diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/akonadi_nepomuktag_resource.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/akonadi_nepomuktag_resource.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/akonadi_nepomuktag_resource.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/akonadi_nepomuktag_resource.po	2012-04-18 08:59:33.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdepim-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 04:24+0000\n"
+"POT-Creation-Date: 2012-04-12 19:14+0000\n"
 "PO-Revision-Date: 2010-12-18 02:03+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:21+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: nepomuktagresource.cpp:52 nepomuktagresource.cpp:54
 msgid "Tags"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/akregator.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/akregator.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/akregator.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/akregator.po	2012-04-18 08:59:25.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:47+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-11 17:21+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,69 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: configuration/settings_advanced.cpp:61
-msgctxt "Mark selected article read after"
-msgid " second"
-msgid_plural " seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: configuration/akregator_config_browser.cpp:54
-msgid "kcmakrbrowserconfig"
-msgstr ""
-
-#: configuration/akregator_config_browser.cpp:55
-msgid "Configure Feed Reader Browser"
-msgstr ""
-
-#: configuration/akregator_config_browser.cpp:57
-#: configuration/akregator_config_general.cpp:61
-#: configuration/akregator_config_appearance.cpp:68
-#: configuration/akregator_config_advanced.cpp:51
-#: configuration/akregator_config_archive.cpp:66
-msgid "(c), 2004 - 2008 Frank Osterfeld"
-msgstr ""
-
-#: configuration/akregator_config_browser.cpp:59
-#: configuration/akregator_config_general.cpp:63
-#: configuration/akregator_config_appearance.cpp:70
-#: configuration/akregator_config_advanced.cpp:53
-#: configuration/akregator_config_archive.cpp:68 src/aboutdata.cpp:42
-msgid "Frank Osterfeld"
-msgstr ""
-
-#: configuration/akregator_config_general.cpp:51
-msgid " minute"
-msgid_plural " minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: configuration/akregator_config_general.cpp:58
-msgid "kcmakrgeneralconfig"
-msgstr ""
-
-#: configuration/akregator_config_general.cpp:59
-msgid "Configure Feeds"
-msgstr ""
-
-#: configuration/akregator_config_appearance.cpp:65
-msgid "kcmakrappearanceconfig"
-msgstr ""
-
-#: configuration/akregator_config_appearance.cpp:66
-msgid "Configure Feed Reader Appearance"
-msgstr ""
-
-#: configuration/akregator_config_advanced.cpp:48
-msgid "kcmakradvancedconfig"
-msgstr ""
-
-#: configuration/akregator_config_advanced.cpp:49
-msgid "Advanced Feed Reader Settings"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-04-18 00:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: configuration/akregator_config_archive.cpp:55
 msgctxt "Limit feed archive size to:"
@@ -97,96 +36,81 @@
 msgid "Configure Feed Reader Archive"
 msgstr ""
 
-#: plugins/onlinesync/onlinesyncplugin.cpp:61
-msgid "Synchronize Feeds"
-msgstr ""
-
-#: plugins/onlinesync/onlinesyncplugin.cpp:96
-#, kde-format
-msgid "Get from %1"
-msgstr ""
-
-#: plugins/onlinesync/onlinesyncplugin.cpp:105
-#, kde-format
-msgid "Send to %1"
-msgstr ""
-
-#: plugins/onlinesync/onlinesyncplugin.cpp:114
-msgid "Manage..."
-msgstr ""
-
-#: plugins/onlinesync/ui/configurationdialog.cpp:37
-msgid "Online Reader Configuration"
-msgstr ""
-
-#: plugins/onlinesync/ui/configurationdialogadd.cpp:43
-msgid "Modify Online Reader Account"
-msgstr ""
-
-#: plugins/onlinesync/ui/configurationdialogadd.cpp:44
-msgid "Google Reader"
+#: configuration/akregator_config_archive.cpp:66
+#: configuration/akregator_config_browser.cpp:57
+#: configuration/akregator_config_appearance.cpp:68
+#: configuration/akregator_config_general.cpp:61
+#: configuration/akregator_config_advanced.cpp:51
+msgid "(c), 2004 - 2008 Frank Osterfeld"
 msgstr ""
 
-#: plugins/onlinesync/ui/configurationwidget.cpp:43
-msgid "Nothing"
+#: configuration/akregator_config_archive.cpp:68
+#: configuration/akregator_config_browser.cpp:59
+#: configuration/akregator_config_appearance.cpp:70
+#: configuration/akregator_config_general.cpp:63
+#: configuration/akregator_config_advanced.cpp:53 src/aboutdata.cpp:42
+msgid "Frank Osterfeld"
 msgstr ""
 
-#: plugins/onlinesync/ui/configurationwidget.cpp:44
-msgid "Categories"
+#: configuration/akregator_config_browser.cpp:54
+msgid "kcmakrbrowserconfig"
 msgstr ""
 
-#: plugins/onlinesync/ui/configurationwidget.cpp:45 src/akregator_part.cpp:98
-msgid "Feeds"
+#: configuration/akregator_config_browser.cpp:55
+msgid "Configure Feed Reader Browser"
 msgstr ""
 
-#: plugins/onlinesync/ui/configurationwidget.cpp:46
-msgid "Ask"
-msgstr ""
+#: configuration/settings_advanced.cpp:61
+msgctxt "Mark selected article read after"
+msgid " second"
+msgid_plural " seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/onlinesync/akregator_config_onlinesync.cpp:49
-msgid "kcmakronlinesyncconfig"
+#: configuration/akregator_config_appearance.cpp:65
+msgid "kcmakrappearanceconfig"
 msgstr ""
 
-#: plugins/onlinesync/akregator_config_onlinesync.cpp:50
-msgid "Configure Online Readers"
+#: configuration/akregator_config_appearance.cpp:66
+msgid "Configure Feed Reader Appearance"
 msgstr ""
 
-#: plugins/onlinesync/akregator_config_onlinesync.cpp:52
-msgid "(c), 2008 Didier Hoarau"
-msgstr ""
+#: configuration/akregator_config_general.cpp:51
+msgid " minute"
+msgid_plural " minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/onlinesync/akregator_config_onlinesync.cpp:54
-msgid "Didier Hoarau"
+#: configuration/akregator_config_general.cpp:58
+msgid "kcmakrgeneralconfig"
 msgstr ""
 
-#: plugins/onlinesync/sync/feedsync.cpp:161
-msgid ""
-"Some categories and feeds have been marked for removal. Do you want to "
-"delete them?"
+#: configuration/akregator_config_general.cpp:59
+msgid "Configure Feeds"
 msgstr ""
 
-#: plugins/onlinesync/sync/feedsync.cpp:163
-msgid "Remove nothing"
+#: configuration/akregator_config_advanced.cpp:48
+msgid "kcmakradvancedconfig"
 msgstr ""
 
-#: plugins/onlinesync/sync/feedsync.cpp:164
-msgid "Remove only categories"
+#: configuration/akregator_config_advanced.cpp:49
+msgid "Advanced Feed Reader Settings"
 msgstr ""
 
-#: plugins/onlinesync/sync/feedsync.cpp:165
-msgid "Remove feeds"
+#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:50
+msgid "kcmakrshareconfig"
 msgstr ""
 
-#: plugins/onlinesync/sync/feedsync.cpp:217
-msgid "An error occurred, synchronization aborted."
+#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:51
+msgid "Configure Share Services"
 msgstr ""
 
-#: plugins/onlinesync/sync/googlereader.cpp:276
-msgid "Authentication failed, synchronization aborted."
+#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:53
+msgid "(c), 2010 Artur Duque de Souza"
 msgstr ""
 
-#: plugins/mk4storage/storagefactorymk4impl.cpp:48
-msgid "Metakit"
+#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:55
+msgid "Artur Duque de Souza"
 msgstr ""
 
 #: plugins/sharemicroblog/sharemicroblogplugin.cpp:87
@@ -211,188 +135,103 @@
 msgid "Error during article share"
 msgstr ""
 
-#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:50
-msgid "kcmakrshareconfig"
-msgstr ""
-
-#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:51
-msgid "Configure Share Services"
-msgstr ""
-
-#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:53
-msgid "(c), 2010 Artur Duque de Souza"
-msgstr ""
-
-#: plugins/sharemicroblog/akregator_config_sharemicroblog.cpp:55
-msgid "Artur Duque de Souza"
+#: plugins/mk4storage/storagefactorymk4impl.cpp:48
+msgid "Metakit"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:72
-#, kde-format
+#: plugins/onlinesync/sync/feedsync.cpp:161
 msgid ""
-"<qt>The standard feed list is corrupted (invalid OPML). A backup was "
-"created:<p><b>%1</b></p></qt>"
+"Some categories and feeds have been marked for removal. Do you want to "
+"delete them?"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:73
-msgid ""
-"<qt>The standard feed list is corrupted (invalid OPML). Could not create a "
-"backup.</p></qt>"
+#: plugins/onlinesync/sync/feedsync.cpp:163
+msgid "Remove nothing"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:76 src/akregator_part.cpp:536
-msgid "OPML Parsing Error"
+#: plugins/onlinesync/sync/feedsync.cpp:164
+msgid "Remove only categories"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:124
-msgid "Opening Feed List..."
+#: plugins/onlinesync/sync/feedsync.cpp:165
+msgid "Remove feeds"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:142
-#, kde-format
-msgid "<qt>Could not open feed list (%1) for reading.</p></qt>"
+#: plugins/onlinesync/sync/feedsync.cpp:217
+msgid "An error occurred, synchronization aborted."
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:142 src/akregator_part.cpp:539
-msgid "Read Error"
+#: plugins/onlinesync/sync/googlereader.cpp:276
+msgid "Authentication failed, synchronization aborted."
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:154
-msgctxt "error message window caption"
-msgid "XML Parsing Error"
+#: plugins/onlinesync/onlinesyncplugin.cpp:61
+msgid "Synchronize Feeds"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:155
+#: plugins/onlinesync/onlinesyncplugin.cpp:96
 #, kde-format
-msgid ""
-"<qt><p>XML parsing error in line %1, column %2 of %3:</p><p>%4</p></qt>"
+msgid "Get from %1"
 msgstr ""
 
-#: src/loadfeedlistcommand.cpp:161
+#: plugins/onlinesync/onlinesyncplugin.cpp:105
 #, kde-format
-msgid ""
-"<qt>The standard feed list is corrupted (invalid XML). A backup was "
-"created:<p><b>%1</b></p></qt>"
-msgstr ""
-
-#: src/loadfeedlistcommand.cpp:162
-msgid ""
-"<qt>The standard feed list is corrupted (invalid XML). Could not create a "
-"backup.</p></qt>"
-msgstr ""
-
-#: src/articlejobs.cpp:188
-msgid "The feed to be listed was already removed."
-msgstr ""
-
-#: src/pluginmanager.cpp:165
-msgctxt "Name of the plugin"
-msgid "Name"
-msgstr ""
-
-#: src/pluginmanager.cpp:166
-msgctxt "Library name"
-msgid "Library"
-msgstr ""
-
-#: src/pluginmanager.cpp:167
-msgctxt "Plugin authors"
-msgid "Authors"
-msgstr ""
-
-#: src/pluginmanager.cpp:168
-msgctxt "Plugin authors' emaila addresses"
-msgid "Email"
-msgstr ""
-
-#: src/pluginmanager.cpp:169
-msgctxt "Plugin version"
-msgid "Version"
-msgstr ""
-
-#: src/pluginmanager.cpp:170
-msgctxt "Framework version plugin requires"
-msgid "Framework Version"
-msgstr ""
-
-#: src/pluginmanager.cpp:174
-msgid "Plugin Information"
-msgstr ""
-
-#: src/akregator_options.h:37 src/akregator_options.h:41
-msgid "Add a feed with the given URL"
-msgstr ""
-
-#: src/akregator_options.h:39
-msgid "When adding feeds, place them in this group"
-msgstr ""
-
-#: src/akregator_options.h:40
-msgid "Hide main window on startup"
+msgid "Send to %1"
 msgstr ""
 
-#: src/dummystorage/storagefactorydummyimpl.cpp:48
-msgid "No Archive"
+#: plugins/onlinesync/onlinesyncplugin.cpp:114
+msgid "Manage..."
 msgstr ""
 
-#: src/pageviewer.cpp:101 src/actionmanagerimpl.cpp:577
-msgctxt "Go back in browser history"
-msgid "Back"
+#: plugins/onlinesync/akregator_config_onlinesync.cpp:49
+msgid "kcmakronlinesyncconfig"
 msgstr ""
 
-#: src/pageviewer.cpp:109 src/actionmanagerimpl.cpp:570
-msgctxt "Go forward in browser history"
-msgid "Forward"
+#: plugins/onlinesync/akregator_config_onlinesync.cpp:50
+msgid "Configure Online Readers"
 msgstr ""
 
-#: src/pageviewer.cpp:116 src/actionmanagerimpl.cpp:586
-msgctxt "Reload current page"
-msgid "Reload"
+#: plugins/onlinesync/akregator_config_onlinesync.cpp:52
+msgid "(c), 2008 Didier Hoarau"
 msgstr ""
 
-#: src/pageviewer.cpp:119 src/actionmanagerimpl.cpp:591
-msgid "Stop"
+#: plugins/onlinesync/akregator_config_onlinesync.cpp:54
+msgid "Didier Hoarau"
 msgstr ""
 
-#: src/pageviewer.cpp:411 src/actions.cpp:35
-msgid "Open Link in New &Tab"
+#: plugins/onlinesync/ui/configurationdialogadd.cpp:43
+msgid "Modify Online Reader Account"
 msgstr ""
 
-#: src/pageviewer.cpp:412
-msgid "<b>Open Link in New Tab</b><p>Opens current link in a new tab.</p>"
+#: plugins/onlinesync/ui/configurationdialogadd.cpp:44
+msgid "Google Reader"
 msgstr ""
 
-#: src/pageviewer.cpp:413 src/actions.cpp:44
-msgid "Open Link in External &Browser"
+#: plugins/onlinesync/ui/configurationwidget.cpp:43
+msgid "Nothing"
 msgstr ""
 
-#: src/pageviewer.cpp:445
-msgid "Open Page in External Browser"
+#: plugins/onlinesync/ui/configurationwidget.cpp:44
+msgid "Categories"
 msgstr ""
 
-#: src/pageviewer.cpp:453
-msgid "Add to Konqueror Bookmarks"
+#: plugins/onlinesync/ui/configurationwidget.cpp:45 src/akregator_part.cpp:98
+msgid "Feeds"
 msgstr ""
 
-#: src/notificationmanager.cpp:79
-#, kde-format
-msgid ""
-"Feed added:\n"
-" %1"
+#: plugins/onlinesync/ui/configurationwidget.cpp:46
+msgid "Ask"
 msgstr ""
 
-#: src/notificationmanager.cpp:87
-#, kde-format
-msgid ""
-"Feeds added:\n"
-" %1"
+#: plugins/onlinesync/ui/configurationdialog.cpp:37
+msgid "Online Reader Configuration"
 msgstr ""
 
-#: src/articlelistview.cpp:184 src/subscriptionlistview.cpp:181
+#: src/articlelistview.cpp:187 src/subscriptionlistview.cpp:181
 msgid "Columns"
 msgstr ""
 
-#: src/articlelistview.cpp:383
+#: src/articlelistview.cpp:386
 msgid ""
 "<h2>Article list</h2>Here you can browse articles from the currently "
 "selected feed. You can also manage articles, as marking them as persistent "
@@ -401,60 +240,29 @@
 "in an external browser window."
 msgstr ""
 
-#: src/articlelistview.cpp:450
+#: src/articlelistview.cpp:453
 msgid ""
 "<div align=center><h3>No matches</h3>Filter does not match any articles, "
 "please change your criteria and try again.</div>"
 msgstr ""
 
-#: src/articlelistview.cpp:461
+#: src/articlelistview.cpp:464
 msgid ""
 "<div align=center><h3>No feed selected</h3>This area is article list. Select "
 "a feed from the feed list and you will see its articles here.</div>"
 msgstr ""
 
-#: src/subscriptionlistmodel.cpp:61
-msgid "Timeout on remote server"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:63
-msgid "Unknown host"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:65
-msgid "Feed file not found on remote server"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:67
-msgid "Could not read feed (invalid XML)"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:69
-msgid "Could not read feed (unknown format)"
+#: src/subscriptionlistjobs.cpp:64
+msgid "Feed list was deleted"
 msgstr ""
 
-#: src/subscriptionlistmodel.cpp:71
-msgid "Could not read feed (invalid feed)"
+#: src/subscriptionlistjobs.cpp:75
+msgid "Node or destination folder not found"
 msgstr ""
 
-#: src/subscriptionlistmodel.cpp:157
+#: src/subscriptionlistjobs.cpp:83
 #, kde-format
-msgid "Could not fetch feed: %1"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:213
-msgctxt "Feedlist's column header"
-msgid "Feeds"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:215
-msgctxt "Feedlist's column header"
-msgid "Unread"
-msgstr ""
-
-#: src/subscriptionlistmodel.cpp:217
-msgctxt "Feedlist's column header"
-msgid "Total"
+msgid "Cannot move folder %1 to its own subfolder %2"
 msgstr ""
 
 #: src/importfeedlistcommand.cpp:64
@@ -469,6 +277,13 @@
 msgid "Imported folder name:"
 msgstr ""
 
+#: src/mainwindow.cpp:104
+#, kde-format
+msgid ""
+"Could not find the Akregator part; please check your installation.\n"
+"%1"
+msgstr ""
+
 #: src/articleviewer.cpp:137
 msgid "Copy &Link Address"
 msgstr "Copïo Cyfeiriad C&yswllt"
@@ -511,12 +326,28 @@
 msgid "Keep Enabled"
 msgstr ""
 
-#: src/articleviewer.cpp:735
-msgid "Are you sure you want to disable this introduction page?"
+#: src/articleviewer.cpp:735
+msgid "Are you sure you want to disable this introduction page?"
+msgstr ""
+
+#: src/articleviewer.cpp:735
+msgid "Disable Introduction Page"
+msgstr ""
+
+#: src/frame.cpp:101
+msgid "Untitled"
+msgstr ""
+
+#: src/frame.cpp:161
+msgid "Loading..."
+msgstr "Llwytho..."
+
+#: src/frame.cpp:182
+msgid "Loading canceled"
 msgstr ""
 
-#: src/articleviewer.cpp:735
-msgid "Disable Introduction Page"
+#: src/frame.cpp:196
+msgid "Loading completed"
 msgstr ""
 
 #: src/aboutdata.cpp:37
@@ -632,162 +463,293 @@
 msgid "Gentoo Ebuild"
 msgstr ""
 
-#: src/feedpropertiesdialog.cpp:71 src/feedpropertiesdialog.cpp:96
-msgid "Minute"
-msgid_plural "Minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/tabwidget.cpp:113
+msgid "Close the current tab"
+msgstr "Cau'r tab cyfredol"
 
-#: src/feedpropertiesdialog.cpp:72 src/feedpropertiesdialog.cpp:97
-msgid "Hour"
-msgid_plural "Hours"
-msgstr[0] ""
-msgstr[1] ""
+#: src/feedlist.cpp:177
+msgid "All Feeds"
+msgstr ""
 
-#: src/feedpropertiesdialog.cpp:73 src/feedpropertiesdialog.cpp:98
-msgid "Day"
-msgid_plural "Days"
+#: src/trayicon.cpp:75
+#, kde-format
+msgid "1 unread article"
+msgid_plural "%1 unread articles"
 msgstr[0] ""
 msgstr[1] ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:21
-#. i18n: ectx: property (windowTitle), widget (QWidget, Akregator::FeedPropertiesWidgetBase)
-#: src/feedpropertiesdialog.cpp:88 src/feedpropertiesdialog.cpp:130 rc.cpp:428
-msgid "Feed Properties"
+#: src/subscriptionlistmodel.cpp:61
+msgid "Timeout on remote server"
 msgstr ""
 
-#: src/feedpropertiesdialog.cpp:99
-msgid "Never"
-msgstr "Byth"
+#: src/subscriptionlistmodel.cpp:63
+msgid "Unknown host"
+msgstr ""
 
-#: src/feedpropertiesdialog.cpp:100
-msgid " day"
-msgid_plural " days"
-msgstr[0] ""
-msgstr[1] ""
+#: src/subscriptionlistmodel.cpp:65
+msgid "Feed file not found on remote server"
+msgstr ""
 
-#: src/feedpropertiesdialog.cpp:101
-msgid " article"
-msgid_plural " articles"
-msgstr[0] ""
-msgstr[1] ""
+#: src/subscriptionlistmodel.cpp:67
+msgid "Could not read feed (invalid XML)"
+msgstr ""
 
-#: src/feedpropertiesdialog.cpp:131
+#: src/subscriptionlistmodel.cpp:69
+msgid "Could not read feed (unknown format)"
+msgstr ""
+
+#: src/subscriptionlistmodel.cpp:71
+msgid "Could not read feed (invalid feed)"
+msgstr ""
+
+#: src/subscriptionlistmodel.cpp:157
 #, kde-format
-msgid "Properties of %1"
-msgstr "Priodweddau %1"
+msgid "Could not fetch feed: %1"
+msgstr ""
 
-#: src/akregator_part.cpp:125
-msgid "KDE Dot News"
+#: src/subscriptionlistmodel.cpp:213
+msgctxt "Feedlist's column header"
+msgid "Feeds"
 msgstr ""
 
-#: src/akregator_part.cpp:130
-msgid "Planet KDE"
+#: src/subscriptionlistmodel.cpp:215
+msgctxt "Feedlist's column header"
+msgid "Unread"
 msgstr ""
 
-#: src/akregator_part.cpp:135
-msgid "Planet KDE PIM"
+#: src/subscriptionlistmodel.cpp:217
+msgctxt "Feedlist's column header"
+msgid "Total"
 msgstr ""
 
-#: src/akregator_part.cpp:140
-msgid "KDE Apps"
+#: src/articlejobs.cpp:188
+msgid "The feed to be listed was already removed."
 msgstr ""
 
-#: src/akregator_part.cpp:145
-msgid "KDE Look"
+#: src/pageviewer.cpp:101 src/actionmanagerimpl.cpp:577
+msgctxt "Go back in browser history"
+msgid "Back"
 msgstr ""
 
-#: src/akregator_part.cpp:154
-msgid "Planet Ubuntu"
+#: src/pageviewer.cpp:109 src/actionmanagerimpl.cpp:570
+msgctxt "Go forward in browser history"
+msgid "Forward"
 msgstr ""
 
-#: src/akregator_part.cpp:159
-msgid "Ubuntu Fridge"
+#: src/pageviewer.cpp:116 src/actionmanagerimpl.cpp:586
+msgctxt "Reload current page"
+msgid "Reload"
 msgstr ""
 
-#: src/akregator_part.cpp:164
-msgid "Kubuntu.org News"
+#: src/pageviewer.cpp:119 src/actionmanagerimpl.cpp:591
+msgid "Stop"
 msgstr ""
 
-#: src/akregator_part.cpp:238
-#, kde-format
-msgid "Unable to load storage backend plugin \"%1\". No feeds are archived."
+#: src/pageviewer.cpp:411 src/actions.cpp:35
+msgid "Open Link in New &Tab"
 msgstr ""
 
-#: src/akregator_part.cpp:238
-msgid "Plugin error"
+#: src/pageviewer.cpp:412
+msgid "<b>Open Link in New Tab</b><p>Opens current link in a new tab.</p>"
 msgstr ""
 
-#: src/akregator_part.cpp:500
+#: src/pageviewer.cpp:413 src/actions.cpp:44
+msgid "Open Link in External &Browser"
+msgstr ""
+
+#: src/pageviewer.cpp:445
+msgid "Open Page in External Browser"
+msgstr ""
+
+#: src/pageviewer.cpp:453
+msgid "Add to Konqueror Bookmarks"
+msgstr ""
+
+#: src/mainwidget.cpp:180
+msgid "You can view multiple articles in several open tabs."
+msgstr ""
+
+#: src/mainwidget.cpp:184
+msgid "Articles list."
+msgstr ""
+
+#: src/mainwidget.cpp:248
+msgid "Browsing area."
+msgstr ""
+
+#: src/mainwidget.cpp:253 src/mainwidget.cpp:610
+msgid "Articles"
+msgstr "Erhyglau"
+
+#: src/mainwidget.cpp:269
+msgid "About"
+msgstr ""
+
+#: src/mainwidget.cpp:787
+msgid "Fetching Feeds..."
+msgstr ""
+
+#: src/mainwidget.cpp:974
+#, kde-format
+msgid "<qt>Are you sure you want to delete article <b>%1</b>?</qt>"
+msgstr ""
+
+#: src/mainwidget.cpp:977
+#, kde-format
+msgid "<qt>Are you sure you want to delete the selected article?</qt>"
+msgid_plural ""
+"<qt>Are you sure you want to delete the %1 selected articles?</qt>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/mainwidget.cpp:981
+msgid "Delete Article"
+msgstr "Dileu Erthygl"
+
+#: src/loadfeedlistcommand.cpp:72
 #, kde-format
 msgid ""
-"Access denied: Cannot save feed list to <b>%1</b>. Please check your "
-"permissions."
+"<qt>The standard feed list is corrupted (invalid OPML). A backup was "
+"created:<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: src/akregator_part.cpp:501 src/akregator_part.cpp:560
-msgid "Write Error"
+#: src/loadfeedlistcommand.cpp:73
+msgid ""
+"<qt>The standard feed list is corrupted (invalid OPML). Could not create a "
+"backup.</p></qt>"
 msgstr ""
 
-#: src/akregator_part.cpp:536
+#: src/loadfeedlistcommand.cpp:76 src/akregator_part.cpp:536
+msgid "OPML Parsing Error"
+msgstr ""
+
+#: src/loadfeedlistcommand.cpp:124
+msgid "Opening Feed List..."
+msgstr ""
+
+#: src/loadfeedlistcommand.cpp:142
 #, kde-format
-msgid "Could not import the file %1 (no valid OPML)"
+msgid "<qt>Could not open feed list (%1) for reading.</p></qt>"
 msgstr ""
 
-#: src/akregator_part.cpp:539
+#: src/loadfeedlistcommand.cpp:142 src/akregator_part.cpp:539
+msgid "Read Error"
+msgstr ""
+
+#: src/loadfeedlistcommand.cpp:154
+msgctxt "error message window caption"
+msgid "XML Parsing Error"
+msgstr ""
+
+#: src/loadfeedlistcommand.cpp:155
 #, kde-format
 msgid ""
-"The file %1 could not be read, check if it exists or if it is readable for "
-"the current user."
+"<qt><p>XML parsing error in line %1, column %2 of %3:</p><p>%4</p></qt>"
 msgstr ""
 
-#: src/akregator_part.cpp:553
+#: src/loadfeedlistcommand.cpp:161
 #, kde-format
-msgid "The file %1 already exists; do you want to overwrite it?"
+msgid ""
+"<qt>The standard feed list is corrupted (invalid XML). A backup was "
+"created:<p><b>%1</b></p></qt>"
+msgstr ""
+
+#: src/loadfeedlistcommand.cpp:162
+msgid ""
+"<qt>The standard feed list is corrupted (invalid XML). Could not create a "
+"backup.</p></qt>"
+msgstr ""
+
+#: src/pluginmanager.cpp:165
+msgctxt "Name of the plugin"
+msgid "Name"
+msgstr ""
+
+#: src/pluginmanager.cpp:166
+msgctxt "Library name"
+msgid "Library"
+msgstr ""
+
+#: src/pluginmanager.cpp:167
+msgctxt "Plugin authors"
+msgid "Authors"
+msgstr ""
+
+#: src/pluginmanager.cpp:168
+msgctxt "Plugin authors' emaila addresses"
+msgid "Email"
+msgstr ""
+
+#: src/pluginmanager.cpp:169
+msgctxt "Plugin version"
+msgid "Version"
+msgstr ""
+
+#: src/pluginmanager.cpp:170
+msgctxt "Framework version plugin requires"
+msgid "Framework Version"
+msgstr ""
+
+#: src/pluginmanager.cpp:174
+msgid "Plugin Information"
 msgstr ""
 
-#: src/akregator_part.cpp:554
-msgid "Export"
+#: src/articleformatter.cpp:57
+#, kde-format
+msgid "(%1, %2)"
 msgstr ""
 
-#: src/akregator_part.cpp:560
+#: src/articleformatter.cpp:62
 #, kde-format
-msgid ""
-"Access denied: cannot write to file %1. Please check your permissions."
+msgid "<a href=\"%1\">%2</a> %3"
 msgstr ""
 
-#: src/akregator_part.cpp:583 src/akregator_part.cpp:593
-msgid "OPML Outlines (*.opml, *.xml)"
+#: src/articleformatter.cpp:108 src/articleformatter.cpp:150
+msgid " (no unread articles)"
 msgstr ""
 
-#: src/akregator_part.cpp:584 src/akregator_part.cpp:594
-msgid "All Files"
-msgstr "Pob Ffeil"
+#: src/articleformatter.cpp:110 src/articleformatter.cpp:152
+#, kde-format
+msgid " (1 unread article)"
+msgid_plural " (%1 unread articles)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/akregator_part.cpp:740
-msgid "Imported Folder"
+#: src/articleformatter.cpp:128
+#, kde-format
+msgid "<b>Description:</b> %1<br /><br />"
 msgstr ""
 
-#: src/akregator_part.cpp:790
-msgid ""
-"Akregator did not close correctly. Would you like to restore the previous "
-"session?"
+#: src/articleformatter.cpp:135
+#, kde-format
+msgid "<b>Homepage:</b> <a href=\"%1\">%2</a>"
 msgstr ""
 
-#: src/akregator_part.cpp:791
-msgid "Restore Session?"
-msgstr ""
+#: src/articleformatter.cpp:189 src/articleformatter.cpp:190
+#: src/articleformatter.cpp:385 src/articleformatter.cpp:386
+msgid "Date"
+msgstr "Dyddiad"
 
-#: src/akregator_part.cpp:792
-msgid "Restore Session"
+#: src/articleformatter.cpp:197 src/articleformatter.cpp:198
+#: src/articleformatter.cpp:394 src/articleformatter.cpp:395
+msgid "Author"
+msgstr "Awdur"
+
+#: src/articleformatter.cpp:205 src/articleformatter.cpp:206
+#: src/articleformatter.cpp:402 src/articleformatter.cpp:403
+msgid "Enclosure"
 msgstr ""
 
-#: src/akregator_part.cpp:793
-msgid "Do Not Restore"
+#: src/articleformatter.cpp:237 src/articleformatter.cpp:434
+msgid "Comments"
+msgstr "Sylwadau"
+
+#: src/articleformatter.cpp:246 src/articleformatter.cpp:444
+msgid "Enclosure:"
 msgstr ""
 
-#: src/akregator_part.cpp:794
-msgid "Ask Me Later"
+#: src/articleformatter.cpp:260 src/articleformatter.cpp:458
+msgid "Complete Story"
 msgstr ""
 
 #: src/deletesubscriptioncommand.cpp:53
@@ -820,81 +782,6 @@
 msgid "Delete Feed"
 msgstr "Dileu'r Porthiant"
 
-#: src/createfoldercommand.cpp:66
-msgid "Add Folder"
-msgstr ""
-
-#: src/createfoldercommand.cpp:67
-msgid "Folder name:"
-msgstr ""
-
-#: src/searchbar.cpp:77
-msgctxt "Title of article searchbar"
-msgid "S&earch:"
-msgstr ""
-
-#: src/searchbar.cpp:88
-msgid "Status:"
-msgstr "Cyflwr:"
-
-#: src/searchbar.cpp:97
-msgid "All Articles"
-msgstr ""
-
-#: src/searchbar.cpp:98
-msgctxt "Unread articles filter"
-msgid "Unread"
-msgstr ""
-
-#: src/searchbar.cpp:99
-msgctxt "New articles filter"
-msgid "New"
-msgstr ""
-
-#: src/searchbar.cpp:100
-msgctxt "Important articles filter"
-msgid "Important"
-msgstr ""
-
-#: src/searchbar.cpp:102
-msgid "Enter space-separated terms to filter article list"
-msgstr ""
-
-#: src/searchbar.cpp:103
-msgid "Choose what kind of articles to show in article list"
-msgstr ""
-
-#: src/progressmanager.cpp:178
-msgid "Fetch completed"
-msgstr ""
-
-#: src/progressmanager.cpp:188
-msgid "Fetch error"
-msgstr ""
-
-#: src/progressmanager.cpp:198
-msgid "Fetch aborted"
-msgstr ""
-
-#: src/speechclient.cpp:113
-msgid "Next Article: "
-msgstr ""
-
-#: src/tabwidget.cpp:113
-msgid "Close the current tab"
-msgstr "Cau'r tab cyfredol"
-
-#: src/trayicon.cpp:75
-#, kde-format
-msgid "1 unread article"
-msgid_plural "%1 unread articles"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/feedlist.cpp:177
-msgid "All Feeds"
-msgstr ""
-
 #: src/actionmanagerimpl.cpp:77 src/actionmanagerimpl.cpp:259
 msgid "&Fetch Feed"
 msgstr ""
@@ -985,7 +872,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_LMBBehaviour)
 #. i18n: file: configuration/settings_browser.ui:46
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MMBBehaviour)
-#: src/actionmanagerimpl.cpp:296 rc.cpp:62 rc.cpp:74
+#: src/actionmanagerimpl.cpp:296 rc.cpp:80 rc.cpp:92
 msgid "Open in Tab"
 msgstr ""
 
@@ -993,7 +880,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_LMBBehaviour)
 #. i18n: file: configuration/settings_browser.ui:56
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MMBBehaviour)
-#: src/actionmanagerimpl.cpp:302 rc.cpp:68 rc.cpp:80
+#: src/actionmanagerimpl.cpp:302 rc.cpp:86 rc.cpp:98
 msgid "Open in External Browser"
 msgstr ""
 
@@ -1186,159 +1073,272 @@
 msgid "Content"
 msgstr ""
 
-#: src/mainwidget.cpp:180
-msgid "You can view multiple articles in several open tabs."
+#: src/speechclient.cpp:113
+msgid "Next Article: "
+msgstr ""
+
+#: src/feedpropertiesdialog.cpp:71 src/feedpropertiesdialog.cpp:96
+msgid "Minute"
+msgid_plural "Minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/feedpropertiesdialog.cpp:72 src/feedpropertiesdialog.cpp:97
+msgid "Hour"
+msgid_plural "Hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/feedpropertiesdialog.cpp:73 src/feedpropertiesdialog.cpp:98
+msgid "Day"
+msgid_plural "Days"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: file: src/feedpropertieswidgetbase.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, Akregator::FeedPropertiesWidgetBase)
+#: src/feedpropertiesdialog.cpp:88 src/feedpropertiesdialog.cpp:130 rc.cpp:461
+msgid "Feed Properties"
+msgstr ""
+
+#: src/feedpropertiesdialog.cpp:99
+msgid "Never"
+msgstr "Byth"
+
+#: src/feedpropertiesdialog.cpp:100
+msgid " day"
+msgid_plural " days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/feedpropertiesdialog.cpp:101
+msgid " article"
+msgid_plural " articles"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/feedpropertiesdialog.cpp:131
+#, kde-format
+msgid "Properties of %1"
+msgstr "Priodweddau %1"
+
+#. i18n: file: src/addfeedwidgetbase.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, Akregator::AddFeedWidgetBase)
+#: src/addfeeddialog.cpp:73 rc.cpp:419
+msgid "Add Feed"
+msgstr ""
+
+#: src/addfeeddialog.cpp:112
+#, kde-format
+msgid "Downloading %1"
+msgstr "Lawrlwytho %1"
+
+#: src/addfeeddialog.cpp:131
+#, kde-format
+msgid "Feed not found from %1."
+msgstr ""
+
+#: src/addfeeddialog.cpp:137
+msgid "Feed found, downloading..."
+msgstr ""
+
+#: src/searchbar.cpp:77
+msgctxt "Title of article searchbar"
+msgid "S&earch:"
+msgstr ""
+
+#: src/searchbar.cpp:88
+msgid "Status:"
+msgstr "Cyflwr:"
+
+#: src/searchbar.cpp:97
+msgid "All Articles"
+msgstr ""
+
+#: src/searchbar.cpp:98
+msgctxt "Unread articles filter"
+msgid "Unread"
+msgstr ""
+
+#: src/searchbar.cpp:99
+msgctxt "New articles filter"
+msgid "New"
+msgstr ""
+
+#: src/searchbar.cpp:100
+msgctxt "Important articles filter"
+msgid "Important"
+msgstr ""
+
+#: src/searchbar.cpp:102
+msgid "Enter space-separated terms to filter article list"
+msgstr ""
+
+#: src/searchbar.cpp:103
+msgid "Choose what kind of articles to show in article list"
+msgstr ""
+
+#: src/notificationmanager.cpp:79
+#, kde-format
+msgid ""
+"Feed added:\n"
+" %1"
+msgstr ""
+
+#: src/notificationmanager.cpp:87
+#, kde-format
+msgid ""
+"Feeds added:\n"
+" %1"
+msgstr ""
+
+#: src/akregator_part.cpp:125
+msgid "KDE Dot News"
+msgstr ""
+
+#: src/akregator_part.cpp:130
+msgid "Planet KDE"
 msgstr ""
 
-#: src/mainwidget.cpp:184
-msgid "Articles list."
+#: src/akregator_part.cpp:135
+msgid "Planet KDE PIM"
 msgstr ""
 
-#: src/mainwidget.cpp:248
-msgid "Browsing area."
+#: src/akregator_part.cpp:140
+msgid "KDE Apps"
 msgstr ""
 
-#: src/mainwidget.cpp:253 src/mainwidget.cpp:610
-msgid "Articles"
-msgstr "Erhyglau"
+#: src/akregator_part.cpp:145
+msgid "KDE Look"
+msgstr ""
 
-#: src/mainwidget.cpp:269
-msgid "About"
+#: src/akregator_part.cpp:154
+msgid "Planet Ubuntu"
 msgstr ""
 
-#: src/mainwidget.cpp:787
-msgid "Fetching Feeds..."
+#: src/akregator_part.cpp:159
+msgid "Ubuntu Fridge"
 msgstr ""
 
-#: src/mainwidget.cpp:974
-#, kde-format
-msgid "<qt>Are you sure you want to delete article <b>%1</b>?</qt>"
+#: src/akregator_part.cpp:164
+msgid "Kubuntu.org News"
 msgstr ""
 
-#: src/mainwidget.cpp:977
+#: src/akregator_part.cpp:238
 #, kde-format
-msgid "<qt>Are you sure you want to delete the selected article?</qt>"
-msgid_plural ""
-"<qt>Are you sure you want to delete the %1 selected articles?</qt>"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unable to load storage backend plugin \"%1\". No feeds are archived."
+msgstr ""
 
-#: src/mainwidget.cpp:981
-msgid "Delete Article"
-msgstr "Dileu Erthygl"
+#: src/akregator_part.cpp:238
+msgid "Plugin error"
+msgstr ""
 
-#: src/mainwindow.cpp:104
+#: src/akregator_part.cpp:500
 #, kde-format
 msgid ""
-"Could not find the Akregator part; please check your installation.\n"
-"%1"
-msgstr ""
-
-#: src/subscriptionlistjobs.cpp:64
-msgid "Feed list was deleted"
+"Access denied: Cannot save feed list to <b>%1</b>. Please check your "
+"permissions."
 msgstr ""
 
-#: src/subscriptionlistjobs.cpp:75
-msgid "Node or destination folder not found"
+#: src/akregator_part.cpp:501 src/akregator_part.cpp:560
+msgid "Write Error"
 msgstr ""
 
-#: src/subscriptionlistjobs.cpp:83
+#: src/akregator_part.cpp:536
 #, kde-format
-msgid "Cannot move folder %1 to its own subfolder %2"
+msgid "Could not import the file %1 (no valid OPML)"
 msgstr ""
 
-#: src/articleformatter.cpp:57
+#: src/akregator_part.cpp:539
 #, kde-format
-msgid "(%1, %2)"
+msgid ""
+"The file %1 could not be read, check if it exists or if it is readable for "
+"the current user."
 msgstr ""
 
-#: src/articleformatter.cpp:62
+#: src/akregator_part.cpp:553
 #, kde-format
-msgid "<a href=\"%1\">%2</a> %3"
+msgid "The file %1 already exists; do you want to overwrite it?"
 msgstr ""
 
-#: src/articleformatter.cpp:108 src/articleformatter.cpp:150
-msgid " (no unread articles)"
+#: src/akregator_part.cpp:554
+msgid "Export"
 msgstr ""
 
-#: src/articleformatter.cpp:110 src/articleformatter.cpp:152
+#: src/akregator_part.cpp:560
 #, kde-format
-msgid " (1 unread article)"
-msgid_plural " (%1 unread articles)"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Access denied: cannot write to file %1. Please check your permissions."
+msgstr ""
 
-#: src/articleformatter.cpp:128
-#, kde-format
-msgid "<b>Description:</b> %1<br /><br />"
+#: src/akregator_part.cpp:583 src/akregator_part.cpp:593
+msgid "OPML Outlines (*.opml, *.xml)"
 msgstr ""
 
-#: src/articleformatter.cpp:135
-#, kde-format
-msgid "<b>Homepage:</b> <a href=\"%1\">%2</a>"
+#: src/akregator_part.cpp:584 src/akregator_part.cpp:594
+msgid "All Files"
+msgstr "Pob Ffeil"
+
+#: src/akregator_part.cpp:740
+msgid "Imported Folder"
 msgstr ""
 
-#: src/articleformatter.cpp:189 src/articleformatter.cpp:190
-#: src/articleformatter.cpp:385 src/articleformatter.cpp:386
-msgid "Date"
-msgstr "Dyddiad"
+#: src/akregator_part.cpp:790
+msgid ""
+"Akregator did not close correctly. Would you like to restore the previous "
+"session?"
+msgstr ""
 
-#: src/articleformatter.cpp:197 src/articleformatter.cpp:198
-#: src/articleformatter.cpp:394 src/articleformatter.cpp:395
-msgid "Author"
-msgstr "Awdur"
+#: src/akregator_part.cpp:791
+msgid "Restore Session?"
+msgstr ""
 
-#: src/articleformatter.cpp:205 src/articleformatter.cpp:206
-#: src/articleformatter.cpp:402 src/articleformatter.cpp:403
-msgid "Enclosure"
+#: src/akregator_part.cpp:792
+msgid "Restore Session"
 msgstr ""
 
-#: src/articleformatter.cpp:237 src/articleformatter.cpp:434
-msgid "Comments"
-msgstr "Sylwadau"
+#: src/akregator_part.cpp:793
+msgid "Do Not Restore"
+msgstr ""
 
-#: src/articleformatter.cpp:246 src/articleformatter.cpp:444
-msgid "Enclosure:"
+#: src/akregator_part.cpp:794
+msgid "Ask Me Later"
 msgstr ""
 
-#: src/articleformatter.cpp:260 src/articleformatter.cpp:458
-msgid "Complete Story"
+#: src/createfoldercommand.cpp:66
+msgid "Add Folder"
 msgstr ""
 
-#: src/frame.cpp:101
-msgid "Untitled"
+#: src/createfoldercommand.cpp:67
+msgid "Folder name:"
 msgstr ""
 
-#: src/frame.cpp:161
-msgid "Loading..."
-msgstr "Llwytho..."
+#: src/akregator_options.h:37 src/akregator_options.h:41
+msgid "Add a feed with the given URL"
+msgstr ""
 
-#: src/frame.cpp:182
-msgid "Loading canceled"
+#: src/akregator_options.h:39
+msgid "When adding feeds, place them in this group"
 msgstr ""
 
-#: src/frame.cpp:196
-msgid "Loading completed"
+#: src/akregator_options.h:40
+msgid "Hide main window on startup"
 msgstr ""
 
-#. i18n: file: src/addfeedwidgetbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, Akregator::AddFeedWidgetBase)
-#: src/addfeeddialog.cpp:65 rc.cpp:419
-msgid "Add Feed"
+#: src/dummystorage/storagefactorydummyimpl.cpp:48
+msgid "No Archive"
 msgstr ""
 
-#: src/addfeeddialog.cpp:104
-#, kde-format
-msgid "Downloading %1"
-msgstr "Lawrlwytho %1"
+#: src/progressmanager.cpp:177
+msgid "Fetch completed"
+msgstr ""
 
-#: src/addfeeddialog.cpp:123
-#, kde-format
-msgid "Feed not found from %1."
+#: src/progressmanager.cpp:187
+msgid "Fetch error"
 msgstr ""
 
-#: src/addfeeddialog.cpp:129
-msgid "Feed found, downloading..."
+#: src/progressmanager.cpp:197
+msgid "Fetch aborted"
 msgstr ""
 
 #: rc.cpp:1
@@ -1459,9 +1459,45 @@
 msgid "Use the &browser cache (less network traffic)"
 msgstr ""
 
+#. i18n: file: configuration/settings_archive.ui:10
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:59
+msgid "Default Archive Settings"
+msgstr ""
+
+#. i18n: file: configuration/settings_archive.ui:16
+#. i18n: ectx: property (text), widget (QRadioButton, rb_DisableArchiving)
+#: rc.cpp:62
+msgid "Disable archiving"
+msgstr ""
+
+#. i18n: file: configuration/settings_archive.ui:23
+#. i18n: ectx: property (text), widget (QRadioButton, rb_KeepAllArticles)
+#: rc.cpp:65
+msgid "Keep all articles"
+msgstr ""
+
+#. i18n: file: configuration/settings_archive.ui:35
+#. i18n: ectx: property (text), widget (QRadioButton, rb_LimitArticleNumber)
+#: rc.cpp:68
+msgid "Limit feed archive size to:"
+msgstr ""
+
+#. i18n: file: configuration/settings_archive.ui:62
+#. i18n: ectx: property (text), widget (QRadioButton, rb_LimitArticleAge)
+#: rc.cpp:71
+msgid "Delete articles older than: "
+msgstr ""
+
+#. i18n: file: configuration/settings_archive.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_DoNotExpireImportantArticles)
+#: rc.cpp:74
+msgid "Do not expire important articles"
+msgstr ""
+
 #. i18n: file: configuration/settings_browser.ui:12
 #. i18n: ectx: property (text), widget (QLabel, LMBlabel)
-#: rc.cpp:59
+#: rc.cpp:77
 msgid "Left mouse click:"
 msgstr ""
 
@@ -1469,25 +1505,25 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_LMBBehaviour)
 #. i18n: file: configuration/settings_browser.ui:51
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MMBBehaviour)
-#: rc.cpp:65 rc.cpp:77
+#: rc.cpp:83 rc.cpp:95
 msgid "Open in Background Tab"
 msgstr ""
 
 #. i18n: file: configuration/settings_browser.ui:38
 #. i18n: ectx: property (text), widget (QLabel, MMBlabel)
-#: rc.cpp:71
+#: rc.cpp:89
 msgid "Middle mouse click:"
 msgstr ""
 
 #. i18n: file: configuration/settings_browser.ui:66
 #. i18n: ectx: property (title), widget (QGroupBox, externalBrowserGroupBox)
-#: rc.cpp:83
+#: rc.cpp:101
 msgid "External Browsing"
 msgstr ""
 
 #. i18n: file: configuration/settings_browser.ui:75
 #. i18n: ectx: property (text), widget (QLineEdit, kcfg_ExternalBrowserCustomCommand)
-#: rc.cpp:87
+#: rc.cpp:105
 #, no-c-format
 msgid "firefox %u"
 msgstr ""
@@ -1496,19 +1532,19 @@
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExternalBrowserUseCustomCommand)
 #. i18n: file: interfaces/akregator.kcfg:176
 #. i18n: ectx: label, entry, group (Browser)
-#: rc.cpp:90 rc.cpp:391
+#: rc.cpp:108 rc.cpp:391
 msgid "Use this command:"
 msgstr ""
 
 #. i18n: file: configuration/settings_browser.ui:89
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExternalBrowserUseKdeDefault)
-#: rc.cpp:93
+#: rc.cpp:111
 msgid "Use default web browser"
 msgstr ""
 
 #. i18n: file: configuration/settings_browser.ui:102
 #. i18n: ectx: property (title), widget (QGroupBox, tabsGroupBox)
-#: rc.cpp:96
+#: rc.cpp:114
 msgid "Tabs"
 msgstr ""
 
@@ -1516,13 +1552,13 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AlwaysShowTabBar)
 #. i18n: file: interfaces/akregator.kcfg:156
 #. i18n: ectx: label, entry, group (Browser)
-#: rc.cpp:99 rc.cpp:367
+#: rc.cpp:117 rc.cpp:367
 msgid "Always show the tab bar"
 msgstr ""
 
 #. i18n: file: configuration/settings_browser.ui:115
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_CloseButtonOnTabs)
-#: rc.cpp:102
+#: rc.cpp:120
 msgid "Show close button on each tab"
 msgstr ""
 
@@ -1530,254 +1566,218 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_NewWindowInTab)
 #. i18n: file: interfaces/akregator.kcfg:166
 #. i18n: ectx: label, entry, group (Browser)
-#: rc.cpp:105 rc.cpp:379
+#: rc.cpp:123 rc.cpp:379
 msgid "Open links in new tab instead of in new window"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:10
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:108
+#: rc.cpp:126
 msgid "Article List Colors"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:37
 #. i18n: ectx: property (text), widget (QLabel, lbl_unreadArticles)
-#: rc.cpp:111
+#: rc.cpp:129
 msgid "Unread articles:"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:54
 #. i18n: ectx: property (text), widget (QLabel, lbl_newArticles)
-#: rc.cpp:114
+#: rc.cpp:132
 msgid "New articles:"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:70
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseCustomColors)
-#: rc.cpp:117
+#: rc.cpp:135
 msgid "Use custom colors"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:80
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:120
+#: rc.cpp:138
 msgid "Font Size"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:86
 #. i18n: ectx: property (text), widget (QLabel, lbl_MinimumFontSize)
-#: rc.cpp:123
+#: rc.cpp:141
 msgid "Minimum font size:"
 msgstr "Maint wynebfath lleiaf:"
 
 #. i18n: file: configuration/settings_appearance.ui:126
 #. i18n: ectx: property (text), widget (QLabel, lbl_MediumFontSize)
-#: rc.cpp:126
+#: rc.cpp:144
 msgid "Medium font size:"
 msgstr "Maint wynebfath canolig:"
 
 #. i18n: file: configuration/settings_appearance.ui:169
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:129
+#: rc.cpp:147
 msgid "Fonts"
 msgstr ""
 
 #. i18n: file: configuration/settings_appearance.ui:175
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:132
+#: rc.cpp:150
 msgid "Standard font:"
 msgstr "Wynebfath safonol:"
 
 #. i18n: file: configuration/settings_appearance.ui:185
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:135
+#: rc.cpp:153
 msgid "Fixed font:"
 msgstr "Wynebfath gosodedig:"
 
 #. i18n: file: configuration/settings_appearance.ui:195
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:138
+#: rc.cpp:156
 msgid "Serif font:"
 msgstr "Wynebfath seriff:"
 
 #. i18n: file: configuration/settings_appearance.ui:205
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:141
+#: rc.cpp:159
 msgid "Sans serif font:"
 msgstr "Wynebfath sans seriff:"
 
 #. i18n: file: configuration/settings_appearance.ui:218
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UnderlineLinks)
-#: rc.cpp:144
+#: rc.cpp:162
 msgid "&Underline links"
 msgstr ""
 
-#. i18n: file: configuration/settings_archive.ui:10
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:147
-msgid "Default Archive Settings"
+#. i18n: file: plugins/sharemicroblog/akregator_sharemicroblog_plugin.rc:4
+#. i18n: ectx: Menu (article)
+#. i18n: file: src/akregator_shell.rc:31
+#. i18n: ectx: Menu (article)
+#. i18n: file: src/akregator_part.rc:57
+#. i18n: ectx: Menu (article)
+#: rc.cpp:165 rc.cpp:446 rc.cpp:527
+msgid "&Article"
+msgstr "&Erthygl"
+
+#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:168
+msgid "Login"
+msgstr ""
+
+#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:65
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:171
+msgid "Service"
+msgstr ""
+
+#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:72
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:174
+msgid "Username:"
+msgstr ""
+
+#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:88
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:177
+msgid "Service URL:"
 msgstr ""
 
-#. i18n: file: configuration/settings_archive.ui:16
-#. i18n: ectx: property (text), widget (QRadioButton, rb_DisableArchiving)
-#: rc.cpp:150
-msgid "Disable archiving"
+#. i18n: file: plugins/sharemicroblog/sharesettings.kcfg:9
+#. i18n: ectx: label, entry, group (ShareService)
+#: rc.cpp:180
+msgid "Service URL"
 msgstr ""
 
-#. i18n: file: configuration/settings_archive.ui:23
-#. i18n: ectx: property (text), widget (QRadioButton, rb_KeepAllArticles)
-#: rc.cpp:153
-msgid "Keep all articles"
+#. i18n: file: plugins/sharemicroblog/sharesettings.kcfg:12
+#. i18n: ectx: label, entry, group (ShareService)
+#: rc.cpp:183
+msgid "Username"
 msgstr ""
 
-#. i18n: file: configuration/settings_archive.ui:35
-#. i18n: ectx: property (text), widget (QRadioButton, rb_LimitArticleNumber)
-#: rc.cpp:156
-msgid "Limit feed archive size to:"
+#. i18n: file: plugins/onlinesync/akregator_onlinesync_plugin.rc:4
+#. i18n: ectx: Menu (file)
+#. i18n: file: src/akregator_shell.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:186 rc.cpp:431
+msgid "&File"
 msgstr ""
 
-#. i18n: file: configuration/settings_archive.ui:62
-#. i18n: ectx: property (text), widget (QRadioButton, rb_LimitArticleAge)
-#: rc.cpp:159
-msgid "Delete articles older than: "
+#. i18n: file: plugins/onlinesync/onlinesyncsettings.kcfg:9
+#. i18n: ectx: label, entry, group (Foo)
+#: rc.cpp:189
+msgid "Bar Settings"
 msgstr ""
 
-#. i18n: file: configuration/settings_archive.ui:100
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_DoNotExpireImportantArticles)
-#: rc.cpp:162
-msgid "Do not expire important articles"
+#. i18n: file: plugins/onlinesync/onlinesyncsettings.kcfg:10
+#. i18n: ectx: whatsthis, entry, group (Foo)
+#: rc.cpp:192
+msgid "Bar!"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:18
 #. i18n: ectx: property (text), widget (QLabel, lConfigName)
-#: rc.cpp:165
+#: rc.cpp:195
 msgid "Online reader accounts:"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:36
 #. i18n: ectx: property (text), widget (QTreeWidget, list_readerList)
-#: rc.cpp:168
+#: rc.cpp:198
 msgid "Type"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:41
 #. i18n: ectx: property (text), widget (QTreeWidget, list_readerList)
-#: rc.cpp:171
+#: rc.cpp:201
 msgid "Description"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:51
 #. i18n: ectx: property (text), widget (QPushButton, b_add)
-#: rc.cpp:174
+#: rc.cpp:204
 msgid "Add..."
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:58
 #. i18n: ectx: property (text), widget (QPushButton, b_update)
-#: rc.cpp:177
+#: rc.cpp:207
 msgid "Modify..."
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:65
 #. i18n: ectx: property (text), widget (QPushButton, b_remove)
-#: rc.cpp:180
+#: rc.cpp:210
 msgid "Remove"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationwidget.ui:94
 #. i18n: ectx: property (text), widget (QLabel, lDeletePolicy)
-#: rc.cpp:183
+#: rc.cpp:213
 msgid "Delete feeds:"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationdialogadd.ui:27
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:186
+#: rc.cpp:216
 msgid "Type:"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationdialogadd.ui:52
 #. i18n: ectx: property (text), widget (QLabel, lAccountGoogleReader)
-#: rc.cpp:189
+#: rc.cpp:219
 msgid "Login:"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationdialogadd.ui:69
 #. i18n: ectx: property (text), widget (QLabel, lPasswordGoogleReader)
-#: rc.cpp:192
+#: rc.cpp:222
 msgid "Password:"
 msgstr ""
 
 #. i18n: file: plugins/onlinesync/ui/configurationdialogadd.ui:87
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:195
-msgid "File:"
-msgstr ""
-
-#. i18n: file: plugins/onlinesync/akregator_onlinesync_plugin.rc:4
-#. i18n: ectx: Menu (file)
-#. i18n: file: src/akregator_shell.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:198 rc.cpp:479
-msgid "&File"
-msgstr ""
-
-#. i18n: file: plugins/onlinesync/onlinesyncsettings.kcfg:9
-#. i18n: ectx: label, entry, group (Foo)
-#: rc.cpp:201
-msgid "Bar Settings"
-msgstr ""
-
-#. i18n: file: plugins/onlinesync/onlinesyncsettings.kcfg:10
-#. i18n: ectx: whatsthis, entry, group (Foo)
-#: rc.cpp:204
-msgid "Bar!"
-msgstr ""
-
-#. i18n: file: plugins/sharemicroblog/akregator_sharemicroblog_plugin.rc:4
-#. i18n: ectx: Menu (article)
-#. i18n: file: src/akregator_shell.rc:31
-#. i18n: ectx: Menu (article)
-#. i18n: file: src/akregator_part.rc:57
-#. i18n: ectx: Menu (article)
-#: rc.cpp:207 rc.cpp:494 rc.cpp:521
-msgid "&Article"
-msgstr "&Erthygl"
-
-#. i18n: file: plugins/sharemicroblog/sharesettings.kcfg:9
-#. i18n: ectx: label, entry, group (ShareService)
-#: rc.cpp:210
-msgid "Service URL"
-msgstr ""
-
-#. i18n: file: plugins/sharemicroblog/sharesettings.kcfg:12
-#. i18n: ectx: label, entry, group (ShareService)
-#: rc.cpp:213
-msgid "Username"
-msgstr ""
-
-#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:216
-msgid "Login"
-msgstr ""
-
-#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:65
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:219
-msgid "Service"
-msgstr ""
-
-#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:72
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:222
-msgid "Username:"
-msgstr ""
-
-#. i18n: file: plugins/sharemicroblog/configurationwidget.ui:88
-#. i18n: ectx: property (text), widget (QLabel, label_9)
 #: rc.cpp:225
-msgid "Service URL:"
+msgid "File:"
 msgstr ""
 
 #. i18n: file: interfaces/akregator.kcfg:10
@@ -2148,176 +2148,182 @@
 msgid "Resets the quick filter when changing feeds."
 msgstr ""
 
-#. i18n: file: src/addfeedwidgetbase.ui:124
+#. i18n: file: src/addfeedwidgetbase.ui:95
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: rc.cpp:422
 msgid "Add New Source"
 msgstr ""
 
-#. i18n: file: src/addfeedwidgetbase.ui:131
+#. i18n: file: src/addfeedwidgetbase.ui:108
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
 #: rc.cpp:425
 msgid "Feed &URL:"
 msgstr ""
 
+#. i18n: file: src/addfeedwidgetbase.ui:122
+#. i18n: ectx: property (text), widget (KSqueezedTextLabel, statusLabel)
+#: rc.cpp:428
+msgid "KSqueezedTextLabel"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:11
+#. i18n: ectx: Menu (edit)
+#. i18n: file: src/akregator_part.rc:14
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:434 rc.cpp:515
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:16
+#. i18n: ectx: Menu (view)
+#. i18n: file: src/akregator_part.rc:21
+#. i18n: ectx: Menu (view)
+#: rc.cpp:437 rc.cpp:518
+msgid "&View"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:21
+#. i18n: ectx: Menu (go)
+#. i18n: file: src/pageviewer.rc:34
+#. i18n: ectx: Menu (go)
+#. i18n: file: src/akregator_part.rc:31
+#. i18n: ectx: Menu (go)
+#: rc.cpp:440 rc.cpp:512 rc.cpp:521
+msgid "&Go"
+msgstr "&Ewch"
+
+#. i18n: file: src/akregator_shell.rc:26
+#. i18n: ectx: Menu (feed)
+#. i18n: file: src/akregator_part.rc:44
+#. i18n: ectx: Menu (feed)
+#: rc.cpp:443 rc.cpp:524
+msgid "Fee&d"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:36
+#. i18n: ectx: Menu (settings)
+#. i18n: file: src/akregator_part.rc:73
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:449 rc.cpp:530
+msgid "&Settings"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:47
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: src/akregator_part.rc:84
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:452 rc.cpp:533
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:51
+#. i18n: ectx: ToolBar (browserToolBar)
+#. i18n: file: src/akregator_part.rc:94
+#. i18n: ectx: ToolBar (browserToolBar)
+#: rc.cpp:455 rc.cpp:536
+msgid "Browser Toolbar"
+msgstr ""
+
+#. i18n: file: src/akregator_shell.rc:54
+#. i18n: ectx: ToolBar (textToSpeechToolBar)
+#. i18n: file: src/akregator_part.rc:102
+#. i18n: ectx: ToolBar (textToSpeechToolBar)
+#: rc.cpp:458 rc.cpp:539
+msgid "Speech Toolbar"
+msgstr ""
+
 #. i18n: file: src/feedpropertieswidgetbase.ui:42
 #. i18n: ectx: attribute (title), widget (QWidget, tab1)
-#: rc.cpp:431
+#: rc.cpp:464
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file: src/feedpropertieswidgetbase.ui:54
 #. i18n: ectx: property (text), widget (QCheckBox, cb_updateInterval)
-#: rc.cpp:434
+#: rc.cpp:467
 msgid "U&se a custom update interval"
 msgstr ""
 
 #. i18n: file: src/feedpropertieswidgetbase.ui:88
 #. i18n: ectx: property (text), widget (QLabel, updateLabel)
-#: rc.cpp:437
+#: rc.cpp:470
 msgid "Update &every:"
 msgstr ""
 
 #. i18n: file: src/feedpropertieswidgetbase.ui:114
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_useNotification)
-#: rc.cpp:440
+#: rc.cpp:473
 msgid "Notify when new articles arri&ve"
 msgstr ""
 
 #. i18n: file: src/feedpropertieswidgetbase.ui:129
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:443
+#: rc.cpp:476
 msgid "&URL:"
 msgstr "&URL:"
 
 #. i18n: file: src/feedpropertieswidgetbase.ui:139
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:446
+#: rc.cpp:479
 msgid "&Name:"
 msgstr "&Enw:"
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:157
+#. i18n: file: src/feedpropertieswidgetbase.ui:155
 #. i18n: ectx: property (toolTip), widget (KLineEdit, feedNameEdit)
-#: rc.cpp:449
+#: rc.cpp:482
 msgid "Display name of RSS column"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:183
+#. i18n: file: src/feedpropertieswidgetbase.ui:181
 #. i18n: ectx: attribute (title), widget (QWidget, tab2)
-#: rc.cpp:452
+#: rc.cpp:485
 msgid "Ar&chive"
 msgstr "Ar&chif"
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:195
+#. i18n: file: src/feedpropertieswidgetbase.ui:193
 #. i18n: ectx: property (text), widget (QRadioButton, rb_globalDefault)
-#: rc.cpp:455
+#: rc.cpp:488
 msgid "&Use default settings"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:205
+#. i18n: file: src/feedpropertieswidgetbase.ui:203
 #. i18n: ectx: property (text), widget (QRadioButton, rb_disableArchiving)
-#: rc.cpp:458
+#: rc.cpp:491
 msgid "Di&sable archiving"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:236
+#. i18n: file: src/feedpropertieswidgetbase.ui:234
 #. i18n: ectx: property (text), widget (QRadioButton, rb_limitArticleNumber)
-#: rc.cpp:461
+#: rc.cpp:494
 msgid "Limit archi&ve to:"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:260
+#. i18n: file: src/feedpropertieswidgetbase.ui:264
 #. i18n: ectx: property (text), widget (QRadioButton, rb_limitArticleAge)
-#: rc.cpp:464
+#: rc.cpp:497
 msgid "&Delete articles older than:"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:312
+#. i18n: file: src/feedpropertieswidgetbase.ui:319
 #. i18n: ectx: property (text), widget (QRadioButton, rb_keepAllArticles)
-#: rc.cpp:467
+#: rc.cpp:500
 msgid "&Keep all articles"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:320
+#. i18n: file: src/feedpropertieswidgetbase.ui:327
 #. i18n: ectx: attribute (title), widget (QWidget, tab3)
-#: rc.cpp:470
+#: rc.cpp:503
 msgid "Adva&nced"
 msgstr "Uw&ch"
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:353
+#. i18n: file: src/feedpropertieswidgetbase.ui:360
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_loadWebsite)
-#: rc.cpp:473
+#: rc.cpp:506
 msgid "Load the &full website when reading articles"
 msgstr ""
 
-#. i18n: file: src/feedpropertieswidgetbase.ui:360
+#. i18n: file: src/feedpropertieswidgetbase.ui:367
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_markRead)
-#: rc.cpp:476
+#: rc.cpp:509
 msgid "Mar&k articles as read when they arrive"
 msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:11
-#. i18n: ectx: Menu (edit)
-#. i18n: file: src/akregator_part.rc:14
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:482 rc.cpp:509
-msgid "&Edit"
-msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:16
-#. i18n: ectx: Menu (view)
-#. i18n: file: src/akregator_part.rc:21
-#. i18n: ectx: Menu (view)
-#: rc.cpp:485 rc.cpp:512
-msgid "&View"
-msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:21
-#. i18n: ectx: Menu (go)
-#. i18n: file: src/akregator_part.rc:31
-#. i18n: ectx: Menu (go)
-#. i18n: file: src/pageviewer.rc:34
-#. i18n: ectx: Menu (go)
-#: rc.cpp:488 rc.cpp:515 rc.cpp:536
-msgid "&Go"
-msgstr "&Ewch"
-
-#. i18n: file: src/akregator_shell.rc:26
-#. i18n: ectx: Menu (feed)
-#. i18n: file: src/akregator_part.rc:44
-#. i18n: ectx: Menu (feed)
-#: rc.cpp:491 rc.cpp:518
-msgid "Fee&d"
-msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:36
-#. i18n: ectx: Menu (settings)
-#. i18n: file: src/akregator_part.rc:73
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:497 rc.cpp:524
-msgid "&Settings"
-msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:47
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: src/akregator_part.rc:84
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:500 rc.cpp:527
-msgid "Main Toolbar"
-msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:51
-#. i18n: ectx: ToolBar (browserToolBar)
-#. i18n: file: src/akregator_part.rc:94
-#. i18n: ectx: ToolBar (browserToolBar)
-#: rc.cpp:503 rc.cpp:530
-msgid "Browser Toolbar"
-msgstr ""
-
-#. i18n: file: src/akregator_shell.rc:54
-#. i18n: ectx: ToolBar (textToSpeechToolBar)
-#. i18n: file: src/akregator_part.rc:102
-#. i18n: ectx: ToolBar (textToSpeechToolBar)
-#: rc.cpp:506 rc.cpp:533
-msgid "Speech Toolbar"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/amarok.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/amarok.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/amarok.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/amarok.po	2012-04-18 08:59:22.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeextragear-1/amarok.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-01 17:57+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2011-09-03 02:42+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,1865 +11,2002 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:27+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: toolbar/VolumePopupButton.cpp:107 toolbar/VolumePopupButton.cpp:118
-#: widgets/Osd.cpp:171
-msgid "(muted)"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, FormatSelectionDialog)
+#: MainWindow.cpp:103 rc.cpp:542 main.cpp:43
+msgid "Amarok"
+msgstr "Amarok"
+
+#: MainWindow.cpp:261
+msgid "Local Music"
 msgstr ""
 
-#: toolbar/VolumePopupButton.cpp:107 toolbar/VolumePopupButton.cpp:118
-#: widgets/Osd.cpp:171
-#, kde-format
-msgid "Volume: %1% %2"
+#: MainWindow.cpp:263
+msgid "Local sources of content"
 msgstr ""
 
-#: toolbar/MainToolbar.cpp:82
-msgid "Main Toolbar"
+#: MainWindow.cpp:271
+msgid "Internet"
 msgstr ""
 
-#: toolbar/MainToolbar.cpp:88
-msgid "Rediscover Your Music"
+#: MainWindow.cpp:273
+msgid "Online sources of content"
 msgstr ""
 
-#: toolbar/SlimToolbar.cpp:36
-msgid "Slim Toolbar"
+#: MainWindow.cpp:279
+msgid "Playlists"
 msgstr ""
 
-#: playlistgenerator/Preset.cpp:42 playlistgenerator/Preset.cpp:55
-msgid "New playlist preset"
+#: MainWindow.cpp:281
+msgid "Various types of playlists"
 msgstr ""
 
-#: playlistgenerator/Preset.cpp:45 playlistgenerator/Preset.cpp:67
-msgid "Unnamed playlist preset"
+#: MainWindow.cpp:287 amarokurls/NavigationUrlGenerator.cpp:135
+msgid "Files"
 msgstr ""
 
-#: playlistgenerator/Preset.cpp:129
-msgid "Generating a new playlist"
+#: MainWindow.cpp:289
+msgid "Browse local hard drive for content"
 msgstr ""
 
-#: playlistgenerator/Preset.cpp:153
-msgid ""
-"The playlist generator created a playlist which does not meet all of your "
-"constraints.  If you are not satisfied with the results, try loosening or "
-"removing some constraints and then generating a new playlist."
+#: MainWindow.cpp:350
+msgctxt "@item:inmenu"
+msgid "&View"
 msgstr ""
 
-#: playlistgenerator/ConstraintSolver.cpp:238
-msgid "The playlist generator failed to load any tracks from the collection."
+#: MainWindow.cpp:353
+msgid "Lock Layout"
 msgstr ""
 
-#: playlistgenerator/ConstraintSolver.cpp:244
+#: MainWindow.cpp:464
 msgid ""
-"There are no tracks that match all constraints. The playlist generator will "
-"find the tracks that match best, but you may want to consider loosening the "
-"constraints to find more tracks."
+"<qt>Closing the main window will keep Amarok running in the System Tray. Use "
+"<B>Quit</B> from the menu, or the Amarok tray icon to exit the "
+"application.</qt>"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:61
-msgid "Checkpoint"
+#: MainWindow.cpp:466
+msgid "Docking in System Tray"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:62
-msgid "Fixes a track, album, or artist to a certain position in the playlist"
+#: MainWindow.cpp:495
+msgid "Use relative path for &saving"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:178
-#, kde-format
-msgid "Checkpoint: %1"
+#: MainWindow.cpp:507 covermanager/CoverFoundDialog.cpp:361
+msgid "Save As"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:186
-#: playlistgenerator/constraints/Checkpoint.cpp:194
-#: playlistgenerator/constraints/Checkpoint.cpp:206
-msgid "unassigned"
+#: MainWindow.cpp:559
+msgid "Play Media (Files or URLs)"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:188
-#, kde-format
-msgid "\"%1\" (track) by %2"
+#: MainWindow.cpp:559
+msgid "Add Media (Files or URLs)"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:197
-#, kde-format
-msgid "\"%1\" (album) by %2"
+#: MainWindow.cpp:577
+msgid "Add Stream"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:199
-#, kde-format
-msgid "\"%1\" (album)"
+#: MainWindow.cpp:577
+msgid "Enter Stream URL:"
 msgstr ""
 
-#: playlistgenerator/constraints/Checkpoint.cpp:208
-#, kde-format
-msgid "\"%1\" (artist)"
+#: MainWindow.cpp:709
+msgid "&Add Media..."
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:86
-msgid "url"
+#: MainWindow.cpp:714
+msgctxt "clear playlist"
+msgid "&Clear Playlist"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:87
-msgid "title"
+#: MainWindow.cpp:719
+msgctxt "edit play queue of playlist"
+msgid "Edit &Queue"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:88
-msgid "artist name"
+#: MainWindow.cpp:724
+msgctxt "Remove duplicate and dead (unplayable) tracks from the playlist"
+msgid "Re&move Duplicates"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:89
-msgid "album name"
+#: MainWindow.cpp:731
+msgid "&Add Stream..."
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:90
-msgid "genre"
+#: MainWindow.cpp:735
+msgid "&Export Playlist As..."
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:91
-msgid "composer"
+#: MainWindow.cpp:739 amarokurls/NavigationUrlGenerator.cpp:250
+msgid "Bookmark Media Sources View"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:92
-msgid "year"
+#: MainWindow.cpp:743 amarokurls/BookmarkManager.cpp:43
+msgid "Bookmark Manager"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:93
-msgid "comment"
+#: MainWindow.cpp:747
+msgid "Equalizer"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:94
-msgid "track number"
+#: MainWindow.cpp:751 playlist/PlaylistViewUrlGenerator.cpp:101
+msgid "Bookmark Playlist Setup"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:95
-msgid "disc number"
+#: MainWindow.cpp:755
+msgid "Bookmark Context Applets"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:96
-msgid "length"
+#: MainWindow.cpp:759 covermanager/CoverManager.cpp:105
+msgid "Cover Manager"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:97
-msgid "added to collection"
+#: MainWindow.cpp:763
+msgid "Play Media..."
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:98
-msgid "score"
+#: MainWindow.cpp:768
+msgid "&Seek Forward"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:99
-msgid "rating"
+#: MainWindow.cpp:774
+msgid "&Seek Backward"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:100
-msgid "first played"
+#: MainWindow.cpp:781
+msgid "Update Collection"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:101
-msgid "last played"
+#: MainWindow.cpp:788
+msgid "Previous Track"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:102
-msgid "play count"
+#: MainWindow.cpp:795
+msgid "Restart current track"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatchSupport.cpp:103
-msgid "label"
+#: MainWindow.cpp:801
+msgid "Repopulate Playlist"
 msgstr ""
 
-#: playlistgenerator/constraints/PlaylistDuration.cpp:58
-msgid "Playlist Duration"
+#: MainWindow.cpp:807
+msgid "Disable Dynamic Playlist"
 msgstr ""
 
-#: playlistgenerator/constraints/PlaylistDuration.cpp:59
-msgid "Sets the preferred duration of the playlist"
+#: MainWindow.cpp:811
+msgid "Next Track"
 msgstr ""
 
-#: playlistgenerator/constraints/PlaylistDuration.cpp:125
-#, kde-format
-msgid "Playlist duration: %1 %2"
-msgstr ""
+#: MainWindow.cpp:816
+msgid "Increase Volume"
+msgstr "Cynyddu'r Lefel Sŵn"
 
-#: playlistgenerator/constraints/PlaylistDuration.cpp:268
-msgctxt "duration of playlist equals some time"
-msgid "equals"
+#: MainWindow.cpp:822
+msgid "Decrease Volume"
+msgstr "Lleihau'r Lefel Sŵn"
+
+#: MainWindow.cpp:828
+msgid "Toggle Main Window"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:49
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
-#: playlistgenerator/constraints/PlaylistDuration.cpp:270 rc.cpp:38
-msgid "longer than"
+#: MainWindow.cpp:833
+msgid "Toggle Full Screen"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:39
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
-#: playlistgenerator/constraints/PlaylistDuration.cpp:272 rc.cpp:32
-msgid "shorter than"
+#: MainWindow.cpp:838 playlist/ProgressiveSearchWidget.cpp:49
+msgid "Search playlist"
 msgstr ""
 
-#: playlistgenerator/constraints/PlaylistDuration.cpp:274
-#: playlistgenerator/constraints/TagMatch.cpp:477
-#: playlistgenerator/constraints/PlaylistLength.cpp:210
-#: widgets/MetaQueryWidget.cpp:890
-msgid "unknown comparison"
+#: MainWindow.cpp:843 browsers/collectionbrowser/CollectionWidget.cpp:176
+msgid "Search collection"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:57
-msgid "Match Tags"
+#: MainWindow.cpp:848
+msgid "Show active track"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:58
-msgid "Make all tracks in the playlist match the specified characteristic"
+#: MainWindow.cpp:852
+msgid "Show Notification Popup"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:184
-#, kde-format
-msgctxt ""
-"%1 = empty string or \"not\"; %2 = a metadata field, like \"title\" or "
-"\"artist name\"; %3 = a predicate, can be equals, starts with, ends with or "
-"contains; %4 = a string to match; Example: Match tag: not title contains "
-"\"foo\""
-msgid "Match tag:%1 %2 %3 %4"
+#: MainWindow.cpp:857
+msgid "Mute Volume"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:185
-msgid " not"
+#: MainWindow.cpp:862
+msgid "Last.fm: Love Current Track"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:188
-#, kde-format
-msgctxt "number of stars in the rating of a track"
-msgid "%1 star"
-msgid_plural "%1 stars"
-msgstr[0] ""
-msgstr[1] ""
+#: MainWindow.cpp:867
+msgid "Last.fm: Ban Current Track"
+msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:194
-#, kde-format
-msgctxt "an arbitrary string surrounded by quotes"
-msgid "\"%1\""
+#: MainWindow.cpp:872
+msgid "Last.fm: Skip Current Track"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:448
-#: widgets/MetaQueryWidget.cpp:879
-msgctxt "a numerical tag (like year or track number) equals a value"
-msgid "equals"
+#: MainWindow.cpp:877 playlist/view/PlaylistViewCommon.cpp:115
+msgid "Queue Track"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:123
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:477
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:614
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonRating)
-#: playlistgenerator/constraints/TagMatch.cpp:450 rc.cpp:163 rc.cpp:247
-#: rc.cpp:280 widgets/MetaQueryWidget.cpp:881
-msgid "greater than"
+#: MainWindow.cpp:882
+msgid "Rate Current Track: 1"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:113
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:467
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:604
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonRating)
-#: playlistgenerator/constraints/TagMatch.cpp:452
-#: playlistgenerator/constraints/PlaylistLength.cpp:208 rc.cpp:157 rc.cpp:241
-#: rc.cpp:274 widgets/MetaQueryWidget.cpp:877
-msgid "less than"
+#: MainWindow.cpp:887
+msgid "Rate Current Track: 2"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:233
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
-#: playlistgenerator/constraints/TagMatch.cpp:456 rc.cpp:187
-msgid "before"
+#: MainWindow.cpp:892
+msgid "Rate Current Track: 3"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:238
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
-#: playlistgenerator/constraints/TagMatch.cpp:458 rc.cpp:190
-msgid "on"
+#: MainWindow.cpp:897
+msgid "Rate Current Track: 4"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:243
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
-#: playlistgenerator/constraints/TagMatch.cpp:460 rc.cpp:193
-msgid "after"
+#: MainWindow.cpp:902
+msgid "Rate Current Track: 5"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:462
-msgid "within"
+#: MainWindow.cpp:908
+msgid "Network Request Viewer"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:466
-msgctxt "an alphabetical tag (like title or artist name) equals some string"
-msgid "equals"
+#: MainWindow.cpp:926
+msgid "&About Amarok"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:468
-msgctxt ""
-"an alphabetical tag (like title or artist name) starts with some string"
-msgid "starts with"
+#: MainWindow.cpp:930
+msgid "&Report Bug..."
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:470
-msgctxt ""
-"an alphabetical tag (like title or artist name) ends with some string"
-msgid "ends with"
+#: MainWindow.cpp:990
+msgid "&Music"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:472
-#: widgets/MetaQueryWidget.cpp:885
-msgctxt ""
-"an alphabetical tag (like title or artist name) contains some string"
-msgid "contains"
+#: MainWindow.cpp:992
+msgid "&Amarok"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:474
-msgid "regexp"
+#: MainWindow.cpp:1016 playlist/PlaylistDock.cpp:54
+#: playlist/PlaylistToolBar.cpp:39
+msgid "&Playlist"
+msgstr "Rhestr &chwarae:"
+
+#: MainWindow.cpp:1033
+msgid "&Tools"
 msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:490
-#, kde-format
-msgid "%1 day"
-msgid_plural "%1 days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlistgenerator/constraints/TagMatch.cpp:493
-#, kde-format
-msgid "%1 month"
-msgid_plural "%1 months"
-msgstr[0] ""
-msgstr[1] ""
+#: MainWindow.cpp:1050
+msgid "&Settings"
+msgstr ""
 
-#: playlistgenerator/constraints/TagMatch.cpp:496
+#: MainWindow.cpp:1097
 #, kde-format
-msgid "%1 year"
-msgid_plural "%1 years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlistgenerator/constraints/TagMatch.cpp:647
-#: playlistgenerator/constraints/TagMatch.cpp:864
-msgctxt "within the last %1 days"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlistgenerator/constraints/TagMatch.cpp:648
-#: playlistgenerator/constraints/TagMatch.cpp:865
-msgctxt "within the last %1 months"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlistgenerator/constraints/TagMatch.cpp:649
-#: playlistgenerator/constraints/TagMatch.cpp:866
-msgctxt "within the last %1 years"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlistgenerator/constraints/PlaylistLength.cpp:58
-msgid "Playlist Length"
+msgid ""
+"You have chosen to hide the menu bar.\n"
+"\n"
+"Please remember that you can always use the shortcut \"%1\" to bring it back."
 msgstr ""
 
-#: playlistgenerator/constraints/PlaylistLength.cpp:59
-msgid "Sets the preferred number of tracks in the playlist"
+#: MainWindow.cpp:1099
+msgid "Hide Menu"
 msgstr ""
 
-#: playlistgenerator/constraints/PlaylistLength.cpp:120
+#: MainWindow.cpp:1141
 #, kde-format
-msgctxt "%2 is e.g. 'more than' or 'less than' or 'equals'"
-msgid "Playlist length: %2 1 track"
-msgid_plural "Playlist length: %2 %1 tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlistgenerator/constraints/PlaylistLength.cpp:204
-msgctxt "number of tracks in playlist equals some number"
-msgid "equals"
+msgid "Paused  ::  %1"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:49
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
-#: playlistgenerator/constraints/PlaylistLength.cpp:206 rc.cpp:101
-msgid "more than"
+#: MainWindow.cpp:1154 core-impl/collections/audiocd/AudioCdCollection.cpp:444
+#: core-impl/collections/audiocd/AudioCdCollection.cpp:445
+#: core-impl/collections/audiocd/AudioCdCollection.cpp:446
+#: core-impl/collections/audiocd/AudioCdCollection.cpp:447
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:512
+#: amarokurls/BookmarkTreeView.cpp:377 amarokurls/BookmarkTreeView.cpp:378
+#: amarokurls/BookmarkTreeView.cpp:379 context/applets/albums/AlbumItem.cpp:97
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: MainWindow.cpp:1154
+#, kde-format
+msgid "%1 - %2  ::  %3"
 msgstr ""
 
-#: playlistgenerator/constraints/PreventDuplicates.cpp:53
-msgid "Prevent Duplicates"
+#: dialogs/DatabaseImporterDialog.cpp:39
+msgid "Import Collection"
 msgstr ""
 
-#: playlistgenerator/constraints/PreventDuplicates.cpp:54
+#: dialogs/DatabaseImporterDialog.cpp:44
 msgid ""
-"Prevents duplicate tracks, albums, or artists from appearing in the playlist"
+"This tool allows you to import track information and<br>statistical data "
+"from another music application.<br><br>Any statistical data in your database "
+"will be <i>overwritten</i>"
 msgstr ""
 
-#: playlistgenerator/constraints/PreventDuplicates.cpp:103
-msgid "Prevent duplicate tracks"
+#: dialogs/DatabaseImporterDialog.cpp:55
+msgid "Amarok collection scanner"
 msgstr ""
 
-#: playlistgenerator/constraints/PreventDuplicates.cpp:105
-msgid "Prevent duplicate artists"
+#: dialogs/DatabaseImporterDialog.cpp:56
+msgid "Amarok 1.4"
 msgstr ""
 
-#: playlistgenerator/constraints/PreventDuplicates.cpp:107
-msgid "Prevent duplicate albums"
+#: dialogs/DatabaseImporterDialog.cpp:57
+msgid "iTunes"
 msgstr ""
 
-#. i18n: file: aboutdialog/OcsPersonItem.ui:137
-#. i18n: ectx: property (text), widget (QLabel, m_textLabel)
-#. i18n: file: services/ampache/AmpacheConfigWidget.ui:53
-#. i18n: ectx: property (text), widget (QTableWidget, serverList)
-#. i18n: file: services/ampache/NewServerWidget.ui:17
-#. i18n: ectx: property (text), widget (QLabel, labelName)
-#. i18n: file: network/NetworkRequests.ui:89
-#. i18n: ectx: property (text), widget (QTreeWidget, requestDetails)
-#. i18n: file: network/NetworkRequests.ui:103
-#. i18n: ectx: property (text), widget (QTreeWidget, responseDetails)
-#: playlistgenerator/TreeModel.cpp:64 rc.cpp:1134 rc.cpp:1295 rc.cpp:1307
-#: rc.cpp:1941 rc.cpp:1947
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:437
-#: amarokurls/BookmarkModel.cpp:265
-msgid "Name"
-msgstr "Enw"
+#: dialogs/DatabaseImporterDialog.cpp:58
+msgid "Banshee"
+msgstr ""
 
-#: playlistgenerator/ConstraintGroup.cpp:87
-msgctxt "name of a type of constraint group"
-msgid "\"Match Any\" group"
+#: dialogs/DatabaseImporterDialog.cpp:59
+msgid "Rhythmbox"
 msgstr ""
 
-#: playlistgenerator/ConstraintGroup.cpp:89
-msgctxt "name of a type of constraint group"
-msgid "\"Match All\" group"
+#: dialogs/DatabaseImporterDialog.cpp:80
+msgid "Select Importer"
 msgstr ""
 
-#: playlistgenerator/ConstraintGroup.cpp:91
-msgctxt "name of a type of constraint group"
-msgid "Unknown match group"
+#: dialogs/DatabaseImporterDialog.cpp:85
+msgid "Configuration"
 msgstr ""
 
-#: playlistgenerator/PresetEditDialog.cpp:61
-msgid "Add new"
+#: dialogs/DatabaseImporterDialog.cpp:94
+msgid "Migrating"
 msgstr ""
 
-#: playlistgenerator/PresetEditDialog.cpp:62
-#: playlistgenerator/PresetEditDialog.cpp:64
-#: playlistgenerator/PresetEditDialog.cpp:92
-msgid "Constraint Group"
+#: dialogs/DatabaseImporterDialog.cpp:161
+msgid "<b><font color='red'>Failed:</font></b> No tracks were imported"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:126
-#. i18n: ectx: property (text), widget (QPushButton, removePushButton)
-#: playlistgenerator/PresetEditDialog.cpp:72 rc.cpp:2401
-msgid "Remove selected"
+#: dialogs/DatabaseImporterDialog.cpp:163
+#, kde-format
+msgid "<b><font color='green'>Success:</font></b> Imported %1 track"
+msgid_plural "<b><font color='green'>Success:</font></b> Imported %1 tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: dialogs/DatabaseImporterDialog.cpp:174
+msgid "<b><font color='red'>Failed:</font></b> Unable to import statistics"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:159 playlistgenerator/PresetModel.cpp:297
-msgid "Preset files (*.xml)"
+#: dialogs/DatabaseImporterDialog.cpp:189
+#, kde-format
+msgid "<b><font color='red'>Error:</font></b> %1"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:161
-msgid "Import preset"
+#: dialogs/DatabaseImporterDialog.cpp:204
+#, kde-format
+msgctxt "Track has been imported, format: Track"
+msgid "Imported <b>%1</b>"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:215
+#: dialogs/DatabaseImporterDialog.cpp:207
 #, kde-format
-msgid "Preset exported to %1"
+msgctxt "Track has been imported, format: Artist - Track"
+msgid "Imported <b>%1 - %2</b>"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:222
+#: dialogs/DatabaseImporterDialog.cpp:210
 #, kde-format
-msgid "Preset could not be exported to %1"
+msgctxt "Track has been imported, format: Artist - Track (Album)"
+msgid "Imported <b>%1 - %2 (%3)</b>"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:240
+#: dialogs/DatabaseImporterDialog.cpp:219
 #, kde-format
-msgid "Presets could not be imported from %1"
+msgctxt "Track has been discarded, format: Url"
+msgid "Discarded <b><font color='gray'>%1</font></b>"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:247
+#: dialogs/DatabaseImporterDialog.cpp:234
 #, kde-format
-msgid "%1 could not be opened for preset import"
+msgctxt "Track has been imported by tags, format: Track, from Url, to Url"
+msgid ""
+"Imported <b><font color='green'>%1</font></b><br/>&nbsp;&nbsp;from "
+"%2<br/>&nbsp;&nbsp;to %3"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:252
-msgid "Example 1: new tracks added this week"
+#: dialogs/DatabaseImporterDialog.cpp:237
+#, kde-format
+msgctxt ""
+"Track has been imported by tags, format: Artist - Track, from Url, to Url"
+msgid ""
+"Imported <b><font color='green'>%1 - %2</font></b><br/>&nbsp;&nbsp;from "
+"%3<br/>&nbsp;&nbsp;to %4"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:253
-msgid "Example 2: rock or pop music"
+#: dialogs/DatabaseImporterDialog.cpp:240
+#, kde-format
+msgctxt ""
+"Track has been imported by tags, format: Artist - Track (Album), from Url, "
+"to Url"
+msgid ""
+"Imported <b><font color='green'>%1 - %2 (%3)</font></b><br/>&nbsp;&nbsp;from "
+"%4<br/>&nbsp;&nbsp;to %5"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:254
-msgid "Example 3: about one hour of tracks from different artists"
+#: dialogs/DatabaseImporterDialog.cpp:252
+#, kde-format
+msgctxt "Track has been matched ambigously, format: Url"
+msgid ""
+"Multiple ambiguous matches found for <b><font color='red'>%1</font></b>, has "
+"been discarded."
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:255
-msgid "Example 4: like my favorite radio station"
+#: dialogs/deviceconfiguredialog.cpp:41
+#, kde-format
+msgid "Select Plugin for %1"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:256
-msgid "Example 5: an 80-minute CD of rock, metal, and industrial"
+#: dialogs/deviceconfiguredialog.cpp:47
+msgid "Configure Media Device"
 msgstr ""
 
-#: playlistgenerator/PresetModel.cpp:306
-#, kde-format
-msgid "Export \"%1\" preset"
+#: dialogs/deviceconfiguredialog.cpp:70
+msgid "Pre-&connect command:"
 msgstr ""
 
-#: statusbar/CompoundProgressBar.cpp:63 statusbar/CompoundProgressBar.cpp:186
-#: statusbar/ProgressBar.cpp:48
-msgid "Abort"
-msgstr "Erthylu"
+#: dialogs/deviceconfiguredialog.cpp:72
+#, c-format
+msgid "Example: mount %d"
+msgstr "Enghraifft: mowntio %d"
 
-#: statusbar/CompoundProgressBar.cpp:67 statusbar/CompoundProgressBar.cpp:198
-msgid "Multiple background tasks running (click to show)"
+#: dialogs/deviceconfiguredialog.cpp:74
+#, c-format
+msgid ""
+"Set a command to be run before connecting to your device (e.g. a mount "
+"command) here.\n"
+"%d is replaced by the device node, %m by the mount point.\n"
+"Empty commands are not executed."
 msgstr ""
 
-#: statusbar/CompoundProgressBar.cpp:68 statusbar/CompoundProgressBar.cpp:199
-msgid "Abort all background tasks"
+#: dialogs/deviceconfiguredialog.cpp:77
+msgid "Post-&disconnect command:"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, FormatSelectionDialog)
-#: main.cpp:40 MainWindow.cpp:103 rc.cpp:1110
-msgid "Amarok"
-msgstr "Amarok"
+#: dialogs/deviceconfiguredialog.cpp:80
+#, c-format
+msgid "Example: eject %d"
+msgstr "Enghraifft: allfwrw %d"
 
-#: main.cpp:41
-msgid "The audio player for KDE"
+#: dialogs/deviceconfiguredialog.cpp:81
+#, c-format
+msgid ""
+"Set a command to be run after disconnecting from your device (e.g. an eject "
+"command) here.\n"
+"%d is replaced by the device node, %m by the mount point.\n"
+"Empty commands are not executed."
 msgstr ""
 
-#: main.cpp:42
-msgid ""
-"(C) 2002-2003, Mark Kretschmann\n"
-"(C) 2003-2011, The Amarok Development Squad"
+#: dialogs/deviceconfiguredialog.cpp:85
+msgid "&Transcode before transferring to device"
 msgstr ""
 
-#: main.cpp:43
+#: dialogs/deviceconfiguredialog.cpp:92
 #, kde-format
-msgid ""
-"IRC:\n"
-"irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n"
-"\n"
-"Feedback:\n"
-"amarok@kde.org\n"
-"\n"
-"(Build Date: %1)"
+msgid "Transcode to preferred format (%1) for device"
 msgstr ""
 
-#: main.cpp:47
-msgid "Alejandro Wainzinger"
-msgstr ""
+#: dialogs/deviceconfiguredialog.cpp:94
+msgid "Whenever possible"
+msgstr "Pan yn bosib"
 
-#: main.cpp:48
-msgid "Developer (xevix)"
-msgstr ""
+#: dialogs/deviceconfiguredialog.cpp:97
+msgid "When necessary"
+msgstr "Pryd mae angen"
 
-#: main.cpp:49
-msgid "Bart 'Where are my toothpicks' Cerneels"
+#: dialogs/deviceconfiguredialog.cpp:104
+msgid "Remove transcoded files after transfer"
 msgstr ""
 
-#: main.cpp:50
-msgid "Developer (Stecchino)"
+#: dialogs/deviceconfiguredialog.cpp:112 dialogs/deviceconfiguredialog.cpp:113
+msgid "For this feature, a script of type \"Transcode\" has to be running"
 msgstr ""
 
-#: main.cpp:51
-msgid "Dan 'Hey, it compiled...' Meltzer"
-msgstr ""
+#: dialogs/FilenameLayoutDialog.cpp:54 dialogs/FilenameLayoutDialog.cpp:428
+#: services/jamendo/JamendoInfoParser.cpp:109
+#: context/applets/wikipedia/WikipediaApplet.cpp:624
+msgid "Track"
+msgstr "Trac"
 
-#: main.cpp:52
-msgid "Developer (hydrogen)"
-msgstr ""
+#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:86
+#. i18n: ectx: property (text), widget (QLabel, titleLabel)
+#: dialogs/FilenameLayoutDialog.cpp:58 dialogs/FilenameLayoutDialog.cpp:421
+#: browsers/playlistbrowser/PodcastModel.cpp:334
+#: core/meta/support/MetaConstants.cpp:172 rc.cpp:1071
+#: widgets/SmartPlaylistEditor.cpp:183 playlist/PlaylistModel.cpp:862
+#: musicbrainz/MusicBrainzTags.cpp:358
+msgid "Title"
+msgstr "Teitl"
 
-#: main.cpp:53
-msgid "Ian 'The Beard' Monroe"
-msgstr ""
+#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:73
+#. i18n: ectx: property (text), widget (QLabel, artistLabel)
+#: dialogs/FilenameLayoutDialog.cpp:62 dialogs/FilenameLayoutDialog.cpp:435
+#: dialogs/transferdialog.cpp:88 browsers/CollectionTreeItemModelBase.cpp:982
+#: services/magnatune/MagnatuneStore.cpp:218
+#: services/lastfm/LastFmService.cpp:507
+#: services/jamendo/JamendoInfoParser.cpp:51
+#: context/applets/wikipedia/WikipediaApplet.cpp:612 rc.cpp:1068
+#: widgets/SmartPlaylistEditor.cpp:183 widgets/SmartPlaylistEditor.cpp:197
+#: playlist/PlaylistModel.cpp:863 musicbrainz/MusicBrainzTags.cpp:359
+msgid "Artist"
+msgstr "Artist"
 
-#: main.cpp:54
-msgid "Developer (eean)"
-msgstr ""
+#: dialogs/FilenameLayoutDialog.cpp:66 dialogs/FilenameLayoutDialog.cpp:442
+#: browsers/CollectionTreeItemModelBase.cpp:984
+#: core/meta/support/MetaConstants.cpp:176 widgets/SmartPlaylistEditor.cpp:183
+#: widgets/SmartPlaylistEditor.cpp:197 playlist/PlaylistModel.cpp:865
+msgid "Composer"
+msgstr "Cyfansoddydd"
 
-#: main.cpp:55
-msgid "Jeff 'IROKSOHARD' Mitchell"
-msgstr ""
+#: dialogs/FilenameLayoutDialog.cpp:70 dialogs/FilenameLayoutDialog.cpp:449
+#: browsers/CollectionTreeItemModelBase.cpp:986
+#: core/meta/support/MetaConstants.cpp:177 widgets/SmartPlaylistEditor.cpp:184
+#: widgets/SmartPlaylistEditor.cpp:197 widgets/SmartPlaylistEditor.cpp:921
+#: playlist/PlaylistModel.cpp:866
+msgid "Year"
+msgstr "Blwyddyn"
 
-#: main.cpp:56
-msgid "Developer (jefferai)"
-msgstr ""
+#: dialogs/FilenameLayoutDialog.cpp:74 dialogs/FilenameLayoutDialog.cpp:463
+#: dialogs/transferdialog.cpp:89 browsers/CollectionTreeView.cpp:226
+#: browsers/CollectionTreeItemModelBase.cpp:981
+#: services/magnatune/MagnatuneStore.cpp:224
+#: services/jamendo/JamendoInfoParser.cpp:83
+#: context/applets/wikipedia/WikipediaApplet.cpp:618
+#: context/applets/albums/AlbumsView.cpp:255
+#: widgets/SmartPlaylistEditor.cpp:183 widgets/SmartPlaylistEditor.cpp:197
+#: playlist/view/PlaylistViewCommon.cpp:64 playlist/PlaylistModel.cpp:867
+#: musicbrainz/MusicBrainzTags.cpp:360
+msgid "Album"
+msgstr "Albwm"
 
-#: main.cpp:57 context/tools/amarokpkg.cpp:82
-msgid "Leo Franchi"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:1049
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#: dialogs/FilenameLayoutDialog.cpp:78 dialogs/FilenameLayoutDialog.cpp:456
+#: browsers/CollectionTreeItemModelBase.cpp:983 rc.cpp:191
+#: playlist/PlaylistModel.cpp:864 musicbrainz/MusicBrainzTags.cpp:361
+msgid "Album Artist"
 msgstr ""
 
-#: main.cpp:58
-msgid "Developer (lfranchi)"
-msgstr ""
+#: dialogs/FilenameLayoutDialog.cpp:82 dialogs/FilenameLayoutDialog.cpp:470
+#: core/meta/support/MetaConstants.cpp:178 widgets/SmartPlaylistEditor.cpp:184
+#: playlist/PlaylistModel.cpp:872
+msgid "Comment"
+msgstr "Sylwad"
 
-#: main.cpp:59
-msgid "Lydia 'is wrong(TM)' Pintscher"
+#: dialogs/FilenameLayoutDialog.cpp:86 dialogs/FilenameLayoutDialog.cpp:477
+#: dialogs/transferdialog.cpp:90 browsers/CollectionTreeItemModelBase.cpp:985
+#: core/meta/support/MetaConstants.cpp:175 widgets/SmartPlaylistEditor.cpp:183
+#: widgets/SmartPlaylistEditor.cpp:197 playlist/PlaylistModel.cpp:871
+#: playlist/ProgressiveSearchWidget.cpp:95
+msgid "Genre"
 msgstr ""
 
-#: main.cpp:60
-msgid "Release Vixen (Nightrose)"
+#: dialogs/FilenameLayoutDialog.cpp:240 dialogs/FilenameLayoutDialog.cpp:245
+#: dialogs/FilenameLayoutDialog.cpp:250 dialogs/FilenameLayoutDialog.cpp:255
+#: dialogs/FilenameLayoutDialog.cpp:260 dialogs/FilenameLayoutDialog.cpp:265
+#: dialogs/FilenameLayoutDialog.cpp:270 dialogs/FilenameLayoutDialog.cpp:275
+#: dialogs/FilenameLayoutDialog.cpp:280
+msgctxt ""
+"Text to represent an empty tag. Braces (<>) are only to clarify emptiness."
+msgid "&lt;empty&gt;"
 msgstr ""
 
-#: main.cpp:61
-msgid "Mark 'It's good, but it's not irssi' Kretschmann"
+#: dialogs/FilenameLayoutDialog.cpp:361
+msgid "&Basic..."
 msgstr ""
 
-#: main.cpp:62
-msgid "Project founder (markey)"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:269
+#. i18n: ectx: property (text), widget (KPushButton, kpbAdvanced)
+#: dialogs/FilenameLayoutDialog.cpp:371 rc.cpp:17
+msgid "&Advanced..."
 msgstr ""
 
-#: main.cpp:63
-msgid "Maximilian Kossick"
+#: dialogs/FilenameLayoutDialog.cpp:484 dialogs/FilenameLayoutDialog.cpp:643
+msgid "File type"
 msgstr ""
 
-#: main.cpp:64
-msgid "Developer (maxx_k)"
+#: dialogs/FilenameLayoutDialog.cpp:489 dialogs/FilenameLayoutDialog.cpp:704
+msgid "Ignore"
 msgstr ""
 
-#: main.cpp:65
-msgid "Nikolaj Hald 'Also very hot' Nielsen"
-msgstr ""
+#: dialogs/FilenameLayoutDialog.cpp:494
+msgid "Folder"
+msgstr "Plygell"
 
-#: main.cpp:66
-msgid "Developer (nhn)"
+#: dialogs/FilenameLayoutDialog.cpp:499 dialogs/FilenameLayoutDialog.cpp:642
+msgctxt "Artist's Initial"
+msgid "Initial"
 msgstr ""
 
-#: main.cpp:67
-msgid "Rick W. Chen"
+#: dialogs/FilenameLayoutDialog.cpp:504 dialogs/FilenameLayoutDialog.cpp:645
+msgid "Disc number"
 msgstr ""
 
-#: main.cpp:68
-msgid "Developer (stuffcorpse)"
+#: dialogs/FilenameLayoutDialog.cpp:568
+msgid "Collection root"
 msgstr ""
 
-#: main.cpp:69
-msgid "Seb 'Surfin' down under' Ruiz"
+#: dialogs/FilenameLayoutDialog.cpp:626
+msgid "File Type"
 msgstr ""
 
-#: main.cpp:70
-msgid "Developer (sebr)"
+#: dialogs/FilenameLayoutDialog.cpp:648
+#, no-c-format
+msgctxt ""
+"Please do not translate the %foo% words as they define a syntax used "
+"internally by a parser to describe a filename."
+msgid ""
+"The following tokens can be used to define a filename scheme:                "
+"           <br>%track%, %title%, %artist%, %composer%, %year%, %album%, "
+"%albumartist%, %comment%, %genre%, %initial%, %folder%, %filetype%, "
+"%discnumber%."
 msgstr ""
 
-#: main.cpp:71
-msgid "Téo Mrnjavac"
+#: dialogs/FilenameLayoutDialog.cpp:707
+#, kde-format, no-c-format
+msgctxt ""
+"Please do not translate the %foo% words as they define a syntax used "
+"internally by a parser to describe a filename."
+msgid ""
+"The following tokens can be used to define a filename scheme:<br>            "
+"               <font color=\"%1\">%track%</font>, <font "
+"color=\"%2\">%title%</font>,                           <font "
+"color=\"%3\">%artist%</font>, <font color=\"%4\">%composer%</font>,          "
+"                 <font color=\"%5\">%year%</font>, <font "
+"color=\"%6\">%album%</font>,                           <font "
+"color=\"%7\">%albumartist%</font>, <font color=\"%8\">%comment%</font>,      "
+"                     <font color=\"%9\">%genre%</font>, %ignore%."
 msgstr ""
 
-#: main.cpp:72
-msgid "Developer (Teo`)"
+#: dialogs/FilenameLayoutDialog.cpp:786
+msgid "New Format Preset"
 msgstr ""
 
-#: main.cpp:90
-msgid "Alex Merry"
+#: dialogs/FilenameLayoutDialog.cpp:786
+msgid "Preset Name"
 msgstr ""
 
-#: main.cpp:90
-msgid "Developer, Replay Gain support"
+#: dialogs/FilenameLayoutDialog.cpp:786
+msgid "New Preset"
 msgstr ""
 
-#: main.cpp:92
-msgid "Casey Link"
+#: dialogs/MusicBrainzTagger.cpp:67
+msgid "Expand All"
 msgstr ""
 
-#: main.cpp:92
-msgid "MP3tunes integration"
+#: dialogs/MusicBrainzTagger.cpp:68
+msgid "Collapse All"
 msgstr ""
 
-#: main.cpp:94
-msgid "Casper van Donderen"
+#: dialogs/MusicBrainzTagger.cpp:69
+msgid "Expand Unchosen"
 msgstr ""
 
-#: main.cpp:94
-msgid "Windows porting"
+#: dialogs/MusicBrainzTagger.cpp:70
+msgid "Collapse Chosen"
 msgstr ""
 
-#: main.cpp:96
-msgid "Christie Harris"
+#: dialogs/transferdialog.cpp:47
+msgid "Transfer Queue to Device"
 msgstr ""
 
-#: main.cpp:96
-msgid "Rokymoter (dangle)"
+#: dialogs/transferdialog.cpp:54
+msgid "Music Location"
 msgstr ""
 
-#: main.cpp:98
-msgid "Dan Leinir Turthra Jensen"
+#: dialogs/transferdialog.cpp:58
+#, kde-format
+msgid ""
+"Your music will be transferred to:\n"
+"%1"
 msgstr ""
 
-#: main.cpp:98
-msgid "Usability"
+#: dialogs/transferdialog.cpp:67
+msgid ""
+"You can have your music automatically grouped in\n"
+"a variety of ways. Each grouping will create\n"
+"directories based upon the specified criteria.\n"
 msgstr ""
 
-#: main.cpp:100
-msgid "Daniel Caleb Jones"
+#: dialogs/transferdialog.cpp:71
+msgid "Groupings"
 msgstr ""
 
-#: main.cpp:100
-msgid "Biased playlists"
+#: dialogs/transferdialog.cpp:74
+msgid "Select first grouping:\n"
 msgstr ""
 
-#: main.cpp:102
-msgid "Daniel Dewald"
+#: dialogs/transferdialog.cpp:76
+msgid "Select second grouping:\n"
 msgstr ""
 
-#: main.cpp:102
-msgid "Tag Guesser, Labels"
+#: dialogs/transferdialog.cpp:78
+msgid "Select third grouping:\n"
 msgstr ""
 
-#: main.cpp:104
-msgid "Daniel Winter"
-msgstr ""
+#: dialogs/transferdialog.cpp:87
+#: browsers/collectionbrowser/CollectionWidget.cpp:223
+#: playlist/navigators/NavigatorConfigAction.cpp:80
+msgid "None"
+msgstr "Dim"
 
-#: main.cpp:104
-msgid "Nepomuk integration"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:633
+#. i18n: ectx: property (title), widget (KButtonGroup, optionsFrame)
+#: dialogs/transferdialog.cpp:111 rc.cpp:110
+msgid "Options"
 msgstr ""
 
-#: main.cpp:106
-msgid "Edward \"Hades\" Toroshchin"
+#: dialogs/transferdialog.cpp:115
+msgid "Convert spaces to underscores"
 msgstr ""
 
-#: main.cpp:106 main.cpp:155 main.cpp:157 main.cpp:171 main.cpp:181
-#: main.cpp:187 main.cpp:189 main.cpp:201 main.cpp:207 main.cpp:209
-#: main.cpp:213 main.cpp:221 context/tools/amarokpkg.cpp:83
-msgid "Developer"
-msgstr ""
+#: dialogs/TrackOrganizer.cpp:48 core-impl/collections/db/sql/SqlMeta.cpp:420
+#: core-impl/collections/db/ScanResultProcessor.cpp:270
+#: browsers/CollectionTreeItemModelBase.cpp:316 core/support/Amarok.cpp:213
+#: covermanager/CoverManager.cpp:841 widgets/AlbumBreadcrumbWidget.cpp:60
+msgid "Various Artists"
+msgstr "Artistiaid Amrywiol"
 
-#: main.cpp:108
-msgid "Frank Meerkötter"
+#: dialogs/TrackOrganizer.cpp:105
+msgid "Unknown album"
 msgstr ""
 
-#: main.cpp:108 main.cpp:127
-msgid "Podcast improvements"
+#: dialogs/TrackOrganizer.cpp:106
+msgid "Unknown artist"
 msgstr ""
 
-#: main.cpp:111
-msgid "Greg Meyer"
+#: dialogs/TrackOrganizer.cpp:110
+msgid "No comments"
 msgstr ""
 
-#: main.cpp:111
-msgid "Live CD, Bug squashing (oggb4mp3)"
+#: dialogs/TrackOrganizer.cpp:111
+msgid "Unknown composer"
 msgstr ""
 
-#: main.cpp:113
-msgid "Harald Sitter"
+#: dialogs/TrackOrganizer.cpp:112
+msgid "Unknown disc number"
 msgstr ""
 
-#: main.cpp:113
-msgid "Rokymoter (apachelogger)"
+#: dialogs/TrackOrganizer.cpp:113
+msgid "Unknown genre"
 msgstr ""
 
-#: main.cpp:115
-msgid "John Atkinson"
+#: dialogs/TrackOrganizer.cpp:114
+msgid "Unknown title"
 msgstr ""
 
-#: main.cpp:117
-msgid "Kenneth Wesley Wimer II"
+#: dialogs/TrackOrganizer.cpp:115
+msgid "Unknown year"
 msgstr ""
 
-#: main.cpp:117
-msgid "Icons"
-msgstr "Eiconau"
+#: dialogs/EqualizerDialog.cpp:44
+msgid "Configure Equalizer"
+msgstr ""
 
-#: main.cpp:119
-msgid "Kevin Funk"
+#: dialogs/EqualizerDialog.cpp:100
+msgid ""
+"Sorry, your current Phonon backend version does not provide equalizer "
+"support."
 msgstr ""
 
-#: main.cpp:119
-msgid "Developer, Website theme (KRF)"
+#: dialogs/EqualizerDialog.cpp:156 dialogs/EqualizerDialog.cpp:165
+msgid ""
+"%0\n"
+"dB"
 msgstr ""
 
-#: main.cpp:121
-msgid "Kuba Serafinowski"
+#: dialogs/EqualizerDialog.cpp:256
+msgctxt "Equalizer state, as in, disabled"
+msgid "Off"
 msgstr ""
 
-#: main.cpp:121 main.cpp:159
-msgid "Rokymoter"
+#: dialogs/EqualizerDialog.cpp:273
+msgid "Cannot delete this preset"
 msgstr ""
 
-#: main.cpp:123
-msgid "Lee Olson"
+#: dialogs/EqualizerDialog.cpp:274
+msgid "Default presets can not be deleted"
 msgstr ""
 
-#: main.cpp:123 main.cpp:137
-msgid "Artwork"
+#: dialogs/EqualizerDialog.cpp:275
+msgid "Error deleting preset"
 msgstr ""
 
-#: main.cpp:125
-msgid "Ljubomir Simin"
+#: dialogs/EqualizerDialog.cpp:298
+msgid "Cannot restore this preset"
 msgstr ""
 
-#: main.cpp:125
-msgid "Rokymoter (ljubomir)"
+#: dialogs/EqualizerDialog.cpp:299
+msgid "Only default presets can be restored"
 msgstr ""
 
-#: main.cpp:127
-msgid "Mathias Panzenböck"
+#: dialogs/EqualizerDialog.cpp:300
+msgid "Error restoring preset"
 msgstr ""
 
-#: main.cpp:129
-msgid "Max Howell"
+#: dialogs/EqualizerDialog.cpp:320
+msgid "Cannot save this preset"
 msgstr ""
 
-#: main.cpp:129
-msgid "Developer, Vision"
+#: dialogs/EqualizerDialog.cpp:321
+msgid ""
+"Preset 'Manual' is reserved for momentary settings.\n"
+"                                              Please choose different name "
+"and try again."
 msgstr ""
 
-#: main.cpp:131
-msgid "Mikko Caldara"
+#: dialogs/EqualizerDialog.cpp:323
+msgid "Error saving preset"
 msgstr ""
 
-#: main.cpp:131
-msgid "Bug triaging and sanitizing"
-msgstr ""
+#: dialogs/deletedialog.cpp:63
+#, kde-format
+msgid "<b>1</b> file selected."
+msgid_plural "<b>%1</b> files selected."
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.cpp:133
-msgid "Myriam Schweingruber"
+#: dialogs/deletedialog.cpp:69
+msgid ""
+"<qt>These items will be <b>permanently deleted</b> from your hard disk.</qt>"
 msgstr ""
 
-#: main.cpp:133
-msgid "Rokymoter, bug squashing (Mamarok)"
+#: dialogs/deletedialog.cpp:75
+msgid "<qt>These items will be moved to the Trash Bin.</qt>"
 msgstr ""
 
-#: main.cpp:135
-msgid "Nikhil Marathe"
+#: dialogs/deletedialog.cpp:87
+msgid "&Send to Trash"
 msgstr ""
 
-#: main.cpp:135
-msgid "UPnP support and patches (nsm)"
+#: dialogs/deletedialog.cpp:93
+msgid "About to delete selected files"
 msgstr ""
 
-#: main.cpp:137
-msgid "Nuno Pinheiro"
+#: dialogs/deletedialog.cpp:154
+msgid "Deleting files"
 msgstr ""
 
-#: main.cpp:139
-msgid "Olivier Bédard"
-msgstr ""
+#: dialogs/OrganizeCollectionDialog.cpp:142
+#: dialogs/OrganizeCollectionDialog.cpp:145
+#, kde-format
+msgid "%1 or %2"
+msgstr "%1 neu %2"
 
-#: main.cpp:139
-msgid "Website hosting"
+#: dialogs/OrganizeCollectionDialog.cpp:146
+msgid "Artist's Initial"
 msgstr ""
 
-#: main.cpp:141
-msgid "Pasi Lalinaho"
+#: dialogs/OrganizeCollectionDialog.cpp:147
+msgid "File Extension of Source"
 msgstr ""
 
-#: main.cpp:141
-msgid "Rokymoter (emunkki)"
-msgstr ""
+#: dialogs/OrganizeCollectionDialog.cpp:148
+#: core/meta/support/MetaConstants.cpp:179
+msgid "Track Number"
+msgstr "Rhif Trac"
 
-#: main.cpp:143
-msgid "Peter Zhou Lei"
+#: dialogs/OrganizeCollectionDialog.cpp:150
+msgid "<h3>Custom Format String</h3>"
 msgstr ""
 
-#: main.cpp:143
-msgid "Scripting interface"
-msgstr ""
+#: dialogs/OrganizeCollectionDialog.cpp:151
+msgid "You can use the following tokens:"
+msgstr "Gallwch ddefnyddio'r tocynnau canlynol:"
 
-#: main.cpp:145
-msgid "Scott Wheeler"
+#: dialogs/OrganizeCollectionDialog.cpp:158
+msgid ""
+"If you surround sections of text that contain a token with curly-braces, "
+"that section will be hidden if the token is empty."
 msgstr ""
 
-#: main.cpp:145
-msgid "TagLib & ktrm code"
+#: dialogs/OrganizeCollectionDialog.cpp:278
+msgid "There is a filename conflict, existing files will be overwritten."
 msgstr ""
 
-#: main.cpp:147
-msgid "Shane King"
+#: dialogs/OrganizeCollectionDialog.cpp:280
+msgid "There is a filename conflict, existing files will not be changed."
 msgstr ""
 
-#: main.cpp:147
-msgid "Patches & Windows porting (shakes)"
+#: dialogs/CollectionSetup.cpp:78
+#, kde-format
+msgid "Rescan '%1'"
 msgstr ""
 
-#: main.cpp:149
-msgid "Simon Esneault"
+#: dialogs/CollectionSetup.cpp:107
+msgid ""
+"These folders will be scanned for media to make up your collection. You can "
+"right-click on a folder to individually rescan it, if it was previously "
+"selected:"
 msgstr ""
 
-#: main.cpp:149
-msgid "Photos & Videos applets, Context View"
+#: dialogs/CollectionSetup.cpp:124
+msgid "Full rescan"
 msgstr ""
 
-#: main.cpp:151
-msgid "Soren Harward"
+#: dialogs/CollectionSetup.cpp:125
+msgid ""
+"Rescan your entire collection. This will <i>not</i> delete any statistics."
 msgstr ""
 
-#: main.cpp:151
-msgid "Developer, Automated Playlist Generator"
+#: dialogs/CollectionSetup.cpp:128
+msgid "Import"
 msgstr ""
 
-#: main.cpp:153
-msgid "Sven Krohlas"
+#: dialogs/CollectionSetup.cpp:129
+msgid ""
+"Import collection and/or statistics from older Amarok versions, the batch "
+"scanner or media players."
 msgstr ""
 
-#: main.cpp:153
-msgid "Rokymoter, Developer (sven423)"
+#: dialogs/CollectionSetup.cpp:132
+msgid "&Scan folders recursively (requires full rescan if newly checked)"
 msgstr ""
 
-#: main.cpp:155
-msgid "Thomas Lübking"
+#: dialogs/CollectionSetup.cpp:133
+msgid "&Watch folders for changes"
 msgstr ""
 
-#: main.cpp:157
-msgid "Valentin Rouet"
+#: dialogs/CollectionSetup.cpp:134
+msgid "Write metadata to file"
 msgstr ""
 
-#: main.cpp:159
-msgid "Valorie Zimmerman"
+#: dialogs/CollectionSetup.cpp:135
+msgid "Write statistics to file"
 msgstr ""
 
-#: main.cpp:161
-msgid "Wade Olson"
+#: dialogs/CollectionSetup.cpp:136
+msgid "Write covers to file"
 msgstr ""
 
-#: main.cpp:161
-msgid "Splash screen artist"
+#: dialogs/CollectionSetup.cpp:137
+msgid "&Enable character set detection in ID3 tags"
 msgstr ""
 
-#: main.cpp:163
-msgid "William Viana Soares"
+#: dialogs/CollectionSetup.cpp:145
+msgid "If selected, Amarok will read all subfolders."
 msgstr ""
 
-#: main.cpp:163
-msgid "Context view"
+#: dialogs/CollectionSetup.cpp:146
+msgid ""
+"If selected, the collection folders will be watched for changes.\n"
+"The watcher will not notice changes behind symbolic links."
 msgstr ""
 
-#: main.cpp:165
-msgid "Former contributors"
+#: dialogs/CollectionSetup.cpp:147
+msgid ""
+"Write meta data changes (including 'stars' rating) back to the original "
+"file.\n"
+"You can also prevent writing back by write protecting the file.\n"
+"This might be a good idea if you are currently\n"
+"sharing those files via the Internet."
 msgstr ""
 
-#: main.cpp:165
+#: dialogs/CollectionSetup.cpp:148
 msgid ""
-"People listed below have contributed to Amarok in the past. Thank you!"
+"Write play-changing statistics (e.g. score, lastplayed, playcount)\n"
+"as tags back to the file."
 msgstr ""
 
-#: main.cpp:167
-msgid "Adam Pigg"
+#: dialogs/CollectionSetup.cpp:149
+msgid ""
+"Write changed covers back to the file.\n"
+"This will replace existing embedded covers."
 msgstr ""
 
-#: main.cpp:167
-msgid "Analyzers, patches, shoutcast"
+#: dialogs/CollectionSetup.cpp:150
+msgid ""
+"If selected, Amarok will use Mozilla's\n"
+"Character Set Detector to attempt to automatically guess the\n"
+"character sets used in ID3 tags."
 msgstr ""
 
-#: main.cpp:169
-msgid "Adeodato Simó"
+#. i18n: file: dialogs/EditFilterDialog.ui:172
+#. i18n: ectx: property (text), item, widget (QComboBox, cbAndOr)
+#: dialogs/EditFilterDialog.cpp:39 rc.cpp:495
+msgid "AND"
 msgstr ""
 
-#: main.cpp:169 main.cpp:177
-msgid "Patches"
-msgstr "Ysbeidiau"
-
-#: main.cpp:171
-msgid "Alexandre Oliveira"
+#. i18n: file: dialogs/EditFilterDialog.ui:177
+#. i18n: ectx: property (text), item, widget (QComboBox, cbAndOr)
+#: dialogs/EditFilterDialog.cpp:40 rc.cpp:498
+msgid "OR"
 msgstr ""
 
-#: main.cpp:173
-msgid "Andreas Mair"
+#: dialogs/EditFilterDialog.cpp:41
+msgid "Simple text"
 msgstr ""
 
-#: main.cpp:173
-msgid "MySQL support"
+#: dialogs/EditFilterDialog.cpp:49
+msgid "Edit Filter"
 msgstr ""
 
-#: main.cpp:175
-msgid "Andrew de Quincey"
+#: dialogs/TagDialog.cpp:420
+msgid "Filename Layout Chooser"
 msgstr ""
 
-#: main.cpp:175
-msgid "Postgresql support"
-msgstr ""
+#: dialogs/TagDialog.cpp:510 browsers/playlistbrowser/PodcastModel.cpp:335
+msgid "Summary"
+msgstr "Crynodeb"
 
-#: main.cpp:177
-msgid "Andrew Turner"
+#: dialogs/TagDialog.cpp:511
+msgid "Tags"
 msgstr ""
 
-#: main.cpp:179
-msgid "Andy Kelk"
-msgstr ""
+#: dialogs/TagDialog.cpp:512 context/applets/lyrics/LyricsApplet.cpp:440
+#: context/applets/lyrics/LyricsApplet.cpp:567
+#: configdialog/dialogs/ScriptsConfig.cpp:54
+msgid "Lyrics"
+msgstr "Lyrics"
 
-#: main.cpp:179
-msgid "MTP and Rio Karma media devices, patches"
+#: dialogs/TagDialog.cpp:513 context/applets/labels/LabelsApplet.cpp:92
+#: context/applets/labels/LabelsApplet.cpp:184
+msgid "Labels"
 msgstr ""
 
-#: main.cpp:181
-msgid "Christian Muehlhaeuser"
+#: dialogs/TagDialog.cpp:667 dialogs/TagDialog.cpp:675
+msgctxt "The value for this tag is not known"
+msgid "Unknown"
 msgstr ""
 
-#: main.cpp:183
-msgid "Derek Nelson"
+#: dialogs/TagDialog.cpp:712
+#, kde-format
+msgid "Track Details: %1 by %2"
 msgstr ""
 
-#: main.cpp:183
-msgid "Graphics, splash-screen"
-msgstr ""
+#: dialogs/TagDialog.cpp:718
+#, kde-format
+msgctxt "The amount of tracks being edited"
+msgid "1 Track"
+msgid_plural "Information for %1 Tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.cpp:185
-msgid "Enrico Ros"
+#: dialogs/TagDialog.cpp:747 dialogs/TagDialog.cpp:757
+#, kde-format
+msgid "<b>%1</b> by <b>%2</b>"
 msgstr ""
 
-#: main.cpp:185
-msgid "Analyzers, Context Browser and systray eye-candy"
+#: dialogs/TagDialog.cpp:749 dialogs/TagDialog.cpp:759
+#, kde-format
+msgid "<b>%1</b>"
 msgstr ""
 
-#: main.cpp:187
-msgid "Frederik Holljen"
+#: dialogs/TagDialog.cpp:755
+#, kde-format
+msgid "<b>%1</b> by <b>%2</b> on <b>%3</b>"
 msgstr ""
 
-#: main.cpp:189
-msgid "Gábor Lehel"
+#: dialogs/TagDialog.cpp:765
+#, kde-format
+msgid "Editing 1 file"
+msgid_plural "Editing %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: dialogs/TagDialog.cpp:797
+msgctxt "When this track first played"
+msgid "Never"
 msgstr ""
 
-#: main.cpp:191
-msgid "Gérard Dürrmeyer"
+#: dialogs/TagDialog.cpp:802
+msgctxt "When this track was last played"
+msgid "Never"
 msgstr ""
 
-#: main.cpp:191
-msgid "Icons and image work"
+#: dialogs/TagDialog.cpp:806
+msgctxt "The collection this track is part of"
+msgid "None"
 msgstr ""
 
-#: main.cpp:193
-msgid "Giovanni Venturi"
+#: dialogs/TagDialog.cpp:1328
+msgid ""
+"Writing to file failed. Please check permissions and available disc space."
 msgstr ""
 
-#: main.cpp:193
-msgid "Dialog to filter the collection titles"
+#. i18n: file: dialogs/MusicBrainzTagger.ui:12
+#. i18n: ectx: property (windowTitle), widget (QWidget, MusicBrainzTagger)
+#: dialogs/TagDialog.cpp:1386 rc.cpp:527
+msgid "MusicBrainz Tagger"
 msgstr ""
 
-#: main.cpp:195
-msgid "Jarkko Lehti"
+#: dialogs/ScriptSelector.cpp:30 configdialog/dialogs/ScriptSelector.cpp:31
+msgid "Search Scripts"
 msgstr ""
 
-#: main.cpp:195
-msgid "Tester, IRC channel operator, whipping"
+#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:78
+#, kde-format
+msgid "Cannot read playlist (%1)."
 msgstr ""
 
-#: main.cpp:197
-msgid "Jocke Andersson"
+#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:97
+msgid "Could not create a temporary file to download playlist."
 msgstr ""
 
-#: main.cpp:197
-msgid "Rokymoter, bug fixer (Firetech)"
+#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:113
+msgid "Downloading remote playlist"
 msgstr ""
 
-#: main.cpp:199
-msgid "Marco Gulino"
+#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:189
+msgid "The used file extension is not valid for playlists."
 msgstr ""
 
-#: main.cpp:199
-msgid "Konqueror Sidebar, some DCOP methods"
+#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:190
+msgid "Unknown playlist format"
 msgstr ""
 
-#: main.cpp:201
-msgid "Martin Aumueller"
+#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:216
+#, kde-format
+msgid "Playlist_%1"
 msgstr ""
 
-#: main.cpp:203
-msgid "Melchior Franz"
+#: core-impl/playlists/types/dynamic/DynamicPlaylist.cpp:36
+msgid "Default Dynamic Playlist"
 msgstr ""
 
-#: main.cpp:203
-msgid "FHT routine, bugfixes"
+#: core-impl/meta/default/DefaultMetaTypes.h:39
+#: core-impl/meta/default/DefaultMetaTypes.h:75
+#: core-impl/meta/default/DefaultMetaTypes.h:92
+#: services/scriptable/ScriptableServiceMeta_p.h:103
+#: services/scriptable/ScriptableServiceMeta_p.h:161
+#: services/scriptable/ScriptableServiceMeta_p.h:210
+#: services/scriptable/ScriptableServiceMeta_p.h:253
+#: services/scriptable/ScriptableServiceMeta_p.h:295
+msgctxt "The value is not known"
+msgid "Unknown"
 msgstr ""
 
-#: main.cpp:205
-msgid "Michael Pyne"
+#: core-impl/meta/default/DefaultMetaTypes.h:58
+msgctxt "The Value is not known"
+msgid "Unknown"
 msgstr ""
 
-#: main.cpp:205
-msgid "K3b export code"
+#: core-impl/meta/stream/Stream.cpp:54
+#, kde-format
+msgid "Stream (%1)"
 msgstr ""
 
-#: main.cpp:207
-msgid "Mike Diehl"
+#: core-impl/collections/daap/DaapCollection.cpp:104
+#, kde-format
+msgid "Loading remote collection from host %1"
 msgstr ""
 
-#: main.cpp:209
-msgid "Paul Cifarelli"
+#: core-impl/collections/daap/DaapCollection.cpp:274
+#, kde-format
+msgid "Music share at %1"
 msgstr ""
 
-#: main.cpp:211
-msgid "Peter C. Ndikuwera"
+#: core-impl/collections/audiocd/handler/AudioCdHandler.cpp:37
+msgid "Audio CD"
 msgstr ""
 
-#: main.cpp:211
-msgid "Bugfixes, PostgreSQL support"
+#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:62
+msgid ""
+"Ogg Vorbis is a fully free and unencumbered compressed audio format that is "
+"perfect for storing your compressed music on your computer. The sound "
+"quality is slightly better than Mp3 at the same bitrate. Note that not all "
+"mobile players support the Ogg Vorbis format."
 msgstr ""
 
-#: main.cpp:213
-msgid "Pierpaolo Panfilo"
+#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:68
+msgid ""
+"Flac is a lossless compressed audio format free of any patents or license "
+"fees. It maintains perfect CD audio quality while reducing file size by "
+"about 50%. Because the filesize is much larger than Ogg Vorbis or Mp3 it is "
+"not recommended if you want to transfer your music to a mobile player."
 msgstr ""
 
-#: main.cpp:215
-msgid "Reigo Reinmets"
+#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:74
+msgid ""
+"Wav is a basic, uncompressed audio file format. It takes up a lot of space "
+"but maintains perfect quality. It is generally not recommended unless you "
+"know what you are doing. If you want perfect quality, use Flac instead."
 msgstr ""
 
-#: main.cpp:215
-msgid "Wikipedia support, patches"
+#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:80
+msgid ""
+"Mp3 is the de facto standard in compressed audio compatible with almost all "
+"mobile players. It is however non free and generally not recommended."
 msgstr ""
 
-#: main.cpp:217
-msgid "Roman Becker"
+#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:113
+msgid "Audio CD settings - Amarok"
 msgstr ""
 
-#: main.cpp:217
-msgid "Former Amarok logo, former splash screen, former icons"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:318
+msgid "Copying Tracks Failed"
 msgstr ""
 
-#: main.cpp:219
-msgid "Sami Nieminen"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:322
+msgid "Tracks not copied: the device is already being copied to"
 msgstr ""
 
-#: main.cpp:219
-msgid "Audioscrobbler support"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:359
+#, kde-format
+msgid "Unsupported format: %1"
 msgstr ""
 
-#: main.cpp:221
-msgid "Stanislav Karchebny"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:402
+msgid "Already on device"
 msgstr ""
 
-#: main.cpp:223
-msgid "Stefan Bogner"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:418
+msgid "Tracks not copied: the device already has these tracks"
 msgstr ""
 
-#: main.cpp:223
-msgid "Loads of stuff"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:439
+msgid "Tracks not copied: the device has insufficient space"
 msgstr ""
 
-#: main.cpp:225
-msgid "Tomasz Dudzik"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:449
+msgid "Transferring Tracks to Device"
 msgstr ""
 
-#: main.cpp:225
-msgid "Splash screen"
-msgstr "Sgrin Croeso"
-
-#: main.cpp:229
-msgid "Benoît AlK Zugmeyer"
-msgstr ""
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:491
+#, kde-format
+msgid "%1 track failed to copy to the device"
+msgid_plural "%1 tracks failed to copy to the device"
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.cpp:230
-msgid "Dr. Tilmann Bubeck"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:593
+msgid "The track failed to copy to the device"
 msgstr ""
 
-#: main.cpp:231
-msgid "Edward Karavakis"
-msgstr ""
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:603
+msgid "Track not deleted:"
+msgid_plural "Tracks not deleted:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.cpp:232
-msgid "Hekkro"
-msgstr ""
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:604
+msgid "Deleting Track Failed"
+msgid_plural "Deleting Tracks Failed"
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.cpp:233
-msgid "Maik Keller"
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:608
+#, kde-format
+msgid "%1 tracks are already being deleted from the device."
 msgstr ""
 
-#: main.cpp:234
-msgid "Nathan Caza"
-msgstr ""
+#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:625
+msgid "Removing Track from Device"
+msgid_plural "Removing Tracks from Device"
+msgstr[0] ""
+msgstr[1] ""
 
-#: main.cpp:235
-msgid "Paul Erntges"
+#: core-impl/collections/mediadevicecollection/podcast/MediaDevicePodcastProvider.cpp:58
+#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:158
+#, kde-format
+msgctxt "Podcasts on a media device"
+msgid "Podcasts on %1"
 msgstr ""
 
-#: main.cpp:236
-msgid "Robert Štětka"
+#: core-impl/collections/mediadevicecollection/MediaDeviceCollection.cpp:249
+#: core-impl/collections/umscollection/UmsCollection.cpp:174
+msgid "&Disconnect Device"
 msgstr ""
 
-#: main.cpp:237
-msgid "Robert Tell"
+#: core-impl/collections/mediadevicecollection/MediaDeviceMeta.cpp:146
+msgid "Unknown Collection"
 msgstr ""
 
-#: main.cpp:238
-msgid "Ryan Rix"
+#: core-impl/collections/mediadevicecollection/MediaDeviceMeta.cpp:147
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:421
+#: core/meta/Meta.cpp:394 context/applets/currenttrack/CurrentTrack.h:38
+#: covermanager/CoverFetchUnit.cpp:596 covermanager/CoverFetchUnit.cpp:606
+msgid "Unknown Artist"
 msgstr ""
 
-#: main.cpp:239
-msgid "Thomas Kahle"
+#: core-impl/collections/mediadevicecollection/MediaDeviceMeta.cpp:149
+#: EngineController.cpp:1431
+msgid "Unknown track"
 msgstr ""
 
-#: main.cpp:240
-msgid "Valentin V. Bartenev"
+#: core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.h:42
+msgid "Media Device playlists"
 msgstr ""
 
-#: EngineController.cpp:271
-msgid ""
-"<p>Phonon claims it <b>cannot</b> play MP3 files. You may want to examine "
-"the installation of the backend that phonon uses.</p><p>You may find useful "
-"information in the <i>FAQ</i> section of the <i>Amarok Handbook</i>.</p>"
+#: core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.cpp:115
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:148
+#: playlistmanager/file/PlaylistFileProvider.cpp:481
+#: playlistmanager/PlaylistManager.cpp:384
+msgid "Change playlist"
 msgstr ""
 
-#: EngineController.cpp:292
-msgid "Install MP3 Support"
+#: core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.cpp:116
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:149
+#: playlistmanager/file/PlaylistFileProvider.cpp:482
+#: playlistmanager/PlaylistManager.cpp:385
+msgid "Enter new name for playlist:"
 msgstr ""
 
-#: EngineController.cpp:294
-msgid ""
-"Amarok currently cannot play MP3 files. Do you want to install support for "
-"MP3?"
+#: core-impl/collections/proxycollection/ProxyCollection.cpp:53
+msgid "Proxy Collection"
 msgstr ""
 
-#: EngineController.cpp:295
-msgid "No MP3 Support"
+#: core-impl/collections/db/ScanManager.cpp:134
+msgid "Database import requested"
 msgstr ""
 
-#: EngineController.cpp:872
-msgid "Preamp"
+#: core-impl/collections/db/ScanManager.cpp:264
+msgid ""
+"<p>The version of the 'amarokcollectionscanner' tool\n"
+"does not match your Amarok version.</p><p>Please note that Collection "
+"Scanning may not work correctly.</p>"
 msgstr ""
 
-#: EngineController.cpp:878
+#: core-impl/collections/db/ScanManager.cpp:329
+#, kde-format
 msgid ""
-"%0\n"
-"Hz"
+"The collection scanner reported the following errors:\n"
+"%1\n"
+"In most cases this means that not all of your tracks were imported.\n"
+"Further errors will only be reported on the console."
 msgstr ""
 
-#: EngineController.cpp:882
-msgid ""
-"%0\n"
-"kHz"
+#: core-impl/collections/db/ScanManager.cpp:474
+#, kde-format
+msgid "Failed to write scanner batch file \"%1\""
 msgstr ""
 
-#: EngineController.cpp:1175
-msgid "Too many errors encountered in playlist. Playback stopped."
+#: core-impl/collections/db/ScanManager.cpp:482
+#: scanner/GenericScanManager.cpp:203
+msgid "Unable to start Amarok collection scanner."
 msgstr ""
 
-#: EngineController.cpp:1396
+#: core-impl/collections/db/ScanManager.cpp:531
+#: scanner/GenericScanManager.cpp:300
 #, kde-format
-msgctxt "track by artist on album"
-msgid "<b>%1</b> by <b>%2</b> on <b>%3</b>"
-msgstr ""
+msgid "Found one directory"
+msgid_plural "Found %1 directories"
+msgstr[0] ""
+msgstr[1] ""
 
-#: EngineController.cpp:1399
+#: core-impl/collections/db/ScanManager.cpp:542
+#: scanner/GenericScanManager.cpp:310
 #, kde-format
-msgctxt "track by artist"
-msgid "<b>%1</b> by <b>%2</b>"
+msgid "Got directory \"%1\" from scanner."
 msgstr ""
 
-#: EngineController.cpp:1403
+#: core-impl/collections/db/ScanManager.cpp:585
 #, kde-format
-msgctxt "track on album"
-msgid "<b>%1</b> on <b>%2</b>"
+msgid "Aborting scanner with error: %1"
 msgstr ""
 
-#: EngineController.cpp:1408
-#: core-impl/collections/mediadevicecollection/MediaDeviceMeta.cpp:152
-msgid "Unknown track"
+#: core-impl/collections/db/ScanManager.cpp:605
+msgid "Scanner aborted."
 msgstr ""
 
-#: EngineController.cpp:1415
-#, kde-format
-msgctxt "track from source"
-msgid "from <b>%1</b>"
+#: core-impl/collections/db/ScanManager.cpp:698
+msgid ""
+"The collection scan had to be aborted. Too many errors were encountered "
+"during the scan."
 msgstr ""
 
-#: EngineController.cpp:1426 widgets/Osd.cpp:651 mac/GrowlInterface.cpp:43
-#: context/engines/current/CurrentEngine.cpp:136
-msgid "No track playing"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:72
+#: core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedCollection.cpp:35
+#: core-impl/collections/db/sql/mysqlservercollection/MySqlServerCollection.cpp:41
+#: context/applets/currenttrack/CurrentTrack.cpp:105
+msgid "Local Collection"
 msgstr ""
 
-#: playlistmanager/PlaylistManager.cpp:278
-msgid "Downloading Playlist"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:497
+msgid "Organizing tracks"
 msgstr ""
 
-#: playlistmanager/PlaylistManager.cpp:342
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:148
-#: playlistmanager/file/PlaylistFileProvider.cpp:481
-#: core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.cpp:115
-msgid "Change playlist"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:499
+msgid "Moving tracks"
 msgstr ""
 
-#: playlistmanager/PlaylistManager.cpp:343
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:149
-#: playlistmanager/file/PlaylistFileProvider.cpp:482
-#: core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.cpp:116
-msgid "Enter new name for playlist:"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:503
+msgid "Copying tracks"
 msgstr ""
 
-#: playlistmanager/sql/SqlPlaylist.cpp:40
-msgid "Playlist in database"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:505
+msgid "Transcoding tracks"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:90
-msgid "Confirm Rename"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:563
+#, kde-format
+msgid "Could not create directory: %1"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:92
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:640
 #, kde-format
-msgid "Are you sure you want to rename this playlist to '%1'?"
+msgid "Transferring: %1"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:93
-msgid "Yes, rename this playlist."
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:642
+#, kde-format
+msgid "Transcoding: %1"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:117
-#: playlistmanager/file/PlaylistFileProvider.cpp:453
-#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:251
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:333
-msgid "Confirm Delete"
+#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:686
+#: core-impl/collections/support/FileCollectionLocation.cpp:100
+#, kde-format
+msgid "Removing: %1"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:119
-#: playlistmanager/file/PlaylistFileProvider.cpp:455
-#, kde-format
-msgid "Are you sure you want to delete this playlist?"
-msgid_plural "Are you sure you want to delete these %1 playlists?"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:21
+#. i18n: ectx: property (windowTitle), widget (QWidget, OrganizeCollectionDialogBase)
+#: core-impl/collections/db/sql/SqlCollection.cpp:81 rc.cpp:452
+msgid "Organize Files"
+msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:125
-msgid "Yes, delete from database."
+#: core-impl/collections/db/sql/SqlCollection.cpp:173
+#, kde-format
+msgid ""
+"The amarok database reported the following errors:\n"
+"%1\n"
+"In most cases you will need to resolve these errors before Amarok will run "
+"properly."
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:190
-#: playlistmanager/file/PlaylistFileProvider.cpp:126
-msgid "&Rename..."
+#: core-impl/collections/db/sql/SqlCollection.cpp:329
+msgid "Scanning music"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:202
-#: playlistmanager/file/PlaylistFileProvider.cpp:138
-msgid "&Delete..."
+#: core-impl/collections/db/sql/CapabilityDelegateImpl.cpp:59
+msgid "Do not show under Various Artists"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:247
-#: playlistmanager/file/PlaylistFileProvider.cpp:194
-msgid "Remove tracks"
+#: core-impl/collections/db/sql/CapabilityDelegateImpl.cpp:64
+msgid "Show under Various Artists"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:250
-#: playlistmanager/file/PlaylistFileProvider.cpp:197
+#: core-impl/collections/db/sql/SqlMeta.cpp:272
+#: services/lastfm/meta/LastFmMeta.cpp:134 covermanager/CoverManager.cpp:842
 #, kde-format
-msgctxt "Remove a track from a saved playlist"
-msgid "Remove From \"%1\""
-msgstr ""
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.h:44
-msgid "Amarok Database"
+#: core-impl/collections/db/ScanResultProcessor.cpp:261
+msgctxt "The genre name for classical music"
+msgid "Classical"
 msgstr ""
 
-#: playlistmanager/sql/SqlUserPlaylistProvider.h:45
-msgid "Local playlists stored in the database"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:291
+msgid "iPod was not initialized:"
 msgstr ""
 
-#: playlistmanager/file/PlaylistFileProvider.cpp:84
-msgid "Playlist Files on Disk"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:292
+msgid "iPod Initialization Failed"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1073
-#. i18n: ectx: property (text), widget (QPushButton, removeButton)
-#: playlistmanager/file/PlaylistFileProvider.cpp:200 rc.cpp:1741
-msgid "Remove"
-msgstr ""
-
-#: playlistmanager/file/PlaylistFileProvider.cpp:365
-#: playlistmanager/file/PlaylistFileProvider.cpp:393
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:315
 #, kde-format
-msgid "The playlist file \"%1\" could not be loaded."
+msgid ""
+"Media Device: could not find iTunesDB on device mounted at %1. Attempt to "
+"initialize your iPod?"
 msgstr ""
 
-#: playlistmanager/file/PlaylistFileProvider.cpp:461
-msgid "Yes, delete from disk."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:317
+msgid "Initialize iPod?"
 msgstr ""
 
-#: playlistmanager/SyncedPlaylist.cpp:40 playlistmanager/SyncedPlaylist.cpp:48
-#: playlistmanager/SyncedPlaylist.cpp:56
-msgid "<Empty>"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:318
+msgid "&Initialize"
 msgstr ""
 
-#: playlistmanager/SyncedPlaylist.cpp:63
-#, kde-format
-msgid "Synchronized on: %1"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:359
+msgid "Set iPod Model"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:43
-msgid "Send a Comment to the Developers"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:359
+msgid "iPod Models"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:155
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:363
 #, kde-format
-msgctxt ""
-"Feedback dialog text, message with one accepted language for the comments"
-msgid ""
-"Please, write it in <b>%1</b> (you may want to use an <a href=\"%2\">online "
-"translation tool</a> for this).<br/>"
+msgid "%1 the iPod Model is necessary to initialize the iPod"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:162
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:389
 #, kde-format
-msgctxt ""
-"Feedback dialog text, message with list of accepted languages for the "
-"comments"
 msgid ""
-"Please, write it in <b>%1 or %2</b> (you may want to use an <a "
-"href=\"%3\">online translation tool</a> for this).<br/>"
+"%1 failed to write to iPod, make sure you have write permissions on the iPod"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:175
-msgctxt ""
-"Feedback dialog text, message to remind to balance the likes and dislikes"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:405
+#, kde-format
 msgid ""
-"To make the comments you send more useful in improving this application, try "
-"to send the same amount of positive and negative comments.<br/>"
+"%1 failed to write SysInfo file to iPod, make sure you have write "
+"permissions on the iPod"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:184
-msgctxt "Feedback dialog text, text to disallow feature requests"
-msgid ""
-"Please, do not ask for new features: this kind of request will be "
-"ignored.<br/>"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:429
+#, kde-format
+msgid "%1 failed to initialize the iPod"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:190
-#, kde-format
-msgctxt ""
-"Feedback dialog text, %1=Application name,%2=message with list of accepted "
-"languages for the comment,%3=optional text to remind to balance the likes "
-"and dislikes,%4=optional text to disallow feature requests."
-msgid ""
-"<p>You can provide the developers a brief description of your opinions about "
-"%1.<br/>%2 %3%4</p>"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:437
+msgid "The iPod was successfully initialized."
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:236
-#, kde-format
-msgid ""
-"The email address you have entered is not valid, and cannot be used: '%1'"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:437
+msgid "iPod Initialized"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:242
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:444
 #, kde-format
 msgid ""
-"Please double check your email address for errors, because it appears to be "
-"an exotic one.\n"
-"%1"
+"%1 you chose not to initialize the iPod. It will not be usable until it is "
+"initialized."
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:308
-msgctxt "Dialog box text"
-msgid ""
-"<p>Your comment has been sent successfully.</p><p>Thank you for your "
-"time.</p>"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:522
+msgid "&Stale and Orphaned"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:310
-msgctxt "Dialog box title"
-msgid "Comment Sent"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:532
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:695
+msgid "Synchronize Artwork"
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:321
-msgctxt "Dialog box text"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:548
 msgid ""
-"<p>There has been an error while trying to send the comment.</p><p>Please, "
-"try again later.</p>"
+"Do you really want to initialize this iPod? Its database will be cleared of "
+"all information, but the files will not be deleted."
 msgstr ""
 
-#: likeback/LikeBackDialog.cpp:323
-msgctxt "Dialog box title"
-msgid "Comment Sending Error"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:552
+msgid "Initialize iPod"
 msgstr ""
 
-#: likeback/LikeBack.cpp:221
-msgid "&Send a Comment to the Developers"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:558
+msgid "The iPod has been initialized"
 msgstr ""
 
-#: likeback/LikeBack.cpp:227
-msgid "Show &Feedback Icons"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:561
+msgid "The iPod was unable to be initialized"
 msgstr ""
 
-#: likeback/LikeBack.cpp:296
-#, kde-format
-msgctxt "Welcome dialog text, header text for test apps"
-msgid "Welcome to this testing version of %1."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:570
+msgid ""
+"Amarok is about to search for stale tracks. This may take a while, do you "
+"want to continue?"
 msgstr ""
 
-#: likeback/LikeBack.cpp:301
-#, kde-format
-msgctxt "Welcome dialog text, header text for released apps"
-msgid "Welcome to %1."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:574
+msgid "Find Stale Tracks"
 msgstr ""
 
-#: likeback/LikeBack.cpp:309
-msgctxt ""
-"Welcome dialog text, explanation for both the like and dislike buttons"
-msgid ""
-"Each time you have a great or frustrating experience, please click on the "
-"appropriate face below the window title bar, briefly describe what you like "
-"or dislike and click on 'Send'."
-msgstr ""
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:657
+#, kde-format
+msgctxt "@info"
+msgid "One stale track removed from the database. Scan for orphaned tracks?"
+msgid_plural "%1 tracks removed from the database. Scan for orphaned tracks?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: likeback/LikeBack.cpp:316
-msgctxt "Welcome dialog text, explanation for the like button alone"
-msgid ""
-"Each time you have a great experience, please click on the smiling face "
-"below the window title-bar, briefly describe what you like and click on "
-"'Send'."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:662
+msgid "Find Orphaned Tracks"
 msgstr ""
 
-#: likeback/LikeBack.cpp:323
-msgctxt "Welcome dialog text, explanation for the dislike button alone"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:693
+#, kde-format
 msgid ""
-"Each time you have a frustrating experience, please click on the frowning "
-"face below the window title-bar, briefly describe what you dislike and click "
-"on 'Send'."
+"Amarok is about to synchronize artwork on <i>%1</i>. Do you want to continue?"
 msgstr ""
 
-#: likeback/LikeBack.cpp:333
-msgctxt "Welcome dialog text, explanation for the bug button"
-msgid ""
-"If you experience an improper behavior in the application, just click on the "
-"bug icon in the top-right corner of the window and follow the instructions "
-"to submit a bug report."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:706
+msgid "Artwork synchronized"
 msgstr ""
 
-#: likeback/LikeBack.cpp:345
-msgctxt "Welcome dialog text, usage example"
-msgid "<b>I like</b> the new artwork. Very refreshing."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:710
+msgid "iPod artwork could not be synchronized"
 msgstr ""
 
-#: likeback/LikeBack.cpp:353
-msgctxt "Welcome dialog text, usage example"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:921
 msgid ""
-"<b>I dislike</b> the welcome page of this assistant. Too time consuming."
+"Amarok requires sudo access to get the FirewireGuid required to connect to "
+"your device. Please enter your sudo password"
 msgstr ""
 
-#: likeback/LikeBack.cpp:361
-msgctxt "Welcome dialog text, usage example"
-msgid ""
-"<b>The application shows an improper behavior</b> when clicking the Add "
-"button. Nothing happens."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2224
+msgid "Select Stale Tracks To Delete"
 msgstr ""
 
-#: likeback/LikeBack.cpp:369
-msgctxt "Welcome dialog text, usage example"
-msgid "<b>I desire a new feature</b> allowing me to send my work by email."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2224
+msgid "Stale Tracks"
 msgstr ""
 
-#: likeback/LikeBack.cpp:382
-msgctxt "Welcome dialog text, us=the developers, it=the application"
-msgid "To help us improve it, your comments are important."
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2271
+msgid "Adding Orphaned Tracks to iPod Database"
 msgstr ""
 
-#: likeback/LikeBack.cpp:385
-msgctxt "Welcome dialog text, header for the examples"
-msgid "Example"
-msgid_plural "Examples"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2296
+#, kde-format
+msgctxt "@info"
+msgid "One orphaned track added to the database."
+msgid_plural "%1 tracks added to the database."
 msgstr[0] ""
 msgstr[1] ""
 
-#: likeback/LikeBack.cpp:391
-msgctxt "Welcome dialog title"
-msgid "Help Improve the Application"
+#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2301
+msgid "Orphaned Tracks Added"
 msgstr ""
 
-#: KNotificationBackend.cpp:146
-msgid "Now playing"
-msgstr ""
+#: core-impl/collections/umscollection/UmsCollectionLocation.cpp:106
+#: core-impl/collections/umscollection/UmsCollectionLocation.cpp:198
+#, kde-format
+msgid "Copying one track to %2"
+msgid_plural "Copying %1 tracks to %2"
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:261
-msgid "Local Music"
-msgstr ""
+#: core-impl/collections/umscollection/UmsCollectionLocation.cpp:143
+#, kde-format
+msgid "Removing one track from %2"
+msgid_plural "Removing %1 tracks from %2"
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:263
-msgid "Local sources of content"
+#: core-impl/collections/umscollection/UmsCollection.cpp:165
+#, kde-format
+msgid "&Configure %1"
 msgstr ""
 
-#: MainWindow.cpp:271
-msgid "Internet"
+#: core-impl/collections/umscollection/UmsCollection.cpp:170
+msgid "&Use as Collection"
 msgstr ""
 
-#: MainWindow.cpp:273
-msgid "Online sources of content"
+#: core-impl/collections/umscollection/UmsCollection.cpp:534
+msgid "Configure USB Mass Storage Device"
 msgstr ""
 
-#: MainWindow.cpp:279
-msgid "Playlists"
+#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:184
+msgid "&Delete Episode"
 msgstr ""
 
-#: MainWindow.cpp:281
-msgid "Various types of playlists"
+#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:254
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:333
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:117
+#: playlistmanager/file/PlaylistFileProvider.cpp:453
+msgid "Confirm Delete"
 msgstr ""
 
-#: MainWindow.cpp:287 amarokurls/NavigationUrlGenerator.cpp:135
-msgid "Files"
-msgstr ""
+#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:256
+#, kde-format
+msgid "Are you sure you want to delete this episode?"
+msgid_plural "Are you sure you want to delete these %1 episodes?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:289
-msgid "Browse local hard drive for content"
+#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:272
+#, kde-format
+msgid "Yes, delete from %1."
 msgstr ""
 
-#: MainWindow.cpp:350
-msgctxt "@item:inmenu"
-msgid "&View"
+#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:328
+#: services/gpodder/GpodderProvider.cpp:336
+msgid "&Delete Channel and Episodes"
 msgstr ""
 
-#: MainWindow.cpp:353
-msgid "Lock Layout"
+#: core-impl/collections/nepomukcollection/NepomukCollection.cpp:129
+msgid "Nepomuk Collection"
 msgstr ""
 
-#: MainWindow.cpp:464
-msgid ""
-"<qt>Closing the main window will keep Amarok running in the System Tray. Use "
-"<B>Quit</B> from the menu, or the Amarok tray icon to exit the "
-"application.</qt>"
+#: core-impl/collections/nepomukcollection/NepomukCollection.cpp:131
+msgid "Nepomuk Collection (slow, Redland)"
 msgstr ""
 
-#: MainWindow.cpp:466
-msgid "Docking in System Tray"
+#: core-impl/collections/upnpcollection/UpnpBrowseCollection.cpp:118
+#, kde-format
+msgid "Scanning %1"
 msgstr ""
 
-#: MainWindow.cpp:495
-msgid "Use relative path for &saving"
+#: core-impl/collections/upnpcollection/UpnpBrowseCollection.cpp:208
+#, kde-format
+msgid "UPnP Error: %1"
 msgstr ""
 
-#: MainWindow.cpp:507 covermanager/CoverFoundDialog.cpp:361
-msgid "Save As"
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:152
+msgid "Could not connect to MTP Device"
 msgstr ""
 
-#: MainWindow.cpp:559
-msgid "Play Media (Files or URLs)"
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:378
+msgid "Could not copy track from device."
 msgstr ""
 
-#: MainWindow.cpp:559
-msgid "Add Media (Files or URLs)"
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:431
+#: core/meta/Meta.cpp:444 context/applets/currenttrack/CurrentTrack.h:39
+msgid "Unknown Album"
 msgstr ""
 
-#: MainWindow.cpp:577
-msgid "Add Stream"
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:437
+#: core/meta/Meta.cpp:481
+msgid "Unknown Genre"
 msgstr ""
 
-#: MainWindow.cpp:577
-msgid "Enter Stream URL:"
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:593
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:732
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:915
+msgid "Could not delete item"
 msgstr ""
 
-#: MainWindow.cpp:701
-msgid "&Add Media..."
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:603
+msgid "Delete failed"
 msgstr ""
 
-#: MainWindow.cpp:706
-msgctxt "clear playlist"
-msgid "&Clear Playlist"
+#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:888
+msgid "Could not save playlist."
 msgstr ""
 
-#: MainWindow.cpp:711
-msgctxt "edit play queue of playlist"
-msgid "Edit &Queue"
+#: core-impl/collections/playdarcollection/PlaydarCollection.cpp:125
+msgid "Playdar Collection"
 msgstr ""
 
-#: MainWindow.cpp:716
-msgctxt "Remove duplicate and dead (unplayable) tracks from the playlist"
-msgid "Re&move Duplicates"
+#: core-impl/collections/support/TrashCollectionLocation.cpp:47
+msgid "Trash"
 msgstr ""
 
-#: MainWindow.cpp:723
-msgid "&Add Stream..."
+#: core-impl/collections/support/TrashCollectionLocation.cpp:101
+#, kde-format
+msgid "Moving to trash: %1"
 msgstr ""
 
-#: MainWindow.cpp:727
-msgid "&Export Playlist As..."
-msgstr ""
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:40
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Do you really want to delete this track? It will be removed from your "
+"collection."
+msgid_plural ""
+"Do you really want to delete these %1 tracks? They will be removed from your "
+"collection."
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:731 amarokurls/NavigationUrlGenerator.cpp:250
-msgid "Bookmark Media Sources View"
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:45
+msgid "Delete Files"
 msgstr ""
 
-#: MainWindow.cpp:735 amarokurls/BookmarkManager.cpp:43
-msgid "Bookmark Manager"
-msgstr ""
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:61
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Do you really want to move this track to the trash? It will be removed from "
+"your collection."
+msgid_plural ""
+"Do you really want to move these %1 tracks to the trash? They will be "
+"removed from your collection."
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:739
-msgid "Equalizer"
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:70
+#: browsers/filebrowser/FileView.cpp:579
+msgctxt "@title:window"
+msgid "Confirm Move to Trash"
 msgstr ""
 
-#: MainWindow.cpp:743 playlist/PlaylistViewUrlGenerator.cpp:101
-msgid "Bookmark Playlist Setup"
-msgstr ""
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:82
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Do you really want to move this track? It will be renamed and the original "
+"deleted."
+msgid_plural ""
+"Do you really want to move these %1 tracks? They will be renamed and the "
+"originals deleted."
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:747
-msgid "Bookmark Context Applets"
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:87
+msgid "Move Files"
 msgstr ""
 
-#: MainWindow.cpp:751 covermanager/CoverManager.cpp:105
-msgid "Cover Manager"
-msgstr ""
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:98
+#, kde-format
+msgctxt "@info"
+msgid ""
+"There was a problem and this track could not be removed. Make sure the "
+"directory is writable."
+msgid_plural ""
+"There was a problem and %1 tracks could not be removed. Make sure the "
+"directory is writable."
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:755
-msgid "Play Media..."
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:103
+msgid "Unable to be removed tracks"
 msgstr ""
 
-#: MainWindow.cpp:760
-msgid "&Seek Forward"
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:110
+msgid ""
+"The collection does not have enough free space available or is not writable."
 msgstr ""
 
-#: MainWindow.cpp:766
-msgid "&Seek Backward"
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:116
+msgid "Do you want to remove empty folders?"
 msgstr ""
 
-#: MainWindow.cpp:773
-msgid "Update Collection"
+#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:117
+msgid "Remove empty folders?"
 msgstr ""
 
-#: MainWindow.cpp:780
-msgid "Previous Track"
+#: core-impl/collections/support/TextualQueryFilter.cpp:262
+msgid "today"
 msgstr ""
 
-#: MainWindow.cpp:787
-msgid "Restart current track"
+#: core-impl/collections/support/TextualQueryFilter.cpp:264
+msgid "last week"
 msgstr ""
 
-#: MainWindow.cpp:793
-msgid "Repopulate Playlist"
+#: core-impl/collections/support/TextualQueryFilter.cpp:266
+msgid "last month"
 msgstr ""
 
-#: MainWindow.cpp:799
-msgid "Disable Dynamic Playlist"
+#: core-impl/collections/support/TextualQueryFilter.cpp:268
+msgid "two months ago"
 msgstr ""
 
-#: MainWindow.cpp:803
-msgid "Next Track"
+#: core-impl/collections/support/TextualQueryFilter.cpp:270
+msgid "three months ago"
 msgstr ""
 
-#: MainWindow.cpp:808
-msgid "Increase Volume"
-msgstr "Cynyddu'r Lefel Sŵn"
-
-#: MainWindow.cpp:814
-msgid "Decrease Volume"
-msgstr "Lleihau'r Lefel Sŵn"
-
-#: MainWindow.cpp:820
-msgid "Toggle Main Window"
+#: core-impl/podcasts/sql/SqlPodcastMeta.cpp:426
+#: core/podcasts/PodcastMeta.h:414
+msgid "Podcast"
 msgstr ""
 
-#: MainWindow.cpp:825
-msgid "Toggle Full Screen"
+#: core-impl/podcasts/sql/SqlPodcastProvider.h:54
+msgid "Local Podcasts"
 msgstr ""
 
-#: MainWindow.cpp:830
-msgid "Jump to"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:288
+msgid "&Update All Channels"
 msgstr ""
 
-#: MainWindow.cpp:835
-msgid "Show active track"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:296
+msgid "&Configure General Settings"
 msgstr ""
 
-#: MainWindow.cpp:839
-msgid "Show Notification Popup"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:304
+msgid "&Export subscriptions to OPML file"
 msgstr ""
 
-#: MainWindow.cpp:844
-msgid "Mute Volume"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:328
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:884
+msgid "&Configure"
 msgstr ""
 
-#: MainWindow.cpp:849
-msgid "Last.fm: Love Current Track"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:346
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:902
+msgid "&Remove Subscription"
 msgstr ""
 
-#: MainWindow.cpp:854
-msgid "Last.fm: Ban Current Track"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:368
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:923
+msgid "&Update Channel"
 msgstr ""
 
-#: MainWindow.cpp:859
-msgid "Last.fm: Skip Current Track"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:407
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:804
+msgid "&Delete Downloaded Episode"
 msgstr ""
 
-#: MainWindow.cpp:864 playlist/view/PlaylistViewCommon.cpp:115
-msgid "Queue Track"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:419
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:817
+msgid "&Write Feed Information to File"
 msgstr ""
 
-#: MainWindow.cpp:869
-msgid "Rate Current Track: 1"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:443
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:854
+msgid "&Download Episode"
 msgstr ""
 
-#: MainWindow.cpp:874
-msgid "Rate Current Track: 2"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:486
+#, kde-format
+msgid "Already subscribed to %1."
 msgstr ""
 
-#: MainWindow.cpp:879
-msgid "Rate Current Track: 3"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:615
+msgctxt "prefix to 'x minutes'"
+msgid "every "
 msgstr ""
 
-#: MainWindow.cpp:884
-msgid "Rate Current Track: 4"
-msgstr ""
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:616
+msgid " minute"
+msgid_plural " minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: MainWindow.cpp:889
-msgid "Rate Current Track: 5"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:625
+msgid "Configure Local Podcasts"
 msgstr ""
 
-#: MainWindow.cpp:895
-msgid "Network Request Viewer"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:645
+msgid "Move Podcasts"
 msgstr ""
 
-#: MainWindow.cpp:913
-msgid "&About Amarok"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:649
+msgid "Do you want to move all downloaded episodes to the new location?"
 msgstr ""
 
-#: MainWindow.cpp:917
-msgid "&Report Bug..."
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:718
+msgid "Select file for OPML export"
 msgstr ""
 
-#: MainWindow.cpp:977
-msgid "&Music"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1002
+msgid "Unsubscribe"
 msgstr ""
 
-#: MainWindow.cpp:979
-msgid "&Amarok"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1006
+#, kde-format
+msgid "Do you really want to unsubscribe from \"%1\"?"
 msgstr ""
 
-#: MainWindow.cpp:1003 playlist/PlaylistToolBar.cpp:38
-#: playlist/PlaylistDock.cpp:54
-msgid "&Playlist"
-msgstr "Rhestr &chwarae:"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1011
+msgid "Delete downloaded episodes"
+msgstr ""
 
-#: MainWindow.cpp:1020
-msgid "&Tools"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1134
+msgid "Waiting for Podcast Downloads to Finish"
 msgstr ""
 
-#: MainWindow.cpp:1037
-msgid "&Settings"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1135
+#, kde-format
+msgid "There is still a podcast download in progress"
+msgid_plural "There are still %1 podcast downloads in progress"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1139
+msgid "Cancel Download and Quit."
 msgstr ""
 
-#: MainWindow.cpp:1084
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1316
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1559
 #, kde-format
-msgid ""
-"You have chosen to hide the menu bar.\n"
-"\n"
-"Please remember that you can always use the shortcut \"%1\" to bring it back."
+msgid "Unable to save podcast episode file to %1"
 msgstr ""
 
-#: MainWindow.cpp:1086
-msgid "Hide Menu"
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1326
+msgid "Downloading Podcast Media"
 msgstr ""
 
-#: MainWindow.cpp:1128
+#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1327
 #, kde-format
-msgid "Paused  ::  %1"
+msgid "Downloading Podcast \"%1\""
 msgstr ""
 
-#: MainWindow.cpp:1141 core-impl/collections/audiocd/AudioCdCollection.cpp:444
-#: core-impl/collections/audiocd/AudioCdCollection.cpp:445
-#: core-impl/collections/audiocd/AudioCdCollection.cpp:446
-#: core-impl/collections/audiocd/AudioCdCollection.cpp:447
-#: amarokurls/BookmarkTreeView.cpp:377 amarokurls/BookmarkTreeView.cpp:378
-#: amarokurls/BookmarkTreeView.cpp:379 context/applets/albums/AlbumItem.cpp:97
-msgid "Unknown"
-msgstr "Anhysbys"
+#: core-impl/podcasts/sql/PodcastSettingsDialog.cpp:36
+#, kde-format
+msgctxt "change options"
+msgid "Configure %1"
+msgstr "Ffurfweddu %1"
 
-#: MainWindow.cpp:1141
+#: core-impl/podcasts/sql/PodcastSettingsDialog.cpp:69
+msgid " Item"
+msgid_plural " Items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core-impl/podcasts/sql/PodcastFilenameLayoutConfigDialog.cpp:31
+msgctxt "Change filename layout"
+msgid "Podcast Episode Filename Configuration"
+msgstr ""
+
+#: core-impl/capabilities/timecode/TimecodeWriteCapability.cpp:102
 #, kde-format
-msgid "%1 - %2  ::  %3"
+msgid "%1 - Stopped %2"
 msgstr ""
 
-#: transcoding/TranscodingPropertySliderWidget.cpp:100
-msgid " (recommended)"
+#: core-impl/capabilities/timecode/TimecodeWriteCapability.cpp:107
+msgid "Playback Ended Markers"
 msgstr ""
 
 #: transcoding/TranscodingOptionsStackedWidget.cpp:55
@@ -1878,6 +2015,10 @@
 "pick an encoder from the list."
 msgstr ""
 
+#: transcoding/TranscodingPropertySliderWidget.cpp:100
+msgid " (recommended)"
+msgstr ""
+
 #: transcoding/TranscodingAssistantDialog.cpp:35
 msgid "Transcode Tracks"
 msgstr ""
@@ -1904,9581 +2045,9687 @@
 "Medium compression, high quality Ogg Vorbis (lossy)."
 msgstr ""
 
-#: ActionClasses.cpp:86
-msgid "Amarok Menu"
+#: browsers/collectionbrowser/CollectionWidget.cpp:146
+msgid ""
+"This is where you will find your local music, as well as music from mobile "
+"audio players and CDs."
 msgstr ""
 
-#: ActionClasses.cpp:176
-msgid "Play/Pause"
-msgstr "Chwarae/Seibio"
-
-#: ActionClasses.cpp:313
-msgid "Click to change"
+#: browsers/collectionbrowser/CollectionWidget.cpp:181
+msgctxt "@item:inlistbox Collection widget filter preset"
+msgid "Added This Hour"
 msgstr ""
 
-#: ActionClasses.cpp:330
-msgid "&Replay Gain Mode"
+#: browsers/collectionbrowser/CollectionWidget.cpp:183
+msgctxt "@item:inlistbox Collection widget filter preset"
+msgid "Added Today"
 msgstr ""
 
-#: ActionClasses.cpp:332
-msgctxt "Replay Gain state, as in, disabled"
-msgid "&Off"
+#: browsers/collectionbrowser/CollectionWidget.cpp:185
+msgctxt "@item:inlistbox Collection widget filter preset"
+msgid "Added This Week"
 msgstr ""
 
-#: ActionClasses.cpp:332
-msgctxt "Item, as in, music"
-msgid "&Track"
+#: browsers/collectionbrowser/CollectionWidget.cpp:187
+msgctxt "@item:inlistbox Collection widget filter preset"
+msgid "Added This Month"
 msgstr ""
 
-#: ActionClasses.cpp:333
-msgid "&Album"
-msgstr "&Album"
+#: browsers/collectionbrowser/CollectionWidget.cpp:193
+#: services/magnatune/MagnatuneStore.cpp:221
+msgid "Artist / Album"
+msgstr ""
 
-#: ActionClasses.cpp:342
-msgid "&Equalizer"
+#: browsers/collectionbrowser/CollectionWidget.cpp:197
+msgid "Album / Artist"
 msgstr ""
 
-#: ActionClasses.cpp:370
-msgid "Your current setup does not support the equalizer feature"
+#: browsers/collectionbrowser/CollectionWidget.cpp:201
+#: services/magnatune/MagnatuneStore.cpp:227
+#: services/jamendo/JamendoService.cpp:153
+msgid "Genre / Artist"
 msgstr ""
 
-#: ActionClasses.cpp:375
-msgctxt "Equalizer state, as in, disabled"
-msgid "&Off"
+#: browsers/collectionbrowser/CollectionWidget.cpp:205
+#: services/magnatune/MagnatuneStore.cpp:230
+#: services/jamendo/JamendoService.cpp:156
+msgid "Genre / Artist / Album"
 msgstr ""
 
-#: ActionClasses.cpp:398
-msgid "Burn"
+#: browsers/collectionbrowser/CollectionWidget.cpp:212
+msgid "First Level"
 msgstr ""
 
-#: ActionClasses.cpp:437
-msgid "Current Playlist"
+#: browsers/collectionbrowser/CollectionWidget.cpp:213
+msgid "Second Level"
 msgstr ""
 
-#: ActionClasses.cpp:438
-msgid "Selected Tracks"
+#: browsers/collectionbrowser/CollectionWidget.cpp:214
+msgid "Third Level"
 msgstr ""
 
-#: ActionClasses.cpp:469
-msgid "Stop"
+#: browsers/collectionbrowser/CollectionWidget.cpp:266
+msgid "Show Years"
 msgstr ""
 
-#: ActionClasses.cpp:521
-msgid "Stop after current Track"
+#: browsers/collectionbrowser/CollectionWidget.cpp:271
+msgctxt "@action:inmenu"
+msgid "Show Track Numbers"
 msgstr ""
 
-#: ActionClasses.cpp:536
-msgid "Stop after current track: On"
+#: browsers/collectionbrowser/CollectionWidget.cpp:276
+msgid "Show Cover Art"
 msgstr ""
 
-#: ActionClasses.cpp:542
-msgid "Stop after current track: Off"
+#: browsers/collectionbrowser/CollectionWidget.cpp:284
+#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:87
+msgid "Merged View"
 msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
+#: browsers/collectionbrowser/CollectionWidget.cpp:291
+#: services/magnatune/MagnatuneStore.cpp:233
+#: services/jamendo/JamendoService.cpp:159
+msgid "Sort Options"
 msgstr ""
-"KD wrth KGyfieithu, ,Launchpad Contributions:,Cadan ap Tomos,David "
-"Jones,JOSHYRAVE,Jonathan Price,Steven Sproat,Thierry Vignaud"
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,cadz123@googlemail.com,,,notclive@gmail.com,,"
+#: browsers/collectionbrowser/CollectionTreeItemDelegate.cpp:172
+#, kde-format
+msgid "%1% used"
+msgstr ""
 
-#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:15
-#. i18n: ectx: property (whatsThis), widget (QWidget, ConstraintGroupEditWidget)
-#: rc.cpp:5
-msgid ""
-"An editor for Constraint Groups.  You can set the group type to \"match "
-"all\" or \"match any\".  When the group type is set to \"match all\", the "
-"Generator will try to have the playlist match all the constraints within the "
-"group.  When the group type is set to \"match any\", the Generator will try "
-"to have the playlist match any of the constraints within the group."
+#: browsers/filebrowser/FileBrowser.cpp:66
+msgctxt "Show Dolphin Places the user configured"
+msgid "Places"
 msgstr ""
 
-#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:8
-msgid "Constraint Group Settings"
+#: browsers/filebrowser/FileBrowser.cpp:76
+msgid "Filter Files"
 msgstr ""
 
-#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:29
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton_MatchAll)
-#: rc.cpp:11
+#: browsers/filebrowser/FileBrowser.cpp:174
 msgid ""
-"The APG will consider the constraint group satisfied only if all of the "
-"constraints within the group are satisfied.  This is analogous to a logical "
-"AND: \"the tracks should match properties A, B, and C\"."
+"The file browser lets you browse files anywhere on your system, regardless "
+"of whether these files are part of your local collection. You can then add "
+"these files to the playlist as well as perform basic file operations."
 msgstr ""
 
-#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:32
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_MatchAll)
-#: rc.cpp:14
-msgid "Match all constraints in the group"
+#: browsers/filebrowser/FileBrowser.cpp:379 browsers/InfoProxy.cpp:164
+msgid "Home"
 msgstr ""
 
-#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:39
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton_MatchAny)
-#: rc.cpp:17
-msgid ""
-"The APG will consider the constraint group satisfied if any one of the "
-"constraints within it is satisfied.  This is analogous to a logical OR: "
-"\"the tracks should match properties A, B, or C\"."
+#: browsers/filebrowser/FileBrowser.cpp:523
+msgid "Places"
 msgstr ""
 
-#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:42
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_MatchAny)
-#: rc.cpp:20
-msgid "Match any constraint in the group"
+#: browsers/filebrowser/FileView.cpp:125 browsers/CollectionTreeView.cpp:277
+msgid "Move to Collection"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:15
-#. i18n: ectx: property (whatsThis), widget (QWidget, PlaylistDurationEditWidget)
-#: rc.cpp:23
-msgid ""
-"An editor for a PlaylistDuration constraint.  The user can set the name of "
-"the constraint; the target duration and whether the playlist should be less "
-"than, equal to, or greater than that duration; and the strictness with which "
-"the APG should match that duration."
+#: browsers/filebrowser/FileView.cpp:134 browsers/CollectionTreeView.cpp:269
+msgid "Copy to Collection"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:26
-msgid "Playlist Duration Constraint Settings"
+#: browsers/filebrowser/FileView.cpp:398 browsers/CollectionTreeView.cpp:838
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:49
+#: services/lastfm/LastFmTreeView.cpp:111
+#: context/applets/albums/AlbumsView.cpp:240
+msgid "&Add to Playlist"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:32
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Comparison)
-#: rc.cpp:29
-msgid ""
-"Whether the duration of the generated playlist should be shorter than, equal "
-"to, or longer than the specified value."
+#: browsers/filebrowser/FileView.cpp:410 browsers/CollectionTreeView.cpp:847
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:56
+#: services/lastfm/LastFmTreeView.cpp:120
+#: context/applets/albums/AlbumsView.cpp:241
+msgctxt "Replace the currently loaded tracks with these"
+msgid "&Replace Playlist"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:44
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:44
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:118
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:472
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:609
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonRating)
-#: rc.cpp:35 rc.cpp:98 rc.cpp:160 rc.cpp:244 rc.cpp:277
-msgid "equal to"
+#: browsers/filebrowser/FileView.cpp:422 browsers/CollectionTreeView.cpp:925
+msgid "&Edit Track Details"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:62
-#. i18n: ectx: property (whatsThis), widget (QTimeEdit, timeEdit_Duration)
-#: rc.cpp:41
-msgid ""
-"The desired duration of the playlist, in hours, minutes, and seconds.  Note: "
-"because of Qt limitations, the maximum playlist duration that you can "
-"specify is 24 hours."
+#: browsers/filebrowser/FileView.cpp:439 amarokurls/BookmarkTreeView.cpp:118
+msgid "&Delete"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:65
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, timeEdit_Duration)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:500
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, timeEdit_TimeValue)
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:72
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, timeEdit_Position)
-#: rc.cpp:44 rc.cpp:253 rc.cpp:316
-msgid "h:mm:ss"
+#: browsers/filebrowser/FileView.cpp:572
+msgctxt "@title:window"
+msgid "Confirm Delete"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:94
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_Strictness)
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:119
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_Strictness)
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:90
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_Strictness)
-#: rc.cpp:47 rc.cpp:56 rc.cpp:107
+#: browsers/filebrowser/FileView.cpp:573
+#, kde-format
+msgid "Are you sure you want to delete this item?"
+msgid_plural "Are you sure you want to delete these %1 items?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: browsers/filebrowser/FileView.cpp:580
+#, kde-format
+msgid "Are you sure you want to move this item to trash?"
+msgid_plural "Are you sure you want to move these %1 items to trash?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: browsers/filebrowser/FileView.cpp:614
+#, kde-format
+msgctxt "@info:status"
+msgid "Moving to trash: 1 file"
+msgid_plural "Moving to trash: %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: browsers/BrowserCategoryList.cpp:52
+msgid "Filter Music Sources"
+msgstr ""
+
+#: browsers/servicebrowser/ServiceBrowser.cpp:40
 msgid ""
-"How strict the APG should be about matching the playlist duration to the "
-"specified time."
+"The Internet browser lets you browse online sources of content that "
+"integrates directly into Amarok. Amarok ships with a number of these "
+"sources, but many more can be added using scripts."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:97
-#. i18n: ectx: property (text), widget (QLabel, label_Strictness)
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:93
-#. i18n: ectx: property (text), widget (QLabel, label_Strictness)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:161
-#. i18n: ectx: property (text), widget (QLabel, label_StrictnessInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:340
-#. i18n: ectx: property (text), widget (QLabel, label_strictnessDate)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:532
-#. i18n: ectx: property (text), widget (QLabel, label_StrictnessTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:655
-#. i18n: ectx: property (text), widget (QLabel, label_StrictnessRating)
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:110
-#. i18n: ectx: property (text), widget (QLabel, label_Strictness)
-#: rc.cpp:50 rc.cpp:110 rc.cpp:172 rc.cpp:208 rc.cpp:259 rc.cpp:289 rc.cpp:322
-msgid "Match:"
+#: browsers/CollectionTreeView.cpp:246 configdialog/ConfigDialog.cpp:59
+msgid "Collection"
+msgstr "Casgliad"
+
+#: browsers/CollectionTreeView.cpp:545 services/lastfm/LastFmTreeView.cpp:201
+msgid "More..."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:109
-#. i18n: ectx: property (text), widget (QLabel, label_Fuzzy)
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:105
-#. i18n: ectx: property (text), widget (QLabel, label_Fuzzy)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:173
-#. i18n: ectx: property (text), widget (QLabel, label_FuzzyInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:352
-#. i18n: ectx: property (text), widget (QLabel, label_FuzzyDate)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:544
-#. i18n: ectx: property (text), widget (QLabel, label_FuzzyTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:667
-#. i18n: ectx: property (text), widget (QLabel, label_FuzzyRating)
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, label_FuzzyPos)
-#: rc.cpp:53 rc.cpp:113 rc.cpp:175 rc.cpp:211 rc.cpp:262 rc.cpp:292 rc.cpp:325
-msgid "fuzzy"
+#: browsers/CollectionTreeView.cpp:894
+msgctxt "Organize Files"
+msgid "Organize Files"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:135
-#. i18n: ectx: property (text), widget (QLabel, label_Exact)
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:131
-#. i18n: ectx: property (text), widget (QLabel, label_Exact)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:196
-#. i18n: ectx: property (text), widget (QLabel, label_ExactInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:375
-#. i18n: ectx: property (text), widget (QLabel, label_ExactDate)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:567
-#. i18n: ectx: property (text), widget (QLabel, label_ExactTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:690
-#. i18n: ectx: property (text), widget (QLabel, label_ExactRating)
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:154
-#. i18n: ectx: property (text), widget (QLabel, label_ExactPos)
-#: rc.cpp:59 rc.cpp:119 rc.cpp:181 rc.cpp:217 rc.cpp:268 rc.cpp:298 rc.cpp:331
-msgid "exact"
+#: browsers/CollectionTreeView.cpp:1072
+msgid "Move Tracks to Trash"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:15
-#. i18n: ectx: property (whatsThis), widget (QWidget, PreventDuplicatesEditWidget)
-#: rc.cpp:62
-msgid ""
-"An editor for a Prevent Duplicates constraint.  When set to \"track\", it "
-"will try to prevent more than one copy of the same track from ending up in "
-"the playlist.  When set to \"album\" or \"artist\", it will try to prevent "
-"more than one track from a given album or a given artist from ending up in "
-"the playlist."
+#: browsers/CollectionTreeView.cpp:1078
+msgid "Delete Tracks"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:65
-msgid "Prevent Duplicates Constraint Settings"
+#: browsers/CollectionTreeItemModelBase.cpp:238
+#: browsers/CollectionTreeItemModelBase.cpp:291
+msgctxt "The Name is not known"
+msgid "Unknown"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:29
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_Field)
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:47
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Field)
-#: rc.cpp:68 rc.cpp:74
-msgid ""
-"Control which duplicates to prevent.  \"Prevent duplicate tracks\" is the "
-"least restrictive, and \"prevent duplicate artists\" is the most restrictive."
+#: browsers/CollectionTreeItemModelBase.cpp:981
+msgid "Year - Album"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label_Field)
-#: rc.cpp:71
-msgid "Prevent duplicate"
+#: browsers/CollectionTreeItemModelBase.cpp:987
+#: core/meta/support/MetaConstants.cpp:201 widgets/SmartPlaylistEditor.cpp:187
+#: widgets/SmartPlaylistEditor.cpp:197
+msgid "Label"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:51
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Field)
-#: rc.cpp:77 widgets/SmartPlaylistEditor.cpp:253
-msgid "tracks"
-msgstr "traciau"
-
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:56
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Field)
-#: rc.cpp:80
-msgid "albums"
+#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:43
+msgctxt "Bias dialog window title"
+msgid "Edit bias"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:61
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Field)
-#: rc.cpp:83
-msgid "artists"
+#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:47
+msgctxt "Bias selection label in bias view."
+msgid "Match Type:"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:15
-#. i18n: ectx: property (whatsThis), widget (QWidget, PlaylistLengthEditWidget)
-#: rc.cpp:86
+#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:111
+#, kde-format
 msgid ""
-"An editor for a Playlist Length constraint.  The user can the target number "
-"of tracks and whether the playlist contain fewer than, equal to, or more "
-"than that number of tracks; and the strictness with which the APG should "
-"match the target number of tracks."
-msgstr ""
-
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:89
-msgid "Playlist Length Constraint Settings"
+"This bias is a replacement for another bias\n"
+"which is currently not loaded or deactivated.\n"
+"The original bias name was %1."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:32
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Comparison)
-#: rc.cpp:92
-msgid ""
-"Whether the number of tracks in the generated playlist should be less than, "
-"equal to, or more than the specified value."
+#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:178
+msgid "This bias has no settings."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:39
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
-#: rc.cpp:95
-msgid "fewer than"
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:36
+msgid "&Rename Folder..."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:59
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, spinBox_Length)
-#: rc.cpp:104
-msgid "The target number of tracks for the generated playlist."
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:42
+msgid "&Delete Folder"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:115
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_Strictness)
-#: rc.cpp:116
-msgid ""
-"How strict the APG should be about matching the playlist length to the "
-"specified number of tracks."
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:315
+msgid "New name"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:15
-#. i18n: ectx: property (whatsThis), widget (QWidget, TagMatchEditWidget)
-#: rc.cpp:122
-msgid ""
-"An editor for a TagMatch constraint.  The user can specify a track "
-"characteristic, and the APG will fill the playlist with tracks that match "
-"that characteristic.  This functions similarity to the matching attributes "
-"of the smart playlists in Amarok 1.4."
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:317
+msgctxt "Enter a new name for a folder that already exists"
+msgid "Enter new folder name:"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:125
-msgid "Match Tag Constraint Settings"
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:335
+msgid "Are you sure you want to delete this folder and its contents?"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:29
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_Match)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:44
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Field)
-#: rc.cpp:128 rc.cpp:134
-msgid "Selects which track characteristic you want to match."
+#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:339
+msgid "Yes, delete folder."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label_Match)
-#: rc.cpp:131
-msgid "Field:"
+#: browsers/playlistbrowser/DynamicView.cpp:231
+msgid "&Rename playlist"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:70
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBox_Invert)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:84
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_Invert)
-#: rc.cpp:137 rc.cpp:144
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Calibri'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The APG will choose all "
-"tracks that do <span style=\" font-weight:600;\">not</span> match the "
-"specified characteristics.</p></body></html>"
+#: browsers/playlistbrowser/DynamicView.cpp:235
+msgid "&Add new Bias"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:87
-#. i18n: ectx: property (text), widget (QLabel, label_Invert)
-#: rc.cpp:151
-msgid "Invert:"
+#: browsers/playlistbrowser/DynamicView.cpp:239
+msgid "&Clone Playlist"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:106
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonInt)
-#: rc.cpp:154
-msgid ""
-"Whether the APG should choose tracks that are less than, equal to, or "
-"greater than the specified value."
+#: browsers/playlistbrowser/DynamicView.cpp:243
+msgid "&Delete playlist"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:133
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, spinBox_ValueInt)
-#: rc.cpp:166
-msgid "The numerical value that the track characteristic should match."
+#: browsers/playlistbrowser/DynamicView.cpp:257
+msgid "&Edit bias..."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:158
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_StrictnessInt)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:180
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessInt)
-#: rc.cpp:169 rc.cpp:178
-msgid ""
-"How strict the APG should be about matching tracks to the specified value."
+#: browsers/playlistbrowser/DynamicView.cpp:261
+msgid "&Clone bias"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:226
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonDate)
-#: rc.cpp:184
-msgid ""
-"Whether the APG should choose tracks that are before, on, or after a "
-"specific date; or whether it should choose tracks that are within a certain "
-"time range."
+#: browsers/playlistbrowser/DynamicView.cpp:271
+msgid "&Delete bias"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:248
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
-#: rc.cpp:196
-msgid "within the last"
+#: browsers/playlistbrowser/DynamicView.cpp:278
+msgid "&Add new bias"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:266
-#. i18n: ectx: property (whatsThis), widget (QWidget, page_DateSpecific)
-#: rc.cpp:199
-msgid "The specific date that the APG should use for matching."
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:182
+#. i18n: ectx: property (text), widget (QCheckBox, m_podcastCheckBox)
+#: browsers/playlistbrowser/PodcastCategory.cpp:81 rc.cpp:581
+msgid "Podcasts"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:300
-#. i18n: ectx: property (whatsThis), widget (QWidget, page_DateRange)
-#: rc.cpp:202
-msgid "The relative time period that the APG should try to match."
+#: browsers/playlistbrowser/PodcastCategory.cpp:82
+msgid "List of podcast subscriptions and episodes"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:337
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_strictnessDate)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:359
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessDate)
-#: rc.cpp:205 rc.cpp:214
+#: browsers/playlistbrowser/PodcastCategory.cpp:85
 msgid ""
-"How strict the APG should be about matching tracks to the specified date."
+"Manage your podcast subscriptions and browse individual episodes. "
+"Downloading episodes to the disk is also done here, or you can tell Amarok "
+"to do this automatically."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:405
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonString)
-#: rc.cpp:220
-msgid ""
-"Whether the APG should match tracks that equal, start with, end with, or "
-"contain the specified string."
+#: browsers/playlistbrowser/PodcastCategory.cpp:95
+msgid "&Add Podcast"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:409
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
-#: rc.cpp:223
-msgid "equals"
+#: browsers/playlistbrowser/PodcastCategory.cpp:102
+msgid "&Update All"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:414
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
-#: rc.cpp:226 widgets/SmartPlaylistEditor.cpp:737
-#: widgets/SmartPlaylistEditor.cpp:1034
-msgid "starts with"
+#: browsers/playlistbrowser/PodcastCategory.cpp:110
+#: browsers/playlistbrowser/PodcastCategory.cpp:113
+msgid "Import OPML File"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:419
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
-#: rc.cpp:229 widgets/SmartPlaylistEditor.cpp:759
-#: widgets/SmartPlaylistEditor.cpp:1035
-msgid "ends with"
+#: browsers/playlistbrowser/PodcastCategory.cpp:167
+msgid "By"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:424
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
-#: rc.cpp:232 widgets/SmartPlaylistEditor.cpp:715
-#: widgets/SmartPlaylistEditor.cpp:1033
-msgid "contains"
-msgstr "yn cynnwys"
-
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:432
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, lineEdit_StringValue)
-#: rc.cpp:235
-msgid "The string that the APG should use when matching tracks."
+#: browsers/playlistbrowser/PodcastCategory.cpp:206
+msgctxt "Podcast published on date"
+msgid "On"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:460
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonTime)
-#: rc.cpp:238
-msgid ""
-"Whether the APG should choose tracks that are less than, equal to, or "
-"greater than the specified time."
+#: browsers/playlistbrowser/PodcastCategory.cpp:224
+msgid "File Size:"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:487
-#. i18n: ectx: property (whatsThis), widget (QTimeEdit, timeEdit_TimeValue)
-#: rc.cpp:250
-msgid "The time that the APG should try to match."
+#: browsers/playlistbrowser/PodcastCategory.cpp:236
+msgid "Subscription Date:"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:529
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_StrictnessTime)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:551
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessTime)
-#: rc.cpp:256 rc.cpp:265
-msgid ""
-"How strict the APG should be about matching tracks to the specified time."
+#: browsers/playlistbrowser/PodcastCategory.cpp:244
+msgid "Keywords:"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:597
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonRating)
-#: rc.cpp:271
-msgid ""
-"Whether the APG should choose tracks that are less than, equal to, or "
-"greater than the specified rating."
+#: browsers/playlistbrowser/PodcastModel.cpp:72
+msgctxt "toggle the \"new\" status of this podcast episode"
+msgid "&New"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:624
-#. i18n: ectx: property (whatsThis), widget (Amarok::KRatingWidget, rating_RatingValue)
-#: rc.cpp:283
-msgid "The rating that the APG should try to match."
-msgstr ""
+#: browsers/playlistbrowser/PodcastModel.cpp:260
+#, kde-format
+msgctxt "number of podcasts from one source"
+msgid "One Channel"
+msgid_plural "%1 channels"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:652
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_StrictnessRating)
-#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:674
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessRating)
-#: rc.cpp:286 rc.cpp:295
-msgid ""
-"How strict the APG should be about matching tracks to the specified rating."
-msgstr ""
+#: browsers/playlistbrowser/PodcastModel.cpp:333
+#: amarokurls/BookmarkModel.cpp:266 playlist/PlaylistModel.cpp:874
+msgid "Type"
+msgstr "Math"
 
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:15
-#. i18n: ectx: property (whatsThis), widget (QWidget, CheckpointEditWidget)
-#: rc.cpp:301
-msgid ""
-"An editor for a CheckPoint constraint.  The user can set the track, album, "
-"or artist to be placed at a certain position in the playlist."
+#: browsers/playlistbrowser/PodcastModel.cpp:355
+msgid "Add Podcast"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:304
-msgid "Checkpoint Constraint Settings"
+#: browsers/playlistbrowser/PodcastModel.cpp:356
+msgid "Enter RSS 1.0/2.0 or Atom feed URL:"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:35
-#. i18n: ectx: property (whatsThis), widget (TrackSelectWidget, trackSelector)
-#: rc.cpp:307
-msgid "Select the track that you want to use as the checkpoint."
+#: browsers/playlistbrowser/UserPlaylistCategory.cpp:58
+msgid "Saved Playlists"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:48
-#. i18n: ectx: property (text), widget (QLabel, label_Position)
-#: rc.cpp:310
-msgid "Position:"
+#: browsers/playlistbrowser/UserPlaylistCategory.cpp:59
+msgid "User generated and imported playlists"
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:69
-#. i18n: ectx: property (whatsThis), widget (QTimeEdit, timeEdit_Position)
-#: rc.cpp:313
+#: browsers/playlistbrowser/UserPlaylistCategory.cpp:62
 msgid ""
-"The desired position of the song in the playlist, in hours, minutes, and "
-"seconds.  Note: because of Qt limitations, the maximum position that you can "
-"specify is 24 hours."
+"Create, edit, organize and load playlists. Amarok automatically adds any "
+"playlists found when scanning your collection, and any playlists that you "
+"save are also shown here."
 msgstr ""
 
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:107
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_Strictness)
-#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:138
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider_Strictness)
-#: rc.cpp:319 rc.cpp:328
-msgid ""
-"How strict the APG should be about placing the selected track at the "
-"specified time."
-msgstr ""
+#: browsers/playlistbrowser/DynamicCategory.cpp:53
+msgid "Dynamic Playlists"
+msgstr "Rhestri Chwarae Deinamig"
 
-#. i18n: file: playlistgenerator/PresetEditDialog.ui:15
-#. i18n: ectx: property (windowTitle), widget (QDialog, PresetEditDialog)
-#: rc.cpp:334
-msgid "APG Preset Editor"
+#: browsers/playlistbrowser/DynamicCategory.cpp:54
+msgid "Dynamically updating parameter based playlists"
 msgstr ""
 
-#. i18n: file: playlistgenerator/PresetEditDialog.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_Tree)
-#: rc.cpp:337
-msgid "Constraint Tree"
+#: browsers/playlistbrowser/DynamicCategory.cpp:57
+msgid ""
+"With a dynamic playlist, Amarok becomes your own personal dj, automatically "
+"selecting tracks for you, based on a number of parameters that you select."
 msgstr ""
 
-#. i18n: file: playlistgenerator/PresetEditDialog.ui:41
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_Title)
-#: rc.cpp:340
-msgid "APG Preset Name"
+#: browsers/playlistbrowser/DynamicCategory.cpp:72
+msgid "Previous:"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:13
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:343
-msgid "Whether to display a second, left time label."
+#: browsers/playlistbrowser/DynamicCategory.cpp:77
+msgid "Number of previous tracks to remain in the playlist."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:14
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:346
-msgid ""
-"Set this to display a second time label to the left of the seek slider in "
-"the player window."
+#: browsers/playlistbrowser/DynamicCategory.cpp:81
+msgid "Upcoming:"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:18
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:349
-msgid "Whether to display remaining track time in the left time label."
+#: browsers/playlistbrowser/DynamicCategory.cpp:87
+msgid "Number of upcoming tracks to add to the playlist."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:19
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:352
-msgid ""
-"Set this to display remaining track time instead of past track time in the "
-"player window."
+#: browsers/playlistbrowser/DynamicCategory.cpp:108
+msgctxt "Turn dynamic mode on"
+msgid "On"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:23
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:355
-msgid "Which tracks or albums to favor in Random Mode"
+#: browsers/playlistbrowser/DynamicCategory.cpp:111
+msgid "Turn dynamic mode on."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:24
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:358
-msgid ""
-"Tracks or albums with the chosen property will be more likely to be chosen "
-"in Random Mode."
+#: browsers/playlistbrowser/DynamicCategory.cpp:115
+msgid "Duplicates"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:34
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:361
-msgid "How to progress through tracks in the playlist"
+#: browsers/playlistbrowser/DynamicCategory.cpp:119
+msgid "Allow duplicate songs in result"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:35
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:364
-msgid ""
-"Determines how amarok will progress through the tracks in the playlist"
+#: browsers/playlistbrowser/DynamicCategory.cpp:123
+msgid "New"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:48
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:367
-msgid "The status of dynamic mode."
+#: browsers/playlistbrowser/DynamicCategory.cpp:125
+msgid "New playlist"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:49
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:370
-msgid ""
-"If set, dynamic mode will be on, and tracks will be added according to the "
-"dynamic playlist specified."
+#: browsers/playlistbrowser/DynamicCategory.cpp:129
+msgid "Edit"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:53
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:373
-msgid "Duplicate tracks in dynamic mode."
+#: browsers/playlistbrowser/DynamicCategory.cpp:131
+msgid "Edit the selected playlist or bias"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:54
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:376
-msgid ""
-"If set, tracks added in the dynamic mode are allowed to have duplicates."
+#: browsers/playlistbrowser/DynamicCategory.cpp:135
+msgid "Delete"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:58
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:379
-msgid "Previous tracks count."
+#: browsers/playlistbrowser/DynamicCategory.cpp:138
+msgid "Delete the selected playlist or bias"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:59
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:382
-msgid "Number of tracks to leave in the playlist before the active track."
+#: browsers/playlistbrowser/DynamicCategory.cpp:142
+msgid "Repopulate"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:63
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:385
-msgid "Upcoming tracks count."
+#: browsers/playlistbrowser/DynamicCategory.cpp:143
+msgid "Replace the upcoming tracks with fresh ones."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:64
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:388
-msgid "Number of tracks to load into the playlist after the active track."
+#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:77
+#: services/opmldirectory/OpmlDirectoryModel.cpp:44
+msgid "Add Folder"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:68
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:391
-msgid "Whether to show icon in system tray"
+#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:82
+msgid "Visible Sources"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:69
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:394
-msgid "Enable/Disable tray icon for Amarok."
+#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:186
+msgid "Folders are only shown in <b>merged view</b>."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:73
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:397
-msgid "Whether to hide the context view."
+#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:273
+msgctxt "default name for new folder"
+msgid "New Folder"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:74
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:400
-msgid "Enable/Disable context view in Amarok."
+#: browsers/playlistbrowser/PlaylistBrowser.cpp:45
+msgid ""
+"The playlist browser contains your list of imported and saved playlists. It "
+"is also where you can specify powerful dynamic playlists and manage your "
+"podcast subscriptions and episodes."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:78
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:403
-msgid "Whether to animate the systray icon"
+#: browsers/playlistbrowser/APGCategory.cpp:39
+msgid "Automated Playlist Generator"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:79
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:406
-msgid "Enable/Disable tray icon animation."
+#: browsers/playlistbrowser/APGCategory.cpp:40
+#: browsers/playlistbrowser/APGCategory.cpp:47
+msgid "Create playlists by specifying criteria"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:83
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:409
-msgid "Delay between tracks, in milliseconds"
+#: browsers/playlistbrowser/APGCategory.cpp:63
+msgid "Add new preset"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:84
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:412
-msgid "Delay between tracks, in milliseconds."
+#: browsers/playlistbrowser/APGCategory.cpp:66
+msgid "Edit selected preset"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:88
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:415
-msgid "Number of undo levels in playlist"
+#: browsers/playlistbrowser/APGCategory.cpp:71
+msgid "Delete selected preset"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:89
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:418
-msgid "The number of undo levels in the playlist."
+#: browsers/playlistbrowser/APGCategory.cpp:76
+msgid "Import a new preset"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:93
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:421
-msgid "Whether a splash-screen should be displayed on startup"
+#: browsers/playlistbrowser/APGCategory.cpp:80
+msgid "Export the selected preset"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:94
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:424
-msgid "Enable/Disable splashscreen during Amarok startup."
+#: browsers/playlistbrowser/APGCategory.cpp:87
+msgid "Run APG with selected preset"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:98
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:427
-msgid "Whether playlists store relative path"
+#: browsers/playlistbrowser/APGCategory.cpp:93
+msgid "APG Presets"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:99
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:430
-msgid ""
-"If set, Amarok's manually saved playlists will contain a relative path to "
-"each track, not an absolute path."
+#: browsers/playlistbrowser/APGCategory.cpp:107
+msgid "Generator Optimization"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:103
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:433
-msgid "Filename of the external web browser to be invoked by Amarok."
+#: browsers/playlistbrowser/APGCategory.cpp:111
+msgid "Speed"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:107
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:436
-msgid "Whether to automatically attempt to fetch cover art as needed"
+#: browsers/playlistbrowser/APGCategory.cpp:116
+msgid "Accuracy"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:111
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:439
-msgid ""
-"Automatically scroll the playlist to make the currently playing song visible"
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:44
+msgid "Create empty playlist"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:115
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:442
-msgid "Show Album art in the Collection Browser"
-msgstr ""
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:138
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:187
+#, kde-format
+msgctxt "number of playlists from one source"
+msgid "One Playlist"
+msgid_plural "%1 playlists"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: amarokconfig.kcfg:119
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:445
-msgid "Show the Context View"
-msgstr ""
+#. i18n: file: services/ampache/NewServerWidget.ui:17
+#. i18n: ectx: property (text), widget (QLabel, labelName)
+#. i18n: file: services/ampache/AmpacheConfigWidget.ui:53
+#. i18n: ectx: property (text), widget (QTableWidget, serverList)
+#. i18n: file: aboutdialog/OcsPersonItem.ui:137
+#. i18n: ectx: property (text), widget (QLabel, m_textLabel)
+#. i18n: file: network/NetworkRequests.ui:89
+#. i18n: ectx: property (text), widget (QTreeWidget, requestDetails)
+#. i18n: file: network/NetworkRequests.ui:103
+#. i18n: ectx: property (text), widget (QTreeWidget, responseDetails)
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:414
+#: services/amazon/AmazonItemTreeModel.cpp:168
+#: amarokurls/BookmarkModel.cpp:265 playlistgenerator/TreeModel.cpp:64
+#: rc.cpp:728 rc.cpp:749 rc.cpp:1002 rc.cpp:1038 rc.cpp:1044
+msgid "Name"
+msgstr "Enw"
 
-#. i18n: file: amarokconfig.kcfg:123
-#. i18n: ectx: label, entry, group (General Options)
-#: rc.cpp:448
-msgid "Play the first run jingle"
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:415
+#: amarokurls/BookmarkModel.cpp:86
+msgid "Group"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:127
-#. i18n: ectx: label, entry, group (General Options)
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:74
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AnimateAppletCollapse)
-#: rc.cpp:451 rc.cpp:2168
-msgid "Enable context applets collapse animations"
+#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:416
+msgid "Source"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:128
-#. i18n: ectx: whatsthis, entry, group (General Options)
-#: rc.cpp:454
-msgid "If set, context applets will collapse using animations."
+#: browsers/BrowserDock.cpp:36
+msgid "&Media Sources"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:135
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:457
-msgid "Whether organize files will overwrite existing files."
-msgstr ""
-
-#. i18n: file: amarokconfig.kcfg:136
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:460
-msgid "If set, Organize files will overwrite any existing destination."
+#: browsers/BrowserDock.cpp:81
+msgid "Previous Browser"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:140
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:463
-msgid ""
-"Whether organize files will group directories according to their filetype."
+#: browsers/CollectionTreeItem.cpp:140
+msgctxt "No labels are assigned to the given item are any of its subitems"
+msgid "No Labels"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:141
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:466
-msgid ""
-"If set, Organize files will group directories containing the same filetype."
+#: browsers/CollectionTreeItem.cpp:148
+msgid "Counting..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:145
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:469
-msgid ""
-"Whether organize files will group artists whose names start with the same "
-"character."
-msgstr ""
+#: browsers/CollectionTreeItem.cpp:175
+#: playlist/proxymodels/GroupingProxy.cpp:186
+#, kde-format
+msgid "1 track"
+msgid_plural "%1 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: amarokconfig.kcfg:146
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:472
-msgid ""
-"If set, Organize files will group artists whose names start with the same "
-"character."
+#: browsers/BrowserBreadcrumbItem.cpp:68
+msgid "Media Sources Home"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:150
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:475
-msgid "Whether organize files will ignore The in artist names."
+#: services/ampache/AmpacheServiceCollection.cpp:57
+#, kde-format
+msgid "Ampache Server %1"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:151
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:478
-msgid "If set, Organize files will ignore The in artist names."
+#: services/ampache/LastfmInfoParser.cpp:67
+msgid "<p>No information found for this track.</p>"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:155
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:481
-msgid ""
-"Whether organize files will replace spaces in filenames with underscores."
+#: services/ampache/LastfmInfoParser.cpp:118
+msgid "<p>No information found for this album.</p>"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:156
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:484
-msgid ""
-"If set, Organize files will replace spaces in filenames with underscores."
+#: services/ampache/LastfmInfoParser.cpp:171
+msgid "<p>No information found for this artist.</p>"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:160
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:487
-msgid "Whether organize files will use cover art as folder icons."
+#: services/ampache/AddServerDialog.cpp:33
+msgid "Add new Ampache server"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:161
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:490
-msgid "If set, Organize files will use cover art as folder icons."
+#: services/ampache/AddServerDialog.cpp:73
+msgid "Successfully connected"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:165
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:493
-msgid "Collection folder path destination for Organize files."
+#: services/ampache/AddServerDialog.cpp:78
+msgid "Connection failure"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:166
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:496
-msgid "The path of the collection folder destination for Organize files."
+#: services/ampache/AmpacheService.cpp:100
+msgid "Amarok frontend for your Ampache server"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:170
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:499
+#: services/ampache/AmpacheService.cpp:102
 msgid ""
-"Whether organize files will rename files in a manner compatible with vfat "
-"filesystems."
+"Use Amarok as a seamless frontend to your Ampache server. This lets you "
+"browse and play all the Ampache contents from within Amarok."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:171
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:502
-msgid ""
-"If set, Organize files will replace characters that are not compatible with "
-"vfat filesystems (such as ':', '*' and '?')."
+#: services/ampache/AmpacheAccountLogin.cpp:133
+msgid "Enter the server name and a password"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:175
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:505
-msgid ""
-"Whether organize files will rename files such that they only contain 7-bit "
-"ASCII characters."
+#: services/ampache/AmpacheAccountLogin.cpp:223
+msgid "Authentication Error"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:176
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:508
-msgid ""
-"If set, Organize files will replace characters that are not compatible with "
-"the 7-bit ASCII character set."
+#: services/gpodder/GpodderServiceSettings.cpp:89
+#: services/lastfm/LastFmServiceSettings.cpp:100
+msgid "Testing..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:180
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:511
-msgid "Whether organize files will use a custom file naming scheme."
+#: services/gpodder/GpodderServiceSettings.cpp:108
+#: services/lastfm/LastFmServiceSettings.cpp:143
+msgctxt "The operation completed as expected"
+msgid "Success"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:181
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:514
+#: services/gpodder/GpodderServiceSettings.cpp:162
+#: services/lastfm/LastFmServiceSettings.cpp:151
 msgid ""
-"If set, Organize files will rename files according to a custom format string."
+"Either the username or the password is incorrect, please correct and try "
+"again"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:185
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:517
-msgid "Format string for Organize files, if a custom naming scheme is used."
+#: services/gpodder/GpodderServiceSettings.cpp:163
+#: services/gpodder/GpodderServiceSettings.cpp:172
+#: services/gpodder/GpodderServiceSettings.cpp:186
+#: services/lastfm/LastFmServiceSettings.cpp:151
+#: services/lastfm/LastFmServiceSettings.cpp:176
+msgid "Failed"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:186
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:520
-msgid ""
-"If the custom filename scheme is enabled, then Organize files will rename "
-"files according to this format string."
+#: services/gpodder/GpodderServiceSettings.cpp:165
+#: services/gpodder/GpodderServiceSettings.cpp:174
+#: services/lastfm/LastFmServiceSettings.cpp:152
+#: services/lastfm/LastFmServiceSettings.cpp:177
+msgid "Test Login"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:190
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:523
-msgid "Regular expression that is to be replaced."
+#: services/gpodder/GpodderServiceSettings.cpp:171
+msgid "Unable to connect to gpodder.net service or other error occurred."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:191
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:526
+#: services/gpodder/GpodderServiceSettings.cpp:186
 msgid ""
-"Organize files will replace substrings matching this regular expression."
+"Error parsing the Reply, check if gpodder.net is working correctly and "
+"report a bug"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:195
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:529
-msgid "Replacing string."
+#. i18n: file: services/gpodder/GpodderConfigWidget.ui:88
+#. i18n: ectx: property (text), widget (QPushButton, testLogin)
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:96
+#. i18n: ectx: property (text), widget (QPushButton, testLogin)
+#: services/gpodder/GpodderServiceSettings.cpp:231
+#: services/lastfm/LastFmServiceSettings.cpp:220 rc.cpp:777 rc.cpp:933
+msgid "&Test Login"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:196
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:532
-msgid "Organize files will replace matching substrings with this string."
+#: services/gpodder/GpodderService.cpp:128
+msgid "gpodder.net: Podcast Directory Service"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:200
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:535
-msgid "Basic or Advanced Mode"
+#: services/gpodder/GpodderService.cpp:131
+msgid "gpodder.net is an online Podcast Directory & Synchonisation Service."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:201
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:538
-msgid ""
-"In basic mode graphical drag/droppable tokens are used to create a filename "
-"scheme, in advanced mode the images are replaced with text."
+#: services/gpodder/GpodderService.cpp:206
+#: services/opmldirectory/OpmlDirectoryService.cpp:134
+msgid "Subscribe"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:205
-#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:541
-msgid "Format Presets"
+#: services/gpodder/GpodderProvider.cpp:281
+msgid "Gpodder Podcasts"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:206
-#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
-#: rc.cpp:544
-msgid "A list of preset formats (token schemas)."
+#: services/gpodder/GpodderProvider.cpp:452
+msgid "Trying to synchronize statuses with gpodder.net"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:213
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:547
-msgid "Master volume"
+#: services/gpodder/GpodderProvider.cpp:510
+msgid "Trying to synchronize with gpodder.net"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:214
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:550
-msgid "The Amarok master volume, a value between 0 and 100."
+#: services/gpodder/GpodderServiceConfig.cpp:144
+msgid "gpodder.net credentials"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:220
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:553
-msgid "Mute state"
+#: services/gpodder/GpodderServiceConfig.cpp:145
+msgid ""
+"No running KWallet found. Would you like Amarok to save your gpodder.net "
+"credentials in plaintext?"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:221
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:556
-msgid "Mute/Unmute sound."
+#: services/magnatune/MagnatuneCollectionLocation.cpp:42
+msgid "Preview Tracks"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:225
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:559
-msgid "Whether to crossfade between tracks"
+#: services/magnatune/MagnatuneCollectionLocation.cpp:45
+msgid ""
+"The tracks you are about to copy are Magnatune.com preview streams. For "
+"better quality and advert free streams, consider buying an album download. "
+"Remember that when buying from Magnatune the artist gets 50%. Also if you "
+"buy using Amarok, you support the Amarok project with 10%."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:226
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:562
-msgid "Enable/Disable crossfading between track changes."
+#: services/magnatune/MagnatuneInfoParser.cpp:32
+msgid "Loading artist info..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:230
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:565
-msgid "Length of crossfade, in milliseconds"
+#: services/magnatune/MagnatuneInfoParser.cpp:44
+#, kde-format
+msgid "Fetching %1 Artist Info"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:231
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:568
-msgid "The length of the crossfade between tracks in milliseconds."
+#: services/magnatune/MagnatuneInfoParser.cpp:53
+msgid "Loading album info..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:236
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:571
-msgid "When to Crossfade"
+#: services/magnatune/MagnatuneInfoParser.cpp:75
+#, kde-format
+msgid "Release Year: %1"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:237
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:574
-msgid ""
-"Determines whether to crossfade always, or on automatic/manual track changes "
-"only."
+#: services/magnatune/MagnatuneInfoParser.cpp:80
+msgid "Description:"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:241
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:577
-msgid "Whether to fade out tracks when pressing stop."
+#: services/magnatune/MagnatuneInfoParser.cpp:84
+msgid "From Magnatune.com"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:242
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:580
-msgid "Enable/Disable fadeout."
+#: services/magnatune/MagnatuneInfoParser.cpp:166
+msgid "Loading Magnatune.com frontpage..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:246
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:583
-msgid "Length of fadeout, in milliseconds"
+#: services/magnatune/MagnatuneInfoParser.cpp:169
+msgid "Fetching Magnatune.com front page"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:247
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:586
-msgid "The length of the fadeout in milliseconds."
+#: services/magnatune/MagnatuneInfoParser.cpp:182
+#: services/magnatune/MagnatuneInfoParser.cpp:198
+msgid "Loading your Magnatune.com favorites page..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:252
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:589
-msgid "Whether to fade out when exiting the program."
+#: services/magnatune/MagnatuneInfoParser.cpp:211
+#: services/magnatune/MagnatuneInfoParser.cpp:227
+msgid "Loading your personal Magnatune.com recommendations page..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:256
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:592
-msgid "Equalizer mode - 0 = off, 1 to n = preset no"
-msgstr ""
+#: services/magnatune/MagnatuneXmlParser.cpp:57
+#, kde-format
+msgctxt ""
+"First part of: Magnatune.com database update complete. Added 3 tracks on 4 "
+"albums from 5 artists."
+msgid "Magnatune.com database update complete. Added 1 track on "
+msgid_plural "Magnatune.com database update complete. Added %1 tracks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: amarokconfig.kcfg:257
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:595
-msgid "When enabled, an equalizer plugin filters the audio stream."
-msgstr ""
+#: services/magnatune/MagnatuneXmlParser.cpp:58
+#, kde-format
+msgctxt ""
+"Middle part of: Magnatune.com database update complete. Added 3 tracks on 4 "
+"albums from 5 artists."
+msgid "1 album from "
+msgid_plural "%1 albums from "
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: amarokconfig.kcfg:261
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:598
-msgid "11 Equalizer gains include pre-amp, range -100..100, 0 is normal."
+#: services/magnatune/MagnatuneXmlParser.cpp:59
+#, kde-format
+msgctxt ""
+"Last part of: Magnatune.com database update complete. Added 3 tracks on 4 "
+"albums from 5 artists."
+msgid "1 artist."
+msgid_plural "%1 artists."
+msgstr[0] ""
+msgstr[1] ""
+
+#: services/magnatune/MagnatuneUrlRunner.cpp:38
+msgctxt ""
+"A type of command that triggers an action in the integrated Magnatune.com "
+"service"
+msgid "Magnatune"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:265
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:601
-msgid "List with user equalizer preset names"
+#: services/magnatune/MagnatuneDownloadHandler.cpp:83
+msgid "Processing download"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:268
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:604
-msgid "List with user presets values"
+#: services/magnatune/MagnatuneDownloadHandler.cpp:148
+msgid ""
+"There seems to be an error in the supplied membership information. Please "
+"correct this and try again."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:272
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:607
-msgid "The mode for adjusting playback volume."
+#: services/magnatune/MagnatuneDownloadHandler.cpp:148
+msgid "Could not process download"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:273
-#. i18n: ectx: whatsthis, entry, group (Playback)
-#: rc.cpp:610
-msgid ""
-"Whether to adjust the volume of tracks to make them sound the same volume, "
-"and if so whether to make the adjustments per-track or per-album."
+#: services/magnatune/MagnatuneAlbumDownloader.cpp:68
+#, kde-format
+msgid "Downloading '%1' by %2 from Magnatune.com"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:276
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:613
-msgid "Disable Replay Gain"
+#: services/magnatune/MagnatuneAlbumDownloader.cpp:72
+msgid "Downloading album from Magnatune.com"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:279
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:616
-msgid "Make each track the same volume"
+#: services/magnatune/MagnatuneAlbumDownloader.cpp:104
+msgid "Magnatune download seems to have failed. Cannot read zip file"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:282
-#. i18n: ectx: label, entry, group (Playback)
-#: rc.cpp:619
-msgid "Make each album the same volume"
+#: services/magnatune/MagnatuneAlbumDownloader.cpp:113
+msgid "Uncompressing Magnatune.com download..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:291
-#. i18n: ectx: label, entry, group (Cover Manager)
-#: rc.cpp:622
-msgid "Amazon locale for cover retrieval"
+#: services/magnatune/MagnatuneAlbumDownloader.cpp:137
+msgid "Adding album cover to collection"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:292
-#. i18n: ectx: whatsthis, entry, group (Cover Manager)
-#: rc.cpp:625
-msgid "Determines which Amazon server cover images should be retrieved from."
+#: services/magnatune/MagnatuneDownloadInfo.cpp:210
+#, kde-format
+msgid ""
+"Redownload of a previously purchased album \"%1\" by \"%2\" from "
+"Magnatune.com.\n"
+"\n"
+"Username: %3\n"
+"Password: %4\n"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:299
-#. i18n: ectx: label, entry, group (Wikipedia)
-#: rc.cpp:628
-msgid "Wikipedia locale for information retrieval"
+#: services/magnatune/MagnatuneStore.cpp:106
+msgid "\"Fair trade\" online music store"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:300
-#. i18n: ectx: whatsthis, entry, group (Wikipedia)
-#: rc.cpp:631
+#: services/magnatune/MagnatuneStore.cpp:110
+#, no-c-format
 msgid ""
-"Determines in which language the information is retrieved from Wikipedia."
+"Magnatune.com is a different kind of record company with the motto \"We are "
+"not evil!\" 50% of every purchase goes directly to the artist and if you "
+"purchase an album through Amarok, the Amarok project receives a 10% "
+"commission. Magnatune.com also offers \"all you can eat\" memberships that "
+"lets you download as much of their music as you like."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:307
-#. i18n: ectx: label, entry, group (KNotify)
-#: rc.cpp:634
-msgid "Use KNotify support"
+#: services/magnatune/MagnatuneStore.cpp:245
+msgid "Re-download"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:314
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:637
-msgid "Use On-Screen Display"
+#: services/magnatune/MagnatuneStore.cpp:248
+msgid "Update Database"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:315
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:640
-msgid "Enable/Disable the On-Screen Display."
+#: services/magnatune/MagnatuneStore.cpp:251
+msgid "Tools"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:319
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:643 configdialog/dialogs/NotificationsConfig.cpp:40
-msgid "Use Growl for notifications"
+#: services/magnatune/MagnatuneStore.cpp:272
+msgid "Download Album"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:320
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:646
-msgid "Enable/Disable use of Growl for notifications."
+#: services/magnatune/MagnatuneStore.cpp:279
+msgid "Signup"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:324
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:649
-msgid "Display the same information in the OSD as in the playlist columns."
+#: services/magnatune/MagnatuneStore.cpp:318
+msgid "Downloading Magnatune.com database..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:325
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:652
-msgid ""
-"If enabled, the OSD will display the same information and in the same order "
-"as the columns in the playlist."
+#: services/magnatune/MagnatuneStore.cpp:347
+msgid "Updating the local Magnatune database."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:329
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:655
-msgid "The OSD text to show"
+#: services/magnatune/MagnatuneStore.cpp:647
+#, c-format
+msgid ""
+"The Magnatune.com service accepts the following messages: \n"
+"\n"
+"\taddMoodyTracks mood count: Adds a number of random tracks with the "
+"specified mood to the playlist. The mood argument must have spaces escaped "
+"with %%20"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:330
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:658
-msgid "Customize the OSD display text."
+#: services/magnatune/MagnatuneStore.cpp:658
+msgid "ERROR: No arguments supplied"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:334
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:661
-msgid "Translucency Toggle"
+#: services/magnatune/MagnatuneStore.cpp:663
+msgid "ERROR: Wrong number of arguments for addMoodyTracks"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:335
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:664
-msgid "Make the background of the OSD translucent."
+#: services/magnatune/MagnatuneStore.cpp:673
+msgid "ERROR: Parse error for argument 2 ( count )"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:339
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:667
-msgid "Whether to use custom colors for the OSD"
+#: services/magnatune/MagnatuneStore.cpp:677
+msgid "ok"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:340
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:670
-msgid "You can use custom colors for the OSD if you set this true."
+#: services/magnatune/MagnatuneStore.cpp:680
+msgid "ERROR: Unknown argument."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:344
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:673
-msgid "Font color for OSD"
+#: services/magnatune/MagnatuneRedownloadHandler.cpp:148
+msgid "Getting list of previous Magnatune.com purchases"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:345
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:676
-msgid ""
-"The color of the OSD text. The color is specified in RGB, a comma-separated "
-"list containing three integers between 0 and 255."
+#: services/magnatune/MagnatuneMeta.cpp:218
+#: services/magnatune/MagnatuneMeta.cpp:426
+msgid "&Download Album"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:349
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:679
-msgid "Font scaling for OSD"
+#: services/magnatune/MagnatuneMeta.cpp:240
+msgid "Magnatune.com: &Download Album"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:350
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:682
-msgid ""
-"The scaling multiplier for the OSD font, in percent-of-normal. 100 is "
-"&ldquo;normal size&rdquo;."
+#: services/magnatune/MagnatuneMeta.cpp:262
+msgid "The non evil record label that is fair to artists and customers alike"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:356
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:685
-msgid "How many milliseconds the text should be displayed for"
+#: services/magnatune/MagnatuneMeta.cpp:432
+msgid "Add to Magnatune.com &favorites"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:357
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:688
-msgid ""
-"The time in milliseconds to show the OSD. A value of 0 means never hide. The "
-"default value is 5000 ms."
+#: services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp:43
+#: services/mp3tunes/Mp3tunesServiceCollection.cpp:53
+msgid "MP3tunes Locker"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:362
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:691
-msgid "Y position offset"
+#: services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp:82
+msgid ""
+"Only the following types of tracks can be uploaded to MP3tunes: mp3, mp4, "
+"m4a, m4p, aac, wma, and ogg. "
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:363
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:694
-msgid ""
-"The Y position of the OSD relative to the chosen screen and OSD alignment. "
-"If Top alignment is chosen the Y offset is the space between the upper part "
-"of the OSD and the top of the screen. If Bottom alignment is chosen the Y "
-"offset is the space between the bottom part of the OSD and the bottom of the "
-"screen."
+#: services/mp3tunes/Mp3tunesService.cpp:113
+msgid "The MP3tunes Locker: Your Music Everywhere!"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:369
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:697
-msgid "OSD screen"
+#: services/mp3tunes/Mp3tunesService.cpp:226
+msgid "MP3tunes AutoSync Enabled"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:370
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:700
-msgid ""
-"The screen that should display the OSD. For single-headed environments this "
-"setting should be 0."
+#: services/mp3tunes/Mp3tunesService.cpp:242
+msgid "MP3tunes AutoSync Disabled"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:374
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:703
-msgid "Whether the album cover should be shown"
+#: services/mp3tunes/Mp3tunesService.cpp:262
+msgid "Authenticating"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:375
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:706
-msgid "If enabled, shows the album cover in the OSD."
+#: services/mp3tunes/Mp3tunesService.cpp:274
+msgid "MP3tunes failed to Authenticate."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:379
-#. i18n: ectx: label, entry, group (OSD)
-#: rc.cpp:709
-msgid "Align OSD to"
+#: services/mp3tunes/Mp3tunesService.cpp:307
+msgid "MP3tunes Harmony: Disconnected"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:380
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#: rc.cpp:712
-msgid ""
-"The relative position of the OSD. Possible choices are Left, Middle, Right "
-"and Center."
+#: services/mp3tunes/Mp3tunesService.cpp:314
+#: services/mp3tunes/Mp3tunesService.cpp:327
+msgid "MP3tunes Harmony: Waiting for PIN Input"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:390
-#. i18n: ectx: label, entry, group (OSD)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:264
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_OsdHideOnFullscreen)
-#: rc.cpp:715 rc.cpp:2117
-msgid "Don't show when a fullscreen application is active"
+#: services/mp3tunes/Mp3tunesService.cpp:339
+msgid "MP3tunes Harmony: Successfully Connected"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:391
-#. i18n: ectx: whatsthis, entry, group (OSD)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:261
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OsdHideOnFullscreen)
-#: rc.cpp:718 rc.cpp:2114
+#: services/mp3tunes/Mp3tunesService.cpp:354
+#, kde-format
 msgid ""
-"Do not show the On-Screen-Display if another application is focused and "
-"running in fullscreen mode."
+"MP3tunes Harmony Error\n"
+"%1"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:399
-#. i18n: ectx: label, entry, group (Session)
-#: rc.cpp:721
-msgid "Resume playback of last played track on startup"
+#: services/mp3tunes/Mp3tunesWorkers.cpp:240
+msgid "Upload to MP3tunes Initiated"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:400
-#. i18n: ectx: whatsthis, entry, group (Session)
-#: rc.cpp:724
-msgid "If set, Amarok resumes playback of the last played track on startup."
+#: services/mp3tunes/Mp3tunesWorkers.cpp:264
+#, kde-format
+msgid "Uploading Track %1/%2"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:404
-#. i18n: ectx: label, entry, group (Session)
-#: rc.cpp:727
-msgid "Track URL to resume upon startup"
+#: services/mp3tunes/Mp3tunesMeta.cpp:45
+msgid ""
+"Online music locker where you can safely store and access your music: "
+"http://mp3tunes.com"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:405
-#. i18n: ectx: whatsthis, entry, group (Session)
-#: rc.cpp:730
-msgid "Internal: URL of the track to resume on startup."
+#: services/mp3tunes/harmonydaemon/main.cpp:31
+msgid "Amarok's MP3tunes Harmony Daemon"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:408
-#. i18n: ectx: label, entry, group (Session)
-#: rc.cpp:733
-msgid "Time to resume at, in milliseconds"
+#: services/mp3tunes/harmonydaemon/main.cpp:32
+msgid "Handles AutoSync for the MP3tunes service in Amarok."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:409
-#. i18n: ectx: whatsthis, entry, group (Session)
-#: rc.cpp:736
-msgid "Internal: Playback position in the track to resume on startup."
+#: services/mp3tunes/harmonydaemon/main.cpp:33
+msgid "(C) 2008, Casey Link"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:412
-#. i18n: ectx: label, entry, group (Session)
-#: rc.cpp:739
+#: services/mp3tunes/harmonydaemon/main.cpp:34
 msgid ""
-"List of bools describing which browsers are visible, from top to bottom."
+"IRC:\n"
+"server: irc.freenode.net / channels: #amarok, #amarok.de, #amarok.es, "
+"#amarok.fr\n"
+"\n"
+"Feedback:\n"
+"amarok@kde.org"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:415
-#. i18n: ectx: label, entry, group (Session)
-#: rc.cpp:742
-msgid "Track playing on last exit. Value is -1 if no track was playing."
+#: services/mp3tunes/harmonydaemon/main.cpp:35
+msgid "http://amarok.kde.org"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:419
-#. i18n: ectx: label, entry, group (Session)
-#: rc.cpp:745
-msgid "Number (from the top) of the last active browser."
+#: services/mp3tunes/harmonydaemon/main.cpp:41
+msgid "The identifier the daemon should use."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:425
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:748
-msgid "Whether Collections folders are scanned recursively"
+#: services/mp3tunes/harmonydaemon/main.cpp:42
+msgid "The email to be used for authentication."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:429
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:751
-msgid "Whether Collection folders are rescanned on change"
+#: services/mp3tunes/harmonydaemon/main.cpp:43
+msgid "The pin to be used for authentication."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:433
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:754
-msgid "Whether meta data changes are written back"
+#: services/ServicePluginManager.cpp:161 services/ServicePluginManager.cpp:178
+#: services/ServicePluginManager.cpp:195
+#, kde-format
+msgid "No service named %1 is currently loaded"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:437
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:757
-msgid "Whether changes to the track statistics are written back"
+#: services/lastfm/LastFmServiceConfig.cpp:154
+msgid "Last.fm credentials"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:441
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:760
-msgid "Whether changes to the album cover are written back"
+#: services/lastfm/LastFmServiceConfig.cpp:155
+msgid ""
+"No running KWallet found. Would you like Amarok to save your Last.fm "
+"credentials in plaintext?"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:445
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:763
-msgid "List of folders in the Collection"
+#: services/lastfm/LoveTrackAction.cpp:25
+#: services/lastfm/LastFmService.cpp:284
+msgid "Last.fm: Love"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:448
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:766
-msgid "Whether track numbers are shown in the collection browser."
+#: services/lastfm/meta/MultiPlayableCapabilityImpl_p.h:111
+msgid ""
+"To listen to this stream you need to be a paying Last.fm subscriber. All the "
+"other Last.fm features are unaffected."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:452
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:769
-msgid "Whether years are shown in the collection browser."
+#: services/lastfm/meta/MultiPlayableCapabilityImpl_p.h:117
+msgid "Error starting track from Last.fm radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:456
-#. i18n: ectx: label, entry, group (Collection)
-#: rc.cpp:772
-msgid ""
-"Whether to use Mozilla's Character Set Detector to try to guess ID3 tag "
-"encodings."
+#: services/lastfm/meta/LastFmMeta.cpp:102
+msgid "Last.fm: &Ban"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:463
-#. i18n: ectx: label, entry, group (Scrobbler)
-#: rc.cpp:775
-msgid "Submit played songs"
+#: services/lastfm/meta/LastFmMeta.cpp:103
+msgid "Ctrl+B"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:464
-#. i18n: ectx: whatsthis, entry, group (Scrobbler)
-#: rc.cpp:778
-msgid "Whether played songs are submitted to Audioscrobbler"
+#: services/lastfm/meta/LastFmMeta.cpp:104
+msgid "Ban this track"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:468
-#. i18n: ectx: label, entry, group (Scrobbler)
-#: rc.cpp:781
-msgctxt "Username for audioscrobbler login"
-msgid "Username"
+#: services/lastfm/meta/LastFmMeta.cpp:108
+msgid "Last.fm: &Skip"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:469
-#. i18n: ectx: whatsthis, entry, group (Scrobbler)
-#: rc.cpp:784
-msgid "The username to use for connecting to Audioscrobbler"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:137
+#. i18n: ectx: property (shortcut), widget (QCheckBox, cutCheckBox)
+#: services/lastfm/meta/LastFmMeta.cpp:109 rc.cpp:1316
+msgid "Ctrl+S"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:473
-#. i18n: ectx: label, entry, group (Scrobbler)
-#. i18n: file: services/ampache/AmpacheConfigWidget.ui:68
-#. i18n: ectx: property (text), widget (QTableWidget, serverList)
-#. i18n: file: services/ampache/NewServerWidget.ui:60
-#. i18n: ectx: property (text), widget (QLabel, labelPassword)
-#: rc.cpp:787 rc.cpp:1304 rc.cpp:1316
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:57
-msgid "Password"
-msgstr "Cyfrinair"
-
-#. i18n: file: amarokconfig.kcfg:474
-#. i18n: ectx: whatsthis, entry, group (Scrobbler)
-#: rc.cpp:790
-msgid "The password to use for connecting to Audioscrobbler"
+#: services/lastfm/meta/LastFmMeta.cpp:110
+msgid "Skip this track"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:478
-#. i18n: ectx: label, entry, group (Scrobbler)
-#: rc.cpp:793
-msgid "Send composer data"
+#: services/lastfm/meta/LastFmMeta.cpp:148
+#: services/lastfm/meta/LastFmMeta.cpp:436
+msgid "Track Radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:479
-#. i18n: ectx: whatsthis, entry, group (Scrobbler)
-#: rc.cpp:796
-msgid "Use composer data in Last.fm as artist"
+#: services/lastfm/meta/LastFmMeta.cpp:378
+#, kde-format
+msgid "Global Tag Radio: \"%1\""
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:483
-#. i18n: ectx: label, entry, group (Scrobbler)
-#: rc.cpp:799
-msgid "Retrieve similar artists"
+#: services/lastfm/meta/LastFmMeta.cpp:384
+#, kde-format
+msgid "User Tag Radio: \"%1\""
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:484
-#. i18n: ectx: whatsthis, entry, group (Scrobbler)
-#: rc.cpp:802
-msgid "Whether similar songs are retrieved from Audioscrobbler"
+#: services/lastfm/meta/LastFmMeta.cpp:392
+#, kde-format
+msgid "Similar Artists to \"%1\""
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:491
-#. i18n: ectx: label, entry, group (MediaDevice)
-#: rc.cpp:805
-msgid "Device type"
+#: services/lastfm/meta/LastFmMeta.cpp:396
+#, kde-format
+msgid "Artist Fan Radio: \"%1\""
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:492
-#. i18n: ectx: whatsthis, entry, group (MediaDevice)
-#: rc.cpp:808
-msgid "The type of media device."
+#: services/lastfm/meta/LastFmMeta.cpp:405
+#, kde-format
+msgid "%1's Neighbor Radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:495
-#. i18n: ectx: label, entry, group (MediaDevice)
-#: rc.cpp:811
-msgid "Mount point"
+#: services/lastfm/meta/LastFmMeta.cpp:409
+#, kde-format
+msgid "%1's Personal Radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:496
-#. i18n: ectx: whatsthis, entry, group (MediaDevice)
-#: rc.cpp:814
-msgid "The mount point used for the media device connection."
+#: services/lastfm/meta/LastFmMeta.cpp:413
+#, kde-format
+msgid "%1's Mix Radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:499
-#. i18n: ectx: label, entry, group (MediaDevice)
-#: rc.cpp:817
-msgid "Mount command"
+#: services/lastfm/meta/LastFmMeta.cpp:417
+#, kde-format
+msgid "%1's Recommended Radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:500
-#. i18n: ectx: whatsthis, entry, group (MediaDevice)
-#: rc.cpp:820
-msgid "The mount command used for the media device connection."
+#: services/lastfm/meta/LastFmMeta.cpp:421
+#, kde-format
+msgid "%1's Recommended Radio (Popularity %2)"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:503
-#. i18n: ectx: label, entry, group (MediaDevice)
-#: rc.cpp:823
-msgid "UmountCommand"
+#: services/lastfm/meta/LastFmMeta.cpp:428
+#, kde-format
+msgid "Group Radio: %1"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:504
-#. i18n: ectx: whatsthis, entry, group (MediaDevice)
-#: rc.cpp:826
-msgid "The umount command used for the media device connection."
+#: services/lastfm/meta/LastFmMeta.cpp:440
+msgid "Artist Radio"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:507
-#. i18n: ectx: label, entry, group (MediaDevice)
-#: rc.cpp:829
-msgid "Auto delete podcasts"
+#: services/lastfm/meta/LastFmMeta.cpp:553
+msgid "Last.fm is cool..."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:508
-#. i18n: ectx: whatsthis, entry, group (MediaDevice)
-#: rc.cpp:832
-msgid ""
-"Whether podcast shows already played are automatically deleted when media "
-"device is connected."
+#: services/lastfm/ScrobblerAdapter.cpp:219
+#: services/lastfm/LastFmService.cpp:543
+#, kde-format
+msgctxt "As in, lastfm"
+msgid "Loved Track: %1"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:511
-#. i18n: ectx: label, entry, group (MediaDevice)
-#: rc.cpp:835
-msgid "Sync stats"
+#: services/lastfm/biases/LastFmBias.cpp:48
+msgctxt "Name of the \"Last.fm\" similar bias"
+msgid "Last.fm similar"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:512
-#. i18n: ectx: whatsthis, entry, group (MediaDevice)
-#: rc.cpp:838
+#: services/lastfm/biases/LastFmBias.cpp:57
+msgctxt "Description of the \"Last.fm\" bias"
 msgid ""
-"Whether Amarok statistics should be synchronized with play count/ratings on "
-"device and whether tracks played should be submitted to Last.fm."
+"The \"Last.fm\" similar bias looks up tracks on Last.fm and only adds "
+"similar tracks."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:518
-#. i18n: ectx: label, entry, group (Daap)
-#: rc.cpp:841
-msgid "Manually added servers"
+#: services/lastfm/biases/LastFmBias.cpp:132
+msgctxt "Last.fm bias representation"
+msgid "Similar to the previous track (as reported by Last.fm)"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:519
-#. i18n: ectx: whatsthis, entry, group (Daap)
-#: rc.cpp:844
-msgid "Music Sharing servers added by the user."
+#: services/lastfm/biases/LastFmBias.cpp:135
+msgctxt "Last.fm bias representation"
+msgid "Similar to the previous artist (as reported by Last.fm)"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:522
-#. i18n: ectx: label, entry, group (Daap)
-#: rc.cpp:847
-msgid "Server passwords"
+#: services/lastfm/biases/LastFmBias.cpp:147
+msgid "Last.fm thinks the track is similar to"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:523
-#. i18n: ectx: whatsthis, entry, group (Daap)
-#: rc.cpp:850
-msgid "Passwords stored by hostname."
+#: services/lastfm/biases/LastFmBias.cpp:150
+msgid "the previous artist"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:529
-#. i18n: ectx: label, entry, group (Playlist Search)
-#: rc.cpp:853
-msgid "Include track names in matching"
+#: services/lastfm/biases/LastFmBias.cpp:152
+msgid "the previous track"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:533
-#. i18n: ectx: label, entry, group (Playlist Search)
-#: rc.cpp:856
-msgid "Include album names in matching"
+#: services/lastfm/biases/WeeklyTopBias.cpp:50
+msgctxt "Name of the \"WeeklyTop\" bias"
+msgid "Last.fm weekly top artist"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:537
-#. i18n: ectx: label, entry, group (Playlist Search)
-#: rc.cpp:859
-msgid "Include artist names in matching"
+#: services/lastfm/biases/WeeklyTopBias.cpp:59
+msgctxt "Description of the \"WeeklyTop\" bias"
+msgid ""
+"The \"WeeklyTop\" bias adds tracks that are in the weekly top chart of "
+"Last.fm."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:541
-#. i18n: ectx: label, entry, group (Playlist Search)
-#: rc.cpp:862
-msgid "Include genre names in matching"
+#: services/lastfm/biases/WeeklyTopBias.cpp:133
+#, kde-format
+msgctxt "WeeklyTopBias bias representation"
+msgid "Tracks from the Last.fm top lists from %1 to %2"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:545
-#. i18n: ectx: label, entry, group (Playlist Search)
-#: rc.cpp:865
-msgid "Include composer names in matching"
+#: services/lastfm/biases/WeeklyTopBias.cpp:144
+msgctxt "in WeeklyTopBias. Label for the date widget"
+msgid "from:"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:549
-#. i18n: ectx: label, entry, group (Playlist Search)
-#. i18n: file: amarokconfig.kcfg:553
-#. i18n: ectx: label, entry, group (Playlist Search)
-#: rc.cpp:868 rc.cpp:871
-msgid "Include years in matching"
+#: services/lastfm/biases/WeeklyTopBias.cpp:158
+msgctxt "in WeeklyTopBias. Label for the date widget"
+msgid "to:"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:560
-#. i18n: ectx: label, entry, group (Playlist Layout)
-#: rc.cpp:874
-msgid "The name of the layout that will be loaded on startup"
+#: services/lastfm/SimilarArtistsAction.cpp:26
+msgid "Play Similar Artists from Last.fm"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:567
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:877
-msgid ""
-"Whether Amarok uses its own internal database, as opposed to an external "
-"engine."
+#: services/lastfm/LastFmServiceSettings.cpp:138
+msgctxt "The operation was rejected by the server"
+msgid "Failed"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:571
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:880
-msgid "The hostname of the external server to connect to."
+#: services/lastfm/LastFmServiceSettings.cpp:176
+msgid "Unable to connect to Last.fm service."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:575
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:883
-msgid "Which server port to connect to the database engine."
+#: services/lastfm/LastFmService.cpp:195
+msgid "Last.fm: The social music revolution"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:579
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:886
+#: services/lastfm/LastFmService.cpp:197
 msgid ""
-"The name of the database Amarok will use. The user should have sufficient "
-"access permissions."
+"Last.fm is a popular online service that provides personal radio stations "
+"and music recommendations. A personal listening station is tailored based on "
+"your listening habits and provides you with recommendations for new music. "
+"It is also possible to play stations with music that is similar to a "
+"particular artist as well as listen to streams from people you have added as "
+"friends or that Last.fm considers your musical \"neighbors\""
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:583
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:889
-msgid "Username used to access the external database."
+#: services/lastfm/LastFmService.cpp:286
+msgid "Ctrl+L"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:587
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:892
-msgid "Password for the external database user."
+#: services/lastfm/LastFmService.cpp:339
+msgctxt "Last.fm: errorMessage"
+msgid ""
+"Either the username was not recognized, or the password was incorrect."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:591
-#. i18n: ectx: label, entry, group (MySQL)
-#: rc.cpp:895
-msgid "Keeps a running count to know when run a CHECK."
+#: services/lastfm/LastFmService.cpp:343
+msgctxt "Last.fm: errorMessage"
+msgid ""
+"There was a problem communicating with the Last.fm services. Please try "
+"again later."
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:598
-#. i18n: ectx: label, entry, group (ScriptManager)
-#: rc.cpp:898
-msgid "Whether to automatically update built-in scripts"
+#: services/lastfm/LastFmService.cpp:431
+msgid "Enter an artist name"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:599
-#. i18n: ectx: whatsthis, entry, group (ScriptManager)
-#: rc.cpp:901
-msgid "Enable/Disable automatic update for built-in scripts."
+#: services/lastfm/LastFmService.cpp:434
+msgid "Enter a tag"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:606
-#. i18n: ectx: label, entry, group (Moodbar)
-#: rc.cpp:904
-msgid ""
-"Whether to show the moodbar of the current track, if available, in the "
-"progress slider"
+#: services/lastfm/LastFmService.cpp:437
+msgid "Enter a Last.fm user name"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:607
-#. i18n: ectx: whatsthis, entry, group (Moodbar)
-#: rc.cpp:907
-msgid "Enable/Disable showing moodbar, if available, in the progress slider."
+#: services/lastfm/LastFmService.cpp:450
+#, kde-format
+msgid "Username: %1"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:611
-#. i18n: ectx: label, entry, group (Moodbar)
-#: rc.cpp:910
-msgid "The style to use when painting the moodbar"
-msgstr ""
+#: services/lastfm/LastFmService.cpp:455
+#, kde-format
+msgid "Play Count: %1 play"
+msgid_plural "Play Count: %1 plays"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: amarokconfig.kcfg:618
-#. i18n: ectx: label, entry, group (PlaylistGenerator)
-#: rc.cpp:913
-msgid "Quality factor for Automated Playlist Generator"
+#: services/lastfm/LastFmService.cpp:504
+msgid "Create a Custom Last.fm Station"
 msgstr ""
 
-#. i18n: file: amarokconfig.kcfg:619
-#. i18n: ectx: whatsthis, entry, group (PlaylistGenerator)
-#: rc.cpp:916
-msgid ""
-"A value between 0 and 10 that controls whether the Automated Playlist "
-"Generator tries to optimize for speed (0) or accuracy (10)."
+#: services/lastfm/LastFmService.cpp:507
+msgid "Tag"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackBar.ui:29
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_likeButton)
-#: rc.cpp:919
-msgid "Tell the developers about something you liked"
+#: services/lastfm/LastFmService.cpp:507
+msgid "User"
+msgstr "Defnyddiwr"
+
+#: services/lastfm/LastFmServiceCollection.cpp:42
+#, kde-format
+msgid "%1's Streams"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackBar.ui:33
-#. i18n: ectx: property (whatsThis), widget (QToolButton, m_likeButton)
-#. i18n: file: likeback/LikeBackBar.ui:50
-#. i18n: ectx: property (whatsThis), widget (QToolButton, m_dislikeButton)
-#. i18n: file: likeback/LikeBackBar.ui:67
-#. i18n: ectx: property (whatsThis), widget (QToolButton, m_bugButton)
-#. i18n: file: likeback/LikeBackBar.ui:84
-#. i18n: ectx: property (whatsThis), widget (QToolButton, m_featureButton)
-#: rc.cpp:922 rc.cpp:929 rc.cpp:936 rc.cpp:943
-msgid ""
-"<html>Click on one of these icons to send your feedback to the developers of "
-"this application. You can disable the icons with the \"Show Feedback Icons\" "
-"checkbox in the Help menu.</html>\n"
-"      "
+#: services/lastfm/LastFmServiceCollection.cpp:46
+msgid "Global Tags"
+msgstr "Tagiau Eang"
+
+#: services/lastfm/LastFmServiceCollection.cpp:50
+msgid "Neighbors' Loved Radio"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackBar.ui:46
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_dislikeButton)
-#: rc.cpp:926
-msgid "Tell the developers about something you did not like"
+#: services/lastfm/LastFmServiceCollection.cpp:54
+msgid "Neighbors' Personal Radio"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackBar.ui:63
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_bugButton)
-#: rc.cpp:933
-msgid "Tell the developers about a problem in the application"
+#: services/lastfm/LastFmServiceCollection.cpp:58
+msgid "Friends' Loved Radio"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackBar.ui:80
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_featureButton)
-#: rc.cpp:940
-msgid ""
-"Tell the developers about new features you would like to have in this "
-"application"
+#: services/lastfm/LastFmServiceCollection.cpp:62
+msgid "Friends' Personal Radio"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:45
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:947
-msgid "Your comment:"
+#: services/lastfm/LastFmServiceCollection.cpp:141
+#: covermanager/CoverFoundDialog.cpp:128
+msgid "Last.fm"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:71
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:950
-msgid "Your comment is about:"
+#: services/lastfm/LastFmTreeModel.cpp:172
+msgid "Personal Radio"
+msgstr "Radio Personol"
+
+#: services/lastfm/LastFmTreeModel.cpp:173
+msgid "Neighborhood"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:86
-#. i18n: ectx: property (text), widget (QRadioButton, likeRadio_)
-#: rc.cpp:953
-msgid "Something you like"
+#: services/lastfm/LastFmTreeModel.cpp:331
+msgid "My Recommendations"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:99
-#. i18n: ectx: property (text), widget (QRadioButton, dislikeRadio_)
-#: rc.cpp:956
-msgid "Something you dislike"
+#: services/lastfm/LastFmTreeModel.cpp:333
+msgid "My Radio Station"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:112
-#. i18n: ectx: property (text), widget (QRadioButton, bugRadio_)
-#: rc.cpp:959
-msgid "An improper behavior of the application"
+#: services/lastfm/LastFmTreeModel.cpp:335
+msgid "My Mix Radio"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:125
-#. i18n: ectx: property (text), widget (QRadioButton, featureRadio_)
-#: rc.cpp:962
-msgid "A new feature you desire"
+#: services/lastfm/LastFmTreeModel.cpp:337
+msgid "My Neighborhood"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:141
-#. i18n: ectx: property (text), widget (QCheckBox, specifyEmailCheckBox_)
-#: rc.cpp:965
-msgid "Specify an email address to be contacted back:"
+#: services/lastfm/LastFmTreeModel.cpp:342
+msgid "My Top Artists"
 msgstr ""
 
-#. i18n: file: likeback/LikeBackDialog.ui:188
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:968
-msgid ""
-"<html>Specifying an email address will allow the developers to ask you for "
-"more information on your report, or to tell you when your feature will be "
-"implemented.<br/>\n"
-"<b>Your email address will not be used for anything else but this "
-"report.</b></html>"
+#: services/lastfm/LastFmTreeModel.cpp:344
+msgid "My Tags"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:105
-#. i18n: ectx: property (text), widget (QCommandLinkButton, justCopyButton)
-#: rc.cpp:972
-msgid "&Copy"
+#: services/lastfm/LastFmTreeModel.cpp:346
+msgid "Friends"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:114
-#. i18n: ectx: property (description), widget (QCommandLinkButton, justCopyButton)
-#: rc.cpp:975
-msgid "Just copy the tracks without transcoding them."
+#: services/lastfm/LastFmTreeModel.cpp:348
+msgid "Neighbors"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:127
-#. i18n: ectx: property (text), widget (QCommandLinkButton, transcodeWithDefaultsButton)
-#: rc.cpp:978
-msgid "&Transcode"
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:312
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: services/ServiceBase.cpp:147 rc.cpp:2021
+msgid "Group By"
+msgstr "Casglu yn ôl"
+
+#: services/ServiceBase.cpp:311
+msgid "This service does not accept any messages"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:149
-#. i18n: ectx: property (text), widget (QCommandLinkButton, transcodeWithOptionsButton)
-#: rc.cpp:981
-msgid "Transcode With Custom &Parameters"
+#: services/ServiceBase.cpp:318
+msgid "ERROR: unknown message"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:158
-#. i18n: ectx: property (description), widget (QCommandLinkButton, transcodeWithOptionsButton)
-#: rc.cpp:984
-msgid ""
-"Configure your own encoding parameters for this transcoding operation."
+#: services/opmldirectory/OpmlDirectoryService.cpp:53
+msgid "Podcast Directory"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:205
-#. i18n: ectx: property (text), widget (QCommandLinkButton, backButton)
-#: rc.cpp:987 context/applets/similarartists/SimilarArtistsApplet.cpp:76
-#: context/applets/wikipedia/WikipediaApplet.cpp:575
-msgid "Back"
+#: services/opmldirectory/OpmlDirectoryService.cpp:74
+msgid "A large listing of podcasts"
 msgstr ""
 
-#. i18n: file: transcoding/TranscodingAssistantDialog.ui:340
-#. i18n: ectx: property (text), widget (QLabel, formatNameLabel)
-#: rc.cpp:990
-msgid "Format Name"
+#: services/opmldirectory/OpmlDirectoryService.cpp:77
+msgid ""
+"A comprehensive list of searchable podcasts that you can subscribe to "
+"directly from within Amarok."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:30
-#. i18n: ectx: property (windowTitle), widget (QWidget, PodcastSettingsBase)
-#: rc.cpp:993
-msgid "Podcast Configuration"
+#: services/opmldirectory/OpmlDirectoryService.cpp:143
+#: services/opmldirectory/OpmlDirectoryModel.cpp:41
+msgid "Add OPML"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:52
-#. i18n: ectx: property (text), widget (QLabel, m_urlLabel)
-#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:65
-#. i18n: ectx: property (text), widget (QLabel, UrlLabel)
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:223
-#. i18n: ectx: property (text), widget (QLabel, urlLabel)
-#: rc.cpp:996 rc.cpp:1140 rc.cpp:2461
-msgid "URL:"
+#: services/opmldirectory/OpmlDirectoryService.cpp:168
+msgid "Add an OPML file to the list."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:68
-#. i18n: ectx: property (text), widget (QLabel, m_saveLocationlabel)
-#: rc.cpp:999
-msgid "Save Location:"
+#: services/opmldirectory/OpmlDirectoryInfoParser.cpp:56
+msgid "Loading Podcast Info..."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:99
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_autoFetchCheck)
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:102
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autoFetchCheck)
-#: rc.cpp:1002 rc.cpp:1005
-msgid "When checked, Amarok will automatically scan the podcast for updates"
+#: services/opmldirectory/OpmlDirectoryInfoParser.cpp:66
+msgid "Fetching Podcast Info"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:105
-#. i18n: ectx: property (text), widget (QCheckBox, m_autoFetchCheck)
-#: rc.cpp:1008
-msgid "Automatically scan for updates"
+#: services/opmldirectory/OpmlDirectoryModel.cpp:294
+msgctxt "Heading of Add OPML dialog"
+msgid "Add OPML"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:112
-#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
-#: rc.cpp:1011
-msgid "Media Download"
+#: services/opmldirectory/OpmlDirectoryModel.cpp:340
+msgid "New Folder"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:121
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_downloadRadio)
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:124
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_downloadRadio)
-#: rc.cpp:1014 rc.cpp:1017
-msgid "Download media as soon as it becomes available"
-msgstr ""
+#: services/jamendo/JamendoXmlParser.cpp:153
+#, kde-format
+msgctxt ""
+"First part of: Jamendo.com database update complete. Added 3 tracks on 4 "
+"albums from 5 artists."
+msgid "Jamendo.com database update complete. Added 1 track on "
+msgid_plural "Jamendo.com database update complete. Added %1 tracks on "
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:127
-#. i18n: ectx: property (text), widget (QRadioButton, m_downloadRadio)
-#: rc.cpp:1020
-msgid "Download when a&vailable"
+#: services/jamendo/JamendoXmlParser.cpp:154
+#, kde-format
+msgctxt ""
+"Middle part of: Jamendo.com database update complete. Added 3 tracks on 4 "
+"albums from 5 artists."
+msgid "1 album from "
+msgid_plural "%1 albums from "
+msgstr[0] ""
+msgstr[1] ""
+
+#: services/jamendo/JamendoXmlParser.cpp:155
+#, kde-format
+msgctxt ""
+"Last part of: Jamendo.com database update complete. Added 3 tracks on 4 "
+"albums from 5 artists."
+msgid "1 artist."
+msgid_plural "%1 artists."
+msgstr[0] ""
+msgstr[1] ""
+
+#: services/jamendo/JamendoService.cpp:80
+msgid "A archive of free, Creative Commons licensed music"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:134
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_streamRadio)
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:137
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_streamRadio)
-#: rc.cpp:1023 rc.cpp:1026
+#: services/jamendo/JamendoService.cpp:83
 msgid ""
-"Media must be explicitly downloaded, otherwise the podcast will be played "
-"from the remote server."
+"Jamendo.com puts artists and music lovers in touch with each other. The site "
+"allows artists to upload their own albums to share them with the world and "
+"users to download all of them for free. Listen to and download all "
+"Jamendo.com contents from within Amarok."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:140
-#. i18n: ectx: property (text), widget (QRadioButton, m_streamRadio)
-#: rc.cpp:1029
-msgid "Stream or download on re&quest"
+#: services/jamendo/JamendoService.cpp:119
+msgctxt "Fetch new information from the website"
+msgid "Update"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:152
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_purgeCheck)
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:155
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_purgeCheck)
-#: rc.cpp:1032 rc.cpp:1035
-msgid "If checked, Amarok will throw away old podcast episodes"
-msgstr ""
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:95
+#. i18n: ectx: property (text), item, widget (QComboBox, typeComboBox)
+#: services/jamendo/JamendoService.cpp:125 rc.cpp:859
+msgid "Download"
+msgstr "Lawrlwytho"
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:158
-#. i18n: ectx: property (text), widget (QCheckBox, m_purgeCheck)
-#: rc.cpp:1038
-msgid "Limit &number of episodes"
+#: services/jamendo/JamendoService.cpp:189
+msgid "Downloading Jamendo.com database..."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:181
-#. i18n: ectx: property (text), widget (QLabel, m_purgeCountLabel)
-#: rc.cpp:1041
-msgid "Keep maximum of:"
+#: services/jamendo/JamendoService.cpp:211
+msgid "Updating the local Jamendo database."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:191
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, m_purgeCountSpinBox)
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:194
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, m_purgeCountSpinBox)
-#: rc.cpp:1044 rc.cpp:1047
-msgid "The maximum number of podcast items to store"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:83
+#. i18n: ectx: property (text), widget (QPushButton, downloadButton)
+#: services/jamendo/JamendoMeta.cpp:135 services/jamendo/JamendoMeta.cpp:371
+#: rc.cpp:798
+msgid "&Download"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:208
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_writeTagsCheck)
-#: rc.cpp:1050
-msgid ""
-"The RSS feed and the tags in the downloaded file sometimes do not contain "
-"the same information. Writing the tags ensures the information in the "
-"playlist and on media devices will be the same as in the feed."
+#: services/jamendo/JamendoMeta.cpp:153
+msgid "Jamendo.com: &Download"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:211
-#. i18n: ectx: property (text), widget (QCheckBox, m_writeTagsCheck)
-#: rc.cpp:1053
-msgid "Write feed information to tags after downloading."
+#: services/jamendo/JamendoMeta.cpp:172
+msgid "A site where artists can freely share their music"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:251
-#. i18n: ectx: property (text), widget (QPushButton, m_filenameLayoutConfigWidgetButton)
-#: rc.cpp:1056
-msgid "Episode Filename Configuration"
+#: services/jamendo/JamendoInfoParser.cpp:46
+#: services/jamendo/JamendoInfoParser.cpp:77
+msgid "No description available..."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:32
-#. i18n: ectx: property (text), widget (QLabel, m_intervalLabel)
-#: rc.cpp:1059
-msgid "Auto-update:"
+#: services/jamendo/JamendoInfoParser.cpp:61
+#: services/jamendo/JamendoInfoParser.cpp:93
+#: services/jamendo/JamendoInfoParser.cpp:113
+msgid "From Jamendo.com"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:57
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, m_autoUpdateInterval)
-#: rc.cpp:1062
-msgctxt "automatic updates turned off"
-msgid "disabled"
+#: services/amazon/AmazonShoppingCartView.cpp:65
+msgid "Remove from Cart"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:79
-#. i18n: ectx: property (text), widget (QLabel, m_baseDirLabel)
-#: rc.cpp:1065
-msgid "Base directory:"
+#: services/amazon/AmazonMeta.cpp:139
+msgid "Snippet taken from the Amazon MP3 store"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:107
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_baseDirUrl)
-#: rc.cpp:1068
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Base directory for all new "
-"podcast channels.</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">When a podcast channel is "
-"added <span style=\" font-style:italic;\">&lt;base "
-"directory&gt;</span>/<span style=\" font-style:italic;\">&lt;channel "
-"name&gt;</span> is used as the download directory.</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">This can be changed for "
-"each channel individually.</p></body></html>"
+#: services/amazon/AmazonItemTreeView.cpp:272
+msgid "Add to Cart"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:112
-#. i18n: ectx: property (whatsThis), widget (KUrlRequester, m_baseDirUrl)
-#: rc.cpp:1077
-msgid ""
-"Base directory for all new podcast channels.\n"
-"When a podcast channel is added <base directory>/<channel name> is used as "
-"the download directory.\n"
-"This can be changed for each channel individually."
+#: services/amazon/AmazonItemTreeView.cpp:281
+msgid "Add Preview to Playlist"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:29
-#. i18n: ectx: property (windowTitle), widget (QWidget, PodcastFilenameLayoutConfigWidget)
-#: rc.cpp:1082
-msgid "Podcast Filename Layout Configuration"
+#: services/amazon/AmazonItemTreeView.cpp:290
+msgid "Load Details..."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:53
-#. i18n: ectx: property (text), widget (QRadioButton, m_filenameLayoutDefault)
-#: rc.cpp:1085
-msgid "Specified by podcast channel"
+#: services/amazon/AmazonItemTreeView.cpp:299
+msgid "Search for Album..."
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:78
-#. i18n: ectx: property (text), widget (QRadioButton, m_filenameLayoutCustom)
-#: rc.cpp:1088
-msgid "custom"
+#: services/amazon/AmazonStore.cpp:100
+msgid "Access the Amazon MP3 Store directly from Amarok"
 msgstr ""
 
-#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:109
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_filenameLayoutText)
-#: rc.cpp:1092
-#, no-c-format
+#: services/amazon/AmazonStore.cpp:104
 msgid ""
-"Available fields : "
-"%artist%,%title%,%genre%,%year%,%composer%,%pubdate%,%number%,%album%"
+"This plugin allows searching and purchasing songs and albums from the Amazon "
+"MP3 store. Amarok gets a share of the profits made by this service."
 msgstr ""
 
-#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, UmsConfiguration)
-#: rc.cpp:1095
-msgid "USB Mass Storage device configuration"
+#: services/amazon/AmazonStore.cpp:191
+#, kde-format
+msgid "<em>%1</em> has been added to your shopping cart."
 msgstr ""
 
-#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:26
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1098
-msgid "Music folder:"
+#: services/amazon/AmazonStore.cpp:214 services/amazon/AmazonStore.cpp:319
+msgid "Error: Unable to write temporary file. :-("
 msgstr ""
 
-#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1101
-msgid "Podcast folder:"
+#: services/amazon/AmazonStore.cpp:277
+msgid "Select your Amazon locale - Amarok"
 msgstr ""
 
-#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:46
-#. i18n: ectx: property (text), widget (QCheckBox, m_autoConnect)
-#: rc.cpp:1104
-msgid "Enabled"
+#: services/amazon/AmazonStore.cpp:289
+msgid ""
+"<b>MP3 Music Store</b><br/><br/>Please select a valid country in the "
+"settings to make the store work."
 msgstr ""
 
-#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:53
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1107
-msgid "Use automatically when connected"
+#: services/amazon/AmazonStore.cpp:409
+msgid "Select results page to show"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:26
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1113
-msgid "Available formats"
+#: services/amazon/AmazonStore.cpp:433
+msgctxt "Add selected item to your shopping cart"
+msgid "Add to Cart"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:32
-#. i18n: ectx: property (text), widget (QRadioButton, oggButton)
-#: rc.cpp:1116 core/transcoding/formats/TranscodingVorbisFormat.cpp:68
-msgid "Ogg Vorbis"
+#: services/amazon/AmazonStore.cpp:434
+msgid "Add selected item to your shopping cart"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:39
-#. i18n: ectx: property (text), widget (QRadioButton, flacButton)
-#: rc.cpp:1119
-msgid "Flac"
+#: services/amazon/AmazonStore.cpp:441
+msgctxt "View your shopping cart contents"
+msgid "View Cart"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:46
-#. i18n: ectx: property (text), widget (QRadioButton, wavButton)
-#: rc.cpp:1122
-msgid "Wav"
+#: services/amazon/AmazonStore.cpp:442
+msgid "View your shopping cart contents"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:53
-#. i18n: ectx: property (text), widget (QRadioButton, mp3Button)
-#: rc.cpp:1125
-msgid "Mp3"
+#: services/amazon/AmazonStore.cpp:449
+msgctxt "Checkout your shopping cart"
+msgid "Checkout"
 msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:1128 amarokurls/BookmarkModel.cpp:268
-msgid "Description"
-msgstr "Disgrifiad"
+#: services/amazon/AmazonStore.cpp:450
+msgid "Checkout your shopping cart"
+msgstr ""
 
-#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:82
-#. i18n: ectx: property (text), widget (QPushButton, advancedButton)
-#: rc.cpp:1131
-msgid "Advanced"
+#: services/amazon/AmazonStore.cpp:470
+msgid "Error: Querying MP3 Music Store database failed. :-("
 msgstr ""
 
-#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:37
-#. i18n: ectx: property (text), widget (QLabel, instructionsLabel)
-#: rc.cpp:1137
-msgid "Add a local or remote OPML file to be included in the list."
+#: services/amazon/AmazonStore.cpp:505
+msgid "Error: Received an invalid reply. :-("
 msgstr ""
 
-#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:78
-#. i18n: ectx: property (text), widget (QLabel, titleLabel)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:556
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:1143 rc.cpp:1836
-msgid "Title:"
+#: services/amazon/AmazonStore.cpp:525
+msgid "Error: Unable to open temporary file. :-("
 msgstr ""
 
-#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:88
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, titleEdit)
-#: rc.cpp:1146
-msgid "If left blank the title from the OPML will be used."
+#: services/amazon/AmazonStore.cpp:545
+msgid "Error: Unable to parse temporary file. :-("
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, magnatuneDownloadDialogBase)
-#: rc.cpp:1149
-msgid "Magnatune.com Album Download"
+#: services/amazon/AmazonShoppingCartDialog.cpp:34
+#: services/amazon/AmazonShoppingCartDialog.cpp:59
+#, kde-format
+msgid "Shopping cart value: %1"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:1152
-msgid "Download options"
+#: services/amazon/AmazonUrlRunner.cpp:41
+msgctxt ""
+"A type of command that triggers an action in the integrated MP3 Music Store "
+"service"
+msgid "Amazon"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:25
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1155
-msgid "Select Format:"
+#: services/amazon/AmazonItemTreeModel.cpp:108
+#: services/amazon/AmazonItemTreeModel.cpp:129
+msgid "<b>Artist:</b> "
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:38
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:1158
-msgid "Download to:"
+#: services/amazon/AmazonItemTreeModel.cpp:112
+#: services/amazon/AmazonItemTreeModel.cpp:133
+msgid "<b>Album:</b> "
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:1161
-msgid ""
-"If you download to a location that is already being monitored by Amarok, the "
-"album will automatically be added to your collection."
+#: services/amazon/AmazonItemTreeModel.cpp:116
+#: services/amazon/AmazonItemTreeModel.cpp:141
+msgid "<b>Price:</b> "
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:67
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:1164
-msgid "Magnatune info"
+#: services/amazon/AmazonItemTreeModel.cpp:137
+msgid "<b>Track:</b> "
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:83
-#. i18n: ectx: property (text), widget (QPushButton, downloadButton)
-#: rc.cpp:1167 services/jamendo/JamendoMeta.cpp:135
-#: services/jamendo/JamendoMeta.cpp:371
-msgid "&Download"
+#: services/amazon/AmazonItemTreeModel.cpp:171
+msgid "Price"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneSignupDialogBase.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, SignupDialog)
-#: rc.cpp:1170
-msgid "Magnatune.com member signup"
+#: services/scriptable/ScriptableServiceInfoParser.cpp:44
+#: services/scriptable/ScriptableServiceInfoParser.cpp:62
+#: services/scriptable/ScriptableServiceInfoParser.cpp:78
+#: services/scriptable/ScriptableServiceInfoParser.cpp:94
+msgid "Loading info..."
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneSignupDialogBase.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1174
-#, no-c-format
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Liberation Sans'; font-size:9pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">By becoming a "
-"Magnatune.com member, you get unlimited download access and can download any "
-"album from within Amarok with a single mouse click. By joining, you can also "
-"listen to all streaming tracks from Magnatune.com ad-free.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The Amarok team gets 10% "
-"of your initial membership payment, so by joining, you are also supporting "
-"the development of Amarok.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">As always, the artists get "
-"50% of your membership payment(s) distributed based on which artist you "
-"download and stream.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">To read more about "
-"Magnatune.com memberships, or to sign up, click here: <a "
-"href=\"http://magnatune.com/downloads?referal_id=amarok\"><span style=\" "
-"text-decoration: underline; color:#0057ae;\">Membership Info</span></a> "
-"</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">After joining, go to the "
-"Magnatune config in \"Settings->Configure Amarok->Plugins\" and enter your "
-"membership information. </p></body></html>"
+#: TrayIcon.cpp:141 widgets/VolumeDial.cpp:301 widgets/VolumeDial.cpp:340
+msgid "Muted"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneSignupDialogBase.ui:45
-#. i18n: ectx: property (text), widget (QPushButton, closeButton)
-#: rc.cpp:1189 firstruntutorial/FirstRunTutorialPage.cpp:56
-#: context/applets/lyrics/LyricsApplet.cpp:465
-#: context/applets/albums/Albums.cpp:345
-msgid "Close"
+#: TrayIcon.cpp:145
+#, kde-format
+msgid "%1%"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, magnatuneReDownloadDialogBase)
-#: rc.cpp:1192
-msgid "Redownload manager"
+#: TrayIcon.cpp:147
+#, kde-format
+msgid "<i>Volume: %1</i>"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:19
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1195
-msgid "These are the albums that you have previously downloaded:"
-msgstr ""
+#: TrayIcon.cpp:152
+#, kde-format
+msgid "Score: %1"
+msgstr "Sgôr: %1"
 
-#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, redownloadButton)
-#: rc.cpp:1198
-msgid "Re&download"
-msgstr ""
+#: TrayIcon.cpp:170
+#, kde-format
+msgid "Rating: %1"
+msgstr "Poblogrwydd : %1"
 
-#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:36
-#. i18n: ectx: property (text), widget (QPushButton, cancelButton)
-#. i18n: file: dialogs/MusicBrainzTagger.ui:68
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_cancel)
-#. i18n: file: dialogs/TagDialogBase.ui:1198
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_cancel)
-#: rc.cpp:1201 rc.cpp:1365 rc.cpp:1759
-msgid "&Cancel"
+#: TrayIcon.cpp:176
+#, kde-format
+msgid "Play count: %1"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:60
-#. i18n: ectx: property (text), widget (QTreeWidget, redownloadListView)
-#: rc.cpp:1204
-msgid "Artist - Album"
+#: TrayIcon.cpp:180
+#, kde-format
+msgid "Last played: %1"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:1207
-msgid "Redownloads"
+#: scriptengine/AmarokNetworkScript.cpp:70
+msgctxt "do not translate 'DataDownloader' or 'qt.core'"
+msgid "qt.core must be loaded to use DataDownloader"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:1210
-msgid ""
-"Enter your e-mail here to be able to redownload any previous purchase from "
-"Magnatune directly from within Amarok."
+#: aboutdialog/OcsPersonItem.cpp:95
+msgid "Email contributor"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:33
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:1213
-msgctxt "Username for logins to Magnatune"
-msgid "E-mail:"
+#: aboutdialog/OcsPersonItem.cpp:103 aboutdialog/OcsPersonItem.cpp:274
+msgid "Visit contributor's homepage"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:53
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1216
-msgid "Membership Options"
+#: aboutdialog/OcsPersonItem.cpp:179
+#, kde-format
+msgctxt "A person's location: City, Country"
+msgid "%1, %2"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:59
-#. i18n: ectx: property (text), widget (QCheckBox, isMemberCheckbox)
-#: rc.cpp:1219
-msgid "I am a member"
+#: aboutdialog/OcsPersonItem.cpp:199
+msgid "IRC channels: "
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:79
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1222
-msgid "Membership type:"
+#: aboutdialog/OcsPersonItem.cpp:212
+msgid "Favorite music: "
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:90
-#. i18n: ectx: property (text), item, widget (QComboBox, typeComboBox)
-#: rc.cpp:1225
-msgid "Stream"
+#: aboutdialog/OcsPersonItem.cpp:217
+#, kde-format
+msgid "Visit %1's openDesktop.org profile"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:95
-#. i18n: ectx: property (text), item, widget (QComboBox, typeComboBox)
-#: rc.cpp:1228 services/jamendo/JamendoService.cpp:125
-msgid "Download"
-msgstr "Lawrlwytho"
-
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1231
-msgctxt "Username for logins to Magnatune"
-msgid "Username:"
+#: aboutdialog/OcsPersonItem.cpp:219
+#, kde-format
+msgid "Visit %1's profile on openDesktop.org"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:117
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1234
-msgid "Password:"
-msgstr "Cyfrinair:"
+#: aboutdialog/OcsPersonItem.cpp:253
+msgid "Visit contributor's blog"
+msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:135
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:1237
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Serif'; font-size:8pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Sans Serif';\">For more information about the Magnatune.com "
-"memberships, and to sign up, go to  </span><a "
-"href=\"http://magnatune.com/compare_plans?referal_id=amarok\"><span style=\" "
-"font-family:'Sans Serif'; text-decoration: underline; "
-"color:#0000ff;\">http://magnatune.com/compare_plans</span></a></p></body></ht"
-"ml>"
+#: aboutdialog/OcsPersonItem.cpp:258
+msgid "Visit contributor's del.icio.us profile"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:157
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:1244
-msgid "Stream Options"
+#: aboutdialog/OcsPersonItem.cpp:263
+msgid "Visit contributor's Digg profile"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:163
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:1247
-msgid "Preview stream type:"
+#: aboutdialog/OcsPersonItem.cpp:268
+msgid "Visit contributor's Facebook profile"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:171
-#. i18n: ectx: property (text), item, widget (QComboBox, streamTypeComboBox)
-#: rc.cpp:1250
-msgid "Ogg"
+#: aboutdialog/OcsPersonItem.cpp:284
+msgid "Visit contributor's Last.fm profile"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:176
-#. i18n: ectx: property (text), item, widget (QComboBox, streamTypeComboBox)
-#: rc.cpp:1253
-msgid "High Quality Mp3"
+#: aboutdialog/OcsPersonItem.cpp:292
+msgid "Visit contributor's LinkedIn profile"
 msgstr ""
 
-#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:181
-#. i18n: ectx: property (text), item, widget (QComboBox, streamTypeComboBox)
-#: rc.cpp:1256
-msgid "Low Quality Mp3"
+#: aboutdialog/OcsPersonItem.cpp:297
+msgid "Visit contributor's MySpace homepage"
 msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:38
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:1259
-msgid "Last.fm Profile"
+#: aboutdialog/OcsPersonItem.cpp:302
+msgid "Visit contributor's Reddit profile"
 msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:44
-#. i18n: ectx: property (text), widget (QLabel, labelUsername)
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:101
-#. i18n: ectx: property (text), widget (QLabel, label_User)
-#: rc.cpp:1262 rc.cpp:2252
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
+#: aboutdialog/OcsPersonItem.cpp:307
+msgid "Visit contributor's YouTube profile"
+msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, labelPassword)
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:134
-#. i18n: ectx: property (text), widget (QLabel, label_Password)
-#: rc.cpp:1265 rc.cpp:2259
-msgid "&Password:"
-msgstr "&Cyfrinair:"
+#: aboutdialog/OcsPersonItem.cpp:312
+msgid "Visit contributor's Twitter feed"
+msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:86
-#. i18n: ectx: property (text), widget (QLabel, kActiveLabel1)
-#: rc.cpp:1268
-msgid "<a href=\"http://www.last.fm:80/signup.php\">Sign up to Last.fm</a>"
+#: aboutdialog/OcsPersonItem.cpp:317
+msgid "Visit contributor's Wikipedia profile"
 msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:96
-#. i18n: ectx: property (text), widget (QPushButton, testLogin)
-#: rc.cpp:1271 services/lastfm/LastFmServiceSettings.cpp:220
-msgid "&Test Login"
+#: aboutdialog/OcsPersonItem.cpp:322
+msgid "Visit contributor's Xing profile"
 msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:106
-#. i18n: ectx: property (text), widget (QLabel, kActiveLabel2)
-#: rc.cpp:1274
-msgid ""
-"Why not join the <a href=\"http://www.last.fm:80/group/Amarok+Users\">Amarok "
-"Last.fm group</a> and share your musical tastes with other Amarok users?"
+#: aboutdialog/OcsPersonItem.cpp:327
+msgid "Visit contributor's identi.ca feed"
 msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:116
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:1277
-msgid "Last.fm Services"
+#: aboutdialog/OcsPersonItem.cpp:332
+msgid "Visit contributor's libre.fm profile"
 msgstr ""
 
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:125
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SubmitPlayedSongs)
-#: rc.cpp:1280
-msgid "&Submit tracks"
-msgstr ""
-
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:135
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_RetrieveSimilarArtists)
-#: rc.cpp:1283
-msgid "&Retrieve similar artists"
-msgstr ""
-
-#. i18n: file: services/lastfm/LastFmConfigWidget.ui:145
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ScrobbleComposer)
-#: rc.cpp:1286
-msgid "&Use composer data if available in Last.fm as artist"
+#: aboutdialog/OcsPersonItem.cpp:337
+msgid "Visit contributor's StackOverflow profile"
 msgstr ""
 
-#. i18n: file: services/ampache/AmpacheConfigWidget.ui:23
-#. i18n: ectx: property (text), widget (QPushButton, addButton)
-#: rc.cpp:1289
-msgid "Add Server"
+#: aboutdialog/libattica-ocsclient/personlistjob.cpp:108
+msgid "Unable to parse avatar image data."
 msgstr ""
 
-#. i18n: file: services/ampache/AmpacheConfigWidget.ui:30
-#. i18n: ectx: property (text), widget (QPushButton, removeButton)
-#: rc.cpp:1292
-msgid "Remove Server"
+#: aboutdialog/ExtendedAboutDialog.cpp:73
+msgid ""
+"<qt>No information available.<br />The supplied KAboutData object does not "
+"exist.</qt>"
 msgstr ""
 
-#. i18n: file: services/ampache/AmpacheConfigWidget.ui:58
-#. i18n: ectx: property (text), widget (QTableWidget, serverList)
-#. i18n: file: services/ampache/NewServerWidget.ui:27
-#. i18n: ectx: property (text), widget (QLabel, labelServerAddress)
-#: rc.cpp:1298 rc.cpp:1310
-msgid "Server Address"
+#: aboutdialog/ExtendedAboutDialog.cpp:82
+msgid ""
+"<qt>No information available.<br />The supplied OcsData object does not "
+"exist.</qt>"
 msgstr ""
 
-#. i18n: file: services/ampache/AmpacheConfigWidget.ui:63
-#. i18n: ectx: property (text), widget (QTableWidget, serverList)
-#. i18n: file: services/ampache/NewServerWidget.ui:50
-#. i18n: ectx: property (text), widget (QLabel, labelUsername)
-#: rc.cpp:1301 rc.cpp:1313
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:53
-msgid "Username"
-msgstr "Enw defnyddiwr"
+#: aboutdialog/ExtendedAboutDialog.cpp:91
+#, kde-format
+msgid "About %1"
+msgstr "Ynglyn â %1"
 
-#. i18n: file: services/ampache/NewServerWidget.ui:74
-#. i18n: ectx: property (text), widget (KPushButton, verifyButton)
-#: rc.cpp:1319
-msgid "Check Connection"
+#: aboutdialog/ExtendedAboutDialog.cpp:112
+#, kde-format
+msgid ""
+"<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE "
+"%3</html>"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1322
-msgid "MP3tunes Login"
+#: aboutdialog/ExtendedAboutDialog.cpp:152
+#, kde-format
+msgid "License: %1"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1325
-msgctxt "The e-mail address for Mp3Tunes logins"
-msgid "E-Mail:"
+#: aboutdialog/ExtendedAboutDialog.cpp:166
+msgid "&About"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1328
-msgctxt "The MP3Tunes password"
-msgid "Password:"
+#: aboutdialog/ExtendedAboutDialog.cpp:183
+msgid "Get data from openDesktop.org to learn more about the team"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:42
-#. i18n: ectx: property (toolTip), widget (QCheckBox, enableHarmony)
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:49
-#. i18n: ectx: property (toolTip), widget (QLabel, label_3)
-#: rc.cpp:1331 rc.cpp:1334
+#: aboutdialog/ExtendedAboutDialog.cpp:195
 msgid ""
-"AutoSync is a feature from MP3tunes which allows you to automatically move "
-"your music between computers and devices."
+"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report "
+"bugs.\n"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:52
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_3)
-#: rc.cpp:1337
-msgid ""
-"AutoSync is a feature from MP3tunes which allows you to automatically move "
-"your music between computers and devices. You can upload music from one "
-"location and have it download instantly to other locations."
+#: aboutdialog/ExtendedAboutDialog.cpp:200
+#: aboutdialog/ExtendedAboutDialog.cpp:206
+#, kde-format
+msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1340
-msgctxt "Enable harmony"
-msgid "Enable AutoSync"
+#: aboutdialog/ExtendedAboutDialog.cpp:225
+msgid "A&uthor"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:62
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:1343
-msgid "PIN Code:"
+#: aboutdialog/ExtendedAboutDialog.cpp:225
+msgid "A&uthors"
 msgstr ""
 
-#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:89
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:1346
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><a "
-"href=\"https://shop.mp3tunes.com/myaccount/registration/\"><span style=\" "
-"text-decoration: underline; color:#0057ae;\">Get an MP3tunes "
-"locker</span></a></p></body></html>"
+#: aboutdialog/ExtendedAboutDialog.cpp:239
+msgid "Get data from openDesktop.org to learn more about contributors"
 msgstr ""
 
-#. i18n: file: dialogs/MusicBrainzTagger.ui:12
-#. i18n: ectx: property (windowTitle), widget (QWidget, MusicBrainzTagger)
-#: rc.cpp:1353 dialogs/TagDialog.cpp:1418
-msgid "MusicBrainz Tagger"
+#: aboutdialog/ExtendedAboutDialog.cpp:253
+msgid "&Thanks To"
 msgstr ""
 
-#. i18n: file: dialogs/MusicBrainzTagger.ui:49
-#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_saveAndClose)
-#: rc.cpp:1356
-msgid "Update tags for checked tracks and exit"
+#: aboutdialog/ExtendedAboutDialog.cpp:266
+msgid "Get data from openDesktop.org to learn more about our generous donors"
 msgstr ""
 
-#. i18n: file: dialogs/MusicBrainzTagger.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_saveAndClose)
-#: rc.cpp:1359
-msgid "&Update Tags"
+#: aboutdialog/ExtendedAboutDialog.cpp:286
+msgid "&Donors"
 msgstr ""
 
-#. i18n: file: dialogs/MusicBrainzTagger.ui:65
-#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_cancel)
-#: rc.cpp:1362
-msgid "Exit without saving"
+#: aboutdialog/ExtendedAboutDialog.cpp:316
+msgid "T&ranslation"
 msgstr ""
 
-#. i18n: file: dialogs/EditFilterDialog.ui:77
-#. i18n: ectx: property (mimeType), widget (TokenPool, tpTokenPool)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:89
-#. i18n: ectx: property (mimeType), widget (TokenPool, tokenPool)
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:262
-#. i18n: ectx: property (mimeType), widget (TokenPool, tokenPool)
-#: rc.cpp:1368 rc.cpp:1788 rc.cpp:1974
-msgid "application/x-amarok-tag-token"
+#: aboutdialog/ExtendedAboutDialog.cpp:340
+msgid "License Agreement"
 msgstr ""
 
-#. i18n: file: dialogs/EditFilterDialog.ui:164
-#. i18n: ectx: property (text), widget (QCheckBox, cbInvert)
-#: rc.cpp:1371 dynamic/biases/TagMatchBias.cpp:174
-msgid "Invert condition"
+#: aboutdialog/ExtendedAboutDialog.cpp:373
+msgid "Internet connection not available"
 msgstr ""
 
-#. i18n: file: dialogs/EditFilterDialog.ui:172
-#. i18n: ectx: property (text), item, widget (QComboBox, cbAndOr)
-#: rc.cpp:1374 dialogs/EditFilterDialog.cpp:39
-msgid "AND"
+#: aboutdialog/ExtendedAboutDialog.cpp:373
+msgid "Network error"
 msgstr ""
 
-#. i18n: file: dialogs/EditFilterDialog.ui:177
-#. i18n: ectx: property (text), item, widget (QComboBox, cbAndOr)
-#: rc.cpp:1377 dialogs/EditFilterDialog.cpp:40
-msgid "OR"
+#: databaseimporter/sqlbatch/SqlBatchImporterConfig.cpp:37
+msgid ""
+"Input file produced by amarokcollectionscanner.<br>See <a "
+"href=\"http://amarok.kde.org/wiki/Batch_Mode\">Batch Mode</a>."
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:21
-#. i18n: ectx: property (windowTitle), widget (QWidget, OrganizeCollectionDialogBase)
-#: rc.cpp:1380 core-impl/collections/db/sql/SqlCollection.cpp:81
-msgid "Organize Files"
+#: databaseimporter/sqlbatch/SqlBatchImporterConfig.cpp:43
+msgid "Input file"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:38
-#. i18n: ectx: property (toolTip), widget (QLabel, folderLabel)
-#: rc.cpp:1383
-msgid "Base directory under which to put files"
+#: databaseimporter/sqlbatch/SqlBatchImporter.cpp:72
+#, kde-format
+msgid "Could not open file \"%1\"."
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:41
-#. i18n: ectx: property (text), widget (QLabel, folderLabel)
-#: rc.cpp:1386
-msgid "C&ollection Folder:"
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:39
+msgid "Connection"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:60
-#. i18n: ectx: property (toolTip), widget (KComboBox, folderCombo)
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:63
-#. i18n: ectx: property (whatsThis), widget (KComboBox, folderCombo)
-#: rc.cpp:1389 rc.cpp:1392
-msgid "The collection folder to which the files will be transferred."
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:45
+#: databaseimporter/itunes/ITunesImporterConfig.cpp:37
+msgid "Database Location"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:83
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1395
-msgid "Format Presets:"
-msgstr ""
+#. i18n: file: services/ampache/NewServerWidget.ui:50
+#. i18n: ectx: property (text), widget (QLabel, labelUsername)
+#. i18n: file: services/ampache/AmpacheConfigWidget.ui:63
+#. i18n: ectx: property (text), widget (QTableWidget, serverList)
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:53 rc.cpp:734
+#: rc.cpp:755
+msgid "Username"
+msgstr "Enw defnyddiwr"
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:108
-#. i18n: ectx: property (whatsThis), widget (QComboBox, presetCombo)
-#: rc.cpp:1398
-msgid "A list of selectable filename scheme/format presets."
-msgstr ""
+#. i18n: file: services/ampache/NewServerWidget.ui:60
+#. i18n: ectx: property (text), widget (QLabel, labelPassword)
+#. i18n: file: services/ampache/AmpacheConfigWidget.ui:68
+#. i18n: ectx: property (text), widget (QTableWidget, serverList)
+#. i18n: file: amarokconfig.kcfg:477
+#. i18n: ectx: label, entry, group (Scrobbler)
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:57 rc.cpp:737
+#: rc.cpp:758 rc.cpp:2492
+msgid "Password"
+msgstr "Cyfrinair"
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:115
-#. i18n: ectx: property (toolTip), widget (QPushButton, removePresetButton)
-#: rc.cpp:1401
-msgid "Removes the currently selected format preset"
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:62
+msgid "Database Name"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:118
-#. i18n: ectx: property (text), widget (QPushButton, removePresetButton)
-#: rc.cpp:1404
-msgid "Remove Preset"
-msgstr ""
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:66
+msgid "Hostname"
+msgstr "Enw gwesteiwr"
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:125
-#. i18n: ectx: property (toolTip), widget (QPushButton, addPresetButton)
-#: rc.cpp:1407
-msgid "Saves the current scheme/format above as a preset."
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:92
+msgid "Match tracks by meta tags"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:128
-#. i18n: ectx: property (text), widget (QPushButton, addPresetButton)
-#: rc.cpp:1410
-msgid "Save Preset"
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:93
+msgid ""
+"Perform meta information search on non-existing files, possibly detecting "
+"file renames. See <b>What's This</b>"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:135
-#. i18n: ectx: property (text), widget (QPushButton, updatePresetButton)
-#: rc.cpp:1413
-msgid "&Update Preset"
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:95
+msgid ""
+"If enabled, tracks from the old collection that do not exist anymore in the "
+"file system are searched for (by metadata) in the current collection. If a "
+"match is found, statistics for the matched track are updated, even if the "
+"file locations differ."
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:166
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:1416
-msgid "Character Replacement"
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:101
+msgid "Import downloaded artwork"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:181
-#. i18n: ectx: property (toolTip), widget (QCheckBox, spaceCheck)
-#: rc.cpp:1419
-msgid "If checked, convert spaces to underscores."
+#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:110
+msgid "Artwork directory"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:184
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, spaceCheck)
-#: rc.cpp:1422
-msgid ""
-"If checked all spaces will be replaced with underscores in the file names. "
-"If not, spaces will be left as they are."
+#: databaseimporter/amarok14/FastForwardWorker.cpp:82
+msgid "No database driver was selected"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, spaceCheck)
-#: rc.cpp:1425
-msgid "Replace spaces with &underscores"
-msgstr ""
-
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:196
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1428
-msgid "Replace"
+#: databaseimporter/amarok14/FastForwardWorker.cpp:88
+#, kde-format
+msgid "Database could not be found at: %1"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:206
-#. i18n: ectx: property (toolTip), widget (KLineEdit, regexpEdit)
-#: rc.cpp:1431
-msgid "Regular expression"
-msgstr "Mynegiad rheolaidd"
-
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:213
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1434 rc.cpp:2385
-msgid "with"
-msgstr "gyda"
-
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:223
-#. i18n: ectx: property (toolTip), widget (KLineEdit, replaceEdit)
-#: rc.cpp:1437
-msgid "Character string"
+#: databaseimporter/amarok14/FastForwardWorker.cpp:123
+#, kde-format
+msgid "Could not open Amarok 1.4 database: %1"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:238
-#. i18n: ectx: property (toolTip), widget (QCheckBox, ignoreTheCheck)
-#: rc.cpp:1440
-msgid "If checked, postfix artists' names starting with 'The' with ', The'."
+#: databaseimporter/amarok14/FastForwardWorker.cpp:153
+#, kde-format
+msgid "Could not execute import query: %1"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:241
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreTheCheck)
-#: rc.cpp:1443
+#: databaseimporter/amarok14/FastForwardWorker.cpp:237
 msgid ""
-"If checked all artists that have the word \"The\" at the beginning will be "
-"treated as if the \"The\" was not there. Example, \"The Beatles\" would "
-"become \"Beatles, The\""
-msgstr ""
-
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:244
-#. i18n: ectx: property (text), widget (QCheckBox, ignoreTheCheck)
-#: rc.cpp:1446
-msgid "I&gnore 'The' in artist names"
+"(track exists, but does not belong in any of your configured collection "
+"folders)"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:265
-#. i18n: ectx: property (toolTip), widget (QCheckBox, asciiCheck)
-#: rc.cpp:1449
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">If checked, all non-ASCII "
-"characters will be replaced with underscores.<span style=\" font-"
-"weight:600;\"> </span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"weight:600;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Do not check this option if you have non-English characters in "
-"your tags. </span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Most people can leave this "
-"option unchecked.</p></body></html>"
-msgstr ""
+#: databaseimporter/amarok14/FastForwardWorker.cpp:271
+#, kde-format
+msgid "Adding <b>1 new track</b> to Amarok collection <b>%2</b>."
+msgid_plural "Adding <b>%1 new tracks</b> to Amarok collection <b>%2</b>."
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:274
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, asciiCheck)
-#: rc.cpp:1460
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">If checked, all non-ASCII "
-"characters will be replaced with underscores.<span style=\" font-"
-"weight:600;\"> Do not check this option if you have non-English characters "
-"in your tags. </span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Most people can leave this "
-"option <span style=\" font-"
-"style:italic;\">unchecked.</span></p></body></html>"
+#: databaseimporter/amarok14/FastForwardWorker.cpp:390
+#, kde-format
+msgid "Cannot import statistics for %1"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:277
-#. i18n: ectx: property (text), widget (QCheckBox, asciiCheck)
-#: rc.cpp:1469
-msgid "Restrict to &ASCII"
+#: databaseimporter/amarok14/FastForwardWorker.cpp:420
+#, kde-format
+msgid "Could not execute labels import query: %1; query was: %2"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:292
-#. i18n: ectx: property (toolTip), widget (QCheckBox, vfatCheck)
-#: rc.cpp:1472
-msgid ""
-"Replace characters that are incompatible with MS-DOS/VFAT file systems with "
-"underscores. \n"
-"\n"
-"Most people can leave this option enabled."
-msgstr ""
+#: databaseimporter/amarok14/FastForwardWorker.cpp:443
+#, kde-format
+msgid "Updating cached lyrics and labels for 1 track..."
+msgid_plural "Updating cached lyrics and labels for %1 tracks..."
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:297
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, vfatCheck)
-#: rc.cpp:1477
-msgid ""
-"If checked, replace characters that are incompatible with MS-DOS/VFAT file "
-"systems with underscores. Incompatible characters include |?*<\":>+[] and "
-"unicode control characters. \n"
-"\n"
-"Most people can leave this option enabled as it ensures copying to media "
-"devices will function correctly."
+#: databaseimporter/amarok14/FastForwardWorker.cpp:459
+#, kde-format
+msgid "Failed to update lyrics/labels for track %1"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:300
-#. i18n: ectx: property (text), widget (QCheckBox, vfatCheck)
-#: rc.cpp:1482
-msgid "&VFAT safe names"
-msgstr ""
+#: databaseimporter/amarok14/FastForwardWorker.cpp:479
+#, kde-format
+msgid "Cached lyrics updated for 1 track"
+msgid_plural "Cached lyrics updated for %1 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:316
-#. i18n: ectx: property (title), widget (QGroupBox, previewBox)
-#: rc.cpp:1485
-msgid "Destination Preview"
-msgstr ""
+#: databaseimporter/amarok14/FastForwardWorker.cpp:483
+#, kde-format
+msgid "labels added to 1 track"
+msgid_plural "labels added to %1 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:344
-#. i18n: ectx: property (text), widget (QTableWidget, previewTableWidget)
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:336
-#. i18n: ectx: property (text), widget (QPushButton, previewButton)
-#: rc.cpp:1488 rc.cpp:1989
-msgid "Preview"
+#: databaseimporter/amarok14/FastForwardWorker.cpp:489
+#, kde-format
+msgctxt ""
+"%1 is e.g. Cached lyrics updated for 2 tracks, %2 is e.g. labels added to 3 "
+"tracks"
+msgid "%1, %2."
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:352
-#. i18n: ectx: property (text), widget (QTableWidget, previewTableWidget)
-#: rc.cpp:1491
-msgid "Original"
+#: databaseimporter/amarok14/FastForwardWorker.cpp:496
+msgid "Importing downloaded album art..."
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:397
-#. i18n: ectx: property (toolTip), widget (QCheckBox, overwriteCheck)
-#: rc.cpp:1494
-msgid "If checked, overwrite files of the same name without asking."
-msgstr ""
+#: databaseimporter/amarok14/FastForwardWorker.cpp:530
+#, kde-format
+msgid "Copied 1 cover image."
+msgid_plural "Copied %1 cover images."
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:404
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, overwriteCheck)
-#: rc.cpp:1497
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Check this to overwrite "
-"files of the same name automatically. <span style=\" font-"
-"style:italic;\">(Warning: Overwriting is not "
-"undoable)</span></p></body></html>"
+#: amarokurls/ContextUrlGenerator.cpp:56
+#, kde-format
+msgid "Context: %1"
 msgstr ""
 
-#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:407
-#. i18n: ectx: property (text), widget (QCheckBox, overwriteCheck)
-#: rc.cpp:1504
-msgid "Overwrite &Destination"
+#: amarokurls/ContextUrlGenerator.cpp:65
+msgid "Bookmark Context View Applets"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, EqualizerGroupBox)
-#: rc.cpp:1507
-msgid "Sound Equalizer"
+#: amarokurls/ContextUrlRunner.cpp:75
+msgctxt "A type of command that affects the context view"
+msgid "Context"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:43
-#. i18n: ectx: property (text), widget (QLabel, eqPresetslabel)
-#: rc.cpp:1510
-msgid "Presets:"
+#: amarokurls/BookmarkManagerWidget.cpp:44
+msgid "Add Group"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:56
-#. i18n: ectx: property (toolTip), widget (QComboBox, eqPresets)
-#: rc.cpp:1513
-msgid "List of available equalizer presets."
+#: amarokurls/BookmarkManagerWidget.cpp:55
+msgid "Filter bookmarks"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:72
-#. i18n: ectx: property (toolTip), widget (QPushButton, eqPresetSaveBtn)
-#: rc.cpp:1516
-msgid "Save changes of currently selected preset"
+#: amarokurls/BookmarkManagerWidget.cpp:59
+msgid "Start typing to progressively filter the bookmarks"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:75
-#. i18n: ectx: property (text), widget (QPushButton, eqPresetSaveBtn)
-#: rc.cpp:1519
-msgid "Save"
+#: amarokurls/NavigationUrlRunner.cpp:132
+msgctxt "A type of command that affects the view in the browser category"
+msgid "Navigate"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:88
-#. i18n: ectx: property (toolTip), widget (QPushButton, eqPresetDeleteBtn)
-#: rc.cpp:1522
-msgid "Delete currently selected preset. Not available for built-in presets."
+#: amarokurls/AmarokUrlHandler.cpp:222
+msgctxt "The command type of this url is not known"
+msgid "Unknown"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:91
-#. i18n: ectx: property (text), widget (QPushButton, eqPresetDeleteBtn)
-#: rc.cpp:1525
-msgid "Delete Preset"
+#: amarokurls/BookmarkCurrentButton.cpp:32 amarokurls/BookmarkModel.cpp:547
+msgid "New Bookmark"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:104
-#. i18n: ectx: property (toolTip), widget (QPushButton, eqPresetResetBtn)
-#: rc.cpp:1528
-msgid ""
-"Reset selected preset setting to default. Available only for built-in "
-"presets."
+#: amarokurls/BookmarkMetaActions.cpp:31
+msgid "Bookmark this Album"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:107
-#. i18n: ectx: property (text), widget (QPushButton, eqPresetResetBtn)
-#: rc.cpp:1531
-msgid "Reset to Default"
+#: amarokurls/BookmarkMetaActions.cpp:47
+msgid "Bookmark this Artist"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:129
-#. i18n: ectx: property (title), widget (QGroupBox, eqBandsGroupBox)
-#: rc.cpp:1534
-msgid "Bands"
+#: amarokurls/BookmarkMetaActions.cpp:62
+msgid "Add Position Marker"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:142
-#. i18n: ectx: property (text), widget (QLabel, eqMaxEq)
-#: rc.cpp:1537
-msgid "+dB"
-msgstr ""
+#. i18n: file: network/NetworkRequests.ui:46
+#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
+#: amarokurls/BookmarkModel.cpp:267 rc.cpp:1017
+msgid "URL"
+msgstr "URL"
 
-#. i18n: file: dialogs/EqualizerDialog.ui:152
-#. i18n: ectx: property (text), widget (QLabel, eqPreampLabel)
-#. i18n: file: dialogs/EqualizerDialog.ui:162
-#. i18n: ectx: property (text), widget (QLabel, eqBand0Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:172
-#. i18n: ectx: property (text), widget (QLabel, eqBand1Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:182
-#. i18n: ectx: property (text), widget (QLabel, eqBand2Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:192
-#. i18n: ectx: property (text), widget (QLabel, eqBand3Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:202
-#. i18n: ectx: property (text), widget (QLabel, eqBand4Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:212
-#. i18n: ectx: property (text), widget (QLabel, eqBand5Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:222
-#. i18n: ectx: property (text), widget (QLabel, eqBand6Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:232
-#. i18n: ectx: property (text), widget (QLabel, eqBand7Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:242
-#. i18n: ectx: property (text), widget (QLabel, eqBand8Value)
-#. i18n: file: dialogs/EqualizerDialog.ui:252
-#. i18n: ectx: property (text), widget (QLabel, eqBand9Value)
-#. i18n: file: dialogs/TagDialogBase.ui:176
-#. i18n: ectx: property (text), widget (QLabel, qLabel_length)
-#. i18n: file: dialogs/TagDialogBase.ui:208
-#. i18n: ectx: property (text), widget (QLabel, qLabel_bitrate)
-#. i18n: file: dialogs/TagDialogBase.ui:240
-#. i18n: ectx: property (text), widget (QLabel, qLabel_samplerate)
-#. i18n: file: dialogs/TagDialogBase.ui:272
-#. i18n: ectx: property (text), widget (QLabel, qLabel_size)
-#. i18n: file: dialogs/TagDialogBase.ui:336
-#. i18n: ectx: property (text), widget (QLabel, qLabel_collection)
-#. i18n: file: dialogs/TagDialogBase.ui:431
-#. i18n: ectx: property (text), widget (QLabel, qLabel_playcount)
-#: rc.cpp:1540 rc.cpp:1543 rc.cpp:1546 rc.cpp:1549 rc.cpp:1552 rc.cpp:1555
-#: rc.cpp:1558 rc.cpp:1561 rc.cpp:1564 rc.cpp:1567 rc.cpp:1570 rc.cpp:1630
-#: rc.cpp:1636 rc.cpp:1642 rc.cpp:1648 rc.cpp:1660 rc.cpp:1669
-#: core/support/Amarok.cpp:135
-msgid "0"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: amarokurls/BookmarkModel.cpp:268 rc.cpp:560
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: amarokurls/BookmarkModel.cpp:522
+msgid "New Group"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:280
-#. i18n: ectx: property (text), widget (QLabel, eqZero)
-#: rc.cpp:1573
-msgid "0dB"
+#: amarokurls/BookmarkModel.cpp:548
+#: context/applets/similarartists/ArtistWidget.cpp:442
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:205
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:229
+#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:162
+#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:163
+#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:165
+#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:166
+msgid "none"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:589
-#. i18n: ectx: property (text), widget (QLabel, eqMinEq)
-#: rc.cpp:1576
-msgid "-dB"
+#: amarokurls/PlayUrlRunner.cpp:84
+msgctxt ""
+"A type of command that starts playing at a specific position in a track"
+msgid "Play"
 msgstr ""
 
-#. i18n: file: dialogs/EqualizerDialog.ui:599
-#. i18n: ectx: property (text), widget (QLabel, eqPreampValue)
-#. i18n: file: dialogs/EqualizerDialog.ui:609
-#. i18n: ectx: property (text), widget (QLabel, eqBand0Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:619
-#. i18n: ectx: property (text), widget (QLabel, eqBand1Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:629
-#. i18n: ectx: property (text), widget (QLabel, eqBand2Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:639
-#. i18n: ectx: property (text), widget (QLabel, eqBand3Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:649
-#. i18n: ectx: property (text), widget (QLabel, eqBand4Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:659
-#. i18n: ectx: property (text), widget (QLabel, eqBand5Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:669
-#. i18n: ectx: property (text), widget (QLabel, eqBand6Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:679
-#. i18n: ectx: property (text), widget (QLabel, eqBand7Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:689
-#. i18n: ectx: property (text), widget (QLabel, eqBand8Label)
-#. i18n: file: dialogs/EqualizerDialog.ui:699
-#. i18n: ectx: property (text), widget (QLabel, eqBand9Label)
-#: rc.cpp:1579 rc.cpp:1582 rc.cpp:1585 rc.cpp:1588 rc.cpp:1591 rc.cpp:1594
-#: rc.cpp:1597 rc.cpp:1600 rc.cpp:1603 rc.cpp:1606 rc.cpp:1609
-msgid "Hz"
+#: amarokurls/BookmarkTreeView.cpp:112
+msgctxt "Load the view represented by this bookmark"
+msgid "&Load"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, TagDialogBase)
-#: rc.cpp:1612
-msgid "Track Information"
+#: amarokurls/BookmarkTreeView.cpp:125
+msgid "&Create timecode track"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget, summaryTab)
-#: rc.cpp:1615
-msgid "S&ummary"
-msgstr "C&rynodeb"
+#: amarokurls/BookmarkTreeView.cpp:376
+msgid "New Timecode Track"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:71
-#. i18n: ectx: property (text), widget (QLabel, trackArtistAlbumLabel)
-#: rc.cpp:1618
-msgid "Track by Artist on Album"
+#: amarokurls/NavigationUrlGenerator.cpp:141
+#, kde-format
+msgid "Files (%1)"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:119
-#. i18n: ectx: property (text), widget (QLabel, leftHeaderLabel)
-#: rc.cpp:1621
-msgid "Properties"
+#: amarokurls/NavigationUrlGenerator.cpp:189
+#, kde-format
+msgid "Album \"%1\" from %2"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:144
-#. i18n: ectx: property (text), widget (QLabel, rightHeaderLabel)
-#: rc.cpp:1624
-msgid "Statistics"
-msgstr "Ystadegau"
+#: amarokurls/NavigationUrlGenerator.cpp:191
+#, kde-format
+msgid "Album \"%1\""
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:157
-#. i18n: ectx: property (text), widget (QLabel, lenghtLabel)
-#: rc.cpp:1627
-msgid "Length:"
+#: amarokurls/NavigationUrlGenerator.cpp:236
+#, kde-format
+msgid "Artist \"%1\" from %2"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:189
-#. i18n: ectx: property (text), widget (QLabel, bitrateLabel)
-#: rc.cpp:1633
-msgid "Bit rate:"
+#: amarokurls/NavigationUrlGenerator.cpp:238
+#, kde-format
+msgid "Artist \"%1\""
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:221
-#. i18n: ectx: property (text), widget (QLabel, samplerateLabel)
-#: rc.cpp:1639
-msgid "Sample rate:"
+#: amarokurls/PlayUrlGenerator.cpp:87
+msgid "Bookmark Track Position"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:253
-#. i18n: ectx: property (text), widget (QLabel, sizeLabel)
-#: rc.cpp:1645
-msgid "Size:"
+#: core/transcoding/formats/TranscodingWmaFormat.cpp:29
+msgid ""
+"The bitrate is a measure of the quantity of data used to represent a second "
+"of the audio track.<br>Due to the limitations of the proprietary <b>WMA</b> "
+"format and the difficulty of reverse-engineering a proprietary encoder, the "
+"WMA encoder used by Amarok sets a <a "
+"href=http://en.wikipedia.org/wiki/Windows_Media_Audio#Windows_Media_Audio>con"
+"stant bitrate (CBR)</a> setting.<br>For this reason, the bitrate measure in "
+"this slider is a pretty accurate estimate of the bitrate of the encoded "
+"track.<br><b>136kb/s</b> is a good choice for music listening on a portable "
+"player.<br/>Anything below <b>112kb/s</b> might be unsatisfactory for music "
+"and anything above <b>182kb/s</b> is probably overkill."
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:285
-#. i18n: ectx: property (text), widget (QLabel, formatLabel)
-#: rc.cpp:1651
-msgid "Format:"
+#: core/transcoding/formats/TranscodingWmaFormat.cpp:60
+msgid "Bitrate target for constant bitrate encoding"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:304
-#. i18n: ectx: property (text), widget (QLabel, qLabel_format)
-#: rc.cpp:1654
-msgid "mp3"
+#: core/transcoding/formats/TranscodingWmaFormat.cpp:61
+#: core/transcoding/formats/TranscodingVorbisFormat.cpp:61
+#: core/transcoding/formats/TranscodingAacFormat.cpp:60
+#: core/transcoding/formats/TranscodingMp3Format.cpp:57
+#: core/transcoding/formats/TranscodingFlacFormat.cpp:43
+msgid "Smaller file"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:317
-#. i18n: ectx: property (text), widget (QLabel, collectionLabel)
-#: rc.cpp:1657
-msgid "Collection:"
+#: core/transcoding/formats/TranscodingWmaFormat.cpp:61
+#: core/transcoding/formats/TranscodingVorbisFormat.cpp:61
+#: core/transcoding/formats/TranscodingAacFormat.cpp:60
+#: core/transcoding/formats/TranscodingMp3Format.cpp:57
+msgid "Better sound quality"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:368
-#. i18n: ectx: property (text), widget (QLabel, ratingLabel)
-#: rc.cpp:1663
-msgid "Rating:"
-msgstr "Poblogrwydd :"
+#: core/transcoding/formats/TranscodingWmaFormat.cpp:68
+msgid "Windows Media Audio"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:406
-#. i18n: ectx: property (text), widget (QLabel, playcountLabel)
-#: rc.cpp:1666
-msgid "Play count:"
+#: core/transcoding/formats/TranscodingWmaFormat.cpp:76
+msgctxt ""
+"Feel free to redirect the english Wikipedia link to a local version, if it "
+"exists."
+msgid ""
+"<a href=http://en.wikipedia.org/wiki/Windows_Media_Audio>Windows Media "
+"Audio</a> (WMA) is a proprietary codec developed by Microsoft for lossy "
+"audio compression.<br>Recommended only for portable music players that do "
+"not support Ogg Vorbis."
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:444
-#. i18n: ectx: property (text), widget (QLabel, scoreLabel)
-#: rc.cpp:1672
-msgid "Score:"
-msgstr "Sgôr:"
+#: core/transcoding/formats/TranscodingVorbisFormat.cpp:29
+msgid ""
+"The bitrate is a measure of the quantity of data used to represent a second "
+"of the audio track.<br>The <b>Vorbis</b> encoder used by Amarok supports a "
+"<a href=http://en.wikipedia.org/wiki/Vorbis#Technical_details>variable "
+"bitrate (VBR)</a> setting, which means that the bitrate value fluctuates "
+"along the track based on the complexity of the audio content. More complex "
+"intervals of data are encoded with a higher bitrate than less complex ones; "
+"this approach yields overall better quality and a smaller file than having a "
+"constant bitrate throughout the track.<br>The Vorbis encoder uses a quality "
+"rating \"-q parameter\" between -1 and 10 to define a certain expected audio "
+"quality level. The bitrate measure in this slider is just a rough estimate "
+"(provided by Vorbis) of the average bitrate of the encoded track given a q "
+"value. In fact, with newer and more efficient Vorbis versions the actual "
+"bitrate is even lower.<br><b>-q5</b> is a good choice for music listening on "
+"a portable player.<br/>Anything below <b>-q3</b> might be unsatisfactory for "
+"music and anything above <b>-q8</b> is probably overkill."
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:460
-#. i18n: ectx: property (text), widget (QLabel, firstPlayedLabel)
-#: rc.cpp:1675
-msgid "First played:"
+#: core/transcoding/formats/TranscodingVorbisFormat.cpp:60
+msgid "Quality rating for variable bitrate encoding"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:498
-#. i18n: ectx: property (text), widget (QLabel, lastPlayedLabel)
-#: rc.cpp:1678
-msgid "Last played:"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:32
+#. i18n: ectx: property (text), widget (QRadioButton, oggButton)
+#: core/transcoding/formats/TranscodingVorbisFormat.cpp:68 rc.cpp:548
+msgid "Ogg Vorbis"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:552
-#. i18n: ectx: attribute (title), widget (QWidget, tagsTab)
-#: rc.cpp:1681
-msgid "Ta&gs"
+#: core/transcoding/formats/TranscodingVorbisFormat.cpp:76
+msgctxt ""
+"Feel free to redirect the english Wikipedia link to a local version, if it "
+"exists."
+msgid ""
+"<a href=http://en.wikipedia.org/wiki/Vorbis>Ogg Vorbis</a> is an open and "
+"royalty-free audio codec for lossy audio compression.<br>It produces smaller "
+"files than MP3 at equivalent or higher quality. Ogg Vorbis is an all-around "
+"excellent choice, especially for portable music players that support it."
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:558
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1684
-msgid "T&itle:"
-msgstr "&Teitl:"
+#: core/transcoding/formats/TranscodingAacFormat.cpp:31
+msgid ""
+"The bitrate is a measure of the quantity of data used to represent a second "
+"of the audio track.<br>The <b>AAC</b> encoder used by Amarok supports a <a "
+"href=http://en.wikipedia.org/wiki/Variable_bitrate#Advantages_and_disadvantag"
+"es_of_VBR>variable bitrate (VBR)</a> setting, which means that the bitrate "
+"value fluctuates along the track based on the complexity of the audio "
+"content. More complex intervals of data are encoded with a higher bitrate "
+"than less complex ones; this approach yields overall better quality and a "
+"smaller file than having a constant bitrate throughout the track.<br>For "
+"this reason, the bitrate measure in this slider is just an estimate of the "
+"<a href=http://www.ffmpeg.org/faq.html#SEC21>average bitrate</a> of the "
+"encoded track.<br><b>150kb/s</b> is a good choice for music listening on a "
+"portable player.<br/>Anything below <b>120kb/s</b> might be unsatisfactory "
+"for music and anything above <b>200kb/s</b> is probably overkill."
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:584
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:1687
-msgid "&Artist:"
-msgstr "&Artist:"
+#: core/transcoding/formats/TranscodingAacFormat.cpp:59
+#: core/transcoding/formats/TranscodingMp3Format.cpp:56
+msgid "Expected average bitrate for variable bitrate encoding"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:616
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
-#: rc.cpp:1690
-msgid "&Composer:"
+#: core/transcoding/formats/TranscodingAacFormat.cpp:67
+msgid "AAC (Non-Free)"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:645
-#. i18n: ectx: property (text), widget (QLabel, textLabel_albumArtist)
-#: rc.cpp:1693
-msgid "Album artist:"
+#: core/transcoding/formats/TranscodingAacFormat.cpp:75
+msgctxt ""
+"Feel free to redirect the english Wikipedia link to a local version, if it "
+"exists."
+msgid ""
+"<a href=http://en.wikipedia.org/wiki/Advanced_Audio_Coding>Advanced Audio "
+"Coding</a> (AAC) is a patented lossy codec for digital audio.<br>AAC "
+"generally achieves better sound quality than MP3 at similar bit rates. It is "
+"a reasonable choice for the iPod and some other portable music players. Non-"
+"Free implementation."
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:668
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:1696
-msgid "Al&bum:"
-msgstr "A&lbum:"
+#: core/transcoding/formats/TranscodingMp3Format.cpp:29
+msgid ""
+"The bitrate is a measure of the quantity of data used to represent a second "
+"of the audio track.<br>The <b>MP3</b> encoder used by Amarok supports a <a "
+"href=http://en.wikipedia.org/wiki/MP3#VBR>variable bitrate (VBR)</a> "
+"setting, which means that the bitrate value fluctuates along the track based "
+"on the complexity of the audio content. More complex intervals of data are "
+"encoded with a higher bitrate than less complex ones; this approach yields "
+"overall better quality and a smaller file than having a constant bitrate "
+"throughout the track.<br>For this reason, the bitrate measure in this slider "
+"is just an estimate of the average bitrate of the encoded "
+"track.<br><b>160kb/s</b> is a good choice for music listening on a portable "
+"player.<br/>Anything below <b>120kb/s</b> might be unsatisfactory for music "
+"and anything above <b>205kb/s</b> is probably overkill."
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:706
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_6_6)
-#: rc.cpp:1699
-msgid "Trac&k number:"
+#: core/transcoding/formats/TranscodingMp3Format.cpp:64
+msgid "MP3"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:747
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:1702
-msgid "&Genre:"
+#: core/transcoding/formats/TranscodingMp3Format.cpp:72
+msgctxt ""
+"Feel free to redirect the english Wikipedia link to a local version, if it "
+"exists."
+msgid ""
+"<a href=http://en.wikipedia.org/wiki/MP3>MPEG Audio Layer 3</a> (MP3) is a "
+"patented digital audio codec using a form of lossy data compression.<br>In "
+"spite of its shortcomings, it is a common format for consumer audio storage, "
+"and is widely supported on portable music players."
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:785
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2_2)
-#: rc.cpp:1705
-msgid "&Disc number:"
+#: core/transcoding/formats/TranscodingFlacFormat.cpp:31
+msgid ""
+"The <a "
+"href=http://flac.sourceforge.net/documentation_tools_flac.html>compression "
+"level</a> is an integer value between 0 and 8 that represents the tradeoff "
+"between file size and compression speed while encoding with "
+"<b>FLAC</b>.<br/> Setting the compression level to <b>0</b> yields the "
+"shortest compression time but generates a comparably big file<br/>On the "
+"other hand, a compression level of <b>8</b> makes compression quite slow but "
+"produces the smallest file.<br/>Note that since FLAC is by definition a "
+"lossless codec, the audio quality of the output is exactly the same "
+"regardless of the compression level.<br/>Also, levels above <b>5</b> "
+"dramatically increase compression time but create an only slightly smaller "
+"file, and are not recommended."
+msgstr ""
+
+#: core/transcoding/formats/TranscodingFlacFormat.cpp:42
+msgid "Compression level"
+msgstr ""
+
+#: core/transcoding/formats/TranscodingFlacFormat.cpp:43
+msgid "Faster compression"
+msgstr ""
+
+#: core/transcoding/formats/TranscodingFlacFormat.cpp:50
+msgid "FLAC"
+msgstr ""
+
+#: core/transcoding/formats/TranscodingFlacFormat.cpp:58
+msgctxt ""
+"Feel free to redirect the english Wikipedia link to a local version, if it "
+"exists."
+msgid ""
+"<a href=http://en.wikipedia.org/wiki/Free_Lossless_Audio_Codec>Free Lossless "
+"Audio Codec</a> (FLAC) is an open and royalty-free codec for lossless "
+"compression of digital music.<br>If you wish to store your music without "
+"compromising on audio quality, FLAC is an excellent choice."
+msgstr ""
+
+#: core/transcoding/formats/TranscodingAlacFormat.cpp:34
+msgid "Apple Lossless"
+msgstr ""
+
+#: core/transcoding/formats/TranscodingAlacFormat.cpp:42
+msgctxt ""
+"Feel free to redirect the english Wikipedia link to a local version, if it "
+"exists."
+msgid ""
+"<a href=http://en.wikipedia.org/wiki/Apple_Lossless>Apple Lossless</a> "
+"(ALAC) is an audio codec for lossless compression of digital "
+"music.<br>Recommended only for Apple music players and players that do not "
+"support FLAC."
+msgstr ""
+
+#: core/meta/Meta.cpp:509 context/applets/currenttrack/CurrentTrack.cpp:828
+msgid "Unknown Composer"
+msgstr ""
+
+#: core/meta/support/MetaUtility.cpp:399
+msgctxt ""
+"the time format for a time length when the time is below 1 hour see QTime "
+"documentation."
+msgid "m:ss"
+msgstr ""
+
+#: core/meta/support/MetaUtility.cpp:406
+#, kde-format
+msgctxt "number of days with spacing for the pretty time"
+msgid "%1 day, "
+msgid_plural "%1 days, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaUtility.cpp:407
+msgctxt ""
+"the time format for a time length when the time is 1 hour or above see QTime "
+"documentation."
+msgid "h:mm:ss"
+msgstr ""
+
+#: core/meta/support/MetaUtility.cpp:421
+#, kde-format
+msgctxt "number of years for the pretty time"
+msgid "%1 year"
+msgid_plural "%1 years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaUtility.cpp:423
+#, kde-format
+msgctxt "number of months for the pretty time"
+msgid "%1 month"
+msgid_plural "%1 months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaUtility.cpp:425
+#, kde-format
+msgctxt "number of days for the pretty time"
+msgid "%1 day"
+msgid_plural "%1 days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaUtility.cpp:427
+#, kde-format
+msgctxt "number of hours for the pretty time"
+msgid "%1 hour"
+msgid_plural "%1 hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaUtility.cpp:429
+#, kde-format
+msgctxt "number of minutes for the pretty time"
+msgid "%1 minute"
+msgid_plural "%1 minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaUtility.cpp:431
+#, kde-format
+msgctxt "number of seconds for the pretty time"
+msgid "%1 second"
+msgid_plural "%1 seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/meta/support/MetaConstants.cpp:170
+msgctxt ""
+"The field name in case nothing specific is selected e.g. in the automatic "
+"playlist generator"
+msgid "anything"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:171
+msgctxt "The name of the file this track is stored in"
+msgid "File Name"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:173
+msgid "Artist Name"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:174
+msgid "Album Name"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:180 playlist/PlaylistModel.cpp:868
+msgid "Disc Number"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:181
+msgid "Bpm"
+msgstr ""
+
+#. i18n: file: network/NetworkRequests.ui:56
+#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
+#: core/meta/support/MetaConstants.cpp:182 rc.cpp:1023
+#: widgets/SmartPlaylistEditor.cpp:183 playlist/PlaylistModel.cpp:875
+msgid "Length"
+msgstr "Hyd"
+
+#: core/meta/support/MetaConstants.cpp:183
+msgid "Bit Rate"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:184 playlist/PlaylistModel.cpp:877
+msgid "Sample Rate"
+msgstr "Cyflymdra Enghreifftio"
+
+#: core/meta/support/MetaConstants.cpp:185 playlist/PlaylistModel.cpp:883
+msgid "File Size"
+msgstr "Maint Ffeil"
+
+#: core/meta/support/MetaConstants.cpp:186
+msgid "Format"
+msgstr "Fformat"
+
+#: core/meta/support/MetaConstants.cpp:187
+msgid "Added to Collection"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:188
+#: context/applets/currenttrack/CurrentTrack.cpp:449
+#: widgets/SmartPlaylistEditor.cpp:185 playlist/PlaylistModel.cpp:878
+msgid "Score"
+msgstr "Sgôr"
+
+#: core/meta/support/MetaConstants.cpp:189 widgets/SmartPlaylistEditor.cpp:185
+#: playlist/PlaylistModel.cpp:879 playlist/ProgressiveSearchWidget.cpp:109
+msgid "Rating"
+msgstr "Poblogrwydd"
+
+#: core/meta/support/MetaConstants.cpp:190
+msgid "First Played"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:191
+#: context/applets/currenttrack/CurrentTrack.cpp:450
+msgid "Last Played"
+msgstr "Chwaraewyd Diwethaf"
+
+#: core/meta/support/MetaConstants.cpp:192
+msgid "Playcount"
+msgstr ""
+
+#: core/meta/support/MetaConstants.cpp:193
+msgid "Unique Id"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:823
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
-#: rc.cpp:1708
-msgid "&Year:"
-msgstr "&Blwyddyn :"
+#: core/meta/support/MetaConstants.cpp:195
+msgid "Track Gain"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:867
-#. i18n: ectx: property (text), widget (QLabel, textLabel_BPM)
-#: rc.cpp:1711
-msgid "B&eats per minute:"
+#: core/meta/support/MetaConstants.cpp:196
+msgid "Track Gain Peak"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:896
-#. i18n: ectx: property (text), widget (QLabel, textLabel_comment)
-#: rc.cpp:1714
-msgid "Co&mment:"
-msgstr "S&ylwad:"
+#: core/meta/support/MetaConstants.cpp:197
+msgid "Album Gain"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:927
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_musicbrainz)
-#: rc.cpp:1717
-msgid "Get Tags from MusicBrain&z"
+#: core/meta/support/MetaConstants.cpp:198
+msgid "Album Gain Peak"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:940
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_guessTags)
-#: rc.cpp:1720
-msgid "Guess Tags from &Filename"
+#: core/meta/support/MetaConstants.cpp:200
+msgid "Album Artist Name"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:948
-#. i18n: ectx: attribute (title), widget (QWidget, lyricsTab)
-#: rc.cpp:1723
-msgid "L&yrics"
-msgstr "L&yrics"
+#: core/meta/support/MetaConstants.cpp:202
+msgid "Last Modified"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:965
-#. i18n: ectx: attribute (title), widget (QWidget, labelsTab)
-#: rc.cpp:1726
-msgid "La&bels"
+#: core/meta/support/MetaConstants.cpp:213
+msgctxt ""
+"The field name in case nothing specific is selected e.g. in the automatic "
+"playlist generator. Use a one word translation."
+msgid "anything"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:981
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1729
-msgid "Label:"
-msgstr "Label:"
+#: core/meta/support/MetaConstants.cpp:214
+msgctxt ""
+"One word translation used in the collection filter. The name of the file "
+"this track is stored in"
+msgid "filename"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:997
-#. i18n: ectx: property (toolTip), widget (KComboBox, kComboBox_label)
-#: rc.cpp:1732
-msgid "Insert your custom label here or select one from the list."
+#: core/meta/support/MetaConstants.cpp:215
+msgctxt "One word translation used in the collection filter"
+msgid "title"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1028
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1735
-msgid "Custom labels for this item:"
+#: core/meta/support/MetaConstants.cpp:216
+msgctxt "One word translation used in the collection filter"
+msgid "artist"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1057
-#. i18n: ectx: property (text), widget (QPushButton, addButton)
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, addPushButton)
-#: rc.cpp:1738 rc.cpp:2388
-msgid "Add"
+#: core/meta/support/MetaConstants.cpp:217
+msgctxt "One word translation used in the collection filter"
+msgid "album"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1102
-#. i18n: ectx: property (text), widget (QLabel, locationLabel)
-#: rc.cpp:1744
-msgid "Location:"
-msgstr "Lleoliad:"
+#: core/meta/support/MetaConstants.cpp:218
+msgctxt "One word translation used in the collection filter"
+msgid "genre"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1145
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_previous)
-#: rc.cpp:1747 playlist/ProgressiveSearchWidget.cpp:66
-msgid "&Previous"
+#: core/meta/support/MetaConstants.cpp:219
+msgctxt "One word translation used in the collection filter"
+msgid "composer"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1155
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_next)
-#: rc.cpp:1750 playlist/ProgressiveSearchWidget.cpp:63
-msgid "&Next"
-msgstr "&Nesaf"
+#: core/meta/support/MetaConstants.cpp:220
+msgctxt "One word translation used in the collection filter"
+msgid "year"
+msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1162
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_perTrack)
-#: rc.cpp:1753
-msgid "Per trac&k"
+#: core/meta/support/MetaConstants.cpp:221
+msgctxt "One word translation used in the collection filter"
+msgid "comment"
 msgstr ""
 
-#. i18n: file: dialogs/TagDialogBase.ui:1185
-#. i18n: ectx: property (text), widget (QPushButton, pushButton_ok)
-#: rc.cpp:1756
-msgid "Sa&ve && Close"
+#: core/meta/support/MetaConstants.cpp:222
+msgctxt "One word translation used in the collection filter"
+msgid "tracknumber"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:41
-#. i18n: ectx: property (text), widget (QLabel, ddWarningIcon)
-#: rc.cpp:1762
-msgid "Icon Placeholder, not in GUI"
+#: core/meta/support/MetaConstants.cpp:223
+msgctxt "One word translation used in the collection filter"
+msgid "discnumber"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:56
-#. i18n: ectx: property (text), widget (QLabel, ddDeleteText)
-#: rc.cpp:1765
-msgid "Deletion method placeholder, never shown to user."
+#: core/meta/support/MetaConstants.cpp:224
+msgctxt "One word translation used in the collection filter"
+msgid "bpm"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:79
-#. i18n: ectx: property (toolTip), widget (K3ListBox, ddFileList)
-#: rc.cpp:1768
-msgid "List of files that are about to be deleted."
+#: core/meta/support/MetaConstants.cpp:225
+msgctxt "One word translation used in the collection filter"
+msgid "length"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:82
-#. i18n: ectx: property (whatsThis), widget (K3ListBox, ddFileList)
-#: rc.cpp:1771
-msgid "This is the list of items that are about to be deleted."
+#: core/meta/support/MetaConstants.cpp:226
+msgctxt "One word translation used in the collection filter"
+msgid "bitrate"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:89
-#. i18n: ectx: property (text), widget (QLabel, ddNumFiles)
-#: rc.cpp:1774
-msgid "Placeholder for number of files, not in GUI"
+#: core/meta/support/MetaConstants.cpp:227
+msgctxt "One word translation used in the collection filter"
+msgid "samplerate"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:102
-#. i18n: ectx: property (text), widget (QCheckBox, ddShouldDelete)
-#: rc.cpp:1777
-msgid "&Delete files instead of moving them to the trash"
+#: core/meta/support/MetaConstants.cpp:228
+msgctxt "One word translation used in the collection filter"
+msgid "filesize"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:105
-#. i18n: ectx: property (toolTip), widget (QCheckBox, ddShouldDelete)
-#: rc.cpp:1780
-msgid ""
-"If checked, files will be permanently removed instead of being placed in the "
-"Trash Bin"
+#: core/meta/support/MetaConstants.cpp:229
+msgctxt "One word translation used in the collection filter"
+msgid "format"
 msgstr ""
 
-#. i18n: file: dialogs/deletedialogbase.ui:110
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ddShouldDelete)
-#: rc.cpp:1783
-msgid ""
-"<qt><p>If this box is checked, files will be <b>permanently removed</b> "
-"instead of being placed in the Trash Bin.</p>\n"
-"\n"
-"<p><em>Use this option with caution</em>: Most filesystems are unable to "
-"reliably undelete deleted files.</p></qt>"
+#: core/meta/support/MetaConstants.cpp:230
+msgctxt "One word translation used in the collection filter"
+msgid "added"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:119
-#. i18n: ectx: property (text), widget (QLabel, syntaxLabel)
-#: rc.cpp:1792
-#, no-c-format
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Nimbus Sans L'; font-size:10pt;\">The following tokens can be used "
-"to define a filename scheme: %track, %title, </span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Nimbus Sans L'; font-size:10pt;\">%artist, %albumartist, %composer, "
-"%year, %album, %comment, %genre<br /></span></p></body></html>"
+#: core/meta/support/MetaConstants.cpp:231
+msgctxt "One word translation used in the collection filter"
+msgid "score"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:263
-#. i18n: ectx: property (text), widget (KPushButton, kpbAdvanced)
-#: rc.cpp:1800 dialogs/FilenameLayoutDialog.cpp:526
-msgid "&Advanced..."
+#: core/meta/support/MetaConstants.cpp:232
+msgctxt "One word translation used in the collection filter"
+msgid "rating"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:330
-#. i18n: ectx: property (title), widget (KButtonGroup, optionsFrame)
-#: rc.cpp:1803 dialogs/transferdialog.cpp:111
-msgid "Options"
+#: core/meta/support/MetaConstants.cpp:233
+msgctxt ""
+"One word translation used in the collection filter. First played time / "
+"access date"
+msgid "firstplay"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:342
-#. i18n: ectx: property (text), widget (QCheckBox, cbCase)
-#: rc.cpp:1806
-msgid "Edit &case"
+#: core/meta/support/MetaConstants.cpp:234
+msgctxt ""
+"One word translation used in the collection filter. Last played time / "
+"access date"
+msgid "lastplay"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:379
-#. i18n: ectx: property (text), widget (QRadioButton, rbTitleCase)
-#: rc.cpp:1809
-msgid "&Title case"
+#: core/meta/support/MetaConstants.cpp:235
+msgctxt "One word translation used in the collection filter"
+msgid "playcount"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:401
-#. i18n: ectx: property (text), widget (QRadioButton, rbFirstLetter)
-#: rc.cpp:1812
-msgid "&First letter of every word uppercase"
+#: core/meta/support/MetaConstants.cpp:236
+msgctxt "One word translation used in the collection filter"
+msgid "uniqueid"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:420
-#. i18n: ectx: property (text), widget (QRadioButton, rbAllUpper)
-#: rc.cpp:1815
-msgid "All &uppercase"
+#: core/meta/support/MetaConstants.cpp:238
+msgctxt "One word translation used in the collection filter"
+msgid "trackgain"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:439
-#. i18n: ectx: property (text), widget (QRadioButton, rbAllLower)
-#: rc.cpp:1818
-msgid "All &lowercase"
+#: core/meta/support/MetaConstants.cpp:239
+msgctxt "One word translation used in the collection filter"
+msgid "trackgainpeak"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:461
-#. i18n: ectx: property (text), widget (QCheckBox, cbEliminateSpaces)
-#: rc.cpp:1821
-msgid "Remove trailing &spaces in tags"
+#: core/meta/support/MetaConstants.cpp:240
+msgctxt "One word translation used in the collection filter"
+msgid "albumgain"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:477
-#. i18n: ectx: property (text), widget (QCheckBox, cbReplaceUnderscores)
-#: rc.cpp:1824
-msgid "Replace &underscores with spaces"
+#: core/meta/support/MetaConstants.cpp:241
+msgctxt "One word translation used in the collection filter"
+msgid "albumgainpeak"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:484
-#. i18n: ectx: property (text), widget (QCheckBox, cbUseFullPath)
-#: rc.cpp:1827
-msgid "Use full file path"
+#: core/meta/support/MetaConstants.cpp:243
+msgctxt "One word translation used in the collection filter"
+msgid "albumartist"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:497
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: rc.cpp:1830
-msgid "Reduce directories nesting level to:"
+#: core/meta/support/MetaConstants.cpp:244
+msgctxt "One word translation used in the collection filter"
+msgid "label"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:548
-#. i18n: ectx: property (title), widget (QGroupBox, resultGroupBox)
-#: rc.cpp:1833
-msgid "Result Preview"
+#: core/meta/support/MetaConstants.cpp:245
+msgctxt "One word translation used in the collection filter"
+msgid "modified"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:563
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:1839
-msgid "Artist:"
+#: core/podcasts/PodcastReader.cpp:455
+#, kde-format
+msgid "Importing podcast channel from %1"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:570
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1842
-msgid "Composer:"
+#: core/podcasts/PodcastReader.cpp:459
+msgid "Updating podcast channel"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:577
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1845
-msgid "Year:"
+#: core/podcasts/PodcastReader.cpp:460
+#, kde-format
+msgid "Updating \"%1\""
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:584
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:1848
-msgid "Track:"
+#: core/podcasts/PodcastReader.cpp:508 core/podcasts/PodcastReader.cpp:522
+#, kde-format
+msgid "Importing podcast from %1 failed with error:\n"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:591
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:1851
-msgid "Album:"
+#: core/podcasts/PodcastReader.cpp:512 core/podcasts/PodcastReader.cpp:526
+#, kde-format
+msgid "Updating podcast from %1 failed with error:\n"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:598
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:1854
-msgid "Comment:"
+#: core/podcasts/PodcastReader.cpp:513 core/podcasts/PodcastReader.cpp:527
+#, kde-format
+msgid "Updating \"%1\" failed with error:\n"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:605
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:1857
-msgid "Genre:"
+#: core/podcasts/PodcastReader.cpp:997
+#, kde-format
+msgid ""
+"While parsing %1, a feed was expected but an HTML page was received.\n"
+"Did you enter the correct URL?"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:618
-#. i18n: ectx: property (text), widget (QLabel, Title_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:634
-#. i18n: ectx: property (text), widget (QLabel, Artist_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:650
-#. i18n: ectx: property (text), widget (QLabel, Composer_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:666
-#. i18n: ectx: property (text), widget (QLabel, Year_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:682
-#. i18n: ectx: property (text), widget (QLabel, Album_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:698
-#. i18n: ectx: property (text), widget (QLabel, Comment_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:714
-#. i18n: ectx: property (text), widget (QLabel, Genre_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:730
-#. i18n: ectx: property (text), widget (QLabel, Track_result)
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:759
-#. i18n: ectx: property (text), widget (QLabel, AlbumArtist_result)
-#: rc.cpp:1860 rc.cpp:1863 rc.cpp:1866 rc.cpp:1869 rc.cpp:1872 rc.cpp:1875
-#: rc.cpp:1878 rc.cpp:1881 rc.cpp:1887
-msgid "<empty>"
+#: core/podcasts/PodcastReader.cpp:1004
+#, kde-format
+msgid "Feed has an unknown type: %1"
 msgstr ""
 
-#. i18n: file: dialogs/FilenameLayoutDialog.ui:746
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#: rc.cpp:1884 dialogs/FilenameLayoutDialog.cpp:246
-#: dialogs/FilenameLayoutDialog.cpp:612
-#: browsers/CollectionTreeItemModelBase.cpp:983
-#: musicbrainz/MusicBrainzTags.cpp:361 playlist/PlaylistModel.cpp:903
-msgid "Album Artist"
+#: core/podcasts/PodcastReader.cpp:1013
+#, kde-format
+msgid "%1 is not an RSS version 2.0 feed."
 msgstr ""
 
-#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:24
-#. i18n: ectx: property (toolTip), widget (QToolButton, addPodcastButton)
-#: rc.cpp:1890
-msgid "Add Podcast..."
+#: core/podcasts/PodcastReader.cpp:1043
+#, kde-format
+msgid "%1 is not a valid RSS version 1.0 feed."
 msgstr ""
 
-#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:27
-#. i18n: ectx: property (text), widget (QToolButton, addPodcastButton)
-#: rc.cpp:1893
-msgid "add podcast..."
+#: core/podcasts/PodcastReader.cpp:1051
+#, kde-format
+msgid "%1 is not a valid Atom feed."
 msgstr ""
 
-#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:50
-#. i18n: ectx: property (text), widget (QToolButton, refreshPodcastsButton)
-#: rc.cpp:1896
-msgid "Refresh All Podcasts"
+#: core/podcasts/PodcastReader.cpp:1134
+msgid "Alternative Enclosures:"
 msgstr ""
 
-#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:73
-#. i18n: ectx: property (toolTip), widget (QToolButton, configurePodcastsButton)
-#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:76
-#. i18n: ectx: property (text), widget (QToolButton, configurePodcastsButton)
-#: rc.cpp:1899 rc.cpp:1902
-msgid "Configure Podcasts..."
+#: core/podcasts/PodcastReader.cpp:1144
+msgid "unknown type"
 msgstr ""
 
-#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:99
-#. i18n: ectx: property (text), widget (QToolButton, podcastsIntervalButton)
-#: rc.cpp:1905
-msgid "Scan Interval..."
+#: core/support/Amarok.cpp:46 core/support/Amarok.cpp:91
+#: playlist/PlaylistModel.cpp:435
+msgctxt "The amount of time since last played"
+msgid "Never"
 msgstr ""
 
-#. i18n: file: network/NetworkRequests.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, NetworkRequestsDialog)
-#. i18n: file: network/NetworkRequests.ui:20
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1908 rc.cpp:1911
-msgid "Network Requests"
+#: core/support/Amarok.cpp:54
+msgctxt "When this track was last played"
+msgid "Unknown"
 msgstr ""
 
-#. i18n: file: network/NetworkRequests.ui:27
-#. i18n: ectx: property (text), widget (QPushButton, clearButton)
-#: rc.cpp:1914
-msgid "&Clear"
-msgstr "&Clirio"
+#: core/support/Amarok.cpp:59
+#, kde-format
+msgctxt "monthname year"
+msgid "%1 %2"
+msgstr "%1 %2"
 
-#. i18n: file: network/NetworkRequests.ui:41
-#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
-#: rc.cpp:1917
-msgid "Method"
-msgstr ""
+#: core/support/Amarok.cpp:66
+#, kde-format
+msgid "One week ago"
+msgid_plural "%1 weeks ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: network/NetworkRequests.ui:46
-#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
-#: rc.cpp:1920 amarokurls/BookmarkModel.cpp:267
-msgid "URL"
-msgstr "URL"
+#: core/support/Amarok.cpp:72
+msgid "Yesterday"
+msgstr "Ddoe"
 
-#. i18n: file: network/NetworkRequests.ui:51
-#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
-#: rc.cpp:1923
-msgid "Response"
-msgstr ""
+#: core/support/Amarok.cpp:73
+#, kde-format
+msgid "One day ago"
+msgid_plural "%1 days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: network/NetworkRequests.ui:56
-#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
-#: rc.cpp:1926 widgets/SmartPlaylistEditor.cpp:183
-#: core/meta/support/MetaConstants.cpp:116 playlist/PlaylistModel.cpp:914
-msgid "Length"
-msgstr "Hyd"
+#: core/support/Amarok.cpp:76
+#, kde-format
+msgid "One hour ago"
+msgid_plural "%1 hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: network/NetworkRequests.ui:61
-#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
-#: rc.cpp:1929
-msgid "Content Type"
+#: core/support/Amarok.cpp:82
+#, kde-format
+msgid "One minute ago"
+msgid_plural "%1 minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/support/Amarok.cpp:83
+msgid "Within the last minute"
+msgstr "O fewn y munud diwethaf"
+
+#: core/support/Amarok.cpp:85
+msgid "The future"
+msgstr "Y dyfodol"
+
+#: core/support/Amarok.cpp:101
+msgctxt "The amount of time since last played"
+msgid "0"
 msgstr ""
 
-#. i18n: file: network/NetworkRequests.ui:66
-#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
-#: rc.cpp:1932
-msgid "Info"
+#: core/support/Amarok.cpp:110
+#, kde-format
+msgctxt "number of months ago"
+msgid "%1M"
 msgstr ""
 
-#. i18n: file: network/NetworkRequests.ui:74
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1935
-msgid "Request Details"
+#: core/support/Amarok.cpp:114
+#, kde-format
+msgctxt "w for weeks"
+msgid "%1w"
 msgstr ""
 
-#. i18n: file: network/NetworkRequests.ui:81
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1938
-msgid "Response Details"
+#: core/support/Amarok.cpp:117
+msgctxt "When this track was last played"
+msgid "Tomorrow"
 msgstr ""
 
-#. i18n: file: network/NetworkRequests.ui:94
-#. i18n: ectx: property (text), widget (QTreeWidget, requestDetails)
-#. i18n: file: network/NetworkRequests.ui:108
-#. i18n: ectx: property (text), widget (QTreeWidget, responseDetails)
-#: rc.cpp:1944 rc.cpp:1950
-msgid "Value"
+#: core/support/Amarok.cpp:123
+#, kde-format, no-c-format
+msgctxt "d for days"
+msgid "%1d"
 msgstr ""
 
-#. i18n: file: playlist/PlaylistQueueEditor.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, PlaylistQueueEditor)
-#: rc.cpp:1953
-msgid "Queue Editor"
+#: core/support/Amarok.cpp:126
+#, kde-format
+msgctxt "h for hours"
+msgid "%1h"
 msgstr ""
 
-#. i18n: file: playlist/PlaylistQueueEditor.ui:32
-#. i18n: ectx: property (toolTip), widget (QPushButton, upButton)
-#: rc.cpp:1956
-msgid "Move Up"
+#. i18n: file: dialogs/TagDialogBase.ui:176
+#. i18n: ectx: property (text), widget (QLabel, qLabel_length)
+#. i18n: file: dialogs/TagDialogBase.ui:208
+#. i18n: ectx: property (text), widget (QLabel, qLabel_bitrate)
+#. i18n: file: dialogs/TagDialogBase.ui:240
+#. i18n: ectx: property (text), widget (QLabel, qLabel_samplerate)
+#. i18n: file: dialogs/TagDialogBase.ui:272
+#. i18n: ectx: property (text), widget (QLabel, qLabel_size)
+#. i18n: file: dialogs/TagDialogBase.ui:336
+#. i18n: ectx: property (text), widget (QLabel, qLabel_collection)
+#. i18n: file: dialogs/TagDialogBase.ui:428
+#. i18n: ectx: property (text), widget (QLabel, qLabel_playcount)
+#. i18n: file: dialogs/EqualizerDialog.ui:152
+#. i18n: ectx: property (text), widget (QLabel, eqPreampLabel)
+#. i18n: file: dialogs/EqualizerDialog.ui:162
+#. i18n: ectx: property (text), widget (QLabel, eqBand0Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:172
+#. i18n: ectx: property (text), widget (QLabel, eqBand1Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:182
+#. i18n: ectx: property (text), widget (QLabel, eqBand2Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:192
+#. i18n: ectx: property (text), widget (QLabel, eqBand3Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:202
+#. i18n: ectx: property (text), widget (QLabel, eqBand4Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:212
+#. i18n: ectx: property (text), widget (QLabel, eqBand5Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:222
+#. i18n: ectx: property (text), widget (QLabel, eqBand6Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:232
+#. i18n: ectx: property (text), widget (QLabel, eqBand7Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:242
+#. i18n: ectx: property (text), widget (QLabel, eqBand8Value)
+#. i18n: file: dialogs/EqualizerDialog.ui:252
+#. i18n: ectx: property (text), widget (QLabel, eqBand9Value)
+#: core/support/Amarok.cpp:135 rc.cpp:215 rc.cpp:221 rc.cpp:227 rc.cpp:233
+#: rc.cpp:245 rc.cpp:254 rc.cpp:380 rc.cpp:383 rc.cpp:386 rc.cpp:389
+#: rc.cpp:392 rc.cpp:395 rc.cpp:398 rc.cpp:401 rc.cpp:404 rc.cpp:407
+#: rc.cpp:410
+msgid "0"
 msgstr ""
 
-#. i18n: file: playlist/PlaylistQueueEditor.ui:48
-#. i18n: ectx: property (toolTip), widget (QPushButton, downButton)
-#: rc.cpp:1959
-msgid "Move Down"
+#: core/support/Amarok.cpp:170
+#, kde-format
+msgctxt ""
+"A saved playlist with the current time (KLocale::Shortdate) added between    "
+"                       the parentheses"
+msgid "Empty Playlist (%1)"
 msgstr ""
 
-#. i18n: file: playlist/PlaylistQueueEditor.ui:61
-#. i18n: ectx: property (toolTip), widget (QPushButton, dequeueTrackButton)
-#: rc.cpp:1962 playlist/view/PlaylistViewCommon.cpp:115
-msgid "Dequeue Track"
+#: core/support/Amarok.cpp:198
+#, kde-format
+msgctxt ""
+"A saved playlist with the current time (KLocale::Shortdate) added between    "
+"                       the parentheses"
+msgid "Various Tracks (%1)"
 msgstr ""
 
-#. i18n: file: playlist/PlaylistQueueEditor.ui:74
-#. i18n: ectx: property (toolTip), widget (QPushButton, clearButton)
-#: rc.cpp:1965
-msgid "Clear Queue"
+#: core/support/Amarok.cpp:205
+msgid "Unknown Artist(s)"
 msgstr ""
 
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:20
-#. i18n: ectx: property (windowTitle), widget (QDialog, PlaylistLayoutEditDialog)
-#: rc.cpp:1968
-msgid "Playlist Layout Editor"
+#: core/support/Amarok.cpp:221
+msgid "Unknown Album(s)"
 msgstr ""
 
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:57
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1971
-msgid "Available Layouts"
+#: core/support/Amarok.cpp:225
+msgid "Various Albums"
 msgstr ""
 
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:294
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:1977
-msgid "Layout"
+#: core/support/Amarok.cpp:228
+#, kde-format
+msgctxt "A saved playlist titled <artist> - <album>"
+msgid "%1 - %2"
 msgstr ""
 
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:300
-#. i18n: ectx: property (text), widget (QCheckBox, inlineControlsChekbox)
-#: rc.cpp:1980
-msgid "Show inline playback controls"
+#: mac/GrowlInterface.cpp:43 context/engines/current/CurrentEngine.cpp:136
+#: widgets/Osd.cpp:651 EngineController.cpp:1452
+msgid "No track playing"
 msgstr ""
 
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:312
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1983 services/ServiceBase.cpp:147
-msgid "Group By"
-msgstr "Casglu yn ôl"
+#: mac/GrowlInterface.cpp:64 widgets/Osd.cpp:675
+msgid "No information available for this track"
+msgstr ""
 
-#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:324
-#. i18n: ectx: property (text), widget (QCheckBox, tooltipsCheckbox)
-#: rc.cpp:1986
-msgid "Show tooltips"
+#: statusbar/CompoundProgressBar.cpp:63 statusbar/CompoundProgressBar.cpp:186
+#: statusbar/ProgressBar.cpp:48
+msgid "Abort"
+msgstr "Erthylu"
+
+#: statusbar/CompoundProgressBar.cpp:67 statusbar/CompoundProgressBar.cpp:198
+msgid "Multiple background tasks running (click to show)"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1992 rc.cpp:2044
-msgid "General"
-msgstr "Cyffredinol"
+#: statusbar/CompoundProgressBar.cpp:68 statusbar/CompoundProgressBar.cpp:199
+msgid "Abort all background tasks"
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:23
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FadeoutOnExit)
-#: rc.cpp:1995
-msgid "If checked, Amarok will fade out the music on program exit."
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:512
+msgid "i18n() takes at least one argument"
+msgstr ""
+
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:528
+msgid "i18nc() takes at least two arguments"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:26
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_FadeoutOnExit)
-#: rc.cpp:1998
-msgid "Fadeout on e&xit"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:545
+msgid "i18np() takes at least two arguments"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:36
-#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_Fadeout)
-#: rc.cpp:2001
-msgid ""
-"If checked, Amarok will slowly fade the volume of the playing track on stop "
-"or at the end of the playlist, rather than stopping playback immediately"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:562
+msgid "i18ncp() takes at least three arguments"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:40
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_Fadeout)
-#: rc.cpp:2004
-msgid ""
-"<b>Quit Behavior</b>\n"
-"<p>On exit, Amarok can slowly fade the volume of the playing track (which is "
-"configurable), or stop playback immediately.</p>"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:580
+msgid "dataEngine() takes one argument"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:43
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_Fadeout)
-#: rc.cpp:2008
-msgid "&Fadeout on stop"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:590
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:615
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:782
+msgid "Could not extract the AppletObject"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:61
-#. i18n: ectx: property (text), widget (QLabel, fadeoutLengthLabel)
-#: rc.cpp:2011
-msgid "Fadeout &duration:"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:595
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:620
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:787
+msgid "Could not extract the Applet"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:74
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_FadeoutLength)
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:77
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_FadeoutLength)
-#: rc.cpp:2014 rc.cpp:2017
-msgid "The length of the fadeout, in milliseconds."
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:605
+msgid "service() takes two arguments"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:80
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_FadeoutLength)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:74
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_OsdDuration)
-#: rc.cpp:2020 rc.cpp:2068
-msgid " ms"
-msgstr " meil"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:633
+msgid "loadui() takes one argument"
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:102
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ResumePlayback)
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:105
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ResumePlayback)
-#: rc.cpp:2023 rc.cpp:2026
-msgid ""
-"If checked, Amarok will<br>resume playback from where you left it the "
-"previous session -- just like a tape-player."
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:639
+#, kde-format
+msgid "Unable to open '%1'"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:108
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ResumePlayback)
-#: rc.cpp:2029
-msgid "&Resume playback on start"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:679
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:712
+msgid "Constructor takes at least 1 argument"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:118
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2032
-msgid "Sound System Configuration"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:764
+msgid "CreateWidget takes one argument"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:145
-#. i18n: ectx: property (toolTip), widget (QPushButton, pushButtonPhonon)
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:148
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pushButtonPhonon)
-#: rc.cpp:2035 rc.cpp:2038
-msgid "Phonon is the audio system used by Amarok."
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:772
+msgid "The parent must be a QGraphicsWidget"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:151
-#. i18n: ectx: property (text), widget (QPushButton, pushButtonPhonon)
-#: rc.cpp:2041
-msgid "Configure Phonon"
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:817
+#, kde-format
+msgid "This operation was not supported, %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:23
-#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_OsdEnabled)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:26
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_OsdEnabled)
-#: rc.cpp:2047 rc.cpp:2050
-msgid ""
-"Check to enable the On-Screen-Display. The OSD briefly displays track data "
-"when a new track is played."
+#: context/scriptengine/javascript/simplejavascriptapplet.cpp:824
+msgid "print() takes one argument"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:29
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OsdEnabled)
-#: rc.cpp:2053
-msgid "Use &On-Screen-Display"
+#: context/scriptengine/javascript/qtgui/linearlayout.cpp:70
+msgid "LinearLayout requires a parent"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:43
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2056
-msgid "&Duration:"
-msgstr "&Hyd:"
+#: context/scriptengine/javascript/qtgui/linearlayout.cpp:76
+msgid "The parent must be a QGraphicsLayoutItem"
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:62
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_OsdDuration)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:65
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_OsdDuration)
-#: rc.cpp:2059 rc.cpp:2062
-msgid ""
-"The time in milliseconds for which to show the OSD. The value must be "
-"between 500 ms and 10000 ms."
+#: context/engines/current/CurrentEngine.cpp:146
+#: context/applets/albums/Albums.cpp:65
+msgid "Recently Added Albums"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:71
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_OsdDuration)
-#: rc.cpp:2065
-msgid "Forever"
-msgstr "Am Byth"
+#: context/engines/current/CurrentEngine.cpp:227
+#, kde-format
+msgid "Albums by %1"
+msgstr "Albymau gan %1"
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:93
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:2071
-msgid "Sc&reen:"
-msgstr "Sg&rîn :"
+#: context/engines/current/CurrentEngine.cpp:247
+msgctxt "Header text for current album applet"
+msgid "Albums"
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:112
-#. i18n: ectx: property (toolTip), widget (KComboBox, kcfg_OsdScreen)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:115
-#. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_OsdScreen)
-#: rc.cpp:2074 rc.cpp:2077
-msgid "The screen that should display the OSD."
+#: context/engines/videoclip/VideoclipEngine.cpp:207
+#, kde-format
+msgid "Unable to retrieve Youtube information: %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:133
-#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_OsdUseCustomColors)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:136
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_OsdUseCustomColors)
-#: rc.cpp:2080 rc.cpp:2083
-msgid "Check to enable custom colors for the On-Screen-Display."
+#: context/engines/videoclip/VideoclipEngine.cpp:354
+#, kde-format
+msgid "Unable to retrieve Dailymotion information: %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:139
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OsdUseCustomColors)
-#: rc.cpp:2086
-msgid "Use &custom colors"
-msgstr "Defnyddio lliwiau &addasiedig"
+#: context/engines/videoclip/VideoclipEngine.cpp:496
+#, kde-format
+msgid "Unable to retrieve Vimeo information: %1"
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:163
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:191
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_OsdTextColor)
-#: rc.cpp:2089 rc.cpp:2098
-msgid "The color of the OSD text."
+#: context/engines/videoclip/VideoclipEngine.cpp:542
+#, kde-format
+msgid "Unable to retrieve Vimeo Bis information: %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:166
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:2092
-msgid "Text color:"
-msgstr "Lliw testun:"
+#: context/engines/videoclip/VideoclipEngine.cpp:669
+msgid "No video clip found..."
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:188
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_OsdTextColor)
-#: rc.cpp:2095
-msgid "Click to select the color of the OSD text."
+#: context/engines/songkick/SongkickEngine.cpp:48
+msgid "ontour"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:211
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OsdUseTranslucency)
-#: rc.cpp:2101
-msgid "If checked, enables translucency if supported by your desktop system."
+#: context/engines/songkick/SongkickEngine.cpp:48
+msgid "dates"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:214
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_OsdUseTranslucency)
-#: rc.cpp:2104
-msgid "&Translucent"
+#: context/engines/wikipedia/WikipediaEngine.cpp:191
+#: context/engines/wikipedia/WikipediaEngine.cpp:262
+#: context/engines/wikipedia/WikipediaEngine.cpp:395
+#, kde-format
+msgid "Unable to retrieve Wikipedia information: %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:226
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2107
-msgid "Font scale:"
+#: context/engines/wikipedia/WikipediaEngine.cpp:207
+#: context/engines/wikipedia/WikipediaEngine.cpp:371
+#: context/engines/wikipedia/WikipediaEngine.cpp:433
+#: context/engines/wikipedia/WikipediaEngine.cpp:633
+#: context/engines/wikipedia/WikipediaEngine.cpp:654
+#: context/engines/wikipedia/WikipediaEngine.cpp:672
+msgid "No information found..."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:233
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_OsdFontScaling)
-#: rc.cpp:2111
-#, no-c-format
-msgid "%"
+#: context/engines/wikipedia/WikipediaEngine.cpp:848
+msgid "Choose Language"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:274
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_KNotifyEnabled)
-#: rc.cpp:2120
-msgid "Check to use the system notification."
+#: context/engines/photos/PhotosEngine.cpp:204
+#, kde-format
+msgid "Unable to retrieve from Flickr.com: %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:277
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_KNotifyEnabled)
-#: rc.cpp:2123
-msgid "Use &system notifications"
+#: context/engines/labels/LabelsEngine.cpp:132
+#: context/engines/labels/LabelsEngine.cpp:195
+#: context/engines/labels/LabelsEngine.cpp:256
+#: context/engines/labels/LabelsEngine.cpp:266
+#: context/engines/labels/LabelsEngine.cpp:300
+#: context/engines/labels/LabelsEngine.cpp:351
+msgid "No labels found on Last.fm"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/CollectionConfig.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, CollectionConfig)
-#: rc.cpp:2126
-msgid "Collection Setup"
+#: context/engines/labels/LabelsEngine.cpp:319
+msgid "Unable to retrieve from Last.fm"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/CollectionConfig.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, collectionFoldersBox)
-#: rc.cpp:2129
-msgid "Collection Folders"
+#: context/engines/labels/LabelsEngine.cpp:369
+msgid "No connection to Last.fm"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, generalBox)
-#: rc.cpp:2132
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
+#: context/containments/verticallayout/VerticalToolbarContainment.cpp:191
+msgid ""
+"Please add some applets from the toolbar at the bottom of the context view."
+msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:29
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowSplashScreen)
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:32
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowSplashScreen)
-#: rc.cpp:2135 rc.cpp:2138
-msgid "Check to enable the splashscreen during Amarok startup."
+#: context/ContextDock.cpp:30
+msgid "&Context"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:35
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowSplashScreen)
-#: rc.cpp:2141
-msgid "Sho&w splash-screen on startup"
+#: context/toolbar/AppletItemOverlay.cpp:105
+#: context/toolbar/AppletToolbarAppletItem.cpp:58
+msgid "Remove Applet"
+msgstr ""
+
+#: context/toolbar/AppletToolbarAddItem.cpp:47
+msgid "Add Applets..."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:42
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowTrayIcon)
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:45
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowTrayIcon)
-#: rc.cpp:2144 rc.cpp:2147
-msgid "Check to enable the Amarok system tray icon."
+#: context/toolbar/AppletToolbarAddItem.cpp:71
+msgid "Add Applet..."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:48
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowTrayIcon)
-#: rc.cpp:2150
-msgid "Show tray &icon"
+#: context/toolbar/AppletToolbarAppletItem.cpp:53
+msgid "no applet name"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:55
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoGetCoverArt)
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:58
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoGetCoverArt)
-#: rc.cpp:2153 rc.cpp:2156
-msgid ""
-"Check to enable the automatic retrieval of cover art from the Internet."
+#: context/toolbar/AppletToolbarConfigItem.cpp:36
+msgid "Configure Applets..."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoGetCoverArt)
-#: rc.cpp:2159
-msgid "Automatically retrieve cover art"
+#: context/tools/amarokpkg.cpp:40
+msgid "Install, list, remove Amarok applets"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:68
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AnimateAppletCollapse)
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:71
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AnimateAppletCollapse)
-#: rc.cpp:2162 rc.cpp:2165
-msgid "Check to enable animations when context applets collapse."
+#: context/tools/amarokpkg.cpp:76
+msgid "Amarok Applet Manager"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:84
-#. i18n: ectx: property (title), widget (QGroupBox, playlistBox)
-#: rc.cpp:2171
-msgid "Playlist Options"
+#: context/tools/amarokpkg.cpp:78
+msgid "(C) 2008, Aaron Seigo, (C) 2009, Leo Franchi"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:90
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoScrollPlaylist)
-#: rc.cpp:2174
-msgid ""
-"Check to make the playlist scroll so the current track is always visible."
+#: context/tools/amarokpkg.cpp:79
+msgid "Aaron Seigo"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:93
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoScrollPlaylist)
-#: rc.cpp:2177
-msgid "Automatically scroll playlist to current track"
+#: context/tools/amarokpkg.cpp:80
+msgid "Original author"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:103
-#. i18n: ectx: property (title), widget (QGroupBox, moodbarBox)
-#: rc.cpp:2180
-msgid "Moodbar Options"
+#: context/tools/amarokpkg.cpp:82 main.cpp:63
+msgid "Leo Franchi"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:110
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowMoodbarInSlider)
-#: rc.cpp:2183
-msgid ""
-"The Moodbar makes it possible to navigate in your music visually.\n"
-"Please note that this feature requires the external \"Moodbar Generator\" "
-"tool."
+#: context/tools/amarokpkg.cpp:83 main.cpp:123 main.cpp:176 main.cpp:178
+#: main.cpp:192 main.cpp:202 main.cpp:208 main.cpp:210 main.cpp:222
+#: main.cpp:228 main.cpp:230 main.cpp:234 main.cpp:242
+msgid "Developer"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:113
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowMoodbarInSlider)
-#: rc.cpp:2187
-msgid "Show Moodbar in Progress Slider"
+#: context/tools/amarokpkg.cpp:92
+msgid "For install or remove, operates on applets installed for all users."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:120
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2190
-msgid "Moodbar style"
+#: context/tools/amarokpkg.cpp:95
+msgctxt "Do not translate <path>"
+msgid "Install the applet at <path>"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:127
-#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_MoodbarPaintStyle)
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:130
-#. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_MoodbarPaintStyle)
-#: rc.cpp:2193 rc.cpp:2196
-msgid "Choose the mood display style"
+#: context/tools/amarokpkg.cpp:97
+msgctxt "Do not translate <path>"
+msgid "Upgrade the applet at <path>"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:134
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
-#. i18n: tag layout attribute name
-#. i18n: file: data/DefaultPlaylistLayouts.xml:3
-#: rc.cpp:2199 rc.cpp:2520
-msgid "Default"
+#: context/tools/amarokpkg.cpp:99
+msgid "List installed applets"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:139
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
-#: rc.cpp:2202
-msgid "Angry"
+#: context/tools/amarokpkg.cpp:101
+msgctxt "Do not translate <name>"
+msgid "Remove the applet named <name>"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:144
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
-#: rc.cpp:2205
-msgid "Frozen"
+#: context/tools/amarokpkg.cpp:103
+msgid ""
+"Absolute path to the package root. If not supplied, then the standard data "
+"directories for this KDE session will be searched instead."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/GeneralConfig.ui:149
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
-#: rc.cpp:2208
-msgid "Happy"
+#: context/tools/amarokpkg.cpp:162
+#, kde-format
+msgid "Successfully removed %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:36
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoUpdateScripts)
-#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:39
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoUpdateScripts)
-#: rc.cpp:2211 rc.cpp:2214
-msgid ""
-"Automatically download and install updates for the built-in scripts from the "
-"Amarok website if available"
+#: context/tools/amarokpkg.cpp:164
+#, kde-format
+msgid "Removal of %1 failed."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:42
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoUpdateScripts)
-#: rc.cpp:2217
-msgid "Automatically update built-in scripts"
+#: context/tools/amarokpkg.cpp:169
+#, kde-format
+msgid "Plugin %1 is not installed."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:62
-#. i18n: ectx: property (toolTip), widget (QPushButton, manageButton)
-#: rc.cpp:2220
-msgid "Browse, install, and uninstall scripts"
+#: context/tools/amarokpkg.cpp:174
+#, kde-format
+msgid "Successfully installed %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:65
-#. i18n: ectx: property (text), widget (QPushButton, manageButton)
-#: rc.cpp:2223
-msgid "Manage Scripts"
+#: context/tools/amarokpkg.cpp:177
+#, kde-format
+msgid "Installation of %1 failed."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:17
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_UseServer)
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:20
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_UseServer)
-#: rc.cpp:2226 rc.cpp:2229
-msgid ""
-"Check to enable the use of an external database. By default there is already "
-"an embedded MySQL database running."
+#: context/tools/amarokpkg.cpp:183
+msgctxt ""
+"No option was given, this is the error message telling the user he needs at "
+"least one, do not translate install, remove, upgrade nor list"
+msgid "One of install, remove, upgrade or list is required."
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseServer)
-#: rc.cpp:2232
-msgid "Use &external MySQL database"
+#: context/LyricsManager.cpp:135
+msgid "Retrieved lyrics is empty"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:30
-#. i18n: ectx: property (title), widget (QGroupBox, group_Connection)
-#: rc.cpp:2235
-msgid "Connection Settings"
+#: context/LyricsManager.cpp:176
+msgid "Lyrics data could not be parsed"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:38
-#. i18n: ectx: property (text), widget (QLabel, label_Host)
-#: rc.cpp:2238
-msgid "&Server:"
+#: context/widgets/appletexplorer/AppletExplorer.cpp:105
+msgid "Hide menu"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:55
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_Host)
-#: rc.cpp:2241
-msgid "Enter the name of the existing MySQL server\n"
+#: context/widgets/appletexplorer/AppletExplorer.cpp:122
+msgid "<strong>Applet Explorer</strong>"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_Port)
-#: rc.cpp:2245
-msgid "P&ort:"
+#: context/widgets/appletexplorer/AppletExplorer.cpp:224
+msgid "Containments"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:91
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_Port)
-#: rc.cpp:2248
-msgid "Enter the port number to access the server. Default is port 3306.\n"
+#: context/widgets/ContainmentSelectionLayer.cpp:37
+msgid "Zoom In"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:118
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_Password)
-#: rc.cpp:2255
-msgid "Enter the password for the default user.\n"
+#: context/widgets/TrackWidget.cpp:39
+msgctxt "Score of a track"
+msgid "Score:"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:151
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_User)
-#: rc.cpp:2262
-msgid ""
-"Enter the username to access the database with full access privileges.\n"
+#: context/widgets/TrackWidget.cpp:162
+#, kde-format
+msgid "%1 - %2 (%3)"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:161
-#. i18n: ectx: property (text), widget (QLabel, label_Database)
-#: rc.cpp:2266
-msgid "&Database:"
+#: context/widgets/RatingWidget.cpp:70 context/widgets/RatingWidget.cpp:221
+#: context/widgets/RatingWidget.cpp:247
+#, kde-format
+msgid "Track rating: %1"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:178
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_Database)
-#: rc.cpp:2269
-msgid "Enter the name of the database. Default preset is amarokdb.\n"
+#: context/widgets/AppletHeader.cpp:43
+msgid "Context Applet"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:199
-#. i18n: ectx: property (text), widget (QLabel, label_Info)
-#: rc.cpp:2273
-msgid ""
-"Amarok expects the above database and user account to already exist. This "
-"user also requires full access to the database. You MUST restart Amarok "
-"after changing these settings."
+#: context/applets/playlistinfo/PlaylistInfo.cpp:151
+msgid "Configure Playlist Info Applet"
 msgstr ""
 
-#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:209
-#. i18n: ectx: property (text), widget (QLabel, label_SQL)
-#: rc.cpp:2276
-msgid ""
-"If your database is not already set up, you can use the following S&QL "
-"commands (after replacing the password with the correct one):"
+#: context/applets/playlistinfo/PlaylistInfo.cpp:163
+msgid "Width"
 msgstr ""
 
-#. i18n: file: context/applets/lyrics/lyricsSettings.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, lyricsSettings)
-#: rc.cpp:2279 context/applets/lyrics/LyricsApplet.cpp:694
-msgid "Lyrics Settings"
+#: context/applets/tabs/TabsApplet.cpp:79
+#: context/applets/tabs/TabsApplet.cpp:129
+#: context/applets/tabs/TabsApplet.cpp:146
+msgctxt "Guitar tablature"
+msgid "Tabs"
 msgstr ""
 
-#. i18n: file: context/applets/lyrics/lyricsSettings.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, fontGroup)
-#: rc.cpp:2282
-msgid "Font"
+#: context/applets/tabs/TabsApplet.cpp:95
+msgctxt "Guitar tablature"
+msgid "Reload tabs"
 msgstr ""
 
-#. i18n: file: context/applets/lyrics/lyricsSettings.ui:32
-#. i18n: ectx: property (title), widget (KButtonGroup, alignmentGroup)
-#: rc.cpp:2285
-msgid "Alignment"
+#: context/applets/tabs/TabsApplet.cpp:104
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:97
+#: context/applets/videoclip/VideoclipApplet.cpp:108
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:84
+#: context/applets/wikipedia/WikipediaApplet.cpp:630
+#: context/applets/photos/PhotosApplet.cpp:76
+#: context/applets/albums/Albums.cpp:74
+#: context/applets/lyrics/LyricsApplet.cpp:485
+#: context/applets/labels/LabelsApplet.cpp:112
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:157
+msgid "Settings"
 msgstr ""
 
-#. i18n: file: context/applets/lyrics/lyricsSettings.ui:38
-#. i18n: ectx: property (text), widget (QRadioButton, alignLeft)
-#: rc.cpp:2288
-msgctxt "Left alignment"
-msgid "Left"
+#: context/applets/tabs/TabsApplet.cpp:158
+msgid "Tabs: Fetching..."
 msgstr ""
 
-#. i18n: file: context/applets/lyrics/lyricsSettings.ui:45
-#. i18n: ectx: property (text), widget (QRadioButton, alignCenter)
-#: rc.cpp:2291
-msgctxt "Center alignment"
-msgid "Center"
+#: context/applets/tabs/TabsApplet.cpp:170
+#, kde-format
+msgctxt "Guitar tablature"
+msgid "No Tabs for %1 by %2"
 msgstr ""
 
-#. i18n: file: context/applets/lyrics/lyricsSettings.ui:52
-#. i18n: ectx: property (text), widget (QRadioButton, alignRight)
-#: rc.cpp:2294
-msgid "Right"
+#: context/applets/tabs/TabsApplet.cpp:176
+msgctxt "Guitar tablature"
+msgid "Tabs: Fetch Error"
 msgstr ""
 
-#. i18n: file: context/applets/similarartists/similarArtistsSettings.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2297
-msgid "Maximum number of artists to show:"
+#: context/applets/tabs/TabsApplet.cpp:201
+#, kde-format
+msgctxt "Guitar tablature"
+msgid "Tabs: %1 - %2"
 msgstr ""
 
-#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, currentTrackSettings)
-#. i18n: file: context/applets/tabs/TabsSettings.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, TabsSettings)
-#: rc.cpp:2300 rc.cpp:2327 context/applets/currenttrack/CurrentTrack.cpp:676
-msgid "Current Track Settings"
+#: context/applets/tabs/TabsApplet.cpp:266
+msgctxt "Guitar tablature settings"
+msgid "Tabs Settings"
 msgstr ""
 
-#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, showActionsGroupBox)
-#: rc.cpp:2303
-msgid "Show Actions"
+#: context/applets/tabs/TabsApplet.cpp:309
+msgid "Reload Tabs"
 msgstr ""
 
-#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, editTrackDetailsCheckBox)
-#: rc.cpp:2306 playlist/view/PlaylistViewCommon.cpp:230
-#: context/applets/albums/AlbumsView.cpp:243
-#: context/applets/currenttrack/CurrentTrack.cpp:781
-msgid "Edit Track Details"
+#: context/applets/tabs/TabsView.cpp:174
+msgid "tab provided from: "
 msgstr ""
 
-#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:45
-#. i18n: ectx: property (text), widget (QCheckBox, findInSourceCheckBox)
-#: rc.cpp:2309 playlist/view/PlaylistViewCommon.cpp:175
 #: context/applets/similarartists/ArtistWidget.cpp:130
-#: context/applets/labels/LabelGraphicsItem.cpp:73
 #: context/applets/upcomingevents/UpcomingEventsApplet.cpp:145
+#: context/applets/labels/LabelGraphicsItem.cpp:74
+#: playlist/view/PlaylistViewCommon.cpp:193
 msgid "Show in Media Sources"
 msgstr ""
 
-#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:61
-#. i18n: ectx: property (title), widget (QGroupBox, fontsGroupBox)
-#: rc.cpp:2312
-msgid "Fonts"
+#: context/applets/similarartists/ArtistWidget.cpp:136
+msgid "Add Last.fm artist station to the Playlist"
 msgstr ""
 
-#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:32
-#. i18n: ectx: property (windowTitle), widget (QWidget, ReloadEditDialog)
-#: rc.cpp:2315
-msgid "Reload tabs"
+#: context/applets/similarartists/ArtistWidget.cpp:142
+msgid "Add top track to the Playlist"
 msgstr ""
 
-#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:61
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2318
-msgid "Reload tabs with the following title and artist"
+#: context/applets/similarartists/ArtistWidget.cpp:149
+#, kde-format
+msgid "Show Similar Artists of %1"
 msgstr ""
 
-#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:73
-#. i18n: ectx: property (text), widget (QLabel, artistLabel)
-#: rc.cpp:2321 services/jamendo/JamendoInfoParser.cpp:51
-#: services/magnatune/MagnatuneStore.cpp:218
-#: services/lastfm/LastFmService.cpp:507 widgets/SmartPlaylistEditor.cpp:183
-#: widgets/SmartPlaylistEditor.cpp:197 dialogs/transferdialog.cpp:88
-#: dialogs/FilenameLayoutDialog.cpp:230 dialogs/FilenameLayoutDialog.cpp:591
-#: browsers/CollectionTreeItemModelBase.cpp:982
-#: musicbrainz/MusicBrainzTags.cpp:359 playlist/PlaylistModel.cpp:902
-#: context/applets/wikipedia/WikipediaApplet.cpp:594
-msgid "Artist"
-msgstr "Artist"
+#: context/applets/similarartists/ArtistWidget.cpp:164
+msgid "Open Last.fm webpage for this artist"
+msgstr ""
 
-#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:86
-#. i18n: ectx: property (text), widget (QLabel, titleLabel)
-#: rc.cpp:2324 widgets/SmartPlaylistEditor.cpp:183
-#: dialogs/FilenameLayoutDialog.cpp:226 dialogs/FilenameLayoutDialog.cpp:577
-#: core/meta/support/MetaConstants.cpp:106
-#: browsers/playlistbrowser/PodcastModel.cpp:336
-#: musicbrainz/MusicBrainzTags.cpp:358 playlist/PlaylistModel.cpp:901
-msgid "Title"
-msgstr "Teitl"
+#: context/applets/similarartists/ArtistWidget.cpp:181
+#, kde-format
+msgid "Match: %1%"
+msgstr ""
 
-#. i18n: file: context/applets/tabs/TabsSettings.ui:38
-#. i18n: ectx: property (title), widget (QGroupBox, gbFetchTabs)
-#: rc.cpp:2330
-msgid "Fetch tabs for"
+#: context/applets/similarartists/ArtistWidget.cpp:277
+#, kde-format
+msgid "Unable to fetch the picture: %1"
 msgstr ""
 
-#. i18n: file: context/applets/tabs/TabsSettings.ui:47
-#. i18n: ectx: property (text), widget (QCheckBox, cbFetchGuitar)
-#: rc.cpp:2333
-msgid "Guitar"
+#: context/applets/similarartists/ArtistWidget.cpp:286
+msgctxt "@info:tooltip Artist biography"
+msgid "Show Biography"
 msgstr ""
 
-#. i18n: file: context/applets/tabs/TabsSettings.ui:60
-#. i18n: ectx: property (text), widget (QCheckBox, cbFetchBass)
-#: rc.cpp:2336
-msgid "Bass"
+#: context/applets/similarartists/ArtistWidget.cpp:427
+msgid "No description available."
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, labelsGeneralSettings)
-#: rc.cpp:2339
-msgid "Labels Settings"
+#: context/applets/similarartists/ArtistWidget.cpp:443
+#, kde-format
+msgctxt "@label:textbox"
+msgid "Tags: %1"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:37
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:169
-#. i18n: ectx: property (text), widget (QLabel, minAutoAddCountLabel)
-#: rc.cpp:2342 rc.cpp:2364
-msgid "Minimum label score:"
+#: context/applets/similarartists/ArtistWidget.cpp:452
+msgid "Top track not found"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:56
-#. i18n: ectx: property (toolTip), widget (QSpinBox, minCountSpinBox)
-#: rc.cpp:2345
-msgid "Show only labels that are rated at least that high."
+#: context/applets/similarartists/ArtistWidget.cpp:458
+#, kde-format
+msgid "Top track: %1"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:75
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:2348
-msgid "Maximum labels to show:"
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:71
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:155
+msgid "Similar Artists"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:95
-#. i18n: ectx: property (toolTip), widget (QSpinBox, numLabelsSpinBox)
-#: rc.cpp:2351
-msgid ""
-"Do not show more than this many labels.\n"
-"Note that personal labels will always be shown."
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:205
+#. i18n: ectx: property (text), widget (QCommandLinkButton, backButton)
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:76
+#: context/applets/wikipedia/WikipediaApplet.cpp:593 rc.cpp:704
+msgid "Back"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:108
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:2355
-msgid "Show personal labels with score:"
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:83
+#: context/applets/wikipedia/WikipediaApplet.cpp:600
+msgid "Forward"
+msgstr "Ymlaen"
+
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:90
+msgid "Show Similar Artists for Currently Playing Track"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:127
-#. i18n: ectx: property (toolTip), widget (QSpinBox, personalCountSpinBox)
-#: rc.cpp:2358
-msgid "Affects the font size of the personal labels."
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:178
+msgid "Similar Artists Settings"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:145
-#. i18n: ectx: property (text), widget (QCheckBox, autoAddCheckBox)
-#: rc.cpp:2361
-msgid "Automatically add downloaded labels if none are assigned"
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:202
+#, kde-format
+msgid "Similar Artists of %1"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:185
-#. i18n: ectx: property (toolTip), widget (QSpinBox, minAutoAddCountSpinBox)
-#: rc.cpp:2367
-msgid "Add only labels that are rated at least that high."
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:209
+msgid "Similar Artists: Not Found"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:227
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:2370
-msgid "Color for assigned labels:"
+#: context/applets/similarartists/SimilarArtistsApplet.cpp:249
+#, kde-format
+msgctxt "@item:intext Artist biography published date"
+msgid "Published: %1"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:257
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:2373
-msgid "Color for labels background:"
+#: context/applets/currenttrack/CurrentTrack.cpp:114
+msgctxt "What artist is this track by"
+msgid "By"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:297
-#. i18n: ectx: property (toolTip), widget (QPushButton, resetColorsPushButton)
-#: rc.cpp:2376
-msgid "Sets the label colors according to the current color scheme."
+#: context/applets/currenttrack/CurrentTrack.cpp:115
+msgctxt "What album is this track on"
+msgid "On"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:300
-#. i18n: ectx: property (text), widget (QPushButton, resetColorsPushButton)
-#: rc.cpp:2379
-msgid "Reset colors"
+#: context/applets/currenttrack/CurrentTrack.cpp:285
+msgid "Recently Played Tracks"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2382
-msgid "Replace downloaded label"
+#: context/applets/currenttrack/CurrentTrack.cpp:448
+#: playlist/ProgressiveSearchWidget.cpp:74
+msgid "Tracks"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:79
-#. i18n: ectx: property (toolTip), widget (QTreeWidget, replacementTreeWidget)
-#: rc.cpp:2391
-msgid ""
-"This will help you keep your label collection clean by replacing downloaded "
-"labels according to your preferences.\n"
-"Eg. \"hip hop\" -> \"hip-hop\""
+#: context/applets/currenttrack/CurrentTrack.cpp:448
+#: playlist/PlaylistModel.cpp:880
+msgid "Play Count"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:98
-#. i18n: ectx: property (text), widget (QTreeWidget, replacementTreeWidget)
-#: rc.cpp:2395
-msgid "Downloaded label"
+#: context/applets/currenttrack/CurrentTrack.cpp:449
+#: context/applets/albums/Albums.cpp:139
+#: playlist/ProgressiveSearchWidget.cpp:81
+msgid "Albums"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:103
-#. i18n: ectx: property (text), widget (QTreeWidget, replacementTreeWidget)
-#: rc.cpp:2398
-msgid "Replacement"
+#: context/applets/currenttrack/CurrentTrack.cpp:450
+#: playlist/ProgressiveSearchWidget.cpp:88
+msgid "Artists"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2404
-msgid "Do not show the following labels:"
+#. i18n: file: context/applets/tabs/TabsSettings.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, TabsSettings)
+#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, currentTrackSettings)
+#: context/applets/currenttrack/CurrentTrack.cpp:672 rc.cpp:1050 rc.cpp:1077
+msgid "Current Track Settings"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, matchArtistCheckBox)
-#: rc.cpp:2407
-msgid "Labels matching the artist"
+#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:38
+#. i18n: ectx: property (text), widget (QCheckBox, editTrackDetailsCheckBox)
+#: context/applets/currenttrack/CurrentTrack.cpp:777
+#: context/applets/albums/AlbumsView.cpp:243 rc.cpp:1083
+#: playlist/view/PlaylistViewCommon.cpp:252
+msgid "Edit Track Details"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:31
-#. i18n: ectx: property (text), widget (QCheckBox, matchTitleCheckBox)
-#: rc.cpp:2410
-msgid "Labels matching the title"
+#: context/applets/currenttrack/CurrentTrack.cpp:800
+msgid "Show Album in Media Sources"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, matchAlbumCheckBox)
-#: rc.cpp:2413
-msgid "Labels matching the album"
+#: context/applets/currenttrack/CurrentTrack.cpp:807
+msgid "Show Artist in Media Sources"
 msgstr ""
 
-#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:61
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:2416
-msgid "Blacklist:"
+#: context/applets/currenttrack/CurrentTrack.cpp:820
+msgid "Search for Artist in the MP3 Music Store"
 msgstr ""
 
-#. i18n: file: context/applets/videoclip/videoclipSettings.ui:20
-#. i18n: ectx: property (text), widget (QCheckBox, checkYoutubeHQ)
-#: rc.cpp:2419
-msgid "Youtube HQ"
+#: context/applets/currenttrack/CurrentTrack.cpp:830
+msgid "Show Composer in Media Sources"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:21
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
-#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:28
-#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
-#: rc.cpp:2422 rc.cpp:2476
-msgid "All events"
+#: context/applets/currenttrack/CurrentTrack.cpp:837
+msgid "Show Genre in Media Sources"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:26
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
-#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:33
-#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
-#: rc.cpp:2425 rc.cpp:2479
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:551
-msgid "This week"
+#: context/applets/currenttrack/CurrentTrack.cpp:844
+msgid "Show Year in Media Sources"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:31
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
-#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:38
-#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
-#: rc.cpp:2428 rc.cpp:2482
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:553
-msgid "This month"
+#: context/applets/videoclip/CustomVideoWidget.cpp:83
+msgid "Enter &fullscreen"
+msgstr ""
+
+#: context/applets/videoclip/CustomVideoWidget.cpp:89
+msgid "E&xit fullscreen"
+msgstr ""
+
+#: context/applets/videoclip/VideoItemButton.cpp:98
+msgid "&Add to playlist"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:36
-#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
-#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:43
-#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
-#: rc.cpp:2431 rc.cpp:2485
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:555
-msgid "This year"
+#: context/applets/videoclip/VideoItemButton.cpp:99
+#: context/applets/albums/AlbumsView.cpp:242
+msgid "&Queue"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:44
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox)
-#: rc.cpp:2434
-msgid "Show places as links"
+#: context/applets/videoclip/VideoItemButton.cpp:100
+msgid "Append and &Play"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:45
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, searchLineEdit)
-#: rc.cpp:2437
-msgid "Search Venue"
+#: context/applets/videoclip/VideoclipApplet.cpp:102
+#: context/applets/videoclip/VideoclipApplet.cpp:279
+#: context/applets/videoclip/VideoclipApplet.cpp:333
+msgid "Video Clip"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:55
-#. i18n: ectx: property (toolTip), widget (KComboBox, countryCombo)
-#: rc.cpp:2440
-msgid "Restrict venues to a specific country"
+#: context/applets/videoclip/VideoclipApplet.cpp:314
+msgid "Video Clip: Fetching"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:65
-#. i18n: ectx: property (text), item, widget (KComboBox, countryCombo)
-#: rc.cpp:2443
-msgid "Any Country"
+#: context/applets/videoclip/VideoclipApplet.cpp:323
+msgid "Video Clip: No Information Found"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:75
-#. i18n: ectx: property (text), widget (QLabel, searchResultsLabel)
-#: rc.cpp:2446
-msgid "Search Results:"
+#: context/applets/videoclip/VideoclipApplet.cpp:522
+msgid "Video Clip Settings"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:104
-#. i18n: ectx: property (text), widget (QLabel, selectedVenuesLabel)
-#: rc.cpp:2449
-msgid "Selected Venues:"
+#: context/applets/songkick/SongkickApplet.cpp:41
+msgid "Songkick Concert Information"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:155
-#. i18n: ectx: property (text), widget (QLabel, photoLabel)
-#: rc.cpp:2452
-msgid "Photo"
+#: context/applets/songkick/SongkickApplet.cpp:63
+msgid "Concerts"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:183
-#. i18n: ectx: property (text), widget (QLabel, nameLabel)
-#: rc.cpp:2455
-msgid "Name:"
-msgstr "Enw:"
+#: context/applets/songkick/SongkickApplet.cpp:70
+msgid "Reload Songkick"
+msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:193
-#. i18n: ectx: property (text), widget (QLabel, cityLabel)
-#: rc.cpp:2458
-msgid "City:"
+#: context/applets/songkick/SongkickApplet.cpp:152
+msgid "Concert information is being fetched."
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:230
-#. i18n: ectx: property (text), widget (QLabel, websiteLabel)
-#: rc.cpp:2464
-msgid "Website:"
+#: context/applets/songkick/SongkickApplet.cpp:157
+#, kde-format
+msgid ""
+"Songkick was not able to be downloaded. Please check your Internet "
+"connection: %1"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:257
-#. i18n: ectx: property (text), widget (QLabel, countryLabel)
-#: rc.cpp:2467
-msgid "Country:"
+#: context/applets/songkick/SongkickApplet.cpp:202
+msgid "There was no information found for this track"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:267
-#. i18n: ectx: property (text), widget (QLabel, streetLabel)
-#: rc.cpp:2470
-msgid "Street:"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:53
+msgid "Loading picture..."
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:20
-#. i18n: ectx: property (text), widget (QLabel, filterLabel)
-#: rc.cpp:2473
-msgid "Filter events by date:"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:78
+msgid "View map"
 msgstr ""
 
-#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, groupVenueCheckBox)
-#: rc.cpp:2488
-msgid "&Group venue events"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:88
+msgid "Open Last.fm webpage for this event"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:20
-#. i18n: ectx: property (text), widget (QLabel, animationLabel)
-#: rc.cpp:2491
-msgid "Animation"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:95
+msgctxt "@label:textbox Supporing acts for an event"
+msgid "Supporting:"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:31
-#. i18n: ectx: property (text), item, widget (KComboBox, animationComboBox)
-#: rc.cpp:2494 context/applets/photos/PhotosApplet.cpp:95
-msgctxt "animation type"
-msgid "Automatic"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:96
+msgctxt "@label:textbox"
+msgid "Venue:"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:36
-#. i18n: ectx: property (text), item, widget (KComboBox, animationComboBox)
-#: rc.cpp:2497 context/applets/photos/PhotosApplet.cpp:97
-msgid "Interactive"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:97
+msgctxt "@label:textbox"
+msgid "Location:"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:41
-#. i18n: ectx: property (text), item, widget (KComboBox, animationComboBox)
-#: rc.cpp:2500
-msgid "Fading"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:98
+msgctxt "@label:textbox"
+msgid "Date:"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:49
-#. i18n: ectx: property (text), widget (QLabel, numberofphotosLabel)
-#: rc.cpp:2503
-msgid "Number of photos"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:99
+msgctxt "@label:textbox"
+msgid "Attending:"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:72
-#. i18n: ectx: property (text), widget (QLabel, additionalkeywordsLabel)
-#: rc.cpp:2506
-msgid "Additional key words:"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:100
+msgctxt "@label:textbox"
+msgid "Tags:"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:79
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, additionalkeywordsLineEdit)
-#: rc.cpp:2509
-msgid "Ex: band live 1977"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:125
+#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:122
+#, kde-format
+msgctxt "@label:textbox Title for a canceled upcoming event"
+msgid "<s>%1</s> (Canceled)"
 msgstr ""
 
-#. i18n: file: context/applets/photos/photosSettings.ui:88
-#. i18n: ectx: property (text), widget (QLabel, addsomemorekeynwordstothequerywithaspaceseparatorLabel)
-#: rc.cpp:2512
-msgid ""
-"Add some more key words to the Flickr.com\n"
-"query, with a space separator. \n"
-"For example: band live 1977 "
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:214
+#, kde-format
+msgctxt "@info:tooltip"
+msgid "<strong>Tags:</strong><nl/>%1"
 msgstr ""
 
-#. i18n: file: context/applets/wikipedia/wikipediaGeneralSettings.ui:31
-#. i18n: ectx: property (text), widget (QCheckBox, mobileCheckBox)
-#: rc.cpp:2517
-msgid "Use Wikipedia &mobile version"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:238
+#, kde-format
+msgctxt "@info:tooltip Supporting artists for an event"
+msgid "<strong>Supporting artists:</strong><nl/>%1"
 msgstr ""
 
-#. i18n: tag layout attribute name
-#. i18n: file: data/DefaultPlaylistLayouts.xml:36
-#: rc.cpp:2523 playlist/layouts/PlaylistLayoutEditDialog.cpp:525
-msgid "No Grouping"
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:254
+#, kde-format
+msgctxt "@info:tooltip Number of days till an event"
+msgid "Tomorrow"
+msgid_plural "In <strong>%1</strong> days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:266
+#, kde-format
+msgctxt "@info:tooltip"
+msgid "<strong>Location:</strong><nl/>%1"
 msgstr ""
 
-#. i18n: tag layout attribute name
-#. i18n: file: data/DefaultPlaylistLayouts.xml:60
-#: rc.cpp:2526
-msgid "No Grouping (Single Line)"
+#: context/applets/upcomingevents/UpcomingEventsCalendarWidget.cpp:160
+msgctxt "@info:tooltip Calendar action"
+msgid "Jump to Today"
 msgstr ""
 
-#. i18n: tag layout attribute name
-#. i18n: file: data/DefaultPlaylistLayouts.xml:77
-#: rc.cpp:2529
-msgid "Verbose"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:67
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:128
+msgid "Upcoming Events"
 msgstr ""
 
-#: dynamic/Bias.cpp:138 dynamic/biases/SearchQueryBias.cpp:116
-msgctxt "Random bias representation"
-msgid "Random songs"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:78
+msgid "View Events Calendar"
 msgstr ""
 
-#: dynamic/Bias.cpp:239
-msgctxt "And bias representation"
-msgid "Match all"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:91
+msgctxt "@title:group"
+msgid "No track is currently playing"
 msgstr ""
 
-#: dynamic/Bias.cpp:257
-msgctxt ""
-"Prefix for AndBias. Shown in front of a bias in the dynamic playlist view"
-msgid "and"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:158
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:303
+msgid "Favorite Venues"
 msgstr ""
 
-#: dynamic/Bias.cpp:458
-msgctxt ""
-"Prefix for OrBias. Shown in front of a bias in the dynamic playlist view"
-msgid "or"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:224
+msgid "No upcoming events"
 msgstr ""
 
-#: dynamic/Bias.cpp:466
-msgctxt "Or bias representation"
-msgid "Match any"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:224
+#, kde-format
+msgid "%1: No upcoming events"
 msgstr ""
 
-#: dynamic/BiasedPlaylist.cpp:57
-msgctxt ""
-"Title for a default dynamic playlist. The default playlist only returns "
-"random tracks."
-msgid "Random"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:229
+#, kde-format
+msgctxt "@title:group Number of upcoming events"
+msgid "1 event"
+msgid_plural "%1 events"
+msgstr[0] ""
+msgstr[1] ""
+
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:230
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:640
+#, kde-format
+msgctxt "@title:group Number of upcoming events"
+msgid "%1: 1 event"
+msgid_plural "%1: %2 events"
+msgstr[0] ""
+msgstr[1] ""
+
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:302
+msgid "Upcoming Events Settings"
 msgstr ""
 
-#: dynamic/BiasedPlaylist.cpp:137
-msgid "Generating playlist..."
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:353
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:362
+msgctxt "@label:textbox Url label"
+msgid "link"
 msgstr ""
 
-#: dynamic/biases/TagMatchBias.cpp:45
-msgctxt "Name of the \"TagMatch\" bias"
-msgid "Match meta tag"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:494
+msgid "Map View"
 msgstr ""
 
-#: dynamic/biases/TagMatchBias.cpp:54
-msgctxt "Description of the \"TagMatch\" bias"
-msgid ""
-"The \"TagMatch\" bias adds tracks that\n"
-"fulfill a specific condition."
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:532
+msgid "Events Calendar"
 msgstr ""
 
-#: dynamic/biases/TagMatchBias.cpp:283
-#, kde-format
-msgctxt "Inverted condition in tag match bias"
-msgid "Not %1"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:26
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
+#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:33
+#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:551 rc.cpp:1095
+#: rc.cpp:1149
+msgid "This week"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:38
-msgctxt "Name of the \"AlbumPlay\" bias"
-msgid "Album play"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:31
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
+#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:38
+#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:553 rc.cpp:1098
+#: rc.cpp:1152
+msgid "This month"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:47
-msgctxt "Description of the \"AlbumPlay\" bias"
-msgid "The \"AlbumPlay\" bias adds tracks that belong to one album."
+#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:36
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
+#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:43
+#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:555 rc.cpp:1101
+#: rc.cpp:1155
+msgid "This year"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:108
-msgctxt "AlbumPlay bias representation"
-msgid "The next track from the album"
+#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:638
+msgctxt "@title:group"
+msgid "Favorite Venues"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:111
-msgctxt "AlbumPlay bias representation"
-msgid "Any later track from the album"
+#: context/applets/upcomingevents/UpcomingEventsStackItem.cpp:288
+msgid "Maximize"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:114
-msgctxt "AlbumPlay bias representation"
-msgid "Tracks from the same album"
+#: context/applets/upcomingevents/UpcomingEventsStackItem.cpp:454
+msgid "Expand this widget"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:124
-msgid "Track directly follows previous track in album"
+#: context/applets/upcomingevents/UpcomingEventsStackItem.cpp:454
+msgid "Collapse this widget"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:126
-msgid "Track comes after previous track in album"
+#: context/applets/wikipedia/WikipediaApplet.cpp:357
+#: context/applets/wikipedia/WikipediaApplet.cpp:433
+msgid "Update Supported Languages"
 msgstr ""
 
-#: dynamic/biases/AlbumPlayBias.cpp:128
-msgid "Track is in the same album as previous track"
+#: context/applets/wikipedia/WikipediaApplet.cpp:358
+#: context/applets/wikipedia/WikipediaApplet.cpp:434
+msgid "Get Supported Languages"
 msgstr ""
 
-#: dynamic/biases/IfElseBias.cpp:37
-msgctxt "Name of the \"IfElse\" bias"
-msgid "If Else"
-msgstr ""
+#: context/applets/wikipedia/WikipediaApplet.cpp:583
+#: context/applets/wikipedia/WikipediaApplet.cpp:746
+msgid "Wikipedia"
+msgstr "Wicipedia"
 
-#: dynamic/biases/IfElseBias.cpp:46
-msgctxt "Description of the \"IfElse\" bias"
-msgid ""
-"The \"IfElse\" bias adds tracks that match at least one of the sub biases. "
-"It will only check the second sub-bias if the first doesn't return any "
-"results."
+#: context/applets/wikipedia/WikipediaApplet.cpp:606
+#: context/applets/labels/LabelsApplet.cpp:102
+msgid "Reload"
 msgstr ""
 
-#: dynamic/biases/IfElseBias.cpp:74
-msgctxt "IfElse bias representation"
-msgid "Match all sequentially"
+#: context/applets/wikipedia/WikipediaApplet.cpp:720
+#, kde-format
+msgid "Wikipedia: %1"
 msgstr ""
 
-#: dynamic/biases/IfElseBias.cpp:83
-msgctxt ""
-"Prefix for IfElseBias. Shown in front of a bias in the dynamic playlist view"
-msgid "else"
+#: context/applets/wikipedia/WikipediaApplet.cpp:779
+msgid "Wikipedia General Settings"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:44
-msgctxt "Name of the \"QuizPlay\" bias"
-msgid "Quiz play"
+#: context/applets/wikipedia/WikipediaApplet.cpp:780
+msgid "Wikipedia Language Settings"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:53
-msgctxt "Description of the \"QuizPlay\" bias"
-msgid ""
-"The \"QuizPlay\" bias adds tracks that start\n"
-"with a character the last track ended with."
+#: context/applets/photos/PhotosApplet.cpp:62
+msgid "Photos"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:118
-msgctxt "QuizPlay bias representation"
-msgid ""
-"Tracks whose title start with a\n"
-" character the last track ended with"
+#. i18n: file: context/applets/photos/photosSettings.ui:31
+#. i18n: ectx: property (text), item, widget (KComboBox, animationComboBox)
+#: context/applets/photos/PhotosApplet.cpp:95 rc.cpp:1167
+msgctxt "animation type"
+msgid "Automatic"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:121
-msgctxt "QuizPlay bias representation"
-msgid ""
-"Tracks whose artist name start\n"
-" with a character the last track ended with"
+#. i18n: file: context/applets/photos/photosSettings.ui:36
+#. i18n: ectx: property (text), item, widget (KComboBox, animationComboBox)
+#: context/applets/photos/PhotosApplet.cpp:97 rc.cpp:1170
+msgid "Interactive"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:124
-msgctxt "QuizPlay bias representation"
-msgid ""
-"Tracks whose album name start\n"
-" with a character the last track ended with"
+#: context/applets/photos/PhotosApplet.cpp:117
+msgid "Photos: No Track Playing"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:135
-msgid ""
-"Last character of the previous song is\n"
-"the first character of the next song"
-msgstr ""
+#: context/applets/photos/PhotosApplet.cpp:132
+#, kde-format
+msgctxt "@title:window Number of photos of artist"
+msgid "1 Photo: %2"
+msgid_plural "%1 Photos: %2"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dynamic/biases/QuizPlayBias.cpp:140
-msgid "of the track title (Title quiz)"
+#: context/applets/photos/PhotosApplet.cpp:153
+#: context/applets/photos/PhotosApplet.cpp:170
+#: context/applets/photos/PhotosApplet.cpp:184
+#, kde-format
+msgid "Photos: %1"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:142
-msgid "of the artist (Artist quiz)"
+#: context/applets/photos/PhotosApplet.cpp:219
+msgid "Photos Settings"
 msgstr ""
 
-#: dynamic/biases/QuizPlayBias.cpp:144
-msgid "of the album name (Album quiz)"
-msgstr ""
+#: context/applets/albums/AlbumItem.cpp:107
+#, kde-format
+msgid "%1 track"
+msgid_plural "%1 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: dynamic/biases/EchoNestBias.cpp:47
-msgctxt "Name of the \"EchoNest\" bias"
-msgid "EchoNest similar artist"
+#: context/applets/albums/Albums.cpp:81 context/applets/albums/Albums.cpp:326
+msgid "Filter Albums"
 msgstr ""
 
-#: dynamic/biases/EchoNestBias.cpp:56
-msgctxt "Description of the \"EchoNest\" bias"
-msgid ""
-"The \"EchoNest\" bias looks up tracks on echo nest and only adds similar "
-"tracks."
-msgstr ""
+#: context/applets/albums/Albums.cpp:221
+#, kde-format
+msgid "Disc %1"
+msgstr "Disg %1"
 
-#: dynamic/biases/EchoNestBias.cpp:126
-msgctxt "EchoNest bias representation"
-msgid "Similar to the previous track (as reported by EchoNest)"
+#: context/applets/albums/Albums.cpp:254
+msgid "Right align track lengths"
 msgstr ""
 
-#: dynamic/biases/EchoNestBias.cpp:129
-msgctxt "EchoNest bias representation"
-msgid ""
-"Similar to any track in the current playlist (as reported by EchoNest)"
+#: context/applets/albums/Albums.cpp:259
+msgid "Number of recently added albums:"
 msgstr ""
 
-#: dynamic/biases/EchoNestBias.cpp:140
-msgid "Echo nest thinks the track is similar to"
+#: context/applets/albums/Albums.cpp:265
+msgid "Albums Applet Settings"
 msgstr ""
 
-#: dynamic/biases/EchoNestBias.cpp:143
-msgid "the previous Track"
+#. i18n: file: services/magnatune/MagnatuneSignupDialogBase.ui:45
+#. i18n: ectx: property (text), widget (QPushButton, closeButton)
+#: context/applets/albums/Albums.cpp:342
+#: context/applets/lyrics/LyricsApplet.cpp:464 rc.cpp:835
+#: firstruntutorial/FirstRunTutorialPage.cpp:56
+msgid "Close"
 msgstr ""
 
-#: dynamic/biases/EchoNestBias.cpp:145
-msgid "one of the tracks in the current playlist"
+#: context/applets/lyrics/LyricsSuggestionsListWidget.cpp:90
+#, kde-format
+msgid "artist: %1"
 msgstr ""
 
-#: dynamic/biases/PartBias.cpp:44
-msgctxt "Name of the \"Part\" bias"
-msgid "Partition"
+#: context/applets/lyrics/LyricsApplet.cpp:192
+msgctxt "Used if the current track has no artist."
+msgid "Unknown"
 msgstr ""
 
-#: dynamic/biases/PartBias.cpp:53
-msgctxt "Description of the \"Part\" bias"
+#: context/applets/lyrics/LyricsApplet.cpp:199
+#, kde-format
 msgid ""
-"The \"Part\" bias fills parts of the playlist from different sub-biases."
+"While you were editing the lyrics of <b>%1 - %2</b> the track has changed. "
+"Do you want to save your changes?"
 msgstr ""
 
-#: dynamic/biases/PartBias.cpp:260
-msgid "This controls what portion of the playlist should match the criteria"
+#: context/applets/lyrics/LyricsApplet.cpp:206
+#, kde-format
+msgid ""
+"The lyrics of <b>%1 - %2</b> changed while you were editing them. Do you "
+"want to save your changes?"
 msgstr ""
 
-#: dynamic/biases/PartBias.cpp:401
-msgctxt "Part bias representation"
-msgid "Partition"
+#: context/applets/lyrics/LyricsApplet.cpp:450
+msgid "Edit Lyrics"
 msgstr ""
 
-#: dynamic/biases/SearchQueryBias.cpp:43
-msgctxt "Name of the \"SearchQuery\" bias"
-msgid "Search"
+#: context/applets/lyrics/LyricsApplet.cpp:457
+msgid "Save Lyrics"
 msgstr ""
 
-#: dynamic/biases/SearchQueryBias.cpp:52
-msgctxt "Description of the \"SearchQuery\" bias"
-msgid ""
-"The \"SearchQuery\" bias adds tracks that are\n"
-"found by a search query. It uses the same search\n"
-"query as the collection browser."
+#: context/applets/lyrics/LyricsApplet.cpp:471
+msgid "Scroll automatically"
 msgstr ""
 
-#: dynamic/biases/SearchQueryBias.cpp:119
-#, kde-format
-msgctxt "SearchQuery bias representation"
-msgid "Search for: %1"
+#: context/applets/lyrics/LyricsApplet.cpp:478
+msgid "Reload Lyrics"
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:52
-msgctxt "Name of the random bias"
-msgid "Random"
+#: context/applets/lyrics/LyricsApplet.cpp:562
+msgid "Lyrics: No script is running"
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:59
-msgctxt "Description of the random bias"
-msgid ""
-"The random bias adds random tracks from the\n"
-"whole collection without any bias."
+#: context/applets/lyrics/LyricsApplet.cpp:574
+msgid "Lyrics: Fetching ..."
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:70
-msgctxt "Name of the \"And\" bias"
-msgid "And"
+#: context/applets/lyrics/LyricsApplet.cpp:578
+msgid "Lyrics: Fetch error"
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:77
-msgctxt "Description of the \"And\" bias"
-msgid ""
-"The \"And\" bias adds tracks that match all\n"
-"of the sub biases."
+#: context/applets/lyrics/LyricsApplet.cpp:584
+msgid "Lyrics: Suggested URLs"
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:88
-msgctxt "Name of the \"Or\" bias"
-msgid "Or"
+#: context/applets/lyrics/LyricsApplet.cpp:610
+#, kde-format
+msgctxt "Lyrics: <artist> - <title>"
+msgid "Lyrics: %1 - %2"
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:95
-msgctxt "Description of the \"Or\" bias"
-msgid ""
-"The \"Or\" bias adds tracks that match at\n"
-"least one of the sub biases."
+#: context/applets/lyrics/LyricsApplet.cpp:616
+msgid "Lyrics: Not found"
 msgstr ""
 
-#: dynamic/BiasFactory.cpp:184 dynamic/BiasFactory.cpp:190
-#, kde-format
-msgid "Replacement for bias %1"
+#: context/applets/lyrics/LyricsApplet.cpp:656
+msgctxt "@info"
+msgid ""
+"Do you really want to refetch lyrics for this track? All changes you may "
+"have made will be lost."
 msgstr ""
 
-#: dynamic/DynamicModel.cpp:786
-msgctxt "Default name for new playlists"
-msgid "New playlist"
+#. i18n: file: context/applets/lyrics/lyricsSettings.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, lyricsSettings)
+#: context/applets/lyrics/LyricsApplet.cpp:693 rc.cpp:1190
+msgid "Lyrics Settings"
 msgstr ""
 
-#: dynamic/DynamicModel.cpp:925
-msgid "Rock and Pop"
+#: context/applets/labels/LabelGraphicsItem.cpp:64
+msgid "Add label"
 msgstr ""
 
-#: dynamic/DynamicModel.cpp:931
-msgid "Album play"
+#: context/applets/labels/LabelGraphicsItem.cpp:69
+msgid "Remove label"
 msgstr ""
 
-#: dynamic/DynamicModel.cpp:940
-msgctxt "Name of a dynamic playlist"
-msgid "Rating"
+#: context/applets/labels/LabelGraphicsItem.cpp:79
+msgid "Add to blacklist"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastMeta.cpp:379
-#: core/podcasts/PodcastMeta.h:413
-msgid "Podcast"
+#: context/applets/labels/LabelsApplet.cpp:195
+msgid "Labels: No track playing"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.h:54
-msgid "Local Podcasts"
+#: context/applets/labels/LabelsApplet.cpp:516
+msgid "Labels: Fetching..."
 msgstr ""
 
-#: core-impl/podcasts/sql/PodcastFilenameLayoutConfigDialog.cpp:15
-msgctxt "Change filename layout"
-msgid "Podcast Episode Filename Configuration"
+#: context/applets/labels/LabelsApplet.cpp:526
+#, kde-format
+msgid "Labels: %1"
 msgstr ""
 
-#: core-impl/podcasts/sql/PodcastSettingsDialog.cpp:36
+#: context/applets/labels/LabelsApplet.cpp:574
 #, kde-format
-msgctxt "change options"
-msgid "Configure %1"
-msgstr "Ffurfweddu %1"
+msgid "Labels for %1 by %2"
+msgstr ""
 
-#: core-impl/podcasts/sql/PodcastSettingsDialog.cpp:69
-msgid " Item"
-msgid_plural " Items"
-msgstr[0] ""
-msgstr[1] ""
+#: context/applets/labels/LabelsApplet.cpp:742
+msgid "General Settings"
+msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:288
-msgid "&Update All Channels"
+#: context/applets/labels/LabelsApplet.cpp:743
+msgid "Blacklist Settings"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:296
-msgid "&Configure General Settings"
+#: context/applets/labels/LabelsApplet.cpp:744
+msgid "Replacement Settings"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:304
-msgid "&Export subscriptions to OPML file"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:48
+msgid "Your system has no OpenGL support"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:328
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:880
-msgid "&Configure"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:64
+msgid "Could not create an OpenGL rendering context."
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:346
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:898
-msgid "&Remove Subscription"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:68
+msgid "Your system has no sample buffer support."
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:368
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:919
-msgid "&Update Channel"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:72
+msgid "Your system has no stencil buffer support."
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:407
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:800
-msgid "&Delete Downloaded Episode"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:76
+msgid "Your system has no double buffer support."
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:419
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:813
-msgid "&Write Feed Information to File"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:80
+msgid "Your system has no accumulation buffer support."
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:443
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:850
-msgid "&Download Episode"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:84
+msgid "Your system has no direct rendering support."
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:486
-#, kde-format
-msgid "Already subscribed to %1."
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:138
+msgid "Spectrum-Analyzer"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:611
-msgctxt "prefix to 'x minutes'"
-msgid "every "
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:166
+msgid "Detach"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:612
-msgid " minute"
-msgid_plural " minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:175
+msgid "Fullscreen"
+msgstr "Sgrîn-lawn"
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:621
-msgid "Configure Local Podcasts"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:184
+msgid "Power"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:641
-msgid "Move Podcasts"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:193
+msgid "Switch Mode"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:645
-msgid "Do you want to move all downloaded episodes to the new location?"
+#: context/applets/spectrumanalyzer/SpectrumAnalyzerApplet.cpp:665
+msgid "Spectrum Analyzer Settings"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:714
-msgid "Select file for OPML export"
+#: ActionClasses.cpp:86
+msgid "Amarok Menu"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:998
-msgid "Unsubscribe"
+#: ActionClasses.cpp:176
+msgid "Play/Pause"
+msgstr "Chwarae/Seibio"
+
+#: ActionClasses.cpp:313
+msgid "Click to change"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1002
-#, kde-format
-msgid "Do you really want to unsubscribe from \"%1\"?"
+#: ActionClasses.cpp:330
+msgid "&Replay Gain Mode"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1007
-msgid "Delete downloaded episodes"
+#: ActionClasses.cpp:332
+msgctxt "Replay Gain state, as in, disabled"
+msgid "&Off"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1130
-msgid "Waiting for Podcast Downloads to Finish"
+#: ActionClasses.cpp:332
+msgctxt "Item, as in, music"
+msgid "&Track"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1131
-#, kde-format
-msgid "There is still a podcast download in progress"
-msgid_plural "There are still %1 podcast downloads in progress"
-msgstr[0] ""
-msgstr[1] ""
+#: ActionClasses.cpp:333
+msgid "&Album"
+msgstr "&Album"
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1135
-msgid "Cancel Download and Quit."
+#: ActionClasses.cpp:342
+msgid "&Equalizer"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1312
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1555
-#, kde-format
-msgid "Unable to save podcast episode file to %1"
+#: ActionClasses.cpp:370
+msgid "Your current setup does not support the equalizer feature"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1322
-msgid "Downloading Podcast Media"
+#: ActionClasses.cpp:375
+msgctxt "Equalizer state, as in, disabled"
+msgid "&Off"
 msgstr ""
 
-#: core-impl/podcasts/sql/SqlPodcastProvider.cpp:1323
-#, kde-format
-msgid "Downloading Podcast \"%1\""
+#: ActionClasses.cpp:398
+msgid "Burn"
 msgstr ""
 
-#: core-impl/capabilities/timecode/TimecodeWriteCapability.cpp:102
-#, kde-format
-msgid "%1 - Stopped %2"
+#: ActionClasses.cpp:437
+msgid "Current Playlist"
 msgstr ""
 
-#: core-impl/capabilities/timecode/TimecodeWriteCapability.cpp:107
-msgid "Playback Ended Markers"
+#: ActionClasses.cpp:438
+msgid "Selected Tracks"
 msgstr ""
 
-#: core-impl/meta/default/DefaultMetaTypes.h:39
-#: core-impl/meta/default/DefaultMetaTypes.h:75
-#: core-impl/meta/default/DefaultMetaTypes.h:92
-#: services/scriptable/ScriptableServiceMeta_p.h:103
-#: services/scriptable/ScriptableServiceMeta_p.h:161
-#: services/scriptable/ScriptableServiceMeta_p.h:210
-#: services/scriptable/ScriptableServiceMeta_p.h:253
-#: services/scriptable/ScriptableServiceMeta_p.h:295
-msgctxt "The value is not known"
-msgid "Unknown"
+#: ActionClasses.cpp:469
+msgid "Stop"
 msgstr ""
 
-#: core-impl/meta/default/DefaultMetaTypes.h:58
-msgctxt "The Value is not known"
-msgid "Unknown"
+#: ActionClasses.cpp:521
+msgid "Stop after current Track"
 msgstr ""
 
-#: core-impl/meta/stream/Stream.cpp:52
-#, kde-format
-msgid "Stream (%1)"
+#: ActionClasses.cpp:536
+msgid "Stop after current track: On"
 msgstr ""
 
-#: core-impl/playlists/types/dynamic/DynamicPlaylist.cpp:36
-msgid "Default Dynamic Playlist"
+#: ActionClasses.cpp:542
+msgid "Stop after current track: Off"
 msgstr ""
 
-#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:78
-#, kde-format
-msgid "Cannot read playlist (%1)."
+#: k3bexporter.cpp:182
+msgid "Unable to start K3b."
 msgstr ""
 
-#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:97
-msgid "Could not create a temporary file to download playlist."
+#: k3bexporter.cpp:206
+msgid "There was a DCOP communication error with K3b."
 msgstr ""
 
-#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:113
-msgid "Downloading remote playlist"
+#: k3bexporter.cpp:240
+msgid ""
+"Create an audio mode CD suitable for CD players, or a data mode CD suitable "
+"for computers and other digital music players?"
 msgstr ""
 
-#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:189
-msgid "The used file extension is not valid for playlists."
+#: k3bexporter.cpp:243
+msgid "Create K3b Project"
 msgstr ""
 
-#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:190
-msgid "Unknown playlist format"
+#: k3bexporter.cpp:244
+msgid "Audio Mode"
 msgstr ""
 
-#: core-impl/playlists/types/file/PlaylistFileSupport.cpp:216
-#, kde-format
-msgid "Playlist_%1"
+#: k3bexporter.cpp:245
+msgid "Data Mode"
 msgstr ""
 
-#: core-impl/collections/daap/DaapCollection.cpp:104
+#: ScriptManager.cpp:303
 #, kde-format
-msgid "Loading remote collection from host %1"
+msgid ""
+"Script error reported by: %1\n"
+"%2"
 msgstr ""
 
-#: core-impl/collections/daap/DaapCollection.cpp:274
-#, kde-format
-msgid "Music share at %1"
+#: toolbar/SlimToolbar.cpp:36
+msgid "Slim Toolbar"
 msgstr ""
 
-#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:155
-#: core-impl/collections/mediadevicecollection/podcast/MediaDevicePodcastProvider.cpp:58
+#: toolbar/VolumePopupButton.cpp:107 toolbar/VolumePopupButton.cpp:118
+#: widgets/Osd.cpp:171
+msgid "(muted)"
+msgstr ""
+
+#: toolbar/VolumePopupButton.cpp:107 toolbar/VolumePopupButton.cpp:118
+#: widgets/Osd.cpp:171
 #, kde-format
-msgctxt "Podcasts on a media device"
-msgid "Podcasts on %1"
+msgid "Volume: %1% %2"
 msgstr ""
 
-#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:181
-msgid "&Delete Episode"
+#: toolbar/MainToolbar.cpp:82
+msgid "Main Toolbar"
 msgstr ""
 
-#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:253
-#, kde-format
-msgid "Are you sure you want to delete this episode?"
-msgid_plural "Are you sure you want to delete these %1 episodes?"
-msgstr[0] ""
-msgstr[1] ""
+#: toolbar/MainToolbar.cpp:89
+msgid "Rediscover Your Music"
+msgstr ""
 
-#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:269
-#, kde-format
-msgid "Yes, delete from %1."
+#: playlistgenerator/PresetEditDialog.cpp:61
+msgid "Add new"
 msgstr ""
 
-#: core-impl/collections/umscollection/podcasts/UmsPodcastProvider.cpp:325
-msgid "&Delete Channel and Episodes"
+#: playlistgenerator/PresetEditDialog.cpp:62
+#: playlistgenerator/PresetEditDialog.cpp:64
+#: playlistgenerator/PresetEditDialog.cpp:92
+msgid "Constraint Group"
 msgstr ""
 
-#: core-impl/collections/umscollection/handler/UmsHandler.cpp:474
-msgid "&Use as Collection"
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:126
+#. i18n: ectx: property (text), widget (QPushButton, removePushButton)
+#: playlistgenerator/PresetEditDialog.cpp:72 rc.cpp:1227
+msgid "Remove selected"
 msgstr ""
 
-#: core-impl/collections/umscollection/handler/UmsHandler.cpp:486
-#, kde-format
-msgid "&Configure %1"
+#: playlistgenerator/constraints/TagMatch.cpp:57
+msgid "Match Tags"
 msgstr ""
 
-#: core-impl/collections/umscollection/handler/UmsHandler.cpp:519
-msgid "Configure USB Mass Storage Device"
+#: playlistgenerator/constraints/TagMatch.cpp:58
+msgid "Make all tracks in the playlist match the specified characteristic"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:152
-msgid "Could not connect to MTP Device"
+#: playlistgenerator/constraints/TagMatch.cpp:184
+#, kde-format
+msgctxt ""
+"%1 = empty string or \"not\"; %2 = a metadata field, like \"title\" or "
+"\"artist name\"; %3 = a predicate, can be equals, starts with, ends with or "
+"contains; %4 = a string to match; Example: Match tag: not title contains "
+"\"foo\""
+msgid "Match tag:%1 %2 %3 %4"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:378
-msgid "Could not copy track from device."
+#: playlistgenerator/constraints/TagMatch.cpp:185
+msgid " not"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:421
-#: core-impl/collections/mediadevicecollection/MediaDeviceMeta.cpp:150
-#: core/meta/Meta.cpp:394 covermanager/CoverFetchUnit.cpp:596
-#: covermanager/CoverFetchUnit.cpp:606
-#: context/applets/currenttrack/CurrentTrack.h:38
-msgid "Unknown Artist"
+#: playlistgenerator/constraints/TagMatch.cpp:188
+#, kde-format
+msgctxt "number of stars in the rating of a track"
+msgid "%1 star"
+msgid_plural "%1 stars"
+msgstr[0] ""
+msgstr[1] ""
+
+#: playlistgenerator/constraints/TagMatch.cpp:194
+#, kde-format
+msgctxt "an arbitrary string surrounded by quotes"
+msgid "\"%1\""
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:431
-#: core/meta/Meta.cpp:444 context/applets/currenttrack/CurrentTrack.h:39
-msgid "Unknown Album"
+#: playlistgenerator/constraints/TagMatch.cpp:353
+#: widgets/MetaQueryWidget.cpp:883
+msgctxt "a numerical tag (like year or track number) equals a value"
+msgid "equals"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:437
-#: core/meta/Meta.cpp:481
-msgid "Unknown Genre"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:123
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:477
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:614
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonRating)
+#: playlistgenerator/constraints/TagMatch.cpp:355 rc.cpp:1372 rc.cpp:1456
+#: rc.cpp:1489 widgets/MetaQueryWidget.cpp:885
+msgid "greater than"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:593
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:732
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:915
-msgid "Could not delete item"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:113
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:467
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:604
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonRating)
+#: playlistgenerator/constraints/TagMatch.cpp:357
+#: playlistgenerator/constraints/PlaylistLength.cpp:154 rc.cpp:1366
+#: rc.cpp:1450 rc.cpp:1483 widgets/MetaQueryWidget.cpp:881
+msgid "less than"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:603
-msgid "Delete failed"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:233
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
+#: playlistgenerator/constraints/TagMatch.cpp:361 rc.cpp:1396
+msgid "before"
 msgstr ""
 
-#: core-impl/collections/mtpcollection/handler/MtpHandler.cpp:888
-msgid "Could not save playlist."
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:238
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
+#: playlistgenerator/constraints/TagMatch.cpp:363 rc.cpp:1399
+msgid "on"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/MediaDeviceCollection.cpp:263
-msgid "&Disconnect Device"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:243
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
+#: playlistgenerator/constraints/TagMatch.cpp:365 rc.cpp:1402
+msgid "after"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:306
-msgid "Copying Tracks Failed"
+#: playlistgenerator/constraints/TagMatch.cpp:367
+msgid "within"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:310
-msgid "Tracks not copied: the device is already being copied to"
+#: playlistgenerator/constraints/TagMatch.cpp:371
+#: widgets/MetaQueryWidget.cpp:897
+msgctxt "an alphabetical tag (like title or artist name) equals some string"
+msgid "equals"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:347
-#, kde-format
-msgid "Unsupported format: %1"
+#: playlistgenerator/constraints/TagMatch.cpp:373
+msgctxt ""
+"an alphabetical tag (like title or artist name) starts with some string"
+msgid "starts with"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:390
-msgid "Already on device"
+#: playlistgenerator/constraints/TagMatch.cpp:375
+msgctxt ""
+"an alphabetical tag (like title or artist name) ends with some string"
+msgid "ends with"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:406
-msgid "Tracks not copied: the device already has these tracks"
+#: playlistgenerator/constraints/TagMatch.cpp:377
+#: widgets/MetaQueryWidget.cpp:899
+msgctxt ""
+"an alphabetical tag (like title or artist name) contains some string"
+msgid "contains"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:427
-msgid "Tracks not copied: the device has insufficient space"
+#: playlistgenerator/constraints/TagMatch.cpp:379
+msgid "regexp"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:437
-msgid "Transferring Tracks to Device"
+#: playlistgenerator/constraints/TagMatch.cpp:382
+#: playlistgenerator/constraints/PlaylistLength.cpp:156
+#: playlistgenerator/constraints/PlaylistDuration.cpp:170
+#: widgets/MetaQueryWidget.cpp:904
+msgid "unknown comparison"
 msgstr ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:479
+#: playlistgenerator/constraints/TagMatch.cpp:395
 #, kde-format
-msgid "%1 track failed to copy to the device"
-msgid_plural "%1 tracks failed to copy to the device"
+msgid "%1 day"
+msgid_plural "%1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:581
-msgid "The track failed to copy to the device"
-msgstr ""
+#: playlistgenerator/constraints/TagMatch.cpp:398
+#, kde-format
+msgid "%1 month"
+msgid_plural "%1 months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:591
-msgid "Track not deleted:"
-msgid_plural "Tracks not deleted:"
+#: playlistgenerator/constraints/TagMatch.cpp:401
+#, kde-format
+msgid "%1 year"
+msgid_plural "%1 years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:592
-msgid "Deleting Track Failed"
-msgid_plural "Deleting Tracks Failed"
+#: playlistgenerator/constraints/TagMatch.cpp:552
+#: playlistgenerator/constraints/TagMatch.cpp:769
+msgctxt "within the last %1 days"
+msgid "day"
+msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:596
-#, kde-format
-msgid "%1 tracks are already being deleted from the device."
-msgstr ""
+#: playlistgenerator/constraints/TagMatch.cpp:553
+#: playlistgenerator/constraints/TagMatch.cpp:770
+msgctxt "within the last %1 months"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: core-impl/collections/mediadevicecollection/handler/MediaDeviceHandler.cpp:613
-msgid "Removing Track from Device"
-msgid_plural "Removing Tracks from Device"
+#: playlistgenerator/constraints/TagMatch.cpp:554
+#: playlistgenerator/constraints/TagMatch.cpp:771
+msgctxt "within the last %1 years"
+msgid "year"
+msgid_plural "years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: core-impl/collections/mediadevicecollection/playlist/MediaDeviceUserPlaylistProvider.h:42
-msgid "Media Device playlists"
+#: playlistgenerator/constraints/PreventDuplicates.cpp:53
+msgid "Prevent Duplicates"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:292
-msgid "iPod was not initialized:"
+#: playlistgenerator/constraints/PreventDuplicates.cpp:54
+msgid ""
+"Prevents duplicate tracks, albums, or artists from appearing in the playlist"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:293
-msgid "iPod Initialization Failed"
+#: playlistgenerator/constraints/PreventDuplicates.cpp:101
+msgid "Prevent duplicate tracks"
+msgstr ""
+
+#: playlistgenerator/constraints/PreventDuplicates.cpp:103
+msgid "Prevent duplicate artists"
+msgstr ""
+
+#: playlistgenerator/constraints/PreventDuplicates.cpp:105
+msgid "Prevent duplicate albums"
+msgstr ""
+
+#: playlistgenerator/constraints/PlaylistLength.cpp:57
+msgid "Playlist Length"
+msgstr ""
+
+#: playlistgenerator/constraints/PlaylistLength.cpp:58
+msgid "Sets the preferred number of tracks in the playlist"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:316
+#: playlistgenerator/constraints/PlaylistLength.cpp:119
 #, kde-format
-msgid ""
-"Media Device: could not find iTunesDB on device mounted at %1. Attempt to "
-"initialize your iPod?"
+msgctxt "%2 is e.g. 'more than' or 'less than' or 'equals'"
+msgid "Playlist length: %2 1 track"
+msgid_plural "Playlist length: %2 %1 tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: playlistgenerator/constraints/PlaylistLength.cpp:150
+msgctxt "number of tracks in playlist equals some number"
+msgid "equals"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:318
-msgid "Initialize iPod?"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:49
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
+#: playlistgenerator/constraints/PlaylistLength.cpp:152 rc.cpp:1525
+msgid "more than"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:319
-msgid "&Initialize"
+#: playlistgenerator/constraints/Checkpoint.cpp:61
+msgid "Checkpoint"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:360
-msgid "Set iPod Model"
+#: playlistgenerator/constraints/Checkpoint.cpp:62
+msgid "Fixes a track, album, or artist to a certain position in the playlist"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:360
-msgid "iPod Models"
+#: playlistgenerator/constraints/Checkpoint.cpp:177
+#, kde-format
+msgid "Checkpoint: %1"
+msgstr ""
+
+#: playlistgenerator/constraints/Checkpoint.cpp:185
+#: playlistgenerator/constraints/Checkpoint.cpp:193
+#: playlistgenerator/constraints/Checkpoint.cpp:205
+msgid "unassigned"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:364
+#: playlistgenerator/constraints/Checkpoint.cpp:187
 #, kde-format
-msgid "%1 the iPod Model is necessary to initialize the iPod"
+msgid "\"%1\" (track) by %2"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:390
+#: playlistgenerator/constraints/Checkpoint.cpp:196
 #, kde-format
-msgid ""
-"%1 failed to write to iPod, make sure you have write permissions on the iPod"
+msgid "\"%1\" (album) by %2"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:406
+#: playlistgenerator/constraints/Checkpoint.cpp:198
 #, kde-format
-msgid ""
-"%1 failed to write SysInfo file to iPod, make sure you have write "
-"permissions on the iPod"
+msgid "\"%1\" (album)"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:430
+#: playlistgenerator/constraints/Checkpoint.cpp:207
 #, kde-format
-msgid "%1 failed to initialize the iPod"
+msgid "\"%1\" (artist)"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:438
-msgid "The iPod was successfully initialized."
+#: playlistgenerator/constraints/TagMatchSupport.cpp:86
+msgid "url"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:438
-msgid "iPod Initialized"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:87
+msgid "title"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:445
-#, kde-format
-msgid ""
-"%1 you chose not to initialize the iPod. It will not be usable until it is "
-"initialized."
+#: playlistgenerator/constraints/TagMatchSupport.cpp:88
+msgid "artist name"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:519
-msgid "&Stale and Orphaned"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:89
+msgid "album name"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:529
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:692
-msgid "Synchronize Artwork"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:90
+msgid "genre"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:545
-msgid ""
-"Do you really want to initialize this iPod? Its database will be cleared of "
-"all information, but the files will not be deleted."
+#: playlistgenerator/constraints/TagMatchSupport.cpp:91
+msgid "composer"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:549
-msgid "Initialize iPod"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:92
+msgid "year"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:555
-msgid "The iPod has been initialized"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:93
+msgid "comment"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:558
-msgid "The iPod was unable to be initialized"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:94
+msgid "track number"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:567
-msgid ""
-"Amarok is about to search for stale tracks. This may take a while, do you "
-"want to continue?"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:95
+msgid "disc number"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:571
-msgid "Find Stale Tracks"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:96
+msgid "length"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:654
-#, kde-format
-msgctxt "@info"
-msgid "One stale track removed from the database. Scan for orphaned tracks?"
-msgid_plural "%1 tracks removed from the database. Scan for orphaned tracks?"
-msgstr[0] ""
-msgstr[1] ""
+#: playlistgenerator/constraints/TagMatchSupport.cpp:97
+msgid "added to collection"
+msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:659
-msgid "Find Orphaned Tracks"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:98
+msgid "score"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:690
-#, kde-format
-msgid ""
-"Amarok is about to synchronize artwork on <i>%1</i>. Do you want to continue?"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:99
+msgid "rating"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:701
-msgid "iPod artwork could not be synchronized"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:100
+msgid "first played"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:712
-msgid "Artwork synchronized"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:101
+msgid "last played"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:922
-msgid ""
-"Amarok requires sudo access to get the FirewireGuid required to connect to "
-"your device. Please enter your sudo password"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:102
+msgid "play count"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2215
-msgid "Select Stale Tracks To Delete"
+#: playlistgenerator/constraints/TagMatchSupport.cpp:103
+msgid "label"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2215
-msgid "Stale Tracks"
+#: playlistgenerator/constraints/PlaylistDuration.cpp:57
+msgid "Playlist Duration"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2269
-msgid "Adding Orphaned Tracks to iPod Database"
+#: playlistgenerator/constraints/PlaylistDuration.cpp:58
+msgid "Sets the preferred duration of the playlist"
 msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2305
+#: playlistgenerator/constraints/PlaylistDuration.cpp:124
 #, kde-format
-msgctxt "@info"
-msgid "One orphaned track added to the database."
-msgid_plural "%1 tracks added to the database."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Playlist duration: %1 %2"
+msgstr ""
 
-#: core-impl/collections/ipodcollection/handler/IpodHandler.cpp:2310
-msgid "Orphaned Tracks Added"
+#: playlistgenerator/constraints/PlaylistDuration.cpp:164
+msgctxt "duration of playlist equals some time"
+msgid "equals"
+msgstr ""
+
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:49
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
+#: playlistgenerator/constraints/PlaylistDuration.cpp:166 rc.cpp:1594
+msgid "longer than"
+msgstr ""
+
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:39
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
+#: playlistgenerator/constraints/PlaylistDuration.cpp:168 rc.cpp:1588
+msgid "shorter than"
+msgstr ""
+
+#: playlistgenerator/PresetModel.cpp:159 playlistgenerator/PresetModel.cpp:297
+msgid "Preset files (*.xml)"
+msgstr ""
+
+#: playlistgenerator/PresetModel.cpp:161
+msgid "Import preset"
 msgstr ""
 
-#: core-impl/collections/playdarcollection/PlaydarCollection.cpp:125
-msgid "Playdar Collection"
+#: playlistgenerator/PresetModel.cpp:215
+#, kde-format
+msgid "Preset exported to %1"
 msgstr ""
 
-#: core-impl/collections/db/ScanResultProcessor.cpp:261
-msgctxt "The genre name for classical music"
-msgid "Classical"
+#: playlistgenerator/PresetModel.cpp:222
+#, kde-format
+msgid "Preset could not be exported to %1"
 msgstr ""
 
-#: core-impl/collections/db/ScanResultProcessor.cpp:270
-#: core-impl/collections/db/sql/SqlMeta.cpp:420
-#: widgets/AlbumBreadcrumbWidget.cpp:60 dialogs/TrackOrganizer.cpp:48
-#: browsers/CollectionTreeItemModelBase.cpp:316
-#: covermanager/CoverManager.cpp:841 playlist/PlaylistModel.cpp:878
-msgid "Various Artists"
-msgstr "Artistiaid Amrywiol"
+#: playlistgenerator/PresetModel.cpp:240
+#, kde-format
+msgid "Presets could not be imported from %1"
+msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:136
-msgid "Database import requested"
+#: playlistgenerator/PresetModel.cpp:247
+#, kde-format
+msgid "%1 could not be opened for preset import"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:242
-msgid "Scanning music"
+#: playlistgenerator/PresetModel.cpp:252
+msgid "Example 1: new tracks added this week"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:269
-msgid ""
-"<p>The version of the 'amarokcollectionscanner' tool\n"
-"does not match your Amarok version.</p><p>Please note that Collection "
-"Scanning may not work correctly.</p>"
+#: playlistgenerator/PresetModel.cpp:253
+msgid "Example 2: rock or pop music"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:334
-#, kde-format
-msgid ""
-"The collection scanner reported the following errors:\n"
-"%1\n"
-"In most cases this means that not all of your tracks were imported.\n"
-"Further errors will only be reported on the console."
+#: playlistgenerator/PresetModel.cpp:254
+msgid "Example 3: about one hour of tracks from different artists"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:479
-#, kde-format
-msgid "Failed to write scanner batch file \"%1\""
+#: playlistgenerator/PresetModel.cpp:255
+msgid "Example 4: like my favorite radio station"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:487
-msgid "Unable to start Amarok collection scanner."
+#: playlistgenerator/PresetModel.cpp:256
+msgid "Example 5: an 80-minute CD of rock, metal, and industrial"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:536
+#: playlistgenerator/PresetModel.cpp:306
 #, kde-format
-msgid "Found one directory"
-msgid_plural "Found %1 directories"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Export \"%1\" preset"
+msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:547
-#, kde-format
-msgid "Got directory \"%1\" from scanner."
+#: playlistgenerator/Preset.cpp:42 playlistgenerator/Preset.cpp:55
+msgid "New playlist preset"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:588
-#, kde-format
-msgid "Aborting scanner with error: %1"
+#: playlistgenerator/Preset.cpp:45 playlistgenerator/Preset.cpp:67
+msgid "Unnamed playlist preset"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:607
-msgid "Scanner aborted."
+#: playlistgenerator/Preset.cpp:129
+msgid "Generating a new playlist"
 msgstr ""
 
-#: core-impl/collections/db/ScanManager.cpp:700
+#: playlistgenerator/Preset.cpp:147
 msgid ""
-"The collection scan had to be aborted. Too many errors were encountered "
-"during the scan."
+"The playlist generator created a playlist which does not meet all of your "
+"constraints.  If you are not satisfied with the results, try loosening or "
+"removing some constraints and then generating a new playlist."
 msgstr ""
 
-#: core-impl/collections/db/sql/mysqlservercollection/MySqlServerCollection.cpp:41
-#: core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedCollection.cpp:35
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:72
-#: context/applets/currenttrack/CurrentTrack.cpp:104
-msgid "Local Collection"
+#: playlistgenerator/ConstraintGroup.cpp:87
+msgctxt "name of a type of constraint group"
+msgid "\"Match Any\" group"
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollection.cpp:172
-#, kde-format
-msgid ""
-"The amarok database reported the following errors:\n"
-"%1\n"
-"In most cases you will need to resolve these errors before Amarok will run "
-"properly."
+#: playlistgenerator/ConstraintGroup.cpp:89
+msgctxt "name of a type of constraint group"
+msgid "\"Match All\" group"
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlMeta.cpp:272
-#: services/lastfm/meta/LastFmMeta.cpp:133 covermanager/CoverManager.cpp:842
-#, kde-format
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: core-impl/collections/db/sql/CapabilityDelegateImpl.cpp:59
-msgid "Do not show under Various Artists"
+#: playlistgenerator/ConstraintGroup.cpp:91
+msgctxt "name of a type of constraint group"
+msgid "Unknown match group"
 msgstr ""
 
-#: core-impl/collections/db/sql/CapabilityDelegateImpl.cpp:64
-msgid "Show under Various Artists"
+#: playlistgenerator/ConstraintSolver.cpp:210
+msgid "The playlist generator failed to load any tracks from the collection."
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:497
-msgid "Organizing tracks"
+#: playlistgenerator/ConstraintSolver.cpp:216
+msgid ""
+"There are no tracks that match all constraints. The playlist generator will "
+"find the tracks that match best, but you may want to consider loosening the "
+"constraints to find more tracks."
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:499
-msgid "Moving tracks"
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
 msgstr ""
+"KD wrth KGyfieithu, ,Launchpad Contributions:,Cadan ap Tomos,David "
+"Jones,JOSHYRAVE,Jonathan Price,Steven Sproat,Thierry Vignaud"
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:503
-msgid "Copying tracks"
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,cadz123@googlemail.com,,,notclive@gmail.com,,"
+
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:89
+#. i18n: ectx: property (mimeType), widget (TokenPool, tokenPool)
+#. i18n: file: dialogs/EditFilterDialog.ui:77
+#. i18n: ectx: property (mimeType), widget (TokenPool, tpTokenPool)
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:262
+#. i18n: ectx: property (mimeType), widget (TokenPool, tokenPool)
+#: rc.cpp:5 rc.cpp:489 rc.cpp:2012
+msgid "application/x-amarok-tag-token"
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:505
-msgid "Transcoding tracks"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:119
+#. i18n: ectx: property (text), widget (QLabel, syntaxLabel)
+#: rc.cpp:9
+#, no-c-format
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'Nimbus Sans L'; font-size:10pt;\">The following tokens can be used "
+"to define a filename scheme: %track, %title, </span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'Nimbus Sans L'; font-size:10pt;\">%artist, %albumartist, %composer, "
+"%year, %album, %comment, %genre<br /></span></p></body></html>"
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:563
-#, kde-format
-msgid "Could not create directory: %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:296
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:20
+msgid "Format Presets:"
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:640
-#, kde-format
-msgid "Transferring: %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:321
+#. i18n: ectx: property (whatsThis), widget (QComboBox, presetCombo)
+#: rc.cpp:23
+msgid "A list of selectable filename scheme/format presets."
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:642
-#, kde-format
-msgid "Transcoding: %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:328
+#. i18n: ectx: property (toolTip), widget (QPushButton, removePresetButton)
+#: rc.cpp:26
+msgid "Removes the currently selected format preset"
 msgstr ""
 
-#: core-impl/collections/db/sql/SqlCollectionLocation.cpp:686
-#: core-impl/collections/support/FileCollectionLocation.cpp:100
-#, kde-format
-msgid "Removing: %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:331
+#. i18n: ectx: property (text), widget (QPushButton, removePresetButton)
+#: rc.cpp:29
+msgid "Remove Preset"
 msgstr ""
 
-#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:62
-msgid ""
-"Ogg Vorbis is a fully free and unencumbered compressed audio format that is "
-"perfect for storing your compressed music on your computer. The sound "
-"quality is slightly better than Mp3 at the same bitrate. Note that not all "
-"mobile players support the Ogg Vorbis format."
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:338
+#. i18n: ectx: property (toolTip), widget (QPushButton, addPresetButton)
+#: rc.cpp:32
+msgid "Saves the current scheme/format above as a preset."
 msgstr ""
 
-#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:68
-msgid ""
-"Flac is a lossless compressed audio format free of any patents or license "
-"fees. It maintains perfect CD audio quality while reducing file size by "
-"about 50%. Because the filesize is much larger than Ogg Vorbis or Mp3 it is "
-"not recommended if you want to transfer your music to a mobile player."
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:341
+#. i18n: ectx: property (text), widget (QPushButton, addPresetButton)
+#: rc.cpp:35
+msgid "Save Preset"
 msgstr ""
 
-#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:74
-msgid ""
-"Wav is a basic, uncompressed audio file format. It takes up a lot of space "
-"but maintains perfect quality. It is generally not recommended unless you "
-"know what you are doing. If you want perfect quality, use Flac instead."
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:348
+#. i18n: ectx: property (text), widget (QPushButton, updatePresetButton)
+#: rc.cpp:38
+msgid "&Update Preset"
 msgstr ""
 
-#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:80
-msgid ""
-"Mp3 is the de facto standard in compressed audio compatible with almost all "
-"mobile players. It is however non free and generally not recommended."
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:380
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:41
+msgid "Character Replacement"
 msgstr ""
 
-#: core-impl/collections/audiocd/FormatSelectionDialog.cpp:113
-msgid "Audio CD settings - Amarok"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:398
+#. i18n: ectx: property (toolTip), widget (QCheckBox, spaceCheck)
+#: rc.cpp:44
+msgid "If checked, convert spaces to underscores."
 msgstr ""
 
-#: core-impl/collections/audiocd/handler/AudioCdHandler.cpp:37
-msgid "Audio CD"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:401
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, spaceCheck)
+#: rc.cpp:47
+msgid ""
+"If checked all spaces will be replaced with underscores in the file names. "
+"If not, spaces will be left as they are."
 msgstr ""
 
-#: core-impl/collections/nepomukcollection/NepomukCollection.cpp:129
-msgid "Nepomuk Collection"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:404
+#. i18n: ectx: property (text), widget (QCheckBox, spaceCheck)
+#: rc.cpp:50
+msgid "Replace spaces with &underscores"
 msgstr ""
 
-#: core-impl/collections/nepomukcollection/NepomukCollection.cpp:131
-msgid "Nepomuk Collection (slow, Redland)"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:417
+#. i18n: ectx: property (toolTip), widget (QCheckBox, ignoreTheCheck)
+#: rc.cpp:53
+msgid "If checked, postfix artists' names starting with 'The' with ', The'."
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:40
-#, kde-format
-msgctxt "@info"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:420
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreTheCheck)
+#: rc.cpp:56
 msgid ""
-"Do you really want to delete this track? It will be removed from disk as "
-"well as your collection."
-msgid_plural ""
-"Do you really want to delete these %1 tracks? They will be removed from disk "
-"as well as your collection."
-msgstr[0] ""
-msgstr[1] ""
+"If checked all artists that have the word \"The\" at the beginning will be "
+"treated as if the \"The\" was not there. Example, \"The Beatles\" would "
+"become \"Beatles, The\""
+msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:45
-msgid "Delete Files"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:423
+#. i18n: ectx: property (text), widget (QCheckBox, ignoreTheCheck)
+#: rc.cpp:59
+msgid "I&gnore 'The' in artist names"
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:61
-#, kde-format
-msgctxt "@info"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:438
+#. i18n: ectx: property (toolTip), widget (QCheckBox, vfatCheck)
+#: rc.cpp:62
 msgid ""
-"Do you really want to move this track to the trash? It will be removed from "
-"disk as well as your collection."
-msgid_plural ""
-"Do you really want to move these %1 tracks to the trash? They will be "
-"removed from disk as well as your collection."
-msgstr[0] ""
-msgstr[1] ""
-
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:70
-#: browsers/filebrowser/FileView.cpp:579
-msgctxt "@title:window"
-msgid "Confirm Move to Trash"
+"Replace characters that are incompatible with MS-DOS/VFAT file systems with "
+"underscores. \n"
+"\n"
+"Most people can leave this option enabled."
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:82
-#, kde-format
-msgctxt "@info"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:443
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, vfatCheck)
+#: rc.cpp:67
 msgid ""
-"Do you really want to move this track? It will be renamed and the original "
-"deleted."
-msgid_plural ""
-"Do you really want to move these %1 tracks? They will be renamed and the "
-"originals deleted."
-msgstr[0] ""
-msgstr[1] ""
+"If checked, replace characters that are incompatible with MS-DOS/VFAT file "
+"systems with underscores. Incompatible characters include |?*<\":>+[] and "
+"unicode control characters. \n"
+"\n"
+"Most people can leave this option enabled as it ensures copying to media "
+"devices will function correctly."
+msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:87
-msgid "Move Files"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:446
+#. i18n: ectx: property (text), widget (QCheckBox, vfatCheck)
+#: rc.cpp:72
+msgid "&VFAT safe names"
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:98
-#, kde-format
-msgctxt "@info"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:467
+#. i18n: ectx: property (toolTip), widget (QCheckBox, asciiCheck)
+#: rc.cpp:75
 msgid ""
-"There was a problem and this track could not be removed. Make sure the "
-"directory is writable."
-msgid_plural ""
-"There was a problem and %1 tracks could not be removed. Make sure the "
-"directory is writable."
-msgstr[0] ""
-msgstr[1] ""
-
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:103
-msgid "Unable to be removed tracks"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">If checked, all non-ASCII "
+"characters will be replaced with underscores.<span style=\" font-"
+"weight:600;\"> </span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+"weight:600;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Do not check this option if you have non-English characters in "
+"your tags. </span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Most people can leave this "
+"option unchecked.</p></body></html>"
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:110
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:476
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, asciiCheck)
+#: rc.cpp:86
 msgid ""
-"The collection does not have enough free space available or is not writable."
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">If checked, all non-ASCII "
+"characters will be replaced with underscores.<span style=\" font-"
+"weight:600;\"> Do not check this option if you have non-English characters "
+"in your tags. </span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Most people can leave this "
+"option <span style=\" font-"
+"style:italic;\">unchecked.</span></p></body></html>"
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:116
-msgid "Do you want to remove empty folders?"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:479
+#. i18n: ectx: property (text), widget (QCheckBox, asciiCheck)
+#: rc.cpp:95
+msgid "Restrict to &ASCII"
 msgstr ""
 
-#: core-impl/collections/support/CollectionLocationDelegateImpl.cpp:117
-msgid "Remove empty folders?"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:500
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:98
+msgid "Replace"
 msgstr ""
 
-#: core-impl/collections/support/TextualQueryFilter.cpp:302
-msgid "today"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:522
+#. i18n: ectx: property (toolTip), widget (KLineEdit, regexpEdit)
+#: rc.cpp:101
+msgid "Regular expression"
+msgstr "Mynegiad rheolaidd"
+
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:541
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:36
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:104 rc.cpp:1211
+msgid "with"
+msgstr "gyda"
+
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:563
+#. i18n: ectx: property (toolTip), widget (KLineEdit, replaceEdit)
+#: rc.cpp:107
+msgid "Character string"
 msgstr ""
 
-#: core-impl/collections/support/TextualQueryFilter.cpp:304
-msgid "last week"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:645
+#. i18n: ectx: property (text), widget (QCheckBox, cbCase)
+#: rc.cpp:113
+msgid "Edit &case"
 msgstr ""
 
-#: core-impl/collections/support/TextualQueryFilter.cpp:306
-msgid "last month"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:682
+#. i18n: ectx: property (text), widget (QRadioButton, rbTitleCase)
+#: rc.cpp:116
+msgid "&Title case"
 msgstr ""
 
-#: core-impl/collections/support/TextualQueryFilter.cpp:308
-msgid "two months ago"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:704
+#. i18n: ectx: property (text), widget (QRadioButton, rbFirstLetter)
+#: rc.cpp:119
+msgid "&First letter of every word uppercase"
 msgstr ""
 
-#: core-impl/collections/support/TextualQueryFilter.cpp:310
-msgid "three months ago"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:723
+#. i18n: ectx: property (text), widget (QRadioButton, rbAllUpper)
+#: rc.cpp:122
+msgid "All &uppercase"
 msgstr ""
 
-#: core-impl/collections/support/TrashCollectionLocation.cpp:47
-msgid "Trash"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:742
+#. i18n: ectx: property (text), widget (QRadioButton, rbAllLower)
+#: rc.cpp:125
+msgid "All &lowercase"
 msgstr ""
 
-#: core-impl/collections/support/TrashCollectionLocation.cpp:101
-#, kde-format
-msgid "Moving to trash: %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:764
+#. i18n: ectx: property (text), widget (QCheckBox, cbEliminateSpaces)
+#: rc.cpp:128
+msgid "Remove trailing &spaces in tags"
 msgstr ""
 
-#: core-impl/collections/proxycollection/ProxyCollection.cpp:53
-msgid "Proxy Collection"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:780
+#. i18n: ectx: property (text), widget (QCheckBox, cbReplaceUnderscores)
+#: rc.cpp:131
+msgid "Replace &underscores with spaces"
 msgstr ""
 
-#: core-impl/collections/upnpcollection/UpnpBrowseCollection.cpp:118
-#, kde-format
-msgid "Scanning %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:787
+#. i18n: ectx: property (text), widget (QCheckBox, cbUseFullPath)
+#: rc.cpp:134
+msgid "Use full file path"
 msgstr ""
 
-#: core-impl/collections/upnpcollection/UpnpBrowseCollection.cpp:208
-#, kde-format
-msgid "UPnP Error: %1"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:800
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#: rc.cpp:137
+msgid "Reduce directories nesting level to:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:95
-msgid "Email contributor"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:851
+#. i18n: ectx: property (title), widget (QGroupBox, resultGroupBox)
+#: rc.cpp:140
+msgid "Result Preview"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:103 aboutdialog/OcsPersonItem.cpp:274
-msgid "Visit contributor's homepage"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:859
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, titleLabel)
+#: rc.cpp:143 rc.cpp:957
+msgid "Title:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:179
-#, kde-format
-msgctxt "A person's location: City, Country"
-msgid "%1, %2"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:866
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:146
+msgid "Artist:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:199
-msgid "IRC channels: "
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:873
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:149
+msgid "Composer:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:212
-msgid "Favorite music: "
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:880
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:152
+msgid "Year:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:217
-#, kde-format
-msgid "Visit %1's openDesktop.org profile"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:887
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:155
+msgid "Track:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:219
-#, kde-format
-msgid "Visit %1's profile on openDesktop.org"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:894
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:158
+msgid "Album:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:253
-msgid "Visit contributor's blog"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:901
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:161
+msgid "Comment:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:258
-msgid "Visit contributor's del.icio.us profile"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:908
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:164
+msgid "Genre:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:263
-msgid "Visit contributor's Digg profile"
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:921
+#. i18n: ectx: property (text), widget (QLabel, Title_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:937
+#. i18n: ectx: property (text), widget (QLabel, Artist_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:953
+#. i18n: ectx: property (text), widget (QLabel, Composer_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:969
+#. i18n: ectx: property (text), widget (QLabel, Year_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:985
+#. i18n: ectx: property (text), widget (QLabel, Album_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:1001
+#. i18n: ectx: property (text), widget (QLabel, Comment_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:1017
+#. i18n: ectx: property (text), widget (QLabel, Genre_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:1033
+#. i18n: ectx: property (text), widget (QLabel, Track_result)
+#. i18n: file: dialogs/FilenameLayoutDialog.ui:1062
+#. i18n: ectx: property (text), widget (QLabel, AlbumArtist_result)
+#: rc.cpp:167 rc.cpp:170 rc.cpp:173 rc.cpp:176 rc.cpp:179 rc.cpp:182
+#: rc.cpp:185 rc.cpp:188 rc.cpp:194
+msgid "<empty>"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:268
-msgid "Visit contributor's Facebook profile"
+#. i18n: file: dialogs/TagDialogBase.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, TagDialogBase)
+#: rc.cpp:197
+msgid "Track Information"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:284
-msgid "Visit contributor's Last.fm profile"
+#. i18n: file: dialogs/TagDialogBase.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget, summaryTab)
+#: rc.cpp:200
+msgid "S&ummary"
+msgstr "C&rynodeb"
+
+#. i18n: file: dialogs/TagDialogBase.ui:71
+#. i18n: ectx: property (text), widget (QLabel, trackArtistAlbumLabel)
+#: rc.cpp:203
+msgid "Track by Artist on Album"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:292
-msgid "Visit contributor's LinkedIn profile"
+#. i18n: file: dialogs/TagDialogBase.ui:119
+#. i18n: ectx: property (text), widget (QLabel, leftHeaderLabel)
+#: rc.cpp:206
+msgid "Properties"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:297
-msgid "Visit contributor's MySpace homepage"
+#. i18n: file: dialogs/TagDialogBase.ui:144
+#. i18n: ectx: property (text), widget (QLabel, rightHeaderLabel)
+#: rc.cpp:209
+msgid "Statistics"
+msgstr "Ystadegau"
+
+#. i18n: file: dialogs/TagDialogBase.ui:157
+#. i18n: ectx: property (text), widget (QLabel, lenghtLabel)
+#: rc.cpp:212
+msgid "Length:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:302
-msgid "Visit contributor's Reddit profile"
+#. i18n: file: dialogs/TagDialogBase.ui:189
+#. i18n: ectx: property (text), widget (QLabel, bitrateLabel)
+#: rc.cpp:218
+msgid "Bit rate:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:307
-msgid "Visit contributor's YouTube profile"
+#. i18n: file: dialogs/TagDialogBase.ui:221
+#. i18n: ectx: property (text), widget (QLabel, samplerateLabel)
+#: rc.cpp:224
+msgid "Sample rate:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:312
-msgid "Visit contributor's Twitter feed"
+#. i18n: file: dialogs/TagDialogBase.ui:253
+#. i18n: ectx: property (text), widget (QLabel, sizeLabel)
+#: rc.cpp:230
+msgid "Size:"
+msgstr ""
+
+#. i18n: file: dialogs/TagDialogBase.ui:285
+#. i18n: ectx: property (text), widget (QLabel, formatLabel)
+#: rc.cpp:236
+msgid "Format:"
+msgstr ""
+
+#. i18n: file: dialogs/TagDialogBase.ui:304
+#. i18n: ectx: property (text), widget (QLabel, qLabel_format)
+#: rc.cpp:239
+msgid "mp3"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:317
-msgid "Visit contributor's Wikipedia profile"
+#. i18n: file: dialogs/TagDialogBase.ui:317
+#. i18n: ectx: property (text), widget (QLabel, collectionLabel)
+#: rc.cpp:242
+msgid "Collection:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:322
-msgid "Visit contributor's Xing profile"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:365
+#. i18n: ectx: property (text), widget (QLabel, ratingLabel)
+#: rc.cpp:248
+msgid "Rating:"
+msgstr "Poblogrwydd :"
 
-#: aboutdialog/OcsPersonItem.cpp:327
-msgid "Visit contributor's identi.ca feed"
+#. i18n: file: dialogs/TagDialogBase.ui:403
+#. i18n: ectx: property (text), widget (QLabel, playcountLabel)
+#: rc.cpp:251
+msgid "Play count:"
 msgstr ""
 
-#: aboutdialog/OcsPersonItem.cpp:332
-msgid "Visit contributor's libre.fm profile"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:441
+#. i18n: ectx: property (text), widget (QLabel, scoreLabel)
+#: rc.cpp:257
+msgid "Score:"
+msgstr "Sgôr:"
 
-#: aboutdialog/OcsPersonItem.cpp:337
-msgid "Visit contributor's StackOverflow profile"
+#. i18n: file: dialogs/TagDialogBase.ui:457
+#. i18n: ectx: property (text), widget (QLabel, firstPlayedLabel)
+#: rc.cpp:260
+msgid "First played:"
 msgstr ""
 
-#: aboutdialog/libattica-ocsclient/personlistjob.cpp:108
-msgid "Unable to parse avatar image data."
+#. i18n: file: dialogs/TagDialogBase.ui:495
+#. i18n: ectx: property (text), widget (QLabel, lastPlayedLabel)
+#: rc.cpp:263
+msgid "Last played:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:73
-msgid ""
-"<qt>No information available.<br />The supplied KAboutData object does not "
-"exist.</qt>"
+#. i18n: file: dialogs/TagDialogBase.ui:549
+#. i18n: ectx: attribute (title), widget (QWidget, tagsTab)
+#: rc.cpp:266
+msgid "Ta&gs"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:82
-msgid ""
-"<qt>No information available.<br />The supplied OcsData object does not "
-"exist.</qt>"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:555
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:269
+msgid "T&itle:"
+msgstr "&Teitl:"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:91
-#, kde-format
-msgid "About %1"
-msgstr "Ynglyn â %1"
+#. i18n: file: dialogs/TagDialogBase.ui:581
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:272
+msgid "&Artist:"
+msgstr "&Artist:"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:112
-#, kde-format
-msgid ""
-"<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE "
-"%3</html>"
+#. i18n: file: dialogs/TagDialogBase.ui:613
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
+#: rc.cpp:275
+msgid "&Composer:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:152
-#, kde-format
-msgid "License: %1"
+#. i18n: file: dialogs/TagDialogBase.ui:642
+#. i18n: ectx: property (text), widget (QLabel, textLabel_albumArtist)
+#: rc.cpp:278
+msgid "Album artist:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:166
-msgid "&About"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:665
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:281
+msgid "Al&bum:"
+msgstr "A&lbum:"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:183
-msgid "Get data from openDesktop.org to learn more about the team"
+#. i18n: file: dialogs/TagDialogBase.ui:703
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_6_6)
+#: rc.cpp:284
+msgid "Trac&k number:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:195
-msgid ""
-"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report "
-"bugs.\n"
+#. i18n: file: dialogs/TagDialogBase.ui:741
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#: rc.cpp:287
+msgid "&Genre:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:200
-#: aboutdialog/ExtendedAboutDialog.cpp:206
-#, kde-format
-msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+#. i18n: file: dialogs/TagDialogBase.ui:779
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2_2)
+#: rc.cpp:290
+msgid "&Disc number:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:225
-msgid "A&uthor"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:814
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
+#: rc.cpp:293
+msgid "&Year:"
+msgstr "&Blwyddyn :"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:225
-msgid "A&uthors"
+#. i18n: file: dialogs/TagDialogBase.ui:855
+#. i18n: ectx: property (text), widget (QLabel, textLabel_BPM)
+#: rc.cpp:296
+msgid "B&eats per minute:"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:239
-msgid "Get data from openDesktop.org to learn more about contributors"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:884
+#. i18n: ectx: property (text), widget (QLabel, textLabel_comment)
+#: rc.cpp:299
+msgid "Co&mment:"
+msgstr "S&ylwad:"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:253
-msgid "&Thanks To"
+#. i18n: file: dialogs/TagDialogBase.ui:915
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_musicbrainz)
+#: rc.cpp:302
+msgid "Get Tags from MusicBrain&z"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:266
-msgid "Get data from openDesktop.org to learn more about our generous donors"
+#. i18n: file: dialogs/TagDialogBase.ui:928
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_guessTags)
+#: rc.cpp:305
+msgid "Guess Tags from &Filename"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:286
-msgid "&Donors"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:936
+#. i18n: ectx: attribute (title), widget (QWidget, lyricsTab)
+#: rc.cpp:308
+msgid "L&yrics"
+msgstr "L&yrics"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:316
-msgid "T&ranslation"
+#. i18n: file: dialogs/TagDialogBase.ui:953
+#. i18n: ectx: attribute (title), widget (QWidget, labelsTab)
+#: rc.cpp:311
+msgid "La&bels"
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:340
-msgid "License Agreement"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:969
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:314
+msgid "Label:"
+msgstr "Label:"
 
-#: aboutdialog/ExtendedAboutDialog.cpp:373
-msgid "Internet connection not available"
+#. i18n: file: dialogs/TagDialogBase.ui:985
+#. i18n: ectx: property (toolTip), widget (KComboBox, kComboBox_label)
+#: rc.cpp:317
+msgid "Insert your custom label here or select one from the list."
 msgstr ""
 
-#: aboutdialog/ExtendedAboutDialog.cpp:373
-msgid "Network error"
+#. i18n: file: dialogs/TagDialogBase.ui:1016
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:320
+msgid "Custom labels for this item:"
 msgstr ""
 
-#: services/ServiceBase.cpp:311
-msgid "This service does not accept any messages"
+#. i18n: file: dialogs/TagDialogBase.ui:1045
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, addPushButton)
+#: rc.cpp:323 rc.cpp:1214
+msgid "Add"
 msgstr ""
 
-#: services/ServiceBase.cpp:318
-msgid "ERROR: unknown message"
+#. i18n: file: dialogs/TagDialogBase.ui:1061
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: rc.cpp:326 playlistmanager/file/PlaylistFileProvider.cpp:224
+msgid "Remove"
 msgstr ""
 
-#: services/jamendo/JamendoMeta.cpp:153
-msgid "Jamendo.com: &Download"
-msgstr ""
+#. i18n: file: dialogs/TagDialogBase.ui:1090
+#. i18n: ectx: property (text), widget (QLabel, locationLabel)
+#: rc.cpp:329
+msgid "Location:"
+msgstr "Lleoliad:"
 
-#: services/jamendo/JamendoMeta.cpp:172
-msgid "A site where artists can freely share their music"
+#. i18n: file: dialogs/TagDialogBase.ui:1133
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_previous)
+#: rc.cpp:332 playlist/ProgressiveSearchWidget.cpp:66
+msgid "&Previous"
 msgstr ""
 
-#: services/jamendo/JamendoXmlParser.cpp:153
-#, kde-format
-msgctxt ""
-"First part of: Jamendo.com database update complete. Added 3 tracks on 4 "
-"albums from 5 artists."
-msgid "Jamendo.com database update complete. Added 1 track on "
-msgid_plural "Jamendo.com database update complete. Added %1 tracks on "
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: dialogs/TagDialogBase.ui:1143
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_next)
+#: rc.cpp:335 playlist/ProgressiveSearchWidget.cpp:63
+msgid "&Next"
+msgstr "&Nesaf"
 
-#: services/jamendo/JamendoXmlParser.cpp:154
-#, kde-format
-msgctxt ""
-"Middle part of: Jamendo.com database update complete. Added 3 tracks on 4 "
-"albums from 5 artists."
-msgid "1 album from "
-msgid_plural "%1 albums from "
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: dialogs/TagDialogBase.ui:1150
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_perTrack)
+#: rc.cpp:338
+msgid "Per trac&k"
+msgstr ""
 
-#: services/jamendo/JamendoXmlParser.cpp:155
-#, kde-format
-msgctxt ""
-"Last part of: Jamendo.com database update complete. Added 3 tracks on 4 "
-"albums from 5 artists."
-msgid "1 artist."
-msgid_plural "%1 artists."
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: dialogs/TagDialogBase.ui:1173
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_ok)
+#: rc.cpp:341
+msgid "Sa&ve && Close"
+msgstr ""
 
-#: services/jamendo/JamendoInfoParser.cpp:46
-#: services/jamendo/JamendoInfoParser.cpp:77
-msgid "No description available..."
+#. i18n: file: dialogs/TagDialogBase.ui:1186
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_cancel)
+#. i18n: file: dialogs/MusicBrainzTagger.ui:68
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_cancel)
+#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:36
+#. i18n: ectx: property (text), widget (QPushButton, cancelButton)
+#: rc.cpp:344 rc.cpp:539 rc.cpp:810
+msgid "&Cancel"
 msgstr ""
 
-#: services/jamendo/JamendoInfoParser.cpp:61
-#: services/jamendo/JamendoInfoParser.cpp:93
-#: services/jamendo/JamendoInfoParser.cpp:113
-msgid "From Jamendo.com"
+#. i18n: file: dialogs/EqualizerDialog.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, EqualizerGroupBox)
+#: rc.cpp:347
+msgid "Sound Equalizer"
 msgstr ""
 
-#: services/jamendo/JamendoInfoParser.cpp:83
-#: services/magnatune/MagnatuneStore.cpp:224
-#: widgets/SmartPlaylistEditor.cpp:183 widgets/SmartPlaylistEditor.cpp:197
-#: dialogs/transferdialog.cpp:89 dialogs/FilenameLayoutDialog.cpp:242
-#: dialogs/FilenameLayoutDialog.cpp:619
-#: browsers/CollectionTreeItemModelBase.cpp:981
-#: browsers/CollectionTreeView.cpp:228 musicbrainz/MusicBrainzTags.cpp:360
-#: playlist/view/PlaylistViewCommon.cpp:64 playlist/PlaylistModel.cpp:906
-#: context/applets/albums/AlbumsView.cpp:255
-#: context/applets/wikipedia/WikipediaApplet.cpp:600
-msgid "Album"
-msgstr "Albwm"
+#. i18n: file: dialogs/EqualizerDialog.ui:43
+#. i18n: ectx: property (text), widget (QLabel, eqPresetslabel)
+#: rc.cpp:350
+msgid "Presets:"
+msgstr ""
 
-#: services/jamendo/JamendoInfoParser.cpp:109
-#: dialogs/FilenameLayoutDialog.cpp:222 dialogs/FilenameLayoutDialog.cpp:584
-#: context/applets/wikipedia/WikipediaApplet.cpp:606
-msgid "Track"
-msgstr "Trac"
+#. i18n: file: dialogs/EqualizerDialog.ui:56
+#. i18n: ectx: property (toolTip), widget (QComboBox, eqPresets)
+#: rc.cpp:353
+msgid "List of available equalizer presets."
+msgstr ""
 
-#: services/jamendo/JamendoService.cpp:80
-msgid "A site where artists can showcase their creations to the world"
+#. i18n: file: dialogs/EqualizerDialog.ui:72
+#. i18n: ectx: property (toolTip), widget (QPushButton, eqPresetSaveBtn)
+#: rc.cpp:356
+msgid "Save changes of currently selected preset"
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:83
-msgid ""
-"Jamendo.com puts artists and music lovers in touch with each other. The site "
-"allows artists to upload their own albums to share them with the world and "
-"users to download all of them for free. Listen to and download all "
-"Jamendo.com contents from within Amarok."
+#. i18n: file: dialogs/EqualizerDialog.ui:75
+#. i18n: ectx: property (text), widget (QPushButton, eqPresetSaveBtn)
+#: rc.cpp:359
+msgid "Save"
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:119
-msgctxt "Fetch new information from the website"
-msgid "Update"
+#. i18n: file: dialogs/EqualizerDialog.ui:88
+#. i18n: ectx: property (toolTip), widget (QPushButton, eqPresetDeleteBtn)
+#: rc.cpp:362
+msgid "Delete currently selected preset. Not available for built-in presets."
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:153
-#: services/magnatune/MagnatuneStore.cpp:227
-#: browsers/collectionbrowser/CollectionWidget.cpp:207
-msgid "Genre / Artist"
+#. i18n: file: dialogs/EqualizerDialog.ui:91
+#. i18n: ectx: property (text), widget (QPushButton, eqPresetDeleteBtn)
+#: rc.cpp:365
+msgid "Delete Preset"
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:156
-#: services/magnatune/MagnatuneStore.cpp:230
-#: browsers/collectionbrowser/CollectionWidget.cpp:211
-msgid "Genre / Artist / Album"
+#. i18n: file: dialogs/EqualizerDialog.ui:104
+#. i18n: ectx: property (toolTip), widget (QPushButton, eqPresetResetBtn)
+#: rc.cpp:368
+msgid ""
+"Reset selected preset setting to default. Available only for built-in "
+"presets."
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:159
-#: services/magnatune/MagnatuneStore.cpp:233
-#: browsers/collectionbrowser/CollectionWidget.cpp:297
-msgid "Sort Options"
+#. i18n: file: dialogs/EqualizerDialog.ui:107
+#. i18n: ectx: property (text), widget (QPushButton, eqPresetResetBtn)
+#: rc.cpp:371
+msgid "Reset to Default"
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:189
-msgid "Downloading Jamendo.com database..."
+#. i18n: file: dialogs/EqualizerDialog.ui:129
+#. i18n: ectx: property (title), widget (QGroupBox, eqBandsGroupBox)
+#: rc.cpp:374
+msgid "Bands"
 msgstr ""
 
-#: services/jamendo/JamendoService.cpp:211
-msgid "Updating the local Jamendo database."
+#. i18n: file: dialogs/EqualizerDialog.ui:142
+#. i18n: ectx: property (text), widget (QLabel, eqMaxEq)
+#: rc.cpp:377
+msgid "+dB"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryModel.cpp:41
-#: services/opmldirectory/OpmlDirectoryService.cpp:143
-msgid "Add OPML"
+#. i18n: file: dialogs/EqualizerDialog.ui:280
+#. i18n: ectx: property (text), widget (QLabel, eqZero)
+#: rc.cpp:413
+msgid "0dB"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryModel.cpp:44
-#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:75
-msgid "Add Folder"
+#. i18n: file: dialogs/EqualizerDialog.ui:589
+#. i18n: ectx: property (text), widget (QLabel, eqMinEq)
+#: rc.cpp:416
+msgid "-dB"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryModel.cpp:294
-msgctxt "Heading of Add OPML dialog"
-msgid "Add OPML"
+#. i18n: file: dialogs/EqualizerDialog.ui:599
+#. i18n: ectx: property (text), widget (QLabel, eqPreampValue)
+#. i18n: file: dialogs/EqualizerDialog.ui:609
+#. i18n: ectx: property (text), widget (QLabel, eqBand0Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:619
+#. i18n: ectx: property (text), widget (QLabel, eqBand1Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:629
+#. i18n: ectx: property (text), widget (QLabel, eqBand2Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:639
+#. i18n: ectx: property (text), widget (QLabel, eqBand3Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:649
+#. i18n: ectx: property (text), widget (QLabel, eqBand4Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:659
+#. i18n: ectx: property (text), widget (QLabel, eqBand5Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:669
+#. i18n: ectx: property (text), widget (QLabel, eqBand6Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:679
+#. i18n: ectx: property (text), widget (QLabel, eqBand7Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:689
+#. i18n: ectx: property (text), widget (QLabel, eqBand8Label)
+#. i18n: file: dialogs/EqualizerDialog.ui:699
+#. i18n: ectx: property (text), widget (QLabel, eqBand9Label)
+#: rc.cpp:419 rc.cpp:422 rc.cpp:425 rc.cpp:428 rc.cpp:431 rc.cpp:434
+#: rc.cpp:437 rc.cpp:440 rc.cpp:443 rc.cpp:446 rc.cpp:449
+msgid "Hz"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryModel.cpp:340
-msgid "New Folder"
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:38
+#. i18n: ectx: property (toolTip), widget (QLabel, folderLabel)
+#: rc.cpp:455
+msgid "Base directory under which to put files"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryService.cpp:53
-msgid "Podcast Directory"
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:41
+#. i18n: ectx: property (text), widget (QLabel, folderLabel)
+#: rc.cpp:458
+msgid "C&ollection Folder:"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryService.cpp:74
-msgid "A large listing of podcasts"
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:60
+#. i18n: ectx: property (toolTip), widget (KComboBox, folderCombo)
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:63
+#. i18n: ectx: property (whatsThis), widget (KComboBox, folderCombo)
+#: rc.cpp:461 rc.cpp:464
+msgid "The collection folder to which the files will be transferred."
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryService.cpp:77
-msgid ""
-"A comprehensive list of searchable podcasts that you can subscribe to "
-"directly from within Amarok."
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:78
+#. i18n: ectx: property (title), widget (QGroupBox, previewBox)
+#: rc.cpp:467
+msgid "Destination Preview"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryService.cpp:134
-#: services/gpodder/GpodderService.cpp:177
-msgid "Subscribe"
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:106
+#. i18n: ectx: property (text), widget (QTableWidget, previewTableWidget)
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:336
+#. i18n: ectx: property (text), widget (QPushButton, previewButton)
+#: rc.cpp:470 rc.cpp:2027
+msgid "Preview"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryService.cpp:168
-msgid "Add an OPML file to the list."
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:114
+#. i18n: ectx: property (text), widget (QTableWidget, previewTableWidget)
+#: rc.cpp:473
+msgid "Original"
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryInfoParser.cpp:56
-msgid "Loading Podcast Info..."
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:159
+#. i18n: ectx: property (toolTip), widget (QCheckBox, overwriteCheck)
+#: rc.cpp:476
+msgid "If checked, overwrite files of the same name without asking."
 msgstr ""
 
-#: services/opmldirectory/OpmlDirectoryInfoParser.cpp:66
-msgid "Fetching Podcast Info"
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:166
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, overwriteCheck)
+#: rc.cpp:479
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Check this to overwrite "
+"files of the same name automatically. <span style=\" font-"
+"style:italic;\">(Warning: Overwriting is not "
+"undoable)</span></p></body></html>"
 msgstr ""
 
-#: services/scriptable/ScriptableServiceInfoParser.cpp:44
-#: services/scriptable/ScriptableServiceInfoParser.cpp:62
-#: services/scriptable/ScriptableServiceInfoParser.cpp:78
-#: services/scriptable/ScriptableServiceInfoParser.cpp:94
-msgid "Loading info..."
+#. i18n: file: dialogs/OrganizeCollectionDialogBase.ui:169
+#. i18n: ectx: property (text), widget (QCheckBox, overwriteCheck)
+#: rc.cpp:486
+msgid "Overwrite &Destination"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:106
-msgid "\"Fair trade\" online music store"
+#. i18n: file: dialogs/EditFilterDialog.ui:164
+#. i18n: ectx: property (text), widget (QCheckBox, cbInvert)
+#: rc.cpp:492 dynamic/biases/TagMatchBias.cpp:174
+msgid "Invert condition"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:110
-#, no-c-format
-msgid ""
-"Magnatune.com is a different kind of record company with the motto \"We are "
-"not evil!\" 50% of every purchase goes directly to the artist and if you "
-"purchase an album through Amarok, the Amarok project receives a 10% "
-"commission. Magnatune.com also offers \"all you can eat\" memberships that "
-"lets you download as much of their music as you like."
+#. i18n: file: dialogs/deletedialogbase.ui:41
+#. i18n: ectx: property (text), widget (QLabel, ddWarningIcon)
+#: rc.cpp:501
+msgid "Icon Placeholder, not in GUI"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:221
-#: browsers/collectionbrowser/CollectionWidget.cpp:199
-msgid "Artist / Album"
+#. i18n: file: dialogs/deletedialogbase.ui:56
+#. i18n: ectx: property (text), widget (QLabel, ddDeleteText)
+#: rc.cpp:504
+msgid "Deletion method placeholder, never shown to user."
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:245
-msgid "Re-download"
+#. i18n: file: dialogs/deletedialogbase.ui:79
+#. i18n: ectx: property (toolTip), widget (K3ListBox, ddFileList)
+#: rc.cpp:507
+msgid "List of files that are about to be deleted."
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:248
-msgid "Update Database"
+#. i18n: file: dialogs/deletedialogbase.ui:82
+#. i18n: ectx: property (whatsThis), widget (K3ListBox, ddFileList)
+#: rc.cpp:510
+msgid "This is the list of items that are about to be deleted."
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:251
-msgid "Tools"
+#. i18n: file: dialogs/deletedialogbase.ui:89
+#. i18n: ectx: property (text), widget (QLabel, ddNumFiles)
+#: rc.cpp:513
+msgid "Placeholder for number of files, not in GUI"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:272
-msgid "Download Album"
+#. i18n: file: dialogs/deletedialogbase.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, ddShouldDelete)
+#: rc.cpp:516
+msgid "&Delete files instead of moving them to the trash"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:279
-msgid "Signup"
+#. i18n: file: dialogs/deletedialogbase.ui:105
+#. i18n: ectx: property (toolTip), widget (QCheckBox, ddShouldDelete)
+#: rc.cpp:519
+msgid ""
+"If checked, files will be permanently removed instead of being placed in the "
+"Trash Bin"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:318
-msgid "Downloading Magnatune.com database..."
+#. i18n: file: dialogs/deletedialogbase.ui:110
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ddShouldDelete)
+#: rc.cpp:522
+msgid ""
+"<qt><p>If this box is checked, files will be <b>permanently removed</b> "
+"instead of being placed in the Trash Bin.</p>\n"
+"\n"
+"<p><em>Use this option with caution</em>: Most filesystems are unable to "
+"reliably undelete deleted files.</p></qt>"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:347
-msgid "Updating the local Magnatune database."
+#. i18n: file: dialogs/MusicBrainzTagger.ui:49
+#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_saveAndClose)
+#: rc.cpp:530
+msgid "Update tags for checked tracks and exit"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:647
-#, c-format
-msgid ""
-"The Magnatune.com service accepts the following messages: \n"
-"\n"
-"\taddMoodyTracks mood count: Adds a number of random tracks with the "
-"specified mood to the playlist. The mood argument must have spaces escaped "
-"with %%20"
+#. i18n: file: dialogs/MusicBrainzTagger.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, pushButton_saveAndClose)
+#: rc.cpp:533
+msgid "&Update Tags"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:658
-msgid "ERROR: No arguments supplied"
+#. i18n: file: dialogs/MusicBrainzTagger.ui:65
+#. i18n: ectx: property (toolTip), widget (QPushButton, pushButton_cancel)
+#: rc.cpp:536
+msgid "Exit without saving"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:663
-msgid "ERROR: Wrong number of arguments for addMoodyTracks"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:26
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:545
+msgid "Available formats"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:673
-msgid "ERROR: Parse error for argument 2 ( count )"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:39
+#. i18n: ectx: property (text), widget (QRadioButton, flacButton)
+#: rc.cpp:551
+msgid "Flac"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:677
-msgid "ok"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:46
+#. i18n: ectx: property (text), widget (QRadioButton, wavButton)
+#: rc.cpp:554
+msgid "Wav"
 msgstr ""
 
-#: services/magnatune/MagnatuneStore.cpp:680
-msgid "ERROR: Unknown argument."
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:53
+#. i18n: ectx: property (text), widget (QRadioButton, mp3Button)
+#: rc.cpp:557
+msgid "Mp3"
 msgstr ""
 
-#: services/magnatune/MagnatuneCollectionLocation.cpp:42
-msgid "Preview Tracks"
+#. i18n: file: core-impl/collections/audiocd/FormatSelectionDialog.ui:82
+#. i18n: ectx: property (text), widget (QPushButton, advancedButton)
+#: rc.cpp:563
+msgid "Advanced"
 msgstr ""
 
-#: services/magnatune/MagnatuneCollectionLocation.cpp:45
-msgid ""
-"The tracks you are about to copy are Magnatune.com preview streams. For "
-"better quality and advert free streams, consider buying an album download. "
-"Remember that when buying from Magnatune the artist gets 50%. Also if you "
-"buy using Amarok, you support the Amarok project with 10%."
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, UmsConfiguration)
+#: rc.cpp:566
+msgid "USB Mass Storage device configuration"
 msgstr ""
 
-#: services/magnatune/MagnatuneRedownloadHandler.cpp:148
-msgid "Getting list of previous Magnatune.com purchases"
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox, m_autoConnect)
+#: rc.cpp:569
+msgid "Use automatically when connected"
 msgstr ""
 
-#: services/magnatune/MagnatuneAlbumDownloader.cpp:68
-#, kde-format
-msgid "Downloading '%1' by %2 from Magnatune.com"
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:81
+#. i18n: ectx: property (text), widget (QCheckBox, m_musicCheckBox)
+#: rc.cpp:572
+msgid "Music"
 msgstr ""
 
-#: services/magnatune/MagnatuneAlbumDownloader.cpp:72
-msgid "Downloading album from Magnatune.com"
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:129
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:575
+msgid "Music folder:"
 msgstr ""
 
-#: services/magnatune/MagnatuneAlbumDownloader.cpp:104
-msgid "Magnatune download seems to have failed. Cannot read zip file"
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:160
+#. i18n: ectx: property (title), widget (QGroupBox, m_filenameSchemeBox)
+#: rc.cpp:578
+msgid "Filename scheme of tracks that are added to the device"
 msgstr ""
 
-#: services/magnatune/MagnatuneAlbumDownloader.cpp:113
-msgid "Uncompressing Magnatune.com download..."
+#. i18n: file: core-impl/collections/umscollection/UmsConfiguration.ui:233
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:584
+msgid "Podcast folder:"
 msgstr ""
 
-#: services/magnatune/MagnatuneAlbumDownloader.cpp:137
-msgid "Adding album cover to collection"
+#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:32
+#. i18n: ectx: property (text), widget (QLabel, m_intervalLabel)
+#: rc.cpp:587
+msgid "Auto-update:"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:32
-msgid "Loading artist info..."
+#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:57
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, m_autoUpdateInterval)
+#: rc.cpp:590
+msgctxt "automatic updates turned off"
+msgid "disabled"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:44
-#, kde-format
-msgid "Fetching %1 Artist Info"
+#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:79
+#. i18n: ectx: property (text), widget (QLabel, m_baseDirLabel)
+#: rc.cpp:593
+msgid "Base directory:"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:53
-msgid "Loading album info..."
+#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:107
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_baseDirUrl)
+#: rc.cpp:596
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Base directory for all new "
+"podcast channels.</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">When a podcast channel is "
+"added <span style=\" font-style:italic;\">&lt;base "
+"directory&gt;</span>/<span style=\" font-style:italic;\">&lt;channel "
+"name&gt;</span> is used as the download directory.</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">This can be changed for "
+"each channel individually.</p></body></html>"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:75
-#, kde-format
-msgid "Release Year: %1"
+#. i18n: file: core-impl/podcasts/sql/SqlPodcastProviderSettingsWidget.ui:112
+#. i18n: ectx: property (whatsThis), widget (KUrlRequester, m_baseDirUrl)
+#: rc.cpp:605
+msgid ""
+"Base directory for all new podcast channels.\n"
+"When a podcast channel is added <base directory>/<channel name> is used as "
+"the download directory.\n"
+"This can be changed for each channel individually."
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:80
-msgid "Description:"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:30
+#. i18n: ectx: property (windowTitle), widget (QWidget, PodcastSettingsBase)
+#: rc.cpp:610
+msgid "Podcast Configuration"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:84
-msgid "From Magnatune.com"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:52
+#. i18n: ectx: property (text), widget (QLabel, m_urlLabel)
+#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:65
+#. i18n: ectx: property (text), widget (QLabel, UrlLabel)
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:223
+#. i18n: ectx: property (text), widget (QLabel, urlLabel)
+#: rc.cpp:613 rc.cpp:954 rc.cpp:1131
+msgid "URL:"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:166
-msgid "Loading Magnatune.com frontpage..."
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:68
+#. i18n: ectx: property (text), widget (QLabel, m_saveLocationlabel)
+#: rc.cpp:616
+msgid "Save Location:"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:169
-msgid "Fetching Magnatune.com front page"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:99
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_autoFetchCheck)
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:102
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autoFetchCheck)
+#: rc.cpp:619 rc.cpp:622
+msgid "When checked, Amarok will automatically scan the podcast for updates"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:182
-#: services/magnatune/MagnatuneInfoParser.cpp:198
-msgid "Loading your Magnatune.com favorites page..."
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:105
+#. i18n: ectx: property (text), widget (QCheckBox, m_autoFetchCheck)
+#: rc.cpp:625
+msgid "Automatically scan for updates"
 msgstr ""
 
-#: services/magnatune/MagnatuneInfoParser.cpp:211
-#: services/magnatune/MagnatuneInfoParser.cpp:227
-msgid "Loading your personal Magnatune.com recommendations page..."
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:112
+#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
+#: rc.cpp:628
+msgid "Media Download"
 msgstr ""
 
-#: services/magnatune/MagnatuneUrlRunner.cpp:38
-msgctxt ""
-"A type of command that triggers an action in the integrated Magnatune.com "
-"service"
-msgid "Magnatune"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:121
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_downloadRadio)
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:124
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_downloadRadio)
+#: rc.cpp:631 rc.cpp:634
+msgid "Download media as soon as it becomes available"
 msgstr ""
 
-#: services/magnatune/MagnatuneDownloadHandler.cpp:83
-msgid "Processing download"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:127
+#. i18n: ectx: property (text), widget (QRadioButton, m_downloadRadio)
+#: rc.cpp:637
+msgid "Download when a&vailable"
 msgstr ""
 
-#: services/magnatune/MagnatuneDownloadHandler.cpp:148
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:134
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_streamRadio)
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:137
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_streamRadio)
+#: rc.cpp:640 rc.cpp:643
 msgid ""
-"There seems to be an error in the supplied membership information. Please "
-"correct this and try again."
+"Media must be explicitly downloaded, otherwise the podcast will be played "
+"from the remote server."
 msgstr ""
 
-#: services/magnatune/MagnatuneDownloadHandler.cpp:148
-msgid "Could not process download"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:140
+#. i18n: ectx: property (text), widget (QRadioButton, m_streamRadio)
+#: rc.cpp:646
+msgid "Stream or download on re&quest"
 msgstr ""
 
-#: services/magnatune/MagnatuneMeta.cpp:218
-#: services/magnatune/MagnatuneMeta.cpp:426
-msgid "&Download Album"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:152
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_purgeCheck)
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:155
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_purgeCheck)
+#: rc.cpp:649 rc.cpp:652
+msgid "If checked, Amarok will throw away old podcast episodes"
 msgstr ""
 
-#: services/magnatune/MagnatuneMeta.cpp:240
-msgid "Magnatune.com: &Download Album"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:158
+#. i18n: ectx: property (text), widget (QCheckBox, m_purgeCheck)
+#: rc.cpp:655
+msgid "Limit &number of episodes"
 msgstr ""
 
-#: services/magnatune/MagnatuneMeta.cpp:262
-msgid "The non evil record label that is fair to artists and customers alike"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:181
+#. i18n: ectx: property (text), widget (QLabel, m_purgeCountLabel)
+#: rc.cpp:658
+msgid "Keep maximum of:"
 msgstr ""
 
-#: services/magnatune/MagnatuneMeta.cpp:432
-msgid "Add to Magnatune.com &favorites"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:191
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, m_purgeCountSpinBox)
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:194
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, m_purgeCountSpinBox)
+#: rc.cpp:661 rc.cpp:664
+msgid "The maximum number of podcast items to store"
 msgstr ""
 
-#: services/magnatune/MagnatuneDownloadInfo.cpp:210
-#, kde-format
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:208
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_writeTagsCheck)
+#: rc.cpp:667
 msgid ""
-"Redownload of a previously purchased album \"%1\" by \"%2\" from "
-"Magnatune.com.\n"
-"\n"
-"Username: %3\n"
-"Password: %4\n"
+"The RSS feed and the tags in the downloaded file sometimes do not contain "
+"the same information. Writing the tags ensures the information in the "
+"playlist and on media devices will be the same as in the feed."
 msgstr ""
 
-#: services/magnatune/MagnatuneXmlParser.cpp:57
-#, kde-format
-msgctxt ""
-"First part of: Magnatune.com database update complete. Added 3 tracks on 4 "
-"albums from 5 artists."
-msgid "Magnatune.com database update complete. Added 1 track on "
-msgid_plural "Magnatune.com database update complete. Added %1 tracks on "
-msgstr[0] ""
-msgstr[1] ""
-
-#: services/magnatune/MagnatuneXmlParser.cpp:58
-#, kde-format
-msgctxt ""
-"Middle part of: Magnatune.com database update complete. Added 3 tracks on 4 "
-"albums from 5 artists."
-msgid "1 album from "
-msgid_plural "%1 albums from "
-msgstr[0] ""
-msgstr[1] ""
-
-#: services/magnatune/MagnatuneXmlParser.cpp:59
-#, kde-format
-msgctxt ""
-"Last part of: Magnatune.com database update complete. Added 3 tracks on 4 "
-"albums from 5 artists."
-msgid "1 artist."
-msgid_plural "%1 artists."
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:211
+#. i18n: ectx: property (text), widget (QCheckBox, m_writeTagsCheck)
+#: rc.cpp:670
+msgid "Write feed information to tags after downloading."
+msgstr ""
 
-#: services/ServicePluginManager.cpp:161 services/ServicePluginManager.cpp:178
-#: services/ServicePluginManager.cpp:195
-#, kde-format
-msgid "No service named %1 is currently loaded"
+#. i18n: file: core-impl/podcasts/sql/PodcastSettingsBase.ui:251
+#. i18n: ectx: property (text), widget (QPushButton, m_filenameLayoutConfigWidgetButton)
+#: rc.cpp:673
+msgid "Episode Filename Configuration"
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:100
-msgid "Testing..."
+#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:30
+#. i18n: ectx: property (windowTitle), widget (QWidget, PodcastFilenameLayoutConfigWidget)
+#: rc.cpp:676
+msgid "Podcast Filename Layout Configuration"
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:138
-msgctxt "The operation was rejected by the server"
-msgid "Failed"
+#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:54
+#. i18n: ectx: property (text), widget (QRadioButton, m_filenameLayoutDefault)
+#: rc.cpp:679
+msgid "Specified by podcast channel"
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:143
-msgctxt "The operation completed as expected"
-msgid "Success"
+#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:79
+#. i18n: ectx: property (text), widget (QRadioButton, m_filenameLayoutCustom)
+#: rc.cpp:682
+msgid "custom"
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:151
+#. i18n: file: core-impl/podcasts/sql/PodcastFilenameLayoutConfigWidget.ui:110
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_filenameLayoutText)
+#: rc.cpp:686
+#, no-c-format
 msgid ""
-"Either the username or the password is incorrect, please correct and try "
-"again"
+"Available fields : "
+"%artist%,%title%,%genre%,%year%,%composer%,%pubdate%,%number%,%album%"
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:151
-#: services/lastfm/LastFmServiceSettings.cpp:176
-msgid "Failed"
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:105
+#. i18n: ectx: property (text), widget (QCommandLinkButton, justCopyButton)
+#: rc.cpp:689
+msgid "&Copy"
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:152
-#: services/lastfm/LastFmServiceSettings.cpp:177
-msgid "Test Login"
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:114
+#. i18n: ectx: property (description), widget (QCommandLinkButton, justCopyButton)
+#: rc.cpp:692
+msgid "Just copy the tracks without transcoding them."
 msgstr ""
 
-#: services/lastfm/LastFmServiceSettings.cpp:176
-msgid "Unable to connect to Last.fm service."
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:127
+#. i18n: ectx: property (text), widget (QCommandLinkButton, transcodeWithDefaultsButton)
+#: rc.cpp:695
+msgid "&Transcode"
 msgstr ""
 
-#: services/lastfm/ScrobblerAdapter.cpp:236
-#: services/lastfm/LastFmService.cpp:543
-#, kde-format
-msgctxt "As in, lastfm"
-msgid "Loved Track: %1"
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:149
+#. i18n: ectx: property (text), widget (QCommandLinkButton, transcodeWithOptionsButton)
+#: rc.cpp:698
+msgid "Transcode With Custom &Parameters"
 msgstr ""
 
-#: services/lastfm/LastFmTreeView.cpp:111
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:43
-#: browsers/CollectionTreeView.cpp:851 browsers/filebrowser/FileView.cpp:398
-#: context/applets/albums/AlbumsView.cpp:240
-msgid "&Add to Playlist"
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:158
+#. i18n: ectx: property (description), widget (QCommandLinkButton, transcodeWithOptionsButton)
+#: rc.cpp:701
+msgid ""
+"Configure your own encoding parameters for this transcoding operation."
 msgstr ""
 
-#: services/lastfm/LastFmTreeView.cpp:120
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:50
-#: browsers/CollectionTreeView.cpp:860 browsers/filebrowser/FileView.cpp:410
-#: context/applets/albums/AlbumsView.cpp:241
-msgctxt "Replace the currently loaded tracks with these"
-msgid "&Replace Playlist"
+#. i18n: file: transcoding/TranscodingAssistantDialog.ui:340
+#. i18n: ectx: property (text), widget (QLabel, formatNameLabel)
+#: rc.cpp:707
+msgid "Format Name"
 msgstr ""
 
-#: services/lastfm/LastFmTreeView.cpp:201 browsers/CollectionTreeView.cpp:547
-msgid "More..."
+#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:24
+#. i18n: ectx: property (toolTip), widget (QToolButton, addPodcastButton)
+#: rc.cpp:710
+msgid "Add Podcast..."
 msgstr ""
 
-#: services/lastfm/SimilarArtistsAction.cpp:26
-msgid "Play Similar Artists from Last.fm"
+#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:27
+#. i18n: ectx: property (text), widget (QToolButton, addPodcastButton)
+#: rc.cpp:713
+msgid "add podcast..."
 msgstr ""
 
-#: services/lastfm/biases/WeeklyTopBias.cpp:50
-msgctxt "Name of the \"WeeklyTop\" bias"
-msgid "Last.fm weekly top artist"
+#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:50
+#. i18n: ectx: property (text), widget (QToolButton, refreshPodcastsButton)
+#: rc.cpp:716
+msgid "Refresh All Podcasts"
 msgstr ""
 
-#: services/lastfm/biases/WeeklyTopBias.cpp:59
-msgctxt "Description of the \"WeeklyTop\" bias"
-msgid ""
-"The \"WeeklyTop\" bias adds tracks that are in the weekly top chart of "
-"Last.fm."
+#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:73
+#. i18n: ectx: property (toolTip), widget (QToolButton, configurePodcastsButton)
+#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:76
+#. i18n: ectx: property (text), widget (QToolButton, configurePodcastsButton)
+#: rc.cpp:719 rc.cpp:722
+msgid "Configure Podcasts..."
 msgstr ""
 
-#: services/lastfm/biases/WeeklyTopBias.cpp:133
-#, kde-format
-msgctxt "WeeklyTopBias bias representation"
-msgid "Tracks from the Last.fm top lists from %1 to %2"
+#. i18n: file: browsers/playlistbrowser/PodcastCategoryBase.ui:99
+#. i18n: ectx: property (text), widget (QToolButton, podcastsIntervalButton)
+#: rc.cpp:725
+msgid "Scan Interval..."
 msgstr ""
 
-#: services/lastfm/biases/WeeklyTopBias.cpp:144
-msgctxt "in WeeklyTopBias. Label for the date widget"
-msgid "from:"
+#. i18n: file: services/ampache/NewServerWidget.ui:27
+#. i18n: ectx: property (text), widget (QLabel, labelServerAddress)
+#. i18n: file: services/ampache/AmpacheConfigWidget.ui:58
+#. i18n: ectx: property (text), widget (QTableWidget, serverList)
+#: rc.cpp:731 rc.cpp:752
+msgid "Server Address"
 msgstr ""
 
-#: services/lastfm/biases/WeeklyTopBias.cpp:158
-msgctxt "in WeeklyTopBias. Label for the date widget"
-msgid "to:"
+#. i18n: file: services/ampache/NewServerWidget.ui:74
+#. i18n: ectx: property (text), widget (KPushButton, verifyButton)
+#: rc.cpp:740
+msgid "Check Connection"
 msgstr ""
 
-#: services/lastfm/biases/LastFmBias.cpp:48
-msgctxt "Name of the \"Last.fm\" similar bias"
-msgid "Last.fm similar"
+#. i18n: file: services/ampache/AmpacheConfigWidget.ui:23
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: rc.cpp:743
+msgid "Add Server"
 msgstr ""
 
-#: services/lastfm/biases/LastFmBias.cpp:57
-msgctxt "Description of the \"Last.fm\" bias"
-msgid ""
-"The \"Last.fm\" similar bias looks up tracks on Last.fm and only adds "
-"similar tracks."
+#. i18n: file: services/ampache/AmpacheConfigWidget.ui:30
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: rc.cpp:746
+msgid "Remove Server"
 msgstr ""
 
-#: services/lastfm/biases/LastFmBias.cpp:132
-msgctxt "Last.fm bias representation"
-msgid "Similar to the previous track (as reported by Last.fm)"
+#. i18n: file: services/gpodder/GpodderConfigWidget.ui:26
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:761
+msgid "gpodder.net Profile"
 msgstr ""
 
-#: services/lastfm/biases/LastFmBias.cpp:135
-msgctxt "Last.fm bias representation"
-msgid "Similar to the previous artist (as reported by Last.fm)"
-msgstr ""
+#. i18n: file: services/gpodder/GpodderConfigWidget.ui:32
+#. i18n: ectx: property (text), widget (QLabel, labelUsername)
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:44
+#. i18n: ectx: property (text), widget (QLabel, labelUsername)
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:101
+#. i18n: ectx: property (text), widget (QLabel, label_User)
+#: rc.cpp:764 rc.cpp:924 rc.cpp:1826
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
 
-#: services/lastfm/biases/LastFmBias.cpp:147
-msgid "Last.fm thinks the track is similar to"
-msgstr ""
+#. i18n: file: services/gpodder/GpodderConfigWidget.ui:45
+#. i18n: ectx: property (text), widget (QLabel, labelPassword)
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:57
+#. i18n: ectx: property (text), widget (QLabel, labelPassword)
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:134
+#. i18n: ectx: property (text), widget (QLabel, label_Password)
+#: rc.cpp:767 rc.cpp:927 rc.cpp:1833
+msgid "&Password:"
+msgstr "&Cyfrinair:"
 
-#: services/lastfm/biases/LastFmBias.cpp:150
-msgid "the previous artist"
+#. i18n: file: services/gpodder/GpodderConfigWidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, kActiveLabel1)
+#: rc.cpp:770
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Ubuntu'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><a "
+"href=\"http://www.gpodder.net/register/\"><span style=\" text-decoration: "
+"underline; color:#0057ae;\">Sign up to "
+"gpodder.net</span></a></p></body></html>"
 msgstr ""
 
-#: services/lastfm/biases/LastFmBias.cpp:152
-msgid "the previous track"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, magnatuneDownloadDialogBase)
+#: rc.cpp:780
+msgid "Magnatune.com Album Download"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:101
-msgid "Last.fm: &Ban"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:783
+msgid "Download options"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:102
-msgid "Ctrl+B"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:25
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:786
+msgid "Select Format:"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:103
-msgid "Ban this track"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:38
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:789
+msgid "Download to:"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:107
-msgid "Last.fm: &Skip"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:792
+msgid ""
+"If you download to a location that is already being monitored by Amarok, the "
+"album will automatically be added to your collection."
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:108
-msgid "Ctrl+S"
+#. i18n: file: services/magnatune/MagnatuneDownloadDialogBase.ui:67
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:795
+msgid "Magnatune info"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:109
-msgid "Skip this track"
+#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, magnatuneReDownloadDialogBase)
+#: rc.cpp:801
+msgid "Redownload manager"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:147
-#: services/lastfm/meta/LastFmMeta.cpp:433
-msgid "Track Radio"
+#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:19
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:804
+msgid "These are the albums that you have previously downloaded:"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:375
-#, kde-format
-msgid "Global Tag Radio: \"%1\""
+#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, redownloadButton)
+#: rc.cpp:807
+msgid "Re&download"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:381
-#, kde-format
-msgid "User Tag Radio: \"%1\""
+#. i18n: file: services/magnatune/MagnatuneRedownloadDialogBase.ui:60
+#. i18n: ectx: property (text), widget (QTreeWidget, redownloadListView)
+#: rc.cpp:813
+msgid "Artist - Album"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:389
-#, kde-format
-msgid "Similar Artists to \"%1\""
+#. i18n: file: services/magnatune/MagnatuneSignupDialogBase.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, SignupDialog)
+#: rc.cpp:816
+msgid "Magnatune.com member signup"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:393
-#, kde-format
-msgid "Artist Fan Radio: \"%1\""
+#. i18n: file: services/magnatune/MagnatuneSignupDialogBase.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:820
+#, no-c-format
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Liberation Sans'; font-size:9pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">By becoming a "
+"Magnatune.com member, you get unlimited download access and can download any "
+"album from within Amarok with a single mouse click. By joining, you can also "
+"listen to all streaming tracks from Magnatune.com ad-free.</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The Amarok team gets 10% "
+"of your initial membership payment, so by joining, you are also supporting "
+"the development of Amarok.</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">As always, the artists get "
+"50% of your membership payment(s) distributed based on which artist you "
+"download and stream.</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">To read more about "
+"Magnatune.com memberships, or to sign up, click here: <a "
+"href=\"http://magnatune.com/downloads?referal_id=amarok\"><span style=\" "
+"text-decoration: underline; color:#0057ae;\">Membership Info</span></a> "
+"</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">After joining, go to the "
+"Magnatune config in \"Settings->Configure Amarok->Plugins\" and enter your "
+"membership information. </p></body></html>"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:402
-#, kde-format
-msgid "%1's Neighbor Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:838
+msgid "Redownloads"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:406
-#, kde-format
-msgid "%1's Personal Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:841
+msgid ""
+"Enter your e-mail here to be able to redownload any previous purchase from "
+"Magnatune directly from within Amarok."
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:410
-#, kde-format
-msgid "%1's Mix Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:33
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:844
+msgctxt "Username for logins to Magnatune"
+msgid "E-mail:"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:414
-#, kde-format
-msgid "%1's Recommended Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:53
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:847
+msgid "Membership Options"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:418
-#, kde-format
-msgid "%1's Recommended Radio (Popularity %2)"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:59
+#. i18n: ectx: property (text), widget (QCheckBox, isMemberCheckbox)
+#: rc.cpp:850
+msgid "I am a member"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:425
-#, kde-format
-msgid "Group Radio: %1"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:79
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:853
+msgid "Membership type:"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:437
-msgid "Artist Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:90
+#. i18n: ectx: property (text), item, widget (QComboBox, typeComboBox)
+#: rc.cpp:856
+msgid "Stream"
 msgstr ""
 
-#: services/lastfm/meta/LastFmMeta.cpp:550
-msgid "Last.fm is cool..."
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:862
+msgctxt "Username for logins to Magnatune"
+msgid "Username:"
 msgstr ""
 
-#: services/lastfm/meta/MultiPlayableCapabilityImpl_p.h:111
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:117
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:865
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:135
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:868
 msgid ""
-"To listen to this stream you need to be a paying Last.Fm subscriber. All the "
-"other Last.Fm features are unaffected."
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Serif'; font-size:8pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'Sans Serif';\">For more information about the Magnatune.com "
+"memberships, and to sign up, go to  </span><a "
+"href=\"http://magnatune.com/compare_plans?referal_id=amarok\"><span style=\" "
+"font-family:'Sans Serif'; text-decoration: underline; "
+"color:#0000ff;\">http://magnatune.com/compare_plans</span></a></p></body></ht"
+"ml>"
 msgstr ""
 
-#: services/lastfm/meta/MultiPlayableCapabilityImpl_p.h:117
-msgid "Error starting track from Last.Fm radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:157
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:875
+msgid "Stream Options"
 msgstr ""
 
-#: services/lastfm/LastFmServiceCollection.cpp:42
-#, kde-format
-msgid "%1's Streams"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:163
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:878
+msgid "Preview stream type:"
 msgstr ""
 
-#: services/lastfm/LastFmServiceCollection.cpp:46
-msgid "Global Tags"
-msgstr "Tagiau Eang"
-
-#: services/lastfm/LastFmServiceCollection.cpp:50
-msgid "Neighbors' Loved Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:171
+#. i18n: ectx: property (text), item, widget (QComboBox, streamTypeComboBox)
+#: rc.cpp:881
+msgid "Ogg"
 msgstr ""
 
-#: services/lastfm/LastFmServiceCollection.cpp:54
-msgid "Neighbors' Personal Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:176
+#. i18n: ectx: property (text), item, widget (QComboBox, streamTypeComboBox)
+#: rc.cpp:884
+msgid "High Quality Mp3"
 msgstr ""
 
-#: services/lastfm/LastFmServiceCollection.cpp:58
-msgid "Friends' Loved Radio"
+#. i18n: file: services/magnatune/MagnatuneConfigWidget.ui:181
+#. i18n: ectx: property (text), item, widget (QComboBox, streamTypeComboBox)
+#: rc.cpp:887
+msgid "Low Quality Mp3"
 msgstr ""
 
-#: services/lastfm/LastFmServiceCollection.cpp:62
-msgid "Friends' Personal Radio"
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:890
+msgid "MP3tunes Login"
 msgstr ""
 
-#: services/lastfm/LastFmServiceCollection.cpp:141
-#: covermanager/CoverFoundDialog.cpp:128
-msgid "Last.fm"
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:893
+msgctxt "The e-mail address for Mp3Tunes logins"
+msgid "E-Mail:"
 msgstr ""
 
-#: services/lastfm/LastFmServiceConfig.cpp:143
-msgid "Last.fm credentials"
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:896
+msgctxt "The MP3Tunes password"
+msgid "Password:"
 msgstr ""
 
-#: services/lastfm/LastFmServiceConfig.cpp:144
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:42
+#. i18n: ectx: property (toolTip), widget (QCheckBox, enableHarmony)
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:49
+#. i18n: ectx: property (toolTip), widget (QLabel, label_3)
+#: rc.cpp:899 rc.cpp:902
 msgid ""
-"No running KWallet found. Would you like Amarok to save your Last.fm "
-"credentials in plaintext?"
-msgstr ""
-
-#: services/lastfm/LastFmService.cpp:195
-msgid "Last.fm: The social music revolution"
+"AutoSync is a feature from MP3tunes which allows you to automatically move "
+"your music between computers and devices."
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:197
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:52
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_3)
+#: rc.cpp:905
 msgid ""
-"Last.fm is a popular online service that provides personal radio stations "
-"and music recommendations. A personal listening station is tailored based on "
-"your listening habits and provides you with recommendations for new music. "
-"It is also possible to play stations with music that is similar to a "
-"particular artist as well as listen to streams from people you have added as "
-"friends or that Last.fm considers your musical \"neighbors\""
-msgstr ""
-
-#: services/lastfm/LastFmService.cpp:284
-#: services/lastfm/LoveTrackAction.cpp:25
-msgid "Last.fm: Love"
+"AutoSync is a feature from MP3tunes which allows you to automatically move "
+"your music between computers and devices. You can upload music from one "
+"location and have it download instantly to other locations."
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:286
-msgid "Ctrl+L"
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:908
+msgctxt "Enable harmony"
+msgid "Enable AutoSync"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:339
-msgctxt "Last.fm: errorMessage"
-msgid ""
-"Either the username was not recognized, or the password was incorrect."
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:62
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:911
+msgid "PIN Code:"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:343
-msgctxt "Last.fm: errorMessage"
+#. i18n: file: services/mp3tunes/Mp3tunesConfigWidget.ui:89
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:914
 msgid ""
-"There was a problem communicating with the Last.fm services. Please try "
-"again later."
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><a "
+"href=\"https://shop.mp3tunes.com/myaccount/registration/\"><span style=\" "
+"text-decoration: underline; color:#0057ae;\">Get an MP3tunes "
+"locker</span></a></p></body></html>"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:431
-msgid "Enter an artist name"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:38
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:921
+msgid "Last.fm Profile"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:434
-msgid "Enter a tag"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:86
+#. i18n: ectx: property (text), widget (QLabel, kActiveLabel1)
+#: rc.cpp:930
+msgid "<a href=\"http://www.last.fm:80/signup.php\">Sign up to Last.fm</a>"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:437
-msgid "Enter a Last.fm user name"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:106
+#. i18n: ectx: property (text), widget (QLabel, kActiveLabel2)
+#: rc.cpp:936
+msgid ""
+"Why not join the <a href=\"http://www.last.fm:80/group/Amarok+Users\">Amarok "
+"Last.fm group</a> and share your musical tastes with other Amarok users?"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:450
-#, kde-format
-msgid "Username: %1"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:116
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:939
+msgid "Last.fm Services"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:455
-#, kde-format
-msgid "Play Count: %1 play"
-msgid_plural "Play Count: %1 plays"
-msgstr[0] ""
-msgstr[1] ""
-
-#: services/lastfm/LastFmService.cpp:504
-msgid "Create a Custom Last.fm Station"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:125
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SubmitPlayedSongs)
+#: rc.cpp:942
+msgid "&Submit tracks"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:507
-msgid "Tag"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:135
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_RetrieveSimilarArtists)
+#: rc.cpp:945
+msgid "&Retrieve similar artists"
 msgstr ""
 
-#: services/lastfm/LastFmService.cpp:507
-msgid "User"
-msgstr "Defnyddiwr"
-
-#: services/lastfm/LastFmTreeModel.cpp:182
-msgid "Personal Radio"
-msgstr "Radio Personol"
-
-#: services/lastfm/LastFmTreeModel.cpp:183
-msgid "Neighborhood"
+#. i18n: file: services/lastfm/LastFmConfigWidget.ui:145
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ScrobbleComposer)
+#: rc.cpp:948
+msgid "&Use composer data if available in Last.fm as artist"
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:368
-msgid "My Recommendations"
+#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:37
+#. i18n: ectx: property (text), widget (QLabel, instructionsLabel)
+#: rc.cpp:951
+msgid "Add a local or remote OPML file to be included in the list."
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:370
-msgid "My Radio Station"
+#. i18n: file: services/opmldirectory/AddOpmlWidget.ui:88
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, titleEdit)
+#: rc.cpp:960
+msgid "If left blank the title from the OPML will be used."
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:372
-msgid "My Mix Radio"
+#. i18n: file: services/amazon/AmazonShoppingCartDialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, AmazonShoppingCartDialog)
+#: rc.cpp:963
+msgid "Amarok - Your Shopping Cart"
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:374
-msgid "My Neighborhood"
+#. i18n: file: services/amazon/AmazonShoppingCartDialog.ui:30
+#. i18n: ectx: property (text), widget (QLabel, cartValueLabel)
+#: rc.cpp:966
+msgid "Shopping cart value: "
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:379
-msgid "My Top Artists"
+#. i18n: file: services/amazon/AmazonShoppingCartDialog.ui:39
+#. i18n: ectx: property (text), widget (QPushButton, checkoutButton)
+#: rc.cpp:969
+msgid "Checkout"
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:381
-msgid "My Tags"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:32
+#. i18n: ectx: property (windowTitle), widget (QWidget, AmazonConfigWidget)
+#: rc.cpp:972
+msgid "Select Your Country"
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:383
-msgid "Friends"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:44
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:975
+msgid "Country"
 msgstr ""
 
-#: services/lastfm/LastFmTreeModel.cpp:385
-msgid "Neighbors"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:56
+#. i18n: ectx: property (text), widget (QLabel, textLabel)
+#: rc.cpp:978
+msgid ""
+"The Amazon MP3 Store offers different items depending on your location. "
+"Please select the country you are located in. Note that changing the country "
+"also invalidates your shopping cart. Countries not in this list are not yet "
+"supported by the store, you can only buy items if you live in one of the "
+"listed countries."
 msgstr ""
 
-#: services/ampache/AddServerDialog.cpp:33
-msgid "Add new Ampache server"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:74
+#. i18n: ectx: property (text), widget (QLabel, countryLabel)
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:257
+#. i18n: ectx: property (text), widget (QLabel, countryLabel)
+#: rc.cpp:981 rc.cpp:1137
+msgid "Country:"
 msgstr ""
 
-#: services/ampache/AddServerDialog.cpp:73
-msgid "Successfully connected"
-msgstr ""
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:82
+#. i18n: ectx: property (text), item, widget (QComboBox, countrySelectionComboBox)
+#: rc.cpp:984
+msgid "France"
+msgstr "Ffrainc"
 
-#: services/ampache/AddServerDialog.cpp:78
-msgid "Connection failure"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:87
+#. i18n: ectx: property (text), item, widget (QComboBox, countrySelectionComboBox)
+#: rc.cpp:987
+msgid "Austria, Germany, Switzerland"
 msgstr ""
 
-#: services/ampache/AmpacheService.cpp:100
-msgid "Amarok frontend for your Ampache server"
-msgstr ""
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:92
+#. i18n: ectx: property (text), item, widget (QComboBox, countrySelectionComboBox)
+#: rc.cpp:990
+msgid "Japan"
+msgstr "Siapan"
 
-#: services/ampache/AmpacheService.cpp:102
-msgid ""
-"Use Amarok as a seamless frontend to your Ampache server. This lets you "
-"browse and play all the Ampache contents from within Amarok."
-msgstr ""
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:97
+#. i18n: ectx: property (text), item, widget (QComboBox, countrySelectionComboBox)
+#: rc.cpp:993
+msgid "United Kingdom"
+msgstr "Y Deyrnas Unedig"
 
-#: services/ampache/LastfmInfoParser.cpp:67
-msgid "<p>No information found for this track.</p>"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:102
+#. i18n: ectx: property (text), item, widget (QComboBox, countrySelectionComboBox)
+#: rc.cpp:996
+msgid "United States"
 msgstr ""
 
-#: services/ampache/LastfmInfoParser.cpp:118
-msgid "<p>No information found for this album.</p>"
+#. i18n: file: services/amazon/AmazonConfigWidget.ui:107
+#. i18n: ectx: property (text), item, widget (QComboBox, countrySelectionComboBox)
+#: rc.cpp:999
+msgid "none of the above (store won't work)"
 msgstr ""
 
-#: services/ampache/LastfmInfoParser.cpp:171
-msgid "<p>No information found for this artist.</p>"
+#. i18n: file: network/NetworkRequests.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, NetworkRequestsDialog)
+#. i18n: file: network/NetworkRequests.ui:20
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1005 rc.cpp:1008
+msgid "Network Requests"
 msgstr ""
 
-#: services/ampache/AmpacheServiceCollection.cpp:57
-#, kde-format
-msgid "Ampache Server %1"
-msgstr ""
+#. i18n: file: network/NetworkRequests.ui:27
+#. i18n: ectx: property (text), widget (QPushButton, clearButton)
+#: rc.cpp:1011
+msgid "&Clear"
+msgstr "&Clirio"
 
-#: services/ampache/AmpacheAccountLogin.cpp:133
-msgid "Enter the server name and a password"
+#. i18n: file: network/NetworkRequests.ui:41
+#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
+#: rc.cpp:1014
+msgid "Method"
 msgstr ""
 
-#: services/ampache/AmpacheAccountLogin.cpp:223
-msgid "Authentication Error"
+#. i18n: file: network/NetworkRequests.ui:51
+#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
+#: rc.cpp:1020
+msgid "Response"
 msgstr ""
 
-#: services/gpodder/GpodderService.cpp:113
-msgid "gpodder.net: Podcast Directory Service"
+#. i18n: file: network/NetworkRequests.ui:61
+#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
+#: rc.cpp:1026
+msgid "Content Type"
 msgstr ""
 
-#: services/gpodder/GpodderService.cpp:115
-msgid "gpodder.net is an online Podcast Directory & Synchonisation Service."
+#. i18n: file: network/NetworkRequests.ui:66
+#. i18n: ectx: property (text), widget (QTreeWidget, requestList)
+#: rc.cpp:1029
+msgid "Info"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:113
-msgid "The MP3tunes Locker: Your Music Everywhere!"
+#. i18n: file: network/NetworkRequests.ui:74
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1032
+msgid "Request Details"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:226
-msgid "MP3tunes AutoSync Enabled"
+#. i18n: file: network/NetworkRequests.ui:81
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1035
+msgid "Response Details"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:242
-msgid "MP3tunes AutoSync Disabled"
+#. i18n: file: network/NetworkRequests.ui:94
+#. i18n: ectx: property (text), widget (QTreeWidget, requestDetails)
+#. i18n: file: network/NetworkRequests.ui:108
+#. i18n: ectx: property (text), widget (QTreeWidget, responseDetails)
+#: rc.cpp:1041 rc.cpp:1047
+msgid "Value"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:262
-msgid "Authenticating"
+#. i18n: file: context/applets/tabs/TabsSettings.ui:38
+#. i18n: ectx: property (title), widget (QGroupBox, gbFetchTabs)
+#: rc.cpp:1053
+msgid "Fetch tabs for"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:274
-msgid "MP3tunes failed to Authenticate."
+#. i18n: file: context/applets/tabs/TabsSettings.ui:47
+#. i18n: ectx: property (text), widget (QCheckBox, cbFetchGuitar)
+#: rc.cpp:1056
+msgid "Guitar"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:307
-msgid "MP3tunes Harmony: Disconnected"
+#. i18n: file: context/applets/tabs/TabsSettings.ui:60
+#. i18n: ectx: property (text), widget (QCheckBox, cbFetchBass)
+#: rc.cpp:1059
+msgid "Bass"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:314
-#: services/mp3tunes/Mp3tunesService.cpp:327
-msgid "MP3tunes Harmony: Waiting for PIN Input"
+#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:32
+#. i18n: ectx: property (windowTitle), widget (QWidget, ReloadEditDialog)
+#: rc.cpp:1062
+msgid "Reload tabs"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:339
-msgid "MP3tunes Harmony: Successfully Connected"
+#. i18n: file: context/applets/tabs/ReloadEditDialog.ui:61
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1065
+msgid "Reload tabs with the following title and artist"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesService.cpp:354
-#, kde-format
-msgid ""
-"MP3tunes Harmony Error\n"
-"%1"
+#. i18n: file: context/applets/similarartists/similarArtistsSettings.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1074
+msgid "Maximum number of artists to show:"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:31
-msgid "Amarok's MP3tunes Harmony Daemon"
+#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, showActionsGroupBox)
+#: rc.cpp:1080
+msgid "Show Actions"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:32
-msgid "Handles AutoSync for the MP3tunes service in Amarok."
+#. i18n: file: context/applets/currenttrack/currentTrackSettings.ui:54
+#. i18n: ectx: property (title), widget (QGroupBox, fontsGroupBox)
+#: rc.cpp:1086
+msgid "Fonts"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:33
-msgid "(C) 2008, Casey Link"
+#. i18n: file: context/applets/videoclip/videoclipSettings.ui:20
+#. i18n: ectx: property (text), widget (QCheckBox, checkYoutubeHQ)
+#: rc.cpp:1089
+msgid "Youtube HQ"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:34
-msgid ""
-"IRC:\n"
-"server: irc.freenode.net / channels: #amarok, #amarok.de, #amarok.es, "
-"#amarok.fr\n"
-"\n"
-"Feedback:\n"
-"amarok@kde.org"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:21
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox)
+#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:28
+#. i18n: ectx: property (text), item, widget (QComboBox, filterComboBox)
+#: rc.cpp:1092 rc.cpp:1146
+msgid "All events"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:35
-msgid "http://amarok.kde.org"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsSettings.ui:44
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox)
+#: rc.cpp:1104
+msgid "Show places as links"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:41
-msgid "The identifier the daemon should use."
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:45
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, searchLineEdit)
+#: rc.cpp:1107
+msgid "Search Venue"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:42
-msgid "The email to be used for authentication."
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:55
+#. i18n: ectx: property (toolTip), widget (KComboBox, countryCombo)
+#: rc.cpp:1110
+msgid "Restrict venues to a specific country"
 msgstr ""
 
-#: services/mp3tunes/harmonydaemon/main.cpp:43
-msgid "The pin to be used for authentication."
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:65
+#. i18n: ectx: property (text), item, widget (KComboBox, countryCombo)
+#: rc.cpp:1113
+msgid "Any Country"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesWorkers.cpp:240
-msgid "Upload to MP3tunes Initiated"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:75
+#. i18n: ectx: property (text), widget (QLabel, searchResultsLabel)
+#: rc.cpp:1116
+msgid "Search Results:"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesWorkers.cpp:264
-#, kde-format
-msgid "Uploading Track %1/%2"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:104
+#. i18n: ectx: property (text), widget (QLabel, selectedVenuesLabel)
+#: rc.cpp:1119
+msgid "Selected Venues:"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp:43
-#: services/mp3tunes/Mp3tunesServiceCollection.cpp:53
-msgid "MP3tunes Locker"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:155
+#. i18n: ectx: property (text), widget (QLabel, photoLabel)
+#: rc.cpp:1122
+msgid "Photo"
 msgstr ""
 
-#: services/mp3tunes/Mp3tunesServiceCollectionLocation.cpp:82
-msgid ""
-"Only the following types of tracks can be uploaded to MP3tunes: mp3, mp4, "
-"m4a, m4p, aac, wma, and ogg. "
-msgstr ""
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:183
+#. i18n: ectx: property (text), widget (QLabel, nameLabel)
+#: rc.cpp:1125
+msgid "Name:"
+msgstr "Enw:"
 
-#: services/mp3tunes/Mp3tunesMeta.cpp:45
-msgid ""
-"Online music locker where you can safely store and access your music: "
-"http://mp3tunes.com"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:193
+#. i18n: ectx: property (text), widget (QLabel, cityLabel)
+#: rc.cpp:1128
+msgid "City:"
 msgstr ""
 
-#: widgets/ProgressWidget.cpp:44
-msgid "Track Progress"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:230
+#. i18n: ectx: property (text), widget (QLabel, websiteLabel)
+#: rc.cpp:1134
+msgid "Website:"
 msgstr ""
 
-#: widgets/ProgressWidget.cpp:120
-msgid "The amount of time elapsed in current song"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsVenueSettings.ui:267
+#. i18n: ectx: property (text), widget (QLabel, streetLabel)
+#: rc.cpp:1140
+msgid "Street:"
 msgstr ""
 
-#: widgets/ProgressWidget.cpp:121
-msgid "The amount of time remaining in current song"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:20
+#. i18n: ectx: property (text), widget (QLabel, filterLabel)
+#: rc.cpp:1143
+msgid "Filter events by date:"
 msgstr ""
 
-#: widgets/Osd.cpp:157
-msgid "Rating changed"
+#. i18n: file: context/applets/upcomingevents/upcomingEventsGeneralSettings.ui:51
+#. i18n: ectx: property (text), widget (QCheckBox, groupVenueCheckBox)
+#: rc.cpp:1158
+msgid "&Group venue events"
 msgstr ""
 
-#: widgets/Osd.cpp:232
-msgid "Volume: 100% (muted)"
+#. i18n: file: context/applets/wikipedia/wikipediaGeneralSettings.ui:31
+#. i18n: ectx: property (text), widget (QCheckBox, mobileCheckBox)
+#: rc.cpp:1161
+msgid "Use Wikipedia &mobile version"
 msgstr ""
 
-#: widgets/Osd.cpp:489
-msgid ""
-"On-Screen-Display preview\n"
-"Drag to reposition"
+#. i18n: file: context/applets/photos/photosSettings.ui:20
+#. i18n: ectx: property (text), widget (QLabel, animationLabel)
+#: rc.cpp:1164
+msgid "Animation"
 msgstr ""
 
-#: widgets/Osd.cpp:675 mac/GrowlInterface.cpp:64
-msgid "No information available for this track"
+#. i18n: file: context/applets/photos/photosSettings.ui:41
+#. i18n: ectx: property (text), item, widget (KComboBox, animationComboBox)
+#: rc.cpp:1173
+msgid "Fading"
 msgstr ""
 
-#: widgets/Osd.cpp:741
-msgid "Stopped"
-msgstr "Wedi aros"
-
-#: widgets/Osd.cpp:750
-msgid "Paused"
-msgstr "Wedi ei Seibio"
-
-#: widgets/SliderWidget.cpp:245
-msgid "Volume"
-msgstr "Lefel Sain"
-
-#: widgets/SliderWidget.cpp:246
-msgid "100%"
-msgstr "100%"
-
-#: widgets/SliderWidget.cpp:247
-msgid "80%"
+#. i18n: file: context/applets/photos/photosSettings.ui:49
+#. i18n: ectx: property (text), widget (QLabel, numberofphotosLabel)
+#: rc.cpp:1176
+msgid "Number of photos"
 msgstr ""
 
-#: widgets/SliderWidget.cpp:248
-msgid "60%"
+#. i18n: file: context/applets/photos/photosSettings.ui:72
+#. i18n: ectx: property (text), widget (QLabel, additionalkeywordsLabel)
+#: rc.cpp:1179
+msgid "Additional key words:"
 msgstr ""
 
-#: widgets/SliderWidget.cpp:249
-msgid "40%"
+#. i18n: file: context/applets/photos/photosSettings.ui:79
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, additionalkeywordsLineEdit)
+#: rc.cpp:1182
+msgid "Ex: band live 1977"
 msgstr ""
 
-#: widgets/SliderWidget.cpp:250
-msgid "20%"
+#. i18n: file: context/applets/photos/photosSettings.ui:88
+#. i18n: ectx: property (text), widget (QLabel, addsomemorekeynwordstothequerywithaspaceseparatorLabel)
+#: rc.cpp:1185
+msgid ""
+"Add some more key words to the Flickr.com\n"
+"query, with a space separator. \n"
+"For example: band live 1977 "
 msgstr ""
 
-#: widgets/SliderWidget.cpp:251
-msgid "0%"
-msgstr "0%"
-
-#: widgets/SliderWidget.cpp:412
-#, kde-format
-msgctxt ""
-"Tooltip shown when the mouse is over the progress slider, representing the "
-"position in the currently playing track that Amarok will seek to if you "
-"click the mouse. Keep it concise."
-msgid "Jump to: %1"
+#. i18n: file: context/applets/lyrics/lyricsSettings.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, fontGroup)
+#: rc.cpp:1193
+msgid "Font"
 msgstr ""
 
-#: widgets/BookmarkPopup.cpp:83 widgets/BookmarkPopup.cpp:111
-msgid "Bookmark"
+#. i18n: file: context/applets/lyrics/lyricsSettings.ui:32
+#. i18n: ectx: property (title), widget (KButtonGroup, alignmentGroup)
+#: rc.cpp:1196
+msgid "Alignment"
 msgstr ""
 
-#: widgets/TokenDropTarget.cpp:387
-msgid "Drag in and out items from above."
+#. i18n: file: context/applets/lyrics/lyricsSettings.ui:38
+#. i18n: ectx: property (text), widget (QRadioButton, alignLeft)
+#: rc.cpp:1199
+msgctxt "Left alignment"
+msgid "Left"
 msgstr ""
 
-#: widgets/PlayPauseButton.cpp:31 widgets/PlayPauseButton.cpp:81
-msgid "Play"
-msgstr "Chwarae"
-
-#: widgets/PlayPauseButton.cpp:81
-msgid "Pause"
-msgstr "Seibio"
+#. i18n: file: context/applets/lyrics/lyricsSettings.ui:45
+#. i18n: ectx: property (text), widget (QRadioButton, alignCenter)
+#: rc.cpp:1202
+msgctxt "Center alignment"
+msgid "Center"
+msgstr ""
 
-#: widgets/TokenWithLayout.cpp:242
-msgid "[prefix]"
+#. i18n: file: context/applets/lyrics/lyricsSettings.ui:52
+#. i18n: ectx: property (text), widget (QRadioButton, alignRight)
+#: rc.cpp:1205
+msgid "Right"
 msgstr ""
 
-#: widgets/TokenWithLayout.cpp:253
-msgid "[suffix]"
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1208
+msgid "Replace downloaded label"
 msgstr ""
 
-#: widgets/SearchWidget.cpp:73
-msgid "Enter space-separated terms to search."
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:79
+#. i18n: ectx: property (toolTip), widget (QTreeWidget, replacementTreeWidget)
+#: rc.cpp:1217
+msgid ""
+"This will help you keep your label collection clean by replacing downloaded "
+"labels according to your preferences.\n"
+"Eg. \"hip hop\" -> \"hip-hop\""
 msgstr ""
 
-#: widgets/SearchWidget.cpp:82 covermanager/CoverManager.cpp:173
-msgid "Enter search terms here"
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:98
+#. i18n: ectx: property (text), widget (QTreeWidget, replacementTreeWidget)
+#: rc.cpp:1221
+msgid "Downloaded label"
 msgstr ""
 
-#: widgets/SearchWidget.cpp:88 widgets/SearchWidget.cpp:160
-msgid "Edit filter"
+#. i18n: file: context/applets/labels/labelsReplacementSettings.ui:103
+#. i18n: ectx: property (text), widget (QTreeWidget, replacementTreeWidget)
+#: rc.cpp:1224
+msgid "Replacement"
 msgstr ""
 
-#: widgets/AnalyzerWidget.cpp:35
-msgid "Click for more analyzers"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, labelsGeneralSettings)
+#: rc.cpp:1230
+msgid "Labels Settings"
 msgstr ""
 
-#: widgets/AnalyzerWidget.cpp:69
-msgid "&Visualizations"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:37
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:169
+#. i18n: ectx: property (text), widget (QLabel, minAutoAddCountLabel)
+#: rc.cpp:1233 rc.cpp:1255
+msgid "Minimum label score:"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:124
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:56
+#. i18n: ectx: property (toolTip), widget (QSpinBox, minCountSpinBox)
+#: rc.cpp:1236
+msgid "Show only labels that are rated at least that high."
+msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:125
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:75
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1239
+msgid "Maximum labels to show:"
+msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:126
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:95
+#. i18n: ectx: property (toolTip), widget (QSpinBox, numLabelsSpinBox)
+#: rc.cpp:1242
+msgid ""
+"Do not show more than this many labels.\n"
+"Note that personal labels will always be shown."
+msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:127
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:108
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1246
+msgid "Show personal labels with score:"
+msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:128
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:127
+#. i18n: ectx: property (toolTip), widget (QSpinBox, personalCountSpinBox)
+#: rc.cpp:1249
+msgid "Affects the font size of the personal labels."
+msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:220
-msgid "Simple Search"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:145
+#. i18n: ectx: property (text), widget (QCheckBox, autoAddCheckBox)
+#: rc.cpp:1252
+msgid "Automatically add downloaded labels if none are assigned"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:435 widgets/SmartPlaylistEditor.cpp:934
-#: widgets/SmartPlaylistEditor.cpp:956 widgets/SmartPlaylistEditor.cpp:984
-#: widgets/SmartPlaylistEditor.cpp:1003
-msgid "and"
-msgstr "a"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:185
+#. i18n: ectx: property (toolTip), widget (QSpinBox, minAutoAddCountSpinBox)
+#: rc.cpp:1258
+msgid "Add only labels that are rated at least that high."
+msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:531
-msgctxt "Unit for data rate kilo bit per seconds"
-msgid "kbps"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:227
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1261
+msgid "Color for assigned labels:"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:533
-msgctxt "Unit for sample rate"
-msgid "Hz"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:257
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:1264
+msgid "Color for labels background:"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:535
-msgctxt "Unit for file size in mega byte"
-msgid "MiB"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:297
+#. i18n: ectx: property (toolTip), widget (QPushButton, resetColorsPushButton)
+#: rc.cpp:1267
+msgid "Sets the label colors according to the current color scheme."
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:859
-msgctxt "The date lies before the given fixed date"
-msgid "before"
+#. i18n: file: context/applets/labels/labelsGeneralSettings.ui:300
+#. i18n: ectx: property (text), widget (QPushButton, resetColorsPushButton)
+#: rc.cpp:1270
+msgid "Reset colors"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:861
-msgctxt "The date is the same as the given fixed date"
-msgid "on"
+#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1273
+msgid "Do not show the following labels:"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:863
-msgctxt "The date is after the given fixed date"
-msgid "after"
+#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:24
+#. i18n: ectx: property (text), widget (QCheckBox, matchArtistCheckBox)
+#: rc.cpp:1276
+msgid "Labels matching the artist"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:865
-msgctxt "The date is between the given fixed dates"
-msgid "between"
+#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:31
+#. i18n: ectx: property (text), widget (QCheckBox, matchTitleCheckBox)
+#: rc.cpp:1279
+msgid "Labels matching the title"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:867
-msgctxt "The date lies before the given time interval"
-msgid "older than"
+#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:38
+#. i18n: ectx: property (text), widget (QCheckBox, matchAlbumCheckBox)
+#: rc.cpp:1282
+msgid "Labels matching the album"
 msgstr ""
 
-#: widgets/MetaQueryWidget.cpp:883
-msgctxt "a numerical tag (like year or track number) is between two values"
-msgid "between"
+#. i18n: file: context/applets/labels/labelsBlacklistSettings.ui:61
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1285
+msgid "Blacklist:"
 msgstr ""
 
-#: widgets/TrackSelectWidget.cpp:67
-#, kde-format
-msgid "Checkpoint: <b>%1</b>"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:23
+#. i18n: ectx: property (text), widget (QLabel, Label5)
+#: rc.cpp:1288
+msgid "Analyzer Mode"
 msgstr ""
 
-#: widgets/TrackSelectWidget.cpp:87
-#, kde-format
-msgid "Track: %1"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:34
+#. i18n: ectx: property (text), item, widget (KComboBox, modeComboBox)
+#: rc.cpp:1291
+msgid "Bars"
 msgstr ""
 
-#: widgets/TrackSelectWidget.cpp:89
-#, kde-format
-msgid "Album: %1"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:39
+#. i18n: ectx: property (text), item, widget (KComboBox, modeComboBox)
+#: rc.cpp:1294
+msgid "Wave"
 msgstr ""
 
-#: widgets/TrackSelectWidget.cpp:91
-#, kde-format
-msgid "Artist: %1"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:44
+#. i18n: ectx: property (text), item, widget (KComboBox, modeComboBox)
+#: rc.cpp:1297
+msgid "Waterfall Diagram"
 msgstr ""
 
-#: widgets/TrackSelectWidget.cpp:95
-msgid "empty"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:49
+#. i18n: ectx: property (text), item, widget (KComboBox, modeComboBox)
+#: rc.cpp:1300
+msgid "3D Frequency Waves"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:79
-msgid "Create Smart Playlist"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:57
+#. i18n: ectx: property (text), widget (QLabel, Label2)
+#: rc.cpp:1304
+#, no-c-format
+msgid "Amount of Data (in %)"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:95
-msgid "Edit Smart Playlist"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:80
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1307
+msgid "Show Peaks (Bar Mode Only)"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:183 widgets/SmartPlaylistEditor.cpp:197
-#: dialogs/FilenameLayoutDialog.cpp:234 dialogs/FilenameLayoutDialog.cpp:598
-#: core/meta/support/MetaConstants.cpp:110
-#: browsers/CollectionTreeItemModelBase.cpp:984 playlist/PlaylistModel.cpp:904
-msgid "Composer"
-msgstr "Cyfansoddydd"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:97
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1310
+msgid "Peaks Sinkrate"
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:183 widgets/SmartPlaylistEditor.cpp:197
-#: dialogs/transferdialog.cpp:90 dialogs/FilenameLayoutDialog.cpp:254
-#: dialogs/FilenameLayoutDialog.cpp:633
-#: core/meta/support/MetaConstants.cpp:109
-#: browsers/CollectionTreeItemModelBase.cpp:985
-#: playlist/ProgressiveSearchWidget.cpp:95 playlist/PlaylistModel.cpp:910
-msgid "Genre"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:117
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1313
+msgid "Show Wave (Bar Mode Only)"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:184
-msgid "Track #"
+#. i18n: file: context/applets/spectrumanalyzer/spectrumAnalyzerSettings.ui:147
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1319
+msgid "Cut out lower frequencies"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:184 widgets/SmartPlaylistEditor.cpp:197
-#: widgets/SmartPlaylistEditor.cpp:921 dialogs/FilenameLayoutDialog.cpp:238
-#: dialogs/FilenameLayoutDialog.cpp:605
-#: core/meta/support/MetaConstants.cpp:111
-#: browsers/CollectionTreeItemModelBase.cpp:986 playlist/PlaylistModel.cpp:905
-msgid "Year"
-msgstr "Blwyddyn"
+#. i18n: file: playlistgenerator/PresetEditDialog.ui:15
+#. i18n: ectx: property (windowTitle), widget (QDialog, PresetEditDialog)
+#: rc.cpp:1322
+msgid "APG Preset Editor"
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:184 dialogs/FilenameLayoutDialog.cpp:250
-#: dialogs/FilenameLayoutDialog.cpp:626
-#: core/meta/support/MetaConstants.cpp:112 playlist/PlaylistModel.cpp:911
-msgid "Comment"
-msgstr "Sylwad"
+#. i18n: file: playlistgenerator/PresetEditDialog.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_Tree)
+#: rc.cpp:1325
+msgid "Constraint Tree"
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:184
-msgid "Play Counter"
+#. i18n: file: playlistgenerator/PresetEditDialog.ui:41
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_Title)
+#: rc.cpp:1328
+msgid "APG Preset Name"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:185 core/meta/support/MetaConstants.cpp:122
-#: playlist/PlaylistModel.cpp:917
-#: context/applets/currenttrack/CurrentTrack.cpp:449
-msgid "Score"
-msgstr "Sgôr"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:15
+#. i18n: ectx: property (whatsThis), widget (QWidget, TagMatchEditWidget)
+#: rc.cpp:1331
+msgid ""
+"An editor for a TagMatch constraint.  The user can specify a track "
+"characteristic, and the APG will fill the playlist with tracks that match "
+"that characteristic.  This functions similarity to the matching attributes "
+"of the smart playlists in Amarok 1.4."
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:185 core/meta/support/MetaConstants.cpp:123
-#: playlist/ProgressiveSearchWidget.cpp:109 playlist/PlaylistModel.cpp:918
-msgid "Rating"
-msgstr "Poblogrwydd"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1334
+msgid "Match Tag Constraint Settings"
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:185
-msgid "First Play"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:29
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_Match)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:44
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Field)
+#: rc.cpp:1337 rc.cpp:1343
+msgid "Selects which track characteristic you want to match."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:186
-msgid "Last Play"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label_Match)
+#: rc.cpp:1340
+msgid "Field:"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:186
-msgid "Modified Date"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:70
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBox_Invert)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:84
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_Invert)
+#: rc.cpp:1346 rc.cpp:1353
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Calibri'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The APG will choose all "
+"tracks that do <span style=\" font-weight:600;\">not</span> match the "
+"specified characteristics.</p></body></html>"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:186
-msgid "File Path"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:87
+#. i18n: ectx: property (text), widget (QLabel, label_Invert)
+#: rc.cpp:1360
+msgid "Invert:"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:187 playlist/PlaylistModel.cpp:909
-msgid "BPM"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:106
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonInt)
+#: rc.cpp:1363
+msgid ""
+"Whether the APG should choose tracks that are less than, equal to, or "
+"greater than the specified value."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:187
-msgid "Mount Point"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:118
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:472
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:609
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonRating)
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:44
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:44
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
+#: rc.cpp:1369 rc.cpp:1453 rc.cpp:1486 rc.cpp:1522 rc.cpp:1591
+msgid "equal to"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:187 playlist/PlaylistModel.cpp:915
-msgid "Bitrate"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:133
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, spinBox_ValueInt)
+#: rc.cpp:1375
+msgid "The numerical value that the track characteristic should match."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:187 widgets/SmartPlaylistEditor.cpp:197
-#: core/meta/support/MetaConstants.cpp:135
-#: browsers/CollectionTreeItemModelBase.cpp:987
-msgid "Label"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:158
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_StrictnessInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:180
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessInt)
+#: rc.cpp:1378 rc.cpp:1387
+msgid ""
+"How strict the APG should be about matching tracks to the specified value."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:204
-msgid "Playlist name:"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:161
+#. i18n: ectx: property (text), widget (QLabel, label_StrictnessInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:340
+#. i18n: ectx: property (text), widget (QLabel, label_strictnessDate)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:532
+#. i18n: ectx: property (text), widget (QLabel, label_StrictnessTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:655
+#. i18n: ectx: property (text), widget (QLabel, label_StrictnessRating)
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:93
+#. i18n: ectx: property (text), widget (QLabel, label_Strictness)
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:110
+#. i18n: ectx: property (text), widget (QLabel, label_Strictness)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:97
+#. i18n: ectx: property (text), widget (QLabel, label_Strictness)
+#: rc.cpp:1381 rc.cpp:1417 rc.cpp:1468 rc.cpp:1498 rc.cpp:1534 rc.cpp:1567
+#: rc.cpp:1606
+msgid "Match:"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:212
-msgid "Match Any of the following conditions"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:173
+#. i18n: ectx: property (text), widget (QLabel, label_FuzzyInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:352
+#. i18n: ectx: property (text), widget (QLabel, label_FuzzyDate)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:544
+#. i18n: ectx: property (text), widget (QLabel, label_FuzzyTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:667
+#. i18n: ectx: property (text), widget (QLabel, label_FuzzyRating)
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:105
+#. i18n: ectx: property (text), widget (QLabel, label_Fuzzy)
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, label_FuzzyPos)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:109
+#. i18n: ectx: property (text), widget (QLabel, label_Fuzzy)
+#: rc.cpp:1384 rc.cpp:1420 rc.cpp:1471 rc.cpp:1501 rc.cpp:1537 rc.cpp:1570
+#: rc.cpp:1609
+msgid "fuzzy"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:222
-msgid "Match All of the following conditions"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:196
+#. i18n: ectx: property (text), widget (QLabel, label_ExactInt)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:375
+#. i18n: ectx: property (text), widget (QLabel, label_ExactDate)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:567
+#. i18n: ectx: property (text), widget (QLabel, label_ExactTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:690
+#. i18n: ectx: property (text), widget (QLabel, label_ExactRating)
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:131
+#. i18n: ectx: property (text), widget (QLabel, label_Exact)
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:154
+#. i18n: ectx: property (text), widget (QLabel, label_ExactPos)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:135
+#. i18n: ectx: property (text), widget (QLabel, label_Exact)
+#: rc.cpp:1390 rc.cpp:1426 rc.cpp:1477 rc.cpp:1507 rc.cpp:1543 rc.cpp:1576
+#: rc.cpp:1615
+msgid "exact"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:232
-msgid "Order by"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:226
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonDate)
+#: rc.cpp:1393
+msgid ""
+"Whether the APG should choose tracks that are before, on, or after a "
+"specific date; or whether it should choose tracks that are within a certain "
+"time range."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:238
-msgid "Random"
-msgstr "Hap"
-
-#: widgets/SmartPlaylistEditor.cpp:246
-msgid "Limit to"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:248
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonDate)
+#: rc.cpp:1405
+msgid "within the last"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:258
-msgid "Expand by"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:266
+#. i18n: ectx: property (whatsThis), widget (QWidget, page_DateSpecific)
+#: rc.cpp:1408
+msgid "The specific date that the APG should use for matching."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:345
-msgid "Completely Random"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:300
+#. i18n: ectx: property (whatsThis), widget (QWidget, page_DateRange)
+#: rc.cpp:1411
+msgid "The relative time period that the APG should try to match."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:346
-msgid "Score Weighted"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:337
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_strictnessDate)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:359
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessDate)
+#: rc.cpp:1414 rc.cpp:1423
+msgid ""
+"How strict the APG should be about matching tracks to the specified date."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:347
-msgid "Rating Weighted"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:405
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonString)
+#: rc.cpp:1429
+msgid ""
+"Whether the APG should match tracks that equal, start with, end with, or "
+"contain the specified string."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:351
-msgid "Ascending"
-msgstr "Esgynnol"
-
-#: widgets/SmartPlaylistEditor.cpp:352
-msgid "Descending"
-msgstr "Disgynnol"
-
-#: widgets/SmartPlaylistEditor.cpp:501 widgets/SmartPlaylistEditor.cpp:508
-#: widgets/SmartPlaylistEditor.cpp:528 widgets/SmartPlaylistEditor.cpp:538
-#: widgets/SmartPlaylistEditor.cpp:582 widgets/SmartPlaylistEditor.cpp:589
-#: widgets/SmartPlaylistEditor.cpp:602 widgets/SmartPlaylistEditor.cpp:613
-#: widgets/SmartPlaylistEditor.cpp:653 widgets/SmartPlaylistEditor.cpp:659
-#: widgets/SmartPlaylistEditor.cpp:678 widgets/SmartPlaylistEditor.cpp:698
-#: widgets/SmartPlaylistEditor.cpp:767 widgets/SmartPlaylistEditor.cpp:883
-#: widgets/SmartPlaylistEditor.cpp:886 widgets/SmartPlaylistEditor.cpp:933
-#: widgets/SmartPlaylistEditor.cpp:955 widgets/SmartPlaylistEditor.cpp:983
-#: widgets/SmartPlaylistEditor.cpp:1002 widgets/SmartPlaylistEditor.cpp:1042
-#: widgets/SmartPlaylistEditor.cpp:1048
-msgid "is between"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:409
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
+#: rc.cpp:1432
+msgid "equals"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:514 widgets/SmartPlaylistEditor.cpp:595
-#: widgets/SmartPlaylistEditor.cpp:665 widgets/SmartPlaylistEditor.cpp:767
-#: widgets/SmartPlaylistEditor.cpp:884 widgets/SmartPlaylistEditor.cpp:887
-#: widgets/SmartPlaylistEditor.cpp:968 widgets/SmartPlaylistEditor.cpp:1048
-msgid "is in the last"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:414
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
+#: rc.cpp:1435 widgets/SmartPlaylistEditor.cpp:737
+#: widgets/SmartPlaylistEditor.cpp:1034
+msgid "starts with"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:514 widgets/SmartPlaylistEditor.cpp:595
-#: widgets/SmartPlaylistEditor.cpp:665 widgets/SmartPlaylistEditor.cpp:769
-#: widgets/SmartPlaylistEditor.cpp:885 widgets/SmartPlaylistEditor.cpp:888
-#: widgets/SmartPlaylistEditor.cpp:969 widgets/SmartPlaylistEditor.cpp:1048
-msgid "is not in the last"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:419
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
+#: rc.cpp:1438 widgets/SmartPlaylistEditor.cpp:759
+#: widgets/SmartPlaylistEditor.cpp:1035
+msgid "ends with"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:717 widgets/SmartPlaylistEditor.cpp:1033
-msgid "does not contain"
-msgstr "ni Chynhwysa"
-
-#: widgets/SmartPlaylistEditor.cpp:719 widgets/SmartPlaylistEditor.cpp:1033
-#: widgets/SmartPlaylistEditor.cpp:1041 widgets/SmartPlaylistEditor.cpp:1047
-msgid "is"
-msgstr "yw"
-
-#: widgets/SmartPlaylistEditor.cpp:728 widgets/SmartPlaylistEditor.cpp:1033
-#: widgets/SmartPlaylistEditor.cpp:1041 widgets/SmartPlaylistEditor.cpp:1047
-msgid "is not"
-msgstr "nid Yw"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:424
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_ComparisonString)
+#: rc.cpp:1441 widgets/SmartPlaylistEditor.cpp:715
+#: widgets/SmartPlaylistEditor.cpp:1033
+msgid "contains"
+msgstr "yn cynnwys"
 
-#: widgets/SmartPlaylistEditor.cpp:748 widgets/SmartPlaylistEditor.cpp:1034
-msgid "does not start with"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:432
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, lineEdit_StringValue)
+#: rc.cpp:1444
+msgid "The string that the APG should use when matching tracks."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:761 widgets/SmartPlaylistEditor.cpp:1035
-msgid "does not end with"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:460
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonTime)
+#: rc.cpp:1447
+msgid ""
+"Whether the APG should choose tracks that are less than, equal to, or "
+"greater than the specified time."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:763 widgets/SmartPlaylistEditor.cpp:1041
-msgid "is greater than"
-msgstr "yn fwy na"
-
-#: widgets/SmartPlaylistEditor.cpp:763 widgets/SmartPlaylistEditor.cpp:1047
-msgid "is after"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:487
+#. i18n: ectx: property (whatsThis), widget (QTimeEdit, timeEdit_TimeValue)
+#: rc.cpp:1459
+msgid "The time that the APG should try to match."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:765 widgets/SmartPlaylistEditor.cpp:1041
-msgid "is smaller than"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:500
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, timeEdit_TimeValue)
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:72
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, timeEdit_Position)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:65
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, timeEdit_Duration)
+#: rc.cpp:1462 rc.cpp:1561 rc.cpp:1600
+msgid "h:mm:ss"
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:765 widgets/SmartPlaylistEditor.cpp:1047
-msgid "is before"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:529
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_StrictnessTime)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:551
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessTime)
+#: rc.cpp:1465 rc.cpp:1474
+msgid ""
+"How strict the APG should be about matching tracks to the specified time."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:974
-msgid "Days"
-msgstr "Dydd"
-
-#: widgets/SmartPlaylistEditor.cpp:975
-msgid "Months"
-msgstr "Misoedd"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:597
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_ComparisonRating)
+#: rc.cpp:1480
+msgid ""
+"Whether the APG should choose tracks that are less than, equal to, or "
+"greater than the specified rating."
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:976
-#: playlist/ProgressiveSearchWidget.cpp:116
-msgid "Years"
-msgstr "Blynyddoedd"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:624
+#. i18n: ectx: property (whatsThis), widget (Amarok::KRatingWidget, rating_RatingValue)
+#: rc.cpp:1492
+msgid "The rating that the APG should try to match."
+msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:1011
-msgid "Seconds"
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:652
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_StrictnessRating)
+#. i18n: file: playlistgenerator/constraints/TagMatchEditWidget.ui:674
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_StrictnessRating)
+#: rc.cpp:1495 rc.cpp:1504
+msgid ""
+"How strict the APG should be about matching tracks to the specified rating."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:1012
-msgid "Minutes"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:15
+#. i18n: ectx: property (whatsThis), widget (QWidget, PlaylistLengthEditWidget)
+#: rc.cpp:1510
+msgid ""
+"An editor for a Playlist Length constraint.  The user can the target number "
+"of tracks and whether the playlist contain fewer than, equal to, or more "
+"than that number of tracks; and the strictness with which the APG should "
+"match the target number of tracks."
 msgstr ""
 
-#: widgets/SmartPlaylistEditor.cpp:1013
-msgid "Hours"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1513
+msgid "Playlist Length Constraint Settings"
 msgstr ""
 
-#: widgets/BreadcrumbItemButton.cpp:239
-msgid "List and run bookmarks, or create new ones"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:32
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Comparison)
+#: rc.cpp:1516
+msgid ""
+"Whether the number of tracks in the generated playlist should be less than, "
+"equal to, or more than the specified value."
 msgstr ""
 
-#: widgets/BreadcrumbItemButton.cpp:257
-msgid "Amarok Bookmarks"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:39
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Comparison)
+#: rc.cpp:1519
+msgid "fewer than"
 msgstr ""
 
-#: widgets/BreadcrumbItemButton.cpp:276
-msgid "Copy Current View Bookmark to Clipboard"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:59
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, spinBox_Length)
+#: rc.cpp:1528
+msgid "The target number of tracks for the generated playlist."
 msgstr ""
 
-#: widgets/VolumeDial.cpp:301 widgets/VolumeDial.cpp:340 TrayIcon.cpp:142
-msgid "Muted"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:90
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_Strictness)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:94
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_Strictness)
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:119
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_Strictness)
+#: rc.cpp:1531 rc.cpp:1603 rc.cpp:1612
+msgid ""
+"How strict the APG should be about matching the playlist duration to the "
+"specified time."
 msgstr ""
 
-#: widgets/VolumeDial.cpp:301 widgets/VolumeDial.cpp:340
-#, kde-format
-msgid "Volume: %1%"
+#. i18n: file: playlistgenerator/constraints/PlaylistLengthEditWidget.ui:115
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_Strictness)
+#: rc.cpp:1540
+msgid ""
+"How strict the APG should be about matching the playlist length to the "
+"specified number of tracks."
 msgstr ""
 
-#: ScriptManager.cpp:303
-#, kde-format
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:15
+#. i18n: ectx: property (whatsThis), widget (QWidget, CheckpointEditWidget)
+#: rc.cpp:1546
 msgid ""
-"Script error reported by: %1\n"
-"%2"
+"An editor for a CheckPoint constraint.  The user can set the track, album, "
+"or artist to be placed at a certain position in the playlist."
 msgstr ""
 
-#: dialogs/EditFilterDialog.cpp:41
-msgid "Simple text"
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1549
+msgid "Checkpoint Constraint Settings"
 msgstr ""
 
-#: dialogs/EditFilterDialog.cpp:49
-msgid "Edit Filter"
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:35
+#. i18n: ectx: property (whatsThis), widget (TrackSelectWidget, trackSelector)
+#: rc.cpp:1552
+msgid "Select the track that you want to use as the checkpoint."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:47
-msgid "Transfer Queue to Device"
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:48
+#. i18n: ectx: property (text), widget (QLabel, label_Position)
+#: rc.cpp:1555
+msgid "Position:"
 msgstr ""
 
-#: dialogs/transferdialog.cpp:54
-msgid "Music Location"
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:69
+#. i18n: ectx: property (whatsThis), widget (QTimeEdit, timeEdit_Position)
+#: rc.cpp:1558
+msgid ""
+"The desired position of the song in the playlist, in hours, minutes, and "
+"seconds.  Note: because of Qt limitations, the maximum position that you can "
+"specify is 24 hours."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:58
-#, kde-format
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:107
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_Strictness)
+#. i18n: file: playlistgenerator/constraints/CheckpointEditWidget.ui:138
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider_Strictness)
+#: rc.cpp:1564 rc.cpp:1573
 msgid ""
-"Your music will be transferred to:\n"
-"%1"
+"How strict the APG should be about placing the selected track at the "
+"specified time."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:67
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:15
+#. i18n: ectx: property (whatsThis), widget (QWidget, PlaylistDurationEditWidget)
+#: rc.cpp:1579
 msgid ""
-"You can have your music automatically grouped in\n"
-"a variety of ways. Each grouping will create\n"
-"directories based upon the specified criteria.\n"
+"An editor for a PlaylistDuration constraint.  The user can set the name of "
+"the constraint; the target duration and whether the playlist should be less "
+"than, equal to, or greater than that duration; and the strictness with which "
+"the APG should match that duration."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:71
-msgid "Groupings"
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1582
+msgid "Playlist Duration Constraint Settings"
 msgstr ""
 
-#: dialogs/transferdialog.cpp:74
-msgid "Select first grouping:\n"
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:32
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Comparison)
+#: rc.cpp:1585
+msgid ""
+"Whether the duration of the generated playlist should be shorter than, equal "
+"to, or longer than the specified value."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:76
-msgid "Select second grouping:\n"
+#. i18n: file: playlistgenerator/constraints/PlaylistDurationEditWidget.ui:62
+#. i18n: ectx: property (whatsThis), widget (QTimeEdit, timeEdit_Duration)
+#: rc.cpp:1597
+msgid ""
+"The desired duration of the playlist, in hours, minutes, and seconds.  Note: "
+"because of Qt limitations, the maximum playlist duration that you can "
+"specify is 24 hours."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:78
-msgid "Select third grouping:\n"
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:15
+#. i18n: ectx: property (whatsThis), widget (QWidget, PreventDuplicatesEditWidget)
+#: rc.cpp:1618
+msgid ""
+"An editor for a Prevent Duplicates constraint.  When set to \"track\", it "
+"will try to prevent more than one copy of the same track from ending up in "
+"the playlist.  When set to \"album\" or \"artist\", it will try to prevent "
+"more than one track from a given album or a given artist from ending up in "
+"the playlist."
 msgstr ""
 
-#: dialogs/transferdialog.cpp:87
-#: browsers/collectionbrowser/CollectionWidget.cpp:229
-#: playlist/navigators/NavigatorConfigAction.cpp:80
-msgid "None"
-msgstr "Dim"
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1621
+msgid "Prevent Duplicates Constraint Settings"
+msgstr ""
 
-#: dialogs/transferdialog.cpp:115
-msgid "Convert spaces to underscores"
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:29
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_Field)
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:47
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboBox_Field)
+#: rc.cpp:1624 rc.cpp:1630
+msgid ""
+"Control which duplicates to prevent.  \"Prevent duplicate tracks\" is the "
+"least restrictive, and \"prevent duplicate artists\" is the most restrictive."
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:131
-msgid "Collection root"
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label_Field)
+#: rc.cpp:1627
+msgid "Prevent duplicate"
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:189
-msgid "File Type"
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:51
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Field)
+#: rc.cpp:1633 widgets/SmartPlaylistEditor.cpp:253
+msgid "tracks"
+msgstr "traciau"
+
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:56
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Field)
+#: rc.cpp:1636
+msgid "albums"
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:269 dialogs/FilenameLayoutDialog.cpp:645
-msgid "Ignore"
+#. i18n: file: playlistgenerator/constraints/PreventDuplicatesEditWidget.ui:61
+#. i18n: ectx: property (text), item, widget (QComboBox, comboBox_Field)
+#: rc.cpp:1639
+msgid "artists"
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:272
-#, kde-format, no-c-format
-msgctxt ""
-"Please do not translate the %foo% words as they define a syntax used "
-"internally by a parser to describe a filename."
+#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:15
+#. i18n: ectx: property (whatsThis), widget (QWidget, ConstraintGroupEditWidget)
+#: rc.cpp:1642
 msgid ""
-"The following tokens can be used to define a filename scheme:<br>            "
-"                          <font color=\"%1\">%track%</font>, <font "
-"color=\"%2\">%title%</font>,                                      <font "
-"color=\"%3\">%artist%</font>, <font color=\"%4\">%composer%</font>,          "
-"                            <font color=\"%5\">%year%</font>, <font "
-"color=\"%6\">%album%</font>,                                      <font "
-"color=\"%7\">%albumartist%</font>, <font color=\"%8\">%comment%</font>,      "
-"                                <font color=\"%9\">%genre%</font>, %ignore%."
+"An editor for Constraint Groups.  You can set the group type to \"match "
+"all\" or \"match any\".  When the group type is set to \"match all\", the "
+"Generator will try to have the playlist match all the constraints within the "
+"group.  When the group type is set to \"match any\", the Generator will try "
+"to have the playlist match any of the constraints within the group."
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:284 dialogs/FilenameLayoutDialog.cpp:655
-msgctxt "Artist's Initial"
-msgid "Initial"
+#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1645
+msgid "Constraint Group Settings"
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:285 dialogs/FilenameLayoutDialog.cpp:640
-msgid "File type"
+#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:29
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton_MatchAll)
+#: rc.cpp:1648
+msgid ""
+"The APG will consider the constraint group satisfied only if all of the "
+"constraints within the group are satisfied.  This is analogous to a logical "
+"AND: \"the tracks should match properties A, B, and C\"."
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:287 dialogs/FilenameLayoutDialog.cpp:660
-msgid "Disc number"
+#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:32
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton_MatchAll)
+#: rc.cpp:1651
+msgid "Match all constraints in the group"
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:290
-#, no-c-format
-msgctxt ""
-"Please do not translate the %foo% words as they define a syntax used "
-"internally by a parser to describe a filename."
+#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:39
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton_MatchAny)
+#: rc.cpp:1654
 msgid ""
-"The following tokens can be used to define a filename scheme:                "
-"                      <br>%track%, %title%, %artist%, %composer%, %year%, "
-"%album%, %albumartist%, %comment%, %genre%, %initial%, %folder%, %filetype%, "
-"%discnumber%."
-msgstr ""
-
-#: dialogs/FilenameLayoutDialog.cpp:395 dialogs/FilenameLayoutDialog.cpp:400
-#: dialogs/FilenameLayoutDialog.cpp:405 dialogs/FilenameLayoutDialog.cpp:410
-#: dialogs/FilenameLayoutDialog.cpp:415 dialogs/FilenameLayoutDialog.cpp:420
-#: dialogs/FilenameLayoutDialog.cpp:425 dialogs/FilenameLayoutDialog.cpp:430
-#: dialogs/FilenameLayoutDialog.cpp:435
-msgctxt ""
-"Text to represent an empty tag. Braces (<>) are only to clarify emptiness."
-msgid "&lt;empty&gt;"
+"The APG will consider the constraint group satisfied if any one of the "
+"constraints within it is satisfied.  This is analogous to a logical OR: "
+"\"the tracks should match properties A, B, or C\"."
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:516
-msgid "&Basic..."
+#. i18n: file: playlistgenerator/ConstraintGroupEditWidget.ui:42
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton_MatchAny)
+#: rc.cpp:1657
+msgid "Match any constraint in the group"
 msgstr ""
 
-#: dialogs/FilenameLayoutDialog.cpp:650
-msgid "Folder"
-msgstr "Plygell"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1660 rc.cpp:1748
+msgid "General"
+msgstr "Cyffredinol"
 
-#: dialogs/MusicBrainzTagger.cpp:67
-msgid "Expand All"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:23
+#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_OsdEnabled)
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:26
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_OsdEnabled)
+#: rc.cpp:1663 rc.cpp:1666
+msgid ""
+"Check to enable the On-Screen-Display. The OSD briefly displays track data "
+"when a new track is played."
 msgstr ""
 
-#: dialogs/MusicBrainzTagger.cpp:68
-msgid "Collapse All"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:29
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OsdEnabled)
+#: rc.cpp:1669
+msgid "Use &On-Screen-Display"
 msgstr ""
 
-#: dialogs/MusicBrainzTagger.cpp:69
-msgid "Expand Unchosen"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:43
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1672
+msgid "&Duration:"
+msgstr "&Hyd:"
+
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:62
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_OsdDuration)
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:65
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_OsdDuration)
+#: rc.cpp:1675 rc.cpp:1678
+msgid ""
+"The time in milliseconds for which to show the OSD. The value must be "
+"between 500 ms and 10000 ms."
 msgstr ""
 
-#: dialogs/MusicBrainzTagger.cpp:70
-msgid "Collapse Chosen"
-msgstr ""
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:71
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_OsdDuration)
+#: rc.cpp:1681
+msgid "Forever"
+msgstr "Am Byth"
 
-#: dialogs/OrganizeCollectionDialog.cpp:152
-#: dialogs/OrganizeCollectionDialog.cpp:155
-#, kde-format
-msgid "%1 or %2"
-msgstr "%1 neu %2"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:74
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_OsdDuration)
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:80
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_FadeoutLength)
+#: rc.cpp:1684 rc.cpp:1776
+msgid " ms"
+msgstr " meil"
 
-#: dialogs/OrganizeCollectionDialog.cpp:156
-msgid "Artist's Initial"
-msgstr ""
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:93
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#: rc.cpp:1687
+msgid "Sc&reen:"
+msgstr "Sg&rîn :"
 
-#: dialogs/OrganizeCollectionDialog.cpp:157
-msgid "File Extension of Source"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:112
+#. i18n: ectx: property (toolTip), widget (KComboBox, kcfg_OsdScreen)
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:115
+#. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_OsdScreen)
+#: rc.cpp:1690 rc.cpp:1693
+msgid "The screen that should display the OSD."
 msgstr ""
 
-#: dialogs/OrganizeCollectionDialog.cpp:158
-#: core/meta/support/MetaConstants.cpp:113
-msgid "Track Number"
-msgstr "Rhif Trac"
-
-#: dialogs/OrganizeCollectionDialog.cpp:160
-msgid "<h3>Custom Format String</h3>"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:133
+#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_OsdUseCustomColors)
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:136
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_OsdUseCustomColors)
+#: rc.cpp:1696 rc.cpp:1699
+msgid "Check to enable custom colors for the On-Screen-Display."
 msgstr ""
 
-#: dialogs/OrganizeCollectionDialog.cpp:161
-msgid "You can use the following tokens:"
-msgstr "Gallwch ddefnyddio'r tocynnau canlynol:"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:139
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OsdUseCustomColors)
+#: rc.cpp:1702
+msgid "Use &custom colors"
+msgstr "Defnyddio lliwiau &addasiedig"
 
-#: dialogs/OrganizeCollectionDialog.cpp:168
-msgid ""
-"If you surround sections of text that contain a token with curly-braces, "
-"that section will be hidden if the token is empty."
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:163
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:191
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_OsdTextColor)
+#: rc.cpp:1705 rc.cpp:1714
+msgid "The color of the OSD text."
 msgstr ""
 
-#: dialogs/OrganizeCollectionDialog.cpp:338
-msgid "There is a filename conflict, existing files will be overwritten."
-msgstr ""
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:166
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1708
+msgid "Text color:"
+msgstr "Lliw testun:"
 
-#: dialogs/OrganizeCollectionDialog.cpp:340
-msgid "There is a filename conflict, existing files will not be changed."
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:188
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_OsdTextColor)
+#: rc.cpp:1711
+msgid "Click to select the color of the OSD text."
 msgstr ""
 
-#: dialogs/OrganizeCollectionDialog.cpp:391
-msgid "New Format Preset"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:211
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OsdUseTranslucency)
+#: rc.cpp:1717
+msgid "If checked, enables translucency if supported by your desktop system."
 msgstr ""
 
-#: dialogs/OrganizeCollectionDialog.cpp:391
-msgid "Preset Name"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:214
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_OsdUseTranslucency)
+#: rc.cpp:1720
+msgid "&Translucent"
 msgstr ""
 
-#: dialogs/OrganizeCollectionDialog.cpp:391
-msgid "New Preset"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:226
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1723
+msgid "Font scale:"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:39
-msgid "Import Collection"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:233
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_OsdFontScaling)
+#: rc.cpp:1727
+#, no-c-format
+msgid "%"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:44
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:261
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OsdHideOnFullscreen)
+#. i18n: file: amarokconfig.kcfg:395
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:1730 rc.cpp:2423
 msgid ""
-"This tool allows you to import track information and<br>statistical data "
-"from another music application.<br><br>Any statistical data in your database "
-"will be <i>overwritten</i>"
-msgstr ""
-
-#: dialogs/DatabaseImporterDialog.cpp:55
-msgid "Amarok collection scanner"
+"Do not show the On-Screen-Display if another application is focused and "
+"running in fullscreen mode."
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:56
-msgid "Amarok 1.4"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:264
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_OsdHideOnFullscreen)
+#. i18n: file: amarokconfig.kcfg:394
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:1733 rc.cpp:2420
+msgid "Don't show when a fullscreen application is active"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:57
-msgid "iTunes"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:274
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_KNotifyEnabled)
+#: rc.cpp:1736
+msgid "Check to use the system notification."
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:58
-msgid "Banshee"
+#. i18n: file: configdialog/dialogs/NotificationsConfig.ui:277
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_KNotifyEnabled)
+#: rc.cpp:1739
+msgid "Use &system notifications"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:59
-msgid "Rhythmbox"
+#. i18n: file: configdialog/dialogs/CollectionConfig.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, CollectionConfig)
+#: rc.cpp:1742
+msgid "Collection Setup"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:80
-msgid "Select Importer"
+#. i18n: file: configdialog/dialogs/CollectionConfig.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, collectionFoldersBox)
+#: rc.cpp:1745
+msgid "Collection Folders"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:85
-msgid "Configuration"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:23
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FadeoutOnExit)
+#: rc.cpp:1751
+msgid "If checked, Amarok will fade out the music on program exit."
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:94
-msgid "Migrating"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_FadeoutOnExit)
+#: rc.cpp:1754
+msgid "Fadeout on e&xit"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:161
-msgid "<b><font color='red'>Failed:</font></b> No tracks were imported"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:36
+#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_Fadeout)
+#: rc.cpp:1757
+msgid ""
+"If checked, Amarok will slowly fade the volume of the playing track on stop "
+"or at the end of the playlist, rather than stopping playback immediately"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:163
-#, kde-format
-msgid "<b><font color='green'>Success:</font></b> Imported %1 track"
-msgid_plural "<b><font color='green'>Success:</font></b> Imported %1 tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: dialogs/DatabaseImporterDialog.cpp:174
-msgid "<b><font color='red'>Failed:</font></b> Unable to import statistics"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:40
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_Fadeout)
+#: rc.cpp:1760
+msgid ""
+"<b>Quit Behavior</b>\n"
+"<p>On exit, Amarok can slowly fade the volume of the playing track (which is "
+"configurable), or stop playback immediately.</p>"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:189
-#, kde-format
-msgid "<b><font color='red'>Error:</font></b> %1"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:43
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_Fadeout)
+#: rc.cpp:1764
+msgid "&Fadeout on stop"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:204
-#, kde-format
-msgctxt "Track has been imported, format: Track"
-msgid "Imported <b>%1</b>"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:61
+#. i18n: ectx: property (text), widget (QLabel, fadeoutLengthLabel)
+#: rc.cpp:1767
+msgid "Fadeout &duration:"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:207
-#, kde-format
-msgctxt "Track has been imported, format: Artist - Track"
-msgid "Imported <b>%1 - %2</b>"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:74
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_FadeoutLength)
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:77
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_FadeoutLength)
+#: rc.cpp:1770 rc.cpp:1773
+msgid "The length of the fadeout, in milliseconds."
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:210
-#, kde-format
-msgctxt "Track has been imported, format: Artist - Track (Album)"
-msgid "Imported <b>%1 - %2 (%3)</b>"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:102
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ResumePlayback)
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:105
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ResumePlayback)
+#: rc.cpp:1779 rc.cpp:1782
+msgid ""
+"If checked, Amarok will<br>resume playback from where you left it the "
+"previous session -- just like a tape-player."
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:219
-#, kde-format
-msgctxt "Track has been discarded, format: Url"
-msgid "Discarded <b><font color='gray'>%1</font></b>"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:108
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ResumePlayback)
+#: rc.cpp:1785
+msgid "&Resume playback on start"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:234
-#, kde-format
-msgctxt "Track has been imported by tags, format: Track, from Url, to Url"
-msgid ""
-"Imported <b><font color='green'>%1</font></b><br/>&nbsp;&nbsp;from "
-"%2<br/>&nbsp;&nbsp;to %3"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:118
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:1788
+msgid "Sound System Configuration"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:237
-#, kde-format
-msgctxt ""
-"Track has been imported by tags, format: Artist - Track, from Url, to Url"
-msgid ""
-"Imported <b><font color='green'>%1 - %2</font></b><br/>&nbsp;&nbsp;from "
-"%3<br/>&nbsp;&nbsp;to %4"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:145
+#. i18n: ectx: property (toolTip), widget (QPushButton, pushButtonPhonon)
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:148
+#. i18n: ectx: property (whatsThis), widget (QPushButton, pushButtonPhonon)
+#: rc.cpp:1791 rc.cpp:1794
+msgid "Phonon is the audio system used by Amarok."
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:240
-#, kde-format
-msgctxt ""
-"Track has been imported by tags, format: Artist - Track (Album), from Url, "
-"to Url"
-msgid ""
-"Imported <b><font color='green'>%1 - %2 (%3)</font></b><br/>&nbsp;&nbsp;from "
-"%4<br/>&nbsp;&nbsp;to %5"
+#. i18n: file: configdialog/dialogs/PlaybackConfig.ui:151
+#. i18n: ectx: property (text), widget (QPushButton, pushButtonPhonon)
+#: rc.cpp:1797
+msgid "Configure Phonon"
 msgstr ""
 
-#: dialogs/DatabaseImporterDialog.cpp:252
-#, kde-format
-msgctxt "Track has been matched ambigously, format: Url"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:17
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_UseServer)
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:20
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_UseServer)
+#: rc.cpp:1800 rc.cpp:1803
 msgid ""
-"Multiple ambiguous matches found for <b><font color='red'>%1</font></b>, has "
-"been discarded."
+"Check to enable the use of an external database. By default there is already "
+"an embedded MySQL database running."
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:44
-msgid "Configure Equalizer"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:23
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseServer)
+#: rc.cpp:1806
+msgid "Use &external MySQL database"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:100
-msgid ""
-"Sorry, your current Phonon backend version does not provide equalizer "
-"support."
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:30
+#. i18n: ectx: property (title), widget (QGroupBox, group_Connection)
+#: rc.cpp:1809
+msgid "Connection Settings"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:156 dialogs/EqualizerDialog.cpp:165
-msgid ""
-"%0\n"
-"dB"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:38
+#. i18n: ectx: property (text), widget (QLabel, label_Host)
+#: rc.cpp:1812
+msgid "&Server:"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:256
-msgctxt "Equalizer state, as in, disabled"
-msgid "Off"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:55
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_Host)
+#: rc.cpp:1815
+msgid "Enter the name of the existing MySQL server\n"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:273
-msgid "Cannot delete this preset"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:71
+#. i18n: ectx: property (text), widget (QLabel, label_Port)
+#: rc.cpp:1819
+msgid "P&ort:"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:274
-msgid "Default presets can not be deleted"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:91
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_Port)
+#: rc.cpp:1822
+msgid "Enter the port number to access the server. Default is port 3306.\n"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:275
-msgid "Error deleting preset"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:118
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_Password)
+#: rc.cpp:1829
+msgid "Enter the password for the default user.\n"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:298
-msgid "Cannot restore this preset"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:151
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_User)
+#: rc.cpp:1836
+msgid ""
+"Enter the username to access the database with full access privileges.\n"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:299
-msgid "Only default presets can be restored"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:161
+#. i18n: ectx: property (text), widget (QLabel, label_Database)
+#: rc.cpp:1840
+msgid "&Database:"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:300
-msgid "Error restoring preset"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:178
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_Database)
+#: rc.cpp:1843
+msgid "Enter the name of the database. Default preset is amarokdb.\n"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:320
-msgid "Cannot save this preset"
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:199
+#. i18n: ectx: property (text), widget (QLabel, label_Info)
+#: rc.cpp:1847
+msgid ""
+"Amarok expects the above database and user account to already exist. This "
+"user also requires full access to the database. You MUST restart Amarok "
+"after changing these settings."
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:321
+#. i18n: file: configdialog/dialogs/DatabaseConfig.ui:209
+#. i18n: ectx: property (text), widget (QLabel, label_SQL)
+#: rc.cpp:1850
 msgid ""
-"Preset 'Manual' is reserved for momentary settings.\n"
-"                                              Please choose different name "
-"and try again."
+"If your database is not already set up, you can use the following S&QL "
+"commands (after replacing the password with the correct one):"
 msgstr ""
 
-#: dialogs/EqualizerDialog.cpp:323
-msgid "Error saving preset"
+#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:36
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoUpdateScripts)
+#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:39
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoUpdateScripts)
+#: rc.cpp:1853 rc.cpp:1856
+msgid ""
+"Automatically download and install updates for the built-in scripts from the "
+"Amarok website if available"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:419
-msgid "Filename Layout Chooser"
+#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:42
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoUpdateScripts)
+#: rc.cpp:1859
+msgid "Automatically update built-in scripts"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:536 browsers/playlistbrowser/PodcastModel.cpp:337
-msgid "Summary"
-msgstr "Crynodeb"
+#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:62
+#. i18n: ectx: property (toolTip), widget (QPushButton, manageButton)
+#: rc.cpp:1862
+msgid "Browse, install, and uninstall scripts"
+msgstr ""
 
-#: dialogs/TagDialog.cpp:537
-msgid "Tags"
+#. i18n: file: configdialog/dialogs/ScriptsConfig.ui:65
+#. i18n: ectx: property (text), widget (QPushButton, manageButton)
+#: rc.cpp:1865
+msgid "Manage Scripts"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:538 configdialog/dialogs/ScriptsConfig.cpp:54
-#: context/applets/lyrics/LyricsApplet.cpp:440
-#: context/applets/lyrics/LyricsApplet.cpp:568
-msgid "Lyrics"
-msgstr "Lyrics"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, generalBox)
+#: rc.cpp:1868
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#: dialogs/TagDialog.cpp:539 context/applets/labels/LabelsApplet.cpp:92
-#: context/applets/labels/LabelsApplet.cpp:184
-msgid "Labels"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:29
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowSplashScreen)
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:32
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowSplashScreen)
+#: rc.cpp:1871 rc.cpp:1874
+msgid "Check to enable the splashscreen during Amarok startup."
 msgstr ""
 
-#: dialogs/TagDialog.cpp:700 dialogs/TagDialog.cpp:708
-msgctxt "The value for this tag is not known"
-msgid "Unknown"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:35
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowSplashScreen)
+#: rc.cpp:1877
+msgid "Sho&w splash-screen on startup"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:745
-#, kde-format
-msgid "Track Details: %1 by %2"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:42
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowTrayIcon)
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:45
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowTrayIcon)
+#: rc.cpp:1880 rc.cpp:1883
+msgid "Check to enable the Amarok system tray icon."
 msgstr ""
 
-#: dialogs/TagDialog.cpp:751
-#, kde-format
-msgctxt "The amount of tracks being edited"
-msgid "1 Track"
-msgid_plural "Information for %1 Tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: dialogs/TagDialog.cpp:780 dialogs/TagDialog.cpp:790
-#, kde-format
-msgid "<b>%1</b> by <b>%2</b>"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:48
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowTrayIcon)
+#: rc.cpp:1886
+msgid "Show tray &icon"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:782 dialogs/TagDialog.cpp:792
-#, kde-format
-msgid "<b>%1</b>"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:55
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoGetCoverArt)
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:58
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoGetCoverArt)
+#: rc.cpp:1889 rc.cpp:1892
+msgid ""
+"Check to enable the automatic retrieval of cover art from the Internet."
 msgstr ""
 
-#: dialogs/TagDialog.cpp:788
-#, kde-format
-msgid "<b>%1</b> by <b>%2</b> on <b>%3</b>"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoGetCoverArt)
+#: rc.cpp:1895
+msgid "Automatically retrieve cover art"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:798
-#, kde-format
-msgid "Editing 1 file"
-msgid_plural "Editing %1 files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: dialogs/TagDialog.cpp:830
-msgctxt "When this track first played"
-msgid "Never"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:68
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AnimateAppletCollapse)
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:71
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AnimateAppletCollapse)
+#: rc.cpp:1898 rc.cpp:1901
+msgid "Check to enable animations when context applets collapse."
 msgstr ""
 
-#: dialogs/TagDialog.cpp:835
-msgctxt "When this track was last played"
-msgid "Never"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:74
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AnimateAppletCollapse)
+#. i18n: file: amarokconfig.kcfg:131
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:1904 rc.cpp:2156
+msgid "Enable context applets collapse animations"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:839
-msgctxt "The collection this track is part of"
-msgid "None"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:81
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowBrowserBackgroundImage)
+#: rc.cpp:1907
+msgid "Show background images in the browser panel"
 msgstr ""
 
-#: dialogs/TagDialog.cpp:1360
-msgid ""
-"Writing to file failed. Please check permissions and available disc space."
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:91
+#. i18n: ectx: property (title), widget (QGroupBox, playlistBox)
+#: rc.cpp:1910
+msgid "Playlist Options"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:78
-#, kde-format
-msgid "Rescan '%1'"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:97
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoScrollPlaylist)
+#: rc.cpp:1913
+msgid ""
+"Check to make the playlist scroll so the current track is always visible."
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:107
-msgid ""
-"These folders will be scanned for media to make up your collection. You can "
-"right-click on a folder to individually rescan it, if it was previously "
-"selected:"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoScrollPlaylist)
+#: rc.cpp:1916
+msgid "Automatically scroll playlist to current track"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:124
-msgid "Full rescan"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:110
+#. i18n: ectx: property (title), widget (QGroupBox, moodbarBox)
+#: rc.cpp:1919
+msgid "Moodbar Options"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:125
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:117
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowMoodbarInSlider)
+#: rc.cpp:1922
 msgid ""
-"Rescan your entire collection. This will <i>not</i> delete any statistics."
+"The Moodbar makes it possible to navigate in your music visually.\n"
+"Please note that this feature requires the external \"Moodbar Generator\" "
+"tool."
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:128
-msgid "Import"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:120
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowMoodbarInSlider)
+#: rc.cpp:1926
+msgid "Show Moodbar in Progress Slider"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:129
-msgid ""
-"Import collection and/or statistics from older Amarok versions, the batch "
-"scanner or media players."
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:127
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1929
+msgid "Moodbar style"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:132
-msgid "&Scan folders recursively (requires full rescan if newly checked)"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:134
+#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_MoodbarPaintStyle)
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:137
+#. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_MoodbarPaintStyle)
+#: rc.cpp:1932 rc.cpp:1935
+msgid "Choose the mood display style"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:133
-msgid "&Watch folders for changes"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:141
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
+#: rc.cpp:1938
+msgid "Default (System colours)"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:134
-msgid "Write metadata to file"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:146
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
+#: rc.cpp:1941
+msgid "Angry"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:135
-msgid "Write statistics to file"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:151
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
+#: rc.cpp:1944
+msgid "Frozen"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:136
-msgid "Write covers to file"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:156
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
+#: rc.cpp:1947
+msgid "Happy"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:137
-msgid "&Enable character set detection in ID3 tags"
+#. i18n: file: configdialog/dialogs/GeneralConfig.ui:161
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MoodbarPaintStyle)
+#: rc.cpp:1950
+msgid "Normal"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:145
-msgid "If selected, Amarok will read all subfolders."
+#. i18n: file: likeback/LikeBackBar.ui:29
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_likeButton)
+#: rc.cpp:1953
+msgid "Tell the developers about something you liked"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:146
+#. i18n: file: likeback/LikeBackBar.ui:33
+#. i18n: ectx: property (whatsThis), widget (QToolButton, m_likeButton)
+#. i18n: file: likeback/LikeBackBar.ui:50
+#. i18n: ectx: property (whatsThis), widget (QToolButton, m_dislikeButton)
+#. i18n: file: likeback/LikeBackBar.ui:67
+#. i18n: ectx: property (whatsThis), widget (QToolButton, m_bugButton)
+#. i18n: file: likeback/LikeBackBar.ui:84
+#. i18n: ectx: property (whatsThis), widget (QToolButton, m_featureButton)
+#: rc.cpp:1956 rc.cpp:1963 rc.cpp:1970 rc.cpp:1977
 msgid ""
-"If selected, the collection folders will be watched for changes.\n"
-"The watcher will not notice changes behind symbolic links."
+"<html>Click on one of these icons to send your feedback to the developers of "
+"this application. You can disable the icons with the \"Show Feedback Icons\" "
+"checkbox in the Help menu.</html>\n"
+"      "
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:147
-msgid ""
-"Write meta data changes (including 'stars' rating) back to the original "
-"file.\n"
-"You can also prevent writing back by write protecting the file.\n"
-"This might be a good idea if you are currently\n"
-"sharing those files via the Internet."
+#. i18n: file: likeback/LikeBackBar.ui:46
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_dislikeButton)
+#: rc.cpp:1960
+msgid "Tell the developers about something you did not like"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:148
-msgid ""
-"Write play-changing statistics (e.g. score, lastplayed, playcount)\n"
-"as tags back to the file."
+#. i18n: file: likeback/LikeBackBar.ui:63
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_bugButton)
+#: rc.cpp:1967
+msgid "Tell the developers about a problem in the application"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:149
+#. i18n: file: likeback/LikeBackBar.ui:80
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_featureButton)
+#: rc.cpp:1974
 msgid ""
-"Write changed covers back to the file.\n"
-"This will replace existing embedded covers."
+"Tell the developers about new features you would like to have in this "
+"application"
 msgstr ""
 
-#: dialogs/CollectionSetup.cpp:150
-msgid ""
-"If selected, Amarok will use Mozilla's\n"
-"Character Set Detector to attempt to automatically guess the\n"
-"character sets used in ID3 tags."
+#. i18n: file: likeback/LikeBackDialog.ui:45
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1981
+msgid "Your comment:"
 msgstr ""
 
-#: dialogs/ScriptSelector.cpp:30 configdialog/dialogs/ScriptSelector.cpp:31
-msgid "Search Scripts"
+#. i18n: file: likeback/LikeBackDialog.ui:71
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1984
+msgid "Your comment is about:"
 msgstr ""
 
-#: dialogs/deletedialog.cpp:63
-#, kde-format
-msgid "<b>1</b> file selected."
-msgid_plural "<b>%1</b> files selected."
-msgstr[0] ""
-msgstr[1] ""
-
-#: dialogs/deletedialog.cpp:69
-msgid ""
-"<qt>These items will be <b>permanently deleted</b> from your hard disk.</qt>"
+#. i18n: file: likeback/LikeBackDialog.ui:86
+#. i18n: ectx: property (text), widget (QRadioButton, likeRadio_)
+#: rc.cpp:1987
+msgid "Something you like"
 msgstr ""
 
-#: dialogs/deletedialog.cpp:75
-msgid "<qt>These items will be moved to the Trash Bin.</qt>"
+#. i18n: file: likeback/LikeBackDialog.ui:99
+#. i18n: ectx: property (text), widget (QRadioButton, dislikeRadio_)
+#: rc.cpp:1990
+msgid "Something you dislike"
 msgstr ""
 
-#: dialogs/deletedialog.cpp:87
-msgid "&Send to Trash"
+#. i18n: file: likeback/LikeBackDialog.ui:112
+#. i18n: ectx: property (text), widget (QRadioButton, bugRadio_)
+#: rc.cpp:1993
+msgid "An improper behavior of the application"
 msgstr ""
 
-#: dialogs/deletedialog.cpp:93
-msgid "About to delete selected files"
+#. i18n: file: likeback/LikeBackDialog.ui:125
+#. i18n: ectx: property (text), widget (QRadioButton, featureRadio_)
+#: rc.cpp:1996
+msgid "A new feature you desire"
 msgstr ""
 
-#: dialogs/deletedialog.cpp:154
-msgid "Deleting files"
+#. i18n: file: likeback/LikeBackDialog.ui:141
+#. i18n: ectx: property (text), widget (QCheckBox, specifyEmailCheckBox_)
+#: rc.cpp:1999
+msgid "Specify an email address to be contacted back:"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:41
-#, kde-format
-msgid "Select Plugin for %1"
+#. i18n: file: likeback/LikeBackDialog.ui:188
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2002
+msgid ""
+"<html>Specifying an email address will allow the developers to ask you for "
+"more information on your report, or to tell you when your feature will be "
+"implemented.<br/>\n"
+"<b>Your email address will not be used for anything else but this "
+"report.</b></html>"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:47
-msgid "Configure Media Device"
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:20
+#. i18n: ectx: property (windowTitle), widget (QDialog, PlaylistLayoutEditDialog)
+#: rc.cpp:2006
+msgid "Playlist Layout Editor"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:70
-msgid "Pre-&connect command:"
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:57
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2009
+msgid "Available Layouts"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:72
-#, c-format
-msgid "Example: mount %d"
-msgstr "Enghraifft: mowntio %d"
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:294
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2015
+msgid "Layout"
+msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:74
-#, c-format
-msgid ""
-"Set a command to be run before connecting to your device (e.g. a mount "
-"command) here.\n"
-"%d is replaced by the device node, %m by the mount point.\n"
-"Empty commands are not executed."
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:300
+#. i18n: ectx: property (text), widget (QCheckBox, inlineControlsChekbox)
+#: rc.cpp:2018
+msgid "Show inline playback controls"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:77
-msgid "Post-&disconnect command:"
+#. i18n: file: playlist/layouts/PlaylistLayoutEditDialog.ui:324
+#. i18n: ectx: property (text), widget (QCheckBox, tooltipsCheckbox)
+#: rc.cpp:2024
+msgid "Show tooltips"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:80
-#, c-format
-msgid "Example: eject %d"
-msgstr "Enghraifft: allfwrw %d"
+#. i18n: file: playlist/PlaylistQueueEditor.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, PlaylistQueueEditor)
+#: rc.cpp:2030
+msgid "Queue Editor"
+msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:81
-#, c-format
-msgid ""
-"Set a command to be run after disconnecting from your device (e.g. an eject "
-"command) here.\n"
-"%d is replaced by the device node, %m by the mount point.\n"
-"Empty commands are not executed."
+#. i18n: file: playlist/PlaylistQueueEditor.ui:32
+#. i18n: ectx: property (toolTip), widget (QPushButton, upButton)
+#: rc.cpp:2033
+msgid "Move Up"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:85
-msgid "&Transcode before transferring to device"
+#. i18n: file: playlist/PlaylistQueueEditor.ui:48
+#. i18n: ectx: property (toolTip), widget (QPushButton, downButton)
+#: rc.cpp:2036
+msgid "Move Down"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:92
-#, kde-format
-msgid "Transcode to preferred format (%1) for device"
+#. i18n: file: playlist/PlaylistQueueEditor.ui:61
+#. i18n: ectx: property (toolTip), widget (QPushButton, dequeueTrackButton)
+#: rc.cpp:2039 playlist/view/PlaylistViewCommon.cpp:115
+msgid "Dequeue Track"
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:94
-msgid "Whenever possible"
-msgstr "Pan yn bosib"
+#. i18n: file: playlist/PlaylistQueueEditor.ui:74
+#. i18n: ectx: property (toolTip), widget (QPushButton, clearButton)
+#: rc.cpp:2042
+msgid "Clear Queue"
+msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:97
-msgid "When necessary"
-msgstr "Pryd mae angen"
+#. i18n: file: amarokconfig.kcfg:13
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2045
+msgid "Whether to display a second, left time label."
+msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:104
-msgid "Remove transcoded files after transfer"
+#. i18n: file: amarokconfig.kcfg:14
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2048
+msgid ""
+"Set this to display a second time label to the left of the seek slider in "
+"the player window."
 msgstr ""
 
-#: dialogs/deviceconfiguredialog.cpp:112 dialogs/deviceconfiguredialog.cpp:113
-msgid "For this feature, a script of type \"Transcode\" has to be running"
+#. i18n: file: amarokconfig.kcfg:18
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2051
+msgid "Whether to display remaining track time in the left time label."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:455
-#, kde-format
-msgid "Importing podcast channel from %1"
+#. i18n: file: amarokconfig.kcfg:19
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2054
+msgid ""
+"Set this to display remaining track time instead of past track time in the "
+"player window."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:459
-msgid "Updating podcast channel"
+#. i18n: file: amarokconfig.kcfg:23
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2057
+msgid "Which tracks or albums to favor in Random Mode"
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:460
-#, kde-format
-msgid "Updating \"%1\""
+#. i18n: file: amarokconfig.kcfg:24
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2060
+msgid ""
+"Tracks or albums with the chosen property will be more likely to be chosen "
+"in Random Mode."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:508 core/podcasts/PodcastReader.cpp:522
-#, kde-format
-msgid "Importing podcast from %1 failed with error:\n"
+#. i18n: file: amarokconfig.kcfg:34
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2063
+msgid "How to progress through tracks in the playlist"
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:512 core/podcasts/PodcastReader.cpp:526
-#, kde-format
-msgid "Updating podcast from %1 failed with error:\n"
+#. i18n: file: amarokconfig.kcfg:35
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2066
+msgid ""
+"Determines how amarok will progress through the tracks in the playlist"
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:513 core/podcasts/PodcastReader.cpp:527
-#, kde-format
-msgid "Updating \"%1\" failed with error:\n"
+#. i18n: file: amarokconfig.kcfg:48
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2069
+msgid "The status of dynamic mode."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:997
-#, kde-format
+#. i18n: file: amarokconfig.kcfg:49
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2072
 msgid ""
-"While parsing %1, a feed was expected but an HTML page was received.\n"
-"Did you enter the correct URL?"
+"If set, dynamic mode will be on, and tracks will be added according to the "
+"dynamic playlist specified."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:1004
-#, kde-format
-msgid "Feed has an unknown type: %1"
+#. i18n: file: amarokconfig.kcfg:53
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2075
+msgid "Duplicate tracks in dynamic mode."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:1013
-#, kde-format
-msgid "%1 is not an RSS version 2.0 feed."
+#. i18n: file: amarokconfig.kcfg:54
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2078
+msgid ""
+"If set, tracks added in the dynamic mode are allowed to have duplicates."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:1043
-#, kde-format
-msgid "%1 is not a valid RSS version 1.0 feed."
+#. i18n: file: amarokconfig.kcfg:58
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2081
+msgid "Previous tracks count."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:1051
-#, kde-format
-msgid "%1 is not a valid Atom feed."
+#. i18n: file: amarokconfig.kcfg:59
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2084
+msgid "Number of tracks to leave in the playlist before the active track."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:1134
-msgid "Alternative Enclosures:"
+#. i18n: file: amarokconfig.kcfg:63
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2087
+msgid "Upcoming tracks count."
 msgstr ""
 
-#: core/podcasts/PodcastReader.cpp:1144
-msgid "unknown type"
+#. i18n: file: amarokconfig.kcfg:64
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2090
+msgid "Number of tracks to load into the playlist after the active track."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingAlacFormat.cpp:34
-msgid "Apple Lossless"
+#. i18n: file: amarokconfig.kcfg:68
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2093
+msgid "Whether to show icon in system tray"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingAlacFormat.cpp:42
-msgctxt ""
-"Feel free to redirect the english Wikipedia link to a local version, if it "
-"exists."
-msgid ""
-"<a href=http://en.wikipedia.org/wiki/Apple_Lossless>Apple Lossless</a> "
-"(ALAC) is an audio codec for lossless compression of digital "
-"music.<br>Recommended only for Apple music players and players that do not "
-"support FLAC."
+#. i18n: file: amarokconfig.kcfg:69
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2096
+msgid "Enable/Disable tray icon for Amarok."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingFlacFormat.cpp:31
-msgid ""
-"The <a "
-"href=http://flac.sourceforge.net/documentation_tools_flac.html>compression "
-"level</a> is an integer value between 0 and 8 that represents the tradeoff "
-"between file size and compression speed while encoding with "
-"<b>FLAC</b>.<br/> Setting the compression level to <b>0</b> yields the "
-"shortest compression time but generates a comparably big file<br/>On the "
-"other hand, a compression level of <b>8</b> makes compression quite slow but "
-"produces the smallest file.<br/>Note that since FLAC is by definition a "
-"lossless codec, the audio quality of the output is exactly the same "
-"regardless of the compression level.<br/>Also, levels above <b>5</b> "
-"dramatically increase compression time but create an only slightly smaller "
-"file, and are not recommended."
+#. i18n: file: amarokconfig.kcfg:73
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2099
+msgid "Whether to hide the context view."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingFlacFormat.cpp:42
-msgid "Compression level"
+#. i18n: file: amarokconfig.kcfg:74
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2102
+msgid "Enable/Disable context view in Amarok."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingFlacFormat.cpp:43
-msgid "Faster compression"
+#. i18n: file: amarokconfig.kcfg:78
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2105
+msgid "Whether to animate the systray icon"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingFlacFormat.cpp:43
-#: core/transcoding/formats/TranscodingMp3Format.cpp:57
-#: core/transcoding/formats/TranscodingAacFormat.cpp:60
-#: core/transcoding/formats/TranscodingVorbisFormat.cpp:61
-#: core/transcoding/formats/TranscodingWmaFormat.cpp:61
-msgid "Smaller file"
+#. i18n: file: amarokconfig.kcfg:79
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2108
+msgid "Enable/Disable tray icon animation."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingFlacFormat.cpp:50
-msgid "FLAC"
+#. i18n: file: amarokconfig.kcfg:83
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2111
+msgid "Delay between tracks, in milliseconds"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingFlacFormat.cpp:58
-msgctxt ""
-"Feel free to redirect the english Wikipedia link to a local version, if it "
-"exists."
-msgid ""
-"<a href=http://en.wikipedia.org/wiki/Free_Lossless_Audio_Codec>Free Lossless "
-"Audio Codec</a> (FLAC) is an open and royalty-free codec for lossless "
-"compression of digital music.<br>If you wish to store your music without "
-"compromising on audio quality, FLAC is an excellent choice."
+#. i18n: file: amarokconfig.kcfg:84
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2114
+msgid "Delay between tracks, in milliseconds."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingMp3Format.cpp:29
-msgid ""
-"The bitrate is a measure of the quantity of data used to represent a second "
-"of the audio track.<br>The <b>MP3</b> encoder used by Amarok supports a <a "
-"href=http://en.wikipedia.org/wiki/MP3#VBR>variable bitrate (VBR)</a> "
-"setting, which means that the bitrate value fluctuates along the track based "
-"on the complexity of the audio content. More complex intervals of data are "
-"encoded with a higher bitrate than less complex ones; this approach yields "
-"overall better quality and a smaller file than having a constant bitrate "
-"throughout the track.<br>For this reason, the bitrate measure in this slider "
-"is just an estimate of the average bitrate of the encoded "
-"track.<br><b>160kb/s</b> is a good choice for music listening on a portable "
-"player.<br/>Anything below <b>120kb/s</b> might be unsatisfactory for music "
-"and anything above <b>205kb/s</b> is probably overkill."
+#. i18n: file: amarokconfig.kcfg:88
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2117
+msgid "Number of undo levels in playlist"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingMp3Format.cpp:56
-#: core/transcoding/formats/TranscodingAacFormat.cpp:59
-msgid "Expected average bitrate for variable bitrate encoding"
+#. i18n: file: amarokconfig.kcfg:89
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2120
+msgid "The number of undo levels in the playlist."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingMp3Format.cpp:57
-#: core/transcoding/formats/TranscodingAacFormat.cpp:60
-#: core/transcoding/formats/TranscodingVorbisFormat.cpp:61
-#: core/transcoding/formats/TranscodingWmaFormat.cpp:61
-msgid "Better sound quality"
+#. i18n: file: amarokconfig.kcfg:93
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2123
+msgid "Whether a splash-screen should be displayed on startup"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingMp3Format.cpp:64
-msgid "MP3"
+#. i18n: file: amarokconfig.kcfg:94
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2126
+msgid "Enable/Disable splashscreen during Amarok startup."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingMp3Format.cpp:72
-msgctxt ""
-"Feel free to redirect the english Wikipedia link to a local version, if it "
-"exists."
-msgid ""
-"<a href=http://en.wikipedia.org/wiki/MP3>MPEG Audio Layer 3</a> (MP3) is a "
-"patented digital audio codec using a form of lossy data compression.<br>In "
-"spite of its shortcomings, it is a common format for consumer audio storage, "
-"and is widely supported on portable music players."
+#. i18n: file: amarokconfig.kcfg:98
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2129
+msgid "Whether playlists store relative path"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingAacFormat.cpp:31
+#. i18n: file: amarokconfig.kcfg:99
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2132
 msgid ""
-"The bitrate is a measure of the quantity of data used to represent a second "
-"of the audio track.<br>The <b>AAC</b> encoder used by Amarok supports a <a "
-"href=http://en.wikipedia.org/wiki/Variable_bitrate#Advantages_and_disadvantag"
-"es_of_VBR>variable bitrate (VBR)</a> setting, which means that the bitrate "
-"value fluctuates along the track based on the complexity of the audio "
-"content. More complex intervals of data are encoded with a higher bitrate "
-"than less complex ones; this approach yields overall better quality and a "
-"smaller file than having a constant bitrate throughout the track.<br>For "
-"this reason, the bitrate measure in this slider is just an estimate of the "
-"<a href=http://www.ffmpeg.org/faq.html#SEC21>average bitrate</a> of the "
-"encoded track.<br><b>150kb/s</b> is a good choice for music listening on a "
-"portable player.<br/>Anything below <b>120kb/s</b> might be unsatisfactory "
-"for music and anything above <b>200kb/s</b> is probably overkill."
+"If set, Amarok's manually saved playlists will contain a relative path to "
+"each track, not an absolute path."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingAacFormat.cpp:67
-msgid "AAC (Non-Free)"
+#. i18n: file: amarokconfig.kcfg:103
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2135
+msgid "Filename of the external web browser to be invoked by Amarok."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingAacFormat.cpp:75
-msgctxt ""
-"Feel free to redirect the english Wikipedia link to a local version, if it "
-"exists."
-msgid ""
-"<a href=http://en.wikipedia.org/wiki/Advanced_Audio_Coding>Advanced Audio "
-"Coding</a> (AAC) is a patented lossy codec for digital audio.<br>AAC "
-"generally achieves better sound quality than MP3 at similar bit rates. It is "
-"a reasonable choice for the iPod and some other portable music players. Non-"
-"Free implementation."
+#. i18n: file: amarokconfig.kcfg:107
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2138
+msgid "Whether to automatically attempt to fetch cover art as needed"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingVorbisFormat.cpp:29
-msgid ""
-"The bitrate is a measure of the quantity of data used to represent a second "
-"of the audio track.<br>The <b>Vorbis</b> encoder used by Amarok supports a "
-"<a href=http://en.wikipedia.org/wiki/Vorbis#Technical_details>variable "
-"bitrate (VBR)</a> setting, which means that the bitrate value fluctuates "
-"along the track based on the complexity of the audio content. More complex "
-"intervals of data are encoded with a higher bitrate than less complex ones; "
-"this approach yields overall better quality and a smaller file than having a "
-"constant bitrate throughout the track.<br>The Vorbis encoder uses a quality "
-"rating \"-q parameter\" between -1 and 10 to define a certain expected audio "
-"quality level. The bitrate measure in this slider is just a rough estimate "
-"(provided by Vorbis) of the average bitrate of the encoded track given a q "
-"value. In fact, with newer and more efficient Vorbis versions the actual "
-"bitrate is even lower.<br><b>-q5</b> is a good choice for music listening on "
-"a portable player.<br/>Anything below <b>-q3</b> might be unsatisfactory for "
-"music and anything above <b>-q8</b> is probably overkill."
+#. i18n: file: amarokconfig.kcfg:111
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2141
+msgid "Whether to show background images in the browser pane"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingVorbisFormat.cpp:60
-msgid "Quality rating for variable bitrate encoding"
+#. i18n: file: amarokconfig.kcfg:115
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2144
+msgid ""
+"Automatically scroll the playlist to make the currently playing song visible"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingVorbisFormat.cpp:76
-msgctxt ""
-"Feel free to redirect the english Wikipedia link to a local version, if it "
-"exists."
-msgid ""
-"<a href=http://en.wikipedia.org/wiki/Vorbis>Ogg Vorbis</a> is an open and "
-"royalty-free audio codec for lossy audio compression.<br>It produces smaller "
-"files than MP3 at equivalent or higher quality. Ogg Vorbis is an all-around "
-"excellent choice, especially for portable music players that support it."
+#. i18n: file: amarokconfig.kcfg:119
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2147
+msgid "Show Album art in the Collection Browser"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingWmaFormat.cpp:29
-msgid ""
-"The bitrate is a measure of the quantity of data used to represent a second "
-"of the audio track.<br>Due to the limitations of the proprietary <b>WMA</b> "
-"format and the difficulty of reverse-engineering a proprietary encoder, the "
-"WMA encoder used by Amarok sets a <a "
-"href=http://en.wikipedia.org/wiki/Windows_Media_Audio#Windows_Media_Audio>con"
-"stant bitrate (CBR)</a> setting.<br>For this reason, the bitrate measure in "
-"this slider is a pretty accurate estimate of the bitrate of the encoded "
-"track.<br><b>136kb/s</b> is a good choice for music listening on a portable "
-"player.<br/>Anything below <b>112kb/s</b> might be unsatisfactory for music "
-"and anything above <b>182kb/s</b> is probably overkill."
+#. i18n: file: amarokconfig.kcfg:123
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2150
+msgid "Show the Context View"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingWmaFormat.cpp:60
-msgid "Bitrate target for constant bitrate encoding"
+#. i18n: file: amarokconfig.kcfg:127
+#. i18n: ectx: label, entry, group (General Options)
+#: rc.cpp:2153
+msgid "Play the first run jingle"
 msgstr ""
 
-#: core/transcoding/formats/TranscodingWmaFormat.cpp:68
-msgid "Windows Media Audio"
+#. i18n: file: amarokconfig.kcfg:132
+#. i18n: ectx: whatsthis, entry, group (General Options)
+#: rc.cpp:2159
+msgid "If set, context applets will collapse using animations."
 msgstr ""
 
-#: core/transcoding/formats/TranscodingWmaFormat.cpp:76
-msgctxt ""
-"Feel free to redirect the english Wikipedia link to a local version, if it "
-"exists."
-msgid ""
-"<a href=http://en.wikipedia.org/wiki/Windows_Media_Audio>Windows Media "
-"Audio</a> (WMA) is a proprietary codec developed by Microsoft for lossy "
-"audio compression.<br>Recommended only for portable music players that do "
-"not support Ogg Vorbis."
+#. i18n: file: amarokconfig.kcfg:139
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2162
+msgid "Whether organize files will overwrite existing files."
 msgstr ""
 
-#: core/meta/Meta.cpp:509 context/applets/currenttrack/CurrentTrack.cpp:816
-msgid "Unknown Composer"
+#. i18n: file: amarokconfig.kcfg:140
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2165
+msgid "If set, Organize files will overwrite any existing destination."
 msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:399
-msgctxt ""
-"the time format for a time length when the time is below 1 hour see QTime "
-"documentation."
-msgid "m:ss"
+#. i18n: file: amarokconfig.kcfg:144
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2168
+msgid ""
+"Whether organize files will group directories according to their filetype."
 msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:406
-#, kde-format
-msgctxt "number of days with spacing for the pretty time"
-msgid "%1 day, "
-msgid_plural "%1 days, "
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:145
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2171
+msgid ""
+"If set, Organize files will group directories containing the same filetype."
+msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:407
-msgctxt ""
-"the time format for a time length when the time is 1 hour or above see QTime "
-"documentation."
-msgid "h:mm:ss"
+#. i18n: file: amarokconfig.kcfg:149
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2174
+msgid ""
+"Whether organize files will group artists whose names start with the same "
+"character."
 msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:421
-#, kde-format
-msgctxt "number of years for the pretty time"
-msgid "%1 year"
-msgid_plural "%1 years"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:150
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2177
+msgid ""
+"If set, Organize files will group artists whose names start with the same "
+"character."
+msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:423
-#, kde-format
-msgctxt "number of months for the pretty time"
-msgid "%1 month"
-msgid_plural "%1 months"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:154
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2180
+msgid "Whether organize files will ignore The in artist names."
+msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:425
-#, kde-format
-msgctxt "number of days for the pretty time"
-msgid "%1 day"
-msgid_plural "%1 days"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:155
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2183
+msgid "If set, Organize files will ignore The in artist names."
+msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:427
-#, kde-format
-msgctxt "number of hours for the pretty time"
-msgid "%1 hour"
-msgid_plural "%1 hours"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:159
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2186
+msgid ""
+"Whether organize files will replace spaces in filenames with underscores."
+msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:429
-#, kde-format
-msgctxt "number of minutes for the pretty time"
-msgid "%1 minute"
-msgid_plural "%1 minutes"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:160
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2189
+msgid ""
+"If set, Organize files will replace spaces in filenames with underscores."
+msgstr ""
 
-#: core/meta/support/MetaUtility.cpp:431
-#, kde-format
-msgctxt "number of seconds for the pretty time"
-msgid "%1 second"
-msgid_plural "%1 seconds"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: amarokconfig.kcfg:164
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2192
+msgid "Whether organize files will use cover art as folder icons."
+msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:104
-msgctxt ""
-"The field name in case nothing specific is selected e.g. in the automatic "
-"playlist generator"
-msgid "anything"
+#. i18n: file: amarokconfig.kcfg:165
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2195
+msgid "If set, Organize files will use cover art as folder icons."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:105
-msgctxt "The name of the file this track is stored in"
-msgid "File Name"
+#. i18n: file: amarokconfig.kcfg:169
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2198
+msgid "Collection folder path destination for Organize files."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:107
-msgid "Artist Name"
+#. i18n: file: amarokconfig.kcfg:170
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2201
+msgid "The path of the collection folder destination for Organize files."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:108
-msgid "Album Name"
+#. i18n: file: amarokconfig.kcfg:174
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2204
+msgid ""
+"Whether organize files will rename files in a manner compatible with vfat "
+"filesystems."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:114 playlist/PlaylistModel.cpp:907
-msgid "Disc Number"
+#. i18n: file: amarokconfig.kcfg:175
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2207
+msgid ""
+"If set, Organize files will replace characters that are not compatible with "
+"vfat filesystems (such as ':', '*' and '?')."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:115
-msgid "Bpm"
+#. i18n: file: amarokconfig.kcfg:179
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2210
+msgid ""
+"Whether organize files will rename files such that they only contain 7-bit "
+"ASCII characters."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:117
-msgid "Bit Rate"
+#. i18n: file: amarokconfig.kcfg:180
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2213
+msgid ""
+"If set, Organize files will replace characters that are not compatible with "
+"the 7-bit ASCII character set."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:118 playlist/PlaylistModel.cpp:916
-msgid "Sample Rate"
-msgstr "Cyflymdra Enghreifftio"
+#. i18n: file: amarokconfig.kcfg:184
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2216
+msgid "Whether organize files will use a custom file naming scheme."
+msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:119 playlist/PlaylistModel.cpp:922
-msgid "File Size"
-msgstr "Maint Ffeil"
+#. i18n: file: amarokconfig.kcfg:185
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2219
+msgid ""
+"If set, Organize files will rename files according to a custom format string."
+msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:120
-msgid "Format"
-msgstr "Fformat"
+#. i18n: file: amarokconfig.kcfg:189
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2222
+msgid "Format string for Organize files, if a custom naming scheme is used."
+msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:121
-msgid "Added to Collection"
+#. i18n: file: amarokconfig.kcfg:190
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2225
+msgid ""
+"If the custom filename scheme is enabled, then Organize files will rename "
+"files according to this format string."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:124
-msgid "First Played"
+#. i18n: file: amarokconfig.kcfg:194
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2228
+msgid "Regular expression that is to be replaced."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:125
-#: context/applets/currenttrack/CurrentTrack.cpp:450
-msgid "Last Played"
-msgstr "Chwaraewyd Diwethaf"
+#. i18n: file: amarokconfig.kcfg:195
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2231
+msgid ""
+"Organize files will replace substrings matching this regular expression."
+msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:126
-msgid "Playcount"
+#. i18n: file: amarokconfig.kcfg:199
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2234
+msgid "Replacing string."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:127
-msgid "Unique Id"
+#. i18n: file: amarokconfig.kcfg:200
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2237
+msgid "Organize files will replace matching substrings with this string."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:129
-msgid "Track Gain"
+#. i18n: file: amarokconfig.kcfg:204
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2240
+msgid "Basic or Advanced Mode"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:130
-msgid "Track Gain Peak"
+#. i18n: file: amarokconfig.kcfg:205
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2243
+msgid ""
+"In basic mode graphical drag/droppable tokens are used to create a filename "
+"scheme, in advanced mode the images are replaced with text."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:131
-msgid "Album Gain"
+#. i18n: file: amarokconfig.kcfg:209
+#. i18n: ectx: label, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2246
+msgid "Format Presets"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:132
-msgid "Album Gain Peak"
+#. i18n: file: amarokconfig.kcfg:210
+#. i18n: ectx: whatsthis, entry, group (OrganizeCollectionDialog)
+#: rc.cpp:2249
+msgid "A list of preset formats (token schemas)."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:134
-msgid "Album Artist Name"
+#. i18n: file: amarokconfig.kcfg:217
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2252
+msgid "Master volume"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:136
-msgid "Last Modified"
+#. i18n: file: amarokconfig.kcfg:218
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2255
+msgid "The Amarok master volume, a value between 0 and 100."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:147
-msgctxt ""
-"The field name in case nothing specific is selected e.g. in the automatic "
-"playlist generator. Use a one word translation."
-msgid "anything"
+#. i18n: file: amarokconfig.kcfg:224
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2258
+msgid "Mute state"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:148
-msgctxt ""
-"One word translation used in the collection filter. The name of the file "
-"this track is stored in"
-msgid "filename"
+#. i18n: file: amarokconfig.kcfg:225
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2261
+msgid "Mute/Unmute sound."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:149
-msgctxt "One word translation used in the collection filter"
-msgid "title"
+#. i18n: file: amarokconfig.kcfg:229
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2264
+msgid "Whether to crossfade between tracks"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:150
-msgctxt "One word translation used in the collection filter"
-msgid "artist"
+#. i18n: file: amarokconfig.kcfg:230
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2267
+msgid "Enable/Disable crossfading between track changes."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:151
-msgctxt "One word translation used in the collection filter"
-msgid "album"
+#. i18n: file: amarokconfig.kcfg:234
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2270
+msgid "Length of crossfade, in milliseconds"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:152
-msgctxt "One word translation used in the collection filter"
-msgid "genre"
+#. i18n: file: amarokconfig.kcfg:235
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2273
+msgid "The length of the crossfade between tracks in milliseconds."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:153
-msgctxt "One word translation used in the collection filter"
-msgid "composer"
+#. i18n: file: amarokconfig.kcfg:240
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2276
+msgid "When to Crossfade"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:154
-msgctxt "One word translation used in the collection filter"
-msgid "year"
+#. i18n: file: amarokconfig.kcfg:241
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2279
+msgid ""
+"Determines whether to crossfade always, or on automatic/manual track changes "
+"only."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:155
-msgctxt "One word translation used in the collection filter"
-msgid "comment"
+#. i18n: file: amarokconfig.kcfg:245
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2282
+msgid "Whether to fade out tracks when pressing stop."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:156
-msgctxt "One word translation used in the collection filter"
-msgid "tracknumber"
+#. i18n: file: amarokconfig.kcfg:246
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2285
+msgid "Enable/Disable fadeout."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:157
-msgctxt "One word translation used in the collection filter"
-msgid "discnumber"
+#. i18n: file: amarokconfig.kcfg:250
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2288
+msgid "Length of fadeout, in milliseconds"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:158
-msgctxt "One word translation used in the collection filter"
-msgid "bpm"
+#. i18n: file: amarokconfig.kcfg:251
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2291
+msgid "The length of the fadeout in milliseconds."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:159
-msgctxt "One word translation used in the collection filter"
-msgid "length"
+#. i18n: file: amarokconfig.kcfg:256
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2294
+msgid "Whether to fade out when exiting the program."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:160
-msgctxt "One word translation used in the collection filter"
-msgid "bitrate"
+#. i18n: file: amarokconfig.kcfg:260
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2297
+msgid "Equalizer mode - 0 = off, 1 to n = preset no"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:161
-msgctxt "One word translation used in the collection filter"
-msgid "samplerate"
+#. i18n: file: amarokconfig.kcfg:261
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2300
+msgid "When enabled, an equalizer plugin filters the audio stream."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:162
-msgctxt "One word translation used in the collection filter"
-msgid "filesize"
+#. i18n: file: amarokconfig.kcfg:265
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2303
+msgid "11 Equalizer gains include pre-amp, range -100..100, 0 is normal."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:163
-msgctxt "One word translation used in the collection filter"
-msgid "format"
+#. i18n: file: amarokconfig.kcfg:269
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2306
+msgid "List with user equalizer preset names"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:164
-msgctxt "One word translation used in the collection filter"
-msgid "added"
+#. i18n: file: amarokconfig.kcfg:272
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2309
+msgid "List with user presets values"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:165
-msgctxt "One word translation used in the collection filter"
-msgid "score"
+#. i18n: file: amarokconfig.kcfg:276
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2312
+msgid "The mode for adjusting playback volume."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:166
-msgctxt "One word translation used in the collection filter"
-msgid "rating"
+#. i18n: file: amarokconfig.kcfg:277
+#. i18n: ectx: whatsthis, entry, group (Playback)
+#: rc.cpp:2315
+msgid ""
+"Whether to adjust the volume of tracks to make them sound the same volume, "
+"and if so whether to make the adjustments per-track or per-album."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:167
-msgctxt ""
-"One word translation used in the collection filter. First played time / "
-"access date"
-msgid "firstplay"
+#. i18n: file: amarokconfig.kcfg:280
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2318
+msgid "Disable Replay Gain"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:168
-msgctxt ""
-"One word translation used in the collection filter. Last played time / "
-"access date"
-msgid "lastplay"
+#. i18n: file: amarokconfig.kcfg:283
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2321
+msgid "Make each track the same volume"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:169
-msgctxt "One word translation used in the collection filter"
-msgid "playcount"
+#. i18n: file: amarokconfig.kcfg:286
+#. i18n: ectx: label, entry, group (Playback)
+#: rc.cpp:2324
+msgid "Make each album the same volume"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:170
-msgctxt "One word translation used in the collection filter"
-msgid "uniqueid"
+#. i18n: file: amarokconfig.kcfg:295
+#. i18n: ectx: label, entry, group (Cover Manager)
+#: rc.cpp:2327
+msgid "Amazon locale for cover retrieval"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:172
-msgctxt "One word translation used in the collection filter"
-msgid "trackgain"
+#. i18n: file: amarokconfig.kcfg:296
+#. i18n: ectx: whatsthis, entry, group (Cover Manager)
+#: rc.cpp:2330
+msgid "Determines which Amazon server cover images should be retrieved from."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:173
-msgctxt "One word translation used in the collection filter"
-msgid "trackgainpeak"
+#. i18n: file: amarokconfig.kcfg:303
+#. i18n: ectx: label, entry, group (Wikipedia)
+#: rc.cpp:2333
+msgid "Wikipedia locale for information retrieval"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:174
-msgctxt "One word translation used in the collection filter"
-msgid "albumgain"
+#. i18n: file: amarokconfig.kcfg:304
+#. i18n: ectx: whatsthis, entry, group (Wikipedia)
+#: rc.cpp:2336
+msgid ""
+"Determines in which language the information is retrieved from Wikipedia."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:175
-msgctxt "One word translation used in the collection filter"
-msgid "albumgainpeak"
+#. i18n: file: amarokconfig.kcfg:311
+#. i18n: ectx: label, entry, group (KNotify)
+#: rc.cpp:2339
+msgid "Use KNotify support"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:177
-msgctxt "One word translation used in the collection filter"
-msgid "albumartist"
+#. i18n: file: amarokconfig.kcfg:318
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2342
+msgid "Use On-Screen Display"
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:178
-msgctxt "One word translation used in the collection filter"
-msgid "label"
+#. i18n: file: amarokconfig.kcfg:319
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2345
+msgid "Enable/Disable the On-Screen Display."
 msgstr ""
 
-#: core/meta/support/MetaConstants.cpp:179
-msgctxt "One word translation used in the collection filter"
-msgid "modified"
+#. i18n: file: amarokconfig.kcfg:323
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2348 configdialog/dialogs/NotificationsConfig.cpp:40
+msgid "Use Growl for notifications"
 msgstr ""
 
-#: core/support/Amarok.cpp:46 core/support/Amarok.cpp:91
-#: playlist/PlaylistModel.cpp:406
-msgctxt "The amount of time since last played"
-msgid "Never"
+#. i18n: file: amarokconfig.kcfg:324
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2351
+msgid "Enable/Disable use of Growl for notifications."
 msgstr ""
 
-#: core/support/Amarok.cpp:54
-msgctxt "When this track was last played"
-msgid "Unknown"
+#. i18n: file: amarokconfig.kcfg:328
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2354
+msgid "Display the same information in the OSD as in the playlist columns."
 msgstr ""
 
-#: core/support/Amarok.cpp:59
-#, kde-format
-msgctxt "monthname year"
-msgid "%1 %2"
-msgstr "%1 %2"
-
-#: core/support/Amarok.cpp:66
-#, kde-format
-msgid "One week ago"
-msgid_plural "%1 weeks ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: core/support/Amarok.cpp:72
-msgid "Yesterday"
-msgstr "Ddoe"
-
-#: core/support/Amarok.cpp:73
-#, kde-format
-msgid "One day ago"
-msgid_plural "%1 days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: core/support/Amarok.cpp:76
-#, kde-format
-msgid "One hour ago"
-msgid_plural "%1 hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: core/support/Amarok.cpp:82
-#, kde-format
-msgid "One minute ago"
-msgid_plural "%1 minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: core/support/Amarok.cpp:83
-msgid "Within the last minute"
-msgstr "O fewn y munud diwethaf"
-
-#: core/support/Amarok.cpp:85
-msgid "The future"
-msgstr "Y dyfodol"
-
-#: core/support/Amarok.cpp:101
-msgctxt "The amount of time since last played"
-msgid "0"
+#. i18n: file: amarokconfig.kcfg:329
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2357
+msgid ""
+"If enabled, the OSD will display the same information and in the same order "
+"as the columns in the playlist."
 msgstr ""
 
-#: core/support/Amarok.cpp:110
-#, kde-format
-msgctxt "number of months ago"
-msgid "%1M"
+#. i18n: file: amarokconfig.kcfg:333
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2360
+msgid "The OSD text to show"
 msgstr ""
 
-#: core/support/Amarok.cpp:114
-#, kde-format
-msgctxt "w for weeks"
-msgid "%1w"
+#. i18n: file: amarokconfig.kcfg:334
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2363
+msgid "Customize the OSD display text."
 msgstr ""
 
-#: core/support/Amarok.cpp:117
-msgctxt "When this track was last played"
-msgid "Tomorrow"
+#. i18n: file: amarokconfig.kcfg:338
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2366
+msgid "Translucency Toggle"
 msgstr ""
 
-#: core/support/Amarok.cpp:123
-#, kde-format, no-c-format
-msgctxt "d for days"
-msgid "%1d"
+#. i18n: file: amarokconfig.kcfg:339
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2369
+msgid "Make the background of the OSD translucent."
 msgstr ""
 
-#: core/support/Amarok.cpp:126
-#, kde-format
-msgctxt "h for hours"
-msgid "%1h"
+#. i18n: file: amarokconfig.kcfg:343
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2372
+msgid "Whether to use custom colors for the OSD"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionTreeItemDelegate.cpp:181
-#, kde-format
-msgid "%1% used"
+#. i18n: file: amarokconfig.kcfg:344
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2375
+msgid "You can use custom colors for the OSD if you set this true."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:145
-msgid ""
-"This is where you will find your local music, as well as music from mobile "
-"audio players and CDs."
+#. i18n: file: amarokconfig.kcfg:348
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2378
+msgid "Font color for OSD"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:154
-msgid "Search collection"
+#. i18n: file: amarokconfig.kcfg:349
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2381
+msgid ""
+"The color of the OSD text. The color is specified in RGB, a comma-separated "
+"list containing three integers between 0 and 255."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:187
-msgctxt "@item:inlistbox Collection widget filter preset"
-msgid "Added This Hour"
+#. i18n: file: amarokconfig.kcfg:353
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2384
+msgid "Font scaling for OSD"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:189
-msgctxt "@item:inlistbox Collection widget filter preset"
-msgid "Added Today"
+#. i18n: file: amarokconfig.kcfg:354
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2387
+msgid ""
+"The scaling multiplier for the OSD font, in percent-of-normal. 100 is "
+"&ldquo;normal size&rdquo;."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:191
-msgctxt "@item:inlistbox Collection widget filter preset"
-msgid "Added This Week"
+#. i18n: file: amarokconfig.kcfg:360
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2390
+msgid "How many milliseconds the text should be displayed for"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:193
-msgctxt "@item:inlistbox Collection widget filter preset"
-msgid "Added This Month"
+#. i18n: file: amarokconfig.kcfg:361
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2393
+msgid ""
+"The time in milliseconds to show the OSD. A value of 0 means never hide. The "
+"default value is 5000 ms."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:203
-msgid "Album / Artist"
+#. i18n: file: amarokconfig.kcfg:366
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2396
+msgid "Y position offset"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:218
-msgid "First Level"
+#. i18n: file: amarokconfig.kcfg:367
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2399
+msgid ""
+"The Y position of the OSD relative to the chosen screen and OSD alignment. "
+"If Top alignment is chosen the Y offset is the space between the upper part "
+"of the OSD and the top of the screen. If Bottom alignment is chosen the Y "
+"offset is the space between the bottom part of the OSD and the bottom of the "
+"screen."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:219
-msgid "Second Level"
+#. i18n: file: amarokconfig.kcfg:373
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2402
+msgid "OSD screen"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:220
-msgid "Third Level"
+#. i18n: file: amarokconfig.kcfg:374
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2405
+msgid ""
+"The screen that should display the OSD. For single-headed environments this "
+"setting should be 0."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:272
-msgid "Show Years"
+#. i18n: file: amarokconfig.kcfg:378
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2408
+msgid "Whether the album cover should be shown"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:277
-msgctxt "@action:inmenu"
-msgid "Show Track Numbers"
+#. i18n: file: amarokconfig.kcfg:379
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2411
+msgid "If enabled, shows the album cover in the OSD."
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:282
-msgid "Show Cover Art"
+#. i18n: file: amarokconfig.kcfg:383
+#. i18n: ectx: label, entry, group (OSD)
+#: rc.cpp:2414
+msgid "Align OSD to"
 msgstr ""
 
-#: browsers/collectionbrowser/CollectionWidget.cpp:290
-#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:85
-msgid "Merged View"
+#. i18n: file: amarokconfig.kcfg:384
+#. i18n: ectx: whatsthis, entry, group (OSD)
+#: rc.cpp:2417
+msgid ""
+"The relative position of the OSD. Possible choices are Left, Middle, Right "
+"and Center."
 msgstr ""
 
-#: browsers/BrowserDock.cpp:36
-msgid "&Media Sources"
+#. i18n: file: amarokconfig.kcfg:403
+#. i18n: ectx: label, entry, group (Session)
+#: rc.cpp:2426
+msgid "Resume playback of last played track on startup"
 msgstr ""
 
-#: browsers/BrowserDock.cpp:81
-msgid "Previous Browser"
+#. i18n: file: amarokconfig.kcfg:404
+#. i18n: ectx: whatsthis, entry, group (Session)
+#: rc.cpp:2429
+msgid "If set, Amarok resumes playback of the last played track on startup."
 msgstr ""
 
-#: browsers/BrowserBreadcrumbWidget.cpp:62
-msgid "Click For Location Navigation"
+#. i18n: file: amarokconfig.kcfg:408
+#. i18n: ectx: label, entry, group (Session)
+#: rc.cpp:2432
+msgid "Track URL to resume upon startup"
 msgstr ""
 
-#: browsers/BrowserCategoryList.cpp:52
-msgid "Filter Music Sources"
+#. i18n: file: amarokconfig.kcfg:409
+#. i18n: ectx: whatsthis, entry, group (Session)
+#: rc.cpp:2435
+msgid "Internal: URL of the track to resume on startup."
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:80
-msgid "Visible Sources"
+#. i18n: file: amarokconfig.kcfg:412
+#. i18n: ectx: label, entry, group (Session)
+#: rc.cpp:2438
+msgid "Time to resume at, in milliseconds"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:183
-msgid "Folders are only shown in <b>merged view</b>."
+#. i18n: file: amarokconfig.kcfg:413
+#. i18n: ectx: whatsthis, entry, group (Session)
+#: rc.cpp:2441
+msgid "Internal: Playback position in the track to resume on startup."
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistBrowserCategory.cpp:278
-msgctxt "default name for new folder"
-msgid "New Folder"
+#. i18n: file: amarokconfig.kcfg:416
+#. i18n: ectx: label, entry, group (Session)
+#: rc.cpp:2444
+msgid ""
+"List of bools describing which browsers are visible, from top to bottom."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:231
-msgid "&Rename playlist"
+#. i18n: file: amarokconfig.kcfg:419
+#. i18n: ectx: label, entry, group (Session)
+#: rc.cpp:2447
+msgid "Track playing on last exit. Value is -1 if no track was playing."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:235
-msgid "&Add new Bias"
+#. i18n: file: amarokconfig.kcfg:423
+#. i18n: ectx: label, entry, group (Session)
+#: rc.cpp:2450
+msgid "Number (from the top) of the last active browser."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:239
-msgid "&Clone Playlist"
+#. i18n: file: amarokconfig.kcfg:429
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2453
+msgid "Whether Collections folders are scanned recursively"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:243
-msgid "&Delete playlist"
+#. i18n: file: amarokconfig.kcfg:433
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2456
+msgid "Whether Collection folders are rescanned on change"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:257
-msgid "&Edit bias..."
+#. i18n: file: amarokconfig.kcfg:437
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2459
+msgid "Whether meta data changes are written back"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:261
-msgid "&Clone bias"
+#. i18n: file: amarokconfig.kcfg:441
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2462
+msgid "Whether changes to the track statistics are written back"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:271
-msgid "&Delete bias"
+#. i18n: file: amarokconfig.kcfg:445
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2465
+msgid "Whether changes to the album cover are written back"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicView.cpp:278
-msgid "&Add new bias"
+#. i18n: file: amarokconfig.kcfg:449
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2468
+msgid "List of folders in the Collection"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistBrowser.cpp:45
-msgid ""
-"The playlist browser contains your list of imported and saved playlists. It "
-"is also where you can specify powerful dynamic playlists and manage your "
-"podcast subscriptions and episodes."
+#. i18n: file: amarokconfig.kcfg:452
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2471
+msgid "Whether track numbers are shown in the collection browser."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:52
-msgid "Dynamic Playlists"
-msgstr "Rhestri Chwarae Deinamig"
-
-#: browsers/playlistbrowser/DynamicCategory.cpp:53
-msgid "Dynamically updating parameter based playlists"
+#. i18n: file: amarokconfig.kcfg:456
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2474
+msgid "Whether years are shown in the collection browser."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:56
+#. i18n: file: amarokconfig.kcfg:460
+#. i18n: ectx: label, entry, group (Collection)
+#: rc.cpp:2477
 msgid ""
-"With a dynamic playlist, Amarok becomes your own personal dj, automatically "
-"selecting tracks for you, based on a number of parameters that you select."
+"Whether to use Mozilla's Character Set Detector to try to guess ID3 tag "
+"encodings."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:71
-msgid "Previous:"
+#. i18n: file: amarokconfig.kcfg:467
+#. i18n: ectx: label, entry, group (Scrobbler)
+#: rc.cpp:2480
+msgid "Submit played songs"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:76
-msgid "Number of previous tracks to remain in the playlist."
+#. i18n: file: amarokconfig.kcfg:468
+#. i18n: ectx: whatsthis, entry, group (Scrobbler)
+#: rc.cpp:2483
+msgid "Whether played songs are submitted to Audioscrobbler"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:80
-msgid "Upcoming:"
+#. i18n: file: amarokconfig.kcfg:472
+#. i18n: ectx: label, entry, group (Scrobbler)
+#: rc.cpp:2486
+msgctxt "Username for audioscrobbler login"
+msgid "Username"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:86
-msgid "Number of upcoming tracks to add to the playlist."
+#. i18n: file: amarokconfig.kcfg:473
+#. i18n: ectx: whatsthis, entry, group (Scrobbler)
+#: rc.cpp:2489
+msgid "The username to use for connecting to Audioscrobbler"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:107
-msgctxt "Turn dynamic mode on"
-msgid "On"
+#. i18n: file: amarokconfig.kcfg:478
+#. i18n: ectx: whatsthis, entry, group (Scrobbler)
+#: rc.cpp:2495
+msgid "The password to use for connecting to Audioscrobbler"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:110
-msgid "Turn dynamic mode on."
+#. i18n: file: amarokconfig.kcfg:482
+#. i18n: ectx: label, entry, group (Scrobbler)
+#: rc.cpp:2498
+msgid "Send composer data"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:114
-msgid "Duplicates"
+#. i18n: file: amarokconfig.kcfg:483
+#. i18n: ectx: whatsthis, entry, group (Scrobbler)
+#: rc.cpp:2501
+msgid "Use composer data in Last.fm as artist"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:118
-msgid "Allow duplicate songs in result"
+#. i18n: file: amarokconfig.kcfg:487
+#. i18n: ectx: label, entry, group (Scrobbler)
+#: rc.cpp:2504
+msgid "Retrieve similar artists"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:122
-msgid "New"
+#. i18n: file: amarokconfig.kcfg:488
+#. i18n: ectx: whatsthis, entry, group (Scrobbler)
+#: rc.cpp:2507
+msgid "Whether similar songs are retrieved from Audioscrobbler"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:124
-msgid "New playlist"
+#. i18n: file: amarokconfig.kcfg:495
+#. i18n: ectx: label, entry, group (MediaDevice)
+#: rc.cpp:2510
+msgid "Device type"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:128
-msgid "Edit"
+#. i18n: file: amarokconfig.kcfg:496
+#. i18n: ectx: whatsthis, entry, group (MediaDevice)
+#: rc.cpp:2513
+msgid "The type of media device."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:130
-msgid "Edit the selected playlist or bias"
+#. i18n: file: amarokconfig.kcfg:499
+#. i18n: ectx: label, entry, group (MediaDevice)
+#: rc.cpp:2516
+msgid "Mount point"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:134
-msgid "Delete"
+#. i18n: file: amarokconfig.kcfg:500
+#. i18n: ectx: whatsthis, entry, group (MediaDevice)
+#: rc.cpp:2519
+msgid "The mount point used for the media device connection."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:137
-msgid "Delete the selected playlist or bias"
+#. i18n: file: amarokconfig.kcfg:503
+#. i18n: ectx: label, entry, group (MediaDevice)
+#: rc.cpp:2522
+msgid "Mount command"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:141
-msgid "Repopulate"
+#. i18n: file: amarokconfig.kcfg:504
+#. i18n: ectx: whatsthis, entry, group (MediaDevice)
+#: rc.cpp:2525
+msgid "The mount command used for the media device connection."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicCategory.cpp:142
-msgid "Replace the upcoming tracks with fresh ones."
+#. i18n: file: amarokconfig.kcfg:507
+#. i18n: ectx: label, entry, group (MediaDevice)
+#: rc.cpp:2528
+msgid "UmountCommand"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:43
-msgctxt "Bias dialog window title"
-msgid "Edit bias"
+#. i18n: file: amarokconfig.kcfg:508
+#. i18n: ectx: whatsthis, entry, group (MediaDevice)
+#: rc.cpp:2531
+msgid "The umount command used for the media device connection."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:47
-msgctxt "Bias selection label in bias view."
-msgid "Match Type:"
+#. i18n: file: amarokconfig.kcfg:511
+#. i18n: ectx: label, entry, group (MediaDevice)
+#: rc.cpp:2534
+msgid "Auto delete podcasts"
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:111
-#, kde-format
+#. i18n: file: amarokconfig.kcfg:512
+#. i18n: ectx: whatsthis, entry, group (MediaDevice)
+#: rc.cpp:2537
 msgid ""
-"This bias is a replacement for another bias\n"
-"which is currently not loaded or deactivated.\n"
-"The original bias name was %1."
+"Whether podcast shows already played are automatically deleted when media "
+"device is connected."
 msgstr ""
 
-#: browsers/playlistbrowser/DynamicBiasWidgets.cpp:178
-msgid "This bias has no settings."
+#. i18n: file: amarokconfig.kcfg:515
+#. i18n: ectx: label, entry, group (MediaDevice)
+#: rc.cpp:2540
+msgid "Sync stats"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:36
-msgid "&Rename Folder..."
+#. i18n: file: amarokconfig.kcfg:516
+#. i18n: ectx: whatsthis, entry, group (MediaDevice)
+#: rc.cpp:2543
+msgid ""
+"Whether Amarok statistics should be synchronized with play count/ratings on "
+"device and whether tracks played should be submitted to Last.fm."
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:42
-msgid "&Delete Folder"
+#. i18n: file: amarokconfig.kcfg:522
+#. i18n: ectx: label, entry, group (Daap)
+#: rc.cpp:2546
+msgid "Manually added servers"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:315
-msgid "New name"
+#. i18n: file: amarokconfig.kcfg:523
+#. i18n: ectx: whatsthis, entry, group (Daap)
+#: rc.cpp:2549
+msgid "Music Sharing servers added by the user."
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:317
-msgctxt "Enter a new name for a folder that already exists"
-msgid "Enter new folder name:"
+#. i18n: file: amarokconfig.kcfg:526
+#. i18n: ectx: label, entry, group (Daap)
+#: rc.cpp:2552
+msgid "Server passwords"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:335
-msgid "Are you sure you want to delete this folder and its contents?"
+#. i18n: file: amarokconfig.kcfg:527
+#. i18n: ectx: whatsthis, entry, group (Daap)
+#: rc.cpp:2555
+msgid "Passwords stored by hostname."
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistsInFoldersProxy.cpp:339
-msgid "Yes, delete folder."
+#. i18n: file: amarokconfig.kcfg:533
+#. i18n: ectx: label, entry, group (Playlist Search)
+#: rc.cpp:2558
+msgid "Include track names in matching"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastModel.cpp:71
-msgctxt "toggle the \"new\" status of this podcast episode"
-msgid "&New"
+#. i18n: file: amarokconfig.kcfg:537
+#. i18n: ectx: label, entry, group (Playlist Search)
+#: rc.cpp:2561
+msgid "Include album names in matching"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastModel.cpp:266
-#, kde-format
-msgctxt "number of podcasts from one source"
-msgid "One Channel"
-msgid_plural "%1 channels"
-msgstr[0] ""
-msgstr[1] ""
-
-#: browsers/playlistbrowser/PodcastModel.cpp:335
-#: amarokurls/BookmarkModel.cpp:266 playlist/PlaylistModel.cpp:913
-msgid "Type"
-msgstr "Math"
+#. i18n: file: amarokconfig.kcfg:541
+#. i18n: ectx: label, entry, group (Playlist Search)
+#: rc.cpp:2564
+msgid "Include artist names in matching"
+msgstr ""
 
-#: browsers/playlistbrowser/PodcastModel.cpp:357
-msgid "Add Podcast"
+#. i18n: file: amarokconfig.kcfg:545
+#. i18n: ectx: label, entry, group (Playlist Search)
+#: rc.cpp:2567
+msgid "Include genre names in matching"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastModel.cpp:358
-msgid "Enter RSS 1.0/2.0 or Atom feed URL:"
+#. i18n: file: amarokconfig.kcfg:549
+#. i18n: ectx: label, entry, group (Playlist Search)
+#: rc.cpp:2570
+msgid "Include composer names in matching"
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:42
-msgid "Automated Playlist Generator"
+#. i18n: file: amarokconfig.kcfg:553
+#. i18n: ectx: label, entry, group (Playlist Search)
+#. i18n: file: amarokconfig.kcfg:557
+#. i18n: ectx: label, entry, group (Playlist Search)
+#: rc.cpp:2573 rc.cpp:2576
+msgid "Include years in matching"
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:43
-#: browsers/playlistbrowser/APGCategory.cpp:50
-msgid "Create playlists by specifying criteria"
+#. i18n: file: amarokconfig.kcfg:564
+#. i18n: ectx: label, entry, group (Playlist Layout)
+#: rc.cpp:2579
+msgid "The name of the layout that will be loaded on startup"
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:66
-msgid "Add new preset"
+#. i18n: file: amarokconfig.kcfg:571
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2582
+msgid ""
+"Whether Amarok uses its own internal database, as opposed to an external "
+"engine."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:69
-msgid "Edit selected preset"
+#. i18n: file: amarokconfig.kcfg:575
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2585
+msgid "The hostname of the external server to connect to."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:74
-msgid "Delete selected preset"
+#. i18n: file: amarokconfig.kcfg:579
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2588
+msgid "Which server port to connect to the database engine."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:79
-msgid "Import a new preset"
+#. i18n: file: amarokconfig.kcfg:583
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2591
+msgid ""
+"The name of the database Amarok will use. The user should have sufficient "
+"access permissions."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:83
-msgid "Export the selected preset"
+#. i18n: file: amarokconfig.kcfg:587
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2594
+msgid "Username used to access the external database."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:91
-msgid "Run constraint tester"
+#. i18n: file: amarokconfig.kcfg:591
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2597
+msgid "Password for the external database user."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:100
-msgid "Run APG with selected preset"
+#. i18n: file: amarokconfig.kcfg:595
+#. i18n: ectx: label, entry, group (MySQL)
+#: rc.cpp:2600
+msgid "Keeps a running count to know when run a CHECK."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:106
-msgid "APG Presets"
+#. i18n: file: amarokconfig.kcfg:602
+#. i18n: ectx: label, entry, group (ScriptManager)
+#: rc.cpp:2603
+msgid "Whether to automatically update built-in scripts"
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:120
-msgid "Generator Optimization"
+#. i18n: file: amarokconfig.kcfg:603
+#. i18n: ectx: whatsthis, entry, group (ScriptManager)
+#: rc.cpp:2606
+msgid "Enable/Disable automatic update for built-in scripts."
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:124
-msgid "Speed"
+#. i18n: file: amarokconfig.kcfg:610
+#. i18n: ectx: label, entry, group (Moodbar)
+#: rc.cpp:2609
+msgid ""
+"Whether to show the moodbar of the current track, if available, in the "
+"progress slider"
 msgstr ""
 
-#: browsers/playlistbrowser/APGCategory.cpp:129
-msgid "Accuracy"
+#. i18n: file: amarokconfig.kcfg:611
+#. i18n: ectx: whatsthis, entry, group (Moodbar)
+#: rc.cpp:2612
+msgid "Enable/Disable showing moodbar, if available, in the progress slider."
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:80
-msgid "Podcasts"
+#. i18n: file: amarokconfig.kcfg:615
+#. i18n: ectx: label, entry, group (Moodbar)
+#: rc.cpp:2615
+msgid "The style to use when painting the moodbar"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:81
-msgid "List of podcast subscriptions and episodes"
+#. i18n: file: amarokconfig.kcfg:622
+#. i18n: ectx: label, entry, group (PlaylistGenerator)
+#: rc.cpp:2618
+msgid "Quality factor for Automated Playlist Generator"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:84
+#. i18n: file: amarokconfig.kcfg:623
+#. i18n: ectx: whatsthis, entry, group (PlaylistGenerator)
+#: rc.cpp:2621
 msgid ""
-"Manage your podcast subscriptions and browse individual episodes. "
-"Downloading episodes to the disk is also done here, or you can tell Amarok "
-"to do this automatically."
+"A value between 0 and 10 that controls whether the Automated Playlist "
+"Generator tries to optimize for speed (0) or accuracy (10)."
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:94
-msgid "&Add Podcast"
+#. i18n: tag layout attribute name
+#. i18n: file: data/DefaultPlaylistLayouts.xml:3
+#: rc.cpp:2624
+msgid "Default"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:101
-msgid "&Update All"
+#. i18n: tag layout attribute name
+#. i18n: file: data/DefaultPlaylistLayouts.xml:36
+#: rc.cpp:2627 playlist/layouts/PlaylistLayoutEditDialog.cpp:525
+msgid "No Grouping"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:109
-#: browsers/playlistbrowser/PodcastCategory.cpp:112
-msgid "Import OPML File"
+#. i18n: tag layout attribute name
+#. i18n: file: data/DefaultPlaylistLayouts.xml:60
+#: rc.cpp:2630
+msgid "No Grouping (Single Line)"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:166
-msgid "By"
+#. i18n: tag layout attribute name
+#. i18n: file: data/DefaultPlaylistLayouts.xml:77
+#: rc.cpp:2633
+msgid "Verbose"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:205
-msgctxt "Podcast published on date"
-msgid "On"
+#: covermanager/CoverFoundDialog.cpp:81
+msgid "Finding cover for"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:223
-msgid "File Size:"
+#: covermanager/CoverFoundDialog.cpp:113
+msgid "Enter Custom Search"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:235
-msgid "Subscription Date:"
+#: covermanager/CoverFoundDialog.cpp:129
+msgid "Google"
 msgstr ""
 
-#: browsers/playlistbrowser/PodcastCategory.cpp:243
-msgid "Keywords:"
+#: covermanager/CoverFoundDialog.cpp:130
+msgid "Yahoo!"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:173
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:222
-#, kde-format
-msgctxt "number of playlists from one source"
-msgid "One Playlist"
-msgid_plural "%1 playlists"
-msgstr[0] ""
-msgstr[1] ""
-
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:438
-#: amarokurls/BookmarkModel.cpp:86
-msgid "Group"
+#: covermanager/CoverFoundDialog.cpp:131
+msgid "Discogs"
 msgstr ""
 
-#: browsers/playlistbrowser/PlaylistBrowserModel.cpp:439
-msgid "Source"
+#: covermanager/CoverFoundDialog.cpp:141
+msgid "Sort by size"
 msgstr ""
 
-#: browsers/playlistbrowser/UserPlaylistCategory.cpp:58
-msgid "Saved Playlists"
+#: covermanager/CoverFoundDialog.cpp:358
+#: covermanager/CoverFetchingActions.cpp:75
+msgid "Display Cover"
 msgstr ""
 
-#: browsers/playlistbrowser/UserPlaylistCategory.cpp:59
-msgid "User generated and imported playlists"
+#: covermanager/CoverFoundDialog.cpp:383
+msgid "Cover Image Save Location"
 msgstr ""
 
-#: browsers/playlistbrowser/UserPlaylistCategory.cpp:62
-msgid ""
-"Create, edit, organize and load playlists. Amarok automatically adds any "
-"playlists found when scanning your collection, and any playlists that you "
-"save are also shown here."
+#: covermanager/CoverFoundDialog.cpp:409 covermanager/CoverFoundDialog.cpp:426
+msgid "Sorry, the cover could not be saved."
 msgstr ""
 
-#: browsers/InfoProxy.cpp:164 browsers/filebrowser/FileBrowser.cpp:398
-msgid "Home"
+#: covermanager/CoverFoundDialog.cpp:495
+msgid "Sorry, the cover image could not be retrieved."
 msgstr ""
 
-#: browsers/CollectionTreeItem.cpp:140
-msgctxt "No labels are assigned to the given item are any of its subitems"
-msgid "No Labels"
+#: covermanager/CoverFoundDialog.cpp:516
+msgid "Fetching Large Cover"
 msgstr ""
 
-#: browsers/CollectionTreeItem.cpp:148
-msgid "Counting..."
+#: covermanager/CoverFoundDialog.cpp:517
+msgid "Download Progress"
 msgstr ""
 
-#: browsers/CollectionTreeItem.cpp:175
-#: playlist/proxymodels/GroupingProxy.cpp:186
-#, kde-format
-msgid "1 track"
-msgid_plural "%1 tracks"
-msgstr[0] ""
-msgstr[1] ""
+#: covermanager/CoverFoundDialog.cpp:690
+msgid "Search"
+msgstr "Chwilio"
 
-#: browsers/servicebrowser/ServiceBrowser.cpp:40
-msgid ""
-"The Internet browser lets you browse online sources of content that "
-"integrates directly into Amarok. Amarok ships with a number of these "
-"sources, but many more can be added using scripts."
+#: covermanager/CoverFoundDialog.cpp:690
+msgid "Search For More Results"
 msgstr ""
 
-#: browsers/CollectionTreeItemModelBase.cpp:238
-#: browsers/CollectionTreeItemModelBase.cpp:291
-msgctxt "The Name is not known"
-msgid "Unknown"
+#: covermanager/CoverFoundDialog.cpp:706
+msgid "No Images Found"
 msgstr ""
 
-#: browsers/CollectionTreeItemModelBase.cpp:981
-msgid "Year - Album"
-msgstr ""
+#: covermanager/CoverFoundDialog.cpp:707
+#, kde-format
+msgid "1 Image Found"
+msgid_plural "%1 Images Found"
+msgstr[0] ""
+msgstr[1] ""
 
-#: browsers/BrowserBreadcrumbItem.cpp:68
-msgid "Media Sources Home"
+#: covermanager/CoverFoundDialog.cpp:731
+msgid "Information"
 msgstr ""
 
-#: browsers/CollectionTreeView.cpp:248 configdialog/ConfigDialog.cpp:59
-msgid "Collection"
-msgstr "Casgliad"
-
-#: browsers/CollectionTreeView.cpp:271 browsers/filebrowser/FileView.cpp:134
-msgid "Copy to Collection"
+#: covermanager/CoverFoundDialog.cpp:732
+msgid "Notes"
 msgstr ""
 
-#: browsers/CollectionTreeView.cpp:279 browsers/filebrowser/FileView.cpp:125
-msgid "Move to Collection"
+#: covermanager/CoverFoundDialog.cpp:804
+msgctxt "@item::intable"
+msgid "Artist"
 msgstr ""
 
-#: browsers/CollectionTreeView.cpp:907
-msgctxt "Organize Files"
-msgid "Organize Files"
+#: covermanager/CoverFoundDialog.cpp:805
+msgctxt "@item::intable"
+msgid "Country"
 msgstr ""
 
-#: browsers/CollectionTreeView.cpp:938 browsers/filebrowser/FileView.cpp:422
-msgid "&Edit Track Details"
+#: covermanager/CoverFoundDialog.cpp:806
+msgctxt "@item::intable"
+msgid "Date"
 msgstr ""
 
-#: browsers/CollectionTreeView.cpp:1085
-msgid "Delete Tracks"
+#: covermanager/CoverFoundDialog.cpp:807
+msgctxt "@item::intable File Format"
+msgid "Format"
 msgstr ""
 
-#: browsers/filebrowser/FileView.cpp:439 amarokurls/BookmarkTreeView.cpp:118
-msgid "&Delete"
+#: covermanager/CoverFoundDialog.cpp:808
+msgctxt "@item::intable Image Height"
+msgid "Height"
 msgstr ""
 
-#: browsers/filebrowser/FileView.cpp:572
-msgctxt "@title:window"
-msgid "Confirm Delete"
+#: covermanager/CoverFoundDialog.cpp:809 covermanager/CoverFoundDialog.cpp:814
+msgctxt "@item::intable Album Title"
+msgid "Title"
 msgstr ""
 
-#: browsers/filebrowser/FileView.cpp:573
-#, kde-format
-msgid "Are you sure you want to delete this item?"
-msgid_plural "Are you sure you want to delete these %1 items?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: browsers/filebrowser/FileView.cpp:580
-#, kde-format
-msgid "Are you sure you want to move this item to trash?"
-msgid_plural "Are you sure you want to move these %1 items to trash?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: browsers/filebrowser/FileView.cpp:614
-#, kde-format
-msgctxt "@info:status"
-msgid "Moving to trash: 1 file"
-msgid_plural "Moving to trash: %1 files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: browsers/filebrowser/FileBrowser.cpp:65
-msgctxt "Show Dolphin Places the user configured"
-msgid "Places"
+#: covermanager/CoverFoundDialog.cpp:810
+msgctxt "@item::intable Release Type"
+msgid "Type"
 msgstr ""
 
-#: browsers/filebrowser/FileBrowser.cpp:75
-msgid "Filter Files"
+#: covermanager/CoverFoundDialog.cpp:811
+msgctxt "@item::intable Release Date"
+msgid "Released"
 msgstr ""
 
-#: browsers/filebrowser/FileBrowser.cpp:174
-msgid ""
-"The file browser lets you browse files anywhere on your system, regardless "
-"of whether these files are part of your local collection. You can then add "
-"these files to the playlist as well as perform basic file operations."
+#: covermanager/CoverFoundDialog.cpp:812
+msgctxt "@item::intable File Size"
+msgid "Size"
 msgstr ""
 
-#: browsers/filebrowser/FileBrowser.cpp:542
-msgid "Places"
+#: covermanager/CoverFoundDialog.cpp:813
+msgctxt "@item::intable Cover Provider"
+msgid "Source"
 msgstr ""
 
-#: App.cpp:423
-msgid "Files/URLs to open"
+#: covermanager/CoverFoundDialog.cpp:815
+msgctxt "@item::intable Image Width"
+msgid "Width"
 msgstr ""
 
-#: App.cpp:424
-msgid "Immediately start playing an audio cd"
+#: covermanager/CoverFoundDialog.cpp:855
+msgctxt "@item::intable URL"
+msgid "link"
 msgstr ""
 
-#: App.cpp:426
-msgid "Skip backwards in playlist"
+#: covermanager/CoverFoundDialog.cpp:861
+msgctxt "@item::intable"
+msgid "URL"
 msgstr ""
 
-#: App.cpp:428
-msgid "Start playing current playlist"
+#: covermanager/CoverViewDialog.cpp:32 covermanager/CoverViewDialog.cpp:43
+msgid "Cover View"
 msgstr ""
 
-#: App.cpp:430
-msgid "Play if stopped, pause if playing"
+#: covermanager/CoverFetcher.cpp:172 covermanager/CoverFetcher.cpp:332
+msgid "Fetching Cover"
 msgstr ""
 
-#: App.cpp:431
-msgid "Pause playback"
+#: covermanager/CoverFetcher.cpp:194
+#, kde-format
+msgid "There was an error communicating with cover provider: %1"
 msgstr ""
 
-#: App.cpp:433
-msgid "Stop playback"
+#: covermanager/CoverFetcher.cpp:401
+#, kde-format
+msgid "Retrieved cover successfully for '%1'."
 msgstr ""
 
-#: App.cpp:435
-msgid "Skip forwards in playlist"
+#: covermanager/CoverFetcher.cpp:412
+#, kde-format
+msgid "Fetching cover for '%1' failed."
 msgstr ""
 
-#: App.cpp:436
-msgid "Additional options:"
+#: covermanager/CoverFetcher.cpp:425
+#, kde-format
+msgid "Canceled fetching cover for '%1'."
 msgstr ""
 
-#: App.cpp:438
-msgid "Append files/URLs to playlist"
+#: covermanager/CoverFetcher.cpp:434
+#, kde-format
+msgid "Unable to find a cover for '%1'."
 msgstr ""
 
-#: App.cpp:439
-msgid "Queue URLs after the currently playing track"
+#: covermanager/CoverManager.cpp:116
+msgid "Albums By"
 msgstr ""
 
-#: App.cpp:441
-msgid "Load URLs, replacing current playlist"
+#: covermanager/CoverManager.cpp:126
+msgid "All Artists"
 msgstr ""
 
-#: App.cpp:443
-msgid "Print verbose debugging information"
+#: covermanager/CoverManager.cpp:173 widgets/SearchWidget.cpp:64
+msgid "Enter search terms here"
 msgstr ""
 
-#: App.cpp:445
-msgid "Disable colorization for debug output."
+#: covermanager/CoverManager.cpp:186
+msgid "All Albums"
 msgstr ""
 
-#: App.cpp:447
-msgid "Allow running multiple Amarok instances"
+#: covermanager/CoverManager.cpp:187
+msgid "Albums With Cover"
 msgstr ""
 
-#: App.cpp:448
-msgid "Base for relative filenames/URLs"
+#: covermanager/CoverManager.cpp:188
+msgid "Albums Without Cover"
 msgstr ""
 
-#: App.cpp:450
-msgid "Unit test options:"
+#: covermanager/CoverManager.cpp:201
+msgid "Fetch Missing Covers"
 msgstr ""
 
-#: App.cpp:451
-msgid "Run integrated unit tests"
+#: covermanager/CoverManager.cpp:307
+msgid "Fetching"
 msgstr ""
 
-#: App.cpp:452
-msgid "Destination of test output: 'stdout', 'log'"
+#: covermanager/CoverManager.cpp:402
+msgid "Loading"
 msgstr ""
 
-#: App.cpp:453
-msgid "Format of test output: 'xml', 'lightxml', 'plaintext'"
+#: covermanager/CoverManager.cpp:632
+msgctxt "The fetching is done."
+msgid "Finished."
 msgstr ""
 
-#: App.cpp:454
-msgid "Verbosity from 0-3 (highest)"
-msgstr ""
+#: covermanager/CoverManager.cpp:634
+#, kde-format
+msgid " Cover not found"
+msgid_plural " <b>%1</b> covers not found"
+msgstr[0] ""
+msgstr[1] ""
 
-#: App.cpp:646
-msgid ""
-"The embedded database was not found; you must set up a database server "
-"connection.\n"
-"You must restart Amarok after doing this."
+#: covermanager/CoverManager.cpp:652
+#, kde-format
+msgid "Fetching cover for %1 - %2..."
 msgstr ""
 
-#: App.cpp:647
-msgid ""
-"The connection details for the database server were invalid.\n"
-"You must enter correct settings and restart Amarok after doing this."
+#: covermanager/CoverManager.cpp:658
+#, kde-format
+msgid "Fetching cover for %1..."
 msgstr ""
 
-#: App.cpp:648
-msgid "Database Error"
-msgstr ""
+#: covermanager/CoverManager.cpp:664
+#, kde-format
+msgid "Fetching 1 cover: "
+msgid_plural "Fetching <b>%1</b> covers... : "
+msgstr[0] ""
+msgstr[1] ""
 
-#: App.cpp:693
-msgid "Moving files to trash"
+#: covermanager/CoverManager.cpp:666
+#, kde-format
+msgid "1 fetched"
+msgid_plural "%1 fetched"
+msgstr[0] ""
+msgstr[1] ""
+
+#: covermanager/CoverManager.cpp:670
+msgid " - "
 msgstr ""
 
-#: OpmlParser.cpp:109
+#: covermanager/CoverManager.cpp:671
 #, kde-format
-msgid "Reading OPML podcast from %1 failed with error:\n"
-msgstr ""
+msgid "1 not found"
+msgid_plural "%1 not found"
+msgstr[0] ""
+msgstr[1] ""
 
-#: k3bexporter.cpp:182
-msgid "Unable to start K3b."
-msgstr ""
+#: covermanager/CoverManager.cpp:674
+msgid "Connecting..."
+msgstr "Yn cysylltu..."
 
-#: k3bexporter.cpp:206
-msgid "There was a DCOP communication error with K3b."
-msgstr ""
+#: covermanager/CoverManager.cpp:697
+#, kde-format
+msgid "1 result for \"%2\""
+msgid_plural "%1 results for \"%2\""
+msgstr[0] ""
+msgstr[1] ""
 
-#: k3bexporter.cpp:240
-msgid ""
-"Create an audio mode CD suitable for CD players, or a data mode CD suitable "
-"for computers and other digital music players?"
+#: covermanager/CoverManager.cpp:701
+#, kde-format
+msgid "1 album"
+msgid_plural "%1 albums"
+msgstr[0] ""
+msgstr[1] ""
+
+#: covermanager/CoverManager.cpp:713
+msgid " by "
 msgstr ""
 
-#: k3bexporter.cpp:243
-msgid "Create K3b Project"
+#: covermanager/CoverManager.cpp:718
+#, kde-format
+msgid " - ( <b>%1</b> without cover )"
 msgstr ""
 
-#: k3bexporter.cpp:244
-msgid "Audio Mode"
+#: covermanager/CoverManager.cpp:767
+msgid "Cover Image"
 msgstr ""
 
-#: k3bexporter.cpp:245
-msgid "Data Mode"
+#: covermanager/CoverManager.cpp:860
+msgid "No Artist"
 msgstr ""
 
 #: covermanager/CoverFetchingActions.cpp:47
@@ -11494,29 +11741,24 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: covermanager/CoverFetchingActions.cpp:69
-#: covermanager/CoverFoundDialog.cpp:358
-msgid "Display Cover"
-msgstr ""
-
-#: covermanager/CoverFetchingActions.cpp:71
+#: covermanager/CoverFetchingActions.cpp:77
 msgid "Display artwork for this album"
 msgstr ""
 
-#: covermanager/CoverFetchingActions.cpp:89
+#: covermanager/CoverFetchingActions.cpp:95
 msgid "Unset Cover"
 msgid_plural "Unset Covers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: covermanager/CoverFetchingActions.cpp:91
+#: covermanager/CoverFetchingActions.cpp:97
 #, kde-format
 msgid "Remove artwork for this album"
 msgid_plural "Remove artwork for %1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: covermanager/CoverFetchingActions.cpp:104
+#: covermanager/CoverFetchingActions.cpp:110
 #, kde-format
 msgid "Are you sure you want to remove this cover from the Collection?"
 msgid_plural ""
@@ -11524,1159 +11766,1304 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: covermanager/CoverFetchingActions.cpp:127
+#: covermanager/CoverFetchingActions.cpp:133
 msgid "Set Custom Cover"
 msgstr ""
 
-#: covermanager/CoverFetchingActions.cpp:129
+#: covermanager/CoverFetchingActions.cpp:135
 #, kde-format
 msgid "Set custom artwork for this album"
 msgid_plural "Set custom artwork for these %1 albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: covermanager/CoverFetchingActions.cpp:155
+#: covermanager/CoverFetchingActions.cpp:161
 msgid "Select Cover Image File"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:81
-msgid "Finding cover for"
+#: PluginManager.cpp:256
+msgid ""
+"<p>Amarok could not find any collection plugins. It is possible that Amarok "
+"is installed under the wrong prefix, please fix your installation "
+"using:<pre>$ cd /path/to/amarok/source-code/<br>$ su -c \"make "
+"uninstall\"<br>$ cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` && su -"
+"c \"make install\"<br>$ kbuildsycoca4 --noincremental<br>$ amarok</pre>More "
+"information can be found in the README file. For further assistance join us "
+"at #amarok on irc.freenode.net.</p>"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:113
-msgid "Enter Custom Search"
+#: widgets/Osd.cpp:157
+msgid "Rating changed"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:129
-msgid "Google"
+#: widgets/Osd.cpp:232
+msgid "Volume: 100% (muted)"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:130
-msgid "Yahoo!"
+#: widgets/Osd.cpp:489
+msgid ""
+"On-Screen-Display preview\n"
+"Drag to reposition"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:131
-msgid "Discogs"
+#: widgets/Osd.cpp:741
+msgid "Stopped"
+msgstr "Wedi aros"
+
+#: widgets/Osd.cpp:750
+msgid "Paused"
+msgstr "Wedi ei Seibio"
+
+#: widgets/SliderWidget.cpp:245
+msgid "Volume"
+msgstr "Lefel Sain"
+
+#: widgets/SliderWidget.cpp:246
+msgid "100%"
+msgstr "100%"
+
+#: widgets/SliderWidget.cpp:247
+msgid "80%"
+msgstr ""
+
+#: widgets/SliderWidget.cpp:248
+msgid "60%"
+msgstr ""
+
+#: widgets/SliderWidget.cpp:249
+msgid "40%"
+msgstr ""
+
+#: widgets/SliderWidget.cpp:250
+msgid "20%"
+msgstr ""
+
+#: widgets/SliderWidget.cpp:251
+msgid "0%"
+msgstr "0%"
+
+#: widgets/SliderWidget.cpp:412
+#, kde-format
+msgctxt ""
+"Tooltip shown when the mouse is over the progress slider, representing the "
+"position in the currently playing track that Amarok will seek to if you "
+"click the mouse. Keep it concise."
+msgid "Jump to: %1"
+msgstr ""
+
+#: widgets/SearchWidget.cpp:51
+msgid "Enter space-separated terms to search."
+msgstr ""
+
+#: widgets/SearchWidget.cpp:71 widgets/SearchWidget.cpp:174
+msgid "Edit filter"
+msgstr ""
+
+#: widgets/ProgressWidget.cpp:44
+msgid "Track Progress"
+msgstr ""
+
+#: widgets/ProgressWidget.cpp:120
+msgid "The amount of time elapsed in current song"
+msgstr ""
+
+#: widgets/ProgressWidget.cpp:121
+msgid "The amount of time remaining in current song"
+msgstr ""
+
+#: widgets/MetaQueryWidget.cpp:124
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widgets/MetaQueryWidget.cpp:125
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widgets/MetaQueryWidget.cpp:126
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widgets/MetaQueryWidget.cpp:127
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widgets/MetaQueryWidget.cpp:128
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widgets/MetaQueryWidget.cpp:220
+msgid "Simple Search"
+msgstr ""
+
+#: widgets/MetaQueryWidget.cpp:435 widgets/SmartPlaylistEditor.cpp:934
+#: widgets/SmartPlaylistEditor.cpp:956 widgets/SmartPlaylistEditor.cpp:984
+#: widgets/SmartPlaylistEditor.cpp:1003
+msgid "and"
+msgstr "a"
+
+#: widgets/MetaQueryWidget.cpp:535
+msgctxt "Unit for data rate kilo bit per seconds"
+msgid "kbps"
+msgstr ""
+
+#: widgets/MetaQueryWidget.cpp:537
+msgctxt "Unit for sample rate"
+msgid "Hz"
+msgstr ""
+
+#: widgets/MetaQueryWidget.cpp:539
+msgctxt "Unit for file size in mega byte"
+msgid "MiB"
+msgstr ""
+
+#: widgets/MetaQueryWidget.cpp:863
+msgctxt "The date lies before the given fixed date"
+msgid "before"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:141
-msgid "Sort by size"
+#: widgets/MetaQueryWidget.cpp:865
+msgctxt "The date is the same as the given fixed date"
+msgid "on"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:376
-msgid "Cover Image Save Location"
+#: widgets/MetaQueryWidget.cpp:867
+msgctxt "The date is after the given fixed date"
+msgid "after"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:402 covermanager/CoverFoundDialog.cpp:419
-msgid "Sorry, the cover could not be saved."
+#: widgets/MetaQueryWidget.cpp:869
+msgctxt "The date is between the given fixed dates"
+msgid "between"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:487
-msgid "Sorry, the cover image could not be retrieved."
+#: widgets/MetaQueryWidget.cpp:871
+msgctxt "The date lies before the given time interval"
+msgid "older than"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:507
-msgid "Fetching Large Cover"
+#: widgets/MetaQueryWidget.cpp:887
+msgctxt "a numerical tag (like year or track number) is between two values"
+msgid "between"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:508
-msgid "Download Progress"
+#: widgets/BookmarkPopup.cpp:83 widgets/BookmarkPopup.cpp:111
+msgid "Bookmark"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:681
-msgid "Search"
-msgstr "Chwilio"
+#: widgets/TrackSelectWidget.cpp:67
+#, kde-format
+msgid "Checkpoint: <b>%1</b>"
+msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:681
-msgid "Search For More Results"
+#: widgets/TrackSelectWidget.cpp:87
+#, kde-format
+msgid "Track: %1"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:697
-msgid "No Images Found"
+#: widgets/TrackSelectWidget.cpp:89
+#, kde-format
+msgid "Album: %1"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:698
+#: widgets/TrackSelectWidget.cpp:91
 #, kde-format
-msgid "1 Image Found"
-msgid_plural "%1 Images Found"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Artist: %1"
+msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:722
-msgid "Information"
+#: widgets/TrackSelectWidget.cpp:95
+msgid "empty"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:723
-msgid "Notes"
+#: widgets/VolumeDial.cpp:301 widgets/VolumeDial.cpp:340
+#, kde-format
+msgid "Volume: %1%"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:795
-msgctxt "@item::intable"
-msgid "Artist"
+#: widgets/TokenWithLayout.cpp:242
+msgid "[prefix]"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:796
-msgctxt "@item::intable"
-msgid "Country"
+#: widgets/TokenWithLayout.cpp:253
+msgid "[suffix]"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:797
-msgctxt "@item::intable"
-msgid "Date"
+#: widgets/BreadcrumbItemButton.cpp:239
+msgid "List and run bookmarks, or create new ones"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:798
-msgctxt "@item::intable File Format"
-msgid "Format"
+#: widgets/BreadcrumbItemButton.cpp:257
+msgid "Amarok Bookmarks"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:799
-msgctxt "@item::intable Image Height"
-msgid "Height"
+#: widgets/BreadcrumbItemButton.cpp:276
+msgid "Copy Current View Bookmark to Clipboard"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:800 covermanager/CoverFoundDialog.cpp:805
-msgctxt "@item::intable Album Title"
-msgid "Title"
+#: widgets/TokenDropTarget.cpp:387
+msgid "Drag in and out items from above."
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:801
-msgctxt "@item::intable Release Type"
-msgid "Type"
+#: widgets/AnalyzerWidget.cpp:35
+msgid "Click for more analyzers"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:802
-msgctxt "@item::intable Release Date"
-msgid "Released"
+#: widgets/AnalyzerWidget.cpp:69
+msgid "&Visualizations"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:803
-msgctxt "@item::intable File Size"
-msgid "Size"
+#: widgets/SmartPlaylistEditor.cpp:79
+msgid "Create Smart Playlist"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:804
-msgctxt "@item::intable Cover Provider"
-msgid "Source"
+#: widgets/SmartPlaylistEditor.cpp:95
+msgid "Edit Smart Playlist"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:806
-msgctxt "@item::intable Image Width"
-msgid "Width"
+#: widgets/SmartPlaylistEditor.cpp:184
+msgid "Track #"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:846
-msgctxt "@item::intable URL"
-msgid "link"
+#: widgets/SmartPlaylistEditor.cpp:184
+msgid "Play Counter"
 msgstr ""
 
-#: covermanager/CoverFoundDialog.cpp:852
-msgctxt "@item::intable"
-msgid "URL"
+#: widgets/SmartPlaylistEditor.cpp:185
+msgid "First Play"
 msgstr ""
 
-#: covermanager/CoverViewDialog.cpp:32 covermanager/CoverViewDialog.cpp:43
-msgid "Cover View"
+#: widgets/SmartPlaylistEditor.cpp:186
+msgid "Last Play"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:116
-msgid "Albums By"
+#: widgets/SmartPlaylistEditor.cpp:186
+msgid "Modified Date"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:126
-msgid "All Artists"
+#: widgets/SmartPlaylistEditor.cpp:186
+msgid "File Path"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:186
-msgid "All Albums"
+#: widgets/SmartPlaylistEditor.cpp:187 playlist/PlaylistModel.cpp:870
+msgid "BPM"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:187
-msgid "Albums With Cover"
+#: widgets/SmartPlaylistEditor.cpp:187
+msgid "Mount Point"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:188
-msgid "Albums Without Cover"
+#: widgets/SmartPlaylistEditor.cpp:187 playlist/PlaylistModel.cpp:876
+msgid "Bitrate"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:201
-msgid "Fetch Missing Covers"
+#: widgets/SmartPlaylistEditor.cpp:204
+msgid "Playlist name:"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:307
-msgid "Fetching"
+#: widgets/SmartPlaylistEditor.cpp:212
+msgid "Match Any of the following conditions"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:402
-msgid "Loading"
+#: widgets/SmartPlaylistEditor.cpp:222
+msgid "Match All of the following conditions"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:632
-msgctxt "The fetching is done."
-msgid "Finished."
+#: widgets/SmartPlaylistEditor.cpp:232
+msgid "Order by"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:634
-#, kde-format
-msgid " Cover not found"
-msgid_plural " <b>%1</b> covers not found"
-msgstr[0] ""
-msgstr[1] ""
+#: widgets/SmartPlaylistEditor.cpp:238
+msgid "Random"
+msgstr "Hap"
 
-#: covermanager/CoverManager.cpp:652
-#, kde-format
-msgid "Fetching cover for %1 - %2..."
+#: widgets/SmartPlaylistEditor.cpp:246
+msgid "Limit to"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:658
-#, kde-format
-msgid "Fetching cover for %1..."
+#: widgets/SmartPlaylistEditor.cpp:258
+msgid "Expand by"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:664
-#, kde-format
-msgid "Fetching 1 cover: "
-msgid_plural "Fetching <b>%1</b> covers... : "
-msgstr[0] ""
-msgstr[1] ""
-
-#: covermanager/CoverManager.cpp:666
-#, kde-format
-msgid "1 fetched"
-msgid_plural "%1 fetched"
-msgstr[0] ""
-msgstr[1] ""
+#: widgets/SmartPlaylistEditor.cpp:345
+msgid "Completely Random"
+msgstr ""
 
-#: covermanager/CoverManager.cpp:670
-msgid " - "
+#: widgets/SmartPlaylistEditor.cpp:346
+msgid "Score Weighted"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:671
-#, kde-format
-msgid "1 not found"
-msgid_plural "%1 not found"
-msgstr[0] ""
-msgstr[1] ""
+#: widgets/SmartPlaylistEditor.cpp:347
+msgid "Rating Weighted"
+msgstr ""
 
-#: covermanager/CoverManager.cpp:674
-msgid "Connecting..."
-msgstr "Yn cysylltu..."
+#: widgets/SmartPlaylistEditor.cpp:351
+msgid "Ascending"
+msgstr "Esgynnol"
 
-#: covermanager/CoverManager.cpp:697
-#, kde-format
-msgid "1 result for \"%2\""
-msgid_plural "%1 results for \"%2\""
-msgstr[0] ""
-msgstr[1] ""
+#: widgets/SmartPlaylistEditor.cpp:352
+msgid "Descending"
+msgstr "Disgynnol"
 
-#: covermanager/CoverManager.cpp:701
-#, kde-format
-msgid "1 album"
-msgid_plural "%1 albums"
-msgstr[0] ""
-msgstr[1] ""
+#: widgets/SmartPlaylistEditor.cpp:501 widgets/SmartPlaylistEditor.cpp:508
+#: widgets/SmartPlaylistEditor.cpp:528 widgets/SmartPlaylistEditor.cpp:538
+#: widgets/SmartPlaylistEditor.cpp:582 widgets/SmartPlaylistEditor.cpp:589
+#: widgets/SmartPlaylistEditor.cpp:602 widgets/SmartPlaylistEditor.cpp:613
+#: widgets/SmartPlaylistEditor.cpp:653 widgets/SmartPlaylistEditor.cpp:659
+#: widgets/SmartPlaylistEditor.cpp:678 widgets/SmartPlaylistEditor.cpp:698
+#: widgets/SmartPlaylistEditor.cpp:767 widgets/SmartPlaylistEditor.cpp:883
+#: widgets/SmartPlaylistEditor.cpp:886 widgets/SmartPlaylistEditor.cpp:933
+#: widgets/SmartPlaylistEditor.cpp:955 widgets/SmartPlaylistEditor.cpp:983
+#: widgets/SmartPlaylistEditor.cpp:1002 widgets/SmartPlaylistEditor.cpp:1042
+#: widgets/SmartPlaylistEditor.cpp:1048
+msgid "is between"
+msgstr ""
 
-#: covermanager/CoverManager.cpp:713
-msgid " by "
+#: widgets/SmartPlaylistEditor.cpp:514 widgets/SmartPlaylistEditor.cpp:595
+#: widgets/SmartPlaylistEditor.cpp:665 widgets/SmartPlaylistEditor.cpp:767
+#: widgets/SmartPlaylistEditor.cpp:884 widgets/SmartPlaylistEditor.cpp:887
+#: widgets/SmartPlaylistEditor.cpp:968 widgets/SmartPlaylistEditor.cpp:1048
+msgid "is in the last"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:718
-#, kde-format
-msgid " - ( <b>%1</b> without cover )"
+#: widgets/SmartPlaylistEditor.cpp:514 widgets/SmartPlaylistEditor.cpp:595
+#: widgets/SmartPlaylistEditor.cpp:665 widgets/SmartPlaylistEditor.cpp:769
+#: widgets/SmartPlaylistEditor.cpp:885 widgets/SmartPlaylistEditor.cpp:888
+#: widgets/SmartPlaylistEditor.cpp:969 widgets/SmartPlaylistEditor.cpp:1048
+msgid "is not in the last"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:767
-msgid "Cover Image"
+#: widgets/SmartPlaylistEditor.cpp:717 widgets/SmartPlaylistEditor.cpp:1033
+msgid "does not contain"
+msgstr "ni Chynhwysa"
+
+#: widgets/SmartPlaylistEditor.cpp:719 widgets/SmartPlaylistEditor.cpp:1033
+#: widgets/SmartPlaylistEditor.cpp:1041 widgets/SmartPlaylistEditor.cpp:1047
+msgid "is"
+msgstr "yw"
+
+#: widgets/SmartPlaylistEditor.cpp:728 widgets/SmartPlaylistEditor.cpp:1033
+#: widgets/SmartPlaylistEditor.cpp:1041 widgets/SmartPlaylistEditor.cpp:1047
+msgid "is not"
+msgstr "nid Yw"
+
+#: widgets/SmartPlaylistEditor.cpp:748 widgets/SmartPlaylistEditor.cpp:1034
+msgid "does not start with"
 msgstr ""
 
-#: covermanager/CoverManager.cpp:860
-msgid "No Artist"
+#: widgets/SmartPlaylistEditor.cpp:761 widgets/SmartPlaylistEditor.cpp:1035
+msgid "does not end with"
 msgstr ""
 
-#: covermanager/CoverFetcher.cpp:172 covermanager/CoverFetcher.cpp:332
-msgid "Fetching Cover"
-msgstr ""
+#: widgets/SmartPlaylistEditor.cpp:763 widgets/SmartPlaylistEditor.cpp:1041
+msgid "is greater than"
+msgstr "yn fwy na"
 
-#: covermanager/CoverFetcher.cpp:194
-#, kde-format
-msgid "There was an error communicating with cover provider: %1"
+#: widgets/SmartPlaylistEditor.cpp:763 widgets/SmartPlaylistEditor.cpp:1047
+msgid "is after"
 msgstr ""
 
-#: covermanager/CoverFetcher.cpp:401
-#, kde-format
-msgid "Retrieved cover successfully for '%1'."
+#: widgets/SmartPlaylistEditor.cpp:765 widgets/SmartPlaylistEditor.cpp:1041
+msgid "is smaller than"
 msgstr ""
 
-#: covermanager/CoverFetcher.cpp:412
-#, kde-format
-msgid "Fetching cover for '%1' failed."
+#: widgets/SmartPlaylistEditor.cpp:765 widgets/SmartPlaylistEditor.cpp:1047
+msgid "is before"
 msgstr ""
 
-#: covermanager/CoverFetcher.cpp:425
-#, kde-format
-msgid "Canceled fetching cover for '%1'."
-msgstr ""
+#: widgets/SmartPlaylistEditor.cpp:974
+msgid "Days"
+msgstr "Dydd"
 
-#: covermanager/CoverFetcher.cpp:434
-#, kde-format
-msgid "Unable to find a cover for '%1'."
-msgstr ""
+#: widgets/SmartPlaylistEditor.cpp:975
+msgid "Months"
+msgstr "Misoedd"
 
-#: musicbrainz/MusicBrainzTags.cpp:447 musicbrainz/MusicBrainzTags.cpp:453
-#, kde-format
-msgid "MusicBrainz match ratio: %1%"
-msgstr ""
+#: widgets/SmartPlaylistEditor.cpp:976
+#: playlist/ProgressiveSearchWidget.cpp:116
+msgid "Years"
+msgstr "Blynyddoedd"
 
-#: musicbrainz/MusicBrainzTags.cpp:449 musicbrainz/MusicBrainzTags.cpp:456
-#, kde-format
-msgid "MusicDNS match ratio: %1%"
+#: widgets/SmartPlaylistEditor.cpp:1011
+msgid "Seconds"
 msgstr ""
 
-#: musicbrainz/MusicBrainzTags.cpp:499
-msgid "Click here to choose best matches"
+#: widgets/SmartPlaylistEditor.cpp:1012
+msgid "Minutes"
 msgstr ""
 
-#: musicbrainz/MusicBrainzTags.cpp:666
-msgid "Artist page"
+#: widgets/SmartPlaylistEditor.cpp:1013
+msgid "Hours"
 msgstr ""
 
-#: musicbrainz/MusicBrainzTags.cpp:672
-msgid "Album page"
-msgstr ""
+#: widgets/PlayPauseButton.cpp:31 widgets/PlayPauseButton.cpp:81
+msgid "Play"
+msgstr "Chwarae"
 
-#: musicbrainz/MusicBrainzTags.cpp:678
-msgid "Track page"
-msgstr ""
+#: widgets/PlayPauseButton.cpp:81
+msgid "Pause"
+msgstr "Seibio"
 
-#: databaseimporter/sqlbatch/SqlBatchImporter.cpp:72
-#, kde-format
-msgid "Could not open file \"%1\"."
+#: configdialog/dialogs/MediadeviceConfig.cpp:40
+msgid "Media Devices"
 msgstr ""
 
-#: databaseimporter/sqlbatch/SqlBatchImporterConfig.cpp:37
-msgid ""
-"Input file produced by amarokcollectionscanner.<br>See <a "
-"href=\"http://amarok.kde.org/wiki/Batch_Mode\">Batch Mode</a>."
+#: configdialog/dialogs/MediadeviceConfig.cpp:50
+msgid "Generic Devices and Volumes..."
 msgstr ""
 
-#: databaseimporter/sqlbatch/SqlBatchImporterConfig.cpp:43
-msgid "Input file"
-msgstr ""
+#: configdialog/dialogs/MediadeviceConfig.cpp:53
+msgid "Add Device..."
+msgstr "Ychwanegu Dyfais..."
 
-#: databaseimporter/itunes/ITunesImporterConfig.cpp:37
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:45
-msgid "Database Location"
+#: configdialog/dialogs/DatabaseConfig.cpp:93
+msgctxt ""
+"A default password for insertion into an example SQL command (so as not to "
+"print the real one). To be manually replaced by the user."
+msgid "password"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:82
-msgid "No database driver was selected"
+#: configdialog/dialogs/PlaybackConfig.cpp:75
+msgid "Sound System - Amarok"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:88
-#, kde-format
-msgid "Database could not be found at: %1"
+#: configdialog/dialogs/ScriptsConfig.cpp:50
+msgid "Generic"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:123
-#, kde-format
-msgid "Could not open Amarok 1.4 database: %1"
+#: configdialog/dialogs/ScriptsConfig.cpp:58
+msgid "Scriptable Service"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:153
-#, kde-format
-msgid "Could not execute import query: %1"
+#: configdialog/dialogs/ScriptsConfig.cpp:75
+msgid ""
+"<p>Script successfully installed.</p><p>Please restart Amarok to start the "
+"script.</p>"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:237
+#: configdialog/dialogs/ScriptsConfig.cpp:78
 msgid ""
-"(track exists, but does not belong in any of your configured collection "
-"folders)"
+"<p>Script successfully uninstalled.</p><p>Please restart Amarok to totally "
+"remove the script.</p>"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:271
-#, kde-format
-msgid "Adding <b>1 new track</b> to Amarok collection <b>%2</b>."
-msgid_plural "Adding <b>%1 new tracks</b> to Amarok collection <b>%2</b>."
-msgstr[0] ""
-msgstr[1] ""
-
-#: databaseimporter/amarok14/FastForwardWorker.cpp:390
-#, kde-format
-msgid "Cannot import statistics for %1"
+#: configdialog/dialogs/PluginsConfig.cpp:44
+msgid "Collections"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:420
-#, kde-format
-msgid "Could not execute labels import query: %1; query was: %2"
+#: configdialog/dialogs/PluginsConfig.cpp:48
+msgid "Internet Services"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:443
-#, kde-format
-msgid "Updating cached lyrics and labels for 1 track..."
-msgid_plural "Updating cached lyrics and labels for %1 tracks..."
-msgstr[0] ""
-msgstr[1] ""
+#: configdialog/dialogs/PluginsConfig.cpp:52
+msgid "Devices"
+msgstr "Dyfeisiadau"
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:459
-#, kde-format
-msgid "Failed to update lyrics/labels for track %1"
+#: configdialog/ConfigDialog.cpp:58
+msgctxt "Miscellaneous settings"
+msgid "General"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:479
-#, kde-format
-msgid "Cached lyrics updated for 1 track"
-msgid_plural "Cached lyrics updated for %1 tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: databaseimporter/amarok14/FastForwardWorker.cpp:483
-#, kde-format
-msgid "labels added to 1 track"
-msgid_plural "labels added to %1 tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: databaseimporter/amarok14/FastForwardWorker.cpp:489
-#, kde-format
-msgctxt ""
-"%1 is e.g. Cached lyrics updated for 2 tracks, %2 is e.g. labels added to 3 "
-"tracks"
-msgid "%1, %2."
+#: configdialog/ConfigDialog.cpp:58
+msgid "Configure General Options"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:496
-msgid "Importing downloaded album art..."
+#: configdialog/ConfigDialog.cpp:59
+msgid "Configure Collection"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardWorker.cpp:530
-#, kde-format
-msgid "Copied 1 cover image."
-msgid_plural "Copied %1 cover images."
-msgstr[0] ""
-msgstr[1] ""
-
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:39
-msgid "Connection"
+#: configdialog/ConfigDialog.cpp:60
+msgid "Playback"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:62
-msgid "Database Name"
+#: configdialog/ConfigDialog.cpp:60
+msgid "Configure Playback"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:66
-msgid "Hostname"
-msgstr "Enw gwesteiwr"
+#: configdialog/ConfigDialog.cpp:61
+msgid "Notifications"
+msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:92
-msgid "Match tracks by meta tags"
+#: configdialog/ConfigDialog.cpp:61
+msgid "Configure Notifications"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:93
-msgid ""
-"Perform meta information search on non-existing files, possibly detecting "
-"file renames. See <b>What's This</b>"
+#: configdialog/ConfigDialog.cpp:62
+msgid "Database"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:95
-msgid ""
-"If enabled, tracks from the old collection that do not exist anymore in the "
-"file system are searched for (by metadata) in the current collection. If a "
-"match is found, statistics for the matched track are updated, even if the "
-"file locations differ."
+#: configdialog/ConfigDialog.cpp:62
+msgid "Configure Database"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:101
-msgid "Import downloaded artwork"
+#: configdialog/ConfigDialog.cpp:63
+msgid "Plugins"
+msgstr "Ategion"
+
+#: configdialog/ConfigDialog.cpp:63
+msgid "Configure Plugins"
 msgstr ""
 
-#: databaseimporter/amarok14/FastForwardImporterConfig.cpp:110
-msgid "Artwork directory"
+#: configdialog/ConfigDialog.cpp:64
+msgid "Scripts"
+msgstr "Sgriptiau"
+
+#: configdialog/ConfigDialog.cpp:64
+msgid "Configure Scripts"
 msgstr ""
 
-#: scriptengine/AmarokNetworkScript.cpp:70
-msgctxt "do not translate 'DataDownloader' or 'qt.core'"
-msgid "qt.core must be loaded to use DataDownloader"
+#: App.cpp:410
+msgid "Files/URLs to open"
 msgstr ""
 
-#: TrayIcon.cpp:146
-#, kde-format
-msgid "%1%"
+#: App.cpp:411
+msgid "Immediately start playing an audio cd"
 msgstr ""
 
-#: TrayIcon.cpp:148
-#, kde-format
-msgid "<i>Volume: %1</i>"
+#: App.cpp:413
+msgid "Skip backwards in playlist"
 msgstr ""
 
-#: TrayIcon.cpp:153
-#, kde-format
-msgid "Score: %1"
-msgstr "Sgôr: %1"
+#: App.cpp:415
+msgid "Start playing current playlist"
+msgstr ""
 
-#: TrayIcon.cpp:171
-#, kde-format
-msgid "Rating: %1"
-msgstr "Poblogrwydd : %1"
+#: App.cpp:417
+msgid "Play if stopped, pause if playing"
+msgstr ""
 
-#: TrayIcon.cpp:177
-#, kde-format
-msgid "Play count: %1"
+#: App.cpp:418
+msgid "Pause playback"
 msgstr ""
 
-#: TrayIcon.cpp:181
-#, kde-format
-msgid "Last played: %1"
+#: App.cpp:420
+msgid "Stop playback"
 msgstr ""
 
-#: amarokurls/PlayUrlGenerator.cpp:87
-msgid "Bookmark Track Position"
+#: App.cpp:422
+msgid "Skip forwards in playlist"
 msgstr ""
 
-#: amarokurls/ContextUrlRunner.cpp:75
-msgctxt "A type of command that affects the context view"
-msgid "Context"
+#: App.cpp:423
+msgid "Additional options:"
 msgstr ""
 
-#: amarokurls/AmarokUrlHandler.cpp:222
-msgctxt "The command type of this url is not known"
-msgid "Unknown"
+#: App.cpp:425
+msgid "Append files/URLs to playlist"
 msgstr ""
 
-#: amarokurls/BookmarkCurrentButton.cpp:32 amarokurls/BookmarkModel.cpp:547
-msgid "New Bookmark"
+#: App.cpp:426
+msgid "Queue URLs after the currently playing track"
 msgstr ""
 
-#: amarokurls/NavigationUrlRunner.cpp:132
-msgctxt "A type of command that affects the view in the browser category"
-msgid "Navigate"
+#: App.cpp:428
+msgid "Load URLs, replacing current playlist"
 msgstr ""
 
-#: amarokurls/NavigationUrlGenerator.cpp:141
-#, kde-format
-msgid "Files (%1)"
+#: App.cpp:430
+msgid "Print verbose debugging information"
 msgstr ""
 
-#: amarokurls/NavigationUrlGenerator.cpp:189
-#, kde-format
-msgid "Album \"%1\" from %2"
+#: App.cpp:432
+msgid "Disable colorization for debug output."
 msgstr ""
 
-#: amarokurls/NavigationUrlGenerator.cpp:191
-#, kde-format
-msgid "Album \"%1\""
+#: App.cpp:434
+msgid "Allow running multiple Amarok instances"
 msgstr ""
 
-#: amarokurls/NavigationUrlGenerator.cpp:236
-#, kde-format
-msgid "Artist \"%1\" from %2"
+#: App.cpp:435
+msgid "Base for relative filenames/URLs"
 msgstr ""
 
-#: amarokurls/NavigationUrlGenerator.cpp:238
-#, kde-format
-msgid "Artist \"%1\""
+#: App.cpp:437
+msgid "Unit test options:"
 msgstr ""
 
-#: amarokurls/PlayUrlRunner.cpp:84
-msgctxt ""
-"A type of command that starts playing at a specific position in a track"
-msgid "Play"
+#: App.cpp:438
+msgid "Run integrated unit tests"
 msgstr ""
 
-#: amarokurls/BookmarkMetaActions.cpp:31
-msgid "Bookmark this Album"
+#: App.cpp:439
+msgid "Destination of test output: 'stdout', 'log'"
 msgstr ""
 
-#: amarokurls/BookmarkMetaActions.cpp:47
-msgid "Bookmark this Artist"
+#: App.cpp:440
+msgid "Format of test output: 'xml', 'lightxml', 'plaintext'"
 msgstr ""
 
-#: amarokurls/BookmarkMetaActions.cpp:62
-msgid "Add Position Marker"
+#: App.cpp:441
+msgid "Verbosity from 0-3 (highest)"
 msgstr ""
 
-#: amarokurls/ContextUrlGenerator.cpp:56
-#, kde-format
-msgid "Context: %1"
+#: App.cpp:636
+msgid ""
+"The embedded database was not found; you must set up a database server "
+"connection.\n"
+"You must restart Amarok after doing this."
 msgstr ""
 
-#: amarokurls/ContextUrlGenerator.cpp:65
-msgid "Bookmark Context View Applets"
+#: App.cpp:637
+msgid ""
+"The connection details for the database server were invalid.\n"
+"You must enter correct settings and restart Amarok after doing this."
 msgstr ""
 
-#: amarokurls/BookmarkModel.cpp:522
-msgid "New Group"
+#: App.cpp:638
+msgid "Database Error"
 msgstr ""
 
-#: amarokurls/BookmarkModel.cpp:548
-#: context/applets/similarartists/ArtistWidget.cpp:442
-#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:162
-#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:163
-#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:165
-#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:166
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:205
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:229
-msgid "none"
+#: App.cpp:683
+msgid "Moving files to trash"
 msgstr ""
 
-#: amarokurls/BookmarkManagerWidget.cpp:44
-msgid "Add Group"
+#: dynamic/DynamicModel.cpp:787
+msgctxt "Default name for new playlists"
+msgid "New playlist"
 msgstr ""
 
-#: amarokurls/BookmarkManagerWidget.cpp:55
-msgid "Filter bookmarks"
+#: dynamic/DynamicModel.cpp:926
+msgid "Rock and Pop"
 msgstr ""
 
-#: amarokurls/BookmarkManagerWidget.cpp:59
-msgid "Start typing to progressively filter the bookmarks"
+#: dynamic/DynamicModel.cpp:932
+msgid "Album play"
 msgstr ""
 
-#: amarokurls/BookmarkTreeView.cpp:112
-msgctxt "Load the view represented by this bookmark"
-msgid "&Load"
+#: dynamic/DynamicModel.cpp:941
+msgctxt "Name of a dynamic playlist"
+msgid "Rating"
 msgstr ""
 
-#: amarokurls/BookmarkTreeView.cpp:125
-msgid "&Create timecode track"
+#: dynamic/biases/AlbumPlayBias.cpp:38
+msgctxt "Name of the \"AlbumPlay\" bias"
+msgid "Album play"
 msgstr ""
 
-#: amarokurls/BookmarkTreeView.cpp:376
-msgid "New Timecode Track"
+#: dynamic/biases/AlbumPlayBias.cpp:47
+msgctxt "Description of the \"AlbumPlay\" bias"
+msgid "The \"AlbumPlay\" bias adds tracks that belong to one album."
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:90
-msgid "Manual"
-msgstr "Â llaw"
+#: dynamic/biases/AlbumPlayBias.cpp:108
+msgctxt "AlbumPlay bias representation"
+msgid "The next track from the album"
+msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:91
-msgid "Classical"
+#: dynamic/biases/AlbumPlayBias.cpp:111
+msgctxt "AlbumPlay bias representation"
+msgid "Any later track from the album"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:92
-msgid "Club"
+#: dynamic/biases/AlbumPlayBias.cpp:114
+msgctxt "AlbumPlay bias representation"
+msgid "Tracks from the same album"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:93
-msgid "Dance"
+#: dynamic/biases/AlbumPlayBias.cpp:124
+msgid "Track directly follows previous track in album"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:94
-msgid "Full Bass"
+#: dynamic/biases/AlbumPlayBias.cpp:126
+msgid "Track comes after previous track in album"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:95
-msgid "Full Treble"
+#: dynamic/biases/AlbumPlayBias.cpp:128
+msgid "Track is in the same album as previous track"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:96
-msgid "Full Bass + Treble"
+#: dynamic/biases/QuizPlayBias.cpp:44
+msgctxt "Name of the \"QuizPlay\" bias"
+msgid "Quiz play"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:97
-msgid "Laptop/Headphones"
+#: dynamic/biases/QuizPlayBias.cpp:53
+msgctxt "Description of the \"QuizPlay\" bias"
+msgid ""
+"The \"QuizPlay\" bias adds tracks that start\n"
+"with a character the last track ended with."
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:98
-msgid "Large Hall"
+#: dynamic/biases/QuizPlayBias.cpp:118
+msgctxt "QuizPlay bias representation"
+msgid ""
+"Tracks whose title start with a\n"
+" character the last track ended with"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:99
-msgid "Live"
+#: dynamic/biases/QuizPlayBias.cpp:121
+msgctxt "QuizPlay bias representation"
+msgid ""
+"Tracks whose artist name start\n"
+" with a character the last track ended with"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:100
-msgid "Party"
+#: dynamic/biases/QuizPlayBias.cpp:124
+msgctxt "QuizPlay bias representation"
+msgid ""
+"Tracks whose album name start\n"
+" with a character the last track ended with"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:101
-msgid "Pop"
+#: dynamic/biases/QuizPlayBias.cpp:135
+msgid ""
+"Last character of the previous song is\n"
+"the first character of the next song"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:102
-msgid "Reggae"
+#: dynamic/biases/QuizPlayBias.cpp:140
+msgid "of the track title (Title quiz)"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:103
-msgid "Rock"
+#: dynamic/biases/QuizPlayBias.cpp:142
+msgid "of the artist (Artist quiz)"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:104
-msgid "Soft"
+#: dynamic/biases/QuizPlayBias.cpp:144
+msgid "of the album name (Album quiz)"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:105
-msgid "Ska"
+#: dynamic/biases/TagMatchBias.cpp:45
+msgctxt "Name of the \"TagMatch\" bias"
+msgid "Match meta tag"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:106
-msgid "Soft Rock"
+#: dynamic/biases/TagMatchBias.cpp:54
+msgctxt "Description of the \"TagMatch\" bias"
+msgid ""
+"The \"TagMatch\" bias adds tracks that\n"
+"fulfill a specific condition."
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:107
-msgid "Techno"
+#: dynamic/biases/TagMatchBias.cpp:283
+#, kde-format
+msgctxt "Inverted condition in tag match bias"
+msgid "Not %1"
 msgstr ""
 
-#: equalizer/EqualizerPresets.cpp:108
-msgid "Zero"
+#: dynamic/biases/PartBias.cpp:44
+msgctxt "Name of the \"Part\" bias"
+msgid "Partition"
 msgstr ""
 
-#: playlist/PlaylistViewUrlRunner.cpp:110
-msgctxt ""
-"A type of command that affects the sorting, layout and filtering int he "
-"Playlist"
-msgid "Playlist"
+#: dynamic/biases/PartBias.cpp:53
+msgctxt "Description of the \"Part\" bias"
+msgid ""
+"The \"Part\" bias fills parts of the playlist from different sub-biases."
 msgstr ""
 
-#: playlist/PlaylistBreadcrumbLevel.cpp:31
-#: playlist/PlaylistBreadcrumbLevel.cpp:49
-#: playlist/proxymodels/SortScheme.cpp:92
-#: playlist/PlaylistBreadcrumbItem.cpp:124
-msgid "Shuffle"
+#: dynamic/biases/PartBias.cpp:260
+msgid "This controls what portion of the playlist should match the criteria"
 msgstr ""
 
-#: playlist/view/PlaylistViewCommon.cpp:140
-msgid "Stop Playing After This Track"
+#: dynamic/biases/PartBias.cpp:401
+msgctxt "Part bias representation"
+msgid "Partition"
 msgstr ""
 
-#: playlist/view/PlaylistViewCommon.cpp:149
-msgid "Remove From Playlist"
+#: dynamic/biases/EchoNestBias.cpp:47
+msgctxt "Name of the \"EchoNest\" bias"
+msgid "EchoNest similar artist"
 msgstr ""
 
-#: playlist/view/PlaylistViewCommon.cpp:213
-msgid "Select Source"
+#: dynamic/biases/EchoNestBias.cpp:56
+msgctxt "Description of the \"EchoNest\" bias"
+msgid ""
+"The \"EchoNest\" bias looks up tracks on echo nest and only adds similar "
+"tracks."
 msgstr ""
 
-#: playlist/view/listview/SourceSelectionPopup.cpp:35
-msgid "The following sources are available for this track:"
+#: dynamic/biases/EchoNestBias.cpp:126
+msgctxt "EchoNest bias representation"
+msgid "Similar to the previous track (as reported by EchoNest)"
 msgstr ""
 
-#: playlist/view/listview/SourceSelectionPopup.cpp:40
-msgid "Ok"
+#: dynamic/biases/EchoNestBias.cpp:129
+msgctxt "EchoNest bias representation"
+msgid ""
+"Similar to any track in the current playlist (as reported by EchoNest)"
 msgstr ""
 
-#: playlist/PlaylistInfoWidget.cpp:68
-#, kde-format
-msgctxt "%1 is number of tracks, %2 is time"
-msgid "%1 track (%2)"
-msgid_plural "%1 tracks (%2)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlist/PlaylistInfoWidget.cpp:94 playlist/PlaylistInfoWidget.cpp:100
-#, kde-format
-msgid "Total playlist size: %1"
+#: dynamic/biases/EchoNestBias.cpp:140
+msgid "Echo nest thinks the track is similar to"
 msgstr ""
 
-#: playlist/PlaylistInfoWidget.cpp:95
-#, kde-format
-msgid "Queue size: %1"
+#: dynamic/biases/EchoNestBias.cpp:143
+msgid "the previous Track"
 msgstr ""
 
-#: playlist/PlaylistInfoWidget.cpp:96
-#, kde-format
-msgid "Queue length: %1"
+#: dynamic/biases/EchoNestBias.cpp:145
+msgid "one of the tracks in the current playlist"
 msgstr ""
 
-#: playlist/PlaylistInfoWidget.cpp:108
-#, kde-format
-msgctxt "%1 is number of tracks"
-msgid "%1 track"
-msgid_plural "%1 tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: playlist/PlaylistInfoWidget.cpp:114
-msgid "No tracks"
+#: dynamic/biases/IfElseBias.cpp:37
+msgctxt "Name of the \"IfElse\" bias"
+msgid "If Else"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:33
-msgid "Track Progression"
+#: dynamic/biases/IfElseBias.cpp:46
+msgctxt "Description of the \"IfElse\" bias"
+msgid ""
+"The \"IfElse\" bias adds tracks that match at least one of the sub biases. "
+"It will only check the second sub-bias if the first doesn't return any "
+"results."
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:38
-msgid "Standard"
+#: dynamic/biases/IfElseBias.cpp:74
+msgctxt "IfElse bias representation"
+msgid "Match all sequentially"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:43
-msgid "Only Queue"
+#: dynamic/biases/IfElseBias.cpp:83
+msgctxt ""
+"Prefix for IfElseBias. Shown in front of a bias in the dynamic playlist view"
+msgid "else"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:51
-msgid "Repeat Track"
+#: dynamic/biases/SearchQueryBias.cpp:43
+msgctxt "Name of the \"SearchQuery\" bias"
+msgid "Search"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:55
-msgid "Repeat Album"
+#: dynamic/biases/SearchQueryBias.cpp:52
+msgctxt "Description of the \"SearchQuery\" bias"
+msgid ""
+"The \"SearchQuery\" bias adds tracks that are\n"
+"found by a search query. It uses the same search\n"
+"query as the collection browser."
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:59
-msgid "Repeat Playlist"
+#: dynamic/biases/SearchQueryBias.cpp:116 dynamic/Bias.cpp:138
+msgctxt "Random bias representation"
+msgid "Random songs"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:67
-msgid "Random Tracks"
+#: dynamic/biases/SearchQueryBias.cpp:119
+#, kde-format
+msgctxt "SearchQuery bias representation"
+msgid "Search for: %1"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:71
-msgid "Random Albums"
+#: dynamic/BiasFactory.cpp:53
+msgctxt "Name of the random bias"
+msgid "Random"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:77
-msgid "Favor"
+#: dynamic/BiasFactory.cpp:60
+msgctxt "Description of the random bias"
+msgid ""
+"The random bias adds random tracks from the\n"
+"whole collection without any bias."
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:83
-msgid "Higher Scores"
+#: dynamic/BiasFactory.cpp:71
+msgctxt "Name of the \"And\" bias"
+msgid "And"
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:86
-msgid "Higher Ratings"
+#: dynamic/BiasFactory.cpp:78
+msgctxt "Description of the \"And\" bias"
+msgid ""
+"The \"And\" bias adds tracks that match all\n"
+"of the sub biases."
 msgstr ""
 
-#: playlist/navigators/NavigatorConfigAction.cpp:89
-msgid "Not Recently Played"
+#: dynamic/BiasFactory.cpp:89
+msgctxt "Name of the \"Or\" bias"
+msgid "Or"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:45
-msgid "Warning: tracks have been hidden in the playlist"
+#: dynamic/BiasFactory.cpp:96
+msgctxt "Description of the \"Or\" bias"
+msgid ""
+"The \"Or\" bias adds tracks that match at\n"
+"least one of the sub biases."
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:49
-msgid "Search playlist"
+#: dynamic/BiasFactory.cpp:185 dynamic/BiasFactory.cpp:191
+#, kde-format
+msgid "Replacement for bias %1"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:53
-msgid "Start typing to progressively search through the playlist"
+#: dynamic/BiasedPlaylist.cpp:57
+msgctxt ""
+"Title for a default dynamic playlist. The default playlist only returns "
+"random tracks."
+msgid "Random"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:74
-#: context/applets/currenttrack/CurrentTrack.cpp:448
-msgid "Tracks"
+#: dynamic/BiasedPlaylist.cpp:137
+msgid "Generating playlist..."
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:81
-#: context/applets/albums/Albums.cpp:138
-#: context/applets/currenttrack/CurrentTrack.cpp:449
-msgid "Albums"
+#: dynamic/Bias.cpp:239
+msgctxt "And bias representation"
+msgid "Match all"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:88
-msgid "Artists"
+#: dynamic/Bias.cpp:257
+msgctxt ""
+"Prefix for AndBias. Shown in front of a bias in the dynamic playlist view"
+msgid "and"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:102
-msgid "Composers"
+#: dynamic/Bias.cpp:458
+msgctxt ""
+"Prefix for OrBias. Shown in front of a bias in the dynamic playlist view"
+msgid "or"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:125
-msgid "Show only matches"
+#: dynamic/Bias.cpp:466
+msgctxt "Or bias representation"
+msgid "Match any"
 msgstr ""
 
-#: playlist/ProgressiveSearchWidget.cpp:137
-msgid "Search Preferences"
+#: likeback/LikeBack.cpp:221
+msgid "&Send a Comment to the Developers"
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:242
-msgid "(...)"
+#: likeback/LikeBack.cpp:227
+msgid "Show &Feedback Icons"
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:257
-msgid "No extra information available"
+#: likeback/LikeBack.cpp:296
+#, kde-format
+msgctxt "Welcome dialog text, header text for test apps"
+msgid "Welcome to this testing version of %1."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:838
+#: likeback/LikeBack.cpp:301
 #, kde-format
-msgctxt ""
-"A saved playlist with the current time (KLocale::Shortdate) added between    "
-"                   the parentheses"
-msgid "Empty Playlist (%1)"
+msgctxt "Welcome dialog text, header text for released apps"
+msgid "Welcome to %1."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:866
-#, kde-format
+#: likeback/LikeBack.cpp:309
 msgctxt ""
-"A saved playlist with the current time (KLocale::Shortdate) added between    "
-"                   the parentheses"
-msgid "Various Tracks (%1)"
+"Welcome dialog text, explanation for both the like and dislike buttons"
+msgid ""
+"Each time you have a great or frustrating experience, please click on the "
+"appropriate face below the window title bar, briefly describe what you like "
+"or dislike and click on 'Send'."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:873
-msgid "Unknown Artist(s)"
+#: likeback/LikeBack.cpp:316
+msgctxt "Welcome dialog text, explanation for the like button alone"
+msgid ""
+"Each time you have a great experience, please click on the smiling face "
+"below the window title-bar, briefly describe what you like and click on "
+"'Send'."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:885
-msgid "Unknown Album(s)"
+#: likeback/LikeBack.cpp:323
+msgctxt "Welcome dialog text, explanation for the dislike button alone"
+msgid ""
+"Each time you have a frustrating experience, please click on the frowning "
+"face below the window title-bar, briefly describe what you dislike and click "
+"on 'Send'."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:888
-msgid "Various Albums"
+#: likeback/LikeBack.cpp:333
+msgctxt "Welcome dialog text, explanation for the bug button"
+msgid ""
+"If you experience an improper behavior in the application, just click on the "
+"bug icon in the top-right corner of the window and follow the instructions "
+"to submit a bug report."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:890
-#, kde-format
-msgctxt "A saved playlist titled <artist> - <album>"
-msgid "%1 - %2"
+#: likeback/LikeBack.cpp:345
+msgctxt "Welcome dialog text, usage example"
+msgid "<b>I like</b> the new artwork. Very refreshing."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:900
-msgctxt "The name of the file this track is stored in"
-msgid "Filename"
+#: likeback/LikeBack.cpp:353
+msgctxt "Welcome dialog text, usage example"
+msgid ""
+"<b>I dislike</b> the welcome page of this assistant. Too time consuming."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:908
-msgctxt "The Track number for this item"
-msgid "Track"
+#: likeback/LikeBack.cpp:361
+msgctxt "Welcome dialog text, usage example"
+msgid ""
+"<b>The application shows an improper behavior</b> when clicking the Add "
+"button. Nothing happens."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:912
-msgctxt "The location on disc of this track"
-msgid "Directory"
+#: likeback/LikeBack.cpp:369
+msgctxt "Welcome dialog text, usage example"
+msgid "<b>I desire a new feature</b> allowing me to send my work by email."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:919
-#: context/applets/currenttrack/CurrentTrack.cpp:448
-msgid "Play Count"
+#: likeback/LikeBack.cpp:382
+msgctxt "Welcome dialog text, us=the developers, it=the application"
+msgid "To help us improve it, your comments are important."
 msgstr ""
 
-#: playlist/PlaylistModel.cpp:920
-msgctxt "Column name"
-msgid "Last Played"
-msgstr ""
+#: likeback/LikeBack.cpp:385
+msgctxt "Welcome dialog text, header for the examples"
+msgid "Example"
+msgid_plural "Examples"
+msgstr[0] ""
+msgstr[1] ""
 
-#: playlist/PlaylistModel.cpp:921
-msgid "Mood"
+#: likeback/LikeBack.cpp:391
+msgctxt "Welcome dialog title"
+msgid "Help Improve the Application"
 msgstr ""
 
-#: playlist/PlaylistDock.cpp:105
-msgid "Dynamic Mode Enabled"
+#: likeback/LikeBackDialog.cpp:43
+msgid "Send a Comment to the Developers"
 msgstr ""
 
-#: playlist/PlaylistDock.cpp:184
-msgid "&Save Current Playlist"
+#: likeback/LikeBackDialog.cpp:155
+#, kde-format
+msgctxt ""
+"Feedback dialog text, message with one accepted language for the comments"
+msgid ""
+"Please, write it in <b>%1</b> (you may want to use an <a href=\"%2\">online "
+"translation tool</a> for this).<br/>"
 msgstr ""
 
-#: playlist/PlaylistDock.cpp:268
+#: likeback/LikeBackDialog.cpp:162
 #, kde-format
-msgid "&Save playlist to \"%1\""
+msgctxt ""
+"Feedback dialog text, message with list of accepted languages for the "
+"comments"
+msgid ""
+"Please, write it in <b>%1 or %2</b> (you may want to use an <a "
+"href=\"%3\">online translation tool</a> for this).<br/>"
 msgstr ""
 
-#: playlist/PlaylistViewUrlGenerator.cpp:82
-#, kde-format
-msgid "Filter %1"
+#: likeback/LikeBackDialog.cpp:175
+msgctxt ""
+"Feedback dialog text, message to remind to balance the likes and dislikes"
+msgid ""
+"To make the comments you send more useful in improving this application, try "
+"to send the same amount of positive and negative comments.<br/>"
 msgstr ""
 
-#: playlist/PlaylistViewUrlGenerator.cpp:83
-#, kde-format
-msgid "Search %1"
+#: likeback/LikeBackDialog.cpp:184
+msgctxt "Feedback dialog text, text to disallow feature requests"
+msgid ""
+"Please, do not ask for new features: this kind of request will be "
+"ignored.<br/>"
 msgstr ""
 
-#: playlist/PlaylistViewUrlGenerator.cpp:90
+#: likeback/LikeBackDialog.cpp:190
 #, kde-format
-msgid "%1 layout"
+msgctxt ""
+"Feedback dialog text, %1=Application name,%2=message with list of accepted "
+"languages for the comment,%3=optional text to remind to balance the likes "
+"and dislikes,%4=optional text to disallow feature requests."
+msgid ""
+"<p>You can provide the developers a brief description of your opinions about "
+"%1.<br/>%2 %3%4</p>"
 msgstr ""
 
-#: playlist/UndoCommands.cpp:32
-msgid "Tracks Added"
+#: likeback/LikeBackDialog.cpp:236
+#, kde-format
+msgid ""
+"The email address you have entered is not valid, and cannot be used: '%1'"
 msgstr ""
 
-#: playlist/UndoCommands.cpp:54
-msgid "Tracks Removed"
+#: likeback/LikeBackDialog.cpp:242
+#, kde-format
+msgid ""
+"Please double check your email address for errors, because it appears to be "
+"an exotic one.\n"
+"%1"
 msgstr ""
 
-#: playlist/UndoCommands.cpp:76
-msgid "Track moved"
+#: likeback/LikeBackDialog.cpp:308
+msgctxt "Dialog box text"
+msgid ""
+"<p>Your comment has been sent successfully.</p><p>Thank you for your "
+"time.</p>"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:34
-msgctxt "Empty placeholder token used for spacing in playlist layouts"
-msgid "Placeholder"
+#: likeback/LikeBackDialog.cpp:310
+msgctxt "Dialog box title"
+msgid "Comment Sent"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:35
-msgctxt "'Album' playlist column name and token for playlist layouts"
-msgid "Album"
+#: likeback/LikeBackDialog.cpp:321
+msgctxt "Dialog box text"
+msgid ""
+"<p>There has been an error while trying to send the comment.</p><p>Please, "
+"try again later.</p>"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:36
-msgctxt "'Album artist' playlist column name and token for playlist layouts"
-msgid "Album artist"
+#: likeback/LikeBackDialog.cpp:323
+msgctxt "Dialog box title"
+msgid "Comment Sending Error"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:37
-msgctxt "'Artist' playlist column name and token for playlist layouts"
-msgid "Artist"
+#: KNotificationBackend.cpp:146
+msgid "Now playing"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:38
-msgctxt "'Bitrate' playlist column name and token for playlist layouts"
-msgid "Bitrate"
+#: playlistmanager/sql/SqlPlaylist.cpp:40
+msgid "Playlist in database"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:39
-msgctxt ""
-"'Beats per minute' playlist column name and token for playlist layouts"
-msgid "BPM"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:90
+msgid "Confirm Rename"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:40
-msgctxt "'Comment' playlist column name and token for playlist layouts"
-msgid "Comment"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:92
+#, kde-format
+msgid "Are you sure you want to rename this playlist to '%1'?"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:41
-msgctxt "'Composer' playlist column name and token for playlist layouts"
-msgid "Composer"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:93
+msgid "Yes, rename this playlist."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:42
-msgctxt "'Cover image' playlist column name and token for playlist layouts"
-msgid "Cover image"
-msgstr ""
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:119
+#: playlistmanager/file/PlaylistFileProvider.cpp:455
+#, kde-format
+msgid "Are you sure you want to delete this playlist?"
+msgid_plural "Are you sure you want to delete these %1 playlists?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: playlist/PlaylistColumnNames.cpp:43
-msgctxt "'Directory' playlist column name and token for playlist layouts"
-msgid "Directory"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:125
+msgid "Yes, delete from database."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:44
-msgctxt "'Disc number' playlist column name and token for playlist layouts"
-msgid "Disc number"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:190
+#: playlistmanager/file/PlaylistFileProvider.cpp:150
+msgid "&Rename..."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:45
-msgctxt ""
-"'Divider' token for playlist layouts representing a small visual divider"
-msgid "Divider"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:202
+#: playlistmanager/file/PlaylistFileProvider.cpp:162
+msgid "&Delete..."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:46
-msgctxt "'File name' playlist column name and token for playlist layouts"
-msgid "File name"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:247
+#: playlistmanager/file/PlaylistFileProvider.cpp:218
+msgid "Remove tracks"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:47
-msgctxt "'File size' playlist column name and token for playlist layouts"
-msgid "File size"
+#: playlistmanager/sql/SqlUserPlaylistProvider.cpp:250
+#: playlistmanager/file/PlaylistFileProvider.cpp:221
+#, kde-format
+msgctxt "Remove a track from a saved playlist"
+msgid "Remove From \"%1\""
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:48
-msgctxt "'Genre' playlist column name and token for playlist layouts"
-msgid "Genre"
+#: playlistmanager/sql/SqlUserPlaylistProvider.h:44
+msgid "Amarok Database"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:49
-msgctxt ""
-"'Group length' (total play time of group) playlist column name and token for "
-"playlist layouts"
-msgid "Group length"
+#: playlistmanager/sql/SqlUserPlaylistProvider.h:45
+msgid "Local playlists stored in the database"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:50
-msgctxt ""
-"'Group tracks' (number of tracks in group) playlist column name and token "
-"for playlist layouts"
-msgid "Group tracks"
+#: playlistmanager/file/PlaylistFileProvider.cpp:106
+msgid "Playlist Files on Disk"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:51
-msgctxt "'Labels' playlist column name and token for playlist layouts"
-msgid "Labels"
+#: playlistmanager/file/PlaylistFileProvider.cpp:385
+#, kde-format
+msgid "The playlist file \"%1\" could not be loaded."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:52
-msgctxt ""
-"'Last played' (when was track last played) playlist column name and token "
-"for playlist layouts"
-msgid "Last played"
+#: playlistmanager/file/PlaylistFileProvider.cpp:461
+msgid "Yes, delete from disk."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:53 playlist/PlaylistColumnNames.cpp:54
-msgctxt ""
-"'Length' (track length) playlist column name and token for playlist layouts"
-msgid "Length"
+#: playlistmanager/PlaylistManager.cpp:320
+msgid "Downloading Playlist"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:55
-msgctxt "'Mood' playlist column name and token for playlist layouts"
-msgid "Mood"
+#: playlistmanager/SyncedPlaylist.cpp:42 playlistmanager/SyncedPlaylist.cpp:50
+#: playlistmanager/SyncedPlaylist.cpp:58
+msgid "<Empty>"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:56
-msgctxt "'Moodbar' playlist column name and token for playlist layouts"
-msgid "Moodbar"
+#: playlistmanager/SyncedPlaylist.cpp:65
+#, kde-format
+msgid "Synchronized on: %1"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:57
-msgctxt "'Play count' playlist column name and token for playlist layouts"
-msgid "Play count"
+#: playlist/PlaylistSortWidget.cpp:43
+msgid "Clear the playlist sorting configuration."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:58
-msgctxt "'Rating' playlist column name and token for playlist layouts"
-msgid "Rating"
+#: playlist/PlaylistSortWidget.cpp:53
+msgid "Add a playlist sorting level."
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:59
-msgctxt "'Sample rate' playlist column name and token for playlist layouts"
-msgid "Sample rate"
-msgstr ""
+#: playlist/PlaylistInfoWidget.cpp:68
+#, kde-format
+msgctxt "%1 is number of tracks, %2 is time"
+msgid "%1 track (%2)"
+msgid_plural "%1 tracks (%2)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: playlist/PlaylistColumnNames.cpp:60
-msgctxt "'Score' playlist column name and token for playlist layouts"
-msgid "Score"
+#: playlist/PlaylistInfoWidget.cpp:94 playlist/PlaylistInfoWidget.cpp:100
+#, kde-format
+msgid "Total playlist size: %1"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:61
-msgctxt ""
-"'Source' (local collection, Magnatune.com, last.fm, ... ) playlist column "
-"name and token for playlist layouts"
-msgid "Source"
+#: playlist/PlaylistInfoWidget.cpp:95
+#, kde-format
+msgid "Queue size: %1"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:62
-msgctxt "'SourceEmblem' playlist column name and token for playlist layouts"
-msgid "SourceEmblem"
+#: playlist/PlaylistInfoWidget.cpp:96
+#, kde-format
+msgid "Queue length: %1"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:63
-msgctxt ""
-"'Title' (track name) playlist column name and token for playlist layouts"
-msgid "Title"
-msgstr ""
+#: playlist/PlaylistInfoWidget.cpp:108
+#, kde-format
+msgctxt "%1 is number of tracks"
+msgid "%1 track"
+msgid_plural "%1 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: playlist/PlaylistColumnNames.cpp:64
-msgctxt ""
-"'Title (with track number)' (track name prefixed with the track number) "
-"playlist column name and token for playlist layouts"
-msgid "Title (with track number)"
+#: playlist/PlaylistInfoWidget.cpp:114
+msgid "No tracks"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:65
-msgctxt "'Track number' playlist column name and token for playlist layouts"
-msgid "Track number"
+#: playlist/view/listview/SourceSelectionPopup.cpp:35
+msgid "The following sources are available for this track:"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:66
-msgctxt ""
-"'Type' (file format) playlist column name and token for playlist layouts"
-msgid "Type"
+#: playlist/view/listview/SourceSelectionPopup.cpp:40
+msgid "Ok"
 msgstr ""
 
-#: playlist/PlaylistColumnNames.cpp:67
-msgctxt "'Year' playlist column name and token for playlist layouts"
-msgid "Year"
+#: playlist/view/PlaylistViewCommon.cpp:152
+msgid "Stop Playing After This Track"
 msgstr ""
 
-#: playlist/layouts/LayoutEditWidget.cpp:41
-#: playlist/layouts/LayoutEditWidget.cpp:56
-msgid "Show cover"
+#: playlist/view/PlaylistViewCommon.cpp:164
+msgid "Remove From Playlist"
 msgstr ""
 
-#: playlist/layouts/LayoutEditWidget.cpp:82
-msgid "Invalid playlist layout."
+#: playlist/view/PlaylistViewCommon.cpp:234
+msgid "Select Source"
 msgstr ""
 
-#: playlist/layouts/LayoutEditWidget.cpp:83
-msgid "Encountered an unknown element name while reading layout."
+#: playlist/proxymodels/SortScheme.cpp:92
+#: playlist/PlaylistBreadcrumbLevel.cpp:31
+#: playlist/PlaylistBreadcrumbLevel.cpp:49
+#: playlist/PlaylistBreadcrumbItem.cpp:124
+msgid "Shuffle"
 msgstr ""
 
 #: playlist/layouts/LayoutEditDialog.cpp:75
@@ -12738,37 +13125,6 @@
 msgid "Configuration for '%1'"
 msgstr ""
 
-#: playlist/layouts/LayoutManager.cpp:107
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:414
-#, kde-format
-msgid "copy of %1"
-msgstr ""
-
-#: playlist/layouts/LayoutManager.cpp:115
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:422
-#, kde-format
-msgctxt ""
-"adds a copy number to a generated name if the name already exists, for "
-"instance 'copy of Foo 2' if 'copy of Foo' is taken"
-msgid "%1 %2"
-msgstr ""
-
-#: playlist/layouts/LayoutManager.cpp:119
-#, kde-format
-msgid ""
-"Current layout '%1' is read only. Creating a new layout '%2' with your "
-"changes and setting this as active"
-msgstr ""
-
-#: playlist/layouts/LayoutManager.cpp:413
-#, kde-format
-msgid "The layout '%1' is one of the default layouts and cannot be deleted."
-msgstr ""
-
-#: playlist/layouts/LayoutManager.cpp:413
-msgid "Cannot Delete Default Layouts"
-msgstr ""
-
 #: playlist/layouts/PlaylistLayoutEditDialog.cpp:104
 msgid "Head"
 msgstr ""
@@ -12834,1112 +13190,1235 @@
 msgid "Cannot create a layout containing '/'."
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:227
-#, kde-format
-msgid ""
-"Please enter a name for the playlist layout you are about to define as copy "
-"of the layout '%1':"
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:227
+#, kde-format
+msgid ""
+"Please enter a name for the playlist layout you are about to define as copy "
+"of the layout '%1':"
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:284
+msgid "Choose a new name for the playlist layout"
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:285
+msgid ""
+"Please enter a new name for the playlist layout you are about to rename:"
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:293
+msgid "Cannot rename a layout to have no name."
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:295
+msgid "Cannot rename a layout to have the same name as an existing layout."
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:414
+#: playlist/layouts/LayoutManager.cpp:107
+#, kde-format
+msgid "copy of %1"
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:422
+#: playlist/layouts/LayoutManager.cpp:115
+#, kde-format
+msgctxt ""
+"adds a copy number to a generated name if the name already exists, for "
+"instance 'copy of Foo 2' if 'copy of Foo' is taken"
+msgid "%1 %2"
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:425
+#, kde-format
+msgid ""
+"The layout '%1' you modified is one of the default layouts and cannot be "
+"overwritten. Saved as new layout '%2'"
+msgstr ""
+
+#: playlist/layouts/PlaylistLayoutEditDialog.cpp:427
+msgid "Default Layout"
+msgstr ""
+
+#: playlist/layouts/LayoutConfigAction.cpp:44
+msgid "Playlist Layouts"
+msgstr ""
+
+#: playlist/layouts/LayoutConfigAction.cpp:70
+msgid "Configure Playlist Layouts..."
+msgstr ""
+
+#: playlist/layouts/LayoutEditWidget.cpp:41
+#: playlist/layouts/LayoutEditWidget.cpp:56
+msgid "Show cover"
+msgstr ""
+
+#: playlist/layouts/LayoutEditWidget.cpp:82
+msgid "Invalid playlist layout."
+msgstr ""
+
+#: playlist/layouts/LayoutEditWidget.cpp:83
+msgid "Encountered an unknown element name while reading layout."
+msgstr ""
+
+#: playlist/layouts/LayoutManager.cpp:119
+#, kde-format
+msgid ""
+"Current layout '%1' is read only. Creating a new layout '%2' with your "
+"changes and setting this as active"
+msgstr ""
+
+#: playlist/layouts/LayoutManager.cpp:413
+#, kde-format
+msgid "The layout '%1' is one of the default layouts and cannot be deleted."
+msgstr ""
+
+#: playlist/layouts/LayoutManager.cpp:413
+msgid "Cannot Delete Default Layouts"
+msgstr ""
+
+#: playlist/PlaylistViewUrlRunner.cpp:110
+msgctxt ""
+"A type of command that affects the sorting, layout and filtering int he "
+"Playlist"
+msgid "Playlist"
+msgstr ""
+
+#: playlist/PlaylistDock.cpp:105
+msgid "Dynamic Mode Enabled"
+msgstr ""
+
+#: playlist/PlaylistDock.cpp:175
+msgid "&Save Current Playlist"
+msgstr ""
+
+#: playlist/PlaylistDock.cpp:267
+#, kde-format
+msgid "&Save playlist to \"%1\""
+msgstr ""
+
+#: playlist/PlaylistViewUrlGenerator.cpp:82
+#, kde-format
+msgid "Filter %1"
+msgstr ""
+
+#: playlist/PlaylistViewUrlGenerator.cpp:83
+#, kde-format
+msgid "Search %1"
+msgstr ""
+
+#: playlist/PlaylistViewUrlGenerator.cpp:90
+#, kde-format
+msgid "%1 layout"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:33
+msgid "Track Progression"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:38
+msgid "Standard"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:43
+msgid "Only Queue"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:51
+msgid "Repeat Track"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:55
+msgid "Repeat Album"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:59
+msgid "Repeat Playlist"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:67
+msgid "Random Tracks"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:71
+msgid "Random Albums"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:77
+msgid "Favor"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:83
+msgid "Higher Scores"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:86
+msgid "Higher Ratings"
+msgstr ""
+
+#: playlist/navigators/NavigatorConfigAction.cpp:89
+msgid "Not Recently Played"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:271
+msgid "(...)"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:286
+msgid "No extra information available"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:861
+msgctxt "The name of the file this track is stored in"
+msgid "Filename"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:869
+msgctxt "The Track number for this item"
+msgid "Track"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:873
+msgctxt "The location on disc of this track"
+msgid "Directory"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:881
+msgctxt "Column name"
+msgid "Last Played"
+msgstr ""
+
+#: playlist/PlaylistModel.cpp:882
+msgid "Mood"
+msgstr ""
+
+#: playlist/ProgressiveSearchWidget.cpp:45
+msgid "Warning: tracks have been hidden in the playlist"
+msgstr ""
+
+#: playlist/ProgressiveSearchWidget.cpp:53
+msgid "Start typing to progressively search through the playlist"
+msgstr ""
+
+#: playlist/ProgressiveSearchWidget.cpp:102
+msgid "Composers"
+msgstr ""
+
+#: playlist/ProgressiveSearchWidget.cpp:125
+msgid "Show only matches"
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:284
-msgid "Choose a new name for the playlist layout"
+#: playlist/ProgressiveSearchWidget.cpp:137
+msgid "Search Preferences"
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:285
-msgid ""
-"Please enter a new name for the playlist layout you are about to rename:"
+#: playlist/PlaylistColumnNames.cpp:34
+msgctxt "Empty placeholder token used for spacing in playlist layouts"
+msgid "Placeholder"
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:293
-msgid "Cannot rename a layout to have no name."
+#: playlist/PlaylistColumnNames.cpp:35
+msgctxt "'Album' playlist column name and token for playlist layouts"
+msgid "Album"
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:295
-msgid "Cannot rename a layout to have the same name as an existing layout."
+#: playlist/PlaylistColumnNames.cpp:36
+msgctxt "'Album artist' playlist column name and token for playlist layouts"
+msgid "Album artist"
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:425
-#, kde-format
-msgid ""
-"The layout '%1' you modified is one of the default layouts and cannot be "
-"overwritten. Saved as new layout '%2'"
+#: playlist/PlaylistColumnNames.cpp:37
+msgctxt "'Artist' playlist column name and token for playlist layouts"
+msgid "Artist"
 msgstr ""
 
-#: playlist/layouts/PlaylistLayoutEditDialog.cpp:427
-msgid "Default Layout"
+#: playlist/PlaylistColumnNames.cpp:38
+msgctxt "'Bitrate' playlist column name and token for playlist layouts"
+msgid "Bitrate"
 msgstr ""
 
-#: playlist/layouts/LayoutConfigAction.cpp:44
-msgid "Playlist Layouts"
+#: playlist/PlaylistColumnNames.cpp:39
+msgctxt ""
+"'Beats per minute' playlist column name and token for playlist layouts"
+msgid "BPM"
 msgstr ""
 
-#: playlist/layouts/LayoutConfigAction.cpp:70
-msgid "Configure Playlist Layouts..."
+#: playlist/PlaylistColumnNames.cpp:40
+msgctxt "'Comment' playlist column name and token for playlist layouts"
+msgid "Comment"
 msgstr ""
 
-#: playlist/PlaylistSortWidget.cpp:43
-msgid "Clear the playlist sorting configuration."
+#: playlist/PlaylistColumnNames.cpp:41
+msgctxt "'Composer' playlist column name and token for playlist layouts"
+msgid "Composer"
 msgstr ""
 
-#: playlist/PlaylistSortWidget.cpp:53
-msgid "Add a playlist sorting level."
+#: playlist/PlaylistColumnNames.cpp:42
+msgctxt "'Cover image' playlist column name and token for playlist layouts"
+msgid "Cover image"
 msgstr ""
 
-#: playlist/PlaylistBreadcrumbItem.cpp:112
-msgid "Add a sorting level to the playlist."
+#: playlist/PlaylistColumnNames.cpp:43
+msgctxt "'Directory' playlist column name and token for playlist layouts"
+msgid "Directory"
 msgstr ""
 
-#: PluginManager.cpp:253
-msgid ""
-"<p>Amarok could not find any collection plugins. It is possible that Amarok "
-"is installed under the wrong prefix, please fix your installation "
-"using:<pre>$ cd /path/to/amarok/source-code/<br>$ su -c \"make "
-"uninstall\"<br>$ cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` && su -"
-"c \"make install\"<br>$ kbuildsycoca4 --noincremental<br>$ amarok</pre>More "
-"information can be found in the README file. For further assistance join us "
-"at #amarok on irc.freenode.net.</p>"
+#: playlist/PlaylistColumnNames.cpp:44
+msgctxt "'Disc number' playlist column name and token for playlist layouts"
+msgid "Disc number"
 msgstr ""
 
-#: configdialog/dialogs/ScriptsConfig.cpp:50
-msgid "Generic"
+#: playlist/PlaylistColumnNames.cpp:45
+msgctxt ""
+"'Divider' token for playlist layouts representing a small visual divider"
+msgid "Divider"
 msgstr ""
 
-#: configdialog/dialogs/ScriptsConfig.cpp:58
-msgid "Scriptable Service"
+#: playlist/PlaylistColumnNames.cpp:46
+msgctxt "'File name' playlist column name and token for playlist layouts"
+msgid "File name"
 msgstr ""
 
-#: configdialog/dialogs/ScriptsConfig.cpp:75
-msgid ""
-"<p>Script successfully installed.</p><p>Please restart Amarok to start the "
-"script.</p>"
+#: playlist/PlaylistColumnNames.cpp:47
+msgctxt "'File size' playlist column name and token for playlist layouts"
+msgid "File size"
 msgstr ""
 
-#: configdialog/dialogs/ScriptsConfig.cpp:78
-msgid ""
-"<p>Script successfully uninstalled.</p><p>Please restart Amarok to totally "
-"remove the script.</p>"
+#: playlist/PlaylistColumnNames.cpp:48
+msgctxt "'Genre' playlist column name and token for playlist layouts"
+msgid "Genre"
 msgstr ""
 
-#: configdialog/dialogs/DatabaseConfig.cpp:93
+#: playlist/PlaylistColumnNames.cpp:49
 msgctxt ""
-"A default password for insertion into an example SQL command (so as not to "
-"print the real one). To be manually replaced by the user."
-msgid "password"
+"'Group length' (total play time of group) playlist column name and token for "
+"playlist layouts"
+msgid "Group length"
 msgstr ""
 
-#: configdialog/dialogs/PlaybackConfig.cpp:75
-msgid "Sound System - Amarok"
+#: playlist/PlaylistColumnNames.cpp:50
+msgctxt ""
+"'Group tracks' (number of tracks in group) playlist column name and token "
+"for playlist layouts"
+msgid "Group tracks"
 msgstr ""
 
-#: configdialog/dialogs/MediadeviceConfig.cpp:40
-msgid "Media Devices"
+#: playlist/PlaylistColumnNames.cpp:51
+msgctxt "'Labels' playlist column name and token for playlist layouts"
+msgid "Labels"
 msgstr ""
 
-#: configdialog/dialogs/MediadeviceConfig.cpp:50
-msgid "Generic Devices and Volumes..."
+#: playlist/PlaylistColumnNames.cpp:52
+msgctxt ""
+"'Last played' (when was track last played) playlist column name and token "
+"for playlist layouts"
+msgid "Last played"
 msgstr ""
 
-#: configdialog/dialogs/MediadeviceConfig.cpp:53
-msgid "Add Device..."
-msgstr "Ychwanegu Dyfais..."
-
-#: configdialog/dialogs/PluginsConfig.cpp:44
-msgid "Collections"
+#: playlist/PlaylistColumnNames.cpp:53 playlist/PlaylistColumnNames.cpp:54
+msgctxt ""
+"'Length' (track length) playlist column name and token for playlist layouts"
+msgid "Length"
 msgstr ""
 
-#: configdialog/dialogs/PluginsConfig.cpp:48
-msgid "Internet Services"
+#: playlist/PlaylistColumnNames.cpp:55
+msgctxt "'Mood' playlist column name and token for playlist layouts"
+msgid "Mood"
 msgstr ""
 
-#: configdialog/dialogs/PluginsConfig.cpp:52
-msgid "Devices"
-msgstr "Dyfeisiadau"
-
-#: configdialog/ConfigDialog.cpp:58
-msgctxt "Miscellaneous settings"
-msgid "General"
+#: playlist/PlaylistColumnNames.cpp:56
+msgctxt "'Moodbar' playlist column name and token for playlist layouts"
+msgid "Moodbar"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:58
-msgid "Configure General Options"
+#: playlist/PlaylistColumnNames.cpp:57
+msgctxt "'Play count' playlist column name and token for playlist layouts"
+msgid "Play count"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:59
-msgid "Configure Collection"
+#: playlist/PlaylistColumnNames.cpp:58
+msgctxt "'Rating' playlist column name and token for playlist layouts"
+msgid "Rating"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:60
-msgid "Playback"
+#: playlist/PlaylistColumnNames.cpp:59
+msgctxt "'Sample rate' playlist column name and token for playlist layouts"
+msgid "Sample rate"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:60
-msgid "Configure Playback"
+#: playlist/PlaylistColumnNames.cpp:60
+msgctxt "'Score' playlist column name and token for playlist layouts"
+msgid "Score"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:61
-msgid "Notifications"
+#: playlist/PlaylistColumnNames.cpp:61
+msgctxt ""
+"'Source' (local collection, Magnatune.com, last.fm, ... ) playlist column "
+"name and token for playlist layouts"
+msgid "Source"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:61
-msgid "Configure Notifications"
+#: playlist/PlaylistColumnNames.cpp:62
+msgctxt "'SourceEmblem' playlist column name and token for playlist layouts"
+msgid "SourceEmblem"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:62
-msgid "Database"
+#: playlist/PlaylistColumnNames.cpp:63
+msgctxt ""
+"'Title' (track name) playlist column name and token for playlist layouts"
+msgid "Title"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:62
-msgid "Configure Database"
+#: playlist/PlaylistColumnNames.cpp:64
+msgctxt ""
+"'Title (with track number)' (track name prefixed with the track number) "
+"playlist column name and token for playlist layouts"
+msgid "Title (with track number)"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:63
-msgid "Plugins"
-msgstr "Ategion"
-
-#: configdialog/ConfigDialog.cpp:63
-msgid "Configure Plugins"
+#: playlist/PlaylistColumnNames.cpp:65
+msgctxt "'Track number' playlist column name and token for playlist layouts"
+msgid "Track number"
 msgstr ""
 
-#: configdialog/ConfigDialog.cpp:64
-msgid "Scripts"
-msgstr "Sgriptiau"
+#: playlist/PlaylistColumnNames.cpp:66
+msgctxt ""
+"'Type' (file format) playlist column name and token for playlist layouts"
+msgid "Type"
+msgstr ""
 
-#: configdialog/ConfigDialog.cpp:64
-msgid "Configure Scripts"
+#: playlist/PlaylistColumnNames.cpp:67
+msgctxt "'Year' playlist column name and token for playlist layouts"
+msgid "Year"
 msgstr ""
 
-#: context/toolbar/AppletItemOverlay.cpp:104
-#: context/toolbar/AppletToolbarAppletItem.cpp:58
-msgid "Remove Applet"
+#: playlist/PlaylistBreadcrumbItem.cpp:112
+msgid "Add a sorting level to the playlist."
 msgstr ""
 
-#: context/toolbar/AppletToolbarAppletItem.cpp:53
-msgid "no applet name"
+#: playlist/UndoCommands.cpp:32
+msgid "Tracks Added"
 msgstr ""
 
-#: context/toolbar/AppletToolbarAddItem.cpp:47
-msgid "Add Applets..."
+#: playlist/UndoCommands.cpp:54
+msgid "Tracks Removed"
 msgstr ""
 
-#: context/toolbar/AppletToolbarAddItem.cpp:71
-msgid "Add Applet..."
+#: playlist/UndoCommands.cpp:76
+msgid "Track moved"
 msgstr ""
 
-#: context/toolbar/AppletToolbarConfigItem.cpp:36
-msgid "Configure Applets..."
+#: equalizer/EqualizerPresets.cpp:90
+msgid "Manual"
+msgstr "Â llaw"
+
+#: equalizer/EqualizerPresets.cpp:91
+msgid "Classical"
 msgstr ""
 
-#: context/ContextDock.cpp:30
-msgid "&Context"
+#: equalizer/EqualizerPresets.cpp:92
+msgid "Club"
 msgstr ""
 
-#: context/engines/current/CurrentEngine.cpp:145
-#: context/applets/albums/Albums.cpp:65
-msgid "Recently Added Albums"
+#: equalizer/EqualizerPresets.cpp:93
+msgid "Dance"
 msgstr ""
 
-#: context/engines/current/CurrentEngine.cpp:214
-msgctxt "Header text for current album applet"
-msgid "Albums"
+#: equalizer/EqualizerPresets.cpp:94
+msgid "Full Bass"
 msgstr ""
 
-#: context/engines/current/CurrentEngine.cpp:225
-#, kde-format
-msgid "Albums by %1"
-msgstr "Albymau gan %1"
+#: equalizer/EqualizerPresets.cpp:95
+msgid "Full Treble"
+msgstr ""
 
-#: context/engines/labels/LabelsEngine.cpp:132
-#: context/engines/labels/LabelsEngine.cpp:195
-#: context/engines/labels/LabelsEngine.cpp:256
-#: context/engines/labels/LabelsEngine.cpp:266
-#: context/engines/labels/LabelsEngine.cpp:300
-#: context/engines/labels/LabelsEngine.cpp:351
-msgid "No labels found on Last.fm"
+#: equalizer/EqualizerPresets.cpp:96
+msgid "Full Bass + Treble"
 msgstr ""
 
-#: context/engines/labels/LabelsEngine.cpp:319
-msgid "Unable to retrieve from Last.fm"
+#: equalizer/EqualizerPresets.cpp:97
+msgid "Laptop/Headphones"
 msgstr ""
 
-#: context/engines/labels/LabelsEngine.cpp:369
-msgid "No connection to Last.fm"
+#: equalizer/EqualizerPresets.cpp:98
+msgid "Large Hall"
 msgstr ""
 
-#: context/engines/videoclip/VideoclipEngine.cpp:207
-#, kde-format
-msgid "Unable to retrieve Youtube information: %1"
+#: equalizer/EqualizerPresets.cpp:99
+msgid "Live"
 msgstr ""
 
-#: context/engines/videoclip/VideoclipEngine.cpp:354
-#, kde-format
-msgid "Unable to retrieve Dailymotion information: %1"
+#: equalizer/EqualizerPresets.cpp:100
+msgid "Party"
 msgstr ""
 
-#: context/engines/videoclip/VideoclipEngine.cpp:496
-#, kde-format
-msgid "Unable to retrieve Vimeo information: %1"
+#: equalizer/EqualizerPresets.cpp:101
+msgid "Pop"
 msgstr ""
 
-#: context/engines/videoclip/VideoclipEngine.cpp:542
-#, kde-format
-msgid "Unable to retrieve Vimeo Bis information: %1"
+#: equalizer/EqualizerPresets.cpp:102
+msgid "Reggae"
 msgstr ""
 
-#: context/engines/videoclip/VideoclipEngine.cpp:669
-msgid "No video clip found..."
+#: equalizer/EqualizerPresets.cpp:103
+msgid "Rock"
 msgstr ""
 
-#: context/engines/photos/PhotosEngine.cpp:204
-#, kde-format
-msgid "Unable to retrieve from Flickr.com: %1"
+#: equalizer/EqualizerPresets.cpp:104
+msgid "Soft"
 msgstr ""
 
-#: context/engines/wikipedia/WikipediaEngine.cpp:191
-#: context/engines/wikipedia/WikipediaEngine.cpp:262
-#: context/engines/wikipedia/WikipediaEngine.cpp:395
-#, kde-format
-msgid "Unable to retrieve Wikipedia information: %1"
+#: equalizer/EqualizerPresets.cpp:105
+msgid "Ska"
 msgstr ""
 
-#: context/engines/wikipedia/WikipediaEngine.cpp:207
-#: context/engines/wikipedia/WikipediaEngine.cpp:371
-#: context/engines/wikipedia/WikipediaEngine.cpp:433
-#: context/engines/wikipedia/WikipediaEngine.cpp:630
-#: context/engines/wikipedia/WikipediaEngine.cpp:651
-#: context/engines/wikipedia/WikipediaEngine.cpp:669
-msgid "No information found..."
+#: equalizer/EqualizerPresets.cpp:106
+msgid "Soft Rock"
 msgstr ""
 
-#: context/engines/wikipedia/WikipediaEngine.cpp:845
-msgid "Choose Language"
+#: equalizer/EqualizerPresets.cpp:107
+msgid "Techno"
 msgstr ""
 
-#: context/engines/songkick/SongkickEngine.cpp:48
-msgid "ontour"
+#: equalizer/EqualizerPresets.cpp:108
+msgid "Zero"
 msgstr ""
 
-#: context/engines/songkick/SongkickEngine.cpp:48
-msgid "dates"
+#: OpmlParser.cpp:109
+#, kde-format
+msgid "Reading OPML podcast from %1 failed with error:\n"
 msgstr ""
 
-#: context/containments/verticallayout/VerticalToolbarContainment.cpp:180
+#: EngineController.cpp:289
 msgid ""
-"Please add some applets from the toolbar at the bottom of the context view."
+"<p>Phonon claims it <b>cannot</b> play MP3 files. You may want to examine "
+"the installation of the backend that phonon uses.</p><p>You may find useful "
+"information in the <i>FAQ</i> section of the <i>Amarok Handbook</i>.</p>"
 msgstr ""
 
-#: context/widgets/RatingWidget.cpp:70 context/widgets/RatingWidget.cpp:221
-#: context/widgets/RatingWidget.cpp:247
-#, kde-format
-msgid "Track rating: %1"
+#: EngineController.cpp:311
+msgid "Install MP3 Support"
 msgstr ""
 
-#: context/widgets/ContainmentSelectionLayer.cpp:37
-msgid "Zoom In"
+#: EngineController.cpp:313
+msgid ""
+"Amarok currently cannot play MP3 files. Do you want to install support for "
+"MP3?"
 msgstr ""
 
-#: context/widgets/TrackWidget.cpp:39
-msgctxt "Score of a track"
-msgid "Score:"
+#: EngineController.cpp:314
+msgid "No MP3 Support"
 msgstr ""
 
-#: context/widgets/TrackWidget.cpp:162
-#, kde-format
-msgid "%1 - %2 (%3)"
+#: EngineController.cpp:891
+msgid "Preamp"
 msgstr ""
 
-#: context/widgets/appletexplorer/AppletExplorer.cpp:105
-msgid "Hide menu"
+#: EngineController.cpp:897
+msgid ""
+"%0\n"
+"Hz"
 msgstr ""
 
-#: context/widgets/appletexplorer/AppletExplorer.cpp:122
-msgid "<strong>Applet Explorer</strong>"
+#: EngineController.cpp:901
+msgid ""
+"%0\n"
+"kHz"
 msgstr ""
 
-#: context/widgets/appletexplorer/AppletExplorer.cpp:224
-msgid "Containments"
+#: EngineController.cpp:1198
+msgid "Too many errors encountered in playlist. Playback stopped."
 msgstr ""
 
-#: context/widgets/AppletHeader.cpp:43
-msgid "Context Applet"
+#: EngineController.cpp:1419
+#, kde-format
+msgctxt "track by artist on album"
+msgid "<b>%1</b> by <b>%2</b> on <b>%3</b>"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:40
-msgid "Install, list, remove Amarok applets"
+#: EngineController.cpp:1422
+#, kde-format
+msgctxt "track by artist"
+msgid "<b>%1</b> by <b>%2</b>"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:76
-msgid "Amarok Applet Manager"
+#: EngineController.cpp:1426
+#, kde-format
+msgctxt "track on album"
+msgid "<b>%1</b> on <b>%2</b>"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:78
-msgid "(C) 2008, Aaron Seigo, (C) 2009, Leo Franchi"
+#: EngineController.cpp:1438
+#, kde-format
+msgctxt "track from source"
+msgid "from <b>%1</b>"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:79
-msgid "Aaron Seigo"
+#: musicbrainz/MusicBrainzTags.cpp:447 musicbrainz/MusicBrainzTags.cpp:453
+#, kde-format
+msgid "MusicBrainz match ratio: %1%"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:80
-msgid "Original author"
+#: musicbrainz/MusicBrainzTags.cpp:449 musicbrainz/MusicBrainzTags.cpp:456
+#, kde-format
+msgid "MusicDNS match ratio: %1%"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:92
-msgid "For install or remove, operates on applets installed for all users."
+#: musicbrainz/MusicBrainzTags.cpp:499
+msgid "Click here to choose best matches"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:95
-msgctxt "Do not translate <path>"
-msgid "Install the applet at <path>"
+#: musicbrainz/MusicBrainzTags.cpp:666
+msgid "Artist page"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:97
-msgctxt "Do not translate <path>"
-msgid "Upgrade the applet at <path>"
+#: musicbrainz/MusicBrainzTags.cpp:672
+msgid "Album page"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:99
-msgid "List installed applets"
+#: musicbrainz/MusicBrainzTags.cpp:678
+msgid "Track page"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:101
-msgctxt "Do not translate <name>"
-msgid "Remove the applet named <name>"
+#: main.cpp:44
+msgid "The audio player for KDE"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:103
+#: main.cpp:45
 msgid ""
-"Absolute path to the package root. If not supplied, then the standard data "
-"directories for this KDE session will be searched instead."
+"(C) 2002-2003, Mark Kretschmann\n"
+"(C) 2003-2011, The Amarok Development Squad"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:162
+#: main.cpp:46
 #, kde-format
-msgid "Successfully removed %1"
+msgid ""
+"IRC:\n"
+"irc.freenode.net - #amarok, #amarok.de, #amarok.es, #amarok.fr\n"
+"\n"
+"Feedback:\n"
+"amarok@kde.org\n"
+"\n"
+"(Build Date: %1)"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:164
-#, kde-format
-msgid "Removal of %1 failed."
+#: main.cpp:51
+msgid "Bart 'Where are my toothpicks' Cerneels"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:169
-#, kde-format
-msgid "Plugin %1 is not installed."
+#: main.cpp:52
+msgid "Developer (Stecchino)"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:174
-#, kde-format
-msgid "Successfully installed %1"
+#: main.cpp:55
+msgid "Ian 'The Beard' Monroe"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:177
-#, kde-format
-msgid "Installation of %1 failed."
+#: main.cpp:56
+msgid "Developer (eean)"
 msgstr ""
 
-#: context/tools/amarokpkg.cpp:183
-msgctxt ""
-"No option was given, this is the error message telling the user he needs at "
-"least one, do not translate install, remove, upgrade nor list"
-msgid "One of install, remove, upgrade or list is required."
+#: main.cpp:59
+msgid "Jeff 'IROKSOHARD' Mitchell"
 msgstr ""
 
-#: context/applets/playlistinfo/PlaylistInfo.cpp:151
-msgid "Configure Playlist Info Applet"
+#: main.cpp:60
+msgid "Developer (jefferai)"
 msgstr ""
 
-#: context/applets/playlistinfo/PlaylistInfo.cpp:163
-msgid "Width"
+#: main.cpp:64
+msgid "Developer (lfranchi)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsSuggestionsListWidget.cpp:90
-#, kde-format
-msgid "artist: %1"
+#: main.cpp:67
+msgid "Lydia 'is wrong(TM)' Pintscher"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:192
-msgctxt "Used if the current track has no artist."
-msgid "Unknown"
+#: main.cpp:68
+msgid "Release Vixen (Nightrose)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:199
-#, kde-format
-msgid ""
-"While you were editing the lyrics of <b>%1 - %2</b> the track has changed. "
-"Do you want to save your changes?"
+#: main.cpp:71
+msgid "Mark 'It's good, but it's not irssi' Kretschmann"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:206
-#, kde-format
-msgid ""
-"The lyrics of <b>%1 - %2</b> changed while you were editing them. Do you "
-"want to save your changes?"
+#: main.cpp:72
+msgid "Project founder (markey)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:451
-msgid "Edit Lyrics"
+#: main.cpp:75
+msgid "Myriam Schweingruber"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:458
-msgid "Save Lyrics"
+#: main.cpp:75
+msgid "Rokymoter, Bug triaging (Mamarok)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:472
-msgid "Scroll automatically"
+#: main.cpp:78
+msgid "Nikolaj Hald 'Also very hot' Nielsen"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:479
-msgid "Reload Lyrics"
+#: main.cpp:79
+msgid "Developer (nhn)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:486
-#: context/applets/albums/Albums.cpp:74
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:97
-#: context/applets/tabs/TabsApplet.cpp:104
-#: context/applets/labels/LabelsApplet.cpp:112
-#: context/applets/videoclip/VideoclipApplet.cpp:108
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:84
-#: context/applets/photos/PhotosApplet.cpp:76
-#: context/applets/wikipedia/WikipediaApplet.cpp:612
-msgid "Settings"
+#: main.cpp:82
+msgid "Ralf 'SalsaMaster' Engels"
+msgstr ""
+
+#: main.cpp:83
+msgid "Developer (rengels)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:563
-msgid "Lyrics: No script is running"
+#: main.cpp:86
+msgid "Rick W. Chen"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:575
-msgid "Lyrics: Fetching ..."
+#: main.cpp:87
+msgid "Developer (stuffcorpse)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:579
-msgid "Lyrics: Fetch error"
+#: main.cpp:90
+msgid "Seb 'Surfin' down under' Ruiz"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:585
-msgid "Lyrics: Suggested URLs"
+#: main.cpp:91
+msgid "Developer (sebr)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:611
-#, kde-format
-msgctxt "Lyrics: <artist> - <title>"
-msgid "Lyrics: %1 - %2"
+#: main.cpp:94
+msgid "Sven Krohlas"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:617
-msgid "Lyrics: Not found"
+#: main.cpp:94
+msgid "Rokymoter, Developer (sven423)"
 msgstr ""
 
-#: context/applets/lyrics/LyricsApplet.cpp:657
-msgctxt "@info"
-msgid ""
-"Do you really want to refetch lyrics for this track? All changes you may "
-"have made will be lost."
+#: main.cpp:97
+msgid "Téo Mrnjavac"
 msgstr ""
 
-#: context/applets/albums/AlbumsView.cpp:242
-#: context/applets/videoclip/VideoItemButton.cpp:99
-msgid "&Queue"
+#: main.cpp:98
+msgid "Developer (Teo`)"
 msgstr ""
 
-#: context/applets/albums/AlbumItem.cpp:107
-#, kde-format
-msgid "%1 track"
-msgid_plural "%1 tracks"
-msgstr[0] ""
-msgstr[1] ""
+#: main.cpp:103
+msgid "Alejandro Wainzinger"
+msgstr ""
 
-#: context/applets/albums/Albums.cpp:81 context/applets/albums/Albums.cpp:329
-msgid "Filter Albums"
+#: main.cpp:103
+msgid "Developer (xevix)"
 msgstr ""
 
-#: context/applets/albums/Albums.cpp:220
-#, kde-format
-msgid "Disc %1"
-msgstr "Disg %1"
+#: main.cpp:105
+msgid "Alex Merry"
+msgstr ""
 
-#: context/applets/albums/Albums.cpp:253
-msgid "Right align track lengths"
+#: main.cpp:105
+msgid "Developer, Replay Gain support"
 msgstr ""
 
-#: context/applets/albums/Albums.cpp:258
-msgid "Number of recently added albums:"
+#: main.cpp:107
+msgid "Casey Link"
 msgstr ""
 
-#: context/applets/albums/Albums.cpp:264
-msgid "Albums Applet Settings"
+#: main.cpp:107
+msgid "MP3tunes integration"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:136
-msgid "Add Last.fm artist station to the Playlist"
+#: main.cpp:109
+msgid "Casper van Donderen"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:142
-msgid "Add top track to the Playlist"
+#: main.cpp:109
+msgid "Windows porting"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:149
-#, kde-format
-msgid "Show Similar Artists of %1"
+#: main.cpp:111
+msgid "Christie Harris"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:164
-msgid "Open Last.fm webpage for this artist"
+#: main.cpp:111
+msgid "Rokymoter (dangle)"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:181
-#, kde-format
-msgid "Match: %1%"
+#: main.cpp:113
+msgid "Dan Leinir Turthra Jensen"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:277
-#, kde-format
-msgid "Unable to fetch the picture: %1"
+#: main.cpp:113
+msgid "Usability"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:286
-msgctxt "@info:tooltip Artist biography"
-msgid "Show Biography"
+#: main.cpp:115
+msgid "Dan 'Hey, it compiled...' Meltzer"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:427
-msgid "No description available."
+#: main.cpp:115
+msgid "Developer (hydrogen)"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:443
-#, kde-format
-msgctxt "@label:textbox"
-msgid "Tags: %1"
+#: main.cpp:117
+msgid "Daniel Caleb Jones"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:452
-msgid "Top track not found"
+#: main.cpp:117
+msgid "Biased playlists"
 msgstr ""
 
-#: context/applets/similarartists/ArtistWidget.cpp:458
-#, kde-format
-msgid "Top track: %1"
+#: main.cpp:119
+msgid "Daniel Dewald"
 msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:71
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:155
-msgid "Similar Artists"
+#: main.cpp:119
+msgid "Tag Guesser, Labels, Spectrum Analyzer"
 msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:83
-#: context/applets/wikipedia/WikipediaApplet.cpp:582
-msgid "Forward"
-msgstr "Ymlaen"
+#: main.cpp:121
+msgid "Daniel Winter"
+msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:90
-msgid "Show Similar Artists for Currently Playing Track"
+#: main.cpp:121
+msgid "Nepomuk integration"
 msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:178
-msgid "Similar Artists Settings"
+#: main.cpp:123
+msgid "Edward \"Hades\" Toroshchin"
 msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:202
-#, kde-format
-msgid "Similar Artists of %1"
+#: main.cpp:125
+msgid "Frank Meerkötter"
 msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:209
-msgid "Similar Artists: Not Found"
+#: main.cpp:125 main.cpp:146
+msgid "Podcast improvements"
 msgstr ""
 
-#: context/applets/similarartists/SimilarArtistsApplet.cpp:249
-#, kde-format
-msgctxt "@item:intext Artist biography published date"
-msgid "Published: %1"
+#: main.cpp:128
+msgid "Greg Meyer"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:113
-msgctxt "What artist is this track by"
-msgid "By"
+#: main.cpp:128
+msgid "Live CD, Bug squashing (oggb4mp3)"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:114
-msgctxt "What album is this track on"
-msgid "On"
+#: main.cpp:130
+msgid "Harald Sitter"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:285
-msgid "Recently Played Tracks"
+#: main.cpp:130
+msgid "Rokymoter (apachelogger)"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:450
-msgid "Genres"
-msgstr "Ffurf Lenyddol"
+#: main.cpp:132
+msgid "John Atkinson"
+msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:804
-msgid "Show Album in Media Sources"
+#: main.cpp:134
+msgid "Kenneth Wesley Wimer II"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:811
-msgid "Show Artist in Media Sources"
+#: main.cpp:134
+msgid "Icons"
+msgstr "Eiconau"
+
+#: main.cpp:136
+msgid "Kevin Funk"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:818
-msgid "Show Composer in Media Sources"
+#: main.cpp:136
+msgid "Developer, Website theme (KRF)"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:825
-msgid "Show Genre in Media Sources"
+#: main.cpp:138
+msgid "Kuba Serafinowski"
 msgstr ""
 
-#: context/applets/currenttrack/CurrentTrack.cpp:832
-msgid "Show Year in Media Sources"
+#: main.cpp:138 main.cpp:180
+msgid "Rokymoter"
 msgstr ""
 
-#: context/applets/tabs/TabsView.cpp:174
-msgid "tab provided from: "
+#: main.cpp:140
+msgid "Lee Olson"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:79
-#: context/applets/tabs/TabsApplet.cpp:129
-#: context/applets/tabs/TabsApplet.cpp:146
-msgctxt "Guitar tablature"
-msgid "Tabs"
+#: main.cpp:140 main.cpp:156
+msgid "Artwork"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:95
-msgctxt "Guitar tablature"
-msgid "Reload tabs"
+#: main.cpp:142
+msgid "Ljubomir Simin"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:158
-msgid "Tabs: Fetching..."
+#: main.cpp:142
+msgid "Rokymoter (ljubomir)"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:170
-#, kde-format
-msgctxt "Guitar tablature"
-msgid "No Tabs for %1 by %2"
+#: main.cpp:144
+msgid "Lucas Gomes"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:176
-msgctxt "Guitar tablature"
-msgid "Tabs: Fetch Error"
+#: main.cpp:144
+msgid "Developer (MaskMaster)"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:201
-#, kde-format
-msgctxt "Guitar tablature"
-msgid "Tabs: %1 - %2"
+#: main.cpp:146
+msgid "Mathias Panzenböck"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:266
-msgctxt "Guitar tablature settings"
-msgid "Tabs Settings"
+#: main.cpp:148
+msgid "Max Howell"
 msgstr ""
 
-#: context/applets/tabs/TabsApplet.cpp:309
-msgid "Reload Tabs"
+#: main.cpp:148
+msgid "Developer, Vision"
 msgstr ""
 
-#: context/applets/labels/LabelGraphicsItem.cpp:63
-msgid "Add label"
+#: main.cpp:150
+msgid "Maximilian Kossick"
 msgstr ""
 
-#: context/applets/labels/LabelGraphicsItem.cpp:68
-msgid "Remove label"
+#: main.cpp:150
+msgid "Developer (maxx_k)"
 msgstr ""
 
-#: context/applets/labels/LabelGraphicsItem.cpp:78
-msgid "Add to blacklist"
+#: main.cpp:152
+msgid "Mikko Caldara"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:102
-#: context/applets/wikipedia/WikipediaApplet.cpp:588
-msgid "Reload"
+#: main.cpp:152
+msgid "Bug triaging and sanitizing"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:195
-msgid "Labels: No track playing"
+#: main.cpp:154
+msgid "Nikhil Marathe"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:515
-msgid "Labels: Fetching..."
+#: main.cpp:154
+msgid "UPnP support and patches (nsm)"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:525
-#, kde-format
-msgid "Labels: %1"
+#: main.cpp:156
+msgid "Nuno Pinheiro"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:573
-#, kde-format
-msgid "Labels for %1 by %2"
+#: main.cpp:158
+msgid "Olivier Bédard"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:741
-msgid "General Settings"
+#: main.cpp:158
+msgid "Website hosting"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:742
-msgid "Blacklist Settings"
+#: main.cpp:160
+msgid "Pasi Lalinaho"
 msgstr ""
 
-#: context/applets/labels/LabelsApplet.cpp:743
-msgid "Replacement Settings"
+#: main.cpp:160
+msgid "Rokymoter (emunkki)"
 msgstr ""
 
-#: context/applets/videoclip/CustomVideoWidget.cpp:83
-msgid "Enter &fullscreen"
+#: main.cpp:162
+msgid "Patrick von Reth"
 msgstr ""
 
-#: context/applets/videoclip/CustomVideoWidget.cpp:89
-msgid "E&xit fullscreen"
+#: main.cpp:162
+msgid "Windows build (TheOneRing)"
 msgstr ""
 
-#: context/applets/videoclip/VideoItemButton.cpp:98
-msgid "&Add to playlist"
+#: main.cpp:164
+msgid "Peter Zhou Lei"
 msgstr ""
 
-#: context/applets/videoclip/VideoItemButton.cpp:100
-msgid "Append and &Play"
+#: main.cpp:164
+msgid "Scripting interface"
 msgstr ""
 
-#: context/applets/videoclip/VideoclipApplet.cpp:102
-#: context/applets/videoclip/VideoclipApplet.cpp:279
-#: context/applets/videoclip/VideoclipApplet.cpp:333
-msgid "Video Clip"
+#: main.cpp:166
+msgid "Sam Lade"
 msgstr ""
 
-#: context/applets/videoclip/VideoclipApplet.cpp:314
-msgid "Video Clip: Fetching"
+#: main.cpp:166
+msgid "Developer (Sentynel)"
 msgstr ""
 
-#: context/applets/videoclip/VideoclipApplet.cpp:323
-msgid "Video Clip: No Information Found"
+#: main.cpp:168
+msgid "Scott Wheeler"
 msgstr ""
 
-#: context/applets/videoclip/VideoclipApplet.cpp:522
-msgid "Video Clip Settings"
+#: main.cpp:168
+msgid "TagLib & ktrm code"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsMapWidget.cpp:122
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:125
-#, kde-format
-msgctxt "@label:textbox Title for a canceled upcoming event"
-msgid "<s>%1</s> (Canceled)"
+#: main.cpp:170
+msgid "Shane King"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:67
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:128
-msgid "Upcoming Events"
+#: main.cpp:170
+msgid "Patches & Windows porting (shakes)"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:78
-msgid "View Events Calendar"
+#: main.cpp:172
+msgid "Simon Esneault"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:91
-msgctxt "@title:group"
-msgid "No track is currently playing"
+#: main.cpp:172
+msgid "Photos & Videos applets, Context View"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:158
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:303
-msgid "Favorite Venues"
+#: main.cpp:174
+msgid "Soren Harward"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:224
-msgid "No upcoming events"
+#: main.cpp:174
+msgid "Developer, Automated Playlist Generator"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:224
-#, kde-format
-msgid "%1: No upcoming events"
+#: main.cpp:176
+msgid "Thomas Lübking"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:229
-#, kde-format
-msgctxt "@title:group Number of upcoming events"
-msgid "1 event"
-msgid_plural "%1 events"
-msgstr[0] ""
-msgstr[1] ""
-
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:230
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:640
-#, kde-format
-msgctxt "@title:group Number of upcoming events"
-msgid "%1: 1 event"
-msgid_plural "%1: %2 events"
-msgstr[0] ""
-msgstr[1] ""
+#: main.cpp:178
+msgid "Valentin Rouet"
+msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:302
-msgid "Upcoming Events Settings"
+#: main.cpp:180 main.cpp:253
+msgid "Valorie Zimmerman"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:353
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:362
-msgctxt "@label:textbox Url label"
-msgid "link"
+#: main.cpp:182
+msgid "Wade Olson"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:494
-msgid "Map View"
+#: main.cpp:182
+msgid "Splash screen artist"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:532
-msgid "Events Calendar"
+#: main.cpp:184
+msgid "William Viana Soares"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsApplet.cpp:638
-msgctxt "@title:group"
-msgid "Favorite Venues"
+#: main.cpp:184
+msgid "Context view"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsStackItem.cpp:288
-msgid "Maximize"
+#: main.cpp:186
+msgid "Former contributors"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsStackItem.cpp:454
-msgid "Expand this widget"
+#: main.cpp:186
+msgid ""
+"People listed below have contributed to Amarok in the past. Thank you!"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsStackItem.cpp:454
-msgid "Collapse this widget"
+#: main.cpp:188
+msgid "Adam Pigg"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:53
-msgid "Loading picture..."
+#: main.cpp:188
+msgid "Analyzers, patches, shoutcast"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:78
-msgid "View map"
+#: main.cpp:190
+msgid "Adeodato Simó"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:88
-msgid "Open Last.fm webpage for this event"
+#: main.cpp:190 main.cpp:198
+msgid "Patches"
+msgstr "Ysbeidiau"
+
+#: main.cpp:192
+msgid "Alexandre Oliveira"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:95
-msgctxt "@label:textbox Supporing acts for an event"
-msgid "Supporting:"
+#: main.cpp:194
+msgid "Andreas Mair"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:96
-msgctxt "@label:textbox"
-msgid "Venue:"
+#: main.cpp:194
+msgid "MySQL support"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:97
-msgctxt "@label:textbox"
-msgid "Location:"
+#: main.cpp:196
+msgid "Andrew de Quincey"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:98
-msgctxt "@label:textbox"
-msgid "Date:"
+#: main.cpp:196
+msgid "Postgresql support"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:99
-msgctxt "@label:textbox"
-msgid "Attending:"
+#: main.cpp:198
+msgid "Andrew Turner"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:100
-msgctxt "@label:textbox"
-msgid "Tags:"
+#: main.cpp:200
+msgid "Andy Kelk"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:214
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "<strong>Tags:</strong><nl/>%1"
+#: main.cpp:200
+msgid "MTP and Rio Karma media devices, patches"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:238
-#, kde-format
-msgctxt "@info:tooltip Supporting artists for an event"
-msgid "<strong>Supporting artists:</strong><nl/>%1"
+#: main.cpp:202
+msgid "Christian Muehlhaeuser"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:254
-#, kde-format
-msgctxt "@info:tooltip Number of days till an event"
-msgid "Tomorrow"
-msgid_plural "In <strong>%1</strong> days"
-msgstr[0] ""
-msgstr[1] ""
+#: main.cpp:204
+msgid "Derek Nelson"
+msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsWidget.cpp:266
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "<strong>Location:</strong><nl/>%1"
+#: main.cpp:204
+msgid "Graphics, splash-screen"
 msgstr ""
 
-#: context/applets/upcomingevents/UpcomingEventsCalendarWidget.cpp:160
-msgctxt "@info:tooltip Calendar action"
-msgid "Jump to Today"
+#: main.cpp:206
+msgid "Enrico Ros"
 msgstr ""
 
-#: context/applets/photos/PhotosApplet.cpp:62
-msgid "Photos"
+#: main.cpp:206
+msgid "Analyzers, Context Browser and systray eye-candy"
 msgstr ""
 
-#: context/applets/photos/PhotosApplet.cpp:117
-msgid "Photos: No Track Playing"
+#: main.cpp:208
+msgid "Frederik Holljen"
 msgstr ""
 
-#: context/applets/photos/PhotosApplet.cpp:132
-#, kde-format
-msgctxt "@title:window Number of photos of artist"
-msgid "1 Photo: %2"
-msgid_plural "%1 Photos: %2"
-msgstr[0] ""
-msgstr[1] ""
+#: main.cpp:210
+msgid "Gábor Lehel"
+msgstr ""
 
-#: context/applets/photos/PhotosApplet.cpp:153
-#: context/applets/photos/PhotosApplet.cpp:170
-#: context/applets/photos/PhotosApplet.cpp:184
-#, kde-format
-msgid "Photos: %1"
+#: main.cpp:212
+msgid "Gérard Dürrmeyer"
 msgstr ""
 
-#: context/applets/photos/PhotosApplet.cpp:219
-msgid "Photos Settings"
+#: main.cpp:212
+msgid "Icons and image work"
 msgstr ""
 
-#: context/applets/wikipedia/WikipediaApplet.cpp:352
-#: context/applets/wikipedia/WikipediaApplet.cpp:428
-msgid "Update Supported Languages"
+#: main.cpp:214
+msgid "Giovanni Venturi"
 msgstr ""
 
-#: context/applets/wikipedia/WikipediaApplet.cpp:353
-#: context/applets/wikipedia/WikipediaApplet.cpp:429
-msgid "Get Supported Languages"
+#: main.cpp:214
+msgid "Dialog to filter the collection titles"
 msgstr ""
 
-#: context/applets/wikipedia/WikipediaApplet.cpp:565
-#: context/applets/wikipedia/WikipediaApplet.cpp:728
-msgid "Wikipedia"
-msgstr "Wicipedia"
+#: main.cpp:216
+msgid "Jarkko Lehti"
+msgstr ""
 
-#: context/applets/wikipedia/WikipediaApplet.cpp:702
-#, kde-format
-msgid "Wikipedia: %1"
+#: main.cpp:216
+msgid "Tester, IRC channel operator, whipping"
 msgstr ""
 
-#: context/applets/wikipedia/WikipediaApplet.cpp:761
-msgid "Wikipedia General Settings"
+#: main.cpp:218
+msgid "Jocke Andersson"
 msgstr ""
 
-#: context/applets/wikipedia/WikipediaApplet.cpp:762
-msgid "Wikipedia Language Settings"
+#: main.cpp:218
+msgid "Rokymoter, bug fixer (Firetech)"
 msgstr ""
 
-#: context/applets/songkick/SongkickApplet.cpp:41
-msgid "Songkick Concert Information"
+#: main.cpp:220
+msgid "Marco Gulino"
 msgstr ""
 
-#: context/applets/songkick/SongkickApplet.cpp:63
-msgid "Concerts"
+#: main.cpp:220
+msgid "Konqueror Sidebar, some DCOP methods"
 msgstr ""
 
-#: context/applets/songkick/SongkickApplet.cpp:70
-msgid "Reload Songkick"
+#: main.cpp:222
+msgid "Martin Aumueller"
 msgstr ""
 
-#: context/applets/songkick/SongkickApplet.cpp:152
-msgid "Concert information is being fetched."
+#: main.cpp:224
+msgid "Melchior Franz"
 msgstr ""
 
-#: context/applets/songkick/SongkickApplet.cpp:157
-#, kde-format
-msgid ""
-"Songkick was not able to be downloaded. Please check your Internet "
-"connection: %1"
+#: main.cpp:224
+msgid "FHT routine, bugfixes"
 msgstr ""
 
-#: context/applets/songkick/SongkickApplet.cpp:202
-msgid "There was no information found for this track"
+#: main.cpp:226
+msgid "Michael Pyne"
 msgstr ""
 
-#: context/scriptengine/javascript/qtgui/linearlayout.cpp:70
-msgid "LinearLayout requires a parent"
+#: main.cpp:226
+msgid "K3b export code"
 msgstr ""
 
-#: context/scriptengine/javascript/qtgui/linearlayout.cpp:76
-msgid "The parent must be a QGraphicsLayoutItem"
+#: main.cpp:228
+msgid "Mike Diehl"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:512
-msgid "i18n() takes at least one argument"
+#: main.cpp:230
+msgid "Paul Cifarelli"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:528
-msgid "i18nc() takes at least two arguments"
+#: main.cpp:232
+msgid "Peter C. Ndikuwera"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:545
-msgid "i18np() takes at least two arguments"
+#: main.cpp:232
+msgid "Bugfixes, PostgreSQL support"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:562
-msgid "i18ncp() takes at least three arguments"
+#: main.cpp:234
+msgid "Pierpaolo Panfilo"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:580
-msgid "dataEngine() takes one argument"
+#: main.cpp:236
+msgid "Reigo Reinmets"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:590
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:615
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:782
-msgid "Could not extract the AppletObject"
+#: main.cpp:236
+msgid "Wikipedia support, patches"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:595
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:620
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:787
-msgid "Could not extract the Applet"
+#: main.cpp:238
+msgid "Roman Becker"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:605
-msgid "service() takes two arguments"
+#: main.cpp:238
+msgid "Former Amarok logo, former splash screen, former icons"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:633
-msgid "loadui() takes one argument"
+#: main.cpp:240
+msgid "Sami Nieminen"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:639
-#, kde-format
-msgid "Unable to open '%1'"
+#: main.cpp:240
+msgid "Audioscrobbler support"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:679
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:712
-msgid "Constructor takes at least 1 argument"
+#: main.cpp:242
+msgid "Stanislav Karchebny"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:764
-msgid "CreateWidget takes one argument"
+#: main.cpp:244
+msgid "Stefan Bogner"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:772
-msgid "The parent must be a QGraphicsWidget"
+#: main.cpp:244
+msgid "Loads of stuff"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:817
-#, kde-format
-msgid "This operation was not supported, %1"
+#: main.cpp:246
+msgid "Tomasz Dudzik"
 msgstr ""
 
-#: context/scriptengine/javascript/simplejavascriptapplet.cpp:824
-msgid "print() takes one argument"
+#: main.cpp:246
+msgid "Splash screen"
+msgstr "Sgrin Croeso"
+
+#: main.cpp:250
+msgid "Andrew Browning"
 msgstr ""
 
-#: context/LyricsManager.cpp:135
-msgid "Retrieved lyrics is empty"
+#: main.cpp:251
+msgid "David Roth"
 msgstr ""
 
-#: context/LyricsManager.cpp:176
-msgid "Lyrics data could not be parsed"
+#: main.cpp:252
+msgid "Dr. Tilmann Bubeck"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/amor.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/amor.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/amor.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/amor.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdetoys\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 04:38+0000\n"
-"PO-Revision-Date: 2012-03-14 17:37+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:03+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: tips.cpp:2
 msgid "Don't run with scissors."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/audiocd_encoder_lame.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/audiocd_encoder_lame.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/audiocd_encoder_lame.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/audiocd_encoder_lame.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,67 +2,67 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:00+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:16+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: encoderlameconfig.ui:16
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1_2)
-#: rc.cpp:84 rc.cpp:393
+#: rc.cpp:3
 msgid "Options"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:28
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_copyright)
-#: rc.cpp:87 rc.cpp:396
+#: rc.cpp:6
 msgid "Cop&yrighted"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:31
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_copyright)
-#: rc.cpp:90 rc.cpp:399
+#: rc.cpp:9
 msgid "Mark MP3 file as copyrighted"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:34
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_copyright)
-#: rc.cpp:93 rc.cpp:402
+#: rc.cpp:12
 msgid "Mark MP3 file as copyrighted."
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:41
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_original)
-#: rc.cpp:96 rc.cpp:405
+#: rc.cpp:15
 msgid "Origi&nal"
 msgstr "Gwrei&ddiol"
 
 #. i18n: file: encoderlameconfig.ui:47
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_original)
-#: rc.cpp:99 rc.cpp:408
+#: rc.cpp:18
 msgid "Mark MP3 file as an original"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:50
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_original)
-#: rc.cpp:102 rc.cpp:411
+#: rc.cpp:21
 msgid "Mark MP3 file as an original."
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:57
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_iso)
-#: rc.cpp:105 rc.cpp:414
+#: rc.cpp:24
 msgid "&ISO encoding"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:60
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_iso)
-#: rc.cpp:108 rc.cpp:417
+#: rc.cpp:27
 msgid "Try to use strict ISO encoding"
 msgstr ""
 
@@ -70,23 +70,19 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_iso)
 #. i18n: file: encoderlameconfig.ui:380
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_vbr_max_br)
-#. i18n: file: encoderlameconfig.ui:63
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_iso)
-#. i18n: file: encoderlameconfig.ui:380
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_vbr_max_br)
-#: rc.cpp:111 rc.cpp:213 rc.cpp:420 rc.cpp:522
+#: rc.cpp:30 rc.cpp:132
 msgid "This selects the maximal bitrate used for encoding."
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:70
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_crc)
-#: rc.cpp:114 rc.cpp:423
+#: rc.cpp:33
 msgid "&Error protection"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:77
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_id3_tag)
-#: rc.cpp:117 rc.cpp:426
+#: rc.cpp:36
 msgid "&Write ID3 tag"
 msgstr ""
 
@@ -94,42 +90,38 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_id3_tag)
 #. i18n: file: encoderlameconfig.ui:86
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_id3_tag)
-#. i18n: file: encoderlameconfig.ui:83
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_id3_tag)
-#. i18n: file: encoderlameconfig.ui:86
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_id3_tag)
-#: rc.cpp:120 rc.cpp:123 rc.cpp:429 rc.cpp:432
+#: rc.cpp:39 rc.cpp:42
 msgid ""
 "If checked and if cddb support is available, an id3 tag will be appended"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:109
 #. i18n: ectx: property (title), widget (QGroupBox, buttonGroup1)
-#: rc.cpp:126 rc.cpp:435
+#: rc.cpp:45
 msgid "Encoding Method"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:117
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2)
-#: rc.cpp:129 rc.cpp:438
+#: rc.cpp:48
 msgid "Low"
 msgstr "Isel"
 
 #. i18n: file: encoderlameconfig.ui:149
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#: rc.cpp:132 rc.cpp:441
+#: rc.cpp:51
 msgid "High"
 msgstr "Uchel"
 
 #. i18n: file: encoderlameconfig.ui:161
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
-#: rc.cpp:135 rc.cpp:444
+#: rc.cpp:54
 msgid "&Quality:"
 msgstr "&Ansawdd:"
 
 #. i18n: file: encoderlameconfig.ui:177
 #. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_stereo)
-#: rc.cpp:138 rc.cpp:447
+#: rc.cpp:57
 msgid ""
 "This option controls whether MP3 files are recorded with one or two "
 "channels. Note that choosing <i>\"Mono\"</i> reduces file size, but also "
@@ -138,55 +130,55 @@
 
 #. i18n: file: encoderlameconfig.ui:181
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_stereo)
-#: rc.cpp:141 rc.cpp:450
+#: rc.cpp:60
 msgid "Stereo"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:186
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_stereo)
-#: rc.cpp:144 rc.cpp:453
+#: rc.cpp:63
 msgid "Joint Stereo"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:191
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_stereo)
-#: rc.cpp:147 rc.cpp:456
+#: rc.cpp:66
 msgid "Dual Channel"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:196
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_stereo)
-#: rc.cpp:150 rc.cpp:459
+#: rc.cpp:69
 msgid "Mono"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:204
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_bitrate_constant)
-#: rc.cpp:153 rc.cpp:462
+#: rc.cpp:72
 msgid "Constant bitrate"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:211
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_bitrate_variable)
-#: rc.cpp:156 rc.cpp:465
+#: rc.cpp:75
 msgid "Variable bitrate"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:272
 #. i18n: ectx: property (title), widget (QGroupBox, vbr_settings)
-#: rc.cpp:159 rc.cpp:468
+#: rc.cpp:78
 msgid "Variable Bitrate Settings"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:284
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_vbr_average_br)
-#: rc.cpp:162 rc.cpp:471
+#: rc.cpp:81
 msgid "Avera&ge bitrate:"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:287
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_vbr_average_br)
-#: rc.cpp:165 rc.cpp:474
+#: rc.cpp:84
 msgid "This selects the average bitrate used for encoding."
 msgstr ""
 
@@ -198,16 +190,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:618
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:301
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:407
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:510
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:618
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:168 rc.cpp:222 rc.cpp:273 rc.cpp:324 rc.cpp:477 rc.cpp:531
-#: rc.cpp:582 rc.cpp:633
+#: rc.cpp:87 rc.cpp:141 rc.cpp:192 rc.cpp:243
 msgid "32 kbs"
 msgstr ""
 
@@ -219,16 +202,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:623
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:306
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:412
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:515
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:623
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:171 rc.cpp:225 rc.cpp:276 rc.cpp:327 rc.cpp:480 rc.cpp:534
-#: rc.cpp:585 rc.cpp:636
+#: rc.cpp:90 rc.cpp:144 rc.cpp:195 rc.cpp:246
 msgid "40 kbs"
 msgstr ""
 
@@ -240,16 +214,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:628
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:311
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:417
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:520
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:628
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:174 rc.cpp:228 rc.cpp:279 rc.cpp:330 rc.cpp:483 rc.cpp:537
-#: rc.cpp:588 rc.cpp:639
+#: rc.cpp:93 rc.cpp:147 rc.cpp:198 rc.cpp:249
 msgid "48 kbs"
 msgstr ""
 
@@ -261,16 +226,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:633
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:316
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:422
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:525
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:633
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:177 rc.cpp:231 rc.cpp:282 rc.cpp:333 rc.cpp:486 rc.cpp:540
-#: rc.cpp:591 rc.cpp:642
+#: rc.cpp:96 rc.cpp:150 rc.cpp:201 rc.cpp:252
 msgid "56 kbs"
 msgstr ""
 
@@ -282,16 +238,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:638
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:321
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:427
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:530
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:638
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:180 rc.cpp:234 rc.cpp:285 rc.cpp:336 rc.cpp:489 rc.cpp:543
-#: rc.cpp:594 rc.cpp:645
+#: rc.cpp:99 rc.cpp:153 rc.cpp:204 rc.cpp:255
 msgid "64 kbs"
 msgstr ""
 
@@ -303,16 +250,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:643
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:326
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:432
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:535
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:643
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:183 rc.cpp:237 rc.cpp:288 rc.cpp:339 rc.cpp:492 rc.cpp:546
-#: rc.cpp:597 rc.cpp:648
+#: rc.cpp:102 rc.cpp:156 rc.cpp:207 rc.cpp:258
 msgid "80 kbs"
 msgstr ""
 
@@ -324,16 +262,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:648
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:331
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:437
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:540
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:648
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:186 rc.cpp:240 rc.cpp:291 rc.cpp:342 rc.cpp:495 rc.cpp:549
-#: rc.cpp:600 rc.cpp:651
+#: rc.cpp:105 rc.cpp:159 rc.cpp:210 rc.cpp:261
 msgid "96 kbs"
 msgstr ""
 
@@ -345,16 +274,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:653
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:336
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:442
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:545
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:653
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:189 rc.cpp:243 rc.cpp:294 rc.cpp:345 rc.cpp:498 rc.cpp:552
-#: rc.cpp:603 rc.cpp:654
+#: rc.cpp:108 rc.cpp:162 rc.cpp:213 rc.cpp:264
 msgid "112 kbs"
 msgstr ""
 
@@ -366,16 +286,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:658
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:341
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:447
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:550
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:658
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:192 rc.cpp:246 rc.cpp:297 rc.cpp:348 rc.cpp:501 rc.cpp:555
-#: rc.cpp:606 rc.cpp:657
+#: rc.cpp:111 rc.cpp:165 rc.cpp:216 rc.cpp:267
 msgid "128 kbs"
 msgstr ""
 
@@ -387,16 +298,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:663
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:346
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:452
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:555
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:663
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:195 rc.cpp:249 rc.cpp:300 rc.cpp:351 rc.cpp:504 rc.cpp:558
-#: rc.cpp:609 rc.cpp:660
+#: rc.cpp:114 rc.cpp:168 rc.cpp:219 rc.cpp:270
 msgid "160 kbs"
 msgstr ""
 
@@ -408,16 +310,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:668
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:351
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:457
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:560
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:668
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:198 rc.cpp:252 rc.cpp:303 rc.cpp:354 rc.cpp:507 rc.cpp:561
-#: rc.cpp:612 rc.cpp:663
+#: rc.cpp:117 rc.cpp:171 rc.cpp:222 rc.cpp:273
 msgid "192 kbs"
 msgstr ""
 
@@ -429,16 +322,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:673
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:356
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:462
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:565
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:673
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:201 rc.cpp:255 rc.cpp:306 rc.cpp:357 rc.cpp:510 rc.cpp:564
-#: rc.cpp:615 rc.cpp:666
+#: rc.cpp:120 rc.cpp:174 rc.cpp:225 rc.cpp:276
 msgid "224 kbs"
 msgstr ""
 
@@ -450,16 +334,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:678
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:361
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:467
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:570
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:678
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:204 rc.cpp:258 rc.cpp:309 rc.cpp:360 rc.cpp:513 rc.cpp:567
-#: rc.cpp:618 rc.cpp:669
+#: rc.cpp:123 rc.cpp:177 rc.cpp:228 rc.cpp:279
 msgid "256 kbs"
 msgstr ""
 
@@ -471,88 +346,77 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
 #. i18n: file: encoderlameconfig.ui:683
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#. i18n: file: encoderlameconfig.ui:366
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_max_brate)
-#. i18n: file: encoderlameconfig.ui:472
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_mean_brate)
-#. i18n: file: encoderlameconfig.ui:575
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vbr_min_brate)
-#. i18n: file: encoderlameconfig.ui:683
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:207 rc.cpp:261 rc.cpp:312 rc.cpp:363 rc.cpp:516 rc.cpp:570
-#: rc.cpp:621 rc.cpp:672
+#: rc.cpp:126 rc.cpp:180 rc.cpp:231 rc.cpp:282
 msgid "320 kbs"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:377
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_vbr_max_br)
-#: rc.cpp:210 rc.cpp:519
+#: rc.cpp:129
 msgid "Maximal bi&trate:"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:387
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_vbr_xing_tag)
-#: rc.cpp:216 rc.cpp:525
+#: rc.cpp:135
 msgid "Write &Xing VBR tag"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:393
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_vbr_xing_tag)
-#: rc.cpp:219 rc.cpp:528
+#: rc.cpp:138
 msgid ""
 "This writes additional information related to VBR as introduced by Xing."
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:483
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_vbr_min_hard)
-#: rc.cpp:264 rc.cpp:573
+#: rc.cpp:183
 msgid "Minimal &value is a hard limit"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:493
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_vbr_min_br)
-#: rc.cpp:267 rc.cpp:576
+#: rc.cpp:186
 msgid "Minimal &bitrate:"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:496
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_vbr_min_br)
-#: rc.cpp:270 rc.cpp:579
+#: rc.cpp:189
 msgid "This selects the minimal bitrate used for encoding."
 msgstr ""
 
-#. i18n: file: audiocd_lame_encoder.kcfg:62
-#. i18n: ectx: label, entry (cbr_bitrate), group (Lame)
 #. i18n: file: encoderlameconfig.ui:586
 #. i18n: ectx: property (title), widget (QGroupBox, cbr_settings)
 #. i18n: file: audiocd_lame_encoder.kcfg:62
 #. i18n: ectx: label, entry (cbr_bitrate), group (Lame)
-#: rc.cpp:33 rc.cpp:315 rc.cpp:624 rc.cpp:732
+#: rc.cpp:234 rc.cpp:342
 msgid "Constant Bitrate Settings"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:598
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2)
-#: rc.cpp:318 rc.cpp:627
+#: rc.cpp:237
 msgid "Bitrate:"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:614
 #. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_cbr_bitrate)
-#: rc.cpp:321 rc.cpp:630
+#: rc.cpp:240
 msgid ""
 "The higher the bitrate, the better the quality and the larger the file."
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:694
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox83_2)
-#: rc.cpp:366 rc.cpp:675
+#: rc.cpp:285
 msgid "Filter Settings"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:709
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_enable_lowpass)
-#: rc.cpp:369 rc.cpp:678
+#: rc.cpp:288
 msgid "Apply &lowpass filter above"
 msgstr ""
 
@@ -564,178 +428,169 @@
 #. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_lowfilterwidth)
 #. i18n: file: encoderlameconfig.ui:785
 #. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_highfilterwidth)
-#. i18n: file: encoderlameconfig.ui:719
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_lowfilterfreq)
-#. i18n: file: encoderlameconfig.ui:739
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_highfilterfreq)
-#. i18n: file: encoderlameconfig.ui:762
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_lowfilterwidth)
-#. i18n: file: encoderlameconfig.ui:785
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_highfilterwidth)
-#: rc.cpp:372 rc.cpp:378 rc.cpp:384 rc.cpp:390 rc.cpp:681 rc.cpp:687
-#: rc.cpp:693 rc.cpp:699
+#: rc.cpp:291 rc.cpp:297 rc.cpp:303 rc.cpp:309
 msgid " Hz"
 msgstr " Hz"
 
 #. i18n: file: encoderlameconfig.ui:729
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_enable_highpass)
-#: rc.cpp:375 rc.cpp:684
+#: rc.cpp:294
 msgid "Apply &highpass filter below"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:752
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_set_lpf_width)
-#: rc.cpp:381 rc.cpp:690
+#: rc.cpp:300
 msgid "Low&pass filter width"
 msgstr ""
 
 #. i18n: file: encoderlameconfig.ui:775
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_set_hpf_width)
-#: rc.cpp:387 rc.cpp:696
+#: rc.cpp:306
 msgid "Highpa&ss filter width"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:11
 #. i18n: ectx: label, entry (bitrate_constant), group (Lame)
-#: rc.cpp:3 rc.cpp:702
+#: rc.cpp:312
 msgid "Constant Bitrate"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:15
 #. i18n: ectx: label, entry (bitrate_variable), group (Lame)
-#: rc.cpp:6 rc.cpp:705
+#: rc.cpp:315
 msgid "Variable Bitrate"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:20
 #. i18n: ectx: label, entry (stereo), group (Lame)
-#: rc.cpp:9 rc.cpp:708
+#: rc.cpp:318
 msgid "Stereo Mode"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:24
 #. i18n: ectx: label, entry (quality), group (Lame)
-#: rc.cpp:12 rc.cpp:711
+#: rc.cpp:321
 msgid "Quality"
 msgstr "Ansawdd"
 
 #. i18n: file: audiocd_lame_encoder.kcfg:29
 #. i18n: ectx: label, entry (byte_swap), group (Lame)
-#: rc.cpp:15 rc.cpp:714
+#: rc.cpp:324
 msgid "Byte Swap"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:40
 #. i18n: ectx: label, entry (copyright), group (Lame)
-#: rc.cpp:18 rc.cpp:717
+#: rc.cpp:327
 msgid "Copyrighted"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:44
 #. i18n: ectx: label, entry (original), group (Lame)
-#: rc.cpp:21 rc.cpp:720
+#: rc.cpp:330
 msgid "Original"
 msgstr "Gwreiddiol"
 
 #. i18n: file: audiocd_lame_encoder.kcfg:48
 #. i18n: ectx: label, entry (iso), group (Lame)
-#: rc.cpp:24 rc.cpp:723
+#: rc.cpp:333
 msgid "ISO Encoding"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:52
 #. i18n: ectx: label, entry (crc), group (Lame)
-#: rc.cpp:27 rc.cpp:726
+#: rc.cpp:336
 msgid "Error protection"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:56
 #. i18n: ectx: label, entry (id3_tag), group (Lame)
-#: rc.cpp:30 rc.cpp:729
+#: rc.cpp:339
 msgid "Write ID3 Tag"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:70
 #. i18n: ectx: label, entry (vbr_min_br), group (Lame)
-#: rc.cpp:36 rc.cpp:735
+#: rc.cpp:345
 msgid "Minimal bitrate"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:74
 #. i18n: ectx: label, entry (vbr_min_hard), group (Lame)
-#: rc.cpp:39 rc.cpp:738
+#: rc.cpp:348
 msgid "Minimal Value is a hard limit"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:78
 #. i18n: ectx: label, entry (vbr_max_br), group (Lame)
-#: rc.cpp:42 rc.cpp:741
+#: rc.cpp:351
 msgid "Maximal bitrate"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:82
 #. i18n: ectx: label, entry (vbr_average_br), group (Lame)
-#: rc.cpp:45 rc.cpp:744
+#: rc.cpp:354
 msgid "Average bitrate"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:86
 #. i18n: ectx: label, entry (vbr_xing_tag), group (Lame)
-#: rc.cpp:48 rc.cpp:747
+#: rc.cpp:357
 msgid "Write Xing VBR tag"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:91
 #. i18n: ectx: label, entry (vbr_min_brate), group (Lame)
-#: rc.cpp:51 rc.cpp:750
+#: rc.cpp:360
 msgid "Minimal bitrate value"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:97
 #. i18n: ectx: label, entry (vbr_max_brate), group (Lame)
-#: rc.cpp:54 rc.cpp:753
+#: rc.cpp:363
 msgid "Maximal bitrate value"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:103
 #. i18n: ectx: label, entry (vbr_mean_brate), group (Lame)
-#: rc.cpp:57 rc.cpp:756
+#: rc.cpp:366
 msgid "Average bitrate value"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:112
 #. i18n: ectx: label, entry (enable_lowpass), group (Lame)
-#: rc.cpp:60 rc.cpp:759
+#: rc.cpp:369
 msgid "Enable the lowpass filter"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:116
 #. i18n: ectx: label, entry (lowfilterfreq), group (Lame)
-#: rc.cpp:63 rc.cpp:762
+#: rc.cpp:372
 msgid "Value of the cutoff frequency for the lowpass filter"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:121
 #. i18n: ectx: label, entry (enable_highpass), group (Lame)
-#: rc.cpp:66 rc.cpp:765
+#: rc.cpp:375
 msgid "Enable the highpass filter"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:125
 #. i18n: ectx: label, entry (highfilterfreq), group (Lame)
-#: rc.cpp:69 rc.cpp:768
+#: rc.cpp:378
 msgid "Value of the cutoff frequency for the highpass filter"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:130
 #. i18n: ectx: label, entry (set_lpf_width), group (Lame)
-#: rc.cpp:72 rc.cpp:771
+#: rc.cpp:381
 msgid "Lowpass filter width"
 msgstr ""
 
 #. i18n: file: audiocd_lame_encoder.kcfg:134
 #. i18n: ectx: label, entry (lowfilterwidth), group (Lame)
-#: rc.cpp:75 rc.cpp:774
+#: rc.cpp:384
 msgid "Lowpass filter width value"
 msgstr ""
 
@@ -743,10 +598,6 @@
 #. i18n: ectx: label, entry (set_hpf_width), group (Lame)
 #. i18n: file: audiocd_lame_encoder.kcfg:143
 #. i18n: ectx: label, entry (highfilterwidth), group (Lame)
-#. i18n: file: audiocd_lame_encoder.kcfg:139
-#. i18n: ectx: label, entry (set_hpf_width), group (Lame)
-#. i18n: file: audiocd_lame_encoder.kcfg:143
-#. i18n: ectx: label, entry (highfilterwidth), group (Lame)
-#: rc.cpp:78 rc.cpp:81 rc.cpp:777 rc.cpp:780
+#: rc.cpp:387 rc.cpp:390
 msgid "Highpass filter width"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/audiocd_encoder_vorbis.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/audiocd_encoder_vorbis.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/audiocd_encoder_vorbis.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/audiocd_encoder_vorbis.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,73 +2,85 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: encodervorbisconfig.ui:16
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_vorbis_enc_method)
-#: rc.cpp:33 rc.cpp:171
+#: rc.cpp:3
 msgid "&Encoding Method"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:22
 #. i18n: ectx: property (text), widget (QRadioButton, vorbis_enc_quality)
-#: rc.cpp:36 rc.cpp:174
+#: rc.cpp:6
 msgid "Quality based"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:32
 #. i18n: ectx: property (text), widget (QRadioButton, vorbis_enc_bitrate)
-#: rc.cpp:39 rc.cpp:177
+#: rc.cpp:9
 msgid "Bitrate based"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:45
 #. i18n: ectx: property (title), widget (QGroupBox, vorbis_bitrate_settings)
-#: rc.cpp:42 rc.cpp:180
+#: rc.cpp:12
 msgid "Vorbis Bitrate Settings"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:58
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_min_br)
-#: rc.cpp:45 rc.cpp:183
+#. i18n: file: encodervorbisconfig.ui:138
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_max_br)
+#: rc.cpp:15 rc.cpp:57
 msgid "32 kbps"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:63
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_min_br)
-#: rc.cpp:48 rc.cpp:186
+#. i18n: file: encodervorbisconfig.ui:143
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_max_br)
+#: rc.cpp:18 rc.cpp:60
 msgid "40 kbps"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:68
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_min_br)
-#: rc.cpp:51 rc.cpp:189
+#. i18n: file: encodervorbisconfig.ui:148
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_max_br)
+#: rc.cpp:21 rc.cpp:63
 msgid "48 kbps"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:73
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_min_br)
-#: rc.cpp:54 rc.cpp:192
+#. i18n: file: encodervorbisconfig.ui:153
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_max_br)
+#: rc.cpp:24 rc.cpp:66
 msgid "56 kbps"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:78
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_min_br)
-#: rc.cpp:57 rc.cpp:195
+#. i18n: file: encodervorbisconfig.ui:158
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_max_br)
+#: rc.cpp:27 rc.cpp:69
 msgid "64 kbps"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:83
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_min_br)
-#: rc.cpp:60 rc.cpp:198
+#. i18n: file: encodervorbisconfig.ui:163
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_vorbis_max_br)
+#: rc.cpp:30 rc.cpp:72
 msgid "80 kbps"
 msgstr ""
 
@@ -148,31 +160,31 @@
 
 #. i18n: file: encodervorbisconfig.ui:214
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_set_vorbis_min_br)
-#: rc.cpp:129 rc.cpp:267
+#: rc.cpp:99
 msgid "M&inimal bitrate:"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:224
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_set_vorbis_max_br)
-#: rc.cpp:132 rc.cpp:270
+#: rc.cpp:102
 msgid "Ma&ximal bitrate:"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:263
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_set_vorbis_nominal_br)
-#: rc.cpp:150 rc.cpp:288
+#: rc.cpp:120
 msgid "A&verage bitrate:"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:276
 #. i18n: ectx: property (title), widget (QGroupBox, vorbis_quality_settings)
-#: rc.cpp:153 rc.cpp:291
+#: rc.cpp:123
 msgid "Vorbis &Quality Setting"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:279
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, vorbis_quality_settings)
-#: rc.cpp:156 rc.cpp:294
+#: rc.cpp:126
 msgid ""
 "You can set the quality of the encoded stream here. A higher value implies a "
 "higher quality but encodes slower."
@@ -180,25 +192,25 @@
 
 #. i18n: file: encodervorbisconfig.ui:297
 #. i18n: ectx: property (whatsThis), widget (KDoubleNumInput, kcfg_vorbis_quality)
-#: rc.cpp:159 rc.cpp:297
+#: rc.cpp:129
 msgid "Higher is better but slower"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:307
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox193)
-#: rc.cpp:162 rc.cpp:300
+#: rc.cpp:132
 msgid "Options"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:316
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_vorbis_comments)
-#: rc.cpp:165 rc.cpp:303
+#: rc.cpp:135
 msgid "Add &track information"
 msgstr ""
 
 #. i18n: file: encodervorbisconfig.ui:319
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_vorbis_comments)
-#: rc.cpp:168 rc.cpp:306
+#: rc.cpp:138
 msgid ""
 "Add a description of the song to the file header. This makes it easy for the "
 "user to get advanced song information shown by his media player. You can get "
@@ -208,43 +220,43 @@
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:10
 #. i18n: ectx: label, entry (vorbis_enc_method), group (Vorbis)
-#: rc.cpp:3 rc.cpp:309
+#: rc.cpp:141
 msgid "Vorbis Encoding Quality or Bitrate"
 msgstr ""
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:15
 #. i18n: ectx: label, entry (set_vorbis_min_br), group (Vorbis)
-#: rc.cpp:6 rc.cpp:312
+#: rc.cpp:144
 msgid "Minimal bitrate specified"
 msgstr ""
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:19
 #. i18n: ectx: label, entry (set_vorbis_max_br), group (Vorbis)
-#: rc.cpp:9 rc.cpp:315
+#: rc.cpp:147
 msgid "Maximal bitrate specified"
 msgstr ""
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:23
 #. i18n: ectx: label, entry (set_vorbis_nominal_br), group (Vorbis)
-#: rc.cpp:12 rc.cpp:318
+#: rc.cpp:150
 msgid "Average bitrate specified"
 msgstr ""
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:28
 #. i18n: ectx: label, entry (vorbis_comments), group (Vorbis)
-#: rc.cpp:15 rc.cpp:321
+#: rc.cpp:153
 msgid "Add Comments"
 msgstr ""
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:32
 #. i18n: ectx: label, entry (vorbis_quality), group (Vorbis)
-#: rc.cpp:18 rc.cpp:324
+#: rc.cpp:156
 msgid "Quality"
 msgstr "Ansawdd"
 
 #. i18n: file: audiocd_vorbis_encoder.kcfg:39
 #. i18n: ectx: label, entry (vorbis_min_br), group (Vorbis)
-#: rc.cpp:21 rc.cpp:327
+#: rc.cpp:159
 msgid "Minimal bitrate"
 msgstr ""
 
@@ -254,12 +266,6 @@
 #. i18n: ectx: label, entry (vorbis_nominal_br), group (Vorbis)
 #. i18n: file: audiocd_vorbis_encoder.kcfg:61
 #. i18n: ectx: label, entry (vorbis_nominal_br), group (Vorbis)
-#. i18n: file: audiocd_vorbis_encoder.kcfg:46
-#. i18n: ectx: label, entry (vorbis_max_br), group (Vorbis)
-#. i18n: file: audiocd_vorbis_encoder.kcfg:53
-#. i18n: ectx: label, entry (vorbis_nominal_br), group (Vorbis)
-#. i18n: file: audiocd_vorbis_encoder.kcfg:61
-#. i18n: ectx: label, entry (vorbis_nominal_br), group (Vorbis)
-#: rc.cpp:24 rc.cpp:27 rc.cpp:30 rc.cpp:330 rc.cpp:333 rc.cpp:336
+#: rc.cpp:162 rc.cpp:165 rc.cpp:168
 msgid "maximal bitrate"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/audiorename_plugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/audiorename_plugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/audiorename_plugin.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/audiorename_plugin.po	2012-04-18 08:59:34.000000000 +0000
@@ -9,40 +9,40 @@
 msgstr ""
 "Project-Id-Version: audiorename_plugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-23 08:39+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:38+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:02+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: audio_plugin.cpp:72
+#: audio_plugin.cpp:74
 #, kde-format
 msgid "An older file named '%1' already exists.\n"
 msgstr "Mae ffeil hyn o'r enw '%1' mewn bod eisoes.\n"
 
-#: audio_plugin.cpp:74
+#: audio_plugin.cpp:76
 #, kde-format
 msgid "A similar file named '%1' already exists.\n"
 msgstr "Mae ffeil tebyg o'r enw '%1' mewn bod eisoes.\n"
 
-#: audio_plugin.cpp:76
+#: audio_plugin.cpp:78
 #, kde-format
 msgid "A newer file named '%1' already exists.\n"
 msgstr "Mae ffeil diweddarach o'r enw '%1' mewn bod eisoes.\n"
 
-#: audio_plugin.cpp:78
+#: audio_plugin.cpp:80
 msgid "Source File"
 msgstr "Ffeil Tarddiad"
 
-#: audio_plugin.cpp:79
+#: audio_plugin.cpp:81
 msgid "Existing File"
 msgstr "Ffeil Cyfredol"
 
-#: audio_plugin.cpp:80
+#: audio_plugin.cpp:82
 msgid ""
 "Would you like to replace the existing file with the one on the right?"
 msgstr "Hoffech chi ddisodli'r ffeil cyfredol gyda'r un ar y dde?"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/autorefresh.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/autorefresh.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/autorefresh.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/autorefresh.po	2012-04-18 08:59:36.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: autorefresh\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-18 02:04+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:38+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: autorefresh.cpp:42
 msgid "&Auto Refresh"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/babelfish.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/babelfish.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/babelfish.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/babelfish.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeaddons/babelfish.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-10 17:28+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:39+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: plugin_babelfish.cpp:54
 msgid "Translate Web Page"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/bomber.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/bomber.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/bomber.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/bomber.po	2012-04-18 08:59:23.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdegames\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-11-11 14:22+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:44+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:02+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1 rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -74,19 +74,19 @@
 msgid "Game over."
 msgstr ""
 
-#: src/bomber.cpp:40 src/bomber.cpp:198
+#: src/bomber.cpp:40 src/bomber.cpp:199
 #, kde-format
 msgctxt "Used to display the current level of play to the user"
 msgid "Level: %1"
 msgstr ""
 
-#: src/bomber.cpp:41 src/bomber.cpp:204
+#: src/bomber.cpp:41 src/bomber.cpp:205
 #, kde-format
 msgctxt "Used to inform the user of their current score"
 msgid "Score: %1"
 msgstr ""
 
-#: src/bomber.cpp:42 src/bomber.cpp:211
+#: src/bomber.cpp:42 src/bomber.cpp:212
 #, kde-format
 msgctxt "Used to tell the user how many lives they have left"
 msgid "Lives: %1"
@@ -122,7 +122,7 @@
 msgid "Theme"
 msgstr ""
 
-#: src/bomber.cpp:229
+#: src/bomber.cpp:230
 #, kde-format
 msgctxt "Game over messaged displayed in the status bar"
 msgid "Game over. Press '%1' for a new game"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/bovo.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/bovo.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/bovo.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/bovo.po	2012-04-18 08:59:23.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdegames\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-23 08:56+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:44+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:02+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/cervisia.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/cervisia.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/cervisia.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/cervisia.po	2012-04-18 08:59:26.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/cervisia.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2009-07-18 18:09+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:22+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: addignoremenu.cpp:38
 msgid "Add to Ignore List"
@@ -746,7 +746,7 @@
 msgstr ""
 
 #: checkoutdialog.cpp:104 checkoutdialog.cpp:120 mergedialog.cpp:67
-#: tagdialog.cpp:72 updatedialog.cpp:66
+#: tagdialog.cpp:71 updatedialog.cpp:66
 msgid "Fetch &List"
 msgstr ""
 
@@ -1249,11 +1249,11 @@
 msgid "Fetch L&ist"
 msgstr ""
 
-#: misc.cpp:84
+#: misc.cpp:83
 msgid "CVS Status"
 msgstr ""
 
-#: misc.cpp:217
+#: misc.cpp:216
 #, kde-format
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
@@ -1261,15 +1261,15 @@
 "Mae ffeil o'r enw \"%1\" mewn bod eisoes.  Ydych wir eisiau ysgrifennu "
 "drosti?"
 
-#: misc.cpp:218
+#: misc.cpp:217
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: misc.cpp:219
+#: misc.cpp:218
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: misc.cpp:219
+#: misc.cpp:218
 msgid "Overwrite the file"
 msgstr ""
 
@@ -1330,12 +1330,12 @@
 msgid "[Aborted]\n"
 msgstr ""
 
-#: rc.cpp:49
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:50
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
@@ -1344,11 +1344,7 @@
 #. i18n: ectx: Menu (file)
 #. i18n: file: cervisiaui.rc:4
 #. i18n: ectx: Menu (file)
-#. i18n: file: cervisiashellui.rc:4
-#. i18n: ectx: Menu (file)
-#. i18n: file: cervisiaui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:9 rc.cpp:21 rc.cpp:53 rc.cpp:65
+#: rc.cpp:5 rc.cpp:17
 msgid "&File"
 msgstr ""
 
@@ -1356,11 +1352,7 @@
 #. i18n: ectx: Menu (settings)
 #. i18n: file: cervisiaui.rc:70
 #. i18n: ectx: Menu (settings)
-#. i18n: file: cervisiashellui.rc:7
-#. i18n: ectx: Menu (settings)
-#. i18n: file: cervisiaui.rc:70
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:12 rc.cpp:33 rc.cpp:56 rc.cpp:77
+#: rc.cpp:8 rc.cpp:29
 msgid "&Settings"
 msgstr ""
 
@@ -1368,11 +1360,7 @@
 #. i18n: ectx: Menu (help)
 #. i18n: file: cervisiaui.rc:80
 #. i18n: ectx: Menu (help)
-#. i18n: file: cervisiashellui.rc:11
-#. i18n: ectx: Menu (help)
-#. i18n: file: cervisiaui.rc:80
-#. i18n: ectx: Menu (help)
-#: rc.cpp:15 rc.cpp:36 rc.cpp:59 rc.cpp:80
+#: rc.cpp:11 rc.cpp:32
 msgid "&Help"
 msgstr ""
 
@@ -1380,53 +1368,49 @@
 #. i18n: ectx: ToolBar (mainToolBar)
 #. i18n: file: cervisiaui.rc:84
 #. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: cervisiashellui.rc:16
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: cervisiaui.rc:84
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:18 rc.cpp:39 rc.cpp:62 rc.cpp:83
+#: rc.cpp:14 rc.cpp:35
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: cervisiaui.rc:24
 #. i18n: ectx: Menu (view)
-#: rc.cpp:24 rc.cpp:68
+#: rc.cpp:20
 msgid "&View"
 msgstr ""
 
 #. i18n: file: cervisiaui.rc:43
 #. i18n: ectx: Menu (advanced)
-#: rc.cpp:27 rc.cpp:71
+#: rc.cpp:23
 msgid "&Advanced"
 msgstr "&Uwch"
 
 #. i18n: file: cervisiaui.rc:63
 #. i18n: ectx: Menu (repository)
-#: rc.cpp:30 rc.cpp:74
+#: rc.cpp:26
 msgid "&Repository"
 msgstr ""
 
 #. i18n: file: settingsdialog_advanced.ui:32
 #. i18n: ectx: property (text), widget (QLabel, timeoutLbl)
-#: rc.cpp:42 rc.cpp:86
+#: rc.cpp:38
 msgid "&Timeout after which a progress dialog appears (in ms):"
 msgstr ""
 
 #. i18n: file: settingsdialog_advanced.ui:45
 #. i18n: ectx: property (text), widget (QLabel, compressionLbl)
-#: rc.cpp:45 rc.cpp:89
+#: rc.cpp:41
 msgid "Default compression &level:"
 msgstr ""
 
 #. i18n: file: settingsdialog_advanced.ui:58
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseSshAgent)
-#: rc.cpp:48 rc.cpp:92
+#: rc.cpp:44
 msgid "Utilize a running or start a new ssh-agent process"
 msgstr ""
 
 #. i18n: file: cervisiapart.kcfg:24
 #. i18n: ectx: label, entry (ConflictColor), group (Colors)
-#: rc.cpp:3 rc.cpp:95
+#: rc.cpp:47
 msgid ""
 "The foreground color used to highlight files with a conflict in the file "
 "view."
@@ -1434,7 +1418,7 @@
 
 #. i18n: file: cervisiapart.kcfg:46
 #. i18n: ectx: label, entry, group (General)
-#: rc.cpp:6 rc.cpp:98
+#: rc.cpp:50
 msgid "Delay (ms) until the progress dialog appears."
 msgstr ""
 
@@ -1640,31 +1624,31 @@
 msgid "Split main window &horizontally"
 msgstr ""
 
-#: tagdialog.cpp:53
+#: tagdialog.cpp:52
 msgid "CVS Delete Tag"
 msgstr ""
 
-#: tagdialog.cpp:53
+#: tagdialog.cpp:52
 msgid "CVS Tag"
 msgstr ""
 
-#: tagdialog.cpp:69 tagdialog.cpp:88
+#: tagdialog.cpp:68 tagdialog.cpp:87
 msgid "&Name of tag:"
 msgstr ""
 
-#: tagdialog.cpp:96
+#: tagdialog.cpp:95
 msgid "Create &branch with this tag"
 msgstr ""
 
-#: tagdialog.cpp:99
+#: tagdialog.cpp:98
 msgid "&Force tag creation even if tag already exists"
 msgstr ""
 
-#: tagdialog.cpp:132
+#: tagdialog.cpp:131
 msgid "You must define a tag name."
 msgstr ""
 
-#: tagdialog.cpp:140
+#: tagdialog.cpp:139
 msgid ""
 "Tag must start with a letter and may contain letters, digits and the "
 "characters '-' and '_'."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/cvsservice.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/cvsservice.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/cvsservice.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/cvsservice.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/cvsservice.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
-"PO-Revision-Date: 2012-03-14 18:29+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
+"PO-Revision-Date: 2012-04-11 18:24+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:22+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: cvsaskpass.cpp:34
 msgid "cvsaskpass"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_extragear-graphics_skanlite.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_extragear-graphics_skanlite.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_extragear-graphics_skanlite.po	2012-03-23 07:39:20.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_extragear-graphics_skanlite.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Welsh translation for skanlite
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the skanlite package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: skanlite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-06-01 06:28+0000\n"
-"PO-Revision-Date: 2010-11-11 14:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: skanlite.desktop:7
-msgctxt "Name"
-msgid "Skanlite"
-msgstr "Skanlite"
-
-#: skanlite.desktop:49
-msgctxt "GenericName"
-msgid "Image Scanning Application"
-msgstr ""
-
-#: skanlite.desktop:91
-msgctxt "Comment"
-msgid "Scan and save images"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_extragear-network_rekonq.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_extragear-network_rekonq.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_extragear-network_rekonq.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_extragear-network_rekonq.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Welsh translation for rekonq
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the rekonq package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: rekonq\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-05-30 18:35+0000\n"
-"PO-Revision-Date: 2010-12-18 02:14+0000\n"
-"Last-Translator: David Jones <Unknown>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:32+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: src/data/rekonq.desktop:2
-msgctxt "Name"
-msgid "rekonq"
-msgstr "rekonq"
-
-#: src/data/rekonq.desktop:41
-msgctxt "GenericName"
-msgid "Web Browser"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdeadmin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdeadmin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdeadmin.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdeadmin.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,70 +0,0 @@
-# translation of desktop_kdeadmin.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdeadmin\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 02:38+0000\n"
-"PO-Revision-Date: 2010-12-18 02:05+0000\n"
-"Last-Translator: David Jones <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:39+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: kcron/src/kcm_cron.desktop:14
-msgctxt "Name"
-msgid "Task Scheduler"
-msgstr "Trefnlennydd Tasgau"
-
-#: kcron/src/kcm_cron.desktop:67
-msgctxt "Comment"
-msgid "Configure and schedule tasks"
-msgstr ""
-
-#: ksystemlog/src/ksystemlog.desktop:2
-msgctxt "Name"
-msgid "KSystemLog"
-msgstr "KSystemLog"
-
-#: ksystemlog/src/ksystemlog.desktop:60
-msgctxt "Comment"
-msgid "System log viewer tool"
-msgstr ""
-
-#: ksystemlog/src/ksystemlog.desktop:113
-msgctxt "GenericName"
-msgid "System Log Viewer"
-msgstr "Gwelydd Cofnodion System"
-
-#: kuser/kuser.desktop:2
-msgctxt "Name"
-msgid "KUser"
-msgstr "KUser"
-
-#: kuser/kuser.desktop:76
-msgctxt "GenericName"
-msgid "User Manager"
-msgstr "Rheolydd Defnyddwyr"
-
-#: strigi-analyzer/rpm/kfile_rpm.desktop:3
-msgctxt "Name"
-msgid "RPM Stats"
-msgstr "Ystadegau RPM"
-
-#: system-config-printer-kde/system-config-printer-kde.desktop:14
-msgctxt "Name"
-msgid "Printer Configuration"
-msgstr ""
-
-#: system-config-printer-kde/system-config-printer-kde.desktop:64
-msgctxt "Comment"
-msgid "Configure local and remote Printers"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdeartwork.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdeartwork.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdeartwork.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdeartwork.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,2276 +0,0 @@
-# translation of desktop_kdeartwork.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# Kgyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2003.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdeartwork\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 15:58+0000\n"
-"PO-Revision-Date: 2009-07-18 17:22+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: IconThemes/kdeclassic/index.theme:2
-msgctxt "Name"
-msgid "KDE-Classic"
-msgstr "Clasurol KDE"
-
-#: IconThemes/kdeclassic/index.theme:66
-msgctxt "Comment"
-msgid "KDE Classic Icon Theme"
-msgstr "Thema Eicon Clasurol KDE"
-
-#: IconThemes/mono/index.theme:2
-msgctxt "Name"
-msgid "Monochrome"
-msgstr ""
-
-#: IconThemes/primary/index.theme:58
-msgctxt "Comment"
-msgid "By Danny Allen (danny@dannyallen.co.uk)"
-msgstr ""
-
-#: IconThemes/nuvola/index.theme:2
-msgctxt "Name"
-msgid "Nuvola theme"
-msgstr ""
-
-#: IconThemes/nuvola/index.theme:56
-msgctxt "Comment"
-msgid "Icon Theme by David Vignoni ( icon-king.com ) - 2003-2004"
-msgstr ""
-
-#: IconThemes/primary/index.theme:2
-msgctxt "Name"
-msgid "Primary"
-msgstr ""
-
-#: WeatherWallpapers/Beach_Reflecting_Clouds/metadata.desktop:2
-msgctxt "Name"
-msgid "Beach Reflecting Clouds"
-msgstr ""
-
-#: WeatherWallpapers/City_at_Night/metadata.desktop:2
-msgctxt "Name"
-msgid "City at Night"
-msgstr ""
-
-#: WeatherWallpapers/Icy_Tree/metadata.desktop:2
-msgctxt "Name"
-msgid "Icy Tree"
-msgstr ""
-
-#: WeatherWallpapers/JK_Bridge_at_Night/metadata.desktop:2
-msgctxt "Name"
-msgid "JK Bridge at Night"
-msgstr ""
-
-#: WeatherWallpapers/Lightning/metadata.desktop:2
-#: kscreensaver/kxsconfig/ScreenSavers/lightning.desktop:9
-msgctxt "Name"
-msgid "Lightning"
-msgstr "Mellt"
-
-#: WeatherWallpapers/Winter_Track/metadata.desktop:2
-msgctxt "Name"
-msgid "Winter Track"
-msgstr ""
-
-#: aurorae/Air-Oxygen/metadata.desktop:2
-msgctxt "Name"
-msgid "Air-Oxygen"
-msgstr ""
-
-#: aurorae/Air-Oxygen/metadata.desktop:31
-msgctxt "Comment"
-msgid ""
-"An Aurorae theme based on the Air Plasma theme and Oxygen-lookalike buttons"
-msgstr ""
-
-#: aurorae/Oxygen/metadata.desktop:2
-msgctxt "Name"
-msgid "Oxygen"
-msgstr ""
-
-#: aurorae/Oxygen/metadata.desktop:42
-msgctxt "Comment"
-msgid "An Aurorae theme based on the Oxygen Plasma theme."
-msgstr ""
-
-#: desktopthemes/Androbit/metadata.desktop:2
-msgctxt "Name"
-msgid "Androbit"
-msgstr ""
-
-#: desktopthemes/Androbit/metadata.desktop:34
-msgctxt "Comment"
-msgid "A modern glossy theme for plasma"
-msgstr ""
-
-#: desktopthemes/Aya/metadata.desktop:2
-msgctxt "Name"
-msgid "Aya"
-msgstr ""
-
-#: desktopthemes/Aya/metadata.desktop:48
-msgctxt "Comment"
-msgid ""
-"Theme that matches current system colors (Optimized with Oxygen style)"
-msgstr ""
-
-#: desktopthemes/Produkt/metadata.desktop:2
-msgctxt "Name"
-msgid "Produkt"
-msgstr ""
-
-#: desktopthemes/Produkt/metadata.desktop:34
-msgctxt "Comment"
-msgid "Elegant textured theme"
-msgstr ""
-
-#: desktopthemes/Tibanna/metadata.desktop:2
-msgctxt "Name"
-msgid "Tibanna"
-msgstr ""
-
-#: desktopthemes/Tibanna/metadata.desktop:34
-msgctxt "Comment"
-msgid "Elegant simple theme that follows system colors"
-msgstr ""
-
-#: desktopthemes/slim-glow/metadata.desktop:2
-msgctxt "Name"
-msgid "Slim Glow"
-msgstr ""
-
-#: desktopthemes/slim-glow/metadata.desktop:46
-msgctxt "Comment"
-msgid "Slick theme for dark wallpapers"
-msgstr ""
-
-#: kscreensaver/kdesavers/KBanner.desktop:8
-msgctxt "Name"
-msgid "Banner"
-msgstr "Baner"
-
-#: kscreensaver/kdesavers/KBanner.desktop:75
-#: kscreensaver/kdesavers/KBlob.desktop:72
-#: kscreensaver/kdesavers/KClock.desktop:78
-#: kscreensaver/kdesavers/KEuphoria.desktop:75
-#: kscreensaver/kdesavers/KFiresaver.desktop:71
-#: kscreensaver/kdesavers/KFlux.desktop:76
-#: kscreensaver/kdesavers/KFountain.desktop:75
-#: kscreensaver/kdesavers/KGravity.desktop:78
-#: kscreensaver/kdesavers/KLines-saver.desktop:78
-#: kscreensaver/kdesavers/KLorenz.desktop:73
-#: kscreensaver/kdesavers/KPendulum.desktop:70
-#: kscreensaver/kdesavers/KPolygon.desktop:77
-#: kscreensaver/kdesavers/KRotation.desktop:70
-#: kscreensaver/kdesavers/KScience.desktop:79
-#: kscreensaver/kdesavers/KSlideshow.desktop:78
-#: kscreensaver/kdesavers/KSolarWinds.desktop:75
-#: kscreensaver/kdesavers/KVm.desktop:76
-#: kscreensaver/kdesavers/KWave.desktop:76
-#: kscreensaver/kpartsaver/kpartsaver.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/abstractile.desktop:47
-#: kscreensaver/kxsconfig/ScreenSavers/anemone.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/ant.desktop:78
-#: kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop:54
-#: kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/apple2.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/attraction.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/barcode.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/blaster.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/boing.desktop:54
-#: kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/boxed.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop:48
-#: kscreensaver/kxsconfig/ScreenSavers/braid.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/bsod.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop:78
-#: kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/bumps.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/cage.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/carousel.desktop:52
-#: kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/celtic.desktop:55
-#: kscreensaver/kxsconfig/ScreenSavers/circuit.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/compass.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/coral.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop:49
-#: kscreensaver/kxsconfig/ScreenSavers/critical.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/crystal.desktop:78
-#: kscreensaver/kxsconfig/ScreenSavers/cube21.desktop:48
-#: kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop:46
-#: kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop:45
-#: kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/deco.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/demon.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/discrete.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/distort.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/drift.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/endgame.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/engine.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/eruption.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop:49
-#: kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/flag.desktop:78
-#: kscreensaver/kxsconfig/ScreenSavers/flame.desktop:79
-#: kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop:50
-#: kscreensaver/kxsconfig/ScreenSavers/flow.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/flurry.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/forest.desktop:79
-#: kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/gears.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/gflux.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/glblur.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/glcells.desktop:47
-#: kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop:52
-#: kscreensaver/kxsconfig/ScreenSavers/glknots.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/glschool.desktop:49
-#: kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/gltext.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/goop.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/grav.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/halftone.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/halo.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/helix.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop:47
-#: kscreensaver/kxsconfig/ScreenSavers/ifs.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop:48
-#: kscreensaver/kxsconfig/ScreenSavers/interference.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop:66
-#: kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/juggle.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop:55
-#: kscreensaver/kxsconfig/ScreenSavers/julia.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/klein.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/lament.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/laser.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop:46
-#: kscreensaver/kxsconfig/ScreenSavers/lightning.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/lisa.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/lissie.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/lockward.desktop:45
-#: kscreensaver/kxsconfig/ScreenSavers/loop.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/m6502.desktop:48
-#: kscreensaver/kxsconfig/ScreenSavers/maze.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop:65
-#: kscreensaver/kxsconfig/ScreenSavers/menger.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop:65
-#: kscreensaver/kxsconfig/ScreenSavers/moebius.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop:51
-#: kscreensaver/kxsconfig/ScreenSavers/moire.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/moire2.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/molecule.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/mountain.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/munch.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/noof.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/pacman.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/pedal.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/penrose.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/petri.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/photopile.desktop:47
-#: kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop:67
-#: kscreensaver/kxsconfig/ScreenSavers/pinion.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/pipes.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/pong.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop:67
-#: kscreensaver/kxsconfig/ScreenSavers/providence.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/pyro.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/qix.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/queens.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/ripples.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/rocks.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/rotor.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/rubik.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/sballs.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/skytentacles.desktop:47
-#: kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/slip.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/sonar.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop:67
-#: kscreensaver/kxsconfig/ScreenSavers/sphere.desktop:76
-#: kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/spiral.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/squiral.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/stairs.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/starfish.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/starwars.desktop:74
-#: kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/strange.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/substrate.desktop:66
-#: kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/swirl.desktop:73
-#: kscreensaver/kxsconfig/ScreenSavers/t3d.desktop:75
-#: kscreensaver/kxsconfig/ScreenSavers/tangram.desktop:54
-#: kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop:50
-#: kscreensaver/kxsconfig/ScreenSavers/topblock.desktop:49
-#: kscreensaver/kxsconfig/ScreenSavers/triangle.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/truchet.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/twang.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/vines.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/voronoi.desktop:51
-#: kscreensaver/kxsconfig/ScreenSavers/wander.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop:68
-#: kscreensaver/kxsconfig/ScreenSavers/worm.desktop:77
-#: kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop:69
-#: kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/xflame.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/xjack.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop:70
-#: kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop:71
-#: kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop:72
-#: kscreensaver/kxsconfig/ScreenSavers/zoom.desktop:76
-#: kscreensaver/xsavers/KSpace.desktop:75
-#: kscreensaver/xsavers/KSwarm.desktop:72
-msgctxt "Name"
-msgid "Setup..."
-msgstr "Gosod ..."
-
-#: kscreensaver/kdesavers/KBanner.desktop:146
-#: kscreensaver/kdesavers/KBlob.desktop:143
-#: kscreensaver/kdesavers/KClock.desktop:149
-#: kscreensaver/kdesavers/KEuphoria.desktop:146
-#: kscreensaver/kdesavers/KFiresaver.desktop:142
-#: kscreensaver/kdesavers/KFlux.desktop:147
-#: kscreensaver/kdesavers/KFountain.desktop:146
-#: kscreensaver/kdesavers/KGravity.desktop:149
-#: kscreensaver/kdesavers/KLines-saver.desktop:149
-#: kscreensaver/kdesavers/KLorenz.desktop:144
-#: kscreensaver/kdesavers/KPendulum.desktop:141
-#: kscreensaver/kdesavers/KPolygon.desktop:148
-#: kscreensaver/kdesavers/KRotation.desktop:141
-#: kscreensaver/kdesavers/KScience.desktop:150
-#: kscreensaver/kdesavers/KSlideshow.desktop:149
-#: kscreensaver/kdesavers/KSolarWinds.desktop:146
-#: kscreensaver/kdesavers/KVm.desktop:147
-#: kscreensaver/kdesavers/KWave.desktop:147
-#: kscreensaver/kpartsaver/kpartsaver.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/abstractile.desktop:117
-#: kscreensaver/kxsconfig/ScreenSavers/anemone.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/ant.desktop:149
-#: kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop:124
-#: kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/apple2.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/attraction.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/barcode.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/blaster.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/boing.desktop:124
-#: kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/boxed.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop:118
-#: kscreensaver/kxsconfig/ScreenSavers/braid.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/bsod.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop:149
-#: kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/bumps.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/cage.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/carousel.desktop:122
-#: kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/celtic.desktop:125
-#: kscreensaver/kxsconfig/ScreenSavers/circuit.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/compass.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/coral.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop:119
-#: kscreensaver/kxsconfig/ScreenSavers/critical.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/crystal.desktop:149
-#: kscreensaver/kxsconfig/ScreenSavers/cube21.desktop:118
-#: kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop:116
-#: kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop:115
-#: kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/deco.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/demon.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/discrete.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/distort.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/drift.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/endgame.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/engine.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/eruption.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop:119
-#: kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/flag.desktop:149
-#: kscreensaver/kxsconfig/ScreenSavers/flame.desktop:150
-#: kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop:120
-#: kscreensaver/kxsconfig/ScreenSavers/flow.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/flurry.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/forest.desktop:150
-#: kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/gears.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/gflux.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/glblur.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/glcells.desktop:117
-#: kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop:122
-#: kscreensaver/kxsconfig/ScreenSavers/glknots.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/glschool.desktop:119
-#: kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/gltext.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/goop.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/grav.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/halftone.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/halo.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/helix.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop:117
-#: kscreensaver/kxsconfig/ScreenSavers/ifs.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop:118
-#: kscreensaver/kxsconfig/ScreenSavers/interference.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop:136
-#: kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/juggle.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop:125
-#: kscreensaver/kxsconfig/ScreenSavers/julia.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/klein.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/lament.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/laser.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop:116
-#: kscreensaver/kxsconfig/ScreenSavers/lightning.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/lisa.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/lissie.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/lockward.desktop:115
-#: kscreensaver/kxsconfig/ScreenSavers/loop.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/m6502.desktop:118
-#: kscreensaver/kxsconfig/ScreenSavers/maze.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop:135
-#: kscreensaver/kxsconfig/ScreenSavers/menger.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop:135
-#: kscreensaver/kxsconfig/ScreenSavers/moebius.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop:121
-#: kscreensaver/kxsconfig/ScreenSavers/moire.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/moire2.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/molecule.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/mountain.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/munch.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/noof.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/pacman.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/pedal.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/penrose.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/petri.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop:147
-#: kscreensaver/kxsconfig/ScreenSavers/photopile.desktop:117
-#: kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop:137
-#: kscreensaver/kxsconfig/ScreenSavers/pinion.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/pipes.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/pong.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop:137
-#: kscreensaver/kxsconfig/ScreenSavers/providence.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/pyro.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/qix.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/queens.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/ripples.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/rocks.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/rotor.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/rubik.desktop:145
-#: kscreensaver/kxsconfig/ScreenSavers/sballs.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/skytentacles.desktop:117
-#: kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/slip.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/sonar.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop:137
-#: kscreensaver/kxsconfig/ScreenSavers/sphere.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/spiral.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/squiral.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/stairs.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/starfish.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/starwars.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/strange.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/substrate.desktop:136
-#: kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/swirl.desktop:144
-#: kscreensaver/kxsconfig/ScreenSavers/t3d.desktop:146
-#: kscreensaver/kxsconfig/ScreenSavers/tangram.desktop:124
-#: kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop:120
-#: kscreensaver/kxsconfig/ScreenSavers/topblock.desktop:119
-#: kscreensaver/kxsconfig/ScreenSavers/triangle.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/truchet.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/twang.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/vines.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/voronoi.desktop:121
-#: kscreensaver/kxsconfig/ScreenSavers/wander.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop:141
-#: kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop:138
-#: kscreensaver/kxsconfig/ScreenSavers/worm.desktop:148
-#: kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop:139
-#: kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/xflame.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/xjack.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop:143
-#: kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop:140
-#: kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop:142
-#: kscreensaver/kxsconfig/ScreenSavers/zoom.desktop:146
-#: kscreensaver/xsavers/KSpace.desktop:146
-#: kscreensaver/xsavers/KSwarm.desktop:143
-msgctxt "Name"
-msgid "Display in Specified Window"
-msgstr "Dangos mewn Ffenestr Benodol"
-
-#: kscreensaver/kdesavers/KBanner.desktop:213
-#: kscreensaver/kdesavers/KBlob.desktop:210
-#: kscreensaver/kdesavers/KClock.desktop:216
-#: kscreensaver/kdesavers/KEuphoria.desktop:213
-#: kscreensaver/kdesavers/KFiresaver.desktop:209
-#: kscreensaver/kdesavers/KFlux.desktop:214
-#: kscreensaver/kdesavers/KFountain.desktop:213
-#: kscreensaver/kdesavers/KGravity.desktop:216
-#: kscreensaver/kdesavers/KLines-saver.desktop:216
-#: kscreensaver/kdesavers/KLorenz.desktop:211
-#: kscreensaver/kdesavers/KPendulum.desktop:208
-#: kscreensaver/kdesavers/KPolygon.desktop:215
-#: kscreensaver/kdesavers/KRotation.desktop:208
-#: kscreensaver/kdesavers/KScience.desktop:217
-#: kscreensaver/kdesavers/KSlideshow.desktop:216
-#: kscreensaver/kdesavers/KSolarWinds.desktop:213
-#: kscreensaver/kdesavers/KVm.desktop:214
-#: kscreensaver/kdesavers/KWave.desktop:214
-#: kscreensaver/kpartsaver/kpartsaver.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/abstractile.desktop:184
-#: kscreensaver/kxsconfig/ScreenSavers/anemone.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/ant.desktop:216
-#: kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop:191
-#: kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/apple2.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/attraction.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/barcode.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/blaster.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/boing.desktop:191
-#: kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/boxed.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop:185
-#: kscreensaver/kxsconfig/ScreenSavers/braid.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/bsod.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop:216
-#: kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/bumps.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/cage.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/carousel.desktop:189
-#: kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/celtic.desktop:192
-#: kscreensaver/kxsconfig/ScreenSavers/circuit.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/compass.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/coral.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop:186
-#: kscreensaver/kxsconfig/ScreenSavers/critical.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/crystal.desktop:216
-#: kscreensaver/kxsconfig/ScreenSavers/cube21.desktop:185
-#: kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop:183
-#: kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop:182
-#: kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/deco.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/demon.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/discrete.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/distort.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/drift.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/endgame.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/engine.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/eruption.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop:186
-#: kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/flag.desktop:216
-#: kscreensaver/kxsconfig/ScreenSavers/flame.desktop:217
-#: kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop:187
-#: kscreensaver/kxsconfig/ScreenSavers/flow.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/flurry.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/forest.desktop:217
-#: kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/gears.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/gflux.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/glblur.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/glcells.desktop:184
-#: kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop:189
-#: kscreensaver/kxsconfig/ScreenSavers/glknots.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/glschool.desktop:186
-#: kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/gltext.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/goop.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/grav.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/halftone.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/halo.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/helix.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop:184
-#: kscreensaver/kxsconfig/ScreenSavers/ifs.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop:185
-#: kscreensaver/kxsconfig/ScreenSavers/interference.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop:203
-#: kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/juggle.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop:192
-#: kscreensaver/kxsconfig/ScreenSavers/julia.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/klein.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/lament.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/laser.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop:183
-#: kscreensaver/kxsconfig/ScreenSavers/lightning.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/lisa.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/lissie.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/lockward.desktop:182
-#: kscreensaver/kxsconfig/ScreenSavers/loop.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/m6502.desktop:185
-#: kscreensaver/kxsconfig/ScreenSavers/maze.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop:202
-#: kscreensaver/kxsconfig/ScreenSavers/menger.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop:202
-#: kscreensaver/kxsconfig/ScreenSavers/moebius.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop:188
-#: kscreensaver/kxsconfig/ScreenSavers/moire.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/moire2.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/molecule.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/mountain.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/munch.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/noof.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/pacman.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/pedal.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/penrose.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/petri.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop:214
-#: kscreensaver/kxsconfig/ScreenSavers/photopile.desktop:184
-#: kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop:204
-#: kscreensaver/kxsconfig/ScreenSavers/pinion.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/pipes.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/pong.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop:204
-#: kscreensaver/kxsconfig/ScreenSavers/providence.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/pyro.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/qix.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/queens.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/ripples.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/rocks.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/rotor.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/rubik.desktop:212
-#: kscreensaver/kxsconfig/ScreenSavers/sballs.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/skytentacles.desktop:184
-#: kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/slip.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/sonar.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop:204
-#: kscreensaver/kxsconfig/ScreenSavers/sphere.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/spiral.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/squiral.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/stairs.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/starfish.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/starwars.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/strange.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/substrate.desktop:203
-#: kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/swirl.desktop:211
-#: kscreensaver/kxsconfig/ScreenSavers/t3d.desktop:213
-#: kscreensaver/kxsconfig/ScreenSavers/tangram.desktop:191
-#: kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop:187
-#: kscreensaver/kxsconfig/ScreenSavers/topblock.desktop:186
-#: kscreensaver/kxsconfig/ScreenSavers/triangle.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/truchet.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/twang.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/vines.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/voronoi.desktop:188
-#: kscreensaver/kxsconfig/ScreenSavers/wander.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop:208
-#: kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop:205
-#: kscreensaver/kxsconfig/ScreenSavers/worm.desktop:215
-#: kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop:206
-#: kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/xflame.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/xjack.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop:210
-#: kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop:207
-#: kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop:209
-#: kscreensaver/kxsconfig/ScreenSavers/zoom.desktop:213
-#: kscreensaver/xsavers/KSpace.desktop:213
-#: kscreensaver/xsavers/KSwarm.desktop:210
-msgctxt "Name"
-msgid "Display in Root Window"
-msgstr "Dangos mewn Ffenestr Wraidd"
-
-#: kscreensaver/kdesavers/KBlob.desktop:8
-msgctxt "Name"
-msgid "Blob"
-msgstr "Smotyn"
-
-#: kscreensaver/kdesavers/KClock.desktop:8
-msgctxt "Name"
-msgid "Clock"
-msgstr "Cloc"
-
-#: kscreensaver/kdesavers/KEuphoria.desktop:9
-msgctxt "Name"
-msgid "Euphoria (GL)"
-msgstr "Iwfforia (GL)"
-
-#: kscreensaver/kdesavers/KFiresaver.desktop:9
-msgctxt "Name"
-msgid "Fireworks 3D (GL)"
-msgstr ""
-
-#: kscreensaver/kdesavers/KFlux.desktop:9
-msgctxt "Name"
-msgid "Flux (GL)"
-msgstr "Dylif (GL)"
-
-#: kscreensaver/kdesavers/KFountain.desktop:9
-msgctxt "Name"
-msgid "Particle Fountain (GL)"
-msgstr "Ffynnon Gronyn (GL)"
-
-#: kscreensaver/kdesavers/KGravity.desktop:9
-msgctxt "Name"
-msgid "Gravity (GL)"
-msgstr "Disgyrchiant (GL)"
-
-#: kscreensaver/kdesavers/KLines-saver.desktop:8
-msgctxt "Name"
-msgid "Lines"
-msgstr "Llinellau"
-
-#: kscreensaver/kdesavers/KLorenz.desktop:8
-msgctxt "Name"
-msgid "Lorenz Attractor"
-msgstr "Attynydd Lorenz"
-
-#: kscreensaver/kdesavers/KPendulum.desktop:9
-msgctxt "Name"
-msgid "KPendulum (GL)"
-msgstr ""
-
-#: kscreensaver/kdesavers/KPolygon.desktop:8
-msgctxt "Name"
-msgid "Polygons"
-msgstr "Polygonau"
-
-#: kscreensaver/kdesavers/KRotation.desktop:9
-msgctxt "Name"
-msgid "KRotation (GL)"
-msgstr ""
-
-#: kscreensaver/kdesavers/KScience.desktop:9
-msgctxt "Name"
-msgid "Science"
-msgstr "Gwyddoniaeth"
-
-#: kscreensaver/kdesavers/KSlideshow.desktop:8
-msgctxt "Name"
-msgid "Slide Show"
-msgstr "Sioe Tryloywder"
-
-#: kscreensaver/kdesavers/KSolarWinds.desktop:9
-msgctxt "Name"
-msgid "Solar Winds (GL)"
-msgstr "Gwyntoedd o'r Haul (GL)"
-
-#: kscreensaver/kdesavers/KVm.desktop:8
-msgctxt "Name"
-msgid "Virtual Machine"
-msgstr "Peiriant Rhith"
-
-#: kscreensaver/kdesavers/KWave.desktop:9
-msgctxt "Name"
-msgid "Bitmap Flag (GL)"
-msgstr "Baner Didfap (GL)"
-
-#: kscreensaver/kdesavers/asciiquarium/asciiquarium.desktop:2
-msgctxt "Name"
-msgid "Asciiquarium"
-msgstr ""
-
-#: kscreensaver/kdesavers/asciiquarium/asciiquarium.desktop:56
-msgctxt "Name"
-msgid "Display in specified window"
-msgstr ""
-
-#: kscreensaver/kdesavers/asciiquarium/asciiquarium.desktop:109
-msgctxt "Name"
-msgid "Display in root window"
-msgstr ""
-
-#: kscreensaver/kdesavers/asciiquarium/asciiquarium.desktop:162
-msgctxt "Name"
-msgid "Display setup dialog"
-msgstr ""
-
-#: kscreensaver/kpartsaver/kpartsaver.desktop:3
-msgctxt "Name"
-msgid "Media Screen Saver"
-msgstr "Arbedydd Sgrîn efo Cyfryngau"
-
-#: kscreensaver/kxsconfig/ScreenSavers/abstractile.desktop:9
-msgctxt "Name"
-msgid "Abstractile"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/anemone.desktop:9
-msgctxt "Name"
-msgid "Anemone"
-msgstr "Blodyn Y Gwynt"
-
-#: kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop:8
-msgctxt "Name"
-msgid "Anemotaxis"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/ant.desktop:9
-msgctxt "Name"
-msgid "Ant"
-msgstr "Morgrugyn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop:8
-msgctxt "Name"
-msgid "AntInspect"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop:10
-msgctxt "Name"
-msgid "AntMaze"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop:8
-msgctxt "Name"
-msgid "AntSpotlight"
-msgstr "GolauSbot Ant"
-
-#: kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop:9
-msgctxt "Name"
-msgid "Apollonian"
-msgstr "Apolonaidd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/apple2.desktop:10
-msgctxt "Name"
-msgid "Apple ]["
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop:10
-msgctxt "Name"
-msgid "Atlantis (GL)"
-msgstr "Atlantis (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/attraction.desktop:9
-msgctxt "Name"
-msgid "Attraction"
-msgstr "Atyniad"
-
-#: kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop:10
-msgctxt "Name"
-msgid "Atunnel"
-msgstr "TwnelA"
-
-#: kscreensaver/kxsconfig/ScreenSavers/barcode.desktop:9
-msgctxt "Name"
-msgid "Barcode"
-msgstr "Bargôd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/blaster.desktop:9
-msgctxt "Name"
-msgid "Blaster"
-msgstr "Ffrwydryn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop:8
-msgctxt "Name"
-msgid "BlinkBox"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop:9
-msgctxt "Name"
-msgid "BlitSpin"
-msgstr "SbinBlit"
-
-#: kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop:8
-msgctxt "Name"
-msgid "BlockTube"
-msgstr "TiwbBloc"
-
-#: kscreensaver/kxsconfig/ScreenSavers/boing.desktop:10
-msgctxt "Name"
-msgid "Boing"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop:9
-msgctxt "Name"
-msgid "Bouboule"
-msgstr "Bouboule"
-
-#: kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop:10
-msgctxt "Name"
-msgid "BouncingCow"
-msgstr "BuwchSboncio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/boxed.desktop:10
-msgctxt "Name"
-msgid "Boxed"
-msgstr "Amgaeëdig"
-
-#: kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop:9
-msgctxt "Name"
-msgid "BoxFit"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/braid.desktop:9
-msgctxt "Name"
-msgid "Braid"
-msgstr "Plethu"
-
-#: kscreensaver/kxsconfig/ScreenSavers/bsod.desktop:9
-msgctxt "Name"
-msgid "BSOD"
-msgstr "BSOD"
-
-#: kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop:10
-msgctxt "Name"
-msgid "Bubble 3D (GL)"
-msgstr "Swigen 3D (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop:9
-msgctxt "Name"
-msgid "Bubbles"
-msgstr "Swigod"
-
-#: kscreensaver/kxsconfig/ScreenSavers/bumps.desktop:10
-msgctxt "Name"
-msgid "Bumps"
-msgstr "Hergydion"
-
-#: kscreensaver/kxsconfig/ScreenSavers/cage.desktop:10
-msgctxt "Name"
-msgid "Cage (GL)"
-msgstr "Cawell (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/carousel.desktop:10
-msgctxt "Name"
-msgid "Carousel"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop:9
-msgctxt "Name"
-msgid "C Curve"
-msgstr "Cromlin C"
-
-#: kscreensaver/kxsconfig/ScreenSavers/celtic.desktop:9
-msgctxt "Name"
-msgid "Celtic"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/circuit.desktop:10
-msgctxt "Name"
-msgid "Circuit"
-msgstr "Cylched"
-
-#: kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop:8
-msgctxt "Name"
-msgid "CloudLife"
-msgstr "BywydCymylau"
-
-#: kscreensaver/kxsconfig/ScreenSavers/compass.desktop:9
-msgctxt "Name"
-msgid "Compass"
-msgstr "Cwmpawd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/coral.desktop:9
-msgctxt "Name"
-msgid "Coral"
-msgstr "Cwrel"
-
-#: kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop:10
-msgctxt "Name"
-msgid "Crackberg"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/critical.desktop:9
-msgctxt "Name"
-msgid "Critical"
-msgstr "Critigol"
-
-#: kscreensaver/kxsconfig/ScreenSavers/crystal.desktop:9
-msgctxt "Name"
-msgid "Crystal"
-msgstr "Grisial"
-
-#: kscreensaver/kxsconfig/ScreenSavers/cube21.desktop:10
-msgctxt "Name"
-msgid "Cube21"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop:10
-msgctxt "Name"
-msgid "Cubenetic"
-msgstr "Ciwbnetig"
-
-#: kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop:8
-msgctxt "Name"
-msgid "CubeStorm"
-msgstr "StormCiwb"
-
-#: kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop:10
-msgctxt "Name"
-msgid "CubicGrid"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop:9
-msgctxt "Name"
-msgid "CWaves"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop:9
-msgctxt "Name"
-msgid "Cynosure"
-msgstr "Canolbwynt Edmygedd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop:10
-msgctxt "Name"
-msgid "DangerBall"
-msgstr "PelEnbyd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop:10
-msgctxt "Name"
-msgid "DecayScreen"
-msgstr "SgrînDadfeilio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/deco.desktop:9
-msgctxt "Name"
-msgid "Deco"
-msgstr "Deco"
-
-#: kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop:9
-msgctxt "Name"
-msgid "Deluxe"
-msgstr "Moethus"
-
-#: kscreensaver/kxsconfig/ScreenSavers/demon.desktop:9
-msgctxt "Name"
-msgid "Demon"
-msgstr "Cythraul"
-
-#: kscreensaver/kxsconfig/ScreenSavers/discrete.desktop:9
-msgctxt "Name"
-msgid "Discrete"
-msgstr "Arwahanol"
-
-#: kscreensaver/kxsconfig/ScreenSavers/distort.desktop:10
-msgctxt "Name"
-msgid "Distort"
-msgstr "Aflunio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/drift.desktop:9
-msgctxt "Name"
-msgid "Drift"
-msgstr "Drifft"
-
-#: kscreensaver/kxsconfig/ScreenSavers/endgame.desktop:10
-msgctxt "Name"
-msgid "Endgame"
-msgstr "Diwedd y Gêm"
-
-#: kscreensaver/kxsconfig/ScreenSavers/engine.desktop:10
-msgctxt "Name"
-msgid "Engine"
-msgstr "Peiriant"
-
-#: kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop:9
-msgctxt "Name"
-msgid "Epicycle"
-msgstr "Argylch"
-
-#: kscreensaver/kxsconfig/ScreenSavers/eruption.desktop:9
-msgctxt "Name"
-msgid "Eruption"
-msgstr "Allwthiad"
-
-#: kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop:9
-msgctxt "Name"
-msgid "Euler2d"
-msgstr "Euler2d"
-
-#: kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop:10
-msgctxt "Name"
-msgid "Extrusion"
-msgstr "Allwthiad"
-
-#: kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop:9
-msgctxt "Name"
-msgid "Fade Plot"
-msgstr "Plot Afliwio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop:9
-msgctxt "Name"
-msgid "Fiberlamp"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop:8
-msgctxt "Name"
-msgid "Fireworkx"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/flag.desktop:9
-msgctxt "Name"
-msgid "Flag"
-msgstr "Baner"
-
-#: kscreensaver/kxsconfig/ScreenSavers/flame.desktop:9
-msgctxt "Name"
-msgid "Flame"
-msgstr "Fflam"
-
-#: kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop:8
-msgctxt "Name"
-msgid "FlipFlop"
-msgstr "FflipLlip"
-
-#: kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop:10
-msgctxt "Name"
-msgid "Flipscreen3d"
-msgstr "Sgrînfflip3d"
-
-#: kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop:10
-msgctxt "Name"
-msgid "FlipText"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/flow.desktop:9
-msgctxt "Name"
-msgid "Flow"
-msgstr "Llif"
-
-#: kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop:9
-msgctxt "Name"
-msgid "FluidBalls"
-msgstr "PeliLlif"
-
-#: kscreensaver/kxsconfig/ScreenSavers/flurry.desktop:10
-msgctxt "Name"
-msgid "Flurry"
-msgstr "Ffwdan"
-
-#: kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop:10
-msgctxt "Name"
-msgid "Flying Toasters"
-msgstr "TosteriFflio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop:8
-msgctxt "Name"
-msgid "FontGlide"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/forest.desktop:9
-msgctxt "Name"
-msgid "Forest"
-msgstr "Coedwig"
-
-#: kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop:9
-msgctxt "Name"
-msgid "FuzzyFlakes"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop:9
-msgctxt "Name"
-msgid "Galaxy"
-msgstr "Galaeth"
-
-#: kscreensaver/kxsconfig/ScreenSavers/gears.desktop:10
-msgctxt "Name"
-msgid "Gears (GL)"
-msgstr "Gerau (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/gflux.desktop:10
-msgctxt "Name"
-msgid "GFlux"
-msgstr "FfrwdG"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glblur.desktop:10
-msgctxt "Name"
-msgid "GLBlur"
-msgstr "DylniGL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glcells.desktop:10
-msgctxt "Name"
-msgid "GLCells"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop:8
-msgctxt "Name"
-msgid "Gleidescope"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop:10
-msgctxt "Name"
-msgid "GLForestFire"
-msgstr "TânCoedwigGL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop:10
-msgctxt "Name"
-msgid "GLHanoi"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/glknots.desktop:8
-msgctxt "Name"
-msgid "GLKnots"
-msgstr "ClymauGL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop:10
-msgctxt "Name"
-msgid "GLMatrix"
-msgstr "MatricsGL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop:10
-msgctxt "Name"
-msgid "GL Planet (GL)"
-msgstr "GL Planed (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glschool.desktop:10
-msgctxt "Name"
-msgid "GLSchool"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop:10
-msgctxt "Name"
-msgid "GLSlideshow"
-msgstr "Sioe Tryloywder GL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop:10
-msgctxt "Name"
-msgid "GLSnake"
-msgstr "NeidrGL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/gltext.desktop:10
-msgctxt "Name"
-msgid "GLText"
-msgstr "TestunGL"
-
-#: kscreensaver/kxsconfig/ScreenSavers/goop.desktop:9
-msgctxt "Name"
-msgid "Goop"
-msgstr "Llaid"
-
-#: kscreensaver/kxsconfig/ScreenSavers/grav.desktop:9
-msgctxt "Name"
-msgid "Gravity"
-msgstr "Disgyrchiant"
-
-#: kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop:9
-msgctxt "Name"
-msgid "graynetic"
-msgstr "llwydnetig"
-
-#: kscreensaver/kxsconfig/ScreenSavers/halftone.desktop:9
-msgctxt "Name"
-msgid "Halftone"
-msgstr "Hannerdôn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/halo.desktop:9
-msgctxt "Name"
-msgid "Halo"
-msgstr "Corongylch"
-
-#: kscreensaver/kxsconfig/ScreenSavers/helix.desktop:9
-msgctxt "Name"
-msgid "Helix"
-msgstr "Helics"
-
-#: kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop:9
-msgctxt "Name"
-msgid "Hopalong"
-msgstr "Sboncio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop:9
-msgctxt "Name"
-msgid "Hyperball"
-msgstr "Gorbêl"
-
-#: kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop:9
-msgctxt "Name"
-msgid "Hypercube"
-msgstr "Gorgiwb"
-
-#: kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop:8
-msgctxt "Name"
-msgid "4D Hypertorus"
-msgstr "Gordorws 4D"
-
-#: kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop:10
-msgctxt "Name"
-msgid "Hypnowheel"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/ifs.desktop:9
-msgctxt "Name"
-msgid "Iterated-function-system Images"
-msgstr "Delweddau Cysawd-ffwythiant-adrifo"
-
-#: kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop:9
-msgctxt "Name"
-msgid "Fractal Maps"
-msgstr "Mapiau Ffractaidd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop:9
-msgctxt "Name"
-msgid "Interaggregate"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/interference.desktop:9
-msgctxt "Name"
-msgid "Interference"
-msgstr "Ymyrraeth"
-
-#: kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop:7
-msgctxt "Name"
-msgid "Intermomentary"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop:8
-msgctxt "Name"
-msgid "JigglyPuff"
-msgstr "PwffJiglo"
-
-#: kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop:10
-msgctxt "Name"
-msgid "Jigsaw"
-msgstr "Jig-sô"
-
-#: kscreensaver/kxsconfig/ScreenSavers/juggle.desktop:9
-msgctxt "Name"
-msgid "Juggle"
-msgstr "Jyglo"
-
-#: kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop:10
-msgctxt "Name"
-msgid "Juggler3D"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/julia.desktop:9
-msgctxt "Name"
-msgid "Julia"
-msgstr "Julia"
-
-#: kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop:9
-msgctxt "Name"
-msgid "Kaleidescope"
-msgstr "Kaleidesgôp"
-
-#: kscreensaver/kxsconfig/ScreenSavers/klein.desktop:8
-msgctxt "Name"
-msgid "Klein"
-msgstr "Klein"
-
-#: kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop:9
-msgctxt "Name"
-msgid "Kumppa"
-msgstr "Kumppa"
-
-#: kscreensaver/kxsconfig/ScreenSavers/lament.desktop:10
-msgctxt "Name"
-msgid "Lament (GL)"
-msgstr "Galarnad (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/laser.desktop:9
-msgctxt "Name"
-msgid "Laser"
-msgstr "Laser"
-
-#: kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop:10
-msgctxt "Name"
-msgid "LavaLite"
-msgstr "GolauLafa"
-
-#: kscreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop:9
-msgctxt "Name"
-msgid "LCDscrub"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/lisa.desktop:9
-msgctxt "Name"
-msgid "Lisa"
-msgstr "Lisa"
-
-#: kscreensaver/kxsconfig/ScreenSavers/lissie.desktop:9
-msgctxt "Name"
-msgid "Lissie"
-msgstr "Lissie"
-
-#: kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop:9
-msgctxt "Name"
-msgid "Morphing Lines"
-msgstr "Llinellau sy'n Morffio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/lockward.desktop:10
-msgctxt "Name"
-msgid "Lockward"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/loop.desktop:9
-msgctxt "Name"
-msgid "Loop"
-msgstr "Dolen"
-
-#: kscreensaver/kxsconfig/ScreenSavers/m6502.desktop:9
-msgctxt "Name"
-msgid "m6502"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/maze.desktop:9
-msgctxt "Name"
-msgid "Maze"
-msgstr "Drysfa"
-
-#: kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop:8
-msgctxt "Name"
-msgid "MemScroller"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/menger.desktop:10
-msgctxt "Name"
-msgid "Menger"
-msgstr "Menger"
-
-#: kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop:9
-msgctxt "Name"
-msgid "MetaBalls"
-msgstr "MetaBeli"
-
-#: kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop:8
-msgctxt "Name"
-msgid "MirrorBlob"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop:9
-msgctxt "Name"
-msgid "Mismunch"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/moebius.desktop:10
-msgctxt "Name"
-msgid "Moebius (GL)"
-msgstr "Moebius (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop:10
-msgctxt "Name"
-msgid "MoebiusGears"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/moire.desktop:9
-msgctxt "Name"
-msgid "Moire"
-msgstr "Moire"
-
-#: kscreensaver/kxsconfig/ScreenSavers/moire2.desktop:9
-msgctxt "Name"
-msgid "Moire2"
-msgstr "Moire2"
-
-#: kscreensaver/kxsconfig/ScreenSavers/molecule.desktop:10
-msgctxt "Name"
-msgid "Molecule"
-msgstr "Moleciwl"
-
-#: kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop:10
-msgctxt "Name"
-msgid "Morph3D"
-msgstr "Morff3D"
-
-#: kscreensaver/kxsconfig/ScreenSavers/mountain.desktop:9
-msgctxt "Name"
-msgid "Mountain"
-msgstr "Mynydd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/munch.desktop:9
-msgctxt "Name"
-msgid "Munch"
-msgstr "Cnoi"
-
-#: kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop:9
-msgctxt "Name"
-msgid "NerveRot"
-msgstr "NerfBydredd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/noof.desktop:8
-msgctxt "Name"
-msgid "Noof"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop:10
-msgctxt "Name"
-msgid "Noseguy"
-msgstr "Boitrwyn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/pacman.desktop:9
-msgctxt "Name"
-msgid "Pacman"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/pedal.desktop:9
-msgctxt "Name"
-msgid "Pedal"
-msgstr "Pedal"
-
-#: kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop:9
-msgctxt "Name"
-msgid "Penetrate"
-msgstr "Treiddio"
-
-#: kscreensaver/kxsconfig/ScreenSavers/penrose.desktop:9
-msgctxt "Name"
-msgid "Penrose"
-msgstr "Penrose"
-
-#: kscreensaver/kxsconfig/ScreenSavers/petri.desktop:9
-msgctxt "Name"
-msgid "Petri"
-msgstr "Petri"
-
-#: kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop:10
-msgctxt "Name"
-msgid "Phosphor"
-msgstr "Ffosffor"
-
-#: kscreensaver/kxsconfig/ScreenSavers/photopile.desktop:10
-msgctxt "Name"
-msgid "Photopile"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop:9
-msgctxt "Name"
-msgid "Piecewise"
-msgstr "Tameidiog"
-
-#: kscreensaver/kxsconfig/ScreenSavers/pinion.desktop:7
-msgctxt "Name"
-msgid "Pinion"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/pipes.desktop:10
-msgctxt "Name"
-msgid "Pipes - another (GL)"
-msgstr "Pibellau - un arall (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop:9
-msgctxt "Name"
-msgid "pixmaps"
-msgstr "picsfapiau"
-
-#: kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop:8
-msgctxt "Name"
-msgid "Polyhedra"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop:9
-msgctxt "Name"
-msgid "Polyominoes"
-msgstr "Poliominôs"
-
-#: kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop:8
-msgctxt "Name"
-msgid "Regular 4D Polytopes"
-msgstr "Politopau 4D Rheolaidd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/pong.desktop:9
-msgctxt "Name"
-msgid "Pong"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop:9
-msgctxt "Name"
-msgid "Popsquares"
-msgstr "SgwariauPop"
-
-#: kscreensaver/kxsconfig/ScreenSavers/providence.desktop:8
-msgctxt "Name"
-msgid "Providence"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop:10
-msgctxt "Name"
-msgid "Pulsar (GL)"
-msgstr "Curiadydd (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/pyro.desktop:9
-msgctxt "Name"
-msgid "Pyro"
-msgstr "Pyro"
-
-#: kscreensaver/kxsconfig/ScreenSavers/qix.desktop:9
-msgctxt "Name"
-msgid "Qix"
-msgstr "Qix"
-
-#: kscreensaver/kxsconfig/ScreenSavers/queens.desktop:10
-msgctxt "Name"
-msgid "Queens"
-msgstr "Brenhinesau"
-
-#: kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop:9
-msgctxt "Name"
-msgid "RD-Bomb"
-msgstr "RD-Bom"
-
-#: kscreensaver/kxsconfig/ScreenSavers/ripples.desktop:10
-msgctxt "Name"
-msgid "Ripples"
-msgstr "Crychdonni"
-
-#: kscreensaver/kxsconfig/ScreenSavers/rocks.desktop:9
-msgctxt "Name"
-msgid "Rocks"
-msgstr "Creigiau"
-
-#: kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop:9
-msgctxt "Name"
-msgid "Rorschach"
-msgstr "Rorschach"
-
-#: kscreensaver/kxsconfig/ScreenSavers/rotor.desktop:9
-msgctxt "Name"
-msgid "Rotor"
-msgstr "Rotor"
-
-#: kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop:10
-msgctxt "Name"
-msgid "RotZoomer"
-msgstr "PydrChwyddydd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/rubik.desktop:10
-msgctxt "Name"
-msgid "Rubik Cube (GL)"
-msgstr "Ciwb Rubik (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/sballs.desktop:10
-msgctxt "Name"
-msgid "Sballs"
-msgstr "Sbelli"
-
-#: kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop:9
-msgctxt "Name"
-msgid "ShadeBobs"
-msgstr "SiglauCysgod"
-
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop:9
-msgctxt "Name"
-msgid "Sierpinski"
-msgstr "Sierpinski"
-
-#: kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop:10
-msgctxt "Name"
-msgid "Sierpinski3D"
-msgstr "Sierpinski3D"
-
-#: kscreensaver/kxsconfig/ScreenSavers/skytentacles.desktop:10
-msgctxt "Name"
-msgid "SkyTentacles"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop:10
-msgctxt "Name"
-msgid "SlideScreen"
-msgstr "LlithroSgrîn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/slip.desktop:9
-msgctxt "Name"
-msgid "Slip"
-msgstr "Llithro"
-
-#: kscreensaver/kxsconfig/ScreenSavers/sonar.desktop:9
-msgctxt "Name"
-msgid "Sonar"
-msgstr "Sonar"
-
-#: kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop:9
-msgctxt "Name"
-msgid "SpeedMine"
-msgstr "FfrwydonCyflymder"
-
-#: kscreensaver/kxsconfig/ScreenSavers/sphere.desktop:9
-msgctxt "Name"
-msgid "Sphere"
-msgstr "Sffêr"
-
-#: kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop:10
-msgctxt "Name"
-msgid "Spheremonics"
-msgstr "Sfferemonics"
-
-#: kscreensaver/kxsconfig/ScreenSavers/spiral.desktop:9
-msgctxt "Name"
-msgid "Spiral"
-msgstr "Troelliad"
-
-#: kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop:10
-msgctxt "Name"
-msgid "Spotlight"
-msgstr "GolauSbot"
-
-#: kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop:10
-msgctxt "Name"
-msgid "Sproingies (GL)"
-msgstr "Sionceiddiau (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/squiral.desktop:9
-msgctxt "Name"
-msgid "Squiral"
-msgstr "Sgwoellyn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/stairs.desktop:10
-msgctxt "Name"
-msgid "Stairs (GL)"
-msgstr "Grisiau (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/starfish.desktop:9
-msgctxt "Name"
-msgid "Starfish"
-msgstr "Seren y Môr"
-
-#: kscreensaver/kxsconfig/ScreenSavers/starwars.desktop:12
-msgctxt "Name"
-msgid "StarWars"
-msgstr "StarWars"
-
-#: kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop:10
-msgctxt "Name"
-msgid "StonerView"
-msgstr "StonerView"
-
-#: kscreensaver/kxsconfig/ScreenSavers/strange.desktop:9
-msgctxt "Name"
-msgid "Strange"
-msgstr "Rhyfedd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/substrate.desktop:7
-msgctxt "Name"
-msgid "Substrate"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop:10
-msgctxt "Name"
-msgid "Superquadrics (GL)"
-msgstr "Superquadrics (GL)"
-
-#: kscreensaver/kxsconfig/ScreenSavers/swirl.desktop:9
-msgctxt "Name"
-msgid "Swirl"
-msgstr "Chwyrlïad"
-
-#: kscreensaver/kxsconfig/ScreenSavers/t3d.desktop:9
-msgctxt "Name"
-msgid "Time 3D"
-msgstr "Amser 3D"
-
-#: kscreensaver/kxsconfig/ScreenSavers/tangram.desktop:10
-msgctxt "Name"
-msgid "Tangram"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop:9
-msgctxt "Name"
-msgid "Thornbird"
-msgstr "AderynMieri"
-
-#: kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop:10
-msgctxt "Name"
-msgid "TimeTunnel"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/topblock.desktop:10
-msgctxt "Name"
-msgid "TopBlock"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/triangle.desktop:9
-msgctxt "Name"
-msgid "Triangle"
-msgstr "Triongl"
-
-#: kscreensaver/kxsconfig/ScreenSavers/truchet.desktop:9
-msgctxt "Name"
-msgid "Truchet"
-msgstr "Truchet"
-
-#: kscreensaver/kxsconfig/ScreenSavers/twang.desktop:10
-msgctxt "Name"
-msgid "Twang"
-msgstr "Twang"
-
-#: kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop:9
-msgctxt "Name"
-msgid "Vermiculate"
-msgstr "Llyngyrol"
-
-#: kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop:10
-msgctxt "Name"
-msgid "vidwhacker"
-msgstr "fid-darydd"
-
-#: kscreensaver/kxsconfig/ScreenSavers/vines.desktop:9
-msgctxt "Name"
-msgid "Vines"
-msgstr "Gwinwyddenau"
-
-#: kscreensaver/kxsconfig/ScreenSavers/voronoi.desktop:10
-msgctxt "Name"
-msgid "Voronoi"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/wander.desktop:9
-msgctxt "Name"
-msgid "Wander"
-msgstr "Crwydro"
-
-#: kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop:9
-msgctxt "Name"
-msgid "Web Collage"
-msgstr "Gludwaith Gwê"
-
-#: kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop:9
-msgctxt "Name"
-msgid "WhirlwindWarp"
-msgstr "AnffurfChwyrlwynt"
-
-#: kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop:9
-msgctxt "Name"
-msgid "WhirlyGig"
-msgstr "Chwyrligwgan"
-
-#: kscreensaver/kxsconfig/ScreenSavers/worm.desktop:9
-msgctxt "Name"
-msgid "Worm"
-msgstr "Abwydyn"
-
-#: kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop:8
-msgctxt "Name"
-msgid "Wormhole"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop:8
-msgctxt "Name"
-msgid "XAnalogTV"
-msgstr ""
-
-#: kscreensaver/kxsconfig/ScreenSavers/xflame.desktop:9
-msgctxt "Name"
-msgid "XFlame"
-msgstr "XFflam"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xjack.desktop:9
-msgctxt "Name"
-msgid "XJack"
-msgstr "XJack"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop:9
-msgctxt "Name"
-msgid "Xlyap"
-msgstr "Xlyap"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop:9
-msgctxt "Name"
-msgid "The Matrix"
-msgstr "Y Matrics"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop:9
-msgctxt "Name"
-msgid "XRaySwarm"
-msgstr "HaidPelydrX"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop:9
-msgctxt "Name"
-msgid "XSpiroGraph"
-msgstr "XSbirograff"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop:10
-msgctxt "Name"
-msgid "xsublim"
-msgstr "xisganfyddol"
-
-#: kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop:10
-msgctxt "Name"
-msgid "XTeeVee"
-msgstr "XTiFi"
-
-#: kscreensaver/kxsconfig/ScreenSavers/zoom.desktop:10
-msgctxt "Name"
-msgid "Zoom"
-msgstr "Chwyddo"
-
-#: kscreensaver/xsavers/KSpace.desktop:9
-msgctxt "Name"
-msgid "Space (GL)"
-msgstr "Gofod (GL)"
-
-#: kscreensaver/xsavers/KSwarm.desktop:8
-msgctxt "Name"
-msgid "Swarm"
-msgstr "Haid"
-
-#: kwin-styles/kde2/kde2.desktop:2
-msgctxt "Name"
-msgid "KDE 2"
-msgstr ""
-
-#: kwin-styles/keramik/keramik.desktop:2
-msgctxt "Name"
-msgid "Keramik"
-msgstr ""
-
-#: kwin-styles/modernsystem/modernsystem.desktop:2
-msgctxt "Name"
-msgid "Modern System"
-msgstr ""
-
-#: kwin-styles/quartz/quartz.desktop:2
-msgctxt "Name"
-msgid "Quartz"
-msgstr ""
-
-#: kwin-styles/redmond/redmond.desktop:2
-msgctxt "Name"
-msgid "Redmond"
-msgstr ""
-
-#: kwin-styles/web/web.desktop:2
-msgctxt "Name"
-msgid "Web"
-msgstr ""
-
-#: styles/phase/phase.themerc:2
-msgctxt "Name"
-msgid "Phase"
-msgstr ""
-
-#: styles/phase/phase.themerc:62
-msgctxt "Comment"
-msgid "Clean classical look"
-msgstr ""
-
-#: wallpapers/Atra_Dot/metadata.desktop:2
-msgctxt "Name"
-msgid "Atra Dot"
-msgstr ""
-
-#: wallpapers/Blue_Curl/metadata.desktop:2
-msgctxt "Name"
-msgid "Blue Curl"
-msgstr ""
-
-#: wallpapers/Chess/metadata.desktop:2
-msgctxt "Name"
-msgid "Chess"
-msgstr ""
-
-#: wallpapers/Code_Poets_Dream/metadata.desktop:2
-msgctxt "Name"
-msgid "Code Poets Dream"
-msgstr ""
-
-#: wallpapers/Colorado_Farm/metadata.desktop:2
-msgctxt "Name"
-msgid "Colorado Farm"
-msgstr ""
-
-#: wallpapers/Curls_on_Green/metadata.desktop:2
-msgctxt "Name"
-msgid "Curls on Green"
-msgstr ""
-
-#: wallpapers/Damselfly/metadata.desktop:2
-msgctxt "Name"
-msgid "Damselfly"
-msgstr ""
-
-#: wallpapers/EOS/metadata.desktop:2
-msgctxt "Name"
-msgid "EOS"
-msgstr ""
-
-#: wallpapers/Emotion/metadata.desktop:2
-msgctxt "Name"
-msgid "Emotion"
-msgstr ""
-
-#: wallpapers/Ethais/metadata.desktop:2
-msgctxt "Name"
-msgid "Ethais"
-msgstr ""
-
-#: wallpapers/Field/metadata.desktop:2
-msgctxt "Name"
-msgid "Field"
-msgstr ""
-
-#: wallpapers/Flower_drops/metadata.desktop:2
-msgctxt "Name"
-msgid "Flower Drops"
-msgstr ""
-
-#: wallpapers/Golden_Ripples/metadata.desktop:2
-msgctxt "Name"
-msgid "Golden Ripples"
-msgstr ""
-
-#: wallpapers/Green_Concentration/metadata.desktop:2
-msgctxt "Name"
-msgid "Green Concentration"
-msgstr ""
-
-#: wallpapers/HighTide/metadata.desktop:2
-msgctxt "Name"
-msgid "HighTide"
-msgstr ""
-
-#: wallpapers/Holiday_Cactus/metadata.desktop:2
-msgctxt "Name"
-msgid "Holiday Cactus"
-msgstr ""
-
-#: wallpapers/Korea/metadata.desktop:2
-msgctxt "Name"
-msgid "Korea"
-msgstr ""
-
-#: wallpapers/Ladybuggin/metadata.desktop:2
-msgctxt "Name"
-msgid "Ladybuggin"
-msgstr ""
-
-#: wallpapers/Leafs_Labyrinth/metadata.desktop:2
-msgctxt "Name"
-msgid "Leafs Labyrinth"
-msgstr ""
-
-#: wallpapers/Midnight_in_Karelia/metadata.desktop:2
-msgctxt "Name"
-msgid "Midnight in Karelia"
-msgstr ""
-
-#: wallpapers/Skeeter_Hawk/metadata.desktop:2
-msgctxt "Name"
-msgid "Skeeter Hawk"
-msgstr ""
-
-#: wallpapers/Spring_Sunray/metadata.desktop:2
-msgctxt "Name"
-msgid "Spring Sunray"
-msgstr ""
-
-#: wallpapers/The_Rings_of_Saturn/metadata.desktop:2
-msgctxt "Name"
-msgid "The Rings of Saturn"
-msgstr ""
-
-#: wallpapers/There_is_Rain_on_the_Table/metadata.desktop:2
-msgctxt "Name"
-msgid "There is Rain on the Table"
-msgstr ""
-
-#: wallpapers/Vector_Sunset/metadata.desktop:2
-msgctxt "Name"
-msgid "Vector Sunset"
-msgstr ""
-
-#: wallpapers/Yellow_Flowers/metadata.desktop:2
-msgctxt "Name"
-msgid "Yellow Flowers"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kde-baseapps.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kde-baseapps.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kde-baseapps.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kde-baseapps.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1219 +0,0 @@
-# translation of desktop_kdebase.po to Cymraeg
-# Translation of dt_kdebase.po to Cymraeg
-# Translation of desktop_kdebase.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KGyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdebase\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2009-07-18 18:22+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:15+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: apps/dolphin/src/dolphin.desktop:2
-msgctxt "Name"
-msgid "Dolphin"
-msgstr ""
-
-#: apps/dolphin/src/dolphin.desktop:91
-msgctxt "GenericName"
-msgid "File Manager"
-msgstr ""
-
-#: apps/dolphin/src/dolphinpart.desktop:3
-msgctxt "Name"
-msgid "Dolphin View"
-msgstr ""
-
-#: apps/dolphin/src/dolphinpart.desktop:95
-msgctxt "Name"
-msgid "Icons"
-msgstr "Eicon"
-
-#: apps/dolphin/src/dolphinpart.desktop:189
-msgctxt "Name"
-msgid "Details"
-msgstr ""
-
-#: apps/dolphin/src/dolphinpart.desktop:274
-msgctxt "Name"
-msgid "Columns"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphingeneral.desktop:1
-msgctxt "Name"
-msgid "Dolphin General"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphingeneral.desktop:67
-msgctxt "Comment"
-msgid "This service allows configuration of general Dolphin settings."
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphingeneral.desktop:143
-msgctxt "Name|Random file browsing settings."
-msgid "General"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphingeneral.desktop:208
-msgctxt "Comment"
-msgid "Configure general file manager settings"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinnavigation.desktop:1
-msgctxt "Name"
-msgid "Dolphin Navigation"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinnavigation.desktop:67
-msgctxt "Comment"
-msgid "This service allows configuration of the Dolphin navigation."
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinnavigation.desktop:142
-msgctxt "Name"
-msgid "Navigation"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinnavigation.desktop:208
-msgctxt "Comment"
-msgid "Configure file manager navigation"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinservices.desktop:1
-msgctxt "Name"
-msgid "Dolphin Services"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinservices.desktop:76
-#: apps/konqueror/sidebar/default_entries/services.desktop:4
-#: apps/konqueror/sidebar/trees/init/services/.directory:3
-msgctxt "Name"
-msgid "Services"
-msgstr "Gwasanaethau"
-
-#: apps/dolphin/src/kcm/kcmdolphinservices.desktop:165
-msgctxt "Comment"
-msgid "Configure file manager services"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop:1
-msgctxt "Name"
-msgid "Dolphin View Modes"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop:67
-msgctxt "Comment"
-msgid "This service allows configuration of the Dolphin view modes."
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop:141
-msgctxt "Name"
-msgid "View Modes"
-msgstr ""
-
-#: apps/dolphin/src/kcm/kcmdolphinviewmodes.desktop:207
-msgctxt "Comment"
-msgid "Configure file manager view modes"
-msgstr ""
-
-#: apps/dolphin/src/versioncontrol/fileviewversioncontrolplugin.desktop:4
-msgctxt "Comment"
-msgid "Version Control Plugin for File Views"
-msgstr ""
-
-#: apps/kdepasswd/kcm/kcm_useraccount.desktop:14
-msgctxt "Name"
-msgid "Password & User Account"
-msgstr "Cyfrinair a Chyfrif Defnyddiwr"
-
-#: apps/kdepasswd/kcm/kcm_useraccount.desktop:137
-msgctxt "Comment"
-msgid "User information such as password, name and email"
-msgstr "Gwybodaeth ddefnyddiwr fel cyfrinair, enw ac ebost"
-
-#: apps/kdepasswd/kdepasswd.desktop:8
-msgctxt "Name"
-msgid "Change Password"
-msgstr "Newid Cyfrinair"
-
-#: keditbookmarks/keditbookmarks.desktop:6
-msgctxt "Name"
-msgid "Bookmark Editor"
-msgstr ""
-
-#: keditbookmarks/keditbookmarks.desktop:68
-msgctxt "Comment"
-msgid "Bookmark Organizer and Editor"
-msgstr ""
-
-#: apps/kfind/kfind.desktop:7
-msgctxt "Name"
-msgid "Find Files/Folders"
-msgstr ""
-
-#: konq-plugins/adblock/plugin_adblock.desktop:2
-msgctxt "Name"
-msgid "Adblock"
-msgstr ""
-
-#: konq-plugins/adblock/plugin_adblock.desktop:58
-msgctxt "Comment"
-msgid "Show all blockable html elements"
-msgstr ""
-
-#: konq-plugins/akregator/akregator_konqfeedicon.desktop:2
-msgctxt "Name"
-msgid "Konqueror Feed Icon"
-msgstr ""
-
-#: konq-plugins/akregator/akregator_konqfeedicon.desktop:63
-msgctxt "Comment"
-msgid "Displays an icon in the status bar if the page contains a feed"
-msgstr ""
-
-#: konq-plugins/akregator/akregator_konqplugin.desktop:4
-msgctxt "Name"
-msgid "Add Feed to Akregator"
-msgstr ""
-
-#: konq-plugins/akregator/akregator_konqplugin.desktop:67
-msgctxt "Comment"
-msgid "Adds selected feed to Akregator"
-msgstr ""
-
-#: konq-plugins/autorefresh/autorefresh.desktop:13
-msgctxt "Name"
-msgid "Auto Refresh"
-msgstr ""
-
-#: konq-plugins/autorefresh/autorefresh.desktop:67
-msgctxt "Comment"
-msgid "Auto Refresh plugin"
-msgstr ""
-
-#: konq-plugins/babelfish/plugin_babelfish.desktop:13
-msgctxt "Name"
-msgid "Translate"
-msgstr ""
-
-#: konq-plugins/babelfish/plugin_babelfish.desktop:76
-msgctxt "Comment"
-msgid "Language translation for the current page using Babelfish"
-msgstr ""
-
-#: konq-plugins/dirfilter/dirfilterplugin.desktop:13
-msgctxt "Name"
-msgid "Directory Filter"
-msgstr ""
-
-#: konq-plugins/dirfilter/dirfilterplugin.desktop:72
-msgctxt "Comment"
-msgid "Filter directory view using an attribute filter"
-msgstr ""
-
-#: konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop:13
-msgctxt "Name"
-msgid "DOM Tree Viewer"
-msgstr ""
-
-#: konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop:73
-msgctxt "Comment"
-msgid "View the DOM tree of the current page"
-msgstr ""
-
-#: konq-plugins/fsview/fsview.desktop:10
-msgctxt "Name"
-msgid "File Size Viewer"
-msgstr ""
-
-#: konq-plugins/fsview/fsview.desktop:69
-msgctxt "Comment"
-msgid "View your filesystem as a TreeMap"
-msgstr ""
-
-#: konq-plugins/fsview/fsview_part.desktop:3
-msgctxt "Name"
-msgid "File Size View"
-msgstr ""
-
-#: konq-plugins/fsview/fsview_part.desktop:62
-msgctxt "Comment"
-msgid ""
-"Enables a proportional view of directories and files based on file size"
-msgstr ""
-
-#: konq-plugins/imagerotation/imageconverter.desktop:7
-msgctxt "X-KDE-Submenu"
-msgid "Convert To"
-msgstr ""
-
-#: konq-plugins/imagerotation/imageconverter.desktop:74
-msgctxt "Name"
-msgid "JPEG"
-msgstr ""
-
-#: konq-plugins/imagerotation/imageconverter.desktop:144
-msgctxt "Name"
-msgid "PNG"
-msgstr ""
-
-#: konq-plugins/imagerotation/imageconverter.desktop:214
-msgctxt "Name"
-msgid "TIFF"
-msgstr ""
-
-#: konq-plugins/imagerotation/imageconverter.desktop:276
-msgctxt "Name"
-msgid "GIF"
-msgstr ""
-
-#: konq-plugins/imagerotation/jpegorient.desktop:7
-msgctxt "X-KDE-Submenu"
-msgid "Transform Image"
-msgstr ""
-
-#: konq-plugins/imagerotation/jpegorient.desktop:75
-msgctxt "Name"
-msgid "Rotate Clockwise"
-msgstr ""
-
-#: konq-plugins/imagerotation/jpegorient.desktop:142
-msgctxt "Name"
-msgid "Rotate Counter-Clockwise"
-msgstr ""
-
-#: konq-plugins/imagerotation/jpegorient.desktop:214
-msgctxt "Name"
-msgid "Flip Vertically"
-msgstr ""
-
-#: konq-plugins/imagerotation/jpegorient.desktop:284
-msgctxt "Name"
-msgid "Flip Horizontally"
-msgstr ""
-
-#: konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop:13
-msgctxt "Name"
-msgid "KHTML Settings"
-msgstr ""
-
-#: konq-plugins/khtmlsettingsplugin/khtmlsettingsplugin.desktop:73
-msgctxt "Comment"
-msgid "A fast way to change the KHTML settings"
-msgstr ""
-
-#: konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop:12
-msgctxt "Name"
-msgid "Image Gallery"
-msgstr ""
-
-#: konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop:71
-msgctxt "Comment"
-msgid "An easy way to generate an HTML image gallery"
-msgstr ""
-
-#: apps/konqueror/kttsplugin/khtmlkttsd.desktop:14
-msgctxt "Name"
-msgid "Text-to-Speech"
-msgstr ""
-
-#: apps/konqueror/kttsplugin/khtmlkttsd.desktop:96
-msgctxt "Comment"
-msgid "Produces audio output for text in the current page"
-msgstr ""
-
-#: konq-plugins/microformat/mf_konqmficon.desktop:2
-msgctxt "Name"
-msgid "Microformat Icon"
-msgstr ""
-
-#: konq-plugins/microformat/mf_konqmficon.desktop:62
-msgctxt "Comment"
-msgid "Displays an icon in the status bar if the page contains a microformat"
-msgstr ""
-
-#: konq-plugins/minitools/minitoolsplugin.desktop:14
-msgctxt "Name"
-msgid "Bookmarklets"
-msgstr ""
-
-#: konq-plugins/minitools/minitoolsplugin.desktop:71
-msgctxt "Comment"
-msgid "Enables the use of bookmarklets"
-msgstr ""
-
-#: apps/konqueror/quickprint/text-ada-print.desktop:7
-#: apps/konqueror/quickprint/text-c++-print.desktop:7
-#: apps/konqueror/quickprint/text-c++h-print.desktop:7
-#: apps/konqueror/quickprint/text-c-print.desktop:7
-#: apps/konqueror/quickprint/text-ch-print.desktop:7
-#: apps/konqueror/quickprint/text-css-print.desktop:7
-#: apps/konqueror/quickprint/text-diff-print.desktop:7
-#: apps/konqueror/quickprint/text-html-print.desktop:7
-#: apps/konqueror/quickprint/text-java-print.desktop:7
-#: apps/konqueror/quickprint/text-log-print.desktop:7
-#: apps/konqueror/quickprint/text-makefile-print.desktop:7
-#: apps/konqueror/quickprint/text-pas-print.desktop:7
-#: apps/konqueror/quickprint/text-perl-print.desktop:7
-#: apps/konqueror/quickprint/text-print.desktop:7
-#: apps/konqueror/quickprint/text-python-print.desktop:7
-#: apps/konqueror/quickprint/text-tcl-print.desktop:7
-#: apps/konqueror/quickprint/text-tex-print.desktop:7
-#: apps/konqueror/quickprint/text-xml-print.desktop:7
-#: apps/konqueror/quickprint/text-xslt-print.desktop:7
-msgctxt "Name"
-msgid "Print..."
-msgstr "Argraffu..."
-
-#: konq-plugins/rellinks/plugin_rellinks.desktop:14
-msgctxt "Name"
-msgid "Document Relations"
-msgstr ""
-
-#: konq-plugins/rellinks/plugin_rellinks.desktop:74
-msgctxt "Comment"
-msgid "Displays the document relations of a document"
-msgstr ""
-
-#: konq-plugins/searchbar/searchbar.desktop:15
-msgctxt "Name"
-msgid "Search Bar"
-msgstr ""
-
-#: konq-plugins/searchbar/searchbar.desktop:76
-msgctxt "Comment"
-msgid "Provides a text box for easier access to search engines like Google."
-msgstr ""
-
-#: apps/konqueror/shellcmdplugin/kshellcmdplugin.desktop:14
-msgctxt "Name"
-msgid "Shell Command Plugin"
-msgstr ""
-
-#: apps/konqueror/shellcmdplugin/kshellcmdplugin.desktop:97
-msgctxt "Comment"
-msgid "Shell Command Plugin for Konqueror"
-msgstr ""
-
-#: konq-plugins/uachanger/uachangerplugin.desktop:13
-msgctxt "Name"
-msgid "UserAgent Changer"
-msgstr ""
-
-#: konq-plugins/uachanger/uachangerplugin.desktop:72
-msgctxt "Comment"
-msgid "Allows the detected UserAgent to be modified"
-msgstr ""
-
-#: konq-plugins/validators/plugin_validators.desktop:13
-msgctxt "Name"
-msgid "Website Validators"
-msgstr ""
-
-#: konq-plugins/validators/plugin_validators.desktop:72
-msgctxt "Comment"
-msgid "CSS and HTML validation tools"
-msgstr ""
-
-#: konq-plugins/webarchiver/plugin_webarchiver.desktop:13
-msgctxt "Name"
-msgid "Web Archiver"
-msgstr ""
-
-#: konq-plugins/webarchiver/plugin_webarchiver.desktop:74
-msgctxt "Comment"
-msgid "Creates archives of websites"
-msgstr ""
-
-#: konq-plugins/webarchiver/webarchivethumbnail.desktop:4
-msgctxt "Name"
-msgid "Web Archives"
-msgstr ""
-
-#: apps/konqueror/Home.desktop:7
-msgctxt "Name"
-msgid "Home"
-msgstr "Cartref"
-
-#: apps/konqueror/Home.desktop:97
-msgctxt "GenericName"
-msgid "Personal Files"
-msgstr "Ffeiliau Personol"
-
-#: apps/konqueror/about/konq_aboutpage.desktop:3
-msgctxt "Name"
-msgid "About-Page for Konqueror"
-msgstr "Tudalen Ynghylch i Konqueror"
-
-#: apps/konqueror/kfmclient.desktop:10 apps/konqueror/kfmclient_dir.desktop:10
-#: apps/konqueror/kfmclient_html.desktop:9
-#: apps/konqueror/kfmclient_war.desktop:9 apps/konqueror/konqbrowser.desktop:7
-#: apps/konqueror/konqueror.desktop:4
-msgctxt "Name"
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: apps/kappfinder/apps/Internet/Galeon.desktop:89
-#: apps/kappfinder/apps/Internet/Terminal/Links.desktop:90
-#: apps/kappfinder/apps/Internet/Terminal/Lynx.desktop:89
-#: apps/kappfinder/apps/Internet/Terminal/w3m.desktop:89
-#: apps/kappfinder/apps/Internet/arena.desktop:91
-#: apps/kappfinder/apps/Internet/epiphany.desktop:88
-#: apps/kappfinder/apps/Internet/mozilla-firefox.desktop:92
-#: apps/kappfinder/apps/Internet/mozilla.desktop:93
-#: apps/kappfinder/apps/Internet/netscape.desktop:93
-#: apps/kappfinder/apps/Internet/netscape6.desktop:80
-#: apps/kappfinder/apps/Internet/opera.desktop:90
-#: apps/konqueror/konqbrowser.desktop:95
-msgctxt "GenericName"
-msgid "Web Browser"
-msgstr "Porydd Gwe"
-
-#: apps/konqueror/konqueror.desktop:93
-msgctxt "Comment"
-msgid "KDE File Manager & Web Browser"
-msgstr "Trefnydd Ffeiliau a Porydd Gwe KDE"
-
-#: apps/konqueror/konquerorsu.desktop:8
-msgctxt "Name"
-msgid "File Manager - Super User Mode"
-msgstr "Trefnydd Ffeiliau - Modd Defnyddiwr Uwch"
-
-#: apps/konqueror/preloader/konqy_preload.desktop:4
-msgctxt "Name"
-msgid "Konqueror Preloading During KDE startup"
-msgstr "Cynlwytho Konqueror yn ystod Ymgychwyn KDE"
-
-#: konqueror/preloader/konqy_preloader.desktop:3
-msgctxt "Name"
-msgid "Konqueror Browser Preloader"
-msgstr ""
-
-#: apps/konqueror/preloader/konqy_preloader.desktop:84
-msgctxt "Comment"
-msgid "Reduces Konqueror startup time"
-msgstr "Lleihau amser ymgychwyn Konqueror"
-
-#: apps/konqueror/profile_filemanagement.desktop:2
-#: apps/konqueror/src/tests/filemanagement.old.profile:7
-msgctxt "Name"
-msgid "File Management"
-msgstr "Trefnu Ffeiliau"
-
-#: apps/konqueror/profile_filepreview.desktop:9
-msgctxt "Name"
-msgid "File Preview"
-msgstr "Rhagolwg Ffeil"
-
-#: apps/konqueror/profile_kde_devel.desktop:3
-msgctxt "Name"
-msgid "KDE Development"
-msgstr "Datblygu KDE"
-
-#: apps/konqueror/profile_midnightcommander.desktop:9
-msgctxt "Name"
-msgid "Midnight Commander"
-msgstr "Midnight Commander"
-
-#: apps/konqueror/profile_tabbedbrowsing.desktop:3
-msgctxt "Name"
-msgid "Tabbed Browsing"
-msgstr "Pori Tabiedig"
-
-#: apps/konqueror/profile_webbrowsing.desktop:2
-msgctxt "Name"
-msgid "Web Browsing"
-msgstr "Pori'r W?"
-
-#: apps/konqueror/settings/ebrowsing/ebrowsing.desktop:11
-msgctxt "Name"
-msgid "Web Shortcuts"
-msgstr "Byr-lwybrau Gwe"
-
-#: apps/konqueror/settings/ebrowsing/ebrowsing.desktop:100
-msgctxt "Comment"
-msgid "Configure enhanced browsing"
-msgstr "Ffurfweddu pori uchel"
-
-#: apps/konqueror/settings/kio/bookmarks.desktop:12
-#: apps/konqueror/sidebar/default_entries/bookmarks.desktop:5
-#: apps/konqueror/sidebar/trees/init/bookmarks_module.desktop:5
-msgctxt "Name"
-msgid "Bookmarks"
-msgstr "Nodau Tudalen"
-
-#: apps/konqueror/settings/kio/bookmarks.desktop:101
-msgctxt "Comment"
-msgid "Configure the bookmarks home page"
-msgstr ""
-
-#: apps/konqueror/settings/kio/cache.desktop:12
-msgctxt "Name"
-msgid "Cache"
-msgstr "Cache"
-
-#: apps/konqueror/settings/kio/cache.desktop:102
-msgctxt "Comment"
-msgid "Configure web cache settings"
-msgstr "Ffurfweddu gosodiadau'r storfa w?"
-
-#: apps/konqueror/settings/kio/cookies.desktop:12
-msgctxt "Name"
-msgid "Cookies"
-msgstr "Cwcis"
-
-#: apps/konqueror/settings/kio/cookies.desktop:100
-msgctxt "Comment"
-msgid "Configure the way cookies work"
-msgstr "Ffurfweddu'r ffordd y mae cwcis yn gweithio"
-
-#: apps/konqueror/settings/kio/netpref.desktop:15
-msgctxt "Name"
-msgid "Connection Preferences"
-msgstr ""
-
-#: apps/konqueror/settings/kio/netpref.desktop:102
-msgctxt "Comment"
-msgid "Configure generic network preferences, like timeout values"
-msgstr "Ffurfweddu dewisiadau rhwydwaith generig, fel gwerthoedd goramser"
-
-#: apps/konqueror/settings/kio/proxy.desktop:15
-msgctxt "Name"
-msgid "Proxy"
-msgstr "Dirprwy"
-
-#: apps/konqueror/settings/kio/proxy.desktop:105
-msgctxt "Comment"
-msgid "Configure the proxy servers used"
-msgstr "Ffurfweddu gweinyddion dirprwyol i'w defnyddio"
-
-#: apps/konqueror/settings/kio/smb.desktop:13
-msgctxt "Name"
-msgid "Windows Shares"
-msgstr "Rhaniadau Windows"
-
-#: apps/konqueror/settings/kio/smb.desktop:100
-msgctxt "Comment"
-msgid "Use to configure which windows (SMB) filesystems you can browse"
-msgstr ""
-"Defnyddio i ffurfweddu pa cysodau ffeil Windows (SMB) a fedrwch eu pori"
-
-#: apps/konqueror/settings/kio/uasprovider.desktop:4
-msgctxt "Comment"
-msgid "UserAgent Strings"
-msgstr "Llinynnau Asiant y Defnyddiwr"
-
-#: apps/konqueror/settings/kio/uasproviders/android10.desktop:2
-msgctxt "Name"
-msgid "UADescription (Android Phone 1.0)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop:2
-msgctxt "Name"
-msgid "UADescription (Google Chrome 1.0 on Windows XP)"
-msgstr ""
-
-#: konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Google Chrome 5.0)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/firefox20oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Firefox 2.0 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Firefox 3.0 on current)"
-msgstr ""
-
-#: konqueror/settings/kio/uasproviders/firefox36oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Firefox 3.6 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/googlebot.desktop:2
-msgctxt "Name"
-msgid "UADescription (Googlebot/2.1)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/ie401onwinnt4.desktop:2
-msgctxt "Name"
-msgid "UADescription (IE 4.01 on Win 2000)"
-msgstr "UADisgrifiad (IE 4.01 ar Win 2000)"
-
-#: apps/konqueror/settings/kio/uasproviders/ie55onwinnt5.desktop:2
-msgctxt "Name"
-msgid "UADescription (IE 5.5 on Win 2000)"
-msgstr "UADisgrifiad (IE 5.5 ar Win 2000)"
-
-#: apps/konqueror/settings/kio/uasproviders/ie60oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (IE 6.0 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/ie60onwinnt51.desktop:2
-msgctxt "Name"
-msgid "UADescription (IE 6.0 on Win XP)"
-msgstr "UADisgrifiad (IE 6.0 ar Win XP)"
-
-#: apps/konqueror/settings/kio/uasproviders/ie70onwinnt51.desktop:2
-msgctxt "Name"
-msgid "UADescription (IE 7.0 on Win XP)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/lynxoncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Lynx 2.8.3)"
-msgstr "UADisgrifiad (Lynx 2.8.3)"
-
-#: apps/konqueror/settings/kio/uasproviders/nn301oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (NN 3.01 on current)"
-msgstr "UADisgrifiad (NN 3.01 ar gyfredol)"
-
-#: apps/konqueror/settings/kio/uasproviders/nn475oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (NN 4.76 on current)"
-msgstr "UADisgrifiad (NN 4.76 ar gyfredol)"
-
-#: apps/konqueror/settings/kio/uasproviders/nn475onwin95.desktop:2
-msgctxt "Name"
-msgid "UADescription (NN 4.7 on Windows 95)"
-msgstr "UADisgrifiad (NN4.7 ar Windows 95)"
-
-#: apps/konqueror/settings/kio/uasproviders/ns71oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Netscape 7.1 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/ns71onwinnt51.desktop:2
-msgctxt "Name"
-msgid "UADescription (Netscape 7.1 on XP)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/op403onwinnt4.desktop:2
-msgctxt "Name"
-msgid "UADescription (Opera 4.03 on NT)"
-msgstr "UADisgrifiad (Opera 4.03 ar NT)"
-
-#: apps/konqueror/settings/kio/uasproviders/op85oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Opera 8.5 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/op90oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Opera 9.00 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/op962oncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Opera 9.62 on current)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/safari20.desktop:2
-msgctxt "Name"
-msgid "UADescription (Safari 2.0 on MacOS X)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/safari30oniphone.desktop:2
-msgctxt "Name"
-msgid "UADescription (Safari 3.0 on iPhone)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/safari32.desktop:2
-msgctxt "Name"
-msgid "UADescription (Safari 3.2 on MacOS X)"
-msgstr ""
-
-#: konqueror/settings/kio/uasproviders/safari40.desktop:2
-msgctxt "Name"
-msgid "UADescription (Safari 4.0 on MacOS X)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/uasproviders/w3moncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (w3m 0.1.9)"
-msgstr "UADisgrifiad (w3m 0.1.9)"
-
-#: apps/konqueror/settings/kio/uasproviders/wgetoncurrent.desktop:2
-msgctxt "Name"
-msgid "UADescription (Wget 1.11.4)"
-msgstr ""
-
-#: apps/konqueror/settings/kio/useragent.desktop:12
-msgctxt "Name"
-msgid "Browser Identification"
-msgstr "Enw'r Porwr"
-
-#: apps/konqueror/settings/kio/useragent.desktop:99
-msgctxt "Comment"
-msgid "Configure the way Konqueror reports itself"
-msgstr "Ffurfweddu'r ffordd y mae Konqueror yn adrodd ei hun"
-
-#: apps/konqueror/settings/konq/fileappearance.desktop:11
-#: apps/konqueror/settings/konq/webappearance.desktop:12
-#: apps/konqueror/settings/konqhtml/khtml_appearance.desktop:13
-msgctxt "Name"
-msgid "Appearance"
-msgstr "Golwg"
-
-#: apps/konqueror/settings/konq/fileappearance.desktop:101
-#: apps/konqueror/settings/konq/webappearance.desktop:102
-msgctxt "Comment"
-msgid "You can configure how Konqueror looks as a file manager here"
-msgstr "Ffurfweddu golwg Konqueror fel rheolydd ffeiliau"
-
-#: apps/konqueror/settings/konq/filebehavior.desktop:11
-#: apps/konqueror/settings/konq/webbehavior.desktop:12
-msgctxt "Name"
-msgid "Behavior"
-msgstr "Ymddygiad"
-
-#: apps/konqueror/settings/konq/filebehavior.desktop:101
-#: apps/konqueror/settings/konq/webbehavior.desktop:102
-msgctxt "Comment"
-msgid "You can configure how Konqueror behaves as a file manager here"
-msgstr "Ffurfweddu ymddygiad Konqueror fel rheolydd ffeiliau"
-
-#: apps/konqueror/settings/konqhtml/css/kcmcss.desktop:12
-msgctxt "Name"
-msgid "Stylesheets"
-msgstr "Dalennau arddull"
-
-#: apps/konqueror/settings/konqhtml/css/kcmcss.desktop:100
-msgctxt "Comment"
-msgid "Configure the stylesheets used to render web pages"
-msgstr "Ffurfweddu'r dalennau arddull sy'n trosi tudalennau gwe."
-
-#: apps/konqueror/settings/konqhtml/khtml_appearance.desktop:104
-msgctxt "Comment"
-msgid "Configure how to display web pages"
-msgstr ""
-
-#: apps/konqueror/settings/konqhtml/khtml_behavior.desktop:12
-msgctxt "Name"
-msgid "Web Behavior"
-msgstr "Ymddygiad Gwê"
-
-#: apps/konqueror/settings/konqhtml/khtml_behavior.desktop:99
-msgctxt "Comment"
-msgid "Configure the browser behavior"
-msgstr "Ffurfweddu ymddygiad y porydd"
-
-#: apps/konqueror/settings/konqhtml/khtml_filter.desktop:13
-msgctxt "Name"
-msgid "AdBlocK Filters"
-msgstr ""
-
-#: apps/konqueror/settings/konqhtml/khtml_filter.desktop:101
-msgctxt "Comment"
-msgid "Configure Konqueror AdBlocK filters"
-msgstr ""
-
-#: apps/konqueror/settings/konqhtml/khtml_general.desktop:13
-msgctxt ""
-"Name|Konqeuror settings relevant to both web browsing and file management."
-msgid "General"
-msgstr ""
-
-#: apps/konqueror/settings/konqhtml/khtml_general.desktop:77
-msgctxt "Comment"
-msgid "Configure general Konqueror behavior"
-msgstr ""
-
-#: apps/konqueror/settings/konqhtml/khtml_java_js.desktop:12
-msgctxt "Name"
-msgid "Java & JavaScript"
-msgstr "Java a JavaScript"
-
-#: apps/konqueror/settings/konqhtml/khtml_java_js.desktop:101
-msgctxt "Comment"
-msgid "Configure the behavior of Java and JavaScript"
-msgstr "Ffurfweddu ymddygiad Java a JavaScript"
-
-#: apps/konqueror/settings/performance/kcmkonqyperformance.desktop:12
-msgctxt "Name"
-msgid "Performance"
-msgstr "Perfformiad"
-
-#: apps/konqueror/settings/performance/kcmkonqyperformance.desktop:99
-msgctxt "Comment"
-msgid "Configure settings that can improve Konqueror performance"
-msgstr "Ffurfweddu gosodiadau sy'n gallu gwella perfformiad Konqueror"
-
-#: apps/konqueror/settings/performance/kcmperformance.desktop:11
-msgctxt "Name"
-msgid "KDE Performance"
-msgstr "Perfformiad KDE"
-
-#: apps/konqueror/settings/performance/kcmperformance.desktop:98
-msgctxt "Comment"
-msgid "Configure settings that can improve KDE performance"
-msgstr "Ffurfweddu gosodiadau sy'n gallu gwella perfformiad KDE"
-
-#: apps/konqueror/sidebar/default_entries/bookmarks.desktop:94
-#: apps/konqueror/sidebar/trees/init/bookmarks_module.desktop:94
-msgctxt "Comment"
-msgid "This is the list of your bookmarks, for a faster access"
-msgstr "Dyma restr eich nodau tudalen, am gyrchiad cyflymach"
-
-#: apps/konqueror/sidebar/default_entries/history.desktop:5
-#: apps/konqueror/sidebar/history_module/kcmhistory.desktop:11
-msgctxt "Name"
-msgid "History"
-msgstr "Hanes"
-
-#: apps/konqueror/sidebar/default_entries/history.desktop:94
-msgctxt "Comment"
-msgid ""
-"This is the history of the URLs you have recently visited. You can sort them "
-"in many ways."
-msgstr ""
-"Dyma hanes y safleoedd rydych wedi ymweld a nhw. Gallwch eu didoli mewn sawl "
-"ffordd."
-
-#: apps/konqueror/sidebar/default_entries/home.desktop:5
-msgctxt "Name"
-msgid "Home Folder"
-msgstr "Plygell Cartref"
-
-#: apps/konqueror/sidebar/default_entries/home.desktop:93
-msgctxt "Comment"
-msgid "This folder contains your personal files"
-msgstr "Mae'r plygell yma'n cadw eich ffeiliau personol"
-
-#: konqueror/sidebar/default_entries/places.desktop:4
-msgctxt "Name"
-msgid "Places"
-msgstr ""
-
-#: konqueror/sidebar/default_entries/places.desktop:78
-msgctxt "Comment"
-msgid "This is the list of places."
-msgstr ""
-
-#: apps/konqueror/sidebar/default_entries/remote.desktop:2
-#: apps/konqueror/sidebar/trees/init/remote/.directory:2
-msgctxt "Name"
-msgid "Network"
-msgstr "Rhwydwaith"
-
-#: apps/konqueror/sidebar/default_entries/root.desktop:5
-msgctxt "Name"
-msgid "Root Folder"
-msgstr "Plygell Gwraidd"
-
-#: apps/konqueror/sidebar/default_entries/root.desktop:92
-msgctxt "Comment"
-msgid "This is the root of the filesystem"
-msgstr "Dyma wraidd y cysawd ffeiliau"
-
-#: apps/konqueror/sidebar/history_module/kcmhistory.desktop:100
-msgctxt "Comment"
-msgid "Configure the history sidebar"
-msgstr "Ffurfweddu'r cwpwrdd cornel hanes"
-
-#: apps/konqueror/sidebar/history_module/konqsidebar_history.desktop:4
-msgctxt "Name"
-msgid "History SideBar Module"
-msgstr ""
-
-#: apps/konqueror/sidebar/konq_sidebartng.desktop:4
-msgctxt "Name"
-msgid "Sidebar"
-msgstr ""
-
-#: konqueror/sidebar/places_module/konqsidebar_places.desktop:4
-msgctxt "Name"
-msgid "Places SideBar Module"
-msgstr ""
-
-#: apps/konqueror/sidebar/test/test.desktop:5
-msgctxt "Name"
-msgid "Test"
-msgstr "Arbrofi"
-
-#: apps/konqueror/sidebar/trees/init/dirtree_module.desktop:5
-#: apps/konqueror/sidebar/trees/konqsidebar_tree.desktop:4
-msgctxt "Name"
-msgid "Folder"
-msgstr "Plygell"
-
-#: apps/konqueror/sidebar/trees/init/remote/ftp/.directory:2
-msgctxt "Name"
-msgid "FTP Archives"
-msgstr ""
-
-#: apps/konqueror/sidebar/trees/init/remote/ftp/kde_ftp.desktop:5
-msgctxt "Name"
-msgid "KDE Official FTP"
-msgstr "FTP Swyddogol KDE"
-
-#: apps/konqueror/sidebar/trees/init/remote/web/.directory:2
-msgctxt "Name"
-msgid "Web Sites"
-msgstr ""
-
-#: apps/konqueror/sidebar/trees/init/remote/web/apps_web.desktop:4
-msgctxt "Name"
-msgid "KDE Applications"
-msgstr "Cymhwysiadau KDE"
-
-#: apps/konqueror/sidebar/trees/init/remote/web/dot_web.desktop:4
-msgctxt "Name"
-msgid "KDE News"
-msgstr "Newyddion KDE"
-
-#: apps/konqueror/sidebar/trees/init/remote/web/kde_web.desktop:4
-msgctxt "Name"
-msgid "KDE Home Page"
-msgstr "Hafan KDE"
-
-#: apps/konqueror/sidebar/trees/init/remote/web/look_web.desktop:4
-msgctxt "Name"
-msgid "KDE Eye Candy"
-msgstr ""
-
-#: apps/konqueror/sidebar/trees/init/services/applications.desktop:5
-msgctxt "Name"
-msgid "Applications"
-msgstr "Cymhwysiadau"
-
-#: apps/konqueror/sidebar/trees/init/services/printsystem.desktop:5
-msgctxt "Name"
-msgid "Print System Browser"
-msgstr "Porydd y Cysawd Argraffu"
-
-#: apps/konqueror/sidebar/trees/init/services/settings.desktop:5
-msgctxt "Name"
-msgid "Settings"
-msgstr "Gosodiadau"
-
-#: apps/konqueror/sidebar/web_module/konqsidebar_web.desktop:4
-msgctxt "Name"
-msgid "Web SideBar Module"
-msgstr "Modiwl Bar Ochr Gwe"
-
-#: apps/lib/konq/Templates/CDROM-Device.desktop:11
-#: apps/lib/konq/Templates/CDWRITER-Device.desktop:11
-#: apps/lib/konq/Templates/DVDROM-Device.desktop:11
-#: apps/lib/konq/Templates/ZIP-Device.desktop:11
-msgctxt "Name"
-msgid "Eject"
-msgstr "Allfwrw"
-
-#: apps/lib/konq/Templates/Directory.desktop:2
-msgctxt "Name"
-msgid "Folder..."
-msgstr "Plygell..."
-
-#: apps/lib/konq/Templates/Directory.desktop:88
-msgctxt "Comment"
-msgid "Enter folder name:"
-msgstr "Mewnosodwch enw'r plygell:"
-
-#: lib/konq/Templates/Floppy.desktop:4
-msgctxt "Name|Starts a program to format a floppy drive"
-msgid "Format"
-msgstr ""
-
-#: apps/lib/konq/Templates/HTMLFile.desktop:2
-msgctxt "Name"
-msgid "HTML File..."
-msgstr "Ffeil HTML..."
-
-#: apps/lib/konq/Templates/HTMLFile.desktop:88
-msgctxt "Comment"
-msgid "Enter HTML filename:"
-msgstr ""
-
-#: apps/lib/konq/Templates/TextFile.desktop:2
-msgctxt "Name"
-msgid "Text File..."
-msgstr "Ffeil Testun..."
-
-#: apps/lib/konq/Templates/TextFile.desktop:88
-msgctxt "Comment"
-msgid "Enter text filename:"
-msgstr ""
-
-#: apps/lib/konq/Templates/linkCAMERA.desktop:2
-msgctxt "Name"
-msgid "Camera Device..."
-msgstr "Dyfais Camera..."
-
-#: apps/lib/konq/Templates/linkCAMERA.desktop:87
-msgctxt "Comment"
-msgid "New camera"
-msgstr "Camera Newydd"
-
-#: apps/lib/konq/Templates/linkCDROM.desktop:2
-msgctxt "Name"
-msgid "CD-ROM Device..."
-msgstr "Dyfais CD-ROM..."
-
-#: apps/lib/konq/Templates/linkCDROM.desktop:87
-msgctxt "Comment"
-msgid "New CD-ROM Device"
-msgstr "Dyfais CD-ROM Newydd"
-
-#: apps/lib/konq/Templates/linkCDWRITER.desktop:2
-msgctxt "Name"
-msgid "CDWRITER Device..."
-msgstr "Dyfais CDWRITER..."
-
-#: apps/lib/konq/Templates/linkCDWRITER.desktop:87
-msgctxt "Comment"
-msgid "New CDWRITER Device"
-msgstr "Dyfais CDWRITER Newydd"
-
-#: apps/lib/konq/Templates/linkDVDROM.desktop:2
-msgctxt "Name"
-msgid "DVD-ROM Device..."
-msgstr "Dyfais DVD-ROM..."
-
-#: apps/lib/konq/Templates/linkDVDROM.desktop:88
-msgctxt "Comment"
-msgid "New DVD-ROM Device"
-msgstr "Dyfais DVD-ROM Newydd"
-
-#: apps/lib/konq/Templates/linkFloppy.desktop:2
-msgctxt "Name"
-msgid "Floppy Device..."
-msgstr "Dyfais Disg Meddal..."
-
-#: apps/lib/konq/Templates/linkFloppy.desktop:87
-msgctxt "Comment"
-msgid "New Floppy Device"
-msgstr "Dyfais Disg Meddal Newydd"
-
-#: apps/lib/konq/Templates/linkHD.desktop:2
-msgctxt "Name"
-msgid "Hard Disc Device..."
-msgstr "Dyfais Disg Caled..."
-
-#: apps/lib/konq/Templates/linkHD.desktop:87
-msgctxt "Comment"
-msgid "New Hard Disc"
-msgstr "Disg Caled Newydd"
-
-#: apps/lib/konq/Templates/linkMO.desktop:2
-msgctxt "Name"
-msgid "MO Device..."
-msgstr "Dyfais MO..."
-
-#: apps/lib/konq/Templates/linkMO.desktop:87
-msgctxt "Comment"
-msgid "New MO Device"
-msgstr ""
-
-#: apps/lib/konq/Templates/linkNFS.desktop:2
-msgctxt "Name"
-msgid "NFS..."
-msgstr "NFS..."
-
-#: apps/lib/konq/Templates/linkNFS.desktop:88
-msgctxt "Comment"
-msgid "New NFS Link"
-msgstr "Cyswllt NFS Newydd"
-
-#: apps/lib/konq/Templates/linkPath.desktop:2
-msgctxt "Name"
-msgid "Basic link to file or directory..."
-msgstr ""
-
-#: apps/lib/konq/Templates/linkPath.desktop:59
-msgctxt "Comment"
-msgid "Enter path of file or directory:"
-msgstr ""
-
-#: apps/lib/konq/Templates/linkProgram.desktop:2
-msgctxt "Name"
-msgid "Link to Application..."
-msgstr ""
-
-#: apps/lib/konq/Templates/linkProgram.desktop:83
-msgctxt "Comment"
-msgid "New Link to Application"
-msgstr "Cyswllt Newydd i Gymhwysiad"
-
-#: apps/lib/konq/Templates/linkURL.desktop:2
-msgctxt "Name"
-msgid "Link to Location (URL)..."
-msgstr "Cyswllt i Leoliad (URL)..."
-
-#: apps/lib/konq/Templates/linkURL.desktop:87
-msgctxt "Comment"
-msgid "Enter link to location (URL):"
-msgstr "Mewnosodwch cyswllt i leoliad (URL):"
-
-#: apps/lib/konq/Templates/linkZIP.desktop:2
-msgctxt "Name"
-msgid "ZIP Device..."
-msgstr "Dyfais ZIP..."
-
-#: apps/lib/konq/Templates/linkZIP.desktop:87
-msgctxt "Comment"
-msgid "New ZIP Device"
-msgstr "Dyfais ZIP Newydd"
-
-#: apps/lib/konq/directory_bookmarkbar.desktop:3
-msgctxt "Name"
-msgid "Bookmark Toolbar"
-msgstr "Bar Offer Nodau Tudalen"
-
-#: lib/konq/favicons/favicons.desktop:3
-msgctxt "Name"
-msgid "Favicons"
-msgstr ""
-
-#: lib/konq/favicons/favicons.desktop:77
-msgctxt "Comment"
-msgid "Stores website icons"
-msgstr ""
-
-#: apps/lib/konq/konqdndpopupmenuplugin.desktop:4
-msgctxt "Comment"
-msgid "Drag-and-drop plugin for the Konqueror Popup Menu."
-msgstr ""
-
-#: apps/lib/konq/konqpopupmenuplugin.desktop:4
-msgctxt "Comment"
-msgid "Plugin for the Konqueror Popup Menu"
-msgstr "Ategyn i Naidlen Konqueror"
-
-#: apps/nsplugins/khtml_plugins.desktop:14
-msgctxt "Name"
-msgid "Plugins"
-msgstr "Ategion"
-
-#: apps/nsplugins/khtml_plugins.desktop:103
-msgctxt "Comment"
-msgid "Configure the browser plugins"
-msgstr "Ffurfweddu ategion y porydd"
-
-#: apps/plasma/applets/folderview/plasma-applet-folderview.desktop:2
-msgctxt "Name"
-msgid "Folder View"
-msgstr ""
-
-#: apps/plasma/applets/folderview/plasma-applet-folderview.desktop:80
-msgctxt "Comment"
-msgid "Display the contents of folders (User's home folder as default)"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdegames.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdegames.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdegames.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdegames.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,3506 +0,0 @@
-# translation of desktop_kdegames.po to Cymraeg
-# Penbwrdd yn Gymraeg.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk<kyfieithu@dotmon.com>, www.gyfieithu.co.uk<kyfieithu@dotmon.com>, 2003.
-# Kevin Donnelly <kevin@dotmon.com>, 2005.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdegames\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2009-07-18 18:37+0000\n"
-"Last-Translator: Kevin Donnelly <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:45+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: bomber/src/bomber.desktop:2
-msgctxt "Name"
-msgid "Bomber"
-msgstr ""
-
-#: bomber/src/bomber.desktop:52
-msgctxt "GenericName"
-msgid "Arcade Bombing Game"
-msgstr ""
-
-#: bomber/themes/Lava-Island.desktop:3
-msgctxt "Name"
-msgid "Lava-Island"
-msgstr ""
-
-#: bomber/themes/Lava-Island.desktop:46
-msgctxt "Description"
-msgid "Stop the lava and save the day"
-msgstr ""
-
-#: bomber/themes/kbomber.desktop:3
-msgctxt "Name"
-msgid "KBomber - Star Wars"
-msgstr ""
-
-#: bovo/bovo.desktop:3
-msgctxt "Name"
-msgid "Bovo"
-msgstr ""
-
-#: bovo/bovo.desktop:60
-msgctxt "GenericName"
-msgid "Five-in-a-row Board Game"
-msgstr ""
-
-#: bovo/themes/gomoku/themerc:2
-msgctxt "Name"
-msgid "Gomoku"
-msgstr ""
-
-#: bovo/themes/gomoku/themerc:51
-msgctxt "Comment"
-msgid "A classic Japanese theme"
-msgstr ""
-
-#: bovo/themes/highcontrast/themerc:2
-msgctxt "Name"
-msgid "High Contrast"
-msgstr ""
-
-#: bovo/themes/highcontrast/themerc:54
-msgctxt "Comment"
-msgid "A theme with a lot of contrast"
-msgstr ""
-
-#: bovo/themes/scribble/themerc:2
-msgctxt "Name"
-msgid "Scribble"
-msgstr ""
-
-#: bovo/themes/scribble/themerc:51
-msgctxt "Comment"
-msgid "A pen and paper theme"
-msgstr ""
-
-#: bovo/themes/spacy/themerc:2
-msgctxt "Name"
-msgid "Spacy"
-msgstr ""
-
-#: bovo/themes/spacy/themerc:50
-msgctxt "Comment"
-msgid "A theme from outer space"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Arena.desktop:2
-#: kmahjongg/layouts/arena.desktop:2
-msgctxt "Name"
-msgid "Arena"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Arena.desktop:47
-#: granatier/arenas/clanbomber_Big_Block.desktop:36
-#: granatier/arenas/clanbomber_Big_Standard.desktop:34
-#: granatier/arenas/clanbomber_Blast_Matrix.desktop:35
-#: granatier/arenas/clanbomber_Bloody_Ring.desktop:35
-#: granatier/arenas/clanbomber_Boiling_Egg.desktop:37
-#: granatier/arenas/clanbomber_Bomb_Attack.desktop:36
-#: granatier/arenas/clanbomber_Broken_Heart.desktop:37
-#: granatier/arenas/clanbomber_Crammed.desktop:36
-#: granatier/arenas/clanbomber_Death_Corridor.desktop:37
-#: granatier/arenas/clanbomber_Dilemma.desktop:37
-#: granatier/arenas/clanbomber_FearCircle.desktop:36
-#: granatier/arenas/clanbomber_FearCircle_Remix.desktop:35
-#: granatier/arenas/clanbomber_FireWheels.desktop:36
-#: granatier/arenas/clanbomber_Football.desktop:36
-#: granatier/arenas/clanbomber_Four_Instance.desktop:35
-#: granatier/arenas/clanbomber_Ghostbear.desktop:35
-#: granatier/arenas/clanbomber_Hard_Work.desktop:37
-#: granatier/arenas/clanbomber_Hole_Run.desktop:35
-#: granatier/arenas/clanbomber_Huge_Standard.desktop:35
-#: granatier/arenas/clanbomber_Juicy_Lucy.desktop:35
-#: granatier/arenas/clanbomber_Kitchen.desktop:36
-#: granatier/arenas/clanbomber_Meeting.desktop:36
-#: granatier/arenas/clanbomber_MungoBane.desktop:35
-#: granatier/arenas/clanbomber_Obstacle_Race.desktop:36
-#: granatier/arenas/clanbomber_Overkill.desktop:35
-#: granatier/arenas/clanbomber_Prison_Cells.desktop:36
-#: granatier/arenas/clanbomber_Redirection.desktop:36
-#: granatier/arenas/clanbomber_Sixty_Nine.desktop:36
-#: granatier/arenas/clanbomber_Small_Standard.desktop:35
-#: granatier/arenas/clanbomber_Snake_Race.desktop:36
-#: granatier/arenas/clanbomber_Tiny_Standard.desktop:34
-#: granatier/arenas/clanbomber_Whole_Mess.desktop:34
-msgctxt "Description"
-msgid "Clanbomber Import"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Big_Block.desktop:2
-msgctxt "Name"
-msgid "Big Block"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Big_Standard.desktop:2
-msgctxt "Name"
-msgid "Clanbomber Big Standard"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Blast_Matrix.desktop:2
-msgctxt "Name"
-msgid "Blast Matrix"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Bloody_Ring.desktop:2
-msgctxt "Name"
-msgid "Bloody Ring"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Boiling_Egg.desktop:2
-msgctxt "Name"
-msgid "Boiling Egg"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Bomb_Attack.desktop:2
-msgctxt "Name"
-msgid "Bomb Attack"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Broken_Heart.desktop:2
-msgctxt "Name"
-msgid "Broken Heart"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Crammed.desktop:2
-msgctxt "Name"
-msgid "Crammed"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Death_Corridor.desktop:2
-msgctxt "Name"
-msgid "Death Corridor"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Dilemma.desktop:2
-msgctxt "Name"
-msgid "Dilemma"
-msgstr ""
-
-#: granatier/arenas/clanbomber_FearCircle.desktop:2
-msgctxt "Name"
-msgid "Fear Circle"
-msgstr ""
-
-#: granatier/arenas/clanbomber_FearCircle_Remix.desktop:2
-msgctxt "Name"
-msgid "Fear Circle Remix"
-msgstr ""
-
-#: granatier/arenas/clanbomber_FireWheels.desktop:2
-msgctxt "Name"
-msgid "Fire Wheels"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Football.desktop:2
-msgctxt "Name"
-msgid "Football"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Four_Instance.desktop:2
-msgctxt "Name"
-msgid "Four Instance"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Ghostbear.desktop:2
-msgctxt "Name"
-msgid "Ghostbear"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Hard_Work.desktop:2
-msgctxt "Name"
-msgid "Hard Work"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Hole_Run.desktop:2
-msgctxt "Name"
-msgid "Hole Run"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Huge_Standard.desktop:2
-msgctxt "Name"
-msgid "Clanbomber Huge Standard"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Juicy_Lucy.desktop:2
-msgctxt "Name"
-msgid "Juicy Lucy"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Kitchen.desktop:2
-msgctxt "Name"
-msgid "Kitchen"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Meeting.desktop:2
-msgctxt "Name"
-msgid "Meeting"
-msgstr ""
-
-#: granatier/arenas/clanbomber_MungoBane.desktop:2
-msgctxt "Name"
-msgid "Mungo Bane"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Obstacle_Race.desktop:2
-msgctxt "Name"
-msgid "Obstacle Race"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Overkill.desktop:2
-msgctxt "Name"
-msgid "Overkill"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Prison_Cells.desktop:2
-msgctxt "Name"
-msgid "Prison Cells"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Redirection.desktop:2
-msgctxt "Name"
-msgid "Redirection"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Sixty_Nine.desktop:2
-msgctxt "Name"
-msgid "Sixty Nine"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Small_Standard.desktop:2
-msgctxt "Name"
-msgid "Clanbomber Small Standard"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Snake_Race.desktop:2
-msgctxt "Name"
-msgid "Snake Race"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Tiny_Standard.desktop:2
-msgctxt "Name"
-msgid "Clanbomber Tiny Standard"
-msgstr ""
-
-#: granatier/arenas/clanbomber_Whole_Mess.desktop:2
-msgctxt "Name"
-msgid "Whole Mess"
-msgstr ""
-
-#: granatier/arenas/clover.desktop:2
-msgctxt "Name"
-msgid "The four-leaf clover"
-msgstr ""
-
-#: granatier/arenas/clover.desktop:29
-msgctxt "Description"
-msgid ""
-"The four-leaf clover is an uncommon variation of the common, three-leaved "
-"clover. According to tradition, such leaves bring good luck to their "
-"finders, especially if found accidentally. According to legend, each leaf "
-"represents something: the first is for hope, the second is for faith, the "
-"third is for love, and the fourth is for luck."
-msgstr ""
-
-#: granatier/arenas/crazy.desktop:2
-msgctxt "Name"
-msgid "Crazy"
-msgstr ""
-
-#: granatier/arenas/crazy.desktop:35
-msgctxt "Description"
-msgid "Crazy Arena"
-msgstr ""
-
-#: granatier/arenas/granatier.desktop:2 granatier/src/granatier.desktop:3
-#: granatier/themes/granatier.desktop:2
-msgctxt "Name"
-msgid "Granatier"
-msgstr ""
-
-#: granatier/arenas/granatier.desktop:36
-msgctxt "Description"
-msgid "Default Granatier Arena"
-msgstr ""
-
-#: granatier/arenas/labyrinth.desktop:2 kmahjongg/layouts/labyrinth.desktop:2
-msgctxt "Name"
-msgid "Labyrinth"
-msgstr ""
-
-#: granatier/arenas/labyrinth.desktop:45
-msgctxt "Description"
-msgid "Labyrinth Arena"
-msgstr ""
-
-#: granatier/arenas/threeofthree.desktop:2
-msgctxt "Name"
-msgid "Three of Three"
-msgstr ""
-
-#: granatier/arenas/threeofthree.desktop:37
-msgctxt "Description"
-msgid "Three of Three Arena"
-msgstr ""
-
-#: granatier/players/player1.desktop:2
-msgctxt "Name"
-msgid "Player1"
-msgstr ""
-
-#: granatier/players/player1.desktop:38
-msgctxt "Description"
-msgid "This is Player1"
-msgstr ""
-
-#: granatier/players/player2.desktop:2
-msgctxt "Name"
-msgid "Player2"
-msgstr ""
-
-#: granatier/players/player2.desktop:38
-msgctxt "Description"
-msgid "This is Player2"
-msgstr ""
-
-#: granatier/players/player3.desktop:2
-msgctxt "Name"
-msgid "Player3"
-msgstr ""
-
-#: granatier/players/player3.desktop:38
-msgctxt "Description"
-msgid "This is Player3"
-msgstr ""
-
-#: granatier/players/player4.desktop:2
-msgctxt "Name"
-msgid "Player4"
-msgstr ""
-
-#: granatier/players/player4.desktop:38
-msgctxt "Description"
-msgid "This is Player4"
-msgstr ""
-
-#: granatier/players/player5.desktop:2
-msgctxt "Name"
-msgid "Player5"
-msgstr ""
-
-#: granatier/players/player5.desktop:38
-msgctxt "Description"
-msgid "This is Player5"
-msgstr ""
-
-#: granatier/src/granatier.desktop:37
-msgctxt "GenericName"
-msgid "Bomberman clone"
-msgstr ""
-
-#: granatier/themes/clanbomber.desktop:2
-msgctxt "Name"
-msgid "Clanbomber"
-msgstr ""
-
-#: granatier/themes/clanbomber.desktop:38
-msgctxt "Description"
-msgid "Clanbomber Theme"
-msgstr ""
-
-#: granatier/themes/granatier.desktop:36
-msgctxt "Description"
-msgid "Granatier Theme"
-msgstr ""
-
-#: granatier/themes/waterbomb.desktop:2
-msgctxt "Name"
-msgid "Water Bomb"
-msgstr ""
-
-#: granatier/themes/waterbomb.desktop:37
-msgctxt "Description"
-msgid "Water Bomb Theme"
-msgstr ""
-
-#: kajongg/kajongg.desktop:3
-msgctxt "Name"
-msgid "Kajongg"
-msgstr ""
-
-#: kajongg/kajongg.desktop:38
-msgctxt "Comment"
-msgid "The ancient Chinese board game for 4 players"
-msgstr ""
-
-#: kajongg/kajongg.desktop:69
-msgctxt "GenericName"
-msgid "Mah Jongg"
-msgstr ""
-
-#: kapman/kapman.desktop:4
-msgctxt "Name"
-msgid "Kapman"
-msgstr ""
-
-#: kapman/kapman.desktop:50
-msgctxt "GenericName"
-msgid "Pac-Man Clone"
-msgstr ""
-
-#: kapman/kapman.desktop:91
-msgctxt "Comment"
-msgid "Eat pills escaping ghosts"
-msgstr ""
-
-#: kapman/themes/invisible.desktop:2
-msgctxt "Name"
-msgid "Invisible"
-msgstr ""
-
-#: kapman/themes/invisible.desktop:46
-msgctxt "Description"
-msgid ""
-"Getting bored with Kapman? More than 100,000 points over level 20? Next "
-"step: the invisible maze!"
-msgstr ""
-
-#: kapman/themes/matches.desktop:2
-msgctxt "Name"
-msgid "Matches"
-msgstr ""
-
-#: kapman/themes/matches.desktop:46
-msgctxt "Description"
-msgid "A matches drawn maze"
-msgstr ""
-
-#: kapman/themes/mountain.desktop:2
-#: killbots/themes/mountainadventure.desktop:2
-msgctxt "Name"
-msgid "Mountain Adventure"
-msgstr ""
-
-#: kapman/themes/mountain.desktop:43
-msgctxt "Description"
-msgid "Default"
-msgstr ""
-
-#: kapman/themes/mummies_crypt.desktop:2
-msgctxt "Name"
-msgid "Mummies Crypt"
-msgstr ""
-
-#: kapman/themes/mummies_crypt.desktop:43
-msgctxt "Description"
-msgid "Avoid the mummies at all costs!"
-msgstr ""
-
-#: kapman/themes/retro.desktop:2
-msgctxt "Name"
-msgid "Retro"
-msgstr ""
-
-#: kapman/themes/retro.desktop:47
-msgctxt "Description"
-msgid "The old game theme revisited"
-msgstr ""
-
-#: katomic/default_theme.desktop:4
-msgctxt "Name"
-msgid "KAtomic Default Theme"
-msgstr ""
-
-#: katomic/default_theme.desktop:33
-msgctxt "Description"
-msgid "KAtomic Default Theme."
-msgstr ""
-
-#: katomic/katomic.desktop:2
-msgctxt "Name"
-msgid "KAtomic"
-msgstr "KAtomic"
-
-#: katomic/katomic.desktop:71
-msgctxt "GenericName"
-msgid "Sokoban-like Logic Game"
-msgstr "Gêm Resymeg sy'n debyg i Sokoban"
-
-#: katomic/levels/default_levels.dat:2
-msgctxt "Name"
-msgid "Original levels"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:35
-msgctxt "Description"
-msgid "This is the original collection of KAtomic levels."
-msgstr ""
-
-#: katomic/levels/default_levels.dat:71
-msgctxt "Name"
-msgid "Water"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:131
-msgctxt "Name"
-msgid "Formic Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:191
-msgctxt "Name"
-msgid "Acetic Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:255
-msgctxt "Name"
-msgid "trans-Butene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:318
-msgctxt "Name"
-msgid "cis-Butene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:380
-msgctxt "Name"
-msgid "Dimethyl ether"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:441
-msgctxt "Name"
-msgid "Butanol"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:505
-msgctxt "Name"
-msgid "2-Methyl-2-Propanol"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:569
-msgctxt "Name"
-msgid "Glycerin"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:633
-msgctxt "Name"
-msgid "Poly-Tetra-Fluoro-Ethene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:690
-msgctxt "Name"
-msgid "Oxalic Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:751
-msgctxt "Name"
-msgid "Methane"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:812
-msgctxt "Name"
-msgid "Formaldehyde"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:872
-msgctxt "Name"
-msgid "Crystal 1"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:937
-msgctxt "Name"
-msgid "Acetic acid ethyl ester"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:998
-msgctxt "Name"
-msgid "Ammonia"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1057
-msgctxt "Name"
-msgid "3-Methyl-Pentane"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1119
-msgctxt "Name"
-msgid "Propanal"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1181
-#: katomic/levels/default_levels.dat:2671
-msgctxt "Name"
-msgid "Propyne"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1244
-msgctxt "Name"
-msgid "Furanal"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1311
-msgctxt "Name"
-msgid "Pyran"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1378
-msgctxt "Name"
-msgid "Cyclo-Pentane"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1445
-msgctxt "Name"
-msgid "Methanol"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1507
-msgctxt "Name"
-msgid "Nitro-Glycerin"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1583
-msgctxt "Name"
-msgid "Ethane"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1648
-msgctxt "Name"
-msgid "Crystal 2"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1714
-msgctxt "Name"
-msgid "Ethylene-Glycol"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1776
-msgctxt "Name"
-msgid "L-Alanine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1843
-msgctxt "Name"
-msgid "Cyanoguanidine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1908
-msgctxt "Name"
-msgid "Prussic Acid (Cyanic Acid)"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:1966
-msgctxt "Name"
-msgid "Anthracene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2041
-msgctxt "Name"
-msgid "Thiazole"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2107
-msgctxt "Name"
-msgid "Saccharin"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2182
-msgctxt "Name"
-msgid "Ethylene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2244
-msgctxt "Name"
-msgid "Styrene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2317
-msgctxt "Name"
-msgid "Melamine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2387
-msgctxt "Name"
-msgid "Cyclobutane"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2448
-msgctxt "Name"
-msgid "Nicotine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2526
-msgctxt "Name"
-msgid "Acetyle salicylic acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2603
-msgctxt "Name"
-msgid "Meta-Di-Nitro-Benzene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2736
-#: katomic/levels/default_levels.dat:5221
-msgctxt "Name"
-msgid "Malonic Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2801
-msgctxt "Name"
-msgid "2,2-Dimethylpropane"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2868
-msgctxt "Name"
-msgid "Ethyl-Benzene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:2938
-msgctxt "Name"
-msgid "Propene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3001
-msgctxt "Name"
-msgid "L-Asparagine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3072
-msgctxt "Name"
-msgid "1,3,5,7-Cyclooctatetraene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3135
-msgctxt "Name"
-msgid "Vanillin"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3211
-msgctxt "Name"
-msgid "Crystal 3"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3275
-msgctxt "Name"
-msgid "Uric Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3348
-msgctxt "Name"
-msgid "Thymine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3419
-msgctxt "Name"
-msgid "Aniline"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3492
-msgctxt "Name"
-msgid "Chloroform"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3552
-msgctxt "Name"
-msgid "Carbonic acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3614
-msgctxt "Name"
-msgid "Crystal 4"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3687
-msgctxt "Name"
-msgid "Ethanol"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3748
-msgctxt "Name"
-msgid "Acrylo-Nitril"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3809
-msgctxt "Name"
-msgid "Furan"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3875
-msgctxt "Name"
-msgid "l-Lactic acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:3939
-msgctxt "Name"
-msgid "Maleic Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4007
-msgctxt "Name"
-msgid "meso-Tartaric acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4074
-msgctxt "Name"
-msgid "Crystal 5"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4147
-msgctxt "Name"
-msgid "Formic acid ethyl ester"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4210
-msgctxt "Name"
-msgid "1,4-Cyclohexadiene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4271
-msgctxt "Name"
-msgid "Squaric acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4337
-msgctxt "Name"
-msgid "Ascorbic acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4410
-msgctxt "Name"
-msgid "Isopropanol"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4472
-msgctxt "Name"
-msgid "Phosgene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4530
-msgctxt "Name"
-msgid "Thiophene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4594
-msgctxt "Name"
-msgid "Urea"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4658
-msgctxt "Name"
-msgid "Pyruvic Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4722
-msgctxt "Name"
-msgid "Ethylene oxide"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4785
-msgctxt "Name"
-msgid "Phosphoric Acid"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4848
-msgctxt "Name"
-msgid "Diacetyl"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4913
-msgctxt "Name"
-msgid "trans-Dichloroethene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:4972
-msgctxt "Name"
-msgid "Allylisothiocyanate"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:5033
-msgctxt "Name"
-msgid "Diketene"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:5097
-msgctxt "Name"
-msgid "Ethanal"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:5158
-msgctxt "Name"
-msgid "Acroleine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:5286
-msgctxt "Name"
-msgid "Uracil"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:5355
-msgctxt "Name"
-msgid "Caffeine"
-msgstr ""
-
-#: katomic/levels/default_levels.dat:5436
-msgctxt "Name"
-msgid "Acetone"
-msgstr ""
-
-#: kbattleship/src/kbattleship.desktop:2
-msgctxt "Name"
-msgid "Naval Battle"
-msgstr ""
-
-#: kbattleship/src/kbattleship.desktop:36
-msgctxt "GenericName"
-msgid "Ship Sinking Game"
-msgstr ""
-
-#: kbattleship/src/kbattleship.protocol:8
-msgctxt "Description"
-msgid "A protocol for the game Naval Battle"
-msgstr ""
-
-#: kblackbox/kblackbox.desktop:2
-msgctxt "GenericName"
-msgid "Blackbox Logic Game"
-msgstr "Gêm Resymeg Blackbox"
-
-#: kblackbox/kblackbox.desktop:61
-msgctxt "Name"
-msgid "KBlackBox"
-msgstr "KBlackBox"
-
-#: kblocks/kblocks.desktop:2
-msgctxt "Name"
-msgid "KBlocks"
-msgstr ""
-
-#: kblocks/kblocks.desktop:52
-msgctxt "GenericName"
-msgid "Falling Blocks Game"
-msgstr ""
-
-#: kblocks/themes/default.desktop:2 kdiamond/themes/default.desktop:3
-#: klines/themes/egyptian.desktop:3 libkmahjongg/backgrounds/default.desktop:2
-#: lskat/grafix/egyptian.desktop:2
-msgctxt "Name"
-msgid "Egyptian"
-msgstr ""
-
-#: kblocks/themes/default.desktop:43
-msgctxt "Description"
-msgid "KBlocks, Egyptian style."
-msgstr ""
-
-#: kblocks/themes/oxygen.desktop:2
-msgctxt "Name"
-msgid "oxygen"
-msgstr ""
-
-#: kblocks/themes/oxygen.desktop:39
-msgctxt "Description"
-msgid "KBlocks Oxygen theme for KDE 4"
-msgstr ""
-
-#: kbounce/kbounce.desktop:2
-msgctxt "Name"
-msgid "KBounce"
-msgstr "KBounce"
-
-#: kbounce/kbounce.desktop:72
-msgctxt "GenericName"
-msgid "Ball Bouncing Game"
-msgstr ""
-
-#: kbounce/themes/default.desktop:3
-msgctxt "Name"
-msgid "Egyptian Bounce"
-msgstr ""
-
-#: kbounce/themes/default.desktop:40
-msgctxt "Description"
-msgid "KBounce, Egyptian style."
-msgstr ""
-
-#: kbounce/themes/geometry.desktop:3
-msgctxt "Name"
-msgid "Strange Geometry"
-msgstr ""
-
-#: kbounce/themes/geometry.desktop:46
-msgctxt "Description"
-msgid "A simple high-contrast theme for those who like it clean."
-msgstr ""
-
-#: kbounce/themes/oxygen.desktop:3
-#: libkdegames/carddecks/decks/deck13.desktop:2
-#: libkdegames/carddecks/svg-oxygen/index.desktop:2
-#: lskat/grafix/oxygen.desktop:2
-msgctxt "Name"
-msgid "Oxygen"
-msgstr ""
-
-#: kbounce/themes/roads.desktop:3
-msgctxt "Name"
-msgid "Roads"
-msgstr ""
-
-#: kbounce/themes/roads.desktop:45
-msgctxt "Description"
-msgid "Roads, cones and wheels."
-msgstr ""
-
-#: kbounce/themes/the_beach.desktop:3
-msgctxt "Name"
-msgid "The Beach"
-msgstr ""
-
-#: kbreakout/kbreakout.desktop:2
-msgctxt "Name"
-msgid "KBreakOut"
-msgstr ""
-
-#: kbreakout/kbreakout.desktop:50
-msgctxt "GenericName"
-msgid "Breakout-like Game"
-msgstr ""
-
-#: kbreakout/themes/IceWorld.desktop:2
-msgctxt "Name"
-msgid "IceWorld"
-msgstr ""
-
-#: kbreakout/themes/IceWorld.desktop:46
-msgctxt "Description"
-msgid "Ice chilled theme"
-msgstr ""
-
-#: kbreakout/themes/alienbreakout.desktop:2
-msgctxt "Name"
-msgid "Alien Breakout"
-msgstr ""
-
-#: kbreakout/themes/alienbreakout.desktop:34
-msgctxt "Description"
-msgid "Breakout before the aliens do."
-msgstr ""
-
-#: kbreakout/themes/crystal.desktop:2
-msgctxt "Name"
-msgid "Crystal clear"
-msgstr ""
-
-#: kbreakout/themes/crystal.desktop:45
-msgctxt "Description"
-msgid "Crystal-like theme for KBreakOut"
-msgstr ""
-
-#: kbreakout/themes/default.desktop:2
-msgctxt "Name"
-msgid "Egyptian Breakout"
-msgstr ""
-
-#: kbreakout/themes/default.desktop:40
-msgctxt "Description"
-msgid "Egyptian style breakout theme."
-msgstr ""
-
-#: kbreakout/themes/simple.desktop:2
-msgctxt "Name"
-msgid "Simple"
-msgstr ""
-
-#: kbreakout/themes/simple.desktop:48
-msgctxt "Description"
-msgid "Simple KBreakOut theme"
-msgstr ""
-
-#: kbreakout/themes/web20.desktop:2
-msgctxt "Name"
-msgid "WEB 2.0"
-msgstr ""
-
-#: kbreakout/themes/web20.desktop:46
-msgctxt "Description"
-msgid ""
-"Web 2.0 theme showcases graphical elements reminiscent of those used in "
-"popular 'WEB 2.0' movement, currently taking the interweb by storm."
-msgstr ""
-
-#: kdiamond/src/kdiamond.desktop:4
-msgctxt "Name"
-msgid "KDiamond"
-msgstr ""
-
-#: kdiamond/src/kdiamond.desktop:50
-msgctxt "GenericName"
-msgid "Three-in-a-row game"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:3
-msgctxt "Comment"
-msgid "KDiamond Game"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:38 klickety/klickety.notifyrc:34
-msgctxt "Name"
-msgid "Game"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:87 klickety/klickety.notifyrc:83
-msgctxt "Comment"
-msgid "Sounds that appear during a game"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:131
-msgctxt "Name"
-msgid "Diamonds removed"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:176
-msgctxt "Comment"
-msgid "Diamonds were removed."
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:226
-msgctxt "Name"
-msgid "Diamonds moving"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:271
-msgctxt "Comment"
-msgid "Diamonds are moving."
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:321 klickety/klickety.notifyrc:188
-msgctxt "Name"
-msgid "Game over"
-msgstr ""
-
-#: kdiamond/src/kdiamond.notifyrc:369 klickety/klickety.notifyrc:236
-msgctxt "Comment"
-msgid "Time is up."
-msgstr ""
-
-#: kdiamond/themes/default.desktop:44 kpat/themes/ancientegypt.desktop:34
-msgctxt "Description"
-msgid "Egyptian style theme."
-msgstr ""
-
-#: kdiamond/themes/diamonds.desktop:3
-msgctxt "Name"
-msgid "Diamonds"
-msgstr ""
-
-#: kdiamond/themes/diamonds.desktop:41
-msgctxt "Description"
-msgid "A theme based on real looking diamonds."
-msgstr ""
-
-#: kdiamond/themes/funny_zoo.desktop:3
-msgctxt "Name"
-msgid "Funny Zoo"
-msgstr ""
-
-#: kdiamond/themes/funny_zoo.desktop:44
-msgctxt "Description"
-msgid ""
-"It is a fun time in the jungle! Help animals find their families. And watch "
-"out for those hard to find frogs."
-msgstr ""
-
-#: kfourinline/grafix/default.desktop:2
-msgctxt "Name"
-msgid "Black and Red"
-msgstr ""
-
-#: kfourinline/grafix/gray_reflection.desktop:2
-msgctxt "Name"
-msgid "True Reflection"
-msgstr ""
-
-#: kfourinline/grafix/yellow.desktop:2
-msgctxt "Name"
-msgid "Yellow and Red"
-msgstr ""
-
-#: kfourinline/grafix/yellow_reflection.desktop:2
-msgctxt "Name"
-msgid "Yellow and Red Reflection"
-msgstr ""
-
-#: kfourinline/kfourinline.desktop:2
-msgctxt "Name"
-msgid "KFourInLine"
-msgstr ""
-
-#: kfourinline/kfourinline.desktop:49
-msgctxt "GenericName"
-msgid "Four-in-a-row Board Game"
-msgstr ""
-
-#: kgoldrunner/src/KGoldrunner.desktop:3
-msgctxt "Name"
-msgid "KGoldrunner"
-msgstr "KGoldrunner"
-
-#: kgoldrunner/src/KGoldrunner.desktop:65
-msgctxt "GenericName"
-msgid "Hunt Gold, Dodge Enemies and Solve Puzzles"
-msgstr ""
-
-#: kgoldrunner/src/KGoldrunner.desktop:109
-msgctxt "Comment"
-msgid "A game of action and puzzle-solving"
-msgstr "Gêm gynhyrfus o ddatrys posau"
-
-#: kgoldrunner/themes/black-on-white.desktop:2
-msgctxt "Name"
-msgid "Black on White"
-msgstr ""
-
-#: kgoldrunner/themes/black-on-white.desktop:50
-msgctxt "Description"
-msgid "A monochrome, black on white theme for KGoldrunner"
-msgstr ""
-
-#: kgoldrunner/themes/default.desktop:2
-msgctxt "Name"
-msgid "KGoldRunner Default"
-msgstr ""
-
-#: kgoldrunner/themes/default.desktop:52
-msgctxt "Description"
-msgid "A light and clean theme for KDE4"
-msgstr ""
-
-#: kgoldrunner/themes/egypt.desktop:2
-msgctxt "Name"
-msgid "The Treasure of Egypt"
-msgstr ""
-
-#: kgoldrunner/themes/egypt.desktop:49
-msgctxt "Description"
-msgid "Help Matt Goldrunner escape the traps of ancient Egypt."
-msgstr ""
-
-#: kgoldrunner/themes/kgr_geek.desktop:2
-msgctxt "Name"
-msgid "Geek City"
-msgstr ""
-
-#: kgoldrunner/themes/kgr_geek.desktop:47
-msgctxt "Description"
-msgid "The hero is trapped inside a computer."
-msgstr ""
-
-#: kgoldrunner/themes/nostalgia-blues.desktop:2
-msgctxt "Name"
-msgid "Nostalgia Blues"
-msgstr ""
-
-#: kgoldrunner/themes/nostalgia-blues.desktop:46
-msgctxt "Description"
-msgid ""
-"A theme for KGoldrunner that brings back that 8-bit look... now in blue!"
-msgstr ""
-
-#: kgoldrunner/themes/nostalgia.desktop:2
-msgctxt "Name"
-msgid "Nostalgia"
-msgstr ""
-
-#: kgoldrunner/themes/nostalgia.desktop:50
-msgctxt "Description"
-msgid "A scalable theme for KGoldrunner that brings back that 8-bit look..."
-msgstr ""
-
-#: kigo/data/themes/default.desktop:2 kmahjongg/layouts/default.desktop:2
-#: kmines/themes/default.desktop:2 knetwalk/themes/default.desktop:2
-#: libkmahjongg/backgrounds/default_old.desktop:2
-#: libkmahjongg/tilesets/default.desktop:2
-msgctxt "Name"
-msgid "Default"
-msgstr ""
-
-#: kigo/data/themes/default.desktop:57
-msgctxt "Description"
-msgid "Kigo Default theme for KDE 4"
-msgstr ""
-
-#: kigo/src/gui/kigo.desktop:9
-msgctxt "Name"
-msgid "Kigo"
-msgstr ""
-
-#: kigo/src/gui/kigo.desktop:46
-msgctxt "GenericName"
-msgid "Go Board Game"
-msgstr ""
-
-#: killbots/killbots.desktop:2 killbots/rulesets/default.desktop:2
-msgctxt "Name"
-msgid "Killbots"
-msgstr ""
-
-#: killbots/rulesets/classic.desktop:2 killbots/themes/classic.desktop:2
-#: klickety/themes/default.desktop:2 kmines/themes/classic.desktop:2
-#: libkmahjongg/tilesets/classic.desktop:2 kolf/courses/Classic.kolf:2
-msgctxt "Name"
-msgid "Classic"
-msgstr ""
-
-#: killbots/rulesets/classic.desktop:57
-msgctxt "Description"
-msgid ""
-"<qt><p>The rules used in the original BSD command line version of "
-"<tt>robots</tt>.</p><p>Nothing fancy, just the basic game elements: no "
-"fastbots, no safe teleports, no pushing junkheaps, and a huge game "
-"grid.</p><p>Due to its larger width, it is recommended that you use a theme "
-"with narrower tiles to better fit your screen.</p></qt>"
-msgstr ""
-
-#: killbots/rulesets/daleks.desktop:2
-msgctxt "Name"
-msgid "Daleks"
-msgstr ""
-
-#: killbots/rulesets/daleks.desktop:42
-msgctxt "Description"
-msgid ""
-"<qt><p>An approximation of the rules used in Daleks, a robots-like game for "
-"early Apple computers.</p><p>The hero is allotted one energy each round that "
-"can be used to power the sonic screwdriver. All other special features are "
-"disabled.</p></qt>"
-msgstr ""
-
-#: killbots/rulesets/default.desktop:47
-msgctxt "Description"
-msgid ""
-"<qt><p>The default Killbots game type.</p><p>Includes a medium size grid, "
-"safe teleports, fast enemies and pushable junkheaps.</p></qt>"
-msgstr ""
-
-#: killbots/rulesets/easy.desktop:2
-msgctxt "Name"
-msgid "Easy"
-msgstr ""
-
-#: killbots/rulesets/easy.desktop:46
-msgctxt "Description"
-msgid ""
-"<qt><p>An easier version of the \"Killbots\" game type.</p><p>Includes a "
-"bigger game grid prepopulated with junkheaps, a starting stash of energy and "
-"an increasing energy cap.</p></qt>"
-msgstr ""
-
-#: killbots/rulesets/energycrisis.desktop:2
-msgctxt "Name"
-msgid "Energy Crisis"
-msgstr ""
-
-#: killbots/rulesets/energycrisis.desktop:37
-msgctxt "Description"
-msgid ""
-"The player starts with 30 energy and cannot earn more. How many rounds can "
-"you survive and how many points can you collect before your energy and luck "
-"run out?"
-msgstr ""
-
-#: killbots/themes/classic.desktop:55
-msgctxt "Description"
-msgid "A theme for those who miss the console version"
-msgstr ""
-
-#: killbots/themes/mountainadventure.desktop:43
-msgctxt "Description"
-msgid ""
-"<qt><p>Indiana Gnomes battles ghosts and bats on a misty "
-"mountainside.</p><p>Sprites by Nicu Buculei. Background by Eugene "
-"Trounev.</p></qt>"
-msgstr ""
-
-#: killbots/themes/mummymadness.desktop:2
-msgctxt "Name"
-msgid "Mummy Madness"
-msgstr ""
-
-#: killbots/themes/mummymadness.desktop:40
-msgctxt "Description"
-msgid "Egyptian style theme with mad mummies."
-msgstr ""
-
-#: killbots/themes/robotkill.desktop:2
-msgctxt "Name"
-msgid "Robot Kill"
-msgstr ""
-
-#: killbots/themes/robotkill.desktop:42
-msgctxt "Description"
-msgid "The default Killbots theme."
-msgstr ""
-
-#: kiriki/src/kiriki.desktop:2
-msgctxt "Name"
-msgid "Kiriki"
-msgstr ""
-
-#: kiriki/src/kiriki.desktop:56
-msgctxt "GenericName"
-msgid "Yahtzee-like Dice Game"
-msgstr ""
-
-#: kjumpingcube/kjumpingcube.desktop:2
-msgctxt "Name"
-msgid "KJumpingCube"
-msgstr "KJumpingCube"
-
-#: kjumpingcube/kjumpingcube.desktop:70
-msgctxt "GenericName"
-msgid "Territory Capture Game"
-msgstr ""
-
-#: kjumpingcube/pics/default.desktop:2
-msgctxt "Name"
-msgid "KJumpingCube Default"
-msgstr ""
-
-#: kjumpingcube/pics/default.desktop:50
-msgctxt "Description"
-msgid "A simple set of cubes for KDE4"
-msgstr ""
-
-#: klickety/klickety.desktop:2
-msgctxt "Name"
-msgid "Klickety"
-msgstr "Klickety"
-
-#: klickety/klickety.desktop:31 klickety/ksame.desktop:70
-msgctxt "GenericName"
-msgid "Board Game"
-msgstr "Gêm Fwrdd"
-
-#: klickety/klickety.notifyrc:3
-msgctxt "Comment"
-msgid "Board Game"
-msgstr ""
-
-#: klickety/klickety.notifyrc:127
-msgctxt "Name"
-msgid "Pieces removed"
-msgstr ""
-
-#: klickety/klickety.notifyrc:155
-msgctxt "Comment"
-msgid "Pieces were removed."
-msgstr ""
-
-#: klickety/ksame.desktop:2
-msgctxt "Name"
-msgid "SameGame"
-msgstr "YrUnGêm"
-
-#: klickety/themes/default.desktop:55
-msgctxt "Description"
-msgid "Klickety Classic Theme"
-msgstr ""
-
-#: klickety/themes/ksame.desktop:2
-msgctxt "Name"
-msgid "KSame"
-msgstr ""
-
-#: klickety/themes/ksame.desktop:30
-msgctxt "Description"
-msgid "Klickety KSame Theme"
-msgstr ""
-
-#: klickety/themes/ksame_old.desktop:2
-msgctxt "Name"
-msgid "KSame Old"
-msgstr ""
-
-#: klickety/themes/ksame_old.desktop:29
-msgctxt "Description"
-msgid "Klickety KSame Old Theme"
-msgstr ""
-
-#: klines/klines.desktop:7
-msgctxt "GenericName"
-msgid "Tactical Game"
-msgstr "Gêm Dactegol"
-
-#: klines/klines.desktop:73
-msgctxt "Name"
-msgid "Kolor Lines"
-msgstr "Kolor Lines"
-
-#: klines/themes/crystal.desktop:3
-msgctxt "Name"
-msgid "Crystal"
-msgstr ""
-
-#: klines/themes/egyptian.desktop:44
-msgctxt "Description"
-msgid "An Egyptian style theme for klines."
-msgstr ""
-
-#: klines/themes/klines-gems.desktop:3
-msgctxt "Name"
-msgid "Gems for Kolor Lines"
-msgstr ""
-
-#: klines/themes/metal.desktop:3
-msgctxt "Name"
-msgid "Metal"
-msgstr ""
-
-#: klines/themes/metal.desktop:39
-msgctxt "Description"
-msgid "A metal style theme with bouncing balls"
-msgstr ""
-
-#: kmahjongg/kmahjongg.desktop:2
-msgctxt "Name"
-msgid "KMahjongg"
-msgstr "KMahjongg"
-
-#: kmahjongg/kmahjongg.desktop:67
-msgctxt "GenericName"
-msgid "Mahjongg Solitaire"
-msgstr ""
-
-#: kmahjongg/layouts/4_winds.desktop:2
-msgctxt "Name"
-msgid "4 Winds"
-msgstr ""
-
-#: kmahjongg/layouts/4_winds.desktop:43
-msgctxt "Description"
-msgid "A layout resembling a fortress"
-msgstr ""
-
-#: kmahjongg/layouts/Vi.desktop:2
-msgctxt "Name"
-msgid "Vi"
-msgstr ""
-
-#: kmahjongg/layouts/Vi.desktop:43
-msgctxt "Description"
-msgid "A V-shaped layout with thick lower corners"
-msgstr ""
-
-#: kmahjongg/layouts/X_shaped.desktop:2
-msgctxt "Name"
-msgid "X-shaped"
-msgstr ""
-
-#: kmahjongg/layouts/X_shaped.desktop:41
-msgctxt "Description"
-msgid "A large letter X made of mahjongg tiles"
-msgstr ""
-
-#: kmahjongg/layouts/alien.desktop:2
-msgctxt "Name"
-msgid "Alien"
-msgstr ""
-
-#: kmahjongg/layouts/alien.desktop:44
-msgctxt "Description"
-msgid "A humanoid made up of Mahjongg tiles"
-msgstr ""
-
-#: kmahjongg/layouts/altar.desktop:2
-msgctxt "Name"
-msgid "Altar"
-msgstr ""
-
-#: kmahjongg/layouts/altar.desktop:44
-msgctxt "Description"
-msgid "An elevated surface with stairs and columns aside"
-msgstr ""
-
-#: kmahjongg/layouts/arena.desktop:47
-msgctxt "Description"
-msgid "Circular-aligned seats around a performance area"
-msgstr ""
-
-#: kmahjongg/layouts/arrow.desktop:2
-msgctxt "Name"
-msgid "Arrow"
-msgstr ""
-
-#: kmahjongg/layouts/arrow.desktop:45
-msgctxt "Description"
-msgid "A big arrow pointing in the right direction"
-msgstr ""
-
-#: kmahjongg/layouts/atlantis.desktop:2
-msgctxt "Name"
-msgid "Atlantis"
-msgstr ""
-
-#: kmahjongg/layouts/atlantis.desktop:44
-msgctxt "Description"
-msgid "The starship-city from Stargate Atlantis"
-msgstr ""
-
-#: kmahjongg/layouts/aztec.desktop:2
-msgctxt "Name"
-msgid "Aztec"
-msgstr ""
-
-#: kmahjongg/layouts/aztec.desktop:44
-msgctxt "Description"
-msgid "A layout resembling Aztec buildings"
-msgstr ""
-
-#: kmahjongg/layouts/balance.desktop:2
-msgctxt "Name"
-msgid "Balance"
-msgstr ""
-
-#: kmahjongg/layouts/balance.desktop:43
-msgctxt "Description"
-msgid "Time to weight every decision carefully!"
-msgstr ""
-
-#: kmahjongg/layouts/bat.desktop:2
-msgctxt "Name"
-msgid "Bat"
-msgstr ""
-
-#: kmahjongg/layouts/bat.desktop:45
-msgctxt "Description"
-msgid "A bat-shaped layout"
-msgstr ""
-
-#: kmahjongg/layouts/bug.desktop:2
-msgctxt "Name"
-msgid "Bug"
-msgstr ""
-
-#: kmahjongg/layouts/bug.desktop:44
-msgctxt "Description"
-msgid "The bug. Let us take it apart!"
-msgstr ""
-
-#: kmahjongg/layouts/castle.desktop:2
-msgctxt "Name"
-msgid "Castle"
-msgstr ""
-
-#: kmahjongg/layouts/castle.desktop:45
-msgctxt "Description"
-msgid "Vista-styled castle layout"
-msgstr ""
-
-#: kmahjongg/layouts/castle2.desktop:2
-msgctxt "Name"
-msgid "Castle View"
-msgstr ""
-
-#: kmahjongg/layouts/castle2.desktop:43
-msgctxt "Description"
-msgid "A castle as viewed from one side"
-msgstr ""
-
-#: kmahjongg/layouts/cat.desktop:2
-msgctxt "Name"
-msgid "Cat"
-msgstr ""
-
-#: kmahjongg/layouts/cat.desktop:45
-msgctxt "Description"
-msgid "Vista-styled cat layout"
-msgstr ""
-
-#: kmahjongg/layouts/chains.desktop:2
-msgctxt "Name"
-msgid "Chains"
-msgstr ""
-
-#: kmahjongg/layouts/chains.desktop:44
-msgctxt "Description"
-msgid "Four chains making up a single structure"
-msgstr ""
-
-#: kmahjongg/layouts/checkered.desktop:2
-msgctxt "Name"
-msgid "Checkered"
-msgstr ""
-
-#: kmahjongg/layouts/checkered.desktop:41
-msgctxt "Description"
-msgid "What if the chess board was not square?"
-msgstr ""
-
-#: kmahjongg/layouts/chip.desktop:2
-msgctxt "Name"
-msgid "Chip"
-msgstr ""
-
-#: kmahjongg/layouts/chip.desktop:43
-msgctxt "Description"
-msgid "An electronic component with many connectors"
-msgstr ""
-
-#: kmahjongg/layouts/clubs.desktop:2
-msgctxt "Name"
-msgid "Clubs"
-msgstr ""
-
-#: kmahjongg/layouts/clubs.desktop:42
-msgctxt "Description"
-msgid "A layout resembling a multitude of card clubs"
-msgstr ""
-
-#: kmahjongg/layouts/columns.desktop:2
-msgctxt "Name"
-msgid "Columns"
-msgstr ""
-
-#: kmahjongg/layouts/columns.desktop:45
-msgctxt "Description"
-msgid "A circular arena covered with columns of varying height"
-msgstr ""
-
-#: kmahjongg/layouts/crab.desktop:2
-msgctxt "Name"
-msgid "Crab"
-msgstr ""
-
-#: kmahjongg/layouts/crab.desktop:46
-msgctxt "Description"
-msgid "Vista-styled crab layout"
-msgstr ""
-
-#: kmahjongg/layouts/cross.desktop:2
-msgctxt "Name"
-msgid "Cross"
-msgstr ""
-
-#: kmahjongg/layouts/cross.desktop:46
-msgctxt "Description"
-msgid "A six-ended cross resembling the Cyrillic letter Zh"
-msgstr ""
-
-#: kmahjongg/layouts/default.desktop:57
-msgctxt "Description"
-msgid "Default KMahjongg game layout"
-msgstr ""
-
-#: kmahjongg/layouts/dragon.desktop:2
-msgctxt "Name"
-msgid "Dragon"
-msgstr ""
-
-#: kmahjongg/layouts/dragon.desktop:47
-msgctxt "Description"
-msgid "Vista-styled dragon layout"
-msgstr ""
-
-#: kmahjongg/layouts/eagle.desktop:2
-msgctxt "Name"
-msgid "Eagle"
-msgstr ""
-
-#: kmahjongg/layouts/eagle.desktop:46
-msgctxt "Description"
-msgid "A large carnivore bird in Mahjongg tiles"
-msgstr ""
-
-#: kmahjongg/layouts/enterprise.desktop:2
-msgctxt "Name"
-msgid "Enterprise"
-msgstr ""
-
-#: kmahjongg/layouts/enterprise.desktop:44
-msgctxt "Description"
-msgid "A layout for Star Trek fans"
-msgstr ""
-
-#: kmahjongg/layouts/explosion.desktop:2 kmines/data/kmines.notifyrc:446
-msgctxt "Name"
-msgid "Explosion"
-msgstr "Ffrwydriad"
-
-#: kmahjongg/layouts/explosion.desktop:64
-msgctxt "Description"
-msgid "Something has exploded. Collect the pieces."
-msgstr ""
-
-#: kmahjongg/layouts/flowers.desktop:2
-msgctxt "Name"
-msgid "Flowers"
-msgstr "Blodau"
-
-#: kmahjongg/layouts/flowers.desktop:64
-msgctxt "Description"
-msgid "A layout consisting of six flowers"
-msgstr ""
-
-#: kmahjongg/layouts/future.desktop:2
-#: libkdegames/carddecks/decks/deck16.desktop:2
-msgctxt "Name"
-msgid "Future"
-msgstr ""
-
-#: kmahjongg/layouts/future.desktop:45
-msgctxt "Description"
-msgid "An abstract image resembling an asterisk"
-msgstr ""
-
-#: kmahjongg/layouts/galaxy.desktop:2
-msgctxt "Name"
-msgid "Galaxy"
-msgstr ""
-
-#: kmahjongg/layouts/galaxy.desktop:46
-msgctxt "Description"
-msgid "Diversely sized piles of matter"
-msgstr ""
-
-#: kmahjongg/layouts/garden.desktop:2
-msgctxt "Name"
-msgid "Garden"
-msgstr ""
-
-#: kmahjongg/layouts/garden.desktop:46
-msgctxt "Description"
-msgid "Regular patterns resembling a classical garden"
-msgstr ""
-
-#: kmahjongg/layouts/girl.desktop:2
-msgctxt "Name"
-msgid "Girl"
-msgstr ""
-
-#: kmahjongg/layouts/girl.desktop:45
-msgctxt "Description"
-msgid "A layout resembling a girl's face"
-msgstr ""
-
-#: kmahjongg/layouts/glade.desktop:2
-msgctxt "Name"
-msgid "Glade"
-msgstr ""
-
-#: kmahjongg/layouts/glade.desktop:41
-msgctxt "Description"
-msgid "A small piece of empty space surrounded by a forest"
-msgstr ""
-
-#: kmahjongg/layouts/grid.desktop:2
-msgctxt "Name"
-msgid "Grid"
-msgstr ""
-
-#: kmahjongg/layouts/grid.desktop:46
-msgctxt "Description"
-msgid "A rectangular grid of varying height"
-msgstr ""
-
-#: kmahjongg/layouts/helios.desktop:2
-msgctxt "Name"
-msgid "Helios"
-msgstr ""
-
-#: kmahjongg/layouts/helios.desktop:43
-msgctxt "Description"
-msgid "The greek Sun god's sign"
-msgstr ""
-
-#: kmahjongg/layouts/hole.desktop:2
-msgctxt "Name"
-msgid "Hole"
-msgstr ""
-
-#: kmahjongg/layouts/hole.desktop:43 kmahjongg/layouts/time_tunnel.desktop:43
-msgctxt "Description"
-msgid "A pyramid with a hole in the middle"
-msgstr ""
-
-#: kmahjongg/layouts/inner_circle.desktop:2
-msgctxt "Name"
-msgid "Inner Circle"
-msgstr ""
-
-#: kmahjongg/layouts/inner_circle.desktop:41
-msgctxt "Description"
-msgid "Concentric boxes with openings pointing in opposite directions"
-msgstr ""
-
-#: kmahjongg/layouts/key.desktop:2
-msgctxt "Name"
-msgid "Key"
-msgstr ""
-
-#: kmahjongg/layouts/key.desktop:45
-msgctxt "Description"
-msgid "A large key made of Mahjongg tiles"
-msgstr ""
-
-#: kmahjongg/layouts/km.desktop:2
-msgctxt "Name"
-msgid "KM"
-msgstr ""
-
-#: kmahjongg/layouts/km.desktop:45
-msgctxt "Description"
-msgid "Letters K and M. Do you have your favourite extension for that?"
-msgstr ""
-
-#: kmahjongg/layouts/labyrinth.desktop:45
-msgctxt "Description"
-msgid "A complex yet symmetric labyrinth"
-msgstr ""
-
-#: kmahjongg/layouts/mask.desktop:2
-msgctxt "Name"
-msgid "Mask"
-msgstr ""
-
-#: kmahjongg/layouts/mask.desktop:45
-msgctxt "Description"
-msgid "A scary embossed pagan mask"
-msgstr ""
-
-#: kmahjongg/layouts/maya.desktop:2
-msgctxt "Name"
-msgid "Maya"
-msgstr ""
-
-#: kmahjongg/layouts/maya.desktop:43
-msgctxt "Description"
-msgid "A layout resembling Maya pyramids"
-msgstr ""
-
-#: kmahjongg/layouts/maze.desktop:2
-msgctxt "Name"
-msgid "Maze"
-msgstr ""
-
-#: kmahjongg/layouts/maze.desktop:45
-msgctxt "Description"
-msgid "An extremely twisted maze. Beware of minotaurs!"
-msgstr ""
-
-#: kmahjongg/layouts/mesh.desktop:2
-msgctxt "Name"
-msgid "Mesh"
-msgstr ""
-
-#: kmahjongg/layouts/mesh.desktop:41
-msgctxt "Description"
-msgid "An interweaved structure made up of Mahjongg tiles"
-msgstr ""
-
-#: kmahjongg/layouts/moth.desktop:2
-msgctxt "Name"
-msgid "Moth"
-msgstr ""
-
-#: kmahjongg/layouts/moth.desktop:41
-msgctxt "Description"
-msgid "A layout representing a small flying insect"
-msgstr ""
-
-#: kmahjongg/layouts/order.desktop:2
-msgctxt "Name"
-msgid "Order"
-msgstr ""
-
-#: kmahjongg/layouts/order.desktop:43
-msgctxt "Description"
-msgid "A cross with thick ends"
-msgstr ""
-
-#: kmahjongg/layouts/pattern.desktop:2
-msgctxt "Name"
-msgid "Pattern"
-msgstr ""
-
-#: kmahjongg/layouts/pattern.desktop:45
-msgctxt "Description"
-msgid "A mysterious pattern atop rectangular blocks"
-msgstr ""
-
-#: kmahjongg/layouts/penta.desktop:2
-msgctxt "Name"
-msgid "Penta"
-msgstr ""
-
-#: kmahjongg/layouts/penta.desktop:43
-msgctxt "Description"
-msgid "A fortress with five towers"
-msgstr ""
-
-#: kmahjongg/layouts/pillars.desktop:2
-msgctxt "Name"
-msgid "Pillars"
-msgstr ""
-
-#: kmahjongg/layouts/pillars.desktop:42
-msgctxt "Description"
-msgid "A couple of vertical pillars supporting a flat surface"
-msgstr ""
-
-#: kmahjongg/layouts/pirates.desktop:2
-msgctxt "Name"
-msgid "Pirates"
-msgstr ""
-
-#: kmahjongg/layouts/pirates.desktop:44
-msgctxt "Description"
-msgid "A sailing boat under the sun"
-msgstr ""
-
-#: kmahjongg/layouts/pyramid.desktop:2
-msgctxt "Name"
-msgid "Pyramid"
-msgstr ""
-
-#: kmahjongg/layouts/pyramid.desktop:54
-msgctxt "Description"
-msgid "Can you tear the pyramid apart?"
-msgstr ""
-
-#: kmahjongg/layouts/rocket.desktop:2
-msgctxt "Name"
-msgid "Rocket"
-msgstr ""
-
-#: kmahjongg/layouts/rocket.desktop:43
-msgctxt "Description"
-msgid "A rocket for you to launch off the board"
-msgstr ""
-
-#: kmahjongg/layouts/shield.desktop:2
-msgctxt "Name"
-msgid "Shield"
-msgstr ""
-
-#: kmahjongg/layouts/shield.desktop:43
-msgctxt "Description"
-msgid "A shield and a sword made up of Mahjongg tiles"
-msgstr ""
-
-#: kmahjongg/layouts/spider.desktop:2
-msgctxt "Name"
-msgid "Spider"
-msgstr ""
-
-#: kmahjongg/layouts/spider.desktop:44
-msgctxt "Description"
-msgid "Vista-styled spider layout"
-msgstr ""
-
-#: kmahjongg/layouts/squares.desktop:2
-msgctxt "Name"
-msgid "Squares"
-msgstr ""
-
-#: kmahjongg/layouts/squares.desktop:45
-msgctxt "Description"
-msgid "Concentric squares of alterating height"
-msgstr ""
-
-#: kmahjongg/layouts/squaring.desktop:2
-msgctxt "Name"
-msgid "Squaring"
-msgstr ""
-
-#: kmahjongg/layouts/squaring.desktop:42
-msgctxt "Description"
-msgid "Who said squares are flat?"
-msgstr ""
-
-#: kmahjongg/layouts/stadion.desktop:2
-msgctxt "Name"
-msgid "Stadion"
-msgstr ""
-
-#: kmahjongg/layouts/stadion.desktop:43
-msgctxt "Description"
-msgid "A layout representing a football field"
-msgstr ""
-
-#: kmahjongg/layouts/stairs.desktop:2
-msgctxt "Name"
-msgid "Stairs"
-msgstr ""
-
-#: kmahjongg/layouts/stairs.desktop:45
-msgctxt "Description"
-msgid "A staircase for those who dislike taking the same path twice"
-msgstr ""
-
-#: kmahjongg/layouts/star.desktop:2
-msgctxt "Name"
-msgid "Star"
-msgstr ""
-
-#: kmahjongg/layouts/star.desktop:46
-msgctxt "Description"
-msgid "An asterisk-shaped embossed layout"
-msgstr ""
-
-#: kmahjongg/layouts/star_ship.desktop:2
-msgctxt "Name"
-msgid "Star Ship"
-msgstr ""
-
-#: kmahjongg/layouts/star_ship.desktop:43
-msgctxt "Description"
-msgid "A sci-fi space transport"
-msgstr ""
-
-#: kmahjongg/layouts/stax.desktop:2
-msgctxt "Name"
-msgid "Stacks"
-msgstr ""
-
-#: kmahjongg/layouts/stax.desktop:49
-msgctxt "Description"
-msgid "Difficult layout with stacks of tiles"
-msgstr ""
-
-#: kmahjongg/layouts/swirl.desktop:2
-msgctxt "Name"
-msgid "Swirl"
-msgstr ""
-
-#: kmahjongg/layouts/swirl.desktop:46
-msgctxt "Description"
-msgid "A spiral with thick ends"
-msgstr ""
-
-#: kmahjongg/layouts/temple.desktop:2
-msgctxt "Name"
-msgid "Temple"
-msgstr ""
-
-#: kmahjongg/layouts/temple.desktop:44
-msgctxt "Description"
-msgid "A temple-shaped layout"
-msgstr ""
-
-#: kmahjongg/layouts/the_door.desktop:2
-msgctxt "Name"
-msgid "The Door"
-msgstr ""
-
-#: kmahjongg/layouts/the_door.desktop:43
-msgctxt "Description"
-msgid "A doorway through a pyramid-shaped wall"
-msgstr ""
-
-#: kmahjongg/layouts/theatre.desktop:2
-msgctxt "Name"
-msgid "Theatre"
-msgstr ""
-
-#: kmahjongg/layouts/theatre.desktop:43
-msgctxt "Description"
-msgid "A rectangular building with empty space in the middle"
-msgstr ""
-
-#: kmahjongg/layouts/time_tunnel.desktop:2
-msgctxt "Name"
-msgid "Time Tunnel"
-msgstr ""
-
-#: kmahjongg/layouts/tomb.desktop:2
-msgctxt "Name"
-msgid "Tomb"
-msgstr ""
-
-#: kmahjongg/layouts/tomb.desktop:42
-msgctxt "Description"
-msgid "Fans of Lara Croft may start digging"
-msgstr ""
-
-#: kmahjongg/layouts/totem.desktop:2
-msgctxt "Name"
-msgid "Totem"
-msgstr ""
-
-#: kmahjongg/layouts/totem.desktop:45
-msgctxt "Description"
-msgid "A T-shaped embossed object with a hole"
-msgstr ""
-
-#: kmahjongg/layouts/tower.desktop:2
-msgctxt "Name"
-msgid "Tower"
-msgstr ""
-
-#: kmahjongg/layouts/tower.desktop:54
-msgctxt "Description"
-msgid "Remove the towers"
-msgstr ""
-
-#: kmahjongg/layouts/triangle.desktop:2
-msgctxt "Name"
-msgid "Triangle"
-msgstr ""
-
-#: kmahjongg/layouts/triangle.desktop:55
-msgctxt "Description"
-msgid "Triangular pyramid"
-msgstr ""
-
-#: kmahjongg/layouts/up&down.desktop:2
-msgctxt "Name"
-msgid "Up&Down"
-msgstr ""
-
-#: kmahjongg/layouts/up&down.desktop:41
-msgctxt "Description"
-msgid "Have you ever tried to represent waves in rectangular blocks?"
-msgstr ""
-
-#: kmahjongg/layouts/well.desktop:2
-msgctxt "Name"
-msgid "Well"
-msgstr ""
-
-#: kmahjongg/layouts/well.desktop:42
-msgctxt "Description"
-msgid "A rectangular well with stairs at all sides"
-msgstr ""
-
-#: kmines/data/kmines.desktop:2
-msgctxt "Name"
-msgid "KMines"
-msgstr "KMines"
-
-#: kmines/data/kmines.desktop:70
-msgctxt "GenericName"
-msgid "Minesweeper-like Game"
-msgstr "Gêm tebyg i Minesweeper"
-
-#: kmines/data/kmines.notifyrc:3
-msgctxt "Comment"
-msgid "KMines Minesweeper-like Game"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:37
-msgctxt "Name"
-msgid "Reveal Case"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:83
-msgctxt "Comment"
-msgid "Reveal case"
-msgstr "Dangos cas"
-
-#: kmines/data/kmines.notifyrc:140
-msgctxt "Name"
-msgid "Autoreveal Case"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:185
-msgctxt "Comment"
-msgid "Autoreveal case"
-msgstr "Dangos cas yn ymysgogol"
-
-#: kmines/data/kmines.notifyrc:242
-msgctxt "Name"
-msgid "Mark Case"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:287
-msgctxt "Comment"
-msgid "Mark case"
-msgstr "Marcio cas"
-
-#: kmines/data/kmines.notifyrc:344
-msgctxt "Name"
-msgid "Unmark Case"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:389
-msgctxt "Comment"
-msgid "Unmark case"
-msgstr "Dadmarcio cas"
-
-#: kmines/data/kmines.notifyrc:508
-msgctxt "Comment"
-msgid "Explosion"
-msgstr "Ffrwydriad"
-
-#: kmines/data/kmines.notifyrc:572 kreversi/sounds/kreversi.notifyrc:165
-msgctxt "Name"
-msgid "Game Won"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:622 knetwalk/src/knetwalk.notifyrc:339
-#: kreversi/sounds/kreversi.notifyrc:215
-msgctxt "Comment"
-msgid "Game won"
-msgstr "Gêm wedi ei ennill"
-
-#: kmines/data/kmines.notifyrc:684 kreversi/sounds/kreversi.notifyrc:278
-msgctxt "Name"
-msgid "Game Lost"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:734 kreversi/sounds/kreversi.notifyrc:328
-msgctxt "Comment"
-msgid "Game lost"
-msgstr "Gêm wedi ei golli"
-
-#: kmines/data/kmines.notifyrc:796
-msgctxt "Name"
-msgid "Set Question Mark"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:843
-msgctxt "Comment"
-msgid "Set question mark"
-msgstr "Gosod gofynnod"
-
-#: kmines/data/kmines.notifyrc:902
-msgctxt "Name"
-msgid "Unset Question Mark"
-msgstr ""
-
-#: kmines/data/kmines.notifyrc:949
-msgctxt "Comment"
-msgid "Unset question mark"
-msgstr "Dadosod gofynnod"
-
-#: kmines/themes/classic.desktop:55
-msgctxt "Description"
-msgid "Classic theme for KMines"
-msgstr ""
-
-#: kmines/themes/default.desktop:57
-msgctxt "Description"
-msgid "KMines Oxygen theme for KDE 4"
-msgstr ""
-
-#: kmines/themes/graveyard-mayhem.desktop:2
-msgctxt "Name"
-msgid "Graveyard Mayhem"
-msgstr ""
-
-#: kmines/themes/graveyard-mayhem.desktop:35
-msgctxt "Description"
-msgid ""
-"A spooky theme for KMines. Don't get caught by the zombies in the graveyard!"
-msgstr ""
-
-#: kmines/themes/green.desktop:2
-msgctxt "Name"
-msgid "Gardens of Danger"
-msgstr ""
-
-#: kmines/themes/green.desktop:49
-msgctxt "Description"
-msgid "A funny theme for KDE4 mines game"
-msgstr ""
-
-#: knetwalk/src/knetwalk.desktop:5
-msgctxt "Name"
-msgid "KNetWalk"
-msgstr ""
-
-#: knetwalk/src/knetwalk.desktop:53
-msgctxt "GenericName"
-msgid "Network Construction Game"
-msgstr ""
-
-#: knetwalk/src/knetwalk.notifyrc:3
-msgctxt "Comment"
-msgid "KNetWalk Game"
-msgstr ""
-
-#: knetwalk/src/knetwalk.notifyrc:37 kreversi/sounds/kreversi.notifyrc:38
-msgctxt "Name"
-msgid "Click"
-msgstr "Clicio"
-
-#: knetwalk/src/knetwalk.notifyrc:99 kreversi/sounds/kreversi.notifyrc:100
-msgctxt "Comment"
-msgid "Click"
-msgstr "Clicio"
-
-#: knetwalk/src/knetwalk.notifyrc:164 knetwalk/src/knetwalk.notifyrc:402
-msgctxt "Name"
-msgid "Connect"
-msgstr "Connect"
-
-#: knetwalk/src/knetwalk.notifyrc:223 knetwalk/src/knetwalk.notifyrc:461
-msgctxt "Comment"
-msgid "Connect"
-msgstr ""
-
-#: knetwalk/src/knetwalk.notifyrc:279
-msgctxt "Name"
-msgid "Game won"
-msgstr "Gêm wedi ei ennill"
-
-#: knetwalk/src/knetwalk.notifyrc:517
-msgctxt "Name"
-msgid "Turn"
-msgstr "Turn"
-
-#: knetwalk/src/knetwalk.notifyrc:573
-msgctxt "Comment"
-msgid "Turn"
-msgstr ""
-
-#: knetwalk/themes/default.desktop:57
-msgctxt "Description"
-msgid "KNetWalk Default theme for KDE 4"
-msgstr ""
-
-#: knetwalk/themes/electronic.desktop:2
-msgctxt "Name"
-msgid "Electronic"
-msgstr ""
-
-#: knetwalk/themes/electronic.desktop:51
-msgctxt "Description"
-msgid "KNetWalk Electronic theme for KDE 4"
-msgstr ""
-
-#: kolf/graphics/default_theme.desktop:3
-msgctxt "Name"
-msgid "Kolf Default Theme"
-msgstr ""
-
-#: kolf/graphics/default_theme.desktop:31
-msgctxt "Description"
-msgid "Kolf Default Theme"
-msgstr ""
-
-#: kolf/kolf.desktop:3
-msgctxt "Name"
-msgid "Kolf"
-msgstr "Kolf"
-
-#: kolf/kolf.desktop:73
-msgctxt "GenericName"
-msgid "Miniature Golf"
-msgstr "Golff Bach"
-
-#: kollision/kollision.desktop:2
-msgctxt "Name"
-msgid "Kollision"
-msgstr ""
-
-#: kollision/kollision.desktop:49
-msgctxt "Comment"
-msgid "A simple ball dodging game"
-msgstr ""
-
-#: kollision/pictures/theme.desktop:3
-msgctxt "Name"
-msgid "Kollision Default Theme"
-msgstr ""
-
-#: kollision/pictures/theme.desktop:32
-msgctxt "Description"
-msgid "Kollision Default Theme"
-msgstr ""
-
-#: konquest/konquest.desktop:3
-msgctxt "Name"
-msgid "Konquest"
-msgstr "Konquest"
-
-#: konquest/konquest.desktop:68
-msgctxt "GenericName"
-msgid "Galactic Strategy Game"
-msgstr "Gêm Strategaeth Galaethol"
-
-#: kpat/kpat.desktop:2
-msgctxt "Name"
-msgid "KPatience"
-msgstr ""
-
-#: kpat/kpat.desktop:52
-msgctxt "GenericName"
-msgid "Patience Card Game"
-msgstr "Gêm Cerdiau Patience"
-
-#: kpat/themes/ancientegypt.desktop:2
-msgctxt "Name"
-msgid "Desert Sands"
-msgstr ""
-
-#: kpat/themes/cleangreen.desktop:2
-msgctxt "Name"
-msgid "Clean Green"
-msgstr ""
-
-#: kpat/themes/cleangreen.desktop:33
-msgctxt "Description"
-msgid "A simple green felt theme"
-msgstr ""
-
-#: kpat/themes/greenblaze.desktop:2
-msgctxt "Name"
-msgid "Green Blaze"
-msgstr ""
-
-#: kpat/themes/oldertheme.desktop:2
-msgctxt "Name"
-msgid "Older Theme"
-msgstr ""
-
-#: kpat/themes/oldertheme.desktop:34
-msgctxt "Description"
-msgid "An older, unnamed KPat theme."
-msgstr ""
-
-#: kreversi/kreversi.desktop:3
-msgctxt "Name"
-msgid "KReversi"
-msgstr "KReversi"
-
-#: kreversi/kreversi.desktop:70
-msgctxt "GenericName"
-msgid "Reversi Board Game"
-msgstr "Gêm Fwrdd Reversi"
-
-#: kreversi/pics/default_theme.desktop:3
-msgctxt "Name"
-msgid "KReversi Default Theme"
-msgstr ""
-
-#: kreversi/sounds/kreversi.notifyrc:3
-msgctxt "Comment"
-msgid "KReversi Game"
-msgstr ""
-
-#: kreversi/sounds/kreversi.notifyrc:390
-msgctxt "Name"
-msgid "Draw"
-msgstr "Arlunio"
-
-#: kreversi/sounds/kreversi.notifyrc:449
-msgctxt "Comment"
-msgid "Draw"
-msgstr "Arlunio"
-
-#: kreversi/sounds/kreversi.notifyrc:511
-msgctxt "Name"
-msgid "Illegal Move"
-msgstr "Symudiad Angyfreithlon"
-
-#: kreversi/sounds/kreversi.notifyrc:568
-msgctxt "Comment"
-msgid "Illegal move"
-msgstr "Symudiad angyfreithlon"
-
-#: kshisen/kshisen.desktop:5
-msgctxt "Name"
-msgid "Shisen-Sho"
-msgstr "Shisen-Sho"
-
-#: kshisen/kshisen.desktop:68
-msgctxt "GenericName"
-msgid "Shisen-Sho Mahjongg-like Tile Game"
-msgstr "Gêm Deiliau Shisen-Sho sy'n debyg i Mahjongg"
-
-#: ksirk/ksirk/ksirk.desktop:8
-msgctxt "Name"
-msgid "KsirK"
-msgstr ""
-
-#: ksirk/ksirk/ksirk.desktop:52
-msgctxt "GenericName"
-msgid "World Domination Strategy Game"
-msgstr ""
-
-#: ksirk/ksirkskineditor/ksirkskineditor.desktop:8
-msgctxt "Name"
-msgid "KsirK Skin Editor"
-msgstr ""
-
-#: ksirk/ksirkskineditor/ksirkskineditor.desktop:50
-msgctxt "GenericName"
-msgid "Skin Editor for the World Domination Strategy Game"
-msgstr ""
-
-#: kspaceduel/kspaceduel.desktop:2
-msgctxt "Name"
-msgid "KSpaceDuel"
-msgstr "KSpaceDuel"
-
-#: kspaceduel/kspaceduel.desktop:66
-msgctxt "GenericName"
-msgid "Space Arcade Game"
-msgstr "Gêm Arcêd Ofod"
-
-#: ksquares/src/ksquares.desktop:2
-msgctxt "Name"
-msgid "KSquares"
-msgstr ""
-
-#: ksquares/src/ksquares.desktop:56
-msgctxt "GenericName"
-msgid "Connect the dots to create squares"
-msgstr ""
-
-#: ksudoku/src/gui/ksudoku.desktop:2
-msgctxt "Name"
-msgid "KSudoku"
-msgstr ""
-
-#: ksudoku/src/gui/ksudoku.desktop:51
-msgctxt "GenericName"
-msgid "Sudoku Game"
-msgstr ""
-
-#: ksudoku/src/gui/ksudoku.desktop:100
-msgctxt "Comment"
-msgid "KSudoku, Sudoku game & more for KDE"
-msgstr ""
-
-#: ksudoku/src/shapes/4x4.desktop:2
-msgctxt "Name"
-msgid "4x4"
-msgstr ""
-
-#: ksudoku/src/shapes/4x4.desktop:57
-msgctxt "Description"
-msgid "4x4 shape puzzle"
-msgstr ""
-
-#: ksudoku/src/shapes/Jigsaw.desktop:2
-msgctxt "Name"
-msgid "Jigsaw"
-msgstr ""
-
-#: ksudoku/src/shapes/Jigsaw.desktop:51
-msgctxt "Description"
-msgid "Jigsaw shape puzzle"
-msgstr ""
-
-#: ksudoku/src/shapes/Samurai.desktop:2
-msgctxt "Name"
-msgid "Samurai"
-msgstr ""
-
-#: ksudoku/src/shapes/Samurai.desktop:52
-msgctxt "Description"
-msgid "Samurai shape puzzle"
-msgstr ""
-
-#: ksudoku/src/shapes/TinySamurai.desktop:2
-msgctxt "Name"
-msgid "Tiny Samurai"
-msgstr ""
-
-#: ksudoku/src/shapes/TinySamurai.desktop:51
-msgctxt "Description"
-msgid "A smaller samurai puzzle"
-msgstr ""
-
-#: ksudoku/src/shapes/XSudoku.desktop:2
-msgctxt "Name"
-msgid "XSudoku"
-msgstr ""
-
-#: ksudoku/src/shapes/XSudoku.desktop:51
-msgctxt "Description"
-msgid "XSudoku shape puzzle"
-msgstr ""
-
-#: ksudoku/src/themes/abstraction.desktop:2
-msgctxt "Name"
-msgid "Abstraction"
-msgstr ""
-
-#: ksudoku/src/themes/abstraction.desktop:37
-msgctxt "Description"
-msgid "A ksudoku theme with abstract artwork."
-msgstr ""
-
-#: ksudoku/src/themes/default.desktop:2
-msgctxt "Name"
-msgid "ksudoku_egyptian"
-msgstr ""
-
-#: ksudoku/src/themes/default.desktop:38
-msgctxt "Description"
-msgid "KSudoku egyptian style theme"
-msgstr ""
-
-#: ksudoku/src/themes/ksudoku_scrible.desktop:2
-msgctxt "Name"
-msgid "Scrible"
-msgstr ""
-
-#: ksudoku/src/themes/ksudoku_scrible.desktop:44
-msgctxt "Description"
-msgid "KSudoku Scrible theme for KDE 4"
-msgstr ""
-
-#: ktron/kdesnake.desktop:6
-msgctxt "GenericName"
-msgid "Snake-like Game"
-msgstr ""
-
-#: ktron/kdesnake.desktop:47
-msgctxt "Name"
-msgid "KSnake"
-msgstr ""
-
-#: ktron/ktron.desktop:7
-msgctxt "Name"
-msgid "KSnakeDuel"
-msgstr ""
-
-#: ktron/themes/default.desktop:3
-msgctxt "Name"
-msgid "Default Theme"
-msgstr ""
-
-#: ktron/themes/default.desktop:32
-msgctxt "Description"
-msgid "Default theme."
-msgstr ""
-
-#: ktron/themes/neon.desktop:3
-msgctxt "Name"
-msgid "Neon"
-msgstr ""
-
-#: ktron/themes/neon.desktop:31
-msgctxt "Description"
-msgid "A retro theme with a distinctive touch of early 50s."
-msgstr ""
-
-#: ktuberling/ktuberling.desktop:3 ktuberling/pics/default_theme.desktop:2
-msgctxt "Name"
-msgid "Potato Guy"
-msgstr "Potato Guy"
-
-#: ktuberling/ktuberling.desktop:67
-msgctxt "GenericName"
-msgid "Picture Game for Children"
-msgstr ""
-
-#: ktuberling/pics/butterflies.desktop:2
-msgctxt "Name"
-msgid "Butterflies"
-msgstr ""
-
-#: ktuberling/pics/christmas.desktop:2
-msgctxt "Name"
-msgid "Christmas"
-msgstr ""
-
-#: ktuberling/pics/egypt.desktop:2
-msgctxt "Name"
-msgid "Ancient Egypt"
-msgstr ""
-
-#: ktuberling/pics/moon.desktop:2
-msgctxt "Name"
-msgid "The Moon"
-msgstr ""
-
-#: ktuberling/pics/pizzeria.desktop:2
-msgctxt "Name"
-msgid "Pizzeria"
-msgstr ""
-
-#: ktuberling/pics/potato-game.desktop:2
-msgctxt "Name"
-msgid "Potato Guy 2"
-msgstr ""
-
-#: ktuberling/pics/robin-tux.desktop:2
-msgctxt "Name"
-msgid "Robin Tux"
-msgstr ""
-
-#: ktuberling/pics/robot_workshop.desktop:2
-msgctxt "Name"
-msgid "Robot workshop"
-msgstr ""
-
-#: ktuberling/pics/train_valley.desktop:2
-msgctxt "Name"
-msgid "Train Valley"
-msgstr ""
-
-#: kubrick/src/kubrick.desktop:2
-msgctxt "Name"
-msgid "Kubrick"
-msgstr ""
-
-#: kubrick/src/kubrick.desktop:53
-msgctxt "GenericName"
-msgid "3-D Game based on Rubik's Cube"
-msgstr ""
-
-#: kubrick/src/kubrick.desktop:94
-msgctxt "Comment"
-msgid "A 3-D game based on Rubik's Cube"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck1.desktop:2
-msgctxt "Name"
-msgid "Classic Blue"
-msgstr "Glas Clasurol"
-
-#: libkdegames/carddecks/decks/deck10.desktop:2
-#: libkdegames/carddecks/svg-gm-paris/index.desktop:2
-msgctxt "Name"
-msgid "Paris"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck10.desktop:43
-msgctxt "Comment"
-msgid "Classic"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck11.desktop:2
-#: libkdegames/carddecks/svg-oxygen-white/index.desktop:2
-msgctxt "Name"
-msgid "Oxygen White"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck11.desktop:40
-#: libkdegames/carddecks/decks/deck13.desktop:53
-msgctxt "Comment"
-msgid "SVG Oxygen"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck12.desktop:2
-#: libkdegames/carddecks/svg-jolly-royal/index.desktop:2
-msgctxt "Name"
-msgid "Jolly Royal"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck12.desktop:39
-#: libkdegames/carddecks/svg-jolly-royal/index.desktop:39
-msgctxt "Comment"
-msgid "A clean and easy style with a distinctively royal touch."
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck14.desktop:2
-msgctxt "Name"
-msgid "Diamond Tree"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck14.desktop:41
-msgctxt "Comment"
-msgid "Simple, yet visually pleasing card back"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck14.desktop:80
-msgctxt "Comment"
-msgid "Simple, yet visually pleasing card back."
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck15.desktop:2
-#: libkdegames/carddecks/svg-ancient-egyptians/index.desktop:2
-#: libkmahjongg/tilesets/egypt.desktop:2
-msgctxt "Name"
-msgid "Ancient Egyptians"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck15.desktop:41
-msgctxt "Comment"
-msgid "Egyptian style card back."
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck16.desktop:45
-msgctxt "Comment"
-msgid "Futuristic, minimal card design."
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck17.desktop:2
-msgctxt "Name"
-msgid "Ancient Egyptians Dark"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck17.desktop:38
-msgctxt "Comment"
-msgid "Egyptian dark style card back."
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck18.desktop:2
-#: libkdegames/carddecks/svg-tigullio-international/index.desktop:2
-msgctxt "Name"
-msgid "Tigullio International"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck2.desktop:2
-msgctxt "Name"
-msgid "Classic Red"
-msgstr "Coch Clasurol"
-
-#: libkdegames/carddecks/decks/deck3.desktop:2
-msgctxt "Name"
-msgid "Penguin"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck4.desktop:2
-msgctxt "Name"
-msgid "Tristan"
-msgstr "Tristan"
-
-#: libkdegames/carddecks/decks/deck5.desktop:2
-msgctxt "Name"
-msgid "Grandma"
-msgstr "Nain"
-
-#: libkdegames/carddecks/decks/deck6.desktop:2
-msgctxt "Name"
-msgid "Modern Red"
-msgstr "Coch Cyfoes"
-
-#: libkdegames/carddecks/decks/deck7.desktop:2
-#: libkdegames/carddecks/svg-konqi-modern/index.desktop:2
-msgctxt "Name"
-msgid "Konqi"
-msgstr "Konqi"
-
-#: libkdegames/carddecks/decks/deck7.desktop:68
-msgctxt "Comment"
-msgid ""
-"Modern Konqi - play the family carddeck\\nDesign: Laura Layland\\n     "
-"<l_layland@hotmail.com>\\nKonqi by Stefan Spatz\\n     <stefan.spatz@stud-"
-"mail.uni-wuerzburg.de>"
-msgstr ""
-"Set cerdiau cyfoes Konqi - chwarae yn erbyn y teulu\\nDylunio:Laura Layland\\"
-"n <l_layland@hotmail.com>\\nKonqi gan Stefan Spatz\\n <stefan.spatz@stud-"
-"mail.uni-wuerzburg.de>"
-
-#: libkdegames/carddecks/decks/deck8.desktop:2
-#: libkdegames/carddecks/svg-dondorf/index.desktop:2
-msgctxt "Name"
-msgid "Dondorf"
-msgstr "Dondorf"
-
-#: libkdegames/carddecks/decks/deck8.desktop:56
-msgctxt "Comment"
-msgid "SVG Dondorf"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck9.desktop:2
-#: libkdegames/carddecks/svg-nicu-ornamental/index.desktop:2
-msgctxt "Name"
-msgid "Nicu Ornamental"
-msgstr ""
-
-#: libkdegames/carddecks/decks/deck9.desktop:39
-msgctxt "Comment"
-msgid "SVG Ornamental"
-msgstr ""
-
-#: libkdegames/carddecks/svg-ancient-egyptians/index.desktop:41
-msgctxt "Comment"
-msgid "An ancient Egyptian card deck."
-msgstr ""
-
-#: libkdegames/carddecks/svg-future/index.desktop:2
-msgctxt "Name"
-msgid "Future Simple"
-msgstr ""
-
-#: libkdegames/carddecks/svg-nicu-white/index.desktop:2
-msgctxt "Name"
-msgid "Nicu White"
-msgstr ""
-
-#: libkdegames/carddecks/svg-oxygen-air/index.desktop:2
-msgctxt "Name"
-msgid "Oxygen Air"
-msgstr ""
-
-#: libkdegames/carddecks/svg-penguins/index.desktop:2
-msgctxt "Name"
-msgid "Penguins"
-msgstr ""
-
-#: libkdegames/carddecks/svg-standard/index.desktop:2
-msgctxt "Name"
-msgid "Standard"
-msgstr ""
-
-#: libkdegames/carddecks/svg-standard/index.desktop:47
-msgctxt "Comment"
-msgid "Standard KDE card set\\nGPL license"
-msgstr "Trwydded GPL safonol\\nar gyfer set cerdiau KDE"
-
-#: libkdegames/carddecks/svg-xskat-french/index.desktop:2
-msgctxt "Name"
-msgid "XSkat French"
-msgstr "XSkat Ffrangeg"
-
-#: libkdegames/carddecks/svg-xskat-german/index.desktop:2
-msgctxt "Name"
-msgid "XSkat German"
-msgstr "XSkat Almaeneg"
-
-#: libkdegames/digits/themes/fourteen-segment-sample.desktop:3
-msgctxt "Name"
-msgid "Fourteen Segment Sample"
-msgstr ""
-
-#: libkdegames/digits/themes/fourteen-segment-sample.desktop:44
-msgctxt "Comment"
-msgid ""
-"This file holds metadata, configuration settings, and the mappings "
-"controlling which segments are on or off for the theme fourteen-segment-"
-"sample.svg"
-msgstr ""
-
-#: libkdegames/digits/themes/individual-digit-sample.desktop:3
-msgctxt "Name"
-msgid "Individual Digit Sample"
-msgstr ""
-
-#: libkdegames/digits/themes/individual-digit-sample.desktop:43
-msgctxt "Comment"
-msgid ""
-"This file holds metadata, configuration settings, and the mappings between "
-"digit's and id's for the theme individual-digit-sample.svg"
-msgstr ""
-
-#: libkmahjongg/backgrounds/chinese_landscape.desktop:2
-msgctxt "Name"
-msgid "Chinese Landscape"
-msgstr ""
-
-#: libkmahjongg/backgrounds/chinese_landscape.desktop:53
-msgctxt "Description"
-msgid "Chinese landscape with mountains and a waterfall"
-msgstr ""
-
-#: libkmahjongg/backgrounds/color_plain.desktop:2
-msgctxt "Name"
-msgid "Plain Color"
-msgstr ""
-
-#: libkmahjongg/backgrounds/color_plain.desktop:52
-msgctxt "Description"
-msgid "Use the default window background color."
-msgstr ""
-
-#: libkmahjongg/backgrounds/default.desktop:43
-msgctxt "Description"
-msgid "A Egyptian style background"
-msgstr ""
-
-#: libkmahjongg/backgrounds/default_old.desktop:57
-msgctxt "Description"
-msgid "A green background with light geometric patterns"
-msgstr ""
-
-#: libkmahjongg/backgrounds/summerfield.desktop:2
-msgctxt "Name"
-msgid "Summer Field"
-msgstr ""
-
-#: libkmahjongg/backgrounds/summerfield.desktop:47
-msgctxt "Description"
-msgid "The Summertime Greens"
-msgstr ""
-
-#: libkmahjongg/backgrounds/wood_light.desktop:2
-msgctxt "Name"
-msgid "Light Wood"
-msgstr ""
-
-#: libkmahjongg/backgrounds/wood_light.desktop:51
-msgctxt "Description"
-msgid "Resembles the surface of a wood table"
-msgstr ""
-
-#: libkmahjongg/tilesets/alphabet.desktop:2
-msgctxt "Name"
-msgid "Alphabet"
-msgstr ""
-
-#: libkmahjongg/tilesets/alphabet.desktop:53
-msgctxt "Description"
-msgid "A colorful tileset designed for kids of all ages."
-msgstr ""
-
-#: libkmahjongg/tilesets/bamboo.desktop:2
-msgctxt "Name"
-msgid "Bamboo"
-msgstr ""
-
-#: libkmahjongg/tilesets/bamboo.desktop:39
-msgctxt "Description"
-msgid "Japanese tileset with brightly-colored kanji on a soft woodgrain"
-msgstr ""
-
-#: libkmahjongg/tilesets/classic.desktop:55
-msgctxt "Description"
-msgid "Chinese tileset, inspired by the classic version shipped with KDE 3"
-msgstr ""
-
-#: libkmahjongg/tilesets/default.desktop:57
-msgctxt "Description"
-msgid "Art inspired by real Japanese Mahjongg tiles"
-msgstr ""
-
-#: libkmahjongg/tilesets/jade.desktop:2
-msgctxt "Name"
-msgid "Imperial Jade"
-msgstr ""
-
-#: libkmahjongg/tilesets/traditional.desktop:2
-msgctxt "Name"
-msgid "Traditional"
-msgstr ""
-
-#: libkmahjongg/tilesets/traditional.desktop:52
-msgctxt "Description"
-msgid "Americanized tiles inspired by Japanese Mahjongg tiles"
-msgstr ""
-
-#: lskat/grafix/blue.desktop:2
-msgctxt "Name"
-msgid "Green Blase"
-msgstr ""
-
-#: lskat/lskat.desktop:2
-msgctxt "Name"
-msgid "LSkat"
-msgstr ""
-
-#: lskat/lskat.desktop:53
-msgctxt "GenericName"
-msgid "Card Game"
-msgstr "Gêm Cerdiau"
-
-#: palapeli/libpala/libpala-slicerplugin.desktop:5
-msgctxt "Comment"
-msgid "Slicer plugin for libpala, the base library of Palapeli"
-msgstr ""
-
-#: palapeli/mime/palapeli_servicemenu.desktop:11
-msgctxt "Name"
-msgid "Import into your Palapeli puzzle collection"
-msgstr ""
-
-#: palapeli/mime/palathumbcreator.desktop:4
-msgctxt "Name"
-msgid "Palapeli puzzles"
-msgstr ""
-
-#: palapeli/puzzles/castle-maintenon.desktop:2
-msgctxt "Name"
-msgid "Castle of Maintenon"
-msgstr ""
-
-#: palapeli/puzzles/castle-maintenon.desktop:35
-msgctxt "Comment"
-msgid "Eure-et-Loir département, France"
-msgstr ""
-
-#: palapeli/puzzles/cincinnati-bridge.desktop:2
-msgctxt "Name"
-msgid "Roebling Suspension Bridge"
-msgstr ""
-
-#: palapeli/puzzles/cincinnati-bridge.desktop:36
-msgctxt "Comment"
-msgid "in Cincinnati"
-msgstr ""
-
-#: palapeli/puzzles/citrus-fruits.desktop:2
-msgctxt "Name"
-msgid "Citrus Fruits"
-msgstr ""
-
-#: palapeli/puzzles/european-honey-bee.desktop:2
-msgctxt "Name"
-msgid "European Honey Bee"
-msgstr ""
-
-#: palapeli/puzzles/panther-chameleon-female.desktop:2
-msgctxt "Name"
-msgid "Furcifer pardalis"
-msgstr ""
-
-#: palapeli/puzzles/panther-chameleon-female.desktop:34
-msgctxt "Comment"
-msgid "Female panther chameleon"
-msgstr ""
-
-#: palapeli/slicers/palapeli_goldbergslicer.desktop:15
-msgctxt "Name"
-msgid "Palapeli Slicer Collection"
-msgstr ""
-
-#: palapeli/slicers/palapeli_goldbergslicer.desktop:41
-msgctxt "Comment"
-msgid "Formerly known as Goldberg Slicer"
-msgstr ""
-
-#: palapeli/slicers/palapeli_jigsawslicer.desktop:15
-msgctxt "Name"
-msgid "Classic jigsaw pieces"
-msgstr ""
-
-#: palapeli/slicers/palapeli_rectslicer.desktop:15
-msgctxt "Name"
-msgid "Rectangular pieces"
-msgstr ""
-
-#: palapeli/src/palapeli.desktop:4
-msgctxt "Name"
-msgid "Palapeli"
-msgstr ""
-
-#: palapeli/src/palapeli.desktop:39
-msgctxt "GenericName"
-msgid "Jigsaw puzzle game"
-msgstr ""
-
-#: palapeli/src/palapeli.notifyrc:2
-msgctxt "Comment"
-msgid "Palapeli Jigsaw Puzzle"
-msgstr ""
-
-#: palapeli/src/palapeli.notifyrc:37
-msgctxt "Name"
-msgid "File management operations"
-msgstr ""
-
-#: palapeli/src/palapeli.notifyrc:71
-msgctxt "Name"
-msgid "Importing puzzle"
-msgstr ""
-
-#: palapeli/src/palapeli.notifyrc:105
-msgctxt "Comment"
-msgid "A puzzle is being imported into the local puzzle collection"
-msgstr ""
-
-#: kolf/courses/Easy.kolf:2
-msgctxt "Name"
-msgid "Easy Course"
-msgstr ""
-
-#: kolf/courses/Easy.kolf:616
-msgctxt "Comment"
-msgid "Hit slowly..."
-msgstr ""
-
-#: kolf/courses/Hard.kolf:2
-msgctxt "Name"
-msgid "Hard Course"
-msgstr ""
-
-#: kolf/courses/Hard.kolf:1112
-msgctxt "Comment"
-msgid "Let the floaters <strong>push</strong> you!"
-msgstr ""
-
-#: kolf/courses/Impossible:2
-msgctxt "Name"
-msgid "Impossible Course"
-msgstr ""
-
-#: kolf/courses/Impossible:830
-msgctxt "Comment"
-msgid "Reprieve"
-msgstr ""
-
-#: kolf/courses/Impossible:1582
-msgctxt "Comment"
-msgid "Luck"
-msgstr ""
-
-#: kolf/courses/Impossible:3395
-msgctxt "Comment"
-msgid "Chaos"
-msgstr ""
-
-#: kolf/courses/Medium.kolf:2
-msgctxt "Name"
-msgid "Medium Course"
-msgstr ""
-
-#: kolf/courses/Practice:2
-msgctxt "Name"
-msgid "Slope Practise"
-msgstr ""
-
-#: kolf/courses/ReallyEasy:2
-msgctxt "Name"
-msgid "Really Easy"
-msgstr ""
-
-#: kolf/courses/USApro:2
-msgctxt "Name"
-msgid "USA Pro"
-msgstr ""
-
-#: kolf/courses/USApro:90
-msgctxt "Comment"
-msgid "Daytona Beach, FL"
-msgstr ""
-
-#: kolf/courses/USApro:318
-msgctxt "Comment"
-msgid "Washington DC (Pentagon)"
-msgstr ""
-
-#: kolf/courses/USApro:511
-msgctxt "Comment"
-msgid "Palm Springs, CO"
-msgstr ""
-
-#: kolf/courses/USApro:707
-msgctxt "Comment"
-msgid "Las Vegas, NV"
-msgstr ""
-
-#: kolf/courses/USApro:902 kolf/courses/USApro:1564
-msgctxt "Comment"
-msgid "San Francisco, CA"
-msgstr ""
-
-#: kolf/courses/USApro:1029
-msgctxt "Comment"
-msgid "Grand Canyon"
-msgstr ""
-
-#: kolf/courses/USApro:1185
-msgctxt "Comment"
-msgid "Lake Tahoe, CA/NV"
-msgstr ""
-
-#: kolf/courses/USApro:1368
-msgctxt "Comment"
-msgid "Florida Keys, FL"
-msgstr ""
-
-#: kolf/courses/USApro:1757
-msgctxt "Comment"
-msgid "Washington DC"
-msgstr ""
-
-#: kolf/courses/USApro:2017
-msgctxt "Comment"
-msgid "Niagara Falls, NY"
-msgstr ""
-
-#: kolf/tutorial.kolf:2
-msgctxt "Name"
-msgid "Tutorial Course"
-msgstr ""
-
-#: kolf/tutorial.kolf:63
-msgctxt "Comment"
-msgid "<h3>Welcome</h3> to the tutorial course for Kolf!"
-msgstr ""
-
-#: kolf/tutorial.kolf:112
-msgctxt "Comment"
-msgid ""
-"To hit the ball, press and hold the Down Arrow or left mouse button. How "
-"long you hold down the mouse button or key determines strength of the shot."
-msgstr ""
-
-#: kolf/tutorial.kolf:159
-msgctxt "Comment"
-msgid ""
-"To aim the putter, press the Left (rotate counterclockwise) and Right "
-"(rotate clockwise) Arrow keys or use the mouse."
-msgstr ""
-
-#: kolf/tutorial.kolf:259
-msgctxt "Comment"
-msgid ""
-"<h3>Bridges</h3>Bridges can have walls on the top, bottom, left, or right."
-msgstr ""
-
-#: kolf/tutorial.kolf:372
-msgctxt "Comment"
-msgid ""
-"<h3>Everything</h3>Here's a hole that has it all. Have fun with "
-"Kolf!<br><center>-- Jason Katz-Brown</center>"
-msgstr ""
-
-#: kolf/tutorial.kolf:476
-msgctxt "Comment"
-msgid ""
-"<h3>Slopes</h3>Slopes are slanted areas of ground that push the ball in the "
-"direction that they slope. This direction is shown when you choose <u>Hole-"
-">Show Info</u>."
-msgstr ""
-
-#: kolf/tutorial.kolf:522
-msgctxt "Comment"
-msgid "Hit the ball onto the slope and let it roll into cup."
-msgstr ""
-
-#: kolf/tutorial.kolf:587
-msgctxt "Comment"
-msgid "Try out these different types of slopes."
-msgstr ""
-
-#: kolf/tutorial.kolf:717
-msgctxt "Comment"
-msgid ""
-"The steepness of a slope is shown when you choose <u>Hole->Show Info</u>. "
-"Steepness goes from 8 (steepest) to 1 (shallowest)."
-msgstr ""
-
-#: kolf/tutorial.kolf:791
-msgctxt "Comment"
-msgid "<h3>Walls</h3>Bounce the ball off of the red walls."
-msgstr ""
-
-#: kolf/tutorial.kolf:890
-msgctxt "Comment"
-msgid "<h3>Sand</h3>Sand is yellow, and slows your ball down."
-msgstr ""
-
-#: kolf/tutorial.kolf:936
-msgctxt "Comment"
-msgid ""
-"<h3>Puddles (Water)</h3>Hitting into a puddle (blue) adds a penalty stroke "
-"to your score, and your ball is placed outside the puddle."
-msgstr ""
-
-#: kolf/tutorial.kolf:997
-msgctxt "Comment"
-msgid ""
-"<h3>Windmills</h3>Windmills (brown base with moving arm) have brown walls "
-"(or half walls). The speed of the windmill arm may vary for each hole."
-msgstr ""
-
-#: kolf/tutorial.kolf:1069
-msgctxt "Comment"
-msgid ""
-"<h3>Black Holes</h3>Black Holes transport the ball to their exit, and eject "
-"it at a speed in direct relation to the speed your ball was traveling. "
-"Choose <u>Hole->Show Info</u> to see which Black Hole goes to which exit and "
-"the direction the ball will come out."
-msgstr ""
-
-#: kolf/tutorial.kolf:1144
-msgctxt "Comment"
-msgid ""
-"<h3>Floaters</h3>Floaters are moving platforms that carry a ball that lands "
-"on it. Floaters' speeds vary."
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdelibs.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdelibs.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdelibs.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdelibs.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1618 +0,0 @@
-# Cyfieithiad o desktop_kdelibs.po i Cymraeg
-# Translation of desktop_kdelibs.po to Cymraeg
-# translation of desktop_kdelibs.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# Kgyfieithu <kyfieithu@dotmon.com>, 2003.
-# KGyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
-# Kevin Donnelly <kevin@dotmon.com>, 2005.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdelibs\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
-"PO-Revision-Date: 2009-07-18 17:36+0000\n"
-"Last-Translator: Kevin Donnelly <Unknown>\n"
-"Language-Team: Cymraeg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: interfaces/kimproxy/interface/dbusinstantmessenger.desktop:4
-msgctxt "Comment"
-msgid "Instant Messenger with a D-Bus interface"
-msgstr ""
-
-#: interfaces/kimproxy/interface/kcm_instantmessenger.desktop:2
-msgctxt "Name|standard desktop component"
-msgid "Instant Messenger"
-msgstr ""
-
-#: interfaces/kimproxy/interface/kcm_instantmessenger.desktop:68
-msgctxt "Comment"
-msgid ""
-"The instant messenger allows two-way chat between individuals and groups."
-msgstr ""
-"Mae'r negesydd chwim yn caniatàu sgwrs dwy-ffordd rhwng unigolion a grwpiau."
-
-#: interfaces/kspeech/dbustexttospeech.desktop:4
-msgctxt "Comment"
-msgid "Text-to-Speech Service with a D-Bus interface"
-msgstr ""
-
-#: interfaces/ktexteditor/kcm_ktexteditor.desktop:2
-msgctxt "Name|standard desktop component"
-msgid "Embedded Text Editor"
-msgstr ""
-
-#: interfaces/ktexteditor/kcm_ktexteditor.desktop:67
-msgctxt "Comment"
-msgid ""
-"The text editor service provides applications with a text viewer and editor. "
-"KDE applications that provide text editing facilities should use this "
-"service."
-msgstr ""
-"Mae'r gwasanaeth golygu testun yn darparu gwelydd testun a golygydd i "
-"gymhwysiadau.  dylai cymhwysiadau KDE sy'n darparu galluoedd golygu testun "
-"ddefnyddio'r gwasanaeth yma."
-
-#: interfaces/ktexteditor/ktexteditor.desktop:5
-msgctxt "Comment"
-msgid "Embeddable Text Editor Component (with Doc/View Separation)"
-msgstr "Cydran Golygydd Testun Mewnadeiladwy (wrth Wahanu Dogfen/Golwg)"
-
-#: interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop:5
-msgctxt "Comment"
-msgid "KTextEditor load/save filter/check plugin"
-msgstr ""
-
-#: interfaces/ktexteditor/ktexteditorplugin.desktop:5
-msgctxt "Comment"
-msgid "KTextEditor Plugin"
-msgstr "Atodyn KTextEditor"
-
-#: kdecore/config/kconfigbackend.desktop:5
-msgctxt "Comment"
-msgid "Storage backend for KConfig"
-msgstr ""
-
-#: kdecore/all_languages.desktop:2
-msgctxt "Name"
-msgid "Afar"
-msgstr "Afareg"
-
-#: kdecore/all_languages.desktop:96
-msgctxt "Name"
-msgid "Abkhazian"
-msgstr "Abkhazeg"
-
-#: kdecore/all_languages.desktop:190
-msgctxt "Name"
-msgid "Avestan"
-msgstr "Afestaneg"
-
-#: kdecore/all_languages.desktop:283
-msgctxt "Name"
-msgid "Afrikaans"
-msgstr "Affricaneg"
-
-#: kdecore/all_languages.desktop:377
-msgctxt "Name"
-msgid "Amharic"
-msgstr "Amhareg"
-
-#: kdecore/all_languages.desktop:471
-msgctxt "Name"
-msgid "Arabic"
-msgstr "Arabeg"
-
-#: kdecore/all_languages.desktop:566
-msgctxt "Name"
-msgid "Assamese"
-msgstr "Assameg"
-
-#: kdecore/all_languages.desktop:660
-msgctxt "Name"
-msgid "Asturian"
-msgstr ""
-
-#: kdecore/all_languages.desktop:719
-msgctxt "Name"
-msgid "Aymara"
-msgstr "Aimareg"
-
-#: kdecore/all_languages.desktop:813
-msgctxt "Name"
-msgid "Azerbaijani"
-msgstr "Azerbaijaneg"
-
-#: kdecore/all_languages.desktop:908
-msgctxt "Name"
-msgid "Bashkir"
-msgstr "Bashkireg"
-
-#: kdecore/all_languages.desktop:1002
-msgctxt "Name"
-msgid "Belarusian"
-msgstr "Belarwsieg"
-
-#: kdecore/all_languages.desktop:1096
-msgctxt "Name"
-msgid "Belarusian (Latin)"
-msgstr ""
-
-#: kdecore/all_languages.desktop:1171
-msgctxt "Name"
-msgid "Bulgarian"
-msgstr "Bwlgareg"
-
-#: kdecore/all_languages.desktop:1265
-msgctxt "Name"
-msgid "Bihari"
-msgstr "Bihareg"
-
-#: kdecore/all_languages.desktop:1359
-msgctxt "Name"
-msgid "Bislama"
-msgstr "Bislameg"
-
-#: kdecore/all_languages.desktop:1453
-msgctxt "Name"
-msgid "Bengali"
-msgstr "Bengaleg"
-
-#: kdecore/all_languages.desktop:1547
-msgctxt "Name"
-msgid "Bengali (India)"
-msgstr ""
-
-#: kdecore/all_languages.desktop:1629
-msgctxt "Name"
-msgid "Tibetan"
-msgstr "Tibeteg"
-
-#: kdecore/all_languages.desktop:1723
-msgctxt "Name"
-msgid "Breton"
-msgstr "Llydaweg"
-
-#: kdecore/all_languages.desktop:1817
-msgctxt "Name"
-msgid "Bosnian"
-msgstr "Bosneg"
-
-#: kdecore/all_languages.desktop:1911
-msgctxt "Name"
-msgid "Catalan"
-msgstr "Catalaneg"
-
-#: kdecore/all_languages.desktop:2005
-msgctxt "Name"
-msgid "Catalan (Valencian)"
-msgstr ""
-
-#: kdecore/all_languages.desktop:2060
-msgctxt "Name"
-msgid "Chechen"
-msgstr "Checheneg"
-
-#: kdecore/all_languages.desktop:2154
-msgctxt "Name"
-msgid "Chamorro"
-msgstr "Chamorreg"
-
-#: kdecore/all_languages.desktop:2248
-msgctxt "Name"
-msgid "Corsican"
-msgstr "Corsiceg"
-
-#: kdecore/all_languages.desktop:2342
-msgctxt "Name"
-msgid "Crimean Tatar"
-msgstr ""
-
-#: kdecore/all_languages.desktop:2419
-msgctxt "Name"
-msgid "Czech"
-msgstr "Tsiec"
-
-#: kdecore/all_languages.desktop:2513
-msgctxt "Name"
-msgid "Kashubian"
-msgstr ""
-
-#: kdecore/all_languages.desktop:2594
-msgctxt "Name"
-msgid "Church Slavic"
-msgstr "Slaveg Eglwysol"
-
-#: kdecore/all_languages.desktop:2687
-msgctxt "Name"
-msgid "Chuvash"
-msgstr "Chuvasheg"
-
-#: kdecore/all_languages.desktop:2781
-msgctxt "Name"
-msgid "Welsh"
-msgstr "Cymraeg"
-
-#: kdecore/all_languages.desktop:2875
-msgctxt "Name"
-msgid "Danish"
-msgstr "Daneg"
-
-#: kdecore/all_languages.desktop:2969
-msgctxt "Name"
-msgid "German"
-msgstr "Almaeneg"
-
-#: kdecore/all_languages.desktop:3064
-msgctxt "Name"
-msgid "Lower Sorbian"
-msgstr ""
-
-#: kdecore/all_languages.desktop:3138
-msgctxt "Name"
-msgid "Dzongkha"
-msgstr "Dzongkhaeg"
-
-#: kdecore/all_languages.desktop:3231
-msgctxt "Name"
-msgid "Greek"
-msgstr "Groeg"
-
-#: kdecore/all_languages.desktop:3326
-msgctxt "Name"
-msgid "English"
-msgstr "Saesneg"
-
-#: kdecore/all_languages.desktop:3421
-msgctxt "Name"
-msgid "British English"
-msgstr "Saesneg Prydain"
-
-#: kdecore/all_languages.desktop:3515
-msgctxt "Name"
-msgid "American English"
-msgstr ""
-
-#: kdecore/all_languages.desktop:3608
-msgctxt "Name"
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: kdecore/all_languages.desktop:3703
-msgctxt "Name"
-msgid "Spanish"
-msgstr "Sbaeneg"
-
-#: kdecore/all_languages.desktop:3798
-msgctxt "Name"
-msgid "Estonian"
-msgstr "Estoneg"
-
-#: kdecore/all_languages.desktop:3893
-msgctxt "Name"
-msgid "Basque"
-msgstr "Basgeg"
-
-#: kdecore/all_languages.desktop:3987
-msgctxt "Name"
-msgid "Farsi (Persian)"
-msgstr "Farsi (Perseg)"
-
-#: kdecore/all_languages.desktop:4079
-msgctxt "Name"
-msgid "Finnish"
-msgstr "Ffineg"
-
-#: kdecore/all_languages.desktop:4174
-msgctxt "Name"
-msgid "Fijian"
-msgstr "Fijieg"
-
-#: kdecore/all_languages.desktop:4268
-msgctxt "Name"
-msgid "Faroese"
-msgstr "Faroeg"
-
-#: kdecore/all_languages.desktop:4361
-msgctxt "Name"
-msgid "French"
-msgstr "Frangeg"
-
-#: kdecore/all_languages.desktop:4456
-msgctxt "Name"
-msgid "Frisian"
-msgstr "Frisieg"
-
-#: kdecore/all_languages.desktop:4550
-msgctxt "Name"
-msgid "Irish Gaelic"
-msgstr ""
-
-#: kdecore/all_languages.desktop:4637
-msgctxt "Name"
-msgid "Gaelic"
-msgstr "Gaeleg"
-
-#: kdecore/all_languages.desktop:4731
-msgctxt "Name"
-msgid "Galician"
-msgstr "Galiseg"
-
-#: kdecore/all_languages.desktop:4824
-msgctxt "Name"
-msgid "Guarani"
-msgstr "Guarani"
-
-#: kdecore/all_languages.desktop:4918
-msgctxt "Name"
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: kdecore/all_languages.desktop:5012
-msgctxt "Name"
-msgid "Manx"
-msgstr "Manneg"
-
-#: kdecore/all_languages.desktop:5105
-msgctxt "Name"
-msgid "Hausa"
-msgstr "Hausa"
-
-#: kdecore/all_languages.desktop:5199
-msgctxt "Name"
-msgid "Hebrew"
-msgstr "Iddeweg"
-
-#: kdecore/all_languages.desktop:5293
-msgctxt "Name"
-msgid "Hindi"
-msgstr "Hindw^"
-
-#: kdecore/all_languages.desktop:5388
-msgctxt "Name"
-msgid "Chhattisgarhi"
-msgstr ""
-
-#: kdecore/all_languages.desktop:5451
-msgctxt "Name"
-msgid "Hiri Motu"
-msgstr "Hiri Motu"
-
-#: kdecore/all_languages.desktop:5545
-msgctxt "Name"
-msgid "Croatian"
-msgstr "Croatieg"
-
-#: kdecore/all_languages.desktop:5639
-msgctxt "Name"
-msgid "Upper Sorbian"
-msgstr "Sorbieg Uchaf"
-
-#: kdecore/all_languages.desktop:5730
-msgctxt "Name"
-msgid "Hungarian"
-msgstr "Hwngareg"
-
-#: kdecore/all_languages.desktop:5824
-msgctxt "Name"
-msgid "Armenian"
-msgstr "Armeineg"
-
-#: kdecore/all_languages.desktop:5919
-msgctxt "Name"
-msgid "Herero"
-msgstr "Hausa"
-
-#: kdecore/all_languages.desktop:6013
-msgctxt "Name"
-msgid "Interlingua"
-msgstr "Interlingua"
-
-#: kdecore/all_languages.desktop:6106
-msgctxt "Name"
-msgid "Indonesian"
-msgstr "Indonesieg"
-
-#: kdecore/all_languages.desktop:6200
-msgctxt "Name"
-msgid "Interlingue"
-msgstr "Interlingue"
-
-#: kdecore/all_languages.desktop:6292
-msgctxt "Name"
-msgid "Inupiaq"
-msgstr "Inupiaq"
-
-#: kdecore/all_languages.desktop:6385
-msgctxt "Name"
-msgid "Ido"
-msgstr "Ido"
-
-#: kdecore/all_languages.desktop:6479
-msgctxt "Name"
-msgid "Icelandic"
-msgstr "Islandeg"
-
-#: kdecore/all_languages.desktop:6573
-msgctxt "Name"
-msgid "Italian"
-msgstr "Eidaleg"
-
-#: kdecore/all_languages.desktop:6668
-msgctxt "Name"
-msgid "Inuktitut"
-msgstr "Inuktitut"
-
-#: kdecore/all_languages.desktop:6761
-msgctxt "Name"
-msgid "Japanese"
-msgstr "Japaneg"
-
-#: kdecore/all_languages.desktop:6855
-msgctxt "Name"
-msgid "Javanese"
-msgstr "Javaneg"
-
-#: kdecore/all_languages.desktop:6949
-msgctxt "Name"
-msgid "Georgian"
-msgstr "Georgeg"
-
-#: kdecore/all_languages.desktop:7043
-msgctxt "Name"
-msgid "Kikuyu"
-msgstr "Kikuyu"
-
-#: kdecore/all_languages.desktop:7137
-msgctxt "Name"
-msgid "Kazakh"
-msgstr "Kazakh"
-
-#: kdecore/all_languages.desktop:7231
-msgctxt "Name"
-msgid "Kalaallisut"
-msgstr "Kalaallisut"
-
-#: kdecore/all_languages.desktop:7323
-msgctxt "Name"
-msgid "Khmer"
-msgstr "Khmer"
-
-#: kdecore/all_languages.desktop:7417
-msgctxt "Name"
-msgid "Kannada"
-msgstr "Kannada"
-
-#: kdecore/all_languages.desktop:7511
-msgctxt "Name"
-msgid "Korean"
-msgstr "Koreëg"
-
-#: kdecore/all_languages.desktop:7605
-msgctxt "Name"
-msgid "Kashmiri"
-msgstr "Kashmiri"
-
-#: kdecore/all_languages.desktop:7699
-msgctxt "Name"
-msgid "Kurdish"
-msgstr "Kwrdeg"
-
-#: kdecore/all_languages.desktop:7793
-msgctxt "Name"
-msgid "Komi"
-msgstr "Komi"
-
-#: kdecore/all_languages.desktop:7887
-msgctxt "Name"
-msgid "Cornish"
-msgstr "Cernyweg"
-
-#: kdecore/all_languages.desktop:7981
-msgctxt "Name"
-msgid "Kirghiz"
-msgstr "Kirghiz"
-
-#: kdecore/all_languages.desktop:8075
-msgctxt "Name"
-msgid "Latin"
-msgstr "Lladin"
-
-#: kdecore/all_languages.desktop:8170
-msgctxt "Name"
-msgid "Luxembourgish"
-msgstr "Luxembwrgeg"
-
-#: kdecore/all_languages.desktop:8264
-msgctxt "Name"
-msgid "Limburgan"
-msgstr "Limbwrgeg"
-
-#: kdecore/all_languages.desktop:8356
-msgctxt "Name"
-msgid "Lingala"
-msgstr "Lingala"
-
-#: kdecore/all_languages.desktop:8450
-msgctxt "Name"
-msgid "Lao"
-msgstr "Lao"
-
-#: kdecore/all_languages.desktop:8544
-msgctxt "Name"
-msgid "Lithuanian"
-msgstr "Lithuaneg"
-
-#: kdecore/all_languages.desktop:8639
-msgctxt "Name"
-msgid "Latvian"
-msgstr "Latfieg"
-
-#: kdecore/all_languages.desktop:8733
-msgctxt "Name"
-msgid "Maithili"
-msgstr ""
-
-#: kdecore/all_languages.desktop:8804
-msgctxt "Name"
-msgid "Malagasy"
-msgstr "Malagasy"
-
-#: kdecore/all_languages.desktop:8897
-msgctxt "Name"
-msgid "Marshallese"
-msgstr "Marshalleg"
-
-#: kdecore/all_languages.desktop:8990
-msgctxt "Name"
-msgid "Maori"
-msgstr "Maori"
-
-#: kdecore/all_languages.desktop:9084
-msgctxt "Name"
-msgid "Macedonian"
-msgstr "Macedoneg"
-
-#: kdecore/all_languages.desktop:9178
-msgctxt "Name"
-msgid "Malayalam"
-msgstr "Malayalam"
-
-#: kdecore/all_languages.desktop:9272
-msgctxt "Name"
-msgid "Mongolian"
-msgstr "Mongoleg"
-
-#: kdecore/all_languages.desktop:9366
-msgctxt "Name"
-msgid "Moldavian"
-msgstr "Moldafeg"
-
-#: kdecore/all_languages.desktop:9460
-msgctxt "Name"
-msgid "Marathi"
-msgstr "Marathi"
-
-#: kdecore/all_languages.desktop:9554
-msgctxt "Name"
-msgid "Malay"
-msgstr "Malay"
-
-#: kdecore/all_languages.desktop:9648
-msgctxt "Name"
-msgid "Maltese"
-msgstr "Malteg"
-
-#: kdecore/all_languages.desktop:9742
-msgctxt "Name"
-msgid "Burmese"
-msgstr "Burmeg"
-
-#: kdecore/all_languages.desktop:9836
-msgctxt "Name"
-msgid "Nauru"
-msgstr "Nauru"
-
-#: kdecore/all_languages.desktop:9930
-msgctxt "Name"
-msgid "Norwegian Bokmål"
-msgstr "Bokmal Norwyeg"
-
-#: kdecore/all_languages.desktop:10023
-msgctxt "Name"
-msgid "Ndebele, North"
-msgstr "Ndebele, Gogledd"
-
-#: kdecore/all_languages.desktop:10114
-msgctxt "Name"
-msgid "Low Saxon"
-msgstr "Sacsoneg Isel"
-
-#: kdecore/all_languages.desktop:10205
-msgctxt "Name"
-msgid "Nepali"
-msgstr "Nepali"
-
-#: kdecore/all_languages.desktop:10299
-msgctxt "Name"
-msgid "Ndonga"
-msgstr "Ndonga"
-
-#: kdecore/all_languages.desktop:10392
-msgctxt "Name"
-msgid "Dutch"
-msgstr "Iseldireg"
-
-#: kdecore/all_languages.desktop:10486
-msgctxt "Name"
-msgid "Norwegian Nynorsk"
-msgstr "Nynorsk Norwyeg"
-
-#: kdecore/all_languages.desktop:10579
-msgctxt "Name"
-msgid "Ndebele, South"
-msgstr "Ndebele, De"
-
-#: kdecore/all_languages.desktop:10671
-msgctxt "Name"
-msgid "Northern Sotho"
-msgstr "Sotho'r Gogledd"
-
-#: kdecore/all_languages.desktop:10763
-msgctxt "Name"
-msgid "Navajo"
-msgstr "Navajo"
-
-#: kdecore/all_languages.desktop:10856
-msgctxt "Name"
-msgid "Chichewa"
-msgstr "Chichewa"
-
-#: kdecore/all_languages.desktop:10949
-msgctxt "Name"
-msgid "Occitan"
-msgstr "Occitaneg"
-
-#: kdecore/all_languages.desktop:11043
-msgctxt "Name"
-msgid "Oromo"
-msgstr "Oromo"
-
-#: kdecore/all_languages.desktop:11136
-msgctxt "Name"
-msgid "Oriya"
-msgstr "Oriya"
-
-#: kdecore/all_languages.desktop:11230
-msgctxt "Name"
-msgid "Ossetian"
-msgstr "Oseteg"
-
-#: kdecore/all_languages.desktop:11323
-msgctxt "Name"
-msgid "Punjabi/Panjabi"
-msgstr ""
-
-#: kdecore/all_languages.desktop:11409
-msgctxt "Name"
-msgid "Pali"
-msgstr "Pali"
-
-#: kdecore/all_languages.desktop:11503
-msgctxt "Name"
-msgid "Polish"
-msgstr "Pwyleg"
-
-#: kdecore/all_languages.desktop:11597
-msgctxt "Name"
-msgid "Pushto"
-msgstr "Pushto"
-
-#: kdecore/all_languages.desktop:11690
-msgctxt "Name"
-msgid "Portuguese"
-msgstr "Portiwgaleg"
-
-#: kdecore/all_languages.desktop:11784
-msgctxt "Name"
-msgid "Brazilian Portuguese"
-msgstr "Portiwgaleg Brasil"
-
-#: kdecore/all_languages.desktop:11877
-msgctxt "Name"
-msgid "Quechua"
-msgstr "Quechua"
-
-#: kdecore/all_languages.desktop:11971
-msgctxt "Name"
-msgid "Rundi"
-msgstr "Rwndi"
-
-#: kdecore/all_languages.desktop:12064
-msgctxt "Name"
-msgid "Romanian"
-msgstr "Romaneg"
-
-#: kdecore/all_languages.desktop:12158
-msgctxt "Name"
-msgid "Romany"
-msgstr ""
-
-#: kdecore/all_languages.desktop:12246
-msgctxt "Name"
-msgid "Russian"
-msgstr "Rwsieg"
-
-#: kdecore/all_languages.desktop:12341
-msgctxt "Name"
-msgid "Kinyarwanda"
-msgstr "Kinyarwanda"
-
-#: kdecore/all_languages.desktop:12435
-msgctxt "Name"
-msgid "Sanskrit"
-msgstr "Sansgrit"
-
-#: kdecore/all_languages.desktop:12529
-msgctxt "Name"
-msgid "Sardinian"
-msgstr "Sardinieg"
-
-#: kdecore/all_languages.desktop:12623
-msgctxt "Name"
-msgid "Sindhi"
-msgstr "Sindhi"
-
-#: kdecore/all_languages.desktop:12716
-msgctxt "Name"
-msgid "Northern Sami"
-msgstr "Sami'r Gogledd"
-
-#: kdecore/all_languages.desktop:12809
-msgctxt "Name"
-msgid "Sango"
-msgstr "Sango"
-
-#: kdecore/all_languages.desktop:12902
-msgctxt "Name"
-msgid "Sinhala"
-msgstr ""
-
-#: kdecore/all_languages.desktop:12968
-msgctxt "Name"
-msgid "Slovak"
-msgstr "Sloveg"
-
-#: kdecore/all_languages.desktop:13062
-msgctxt "Name"
-msgid "Slovenian"
-msgstr "Sloveneg"
-
-#: kdecore/all_languages.desktop:13156
-msgctxt "Name"
-msgid "Samoan"
-msgstr "Samoeg"
-
-#: kdecore/all_languages.desktop:13249
-msgctxt "Name"
-msgid "Shona"
-msgstr "Shona"
-
-#: kdecore/all_languages.desktop:13343
-msgctxt "Name"
-msgid "Somali"
-msgstr "Somali"
-
-#: kdecore/all_languages.desktop:13437
-msgctxt "Name"
-msgid "Albanian"
-msgstr "Albaneg"
-
-#: kdecore/all_languages.desktop:13531
-msgctxt "Name"
-msgid "Serbian"
-msgstr "Serbieg"
-
-#: kdecore/all_languages.desktop:13625
-msgctxt "Name"
-msgid "Serbian Ijekavian"
-msgstr ""
-
-#: kdecore/all_languages.desktop:13677
-msgctxt "Name"
-msgid "Serbian Ijekavian Latin"
-msgstr ""
-
-#: kdecore/all_languages.desktop:13729
-msgctxt "Name"
-msgid "Serbian Latin"
-msgstr "Serbieg Lladin"
-
-#: kdecore/all_languages.desktop:13819
-msgctxt "Name"
-msgid "Swati"
-msgstr "Swati"
-
-#: kdecore/all_languages.desktop:13913
-msgctxt "Name"
-msgid "Sotho, Southern"
-msgstr "Sotho, De"
-
-#: kdecore/all_languages.desktop:14006
-msgctxt "Name"
-msgid "Sundanese"
-msgstr "Sundaneg"
-
-#: kdecore/all_languages.desktop:14099
-msgctxt "Name"
-msgid "Swedish"
-msgstr "Swedeg"
-
-#: kdecore/all_languages.desktop:14193
-msgctxt "Name"
-msgid "Swahili"
-msgstr "Swahili"
-
-#: kdecore/all_languages.desktop:14287
-msgctxt "Name"
-msgid "Tamil"
-msgstr "Tamil"
-
-#: kdecore/all_languages.desktop:14381
-msgctxt "Name"
-msgid "Telugu"
-msgstr "Telugu"
-
-#: kdecore/all_languages.desktop:14475
-msgctxt "Name"
-msgid "Tajik"
-msgstr "Tajik"
-
-#: kdecore/all_languages.desktop:14569
-msgctxt "Name"
-msgid "Thai"
-msgstr "Thai"
-
-#: kdecore/all_languages.desktop:14663
-msgctxt "Name"
-msgid "Tigrinya"
-msgstr "Tigrinya"
-
-#: kdecore/all_languages.desktop:14757
-msgctxt "Name"
-msgid "Turkmen"
-msgstr "Twrcmeneg"
-
-#: kdecore/all_languages.desktop:14850
-msgctxt "Name"
-msgid "Tswana"
-msgstr "Tswana"
-
-#: kdecore/all_languages.desktop:14944
-msgctxt "Name"
-msgid "Tonga"
-msgstr "Tonga"
-
-#: kdecore/all_languages.desktop:15038
-msgctxt "Name"
-msgid "Turkish"
-msgstr "Twrceg"
-
-#: kdecore/all_languages.desktop:15133
-msgctxt "Name"
-msgid "Tsonga"
-msgstr "Tsonga"
-
-#: kdecore/all_languages.desktop:15227
-msgctxt "Name"
-msgid "Tatar"
-msgstr "Tatar"
-
-#: kdecore/all_languages.desktop:15321
-msgctxt "Name"
-msgid "Twi"
-msgstr "Twi"
-
-#: kdecore/all_languages.desktop:15414
-msgctxt "Name"
-msgid "Tahitian"
-msgstr "Tahitieg"
-
-#: kdecore/localization/all_languages.desktop:15534
-msgctxt "Name"
-msgid "Uyghur"
-msgstr ""
-
-#: kdecore/all_languages.desktop:15600
-msgctxt "Name"
-msgid "Ukrainian"
-msgstr "Ukraineg"
-
-#: kdecore/all_languages.desktop:15694
-msgctxt "Name"
-msgid "Urdu"
-msgstr "Wrdw"
-
-#: kdecore/all_languages.desktop:15788
-msgctxt "Name"
-msgid "Uzbek"
-msgstr "Wzbec"
-
-#: kdecore/all_languages.desktop:15882
-msgctxt "Name"
-msgid "Uzbek (Cyrillic)"
-msgstr ""
-
-#: kdecore/all_languages.desktop:15962
-msgctxt "Name"
-msgid "Venda"
-msgstr "Venda"
-
-#: kdecore/all_languages.desktop:16055
-msgctxt "Name"
-msgid "Vietnamese"
-msgstr "Vietnameg"
-
-#: kdecore/all_languages.desktop:16149
-msgctxt "Name"
-msgid "Volapük"
-msgstr "Volapuk"
-
-#: kdecore/all_languages.desktop:16240
-msgctxt "Name"
-msgid "Walloon"
-msgstr "Walloon"
-
-#: kdecore/all_languages.desktop:16334
-msgctxt "Name"
-msgid "Wolof"
-msgstr "Woloff"
-
-#: kdecore/all_languages.desktop:16428
-msgctxt "Name"
-msgid "Xhosa"
-msgstr "Xhosa"
-
-#: kdecore/localization/all_languages.desktop:16506
-msgctxt "Name"
-msgid "KDE Test Language"
-msgstr ""
-
-#: kdecore/all_languages.desktop:16522
-msgctxt "Name"
-msgid "Yiddish"
-msgstr "Yideg"
-
-#: kdecore/all_languages.desktop:16616
-msgctxt "Name"
-msgid "Yoruba"
-msgstr "Yoruba"
-
-#: kdecore/all_languages.desktop:16709
-msgctxt "Name"
-msgid "Zhuang"
-msgstr "Zhuang"
-
-#: kdecore/all_languages.desktop:16801
-msgctxt "Name"
-msgid "Chinese"
-msgstr "Tseineeg"
-
-#: kdecore/all_languages.desktop:16895
-msgctxt "Name"
-msgid "Chinese Simplified"
-msgstr "Tseineeg Syml"
-
-#: kdecore/all_languages.desktop:16988
-msgctxt "Name"
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#: kdecore/all_languages.desktop:17079
-msgctxt "Name"
-msgid "Chinese Traditional"
-msgstr "Tsieineeg Traddodiadol"
-
-#: kdecore/all_languages.desktop:17172
-msgctxt "Name"
-msgid "Zulu"
-msgstr "Zulu"
-
-#: kdecore/localization/entry.desktop:2
-msgctxt "Name"
-msgid "US English"
-msgstr ""
-
-#: kdecore/network/kssld/kssld.desktop:8
-msgctxt "Name"
-msgid "SSL Certificate Policy"
-msgstr ""
-
-#: kdecore/network/kssld/kssld.desktop:61
-msgctxt "Comment"
-msgid "Provides SSL certificate policy to applications"
-msgstr ""
-
-#: kdecore/services/kplugininfo.desktop:4
-msgctxt "Name"
-msgid "KDE Plugin Information"
-msgstr "Gwybodaeth Ategynnau KDE"
-
-#: kdecore/sonnet/sonnetspeller.desktop:5
-msgctxt "Comment"
-msgid "Sonnet Spell Client"
-msgstr ""
-
-#: kded/kdedmodule.desktop:4
-msgctxt "Comment"
-msgid "KDED Module"
-msgstr "Modiwl KDED"
-
-#: kfile/kfilemodule.desktop:2
-msgctxt "Name"
-msgid "KFileModule"
-msgstr ""
-
-#: kfile/kfilemodule.desktop:61
-msgctxt "Comment"
-msgid "The default KDE file module providing the standard file dialog"
-msgstr ""
-
-#: khtml/java/kjavaappletviewer.desktop:2
-msgctxt "Name"
-msgid "Embedded Java Applet Viewer"
-msgstr "Gwelydd Rhaglennig Java Mewnadeiladedig"
-
-#: khtml/khtml.desktop:3
-msgctxt "Comment"
-msgid "Embeddable HTML viewing component"
-msgstr "Cydran gweld HTML mewnadeiladadwy"
-
-#: khtml/khtml.desktop:96
-msgctxt "Name"
-msgid "KHTML"
-msgstr "KHTML"
-
-#: khtml/khtmladaptorpart.desktop:2
-msgctxt "Name"
-msgid "KHTML Extension Adaptor"
-msgstr ""
-
-#: khtml/khtmlimage.desktop:3
-msgctxt "Comment"
-msgid "Embeddable Image Viewing Component"
-msgstr "Cydran Gweld Delwedd Mewnadeiladadwy"
-
-#: khtml/khtmlimage.desktop:95
-msgctxt "Name"
-msgid "Embeddable Image Viewer"
-msgstr "Gwelydd Delweddau Mewnadeiladadwy"
-
-#: khtml/kmultipart/kmultipart.desktop:4
-msgctxt "Name"
-msgid "Embeddable Component for multipart/mixed"
-msgstr ""
-
-#: kimgio/bmp.desktop:2
-msgctxt "Name"
-msgid "BMP"
-msgstr ""
-
-#: kimgio/dds.desktop:2
-msgctxt "Name"
-msgid "DDS"
-msgstr ""
-
-#: kimgio/eps.desktop:2
-msgctxt "Name"
-msgid "EPS"
-msgstr ""
-
-#: kimgio/exr.desktop:2
-msgctxt "Name"
-msgid "EXR"
-msgstr ""
-
-#: kimgio/gif.desktop:2
-msgctxt "Name"
-msgid "GIF"
-msgstr ""
-
-#: kimgio/hdr.desktop:2 kimgio/pic.desktop:2
-msgctxt "Name"
-msgid "HDR"
-msgstr ""
-
-#: kimgio/ico.desktop:2
-msgctxt "Name"
-msgid "ICO"
-msgstr ""
-
-#: kimgio/jp2.desktop:2
-msgctxt "Name"
-msgid "JP2"
-msgstr ""
-
-#: kimgio/jpeg.desktop:2
-msgctxt "Name"
-msgid "JPEG"
-msgstr ""
-
-#: kimgio/mng.desktop:2
-msgctxt "Name"
-msgid "MNG"
-msgstr ""
-
-#: kimgio/pbm.desktop:2
-msgctxt "Name"
-msgid "PBM"
-msgstr ""
-
-#: kimgio/pgm.desktop:2
-msgctxt "Name"
-msgid "PGM"
-msgstr ""
-
-#: kimgio/png.desktop:2
-msgctxt "Name"
-msgid "PNG"
-msgstr ""
-
-#: kimgio/pnm.desktop:2
-msgctxt "Name"
-msgid "PNM"
-msgstr ""
-
-#: kimgio/ppm.desktop:2
-msgctxt "Name"
-msgid "PPM"
-msgstr ""
-
-#: kimgio/psd.desktop:2
-msgctxt "Name"
-msgid "PSD"
-msgstr ""
-
-#: kimgio/qimageio_plugin.desktop:4
-msgctxt "Comment"
-msgid "QImageIOHandler plugin"
-msgstr ""
-
-#: kimgio/ras.desktop:2
-msgctxt "Name"
-msgid "RAS"
-msgstr ""
-
-#: kimgio/rgb.desktop:2
-msgctxt "Name"
-msgid "RGB"
-msgstr ""
-
-#: kimgio/tga.desktop:2
-msgctxt "Name"
-msgid "TGA"
-msgstr ""
-
-#: kimgio/tiff.desktop:2
-msgctxt "Name"
-msgid "TIFF"
-msgstr ""
-
-#: kimgio/xbm.desktop:2
-msgctxt "Name"
-msgid "XBM"
-msgstr ""
-
-#: kimgio/xcf.desktop:2
-msgctxt "Name"
-msgid "XCF"
-msgstr ""
-
-#: kimgio/xpm.desktop:2
-msgctxt "Name"
-msgid "XPM"
-msgstr ""
-
-#: kimgio/xv.desktop:2
-msgctxt "Name"
-msgid "XV"
-msgstr ""
-
-#: kio/application.desktop:4
-msgctxt "Name"
-msgid "Application"
-msgstr "Cymhwysiad"
-
-#: kio/data.protocol:8
-msgctxt "Description"
-msgid "A kioslave for data URIs (rfc2397)"
-msgstr ""
-
-#: kio/kcmodule.desktop:4
-msgctxt "Name"
-msgid "KDE Configuration Module"
-msgstr ""
-
-#: kio/kcmoduleinit.desktop:4
-msgctxt "Name"
-msgid "KDE Configuration Initialization"
-msgstr ""
-
-#: kio/kdatatool.desktop:4
-msgctxt "Comment"
-msgid "KDE Data Tool"
-msgstr "Erfyn Data KDE"
-
-#: kio/kfile/kiofilemodule.desktop:4
-msgctxt "Name"
-msgid "filemodule"
-msgstr ""
-
-#: kio/kfile/kiofilemodule.desktop:61
-msgctxt "Comment"
-msgid "KIO File Module"
-msgstr ""
-
-#: kio/kfile/kpropertiesdialogplugin.desktop:4
-msgctxt "Comment"
-msgid "Plugin for the Properties Dialog"
-msgstr "Ategyn am yr Ymgom Priodweddau"
-
-#: kio/kfileplugin.desktop:4
-msgctxt "Name"
-msgid "KFile Meta Data Plugin"
-msgstr "Ategyn Meta-ddata KFfeil"
-
-#: kio/kio/kfileitemactionplugin.desktop:4
-msgctxt "Comment"
-msgid "Plugin for the KIO file item context menu"
-msgstr ""
-
-#: kio/kio/kfilewrite.desktop:5
-msgctxt "Comment"
-msgid "KFileWrite plugin"
-msgstr ""
-
-#: kio/kscan.desktop:4
-msgctxt "Name"
-msgid "KScan"
-msgstr "KSgan"
-
-#: kio/kssl/kcm/kcm_ssl.desktop:11
-msgctxt "Name"
-msgid "SSL Preferences"
-msgstr ""
-
-#: kio/kssl/kcm/kcm_ssl.desktop:57
-msgctxt "Comment"
-msgid "SSL Versions and Certificates"
-msgstr ""
-
-#: kio/kurifilterplugin.desktop:4
-msgctxt "Name"
-msgid "Enhanced Browsing Plugin"
-msgstr "Ategyn Pori Hwylusach"
-
-#: kio/misc/kmailservice.desktop:11
-msgctxt "Name"
-msgid "KMailService"
-msgstr ""
-
-#: kio/misc/kpac/proxyscout.desktop:3
-msgctxt "Name"
-msgid "Network Proxy Configuration"
-msgstr ""
-
-#: kio/misc/kpac/proxyscout.desktop:58
-msgctxt "Comment"
-msgid "Automatic proxy configuration"
-msgstr "Ffurweddiad Awtomatig o'r Dirprwy"
-
-#: kio/misc/kpac/proxyscout.notifyrc:3
-msgctxt "Comment"
-msgid "Network Proxy Configuration"
-msgstr ""
-
-#: kio/misc/kpac/proxyscout.notifyrc:60
-msgctxt "Name"
-msgid "Invalid Proxy Script"
-msgstr ""
-
-#: kio/misc/kpac/proxyscout.notifyrc:141
-msgctxt "Comment"
-msgid "The downloaded proxy configuration script is invalid"
-msgstr "Mae'r sgript ffurfweddu'r dirprwy a chafodd ei lawrlwytho yn annilys"
-
-#: kio/misc/kpac/proxyscout.notifyrc:232
-msgctxt "Name"
-msgid "Script Download Error"
-msgstr ""
-
-#: kio/misc/kpac/proxyscout.notifyrc:314
-msgctxt "Comment"
-msgid "The proxy configuration script could not be downloaded"
-msgstr "Y sgript ffurfweddu'r dirprwy"
-
-#: kio/misc/kpac/proxyscout.notifyrc:405
-msgctxt "Name"
-msgid "Script Evaluation Error"
-msgstr ""
-
-#: kio/misc/kpac/proxyscout.notifyrc:485
-msgctxt "Comment"
-msgid "There was an error executing the proxy configuration script"
-msgstr "Digwyddodd gwall wrth weithredu'r sgript ffurfweddu'r dirprwy"
-
-#: kio/misc/ktelnetservice.desktop:10
-msgctxt "Name"
-msgid "KTelnetService"
-msgstr ""
-
-#: kio/misc/mms.protocol:11
-msgctxt "Description"
-msgid "Microsoft Media Server Protocol"
-msgstr ""
-
-#: kio/renamedialogplugin.desktop:4
-msgctxt "Comment"
-msgid "Plugin for the Rename Dialog"
-msgstr "Ategyn am yr Ymgom Ail-enwi"
-
-#: kio/tests/dummymeta.desktop:3
-msgctxt "Name"
-msgid "Dummy Meta"
-msgstr "Meta Dymi"
-
-#: kioslave/http/http_cache_cleaner.desktop:3
-msgctxt "Name"
-msgid "HTTP Cache Cleaner"
-msgstr "Glanhauwr Storfa HTTP"
-
-#: kioslave/http/http_cache_cleaner.desktop:95
-msgctxt "Comment"
-msgid "Cleans up old entries from the HTTP cache"
-msgstr "Glanhau'r hen gofnodion o'r storfa HTTP"
-
-#: kioslave/http/kcookiejar/kcookiejar.desktop:3
-msgctxt "Name"
-msgid "Cookie Jar"
-msgstr ""
-
-#: kioslave/http/kcookiejar/kcookiejar.desktop:55
-msgctxt "Comment"
-msgid "Stores network cookies"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:3
-msgctxt "Comment"
-msgid "Test for Knotify"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:85
-msgctxt "Name"
-msgid "Group"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:168
-msgctxt "Comment"
-msgid "The group"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:251
-msgctxt "Name"
-msgid "Online"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:333
-msgctxt "Comment"
-msgid "The contact is now connected"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:418
-msgctxt "Name"
-msgid "Message Received"
-msgstr ""
-
-#: knotify/tests/knotifytest.notifyrc:500
-msgctxt "Comment"
-msgid "A Message has been received"
-msgstr ""
-
-#: kparts/browserview.desktop:5
-msgctxt "Name"
-msgid "Browser View"
-msgstr "Golwg Porydd"
-
-#: kparts/kpart.desktop:4 kparts/krop.desktop:5 kparts/krwp.desktop:5
-msgctxt "Comment"
-msgid "KDE Component"
-msgstr "Cydran KDE"
-
-#: kparts/tests/notepad.desktop:2
-msgctxt "Name"
-msgid "Notepad (example)"
-msgstr "Pad ysgrifennu (enghraifft)"
-
-#: kutils/kemoticons/providers/adium/emoticonstheme_adium.desktop:3
-msgctxt "Name"
-msgid "Adium Emoticons Theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/adium/emoticonstheme_adium.desktop:76
-msgctxt "Comment"
-msgid "Library to use Adium emoticons theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/kde/emoticonstheme_kde.desktop:3
-msgctxt "Name"
-msgid "KDE Emoticons Theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/kde/emoticonstheme_kde.desktop:56
-msgctxt "Comment"
-msgid "Library to use KDE emoticons theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/pidgin/emoticonstheme_pidgin.desktop:3
-msgctxt "Name"
-msgid "Pidgin Emoticons Theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/pidgin/emoticonstheme_pidgin.desktop:78
-msgctxt "Comment"
-msgid "Library to use Pidgin emoticons theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/xmpp/emoticonstheme_xmpp.desktop:3
-msgctxt "Name"
-msgid "XMPP Emoticons Theme"
-msgstr ""
-
-#: kutils/kemoticons/providers/xmpp/emoticonstheme_xmpp.desktop:78
-msgctxt "Comment"
-msgid "Library to use XMPP emoticons theme"
-msgstr ""
-
-#: plasma/data/services/plasma-applet-extenderapplet.desktop:2
-msgctxt "Name"
-msgid "Collection"
-msgstr ""
-
-#: plasma/data/services/plasma.protocol:9
-msgctxt "Description"
-msgid "A protocol for Plasma services"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-animator.desktop:5
-msgctxt "Comment"
-msgid "Plasma Animation Engine"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-applet-popupapplet.desktop:5
-msgctxt "Comment"
-msgid "Plasma scripting popup applet"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-applet.desktop:5
-msgctxt "Comment"
-msgid "Plasma applet"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-containment.desktop:5
-msgctxt "Comment"
-msgid "Plasma applet container and background painter"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-containmentactions.desktop:5
-msgctxt "Comment"
-msgid "Plasma ContainmentActions"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-dataengine.desktop:5
-msgctxt "Comment"
-msgid "Plasma Data Engine"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-packagestructure.desktop:4
-msgctxt "Comment"
-msgid "Plasma package structure definition"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-runner.desktop:5
-msgctxt "Comment"
-msgid "KRunner plugin"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-scriptengine.desktop:5
-msgctxt "Comment"
-msgid "Scripting language extension for Plasma"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-service.desktop:5
-msgctxt "Comment"
-msgid "Plasma service"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-toolbox.desktop:5
-msgctxt "Comment"
-msgid "Plasma toolbox"
-msgstr ""
-
-#: plasma/data/servicetypes/plasma-wallpaper.desktop:5
-msgctxt "Comment"
-msgid "Plasma wallpaper"
-msgstr ""
-
-#: plasma/tests/packagemetadatatest.desktop:2
-msgctxt "Name"
-msgid "Package metadata test file"
-msgstr ""
-
-#: plasma/tests/packagemetadatatest.desktop:70
-msgctxt "Comment"
-msgid "A test desktop file to test the PackageMetaData class."
-msgstr ""
-
-#: plasma/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop:2
-msgctxt "Name"
-msgid "Test"
-msgstr ""
-
-#: plasma/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop:51
-msgctxt "Comment"
-msgid "A dummy plugin for testing"
-msgstr ""
-
-#: plasma/tests/testengine/plasma-dataengine-testengine.desktop:2
-msgctxt "Name"
-msgid "Test Data Engine"
-msgstr ""
-
-#: security/crypto/crypto.desktop:11
-msgctxt "Name"
-msgid "Crypto"
-msgstr ""
-
-#: security/crypto/crypto.desktop:92
-msgctxt "Comment"
-msgid "Configure SSL, manage certificates, and other cryptography settings"
-msgstr ""
-
-#: security/kcert/kcertpart.desktop:3
-msgctxt "Comment"
-msgid "Embeddable Personal Certificate Manager"
-msgstr "Rheolydd Tystysgrif Bersonol Mewnadeiladadwy"
-
-#: security/kcert/kcertpart.desktop:95
-msgctxt "Name"
-msgid "KCertPart"
-msgstr "KRhanTyst"
-
-#: sonnet/plugins/aspell/kspell_aspell.desktop:14
-msgctxt "Name"
-msgid "ASpell"
-msgstr ""
-
-#: sonnet/plugins/enchant/kspell_enchant.desktop:14
-msgctxt "Name"
-msgid "Enchant"
-msgstr ""
-
-#: sonnet/plugins/hspell/kspell_hspell.desktop:14
-msgctxt "Name"
-msgid "HSpell"
-msgstr ""
-
-#: sonnet/plugins/hunspell/kspell_hunspell.desktop:14
-msgctxt "Name"
-msgid "Hunspell"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdemultimedia.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdemultimedia.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdemultimedia.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdemultimedia.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,251 +0,0 @@
-# translation of desktop_kdemultimedia.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdemultimedia\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
-"PO-Revision-Date: 2009-07-18 18:00+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: debian/dolphin-open-audiocd.desktop:9
-msgctxt "Name"
-msgid "Open Audio CD in Dolphin"
-msgstr ""
-
-#: dragonplayer/misc/dragonplayer-opendvd.desktop:7
-msgctxt "Name"
-msgid "Open with Video Player (Dragon Player)"
-msgstr ""
-
-#: dragonplayer/misc/dragonplayer.desktop:4
-msgctxt "Name"
-msgid "Dragon Player"
-msgstr ""
-
-#: dragonplayer/misc/dragonplayer.desktop:59
-msgctxt "GenericName"
-msgid "Video Player"
-msgstr ""
-
-#: dragonplayer/misc/dragonplayer_part.desktop:4
-msgctxt "Name"
-msgid "Dragon Player Part"
-msgstr ""
-
-#: dragonplayer/misc/dragonplayer_part.desktop:58
-msgctxt "Comment"
-msgid "Embeddable Video Player"
-msgstr ""
-
-#: dragonplayer/misc/dragonplayer_play_dvd.desktop:8
-msgctxt "Name"
-msgid "Play DVD with Dragon Player"
-msgstr ""
-
-#: ffmpegthumbs/ffmpegthumbs.desktop:3
-msgctxt "Name"
-msgid "Video Files (ffmpegthumbs)"
-msgstr ""
-
-#: juk/juk.desktop:10 juk/juk.notifyrc:45
-msgctxt "Name"
-msgid "JuK"
-msgstr "JuK"
-
-#: juk/juk.desktop:80
-msgctxt "GenericName"
-msgid "Music Player"
-msgstr "Chwaraewr Cerdd"
-
-#: juk/juk.notifyrc:3
-msgctxt "Comment"
-msgid "Juk Music Player"
-msgstr ""
-
-#: juk/juk.notifyrc:117
-msgctxt "Name"
-msgid "Cover Successfully Downloaded"
-msgstr ""
-
-#: juk/juk.notifyrc:169
-msgctxt "Comment"
-msgid "A requested cover has been downloaded"
-msgstr ""
-
-#: juk/juk.notifyrc:224
-msgctxt "Name"
-msgid "Cover Failed to Download"
-msgstr ""
-
-#: juk/juk.notifyrc:276
-msgctxt "Comment"
-msgid "A requested cover has failed to download"
-msgstr ""
-
-#: juk/jukservicemenu.desktop:7
-msgctxt "Name"
-msgid "Add to JuK Collection"
-msgstr "Ychwanegu i Gasgliad JuK"
-
-#: kioslave/audiocd/data/audiocd.desktop:5
-msgctxt "Name"
-msgid "Audio CD Browser"
-msgstr ""
-
-#: kioslave/audiocd/data/solid_audiocd.desktop:10
-msgctxt "Name"
-msgid "Open with File Manager"
-msgstr ""
-
-#: kioslave/audiocd/kcmaudiocd/audiocd.desktop:11
-msgctxt "Name"
-msgid "Audio CDs"
-msgstr "CDau Sain"
-
-#: kioslave/audiocd/kcmaudiocd/audiocd.desktop:83
-msgctxt "Comment"
-msgid "Audiocd IO Slave Configuration"
-msgstr "Gosodiad Gwas IO ar gyfer CDau Sain"
-
-#: kioslave/audiocd/kcmaudiocd/audiocd.desktop:152
-msgctxt "Keywords"
-msgid "Audio CD,CD,Ogg,Vorbis,Encoding,CDDA,Bitrate"
-msgstr "CD Sain,CD,crynoddisg,Ogg,Vorbis,Amgodio,CDDA,Cyfradd Ddidau"
-
-#: kmix/kmix.desktop:8 kmix/kmix_autostart.desktop:13
-msgctxt "GenericName"
-msgid "Sound Mixer"
-msgstr "Cymysgydd Sŵn"
-
-#: kmix/kmix.desktop:79 kmix/kmix_autostart.desktop:84
-msgctxt "Name"
-msgid "KMix"
-msgstr "KMix"
-
-#: kmix/kmix.notifyrc:3
-msgctxt "Comment"
-msgid "Sound Mixer"
-msgstr ""
-
-#: kmix/kmix.notifyrc:63
-msgctxt "Name"
-msgid "Audio Device Fallback"
-msgstr ""
-
-#: kmix/kmix.notifyrc:118
-msgctxt "Comment"
-msgid ""
-"Notification on automatic fallback if the preferred device is unavailable"
-msgstr ""
-
-#: kmix/kmixctrl_restore.desktop:3
-msgctxt "Name"
-msgid "Restore Mixer Settings"
-msgstr "Adfer Gosodiadau Cymysgydd"
-
-#: kmix/kmixd.desktop:5
-msgctxt "Name"
-msgid "KMixD"
-msgstr ""
-
-#: kmix/kmixd.desktop:47
-msgctxt "Comment"
-msgid "KMixD Mixer Service"
-msgstr ""
-
-#: kmix/plasma/engine/plasma-engine-mixer.desktop:2
-msgctxt "Name"
-msgid "Mixer DataEngine"
-msgstr ""
-
-#: kmix/restore_kmix_volumes.desktop:7
-msgctxt "Name"
-msgid "Restore Mixer Volumes"
-msgstr "Adfer Lefelau Sain y Cymysgydd"
-
-#: kscd/kscd-play-audiocd.desktop:9
-msgctxt "Name"
-msgid "Play Audio CD with KsCD"
-msgstr ""
-
-#: kscd/kscd.desktop:2
-msgctxt "GenericName"
-msgid "CD Player"
-msgstr "Chwaraewr CD"
-
-#: kscd/kscd.desktop:75
-msgctxt "Name"
-msgid "KsCD"
-msgstr "KsCD"
-
-#: libkcddb/kcmcddb/libkcddb.desktop:12
-msgctxt "Name"
-msgid "CDDB Retrieval"
-msgstr "Cyrchu CDDB"
-
-#: libkcddb/kcmcddb/libkcddb.desktop:80
-msgctxt "GenericName"
-msgid "CDDB Configuration"
-msgstr "Ffurfweddu CDDB"
-
-#: libkcddb/kcmcddb/libkcddb.desktop:150
-msgctxt "Comment"
-msgid "Configure the CDDB Retrieval"
-msgstr "Ffurfweddu Nôl o'r CDDB"
-
-#: libkcddb/kcmcddb/libkcddb.desktop:215
-msgctxt "Keywords"
-msgid "cddb"
-msgstr "cddb"
-
-#: mplayerthumbs/src/videopreview.desktop:3
-msgctxt "Name"
-msgid "Video Files (MPlayerThumbs)"
-msgstr ""
-
-#: strigi-analyzer/avi/kfile_avi.desktop:3
-msgctxt "Name"
-msgid "AVI Info"
-msgstr "Gwybodaeth AVI"
-
-#: strigi-analyzer/flac/kfile_flac.desktop:3
-msgctxt "Name"
-msgid "FLAC Info"
-msgstr "Gwybodaeth FLAC"
-
-#: strigi-analyzer/mp3/kfile_mp3.desktop:3
-msgctxt "Name"
-msgid "MP3 Info"
-msgstr "Gwybodaeth MP3"
-
-#: strigi-analyzer/ogg/kfile_ogg.desktop:3
-msgctxt "Name"
-msgid "OGG Info"
-msgstr "Gwybodaeth OGG"
-
-#: strigi-analyzer/sid/kfile_sid.desktop:3
-msgctxt "Name"
-msgid "SID Info"
-msgstr "Gwybodaeth SID"
-
-#: strigi-analyzer/theora/kfile_theora.desktop:3
-msgctxt "Name"
-msgid "theora Info"
-msgstr ""
-
-#: strigi-analyzer/wav/kfile_wav.desktop:3
-msgctxt "Name"
-msgid "WAV Info"
-msgstr "Gwybodaeth WAV"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdenetwork.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdenetwork.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdenetwork.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdenetwork.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1463 +0,0 @@
-# translation of desktop_kdenetwork.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdenetwork\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
-"PO-Revision-Date: 2009-07-18 17:59+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop:4
-#: filesharing/samba/filepropertiesplugin/sambausershareplugin.desktop:4
-msgctxt "Name"
-msgid "Fileshare Konqueror Directory Properties Page"
-msgstr ""
-
-#: filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop:67
-#: filesharing/samba/filepropertiesplugin/sambausershareplugin.desktop:67
-msgctxt "Comment"
-msgid ""
-"Konqueror properties dialog plugin to share a directory with the local "
-"network"
-msgstr ""
-
-#: kdnssd/ioslave/zeroconf.desktop:3
-msgctxt "Name"
-msgid "Network Services"
-msgstr ""
-
-#: kdnssd/ioslave/zeroconf.protocol:15
-msgctxt "Description"
-msgid "A kioslave for ZeroConf"
-msgstr ""
-
-#: kdnssd/kdedmodule/dnssdwatcher.desktop:3
-msgctxt "Name"
-msgid "DNS-SD Service Discovery Monitor"
-msgstr ""
-
-#: kdnssd/kdedmodule/dnssdwatcher.desktop:38
-msgctxt "Comment"
-msgid "Monitors the network for DNS-SD services"
-msgstr ""
-
-#: kget/core/plugin/kget_plugin.desktop:4
-msgctxt "Name"
-msgid "KGet Plugin"
-msgstr ""
-
-#: kget/core/plugin/kget_plugin.desktop:58
-msgctxt "Comment"
-msgid "Plugin for KGet"
-msgstr ""
-
-#: kget/desktop/kget.desktop:8 kget/plasma/runner/plasma-runner-kget.desktop:2
-#: kget/plasma/runner/plasma-runner-kget_config.desktop:7
-msgctxt "Name"
-msgid "KGet"
-msgstr "KNôl"
-
-#: kget/desktop/kget.desktop:79
-msgctxt "GenericName"
-msgid "Download Manager"
-msgstr "Rheolydd Lawrlwytho"
-
-#: kget/desktop/kget_download.desktop:13
-msgctxt "Name"
-msgid "Download with KGet"
-msgstr ""
-
-#: kget/extensions/konqueror/kget_plug_in.desktop:14
-msgctxt "Name"
-msgid "Download Manager"
-msgstr ""
-
-#: kget/extensions/konqueror/kget_plug_in.desktop:51
-msgctxt "Comment"
-msgid "A versatile and easy to use file download manager"
-msgstr ""
-
-#: kget/plasma/applet/barapplet/kgetbarapplet-default.desktop:3
-msgctxt "Name"
-msgid "KGet Barchart Applet"
-msgstr ""
-
-#: kget/plasma/applet/barapplet/kgetbarapplet-default.desktop:49
-msgctxt "Comment"
-msgid "KGet barchart applet"
-msgstr ""
-
-#: kget/plasma/applet/panelbar/kgetpanelbarapplet-default.desktop:3
-msgctxt "Name"
-msgid "KGet Panelbar Applet"
-msgstr ""
-
-#: kget/plasma/applet/panelbar/kgetpanelbarapplet-default.desktop:47
-msgctxt "Comment"
-msgid "KGet panelbar applet"
-msgstr ""
-
-#: kget/plasma/applet/piechart/kgetpiechartapplet-default.desktop:3
-msgctxt "Name"
-msgid "KGet Piechart Applet"
-msgstr ""
-
-#: kget/plasma/applet/piechart/kgetpiechartapplet-default.desktop:49
-msgctxt "Comment"
-msgid "KGet piechart applet"
-msgstr ""
-
-#: kget/plasma/engine/plasma-engine-kget.desktop:2
-msgctxt "Name"
-msgid "KGet Data Engine"
-msgstr ""
-
-#: kget/plasma/runner/plasma-runner-kget.desktop:73
-msgctxt "Comment"
-msgid "Download links with KGet"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:3
-msgctxt "Comment"
-msgid "KGet Download Manager"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:45
-msgctxt "Name"
-msgid "Transfer Added"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:100
-msgctxt "Comment"
-msgid "A new download has been added"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:165
-msgctxt "Name"
-msgid "Download Started"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:221
-msgctxt "Comment"
-msgid "Downloading started"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:287
-msgctxt "Name"
-msgid "Download Finished"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:343
-msgctxt "Comment"
-msgid "Downloading finished"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:407
-msgctxt "Name"
-msgid "All Downloads Finished"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:463
-msgctxt "Comment"
-msgid "All downloads finished"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:528
-msgctxt "Name"
-msgid "Error Occurred"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:577
-msgctxt "Comment"
-msgid "An Error has Occurred"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:630
-msgctxt "Name"
-msgid "Information"
-msgstr ""
-
-#: kget/sounds/kget.notifyrc:686
-msgctxt "Comment"
-msgid "User Notified of Information"
-msgstr ""
-
-#: kget/transfer-plugins/bittorrent/kget_bittorrentfactory.desktop:9
-#: kget/transfer-plugins/bittorrent/kget_bittorrentfactory_config.desktop:8
-msgctxt "Name"
-msgid "Bittorrent"
-msgstr ""
-
-#: kget/transfer-plugins/bittorrent/kget_bittorrentfactory.desktop:61
-msgctxt "Comment"
-msgid "Allows files to be downloaded using Bittorrent"
-msgstr ""
-
-#: kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop:8
-msgctxt "Name"
-msgid "Checksum Search"
-msgstr ""
-
-#: kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop:50
-msgctxt "Comment"
-msgid "Tries to find checksums for a specified URL"
-msgstr ""
-
-#: kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory_config.desktop:8
-msgctxt "Name"
-msgid "ChecksumSearch"
-msgstr ""
-
-#: kget/transfer-plugins/contentfetch/kget_contentfetchfactory.desktop:8
-msgctxt "Name"
-msgid "Content Fetch"
-msgstr ""
-
-#: kget/transfer-plugins/contentfetch/kget_contentfetchfactory.desktop:59
-msgctxt "Comment"
-msgid "Fetch contents with custom scripts."
-msgstr ""
-
-#: kget/transfer-plugins/contentfetch/kget_contentfetchfactory_config.desktop:8
-msgctxt "Name"
-msgid "Content Fetcher"
-msgstr ""
-
-#: kget/transfer-plugins/kio/kget_kiofactory.desktop:8
-msgctxt "Name"
-msgid "KIO"
-msgstr ""
-
-#: kget/transfer-plugins/kio/kget_kiofactory.desktop:60
-msgctxt "Comment"
-msgid "Classic file downloader plugin"
-msgstr ""
-
-#: kget/transfer-plugins/metalink/kget_metalinkfactory.desktop:8
-#: kget/transfer-plugins/metalink/kget_metalinkfactory_config.desktop:8
-msgctxt "Name"
-msgid "Metalink"
-msgstr ""
-
-#: kget/transfer-plugins/metalink/kget_metalinkfactory.desktop:60
-msgctxt "Comment"
-msgid "Allows files to be downloaded from Metalink"
-msgstr ""
-
-#: kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop:8
-msgctxt "Name"
-msgid "Mirror Search"
-msgstr ""
-
-#: kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop:60
-msgctxt "Comment"
-msgid "Allows KGet to search through mirror search engines for files"
-msgstr ""
-
-#: kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory_config.desktop:8
-msgctxt "Name"
-msgid "MirrorSearch"
-msgstr ""
-
-#: kget/transfer-plugins/mms/kget_mmsfactory.desktop:8
-#: kget/transfer-plugins/mmsclient/kget_mmsfactory.desktop:8
-msgctxt "Name"
-msgid "MMS"
-msgstr ""
-
-#: kget/transfer-plugins/mms/kget_mmsfactory.desktop:62
-#: kget/transfer-plugins/mmsclient/kget_mmsfactory.desktop:62
-msgctxt "Comment"
-msgid "MMS-Transfer plugin for KGet"
-msgstr ""
-
-#: kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop:8
-msgctxt "Name"
-msgid "Multi Segment KIO"
-msgstr ""
-
-#: kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop:58
-msgctxt "Comment"
-msgid "Multithreaded file download plugin"
-msgstr ""
-
-#: kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory_config.desktop:8
-msgctxt "Name"
-msgid "MultiSegmentKIO"
-msgstr ""
-
-#: kopete/doc/t1/kopete_tutorialplugin.desktop:3
-#: kopete/doc/t2/kopete_tutorialplugin.desktop:3
-#: kopete/doc/t3/kopete_tutorialplugin.desktop:3
-msgctxt "Name"
-msgid "Tutorial Plugin"
-msgstr ""
-
-#: kopete/doc/t1/kopete_tutorialplugin.desktop:61
-#: kopete/doc/t2/kopete_tutorialplugin.desktop:61
-#: kopete/doc/t3/kopete_tutorialplugin.desktop:61
-msgctxt "Comment"
-msgid "Demonstration plugin for teaching Kopete development"
-msgstr ""
-
-#: kopete/doc/t3/kopete_tutorialplugin_config.desktop:5
-msgctxt "Name"
-msgid "Tutorial"
-msgstr ""
-
-#: kopete/doc/t3/kopete_tutorialplugin_config.desktop:63
-msgctxt "Comment"
-msgid "Turns normal people into Super Kopete Developer"
-msgstr ""
-
-#: kopete/kopete/chatwindow/chatwindow.desktop:15
-msgctxt "Name"
-msgid "Kopete Chat Window"
-msgstr "Ffenestr Sgwrs Kopete"
-
-#: kopete/kopete/chatwindow/chatwindow.desktop:84
-msgctxt "Comment"
-msgid "The default Kopete chat window"
-msgstr "Y ffenestr sgwrs Kopete rhagosod"
-
-#: kopete/kopete/chatwindow/emailwindow.desktop:15
-msgctxt "Name"
-msgid "Kopete Email Window"
-msgstr ""
-
-#: kopete/kopete/chatwindow/emailwindow.desktop:79
-msgctxt "Comment"
-msgid "The Kopete email window"
-msgstr ""
-
-#: kopete/kopete/config/accounts/kopete_accountconfig.desktop:12
-msgctxt "Name"
-msgid "Accounts"
-msgstr "Cyfrifon"
-
-#: kopete/kopete/config/accounts/kopete_accountconfig.desktop:85
-msgctxt "Comment"
-msgid "Manage Your Accounts and Identities"
-msgstr ""
-
-#: kopete/kopete/config/appearance/kopete_appearanceconfig.desktop:11
-msgctxt "Name"
-msgid "Contact List"
-msgstr ""
-
-#: kopete/kopete/config/appearance/kopete_appearanceconfig.desktop:66
-msgctxt "Comment"
-msgid "Configure Contact List Look and Feel"
-msgstr ""
-
-#: kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop:12
-msgctxt "Name"
-msgid "Video"
-msgstr ""
-
-#: kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop:67
-msgctxt "Comment"
-msgid "Configure Video Devices"
-msgstr ""
-
-#: kopete/kopete/config/behavior/kopete_behaviorconfig.desktop:11
-msgctxt "Name"
-msgid "Behavior"
-msgstr "Ymddygiad"
-
-#: kopete/kopete/config/behavior/kopete_behaviorconfig.desktop:85
-msgctxt "Comment"
-msgid "Personalize Kopete's Behavior"
-msgstr ""
-
-#: kopete/kopete/config/chatwindow/kopete_chatwindowconfig.desktop:11
-msgctxt "Name"
-msgid "Chat Window"
-msgstr ""
-
-#: kopete/kopete/config/chatwindow/kopete_chatwindowconfig.desktop:66
-msgctxt "Comment"
-msgid "Configure Chat Window Look and Feel"
-msgstr ""
-
-#: kopete/kopete/config/plugins/kopete_pluginconfig.desktop:12
-msgctxt "Name"
-msgid "Plugins"
-msgstr ""
-
-#: kopete/kopete/config/plugins/kopete_pluginconfig.desktop:75
-msgctxt "Comment"
-msgid "Select and Configure Plugins"
-msgstr ""
-
-#: kopete/kopete/config/status/kopete_statusconfig.desktop:11
-msgctxt "Name"
-msgid "Status"
-msgstr ""
-
-#: kopete/kopete/config/status/kopete_statusconfig.desktop:65
-msgctxt "Comment"
-msgid "Manage Your Statuses"
-msgstr ""
-
-#: kopete/kopete/kopete.desktop:3
-msgctxt "Name"
-msgid "Kopete"
-msgstr "Kopete"
-
-#: kopete/kopete/kopete.desktop:74
-msgctxt "GenericName"
-msgid "Instant Messenger"
-msgstr "Negesydd Chwim"
-
-#: kopete/kopete/kopete.desktop:147
-msgctxt "Comment"
-msgid "Instant Messenger"
-msgstr "Negesydd Chwim"
-
-#: kopete/kopete/kopete.notifyrc:3
-msgctxt "Comment"
-msgid "Kopete Messenger"
-msgstr "Negesydd Kopete"
-
-#: kopete/kopete/kopete.notifyrc:72
-msgctxt "Name"
-msgid "Group"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:129
-msgctxt "Comment"
-msgid "The group where the contact resides"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:186
-msgctxt "Name"
-msgid "Contact"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:242
-msgctxt "Comment"
-msgid "The specified contact"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:299
-msgctxt "Name"
-msgid "Class"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:356
-msgctxt "Comment"
-msgid "The message class"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:414
-msgctxt "Name"
-msgid "Incoming Message"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:469
-msgctxt "Comment"
-msgid "An incoming message has been received"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:539
-msgctxt "Name"
-msgid "Incoming Message in Active Chat"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:592
-msgctxt "Comment"
-msgid "An incoming message in the active chat window has been received"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:648
-msgctxt "Name"
-msgid "Outgoing Message"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:702
-msgctxt "Comment"
-msgid "An outgoing message has been sent"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:769
-msgctxt "Name"
-msgid "Contact Gone Online"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:824
-msgctxt "Comment"
-msgid "A contact has come online"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:889
-msgctxt "Name"
-msgid "Offline"
-msgstr "All-lein"
-
-#: kopete/kopete/kopete.notifyrc:957
-msgctxt "Comment"
-msgid "A contact has gone offline"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1023
-msgctxt "Name"
-msgid "Status Change"
-msgstr "Newid Cyflwr"
-
-#: kopete/kopete/kopete.notifyrc:1088
-msgctxt "Comment"
-msgid "A contact's online status has changed"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1153
-#: kopete/plugins/highlight/kopete_highlight.desktop:16
-#: kopete/plugins/highlight/kopete_highlight_config.desktop:10
-msgctxt "Name"
-msgid "Highlight"
-msgstr "Amlygu"
-
-#: kopete/kopete/kopete.notifyrc:1224
-msgctxt "Comment"
-msgid "A highlighted message has been received"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1291
-msgctxt "Name"
-msgid "Low Priority Messages"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1345
-msgctxt "Comment"
-msgid "A message marked with a low priority has been received"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1411
-msgctxt "Name"
-msgid "Yahoo Mail"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1474
-msgctxt "Comment"
-msgid "New email has arrived in your Yahoo inbox"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1540
-msgctxt "Name"
-msgid "MSN Mail"
-msgstr "MSN Mail"
-
-#: kopete/kopete/kopete.notifyrc:1603
-msgctxt "Comment"
-msgid "New email has arrived in your MSN inbox"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1669
-msgctxt "Name"
-msgid "ICQ Authorization"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1727
-msgctxt "Comment"
-msgid "An ICQ user has authorized/declined your authorization request"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1788
-msgctxt "Name"
-msgid "IRC Event"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1848
-msgctxt "Comment"
-msgid "An IRC event has occurred"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1910
-msgctxt "Name"
-msgid "Connection Error"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:1973
-msgctxt "Comment"
-msgid "An error on connection has occurred"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2037
-msgctxt "Name"
-msgid "Connection Lost"
-msgstr "Collwyd Cysylltiad"
-
-#: kopete/kopete/kopete.notifyrc:2099
-msgctxt "Comment"
-msgid "The connection have been lost"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2156
-msgctxt "Name"
-msgid "Cannot Connect"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2217
-msgctxt "Comment"
-msgid "Kopete cannot connect to the service"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2263
-msgctxt "Name"
-msgid "Network Problems"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2324
-msgctxt "Comment"
-msgid "The network is experiencing problems"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2385
-msgctxt "Name"
-msgid "Server Internal Error"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2442
-msgctxt "Comment"
-msgid "An internal service error has occurred"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2489
-msgctxt "Name"
-msgid "Buzz/Nudge"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2545
-msgctxt "Comment"
-msgid "A contact has sent you a buzz/nudge."
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2605
-msgctxt "Name"
-msgid "Message Dropped"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2659
-msgctxt "Comment"
-msgid "A message was filtered by the Privacy Plugin"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2716
-msgctxt "Name"
-msgid "ICQ Reading status"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2770
-msgctxt "Comment"
-msgid "An ICQ user is reading your status message"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2826
-msgctxt "Name"
-msgid "Service Message"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2878
-msgctxt "Comment"
-msgid "A service message has been received (e.g. authorization request)"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2924
-msgctxt "Name"
-msgid "Gadu-Gadu contacts list"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:2965
-msgctxt "Comment"
-msgid "Contact list has been received/exported/deleted"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:3008
-msgctxt "Name"
-msgid "Typing message"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:3131
-msgctxt "Comment"
-msgid "A user is typing a message"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:3171
-msgctxt "Name"
-msgid "Incoming File Transfer"
-msgstr ""
-
-#: kopete/kopete/kopete.notifyrc:3207
-msgctxt "Comment"
-msgid "An incoming file transfer request has been received"
-msgstr ""
-
-#: kopete/libkopete/kopeteplugin.desktop:5
-msgctxt "Comment"
-msgid "Kopete Plugin"
-msgstr "Ategyn Kopete"
-
-#: kopete/libkopete/kopeteprotocol.desktop:5
-msgctxt "Comment"
-msgid "Kopete Protocol Plugin"
-msgstr "Ategyn Protocol Kopete"
-
-#: kopete/libkopete/kopeteui.desktop:5
-msgctxt "Comment"
-msgid "A Kopete UI Plugin"
-msgstr "Ategyn UI Kopete"
-
-#: kopete/plugins/addbookmarks/kopete_addbookmarks.desktop:3
-#: kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop:3
-msgctxt "Name"
-msgid "Bookmarks"
-msgstr "Nodau Tudalen"
-
-#: kopete/plugins/addbookmarks/kopete_addbookmarks.desktop:75
-#: kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop:75
-msgctxt "Comment"
-msgid "Automatically bookmark links in incoming messages"
-msgstr ""
-
-#: kopete/plugins/alias/kopete_alias.desktop:16
-#: kopete/plugins/alias/kopete_alias_config.desktop:11
-msgctxt "Name"
-msgid "Alias"
-msgstr "Ffugenw"
-
-#: kopete/plugins/alias/kopete_alias.desktop:86
-#: kopete/plugins/alias/kopete_alias_config.desktop:81
-msgctxt "Comment"
-msgid "Adds custom aliases for commands"
-msgstr "Ychwanegu ffugenwau addasiedig ar gyfer gorchmynion"
-
-#: kopete/plugins/autoreplace/kopete_autoreplace.desktop:16
-#: kopete/plugins/autoreplace/kopete_autoreplace_config.desktop:10
-msgctxt "Name"
-msgid "Auto Replace"
-msgstr "Hunan-Amnewid"
-
-#: kopete/plugins/autoreplace/kopete_autoreplace.desktop:86
-msgctxt "Comment"
-msgid "Auto replaces some text you can choose"
-msgstr "Hunan-amnewid testun y gallwch ei ddewis"
-
-#: kopete/plugins/autoreplace/kopete_autoreplace_config.desktop:80
-msgctxt "Comment"
-msgid "Autoreplaces some text you can choose"
-msgstr "Hunan-amnewid testun y gallwch ei ddewis"
-
-#: kopete/plugins/contactnotes/kopete_contactnotes.desktop:16
-msgctxt "Name"
-msgid "Contact Notes"
-msgstr "Nodiadau Cysylltiad"
-
-#: kopete/plugins/contactnotes/kopete_contactnotes.desktop:83
-msgctxt "Comment"
-msgid "Add personal notes on your contacts"
-msgstr "Ychwanegu nodiadau personol ynglyn â'ch cysylltiadau"
-
-#: kopete/plugins/highlight/kopete_highlight.desktop:86
-msgctxt "Comment"
-msgid "Highlight messages"
-msgstr "Amlygu negeseuon"
-
-#: kopete/plugins/highlight/kopete_highlight_config.desktop:80
-msgctxt "Comment"
-msgid "Highlights text based on filters"
-msgstr "Amlygu testun ar sail hidlau"
-
-#: kopete/plugins/history/kopete_history.desktop:16
-#: kopete/plugins/history/kopete_history_config.desktop:11
-msgctxt "Name"
-msgid "History"
-msgstr "Hanes"
-
-#: kopete/plugins/history/kopete_history.desktop:91
-msgctxt "Comment"
-msgid "Log all messages to keep track of your conversations"
-msgstr "Cofnodi pob neges er mwyn cadw trefn ar eich sgwrsiau"
-
-#: kopete/plugins/history/kopete_history_config.desktop:86
-msgctxt "Comment"
-msgid "History Plugin"
-msgstr "Ategyn Hanes"
-
-#: kopete/plugins/latex/kopete_latex.desktop:16
-msgctxt "Name"
-msgid "KopeteTeX"
-msgstr ""
-
-#: kopete/plugins/latex/kopete_latex.desktop:68
-msgctxt "Comment"
-msgid "Render Latex formulas in the chatwindow"
-msgstr ""
-
-#: kopete/plugins/latex/kopete_latex_config.desktop:10
-msgctxt "Name"
-msgid "KopeTeX"
-msgstr ""
-
-#: kopete/plugins/nowlistening/kopete_nowlistening.desktop:16
-#: kopete/plugins/nowlistening/kopete_nowlistening_config.desktop:11
-msgctxt "Name"
-msgid "Now Listening"
-msgstr "Rwan yn Gwrando ar"
-
-#: kopete/plugins/nowlistening/kopete_nowlistening.desktop:84
-#: kopete/plugins/nowlistening/kopete_nowlistening_config.desktop:79
-msgctxt "Comment"
-msgid "Tells your buddies what you're listening to"
-msgstr "Dweud wrth eich cyfeillion be y gwrandwch arnodd"
-
-#: kopete/plugins/otr/kopete_otr.desktop:16
-#: kopete/plugins/otr/kopete_otr_config.desktop:11
-msgctxt "Comment"
-msgid "Encrypt chat sessions with Off-The-Record encryption"
-msgstr ""
-
-#: kopete/plugins/otr/kopete_otr.desktop:64
-#: kopete/plugins/otr/kopete_otr_config.desktop:59
-msgctxt "Name"
-msgid "OTR"
-msgstr ""
-
-#: kopete/plugins/pipes/kopete_pipes.desktop:16
-#: kopete/plugins/pipes/kopete_pipes_config.desktop:11
-msgctxt "Name"
-msgid "Pipes"
-msgstr ""
-
-#: kopete/plugins/pipes/kopete_pipes.desktop:67
-#: kopete/plugins/pipes/kopete_pipes_config.desktop:62
-msgctxt "Comment"
-msgid "Pipe messages through an external program or script"
-msgstr ""
-
-#: kopete/plugins/privacy/kopete_privacy.desktop:16
-#: kopete/plugins/privacy/kopete_privacy_config.desktop:10
-msgctxt "Name"
-msgid "Privacy"
-msgstr ""
-
-#: kopete/plugins/privacy/kopete_privacy.desktop:75
-msgctxt "Comment"
-msgid "Filters incoming messages"
-msgstr ""
-
-#: kopete/plugins/privacy/kopete_privacy_config.desktop:69
-msgctxt "Comment"
-msgid "Privacy Plugin"
-msgstr ""
-
-#: kopete/plugins/statistics/kopete_statistics.desktop:16
-msgctxt "Name"
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: kopete/plugins/statistics/kopete_statistics.desktop:85
-msgctxt "Comment"
-msgid "Gather some meaningful statistics"
-msgstr ""
-
-#: kopete/plugins/texteffect/kopete_texteffect.desktop:16
-#: kopete/plugins/texteffect/kopete_texteffect_config.desktop:10
-msgctxt "Name"
-msgid "Text Effect"
-msgstr "Effaith Testun"
-
-#: kopete/plugins/texteffect/kopete_texteffect.desktop:85
-msgctxt "Comment"
-msgid "Add nice effects to your messages"
-msgstr "Ychwanegu effeithiau del i'ch negeseuon"
-
-#: kopete/plugins/texteffect/kopete_texteffect_config.desktop:79
-msgctxt "Comment"
-msgid "Adds special effects to your text"
-msgstr "Ychwanegu effeithiau arbennig i'ch testun"
-
-#: kopete/plugins/translator/kopete_translator.desktop:16
-#: kopete/plugins/translator/kopete_translator_config.desktop:11
-msgctxt "Name"
-msgid "Translator"
-msgstr "Cyfieithydd"
-
-#: kopete/plugins/translator/kopete_translator.desktop:90
-msgctxt "Comment"
-msgid "Chat with foreign buddies in your native language"
-msgstr "Sgwrsio â chyfeillion tramor yn eich iaith gyntaf"
-
-#: kopete/plugins/translator/kopete_translator_config.desktop:85
-msgctxt "Comment"
-msgid "Translates messages from your native language to another language"
-msgstr "Cyfieithu negeseuon o'ch iaith gyntaf i iaith arall"
-
-#: kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop:16
-msgctxt "Name"
-msgid "Preview of Pictures in Chats"
-msgstr ""
-
-#: kopete/plugins/urlpicpreview/kopete_urlpicpreview.desktop:62
-msgctxt "Comment"
-msgid "Displays a preview of pictures in chats"
-msgstr ""
-
-#: kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop:10
-msgctxt "Name"
-msgid "URLPicPreview Plugin Configuration"
-msgstr ""
-
-#: kopete/plugins/urlpicpreview/kopete_urlpicpreview_config.desktop:63
-msgctxt "Comment"
-msgid "URLPicPreview Plugin"
-msgstr ""
-
-#: kopete/plugins/webpresence/kopete_webpresence.desktop:16
-#: kopete/plugins/webpresence/kopete_webpresence_config.desktop:10
-msgctxt "Comment"
-msgid "Show the status of (parts of) your contact list on a webpage"
-msgstr "Dangos cyflwr o (rannau o) eich rhestr cysylltiadau ar dudalen wê"
-
-#: kopete/plugins/webpresence/kopete_webpresence.desktop:80
-#: kopete/plugins/webpresence/kopete_webpresence_config.desktop:74
-msgctxt "Name"
-msgid "Web Presence"
-msgstr "Presenoldeb Gwê"
-
-#: kopete/protocols/bonjour/kopete_bonjour.desktop:17
-msgctxt "Name"
-msgid "Bonjour"
-msgstr ""
-
-#: kopete/protocols/bonjour/kopete_bonjour.desktop:71
-msgctxt "Comment"
-msgid "Serverless Link Local XMPP Messaging"
-msgstr ""
-
-#: kopete/protocols/gadu/kopete_gadu.desktop:17
-msgctxt "Name"
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: kopete/protocols/gadu/kopete_gadu.desktop:87
-msgctxt "Comment"
-msgid "Gadu-Gadu: the Polish IM service"
-msgstr ""
-
-#: kopete/protocols/groupwise/kopete_groupwise.desktop:17
-msgctxt "Name"
-msgid "GroupWise"
-msgstr ""
-
-#: kopete/protocols/groupwise/kopete_groupwise.desktop:87
-msgctxt "Comment"
-msgid "Novell GroupWise Messenger"
-msgstr ""
-
-#: kopete/protocols/irc/kopete_irc.desktop:17
-msgctxt "Name"
-msgid "IRC"
-msgstr "IRC"
-
-#: kopete/protocols/irc/kopete_irc.desktop:86
-msgctxt "Comment"
-msgid "Internet Relay Chat"
-msgstr ""
-
-#: kopete/protocols/jabber/kioslave/jabberdisco.protocol:12
-msgctxt "Description"
-msgid "A KIO slave for Jabber Service Discovery"
-msgstr ""
-
-#: kopete/protocols/jabber/kopete_jabber.desktop:17
-msgctxt "Name"
-msgid "Jabber"
-msgstr "Jabber"
-
-#: kopete/protocols/jabber/kopete_jabber.desktop:87
-msgctxt "Comment"
-msgid "XMPP, Jabber, Google Talk"
-msgstr ""
-
-#: kopete/protocols/meanwhile/kopete_meanwhile.desktop:17
-msgctxt "Name"
-msgid "Meanwhile"
-msgstr ""
-
-#: kopete/protocols/meanwhile/kopete_meanwhile.desktop:82
-msgctxt "Comment"
-msgid "Communicate at the same time with Meanwhile"
-msgstr ""
-
-#: kopete/protocols/oscar/aim/kopete_aim.desktop:17
-msgctxt "Name"
-msgid "AIM"
-msgstr "AIM"
-
-#: kopete/protocols/oscar/aim/kopete_aim.desktop:87
-msgctxt "Comment"
-msgid "An Instant Messenger"
-msgstr ""
-
-#: kopete/protocols/oscar/icq/kopete_icq.desktop:17
-msgctxt "Name"
-msgid "ICQ"
-msgstr "ICQ"
-
-#: kopete/protocols/oscar/icq/kopete_icq.desktop:87
-msgctxt "Comment"
-msgid "Seek and Chat with ICQ"
-msgstr ""
-
-#: kopete/protocols/qq/kopete_qq.desktop:17
-msgctxt "Name"
-msgid "QQ"
-msgstr ""
-
-#: kopete/protocols/qq/kopete_qq.desktop:74
-msgctxt "Comment"
-msgid "A popular Chinese IM system"
-msgstr ""
-
-#: kopete/protocols/skype/kopete_skype.desktop:18
-msgctxt "Name"
-msgid "Skype"
-msgstr ""
-
-#: kopete/protocols/skype/kopete_skype.desktop:66
-msgctxt "Comment"
-msgid "Skype protocol plugin (a wrapper)"
-msgstr ""
-
-#: kopete/protocols/sms/kopete_sms.desktop:17
-msgctxt "Name"
-msgid "SMS"
-msgstr "SMS"
-
-#: kopete/protocols/sms/kopete_sms.desktop:89
-msgctxt "Comment"
-msgid "Send SMS messages to mobile phones"
-msgstr ""
-
-#: kopete/protocols/testbed/kopete_testbed.desktop:17
-msgctxt "Name"
-msgid "Testbed"
-msgstr "Mainc Arbrofi"
-
-#: kopete/protocols/testbed/kopete_testbed.desktop:82
-msgctxt "Comment"
-msgid "Kopete test protocol"
-msgstr "Protocol arbrofi Kopete"
-
-#: kopete/protocols/winpopup/kopete_wp.desktop:17
-msgctxt "Name"
-msgid "WinPopup"
-msgstr "WinPopup"
-
-#: kopete/protocols/winpopup/kopete_wp.desktop:85
-msgctxt "Comment"
-msgid "Sends Windows WinPopup messages"
-msgstr ""
-
-#: kopete/protocols/wlm/kopete_wlm.desktop:17
-msgctxt "Name"
-msgid "WLM Messenger"
-msgstr ""
-
-#: kopete/protocols/wlm/kopete_wlm.desktop:69
-msgctxt "Comment"
-msgid "Windows Live Messenger plugin"
-msgstr ""
-
-#: kopete/protocols/yahoo/kopete_yahoo.desktop:17
-msgctxt "Name"
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: kopete/protocols/yahoo/kopete_yahoo.desktop:89
-msgctxt "Comment"
-msgid "Yahoo! Messenger IM and video chat"
-msgstr ""
-
-#: kppp/DB/Provider/Austria/.directory:2
-msgctxt "Name"
-msgid "Austria"
-msgstr ""
-
-#: kppp/DB/Provider/Belarus/.directory:2
-msgctxt "Name"
-msgid "Belarus"
-msgstr ""
-
-#: kppp/DB/Provider/Czech_Republic/.directory:2
-msgctxt "Name"
-msgid "Czechia"
-msgstr ""
-
-#: kppp/DB/Provider/Denmark/.directory:2
-msgctxt "Name"
-msgid "Denmark"
-msgstr ""
-
-#: kppp/DB/Provider/France/.directory:2
-msgctxt "Name"
-msgid "France"
-msgstr ""
-
-#: kppp/DB/Provider/Germany/.directory:2
-msgctxt "Name"
-msgid "Germany"
-msgstr ""
-
-#: kppp/DB/Provider/Ireland/.directory:2
-msgctxt "Name"
-msgid "Ireland"
-msgstr ""
-
-#: kppp/DB/Provider/Netherlands/.directory:2
-msgctxt "Name"
-msgid "Netherlands"
-msgstr ""
-
-#: kppp/DB/Provider/New_Zealand/.directory:2
-msgctxt "Name"
-msgid "New Zealand"
-msgstr ""
-
-#: kppp/DB/Provider/Norway/.directory:2
-msgctxt "Name"
-msgid "Norway"
-msgstr ""
-
-#: kppp/DB/Provider/Portugal/.directory:2
-msgctxt "Name"
-msgid "Portugal"
-msgstr ""
-
-#: kppp/DB/Provider/Slovenia/.directory:2
-msgctxt "Name"
-msgid "Slovenia"
-msgstr ""
-
-#: kppp/DB/Provider/Sweden/.directory:2
-msgctxt "Name"
-msgid "Sweden"
-msgstr ""
-
-#: kppp/DB/Provider/Switzerland/.directory:2
-msgctxt "Name"
-msgid "Switzerland"
-msgstr ""
-
-#: kppp/DB/Provider/Taiwan/.directory:2
-msgctxt "Name"
-msgid "Taiwan"
-msgstr ""
-
-#: kppp/DB/Provider/Ukraine/.directory:2
-msgctxt "Name"
-msgid "Ukraine"
-msgstr ""
-
-#: kppp/DB/Provider/United_Kingdom/.directory:2
-msgctxt "Name"
-msgid "United Kingdom"
-msgstr ""
-
-#: kppp/DB/Provider/Yugoslavia/.directory:2
-msgctxt "Name"
-msgid "Yugoslavia"
-msgstr ""
-
-#: kppp/Kppp.desktop:2
-msgctxt "GenericName"
-msgid "Internet Dial-Up Tool"
-msgstr ""
-
-#: kppp/Kppp.desktop:67
-msgctxt "Name"
-msgid "KPPP"
-msgstr "KPPP"
-
-#: kppp/logview/kppplogview.desktop:2
-msgctxt "Name"
-msgid "KPPPLogview"
-msgstr ""
-
-#: kppp/logview/kppplogview.desktop:67
-msgctxt "GenericName"
-msgid "Internet Dial-Up Tool Log Viewer"
-msgstr ""
-
-#: krdc/core/krdc_plugin.desktop:4
-msgctxt "Name"
-msgid "KRDC Plugin"
-msgstr ""
-
-#: krdc/konsole/krdc_konsole.desktop:5
-msgctxt "Name"
-msgid "Konsole"
-msgstr ""
-
-#: krdc/konsole/krdc_konsole.desktop:57
-msgctxt "Comment"
-msgid "Allows managing SSH or Telnet sessions through KRDC"
-msgstr ""
-
-#: krdc/krdc.desktop:7 krdc/krdc_approver/krdc_rfb_approver.notifyrc:49
-msgctxt "Name"
-msgid "KRDC"
-msgstr ""
-
-#: krdc/krdc.desktop:60
-msgctxt "GenericName"
-msgid "Remote Desktop Client"
-msgstr ""
-
-#: krdc/krdc_approver/krdc_rfb_approver.notifyrc:3
-msgctxt "Comment"
-msgid "KRDC"
-msgstr ""
-
-#: krdc/krdc_approver/krdc_rfb_approver.notifyrc:104
-msgctxt "Name"
-msgid "Incoming RFB Tube"
-msgstr ""
-
-#: krdc/nx/krdc_nx.desktop:5 krdc/nx/krdc_nx_config.desktop:4
-msgctxt "Name"
-msgid "NX"
-msgstr ""
-
-#: krdc/nx/krdc_nx.desktop:55
-msgctxt "Comment"
-msgid "Allows managing NX sessions through KRDC"
-msgstr ""
-
-#: krdc/rdp/krdc_rdp.desktop:5 krdc/rdp/krdc_rdp_config.desktop:4
-msgctxt "Name"
-msgid "RDP"
-msgstr ""
-
-#: krdc/rdp/krdc_rdp.desktop:55
-msgctxt "Comment"
-msgid "Allows managing RDP sessions through KRDC"
-msgstr ""
-
-#: krdc/rdp/smb2rdc.desktop:8
-msgctxt "Name"
-msgid "Open Remote Desktop Connection to This Machine"
-msgstr ""
-
-#: krdc/test/krdc_test.desktop:5
-msgctxt "Name"
-msgid "Test"
-msgstr ""
-
-#: krdc/test/krdc_test.desktop:57
-msgctxt "Comment"
-msgid "Testplugin for KRDC development"
-msgstr ""
-
-#: krdc/vnc/krdc_vnc.desktop:5 krdc/vnc/krdc_vnc_config.desktop:4
-msgctxt "Name"
-msgid "VNC"
-msgstr ""
-
-#: krdc/vnc/krdc_vnc.desktop:55
-msgctxt "Comment"
-msgid "Allows managing VNC sessions through KRDC"
-msgstr ""
-
-#: krfb/framebuffers/qt/krfb_framebuffer_qt.desktop:3
-msgctxt "Comment"
-msgid "Qt based Framebuffer for KRfb."
-msgstr ""
-
-#: krfb/framebuffers/qt/krfb_framebuffer_qt.desktop:41
-msgctxt "Name"
-msgid "Qt Framebuffer for KRfb"
-msgstr ""
-
-#: krfb/framebuffers/x11/krfb_framebuffer_x11.desktop:3
-msgctxt "Comment"
-msgid "X11 XDamage/XShm based Framebuffer for KRfb."
-msgstr ""
-
-#: krfb/framebuffers/x11/krfb_framebuffer_x11.desktop:41
-msgctxt "Name"
-msgid "X11 Framebuffer for KRfb"
-msgstr ""
-
-#: krfb/kcm_krfb/kcmkrfb.desktop:13
-msgctxt "Name"
-msgid "Desktop Sharing"
-msgstr "Rhannu Penbwrdd"
-
-#: krfb/kcm_krfb/kcmkrfb.desktop:85
-msgctxt "Comment"
-msgid "Configure Desktop Sharing"
-msgstr "Ffurfweddu Rhannu Penbwrdd"
-
-#: krfb/kinetd/kinetd.desktop:9
-msgctxt "Name"
-msgid "KDE Internet Daemon"
-msgstr "Daemon Rhyngrwyd KDE"
-
-#: krfb/kinetd/kinetd.desktop:82
-msgctxt "Comment"
-msgid "An Internet daemon that starts network services on demand"
-msgstr "Daemon Rhyngrwyd sy'n cychwyn gwasanaethau rhwydwaith ar alw"
-
-#: krfb/kinetd/kinetd.notifyrc:3
-msgctxt "Comment"
-msgid "KInetD"
-msgstr "KInetD"
-
-#: krfb/kinetd/kinetd.notifyrc:70
-msgctxt "Name"
-msgid "IncomingConnection"
-msgstr "CysylltiadCyrraedd"
-
-#: krfb/kinetd/kinetd.notifyrc:135
-msgctxt "Comment"
-msgid "Received incoming connection"
-msgstr "Derbynwyd cysylltiad a gyrhaeddodd"
-
-#: krfb/kinetd/kinetd.notifyrc:202
-msgctxt "Name"
-msgid "ProcessFailed"
-msgstr "MethoddProses"
-
-#: krfb/kinetd/kinetd.notifyrc:266
-msgctxt "Comment"
-msgid "Could not call process to handle connection"
-msgstr "Methu galw proses i drin y cysylltiad"
-
-#: krfb/kinetd/kinetdmodule.desktop:6
-msgctxt "Name"
-msgid "KInetD Module Type"
-msgstr "Math Modiwl KInetD"
-
-#: krfb/krfb/krfb-framebuffer.desktop:5
-msgctxt "Comment"
-msgid "Frame Buffer plugins for KRfb"
-msgstr ""
-
-#: krfb/krfb/krfb.desktop:8
-msgctxt "Name"
-msgid "Krfb"
-msgstr ""
-
-#: krfb/krfb/krfb.desktop:71
-msgctxt "GenericName"
-msgid "Desktop Sharing"
-msgstr "Rhannu Penbwrdd"
-
-#: krfb/krfb/krfb.notifyrc:3
-msgctxt "Comment"
-msgid "Desktop Sharing"
-msgstr "Rhannu Penbwrdd"
-
-#: krfb/krfb/krfb.notifyrc:71
-msgctxt "Name"
-msgid "User Accepts Connection"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:126
-msgctxt "Comment"
-msgid "User accepts connection"
-msgstr "Mae'r defnyddiwr yn derbyn y cysylltiad"
-
-#: krfb/krfb/krfb.notifyrc:194
-msgctxt "Name"
-msgid "User Refuses Connection"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:249
-msgctxt "Comment"
-msgid "User refuses connection"
-msgstr "Mae'r defnyddiwr yn gwrthod y cysylltiad"
-
-#: krfb/krfb/krfb.notifyrc:317
-msgctxt "Name"
-msgid "Connection Closed"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:373
-msgctxt "Comment"
-msgid "Connection closed"
-msgstr "Mae'r cysylltiad ar gau"
-
-#: krfb/krfb/krfb.notifyrc:444
-msgctxt "Name"
-msgid "Invalid Password"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:500
-msgctxt "Comment"
-msgid "Invalid password"
-msgstr "Cyfrinair annilys"
-
-#: krfb/krfb/krfb.notifyrc:574
-msgctxt "Name"
-msgid "Invalid Password Invitations"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:629
-msgctxt "Comment"
-msgid "The invited party sent an invalid password. Connection refused."
-msgstr ""
-"Anfonodd y person gwahodd cyfrinair annilys.  Gwrthodwyd y cysylltiad."
-
-#: krfb/krfb/krfb.notifyrc:696
-msgctxt "Name"
-msgid "New Connection on Hold"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:751
-msgctxt "Comment"
-msgid "Connection requested, user must accept"
-msgstr "Cais wedi'i wneud am gysylltiad,rhaid i'r ddefnyddiwr ei dderbyn"
-
-#: krfb/krfb/krfb.notifyrc:819
-msgctxt "Name"
-msgid "New Connection Auto Accepted"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:874
-msgctxt "Comment"
-msgid "New connection automatically established"
-msgstr "Sefydlwyd cysylltiad newydd yn awtomatig"
-
-#: krfb/krfb/krfb.notifyrc:942
-msgctxt "Name"
-msgid "Too Many Connections"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:997
-msgctxt "Comment"
-msgid "Busy, connection refused"
-msgstr "Prysur, gwrthodwyd y cysylltiad"
-
-#: krfb/krfb/krfb.notifyrc:1068
-msgctxt "Name"
-msgid "Unexpected Connection"
-msgstr ""
-
-#: krfb/krfb/krfb.notifyrc:1123
-msgctxt "Comment"
-msgid "Received unexpected connection, abort"
-msgstr "Derbynwyd cysylltiad annisgwyl,terfynu"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdepim.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdepim.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdepim.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdepim.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,1557 +0,0 @@
-# translation of desktop_kdepim.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# Kgyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdepim\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2009-07-18 17:56+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: akonadiconsole/akonadiconsole.desktop:2
-msgctxt "Name"
-msgid "Akonadi Console"
-msgstr ""
-
-#: akonadiconsole/akonadiconsole.desktop:54
-msgctxt "Comment"
-msgid "Akonadi Management and Debugging Console"
-msgstr ""
-
-#: akregator/configuration/akregator_config_advanced.desktop:14
-msgctxt "Name"
-msgid "Advanced"
-msgstr ""
-
-#: akregator/configuration/akregator_config_advanced.desktop:67
-msgctxt "Comment"
-msgid "Advanced Feed Reader Settings"
-msgstr ""
-
-#: akregator/configuration/akregator_config_appearance.desktop:14
-#: kleopatra/conf/kleopatra_config_appear.desktop:16
-#: kmail/kmail_config_appearance.desktop:17
-#: knode/knode_config_appearance.desktop:16
-#: ktimetracker/ktimetracker_config_display.desktop:17
-msgctxt "Name"
-msgid "Appearance"
-msgstr "Golwg"
-
-#: akregator/configuration/akregator_config_appearance.desktop:87
-msgctxt "Comment"
-msgid "Configure the Feed Reader Appearance"
-msgstr ""
-
-#: akregator/configuration/akregator_config_archive.desktop:14
-msgctxt "Name"
-msgid "Archive"
-msgstr ""
-
-#: akregator/configuration/akregator_config_archive.desktop:66
-msgctxt "Comment"
-msgid "Configure Feed Archive"
-msgstr ""
-
-#: akregator/configuration/akregator_config_browser.desktop:14
-msgctxt "Name"
-msgid "Browser"
-msgstr ""
-
-#: akregator/configuration/akregator_config_browser.desktop:67
-msgctxt "Comment"
-msgid "Configure Internal Browser Component"
-msgstr ""
-
-#: akregator/configuration/akregator_config_general.desktop:14
-#: korganizer/kcmconfigs/korganizer_configmain.desktop:17
-msgctxt "Name"
-msgid "General"
-msgstr "Cyffredinol"
-
-#: akregator/configuration/akregator_config_general.desktop:85
-msgctxt "Comment"
-msgid "Configure Feeds"
-msgstr ""
-
-#: akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop:3
-msgctxt "Name"
-msgid "Metakit storage backend"
-msgstr ""
-
-#: akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop:61
-#: akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop:50
-#: akregator/plugins/sharemicroblog/akregator_sharemicroblog_plugin.desktop:37
-#: akregator/src/akregator_plugin.desktop:4
-msgctxt "Comment"
-msgid "Plugin for Akregator"
-msgstr ""
-
-#: akregator/plugins/onlinesync/akregator_config_onlinesync.desktop:15
-msgctxt "Name"
-msgid "Online Readers"
-msgstr ""
-
-#: akregator/plugins/onlinesync/akregator_config_onlinesync.desktop:62
-msgctxt "Comment"
-msgid "Configure Online Readers"
-msgstr ""
-
-#: akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop:3
-msgctxt "Name"
-msgid "Akregator Online Feed Reader Support"
-msgstr ""
-
-#: akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop:15
-msgctxt "Name"
-msgid "Share Services"
-msgstr ""
-
-#: akregator/plugins/sharemicroblog/akregator_config_sharemicroblog.desktop:53
-msgctxt "Comment"
-msgid "Configure Share Services"
-msgstr ""
-
-#: akregator/plugins/sharemicroblog/akregator_sharemicroblog_plugin.desktop:3
-msgctxt "Name"
-msgid "Akregator Online Article Share"
-msgstr ""
-
-#: akregator/src/akregator.desktop:2
-msgctxt "Name"
-msgid "Akregator"
-msgstr ""
-
-#: akregator/src/akregator.desktop:72
-msgctxt "GenericName"
-msgid "Feed Reader"
-msgstr ""
-
-#: akregator/src/akregator.desktop:122
-msgctxt "Comment"
-msgid "A KDE News Feed Reader"
-msgstr ""
-
-#: akregator/src/akregator.notifyrc:3
-msgctxt "Comment"
-msgid "Akregator"
-msgstr ""
-
-#: akregator/src/akregator.notifyrc:68
-msgctxt "Name"
-msgid "Feed added"
-msgstr ""
-
-#: akregator/src/akregator.notifyrc:126
-msgctxt "Comment"
-msgid "A new feed was remotely added to Akregator"
-msgstr ""
-
-#: akregator/src/akregator.notifyrc:186
-msgctxt "Name"
-msgid "New Articles"
-msgstr ""
-
-#: akregator/src/akregator.notifyrc:247
-msgctxt "Comment"
-msgid "New articles were fetched"
-msgstr ""
-
-#: akregator/src/akregator_part.desktop:2
-msgctxt "Name"
-msgid "aKregatorPart"
-msgstr ""
-
-#: blogilo/blogilo.desktop:2
-msgctxt "Name"
-msgid "Blogilo"
-msgstr ""
-
-#: blogilo/blogilo.desktop:52
-msgctxt "GenericName"
-msgid "A KDE Blogging Client"
-msgstr ""
-
-#: calendarsupport/calendarplugin.desktop:2
-msgctxt "Name"
-msgid "Calendar Plugin Interface"
-msgstr ""
-
-#: calendarsupport/calendarplugin.desktop:50
-msgctxt "Comment"
-msgid "Calendar Plugin"
-msgstr "Ategyn Calendr"
-
-#: calendarviews/eventviews/agenda/calendardecoration.desktop:2
-msgctxt "Name"
-msgid "Calendar Decoration Interface"
-msgstr ""
-
-#: calendarviews/eventviews/agenda/calendardecoration.desktop:50
-msgctxt "Comment"
-msgid "Calendar Decoration Plugin"
-msgstr "Ategyn Addurniad Calendr"
-
-#: console/kabcclient/doc/examples/letters/home_address.desktop:5
-msgctxt "Name"
-msgid "Letter home/private address"
-msgstr ""
-
-#: console/kabcclient/doc/examples/letters/work_address.desktop:5
-msgctxt "Name"
-msgid "Letter business/work address"
-msgstr ""
-
-#: console/konsolekalendar/konsolekalendar.desktop:2
-msgctxt "Name"
-msgid "KonsoleKalendar"
-msgstr "KonsoleKalendar"
-
-#: doc/kontact-admin/kontact-admin.desktop:2
-msgctxt "Name"
-msgid "Kontact Administration"
-msgstr ""
-
-#: examples/coisceim/coisceimpart.desktop:2
-msgctxt "Name"
-msgid "CoisceimPart"
-msgstr ""
-
-#: examples/coisceim/kontact-plugin/coisceim_plugin.desktop:20
-msgctxt "Comment"
-msgid "Coisceim Plugin"
-msgstr ""
-
-#: examples/coisceim/kontact-plugin/coisceim_plugin.desktop:49
-msgctxt "Name"
-msgid "Trips"
-msgstr ""
-
-#: examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop:2
-#: kmail/KMail2.desktop:2
-msgctxt "Name"
-msgid "KMail"
-msgstr "KMail"
-
-#: examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop:77
-msgctxt ""
-"Comment|KMail plasma widget's comment, NOT translators' e-mail addresses."
-msgid "Your emails"
-msgstr ""
-
-#: examples/mailreader/mailreader.desktop:2
-msgctxt "Name"
-msgid "mailreader"
-msgstr ""
-
-#: examples/mailreader/mailreader.desktop:48
-msgctxt "GenericName"
-msgid "A KDE4 Application"
-msgstr ""
-
-#: kaddressbook/grantlee/tests/themes/air/theme-air.desktop:2
-msgctxt "Name"
-msgid "Air"
-msgstr ""
-
-#: kaddressbook/grantlee/tests/themes/air/theme-air.desktop:41
-msgctxt "Description"
-msgid "An Air theme"
-msgstr ""
-
-#: kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop:2
-msgctxt "Name"
-msgid "Simple"
-msgstr ""
-
-#: kaddressbook/grantlee/tests/themes/simple/theme-simple.desktop:41
-msgctxt "Description"
-msgid "A Simple theme"
-msgstr ""
-
-#: kaddressbook/grantlee/tests/themes/test/theme-test.desktop:2
-msgctxt "Name"
-msgid "Test"
-msgstr ""
-
-#: kaddressbook/grantlee/tests/themes/test/theme-test.desktop:40
-msgctxt "Description"
-msgid "A Test theme"
-msgstr ""
-
-#: kaddressbook/kaddressbook.desktop:2 kaddressbook/kaddressbookpart.desktop:3
-msgctxt "Name"
-msgid "KAddressBook"
-msgstr "KAddressBook/LlyfrKyfeiriadau"
-
-#: kaddressbook/kaddressbook.desktop:67
-msgctxt "GenericName"
-msgid "Contact Manager"
-msgstr ""
-
-#: kalarm/akonadi/akonadi_serializer_kalarm.desktop:2
-msgctxt "Name"
-msgid "KAlarm Event Serializer"
-msgstr ""
-
-#: kalarm/akonadi/akonadi_serializer_kalarm.desktop:40
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for KAlarm events"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource.desktop:2
-msgctxt "Name"
-msgid "KAlarm Calendar File"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource.desktop:44
-msgctxt "Comment"
-msgid "Loads data from a KAlarm calendar file"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource_active.desktop:2
-msgctxt "Name"
-msgid "KAlarm Active Alarms"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource_active.desktop:42
-msgctxt "Comment"
-msgid "Loads data from a KAlarm active alarm calendar file"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource_archived.desktop:2
-msgctxt "Name"
-msgid "KAlarm Archived Alarms"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource_archived.desktop:42
-msgctxt "Comment"
-msgid "Loads data from a KAlarm archived alarm calendar file"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource_template.desktop:2
-msgctxt "Name"
-msgid "KAlarm Templates"
-msgstr ""
-
-#: kalarm/akonadi/kalarm/kalarmresource_template.desktop:43
-msgctxt "Comment"
-msgid "Loads data from a KAlarm alarm template file"
-msgstr ""
-
-#: kalarm/akonadi/kalarmdir/kalarmdirresource.desktop:2
-msgctxt "Name"
-msgid "KAlarm Directory"
-msgstr ""
-
-#: kalarm/akonadi/kalarmdir/kalarmdirresource.desktop:36
-msgctxt "Comment"
-msgid "Loads data from a local KAlarm folder"
-msgstr ""
-
-#: kalarm/kalarm.autostart.desktop:3 kalarm/kalarm.desktop:3
-#: kalarm/rtcwakeaction.actions:2
-msgctxt "Name"
-msgid "KAlarm"
-msgstr "KLarwm"
-
-#: kalarm/kalarm.autostart.desktop:75
-msgctxt "Comment"
-msgid "KAlarm autostart at login"
-msgstr ""
-
-#: kalarm/kalarm.desktop:75
-msgctxt "GenericName"
-msgid "Personal Alarm Scheduler"
-msgstr "Trefnlennydd Larwm Personol"
-
-#: kalarm/resources/kalarm_manager.desktop:3
-msgctxt "Name"
-msgid "Alarms"
-msgstr ""
-
-#: kalarm/resources/local.desktop:2
-msgctxt "Name"
-msgid "Alarms in Local File"
-msgstr ""
-
-#: kalarm/resources/local.desktop:52
-msgctxt "Comment"
-msgid "Provides access to an alarm calendar stored in a single local file"
-msgstr ""
-
-#: kalarm/resources/localdir.desktop:2
-msgctxt "Name"
-msgid "Alarms in Local Directory"
-msgstr ""
-
-#: kalarm/resources/localdir.desktop:53
-msgctxt "Comment"
-msgid ""
-"Provides access to an alarm calendar stored in a local directory, in which "
-"each calendar item is stored in a separate file"
-msgstr ""
-
-#: kalarm/resources/remote.desktop:2
-msgctxt "Name"
-msgid "Alarms in Remote File"
-msgstr ""
-
-#: kalarm/resources/remote.desktop:53
-msgctxt "Comment"
-msgid ""
-"Provides access to an alarm calendar in a remote file using KDE's network "
-"framework KIO"
-msgstr ""
-
-#: kalarm/rtcwakeaction.actions:73
-msgctxt "Name"
-msgid "Set RTC wakeup time"
-msgstr ""
-
-#: kalarm/rtcwakeaction.actions:100
-msgctxt "Description"
-msgid "Set RTC wake-from-suspend time"
-msgstr ""
-
-#: kjots/Kjots.desktop:3
-msgctxt "Name"
-msgid "KJots"
-msgstr ""
-
-#: kjots/Kjots.desktop:52
-msgctxt "GenericName"
-msgid "Note Taker"
-msgstr ""
-
-#: kjots/kjots_config_misc.desktop:16 kmail/kmail_config_misc.desktop:17
-msgctxt "Name"
-msgid "Misc"
-msgstr "Amrywiol"
-
-#: kjots/kjots_config_misc.desktop:85
-msgctxt "Comment"
-msgid "Setup misc for KJots"
-msgstr ""
-
-#: kjots/kjotspart.desktop:2
-msgctxt "Name"
-msgid "KJotsPart"
-msgstr ""
-
-#: kjots/plasmoid/akonotes.desktop:2
-msgctxt "Name"
-msgid "Akonotes plasmoid"
-msgstr ""
-
-#: kjots/plasmoid/akonotes.desktop:36
-msgctxt "Comment"
-msgid "Akonotes plasmoid"
-msgstr ""
-
-#: kjots/plasmoid/akonotes_list.desktop:2
-msgctxt "Name"
-msgid "Akonotes list plasmoid"
-msgstr ""
-
-#: kjots/plasmoid/akonotes_list.desktop:36
-msgctxt "Comment"
-msgid "Akonotes list plasmoid"
-msgstr ""
-
-#: kjots/plasmoid/akonotes_note.desktop:2
-msgctxt "Name"
-msgid "Akonotes note plasmoid"
-msgstr ""
-
-#: kjots/plasmoid/akonotes_note.desktop:36
-msgctxt "Comment"
-msgid "Akonotes note plasmoid"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_appear.desktop:89
-msgctxt "Comment"
-msgid "Colors & Fonts Configuration"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_cryptooperations.desktop:16
-msgctxt "Name"
-msgid "Crypto Operations"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_cryptooperations.desktop:56
-msgctxt "Comment"
-msgid "Configuration of Crypto Operations"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_dirserv.desktop:16
-msgctxt "Name"
-msgid "Directory Services"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_dirserv.desktop:79
-msgctxt "Comment"
-msgid "Configuration of directory services"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_gnupgsystem.desktop:16
-msgctxt "Name"
-msgid "GnuPG System"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_gnupgsystem.desktop:62
-msgctxt "Comment"
-msgid "Configuration of GnuPG System options"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_smimevalidation.desktop:16
-msgctxt "Name"
-msgid "S/MIME Validation"
-msgstr ""
-
-#: kleopatra/conf/kleopatra_config_smimevalidation.desktop:62
-msgctxt "Comment"
-msgid "Configuration of S/MIME certificate validation options"
-msgstr ""
-
-#: kleopatra/kleopatra.desktop:6 kleopatra/kleopatra_import.desktop:9
-msgctxt "Name"
-msgid "Kleopatra"
-msgstr "Kleopatra"
-
-#: kleopatra/kleopatra.desktop:75
-msgctxt "GenericName"
-msgid "Certificate Manager and Unified Crypto GUI"
-msgstr ""
-
-#: kleopatra/kleopatra_decryptverifyfiles.desktop:6
-msgctxt "Name"
-msgid "Kleopatra Decrypt/Verify Files"
-msgstr ""
-
-#: kleopatra/kleopatra_decryptverifyfiles.desktop:55
-msgctxt "Name"
-msgid "Decrypt/Verify File"
-msgstr ""
-
-#: kleopatra/kleopatra_decryptverifyfolders.desktop:5
-msgctxt "Name"
-msgid "Kleopatra Decrypt/Verify All Files In Folder"
-msgstr ""
-
-#: kleopatra/kleopatra_decryptverifyfolders.desktop:54
-msgctxt "Name"
-msgid "Decrypt/Verify All Files In Folder"
-msgstr ""
-
-#: kleopatra/kleopatra_import.desktop:78
-msgctxt "Comment"
-msgid "Certificate Manager and Unified Crypto GUI"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfiles.desktop:7
-msgctxt "Name"
-msgid "Kleopatra Sign/Encrypt Files"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfiles.desktop:56
-msgctxt "Name"
-msgid "Sign & Encrypt File"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfiles.desktop:97
-msgctxt "Name"
-msgid "Encrypt File"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfiles.desktop:150
-msgctxt "Name"
-msgid "OpenPGP-Sign File"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfiles.desktop:199
-msgctxt "Name"
-msgid "S/MIME-Sign File"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfolders.desktop:6
-msgctxt "Name"
-msgid "Kleopatra Sign/Encrypt Folders"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfolders.desktop:54
-msgctxt "Name"
-msgid "Archive, Sign & Encrypt Folder"
-msgstr ""
-
-#: kleopatra/kleopatra_signencryptfolders.desktop:103
-msgctxt "Name"
-msgid "Archive & Encrypt Folder"
-msgstr ""
-
-#: kmail/KMail2.desktop:80
-msgctxt "GenericName"
-msgid "Mail Client"
-msgstr "Dibynnydd Ebost"
-
-#: kmail/dbusmail.desktop:4
-msgctxt "Comment"
-msgid "Mail program with a D-Bus interface"
-msgstr ""
-
-#: kmail/kcm_kpimidentities/kcm_kpimidentities.desktop:13
-#: kmail/kmail_config_identity.desktop:17
-msgctxt "Name"
-msgid "Identities"
-msgstr ""
-
-#: kmail/kcm_kpimidentities/kcm_kpimidentities.desktop:82
-#: kmail/kmail_config_identity.desktop:86
-msgctxt "Comment"
-msgid "Manage Identities"
-msgstr ""
-
-#: kmail/kmail2.notifyrc:3
-msgctxt "Comment"
-msgid "KMail"
-msgstr "KMail"
-
-#: kmail/kmail2.notifyrc:74
-msgctxt "Name"
-msgid "Error While Checking Mail"
-msgstr ""
-
-#: kmail/kmail2.notifyrc:115
-msgctxt "Comment"
-msgid "There was an error while checking for new mail"
-msgstr ""
-
-#: kmail/kmail2.notifyrc:159
-msgctxt "Name"
-msgid "New Mail Arrived"
-msgstr ""
-
-#: kmail/kmail2.notifyrc:222
-msgctxt "Comment"
-msgid "New mail arrived"
-msgstr "Cyrhaeddodd ebost newydd"
-
-#: kmail/kmail_addattachmentservicemenu.desktop:10
-msgctxt "Name"
-msgid "Send To"
-msgstr ""
-
-#: kmail/kmail_config_accounts.desktop:17
-#: knode/knode_config_accounts.desktop:16
-msgctxt "Name"
-msgid "Accounts"
-msgstr "Cyfrifon"
-
-#: kmail/kmail_config_accounts.desktop:88
-msgctxt "Comment"
-msgid "Setup for Sending and Receiving Messages"
-msgstr ""
-
-#: kmail/kmail_config_appearance.desktop:90
-#: knode/knode_config_appearance.desktop:89
-msgctxt "Comment"
-msgid "Customize Visual Appearance"
-msgstr "Addasu Golwg"
-
-#: kmail/kmail_config_composer.desktop:17
-msgctxt "Name"
-msgid "Composer"
-msgstr "Cyfansoddydd"
-
-#: kmail/kmail_config_composer.desktop:83
-msgctxt "Comment"
-msgid "Message Composer Settings"
-msgstr ""
-
-#: kmail/kmail_config_misc.desktop:86
-msgctxt "Comment"
-msgid "Settings that don't fit elsewhere"
-msgstr ""
-
-#: kmail/kmail_config_security.desktop:17
-msgctxt "Name"
-msgid "Security"
-msgstr "Diogelwch"
-
-#: kmail/kmail_config_security.desktop:89
-msgctxt "Comment"
-msgid "Security & Privacy Settings"
-msgstr ""
-
-#: kmail/kmail_view.desktop:2
-msgctxt "Name"
-msgid "KMail view"
-msgstr ""
-
-#: knode/KNode.desktop:7
-msgctxt "Name"
-msgid "KNode"
-msgstr "KNode"
-
-#: knode/KNode.desktop:74
-msgctxt "GenericName"
-msgid "News Reader"
-msgstr "Darllenydd Newyddion"
-
-#: knode/knode_config_accounts.desktop:87
-msgctxt "Comment"
-msgid "Setup for Newsgroup and Mail Servers"
-msgstr ""
-
-#: knode/knode_config_cleanup.desktop:16
-msgctxt "Name"
-msgid "Cleanup"
-msgstr ""
-
-#: knode/knode_config_cleanup.desktop:81
-msgctxt "Comment"
-msgid "Preserving Disk Space"
-msgstr ""
-
-#: knode/knode_config_identity.desktop:16
-msgctxt "Name"
-msgid "Identity"
-msgstr "Dynodiad"
-
-#: knode/knode_config_identity.desktop:87
-msgctxt "Comment"
-msgid "Personal Information"
-msgstr "Gwybodaeth Bersonol"
-
-#: knode/knode_config_post_news.desktop:16
-msgctxt "Name"
-msgid "Posting News"
-msgstr ""
-
-#: knode/knode_config_privacy.desktop:16
-msgctxt "Name"
-msgid "Signing/Verifying"
-msgstr ""
-
-#: knode/knode_config_privacy.desktop:76
-msgctxt "Comment"
-msgid "Protect your privacy by signing and verifying postings"
-msgstr ""
-
-#: knode/knode_config_read_news.desktop:16
-msgctxt "Name"
-msgid "Reading News"
-msgstr ""
-
-#: knotes/knote_config_action.desktop:16
-msgctxt "Name"
-msgid "Actions"
-msgstr ""
-
-#: knotes/knote_config_action.desktop:63
-msgctxt "Comment"
-msgid "Setup actions for notes"
-msgstr ""
-
-#: knotes/knote_config_display.desktop:16
-msgctxt "Name"
-msgid "Display"
-msgstr ""
-
-#: knotes/knote_config_display.desktop:64
-msgctxt "Comment"
-msgid "Setup display for notes"
-msgstr ""
-
-#: knotes/knote_config_editor.desktop:16
-msgctxt "Name"
-msgid "Editor"
-msgstr ""
-
-#: knotes/knote_config_editor.desktop:66
-msgctxt "Comment"
-msgid "Setup editor"
-msgstr ""
-
-#: knotes/knote_config_network.desktop:16
-msgctxt "Name"
-msgid "Network"
-msgstr ""
-
-#: knotes/knote_config_network.desktop:65
-msgctxt "Comment"
-msgid "Network Settings"
-msgstr ""
-
-#: knotes/knote_config_style.desktop:16
-msgctxt "Name"
-msgid "Style"
-msgstr ""
-
-#: knotes/knote_config_style.desktop:64
-msgctxt "Comment"
-msgid "Style Settings"
-msgstr ""
-
-#: knotes/knotes.desktop:9
-msgctxt "GenericName"
-msgid "Popup Notes"
-msgstr "Naid-nodiadau"
-
-#: knotes/knotes.desktop:75
-msgctxt "Name"
-msgid "KNotes"
-msgstr "KNodiadau"
-
-#: knotes/knotes_manager.desktop:3
-msgctxt "Name"
-msgid "Notes"
-msgstr "Nodiadau"
-
-#: knotes/local.desktop:2
-msgctxt "Name"
-msgid "Notes in Local File"
-msgstr ""
-
-#: kontact/plugins/akregator/akregator.setdlg:2
-#: kontact/plugins/akregator/akregatorplugin.desktop:81
-msgctxt "Name"
-msgid "Feeds"
-msgstr ""
-
-#: kontact/plugins/akregator/akregator.setdlg:68
-msgctxt "Comment"
-msgid "Feed Reader"
-msgstr ""
-
-#: kontact/plugins/akregator/akregatorplugin.desktop:17
-msgctxt "Comment"
-msgid "Akregator Plugin"
-msgstr ""
-
-#: kontact/plugins/kaddressbook/kaddressbook.setdlg:2
-#: kontact/plugins/kaddressbook/kaddressbookplugin.desktop:84
-msgctxt "Name"
-msgid "Contacts"
-msgstr "Cysylltau"
-
-#: kontact/plugins/kaddressbook/kaddressbook.setdlg:73
-msgctxt "Comment"
-msgid "Address Book Component"
-msgstr ""
-
-#: kontact/plugins/kaddressbook/kaddressbookplugin.desktop:20
-msgctxt "Comment"
-msgid "Kontact KAddressBook Plugin"
-msgstr "Ategyn KLlyfrCyfeiriadau Kontact"
-
-#: kontact/plugins/kjots/kjots.setdlg:2
-#: kontact/plugins/kjots/kjots_plugin.desktop:65
-msgctxt "Name"
-msgid "Notebooks"
-msgstr ""
-
-#: kontact/plugins/kjots/kjots.setdlg:49
-msgctxt "Comment"
-msgid "Notebooks Component"
-msgstr ""
-
-#: kontact/plugins/kjots/kjots_plugin.desktop:20
-msgctxt "Comment"
-msgid "Kontact KJots Plugin"
-msgstr ""
-
-#: kontact/plugins/kmail/kcmkmailsummary.desktop:15
-msgctxt "Name"
-msgid "New Messages"
-msgstr ""
-
-#: kontact/plugins/kmail/kcmkmailsummary.desktop:67
-msgctxt "Comment"
-msgid "Mail Summary Setup"
-msgstr ""
-
-#: kontact/plugins/kmail/kmail.setdlg:2
-#: kontact/plugins/kmail/kmailplugin.desktop:87
-msgctxt "Name"
-msgid "Mail"
-msgstr "Ebost"
-
-#: kontact/plugins/kmail/kmail.setdlg:75
-msgctxt "Comment"
-msgid "Mail Component"
-msgstr ""
-
-#: kontact/plugins/kmail/kmailplugin.desktop:20
-msgctxt "Comment"
-msgid "Kontact KMail Plugin"
-msgstr "Ategyn KMail Kontact"
-
-#: kontact/plugins/knode/knode.setdlg:2
-#: kontact/plugins/knode/knodeplugin.desktop:84
-msgctxt "Name"
-msgid "Usenet"
-msgstr ""
-
-#: kontact/plugins/knode/knode.setdlg:50
-msgctxt "Comment"
-msgid "Usenet Component"
-msgstr ""
-
-#: kontact/plugins/knode/knodeplugin.desktop:19
-msgctxt "Comment"
-msgid "Kontact KNode Plugin"
-msgstr "Ategyn KNode Kontact"
-
-#: kontact/plugins/knotes/knotes.setdlg:2
-#: kontact/plugins/knotes/knotesplugin.desktop:83
-msgctxt "Name"
-msgid "Popup Notes"
-msgstr ""
-
-#: kontact/plugins/knotes/knotes.setdlg:49
-msgctxt "Comment"
-msgid "Popup Notes Component"
-msgstr ""
-
-#: kontact/plugins/knotes/knotesplugin.desktop:18
-msgctxt "Comment"
-msgid "Kontact KNotes Plugin"
-msgstr "Ategyn KNotes Kontact"
-
-#: kontact/plugins/korganizer/journalplugin.desktop:19
-msgctxt "Comment"
-msgid "Kontact KOrganizer Journal Plugin"
-msgstr ""
-
-#: kontact/plugins/korganizer/journalplugin.desktop:75
-msgctxt "Name"
-msgid "Journal"
-msgstr "Dyddlyfr"
-
-#: kontact/plugins/korganizer/kcmapptsummary.desktop:15
-msgctxt "Name"
-msgid "Upcoming Events"
-msgstr ""
-
-#: kontact/plugins/korganizer/kcmapptsummary.desktop:63
-msgctxt "Comment"
-msgid "Upcoming Events Summary Setup"
-msgstr ""
-
-#: kontact/plugins/korganizer/kcmtodosummary.desktop:15
-msgctxt "Name"
-msgid "Pending To-dos"
-msgstr ""
-
-#: kontact/plugins/korganizer/kcmtodosummary.desktop:63
-msgctxt "Comment"
-msgid "Pending To-dos Summary Setup"
-msgstr ""
-
-#: kontact/plugins/korganizer/korganizer.setdlg:2
-#: kontact/plugins/korganizer/korganizerplugin.desktop:84
-msgctxt "Name"
-msgid "Calendar"
-msgstr "Calendr"
-
-#: kontact/plugins/korganizer/korganizer.setdlg:73
-msgctxt "Comment"
-msgid "Calendar Component"
-msgstr ""
-
-#: kontact/plugins/korganizer/korganizerplugin.desktop:19
-msgctxt "Comment"
-msgid "Kontact KOrganizer Plugin"
-msgstr "Ategyn KOrganizer Kontact"
-
-#: kontact/plugins/korganizer/todoplugin.desktop:19
-msgctxt "Comment"
-msgid "Kontact KOrganizer To-do List Plugin"
-msgstr ""
-
-#: kontact/plugins/korganizer/todoplugin.desktop:75
-msgctxt "Name"
-msgid "To-do List"
-msgstr "Rhestr I'w-Wneud"
-
-#: kontact/plugins/ktimetracker/ktimetracker.setdlg:2
-#: kontact/plugins/ktimetracker/ktimetracker_plugin.desktop:64
-msgctxt "Name"
-msgid "Time Tracker"
-msgstr ""
-
-#: kontact/plugins/ktimetracker/ktimetracker.setdlg:49
-msgctxt "Comment"
-msgid "Time Tracker Component"
-msgstr ""
-
-#: kontact/plugins/ktimetracker/ktimetracker_plugin.desktop:18
-msgctxt "Comment"
-msgid "TimeTracker Plugin"
-msgstr ""
-
-#: kontact/plugins/planner/kcmplanner.desktop:15
-#: kontact/plugins/planner/planner.setdlg:2
-#: kontact/plugins/planner/plannerplugin.desktop:17
-msgctxt "Name"
-msgid "Planner"
-msgstr ""
-
-#: kontact/plugins/planner/kcmplanner.desktop:62
-msgctxt "Comment"
-msgid "Planner Setup"
-msgstr ""
-
-#: kontact/plugins/planner/planner.setdlg:49
-msgctxt "Comment"
-msgid "Planner Summary"
-msgstr ""
-
-#: kontact/plugins/planner/plannerplugin.desktop:64
-msgctxt "Comment"
-msgid "Planner Plugin"
-msgstr ""
-
-#: kontact/plugins/specialdates/kcmsdsummary.desktop:15
-msgctxt "Name"
-msgid "Upcoming Special Dates"
-msgstr ""
-
-#: kontact/plugins/specialdates/kcmsdsummary.desktop:65
-msgctxt "Comment"
-msgid "Upcoming Special Dates Summary Setup"
-msgstr ""
-
-#: kontact/plugins/specialdates/specialdates.setdlg:2
-msgctxt "Name"
-msgid "Special Dates Summary"
-msgstr ""
-
-#: kontact/plugins/specialdates/specialdates.setdlg:64
-msgctxt "Comment"
-msgid "Special Dates Summary Component"
-msgstr ""
-
-#: kontact/plugins/specialdates/specialdatesplugin.desktop:17
-msgctxt "Name"
-msgid "Special Dates"
-msgstr ""
-
-#: kontact/plugins/specialdates/specialdatesplugin.desktop:82
-msgctxt "Comment"
-msgid "Special Dates Plugin"
-msgstr ""
-
-#: kontact/plugins/summary/kcmkontactsummary.desktop:15
-msgctxt "Name"
-msgid "Summaries"
-msgstr ""
-
-#: kontact/plugins/summary/kcmkontactsummary.desktop:63
-msgctxt "Comment"
-msgid "Summary Selection"
-msgstr ""
-
-#: kontact/plugins/summary/summary.setdlg:2
-#: kontact/plugins/summary/summaryplugin.desktop:74
-msgctxt "Name"
-msgid "Summary"
-msgstr "Crynodeb"
-
-#: kontact/plugins/summary/summary.setdlg:73
-msgctxt "Comment"
-msgid "Summary View"
-msgstr ""
-
-#: kontact/plugins/summary/summaryplugin.desktop:15
-msgctxt "Comment"
-msgid "Kontact SummaryView Plugin"
-msgstr "Ategyn Golwg Grynodeb Kontact"
-
-#: kontact/src/Kontact.desktop:2
-msgctxt "Name"
-msgid "Kontact"
-msgstr "Kontact"
-
-#: kontact/src/Kontact.desktop:71
-msgctxt "GenericName"
-msgid "Personal Information Manager"
-msgstr "Rheolydd Gwybodaeth Personol"
-
-#: kontact/src/kontactconfig.desktop:15
-msgctxt "Name"
-msgid "Kontact Configuration"
-msgstr ""
-
-#: kontact/src/kontactconfig.desktop:45
-msgctxt "Comment"
-msgid "Default KDE Kontact Component"
-msgstr ""
-
-#: korganizer/dbuscalendar.desktop:2
-msgctxt "Name"
-msgid "DBUSCalendar"
-msgstr ""
-
-#: korganizer/dbuscalendar.desktop:51
-msgctxt "Comment"
-msgid "Organizer with a D-Bus interface"
-msgstr ""
-
-#: korganizer/interfaces/korganizer/korganizerpart.desktop:2
-msgctxt "Name"
-msgid "KOrganizer Part Interface"
-msgstr ""
-
-#: korganizer/interfaces/korganizer/korganizerpart.desktop:50
-#: korganizer/interfaces/korganizer/korgprintplugin.desktop:49
-msgctxt "Comment"
-msgid "KOrganizer Part"
-msgstr "KTrefnydd Part"
-
-#: korganizer/interfaces/korganizer/korgprintplugin.desktop:2
-msgctxt "Name"
-msgid "KOrganizer Print Plugin Interface"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop:17
-msgctxt "Name"
-msgid "Colors and Fonts"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configcolorsandfonts.desktop:64
-msgctxt "Comment"
-msgid "KOrganizer Colors and Fonts Configuration"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configdesignerfields.desktop:17
-msgctxt "Name"
-msgid "Custom Pages"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configdesignerfields.desktop:81
-msgctxt "Comment"
-msgid "Configure the Custom Pages"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configfreebusy.desktop:17
-msgctxt "Name"
-msgid "Free/Busy"
-msgstr "Rhydd/Prysur"
-
-#: korganizer/kcmconfigs/korganizer_configfreebusy.desktop:83
-msgctxt "Comment"
-msgid "KOrganizer Free/Busy Configuration"
-msgstr "Ffurfweddiad Rhydd/Prysur KTrefnydd"
-
-#: korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop:17
-msgctxt "Name"
-msgid "Group Scheduling"
-msgstr "Trefnlennu Grŵp"
-
-#: korganizer/kcmconfigs/korganizer_configgroupscheduling.desktop:79
-msgctxt "Comment"
-msgid "KOrganizer Group Scheduling Configuration"
-msgstr "Ffurfweddiad Trefnlennu Grŵp KTrefnydd"
-
-#: korganizer/kcmconfigs/korganizer_configmain.desktop:88
-msgctxt "Comment"
-msgid "KOrganizer Main Configuration"
-msgstr "Prif Ffurfweddiad KTrefnydd"
-
-#: korganizer/kcmconfigs/korganizer_configplugins.desktop:17
-msgctxt "Name"
-msgid "Plugins"
-msgstr "Ategion"
-
-#: korganizer/kcmconfigs/korganizer_configplugins.desktop:85
-msgctxt "Comment"
-msgid "KOrganizer Plugin Configuration"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configtime.desktop:17
-msgctxt "Name"
-msgid "Time and Date"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configtime.desktop:68
-msgctxt "Comment"
-msgid "KOrganizer Time and Date Configuration"
-msgstr ""
-
-#: korganizer/kcmconfigs/korganizer_configviews.desktop:17
-msgctxt "Name"
-msgid "Views"
-msgstr "Golygon"
-
-#: korganizer/kcmconfigs/korganizer_configviews.desktop:87
-msgctxt "Comment"
-msgid "KOrganizer View Configuration"
-msgstr "Ffurfweddiad Golygon KTrefnydd"
-
-#: korganizer/korgac/korgac.desktop:3
-msgctxt "Name"
-msgid "KOrganizer Reminder Client"
-msgstr ""
-
-#: korganizer/korgac/korgac.desktop:63
-msgctxt "GenericName"
-msgid "KOrganizer Reminder Daemon Client"
-msgstr ""
-
-#: korganizer/korgac/korgacagent.desktop:2
-msgctxt "Name"
-msgid "Reminder Daemon"
-msgstr ""
-
-#: korganizer/korgac/korgacagent.desktop:37
-msgctxt "Comment"
-msgid "Event and task reminder daemon"
-msgstr ""
-
-#: korganizer/korganizer-import.desktop:3 korganizer/korganizer.desktop:3
-#: korganizer/korganizer_part.desktop:3
-msgctxt "Comment"
-msgid "Calendar and Scheduling Program"
-msgstr "Rhaglen Galendr a Drefnlennu"
-
-#: korganizer/korganizer-import.desktop:75 korganizer/korganizer.desktop:75
-#: korganizer/korganizer_part.desktop:73
-msgctxt "Name"
-msgid "KOrganizer"
-msgstr "KTrefnydd"
-
-#: korganizer/korganizer-import.desktop:142 korganizer/korganizer.desktop:142
-msgctxt "GenericName"
-msgid "Personal Organizer"
-msgstr "Trefnydd Personol"
-
-#: korganizer/plugins/datenums/datenums.desktop:3
-msgctxt "Name"
-msgid "Date Numbers Plugin for Calendars"
-msgstr ""
-
-#: korganizer/plugins/datenums/datenums.desktop:61
-msgctxt "Comment"
-msgid ""
-"For each day this plugin shows its daynumber of the year at the top of the "
-"agenda view. For example, February 1 is day 32 of the year."
-msgstr ""
-
-#: korganizer/plugins/hebrew/hebrew.desktop:3
-msgctxt "Name"
-msgid "Jewish Calendar Plugin"
-msgstr ""
-
-#: korganizer/plugins/hebrew/hebrew.desktop:63
-msgctxt "Comment"
-msgid "Shows all dates in KOrganizer also in the Jewish calendar system."
-msgstr ""
-
-#: korganizer/plugins/picoftheday/picoftheday.desktop:3
-msgctxt "Name"
-msgid "Wikipedia Picture Of the Day Plugin for Calendars"
-msgstr ""
-
-#: korganizer/plugins/picoftheday/picoftheday.desktop:51
-msgctxt "Comment"
-msgid "This plugin provides the Wikipedia Picture of the Day"
-msgstr ""
-
-#: korganizer/plugins/printing/journal/journalprint.desktop:3
-msgctxt "Name"
-msgid "Journal Print Style"
-msgstr ""
-
-#: korganizer/plugins/printing/journal/journalprint.desktop:60
-msgctxt "Comment"
-msgid "This plugin allows you to print out journal entries (diary entries)."
-msgstr ""
-
-#: korganizer/plugins/printing/list/listprint.desktop:3
-msgctxt "Name"
-msgid "List Print Style"
-msgstr ""
-
-#: korganizer/plugins/printing/list/listprint.desktop:60
-msgctxt "Comment"
-msgid "This plugin allows you to print out events and to-dos in list form."
-msgstr ""
-
-#: korganizer/plugins/printing/whatsnext/whatsnextprint.desktop:3
-msgctxt "Name"
-msgid "What's Next Print Style"
-msgstr ""
-
-#: korganizer/plugins/printing/whatsnext/whatsnextprint.desktop:60
-msgctxt "Comment"
-msgid ""
-"This plugin allows you to print out a list of all upcoming events and to-dos."
-msgstr ""
-
-#: korganizer/plugins/printing/year/yearprint.desktop:3
-msgctxt "Name"
-msgid "Yearly Print Style"
-msgstr ""
-
-#: korganizer/plugins/printing/year/yearprint.desktop:55
-msgctxt "Comment"
-msgid "This plugin allows you to print out a yearly calendar."
-msgstr ""
-
-#: korganizer/plugins/thisdayinhistory/thisdayinhistory.desktop:3
-msgctxt "Name"
-msgid "Wikipedia 'This Day in History' Plugin"
-msgstr ""
-
-#: korganizer/plugins/thisdayinhistory/thisdayinhistory.desktop:48
-msgctxt "Comment"
-msgid "This plugin provides links to Wikipedia's 'This Day in History' pages"
-msgstr ""
-
-#: kresources/blog/blog.desktop:2
-msgctxt "Name"
-msgid "Journal in a blog"
-msgstr ""
-
-#: kresources/blog/blog.desktop:52
-msgctxt "Comment"
-msgid "Allows to post calendar journal entries as blog entries"
-msgstr ""
-
-#: kresources/groupwise/kabc_groupwise.desktop:2
-#: kresources/groupwise/kcal_groupwise.desktop:2
-msgctxt "Name"
-msgid "Novell GroupWise Server"
-msgstr ""
-
-#: kresources/remote/remote.desktop:2
-msgctxt "Name"
-msgid "Calendar in Remote File"
-msgstr "Calendr mewn Ffeil Pell"
-
-#: kresources/remote/remote.desktop:63
-msgctxt "Comment"
-msgid ""
-"Provides access to a calendar in a remote file using KDE's network framework "
-"KIO"
-msgstr ""
-
-#: ktimetracker/ktimetracker_config_behavior.desktop:17
-msgctxt "Name"
-msgid "Behavior"
-msgstr ""
-
-#: ktimetracker/ktimetracker_config_behavior.desktop:65
-msgctxt "Comment"
-msgid "Configure Behavior"
-msgstr ""
-
-#: ktimetracker/ktimetracker_config_display.desktop:90
-msgctxt "Comment"
-msgid "Configure Appearance"
-msgstr ""
-
-#: ktimetracker/ktimetracker_config_storage.desktop:17
-msgctxt "Name"
-msgid "Storage"
-msgstr ""
-
-#: ktimetracker/ktimetracker_config_storage.desktop:64
-msgctxt "Comment"
-msgid "Configure Storage"
-msgstr ""
-
-#: ktimetracker/ktimetrackerpart.desktop:2
-msgctxt "Name"
-msgid "KTimeTracker Component"
-msgstr ""
-
-#: ktimetracker/support/ktimetracker.desktop:2
-msgctxt "Name"
-msgid "KTimeTracker"
-msgstr ""
-
-#: ktimetracker/support/ktimetracker.desktop:51
-msgctxt "GenericName"
-msgid "Personal Time Tracker"
-msgstr "Dilynnydd Amser Personol"
-
-#: libkdepim/ldap/kcmldap.desktop:13
-msgctxt "Name"
-msgid "LDAP Server Settings"
-msgstr ""
-
-#: libkdepim/ldap/kcmldap.desktop:55
-msgctxt "Comment"
-msgid "Configure the available LDAP servers"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:5 libkleo/libkleopatrarc.desktop:5
-msgctxt "Name"
-msgid "TAR (PGP®-compatible)"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:53 libkleo/libkleopatrarc.desktop:138
-msgctxt "Name"
-msgid "sha1sum"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:99
-msgctxt "Name"
-msgid "sha256sum"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:142 libkleo/libkleopatrarc.desktop:184
-msgctxt "Name"
-msgid "md5sum"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:186 libkleo/libkleopatrarc.desktop:228
-msgctxt "Name"
-msgid "Not Validated Key"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:249 libkleo/libkleopatrarc.desktop:291
-msgctxt "Name"
-msgid "Expired Key"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:313 libkleo/libkleopatrarc.desktop:355
-msgctxt "Name"
-msgid "Revoked Key"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:377 libkleo/libkleopatrarc.desktop:419
-msgctxt "Name"
-msgid "Trusted Root Certificate"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:443 libkleo/libkleopatrarc.desktop:485
-msgctxt "Name"
-msgid "Not Trusted Root Certificate"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:505 libkleo/libkleopatrarc.desktop:547
-msgctxt "Name"
-msgid "Keys for Qualified Signatures"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:553 libkleo/libkleopatrarc.desktop:595
-msgctxt "Name"
-msgid "Other Keys"
-msgstr ""
-
-#: libkleo/libkleopatrarc-win32.desktop:604 libkleo/libkleopatrarc.desktop:646
-msgctxt "Name"
-msgid "Smartcard Key"
-msgstr ""
-
-#: libkleo/libkleopatrarc.desktop:92
-msgctxt "Name"
-msgid "TAR (with bzip2 compression)"
-msgstr ""
-
-#: mobile/calendar/korganizer-mobile.desktop:4
-msgctxt "Name"
-msgid "Kontact Touch Calendar"
-msgstr ""
-
-#: mobile/calendar/korganizer-mobile.desktop:48
-msgctxt "Keywords"
-msgid "mobile"
-msgstr ""
-
-#: mobile/contacts/kaddressbook-mobile.desktop:4
-msgctxt "Name"
-msgid "Kontact Touch Contacts"
-msgstr ""
-
-#: mobile/mail/kmail-mobile.desktop:4 mobile/mail/kmail-mobile.notifyrc:34
-msgctxt "Name"
-msgid "Kontact Touch Mail"
-msgstr ""
-
-#: mobile/mail/kmail-mobile.notifyrc:3
-msgctxt "Comment"
-msgid "KDE Kontact Touch e-mail client"
-msgstr ""
-
-#: mobile/mail/kmail-mobile.notifyrc:68
-msgctxt "Name"
-msgid "Error while sending email"
-msgstr ""
-
-#: mobile/mail/kmail-mobile.notifyrc:104
-msgctxt "Comment"
-msgid "There was an error while trying to send the e-mail."
-msgstr ""
-
-#: mobile/notes/notes-mobile.desktop:4
-msgctxt "Name"
-msgid "Kontact Touch Notes"
-msgstr ""
-
-#: mobile/tasks/tasks-mobile.desktop:4
-msgctxt "Name"
-msgid "Kontact Touch Tasks"
-msgstr ""
-
-#: nepomuk_email_feeder/nepomukemailfeeder.desktop:2
-msgctxt "Name"
-msgid "Nepomuk EMail Feeder"
-msgstr ""
-
-#: nepomuk_email_feeder/nepomukemailfeeder.desktop:46
-msgctxt "Comment"
-msgid "Extension to push emails into Nepomuk"
-msgstr ""
-
-#: plugins/messageviewer/bodypartformatter/application_ms-tnef.desktop:2
-msgctxt "Name"
-msgid "TNEF"
-msgstr ""
-
-#: plugins/messageviewer/bodypartformatter/application_ms-tnef.desktop:36
-msgctxt "Comment"
-msgid "A bodypart formatter plugin for TNEF attachments"
-msgstr ""
-
-#: plugins/messageviewer/bodypartformatter/text_calendar.desktop:2
-#: plugins/messageviewer/bodypartformatter/text_vcard.desktop:2
-#: plugins/messageviewer/bodypartformatter/text_xdiff.desktop:2
-msgctxt "Name"
-msgid "Application Octetstream"
-msgstr ""
-
-#: plugins/messageviewer/bodypartformatter/text_calendar.desktop:59
-msgctxt "Comment"
-msgid "A bodypart formatter plugin for text/calendar"
-msgstr ""
-
-#: plugins/messageviewer/bodypartformatter/text_vcard.desktop:59
-msgctxt "Comment"
-msgid "A bodypart formatter plugin for text/vcard"
-msgstr ""
-
-#: plugins/messageviewer/bodypartformatter/text_xdiff.desktop:59
-msgctxt "Comment"
-msgid "A bodypart formatter plugin for text/x-patch"
-msgstr ""
-
-#: wizards/groupwarewizard.desktop:2
-msgctxt "Name"
-msgid "KDE Groupware Wizard"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdepim-runtime.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdepim-runtime.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdepim-runtime.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdepim-runtime.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,581 +0,0 @@
-# translation of desktop_kdepim.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# Kgyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdepim\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:24+0000\n"
-"PO-Revision-Date: 2009-10-20 07:46+0000\n"
-"Last-Translator: David Planella <david.planella@ubuntu.com>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: accountwizard/accountwizard.desktop:2
-msgctxt "Name"
-msgid "Account Wizard"
-msgstr ""
-
-#: accountwizard/accountwizard.desktop:46
-msgctxt "Comment"
-msgid "Launch the account wizard to configure PIM accounts."
-msgstr ""
-
-#: agents/calendarsearch/calendarsearchagent.desktop:2
-msgctxt "Name"
-msgid "Calendar Search Agent"
-msgstr ""
-
-#: agents/invitations/invitationsagent.desktop:2
-msgctxt "Name"
-msgid "Invitations Dispatcher Agent"
-msgstr ""
-
-#: agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc:3
-msgctxt "Comment"
-msgid "KDE e-mail client"
-msgstr ""
-
-#: agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc:40
-msgctxt "Name"
-msgid "KDE Mail"
-msgstr ""
-
-#: agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc:79
-msgctxt "Name"
-msgid "E-mail successfully sent"
-msgstr ""
-
-#: agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc:119
-msgctxt "Name"
-msgid "E-mail sending failed"
-msgstr ""
-
-#: agents/maildispatcher/maildispatcheragent.desktop:2
-msgctxt "Name"
-msgid "Mail Dispatcher Agent"
-msgstr ""
-
-#: agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop:2
-msgctxt "Name"
-msgid "Nepomuk Calendar Feeder"
-msgstr ""
-
-#: agents/nepomuk_calendar_feeder/nepomukcalendarfeeder.desktop:40
-msgctxt "Comment"
-msgid "Extension to push events, journals and todos into Nepomuk"
-msgstr ""
-
-#: agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop:2
-msgctxt "Name"
-msgid "Nepomuk Contact Feeder"
-msgstr ""
-
-#: agents/nepomuk_contact_feeder/nepomukcontactfeeder.desktop:46
-msgctxt "Comment"
-msgid "Extension to push contacts into Nepomuk"
-msgstr ""
-
-#: agents/newmailnotifier/newmailnotifieragent.desktop:2
-msgctxt "Name"
-msgid "New Email Notifier"
-msgstr ""
-
-#: agents/newmailnotifier/newmailnotifieragent.desktop:36
-msgctxt "Comment"
-msgid "Notifications about newly received emails"
-msgstr ""
-
-#: agents/strigifeeder/strigifeeder.desktop:2
-msgctxt "Name"
-msgid "Strigi Feeder"
-msgstr ""
-
-#: agents/strigifeeder/strigifeeder.desktop:42
-msgctxt "Comment"
-msgid "Strigi-based fulltext search"
-msgstr ""
-
-#: defaultsetup/defaultaddressbook-ce.desktop:4
-#: defaultsetup/defaultaddressbook.desktop:4
-#: resources/contacts/contactsresource.desktop:2
-#: resources/contacts/wizard/contactswizard.desktop:2
-msgctxt "Name"
-msgid "Personal Contacts"
-msgstr ""
-
-#: defaultsetup/defaultcalendar-ce.desktop:4
-#: defaultsetup/defaultcalendar.desktop:4
-msgctxt "Name"
-msgid "Personal Calendar"
-msgstr ""
-
-#: defaultsetup/defaultnotebook-ce.desktop:4
-#: defaultsetup/defaultnotebook.desktop:4
-#: resources/ical/notes/notesresource.desktop:2
-msgctxt "Name"
-msgid "Notes"
-msgstr "Nodiadau"
-
-#: kcm/kcm_akonadi.desktop:16
-msgctxt "Name"
-msgid "Akonadi Configuration"
-msgstr ""
-
-#: kcm/kcm_akonadi.desktop:63 kcm/kcm_akonadi_resources.desktop:64
-msgctxt "Comment"
-msgid ""
-"Configuration of the Akonadi Personal Information Management framework"
-msgstr ""
-
-#: kcm/kcm_akonadi_resources.desktop:17
-msgctxt "Name"
-msgid "Akonadi Resources Configuration"
-msgstr ""
-
-#: kcm/kcm_akonadi_server.desktop:16
-msgctxt "Name"
-msgid "Akonadi Server Configuration"
-msgstr ""
-
-#: kresources/kabc/akonadi.desktop:2
-msgctxt "Name"
-msgid "Akonadi Address Books"
-msgstr ""
-
-#: kresources/kabc/akonadi.desktop:48
-msgctxt "Comment"
-msgid "Provides access to contacts stored in Akonadi address book folders"
-msgstr ""
-
-#: kresources/kcal/akonadi.desktop:2
-msgctxt "Name"
-msgid "Akonadi"
-msgstr ""
-
-#: kresources/kcal/akonadi.desktop:53
-msgctxt "Comment"
-msgid "Provides access to calendars stored in Akonadi calendar folders"
-msgstr ""
-
-#: migration/kaddressbook/kaddressbookmigrator.desktop:2
-msgctxt "Name"
-msgid "kaddressbookmigrator"
-msgstr ""
-
-#: migration/kaddressbook/kaddressbookmigrator.desktop:45
-msgctxt "Comment"
-msgid "Tool to migrate the old kresource based address book to Akonadi."
-msgstr ""
-
-#: plugins/akonadi_serializer_addressee.desktop:2
-msgctxt "Name"
-msgid "Addressee Serializer"
-msgstr ""
-
-#: plugins/akonadi_serializer_addressee.desktop:46
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for addressee objects"
-msgstr ""
-
-#: plugins/akonadi_serializer_bookmark.desktop:2
-msgctxt "Name"
-msgid "Bookmark serializer"
-msgstr ""
-
-#: plugins/akonadi_serializer_bookmark.desktop:45
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for bookmark objects"
-msgstr ""
-
-#: plugins/akonadi_serializer_contactgroup.desktop:2
-msgctxt "Name"
-msgid "Contact Group Serializer"
-msgstr ""
-
-#: plugins/akonadi_serializer_contactgroup.desktop:45
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for contact group objects"
-msgstr ""
-
-#: plugins/akonadi_serializer_kcal.desktop:2
-#: plugins/akonadi_serializer_kcalcore.desktop:2
-msgctxt "Name"
-msgid "Incidence Serializer"
-msgstr ""
-
-#: plugins/akonadi_serializer_kcal.desktop:45
-#: plugins/akonadi_serializer_kcalcore.desktop:45
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for events, tasks and journal entries"
-msgstr ""
-
-#: plugins/akonadi_serializer_mail.desktop:2
-msgctxt "Name"
-msgid "Mail Serializer"
-msgstr ""
-
-#: plugins/akonadi_serializer_mail.desktop:46
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for mail objects"
-msgstr ""
-
-#: plugins/akonadi_serializer_microblog.desktop:2
-msgctxt "Name"
-msgid "Microblog Serializer"
-msgstr ""
-
-#: plugins/akonadi_serializer_microblog.desktop:44
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for Microblog"
-msgstr ""
-
-#: resources/akonotes/akonotesresource.desktop:2
-msgctxt "Name"
-msgid "AkoNotes"
-msgstr ""
-
-#: resources/akonotes/akonotesresource.desktop:38
-msgctxt "Comment"
-msgid "Loads a notes hierarchy from a local maildir folder"
-msgstr ""
-
-#: resources/birthdays/birthdaysresource.desktop:2
-msgctxt "Name"
-msgid "Birthdays & Anniversaries"
-msgstr ""
-
-#: resources/birthdays/birthdaysresource.desktop:48
-msgctxt "Comment"
-msgid ""
-"Provides access to birthday and anniversary dates of contacts in your "
-"address book as calendar events"
-msgstr ""
-
-#: resources/contacts/contactsresource.desktop:46
-#: resources/contacts/wizard/contactswizard.desktop:46
-msgctxt "Comment"
-msgid "The address book with personal contacts"
-msgstr ""
-
-#: resources/dav/resource/davgroupwareprovider.desktop:4
-msgctxt "Name"
-msgid "DAV Groupware resource provider"
-msgstr ""
-
-#: resources/dav/resource/davgroupwareresource.desktop:2
-msgctxt "Name"
-msgid "DAV groupware resource"
-msgstr ""
-
-#: resources/dav/resource/davgroupwareresource.desktop:36
-msgctxt "Comment"
-msgid "Resource to manage DAV calendars and address books (CalDAV, GroupDAV)"
-msgstr ""
-
-#: resources/dav/services/citadel.desktop:2
-msgctxt "Name"
-msgid "Citadel"
-msgstr ""
-
-#: resources/dav/services/davical.desktop:2
-msgctxt "Name"
-msgid "Davical"
-msgstr ""
-
-#: resources/dav/services/egroupware.desktop:2
-msgctxt "Name"
-msgid "eGroupware"
-msgstr ""
-
-#: resources/dav/services/opengroupware.desktop:2
-msgctxt "Name"
-msgid "OpenGroupware"
-msgstr ""
-
-#: resources/dav/services/scalix.desktop:2
-msgctxt "Name"
-msgid "Scalix"
-msgstr ""
-
-#: resources/dav/services/sogo.desktop:2
-msgctxt "Name"
-msgid "ScalableOGo"
-msgstr ""
-
-#: resources/dav/services/yahoo.desktop:2
-msgctxt "Name"
-msgid "Yahoo!"
-msgstr ""
-
-#: resources/dav/services/zarafa.desktop:2
-msgctxt "Name"
-msgid "Zarafa"
-msgstr ""
-
-#: resources/dav/services/zimbra.desktop:2
-msgctxt "Name"
-msgid "Zimbra"
-msgstr ""
-
-#: resources/ical/icalresource.desktop:2
-#: resources/ical/wizard/icalwizard.desktop:2
-msgctxt "Name"
-msgid "ICal Calendar File"
-msgstr ""
-
-#: resources/ical/icalresource.desktop:48
-#: resources/ical/wizard/icalwizard.desktop:49
-msgctxt "Comment"
-msgid "Loads data from an iCal file"
-msgstr ""
-
-#: resources/ical/notes/notesresource.desktop:75
-msgctxt "Comment"
-msgid "Loads data from a notes file"
-msgstr ""
-
-#: resources/imap/imapresource.desktop:2
-msgctxt "Name"
-msgid "IMAP E-Mail Server"
-msgstr ""
-
-#: resources/imap/imapresource.desktop:45
-msgctxt "Comment"
-msgid "Connects to an IMAP e-mail server"
-msgstr ""
-
-#: resources/imap/wizard/imapwizard.desktop:2
-msgctxt "Name"
-msgid "Generic IMAP Email Server"
-msgstr ""
-
-#: resources/imap/wizard/imapwizard.desktop:41
-msgctxt "Comment"
-msgid "Imap account"
-msgstr ""
-
-#: resources/kabc/kabcresource.desktop:2
-msgctxt "Name"
-msgid "KDE Address Book (traditional)"
-msgstr ""
-
-#: resources/kabc/kabcresource.desktop:47
-msgctxt "Comment"
-msgid "Loads data from a traditional KDE address book resource"
-msgstr ""
-
-#: resources/kcal/kcalresource.desktop:2
-msgctxt "Name"
-msgid "KDE Calendar (traditional)"
-msgstr ""
-
-#: resources/kcal/kcalresource.desktop:48
-msgctxt "Comment"
-msgid "Loads data from a traditional KDE calendar resource"
-msgstr ""
-
-#: resources/kdeaccounts/kdeaccountsresource.desktop:2
-msgctxt "Name"
-msgid "KDE Accounts"
-msgstr ""
-
-#: resources/kdeaccounts/kdeaccountsresource.desktop:43
-msgctxt "Comment"
-msgid "Loads contacts from the KDE accounts file"
-msgstr ""
-
-#: resources/knut/knutresource.desktop:2
-msgctxt "Name"
-msgid "Knut"
-msgstr ""
-
-#: resources/knut/knutresource.desktop:51
-msgctxt "Comment"
-msgid "An agent for debugging purpose"
-msgstr ""
-
-#: resources/kolabproxy/kolabproxyresource.desktop:2
-#: resources/kolabproxy/wizard/kolabwizard.desktop:2
-msgctxt "Name"
-msgid "Kolab Groupware Server"
-msgstr ""
-
-#: resources/kolabproxy/kolabproxyresource.desktop:43
-msgctxt "Comment"
-msgid ""
-"Provides access to Kolab groupware folders on an IMAP server (IMAP accounts "
-"need to be set up separately)."
-msgstr ""
-
-#: resources/kolabproxy/wizard/kolabwizard.desktop:44
-msgctxt "Comment"
-msgid "Kolab Groupware Server"
-msgstr ""
-
-#: resources/localbookmarks/localbookmarksresource.desktop:2
-msgctxt "Name"
-msgid "Local Bookmarks"
-msgstr ""
-
-#: resources/localbookmarks/localbookmarksresource.desktop:47
-msgctxt "Comment"
-msgid "Loads data from a local bookmarks file"
-msgstr ""
-
-#: resources/maildir/maildirresource.desktop:2
-#: resources/maildir/wizard/maildirwizard.desktop:2
-msgctxt "Name"
-msgid "Maildir"
-msgstr ""
-
-#: resources/maildir/maildirresource.desktop:51
-msgctxt "Comment"
-msgid "Loads data from a local maildir folder"
-msgstr ""
-
-#: resources/maildir/wizard/maildirwizard.desktop:52
-msgctxt "Comment"
-msgid "Maildir account"
-msgstr ""
-
-#: resources/mailtransport_dummy/mtdummyresource.desktop:2
-msgctxt "Name"
-msgid "Dummy MailTransport Resource"
-msgstr ""
-
-#: resources/mailtransport_dummy/mtdummyresource.desktop:38
-msgctxt "Comment"
-msgid "Dummy Resource implementing mail transport interface"
-msgstr ""
-
-#: resources/mbox/mboxresource.desktop:2
-msgctxt "Name"
-msgid "Mbox"
-msgstr ""
-
-#: resources/mbox/mboxresource.desktop:47
-msgctxt "Comment"
-msgid "Loads data from a local mbox file"
-msgstr ""
-
-#: resources/mbox/wizard/mailboxwizard.desktop:2
-msgctxt "Name"
-msgid "MailBox"
-msgstr ""
-
-#: resources/mbox/wizard/mailboxwizard.desktop:43
-msgctxt "Comment"
-msgid "Mailbox account"
-msgstr ""
-
-#: resources/microblog/microblog.desktop:2
-msgctxt "Name"
-msgid "Microblog (Twitter and Identi.ca)"
-msgstr ""
-
-#: resources/microblog/microblog.desktop:47
-msgctxt "Comment"
-msgid "Shows your microblog data from Twitter or Identi.ca."
-msgstr ""
-
-#: resources/mixedmaildir/mixedmaildirresource.desktop:2
-msgctxt "Name"
-msgid "KMail Maildir"
-msgstr ""
-
-#: resources/mixedmaildir/mixedmaildirresource.desktop:39
-msgctxt "Comment"
-msgid "Loads data from a local KMail maildir folder"
-msgstr ""
-
-#: resources/nepomuktag/nepomuktagresource.desktop:2
-msgctxt "Name"
-msgid "Nepomuk Tags (Virtual Folders)"
-msgstr ""
-
-#: resources/nepomuktag/nepomuktagresource.desktop:47
-msgctxt "Comment"
-msgid "Virtual folders for selecting messages which have Nepomuk Tags."
-msgstr ""
-
-#: resources/nntp/nntpresource.desktop:2
-msgctxt "Name"
-msgid "Usenet Newsgroups (NNTP)"
-msgstr ""
-
-#: resources/nntp/nntpresource.desktop:46
-msgctxt "Comment"
-msgid "Makes it possible to read articles from a news server"
-msgstr ""
-
-#: resources/openxchange/openxchangeresource.desktop:2
-msgctxt "Name"
-msgid "Open-Xchange Groupware Server"
-msgstr ""
-
-#: resources/openxchange/openxchangeresource.desktop:40
-msgctxt "Comment"
-msgid ""
-"Provides access to the appointments, tasks, and contacts of an Open-Xchange "
-"groupware server."
-msgstr ""
-
-#: resources/pop3/pop3resource.desktop:2
-msgctxt "Name"
-msgid "POP3 E-Mail Server"
-msgstr ""
-
-#: resources/pop3/pop3resource.desktop:42
-msgctxt "Comment"
-msgid "Connects to a POP3 e-mail server"
-msgstr ""
-
-#: resources/pop3/wizard/pop3wizard.desktop:2
-msgctxt "Name"
-msgid "Pop3"
-msgstr ""
-
-#: resources/pop3/wizard/pop3wizard.desktop:45
-msgctxt "Comment"
-msgid "Pop3 account"
-msgstr ""
-
-#: resources/vcard/vcardresource.desktop:2
-msgctxt "Name"
-msgid "VCard File"
-msgstr ""
-
-#: resources/vcard/vcardresource.desktop:49
-msgctxt "Comment"
-msgid "Loads data from a VCard file"
-msgstr ""
-
-#: resources/vcarddir/vcarddirresource.desktop:2
-msgctxt "Name"
-msgid "VCard Directory"
-msgstr ""
-
-#: resources/vcarddir/vcarddirresource.desktop:49
-msgctxt "Comment"
-msgid "Loads data from a directory with VCards"
-msgstr ""
-
-#: tray/akonaditray.desktop:6
-msgctxt "Name"
-msgid "Akonaditray"
-msgstr ""
-
-#: tray/akonaditray.desktop:54
-msgctxt "GenericName"
-msgid "Akonadi Tray Utility"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kde-runtime.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kde-runtime.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kde-runtime.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kde-runtime.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,5187 +0,0 @@
-# translation of desktop_kdebase.po to Cymraeg
-# Translation of dt_kdebase.po to Cymraeg
-# Translation of desktop_kdebase.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KGyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdebase\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2009-07-18 18:18+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:39+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: activitymanager/activitymanager-plugin.desktop:6
-#: debian/tmp/usr/share/kde4/servicetypes/activitymanager-plugin.desktop:6
-msgctxt "Comment"
-msgid "Activity manager plugin"
-msgstr ""
-
-#: activitymanager/kactivitymanagerd.desktop:9
-msgctxt "Name"
-msgid "Activity Manager"
-msgstr ""
-
-#: activitymanager/kactivitymanagerd.desktop:72
-msgctxt "Comment"
-msgid "The activity management backend"
-msgstr ""
-
-#: activitymanager/plugins/dummy/activitymanager-plugin-dummy.desktop:2
-#: debian/tmp/usr/share/kde4/services/activitymanager-plugin-dummy.desktop:2
-msgctxt "Name"
-msgid "Dummy plugin"
-msgstr ""
-
-#: activitymanager/plugins/dummy/activitymanager-plugin-dummy.desktop:3
-#: debian/tmp/usr/share/kde4/services/activitymanager-plugin-dummy.desktop:3
-msgctxt "Comment"
-msgid "Just testing"
-msgstr ""
-
-#: activitymanager/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop:2
-#: debian/tmp/usr/share/kde4/services/activitymanager-plugin-nepomuk.desktop:2
-msgctxt "Name"
-msgid "Nepomuk Feeder Plugin"
-msgstr ""
-
-#: activitymanager/plugins/nepomuk/activitymanager-plugin-nepomuk.desktop:3
-#: debian/tmp/usr/share/kde4/services/activitymanager-plugin-nepomuk.desktop:3
-msgctxt "Comment"
-msgid "Plugin to store and score events in Nepomuk"
-msgstr ""
-
-#: activitymanager/plugins/slc/activitymanager-plugin-slc.desktop:2
-#: debian/tmp/usr/share/kde4/services/activitymanager-plugin-slc.desktop:2
-msgctxt "Name"
-msgid "Share-Like-Connect Plugin"
-msgstr ""
-
-#: activitymanager/plugins/slc/activitymanager-plugin-slc.desktop:3
-#: debian/tmp/usr/share/kde4/services/activitymanager-plugin-slc.desktop:3
-msgctxt "Comment"
-msgid "Plugin to provide data to the SLC system"
-msgstr ""
-
-#: attica/kcm/kcm_attica.desktop:12
-msgctxt "Name"
-msgid "Social Desktop"
-msgstr ""
-
-#: attica/kcm/kcm_attica.desktop:74
-msgctxt "Comment"
-msgid "Manage Social Desktop Providers"
-msgstr ""
-
-#: debian/tmp/usr/share/applications/kde4/Help.desktop:10
-msgctxt "Name"
-msgid "Help"
-msgstr ""
-
-#: knetattach/knetattach.desktop:2
-msgctxt "Name"
-msgid "KNetAttach"
-msgstr ""
-
-#: knetattach/knetattach.desktop:87
-msgctxt "GenericName"
-msgid "Network Folder Wizard"
-msgstr ""
-
-#: nepomuk/services/backupsync/gui/nepomukbackup.desktop:2
-msgctxt "Name"
-msgid "Nepomuk Backup"
-msgstr ""
-
-#: debian/tmp/usr/share/applications/kde4/nepomukcontroller.desktop:2
-#: debian/tmp/usr/share/autostart/nepomukcontroller.desktop:2
-#: nepomuk/controller/nepomukcontroller.desktop:2
-msgctxt "Name"
-msgid "Nepomuk File Indexing Controller"
-msgstr ""
-
-#: debian/tmp/usr/share/applications/kde4/nepomukcontroller.desktop:47
-#: debian/tmp/usr/share/autostart/nepomukcontroller.desktop:47
-#: nepomuk/controller/nepomukcontroller.desktop:47
-msgctxt "Comment"
-msgid "System tray icon to control the behaviour of the Nepomuk file indexer"
-msgstr ""
-
-#: nepomuk/server/nepomukserver.desktop:8
-msgctxt "Name"
-msgid "Nepomuk Server"
-msgstr ""
-
-#: nepomuk/server/nepomukserver.desktop:85
-msgctxt "Comment"
-msgid "The Nepomuk Server providing Storage services and strigi controlling"
-msgstr ""
-
-#: menu/desktop/kde-development-translation.directory:4
-#: menu/desktop/kde-development-translation.directory:97
-msgctxt "Name"
-msgid "Translation"
-msgstr "Cyfieithiad"
-
-#: menu/desktop/kde-development-webdevelopment.directory:4
-#: menu/desktop/kde-development-webdevelopment.directory:96
-msgctxt "Name"
-msgid "Web Development"
-msgstr ""
-
-#: menu/desktop/kde-development.directory:4
-msgctxt "Name"
-msgid "Development"
-msgstr "Datblygu"
-
-#: menu/desktop/kde-editors.directory:4
-msgctxt "Name"
-msgid "Editors"
-msgstr "Golygyddion"
-
-#: menu/desktop/kde-edu-languages.directory:5
-msgctxt "Name"
-msgid "Languages"
-msgstr ""
-
-#: menu/desktop/kde-edu-mathematics.directory:5
-msgctxt "Name"
-msgid "Mathematics"
-msgstr ""
-
-#: menu/desktop/kde-edu-miscellaneous.directory:5
-msgctxt "Name"
-msgid "Miscellaneous"
-msgstr ""
-
-#: menu/desktop/kde-edu-science.directory:5
-msgctxt "Name"
-msgid "Science"
-msgstr ""
-
-#: menu/desktop/kde-edu-tools.directory:5
-msgctxt "Name"
-msgid "Teaching Tools"
-msgstr ""
-
-#: menu/desktop/kde-education.directory:4
-msgctxt "Name"
-msgid "Education"
-msgstr ""
-
-#: menu/desktop/kde-games-arcade.directory:4
-msgctxt "Name"
-msgid "Arcade"
-msgstr "Arcêd"
-
-#: menu/desktop/kde-games-board.directory:4
-msgctxt "Name"
-msgid "Board Games"
-msgstr "Gemau Bwrdd"
-
-#: menu/desktop/kde-games-card.directory:4
-msgctxt "Name"
-msgid "Card Games"
-msgstr "Gemau Cardiau"
-
-#: menu/desktop/kde-games-kids.directory:4
-msgctxt "Name"
-msgid "Games for Kids"
-msgstr "Gêmau ar gyfer Plant"
-
-#: menu/desktop/kde-games-logic.directory:4
-msgctxt "Name"
-msgid "Logic Games"
-msgstr ""
-
-#: menu/desktop/kde-games-roguelikes.directory:4
-msgctxt "Name"
-msgid "Rogue-like Games"
-msgstr "Gemau sy'n debyg i Rogue"
-
-#: menu/desktop/kde-games-strategy.directory:4
-msgctxt "Name"
-msgid "Tactics & Strategy"
-msgstr "Tactegau & Strategaeth"
-
-#: menu/desktop/kde-games.directory:4
-msgctxt "Name"
-msgid "Games"
-msgstr "Gemau"
-
-#: menu/desktop/kde-graphics.directory:4
-msgctxt "Name"
-msgid "Graphics"
-msgstr "Graffeg"
-
-#: kcontrol/menus/kde-information.directory:4
-msgctxt "Name"
-msgid "Information"
-msgstr "Gwybodaeth"
-
-#: menu/desktop/kde-internet-terminal.directory:4
-#: menu/desktop/kde-system-terminal.directory:4
-msgctxt "Name"
-msgid "Terminal Applications"
-msgstr "Cymhwysiadau Terfynell"
-
-#: menu/desktop/kde-internet.directory:4
-msgctxt "Name"
-msgid "Internet"
-msgstr "Rhyngrwyd"
-
-#: menu/desktop/kde-main.directory:5
-msgctxt "Name"
-msgid "KDE Menu"
-msgstr "Dewislen KDE"
-
-#: menu/desktop/kde-more.directory:5
-msgctxt "Name"
-msgid "More Applications"
-msgstr "Rhagor o Gymhwysiadau"
-
-#: menu/desktop/kde-multimedia.directory:4 phonon/kcm/kcm_phonon.desktop:13
-msgctxt "Name"
-msgid "Multimedia"
-msgstr "Amlgyfryngau"
-
-#: menu/desktop/kde-office.directory:4
-msgctxt "Name"
-msgid "Office"
-msgstr "Swyddfa"
-
-#: menu/desktop/kde-science.directory:5
-msgctxt "Name"
-msgid "Science & Math"
-msgstr "Gwyddoniaeth a Mathemateg"
-
-#: menu/desktop/kde-settingsmenu.directory:4
-msgctxt "Name"
-msgid "Settings"
-msgstr "Gosodiadau"
-
-#: menu/desktop/kde-system.directory:4
-msgctxt "Name"
-msgid "System"
-msgstr "Cysawd"
-
-#: menu/desktop/kde-toys.directory:4
-msgctxt "Name"
-msgid "Toys"
-msgstr "Tegannau"
-
-#: menu/desktop/kde-unknown.directory:4
-msgctxt "Name"
-msgid "Lost & Found"
-msgstr "Colledig a Chanfyddedig"
-
-#: menu/desktop/kde-utilities-accessibility.directory:4
-msgctxt "Name"
-msgid "Accessibility"
-msgstr "Hygyrchedd"
-
-#: menu/desktop/kde-utilities-accessibility.directory:94
-msgctxt "Comment"
-msgid "Accessibility"
-msgstr "Hygyrchedd"
-
-#: menu/desktop/kde-utilities-desktop.directory:4
-msgctxt "Name"
-msgid "Desktop"
-msgstr "Penbwrdd"
-
-#: menu/desktop/kde-utilities-desktop.directory:94
-msgctxt "Comment"
-msgid "Desktop"
-msgstr "Penbwrdd"
-
-#: menu/desktop/kde-utilities-file.directory:4
-msgctxt "Name"
-msgid "File"
-msgstr "Ffeil"
-
-#: menu/desktop/kde-utilities-file.directory:93
-msgctxt "Comment"
-msgid "File"
-msgstr "Ffeil"
-
-#: menu/desktop/kde-utilities-peripherals.directory:4
-msgctxt "Name"
-msgid "Peripherals"
-msgstr "Perifferolion"
-
-#: menu/desktop/kde-utilities-peripherals.directory:92
-msgctxt "Comment"
-msgid "Peripherals"
-msgstr "Perifferolion"
-
-#: menu/desktop/kde-utilities-pim.directory:4
-msgctxt "Name"
-msgid "PIM"
-msgstr ""
-
-#: menu/desktop/kde-utilities-pim.directory:88
-msgctxt "Comment"
-msgid "PIM"
-msgstr ""
-
-#: menu/desktop/kde-utilities-xutils.directory:5
-msgctxt "Name"
-msgid "X-Utilities"
-msgstr "Defnyddioldebau-X"
-
-#: menu/desktop/kde-utilities-xutils.directory:93
-msgctxt "Comment"
-msgid "X Window Utilities"
-msgstr "Defnyddioldebau Ffenestr X"
-
-#: menu/desktop/kde-utilities.directory:4
-msgctxt "Name"
-msgid "Utilities"
-msgstr "Defnyddioldebau"
-
-#: menu/desktop/kde-utilities.directory:94
-msgctxt "Comment"
-msgid "Utilities"
-msgstr "Defnyddioldebau"
-
-#: pics/hicolor/index.theme:2
-msgctxt "Name"
-msgid "KDE-HiColor"
-msgstr ""
-
-#: pics/hicolor/index.theme:79
-msgctxt "Comment"
-msgid "Fallback icon theme"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/apps/desktoptheme/appdashboard/metadata.desktop:2
-#: desktoptheme/appdashboard/metadata.desktop:2
-msgctxt "Name"
-msgid "Application dashboard"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/apps/desktoptheme/appdashboard/metadata.desktop:50
-#: desktoptheme/appdashboard/metadata.desktop:50
-msgctxt "Comment"
-msgid "Intended as Application dashboard default"
-msgstr ""
-
-#: desktoptheme/air/metadata.desktop:2
-msgctxt "Name"
-msgid "Air"
-msgstr ""
-
-#: desktoptheme/air/metadata.desktop:71
-msgctxt "Comment"
-msgid "A breath of fresh air"
-msgstr ""
-
-#: desktoptheme/oxygen/metadata.desktop:2 kstyles/oxygen/oxygen.themerc:2
-msgctxt "Name"
-msgid "Oxygen"
-msgstr ""
-
-#: desktoptheme/oxygen/metadata.desktop:84
-msgctxt "Comment"
-msgid "Theme done in the Oxygen style"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:2
-msgctxt "Name"
-msgid "Hardware notifications"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:65
-msgctxt "Comment"
-msgid "Notifications triggered by hardware devices"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:116
-msgctxt "Name"
-msgid "Device Notifier"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:189
-msgctxt "Comment"
-msgid "The Plasma device notifier is present"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:237
-msgctxt "Name"
-msgid "Mount or unmount error"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:297
-msgctxt "Comment"
-msgid "There has been a problem mounting or unmounting a device"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:361
-msgctxt "Name"
-msgid "The device can be safely removed"
-msgstr ""
-
-#: knotify/hardwarenotifications.notifyrc:409
-msgctxt "Comment"
-msgid "The device which has been just unmounted is now safe to remove."
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_browser.desktop:4
-msgctxt "Name|standard desktop component"
-msgid "Web Browser"
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_browser.desktop:68
-msgctxt "Comment"
-msgid ""
-"Here you can configure your default web browser. All KDE applications in "
-"which you can select hyperlinks should honor this setting."
-msgstr ""
-"Dyma lle gallwch ffurfweddu eich porydd gwe rhagosodol.  Dylai pob rhaglen "
-"KDE lle gallwch ddewis hypergysylltau ddefnyddio'r gosodiad yma."
-
-#: kcontrol/componentchooser/componentservices/kcm_filemanager.desktop:4
-msgctxt "Name|standard desktop component"
-msgid "File Manager"
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_filemanager.desktop:68
-msgctxt "Comment"
-msgid ""
-"Here you can configure your default file manager. The entries in the K menu "
-"and all KDE applications in which you can open folders will use this file "
-"manager."
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_kemail.desktop:4
-msgctxt "Name|standard desktop component"
-msgid "Email Client"
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_kemail.desktop:68
-msgctxt "Comment"
-msgid ""
-"This service allows you to configure your default email client. All KDE "
-"applications which need access to an email client application should honor "
-"this setting."
-msgstr ""
-"Mae'r gwasanaeth ymayn gadael i chi ffurfweddu eich dibynnydd ebost "
-"cyffredinol. Dylai bob raglen KDE sydd angen cyrchiad i ddibynnydd ebost "
-"ddefnyddio'r gosodiad yma."
-
-#: kcontrol/componentchooser/componentservices/kcm_terminal.desktop:4
-msgctxt "Name|standard desktop component"
-msgid "Terminal Emulator"
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_terminal.desktop:68
-msgctxt "Comment"
-msgid ""
-"This service allows you to configure your default terminal emulator. All KDE "
-"applications which invoke a terminal emulator application should honor this "
-"setting."
-msgstr ""
-"Mae'r gwasanaeth yma yn gadael i chi ffurfweddu eich efelychydd terfynell "
-"cyffredinol. Dylai pob rhaglen KDE sy'n cychwyn efelychydd terfynell "
-"ddefnyddio'r gosodiad yma."
-
-#: kcontrol/componentchooser/componentservices/kcm_wm.desktop:4
-msgctxt "Name|standard desktop component"
-msgid "Window Manager"
-msgstr ""
-
-#: kcontrol/componentchooser/componentservices/kcm_wm.desktop:68
-msgctxt "Comment"
-msgid "Here you can select the window manager to be run in your KDE session."
-msgstr ""
-
-#: knotify/kde.notifyrc:3
-msgctxt "Comment"
-msgid "KDE Workspace"
-msgstr ""
-
-#: knotify/kde.notifyrc:82
-msgctxt "Name"
-msgid "Trash: Emptied"
-msgstr ""
-
-#: knotify/kde.notifyrc:158
-msgctxt "Comment"
-msgid "The trash has been emptied"
-msgstr ""
-
-#: knotify/kde.notifyrc:239
-msgctxt "Name"
-msgid "Textcompletion: Rotation"
-msgstr ""
-
-#: knotify/kde.notifyrc:312
-msgctxt "Comment"
-msgid "The end of the list of matches has been reached"
-msgstr ""
-
-#: knotify/kde.notifyrc:392
-msgctxt "Name"
-msgid "Textcompletion: No Match"
-msgstr ""
-
-#: knotify/kde.notifyrc:467
-msgctxt "Comment"
-msgid "No matching completion was found"
-msgstr ""
-
-#: knotify/kde.notifyrc:547
-msgctxt "Name"
-msgid "Textcompletion: Partial Match"
-msgstr ""
-
-#: knotify/kde.notifyrc:622
-msgctxt "Comment"
-msgid "There is more than one possible match"
-msgstr ""
-
-#: knotify/kde.notifyrc:702
-msgctxt "Name"
-msgid "Fatal Error"
-msgstr ""
-
-#: knotify/kde.notifyrc:781
-msgctxt "Comment"
-msgid "There was a serious error causing the program to exit"
-msgstr ""
-
-#: knotify/kde.notifyrc:862
-msgctxt "Name"
-msgid "Notification"
-msgstr ""
-
-#: knotify/kde.notifyrc:943
-msgctxt "Comment"
-msgid "Something special happened in the program"
-msgstr ""
-
-#: knotify/kde.notifyrc:1023
-msgctxt "Name"
-msgid "Warning"
-msgstr ""
-
-#: knotify/kde.notifyrc:1105
-msgctxt "Comment"
-msgid "There was an error in the program which may cause problems"
-msgstr ""
-
-#: knotify/kde.notifyrc:1185
-msgctxt "Name"
-msgid "Catastrophe"
-msgstr ""
-
-#: knotify/kde.notifyrc:1261
-msgctxt "Comment"
-msgid "A very serious error occurred, at least causing the program to exit"
-msgstr ""
-
-#: knotify/kde.notifyrc:1340
-msgctxt "Name"
-msgid "Login"
-msgstr ""
-
-#: knotify/kde.notifyrc:1421
-msgctxt "Comment"
-msgid "KDE is starting up"
-msgstr ""
-
-#: knotify/kde.notifyrc:1505
-msgctxt "Name"
-msgid "Logout"
-msgstr ""
-
-#: knotify/kde.notifyrc:1586
-msgctxt "Comment"
-msgid "KDE is exiting"
-msgstr ""
-
-#: knotify/kde.notifyrc:1670
-msgctxt "Name"
-msgid "Logout Canceled"
-msgstr ""
-
-#: knotify/kde.notifyrc:1749
-msgctxt "Comment"
-msgid "KDE logout was canceled"
-msgstr ""
-
-#: knotify/kde.notifyrc:1829
-msgctxt "Name"
-msgid "Print Error"
-msgstr ""
-
-#: knotify/kde.notifyrc:1909
-msgctxt "Comment"
-msgid "A print error has occurred"
-msgstr ""
-
-#: knotify/kde.notifyrc:1990
-msgctxt "Name"
-msgid "Information Message"
-msgstr ""
-
-#: knotify/kde.notifyrc:2070
-msgctxt "Comment"
-msgid "An information message is being shown"
-msgstr ""
-
-#: knotify/kde.notifyrc:2151
-msgctxt "Name"
-msgid "Warning Message"
-msgstr ""
-
-#: knotify/kde.notifyrc:2231
-msgctxt "Comment"
-msgid "A warning message is being shown"
-msgstr ""
-
-#: knotify/kde.notifyrc:2311
-msgctxt "Name"
-msgid "Critical Message"
-msgstr ""
-
-#: knotify/kde.notifyrc:2385
-msgctxt "Comment"
-msgid "A critical message is being shown"
-msgstr ""
-
-#: knotify/kde.notifyrc:2464
-msgctxt "Name"
-msgid "Question"
-msgstr ""
-
-#: knotify/kde.notifyrc:2546
-msgctxt "Comment"
-msgid "A question is being asked"
-msgstr ""
-
-#: knotify/kde.notifyrc:2628
-msgctxt "Name"
-msgid "Beep"
-msgstr ""
-
-#: knotify/kde.notifyrc:2708
-msgctxt "Comment"
-msgid "Sound bell"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:3
-msgctxt "Comment"
-msgid "Global Keyboard Shortcuts"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:61
-msgctxt "Name"
-msgid "kglobalaccel"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:125
-#: phonon/platform_kde/phonon.notifyrc:77
-msgctxt "Name"
-msgid "Application"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:202
-msgctxt "Comment"
-msgid "The application name"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:264
-msgctxt "Name"
-msgid "Global Shortcut Registration"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:323
-msgctxt "Comment"
-msgid "An application registered new global shortcuts."
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:385
-msgctxt "Name"
-msgid "Global Shortcut Triggered"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.notifyrc:442
-msgctxt "Comment"
-msgid "The user triggered a global shortcut"
-msgstr ""
-
-#: kioslave/desktop/Home.desktop:3
-msgctxt "Name"
-msgid "Home"
-msgstr "Cartref"
-
-#: kioslave/desktop/Home.desktop:92
-msgctxt "GenericName"
-msgid "Personal Files"
-msgstr "Ffeiliau Personol"
-
-#: kioslave/network/ioslave/network.desktop:7
-#: kioslave/network/ioslave/virtualfolder_network.desktop:7
-msgctxt "Name"
-msgid "Network"
-msgstr "Rhwydwaith"
-
-#: kioslave/smb/smb-network.desktop:3
-msgctxt "Name"
-msgid "Samba Shares"
-msgstr "Cydranniad Samba"
-
-#: kcontrol/componentchooser/windowmanagers/compiz-custom.desktop:2
-msgctxt "Name"
-msgid ""
-"Compiz custom (create wrapper script 'compiz-kde-launcher' to launch it)"
-msgstr ""
-
-#: kcontrol/componentchooser/windowmanagers/compiz.desktop:2
-msgctxt "Name"
-msgid "Compiz"
-msgstr ""
-
-#: kcontrol/componentchooser/windowmanagers/metacity.desktop:2
-msgctxt "Name"
-msgid "Metacity (GNOME)"
-msgstr ""
-
-#: kcontrol/componentchooser/windowmanagers/openbox.desktop:2
-msgctxt "Name"
-msgid "Openbox"
-msgstr "Blwchagored (Openbox)"
-
-#: kwalletd/kwalletd.notifyrc:3
-msgctxt "Comment"
-msgid "Wallet"
-msgstr ""
-
-#: kwalletd/kwalletd.notifyrc:65
-msgctxt "Name"
-msgid "kwalletd"
-msgstr ""
-
-#: kwalletd/kwalletd.notifyrc:131
-msgctxt "Name"
-msgid "Needs password"
-msgstr ""
-
-#: kwalletd/kwalletd.notifyrc:195
-msgctxt "Comment"
-msgid "The KDE Wallet Daemon requests a password"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/apps/nepomukfilewatch/nepomukfilewatch.notifyrc:3
-#: nepomuk/services/filewatch/nepomukfilewatch.notifyrc:3
-msgctxt "Comment"
-msgid "Nepomuk file watch service"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/apps/nepomukfilewatch/nepomukfilewatch.notifyrc:51
-#: nepomuk/services/filewatch/nepomukfilewatch.notifyrc:51
-msgctxt "Name"
-msgid "New Removable Device"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/apps/nepomukfilewatch/nepomukfilewatch.notifyrc:97
-#: nepomuk/services/filewatch/nepomukfilewatch.notifyrc:97
-msgctxt "Comment"
-msgid "A new unknown removable device has been mounted"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:3
-msgctxt "Name"
-msgid "Semantic Data Storage"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:63
-msgctxt "Comment"
-msgid "Semantic Desktop"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:149
-msgctxt "Name"
-msgid "Failed to start Nepomuk"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:205
-msgctxt "Comment"
-msgid "The Nepomuk Semantic Desktop system could not be started"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:260
-msgctxt "Name"
-msgid "Converting Nepomuk data"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:331
-msgctxt "Comment"
-msgid "All Nepomuk data is converted to a new storage backend"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:403
-msgctxt "Name"
-msgid "Converting Nepomuk data failed"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:474
-msgctxt "Comment"
-msgid "Converting Nepomuk data to a new backend failed"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:546
-msgctxt "Name"
-msgid "Converting Nepomuk data done"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.notifyrc:617
-msgctxt "Comment"
-msgid "Successfully converted Nepomuk data to new backend"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:3
-msgctxt "Comment"
-msgid "Desktop Search"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:59
-msgctxt "Name"
-msgid "Initial Indexing started"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:132
-msgctxt "Comment"
-msgid "Indexing of local files for fast searches has started."
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:189
-msgctxt "Name"
-msgid "Initial Indexing finished"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:261
-msgctxt "Comment"
-msgid ""
-"The initial indexing of local files for fast desktop searches has completed."
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:318
-msgctxt "Name"
-msgid "Indexing suspended"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:390
-msgctxt "Comment"
-msgid "File indexing has been suspended by the search service."
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:447
-msgctxt "Name"
-msgid "Indexing resumed"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.notifyrc:519
-msgctxt "Comment"
-msgid "File indexing has been resumed by the search service."
-msgstr ""
-
-#: phonon/platform_kde/phonon.notifyrc:3
-msgctxt "Comment"
-msgid "Multimedia System"
-msgstr ""
-
-#: phonon/platform_kde/phonon.notifyrc:149
-msgctxt "Name"
-msgid "Audio Output Device Changed"
-msgstr ""
-
-#: phonon/platform_kde/phonon.notifyrc:194
-msgctxt "Comment"
-msgid "Notification when audio output device has automatically changed"
-msgstr ""
-
-#: kioslave/thumbnail/comicbookthumbnail.desktop:4
-msgctxt "Name"
-msgid "Comic Books"
-msgstr ""
-
-#: kcontrol/componentchooser/componentchooser.desktop:13
-msgctxt "Name"
-msgid "Default Applications"
-msgstr ""
-
-#: kcontrol/componentchooser/componentchooser.desktop:95
-msgctxt "Comment"
-msgid "Choose the default components for various services"
-msgstr "Dewiswch y cydrannau rhagosodedig i wasanaethau amrywiol"
-
-#: kioslave/thumbnail/cursorthumbnail.desktop:3
-msgctxt "Name"
-msgid "Cursor Files"
-msgstr "Ffeiliau Cyrchydd"
-
-#: kioslave/thumbnail/desktopthumbnail.desktop:3
-msgctxt "Name"
-msgid "Desktop Files"
-msgstr ""
-
-#: solid-device-automounter/kcm/device_automounter_kcm.desktop:11
-msgctxt "Name"
-msgid "Removable Devices"
-msgstr ""
-
-#: solid-device-automounter/kcm/device_automounter_kcm.desktop:67
-msgctxt "Comment"
-msgid "Configure automatic handling of removable storage media"
-msgstr ""
-
-#: kioslave/thumbnail/directorythumbnail.desktop:3
-msgctxt "Name"
-msgid "Directories"
-msgstr ""
-
-#: kioslave/thumbnail/djvuthumbnail.desktop:3
-msgctxt "Name"
-msgid "DjVu Files"
-msgstr "Ffeiliau DjVu"
-
-#: kcontrol/emoticons/emoticons.desktop:13
-msgctxt "Name"
-msgid "Emoticons"
-msgstr ""
-
-#: kcontrol/emoticons/emoticons.desktop:92
-msgctxt "Comment"
-msgid "Emoticons Themes Manager"
-msgstr ""
-
-#: kioslave/thumbnail/exrthumbnail.desktop:3
-msgctxt "Name"
-msgid "EXR Images"
-msgstr ""
-
-#: keditfiletype/filetypes.desktop:12
-msgctxt "Name"
-msgid "File Associations"
-msgstr "Cysylltiadau Ffeiliau"
-
-#: keditfiletype/filetypes.desktop:101
-msgctxt "Comment"
-msgid "Configure file associations"
-msgstr "Ffurfweddu cysylltiadau ffeiliau"
-
-#: kioslave/fish/fish.protocol:14
-msgctxt "Description"
-msgid "A kioslave for the FISH protocol"
-msgstr ""
-
-#: kurifilter-plugins/fixhost/fixhosturifilter.desktop:3
-msgctxt "Name"
-msgid "FixHostFilter"
-msgstr ""
-
-#: kioslave/thumbnail/htmlthumbnail.desktop:3
-msgctxt "Name"
-msgid "HTML Files"
-msgstr "Ffeiliau HTML"
-
-#: kcontrol/icons/icons.desktop:14
-msgctxt "Name"
-msgid "Icons"
-msgstr "Eicon"
-
-#: kcontrol/icons/icons.desktop:104
-msgctxt "Comment"
-msgid "Customize KDE Icons"
-msgstr "Addasu Eiconau KDE"
-
-#: kioslave/thumbnail/imagethumbnail.desktop:3
-msgctxt "Name"
-msgid "Images (GIF, PNG, BMP, ...)"
-msgstr ""
-
-#: kioslave/thumbnail/jpegthumbnail.desktop:3
-msgctxt "Name"
-msgid "JPEG Images"
-msgstr ""
-
-#: kcontrol/dnssd/kcm_kdnssd.desktop:4
-msgctxt "Name"
-msgid "Service Discovery"
-msgstr ""
-
-#: kcontrol/dnssd/kcm_kdnssd.desktop:89
-msgctxt "Comment"
-msgid "Configure service discovery"
-msgstr ""
-
-#: nepomuk/kcm/kcm_nepomuk.desktop:13
-msgctxt "Name"
-msgid "Desktop Search"
-msgstr ""
-
-#: nepomuk/kcm/kcm_nepomuk.desktop:87
-msgctxt "Comment"
-msgid "Nepomuk/Strigi Server Configuration"
-msgstr ""
-
-#: phonon/kcm/kcm_phonon.desktop:13
-msgctxt "Name"
-msgid "Phonon"
-msgstr ""
-
-#: phonon/kcm/kcm_phonon.desktop:102
-msgctxt "Comment"
-msgid "Sound and Video Configuration"
-msgstr ""
-
-#: phonon/kcm/xine/kcm_phononxine.desktop:11
-msgctxt "Name"
-msgid "Phonon Xine"
-msgstr ""
-
-#: phonon/kcm/xine/kcm_phononxine.desktop:86
-msgctxt "Comment"
-msgid "Xine Backend Configuration"
-msgstr ""
-
-#: kioslave/cgi/kcmcgi/kcmcgi.desktop:11
-msgctxt "Name"
-msgid "CGI Scripts"
-msgstr "Sgriptiau CGI"
-
-#: kioslave/cgi/kcmcgi/kcmcgi.desktop:99
-msgctxt "Comment"
-msgid "Configure the CGI KIO slave"
-msgstr "Ffurfweddu'r gwas CGI KIO"
-
-#: kcontrol/kded/kcmkded.desktop:13
-msgctxt "Name"
-msgid "Service Manager"
-msgstr "Rheolydd Gwasanaethau"
-
-#: kcontrol/kded/kcmkded.desktop:100
-msgctxt "Comment"
-msgid "KDE Services Configuration"
-msgstr ""
-
-#: kcontrol/knotify/kcmnotify.desktop:14
-msgctxt "Name"
-msgid "Manage Notifications"
-msgstr ""
-
-#: kcontrol/knotify/kcmnotify.desktop:102
-msgctxt "Comment"
-msgid "System Notification Configuration"
-msgstr "Ffurfweddu Hysbysiadau Cysawd"
-
-#: kioslave/trash/kcmtrash.desktop:1 kioslave/trash/kcmtrash.desktop:160
-msgctxt "Name"
-msgid "Trash"
-msgstr ""
-
-#: kioslave/trash/kcmtrash.desktop:77
-msgctxt "Comment"
-msgid "This service allows configuration of the trash."
-msgstr ""
-
-#: kioslave/trash/kcmtrash.desktop:236
-msgctxt "Comment"
-msgid "Configure trash settings"
-msgstr ""
-
-#: kioslave/desktop/desktopnotifier.desktop:3
-msgctxt "Name"
-msgid "Directory Watcher"
-msgstr ""
-
-#: kioslave/desktop/desktopnotifier.desktop:71
-msgctxt "Comment"
-msgid "Monitors directories for changes"
-msgstr ""
-
-#: solid-device-automounter/kded/device_automounter.desktop:9
-msgctxt "Name"
-msgid "Removable Device Automounter"
-msgstr ""
-
-#: solid-device-automounter/kded/device_automounter.desktop:67
-msgctxt "Comment"
-msgid "Automatically mounts devices as needed"
-msgstr ""
-
-#: kpasswdserver/kpasswdserver.desktop:3
-msgctxt "Name"
-msgid "Password Caching"
-msgstr ""
-
-#: kpasswdserver/kpasswdserver.desktop:63
-msgctxt "Comment"
-msgid "Temporary password caching"
-msgstr ""
-
-#: ktimezoned/ktimezoned.desktop:10
-msgctxt "Name"
-msgid "Time Zone"
-msgstr ""
-
-#: ktimezoned/ktimezoned.desktop:72
-msgctxt "Comment"
-msgid "Provides the system's time zone to applications"
-msgstr ""
-
-#: nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop:8
-msgctxt "Name"
-msgid "Nepomuk Search Module"
-msgstr ""
-
-#: nepomuk/kioslaves/search/kdedmodule/nepomuksearchmodule.desktop:56
-msgctxt "Comment"
-msgid ""
-"Helper module for KIO to ensure automatic updates of nepomuksearch listings."
-msgstr ""
-
-#: solid-networkstatus/kded/networkstatus.desktop:2
-msgctxt "Name"
-msgid "Network Status"
-msgstr ""
-
-#: solid-networkstatus/kded/networkstatus.desktop:62
-msgctxt "Comment"
-msgid ""
-"Tracks status of network interfaces and provides notification to "
-"applications using the network."
-msgstr ""
-
-#: kioslave/network/kded/networkwatcher.desktop:8
-msgctxt "Name"
-msgid "Network Watcher"
-msgstr ""
-
-#: kioslave/network/kded/networkwatcher.desktop:71
-msgctxt "Comment"
-msgid ""
-"Keeps track of the network and updates directory listings of the network:/ "
-"protocol"
-msgstr ""
-
-#: phonon/kded-module/phononserver.desktop:8
-msgctxt "Name"
-msgid "Sound Policy"
-msgstr ""
-
-#: phonon/kded-module/phononserver.desktop:70
-msgctxt "Comment"
-msgid "Provides sound system policy to applications"
-msgstr ""
-
-#: kioslave/remote/kdedmodule/remotedirnotify.desktop:3
-msgctxt "Name"
-msgid "Remote URL Change Notifier"
-msgstr ""
-
-#: kioslave/remote/kdedmodule/remotedirnotify.desktop:63
-msgctxt "Comment"
-msgid "Provides change notification for network folders"
-msgstr ""
-
-#: solidautoeject/solidautoeject.desktop:7
-msgctxt "Name"
-msgid "Drive Ejector"
-msgstr ""
-
-#: solidautoeject/solidautoeject.desktop:65
-msgctxt "Comment"
-msgid "Automatically releases drives when their eject button is pushed"
-msgstr ""
-
-#: soliduiserver/soliduiserver.desktop:8
-msgctxt "Name"
-msgid "Hardware Detection"
-msgstr ""
-
-#: soliduiserver/soliduiserver.desktop:68
-msgctxt "Comment"
-msgid "Provides a user interface for hardware events"
-msgstr ""
-
-#: kglobalaccel/kglobalaccel.desktop:11
-msgctxt "Name"
-msgid "KDED Global Shortcuts Server"
-msgstr ""
-
-#: kioslave/man/kmanpart.desktop:3
-msgctxt "Comment"
-msgid "Embeddable Troff Viewer"
-msgstr "Gwelydd Troff Mewnadeiladwy"
-
-#: kioslave/man/kmanpart.desktop:90
-msgctxt "Name"
-msgid "KManPart"
-msgstr "KManPart"
-
-#: knotify/knotify4.desktop:3
-msgctxt "Name"
-msgid "KNotify"
-msgstr ""
-
-#: knotify/knotify4.desktop:84
-msgctxt "Comment"
-msgid "KDE Notification Daemon"
-msgstr ""
-
-#: kurifilter-plugins/shorturi/kshorturifilter.desktop:3
-msgctxt "Name"
-msgid "ShortURIFilter"
-msgstr "HidlURIByr"
-
-#: kuiserver/kuiserver.desktop:3
-msgctxt "Name"
-msgid "kuiserver"
-msgstr ""
-
-#: kuiserver/kuiserver.desktop:83
-msgctxt "Comment"
-msgid "KDE's Progress Info UI server"
-msgstr ""
-
-#: kurifilter-plugins/ikws/kuriikwsfilter.desktop:3
-msgctxt "Name"
-msgid "InternetKeywordsFilter"
-msgstr "HidlAllweddeiriauRhyngrwyd"
-
-#: kurifilter-plugins/ikws/kurisearchfilter.desktop:3
-msgctxt "Name"
-msgid "SearchKeywordsFilter"
-msgstr "HidlChwilioAllweddeiriau"
-
-#: kwalletd/kwalletd.desktop:8
-msgctxt "Name"
-msgid "Wallet Server"
-msgstr ""
-
-#: kwalletd/kwalletd.desktop:82
-msgctxt "Comment"
-msgid "Wallet Server"
-msgstr ""
-
-#: kcontrol/locale/language.desktop:14
-msgctxt "Name"
-msgid "Country/Region & Language"
-msgstr "Gwlad/Rhanbarth ac Iaith"
-
-#: kcontrol/locale/language.desktop:102
-msgctxt "Comment"
-msgid "Language, numeric, and time settings for your particular region"
-msgstr "Gosodiadu iaith,rhifau,ac amser i'ch rhanbarth"
-
-#: kurifilter-plugins/localdomain/localdomainurifilter.desktop:3
-msgctxt "Name"
-msgid "LocalDomainFilter"
-msgstr "HidlParthLleol"
-
-#: nepomuk/services/backupsync/service/nepomukbackupsync.desktop:8
-msgctxt "Name"
-msgid "Nepomuk Backup and Sync"
-msgstr ""
-
-#: nepomuk/services/backupsync/service/nepomukbackupsync.desktop:54
-msgctxt "Comment"
-msgid "Nepomuk Service which handles backup and sync."
-msgstr ""
-
-#: nepomuk/services/filewatch/nepomukfilewatch.desktop:7
-msgctxt "Name"
-msgid "NepomukFileWatch"
-msgstr ""
-
-#: nepomuk/services/filewatch/nepomukfilewatch.desktop:81
-msgctxt "Comment"
-msgid "The Nepomuk file watch service for monitoring file changes"
-msgstr ""
-
-#: nepomuk/services/queryservice/nepomukqueryservice.desktop:7
-msgctxt "Name"
-msgid "NepomukQueryService"
-msgstr ""
-
-#: nepomuk/services/queryservice/nepomukqueryservice.desktop:80
-msgctxt "Comment"
-msgid ""
-"The Nepomuk Query Service provides an interface for persistent query folders"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.desktop:7
-#: nepomuk/services/storage/nepomukstorage.notifyrc:3
-msgctxt "Name"
-msgid "Nepomuk Data Storage"
-msgstr ""
-
-#: nepomuk/services/storage/nepomukstorage.desktop:80
-msgctxt "Comment"
-msgid "The Core Nepomuk data storage service"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.desktop:7
-msgctxt "Name"
-msgid "Nepomuk Strigi Service"
-msgstr ""
-
-#: nepomuk/services/strigi/nepomukstrigiservice.desktop:83
-msgctxt "Comment"
-msgid ""
-"Nepomuk Service which controls the strigidaemon, i.e. indexes files on the "
-"desktop"
-msgstr ""
-
-#: kioslave/network/ioslave/network.protocol:8
-msgctxt "Description"
-msgid "A kioslave to browse the network"
-msgstr ""
-
-#: plasma/containments/newspaper/plasma-containment-newspaper.desktop:2
-msgctxt "Name"
-msgid "Newspaper Layout"
-msgstr ""
-
-#: plasma/containments/newspaper/plasma-containment-newspaper.desktop:52
-msgctxt "Comment"
-msgid "A layout that puts widgets into columns"
-msgstr ""
-
-#: plasma/kpart/plasma-kpart.desktop:2
-msgctxt "Name"
-msgid "plasma-kpart"
-msgstr ""
-
-#: plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop:2
-msgctxt "Name"
-msgid "Javascript Addon"
-msgstr ""
-
-#: plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop:53
-msgctxt "Comment"
-msgid "Addons for Javascript Plasma plugins"
-msgstr ""
-
-#: plasma/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop:2
-msgctxt "Name"
-msgid "Declarative widget"
-msgstr ""
-
-#: plasma/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop:42
-msgctxt "Comment"
-msgid "Native Plasma widget written in QML and JavaScript"
-msgstr ""
-
-#: plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop:2
-msgctxt "Name"
-msgid "JavaScript Widget"
-msgstr ""
-
-#: plasma/scriptengines/javascript/plasma-scriptengine-applet-simple-javascript.desktop:71
-msgctxt "Comment"
-msgid "Native Plasma widget written in JavaScript"
-msgstr ""
-
-#: plasma/scriptengines/javascript/plasma-scriptengine-dataengine-javascript.desktop:2
-msgctxt "Name"
-msgid "JavaScript DataEngine"
-msgstr ""
-
-#: plasma/scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop:2
-msgctxt "Name"
-msgid "JavaScript Runner"
-msgstr ""
-
-#: plasma/scriptengines/javascript/plasma-scriptengine-runner-javascript.desktop:72
-msgctxt "Comment"
-msgid "JavaScript Runner"
-msgstr ""
-
-#: renamedlgplugins/audio/renaudiodlg.desktop:3
-msgctxt "Name"
-msgid "Audio Preview"
-msgstr ""
-
-#: renamedlgplugins/images/renimagedlg.desktop:3
-msgctxt "Name"
-msgid "Image Displayer"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/7digital.desktop:5
-msgctxt "Name"
-msgid "7Digital"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/7digital.desktop:67
-msgctxt "Query"
-msgid ""
-"http://us.7digital.com/Search?search=\\\\{@}&searchtype=global&submit=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/acronym.desktop:3
-msgctxt "Name"
-msgid "Acronym Database"
-msgstr "Cronfa Llythrenwau"
-
-#: kurifilter-plugins/ikws/searchproviders/acronym.desktop:89
-msgctxt "Query"
-msgid "http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/altavista.desktop:3
-msgctxt "Name"
-msgid "AltaVista"
-msgstr "AltaVista"
-
-#: kurifilter-plugins/ikws/searchproviders/altavista.desktop:92
-msgctxt "Query"
-msgid ""
-"http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/amazon.desktop:5
-msgctxt "Name"
-msgid "Amazon"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/amazon.desktop:66
-msgctxt "Query"
-msgid ""
-"http://www.amazon.com/s/ref=nb_sb_noss?url=search-alias=aps&field-keywords=\\"
-"\\{@}&x=0&y=0"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/amazon_mp3.desktop:5
-msgctxt "Name"
-msgid "Amazon MP3"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/amazon_mp3.desktop:68
-msgctxt "Query"
-msgid ""
-"http://www.amazon.com/s/ref=nb_sb_noss?url=search-alias=digital-music&field-"
-"keywords=\\\\{@}&x=0&y=0"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/amg.desktop:4
-msgctxt "Name"
-msgid "All Music Guide"
-msgstr "Canllaw Cerdd"
-
-#: kurifilter-plugins/ikws/searchproviders/amg.desktop:88
-msgctxt "Query"
-msgid "http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/austronaut.desktop:3
-msgctxt "Name"
-msgid "AustroNaut"
-msgstr "AustroNaut"
-
-#: kurifilter-plugins/ikws/searchproviders/austronaut.desktop:92
-msgctxt "Query"
-msgid "http://austronaut.at/page.php?begriff=\\\\{@}&wo=at"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/backports.desktop:3
-msgctxt "Name"
-msgid "Debian Backports Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/backports.desktop:86
-msgctxt "Query"
-msgid "http://www.backports.org/package.php?search=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/baidu.desktop:3
-msgctxt "Name"
-msgid "Baidu"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/baidu.desktop:60
-msgctxt "Query"
-msgid "http://www.baidu.com/s?wd=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/beolingus.desktop:3
-msgctxt "Name"
-msgid "Beolingus Online Dictionary"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/beolingus.desktop:65
-msgctxt "Query"
-msgid ""
-"http://dict.tu-"
-"chemnitz.de/dings.cgi?lang=de&service=deen&opterrors=0&optpro=0&query=\\\\"
-"{@}&iservice=&comment=&email"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/bing.desktop:3
-msgctxt "Name"
-msgid "Bing"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/bing.desktop:60
-msgctxt "Query"
-msgid "http://www.bing.com/search?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/blip.desktop:5
-msgctxt "Name"
-msgid "Blip.tv"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/blip.desktop:67
-msgctxt "Query"
-msgid "http://blip.tv/search?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/bugft.desktop:3
-msgctxt "Name"
-msgid "KDE Bug Database Fulltext Search"
-msgstr "Chwilio Llawn-destun y Gronfa Gwallau KDE"
-
-#: kurifilter-plugins/ikws/searchproviders/bugft.desktop:90
-msgctxt "Query"
-msgid "http://bugs.kde.org/buglist.cgi?quicksearch=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/bugno.desktop:3
-msgctxt "Name"
-msgid "KDE Bug Database Bug Number Search"
-msgstr "Chwilio Rhif Gwall y Gronfa Gwallau KDE"
-
-#: kurifilter-plugins/ikws/searchproviders/bugno.desktop:89
-msgctxt "Query"
-msgid "https://bugs.kde.org/show_bug.cgi?id=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/call.desktop:5
-msgctxt "Name"
-msgid "QRZ.com Callsign Database"
-msgstr "Cronfa Ddata Arwydd-galwad QRZ.com"
-
-#: kurifilter-plugins/ikws/searchproviders/call.desktop:89
-msgctxt "Query"
-msgid "http://www.qrz.com/database?callsign=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/cia.desktop:4
-msgctxt "Name"
-msgid "CIA World Fact Book"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/cia.desktop:84
-msgctxt "Query"
-msgid ""
-"http://www.google.com/search?q=allintitle%3A\\\\"
-"{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/citeseer.desktop:5
-msgctxt "Name"
-msgid "CiteSeer: Scientific Literature Digital Library"
-msgstr "CiteSeer: Llyfgell Digidol Llenyddiaeth Gwyddonol"
-
-#: kurifilter-plugins/ikws/searchproviders/citeseer.desktop:90
-msgctxt "Query"
-msgid "http://citeseer.ist.psu.edu/cs?q=\\\\{@}&submit=Search+Documents&cs=1"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/cpan.desktop:3
-msgctxt "Name"
-msgid "CPAN - Comprehensive Perl Archive Network"
-msgstr "CPAN - Rhwydwaith Archif Cynhwysfawr Perl"
-
-#: kurifilter-plugins/ikws/searchproviders/cpan.desktop:90
-msgctxt "Query"
-msgid ""
-"http://search.cpan.org/search?mode=\\\\{mode,2,\"dist\"}&query=\\\\"
-"{query,q,1}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ctan.desktop:3
-msgctxt "Name"
-msgid "CTAN - Comprehensive TeX Archive Network"
-msgstr "CTAN - Rhwydwaith Archif Cynhwysfawr TeX"
-
-#: kurifilter-plugins/ikws/searchproviders/ctan.desktop:90
-msgctxt "Query"
-msgid ""
-"http://ctan.org/cgi-bin/filenameSearch.py?filename=\\\\{@}&Search=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ctan_cat.desktop:3
-msgctxt "Name"
-msgid "CTAN Catalog"
-msgstr "Catalog CTAN"
-
-#: kurifilter-plugins/ikws/searchproviders/ctan_cat.desktop:90
-msgctxt "Query"
-msgid ""
-"http://tug.ctan.org/cgi-bin/search.py?metadataSearch=\\\\"
-"{@}&metadataSearchSubmit=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/dbug.desktop:3
-msgctxt "Name"
-msgid "Debian BTS Bug Search"
-msgstr "Chwiliad Nam BTS Debian"
-
-#: kurifilter-plugins/ikws/searchproviders/dbug.desktop:87
-msgctxt "Query"
-msgid "http://bugs.debian.org/\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/de2en.desktop:5
-msgctxt "Name"
-msgid "dict.cc Translation: German to English"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/de2en.desktop:89
-#: kurifilter-plugins/ikws/searchproviders/en2de.desktop:89
-msgctxt "Query"
-msgid "http://www.dict.cc/?s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/de2fr.desktop:3
-msgctxt "Name"
-msgid "LEO - Translate Between German and French"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/de2fr.desktop:89
-#: kurifilter-plugins/ikws/searchproviders/fr2de.desktop:89
-msgctxt "Query"
-msgid "http://dict.leo.org/?lp=frde&search=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/deb.desktop:3
-msgctxt "Name"
-msgid "Debian Package Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/deb.desktop:89
-msgctxt "Query"
-msgid "http://packages.debian.org/\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/dictfr.desktop:3
-msgctxt "Name"
-msgid "CNRTL/TILF French dictionary"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/dictfr.desktop:63
-msgctxt "Query"
-msgid "http://www.cnrtl.fr/definition/\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/dmoz.desktop:3
-msgctxt "Name"
-msgid "Open Directory"
-msgstr "Cyfeiriadur Agored"
-
-#: kurifilter-plugins/ikws/searchproviders/dmoz.desktop:93
-msgctxt "Query"
-msgid "http://search.dmoz.org/cgi-bin/search?search=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/docbook.desktop:5
-msgctxt "Name"
-msgid "DocBook - The Definitive Guide"
-msgstr "DocBook - Y Canllaw Awdurdodol"
-
-#: kurifilter-plugins/ikws/searchproviders/docbook.desktop:92
-msgctxt "Query"
-msgid "http://www.docbook.org/tdg/en/html/\\\\{1}.html"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/doi.desktop:5
-msgctxt "Name"
-msgid "Digital Object Identifier"
-msgstr "Dynodydd Gwrthrych Digidol"
-
-#: kurifilter-plugins/ikws/searchproviders/doi.desktop:89
-msgctxt "Query"
-msgid "http://dx.doi.org/\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/duckduckgo.desktop:5
-msgctxt "Name"
-msgid "Duck Duck Go"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/duckduckgo.desktop:65
-msgctxt "Query"
-msgid "http://duckduckgo.com/?q=\\\\{@}&v="
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/duckduckgo_info.desktop:5
-msgctxt "Name"
-msgid "Duck Duck Go Info"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/duckduckgo_info.desktop:64
-msgctxt "Query"
-msgid "http://duckduckgo.com/?q=\\\\{@}&v=r"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/duckduckgo_shopping.desktop:5
-msgctxt "Name"
-msgid "Duck Duck Go Shopping"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/duckduckgo_shopping.desktop:64
-msgctxt "Query"
-msgid "http://duckduckgo.com/?q=\\\\{@}&v=s"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ecosia.desktop:3
-msgctxt "Name"
-msgid "Ecosia search engine"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ecosia.desktop:66
-msgctxt "Query"
-msgid "http://ecosia.org/search.php?q=\\\\{@}&meta=normal"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/en2de.desktop:5
-msgctxt "Name"
-msgid "dict.cc Translation: English to German"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/en2es.desktop:5
-msgctxt "Name"
-msgid "WordReference.com Translation: English to Spanish"
-msgstr "Cyfieithiad WordReference.com: Saesneg i Sbaeneg"
-
-#: kurifilter-plugins/ikws/searchproviders/en2es.desktop:89
-msgctxt "Query"
-msgid "http://www.wordreference.com/es/translation.asp?tranword=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/en2fr.desktop:5
-msgctxt "Name"
-msgid "WordReference.com Translation: English to French"
-msgstr "Cyfieithiad WordReference.com: Saesneg i Ffrangeg"
-
-#: kurifilter-plugins/ikws/searchproviders/en2fr.desktop:89
-msgctxt "Query"
-msgid "http://www.wordreference.com/fr/Translation.asp?enfr=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/en2it.desktop:5
-msgctxt "Name"
-msgid "WordReference.com Translation: English to Italian"
-msgstr "Cyfieithiad WordReference.com: Saesneg i Eidaleg"
-
-#: kurifilter-plugins/ikws/searchproviders/en2it.desktop:89
-msgctxt "Query"
-msgid "http://www.wordreference.com/it/translation.asp?enit=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/es2en.desktop:5
-msgctxt "Name"
-msgid "WordReference.com Translation: Spanish to English"
-msgstr "Cyfieithiad WordReference.com: Sbaeneg i Saesneg"
-
-#: kurifilter-plugins/ikws/searchproviders/es2en.desktop:89
-msgctxt "Query"
-msgid "http://www.wordreference.com/es/en/translation.asp?spen=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ethicle.desktop:3
-msgctxt "Name"
-msgid "Ethicle"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ethicle.desktop:66
-msgctxt "Query"
-msgid "http://www.ethicle.com/search.php?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/facebook.desktop:5
-msgctxt "Name"
-msgid "Facebook"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/facebook.desktop:67
-msgctxt "Query"
-msgid "http://www.facebook.com/search/?q=\\\\{@}&init=quick"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/feedster.desktop:3
-msgctxt "Name"
-msgid "Feedster"
-msgstr "Feedster"
-
-#: kurifilter-plugins/ikws/searchproviders/feedster.desktop:91
-msgctxt "Query"
-msgid "http://www.feedster.com/search.php?q=\\\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/flickr.desktop:5
-msgctxt "Name"
-msgid "Flickr"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/flickr.desktop:68
-msgctxt "Query"
-msgid "http://www.flickr.com/search/?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/flickrcc.desktop:5
-msgctxt "Name"
-msgid "Flickr Creative Commons"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/flickrcc.desktop:62
-msgctxt "Query"
-msgid "http://www.flickr.com/search/?q=\\\\{@}&l=cc&ct=0&mt=all&adv=1"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/foldoc.desktop:3
-msgctxt "Name"
-msgid "Free On-Line Dictionary of Computing"
-msgstr "Geiriadur Rhydd Ar-lein o Gyfrifiaduro"
-
-#: kurifilter-plugins/ikws/searchproviders/foldoc.desktop:91
-msgctxt "Query"
-msgid "http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/fr2de.desktop:3
-msgctxt "Name"
-msgid "LEO - Translate Between French and German"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/fr2en.desktop:5
-msgctxt "Name"
-msgid "WordReference.com Translation: French to English"
-msgstr "Cyfieithiad WordReference.com: Ffrangeg i Saesneg"
-
-#: kurifilter-plugins/ikws/searchproviders/fr2en.desktop:89
-msgctxt "Query"
-msgid "http://www.wordreference.com/fr/en/translation.asp?fren=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/freedb.desktop:3
-msgctxt "Name"
-msgid "FreeDB"
-msgstr "FreeDB"
-
-#: kurifilter-plugins/ikws/searchproviders/freedb.desktop:91
-msgctxt "Query"
-msgid "http://www.freedb.org/freedb_search.php?words=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/freshmeat.desktop:3
-msgctxt "Name"
-msgid "Freshmeat"
-msgstr "Freshmeat"
-
-#: kurifilter-plugins/ikws/searchproviders/freshmeat.desktop:92
-msgctxt "Query"
-msgid "http://freshmeat.net/search/?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/froogle.desktop:3
-msgctxt "Name"
-msgid "Froogle"
-msgstr "Froogle"
-
-#: kurifilter-plugins/ikws/searchproviders/froogle.desktop:91
-msgctxt "Query"
-msgid "http://froogle.google.com/froogle?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/fsd.desktop:3
-msgctxt "Name"
-msgid "FSF/UNESCO Free Software Directory"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/fsd.desktop:89
-msgctxt "Query"
-msgid "http://directory.fsf.org/search/?query=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/github.desktop:5
-msgctxt "Name"
-msgid "GitHub"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/github.desktop:67
-msgctxt "Query"
-msgid "http://github.com/search?q=\\\\{@}&x=0&y=0"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/gitorious.desktop:5
-msgctxt "Name"
-msgid "Gitorious"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/gitorious.desktop:67
-msgctxt "Query"
-msgid "http://gitorious.org/search?q=\\\\{@}&commit=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google.desktop:3
-msgctxt "Name"
-msgid "Google"
-msgstr "Google"
-
-#: kurifilter-plugins/ikws/searchproviders/google.desktop:94
-msgctxt "Query"
-msgid "http://www.google.com/search?q=\\\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_advanced.desktop:3
-msgctxt "Name"
-msgid "Google Advanced Search"
-msgstr "Chwilio Uwch Google"
-
-#: kurifilter-plugins/ikws/searchproviders/google_advanced.desktop:92
-msgctxt "Query"
-msgid ""
-"http://www.google.com/search?as_q=\\\\{all,@}&num=\\\\"
-"{num,\"10\"}&btnG=Google+Search&as_epq=\\\\{exact,\"\"}&as_oq=\\\\"
-"{any,\"\"}&as_eq=\\\\{without,\"\"}&lr=\\\\{lang,\"\"}&as_ft=\\\\"
-"{ft,\"i\"}&as_filetype=\\\\{filetype,\"\"}&as_qdr=\\\\"
-"{date,\"all\"}&as_occt=\\\\{occ,\"any\"}&as_dt=\\\\"
-"{siteop,\"i\"}&as_sitesearch=\\\\{site}&safe=\\\\{safe,\"active\"}&ie=UTF-"
-"8&oe=UTF-8"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_code.desktop:5
-msgctxt "Name"
-msgid "Google Code"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_code.desktop:66
-msgctxt "Query"
-msgid "http://code.google.com/query/#q=\\\\{%2520}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_groups.desktop:3
-msgctxt "Name"
-msgid "Google Groups"
-msgstr "Grwpiau Google"
-
-#: kurifilter-plugins/ikws/searchproviders/google_groups.desktop:94
-msgctxt "Query"
-msgid "http://groups.google.com/groups?oi=djq&as_q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_images.desktop:3
-msgctxt "Name"
-msgid "Google Image Search"
-msgstr "Chwilio Delweddau Google"
-
-#: kurifilter-plugins/ikws/searchproviders/google_images.desktop:94
-msgctxt "Query"
-msgid "http://images.google.com/images?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_lucky.desktop:3
-msgctxt "Name"
-msgid "Google (I'm Feeling Lucky)"
-msgstr "Google(Dwi'n Teimlo'n Lwcus)"
-
-#: kurifilter-plugins/ikws/searchproviders/google_lucky.desktop:92
-msgctxt "Query"
-msgid ""
-"http://www.google.com/search?q=\\\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-"
-"8&oe=UTF-8"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_maps.desktop:3
-msgctxt "Name"
-msgid "Google Maps"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_maps.desktop:66
-msgctxt "Query"
-msgid "http://maps.google.com/maps?q=\\\\{@}&ie=UTF8&iwloc=addr"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_movie.desktop:3
-msgctxt "Name"
-msgid "Google Movies"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_movie.desktop:92
-msgctxt "Query"
-msgid "http://www.google.com/search?q=movie:\\\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/google_news.desktop:3
-msgctxt "Name"
-msgid "Google News"
-msgstr "Newyddion Google"
-
-#: kurifilter-plugins/ikws/searchproviders/google_news.desktop:93
-msgctxt "Query"
-msgid "http://news.google.com/news?q=\\\\{@}&ie=UTF-8&oe=UTF-8"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/gracenote.desktop:3
-msgctxt "Name"
-msgid "Gracenote"
-msgstr "Gracenote"
-
-#: kurifilter-plugins/ikws/searchproviders/gracenote.desktop:91
-msgctxt "Query"
-msgid "http://www.gracenote.com/music/search-adv.html?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/grec.desktop:5
-msgctxt "Name"
-msgid ""
-"Great Dictionary of the Catalan Language (GRan Enciclopèdia  Catalana)"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/grec.desktop:86
-msgctxt "Query"
-msgid "http://ec.grec.net/cgi-bin/AppDLC3.exe?APP=CERCADLC&GECART=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/hyperdictionary.desktop:3
-msgctxt "Name"
-msgid "HyperDictionary.com"
-msgstr "HyperDictionary.com"
-
-#: kurifilter-plugins/ikws/searchproviders/hyperdictionary.desktop:92
-msgctxt "Query"
-msgid "http://www.hyperdictionary.com/search.aspx?define=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:3
-msgctxt "Name"
-msgid "HyperDictionary.com Thesaurus"
-msgstr "Thesawrws HyperDictionary.com"
-
-#: kurifilter-plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop:92
-msgctxt "Query"
-msgid "http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ibl.desktop:4
-msgctxt "Name"
-msgid "Internet Book List"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ibl.desktop:87
-msgctxt "Query"
-msgid "http://www.iblist.com/search/search.php?item=\\\\{@}&submit=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/identica_groups.desktop:5
-msgctxt "Name"
-msgid "Identi.ca Groups"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/identica_groups.desktop:67
-msgctxt "Query"
-msgid "http://identi.ca/search/group?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/identica_notices.desktop:5
-msgctxt "Name"
-msgid "Identi.ca Notices"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/identica_notices.desktop:65
-msgctxt "Query"
-msgid "http://identi.ca/search/notice?q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/identica_people.desktop:5
-msgctxt "Name"
-msgid "Identi.ca People"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/identica_people.desktop:64
-msgctxt "Query"
-msgid "http://identi.ca/search/people?q=\\\\{@}&search=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/imdb.desktop:3
-msgctxt "Name"
-msgid "Internet Movie Database"
-msgstr "Cronfa Ffilmiau y Rhyngrwyd"
-
-#: kurifilter-plugins/ikws/searchproviders/imdb.desktop:91
-msgctxt "Query"
-msgid "http://imdb.com/find?s=all&q=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/it2en.desktop:5
-msgctxt "Name"
-msgid "WordReference.com Translation: Italian to English"
-msgstr "Cyfieithiad WordReference.com: Eidaleg i Saesneg"
-
-#: kurifilter-plugins/ikws/searchproviders/it2en.desktop:89
-msgctxt "Query"
-msgid "http://www.wordreference.com/it/en/translation.asp?iten=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/jamendo.desktop:5
-msgctxt "Name"
-msgid "Jamendo"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/jamendo.desktop:67
-msgctxt "Query"
-msgid "http://www.jamendo.com/en/search/all/\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/jeeves.desktop:3
-msgctxt "Name"
-msgid "Ask Jeeves"
-msgstr "Ask Jeeves"
-
-#: kurifilter-plugins/ikws/searchproviders/jeeves.desktop:92
-msgctxt "Query"
-msgid ""
-"http://www.ask.com/main/askJeeves.asp?origin=0&qSource=4&site_name=Jeeves&met"
-"asearch=yes&ask=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/katatudo.desktop:3
-msgctxt "Name"
-msgid "KataTudo"
-msgstr "KataTudo"
-
-#: kurifilter-plugins/ikws/searchproviders/katatudo.desktop:91
-msgctxt "Query"
-msgid ""
-"http://www.katatudo.com.br/busca/resultado.php?q=\\\\{@}&onde=&b=Buscar"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde.desktop:6
-msgctxt "Name"
-msgid "KDE API Documentation"
-msgstr "Dogfenniaeth API KDE"
-
-#: kurifilter-plugins/ikws/searchproviders/kde.desktop:92
-msgctxt "Query"
-msgid "http://api.kde.org/classmapper.php?class=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/appsy.desktop:3
-msgctxt "Name"
-msgid "KDE App Search"
-msgstr "KDE App Chwilio"
-
-#: kurifilter-plugins/ikws/searchproviders/appsy.desktop:92
-msgctxt "Query"
-msgid "http://www.kde-apps.org/content/search.php?search=Search&name=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_forums.desktop:5
-msgctxt "Name"
-msgid "KDE Forums"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_forums.desktop:67
-msgctxt "Query"
-msgid ""
-"http://forum.kde.org/search.php?keywords=\\\\"
-"{@}&terms=all&author=&tags=&sv=0&sc=1&sf=all&sr=posts&sk=t&sd=d&st=0&ch=300&c"
-"ountlimit=100&t=0&submit=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_look.desktop:5
-msgctxt "Name"
-msgid "KDE Look"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_look.desktop:67
-msgctxt "Query"
-msgid "http://www.kde-look.org/content/search.php?search=Search&name=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_techbase.desktop:5
-msgctxt "Name"
-msgid "KDE TechBase"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_techbase.desktop:67
-msgctxt "Query"
-msgid "http://techbase.kde.org/Special:Search?search=\\\\{@}&fulltext=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_userbase.desktop:5
-msgctxt "Name"
-msgid "KDE UserBase"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_userbase.desktop:67
-msgctxt "Query"
-msgid "http://userbase.kde.org/Special:Search?search=\\\\{@}&fulltext=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_websvn.desktop:3
-msgctxt "Name"
-msgid "KDE WebSVN"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/kde_websvn.desktop:91
-msgctxt "Query"
-msgid "http://websvn.kde.org/\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/leo.desktop:3
-msgctxt "Name"
-msgid "LEO-Translate"
-msgstr "LEO-Cyfieithu"
-
-#: kurifilter-plugins/ikws/searchproviders/leo.desktop:92
-msgctxt "Query"
-msgid "http://dict.leo.org/?search=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/magnatune.desktop:5
-msgctxt "Name"
-msgid "Magnatune"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/magnatune.desktop:67
-msgctxt "Query"
-msgid "http://my.magnatune.com/search?w=\\\\{@}&t=m&x=0&y=0"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/metacrawler.desktop:3
-msgctxt "Name"
-msgid "MetaCrawler"
-msgstr "MetaCrawler"
-
-#: kurifilter-plugins/ikws/searchproviders/metacrawler.desktop:92
-msgctxt "Query"
-msgid ""
-"http://search.metacrawler.com/crawler?general=\\\\"
-"{@}&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&tim"
-"eout=0&sort=0&format=beta99&theme=classic&refer=mc-search&refer=mc-search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/msdn.desktop:3
-msgctxt "Name"
-msgid "Microsoft Developer Network Search"
-msgstr "Chwilio Rhwydwaith Datblygwyr Microsoft"
-
-#: kurifilter-plugins/ikws/searchproviders/msdn.desktop:91
-msgctxt "Query"
-msgid ""
-"http://msdn.microsoft.com/library/shared/searchtab/searchHandoff.asp?handoffu"
-"rl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault.asp&stcfg=d%3A%2F"
-"http%2Fcnfg.xml&qu=\\\\{@}&btnSearch=GO"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-deru.desktop:4
-msgctxt "Name"
-msgid "Multitran - Translate Between German and Russian"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-deru.desktop:83
-msgctxt "Query"
-msgid "http://multitran.ru/c/m.exe?l1=3&s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-enru.desktop:4
-msgctxt "Name"
-msgid "Multitran - Translate Between English and Russian"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-enru.desktop:83
-msgctxt "Query"
-msgid "http://multitran.ru/c/m.exe?l1=1&l2=2&s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-esru.desktop:4
-msgctxt "Name"
-msgid "Multitran - Translate Between Spanish and Russian"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-esru.desktop:83
-msgctxt "Query"
-msgid "http://multitran.ru/c/m.exe?l1=5&s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-frru.desktop:4
-msgctxt "Name"
-msgid "Multitran - Translate Between French and Russian"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-frru.desktop:83
-msgctxt "Query"
-msgid "http://multitran.ru/c/m.exe?l1=4&s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-itru.desktop:4
-msgctxt "Name"
-msgid "Multitran - Translate Between Italian and Russian"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-itru.desktop:83
-msgctxt "Query"
-msgid "http://multitran.ru/c/m.exe?l1=23&s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-nlru.desktop:4
-msgctxt "Name"
-msgid "Multitran - Translate Between Dutch and Russian"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/multitran-nlru.desktop:83
-msgctxt "Query"
-msgid "http://multitran.ru/c/m.exe?l1=24&s=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/netcraft.desktop:3
-msgctxt "Name"
-msgid "Netcraft"
-msgstr "Netcraft"
-
-#: kurifilter-plugins/ikws/searchproviders/netcraft.desktop:91
-msgctxt "Query"
-msgid "http://uptime.netcraft.com/up/graph?site=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/nl-telephone.desktop:2
-msgctxt "Name"
-msgid "Telephonebook Search Provider"
-msgstr "Darparydd Chwiliadau Llyfr Ffôn"
-
-#: kurifilter-plugins/ikws/searchproviders/nl-telephone.desktop:89
-msgctxt "Query"
-msgid ""
-"http://www.detelefoongids.nl/tginl.dll?action=white&type=search&name=\\\\"
-"{1}&city=\\\\{2}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/nl-teletekst.desktop:2
-msgctxt "Name"
-msgid "Teletekst Search Provider"
-msgstr "Darparwr Chwiliadau Teletekst"
-
-#: kurifilter-plugins/ikws/searchproviders/nl-teletekst.desktop:91
-msgctxt "Query"
-msgid "http://teletekst.nos.nl/gif/\\\\{@}-01.html"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/opendesktop.desktop:5
-msgctxt "Name"
-msgid "openDesktop.org"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/opendesktop.desktop:62
-msgctxt "Query"
-msgid ""
-"http://www.opendesktop.org/content/search.php?search=Search&name=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/pgpkeys.desktop:3
-msgctxt "Name"
-msgid "OpenPGP Key Search"
-msgstr "Chwilio Allwedd PGPAgored"
-
-#: kurifilter-plugins/ikws/searchproviders/pgpkeys.desktop:90
-msgctxt "Query"
-msgid "http://pgp.dtype.org:11371/pks/lookup?search=\\\\{@}&op=vindex"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/php.desktop:3
-msgctxt "Name"
-msgid "PHP Search"
-msgstr "Chwilio PHP"
-
-#: kurifilter-plugins/ikws/searchproviders/php.desktop:91
-msgctxt "Query"
-msgid "http://www.php.net/manual-lookup.php?pattern=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/python.desktop:5
-msgctxt "Name"
-msgid "Python Reference Manual"
-msgstr "Llawlyfr Cyfeiriol Python"
-
-#: kurifilter-plugins/ikws/searchproviders/python.desktop:91
-msgctxt "Query"
-msgid ""
-"http://www.google.com/search?sourceid=python-search&q=\\\\"
-"{@}&submit=Search&q=site%3Apython.org"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/qt.desktop:5
-msgctxt "Name"
-msgid "Latest Qt Online Documentation"
-msgstr "Dogfennaeth Diweddar QT Online"
-
-#: kurifilter-plugins/ikws/searchproviders/qt.desktop:90
-msgctxt "Query"
-msgid "http://doc.qt.nokia.com/latest/\\\\{@}.html"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/qt3.desktop:5
-msgctxt "Name"
-msgid "Qt3 Online Documentation"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/qt3.desktop:86
-msgctxt "Query"
-msgid "http://doc.trolltech.com/3.3/\\\\{@}.html"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/rae.desktop:5
-msgctxt "Name"
-msgid "Dictionary of the Spanish Academy (RAE)"
-msgstr "Geiriadur yr Academi Sbaeneg (RAE)"
-
-#: kurifilter-plugins/ikws/searchproviders/rae.desktop:91
-msgctxt "Query"
-msgid ""
-"http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\\\"
-"{@}&FORMATO=ampliado"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/rfc.desktop:3
-msgctxt "Name"
-msgid "IETF Requests for Comments"
-msgstr "Ceisiadau am Sylwadau IETF"
-
-#: debian/tmp/usr/share/kde4/services/searchproviders/rfc.desktop:90
-#: kurifilter-plugins/ikws/searchproviders/rfc.desktop:90
-msgctxt "Query"
-msgid "http://tools.ietf.org/html/rfc\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/rpmfind.desktop:3
-msgctxt "Name"
-msgid "RPM-Find"
-msgstr "RPM-Find"
-
-#: kurifilter-plugins/ikws/searchproviders/rpmfind.desktop:93
-msgctxt "Query"
-msgid "http://www.rpmfind.net/linux/rpm2html/search.php?query=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/ruby_application_archive.desktop:3
-msgctxt "Name"
-msgid "Ruby Application Archive"
-msgstr "Archif Cymhwysiadau Ruby"
-
-#: kurifilter-plugins/ikws/searchproviders/ruby_application_archive.desktop:92
-msgctxt "Query"
-msgid "http://www.ruby-lang.org/en/raa-list.rhtml?name=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/sourceforge.desktop:3
-msgctxt "Name"
-msgid "SourceForge"
-msgstr "SourceForge"
-
-#: kurifilter-plugins/ikws/searchproviders/sourceforge.desktop:90
-msgctxt "Query"
-msgid ""
-"http://sourceforge.net/search/?type_of_search=\\\\{type,\"soft\"}&exact=\\\\"
-"{exact,\"0\"}&words=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/technorati.desktop:3
-msgctxt "Name"
-msgid "Technorati"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/technorati.desktop:90
-msgctxt "Query"
-msgid ""
-"http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/technoratitags.desktop:3
-msgctxt "Name"
-msgid "Technorati Tags"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/technoratitags.desktop:88
-msgctxt "Query"
-msgid "http://technorati.com/tag/\\\\{@}?sourceid=kde-search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/thesaurus.desktop:3
-msgctxt "Name"
-msgid "Merriam-Webster Thesaurus"
-msgstr "Thesawrws Merriam-Webster"
-
-#: kurifilter-plugins/ikws/searchproviders/thesaurus.desktop:91
-msgctxt "Query"
-msgid "http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/tvtome.desktop:4
-msgctxt "Name"
-msgid "TV Tome"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/tvtome.desktop:90
-msgctxt "Query"
-msgid "http://www.tv.com/search.php?type=11&stype=all&qs=\\\\{@}&x=0&y=0"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/urbandictionary.desktop:5
-msgctxt "Name"
-msgid "Urban Dictionary"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/urbandictionary.desktop:66
-msgctxt "Query"
-msgid "http://www.urbandictionary.com/define.php?term=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/uspto.desktop:5
-msgctxt "Name"
-msgid "U.S. Patent Database"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/uspto.desktop:90
-msgctxt "Query"
-msgid ""
-"http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\\\"
-"{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/vimeo.desktop:5
-msgctxt "Name"
-msgid "Vimeo"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/vimeo.desktop:66
-msgctxt "Query"
-msgid "http://vimeo.com/videos/search:\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/vivisimo.desktop:3
-msgctxt "Name"
-msgid "Vivisimo"
-msgstr "Vivisimo"
-
-#: kurifilter-plugins/ikws/searchproviders/vivisimo.desktop:92
-msgctxt "Query"
-msgid ""
-"http://vivisimo.com/search?query=\\\\"
-"{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD%2CExcite%2CDirectHit%2CLooksmart%2"
-"CEuroseek&x=49&y=16"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/voila.desktop:3
-msgctxt "Name"
-msgid "Voila"
-msgstr "Voila"
-
-#: kurifilter-plugins/ikws/searchproviders/voila.desktop:93
-msgctxt "Query"
-msgid "http://www.voila.com/S/geek?an=1&kw=\\\\{@}&dt=*"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/webster.desktop:3
-msgctxt "Name"
-msgid "Merriam-Webster Dictionary"
-msgstr "Geiriadur Merriam-Webster"
-
-#: kurifilter-plugins/ikws/searchproviders/webster.desktop:93
-msgctxt "Query"
-msgid "http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wikia.desktop:5
-msgctxt "Name"
-msgid "Wikia"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wikia.desktop:68
-msgctxt "Query"
-msgid ""
-"http://www.wikia.com/Special:Search?search=\\\\{@}&wikia_search_submit=Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wikipedia.desktop:3
-msgctxt "Name"
-msgid "Wikipedia - The Free Encyclopedia"
-msgstr "Wikipedia - Y Gwyddoniadur Rhydd"
-
-#: kurifilter-plugins/ikws/searchproviders/wikipedia.desktop:92
-msgctxt "Query"
-msgid "http://en.wikipedia.org/wiki/Special:Search?search=\\\\{@}&go=Go"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wiktionary.desktop:3
-msgctxt "Name"
-msgid "Wiktionary - The Free Dictionary"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wiktionary.desktop:90
-msgctxt "Query"
-msgid "http://en.wiktionary.org/wiki/Special:Search?search=\\\\{@}&go=Go"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wolfram_alpha.desktop:3
-msgctxt "Name"
-msgid "Wolfram Alpha"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wolfram_alpha.desktop:62
-msgctxt "Query"
-msgid "http://www.wolframalpha.com/input/?i=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/wordref.desktop:5
-msgctxt "Name"
-msgid "WordReference.com English Dictionary"
-msgstr "Geiriadur Saesneg WorldReference.com"
-
-#: kurifilter-plugins/ikws/searchproviders/wordref.desktop:90
-msgctxt "Query"
-msgid "http://www.wordreference.com/english/definition.asp?en=\\\\{@}"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo.desktop:5
-msgctxt "Name"
-msgid "Yahoo"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo.desktop:69
-msgctxt "Query"
-msgid ""
-"http://search.yahoo.com/search?toggle=1&cop=mss&ei=UTF-8&fr=yfp-t-701&p=\\\\"
-"{@}&x=0&y=0&=Web+Search"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_image.desktop:5
-msgctxt "Name"
-msgid "Yahoo Images"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_image.desktop:67
-msgctxt "Query"
-msgid ""
-"http://images.search.yahoo.com/search/images;_ylt=A0geuy0K6JZLsVkB4m1XNyoA?ei"
-"=UTF-8&p=\\\\{@}&y=0&fr2=tab-web&fr=yfp-t-701"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_local.desktop:5
-msgctxt "Name"
-msgid "Yahoo Local"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_local.desktop:67
-msgctxt "Query"
-msgid ""
-"http://local.yahoo.com/results?stx=\\\\{@}&ei=UTF-8&fr=yfp-t-701&fr2=tab-img"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_shopping.desktop:5
-msgctxt "Name"
-msgid "Yahoo Shopping"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_shopping.desktop:67
-msgctxt "Query"
-msgid ""
-"http://shopping.yahoo.com/search;_ylt=A0SO8ZgG65ZLyX8AsLX7w8QF;_ylu=X3oDMTBpc"
-"jIxMDllBHNlYwN0YWJzBHZ0aWQDVjEwOQ--?cop=mss&ei=UTF-8&p=\\\\{@}&fr2=tab-"
-"video&fr=yfp-t-701"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_video.desktop:5
-msgctxt "Name"
-msgid "Yahoo Video"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/yahoo_video.desktop:67
-msgctxt "Query"
-msgid ""
-"http://video.search.yahoo.com/search/video;_ylt=A0WTb_3a6JZLSHwAK7.JzbkF?ei=U"
-"TF-8&p=\\\\{@}&y=0&fr2=tab-img&fr=yfp-t-701"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/youtube.desktop:3
-msgctxt "Name"
-msgid "YouTube"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchproviders/youtube.desktop:65
-msgctxt "Query"
-msgid "http://www.youtube.com/results?search_query=\\\\{@}&search_type=&aq=f"
-msgstr ""
-
-#: kioslave/sftp/sftp.protocol:15
-msgctxt "Description"
-msgid "A kioslave for sftp"
-msgstr ""
-
-#: kcontrol/spellchecking/spellchecking.desktop:14
-msgctxt "Name"
-msgid "Spell Checker"
-msgstr "Cywirydd Sillafu"
-
-#: kcontrol/spellchecking/spellchecking.desktop:97
-msgctxt "Comment"
-msgid "Configure the spell checker"
-msgstr "Ffurfweddu'r cywirydd sillafu"
-
-#: kioslave/thumbnail/svgthumbnail.desktop:3
-msgctxt "Name"
-msgid "SVG Images"
-msgstr ""
-
-#: kioslave/thumbnail/textthumbnail.desktop:3
-msgctxt "Name"
-msgid "Text Files"
-msgstr "Ffeiliau Testun"
-
-#: kioslave/trash/trash.protocol:25
-msgctxt "ExtraNames"
-msgid "Original Path,Deletion Date"
-msgstr ""
-
-#: kioslave/thumbnail/windowsexethumbnail.desktop:4
-msgctxt "Name"
-msgid "Microsoft Windows Executables"
-msgstr ""
-
-#: kioslave/thumbnail/windowsimagethumbnail.desktop:4
-msgctxt "Name"
-msgid "Microsoft Windows Images"
-msgstr ""
-
-#: nepomuk/server/nepomukservice.desktop:4
-msgctxt "Comment"
-msgid "Nepomuk Service"
-msgstr ""
-
-#: phonon/platform_kde/phononbackend.desktop:4
-msgctxt "Name"
-msgid "KDE Multimedia Backend"
-msgstr ""
-
-#: plasma/scriptengines/javascript/data/plasma-javascriptaddon.desktop:2
-msgctxt "Name"
-msgid "Plasma JavaScript Addon"
-msgstr ""
-
-#: kurifilter-plugins/ikws/searchprovider.desktop:4
-msgctxt "Comment"
-msgid "Search Engine"
-msgstr "Peiriant Chwilio"
-
-#: kioslave/thumbnail/thumbcreator.desktop:4
-msgctxt "Comment"
-msgid "Thumbnail Handler"
-msgstr "Trinydd Lluniau Cryno"
-
-#: localization/currency/adf.desktop:5
-msgctxt "Name"
-msgid "Andorran Franc"
-msgstr ""
-
-#: localization/currency/adp.desktop:5
-msgctxt "Name"
-msgid "Andorran Peseta"
-msgstr ""
-
-#: localization/currency/aed.desktop:5
-msgctxt "Name"
-msgid "United Arab Emirates Dirham"
-msgstr ""
-
-#: localization/currency/afa.desktop:5 localization/currency/afn.desktop:5
-msgctxt "Name"
-msgid "Afghan Afghani"
-msgstr ""
-
-#: localization/currency/all.desktop:5
-msgctxt "Name"
-msgid "Albanian Lek"
-msgstr ""
-
-#: localization/currency/amd.desktop:5
-msgctxt "Name"
-msgid "Armenian Dram"
-msgstr ""
-
-#: localization/currency/ang.desktop:5
-msgctxt "Name"
-msgid "Netherlands Antillean Guilder"
-msgstr ""
-
-#: localization/currency/aoa.desktop:5
-msgctxt "Name"
-msgid "Angolan Kwanza"
-msgstr ""
-
-#: localization/currency/aon.desktop:5
-msgctxt "Name"
-msgid "Angolan Novo Kwanza"
-msgstr ""
-
-#: localization/currency/ars.desktop:5
-msgctxt "Name"
-msgid "Argentine Peso"
-msgstr ""
-
-#: localization/currency/ats.desktop:5
-msgctxt "Name"
-msgid "Austrian Schilling"
-msgstr ""
-
-#: localization/currency/aud.desktop:5
-msgctxt "Name"
-msgid "Australian Dollar"
-msgstr ""
-
-#: localization/currency/awg.desktop:5
-msgctxt "Name"
-msgid "Aruban Florin"
-msgstr ""
-
-#: localization/currency/azm.desktop:5 localization/currency/azn.desktop:5
-msgctxt "Name"
-msgid "Azerbaijani Manat"
-msgstr ""
-
-#: localization/currency/bam.desktop:5
-msgctxt "Name"
-msgid "Bosnia and Herzegovina Convertible Mark"
-msgstr ""
-
-#: localization/currency/bbd.desktop:5
-msgctxt "Name"
-msgid "Barbados Dollar"
-msgstr ""
-
-#: localization/currency/bdt.desktop:5
-msgctxt "Name"
-msgid "Bangladeshi Taka"
-msgstr ""
-
-#: localization/currency/bef.desktop:5
-msgctxt "Name"
-msgid "Belgian Franc"
-msgstr ""
-
-#: localization/currency/bgl.desktop:5
-msgctxt "Name"
-msgid "Bulgarian Lev A/99"
-msgstr ""
-
-#: localization/currency/bgn.desktop:5
-msgctxt "Name"
-msgid "Bulgarian Lev"
-msgstr ""
-
-#: localization/currency/bhd.desktop:5
-msgctxt "Name"
-msgid "Bahraini Dinar"
-msgstr ""
-
-#: localization/currency/bif.desktop:5
-msgctxt "Name"
-msgid "Burundian Franc"
-msgstr ""
-
-#: localization/currency/bmd.desktop:5
-msgctxt "Name"
-msgid "Bermuda Dollar"
-msgstr ""
-
-#: localization/currency/bnd.desktop:5
-msgctxt "Name"
-msgid "Brunei Dollar"
-msgstr ""
-
-#: localization/currency/bob.desktop:5
-msgctxt "Name"
-msgid "Bolivian Boliviano"
-msgstr ""
-
-#: localization/currency/bov.desktop:5
-msgctxt "Name"
-msgid "Bolivian Mvdol"
-msgstr ""
-
-#: localization/currency/brl.desktop:5
-msgctxt "Name"
-msgid "Brazilian Real"
-msgstr ""
-
-#: localization/currency/bsd.desktop:5
-msgctxt "Name"
-msgid "Bahamian Dollar"
-msgstr ""
-
-#: localization/currency/btn.desktop:5
-msgctxt "Name"
-msgid "Bhutanese Ngultrum"
-msgstr ""
-
-#: localization/currency/bwp.desktop:6
-msgctxt "Name"
-msgid "Botswana Pula"
-msgstr ""
-
-#: localization/currency/byr.desktop:5
-msgctxt "Name"
-msgid "Belarusian Ruble"
-msgstr ""
-
-#: localization/currency/bzd.desktop:5
-msgctxt "Name"
-msgid "Belize Dollar"
-msgstr ""
-
-#: localization/currency/cad.desktop:5
-msgctxt "Name"
-msgid "Canadian Dollar"
-msgstr ""
-
-#: localization/currency/cdf.desktop:5
-msgctxt "Name"
-msgid "Congolese Franc"
-msgstr ""
-
-#: localization/currency/chf.desktop:5
-msgctxt "Name"
-msgid "Swiss Franc"
-msgstr ""
-
-#: localization/currency/clf.desktop:5
-msgctxt "Name"
-msgid "Chilean Unidad de Fomento"
-msgstr ""
-
-#: localization/currency/clp.desktop:5
-msgctxt "Name"
-msgid "Chilean Peso"
-msgstr ""
-
-#: localization/currency/cny.desktop:5
-msgctxt "Name"
-msgid "Chinese Yuan"
-msgstr ""
-
-#: localization/currency/cop.desktop:5
-msgctxt "Name"
-msgid "Colombian Peso"
-msgstr ""
-
-#: localization/currency/cou.desktop:5
-msgctxt "Name"
-msgid "Colombian Unidad de Valor Real"
-msgstr ""
-
-#: localization/currency/crc.desktop:5
-msgctxt "Name"
-msgid "Costa Rican Colon"
-msgstr ""
-
-#: localization/currency/cuc.desktop:5
-msgctxt "Name"
-msgid "Cuban Convertible Peso"
-msgstr ""
-
-#: localization/currency/cup.desktop:5
-msgctxt "Name"
-msgid "Cuban Peso"
-msgstr ""
-
-#: localization/currency/cve.desktop:5
-msgctxt "Name"
-msgid "Cape Verde Escudo"
-msgstr ""
-
-#: localization/currency/cyp.desktop:5
-msgctxt "Name"
-msgid "Cypriot Pound"
-msgstr ""
-
-#: localization/currency/czk.desktop:5
-msgctxt "Name"
-msgid "Czech Koruna"
-msgstr ""
-
-#: localization/currency/dem.desktop:5
-msgctxt "Name"
-msgid "German Mark"
-msgstr ""
-
-#: localization/currency/djf.desktop:5
-msgctxt "Name"
-msgid "Djibouti Franc"
-msgstr ""
-
-#: localization/currency/dkk.desktop:5
-msgctxt "Name"
-msgid "Danish Krone"
-msgstr ""
-
-#: localization/currency/dop.desktop:5
-msgctxt "Name"
-msgid "Dominican Peso"
-msgstr ""
-
-#: localization/currency/dzd.desktop:5
-msgctxt "Name"
-msgid "Algerian Dinar"
-msgstr ""
-
-#: localization/currency/eek.desktop:5
-msgctxt "Name"
-msgid "Estonian Kroon"
-msgstr ""
-
-#: localization/currency/egp.desktop:5
-msgctxt "Name"
-msgid "Egyptian Pound"
-msgstr ""
-
-#: localization/currency/ern.desktop:5
-msgctxt "Name"
-msgid "Eritrean Nakfa"
-msgstr ""
-
-#: localization/currency/esp.desktop:5
-msgctxt "Name"
-msgid "Spanish Peseta"
-msgstr ""
-
-#: localization/currency/etb.desktop:5
-msgctxt "Name"
-msgid "Ethiopian Birr"
-msgstr ""
-
-#: localization/currency/eur.desktop:6
-msgctxt "Name"
-msgid "Euro"
-msgstr ""
-
-#: localization/currency/fim.desktop:5
-msgctxt "Name"
-msgid "Finnish Markka"
-msgstr ""
-
-#: localization/currency/fjd.desktop:5
-msgctxt "Name"
-msgid "Fijian Dollar"
-msgstr ""
-
-#: localization/currency/fkp.desktop:5
-msgctxt "Name"
-msgid "Falkland Islands Pound"
-msgstr ""
-
-#: localization/currency/frf.desktop:5
-msgctxt "Name"
-msgid "French Franc"
-msgstr ""
-
-#: localization/currency/gbp.desktop:5
-msgctxt "Name"
-msgid "British Pound Sterling"
-msgstr ""
-
-#: localization/currency/gel.desktop:5
-msgctxt "Name"
-msgid "Georgian Lari"
-msgstr ""
-
-#: localization/currency/ghc.desktop:5
-msgctxt "Name"
-msgid "Ghanaian Cedi"
-msgstr ""
-
-#: localization/currency/ghs.desktop:5
-msgctxt "Name"
-msgid "Ghana Cedi"
-msgstr ""
-
-#: localization/currency/gip.desktop:5
-msgctxt "Name"
-msgid "Gibraltar Pound"
-msgstr ""
-
-#: localization/currency/gmd.desktop:5
-msgctxt "Name"
-msgid "Gambian Dalasi"
-msgstr ""
-
-#: localization/currency/gnf.desktop:5
-msgctxt "Name"
-msgid "Guinean Franc"
-msgstr ""
-
-#: localization/currency/grd.desktop:5
-msgctxt "Name"
-msgid "Greek Drachma"
-msgstr ""
-
-#: localization/currency/gtq.desktop:5
-msgctxt "Name"
-msgid "Guatemalan Quetzal"
-msgstr ""
-
-#: localization/currency/gwp.desktop:5
-msgctxt "Name"
-msgid "Guinea-Bissau Peso"
-msgstr ""
-
-#: localization/currency/gyd.desktop:5
-msgctxt "Name"
-msgid "Guyanese Dollar"
-msgstr ""
-
-#: localization/currency/hkd.desktop:5
-msgctxt "Name"
-msgid "Hong Kong Dollar"
-msgstr ""
-
-#: localization/currency/hnl.desktop:5
-msgctxt "Name"
-msgid "Honduran Lempira"
-msgstr ""
-
-#: localization/currency/hrk.desktop:5
-msgctxt "Name"
-msgid "Croatian Kuna"
-msgstr ""
-
-#: localization/currency/htg.desktop:5
-msgctxt "Name"
-msgid "Haitian Gourde"
-msgstr ""
-
-#: localization/currency/huf.desktop:5
-msgctxt "Name"
-msgid "Hungarian Forint"
-msgstr ""
-
-#: localization/currency/idr.desktop:5
-msgctxt "Name"
-msgid "Indonesian Rupiah"
-msgstr ""
-
-#: localization/currency/iep.desktop:5
-msgctxt "Name"
-msgid "Irish Pound"
-msgstr ""
-
-#: localization/currency/ils.desktop:5
-msgctxt "Name"
-msgid "Israeli New Sheqel"
-msgstr ""
-
-#: localization/currency/inr.desktop:5
-msgctxt "Name"
-msgid "Indian Rupee"
-msgstr ""
-
-#: localization/currency/iqd.desktop:5
-msgctxt "Name"
-msgid "Iraqi Dinar"
-msgstr ""
-
-#: localization/currency/irr.desktop:5
-msgctxt "Name"
-msgid "Iranian Rial"
-msgstr ""
-
-#: localization/currency/isk.desktop:5
-msgctxt "Name"
-msgid "Icelandic Krona"
-msgstr ""
-
-#: localization/currency/itl.desktop:5
-msgctxt "Name"
-msgid "Italian Lira"
-msgstr ""
-
-#: localization/currency/jmd.desktop:5
-msgctxt "Name"
-msgid "Jamaican Dollar"
-msgstr ""
-
-#: localization/currency/jod.desktop:5
-msgctxt "Name"
-msgid "Jordanian Dinar"
-msgstr ""
-
-#: localization/currency/jpy.desktop:5
-msgctxt "Name"
-msgid "Japanese Yen"
-msgstr ""
-
-#: localization/currency/kes.desktop:5
-msgctxt "Name"
-msgid "Kenyan Shilling"
-msgstr ""
-
-#: localization/currency/kgs.desktop:5
-msgctxt "Name"
-msgid "Kyrgyzstani Som"
-msgstr ""
-
-#: localization/currency/khr.desktop:5
-msgctxt "Name"
-msgid "Cambodian Riel"
-msgstr ""
-
-#: localization/currency/kmf.desktop:5
-msgctxt "Name"
-msgid "Comorian Franc"
-msgstr ""
-
-#: localization/currency/kpw.desktop:5
-msgctxt "Name"
-msgid "North Korean Won"
-msgstr ""
-
-#: localization/currency/krw.desktop:5
-msgctxt "Name"
-msgid "South Korean Won"
-msgstr ""
-
-#: localization/currency/kwd.desktop:5
-msgctxt "Name"
-msgid "Kuwaiti Dinar"
-msgstr ""
-
-#: localization/currency/kyd.desktop:5
-msgctxt "Name"
-msgid "Cayman Islands Dollar"
-msgstr ""
-
-#: localization/currency/kzt.desktop:5
-msgctxt "Name"
-msgid "Kazakhstani Tenge"
-msgstr ""
-
-#: localization/currency/lak.desktop:5
-msgctxt "Name"
-msgid "Lao Kip"
-msgstr ""
-
-#: localization/currency/lbp.desktop:5
-msgctxt "Name"
-msgid "Lebanese Pound"
-msgstr ""
-
-#: localization/currency/lkr.desktop:5
-msgctxt "Name"
-msgid "Sri Lankan Rupee"
-msgstr ""
-
-#: localization/currency/lrd.desktop:5
-msgctxt "Name"
-msgid "Liberian Dollar"
-msgstr ""
-
-#: localization/currency/lsl.desktop:5
-msgctxt "Name"
-msgid "Lesotho Loti"
-msgstr ""
-
-#: localization/currency/ltl.desktop:5
-msgctxt "Name"
-msgid "Lithuanian Litas"
-msgstr ""
-
-#: localization/currency/luf.desktop:5
-msgctxt "Name"
-msgid "Luxembourgish Franc"
-msgstr ""
-
-#: localization/currency/lvl.desktop:5
-msgctxt "Name"
-msgid "Latvian Lats"
-msgstr ""
-
-#: localization/currency/lyd.desktop:5
-msgctxt "Name"
-msgid "Libyan Dinar"
-msgstr ""
-
-#: localization/currency/mad.desktop:5
-msgctxt "Name"
-msgid "Moroccan Dirham"
-msgstr ""
-
-#: localization/currency/mdl.desktop:5
-msgctxt "Name"
-msgid "Moldovan Leu"
-msgstr ""
-
-#: localization/currency/mga.desktop:5
-msgctxt "Name"
-msgid "Malagasy Ariary"
-msgstr ""
-
-#: localization/currency/mgf.desktop:5
-msgctxt "Name"
-msgid "Malagasy Franc"
-msgstr ""
-
-#: localization/currency/mkd.desktop:5
-msgctxt "Name"
-msgid "Macedonian Denar"
-msgstr ""
-
-#: localization/currency/mlf.desktop:5
-msgctxt "Name"
-msgid "Mali Franc"
-msgstr ""
-
-#: localization/currency/mmk.desktop:5
-msgctxt "Name"
-msgid "Myanma Kyat"
-msgstr ""
-
-#: localization/currency/mnt.desktop:5
-msgctxt "Name"
-msgid "Mongolian Tugrik"
-msgstr ""
-
-#: localization/currency/mop.desktop:5
-msgctxt "Name"
-msgid "Macanese Pataca"
-msgstr ""
-
-#: localization/currency/mro.desktop:5
-msgctxt "Name"
-msgid "Mauritanian Ouguiya"
-msgstr ""
-
-#: localization/currency/mtl.desktop:5
-msgctxt "Name"
-msgid "Maltese Lira"
-msgstr ""
-
-#: localization/currency/mur.desktop:5
-msgctxt "Name"
-msgid "Mauritius Rupee"
-msgstr ""
-
-#: localization/currency/mvr.desktop:5
-msgctxt "Name"
-msgid "Maldivian Rufiyaa"
-msgstr ""
-
-#: localization/currency/mwk.desktop:5
-msgctxt "Name"
-msgid "Malawian Kwacha"
-msgstr ""
-
-#: localization/currency/mxn.desktop:5
-msgctxt "Name"
-msgid "Mexican Peso"
-msgstr ""
-
-#: localization/currency/mxv.desktop:5
-msgctxt "Name"
-msgid "Mexican Unidad de Inversion"
-msgstr ""
-
-#: localization/currency/myr.desktop:5
-msgctxt "Name"
-msgid "Malaysian Ringgit"
-msgstr ""
-
-#: localization/currency/mzm.desktop:5 localization/currency/mzn.desktop:5
-msgctxt "Name"
-msgid "Mozambican Metical"
-msgstr ""
-
-#: localization/currency/nad.desktop:5
-msgctxt "Name"
-msgid "Namibian Dollar"
-msgstr ""
-
-#: localization/currency/ngn.desktop:5
-msgctxt "Name"
-msgid "Nigerian Naira"
-msgstr ""
-
-#: localization/currency/nio.desktop:5
-msgctxt "Name"
-msgid "Nicaraguan Cordoba Oro"
-msgstr ""
-
-#: localization/currency/nlg.desktop:5
-msgctxt "Name"
-msgid "Netherlands Guilder"
-msgstr ""
-
-#: localization/currency/nok.desktop:5
-msgctxt "Name"
-msgid "Norwegian Krone"
-msgstr ""
-
-#: localization/currency/npr.desktop:5
-msgctxt "Name"
-msgid "Nepalese Rupee"
-msgstr ""
-
-#: localization/currency/nzd.desktop:5
-msgctxt "Name"
-msgid "New Zealand Dollar"
-msgstr ""
-
-#: localization/currency/omr.desktop:5
-msgctxt "Name"
-msgid "Omani Rial"
-msgstr ""
-
-#: localization/currency/pab.desktop:5
-msgctxt "Name"
-msgid "Panamanian Balboa"
-msgstr ""
-
-#: localization/currency/pen.desktop:5
-msgctxt "Name"
-msgid "Peruvian Nuevo Sol"
-msgstr ""
-
-#: localization/currency/pgk.desktop:5
-msgctxt "Name"
-msgid "Papua New Guinean Kina"
-msgstr ""
-
-#: localization/currency/php.desktop:5
-msgctxt "Name"
-msgid "Philippine Peso"
-msgstr ""
-
-#: localization/currency/pkr.desktop:5
-msgctxt "Name"
-msgid "Pakistan Rupee"
-msgstr ""
-
-#: localization/currency/pln.desktop:5
-msgctxt "Name"
-msgid "Polish Zloty"
-msgstr ""
-
-#: localization/currency/pte.desktop:5
-msgctxt "Name"
-msgid "Portuguese Escudo"
-msgstr ""
-
-#: localization/currency/pyg.desktop:5
-msgctxt "Name"
-msgid "Paraguayan Guarani"
-msgstr ""
-
-#: localization/currency/qar.desktop:5
-msgctxt "Name"
-msgid "Qatari Riyal"
-msgstr ""
-
-#: localization/currency/rol.desktop:5
-msgctxt "Name"
-msgid "Romanian Leu A/05"
-msgstr ""
-
-#: localization/currency/ron.desktop:5
-msgctxt "Name"
-msgid "Romanian Leu"
-msgstr ""
-
-#: localization/currency/rsd.desktop:5
-msgctxt "Name"
-msgid "Serbian Dinar"
-msgstr ""
-
-#: localization/currency/rub.desktop:5
-msgctxt "Name"
-msgid "Russian Ruble"
-msgstr ""
-
-#: localization/currency/rur.desktop:5
-msgctxt "Name"
-msgid "Russian Ruble A/97"
-msgstr ""
-
-#: localization/currency/rwf.desktop:5
-msgctxt "Name"
-msgid "Rwandan Franc"
-msgstr ""
-
-#: localization/currency/sar.desktop:5
-msgctxt "Name"
-msgid "Saudi Riyal"
-msgstr ""
-
-#: localization/currency/sbd.desktop:5
-msgctxt "Name"
-msgid "Solomon Islands Dollar"
-msgstr ""
-
-#: localization/currency/scr.desktop:5
-msgctxt "Name"
-msgid "Seychellois Rupee"
-msgstr ""
-
-#: localization/currency/sdd.desktop:5
-msgctxt "Name"
-msgid "Sudanese Dinar"
-msgstr ""
-
-#: localization/currency/sdg.desktop:5
-msgctxt "Name"
-msgid "Sudanese Pound"
-msgstr ""
-
-#: localization/currency/sek.desktop:5
-msgctxt "Name"
-msgid "Swedish Krona"
-msgstr ""
-
-#: localization/currency/sgd.desktop:5
-msgctxt "Name"
-msgid "Singapore Dollar"
-msgstr ""
-
-#: localization/currency/shp.desktop:5
-msgctxt "Name"
-msgid "Saint Helena Pound"
-msgstr ""
-
-#: localization/currency/sit.desktop:5
-msgctxt "Name"
-msgid "Slovenian Tolar"
-msgstr ""
-
-#: localization/currency/skk.desktop:5
-msgctxt "Name"
-msgid "Slovak Koruna"
-msgstr ""
-
-#: localization/currency/sll.desktop:5
-msgctxt "Name"
-msgid "Sierra Leonean Leone"
-msgstr ""
-
-#: localization/currency/sos.desktop:5
-msgctxt "Name"
-msgid "Somali Shilling"
-msgstr ""
-
-#: localization/currency/srd.desktop:5
-msgctxt "Name"
-msgid "Surinamese Dollar"
-msgstr ""
-
-#: localization/currency/srg.desktop:5
-msgctxt "Name"
-msgid "Surinamese Guilder"
-msgstr ""
-
-#: localization/currency/std.desktop:5
-msgctxt "Name"
-msgid "São Tomé and Príncipe Dobra"
-msgstr ""
-
-#: localization/currency/svc.desktop:5
-msgctxt "Name"
-msgid "Salvadoran Colon"
-msgstr ""
-
-#: localization/currency/syp.desktop:5
-msgctxt "Name"
-msgid "Syrian Pound"
-msgstr ""
-
-#: localization/currency/szl.desktop:5
-msgctxt "Name"
-msgid "Swazi Lilangeni"
-msgstr ""
-
-#: localization/currency/thb.desktop:5
-msgctxt "Name"
-msgid "Thai Baht"
-msgstr ""
-
-#: localization/currency/tjs.desktop:5
-msgctxt "Name"
-msgid "Tajikistani Somoni"
-msgstr ""
-
-#: localization/currency/tmm.desktop:5
-msgctxt "Name"
-msgid "Turkmenistani Old Manat"
-msgstr ""
-
-#: localization/currency/tmt.desktop:5
-msgctxt "Name"
-msgid "Turkmenistani Manat"
-msgstr ""
-
-#: localization/currency/tnd.desktop:5
-msgctxt "Name"
-msgid "Tunisian Dinar"
-msgstr ""
-
-#: localization/currency/top.desktop:5
-msgctxt "Name"
-msgid "Tongan Pa'anga"
-msgstr ""
-
-#: localization/currency/tpe.desktop:5
-msgctxt "Name"
-msgid "Portuguese Timorese Escudo"
-msgstr ""
-
-#: localization/currency/trl.desktop:5
-msgctxt "Name"
-msgid "Turkish Lira A/05"
-msgstr ""
-
-#: localization/currency/try.desktop:5
-msgctxt "Name"
-msgid "Turkish Lira"
-msgstr ""
-
-#: localization/currency/ttd.desktop:5
-msgctxt "Name"
-msgid "Trinidad and Tobago Dollar"
-msgstr ""
-
-#: localization/currency/twd.desktop:5
-msgctxt "Name"
-msgid "New Taiwan Dollar"
-msgstr ""
-
-#: localization/currency/tzs.desktop:5
-msgctxt "Name"
-msgid "Tanzanian Shilling"
-msgstr ""
-
-#: localization/currency/uah.desktop:5
-msgctxt "Name"
-msgid "Ukrainian Hryvnia"
-msgstr ""
-
-#: localization/currency/ugx.desktop:5
-msgctxt "Name"
-msgid "Ugandan Shilling"
-msgstr ""
-
-#: localization/currency/usd.desktop:5
-msgctxt "Name"
-msgid "United States Dollar"
-msgstr ""
-
-#: localization/currency/usn.desktop:5
-msgctxt "Name"
-msgid "United States Dollar (Next Day)"
-msgstr ""
-
-#: localization/currency/uss.desktop:5
-msgctxt "Name"
-msgid "United States Dollar (Same Day)"
-msgstr ""
-
-#: localization/currency/uyu.desktop:5
-msgctxt "Name"
-msgid "Uruguayan Peso"
-msgstr ""
-
-#: localization/currency/uzs.desktop:5
-msgctxt "Name"
-msgid "Uzbekistan Som"
-msgstr ""
-
-#: localization/currency/veb.desktop:5
-msgctxt "Name"
-msgid "Venezuelan Bolívar Fuerte"
-msgstr ""
-
-#: localization/currency/vnd.desktop:5
-msgctxt "Name"
-msgid "Vietnamese Dong"
-msgstr ""
-
-#: localization/currency/vuv.desktop:5
-msgctxt "Name"
-msgid "Vanuatu Vatu"
-msgstr ""
-
-#: localization/currency/wst.desktop:5
-msgctxt "Name"
-msgid "Samoan Tala"
-msgstr ""
-
-#: localization/currency/xaf.desktop:5
-msgctxt "Name"
-msgid "Central African CFA Franc"
-msgstr ""
-
-#: localization/currency/xag.desktop:5
-msgctxt "Name"
-msgid "Silver"
-msgstr ""
-
-#: localization/currency/xau.desktop:5
-msgctxt "Name"
-msgid "Gold"
-msgstr ""
-
-#: localization/currency/xcd.desktop:5
-msgctxt "Name"
-msgid "East Caribbean Dollar"
-msgstr ""
-
-#: localization/currency/xof.desktop:5
-msgctxt "Name"
-msgid "West African CFA Franc"
-msgstr ""
-
-#: localization/currency/xpd.desktop:5
-msgctxt "Name"
-msgid "Palladium"
-msgstr ""
-
-#: localization/currency/xpf.desktop:5
-msgctxt "Name"
-msgid "CFP Franc"
-msgstr ""
-
-#: kstyles/themes/qtplatinum.themerc:2 localization/currency/xpt.desktop:5
-msgctxt "Name"
-msgid "Platinum"
-msgstr ""
-
-#: localization/currency/yer.desktop:5
-msgctxt "Name"
-msgid "Yemeni Rial"
-msgstr ""
-
-#: localization/currency/yum.desktop:5
-msgctxt "Name"
-msgid "Yugoslav Dinar"
-msgstr ""
-
-#: localization/currency/zar.desktop:5
-msgctxt "Name"
-msgid "South African Rand"
-msgstr ""
-
-#: localization/currency/zmk.desktop:5
-msgctxt "Name"
-msgid "Zambian Kwacha"
-msgstr ""
-
-#: localization/currency/zwd.desktop:5
-msgctxt "Name"
-msgid "Zimbabwean Dollar A/06"
-msgstr ""
-
-#: localization/currency/zwl.desktop:5
-msgctxt "Name"
-msgid "Zimbabwean Dollar"
-msgstr ""
-
-#: l10n/C/entry.desktop:2
-msgctxt "Name"
-msgid "Default"
-msgstr "Rhagosodedig"
-
-#: l10n/ad/entry.desktop:2
-msgctxt "Name"
-msgid "Andorra"
-msgstr "Andorra"
-
-#: l10n/ae/entry.desktop:2
-msgctxt "Name"
-msgid "United Arab Emirates"
-msgstr "Emiraethau Arabaidd Unedig"
-
-#: l10n/af/entry.desktop:2
-msgctxt "Name"
-msgid "Afghanistan"
-msgstr "Affganistan"
-
-#: l10n/ag/entry.desktop:2
-msgctxt "Name"
-msgid "Antigua and Barbuda"
-msgstr "Antigwa a Barbwda"
-
-#: l10n/ai/entry.desktop:2
-msgctxt "Name"
-msgid "Anguilla"
-msgstr "Angwila"
-
-#: l10n/al/entry.desktop:2
-msgctxt "Name"
-msgid "Albania"
-msgstr "Albania"
-
-#: l10n/am/entry.desktop:2
-msgctxt "Name"
-msgid "Armenia"
-msgstr "Armenia"
-
-#: l10n/an/entry.desktop:2
-msgctxt "Name"
-msgid "Netherlands Antilles"
-msgstr "Ynysoedd Iseldiraidd Y Carib?"
-
-#: l10n/ao/entry.desktop:2
-msgctxt "Name"
-msgid "Angola"
-msgstr "Angola"
-
-#: l10n/ar/entry.desktop:2
-msgctxt "Name"
-msgid "Argentina"
-msgstr "Ariannin"
-
-#: l10n/as/entry.desktop:2
-msgctxt "Name"
-msgid "American Samoa"
-msgstr "Samoa Americanaidd"
-
-#: l10n/at/entry.desktop:2
-msgctxt "Name"
-msgid "Austria"
-msgstr "Awstria"
-
-#: l10n/au/entry.desktop:2
-msgctxt "Name"
-msgid "Australia"
-msgstr "Awstralia"
-
-#: l10n/aw/entry.desktop:2
-msgctxt "Name"
-msgid "Aruba"
-msgstr "Arwba"
-
-#: l10n/ax/entry.desktop:2
-msgctxt "Name"
-msgid "Åland Islands"
-msgstr ""
-
-#: l10n/az/entry.desktop:2
-msgctxt "Name"
-msgid "Azerbaijan"
-msgstr "Aserbaijan"
-
-#: l10n/ba/entry.desktop:2
-msgctxt "Name"
-msgid "Bosnia and Herzegovina"
-msgstr "Bosnia a Hertsegofina"
-
-#: l10n/bb/entry.desktop:2
-msgctxt "Name"
-msgid "Barbados"
-msgstr "Barbados"
-
-#: l10n/bd/entry.desktop:2
-msgctxt "Name"
-msgid "Bangladesh"
-msgstr "Bangladesh"
-
-#: l10n/be/entry.desktop:2
-msgctxt "Name"
-msgid "Belgium"
-msgstr "Gwlad Belg"
-
-#: l10n/bf/entry.desktop:2
-msgctxt "Name"
-msgid "Burkina Faso"
-msgstr "Bwrcina Ffaso"
-
-#: l10n/bg/entry.desktop:2
-msgctxt "Name"
-msgid "Bulgaria"
-msgstr "Bwlgaria"
-
-#: l10n/bh/entry.desktop:2
-msgctxt "Name"
-msgid "Bahrain"
-msgstr "Bahrain"
-
-#: l10n/bi/entry.desktop:2
-msgctxt "Name"
-msgid "Burundi"
-msgstr "Bwrwndi"
-
-#: l10n/bj/entry.desktop:2
-msgctxt "Name"
-msgid "Benin"
-msgstr "Benin"
-
-#: l10n/bl/entry.desktop:2
-msgctxt "Name"
-msgid "Saint Barthélemy"
-msgstr ""
-
-#: l10n/bm/entry.desktop:2
-msgctxt "Name"
-msgid "Bermuda"
-msgstr "Bermwda"
-
-#: l10n/bn/entry.desktop:3
-msgctxt "Name"
-msgid "Brunei Darussalam"
-msgstr "Brwnei Darwsalam"
-
-#: l10n/bo/entry.desktop:2
-msgctxt "Name"
-msgid "Bolivia"
-msgstr "Bolifia"
-
-#: l10n/br/entry.desktop:2
-msgctxt "Name"
-msgid "Brazil"
-msgstr "Brasil"
-
-#: l10n/bs/entry.desktop:2
-msgctxt "Name"
-msgid "Bahamas"
-msgstr "Ynysoedd Bahama"
-
-#: l10n/bt/entry.desktop:3
-msgctxt "Name"
-msgid "Bhutan"
-msgstr "Bhwtan"
-
-#: l10n/bw/entry.desktop:2
-msgctxt "Name"
-msgid "Botswana"
-msgstr "Botswana"
-
-#: l10n/by/entry.desktop:3
-msgctxt "Name"
-msgid "Belarus"
-msgstr "Belarws"
-
-#: l10n/bz/entry.desktop:2
-msgctxt "Name"
-msgid "Belize"
-msgstr "Bel?s"
-
-#: l10n/ca/entry.desktop:5
-msgctxt "Name"
-msgid "Canada"
-msgstr "Canada"
-
-#: l10n/caribbean.desktop:2
-msgctxt "Name"
-msgid "Caribbean"
-msgstr "Y Carib?"
-
-#: l10n/cc/entry.desktop:2
-msgctxt "Name"
-msgid "Cocos (Keeling) Islands"
-msgstr "Ynysoedd y Cocos (Keeling)"
-
-#: l10n/cd/entry.desktop:2
-msgctxt "Name"
-msgid "Congo, The Democratic Republic of the"
-msgstr "Congo, Gweriniaeth Democrataidd y"
-
-#: l10n/centralafrica.desktop:2
-msgctxt "Name"
-msgid "Africa, Central"
-msgstr "Affrica, Canolig"
-
-#: l10n/centralamerica.desktop:2
-msgctxt "Name"
-msgid "America, Central"
-msgstr "America, Canolig"
-
-#: l10n/centralasia.desktop:2
-msgctxt "Name"
-msgid "Asia, Central"
-msgstr "Asia, Canolig"
-
-#: l10n/centraleurope.desktop:2
-msgctxt "Name"
-msgid "Europe, Central"
-msgstr "Ewrop, Canolig"
-
-#: l10n/cf/entry.desktop:2
-msgctxt "Name"
-msgid "Central African Republic"
-msgstr "Gweriniaeth Canolig Affrica"
-
-#: l10n/cg/entry.desktop:2
-msgctxt "Name"
-msgid "Congo"
-msgstr "Congo"
-
-#: l10n/ch/entry.desktop:2
-msgctxt "Name"
-msgid "Switzerland"
-msgstr "Y Swistir"
-
-#: l10n/ci/entry.desktop:2
-msgctxt "Name"
-msgid "Cote d'ivoire"
-msgstr "Y Traeth Ifori"
-
-#: l10n/ck/entry.desktop:2
-msgctxt "Name"
-msgid "Cook islands"
-msgstr "Ynysoedd Cook"
-
-#: l10n/cl/entry.desktop:2
-msgctxt "Name"
-msgid "Chile"
-msgstr "Tsile"
-
-#: l10n/cm/entry.desktop:2
-msgctxt "Name"
-msgid "Cameroon"
-msgstr "Y Camer?n"
-
-#: l10n/cn/entry.desktop:3
-msgctxt "Name"
-msgid "China"
-msgstr "Tseina"
-
-#: l10n/co/entry.desktop:2
-msgctxt "Name"
-msgid "Colombia"
-msgstr "Colombia"
-
-#: l10n/cr/entry.desktop:2
-msgctxt "Name"
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: l10n/cu/entry.desktop:2
-msgctxt "Name"
-msgid "Cuba"
-msgstr "Ciwba"
-
-#: l10n/cv/entry.desktop:2
-msgctxt "Name"
-msgid "Cape Verde"
-msgstr "Cape Ferde"
-
-#: l10n/cx/entry.desktop:2
-msgctxt "Name"
-msgid "Christmas Island"
-msgstr "Ynys y Nadolig"
-
-#: l10n/cy/entry.desktop:2
-msgctxt "Name"
-msgid "Cyprus"
-msgstr "Cyprus"
-
-#: l10n/cz/entry.desktop:2
-msgctxt "Name"
-msgid "Czech Republic"
-msgstr ""
-
-#: l10n/de/entry.desktop:2
-msgctxt "Name"
-msgid "Germany"
-msgstr "Yr Almaen"
-
-#: l10n/dj/entry.desktop:2
-msgctxt "Name"
-msgid "Djibouti"
-msgstr "Jib?ti"
-
-#: l10n/dk/entry.desktop:3
-msgctxt "Name"
-msgid "Denmark"
-msgstr "Denmarc"
-
-#: l10n/dm/entry.desktop:2
-msgctxt "Name"
-msgid "Dominica"
-msgstr "Dominica"
-
-#: l10n/do/entry.desktop:2
-msgctxt "Name"
-msgid "Dominican Republic"
-msgstr "Gweriniaeth Dominica"
-
-#: l10n/dz/entry.desktop:2
-msgctxt "Name"
-msgid "Algeria"
-msgstr "Algeria"
-
-#: l10n/eastafrica.desktop:2
-msgctxt "Name"
-msgid "Africa, Eastern"
-msgstr ""
-
-#: l10n/eastasia.desktop:2
-msgctxt "Name"
-msgid "Asia, East"
-msgstr "Asia,Dwyrain"
-
-#: l10n/easteurope.desktop:2
-msgctxt "Name"
-msgid "Europe, Eastern"
-msgstr "Ewrop, Dwyrain"
-
-#: l10n/ec/entry.desktop:2
-msgctxt "Name"
-msgid "Ecuador"
-msgstr ""
-
-#: l10n/ee/entry.desktop:2
-msgctxt "Name"
-msgid "Estonia"
-msgstr "Estonia"
-
-#: l10n/eg/entry.desktop:2
-msgctxt "Name"
-msgid "Egypt"
-msgstr "Yr Aifft"
-
-#: l10n/eh/entry.desktop:2
-msgctxt "Name"
-msgid "Western Sahara"
-msgstr "Gorllewin Sahara"
-
-#: l10n/er/entry.desktop:2
-msgctxt "Name"
-msgid "Eritrea"
-msgstr "Eritrea"
-
-#: l10n/es/entry.desktop:2
-msgctxt "Name"
-msgid "Spain"
-msgstr "Sbaen"
-
-#: l10n/et/entry.desktop:2
-msgctxt "Name"
-msgid "Ethiopia"
-msgstr "Ethiopia"
-
-#: l10n/fi/entry.desktop:3
-msgctxt "Name"
-msgid "Finland"
-msgstr "Y Ffindir"
-
-#: l10n/fj/entry.desktop:2
-msgctxt "Name"
-msgid "Fiji"
-msgstr "Ffiji"
-
-#: l10n/fk/entry.desktop:2
-msgctxt "Name"
-msgid "Falkland Islands (Malvinas)"
-msgstr "Ynysoedd Y Ffalcland (Malfinas)"
-
-#: l10n/fm/entry.desktop:2
-msgctxt "Name"
-msgid "Micronesia, Federated States of"
-msgstr "Micronesia, Taleithau Cyfunol"
-
-#: l10n/fo/entry.desktop:2
-msgctxt "Name"
-msgid "Faroe Islands"
-msgstr "Ynysoedd Ffar?e"
-
-#: l10n/fr/entry.desktop:3
-msgctxt "Name"
-msgid "France"
-msgstr "Ffrainc"
-
-#: l10n/ga/entry.desktop:2
-msgctxt "Name"
-msgid "Gabon"
-msgstr "Gabon"
-
-#: l10n/gb/entry.desktop:2
-msgctxt "Name"
-msgid "United Kingdom"
-msgstr "Y Deyrnas Unedig"
-
-#: l10n/gd/entry.desktop:2
-msgctxt "Name"
-msgid "Grenada"
-msgstr "Grenada"
-
-#: l10n/ge/entry.desktop:2
-msgctxt "Name"
-msgid "Georgia"
-msgstr "Georgia"
-
-#: l10n/gf/entry.desktop:2
-msgctxt "Name"
-msgid "French Guiana"
-msgstr ""
-
-#: l10n/gg/entry.desktop:2
-msgctxt "Name"
-msgid "Guernsey"
-msgstr ""
-
-#: l10n/gh/entry.desktop:2
-msgctxt "Name"
-msgid "Ghana"
-msgstr "Ghana"
-
-#: l10n/gi/entry.desktop:2
-msgctxt "Name"
-msgid "Gibraltar"
-msgstr "Gibraltar"
-
-#: l10n/gl/entry.desktop:2
-msgctxt "Name"
-msgid "Greenland"
-msgstr "Y Lasynys"
-
-#: l10n/gm/entry.desktop:2
-msgctxt "Name"
-msgid "Gambia"
-msgstr "Gambia"
-
-#: l10n/gn/entry.desktop:2
-msgctxt "Name"
-msgid "Guinea"
-msgstr "Gini"
-
-#: l10n/gp/entry.desktop:2
-msgctxt "Name"
-msgid "Guadeloupe"
-msgstr "Gwadel?p"
-
-#: l10n/gq/entry.desktop:2
-msgctxt "Name"
-msgid "Equatorial Guinea"
-msgstr "Gini Gyhydeddol"
-
-#: l10n/gr/entry.desktop:2
-msgctxt "Name"
-msgid "Greece"
-msgstr "Gwlad Groeg"
-
-#: l10n/gt/entry.desktop:2
-msgctxt "Name"
-msgid "Guatemala"
-msgstr "Gwatemala"
-
-#: l10n/gu/entry.desktop:2
-msgctxt "Name"
-msgid "Guam"
-msgstr "Gw?m"
-
-#: l10n/gw/entry.desktop:2
-msgctxt "Name"
-msgid "Guinea-Bissau"
-msgstr "Gini-Bisaw"
-
-#: l10n/gy/entry.desktop:2
-msgctxt "Name"
-msgid "Guyana"
-msgstr "Giana"
-
-#: l10n/hk/entry.desktop:2
-msgctxt "Name"
-msgid "Hong Kong SAR(China)"
-msgstr ""
-
-#: l10n/hn/entry.desktop:2
-msgctxt "Name"
-msgid "Honduras"
-msgstr "Hondwras"
-
-#: l10n/hr/entry.desktop:2
-msgctxt "Name"
-msgid "Croatia"
-msgstr "Croatia"
-
-#: l10n/ht/entry.desktop:2
-msgctxt "Name"
-msgid "Haiti"
-msgstr "Haiti"
-
-#: l10n/hu/entry.desktop:2
-msgctxt "Name"
-msgid "Hungary"
-msgstr "Hwngari"
-
-#: l10n/id/entry.desktop:2
-msgctxt "Name"
-msgid "Indonesia"
-msgstr "Indonesia"
-
-#: l10n/ie/entry.desktop:2
-msgctxt "Name"
-msgid "Ireland"
-msgstr "Iwerddon"
-
-#: l10n/il/entry.desktop:3
-msgctxt "Name"
-msgid "Israel"
-msgstr "Israel"
-
-#: l10n/im/entry.desktop:2
-msgctxt "Name"
-msgid "Isle of Man"
-msgstr ""
-
-#: l10n/in/entry.desktop:2
-msgctxt "Name"
-msgid "India"
-msgstr "India"
-
-#: l10n/iq/entry.desktop:2
-msgctxt "Name"
-msgid "Iraq"
-msgstr "Irac"
-
-#: l10n/ir/entry.desktop:2
-msgctxt "Name"
-msgid "Iran"
-msgstr "Iran"
-
-#: l10n/is/entry.desktop:2
-msgctxt "Name"
-msgid "Iceland"
-msgstr "Ynys yr I?"
-
-#: l10n/it/entry.desktop:2
-msgctxt "Name"
-msgid "Italy"
-msgstr "Yr Eidal"
-
-#: l10n/je/entry.desktop:2
-msgctxt "Name"
-msgid "Jersey"
-msgstr ""
-
-#: l10n/jm/entry.desktop:2
-msgctxt "Name"
-msgid "Jamaica"
-msgstr "Jamaica"
-
-#: l10n/jo/entry.desktop:2
-msgctxt "Name"
-msgid "Jordan"
-msgstr "Gwlad Iorddonen"
-
-#: l10n/jp/entry.desktop:2
-msgctxt "Name"
-msgid "Japan"
-msgstr "Siapan"
-
-#: l10n/ke/entry.desktop:2
-msgctxt "Name"
-msgid "Kenya"
-msgstr "Cenia"
-
-#: l10n/kg/entry.desktop:2
-msgctxt "Name"
-msgid "Kyrgyzstan"
-msgstr "Cyrgystan"
-
-#: l10n/kh/entry.desktop:2
-msgctxt "Name"
-msgid "Cambodia"
-msgstr "Cambodia"
-
-#: l10n/ki/entry.desktop:2
-msgctxt "Name"
-msgid "Kiribati"
-msgstr "Ciribati"
-
-#: l10n/km/entry.desktop:2
-msgctxt "Name"
-msgid "Comoros"
-msgstr "Ynysoedd Y Comoros"
-
-#: l10n/kn/entry.desktop:2
-msgctxt "Name"
-msgid "St. Kitts and Nevis"
-msgstr "Ynysoedd St. Kitts a Nevis"
-
-#: l10n/kp/entry.desktop:2
-msgctxt "Name"
-msgid "North Korea"
-msgstr "Gogledd Corea"
-
-#: l10n/kr/entry.desktop:2
-msgctxt "Name"
-msgid "South Korea"
-msgstr "De Corea"
-
-#: l10n/kw/entry.desktop:2
-msgctxt "Name"
-msgid "Kuwait"
-msgstr "Coweit"
-
-#: l10n/ky/entry.desktop:2
-msgctxt "Name"
-msgid "Cayman Islands"
-msgstr "Ynysoedd Caiman"
-
-#: l10n/kz/entry.desktop:2
-msgctxt "Name"
-msgid "Kazakhstan"
-msgstr "Casacstan"
-
-#: l10n/la/entry.desktop:2
-msgctxt "Name"
-msgid "Laos"
-msgstr "Laos"
-
-#: l10n/lb/entry.desktop:2
-msgctxt "Name"
-msgid "Lebanon"
-msgstr "Libanus"
-
-#: l10n/lc/entry.desktop:2
-msgctxt "Name"
-msgid "St. Lucia"
-msgstr "St. Lwsia"
-
-#: l10n/li/entry.desktop:2
-msgctxt "Name"
-msgid "Liechtenstein"
-msgstr "Liechtenstein"
-
-#: l10n/lk/entry.desktop:2
-msgctxt "Name"
-msgid "Sri Lanka"
-msgstr "Sri Lanca"
-
-#: l10n/lr/entry.desktop:2
-msgctxt "Name"
-msgid "Liberia"
-msgstr "Liberia"
-
-#: l10n/ls/entry.desktop:2
-msgctxt "Name"
-msgid "Lesotho"
-msgstr "Lesotho"
-
-#: l10n/lt/entry.desktop:2
-msgctxt "Name"
-msgid "Lithuania"
-msgstr "Lithwania"
-
-#: l10n/lu/entry.desktop:2
-msgctxt "Name"
-msgid "Luxembourg"
-msgstr "Lwcsembwrg"
-
-#: l10n/lv/entry.desktop:2
-msgctxt "Name"
-msgid "Latvia"
-msgstr "Latfia"
-
-#: l10n/ly/entry.desktop:2
-msgctxt "Name"
-msgid "Libya"
-msgstr "Libia"
-
-#: l10n/ma/entry.desktop:2
-msgctxt "Name"
-msgid "Morocco"
-msgstr "Moroco"
-
-#: l10n/mc/entry.desktop:2
-msgctxt "Name"
-msgid "Monaco"
-msgstr "Monaco"
-
-#: l10n/md/entry.desktop:2
-msgctxt "Name"
-msgid "Moldova"
-msgstr "Moldofa"
-
-#: l10n/me/entry.desktop:3
-msgctxt "Name"
-msgid "Montenegro"
-msgstr ""
-
-#: l10n/mf/entry.desktop:2
-msgctxt "Name"
-msgid "Saint Martin"
-msgstr ""
-
-#: l10n/mg/entry.desktop:2
-msgctxt "Name"
-msgid "Madagascar"
-msgstr "Madagascar"
-
-#: l10n/mh/entry.desktop:2
-msgctxt "Name"
-msgid "Marshall Islands"
-msgstr "Ynysoedd Marshall"
-
-#: l10n/middleeast.desktop:2
-msgctxt "Name"
-msgid "Middle-East"
-msgstr "Dwyrain Canol"
-
-#: l10n/mk/entry.desktop:3
-msgctxt "Name"
-msgid "Macedonia"
-msgstr "Macedonia"
-
-#: l10n/ml/entry.desktop:2
-msgctxt "Name"
-msgid "Mali"
-msgstr "Mali"
-
-#: l10n/mm/entry.desktop:2
-msgctxt "Name"
-msgid "Myanmar"
-msgstr "Mianmar"
-
-#: l10n/mn/entry.desktop:2
-msgctxt "Name"
-msgid "Mongolia"
-msgstr "Mongolia"
-
-#: l10n/mo/entry.desktop:2
-msgctxt "Name"
-msgid "Macau SAR(China)"
-msgstr ""
-
-#: l10n/mp/entry.desktop:2
-msgctxt "Name"
-msgid "Northern Mariana Islands"
-msgstr ""
-
-#: l10n/mq/entry.desktop:2
-msgctxt "Name"
-msgid "Martinique"
-msgstr "Martin?c"
-
-#: l10n/mr/entry.desktop:2
-msgctxt "Name"
-msgid "Mauritania"
-msgstr "Mawritania"
-
-#: l10n/ms/entry.desktop:2
-msgctxt "Name"
-msgid "Montserrat"
-msgstr "Montserrat"
-
-#: l10n/mt/entry.desktop:3
-msgctxt "Name"
-msgid "Malta"
-msgstr "Malta"
-
-#: l10n/mu/entry.desktop:2
-msgctxt "Name"
-msgid "Mauritius"
-msgstr "Mawrisiws"
-
-#: l10n/mv/entry.desktop:2
-msgctxt "Name"
-msgid "Maldives"
-msgstr "Ynysoedd y Mald?f"
-
-#: l10n/mw/entry.desktop:2
-msgctxt "Name"
-msgid "Malawi"
-msgstr "Malawi"
-
-#: l10n/mx/entry.desktop:2
-msgctxt "Name"
-msgid "Mexico"
-msgstr "Mecsico"
-
-#: l10n/my/entry.desktop:2
-msgctxt "Name"
-msgid "Malaysia"
-msgstr "Maleisia"
-
-#: l10n/mz/entry.desktop:2
-msgctxt "Name"
-msgid "Mozambique"
-msgstr "Mosamb?c"
-
-#: l10n/na/entry.desktop:2
-msgctxt "Name"
-msgid "Namibia"
-msgstr "Namibia"
-
-#: l10n/nc/entry.desktop:2
-msgctxt "Name"
-msgid "New Caledonia"
-msgstr "Caledonia Newydd"
-
-#: l10n/ne/entry.desktop:2
-msgctxt "Name"
-msgid "Niger"
-msgstr "Niger"
-
-#: l10n/nf/entry.desktop:2
-msgctxt "Name"
-msgid "Norfolk Island"
-msgstr "Ynys Norffolc"
-
-#: l10n/ng/entry.desktop:2
-msgctxt "Name"
-msgid "Nigeria"
-msgstr "Nigeria"
-
-#: l10n/ni/entry.desktop:2
-msgctxt "Name"
-msgid "Nicaragua"
-msgstr "Nicaragwa"
-
-#: l10n/nl/entry.desktop:3
-msgctxt "Name"
-msgid "Netherlands"
-msgstr "Yr Iseldiroedd"
-
-#: l10n/no/entry.desktop:3
-msgctxt "Name"
-msgid "Norway"
-msgstr "Norwy"
-
-#: l10n/northafrica.desktop:2
-msgctxt "Name"
-msgid "Africa, Northern"
-msgstr "Affrica, Gogledd"
-
-#: l10n/northamerica.desktop:2
-msgctxt "Name"
-msgid "America, North"
-msgstr "America, Gogledd"
-
-#: l10n/northeurope.desktop:2
-msgctxt "Name"
-msgid "Europe, Northern"
-msgstr "Ewrop, Gogledd"
-
-#: l10n/np/entry.desktop:2
-msgctxt "Name"
-msgid "Nepal"
-msgstr "Nepal"
-
-#: l10n/nr/entry.desktop:2
-msgctxt "Name"
-msgid "Nauru"
-msgstr "Nawrw"
-
-#: l10n/nu/entry.desktop:2
-msgctxt "Name"
-msgid "Niue"
-msgstr "Niwe"
-
-#: l10n/nz/entry.desktop:3
-msgctxt "Name"
-msgid "New Zealand"
-msgstr "Seland Newydd"
-
-#: l10n/oceania.desktop:2
-msgctxt "Name"
-msgid "Oceania"
-msgstr "Ynysoedd y De"
-
-#: l10n/om/entry.desktop:2
-msgctxt "Name"
-msgid "Oman"
-msgstr "Oman"
-
-#: l10n/pa/entry.desktop:2
-msgctxt "Name"
-msgid "Panama"
-msgstr "Panama"
-
-#: l10n/pe/entry.desktop:2
-msgctxt "Name"
-msgid "Peru"
-msgstr "Periw"
-
-#: l10n/pf/entry.desktop:2
-msgctxt "Name"
-msgid "French Polynesia"
-msgstr "Polynesia Ffrengig"
-
-#: l10n/pg/entry.desktop:2
-msgctxt "Name"
-msgid "Papua New Guinea"
-msgstr "Papwa Gini Newydd"
-
-#: l10n/ph/entry.desktop:2
-msgctxt "Name"
-msgid "Philippines"
-msgstr "Ynysoedd Y Philipinau"
-
-#: l10n/pk/entry.desktop:2
-msgctxt "Name"
-msgid "Pakistan"
-msgstr "Pacistan"
-
-#: l10n/pl/entry.desktop:2
-msgctxt "Name"
-msgid "Poland"
-msgstr "Gwlad Pwyl"
-
-#: l10n/pm/entry.desktop:2
-msgctxt "Name"
-msgid "Saint Pierre and Miquelon"
-msgstr "Ynysoedd Sant Pierre a Micwelon"
-
-#: l10n/pn/entry.desktop:2
-msgctxt "Name"
-msgid "Pitcairn"
-msgstr "Ynys Pitcairn"
-
-#: l10n/pr/entry.desktop:2
-msgctxt "Name"
-msgid "Puerto Rico"
-msgstr "Pwerto Rico"
-
-#: l10n/ps/entry.desktop:2
-msgctxt "Name"
-msgid "Palestinian Territory"
-msgstr "Tiriogaeth Palesteina"
-
-#: l10n/pt/entry.desktop:3
-msgctxt "Name"
-msgid "Portugal"
-msgstr "Portiwgal"
-
-#: l10n/pw/entry.desktop:2
-msgctxt "Name"
-msgid "Palau"
-msgstr "Palaw"
-
-#: l10n/py/entry.desktop:2
-msgctxt "Name"
-msgid "Paraguay"
-msgstr "Paragw?i"
-
-#: l10n/qa/entry.desktop:2
-msgctxt "Name"
-msgid "Qatar"
-msgstr "Catar"
-
-#: l10n/re/entry.desktop:2
-msgctxt "Name"
-msgid "Réunion"
-msgstr ""
-
-#: l10n/ro/entry.desktop:2
-msgctxt "Name"
-msgid "Romania"
-msgstr "Romania"
-
-#: l10n/rs/entry.desktop:3
-msgctxt "Name"
-msgid "Serbia"
-msgstr ""
-
-#: l10n/ru/entry.desktop:3
-msgctxt "Name"
-msgid "Russia"
-msgstr "Rwsia"
-
-#: l10n/rw/entry.desktop:2
-msgctxt "Name"
-msgid "Rwanda"
-msgstr "Rwanda"
-
-#: l10n/sa/entry.desktop:2
-msgctxt "Name"
-msgid "Saudi Arabia"
-msgstr "Sawdi Arabia"
-
-#: l10n/sb/entry.desktop:2
-msgctxt "Name"
-msgid "Solomon Islands"
-msgstr "Ynysoedd Solomon"
-
-#: l10n/sc/entry.desktop:2
-msgctxt "Name"
-msgid "Seychelles"
-msgstr "Ynysoedd y Seisi?l"
-
-#: l10n/sd/entry.desktop:2
-msgctxt "Name"
-msgid "Sudan"
-msgstr "Swdan"
-
-#: l10n/se/entry.desktop:2
-msgctxt "Name"
-msgid "Sweden"
-msgstr "Sweden"
-
-#: l10n/sg/entry.desktop:2
-msgctxt "Name"
-msgid "Singapore"
-msgstr "Singap?r"
-
-#: l10n/sh/entry.desktop:2
-msgctxt "Name"
-msgid "Saint Helena"
-msgstr "Ynys Santes Helena"
-
-#: l10n/si/entry.desktop:2
-msgctxt "Name"
-msgid "Slovenia"
-msgstr "Slofenia"
-
-#: l10n/sk/entry.desktop:2
-msgctxt "Name"
-msgid "Slovakia"
-msgstr "Slofacia"
-
-#: l10n/sl/entry.desktop:2
-msgctxt "Name"
-msgid "Sierra Leone"
-msgstr ""
-
-#: l10n/sm/entry.desktop:2
-msgctxt "Name"
-msgid "San Marino"
-msgstr "San Marino"
-
-#: l10n/sn/entry.desktop:2
-msgctxt "Name"
-msgid "Senegal"
-msgstr "Senegal"
-
-#: l10n/so/entry.desktop:2
-msgctxt "Name"
-msgid "Somalia"
-msgstr "Somalia"
-
-#: l10n/southafrica.desktop:2
-msgctxt "Name"
-msgid "Africa, Southern"
-msgstr "Affrica, De"
-
-#: l10n/southamerica.desktop:2
-msgctxt "Name"
-msgid "America, South"
-msgstr "America, De"
-
-#: l10n/southasia.desktop:2
-msgctxt "Name"
-msgid "Asia, South"
-msgstr "Asia, De"
-
-#: l10n/southeastasia.desktop:2
-msgctxt "Name"
-msgid "Asia, South-East"
-msgstr "Asia, De-Ddwyrain"
-
-#: l10n/southeurope.desktop:2
-msgctxt "Name"
-msgid "Europe, Southern"
-msgstr "Ewrop, De"
-
-#: l10n/sr/entry.desktop:2
-msgctxt "Name"
-msgid "Suriname"
-msgstr "Swrinam"
-
-#: l10n/st/entry.desktop:2
-msgctxt "Name"
-msgid "Sao Tome and Principe"
-msgstr "Ynysoedd Sao Tome a Principe"
-
-#: l10n/sv/entry.desktop:2
-msgctxt "Name"
-msgid "El Salvador"
-msgstr "El Salfador"
-
-#: l10n/sy/entry.desktop:2
-msgctxt "Name"
-msgid "Syria"
-msgstr "Syria"
-
-#: l10n/sz/entry.desktop:2
-msgctxt "Name"
-msgid "Swaziland"
-msgstr "Gwlad y Swasi"
-
-#: l10n/tc/entry.desktop:2
-msgctxt "Name"
-msgid "Turks and Caicos Islands"
-msgstr "Ynysoedd Twrc a Chaicos"
-
-#: l10n/td/entry.desktop:2
-msgctxt "Name"
-msgid "Chad"
-msgstr "Tsiad"
-
-#: l10n/tg/entry.desktop:2
-msgctxt "Name"
-msgid "Togo"
-msgstr "Togo"
-
-#: l10n/th/entry.desktop:2
-msgctxt "Name"
-msgid "Thailand"
-msgstr "Gwlad y Tai"
-
-#: l10n/tj/entry.desktop:2
-msgctxt "Name"
-msgid "Tajikistan"
-msgstr "Tajicistan"
-
-#: l10n/tk/entry.desktop:2
-msgctxt "Name"
-msgid "Tokelau"
-msgstr "Tocelaw"
-
-#: l10n/tl/entry.desktop:2
-msgctxt "Name"
-msgid "Timor-Leste"
-msgstr ""
-
-#: l10n/tm/entry.desktop:2
-msgctxt "Name"
-msgid "Turkmenistan"
-msgstr "Twrcmenistan"
-
-#: l10n/tn/entry.desktop:2
-msgctxt "Name"
-msgid "Tunisia"
-msgstr "Tiwnisia"
-
-#: l10n/to/entry.desktop:2
-msgctxt "Name"
-msgid "Tonga"
-msgstr "Tonga"
-
-#: l10n/tp/entry.desktop:2
-msgctxt "Name"
-msgid "East Timor"
-msgstr "Dwyrain Timor"
-
-#: l10n/tr/entry.desktop:2
-msgctxt "Name"
-msgid "Turkey"
-msgstr "Twrci"
-
-#: l10n/tt/entry.desktop:2
-msgctxt "Name"
-msgid "Trinidad and Tobago"
-msgstr "Ynysoedd Trinidad a Thobago"
-
-#: l10n/tv/entry.desktop:2
-msgctxt "Name"
-msgid "Tuvalu"
-msgstr "Twfalw"
-
-#: l10n/tw/entry.desktop:3
-msgctxt "Name"
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: l10n/tz/entry.desktop:2
-msgctxt "Name"
-msgid "Tanzania, United Republic of"
-msgstr "Tansania, Gweriniaeth Unedig"
-
-#: l10n/ua/entry.desktop:3
-msgctxt "Name"
-msgid "Ukraine"
-msgstr "Wcr?in"
-
-#: l10n/ug/entry.desktop:2
-msgctxt "Name"
-msgid "Uganda"
-msgstr "Wganda"
-
-#: l10n/us/entry.desktop:2
-msgctxt "Name"
-msgid "United States of America"
-msgstr "Unol Daleithau America"
-
-#: l10n/uy/entry.desktop:2
-msgctxt "Name"
-msgid "Uruguay"
-msgstr "Wrwgw?i"
-
-#: l10n/uz/entry.desktop:2
-msgctxt "Name"
-msgid "Uzbekistan"
-msgstr "Wsbecist?n"
-
-#: l10n/va/entry.desktop:2
-msgctxt "Name"
-msgid "Vatican City"
-msgstr "Dinas y Fatican"
-
-#: l10n/vc/entry.desktop:2
-msgctxt "Name"
-msgid "St. Vincent and the Grenadines"
-msgstr "Ynysoedd St. Finsent a'r Grenadinau"
-
-#: l10n/ve/entry.desktop:2
-msgctxt "Name"
-msgid "Venezuela"
-msgstr "Feneswela"
-
-#: l10n/vg/entry.desktop:2
-msgctxt "Name"
-msgid "Virgin Islands, British"
-msgstr "Ynysoedd yr Wyryf, Prydeinig"
-
-#: l10n/vi/entry.desktop:2
-msgctxt "Name"
-msgid "Virgin Islands, U.S."
-msgstr "Ynysoedd yr Wyryf, Americanaidd"
-
-#: l10n/vn/entry.desktop:2
-msgctxt "Name"
-msgid "Vietnam"
-msgstr "Fiet-nam"
-
-#: l10n/vu/entry.desktop:2
-msgctxt "Name"
-msgid "Vanuatu"
-msgstr "Fanwatw"
-
-#: l10n/westafrica.desktop:2
-msgctxt "Name"
-msgid "Africa, Western"
-msgstr "Affrica, Gorllewin"
-
-#: l10n/westeurope.desktop:2
-msgctxt "Name"
-msgid "Europe, Western"
-msgstr "Ewrop, Gorllewin"
-
-#: l10n/wf/entry.desktop:2
-msgctxt "Name"
-msgid "Wallis and Futuna"
-msgstr "Ynysoedd Walis a Ffwtwna"
-
-#: l10n/ws/entry.desktop:3
-msgctxt "Name"
-msgid "Samoa"
-msgstr "Samoa"
-
-#: l10n/ye/entry.desktop:2
-msgctxt "Name"
-msgid "Yemen"
-msgstr "Yr Iemen"
-
-#: l10n/yt/entry.desktop:2
-msgctxt "Name"
-msgid "Mayotte"
-msgstr ""
-
-#: l10n/za/entry.desktop:3
-msgctxt "Name"
-msgid "South Africa"
-msgstr "De Affrica"
-
-#: l10n/zm/entry.desktop:2
-msgctxt "Name"
-msgid "Zambia"
-msgstr "Sambia"
-
-#: l10n/zw/entry.desktop:2
-msgctxt "Name"
-msgid "Zimbabwe"
-msgstr "Simbabwe"
-
-#: drkonqi/data/debuggers/external/gdbrc:2
-#: drkonqi/data/debuggers/internal/gdbrc:2
-msgctxt "Name"
-msgid "gdb"
-msgstr ""
-
-#: drkonqi/data/debuggers/external/kdbgrc:2
-msgctxt "Name"
-msgid "kdbg"
-msgstr ""
-
-#: drkonqi/data/debuggers/internal/dbxrc:2
-msgctxt "Name"
-msgid "dbx"
-msgstr ""
-
-#: drkonqi/data/debuggers/internal/kdbgwinrc:2
-msgctxt "Name"
-msgid "kdbgwin"
-msgstr ""
-
-#: kcontrol/componentchooser/EXAMPLE.desktop:1
-msgctxt "Name"
-msgid "A nice name you have chosen for your interface"
-msgstr "Enw neis yr ydych wedi dewis am eich rhyngwyneb"
-
-#: kcontrol/componentchooser/EXAMPLE.desktop:87
-msgctxt "Comment"
-msgid "A helpful description of the interface for the top right info box"
-msgstr "Disgrifiad cymorthwyol o'r rhyngwyneb i'r blwch gwybodaeth top de"
-
-#: kioslave/desktop/directory.trash:83
-msgctxt "Comment"
-msgid "Contains removed files"
-msgstr ""
-
-#: menu/desktop/hidden.directory:4
-msgctxt "Name"
-msgid "Internal Services"
-msgstr ""
-
-#: plasma/remotewidgetshelper/kcm_remotewidgets.actions:2
-msgctxt "Name"
-msgid "Save remote widgets' policies"
-msgstr ""
-
-#: plasma/remotewidgetshelper/kcm_remotewidgets.actions:55
-msgctxt "Description"
-msgid "Prevents the system from saving remote plasma widgets' policies"
-msgstr ""
-
-#: platforms/win/config/platform.desktop:13
-msgctxt "Name"
-msgid "Platform"
-msgstr ""
-
-#: platforms/win/config/platform.desktop:76
-msgctxt "Comment"
-msgid "Windows Platform Manager"
-msgstr ""
-
-#: platforms/win/kwinshutdown/kwinshutdown.desktop:2
-msgctxt "Name"
-msgid "KDE Shutdown"
-msgstr ""
-
-#: platforms/win/kwinshutdown/kwinshutdown.desktop:35
-msgctxt "Comment"
-msgid "kill running KDE applications and processes"
-msgstr ""
-
-#: platforms/win/kwinstartmenu/winstartmenu.desktop:3
-msgctxt "Name"
-msgid "KDED Windows Start Menu Module"
-msgstr ""
-
-#: platforms/win/kwinstartmenu/winstartmenu.desktop:76
-msgctxt "Comment"
-msgid "Shortcut icon support"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdesdk.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdesdk.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kdesdk.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kdesdk.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,702 +0,0 @@
-# translation of desktop_kdesdk.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdesdk\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
-"PO-Revision-Date: 2009-07-18 18:09+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:23+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: cervisia/cervisia.desktop:2
-msgctxt "GenericName"
-msgid "CVS Frontend"
-msgstr "Ochr Blaen CVS"
-
-#: cervisia/cervisia.desktop:70 cervisia/cervisiapart.desktop:5
-msgctxt "Name"
-msgid "Cervisia"
-msgstr "Cervisia"
-
-#: cervisia/cervisia.notifyrc:3
-msgctxt "Comment"
-msgid "Cervisia CVS Client"
-msgstr ""
-
-#: cervisia/cervisia.notifyrc:40
-msgctxt "Name"
-msgid "CVS commit job done"
-msgstr ""
-
-#: cervisia/cervisia.notifyrc:87
-msgctxt "Comment"
-msgid "A CVS commit job is done"
-msgstr ""
-
-#: cervisia/cvsservice/cvsservice.desktop:3
-msgctxt "Name"
-msgid "CvsService"
-msgstr "GwasanaethCVS"
-
-#: cervisia/cvsservice/cvsservice.desktop:63
-msgctxt "Comment"
-msgid "A D-Bus service that provides an interface to cvs"
-msgstr ""
-
-#: dolphin-plugins/git/fileviewgitplugin.desktop:3
-msgctxt "Name"
-msgid "Git"
-msgstr ""
-
-#: dolphin-plugins/svn/fileviewsvnplugin.desktop:3
-msgctxt "Name"
-msgid "Subversion"
-msgstr ""
-
-#: kapptemplate/kapptemplate.desktop:7
-msgctxt "GenericName"
-msgid "KDE Template Generator"
-msgstr ""
-
-#: kapptemplate/kapptemplate.desktop:50
-msgctxt "Name"
-msgid "KAppTemplate"
-msgstr ""
-
-#: kapptemplate/templates/C++/akonadiresource/akonadiresource.kdevtemplate:3
-msgctxt "Name"
-msgid "Akonadi Resource Template"
-msgstr ""
-
-#: kapptemplate/templates/C++/akonadiresource/akonadiresource.kdevtemplate:44
-msgctxt "Comment"
-msgid "A template for an Akonadi PIM data resource"
-msgstr ""
-
-#: kapptemplate/templates/C++/akonadiserializer/akonadi_serializer_%{APPNAMELC}.desktop:2
-msgctxt "Name"
-msgid "%{APPNAME} Serializer"
-msgstr ""
-
-#: kapptemplate/templates/C++/akonadiserializer/akonadi_serializer_%{APPNAMELC}.desktop:41
-msgctxt "Comment"
-msgid "An Akonadi serializer plugin for %{APPNAMELC}"
-msgstr ""
-
-#: kapptemplate/templates/C++/akonadiserializer/akonadiserializer.kdevtemplate:3
-msgctxt "Name"
-msgid "Akonadi Serializer Template"
-msgstr ""
-
-#: kapptemplate/templates/C++/akonadiserializer/akonadiserializer.kdevtemplate:41
-msgctxt "Comment"
-msgid "A template for an Akonadi data serializer plugin"
-msgstr ""
-
-#: kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop:4
-#: kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop:4
-msgctxt "Name"
-msgid "%{APPNAME} Shape"
-msgstr ""
-
-#: kapptemplate/templates/C++/flake/%{APPNAMELC}shape.desktop:38
-#: kapptemplate/templates/C++/flake/%{APPNAME}shape.desktop:38
-msgctxt "Comment"
-msgid "%{APPNAME} Flake Shape"
-msgstr ""
-
-#: kapptemplate/templates/C++/flake/flake.kdevtemplate:3
-msgctxt "Name"
-msgid "KOffice Shape Template (Flake)"
-msgstr ""
-
-#: kapptemplate/templates/C++/flake/flake.kdevtemplate:34
-msgctxt "Comment"
-msgid ""
-"A KOffice plugin template with a shape, a tool and a docker (please use "
-"ThisFormat for the project name)"
-msgstr ""
-
-#: kapptemplate/templates/C++/kapp4/kapp4.kdevtemplate:3
-msgctxt "Name"
-msgid "KDE 4 GUI Application"
-msgstr ""
-
-#: kapptemplate/templates/C++/kapp4/kapp4.kdevtemplate:45
-msgctxt "Comment"
-msgid ""
-"KDE4 simple template based on CMake, inherits from XMLGuiWindow and "
-"demonstrates how to use KConfig XT"
-msgstr ""
-
-#: kapptemplate/templates/C++/kapp4/src/%{APPNAMELC}.desktop:2
-#: kapptemplate/templates/C++/konqplugin/src/%{APPNAMELC}.desktop:44
-#: kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}.desktop:2
-#: kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop:41
-#: kapptemplate/templates/C++/plasmoid/plasma-applet-%{APPNAMELC}.desktop:2
-#: kapptemplate/templates/C++/runner/%{APPNAMELC}.desktop:2
-#: kapptemplate/templates/ruby/kderubyapp/src/%{APPNAMELC}.desktop:2
-#: kapptemplate/templates/ruby/rubykonqplugin/src/%{APPNAMELC}.desktop:47
-msgctxt "Name"
-msgid "%{APPNAME}"
-msgstr ""
-
-#: kapptemplate/templates/C++/kapp4/src/%{APPNAMELC}.desktop:50
-msgctxt "GenericName"
-msgid "A KDE4 Application"
-msgstr ""
-
-#: kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate:3
-msgctxt "Name"
-msgid "KOffice Text-Plugin Template"
-msgstr ""
-
-#: kapptemplate/templates/C++/kofficetext/kofficetext.kdevtemplate:35
-msgctxt "Comment"
-msgid ""
-"A KOffice plugin template to add new features for modifying text (use "
-"ThisFormat for the project name)"
-msgstr ""
-
-#: kapptemplate/templates/C++/kofficetext/kotext%{APPNAMELC}.desktop:2
-msgctxt "Name"
-msgid "%{APPNAME} plugin"
-msgstr ""
-
-#: kapptemplate/templates/C++/konqplugin/konqplugin.kdevtemplate:3
-msgctxt "Name"
-msgid "KDE 4 Konqueror plugin"
-msgstr ""
-
-#: kapptemplate/templates/C++/konqplugin/konqplugin.kdevtemplate:36
-msgctxt "Comment"
-msgid ""
-"KDE4 simple template based on CMake, inherits from KParts::Plugin and "
-"demonstrates how to write a konqueror plugin"
-msgstr ""
-
-#: kapptemplate/templates/C++/konqplugin/src/%{APPNAMELC}.desktop:16
-msgctxt "Comment"
-msgid "Extended UrlBar Options"
-msgstr ""
-
-#: kapptemplate/templates/C++/konqplugin/src/%{APPNAMELC}.desktop:88
-#: kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop:85
-#: kapptemplate/templates/ruby/rubykonqplugin/src/%{APPNAMELC}.desktop:91
-msgctxt "GenericName"
-msgid "%{APPNAME}"
-msgstr ""
-
-#: kapptemplate/templates/C++/kpartapp/kpartapp.kdevtemplate:3
-msgctxt "Name"
-msgid "KDE 4 KPart Application"
-msgstr ""
-
-#: kapptemplate/templates/C++/kpartapp/kpartapp.kdevtemplate:44
-msgctxt "Comment"
-msgid ""
-"KDE4 simple template based on CMake, inherits from XMLGuiWindow and "
-"demonstrates how to use KPart"
-msgstr ""
-
-#: kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}.desktop:50
-msgctxt "GenericName"
-msgid "A KDE KPart Application"
-msgstr ""
-
-#: kapptemplate/templates/C++/kpartapp/src/%{APPNAMELC}_part.desktop:2
-msgctxt "Name"
-msgid "%{APPNAME}Part"
-msgstr ""
-
-#: kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate:3
-msgctxt "Name"
-msgid "KTextEditor Plugin Template"
-msgstr ""
-
-#: kapptemplate/templates/C++/ktexteditor/ktexteditor.kdevtemplate:38
-msgctxt "Comment"
-msgid ""
-"A KTextEditor plugin template to perform special operations on text in "
-"KWrite, Kate, KDevelop etc.  (use ThisFormat for the project name)"
-msgstr ""
-
-#: kapptemplate/templates/C++/ktexteditor/ktexteditor_%{APPNAMELC}.desktop:3
-msgctxt "Comment"
-msgid "%{APPNAME}"
-msgstr ""
-
-#: kapptemplate/templates/C++/plasmoid/plasma-applet-%{APPNAMELC}.desktop:46
-msgctxt "Comment"
-msgid "Plasma %{APPNAME}"
-msgstr ""
-
-#: kapptemplate/templates/C++/plasmoid/plasmoid.kdevtemplate:3
-msgctxt "Name"
-msgid "Plasma Applet Template"
-msgstr ""
-
-#: kapptemplate/templates/C++/plasmoid/plasmoid.kdevtemplate:45
-msgctxt "Comment"
-msgid "A plasma applet template displaying an icon and a text"
-msgstr ""
-
-#: kapptemplate/templates/C++/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate:3
-msgctxt "Name"
-msgid "Qt4 GUI Application"
-msgstr ""
-
-#: kapptemplate/templates/C++/qmake_qt4guiapp/qmake_qt4guiapp.kdevtemplate:46
-msgctxt "Comment"
-msgid ""
-"Generate a QMake/Qt4 based application with graphical user interface "
-"(crossplatform compatible)"
-msgstr ""
-
-#: kapptemplate/templates/C++/runner/%{APPNAMELC}.desktop:46
-msgctxt "Comment"
-msgid "%{APPNAME} runner"
-msgstr ""
-
-#: kapptemplate/templates/C++/runner/runner.kdevtemplate:3
-msgctxt "Name"
-msgid "Plasma Runner Template"
-msgstr ""
-
-#: kapptemplate/templates/C++/runner/runner.kdevtemplate:43
-msgctxt "Comment"
-msgid "A plasma runner template"
-msgstr ""
-
-#: kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate:3
-msgctxt "Name"
-msgid "PyKDE4 GUI Application"
-msgstr ""
-
-#: kapptemplate/templates/Python/pykde4app/pykde4app.kdevtemplate:45
-msgctxt "Comment"
-msgid "PyKDE4 template  - needs PyKDE4"
-msgstr ""
-
-#: kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate:3
-msgctxt "Name"
-msgid "PyQt4 GUI Application"
-msgstr ""
-
-#: kapptemplate/templates/Python/pyqt4app/pyqt4app.kdevtemplate:45
-msgctxt "Comment"
-msgid "PyQt template using a Designer file - needs PyQt4"
-msgstr ""
-
-#: kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate:3
-msgctxt "Name"
-msgid "KDE 4 Ruby GUI Application"
-msgstr ""
-
-#: kapptemplate/templates/ruby/kderubyapp/kderubyapp.kdevtemplate:43
-msgctxt "Comment"
-msgid ""
-"KDE4 simple ruby template, inherits from XMLGuiWindow - needs korundum4"
-msgstr ""
-
-#: kapptemplate/templates/ruby/kderubyapp/src/%{APPNAMELC}.desktop:50
-msgctxt "GenericName"
-msgid "A KDE4 Ruby Application"
-msgstr ""
-
-#: kapptemplate/templates/ruby/rubykonqplugin/rubykonqplugin.kdevtemplate:3
-msgctxt "Name"
-msgid "KDE 4 Ruby Konqueror plugin"
-msgstr ""
-
-#: kapptemplate/templates/ruby/rubykonqplugin/rubykonqplugin.kdevtemplate:34
-msgctxt "Comment"
-msgid ""
-"KDE4 simple template based on CMake, inherits from KParts::Plugin and "
-"demonstrates how to write a konqueror plugin in Ruby"
-msgstr ""
-
-#: kapptemplate/templates/ruby/rubykonqplugin/src/%{APPNAMELC}.desktop:18
-msgctxt "Comment"
-msgid "%{APPNAME} - You can write Konqueror-Plugins in Ruby"
-msgstr ""
-
-#: kcachegrind/kcachegrind/kcachegrind.desktop:9
-msgctxt "Name"
-msgid "KCachegrind"
-msgstr "KCachegrind"
-
-#: kcachegrind/kcachegrind/kcachegrind.desktop:64
-msgctxt "GenericName"
-msgid "Profiler Frontend"
-msgstr "Blaen-wyneb Proffilydd"
-
-#: kcachegrind/kcachegrind/kcachegrind.desktop:118
-msgctxt "Comment"
-msgid "Visualization of Performance Profiling Data"
-msgstr ""
-
-#: kdeaccounts-plugin/kdeaccountsplugin.desktop:2
-msgctxt "Name"
-msgid "KDE Repository Accounts"
-msgstr ""
-
-#: kioslave/svn/ksvnd/ksvnd.desktop:3
-msgctxt "Name"
-msgid "KDED Subversion Module"
-msgstr ""
-
-#: kioslave/svn/svn+file.protocol:15 kioslave/svn/svn+http.protocol:15
-#: kioslave/svn/svn+https.protocol:15 kioslave/svn/svn+ssh.protocol:15
-#: kioslave/svn/svn.protocol:15
-msgctxt "Description"
-msgid "Subversion ioslave"
-msgstr ""
-
-#: kioslave/svn/svnhelper/apply_patch.desktop:8
-msgctxt "Name"
-msgid "Apply Patch..."
-msgstr ""
-
-#: kioslave/svn/svnhelper/apply_patch.desktop:62
-msgctxt "Comment"
-msgid "Apply the patch to another folder/file"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:4
-msgctxt "X-KDE-Submenu"
-msgid "Subversion"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:66
-msgctxt "Name"
-msgid "Add to Repository"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:122
-msgctxt "Name"
-msgid "Delete From Repository"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:178
-msgctxt "Name"
-msgid "Revert Local Changes"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:231
-msgctxt "Comment"
-msgid "Remove any changes made locally. Warning - this cannot be undone."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:281
-msgctxt "Name"
-msgid "Rename..."
-msgstr "Ail-enwi..."
-
-#: kioslave/svn/svnhelper/subversion.desktop:339
-msgctxt "Comment"
-msgid ""
-"Rename a file locally and in the repository.  Use this rather than adding "
-"and deleting to rename a file."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:389
-msgctxt "Name"
-msgid "Import Repository"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:443
-msgctxt "Comment"
-msgid ""
-"Put folder into an existing repository to put it under revision control."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:492
-msgctxt "Name"
-msgid "Checkout From Repository..."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:544
-msgctxt "Comment"
-msgid "Checkout out files from an existing repository into this folder."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:594
-msgctxt "Name"
-msgid "Switch..."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:648
-msgctxt "Comment"
-msgid "Switch given working copy to another branch"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:699
-msgctxt "Name"
-msgid "Merge..."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:753
-msgctxt "Comment"
-msgid "Merge changes between this and another branch"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:804
-msgctxt "Name"
-msgid "Blame..."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:854
-msgctxt "Comment"
-msgid "See who wrote each line of the file and in what revision"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:905
-msgctxt "Name"
-msgid "Create Patch..."
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:960
-msgctxt "Name"
-msgid "Export..."
-msgstr "Allforio..."
-
-#: kioslave/svn/svnhelper/subversion.desktop:1019
-msgctxt "Comment"
-msgid "Checkout out an unversioned copy of a tree from a repository"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:1069
-msgctxt "Name"
-msgid "Diff (local)"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion.desktop:1123
-msgctxt "Comment"
-msgid "Show local changes since last update"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion_toplevel.desktop:11
-msgctxt "Name"
-msgid "SVN Update"
-msgstr ""
-
-#: kioslave/svn/svnhelper/subversion_toplevel.desktop:67
-msgctxt "Name"
-msgid "SVN Commit"
-msgstr ""
-
-#: kompare/kompare.desktop:4
-msgctxt "Name"
-msgid "Kompare"
-msgstr "Kompare"
-
-#: kompare/kompare.desktop:65
-msgctxt "GenericName"
-msgid "Diff/Patch Frontend"
-msgstr "Blaen Gwahaniaethau/Clytiau"
-
-#: kompare/komparenavtreepart/komparenavtreepart.desktop:2
-msgctxt "Name"
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
-#: kompare/komparepart/komparepart.desktop:3
-msgctxt "Name"
-msgid "KomparePart"
-msgstr "KomparePart"
-
-#: kuiviewer/designerthumbnail.desktop:3
-msgctxt "Name"
-msgid "Qt Designer Files"
-msgstr "Ffeiliau Qt Designer"
-
-#: kuiviewer/kuiviewer.desktop:2
-msgctxt "Name"
-msgid "KUIViewer"
-msgstr "KUIGwelydd"
-
-#: kuiviewer/kuiviewer.desktop:59
-msgctxt "GenericName"
-msgid "Qt Designer UI File Viewer"
-msgstr "Gwelydd Ffeiliau UI Qt Designer"
-
-#: kuiviewer/kuiviewer_part.desktop:2
-msgctxt "Name"
-msgid "KUIViewerPart"
-msgstr "KUIViewerPart"
-
-#: lokalize/src/lokalize.desktop:2
-msgctxt "Name"
-msgid "Lokalize"
-msgstr ""
-
-#: lokalize/src/lokalize.desktop:54
-msgctxt "GenericName"
-msgid "Computer-Aided Translation System"
-msgstr ""
-
-#: lokalize/src/lokalize.notifyrc:3
-msgctxt "Comment"
-msgid "Computer-aided translation system"
-msgstr ""
-
-#: lokalize/src/lokalize.notifyrc:80
-msgctxt "Name"
-msgid "Error opening files"
-msgstr ""
-
-#: lokalize/src/lokalize.notifyrc:111
-msgctxt "Name"
-msgid "Error opening files for synchronization"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/bitfields/bitfields.desktop:7
-msgctxt "Name"
-msgid "Bitfields test"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/dynamic-array-js/dynamic.desktop:7
-msgctxt "Name"
-msgid ""
-"Testing dynamic length arrays (JS). Do not translate, it's a waste of time"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/dynamic-array-js/dynamic.desktop:32
-msgctxt "Comment"
-msgid ""
-"A test structure for dynamic arrays (JS). Do not translate, it's a waste of "
-"time"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/dynamic/dynamic.desktop:7
-msgctxt "Name"
-msgid "Testing dynamic length arrays"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/dynamic/dynamic.desktop:33
-msgctxt "Comment"
-msgid "A test structure for dynamic arrays"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/elf-js/elf-js.desktop:9
-#: okteta/kasten/controllers/view/structures/examples/elf/elf.desktop:7
-msgctxt "Name"
-msgid "ELF structure"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/elf-js/elf-js.desktop:35
-#: okteta/kasten/controllers/view/structures/examples/elf/elf.desktop:33
-msgctxt "Comment"
-msgid "Structure for Executable and Linkable Format (ELF)"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/enum/enum.desktop:7
-msgctxt "Name"
-msgid "Testing enums"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/enum/enum.desktop:33
-msgctxt "Comment"
-msgid "A test structure for enums"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/png/png.desktop:7
-msgctxt "Name"
-msgid "PNG file header"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/png/png.desktop:35
-msgctxt "Comment"
-msgid ""
-"A test structure containing the PNG file header (file must be set to big-"
-"endian)"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/simple-js/simple-js.desktop:7
-msgctxt "Name"
-msgid "JavaScript test"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/simple-js/simple-js.desktop:34
-msgctxt "Comment"
-msgid "Just testing structures defined in JS"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/test/test.desktop:7
-msgctxt "Name"
-msgid "Simple test"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/test/test.desktop:35
-msgctxt "Comment"
-msgid "A few test structures"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/test_2/test_2.desktop:7
-msgctxt "Name"
-msgid "Another simple test"
-msgstr ""
-
-#: okteta/kasten/controllers/view/structures/examples/test_2/test_2.desktop:35
-msgctxt "Comment"
-msgid "A few more test structures"
-msgstr ""
-
-#: okteta/mobile/program/okteta-mobile.desktop:4
-msgctxt "Name"
-msgid "Okteta Mobile"
-msgstr ""
-
-#: okteta/parts/kbytesedit/kbytearrayedit.desktop:3
-msgctxt "Name"
-msgid "BytesEdit Widget"
-msgstr ""
-
-#: okteta/parts/kpart/oktetapart.desktop:4
-msgctxt "Name"
-msgid "Okteta Hex Viewer"
-msgstr ""
-
-#: okteta/program/okteta.desktop:2
-msgctxt "Name"
-msgid "Okteta"
-msgstr ""
-
-#: okteta/program/okteta.desktop:33
-msgctxt "GenericName"
-msgid "Hex Editor"
-msgstr ""
-
-#: scheck/scheck.themerc:2
-msgctxt "Name"
-msgid "Scheck"
-msgstr "Scheck"
-
-#: scheck/scheck.themerc:55
-msgctxt "Comment"
-msgid "Development style for searching accelerator and style guide conflicts"
-msgstr ""
-"Arddull datblygu er chwilio am wrthdaro yn y cyflymyddion a'r canllawiau "
-"steil"
-
-#: umbrello/umbrello/umbrello.desktop:8
-msgctxt "Name"
-msgid "Umbrello"
-msgstr "Umbrello"
-
-#: umbrello/umbrello/umbrello.desktop:65
-msgctxt "GenericName"
-msgid "UML Modeller"
-msgstr "Modelydd UML"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kde-workspace.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kde-workspace.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kde-workspace.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kde-workspace.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,5871 +0,0 @@
-# translation of desktop_kdebase.po to Cymraeg
-# Translation of dt_kdebase.po to Cymraeg
-# Translation of desktop_kdebase.po to Cymraeg
-# KDE yn Gymraeg.
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-# www.kyfieithu.co.uk <kyfieithu@kyfieithu.co.uk>, 2003.
-# KGyfieithu <kyfieithu@dotmon.com>, 2003.
-# KD at KGyfieithu <kyfieithu@dotmon.com>, 2003, 2004.
-#
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: desktop_kdebase\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2009-07-18 18:25+0000\n"
-"Last-Translator: KD at KGyfieithu <Unknown>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:43+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: obj-i686-linux-gnu/kdm/kfrontend/sessions/kde-plasma-safe.desktop:6
-msgctxt "Name"
-msgid "KDE Plasma Workspace (failsafe session)"
-msgstr ""
-
-#: obj-i686-linux-gnu/kdm/kfrontend/sessions/kde-plasma-safe.desktop:7
-msgctxt "Comment"
-msgid "The desktop made by KDE (failsafe session)"
-msgstr ""
-
-#: obj-i686-linux-gnu/kdm/kfrontend/sessions/kde-plasma.desktop:6
-msgctxt "Name"
-msgid "KDE Plasma Workspace"
-msgstr ""
-
-#: obj-i686-linux-gnu/kdm/kfrontend/sessions/kde-plasma.desktop:7
-msgctxt "Comment"
-msgid "The desktop made by KDE"
-msgstr ""
-
-#: plasma/netbook/containments/sal/plasma-containment-sal.desktop:2
-msgctxt "Name"
-msgid "Search and Launch"
-msgstr ""
-
-#: plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/metadata.desktop:3
-#: plasma/desktop/shell/data/layouts/plasma-layout-org.kde.plasma-desktop.defaultPanel.desktop:3
-msgctxt "Name"
-msgid "Default Panel"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/desktop/shell/plasma-layout-org.kde.plasma-desktop.desktopIcons.desktop:3
-#: debian/tmp/usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/metadata.desktop:3
-#: debian/tmp/usr/share/kde4/services/plasma-layout-org.kde.plasma-desktop.desktopIcons.desktop:3
-#: obj-i686-linux-gnu/plasma/desktop/shell/plasma-layout-org.kde.plasma-desktop.desktopIcons.desktop:3
-#: plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.desktopIcons/metadata.desktop:3
-msgctxt "Name"
-msgid "Desktop Icons"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/desktop/shell/plasma-layout-org.kde.plasma-desktop.findWidgets.desktop:3
-#: plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.findWidgets/metadata.desktop:3
-msgctxt "Name"
-msgid "Find Widgets"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/desktop/shell/plasma-layout-org.kde.plasma-desktop.photoActivity.desktop:3
-#: plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.photoActivity/metadata.desktop:3
-msgctxt "Name"
-msgid "Photos Activity"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/imgsusepasteorg/plasma-dataengine-share-addon-imgsusepasteorg.desktop:2
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/imgsusepasteorg/metadata.desktop:2
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-imgsusepasteorg.desktop:2
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/imgsusepasteorg/plasma-dataengine-share-addon-imgsusepasteorg.desktop:2
-#: plasma/generic/dataengines/share/backends/imgsusepasteorg/metadata.desktop:2
-msgctxt "Name"
-msgid "img.susepaste.org"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/imgsusepasteorg/plasma-dataengine-share-addon-imgsusepasteorg.desktop:49
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/imgsusepasteorg/metadata.desktop:49
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-imgsusepasteorg.desktop:49
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/imgsusepasteorg/plasma-dataengine-share-addon-imgsusepasteorg.desktop:49
-#: plasma/generic/dataengines/share/backends/imgsusepasteorg/metadata.desktop:49
-msgctxt "Comment"
-msgid "Allows images to be shared using the susepaste.org service"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/imgur/plasma-dataengine-share-addon-imgur.desktop:2
-#: plasma/generic/dataengines/share/backends/imgur/metadata.desktop:2
-msgctxt "Name"
-msgid "Imgur"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/imgur/plasma-dataengine-share-addon-imgur.desktop:56
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/imgur/metadata.desktop:56
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-imgur.desktop:56
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/imgur/plasma-dataengine-share-addon-imgur.desktop:56
-#: plasma/generic/dataengines/share/backends/imgur/metadata.desktop:56
-msgctxt "Comment"
-msgid "Allows images to be shared using the imgur service"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/kde/plasma-dataengine-share-addon-kde.desktop:2
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/kde/metadata.desktop:2
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-kde.desktop:2
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/kde/plasma-dataengine-share-addon-kde.desktop:2
-#: plasma/generic/dataengines/share/backends/kde/metadata.desktop:2
-msgctxt "Name"
-msgid "kde.org"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/kde/plasma-dataengine-share-addon-kde.desktop:52
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/kde/metadata.desktop:52
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-kde.desktop:52
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/kde/plasma-dataengine-share-addon-kde.desktop:52
-#: plasma/generic/dataengines/share/backends/kde/metadata.desktop:52
-msgctxt "Comment"
-msgid "Allows text to be shared using the kde.org service"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/pastebincom/plasma-dataengine-share-addon-pastebincom.desktop:2
-#: plasma/generic/dataengines/share/backends/pastebincom/metadata.desktop:2
-msgctxt "Name"
-msgid "pastebin.com"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/pastebincom/plasma-dataengine-share-addon-pastebincom.desktop:57
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/pastebincom/metadata.desktop:57
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-pastebincom.desktop:57
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/pastebincom/plasma-dataengine-share-addon-pastebincom.desktop:57
-#: plasma/generic/dataengines/share/backends/pastebincom/metadata.desktop:57
-msgctxt "Comment"
-msgid "Allows text to be shared using the pastebin.com service"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/pasteopensuseorg/plasma-dataengine-share-addon-pasteopensuseorg.desktop:2
-#: plasma/generic/dataengines/share/backends/pasteopensuseorg/metadata.desktop:2
-msgctxt "Name"
-msgid "paste.opensuse.org"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/pasteopensuseorg/plasma-dataengine-share-addon-pasteopensuseorg.desktop:53
-#: plasma/generic/dataengines/share/backends/pasteopensuseorg/metadata.desktop:53
-msgctxt "Comment"
-msgid "Paste text with openSUSE"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/pasteubuntucom/plasma-dataengine-share-addon-pasteubuntucom.desktop:2
-#: plasma/generic/dataengines/share/backends/pasteubuntucom/metadata.desktop:2
-msgctxt "Name"
-msgid "paste.ubuntu.com"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/privatepaste/plasma-dataengine-share-addon-privatepastecom.desktop:2
-#: plasma/generic/dataengines/share/backends/privatepaste/metadata.desktop:2
-msgctxt "Name"
-msgid "privatepaste.com"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/privatepaste/plasma-dataengine-share-addon-privatepastecom.desktop:52
-#: plasma/generic/dataengines/share/backends/privatepaste/metadata.desktop:52
-msgctxt "Comment"
-msgid "Paste text with the PrivatePaste.com service"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/simplestimagehosting/plasma-dataengine-share-addon-simplestimagehosting.desktop:2
-#: plasma/generic/dataengines/share/backends/simplestimagehosting/metadata.desktop:2
-msgctxt "Name"
-msgid "Simplest Image Hosting"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/simplestimagehosting/plasma-dataengine-share-addon-simplestimagehosting.desktop:54
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/simplestimagehosting/metadata.desktop:54
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-simplestimagehosting.desktop:54
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/simplestimagehosting/plasma-dataengine-share-addon-simplestimagehosting.desktop:54
-#: plasma/generic/dataengines/share/backends/simplestimagehosting/metadata.desktop:54
-msgctxt "Comment"
-msgid "Allows images to be shared using the Simplest Image Hosting service"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/wklej/plasma-dataengine-share-addon-wklej.desktop:2
-#: plasma/generic/dataengines/share/backends/wklej/metadata.desktop:2
-msgctxt "Name"
-msgid "wklej.org"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/wklej/plasma-dataengine-share-addon-wklej.desktop:57
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/wklej/metadata.desktop:57
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-wklej.desktop:57
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/wklej/plasma-dataengine-share-addon-wklej.desktop:57
-#: plasma/generic/dataengines/share/backends/wklej/metadata.desktop:57
-msgctxt "Comment"
-msgid "Allows text to be shared using the wklej.org service"
-msgstr ""
-
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/wstaw/plasma-dataengine-share-addon-wstaw.desktop:2
-#: plasma/generic/dataengines/share/backends/wstaw/metadata.desktop:2
-msgctxt "Name"
-msgid "wstaw.org"
-msgstr ""
-
-#: debian/build-kwin-gles/plasma/generic/dataengines/share/backends/wstaw/plasma-dataengine-share-addon-wstaw.desktop:58
-#: debian/tmp/usr/share/kde4/apps/plasma/shareprovider/wstaw/metadata.desktop:58
-#: debian/tmp/usr/share/kde4/services/plasma-dataengine-share-addon-wstaw.desktop:58
-#: obj-i686-linux-gnu/plasma/generic/dataengines/share/backends/wstaw/plasma-dataengine-share-addon-wstaw.desktop:58
-#: plasma/generic/dataengines/share/backends/wstaw/metadata.desktop:58
-msgctxt "Comment"
-msgid "Allows images to be shared using the wstaw.org service"
-msgstr ""
-
-#: plasma/netbook/shell/plasma-netbook.desktop:4
-msgctxt "Name"
-msgid "Plasma Netbook"
-msgstr ""
-
-#: plasma/netbook/shell/plasma-netbook.desktop:59
-msgctxt "Comment"
-msgid "Workspace shell for netbook devices."
-msgstr ""
-
-#: kcontrol/kfontinst/apps/kfontview.desktop:2
-msgctxt "Name"
-msgid "KFontView"
-msgstr "KFontView"
-
-#: kcontrol/kfontinst/apps/kfontview.desktop:94
-msgctxt "GenericName"
-msgid "Font Viewer"
-msgstr "Gwelydd Wynebfathau"
-
-#: kinfocenter/kinfocenter.desktop:9
-msgctxt "Name"
-msgid "KInfoCenter"
-msgstr ""
-
-#: kinfocenter/kinfocenter.desktop:96
-msgctxt "GenericName"
-msgid "Info Center"
-msgstr "Canolfan Gwybodaeth"
-
-#: klipper/klipper.desktop:2
-msgctxt "Name"
-msgid "Klipper"
-msgstr "Klipper"
-
-#: klipper/klipper.desktop:88
-msgctxt "GenericName"
-msgid "Clipboard Tool"
-msgstr "Offeryn Gludfwrdd"
-
-#: klipper/klipper.desktop:185
-msgctxt "Comment"
-msgid "A cut & paste history utility"
-msgstr ""
-
-#: kmenuedit/kmenuedit.desktop:9
-msgctxt "Name"
-msgid "Menu Editor"
-msgstr "Golygydd Dewislen"
-
-#: kcontrol/randr/krandrtray.desktop:2
-msgctxt "Name"
-msgid "KRandRTray"
-msgstr ""
-
-#: kcontrol/randr/krandrtray.desktop:88
-msgctxt "GenericName"
-msgid "Screen Resize & Rotate"
-msgstr "Newid Maint a Cylchdroi'r Sgrîn"
-
-#: kcontrol/randr/krandrtray.desktop:174
-msgctxt "Comment"
-msgid "A panel applet for resizing and reorientating X screens."
-msgstr ""
-
-#: ksysguard/gui/ksysguard.desktop:2
-#: plasma/generic/applets/system-monitor/plasma-applet-system-monitor.desktop:2
-#: plasma/generic/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop:3
-msgctxt "Name"
-msgid "System Monitor"
-msgstr ""
-
-#: ksysguard/gui/ksysguard.desktop:83
-msgctxt "GenericName"
-msgid "System Monitor"
-msgstr "Monitr Cysawd"
-
-#: systemsettings/app/systemsettings.desktop:8
-msgctxt "GenericName"
-msgid "System Settings"
-msgstr ""
-
-#: systemsettings/app/systemsettings.desktop:87
-msgctxt "Name"
-msgid "System Settings"
-msgstr ""
-
-#: krunner/krunner.desktop:4
-msgctxt "Name"
-msgid "Command Runner"
-msgstr ""
-
-#: plasma/desktop/shell/data/plasma-desktop.desktop:4
-msgctxt "Name"
-msgid "Plasma Desktop Workspace"
-msgstr ""
-
-#: plasma/netbook/desktoptheme/air-netbook/metadata.desktop:2
-msgctxt "Name"
-msgid "Air for netbooks"
-msgstr ""
-
-#: plasma/netbook/desktoptheme/air-netbook/metadata.desktop:60
-msgctxt "Comment"
-msgid "A breath of fresh air"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.notifyrc:3
-msgctxt "Comment"
-msgid "KDE Free Space Notifier Daemon"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.notifyrc:54
-msgctxt "Name"
-msgid "Low Disk Space"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.notifyrc:107
-#: powerdevil/powerdevil.notifyrc:131
-msgctxt "Name"
-msgid "Warning"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.notifyrc:190
-#: powerdevil/powerdevil.notifyrc:214
-msgctxt "Comment"
-msgid "Used for warning notifications"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.notifyrc:260
-msgctxt "Name"
-msgid "Running low on disk space"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.notifyrc:310
-msgctxt "Comment"
-msgid "You are running low on disk space"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:3
-msgctxt "Comment"
-msgid "Accessibility"
-msgstr "Hygyrchedd"
-
-#: kcontrol/access/kaccess.notifyrc:93
-msgctxt "Name"
-msgid "A modifier key has become active"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:168
-msgctxt "Comment"
-msgid ""
-"A modifier key (e.g. Shift or Ctrl) has changed its state and is now active"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:244
-msgctxt "Name"
-msgid "A modifier key has become inactive"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:319
-msgctxt "Comment"
-msgid ""
-"A modifier key (e.g. Shift or Ctrl) has changed its state and is now inactive"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:395
-msgctxt "Name"
-msgid "A modifier key has been locked"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:470
-msgctxt "Comment"
-msgid ""
-"A modifier key (e.g. Shift or Ctrl) has been locked and is now active for "
-"all of the following keypresses"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:545
-msgctxt "Name"
-msgid "A lock key has been activated"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:622
-msgctxt "Comment"
-msgid ""
-"A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now "
-"active"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:697
-msgctxt "Name"
-msgid "A lock key has been deactivated"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:773
-msgctxt "Comment"
-msgid ""
-"A lock key (e.g. Caps Lock or Num Lock) has changed its state and is now "
-"inactive"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:848
-msgctxt "Name"
-msgid "Sticky keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:922
-msgctxt "Comment"
-msgid "Sticky keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:1001
-msgctxt "Name"
-msgid "Slow keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:1074
-msgctxt "Comment"
-msgid "Slow keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:1152
-msgctxt "Name"
-msgid "Bounce keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:1225
-msgctxt "Comment"
-msgid "Bounce keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:1303
-msgctxt "Name"
-msgid "Mouse keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/access/kaccess.notifyrc:1377
-msgctxt "Comment"
-msgid "Mouse keys has been enabled or disabled"
-msgstr ""
-
-#: kcontrol/keys/schemes/kde3.kksrc:2
-msgctxt "Name"
-msgid "KDE Default for 3 Modifier Keys"
-msgstr "Rhagosodion KDE i 3 Bysell Addasu"
-
-#: kcontrol/keys/schemes/kde4.kksrc:2
-msgctxt "Name"
-msgid "KDE Default for 4 Modifier Keys"
-msgstr "Rhagosodion KDE i 4 Bysell Addasu"
-
-#: kcontrol/keys/schemes/mac4.kksrc:2
-msgctxt "Name"
-msgid "Mac Scheme"
-msgstr "Cynllun Mac"
-
-#: kcontrol/keys/schemes/unix3.kksrc:2
-msgctxt "Name"
-msgid "UNIX Scheme"
-msgstr "Cynllun UNIX"
-
-#: kcontrol/keys/schemes/win3.kksrc:2
-msgctxt "Name"
-msgid "Windows Scheme (Without Win Key)"
-msgstr "Cynllun Windows (Heb Allwedd Win)"
-
-#: kcontrol/keys/schemes/win4.kksrc:2
-msgctxt "Name"
-msgid "Windows Scheme (With Win Key)"
-msgstr "Cynllun Windows (Gyda'r Allwedd Win)"
-
-#: kcontrol/keys/schemes/wm3.kksrc:2
-msgctxt "Name"
-msgid "WindowMaker (3 Modifier Keys)"
-msgstr "WindowMaker (3 Bysell Addasu)"
-
-#: kcontrol/kdm/background/patterns/fish.desktop:2
-msgctxt "Comment"
-msgid "Fish Net"
-msgstr "Rhwyd Pysgod"
-
-#: kcontrol/kdm/background/patterns/flowers.desktop:2
-msgctxt "Comment"
-msgid "Flowers"
-msgstr "Blodau"
-
-#: kcontrol/kdm/background/patterns/night-rock.desktop:2
-msgctxt "Comment"
-msgid "Night Rock by Tigert"
-msgstr "Carreg Nos gan Tigert"
-
-#: kcontrol/kdm/background/patterns/pavement.desktop:2
-msgctxt "Comment"
-msgid "Pavement"
-msgstr "Palmant"
-
-#: kcontrol/kdm/background/patterns/rattan.desktop:2
-msgctxt "Comment"
-msgid "Rattan"
-msgstr "Rattan"
-
-#: kcontrol/kdm/background/patterns/stonewall2.desktop:2
-msgctxt "Comment"
-msgid "Stonewall 2 by Tigert"
-msgstr "Stonewall 2 gan Tigert"
-
-#: kcontrol/kdm/background/patterns/triangles.desktop:2
-msgctxt "Comment"
-msgid "Triangles"
-msgstr "Trionglau"
-
-#: kcontrol/kdm/background/programs/xearth.desktop:2
-msgctxt "Comment"
-msgid "XEarth by Kirk Johnson"
-msgstr "XEarth gan Kirk Johnson"
-
-#: kcontrol/kdm/background/programs/xglobe.desktop:2
-msgctxt "Comment"
-msgid "XGlobe by Thorsten Scheuermann"
-msgstr "XGlobe gan Thorsten Scheuermann"
-
-#: kcontrol/kdm/background/programs/xplanet.desktop:3
-msgctxt "Comment"
-msgid "XPlanet by Hari Nair"
-msgstr "XPlanet gan Hari Nair"
-
-#: kdm/kfrontend/sessions/9wm.desktop:5
-msgctxt "Name"
-msgid "9WM"
-msgstr "9WM"
-
-#: kdm/kfrontend/sessions/9wm.desktop:92
-msgctxt "Comment"
-msgid "An emulation of the Plan 9 window manager 8-1/2"
-msgstr "Efelychiad o 8-1/2, y trefnydd ffenestri Plan 9"
-
-#: kdm/kfrontend/sessions/aewm++.desktop:5
-msgctxt "Name"
-msgid "AEWM++"
-msgstr "AEWM++"
-
-#: kdm/kfrontend/sessions/aewm++.desktop:91
-msgctxt "Comment"
-msgid ""
-"A minimal window manager based on AEWM, enhanced by virtual desktops and "
-"partial GNOME support"
-msgstr ""
-"Trefnydd ffenestri lleiafol wed'i seilio ar AEWM, wedi'i wella gan "
-"penbyrddau rhith a cynhaliaeth Gnome rhannol."
-
-#: kdm/kfrontend/sessions/aewm.desktop:5
-msgctxt "Name"
-msgid "AEWM"
-msgstr "AEWM"
-
-#: kdm/kfrontend/sessions/aewm.desktop:91
-msgctxt "Comment"
-msgid "A minimalist window manager"
-msgstr "Trefnydd ffenestri lleiafol"
-
-#: kdm/kfrontend/sessions/afterstep.desktop:5
-msgctxt "Name"
-msgid "AfterStep"
-msgstr "AfterStep"
-
-#: kdm/kfrontend/sessions/afterstep.desktop:90
-msgctxt "Comment"
-msgid "A window manager with the NeXTStep look and feel, based on FVWM"
-msgstr ""
-"Trefnydd ffenestri efo golwg a theimlad CamNesaf (NeXTStep), wedi'i seilio "
-"ar FVWM"
-
-#: kdm/kfrontend/sessions/amaterus.desktop:5
-msgctxt "Name"
-msgid "AMATERUS"
-msgstr "AMATERUS"
-
-#: kdm/kfrontend/sessions/amaterus.desktop:90
-msgctxt "Comment"
-msgid "A GTK+ based window manager with a window grouping feature"
-msgstr ""
-"Trefnydd ffenestri wedi'i seilio ar GTK+, efo nodwedd casglu ffenestri"
-
-#: kdm/kfrontend/sessions/amiwm.desktop:5
-msgctxt "Name"
-msgid "AmiWM"
-msgstr "AmiWM"
-
-#: kdm/kfrontend/sessions/amiwm.desktop:90
-msgctxt "Comment"
-msgid "The Amiga look-alike window manager"
-msgstr "Trefnydd ffenestri sy'n edrych yn debyg i'r Amiga"
-
-#: kdm/kfrontend/sessions/asclassic.desktop:5
-msgctxt "Name"
-msgid "ASClassic"
-msgstr "ASClasurol"
-
-#: kdm/kfrontend/sessions/asclassic.desktop:90
-msgctxt "Comment"
-msgid "AfterStep Classic, a window manager based on AfterStep v1.1"
-msgstr "ÔlGam Clasurol, trefnydd ffenestri wedi'i seilio ar AfterStep v1.1"
-
-#: kdm/kfrontend/sessions/blackbox.desktop:5
-msgctxt "Name"
-msgid "Blackbox"
-msgstr "Du-flwch (Blackbox)"
-
-#: kdm/kfrontend/sessions/blackbox.desktop:90
-msgctxt "Comment"
-msgid "A fast & light window manager"
-msgstr "Trefnydd ffenestri cyflym ac ysgafn"
-
-#: kdm/kfrontend/sessions/cde.desktop:5 kstyles/themes/qtcde.themerc:2
-msgctxt "Name"
-msgid "CDE"
-msgstr "CDE"
-
-#: kdm/kfrontend/sessions/cde.desktop:93
-msgctxt "Comment"
-msgid ""
-"The Common Desktop Environment, a proprietary industry standard desktop "
-"environment"
-msgstr ""
-"Yr Amgylchedd Penbwrdd Cyffredin (Common Desktop Environment), amgylchedd "
-"penbwrdd perchnogol sy'n safonol yn y diwydiant"
-
-#: kdm/kfrontend/sessions/ctwm.desktop:5
-msgctxt "Name"
-msgid "CTWM"
-msgstr "CTWM"
-
-#: kdm/kfrontend/sessions/ctwm.desktop:90
-msgctxt "Comment"
-msgid "Claude's Tab Window Manager, TWM enhanced by virtual screens, etc."
-msgstr ""
-"Trefnydd Ffenestri Tab Claude, TWM wedi ei wella gan sgriniau rhith, ayyb."
-
-#: kdm/kfrontend/sessions/cwwm.desktop:5
-msgctxt "Name"
-msgid "CWWM"
-msgstr "CWWM"
-
-#: kdm/kfrontend/sessions/cwwm.desktop:90
-msgctxt "Comment"
-msgid ""
-"The ChezWam Window Manager, a minimalist window manager based on EvilWM"
-msgstr ""
-"Y Trefnydd Ffenestri ChezWam, trefnydd ffenestri lleiafol wedi'i seilio ar "
-"EvilWM"
-
-#: kdm/kfrontend/sessions/e16.desktop:5
-msgctxt "Name"
-msgid "Enlightenment DR16"
-msgstr ""
-
-#: kdm/kfrontend/sessions/e16.desktop:81
-#: kdm/kfrontend/sessions/enlightenment.desktop:90
-msgctxt "Comment"
-msgid "An extremely themable very feature-rich window manager"
-msgstr "Trefnydd ffenestri sy'n llawn o nodweddion, efo llawer o themau."
-
-#: kdm/kfrontend/sessions/enlightenment.desktop:5
-msgctxt "Name"
-msgid "Enlightenment"
-msgstr "Goleuni (Enlightenment)"
-
-#: kdm/kfrontend/sessions/evilwm.desktop:5
-msgctxt "Name"
-msgid "EvilWM"
-msgstr "EvilWM"
-
-#: kdm/kfrontend/sessions/evilwm.desktop:90
-msgctxt "Comment"
-msgid "A minimalist window manager based on AEWM"
-msgstr "Trefnydd ffenestri lleiafol wedi'i seilio ar AEM"
-
-#: kdm/kfrontend/sessions/fluxbox.desktop:5
-msgctxt "Name"
-msgid "Fluxbox"
-msgstr "Llif-flwch (Fluxbox)"
-
-#: kdm/kfrontend/sessions/fluxbox.desktop:90
-msgctxt "Comment"
-msgid ""
-"A highly configurable and low resource window manager based on Blackbox"
-msgstr ""
-"Trefnydd ffenestri hawdd ei ffurfweddu ac ysgafn ei ddefnydd adnoddau, "
-"wedi'i seilio ar Ddu-flwch (Blackbox)"
-
-#: kdm/kfrontend/sessions/flwm.desktop:5
-msgctxt "Name"
-msgid "FLWM"
-msgstr "FLWM"
-
-#: kdm/kfrontend/sessions/flwm.desktop:90
-msgctxt "Comment"
-msgid "The Fast Light Window Manager, based primarily on WM2"
-msgstr ""
-"Y Trefnydd Ffenestri Chwim ac Ysgafn, wedi'i seilio ar WM2 am y rhan fwyaf"
-
-#: kdm/kfrontend/sessions/fvwm.desktop:5
-msgctxt "Name"
-msgid "FVWM"
-msgstr "FVWM"
-
-#: kdm/kfrontend/sessions/fvwm.desktop:90
-msgctxt "Comment"
-msgid "A powerful ICCCM-compliant multiple virtual desktop window manager"
-msgstr ""
-"Trefnydd ffenestri pwerus efo penbyrddau rhith lluosol, sy'n cydymffurfio â "
-"ICCCM"
-
-#: kdm/kfrontend/sessions/fvwm95.desktop:5
-msgctxt "Name"
-msgid "FVWM95"
-msgstr "FVWM95"
-
-#: kdm/kfrontend/sessions/fvwm95.desktop:90
-msgctxt "Comment"
-msgid "A Windows 95 look-alike derivative of FVWM"
-msgstr "Deilliant o FVWM sy'n edrych yn debyg i Windows95"
-
-#: kdm/kfrontend/sessions/gnome.desktop:5
-msgctxt "Name"
-msgid "GNOME"
-msgstr "GNOME"
-
-#: kdm/kfrontend/sessions/gnome.desktop:91
-msgctxt "Comment"
-msgid ""
-"The GNU Network Object Model Environment. A complete, free and easy-to-use "
-"desktop environment"
-msgstr ""
-"Yr Amgylchedd Model Gwrthrych Rhwydwaith GNU (GNU Network Object Model "
-"Environment).  Amgylchedd penbwrdd cyflawn, rhydd, a hawdd ei ddefnyddio."
-
-#: kdm/kfrontend/sessions/golem.desktop:5
-msgctxt "Name"
-msgid "Golem"
-msgstr "Golem"
-
-#: kdm/kfrontend/sessions/golem.desktop:91
-msgctxt "Comment"
-msgid "A lightweight window manager"
-msgstr "Trefnydd ffenestri ysgafn"
-
-#: kdm/kfrontend/sessions/icewm.desktop:5
-msgctxt "Name"
-msgid "IceWM"
-msgstr "IceWM"
-
-#: kdm/kfrontend/sessions/icewm.desktop:91
-msgctxt "Comment"
-msgid "A Windows 95-OS/2-Motif-like window manager"
-msgstr "Trefnydd ffenestri sy'n debyg i Windows95-OS/2-Motif"
-
-#: kdm/kfrontend/sessions/ion.desktop:5
-msgctxt "Name"
-msgid "Ion"
-msgstr "Ion"
-
-#: kdm/kfrontend/sessions/ion.desktop:90
-msgctxt "Comment"
-msgid "A keyboard-friendly window manager with tiled windows, based on PWM"
-msgstr ""
-"Trefnydd ffenestri sy'n hawdd ei ddefnyddio o'r alweddell, efo ffenestri "
-"wedi'u teilio, wedi'i seilio ar PVM"
-
-#: kdm/kfrontend/sessions/larswm.desktop:5
-msgctxt "Name"
-msgid "LarsWM"
-msgstr "LarsWM"
-
-#: kdm/kfrontend/sessions/larswm.desktop:90
-msgctxt "Comment"
-msgid "The Lars Window Manager, based on 9WM, supports tiled windows"
-msgstr ""
-"Y Trefnydd Ffenestri Lars, wedi'i seilio ar 9WM, sy'n cynnal ffenestri "
-"wedi'u teilio"
-
-#: kdm/kfrontend/sessions/lwm.desktop:5
-msgctxt "Name"
-msgid "LWM"
-msgstr "LWM"
-
-#: kdm/kfrontend/sessions/lwm.desktop:90
-msgctxt "Comment"
-msgid ""
-"The Lightweight Window Manager. A non-configurable, bare window manager"
-msgstr ""
-"Y Trefnydd Ffenestri Ysgafn.  Trefnydd ffenestri noeth, na ellir ffurfweddu"
-
-#: kdm/kfrontend/sessions/matchbox.desktop:5
-msgctxt "Name"
-msgid "Matchbox"
-msgstr "Matchbox"
-
-#: kdm/kfrontend/sessions/matchbox.desktop:89
-msgctxt "Comment"
-msgid "A window manager for handheld devices"
-msgstr "Trefnydd ffenestri ar gyfer llawiaduron"
-
-#: kdm/kfrontend/sessions/metacity.desktop:5
-msgctxt "Name"
-msgid "Metacity"
-msgstr "Metacity"
-
-#: kdm/kfrontend/sessions/metacity.desktop:91
-msgctxt "Comment"
-msgid "A lightweight GTK2 based window manager"
-msgstr "Trefnydd ffenestri ysgafn, wedi'i seilio ar GTK2"
-
-#: kdm/kfrontend/sessions/mwm.desktop:5
-msgctxt "Name"
-msgid "MWM"
-msgstr "MWM"
-
-#: kdm/kfrontend/sessions/mwm.desktop:91
-msgctxt "Comment"
-msgid "The Motif Window Manager"
-msgstr "Y Trefnydd Ffenestri Motif"
-
-#: kdm/kfrontend/sessions/olvwm.desktop:5
-msgctxt "Name"
-msgid "OLVWM"
-msgstr "OLVWM"
-
-#: kdm/kfrontend/sessions/olvwm.desktop:91
-msgctxt "Comment"
-msgid ""
-"The OpenLook Virtual Window Manager. OLWM enhanced for handling of virtual "
-"desktops"
-msgstr ""
-"Y Trefnydd Ffenestri Rhith GolwgAgored (OpenLook).  OLWM wedi'i wella i "
-"gynnal penbyrddau rhith"
-
-#: kdm/kfrontend/sessions/olwm.desktop:5
-msgctxt "Name"
-msgid "OLWM"
-msgstr "OLWM"
-
-#: kdm/kfrontend/sessions/olwm.desktop:91
-msgctxt "Comment"
-msgid "The traditional Open Look Window Manager"
-msgstr "Y Trefnydd Ffenestri GolwgAgored (OpenLook) traddodiadol"
-
-#: kdm/kfrontend/sessions/openbox.desktop:5
-msgctxt "Name"
-msgid "Openbox"
-msgstr "Blwchagored (Openbox)"
-
-#: kdm/kfrontend/sessions/openbox.desktop:92
-msgctxt "Comment"
-msgid "A lightweight window manager based on Blackbox"
-msgstr "Trefnydd ffenestri ysgafn, wedi'i seilio ar Ddu-flwch"
-
-#: kdm/kfrontend/sessions/oroborus.desktop:5
-msgctxt "Name"
-msgid "Oroborus"
-msgstr "Oroborus"
-
-#: kdm/kfrontend/sessions/oroborus.desktop:90
-msgctxt "Comment"
-msgid "A lightweight themeable window manager"
-msgstr "Trefnydd ffenestri ysgafn sy'n defnyddio themau"
-
-#: kdm/kfrontend/sessions/phluid.desktop:5
-msgctxt "Name"
-msgid "Phluid"
-msgstr "Phluid"
-
-#: kdm/kfrontend/sessions/phluid.desktop:90
-msgctxt "Comment"
-msgid "An Imlib2 based window manager"
-msgstr "Trefnydd ffenestri wedi'i seilio ar lmlib2"
-
-#: kdm/kfrontend/sessions/pwm.desktop:5
-msgctxt "Name"
-msgid "PWM"
-msgstr "PWM"
-
-#: kdm/kfrontend/sessions/pwm.desktop:90
-msgctxt "Comment"
-msgid ""
-"A lightweight window manager able to attach multiple windows to one frame"
-msgstr ""
-"Trefnydd ffenestri ysgafn sy'n gallu atodi mwy nag un ffenestr at un ffrâm"
-
-#: kdm/kfrontend/sessions/qvwm.desktop:5
-msgctxt "Name"
-msgid "QVWM"
-msgstr "QVWM"
-
-#: kdm/kfrontend/sessions/qvwm.desktop:91
-msgctxt "Comment"
-msgid "A Windows 95 like window manager"
-msgstr "Trefnydd Ffenestri sy'n debyg i Windows95"
-
-#: kdm/kfrontend/sessions/ratpoison.desktop:5
-msgctxt "Name"
-msgid "Ratpoison"
-msgstr "Gwenwynllygodmawr (Ratpoison)"
-
-#: kdm/kfrontend/sessions/ratpoison.desktop:91
-msgctxt "Comment"
-msgid "A simple keyboard-only window manager modeled after Screen"
-msgstr ""
-"Trefnydd ffenestri syml sy'n defnyddio'r allweddell yn unig, wedi'i "
-"arddullio ar Sgrîn (Screen)"
-
-#: kdm/kfrontend/sessions/sapphire.desktop:5
-msgctxt "Name"
-msgid "Sapphire"
-msgstr "Sapphire"
-
-#: kdm/kfrontend/sessions/sapphire.desktop:91
-msgctxt "Comment"
-msgid "A minimal but configurable window manager"
-msgstr "Trefnydd ffenestri lleiafol a ffurfweddir"
-
-#: kdm/kfrontend/sessions/sawfish.desktop:5
-msgctxt "Name"
-msgid "Sawfish"
-msgstr "Sawfish"
-
-#: kdm/kfrontend/sessions/sawfish.desktop:91
-msgctxt "Comment"
-msgid ""
-"An extensible window manager scriptable with an Emacs Lisp-like language"
-msgstr ""
-"Trefnydd ffenestri estynadwy a all ei sgriptio efo iaith sy'n debyg i Emacs "
-"Lisp"
-
-#: kdm/kfrontend/sessions/twm.desktop:5
-msgctxt "Name"
-msgid "TWM"
-msgstr "TWM"
-
-#: kdm/kfrontend/sessions/twm.desktop:90
-msgctxt "Comment"
-msgid "The Tab Window Manager"
-msgstr "Y Trefnydd Ffenestri Tab"
-
-#: kdm/kfrontend/sessions/ude.desktop:5
-msgctxt "Name"
-msgid "UDE"
-msgstr "UDE"
-
-#: kdm/kfrontend/sessions/ude.desktop:90
-msgctxt "Comment"
-msgid "The UNIX Desktop Environment"
-msgstr "Yr Amgylchedd Penbwrdd UNIX"
-
-#: kdm/kfrontend/sessions/vtwm.desktop:5
-msgctxt "Name"
-msgid "VTWM"
-msgstr "VTWM"
-
-#: kdm/kfrontend/sessions/vtwm.desktop:91
-msgctxt "Comment"
-msgid "The Virtual Tab Window Manager. TWM enhanced by virtual screens, etc."
-msgstr ""
-"Y Trefnydd Ffenestri Tab Rhith.  TWM wedi'i wella gan sgriniau rhith, ayyb."
-
-#: kdm/kfrontend/sessions/w9wm.desktop:5
-msgctxt "Name"
-msgid "W9WM"
-msgstr "W9WM"
-
-#: kdm/kfrontend/sessions/w9wm.desktop:91
-msgctxt "Comment"
-msgid ""
-"A window manager based on 9WM, enhanced by virtual screens and keyboard "
-"bindings"
-msgstr ""
-"Trefnydd ffenestri wedi'i seilio ar 9WM, wedi'i wella gan sgriniau rhith a "
-"rhwymiadau bysyll."
-
-#: kdm/kfrontend/sessions/waimea.desktop:5
-msgctxt "Name"
-msgid "Waimea"
-msgstr "Waimea"
-
-#: kdm/kfrontend/sessions/waimea.desktop:90
-msgctxt "Comment"
-msgid "A highly customizable window manager based on Blackbox"
-msgstr ""
-"Trefnydd ffenestri sy'n hawdd ei ffurfweddu, wedi'i seilio ar Ddu-flwch"
-
-#: kdm/kfrontend/sessions/wm2.desktop:5
-msgctxt "Name"
-msgid "WM2"
-msgstr "WM2"
-
-#: kdm/kfrontend/sessions/wm2.desktop:91
-msgctxt "Comment"
-msgid "A small, non-configurable window manager"
-msgstr "Trefnydd ffenestri bach na ellir ffurfweddu"
-
-#: kdm/kfrontend/sessions/wmaker.desktop:5
-msgctxt "Name"
-msgid "WindowMaker"
-msgstr "GwneuthuryddFfenestri (WindowMaker)"
-
-#: kdm/kfrontend/sessions/wmaker.desktop:90
-msgctxt "Comment"
-msgid "A simple window manager that resembles the NeXTStep look very closely"
-msgstr "Trefnydd ffenestri syml sy'n debyg iawn i'r golwg CamNesaf"
-
-#: kdm/kfrontend/sessions/xfce.desktop:5
-msgctxt "Name"
-msgid "XFce"
-msgstr "XFce"
-
-#: kdm/kfrontend/sessions/xfce.desktop:91
-msgctxt "Comment"
-msgid ""
-"The Cholesterol Free Desktop Environment. A desktop environment reminiscent "
-"of CDE"
-msgstr ""
-"Yr Amgylchedd Penbwrdd Di-Golesterol.  Amgylchedd penbwrdd sy'n atgoffaol o "
-"CDE"
-
-#: kdm/kfrontend/sessions/xfce4.desktop:5
-msgctxt "Name"
-msgid "Xfce 4"
-msgstr ""
-
-#: kdm/kfrontend/sessions/xfce4.desktop:91
-msgctxt "Comment"
-msgid ""
-"The Cholesterol Free Desktop Environment, version 4. A desktop environment "
-"reminiscent of CDE"
-msgstr ""
-"Yr Amgylchedd Penbwrdd Di-Golesterol, fersiwn 4.  Amgylchedd penbwrdd sy'n "
-"atgoffaol o CDE"
-
-#: kdm/kfrontend/themes/circles/KdmGreeterTheme.desktop:6
-msgctxt "Name"
-msgid "Circles"
-msgstr "Cylchoedd"
-
-#: kdm/kfrontend/themes/circles/KdmGreeterTheme.desktop:92
-msgctxt "Description"
-msgid "Theme with blue circles"
-msgstr ""
-
-#: kdm/kfrontend/themes/horos/KdmGreeterTheme.desktop:6
-#: wallpapers/Horos/metadata.desktop:2
-msgctxt "Name"
-msgid "Horos"
-msgstr ""
-
-#: kdm/kfrontend/themes/oxygen-air/KdmGreeterTheme.desktop:6
-msgctxt "Name"
-msgid "Oxygen-Air"
-msgstr ""
-
-#: kdm/kfrontend/themes/oxygen/KdmGreeterTheme.desktop:6
-#: kstyles/oxygen/oxygen.themerc:2 kwin/clients/oxygen/oxygenclient.desktop:3
-msgctxt "Name"
-msgid "Oxygen"
-msgstr ""
-
-#: kdm/kfrontend/themes/oxygen/KdmGreeterTheme.desktop:89
-msgctxt "Description"
-msgid "Oxygen Theme"
-msgstr ""
-
-#: kcontrol/fonts/fonts.desktop:14 kcontrol/kfontinst/kio/fonts.desktop:5
-msgctxt "Name"
-msgid "Fonts"
-msgstr "Ffontiau"
-
-#: krunner/lock/kscreenlocker.notifyrc:3
-msgctxt "Comment"
-msgid "Screen Saver"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:59
-msgctxt "Name"
-msgid "Screen saver started"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:119
-msgctxt "Comment"
-msgid "The screen saver has been started"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:182
-msgctxt "Name"
-msgid "Screen locked"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:244
-msgctxt "Comment"
-msgid "The screen has been locked"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:309
-msgctxt "Name"
-msgid "Screen saver exited"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:368
-msgctxt "Comment"
-msgid "The screen saver has finished"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:431
-msgctxt "Name"
-msgid "Screen unlocked"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:494
-msgctxt "Comment"
-msgid "The screen has been unlocked"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:557
-msgctxt "Name"
-msgid "Screen unlock failed"
-msgstr ""
-
-#: krunner/lock/kscreenlocker.notifyrc:620
-msgctxt "Comment"
-msgid "Failed attempt to unlock the screen"
-msgstr ""
-
-#: kstyles/oxygen/oxygen.themerc:86
-#: kwin/clients/oxygen/oxygenclient.desktop:87
-msgctxt "Comment"
-msgid "Styling of the next generation desktop"
-msgstr ""
-
-#: kstyles/themes/qtcde.themerc:90
-msgctxt "Comment"
-msgid "Built-in unthemed CDE style"
-msgstr ""
-
-#: kstyles/themes/qtcleanlooks.themerc:2
-msgctxt "Name"
-msgid "Cleanlooks"
-msgstr ""
-
-#: kstyles/themes/qtcleanlooks.themerc:62
-msgctxt "Comment"
-msgid "Built-in unthemed style similar to Clearlooks from GNOME"
-msgstr ""
-
-#: kstyles/themes/qtgtk.themerc:2
-msgctxt "Name"
-msgid "GTK+ Style"
-msgstr ""
-
-#: kstyles/themes/qtgtk.themerc:65
-msgctxt "Comment"
-msgid "Style that uses the GTK+ theming engine"
-msgstr ""
-
-#: kstyles/themes/qtmotif.themerc:2
-msgctxt "Name"
-msgid "Motif"
-msgstr ""
-
-#: kstyles/themes/qtmotif.themerc:84
-msgctxt "Comment"
-msgid "Built-in unthemed Motif style"
-msgstr ""
-
-#: kstyles/themes/qtplastique.themerc:2
-msgctxt "Name"
-msgid "Plastique"
-msgstr ""
-
-#: kstyles/themes/qtplastique.themerc:65
-msgctxt "Comment"
-msgid "Built-in unthemed style similar to Plastik from KDE3"
-msgstr ""
-
-#: kstyles/themes/qtwindows.themerc:2
-msgctxt "Name"
-msgid "MS Windows 9x"
-msgstr ""
-
-#: kstyles/themes/qtwindows.themerc:85
-msgctxt "Comment"
-msgid "Built-in unthemed Windows 9x style"
-msgstr ""
-
-#: ksysguard/example/ksysguard.notifyrc:3
-msgctxt "Comment"
-msgid "System Monitor"
-msgstr ""
-
-#: ksysguard/example/ksysguard.notifyrc:59
-msgctxt "Name"
-msgid "Pattern Matched"
-msgstr ""
-
-#: ksysguard/example/ksysguard.notifyrc:135
-msgctxt "Comment"
-msgid "Search pattern matched"
-msgstr ""
-
-#: ksysguard/example/ksysguard.notifyrc:215
-msgctxt "Name"
-msgid "Sensor Alarm"
-msgstr ""
-
-#: ksysguard/example/ksysguard.notifyrc:291
-msgctxt "Comment"
-msgid "Sensor exceeded critical limit"
-msgstr "Aethpwyd dros gyfyngder critigol y synhwyrydd"
-
-#: libs/ksysguard/scripts/smaps/smaps.desktop:2
-msgctxt "Name"
-msgid "Detailed Memory Information"
-msgstr ""
-
-#: kwin/clients/aurorae/src/aurorae.desktop:2
-msgctxt "Name"
-msgid "Aurorae Decoration Theme Engine"
-msgstr ""
-
-#: kwin/clients/b2/b2.desktop:2
-msgctxt "Name"
-msgid "B II"
-msgstr "B II"
-
-#: kwin/kwin.notifyrc:3
-msgctxt "Comment"
-msgid "KWin Window Manager"
-msgstr ""
-
-#: kwin/kwin.notifyrc:58
-msgctxt "Name"
-msgid "Change to Desktop 1"
-msgstr "Newid i Penbwrdd 1"
-
-#: kwin/kwin.notifyrc:142
-msgctxt "Comment"
-msgid "Virtual desktop one is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:227
-msgctxt "Name"
-msgid "Change to Desktop 2"
-msgstr "Newid i Penbwrdd 2"
-
-#: kwin/kwin.notifyrc:311
-msgctxt "Comment"
-msgid "Virtual desktop two is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:397
-msgctxt "Name"
-msgid "Change to Desktop 3"
-msgstr "Newid i Penbwrdd 3"
-
-#: kwin/kwin.notifyrc:481
-msgctxt "Comment"
-msgid "Virtual desktop three is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:567
-msgctxt "Name"
-msgid "Change to Desktop 4"
-msgstr "Newid i Penbwrdd 4"
-
-#: kwin/kwin.notifyrc:651
-msgctxt "Comment"
-msgid "Virtual desktop four is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:736
-msgctxt "Name"
-msgid "Change to Desktop 5"
-msgstr "Newid i Penbwrdd 5"
-
-#: kwin/kwin.notifyrc:820
-msgctxt "Comment"
-msgid "Virtual desktop five is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:906
-msgctxt "Name"
-msgid "Change to Desktop 6"
-msgstr "Newid i Penbwrdd 6"
-
-#: kwin/kwin.notifyrc:990
-msgctxt "Comment"
-msgid "Virtual desktop six is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1074
-msgctxt "Name"
-msgid "Change to Desktop 7"
-msgstr "Newid i Penbwrdd 7"
-
-#: kwin/kwin.notifyrc:1158
-msgctxt "Comment"
-msgid "Virtual desktop seven is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1244
-msgctxt "Name"
-msgid "Change to Desktop 8"
-msgstr "Newid i Penbwrdd 8"
-
-#: kwin/kwin.notifyrc:1328
-msgctxt "Comment"
-msgid "Virtual desktop eight is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1414
-msgctxt "Name"
-msgid "Change to Desktop 9"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1496
-msgctxt "Comment"
-msgid "Virtual desktop nine is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1580
-msgctxt "Name"
-msgid "Change to Desktop 10"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1662
-msgctxt "Comment"
-msgid "Virtual desktop ten is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1746
-msgctxt "Name"
-msgid "Change to Desktop 11"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1828
-msgctxt "Comment"
-msgid "Virtual desktop eleven is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1911
-msgctxt "Name"
-msgid "Change to Desktop 12"
-msgstr ""
-
-#: kwin/kwin.notifyrc:1993
-msgctxt "Comment"
-msgid "Virtual desktop twelve is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2076
-msgctxt "Name"
-msgid "Change to Desktop 13"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2158
-msgctxt "Comment"
-msgid "Virtual desktop thirteen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2242
-msgctxt "Name"
-msgid "Change to Desktop 14"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2324
-msgctxt "Comment"
-msgid "Virtual desktop fourteen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2407
-msgctxt "Name"
-msgid "Change to Desktop 15"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2489
-msgctxt "Comment"
-msgid "Virtual desktop fifteen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2573
-msgctxt "Name"
-msgid "Change to Desktop 16"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2655
-msgctxt "Comment"
-msgid "Virtual desktop sixteen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2739
-msgctxt "Name"
-msgid "Change to Desktop 17"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2821
-msgctxt "Comment"
-msgid "Virtual desktop seventeen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2904
-msgctxt "Name"
-msgid "Change to Desktop 18"
-msgstr ""
-
-#: kwin/kwin.notifyrc:2986
-msgctxt "Comment"
-msgid "Virtual desktop eighteen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3070
-msgctxt "Name"
-msgid "Change to Desktop 19"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3152
-msgctxt "Comment"
-msgid "Virtual desktop nineteen is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3236
-msgctxt "Name"
-msgid "Change to Desktop 20"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3318
-msgctxt "Comment"
-msgid "Virtual desktop twenty is selected"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3402
-msgctxt "Name"
-msgid "Activate Window"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3482
-msgctxt "Comment"
-msgid "Another window is activated"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3562
-msgctxt "Name"
-msgid "New Window"
-msgstr "Ffenestr Newydd"
-
-#: kwin/kwin.notifyrc:3650
-msgctxt "Comment"
-msgid "New window"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3736
-msgctxt "Name"
-msgid "Delete Window"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3815
-msgctxt "Comment"
-msgid "Delete window"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3899
-msgctxt "Name"
-msgid "Window Close"
-msgstr ""
-
-#: kwin/kwin.notifyrc:3980
-msgctxt "Comment"
-msgid "A window closes"
-msgstr ""
-
-#: kwin/kwin.notifyrc:4066
-msgctxt "Name"
-msgid "Window Shade Up"
-msgstr "Rholio'r Ffenestr i Fyny"
-
-#: kwin/kwin.notifyrc:4142
-msgctxt "Comment"
-msgid "A window is shaded up"
-msgstr ""
-
-#: kwin/kwin.notifyrc:4220
-msgctxt "Name"
-msgid "Window Shade Down"
-msgstr "Rholio'r Ffenestr i Lawr"
-
-#: kwin/kwin.notifyrc:4295
-msgctxt "Comment"
-msgid "A window is shaded down"
-msgstr ""
-
-#: kwin/kwin.notifyrc:4371
-msgctxt "Name"
-msgid "Window Minimize"
-msgstr "Lleihau Ffenestr"
-
-#: kwin/kwin.notifyrc:4450
-msgctxt "Comment"
-msgid "A window is minimized"
-msgstr ""
-
-#: kwin/kwin.notifyrc:4533
-msgctxt "Name"
-msgid "Window Unminimize"
-msgstr "Dad-leihau Ffenestr"
-
-#: kwin/kwin.notifyrc:4608
-msgctxt "Comment"
-msgid "A Window is restored"
-msgstr ""
-
-#: kwin/kwin.notifyrc:4690
-msgctxt "Name"
-msgid "Window Maximize"
-msgstr "Ehangu Ffenestr"
-
-#: kwin/kwin.notifyrc:4770
-msgctxt "Comment"
-msgid "A window is maximized"
-msgstr ""
-
-#: kwin/kwin.notifyrc:4853
-msgctxt "Name"
-msgid "Window Unmaximize"
-msgstr "Dad_ehangu Ffenestr"
-
-#: kwin/kwin.notifyrc:4931
-msgctxt "Comment"
-msgid "A window loses maximization"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5010
-msgctxt "Name"
-msgid "Window on All Desktops"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5086
-msgctxt "Comment"
-msgid "A window is made visible on all desktops"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5168
-msgctxt "Name"
-msgid "Window Not on All Desktops"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5242
-msgctxt "Comment"
-msgid "A Window is no longer visible on all desktops"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5322
-msgctxt "Name"
-msgid "New Dialog"
-msgstr "Ymgom Newydd"
-
-#: kwin/kwin.notifyrc:5406
-msgctxt "Comment"
-msgid "Transient window (a dialog) appears"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5481
-msgctxt "Name"
-msgid "Delete Dialog"
-msgstr "Dileu Ymgom"
-
-#: kwin/kwin.notifyrc:5563
-msgctxt "Comment"
-msgid "Transient window (a dialog) is removed"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5639
-msgctxt "Name"
-msgid "Window Move Start"
-msgstr "Cychwyn Symud y Ffenestr"
-
-#: kwin/kwin.notifyrc:5717
-msgctxt "Comment"
-msgid "A window has begun moving"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5794
-msgctxt "Name"
-msgid "Window Move End"
-msgstr "Gorffen Symud y Ffenestr"
-
-#: kwin/kwin.notifyrc:5872
-msgctxt "Comment"
-msgid "A window has completed its moving"
-msgstr ""
-
-#: kwin/kwin.notifyrc:5949
-msgctxt "Name"
-msgid "Window Resize Start"
-msgstr "Cychwyn Newid Maint y Ffenestr"
-
-#: kwin/kwin.notifyrc:6027
-msgctxt "Comment"
-msgid "A window has begun resizing"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6104
-msgctxt "Name"
-msgid "Window Resize End"
-msgstr "Gorffen Newid Maint y Ffenestr"
-
-#: kwin/kwin.notifyrc:6182
-msgctxt "Comment"
-msgid "A window has finished resizing"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6259
-msgctxt "Name"
-msgid "Window on Current Desktop Demands Attention"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6328
-msgctxt "Comment"
-msgid "A window on the current virtual desktop demands attention"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6401
-msgctxt "Name"
-msgid "Window on Other Desktop Demands Attention"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6470
-msgctxt "Comment"
-msgid "A window on an inactive virtual desktop demands attention"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6540
-msgctxt "Name"
-msgid "Compositing Performance Is Slow"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6602
-msgctxt "Comment"
-msgid ""
-"The compositing performance was too slow and compositing has been suspended"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6666
-msgctxt "Name"
-msgid "Compositing has been suspended"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6725
-msgctxt "Comment"
-msgid "Another application has requested to suspend compositing."
-msgstr ""
-
-#: kwin/kwin.notifyrc:6784
-msgctxt "Name"
-msgid "Effects not supported"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6846
-msgctxt "Comment"
-msgid "Some effects are not supported by backend or hardware."
-msgstr ""
-
-#: kwin/kwin.notifyrc:6906
-msgctxt "Name"
-msgid "Tiling Enabled"
-msgstr ""
-
-#: kwin/kwin.notifyrc:6953
-msgctxt "Comment"
-msgid "Tiling mode has been enabled"
-msgstr ""
-
-#: kwin/kwin.notifyrc:7001
-msgctxt "Name"
-msgid "Tiling Disabled"
-msgstr ""
-
-#: kwin/kwin.notifyrc:7048
-msgctxt "Comment"
-msgid "Tiling mode has been disabled"
-msgstr ""
-
-#: kwin/kwin.notifyrc:7096
-msgctxt "Name"
-msgid "Tiling Layout Changed"
-msgstr ""
-
-#: kwin/kwin.notifyrc:7141
-msgctxt "Comment"
-msgid "Tiling Layout has been changed"
-msgstr ""
-
-#: kwin/clients/laptop/laptop.desktop:2
-msgctxt "Name"
-msgid "Laptop"
-msgstr "Gluniadur"
-
-#: kwin/clients/plastik/plastik.desktop:3
-msgctxt "Name"
-msgid "Plastik"
-msgstr "Plastik"
-
-#: kwin/clients/tabstrip/tabstrip.desktop:2
-msgctxt "Name"
-msgid "Tabstrip"
-msgstr ""
-
-#: kwrited/kwrited.notifyrc:3
-msgctxt "Comment"
-msgid "Local system message service"
-msgstr ""
-
-#: kwrited/kwrited.notifyrc:54
-msgctxt "Name"
-msgid "New message received"
-msgstr ""
-
-#: kwrited/kwrited.notifyrc:122
-msgctxt "Comment"
-msgid "The daemon received a new message sent with wall(1) or write(1)"
-msgstr ""
-
-#: plasma/desktop/shell/data/plasma-desktop.notifyrc:3
-msgctxt "Comment"
-msgid "Plasma Desktop Shell"
-msgstr ""
-
-#: kcontrol/workspaceoptions/workspaceoptions.desktop:13
-#: plasma/desktop/shell/data/plasma-desktop.notifyrc:62
-msgctxt "Name"
-msgid "Workspace"
-msgstr ""
-
-#: plasma/desktop/shell/data/plasma-desktop.notifyrc:125
-msgctxt "Name"
-msgid "New widget published"
-msgstr ""
-
-#: plasma/desktop/shell/data/plasma-desktop.notifyrc:180
-msgctxt "Comment"
-msgid "A new widget has become available on the network."
-msgstr ""
-
-#: plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultPage/metadata.desktop:3
-#: plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop:3
-msgctxt "Name"
-msgid "Page one"
-msgstr ""
-
-#: plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultPage/metadata.desktop:54
-#: plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop:54
-msgctxt "Comment"
-msgid "Default Netbook Page"
-msgstr ""
-
-#: plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultPanel/metadata.desktop:3
-#: plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultPanel.desktop:3
-msgctxt "Name"
-msgid "Default Netbook Panel"
-msgstr ""
-
-#: plasma/netbook/shell/data/layouts/org.kde.plasma-netbook.defaultSal/metadata.desktop:3
-#: plasma/netbook/shell/data/layouts/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop:3
-msgctxt "Name"
-msgid "Search and launch"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:2
-msgctxt "Name"
-msgid "KDE Power Management System"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:49
-msgctxt "Comment"
-msgid "Notifications for KDE Power Management system"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:284
-msgctxt "Name"
-msgid "Notification"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:366
-msgctxt "Comment"
-msgid "Used for standard notifications"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:438
-msgctxt "Name"
-msgid "Critical notification"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:510
-msgctxt "Comment"
-msgid "Notifies a critical event"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:583
-msgctxt "Name"
-msgid "Low Battery"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:653
-msgctxt "Comment"
-msgid "Your battery has reached low level"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:731
-msgctxt "Name"
-msgid "Battery at warning level"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:803
-msgctxt "Comment"
-msgid "Your battery has reached warning level"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:881
-msgctxt "Name"
-msgid "Battery at critical level"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:953
-msgctxt "Comment"
-msgid ""
-"Your battery has reached critical level. This notification triggers a "
-"countdown before doing the configured action, hence it is strongly advised "
-"to leave that on."
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1023
-msgctxt "Name"
-msgid "AC adaptor plugged in"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1095
-msgctxt "Comment"
-msgid "The power adaptor has been plugged in"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1173
-msgctxt "Name"
-msgid "AC adaptor unplugged"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1245
-msgctxt "Comment"
-msgid "The power adaptor has been unplugged"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1323
-msgctxt "Name"
-msgid "Job error"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1395
-msgctxt "Comment"
-msgid "There was an error while performing a job"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1469
-msgctxt "Name"
-msgid "Profile Changed"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1541
-msgctxt "Comment"
-msgid "The profile was changed"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1618
-msgctxt "Name"
-msgid "Performing a suspension job"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1686
-msgctxt "Comment"
-msgid ""
-"This notification is displayed when a suspension job is about to be done, "
-"and it triggers a countdown. Hence, it is strongly advised to leave it on."
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1742
-msgctxt "Name"
-msgid "Internal KDE Power Management System Error"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1787
-msgctxt "Comment"
-msgid "The KDE Power Management System has triggered an internal error"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1893
-msgctxt "Name"
-msgid "Suspension inhibited"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1958
-msgctxt "Comment"
-msgid "The suspension has been inhibited because an application requested it"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:1971
-msgctxt "Name"
-msgid "Broken battery notification"
-msgstr ""
-
-#: powerdevil/powerdevil.notifyrc:2013
-msgctxt "Comment"
-msgid ""
-"This notification will pop up if KDE Power Management System detects some "
-"troubles with one of your batteries"
-msgstr ""
-
-#: plasma/generic/applets/devicenotifier/test-predicate-openinwindow.desktop:7
-msgctxt "Name"
-msgid "Open with File Manager"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AcAdapter.desktop:2
-#: solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop:136
-msgctxt "Name"
-msgid "Plugged"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AcAdapter.desktop:70
-#: solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop:337
-#: solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop:336
-#: solid/solid-actions-kcm/device-actions/solid-device-Block.desktop:200
-#: solid/solid-actions-kcm/device-actions/solid-device-Button.desktop:199
-#: solid/solid-actions-kcm/device-actions/solid-device-Camera.desktop:138
-#: solid/solid-actions-kcm/device-actions/solid-device-DvbInterface.desktop:268
-#: solid/solid-actions-kcm/device-actions/solid-device-NetworkInterface.desktop:271
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:807
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:607
-#: solid/solid-actions-kcm/device-actions/solid-device-PortableMediaPlayer.desktop:138
-#: solid/solid-actions-kcm/device-actions/solid-device-Processor.desktop:266
-#: solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop:201
-#: solid/solid-actions-kcm/device-actions/solid-device-SmartCardReader.desktop:69
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageAccess.desktop:136
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop:336
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:405
-#: solid/solid-actions-kcm/device-actions/solid-device-Video.desktop:71
-msgctxt "Name"
-msgid "Solid Device"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop:2
-#: solid/solid-actions-kcm/device-actions/solid-device-DvbInterface.desktop:200
-msgctxt "Name"
-msgid "Device Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop:69
-msgctxt "Name"
-msgid "Driver"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop:137
-#: solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop:2
-msgctxt "Name"
-msgid "Driver Handle"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop:201
-msgctxt "Name"
-msgid "Name"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-AudioInterface.desktop:268
-msgctxt "Name"
-msgid "Soundcard Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop:2
-msgctxt "Name"
-msgid "Charge Percent"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop:69
-msgctxt "Name"
-msgid "Charge State"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop:203
-msgctxt "Name"
-msgid "Rechargeable"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Battery.desktop:267
-#: solid/solid-actions-kcm/device-actions/solid-device-Button.desktop:130
-msgctxt "Name"
-msgid "Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Block.desktop:2
-#: solid/solid-actions-kcm/device-actions/solid-device-DvbInterface.desktop:2
-msgctxt "Name"
-msgid "Device"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Block.desktop:69
-msgctxt "Name"
-msgid "Major"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Block.desktop:134
-msgctxt "Name"
-msgid "Minor"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Button.desktop:2
-msgctxt "Name"
-msgid "Has State"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Button.desktop:67
-msgctxt "Name"
-msgid "State Value"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Camera.desktop:2
-#: solid/solid-actions-kcm/device-actions/solid-device-PortableMediaPlayer.desktop:2
-#: solid/solid-actions-kcm/device-actions/solid-device-Video.desktop:2
-msgctxt "Name"
-msgid "Supported Drivers"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Camera.desktop:70
-#: solid/solid-actions-kcm/device-actions/solid-device-PortableMediaPlayer.desktop:70
-msgctxt "Name"
-msgid "Supported Protocols"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-DvbInterface.desktop:69
-msgctxt "Name"
-msgid "Device Adapter"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-DvbInterface.desktop:135
-msgctxt "Name"
-msgid "Device Index"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-NetworkInterface.desktop:2
-msgctxt "Name"
-msgid "Hw Address"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-NetworkInterface.desktop:70
-msgctxt "Name"
-msgid "Iface Name"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-NetworkInterface.desktop:135
-msgctxt "Name"
-msgid "Mac Address"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-NetworkInterface.desktop:203
-msgctxt "Name"
-msgid "Wireless"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:2
-msgctxt "Name"
-msgid "Appendable"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:68
-msgctxt "Name"
-msgid "Available Content"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:135
-msgctxt "Name"
-msgid "Blank"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:202
-msgctxt "Name"
-msgid "Capacity"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:269
-msgctxt "Name"
-msgid "Disc Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:337
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:2
-msgctxt "Name"
-msgid "Fs Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:405
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:70
-msgctxt "Name"
-msgid "Ignored"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:471
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:136
-msgctxt "Name"
-msgid "Label"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:538
-msgctxt "Name"
-msgid "Rewritable"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:605
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:335
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop:268
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:203
-msgctxt "Name"
-msgid "Size"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:672
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:270
-msgctxt "Name"
-msgid "Usage"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDisc.desktop:739
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageVolume.desktop:337
-msgctxt "Name"
-msgid "Uuid"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:2
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop:2
-msgctxt "Name"
-msgid "Bus"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:69
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop:69
-msgctxt "Name"
-msgid "Drive Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:137
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop:137
-msgctxt "Name"
-msgid "Hotpluggable"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:200
-msgctxt "Name"
-msgid "Read Speed"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:267
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageDrive.desktop:200
-msgctxt "Name"
-msgid "Removable"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:402
-msgctxt "Name"
-msgid "Supported Media"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:470
-msgctxt "Name"
-msgid "Write Speed"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-OpticalDrive.desktop:538
-msgctxt "Name"
-msgid "Write Speeds"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Processor.desktop:2
-msgctxt "Name"
-msgid "Can Change Frequency"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Processor.desktop:67
-msgctxt "Name"
-msgid "Instruction Sets"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Processor.desktop:132
-msgctxt "Name"
-msgid "Max Speed"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-Processor.desktop:198
-msgctxt "Name"
-msgid "Number"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop:66
-msgctxt "Name"
-msgid "Port"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-SerialInterface.desktop:132
-msgctxt "Name"
-msgid "Serial Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-SmartCardReader.desktop:2
-msgctxt "Name"
-msgid "Reader Type"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageAccess.desktop:2
-msgctxt "Name"
-msgid "Accessible"
-msgstr ""
-
-#: solid/solid-actions-kcm/device-actions/solid-device-StorageAccess.desktop:69
-msgctxt "Name"
-msgid "File Path"
-msgstr ""
-
-#: kscreensaver/kblank_screensaver/kblank.desktop:7
-msgctxt "Name"
-msgid "Blank Screen"
-msgstr "Sgrîn Gwag"
-
-#: kscreensaver/kblank_screensaver/kblank.desktop:97
-#: kscreensaver/krandom_screensaver/krandom.desktop:98
-msgctxt "Name"
-msgid "Setup..."
-msgstr "Gosod..."
-
-#: kscreensaver/kblank_screensaver/kblank.desktop:188
-#: kscreensaver/krandom_screensaver/krandom.desktop:189
-msgctxt "Name"
-msgid "Display in Specified Window"
-msgstr "Dangos mewn Ffenestr Benodol"
-
-#: kscreensaver/kblank_screensaver/kblank.desktop:277
-#: kscreensaver/krandom_screensaver/krandom.desktop:278
-msgctxt "Name"
-msgid "Display in Root Window"
-msgstr "Dangos mewn Ffenestr Wraidd"
-
-#: kscreensaver/krandom_screensaver/krandom.desktop:7
-msgctxt "Name"
-msgid "Random"
-msgstr "Ar Hap"
-
-#: kcontrol/kfontinst/apps/installfont.desktop:7
-msgctxt "Name"
-msgid "Install..."
-msgstr ""
-
-#: kcontrol/autostart/autostart.desktop:13
-msgctxt "Name"
-msgid "Autostart"
-msgstr "Hunan-gychwyn"
-
-#: kcontrol/autostart/autostart.desktop:100
-msgctxt "Comment"
-msgid "A configuration tool for managing which programs start up."
-msgstr ""
-
-#: kcontrol/bell/bell.desktop:16
-msgctxt "Name"
-msgid "System Bell"
-msgstr "Cloch Cysawd"
-
-#: kcontrol/bell/bell.desktop:105
-msgctxt "Comment"
-msgid "System Bell Configuration"
-msgstr "Gosodiadau'r Cloch Cysawd"
-
-#: kcontrol/dateandtime/clock.desktop:15
-msgctxt "Name"
-msgid "Date & Time"
-msgstr "Dyddiad ac Amser"
-
-#: kcontrol/dateandtime/clock.desktop:105
-msgctxt "Comment"
-msgid "Date and time settings"
-msgstr "Gosodiadau dyddiad ac amser"
-
-#: kcontrol/colors/colors.desktop:14
-msgctxt "Name"
-msgid "Colors"
-msgstr "Lliwiau"
-
-#: kcontrol/colors/colors.desktop:104
-msgctxt "Comment"
-msgid "Color settings"
-msgstr "Gosodiadau lliwiau"
-
-#: kcontrol/input/cursortheme.desktop:12
-msgctxt "Name"
-msgid "Cursor Theme"
-msgstr ""
-
-#: kcontrol/input/cursortheme.desktop:63
-msgctxt "Comment"
-msgid "Customize the mouse cursor appearance"
-msgstr ""
-
-#: kwin/kcmkwin/kwindesktop/desktop.desktop:14
-msgctxt "Name"
-msgid "Virtual Desktops"
-msgstr "Penbyrddau Rhith"
-
-#: kwin/kcmkwin/kwindesktop/desktop.desktop:67
-msgctxt "Comment"
-msgid "You can configure how many virtual desktops there are."
-msgstr "Gallwch ffurfweddu faint o benbyrddau sydd ar gael"
-
-#: kcontrol/desktoppaths/desktoppath.desktop:14
-msgctxt "Name"
-msgid "Paths"
-msgstr "Llwybrau"
-
-#: kcontrol/desktoppaths/desktoppath.desktop:105
-msgctxt "Comment"
-msgid "Change the location important files are stored"
-msgstr "Newid lle mae ffeiliau pwysig yn cael eu cadw"
-
-#: kcontrol/desktoptheme/desktoptheme.desktop:12
-msgctxt "Name"
-msgid "Desktop Theme"
-msgstr ""
-
-#: kcontrol/desktoptheme/desktoptheme.desktop:66
-msgctxt "Comment"
-msgid "Customize the desktop theme"
-msgstr ""
-
-#: kinfocenter/Categories/deviceinfocategory.desktop:7
-msgctxt "Name"
-msgid "Lost And Found"
-msgstr ""
-
-#: kinfocenter/Modules/devinfo/devinfo.desktop:13
-msgctxt "Name"
-msgid "Device Viewer"
-msgstr ""
-
-#: kinfocenter/Modules/devinfo/devinfo.desktop:67
-msgctxt "Comment"
-msgid "Device Viewer"
-msgstr ""
-
-#: kcontrol/hardware/display/display.desktop:10
-msgctxt "Name"
-msgid "Display"
-msgstr "Arddangos"
-
-#: kcontrol/hardware/display/display.desktop:98
-#: systemsettings/categories/settings-display.desktop:59
-msgctxt "Comment"
-msgid "Display Settings"
-msgstr "Gosodiadau Arddangos"
-
-#: kinfocenter/Modules/info/dma.desktop:14
-msgctxt "Name"
-msgid "DMA-Channels"
-msgstr "Sianeli DMA"
-
-#: kinfocenter/Modules/info/dma.desktop:104
-msgctxt "Comment"
-msgid "DMA information"
-msgstr "Gwybodaeth DMA"
-
-#: kcontrol/kfontinst/dbus/fontinst.actions:2
-#: kcontrol/kfontinst/kcmfontinst/fontinst.desktop:11
-msgctxt "Name"
-msgid "Font Installer"
-msgstr "Gosodydd Ffontiau"
-
-#: kcontrol/kfontinst/kcmfontinst/fontinst.desktop:101
-msgctxt "Comment"
-msgid "Install, manage, and preview fonts"
-msgstr ""
-
-#: kcontrol/fonts/fonts.desktop:104
-msgctxt "Comment"
-msgid "Font settings"
-msgstr "Gosodiadau Ffontiau"
-
-#: kcontrol/kfontinst/thumbnail/fontthumbnail.desktop:3
-msgctxt "Name"
-msgid "Font Files"
-msgstr "Ffeiliau Ffont"
-
-#: kinfocenter/Categories/graphicalinfocategory.desktop:7
-msgctxt "Name"
-msgid "Graphical Information"
-msgstr ""
-
-#: kinfocenter/Modules/info/interrupts.desktop:14
-msgctxt "Name"
-msgid "Interrupts"
-msgstr "Ymyriadau"
-
-#: kinfocenter/Modules/info/interrupts.desktop:104
-msgctxt "Comment"
-msgid "Interrupt information"
-msgstr "Gwybodaeth Ymyriadau"
-
-#: plasma/generic/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop:2
-msgctxt "Name"
-msgid "BBC Weather from UK MET Office"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop:74
-msgctxt "Comment"
-msgid "XML Data from the UK MET Office"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/ion-debianweather.desktop:2
-#: plasma/generic/dataengines/weather/ions/debianweather/ion-debianweather.desktop:2
-msgctxt "Name"
-msgid "Debian Weather Service"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/ion-debianweather.desktop:49
-#: plasma/generic/dataengines/weather/ions/debianweather/ion-debianweather.desktop:49
-msgctxt "Comment"
-msgid "XML Data from edos.debian.net"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/envcan/ion-envcan.desktop:2
-msgctxt "Name"
-msgid "Environment Canada"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/envcan/ion-envcan.desktop:72
-msgctxt "Comment"
-msgid "XML Data from Environment Canada"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/noaa/ion-noaa.desktop:2
-msgctxt "Name"
-msgid "NOAA's National Weather Service"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/noaa/ion-noaa.desktop:71
-msgctxt "Comment"
-msgid "XML Data from NOAA's National Weather Service"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/wetter.com/ion-wettercom.desktop:2
-msgctxt "Name"
-msgid "wetter.com"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/ions/wetter.com/ion-wettercom.desktop:62
-msgctxt "Comment"
-msgid "Weather forecast by wetter.com"
-msgstr ""
-
-#: kinfocenter/Modules/info/ioports.desktop:14
-msgctxt "Name"
-msgid "IO-Ports"
-msgstr "Pyrth-IO"
-
-#: kinfocenter/Modules/info/ioports.desktop:104
-msgctxt "Comment"
-msgid "IO-port information"
-msgstr "Gwybodaeth Porth-IO"
-
-#: kcontrol/hardware/joystick/joystick.desktop:17
-msgctxt "Comment"
-msgid "Joystick settings"
-msgstr ""
-
-#: kcontrol/hardware/joystick/joystick.desktop:134
-msgctxt "Name"
-msgid "Joystick"
-msgstr "Ffôn reoli"
-
-#: kcontrol/access/kaccess.desktop:3
-msgctxt "Name"
-msgid "KDE Accessibility Tool"
-msgstr "Erfyn Hygyrchedd KDE"
-
-#: kinfocenter/Modules/infosummary/kcm_infosummary.desktop:11
-msgctxt "Name"
-msgid "Summary"
-msgstr ""
-
-#: kinfocenter/Modules/infosummary/kcm_infosummary.desktop:67
-msgctxt "Comment"
-msgid "Hardware Information Summary"
-msgstr ""
-
-#: kcontrol/keyboard/kcm_keyboard.desktop:18
-msgctxt "Name"
-msgid "Keyboard"
-msgstr "Bysellfwrdd"
-
-#: kcontrol/keyboard/kcm_keyboard.desktop:107
-msgctxt "Comment"
-msgid "Keyboard settings"
-msgstr "Gosodiadau Bysellfwrdd"
-
-#: kinfocenter/Modules/memory/kcm_memory.desktop:12
-msgctxt "Name"
-msgid "Memory"
-msgstr "Cof"
-
-#: kinfocenter/Modules/memory/kcm_memory.desktop:103
-msgctxt "Comment"
-msgid "Memory information"
-msgstr "Gwybodaeth Cof"
-
-#: solid/kcm/kcm_solid.desktop:12
-msgctxt "Name"
-msgid "Information Sources"
-msgstr ""
-
-#: solid/kcm/kcm_solid.desktop:65
-msgctxt "Comment"
-msgid "Hardware Integration Configuration with Solid"
-msgstr ""
-
-#: kcontrol/access/kcmaccess.desktop:14
-#: systemsettings/categories/settings-accessibility.desktop:8
-msgctxt "Name"
-msgid "Accessibility"
-msgstr "Hygyrchedd"
-
-#: kcontrol/access/kcmaccess.desktop:105
-msgctxt "Comment"
-msgid "Improve accessibility for disabled persons"
-msgstr "Gwella hygyrchedd i bobl anabl"
-
-#: kcontrol/launch/kcmlaunch.desktop:14
-msgctxt "Name"
-msgid "Launch Feedback"
-msgstr "Adborth wrth Gychwyn"
-
-#: kcontrol/launch/kcmlaunch.desktop:99
-msgctxt "Comment"
-msgid "Choose application-launch feedback style"
-msgstr "Dewis arddull adborth wrth gychwyn rhaglen"
-
-#: ksmserver/kcm/kcmsmserver.desktop:13
-msgctxt "Name"
-msgid "Session Management"
-msgstr ""
-
-#: ksmserver/kcm/kcmsmserver.desktop:67
-msgctxt "Comment"
-msgid "Configure the session manager and logout settings"
-msgstr "Ffurfweddu'r rheolydd sesiwn a gosodiadau allgofnodi"
-
-#: kinfocenter/Modules/usbview/kcmusb.desktop:12
-msgctxt "Name"
-msgid "USB Devices"
-msgstr "Dyfeisiau USB"
-
-#: kinfocenter/Modules/usbview/kcmusb.desktop:102
-msgctxt "Comment"
-msgid "USB devices attached to this computer"
-msgstr ""
-
-#: kinfocenter/Modules/view1394/kcmview1394.desktop:12
-msgctxt "Name"
-msgid "IEEE 1394 Devices"
-msgstr "Dyfeisiau IEE 1394"
-
-#: kinfocenter/Modules/view1394/kcmview1394.desktop:101
-msgctxt "Comment"
-msgid "Attached IEEE 1394 devices"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.desktop:2
-msgctxt "Name"
-msgid "Free Space Notifier"
-msgstr ""
-
-#: freespacenotifier/freespacenotifier.desktop:54
-msgctxt "Comment"
-msgid "Warns when running out of space on your home folder"
-msgstr ""
-
-#: libs/kephal/service/kephal.desktop:10
-msgctxt "Name"
-msgid "Display Management"
-msgstr ""
-
-#: libs/kephal/service/kephal.desktop:60
-msgctxt "Comment"
-msgid "Manages displays and video outputs"
-msgstr ""
-
-#: kcontrol/keyboard/keyboard.desktop:12
-msgctxt "Name"
-msgid "Keyboard Daemon"
-msgstr ""
-
-#: khotkeys/app/khotkeys.desktop:3
-msgctxt "Name"
-msgid "Input Actions"
-msgstr ""
-
-#: khotkeys/app/khotkeys.desktop:86
-msgctxt "Comment"
-msgid "Input Actions service performing configured actions on key presses"
-msgstr ""
-
-#: kwrited/kwrited.desktop:2
-msgctxt "Name"
-msgid "Write Daemon"
-msgstr ""
-
-#: kwrited/kwrited-autostart.desktop:89 kwrited/kwrited.desktop:54
-msgctxt "Comment"
-msgid "Watch for messages from local users sent with write(1) or wall(1)"
-msgstr ""
-"Gwylio am negeseuon oddiwrth defnyddwyr lleol a anfonwyd efo write(1) neu "
-"wall(1)"
-
-#: powerdevil/daemon/powerdevil.desktop:11
-#: powerdevil/kcmodule/powerdevilconfig.desktop:13
-msgctxt "Name"
-msgid "Power Management"
-msgstr ""
-
-#: powerdevil/daemon/powerdevil.desktop:85
-msgctxt "Comment"
-msgid "Battery, Display and CPU power management and notification"
-msgstr ""
-
-#: kcontrol/randr/module/randrmonitor.desktop:2
-msgctxt "Name"
-msgid "Display Management change monitor"
-msgstr ""
-
-#: statusnotifierwatcher/statusnotifierwatcher.desktop:3
-msgctxt "Name"
-msgid "Status Notifier Manager"
-msgstr ""
-
-#: statusnotifierwatcher/statusnotifierwatcher.desktop:54
-msgctxt "Comment"
-msgid "Manages services that provide status notifier user interfaces"
-msgstr ""
-
-#: kcontrol/kdm/kdm.desktop:13
-msgctxt "Name"
-msgid "Login Screen"
-msgstr ""
-
-#: kcontrol/kdm/kdm.desktop:66
-msgctxt "Comment"
-msgid "Configure the login manager (KDM)"
-msgstr "Ffurfweddu y rheolydd mewngofnodi (KDM)"
-
-#: kcontrol/keys/keys.desktop:15
-msgctxt "Name"
-msgid "Global Keyboard Shortcuts"
-msgstr ""
-
-#: kcontrol/keys/keys.desktop:91
-msgctxt "Comment"
-msgid "Configuration of keybindings"
-msgstr "Furfweddiad o rwymiadau  bysell"
-
-#: kcontrol/kfontinst/viewpart/kfontviewpart.desktop:2
-msgctxt "Name"
-msgid "Font Viewer"
-msgstr "Gwelydd Ffont"
-
-#: khotkeys/kcm_hotkeys/khotkeys.desktop:12
-msgctxt "Name"
-msgid "Custom Shortcuts"
-msgstr ""
-
-#: khotkeys/kcm_hotkeys/khotkeys.desktop:64
-msgctxt "Comment"
-msgid "Configure Input Actions settings"
-msgstr ""
-
-#: ksplash/kcm/ksplashthememgr.desktop:15
-msgctxt "Name"
-msgid "Splash Screen"
-msgstr "Sgrîn Croeso"
-
-#: ksplash/kcm/ksplashthememgr.desktop:99
-msgctxt "Comment"
-msgid "Manager for Splash Screen Themes"
-msgstr "Rheolydd Themau Sgriniau Croeso"
-
-#: kwin/effects/blur/blur.desktop:2 kwin/effects/blur/blur_config.desktop:9
-msgctxt "Name"
-msgid "Blur"
-msgstr ""
-
-#: kwin/effects/blur/blur.desktop:82
-msgctxt "Comment"
-msgid "Blurs the background behind semi-transparent windows"
-msgstr ""
-
-#: kwin/effects/boxswitch/boxswitch.desktop:2
-#: kwin/effects/boxswitch/boxswitch_config.desktop:9
-msgctxt "Name"
-msgid "Box Switch"
-msgstr ""
-
-#: kwin/effects/boxswitch/boxswitch.desktop:76
-msgctxt "Comment"
-msgid "Display thumbnails of windows in the alt+tab window switcher"
-msgstr ""
-
-#: kwin/effects/coverswitch/coverswitch.desktop:2
-#: kwin/effects/coverswitch/coverswitch_config.desktop:9
-msgctxt "Name"
-msgid "Cover Switch"
-msgstr ""
-
-#: kwin/effects/coverswitch/coverswitch.desktop:68
-msgctxt "Comment"
-msgid "Display a Cover Flow effect for the alt+tab window switcher"
-msgstr ""
-
-#: kwin/effects/cube/cube.desktop:2 kwin/effects/cube/cube_config.desktop:9
-msgctxt "Name"
-msgid "Desktop Cube"
-msgstr ""
-
-#: kwin/effects/cube/cube.desktop:76
-msgctxt "Comment"
-msgid "Display each virtual desktop on a side of a cube"
-msgstr ""
-
-#: kwin/effects/cube/cubeslide.desktop:2
-#: kwin/effects/cube/cubeslide_config.desktop:9
-msgctxt "Name"
-msgid "Desktop Cube Animation"
-msgstr ""
-
-#: kwin/effects/cube/cubeslide.desktop:66
-msgctxt "Comment"
-msgid "Animate desktop switching with a cube"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop:2
-msgctxt "Name"
-msgid "Dashboard"
-msgstr ""
-
-#: kwin/effects/dashboard/dashboard.desktop:76
-msgctxt "Comment"
-msgid "Desaturate the desktop when displaying the Plasma dashboard"
-msgstr ""
-
-#: kwin/effects/desktopgrid/desktopgrid.desktop:2
-#: kwin/effects/desktopgrid/desktopgrid_config.desktop:9
-msgctxt "Name"
-msgid "Desktop Grid"
-msgstr ""
-
-#: kwin/effects/desktopgrid/desktopgrid.desktop:79
-msgctxt "Comment"
-msgid "Zoom out so all desktops are displayed side-by-side in a grid"
-msgstr ""
-
-#: kwin/effects/dialogparent/dialogparent.desktop:2
-msgctxt "Name"
-msgid "Dialog Parent"
-msgstr ""
-
-#: kwin/effects/dialogparent/dialogparent.desktop:76
-msgctxt "Comment"
-msgid "Darkens the parent window of the currently active dialog"
-msgstr ""
-
-#: kwin/effects/diminactive/diminactive.desktop:2
-#: kwin/effects/diminactive/diminactive_config.desktop:9
-msgctxt "Name"
-msgid "Dim Inactive"
-msgstr ""
-
-#: kwin/effects/diminactive/diminactive.desktop:75
-msgctxt "Comment"
-msgid "Darken inactive windows"
-msgstr ""
-
-#: kwin/effects/dimscreen/dimscreen.desktop:2
-msgctxt "Name"
-msgid "Dim Screen for Administrator Mode"
-msgstr ""
-
-#: kwin/effects/dimscreen/dimscreen.desktop:70
-msgctxt "Comment"
-msgid "Darkens the entire screen when requesting root privileges"
-msgstr ""
-
-#: kwin/effects/explosion/explosion.desktop:2
-msgctxt "Name"
-msgid "Explosion"
-msgstr ""
-
-#: kwin/effects/explosion/explosion.desktop:81
-msgctxt "Comment"
-msgid "Make windows explode when they are closed"
-msgstr ""
-
-#: kwin/effects/fade/fade.desktop:2
-msgctxt "Name"
-msgid "Fade"
-msgstr ""
-
-#: kwin/effects/fade/fade.desktop:80
-msgctxt "Comment"
-msgid "Make windows smoothly fade in and out when they are shown or hidden"
-msgstr ""
-
-#: kwin/effects/fadedesktop/fadedesktop.desktop:2
-msgctxt "Name"
-msgid "Fade Desktop"
-msgstr ""
-
-#: kwin/effects/fadedesktop/fadedesktop.desktop:64
-msgctxt "Comment"
-msgid "Fade between virtual desktops when switching between them"
-msgstr ""
-
-#: kwin/effects/fallapart/fallapart.desktop:2
-msgctxt "Name"
-msgid "Fall Apart"
-msgstr ""
-
-#: kwin/effects/fallapart/fallapart.desktop:75
-msgctxt "Comment"
-msgid "Closed windows fall into pieces"
-msgstr ""
-
-#: kwin/effects/flipswitch/flipswitch.desktop:2
-#: kwin/effects/flipswitch/flipswitch_config.desktop:9
-msgctxt "Name"
-msgid "Flip Switch"
-msgstr ""
-
-#: kwin/effects/flipswitch/flipswitch.desktop:68
-msgctxt "Comment"
-msgid ""
-"Flip through windows that are in a stack for the alt+tab window switcher"
-msgstr ""
-
-#: kwin/effects/glide/glide.desktop:2
-#: kwin/effects/glide/glide_config.desktop:9
-msgctxt "Name"
-msgid "Glide"
-msgstr ""
-
-#: kwin/effects/glide/glide.desktop:51
-msgctxt "Comment"
-msgid "Windows Glide Effect as they are open and closed"
-msgstr ""
-
-#: kwin/effects/highlightwindow/highlightwindow.desktop:2
-msgctxt "Name"
-msgid "Highlight Window"
-msgstr ""
-
-#: kwin/effects/highlightwindow/highlightwindow.desktop:67
-msgctxt "Comment"
-msgid "Highlight the appropriate window when hovering over taskbar entries"
-msgstr ""
-
-#: kwin/effects/invert/invert.desktop:2
-#: kwin/effects/invert/invert_config.desktop:9
-msgctxt "Name"
-msgid "Invert"
-msgstr ""
-
-#: kwin/effects/invert/invert.desktop:81
-msgctxt "Comment"
-msgid "Inverts the color of the desktop and windows"
-msgstr ""
-
-#: kwin/effects/login/login.desktop:2
-msgctxt "Name"
-msgid "Login"
-msgstr ""
-
-#: kwin/effects/login/login.desktop:85
-msgctxt "Comment"
-msgid "Smoothly fade to the desktop when logging in"
-msgstr ""
-
-#: kwin/effects/logout/logout.desktop:2
-msgctxt "Name"
-msgid "Logout"
-msgstr ""
-
-#: kwin/effects/logout/logout.desktop:85
-msgctxt "Comment"
-msgid "Desaturate the desktop when displaying the logout dialog"
-msgstr ""
-
-#: kwin/effects/lookingglass/lookingglass.desktop:2
-#: kwin/effects/lookingglass/lookingglass_config.desktop:9
-msgctxt "Name"
-msgid "Looking Glass"
-msgstr ""
-
-#: kwin/effects/lookingglass/lookingglass.desktop:75
-msgctxt "Comment"
-msgid "A screen magnifier that looks like a fisheye lens"
-msgstr ""
-
-#: kwin/effects/magiclamp/magiclamp.desktop:2
-#: kwin/effects/magiclamp/magiclamp_config.desktop:9
-msgctxt "Name"
-msgid "Magic Lamp"
-msgstr ""
-
-#: kwin/effects/magiclamp/magiclamp.desktop:71
-msgctxt "Comment"
-msgid "Simulate a magic lamp when minimizing windows"
-msgstr ""
-
-#: kwin/effects/magnifier/magnifier.desktop:2
-#: kwin/effects/magnifier/magnifier_config.desktop:9
-msgctxt "Name"
-msgid "Magnifier"
-msgstr ""
-
-#: kwin/effects/magnifier/magnifier.desktop:84
-msgctxt "Comment"
-msgid "Magnify the section of the screen that is near the mouse cursor"
-msgstr ""
-
-#: kwin/effects/minimizeanimation/minimizeanimation.desktop:2
-msgctxt "Name"
-msgid "Minimize Animation"
-msgstr ""
-
-#: kwin/effects/minimizeanimation/minimizeanimation.desktop:79
-msgctxt "Comment"
-msgid "Animate the minimizing of windows"
-msgstr ""
-
-#: kwin/effects/mousemark/mousemark.desktop:2
-#: kwin/effects/mousemark/mousemark_config.desktop:9
-msgctxt "Name"
-msgid "Mouse Mark"
-msgstr ""
-
-#: kwin/effects/mousemark/mousemark.desktop:79
-msgctxt "Comment"
-msgid "Allows you to draw lines on the desktop"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/kwin/outline.desktop:2
-#: kwin/effects/outline/outline.desktop:2
-msgctxt "Name"
-msgid "Outline"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/kwin/outline.desktop:46
-#: kwin/effects/outline/outline.desktop:46
-msgctxt "Comment"
-msgid "Helper effect to render an outline"
-msgstr ""
-
-#: kwin/effects/presentwindows/presentwindows.desktop:2
-#: kwin/effects/presentwindows/presentwindows_config.desktop:9
-msgctxt "Name"
-msgid "Present Windows"
-msgstr ""
-
-#: kwin/effects/presentwindows/presentwindows.desktop:79
-msgctxt "Comment"
-msgid "Zoom out until all opened windows can be displayed side-by-side"
-msgstr ""
-
-#: kwin/effects/resize/resize.desktop:2
-msgctxt "Name"
-msgid "Resize Window"
-msgstr ""
-
-#: kwin/effects/resize/resize.desktop:69
-msgctxt "Comment"
-msgid ""
-"Resizes windows with a fast texture scale instead of updating contents"
-msgstr ""
-
-#: kwin/effects/scalein/scalein.desktop:2
-msgctxt "Name"
-msgid "Scale In"
-msgstr ""
-
-#: kwin/effects/scalein/scalein.desktop:77
-msgctxt "Comment"
-msgid "Animate the appearing of windows"
-msgstr ""
-
-#: kwin/effects/screenshot/screenshot.desktop:2
-msgctxt "Name"
-msgid "Screenshot"
-msgstr ""
-
-#: kwin/effects/screenshot/screenshot.desktop:56
-msgctxt "Comment"
-msgid "Saves screenshot of active window into the home directory"
-msgstr ""
-
-#: kwin/effects/sheet/sheet.desktop:2
-msgctxt "Name"
-msgid "Sheet"
-msgstr ""
-
-#: kwin/effects/sheet/sheet.desktop:67
-msgctxt "Comment"
-msgid ""
-"Make modal dialogs smoothly fly in and out when they are shown or hidden"
-msgstr ""
-
-#: kwin/effects/showfps/showfps.desktop:2
-#: kwin/effects/showfps/showfps_config.desktop:9
-msgctxt "Name"
-msgid "Show FPS"
-msgstr ""
-
-#: kwin/effects/showfps/showfps.desktop:80
-msgctxt "Comment"
-msgid "Display KWin's performance in the corner of the screen"
-msgstr ""
-
-#: kwin/effects/showpaint/showpaint.desktop:2
-msgctxt "Name"
-msgid "Show Paint"
-msgstr ""
-
-#: kwin/effects/showpaint/showpaint.desktop:76
-msgctxt "Comment"
-msgid "Highlight areas of the desktop that have been recently updated"
-msgstr ""
-
-#: kwin/effects/slide/slide.desktop:2
-msgctxt "Name"
-msgid "Slide"
-msgstr ""
-
-#: kwin/effects/slide/slide.desktop:69
-msgctxt "Comment"
-msgid "Slide windows across the screen when switching virtual desktops"
-msgstr ""
-
-#: kwin/effects/slideback/slideback.desktop:2
-msgctxt "Name"
-msgid "Slide Back"
-msgstr ""
-
-#: kwin/effects/slideback/slideback.desktop:66
-msgctxt "Comment"
-msgid "Slide back windows losing focus"
-msgstr ""
-
-#: kwin/effects/slidingpopups/slidingpopups.desktop:2
-msgctxt "Name"
-msgid "Sliding popups"
-msgstr ""
-
-#: kwin/effects/slidingpopups/slidingpopups.desktop:57
-msgctxt "Comment"
-msgid "Sliding animation for Plasma popups"
-msgstr ""
-
-#: kwin/effects/snaphelper/snaphelper.desktop:2
-msgctxt "Name"
-msgid "Snap Helper"
-msgstr ""
-
-#: kwin/effects/snaphelper/snaphelper.desktop:66
-msgctxt "Comment"
-msgid "Help you locate the center of the screen when moving a window."
-msgstr ""
-
-#: kwin/effects/startupfeedback/startupfeedback.desktop:2
-msgctxt "Name"
-msgid "Startup Feedback"
-msgstr ""
-
-#: kwin/effects/startupfeedback/startupfeedback.desktop:50
-msgctxt "Comment"
-msgid "Helper effect for startup feedback"
-msgstr ""
-
-#: kwin/effects/taskbarthumbnail/taskbarthumbnail.desktop:2
-msgctxt "Name"
-msgid "Taskbar Thumbnails"
-msgstr ""
-
-#: kwin/effects/taskbarthumbnail/taskbarthumbnail.desktop:75
-msgctxt "Comment"
-msgid "Display window thumbnails when hovering over taskbar entries"
-msgstr ""
-
-#: kwin/effects/thumbnailaside/thumbnailaside.desktop:2
-#: kwin/effects/thumbnailaside/thumbnailaside_config.desktop:9
-msgctxt "Name"
-msgid "Thumbnail Aside"
-msgstr ""
-
-#: kwin/effects/thumbnailaside/thumbnailaside.desktop:77
-msgctxt "Comment"
-msgid "Display window thumbnails on the edge of the screen"
-msgstr ""
-
-#: kwin/effects/trackmouse/trackmouse.desktop:2
-#: kwin/effects/trackmouse/trackmouse_config.desktop:9
-msgctxt "Name"
-msgid "Track Mouse"
-msgstr ""
-
-#: kwin/effects/trackmouse/trackmouse.desktop:80
-msgctxt "Comment"
-msgid "Display a mouse cursor locating effect when activated"
-msgstr ""
-
-#: kwin/effects/translucency/translucency.desktop:2
-#: kwin/effects/translucency/translucency_config.desktop:9
-msgctxt "Name"
-msgid "Translucency"
-msgstr ""
-
-#: kwin/effects/translucency/translucency.desktop:82
-msgctxt "Comment"
-msgid "Make windows translucent under different conditions"
-msgstr ""
-
-#: kwin/effects/windowgeometry/windowgeometry.desktop:3
-#: kwin/effects/windowgeometry/windowgeometry_config.desktop:9
-msgctxt "Name"
-msgid "WindowGeometry"
-msgstr ""
-
-#: kwin/effects/windowgeometry/windowgeometry.desktop:49
-msgctxt "Comment"
-msgid "Display window geometries on move/resize"
-msgstr ""
-
-#: kwin/effects/wobblywindows/wobblywindows.desktop:2
-#: kwin/effects/wobblywindows/wobblywindows_config.desktop:9
-msgctxt "Name"
-msgid "Wobbly Windows"
-msgstr ""
-
-#: kwin/effects/wobblywindows/wobblywindows.desktop:72
-msgctxt "Comment"
-msgid "Deform windows while they are moving"
-msgstr ""
-
-#: kwin/effects/zoom/zoom.desktop:2 kwin/effects/zoom/zoom_config.desktop:9
-msgctxt "Name"
-msgid "Zoom"
-msgstr ""
-
-#: kwin/effects/zoom/zoom.desktop:86
-msgctxt "Comment"
-msgid "Magnify the entire desktop"
-msgstr ""
-
-#: kwin/kcmkwin/kwinoptions/kwinactions.desktop:12
-msgctxt "Name"
-msgid "Actions"
-msgstr "Gweithredoedd"
-
-#: kwin/kcmkwin/kwinoptions/kwinactions.desktop:100
-msgctxt "Comment"
-msgid "Configure keyboard and mouse settings"
-msgstr "Ffurfweddu gosodiadau bysellfwrdd a llygoden"
-
-#: kwin/kcmkwin/kwinoptions/kwinadvanced.desktop:11
-msgctxt "Name"
-msgid "Advanced"
-msgstr "Uwch"
-
-#: kwin/kcmkwin/kwinoptions/kwinadvanced.desktop:99
-msgctxt "Comment"
-msgid "Configure advanced window management features"
-msgstr "Ffurfweddu Nodweddion Uwch Trefnu Ffenestri"
-
-#: kwin/kcmkwin/kwincompositing/kwincompositing.desktop:14
-msgctxt "Name"
-msgid "Desktop Effects"
-msgstr ""
-
-#: kwin/kcmkwin/kwincompositing/kwincompositing.desktop:96
-msgctxt "Comment"
-msgid "Configure desktop effects"
-msgstr ""
-
-#: kwin/kcmkwin/kwindecoration/kwindecoration.desktop:14
-msgctxt "Name"
-msgid "Window Decorations"
-msgstr ""
-
-#: kwin/kcmkwin/kwindecoration/kwindecoration.desktop:65
-msgctxt "Comment"
-msgid "Configure the look and feel of window titles"
-msgstr "Ffurfweddu golwg a theimlad teitlau ffenestri"
-
-#: kwin/kcmkwin/kwinoptions/kwinfocus.desktop:11
-msgctxt "Name"
-msgid "Focus"
-msgstr "Canolbwynt"
-
-#: kwin/kcmkwin/kwinoptions/kwinfocus.desktop:97
-msgctxt "Comment"
-msgid "Configure the window focus policy"
-msgstr "Ffurfweddu'r polisi canolbyntio ffenestri"
-
-#: kwin/kcmkwin/kwinoptions/kwinmoving.desktop:12
-msgctxt "Name"
-msgid "Moving"
-msgstr "Symud"
-
-#: kwin/kcmkwin/kwinoptions/kwinmoving.desktop:98
-msgctxt "Comment"
-msgid "Configure the way that windows are moved"
-msgstr "Ffurfweddu'r ffordd y symudir ffenestri"
-
-#: kwin/kcmkwin/kwinoptions/kwinoptions.desktop:15
-#: systemsettings/categories/settings-window-behaviour.desktop:8
-msgctxt "Name"
-msgid "Window Behavior"
-msgstr "Ymddygiad Ffenestri"
-
-#: kwin/kcmkwin/kwinoptions/kwinoptions.desktop:101
-msgctxt "Comment"
-msgid "Configure the window behavior"
-msgstr "Ffurfweddu ymddygiad y ffenestr"
-
-#: kwin/kcmkwin/kwinrules/kwinrules.desktop:14
-msgctxt "Name"
-msgid "Window Rules"
-msgstr ""
-
-#: kwin/kcmkwin/kwinrules/kwinrules.desktop:67
-msgctxt "Comment"
-msgid "Configure settings specifically for a window"
-msgstr "Ffurfweddu gosodiadau yn benodol ar gyfer ffenestr"
-
-#: kwin/kcmkwin/kwinscreenedges/kwinscreenedges.desktop:14
-msgctxt "Name"
-msgid "Screen Edges"
-msgstr ""
-
-#: kwin/kcmkwin/kwinscreenedges/kwinscreenedges.desktop:79
-msgctxt "Comment"
-msgid "Configure active screen edges"
-msgstr ""
-
-#: kwin/kcmkwin/kwintabbox/kwintabbox.desktop:13
-msgctxt "Name"
-msgid "Task Switcher"
-msgstr ""
-
-#: kwin/kcmkwin/kwintabbox/kwintabbox.desktop:68
-msgctxt "Comment"
-msgid "Configure the behavior for navigating through windows"
-msgstr ""
-
-#: kinfocenter/Categories/lostfoundcategory.desktop:7
-#: plasma/generic/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop:2
-msgctxt "Name"
-msgid "Device Information"
-msgstr ""
-
-#: kcontrol/input/mouse.desktop:15
-msgctxt "Name"
-msgid "Mouse"
-msgstr "Llygoden"
-
-#: kcontrol/input/mouse.desktop:105
-msgctxt "Comment"
-msgid "Mouse settings"
-msgstr "Gosodiadau Llygoden"
-
-#: kinfocenter/Categories/networkinfocategory.desktop:7
-msgctxt "Name"
-msgid "Network Information"
-msgstr ""
-
-#: kinfocenter/Modules/nics/nic.desktop:12
-msgctxt "Name"
-msgid "Network Interfaces"
-msgstr "Rhyngwynebau Rhwydwaith"
-
-#: kinfocenter/Modules/nics/nic.desktop:101
-#: plasma/generic/dataengines/network/plasma-dataengine-network.desktop:75
-msgctxt "Comment"
-msgid "Network interface information"
-msgstr "Gwybodaeth rhyngwynebau rhwydwaith"
-
-#: kinfocenter/Modules/opengl/opengl.desktop:12
-msgctxt "Name"
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: kinfocenter/Modules/opengl/opengl.desktop:101
-msgctxt "Comment"
-msgid "OpenGL information"
-msgstr ""
-
-#: plasma/generic/animators/default/plasma-animator-default.desktop:2
-msgctxt "Name"
-msgid "Default Plasma Animator"
-msgstr ""
-
-#: plasma/generic/applets/activitybar/plasma-applet-activitybar.desktop:2
-msgctxt "Name"
-msgid "Activity Bar"
-msgstr ""
-
-#: plasma/generic/applets/activitybar/plasma-applet-activitybar.desktop:71
-msgctxt "Comment"
-msgid "Tab bar to switch activities"
-msgstr ""
-
-#: plasma/generic/applets/analog-clock/plasma-applet-analogclock.desktop:2
-msgctxt "Name"
-msgid "Analog Clock"
-msgstr ""
-
-#: plasma/generic/applets/analog-clock/plasma-applet-analogclock.desktop:84
-msgctxt "Comment"
-msgid "A clock with hands"
-msgstr ""
-
-#: plasma/generic/applets/calendar/plasma-applet-calendar.desktop:2
-#: plasma/generic/dataengines/calendar/plasma-dataengine-calendar.desktop:2
-msgctxt "Name"
-msgid "Calendar"
-msgstr ""
-
-#: plasma/generic/applets/calendar/plasma-applet-calendar.desktop:74
-msgctxt "Comment"
-msgid "View and pick dates from the calendar"
-msgstr ""
-
-#: plasma/generic/applets/devicenotifier/plasma-applet-devicenotifier.desktop:2
-msgctxt "Name"
-msgid "Device Notifier"
-msgstr ""
-
-#: plasma/generic/applets/devicenotifier/plasma-applet-devicenotifier.desktop:73
-msgctxt "Comment"
-msgid "Notifications and access for new devices"
-msgstr ""
-
-#: plasma/generic/applets/digital-clock/plasma-applet-digitalclock.desktop:2
-msgctxt "Name"
-msgid "Digital Clock"
-msgstr ""
-
-#: plasma/generic/applets/digital-clock/plasma-applet-digitalclock.desktop:85
-msgctxt "Comment"
-msgid "Time displayed in a digital format"
-msgstr ""
-
-#: plasma/generic/applets/icon/plasma-applet-icon.desktop:2
-msgctxt "Name"
-msgid "Icon"
-msgstr ""
-
-#: plasma/generic/applets/icon/plasma-applet-icon.desktop:83
-msgctxt "Comment"
-msgid "A generic icon"
-msgstr ""
-
-#: plasma/desktop/applets/kickoff/applet/plasma-applet-launcher.desktop:2
-#: plasma/generic/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop:2
-msgctxt "Name"
-msgid "Application Launcher"
-msgstr ""
-
-#: plasma/desktop/applets/kickoff/applet/plasma-applet-launcher.desktop:83
-msgctxt "Comment"
-msgid "Launcher to start applications"
-msgstr ""
-
-#: plasma/generic/applets/lock_logout/plasma-applet-lockout.desktop:2
-msgctxt "Name"
-msgid "Lock/Logout"
-msgstr ""
-
-#: plasma/generic/applets/lock_logout/plasma-applet-lockout.desktop:81
-msgctxt "Comment"
-msgid "Lock the screen or log out"
-msgstr ""
-
-#: plasma/generic/applets/notifications/plasma-applet-notifications.desktop:2
-msgctxt "Name"
-msgid "Notifications"
-msgstr ""
-
-#: plasma/generic/applets/notifications/plasma-applet-notifications.desktop:85
-msgctxt "Comment"
-msgid "Display notifications and jobs"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/plasma-applet-org.kde.showActivityManager.desktop:2
-#: debian/tmp/usr/share/kde4/services/plasma-runner-activityrunner.desktop:2
-#: plasma/desktop/applets/showActivityManager/plasma-applet-org.kde.showActivityManager.desktop:2
-#: plasma/generic/runners/activities/plasma-runner-activityrunner.desktop:2
-msgctxt "Name"
-msgid "Activities"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/plasma-applet-org.kde.showActivityManager.desktop:50
-#: plasma/desktop/applets/showActivityManager/plasma-applet-org.kde.showActivityManager.desktop:50
-msgctxt "Comment"
-msgid "Shows the activity manager"
-msgstr ""
-
-#: plasma/generic/applets/panelspacer/plasma-applet-panelspacer-internal.desktop:2
-msgctxt "Name"
-msgid "Panel Spacer"
-msgstr ""
-
-#: plasma/generic/applets/panelspacer/plasma-applet-panelspacer-internal.desktop:61
-msgctxt "Comment"
-msgid "Reserve empty spaces within the panel."
-msgstr ""
-
-#: plasma/generic/applets/quicklaunch/plasma-applet-quicklaunch.desktop:2
-msgctxt "Name"
-msgid "Quicklaunch"
-msgstr ""
-
-#: plasma/generic/applets/quicklaunch/plasma-applet-quicklaunch.desktop:70
-msgctxt "Comment"
-msgid "Launch your favourite Applications"
-msgstr ""
-
-#: plasma/netbook/applets/searchbox/plasma-applet-searchbox.desktop:2
-msgctxt "Name"
-msgid "Search Box"
-msgstr ""
-
-#: plasma/netbook/applets/searchbox/plasma-applet-searchbox.desktop:64
-msgctxt "Comment"
-msgid "Search Box for a given RunnerManager"
-msgstr ""
-
-#: plasma/desktop/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop:2
-msgctxt "Name"
-msgid "Application Launcher Menu"
-msgstr ""
-
-#: plasma/desktop/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop:75
-msgctxt "Comment"
-msgid "Traditional menu based application launcher"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_cpu.desktop:3
-msgctxt "Name"
-msgid "CPU Monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_cpu.desktop:56
-msgctxt "Comment"
-msgid "A CPU usage monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_hdd.desktop:3
-msgctxt "Name"
-msgid "Hard Disk Status"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_hdd.desktop:56
-msgctxt "Comment"
-msgid "A hard disk usage monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_hwinfo.desktop:3
-msgctxt "Name"
-msgid "Hardware Info"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_hwinfo.desktop:56
-msgctxt "Comment"
-msgid "Show hardware info"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_net.desktop:3
-msgctxt "Name"
-msgid "Network Monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_net.desktop:58
-msgctxt "Comment"
-msgid "A network usage monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_ram.desktop:3
-msgctxt "Name"
-msgid "Memory Status"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_ram.desktop:56
-msgctxt "Comment"
-msgid "A RAM usage monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_temperature.desktop:3
-msgctxt "Name"
-msgid "Hardware Temperature"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-sm_temperature.desktop:56
-msgctxt "Comment"
-msgid "A system temperature monitor"
-msgstr ""
-
-#: plasma/generic/applets/system-monitor/plasma-applet-system-monitor.desktop:83
-msgctxt "Comment"
-msgid "System monitoring applet"
-msgstr ""
-
-#: plasma/generic/applets/systemtray/plasma-applet-systemtray.desktop:2
-msgctxt "Name"
-msgid "System Tray"
-msgstr "Bar Tasgau"
-
-#: plasma/generic/applets/systemtray/plasma-applet-systemtray.desktop:87
-msgctxt "Comment"
-msgid "Access hidden applications minimized in the system tray"
-msgstr ""
-
-#: plasma/desktop/applets/trash/plasma-applet-trash.desktop:2
-msgctxt "Name"
-msgid "Trashcan"
-msgstr ""
-
-#: plasma/desktop/applets/trash/plasma-applet-trash.desktop:77
-msgctxt "Comment"
-msgid "Access to deleted items"
-msgstr ""
-
-#: plasma/generic/applets/webbrowser/plasma-applet-webbrowser.desktop:3
-msgctxt "Name"
-msgid "Web Browser"
-msgstr "Porydd Gwê"
-
-#: plasma/generic/applets/webbrowser/plasma-applet-webbrowser.desktop:92
-msgctxt "Comment"
-msgid "A simple web browser"
-msgstr ""
-
-#: plasma/desktop/applets/windowlist/plasma-applet-windowlist.desktop:2
-msgctxt "Name"
-msgid "Window List"
-msgstr ""
-
-#: plasma/desktop/applets/windowlist/plasma-applet-windowlist.desktop:63
-msgctxt "Comment"
-msgid "Plasmoid to show list of opened windows."
-msgstr ""
-
-#: plasma/generic/applets/battery/plasma-battery-default.desktop:2
-msgctxt "Name"
-msgid "Battery Monitor"
-msgstr ""
-
-#: plasma/generic/applets/battery/plasma-battery-default.desktop:83
-msgctxt "Comment"
-msgid "See the power status of your battery"
-msgstr ""
-
-#: plasma/desktop/containments/desktop/plasma-containment-desktop.desktop:3
-msgctxt "Name|plasma containment"
-msgid "Desktop"
-msgstr ""
-
-#: plasma/desktop/containments/desktop/plasma-containment-desktop.desktop:69
-msgctxt "Comment"
-msgid "Default desktop"
-msgstr ""
-
-#: plasma/desktop/containments/desktop/plasma-containment-desktopdashboard.desktop:3
-msgctxt "Name|plasma containment"
-msgid "Desktop Dashboard"
-msgstr ""
-
-#: plasma/desktop/containments/desktop/plasma-containment-desktopdashboard.desktop:59
-msgctxt "Comment"
-msgid "Widget Dashboard"
-msgstr ""
-
-#: plasma/netbook/containments/netpanel/plasma-containment-netpanel.desktop:2
-msgctxt "Name"
-msgid "Panel for Netbooks"
-msgstr ""
-
-#: plasma/desktop/containments/panel/plasma-containment-panel.desktop:53
-#: plasma/netbook/containments/netpanel/plasma-containment-netpanel.desktop:61
-msgctxt "Comment"
-msgid "A containment for a panel"
-msgstr ""
-
-#: plasma/desktop/containments/panel/plasma-containment-panel.desktop:2
-msgctxt "Name"
-msgid "Empty Panel"
-msgstr ""
-
-#: plasma/desktop/containments/panel/plasma-containment-panel.desktop:60
-msgctxt "Comment"
-msgid "A simple linear panel"
-msgstr ""
-
-#: plasma/netbook/containments/sal/plasma-containment-sal.desktop:49
-msgctxt "Comment"
-msgid "Full screen application launcher with search interface"
-msgstr ""
-
-#: plasma/screensaver/containments/screensaver/plasma-containment-saverdesktop.desktop:2
-msgctxt "Name"
-msgid "SaverDesktop"
-msgstr ""
-
-#: plasma/generic/containmentactions/applauncher/plasma-containmentactions-applauncher.desktop:85
-msgctxt "Comment"
-msgid "Simple application launcher"
-msgstr ""
-
-#: plasma/generic/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop:2
-msgctxt "Name"
-msgid "Standard Menu"
-msgstr ""
-
-#: plasma/generic/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop:60
-msgctxt "Comment"
-msgid "The menu that normally shows on right-click"
-msgstr ""
-
-#: plasma/generic/containmentactions/minimalcontextmenu/plasma-containmentactions-minimalcontextmenu.desktop:2
-msgctxt "Name"
-msgid "Minimal Menu"
-msgstr ""
-
-#: plasma/generic/containmentactions/paste/plasma-containmentactions-paste.desktop:2
-msgctxt "Name"
-msgid "Paste"
-msgstr ""
-
-#: plasma/generic/containmentactions/paste/plasma-containmentactions-paste.desktop:65
-msgctxt "Comment"
-msgid "Creates a widget from the contents of the clipboard"
-msgstr ""
-
-#: plasma/generic/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop:2
-msgctxt "Name"
-msgid "Switch Activity"
-msgstr ""
-
-#: plasma/generic/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop:64
-msgctxt "Comment"
-msgid "Switch to another activity"
-msgstr ""
-
-#: plasma/generic/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop:2
-msgctxt "Name"
-msgid "Switch Desktop"
-msgstr ""
-
-#: plasma/generic/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop:66
-msgctxt "Comment"
-msgid "Switch to another virtual desktop"
-msgstr ""
-
-#: plasma/generic/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop:2
-msgctxt "Name"
-msgid "Switch Window"
-msgstr ""
-
-#: plasma/generic/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop:64
-msgctxt "Comment"
-msgid "Show a list of windows to switch to"
-msgstr ""
-
-#: plasma/generic/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop:2
-msgctxt "Name"
-msgid "Application Job Information"
-msgstr ""
-
-#: plasma/generic/dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop:68
-msgctxt "Comment"
-msgid "Application job updates (via kuiserver)"
-msgstr ""
-
-#: plasma/generic/dataengines/apps/plasma-dataengine-apps.desktop:2
-msgctxt "Name"
-msgid "Application Information"
-msgstr ""
-
-#: plasma/generic/dataengines/apps/plasma-dataengine-apps.desktop:64
-msgctxt "Comment"
-msgid "Information and launching of all applications in the app menu."
-msgstr ""
-
-#: plasma/generic/dataengines/calendar/plasma-dataengine-calendar.desktop:74
-msgctxt "Comment"
-msgid "Calendar data engine"
-msgstr ""
-
-#: plasma/generic/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop:2
-msgctxt "Name"
-msgid "Device Notifications"
-msgstr ""
-
-#: plasma/generic/dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop:53
-msgctxt "Comment"
-msgid "Passive device notifications for the user."
-msgstr ""
-
-#: plasma/generic/dataengines/dict/plasma-dataengine-dict.desktop:2
-msgctxt "Name"
-msgid "Dictionary"
-msgstr ""
-
-#: plasma/generic/dataengines/dict/plasma-dataengine-dict.desktop:75
-msgctxt "Comment"
-msgid "Look up word meanings"
-msgstr ""
-
-#: plasma/generic/dataengines/executable/plasma-dataengine-executable.desktop:3
-msgctxt "Name"
-msgid "Run Commands"
-msgstr ""
-
-#: plasma/generic/dataengines/executable/plasma-dataengine-executable.desktop:74
-msgctxt "Comment"
-msgid "Run Executable Data Engine"
-msgstr ""
-
-#: plasma/generic/dataengines/favicons/plasma-dataengine-favicons.desktop:3
-msgctxt "Name"
-msgid "Favicons"
-msgstr ""
-
-#: plasma/generic/dataengines/favicons/plasma-dataengine-favicons.desktop:74
-msgctxt "Comment"
-msgid "Data Engine for getting favicons of web sites"
-msgstr ""
-
-#: plasma/generic/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop:2
-msgctxt "Name"
-msgid "Files and Directories"
-msgstr ""
-
-#: plasma/generic/dataengines/filebrowser/plasma-dataengine-filebrowser.desktop:73
-msgctxt "Comment"
-msgid "Information about files and directories."
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-dataengine-geolocation.desktop:3
-msgctxt "Name"
-msgid "Geolocation"
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-dataengine-geolocation.desktop:64
-msgctxt "Comment"
-msgid "Geolocation Data Engine"
-msgstr ""
-
-#: plasma/generic/dataengines/hotplug/plasma-dataengine-hotplug.desktop:2
-msgctxt "Name"
-msgid "Hotplug Events"
-msgstr ""
-
-#: plasma/generic/dataengines/hotplug/plasma-dataengine-hotplug.desktop:68
-msgctxt "Comment"
-msgid "Tracks hot-pluggable devices as they appear and disappear."
-msgstr ""
-
-#: plasma/generic/dataengines/keystate/plasma-dataengine-keystate.desktop:2
-msgctxt "Name"
-msgid "Keyboard and Mouse State"
-msgstr ""
-
-#: plasma/generic/dataengines/keystate/plasma-dataengine-keystate.desktop:65
-msgctxt "Comment"
-msgid "Keyboard modifier and mouse buttons states"
-msgstr ""
-
-#: plasma/generic/dataengines/mouse/plasma-dataengine-mouse.desktop:2
-msgctxt "Name"
-msgid "Pointer Position"
-msgstr ""
-
-#: plasma/generic/dataengines/mouse/plasma-dataengine-mouse.desktop:70
-msgctxt "Comment"
-msgid "Mouse position and cursor"
-msgstr ""
-
-#: plasma/generic/dataengines/network/plasma-dataengine-network.desktop:3
-msgctxt "Name"
-msgid "Networking"
-msgstr ""
-
-#: plasma/generic/dataengines/notifications/plasma-dataengine-notifications.desktop:2
-msgctxt "Name"
-msgid "Application Notifications"
-msgstr ""
-
-#: plasma/generic/dataengines/notifications/plasma-dataengine-notifications.desktop:73
-msgctxt "Comment"
-msgid "Passive visual notifications for the user."
-msgstr ""
-
-#: plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop:2
-msgctxt "Name"
-msgid "Now Playing"
-msgstr ""
-
-#: plasma/generic/dataengines/nowplaying/plasma-dataengine-nowplaying.desktop:75
-msgctxt "Comment"
-msgid "Lists currently playing music"
-msgstr ""
-
-#: plasma/generic/dataengines/places/plasma-dataengine-places.desktop:2
-#: plasma/generic/runners/places/plasma-runner-places.desktop:2
-msgctxt "Name"
-msgid "Places"
-msgstr ""
-
-#: plasma/generic/dataengines/places/plasma-dataengine-places.desktop:73
-msgctxt "Comment"
-msgid "Places, as seen in the file manager and in file dialogs."
-msgstr ""
-
-#: plasma/generic/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop:3
-msgctxt "Name|plasma data engine"
-msgid "Power Management"
-msgstr ""
-
-#: plasma/generic/dataengines/powermanagement/plasma-dataengine-powermanagement.desktop:67
-msgctxt "Comment"
-msgid "Battery, AC, sleep and PowerDevil information."
-msgstr ""
-
-#: plasma/generic/dataengines/rss/plasma-dataengine-rss.desktop:3
-msgctxt "Name"
-msgid "RSS"
-msgstr ""
-
-#: plasma/generic/dataengines/rss/plasma-dataengine-rss.desktop:75
-msgctxt "Comment"
-msgid "RSS News Data Engine"
-msgstr ""
-
-#: plasma/generic/dataengines/share/data/plasma-dataengine-share.desktop:2
-msgctxt "Name"
-msgid "Share Services"
-msgstr ""
-
-#: plasma/generic/dataengines/share/data/plasma-dataengine-share.desktop:48
-msgctxt "Comment"
-msgid "Engine to share content using different services"
-msgstr ""
-
-#: plasma/generic/dataengines/soliddevice/plasma-dataengine-soliddevice.desktop:74
-msgctxt "Comment"
-msgid "Device data via Solid"
-msgstr ""
-
-#: plasma/generic/dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop:84
-msgctxt "Comment"
-msgid "System status information"
-msgstr ""
-
-#: plasma/generic/dataengines/tasks/plasma-dataengine-tasks.desktop:2
-msgctxt "Name"
-msgid "Window Information"
-msgstr ""
-
-#: plasma/generic/dataengines/tasks/plasma-dataengine-tasks.desktop:73
-msgctxt "Comment"
-msgid "Information and management services for all available windows."
-msgstr ""
-
-#: plasma/generic/dataengines/time/plasma-dataengine-time.desktop:2
-msgctxt "Name"
-msgid "Date and Time"
-msgstr ""
-
-#: plasma/generic/dataengines/time/plasma-dataengine-time.desktop:75
-msgctxt "Comment"
-msgid "Date and time by timezone"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/plasma-dataengine-weather.desktop:2
-msgctxt "Name"
-msgid "Weather"
-msgstr ""
-
-#: plasma/generic/dataengines/weather/plasma-dataengine-weather.desktop:74
-msgctxt "Comment"
-msgid "Weather data from multiple online sources"
-msgstr ""
-
-#: plasma/generic/dataengines/activities/plasma-engine-activities.desktop:2
-msgctxt "Name"
-msgid "Activities Engine"
-msgstr ""
-
-#: plasma/generic/dataengines/activities/plasma-engine-activities.desktop:48
-msgctxt "Comment"
-msgid "Information on Plasma Activities"
-msgstr ""
-
-#: plasma/generic/dataengines/akonadi/plasma-engine-akonadi.desktop:2
-msgctxt "Name"
-msgid "Akonadi"
-msgstr ""
-
-#: plasma/generic/dataengines/akonadi/plasma-engine-akonadi.desktop:65
-msgctxt "Comment"
-msgid "Akonadi PIM data engine"
-msgstr ""
-
-#: plasma/generic/dataengines/metadata/plasma-engine-metadata.desktop:2
-msgctxt "Name"
-msgid "Meta Data"
-msgstr ""
-
-#: plasma/netbook/dataengines/searchlaunch/plasma-engine-searchlaunch.desktop:2
-msgctxt "Name"
-msgid "Search and Launch Engine"
-msgstr ""
-
-#: plasma/netbook/dataengines/searchlaunch/plasma-engine-searchlaunch.desktop:61
-msgctxt "Comment"
-msgid "Engine to handle queries to SAL containment"
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-geolocation-gps.desktop:2
-msgctxt "Name"
-msgid "Geolocation GPS"
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-geolocation-gps.desktop:63
-msgctxt "Comment"
-msgid "Geolocation from GPS address."
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-geolocation-ip.desktop:2
-msgctxt "Name"
-msgid "Geolocation IP"
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-geolocation-ip.desktop:63
-msgctxt "Comment"
-msgid "Geolocation from IP address."
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-packagestructure-dashboard.desktop:2
-msgctxt "Name"
-msgid "MacOS Dashboard Widgets"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-packagestructure-dashboard.desktop:69
-msgctxt "Comment"
-msgid "MacOS dashboard widget"
-msgstr ""
-
-#: plasma/generic/dataengines/share/data/plasma-packagestructure-share.desktop:2
-msgctxt "Name"
-msgid "ShareProvider"
-msgstr ""
-
-#: plasma/generic/dataengines/share/data/plasma-packagestructure-share.desktop:44
-msgctxt "Comment"
-msgid "Share Package Structure"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-packagestructure-web.desktop:2
-msgctxt "Name"
-msgid "Web Widgets"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-packagestructure-web.desktop:72
-msgctxt "Comment"
-msgid "HTML widget"
-msgstr ""
-
-#: plasma/desktop/applets/pager/plasma-pager-default.desktop:2
-msgctxt "Name"
-msgid "Pager"
-msgstr ""
-
-#: plasma/desktop/applets/pager/plasma-pager-default.desktop:81
-msgctxt "Comment"
-msgid "Switch between virtual desktops"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/plasma-runner-activityrunner.desktop:50
-#: plasma/generic/runners/activities/plasma-runner-activityrunner.desktop:50
-msgctxt "Comment"
-msgid "List and switch between desktop activities"
-msgstr ""
-
-#: plasma/generic/runners/bookmarks/plasma-runner-bookmarks.desktop:3
-msgctxt "Name|plasma runner"
-msgid "Bookmarks"
-msgstr ""
-
-#: plasma/generic/runners/bookmarks/plasma-runner-bookmarks.desktop:67
-msgctxt "Comment"
-msgid "Find and open bookmarks"
-msgstr ""
-
-#: plasma/generic/runners/calculator/plasma-runner-calculator.desktop:2
-msgctxt "Name"
-msgid "Calculator"
-msgstr ""
-
-#: plasma/generic/runners/calculator/plasma-runner-calculator.desktop:78
-msgctxt "Comment"
-msgid "Calculate expressions"
-msgstr ""
-
-#: plasma/generic/runners/kill/plasma-runner-kill.desktop:2
-msgctxt "Name"
-msgid "Terminate Applications"
-msgstr ""
-
-#: plasma/generic/runners/kill/plasma-runner-kill.desktop:65
-msgctxt "Comment"
-msgid "Stop applications that are currently running"
-msgstr ""
-
-#: plasma/generic/runners/kill/plasma-runner-kill_config.desktop:9
-msgctxt "Name"
-msgid "Kill Applications"
-msgstr ""
-
-#: plasma/generic/runners/locations/plasma-runner-locations.desktop:2
-msgctxt "Name"
-msgid "Locations"
-msgstr ""
-
-#: plasma/generic/runners/locations/plasma-runner-locations.desktop:74
-msgctxt "Comment"
-msgid "File and URL opener"
-msgstr ""
-
-#: plasma/generic/runners/nepomuksearch/plasma-runner-nepomuksearch.desktop:2
-msgctxt "Name"
-msgid "Nepomuk Desktop Search Runner"
-msgstr ""
-
-#: plasma/generic/runners/nepomuksearch/plasma-runner-nepomuksearch.desktop:70
-msgctxt "Comment"
-msgid "KRunner which performs desktop searches via Nepomuk"
-msgstr ""
-
-#: plasma/generic/runners/places/plasma-runner-places.desktop:76
-msgctxt "Comment"
-msgid "Open Devices and Folder Bookmarks"
-msgstr ""
-
-#: plasma/desktop/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop:2
-msgctxt "Name"
-msgid "Plasma Desktop Shell"
-msgstr ""
-
-#: plasma/desktop/runners/plasma-desktop/plasma-runner-plasma-desktop.desktop:61
-msgctxt "Comment"
-msgid "Interact with the Plasma desktop shell"
-msgstr ""
-
-#: plasma/generic/runners/powerdevil/plasma-runner-powerdevil.desktop:2
-msgctxt "Comment"
-msgid "Basic Power Management Operations"
-msgstr ""
-
-#: plasma/generic/runners/powerdevil/plasma-runner-powerdevil.desktop:71
-#: powerdevil/powerdevil.notifyrc:2
-msgctxt "Name"
-msgid "PowerDevil"
-msgstr ""
-
-#: plasma/generic/runners/services/plasma-runner-services.desktop:2
-msgctxt "Name"
-msgid "Applications"
-msgstr "Cymhwysiadau"
-
-#: plasma/generic/runners/services/plasma-runner-services.desktop:91
-msgctxt "Comment"
-msgid "Find applications, control panels and services"
-msgstr ""
-
-#: plasma/generic/runners/sessions/plasma-runner-sessions.desktop:2
-msgctxt "Name"
-msgid "Desktop Sessions"
-msgstr ""
-
-#: plasma/generic/runners/sessions/plasma-runner-sessions.desktop:74
-msgctxt "Comment"
-msgid "Fast user switching"
-msgstr ""
-
-#: plasma/generic/runners/shell/plasma-runner-shell.desktop:2
-msgctxt "Name"
-msgid "Command Line"
-msgstr ""
-
-#: plasma/generic/runners/shell/plasma-runner-shell.desktop:76
-msgctxt "Comment"
-msgid "Executes shell commands"
-msgstr ""
-
-#: plasma/generic/runners/solid/plasma-runner-solid.desktop:3
-msgctxt "Name|plasma runner"
-msgid "Devices"
-msgstr ""
-
-#: plasma/generic/runners/solid/plasma-runner-solid.desktop:64
-msgctxt "Comment"
-msgid "Manage removable devices"
-msgstr ""
-
-#: plasma/generic/runners/webshortcuts/plasma-runner-webshortcuts.desktop:3
-msgctxt "Name|plasma runner"
-msgid "Web Shortcuts"
-msgstr ""
-
-#: plasma/generic/runners/webshortcuts/plasma-runner-webshortcuts.desktop:67
-msgctxt "Comment"
-msgid "Allows user to use Konqueror's Web shortcuts"
-msgstr ""
-
-#: plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop:2
-msgctxt "Name"
-msgid "Windowed widgets"
-msgstr ""
-
-#: plasma/generic/runners/windowedwidgets/plasma-runner-windowedwidgets.desktop:53
-msgctxt "Comment"
-msgid "Find Plasma widgets that can be run as standalone windows"
-msgstr ""
-
-#: plasma/generic/runners/windows/plasma-runner-windows.desktop:3
-msgctxt "Name|plasma runner"
-msgid "Windows"
-msgstr ""
-
-#: plasma/generic/runners/windows/plasma-runner-windows.desktop:67
-msgctxt "Comment"
-msgid "List windows and desktops and switch them"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-bookmarks.desktop:2
-msgctxt "Name"
-msgid "Bookmarks"
-msgstr "Nodau Tudalen"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-bookmarks.desktop:92
-msgctxt "Comment"
-msgid "List all your bookmarks"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-contacts.desktop:2
-msgctxt "Name"
-msgid "Contacts"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-contacts.desktop:65
-msgctxt "Comment"
-msgid "List all your contacts"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-development.desktop:2
-msgctxt "Name"
-msgid "Development"
-msgstr "Datblygu"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-development.desktop:92
-msgctxt "Comment"
-msgid "Applications targeted to software development"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-education.desktop:2
-msgctxt "Name"
-msgid "Education"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-education.desktop:86
-msgctxt "Comment"
-msgid "Educational applications"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-games.desktop:2
-msgctxt "Name"
-msgid "Games"
-msgstr "Gemau"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-games.desktop:92
-msgctxt "Comment"
-msgid "A collection of fun games"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-graphics.desktop:2
-msgctxt "Name"
-msgid "Graphics"
-msgstr "Graffeg"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-graphics.desktop:92
-msgctxt "Comment"
-msgid "Graphics applications, such as paint programs and image viewers"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-internet.desktop:2
-msgctxt "Name"
-msgid "Internet"
-msgstr "Rhyngrwyd"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-internet.desktop:91
-msgctxt "Comment"
-msgid "Internet related applications, such as Web browser, Email and chat"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-multimedia.desktop:2
-#: systemsettings/categories/settings-audio-and-video.desktop:9
-msgctxt "Name"
-msgid "Multimedia"
-msgstr "Amlgyfryngau"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-multimedia.desktop:92
-msgctxt "Comment"
-msgid "Multimedia applications, such as audio and video players"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-office.desktop:2
-msgctxt "Name"
-msgid "Office"
-msgstr "Swyddfa"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-office.desktop:92
-msgctxt "Comment"
-msgid "Office related applications, such as wordprocessing and spreadsheets"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-system.desktop:2
-msgctxt "Name"
-msgid "System"
-msgstr "Cysawd"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-system.desktop:92
-msgctxt "Comment"
-msgid "System preferences and setup programs"
-msgstr ""
-
-#: plasma/netbook/containments/sal/services/plasma-sal-utility.desktop:2
-msgctxt "Name"
-msgid "Utilities"
-msgstr "Defnyddioldebau"
-
-#: plasma/netbook/containments/sal/services/plasma-sal-utility.desktop:92
-msgctxt "Comment"
-msgid "Small utilities and accessories"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-dashboard.desktop:73
-msgctxt "Comment"
-msgid "MacOS X dashboard widget"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-applet-python.desktop:2
-msgctxt "Name"
-msgid "Python Widget"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-applet-python.desktop:72
-msgctxt "Comment"
-msgid "Plasma widget support written in Python"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-web.desktop:2
-msgctxt "Name"
-msgid "Web Widget"
-msgstr ""
-
-#: plasma/generic/scriptengines/webkit/plasma-scriptengine-applet-web.desktop:73
-msgctxt "Comment"
-msgid "Webpage widget using HTML and JavaScript"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-dataengine-python.desktop:2
-msgctxt "Name"
-msgid "Python data engine"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-dataengine-python.desktop:70
-msgctxt "Comment"
-msgid "Plasma data engine support for Python"
-msgstr ""
-
-#: plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop:2
-#: plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop:2
-msgctxt "Name"
-msgid "Ruby Widget"
-msgstr ""
-
-#: plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-applet.desktop:72
-#: plasma/generic/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop:72
-msgctxt "Comment"
-msgid "Native Plasma widget written in Ruby"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop:2
-msgctxt "Name"
-msgid "Python Runner"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-runner-python.desktop:55
-msgctxt "Comment"
-msgid "Plasma Runner support for Python"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop:2
-msgctxt "Name"
-msgid "Python wallpaper"
-msgstr ""
-
-#: plasma/generic/scriptengines/python/plasma-scriptengine-wallpaper-python.desktop:57
-msgctxt "Comment"
-msgid "Plasma wallpaper support for Python"
-msgstr ""
-
-#: plasma/desktop/applets/tasks/plasma-tasks-default.desktop:2
-msgctxt "Name"
-msgid "Task Manager"
-msgstr ""
-
-#: plasma/desktop/applets/tasks/plasma-tasks-default.desktop:80
-msgctxt "Comment"
-msgid "Switch between running applications"
-msgstr ""
-
-#: plasma/desktop/shell/toolbox/plasma-toolbox-desktoptoolbox.desktop:2
-msgctxt "Comment"
-msgid "Default desktop toolbox for the Plasma desktop shell"
-msgstr ""
-
-#: plasma/desktop/shell/toolbox/plasma-toolbox-desktoptoolbox.desktop:44
-msgctxt "Name"
-msgid "Desktop toolbox"
-msgstr ""
-
-#: plasma/netbook/shell/nettoolbox/plasma-toolbox-nettoolbox.desktop:2
-msgctxt "Comment"
-msgid "Default toolbox for the netbook shell"
-msgstr ""
-
-#: plasma/netbook/shell/nettoolbox/plasma-toolbox-nettoolbox.desktop:44
-msgctxt "Name"
-msgid "Net toolbox"
-msgstr ""
-
-#: plasma/desktop/shell/toolbox/plasma-toolbox-paneltoolbox.desktop:2
-msgctxt "Comment"
-msgid "Default panel toolbox for the Plasma desktop shell"
-msgstr ""
-
-#: plasma/desktop/shell/toolbox/plasma-toolbox-paneltoolbox.desktop:45
-msgctxt "Name"
-msgid "Panel toolbox"
-msgstr ""
-
-#: plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop:2
-msgctxt "Name"
-msgid "Color"
-msgstr ""
-
-#: plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop:3
-#: plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop:92
-msgctxt "Name"
-msgid "Image"
-msgstr ""
-
-#: plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop:169
-msgctxt "Name"
-msgid "Slideshow"
-msgstr ""
-
-#: kcontrol/keyboard/plasma_applet_keyboard.desktop:2
-msgctxt "Name"
-msgid "Keyboard Layout"
-msgstr "Cynllun Bysellfwrdd"
-
-#: kcontrol/keyboard/plasma_applet_keyboard.desktop:91
-msgctxt "Comment"
-msgid "View and switch between active keyboard layouts"
-msgstr ""
-
-#: plasma/generic/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop:2
-msgctxt "Name"
-msgid "Status Notifier Information"
-msgstr ""
-
-#: plasma/generic/dataengines/statusnotifieritem/plasma_engine_statusnotifieritem.desktop:48
-msgctxt "Comment"
-msgid ""
-"Engine for applications' status information, based on the Status Notifier "
-"protocol."
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop:6
-msgctxt "Name"
-msgid "Display Brightness"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilbrightnesscontrolaction.desktop:53
-msgctxt "Comment"
-msgid "Basic Controls for brightness"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop:6
-msgctxt "Name"
-msgid "Dim Display"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevildimdisplayaction.desktop:53
-msgctxt "Comment"
-msgid "Dims gradually the display on a time basis"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevildisabledesktopeffectsaction.desktop:6
-msgctxt "Name"
-msgid "Disable Desktop Effects"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevildisabledesktopeffectsaction.desktop:54
-msgctxt "Comment"
-msgid "Temporary disables KWin's desktop effects"
-msgstr ""
-
-#: powerdevil/daemon/actions/dpms/powerdevildpmsaction.desktop:6
-msgctxt "Name"
-msgid "Screen Energy Saving"
-msgstr ""
-
-#: powerdevil/daemon/actions/dpms/powerdevildpmsaction.desktop:49
-msgctxt "Comment"
-msgid "Controls DPMS settings"
-msgstr ""
-
-#: powerdevil/kcmodule/global/powerdevilglobalconfig.desktop:13
-msgctxt "Name"
-msgid "Global settings"
-msgstr ""
-
-#: powerdevil/kcmodule/global/powerdevilglobalconfig.desktop:61
-msgctxt "Comment"
-msgid "Configure global Power Management settings"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop:7
-msgctxt "Name"
-msgid "Button events handling"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilhandlebuttoneventsaction.desktop:49
-msgctxt "Comment"
-msgid "Performs an action whenever a button is pressed"
-msgstr ""
-
-#: powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop:13
-msgctxt "Name"
-msgid "Power Profiles"
-msgstr ""
-
-#: powerdevil/kcmodule/profiles/powerdevilprofilesconfig.desktop:59
-msgctxt "Comment"
-msgid "Configure Power Management Profiles"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilrunscriptaction.desktop:6
-msgctxt "Name"
-msgid "Run Script"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilrunscriptaction.desktop:54
-msgctxt "Comment"
-msgid "Runs a custom script"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilsuspendsessionaction.desktop:6
-msgctxt "Name"
-msgid "Suspend Session"
-msgstr ""
-
-#: powerdevil/daemon/actions/bundled/powerdevilsuspendsessionaction.desktop:54
-msgctxt "Comment"
-msgid "Suspends the session"
-msgstr ""
-
-#: kcontrol/randr/randr.desktop:14
-msgctxt "Name"
-msgid "Size & Orientation"
-msgstr "Maint & Cyfeiriad"
-
-#: kcontrol/randr/randr.desktop:102
-msgctxt "Comment"
-msgid "Resize and Rotate your display"
-msgstr "Newid Maint a Cylchdroi eich dangosydd"
-
-#: plasma/generic/runners/recentdocuments/recentdocuments.desktop:2
-msgctxt "Name"
-msgid "Recent Documents"
-msgstr "Dogfenni Diweddar"
-
-#: kcontrol/screensaver/screensaver.desktop:14
-msgctxt "Name"
-msgid "Screen Saver"
-msgstr "Arbedydd Sgrîn"
-
-#: kcontrol/screensaver/screensaver.desktop:103
-msgctxt "Comment"
-msgid "Screen Saver Settings"
-msgstr "Gosodiadau Arbedydd Sgrîn"
-
-#: kinfocenter/Modules/info/scsi.desktop:13
-msgctxt "Name"
-msgid "SCSI"
-msgstr "SCSI"
-
-#: kinfocenter/Modules/info/scsi.desktop:104
-msgctxt "Comment"
-msgid "SCSI information"
-msgstr "Gwybodaeth SCSI"
-
-#: systemsettings/categories/settings-account-details.desktop:8
-msgctxt "Name"
-msgid "Account Details"
-msgstr ""
-
-#: systemsettings/categories/settings-application-and-system-notifications.desktop:8
-msgctxt "Name"
-msgid "Application and System Notifications"
-msgstr ""
-
-#: systemsettings/categories/settings-application-appearance-and-behavior.desktop:9
-msgctxt "Name"
-msgid "Common Appearance and Behavior"
-msgstr ""
-
-#: systemsettings/categories/settings-application-appearance.desktop:8
-msgctxt "Name"
-msgid "Application Appearance"
-msgstr ""
-
-#: systemsettings/categories/settings-bluetooth.desktop:8
-msgctxt "Name"
-msgid "Bluetooth"
-msgstr ""
-
-#: systemsettings/classic/settings-classic-view.desktop:9
-msgctxt "Name"
-msgid "Classic Tree View"
-msgstr ""
-
-#: systemsettings/classic/settings-classic-view.desktop:74
-msgctxt "Comment"
-msgid "A Classic KDE 3 KControl style system settings view."
-msgstr ""
-
-#: systemsettings/categories/settings-desktop-appearance.desktop:9
-msgctxt "Name"
-msgid "Workspace Appearance"
-msgstr ""
-
-#: systemsettings/categories/settings-desktop-appearance.desktop:67
-msgctxt "Comment"
-msgid "Customize the appearance of your desktop"
-msgstr ""
-
-#: systemsettings/categories/settings-display.desktop:8
-msgctxt "Name"
-msgid "Display and Monitor"
-msgstr ""
-
-#: systemsettings/categories/settings-hardware.desktop:9
-msgctxt "Name"
-msgid "Hardware"
-msgstr "Caledwedd"
-
-#: systemsettings/icons/settings-icon-view.desktop:9
-msgctxt "Name"
-msgid "Icon View"
-msgstr "Golwg Eicon"
-
-#: systemsettings/icons/settings-icon-view.desktop:81
-msgctxt "Comment"
-msgid "The KDE 4 icon view style"
-msgstr ""
-
-#: systemsettings/categories/settings-input-devices.desktop:8
-msgctxt "Name"
-msgid "Input Devices"
-msgstr ""
-
-#: systemsettings/categories/settings-locale.desktop:8
-msgctxt "Name"
-msgid "Locale"
-msgstr ""
-
-#: systemsettings/categories/settings-lost-and-found.desktop:9
-msgctxt "Name"
-msgid "Lost and Found"
-msgstr ""
-
-#: systemsettings/categories/settings-network-and-connectivity.desktop:8
-msgctxt "Name"
-msgid "Network and Connectivity"
-msgstr ""
-
-#: systemsettings/categories/settings-network-settings.desktop:8
-msgctxt "Name"
-msgid "Network Settings"
-msgstr ""
-
-#: systemsettings/categories/settings-permissions.desktop:8
-msgctxt "Name"
-msgid "Permissions"
-msgstr ""
-
-#: systemsettings/categories/settings-personal-information.desktop:8
-msgctxt "Name"
-msgid "Personal Information"
-msgstr ""
-
-#: systemsettings/categories/settings-removable-devices.desktop:8
-msgctxt "Name"
-msgid "Removable Devices"
-msgstr ""
-
-#: systemsettings/categories/settings-sharing.desktop:8
-msgctxt "Name"
-msgid "Sharing"
-msgstr ""
-
-#: systemsettings/categories/settings-shortcuts-and-gestures.desktop:8
-msgctxt "Name"
-msgid "Shortcuts and Gestures"
-msgstr ""
-
-#: systemsettings/categories/settings-startup-and-shutdown.desktop:8
-msgctxt "Name"
-msgid "Startup and Shutdown"
-msgstr ""
-
-#: systemsettings/categories/settings-system-administration.desktop:9
-msgctxt "Name"
-msgid "System Administration"
-msgstr "Gweinyddiaith Cysawd"
-
-#: systemsettings/categories/settings-workspace-appearance-and-behavior.desktop:9
-msgctxt "Name"
-msgid "Workspace Appearance and Behavior"
-msgstr ""
-
-#: systemsettings/categories/settings-workspace-behavior.desktop:8
-msgctxt "Name"
-msgid "Workspace Behavior"
-msgstr ""
-
-#: kinfocenter/Modules/samba/smbstatus.desktop:12
-msgctxt "Name"
-msgid "Samba Status"
-msgstr "Cyflwr Samba"
-
-#: kinfocenter/Modules/samba/smbstatus.desktop:102
-msgctxt "Comment"
-msgid "Samba status monitor"
-msgstr "Monitr cyflwr samba"
-
-#: solid/solid-actions-kcm/solid-actions.desktop:13
-msgctxt "Name"
-msgid "Device Actions"
-msgstr ""
-
-#: solid/solid-actions-kcm/solid-actions.desktop:79
-msgctxt "Comment"
-msgid ""
-"A configuration tool for managing the actions available to the user when "
-"connecting new devices to the computer"
-msgstr ""
-
-#: libs/solid/control/backends/fakenet/solid_fakenet.desktop:7
-msgctxt "Name"
-msgid "Fake Net"
-msgstr ""
-
-#: libs/solid/control/backends/fakenet/solid_fakenet.desktop:83
-msgctxt "Comment"
-msgid "Fake Network Management"
-msgstr ""
-
-#: solid/modemmanager-0.4/solid_modemmanager04.desktop:6
-msgctxt "Name"
-msgid "ModemManager 0.4"
-msgstr ""
-
-#: solid/modemmanager-0.4/solid_modemmanager04.desktop:60
-msgctxt "Comment"
-msgid "Network management using the ModemManager daemon, version 0.4"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/solidbackends/solid_networkmanager09_fake.desktop:6
-#: solid/networkmanager_fake-0.9/solid_networkmanager09_fake.desktop:6
-msgctxt "Name"
-msgid "Fake NetworkManager 0.9"
-msgstr ""
-
-#: debian/tmp/usr/share/kde4/services/solidbackends/solid_networkmanager09_fake.desktop:25
-#: solid/networkmanager_fake-0.9/solid_networkmanager09_fake.desktop:25
-msgctxt "Comment"
-msgid ""
-"Fake backend to allow kdelibs to read NetworkManager daemon 0.9's status"
-msgstr ""
-
-#: solid/wicd/solid_wicd.desktop:7
-msgctxt "Name"
-msgid "Wicd"
-msgstr ""
-
-#: solid/wicd/solid_wicd.desktop:73
-msgctxt "Comment"
-msgid "Network management using the Wicd daemon."
-msgstr ""
-
-#: kcontrol/standard_actions/standard_actions.desktop:15
-msgctxt "Name"
-msgid "Standard Keyboard Shortcuts"
-msgstr ""
-
-#: kcontrol/standard_actions/standard_actions.desktop:91
-msgctxt "Comment"
-msgid "Configuration of standard keybindings"
-msgstr ""
-
-#: kcontrol/style/style.desktop:15
-msgctxt "Name"
-msgid "Style"
-msgstr "Arddull"
-
-#: kcontrol/style/style.desktop:104
-msgctxt "Comment"
-msgid ""
-"Allows the manipulation of widget behavior and changing the Style for KDE"
-msgstr "Yn caniatau trin ymddygiad teclyn a newid arddull KDE"
-
-#: kcontrol/workspaceoptions/workspaceoptions.desktop:75
-msgctxt "Comment"
-msgid "Global options for the Plasma Workspace"
-msgstr ""
-
-#: kcontrol/xinerama/xinerama.desktop:17
-msgctxt "Name"
-msgid "Multiple Monitors"
-msgstr "Dangosyddion Lluosol"
-
-#: kcontrol/xinerama/xinerama.desktop:104
-msgctxt "Comment"
-msgid "Configure KDE for multiple monitors"
-msgstr "Ffurfweddu dangosyddion lluosol i KDE"
-
-#: kinfocenter/Modules/info/xserver.desktop:13
-msgctxt "Name"
-msgid "X-Server"
-msgstr "Gweinydd-X"
-
-#: kinfocenter/Modules/info/xserver.desktop:103
-msgctxt "Comment"
-msgid "X-Server information"
-msgstr "Gwybodaeth Gweinydd-X"
-
-#: kinfocenter/Categories/kinfocentercategory.desktop:4
-msgctxt "Name"
-msgid "KInfoCenter Category"
-msgstr ""
-
-#: kwin/effects/kwineffect.desktop:5
-msgctxt "Comment"
-msgid "KWin Effect"
-msgstr ""
-
-#: plasma/generic/dataengines/geolocation/plasma-geolocationprovider.desktop:4
-msgctxt "Comment"
-msgid "Plasma Geolocation Provider"
-msgstr ""
-
-#: plasma/netbook/containments/sal/plasma-sal-menu.desktop:5
-msgctxt "Name"
-msgid "Plasma Search and Launch menu"
-msgstr ""
-
-#: plasma/netbook/containments/sal/plasma-sal-menu.desktop:63
-msgctxt "Comment"
-msgid "Menu entry for The Plasma search and launch activity"
-msgstr ""
-
-#: plasma/generic/dataengines/share/data/plasma_shareprovider.desktop:4
-msgctxt "Comment"
-msgid "Plugin for Plasma Sharebin"
-msgstr ""
-
-#: powerdevil/daemon/actions/powerdevilaction.desktop:5
-msgctxt "Comment"
-msgid "Power Management Action Extension"
-msgstr ""
-
-#: kscreensaver/libkscreensaver/screensaver.desktop:4
-msgctxt "Comment"
-msgid "ScreenSaver"
-msgstr ""
-
-#: solid/solid-actions-kcm/solid-device-type.desktop:4
-msgctxt "Name"
-msgid "Solid Device Type"
-msgstr ""
-
-#: libs/solid/control/solidmodemmanager.desktop:5
-msgctxt "Comment"
-msgid "Modem Management Backend"
-msgstr ""
-
-#: libs/solid/control/solidnetworkmanager.desktop:5
-msgctxt "Comment"
-msgid "Network Management Backend"
-msgstr ""
-
-#: systemsettings/categories/systemsettingscategory.desktop:4
-msgctxt "Name"
-msgid "System Settings Category"
-msgstr ""
-
-#: systemsettings/core/systemsettingsexternalapp.desktop:4
-msgctxt "Name"
-msgid "System Settings External Application"
-msgstr ""
-
-#: systemsettings/core/systemsettingsview.desktop:4
-msgctxt "Name"
-msgid "System Settings View"
-msgstr ""
-
-#: kcontrol/dateandtime/kcmclock_actions.actions:2
-msgctxt "Name"
-msgid "Date and Time Control Module"
-msgstr ""
-
-#: kcontrol/dateandtime/kcmclock_actions.actions:66
-msgctxt "Name"
-msgid "Save the date/time settings"
-msgstr ""
-
-#: kcontrol/dateandtime/kcmclock_actions.actions:126
-msgctxt "Description"
-msgid "System policies prevent you from saving the date/time settings."
-msgstr ""
-
-#: kcontrol/kfontinst/dbus/fontinst.actions:93
-msgctxt "Name"
-msgid "Manage system-wide fonts."
-msgstr ""
-
-#: kcontrol/kfontinst/dbus/fontinst.actions:150
-msgctxt "Description"
-msgid "Modifying the system-wide font configuration requires privileges."
-msgstr ""
-
-#: kcontrol/smartcard/smartcard.desktop:15
-msgctxt "Name"
-msgid "Smartcards"
-msgstr "Smartcards"
-
-#: kcontrol/smartcard/smartcard.desktop:103
-msgctxt "Comment"
-msgid "Configure smartcard support"
-msgstr "Ffurfweddu cynhaliaeth cerdyn smart"
-
-#: kcontrol/kdm/kcmkdm_actions.actions:2
-msgctxt "Name"
-msgid "Login Manager Control Module"
-msgstr ""
-
-#: kcontrol/kdm/kcmkdm_actions.actions:54
-msgctxt "Name"
-msgid "Save the Login Manager settings"
-msgstr ""
-
-#: kcontrol/kdm/kcmkdm_actions.actions:103
-msgctxt "Description"
-msgid ""
-"Administrator authorization is required to change the Login Manager settings"
-msgstr ""
-
-#: kcontrol/kdm/kcmkdm_actions.actions:154
-msgctxt "Name"
-msgid "Manage user images shown in the Login Manager"
-msgstr ""
-
-#: kcontrol/kdm/kcmkdm_actions.actions:202
-msgctxt "Description"
-msgid ""
-"Administrator authorization is required to manage user images for the Login "
-"Manager"
-msgstr ""
-
-#: kcontrol/kdm/kcmkdm_actions.actions:254
-msgctxt "Name"
-msgid "Manage themes for the Login Manager"
-msgstr ""
-
-#: kcontrol/kdm/kcmkdm_actions.actions:303
-msgctxt "Description"
-msgid ""
-"Administrator authorization is required to manage themes for the Login "
-"Manager"
-msgstr ""
-
-#: kdm/kfrontend/pics/stripes.png.desktop:3
-msgctxt "Name"
-msgid "Stripes"
-msgstr ""
-
-#: kdm/kfrontend/sessions/awesome.desktop:5
-msgctxt "Name"
-msgid "awesome"
-msgstr ""
-
-#: kdm/kfrontend/sessions/awesome.desktop:68
-msgctxt "Comment"
-msgid "Highly configurable framework window manager"
-msgstr ""
-
-#: kdm/kfrontend/sessions/lxde.desktop:5
-msgctxt "Name"
-msgid "LXDE"
-msgstr ""
-
-#: kdm/kfrontend/sessions/lxde.desktop:58
-msgctxt "Comment"
-msgid "Lightweight X11 desktop environment"
-msgstr ""
-
-#: khotkeys/data/defaults.khotkeys:5 khotkeys/data/defaults.khotkeys:151
-msgctxt "Comment"
-msgid "Comment"
-msgstr ""
-
-#: khotkeys/data/defaults.khotkeys:75
-msgctxt "Name"
-msgid "KMenuEdit"
-msgstr ""
-
-#: khotkeys/data/defaults.khotkeys:220
-msgctxt "Name"
-msgid "Search"
-msgstr ""
-
-#: khotkeys/data/defaults.khotkeys:302 khotkeys/data/kde32b1.khotkeys:526
-#: khotkeys/data/kde32b1.khotkeys:768 khotkeys/data/kde32b1.khotkeys:1028
-#: khotkeys/data/kde32b1.khotkeys:1484 khotkeys/data/kde32b1.khotkeys:1903
-#: khotkeys/data/kde32b1.khotkeys:3333 khotkeys/data/printscreen.khotkeys:349
-msgctxt "Comment"
-msgid "Simple_action"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:5
-msgctxt "Comment"
-msgid ""
-"This group contains various examples demonstrating most of the features of "
-"KHotkeys. (Note that this group and all its actions are disabled by default.)"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:78
-msgctxt "Name"
-msgid "Examples"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:172
-msgctxt "Comment"
-msgid ""
-"After pressing Ctrl+Alt+I, the KSIRC window will be activated, if it exists. "
-"Simple."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:250
-msgctxt "Name"
-msgid "Activate KSIRC Window"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:341
-msgctxt "Comment"
-msgid "KSIRC window"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:430
-msgctxt "Comment"
-msgid "KSIRC"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:611
-msgctxt "Comment"
-msgid ""
-"After pressing Alt+Ctrl+H the input of 'Hello' will be simulated, as if you "
-"typed it.  This is especially useful if you have call to frequently type a "
-"word (for instance, 'unsigned').  Every keypress in the input is separated "
-"by a colon ':'. Note that the keypresses literally mean keypresses, so you "
-"have to write what you would press on the keyboard. In the table below, the "
-"left column shows the input and the right column shows what to type.\\n\\"
-"n\"enter\" (i.e. new line)                Enter or Return\\na (i.e. small a) "
-"                         A\\nA (i.e. capital a)                       "
-"Shift+A\\n: (colon)                                  Shift+;\\n' '  (space)  "
-"                            Space"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:673
-msgctxt "Name"
-msgid "Type 'Hello'"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:853
-msgctxt "Comment"
-msgid "This action runs Konsole, after pressing Ctrl+Alt+T."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:931
-msgctxt "Name"
-msgid "Run Konsole"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1113
-msgctxt "Comment"
-msgid ""
-"Read the comment on the \"Type 'Hello'\" action first.\\n\\nQt Designer uses "
-"Ctrl+F4 for closing windows.  In KDE, however, Ctrl+F4 is the shortcut for "
-"going to virtual desktop 4, so this shortcut does not work in Qt Designer.  "
-"Further, Qt Designer does not use KDE's standard Ctrl+W for closing the "
-"window.\\n\\nThis problem can be solved by remapping Ctrl+W to Ctrl+F4 when "
-"the active window is Qt Designer. When Qt Designer is active, every time "
-"Ctrl+W is pressed, Ctrl+F4 will be sent to Qt Designer instead. In other "
-"applications, the effect of Ctrl+W is unchanged.\\n\\nWe now need to specify "
-"three things: A new shortcut trigger on 'Ctrl+W', a new keyboard input "
-"action sending Ctrl+F4, and a new condition that the active window is Qt "
-"Designer.\\nQt Designer seems to always have title 'Qt Designer by "
-"Trolltech', so the condition will check for the active window having that "
-"title."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1155
-msgctxt "Name"
-msgid "Remap Ctrl+W to Ctrl+F4 in Qt Designer"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1248
-msgctxt "Comment"
-msgid "Qt Designer"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1353
-msgctxt "Comment"
-msgid ""
-"By pressing Alt+Ctrl+W a D-Bus call will be performed that will show the "
-"minicli. You can use any kind of D-Bus call, just like using the command "
-"line 'qdbus' tool."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1418
-msgctxt "Name"
-msgid "Perform D-Bus call 'qdbus org.kde.krunner /App display'"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1569
-msgctxt "Comment"
-msgid ""
-"Read the comment on the \"Type 'Hello'\" action first.\\n\\nJust like the "
-"\"Type 'Hello'\" action, this one simulates keyboard input, specifically, "
-"after pressing Ctrl+Alt+B, it sends B to XMMS (B in XMMS jumps to the next "
-"song). The 'Send to specific window' checkbox is checked and a window with "
-"its class containing 'XMMS_Player' is specified; this will make the input "
-"always be sent to this window. This way, you can control XMMS even if, for "
-"instance, it is on a different virtual desktop.\\n\\n(Run 'xprop' and click "
-"on the XMMS window and search for WM_CLASS to see 'XMMS_Player')."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1628
-msgctxt "Name"
-msgid "Next in XMMS"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1721
-msgctxt "Comment"
-msgid "XMMS window"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1811
-msgctxt "Comment"
-msgid "XMMS Player window"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:1988
-msgctxt "Comment"
-msgid ""
-"Konqueror in KDE3.1 has tabs, and now you can also have gestures.\\n\\nJust "
-"press the middle mouse button and start drawing one of the gestures, and "
-"after you are finished, release the mouse button. If you only need to paste "
-"the selection, it still works, just click the middle mouse button. (You can "
-"change the mouse button to use in the global settings).\\n\\nRight now, "
-"there are the following gestures available:\\nmove right and back left - "
-"Forward (Alt+Right)\\nmove left and back right - Back (Alt+Left)\\nmove up "
-"and back down  - Up (Alt+Up)\\ncircle anticlockwise - Reload (F5)\\n\\nThe "
-"gesture shapes can be entered by performing them in the configuration "
-"dialog. You can also look at your numeric pad to help you: gestures are "
-"recognized like a 3x3 grid of fields, numbered 1 to 9.\\n\\nNote that you "
-"must perform exactly the gesture to trigger the action. Because of this, it "
-"is possible to enter more gestures for the action. You should try to avoid "
-"complicated gestures where you change the direction of mouse movement more "
-"than once.  For instance, 45654 or 74123 are simple to perform, but 1236987 "
-"may be already quite difficult.\\n\\nThe conditions for all gestures are "
-"defined in this group. All these gestures are active only if the active "
-"window is Konqueror (class contains 'konqueror')."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2048
-msgctxt "Name"
-msgid "Konqi Gestures"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2130
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:171
-msgctxt "Comment"
-msgid "Konqueror window"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2221 khotkeys/data/kde32b1.khotkeys:2311
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:262
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:352
-msgctxt "Comment"
-msgid "Konqueror"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2406
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:525
-msgctxt "Name"
-msgid "Back"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2508 khotkeys/data/kde32b1.khotkeys:2700
-#: khotkeys/data/kde32b1.khotkeys:2892 khotkeys/data/kde32b1.khotkeys:3084
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:786
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1038
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1277
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1537
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1796
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1888
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2144
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2400
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2661
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2921
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3177
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3432
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3697
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3958
-msgctxt "Comment"
-msgid "Gesture_triggers"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2598
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2559
-msgctxt "Name"
-msgid "Forward"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2790
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:936
-msgctxt "Name"
-msgid "Up"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:2982
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3856
-msgctxt "Name"
-msgid "Reload"
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:3172
-msgctxt "Comment"
-msgid ""
-"After pressing Win+E (Tux+E) a WWW browser will be launched, and it will "
-"open http://www.kde.org . You may run all kind of commands you can run in "
-"minicli (Alt+F2)."
-msgstr ""
-
-#: khotkeys/data/kde32b1.khotkeys:3237
-msgctxt "Name"
-msgid "Go to KDE Website"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:5
-msgctxt "Comment"
-msgid "Basic Konqueror gestures."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:87
-msgctxt "Name"
-msgid "Konqueror Gestures"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:445
-msgctxt "Comment"
-msgid "Press, move left, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:615
-msgctxt "Comment"
-msgid ""
-"Opera-style: Press, move up, release.\\nNOTE: Conflicts with 'New Tab', and "
-"as such is disabled by default."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:687
-msgctxt "Name"
-msgid "Stop Loading"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:866
-msgctxt "Comment"
-msgid ""
-"Going up in URL/directory structure.\\nMozilla-style: Press, move up, move "
-"left, move up, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1118
-msgctxt "Comment"
-msgid ""
-"Going up in URL/directory structure.\\nOpera-style: Press, move up, move "
-"left, move up, release.\\nNOTE: Conflicts with  \"Activate Previous Tab\", "
-"and as such is disabled by default."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1185
-msgctxt "Name"
-msgid "Up #2"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1357
-msgctxt "Comment"
-msgid "Press, move up, move right, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1436
-msgctxt "Name"
-msgid "Activate Next Tab"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1617
-msgctxt "Comment"
-msgid "Press, move up, move left, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1696
-msgctxt "Name"
-msgid "Activate Previous Tab"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:1968
-msgctxt "Comment"
-msgid "Press, move down, move up, move down, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2047
-msgctxt "Name"
-msgid "Duplicate Tab"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2224
-msgctxt "Comment"
-msgid "Press, move down, move up, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2303
-msgctxt "Name"
-msgid "Duplicate Window"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2480
-msgctxt "Comment"
-msgid "Press, move right, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2741
-msgctxt "Comment"
-msgid ""
-"Press, move down, move half up, move right, move down, release.\\n(Drawing a "
-"lowercase 'h'.)"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:2813
-msgctxt "Name"
-msgid "Home"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3005
-msgctxt "Comment"
-msgid ""
-"Press, move right, move down, move right, release.\\nMozilla-style: Press, "
-"move down, move right, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3077
-msgctxt "Name"
-msgid "Close Tab"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3261
-msgctxt "Comment"
-msgid ""
-"Press, move up, release.\\nConflicts with Opera-style 'Up #2', which is "
-"disabled by default."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3332
-msgctxt "Name"
-msgid "New Tab"
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3512
-msgctxt "Comment"
-msgid "Press, move down, release."
-msgstr ""
-
-#: khotkeys/data/konqueror_gestures_kde321.khotkeys:3777
-msgctxt "Comment"
-msgid "Press, move up, move down, release."
-msgstr ""
-
-#: khotkeys/data/printscreen.khotkeys:5
-msgctxt "Comment"
-msgid "This group contains actions that are set up by default."
-msgstr ""
-
-#: khotkeys/data/printscreen.khotkeys:84
-msgctxt "Name"
-msgid "Preset Actions"
-msgstr ""
-
-#: khotkeys/data/printscreen.khotkeys:174
-msgctxt "Comment"
-msgid "Launches KSnapShot when PrintScrn is pressed."
-msgstr ""
-
-#: khotkeys/data/printscreen.khotkeys:252
-msgctxt "Name"
-msgid "PrintScreen"
-msgstr ""
-
-#: klipper/klipperrc.desktop:14
-msgctxt "Description"
-msgid "Jpeg-Image"
-msgstr "Delwedd Jpeg"
-
-#: klipper/klipperrc.desktop:107
-msgctxt "Description"
-msgid "Launch &Gwenview"
-msgstr ""
-
-#: klipper/klipperrc.desktop:186
-msgctxt "Description"
-msgid "Web-URL"
-msgstr "URL Gw?"
-
-#: klipper/klipperrc.desktop:278 klipper/klipperrc.desktop:1911
-msgctxt "Description"
-msgid "Open with &default Browser"
-msgstr ""
-
-#: klipper/klipperrc.desktop:358 klipper/klipperrc.desktop:1991
-msgctxt "Description"
-msgid "Open with &Konqueror"
-msgstr "Agor gyda &Konqueror"
-
-#: klipper/klipperrc.desktop:450 klipper/klipperrc.desktop:2082
-msgctxt "Description"
-msgid "Open with &Mozilla"
-msgstr "Agor gyda &Mozilla"
-
-#: klipper/klipperrc.desktop:541 klipper/klipperrc.desktop:1361
-#: klipper/klipperrc.desktop:1636 klipper/klipperrc.desktop:2173
-msgctxt "Description"
-msgid "Send &URL"
-msgstr "Anfon &URL"
-
-#: klipper/klipperrc.desktop:634
-msgctxt "Description"
-msgid "Open with &Firefox"
-msgstr ""
-
-#: klipper/klipperrc.desktop:722
-msgctxt "Description"
-msgid "Send &Page"
-msgstr "Anfon &Tudalen"
-
-#: klipper/klipperrc.desktop:813
-msgctxt "Description"
-msgid "Mail-URL"
-msgstr "URL Ebost"
-
-#: klipper/klipperrc.desktop:905
-msgctxt "Description"
-msgid "Launch &Kmail"
-msgstr "Cychwyn &KMail"
-
-#: klipper/klipperrc.desktop:996
-msgctxt "Description"
-msgid "Launch &mutt"
-msgstr "Cychwyn &mutt"
-
-#: klipper/klipperrc.desktop:1086
-msgctxt "Description"
-msgid "Text File"
-msgstr "Ffeil Testun"
-
-#: klipper/klipperrc.desktop:1179
-msgctxt "Description"
-msgid "Launch K&Write"
-msgstr "Cychwyn K&Write"
-
-#: klipper/klipperrc.desktop:1269
-msgctxt "Description"
-msgid "Local file URL"
-msgstr "URL ffeil lleol"
-
-#: klipper/klipperrc.desktop:1453 klipper/klipperrc.desktop:1728
-#: klipper/klipperrc.desktop:2265
-msgctxt "Description"
-msgid "Send &File"
-msgstr "Anfon &Ffeil"
-
-#: klipper/klipperrc.desktop:1544
-msgctxt "Description"
-msgid "Gopher URL"
-msgstr "URL Gopher"
-
-#: klipper/klipperrc.desktop:1819
-msgctxt "Description"
-msgid "ftp URL"
-msgstr "URL ftp"
-
-#: kstyles/highcontrast/highcontrast.themerc:2
-msgctxt "Name"
-msgid "HighContrast"
-msgstr ""
-
-#: kstyles/highcontrast/highcontrast.themerc:82
-msgctxt "Comment"
-msgid "A style that works well with high contrast color schemes"
-msgstr ""
-
-#: kstyles/themes/b3.themerc:2
-msgctxt "Name"
-msgid "B3/KDE"
-msgstr ""
-
-#: kstyles/themes/b3.themerc:83
-msgctxt "Comment"
-msgid "B3/Modification of B2"
-msgstr ""
-
-#: kstyles/themes/beos.themerc:2
-msgctxt "Name"
-msgid "BeOS"
-msgstr "BeOS"
-
-#: kstyles/themes/beos.themerc:90
-msgctxt "Comment"
-msgid "Unthemed BeOS-like style"
-msgstr ""
-
-#: kstyles/themes/default.themerc:2
-msgctxt "Name"
-msgid "KDE Classic"
-msgstr ""
-
-#: kstyles/themes/default.themerc:81
-msgctxt "Comment"
-msgid "Classic KDE style"
-msgstr ""
-
-#: kstyles/themes/highcolor.themerc:2
-msgctxt "Name"
-msgid "HighColor Classic"
-msgstr ""
-
-#: kstyles/themes/highcolor.themerc:79
-msgctxt "Comment"
-msgid "Highcolor version of the classic style"
-msgstr ""
-
-#: kstyles/themes/keramik.themerc:2 kwin/clients/keramik/keramik.desktop:2
-msgctxt "Name"
-msgid "Keramik"
-msgstr "Keramik"
-
-#: kstyles/themes/keramik.themerc:92
-msgctxt "Comment"
-msgid "A style using alphablending"
-msgstr ""
-
-#: kstyles/themes/light-v2.themerc:2
-msgctxt "Name"
-msgid "Light Style, 2nd revision"
-msgstr ""
-
-#: kstyles/themes/light-v2.themerc:78
-msgctxt "Comment"
-msgid "Second revision of the simple and elegant 'Light' widget style."
-msgstr ""
-
-#: kstyles/themes/light-v3.themerc:2
-msgctxt "Name"
-msgid "Light Style, 3rd revision"
-msgstr ""
-
-#: kstyles/themes/light-v3.themerc:78
-msgctxt "Comment"
-msgid "Third revision of the simple and elegant 'Light' widget style."
-msgstr ""
-
-#: kstyles/themes/mega.themerc:2
-msgctxt "Name"
-msgid "MegaGradient highcolor style"
-msgstr ""
-
-#: kstyles/themes/qtmacintosh.themerc:2
-msgctxt "Name"
-msgid "Mac OS X"
-msgstr ""
-
-#: kstyles/themes/qtmacintosh.themerc:66
-msgctxt "Comment"
-msgid "Style that uses the Apple Appearance Manager"
-msgstr ""
-
-#: kstyles/themes/qtmotifplus.themerc:2
-msgctxt "Name"
-msgid "Motif Plus"
-msgstr ""
-
-#: kstyles/themes/qtmotifplus.themerc:81
-msgctxt "Comment"
-msgid "Built-in enhanced Motif style"
-msgstr ""
-
-#: kstyles/themes/qtplatinum.themerc:2
-msgctxt "Name"
-msgid "Platinum"
-msgstr ""
-
-#: kstyles/themes/qtplatinum.themerc:82
-msgctxt "Comment"
-msgid "Built-in unthemed Platinum style"
-msgstr ""
-
-#: kstyles/themes/qtsgi.themerc:2
-msgctxt "Name"
-msgid "SGI"
-msgstr ""
-
-#: kstyles/themes/qtsgi.themerc:84
-msgctxt "Comment"
-msgid "Built-in SGI style"
-msgstr ""
-
-#: kstyles/themes/qtwindowsvista.themerc:2
-msgctxt "Name"
-msgid "MS Windows Vista"
-msgstr ""
-
-#: kstyles/themes/qtwindowsvista.themerc:65
-msgctxt "Comment"
-msgid "Style that uses the Windows Vista style engine"
-msgstr ""
-
-#: kstyles/themes/qtwindowsxp.themerc:2
-msgctxt "Name"
-msgid "MS Windows XP"
-msgstr ""
-
-#: kstyles/themes/qtwindowsxp.themerc:65
-msgctxt "Comment"
-msgid "Style that uses the Windows XP style engine"
-msgstr ""
-
-#: kstyles/web/web.themerc:2
-msgctxt "Name"
-msgid "Web style"
-msgstr ""
-
-#: kstyles/web/web.themerc:82
-msgctxt "Comment"
-msgid "Web widget style"
-msgstr ""
-
-#: kwin/data/fsp_workarounds_1.kwinrules:2
-msgctxt "Description"
-msgid "(Default) Disable focus stealing prevention for XV"
-msgstr ""
-
-#: kwin/effects/_test/demo_liquid.desktop:2
-msgctxt "Name"
-msgid "Demo Liquid"
-msgstr ""
-
-#: kwin/effects/_test/demo_shakymove.desktop:2
-msgctxt "Name"
-msgid "Demo Shaky Move"
-msgstr ""
-
-#: kwin/effects/_test/demo_shiftworkspaceup.desktop:2
-msgctxt "Name"
-msgid "Demo ShiftWorkspaceUp"
-msgstr ""
-
-#: kwin/effects/_test/demo_showpicture.desktop:2
-msgctxt "Name"
-msgid "Demo ShowPicture"
-msgstr ""
-
-#: kwin/effects/_test/demo_wavywindows.desktop:2
-msgctxt "Name"
-msgid "Demo Wavy Windows"
-msgstr ""
-
-#: kwin/effects/_test/drunken.desktop:2
-msgctxt "Name"
-msgid "Drunken"
-msgstr ""
-
-#: kwin/effects/_test/flame.desktop:2
-msgctxt "Name"
-msgid "Flame"
-msgstr ""
-
-#: kwin/effects/_test/gears.desktop:2
-msgctxt "Name"
-msgid "Cube Gears"
-msgstr ""
-
-#: kwin/effects/_test/gears.desktop:60
-msgctxt "Comment"
-msgid "Display gears inside the cube"
-msgstr ""
-
-#: kwin/effects/_test/howto.desktop:3
-msgctxt "Name"
-msgid "Howto"
-msgstr ""
-
-#: kwin/effects/_test/kicker/kicker.desktop:4
-msgctxt "Comment"
-msgid "Demonstration effect for using EffectFrames"
-msgstr ""
-
-#: kwin/effects/_test/slidetabs/slidetabs.desktop:2
-#: kwin/effects/_test/slidetabs/slidetabs_config.desktop:9
-msgctxt "Name"
-msgid "Slide Tabs"
-msgstr ""
-
-#: kwin/effects/_test/slidetabs/slidetabs.desktop:58
-msgctxt "Comment"
-msgid "Slide windows when switching or grouping tabs."
-msgstr ""
-
-#: kwin/effects/_test/swiveltabs/swiveltabs.desktop:2
-#: kwin/effects/_test/swiveltabs/swiveltabs_config.desktop:9
-msgctxt "Name"
-msgid "Swivel Tabs"
-msgstr ""
-
-#: kwin/effects/_test/swiveltabs/swiveltabs.desktop:51
-msgctxt "Comment"
-msgid "Make the windows turn when switching tabs"
-msgstr ""
-
-#: kwin/effects/_test/test_fbo.desktop:2
-msgctxt "Name"
-msgid "Test_FBO"
-msgstr ""
-
-#: kwin/effects/_test/test_input.desktop:2
-msgctxt "Name"
-msgid "Test_Input"
-msgstr ""
-
-#: kwin/effects/_test/test_thumbnail.desktop:2
-msgctxt "Name"
-msgid "Test_Thumbnail"
-msgstr ""
-
-#: kwin/effects/_test/videorecord.desktop:2
-#: kwin/effects/_test/videorecord_config.desktop:9
-msgctxt "Name"
-msgid "Video Record"
-msgstr ""
-
-#: kwin/effects/_test/videorecord.desktop:81
-msgctxt "Comment"
-msgid "Record a video of your desktop"
-msgstr ""
-
-#: kwrited/kwrited-autostart.desktop:2
-msgctxt "Name"
-msgid "KDE Write Daemon"
-msgstr "Daemon KDE Write"
-
-#: libs/ksysguard/processcore/actions.actions:2
-msgctxt "Name"
-msgid "KSysGuard"
-msgstr "KSysGuard"
-
-#: libs/ksysguard/processcore/actions.actions:73
-msgctxt "Name"
-msgid "Kill or stop etc a process"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:129
-msgctxt "Description"
-msgid "Sends a given signal to a given process"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:188
-msgctxt "Name"
-msgid "Change the priority of a process"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:245
-msgctxt "Description"
-msgid "Change the niceness of a given process"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:301
-msgctxt "Name"
-msgid "Change IO Scheduler and priority"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:353
-msgctxt "Description"
-msgid "Change how the read and writes of a given process are prioritized"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:406
-msgctxt "Name"
-msgid "Change CPU Scheduler and priority"
-msgstr ""
-
-#: libs/ksysguard/processcore/actions.actions:457
-msgctxt "Description"
-msgid ""
-"Change which CPU scheduler is to schedule the running of a given process"
-msgstr ""
-
-#: plasma/generic/scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop:2
-msgctxt "Name"
-msgid "Google Gadgets"
-msgstr ""
-
-#: plasma/generic/scriptengines/google_gadgets/plasma-packagestructure-googlegadgets.desktop:74
-msgctxt "Comment"
-msgid "Google Desktop Gadget"
-msgstr ""
-
-#: plasma/generic/scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop:2
-msgctxt "Name"
-msgid "GoogleGadgets"
-msgstr ""
-
-#: plasma/generic/scriptengines/google_gadgets/plasma-scriptengine-googlegadgets.desktop:74
-msgctxt "Comment"
-msgid "Google Desktop Gadgets"
-msgstr ""
-
-#: powerdevil/daemon/backends/hal/powerdevilhalbackend.desktop:7
-msgctxt "Name"
-msgid "HAL PowerDevil Backend"
-msgstr ""
-
-#: powerdevil/daemon/backends/hal/powerdevilhalbackend.desktop:53
-msgctxt "Comment"
-msgid "Use KDE Power Management system through freedesktop.org HAL daemon"
-msgstr ""
-
-#: obj-i686-linux-gnu/kdm/kfrontend/sessions/kde.desktop:6
-msgctxt "Name"
-msgid "KDE"
-msgstr ""
-
-#: powerdevil/daemon/backends/upower/backlight_helper_actions.actions:53
-msgctxt "Name"
-msgid "Get brightness"
-msgstr ""
-
-#: powerdevil/daemon/backends/upower/backlight_helper_actions.actions:96
-msgctxt "Description"
-msgid "System policies prevent you from getting the brightness level."
-msgstr ""
-
-#: powerdevil/daemon/backends/upower/backlight_helper_actions.actions:140
-msgctxt "Name"
-msgid "Set brightness"
-msgstr ""
-
-#: powerdevil/daemon/backends/upower/backlight_helper_actions.actions:186
-msgctxt "Description"
-msgid "System policies prevent you from setting the brightness level."
-msgstr ""
-
-#: powerdevil/daemon/backends/upower/powerdevilupowerbackend.desktop:7
-msgctxt "Name"
-msgid "UPower PowerDevil Backend"
-msgstr ""
-
-#: powerdevil/daemon/backends/upower/powerdevilupowerbackend.desktop:52
-msgctxt "Comment"
-msgid "Use KDE Power Management system through freedesktop.org upower daemon"
-msgstr ""
-
-#: solid/networkmanager-0.7/solid_networkmanager07.desktop:6
-msgctxt "Name"
-msgid "NetworkManager 0.7"
-msgstr ""
-
-#: solid/networkmanager-0.7/solid_networkmanager07.desktop:81
-msgctxt "Comment"
-msgid "Network management using the NetworkManager daemon, version 0.7"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kubuntu-firefox-installer.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kubuntu-firefox-installer.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kubuntu-firefox-installer.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kubuntu-firefox-installer.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Welsh translation for kubuntu-firefox-installer
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the kubuntu-firefox-installer package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: kubuntu-firefox-installer\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-07-12 18:59+0000\n"
-"PO-Revision-Date: 2010-12-18 01:38+0000\n"
-"Last-Translator: David Jones <Unknown>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: src/firefox.desktop:3
-msgctxt "Name"
-msgid "Mozilla Firefox Browser Installer"
-msgstr "Mozilla Firefox Borydd Gosodwr"
-
-#: src/firefox.desktop:4
-msgctxt "GenericName"
-msgid "Mozilla Firefox Browser Installer"
-msgstr "Mozilla Firefox Borydd Gosodwr"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kvkbd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kvkbd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_kvkbd.po	2012-03-23 07:39:20.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_kvkbd.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Welsh translation for kvkbd
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the kvkbd package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: kvkbd\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-21 20:49+0000\n"
-"PO-Revision-Date: 2009-09-09 20:46+0000\n"
-"Last-Translator: Ciarán <ciax@live.com>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: src/kvkbd.desktop:2
-msgctxt "Name"
-msgid "Kvkbd"
-msgstr "Kvkbd"
-
-#: src/kvkbd.desktop:7
-msgctxt "Comment"
-msgid "A virtual keyboard for KDE"
-msgstr "Bysellfwrdd rhithwir ar gyfer KDE"
-
-#: src/kvkbd.desktop:25
-msgctxt "GenericName"
-msgid "Virtual Keyboard"
-msgstr "Bysellfwrdd Rhithwir"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_oxygen-icons.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_oxygen-icons.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_oxygen-icons.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_oxygen-icons.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-# Welsh translation for oxygen-icons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the oxygen-icons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: oxygen-icons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 17:53+0000\n"
-"PO-Revision-Date: 2010-11-11 14:11+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:45+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: index.theme:2
-msgctxt "Name"
-msgid "Oxygen"
-msgstr "Oxygen"
-
-#: index.theme:29
-msgctxt "Comment"
-msgid "Oxygen Team"
-msgstr "Tîm Oxygen"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_userconfig.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_userconfig.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/desktop_userconfig.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/desktop_userconfig.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-# Welsh translation for userconfig
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the userconfig package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: userconfig\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-09 13:49+0000\n"
-"PO-Revision-Date: 2010-12-01 11:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Welsh <cy@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:46+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: userconfig.desktop:2
-msgctxt "Name"
-msgid "User Management"
-msgstr "Defnyddiwr Rheolaeth"
-
-#: userconfig.desktop:17
-msgctxt "Comment"
-msgid "Users & Groups Administration"
-msgstr ""
-
-#: userconfig.desktop:48
-msgctxt "GenericName"
-msgid "User Account Editor"
-msgstr "Golygydd Cyfrif Defnyddiwr"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/dirfilterplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/dirfilterplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/dirfilterplugin.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/dirfilterplugin.po	2012-04-18 08:59:36.000000000 +0000
@@ -4,41 +4,37 @@
 msgstr ""
 "Project-Id-Version: dirfilterplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-02-15 21:58+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:15+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:39+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: dirfilterplugin.cpp:137
+#: dirfilterplugin.cpp:140
 msgid "View F&ilter"
 msgstr "Gweld &Hidlen"
 
-#: dirfilterplugin.cpp:141
+#: dirfilterplugin.cpp:144
 msgid "Allow to filter the currently displayed items by filetype."
 msgstr ""
 
-#: dirfilterplugin.cpp:163
-msgid "Filter Field"
-msgstr ""
-
-#: dirfilterplugin.cpp:201
+#: dirfilterplugin.cpp:193
 msgid "Only Show Items of Type"
 msgstr "Dangos yn Unig Eitemau o Fath"
 
-#: dirfilterplugin.cpp:261
+#: dirfilterplugin.cpp:254
 msgid "Use Multiple Filters"
 msgstr "Defnyddio Hidlenni Lluosol"
 
-#: dirfilterplugin.cpp:267
+#: dirfilterplugin.cpp:260
 msgid "Show Count"
 msgstr "Dangos y Cyfrif"
 
-#: dirfilterplugin.cpp:272
+#: dirfilterplugin.cpp:265
 msgid "Reset"
 msgstr "Ailosod"
 
@@ -53,9 +49,3 @@
 #: rc.cpp:6
 msgid "Extra Toolbar"
 msgstr "Bar Offer Ychwanegol"
-
-#. i18n: file: dirfilterplugin.rc:11
-#. i18n: ectx: ToolBar (locationToolBar)
-#: rc.cpp:9
-msgid "Filter Toolbar"
-msgstr "Bar Offer Ychwanegol"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/display.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/display.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/display.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/display.po	2012-04-18 08:59:37.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: display\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-07-28 08:34+0000\n"
 "Last-Translator: Ciarán <ciax@live.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:43+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: display.cpp:44
 msgid "Size && Orientation"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/domtreeviewer.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/domtreeviewer.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/domtreeviewer.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/domtreeviewer.po	2012-04-18 08:59:36.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: domtreeviewer\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-31 04:55+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:41+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: domtreecommands.cpp:33
 msgid "No error"
@@ -88,35 +88,35 @@
 msgid "Unknown Exception %1"
 msgstr ""
 
-#: domtreecommands.cpp:296
+#: domtreecommands.cpp:300
 msgid "Add attribute"
 msgstr ""
 
-#: domtreecommands.cpp:326
+#: domtreecommands.cpp:330
 msgid "Change attribute value"
 msgstr ""
 
-#: domtreecommands.cpp:357
+#: domtreecommands.cpp:361
 msgid "Remove attribute"
 msgstr ""
 
-#: domtreecommands.cpp:389
+#: domtreecommands.cpp:393
 msgid "Rename attribute"
 msgstr ""
 
-#: domtreecommands.cpp:425
+#: domtreecommands.cpp:429
 msgid "Change textual content"
 msgstr ""
 
-#: domtreecommands.cpp:487
+#: domtreecommands.cpp:491
 msgid "Insert node"
 msgstr ""
 
-#: domtreecommands.cpp:515
+#: domtreecommands.cpp:519
 msgid "Remove node"
 msgstr ""
 
-#: domtreecommands.cpp:561
+#: domtreecommands.cpp:565
 msgid "Move node"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/drkonqi.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/drkonqi.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/drkonqi.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/drkonqi.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: drkonqi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:33+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:41+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:03+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: aboutbugreportingdialog.cpp:34
 msgctxt "@title title of the dialog"
@@ -63,7 +63,7 @@
 msgstr ""
 
 #: aboutbugreportingdialog.cpp:67 aboutbugreportingdialog.cpp:170
-#: reportassistantdialog.cpp:71
+#: reportassistantdialog.cpp:74
 msgctxt "@title"
 msgid "What do you know about the crash?"
 msgstr ""
@@ -291,7 +291,7 @@
 msgid "<note>You should write in English.</note>"
 msgstr ""
 
-#: aboutbugreportingdialog.cpp:178
+#: aboutbugreportingdialog.cpp:178 reportassistantdialog.cpp:144
 msgctxt "@title"
 msgid "Sending the Crash Report"
 msgstr ""
@@ -327,7 +327,7 @@
 "on FreeNode IRC) "
 msgstr ""
 
-#: reportassistantpages_base.cpp:181
+#: applicationdetailsexamples.cpp:34
 msgctxt "@info examples about information the user can provide"
 msgid ""
 "Widgets you have in your desktop and panels (both official and unofficial), "
@@ -335,56 +335,56 @@
 "configuration."
 msgstr ""
 
-#: reportassistantpages_base.cpp:185
+#: applicationdetailsexamples.cpp:38
 msgctxt "@info examples about information the user can provide"
 msgid ""
 "State of Desktop Effects (Compositing), kind of effects enabled, window "
 "decoration, and specific window rules and configuration."
 msgstr ""
 
-#: reportassistantpages_base.cpp:190
+#: applicationdetailsexamples.cpp:43
 msgctxt "@info examples about information the user can provide"
 msgid ""
 "sites you were visiting, number of opened tabs, plugins you have installed, "
 "and any other non-default setting."
 msgstr ""
 
-#: reportassistantpages_base.cpp:194
+#: applicationdetailsexamples.cpp:47
 msgctxt "@info examples about information the user can provide"
 msgid ""
 "File view mode, grouping and sorting settings, preview settings, and "
 "directory you were browsing."
 msgstr ""
 
-#: reportassistantpages_base.cpp:197
+#: applicationdetailsexamples.cpp:50
 msgctxt "@info examples about information the user can provide"
 msgid ""
 "Instant Messaging protocols you use, and plugins you have installed "
 "(official and unofficial)."
 msgstr ""
 
-#: reportassistantpages_base.cpp:200
+#: applicationdetailsexamples.cpp:53
 msgctxt "@info examples about information the user can provide"
 msgid "Mail protocols and account-types you use."
 msgstr ""
 
-#: reportassistantpages_base.cpp:205
+#: applicationdetailsexamples.cpp:58
 msgctxt "@info examples about information the user can provide"
 msgid "Type of the document you were editing."
 msgstr ""
 
-#: reportassistantpages_base.cpp:211
+#: applicationdetailsexamples.cpp:64
 msgctxt "@info examples about information the user can provide"
 msgid ""
 "Type of media (extension and format) you were watching and/or listening to."
 msgstr ""
 
-#: backtracewidget.cpp:60
+#: backtracewidget.cpp:70
 msgctxt "@action:button"
 msgid "&Reload"
 msgstr ""
 
-#: backtracewidget.cpp:61
+#: backtracewidget.cpp:71
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to reload the crash information (backtrace). This is useful "
@@ -392,23 +392,23 @@
 "obtain a better backtrace."
 msgstr ""
 
-#: backtracewidget.cpp:68
+#: backtracewidget.cpp:78
 msgctxt "@action:button"
 msgid "&Install Debug Symbols"
 msgstr ""
 
-#: backtracewidget.cpp:69
+#: backtracewidget.cpp:79
 msgctxt "@info:tooltip"
 msgid "Use this button to install the missing debug symbols packages."
 msgstr ""
 
-#: backtracewidget.cpp:75
+#: backtracewidget.cpp:85
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to copy the crash information (backtrace) to the clipboard."
 msgstr ""
 
-#: backtracewidget.cpp:82
+#: backtracewidget.cpp:92
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to save the crash information (backtrace) to a file. This is "
@@ -424,7 +424,7 @@
 "are commonly used during interactive and post-mortem debugging.</p>"
 msgstr ""
 
-#: backtracewidget.cpp:97 reportassistantpages_bugzilla_duplicates.cpp:549
+#: backtracewidget.cpp:134 reportassistantpages_bugzilla_duplicates.cpp:631
 msgctxt "@info:status"
 msgid "Loading..."
 msgstr ""
@@ -434,19 +434,19 @@
 msgid "Generating backtrace... (this may take some time)"
 msgstr ""
 
-#: backtracewidget.cpp:146
+#: backtracewidget.cpp:188
 msgctxt "@info"
 msgid ""
 "Another debugger is currently debugging the same application. The crash "
 "information could not be fetched."
 msgstr ""
 
-#: backtracewidget.cpp:150
+#: backtracewidget.cpp:192
 msgctxt "@info:status"
 msgid "The crash information could not be fetched."
 msgstr ""
 
-#: backtracewidget.cpp:152
+#: backtracewidget.cpp:194
 msgctxt "@info/rich"
 msgid ""
 "Another debugging process is attached to the crashed application. Therefore, "
@@ -503,29 +503,29 @@
 "button."
 msgstr ""
 
-#: backtracewidget.cpp:219
+#: backtracewidget.cpp:288
 msgctxt "@info:status"
 msgid "The debugger has quit unexpectedly."
 msgstr ""
 
-#: backtracewidget.cpp:222 backtracewidget.cpp:235
+#: backtracewidget.cpp:291 backtracewidget.cpp:306
 msgctxt "@info:status"
 msgid "The crash information could not be generated."
 msgstr ""
 
-#: backtracewidget.cpp:225
+#: backtracewidget.cpp:294
 msgctxt "@info/rich"
 msgid ""
 "You could try to regenerate the backtrace by clicking the "
 "<interface>Reload</interface> button."
 msgstr ""
 
-#: backtracewidget.cpp:231
+#: backtracewidget.cpp:302
 msgctxt "@info:status"
 msgid "The debugger application is missing or could not be launched."
 msgstr ""
 
-#: backtracewidget.cpp:237
+#: backtracewidget.cpp:308
 #, kde-format
 msgctxt "@info/rich"
 msgid ""
@@ -533,7 +533,7 @@
 "<interface>Reload</interface> button."
 msgstr ""
 
-#: backtracewidget.cpp:291
+#: backtracewidget.cpp:363
 msgctxt "@title:window"
 msgid "Error during the installation of debug symbols"
 msgstr ""
@@ -549,63 +549,62 @@
 msgid "Missing debug information packages"
 msgstr ""
 
-#: bugzillalib.cpp:249
+#: bugzillalib.cpp:251
 msgctxt "@info"
 msgid "Unknown response from the server"
 msgstr ""
 
-#: bugzillalib.cpp:281 reportassistantpages_bugzilla_duplicates.cpp:745
+#: bugzillalib.cpp:271 reportassistantpages_bugzilla_duplicates.cpp:818
 msgctxt "@info"
 msgid ""
 "Invalid report information (malformed data). This could mean that the bug "
 "report does not exist, or the bug tracking site is experiencing a problem."
 msgstr ""
 
-#: bugzillalib.cpp:289
+#: bugzillalib.cpp:293
 msgctxt "@info"
 msgid "Invalid bug list: corrupted data"
 msgstr ""
 
-#: bugzillalib.cpp:328 bugzillalib.cpp:367 bugzillalib.cpp:415
-#: bugzillalib.cpp:444
+#: bugzillalib.cpp:340 bugzillalib.cpp:556
 msgctxt "@info"
 msgid "Unknown error"
 msgstr ""
 
-#: bugzillalib.cpp:370
+#: bugzillalib.cpp:365
 #, kde-format
 msgctxt "@info"
 msgid "Error while attaching the data to the bug report: %1"
 msgstr ""
 
-#: bugzillalib.cpp:415
+#: bugzillalib.cpp:405
 msgctxt "@info"
 msgid "Missing bug ID or comment in the query. Unknown error"
 msgstr ""
 
-#: bugzillalib.cpp:438
+#: bugzillalib.cpp:429
 #, kde-format
 msgctxt "@info"
 msgid "Error while adding a new comment into the bug report: %1"
 msgstr ""
 
-#: bugzillalib.cpp:442
+#: bugzillalib.cpp:433
 msgctxt "@info"
 msgid "Unknown error while adding a new comment into the bug report"
 msgstr ""
 
-#: bugzillalib.cpp:473
+#: bugzillalib.cpp:469
 msgctxt "@info"
 msgid "Missing bug ID in the query. Unknown error"
 msgstr ""
 
-#: bugzillalib.cpp:447
+#: bugzillalib.cpp:492
 #, kde-format
 msgctxt "@info"
 msgid "Error while adding yourself to the CC list: %1"
 msgstr ""
 
-#: bugzillalib.cpp:653
+#: bugzillalib.cpp:554
 msgctxt "@info"
 msgid "You are not logged in. Make sure cookies are enabled."
 msgstr ""
@@ -632,23 +631,23 @@
 "packages."
 msgstr ""
 
-#: drkonqi.cpp:123
+#: drkonqi.cpp:151
 #, kde-format
 msgctxt "@info"
 msgid "Report saved to <filename>%1</filename>."
 msgstr ""
 
-#: drkonqi.cpp:126
+#: drkonqi.cpp:154
 msgctxt "@info"
 msgid "Could not create a file in which to save the report."
 msgstr ""
 
-#: drkonqi.cpp:137
+#: drkonqi.cpp:165 reportassistantpages_bugzilla.cpp:819
 msgctxt "@title:window"
 msgid "Select Filename"
 msgstr ""
 
-#: drkonqi.cpp:153
+#: drkonqi.cpp:187 reportassistantpages_bugzilla.cpp:840
 #, kde-format
 msgctxt "@info"
 msgid "Cannot open file <filename>%1</filename> for writing."
@@ -681,7 +680,7 @@
 "to include the backtrace from the Developers Information tab.</para>"
 msgstr ""
 
-#: drkonqidialog.cpp:104
+#: drkonqidialog.cpp:112
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -690,7 +689,7 @@
 "(including the backtrace from the Developer Information tab.)</para>"
 msgstr ""
 
-#: drkonqidialog.cpp:110
+#: drkonqidialog.cpp:118
 msgctxt "@info"
 msgid ""
 "<para>You can help us improve KDE Software by reporting this error.<nl "
@@ -699,19 +698,19 @@
 "do not want to report this bug.</note></para>"
 msgstr ""
 
-#: drkonqidialog.cpp:117
+#: drkonqidialog.cpp:125
 msgctxt "@info"
 msgid ""
 "<para>You cannot report this error, because the application does not provide "
 "a bug reporting address.</para>"
 msgstr ""
 
-#: drkonqidialog.cpp:127
+#: drkonqidialog.cpp:135
 msgctxt "@label"
 msgid "Details:"
 msgstr ""
 
-#: drkonqidialog.cpp:129
+#: drkonqidialog.cpp:137
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -719,133 +718,137 @@
 "Signal: %3 (%4)</para>"
 msgstr ""
 
-#: drkonqidialog.cpp:144
+#: drkonqidialog.cpp:160
 msgctxt "@action:button"
 msgid "Report Bug"
 msgstr ""
 
-#: drkonqidialog.cpp:147
+#: drkonqidialog.cpp:163
 msgctxt "@info:tooltip"
 msgid "Starts the bug report assistant."
 msgstr ""
 
-#: drkonqidialog.cpp:156
+#: drkonqidialog.cpp:175
 msgctxt ""
 "@action:button this is the debug menu button label which contains the "
 "debugging applications"
 msgid "Debug"
 msgstr ""
 
-#: drkonqidialog.cpp:157
+#: drkonqidialog.cpp:176
 msgctxt "@info:tooltip"
 msgid "Starts a program to debug the crashed application."
 msgstr ""
 
-#: drkonqidialog.cpp:176
+#: drkonqidialog.cpp:195
 msgctxt "@action:button"
 msgid "Restart Application"
 msgstr ""
 
-#: drkonqidialog.cpp:178
+#: drkonqidialog.cpp:197
 msgctxt "@info:tooltip"
 msgid "Use this button to restart the crashed application."
 msgstr ""
 
-#: drkonqidialog.cpp:186
+#: drkonqidialog.cpp:206
 msgctxt "@info:tooltip"
 msgid "Close this dialog (you will lose the crash information.)"
 msgstr ""
 
-#: drkonqidialog.cpp:197
+#: drkonqidialog.cpp:217
 #, kde-format
 msgctxt "@action:inmenu 1 is the debugger name"
 msgid "Debug in <application>%1</application>"
 msgstr ""
 
+#: findconfigdatajob.cpp:64
+msgid "Failed to retrieve the config data."
+msgstr ""
+
 #: main.cpp:41
 msgid ""
 "The KDE Crash Handler gives the user feedback if a program has crashed."
 msgstr ""
 
-#: main.cpp:57
+#: main.cpp:59
 msgid "The KDE Crash Handler"
 msgstr "Y Trinydd Chwalfeydd KDE"
 
-#: main.cpp:60
+#: main.cpp:62
 msgid "(C) 2000-2009, The DrKonqi Authors"
 msgstr ""
 
-#: main.cpp:61
+#: main.cpp:63
 msgctxt "@info:credit"
 msgid "Hans Petter Bieker"
 msgstr ""
 
-#: main.cpp:63
+#: main.cpp:65
 msgctxt "@info:credit"
 msgid "Dario Andres Rodriguez"
 msgstr ""
 
-#: main.cpp:65
+#: main.cpp:67
 msgctxt "@info:credit"
 msgid "George Kiagiadakis"
 msgstr ""
 
-#: main.cpp:67
+#: main.cpp:69
 msgctxt "@info:credit"
 msgid "A. L. Spehr"
 msgstr ""
 
-#: main.cpp:74
+#: main.cpp:76
 msgctxt "@info:shell"
 msgid "The signal number that was caught"
 msgstr ""
 
-#: main.cpp:75
+#: main.cpp:77
 msgctxt "@info:shell"
 msgid "Name of the program"
 msgstr ""
 
-#: main.cpp:76
+#: main.cpp:78
 msgctxt "@info:shell"
 msgid "Path to the executable"
 msgstr ""
 
-#: main.cpp:77
+#: main.cpp:79
 msgctxt "@info:shell"
 msgid "The version of the program"
 msgstr ""
 
-#: main.cpp:78
+#: main.cpp:80
 msgctxt "@info:shell"
 msgid "The bug address to use"
 msgstr ""
 
-#: main.cpp:79
+#: main.cpp:81
 msgctxt "@info:shell"
 msgid "Translated name of the program"
 msgstr ""
 
-#: main.cpp:80
+#: main.cpp:82
 msgctxt "@info:shell"
 msgid "The PID of the program"
 msgstr ""
 
-#: main.cpp:81
+#: main.cpp:83
 msgctxt "@info:shell"
 msgid "Startup ID of the program"
 msgstr ""
 
-#: main.cpp:82
+#: main.cpp:84
 msgctxt "@info:shell"
 msgid "The program was started by kdeinit"
 msgstr ""
 
-#: main.cpp:83
+#: main.cpp:85
 msgctxt "@info:shell"
 msgid "Disable arbitrary disk access"
 msgstr ""
 
-#: main.cpp:84
+#: main.cpp:86
 msgctxt "@info:shell"
 msgid "The program has already been restarted"
 msgstr ""
@@ -889,7 +892,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:54
 #. i18n: ectx: property (text), widget (QRadioButton, m_rememberCrashSituationNo)
-#: rc.cpp:12
+#: rc.cpp:11
 msgctxt ""
 "@option:radio \"No\" to the question \"do you remember what were you doing "
 "prior to the crash?\""
@@ -898,7 +901,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:90
 #. i18n: ectx: property (text), widget (QLabel, m_reproducibleLabel)
-#: rc.cpp:16
+#: rc.cpp:14
 msgctxt "@label question"
 msgid ""
 "<strong>Does the application crash again if you repeat the same "
@@ -907,7 +910,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:118
 #. i18n: ectx: property (toolTip), widget (KComboBox, m_reproducibleBox)
-#: rc.cpp:19
+#: rc.cpp:17
 msgctxt "@info:tooltip"
 msgid ""
 "If you tried to repeat the situation, select how often the application "
@@ -916,7 +919,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:121
 #. i18n: ectx: property (whatsThis), widget (KComboBox, m_reproducibleBox)
-#: rc.cpp:22
+#: rc.cpp:20
 msgctxt "@info:whatsthis"
 msgid ""
 "If you tried to repeat the situation, select how often the application "
@@ -925,14 +928,14 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:125
 #. i18n: ectx: property (text), item, widget (KComboBox, m_reproducibleBox)
-#: rc.cpp:25
+#: rc.cpp:23
 msgctxt "@item:inlistbox  user didn't tried to repeat the crash situation"
 msgid "I did not try again"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:130
 #. i18n: ectx: property (text), item, widget (KComboBox, m_reproducibleBox)
-#: rc.cpp:28
+#: rc.cpp:26
 msgctxt ""
 "@item:inlistbox the crash cannot be reproduce. reproduciblity->never"
 msgid "Never"
@@ -940,21 +943,21 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:135
 #. i18n: ectx: property (text), item, widget (KComboBox, m_reproducibleBox)
-#: rc.cpp:31
+#: rc.cpp:29
 msgctxt "@item:inlistbox the bug can be reproduced sometimes"
 msgid "Sometimes"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:140
 #. i18n: ectx: property (text), item, widget (KComboBox, m_reproducibleBox)
-#: rc.cpp:34
+#: rc.cpp:32
 msgctxt "@item:inlistbox the bug can be reproduced every time"
 msgid "Every time"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:182
 #. i18n: ectx: property (text), widget (QLabel, m_informationLabel)
-#: rc.cpp:37
+#: rc.cpp:35
 msgctxt "@label question"
 msgid ""
 "<strong>Please select which additional information you can provide:</strong>"
@@ -962,7 +965,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:212
 #. i18n: ectx: property (toolTip), widget (QCheckBox, m_actionsInsideApp)
-#: rc.cpp:40
+#: rc.cpp:38
 msgctxt "@info:tooltip"
 msgid ""
 "Check this option if you can describe what were you doing inside the "
@@ -971,7 +974,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:215
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_actionsInsideApp)
-#: rc.cpp:43
+#: rc.cpp:41
 msgctxt "@info:whatsthis"
 msgid ""
 "Check this option if you can describe what were you doing inside the "
@@ -980,7 +983,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:225
 #. i18n: ectx: property (toolTip), widget (QCheckBox, m_unusualSituation)
-#: rc.cpp:46
+#: rc.cpp:44
 msgctxt "@info:tooltip"
 msgid ""
 "Check this option if you can describe any unusual behavior or appearance in "
@@ -989,16 +992,16 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:228
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_unusualSituation)
-#: rc.cpp:49
+#: rc.cpp:47
 msgctxt "@info:whatsthis"
 msgid ""
 "Check this option if you can describe any unusual behavior or appearance in "
 "the application or the whole desktop"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugawareness.ui:216
+#. i18n: file: ui/assistantpage_bugawareness.ui:231
 #. i18n: ectx: property (text), widget (QCheckBox, m_unusualSituation)
-#: rc.cpp:34
+#: rc.cpp:50
 msgctxt ""
 "@option:check kind of information the user can provide about the crash"
 msgid "Unusual desktop behavior I noticed"
@@ -1006,7 +1009,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:246
 #. i18n: ectx: property (toolTip), widget (QCheckBox, m_appSpecificDetails)
-#: rc.cpp:55
+#: rc.cpp:53
 msgctxt "@info:tooltip"
 msgid ""
 "Check this option if you can provide application specific details or "
@@ -1016,7 +1019,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:249
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_appSpecificDetails)
-#: rc.cpp:58
+#: rc.cpp:56
 msgctxt "@info:whatsthis"
 msgid ""
 "Check this option if you can provide application specific details or "
@@ -1024,9 +1027,9 @@
 "available.)"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugawareness.ui:226
+#. i18n: file: ui/assistantpage_bugawareness.ui:252
 #. i18n: ectx: property (text), widget (QCheckBox, m_appSpecificDetails)
-#: rc.cpp:37
+#: rc.cpp:59
 msgctxt ""
 "@option:check kind of information the user can provide about the crash"
 msgid "Custom settings of the application that may be related"
@@ -1034,7 +1037,7 @@
 
 #. i18n: file: ui/assistantpage_bugawareness.ui:284
 #. i18n: ectx: property (text), widget (QLabel, m_appSpecificDetailsExamples)
-#: rc.cpp:64
+#: rc.cpp:62
 msgctxt ""
 "@label clicking/hovering this, the user will get examples about application "
 "specific details s/he can provide"
@@ -1043,7 +1046,7 @@
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates.ui:17
 #. i18n: ectx: property (text), widget (QLabel, m_explanationLabel)
-#: rc.cpp:40
+#: rc.cpp:65
 msgctxt "@info/rich"
 msgid ""
 "See if your bug has already been reported. Double click a report in the list "
@@ -1053,21 +1056,21 @@
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates.ui:72
 #. i18n: ectx: property (text), widget (QTreeWidget, m_bugListWidget)
-#: rc.cpp:43
+#: rc.cpp:68
 msgctxt "@title:column"
 msgid "Bug ID"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates.ui:77
 #. i18n: ectx: property (text), widget (QTreeWidget, m_bugListWidget)
-#: rc.cpp:46
+#: rc.cpp:71
 msgctxt "@title:column"
 msgid "Description"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates.ui:119
 #. i18n: ectx: property (text), widget (QLabel, m_selectedPossibleDuplicatesLabel)
-#: rc.cpp:49
+#: rc.cpp:74
 msgctxt ""
 "@label title of a listbox where the possible duplicate bug numbers are put in"
 msgid "Possible duplicates:"
@@ -1075,7 +1078,7 @@
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog.ui:81
 #. i18n: ectx: property (text), widget (QCheckBox, m_showOwnBacktraceCheckBox)
-#: rc.cpp:79
+#: rc.cpp:77
 msgctxt ""
 "@option:check user must check this to preview the own backtrace (in order to "
 "compare it with the one in the showed report)"
@@ -1084,7 +1087,7 @@
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:42
 #. i18n: ectx: property (text), widget (QLabel, commonCrashLabel)
-#: rc.cpp:82
+#: rc.cpp:80
 msgid ""
 "This is likely to be a <strong>common crash</strong>, and a lot of different "
 "cases' details may have been provided already. <i>Proceed only if you can "
@@ -1093,51 +1096,51 @@
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:115
 #. i18n: ectx: property (text), widget (QLabel, proceedLabel)
-#: rc.cpp:85
+#: rc.cpp:83
 msgid "<strong>Do you want to proceed with the reporting process?</strong>"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:142
 #. i18n: ectx: property (text), widget (QRadioButton, proceedRadioNo)
-#: rc.cpp:88
+#: rc.cpp:86
 msgid "No, do not file a new bug report, and cancel the assistant"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:152
 #. i18n: ectx: property (text), widget (QRadioButton, proceedRadioYes)
-#: rc.cpp:92
+#: rc.cpp:89
 msgid "Proceed with reporting the bug"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:182
 #. i18n: ectx: property (text), widget (QLabel, areYouSureLabel)
-#: rc.cpp:96
+#: rc.cpp:92
 msgid ""
 "<strong>Are you sure this report matches your crash situation?</strong>"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:209
 #. i18n: ectx: property (text), widget (QRadioButton, markAsDuplicateCheck)
-#: rc.cpp:99
+#: rc.cpp:95
 msgid "Not really sure: mark as a possible duplicate"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_duplicates_dialog_confirmation.ui:219
 #. i18n: ectx: property (text), widget (QRadioButton, attachToBugReportCheck)
-#: rc.cpp:103
+#: rc.cpp:98
 msgid "Completely sure: attach my information to this report"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_information.ui:17
 #. i18n: ectx: property (text), widget (QLabel, m_explanationLabel)
-#: rc.cpp:55
+#: rc.cpp:101
 msgctxt "@info/rich"
 msgid "Complete the bug report fields: <note>Use English.</note>"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_information.ui:27
 #. i18n: ectx: property (text), widget (QLabel, m_titleLabel)
-#: rc.cpp:58
+#: rc.cpp:104
 msgctxt "@label:textbox"
 msgid ""
 "<strong>Title of the bug report:</strong> (<a href=\"#\">examples</a>)"
@@ -1145,89 +1148,89 @@
 
 #. i18n: file: ui/assistantpage_bugzilla_information.ui:39
 #. i18n: ectx: property (text), widget (QLabel, m_detailsLabel)
-#: rc.cpp:112
+#: rc.cpp:107
 msgctxt "@label:textbox"
 msgid ""
 "<strong>Information about the crash:</strong> (<a href=\"#\">help and "
 "examples</a>)"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugzilla_information.ui:51
+#. i18n: file: ui/assistantpage_bugzilla_information.ui:55
 #. i18n: ectx: property (title), widget (QGroupBox, m_distributionGroupBox)
-#: rc.cpp:64
+#: rc.cpp:110
 msgctxt "@title:group"
 msgid "Distribution method:"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugzilla_information.ui:62
+#. i18n: file: ui/assistantpage_bugzilla_information.ui:66
 #. i18n: ectx: property (text), widget (QCheckBox, m_compiledSourcesCheckBox)
-#: rc.cpp:67
+#: rc.cpp:113
 msgctxt "@option:check"
 msgid "KDE Platform is compiled from sources"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugzilla_information.ui:90
+#. i18n: file: ui/assistantpage_bugzilla_information.ui:94
 #. i18n: ectx: property (text), widget (QLabel, m_crashInfoLabel)
-#: rc.cpp:70
+#: rc.cpp:116
 msgctxt "@info/rich"
 msgid ""
 "<note>The crash and system information will be automatically added to the "
 "bug report.</note>"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugzilla_login.ui:22
+#. i18n: file: ui/assistantpage_bugzilla_login.ui:38
 #. i18n: ectx: property (text), widget (QLabel, m_userLabel)
-#: rc.cpp:73
+#: rc.cpp:119
 msgctxt "@label:textbox bugzilla account username"
 msgid "Username:"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugzilla_login.ui:29
+#. i18n: file: ui/assistantpage_bugzilla_login.ui:45
 #. i18n: ectx: property (text), widget (QLabel, m_passwordLabel)
-#: rc.cpp:76
+#: rc.cpp:122
 msgctxt "@label:textbox bugzilla account password"
 msgid "Password:"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_bugzilla_login.ui:48
+#. i18n: file: ui/assistantpage_bugzilla_login.ui:71
 #. i18n: ectx: property (text), widget (QCheckBox, m_savePasswordCheckBox)
-#: rc.cpp:79
+#: rc.cpp:125
 msgctxt "@option:check"
 msgid "Save login information using the KDE Wallet system"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_preview.ui:18
 #. i18n: ectx: property (text), widget (QLabel, m_previewDescriptionLabel)
-#: rc.cpp:82
+#: rc.cpp:128
 msgctxt "@label"
 msgid ""
 "This is a preview of the report's contents which will be sent. <nl />\n"
-"If you want to modify it go the previous pages."
+"If you want to modify it go to the previous pages."
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_send.ui:75
 #. i18n: ectx: property (text), widget (QCheckBox, m_launchPageOnFinish)
-#: rc.cpp:86
+#: rc.cpp:132
 msgctxt "@option:check"
 msgid "Open the bug report page when clicking the Finish button"
 msgstr ""
 
 #. i18n: file: ui/assistantpage_bugzilla_send.ui:98
 #. i18n: ectx: property (text), widget (QCheckBox, m_restartAppOnFinish)
-#: rc.cpp:89
+#: rc.cpp:135
 msgctxt "@option:check"
 msgid "Restart the application when clicking the Finish button"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_conclusions.ui:70
+#. i18n: file: ui/assistantpage_conclusions.ui:73
 #. i18n: ectx: property (text), widget (QCheckBox, m_restartAppOnFinish)
-#: rc.cpp:92
+#: rc.cpp:138
 msgid "Restart the application when clicking the Finish button"
 msgstr ""
 
-#. i18n: file: ui/assistantpage_introduction.ui:20
+#. i18n: file: ui/assistantpage_introduction.ui:17
 #. i18n: ectx: property (text), widget (QLabel, m_introLabel)
-#: rc.cpp:95
+#: rc.cpp:141
 msgctxt "@info"
 msgid ""
 "This assistant will analyze the crash information and guide you through the "
@@ -1236,7 +1239,7 @@
 
 #. i18n: file: ui/assistantpage_introduction.ui:77
 #. i18n: ectx: property (text), widget (QLabel, m_warningLabel)
-#: rc.cpp:149
+#: rc.cpp:144
 msgctxt "@info note before starting the bug reporting process"
 msgid ""
 "<p><note>Since communication between you and the developers is required for "
@@ -1247,16 +1250,16 @@
 
 #. i18n: file: ui/backtracewidget.ui:100
 #. i18n: ectx: property (text), widget (QCheckBox, m_toggleBacktraceCheckBox)
-#: rc.cpp:153
+#: rc.cpp:147
 msgid "Show backtrace content (advanced)"
 msgstr ""
 
-#: reportassistantdialog.cpp:48
+#: reportassistantdialog.cpp:49
 msgctxt "@title:window"
 msgid "Crash Reporting Assistant"
 msgstr ""
 
-#: reportassistantdialog.cpp:61
+#: reportassistantdialog.cpp:64
 msgctxt "@title"
 msgid "Welcome to the Reporting Assistant"
 msgstr ""
@@ -1291,52 +1294,52 @@
 msgid "Preview the Report"
 msgstr ""
 
-#: reportassistantdialog.cpp:318
+#: reportassistantdialog.cpp:337
 msgctxt "@action:button"
 msgid "Close the assistant"
 msgstr ""
 
-#: reportassistantdialog.cpp:321
+#: reportassistantdialog.cpp:340
 msgctxt "@action:button"
 msgid "Cancel"
 msgstr ""
 
-#: reportassistantdialog.cpp:328
+#: reportassistantdialog.cpp:347
 msgctxt "@action:button"
 msgid "Save information and close"
 msgstr ""
 
-#: reportassistantdialog.cpp:331
+#: reportassistantdialog.cpp:350
 msgctxt "@info"
 msgid ""
-"Do you really want to close the bug reporting assistant?<note>The crash "
+"Do you really want to close the bug reporting assistant? <note>The crash "
 "information is still valid, so you can save the report before closing if you "
 "want.</note>"
 msgstr ""
 
-#: reportassistantdialog.cpp:334 reportassistantdialog.cpp:349
+#: reportassistantdialog.cpp:353 reportassistantdialog.cpp:368
 msgctxt "@title:window"
 msgid "Close the Assistant"
 msgstr ""
 
-#: reportassistantdialog.cpp:347
+#: reportassistantdialog.cpp:366
 msgctxt "@info"
 msgid "Do you really want to close the bug reporting assistant?"
 msgstr ""
 
-#: reportassistantpages_base.cpp:105
+#: reportassistantpages_base.cpp:107
 msgctxt "@info"
 msgid ""
 "This crash information is not useful enough, do you want to try to improve "
 "it? You will need to install some debugging packages."
 msgstr ""
 
-#: reportassistantpages_base.cpp:108
+#: reportassistantpages_base.cpp:110
 msgctxt "@title:window"
 msgid "Crash Information is not useful enough"
 msgstr ""
 
-#: reportassistantpages_base.cpp:131
+#: reportassistantpages_base.cpp:133
 #, kde-format
 msgctxt ""
 "@option:check kind of information the user can provide about the crash, %1 "
@@ -1344,61 +1347,61 @@
 msgid "What I was doing when the application \"%1\" crashed"
 msgstr ""
 
-#: reportassistantpages_base.cpp:215
+#: reportassistantpages_base.cpp:199
 #, kde-format
 msgctxt "@label examples about information the user can provide"
 msgid "Examples: %1"
 msgstr ""
 
-#: reportassistantpages_base.cpp:249 reportassistantpages_bugzilla.cpp:488
+#: reportassistantpages_base.cpp:216 reportassistantpages_bugzilla.cpp:672
 msgctxt "@action:button"
 msgid "Sho&w Contents of the Report"
 msgstr ""
 
-#: reportassistantpages_base.cpp:251 reportassistantpages_bugzilla.cpp:490
+#: reportassistantpages_base.cpp:218 reportassistantpages_bugzilla.cpp:674
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to show the generated report information about this crash."
 msgstr ""
 
-#: reportassistantpages_base.cpp:279
+#: reportassistantpages_base.cpp:246
 #, kde-format
 msgctxt "@info/plain"
 msgid "Report to %1"
 msgstr ""
 
-#: reportassistantpages_base.cpp:311
+#: reportassistantpages_base.cpp:279
 msgctxt "@info"
 msgid "The automatically generated crash information is useful."
 msgstr ""
 
-#: reportassistantpages_base.cpp:316
+#: reportassistantpages_base.cpp:284
 msgctxt "@info"
 msgid ""
 "The automatically generated crash information lacks some details but may be "
 "still be useful."
 msgstr ""
 
-#: reportassistantpages_base.cpp:323
+#: reportassistantpages_base.cpp:291
 msgctxt "@info"
 msgid ""
 "The automatically generated crash information lacks important details and it "
 "is probably not helpful."
 msgstr ""
 
-#: reportassistantpages_base.cpp:333
+#: reportassistantpages_base.cpp:301
 msgctxt "@info"
 msgid "The crash information was not generated because it was not needed."
 msgstr ""
 
-#: reportassistantpages_base.cpp:337
+#: reportassistantpages_base.cpp:305
 msgctxt "@info"
 msgid ""
 "The automatically generated crash information does not contain enough "
 "information to be helpful."
 msgstr ""
 
-#: reportassistantpages_base.cpp:340
+#: reportassistantpages_base.cpp:308
 msgctxt "@info"
 msgid ""
 "<note>You can improve it by installing debugging packages and reloading the "
@@ -1406,24 +1409,30 @@
 "Guide by clicking on the <interface>Help</interface> button.</note>"
 msgstr ""
 
-#: reportassistantpages_base.cpp:354
+#: reportassistantpages_base.cpp:322
 msgctxt "@info"
 msgid "The information you can provide could be considered helpful."
 msgstr ""
 
-#: reportassistantpages_base.cpp:357
+#: reportassistantpages_base.cpp:325
 msgctxt "@info"
 msgid ""
 "The information you can provide is not considered helpful enough in this "
 "case."
 msgstr ""
 
-#: reportassistantpages_base.cpp:369
+#: reportassistantpages_base.cpp:330
+#, kde-format
+msgctxt "@info"
+msgid "Your problem has already been reported as bug <numid>%1</numid>."
+msgstr ""
+
+#: reportassistantpages_base.cpp:342
 msgctxt "@info"
 msgid "This report is considered helpful."
 msgstr ""
 
-#: reportassistantpages_base.cpp:374
+#: reportassistantpages_base.cpp:347
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -1432,7 +1441,7 @@
 "report at <link>%1</link>"
 msgstr ""
 
-#: reportassistantpages_base.cpp:385
+#: reportassistantpages_base.cpp:358
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -1441,19 +1450,19 @@
 "maintainer. Also, you can manually report at <link>%1</link>."
 msgstr ""
 
-#: reportassistantpages_base.cpp:400
+#: reportassistantpages_base.cpp:373
 msgctxt "@info"
 msgid ""
 "This report does not contain enough information for the developers, so the "
 "automated bug reporting process is not enabled for this crash."
 msgstr ""
 
-#: reportassistantpages_base.cpp:403
+#: reportassistantpages_base.cpp:376
 msgctxt "@info"
 msgid "If you wish, you can go back and change your answers. "
 msgstr ""
 
-#: reportassistantpages_base.cpp:412
+#: reportassistantpages_base.cpp:385
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -1461,7 +1470,7 @@
 "<interface>Finish</interface> to close the assistant."
 msgstr ""
 
-#: reportassistantpages_base.cpp:418
+#: reportassistantpages_base.cpp:391
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -1469,48 +1478,48 @@
 "<interface>Finish</interface> to close the assistant."
 msgstr ""
 
-#: reportassistantpages_base.cpp:437
+#: reportassistantpages_base.cpp:410
 #, kde-format
 msgctxt "@info/plain report to url/mail address"
 msgid "Report to %1"
 msgstr ""
 
-#: reportassistantpages_base.cpp:464
+#: reportassistantpages_base.cpp:437
 msgctxt "@title:window"
 msgid "Contents of the Report"
 msgstr ""
 
-#: reportassistantpages_base.cpp:469
+#: reportassistantpages_base.cpp:442
 msgctxt "@action:button"
 msgid "&Save to File..."
 msgstr ""
 
-#: reportassistantpages_base.cpp:471
+#: reportassistantpages_base.cpp:444
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to save the generated crash report information to a file. "
 "You can use this option to report the bug later."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:60
+#: reportassistantpages_bugzilla.cpp:73
 #, kde-format
 msgctxt "@info:status '1' is replaced with \"bugs.kde.org\""
 msgid "You need to login with your %1 account in order to proceed."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:63
+#: reportassistantpages_bugzilla.cpp:76
 msgctxt "@action:button"
 msgid "Login"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:65
+#: reportassistantpages_bugzilla.cpp:78
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to login to the KDE bug tracking system using the provided "
 "username and password."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:80
+#: reportassistantpages_bugzilla.cpp:87
 #, kde-format
 msgctxt "@info/rich"
 msgid ""
@@ -1521,31 +1530,31 @@
 "disposable email accounts.</note>"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:91
+#: reportassistantpages_bugzilla.cpp:105
 #, kde-format
 msgctxt "@info:status"
 msgid "Error when trying to login: <message>%1.</message>"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:117
+#: reportassistantpages_bugzilla.cpp:134
 #, kde-format
 msgctxt "@info:status the user is logged at the bugtracker site as USERNAME"
 msgid "Logged in at the KDE bug tracking system (%1) as: %2."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:210
+#: reportassistantpages_bugzilla.cpp:220
 msgid "Failed to communicate with kded. Make sure it is running."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:213
+#: reportassistantpages_bugzilla.cpp:223
 msgid "Failed to load KCookieServer. Check your KDE installation."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:225
+#: reportassistantpages_bugzilla.cpp:235
 msgid "Failed to communicate with KCookieServer."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:233
+#: reportassistantpages_bugzilla.cpp:243
 #, kde-format
 msgctxt "@info 1 is the bugzilla website url"
 msgid ""
@@ -1553,59 +1562,59 @@
 "you need to allow %1 to set cookies."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:238
+#: reportassistantpages_bugzilla.cpp:248
 #, kde-format
 msgctxt "@action:button 1 is the bugzilla website url"
 msgid "Allow %1 to set cookies"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:242
+#: reportassistantpages_bugzilla.cpp:252
 msgctxt "@action:button do not allow bugs.kde.org to set cookies"
 msgid "No, do not allow"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:232
+#: reportassistantpages_bugzilla.cpp:317
 #, kde-format
 msgctxt "@info:status '1' is a url, '2' the username"
 msgid "Performing login at %1 as %2..."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:256
+#: reportassistantpages_bugzilla.cpp:341
 msgctxt "@info:status/rich"
 msgid "<b>Error: Invalid username or password</b>"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:308
+#: reportassistantpages_bugzilla.cpp:398
 msgctxt "@label:listbox KDE distribution method"
 msgid "Unspecified"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:310
+#: reportassistantpages_bugzilla.cpp:400
 msgctxt "@label:listbox KDE distribution method"
 msgid "Debian stable"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:312
+#: reportassistantpages_bugzilla.cpp:402
 msgctxt "@label:listbox KDE distribution method"
 msgid "Debian testing"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:314
+#: reportassistantpages_bugzilla.cpp:404
 msgctxt "@label:listbox KDE distribution method"
 msgid "Debian unstable"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:316
+#: reportassistantpages_bugzilla.cpp:406
 msgctxt "@label:listbox KDE distribution method"
 msgid "Exherbo"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:318
+#: reportassistantpages_bugzilla.cpp:408
 msgctxt "@label:listbox KDE distribution method"
 msgid "Gentoo"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:320
+#: reportassistantpages_bugzilla.cpp:410
 msgctxt "@label:listbox KDE distribution method"
 msgid "Mandriva"
 msgstr ""
@@ -1615,32 +1624,32 @@
 msgid "Mageia"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:322
+#: reportassistantpages_bugzilla.cpp:414
 msgctxt "@label:listbox KDE distribution method"
 msgid "Slackware"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:324
+#: reportassistantpages_bugzilla.cpp:416
 msgctxt "@label:listbox KDE distribution method"
 msgid "SuSE/OpenSUSE"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:326
+#: reportassistantpages_bugzilla.cpp:418
 msgctxt "@label:listbox KDE distribution method"
 msgid "RedHat"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:328
+#: reportassistantpages_bugzilla.cpp:420
 msgctxt "@label:listbox KDE distribution method"
 msgid "Fedora"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:330
+#: reportassistantpages_bugzilla.cpp:422
 msgctxt "@label:listbox KDE distribution method"
 msgid "Kubuntu/Ubuntu (and derivatives)"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:333
+#: reportassistantpages_bugzilla.cpp:425
 msgctxt "@label:listbox KDE distribution method"
 msgid "Pardus"
 msgstr ""
@@ -1650,42 +1659,42 @@
 msgid "Chakra"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:335
+#: reportassistantpages_bugzilla.cpp:429
 msgctxt "@label:listbox KDE distribution method"
 msgid "Archlinux"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:337
+#: reportassistantpages_bugzilla.cpp:431
 msgctxt "@label:listbox KDE distribution method"
 msgid "FreeBSD (Ports)"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:339
+#: reportassistantpages_bugzilla.cpp:433
 msgctxt "@label:listbox KDE distribution method"
 msgid "NetBSD (pkgsrc)"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:341
+#: reportassistantpages_bugzilla.cpp:435
 msgctxt "@label:listbox KDE distribution method"
 msgid "OpenBSD"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:343
+#: reportassistantpages_bugzilla.cpp:437
 msgctxt "@label:listbox KDE distribution method"
 msgid "Mac OS X"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:345
+#: reportassistantpages_bugzilla.cpp:439
 msgctxt "@label:listbox KDE distribution method"
 msgid "Solaris"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:494
+#: reportassistantpages_bugzilla.cpp:508
 msgctxt "the minimum required length of a text was reached"
 msgid "Minimum length reached"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:497
+#: reportassistantpages_bugzilla.cpp:511
 msgctxt "the minimum required length of a text wasn't reached yet"
 msgid "Provide more information"
 msgstr ""
@@ -1719,20 +1728,20 @@
 "developers' time. Can you tell us more?"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:398
+#: reportassistantpages_bugzilla.cpp:551
 msgid "Yes, let me add more information"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:401
+#: reportassistantpages_bugzilla.cpp:554
 msgid "No, I cannot add any other information"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:404
+#: reportassistantpages_bugzilla.cpp:557
 msgctxt "@title:window"
 msgid "We need more information"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:446
+#: reportassistantpages_bugzilla.cpp:599
 msgctxt "@info:tooltip examples of good bug report titles"
 msgid ""
 "<strong>Examples of good titles:</strong><nl />\"Plasma crashed after adding "
@@ -1742,31 +1751,31 @@
 "log file and pressing the Delete key a couple of times\""
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:582
+#: reportassistantpages_bugzilla.cpp:610
 msgctxt "@info:tooltip help and examples of good bug descriptions"
 msgid "Describe in as much detail as possible the crash circumstances:"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:586
+#: reportassistantpages_bugzilla.cpp:614
 msgctxt "@info:tooltip help and examples of good bug descriptions"
 msgid ""
 "- Detail which actions were you taking inside and outside the application an "
 "instant before the crash."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:592
+#: reportassistantpages_bugzilla.cpp:620
 msgctxt "@info:tooltip help and examples of good bug descriptions"
 msgid ""
 "- Note if you noticed any unusual behavior in the application or in the "
 "whole environment."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:598
+#: reportassistantpages_bugzilla.cpp:626
 msgctxt "@info:tooltip help and examples of good bug descriptions"
 msgid "- Note any non-default configuration in the application."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:603
+#: reportassistantpages_bugzilla.cpp:631
 #, kde-format
 msgctxt ""
 "@info:tooltip examples of configuration details. the examples are already "
@@ -1774,24 +1783,24 @@
 msgid "Examples: %1"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:482
-#: reportassistantpages_bugzilla_duplicates.cpp:491
+#: reportassistantpages_bugzilla.cpp:666
+#: reportassistantpages_bugzilla_duplicates.cpp:577
 msgctxt "@action:button"
 msgid "Retry..."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:484
+#: reportassistantpages_bugzilla.cpp:668
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to retry sending the crash report if it failed before."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:511
+#: reportassistantpages_bugzilla.cpp:695
 msgctxt "@info:status"
 msgid "Sending crash report... (please wait)"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:528
+#: reportassistantpages_bugzilla.cpp:712
 #, kde-format
 msgctxt "@info/rich"
 msgid ""
@@ -1799,13 +1808,13 @@
 "KDE. You can now close this window."
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:538
+#: reportassistantpages_bugzilla.cpp:722
 #, kde-format
 msgctxt "@info:status"
 msgid "Error sending the crash report:  <message>%1.</message>"
 msgstr ""
 
-#: reportassistantpages_bugzilla.cpp:560
+#: reportassistantpages_bugzilla.cpp:748
 #, kde-format
 msgctxt "@info/plain report to KDE bugtracker address"
 msgid "Report to %1"
@@ -1830,77 +1839,77 @@
 "submit a bug against DrKonqi."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:63
+#: reportassistantpages_bugzilla_duplicates.cpp:66
 msgctxt "@item:intable custom/manaul bug report number"
 msgid "Manual"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:64
+#: reportassistantpages_bugzilla_duplicates.cpp:68
 msgctxt "@item:intable custom bug report number description"
 msgid "Manually enter a bug report ID"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:70
+#: reportassistantpages_bugzilla_duplicates.cpp:73
 msgctxt "@info:tooltip / whatsthis"
 msgid "Select this option to manually load a specific bug report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:70
+#: reportassistantpages_bugzilla_duplicates.cpp:81
 msgctxt "@action:button"
 msgid "Search for more reports"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:72
+#: reportassistantpages_bugzilla_duplicates.cpp:83
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to search for more similar bug reports on an earlier date."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:78
+#: reportassistantpages_bugzilla_duplicates.cpp:89
 msgctxt "@action:button"
 msgid "Retry search"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:80
+#: reportassistantpages_bugzilla_duplicates.cpp:91
 msgctxt "@info:tooltip"
 msgid "Use this button to retry the search that previously failed."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:84
+#: reportassistantpages_bugzilla_duplicates.cpp:95
 msgctxt "@action:button"
 msgid "Open selected report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:86
+#: reportassistantpages_bugzilla_duplicates.cpp:97
 msgctxt "@info:tooltip"
 msgid "Use this button to view the information of the selected bug report."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:90
+#: reportassistantpages_bugzilla_duplicates.cpp:101
 msgctxt "@action:button"
 msgid "Stop searching"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:92
+#: reportassistantpages_bugzilla_duplicates.cpp:103
 msgctxt "@info:tooltip"
 msgid "Use this button to stop the current search."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:104
+#: reportassistantpages_bugzilla_duplicates.cpp:115
 msgctxt "@action:button remove the selected item from a list"
 msgid "Remove"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:106
+#: reportassistantpages_bugzilla_duplicates.cpp:117
 msgctxt "@info:tooltip"
 msgid "Use this button to remove a selected possible duplicate"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:166
+#: reportassistantpages_bugzilla_duplicates.cpp:178
 msgid "There are no real duplicates"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:175
+#: reportassistantpages_bugzilla_duplicates.cpp:179
 msgid ""
 "Press this button to declare that, in your opinion and according to your "
 "experience, the reports found as similar do not match the crash you have "
@@ -1908,17 +1917,17 @@
 "found after further review."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:170
+#: reportassistantpages_bugzilla_duplicates.cpp:187
 msgid "Let me check more reports"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:184
+#: reportassistantpages_bugzilla_duplicates.cpp:188
 msgid ""
 "Press this button if you would rather review more reports in order to find a "
 "match for the crash you have experienced."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:174
+#: reportassistantpages_bugzilla_duplicates.cpp:194
 msgctxt "@info"
 msgid ""
 "You have not selected any possible duplicates, or a report to which to "
@@ -1926,80 +1935,120 @@
 "confirm that there are no real duplicates?"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:177
+#: reportassistantpages_bugzilla_duplicates.cpp:197
 msgctxt "@title:window"
 msgid "No selected possible duplicates"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:203
+#: reportassistantpages_bugzilla_duplicates.cpp:223
 #, kde-format
 msgctxt "@info:status"
 msgid "Searching for duplicates (from %1 to %2)..."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:231
+#: reportassistantpages_bugzilla_duplicates.cpp:251
 msgctxt "@info:status"
 msgid "Search stopped."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:233
+#: reportassistantpages_bugzilla_duplicates.cpp:253
 #, kde-format
 msgctxt "@info:status"
 msgid "Search stopped. Showing results from %1 to %2"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:279
+#: reportassistantpages_bugzilla_duplicates.cpp:299
 #, kde-format
 msgctxt "@info:status"
 msgid "Showing results from %1 to %2"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:294
+#: reportassistantpages_bugzilla_duplicates.cpp:320
 msgctxt "@info/plain bug status"
 msgid "[Open]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:299
+#: reportassistantpages_bugzilla_duplicates.cpp:323
 msgctxt "@info/plain bug resolution"
 msgid "[Fixed]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:301
+#: reportassistantpages_bugzilla_duplicates.cpp:325
 msgctxt "@info/plain bug resolution"
 msgid "[Non-reproducible]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:319
+#: reportassistantpages_bugzilla_duplicates.cpp:327
 msgctxt "@info/plain bug resolution"
 msgid "[Duplicate report]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:305
+#: reportassistantpages_bugzilla_duplicates.cpp:329
 msgctxt "@info/plain bug resolution"
 msgid "[Invalid]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:308
+#: reportassistantpages_bugzilla_duplicates.cpp:332
 msgctxt "@info/plain bug resolution"
 msgid "[External problem]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:311
+#: reportassistantpages_bugzilla_duplicates.cpp:335
 msgctxt "@info/plain bug status"
 msgid "[Incomplete]"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:336
+#: reportassistantpages_bugzilla_duplicates.cpp:372
 msgctxt "@info:status"
 msgid "Search Finished. No reports found."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:352
+#: reportassistantpages_bugzilla_duplicates.cpp:408
+#, kde-format
+msgctxt "@label"
+msgid ""
+"Your crash is a <strong>duplicate</strong> and has already been reported as "
+"<a href=\"%1\">Bug %1</a>."
+msgstr ""
+
+#: reportassistantpages_bugzilla_duplicates.cpp:409
+#, kde-format
+msgctxt "@label"
+msgid ""
+"Your crash has already been reported as <a href=\"%1\">Bug %1</a>, which is "
+"a <strong>duplicate</strong> of <a href=\"%2\">Bug %2</a>"
+msgstr ""
+
+#: reportassistantpages_bugzilla_duplicates.cpp:410
+#, kde-format
+msgctxt "@label"
+msgid ""
+"Only <strong><a href=\"%1\">attach</a></strong> if you can add needed "
+"information to the bug report."
+msgstr ""
+
+#: reportassistantpages_bugzilla_duplicates.cpp:412
+#, kde-format
+msgctxt "@label"
+msgid ""
+"Your crash has already been reported as <a href=\"%1\">Bug %1</a> which has "
+"been <strong>closed</strong>."
+msgstr ""
+
+#: reportassistantpages_bugzilla_duplicates.cpp:413
+#, kde-format
+msgctxt "@label"
+msgid ""
+"Your crash has already been reported as <a href=\"%1\">Bug %1</a>, which is "
+"a duplicate of the <strong>closed</strong> <a href=\"%2\">Bug %2</a>."
+msgstr ""
+
+#: reportassistantpages_bugzilla_duplicates.cpp:436
 msgctxt "@info:status"
 msgid "Error fetching the bug report list"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:354
+#: reportassistantpages_bugzilla_duplicates.cpp:438
 #, kde-format
 msgctxt "@info/rich"
 msgid ""
@@ -2007,17 +2056,17 @@
 "wait some time and try again."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:383
+#: reportassistantpages_bugzilla_duplicates.cpp:467
 msgctxt "@title:window"
 msgid "Enter a custom bug report number"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:384
+#: reportassistantpages_bugzilla_duplicates.cpp:468
 msgctxt "@label"
 msgid "Enter the number of the bug report you want to check"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:457
+#: reportassistantpages_bugzilla_duplicates.cpp:541
 #, kde-format
 msgctxt "@label"
 msgid ""
@@ -2025,58 +2074,58 @@
 "<numid>%1</numid>. <a href=\"#\">Cancel</a>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:485
+#: reportassistantpages_bugzilla_duplicates.cpp:571
 msgctxt "@title:window"
 msgid "Bug Description"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:493
+#: reportassistantpages_bugzilla_duplicates.cpp:579
 msgctxt "@info:tooltip"
 msgid "Use this button to retry loading the bug report."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:520
+#: reportassistantpages_bugzilla_duplicates.cpp:584
 msgctxt "@action:button"
 msgid "Suggest this crash is related"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:521
+#: reportassistantpages_bugzilla_duplicates.cpp:585
 msgctxt "@info:tooltip"
 msgid ""
 "Use this button to suggest that the crash you experienced is related to this "
 "bug report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:568
+#: reportassistantpages_bugzilla_duplicates.cpp:634
 #, kde-format
 msgctxt "@info"
 msgid "<link url='%1'>Report's webpage</link>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:556
+#: reportassistantpages_bugzilla_duplicates.cpp:637
 #, kde-format
 msgctxt "@info:status"
 msgid "Loading information about bug <numid>%1</numid> from %2...."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:577
+#: reportassistantpages_bugzilla_duplicates.cpp:643
 msgctxt "@info/plain"
 msgid ""
 "Backtrace of the crash I experienced:\n"
 "\n"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:580
+#: reportassistantpages_bugzilla_duplicates.cpp:671
 msgctxt "@action:button let the user to choose to read the main report"
 msgid "Yes, read the main report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:584
+#: reportassistantpages_bugzilla_duplicates.cpp:675
 msgctxt "@action:button let the user choose to read the original report"
 msgid "No, let me read the report I selected"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:587
+#: reportassistantpages_bugzilla_duplicates.cpp:678
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -2085,88 +2134,88 @@
 "(recommended)"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:591
+#: reportassistantpages_bugzilla_duplicates.cpp:682
 msgctxt "@title:window"
 msgid "Nested duplicate detected"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:634
+#: reportassistantpages_bugzilla_duplicates.cpp:700
 #, kde-format
 msgctxt "comment $number to use as subtitle"
 msgid "<h4>Comment %1:</h4>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:651
+#: reportassistantpages_bugzilla_duplicates.cpp:719
 msgctxt "@info bug status"
 msgid "Opened (Unconfirmed)"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:655
+#: reportassistantpages_bugzilla_duplicates.cpp:721
 msgctxt "@info bug status"
 msgid "Opened (Unfixed)"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:663
+#: reportassistantpages_bugzilla_duplicates.cpp:727
 #, kde-format
 msgctxt "@info bug resolution, fixed in version"
 msgid "Fixed in version \"%1\""
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:666
+#: reportassistantpages_bugzilla_duplicates.cpp:730
 #, kde-format
 msgctxt "@info bug resolution, fixed by kde devs in version"
 msgid "the bug was fixed by KDE developers in version \"%1\""
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:620
+#: reportassistantpages_bugzilla_duplicates.cpp:733
 msgctxt "@info bug resolution"
 msgid "Fixed"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:621
+#: reportassistantpages_bugzilla_duplicates.cpp:734
 msgctxt "@info bug resolution"
 msgid "the bug was fixed by KDE developers"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:623
+#: reportassistantpages_bugzilla_duplicates.cpp:737
 msgctxt "@info bug resolution"
 msgid "Non-reproducible"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:666
+#: reportassistantpages_bugzilla_duplicates.cpp:739
 msgctxt "@info bug resolution"
 msgid "Duplicate report (Already reported before)"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:627
+#: reportassistantpages_bugzilla_duplicates.cpp:742
 msgctxt "@info bug resolution"
 msgid "Not a valid report/crash"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:630
+#: reportassistantpages_bugzilla_duplicates.cpp:744
 msgctxt "@info bug resolution"
 msgid "Not caused by a problem in the KDE's Applications or libraries"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:674
+#: reportassistantpages_bugzilla_duplicates.cpp:746
 msgctxt "@info bug resolution"
 msgid ""
 "the bug is caused by a problem in an external application or library, or by "
 "a distribution or packaging issue"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:639
+#: reportassistantpages_bugzilla_duplicates.cpp:753
 #, kde-format
 msgctxt "@info bug status, %1 is the resolution"
 msgid "Closed (%1)"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:642
+#: reportassistantpages_bugzilla_duplicates.cpp:756
 msgctxt "@info bug status"
 msgid "Temporarily closed, because of a lack of information"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:691
+#: reportassistantpages_bugzilla_duplicates.cpp:763
 msgid ""
 "<p><note>The bug report's title is often written by its reporter and may not "
 "reflect the bug's nature, root cause or other visible symptoms you could use "
@@ -2174,7 +2223,7 @@
 "comments below.</note></p>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:697
+#: reportassistantpages_bugzilla_duplicates.cpp:769
 #, kde-format
 msgid ""
 "<p><note>This bug report has %1 duplicate report. That means this is "
@@ -2189,49 +2238,49 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:714
+#: reportassistantpages_bugzilla_duplicates.cpp:786
 msgid ""
 "<p><note>This bug report is not about a crash or about any other critical "
 "bug.</note></p>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:721
+#: reportassistantpages_bugzilla_duplicates.cpp:793
 #, kde-format
 msgctxt "@info bug report title (quoted)"
 msgid "<h3>\"%1\"</h3>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:724
+#: reportassistantpages_bugzilla_duplicates.cpp:796
 #, kde-format
 msgctxt "@info bug report status"
 msgid "<h4>Bug Report Status: %1</h4>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:726
+#: reportassistantpages_bugzilla_duplicates.cpp:798
 #, kde-format
 msgctxt "@info bug report product and component"
 msgid "<h4>Affected Component: %1 (%2)</h4>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:729
+#: reportassistantpages_bugzilla_duplicates.cpp:801
 #, kde-format
 msgctxt "@info bug report description"
 msgid "<h3>Description of the bug</h3><p>%1</p>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:734
+#: reportassistantpages_bugzilla_duplicates.cpp:806
 #, kde-format
 msgctxt "@label:textbox bug report comments (already formatted)"
 msgid "<h2>Additional Comments</h2>%1"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:742
+#: reportassistantpages_bugzilla_duplicates.cpp:815
 #, kde-format
 msgctxt "@info:status"
 msgid "Showing bug <numid>%1</numid>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:748
+#: reportassistantpages_bugzilla_duplicates.cpp:854
 #, kde-format
 msgctxt "@info/rich"
 msgid ""
@@ -2239,38 +2288,38 @@
 "some time and try again."
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:753
+#: reportassistantpages_bugzilla_duplicates.cpp:858
 msgctxt "@info"
 msgid "Error fetching the bug report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:754
+#: reportassistantpages_bugzilla_duplicates.cpp:859
 msgctxt "@info:status"
 msgid "Error fetching the bug report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:829
+#: reportassistantpages_bugzilla_duplicates.cpp:902
 msgctxt "@title:window"
 msgid "Related Bug Report"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:832
+#: reportassistantpages_bugzilla_duplicates.cpp:905
 msgctxt "@action:button"
 msgid "Cancel (Go back to the report)"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:834
+#: reportassistantpages_bugzilla_duplicates.cpp:907
 msgctxt ""
 "@action:button continue with the selected option and close the dialog"
 msgid "Continue"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:841
+#: reportassistantpages_bugzilla_duplicates.cpp:914
 #, kde-format
 msgid "You are going to mark your crash as related to bug <numid>%1</numid>"
 msgstr ""
 
-#: reportassistantpages_bugzilla_duplicates.cpp:854
+#: reportassistantpages_bugzilla_duplicates.cpp:927
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -2278,7 +2327,7 @@
 "information will be useless and will consume developers' time.</i>"
 msgstr ""
 
-#: reportinterface.cpp:171
+#: reportinterface.cpp:182
 msgctxt "@info/plain"
 msgid ""
 "<placeholder>In detail, tell us what you were doing  when the application "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/filetypes.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/filetypes.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/filetypes.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/filetypes.po	2012-04-18 08:59:34.000000000 +0000
@@ -11,17 +11,17 @@
 msgstr ""
 "Project-Id-Version: filetypes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:32+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: filegroupdetails.cpp:35 filetypedetails.cpp:147
+#: filegroupdetails.cpp:35
 msgid "Left Click Action (only for Konqueror file manager)"
 msgstr ""
 
@@ -237,48 +237,48 @@
 "still end up using them)."
 msgstr ""
 
-#: keditfiletype.cpp:122
+#: keditfiletype.cpp:123
 msgid "KEditFileType"
 msgstr "KEditFileType"
 
-#: keditfiletype.cpp:123
+#: keditfiletype.cpp:124
 msgid ""
 "KDE file type editor - simplified version for editing a single file type"
 msgstr ""
 "Golygydd mathau ffeil KDE - fersiwn syml ar gyfer golygu math ffeil unigol"
 
-#: keditfiletype.cpp:125
+#: keditfiletype.cpp:126
 msgid "(c) 2000, KDE developers"
 msgstr "(h)(c)2000, Datblygwyr KDE"
 
-#: keditfiletype.cpp:126
+#: keditfiletype.cpp:127
 msgid "Preston Brown"
 msgstr "Preston Brown"
 
-#: keditfiletype.cpp:127
+#: keditfiletype.cpp:128
 msgid "David Faure"
 msgstr "David Faure"
 
-#: keditfiletype.cpp:133
+#: keditfiletype.cpp:134
 msgid "Makes the dialog transient for the window specified by winid"
 msgstr ""
 "Gwneud yr ymgom yn fyrhoedlog ar gyfer y ffenestr wedi'i phenodi gan winid"
 
-#: keditfiletype.cpp:134
+#: keditfiletype.cpp:135
 msgid "File type to edit (e.g. text/html)"
 msgstr "Math ffeil i olygu (e.e. text/html)"
 
-#: keditfiletype.cpp:162
+#: keditfiletype.cpp:163
 #, kde-format
 msgid "%1 File"
 msgstr "%1 Ffeil"
 
-#: keditfiletype.cpp:189
+#: keditfiletype.cpp:190
 #, kde-format
 msgid "Edit File Type %1"
 msgstr "Golygu Math Ffeil %1"
 
-#: keditfiletype.cpp:191
+#: keditfiletype.cpp:192
 #, kde-format
 msgid "Create New File Type %1"
 msgstr "Creu Math Ffeil Newydd %1"
@@ -409,19 +409,19 @@
 msgid "Create New File Type"
 msgstr "Creu Math Ffeil Newydd"
 
-#: newtypedlg.cpp:49
+#: newtypedlg.cpp:48
 msgid "Group:"
 msgstr "Grŵp:"
 
-#: newtypedlg.cpp:57
+#: newtypedlg.cpp:56
 msgid "Select the category under which the new file type should be added."
 msgstr "Dewiswch gategori i ychwanegu'r math ffeil newydd oddi tano."
 
-#: newtypedlg.cpp:62
+#: newtypedlg.cpp:61
 msgid "Type name:"
 msgstr "Enw'r math:"
 
-#: newtypedlg.cpp:67
+#: newtypedlg.cpp:66
 msgid ""
 "Type the name of the file type. For instance, if you selected 'image' as "
 "category and you type 'custom' here, the file type 'image/custom' will be "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/freespacenotifier.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/freespacenotifier.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/freespacenotifier.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/freespacenotifier.po	2012-04-18 08:59:37.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2011-06-24 00:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:43+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: freespacenotifier.cpp:89
 #, kde-format
@@ -51,30 +51,30 @@
 
 #. i18n: file: freespacenotifier_prefs_base.ui:17
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_enableNotification)
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:3
 msgid "Enable low disk space warning"
 msgstr ""
 
 #. i18n: file: freespacenotifier_prefs_base.ui:27
 #. i18n: ectx: property (text), widget (QLabel, label_minimumSpace)
-#: rc.cpp:12 rc.cpp:21
+#: rc.cpp:6
 msgid "Warn when free space is below:"
 msgstr ""
 
 #. i18n: file: freespacenotifier_prefs_base.ui:37
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_minimumSpace)
-#: rc.cpp:15 rc.cpp:24
+#: rc.cpp:9
 msgid " MiB"
 msgstr ""
 
 #. i18n: file: freespacenotifier.kcfg:9
 #. i18n: ectx: label, entry (minimumSpace), group (General)
-#: rc.cpp:3 rc.cpp:27
+#: rc.cpp:12
 msgid "Minimum free space before user starts being notified."
 msgstr ""
 
 #. i18n: file: freespacenotifier.kcfg:15
 #. i18n: ectx: label, entry (enableNotification), group (General)
-#: rc.cpp:6 rc.cpp:30
+#: rc.cpp:15
 msgid "Is the free space notification enabled."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/fsview.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/fsview.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/fsview.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/fsview.po	2012-04-18 08:59:36.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: fsview\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-31 04:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: fsview.cpp:50 fsview.cpp:388
 msgid "Name"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/htmlsearch.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/htmlsearch.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/htmlsearch.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/htmlsearch.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: htmlsearch\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:32+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: index.cpp:13
 msgid "KHtmlIndex"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/imagerename_plugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/imagerename_plugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/imagerename_plugin.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/imagerename_plugin.po	2012-04-18 08:59:34.000000000 +0000
@@ -4,17 +4,17 @@
 msgstr ""
 "Project-Id-Version: imagerename_plugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 01:43+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:05+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: image_plugin.cpp:71
+#: image_plugin.cpp:72
 msgid "You want to overwrite the left picture with the one on the right."
 msgstr "Rydych eisiau trosysgrifo'r llun ar y chwith efo'r un ar y dde."
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/imgalleryplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/imgalleryplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/imgalleryplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/imgalleryplugin.po	2012-04-18 08:59:36.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: imgalleryplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2006-04-22 12:57+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:42+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: imgallerydialog.cpp:53
 msgctxt "@title:window"
@@ -222,8 +222,8 @@
 " %1"
 
 #: imgalleryplugin.cpp:237
-msgid "KB"
-msgstr "KB"
+msgid "KiB"
+msgstr ""
 
 #: imgalleryplugin.cpp:333 imgalleryplugin.cpp:428
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/joystick.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/joystick.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/joystick.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/joystick.po	2012-04-18 08:59:37.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: joystick\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:04+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:39+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:44+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: caldialog.cpp:41 joywidget.cpp:390
 msgid "Calibration"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/juk.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/juk.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/juk.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/juk.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/juk.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:37+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: advancedsearchdialog.cpp:43
 msgid "Create Search Playlist"
@@ -43,7 +43,7 @@
 msgid "Fewer"
 msgstr ""
 
-#: cache.cpp:379
+#: cache.cpp:387
 msgid ""
 "The music data cache has been corrupted. JuK needs to rescan it now. This "
 "may take some time."
@@ -98,7 +98,7 @@
 msgid "About to delete selected files"
 msgstr ""
 
-#: directorylist.cpp:41
+#: directorylist.cpp:48
 msgid "Folder List"
 msgstr "Rhestr Plygyll"
 
@@ -106,11 +106,15 @@
 msgid "Music"
 msgstr ""
 
-#: exampleoptions.cpp:55 main.cpp:48 playlist.cpp:412 systemtray.cpp:495
+#: exampleoptions.cpp:55 main.cpp:49 playlist.cpp:412 systemtray.cpp:495
 #: systemtray.cpp:506
 msgid "JuK"
 msgstr "JuK"
 
+#: filerenamerconfigdlg.cpp:28
+msgid "File Renamer Options"
+msgstr ""
+
 #: filerenamer.cpp:66
 msgctxt "warning about mass file rename"
 msgid "Warning"
@@ -158,7 +162,7 @@
 
 #. i18n: file: filerenamerbase.ui:212
 #. i18n: ectx: property (text), widget (KPushButton, m_showExample)
-#: filerenamer.cpp:815 rc.cpp:119 rc.cpp:435
+#: filerenamer.cpp:815 rc.cpp:163
 msgid "Show Renamer Test Dialog"
 msgstr ""
 
@@ -171,10 +175,6 @@
 msgid "The following rename operations failed:\n"
 msgstr ""
 
-#: filerenamerconfigdlg.cpp:28
-msgid "File Renamer Options"
-msgstr ""
-
 #: filerenameroptions.cpp:38
 #, kde-format
 msgctxt "%1 will be a music tag category like Artist or Album"
@@ -207,126 +207,126 @@
 msgid "Time"
 msgstr "Amser"
 
-#: juk.cpp:138
+#: juk.cpp:156
 msgid "Your album art failed to download."
 msgstr ""
 
-#: juk.cpp:140
+#: juk.cpp:158
 msgid "Your album art has finished downloading."
 msgstr ""
 
-#: juk.cpp:184 systemtray.cpp:195
+#: juk.cpp:201 systemtray.cpp:195
 msgid "&Random Play"
 msgstr ""
 
-#: juk.cpp:191
+#: juk.cpp:208
 msgid "&Disable Random Play"
 msgstr ""
 
-#: juk.cpp:197
+#: juk.cpp:214
 msgid "Use &Random Play"
 msgstr ""
 
-#: juk.cpp:203
+#: juk.cpp:220
 msgid "Use &Album Random Play"
 msgstr ""
 
-#: juk.cpp:210
+#: juk.cpp:227
 msgid "Remove From Playlist"
 msgstr ""
 
-#: juk.cpp:214
+#: juk.cpp:231
 msgid "Crossfade Between Tracks"
 msgstr ""
 
-#: juk.cpp:218
+#: juk.cpp:235
 msgid "&Play"
 msgstr "&Chwarae"
 
-#: juk.cpp:222
+#: juk.cpp:239
 msgid "P&ause"
 msgstr "S&eibio"
 
-#: juk.cpp:226
+#: juk.cpp:243
 msgid "&Stop"
 msgstr "&Aros"
 
-#: juk.cpp:229
+#: juk.cpp:246
 msgctxt "previous track"
 msgid "Previous"
 msgstr "Cynt"
 
-#: juk.cpp:234
+#: juk.cpp:251
 msgctxt "next track"
 msgid "&Next"
 msgstr "&Nesaf"
 
-#: juk.cpp:238
+#: juk.cpp:255
 msgid "&Loop Playlist"
 msgstr ""
 
-#: juk.cpp:242
+#: juk.cpp:259
 msgid "&Resize Playlist Columns Manually"
 msgstr ""
 
-#: juk.cpp:247
+#: juk.cpp:264
 msgctxt "silence playback"
 msgid "Mute"
 msgstr ""
 
-#: juk.cpp:251
+#: juk.cpp:268
 msgid "Volume Up"
 msgstr ""
 
-#: juk.cpp:255
+#: juk.cpp:272
 msgid "Volume Down"
 msgstr ""
 
-#: juk.cpp:259
+#: juk.cpp:276
 msgid "Play / Pause"
 msgstr ""
 
-#: juk.cpp:263
+#: juk.cpp:280
 msgid "Seek Forward"
 msgstr ""
 
-#: juk.cpp:267
+#: juk.cpp:284
 msgid "Seek Back"
 msgstr ""
 
-#: juk.cpp:271
+#: juk.cpp:288
 msgid "Show / Hide"
 msgstr ""
 
-#: juk.cpp:278
+#: juk.cpp:295
 msgid "Show Splash Screen on Startup"
 msgstr ""
 
-#: juk.cpp:281
+#: juk.cpp:298
 msgid "&Dock in System Tray"
 msgstr "&Docio yn y cafn cysawd"
 
-#: juk.cpp:285
+#: juk.cpp:302
 msgid "&Stay in System Tray on Close"
 msgstr ""
 
-#: juk.cpp:288
+#: juk.cpp:305
 msgid "Popup &Track Announcement"
 msgstr ""
 
-#: juk.cpp:291
+#: juk.cpp:308
 msgid "Save &Play Queue on Exit"
 msgstr ""
 
-#: juk.cpp:294
+#: juk.cpp:311
 msgid "&Tag Guesser..."
 msgstr ""
 
-#: juk.cpp:297
+#: juk.cpp:314
 msgid "&File Renamer..."
 msgstr ""
 
-#: juk.cpp:303
+#: juk.cpp:321
 msgid "Track Position"
 msgstr ""
 
@@ -334,13 +334,13 @@
 msgid "Volume"
 msgstr "Lefel Sain"
 
-#: juk.cpp:484
+#: juk.cpp:505
 msgid ""
 "<qt>Closing the main window will keep JuK running in the system tray. Use "
 "Quit from the File menu to quit the application.</qt>"
 msgstr ""
 
-#: juk.cpp:486
+#: juk.cpp:507
 msgid "Docking in System Tray"
 msgstr ""
 
@@ -483,11 +483,11 @@
 msgid "© 2002 - 2011, Scott Wheeler"
 msgstr ""
 
-#: main.cpp:53
+#: main.cpp:54
 msgid "Scott Wheeler"
 msgstr ""
 
-#: main.cpp:54
+#: main.cpp:55
 msgid "Michael Pyne"
 msgstr ""
 
@@ -495,67 +495,67 @@
 msgid "Γιώργος Κυλάφας (Giorgos Kylafas)"
 msgstr ""
 
-#: main.cpp:55
+#: main.cpp:57
 msgid "Daniel Molkentin"
 msgstr ""
 
-#: main.cpp:56
+#: main.cpp:58
 msgid "Tim Jansen"
 msgstr ""
 
-#: main.cpp:57
+#: main.cpp:59
 msgid "Stefan Asserhäll"
 msgstr ""
 
-#: main.cpp:58
+#: main.cpp:60
 msgid "Stephen Douglas"
 msgstr ""
 
-#: main.cpp:59
+#: main.cpp:61
 msgid "Frerich Raabe"
 msgstr ""
 
-#: main.cpp:60
+#: main.cpp:62
 msgid "Zack Rusin"
 msgstr ""
 
-#: main.cpp:61
+#: main.cpp:63
 msgid "Adam Treat"
 msgstr ""
 
-#: main.cpp:62
+#: main.cpp:64
 msgid "Matthias Kretz"
 msgstr ""
 
-#: main.cpp:63
+#: main.cpp:65
 msgid "Maks Orlovich"
 msgstr ""
 
-#: main.cpp:64
+#: main.cpp:66
 msgid "Antonio Larrosa Jimenez"
 msgstr ""
 
-#: main.cpp:65
+#: main.cpp:67
 msgid "Allan Sandfeld Jensen"
 msgstr ""
 
-#: main.cpp:66
+#: main.cpp:68
 msgid "Nathan Toone"
 msgstr ""
 
-#: main.cpp:67
+#: main.cpp:69
 msgid "Pascal Klein"
 msgstr ""
 
-#: main.cpp:68
+#: main.cpp:70
 msgid "Laurent Montel"
 msgstr ""
 
-#: main.cpp:69
+#: main.cpp:71
 msgid "Georg Grabler"
 msgstr ""
 
-#: main.cpp:74
+#: main.cpp:76
 msgid "File(s) to open"
 msgstr ""
 
@@ -580,11 +580,11 @@
 msgid "Error connecting to MusicBrainz server."
 msgstr ""
 
-#: nowplaying.cpp:309
+#: nowplaying.cpp:306
 msgid "back to playlist"
 msgstr ""
 
-#: playermanager.cpp:454
+#: playermanager.cpp:480
 #, kde-format
 msgctxt ""
 "%1 will be the /path/to/file, %2 will be some string from Phonon describing "
@@ -594,151 +594,6 @@
 "following reason:<nl/><message>%2</message>"
 msgstr ""
 
-#: playlist.cpp:555
-#, kde-format
-msgid "Could not save to file %1."
-msgstr ""
-
-#: playlist.cpp:821
-msgid "Are you sure you want to delete these covers?"
-msgstr ""
-
-#: playlist.cpp:823
-msgid "&Delete Covers"
-msgstr ""
-
-#: playlist.cpp:852
-msgid "Select Cover Image File"
-msgstr ""
-
-#: playlist.cpp:1000
-msgid "Could not delete these files"
-msgstr ""
-
-#: playlist.cpp:1001
-msgid "Could not move these files to the Trash"
-msgstr ""
-
-#. i18n: file: trackpickerdialogbase.ui:97
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#: playlist.cpp:1516 rc.cpp:260 rc.cpp:534
-msgid "Track Name"
-msgstr ""
-
-#. i18n: file: coverdialogbase.ui:46
-#. i18n: ectx: property (text), widget (K3ListView, m_artists)
-#. i18n: file: exampleoptionsbase.ui:221
-#. i18n: ectx: property (text), widget (QLineEdit, m_exampleArtist)
-#. i18n: file: trackpickerdialogbase.ui:108
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#. i18n: file: coverdialogbase.ui:46
-#. i18n: ectx: property (text), widget (K3ListView, m_artists)
-#. i18n: file: exampleoptionsbase.ui:221
-#. i18n: ectx: property (text), widget (QLineEdit, m_exampleArtist)
-#. i18n: file: trackpickerdialogbase.ui:108
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#: playlist.cpp:1517 rc.cpp:6 rc.cpp:74 rc.cpp:263 rc.cpp:322 rc.cpp:390
-#: rc.cpp:537 tagrenameroptions.cpp:102
-msgid "Artist"
-msgstr "Artist"
-
-#. i18n: file: exampleoptionsbase.ui:228
-#. i18n: ectx: property (text), widget (QLineEdit, m_exampleAlbum)
-#. i18n: file: trackpickerdialogbase.ui:119
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#. i18n: file: exampleoptionsbase.ui:228
-#. i18n: ectx: property (text), widget (QLineEdit, m_exampleAlbum)
-#. i18n: file: trackpickerdialogbase.ui:119
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#: playlist.cpp:1518 rc.cpp:77 rc.cpp:266 rc.cpp:393 rc.cpp:540
-#: tagrenameroptions.cpp:106
-msgid "Album"
-msgstr "Album:"
-
-#: playlist.cpp:1519
-msgid "Cover"
-msgstr ""
-
-#. i18n: file: trackpickerdialogbase.ui:130
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#: playlist.cpp:1520 rc.cpp:269 rc.cpp:543 tagrenameroptions.cpp:110
-msgctxt "cd track number"
-msgid "Track"
-msgstr ""
-
-#. i18n: file: exampleoptionsbase.ui:235
-#. i18n: ectx: property (text), widget (QLineEdit, m_exampleGenre)
-#: playlist.cpp:1521 rc.cpp:80 rc.cpp:396 tagrenameroptions.cpp:115
-msgid "Genre"
-msgstr ""
-
-#. i18n: file: trackpickerdialogbase.ui:141
-#. i18n: ectx: property (text), widget (K3ListView, trackList)
-#: playlist.cpp:1522 rc.cpp:272 rc.cpp:546 tagrenameroptions.cpp:119
-msgid "Year"
-msgstr "Blwyddyn"
-
-#: playlist.cpp:1523
-msgid "Length"
-msgstr "Hyd"
-
-#: playlist.cpp:1524
-msgid "Bitrate"
-msgstr ""
-
-#: playlist.cpp:1525
-msgid "Comment"
-msgstr "Sylwad"
-
-#. i18n: file: trackpickerdialogbase.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, fileInfoGroup)
-#: playlist.cpp:1526 rc.cpp:254 rc.cpp:528
-msgid "File Name"
-msgstr "Enw Ffeil"
-
-#: playlist.cpp:1527
-msgid "File Name (full path)"
-msgstr ""
-
-#: playlist.cpp:1703
-msgid "&Show Columns"
-msgstr "&Dangos Colofnau"
-
-#: playlist.cpp:2136
-msgid "Add to Play Queue"
-msgstr ""
-
-#: playlist.cpp:2149 playlist.cpp:2299
-msgid "Edit"
-msgstr ""
-
-#: playlist.cpp:2164
-msgid "Create Playlist From Selected Items..."
-msgstr ""
-
-#: playlist.cpp:2185
-#, kde-format
-msgid "Edit '%1'"
-msgstr "Golygu '%1'"
-
-#: playlist.cpp:2297
-msgid "This will edit multiple files. Are you sure?"
-msgstr ""
-
-#: playlist.cpp:2356 playlistcollection.h:172
-msgid "Create New Playlist"
-msgstr ""
-
-#: playlist.cpp:2365
-msgid ""
-"Manual column widths have been enabled.  You can switch back to automatic "
-"column sizes in the view menu."
-msgstr ""
-
-#: playlist.cpp:2368
-msgid "Manual Column Widths Enabled"
-msgstr ""
-
 #: playlistbox.cpp:109
 msgid "View Modes"
 msgstr ""
@@ -747,7 +602,7 @@
 msgid "Show &History"
 msgstr ""
 
-#: playlistbox.cpp:214 playlistcollection.cpp:402
+#: playlistbox.cpp:214 playlistcollection.cpp:403
 msgctxt "verb, copy the playlist"
 msgid "Duplicate"
 msgstr ""
@@ -774,7 +629,7 @@
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:100
 #. i18n: ectx: property (text), widget (KPushButton, bRemove)
-#: playlistbox.cpp:351 rc.cpp:251 rc.cpp:525
+#: playlistbox.cpp:351 rc.cpp:304
 msgid "&Remove"
 msgstr ""
 
@@ -782,7 +637,7 @@
 msgid "Hid&e"
 msgstr "Cud&dio"
 
-#: playlistbox.cpp:671 playlistcollection.cpp:891
+#: playlistbox.cpp:671 playlistcollection.cpp:892
 msgid "R&emove"
 msgstr "G&waredu"
 
@@ -790,259 +645,364 @@
 msgid "Dynamic List"
 msgstr ""
 
-#: playlistcollection.cpp:231
+#: playlistcollection.cpp:232
 msgid "Now Playing"
 msgstr ""
 
-#: playlistcollection.cpp:333
+#: playlistcollection.cpp:334
 msgid ""
 "Do you want to add these items to the current list or to the collection list?"
 msgstr ""
 
-#: playlistcollection.cpp:335
+#: playlistcollection.cpp:336
 msgctxt "current playlist"
 msgid "Current"
 msgstr ""
 
-#: playlistcollection.cpp:336
+#: playlistcollection.cpp:337
 msgid "Collection"
 msgstr ""
 
-#: playlistcollection.cpp:390
+#: playlistcollection.cpp:391
 msgid "Rename"
 msgstr "Ail-enwi"
 
-#: playlistcollection.cpp:504
+#: playlistcollection.cpp:505
 msgid "Search Playlist"
 msgstr ""
 
-#: playlistcollection.cpp:521
+#: playlistcollection.cpp:522
 msgid "Create Folder Playlist"
 msgstr ""
 
-#: nowplaying.cpp:340 nowplaying.cpp:355 playlistcollection.cpp:560
+#: playlistcollection.cpp:561
 msgid "History"
 msgstr "Hanes"
 
-#: playlistcollection.cpp:742
+#: playlistcollection.cpp:743
 msgid "Please enter a name for this playlist:"
 msgstr ""
 
-#: playlistcollection.cpp:852
+#: playlistcollection.cpp:853
 msgctxt "new playlist"
 msgid "&New"
 msgstr ""
 
-#: playlistcollection.cpp:855
+#: playlistcollection.cpp:856
 msgid "&Empty Playlist..."
 msgstr ""
 
-#: playlistcollection.cpp:857
+#: playlistcollection.cpp:858
 msgid "&Search Playlist..."
 msgstr ""
 
-#: playlistcollection.cpp:859
+#: playlistcollection.cpp:860
 msgid "Playlist From &Folder..."
 msgstr ""
 
-#: playlistcollection.cpp:865
+#: playlistcollection.cpp:866
 msgid "&Guess Tag Information"
 msgstr ""
 
-#: playlistcollection.cpp:870
+#: playlistcollection.cpp:871
 msgid "From &File Name"
 msgstr ""
 
-#: playlistcollection.cpp:872
+#: playlistcollection.cpp:873
 msgid "From &Internet"
 msgstr ""
 
-#: playlistcollection.cpp:875
+#: playlistcollection.cpp:876
 msgid "Guess Tag Information From &File Name"
 msgstr ""
 
-#: playlistcollection.cpp:880
+#: playlistcollection.cpp:881
 msgid "Play First Track"
 msgstr ""
 
-#: playlistcollection.cpp:881
+#: playlistcollection.cpp:882
 msgid "Play Next Album"
 msgstr ""
 
-#: playlistcollection.cpp:887
+#: playlistcollection.cpp:888
 msgid "Add &Folder..."
 msgstr ""
 
-#: playlistcollection.cpp:888
+#: playlistcollection.cpp:889
 msgid "&Rename..."
 msgstr "Ail-&enwi..."
 
-#: playlistcollection.cpp:889
+#: playlistcollection.cpp:890
 msgctxt "verb, copy the playlist"
 msgid "D&uplicate..."
 msgstr ""
 
-#: playlistcollection.cpp:892
+#: playlistcollection.cpp:893
 msgid "Reload"
 msgstr ""
 
-#: playlistcollection.cpp:893
+#: playlistcollection.cpp:894
 msgid "Edit Search..."
 msgstr ""
 
-#: playlistcollection.cpp:895
+#: playlistcollection.cpp:896
 msgid "&Delete"
 msgstr ""
 
-#: playlistcollection.cpp:896
+#: playlistcollection.cpp:897
 msgid "Refresh"
 msgstr "Cyfredoli"
 
-#: playlistcollection.cpp:897
+#: playlistcollection.cpp:898
 msgid "&Rename File"
 msgstr ""
 
 #. i18n: file: coverdialogbase.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, CoverDialogBase)
-#: playlistcollection.cpp:899 rc.cpp:3 rc.cpp:319
+#: playlistcollection.cpp:900 rc.cpp:47
 msgid "Cover Manager"
 msgstr ""
 
-#: playlistcollection.cpp:902
+#: playlistcollection.cpp:903
 msgid "&View Cover"
 msgstr ""
 
-#: playlistcollection.cpp:904
+#: playlistcollection.cpp:905
 msgid "Get Cover From &File..."
 msgstr ""
 
-#: playlistcollection.cpp:906
+#: playlistcollection.cpp:907
 msgid "Get Cover From &Internet..."
 msgstr ""
 
-#: playlistcollection.cpp:908
+#: playlistcollection.cpp:909
 msgid "&Delete Cover"
 msgstr ""
 
-#: playlistcollection.cpp:910
+#: playlistcollection.cpp:911
 msgid "Show Cover &Manager"
 msgstr ""
 
-#: playlistcollection.cpp:914
+#: playlistcollection.cpp:915
 msgid "Show &Play Queue"
 msgstr ""
 
-#: playlistsplitter.cpp:154
+#: playlist.cpp:555
+#, kde-format
+msgid "Could not save to file %1."
+msgstr ""
+
+#: playlist.cpp:821
+msgid "Are you sure you want to delete these covers?"
+msgstr ""
+
+#: playlist.cpp:823
+msgid "&Delete Covers"
+msgstr ""
+
+#: playlist.cpp:852
+msgid "Select Cover Image File"
+msgstr ""
+
+#: playlist.cpp:1000
+msgid "Could not delete these files"
+msgstr ""
+
+#: playlist.cpp:1001
+msgid "Could not move these files to the Trash"
+msgstr ""
+
+#. i18n: file: trackpickerdialogbase.ui:97
+#. i18n: ectx: property (text), widget (K3ListView, trackList)
+#: playlist.cpp:1516 rc.cpp:313
+msgid "Track Name"
+msgstr ""
+
+#. i18n: file: coverdialogbase.ui:46
+#. i18n: ectx: property (text), widget (K3ListView, m_artists)
+#. i18n: file: exampleoptionsbase.ui:221
+#. i18n: ectx: property (text), widget (KLineEdit, m_exampleArtist)
+#. i18n: file: trackpickerdialogbase.ui:108
+#. i18n: ectx: property (text), widget (K3ListView, trackList)
+#: playlist.cpp:1517 rc.cpp:50 rc.cpp:118 rc.cpp:316 tagrenameroptions.cpp:102
+msgid "Artist"
+msgstr "Artist"
+
+#. i18n: file: exampleoptionsbase.ui:228
+#. i18n: ectx: property (text), widget (KLineEdit, m_exampleAlbum)
+#. i18n: file: trackpickerdialogbase.ui:119
+#. i18n: ectx: property (text), widget (K3ListView, trackList)
+#: playlist.cpp:1518 rc.cpp:121 rc.cpp:319 tagrenameroptions.cpp:106
+msgid "Album"
+msgstr "Album:"
+
+#: playlist.cpp:1519
+msgid "Cover"
+msgstr ""
+
+#. i18n: file: trackpickerdialogbase.ui:130
+#. i18n: ectx: property (text), widget (K3ListView, trackList)
+#: playlist.cpp:1520 rc.cpp:322 tagrenameroptions.cpp:110
+msgctxt "cd track number"
+msgid "Track"
+msgstr ""
+
+#. i18n: file: exampleoptionsbase.ui:235
+#. i18n: ectx: property (text), widget (KLineEdit, m_exampleGenre)
+#: playlist.cpp:1521 rc.cpp:124 tagrenameroptions.cpp:115
+msgid "Genre"
+msgstr ""
+
+#. i18n: file: trackpickerdialogbase.ui:141
+#. i18n: ectx: property (text), widget (K3ListView, trackList)
+#: playlist.cpp:1522 rc.cpp:325 tagrenameroptions.cpp:119
+msgid "Year"
+msgstr "Blwyddyn"
+
+#: playlist.cpp:1523
+msgid "Length"
+msgstr "Hyd"
+
+#: playlist.cpp:1524
+msgid "Bitrate"
+msgstr ""
+
+#: playlist.cpp:1525
+msgid "Comment"
+msgstr "Sylwad"
+
+#. i18n: file: trackpickerdialogbase.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, fileInfoGroup)
+#: playlist.cpp:1526 rc.cpp:307
+msgid "File Name"
+msgstr "Enw Ffeil"
+
+#: playlist.cpp:1527
+msgid "File Name (full path)"
+msgstr ""
+
+#: playlist.cpp:1693
+msgid "&Show Columns"
+msgstr "&Dangos Colofnau"
+
+#: playlist.cpp:2126
+msgid "Add to Play Queue"
+msgstr ""
+
+#: playlist.cpp:2139 playlist.cpp:2289
+msgid "Edit"
+msgstr ""
+
+#: playlist.cpp:2154
+msgid "Create Playlist From Selected Items..."
+msgstr ""
+
+#: playlist.cpp:2175
+#, kde-format
+msgid "Edit '%1'"
+msgstr "Golygu '%1'"
+
+#: playlist.cpp:2287
+msgid "This will edit multiple files. Are you sure?"
+msgstr ""
+
+#: playlist.cpp:2346 playlistcollection.h:180
+msgid "Create New Playlist"
+msgstr ""
+
+#: playlist.cpp:2355
+msgid ""
+"Manual column widths have been enabled.  You can switch back to automatic "
+"column sizes in the view menu."
+msgstr ""
+
+#: playlist.cpp:2358
+msgid "Manual Column Widths Enabled"
+msgstr ""
+
+#: playlistsplitter.cpp:155
 msgid "Show &Search Bar"
 msgstr ""
 
-#: playlistsplitter.cpp:157
+#: playlistsplitter.cpp:158
 msgid "Edit Track Search"
 msgstr ""
 
-#: rc.cpp:273
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:274
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: jukui-rtl.rc:4
-#. i18n: ectx: Menu (file)
 #. i18n: file: jukui.rc:6
 #. i18n: ectx: Menu (file)
 #. i18n: file: jukui-rtl.rc:4
 #. i18n: ectx: Menu (file)
-#. i18n: file: jukui.rc:6
-#. i18n: ectx: Menu (file)
-#: rc.cpp:158 rc.cpp:179 rc.cpp:277 rc.cpp:298
+#: rc.cpp:5 rc.cpp:26
 msgid "&File"
 msgstr ""
 
-#. i18n: file: jukui-rtl.rc:26
-#. i18n: ectx: Menu (view)
 #. i18n: file: jukui.rc:28
 #. i18n: ectx: Menu (view)
 #. i18n: file: jukui-rtl.rc:26
 #. i18n: ectx: Menu (view)
-#. i18n: file: jukui.rc:28
-#. i18n: ectx: Menu (view)
-#: rc.cpp:161 rc.cpp:182 rc.cpp:280 rc.cpp:301
+#: rc.cpp:8 rc.cpp:29
 msgid "&View"
 msgstr ""
 
-#. i18n: file: jukui-rtl.rc:38
-#. i18n: ectx: Menu (player)
 #. i18n: file: jukui.rc:40
 #. i18n: ectx: Menu (player)
 #. i18n: file: jukui-rtl.rc:38
 #. i18n: ectx: Menu (player)
-#. i18n: file: jukui.rc:40
-#. i18n: ectx: Menu (player)
-#: rc.cpp:164 rc.cpp:185 rc.cpp:283 rc.cpp:304
+#: rc.cpp:11 rc.cpp:32
 msgid "&Player"
 msgstr "&Chwaraewr"
 
-#. i18n: file: jukui-rtl.rc:56
-#. i18n: ectx: Menu (playlist)
 #. i18n: file: jukui.rc:58
 #. i18n: ectx: Menu (playlist)
 #. i18n: file: jukui-rtl.rc:56
 #. i18n: ectx: Menu (playlist)
-#. i18n: file: jukui.rc:58
-#. i18n: ectx: Menu (playlist)
-#: rc.cpp:167 rc.cpp:188 rc.cpp:286 rc.cpp:307
+#: rc.cpp:14 rc.cpp:35
 msgid "&Tagger"
 msgstr ""
 
-#. i18n: file: jukui-rtl.rc:67
-#. i18n: ectx: Menu (settings)
 #. i18n: file: jukui.rc:69
 #. i18n: ectx: Menu (settings)
 #. i18n: file: jukui-rtl.rc:67
 #. i18n: ectx: Menu (settings)
-#. i18n: file: jukui.rc:69
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:170 rc.cpp:191 rc.cpp:289 rc.cpp:310
+#: rc.cpp:17 rc.cpp:38
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: jukui-rtl.rc:79
-#. i18n: ectx: ToolBar (mainToolBar)
 #. i18n: file: jukui.rc:81
 #. i18n: ectx: ToolBar (mainToolBar)
 #. i18n: file: jukui-rtl.rc:79
 #. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: jukui.rc:81
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:173 rc.cpp:194 rc.cpp:292 rc.cpp:313
+#: rc.cpp:20 rc.cpp:41
 msgid "Main Toolbar"
 msgstr ""
 
-#. i18n: file: jukui-rtl.rc:97
-#. i18n: ectx: ToolBar (playToolBar)
 #. i18n: file: jukui.rc:99
 #. i18n: ectx: ToolBar (playToolBar)
 #. i18n: file: jukui-rtl.rc:97
 #. i18n: ectx: ToolBar (playToolBar)
-#. i18n: file: jukui.rc:99
-#. i18n: ectx: ToolBar (playToolBar)
-#: rc.cpp:176 rc.cpp:197 rc.cpp:295 rc.cpp:316
+#: rc.cpp:23 rc.cpp:44
 msgid "Play Toolbar"
 msgstr ""
 
 #. i18n: file: deletedialogbase.ui:61
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:10 rc.cpp:326
+#: rc.cpp:53
 msgid "Are you sure that you want to remove these items?"
 msgstr ""
 
 #. i18n: file: deletedialogbase.ui:111
 #. i18n: ectx: property (toolTip), widget (QCheckBox, ddShouldDelete)
-#: rc.cpp:15 rc.cpp:331
+#: rc.cpp:56
 msgid ""
 "If checked, files will be permanently removed instead of being placed in the "
 "Trash Bin"
@@ -1050,7 +1010,7 @@
 
 #. i18n: file: deletedialogbase.ui:116
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ddShouldDelete)
-#: rc.cpp:18 rc.cpp:334
+#: rc.cpp:59
 msgid ""
 "<qt><p>If this box is checked, files will be <b>permanently removed</b> "
 "instead of being placed in the Trash Bin.</p>\n"
@@ -1061,7 +1021,7 @@
 
 #. i18n: file: deletedialogbase.ui:119
 #. i18n: ectx: property (text), widget (QCheckBox, ddShouldDelete)
-#: rc.cpp:23 rc.cpp:339
+#: rc.cpp:64
 msgid "&Delete files instead of moving them to the trash"
 msgstr ""
 
@@ -1071,27 +1031,27 @@
 msgid "Please choose the folders where you keep your music:"
 msgstr ""
 
-#. i18n: file: directorylistbase.ui:19
-#. i18n: ectx: property (text), widget (QLabel, informationLabel)
-#: rc.cpp:26 rc.cpp:342
+#. i18n: file: directorylistbase.ui:34
+#. i18n: ectx: property (toolTip), widget (QListView, directoryListView)
+#: rc.cpp:70
 msgid "These folders will be scanned on startup for new files."
 msgstr ""
 
-#. i18n: file: directorylistbase.ui:58
+#. i18n: file: directorylistbase.ui:61
 #. i18n: ectx: property (text), widget (KPushButton, addDirectoryButton)
-#: rc.cpp:29 rc.cpp:345
+#: rc.cpp:73
 msgid "Add Folder..."
 msgstr ""
 
-#. i18n: file: directorylistbase.ui:65
+#. i18n: file: directorylistbase.ui:68
 #. i18n: ectx: property (text), widget (KPushButton, removeDirectoryButton)
-#: rc.cpp:32 rc.cpp:348
+#: rc.cpp:76
 msgid "Remove Folder"
 msgstr "Gwaredu Plygell"
 
-#. i18n: file: directorylistbase.ui:92
+#. i18n: file: directorylistbase.ui:95
 #. i18n: ectx: property (text), widget (QCheckBox, importPlaylistsCheckBox)
-#: rc.cpp:35 rc.cpp:351
+#: rc.cpp:79
 msgid "Import playlists"
 msgstr ""
 
@@ -1099,188 +1059,184 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, ExampleOptionsBase)
 #. i18n: file: filerenamerbase.ui:176
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: exampleoptionsbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ExampleOptionsBase)
-#. i18n: file: filerenamerbase.ui:176
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:38 rc.cpp:116 rc.cpp:354 rc.cpp:432
+#: rc.cpp:82 rc.cpp:160
 msgid "Example"
 msgstr "Enghraifft"
 
 #. i18n: file: exampleoptionsbase.ui:37
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:41 rc.cpp:357
+#: rc.cpp:85
 msgid "Example Tag Selection"
 msgstr ""
 
 #. i18n: file: exampleoptionsbase.ui:58
 #. i18n: ectx: property (text), widget (QRadioButton, m_fileTagsButton)
-#: rc.cpp:44 rc.cpp:360
+#: rc.cpp:88
 msgid "Get example tags from this file:"
 msgstr ""
 
 #. i18n: file: exampleoptionsbase.ui:81
 #. i18n: ectx: property (text), widget (QRadioButton, m_manualTagsButton)
-#: rc.cpp:47 rc.cpp:363
+#: rc.cpp:91
 msgid "Enter example tags manually:"
 msgstr ""
 
 #. i18n: file: exampleoptionsbase.ui:91
 #. i18n: ectx: property (title), widget (QGroupBox, m_manualGroup)
-#: rc.cpp:50 rc.cpp:366
+#: rc.cpp:94
 msgid "Example Tags"
 msgstr ""
 
 #. i18n: file: exampleoptionsbase.ui:135
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:53 rc.cpp:369
+#: rc.cpp:97
 msgctxt "song title"
 msgid "Title:"
 msgstr ""
 
 #. i18n: file: exampleoptionsbase.ui:145
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:56 rc.cpp:372
+#: rc.cpp:100
 msgid "Artist:"
 msgstr "Artist:"
 
 #. i18n: file: exampleoptionsbase.ui:155
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:59 rc.cpp:375
+#: rc.cpp:103
 msgid "Album:"
 msgstr "Album:"
 
 #. i18n: file: exampleoptionsbase.ui:165
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:62 rc.cpp:378
+#: rc.cpp:106
 msgid "Genre:"
 msgstr ""
 
 #. i18n: file: exampleoptionsbase.ui:175
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:65 rc.cpp:381
+#: rc.cpp:109
 msgid "Track number:"
 msgstr "Rhif trac:"
 
 #. i18n: file: exampleoptionsbase.ui:185
 #. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:68 rc.cpp:384
+#: rc.cpp:112
 msgid "Year:"
 msgstr "Blwyddyn :"
 
 #. i18n: file: exampleoptionsbase.ui:214
-#. i18n: ectx: property (text), widget (QLineEdit, m_exampleTitle)
-#: rc.cpp:71 rc.cpp:387
+#. i18n: ectx: property (text), widget (KLineEdit, m_exampleTitle)
+#: rc.cpp:115
 msgctxt "example song title"
 msgid "Title"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:20
 #. i18n: ectx: property (windowTitle), widget (QWidget, FileRenamerBase)
-#: rc.cpp:83 rc.cpp:399
+#: rc.cpp:127
 msgid "File Renamer Configuration"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:47
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_6)
-#: rc.cpp:86 rc.cpp:402
+#: rc.cpp:130
 msgid "Music folder:"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:63
 #. i18n: ectx: property (text), item, widget (KComboBox, m_category)
-#: rc.cpp:89 rc.cpp:405
+#: rc.cpp:133
 msgid "Album Tag"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:68
 #. i18n: ectx: property (text), item, widget (KComboBox, m_category)
-#: rc.cpp:92 rc.cpp:408
+#: rc.cpp:136
 msgid "Artist Tag"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:73
 #. i18n: ectx: property (text), item, widget (KComboBox, m_category)
-#: rc.cpp:95 rc.cpp:411
+#: rc.cpp:139
 msgid "Genre Tag"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:78
 #. i18n: ectx: property (text), item, widget (KComboBox, m_category)
-#: rc.cpp:98 rc.cpp:414
+#: rc.cpp:142
 msgid "Title Tag"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:83
 #. i18n: ectx: property (text), item, widget (KComboBox, m_category)
-#: rc.cpp:101 rc.cpp:417
+#: rc.cpp:145
 msgid "Track Tag"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:88
 #. i18n: ectx: property (text), item, widget (KComboBox, m_category)
-#: rc.cpp:104 rc.cpp:420
+#: rc.cpp:148
 msgid "Year Tag"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:96
 #. i18n: ectx: property (text), widget (KPushButton, m_insertCategory)
-#: rc.cpp:107 rc.cpp:423
+#: rc.cpp:151
 msgid "Insert Category"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:108
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:110 rc.cpp:426
+#: rc.cpp:154
 msgid "Add category:"
 msgstr ""
 
 #. i18n: file: filerenamerbase.ui:118
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_7)
-#: rc.cpp:113 rc.cpp:429
+#: rc.cpp:157
 msgid "Separator:"
 msgstr "Gwahanydd:"
 
 #. i18n: file: filerenameroptionsbase.ui:115
 #. i18n: ectx: property (text), widget (QLabel, m_substitution)
-#: rc.cpp:122 rc.cpp:438
+#: rc.cpp:166
 msgid "Substitution Example"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:137
 #. i18n: ectx: property (text), widget (QRadioButton, m_includeEmptyButton)
-#: rc.cpp:125 rc.cpp:441
+#: rc.cpp:169
 msgid "Include in the &filename anyways"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:144
 #. i18n: ectx: property (text), widget (QRadioButton, m_ignoreTagButton)
-#: rc.cpp:128 rc.cpp:444
+#: rc.cpp:172
 msgid "&Ignore this tag when renaming the file"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:162
 #. i18n: ectx: property (text), widget (QRadioButton, m_useValueButton)
-#: rc.cpp:131 rc.cpp:447
+#: rc.cpp:175
 msgid "Use &this value:"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:172
-#. i18n: ectx: property (text), widget (QLineEdit, m_emptyTagValue)
-#: rc.cpp:134 rc.cpp:450
+#. i18n: ectx: property (text), widget (KLineEdit, m_emptyTagValue)
+#: rc.cpp:178
 msgctxt "value to use in replacement when source tag empty"
 msgid "Empty"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:184
 #. i18n: ectx: property (title), widget (QGroupBox, m_trackGroup)
-#: rc.cpp:137 rc.cpp:453
+#: rc.cpp:181
 msgid "Track numbering"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:196
 #. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#: rc.cpp:140 rc.cpp:456
+#: rc.cpp:184
 msgid ""
 "JuK can force the track used in a file name to have a minimum number of "
 "digits.  You may want to do this for better sorting in file managers."
@@ -1288,31 +1244,31 @@
 
 #. i18n: file: filerenameroptionsbase.ui:228
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:143 rc.cpp:459
+#: rc.cpp:187
 msgid "Minimum number of digits:"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:266
 #. i18n: ectx: property (text), widget (QLabel, m_doubleDigitExample)
-#: rc.cpp:146 rc.cpp:462
+#: rc.cpp:190
 msgid "014"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:284
 #. i18n: ectx: property (text), widget (QLabel, m_singleDigitExample)
-#: rc.cpp:149 rc.cpp:465
+#: rc.cpp:193
 msgid "003"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:291
 #. i18n: ectx: property (text), widget (QLabel, m_singleDigit)
-#: rc.cpp:152 rc.cpp:468
+#: rc.cpp:196
 msgid "3 ->"
 msgstr ""
 
 #. i18n: file: filerenameroptionsbase.ui:301
 #. i18n: ectx: property (text), widget (QLabel, m_doubleDigit)
-#: rc.cpp:155 rc.cpp:471
+#: rc.cpp:199
 msgid "14 ->"
 msgstr ""
 
@@ -1328,19 +1284,27 @@
 msgid "T&rack:"
 msgstr ""
 
-#: tageditor.cpp:522
+#. i18n: file: tageditor.ui:39
+#. i18n: ectx: property (text), widget (QLabel, artistNameLabel)
+#: rc.cpp:208
 msgid "&Artist name:"
 msgstr ""
 
-#: tageditor.cpp:531
+#. i18n: file: tageditor.ui:49
+#. i18n: ectx: property (text), widget (QLabel, albumNameLabel)
+#: rc.cpp:211
 msgid "Album &name:"
 msgstr ""
 
-#: tageditor.cpp:535
+#. i18n: file: tageditor.ui:59
+#. i18n: ectx: property (text), widget (QLabel, genreLabel)
+#: rc.cpp:214
 msgid "&Genre:"
 msgstr ""
 
-#: tageditor.cpp:578
+#. i18n: file: tageditor.ui:72
+#. i18n: ectx: property (text), widget (QLabel, yearLabel)
+#: rc.cpp:217
 msgid "&Year:"
 msgstr "&Blwyddyn :"
 
@@ -1356,7 +1320,9 @@
 msgid "&Bitrate:"
 msgstr ""
 
-#: tageditor.cpp:616
+#. i18n: file: tageditor.ui:108
+#. i18n: ectx: property (text), widget (QLabel, commentLabel)
+#: rc.cpp:226
 msgid "&Comment:"
 msgstr "&Sylwad:"
 
@@ -1366,13 +1332,28 @@
 msgid "Trac&k name:"
 msgstr ""
 
-#: tageditor.cpp:759
+#. i18n: file: tageditor.ui:186
+#. i18n: ectx: property (text), widget (QCheckBox, artistNameEnable)
+#. i18n: file: tageditor.ui:196
+#. i18n: ectx: property (text), widget (QCheckBox, trackNameEnable)
+#. i18n: file: tageditor.ui:203
+#. i18n: ectx: property (text), widget (QCheckBox, albumNameEnable)
+#. i18n: file: tageditor.ui:210
+#. i18n: ectx: property (text), widget (QCheckBox, genreEnable)
+#. i18n: file: tageditor.ui:217
+#. i18n: ectx: property (text), widget (QCheckBox, trackEnable)
+#. i18n: file: tageditor.ui:224
+#. i18n: ectx: property (text), widget (QCheckBox, yearEnable)
+#. i18n: file: tageditor.ui:231
+#. i18n: ectx: property (text), widget (QCheckBox, commentEnable)
+#: rc.cpp:232 rc.cpp:235 rc.cpp:238 rc.cpp:241 rc.cpp:244 rc.cpp:247
+#: rc.cpp:250
 msgid "Enable"
 msgstr "Galluogi"
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:18
 #. i18n: ectx: property (toolTip), widget (QTreeView, lvSchemes)
-#: rc.cpp:200 rc.cpp:474
+#: rc.cpp:253
 msgid "Currently used file name schemes"
 msgstr ""
 
@@ -1401,83 +1382,83 @@
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:42
 #. i18n: ectx: property (toolTip), widget (QToolButton, bMoveUp)
-#: rc.cpp:215 rc.cpp:489
+#: rc.cpp:268
 msgid "Move scheme up"
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:45
 #. i18n: ectx: property (whatsThis), widget (QToolButton, bMoveUp)
-#: rc.cpp:218 rc.cpp:492
+#: rc.cpp:271
 msgid ""
 "Press this button to move the currently selected scheme one step upwards."
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:55
 #. i18n: ectx: property (toolTip), widget (QToolButton, bMoveDown)
-#: rc.cpp:221 rc.cpp:495
+#: rc.cpp:274
 msgid "Move scheme down"
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:58
 #. i18n: ectx: property (whatsThis), widget (QToolButton, bMoveDown)
-#: rc.cpp:224 rc.cpp:498
+#: rc.cpp:277
 msgid ""
 "Press this button to move the currently selected scheme one step downwards."
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:68
 #. i18n: ectx: property (toolTip), widget (KPushButton, bAdd)
-#: rc.cpp:227 rc.cpp:501
+#: rc.cpp:280
 msgid "Add a new scheme"
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:71
 #. i18n: ectx: property (whatsThis), widget (KPushButton, bAdd)
-#: rc.cpp:230 rc.cpp:504
+#: rc.cpp:283
 msgid ""
 "Press this button to add a new file name scheme to the end of the list."
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:74
 #. i18n: ectx: property (text), widget (KPushButton, bAdd)
-#: rc.cpp:233 rc.cpp:507
+#: rc.cpp:286
 msgid "&Add"
 msgstr "&Ychwanegu"
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:81
 #. i18n: ectx: property (toolTip), widget (KPushButton, bModify)
-#: rc.cpp:236 rc.cpp:510
+#: rc.cpp:289
 msgid "Modify scheme"
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:84
 #. i18n: ectx: property (whatsThis), widget (KPushButton, bModify)
-#: rc.cpp:239 rc.cpp:513
+#: rc.cpp:292
 msgid "Press this button to modify the currently selected scheme."
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:87
 #. i18n: ectx: property (text), widget (KPushButton, bModify)
-#: rc.cpp:242 rc.cpp:516
+#: rc.cpp:295
 msgid "&Modify"
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:94
 #. i18n: ectx: property (toolTip), widget (KPushButton, bRemove)
-#: rc.cpp:245 rc.cpp:519
+#: rc.cpp:298
 msgid "Remove scheme"
 msgstr ""
 
 #. i18n: file: tagguesserconfigdlgwidget.ui:97
 #. i18n: ectx: property (whatsThis), widget (KPushButton, bRemove)
-#: rc.cpp:248 rc.cpp:522
+#: rc.cpp:301
 msgid ""
 "Press this button to remove the currently selected scheme from the list."
 msgstr ""
 
 #. i18n: file: trackpickerdialogbase.ui:64
 #. i18n: ectx: property (title), widget (QGroupBox, trackInfoGroup)
-#: rc.cpp:257 rc.cpp:531
+#: rc.cpp:310
 msgid "Select Best Possible Match"
 msgstr ""
 
@@ -1501,6 +1482,10 @@
 msgid "Search:"
 msgstr "Chwiliad:"
 
+#: slideraction.cpp:66
+msgid "Seeking is not supported in this file with your audio settings."
+msgstr ""
+
 #: slider.cpp:235
 msgid "100%"
 msgstr ""
@@ -1525,10 +1510,6 @@
 msgid "0%"
 msgstr ""
 
-#: slideraction.cpp:66
-msgid "Seeking is not supported in this file with your audio settings."
-msgstr ""
-
 #: splashscreen.cpp:34
 msgid "Loading"
 msgstr "llwytho"
@@ -1561,19 +1542,19 @@
 msgid "%1 - <i>%2</i>"
 msgstr ""
 
-#: tageditor.cpp:480
+#: tageditor.cpp:485
 msgid "Show &Tag Editor"
 msgstr ""
 
-#: tageditor.cpp:484
+#: tageditor.cpp:489
 msgid "&Save"
 msgstr ""
 
-#: tageditor.cpp:735
+#: tageditor.cpp:617
 msgid "Do you want to save your changes to:\n"
 msgstr ""
 
-#: tageditor.cpp:737
+#: tageditor.cpp:619
 msgid "Save Changes"
 msgstr "Cadw Newidiadau"
 
@@ -1613,7 +1594,7 @@
 msgid "Error"
 msgstr ""
 
-#: trackpickerdialog.cpp:52
+#: trackpickerdialog.cpp:53
 msgid "Internet Tag Guesser"
 msgstr ""
 
@@ -1642,37 +1623,41 @@
 msgid "Play Queue"
 msgstr ""
 
-#: viewmode.cpp:122
+#: viewmode.cpp:158
 msgctxt "the normal viewing mode"
 msgid "Default"
 msgstr ""
 
-#: viewmode.cpp:243
+#: viewmode.cpp:280
 msgctxt "compact viewing mode"
 msgid "Compact"
 msgstr ""
 
-#: viewmode.cpp:279
+#: viewmode.cpp:316
 msgid "Tree"
 msgstr "Coeden"
 
-#: viewmode.cpp:415
+#: viewmode.cpp:452
 msgid "Artists"
 msgstr ""
 
-#: viewmode.cpp:418
+#: viewmode.cpp:455
 msgid "Albums"
 msgstr ""
 
-#: viewmode.cpp:421
+#: viewmode.cpp:458
 msgid "Genres"
 msgstr ""
 
-#: volumepopupbutton.cpp:112 volumepopupbutton.cpp:123
+#: volumepopupbutton.cpp:70
+msgid "Mute/Unmute"
+msgstr ""
+
+#: volumepopupbutton.cpp:119 volumepopupbutton.cpp:129
 msgid "(muted)"
 msgstr ""
 
-#: volumepopupbutton.cpp:111 volumepopupbutton.cpp:123
+#: volumepopupbutton.cpp:118 volumepopupbutton.cpp:129
 #, kde-format
 msgid "Volume: %1% %2"
 msgstr ""
@@ -1697,6 +1682,6 @@
 msgid "New Search"
 msgstr ""
 
-#: playlistcollection.h:175
+#: playlistcollection.h:183
 msgid "Playlist"
 msgstr "Rhestr chwarae:"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/k3b.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/k3b.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/k3b.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/k3b.po	2012-04-18 08:59:22.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeextragear-1/k3b.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-01 16:25+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-08-19 17:55+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,8603 +11,8598 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:37+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: projects/k3bvideodvdview.cpp:58
-msgid ""
-"Be aware that you need to provide the complete Video DVD filestructure. K3b "
-"does not support video transcoding and preparation of video object files "
-"yet. That means you need to already have the VTS_X_YY.VOB and VTS_X_YY.IFO "
-"files."
+#: k3bstatusbarmanager.cpp:60
+msgid "Temp:"
 msgstr ""
 
-#: projects/k3bvideodvdview.cpp:62
-msgid "K3b Video DVD Restrictions"
+#: k3bstatusbarmanager.cpp:118
+msgid "No info"
 msgstr ""
 
-#: projects/k3bmusicbrainztrackloopupjob.cpp:78
+#: k3bstatusbarmanager.cpp:174
 #, kde-format
-msgid "Generating fingerprint for track %1."
+msgid "1 folder"
+msgid_plural "%1 folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: k3bstatusbarmanager.cpp:171
+#, kde-format
+msgid "1 file in %2"
+msgid_plural "%1 files in %2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: k3bstatusbarmanager.cpp:201
+#, kde-format
+msgid "Audio CD (1 track)"
+msgid_plural "Audio CD (%1 tracks)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: k3bstatusbarmanager.cpp:207
+#, kde-format
+msgid "Data Project (%1)"
 msgstr ""
 
-#: projects/k3bmusicbrainztrackloopupjob.cpp:117
+#: k3bstatusbarmanager.cpp:214
 #, kde-format
-msgid "Querying MusicBrainz for track %1."
+msgid "Mixed CD (1 track and %2)"
+msgid_plural "Mixed CD (%1 tracks and %2)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: k3bstatusbarmanager.cpp:221
+#, kde-format
+msgid "Video CD (1 track)"
+msgid_plural "Video CD (%1 tracks)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: k3bstatusbarmanager.cpp:227
+#, kde-format
+msgid "eMovix Project (%1)"
 msgstr ""
 
-#: projects/kostore/KoStore.cpp:195
-msgid "The directory mode is not supported for remote locations."
+#: k3bstatusbarmanager.cpp:233
+#, kde-format
+msgid "Video DVD (%1)"
 msgstr ""
 
-#: projects/kostore/KoStore.cpp:196
-msgid "KOffice Storage"
+#: k3baudioplayer.cpp:119 rip/k3baudiorippingdialog.cpp:142
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:86
+#: projects/k3bvcdtrackdialog.cpp:373 projects/k3baudioprojectmodel.cpp:327
+msgid "Filename"
+msgstr "Enw Ffeil"
+
+#: k3baudioplayer.cpp:120 rip/k3baudioprojectconvertingdialog.cpp:127
+#: rip/k3baudiorippingdialog.cpp:143 rip/k3bvideocdview.cpp:201
+#: rip/k3baudiotrackmodel.cpp:164 k3bdiskinfoview.cpp:256
+msgid "Length"
+msgstr "Hyd"
+
+#: k3baudioplayer.cpp:169 k3baudioplayer.cpp:551
+msgid "no file"
 msgstr ""
 
-#: projects/k3baudiotrackplayer.cpp:117 projects/k3baudiotrackplayer.cpp:176
-msgid "Play"
-msgstr "Chwarae"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:81
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
+#: k3baudioplayer.cpp:229 projects/k3bvcdview.cpp:55
+#: projects/k3baudiotrackview.cpp:187 projects/k3bmovixview.cpp:56
+#: projects/k3baudioviewimpl.cpp:65 projects/k3bdataviewimpl.cpp:42
+#: rc.cpp:1046
+msgid "Remove"
+msgstr ""
 
-#: projects/k3baudiotrackplayer.cpp:123 projects/k3baudiotrackplayer.cpp:178
-msgid "Pause"
-msgstr "Seibio"
+#: k3baudioplayer.cpp:232
+msgid "Clear List"
+msgstr "Gwagu'r Rhestr"
 
-#: projects/k3baudiotrackplayer.cpp:129
-msgid "Play/Pause"
-msgstr "Chwarae/Seibio"
+#: k3baudioplayer.cpp:352
+msgid "No running aRtsd found"
+msgstr ""
 
-#: projects/k3baudiotrackplayer.cpp:136 projects/k3baudiotrackplayer.cpp:177
-msgid "Stop"
+#: k3baudioplayer.cpp:359
+msgid "Unknown file format"
 msgstr ""
 
-#: projects/k3baudiotrackplayer.cpp:142 projects/k3baudiotrackplayer.cpp:179
-msgid "Next"
-msgstr "Nesaf"
+#: k3baudioplayer.cpp:593
+msgid "playing"
+msgstr "yn chwarae"
 
-#: projects/k3baudiotrackplayer.cpp:148
-msgid "Prev"
+#: k3baudioplayer.cpp:596
+msgid "paused"
+msgstr "wedi ei Seibio"
+
+#: k3baudioplayer.cpp:599
+msgid "stopped"
+msgstr "wedi aros"
+
+#: k3bemptydiscwaiter.cpp:89
+msgid "Waiting for Disk"
 msgstr ""
 
-#: projects/k3baudiotrackplayer.cpp:180
-msgid "Previous"
-msgstr "Cynt"
+#: k3bemptydiscwaiter.cpp:94
+msgid "Eject"
+msgstr "Allfwrw"
 
-#: projects/k3bvolumenamewidget.cpp:57
-msgid "Volume Name:"
+#: k3bemptydiscwaiter.cpp:96
+msgid "Load"
+msgstr "Llwytho"
+
+#: k3bemptydiscwaiter.cpp:118
+msgid "Found medium:"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:70
-msgid "Data Project"
+#: k3bemptydiscwaiter.cpp:267 k3bemptydiscwaiter.cpp:359
+#: k3bemptydiscwaiter.cpp:445
+#, kde-format
+msgid "Found %1 medium in %2 - %3. Should it be overwritten?"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:70 projects/k3bvideodvdburndialog.cpp:47
+#: k3bemptydiscwaiter.cpp:271 k3bemptydiscwaiter.cpp:364
+#: k3bemptydiscwaiter.cpp:450 k3bemptydiscwaiter.cpp:514
 #, kde-format
-msgid "Size: %1"
-msgstr "Maint: %1"
+msgid "Found %1"
+msgstr ""
 
-#: projects/k3bdataburndialog.cpp:81 projects/k3bmixedburndialog.cpp:80
-#: projects/k3bmovixburndialog.cpp:64 projects/k3bvideodvdburndialog.cpp:60
-msgid "Filesystem"
+#: k3bemptydiscwaiter.cpp:273 k3bemptydiscwaiter.cpp:366
+#: k3bemptydiscwaiter.cpp:452 k3bemptydiscwaiter.cpp:516
+#: k3bemptydiscwaiter.cpp:576 k3bappdevicemanager.cpp:61
+msgid "&Eject"
+msgstr "&Allfwrw"
+
+#: k3bemptydiscwaiter.cpp:332
+msgid "Preformatting DVD+RW"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:156 projects/k3bmixedburndialog.cpp:98
-#: projects/k3bmovixburndialog.cpp:99
-msgid "Datatrack Mode"
+#: k3bemptydiscwaiter.cpp:509
+#, kde-format
+msgid "Found %1 medium in %2 - %3. Should it be formatted?"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:161
-msgid "Multisession Mode"
+#: k3bemptydiscwaiter.cpp:515
+msgid "&Format"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:12
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: projects/k3bdataburndialog.cpp:170 projects/k3bmixedburndialog.cpp:101
-#: projects/k3bmixedburndialog.cpp:144 projects/k3bmovixburndialog.cpp:113
-#: projects/k3bvcdburndialog.cpp:366 option/k3boptiondialog.cpp:132 rc.cpp:673
-msgid "Misc"
-msgstr "Amrywiol"
+#: k3bemptydiscwaiter.cpp:537
+msgid "Formatting DVD-RW"
+msgstr ""
 
-#: projects/k3bdataburndialog.cpp:184 projects/k3bmovixburndialog.cpp:216
-#: projects/k3bvideodvdburndialog.cpp:169 projects/k3bvcdburndialog.cpp:552
-#: k3b.cpp:1076 k3bdebuggingoutputdialog.cpp:81
-#: misc/k3bmediacopydialog.cpp:302 misc/k3bmediacopydialog.cpp:311
+#: k3bemptydiscwaiter.cpp:572
 #, kde-format
-msgid "Do you want to overwrite %1?"
+msgid "Found rewritable medium in %1 - %2. Should it be erased?"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:185 projects/k3bmovixburndialog.cpp:217
-#: projects/k3bvideodvdburndialog.cpp:170 projects/k3bvcdburndialog.cpp:553
-#: k3b.cpp:1077 k3bdebuggingoutputdialog.cpp:82
-#: misc/k3bmediacopydialog.cpp:303 misc/k3bmediacopydialog.cpp:312
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
+#: k3bemptydiscwaiter.cpp:574
+msgid "Found Rewritable Disk"
+msgstr ""
 
-#: projects/k3bdataburndialog.cpp:199 projects/k3bmovixburndialog.cpp:227
-msgid "Most writers do not support writing multisession CDs in DAO mode."
+#: k3bemptydiscwaiter.cpp:575
+msgid "E&rase"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:262
-msgid ""
-"It is not possible to write multisession media in DAO mode. Multisession has "
-"been disabled."
+#: k3bemptydiscwaiter.cpp:582
+msgid "Erasing CD-RW"
 msgstr ""
 
-#: projects/k3bdataburndialog.cpp:264
-msgid "Multisession Problem"
+#: k3bemptydiscwaiter.cpp:650
+msgid "Waiting for Medium"
 msgstr ""
 
-#: projects/k3bview.cpp:54
-msgid "&Burn"
+#: k3bemptydiscwaiter.cpp:715
+msgid "Erasing failed."
 msgstr ""
 
-#: projects/k3bview.cpp:56
-msgid "Open the burn dialog for the current project"
+#: k3bfiletreeview.cpp:96 k3bdiroperator.cpp:55
+msgid "&Add to Project"
 msgstr ""
 
-#: projects/k3bview.cpp:57
-msgid "&Properties"
-msgstr "&Priodweddau"
+#: k3bprojecttabwidget.cpp:82 projects/k3bprojectburndialog.cpp:61
+msgid "Project"
+msgstr "Cywaith"
 
-#: projects/k3bview.cpp:59
-msgid "Open the properties dialog"
+#: k3bjobprogressosd.cpp:199
+msgid "Hide OSD"
 msgstr ""
 
-#: projects/k3bview.cpp:91 projects/k3bdataview.cpp:133
-#: projects/k3baudioviewimpl.cpp:349
-msgid "Please add files to your project first."
+#: k3bappdevicemanager.cpp:55
+msgid "Media &Info"
 msgstr ""
 
-#: projects/k3bview.cpp:92 projects/k3bmixedview.cpp:125
-#: projects/k3bdataview.cpp:134
-msgid "No Data to Burn"
+#: k3bappdevicemanager.cpp:57
+msgid "&Unmount"
+msgstr "&Datosod"
+
+#: k3bappdevicemanager.cpp:59
+msgid "&Mount"
+msgstr "&Gosod"
+
+#: k3bappdevicemanager.cpp:63
+msgid "L&oad"
+msgstr "L&lwytho"
+
+#: k3bappdevicemanager.cpp:69
+msgid "Set Read Speed..."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:95
-#, kde-format
-msgid "Moving files to project \"%1\"..."
+#: k3bappdevicemanager.cpp:72
+msgid "Display generic medium information"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:117
-#: projects/k3bdataurladdingdialog.cpp:123
-#, kde-format
-msgid "Adding files to project '%1'"
+#: k3bappdevicemanager.cpp:74
+msgid "Unmount the medium"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:148
-#: projects/k3baudiotrackaddingdialog.cpp:99
-msgid "Problems while adding files to the project."
+#: k3bappdevicemanager.cpp:76
+msgid "Mount the medium"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:197
-msgid ""
-"<p>The file you are about to add to the project is an ISO9660 image. As such "
-"it can be burned to a medium directly since it already contains a file "
-"system.<br>Are you sure you want to add this file to the project?"
+#: k3bappdevicemanager.cpp:78
+msgid "Eject the medium"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:201
-msgid "Adding image file to project"
+#: k3bappdevicemanager.cpp:80
+msgid "(Re)Load the medium"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:202
-msgid "Add the file to the project"
+#: k3bappdevicemanager.cpp:82
+msgid "Force the drive's read speed"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:203
-msgid "Burn the image directly"
+#: k3bappdevicemanager.cpp:288
+msgid "CD Read Speed"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:398
-#: projects/k3bdataurladdingdialog.cpp:625
-msgid "File already exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
-#: projects/k3bdataurladdingdialog.cpp:399
-#: projects/k3bdataurladdingdialog.cpp:626
+#: k3bappdevicemanager.cpp:289
 #, kde-format
-msgid "<p>File <em>%1</em> already exists in project folder <em>%2</em>."
+msgid ""
+"<p>Please enter the preferred read speed for <b>%1</b>. This speed will be "
+"used for the currently mounted medium.<p>This is especially useful to slow "
+"down the drive when watching movies which are read directly from the drive "
+"and the spinning noise is intrusive.<p>Be aware that this has no influence "
+"on K3b since it will change the reading speed again when copying CDs or DVDs."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:179
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
-#: projects/k3bdataurladdingdialog.cpp:406
-#: projects/k3bdataurladdingdialog.cpp:633 rc.cpp:553
-msgid "Replace"
+#: k3bappdevicemanager.cpp:307
+msgid "Setting the read speed failed."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:408
-#: projects/k3bdataurladdingdialog.cpp:635
-msgid "Replace the existing file"
+#: misc/k3bmediacopydialog.cpp:68
+msgid "Disk Copy"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:409
-#: projects/k3bdataurladdingdialog.cpp:636
-msgid "Replace All"
-msgstr "Amnewid y Cwbl"
+#: misc/k3bmediacopydialog.cpp:69
+msgid "and CD Cloning"
+msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:411
-#: projects/k3bdataurladdingdialog.cpp:638
-msgid "Always replace existing files"
+#: misc/k3bmediacopydialog.cpp:79
+msgid "Source Medium"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:412
-#: projects/k3bdataurladdingdialog.cpp:639 k3bwriterselectionwidget.cpp:272
-msgid "Ignore"
-msgstr "Anwybyddu"
+#: misc/k3bmediacopydialog.cpp:98
+msgid "Copy Mode"
+msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:414
-#: projects/k3bdataurladdingdialog.cpp:641
-msgid "Keep the existing file"
+#: misc/k3bmediacopydialog.cpp:100 misc/k3bmediacopydialog.cpp:230
+msgid "Normal Copy"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:415
-#: projects/k3bdataurladdingdialog.cpp:642
-msgid "Ignore All"
-msgstr "Anwybyddu Popeth"
+#: misc/k3bmediacopydialog.cpp:101 misc/k3bmediacopydialog.cpp:235
+msgid "Clone Copy"
+msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:417
-#: projects/k3bdataurladdingdialog.cpp:644
-msgid "Always keep the existing file"
+#: misc/k3bmediacopydialog.cpp:105 misc/k3bimagewritingdialog.cpp:285
+#: misc/k3bmediaformattingdialog.cpp:64 projects/k3bprojectburndialog.cpp:263
+msgid "Writing Mode"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:418
-#: projects/k3bdataurladdingdialog.cpp:645 projects/k3bdataviewimpl.cpp:44
-msgid "Rename"
-msgstr "Ail-enwi"
+#: misc/k3bmediacopydialog.cpp:110 misc/k3bimagewritingdialog.cpp:291
+#: projects/k3bprojectburndialog.cpp:282
+msgid "Copies"
+msgstr "Copïau"
 
-#: projects/k3bdataurladdingdialog.cpp:420
-#: projects/k3bdataurladdingdialog.cpp:647
-msgid "Rename the new file"
-msgstr ""
+#. i18n: file: projects/base_k3bbootimageview.ui:146
+#. i18n: ectx: property (title), widget (QGroupBox, m_groupOptions)
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:25
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: misc/k3bmediacopydialog.cpp:120 misc/k3bimagewritingdialog.cpp:303
+#: misc/k3bimagewritingdialog.cpp:319 misc/k3bmediaformattingdialog.cpp:71
+#: rip/k3baudioprojectconvertingdialog.cpp:145
+#: rip/k3baudiorippingdialog.cpp:163 rip/k3bvideocdrippingdialog.cpp:102
+#: projects/k3bvcdtrackdialog.cpp:434 projects/k3baudioburndialog.cpp:80
+#: projects/k3bdatapropertiesdialog.cpp:147 projects/k3bvcdburndialog.cpp:415
+#: projects/k3bvcdburndialog.cpp:447 projects/k3bprojectburndialog.cpp:268
+#: rc.cpp:586 rc.cpp:1164 option/k3boptiondialog.cpp:48
+msgid "Settings"
+msgstr "Gosodiadau"
 
-#: projects/k3bdataurladdingdialog.cpp:461
-msgid "Adding link to folder"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:167
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: misc/k3bmediacopydialog.cpp:141 rc.cpp:515
+msgid "&Options"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:462
-#, kde-format
-msgid ""
-"<p>'%1' is a symbolic link to folder '%2'.<p>If you intend to make K3b "
-"follow symbolic links you should consider letting K3b do this now since K3b "
-"will not be able to do so afterwards because symbolic links to folders "
-"inside a K3b project cannot be resolved.<p><b>If you do not intend to enable "
-"the option <em>follow symbolic links</em> you may safely ignore this warning "
-"and choose to add the link to the project.</b>"
-msgstr ""
+#: misc/k3bmediacopydialog.cpp:154 misc/k3bimagewritingdialog.cpp:330
+#: misc/k3bimagewritingdialog.cpp:912
+msgid "&Image"
+msgstr "&Delwedd"
 
-#: projects/k3bdataurladdingdialog.cpp:473
-msgid "Follow link now"
-msgstr ""
+#: misc/k3bmediacopydialog.cpp:163 rip/k3baudiorippingdialog.cpp:413
+#: rip/categories.cpp:23 k3bdiskinfoview.cpp:190
+msgid "Data"
+msgstr "Data"
 
-#: projects/k3bdataurladdingdialog.cpp:474
-msgid "Always follow links"
+#: misc/k3bmediacopydialog.cpp:168
+msgid "No error correction"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:475
-msgid "Add link to project"
+#: misc/k3bmediacopydialog.cpp:169 misc/k3bmediacopydialog.cpp:182
+#: rip/k3baudiorippingdialog.cpp:186 projects/k3baudioburndialog.cpp:95
+msgid "Read retries:"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:476
-msgid "Always add links"
-msgstr ""
+#: misc/k3bmediacopydialog.cpp:175 rip/k3baudiorippingdialog.cpp:358
+#: rip/k3baudiorippingdialog.cpp:413
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:313 k3bdiskinfoview.cpp:178
+#: projects/k3bvcdtrackdialog.cpp:614
+msgid "Audio"
+msgstr "Sain"
 
-#: projects/k3bdataurladdingdialog.cpp:754
-msgid "Enter New Filename"
+#: misc/k3bmediacopydialog.cpp:181
+msgid "Copy CD-Text"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:755
-msgid "A file with that name already exists. Please enter a new name:"
+#: misc/k3bmediacopydialog.cpp:185 rip/k3baudiorippingdialog.cpp:184
+#: projects/k3baudioburndialog.cpp:92
+msgid "Paranoia mode:"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:771
-msgid "Do you also want to add hidden files?"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:479
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: misc/k3bmediacopydialog.cpp:193 rc.cpp:179
+msgid "&Advanced"
+msgstr "&Uwch"
+
+#: misc/k3bmediacopydialog.cpp:214
+msgid "Skip unreadable data sectors"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:772
-msgid "Hidden Files"
+#: misc/k3bmediacopydialog.cpp:215
+msgid "Disable the source drive's error correction"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:772
-#: projects/k3bdataurladdingdialog.cpp:788
-msgid "Add"
+#: misc/k3bmediacopydialog.cpp:216
+msgid "Copy CD-Text from the source CD if available."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:772
-#: projects/k3bdataurladdingdialog.cpp:788
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
+#: misc/k3bmediacopydialog.cpp:218
+msgid ""
+"<p>If this option is checked K3b will disable the source drive's ECC/EDC "
+"error correction. This way sectors that are unreadable by intention can be "
+"read.<p>This may be useful for cloning CDs with copy protection based on "
+"corrupted sectors."
+msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:786
+#: misc/k3bmediacopydialog.cpp:223
 msgid ""
-"Do you also want to add system files (FIFOs, sockets, device files, and "
-"broken symlinks)?"
+"<p>If this option is checked K3b will search for CD-Text on the source CD. "
+"Disable it if your CD drive has problems with reading CD-Text or you want to "
+"stick to Cddb info."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:788
-msgid "System Files"
+#: misc/k3bmediacopydialog.cpp:226
+msgid ""
+"<p>If this option is checked and K3b is not able to read a data sector from "
+"the source medium it will be replaced with zeros on the resulting copy."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:803
-#: projects/k3baudiotrackaddingdialog.cpp:80
-msgid "Insufficient permissions to read the following files"
+#: misc/k3bmediacopydialog.cpp:231
+msgid ""
+"<p>This is the normal copy mode for DVD, Blu-ray, and most CD media types. "
+"It allows copying Audio CDs, multi and single session Data Media, and "
+"Enhanced Audio CDs (an Audio CD containing an additional data "
+"session).<p>For VideoCDs please use the CD Cloning mode."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:807
-#: projects/k3baudiotrackaddingdialog.cpp:84
-msgid "Unable to find the following files"
+#: misc/k3bmediacopydialog.cpp:236
+msgid ""
+"<p>In CD Cloning mode K3b performs a raw copy of the CD. That means it does "
+"not care about the content but simply copies the CD bit by bit. It may be "
+"used to copy VideoCDs or CDs which contain erroneous "
+"sectors.<p><b>Caution:</b> Only single session CDs can be cloned."
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:811
-#: projects/k3baudiotrackaddingdialog.cpp:88
-msgid "No non-local files supported"
+#: misc/k3bmediacopydialog.cpp:273 projects/k3bprojectburndialog.cpp:213
+msgid ""
+"There does not seem to be enough free space in the temporary folder. Write "
+"anyway?"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:815
+#: misc/k3bmediacopydialog.cpp:302 misc/k3bmediacopydialog.cpp:311
+#: projects/k3bmovixburndialog.cpp:216 projects/k3bdataburndialog.cpp:184
+#: projects/k3bvcdburndialog.cpp:552 projects/k3bvideodvdburndialog.cpp:169
+#: k3bdebuggingoutputdialog.cpp:81 k3b.cpp:1076
 #, kde-format
-msgid "To burn files bigger than %1 please use %2"
+msgid "Do you want to overwrite %1?"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:820
-msgid "Some filenames had to be modified due to limitations in mkisofs"
+#: misc/k3bmediacopydialog.cpp:303 misc/k3bmediacopydialog.cpp:312
+#: projects/k3bmovixburndialog.cpp:217 projects/k3bdataburndialog.cpp:185
+#: projects/k3bvcdburndialog.cpp:553 projects/k3bvideodvdburndialog.cpp:170
+#: k3bdebuggingoutputdialog.cpp:82 k3b.cpp:1077
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: misc/k3bmediacopydialog.cpp:555
+msgid "Use the same device for burning"
 msgstr ""
 
-#: projects/k3bdataurladdingdialog.cpp:824
-msgid ""
-"The following filenames have an invalid encoding. You may fix this with the "
-"convmv tool"
+#: misc/k3bmediacopydialog.cpp:556
+msgid "<qt>Use the same device for burning <i>(Or insert another medium)</i>"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:270
-#: projects/k3bdatapropertiesdialog.cpp:205
-#, kde-format
-msgid "Link to %1"
+#: misc/k3bimagewritingdialog.cpp:132
+msgid "Burn Image"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:296
-msgid " (broken)"
+#: misc/k3bimagewritingdialog.cpp:215
+msgid "Image to Burn"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:313
-msgctxt "Movix File Position"
-msgid "No."
+#: misc/k3bimagewritingdialog.cpp:220
+msgid "Choose Image File"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:315
-msgctxt "Movix File Title"
-msgid "Title"
+#: misc/k3bimagewritingdialog.cpp:221
+msgid "*.iso *.toc *.ISO *.TOC *.cue *.CUE|Image Files"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:317
-msgctxt "Movix File Type(ie. MPEG)"
-msgid "Type"
+#: misc/k3bimagewritingdialog.cpp:223
+msgid "*.iso *.ISO|ISO9660 Image Files"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:319
-msgctxt "Movix File Size"
-msgid "Size"
+#: misc/k3bimagewritingdialog.cpp:225
+msgid "*.cue *.CUE|Cue Files"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:321
-msgctxt "Movix File Path"
-msgid "Local Path"
+#: misc/k3bimagewritingdialog.cpp:227
+msgid "*.toc *.TOC|Cdrdao TOC Files and Cdrecord Clone Images"
 msgstr ""
 
-#: projects/k3bmovixprojectmodel.cpp:323
-msgctxt "Movix File Link"
-msgid "Link"
+#: misc/k3bimagewritingdialog.cpp:229 k3b.cpp:1374 k3bfileview.cpp:82
+msgid "*|All Files"
+msgstr "*|Pob Ffeil"
+
+#: misc/k3bimagewritingdialog.cpp:233
+msgid "Image Type"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:47
-msgid "File Properties"
+#: misc/k3bimagewritingdialog.cpp:238
+msgid "Auto Detection"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:88 projects/k3bvcdtrackdialog.cpp:573
-#: projects/k3bvcdtrackdialog.cpp:628 k3bdiskinfoview.cpp:297
-msgid "Type:"
-msgstr "Math:"
+#: misc/k3bimagewritingdialog.cpp:239
+msgid "Plain data image"
+msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:92
-msgid "Location:"
-msgstr "Lleoliad:"
-
-#: projects/k3bdatapropertiesdialog.cpp:94 projects/k3bvcdtrackdialog.cpp:376
-msgid "Size:"
-msgstr "Maint:"
-
-#: projects/k3bdatapropertiesdialog.cpp:96
-msgid "Used blocks:"
+#: misc/k3bimagewritingdialog.cpp:240 misc/k3bimagewritingdialog.cpp:763
+msgid "Cue/bin image"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:105
-msgid "Local name:"
+#: misc/k3bimagewritingdialog.cpp:241
+msgid "Audio cue file"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:108
-msgid "Local location:"
+#: misc/k3bimagewritingdialog.cpp:242
+msgid "Cdrdao TOC file"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:129
-msgid "Hide on Rockridge"
+#: misc/k3bimagewritingdialog.cpp:243 misc/k3bimagewritingdialog.cpp:735
+msgid "Cdrecord clone image"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:130
-msgid "Hide on Joliet"
+#: misc/k3bimagewritingdialog.cpp:262
+msgid "No image file selected"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:142
-msgid "Sort weight:"
+#: misc/k3bimagewritingdialog.cpp:343
+msgid "Data mode:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:146
-#. i18n: ectx: property (title), widget (QGroupBox, m_groupOptions)
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:25
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: projects/k3bdatapropertiesdialog.cpp:147 projects/k3bvcdtrackdialog.cpp:434
-#: projects/k3baudioburndialog.cpp:80 projects/k3bvcdburndialog.cpp:415
-#: projects/k3bvcdburndialog.cpp:447 projects/k3bprojectburndialog.cpp:268
-#: option/k3boptiondialog.cpp:48 rip/k3baudiorippingdialog.cpp:163
-#: rip/k3bvideocdrippingdialog.cpp:102
-#: rip/k3baudioprojectconvertingdialog.cpp:145
-#: misc/k3bimagewritingdialog.cpp:303 misc/k3bimagewritingdialog.cpp:319
-#: misc/k3bmediacopydialog.cpp:120 misc/k3bmediaformattingdialog.cpp:71
-#: rc.cpp:384 rc.cpp:981
-msgid "Settings"
-msgstr "Gosodiadau"
-
 #. i18n: file: option/base_k3bcddboptiontab.ui:413
 #. i18n: ectx: attribute (title), widget (QWidget)
 #. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:267
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: projects/k3bdatapropertiesdialog.cpp:148
-#: projects/k3baudioburndialog.cpp:108 projects/k3bvcdburndialog.cpp:386
-#: option/k3boptiondialog.cpp:202 rip/k3baudiorippingdialog.cpp:177
 #: misc/k3bimagewritingdialog.cpp:349 misc/k3bimagewritingdialog.cpp:890
-#: rc.cpp:658 rc.cpp:1008
+#: rip/k3baudiorippingdialog.cpp:177 projects/k3baudioburndialog.cpp:108
+#: projects/k3bdatapropertiesdialog.cpp:148 projects/k3bvcdburndialog.cpp:386
+#: rc.cpp:939 rc.cpp:1191 option/k3boptiondialog.cpp:202
 msgid "Advanced"
 msgstr "Uwch"
 
-#: projects/k3bdatapropertiesdialog.cpp:161
-msgid "Hide this file in the RockRidge filesystem"
+#: misc/k3bimagewritingdialog.cpp:369
+msgid ""
+"<p><b>Image types supported by K3b:</p><p><b>Plain image</b><br/>Plain "
+"images are written as is to the medium using a single data track. Typical "
+"plain images are iso images as created by K3b's data project.<p><b>Cue/bin "
+"images</b><br/>Cue/bin images consist of a cue file describing the table of "
+"contents of the medium and an image file which contains the actual data. The "
+"data will be written to the medium according to the cue file.<p><b>Audio Cue "
+"image</b><br/>Audio cue images are a special kind of cue/bin image "
+"containing an image of an audio CD. The actual audio data can be encoded "
+"using any audio format supported by K3b. Audio cue files can also be "
+"imported into K3b audio projects which allows to change the order and add or "
+"remove tracks.<p><b>Cdrecord clone images</b><br/>K3b creates a cdrecord "
+"clone image of a single-session CD when copying a CD in clone mode. These "
+"images can be reused here.<p><b>Cdrdao TOC files</b><br/>K3b supports "
+"writing cdrdao's own image format, the toc files."
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:162
-msgid "Hide this file in the Joliet filesystem"
+#: misc/k3bimagewritingdialog.cpp:469
+msgid ""
+"<p>The actual file size does not match the size declared in the file header. "
+"If it has been downloaded make sure the download is complete.</p><p>Only "
+"continue if you know what you are doing.</p>"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:163
-msgid "Modify the physical sorting"
+#: misc/k3bimagewritingdialog.cpp:472 option/k3bmiscoptiontab.cpp:130
+msgid "Warning"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:164
-msgid ""
-"<p>If this option is checked, the file or folder (and its entire contents) "
-"will be hidden on the ISO9660 and RockRidge filesystem.</p><p>This is "
-"useful, for example, for having different README files for RockRidge and "
-"Joliet, which can be managed by hiding README.joliet on RockRidge and "
-"README.rr on the Joliet filesystem.</p>"
+#: misc/k3bimagewritingdialog.cpp:628
+msgid "Seems not to be a usable image"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:171
-msgid ""
-"<p>If this option is checked, the file or folder (and its entire contents) "
-"will be hidden on the Joliet filesystem.</p><p>This is useful, for example, "
-"for having different README files for RockRidge and Joliet, which can be "
-"managed by hiding README.joliet on RockRidge and README.rr on the Joliet "
-"filesystem.</p>"
+#: misc/k3bimagewritingdialog.cpp:643
+msgid "File not found"
+msgstr "Ni chanfuwyd y ffeil"
+
+#: misc/k3bimagewritingdialog.cpp:655 misc/k3bimagewritingdialog.cpp:734
+#: misc/k3bimagewritingdialog.cpp:762 misc/k3bimagewritingdialog.cpp:790
+msgid "Detected:"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:178
-msgid ""
-"<p>This value modifies the physical sort order of the files in the ISO9660 "
-"filesystem. A higher weighting means that the file will be located closer to "
-"the beginning of the image (and the disk).<p>This option is useful in order "
-"to optimize the data layout on a medium.<p><b>Caution:</b> This does not "
-"sort the order of the file names that appear in the ISO9660 folder. It sorts "
-"the order in which the file data is written to the image."
+#: misc/k3bimagewritingdialog.cpp:656
+msgid "Iso9660 image"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:216
-msgid "Folder"
+#: misc/k3bimagewritingdialog.cpp:664 misc/k3bimagewritingdialog.cpp:740
+#: misc/k3bimagewritingdialog.cpp:768
+msgid "Filesize:"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:223
+#: misc/k3bimagewritingdialog.cpp:666
 #, kde-format
-msgid "in 1 file"
-msgid_plural "in %1 files"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1 (different than declared volume size)"
+msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:224
-#, kde-format
-msgid "and 1 folder"
-msgid_plural "and %1 folders"
-msgstr[0] ""
-msgstr[1] ""
+#: misc/k3bimagewritingdialog.cpp:675 k3bdiskinfoview.cpp:376
+msgid "Volume Size:"
+msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:228
-msgid "Special file"
+#: misc/k3bimagewritingdialog.cpp:682 k3bdiskinfoview.cpp:370
+msgid "System Id:"
 msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:290
-#, kde-format
-msgid "1 Item"
-msgid_plural "%1 Items"
-msgstr[0] ""
-msgstr[1] ""
+#: misc/k3bimagewritingdialog.cpp:690 k3bdiskinfoview.cpp:371
+msgid "Volume Id:"
+msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:293
-#, kde-format
-msgid "1 File"
-msgid_plural "%1 Files"
-msgstr[0] ""
-msgstr[1] ""
+#: misc/k3bimagewritingdialog.cpp:698 k3bdiskinfoview.cpp:372
+msgid "Volume Set Id:"
+msgstr ""
 
-#: projects/k3bdatapropertiesdialog.cpp:298
-#, kde-format
-msgid "1 Folder"
-msgid_plural "%1 Folders"
-msgstr[0] ""
-msgstr[1] ""
+#: misc/k3bimagewritingdialog.cpp:706 k3bdiskinfoview.cpp:373
+msgid "Publisher Id:"
+msgstr ""
 
-#: projects/k3bbootimagedialog.cpp:27
-msgid "Boot Images"
+#: misc/k3bimagewritingdialog.cpp:714 k3bdiskinfoview.cpp:374
+msgid "Preparer Id:"
 msgstr ""
 
-#: projects/k3baudiotrackdialog.cpp:45
-msgid "Audio Track Properties"
+#: misc/k3bimagewritingdialog.cpp:721 k3bdiskinfoview.cpp:375
+msgid "Application Id:"
 msgstr ""
 
-#: projects/k3bmixedprojectmodel.cpp:30
-msgid "Data Section"
+#: misc/k3bimagewritingdialog.cpp:745 misc/k3bimagewritingdialog.cpp:773
+msgid "Image file:"
 msgstr ""
 
-#: projects/k3bmixedprojectmodel.cpp:31
-msgid "Audio Section"
+#: misc/k3bimagewritingdialog.cpp:751
+msgid "TOC file:"
 msgstr ""
 
-#: projects/k3bdataprojectmodel.cpp:282
-msgid "outside of project"
+#: misc/k3bimagewritingdialog.cpp:779
+msgid "Cue file:"
 msgstr ""
 
-#: projects/k3bdataprojectmodel.cpp:302
-msgctxt "file name"
-msgid "Name"
+#: misc/k3bimagewritingdialog.cpp:791
+msgid "Audio Cue Image"
 msgstr ""
 
-#: projects/k3bdataprojectmodel.cpp:304
-msgctxt "file type"
-msgid "Type"
+#: misc/k3bimagewritingdialog.cpp:796
+#, kde-format
+msgid "%1 track"
+msgid_plural "%1 tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: misc/k3bimagewritingdialog.cpp:810
+msgid "Track"
 msgstr ""
 
-#: projects/k3bdataprojectmodel.cpp:306
-msgctxt "file size"
-msgid "Size"
+#: misc/k3bimagewritingdialog.cpp:949
+msgid "Md5 Sum:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:85
-#. i18n: ectx: property (text), widget (K3ListView, m_viewImages)
-#: projects/k3bdataprojectmodel.cpp:308 rc.cpp:360
-msgid "Local Path"
+#: misc/k3bimagewritingdialog.cpp:980
+msgid "Calculation canceled"
 msgstr ""
 
-#: projects/k3bdataprojectmodel.cpp:310
-msgctxt "symbolic link target"
-msgid "Link"
+#: misc/k3bimagewritingdialog.cpp:982
+msgid "Calculation failed"
 msgstr ""
 
-#: projects/k3baudiotrackaddingdialog.cpp:58
-msgid "Please be patient..."
+#: misc/k3bimagewritingdialog.cpp:997
+msgid "Copy checksum to clipboard"
 msgstr ""
 
-#: projects/k3baudiotrackaddingdialog.cpp:62
-#, kde-format
-msgid "Adding files to project \"%1\"..."
+#: misc/k3bimagewritingdialog.cpp:998
+msgid "Compare checksum..."
 msgstr ""
 
-#: projects/k3baudiotrackaddingdialog.cpp:92
-msgid "Unable to handle the following files due to an unsupported format"
+#: misc/k3bimagewritingdialog.cpp:1004
+msgid "MD5 Sum Check"
 msgstr ""
 
-#: projects/k3baudiotrackaddingdialog.cpp:93
-msgid ""
-"You may manually convert these audio files to wave using another application "
-"supporting the audio format and then add the wave files to the K3b project."
+#: misc/k3bimagewritingdialog.cpp:1005
+msgid "Please insert the MD5 Sum to compare:"
 msgstr ""
 
-#: projects/k3baudiotrackaddingdialog.cpp:153
+#: misc/k3bimagewritingdialog.cpp:1011
 #, kde-format
-msgid "Analysing file '%1'..."
+msgid "The MD5 Sum of %1 equals that specified."
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:68
-msgid "Mixed Project"
+#: misc/k3bimagewritingdialog.cpp:1012
+msgid "MD5 Sums Equal"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:68 projects/k3baudioburndialog.cpp:65
+#: misc/k3bimagewritingdialog.cpp:1014
 #, kde-format
-msgid "1 track (%2 minutes)"
-msgid_plural "%1 tracks (%2 minutes)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "The MD5 Sum of %1 differs from that specified."
+msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:76 projects/k3baudioburndialog.cpp:73
-#: projects/k3baudiocdtextwidget.cpp:40 k3bdiskinfoview.cpp:227
-msgid "CD-Text"
+#: misc/k3bimagewritingdialog.cpp:1015
+msgid "MD5 Sums Differ"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:104
-msgid "Mixed Mode Type"
+#: misc/k3bmediaformattingdialog.cpp:47
+msgid "Format and Erase"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:108
-msgid "Data in second session (CD-Extra)"
+#: misc/k3bmediaformattingdialog.cpp:48
+msgid "CD-RW"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:109
-msgid ""
-"<em>Blue book CD</em><br>K3b will create a multisession CD with 2 sessions. "
-"The first session will contain all audio tracks and the second session will "
-"contain a mode 2 form 1 data track.<br>This mode is based on the <em>Blue "
-"book</em> standard (also known as <em>Extended Audio CD</em>, <em>CD-"
-"Extra</em>, or <em>CD Plus</em>) and has the advantage that a hifi audio CD "
-"player will only recognize the first session and ignore the second session "
-"with the data track.<br>If the CD is intended to be used in a hifi audio CD "
-"player this is the recommended mode.<br>Some older CD-ROMs may have problems "
-"reading a blue book CD since it is a multisession CD."
+#: misc/k3bmediaformattingdialog.cpp:48
+msgid "DVD±RW"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:125
-msgid "Data in first track"
+#: misc/k3bmediaformattingdialog.cpp:48
+msgid "BD-RE"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:126
-msgid "K3b will write the data track before all audio tracks."
-msgstr ""
+#: misc/k3bmediaformattingdialog.cpp:72
+msgid "Force"
+msgstr "Gorfodi"
 
-#: projects/k3bmixedburndialog.cpp:129
-msgid "Data in last track"
+#: misc/k3bmediaformattingdialog.cpp:73
+msgid "Quick format"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:130
-msgid "K3b will write the data track after all audio tracks."
+#: misc/k3bmediaformattingdialog.cpp:87
+msgid "Force formatting of empty DVDs"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:133
+#: misc/k3bmediaformattingdialog.cpp:88
 msgid ""
-"<b>Caution:</b> The last two modes should only be used for CDs that are "
-"unlikely to be played on a hifi audio CD player.<br>It could lead to "
-"problems with some older hifi audio CD players that try to play the data "
-"track."
+"<p>If this option is checked K3b will format a DVD-RW even if it is empty. "
+"It may also be used to force K3b to format a DVD+RW, BD-RE or a DVD-RW in "
+"restricted overwrite mode.<p><b>Caution:</b> It is not recommended to format "
+"a DVD often as it may become unusable after only 10-20 reformat "
+"procedures.<p>DVD+RW and BD-RE media only needs to be formatted once. After "
+"that it just needs to be overwritten. The same applies to DVD-RW in "
+"restricted overwrite mode."
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:293
-msgid ""
-"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
-"uses <em>normalize-audio</em> (http://normalize.nongnu.org/) to normalize "
-"audio tracks. In order to use this functionality, please install it first "
-"(sudo apt-get install normalize-audio)."
+#: misc/k3bmediaformattingdialog.cpp:98
+msgid "Try to perform quick formatting"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:300 projects/k3bmixedburndialog.cpp:319
-#: projects/k3baudioburndialog.cpp:294 projects/k3baudioburndialog.cpp:313
+#: misc/k3bmediaformattingdialog.cpp:99
 msgid ""
-"<p>K3b is not able to normalize audio tracks when burning on-the-fly. The "
-"external program used for this task only supports normalizing a set of audio "
-"files."
+"<p>If this option is checked K3b will tell the writer to perform a quick "
+"format.<p>Erasing a rewritable medium completely can take a very long time "
+"and some writers perform a full format even if quick format is enabled."
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:304 projects/k3bmixedburndialog.cpp:323
-#: projects/k3baudioburndialog.cpp:298 projects/k3baudioburndialog.cpp:317
-msgid "Disable normalization"
+#: k3bjobprogressdialog.cpp:109
+msgid "Show Debugging Output"
 msgstr ""
 
-#: projects/k3bmixedburndialog.cpp:305 projects/k3bmixedburndialog.cpp:324
-#: projects/k3baudioburndialog.cpp:299 projects/k3baudioburndialog.cpp:318
-msgid "Disable on-the-fly burning"
+#: k3bjobprogressdialog.cpp:208
+msgid "Overall progress:"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:55
-msgid "Video Track Properties"
+#: k3bjobprogressdialog.cpp:283 k3bjobprogressdialog.cpp:294
+#: k3bjobprogressdialog.cpp:305 k3bjobprogressdialog.cpp:316
+#, kde-format
+msgctxt "%1 and %2 are byte sizes formatted via KLocale::formatByteSize"
+msgid "%1 of %2"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:78 projects/k3bvcdtrackdialog.cpp:389
-#, kde-format
-msgid "%1 bit/s"
+#: k3bjobprogressdialog.cpp:363 k3bjobprogressdialog.cpp:374
+msgid "Success."
+msgstr "Llwyddiant."
+
+#: k3bjobprogressdialog.cpp:376
+msgid "Successfully finished."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:209
-msgid "May also look like | << on the remote control. "
+#: k3bjobprogressdialog.cpp:385 k3bjobprogressdialog.cpp:387
+msgid "Canceled."
+msgstr "Wedi'i ddiddymu"
+
+#: k3bjobprogressdialog.cpp:390 k3bjobprogressdialog.cpp:392
+msgid "Error."
+msgstr "Gwall."
+
+#: k3bjobprogressdialog.cpp:394
+msgid "Finished with errors"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:210
-msgid "May also look like >> | on the remote control."
+#: k3bjobprogressdialog.cpp:488
+msgid "Do you really want to cancel?"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:211
-msgid "This key may be mapped to the STOP key."
+#: k3bjobprogressdialog.cpp:488
+msgid "Cancel Confirmation"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:212
-msgid "This key is usually mapped to the > or PLAY key."
+#: k3bjobprogressdialog.cpp:541
+#, kde-format
+msgctxt ""
+"@info %1 is a duration formatted using KLocale::prettyFormatDuration"
+msgid "Elapsed time: %1"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:213
-msgid "Target to be jumped to on time-out of <wait>."
+#: k3bjobprogressdialog.cpp:548
+#, kde-format
+msgctxt ""
+"@info %1 is a duration formatted using KLocale::prettyFormatDuration"
+msgid "Remaining: %1"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:214
-msgid "Delay reactivity of keys."
+#: k3bdevicemenu.cpp:76 k3b.cpp:331
+msgid "Continue Multisession Project"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:215 projects/k3bvcdburndialog.cpp:117
-msgid ""
-"Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 "
-"disc formats."
+#: k3bdevicemenu.cpp:77 k3b.cpp:385
+msgid "Copy &Medium..."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:216
-msgid "Activate the use of numeric keys."
+#: k3bdevicemenu.cpp:78 k3b.cpp:366
+msgid "&Format/Erase rewritable disk..."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:217
-msgid "Overwrite default numeric keys."
+#: k3bdevicemenu.cpp:79 k3b.cpp:395
+msgid "Rip Audio CD..."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:218
-msgid "Numeric keys."
+#: k3bdevicemenu.cpp:80 k3b.cpp:403
+msgid "Rip Video DVD..."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:219
-msgid "Times to repeat the playback of 'play track'."
+#: k3bdevicemenu.cpp:81 k3b.cpp:411
+msgid "Rip Video CD..."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:220
-msgid "Time in seconds to wait after playback of 'play track'."
+#: k3bdevicemenu.cpp:83 k3b.cpp:453
+msgid "Open the media copy dialog"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:222
-msgid ""
-"<p>Target to be jumped to on time-out of <wait>.<p>If omitted (and <wait> is "
-"not set to an infinite time) one of the targets is selected at random."
+#: k3bdevicemenu.cpp:85 k3b.cpp:449
+msgid "Open the rewritable disk formatting/erasing dialog"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:224
-msgid ""
-"<p>When reactivity is set to delayed, it is recommended that the length of "
-"the referenced 'play track' is not more than 5 seconds.<p>The recommended "
-"setting for a play item consisting of one still picture and no audio is to "
-"loop once and have a delayed reactivity."
+#: k3bwriterselectionwidget.cpp:91
+msgid "Medium will be overwritten."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:226 projects/k3bvcdburndialog.cpp:206
-msgid ""
-"<p>Playback control, PBC, is available for Video CD 2.0 and Super Video CD "
-"1.0 disc formats.<p>PBC allows control of the playback of play items and the "
-"possibility of interaction with the user through the remote control or some "
-"other input device available."
+#: k3bwriterselectionwidget.cpp:125
+msgid "Burn Medium"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:228
-msgid ""
-"These are actually pseudo keys, representing the numeric keys 0, 1, ..., 9."
+#: k3bwriterselectionwidget.cpp:131
+msgid "Speed:"
+msgstr "Cyflymder:"
+
+#: k3bwriterselectionwidget.cpp:137
+msgid "Writing app:"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:229
-msgid "<p>If numeric keys enabled, you can overwrite the default settings."
+#: k3bwriterselectionwidget.cpp:169
+msgid "The medium that will be used for burning"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:230
-msgid ""
-"<p>Times to repeat the playback of 'play track'.<p>The reactivity attribute "
-"controls whether the playback of 'play track' is finished, thus delayed, "
-"before executing user triggered action or an immediate jump is "
-"performed.<p>After the specified number of repetitions have completed, the "
-"<wait> time begins to count down, unless set to an infinite wait time.<p>If "
-"this element is omitted, a default of `1' is used, i.e. the 'play track' "
-"will be displayed once."
+#: k3bwriterselectionwidget.cpp:170
+msgid "The speed at which to burn the medium"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:234
-msgid ""
-"Time in seconds to wait after playback of 'play track' before triggering the "
-"<timeout> action (unless the user triggers some action before time ran up)."
+#: k3bwriterselectionwidget.cpp:171
+msgid "The external application to actually burn the medium"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:288
-msgid "Event Disabled"
+#: k3bwriterselectionwidget.cpp:173
+msgid ""
+"<p>Select the medium that you want to use for burning.<p>In most cases there "
+"will only be one medium available which does not leave much choice."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:297 projects/k3bvcdtrackdialog.cpp:706
-msgid "VideoCD END"
+#: k3bwriterselectionwidget.cpp:176
+msgid ""
+"<p>Select the speed with which you want to burn.<p><b>Auto</b><br>This will "
+"choose the maximum writing speed possible with the used medium. This is the "
+"recommended selection for most media.</p><p><b>Ignore</b> (DVD only)<br>This "
+"will leave the speed selection to the writer device. Use this if K3b is "
+"unable to set the writing speed.<p>1x refers to 175 KB/s for CD, 1385 KB/s "
+"for DVD, and 4496 KB/s for Blu-ray.</p><p><b>Caution:</b> Make sure your "
+"system is able to send the data fast enough to prevent buffer underruns."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:365
-msgid "File Info"
+#: k3bwriterselectionwidget.cpp:187
+msgid ""
+"<p>K3b uses the command line tools cdrecord, growisofs, and cdrdao to "
+"actually write a CD or DVD.<p>Normally K3b chooses the best suited "
+"application for every task automatically but in some cases it may be "
+"possible that one of the applications does not work as intended with a "
+"certain writer. In this case one may select the application manually."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:373 projects/k3baudioprojectmodel.cpp:327
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:86
-#: rip/k3baudiorippingdialog.cpp:142 k3baudioplayer.cpp:119
-msgid "Filename"
-msgstr "Enw Ffeil"
+#: k3bwriterselectionwidget.cpp:270 k3bwriterselectionwidget.cpp:523
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:363
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:364
+#: projects/k3bdatamultisessioncombobox.cpp:73 k3bwritingmodewidget.cpp:157
+#: k3bdatamodewidget.cpp:33
+msgid "Auto"
+msgstr "Ymysgogol"
 
-#: projects/k3bvcdtrackdialog.cpp:377
-msgid "Length:"
-msgstr "Hyd:"
+#: k3bwriterselectionwidget.cpp:272 projects/k3bdataurladdingdialog.cpp:412
+#: projects/k3bdataurladdingdialog.cpp:639
+msgid "Ignore"
+msgstr "Anwybyddu"
 
-#: projects/k3bvcdtrackdialog.cpp:378
-msgid "Muxrate:"
+#: k3bwriterselectionwidget.cpp:316
+msgid "More..."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:436
-msgid "Enable playback control (for the whole CD)"
+#: k3bwriterselectionwidget.cpp:604
+msgid ""
+"Please enter the speed that K3b should use for burning (Example: 16x)."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:437
-msgid "Use numeric keys"
+#: k3bwriterselectionwidget.cpp:607
+msgid ""
+"<p>K3b is not able to perfectly determine the maximum writing speed of an "
+"optical writer. Writing speed is always reported subject to the inserted "
+"medium.<p>Please enter the writing speed here and K3b will remember it for "
+"future sessions (Example: 16x)."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:439
-msgid "Reactivity delayed to the end of playing track"
+#: k3bwriterselectionwidget.cpp:627
+msgid "Set writing speed manually"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:448 projects/k3bvcdtrackdialog.cpp:547
-msgid "Playing"
-msgstr "Yn chwarae"
-
-#: projects/k3bvcdtrackdialog.cpp:453
-msgid "Playing track"
+#: k3bmediaselectiondialog.cpp:34
+msgid "Medium Selection"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:134
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinLoop)
-#: projects/k3bvcdtrackdialog.cpp:457 rc.cpp:63
-msgid " time(s)"
+#: k3bmediaselectiondialog.cpp:40
+msgid "Please select a medium:"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:458
-msgid "forever"
-msgstr "am Byth"
+#: k3bwelcomewidget.cpp:86
+msgid "More actions..."
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:461
-msgid "then wait"
+#: k3bwelcomewidget.cpp:263
+msgid "Welcome to K3b - The CD and DVD Kreator"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:466
-msgid " seconds"
-msgstr " eiliadau"
+#: k3bwelcomewidget.cpp:397
+msgid "Add Button"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:467
-msgid "infinite"
+#: k3bwelcomewidget.cpp:420
+msgid "Remove Button"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:469
-msgid "after timeout playing"
+#: k3bdiroperator.cpp:48
+msgid "K3b Bookmarks"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:482
-msgid "Key Pressed Interaction"
+#: k3bdiroperator.cpp:51
+msgid "Bookmarks"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:487
-msgid "Previous:"
-msgstr "Cynt :"
+#: rip/k3baudioprojectconvertingdialog.cpp:105
+msgid "Audio Project Conversion"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:488
-msgid "Next:"
-msgstr "Nesaf :"
+#: rip/k3baudioprojectconvertingdialog.cpp:106
+#: rip/k3baudiorippingdialog.cpp:124 rip/k3bvideocdview.cpp:368
+#: rip/k3baudiocdview.cpp:218
+#, kde-format
+msgid "1 track (%2)"
+msgid_plural "%1 tracks (%2)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bvcdtrackdialog.cpp:489
-msgid "Return:"
+#: rip/k3baudioprojectconvertingdialog.cpp:126
+msgid "Filename (relative to base folder)"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:490
-msgid "Default:"
-msgstr "Rhagosodedig :"
+#: rip/k3baudioprojectconvertingdialog.cpp:128
+#: rip/k3baudiorippingdialog.cpp:144
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:85
+msgid "File Size"
+msgstr "Maint Ffeil"
 
-#: projects/k3bvcdtrackdialog.cpp:516
-msgid "Playback Control"
+#: rip/k3baudioprojectconvertingdialog.cpp:151
+#: rip/k3baudiorippingdialog.cpp:169
+msgid "File Naming"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:537 projects/k3bvcdtrackdialog.cpp:558
-msgid "Numeric Keys"
+#: rip/k3baudioprojectconvertingdialog.cpp:184
+#: rip/k3baudiorippingdialog.cpp:247
+msgid "Please check the naming pattern. All filenames need to be unique."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:546
-msgid "Key"
-msgstr "Allwedd"
+#: rip/k3baudioprojectconvertingdialog.cpp:201
+#: rip/k3baudiorippingdialog.cpp:264
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:568
+msgid "Do you want to overwrite these files?"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:553
-msgid "Overwrite default assignment"
+#: rip/k3baudioprojectconvertingdialog.cpp:203
+#: rip/k3baudiorippingdialog.cpp:266 rip/k3bvideocdrippingdialog.cpp:175
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:570
+msgid "Files Exist"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:574 projects/k3bvcdtrackdialog.cpp:629
-msgid "Rate:"
-msgstr "Cyfradd :"
+#: rip/k3baudioprojectconvertingdialog.cpp:282
+#: rip/k3baudioprojectconvertingdialog.cpp:321
+#: rip/k3baudiorippingdialog.cpp:357 rip/k3baudiorippingdialog.cpp:412
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:285 rip/k3bpatternparser.cpp:124
+#: rip/k3bpatternparser.cpp:160 rip/k3bpatternparser.cpp:168
+#: rip/k3baudioconvertingoptionwidget.cpp:222
+#: rip/k3baudioconvertingoptionwidget.cpp:256 k3bdiskinfoview.cpp:299
+msgid "unknown"
+msgstr "anhysbys"
 
-#: projects/k3bvcdtrackdialog.cpp:575
-msgid "Sampling frequency:"
+#: rip/k3baudiorippingdialog.cpp:123
+msgid "CD Ripping"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:576
-msgid "Mode:"
-msgstr "Modd:"
+#. i18n: file: option/base_k3bcddboptiontab.ui:254
+#. i18n: ectx: property (text), widget (K3ListView)
+#: rip/k3baudiorippingdialog.cpp:145 k3bdiskinfoview.cpp:250
+#: projects/k3bvcdburndialog.cpp:394 rc.cpp:912
+msgid "Type"
+msgstr "Math"
 
-#: projects/k3bvcdtrackdialog.cpp:577
-msgid "Copyright:"
-msgstr "Hawlfraint :"
+#: rip/k3baudiorippingdialog.cpp:181 projects/k3baudioburndialog.cpp:98
+msgid "Ignore read errors"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:614
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:313
-#: rip/k3baudiorippingdialog.cpp:358 rip/k3baudiorippingdialog.cpp:413
-#: k3bdiskinfoview.cpp:178 misc/k3bmediacopydialog.cpp:175
-msgid "Audio"
-msgstr "Sain"
+#: rip/k3baudiorippingdialog.cpp:182
+msgid "Do not read pregaps"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:630
-msgid "Chroma format:"
+#: rip/k3baudiorippingdialog.cpp:200 rip/k3bvideocdview.cpp:388
+#: rip/k3baudiocdview.cpp:261 rip/k3bvideocdrippingdialog.cpp:118
+#: rip/videodvd/k3bvideodvdrippingview.cpp:305
+msgid "Start Ripping"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:631
-msgid "Video format:"
+#: rip/k3baudiorippingdialog.cpp:200
+msgid "Starts copying the selected tracks"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:632
-msgid "Resolution:"
-msgstr "Cydraniad:"
+#: rip/k3baudiorippingdialog.cpp:209
+msgid "Maximal number of read retries"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:633
-msgid "High resolution:"
+#: rip/k3baudiorippingdialog.cpp:210
+msgid ""
+"<p>This specifies the maximum number of retries to read a sector of audio "
+"data from the cd. After that K3b will either skip the sector if the "
+"<em>Ignore Read Errors</em> option is enabled or stop the process."
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:676
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:311
-msgid "Video"
-msgstr "Fideo"
+#: rip/k3baudiorippingdialog.cpp:214
+msgid "Do not read the pregaps at the end of every track"
+msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:718
-msgid "ItSelf"
+#: rip/k3baudiorippingdialog.cpp:215
+msgid ""
+"<p>If this option is checked K3b will not rip the audio data in the pregaps. "
+"Most audio tracks contain an empty pregap which does not belong to the track "
+"itself.</p><p>Although the default behavior of nearly all ripping software "
+"is to include the pregaps for most CDs, it makes more sense to ignore them. "
+"In any case, when creating a K3b audio project, the pregaps will be "
+"regenerated.</p>"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:721
-#, kde-format
-msgid "Segment-%1 - %2"
+#: rip/k3baudiorippingdialog.cpp:266
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: rip/k3baudiorippingdialog.cpp:368
+msgid "Cue-file"
 msgstr ""
 
-#: projects/k3bvcdtrackdialog.cpp:723
+#: rip/k3baudiorippingdialog.cpp:406
 #, kde-format
-msgid "Sequence-%1 - %2"
+msgid "Track%1"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:181 projects/k3bdataviewimpl.cpp:48
-#: projects/k3bvcdview.cpp:51 projects/k3bmovixview.cpp:53
-#: projects/k3baudioviewimpl.cpp:63
-msgid "Properties"
-msgstr ""
+#: rip/k3baudiorippingdialog.cpp:427 rip/k3bcddbpatternwidget.cpp:59
+msgid "Playlist"
+msgstr "Rhestr chwarae:"
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:81
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
-#: projects/k3baudiotrackview.cpp:187 projects/k3bdataviewimpl.cpp:42
-#: projects/k3bvcdview.cpp:55 projects/k3bmovixview.cpp:56
-#: projects/k3baudioviewimpl.cpp:65 k3baudioplayer.cpp:229 rc.cpp:1175
-msgid "Remove"
+#: rip/k3bvideocdview.cpp:199
+msgid "Item Name"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:193 projects/k3baudioviewimpl.cpp:48
-msgid "Add Silence..."
+#: rip/k3bvideocdview.cpp:200
+msgid "Extracted Name"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:198 projects/k3baudioviewimpl.cpp:50
-msgid "Merge Tracks"
-msgstr ""
+#. i18n: file: projects/base_k3bbootimageview.ui:74
+#. i18n: ectx: property (text), widget (K3ListView, m_viewImages)
+#: rip/k3bvideocdview.cpp:202 rc.cpp:559
+msgid "Size"
+msgstr "Maint"
 
-#: projects/k3baudiotrackview.cpp:203 projects/k3baudioviewimpl.cpp:52
-msgid "Source to Track"
+#: rip/k3bvideocdview.cpp:267 rip/k3bvideocdview.cpp:444
+msgid "Video CD MPEG tracks"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:208 projects/k3baudioviewimpl.cpp:54
-msgid "Split Track..."
+#: rip/k3bvideocdview.cpp:268
+msgid "Video CD DATA track"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:213 projects/k3baudioviewimpl.cpp:56
-msgid "Edit Source..."
+#: rip/k3bvideocdview.cpp:286
+#, kde-format
+msgid "Sequence-%1"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:222 projects/k3baudioviewimpl.cpp:60
-msgid "Musicbrainz Lookup"
+#: rip/k3bvideocdview.cpp:291 rip/k3bvideocdview.cpp:337
+#: rip/k3bvideocdview.cpp:448
+msgid "Files"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:226 projects/k3baudioviewimpl.cpp:62
-msgid "Try to determine meta information over the Internet"
-msgstr ""
+#: rip/k3bvideocdview.cpp:292 rip/k3bvideocdview.cpp:452
+msgid "Segments"
+msgstr "Cylchrannau"
 
-#: projects/k3baudiotrackview.cpp:505 projects/k3baudioviewimpl.cpp:152
-msgid "Add Silence"
+#: rip/k3bvideocdview.cpp:366 rip/k3bvideocdrippingoptions.h:29
+#: projects/k3bvcdburndialog.cpp:72
+msgid "Video CD"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:509 projects/k3baudioviewimpl.cpp:156
-msgid "Length of silence:"
+#: rip/k3bvideocdview.cpp:376 rip/k3baudiocdview.cpp:249
+#: rip/videodvd/k3bvideodvdrippingview.cpp:285
+msgid "Check All"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:598 projects/k3baudioviewimpl.cpp:243
-msgid "Edit Audio Track Source"
+#: rip/k3bvideocdview.cpp:379 rip/k3baudiocdview.cpp:251
+#: rip/videodvd/k3bvideodvdrippingview.cpp:290
+msgid "Uncheck All"
 msgstr ""
 
-#: projects/k3baudiotrackview.cpp:739 projects/k3baudioviewimpl.cpp:281
-msgid "Please select an audio track."
+#: rip/k3bvideocdview.cpp:382 rip/k3baudiocdview.cpp:253
+#: rip/videodvd/k3bvideodvdrippingview.cpp:295
+msgid "Check Track"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:40
-msgid "New Folder..."
+#: rip/k3bvideocdview.cpp:385 rip/k3baudiocdview.cpp:255
+#: rip/videodvd/k3bvideodvdrippingview.cpp:300
+msgid "Uncheck Track"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:46
-msgid "Parent Folder"
+#: rip/k3bvideocdview.cpp:391
+msgid "View Files"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:50
-msgid "Open"
+#: rip/k3bvideocdview.cpp:393
+msgid "View plain data files"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:52
-msgid "&Import Session..."
+#: rip/k3bvideocdview.cpp:460 rip/k3baudiocdview.cpp:306
+msgid "Please select the tracks to rip."
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:54
-msgid "&Clear Imported Session"
+#: rip/k3bvideocdview.cpp:460 rip/k3baudiocdview.cpp:307
+msgid "No Tracks Selected"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:56
-msgid "&Edit Boot Images..."
+#: rip/k3bvideocdrip.cpp:62
+msgid "Job canceled by user."
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:59
-msgid "Import a previously burned session into the current project"
+#: rip/k3bvideocdrip.cpp:91
+msgid "Check files"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:60
-msgid "Remove the imported items from a previous session"
+#: rip/k3bvideocdrip.cpp:101
+#, kde-format
+msgid "Could not find %1 executable."
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:61
-msgid "Modify the bootable settings of the current project"
+#: rip/k3bvideocdrip.cpp:102
+#, kde-format
+msgid "To rip VideoCD's you must install VcdImager Version %1."
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:105 projects/k3bdataviewimpl.cpp:107
-#: projects/k3bdataviewimpl.cpp:110 projects/k3bdataviewimpl.cpp:113
-msgid "New Folder"
+#: rip/k3bvideocdrip.cpp:103 rip/k3bvideocdrip.cpp:112
+msgid ""
+"You can find this on your distribution disks or download it from "
+"http://www.vcdimager.org"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:106
-msgid "Please insert the name for the new folder:"
+#: rip/k3bvideocdrip.cpp:111
+#, kde-format
+msgid "%1 executable too old: need version %2 or greater."
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:111
-msgid ""
-"A file with that name already exists. Please insert the name for the new "
-"folder:"
+#: rip/k3bvideocdrip.cpp:119
+#, kde-format
+msgid "Using %1 %2 - Copyright (C) %3"
 msgstr ""
 
-#: projects/k3bdataviewimpl.cpp:240
-msgid "Edit Boot Images"
+#: rip/k3bvideocdrip.cpp:170
+msgid "Extracting"
 msgstr ""
 
-#: projects/k3bdatamultisessioncombobox.cpp:36
-msgid "Select the Multisession Mode for the project."
+#: rip/k3bvideocdrip.cpp:171
+msgid "Start extracting."
 msgstr ""
 
-#: projects/k3bdatamultisessioncombobox.cpp:37
-msgid ""
-"<p><b>Multisession Mode</b><p><b>Auto</b><br>Let K3b decide which mode to "
-"use. The decision will be based on the size of the project (does it fill the "
-"whole media) and the state of the inserted media (appendable or "
-"not).<p><b>No Multisession</b><br>Create a single-session CD or DVD and "
-"close the disk.<p><b>Start Multisession</b><br>Start a multisession CD or "
-"DVD, not closing the disk to allow further sessions to be "
-"appended.<p><b>Continue Multisession</b><br>Continue an appendable data CD "
-"(as for example created in <em>Start Multisession</em> mode) and add another "
-"session without closing the disk to allow further sessions to be "
-"appended.<p><b>Finish Multisession</b><br>Continue an appendable data CD (as "
-"for example created in <em>Start Multisession</em> mode), add another "
-"session, and close the disk.<p><em>In the case of DVD+RW and DVD-RW "
-"restricted overwrite media K3b will not actually create multiple sessions "
-"but grow the file system to include the new data.</em>"
+#: rip/k3bvideocdrip.cpp:172
+#, kde-format
+msgid "Extract files from %1 to %2."
 msgstr ""
 
-#: projects/k3bdatamultisessioncombobox.cpp:73 k3bwritingmodewidget.cpp:157
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:363
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:364
-#: k3bwriterselectionwidget.cpp:270 k3bwriterselectionwidget.cpp:523
-#: k3bdatamodewidget.cpp:33
-msgid "Auto"
-msgstr "Ymysgogol"
-
-#: projects/k3bdatamultisessioncombobox.cpp:74
-msgid "No Multisession"
+#: rip/k3bvideocdrip.cpp:177
+#, kde-format
+msgid "Could not start %1."
 msgstr ""
 
-#: projects/k3bdatamultisessioncombobox.cpp:76
-msgid "Start Multisession"
+#: rip/k3bvideocdrip.cpp:267
+msgid "Files successfully extracted."
 msgstr ""
 
-#: projects/k3bdatamultisessioncombobox.cpp:77
-msgid "Continue Multisession "
+#: rip/k3bvideocdrip.cpp:270
+#, kde-format
+msgid "%1 returned an unknown error (code %2)."
 msgstr ""
 
-#: projects/k3bdatamultisessioncombobox.cpp:78
-msgid "Finish Multisession "
+#: rip/k3bvideocdrip.cpp:271
+msgid "Please send me an email with the last output..."
 msgstr ""
 
-#: projects/k3bmovixburndialog.cpp:56
-msgid "eMovix Project"
+#: rip/k3bvideocdrip.cpp:277
+#, kde-format
+msgid "%1 did not exit cleanly."
 msgstr ""
 
-#: projects/k3bmovixburndialog.cpp:57
+#: rip/k3bvideocdrip.cpp:291
 #, kde-format
-msgid "1 file (%2)"
-msgid_plural "%1 files (%2)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/k3bmovixburndialog.cpp:60
-msgid "eMovix"
+msgid "%1 encountered non-form2 sector"
 msgstr ""
 
-#: projects/k3bmovixburndialog.cpp:104
-msgid "Multisession"
+#: rip/k3bvideocdrip.cpp:292
+msgid "leaving loop"
 msgstr ""
 
-#: projects/k3bmovixburndialog.cpp:200
-msgid "Could not find a valid eMovix installation."
+#: rip/k3bvideocdrip.cpp:300
+msgid "detected extended VCD2.0 PBC files"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:68
-msgid "Custom Data Project Filesystems"
+#: rip/k3bvideocdrip.cpp:327 rip/k3bvideocdrip.cpp:345
+#, kde-format
+msgid "Extracting %1"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:73
-msgid "Set special ISO9660 Filesystem preferences."
+#: rip/k3bvideocdrip.cpp:338
+#, kde-format
+msgid "Extracting %1 to %2"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:80
-msgid "IS09660 Settings"
+#: rip/categories.cpp:22
+msgid "Blues"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:84
-msgid "Rock Ridge Settings"
+#: rip/categories.cpp:22
+msgid "Classical"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:88
-msgid "Joliet Settings"
+#: rip/categories.cpp:22
+msgctxt "music genre"
+msgid "Country"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:92
-msgid "Misc Settings"
-msgstr "Gosodiadau Amrywiol"
-
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:97
-msgid "Allow untranslated ISO9660 filenames"
+#: rip/categories.cpp:23
+msgid "Folk"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:100
-msgid "Allow max length ISO9660 filenames (37 characters)"
+#: rip/categories.cpp:23
+msgid "Jazz"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:103
-msgid "Allow full ASCII charset for ISO9660 filenames"
+#: rip/categories.cpp:23 option/k3badvancedoptiontab.cpp:77
+msgid "Miscellaneous"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:106
-msgid "Allow ~ and # in ISO9660 filenames"
+#: rip/categories.cpp:24
+msgid "New Age"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:109
-msgid "Allow lowercase characters in ISO9660 filenames"
+#: rip/categories.cpp:24
+msgid "Reggae"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:112
-msgid "Allow multiple dots in ISO9660 filenames"
+#: rip/categories.cpp:24
+msgid "Rock"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:115
-msgid "Allow 31 character ISO9660 filenames"
+#: rip/categories.cpp:24
+msgid "Soundtrack"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:118
-msgid "Allow leading period in ISO9660 filenames"
+#: rip/k3baudiotrackmodel.cpp:158 projects/k3baudioprojectmodel.cpp:317
+msgctxt "audio track number"
+msgid "No."
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:121
-msgid "Omit version numbers in ISO9660 filenames"
-msgstr ""
+#: rip/k3baudiotrackmodel.cpp:160
+msgid "Artist"
+msgstr "Artist"
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:124
-msgid "Omit trailing period in ISO9660 filenames"
+#: rip/k3baudiotrackmodel.cpp:162
+msgctxt "audio track title"
+msgid "Title"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:130
-msgid "ISO Level"
+#: rip/k3baudiocdview.cpp:155
+msgid "Searching for Artist information..."
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:133
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:136
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:139
+#: rip/k3baudiocdview.cpp:186
 #, kde-format
-msgid "Level %1"
-msgstr "Lefel %1"
-
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:146
-msgid "Allow 103 character Joliet filenames"
+msgid ""
+"Found Cd-Text (%1 - %2). Do you want to use it instead of CDDB (%3 - %4)?"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:151
-msgid "Create TRANS.TBL files"
+#: rip/k3baudiocdview.cpp:191
+msgid "Found Cd-Text"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:154
-msgid "Hide TRANS.TBL files in Joliet"
+#: rip/k3baudiocdview.cpp:192
+msgid "Use CD-Text"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:163
-msgid "Do not cache inodes"
+#: rip/k3baudiocdview.cpp:193
+msgid "Use CDDB"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:167
-msgid "Do not import previous session"
+#: rip/k3baudiocdview.cpp:240
+msgid "Audio CD"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:284
-msgid "Force all options below"
+#: rip/k3baudiocdview.cpp:257
+msgid "Edit Track CDDB Info"
 msgstr ""
 
-#: projects/k3bdataadvancedimagesettingsdialog.cpp:289
-msgid ""
-"<p>Set the ISO-9660 conformance level.\n"
-"<ul>\n"
-"<li>Level 1: Files may only consist of one section and filenames are "
-"restricted to 8.3 characters.</li>\n"
-"<li>Level 2: Files may only consist of one section.</li>\n"
-"<li>Level 3: No restrictions.</li>\n"
-"</ul>\n"
-"<p>With all ISO-9660 levels, all filenames are restricted to upper case "
-"letters, numbers and the underscore (_). The maximum filename length is 31 "
-"characters, the directory nesting level is restricted to 8 and the maximum "
-"path length is limited to 255 characters. (These restrictions may be "
-"violated with the additional ISO-9660 features K3b offers.)"
+#: rip/k3baudiocdview.cpp:259
+msgid "Edit Album CDDB Info"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:64
-#: projects/k3baudiotracktrmlookupdialog.cpp:124
-#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:70
-msgid "Audio Project"
+#: rip/k3baudiocdview.cpp:263
+#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:47
+msgid "Query CDDB"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:85
-msgid "Gimmicks"
+#: rip/k3baudiocdview.cpp:265
+msgid "Save CDDB Entry Locally"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:86
-msgid "Hide first track"
+#: rip/k3baudiocdview.cpp:267
+msgid "Show Data Part"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:90
-msgid "Audio Ripping"
+#: rip/k3baudiocdview.cpp:269
+msgid "Mounts the data part of CD"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:92 rip/k3baudiorippingdialog.cpp:184
-#: misc/k3bmediacopydialog.cpp:185
-msgid "Paranoia mode:"
+#: rip/k3baudiocdview.cpp:327
+#, kde-format
+msgid "CDDB Track %1"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:95 rip/k3baudiorippingdialog.cpp:186
-#: misc/k3bmediacopydialog.cpp:169 misc/k3bmediacopydialog.cpp:182
-msgid "Read retries:"
-msgstr ""
+#: rip/k3baudiocdview.cpp:342 rip/k3baudiocdview.cpp:404
+msgid "Title:"
+msgstr "Teitl:"
 
-#: projects/k3baudioburndialog.cpp:98 rip/k3baudiorippingdialog.cpp:181
-msgid "Ignore read errors"
+#: rip/k3baudiocdview.cpp:345 rip/k3baudiocdview.cpp:406
+msgid "Artist:"
+msgstr "Artist:"
+
+#: rip/k3baudiocdview.cpp:347 rip/k3baudiocdview.cpp:408
+msgid "Extra info:"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:115
-msgid "Hide the first track in the first pregap"
+#: rip/k3baudiocdview.cpp:366
+msgid "Album Cddb"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:120
-msgid ""
-"<p>If this option is checked K3b will <em>hide</em> the first track.<p>The "
-"audio CD standard uses pregaps before every track on the CD. By default "
-"these last for 2 seconds and are silent. In DAO mode it is possible to have "
-"longer pregaps that contain some audio. In this case the first pregap will "
-"contain the complete first track.<p>You will need to seek back from the "
-"beginning of the CD to listen to the first track. Try it, it is quite "
-"amusing.<p><b>This feature is only available in DAO mode when writing with "
-"cdrdao."
+#: rip/k3baudiocdview.cpp:410
+msgid "Genre:"
 msgstr ""
 
-#: projects/k3baudioburndialog.cpp:287
-msgid ""
-"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
-"uses <em>normalize-audio</em> (http://normalize.nongnu.org/) to normalize "
-"audio tracks. In order to use this functionality, please install it first. "
-"(sudo apt-get install normalize-audio) "
-msgstr ""
+#: rip/k3baudiocdview.cpp:412
+msgid "Year:"
+msgstr "Blwyddyn :"
 
-#: projects/k3bbootimageview.cpp:55
-msgid "Floppy"
-msgstr "Llipa"
+#: rip/k3baudiocdview.cpp:415
+msgid "Category:"
+msgstr "Categori :"
 
-#. i18n: file: projects/base_k3bbootimageview.ui:115
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioHarddisk)
-#: projects/k3bbootimageview.cpp:57 rc.cpp:372
-msgid "Harddisk"
+#: rip/k3baudiocdview.cpp:467
+#, kde-format
+msgid "Saved entry in category %1."
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:125
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioNoEmulation)
-#: projects/k3bbootimageview.cpp:59 rc.cpp:378
-#: ../plugins/decoder/mp3/k3bmaddecoder.cpp:432
-msgid "None"
-msgstr "Dim"
-
-#: projects/k3bbootimageview.cpp:126
-msgid "Hide Advanced Options"
-msgstr "Cuddio dewisiadau uwch"
-
-#: projects/k3bbootimageview.cpp:130
-msgid "Show Advanced Options"
-msgstr "Dangos dewisiadau uwch"
+#: rip/k3baudiocdview.cpp:469 option/k3boptiondialog.cpp:192
+msgid "CDDB"
+msgstr "CDDB"
 
-#: projects/k3bbootimageview.cpp:137
-msgid "Please Choose Boot Image"
+#: rip/k3bvideocdrippingdialog.cpp:50
+msgid "Video CD Ripping"
 msgstr ""
 
-#: projects/k3bbootimageview.cpp:145
-msgid ""
-"<p>The file you selected is not a floppy image (floppy images are of size "
-"1200 KB, 1440 KB, or 2880 KB). You may still use boot images of other sizes "
-"by emulating a harddisk or disabling emulation completely. <p>If you are not "
-"familiar with terms like 'harddisk emulation' you most likely want to use a "
-"floppy image here. Floppy images can be created by directly extracting them "
-"from a real floppy disk:<pre>dd if=/dev/floppy of=/tmp/floppy.img</pre>or by "
-"using one of the many boot floppy generators that can be found on <a "
-"href=\"http://www.google.com/search?q=linux+boot+floppy&ie=UTF-8&oe=UTF-"
-"8\">the Internet</a>."
+#: rip/k3bvideocdrippingdialog.cpp:74
+msgid "Destination Folder"
 msgstr ""
 
-#: projects/k3bbootimageview.cpp:154
-msgid "No Floppy image selected"
+#: rip/k3bvideocdrippingdialog.cpp:79
+msgid "Rip files to:"
 msgstr ""
 
-#: projects/k3bbootimageview.cpp:155
-msgid "Use harddisk emulation"
+#: rip/k3bvideocdrippingdialog.cpp:86
+msgid "Free space in folder:"
 msgstr ""
 
-#: projects/k3bbootimageview.cpp:156
-msgid "Use no emulation"
+#: rip/k3bvideocdrippingdialog.cpp:91
+msgid "Necessary storage size:"
 msgstr ""
 
-#: projects/k3bvideodvdburndialog.cpp:47
-msgid "Video DVD Project"
+#: rip/k3bvideocdrippingdialog.cpp:103
+msgid "Ignore /EXT/PSD_X.VCD"
 msgstr ""
 
-#: projects/k3bvcdview.cpp:85
-msgid ""
-"Could not find VcdImager executable. To create VideoCD's you must install "
-"VcdImager >= 0.7.12. You can find this on your distribution disks or "
-"download it from http://www.vcdimager.org"
+#: rip/k3bvideocdrippingdialog.cpp:104
+msgid "Use 2336 byte sector mode for image file"
 msgstr ""
 
-#: projects/k3baudiotracksplitdialog.cpp:41
-msgid "Split Audio Track"
+#: rip/k3bvideocdrippingdialog.cpp:108
+msgid "Extract XML structure"
 msgstr ""
 
-#: projects/k3baudiotracksplitdialog.cpp:53
-msgid "Please select the position where the track should be split."
+#: rip/k3bvideocdrippingdialog.cpp:118
+msgid "Starts extracting the selected VideoCd tracks"
 msgstr ""
 
-#: projects/k3baudiotracksplitdialog.cpp:58
-msgid "Split track at:"
+#: rip/k3bvideocdrippingdialog.cpp:129
+#, kde-format
+msgid "Free space in destination folder: %1"
 msgstr ""
 
-#: projects/k3baudiotracksplitdialog.cpp:101
-msgid "Split Here"
+#: rip/k3bvideocdrippingdialog.cpp:131
+msgid "Necessary space for extracted files"
 msgstr ""
 
-#: projects/k3baudiotracksplitdialog.cpp:105
-msgid "Remove part"
+#: rip/k3bvideocdrippingdialog.cpp:133
+msgid "Ignore extended PSD"
 msgstr ""
 
-#: projects/k3baudioview.cpp:136
+#: rip/k3bvideocdrippingdialog.cpp:134
 msgid ""
-"No audio decoder plugins found. You will not be able to add any files to the "
-"audio project."
-msgstr ""
-
-#: projects/k3baudiodatasourceeditwidget.cpp:38
-msgid "Start Offset"
+"<p>Ignore extended PSD (located in the ISO-9660 filesystem under "
+"`/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>"
 msgstr ""
 
-#: projects/k3baudiodatasourceeditwidget.cpp:39
-msgid "End Offset"
+#: rip/k3bvideocdrippingdialog.cpp:136
+msgid "Assume a 2336-byte sector mode"
 msgstr ""
 
-#: projects/k3baudiodatasourceeditwidget.cpp:62
+#: rip/k3bvideocdrippingdialog.cpp:137
 msgid ""
-"Drag the edges of the highlighted area to define the portion of the audio "
-"source you want to include in the Audio CD track. You can also use the input "
-"windows to fine-tune your selection."
+"<p>This option only makes sense if you are reading from a BIN CD disk image. "
+"This indicates to `vcdxrip' to assume a 2336-byte sector mode for image "
+"file.</p><b>Note: This option is slated to disappear.</b>"
 msgstr ""
 
-#: projects/k3baudiodatasourceeditwidget.cpp:102
-msgid "Used part of the audio source"
+#: rip/k3bvideocdrippingdialog.cpp:140
+msgid "Create XML description file."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:15
-#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bDataVolumeDescWidget)
-#: projects/k3bdatavolumedescdialog.cpp:33 projects/k3bvcdburndialog.cpp:543
-#: rc.cpp:194
-msgid "Volume Descriptor"
+#: rip/k3bvideocdrippingdialog.cpp:141
+msgid ""
+"<p>This option creates an XML description file with all video CD "
+"information.</p><p>This file will always contain all of the "
+"information.</p><p>Example: If you only extract sequences, the description "
+"file will also hold the information for files and segments.</p><p>The "
+"filename is the same as the video CD name, with a .xml extension. The "
+"default is VIDEOCD.xml.</p>"
 msgstr ""
 
-#: projects/k3bmovixview.cpp:59
-msgid "Remove Subtitle File"
+#: rip/k3bvideocdrippingdialog.cpp:154 projects/k3bprojectburndialog.cpp:198
+#, kde-format
+msgid "Image folder '%1' does not exist. Do you want K3b to create it?"
 msgstr ""
 
-#: projects/k3bmovixview.cpp:62
-msgid "Add Subtitle File..."
+#: rip/k3bvideocdrippingdialog.cpp:157 projects/k3bprojectburndialog.cpp:201
+#, kde-format
+msgid "Failed to create folder '%1'."
 msgstr ""
 
-#: projects/k3bmovixview.cpp:144
-msgid "K3b currently only supports local files."
+#: rip/k3bvideocdrippingdialog.cpp:173
+msgid "Continue although the folder is not empty?"
 msgstr ""
 
-#: projects/k3bmixedview.cpp:124
-msgid "Please add files and audio titles to your project first."
+#: rip/k3bcddbpatternwidget.cpp:53
+msgctxt ""
+"Please do NOT modify/translate the quotes, they are part of the pattern!"
+msgid "%A - %T/%n - !a='%A'{%a - }%t"
 msgstr ""
 
-#: projects/k3bdatamultisessionimportdialog.cpp:98
-msgid ""
-"<p>K3b found session containing Joliet information for long filenames but no "
-"Rock Ridge extensions.<p>The filenames in the imported session will be "
-"converted to a restricted character set in the new session. This character "
-"set is based on the ISO9660 settings in the K3b project. K3b is not able to "
-"display these converted filenames yet."
+#: rip/k3bcddbpatternwidget.cpp:54
+msgid "%{albumartist} - %{albumtitle}/%{number} - %{artist} - %{title}"
 msgstr ""
 
-#: projects/k3bdatamultisessionimportdialog.cpp:103
-msgid "Session Import Warning"
+#: rip/k3bcddbpatternwidget.cpp:55
+msgid "%{genre}/%{albumartist} - %{albumtitle}/Track%{number}"
 msgstr ""
 
-#: projects/k3bdatamultisessionimportdialog.cpp:163
-msgid "Please insert an appendable medium"
+#: rip/k3bcddbpatternwidget.cpp:56
+msgid "music/ripped-tracks/%a - %t"
 msgstr ""
 
-#: projects/k3bdatamultisessionimportdialog.cpp:210
-#, kde-format
-msgid "1 audio track"
-msgid_plural "%1 audio tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/k3bdatamultisessionimportdialog.cpp:214 k3bdiskinfoview.cpp:240
-#, kde-format
-msgid "Session %1"
-msgstr "Sesiwn %1"
-
-#: projects/k3bdatamultisessionimportdialog.cpp:273
-msgid "Session Import"
+#: rip/k3bcddbpatternwidget.cpp:58
+msgid "%{albumartist} - %{albumtitle}"
 msgstr ""
 
-#: projects/k3bdatamultisessionimportdialog.cpp:277
-msgid "Please select a session to import."
+#: rip/k3bcddbpatternwidget.cpp:60
+msgid "playlists/%{albumartist}/%{albumtitle    }"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:45
-msgid "Linux/Unix only"
+#: rip/k3bcddbpatternwidget.cpp:127
+msgid ""
+"<p><b>Pattern special strings:</b><p>The following strings will be replaced "
+"with their respective meaning in every track name.<br><em>Hint:</em> %A "
+"differs from %a only on soundtracks or compilations.<p><table "
+"border=\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em><"
+"/td></tr><tr><td>%a</td><td>artist of the track</td><td>%{a} or "
+"%{artist}</td></tr><tr><td>%t</td><td>title of the track</td><td>%{t} or "
+"%{title}</td></tr><tr><td>%n</td><td>track number</td><td>%{n} or "
+"%{number}</td></tr><tr><td>%y</td><td>year of the CD</td><td>%{y} or "
+"%{year}</td></tr><tr><td>%c</td><td>extended track information</td><td>%{c} "
+"or %{comment}</td></tr><tr><td>%g</td><td>genre of the CD</td><td>%{g} or "
+"%{genre}</td></tr><tr><td>%A</td><td>album artist</td><td>%{A} or "
+"%{albumartist}</td></tr><tr><td>%T</td><td>album title</td><td>%{T} or "
+"%{albumtitle}</td></tr><tr><td>%C</td><td>extended CD "
+"information</td><td>%{C} or "
+"%{albumcomment}</td></tr><tr><td>%d</td><td>current date</td><td>%{d} or "
+"%{date}</td></tr><tr><td>%e</td><td>file extension (if left out, it is added "
+"automatically)</td><td>%{e} or %{ext}</td></tr></table>"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:46
-msgid "Linux/Unix + Windows"
+#: rip/k3bcddbpatternwidget.cpp:153
+#, c-format
+msgctxt ""
+"Please do NOT modify/translate the quotes, they are part of the pattern!"
+msgid ""
+"<p><b>Conditional inclusion:</b><p>These patterns make it possible to "
+"selectively include texts, depending on the value of CDDB entries. You can "
+"choose only to include or exclude texts if one of the entries is empty, or "
+"if it has a specific value. Examples:<ul><li>@T{TEXT} includes TEXT if the "
+"album title is specified<li>!T{TEXT} includes TEXT if the album title is not "
+"specified<li>@C='Soundtrack'{TEXT} includes TEXT if the CD's extended "
+"information is named Soundtrack<li>!C='Soundtrack'{TEXT} includes TEXT if "
+"the CD's extended information is anything else but Soundtrack<li>It is also "
+"possible to include special strings in texts and conditions, e.g. "
+"!a='%A'{%a} only includes the title's artist information if it does not "
+"differ from the album artist.</ul><p>Conditional includes make use of the "
+"same characters as the special strings, which means that the X in @X{...} "
+"can be one character out of [atnycgATCd]."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:47
-msgid "Very large files (UDF)"
+#: rip/k3baudioprojectconvertingjob.cpp:125
+#: rip/k3baudioprojectconvertingjob.cpp:430
+msgid "Converting Audio Tracks"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:48
-msgid "DOS Compatibility"
+#: rip/k3baudioprojectconvertingjob.cpp:143
+msgid "Starting audio conversion."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:49
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:71
-msgid "Custom"
-msgstr "Addasiedig"
-
-#: projects/k3bdataimagesettingswidget.cpp:146
-msgid ""
-"<p><b>File System Presets</b><p>K3b provides the following file system "
-"Presets which allow for a quick selection of the most frequently used "
-"settings."
+#: rip/k3baudioprojectconvertingjob.cpp:172 rip/k3baudioripjob.cpp:202
+#, kde-format
+msgid "Removed partial file '%1'."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:150
-msgid ""
-"The file system is optimized for usage on Linux/Unix systems. This mainly "
-"means that it uses the Rock Ridge extensions to provide long filenames, "
-"symbolic links, and POSIX compatible file permissions."
+#: rip/k3baudioprojectconvertingjob.cpp:187
+#: rip/k3baudioprojectconvertingjob.cpp:297 rip/k3baudioripjob.cpp:328
+#: rip/k3baudioripjob.cpp:439 option/k3bmiscoptiontab.cpp:117
+#, kde-format
+msgid "Unable to create folder %1"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:154
-msgid ""
-"In addition to the settings for Linux/Unix the file system contains a Joliet "
-"tree which allows for long file names on Windows which does not support the "
-"Rock Ridge extensions. Be aware that the file name length is restricted to "
-"103 characters."
+#: rip/k3baudioprojectconvertingjob.cpp:231
+#: rip/k3baudioprojectconvertingjob.cpp:348 rip/k3baudioripjob.cpp:372
+#: rip/k3baudioripjob.cpp:495
+#, kde-format
+msgid "Unable to open '%1' for writing."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:158
-msgid ""
-"The file system has additional UDF entries attached to it. This raises the "
-"maximal file size to 4 GB. Be aware that the UDF support in K3b is limited."
+#: rip/k3baudioprojectconvertingjob.cpp:239
+#, kde-format
+msgid "Converting track %1 (%2 - %3)"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:161
-msgid ""
-"The file system is optimized for compatibility with old systems. That means "
-"file names are restricted to 8.3 characters and no symbolic links or file "
-"permissions are supported."
+#: rip/k3baudioprojectconvertingjob.cpp:244
+#, kde-format
+msgid "Converting track %1"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:216
-msgid "Rock Ridge"
+#: rip/k3baudioprojectconvertingjob.cpp:270 rip/k3baudioripjob.cpp:404
+#, kde-format
+msgid "Error while encoding track %1."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:218
-msgid "Joliet"
+#: rip/k3baudioprojectconvertingjob.cpp:286
+#, kde-format
+msgid "Successfully converted track %1."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:220
-msgid "UDF"
+#: rip/k3baudioprojectconvertingjob.cpp:301 rip/k3baudioripjob.cpp:443
+#, kde-format
+msgid "Writing playlist to %1."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:222
-msgid "Custom (ISO9660 only)"
+#: rip/k3baudioprojectconvertingjob.cpp:395 rip/k3baudioripjob.cpp:540
+#, kde-format
+msgid "Writing cue file to %1."
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:224
+#: rip/k3baudioprojectconvertingjob.cpp:432
 #, kde-format
-msgid "Custom (%1)"
+msgid "Converting Audio Tracks From '%1'"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:241
-msgid ""
-"<p>Be aware that it is not recommended to disable the Rock Ridge Extensions. "
-"There is no disadvantage in enabling Rock Ridge (except for a very small "
-"space overhead) but a lot of advantages.<p>Without Rock Ridge Extensions "
-"symbolic links are not supported and will always be followed as if the "
-"\"Follow Symbolic Links\" option was enabled."
-msgstr ""
+#: rip/k3baudioprojectconvertingjob.cpp:439 rip/k3baudioripjob.cpp:584
+#, kde-format
+msgid "1 track (encoding to %2)"
+msgid_plural "%1 tracks (encoding to %2)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bdataimagesettingswidget.cpp:247
-msgid "Rock Ridge Extensions Disabled"
-msgstr ""
+#: rip/k3baudioprojectconvertingjob.cpp:444 rip/k3baudioripjob.cpp:589
+#, kde-format
+msgid "1 track"
+msgid_plural "%1 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bdataimagesettingswidget.cpp:253
-msgid ""
-"<p>Be aware that without the Joliet extensions Windows systems will not be "
-"able to display long filenames. You will only see the ISO9660 "
-"filenames.<p>If you do not intend to use the CD/DVD on a Windows system it "
-"is safe to disable Joliet."
+#: rip/k3baudioripjob.cpp:214
+msgid "Extracting Digital Audio"
 msgstr ""
 
-#: projects/k3bdataimagesettingswidget.cpp:258
-msgid "Joliet Extensions Disabled"
+#: rip/k3baudioripjob.cpp:221
+msgid "Could not load libcdparanoia."
 msgstr ""
 
-#: projects/k3baudiotracktrmlookupdialog.cpp:48
-#: projects/k3bmusicbrainzjob.cpp:122
-msgid "MusicBrainz Query"
+#: rip/k3baudioripjob.cpp:232
+msgid "Reading CD table of contents."
 msgstr ""
 
-#: projects/k3baudiotracktrmlookupdialog.cpp:122
+#: rip/k3baudioripjob.cpp:236
 #, kde-format
-msgid "Track %1 was not found in the MusicBrainz database."
+msgid "Could not open device %1"
 msgstr ""
 
-#: projects/k3baudioprojectmodel.cpp:317 rip/k3baudiotrackmodel.cpp:158
-msgctxt "audio track number"
-msgid "No."
+#: rip/k3baudioripjob.cpp:254 rip/k3baudioripjob.cpp:296
+msgid "Searching index 0 for all tracks"
 msgstr ""
 
-#: projects/k3baudioprojectmodel.cpp:319
-msgid "Artist (CD-Text)"
+#: rip/k3baudioripjob.cpp:271
+msgid "Starting digital audio extraction (ripping)."
 msgstr ""
 
-#: projects/k3baudioprojectmodel.cpp:321
-msgid "Title (CD-Text)"
+#: rip/k3baudioripjob.cpp:379
+#, kde-format
+msgid "Ripping track %1 (%2 - %3)"
 msgstr ""
 
-#: projects/k3baudioprojectmodel.cpp:323
-msgctxt "audio type like mp3 or whatever"
-msgid "Type"
+#: rip/k3baudioripjob.cpp:384
+#, kde-format
+msgid "Ripping track %1"
 msgstr ""
 
-#: projects/k3baudioprojectmodel.cpp:325
-msgctxt "audio track length"
-msgid "Length"
+#: rip/k3baudioripjob.cpp:395
+#, kde-format
+msgid "Successfully ripped track %1 to %2."
 msgstr ""
 
-#: projects/k3baudioviewimpl.cpp:58
-msgid "Play Track"
+#: rip/k3baudioripjob.cpp:420
+#, kde-format
+msgid "Unrecoverable error while ripping track %1."
 msgstr ""
 
-#: projects/k3baudioviewimpl.cpp:67
-msgid "Convert Tracks"
+#: rip/k3baudioripjob.cpp:427
+msgid "Error while initializing audio ripping."
 msgstr ""
 
-#: projects/k3baudioviewimpl.cpp:350
-msgid "No tracks to convert"
+#: rip/k3baudioripjob.cpp:575
+msgid "Ripping Audio Tracks"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:217 projects/k3bfillstatusdisplay.cpp:613
-#: projects/k3bfillstatusdisplay.cpp:876
-msgid "min"
-msgstr "mun"
+#: rip/k3baudioripjob.cpp:577
+#, kde-format
+msgid "Ripping Audio Tracks From '%1'"
+msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:225 projects/k3bfillstatusdisplay.cpp:228
-#: projects/k3bfillstatusdisplay.cpp:233 k3bdiskinfoview.cpp:300
-#: k3bdiskinfoview.cpp:302 k3bdiskinfoview.cpp:306
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:110
+msgid "Ripping Video DVD Titles"
+msgstr ""
+
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:116
 #, kde-format
-msgid "%1 min"
-msgstr "%1 munud"
+msgid "Transcoding 1 title to %2/%3"
+msgid_plural "Transcoding %1 titles to %2/%3"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bfillstatusdisplay.cpp:223
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:145
 #, kde-format
-msgid "Available: %1 of %2"
+msgid "Successfully ripped title %1 to '%2'"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:231
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:150
 #, kde-format
-msgid "Capacity exceeded by %1"
+msgid "Failed to rip title %1"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:435
-msgid "Minutes"
-msgstr "Munudau"
-
-#: projects/k3bfillstatusdisplay.cpp:437
-msgid "Megabytes"
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:180
+#, kde-format
+msgid "Determined clipping values for title %1"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:440
-msgid "Automatic Size"
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:181
+#, kde-format
+msgid "Top: %1, Bottom: %2"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:442 projects/k3bfillstatusdisplay.cpp:444
-#: projects/k3bfillstatusdisplay.cpp:446 projects/k3bfillstatusdisplay.cpp:526
-#: projects/k3bfillstatusdisplay.cpp:527 projects/k3bfillstatusdisplay.cpp:528
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:182
 #, kde-format
-msgid "%1 MB"
-msgstr "%1 MB"
-
-#: projects/k3bfillstatusdisplay.cpp:458
-msgid "Custom..."
-msgstr "Addasu ..."
-
-#: projects/k3bfillstatusdisplay.cpp:460
-msgid "From Medium..."
+msgid "Left: %1, Right: %2"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:478
-msgid "User Defaults"
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:189
+msgid "Insane clipping values. No clipping will be done at all."
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:481
-msgid "Save User Defaults"
+#: rip/videodvd/k3bvideodvdrippingjob.cpp:199
+#, kde-format
+msgid "Failed to determine clipping values for title %1"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:485
-msgid "Why 4.4 instead of 4.7?"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:153
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:175
+msgid "Video DVD Ripping"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:489
-msgid "Show Size In"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:176
+#, kde-format
+msgid "1 title from %2"
+msgid_plural "%1 titles from %2"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:199
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:221
+#, kde-format
+msgid "Title %1 (%2)"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:495
-msgid "CD Size"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:230
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:53
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:77
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:102
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:127
+msgid "unknown language"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:501
-msgid "DVD Size"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:226
+#, kde-format
+msgid "%1 %2Ch (%3%4)"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:507
-msgid "Blu-ray Size"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:241
+msgid "not supported"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:538 projects/k3bfillstatusdisplay.cpp:539
-#: projects/k3bfillstatusdisplay.cpp:540
-#, kde-format
-msgid "unused"
-msgid_plural "%1 minutes"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:455
+#, kde-format, no-c-format
+msgctxt "Ch is short for Channels"
+msgid "%1Ch"
+msgid_plural "%1Ch"
 msgstr[0] ""
 msgstr[1] ""
 
-#: projects/k3bfillstatusdisplay.cpp:598
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:549
 msgid ""
-"<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like it "
-"says on the media?</b><p>A single layer DVD media has a capacity of "
-"approximately 4.4 GB which equals 4.4*1024<sup>3</sup> bytes. Media "
-"producers just calculate with 1000 instead of 1024 for advertising "
-"reasons.<br>This results in 4.4*1024<sup>3</sup>/1000<sup>3</sup> = 4.7 GB."
+"<p>When using the <em>AC3 pass-through</em> audio codec all selected audio "
+"streams need to be in AC3 format. Please select another audio codec or "
+"choose AC3 audio streams for all ripped titles."
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:611
-msgid "GB"
+#: rip/videodvd/k3bvideodvdrippingdialog.cpp:552
+msgid "AC3 Pass-through"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:612 option/k3badvancedoptiontab.cpp:67
-msgid "MB"
-msgstr "MB"
-
-#: projects/k3bfillstatusdisplay.cpp:626
-msgid "Custom Size"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:68
+msgid "Keep original dimensions"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:627
-msgid ""
-"<p>Please specify the size of the medium. Use suffixes <b>GB</b>,<b>MB</b>, "
-"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and "
-"<em>minutes</em> respectively."
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:69
+msgid "640x? (automatic height)"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:684
-msgid "Medium is not empty."
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:70
+msgid "320x? (automatic height)"
 msgstr ""
 
-#: projects/k3bfillstatusdisplay.cpp:687
-msgid "No usable medium found."
-msgstr ""
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:71
+#: projects/k3bdataimagesettingswidget.cpp:49
+msgid "Custom"
+msgstr "Addasiedig"
 
-#: projects/k3bfillstatusdisplay.cpp:877
-msgid "Right click for media sizes"
-msgstr ""
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:83
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:92
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:307
+msgid "Title"
+msgstr "Teitl"
 
-#: projects/k3bvcdburndialog.cpp:64
-msgid "Video CD (Version 1.1)"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:84
+msgid "Video Size"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:66
-msgid "Video CD (Version 2.0)"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:100
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:64
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:67
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:70
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:164
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:165
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:166
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:248
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:249
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:250
+#, kde-format
+msgid "%1 kbps"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:68
-msgid "Super Video CD"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:194
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:195
+msgid "auto"
+msgstr "ymysgogol"
+
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:294
+msgid ""
+"<p><b>Pattern special strings:</b><p>The following strings will be replaced "
+"with their respective meaning in every track name.<br><p><table "
+"border=\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em><"
+"/td></tr><tr><td>%t</td><td>title number</td><td>%{t} or "
+"%{title_number}</td></tr><tr><td>%i</td><td>volume id (mostly the name of "
+"the Video DVD)</td><td>%{i} or "
+"%{volume_id}</td></tr><tr><td>%b</td><td>beautified volume id</td><td>%{b} "
+"or %{beautified_volume_id}</td></tr><tr><td>%l</td><td>two chars language "
+"code</td><td>%{l} or %{lang_code}</td></tr><tr><td>%n</td><td>language "
+"name</td><td>%{n} or %{lang_name}</td></tr><tr><td>%a</td><td>audio format "
+"(on the Video DVD)</td><td>%{a} or "
+"%{audio_format}</td></tr><tr><td>%c</td><td>number of audio channels (on the "
+"Video DVD)</td><td>%{c} or %{channels}</td></tr><tr><td>%v</td><td>size of "
+"the original video</td><td>%{v} or "
+"%{orig_video_size}</td></tr><tr><td>%s</td><td>size of the resulting video "
+"(<em>Caution: auto-clipping values are not taken into "
+"account.</em>)</td><td>%{s} or "
+"%{video_size}</td></tr><tr><td>%r</td><td>aspect ratio of the original "
+"video</td><td>%{r} or %{aspect_ratio}</td></tr><tr><td>%d</td><td>current "
+"date</td><td>%{d} or %{date}</td></tr></table><p><em>Hint: K3b also accepts "
+"slight variations of the long special strings. One can, for example, leave "
+"out the underscores.</em>"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:70
-msgid "High-Quality Video CD"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:347
+msgid "Video Picture Size"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:72 rip/k3bvideocdview.cpp:366
-#: rip/k3bvideocdrippingoptions.h:29
-msgid "Video CD"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:351
+msgid ""
+"<p>Please choose the width and height of the resulting video. If one value "
+"is set to <em>Auto</em> K3b will choose this value depending on the aspect "
+"ratio of the video picture.<br>Be aware that setting both the width and the "
+"height to fixed values will result in no aspect ratio correction being "
+"performed."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:75
-#, kde-format
-msgid "1 MPEG (%2)"
-msgid_plural "%1 MPEGs (%2)"
-msgstr[0] ""
-msgstr[1] ""
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:365
+msgid "Width"
+msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:101 projects/k3bvcdburndialog.cpp:102
-#: projects/k3bvcdburndialog.cpp:103 projects/k3bvcdburndialog.cpp:104
-#, kde-format
-msgid "Select Video CD type %1"
+#: rip/videodvd/k3bvideodvdrippingwidget.cpp:367
+msgid "Height"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:105
-msgid "Automatic video type recognition."
+#: rip/videodvd/k3bvideodvdrippingview.cpp:79
+msgid "Show files"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:106
-msgid "Non-compliant compatibility mode for broken devices"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:80
+msgid ""
+"Shows plain Video DVD vob files from the DVD (including decryption) for "
+"further processing with another application"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:107
-msgid "Chinese VCD3.0 track interpretation"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:140
+msgid "Please select the titles to rip."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:108
-msgid "Use 2336 byte sectors for output"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:141
+msgid "No Titles Selected"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:110
-msgid "Specify ISO volume label for Video CD"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:192
+#, kde-format
+msgid ""
+"K3b was unable to unmount device '%1' containing medium '%2'. Video DVD "
+"ripping will not work if the device is mounted. Please unmount manually."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:111
-msgid "Specify album id for VideoCD set"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:197
+msgid "Unmounting failed"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:112
-msgid "Specify album set sequence number ( <= volume-count )"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:207
+msgid ""
+"<p>Unable to read Video DVD contents: Found encrypted Video DVD.<p>Install "
+"<i>libdvdcss</i> to get Video DVD decryption support."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:113
-msgid "Specify number of volumes in album set"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:218
+msgid "Video DVD"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:114
-msgid "Enable CD-i Application Support for VideoCD Type 1.1 & 2.0"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:219
+#, kde-format
+msgid "%1 title"
+msgid_plural "%1 titles"
+msgstr[0] ""
+msgstr[1] ""
+
+#: rip/videodvd/k3bvideodvdrippingview.cpp:227
+msgid ""
+"K3b uses transcode to rip Video DVDs. Please make sure it is installed."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:115
-msgid "Configuration parameters (only for VCD 2.0)"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:241
+msgid ""
+"<p>K3b uses transcode to rip Video DVDs. Your installation of transcode "
+"lacks support for any of the codecs supported by K3b.<p>Please make sure it "
+"is installed properly."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:118
-msgid "Add always an empty `/SEGMENT' folder"
+#: rip/videodvd/k3bvideodvdrippingview.cpp:254
+msgid "Unable to read Video DVD contents."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:119
-msgid "This controls whether APS constraints are strict or relaxed. "
+#: rip/videodvd/k3bvideodvdrippingview.cpp:307
+msgid "Open the Video DVD ripping dialog"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:120
+#: rip/videodvd/k3bvideodvdrippingview.cpp:308
 msgid ""
-"This controls whether to update the scan data information contained in the "
-"MPEG-2 video streams."
+"<p>Rips single titles from a video DVD into a compressed format such as "
+"XviD. Menu structures are completely ignored.<p>If you intend to copy the "
+"plain Video DVD vob files from the DVD (including decryption) for further "
+"processing with another application, please use \"Show files\" button.<p>If "
+"you intend to make a copy of the entire Video DVD including all menus and "
+"extras it is recommended to use the K3b Copy tool."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:121
-msgid ""
-"This element allows to set viewing restrictions which may be interpreted by "
-"the playing device."
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:49
+#, kde-format
+msgid "%1 %2Ch (%3)"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:123
-msgid "This option allows customization of Gaps and Margins."
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:60
+msgid "No audio streams"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:124
-msgid ""
-"Used to set the number of empty sectors added before the lead-out area "
-"begins."
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:68
+msgid "Audio Streams"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:125
-msgid "Used to set the track pre-gap for all tracks in sectors globally."
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:73
+#, kde-format
+msgid "%1 %2Ch (%3<em>%4</em>)"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:126
-msgid "Sets the front margin for sequence items."
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:99
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:124
+msgid "RLE"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:127
-msgid "Sets the rear margin for sequence items."
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:100
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:125
+msgid "Extended"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:131
-msgid ""
-"<p>This is the most basic <b>Video CD</b> specification dating back to 1993, "
-"which has the following characteristics:<ul><li>One mode2 mixed form ISO-"
-"9660 track containing file pointers to the information areas.</li><li>Up to "
-"98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio tracks.</li><li>Up "
-"to 500 MPEG sequence entry points used as chapter divisions.</li></ul><p>The "
-"Video CD specification requires the multiplex-ed MPEG-1 stream to have a CBR "
-"of less than 174300 bytes (1394400 bits) per second in order to accommodate "
-"single speed CD-ROM drives.<br>The specification allows for the following "
-"two resolutions:<ul><li>352 x 240 @ 29.97 Hz (NTSC SIF).</li><li>352 x 240 @ "
-"23.976 Hz (FILM SIF).</li></ul><p>The CBR MPEG-1, layer II audio stream is "
-"fixed at 224 kbps with 1 stereo or 2 mono channels.<p><b>It is recommended "
-"to keep the video bit-rate under 1151929.1 bps.</b>"
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:109
+msgid "No Subpicture streams"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:142
-msgid ""
-"<p>About two years after the Video CD 1.1 specification came out, an "
-"improved <b>Video CD 2.0</b> standard was published in 1995.<p>This one "
-"added the following items to the features already available in the Video CD "
-"1.1 specification:<ul><li>Support for MPEG segment play items "
-"(<b>\"SPI\"</b>), consisting of still pictures, motion pictures and/or audio "
-"(only) streams was added.</li><li>Note Segment Items::.</li><li>Support for "
-"interactive playback control (<b>\"PBC\"</b>) was added.</li><li>Support for "
-"playing related access by providing a scan point index file was added. "
-"(<b>\"/EXT/SCANDATA.DAT\"</b>)</li><li>Support for closed "
-"captions.</li><li>Support for mixing NTSC and PAL content.</li></ul><p>By "
-"adding PAL support to the Video CD 1.1 specification, the following "
-"resolutions became available:<ul><li>352 x 240 @ 29.97 Hz (NTSC "
-"SIF).</li><li>352 x 240 @ 23.976 Hz (FILM SIF).</li><li>352 x 288 @ 25 Hz "
-"(PAL SIF).</li></ul><p>For segment play items the following audio encodings "
-"became available:<ul><li>Joint stereo, stereo or dual channel audio streams "
-"at 128, 192, 224 or 384 kbit/sec bit-rate.</li><li>Mono audio streams at 64, "
-"96 or 192 kbit/sec bit-rate.</li></ul><p>Also the possibility to have audio "
-"only streams and still pictures was provided.<p><b>The bit-rate of multiplex-"
-"ed streams should be kept under 174300 bytes/sec (except for single still "
-"picture items) in order to accommodate single speed drives.</b>"
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:117
+msgid "Subpicture Streams"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:160
-msgid ""
-"<p>With the upcoming of the DVD-V media, a new VCD standard had to be "
-"published in order to be able to keep up with technology, so the Super Video "
-"CD specification was called into life 1999.<p>In the midst of 2000 a full "
-"subset of this <b>Super Video CD</b> specification was published as <b>IEC-"
-"62107</b>.<p>As the most notable change over Video CD 2.0 is a switch from "
-"MPEG-1 CBR to MPEG-2 VBR encoding for the video stream was performed.<p>The "
-"following new features--building upon the Video CD 2.0 specification--"
-"are:<ul><li>Use of MPEG-2 encoding instead of MPEG-1 for the video "
-"stream.</li><li>Allowed VBR encoding of MPEG-1 audio stream.</li><li>Higher "
-"resolutions (see below) for video stream resolution.</li><li>Up to 4 overlay "
-"graphics and text (<b>\"OGT\"</b>) sub-channels for user switchable subtitle "
-"displaying in addition to the already existing closed caption "
-"facility.</li><li>Command lists for controlling the SVCD virtual "
-"machine.</li></ul><p>For the <b>Super Video CD</b>, only the following two "
-"resolutions are supported for motion video and (low resolution) still "
-"pictures:<ul><li>480 x 480 @ 29.97 Hz (NTSC 2/3 D-2).</li><li>480 x 576 @ 25 "
-"Hz (PAL 2/3 D-2).</li></ul>"
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:227
+msgid "MPEG1"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:173
-msgid ""
-"<p>This is actually just a minor variation defined in IEC-62107 on the Super "
-"Video CD 1.0 format for compatibility with current products in the "
-"market.<p>It differs from the Super Video CD 1.0 format in the following "
-"items:<ul><li>The system profile tag field in <b>/SVCD/INFO.SVD</b> is set "
-"to <b>1</b> instead of <b>0</b>.</li><li>The system identification field "
-"value in <b>/SVCD/INFO.SVD</b> is set to <b>HQ-VCD</b> instead of "
-"<b>SUPERVCD</b>.</li><li><b>/EXT/SCANDATA.DAT</b> is mandatory instead of "
-"being optional.</li><li><b>/SVCD/SEARCH.DAT</b> is optional instead of being "
-"mandatory.</li></ul>"
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:227
+msgid "MPEG2"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:180
-msgid ""
-"<p>If Autodetect is:</p><ul><li>ON then K3b will set the correct VideoCD "
-"type.</li><li>OFF then the correct VideoCD type needs to be set by the "
-"user.</li></ul><p>If you are not sure about the correct VideoCD type, it is "
-"best to turn Autodetect ON.</p><p>If you want to force the VideoCD type, you "
-"must turn Autodetect OFF. This is useful for some standalone DVD players "
-"without SVCD support.</p>"
-msgstr ""
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:257
+#, kde-format
+msgid "%1 chapter"
+msgid_plural "%1 chapters"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bvcdburndialog.cpp:186
-msgid ""
-"<ul><li>Rename <b>\"/MPEG2\"</b> folder on SVCDs to (non-compliant) "
-"\"/MPEGAV\".</li><li>Enables the use of the (deprecated) signature "
-"<b>\"ENTRYSVD\"</b> instead of <b>\"ENTRYVCD\"</b> for the file "
-"<b>\"/SVCD/ENTRY.SVD\"</b>.</li></ul>"
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:267
+msgid "letterboxed"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:188
-msgid ""
-"<ul><li>Enables the use of the (deprecated) Chinese "
-"<b>\"/SVCD/TRACKS.SVD\"</b> format which differs from the format defined in "
-"the <b>IEC-62107</b> specification.</li></ul><p><b>The differences are most "
-"exposed on SVCDs containing more than one video track.</b>"
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:269
+msgid "anamorph"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:191
-msgid ""
-"<p>though most devices will have problems with such an out-of-specification "
-"media.<p><b>You may want use this option for images longer than 80 "
-"minutes</b>"
+#. i18n: file: option/base_k3bthemeoptiontab.ui:74
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:309 rc.cpp:969
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:311
+#: projects/k3bvcdtrackdialog.cpp:676
+msgid "Video"
+msgstr "Fideo"
+
+#: rip/videodvd/k3bvideodvdtitlemodel.cpp:315
+msgid "Subpicture"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:194
-msgid ""
-"<p>To allow the play of Video-CDs on a CD-i player, the Video-CD standard "
-"requires that a CD-i application program must be present.<p>This program is "
-"designed to:<ul><li>provide full play back control as defined in the PSD of "
-"the standard</li><li>be extremely simple to use and easy-to-learn for the "
-"end-user</li></ul><p>The program runs on CD-i players equipped with the "
-"CDRTOS 1.1(.1) operating system and a Digital Video extension cartridge."
+#: rip/k3bpatternparser.cpp:133
+#, kde-format
+msgid "Track %1"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:200
-msgid ""
-"<p>Configuration parameters only available for VideoCD 2.0<p>The engine "
-"works perfectly well when used as-is.<p>You have the option to configure the "
-"VCD application.<p>You can adapt the color and/or the shape of the cursor "
-"and lots more."
+#: rip/k3baudioconvertingoptionwidget.cpp:173
+msgid "Wave"
+msgstr "Ton"
+
+#: k3binteractiondialog.cpp:86
+msgid "Load default settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:209
-msgid ""
-"<p>Here you can specify that the folder <b>SEGMENT</b> should always be "
-"present.<p>Some DVD players need the folder to give a faultless rendition."
+#: k3binteractiondialog.cpp:87
+msgid "Load saved settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:212
-msgid ""
-"<p>An Access Point Sector, APS, is an MPEG video sector on the VCD/SVCD "
-"which is suitable to be jumped to directly.<p>APS are required for entry "
-"points and scantables. APS have to fulfil the requirement to precede every I-"
-"frame by a GOP header which shall be preceded by a sequence header in its "
-"turn.<p>The start codes of these 3 items are required to be contained all in "
-"the same MPEG pack/sector, thus forming a so-called access point "
-"sector.<p>This requirement can be relaxed by enabling the relaxed aps "
-"option, i.e. every sector containing an I-frame will be regarded as an "
-"APS.<p><b>Warning:</b> The sequence header is needed for a playing device to "
-"figure out display parameters, such as display resolution and frame rate, "
-"relaxing the aps requirement may lead to non-working entry points."
+#: k3binteractiondialog.cpp:88
+msgid "Load last used settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:218
-msgid ""
-"<p>According to the specification, it is mandatory for Super Video CDs to "
-"encode scan information data into user data blocks in the picture layer of "
-"all intra coded picture.<p>It can be used by playing devices for "
-"implementing fast forward & fast reverse scanning.<p>The already existing "
-"scan information data can be updated by enabling the update scan offsets "
-"option."
+#: k3binteractiondialog.cpp:111 projects/k3bprojectburndialog.cpp:151
+msgid "Start"
+msgstr "Dechrau"
+
+#: k3binteractiondialog.cpp:112
+msgid "Start the task"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:222
-msgid ""
-"<p>Viewing Restriction may be interpreted by the playing device.<p>The "
-"allowed range goes from 0 to 3.<ul><li>0 = unrestricted, free to view for "
-"all</li><li>3 = restricted, content not suitable for ages under "
-"18</li></ul><p>Actually, the exact meaning is not defined and is player "
-"dependant.<p><b>Most players ignore that value.<b>"
+#: k3binteractiondialog.cpp:202
+msgid "Load default or saved settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:229
-msgid "<p>This option allows customization of Gaps and Margins."
+#: k3binteractiondialog.cpp:203
+msgid "Save current settings to reuse them later"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:230
+#: k3binteractiondialog.cpp:207
 msgid ""
-"<p>This option allows to set the number of empty sectors added before the "
-"lead-out area begins, i.e. the number of post-gap sectors.<p>The ECMA-130 "
-"specification requires the last data track before the lead-out to carry a "
-"post-gap of at least 150 sectors, which is used as default for this "
-"parameter.<p>Some operating systems may encounter I/O errors due to read-"
-"ahead issues when reading the last MPEG track if this parameter is set too "
-"low.<p>Allowed value content: [0..300]. Default: 150."
+"<p>Load a set of settings either from the default K3b settings, settings "
+"saved before, or the last used ones."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:235
+#: k3binteractiondialog.cpp:209
 msgid ""
-"<p>Used to set the track pre-gap for all tracks in sectors globally.<p>The "
-"specification requires the pre-gaps to be at least 150 sectors "
-"long.<p>Allowed value content: [0..300]. Default: 150."
+"<p>Saves the current settings of the action dialog.<p>These settings can be "
+"loaded with the <em>Load saved settings</em> button.<p><b>The K3b defaults "
+"are not overwritten by this.</b>"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:239
-msgid ""
-"Margins are used to compensate for inaccurate sector-addressing issues on CD-"
-"ROM media. Interestingly, they have been abandoned for Super Video "
-"CDs.<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors "
-"long.<p>Allowed value content: [0..150]. Default: 30 for Video CD "
-"1.0/1.1/2.0, otherwise (i.e. Super Video CD 1.0 and HQ-VCD 1.0) 0."
+#: k3binteractiondialog.cpp:287
+msgid "Action Dialog Settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:243
+#: k3binteractiondialog.cpp:288
 msgid ""
-"<p>Margins are used to compensate for inaccurate sector-addressing issues on "
-"CD-ROM media. Interestingly, they have been abandoned for Super Video "
-"CDs.<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors "
-"long.<p>Allowed value content: [0..150]. Default: 45 for Video CD "
-"1.0/1.1/2.0, otherwise 0."
+"<p>K3b handles three sets of settings in action dialogs: the defaults, the "
+"saved settings, and the last used settings. Please choose which of these "
+"sets should be loaded if an action dialog is opened again.<p><em>Be aware "
+"that this choice can always be changed from the K3b configuration "
+"dialog.</em>"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:258
-msgid "Generic"
-msgstr "Generig"
-
-#: projects/k3bvcdburndialog.cpp:260
-msgid "Playback Control (PBC)"
-msgstr ""
+#: k3binteractiondialog.cpp:297 option/k3bmiscoptiontab.cpp:48
+msgid "Default Settings"
+msgstr "Gosodiadau Rhagosodedig"
 
-#: projects/k3bvcdburndialog.cpp:261
-msgid "SEGMENT Folder must always be present"
+#: k3binteractiondialog.cpp:298 option/k3bmiscoptiontab.cpp:51
+msgid "Saved Settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:262
-msgid "Relaxed aps"
+#: k3binteractiondialog.cpp:299 option/k3bmiscoptiontab.cpp:54
+msgid "Last Used Settings"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:263
-msgid "Update scan offsets"
+#: k3bapplication.cpp:122
+msgid "Creating GUI..."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:272
-msgid "Gaps"
-msgstr ""
+#: k3bapplication.cpp:134
+msgid "Ready."
+msgstr "Parod."
 
-#: projects/k3bvcdburndialog.cpp:277
-msgid "Customize gaps and margins"
+#: k3bapplication.cpp:139
+msgid "Checking System"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:279
-msgid "Leadout pre gap (0..300):"
+#: k3bapplication.cpp:174
+msgid "K3b is currently busy and cannot start any other operations."
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:284
-msgid "Track pre gap (0..300):"
+#: k3bapplication.cpp:175
+msgid "K3b is busy"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:289
-msgid "Track front margin (0..150):"
+#: k3bdiskinfoview.cpp:80
+msgid "No medium present"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:298
-msgid "Track rear margin (0..150):"
-msgstr ""
+#: k3bdiskinfoview.cpp:101
+msgid "Medium"
+msgstr "Canolig"
 
-#: projects/k3bvcdburndialog.cpp:371
-msgid "Restriction category (0..3):"
+#: k3bdiskinfoview.cpp:105
+msgid "ISO9660 Filesystem Info"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:254
-#. i18n: ectx: property (text), widget (K3ListView)
-#: projects/k3bvcdburndialog.cpp:394 rip/k3baudiorippingdialog.cpp:145
-#: k3bdiskinfoview.cpp:250 rc.cpp:631
-msgid "Type"
-msgstr "Math"
+#: k3bdiskinfoview.cpp:110
+msgid "Tracks"
+msgstr "Traciau"
 
-#: projects/k3bvcdburndialog.cpp:395
-msgid "VideoCD 1.1"
+#: k3bdiskinfoview.cpp:182
+msgid "Data/Mode1"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:396
-msgid "VideoCD 2.0"
+#: k3bdiskinfoview.cpp:184
+msgid "Data/Mode2"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:397
-msgid "Super-VideoCD"
+#: k3bdiskinfoview.cpp:186
+msgid "Data/Mode2 XA Form1"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:398
-msgid "HQ-VideoCD"
+#: k3bdiskinfoview.cpp:188
+msgid "Data/Mode2 XA Form2"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:416
-msgid "Autodetect VideoCD type"
+#: k3bdiskinfoview.cpp:197
+msgid "copy"
+msgstr "copio"
+
+#: k3bdiskinfoview.cpp:197
+msgid "no copy"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:417
-msgid "Enable broken SVCD mode"
+#: k3bdiskinfoview.cpp:199
+msgid "preemp"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:421
-#, kde-format
-msgid "Enable %1 track interpretation"
+#: k3bdiskinfoview.cpp:199
+msgid "no preemp"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:425
-msgid "Use 2336 byte sectors"
+#: k3bdiskinfoview.cpp:200
+msgid "incremental"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:426
-msgid "Enable CD-i support"
+#: k3bdiskinfoview.cpp:200
+msgid "uninterrupted"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:435
-msgid "VideoCD on CD-i"
+#: k3bdiskinfoview.cpp:227 projects/k3baudioburndialog.cpp:73
+#: projects/k3baudiocdtextwidget.cpp:40 projects/k3bmixedburndialog.cpp:76
+msgid "CD-Text"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:456
-msgid "System:"
-msgstr "Cysawd:"
+#: k3bdiskinfoview.cpp:240 projects/k3bdatamultisessionimportdialog.cpp:214
+#, kde-format
+msgid "Session %1"
+msgstr "Sesiwn %1"
 
-#: projects/k3bvcdburndialog.cpp:457
-msgid "Application:"
-msgstr "Cymhwysiad :"
+#: k3bdiskinfoview.cpp:252
+msgid "Attributes"
+msgstr "Priodweddion"
 
-#: projects/k3bvcdburndialog.cpp:466
-msgid "ISO application id for VideoCD"
+#: k3bdiskinfoview.cpp:254
+msgid "First-Last Sector"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:54
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: projects/k3bvcdburndialog.cpp:470 rc.cpp:200
-msgid "&Volume name:"
+#: k3bdiskinfoview.cpp:296
+msgid "Unknown (probably CD-ROM)"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:471
-msgid "Volume &set name:"
+#: k3bdiskinfoview.cpp:297 projects/k3bvcdtrackdialog.cpp:573
+#: projects/k3bvcdtrackdialog.cpp:628 projects/k3bdatapropertiesdialog.cpp:88
+msgid "Type:"
+msgstr "Math:"
+
+#: k3bdiskinfoview.cpp:299
+msgid "Media ID:"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:472
-msgid "Volume set s&ize:"
+#: k3bdiskinfoview.cpp:300
+msgid "Capacity:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:135
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: projects/k3bvcdburndialog.cpp:473 rc.cpp:212
-msgid "Volume set &number:"
+#: k3bdiskinfoview.cpp:300 k3bdiskinfoview.cpp:302 k3bdiskinfoview.cpp:306
+#: projects/k3bfillstatusdisplay.cpp:225 projects/k3bfillstatusdisplay.cpp:228
+#: projects/k3bfillstatusdisplay.cpp:233
+#, kde-format
+msgid "%1 min"
+msgstr "%1 munud"
+
+#: k3bdiskinfoview.cpp:302
+msgid "Used Capacity:"
 msgstr ""
 
-#: projects/k3bvcdburndialog.cpp:474
-msgid "&Publisher:"
+#: k3bdiskinfoview.cpp:306
+msgid "Remaining:"
 msgstr ""
 
-#: projects/k3bmusicbrainzjob.cpp:123
-#, kde-format
-msgid "Found multiple matches for track %1 (%2). Please select one."
+#: k3bdiskinfoview.cpp:307
+msgid "Rewritable:"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:61 k3bprojecttabwidget.cpp:82
-msgid "Project"
-msgstr "Cywaith"
+#: k3bdiskinfoview.cpp:307 k3bdiskinfoview.cpp:308 k3bdiskinfoview.cpp:309
+msgctxt "Availability"
+msgid "yes"
+msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:74 k3bpassivepopup.cpp:126
-msgid "Close"
+#: k3bdiskinfoview.cpp:307 k3bdiskinfoview.cpp:308 k3bdiskinfoview.cpp:309
+msgctxt "Availability"
+msgid "no"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:75
-msgid "Save Settings and close"
+#: k3bdiskinfoview.cpp:308
+msgid "Appendable:"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:76
-msgid "Saves the settings to the project and closes the dialog."
+#: k3bdiskinfoview.cpp:309
+msgid "Empty:"
+msgstr "Gwag :"
+
+#: k3bdiskinfoview.cpp:311
+msgctxt "Number of layers on an optical medium"
+msgid "Layers:"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:79
-msgid "Cancel"
+#: k3bdiskinfoview.cpp:317
+msgid "not formatted"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:80
-msgid "Discard all changes and close"
+#: k3bdiskinfoview.cpp:320
+msgid "incomplete"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:81
-msgid "Discards all changes made in the dialog and closes it."
+#: k3bdiskinfoview.cpp:323
+msgid "in progress"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:151 k3binteractiondialog.cpp:111
-msgid "Start"
-msgstr "Dechrau"
+#: k3bdiskinfoview.cpp:326
+msgid "complete"
+msgstr "cyflawn"
 
-#: projects/k3bprojectburndialog.cpp:152
-msgid "Start the image creation"
+#: k3bdiskinfoview.cpp:329
+msgid "unknown state"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:154
-msgid "Burn"
+#: k3bdiskinfoview.cpp:332
+msgid "Background Format:"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:155
-msgid "Start the burning process"
+#: k3bdiskinfoview.cpp:335
+msgid "Sessions:"
+msgstr "Sesiynau :"
+
+#: k3bdiskinfoview.cpp:357
+msgid "Supported writing speeds:"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:198 rip/k3bvideocdrippingdialog.cpp:154
+#: k3bdiskinfoview.cpp:379
 #, kde-format
-msgid "Image folder '%1' does not exist. Do you want K3b to create it?"
+msgctxt "Size of one block, always 2048"
+msgid "%1 B"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:201 rip/k3bvideocdrippingdialog.cpp:157
+#: k3bdiskinfoview.cpp:380
 #, kde-format
-msgid "Failed to create folder '%1'."
-msgstr ""
+msgctxt "Number of blocks (one block has 2048 bytes)"
+msgid "1 block"
+msgid_plural "%1 blocks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bprojectburndialog.cpp:213 misc/k3bmediacopydialog.cpp:273
-msgid ""
-"There does not seem to be enough free space in the temporary folder. Write "
-"anyway?"
-msgstr ""
+#: k3bdiskinfoview.cpp:381
+#, kde-format
+msgid "1 B"
+msgid_plural "%1 B"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bprojectburndialog.cpp:261
-msgid "Writing"
+#: projects/k3bvcdview.cpp:51 projects/k3baudiotrackview.cpp:181
+#: projects/k3bmovixview.cpp:53 projects/k3baudioviewimpl.cpp:63
+#: projects/k3bdataviewimpl.cpp:48
+msgid "Properties"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:263 misc/k3bimagewritingdialog.cpp:285
-#: misc/k3bmediacopydialog.cpp:105 misc/k3bmediaformattingdialog.cpp:64
-msgid "Writing Mode"
+#: projects/k3bvcdview.cpp:85
+msgid ""
+"Could not find VcdImager executable. To create VideoCD's you must install "
+"VcdImager >= 0.7.12. You can find this on your distribution disks or "
+"download it from http://www.vcdimager.org"
 msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:282 misc/k3bimagewritingdialog.cpp:291
-#: misc/k3bmediacopydialog.cpp:110
-msgid "Copies"
-msgstr "Copïau"
-
-#: projects/k3bprojectburndialog.cpp:304
-msgid "Image"
-msgstr "Delwedd"
+#: projects/kostore/KoStore.cpp:195
+msgid "The directory mode is not supported for remote locations."
+msgstr ""
 
-#: projects/k3bprojectburndialog.cpp:396
-msgid "Use the 'Image' tab to optionally adjust the path of the image."
+#: projects/kostore/KoStore.cpp:196
+msgid "KOffice Storage"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:234
-msgctxt "VideoCD Track Number"
-msgid "No."
+#: projects/k3bdataurladdingdialog.cpp:95
+#, kde-format
+msgid "Moving files to project \"%1\"..."
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:236
-msgctxt "VideoCD Track Title"
-msgid "Title"
+#: projects/k3bdataurladdingdialog.cpp:117
+#: projects/k3bdataurladdingdialog.cpp:123
+#, kde-format
+msgid "Adding files to project '%1'"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:238
-msgctxt "VideoCD Track Type (ie. MPEG1)"
-msgid "Type"
+#: projects/k3bdataurladdingdialog.cpp:148
+#: projects/k3baudiotrackaddingdialog.cpp:99
+msgid "Problems while adding files to the project."
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:240
-msgctxt "VideoCD Track Resolution"
-msgid "Resolution"
+#: projects/k3bdataurladdingdialog.cpp:197
+msgid ""
+"<p>The file you are about to add to the project is an ISO9660 image. As such "
+"it can be burned to a medium directly since it already contains a file "
+"system.<br>Are you sure you want to add this file to the project?"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:243
-msgctxt "VideoCD Track High Resolution"
-msgid "High Resolution"
+#: projects/k3bdataurladdingdialog.cpp:201
+msgid "Adding image file to project"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:245
-msgctxt "VideoCD Track Framerate"
-msgid "Framerate"
+#: projects/k3bdataurladdingdialog.cpp:202
+msgid "Add the file to the project"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:247
-msgctxt "VideoCD Track Muxrate"
-msgid "Muxrate"
+#: projects/k3bdataurladdingdialog.cpp:203
+msgid "Burn the image directly"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:249
-msgctxt "VideoCD Track Duration"
-msgid "Duration"
+#: projects/k3bdataurladdingdialog.cpp:398
+#: projects/k3bdataurladdingdialog.cpp:625
+msgid "File already exists"
+msgstr "Ffeil yn Bodoli'n Barod"
+
+#: projects/k3bdataurladdingdialog.cpp:399
+#: projects/k3bdataurladdingdialog.cpp:626
+#, kde-format
+msgid "<p>File <em>%1</em> already exists in project folder <em>%2</em>."
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:251
-msgctxt "VideoCD Track File Size"
-msgid "File Size"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:179
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
+#: projects/k3bdataurladdingdialog.cpp:406
+#: projects/k3bdataurladdingdialog.cpp:633 rc.cpp:758
+msgid "Replace"
 msgstr ""
 
-#: projects/k3bvcdprojectmodel.cpp:253
-msgctxt "VideoCD Track Filename"
-msgid "Filename"
+#: projects/k3bdataurladdingdialog.cpp:408
+#: projects/k3bdataurladdingdialog.cpp:635
+msgid "Replace the existing file"
 msgstr ""
 
-#: projects/k3bmovixoptionswidget.cpp:46 projects/k3bmovixoptionswidget.cpp:62
-msgid "default"
-msgstr "rhagosodiad"
+#: projects/k3bdataurladdingdialog.cpp:409
+#: projects/k3bdataurladdingdialog.cpp:636
+msgid "Replace All"
+msgstr "Amnewid y Cwbl"
 
-#: k3bdevicemenu.cpp:76 k3b.cpp:331
-msgid "Continue Multisession Project"
+#: projects/k3bdataurladdingdialog.cpp:411
+#: projects/k3bdataurladdingdialog.cpp:638
+msgid "Always replace existing files"
 msgstr ""
 
-#: k3bdevicemenu.cpp:77 k3b.cpp:385
-msgid "Copy &Medium..."
+#: projects/k3bdataurladdingdialog.cpp:414
+#: projects/k3bdataurladdingdialog.cpp:641
+msgid "Keep the existing file"
 msgstr ""
 
-#: k3bdevicemenu.cpp:78 k3b.cpp:366
-msgid "&Format/Erase rewritable disk..."
-msgstr ""
+#: projects/k3bdataurladdingdialog.cpp:415
+#: projects/k3bdataurladdingdialog.cpp:642
+msgid "Ignore All"
+msgstr "Anwybyddu Popeth"
 
-#: k3bdevicemenu.cpp:79 k3b.cpp:395
-msgid "Rip Audio CD..."
+#: projects/k3bdataurladdingdialog.cpp:417
+#: projects/k3bdataurladdingdialog.cpp:644
+msgid "Always keep the existing file"
 msgstr ""
 
-#: k3bdevicemenu.cpp:80 k3b.cpp:403
-msgid "Rip Video DVD..."
-msgstr ""
+#: projects/k3bdataurladdingdialog.cpp:418
+#: projects/k3bdataurladdingdialog.cpp:645 projects/k3bdataviewimpl.cpp:44
+msgid "Rename"
+msgstr "Ail-enwi"
 
-#: k3bdevicemenu.cpp:81 k3b.cpp:411
-msgid "Rip Video CD..."
+#: projects/k3bdataurladdingdialog.cpp:420
+#: projects/k3bdataurladdingdialog.cpp:647
+msgid "Rename the new file"
 msgstr ""
 
-#: k3bdevicemenu.cpp:83 k3b.cpp:453
-msgid "Open the media copy dialog"
+#: projects/k3bdataurladdingdialog.cpp:461
+msgid "Adding link to folder"
 msgstr ""
 
-#: k3bdevicemenu.cpp:85 k3b.cpp:449
-msgid "Open the rewritable disk formatting/erasing dialog"
+#: projects/k3bdataurladdingdialog.cpp:462
+#, kde-format
+msgid ""
+"<p>'%1' is a symbolic link to folder '%2'.<p>If you intend to make K3b "
+"follow symbolic links you should consider letting K3b do this now since K3b "
+"will not be able to do so afterwards because symbolic links to folders "
+"inside a K3b project cannot be resolved.<p><b>If you do not intend to enable "
+"the option <em>follow symbolic links</em> you may safely ignore this warning "
+"and choose to add the link to the project.</b>"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:26
-msgid ""
-"Let K3b select the best-suited mode. This is the recommended selection."
+#: projects/k3bdataurladdingdialog.cpp:473
+msgid "Follow link now"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:27
-msgid ""
-"<em>Disk At Once</em> or more properly <em>Session At Once</em>. The laser "
-"is never turned off while writing the CD or DVD. This is the preferred mode "
-"to write audio CDs since it allows pregaps other than 2 seconds. Not all "
-"writers support DAO.<br>DVD-R(W)s written in DAO provide the best DVD-Video "
-"compatibility."
+#: projects/k3bdataurladdingdialog.cpp:474
+msgid "Always follow links"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:32
-msgid ""
-"<em>Track At Once</em> should be supported by every CD writer. The laser "
-"will be turned off after every track.<br>Most CD writers need this mode for "
-"writing multisession CDs."
+#: projects/k3bdataurladdingdialog.cpp:475
+msgid "Add link to project"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:37
-msgid ""
-"RAW writing mode. The error correction data is created by the software "
-"instead of the writer device.<br>Try this if your CD writer fails to write "
-"in DAO and TAO."
+#: projects/k3bdataurladdingdialog.cpp:476
+msgid "Always add links"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:40
-msgid ""
-"Incremental sequential is the default writing mode for DVD-R(W). It allows "
-"multisession DVD-R(W)s. It only applies to DVD-R(W)."
+#: projects/k3bdataurladdingdialog.cpp:754
+msgid "Enter New Filename"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:42
-msgid ""
-"Restricted Overwrite allows to use a DVD-RW just like a DVD-RAM or a DVD+RW. "
-"The media may just be overwritten. It is not possible to write multisession "
-"DVD-RWs in this mode but K3b uses growisofs to grow an ISO9660 filesystem "
-"within the first session, thus allowing new files to be added to an already "
-"burned disk."
+#: projects/k3bdataurladdingdialog.cpp:755
+msgid "A file with that name already exists. Please enter a new name:"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:98
-msgid "Select the writing mode to use"
+#: projects/k3bdataurladdingdialog.cpp:771
+msgid "Do you also want to add hidden files?"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:99
-msgid "Writing mode"
+#: projects/k3bdataurladdingdialog.cpp:772
+msgid "Hidden Files"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:100
-msgid ""
-"Be aware that the writing mode is ignored when writing DVD+R(W) and BD-R(E) "
-"since there is only one way to write them."
+#: projects/k3bdataurladdingdialog.cpp:772
+#: projects/k3bdataurladdingdialog.cpp:788
+msgid "Add"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:103
+#: projects/k3bdataurladdingdialog.cpp:772
+#: projects/k3bdataurladdingdialog.cpp:788
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
+
+#: projects/k3bdataurladdingdialog.cpp:786
 msgid ""
-"The selection of writing modes depends on the inserted burning medium."
+"Do you also want to add system files (FIFOs, sockets, device files, and "
+"broken symlinks)?"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:159
-msgid "DAO"
+#: projects/k3bdataurladdingdialog.cpp:788
+msgid "System Files"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:161
-msgid "TAO"
+#: projects/k3bdataurladdingdialog.cpp:803
+#: projects/k3baudiotrackaddingdialog.cpp:80
+msgid "Insufficient permissions to read the following files"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:163
-msgid "RAW"
-msgstr "AMRWD"
-
-#: k3bwritingmodewidget.cpp:165
-msgid "Restricted Overwrite"
+#: projects/k3bdataurladdingdialog.cpp:807
+#: projects/k3baudiotrackaddingdialog.cpp:84
+msgid "Unable to find the following files"
 msgstr ""
 
-#: k3bwritingmodewidget.cpp:167
-msgid "Incremental"
+#: projects/k3bdataurladdingdialog.cpp:811
+#: projects/k3baudiotrackaddingdialog.cpp:88
+msgid "No non-local files supported"
 msgstr ""
 
-#: k3bappdevicemanager.cpp:55
-msgid "Media &Info"
+#: projects/k3bdataurladdingdialog.cpp:815
+#, kde-format
+msgid "To burn files bigger than %1 please use %2"
 msgstr ""
 
-#: k3bappdevicemanager.cpp:57
-msgid "&Unmount"
-msgstr "&Datosod"
+#: projects/k3bdataurladdingdialog.cpp:820
+msgid "Some filenames had to be modified due to limitations in mkisofs"
+msgstr ""
 
-#: k3bappdevicemanager.cpp:59
-msgid "&Mount"
-msgstr "&Gosod"
+#: projects/k3bdataurladdingdialog.cpp:824
+msgid ""
+"The following filenames have an invalid encoding. You may fix this with the "
+"convmv tool"
+msgstr ""
 
-#: k3bappdevicemanager.cpp:61 k3bemptydiscwaiter.cpp:273
-#: k3bemptydiscwaiter.cpp:366 k3bemptydiscwaiter.cpp:452
-#: k3bemptydiscwaiter.cpp:516 k3bemptydiscwaiter.cpp:576
-msgid "&Eject"
-msgstr "&Allfwrw"
+#: projects/k3bmixedprojectmodel.cpp:30
+msgid "Data Section"
+msgstr ""
 
-#: k3bappdevicemanager.cpp:63
-msgid "L&oad"
-msgstr "L&lwytho"
+#: projects/k3bmixedprojectmodel.cpp:31
+msgid "Audio Section"
+msgstr ""
 
-#: k3bappdevicemanager.cpp:69
-msgid "Set Read Speed..."
+#: projects/k3bvcdtrackdialog.cpp:55
+msgid "Video Track Properties"
 msgstr ""
 
-#: k3bappdevicemanager.cpp:72
-msgid "Display generic medium information"
+#: projects/k3bvcdtrackdialog.cpp:78 projects/k3bvcdtrackdialog.cpp:389
+#, kde-format
+msgid "%1 bit/s"
 msgstr ""
 
-#: k3bappdevicemanager.cpp:74
-msgid "Unmount the medium"
+#: projects/k3bvcdtrackdialog.cpp:209
+msgid "May also look like | << on the remote control. "
 msgstr ""
 
-#: k3bappdevicemanager.cpp:76
-msgid "Mount the medium"
+#: projects/k3bvcdtrackdialog.cpp:210
+msgid "May also look like >> | on the remote control."
 msgstr ""
 
-#: k3bappdevicemanager.cpp:78
-msgid "Eject the medium"
+#: projects/k3bvcdtrackdialog.cpp:211
+msgid "This key may be mapped to the STOP key."
 msgstr ""
 
-#: k3bappdevicemanager.cpp:80
-msgid "(Re)Load the medium"
+#: projects/k3bvcdtrackdialog.cpp:212
+msgid "This key is usually mapped to the > or PLAY key."
 msgstr ""
 
-#: k3bappdevicemanager.cpp:82
-msgid "Force the drive's read speed"
+#: projects/k3bvcdtrackdialog.cpp:213
+msgid "Target to be jumped to on time-out of <wait>."
 msgstr ""
 
-#: k3bappdevicemanager.cpp:288
-msgid "CD Read Speed"
+#: projects/k3bvcdtrackdialog.cpp:214
+msgid "Delay reactivity of keys."
 msgstr ""
 
-#: k3bappdevicemanager.cpp:289
-#, kde-format
+#: projects/k3bvcdtrackdialog.cpp:215 projects/k3bvcdburndialog.cpp:117
 msgid ""
-"<p>Please enter the preferred read speed for <b>%1</b>. This speed will be "
-"used for the currently mounted medium.<p>This is especially useful to slow "
-"down the drive when watching movies which are read directly from the drive "
-"and the spinning noise is intrusive.<p>Be aware that this has no influence "
-"on K3b since it will change the reading speed again when copying CDs or DVDs."
+"Playback control, PBC, is available for Video CD 2.0 and Super Video CD 1.0 "
+"disc formats."
 msgstr ""
 
-#: k3bappdevicemanager.cpp:307
-msgid "Setting the read speed failed."
+#: projects/k3bvcdtrackdialog.cpp:216
+msgid "Activate the use of numeric keys."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:107
-msgid "&Search"
-msgstr "&Chwilio"
+#: projects/k3bvcdtrackdialog.cpp:217
+msgid "Overwrite default numeric keys."
+msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:119
-msgid "Set Default"
-msgstr "Gosod yn Ragosodyn"
-
-#: option/k3bexternalbinwidget.cpp:120
-msgid "Change the versions K3b should use."
+#: projects/k3bvcdtrackdialog.cpp:218
+msgid "Numeric keys."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:121
-msgid ""
-"<p>If K3b finds more than one installed version of a program it will choose "
-"one as the <em>default</em>, which will be used to do the work. If you want "
-"to change the default, select the desired version and press this button."
+#: projects/k3bvcdtrackdialog.cpp:219
+msgid "Times to repeat the playback of 'play track'."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:125
-msgid "Use the 'Default' button to change the versions K3b should use."
+#: projects/k3bvcdtrackdialog.cpp:220
+msgid "Time in seconds to wait after playback of 'play track'."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:134
-msgid "Path"
-msgstr "Llwybr"
-
-#. i18n: file: option/base_k3bthemeoptiontab.ui:46
-#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
-#: option/k3bexternalbinwidget.cpp:135 rc.cpp:577
-#: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:116
-msgid "Version"
-msgstr "Fersiwn"
-
-#: option/k3bexternalbinwidget.cpp:136
-msgid "Features"
-msgstr "Nodweddion"
-
-#: option/k3bexternalbinwidget.cpp:141 option/k3boptiondialog.cpp:152
-msgid "Programs"
-msgstr "Rhaglenni"
-
-#: option/k3bexternalbinwidget.cpp:149
-msgid "User parameters have to be separated by space."
+#: projects/k3bvcdtrackdialog.cpp:222
+msgid ""
+"<p>Target to be jumped to on time-out of <wait>.<p>If omitted (and <wait> is "
+"not set to an infinite time) one of the targets is selected at random."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:156
-msgid "Program"
-msgstr "Rhaglen"
-
-#: option/k3bexternalbinwidget.cpp:157
-msgid "Parameters"
-msgstr "Paramedrau"
-
-#: option/k3bexternalbinwidget.cpp:163
-msgid "User Parameters"
+#: projects/k3bvcdtrackdialog.cpp:224
+msgid ""
+"<p>When reactivity is set to delayed, it is recommended that the length of "
+"the referenced 'play track' is not more than 5 seconds.<p>The recommended "
+"setting for a play item consisting of one still picture and no audio is to "
+"loop once and have a delayed reactivity."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:169 option/k3bexternalbinwidget.cpp:180
-msgid "Search Path"
+#: projects/k3bvcdtrackdialog.cpp:226 projects/k3bvcdburndialog.cpp:206
+msgid ""
+"<p>Playback control, PBC, is available for Video CD 2.0 and Super Video CD "
+"1.0 disc formats.<p>PBC allows control of the playback of play items and the "
+"possibility of interaction with the user through the remote control or some "
+"other input device available."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:171
+#: projects/k3bvcdtrackdialog.cpp:228
 msgid ""
-"<qt><b>Hint:</b> to force K3b to use another than the default name for the "
-"executable specify it in the search path.</qt>"
+"These are actually pseudo keys, representing the numeric keys 0, 1, ..., 9."
 msgstr ""
 
-#: option/k3bexternalbinwidget.cpp:228
-msgid " (not found)"
+#: projects/k3bvcdtrackdialog.cpp:229
+msgid "<p>If numeric keys enabled, you can overwrite the default settings."
 msgstr ""
 
-#: option/k3bthemeoptiontab.cpp:111
-msgid "K3b - The CD/DVD Kreator"
+#: projects/k3bvcdtrackdialog.cpp:230
+msgid ""
+"<p>Times to repeat the playback of 'play track'.<p>The reactivity attribute "
+"controls whether the playback of 'play track' is finished, thus delayed, "
+"before executing user triggered action or an immediate jump is "
+"performed.<p>After the specified number of repetitions have completed, the "
+"<wait> time begins to count down, unless set to an infinite wait time.<p>If "
+"this element is omitted, a default of `1' is used, i.e. the 'play track' "
+"will be displayed once."
 msgstr ""
 
-#: option/k3bthemeoptiontab.cpp:131
-msgid "Drag or Type Theme URL"
-msgstr "Llusgwch neu Deipiwch URL Thema"
-
-#: option/k3bthemeoptiontab.cpp:143
-#, kde-format
-msgid "Unable to find the icon theme archive %1."
-msgstr "Methu canfod yr archif thema eiconau %1."
-
-#: option/k3bthemeoptiontab.cpp:145
-#, kde-format
+#: projects/k3bvcdtrackdialog.cpp:234
 msgid ""
-"Unable to download the icon theme archive.\n"
-"Please check that address %1 is correct."
+"Time in seconds to wait after playback of 'play track' before triggering the "
+"<timeout> action (unless the user triggers some action before time ran up)."
 msgstr ""
 
-#: option/k3bthemeoptiontab.cpp:177
-msgid "The file is not a valid K3b theme archive."
+#: projects/k3bvcdtrackdialog.cpp:288
+msgid "Event Disabled"
 msgstr ""
 
-#: option/k3bthemeoptiontab.cpp:185
-#, kde-format
-msgid ""
-"A theme with the name '%1' already exists. Do you want to overwrite it?"
+#: projects/k3bvcdtrackdialog.cpp:297 projects/k3bvcdtrackdialog.cpp:706
+msgid "VideoCD END"
 msgstr ""
 
-#: option/k3bthemeoptiontab.cpp:187
-msgid "Theme exists"
+#: projects/k3bvcdtrackdialog.cpp:365
+msgid "File Info"
 msgstr ""
 
-#: option/k3bthemeoptiontab.cpp:206
-#, kde-format
-msgid ""
-"<qt>Are you sure you want to remove the <strong>%1</strong> "
-"theme?<br><br>This will delete the files installed by this theme.</qt>"
-msgstr ""
+#: projects/k3bvcdtrackdialog.cpp:376 projects/k3bdatapropertiesdialog.cpp:94
+msgid "Size:"
+msgstr "Maint:"
 
-#: option/k3bthemeoptiontab.cpp:211
-msgid "Delete"
+#: projects/k3bvcdtrackdialog.cpp:377
+msgid "Length:"
+msgstr "Hyd:"
+
+#: projects/k3bvcdtrackdialog.cpp:378
+msgid "Muxrate:"
 msgstr ""
 
-#: option/k3bdeviceoptiontab.cpp:45
-msgid ""
-"K3b tries to detect all your devices properly. If K3b is unable to detect "
-"your drive, you need to modify their permissions to give K3b write access to "
-"all devices."
+#: projects/k3bvcdtrackdialog.cpp:436
+msgid "Enable playback control (for the whole CD)"
 msgstr ""
 
-#: option/k3bdeviceoptiontab.cpp:85 k3b.cpp:1399
-#: k3bsystemproblemdialog.cpp:621
-msgid "Unable to start K3b::Setup."
+#: projects/k3bvcdtrackdialog.cpp:437
+msgid "Use numeric keys"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:57 k3bsystemproblemdialog.cpp:105
-msgid "Modify Permissions..."
+#: projects/k3bvcdtrackdialog.cpp:439
+msgid "Reactivity delayed to the end of playing track"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:58
-msgid "Refresh"
-msgstr "Cyfredoli"
+#: projects/k3bvcdtrackdialog.cpp:448 projects/k3bvcdtrackdialog.cpp:547
+msgid "Playing"
+msgstr "Yn chwarae"
 
-#: option/k3bdevicewidget.cpp:59
-msgid "Rescan the devices"
+#: projects/k3bvcdtrackdialog.cpp:453
+msgid "Playing track"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:73
-msgid "CD/DVD/BD Drives"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:134
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinLoop)
+#: projects/k3bvcdtrackdialog.cpp:457 rc.cpp:410
+msgid " time(s)"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:123
-msgid "Writer Drives"
+#: projects/k3bvcdtrackdialog.cpp:458
+msgid "forever"
+msgstr "am Byth"
+
+#: projects/k3bvcdtrackdialog.cpp:461
+msgid "then wait"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:128
-msgid "Read-only Drives"
+#: projects/k3bvcdtrackdialog.cpp:466
+msgid " seconds"
+msgstr " eiliadau"
+
+#: projects/k3bvcdtrackdialog.cpp:467
+msgid "infinite"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:144
-msgid "System device name:"
+#: projects/k3bvcdtrackdialog.cpp:469
+msgid "after timeout playing"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:150
-msgid "Vendor:"
-msgstr "Gwerthwr :"
+#: projects/k3bvcdtrackdialog.cpp:482
+msgid "Key Pressed Interaction"
+msgstr ""
 
-#: option/k3bdevicewidget.cpp:156
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: projects/k3bvcdtrackdialog.cpp:487
+msgid "Previous:"
+msgstr "Cynt :"
 
-#: option/k3bdevicewidget.cpp:162
-msgid "Firmware:"
-msgstr ""
+#: projects/k3bvcdtrackdialog.cpp:488
+msgid "Next:"
+msgstr "Nesaf :"
 
-#: option/k3bdevicewidget.cpp:171
-msgid "Write Capabilities:"
+#: projects/k3bvcdtrackdialog.cpp:489
+msgid "Return:"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:178
-msgid "Read Capabilities:"
-msgstr ""
+#: projects/k3bvcdtrackdialog.cpp:490
+msgid "Default:"
+msgstr "Rhagosodedig :"
 
-#: option/k3bdevicewidget.cpp:189
-msgid "Buffer Size:"
+#: projects/k3bvcdtrackdialog.cpp:516
+msgid "Playback Control"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:199
-msgid "Supports Burnfree:"
+#: projects/k3bvcdtrackdialog.cpp:537 projects/k3bvcdtrackdialog.cpp:558
+msgid "Numeric Keys"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:200
-msgid "yes"
-msgstr "ie"
-
-#: option/k3bdevicewidget.cpp:200
-msgid "no"
-msgstr "nage"
+#: projects/k3bvcdtrackdialog.cpp:546
+msgid "Key"
+msgstr "Allwedd"
 
-#: option/k3bdevicewidget.cpp:206
-msgid "Write modes:"
+#: projects/k3bvcdtrackdialog.cpp:553
+msgid "Overwrite default assignment"
 msgstr ""
 
-#: option/k3bdevicewidget.cpp:217 option/k3bdevicewidget.cpp:222
-msgid "none"
-msgstr "dim"
+#: projects/k3bvcdtrackdialog.cpp:574 projects/k3bvcdtrackdialog.cpp:629
+msgid "Rate:"
+msgstr "Cyfradd :"
 
-#: option/k3bcddboptiontab.cpp:46
-msgid "Unable to load KCDDB configuration module."
+#: projects/k3bvcdtrackdialog.cpp:575
+msgid "Sampling frequency:"
 msgstr ""
 
-#: option/k3boptiondialog.cpp:133
-msgid "Miscellaneous Settings"
-msgstr "Gosodiadau Amrywiol"
+#: projects/k3bvcdtrackdialog.cpp:576
+msgid "Mode:"
+msgstr "Modd:"
 
-#: option/k3boptiondialog.cpp:142
-msgid "Devices"
-msgstr "Dyfeisiau"
+#: projects/k3bvcdtrackdialog.cpp:577
+msgid "Copyright:"
+msgstr "Hawlfraint :"
 
-#: option/k3boptiondialog.cpp:143
-msgid "Setup Devices"
+#: projects/k3bvcdtrackdialog.cpp:630
+msgid "Chroma format:"
 msgstr ""
 
-#: option/k3boptiondialog.cpp:153
-msgid "Setup External Programs"
-msgstr ""
-
-#: option/k3boptiondialog.cpp:162
-msgid "Notifications"
+#: projects/k3bvcdtrackdialog.cpp:631
+msgid "Video format:"
 msgstr ""
 
-#: option/k3boptiondialog.cpp:163
-msgid "System Notifications"
-msgstr "Hysbysiadau Cysawd"
-
-#: option/k3boptiondialog.cpp:172
-msgid "Plugins"
-msgstr "Ategion"
+#: projects/k3bvcdtrackdialog.cpp:632
+msgid "Resolution:"
+msgstr "Cydraniad:"
 
-#: option/k3boptiondialog.cpp:173
-msgid "K3b Plugin Configuration"
+#: projects/k3bvcdtrackdialog.cpp:633
+msgid "High resolution:"
 msgstr ""
 
-#: option/k3boptiondialog.cpp:182
-msgid "Themes"
-msgstr "Themâu"
-
-#: option/k3boptiondialog.cpp:183
-msgid "K3b GUI Themes"
+#: projects/k3bvcdtrackdialog.cpp:718
+msgid "ItSelf"
 msgstr ""
 
-#: option/k3boptiondialog.cpp:192 rip/k3baudiocdview.cpp:469
-msgid "CDDB"
-msgstr "CDDB"
-
-#: option/k3boptiondialog.cpp:193
-msgid "CDDB Audio CD Info Retrieval"
+#: projects/k3bvcdtrackdialog.cpp:721
+#, kde-format
+msgid "Segment-%1 - %2"
 msgstr ""
 
-#: option/k3boptiondialog.cpp:203
-msgid "Advanced Settings"
-msgstr "Gosodiadau Uwch"
-
-#: option/k3badvancedoptiontab.cpp:59
-msgid "Burning"
+#: projects/k3bvcdtrackdialog.cpp:723
+#, kde-format
+msgid "Sequence-%1 - %2"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:63
-msgid "Allow &overburning"
+#: projects/k3bdatamultisessioncombobox.cpp:36
+msgid "Select the Multisession Mode for the project."
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:64
-msgid "&Force unsafe operations"
+#: projects/k3bdatamultisessioncombobox.cpp:37
+msgid ""
+"<p><b>Multisession Mode</b><p><b>Auto</b><br>Let K3b decide which mode to "
+"use. The decision will be based on the size of the project (does it fill the "
+"whole media) and the state of the inserted media (appendable or "
+"not).<p><b>No Multisession</b><br>Create a single-session CD or DVD and "
+"close the disk.<p><b>Start Multisession</b><br>Start a multisession CD or "
+"DVD, not closing the disk to allow further sessions to be "
+"appended.<p><b>Continue Multisession</b><br>Continue an appendable data CD "
+"(as for example created in <em>Start Multisession</em> mode) and add another "
+"session without closing the disk to allow further sessions to be "
+"appended.<p><b>Finish Multisession</b><br>Continue an appendable data CD (as "
+"for example created in <em>Start Multisession</em> mode), add another "
+"session, and close the disk.<p><em>In the case of DVD+RW and DVD-RW "
+"restricted overwrite media K3b will not actually create multiple sessions "
+"but grow the file system to include the new data.</em>"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:65
-msgid "&Manual writing buffer size"
+#: projects/k3bdatamultisessioncombobox.cpp:74
+msgid "No Multisession"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:68
-msgid "Show &advanced GUI elements"
+#: projects/k3bdatamultisessioncombobox.cpp:76
+msgid "Start Multisession"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:77 rip/categories.cpp:23
-msgid "Miscellaneous"
+#: projects/k3bdatamultisessioncombobox.cpp:77
+msgid "Continue Multisession "
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:79
-msgid "Do not &eject medium after write process"
+#: projects/k3bdatamultisessioncombobox.cpp:78
+msgid "Finish Multisession "
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:81
-msgid "Automatically erase CD-RWs and DVD-RWs"
-msgstr ""
+#: projects/k3baudiotrackplayer.cpp:117 projects/k3baudiotrackplayer.cpp:176
+msgid "Play"
+msgstr "Chwarae"
 
-#: option/k3badvancedoptiontab.cpp:99
-msgid "Allow burning more than the official media capacities"
-msgstr ""
+#: projects/k3baudiotrackplayer.cpp:123 projects/k3baudiotrackplayer.cpp:178
+msgid "Pause"
+msgstr "Seibio"
 
-#: option/k3badvancedoptiontab.cpp:100
-msgid ""
-"Show advanced GUI elements like allowing to choose between cdrecord and "
-"cdrdao"
-msgstr ""
+#: projects/k3baudiotrackplayer.cpp:129
+msgid "Play/Pause"
+msgstr "Chwarae/Seibio"
 
-#: option/k3badvancedoptiontab.cpp:101
-msgid "Automatically erase CD-RWs and DVD-RWs without asking"
+#: projects/k3baudiotrackplayer.cpp:136 projects/k3baudiotrackplayer.cpp:177
+msgid "Stop"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:102
-msgid "Do not eject the burn medium after a completed burn process"
-msgstr ""
+#: projects/k3baudiotrackplayer.cpp:142 projects/k3baudiotrackplayer.cpp:179
+msgid "Next"
+msgstr "Nesaf"
 
-#: option/k3badvancedoptiontab.cpp:103
-msgid "Force K3b to continue some operations otherwise deemed as unsafe"
+#: projects/k3baudiotrackplayer.cpp:148
+msgid "Prev"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:105
-msgid ""
-"<p>If this option is checked additional GUI elements which allow to "
-"influence the behavior of K3b are shown. This includes the manual selection "
-"of the used burning tool. (Choose between cdrecord and cdrdao when writing a "
-"CD or between cdrecord and growisofs when writing a DVD/BD.)<p><b>Be aware "
-"that K3b does not support all possible tools in all project types and "
-"actions.</b>"
+#: projects/k3baudiotrackplayer.cpp:180
+msgid "Previous"
+msgstr "Cynt"
+
+#: projects/k3baudioburndialog.cpp:64
+#: projects/k3baudiotracktrmlookupdialog.cpp:124
+#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:70
+msgid "Audio Project"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:113
-msgid ""
-"<p>Each medium has an official maximum capacity which is stored in a read-"
-"only area of the medium and is guaranteed by the vendor. However, this "
-"official maximum is not always the actual maximum. Many media have an actual "
-"total capacity that is slightly larger than the official amount.<p>If this "
-"option is checked K3b will disable a safety check that prevents burning "
-"beyond the official capacity.<p><b>Caution:</b> Enabling this option can "
-"cause failures in the end of the burning process if K3b attempts to write "
-"beyond the official capacity. It makes sense to first determine the actual "
-"maximum capacity of the media brand with a simulated burn."
+#: projects/k3baudioburndialog.cpp:65 projects/k3bmixedburndialog.cpp:68
+#, kde-format
+msgid "1 track (%2 minutes)"
+msgid_plural "%1 tracks (%2 minutes)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/k3baudioburndialog.cpp:85
+msgid "Gimmicks"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:124
-msgid ""
-"<p>If this option is checked K3b will automatically erase CD-RWs and format "
-"DVD-RWs if one is found instead of an empty media before writing."
+#: projects/k3baudioburndialog.cpp:86
+msgid "Hide first track"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:128
-#, kde-format
-msgid ""
-"<p>K3b uses a software buffer during the burning process to avoid gaps in "
-"the data stream due to high system load. The default sizes used are %1 MB "
-"for CD and %2 MB for DVD burning.<p>If this option is checked the value "
-"specified will be used for both CD and DVD burning."
+#: projects/k3baudioburndialog.cpp:90
+msgid "Audio Ripping"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:134
-msgid ""
-"<p>If this option is checked K3b will not eject the medium once the burn "
-"process finishes. This can be helpful in case one leaves the computer after "
-"starting the burning and does not want the tray to be open all the "
-"time.<p>However, on Linux systems a freshly burned medium has to be "
-"reloaded. Otherwise the system will not detect the changes and still treat "
-"it as an empty medium."
+#: projects/k3baudioburndialog.cpp:115
+msgid "Hide the first track in the first pregap"
 msgstr ""
 
-#: option/k3badvancedoptiontab.cpp:140
+#: projects/k3baudioburndialog.cpp:120
 msgid ""
-"<p>If this option is checked K3b will continue in some situations which "
-"would otherwise be deemed as unsafe.<p>This setting for example disables the "
-"check for medium speed verification. Thus, one can force K3b to burn a high "
-"speed medium on a low speed writer.<p><b>Caution:</b> Enabling this option "
-"may result in damaged media."
+"<p>If this option is checked K3b will <em>hide</em> the first track.<p>The "
+"audio CD standard uses pregaps before every track on the CD. By default "
+"these last for 2 seconds and are silent. In DAO mode it is possible to have "
+"longer pregaps that contain some audio. In this case the first pregap will "
+"contain the complete first track.<p>You will need to seek back from the "
+"beginning of the CD to listen to the first track. Try it, it is quite "
+"amusing.<p><b>This feature is only available in DAO mode when writing with "
+"cdrdao."
 msgstr ""
 
-#: option/k3bexternalbinoptiontab.cpp:49
+#: projects/k3baudioburndialog.cpp:287
 msgid ""
-"Specify the paths to the external programs that K3b needs to work properly, "
-"or press \"Search\" to let K3b search for the programs."
+"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
+"uses <em>normalize-audio</em> (http://normalize.nongnu.org/) to normalize "
+"audio tracks. In order to use this functionality, please install it first. "
+"(sudo apt-get install normalize-audio) "
 msgstr ""
 
-#. i18n: file: option/base_k3bpluginoptiontab.ui:47
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: option/k3bpluginoptiontab.cpp:38 rc.cpp:565
+#: projects/k3baudioburndialog.cpp:294 projects/k3baudioburndialog.cpp:313
+#: projects/k3bmixedburndialog.cpp:300 projects/k3bmixedburndialog.cpp:319
 msgid ""
-"<p>Here all <em>K3b Plugins</em> may be configured. Be aware that this does "
-"not include the <em>KPart Plugins</em> which embed themselves in the K3b "
-"menu structure.</p>"
+"<p>K3b is not able to normalize audio tracks when burning on-the-fly. The "
+"external program used for this task only supports normalizing a set of audio "
+"files."
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:48 k3binteractiondialog.cpp:297
-msgid "Default Settings"
-msgstr "Gosodiadau Rhagosodedig"
-
-#: option/k3bmiscoptiontab.cpp:49
-msgid "Load the K3b Defaults at dialog startup."
+#: projects/k3baudioburndialog.cpp:298 projects/k3baudioburndialog.cpp:317
+#: projects/k3bmixedburndialog.cpp:304 projects/k3bmixedburndialog.cpp:323
+msgid "Disable normalization"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:51 k3binteractiondialog.cpp:298
-msgid "Saved Settings"
+#: projects/k3baudioburndialog.cpp:299 projects/k3baudioburndialog.cpp:318
+#: projects/k3bmixedburndialog.cpp:305 projects/k3bmixedburndialog.cpp:324
+msgid "Disable on-the-fly burning"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:52
-msgid "Load the settings saved by the user at dialog startup."
-msgstr ""
+#: projects/k3bfillstatusdisplay.cpp:217 projects/k3bfillstatusdisplay.cpp:613
+#: projects/k3bfillstatusdisplay.cpp:876
+msgid "min"
+msgstr "mun"
 
-#: option/k3bmiscoptiontab.cpp:54 k3binteractiondialog.cpp:299
-msgid "Last Used Settings"
+#: projects/k3bfillstatusdisplay.cpp:223
+#, kde-format
+msgid "Available: %1 of %2"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:55
-msgid "Load the last used settings at dialog startup."
+#: projects/k3bfillstatusdisplay.cpp:231
+#, kde-format
+msgid "Capacity exceeded by %1"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:56
-msgid ""
-"K3b handles three sets of settings in action dialogs (action dialogs include "
-"the CD Copy dialog or the Audio CD project dialog):"
-msgstr ""
+#: projects/k3bfillstatusdisplay.cpp:435
+msgid "Minutes"
+msgstr "Munudau"
 
-#: option/k3bmiscoptiontab.cpp:59
-msgid ""
-"One of these sets is loaded once an action dialog is opened. This setting "
-"defines which set it will be."
+#: projects/k3bfillstatusdisplay.cpp:437
+msgid "Megabytes"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:112
-#, kde-format
-msgid "Folder (%1) does not exist. Create?"
+#: projects/k3bfillstatusdisplay.cpp:440
+msgid "Automatic Size"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:113
-msgid "Create Folder"
-msgstr ""
+#: projects/k3bfillstatusdisplay.cpp:442 projects/k3bfillstatusdisplay.cpp:444
+#: projects/k3bfillstatusdisplay.cpp:446 projects/k3bfillstatusdisplay.cpp:526
+#: projects/k3bfillstatusdisplay.cpp:527 projects/k3bfillstatusdisplay.cpp:528
+#, kde-format
+msgid "%1 MB"
+msgstr "%1 MB"
 
-#: option/k3bmiscoptiontab.cpp:114
-msgid "Create"
-msgstr "Creu"
+#: projects/k3bfillstatusdisplay.cpp:458
+msgid "Custom..."
+msgstr "Addasu ..."
 
-#: option/k3bmiscoptiontab.cpp:117 rip/k3baudioprojectconvertingjob.cpp:187
-#: rip/k3baudioprojectconvertingjob.cpp:297 rip/k3baudioripjob.cpp:328
-#: rip/k3baudioripjob.cpp:439
-#, kde-format
-msgid "Unable to create folder %1"
+#: projects/k3bfillstatusdisplay.cpp:460
+msgid "From Medium..."
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:128
-msgid ""
-"You specified a file for the temporary folder. K3b will use its base path as "
-"the temporary folder."
+#: projects/k3bfillstatusdisplay.cpp:478
+msgid "User Defaults"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:130 misc/k3bimagewritingdialog.cpp:472
-msgid "Warning"
+#: projects/k3bfillstatusdisplay.cpp:481
+msgid "Save User Defaults"
 msgstr ""
 
-#: option/k3bmiscoptiontab.cpp:137
-#, kde-format
-msgid "You do not have permission to write to %1."
+#: projects/k3bfillstatusdisplay.cpp:485
+msgid "Why 4.4 instead of 4.7?"
 msgstr ""
 
-#: main.cpp:42
-msgid ""
-"<p>K3b is a full-featured CD/DVD/Blu-ray burning and ripping "
-"application.<br/>It supports a variety of project types as well as copying "
-"of optical media, burning of different types of images, and ripping Audio "
-"CDs, Video CDs, and Video DVDs.<br/>Its convenient user interface is "
-"targeted at all audiences, trying to be as simple as possible for novice "
-"users while also providing all features an advanced user might need."
+#: projects/k3bfillstatusdisplay.cpp:489
+msgid "Show Size In"
 msgstr ""
 
-#: main.cpp:53
-msgid "K3b"
-msgstr "K3b"
-
-#: main.cpp:55
-msgid "(C) 1998-2009 Sebastian Trüg"
+#: projects/k3bfillstatusdisplay.cpp:495
+msgid "CD Size"
 msgstr ""
 
-#: main.cpp:55
-msgid "http://www.k3b.org"
+#: projects/k3bfillstatusdisplay.cpp:501
+msgid "DVD Size"
 msgstr ""
 
-#: main.cpp:57
-msgid "Sebastian Trüg"
+#: projects/k3bfillstatusdisplay.cpp:507
+msgid "Blu-ray Size"
 msgstr ""
 
-#: main.cpp:57
-msgid "Maintainer and Lead Developer"
+#: projects/k3bfillstatusdisplay.cpp:538 projects/k3bfillstatusdisplay.cpp:539
+#: projects/k3bfillstatusdisplay.cpp:540
+#, kde-format
+msgid "unused"
+msgid_plural "%1 minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/k3bfillstatusdisplay.cpp:598
+msgid ""
+"<p><b>Why does K3b offer 4.4 GB and 8.0 GB instead of 4.7 and 8.5 like it "
+"says on the media?</b><p>A single layer DVD media has a capacity of "
+"approximately 4.4 GB which equals 4.4*1024<sup>3</sup> bytes. Media "
+"producers just calculate with 1000 instead of 1024 for advertising "
+"reasons.<br>This results in 4.4*1024<sup>3</sup>/1000<sup>3</sup> = 4.7 GB."
 msgstr ""
 
-#: main.cpp:58
-msgid "Michał Małek"
+#: projects/k3bfillstatusdisplay.cpp:611
+msgid "GB"
 msgstr ""
 
-#: main.cpp:58
-msgid "Developer"
-msgstr "Datblygwr"
+#: projects/k3bfillstatusdisplay.cpp:612 option/k3badvancedoptiontab.cpp:67
+msgid "MB"
+msgstr "MB"
 
-#: main.cpp:59
-msgid "Christian Kvasny"
+#: projects/k3bfillstatusdisplay.cpp:626
+msgid "Custom Size"
 msgstr ""
 
-#: main.cpp:59
-msgid "Video CD Project and Video CD ripping"
+#: projects/k3bfillstatusdisplay.cpp:627
+msgid ""
+"<p>Please specify the size of the medium. Use suffixes <b>GB</b>,<b>MB</b>, "
+"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and "
+"<em>minutes</em> respectively."
 msgstr ""
 
-#: main.cpp:60
-msgid "Montel Laurent"
+#: projects/k3bfillstatusdisplay.cpp:684
+msgid "Medium is not empty."
 msgstr ""
 
-#: main.cpp:60
-msgid "Initial port to KDE Platform 4"
+#: projects/k3bfillstatusdisplay.cpp:687
+msgid "No usable medium found."
 msgstr ""
 
-#: main.cpp:61
-msgid "Ralf Habacker"
+#: projects/k3bfillstatusdisplay.cpp:877
+msgid "Right click for media sizes"
 msgstr ""
 
-#: main.cpp:61
-msgid "Windows port"
+#: projects/k3bvideodvdview.cpp:58
+msgid ""
+"Be aware that you need to provide the complete Video DVD filestructure. K3b "
+"does not support video transcoding and preparation of video object files "
+"yet. That means you need to already have the VTS_X_YY.VOB and VTS_X_YY.IFO "
+"files."
 msgstr ""
 
-#: main.cpp:63
-msgid "Klaus-Dieter Krannich"
+#: projects/k3bvideodvdview.cpp:62
+msgid "K3b Video DVD Restrictions"
 msgstr ""
 
-#: main.cpp:63
-msgid "Advanced Cdrdao integration"
+#: projects/k3baudioview.cpp:136
+msgid ""
+"No audio decoder plugins found. You will not be able to add any files to the "
+"audio project."
 msgstr ""
 
-#: main.cpp:64
-msgid "Thomas Froescher"
+#: projects/k3bmovixoptionswidget.cpp:46 projects/k3bmovixoptionswidget.cpp:62
+msgid "default"
+msgstr "rhagosodiad"
+
+#: projects/k3bdataprojectmodel.cpp:282
+msgid "outside of project"
 msgstr ""
 
-#: main.cpp:65
-msgid "VideoDVD ripping and video encoding in pre-1.0 versions."
+#: projects/k3bdataprojectmodel.cpp:302
+msgctxt "file name"
+msgid "Name"
 msgstr ""
 
-#: main.cpp:67
-msgid "Alexis Younes aka Ayo"
+#: projects/k3bdataprojectmodel.cpp:304
+msgctxt "file type"
+msgid "Type"
 msgstr ""
 
-#: main.cpp:68
-msgid "For his bombastic artwork."
+#: projects/k3bdataprojectmodel.cpp:306
+msgctxt "file size"
+msgid "Size"
 msgstr ""
 
-#: main.cpp:70
-msgid "Christoph Thielecke"
+#. i18n: file: projects/base_k3bbootimageview.ui:85
+#. i18n: ectx: property (text), widget (K3ListView, m_viewImages)
+#: projects/k3bdataprojectmodel.cpp:308 rc.cpp:562
+msgid "Local Path"
 msgstr ""
 
-#: main.cpp:71
-msgid "For extensive testing and the first German translation."
+#: projects/k3bdataprojectmodel.cpp:310
+msgctxt "symbolic link target"
+msgid "Link"
 msgstr ""
 
-#: main.cpp:73
-msgid "Andy Polyakov"
+#: projects/k3baudiotrackview.cpp:193 projects/k3baudioviewimpl.cpp:48
+msgid "Add Silence..."
 msgstr ""
 
-#: main.cpp:74
-msgid "For the great dvd+rw-tools and the nice cooperation."
+#: projects/k3baudiotrackview.cpp:198 projects/k3baudioviewimpl.cpp:50
+msgid "Merge Tracks"
 msgstr ""
 
-#: main.cpp:76
-msgid "Roberto De Leo"
+#: projects/k3baudiotrackview.cpp:203 projects/k3baudioviewimpl.cpp:52
+msgid "Source to Track"
 msgstr ""
 
-#: main.cpp:77
-msgid "For the very cool eMovix package and his accommodating work."
+#: projects/k3baudiotrackview.cpp:208 projects/k3baudioviewimpl.cpp:54
+msgid "Split Track..."
 msgstr ""
 
-#: main.cpp:79
-msgid "John Steele Scott"
+#: projects/k3baudiotrackview.cpp:213 projects/k3baudioviewimpl.cpp:56
+msgid "Edit Source..."
 msgstr ""
 
-#: main.cpp:80
-msgid "For the flac decoding plugin."
+#: projects/k3baudiotrackview.cpp:222 projects/k3baudioviewimpl.cpp:60
+msgid "Musicbrainz Lookup"
 msgstr ""
 
-#: main.cpp:82
-msgid "György Szombathelyi"
+#: projects/k3baudiotrackview.cpp:226 projects/k3baudioviewimpl.cpp:62
+msgid "Try to determine meta information over the Internet"
 msgstr ""
 
-#: main.cpp:83
-msgid "For the very useful isofslib."
+#: projects/k3baudiotrackview.cpp:505 projects/k3baudioviewimpl.cpp:152
+msgid "Add Silence"
 msgstr ""
 
-#: main.cpp:85
-msgid "Erik de Castro Lopo"
+#: projects/k3baudiotrackview.cpp:509 projects/k3baudioviewimpl.cpp:156
+msgid "Length of silence:"
 msgstr ""
 
-#: main.cpp:86
-msgid ""
-"For libsamplerate which is used for generic resampling in the audio decoder "
-"framework."
+#: projects/k3baudiotrackview.cpp:598 projects/k3baudioviewimpl.cpp:243
+msgid "Edit Audio Track Source"
 msgstr ""
 
-#: main.cpp:88
-msgid "Jakob Petsovits"
+#: projects/k3baudiotrackview.cpp:739 projects/k3baudioviewimpl.cpp:281
+msgid "Please select an audio track."
 msgstr ""
 
-#: main.cpp:89
-msgid "For the very cool conditional audio ripping pattern."
+#: projects/k3bmusicbrainzjob.cpp:122
+#: projects/k3baudiotracktrmlookupdialog.cpp:48
+msgid "MusicBrainz Query"
 msgstr ""
 
-#: main.cpp:91
-msgid "Heiner Eichmann"
+#: projects/k3bmusicbrainzjob.cpp:123
+#, kde-format
+msgid "Found multiple matches for track %1 (%2). Please select one."
 msgstr ""
 
-#: main.cpp:92
-msgid "For his work on the BSD port and some great patches."
+#: projects/k3baudiodatasourceeditwidget.cpp:38
+msgid "Start Offset"
 msgstr ""
 
-#: main.cpp:94
-msgid "Adriaan De Groot"
+#: projects/k3baudiodatasourceeditwidget.cpp:39
+msgid "End Offset"
 msgstr ""
 
-#: main.cpp:95
-msgid "For his work on the BSD port."
+#: projects/k3baudiodatasourceeditwidget.cpp:62
+msgid ""
+"Drag the edges of the highlighted area to define the portion of the audio "
+"source you want to include in the Audio CD track. You can also use the input "
+"windows to fine-tune your selection."
 msgstr ""
 
-#: main.cpp:97
-msgid "Thiago Macieira"
+#: projects/k3baudiodatasourceeditwidget.cpp:102
+msgid "Used part of the audio source"
 msgstr ""
 
-#: main.cpp:98
-msgid "For his help with the many invalid k3b entries on bugs.kde.org."
+#: projects/k3bmovixburndialog.cpp:56
+msgid "eMovix Project"
 msgstr ""
 
-#: main.cpp:100
-msgid "Marcel Dierkes"
+#: projects/k3bmovixburndialog.cpp:57
+#, kde-format
+msgid "1 file (%2)"
+msgid_plural "%1 files (%2)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/k3bmovixburndialog.cpp:60
+msgid "eMovix"
 msgstr ""
 
-#: main.cpp:101
-msgid "For the great K3b icon eyecandy."
+#: projects/k3bmovixburndialog.cpp:64 projects/k3bdataburndialog.cpp:81
+#: projects/k3bvideodvdburndialog.cpp:60 projects/k3bmixedburndialog.cpp:80
+msgid "Filesystem"
 msgstr ""
 
-#: main.cpp:103
-msgid "Christoph Burger-Scheidlin"
+#: projects/k3bmovixburndialog.cpp:99 projects/k3bdataburndialog.cpp:156
+#: projects/k3bmixedburndialog.cpp:98
+msgid "Datatrack Mode"
 msgstr ""
 
-#: main.cpp:104
-msgid "For his neverending help cleaning out the K3b bug database."
-msgstr ""
-
-#: main.cpp:106
-msgid "Robert Wadley"
-msgstr ""
-
-#: main.cpp:107
-msgid ""
-"Rob created a great theme and came up with the idea for transparent themes."
+#: projects/k3bmovixburndialog.cpp:104
+msgid "Multisession"
 msgstr ""
 
-#: main.cpp:109
-msgid "Dmitry Novikov"
-msgstr ""
+#. i18n: file: option/base_k3bmiscoptiontab.ui:12
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: projects/k3bmovixburndialog.cpp:113 projects/k3bdataburndialog.cpp:170
+#: projects/k3bvcdburndialog.cpp:366 projects/k3bmixedburndialog.cpp:101
+#: projects/k3bmixedburndialog.cpp:144 rc.cpp:801
+#: option/k3boptiondialog.cpp:132
+msgid "Misc"
+msgstr "Amrywiol"
 
-#: main.cpp:110
-msgid "For the amazing K3b 1.0 theme."
+#: projects/k3bmovixburndialog.cpp:200
+msgid "Could not find a valid eMovix installation."
 msgstr ""
 
-#: main.cpp:112
-msgid "Jeremy C. Andrus"
+#: projects/k3bmovixburndialog.cpp:227 projects/k3bdataburndialog.cpp:199
+msgid "Most writers do not support writing multisession CDs in DAO mode."
 msgstr ""
 
-#: main.cpp:113
-msgid "First Windows port of libk3bdevice."
+#: projects/k3bdataview.cpp:133 projects/k3baudioviewimpl.cpp:349
+#: projects/k3bview.cpp:91
+msgid "Please add files to your project first."
 msgstr ""
 
-#: main.cpp:117
-msgid "file(s) to open"
+#: projects/k3bdataview.cpp:134 projects/k3bmixedview.cpp:125
+#: projects/k3bview.cpp:92
+msgid "No Data to Burn"
 msgstr ""
 
-#: main.cpp:118
-msgid "Create a new data CD project and add all given files"
+#: projects/k3baudiotracktrmlookupdialog.cpp:122
+#, kde-format
+msgid "Track %1 was not found in the MusicBrainz database."
 msgstr ""
 
-#: main.cpp:119
-msgid "Create a new audio CD project and add all given files"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:68
+msgid "Custom Data Project Filesystems"
 msgstr ""
 
-#: main.cpp:120
-msgid "Create a new video CD project and add all given files"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:73
+msgid "Set special ISO9660 Filesystem preferences."
 msgstr ""
 
-#: main.cpp:121
-msgid "Create a new mixed mode CD project and add all given files"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:80
+msgid "IS09660 Settings"
 msgstr ""
 
-#: main.cpp:122
-msgid "Create a new eMovix CD project and add all given files"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:84
+msgid "Rock Ridge Settings"
 msgstr ""
 
-#: main.cpp:123
-msgid "Create a new Video DVD project and add all given files"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:88
+msgid "Joliet Settings"
 msgstr ""
 
-#: main.cpp:124
-msgid "Open the project burn dialog for the current project"
-msgstr ""
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:92
+msgid "Misc Settings"
+msgstr "Gosodiadau Amrywiol"
 
-#: main.cpp:125
-msgid "Open the copy dialog, optionally specify the source device"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:97
+msgid "Allow untranslated ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:126
-msgid "Write an image to a CD or DVD"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:100
+msgid "Allow max length ISO9660 filenames (37 characters)"
 msgstr ""
 
-#: main.cpp:127
-msgid "Format a rewritable medium"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:103
+msgid "Allow full ASCII charset for ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:128
-msgid "Extract Audio tracks digitally (+encoding)"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:106
+msgid "Allow ~ and # in ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:129
-msgid "Rip Video DVD Titles (+transcoding)"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:109
+msgid "Allow lowercase characters in ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:130
-msgid "Rip Video CD Tracks"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:112
+msgid "Allow multiple dots in ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:131
-msgid "Set the GUI language"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:115
+msgid "Allow 31 character ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:132
-msgid "Disable the splash screen"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:118
+msgid "Allow leading period in ISO9660 filenames"
 msgstr ""
 
-#: main.cpp:133
-msgid ""
-"Set the device to be used for new projects. (This option has no effect: its "
-"main purpose is to enable handling of empty media from the KDE Media "
-"Manager.)"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:121
+msgid "Omit version numbers in ISO9660 filenames"
 msgstr ""
 
-#: k3bwelcomewidget.cpp:86
-msgid "More actions..."
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:124
+msgid "Omit trailing period in ISO9660 filenames"
 msgstr ""
 
-#: k3bwelcomewidget.cpp:263
-msgid "Welcome to K3b - The CD and DVD Kreator"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:130
+msgid "ISO Level"
 msgstr ""
 
-#: k3bwelcomewidget.cpp:397
-msgid "Add Button"
-msgstr ""
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:133
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:136
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:139
+#, kde-format
+msgid "Level %1"
+msgstr "Lefel %1"
 
-#: k3bwelcomewidget.cpp:420
-msgid "Remove Button"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:146
+msgid "Allow 103 character Joliet filenames"
 msgstr ""
 
-#: k3bpassivepopup.cpp:133
-msgid "Keep Open"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:151
+msgid "Create TRANS.TBL files"
 msgstr ""
 
-#: rip/categories.cpp:22
-msgid "Blues"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:154
+msgid "Hide TRANS.TBL files in Joliet"
 msgstr ""
 
-#: rip/categories.cpp:22
-msgid "Classical"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:163
+msgid "Do not cache inodes"
 msgstr ""
 
-#: rip/categories.cpp:22
-msgctxt "music genre"
-msgid "Country"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:167
+msgid "Do not import previous session"
 msgstr ""
 
-#: rip/categories.cpp:23 rip/k3baudiorippingdialog.cpp:413
-#: k3bdiskinfoview.cpp:190 misc/k3bmediacopydialog.cpp:163
-msgid "Data"
-msgstr "Data"
-
-#: rip/categories.cpp:23
-msgid "Folk"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:284
+msgid "Force all options below"
 msgstr ""
 
-#: rip/categories.cpp:23
-msgid "Jazz"
+#: projects/k3bdataadvancedimagesettingsdialog.cpp:289
+msgid ""
+"<p>Set the ISO-9660 conformance level.\n"
+"<ul>\n"
+"<li>Level 1: Files may only consist of one section and filenames are "
+"restricted to 8.3 characters.</li>\n"
+"<li>Level 2: Files may only consist of one section.</li>\n"
+"<li>Level 3: No restrictions.</li>\n"
+"</ul>\n"
+"<p>With all ISO-9660 levels, all filenames are restricted to upper case "
+"letters, numbers and the underscore (_). The maximum filename length is 31 "
+"characters, the directory nesting level is restricted to 8 and the maximum "
+"path length is limited to 255 characters. (These restrictions may be "
+"violated with the additional ISO-9660 features K3b offers.)"
 msgstr ""
 
-#: rip/categories.cpp:24
-msgid "New Age"
+#: projects/k3baudiotrackaddingdialog.cpp:58
+msgid "Please be patient..."
 msgstr ""
 
-#: rip/categories.cpp:24
-msgid "Reggae"
+#: projects/k3baudiotrackaddingdialog.cpp:62
+#, kde-format
+msgid "Adding files to project \"%1\"..."
 msgstr ""
 
-#: rip/categories.cpp:24
-msgid "Rock"
+#: projects/k3baudiotrackaddingdialog.cpp:92
+msgid "Unable to handle the following files due to an unsupported format"
 msgstr ""
 
-#: rip/categories.cpp:24
-msgid "Soundtrack"
+#: projects/k3baudiotrackaddingdialog.cpp:93
+msgid ""
+"You may manually convert these audio files to wave using another application "
+"supporting the audio format and then add the wave files to the K3b project."
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:199
-msgid "Item Name"
+#: projects/k3baudiotrackaddingdialog.cpp:153
+#, kde-format
+msgid "Analysing file '%1'..."
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:200
-msgid "Extracted Name"
+#: projects/k3bdatapropertiesdialog.cpp:47
+msgid "File Properties"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:201 rip/k3baudiotrackmodel.cpp:164
-#: rip/k3baudiorippingdialog.cpp:143
-#: rip/k3baudioprojectconvertingdialog.cpp:127 k3bdiskinfoview.cpp:256
-#: k3baudioplayer.cpp:120
-msgid "Length"
-msgstr "Hyd"
-
-#. i18n: file: projects/base_k3bbootimageview.ui:74
-#. i18n: ectx: property (text), widget (K3ListView, m_viewImages)
-#: rip/k3bvideocdview.cpp:202 rc.cpp:357
-msgid "Size"
-msgstr "Maint"
+#: projects/k3bdatapropertiesdialog.cpp:92
+msgid "Location:"
+msgstr "Lleoliad:"
 
-#: rip/k3bvideocdview.cpp:267 rip/k3bvideocdview.cpp:444
-msgid "Video CD MPEG tracks"
+#: projects/k3bdatapropertiesdialog.cpp:96
+msgid "Used blocks:"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:268
-msgid "Video CD DATA track"
+#: projects/k3bdatapropertiesdialog.cpp:105
+msgid "Local name:"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:286
-#, kde-format
-msgid "Sequence-%1"
+#: projects/k3bdatapropertiesdialog.cpp:108
+msgid "Local location:"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:291 rip/k3bvideocdview.cpp:337
-#: rip/k3bvideocdview.cpp:448
-msgid "Files"
+#: projects/k3bdatapropertiesdialog.cpp:129
+msgid "Hide on Rockridge"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:292 rip/k3bvideocdview.cpp:452
-msgid "Segments"
-msgstr "Cylchrannau"
-
-#: rip/k3bvideocdview.cpp:368 rip/k3baudiocdview.cpp:218
-#: rip/k3baudiorippingdialog.cpp:124
-#: rip/k3baudioprojectconvertingdialog.cpp:106
-#, kde-format
-msgid "1 track (%2)"
-msgid_plural "%1 tracks (%2)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rip/k3bvideocdview.cpp:376 rip/videodvd/k3bvideodvdrippingview.cpp:285
-#: rip/k3baudiocdview.cpp:249
-msgid "Check All"
+#: projects/k3bdatapropertiesdialog.cpp:130
+msgid "Hide on Joliet"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:379 rip/videodvd/k3bvideodvdrippingview.cpp:290
-#: rip/k3baudiocdview.cpp:251
-msgid "Uncheck All"
+#: projects/k3bdatapropertiesdialog.cpp:142
+msgid "Sort weight:"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:382 rip/videodvd/k3bvideodvdrippingview.cpp:295
-#: rip/k3baudiocdview.cpp:253
-msgid "Check Track"
+#: projects/k3bdatapropertiesdialog.cpp:161
+msgid "Hide this file in the RockRidge filesystem"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:385 rip/videodvd/k3bvideodvdrippingview.cpp:300
-#: rip/k3baudiocdview.cpp:255
-msgid "Uncheck Track"
+#: projects/k3bdatapropertiesdialog.cpp:162
+msgid "Hide this file in the Joliet filesystem"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:388 rip/videodvd/k3bvideodvdrippingview.cpp:305
-#: rip/k3baudiocdview.cpp:261 rip/k3baudiorippingdialog.cpp:200
-#: rip/k3bvideocdrippingdialog.cpp:118
-msgid "Start Ripping"
+#: projects/k3bdatapropertiesdialog.cpp:163
+msgid "Modify the physical sorting"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:391
-msgid "View Files"
+#: projects/k3bdatapropertiesdialog.cpp:164
+msgid ""
+"<p>If this option is checked, the file or folder (and its entire contents) "
+"will be hidden on the ISO9660 and RockRidge filesystem.</p><p>This is "
+"useful, for example, for having different README files for RockRidge and "
+"Joliet, which can be managed by hiding README.joliet on RockRidge and "
+"README.rr on the Joliet filesystem.</p>"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:393
-msgid "View plain data files"
+#: projects/k3bdatapropertiesdialog.cpp:171
+msgid ""
+"<p>If this option is checked, the file or folder (and its entire contents) "
+"will be hidden on the Joliet filesystem.</p><p>This is useful, for example, "
+"for having different README files for RockRidge and Joliet, which can be "
+"managed by hiding README.joliet on RockRidge and README.rr on the Joliet "
+"filesystem.</p>"
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:460 rip/k3baudiocdview.cpp:306
-msgid "Please select the tracks to rip."
+#: projects/k3bdatapropertiesdialog.cpp:178
+msgid ""
+"<p>This value modifies the physical sort order of the files in the ISO9660 "
+"filesystem. A higher weighting means that the file will be located closer to "
+"the beginning of the image (and the disk).<p>This option is useful in order "
+"to optimize the data layout on a medium.<p><b>Caution:</b> This does not "
+"sort the order of the file names that appear in the ISO9660 folder. It sorts "
+"the order in which the file data is written to the image."
 msgstr ""
 
-#: rip/k3bvideocdview.cpp:460 rip/k3baudiocdview.cpp:307
-msgid "No Tracks Selected"
+#: projects/k3bdatapropertiesdialog.cpp:205
+#: projects/k3bmovixprojectmodel.cpp:270
+#, kde-format
+msgid "Link to %1"
 msgstr ""
 
-#: rip/k3bpatternparser.cpp:124 rip/k3bpatternparser.cpp:160
-#: rip/k3bpatternparser.cpp:168 rip/videodvd/k3bvideodvdrippingwidget.cpp:285
-#: rip/k3baudioconvertingoptionwidget.cpp:222
-#: rip/k3baudioconvertingoptionwidget.cpp:256
-#: rip/k3baudiorippingdialog.cpp:357 rip/k3baudiorippingdialog.cpp:412
-#: rip/k3baudioprojectconvertingdialog.cpp:282
-#: rip/k3baudioprojectconvertingdialog.cpp:321 k3bdiskinfoview.cpp:299
-msgid "unknown"
-msgstr "anhysbys"
+#: projects/k3bdatapropertiesdialog.cpp:216
+msgid "Folder"
+msgstr ""
 
-#: rip/k3bpatternparser.cpp:133
+#: projects/k3bdatapropertiesdialog.cpp:223
 #, kde-format
-msgid "Track %1"
-msgstr ""
+msgid "in 1 file"
+msgid_plural "in %1 files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: rip/k3bvideocdrip.cpp:62
-msgid "Job canceled by user."
-msgstr ""
+#: projects/k3bdatapropertiesdialog.cpp:224
+#, kde-format
+msgid "and 1 folder"
+msgid_plural "and %1 folders"
+msgstr[0] ""
+msgstr[1] ""
 
-#: rip/k3bvideocdrip.cpp:91
-msgid "Check files"
+#: projects/k3bdatapropertiesdialog.cpp:228
+msgid "Special file"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:101
+#: projects/k3bdatapropertiesdialog.cpp:290
 #, kde-format
-msgid "Could not find %1 executable."
-msgstr ""
+msgid "1 Item"
+msgid_plural "%1 Items"
+msgstr[0] ""
+msgstr[1] ""
 
-#: rip/k3bvideocdrip.cpp:102
+#: projects/k3bdatapropertiesdialog.cpp:293
 #, kde-format
-msgid "To rip VideoCD's you must install VcdImager Version %1."
-msgstr ""
+msgid "1 File"
+msgid_plural "%1 Files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: rip/k3bvideocdrip.cpp:103 rip/k3bvideocdrip.cpp:112
+#: projects/k3bdatapropertiesdialog.cpp:298
+#, kde-format
+msgid "1 Folder"
+msgid_plural "%1 Folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/k3bdatamultisessionimportdialog.cpp:98
 msgid ""
-"You can find this on your distribution disks or download it from "
-"http://www.vcdimager.org"
+"<p>K3b found session containing Joliet information for long filenames but no "
+"Rock Ridge extensions.<p>The filenames in the imported session will be "
+"converted to a restricted character set in the new session. This character "
+"set is based on the ISO9660 settings in the K3b project. K3b is not able to "
+"display these converted filenames yet."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:111
-#, kde-format
-msgid "%1 executable too old: need version %2 or greater."
+#: projects/k3bdatamultisessionimportdialog.cpp:103
+msgid "Session Import Warning"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:119
-#, kde-format
-msgid "Using %1 %2 - Copyright (C) %3"
+#: projects/k3bdatamultisessionimportdialog.cpp:163
+msgid "Please insert an appendable medium"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:170
-msgid "Extracting"
-msgstr ""
+#: projects/k3bdatamultisessionimportdialog.cpp:210
+#, kde-format
+msgid "1 audio track"
+msgid_plural "%1 audio tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: rip/k3bvideocdrip.cpp:171
-msgid "Start extracting."
+#: projects/k3bdatamultisessionimportdialog.cpp:273
+msgid "Session Import"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:172
-#, kde-format
-msgid "Extract files from %1 to %2."
+#: projects/k3bdatamultisessionimportdialog.cpp:277
+msgid "Please select a session to import."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:177
-#, kde-format
-msgid "Could not start %1."
+#: projects/k3bmixedview.cpp:124
+msgid "Please add files and audio titles to your project first."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:267
-msgid "Files successfully extracted."
+#: projects/k3bdataimagesettingswidget.cpp:45
+msgid "Linux/Unix only"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:270
-#, kde-format
-msgid "%1 returned an unknown error (code %2)."
+#: projects/k3bdataimagesettingswidget.cpp:46
+msgid "Linux/Unix + Windows"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:271
-msgid "Please send me an email with the last output..."
+#: projects/k3bdataimagesettingswidget.cpp:47
+msgid "Very large files (UDF)"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:277
-#, kde-format
-msgid "%1 did not exit cleanly."
+#: projects/k3bdataimagesettingswidget.cpp:48
+msgid "DOS Compatibility"
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:291
-#, kde-format
-msgid "%1 encountered non-form2 sector"
+#: projects/k3bdataimagesettingswidget.cpp:146
+msgid ""
+"<p><b>File System Presets</b><p>K3b provides the following file system "
+"Presets which allow for a quick selection of the most frequently used "
+"settings."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:292
-msgid "leaving loop"
+#: projects/k3bdataimagesettingswidget.cpp:150
+msgid ""
+"The file system is optimized for usage on Linux/Unix systems. This mainly "
+"means that it uses the Rock Ridge extensions to provide long filenames, "
+"symbolic links, and POSIX compatible file permissions."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:300
-msgid "detected extended VCD2.0 PBC files"
+#: projects/k3bdataimagesettingswidget.cpp:154
+msgid ""
+"In addition to the settings for Linux/Unix the file system contains a Joliet "
+"tree which allows for long file names on Windows which does not support the "
+"Rock Ridge extensions. Be aware that the file name length is restricted to "
+"103 characters."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:327 rip/k3bvideocdrip.cpp:345
-#, kde-format
-msgid "Extracting %1"
+#: projects/k3bdataimagesettingswidget.cpp:158
+msgid ""
+"The file system has additional UDF entries attached to it. This raises the "
+"maximal file size to 4 GB. Be aware that the UDF support in K3b is limited."
 msgstr ""
 
-#: rip/k3bvideocdrip.cpp:338
-#, kde-format
-msgid "Extracting %1 to %2"
+#: projects/k3bdataimagesettingswidget.cpp:161
+msgid ""
+"The file system is optimized for compatibility with old systems. That means "
+"file names are restricted to 8.3 characters and no symbolic links or file "
+"permissions are supported."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:153
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:175
-msgid "Video DVD Ripping"
+#: projects/k3bdataimagesettingswidget.cpp:216
+msgid "Rock Ridge"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:176
-#, kde-format
-msgid "1 title from %2"
-msgid_plural "%1 titles from %2"
-msgstr[0] ""
-msgstr[1] ""
+#: projects/k3bdataimagesettingswidget.cpp:218
+msgid "Joliet"
+msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:199
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:221
-#, kde-format
-msgid "Title %1 (%2)"
+#: projects/k3bdataimagesettingswidget.cpp:220
+msgid "UDF"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:230
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:53
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:77
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:102
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:127
-msgid "unknown language"
+#: projects/k3bdataimagesettingswidget.cpp:222
+msgid "Custom (ISO9660 only)"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:226
+#: projects/k3bdataimagesettingswidget.cpp:224
 #, kde-format
-msgid "%1 %2Ch (%3%4)"
+msgid "Custom (%1)"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:241
-msgid "not supported"
+#: projects/k3bdataimagesettingswidget.cpp:241
+msgid ""
+"<p>Be aware that it is not recommended to disable the Rock Ridge Extensions. "
+"There is no disadvantage in enabling Rock Ridge (except for a very small "
+"space overhead) but a lot of advantages.<p>Without Rock Ridge Extensions "
+"symbolic links are not supported and will always be followed as if the "
+"\"Follow Symbolic Links\" option was enabled."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:455
-#, kde-format, no-c-format
-msgctxt "Ch is short for Channels"
-msgid "%1Ch"
-msgid_plural "%1Ch"
-msgstr[0] ""
-msgstr[1] ""
+#: projects/k3bdataimagesettingswidget.cpp:247
+msgid "Rock Ridge Extensions Disabled"
+msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:549
+#: projects/k3bdataimagesettingswidget.cpp:253
 msgid ""
-"<p>When using the <em>AC3 pass-through</em> audio codec all selected audio "
-"streams need to be in AC3 format. Please select another audio codec or "
-"choose AC3 audio streams for all ripped titles."
+"<p>Be aware that without the Joliet extensions Windows systems will not be "
+"able to display long filenames. You will only see the ISO9660 "
+"filenames.<p>If you do not intend to use the CD/DVD on a Windows system it "
+"is safe to disable Joliet."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:552
-msgid "AC3 Pass-through"
+#: projects/k3bdataimagesettingswidget.cpp:258
+msgid "Joliet Extensions Disabled"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:568
-#: rip/k3baudiorippingdialog.cpp:264
-#: rip/k3baudioprojectconvertingdialog.cpp:201
-msgid "Do you want to overwrite these files?"
+#: projects/k3baudiotrackdialog.cpp:45
+msgid "Audio Track Properties"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingdialog.cpp:570
-#: rip/k3baudiorippingdialog.cpp:266 rip/k3bvideocdrippingdialog.cpp:175
-#: rip/k3baudioprojectconvertingdialog.cpp:203
-msgid "Files Exist"
+#: projects/k3bbootimagedialog.cpp:27
+msgid "Boot Images"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:110
-msgid "Ripping Video DVD Titles"
+#: projects/k3bdataburndialog.cpp:70
+msgid "Data Project"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:116
-#, kde-format
-msgid "Transcoding 1 title to %2/%3"
-msgid_plural "Transcoding %1 titles to %2/%3"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:145
+#: projects/k3bdataburndialog.cpp:70 projects/k3bvideodvdburndialog.cpp:47
 #, kde-format
-msgid "Successfully ripped title %1 to '%2'"
-msgstr ""
+msgid "Size: %1"
+msgstr "Maint: %1"
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:150
-#, kde-format
-msgid "Failed to rip title %1"
+#: projects/k3bdataburndialog.cpp:161
+msgid "Multisession Mode"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:180
-#, kde-format
-msgid "Determined clipping values for title %1"
+#: projects/k3bdataburndialog.cpp:262
+msgid ""
+"It is not possible to write multisession media in DAO mode. Multisession has "
+"been disabled."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:181
-#, kde-format
-msgid "Top: %1, Bottom: %2"
+#: projects/k3bdataburndialog.cpp:264
+msgid "Multisession Problem"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:182
-#, kde-format
-msgid "Left: %1, Right: %2"
+#: projects/k3bmovixview.cpp:59
+msgid "Remove Subtitle File"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:189
-msgid "Insane clipping values. No clipping will be done at all."
+#: projects/k3bmovixview.cpp:62
+msgid "Add Subtitle File..."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingjob.cpp:199
-#, kde-format
-msgid "Failed to determine clipping values for title %1"
+#: projects/k3bmovixview.cpp:144
+msgid "K3b currently only supports local files."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:68
-msgid "Keep original dimensions"
+#: projects/k3bvcdburndialog.cpp:64
+msgid "Video CD (Version 1.1)"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:69
-msgid "640x? (automatic height)"
+#: projects/k3bvcdburndialog.cpp:66
+msgid "Video CD (Version 2.0)"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:70
-msgid "320x? (automatic height)"
+#: projects/k3bvcdburndialog.cpp:68
+msgid "Super Video CD"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:83
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:92
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:307
-msgid "Title"
-msgstr "Teitl"
-
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:84
-msgid "Video Size"
+#: projects/k3bvcdburndialog.cpp:70
+msgid "High-Quality Video CD"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:85
-#: rip/k3baudiorippingdialog.cpp:144
-#: rip/k3baudioprojectconvertingdialog.cpp:128
-msgid "File Size"
-msgstr "Maint Ffeil"
+#: projects/k3bvcdburndialog.cpp:75
+#, kde-format
+msgid "1 MPEG (%2)"
+msgid_plural "%1 MPEGs (%2)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:100
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:64
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:67
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:70
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:164
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:165
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:166
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:248
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:249
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:250
+#: projects/k3bvcdburndialog.cpp:101 projects/k3bvcdburndialog.cpp:102
+#: projects/k3bvcdburndialog.cpp:103 projects/k3bvcdburndialog.cpp:104
 #, kde-format
-msgid "%1 kbps"
+msgid "Select Video CD type %1"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:194
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:195
-msgid "auto"
-msgstr "ymysgogol"
-
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:294
-msgid ""
-"<p><b>Pattern special strings:</b><p>The following strings will be replaced "
-"with their respective meaning in every track name.<br><p><table "
-"border=\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em><"
-"/td></tr><tr><td>%t</td><td>title number</td><td>%{t} or "
-"%{title_number}</td></tr><tr><td>%i</td><td>volume id (mostly the name of "
-"the Video DVD)</td><td>%{i} or "
-"%{volume_id}</td></tr><tr><td>%b</td><td>beautified volume id</td><td>%{b} "
-"or %{beautified_volume_id}</td></tr><tr><td>%l</td><td>two chars language "
-"code</td><td>%{l} or %{lang_code}</td></tr><tr><td>%n</td><td>language "
-"name</td><td>%{n} or %{lang_name}</td></tr><tr><td>%a</td><td>audio format "
-"(on the Video DVD)</td><td>%{a} or "
-"%{audio_format}</td></tr><tr><td>%c</td><td>number of audio channels (on the "
-"Video DVD)</td><td>%{c} or %{channels}</td></tr><tr><td>%v</td><td>size of "
-"the original video</td><td>%{v} or "
-"%{orig_video_size}</td></tr><tr><td>%s</td><td>size of the resulting video "
-"(<em>Caution: auto-clipping values are not taken into "
-"account.</em>)</td><td>%{s} or "
-"%{video_size}</td></tr><tr><td>%r</td><td>aspect ratio of the original "
-"video</td><td>%{r} or %{aspect_ratio}</td></tr><tr><td>%d</td><td>current "
-"date</td><td>%{d} or %{date}</td></tr></table><p><em>Hint: K3b also accepts "
-"slight variations of the long special strings. One can, for example, leave "
-"out the underscores.</em>"
+#: projects/k3bvcdburndialog.cpp:105
+msgid "Automatic video type recognition."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:347
-msgid "Video Picture Size"
+#: projects/k3bvcdburndialog.cpp:106
+msgid "Non-compliant compatibility mode for broken devices"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:351
-msgid ""
-"<p>Please choose the width and height of the resulting video. If one value "
-"is set to <em>Auto</em> K3b will choose this value depending on the aspect "
-"ratio of the video picture.<br>Be aware that setting both the width and the "
-"height to fixed values will result in no aspect ratio correction being "
-"performed."
+#: projects/k3bvcdburndialog.cpp:107
+msgid "Chinese VCD3.0 track interpretation"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:365
-msgid "Width"
+#: projects/k3bvcdburndialog.cpp:108
+msgid "Use 2336 byte sectors for output"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingwidget.cpp:367
-msgid "Height"
+#: projects/k3bvcdburndialog.cpp:110
+msgid "Specify ISO volume label for Video CD"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:49
-#, kde-format
-msgid "%1 %2Ch (%3)"
+#: projects/k3bvcdburndialog.cpp:111
+msgid "Specify album id for VideoCD set"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:60
-msgid "No audio streams"
+#: projects/k3bvcdburndialog.cpp:112
+msgid "Specify album set sequence number ( <= volume-count )"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:68
-msgid "Audio Streams"
+#: projects/k3bvcdburndialog.cpp:113
+msgid "Specify number of volumes in album set"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:73
-#, kde-format
-msgid "%1 %2Ch (%3<em>%4</em>)"
+#: projects/k3bvcdburndialog.cpp:114
+msgid "Enable CD-i Application Support for VideoCD Type 1.1 & 2.0"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:99
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:124
-msgid "RLE"
+#: projects/k3bvcdburndialog.cpp:115
+msgid "Configuration parameters (only for VCD 2.0)"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:100
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:125
-msgid "Extended"
+#: projects/k3bvcdburndialog.cpp:118
+msgid "Add always an empty `/SEGMENT' folder"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:109
-msgid "No Subpicture streams"
+#: projects/k3bvcdburndialog.cpp:119
+msgid "This controls whether APS constraints are strict or relaxed. "
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:117
-msgid "Subpicture Streams"
+#: projects/k3bvcdburndialog.cpp:120
+msgid ""
+"This controls whether to update the scan data information contained in the "
+"MPEG-2 video streams."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:227
-msgid "MPEG1"
+#: projects/k3bvcdburndialog.cpp:121
+msgid ""
+"This element allows to set viewing restrictions which may be interpreted by "
+"the playing device."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:227
-msgid "MPEG2"
+#: projects/k3bvcdburndialog.cpp:123
+msgid "This option allows customization of Gaps and Margins."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:257
-#, kde-format
-msgid "%1 chapter"
-msgid_plural "%1 chapters"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:267
-msgid "letterboxed"
+#: projects/k3bvcdburndialog.cpp:124
+msgid ""
+"Used to set the number of empty sectors added before the lead-out area "
+"begins."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:269
-msgid "anamorph"
+#: projects/k3bvcdburndialog.cpp:125
+msgid "Used to set the track pre-gap for all tracks in sectors globally."
 msgstr ""
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:74
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:309 rc.cpp:583
-msgid "Preview"
-msgstr "Rhagolwg"
-
-#: rip/videodvd/k3bvideodvdtitlemodel.cpp:315
-msgid "Subpicture"
+#: projects/k3bvcdburndialog.cpp:126
+msgid "Sets the front margin for sequence items."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingview.cpp:79
-msgid "Show files"
+#: projects/k3bvcdburndialog.cpp:127
+msgid "Sets the rear margin for sequence items."
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingview.cpp:80
+#: projects/k3bvcdburndialog.cpp:131
 msgid ""
-"Shows plain Video DVD vob files from the DVD (including decryption) for "
-"further processing with another application"
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:140
-msgid "Please select the titles to rip."
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:141
-msgid "No Titles Selected"
+"<p>This is the most basic <b>Video CD</b> specification dating back to 1993, "
+"which has the following characteristics:<ul><li>One mode2 mixed form ISO-"
+"9660 track containing file pointers to the information areas.</li><li>Up to "
+"98 multiplex-ed MPEG-1 audio/video streams or CD-DA audio tracks.</li><li>Up "
+"to 500 MPEG sequence entry points used as chapter divisions.</li></ul><p>The "
+"Video CD specification requires the multiplex-ed MPEG-1 stream to have a CBR "
+"of less than 174300 bytes (1394400 bits) per second in order to accommodate "
+"single speed CD-ROM drives.<br>The specification allows for the following "
+"two resolutions:<ul><li>352 x 240 @ 29.97 Hz (NTSC SIF).</li><li>352 x 240 @ "
+"23.976 Hz (FILM SIF).</li></ul><p>The CBR MPEG-1, layer II audio stream is "
+"fixed at 224 kbps with 1 stereo or 2 mono channels.<p><b>It is recommended "
+"to keep the video bit-rate under 1151929.1 bps.</b>"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingview.cpp:192
-#, kde-format
+#: projects/k3bvcdburndialog.cpp:142
 msgid ""
-"K3b was unable to unmount device '%1' containing medium '%2'. Video DVD "
-"ripping will not work if the device is mounted. Please unmount manually."
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:197
-msgid "Unmounting failed"
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:207
-msgid ""
-"<p>Unable to read Video DVD contents: Found encrypted Video DVD.<p>Install "
-"<i>libdvdcss</i> to get Video DVD decryption support."
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:218
-msgid "Video DVD"
+"<p>About two years after the Video CD 1.1 specification came out, an "
+"improved <b>Video CD 2.0</b> standard was published in 1995.<p>This one "
+"added the following items to the features already available in the Video CD "
+"1.1 specification:<ul><li>Support for MPEG segment play items "
+"(<b>\"SPI\"</b>), consisting of still pictures, motion pictures and/or audio "
+"(only) streams was added.</li><li>Note Segment Items::.</li><li>Support for "
+"interactive playback control (<b>\"PBC\"</b>) was added.</li><li>Support for "
+"playing related access by providing a scan point index file was added. "
+"(<b>\"/EXT/SCANDATA.DAT\"</b>)</li><li>Support for closed "
+"captions.</li><li>Support for mixing NTSC and PAL content.</li></ul><p>By "
+"adding PAL support to the Video CD 1.1 specification, the following "
+"resolutions became available:<ul><li>352 x 240 @ 29.97 Hz (NTSC "
+"SIF).</li><li>352 x 240 @ 23.976 Hz (FILM SIF).</li><li>352 x 288 @ 25 Hz "
+"(PAL SIF).</li></ul><p>For segment play items the following audio encodings "
+"became available:<ul><li>Joint stereo, stereo or dual channel audio streams "
+"at 128, 192, 224 or 384 kbit/sec bit-rate.</li><li>Mono audio streams at 64, "
+"96 or 192 kbit/sec bit-rate.</li></ul><p>Also the possibility to have audio "
+"only streams and still pictures was provided.<p><b>The bit-rate of multiplex-"
+"ed streams should be kept under 174300 bytes/sec (except for single still "
+"picture items) in order to accommodate single speed drives.</b>"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingview.cpp:219
-#, kde-format
-msgid "%1 title"
-msgid_plural "%1 titles"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:227
+#: projects/k3bvcdburndialog.cpp:160
 msgid ""
-"K3b uses transcode to rip Video DVDs. Please make sure it is installed."
+"<p>With the upcoming of the DVD-V media, a new VCD standard had to be "
+"published in order to be able to keep up with technology, so the Super Video "
+"CD specification was called into life 1999.<p>In the midst of 2000 a full "
+"subset of this <b>Super Video CD</b> specification was published as <b>IEC-"
+"62107</b>.<p>As the most notable change over Video CD 2.0 is a switch from "
+"MPEG-1 CBR to MPEG-2 VBR encoding for the video stream was performed.<p>The "
+"following new features--building upon the Video CD 2.0 specification--"
+"are:<ul><li>Use of MPEG-2 encoding instead of MPEG-1 for the video "
+"stream.</li><li>Allowed VBR encoding of MPEG-1 audio stream.</li><li>Higher "
+"resolutions (see below) for video stream resolution.</li><li>Up to 4 overlay "
+"graphics and text (<b>\"OGT\"</b>) sub-channels for user switchable subtitle "
+"displaying in addition to the already existing closed caption "
+"facility.</li><li>Command lists for controlling the SVCD virtual "
+"machine.</li></ul><p>For the <b>Super Video CD</b>, only the following two "
+"resolutions are supported for motion video and (low resolution) still "
+"pictures:<ul><li>480 x 480 @ 29.97 Hz (NTSC 2/3 D-2).</li><li>480 x 576 @ 25 "
+"Hz (PAL 2/3 D-2).</li></ul>"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingview.cpp:241
+#: projects/k3bvcdburndialog.cpp:173
 msgid ""
-"<p>K3b uses transcode to rip Video DVDs. Your installation of transcode "
-"lacks support for any of the codecs supported by K3b.<p>Please make sure it "
-"is installed properly."
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:254
-msgid "Unable to read Video DVD contents."
-msgstr ""
-
-#: rip/videodvd/k3bvideodvdrippingview.cpp:307
-msgid "Open the Video DVD ripping dialog"
+"<p>This is actually just a minor variation defined in IEC-62107 on the Super "
+"Video CD 1.0 format for compatibility with current products in the "
+"market.<p>It differs from the Super Video CD 1.0 format in the following "
+"items:<ul><li>The system profile tag field in <b>/SVCD/INFO.SVD</b> is set "
+"to <b>1</b> instead of <b>0</b>.</li><li>The system identification field "
+"value in <b>/SVCD/INFO.SVD</b> is set to <b>HQ-VCD</b> instead of "
+"<b>SUPERVCD</b>.</li><li><b>/EXT/SCANDATA.DAT</b> is mandatory instead of "
+"being optional.</li><li><b>/SVCD/SEARCH.DAT</b> is optional instead of being "
+"mandatory.</li></ul>"
 msgstr ""
 
-#: rip/videodvd/k3bvideodvdrippingview.cpp:308
+#: projects/k3bvcdburndialog.cpp:180
 msgid ""
-"<p>Rips single titles from a video DVD into a compressed format such as "
-"XviD. Menu structures are completely ignored.<p>If you intend to copy the "
-"plain Video DVD vob files from the DVD (including decryption) for further "
-"processing with another application, please use \"Show files\" button.<p>If "
-"you intend to make a copy of the entire Video DVD including all menus and "
-"extras it is recommended to use the K3b Copy tool."
-msgstr ""
-
-#: rip/k3bcddbpatternwidget.cpp:53
-msgctxt ""
-"Please do NOT modify/translate the quotes, they are part of the pattern!"
-msgid "%A - %T/%n - !a='%A'{%a - }%t"
-msgstr ""
-
-#: rip/k3bcddbpatternwidget.cpp:54
-msgid "%{albumartist} - %{albumtitle}/%{number} - %{artist} - %{title}"
-msgstr ""
-
-#: rip/k3bcddbpatternwidget.cpp:55
-msgid "%{genre}/%{albumartist} - %{albumtitle}/Track%{number}"
-msgstr ""
-
-#: rip/k3bcddbpatternwidget.cpp:56
-msgid "music/ripped-tracks/%a - %t"
-msgstr ""
-
-#: rip/k3bcddbpatternwidget.cpp:58
-msgid "%{albumartist} - %{albumtitle}"
-msgstr ""
-
-#: rip/k3bcddbpatternwidget.cpp:59 rip/k3baudiorippingdialog.cpp:427
-msgid "Playlist"
-msgstr "Rhestr chwarae:"
-
-#: rip/k3bcddbpatternwidget.cpp:60
-msgid "playlists/%{albumartist}/%{albumtitle    }"
+"<p>If Autodetect is:</p><ul><li>ON then K3b will set the correct VideoCD "
+"type.</li><li>OFF then the correct VideoCD type needs to be set by the "
+"user.</li></ul><p>If you are not sure about the correct VideoCD type, it is "
+"best to turn Autodetect ON.</p><p>If you want to force the VideoCD type, you "
+"must turn Autodetect OFF. This is useful for some standalone DVD players "
+"without SVCD support.</p>"
 msgstr ""
 
-#: rip/k3bcddbpatternwidget.cpp:127
+#: projects/k3bvcdburndialog.cpp:186
 msgid ""
-"<p><b>Pattern special strings:</b><p>The following strings will be replaced "
-"with their respective meaning in every track name.<br><em>Hint:</em> %A "
-"differs from %a only on soundtracks or compilations.<p><table "
-"border=\"0\"><tr><td></td><td><em>Meaning</em></td><td><em>Alternatives</em><"
-"/td></tr><tr><td>%a</td><td>artist of the track</td><td>%{a} or "
-"%{artist}</td></tr><tr><td>%t</td><td>title of the track</td><td>%{t} or "
-"%{title}</td></tr><tr><td>%n</td><td>track number</td><td>%{n} or "
-"%{number}</td></tr><tr><td>%y</td><td>year of the CD</td><td>%{y} or "
-"%{year}</td></tr><tr><td>%c</td><td>extended track information</td><td>%{c} "
-"or %{comment}</td></tr><tr><td>%g</td><td>genre of the CD</td><td>%{g} or "
-"%{genre}</td></tr><tr><td>%A</td><td>album artist</td><td>%{A} or "
-"%{albumartist}</td></tr><tr><td>%T</td><td>album title</td><td>%{T} or "
-"%{albumtitle}</td></tr><tr><td>%C</td><td>extended CD "
-"information</td><td>%{C} or "
-"%{albumcomment}</td></tr><tr><td>%d</td><td>current date</td><td>%{d} or "
-"%{date}</td></tr><tr><td>%e</td><td>file extension (if left out, it is added "
-"automatically)</td><td>%{e} or %{ext}</td></tr></table>"
+"<ul><li>Rename <b>\"/MPEG2\"</b> folder on SVCDs to (non-compliant) "
+"\"/MPEGAV\".</li><li>Enables the use of the (deprecated) signature "
+"<b>\"ENTRYSVD\"</b> instead of <b>\"ENTRYVCD\"</b> for the file "
+"<b>\"/SVCD/ENTRY.SVD\"</b>.</li></ul>"
 msgstr ""
 
-#: rip/k3bcddbpatternwidget.cpp:153
-#, c-format
-msgctxt ""
-"Please do NOT modify/translate the quotes, they are part of the pattern!"
+#: projects/k3bvcdburndialog.cpp:188
 msgid ""
-"<p><b>Conditional inclusion:</b><p>These patterns make it possible to "
-"selectively include texts, depending on the value of CDDB entries. You can "
-"choose only to include or exclude texts if one of the entries is empty, or "
-"if it has a specific value. Examples:<ul><li>@T{TEXT} includes TEXT if the "
-"album title is specified<li>!T{TEXT} includes TEXT if the album title is not "
-"specified<li>@C='Soundtrack'{TEXT} includes TEXT if the CD's extended "
-"information is named Soundtrack<li>!C='Soundtrack'{TEXT} includes TEXT if "
-"the CD's extended information is anything else but Soundtrack<li>It is also "
-"possible to include special strings in texts and conditions, e.g. "
-"!a='%A'{%a} only includes the title's artist information if it does not "
-"differ from the album artist.</ul><p>Conditional includes make use of the "
-"same characters as the special strings, which means that the X in @X{...} "
-"can be one character out of [atnycgATCd]."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:125
-#: rip/k3baudioprojectconvertingjob.cpp:430
-msgid "Converting Audio Tracks"
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:143
-msgid "Starting audio conversion."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:172 rip/k3baudioripjob.cpp:202
-#, kde-format
-msgid "Removed partial file '%1'."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:231
-#: rip/k3baudioprojectconvertingjob.cpp:348 rip/k3baudioripjob.cpp:372
-#: rip/k3baudioripjob.cpp:495
-#, kde-format
-msgid "Unable to open '%1' for writing."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:239
-#, kde-format
-msgid "Converting track %1 (%2 - %3)"
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:244
-#, kde-format
-msgid "Converting track %1"
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:270 rip/k3baudioripjob.cpp:404
-#, kde-format
-msgid "Error while encoding track %1."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:286
-#, kde-format
-msgid "Successfully converted track %1."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:301 rip/k3baudioripjob.cpp:443
-#, kde-format
-msgid "Writing playlist to %1."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:395 rip/k3baudioripjob.cpp:540
-#, kde-format
-msgid "Writing cue file to %1."
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:432
-#, kde-format
-msgid "Converting Audio Tracks From '%1'"
-msgstr ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:439 rip/k3baudioripjob.cpp:584
-#, kde-format
-msgid "1 track (encoding to %2)"
-msgid_plural "%1 tracks (encoding to %2)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rip/k3baudioprojectconvertingjob.cpp:444 rip/k3baudioripjob.cpp:589
-#, kde-format
-msgid "1 track"
-msgid_plural "%1 tracks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rip/k3baudioripjob.cpp:214
-msgid "Extracting Digital Audio"
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:221
-msgid "Could not load libcdparanoia."
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:232
-msgid "Reading CD table of contents."
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:236
-#, kde-format
-msgid "Could not open device %1"
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:254 rip/k3baudioripjob.cpp:296
-msgid "Searching index 0 for all tracks"
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:271
-msgid "Starting digital audio extraction (ripping)."
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:379
-#, kde-format
-msgid "Ripping track %1 (%2 - %3)"
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:384
-#, kde-format
-msgid "Ripping track %1"
-msgstr ""
-
-#: rip/k3baudioripjob.cpp:395
-#, kde-format
-msgid "Successfully ripped track %1 to %2."
+"<ul><li>Enables the use of the (deprecated) Chinese "
+"<b>\"/SVCD/TRACKS.SVD\"</b> format which differs from the format defined in "
+"the <b>IEC-62107</b> specification.</li></ul><p><b>The differences are most "
+"exposed on SVCDs containing more than one video track.</b>"
 msgstr ""
 
-#: rip/k3baudioripjob.cpp:420
-#, kde-format
-msgid "Unrecoverable error while ripping track %1."
+#: projects/k3bvcdburndialog.cpp:191
+msgid ""
+"<p>though most devices will have problems with such an out-of-specification "
+"media.<p><b>You may want use this option for images longer than 80 "
+"minutes</b>"
 msgstr ""
 
-#: rip/k3baudioripjob.cpp:427
-msgid "Error while initializing audio ripping."
+#: projects/k3bvcdburndialog.cpp:194
+msgid ""
+"<p>To allow the play of Video-CDs on a CD-i player, the Video-CD standard "
+"requires that a CD-i application program must be present.<p>This program is "
+"designed to:<ul><li>provide full play back control as defined in the PSD of "
+"the standard</li><li>be extremely simple to use and easy-to-learn for the "
+"end-user</li></ul><p>The program runs on CD-i players equipped with the "
+"CDRTOS 1.1(.1) operating system and a Digital Video extension cartridge."
 msgstr ""
 
-#: rip/k3baudioripjob.cpp:575
-msgid "Ripping Audio Tracks"
+#: projects/k3bvcdburndialog.cpp:200
+msgid ""
+"<p>Configuration parameters only available for VideoCD 2.0<p>The engine "
+"works perfectly well when used as-is.<p>You have the option to configure the "
+"VCD application.<p>You can adapt the color and/or the shape of the cursor "
+"and lots more."
 msgstr ""
 
-#: rip/k3baudioripjob.cpp:577
-#, kde-format
-msgid "Ripping Audio Tracks From '%1'"
+#: projects/k3bvcdburndialog.cpp:209
+msgid ""
+"<p>Here you can specify that the folder <b>SEGMENT</b> should always be "
+"present.<p>Some DVD players need the folder to give a faultless rendition."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:155
-msgid "Searching for Artist information..."
+#: projects/k3bvcdburndialog.cpp:212
+msgid ""
+"<p>An Access Point Sector, APS, is an MPEG video sector on the VCD/SVCD "
+"which is suitable to be jumped to directly.<p>APS are required for entry "
+"points and scantables. APS have to fulfil the requirement to precede every I-"
+"frame by a GOP header which shall be preceded by a sequence header in its "
+"turn.<p>The start codes of these 3 items are required to be contained all in "
+"the same MPEG pack/sector, thus forming a so-called access point "
+"sector.<p>This requirement can be relaxed by enabling the relaxed aps "
+"option, i.e. every sector containing an I-frame will be regarded as an "
+"APS.<p><b>Warning:</b> The sequence header is needed for a playing device to "
+"figure out display parameters, such as display resolution and frame rate, "
+"relaxing the aps requirement may lead to non-working entry points."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:186
-#, kde-format
+#: projects/k3bvcdburndialog.cpp:218
 msgid ""
-"Found Cd-Text (%1 - %2). Do you want to use it instead of CDDB (%3 - %4)?"
+"<p>According to the specification, it is mandatory for Super Video CDs to "
+"encode scan information data into user data blocks in the picture layer of "
+"all intra coded picture.<p>It can be used by playing devices for "
+"implementing fast forward & fast reverse scanning.<p>The already existing "
+"scan information data can be updated by enabling the update scan offsets "
+"option."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:191
-msgid "Found Cd-Text"
+#: projects/k3bvcdburndialog.cpp:222
+msgid ""
+"<p>Viewing Restriction may be interpreted by the playing device.<p>The "
+"allowed range goes from 0 to 3.<ul><li>0 = unrestricted, free to view for "
+"all</li><li>3 = restricted, content not suitable for ages under "
+"18</li></ul><p>Actually, the exact meaning is not defined and is player "
+"dependant.<p><b>Most players ignore that value.<b>"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:192
-msgid "Use CD-Text"
+#: projects/k3bvcdburndialog.cpp:229
+msgid "<p>This option allows customization of Gaps and Margins."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:193
-msgid "Use CDDB"
+#: projects/k3bvcdburndialog.cpp:230
+msgid ""
+"<p>This option allows to set the number of empty sectors added before the "
+"lead-out area begins, i.e. the number of post-gap sectors.<p>The ECMA-130 "
+"specification requires the last data track before the lead-out to carry a "
+"post-gap of at least 150 sectors, which is used as default for this "
+"parameter.<p>Some operating systems may encounter I/O errors due to read-"
+"ahead issues when reading the last MPEG track if this parameter is set too "
+"low.<p>Allowed value content: [0..300]. Default: 150."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:240
-msgid "Audio CD"
+#: projects/k3bvcdburndialog.cpp:235
+msgid ""
+"<p>Used to set the track pre-gap for all tracks in sectors globally.<p>The "
+"specification requires the pre-gaps to be at least 150 sectors "
+"long.<p>Allowed value content: [0..300]. Default: 150."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:257
-msgid "Edit Track CDDB Info"
+#: projects/k3bvcdburndialog.cpp:239
+msgid ""
+"Margins are used to compensate for inaccurate sector-addressing issues on CD-"
+"ROM media. Interestingly, they have been abandoned for Super Video "
+"CDs.<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors "
+"long.<p>Allowed value content: [0..150]. Default: 30 for Video CD "
+"1.0/1.1/2.0, otherwise (i.e. Super Video CD 1.0 and HQ-VCD 1.0) 0."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:259
-msgid "Edit Album CDDB Info"
+#: projects/k3bvcdburndialog.cpp:243
+msgid ""
+"<p>Margins are used to compensate for inaccurate sector-addressing issues on "
+"CD-ROM media. Interestingly, they have been abandoned for Super Video "
+"CDs.<p>For Video CD 1.0/1.1/2.0 this margin should be at least 15 sectors "
+"long.<p>Allowed value content: [0..150]. Default: 45 for Video CD "
+"1.0/1.1/2.0, otherwise 0."
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:263
-#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:47
-msgid "Query CDDB"
-msgstr ""
+#: projects/k3bvcdburndialog.cpp:258
+msgid "Generic"
+msgstr "Generig"
 
-#: rip/k3baudiocdview.cpp:265
-msgid "Save CDDB Entry Locally"
+#: projects/k3bvcdburndialog.cpp:260
+msgid "Playback Control (PBC)"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:267
-msgid "Show Data Part"
+#: projects/k3bvcdburndialog.cpp:261
+msgid "SEGMENT Folder must always be present"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:269
-msgid "Mounts the data part of CD"
+#: projects/k3bvcdburndialog.cpp:262
+msgid "Relaxed aps"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:327
-#, kde-format
-msgid "CDDB Track %1"
+#: projects/k3bvcdburndialog.cpp:263
+msgid "Update scan offsets"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:342 rip/k3baudiocdview.cpp:404
-msgid "Title:"
-msgstr "Teitl:"
-
-#: rip/k3baudiocdview.cpp:345 rip/k3baudiocdview.cpp:406
-msgid "Artist:"
-msgstr "Artist:"
-
-#: rip/k3baudiocdview.cpp:347 rip/k3baudiocdview.cpp:408
-msgid "Extra info:"
+#: projects/k3bvcdburndialog.cpp:272
+msgid "Gaps"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:366
-msgid "Album Cddb"
+#: projects/k3bvcdburndialog.cpp:277
+msgid "Customize gaps and margins"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:410
-msgid "Genre:"
+#: projects/k3bvcdburndialog.cpp:279
+msgid "Leadout pre gap (0..300):"
 msgstr ""
 
-#: rip/k3baudiocdview.cpp:412
-msgid "Year:"
-msgstr "Blwyddyn :"
-
-#: rip/k3baudiocdview.cpp:415
-msgid "Category:"
-msgstr "Categori :"
+#: projects/k3bvcdburndialog.cpp:284
+msgid "Track pre gap (0..300):"
+msgstr ""
 
-#: rip/k3baudiocdview.cpp:467
-#, kde-format
-msgid "Saved entry in category %1."
+#: projects/k3bvcdburndialog.cpp:289
+msgid "Track front margin (0..150):"
 msgstr ""
 
-#: rip/k3baudiotrackmodel.cpp:160
-msgid "Artist"
-msgstr "Artist"
+#: projects/k3bvcdburndialog.cpp:298
+msgid "Track rear margin (0..150):"
+msgstr ""
 
-#: rip/k3baudiotrackmodel.cpp:162
-msgctxt "audio track title"
-msgid "Title"
+#: projects/k3bvcdburndialog.cpp:371
+msgid "Restriction category (0..3):"
 msgstr ""
 
-#: rip/k3baudioconvertingoptionwidget.cpp:173
-msgid "Wave"
-msgstr "Ton"
+#: projects/k3bvcdburndialog.cpp:395
+msgid "VideoCD 1.1"
+msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:123
-msgid "CD Ripping"
+#: projects/k3bvcdburndialog.cpp:396
+msgid "VideoCD 2.0"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:169
-#: rip/k3baudioprojectconvertingdialog.cpp:151
-msgid "File Naming"
+#: projects/k3bvcdburndialog.cpp:397
+msgid "Super-VideoCD"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:182
-msgid "Do not read pregaps"
+#: projects/k3bvcdburndialog.cpp:398
+msgid "HQ-VideoCD"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:200
-msgid "Starts copying the selected tracks"
+#: projects/k3bvcdburndialog.cpp:416
+msgid "Autodetect VideoCD type"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:209
-msgid "Maximal number of read retries"
+#: projects/k3bvcdburndialog.cpp:417
+msgid "Enable broken SVCD mode"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:210
-msgid ""
-"<p>This specifies the maximum number of retries to read a sector of audio "
-"data from the cd. After that K3b will either skip the sector if the "
-"<em>Ignore Read Errors</em> option is enabled or stop the process."
+#: projects/k3bvcdburndialog.cpp:421
+#, kde-format
+msgid "Enable %1 track interpretation"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:214
-msgid "Do not read the pregaps at the end of every track"
+#: projects/k3bvcdburndialog.cpp:425
+msgid "Use 2336 byte sectors"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:215
-msgid ""
-"<p>If this option is checked K3b will not rip the audio data in the pregaps. "
-"Most audio tracks contain an empty pregap which does not belong to the track "
-"itself.</p><p>Although the default behavior of nearly all ripping software "
-"is to include the pregaps for most CDs, it makes more sense to ignore them. "
-"In any case, when creating a K3b audio project, the pregaps will be "
-"regenerated.</p>"
+#: projects/k3bvcdburndialog.cpp:426
+msgid "Enable CD-i support"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:247
-#: rip/k3baudioprojectconvertingdialog.cpp:184
-msgid "Please check the naming pattern. All filenames need to be unique."
+#: projects/k3bvcdburndialog.cpp:435
+msgid "VideoCD on CD-i"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:266
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: projects/k3bvcdburndialog.cpp:456
+msgid "System:"
+msgstr "Cysawd:"
 
-#: rip/k3baudiorippingdialog.cpp:368
-msgid "Cue-file"
+#: projects/k3bvcdburndialog.cpp:457
+msgid "Application:"
+msgstr "Cymhwysiad :"
+
+#: projects/k3bvcdburndialog.cpp:466
+msgid "ISO application id for VideoCD"
 msgstr ""
 
-#: rip/k3baudiorippingdialog.cpp:406
-#, kde-format
-msgid "Track%1"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:54
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: projects/k3bvcdburndialog.cpp:470 rc.cpp:250
+msgid "&Volume name:"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:50
-msgid "Video CD Ripping"
+#: projects/k3bvcdburndialog.cpp:471
+msgid "Volume &set name:"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:74
-msgid "Destination Folder"
+#: projects/k3bvcdburndialog.cpp:472
+msgid "Volume set s&ize:"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:79
-msgid "Rip files to:"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:135
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: projects/k3bvcdburndialog.cpp:473 rc.cpp:262
+msgid "Volume set &number:"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:86
-msgid "Free space in folder:"
+#: projects/k3bvcdburndialog.cpp:474
+msgid "&Publisher:"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:91
-msgid "Necessary storage size:"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:15
+#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bDataVolumeDescWidget)
+#: projects/k3bvcdburndialog.cpp:543 projects/k3bdatavolumedescdialog.cpp:33
+#: rc.cpp:244
+msgid "Volume Descriptor"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:103
-msgid "Ignore /EXT/PSD_X.VCD"
+#: projects/k3baudioviewimpl.cpp:58
+msgid "Play Track"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:104
-msgid "Use 2336 byte sector mode for image file"
+#: projects/k3baudioviewimpl.cpp:67
+msgid "Convert Tracks"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:108
-msgid "Extract XML structure"
+#: projects/k3baudioviewimpl.cpp:350
+msgid "No tracks to convert"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:118
-msgid "Starts extracting the selected VideoCd tracks"
+#: projects/k3bdataviewimpl.cpp:40
+msgid "New Folder..."
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:129
-#, kde-format
-msgid "Free space in destination folder: %1"
+#: projects/k3bdataviewimpl.cpp:46
+msgid "Parent Folder"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:131
-msgid "Necessary space for extracted files"
+#: projects/k3bdataviewimpl.cpp:50
+msgid "Open"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:133
-msgid "Ignore extended PSD"
+#: projects/k3bdataviewimpl.cpp:52
+msgid "&Import Session..."
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:134
-msgid ""
-"<p>Ignore extended PSD (located in the ISO-9660 filesystem under "
-"`/EXT/PSD_X.VCD') and use the <em>standard</em> PSD.</p>"
+#: projects/k3bdataviewimpl.cpp:54
+msgid "&Clear Imported Session"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:136
-msgid "Assume a 2336-byte sector mode"
+#: projects/k3bdataviewimpl.cpp:56
+msgid "&Edit Boot Images..."
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:137
-msgid ""
-"<p>This option only makes sense if you are reading from a BIN CD disk image. "
-"This indicates to `vcdxrip' to assume a 2336-byte sector mode for image "
-"file.</p><b>Note: This option is slated to disappear.</b>"
+#: projects/k3bdataviewimpl.cpp:59
+msgid "Import a previously burned session into the current project"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:140
-msgid "Create XML description file."
+#: projects/k3bdataviewimpl.cpp:60
+msgid "Remove the imported items from a previous session"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:141
-msgid ""
-"<p>This option creates an XML description file with all video CD "
-"information.</p><p>This file will always contain all of the "
-"information.</p><p>Example: If you only extract sequences, the description "
-"file will also hold the information for files and segments.</p><p>The "
-"filename is the same as the video CD name, with a .xml extension. The "
-"default is VIDEOCD.xml.</p>"
+#: projects/k3bdataviewimpl.cpp:61
+msgid "Modify the bootable settings of the current project"
 msgstr ""
 
-#: rip/k3bvideocdrippingdialog.cpp:173
-msgid "Continue although the folder is not empty?"
+#: projects/k3bdataviewimpl.cpp:105 projects/k3bdataviewimpl.cpp:107
+#: projects/k3bdataviewimpl.cpp:110 projects/k3bdataviewimpl.cpp:113
+msgid "New Folder"
 msgstr ""
 
-#: rip/k3baudioprojectconvertingdialog.cpp:105
-msgid "Audio Project Conversion"
+#: projects/k3bdataviewimpl.cpp:106
+msgid "Please insert the name for the new folder:"
 msgstr ""
 
-#: rip/k3baudioprojectconvertingdialog.cpp:126
-msgid "Filename (relative to base folder)"
+#: projects/k3bdataviewimpl.cpp:111
+msgid ""
+"A file with that name already exists. Please insert the name for the new "
+"folder:"
 msgstr ""
 
-#: k3bfileview.cpp:76
-msgid "Filter:"
-msgstr "Hidl:"
+#: projects/k3bdataviewimpl.cpp:240
+msgid "Edit Boot Images"
+msgstr ""
 
-#: k3bfileview.cpp:82 k3b.cpp:1374 misc/k3bimagewritingdialog.cpp:229
-msgid "*|All Files"
-msgstr "*|Pob Ffeil"
+#: projects/k3bbootimageview.cpp:55
+msgid "Floppy"
+msgstr "Llipa"
 
-#: k3bfileview.cpp:83
-msgid "audio/x-mp3 audio/x-wav application/x-ogg |Sound Files"
+#. i18n: file: projects/base_k3bbootimageview.ui:115
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioHarddisk)
+#: projects/k3bbootimageview.cpp:57 rc.cpp:574
+msgid "Harddisk"
 msgstr ""
 
-#: k3bfileview.cpp:84
-msgid "audio/x-wav |Wave Sound Files"
-msgstr ""
+#. i18n: file: projects/base_k3bbootimageview.ui:125
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioNoEmulation)
+#: projects/k3bbootimageview.cpp:59 rc.cpp:580
+#: ../plugins/decoder/mp3/k3bmaddecoder.cpp:432
+msgid "None"
+msgstr "Dim"
 
-#: k3bfileview.cpp:85
-msgid "audio/x-mp3 |MP3 Sound Files"
-msgstr ""
+#: projects/k3bbootimageview.cpp:126
+msgid "Hide Advanced Options"
+msgstr "Cuddio dewisiadau uwch"
 
-#: k3bfileview.cpp:86
-msgid "application/x-ogg |Ogg Vorbis Sound Files"
+#: projects/k3bbootimageview.cpp:130
+msgid "Show Advanced Options"
+msgstr "Dangos dewisiadau uwch"
+
+#: projects/k3bbootimageview.cpp:137
+msgid "Please Choose Boot Image"
 msgstr ""
 
-#: k3bfileview.cpp:87
-msgid "video/mpeg |MPEG Video Files"
+#: projects/k3bbootimageview.cpp:145
+msgid ""
+"<p>The file you selected is not a floppy image (floppy images are of size "
+"1200 KB, 1440 KB, or 2880 KB). You may still use boot images of other sizes "
+"by emulating a harddisk or disabling emulation completely. <p>If you are not "
+"familiar with terms like 'harddisk emulation' you most likely want to use a "
+"floppy image here. Floppy images can be created by directly extracting them "
+"from a real floppy disk:<pre>dd if=/dev/floppy of=/tmp/floppy.img</pre>or by "
+"using one of the many boot floppy generators that can be found on <a "
+"href=\"http://www.google.com/search?q=linux+boot+floppy&ie=UTF-8&oe=UTF-"
+"8\">the Internet</a>."
 msgstr ""
 
-#: k3bfileview.cpp:90
-msgid "Show Bookmarks"
+#: projects/k3bbootimageview.cpp:154
+msgid "No Floppy image selected"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:47
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:355
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox3)
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:109
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: k3bfileview.cpp:93 rc.cpp:900 rc.cpp:1031 rc.cpp:1137
-msgid "Options"
+#: projects/k3bbootimageview.cpp:155
+msgid "Use harddisk emulation"
 msgstr ""
 
-#: k3binteractiondialog.cpp:86
-msgid "Load default settings"
+#: projects/k3bbootimageview.cpp:156
+msgid "Use no emulation"
 msgstr ""
 
-#: k3binteractiondialog.cpp:87
-msgid "Load saved settings"
+#: projects/k3baudiotracksplitdialog.cpp:41
+msgid "Split Audio Track"
 msgstr ""
 
-#: k3binteractiondialog.cpp:88
-msgid "Load last used settings"
+#: projects/k3baudiotracksplitdialog.cpp:53
+msgid "Please select the position where the track should be split."
 msgstr ""
 
-#: k3binteractiondialog.cpp:112
-msgid "Start the task"
+#: projects/k3baudiotracksplitdialog.cpp:58
+msgid "Split track at:"
 msgstr ""
 
-#: k3binteractiondialog.cpp:202
-msgid "Load default or saved settings"
+#: projects/k3baudiotracksplitdialog.cpp:101
+msgid "Split Here"
 msgstr ""
 
-#: k3binteractiondialog.cpp:203
-msgid "Save current settings to reuse them later"
+#: projects/k3baudiotracksplitdialog.cpp:105
+msgid "Remove part"
 msgstr ""
 
-#: k3binteractiondialog.cpp:207
-msgid ""
-"<p>Load a set of settings either from the default K3b settings, settings "
-"saved before, or the last used ones."
+#: projects/k3bvolumenamewidget.cpp:57
+msgid "Volume Name:"
 msgstr ""
 
-#: k3binteractiondialog.cpp:209
-msgid ""
-"<p>Saves the current settings of the action dialog.<p>These settings can be "
-"loaded with the <em>Load saved settings</em> button.<p><b>The K3b defaults "
-"are not overwritten by this.</b>"
+#: projects/k3baudioprojectmodel.cpp:319
+msgid "Artist (CD-Text)"
 msgstr ""
 
-#: k3binteractiondialog.cpp:287
-msgid "Action Dialog Settings"
+#: projects/k3baudioprojectmodel.cpp:321
+msgid "Title (CD-Text)"
 msgstr ""
 
-#: k3binteractiondialog.cpp:288
-msgid ""
-"<p>K3b handles three sets of settings in action dialogs: the defaults, the "
-"saved settings, and the last used settings. Please choose which of these "
-"sets should be loaded if an action dialog is opened again.<p><em>Be aware "
-"that this choice can always be changed from the K3b configuration "
-"dialog.</em>"
+#: projects/k3baudioprojectmodel.cpp:323
+msgctxt "audio type like mp3 or whatever"
+msgid "Type"
 msgstr ""
 
-#: k3b.cpp:236
-msgid "K3b - The CD and DVD Kreator"
+#: projects/k3baudioprojectmodel.cpp:325
+msgctxt "audio track length"
+msgid "Length"
 msgstr ""
 
-#: k3b.cpp:298
-msgid "Save All"
-msgstr "Cadw Popeth"
+#: projects/k3bview.cpp:54
+msgid "&Burn"
+msgstr ""
 
-#: k3b.cpp:301
-msgid "Close All"
-msgstr "Cau Popeth"
+#: projects/k3bview.cpp:56
+msgid "Open the burn dialog for the current project"
+msgstr ""
 
-#: k3b.cpp:316
-msgid "&New Project"
-msgstr "&Cywaith Newydd"
+#: projects/k3bview.cpp:57
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#: k3b.cpp:319
-msgid "New &Audio CD Project"
+#: projects/k3bview.cpp:59
+msgid "Open the properties dialog"
 msgstr ""
 
-#: k3b.cpp:321
-msgid "New &Data Project"
+#: projects/k3bprojectburndialog.cpp:74 k3bpassivepopup.cpp:126
+msgid "Close"
 msgstr ""
 
-#: k3b.cpp:323
-msgid "New &Mixed Mode CD Project"
+#: projects/k3bprojectburndialog.cpp:75
+msgid "Save Settings and close"
 msgstr ""
 
-#: k3b.cpp:325
-msgid "New &Video CD Project"
+#: projects/k3bprojectburndialog.cpp:76
+msgid "Saves the settings to the project and closes the dialog."
 msgstr ""
 
-#: k3b.cpp:327
-msgid "New &eMovix Project"
+#: projects/k3bprojectburndialog.cpp:79
+msgid "Cancel"
 msgstr ""
 
-#: k3b.cpp:329
-msgid "New V&ideo DVD Project"
+#: projects/k3bprojectburndialog.cpp:80
+msgid "Discard all changes and close"
 msgstr ""
 
-#: k3b.cpp:350
-msgid "&Add Files..."
+#: projects/k3bprojectburndialog.cpp:81
+msgid "Discards all changes made in the dialog and closes it."
 msgstr ""
 
-#: k3b.cpp:353
-msgid "&Clear Project"
+#: projects/k3bprojectburndialog.cpp:152
+msgid "Start the image creation"
 msgstr ""
 
-#: k3b.cpp:357
-msgid "Lock Panels"
+#: projects/k3bprojectburndialog.cpp:154
+msgid "Burn"
 msgstr ""
 
-#: k3b.cpp:362
-msgid "Show Projects Header"
+#: projects/k3bprojectburndialog.cpp:155
+msgid "Start the burning process"
 msgstr ""
 
-#: k3b.cpp:373
-msgid "Format"
-msgstr "Fformat"
+#: projects/k3bprojectburndialog.cpp:261
+msgid "Writing"
+msgstr ""
 
-#: k3b.cpp:376
-msgid "&Burn Image..."
+#: projects/k3bprojectburndialog.cpp:304
+msgid "Image"
+msgstr "Delwedd"
+
+#: projects/k3bprojectburndialog.cpp:396
+msgid "Use the 'Image' tab to optionally adjust the path of the image."
 msgstr ""
 
-#: k3b.cpp:392 k3bdebuggingoutputdialog.cpp:46
-msgid "Copy"
+#: projects/k3bvideodvdburndialog.cpp:47
+msgid "Video DVD Project"
 msgstr ""
 
-#: k3b.cpp:420
-msgid "System Check"
+#: projects/k3bmovixprojectmodel.cpp:296
+msgid " (broken)"
 msgstr ""
 
-#: k3b.cpp:430
-msgid "&Setup System Permissions..."
+#: projects/k3bmovixprojectmodel.cpp:313
+msgctxt "Movix File Position"
+msgid "No."
 msgstr ""
 
-#: k3b.cpp:439
-msgid "Creates a new project"
+#: projects/k3bmovixprojectmodel.cpp:315
+msgctxt "Movix File Title"
+msgid "Title"
 msgstr ""
 
-#: k3b.cpp:441
-msgid "Creates a new data project"
+#: projects/k3bmovixprojectmodel.cpp:317
+msgctxt "Movix File Type(ie. MPEG)"
+msgid "Type"
 msgstr ""
 
-#: k3b.cpp:443
-msgid "Creates a new audio CD project"
+#: projects/k3bmovixprojectmodel.cpp:319
+msgctxt "Movix File Size"
+msgid "Size"
 msgstr ""
 
-#: k3b.cpp:445
-msgid "Creates a new eMovix project"
+#: projects/k3bmovixprojectmodel.cpp:321
+msgctxt "Movix File Path"
+msgid "Local Path"
 msgstr ""
 
-#: k3b.cpp:447
-msgid "Creates a new Video CD project"
+#: projects/k3bmovixprojectmodel.cpp:323
+msgctxt "Movix File Link"
+msgid "Link"
 msgstr ""
 
-#: k3b.cpp:451
-msgid "Write an Iso9660, cue/bin, or cdrecord clone image to an optical disc"
+#: projects/k3bvcdprojectmodel.cpp:234
+msgctxt "VideoCD Track Number"
+msgid "No."
 msgstr ""
 
-#: k3b.cpp:455
-msgid "Opens an existing project"
+#: projects/k3bvcdprojectmodel.cpp:236
+msgctxt "VideoCD Track Title"
+msgid "Title"
 msgstr ""
 
-#: k3b.cpp:457
-msgid "Opens a recently used file"
-msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
+#: projects/k3bvcdprojectmodel.cpp:238
+msgctxt "VideoCD Track Type (ie. MPEG1)"
+msgid "Type"
+msgstr ""
 
-#: k3b.cpp:459
-msgid "Saves the current project"
+#: projects/k3bvcdprojectmodel.cpp:240
+msgctxt "VideoCD Track Resolution"
+msgid "Resolution"
 msgstr ""
 
-#: k3b.cpp:461
-msgid "Saves the current project to a new url"
+#: projects/k3bvcdprojectmodel.cpp:243
+msgctxt "VideoCD Track High Resolution"
+msgid "High Resolution"
 msgstr ""
 
-#: k3b.cpp:463
-msgid "Saves all open projects"
+#: projects/k3bvcdprojectmodel.cpp:245
+msgctxt "VideoCD Track Framerate"
+msgid "Framerate"
 msgstr ""
 
-#: k3b.cpp:465
-msgid "Closes the current project"
-msgstr "Cau'r cywaith cyfredol"
+#: projects/k3bvcdprojectmodel.cpp:247
+msgctxt "VideoCD Track Muxrate"
+msgid "Muxrate"
+msgstr ""
 
-#: k3b.cpp:467
-msgid "Closes all open projects"
+#: projects/k3bvcdprojectmodel.cpp:249
+msgctxt "VideoCD Track Duration"
+msgid "Duration"
 msgstr ""
 
-#: k3b.cpp:469
-msgid "Quits the application"
-msgstr "Terfynu'r cymhwysiad"
+#: projects/k3bvcdprojectmodel.cpp:251
+msgctxt "VideoCD Track File Size"
+msgid "File Size"
+msgstr ""
 
-#: k3b.cpp:471
-msgid "Configure K3b settings"
+#: projects/k3bvcdprojectmodel.cpp:253
+msgctxt "VideoCD Track Filename"
+msgid "Filename"
 msgstr ""
 
-#: k3b.cpp:474
-msgid "Setup the system permissions"
+#: projects/k3bmusicbrainztrackloopupjob.cpp:78
+#, kde-format
+msgid "Generating fingerprint for track %1."
 msgstr ""
 
-#: k3b.cpp:477
-msgid "Digitally extract tracks from an audio CD"
+#: projects/k3bmusicbrainztrackloopupjob.cpp:117
+#, kde-format
+msgid "Querying MusicBrainz for track %1."
 msgstr ""
 
-#: k3b.cpp:479
-msgid "Transcode Video DVD titles"
+#: projects/k3bmixedburndialog.cpp:68
+msgid "Mixed Project"
 msgstr ""
 
-#: k3b.cpp:481
-msgid "Extract tracks from a Video CD"
+#: projects/k3bmixedburndialog.cpp:104
+msgid "Mixed Mode Type"
 msgstr ""
 
-#: k3b.cpp:483
-msgid "Add files to the current project"
+#: projects/k3bmixedburndialog.cpp:108
+msgid "Data in second session (CD-Extra)"
+msgstr ""
+
+#: projects/k3bmixedburndialog.cpp:109
+msgid ""
+"<em>Blue book CD</em><br>K3b will create a multisession CD with 2 sessions. "
+"The first session will contain all audio tracks and the second session will "
+"contain a mode 2 form 1 data track.<br>This mode is based on the <em>Blue "
+"book</em> standard (also known as <em>Extended Audio CD</em>, <em>CD-"
+"Extra</em>, or <em>CD Plus</em>) and has the advantage that a hifi audio CD "
+"player will only recognize the first session and ignore the second session "
+"with the data track.<br>If the CD is intended to be used in a hifi audio CD "
+"player this is the recommended mode.<br>Some older CD-ROMs may have problems "
+"reading a blue book CD since it is a multisession CD."
 msgstr ""
 
-#: k3b.cpp:485
-msgid "Clear the current project"
+#: projects/k3bmixedburndialog.cpp:125
+msgid "Data in first track"
 msgstr ""
 
-#: k3b.cpp:515
-msgid "Projects"
+#: projects/k3bmixedburndialog.cpp:126
+msgid "K3b will write the data track before all audio tracks."
 msgstr ""
 
-#: k3b.cpp:528
-msgid "Current Projects"
+#: projects/k3bmixedburndialog.cpp:129
+msgid "Data in last track"
 msgstr ""
 
-#: k3b.cpp:551
-msgid "Folders"
-msgstr "Plygyll"
-
-#: k3b.cpp:563
-msgid "Contents"
+#: projects/k3bmixedburndialog.cpp:130
+msgid "K3b will write the data track after all audio tracks."
 msgstr ""
 
-#: k3b.cpp:591
-msgid "&Location Bar"
+#: projects/k3bmixedburndialog.cpp:133
+msgid ""
+"<b>Caution:</b> The last two modes should only be used for CDs that are "
+"unlikely to be played on a hifi audio CD player.<br>It could lead to "
+"problems with some older hifi audio CD players that try to play the data "
+"track."
 msgstr ""
 
-#: k3b.cpp:670 k3b.cpp:992 k3b.cpp:1006
-msgid "Opening file..."
-msgstr "Agor ffeil..."
-
-#: k3b.cpp:698
-msgid "Could not open document."
+#: projects/k3bmixedburndialog.cpp:293
+msgid ""
+"<p><b>External program <em>normalize-audio</em> is not installed.</b><p>K3b "
+"uses <em>normalize-audio</em> (http://normalize.nongnu.org/) to normalize "
+"audio tracks. In order to use this functionality, please install it first "
+"(sudo apt-get install normalize-audio)."
 msgstr ""
 
-#: k3b.cpp:698 ../plugins/encoder/sox/k3bsoxencoder.cpp:320
-msgid "Error"
+#: k3bpassivepopup.cpp:133
+msgid "Keep Open"
 msgstr ""
 
-#: k3b.cpp:962
-#, kde-format
-msgid "%1 has unsaved data."
-msgstr ""
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: k3b.cpp:963
-msgid "Closing Project"
-msgstr ""
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,"
 
-#: k3b.cpp:995 k3b.cpp:1064
-msgid "*.k3b|K3b Projects"
+#. i18n: file: k3bui.rc:4
+#. i18n: ectx: Menu (project)
+#: rc.cpp:5
+msgid "&Project"
+msgstr "&Cywaith"
+
+#. i18n: file: k3bui.rc:9
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:8
+msgid "&Tools"
 msgstr ""
 
-#: k3b.cpp:997
-msgid "Open Files"
-msgstr "Agor Ffeiliau"
+#. i18n: file: k3bui.rc:19
+#. i18n: ectx: Menu (device)
+#. i18n: file: k3bdeviceui.rc:4
+#. i18n: ectx: Menu (device)
+#: rc.cpp:11 rc.cpp:241
+msgid "&Device"
+msgstr "&Dyfais"
 
-#: k3b.cpp:1029
-msgid "Saving file..."
-msgstr "Yn cadw ffeil..."
+#. i18n: file: k3bui.rc:23
+#. i18n: ectx: Menu (view_panels)
+#: rc.cpp:14
+msgid "Panels"
+msgstr ""
 
-#: k3b.cpp:1039 k3b.cpp:1085
-msgid "Could not save the current document."
+#. i18n: file: k3bui.rc:35
+#. i18n: ectx: Menu (help)
+#: rc.cpp:17
+msgid "&Help"
 msgstr ""
 
-#: k3b.cpp:1039 k3b.cpp:1085
-msgid "I/O Error"
+#. i18n: file: k3bui.rc:40
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:20
+msgid "Main Toolbar"
 msgstr ""
 
-#: k3b.cpp:1056
-msgid "Saving file with a new filename..."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:18
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:330
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:23 rc.cpp:149
+msgid "Filetype"
 msgstr ""
 
-#: k3b.cpp:1065
-msgid "Save As"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:34
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonConfigurePlugin)
+#: rc.cpp:26
+msgid "Configure Plugin"
 msgstr ""
 
-#: k3b.cpp:1105
-msgid "Closing file..."
-msgstr "Yn cau ffeil..."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:37
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonConfigurePlugin)
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:247
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonFindBiblio)
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:268
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonFindAbstract)
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:289
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonFindCopyright)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:42
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopySongwriter)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:72
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyComposer)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:128
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyArranger)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:180
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyTitle)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:220
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyPerformer)
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:66
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyPerformer)
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:83
+#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyTitle)
+#: rc.cpp:29 rc.cpp:274 rc.cpp:280 rc.cpp:286 rc.cpp:304 rc.cpp:313 rc.cpp:328
+#: rc.cpp:340 rc.cpp:349 rc.cpp:783 rc.cpp:789
+msgid "..."
+msgstr "..."
 
-#: k3b.cpp:1207
-msgid "Creating new Audio CD Project."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:47
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:109
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:355
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox3)
+#: rc.cpp:32 rc.cpp:1008 rc.cpp:1214 k3bfileview.cpp:93
+msgid "Options"
 msgstr ""
 
-#: k3b.cpp:1216
-msgid "Creating new Data CD Project."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:53
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkCreatePlaylist)
+#: rc.cpp:35
+msgid "Create playlist for the ripped files"
 msgstr ""
 
-#: k3b.cpp:1232
-msgid "Creating new Video DVD Project."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:58
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkCreatePlaylist)
+#: rc.cpp:38
+msgid ""
+"<p>If this option is checked K3b will create a playlist of the ripped files\n"
+"which can be used with programs like Amarok or JuK.\n"
+"<p>You may use the special strings to give the playlist a unique filename."
 msgstr ""
 
-#: k3b.cpp:1242
-msgid "Creating new Mixed Mode CD Project."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkCreatePlaylist)
+#: rc.cpp:43
+msgid "Create m&3u playlist"
 msgstr ""
 
-#: k3b.cpp:1251
-msgid "Creating new Video CD Project."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:89
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkPlaylistRelative)
+#: rc.cpp:46
+msgid "Use relative paths instead of absolute"
 msgstr ""
 
-#: k3b.cpp:1261
-msgid "Creating new eMovix Project."
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:95
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkPlaylistRelative)
+#: rc.cpp:49
+msgid ""
+"<p>If this option is checked, the entries in the playlist will be relative "
+"to its location.\n"
+"<p>Example: If your playlist is located in <em>/home/myself/music</em> and\n"
+"your audio files are in <em>/home/myself/music/cool</em>; then the entries "
+"in the\n"
+"playlist will look something like: <em>cool/track1.ogg</em>."
 msgstr ""
 
-#: k3b.cpp:1376
-msgid "Select Files to Add to Project"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:98
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkPlaylistRelative)
+#: rc.cpp:55
+msgid "&Use relative paths"
 msgstr ""
 
-#: k3b.cpp:1390
-msgid "Please create a project before adding files"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:107
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSingleFile)
+#: rc.cpp:58
+msgid "Rip all tracks to a single file"
 msgstr ""
 
-#: k3b.cpp:1390
-msgid "No Active Project"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:114
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkSingleFile)
+#: rc.cpp:61
+msgid ""
+"<p>If this option is checked K3b will create only one\n"
+"audio file no matter how many tracks are ripped. This\n"
+"file will contain all tracks one after the other.\n"
+"<p>This might be useful to rip a live album or a radio play.\n"
+"<p><b>Caution:</b> The file will have the name made from playlist pattern."
 msgstr ""
 
-#: k3b.cpp:1559
-msgid "Do you really want to clear the current project?"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:117
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkSingleFile)
+#: rc.cpp:68
+msgid "Create si&ngle file"
 msgstr ""
 
-#: k3b.cpp:1560
-msgid "Clear Project"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:145
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkWriteCueFile)
+#: rc.cpp:71
+msgid "Write a cuefile"
 msgstr ""
 
-#: k3b.cpp:1585
-msgid "Audio CD Rip"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:148
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkWriteCueFile)
+#: rc.cpp:74
+msgid ""
+"<p>If this option is checked K3b will create a CDRWIN cue file which allows "
+"to easily write a copy of the audio CD on other systems."
 msgstr ""
 
-#: k3b.cpp:1600
-msgid "Video DVD Rip"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:151
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkWriteCueFile)
+#: rc.cpp:77
+msgid "Write &cue file"
 msgstr ""
 
-#: k3b.cpp:1621
-msgid "Video CD Rip"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:182
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:137
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1_2)
+#: rc.cpp:80 rc.cpp:116
+msgid "Target Folder"
+msgstr ""
+
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:188
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:143
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:83 rc.cpp:119
+msgid "Free space in directory:"
 msgstr ""
 
-#: k3bdebuggingoutputdialog.cpp:42
-msgid "Debugging Output"
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:201
+#. i18n: ectx: property (text), widget (QLabel, m_labelFreeSpace)
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:224
+#. i18n: ectx: property (text), widget (QLabel, m_labelNeededSpace)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:156
+#. i18n: ectx: property (text), widget (QLabel, m_labelFreeSpace)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:179
+#. i18n: ectx: property (text), widget (QLabel, m_labelNeededSpace)
+#: rc.cpp:86 rc.cpp:92 rc.cpp:122 rc.cpp:128
+msgid "-"
+msgstr "-"
+
+#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:214
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:169
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
+#: rc.cpp:89 rc.cpp:125
+msgid "Space needed:"
 msgstr ""
 
-#: k3bdebuggingoutputdialog.cpp:47
-msgid "Save to file"
-msgstr "Cadw i Ffeil"
-
-#: k3bdebuggingoutputdialog.cpp:48
-msgid "Copy to clipboard"
-msgstr "Copïo i'r Gludfwrdd"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:95
+msgid ""
+"Please select the audio streams you want to include in every ripped title"
+msgstr ""
 
-#: k3bdebuggingoutputdialog.cpp:90
-#, kde-format
-msgid "Could not open file %1"
-msgstr "Methwyd agor y ffeil %1"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:43
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:98
+msgid "Setti&ngs"
+msgstr "G&osodiadau"
 
-#: k3bburnprogressdialog.cpp:39
-msgid "Estimated writing speed:"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:49
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
+#: rc.cpp:101
+msgid "Video Quality"
 msgstr ""
 
-#: k3bburnprogressdialog.cpp:51
-msgid "Software buffer:"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:57
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:104
+msgid "Video Size:"
 msgstr ""
 
-#: k3bburnprogressdialog.cpp:52
-msgid "Device buffer:"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:79
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonCustomPictureSize)
+#. i18n: file: projects/base_k3bdataimagesettings.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonCustomFilesystems)
+#: rc.cpp:107 rc.cpp:691
+msgid "&Custom..."
 msgstr ""
 
-#: k3bburnprogressdialog.cpp:89
-#, kde-format
-msgid "Writer: %1 %2"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:90
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#: rc.cpp:110
+msgid "Video Bitrate:"
 msgstr ""
 
-#: k3bburnprogressdialog.cpp:92 k3bburnprogressdialog.cpp:93
-#: k3bburnprogressdialog.cpp:94
-msgid "no info"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:111
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinVideoBitrate)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:286
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinAudioBitrate)
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:144
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinAverageBitrate)
+#: rc.cpp:113 rc.cpp:146 rc.cpp:1137
+msgid " kbps"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:89
-msgid "Waiting for Disk"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:195
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
+#: rc.cpp:131
+msgid "Audio Quality"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:94
-msgid "Eject"
-msgstr "Allfwrw"
-
-#: k3bemptydiscwaiter.cpp:96
-msgid "Load"
-msgstr "Llwytho"
-
-#: k3bemptydiscwaiter.cpp:118
-msgid "Found medium:"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:211
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkAudioVBR)
+#: rc.cpp:134
+msgid "Variable &Bitrate"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:267 k3bemptydiscwaiter.cpp:359
-#: k3bemptydiscwaiter.cpp:445
-#, kde-format
-msgid "Found %1 medium in %2 - %3. Should it be overwritten?"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:220
+#. i18n: ectx: property (text), widget (QLabel, m_labelAudioBitrate)
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:276
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:137 rc.cpp:143
+msgid "Audio Bitrate:"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:271 k3bemptydiscwaiter.cpp:364
-#: k3bemptydiscwaiter.cpp:450 k3bemptydiscwaiter.cpp:514
-#, kde-format
-msgid "Found %1"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:257
+#. i18n: ectx: property (text), widget (K3ActiveLabel, m_labelNoAudioSettings)
+#: rc.cpp:140
+msgid ""
+"<p>No Audio Quality settings available for <em>AC3 pass-through</em>. The "
+"audio stream from the Video DVD is used without any changes."
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:332
-msgid "Preformatting DVD+RW"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:338
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:152
+msgid "Video Codec:"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:509
-#, kde-format
-msgid "Found %1 medium in %2 - %3. Should it be formatted?"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:348
+#. i18n: ectx: property (toolTip), widget (K3b::IntMapComboBox, m_comboVideoCodec)
+#: rc.cpp:155
+msgid "Select the Video codec used to encode the DVD titles"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:515
-msgid "&Format"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:359
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:158
+msgid "Audio Codec:"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:537
-msgid "Formatting DVD-RW"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:369
+#. i18n: ectx: property (toolTip), widget (K3b::IntMapComboBox, m_comboAudioCodec)
+#: rc.cpp:161
+msgid "Select the Audio codec used to encode the DVD titles"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:572
-#, kde-format
-msgid "Found rewritable medium in %1 - %2. Should it be erased?"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:382
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:164
+msgid "File Namin&g"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:574
-msgid "Found Rewritable Disk"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:390
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:64
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:167 rc.cpp:229
+msgid "Ripped files pattern:"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:575
-msgid "E&rase"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:423
+#. i18n: ectx: property (text), widget (KUrlLabel, m_specialStringsLabel)
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:108
+#. i18n: ectx: property (text), widget (KUrlLabel, m_specialStringsLabel)
+#: rc.cpp:170 rc.cpp:235
+msgid "See special strings"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:582
-msgid "Erasing CD-RW"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:435
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBlankReplace)
+#: rc.cpp:173
+msgid "Replace all &blanks with:"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:650
-msgid "Waiting for Medium"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:453
+#. i18n: ectx: property (text), widget (KLineEdit, m_editBlankReplace)
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:32
+#. i18n: ectx: property (text), widget (KLineEdit, m_editBlankReplace)
+#. i18n: file: projects/base_k3bdataimagesettings.ui:199
+#. i18n: ectx: property (text), widget (QLineEdit, m_editReplace)
+#: rc.cpp:176 rc.cpp:223 rc.cpp:764
+msgid "_"
 msgstr ""
 
-#: k3bemptydiscwaiter.cpp:715
-msgid "Erasing failed."
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:485
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkTwoPassEncoding)
+#: rc.cpp:182
+msgid "&2-pass encoding"
 msgstr ""
 
-#: k3bdiroperator.cpp:48
-msgid "K3b Bookmarks"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:491
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkTwoPassEncoding)
+#: rc.cpp:185
+msgid "Enable 2-pass encoding"
 msgstr ""
 
-#: k3bdiroperator.cpp:51
-msgid "Bookmarks"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:496
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkTwoPassEncoding)
+#: rc.cpp:188
+msgid ""
+"<p>If this option is checked K3b encodes the video titles in two passes. The "
+"first pass is used to gather information about the video in order to improve "
+"the distribution of bits in the second pass. The resulting video will have a "
+"higher quality using a variable bitrate.\n"
+"<p>If this option is not checked K3b will create video files with a constant "
+"bitrate and a lower quality.\n"
+"<p>2-pass encoding results in a doubled encoding time."
 msgstr ""
 
-#: k3bdiroperator.cpp:55 k3bfiletreeview.cpp:96
-msgid "&Add to Project"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:503
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkAutoClipping)
+#: rc.cpp:193
+msgid "Automatic &Video Clipping"
 msgstr ""
 
-#: k3bmediumdelegate.cpp:141
-#, kde-format
-msgid "%1 in 1 track"
-msgid_plural "%1 in %2 tracks"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:509
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkAutoClipping)
+#: rc.cpp:196
+msgid "Automatically detect the black borders of the video"
+msgstr ""
 
-#: k3bmediumdelegate.cpp:145
-#, kde-format
-msgid " and %1 session"
-msgid_plural " and %1 sessions"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:514
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkAutoClipping)
+#: rc.cpp:199
+msgid ""
+"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
+"refers to black bars used at the top and bottom (and sometimes at the sides) "
+"of the video to force it into one of the aspect ratios supported by the "
+"Video DVD standard.\n"
+"<p>If this option is checked K3b will automatically detect and remove these "
+"black bars from the resulting video.\n"
+"<p>Although this method is very reliable there may be problems if the source "
+"material is exceptionally short or dark."
+msgstr ""
 
-#: k3bmediumdelegate.cpp:158
-#, kde-format
-msgid "Free space: %1"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:521
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkAudioResampling)
+#: rc.cpp:204
+msgid "Resample Audio to &44.1 KHz"
 msgstr ""
 
-#: k3bmediumdelegate.cpp:170
-#, kde-format
-msgid "Capacity: %1"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:527
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkAudioResampling)
+#: rc.cpp:207
+msgid "Change the sample rate of the audio stream to 44.1 KHz"
 msgstr ""
 
-#: k3bjobprogressosd.cpp:199
-msgid "Hide OSD"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:531
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkAudioResampling)
+#: rc.cpp:210
+msgid ""
+"<p>Video DVD audio streams normally are encoded with a sampling rate of "
+"48000 Hz. Audio CDs on the other hand are encoded with a sampling rate of "
+"44100 Hz.\n"
+"<p>If this option is checked K3b will change the sampling rate of the audio "
+"stream to 44100 Hz."
 msgstr ""
 
-#: k3bmediaselectiondialog.cpp:34
-msgid "Medium Selection"
+#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:538
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkLowPriority)
+#: rc.cpp:214
+msgid "Low s&cheduling priority for the video transcoding process"
 msgstr ""
 
-#: k3bmediaselectiondialog.cpp:40
-msgid "Please select a medium:"
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bCddbPatternWidget)
+#: rc.cpp:217
+msgid "Ripping Pattern"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:54
-msgid "Free space in temporary folder:"
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:22
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBlankReplace)
+#: rc.cpp:220
+msgid "Replace all blan&ks with:"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:79
-msgid "The folder in which to save the image files"
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:41
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:226
+msgid "Playlist pattern:"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:83
-msgid ""
-"<p>This is the folder in which K3b will save the <em>image "
-"files</em>.<p>Please make sure that it resides on a partition that has "
-"enough free space."
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:80
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboFilenamePattern)
+#: rc.cpp:232
+msgid "Insert your custom pattern here"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:190
-msgid "Select Temporary Folder"
+#. i18n: file: rip/base_k3bcddbpatternwidget.ui:118
+#. i18n: ectx: property (text), widget (KUrlLabel, m_conditionalInclusionLabel)
+#: rc.cpp:238
+msgid "About conditional inclusion"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:192
-msgid "Wri&te image files to:"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:41
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:247
+msgid "V&olume set name:"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:193
-msgid "Temporary Folder"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:81
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
+#: rc.cpp:253
+msgid "P&reparer:"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:196
-msgid "Select Temporary File"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:94
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
+#: rc.cpp:256
+msgid "P&ublisher:"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:198
-msgid "Wri&te image file to:"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:107
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:259
+msgid "Volu&me set size:"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:199
-msgid "Temporary File"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:169
+#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
+#: rc.cpp:265
+msgid "S&ystem:"
+msgstr "C&ysawd:"
+
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:189
+#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
+#: rc.cpp:268
+msgid "&Application:"
+msgstr "&Cymhwysiad :"
+
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:244
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonFindBiblio)
+#: rc.cpp:271
+msgid "Select a bibliographic file from the project"
 msgstr ""
 
-#: k3btempdirselectionwidget.cpp:209
-msgid "Size of project:"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:265
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonFindAbstract)
+#: rc.cpp:277
+msgid "Select an abstract file from the project"
 msgstr ""
 
-#: k3bapplication.cpp:122
-msgid "Creating GUI..."
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:286
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonFindCopyright)
+#: rc.cpp:283
+msgid "Select a copyright file from the project"
 msgstr ""
 
-#: k3bapplication.cpp:134
-msgid "Ready."
-msgstr "Parod."
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:298
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:289
+msgid "Abstract file:"
+msgstr ""
 
-#: k3bapplication.cpp:139
-msgid "Checking System"
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:308
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:292
+msgid "Copyright file:"
 msgstr ""
 
-#: k3bapplication.cpp:174
-msgid "K3b is currently busy and cannot start any other operations."
+#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:318
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:295
+msgid "Bibliographic file:"
 msgstr ""
 
-#: k3bapplication.cpp:175
-msgid "K3b is busy"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:21
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#: rc.cpp:298
+msgid "Messa&ge:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:91
-msgid "Medium will be overwritten."
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:39
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopySongwriter)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:69
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyComposer)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:125
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyArranger)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:177
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyTitle)
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:217
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyPerformer)
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:69
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyPerformer)
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:86
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyTitle)
+#: rc.cpp:301 rc.cpp:310 rc.cpp:325 rc.cpp:337 rc.cpp:346 rc.cpp:786
+#: rc.cpp:792
+msgid "Copy to all tracks"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:125
-msgid "Burn Medium"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:307
+msgid "&UPC EAN:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:131
-msgid "Speed:"
-msgstr "Cyflymder:"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:81
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:29
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:316 rc.cpp:494
+msgid "So&ngwriter:"
+msgstr ""
 
-#: k3bwriterselectionwidget.cpp:137
-msgid "Writing app:"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:94
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:74
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:319 rc.cpp:500
+msgid "&Composer:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:169
-msgid "The medium that will be used for burning"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:107
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:322
+msgid "&Disk id:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:170
-msgid "The speed at which to burn the medium"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:137
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:331 rc.cpp:497
+msgid "&Arranger:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:171
-msgid "The external application to actually burn the medium"
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:159
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:103
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:334 rc.cpp:506
+msgid "&Performer:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:173
-msgid ""
-"<p>Select the medium that you want to use for burning.<p>In most cases there "
-"will only be one medium available which does not leave much choice."
+#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:189
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:129
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:95
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:343 rc.cpp:512 rc.cpp:795
+msgid "&Title:"
+msgstr "&Teitl:"
+
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:18
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:352
+msgid "Playback Settings"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:176
-msgid ""
-"<p>Select the speed with which you want to burn.<p><b>Auto</b><br>This will "
-"choose the maximum writing speed possible with the used medium. This is the "
-"recommended selection for most media.</p><p><b>Ignore</b> (DVD only)<br>This "
-"will leave the speed selection to the writer device. Use this if K3b is "
-"unable to set the writing speed.<p>1x refers to 175 KB/s for CD, 1385 KB/s "
-"for DVD, and 4496 KB/s for Blu-ray.</p><p><b>Caution:</b> Make sure your "
-"system is able to send the data fast enough to prevent buffer underruns."
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:24
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:355
+msgid "MPlayer subtitle fontset:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:187
-msgid ""
-"<p>K3b uses the command line tools cdrecord, growisofs, and cdrdao to "
-"actually write a CD or DVD.<p>Normally K3b chooses the best suited "
-"application for every task automatically but in some cases it may be "
-"possible that one of the applications does not work as intended with a "
-"certain writer. In this case one may select the application manually."
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:34
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboSubtitleFontset)
+#: rc.cpp:358
+msgid "Select the font to be used to render subtitles"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:316
-msgid "More..."
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:44
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:361
+msgid "Unwanted MPlayer options:"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:604
-msgid ""
-"Please enter the speed that K3b should use for burning (Example: 16x)."
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:56
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkRandomPlay)
+#: rc.cpp:364
+msgid "The files are played in random order"
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:607
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:59
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkRandomPlay)
+#: rc.cpp:367
 msgid ""
-"<p>K3b is not able to perfectly determine the maximum writing speed of an "
-"optical writer. Writing speed is always reported subject to the inserted "
-"medium.<p>Please enter the writing speed here and K3b will remember it for "
-"future sessions (Example: 16x)."
+"<p>If this option is checked the order in which the files are played is "
+"determined randomly every time it is played."
 msgstr ""
 
-#: k3bwriterselectionwidget.cpp:627
-msgid "Set writing speed manually"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:62
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkRandomPlay)
+#: rc.cpp:370
+msgid "Pla&y files randomly"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:80
-msgid "No medium present"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:69
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkNoDma)
+#: rc.cpp:373
+msgid "Do not use DMA for media access"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:101
-msgid "Medium"
-msgstr "Canolig"
-
-#: k3bdiskinfoview.cpp:105
-msgid "ISO9660 Filesystem Info"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:72
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkNoDma)
+#: rc.cpp:376
+msgid ""
+"<p>If this option is checked the resulting eMovix CD/DVD will not use DMA "
+"for accessing the drive. This will slow down reading from the CD/DVD but may "
+"be necessary on some systems that do not support DMA.</p>"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:110
-msgid "Tracks"
-msgstr "Traciau"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:75
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkNoDma)
+#: rc.cpp:379
+msgid "&Do not use DMA"
+msgstr ""
 
-#: k3bdiskinfoview.cpp:182
-msgid "Data/Mode1"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:84
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_editUnwantedMplayerOptions)
+#: rc.cpp:382
+msgid "MPlayer options you want to be sure MPlayer will not use"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:184
-msgid "Data/Mode2"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:89
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_editUnwantedMplayerOptions)
+#: rc.cpp:385
+msgid ""
+"<p>Here one can specify MPlayer options that should never be used.\n"
+"<p>They have to be separated by spaces:\n"
+"<pre>opt1 opt2 opt3</pre>"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:186
-msgid "Data/Mode2 XA Form1"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:96
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_editAdditionalMplayerOptions)
+#: rc.cpp:390
+msgid "Additional MPlayer options"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:188
-msgid "Data/Mode2 XA Form2"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:101
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_editAdditionalMplayerOptions)
+#: rc.cpp:393
+msgid ""
+"<p>MPlayer options that should be used in any case.\n"
+"<p>They have to be separated by spaces:\n"
+"<pre>opt1 opt2 opt3</pre>"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:197
-msgid "copy"
-msgstr "copio"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:108
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:398
+msgid "Additional MPlayer options:"
+msgstr ""
 
-#: k3bdiskinfoview.cpp:197
-msgid "no copy"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:118
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:401
+msgid "Loop playlist:"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:199
-msgid "preemp"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:128
+#. i18n: ectx: property (toolTip), widget (QSpinBox, m_spinLoop)
+#: rc.cpp:404
+msgid "How many times should the playlist be looped"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:199
-msgid "no preemp"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:131
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_spinLoop)
+#: rc.cpp:407
+msgid "infinity"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:200
-msgid "incremental"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:144
+#. i18n: ectx: property (text), widget (QLabel, m_labelAudioBackground)
+#: rc.cpp:413
+msgid "Audio Player Background:"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:200
-msgid "uninterrupted"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:154
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboAudioBackground)
+#: rc.cpp:416
+msgid "Background video to show during audio playback"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:252
-msgid "Attributes"
-msgstr "Priodweddion"
-
-#: k3bdiskinfoview.cpp:254
-msgid "First-Last Sector"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:159
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboAudioBackground)
+#: rc.cpp:419
+msgid ""
+"<p><b>Audio Player Background</b>\n"
+"<p>During audio playback normally the screen would be black. However, if a "
+"background movie has been selected, eMovix will display it during playback.\n"
+"<p>Additional background movies can be installed. However, this is not as "
+"simple as a few mouse clicks. The background movies are stored in the emovix "
+"shared data folder (mostly <i>/usr/share/emovix</i> or "
+"<i>/usr/local/share/emovix</i>) under <em>backgrounds</em>. So to add a "
+"background one has to copy the file to that folder."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:296
-msgid "Unknown (probably CD-ROM)"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:169
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:424
+msgid "Startup Behavior"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:299
-msgid "Media ID:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:175
+#. i18n: ectx: property (text), widget (QLabel, m_labelKeyboardLayout)
+#: rc.cpp:427
+msgid "Keyboard Layout:"
+msgstr "Cynllun Bysellfwrdd:"
+
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:185
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:430
+msgid "eMovix boot message language:"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:300
-msgid "Capacity:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:195
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboBootMessageLanguage)
+#: rc.cpp:433
+msgid "Select the language of the eMovix help screens"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:302
-msgid "Used Capacity:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:202
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:436
+msgid "Default boot label:"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:306
-msgid "Remaining:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:212
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboDefaultBootLabel)
+#: rc.cpp:439
+msgid "Select the default Linux kernel configuration"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:307
-msgid "Rewritable:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:222
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboDefaultBootLabel)
+#: rc.cpp:442
+msgid ""
+"<p><b>eMovix Boot Labels</b>\n"
+"<p>eMovix provides a variety of different boot configurations which can be "
+"selected at boot time via a boot label (comparable to Lilo or Grub). The "
+"many different boot configurations mainly influence the Video output.\n"
+"<p>The <b>default</b>, <b>movix</b>, or <b>MoviX</b> labels start a general "
+"Vesa video driver.\n"
+"<p>The <b>TV</b> labels can be used to direct video to the TV output of the "
+"graphic board. eMovix provides TVout drivers for different brands of graphic "
+"boards.\n"
+"<p>The <b>FB</b> labels refer to configurations that start a Frame Buffer "
+"driver in different screen resolutions.\n"
+"<p>The <b>AA</b> labels make eMovix output the video through the ASCII-Art "
+"library which displays the picture in text mode through the usage of simple "
+"ASCII characters.\n"
+"<p>The <b>hd</b> label makes eMovix boot from the local harddisk instead of "
+"the medium. This can be used to prevent accidental starting of an eMovix "
+"medium.\n"
+"<p>The <b>floppy</b> label makes eMovix boot from the local floppy drive "
+"instead of the medium."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:307 k3bdiskinfoview.cpp:308 k3bdiskinfoview.cpp:309
-msgctxt "Availability"
-msgid "yes"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:229
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboKeyboardLayout)
+#: rc.cpp:452
+msgid "Select the layout of the keyboard"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:307 k3bdiskinfoview.cpp:308 k3bdiskinfoview.cpp:309
-msgctxt "Availability"
-msgid "no"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:232
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboKeyboardLayout)
+#: rc.cpp:455
+msgid ""
+"<p>The keyboard layout selected here will be used for eMovix commands such "
+"as controlling the media player."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:308
-msgid "Appendable:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:248
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:458
+msgid "Behavior After Playing"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:309
-msgid "Empty:"
-msgstr "Gwag :"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:254
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkEject)
+#: rc.cpp:461
+msgid "Eject the disk after playing has finished"
+msgstr ""
 
-#: k3bdiskinfoview.cpp:311
-msgctxt "Number of layers on an optical medium"
-msgid "Layers:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:257
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkEject)
+#: rc.cpp:464
+msgid ""
+"<p>If this option is checked the disk will be ejected after MPlayer has "
+"finished."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:317
-msgid "not formatted"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:260
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkEject)
+#: rc.cpp:467
+msgid "E&ject disk"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:320
-msgid "incomplete"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:267
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkShutdown)
+#: rc.cpp:470
+msgid "Shutdown after playing has finished"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:323
-msgid "in progress"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:270
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkShutdown)
+#: rc.cpp:473
+msgid ""
+"<p>If this option is checked the PC will be shut down after MPlayer has "
+"finished playing."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:326
-msgid "complete"
-msgstr "cyflawn"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:273
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkShutdown)
+#: rc.cpp:476
+msgid "Sh&utdown"
+msgstr "Ca&u i Lawr"
 
-#: k3bdiskinfoview.cpp:329
-msgid "unknown state"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:280
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkReboot)
+#: rc.cpp:479
+msgid "Reboot after playing has finished"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:332
-msgid "Background Format:"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:283
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkReboot)
+#: rc.cpp:482
+msgid ""
+"<p>If this option is checked the PC will be rebooted after MPlayer has "
+"finished playing."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:335
-msgid "Sessions:"
-msgstr "Sesiynau :"
+#. i18n: file: projects/base_k3bmovixoptionswidget.ui:286
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkReboot)
+#: rc.cpp:485
+msgid "Re&boot"
+msgstr "Ai&lgychwyn"
 
-#: k3bdiskinfoview.cpp:357
-msgid "Supported writing speeds:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:8
+#. i18n: ectx: property (windowTitle), widget (QWidget, K3bAudioTrackWidget)
+#: rc.cpp:488
+msgid "K3bAudioTrackWidget"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:370 misc/k3bimagewritingdialog.cpp:682
-msgid "System Id:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:18
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:491
+msgid "C&D-Text"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:371 misc/k3bimagewritingdialog.cpp:690
-msgid "Volume Id:"
-msgstr ""
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:87
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#: rc.cpp:503
+msgid "&Message:"
+msgstr "&Neges:"
 
-#: k3bdiskinfoview.cpp:372 misc/k3bimagewritingdialog.cpp:698
-msgid "Volume Set Id:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:116
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:509
+msgid "&ISRC:"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:373 misc/k3bimagewritingdialog.cpp:706
-msgid "Publisher Id:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:173
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkPreemphasis)
+#: rc.cpp:518
+msgid "Preemph&asis"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:374 misc/k3bimagewritingdialog.cpp:714
-msgid "Preparer Id:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:176
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkPreemphasis)
+#: rc.cpp:521
+msgid ""
+"<p>Preemphasis is mainly used in audio processing. Higher frequencies in "
+"audio signals usually have lower amplitudes. This can lead to bad signal "
+"quality on noisy transmission because the high frequencies might become too "
+"weak. To avoid this effect, high frequencies are amplified before "
+"transmission (preemphasis); the receiver will then weaken them accordingly "
+"for playback."
 msgstr ""
 
-#: k3bdiskinfoview.cpp:375 misc/k3bimagewritingdialog.cpp:721
-msgid "Application Id:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:183
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkCopyPermitted)
+#: rc.cpp:524
+msgid "&Copy permitted"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:376 misc/k3bimagewritingdialog.cpp:675
-msgid "Volume Size:"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:192
+#. i18n: ectx: property (text), widget (QLabel, m_labelPostGap)
+#: rc.cpp:527
+msgid "Post-Gap:"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:379
-#, kde-format
-msgctxt "Size of one block, always 2048"
-msgid "%1 B"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:202
+#. i18n: ectx: property (toolTip), widget (K3b::MsfEdit, m_editPostGap)
+#: rc.cpp:530
+msgid "Set the length of the track's post-gap"
 msgstr ""
 
-#: k3bdiskinfoview.cpp:380
-#, kde-format
-msgctxt "Number of blocks (one block has 2048 bytes)"
-msgid "1 block"
-msgid_plural "%1 blocks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: k3bdiskinfoview.cpp:381
-#, kde-format
-msgid "1 B"
-msgid_plural "%1 B"
-msgstr[0] ""
-msgstr[1] ""
-
-#: k3bdatamodewidget.cpp:34
-msgid "Mode1"
-msgstr "Modd1"
-
-#: k3bdatamodewidget.cpp:35
-msgid "Mode2"
-msgstr "Modd2"
-
-#: k3bdatamodewidget.cpp:37
-msgid "Select the mode for the data-track"
+#. i18n: file: projects/base_k3baudiotrackwidget.ui:210
+#. i18n: ectx: property (whatsThis), widget (K3b::MsfEdit, m_editPostGap)
+#: rc.cpp:533
+msgid ""
+"<p>On an audio CD each track (except for the last) can have a post-gap.\n"
+"This does not mean that K3b adds an additional gap of silence to the track. "
+"This setting simply influences the display on a Hifi audio CD player. The "
+"part of an audio track that is marked as post-gap is counted backwards.\n"
+"<p>This setting is irrelevant for most users as modern CD burners can put "
+"arbitrary audio data in the post-gap when burning in DAO mode.\n"
+"<p><i>In other CD-burning applications the post-gap might be called the pre-"
+"gap. The pre-gap of track 2 is the same as the post-gap of track 1.\n"
+"<p><b>Changing the post-gap does not change the length of the track.</b>\n"
+"<p><b>When writing in TAO writing mode (not recommended for Audio CDs) the "
+"post-gap will most likely be muted and on some burners forced to 2 "
+"seconds.</b>"
 msgstr ""
 
-#: k3bdatamodewidget.cpp:38
-msgid ""
-"<p><b>Data Mode</b><p>Data tracks may be written in two different "
-"modes:</p><p><b>Auto</b><br>Let K3b select the best suited data "
-"mode.</p><p><b>Mode 1</b><br>This is the <em>original</em> writing mode as "
-"introduced in the <em>Yellow Book</em> standard. It is the preferred mode "
-"when writing pure data CDs.</p><p><b>Mode 2</b><br>To be exact <em>XA Mode 2 "
-"Form 1</em>, but since the other modes are rarely used it is common to refer "
-"to it as <em>Mode 2</em>.</p><p><b>Be aware:</b> Do not mix different modes "
-"on one CD. Some older drives may have problems reading mode 1 multisession "
-"CDs."
+#. i18n: file: projects/base_k3bbootimageview.ui:24
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:541
+msgid "Boot images:"
 msgstr ""
 
-#: k3bstatusbarmanager.cpp:60
-msgid "Temp:"
+#. i18n: file: projects/base_k3bbootimageview.ui:34
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonNew)
+#: rc.cpp:544
+msgid "&New..."
+msgstr "&Newydd..."
+
+#. i18n: file: projects/base_k3bbootimageview.ui:37
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_buttonNew)
+#: rc.cpp:547
+msgid "Add new boot image"
 msgstr ""
 
-#: k3bstatusbarmanager.cpp:118
-msgid "No info"
+#. i18n: file: projects/base_k3bbootimageview.ui:44
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonDelete)
+#: rc.cpp:550
+msgid "&Delete"
 msgstr ""
 
-#: k3bstatusbarmanager.cpp:174
-#, kde-format
-msgid "1 folder"
-msgid_plural "%1 folders"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: projects/base_k3bbootimageview.ui:47
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_buttonDelete)
+#: rc.cpp:553
+msgid "Remove selected boot image"
+msgstr ""
 
-#: k3bstatusbarmanager.cpp:171
-#, kde-format
-msgid "1 file in %2"
-msgid_plural "%1 files in %2"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: projects/base_k3bbootimageview.ui:63
+#. i18n: ectx: property (text), widget (K3ListView, m_viewImages)
+#. i18n: file: projects/base_k3bbootimageview.ui:99
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_groupImageType)
+#: rc.cpp:556 rc.cpp:565
+msgid "Emulation Type"
+msgstr ""
 
-#: k3bstatusbarmanager.cpp:201
-#, kde-format
-msgid "Audio CD (1 track)"
-msgid_plural "Audio CD (%1 tracks)"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: projects/base_k3bbootimageview.ui:105
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioFloppy)
+#: rc.cpp:568
+msgid "Flopp&y"
+msgstr "L&lipa"
 
-#: k3bstatusbarmanager.cpp:207
-#, kde-format
-msgid "Data Project (%1)"
+#. i18n: file: projects/base_k3bbootimageview.ui:108
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioFloppy)
+#: rc.cpp:571
+msgid "Emulate a 1440/2880 kb floppy"
 msgstr ""
 
-#: k3bstatusbarmanager.cpp:214
-#, kde-format
-msgid "Mixed CD (1 track and %2)"
-msgid_plural "Mixed CD (%1 tracks and %2)"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: projects/base_k3bbootimageview.ui:118
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioHarddisk)
+#: rc.cpp:577
+msgid "Emulate a harddisk"
+msgstr ""
 
-#: k3bstatusbarmanager.cpp:221
-#, kde-format
-msgid "Video CD (1 track)"
-msgid_plural "Video CD (%1 tracks)"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: projects/base_k3bbootimageview.ui:128
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioNoEmulation)
+#: rc.cpp:583
+msgid "No emulation at all"
+msgstr ""
 
-#: k3bstatusbarmanager.cpp:227
-#, kde-format
-msgid "eMovix Project (%1)"
+#. i18n: file: projects/base_k3bbootimageview.ui:152
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkNoBoot)
+#: rc.cpp:589
+msgid "No boot image"
 msgstr ""
 
-#: k3bstatusbarmanager.cpp:233
-#, kde-format
-msgid "Video DVD (%1)"
+#. i18n: file: projects/base_k3bbootimageview.ui:155
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkNoBoot)
+#: rc.cpp:592
+msgid "Do not boot from the emulated floppy/harddisk"
 msgstr ""
 
-#: k3baudioplayer.cpp:169 k3baudioplayer.cpp:551
-msgid "no file"
+#. i18n: file: projects/base_k3bbootimageview.ui:162
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkInfoTable)
+#: rc.cpp:595
+msgid "Boot-info-table"
 msgstr ""
 
-#: k3baudioplayer.cpp:232
-msgid "Clear List"
-msgstr "Gwagu'r Rhestr"
+#. i18n: file: projects/base_k3bbootimageview.ui:174
+#. i18n: ectx: property (text), widget (QLineEdit, m_editLoadSegment)
+#. i18n: file: projects/base_k3bbootimageview.ui:184
+#. i18n: ectx: property (text), widget (QLineEdit, m_editLoadSize)
+#: rc.cpp:598 rc.cpp:601
+msgid "0"
+msgstr "0"
 
-#: k3baudioplayer.cpp:352
-msgid "No running aRtsd found"
+#. i18n: file: projects/base_k3bbootimageview.ui:194
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:604
+msgid "Boot load segment:"
 msgstr ""
 
-#: k3baudioplayer.cpp:359
-msgid "Unknown file format"
+#. i18n: file: projects/base_k3bbootimageview.ui:207
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:607
+msgid "Boot load size:"
 msgstr ""
 
-#: k3baudioplayer.cpp:593
-msgid "playing"
-msgstr "yn chwarae"
+#. i18n: file: projects/base_k3bbootimageview.ui:224
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonToggleOptions)
+#: rc.cpp:610
+msgid "Show Advanced Op&tions"
+msgstr "Dangos dewisiada&u uwch"
 
-#: k3baudioplayer.cpp:596
-msgid "paused"
-msgstr "wedi ei Seibio"
+#. i18n: file: projects/base_k3bbootimageview.ui:251
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:613
+msgid "Boot catalog:"
+msgstr ""
 
-#: k3baudioplayer.cpp:599
-msgid "stopped"
-msgstr "wedi aros"
+#. i18n: file: projects/base_k3bbootimageview.ui:261
+#. i18n: ectx: property (text), widget (QLineEdit, m_editBootCataloge)
+#: rc.cpp:616
+msgid "boot/boot.catalog"
+msgstr ""
 
-#: k3bdirview.cpp:205
-msgid ""
-"K3b uses vcdxrip from the vcdimager package to rip Video CDs. Please make "
-"sure it is installed."
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:16
+#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bDataCustomFilesystemsWidget)
+#: rc.cpp:619
+msgid "Custom Data Filesystems"
 msgstr ""
 
-#: k3bdirview.cpp:238
-#, kde-format
-msgid ""
-"<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupIsoSettings)
+#: rc.cpp:622
+msgid "File System Settings"
 msgstr ""
 
-#: k3bdirview.cpp:242
-msgid "Mount Failed"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:38
+#. i18n: ectx: property (text), widget (K3ListView, m_viewIsoSettings)
+#: rc.cpp:625
+msgid "ISO9660 Filesystem"
 msgstr ""
 
-#: k3bdirview.cpp:254
-#, kde-format
-msgid ""
-"<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:55
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:628
+msgid "File Systems"
 msgstr ""
 
-#: k3bdirview.cpp:258
-msgid "Unmount Failed"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkRockRidge)
+#: rc.cpp:631
+msgid "&Generate Rock Ridge extensions"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:132
-msgid "Burn Image"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:67
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkRockRidge)
+#: rc.cpp:634
+msgid "Add Rock Ridge extensions to the file system"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:215
-msgid "Image to Burn"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:73
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkRockRidge)
+#: rc.cpp:637
+msgid ""
+"<p>If this option is checked, K3b will generate the System Use Sharing "
+"Protocol records (SUSP) specified by the Rock Ridge Interchange Protocol "
+"(IEEE-P1282).\n"
+"<p>Rock Ridge extends the ISO-9660 filesystem by features equal to the UNIX "
+"filesystems (permissions, symbolic links, very long filenames, ...). It uses "
+"ISO-8859 or UTF-16 based characters and allows 255 octets.\n"
+"<p>Rock Ridge extensions are located at the end of each ISO-9660 directory "
+"record. This makes the Rock Ridge tree closely coupled to the ISO-9660 "
+"tree.\n"
+"<p><b>It is highly recommended to use Rock Ridge extensions on every data CD "
+"or DVD.</b>"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:220
-msgid "Choose Image File"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:80
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkJoliet)
+#: rc.cpp:643
+msgid "Generate &Joliet extensions"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:221
-msgid "*.iso *.toc *.ISO *.TOC *.cue *.CUE|Image Files"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:83
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkJoliet)
+#: rc.cpp:646
+msgid "Add Joliet extensions to the file system"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:223
-msgid "*.iso *.ISO|ISO9660 Image Files"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:90
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkJoliet)
+#: rc.cpp:649
+msgid ""
+"<p>If this option is checked, K3b will add additional Joliet extensions to "
+"the ISO-9660 file system.\n"
+"<p>Joliet is not an accepted independent international standard like ISO-"
+"9660 or Rock Ridge. It is mainly used on Windows systems.\n"
+"<p>Joliet does not allow all characters, so the Joliet filenames are not "
+"identical to the filenames on disk (as compared to Rock Ridge). Joliet has a "
+"filename length limitation of 64 chars (independent from the character "
+"coding and type e.g. European vs. Japanese). This is inconvenient, as modern "
+"file systems all allow 255 characters per path name component.\n"
+"<p>Joliet uses UTF-16 coding.\n"
+"<p><b>Caution:</b> With the exception of Linux and FreeBSD, there is no "
+"POSIX-like OS that supports Joliet. So <b>never create Joliet-only CDs or "
+"DVDs</b> for that reason."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:225
-msgid "*.cue *.CUE|Cue Files"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:97
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkUdf)
+#: rc.cpp:656
+msgid "Generate &UDF structures"
+msgstr ""
+
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:100
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkUdf)
+#: rc.cpp:659
+msgid "Add UDF structures to the file system"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:227
-msgid "*.toc *.TOC|Cdrdao TOC Files and Cdrecord Clone Images"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:104
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkUdf)
+#: rc.cpp:662
+msgid ""
+"<p>If this option is checked K3b will create UDF filesystem structures in "
+"addition to the ISO9660 filesystem.\n"
+"<p>The UDF (<em><b>U</b>niversal <b>D</b>isk <b>F</b>ormat</em>) is mainly "
+"used for DVDs."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:233
-msgid "Image Type"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:114
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
+#: rc.cpp:666
+msgid "Other Settings"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:238
-msgid "Auto Detection"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:120
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkPreservePermissions)
+#: rc.cpp:669
+msgid "Preserve file permissions (bac&kup)"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:239
-msgid "Plain data image"
+#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:124
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkPreservePermissions)
+#: rc.cpp:672
+msgid ""
+"<p>If this option is checked, all files in the resulting file system will "
+"have exactly the same permissions as the source files. (Otherwise, all files "
+"will have equal permissions and be owned by root).\n"
+"<p>This is mainly useful for backups.<p><b>Caution:</b> The permissions may "
+"not make much sense on other file systems; for example, if a user that owns "
+"a file on the CD or DVD does not exist."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:240 misc/k3bimagewritingdialog.cpp:763
-msgid "Cue/bin image"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:15
+#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bDataImageSettings)
+#: rc.cpp:676
+msgid "Data Image Settings"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:241
-msgid "Audio cue file"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, m_groupVolumeName)
+#: rc.cpp:679
+msgid "Volume Name"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:242
-msgid "Cdrdao TOC file"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:34
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonMoreVolDescFields)
+#: rc.cpp:682
+msgid "&More fields..."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:243 misc/k3bimagewritingdialog.cpp:735
-msgid "Cdrecord clone image"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:44
+#. i18n: ectx: property (title), widget (QGroupBox, m_groupFileSystem)
+#: rc.cpp:685
+msgid "File System"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:262
-msgid "No image file selected"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:56
+#. i18n: ectx: property (toolTip), widget (QComboBox, m_comboFilesystems)
+#: rc.cpp:688
+msgid "File system presets"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:330 misc/k3bimagewritingdialog.cpp:912
-#: misc/k3bmediacopydialog.cpp:154
-msgid "&Image"
-msgstr "&Delwedd"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:75
+#. i18n: ectx: property (title), widget (QGroupBox, m_groupSymlinks)
+#: rc.cpp:694
+msgid "Symbolic Links"
+msgstr "Cysylltau Symbolaidd"
 
-#: misc/k3bimagewritingdialog.cpp:343
-msgid "Data mode:"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:87
+#. i18n: ectx: property (toolTip), widget (QComboBox, m_comboSymlinkHandling)
+#: rc.cpp:697
+msgid "Symbolic link handling in the project"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:369
+#. i18n: file: projects/base_k3bdataimagesettings.ui:105
+#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboSymlinkHandling)
+#: rc.cpp:700
 msgid ""
-"<p><b>Image types supported by K3b:</p><p><b>Plain image</b><br/>Plain "
-"images are written as is to the medium using a single data track. Typical "
-"plain images are iso images as created by K3b's data project.<p><b>Cue/bin "
-"images</b><br/>Cue/bin images consist of a cue file describing the table of "
-"contents of the medium and an image file which contains the actual data. The "
-"data will be written to the medium according to the cue file.<p><b>Audio Cue "
-"image</b><br/>Audio cue images are a special kind of cue/bin image "
-"containing an image of an audio CD. The actual audio data can be encoded "
-"using any audio format supported by K3b. Audio cue files can also be "
-"imported into K3b audio projects which allows to change the order and add or "
-"remove tracks.<p><b>Cdrecord clone images</b><br/>K3b creates a cdrecord "
-"clone image of a single-session CD when copying a CD in clone mode. These "
-"images can be reused here.<p><b>Cdrdao TOC files</b><br/>K3b supports "
-"writing cdrdao's own image format, the toc files."
+"<p>K3b can create ISO9660 filesystems that contain symlinks if the Rock "
+"Ridge extensions are enabled (they are by default). You can change the way "
+"symlinks are handled in a K3b project.\n"
+"\n"
+"<p><b>No Change</b><br>\n"
+"Symlinks are used as they have been added to the project. \n"
+"\n"
+"<p><b>Discard broken symlinks</b><br>\n"
+"K3b will discard all symbolic links that do not point to a file inside the "
+"project. That includes all links to absolute paths like "
+"'/home/myhome/testfile'.\n"
+"\n"
+"<p><b>Discard all symlinks</b><br>\n"
+"K3b will discard all symbolic links that have been added to the project; "
+"meaning that the resulting file system will have no links at all.\n"
+"\n"
+"<p><b>Follow symlinks</b><br>\n"
+"Each symbolic link in the project will be replaced with the contents of the "
+"file it is pointing to. Thus, the resulting filesystem will not contain any "
+"symbolic links.<br>\n"
+"Be aware that in case Rock Ridge extensions are disabled (which is not "
+"recommended) symbolic links are always followed because ISO9660 does not "
+"support symbolic links.\n"
+"\n"
+"<p><b>Caution:</b> Symbolic links require Rock Ridge extensions."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:469
-msgid ""
-"<p>The actual file size does not match the size declared in the file header. "
-"If it has been downloaded make sure the download is complete.</p><p>Only "
-"continue if you know what you are doing.</p>"
-msgstr ""
+#. i18n: file: projects/base_k3bdataimagesettings.ui:109
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
+#. i18n: file: projects/base_k3bdataimagesettings.ui:164
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
+#: rc.cpp:718 rc.cpp:749
+msgid "No Change"
+msgstr "Dim Newid"
 
-#: misc/k3bimagewritingdialog.cpp:628
-msgid "Seems not to be a usable image"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:114
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
+#: rc.cpp:721
+msgid "Discard broken symlinks"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:643
-msgid "File not found"
-msgstr "Ni chanfuwyd y ffeil"
-
-#: misc/k3bimagewritingdialog.cpp:655 misc/k3bimagewritingdialog.cpp:734
-#: misc/k3bimagewritingdialog.cpp:762 misc/k3bimagewritingdialog.cpp:790
-msgid "Detected:"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:119
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
+#: rc.cpp:724
+msgid "Discard all symlinks"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:656
-msgid "Iso9660 image"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:124
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
+#: rc.cpp:727
+msgid "Follow symlinks"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:664 misc/k3bimagewritingdialog.cpp:740
-#: misc/k3bimagewritingdialog.cpp:768
-msgid "Filesize:"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:135
+#. i18n: ectx: property (title), widget (QGroupBox, m_groupWhitespace)
+#: rc.cpp:730
+msgid "White space handling"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:666
-#, kde-format
-msgid "%1 (different than declared volume size)"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:147
+#. i18n: ectx: property (toolTip), widget (QComboBox, m_comboSpaceHandling)
+#: rc.cpp:733
+msgid "Handling of spaces in filenames"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:745 misc/k3bimagewritingdialog.cpp:773
-msgid "Image file:"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:160
+#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboSpaceHandling)
+#: rc.cpp:736
+msgid ""
+"<p><b>No Change</b><br>\n"
+"If this option is checked, K3b will leave all spaces in filenames as they "
+"are.\n"
+"<p><b>Strip</b><br>\n"
+"If this option is checked, K3b will remove all spaces from all "
+"filenames.<br>\n"
+"Example: 'my good file.ext' becomes 'mygoodfile.ext'\n"
+"<p><b>Extended Strip</b><br>\n"
+"If this option is checked K3b will remove all spaces in all filenames and "
+"capitalize all letters following a space.<br>\n"
+"Example: 'my good file.ext' becomes 'myGoodFile.ext'\n"
+"<p><b>Replace</b><br>\n"
+"If this option is checked, K3b will replace all spaces in all filenames with "
+"the specified characters.<br>\n"
+"Example: 'my good file.ext' becomes 'my_good_file.ext'"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:751
-msgid "TOC file:"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:169
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
+#: rc.cpp:752
+msgid "Strip"
+msgstr "Tynnu"
+
+#. i18n: file: projects/base_k3bdataimagesettings.ui:174
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
+#: rc.cpp:755
+msgid "Extended Strip"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:779
-msgid "Cue file:"
+#. i18n: file: projects/base_k3bdataimagesettings.ui:196
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_editReplace)
+#: rc.cpp:761
+msgid "The string to replace spaces with"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:791
-msgid "Audio Cue Image"
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:8
+#. i18n: ectx: property (windowTitle), widget (QWidget, K3bAudioCDTextWidget)
+#: rc.cpp:767
+msgid "K3bAudioCDTextWidget"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:796
-#, kde-format
-msgid "%1 track"
-msgid_plural "%1 tracks"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:14
+#. i18n: ectx: property (title), widget (QGroupBox, m_groupCdText)
+#: rc.cpp:770
+msgid "Write CD-Text"
+msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:810
-msgid "Track"
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:30
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, m_groupCdText)
+#: rc.cpp:773
+msgid ""
+"<p><b>CD-Text</b>\n"
+"<p>If this option is checked K3b uses some otherwise unused space on the "
+"Audio CD to store additional information, such as the artist's name or the "
+"CD title.\n"
+"<p>CD-Text is an extension to the audio CD standard introduced by Sony.\n"
+"<p>CD-Text will only be usable on CD players that support this extension "
+"(mostly car CD players) and software like K3b, of course.\n"
+"<p>Since a CD-Text-enhanced Audio CD will work in any Hifi CD or DVD player "
+"even if the player does not support CD-Text explicitly, enabling it is never "
+"a bad idea (just remember to fill in the CD-Text information)."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:949
-msgid "Md5 Sum:"
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:48
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:780
+msgid "Perf&ormer:"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:980
-msgid "Calculation canceled"
+#. i18n: file: projects/base_k3baudiocdtextwidget.ui:129
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonMoreFields)
+#: rc.cpp:798
+msgid "More Fiel&ds..."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:982
-msgid "Calculation failed"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:18
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSaveOnExit)
+#: rc.cpp:804
+msgid "Ask to save modified projects on exit"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:997
-msgid "Copy checksum to clipboard"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:21
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkSaveOnExit)
+#: rc.cpp:807
+msgid "&Ask to save projects on exit"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:998
-msgid "Compare checksum..."
+#. i18n: file: option/base_k3bmiscoptiontab.ui:30
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:810
+msgid "Default Temporary Directory:"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:1004
-msgid "MD5 Sum Check"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:40
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_editTempDir)
+#: rc.cpp:813
+msgid "The directory where K3b stores temporary files"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:1005
-msgid "Please insert the MD5 Sum to compare:"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:43
+#. i18n: ectx: property (whatsThis), widget (KUrlRequester, m_editTempDir)
+#: rc.cpp:816
+msgid ""
+"<p>This is the default temporary directory. This is where K3b will store "
+"temporary files such as iso images or decoded audio files.<p>Be aware that "
+"the temporary directory may also be changed in every project burn dialog."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:1011
-#, kde-format
-msgid "The MD5 Sum of %1 equals that specified."
-msgstr ""
+#. i18n: file: option/base_k3bmiscoptiontab.ui:55
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:819
+msgid "System"
+msgstr "Cysawd"
 
-#: misc/k3bimagewritingdialog.cpp:1012
-msgid "MD5 Sums Equal"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:61
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSystemConfig)
+#: rc.cpp:822
+msgid "Check system Configuration"
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:1014
-#, kde-format
-msgid "The MD5 Sum of %1 differs from that specified."
+#. i18n: file: option/base_k3bmiscoptiontab.ui:64
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkSystemConfig)
+#: rc.cpp:825
+msgid ""
+"<p>If this option is checked K3b will check the system configuration for any "
+"problems on startup and when the user changes the settings."
 msgstr ""
 
-#: misc/k3bimagewritingdialog.cpp:1015
-msgid "MD5 Sums Differ"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:67
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkSystemConfig)
+#: rc.cpp:828
+msgid "&Check system configuration"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:68
-msgid "Disk Copy"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:77
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:831
+msgid "GUI Settings"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:69
-msgid "and CD Cloning"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:83
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkShowProgressOSD)
+#: rc.cpp:834
+msgid ""
+"<p>If this option is checked K3b will display the progress in an OSD which "
+"always stays on top of all other windows."
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:79
-msgid "Source Medium"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkShowProgressOSD)
+#: rc.cpp:837
+msgid "Show progress &OSD"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:98
-msgid "Copy Mode"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:93
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkHideMainWindowWhileWriting)
+#: rc.cpp:840
+msgid "Hide the main window while displaying the progress window"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:100 misc/k3bmediacopydialog.cpp:230
-msgid "Normal Copy"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:96
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkHideMainWindowWhileWriting)
+#: rc.cpp:843
+msgid ""
+"<p>If this option is checked K3b will hide the main window while displaying "
+"the progress dialog."
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:101 misc/k3bmediacopydialog.cpp:235
-msgid "Clone Copy"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkHideMainWindowWhileWriting)
+#: rc.cpp:846
+msgid "Hide &main window while writing"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:167
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: misc/k3bmediacopydialog.cpp:141 rc.cpp:168
-msgid "&Options"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:106
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkShowSplash)
+#: rc.cpp:849
+msgid "Show the splash screen when K3b starts"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:168
-msgid "No error correction"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkShowSplash)
+#: rc.cpp:852
+msgid "Show splash screen"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:181
-msgid "Copy CD-Text"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:116
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkKeepDialogsOpen)
+#: rc.cpp:855
+msgid "Do not close action dialogs after finishing the process"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:479
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: misc/k3bmediacopydialog.cpp:193 rc.cpp:853
-msgid "&Advanced"
-msgstr "&Uwch"
-
-#: misc/k3bmediacopydialog.cpp:214
-msgid "Skip unreadable data sectors"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:119
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkKeepDialogsOpen)
+#: rc.cpp:858
+msgid ""
+"<p>If this option is checked K3b will not close action dialogs such as the "
+"CD Copy dialog after the process has been finished. It will be kept open to "
+"start a new process, for instance, copying another CD."
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:215
-msgid "Disable the source drive's error correction"
+#. i18n: file: option/base_k3bmiscoptiontab.ui:122
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkKeepDialogsOpen)
+#: rc.cpp:861
+msgid "&Keep action dialogs open"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:216
-msgid "Copy CD-Text from the source CD if available."
+#. i18n: file: option/base_k3bmiscoptiontab.ui:131
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:864
+msgid "&Default action dialog settings:"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:218
-msgid ""
-"<p>If this option is checked K3b will disable the source drive's ECC/EDC "
-"error correction. This way sectors that are unreadable by intention can be "
-"read.<p>This may be useful for cloning CDs with copy protection based on "
-"corrupted sectors."
+#. i18n: file: option/base_k3bmiscoptiontab.ui:144
+#. i18n: ectx: property (toolTip), widget (K3b::IntMapComboBox, m_comboActionDialogSettings)
+#: rc.cpp:867
+msgid "Settings to load when opening an action dialog"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:223
-msgid ""
-"<p>If this option is checked K3b will search for CD-Text on the source CD. "
-"Disable it if your CD drive has problems with reading CD-Text or you want to "
-"stick to Cddb info."
-msgstr ""
+#. i18n: file: option/base_k3bpluginoptiontab.ui:21
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonConfigure)
+#: rc.cpp:870
+msgid "Configure..."
+msgstr "Ffurfweddu..."
 
-#: misc/k3bmediacopydialog.cpp:226
+#. i18n: file: option/base_k3bpluginoptiontab.ui:47
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:873 option/k3bpluginoptiontab.cpp:38
 msgid ""
-"<p>If this option is checked and K3b is not able to read a data sector from "
-"the source medium it will be replaced with zeros on the resulting copy."
+"<p>Here all <em>K3b Plugins</em> may be configured. Be aware that this does "
+"not include the <em>KPart Plugins</em> which embed themselves in the K3b "
+"menu structure.</p>"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:231
-msgid ""
-"<p>This is the normal copy mode for DVD, Blu-ray, and most CD media types. "
-"It allows copying Audio CDs, multi and single session Data Media, and "
-"Enhanced Audio CDs (an Audio CD containing an additional data "
-"session).<p>For VideoCDs please use the CD Cloning mode."
+#. i18n: file: option/base_k3bcddboptiontab.ui:9
+#. i18n: ectx: property (caption), widget (QWidget)
+#: rc.cpp:876
+msgid "CDDB Options"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:236
-msgid ""
-"<p>In CD Cloning mode K3b performs a raw copy of the CD. That means it does "
-"not care about the content but simply copies the CD bit by bit. It may be "
-"used to copy VideoCDs or CDs which contain erroneous "
-"sectors.<p><b>Caution:</b> Only single session CDs can be cloned."
-msgstr ""
+#. i18n: file: option/base_k3bcddboptiontab.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget)
+#: rc.cpp:879
+msgid "Local"
+msgstr "Lleol"
 
-#: misc/k3bmediacopydialog.cpp:555
-msgid "Use the same device for burning"
+#. i18n: file: option/base_k3bcddboptiontab.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox)
+#: rc.cpp:882
+msgid "Use local CDDB directory"
 msgstr ""
 
-#: misc/k3bmediacopydialog.cpp:556
-msgid "<qt>Use the same device for burning <i>(Or insert another medium)</i>"
+#. i18n: file: option/base_k3bcddboptiontab.ui:60
+#. i18n: ectx: property (text), widget (QCheckBox)
+#: rc.cpp:885
+msgid "Save entries in local directory (the first directory in the list)"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:47
-msgid "Format and Erase"
+#. i18n: file: option/base_k3bcddboptiontab.ui:94
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:888
+msgid "Directory:"
+msgstr "Cyfeiriadur:"
+
+#. i18n: file: option/base_k3bcddboptiontab.ui:100
+#. i18n: ectx: property (text), widget (K3ListView)
+#: rc.cpp:891
+msgid "Directory"
+msgstr "Cyfeiriadur"
+
+#. i18n: file: option/base_k3bcddboptiontab.ui:127
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:894
+msgid "Move directory down"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:48
-msgid "CD-RW"
+#. i18n: file: option/base_k3bcddboptiontab.ui:141
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:897
+msgid "Add directory"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:48
-msgid "DVD±RW"
+#. i18n: file: option/base_k3bcddboptiontab.ui:163
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:900
+msgid "Remove directory"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:48
-msgid "BD-RE"
+#. i18n: file: option/base_k3bcddboptiontab.ui:177
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:903
+msgid "Move directory up"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:72
-msgid "Force"
-msgstr "Gorfodi"
+#. i18n: file: option/base_k3bcddboptiontab.ui:206
+#. i18n: ectx: attribute (title), widget (QWidget)
+#: rc.cpp:906
+msgid "Remote"
+msgstr "Pell"
 
-#: misc/k3bmediaformattingdialog.cpp:73
-msgid "Quick format"
-msgstr ""
+#. i18n: file: option/base_k3bcddboptiontab.ui:243
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:909
+msgid "Server:"
+msgstr "Gweinydd:"
 
-#: misc/k3bmediaformattingdialog.cpp:87
-msgid "Force formatting of empty DVDs"
+#. i18n: file: option/base_k3bcddboptiontab.ui:265
+#. i18n: ectx: property (text), widget (K3ListView)
+#: rc.cpp:915
+msgid "Server"
+msgstr "Gweinydd"
+
+#. i18n: file: option/base_k3bcddboptiontab.ui:276
+#. i18n: ectx: property (text), widget (K3ListView)
+#: rc.cpp:918
+msgid "Port"
+msgstr "Porth"
+
+#. i18n: file: option/base_k3bcddboptiontab.ui:320
+#. i18n: ectx: property (prefix), widget (KIntNumInput)
+#: rc.cpp:921
+msgid "Port "
+msgstr "Porth "
+
+#. i18n: file: option/base_k3bcddboptiontab.ui:334
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:924
+msgid "Add server"
+msgstr "Ychwanegu gweinydd"
+
+#. i18n: file: option/base_k3bcddboptiontab.ui:348
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:927
+msgid "Remove server"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:88
-msgid ""
-"<p>If this option is checked K3b will format a DVD-RW even if it is empty. "
-"It may also be used to force K3b to format a DVD+RW, BD-RE or a DVD-RW in "
-"restricted overwrite mode.<p><b>Caution:</b> It is not recommended to format "
-"a DVD often as it may become unusable after only 10-20 reformat "
-"procedures.<p>DVD+RW and BD-RE media only needs to be formatted once. After "
-"that it just needs to be overwritten. The same applies to DVD-RW in "
-"restricted overwrite mode."
+#. i18n: file: option/base_k3bcddboptiontab.ui:362
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:930
+msgid "Move server up"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:98
-msgid "Try to perform quick formatting"
+#. i18n: file: option/base_k3bcddboptiontab.ui:376
+#. i18n: ectx: property (toolTip), widget (QToolButton)
+#: rc.cpp:933
+msgid "Move server down"
 msgstr ""
 
-#: misc/k3bmediaformattingdialog.cpp:99
-msgid ""
-"<p>If this option is checked K3b will tell the writer to perform a quick "
-"format.<p>Erasing a rewritable medium completely can take a very long time "
-"and some writers perform a full format even if quick format is enabled."
+#. i18n: file: option/base_k3bcddboptiontab.ui:403
+#. i18n: ectx: property (text), widget (QCheckBox)
+#: rc.cpp:936
+msgid "Enable remote CDDB queries"
 msgstr ""
 
-#: k3bjobprogressdialog.cpp:109
-msgid "Show Debugging Output"
+#. i18n: file: option/base_k3bcddboptiontab.ui:432
+#. i18n: ectx: property (title), widget (QGroupBox)
+#: rc.cpp:942
+msgid "CGI Path"
 msgstr ""
 
-#: k3bjobprogressdialog.cpp:208
-msgid "Overall progress:"
+#. i18n: file: option/base_k3bcddboptiontab.ui:452
+#. i18n: ectx: property (text), widget (KLineEdit)
+#: rc.cpp:945
+msgid "~/cddb/cddb.cgi"
 msgstr ""
 
-#: k3bjobprogressdialog.cpp:283 k3bjobprogressdialog.cpp:294
-#: k3bjobprogressdialog.cpp:305 k3bjobprogressdialog.cpp:316
-#, kde-format
-msgctxt "%1 and %2 are byte sizes formatted via KLocale::formatByteSize"
-msgid "%1 of %2"
-msgstr ""
+#. i18n: file: option/base_k3bcddboptiontab.ui:463
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:948
+msgid "Path:"
+msgstr "Llwybr:"
 
-#: k3bjobprogressdialog.cpp:363 k3bjobprogressdialog.cpp:374
-msgid "Success."
-msgstr "Llwyddiant."
+#. i18n: file: option/base_k3bcddboptiontab.ui:471
+#. i18n: ectx: property (text), widget (QCheckBox)
+#: rc.cpp:951
+msgid "Manual CGI path"
+msgstr ""
 
-#: k3bjobprogressdialog.cpp:376
-msgid "Successfully finished."
+#. i18n: file: option/base_k3bthemeoptiontab.ui:14
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
+#: rc.cpp:954
+msgid "Theme Selection"
 msgstr ""
 
-#: k3bjobprogressdialog.cpp:385 k3bjobprogressdialog.cpp:387
-msgid "Canceled."
-msgstr "Wedi'i ddiddymu"
+#. i18n: file: option/base_k3bthemeoptiontab.ui:24
+#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
+#: rc.cpp:957
+msgid "Theme"
+msgstr "Thema"
 
-#: k3bjobprogressdialog.cpp:390 k3bjobprogressdialog.cpp:392
-msgid "Error."
-msgstr "Gwall."
+#. i18n: file: option/base_k3bthemeoptiontab.ui:35
+#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
+#: rc.cpp:960
+msgid "Author"
+msgstr "Awdur"
 
-#: k3bjobprogressdialog.cpp:394
-msgid "Finished with errors"
-msgstr ""
+#. i18n: file: option/base_k3bthemeoptiontab.ui:46
+#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
+#: rc.cpp:963 option/k3bexternalbinwidget.cpp:135
+#: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:116
+msgid "Version"
+msgstr "Fersiwn"
 
-#: k3bjobprogressdialog.cpp:488
-msgid "Do you really want to cancel?"
-msgstr ""
+#. i18n: file: option/base_k3bthemeoptiontab.ui:57
+#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
+#: rc.cpp:966
+msgid "Comment"
+msgstr "Sylwad"
 
-#: k3bjobprogressdialog.cpp:488
-msgid "Cancel Confirmation"
+#. i18n: file: option/base_k3bthemeoptiontab.ui:108
+#. i18n: ectx: property (text), widget (QLabel, m_centerPreviewLabel)
+#: rc.cpp:972
+msgid "No theme selected"
 msgstr ""
 
-#: k3bjobprogressdialog.cpp:541
-#, kde-format
-msgctxt ""
-"@info %1 is a duration formatted using KLocale::prettyFormatDuration"
-msgid "Elapsed time: %1"
-msgstr ""
+#. i18n: file: option/base_k3bthemeoptiontab.ui:157
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonInstallTheme)
+#: rc.cpp:975
+msgid "Install New Theme..."
+msgstr "Gosod Thema Newydd..."
 
-#: k3bjobprogressdialog.cpp:548
-#, kde-format
-msgctxt ""
-"@info %1 is a duration formatted using KLocale::prettyFormatDuration"
-msgid "Remaining: %1"
-msgstr ""
+#. i18n: file: option/base_k3bthemeoptiontab.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemoveTheme)
+#: rc.cpp:978
+msgid "Remove Theme"
+msgstr "Gwaredu Thema"
 
-#: k3bprojectmanager.cpp:192
-#, kde-format
-msgid "AudioCD%1"
-msgstr ""
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:981
+msgid "General"
+msgstr "Cyffredinol"
 
-#: k3bprojectmanager.cpp:198
-#, kde-format
-msgid "Data%1"
-msgstr ""
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:27
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:984
+msgid "Name:"
+msgstr "Enw:"
 
-#: k3bprojectmanager.cpp:204
-#, kde-format
-msgid "MixedCD%1"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:40
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:987
+msgid "Filename extension:"
 msgstr ""
 
-#: k3bprojectmanager.cpp:210
-#, kde-format
-msgid "VideoCD%1"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:55
+#. i18n: ectx: property (text), widget (QTreeWidget, m_viewEncoders)
+#: rc.cpp:990 rc.cpp:1043
+msgid "Command"
 msgstr ""
 
-#: k3bprojectmanager.cpp:216
-#, kde-format
-msgid "eMovix%1"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:86
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:994
+#, no-c-format
+msgid ""
+"Please insert the command used to encode the audio data. The command has to "
+"read raw little endian (see <em>Swap Byte Order</em>) 16-bit stereo audio "
+"frames from stdin.\n"
+"<p>The following strings will be replaced by K3b:<br>\n"
+"<b>%f</b> - The filename of the resulting file. This is where the command "
+"has to write its output to.<br>\n"
+"<em>The following refer to metadata stored for example in the ID3 tag of an "
+"mp3 file (Be aware that these values might be empty).</em><br>\n"
+"<b>%t</b> - Title<br>\n"
+"<b>%a</b> - Artist<br>\n"
+"<b>%c</b> - Comment<br>\n"
+"<b>%n</b> - Track number<br>\n"
+"<b>%m</b> - Album Title<br>\n"
+"<b>%r</b> - Album Artist<br>\n"
+"<b>%x</b> - Album comment<br>\n"
+"<b>%y</b> - Release Year"
 msgstr ""
 
-#: k3bprojectmanager.cpp:222
-#, kde-format
-msgid "VideoDVD%1"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:115
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSwapByteOrder)
+#: rc.cpp:1011
+msgid "Swap the byte order of the input data"
 msgstr ""
 
-#: k3blsofwrapperdialog.cpp:46
-msgid "Device in use"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:119
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkSwapByteOrder)
+#: rc.cpp:1014
+msgid ""
+"<p> If this option is checked K3b will swap the byte order of the input "
+"data. Thus, the command has to read big endian audio frames.\n"
+"<p>If the resulting audio file sounds bad it is highly likely that the byte "
+"order is wrong and this option has to be checked."
 msgstr ""
 
-#: k3blsofwrapperdialog.cpp:50
-msgid "Quit the other applications"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:122
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkSwapByteOrder)
+#: rc.cpp:1018
+msgid "Swap &Byte Order"
 msgstr ""
 
-#: k3blsofwrapperdialog.cpp:51 k3blsofwrapperdialog.cpp:82
-msgid "Check again"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:129
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkWriteWaveHeader)
+#: rc.cpp:1021
+msgid "Create a wave header for the input data"
 msgstr ""
 
-#: k3blsofwrapperdialog.cpp:52
-msgid "Continue"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:132
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkWriteWaveHeader)
+#: rc.cpp:1024
+msgid ""
+"<p>If this option is checked K3b will write a wave header. This is useful in "
+"case the encoder application cannot read plain raw audio data."
 msgstr ""
 
-#: k3blsofwrapperdialog.cpp:73
-#, kde-format
-msgid ""
-"<p>Device <b>'%1'</b> is already in use by other applications "
-"(<em>%2</em>).<p>It is highly recommended to quit those before continuing. "
-"Otherwise K3b might not be able to fully access the device.<p><em>Hint: "
-"Sometimes shutting down an application does not happen instantly. In that "
-"case you might have to use the '%3' button."
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:135
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkWriteWaveHeader)
+#: rc.cpp:1027
+msgid "Write W&ave Header"
 msgstr ""
 
-#: k3blsofwrapperdialog.cpp:101
-msgid "<p>Do you really want K3b to kill the following processes: <em>"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1030
+msgid ""
+"<p>This dialog can be used to setup external command line applications as "
+"audio encoders. These can then be used by K3b to encode audio data (Tracks "
+"from an audio CD or the titles from an audio project) to formats that are "
+"normally not supported (i.e. no encoder plugin exists).\n"
+"<p>K3b comes with a selection of predefined external applications that "
+"depends on the installed applications."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:88 k3bsystemproblemdialog.cpp:95
-msgid "System Configuration Problems"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1034
+msgid "Configured Encoders"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:96
-#, kde-format
-msgid "1 problem"
-msgid_plural "%1 problems"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:45
+#. i18n: ectx: property (text), widget (QTreeWidget, m_viewEncoders)
+#: rc.cpp:1037
+msgid "Name"
+msgstr "Enw"
 
-#: k3bsystemproblemdialog.cpp:100
-msgid "Do not show again"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:50
+#. i18n: ectx: property (text), widget (QTreeWidget, m_viewEncoders)
+#: rc.cpp:1040
+msgid "Extension"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:151
-msgid "Solution"
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:88
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonEdit)
+#: rc.cpp:1049
+msgid "Edit..."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:180
-msgid "Click \"Modify Permissions...\" to solve this problem."
+#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:95
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonAdd)
+#: rc.cpp:1052
+msgid "Add..."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:187
-msgid "No optical drive found."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:22
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkManual)
+#: rc.cpp:1055
+msgid "Manual settings (used for all file types)"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:188
-msgid "K3b did not find any optical device in your system."
-msgstr ""
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:49
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1058
+msgid "Sample rate:"
+msgstr "Cyflymdra Enghreifftio :"
 
-#: k3bsystemproblemdialog.cpp:190
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:63
+#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1061
 msgid ""
-"Make sure HAL daemon is running, it is used by K3b for finding devices."
+"<p>The sample data encoding is signed linear (2's complement), unsigned "
+"linear, u-law (logarithmic), A-law (logarithmic), ADPCM, IMA_ADPCM, GSM, or "
+"Floating-point.</p>\n"
+"<p><b>U-law</b> (actually shorthand for mu-law) and <b>A-law</b> are the "
+"U.S. and international standards for logarithmic telephone sound "
+"compression. When uncompressed u-law has roughly the precision of 14-bit PCM "
+"audio and A-law has roughly the precision of 13-bit PCM audio. A-law and u-"
+"law data is sometimes encoded using a reversed bit-ordering (i.e. MSB "
+"becomes LSB).<br> <b>ADPCM </b> is a form of sound compression that has a "
+"good compromise between good sound quality and fast encoding/decoding time. "
+"It is used for telephone sound compression and places where full fidelity is "
+"not as important. When uncompressed it has roughly the precision of 16-bit "
+"PCM audio. Popular versions of ADPCM include G.726, MS ADPCM, and IMA ADPCM. "
+"It has different meanings in different file handlers. In .wav files it "
+"represents MS ADPCM files, in all others it means G.726 ADPCM. <br> <b>IMA "
+"ADPCM</b> is a specific form of ADPCM compression, slightly simpler and "
+"slightly lower fidelity than Microsoft's flavor of ADPCM. IMA ADPCM is also "
+"called DVI ADPCM.<br> <b>GSM</b> is a standard used for telephone sound "
+"compression in European countries and is gaining popularity because of its "
+"good quality. It is usually CPU intensive to work with GSM audio data.</p> "
+"<p><em>Description based on the SoX manpage</em></p>"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:198
-msgid "No CD/DVD/BD writer found."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:67
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1065
+msgid "Signed Linear"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:199
-msgid ""
-"K3b did not find an optical writing device in your system. Thus, you will "
-"not be able to burn CDs or DVDs. However, you can still use other K3b "
-"features such as audio track extraction, audio transcoding or ISO9660 image "
-"creation."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:72
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1068
+msgid "Unsigned Linear"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:209 k3bsystemproblemdialog.cpp:266
-#: k3bsystemproblemdialog.cpp:293 k3bsystemproblemdialog.cpp:338
-#, kde-format
-msgid "Unable to find %1 executable"
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:77
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1071
+msgid "u-law (logarithmic)"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:210
-msgid "K3b uses cdrecord to actually write CDs."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:82
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1074
+msgid "A-law (logarithmic)"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:211
-msgid "Install the cdrtools package which contains cdrecord."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:87
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1077
+msgid "ADPCM"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:217 k3bsystemproblemdialog.cpp:302
-#: k3bsystemproblemdialog.cpp:309 k3bsystemproblemdialog.cpp:317
-#: k3bsystemproblemdialog.cpp:349 k3bsystemproblemdialog.cpp:455
-#, kde-format
-msgid "Used %1 version %2 is outdated"
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:92
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1080
+msgid "IMA_ADPCM"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:218
-msgid ""
-"Although K3b supports all cdrtools versions since 1.10 it is highly "
-"recommended to at least use version 2.0."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:97
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1083
+msgid "GSM"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:221
-msgid "Install a more recent version of the cdrtools."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:102
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
+#: rc.cpp:1086
+msgid "Floating-Point"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:267
-msgid "K3b uses cdrdao to actually write CDs."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:113
+#. i18n: ectx: property (text), widget (QLineEdit, m_editSamplerate)
+#: rc.cpp:1089
+msgid "14400"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:268
-msgid "Install the cdrdao package."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:123
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:1092
+msgid "Data size:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:294
-msgid ""
-"K3b uses growisofs to actually write DVDs. Without growisofs you will not be "
-"able to write DVDs. Make sure to install at least version 5.10."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:133
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1095
+msgid "Data encoding:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:297 k3bsystemproblemdialog.cpp:340
-msgid "Install the dvd+rw-tools package."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:143
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1098
+msgid "Channels:"
+msgstr "Sianeli :"
+
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:157
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboChannels)
+#: rc.cpp:1101
+msgid "1 (mono)"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:303
-msgid ""
-"K3b needs at least growisofs version 5.10 to write DVDs. All older versions "
-"will not work and K3b will refuse to use them."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:162
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboChannels)
+#: rc.cpp:1104
+msgid "2 (stereo)"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:305 k3bsystemproblemdialog.cpp:313
-#: k3bsystemproblemdialog.cpp:321 k3bsystemproblemdialog.cpp:354
-#, kde-format
-msgid "Install a more recent version of %1."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:167
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboChannels)
+#: rc.cpp:1107
+msgid "4 (quad sound)"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:310
-msgid ""
-"K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple "
-"sessions using a growisofs version older than 5.12."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:179
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSize)
+#: rc.cpp:1110
+msgid "Bytes"
+msgstr "Beitiau"
+
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:184
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSize)
+#: rc.cpp:1113
+msgid "16-bit Words"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:318
-msgid ""
-"It is highly recommended to use growisofs 7.0 or higher. K3b will not be "
-"able to write a DVD+RW in multiple sessions using a growisofs version older "
-"than 7.0."
+#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:189
+#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSize)
+#: rc.cpp:1116
+msgid "32-bit Words"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:339
-msgid "K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:8
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, buttonGroup2)
+#: rc.cpp:1119
+msgid "Quality"
+msgstr "Ansawdd"
+
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:17
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioConstantBitrate)
+#: rc.cpp:1122
+msgid "Constant Bitrate"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:352
-msgid ""
-"K3b needs at least mkisofs version 1.14. Older versions may introduce "
-"problems when creating data projects."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:50
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioVariableBitrate)
+#: rc.cpp:1125
+msgid "Variable Bitrate"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:376
-#, kde-format
-msgid "Device %1 - %2 is automounted."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:111
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateMaximum)
+#: rc.cpp:1128
+msgid "Maximum bitrate:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:378
-msgid ""
-"K3b is not able to unmount automounted devices. Thus, especially DVD+RW "
-"rewriting might fail. There is no need to report this as a bug or feature "
-"wish; it is not possible to solve this problem from within K3b."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateMinimum)
+#: rc.cpp:1131
+msgid "Minimum bitrate:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:382
-msgid ""
-"Replace the automounting entries in /etc/fstab with old-fashioned ones or "
-"use a user-space mounting solution like pmount or ivman."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:131
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateAverage)
+#: rc.cpp:1134
+msgid "Average bitrate:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:391
-msgid "No ATAPI writing support in kernel"
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:163
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox2)
+#: rc.cpp:1140
+msgid "Channel Mode"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:392
-msgid ""
-"Your kernel does not support writing without SCSI emulation but there is at "
-"least one writer in your system not configured to use SCSI emulation."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:169
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboMode)
+#: rc.cpp:1143
+msgid "Select the channel mode."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:396
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:178
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboMode)
+#: rc.cpp:1146
 msgid ""
-"The best and recommended solution is to enable ide-scsi (SCSI emulation) for "
-"all devices. This way you will not have any problems. Be aware that you may "
-"still enable DMA on ide-scsi emulated drives."
+"<p>Select the channel mode of the resulting Mp3 file:\n"
+"<p><b>Stereo</b><br>\n"
+"In this mode, the encoder makes no use of potential correlations between the "
+"two input channels; it can, however, negotiate the bit demand between both "
+"channel, i.e. give one channel more bits if the other contains silence or "
+"needs fewer bits because of a lower complexity.\n"
+"<p><b>Joint-Stereo</b><br>\n"
+"In this mode, the encoder will make use of correlations between both "
+"channels. The signal will be matrixed into a sum (\"mid\"), computed by L+R, "
+"and difference (\"side\") signal, computed by L-R, and more bits are "
+"allocated to the mid channel. This will effectively increase the bandwidth "
+"if the signal does not have too much stereo separation, thus giving a "
+"significant gain in encoding quality.\n"
+"<p><b>Mono</b><br>\n"
+"The input will be encoded as a mono signal. If it was a stereo signal, it "
+"will be downsampled to mono. The downmix is calculated as the sum of the "
+"left and right channel, attenuated by 6 dB."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:412 k3bsystemproblemdialog.cpp:431
-#, kde-format
-msgid "%1 %2 does not support ATAPI"
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:182
+#. i18n: ectx: property (text), item, widget (KComboBox, m_comboMode)
+#: rc.cpp:1155 ../plugins/decoder/mp3/k3bmaddecoder.cpp:404
+#: ../plugins/encoder/lame/k3blametyes.h:92
+msgid "Stereo"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:413 k3bsystemproblemdialog.cpp:434
-#, kde-format
-msgid ""
-"The configured version of %1 does not support writing to ATAPI devices "
-"without SCSI emulation and there is at least one writer in your system not "
-"configured to use SCSI emulation."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:187
+#. i18n: ectx: property (text), item, widget (KComboBox, m_comboMode)
+#: rc.cpp:1158 ../plugins/decoder/mp3/k3bmaddecoder.cpp:402
+#: ../plugins/encoder/lame/k3blametyes.h:93
+msgid "Joint Stereo"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:418
-#, kde-format
-msgid ""
-"The best and recommended solution is to enable ide-scsi (SCSI emulation) for "
-"all devices. This way you will not have any problems. Or you install (or "
-"select as the default) a more recent version of %1."
+#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:192
+#. i18n: ectx: property (text), item, widget (KComboBox, m_comboMode)
+#: rc.cpp:1161 ../plugins/decoder/mp3/k3bmaddecoder.cpp:398
+#: ../plugins/encoder/lame/k3blametyes.h:94
+msgid "Mono"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:440
-msgid ""
-"Install cdrdao >= 1.1.8 which supports writing to ATAPI devices directly."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:31
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_groupVariableBitrate)
+#: rc.cpp:1167
+msgid "Quality Settings"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:442
-#, kde-format
-msgid ""
-"The best, and recommended, solution is to use ide-scsi (SCSI emulation) for "
-"all writer devices: this way you will not have any problems; or, you can "
-"install (or select as the default) a more recent version of %1."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:39
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioQualityLevel)
+#: rc.cpp:1170
+msgid "Preset:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:456
-msgid ""
-"K3b will not be able to write DVD-R Dual Layer media using a growisofs "
-"version older than 6.0."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:55
+#. i18n: ectx: property (text), widget (QLabel, m_labelQualityLevel)
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, m_labelQualityLevel)
+#: rc.cpp:1173 rc.cpp:1260
+msgid "textLabel1"
+msgstr "labelTestun1"
+
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:120
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:331
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:120
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:1176 rc.cpp:1211 rc.cpp:1263
+msgid "high quality"
+msgstr "ansawdd Uchel"
+
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:138
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:138
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#: rc.cpp:1179 rc.cpp:1266
+msgid "small file"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:458
-msgid "Install a more recent version of growisofs."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:187
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioManual)
+#: rc.cpp:1182
+msgid "Manual settings:"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:470
-#, kde-format
-msgid "No write access to device %1"
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:203
+#. i18n: ectx: property (text), widget (QLabel, m_labelManualSettings)
+#: rc.cpp:1185
+msgid "textLabel2"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:471
-#, kde-format
-msgid ""
-"K3b needs write access to all the devices to perform certain tasks. Without "
-"it you might encounter problems with %1 - %2"
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:254
+#. i18n: ectx: property (text), widget (QPushButton, m_buttonManualSettings)
+#: rc.cpp:1188
+msgid "Change Settings..."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:473
-#, kde-format
-msgid ""
-"Make sure you have write access to %1. In case you are not using devfs or "
-"udev click \"Modify Permissions...\" and setup permissions by hand."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:273
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
+#: rc.cpp:1194
+msgid "Encoder Quality"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:479
-#, kde-format
-msgid "DMA disabled on device %1 - %2"
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:282
+#. i18n: ectx: property (toolTip), widget (KIntNumInput, m_spinEncoderQuality)
+#: rc.cpp:1197
+msgid "Choose the noise shaping & psycho acoustic algorithm."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:480
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:290
+#. i18n: ectx: property (whatsThis), widget (KIntNumInput, m_spinEncoderQuality)
+#: rc.cpp:1200
 msgid ""
-"With most modern CD/DVD/BD devices enabling DMA highly increases read/write "
-"performance. If you experience very low writing speeds this is probably the "
-"cause."
+"<p>Bitrate is of course the main influence on quality. The higher the "
+"bitrate, the higher the quality. But for a given bitrate, we have a choice "
+"of algorithms to determine the best scalefactors and huffman encoding (noise "
+"shaping).\n"
+"<p>The quality increases from 0 to 9 while the encoding speed drops.\n"
+"<p>9 uses the slowest & best possible version of all algorithms.\n"
+"<p><b>7 is the recommended setting</b> while 4 still produced reasonable "
+"quality at good speed.\n"
+"<p>0 disables almost all algorithms including psy-model resulting in poor "
+"quality.\n"
+"<p><b>This setting has no influence on the size of the resulting file.</b>"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:483
-#, kde-format
-msgid "Enable DMA temporarily as root with 'hdparm -d 1 %1'."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:316
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1208
+msgid "fast encoding"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:498
-#, kde-format
-msgid "User parameters specified for external program %1"
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:361
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkCopyright)
+#: rc.cpp:1217
+msgid "Mark the encoded file as being copyrighted."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:499
-msgid ""
-"Sometimes it may be necessary to specify user parameters in addition to the "
-"parameters generated by K3b. This is simply a warning to make sure that "
-"these parameters are really wanted and will not be part of some bug report."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:364
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkCopyright)
+#: rc.cpp:1220
+msgid "Mark copyrighted"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:502
-#, kde-format
-msgid ""
-"To remove the user parameters for the external program %1 open the K3b "
-"settings page 'Programs' and choose the tab 'User Parameters'."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:371
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkOriginal)
+#: rc.cpp:1223
+msgid "Mark the encoded file as being a copy."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:544
-msgid "System locale charset is ANSI_X3.4-1968"
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:374
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkOriginal)
+#: rc.cpp:1226
+msgid "Mark as original"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:545
-msgid ""
-"Your system's locale charset (i.e. the charset used to encode filenames) is "
-"set to ANSI_X3.4-1968. It is highly unlikely that this has been done "
-"intentionally. Most likely the locale is not set at all. An invalid setting "
-"will result in problems when creating data projects."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:381
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkISO)
+#: rc.cpp:1229
+msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:549
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:385
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkISO)
+#: rc.cpp:1232
 msgid ""
-"To properly set the locale charset make sure the LC_* environment variables "
-"are set. Normally the distribution setup tools take care of this."
+"<p>If this option is checked, LAME will enforce the 7680 bit limitation on "
+"total frame size.<br>\n"
+"This results in many wasted bits for high bitrate encodings but will ensure "
+"strict ISO compatibility. This compatibility might be important for hardware "
+"players."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:562
-msgid "Running K3b as root user"
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:388
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkISO)
+#: rc.cpp:1236
+msgid "Strict ISO compliance"
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:563
-msgid ""
-"It is not recommended to run K3b under the root user account. This "
-"introduces unnecessary security risks."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:395
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkError)
+#: rc.cpp:1239
+msgid "Turn on CRC error protection."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:565
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:398
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkError)
+#: rc.cpp:1242
 msgid ""
-"Run K3b from a proper user account and setup the device and external tool "
-"permissions appropriately."
+"<p>If this option is checked, a cyclic redundancy check (CRC) code will be "
+"added to each frame, allowing transmission errors that could occur on the "
+"MP3 stream to be detected; however, it takes 16 bits per frame that would "
+"otherwise be used for encoding, thus slightly reducing the sound quality."
 msgstr ""
 
-#: k3bsystemproblemdialog.cpp:568
-msgid "The latter can be done via \"Modify Permissions...\"."
+#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:401
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkError)
+#: rc.cpp:1245
+msgid "Error protection"
 msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:1248
+msgid "File Quality"
+msgstr ""
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:29
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioQualityLevel)
+#: rc.cpp:1251
+msgid "Controls the quality of the encoded files"
+msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:18
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:5
-msgid "Playback Settings"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:32
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_radioQualityLevel)
+#: rc.cpp:1254
+msgid ""
+"<p>Vorbis' audio quality is not best measured in kilobits per second, but on "
+"a scale from -1 to 10 called \"quality\". <p>For now, quality -1 is roughly "
+"equivalent to 45kbps average, 5 is roughly 160kbps, and 10 gives about "
+"400kbps. Most people seeking very-near-CD-quality audio encode at a quality "
+"of 5 or, for lossless stereo coupling, 6. The default setting is quality 3, "
+"which at approximately 110kbps gives a smaller filesize and significantly "
+"better fidelity than .mp3 compression at 128kbps. <p><em>This explanation "
+"was copied from the www.vorbis.com FAQ.</em>"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:24
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:8
-msgid "MPlayer subtitle fontset:"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:35
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioQualityLevel)
+#: rc.cpp:1257
+msgid "&Quality level:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:34
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboSubtitleFontset)
-#: rc.cpp:11
-msgid "Select the font to be used to render subtitles"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:169
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioManual)
+#: rc.cpp:1269
+msgid "M&anual settings:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:44
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:14
-msgid "Unwanted MPlayer options:"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:209
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateUpper)
+#: rc.cpp:1272
+msgid "&Upper bitrate:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:56
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkRandomPlay)
-#: rc.cpp:17
-msgid "The files are played in random order"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:216
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateLower)
+#: rc.cpp:1275
+msgid "Lower &bitrate:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:59
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkRandomPlay)
-#: rc.cpp:20
-msgid ""
-"<p>If this option is checked the order in which the files are played is "
-"determined randomly every time it is played."
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:256
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:266
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:276
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1278 rc.cpp:1281 rc.cpp:1284
+msgid "kbps"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:62
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkRandomPlay)
-#: rc.cpp:23
-msgid "Pla&y files randomly"
+#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:292
+#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateNominal)
+#: rc.cpp:1287
+msgid "&Nominal bitrate:"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:69
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkNoDma)
-#: rc.cpp:26
-msgid "Do not use DMA for media access"
+#. i18n: file: tips:2
+#. i18n: ectx: @info:tipoftheday
+#: tips.cpp:3
+msgid ""
+"<p>...that you do not need to erase a CDRW before rewriting it manually\n"
+"since K3b can do that automatically before writing.</p>\n"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:72
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkNoDma)
-#: rc.cpp:29
+#. i18n: file: tips:9
+#. i18n: ectx: @info:tipoftheday
+#: tips.cpp:9
 msgid ""
-"<p>If this option is checked the resulting eMovix CD/DVD will not use DMA "
-"for accessing the drive. This will slow down reading from the CD/DVD but may "
-"be necessary on some systems that do not support DMA.</p>"
+"<p>...that you do not need to bother with any settings if you do not know\n"
+"what they mean. K3b is able to choose the settings best suited for you.</p>\n"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:75
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkNoDma)
-#: rc.cpp:32
-msgid "&Do not use DMA"
+#. i18n: file: tips:16
+#. i18n: ectx: @info:tipoftheday
+#: tips.cpp:15
+msgid ""
+"<p>...that K3b has two types of settings. On the one hand K3b has settings "
+"like most\n"
+"KDE applications have accessible through the configuration dialog via the "
+"settings menu;\n"
+"on the other hand every K3b action dialog has three buttons to load and save "
+"defaults\n"
+"for that action.  This way one may, for example, set the defaults for CD "
+"Copy: these defaults\n"
+"will then be loaded every time the CD Copy dialog is opened. The button "
+"<em>K3b defaults</em>\n"
+"will restore the <em>factory settings</em> in case you do not know if the "
+"settings you chose\n"
+"are appropriate.</p>\n"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:84
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_editUnwantedMplayerOptions)
-#: rc.cpp:35
-msgid "MPlayer options you want to be sure MPlayer will not use"
+#. i18n: file: tips:28
+#. i18n: ectx: @info:tipoftheday
+#: tips.cpp:26
+msgid ""
+"<p>...that you do not need to bother changing the settings marked as "
+"<em>advanced</em> if you \n"
+"do not know what they mean. K3b's defaults are suitable for most daily "
+"use.</p>\n"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:89
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_editUnwantedMplayerOptions)
-#: rc.cpp:38
+#. i18n: file: tips:35
+#. i18n: ectx: @info:tipoftheday
+#: tips.cpp:32
 msgid ""
-"<p>Here one can specify MPlayer options that should never be used.\n"
-"<p>They have to be separated by spaces:\n"
-"<pre>opt1 opt2 opt3</pre>"
+"<p>Just left-click one of your devices in the device and file tree and see "
+"what happens. K3b opens a specific\n"
+"window based on the media's contents. For an audio CD for example you will "
+"be given a list of the tracks with\n"
+"the possibility to rip these tracks to any format supported by K3b (like mp3 "
+"or Ogg-Vorbis).</p>\n"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:96
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_editAdditionalMplayerOptions)
-#: rc.cpp:43
-msgid "Additional MPlayer options"
+#. i18n: file: tips:43
+#. i18n: ectx: @info:tipoftheday
+#: tips.cpp:39
+msgid ""
+"<p>...that K3b lets you choose media instead of devices for burning. So if "
+"you want to burn to a certain\n"
+"medium simply insert it and wait for K3b to detect it. It will then appear "
+"as your burning medium.</p>\n"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:101
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_editAdditionalMplayerOptions)
-#: rc.cpp:46
-msgid ""
-"<p>MPlayer options that should be used in any case.\n"
-"<p>They have to be separated by spaces:\n"
-"<pre>opt1 opt2 opt3</pre>"
+#: k3bsystemproblemdialog.cpp:88 k3bsystemproblemdialog.cpp:95
+msgid "System Configuration Problems"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:108
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:51
-msgid "Additional MPlayer options:"
+#: k3bsystemproblemdialog.cpp:96
+#, kde-format
+msgid "1 problem"
+msgid_plural "%1 problems"
+msgstr[0] ""
+msgstr[1] ""
+
+#: k3bsystemproblemdialog.cpp:100
+msgid "Do not show again"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:118
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:54
-msgid "Loop playlist:"
+#: k3bsystemproblemdialog.cpp:105 option/k3bdevicewidget.cpp:57
+msgid "Modify Permissions..."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:128
-#. i18n: ectx: property (toolTip), widget (QSpinBox, m_spinLoop)
-#: rc.cpp:57
-msgid "How many times should the playlist be looped"
+#: k3bsystemproblemdialog.cpp:151
+msgid "Solution"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:131
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_spinLoop)
-#: rc.cpp:60
-msgid "infinity"
+#: k3bsystemproblemdialog.cpp:180
+msgid "Click \"Modify Permissions...\" to solve this problem."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:144
-#. i18n: ectx: property (text), widget (QLabel, m_labelAudioBackground)
-#: rc.cpp:66
-msgid "Audio Player Background:"
+#: k3bsystemproblemdialog.cpp:187
+msgid "No optical drive found."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:154
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboAudioBackground)
-#: rc.cpp:69
-msgid "Background video to show during audio playback"
+#: k3bsystemproblemdialog.cpp:188
+msgid "K3b did not find any optical device in your system."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:159
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboAudioBackground)
-#: rc.cpp:72
+#: k3bsystemproblemdialog.cpp:190
 msgid ""
-"<p><b>Audio Player Background</b>\n"
-"<p>During audio playback normally the screen would be black. However, if a "
-"background movie has been selected, eMovix will display it during playback.\n"
-"<p>Additional background movies can be installed. However, this is not as "
-"simple as a few mouse clicks. The background movies are stored in the emovix "
-"shared data folder (mostly <i>/usr/share/emovix</i> or "
-"<i>/usr/local/share/emovix</i>) under <em>backgrounds</em>. So to add a "
-"background one has to copy the file to that folder."
+"Make sure HAL daemon is running, it is used by K3b for finding devices."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:169
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:77
-msgid "Startup Behavior"
+#: k3bsystemproblemdialog.cpp:198
+msgid "No CD/DVD/BD writer found."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:175
-#. i18n: ectx: property (text), widget (QLabel, m_labelKeyboardLayout)
-#: rc.cpp:80
-msgid "Keyboard Layout:"
-msgstr "Cynllun Bysellfwrdd:"
+#: k3bsystemproblemdialog.cpp:199
+msgid ""
+"K3b did not find an optical writing device in your system. Thus, you will "
+"not be able to burn CDs or DVDs. However, you can still use other K3b "
+"features such as audio track extraction, audio transcoding or ISO9660 image "
+"creation."
+msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:185
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:83
-msgid "eMovix boot message language:"
+#: k3bsystemproblemdialog.cpp:209 k3bsystemproblemdialog.cpp:266
+#: k3bsystemproblemdialog.cpp:293 k3bsystemproblemdialog.cpp:338
+#, kde-format
+msgid "Unable to find %1 executable"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:195
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboBootMessageLanguage)
-#: rc.cpp:86
-msgid "Select the language of the eMovix help screens"
+#: k3bsystemproblemdialog.cpp:210
+msgid "K3b uses cdrecord to actually write CDs."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:202
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:89
-msgid "Default boot label:"
+#: k3bsystemproblemdialog.cpp:211
+msgid "Install the cdrtools package which contains cdrecord."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:212
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboDefaultBootLabel)
-#: rc.cpp:92
-msgid "Select the default Linux kernel configuration"
+#: k3bsystemproblemdialog.cpp:217 k3bsystemproblemdialog.cpp:302
+#: k3bsystemproblemdialog.cpp:309 k3bsystemproblemdialog.cpp:317
+#: k3bsystemproblemdialog.cpp:349 k3bsystemproblemdialog.cpp:455
+#, kde-format
+msgid "Used %1 version %2 is outdated"
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:222
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboDefaultBootLabel)
-#: rc.cpp:95
+#: k3bsystemproblemdialog.cpp:218
 msgid ""
-"<p><b>eMovix Boot Labels</b>\n"
-"<p>eMovix provides a variety of different boot configurations which can be "
-"selected at boot time via a boot label (comparable to Lilo or Grub). The "
-"many different boot configurations mainly influence the Video output.\n"
-"<p>The <b>default</b>, <b>movix</b>, or <b>MoviX</b> labels start a general "
-"Vesa video driver.\n"
-"<p>The <b>TV</b> labels can be used to direct video to the TV output of the "
-"graphic board. eMovix provides TVout drivers for different brands of graphic "
-"boards.\n"
-"<p>The <b>FB</b> labels refer to configurations that start a Frame Buffer "
-"driver in different screen resolutions.\n"
-"<p>The <b>AA</b> labels make eMovix output the video through the ASCII-Art "
-"library which displays the picture in text mode through the usage of simple "
-"ASCII characters.\n"
-"<p>The <b>hd</b> label makes eMovix boot from the local harddisk instead of "
-"the medium. This can be used to prevent accidental starting of an eMovix "
-"medium.\n"
-"<p>The <b>floppy</b> label makes eMovix boot from the local floppy drive "
-"instead of the medium."
+"Although K3b supports all cdrtools versions since 1.10 it is highly "
+"recommended to at least use version 2.0."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:229
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboKeyboardLayout)
-#: rc.cpp:105
-msgid "Select the layout of the keyboard"
+#: k3bsystemproblemdialog.cpp:221
+msgid "Install a more recent version of the cdrtools."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:232
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboKeyboardLayout)
-#: rc.cpp:108
-msgid ""
-"<p>The keyboard layout selected here will be used for eMovix commands such "
-"as controlling the media player."
+#: k3bsystemproblemdialog.cpp:267
+msgid "K3b uses cdrdao to actually write CDs."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:248
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:111
-msgid "Behavior After Playing"
+#: k3bsystemproblemdialog.cpp:268
+msgid "Install the cdrdao package."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:254
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkEject)
-#: rc.cpp:114
-msgid "Eject the disk after playing has finished"
+#: k3bsystemproblemdialog.cpp:294
+msgid ""
+"K3b uses growisofs to actually write DVDs. Without growisofs you will not be "
+"able to write DVDs. Make sure to install at least version 5.10."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:257
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkEject)
-#: rc.cpp:117
+#: k3bsystemproblemdialog.cpp:297 k3bsystemproblemdialog.cpp:340
+msgid "Install the dvd+rw-tools package."
+msgstr ""
+
+#: k3bsystemproblemdialog.cpp:303
 msgid ""
-"<p>If this option is checked the disk will be ejected after MPlayer has "
-"finished."
+"K3b needs at least growisofs version 5.10 to write DVDs. All older versions "
+"will not work and K3b will refuse to use them."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:260
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkEject)
-#: rc.cpp:120
-msgid "E&ject disk"
+#: k3bsystemproblemdialog.cpp:305 k3bsystemproblemdialog.cpp:313
+#: k3bsystemproblemdialog.cpp:321 k3bsystemproblemdialog.cpp:354
+#, kde-format
+msgid "Install a more recent version of %1."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:267
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkShutdown)
-#: rc.cpp:123
-msgid "Shutdown after playing has finished"
+#: k3bsystemproblemdialog.cpp:310
+msgid ""
+"K3b will not be able to copy DVDs on-the-fly or write a DVD+RW in multiple "
+"sessions using a growisofs version older than 5.12."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:270
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkShutdown)
-#: rc.cpp:126
+#: k3bsystemproblemdialog.cpp:318
 msgid ""
-"<p>If this option is checked the PC will be shut down after MPlayer has "
-"finished playing."
+"It is highly recommended to use growisofs 7.0 or higher. K3b will not be "
+"able to write a DVD+RW in multiple sessions using a growisofs version older "
+"than 7.0."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:273
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkShutdown)
-#: rc.cpp:129
-msgid "Sh&utdown"
-msgstr "Ca&u i Lawr"
-
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:280
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkReboot)
-#: rc.cpp:132
-msgid "Reboot after playing has finished"
+#: k3bsystemproblemdialog.cpp:339
+msgid "K3b uses dvd+rw-format to format DVD-RWs and DVD+RWs."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:283
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkReboot)
-#: rc.cpp:135
+#: k3bsystemproblemdialog.cpp:352
 msgid ""
-"<p>If this option is checked the PC will be rebooted after MPlayer has "
-"finished playing."
+"K3b needs at least mkisofs version 1.14. Older versions may introduce "
+"problems when creating data projects."
 msgstr ""
 
-#. i18n: file: projects/base_k3bmovixoptionswidget.ui:286
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkReboot)
-#: rc.cpp:138
-msgid "Re&boot"
-msgstr "Ai&lgychwyn"
+#: k3bsystemproblemdialog.cpp:376
+#, kde-format
+msgid "Device %1 - %2 is automounted."
+msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:8
-#. i18n: ectx: property (windowTitle), widget (QWidget, K3bAudioTrackWidget)
-#: rc.cpp:141
-msgid "K3bAudioTrackWidget"
+#: k3bsystemproblemdialog.cpp:378
+msgid ""
+"K3b is not able to unmount automounted devices. Thus, especially DVD+RW "
+"rewriting might fail. There is no need to report this as a bug or feature "
+"wish; it is not possible to solve this problem from within K3b."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:18
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:144
-msgid "C&D-Text"
+#: k3bsystemproblemdialog.cpp:382
+msgid ""
+"Replace the automounting entries in /etc/fstab with old-fashioned ones or "
+"use a user-space mounting solution like pmount or ivman."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:29
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:81
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:147 rc.cpp:435
-msgid "So&ngwriter:"
+#: k3bsystemproblemdialog.cpp:391
+msgid "No ATAPI writing support in kernel"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:137
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:150 rc.cpp:450
-msgid "&Arranger:"
+#: k3bsystemproblemdialog.cpp:392
+msgid ""
+"Your kernel does not support writing without SCSI emulation but there is at "
+"least one writer in your system not configured to use SCSI emulation."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:74
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:94
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:153 rc.cpp:438
-msgid "&Composer:"
+#: k3bsystemproblemdialog.cpp:396
+msgid ""
+"The best and recommended solution is to enable ide-scsi (SCSI emulation) for "
+"all devices. This way you will not have any problems. Be aware that you may "
+"still enable DMA on ide-scsi emulated drives."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:87
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:156
-msgid "&Message:"
-msgstr "&Neges:"
+#: k3bsystemproblemdialog.cpp:412 k3bsystemproblemdialog.cpp:431
+#, kde-format
+msgid "%1 %2 does not support ATAPI"
+msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:103
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:159
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:159 rc.cpp:453
-msgid "&Performer:"
+#: k3bsystemproblemdialog.cpp:413 k3bsystemproblemdialog.cpp:434
+#, kde-format
+msgid ""
+"The configured version of %1 does not support writing to ATAPI devices "
+"without SCSI emulation and there is at least one writer in your system not "
+"configured to use SCSI emulation."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:116
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:162
-msgid "&ISRC:"
+#: k3bsystemproblemdialog.cpp:418
+#, kde-format
+msgid ""
+"The best and recommended solution is to enable ide-scsi (SCSI emulation) for "
+"all devices. This way you will not have any problems. Or you install (or "
+"select as the default) a more recent version of %1."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:129
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:95
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:189
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:165 rc.cpp:276 rc.cpp:462
-msgid "&Title:"
-msgstr "&Teitl:"
+#: k3bsystemproblemdialog.cpp:440
+msgid ""
+"Install cdrdao >= 1.1.8 which supports writing to ATAPI devices directly."
+msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:173
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkPreemphasis)
-#: rc.cpp:171
-msgid "Preemph&asis"
+#: k3bsystemproblemdialog.cpp:442
+#, kde-format
+msgid ""
+"The best, and recommended, solution is to use ide-scsi (SCSI emulation) for "
+"all writer devices: this way you will not have any problems; or, you can "
+"install (or select as the default) a more recent version of %1."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:176
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkPreemphasis)
-#: rc.cpp:174
+#: k3bsystemproblemdialog.cpp:456
 msgid ""
-"<p>Preemphasis is mainly used in audio processing. Higher frequencies in "
-"audio signals usually have lower amplitudes. This can lead to bad signal "
-"quality on noisy transmission because the high frequencies might become too "
-"weak. To avoid this effect, high frequencies are amplified before "
-"transmission (preemphasis); the receiver will then weaken them accordingly "
-"for playback."
+"K3b will not be able to write DVD-R Dual Layer media using a growisofs "
+"version older than 6.0."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:183
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkCopyPermitted)
-#: rc.cpp:177
-msgid "&Copy permitted"
+#: k3bsystemproblemdialog.cpp:458
+msgid "Install a more recent version of growisofs."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:192
-#. i18n: ectx: property (text), widget (QLabel, m_labelPostGap)
-#: rc.cpp:180
-msgid "Post-Gap:"
+#: k3bsystemproblemdialog.cpp:470
+#, kde-format
+msgid "No write access to device %1"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:202
-#. i18n: ectx: property (toolTip), widget (K3b::MsfEdit, m_editPostGap)
-#: rc.cpp:183
-msgid "Set the length of the track's post-gap"
+#: k3bsystemproblemdialog.cpp:471
+#, kde-format
+msgid ""
+"K3b needs write access to all the devices to perform certain tasks. Without "
+"it you might encounter problems with %1 - %2"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiotrackwidget.ui:210
-#. i18n: ectx: property (whatsThis), widget (K3b::MsfEdit, m_editPostGap)
-#: rc.cpp:186
+#: k3bsystemproblemdialog.cpp:473
+#, kde-format
 msgid ""
-"<p>On an audio CD each track (except for the last) can have a post-gap.\n"
-"This does not mean that K3b adds an additional gap of silence to the track. "
-"This setting simply influences the display on a Hifi audio CD player. The "
-"part of an audio track that is marked as post-gap is counted backwards.\n"
-"<p>This setting is irrelevant for most users as modern CD burners can put "
-"arbitrary audio data in the post-gap when burning in DAO mode.\n"
-"<p><i>In other CD-burning applications the post-gap might be called the pre-"
-"gap. The pre-gap of track 2 is the same as the post-gap of track 1.\n"
-"<p><b>Changing the post-gap does not change the length of the track.</b>\n"
-"<p><b>When writing in TAO writing mode (not recommended for Audio CDs) the "
-"post-gap will most likely be muted and on some burners forced to 2 "
-"seconds.</b>"
+"Make sure you have write access to %1. In case you are not using devfs or "
+"udev click \"Modify Permissions...\" and setup permissions by hand."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:41
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:197
-msgid "V&olume set name:"
+#: k3bsystemproblemdialog.cpp:479
+#, kde-format
+msgid "DMA disabled on device %1 - %2"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:81
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#: rc.cpp:203
-msgid "P&reparer:"
+#: k3bsystemproblemdialog.cpp:480
+msgid ""
+"With most modern CD/DVD/BD devices enabling DMA highly increases read/write "
+"performance. If you experience very low writing speeds this is probably the "
+"cause."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:94
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:206
-msgid "P&ublisher:"
+#: k3bsystemproblemdialog.cpp:483
+#, kde-format
+msgid "Enable DMA temporarily as root with 'hdparm -d 1 %1'."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:107
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:209
-msgid "Volu&me set size:"
+#: k3bsystemproblemdialog.cpp:498
+#, kde-format
+msgid "User parameters specified for external program %1"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:169
-#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:215
-msgid "S&ystem:"
-msgstr "C&ysawd:"
+#: k3bsystemproblemdialog.cpp:499
+msgid ""
+"Sometimes it may be necessary to specify user parameters in addition to the "
+"parameters generated by K3b. This is simply a warning to make sure that "
+"these parameters are really wanted and will not be part of some bug report."
+msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:189
-#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#: rc.cpp:218
-msgid "&Application:"
-msgstr "&Cymhwysiad :"
+#: k3bsystemproblemdialog.cpp:502
+#, kde-format
+msgid ""
+"To remove the user parameters for the external program %1 open the K3b "
+"settings page 'Programs' and choose the tab 'User Parameters'."
+msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:244
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonFindBiblio)
-#: rc.cpp:221
-msgid "Select a bibliographic file from the project"
+#: k3bsystemproblemdialog.cpp:544
+msgid "System locale charset is ANSI_X3.4-1968"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:247
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonFindBiblio)
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:268
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonFindAbstract)
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:289
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonFindCopyright)
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:66
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyPerformer)
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:83
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyTitle)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:42
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopySongwriter)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:72
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyComposer)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:128
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyArranger)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:180
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyTitle)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:220
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonCopyPerformer)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:37
-#. i18n: ectx: property (text), widget (QToolButton, m_buttonConfigurePlugin)
-#: rc.cpp:224 rc.cpp:230 rc.cpp:236 rc.cpp:264 rc.cpp:270 rc.cpp:423
-#: rc.cpp:432 rc.cpp:447 rc.cpp:459 rc.cpp:468 rc.cpp:897
-msgid "..."
-msgstr "..."
+#: k3bsystemproblemdialog.cpp:545
+msgid ""
+"Your system's locale charset (i.e. the charset used to encode filenames) is "
+"set to ANSI_X3.4-1968. It is highly unlikely that this has been done "
+"intentionally. Most likely the locale is not set at all. An invalid setting "
+"will result in problems when creating data projects."
+msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:265
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonFindAbstract)
-#: rc.cpp:227
-msgid "Select an abstract file from the project"
+#: k3bsystemproblemdialog.cpp:549
+msgid ""
+"To properly set the locale charset make sure the LC_* environment variables "
+"are set. Normally the distribution setup tools take care of this."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:286
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonFindCopyright)
-#: rc.cpp:233
-msgid "Select a copyright file from the project"
+#: k3bsystemproblemdialog.cpp:562
+msgid "Running K3b as root user"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:298
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:239
-msgid "Abstract file:"
+#: k3bsystemproblemdialog.cpp:563
+msgid ""
+"It is not recommended to run K3b under the root user account. This "
+"introduces unnecessary security risks."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:308
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:242
-msgid "Copyright file:"
+#: k3bsystemproblemdialog.cpp:565
+msgid ""
+"Run K3b from a proper user account and setup the device and external tool "
+"permissions appropriately."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdatavolumedescwidget.ui:318
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:245
-msgid "Bibliographic file:"
+#: k3bsystemproblemdialog.cpp:568
+msgid "The latter can be done via \"Modify Permissions...\"."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:8
-#. i18n: ectx: property (windowTitle), widget (QWidget, K3bAudioCDTextWidget)
-#: rc.cpp:248
-msgid "K3bAudioCDTextWidget"
+#: k3bsystemproblemdialog.cpp:621 option/k3bdeviceoptiontab.cpp:85
+#: k3b.cpp:1399
+msgid "Unable to start K3b::Setup."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:14
-#. i18n: ectx: property (title), widget (QGroupBox, m_groupCdText)
-#: rc.cpp:251
-msgid "Write CD-Text"
+#: k3bwritingmodewidget.cpp:26
+msgid ""
+"Let K3b select the best-suited mode. This is the recommended selection."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:30
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, m_groupCdText)
-#: rc.cpp:254
+#: k3bwritingmodewidget.cpp:27
 msgid ""
-"<p><b>CD-Text</b>\n"
-"<p>If this option is checked K3b uses some otherwise unused space on the "
-"Audio CD to store additional information, such as the artist's name or the "
-"CD title.\n"
-"<p>CD-Text is an extension to the audio CD standard introduced by Sony.\n"
-"<p>CD-Text will only be usable on CD players that support this extension "
-"(mostly car CD players) and software like K3b, of course.\n"
-"<p>Since a CD-Text-enhanced Audio CD will work in any Hifi CD or DVD player "
-"even if the player does not support CD-Text explicitly, enabling it is never "
-"a bad idea (just remember to fill in the CD-Text information)."
+"<em>Disk At Once</em> or more properly <em>Session At Once</em>. The laser "
+"is never turned off while writing the CD or DVD. This is the preferred mode "
+"to write audio CDs since it allows pregaps other than 2 seconds. Not all "
+"writers support DAO.<br>DVD-R(W)s written in DAO provide the best DVD-Video "
+"compatibility."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:48
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:261
-msgid "Perf&ormer:"
+#: k3bwritingmodewidget.cpp:32
+msgid ""
+"<em>Track At Once</em> should be supported by every CD writer. The laser "
+"will be turned off after every track.<br>Most CD writers need this mode for "
+"writing multisession CDs."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:69
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyPerformer)
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:86
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyTitle)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:39
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopySongwriter)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:69
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyComposer)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:125
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyArranger)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:177
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyTitle)
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:217
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonCopyPerformer)
-#: rc.cpp:267 rc.cpp:273 rc.cpp:420 rc.cpp:429 rc.cpp:444 rc.cpp:456
-#: rc.cpp:465
-msgid "Copy to all tracks"
+#: k3bwritingmodewidget.cpp:37
+msgid ""
+"RAW writing mode. The error correction data is created by the software "
+"instead of the writer device.<br>Try this if your CD writer fails to write "
+"in DAO and TAO."
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextwidget.ui:129
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonMoreFields)
-#: rc.cpp:279
-msgid "More Fiel&ds..."
+#: k3bwritingmodewidget.cpp:40
+msgid ""
+"Incremental sequential is the default writing mode for DVD-R(W). It allows "
+"multisession DVD-R(W)s. It only applies to DVD-R(W)."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:16
-#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bDataCustomFilesystemsWidget)
-#: rc.cpp:282
-msgid "Custom Data Filesystems"
+#: k3bwritingmodewidget.cpp:42
+msgid ""
+"Restricted Overwrite allows to use a DVD-RW just like a DVD-RAM or a DVD+RW. "
+"The media may just be overwritten. It is not possible to write multisession "
+"DVD-RWs in this mode but K3b uses growisofs to grow an ISO9660 filesystem "
+"within the first session, thus allowing new files to be added to an already "
+"burned disk."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupIsoSettings)
-#: rc.cpp:285
-msgid "File System Settings"
+#: k3bwritingmodewidget.cpp:98
+msgid "Select the writing mode to use"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:38
-#. i18n: ectx: property (text), widget (K3ListView, m_viewIsoSettings)
-#: rc.cpp:288
-msgid "ISO9660 Filesystem"
+#: k3bwritingmodewidget.cpp:99
+msgid "Writing mode"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:55
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:291
-msgid "File Systems"
+#: k3bwritingmodewidget.cpp:100
+msgid ""
+"Be aware that the writing mode is ignored when writing DVD+R(W) and BD-R(E) "
+"since there is only one way to write them."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkRockRidge)
-#: rc.cpp:294
-msgid "&Generate Rock Ridge extensions"
+#: k3bwritingmodewidget.cpp:103
+msgid ""
+"The selection of writing modes depends on the inserted burning medium."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:67
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkRockRidge)
-#: rc.cpp:297
-msgid "Add Rock Ridge extensions to the file system"
+#: k3bwritingmodewidget.cpp:159
+msgid "DAO"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:73
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkRockRidge)
-#: rc.cpp:300
-msgid ""
-"<p>If this option is checked, K3b will generate the System Use Sharing "
-"Protocol records (SUSP) specified by the Rock Ridge Interchange Protocol "
-"(IEEE-P1282).\n"
-"<p>Rock Ridge extends the ISO-9660 filesystem by features equal to the UNIX "
-"filesystems (permissions, symbolic links, very long filenames, ...). It uses "
-"ISO-8859 or UTF-16 based characters and allows 255 octets.\n"
-"<p>Rock Ridge extensions are located at the end of each ISO-9660 directory "
-"record. This makes the Rock Ridge tree closely coupled to the ISO-9660 "
-"tree.\n"
-"<p><b>It is highly recommended to use Rock Ridge extensions on every data CD "
-"or DVD.</b>"
+#: k3bwritingmodewidget.cpp:161
+msgid "TAO"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:80
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkJoliet)
-#: rc.cpp:306
-msgid "Generate &Joliet extensions"
+#: k3bwritingmodewidget.cpp:163
+msgid "RAW"
+msgstr "AMRWD"
+
+#: k3bwritingmodewidget.cpp:165
+msgid "Restricted Overwrite"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:83
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkJoliet)
-#: rc.cpp:309
-msgid "Add Joliet extensions to the file system"
+#: k3bwritingmodewidget.cpp:167
+msgid "Incremental"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:90
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkJoliet)
-#: rc.cpp:312
+#: option/k3bexternalbinoptiontab.cpp:49
 msgid ""
-"<p>If this option is checked, K3b will add additional Joliet extensions to "
-"the ISO-9660 file system.\n"
-"<p>Joliet is not an accepted independent international standard like ISO-"
-"9660 or Rock Ridge. It is mainly used on Windows systems.\n"
-"<p>Joliet does not allow all characters, so the Joliet filenames are not "
-"identical to the filenames on disk (as compared to Rock Ridge). Joliet has a "
-"filename length limitation of 64 chars (independent from the character "
-"coding and type e.g. European vs. Japanese). This is inconvenient, as modern "
-"file systems all allow 255 characters per path name component.\n"
-"<p>Joliet uses UTF-16 coding.\n"
-"<p><b>Caution:</b> With the exception of Linux and FreeBSD, there is no "
-"POSIX-like OS that supports Joliet. So <b>never create Joliet-only CDs or "
-"DVDs</b> for that reason."
+"Specify the paths to the external programs that K3b needs to work properly, "
+"or press \"Search\" to let K3b search for the programs."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:97
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkUdf)
-#: rc.cpp:319
-msgid "Generate &UDF structures"
+#: option/k3bmiscoptiontab.cpp:49
+msgid "Load the K3b Defaults at dialog startup."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:100
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkUdf)
-#: rc.cpp:322
-msgid "Add UDF structures to the file system"
+#: option/k3bmiscoptiontab.cpp:52
+msgid "Load the settings saved by the user at dialog startup."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:104
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkUdf)
-#: rc.cpp:325
+#: option/k3bmiscoptiontab.cpp:55
+msgid "Load the last used settings at dialog startup."
+msgstr ""
+
+#: option/k3bmiscoptiontab.cpp:56
 msgid ""
-"<p>If this option is checked K3b will create UDF filesystem structures in "
-"addition to the ISO9660 filesystem.\n"
-"<p>The UDF (<em><b>U</b>niversal <b>D</b>isk <b>F</b>ormat</em>) is mainly "
-"used for DVDs."
+"K3b handles three sets of settings in action dialogs (action dialogs include "
+"the CD Copy dialog or the Audio CD project dialog):"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:114
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
-#: rc.cpp:329
-msgid "Other Settings"
+#: option/k3bmiscoptiontab.cpp:59
+msgid ""
+"One of these sets is loaded once an action dialog is opened. This setting "
+"defines which set it will be."
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:120
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkPreservePermissions)
-#: rc.cpp:332
-msgid "Preserve file permissions (bac&kup)"
+#: option/k3bmiscoptiontab.cpp:112
+#, kde-format
+msgid "Folder (%1) does not exist. Create?"
 msgstr ""
 
-#. i18n: file: projects/base_k3badvanceddataimagesettings.ui:124
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkPreservePermissions)
-#: rc.cpp:335
+#: option/k3bmiscoptiontab.cpp:113
+msgid "Create Folder"
+msgstr ""
+
+#: option/k3bmiscoptiontab.cpp:114
+msgid "Create"
+msgstr "Creu"
+
+#: option/k3bmiscoptiontab.cpp:128
 msgid ""
-"<p>If this option is checked, all files in the resulting file system will "
-"have exactly the same permissions as the source files. (Otherwise, all files "
-"will have equal permissions and be owned by root).\n"
-"<p>This is mainly useful for backups.<p><b>Caution:</b> The permissions may "
-"not make much sense on other file systems; for example, if a user that owns "
-"a file on the CD or DVD does not exist."
+"You specified a file for the temporary folder. K3b will use its base path as "
+"the temporary folder."
+msgstr ""
+
+#: option/k3bmiscoptiontab.cpp:137
+#, kde-format
+msgid "You do not have permission to write to %1."
+msgstr ""
+
+#: option/k3boptiondialog.cpp:133
+msgid "Miscellaneous Settings"
+msgstr "Gosodiadau Amrywiol"
+
+#: option/k3boptiondialog.cpp:142
+msgid "Devices"
+msgstr "Dyfeisiau"
+
+#: option/k3boptiondialog.cpp:143
+msgid "Setup Devices"
+msgstr ""
+
+#: option/k3boptiondialog.cpp:152 option/k3bexternalbinwidget.cpp:141
+msgid "Programs"
+msgstr "Rhaglenni"
+
+#: option/k3boptiondialog.cpp:153
+msgid "Setup External Programs"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:24
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:339
-msgid "Boot images:"
+#: option/k3boptiondialog.cpp:162
+msgid "Notifications"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:34
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonNew)
-#: rc.cpp:342
-msgid "&New..."
-msgstr "&Newydd..."
+#: option/k3boptiondialog.cpp:163
+msgid "System Notifications"
+msgstr "Hysbysiadau Cysawd"
 
-#. i18n: file: projects/base_k3bbootimageview.ui:37
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_buttonNew)
-#: rc.cpp:345
-msgid "Add new boot image"
-msgstr ""
+#: option/k3boptiondialog.cpp:172
+msgid "Plugins"
+msgstr "Ategion"
 
-#. i18n: file: projects/base_k3bbootimageview.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonDelete)
-#: rc.cpp:348
-msgid "&Delete"
+#: option/k3boptiondialog.cpp:173
+msgid "K3b Plugin Configuration"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:47
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_buttonDelete)
-#: rc.cpp:351
-msgid "Remove selected boot image"
+#: option/k3boptiondialog.cpp:182
+msgid "Themes"
+msgstr "Themâu"
+
+#: option/k3boptiondialog.cpp:183
+msgid "K3b GUI Themes"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:63
-#. i18n: ectx: property (text), widget (K3ListView, m_viewImages)
-#. i18n: file: projects/base_k3bbootimageview.ui:99
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_groupImageType)
-#: rc.cpp:354 rc.cpp:363
-msgid "Emulation Type"
+#: option/k3boptiondialog.cpp:193
+msgid "CDDB Audio CD Info Retrieval"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:105
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioFloppy)
-#: rc.cpp:366
-msgid "Flopp&y"
-msgstr "L&lipa"
+#: option/k3boptiondialog.cpp:203
+msgid "Advanced Settings"
+msgstr "Gosodiadau Uwch"
 
-#. i18n: file: projects/base_k3bbootimageview.ui:108
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioFloppy)
-#: rc.cpp:369
-msgid "Emulate a 1440/2880 kb floppy"
+#: option/k3bdeviceoptiontab.cpp:45
+msgid ""
+"K3b tries to detect all your devices properly. If K3b is unable to detect "
+"your drive, you need to modify their permissions to give K3b write access to "
+"all devices."
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:118
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioHarddisk)
-#: rc.cpp:375
-msgid "Emulate a harddisk"
+#: option/k3badvancedoptiontab.cpp:59
+msgid "Burning"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:128
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioNoEmulation)
-#: rc.cpp:381
-msgid "No emulation at all"
+#: option/k3badvancedoptiontab.cpp:63
+msgid "Allow &overburning"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:152
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkNoBoot)
-#: rc.cpp:387
-msgid "No boot image"
+#: option/k3badvancedoptiontab.cpp:64
+msgid "&Force unsafe operations"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:155
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkNoBoot)
-#: rc.cpp:390
-msgid "Do not boot from the emulated floppy/harddisk"
+#: option/k3badvancedoptiontab.cpp:65
+msgid "&Manual writing buffer size"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:162
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkInfoTable)
-#: rc.cpp:393
-msgid "Boot-info-table"
+#: option/k3badvancedoptiontab.cpp:68
+msgid "Show &advanced GUI elements"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:174
-#. i18n: ectx: property (text), widget (QLineEdit, m_editLoadSegment)
-#. i18n: file: projects/base_k3bbootimageview.ui:184
-#. i18n: ectx: property (text), widget (QLineEdit, m_editLoadSize)
-#: rc.cpp:396 rc.cpp:399
-msgid "0"
-msgstr "0"
-
-#. i18n: file: projects/base_k3bbootimageview.ui:194
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:402
-msgid "Boot load segment:"
+#: option/k3badvancedoptiontab.cpp:79
+msgid "Do not &eject medium after write process"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:207
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:405
-msgid "Boot load size:"
+#: option/k3badvancedoptiontab.cpp:81
+msgid "Automatically erase CD-RWs and DVD-RWs"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:224
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonToggleOptions)
-#: rc.cpp:408
-msgid "Show Advanced Op&tions"
-msgstr "Dangos dewisiada&u uwch"
+#: option/k3badvancedoptiontab.cpp:99
+msgid "Allow burning more than the official media capacities"
+msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:251
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:411
-msgid "Boot catalog:"
+#: option/k3badvancedoptiontab.cpp:100
+msgid ""
+"Show advanced GUI elements like allowing to choose between cdrecord and "
+"cdrdao"
 msgstr ""
 
-#. i18n: file: projects/base_k3bbootimageview.ui:261
-#. i18n: ectx: property (text), widget (QLineEdit, m_editBootCataloge)
-#: rc.cpp:414
-msgid "boot/boot.catalog"
+#: option/k3badvancedoptiontab.cpp:101
+msgid "Automatically erase CD-RWs and DVD-RWs without asking"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:21
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:417
-msgid "Messa&ge:"
+#: option/k3badvancedoptiontab.cpp:102
+msgid "Do not eject the burn medium after a completed burn process"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:426
-msgid "&UPC EAN:"
+#: option/k3badvancedoptiontab.cpp:103
+msgid "Force K3b to continue some operations otherwise deemed as unsafe"
 msgstr ""
 
-#. i18n: file: projects/base_k3baudiocdtextallfieldswidget.ui:107
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:441
-msgid "&Disk id:"
+#: option/k3badvancedoptiontab.cpp:105
+msgid ""
+"<p>If this option is checked additional GUI elements which allow to "
+"influence the behavior of K3b are shown. This includes the manual selection "
+"of the used burning tool. (Choose between cdrecord and cdrdao when writing a "
+"CD or between cdrecord and growisofs when writing a DVD/BD.)<p><b>Be aware "
+"that K3b does not support all possible tools in all project types and "
+"actions.</b>"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:15
-#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bDataImageSettings)
-#: rc.cpp:471
-msgid "Data Image Settings"
+#: option/k3badvancedoptiontab.cpp:113
+msgid ""
+"<p>Each medium has an official maximum capacity which is stored in a read-"
+"only area of the medium and is guaranteed by the vendor. However, this "
+"official maximum is not always the actual maximum. Many media have an actual "
+"total capacity that is slightly larger than the official amount.<p>If this "
+"option is checked K3b will disable a safety check that prevents burning "
+"beyond the official capacity.<p><b>Caution:</b> Enabling this option can "
+"cause failures in the end of the burning process if K3b attempts to write "
+"beyond the official capacity. It makes sense to first determine the actual "
+"maximum capacity of the media brand with a simulated burn."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, m_groupVolumeName)
-#: rc.cpp:474
-msgid "Volume Name"
+#: option/k3badvancedoptiontab.cpp:124
+msgid ""
+"<p>If this option is checked K3b will automatically erase CD-RWs and format "
+"DVD-RWs if one is found instead of an empty media before writing."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:34
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonMoreVolDescFields)
-#: rc.cpp:477
-msgid "&More fields..."
+#: option/k3badvancedoptiontab.cpp:128
+#, kde-format
+msgid ""
+"<p>K3b uses a software buffer during the burning process to avoid gaps in "
+"the data stream due to high system load. The default sizes used are %1 MB "
+"for CD and %2 MB for DVD burning.<p>If this option is checked the value "
+"specified will be used for both CD and DVD burning."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:44
-#. i18n: ectx: property (title), widget (QGroupBox, m_groupFileSystem)
-#: rc.cpp:480
-msgid "File System"
+#: option/k3badvancedoptiontab.cpp:134
+msgid ""
+"<p>If this option is checked K3b will not eject the medium once the burn "
+"process finishes. This can be helpful in case one leaves the computer after "
+"starting the burning and does not want the tray to be open all the "
+"time.<p>However, on Linux systems a freshly burned medium has to be "
+"reloaded. Otherwise the system will not detect the changes and still treat "
+"it as an empty medium."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:56
-#. i18n: ectx: property (toolTip), widget (QComboBox, m_comboFilesystems)
-#: rc.cpp:483
-msgid "File system presets"
+#: option/k3badvancedoptiontab.cpp:140
+msgid ""
+"<p>If this option is checked K3b will continue in some situations which "
+"would otherwise be deemed as unsafe.<p>This setting for example disables the "
+"check for medium speed verification. Thus, one can force K3b to burn a high "
+"speed medium on a low speed writer.<p><b>Caution:</b> Enabling this option "
+"may result in damaged media."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:63
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonCustomFilesystems)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:79
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonCustomPictureSize)
-#: rc.cpp:486 rc.cpp:781
-msgid "&Custom..."
+#: option/k3bthemeoptiontab.cpp:111
+msgid "K3b - The CD/DVD Kreator"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:75
-#. i18n: ectx: property (title), widget (QGroupBox, m_groupSymlinks)
-#: rc.cpp:489
-msgid "Symbolic Links"
-msgstr "Cysylltau Symbolaidd"
+#: option/k3bthemeoptiontab.cpp:131
+msgid "Drag or Type Theme URL"
+msgstr "Llusgwch neu Deipiwch URL Thema"
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:87
-#. i18n: ectx: property (toolTip), widget (QComboBox, m_comboSymlinkHandling)
-#: rc.cpp:492
-msgid "Symbolic link handling in the project"
-msgstr ""
+#: option/k3bthemeoptiontab.cpp:143
+#, kde-format
+msgid "Unable to find the icon theme archive %1."
+msgstr "Methu canfod yr archif thema eiconau %1."
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:105
-#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboSymlinkHandling)
-#: rc.cpp:495
+#: option/k3bthemeoptiontab.cpp:145
+#, kde-format
 msgid ""
-"<p>K3b can create ISO9660 filesystems that contain symlinks if the Rock "
-"Ridge extensions are enabled (they are by default). You can change the way "
-"symlinks are handled in a K3b project.\n"
-"\n"
-"<p><b>No Change</b><br>\n"
-"Symlinks are used as they have been added to the project. \n"
-"\n"
-"<p><b>Discard broken symlinks</b><br>\n"
-"K3b will discard all symbolic links that do not point to a file inside the "
-"project. That includes all links to absolute paths like "
-"'/home/myhome/testfile'.\n"
-"\n"
-"<p><b>Discard all symlinks</b><br>\n"
-"K3b will discard all symbolic links that have been added to the project; "
-"meaning that the resulting file system will have no links at all.\n"
-"\n"
-"<p><b>Follow symlinks</b><br>\n"
-"Each symbolic link in the project will be replaced with the contents of the "
-"file it is pointing to. Thus, the resulting filesystem will not contain any "
-"symbolic links.<br>\n"
-"Be aware that in case Rock Ridge extensions are disabled (which is not "
-"recommended) symbolic links are always followed because ISO9660 does not "
-"support symbolic links.\n"
-"\n"
-"<p><b>Caution:</b> Symbolic links require Rock Ridge extensions."
-msgstr ""
-
-#. i18n: file: projects/base_k3bdataimagesettings.ui:109
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
-#. i18n: file: projects/base_k3bdataimagesettings.ui:164
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
-#: rc.cpp:513 rc.cpp:544
-msgid "No Change"
-msgstr "Dim Newid"
+"Unable to download the icon theme archive.\n"
+"Please check that address %1 is correct."
+msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:114
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
-#: rc.cpp:516
-msgid "Discard broken symlinks"
+#: option/k3bthemeoptiontab.cpp:177
+msgid "The file is not a valid K3b theme archive."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:119
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
-#: rc.cpp:519
-msgid "Discard all symlinks"
+#: option/k3bthemeoptiontab.cpp:185
+#, kde-format
+msgid ""
+"A theme with the name '%1' already exists. Do you want to overwrite it?"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:124
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSymlinkHandling)
-#: rc.cpp:522
-msgid "Follow symlinks"
+#: option/k3bthemeoptiontab.cpp:187
+msgid "Theme exists"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:135
-#. i18n: ectx: property (title), widget (QGroupBox, m_groupWhitespace)
-#: rc.cpp:525
-msgid "White space handling"
+#: option/k3bthemeoptiontab.cpp:206
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to remove the <strong>%1</strong> "
+"theme?<br><br>This will delete the files installed by this theme.</qt>"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:147
-#. i18n: ectx: property (toolTip), widget (QComboBox, m_comboSpaceHandling)
-#: rc.cpp:528
-msgid "Handling of spaces in filenames"
+#: option/k3bthemeoptiontab.cpp:211
+msgid "Delete"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:160
-#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboSpaceHandling)
-#: rc.cpp:531
-msgid ""
-"<p><b>No Change</b><br>\n"
-"If this option is checked, K3b will leave all spaces in filenames as they "
-"are.\n"
-"<p><b>Strip</b><br>\n"
-"If this option is checked, K3b will remove all spaces from all "
-"filenames.<br>\n"
-"Example: 'my good file.ext' becomes 'mygoodfile.ext'\n"
-"<p><b>Extended Strip</b><br>\n"
-"If this option is checked K3b will remove all spaces in all filenames and "
-"capitalize all letters following a space.<br>\n"
-"Example: 'my good file.ext' becomes 'myGoodFile.ext'\n"
-"<p><b>Replace</b><br>\n"
-"If this option is checked, K3b will replace all spaces in all filenames with "
-"the specified characters.<br>\n"
-"Example: 'my good file.ext' becomes 'my_good_file.ext'"
+#: option/k3bcddboptiontab.cpp:46
+msgid "Unable to load KCDDB configuration module."
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:169
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
-#: rc.cpp:547
-msgid "Strip"
-msgstr "Tynnu"
+#: option/k3bdevicewidget.cpp:58
+msgid "Refresh"
+msgstr "Cyfredoli"
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:174
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSpaceHandling)
-#: rc.cpp:550
-msgid "Extended Strip"
+#: option/k3bdevicewidget.cpp:59
+msgid "Rescan the devices"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:196
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_editReplace)
-#: rc.cpp:556
-msgid "The string to replace spaces with"
+#: option/k3bdevicewidget.cpp:73
+msgid "CD/DVD/BD Drives"
 msgstr ""
 
-#. i18n: file: projects/base_k3bdataimagesettings.ui:199
-#. i18n: ectx: property (text), widget (QLineEdit, m_editReplace)
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:32
-#. i18n: ectx: property (text), widget (KLineEdit, m_editBlankReplace)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:453
-#. i18n: ectx: property (text), widget (KLineEdit, m_editBlankReplace)
-#: rc.cpp:559 rc.cpp:751 rc.cpp:850
-msgid "_"
+#: option/k3bdevicewidget.cpp:123
+msgid "Writer Drives"
 msgstr ""
 
-#. i18n: file: option/base_k3bpluginoptiontab.ui:21
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonConfigure)
-#: rc.cpp:562
-msgid "Configure..."
-msgstr "Ffurfweddu..."
+#: option/k3bdevicewidget.cpp:128
+msgid "Read-only Drives"
+msgstr ""
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:14
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
-#: rc.cpp:568
-msgid "Theme Selection"
+#: option/k3bdevicewidget.cpp:144
+msgid "System device name:"
 msgstr ""
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:24
-#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
-#: rc.cpp:571
-msgid "Theme"
-msgstr "Thema"
+#: option/k3bdevicewidget.cpp:150
+msgid "Vendor:"
+msgstr "Gwerthwr :"
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:35
-#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
-#: rc.cpp:574
-msgid "Author"
-msgstr "Awdur"
+#: option/k3bdevicewidget.cpp:156
+msgid "Description:"
+msgstr "Disgrifiad:"
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:57
-#. i18n: ectx: property (text), widget (K3ListView, m_viewTheme)
-#: rc.cpp:580
-msgid "Comment"
-msgstr "Sylwad"
+#: option/k3bdevicewidget.cpp:162
+msgid "Firmware:"
+msgstr ""
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:108
-#. i18n: ectx: property (text), widget (QLabel, m_centerPreviewLabel)
-#: rc.cpp:586
-msgid "No theme selected"
+#: option/k3bdevicewidget.cpp:171
+msgid "Write Capabilities:"
 msgstr ""
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:157
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonInstallTheme)
-#: rc.cpp:589
-msgid "Install New Theme..."
-msgstr "Gosod Thema Newydd..."
+#: option/k3bdevicewidget.cpp:178
+msgid "Read Capabilities:"
+msgstr ""
 
-#. i18n: file: option/base_k3bthemeoptiontab.ui:164
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemoveTheme)
-#: rc.cpp:592
-msgid "Remove Theme"
-msgstr "Gwaredu Thema"
+#: option/k3bdevicewidget.cpp:189
+msgid "Buffer Size:"
+msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:9
-#. i18n: ectx: property (caption), widget (QWidget)
-#: rc.cpp:595
-msgid "CDDB Options"
+#: option/k3bdevicewidget.cpp:199
+msgid "Supports Burnfree:"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:598
-msgid "Local"
-msgstr "Lleol"
+#: option/k3bdevicewidget.cpp:200
+msgid "yes"
+msgstr "ie"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:49
-#. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:601
-msgid "Use local CDDB directory"
-msgstr ""
+#: option/k3bdevicewidget.cpp:200
+msgid "no"
+msgstr "nage"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:60
-#. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:604
-msgid "Save entries in local directory (the first directory in the list)"
+#: option/k3bdevicewidget.cpp:206
+msgid "Write modes:"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:94
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:607
-msgid "Directory:"
-msgstr "Cyfeiriadur:"
+#: option/k3bdevicewidget.cpp:217 option/k3bdevicewidget.cpp:222
+msgid "none"
+msgstr "dim"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:100
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:610
-msgid "Directory"
-msgstr "Cyfeiriadur"
+#: option/k3bexternalbinwidget.cpp:107
+msgid "&Search"
+msgstr "&Chwilio"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:127
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:613
-msgid "Move directory down"
-msgstr ""
+#: option/k3bexternalbinwidget.cpp:119
+msgid "Set Default"
+msgstr "Gosod yn Ragosodyn"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:141
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:616
-msgid "Add directory"
+#: option/k3bexternalbinwidget.cpp:120
+msgid "Change the versions K3b should use."
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:163
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:619
-msgid "Remove directory"
+#: option/k3bexternalbinwidget.cpp:121
+msgid ""
+"<p>If K3b finds more than one installed version of a program it will choose "
+"one as the <em>default</em>, which will be used to do the work. If you want "
+"to change the default, select the desired version and press this button."
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:177
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:622
-msgid "Move directory up"
+#: option/k3bexternalbinwidget.cpp:125
+msgid "Use the 'Default' button to change the versions K3b should use."
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:206
-#. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:625
-msgid "Remote"
-msgstr "Pell"
-
-#. i18n: file: option/base_k3bcddboptiontab.ui:243
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:628
-msgid "Server:"
-msgstr "Gweinydd:"
+#: option/k3bexternalbinwidget.cpp:134
+msgid "Path"
+msgstr "Llwybr"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:265
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:634
-msgid "Server"
-msgstr "Gweinydd"
+#: option/k3bexternalbinwidget.cpp:136
+msgid "Features"
+msgstr "Nodweddion"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:276
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:637
-msgid "Port"
-msgstr "Porth"
+#: option/k3bexternalbinwidget.cpp:149
+msgid "User parameters have to be separated by space."
+msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:320
-#. i18n: ectx: property (prefix), widget (KIntNumInput)
-#: rc.cpp:640
-msgid "Port "
-msgstr "Porth "
+#: option/k3bexternalbinwidget.cpp:156
+msgid "Program"
+msgstr "Rhaglen"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:334
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:643
-msgid "Add server"
-msgstr "Ychwanegu gweinydd"
+#: option/k3bexternalbinwidget.cpp:157
+msgid "Parameters"
+msgstr "Paramedrau"
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:348
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:646
-msgid "Remove server"
+#: option/k3bexternalbinwidget.cpp:163
+msgid "User Parameters"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:362
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:649
-msgid "Move server up"
+#: option/k3bexternalbinwidget.cpp:169 option/k3bexternalbinwidget.cpp:180
+msgid "Search Path"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:376
-#. i18n: ectx: property (toolTip), widget (QToolButton)
-#: rc.cpp:652
-msgid "Move server down"
+#: option/k3bexternalbinwidget.cpp:171
+msgid ""
+"<qt><b>Hint:</b> to force K3b to use another than the default name for the "
+"executable specify it in the search path.</qt>"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:403
-#. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:655
-msgid "Enable remote CDDB queries"
+#: option/k3bexternalbinwidget.cpp:228
+msgid " (not found)"
 msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:432
-#. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:661
-msgid "CGI Path"
-msgstr ""
+#: k3bmediumdelegate.cpp:141
+#, kde-format
+msgid "%1 in 1 track"
+msgid_plural "%1 in %2 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:452
-#. i18n: ectx: property (text), widget (KLineEdit)
-#: rc.cpp:664
-msgid "~/cddb/cddb.cgi"
-msgstr ""
+#: k3bmediumdelegate.cpp:145
+#, kde-format
+msgid " and %1 session"
+msgid_plural " and %1 sessions"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:463
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:667
-msgid "Path:"
-msgstr "Llwybr:"
+#: k3bmediumdelegate.cpp:158
+#, kde-format
+msgid "Free space: %1"
+msgstr ""
 
-#. i18n: file: option/base_k3bcddboptiontab.ui:471
-#. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:670
-msgid "Manual CGI path"
+#: k3bmediumdelegate.cpp:170
+#, kde-format
+msgid "Capacity: %1"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:18
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSaveOnExit)
-#: rc.cpp:676
-msgid "Ask to save modified projects on exit"
+#: k3blsofwrapperdialog.cpp:46
+msgid "Device in use"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:21
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkSaveOnExit)
-#: rc.cpp:679
-msgid "&Ask to save projects on exit"
+#: k3blsofwrapperdialog.cpp:50
+msgid "Quit the other applications"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:30
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:682
-msgid "Default Temporary Directory:"
+#: k3blsofwrapperdialog.cpp:51 k3blsofwrapperdialog.cpp:82
+msgid "Check again"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:40
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_editTempDir)
-#: rc.cpp:685
-msgid "The directory where K3b stores temporary files"
+#: k3blsofwrapperdialog.cpp:52
+msgid "Continue"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:43
-#. i18n: ectx: property (whatsThis), widget (KUrlRequester, m_editTempDir)
-#: rc.cpp:688
+#: k3blsofwrapperdialog.cpp:73
+#, kde-format
 msgid ""
-"<p>This is the default temporary directory. This is where K3b will store "
-"temporary files such as iso images or decoded audio files.<p>Be aware that "
-"the temporary directory may also be changed in every project burn dialog."
+"<p>Device <b>'%1'</b> is already in use by other applications "
+"(<em>%2</em>).<p>It is highly recommended to quit those before continuing. "
+"Otherwise K3b might not be able to fully access the device.<p><em>Hint: "
+"Sometimes shutting down an application does not happen instantly. In that "
+"case you might have to use the '%3' button."
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:55
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:691
-msgid "System"
-msgstr "Cysawd"
+#: k3blsofwrapperdialog.cpp:101
+msgid "<p>Do you really want K3b to kill the following processes: <em>"
+msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:61
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSystemConfig)
-#: rc.cpp:694
-msgid "Check system Configuration"
+#: k3bdebuggingoutputdialog.cpp:42
+msgid "Debugging Output"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:64
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkSystemConfig)
-#: rc.cpp:697
-msgid ""
-"<p>If this option is checked K3b will check the system configuration for any "
-"problems on startup and when the user changes the settings."
+#: k3bdebuggingoutputdialog.cpp:46 k3b.cpp:392
+msgid "Copy"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:67
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkSystemConfig)
-#: rc.cpp:700
-msgid "&Check system configuration"
+#: k3bdebuggingoutputdialog.cpp:47
+msgid "Save to file"
+msgstr "Cadw i Ffeil"
+
+#: k3bdebuggingoutputdialog.cpp:48
+msgid "Copy to clipboard"
+msgstr "Copïo i'r Gludfwrdd"
+
+#: k3bdebuggingoutputdialog.cpp:90
+#, kde-format
+msgid "Could not open file %1"
+msgstr "Methwyd agor y ffeil %1"
+
+#: k3b.cpp:236
+msgid "K3b - The CD and DVD Kreator"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:77
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:703
-msgid "GUI Settings"
+#: k3b.cpp:298
+msgid "Save All"
+msgstr "Cadw Popeth"
+
+#: k3b.cpp:301
+msgid "Close All"
+msgstr "Cau Popeth"
+
+#: k3b.cpp:316
+msgid "&New Project"
+msgstr "&Cywaith Newydd"
+
+#: k3b.cpp:319
+msgid "New &Audio CD Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:83
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkShowProgressOSD)
-#: rc.cpp:706
-msgid ""
-"<p>If this option is checked K3b will display the progress in an OSD which "
-"always stays on top of all other windows."
+#: k3b.cpp:321
+msgid "New &Data Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkShowProgressOSD)
-#: rc.cpp:709
-msgid "Show progress &OSD"
+#: k3b.cpp:323
+msgid "New &Mixed Mode CD Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:93
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkHideMainWindowWhileWriting)
-#: rc.cpp:712
-msgid "Hide the main window while displaying the progress window"
+#: k3b.cpp:325
+msgid "New &Video CD Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:96
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkHideMainWindowWhileWriting)
-#: rc.cpp:715
-msgid ""
-"<p>If this option is checked K3b will hide the main window while displaying "
-"the progress dialog."
+#: k3b.cpp:327
+msgid "New &eMovix Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkHideMainWindowWhileWriting)
-#: rc.cpp:718
-msgid "Hide &main window while writing"
+#: k3b.cpp:329
+msgid "New V&ideo DVD Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:106
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkShowSplash)
-#: rc.cpp:721
-msgid "Show the splash screen when K3b starts"
+#: k3b.cpp:350
+msgid "&Add Files..."
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:109
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkShowSplash)
-#: rc.cpp:724
-msgid "Show splash screen"
+#: k3b.cpp:353
+msgid "&Clear Project"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:116
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkKeepDialogsOpen)
-#: rc.cpp:727
-msgid "Do not close action dialogs after finishing the process"
+#: k3b.cpp:357
+msgid "Lock Panels"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:119
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkKeepDialogsOpen)
-#: rc.cpp:730
-msgid ""
-"<p>If this option is checked K3b will not close action dialogs such as the "
-"CD Copy dialog after the process has been finished. It will be kept open to "
-"start a new process, for instance, copying another CD."
+#: k3b.cpp:362
+msgid "Show Projects Header"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:122
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkKeepDialogsOpen)
-#: rc.cpp:733
-msgid "&Keep action dialogs open"
+#: k3b.cpp:373
+msgid "Format"
+msgstr "Fformat"
+
+#: k3b.cpp:376
+msgid "&Burn Image..."
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:131
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:736
-msgid "&Default action dialog settings:"
+#: k3b.cpp:420
+msgid "System Check"
 msgstr ""
 
-#. i18n: file: option/base_k3bmiscoptiontab.ui:144
-#. i18n: ectx: property (toolTip), widget (K3b::IntMapComboBox, m_comboActionDialogSettings)
-#: rc.cpp:739
-msgid "Settings to load when opening an action dialog"
+#: k3b.cpp:430
+msgid "&Setup System Permissions..."
 msgstr ""
 
-#. i18n: file: k3bdeviceui.rc:4
-#. i18n: ectx: Menu (device)
-#. i18n: file: k3bui.rc:19
-#. i18n: ectx: Menu (device)
-#: rc.cpp:742 rc.cpp:969
-msgid "&Device"
-msgstr "&Dyfais"
+#: k3b.cpp:439
+msgid "Creates a new project"
+msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, base_K3bCddbPatternWidget)
-#: rc.cpp:745
-msgid "Ripping Pattern"
+#: k3b.cpp:441
+msgid "Creates a new data project"
 msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:22
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBlankReplace)
-#: rc.cpp:748
-msgid "Replace all blan&ks with:"
+#: k3b.cpp:443
+msgid "Creates a new audio CD project"
 msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:41
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:754
-msgid "Playlist pattern:"
+#: k3b.cpp:445
+msgid "Creates a new eMovix project"
 msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:64
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:390
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:757 rc.cpp:841
-msgid "Ripped files pattern:"
+#: k3b.cpp:447
+msgid "Creates a new Video CD project"
+msgstr ""
+
+#: k3b.cpp:451
+msgid "Write an Iso9660, cue/bin, or cdrecord clone image to an optical disc"
 msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:80
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboFilenamePattern)
-#: rc.cpp:760
-msgid "Insert your custom pattern here"
+#: k3b.cpp:455
+msgid "Opens an existing project"
 msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:108
-#. i18n: ectx: property (text), widget (KUrlLabel, m_specialStringsLabel)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:423
-#. i18n: ectx: property (text), widget (KUrlLabel, m_specialStringsLabel)
-#: rc.cpp:763 rc.cpp:844
-msgid "See special strings"
+#: k3b.cpp:457
+msgid "Opens a recently used file"
+msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
+
+#: k3b.cpp:459
+msgid "Saves the current project"
 msgstr ""
 
-#. i18n: file: rip/base_k3bcddbpatternwidget.ui:118
-#. i18n: ectx: property (text), widget (KUrlLabel, m_conditionalInclusionLabel)
-#: rc.cpp:766
-msgid "About conditional inclusion"
+#: k3b.cpp:461
+msgid "Saves the current project to a new url"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:769
-msgid ""
-"Please select the audio streams you want to include in every ripped title"
+#: k3b.cpp:463
+msgid "Saves all open projects"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:43
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:772
-msgid "Setti&ngs"
-msgstr "G&osodiadau"
+#: k3b.cpp:465
+msgid "Closes the current project"
+msgstr "Cau'r cywaith cyfredol"
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:49
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
-#: rc.cpp:775
-msgid "Video Quality"
+#: k3b.cpp:467
+msgid "Closes all open projects"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:778
-msgid "Video Size:"
-msgstr ""
+#: k3b.cpp:469
+msgid "Quits the application"
+msgstr "Terfynu'r cymhwysiad"
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:90
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:784
-msgid "Video Bitrate:"
+#: k3b.cpp:471
+msgid "Configure K3b settings"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:111
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinVideoBitrate)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:286
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinAudioBitrate)
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:144
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_spinAverageBitrate)
-#: rc.cpp:787 rc.cpp:820 rc.cpp:1083
-msgid " kbps"
+#: k3b.cpp:474
+msgid "Setup the system permissions"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:137
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1_2)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:182
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:790 rc.cpp:948
-msgid "Target Folder"
+#: k3b.cpp:477
+msgid "Digitally extract tracks from an audio CD"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:143
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:188
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:793 rc.cpp:951
-msgid "Free space in directory:"
+#: k3b.cpp:479
+msgid "Transcode Video DVD titles"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:156
-#. i18n: ectx: property (text), widget (QLabel, m_labelFreeSpace)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:179
-#. i18n: ectx: property (text), widget (QLabel, m_labelNeededSpace)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:201
-#. i18n: ectx: property (text), widget (QLabel, m_labelFreeSpace)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:224
-#. i18n: ectx: property (text), widget (QLabel, m_labelNeededSpace)
-#: rc.cpp:796 rc.cpp:802 rc.cpp:954 rc.cpp:960
-msgid "-"
-msgstr "-"
+#: k3b.cpp:481
+msgid "Extract tracks from a Video CD"
+msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:169
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:214
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:799 rc.cpp:957
-msgid "Space needed:"
+#: k3b.cpp:483
+msgid "Add files to the current project"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:195
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
-#: rc.cpp:805
-msgid "Audio Quality"
+#: k3b.cpp:485
+msgid "Clear the current project"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:211
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkAudioVBR)
-#: rc.cpp:808
-msgid "Variable &Bitrate"
+#: k3b.cpp:515
+msgid "Projects"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:220
-#. i18n: ectx: property (text), widget (QLabel, m_labelAudioBitrate)
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:276
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:811 rc.cpp:817
-msgid "Audio Bitrate:"
+#: k3b.cpp:528
+msgid "Current Projects"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:257
-#. i18n: ectx: property (text), widget (K3ActiveLabel, m_labelNoAudioSettings)
-#: rc.cpp:814
-msgid ""
-"<p>No Audio Quality settings available for <em>AC3 pass-through</em>. The "
-"audio stream from the Video DVD is used without any changes."
+#: k3b.cpp:551
+msgid "Folders"
+msgstr "Plygyll"
+
+#: k3b.cpp:563
+msgid "Contents"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:330
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:18
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:823 rc.cpp:891
-msgid "Filetype"
+#: k3b.cpp:591
+msgid "&Location Bar"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:338
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:826
-msgid "Video Codec:"
+#: k3b.cpp:670 k3b.cpp:992 k3b.cpp:1006
+msgid "Opening file..."
+msgstr "Agor ffeil..."
+
+#: k3b.cpp:698
+msgid "Could not open document."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:348
-#. i18n: ectx: property (toolTip), widget (K3b::IntMapComboBox, m_comboVideoCodec)
-#: rc.cpp:829
-msgid "Select the Video codec used to encode the DVD titles"
+#: k3b.cpp:698 ../plugins/encoder/sox/k3bsoxencoder.cpp:320
+msgid "Error"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:359
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:832
-msgid "Audio Codec:"
+#: k3b.cpp:962
+#, kde-format
+msgid "%1 has unsaved data."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:369
-#. i18n: ectx: property (toolTip), widget (K3b::IntMapComboBox, m_comboAudioCodec)
-#: rc.cpp:835
-msgid "Select the Audio codec used to encode the DVD titles"
+#: k3b.cpp:963
+msgid "Closing Project"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:382
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:838
-msgid "File Namin&g"
+#: k3b.cpp:995 k3b.cpp:1064
+msgid "*.k3b|K3b Projects"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:435
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBlankReplace)
-#: rc.cpp:847
-msgid "Replace all &blanks with:"
+#: k3b.cpp:997
+msgid "Open Files"
+msgstr "Agor Ffeiliau"
+
+#: k3b.cpp:1029
+msgid "Saving file..."
+msgstr "Yn cadw ffeil..."
+
+#: k3b.cpp:1039 k3b.cpp:1085
+msgid "Could not save the current document."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:485
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkTwoPassEncoding)
-#: rc.cpp:856
-msgid "&2-pass encoding"
+#: k3b.cpp:1039 k3b.cpp:1085
+msgid "I/O Error"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:491
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkTwoPassEncoding)
-#: rc.cpp:859
-msgid "Enable 2-pass encoding"
+#: k3b.cpp:1056
+msgid "Saving file with a new filename..."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:496
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkTwoPassEncoding)
-#: rc.cpp:862
-msgid ""
-"<p>If this option is checked K3b encodes the video titles in two passes. The "
-"first pass is used to gather information about the video in order to improve "
-"the distribution of bits in the second pass. The resulting video will have a "
-"higher quality using a variable bitrate.\n"
-"<p>If this option is not checked K3b will create video files with a constant "
-"bitrate and a lower quality.\n"
-"<p>2-pass encoding results in a doubled encoding time."
+#: k3b.cpp:1065
+msgid "Save As"
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:503
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkAutoClipping)
-#: rc.cpp:867
-msgid "Automatic &Video Clipping"
+#: k3b.cpp:1105
+msgid "Closing file..."
+msgstr "Yn cau ffeil..."
+
+#: k3b.cpp:1207
+msgid "Creating new Audio CD Project."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:509
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkAutoClipping)
-#: rc.cpp:870
-msgid "Automatically detect the black borders of the video"
+#: k3b.cpp:1216
+msgid "Creating new Data CD Project."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:514
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkAutoClipping)
-#: rc.cpp:873
-msgid ""
-"<p>Most Video DVDs are encoded in a letterboxed format. <em>Letterboxed</em> "
-"refers to black bars used at the top and bottom (and sometimes at the sides) "
-"of the video to force it into one of the aspect ratios supported by the "
-"Video DVD standard.\n"
-"<p>If this option is checked K3b will automatically detect and remove these "
-"black bars from the resulting video.\n"
-"<p>Although this method is very reliable there may be problems if the source "
-"material is exceptionally short or dark."
+#: k3b.cpp:1232
+msgid "Creating new Video DVD Project."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:521
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkAudioResampling)
-#: rc.cpp:878
-msgid "Resample Audio to &44.1 KHz"
+#: k3b.cpp:1242
+msgid "Creating new Mixed Mode CD Project."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:527
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkAudioResampling)
-#: rc.cpp:881
-msgid "Change the sample rate of the audio stream to 44.1 KHz"
+#: k3b.cpp:1251
+msgid "Creating new Video CD Project."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:531
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkAudioResampling)
-#: rc.cpp:884
-msgid ""
-"<p>Video DVD audio streams normally are encoded with a sampling rate of "
-"48000 Hz. Audio CDs on the other hand are encoded with a sampling rate of "
-"44100 Hz.\n"
-"<p>If this option is checked K3b will change the sampling rate of the audio "
-"stream to 44100 Hz."
+#: k3b.cpp:1261
+msgid "Creating new eMovix Project."
 msgstr ""
 
-#. i18n: file: rip/videodvd/base_k3bvideodvdrippingwidget.ui:538
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkLowPriority)
-#: rc.cpp:888
-msgid "Low s&cheduling priority for the video transcoding process"
+#: k3b.cpp:1376
+msgid "Select Files to Add to Project"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:34
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_buttonConfigurePlugin)
-#: rc.cpp:894
-msgid "Configure Plugin"
+#: k3b.cpp:1390
+msgid "Please create a project before adding files"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:53
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkCreatePlaylist)
-#: rc.cpp:903
-msgid "Create playlist for the ripped files"
+#: k3b.cpp:1390
+msgid "No Active Project"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:58
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkCreatePlaylist)
-#: rc.cpp:906
-msgid ""
-"<p>If this option is checked K3b will create a playlist of the ripped files\n"
-"which can be used with programs like Amarok or JuK.\n"
-"<p>You may use the special strings to give the playlist a unique filename."
+#: k3b.cpp:1559
+msgid "Do you really want to clear the current project?"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkCreatePlaylist)
-#: rc.cpp:911
-msgid "Create m&3u playlist"
+#: k3b.cpp:1560
+msgid "Clear Project"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:89
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkPlaylistRelative)
-#: rc.cpp:914
-msgid "Use relative paths instead of absolute"
+#: k3b.cpp:1585
+msgid "Audio CD Rip"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:95
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkPlaylistRelative)
-#: rc.cpp:917
-msgid ""
-"<p>If this option is checked, the entries in the playlist will be relative "
-"to its location.\n"
-"<p>Example: If your playlist is located in <em>/home/myself/music</em> and\n"
-"your audio files are in <em>/home/myself/music/cool</em>; then the entries "
-"in the\n"
-"playlist will look something like: <em>cool/track1.ogg</em>."
+#: k3b.cpp:1600
+msgid "Video DVD Rip"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:98
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkPlaylistRelative)
-#: rc.cpp:923
-msgid "&Use relative paths"
+#: k3b.cpp:1621
+msgid "Video CD Rip"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:107
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSingleFile)
-#: rc.cpp:926
-msgid "Rip all tracks to a single file"
+#: k3bdatamodewidget.cpp:34
+msgid "Mode1"
+msgstr "Modd1"
+
+#: k3bdatamodewidget.cpp:35
+msgid "Mode2"
+msgstr "Modd2"
+
+#: k3bdatamodewidget.cpp:37
+msgid "Select the mode for the data-track"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:114
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkSingleFile)
-#: rc.cpp:929
+#: k3bdatamodewidget.cpp:38
 msgid ""
-"<p>If this option is checked K3b will create only one\n"
-"audio file no matter how many tracks are ripped. This\n"
-"file will contain all tracks one after the other.\n"
-"<p>This might be useful to rip a live album or a radio play.\n"
-"<p><b>Caution:</b> The file will have the name made from playlist pattern."
+"<p><b>Data Mode</b><p>Data tracks may be written in two different "
+"modes:</p><p><b>Auto</b><br>Let K3b select the best suited data "
+"mode.</p><p><b>Mode 1</b><br>This is the <em>original</em> writing mode as "
+"introduced in the <em>Yellow Book</em> standard. It is the preferred mode "
+"when writing pure data CDs.</p><p><b>Mode 2</b><br>To be exact <em>XA Mode 2 "
+"Form 1</em>, but since the other modes are rarely used it is common to refer "
+"to it as <em>Mode 2</em>.</p><p><b>Be aware:</b> Do not mix different modes "
+"on one CD. Some older drives may have problems reading mode 1 multisession "
+"CDs."
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:117
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkSingleFile)
-#: rc.cpp:936
-msgid "Create si&ngle file"
-msgstr ""
+#: k3bfileview.cpp:76
+msgid "Filter:"
+msgstr "Hidl:"
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:145
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkWriteCueFile)
-#: rc.cpp:939
-msgid "Write a cuefile"
+#: k3bfileview.cpp:83
+msgid "audio/x-mp3 audio/x-wav application/x-ogg |Sound Files"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:148
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkWriteCueFile)
-#: rc.cpp:942
-msgid ""
-"<p>If this option is checked K3b will create a CDRWIN cue file which allows "
-"to easily write a copy of the audio CD on other systems."
+#: k3bfileview.cpp:84
+msgid "audio/x-wav |Wave Sound Files"
 msgstr ""
 
-#. i18n: file: rip/base_k3baudiorippingoptionwidget.ui:151
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkWriteCueFile)
-#: rc.cpp:945
-msgid "Write &cue file"
+#: k3bfileview.cpp:85
+msgid "audio/x-mp3 |MP3 Sound Files"
 msgstr ""
 
-#. i18n: file: k3bui.rc:4
-#. i18n: ectx: Menu (project)
-#: rc.cpp:963
-msgid "&Project"
-msgstr "&Cywaith"
-
-#. i18n: file: k3bui.rc:9
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:966
-msgid "&Tools"
+#: k3bfileview.cpp:86
+msgid "application/x-ogg |Ogg Vorbis Sound Files"
 msgstr ""
 
-#. i18n: file: k3bui.rc:23
-#. i18n: ectx: Menu (view_panels)
-#: rc.cpp:972
-msgid "Panels"
+#: k3bfileview.cpp:87
+msgid "video/mpeg |MPEG Video Files"
 msgstr ""
 
-#. i18n: file: k3bui.rc:35
-#. i18n: ectx: Menu (help)
-#: rc.cpp:975
-msgid "&Help"
+#: k3bfileview.cpp:90
+msgid "Show Bookmarks"
 msgstr ""
 
-#. i18n: file: k3bui.rc:40
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:978
-msgid "Main Toolbar"
+#: k3bprojectmanager.cpp:192
+#, kde-format
+msgid "AudioCD%1"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:31
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_groupVariableBitrate)
-#: rc.cpp:984
-msgid "Quality Settings"
+#: k3bprojectmanager.cpp:198
+#, kde-format
+msgid "Data%1"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:39
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioQualityLevel)
-#: rc.cpp:987
-msgid "Preset:"
+#: k3bprojectmanager.cpp:204
+#, kde-format
+msgid "MixedCD%1"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:55
-#. i18n: ectx: property (text), widget (QLabel, m_labelQualityLevel)
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, m_labelQualityLevel)
-#: rc.cpp:990 rc.cpp:1260
-msgid "textLabel1"
-msgstr "labelTestun1"
+#: k3bprojectmanager.cpp:210
+#, kde-format
+msgid "VideoCD%1"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:120
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:331
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:120
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:993 rc.cpp:1028 rc.cpp:1263
-msgid "high quality"
-msgstr "ansawdd Uchel"
+#: k3bprojectmanager.cpp:216
+#, kde-format
+msgid "eMovix%1"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:138
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:138
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:996 rc.cpp:1266
-msgid "small file"
+#: k3bprojectmanager.cpp:222
+#, kde-format
+msgid "VideoDVD%1"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:187
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioManual)
-#: rc.cpp:999
-msgid "Manual settings:"
+#: k3bburnprogressdialog.cpp:39
+msgid "Estimated writing speed:"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:203
-#. i18n: ectx: property (text), widget (QLabel, m_labelManualSettings)
-#: rc.cpp:1002
-msgid "textLabel2"
+#: k3bburnprogressdialog.cpp:51
+msgid "Software buffer:"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:254
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonManualSettings)
-#: rc.cpp:1005
-msgid "Change Settings..."
+#: k3bburnprogressdialog.cpp:52
+msgid "Device buffer:"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:273
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
-#: rc.cpp:1011
-msgid "Encoder Quality"
+#: k3bburnprogressdialog.cpp:89
+#, kde-format
+msgid "Writer: %1 %2"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:282
-#. i18n: ectx: property (toolTip), widget (KIntNumInput, m_spinEncoderQuality)
-#: rc.cpp:1014
-msgid "Choose the noise shaping & psycho acoustic algorithm."
+#: k3bburnprogressdialog.cpp:92 k3bburnprogressdialog.cpp:93
+#: k3bburnprogressdialog.cpp:94
+msgid "no info"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:290
-#. i18n: ectx: property (whatsThis), widget (KIntNumInput, m_spinEncoderQuality)
-#: rc.cpp:1017
+#: main.cpp:42
 msgid ""
-"<p>Bitrate is of course the main influence on quality. The higher the "
-"bitrate, the higher the quality. But for a given bitrate, we have a choice "
-"of algorithms to determine the best scalefactors and huffman encoding (noise "
-"shaping).\n"
-"<p>The quality increases from 0 to 9 while the encoding speed drops.\n"
-"<p>9 uses the slowest & best possible version of all algorithms.\n"
-"<p><b>7 is the recommended setting</b> while 4 still produced reasonable "
-"quality at good speed.\n"
-"<p>0 disables almost all algorithms including psy-model resulting in poor "
-"quality.\n"
-"<p><b>This setting has no influence on the size of the resulting file.</b>"
+"<p>K3b is a full-featured CD/DVD/Blu-ray burning and ripping "
+"application.<br/>It supports a variety of project types as well as copying "
+"of optical media, burning of different types of images, and ripping Audio "
+"CDs, Video CDs, and Video DVDs.<br/>Its convenient user interface is "
+"targeted at all audiences, trying to be as simple as possible for novice "
+"users while also providing all features an advanced user might need."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:316
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1025
-msgid "fast encoding"
+#: main.cpp:53
+msgid "K3b"
+msgstr "K3b"
+
+#: main.cpp:55
+msgid "(C) 1998-2009 Sebastian Trüg"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:361
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkCopyright)
-#: rc.cpp:1034
-msgid "Mark the encoded file as being copyrighted."
+#: main.cpp:55
+msgid "http://www.k3b.org"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:364
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkCopyright)
-#: rc.cpp:1037
-msgid "Mark copyrighted"
+#: main.cpp:57
+msgid "Sebastian Trüg"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:371
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkOriginal)
-#: rc.cpp:1040
-msgid "Mark the encoded file as being a copy."
+#: main.cpp:57
+msgid "Maintainer and Lead Developer"
+msgstr ""
+
+#: main.cpp:58
+msgid "Michał Małek"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:374
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkOriginal)
-#: rc.cpp:1043
-msgid "Mark as original"
+#: main.cpp:58
+msgid "Developer"
+msgstr "Datblygwr"
+
+#: main.cpp:59
+msgid "Christian Kvasny"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:381
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkISO)
-#: rc.cpp:1046
-msgid "Enforce strict ISO compliance"
+#: main.cpp:59
+msgid "Video CD Project and Video CD ripping"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:385
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkISO)
-#: rc.cpp:1049
-msgid ""
-"<p>If this option is checked, LAME will enforce the 7680 bit limitation on "
-"total frame size.<br>\n"
-"This results in many wasted bits for high bitrate encodings but will ensure "
-"strict ISO compatibility. This compatibility might be important for hardware "
-"players."
+#: main.cpp:60
+msgid "Montel Laurent"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:388
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkISO)
-#: rc.cpp:1053
-msgid "Strict ISO compliance"
+#: main.cpp:60
+msgid "Initial port to KDE Platform 4"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:395
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkError)
-#: rc.cpp:1056
-msgid "Turn on CRC error protection."
+#: main.cpp:61
+msgid "Ralf Habacker"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:398
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkError)
-#: rc.cpp:1059
-msgid ""
-"<p>If this option is checked, a cyclic redundancy check (CRC) code will be "
-"added to each frame, allowing transmission errors that could occur on the "
-"MP3 stream to be detected; however, it takes 16 bits per frame that would "
-"otherwise be used for encoding, thus slightly reducing the sound quality."
+#: main.cpp:61
+msgid "Windows port"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3blameencodersettingswidget.ui:401
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkError)
-#: rc.cpp:1062
-msgid "Error protection"
+#: main.cpp:63
+msgid "Klaus-Dieter Krannich"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:8
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, buttonGroup2)
-#: rc.cpp:1065
-msgid "Quality"
-msgstr "Ansawdd"
+#: main.cpp:63
+msgid "Advanced Cdrdao integration"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:17
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioConstantBitrate)
-#: rc.cpp:1068
-msgid "Constant Bitrate"
+#: main.cpp:64
+msgid "Thomas Froescher"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:50
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioVariableBitrate)
-#: rc.cpp:1071
-msgid "Variable Bitrate"
+#: main.cpp:65
+msgid "VideoDVD ripping and video encoding in pre-1.0 versions."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:111
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateMaximum)
-#: rc.cpp:1074
-msgid "Maximum bitrate:"
+#: main.cpp:67
+msgid "Alexis Younes aka Ayo"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:118
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateMinimum)
-#: rc.cpp:1077
-msgid "Minimum bitrate:"
+#: main.cpp:68
+msgid "For his bombastic artwork."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:131
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateAverage)
-#: rc.cpp:1080
-msgid "Average bitrate:"
+#: main.cpp:70
+msgid "Christoph Thielecke"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:163
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox2)
-#: rc.cpp:1086
-msgid "Channel Mode"
+#: main.cpp:71
+msgid "For extensive testing and the first German translation."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:169
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_comboMode)
-#: rc.cpp:1089
-msgid "Select the channel mode."
+#: main.cpp:73
+msgid "Andy Polyakov"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:178
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboMode)
-#: rc.cpp:1092
-msgid ""
-"<p>Select the channel mode of the resulting Mp3 file:\n"
-"<p><b>Stereo</b><br>\n"
-"In this mode, the encoder makes no use of potential correlations between the "
-"two input channels; it can, however, negotiate the bit demand between both "
-"channel, i.e. give one channel more bits if the other contains silence or "
-"needs fewer bits because of a lower complexity.\n"
-"<p><b>Joint-Stereo</b><br>\n"
-"In this mode, the encoder will make use of correlations between both "
-"channels. The signal will be matrixed into a sum (\"mid\"), computed by L+R, "
-"and difference (\"side\") signal, computed by L-R, and more bits are "
-"allocated to the mid channel. This will effectively increase the bandwidth "
-"if the signal does not have too much stereo separation, thus giving a "
-"significant gain in encoding quality.\n"
-"<p><b>Mono</b><br>\n"
-"The input will be encoded as a mono signal. If it was a stereo signal, it "
-"will be downsampled to mono. The downmix is calculated as the sum of the "
-"left and right channel, attenuated by 6 dB."
+#: main.cpp:74
+msgid "For the great dvd+rw-tools and the nice cooperation."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:182
-#. i18n: ectx: property (text), item, widget (KComboBox, m_comboMode)
-#: rc.cpp:1101 ../plugins/decoder/mp3/k3bmaddecoder.cpp:404
-#: ../plugins/encoder/lame/k3blametyes.h:92
-msgid "Stereo"
+#: main.cpp:76
+msgid "Roberto De Leo"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:187
-#. i18n: ectx: property (text), item, widget (KComboBox, m_comboMode)
-#: rc.cpp:1104 ../plugins/decoder/mp3/k3bmaddecoder.cpp:402
-#: ../plugins/encoder/lame/k3blametyes.h:93
-msgid "Joint Stereo"
+#: main.cpp:77
+msgid "For the very cool eMovix package and his accommodating work."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui:192
-#. i18n: ectx: property (text), item, widget (KComboBox, m_comboMode)
-#: rc.cpp:1107 ../plugins/decoder/mp3/k3bmaddecoder.cpp:398
-#: ../plugins/encoder/lame/k3blametyes.h:94
-msgid "Mono"
+#: main.cpp:79
+msgid "John Steele Scott"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1110
-msgid "General"
-msgstr "Cyffredinol"
+#: main.cpp:80
+msgid "For the flac decoding plugin."
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:27
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1113
-msgid "Name:"
-msgstr "Enw:"
+#: main.cpp:82
+msgid "György Szombathelyi"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:40
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:1116
-msgid "Filename extension:"
+#: main.cpp:83
+msgid "For the very useful isofslib."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:55
-#. i18n: ectx: property (text), widget (QTreeWidget, m_viewEncoders)
-#: rc.cpp:1119 rc.cpp:1172
-msgid "Command"
+#: main.cpp:85
+msgid "Erik de Castro Lopo"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:86
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1123
-#, no-c-format
+#: main.cpp:86
 msgid ""
-"Please insert the command used to encode the audio data. The command has to "
-"read raw little endian (see <em>Swap Byte Order</em>) 16-bit stereo audio "
-"frames from stdin.\n"
-"<p>The following strings will be replaced by K3b:<br>\n"
-"<b>%f</b> - The filename of the resulting file. This is where the command "
-"has to write its output to.<br>\n"
-"<em>The following refer to metadata stored for example in the ID3 tag of an "
-"mp3 file (Be aware that these values might be empty).</em><br>\n"
-"<b>%t</b> - Title<br>\n"
-"<b>%a</b> - Artist<br>\n"
-"<b>%c</b> - Comment<br>\n"
-"<b>%n</b> - Track number<br>\n"
-"<b>%m</b> - Album Title<br>\n"
-"<b>%r</b> - Album Artist<br>\n"
-"<b>%x</b> - Album comment<br>\n"
-"<b>%y</b> - Release Year"
+"For libsamplerate which is used for generic resampling in the audio decoder "
+"framework."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:115
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkSwapByteOrder)
-#: rc.cpp:1140
-msgid "Swap the byte order of the input data"
+#: main.cpp:88
+msgid "Jakob Petsovits"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:119
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkSwapByteOrder)
-#: rc.cpp:1143
-msgid ""
-"<p> If this option is checked K3b will swap the byte order of the input "
-"data. Thus, the command has to read big endian audio frames.\n"
-"<p>If the resulting audio file sounds bad it is highly likely that the byte "
-"order is wrong and this option has to be checked."
+#: main.cpp:89
+msgid "For the very cool conditional audio ripping pattern."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:122
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkSwapByteOrder)
-#: rc.cpp:1147
-msgid "Swap &Byte Order"
+#: main.cpp:91
+msgid "Heiner Eichmann"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:129
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_checkWriteWaveHeader)
-#: rc.cpp:1150
-msgid "Create a wave header for the input data"
+#: main.cpp:92
+msgid "For his work on the BSD port and some great patches."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:132
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_checkWriteWaveHeader)
-#: rc.cpp:1153
-msgid ""
-"<p>If this option is checked K3b will write a wave header. This is useful in "
-"case the encoder application cannot read plain raw audio data."
+#: main.cpp:94
+msgid "Adriaan De Groot"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencodereditwidget.ui:135
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkWriteWaveHeader)
-#: rc.cpp:1156
-msgid "Write W&ave Header"
+#: main.cpp:95
+msgid "For his work on the BSD port."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1159
-msgid ""
-"<p>This dialog can be used to setup external command line applications as "
-"audio encoders. These can then be used by K3b to encode audio data (Tracks "
-"from an audio CD or the titles from an audio project) to formats that are "
-"normally not supported (i.e. no encoder plugin exists).\n"
-"<p>K3b comes with a selection of predefined external applications that "
-"depends on the installed applications."
+#: main.cpp:97
+msgid "Thiago Macieira"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1163
-msgid "Configured Encoders"
+#: main.cpp:98
+msgid "For his help with the many invalid k3b entries on bugs.kde.org."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:45
-#. i18n: ectx: property (text), widget (QTreeWidget, m_viewEncoders)
-#: rc.cpp:1166
-msgid "Name"
-msgstr "Enw"
-
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:50
-#. i18n: ectx: property (text), widget (QTreeWidget, m_viewEncoders)
-#: rc.cpp:1169
-msgid "Extension"
+#: main.cpp:100
+msgid "Marcel Dierkes"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:88
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonEdit)
-#: rc.cpp:1178
-msgid "Edit..."
+#: main.cpp:101
+msgid "For the great K3b icon eyecandy."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui:95
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonAdd)
-#: rc.cpp:1181
-msgid "Add..."
+#: main.cpp:103
+msgid "Christoph Burger-Scheidlin"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:22
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkManual)
-#: rc.cpp:1184
-msgid "Manual settings (used for all file types)"
+#: main.cpp:104
+msgid "For his neverending help cleaning out the K3b bug database."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:49
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:1187
-msgid "Sample rate:"
-msgstr "Cyflymdra Enghreifftio :"
+#: main.cpp:106
+msgid "Robert Wadley"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:63
-#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1190
+#: main.cpp:107
 msgid ""
-"<p>The sample data encoding is signed linear (2's complement), unsigned "
-"linear, u-law (logarithmic), A-law (logarithmic), ADPCM, IMA_ADPCM, GSM, or "
-"Floating-point.</p>\n"
-"<p><b>U-law</b> (actually shorthand for mu-law) and <b>A-law</b> are the "
-"U.S. and international standards for logarithmic telephone sound "
-"compression. When uncompressed u-law has roughly the precision of 14-bit PCM "
-"audio and A-law has roughly the precision of 13-bit PCM audio. A-law and u-"
-"law data is sometimes encoded using a reversed bit-ordering (i.e. MSB "
-"becomes LSB).<br> <b>ADPCM </b> is a form of sound compression that has a "
-"good compromise between good sound quality and fast encoding/decoding time. "
-"It is used for telephone sound compression and places where full fidelity is "
-"not as important. When uncompressed it has roughly the precision of 16-bit "
-"PCM audio. Popular versions of ADPCM include G.726, MS ADPCM, and IMA ADPCM. "
-"It has different meanings in different file handlers. In .wav files it "
-"represents MS ADPCM files, in all others it means G.726 ADPCM. <br> <b>IMA "
-"ADPCM</b> is a specific form of ADPCM compression, slightly simpler and "
-"slightly lower fidelity than Microsoft's flavor of ADPCM. IMA ADPCM is also "
-"called DVI ADPCM.<br> <b>GSM</b> is a standard used for telephone sound "
-"compression in European countries and is gaining popularity because of its "
-"good quality. It is usually CPU intensive to work with GSM audio data.</p> "
-"<p><em>Description based on the SoX manpage</em></p>"
+"Rob created a great theme and came up with the idea for transparent themes."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:67
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1194
-msgid "Signed Linear"
+#: main.cpp:109
+msgid "Dmitry Novikov"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:72
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1197
-msgid "Unsigned Linear"
+#: main.cpp:110
+msgid "For the amazing K3b 1.0 theme."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:77
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1200
-msgid "u-law (logarithmic)"
+#: main.cpp:112
+msgid "Jeremy C. Andrus"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:82
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1203
-msgid "A-law (logarithmic)"
+#: main.cpp:113
+msgid "First Windows port of libk3bdevice."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:87
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1206
-msgid "ADPCM"
+#: main.cpp:117
+msgid "file(s) to open"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:92
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1209
-msgid "IMA_ADPCM"
+#: main.cpp:118
+msgid "Create a new data CD project and add all given files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:97
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1212
-msgid "GSM"
+#: main.cpp:119
+msgid "Create a new audio CD project and add all given files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:102
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboEncoding)
-#: rc.cpp:1215
-msgid "Floating-Point"
+#: main.cpp:120
+msgid "Create a new video CD project and add all given files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:113
-#. i18n: ectx: property (text), widget (QLineEdit, m_editSamplerate)
-#: rc.cpp:1218
-msgid "14400"
+#: main.cpp:121
+msgid "Create a new mixed mode CD project and add all given files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:123
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:1221
-msgid "Data size:"
+#: main.cpp:122
+msgid "Create a new eMovix CD project and add all given files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:133
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:1224
-msgid "Data encoding:"
+#: main.cpp:123
+msgid "Create a new Video DVD project and add all given files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:143
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1227
-msgid "Channels:"
-msgstr "Sianeli :"
+#: main.cpp:124
+msgid "Open the project burn dialog for the current project"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:157
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboChannels)
-#: rc.cpp:1230
-msgid "1 (mono)"
+#: main.cpp:125
+msgid "Open the copy dialog, optionally specify the source device"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:162
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboChannels)
-#: rc.cpp:1233
-msgid "2 (stereo)"
+#: main.cpp:126
+msgid "Write an image to a CD or DVD"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:167
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboChannels)
-#: rc.cpp:1236
-msgid "4 (quad sound)"
+#: main.cpp:127
+msgid "Format a rewritable medium"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:179
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSize)
-#: rc.cpp:1239
-msgid "Bytes"
-msgstr "Beitiau"
+#: main.cpp:128
+msgid "Extract Audio tracks digitally (+encoding)"
+msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:184
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSize)
-#: rc.cpp:1242
-msgid "16-bit Words"
+#: main.cpp:129
+msgid "Rip Video DVD Titles (+transcoding)"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui:189
-#. i18n: ectx: property (text), item, widget (QComboBox, m_comboSize)
-#: rc.cpp:1245
-msgid "32-bit Words"
+#: main.cpp:130
+msgid "Rip Video CD Tracks"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:1248
-msgid "File Quality"
+#: main.cpp:131
+msgid "Set the GUI language"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:29
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioQualityLevel)
-#: rc.cpp:1251
-msgid "Controls the quality of the encoded files"
+#: main.cpp:132
+msgid "Disable the splash screen"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:32
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_radioQualityLevel)
-#: rc.cpp:1254
+#: main.cpp:133
 msgid ""
-"<p>Vorbis' audio quality is not best measured in kilobits per second, but on "
-"a scale from -1 to 10 called \"quality\". <p>For now, quality -1 is roughly "
-"equivalent to 45kbps average, 5 is roughly 160kbps, and 10 gives about "
-"400kbps. Most people seeking very-near-CD-quality audio encode at a quality "
-"of 5 or, for lossless stereo coupling, 6. The default setting is quality 3, "
-"which at approximately 110kbps gives a smaller filesize and significantly "
-"better fidelity than .mp3 compression at 128kbps. <p><em>This explanation "
-"was copied from the www.vorbis.com FAQ.</em>"
+"Set the device to be used for new projects. (This option has no effect: its "
+"main purpose is to enable handling of empty media from the KDE Media "
+"Manager.)"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:35
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioQualityLevel)
-#: rc.cpp:1257
-msgid "&Quality level:"
+#: k3btempdirselectionwidget.cpp:54
+msgid "Free space in temporary folder:"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:169
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioManual)
-#: rc.cpp:1269
-msgid "M&anual settings:"
+#: k3btempdirselectionwidget.cpp:79
+msgid "The folder in which to save the image files"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:209
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateUpper)
-#: rc.cpp:1272
-msgid "&Upper bitrate:"
+#: k3btempdirselectionwidget.cpp:83
+msgid ""
+"<p>This is the folder in which K3b will save the <em>image "
+"files</em>.<p>Please make sure that it resides on a partition that has "
+"enough free space."
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:216
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateLower)
-#: rc.cpp:1275
-msgid "Lower &bitrate:"
+#: k3btempdirselectionwidget.cpp:190
+msgid "Select Temporary Folder"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:256
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:266
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:276
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1278 rc.cpp:1281 rc.cpp:1284
-msgid "kbps"
+#: k3btempdirselectionwidget.cpp:192
+msgid "Wri&te image files to:"
 msgstr ""
 
-#. i18n: file: ../plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui:292
-#. i18n: ectx: property (text), widget (QCheckBox, m_checkBitrateNominal)
-#: rc.cpp:1287
-msgid "&Nominal bitrate:"
+#: k3btempdirselectionwidget.cpp:193
+msgid "Temporary Folder"
 msgstr ""
 
-#. i18n: file: tips:2
-#. i18n: ectx: @info:tipoftheday
-#: tips.cpp:3
-msgid ""
-"<p>...that you do not need to erase a CDRW before rewriting it manually\n"
-"since K3b can do that automatically before writing.</p>\n"
+#: k3btempdirselectionwidget.cpp:196
+msgid "Select Temporary File"
 msgstr ""
 
-#. i18n: file: tips:9
-#. i18n: ectx: @info:tipoftheday
-#: tips.cpp:9
-msgid ""
-"<p>...that you do not need to bother with any settings if you do not know\n"
-"what they mean. K3b is able to choose the settings best suited for you.</p>\n"
+#: k3btempdirselectionwidget.cpp:198
+msgid "Wri&te image file to:"
 msgstr ""
 
-#. i18n: file: tips:16
-#. i18n: ectx: @info:tipoftheday
-#: tips.cpp:15
+#: k3btempdirselectionwidget.cpp:199
+msgid "Temporary File"
+msgstr ""
+
+#: k3btempdirselectionwidget.cpp:209
+msgid "Size of project:"
+msgstr ""
+
+#: k3bdirview.cpp:205
 msgid ""
-"<p>...that K3b has two types of settings. On the one hand K3b has settings "
-"like most\n"
-"KDE applications have accessible through the configuration dialog via the "
-"settings menu;\n"
-"on the other hand every K3b action dialog has three buttons to load and save "
-"defaults\n"
-"for that action.  This way one may, for example, set the defaults for CD "
-"Copy: these defaults\n"
-"will then be loaded every time the CD Copy dialog is opened. The button "
-"<em>K3b defaults</em>\n"
-"will restore the <em>factory settings</em> in case you do not know if the "
-"settings you chose\n"
-"are appropriate.</p>\n"
+"K3b uses vcdxrip from the vcdimager package to rip Video CDs. Please make "
+"sure it is installed."
 msgstr ""
 
-#. i18n: file: tips:28
-#. i18n: ectx: @info:tipoftheday
-#: tips.cpp:26
+#: k3bdirview.cpp:238
+#, kde-format
 msgid ""
-"<p>...that you do not need to bother changing the settings marked as "
-"<em>advanced</em> if you \n"
-"do not know what they mean. K3b's defaults are suitable for most daily "
-"use.</p>\n"
+"<p>K3b was unable to mount medium <b>%1</b> in device <em>%2 - %3</em>"
 msgstr ""
 
-#. i18n: file: tips:35
-#. i18n: ectx: @info:tipoftheday
-#: tips.cpp:32
-msgid ""
-"<p>Just left-click one of your devices in the device and file tree and see "
-"what happens. K3b opens a specific\n"
-"window based on the media's contents. For an audio CD for example you will "
-"be given a list of the tracks with\n"
-"the possibility to rip these tracks to any format supported by K3b (like mp3 "
-"or Ogg-Vorbis).</p>\n"
+#: k3bdirview.cpp:242
+msgid "Mount Failed"
 msgstr ""
 
-#. i18n: file: tips:43
-#. i18n: ectx: @info:tipoftheday
-#: tips.cpp:39
+#: k3bdirview.cpp:254
+#, kde-format
 msgid ""
-"<p>...that K3b lets you choose media instead of devices for burning. So if "
-"you want to burn to a certain\n"
-"medium simply insert it and wait for K3b to detect it. It will then appear "
-"as your burning medium.</p>\n"
+"<p>K3b was unable to unmount medium <b>%1</b> in device <em>%2 - %3</em>"
 msgstr ""
 
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:369
-msgid "FLAC"
+#: k3bdirview.cpp:258
+msgid "Unmount Failed"
 msgstr ""
 
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:375
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:390
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:224
+msgid "Windows Media v1"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:226
+msgid "Windows Media v2"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:232
+msgid "MPEG 1 Layer III"
+msgstr ""
+
+#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:234
+msgid "Advanced Audio Coding (AAC)"
+msgstr ""
+
+#: ../plugins/decoder/wave/k3bwavedecoder.cpp:327
+msgid "WAVE"
+msgstr "TON"
+
+#: ../plugins/decoder/wave/k3bwavedecoder.cpp:333
+#: ../plugins/decoder/wave/k3bwavedecoder.cpp:341
 #: ../plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp:120
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:382
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:395
-#: ../plugins/decoder/wave/k3bwavedecoder.cpp:333
-#: ../plugins/decoder/wave/k3bwavedecoder.cpp:341
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:375
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:390
 #: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:117
 msgid "Channels"
 msgstr "Sianeli"
 
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:376
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:392
+#: ../plugins/decoder/wave/k3bwavedecoder.cpp:334
+#: ../plugins/decoder/wave/k3bwavedecoder.cpp:343
 #: ../plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp:121
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:383
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:409
-#: ../plugins/decoder/wave/k3bwavedecoder.cpp:334
-#: ../plugins/decoder/wave/k3bwavedecoder.cpp:343
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:376
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:392
 #: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:118
 msgid "Sampling Rate"
 msgstr ""
 
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:377
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:394
 #: ../plugins/decoder/wave/k3bwavedecoder.cpp:335
 #: ../plugins/decoder/wave/k3bwavedecoder.cpp:345
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:377
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:394
 msgid "Sample Size"
 msgstr ""
 
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:384
-msgid "Vendor"
-msgstr "Gwerthwr"
-
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:393
+#: ../plugins/decoder/wave/k3bwavedecoder.cpp:344
 #: ../plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp:121
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:410
-#: ../plugins/decoder/wave/k3bwavedecoder.cpp:344
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:393
 #: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:118
 #, kde-format
 msgid "%1 Hz"
 msgstr ""
 
-#: ../plugins/decoder/flac/k3bflacdecoder.cpp:395
 #: ../plugins/decoder/wave/k3bwavedecoder.cpp:346
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:395
 #, kde-format
 msgid "1 bit"
 msgid_plural "%1 bits"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:224
-msgid "Windows Media v1"
-msgstr ""
-
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:226
-msgid "Windows Media v2"
-msgstr ""
-
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:232
-msgid "MPEG 1 Layer III"
-msgstr ""
-
-#: ../plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp:234
-msgid "Advanced Audio Coding (AAC)"
-msgstr ""
-
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:384
 #: ../plugins/decoder/mp3/k3bmaddecoder.cpp:411
 msgid "Bitrate"
@@ -8678,14 +8673,18 @@
 msgid "No"
 msgstr ""
 
-#: ../plugins/decoder/wave/k3bwavedecoder.cpp:327
-msgid "WAVE"
-msgstr "TON"
-
 #: ../plugins/decoder/musepack/k3bmpcdecoder.cpp:69
 msgid "Musepack"
 msgstr ""
 
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:369
+msgid "FLAC"
+msgstr ""
+
+#: ../plugins/decoder/flac/k3bflacdecoder.cpp:384
+msgid "Vendor"
+msgstr "Gwerthwr"
+
 #: ../plugins/decoder/ogg/k3boggvorbisdecoder.cpp:120
 msgid "Bitrate Upper"
 msgstr ""
@@ -8703,60 +8702,6 @@
 msgid "Ogg-Vorbis"
 msgstr ""
 
-#: ../plugins/encoder/lame/k3blamemanualsettingsdialog.cpp:23
-msgid "(Lame) Manual Quality Settings"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:128
-#, kde-format
-msgid "Constant Bitrate: %1 kbps (%2)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:132
-#, kde-format
-msgid "Variable Bitrate (%1)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:75
-msgid "Low quality (56 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:76
-msgid "Low quality (90 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:78
-msgid "Portable (average 115 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:79
-msgid "Portable (average 130 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:80
-msgid "Portable (average 160 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:82
-msgid "HiFi (average 175 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:83
-msgid "HiFi (average 190 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:84
-msgid "HiFi (average 210 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:85
-msgid "HiFi (average 230 kbps)"
-msgstr ""
-
-#: ../plugins/encoder/lame/k3blametyes.h:87
-msgid "Archiving (320 kbps)"
-msgstr ""
-
 #: ../plugins/encoder/external/k3bexternalencoder.cpp:177
 #, kde-format
 msgid "Command failed: %1"
@@ -8884,6 +8829,60 @@
 msgid "Raw"
 msgstr "Amrwd"
 
+#: ../plugins/encoder/lame/k3blamemanualsettingsdialog.cpp:23
+msgid "(Lame) Manual Quality Settings"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:75
+msgid "Low quality (56 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:76
+msgid "Low quality (90 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:78
+msgid "Portable (average 115 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:79
+msgid "Portable (average 130 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:80
+msgid "Portable (average 160 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:82
+msgid "HiFi (average 175 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:83
+msgid "HiFi (average 190 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:84
+msgid "HiFi (average 210 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:85
+msgid "HiFi (average 230 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blametyes.h:87
+msgid "Archiving (320 kbps)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:128
+#, kde-format
+msgid "Constant Bitrate: %1 kbps (%2)"
+msgstr ""
+
+#: ../plugins/encoder/lame/k3blameencoderconfigwidget.cpp:132
+#, kde-format
+msgid "Variable Bitrate (%1)"
+msgstr ""
+
 #: ../plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp:63
 msgid "Controls the quality of the encoded files."
 msgstr ""
@@ -8905,22 +8904,6 @@
 msgid "(targeted VBR of %1)"
 msgstr ""
 
-#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:48
-msgid "Query a CDDB entry for the current audio project."
-msgstr ""
-
-#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:66
-msgid "Please select a non-empty audio project for a CDDB query."
-msgstr ""
-
-#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:70
-msgid "Query Cddb"
-msgstr ""
-
-#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:119
-msgid "Cddb error"
-msgstr ""
-
 #: ../plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp:113
 msgid "Rename Pattern"
 msgstr ""
@@ -8980,3 +8963,19 @@
 #: ../plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.cpp:384
 msgid "Rename audio files based on their meta info."
 msgstr ""
+
+#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:48
+msgid "Query a CDDB entry for the current audio project."
+msgstr ""
+
+#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:66
+msgid "Please select a non-empty audio project for a CDDB query."
+msgstr ""
+
+#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:70
+msgid "Query Cddb"
+msgstr ""
+
+#: ../plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.cpp:119
+msgid "Cddb error"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/k3bsetup.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/k3bsetup.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/k3bsetup.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/k3bsetup.po	2012-04-18 08:59:22.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: all.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-01 16:25+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-08-19 17:58+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:37+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: k3bsetup.cpp:77
 msgid "K3bSetup"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kabc_akonadi.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kabc_akonadi.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kabc_akonadi.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kabc_akonadi.po	2012-04-18 08:59:33.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdepim-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 04:24+0000\n"
+"POT-Creation-Date: 2012-04-12 19:14+0000\n"
 "PO-Revision-Date: 2010-11-11 14:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: resourceakonadi_p.cpp:292
 msgctxt "@label where to store a new address book entry"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kabc_dir.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kabc_dir.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kabc_dir.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kabc_dir.po	2012-04-18 08:59:29.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kabc_dir\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:16+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:53+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: resourcedir.cpp:222
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kaccess.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kaccess.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kaccess.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kaccess.po	2012-04-18 08:59:37.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kaccess\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:08+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:42+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:44+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kaccess.cpp:48
 msgid ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kaddressbook.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kaddressbook.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kaddressbook.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kaddressbook.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kaddressbook\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2009-07-18 17:51+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,12 +18,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: quicksearchwidget.cpp:38
-msgctxt "Search contacts in list"
-msgid "Search"
+#: grantleecontactformatter.cpp:283
+msgctxt "Boolean value"
+msgid "yes"
+msgstr ""
+
+#: grantleecontactformatter.cpp:285
+msgctxt "Boolean value"
+msgid "no"
+msgstr ""
+
+#: mainwindow.cpp:60
+msgid ""
+"You will be presented with a dialog where you can configure the application-"
+"wide shortcuts."
+msgstr ""
+
+#: contactswitcher.cpp:35
+msgctxt "Previous contact"
+msgid "Previous"
+msgstr ""
+
+#: contactswitcher.cpp:36
+msgctxt "Next contact"
+msgid "Next"
+msgstr ""
+
+#: contactswitcher.cpp:111
+#, kde-format
+msgid "%1 out of %2"
 msgstr ""
 
 #: aboutdata.cpp:28
@@ -54,734 +80,716 @@
 msgid "Kontact integration"
 msgstr ""
 
-#: xxportmanager.cpp:98
-msgid "Select Address Book"
+#: mainwidget.cpp:448
+msgid "Print the complete address book or a selected number of contacts."
 msgstr ""
 
-#: xxportmanager.cpp:99
-msgid "Select the address book the imported contact(s) shall be saved in:"
+#: mainwidget.cpp:451
+msgid "Quick search"
 msgstr ""
 
-#: xxportmanager.cpp:111
-msgid "Import Contacts"
+#: mainwidget.cpp:455
+msgid "Select All"
 msgstr ""
 
-#: xxportmanager.cpp:112
-#, kde-format
-msgid "Importing one contact to %2"
-msgid_plural "Importing %1 contacts to %2"
-msgstr[0] ""
-msgstr[1] ""
-
-#: xxportmanager.cpp:153
-msgid "Which contact do you want to export?"
+#: mainwidget.cpp:457
+msgid "Select all contacts in the current address book view."
 msgstr ""
 
-#: xxportmanager.cpp:164
-msgid "You have not selected any contacts to export."
+#: mainwidget.cpp:461
+msgid "Show Simple View"
 msgstr ""
 
-#: contactswitcher.cpp:35
-msgctxt "Previous contact"
-msgid "Previous"
+#: mainwidget.cpp:462
+msgid "Show a simple mode of the address book view."
 msgstr ""
 
-#: contactswitcher.cpp:36
-msgctxt "Next contact"
-msgid "Next"
+#: mainwidget.cpp:468
+msgid "Show QR Codes"
 msgstr ""
 
-#: contactswitcher.cpp:111
-#, kde-format
-msgid "%1 out of %2"
+#: mainwidget.cpp:469
+msgid "Show QR Codes in the contact."
 msgstr ""
 
-#: modelcolumnmanager.cpp:76
-msgid "Full Name"
-msgstr "Enw Llawn"
-
-#: modelcolumnmanager.cpp:81
-msgid "Family Name"
-msgstr ""
+#: mainwidget.cpp:475
+msgid "Import vCard..."
+msgstr "Mewnforio vCerdyn..."
 
-#: modelcolumnmanager.cpp:85
-msgid "Given Name"
+#: mainwidget.cpp:476
+msgid "Import contacts from a vCard file."
 msgstr ""
 
-#: modelcolumnmanager.cpp:93 printing/detailledstyle.cpp:152
-msgid "Home Address"
-msgstr "Cyfeiriad Cartref"
-
-#: modelcolumnmanager.cpp:97
-msgid "Business Address"
+#: mainwidget.cpp:480
+msgid "Import CSV file..."
 msgstr ""
 
-#: modelcolumnmanager.cpp:101
-msgid "Phone Numbers"
+#: mainwidget.cpp:481
+msgid "Import contacts from a file in comma separated value format."
 msgstr ""
 
-#: modelcolumnmanager.cpp:105
-msgid "Preferred EMail"
+#: mainwidget.cpp:485
+msgid "Import LDIF file..."
 msgstr ""
 
-#: modelcolumnmanager.cpp:109
-msgid "All EMails"
+#: mainwidget.cpp:486
+msgid "Import contacts from an LDIF file."
 msgstr ""
 
-#: grantleecontactformatter.cpp:282
-msgctxt "Boolean value"
-msgid "yes"
+#: mainwidget.cpp:490
+msgid "Import from LDAP server..."
 msgstr ""
 
-#: grantleecontactformatter.cpp:284
-msgctxt "Boolean value"
-msgid "no"
+#: mainwidget.cpp:491
+msgid "Import contacts from an LDAP server."
 msgstr ""
 
-#: contactselectiondialog.cpp:29
-msgid "Select Contacts"
+#: mainwidget.cpp:495
+msgid "Import GMX file..."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:119
-msgid ""
-"You have selected a list of contacts, shall they be exported to several "
-"files?"
+#: mainwidget.cpp:496
+msgid "Import contacts from a GMX address book file."
 msgstr ""
-"Rydych wedi dewis rhestr o gysylltau.  Ydych am eu hallforio i sawl ffeil?"
 
-#: xxport/vcard/vcard_xxport.cpp:122
-msgid "Export to Several Files"
-msgstr ""
+#: mainwidget.cpp:502
+msgid "Export vCard 3.0..."
+msgstr "Allforio vCerdyn 3.0..."
 
-#: xxport/vcard/vcard_xxport.cpp:123
-msgid "Export to One File"
+#: mainwidget.cpp:503
+msgid "Export contacts to a vCard 3.0 file."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:175
-msgid "Select vCard to Import"
-msgstr "Dewiswch vGerdyn i'w Fewnforio"
-
-#: xxport/vcard/vcard_xxport.cpp:180
-msgid "vCard Import Failed"
-msgstr "Mewnforio vCerdyn wedi Methu"
+#: mainwidget.cpp:507
+msgid "Export vCard 2.1..."
+msgstr "Allforio vCerdyn 2.1..."
 
-#: xxport/vcard/vcard_xxport.cpp:200
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>When trying to read the vCard, there was an error opening the file "
-"<filename>%1</filename>:</para><para>%2</para>"
+#: mainwidget.cpp:508
+msgid "Export contacts to a vCard 2.1 file."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:208
-#, kde-format
-msgctxt "@info"
-msgid "<para>Unable to access vCard:</para><para>%1</para>"
+#: mainwidget.cpp:512
+msgid "Export CSV file..."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:217
-msgid "No contacts were imported, due to errors with the vCards."
+#: mainwidget.cpp:513
+msgid "Export contacts to a file in comma separated value format."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:219
-msgid "The vCard does not contain any contacts."
+#: mainwidget.cpp:517
+msgid "Export LDIF file..."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:243 xxport/gmx/gmx_xxport.cpp:334
-#: xxport/csv/csv_xxport.cpp:48 xxport/ldif/ldif_xxport.cpp:114
-#, kde-format
-msgid "Do you want to overwrite file \"%1\""
+#: mainwidget.cpp:518
+msgid "Export contacts to an LDIF file."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:407
-msgid "Import vCard"
-msgstr "Mewnforio vCard"
-
-#: xxport/vcard/vcard_xxport.cpp:420
-msgid "Do you want to import this contact into your address book?"
+#: mainwidget.cpp:522
+msgid "Export GMX file..."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:429
-msgid "Import All..."
+#: mainwidget.cpp:523
+msgid "Export contacts to a GMX address book file."
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:491
-msgid "Select vCard Fields"
-msgstr ""
+#: mainwidget.cpp:530
+msgid "Address Book"
+msgstr "Llyfr Cyfeiriadau"
 
-#: xxport/vcard/vcard_xxport.cpp:504
-msgid "Select the fields which shall be exported in the vCard."
+#: mainwidget.cpp:536 printing/printingwizard.cpp:53
+msgid "Print Contacts"
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:507
-msgid "Private fields"
+#: printing/ringbinderstyle.cpp:142
+msgid "Ring Binder Printing Style - Appearance"
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:510
-msgid "Business fields"
+#: printing/ringbinderstyle.cpp:160
+msgid "Setting up fields"
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:513
-msgid "Other fields"
+#: printing/ringbinderstyle.cpp:176 printing/detailledstyle.cpp:283
+#: printing/mikesstyle.cpp:126
+msgid "Setting up document"
 msgstr ""
 
-#: xxport/vcard/vcard_xxport.cpp:516
-msgid "Encryption keys"
-msgstr "Allweddau cêl-ysgrifo"
+#: printing/ringbinderstyle.cpp:203 printing/detailledstyle.cpp:290
+#: printing/mikesstyle.cpp:133
+msgid "Printing"
+msgstr "Argraffu"
 
-#: xxport/vcard/vcard_xxport.cpp:519
-msgid "Pictures"
+#: printing/ringbinderstyle.cpp:207 printing/detailledstyle.cpp:294
+#: printing/mikesstyle.cpp:137
+msgctxt "Finished printing"
+msgid "Done"
 msgstr ""
 
-#: xxport/gmx/gmx_xxport.cpp:98
-msgid "GMX address book file (*.gmxa)"
+#: printing/ringbinderstyle.cpp:223
+msgid "Printout for Ring Binders"
 msgstr ""
 
-#: xxport/gmx/gmx_xxport.cpp:133 xxport/ldif/ldif_xxport.cpp:75
-#, kde-format
-msgid "<qt>Unable to open <b>%1</b> for reading.</qt>"
-msgstr "<qt>Methu agor <b>%1</b> i'w darllen.</qt>"
-
-#: xxport/gmx/gmx_xxport.cpp:148
-#, kde-format
-msgid "%1 is not a GMX address book file."
+#: printing/detailledstyle.cpp:96
+msgid "Organization:"
 msgstr ""
 
-#: xxport/gmx/gmx_xxport.cpp:342 xxport/csv/csv_xxport.cpp:55
-#: xxport/ldif/ldif_xxport.cpp:101
-#, kde-format
-msgid "<qt>Unable to open file <b>%1</b></qt>"
-msgstr ""
+#: printing/detailledstyle.cpp:104
+msgid "Email address:"
+msgstr "Cyfeiriad Ebost:"
 
-#: xxport/gmx/gmx_xxport.cpp:356 xxport/csv/csv_xxport.cpp:68
-#: xxport/ldif/ldif_xxport.cpp:121
-#, kde-format
-msgid "<qt>Unable to open file <b>%1</b>.</qt>"
-msgstr "<qt>Methu agor y ffeil <b>%1</b>.</qt>"
+#: printing/detailledstyle.cpp:104
+msgid "Email addresses:"
+msgstr "Cyfeiriadau ebost:"
 
-#: xxport/csv/templateselectiondialog.cpp:171
-#, kde-format
-msgctxt "@label"
-msgid "Do you really want to delete template '%1'?"
-msgstr ""
+#: printing/detailledstyle.cpp:114
+msgid "Telephone:"
+msgstr "Ffôn:"
 
-#: xxport/csv/templateselectiondialog.cpp:188
-msgctxt "@title:window"
-msgid "Template Selection"
-msgstr ""
+#: printing/detailledstyle.cpp:114
+msgid "Telephones:"
+msgstr "Ffônau:"
 
-#: xxport/csv/templateselectiondialog.cpp:194
-msgctxt "@info"
-msgid "Please select a template, that matches the CSV file:"
-msgstr ""
+#: printing/detailledstyle.cpp:126
+msgid "Web page:"
+msgstr "Tudalen wê:"
 
-#: xxport/csv/csvimportdialog.cpp:170
-msgctxt "@title:window"
-msgid "CSV Import Dialog"
-msgstr ""
+#: printing/detailledstyle.cpp:140
+msgid "Domestic Address"
+msgstr "Cyfeiriad Cartrefol"
 
-#: xxport/csv/csvimportdialog.cpp:220
-msgctxt "@label"
-msgid "Importing contacts"
-msgstr ""
+#: printing/detailledstyle.cpp:143
+msgid "International Address"
+msgstr "Cyfeiriad Rhyngwladol"
 
-#: xxport/csv/csvimportdialog.cpp:273
-msgctxt "@label"
-msgid "File to import:"
-msgstr ""
+#: printing/detailledstyle.cpp:146
+msgid "Postal Address"
+msgstr "Cyfeiriad Post"
 
-#: xxport/csv/csvimportdialog.cpp:284
-msgctxt "@title:group"
-msgid "Delimiter"
-msgstr ""
+#: printing/detailledstyle.cpp:149
+msgid "Parcel Address"
+msgstr "Cyfeiriad Parsel"
 
-#: xxport/csv/csvimportdialog.cpp:295
-msgctxt "@option:radio Field separator"
-msgid "Comma"
-msgstr ""
+#: printing/detailledstyle.cpp:152 modelcolumnmanager.cpp:93
+msgid "Home Address"
+msgstr "Cyfeiriad Cartref"
 
-#: xxport/csv/csvimportdialog.cpp:300
-msgctxt "@option:radio Field separator"
-msgid "Semicolon"
-msgstr ""
+#: printing/detailledstyle.cpp:155
+msgid "Work Address"
+msgstr "Cyfeiriad Gwaith"
 
-#: xxport/csv/csvimportdialog.cpp:304
-msgctxt "@option:radio Field separator"
-msgid "Tabulator"
-msgstr ""
+#: printing/detailledstyle.cpp:159
+msgid "Preferred Address"
+msgstr "Cyfeiriad Dewisedig"
 
-#: xxport/csv/csvimportdialog.cpp:308
-msgctxt "@option:radio Field separator"
-msgid "Space"
+#: printing/detailledstyle.cpp:170
+msgid "Notes:"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:312
-msgctxt "@option:radio Custum field separator"
-msgid "Other"
-msgstr ""
+#. i18n: file: printing/ds_appearance.ui:49
+#. i18n: ectx: property (text), widget (QLabel, labelHeader)
+#: printing/detailledstyle.cpp:247 rc.cpp:32
+msgid "Detailed Print Style - Appearance"
+msgstr "Arddull Manwl Argraffu - Ymddanosiad"
 
-#: xxport/csv/csvimportdialog.cpp:320
-msgctxt "@label:listbox"
-msgid "Text quote:"
+#: printing/detailledstyle.cpp:252
+msgid "Click on the color button to change the header's background color."
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:325
-msgctxt "@item:inlistbox Qoute character option"
-msgid "\""
+#: printing/detailledstyle.cpp:254
+msgid "Click on the color button to change the header's text color."
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:326
-msgctxt "@item:inlistbox Quote character option"
-msgid "'"
+#: printing/detailledstyle.cpp:266
+msgid "Setting up colors"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:327
-msgctxt "@item:inlistbox Quote character option"
-msgid "None"
+#: printing/detailledstyle.cpp:309
+msgid "Detailed Style"
+msgstr "Arddull Manwl"
+
+#: printing/mikesstyle.cpp:153
+msgid "Mike's Printing Style"
+msgstr "Arddull Argraffu Meic"
+
+#: printing/printingwizard.cpp:57
+msgid "Which contacts do you want to print?"
+msgstr "Pa cysylltiadau rydych eisiau argraffu?"
+
+#: printing/printingwizard.cpp:59
+msgid "Choose Contacts to Print"
+msgstr "Dewiswch Cysylltiadau i Argraffu"
+
+#: printing/printingwizard.cpp:65 printing/stylepage.cpp:121
+msgid "Choose Printing Style"
+msgstr "Dewiswch Arddull Argraffu"
+
+#: printing/printingwizard.cpp:133
+msgid "Print Progress"
+msgstr "Cynnydd Argraffu"
+
+#: printing/printprogress.cpp:41
+msgid "Printing: Progress"
+msgstr "Argraffu: Cynnydd"
+
+#: printing/printprogress.cpp:65
+msgid "Progress"
+msgstr "Cynnydd"
+
+#: printing/stylepage.cpp:51
+msgctxt "Ascending sort order"
+msgid "Ascending"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:331
-msgctxt "@label:listbox"
-msgid "Date format:"
+#: printing/stylepage.cpp:52
+msgctxt "Descending sort order"
+msgid "Descending"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:337
-msgctxt "@info:tooltip"
+#: printing/stylepage.cpp:64
+msgid "(No preview available.)"
+msgstr "(Dim rhagolwg ar gael.)"
+
+#: printing/stylepage.cpp:127
 msgid ""
-"<para><list><item>y: year with 2 digits</item><item>Y: year with 4 "
-"digits</item><item>m: month with 1 or 2 digits</item><item>M: month with 2 "
-"digits</item><item>d: day with 1 or 2 digits</item><item>D: day with 2 "
-"digits</item><item>H: hours with 2 digits</item><item>I: minutes with 2 "
-"digits</item><item>S: seconds with 2 digits</item></list></para>"
+"What should the print look like?\n"
+"KAddressBook has several printing styles, designed for different purposes.\n"
+"Choose the style that suits your needs below."
 msgstr ""
+"Sut ddylai'r argraff edrych?\n"
+" Mae gan KLlyfrCyfeiriadau sawl arddull argraffu, wedi'u dylunio ar gyfer "
+"bwriadau gwahanol.\n"
+" Dewiswch yr arddull sy'n addas at eich anghenion isod."
 
-#: xxport/csv/csvimportdialog.cpp:350
-msgctxt "@label:listbox"
-msgid "Text codec:"
-msgstr ""
+#: printing/stylepage.cpp:132
+msgid "Sorting"
+msgstr "Yn Didoli"
 
-#: xxport/csv/csvimportdialog.cpp:357
-msgctxt "@option:check"
-msgid "Skip first row of file"
-msgstr ""
+#: printing/stylepage.cpp:139
+msgid "Criterion:"
+msgstr "Maen prawf:"
 
-#: xxport/csv/csvimportdialog.cpp:370
-msgctxt "@action:button"
-msgid "Apply Template..."
-msgstr ""
+#: printing/stylepage.cpp:145
+msgid "Order:"
+msgstr "Trefn:"
 
-#: xxport/csv/csvimportdialog.cpp:371
-msgctxt "@action:button"
-msgid "Save Template..."
-msgstr ""
+#: printing/stylepage.cpp:153
+msgid "Print Style"
+msgstr "Arddull Argraffu"
 
-#: xxport/csv/csvimportdialog.cpp:390
-#, kde-format
-msgctxt "@item:inlistbox Codec setting"
-msgid "Local (%1)"
+#: contactselectionwidget.cpp:95
+msgid "All contacts"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:391
-msgctxt "@item:inlistbox Codec setting"
-msgid "Latin1"
+#: contactselectionwidget.cpp:96
+msgid "Selected contacts"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:392
-msgctxt "@item:inlistbox Codec setting"
-msgid "Unicode"
+#: contactselectionwidget.cpp:97
+msgid "All contacts from:"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:393
-msgctxt "@item:inlistbox Codec setting"
-msgid "Microsoft Unicode"
+#: contactselectionwidget.cpp:101
+msgid "Include Subfolders"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:477
-msgctxt "@info:status"
-msgid "You have to assign at least one column."
+#: contactfields.cpp:28
+msgctxt "@item Undefined import field type"
+msgid "Undefined"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:493
-msgctxt "@label"
-msgid "There are no templates available yet."
+#: contactfields.cpp:37
+msgid "Anniversary"
+msgstr "Dathliad"
+
+#: contactfields.cpp:60
+msgctxt "Preferred email address"
+msgid "EMail (preferred)"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:493
-msgctxt "@title:window"
-msgid "No templates available"
+#: contactfields.cpp:61
+msgctxt "Second email address"
+msgid "EMail (2)"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:557
-msgctxt "@title:window"
-msgid "Template Name"
+#: contactfields.cpp:62
+msgctxt "Third email address"
+msgid "EMail (3)"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:558
-msgctxt "@info"
-msgid "Please enter a name for the template:"
+#: contactfields.cpp:63
+msgctxt "Fourth email address"
+msgid "EMail (4)"
 msgstr ""
 
-#: xxport/csv/csvimportdialog.cpp:600
-msgctxt "@info:status"
-msgid "Cannot open input file."
+#: contactfields.cpp:70
+msgid "Blog Feed"
 msgstr ""
 
-#: mainwidget.cpp:438
-msgid "Print the complete address book or a selected number of contacts."
+#: contactfields.cpp:71
+msgid "Profession"
+msgstr "Galwedigaeth"
+
+#: contactfields.cpp:72
+msgid "Office"
+msgstr "Swyddfa"
+
+#: contactfields.cpp:73
+msgid "Manager"
 msgstr ""
 
-#: mainwidget.cpp:441
-msgid "Quick search"
+#: contactfields.cpp:74
+msgid "Assistant"
 msgstr ""
 
-#: mainwidget.cpp:445
-msgid "Select All"
+#: contactfields.cpp:75
+msgid "Spouse"
 msgstr ""
 
-#: mainwidget.cpp:447
-msgid "Select all contacts in the current address book view."
+#: xxportmanager.cpp:98
+msgid "Select Address Book"
 msgstr ""
 
-#: mainwidget.cpp:451
-msgid "Show Simple View"
+#: xxportmanager.cpp:99
+msgid "Select the address book the imported contact(s) shall be saved in:"
 msgstr ""
 
-#: mainwidget.cpp:452
-msgid "Show a simple mode of the address book view."
+#: xxportmanager.cpp:111
+msgid "Import Contacts"
 msgstr ""
 
-#: mainwidget.cpp:457
-msgid "Import vCard..."
-msgstr "Mewnforio vCerdyn..."
+#: xxportmanager.cpp:112
+#, kde-format
+msgid "Importing one contact to %2"
+msgid_plural "Importing %1 contacts to %2"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mainwidget.cpp:458
-msgid "Import contacts from a vCard file."
+#: xxportmanager.cpp:153
+msgid "Which contact do you want to export?"
 msgstr ""
 
-#: mainwidget.cpp:462
-msgid "Import CSV file..."
+#: xxportmanager.cpp:164
+msgid "You have not selected any contacts to export."
 msgstr ""
 
-#: mainwidget.cpp:463
-msgid "Import contacts from a file in comma separated value format."
+#: xxport/vcard/vcard_xxport.cpp:119
+msgid ""
+"You have selected a list of contacts, shall they be exported to several "
+"files?"
 msgstr ""
+"Rydych wedi dewis rhestr o gysylltau.  Ydych am eu hallforio i sawl ffeil?"
 
-#: mainwidget.cpp:467
-msgid "Import LDIF file..."
+#: xxport/vcard/vcard_xxport.cpp:122
+msgid "Export to Several Files"
 msgstr ""
 
-#: mainwidget.cpp:468
-msgid "Import contacts from an LDIF file."
+#: xxport/vcard/vcard_xxport.cpp:123
+msgid "Export to One File"
 msgstr ""
 
-#: mainwidget.cpp:472
-msgid "Import from LDAP server..."
-msgstr ""
+#: xxport/vcard/vcard_xxport.cpp:175
+msgid "Select vCard to Import"
+msgstr "Dewiswch vGerdyn i'w Fewnforio"
 
-#: mainwidget.cpp:473
-msgid "Import contacts from an LDAP server."
+#: xxport/vcard/vcard_xxport.cpp:180
+msgid "vCard Import Failed"
+msgstr "Mewnforio vCerdyn wedi Methu"
+
+#: xxport/vcard/vcard_xxport.cpp:200
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>When trying to read the vCard, there was an error opening the file "
+"<filename>%1</filename>:</para><para>%2</para>"
 msgstr ""
 
-#: mainwidget.cpp:477
-msgid "Import GMX file..."
+#: xxport/vcard/vcard_xxport.cpp:208
+#, kde-format
+msgctxt "@info"
+msgid "<para>Unable to access vCard:</para><para>%1</para>"
 msgstr ""
 
-#: mainwidget.cpp:478
-msgid "Import contacts from a GMX address book file."
+#: xxport/vcard/vcard_xxport.cpp:217
+msgid "No contacts were imported, due to errors with the vCards."
 msgstr ""
 
-#: mainwidget.cpp:484
-msgid "Export vCard 3.0..."
-msgstr "Allforio vCerdyn 3.0..."
+#: xxport/vcard/vcard_xxport.cpp:219
+msgid "The vCard does not contain any contacts."
+msgstr ""
 
-#: mainwidget.cpp:485
-msgid "Export contacts to a vCard 3.0 file."
+#: xxport/vcard/vcard_xxport.cpp:243 xxport/ldif/ldif_xxport.cpp:114
+#: xxport/gmx/gmx_xxport.cpp:334 xxport/csv/csv_xxport.cpp:48
+#, kde-format
+msgid "Do you want to overwrite file \"%1\""
 msgstr ""
 
-#: mainwidget.cpp:489
-msgid "Export vCard 2.1..."
-msgstr "Allforio vCerdyn 2.1..."
+#: xxport/vcard/vcard_xxport.cpp:407
+msgid "Import vCard"
+msgstr "Mewnforio vCard"
 
-#: mainwidget.cpp:490
-msgid "Export contacts to a vCard 2.1 file."
+#: xxport/vcard/vcard_xxport.cpp:420
+msgid "Do you want to import this contact into your address book?"
 msgstr ""
 
-#: mainwidget.cpp:494
-msgid "Export CSV file..."
+#: xxport/vcard/vcard_xxport.cpp:429
+msgid "Import All..."
 msgstr ""
 
-#: mainwidget.cpp:495
-msgid "Export contacts to a file in comma separated value format."
+#: xxport/vcard/vcard_xxport.cpp:491
+msgid "Select vCard Fields"
 msgstr ""
 
-#: mainwidget.cpp:499
-msgid "Export LDIF file..."
+#: xxport/vcard/vcard_xxport.cpp:504
+msgid "Select the fields which shall be exported in the vCard."
 msgstr ""
 
-#: mainwidget.cpp:500
-msgid "Export contacts to an LDIF file."
+#: xxport/vcard/vcard_xxport.cpp:507
+msgid "Private fields"
 msgstr ""
 
-#: mainwidget.cpp:504
-msgid "Export GMX file..."
+#: xxport/vcard/vcard_xxport.cpp:510
+msgid "Business fields"
 msgstr ""
 
-#: mainwidget.cpp:505
-msgid "Export contacts to a GMX address book file."
+#: xxport/vcard/vcard_xxport.cpp:513
+msgid "Other fields"
 msgstr ""
 
-#: mainwidget.cpp:512
-msgid "Address Book"
-msgstr "Llyfr Cyfeiriadau"
+#: xxport/vcard/vcard_xxport.cpp:516
+msgid "Encryption keys"
+msgstr "Allweddau cêl-ysgrifo"
 
-#: mainwidget.cpp:518 printing/printingwizard.cpp:53
-msgid "Print Contacts"
+#: xxport/vcard/vcard_xxport.cpp:519
+msgid "Pictures"
 msgstr ""
 
-#: mainwindow.cpp:60
-msgid ""
-"You will be presented with a dialog where you can configure the application-"
-"wide shortcuts."
-msgstr ""
+#: xxport/ldif/ldif_xxport.cpp:75 xxport/gmx/gmx_xxport.cpp:133
+#, kde-format
+msgid "<qt>Unable to open <b>%1</b> for reading.</qt>"
+msgstr "<qt>Methu agor <b>%1</b> i'w darllen.</qt>"
 
-#: contactfields.cpp:28
-msgctxt "@item Undefined import field type"
-msgid "Undefined"
+#: xxport/ldif/ldif_xxport.cpp:101 xxport/gmx/gmx_xxport.cpp:342
+#: xxport/csv/csv_xxport.cpp:55
+#, kde-format
+msgid "<qt>Unable to open file <b>%1</b></qt>"
 msgstr ""
 
-#: contactfields.cpp:37
-msgid "Anniversary"
-msgstr "Dathliad"
+#: xxport/ldif/ldif_xxport.cpp:121 xxport/gmx/gmx_xxport.cpp:356
+#: xxport/csv/csv_xxport.cpp:68
+#, kde-format
+msgid "<qt>Unable to open file <b>%1</b>.</qt>"
+msgstr "<qt>Methu agor y ffeil <b>%1</b>.</qt>"
 
-#: contactfields.cpp:60
-msgctxt "Preferred email address"
-msgid "EMail (preferred)"
+#: xxport/gmx/gmx_xxport.cpp:98
+msgid "GMX address book file (*.gmxa)"
 msgstr ""
 
-#: contactfields.cpp:61
-msgctxt "Second email address"
-msgid "EMail (2)"
+#: xxport/gmx/gmx_xxport.cpp:148
+#, kde-format
+msgid "%1 is not a GMX address book file."
 msgstr ""
 
-#: contactfields.cpp:62
-msgctxt "Third email address"
-msgid "EMail (3)"
+#: xxport/csv/templateselectiondialog.cpp:171
+#, kde-format
+msgctxt "@label"
+msgid "Do you really want to delete template '%1'?"
 msgstr ""
 
-#: contactfields.cpp:63
-msgctxt "Fourth email address"
-msgid "EMail (4)"
+#: xxport/csv/templateselectiondialog.cpp:188
+msgctxt "@title:window"
+msgid "Template Selection"
 msgstr ""
 
-#: contactfields.cpp:70
-msgid "Blog Feed"
+#: xxport/csv/templateselectiondialog.cpp:194
+msgctxt "@info"
+msgid "Please select a template, that matches the CSV file:"
 msgstr ""
 
-#: contactfields.cpp:71
-msgid "Profession"
-msgstr "Galwedigaeth"
-
-#: contactfields.cpp:72
-msgid "Office"
-msgstr "Swyddfa"
-
-#: contactfields.cpp:73
-msgid "Manager"
+#: xxport/csv/csvimportdialog.cpp:170
+msgctxt "@title:window"
+msgid "CSV Import Dialog"
 msgstr ""
 
-#: contactfields.cpp:74
-msgid "Assistant"
+#: xxport/csv/csvimportdialog.cpp:220
+msgctxt "@label"
+msgid "Importing contacts"
 msgstr ""
 
-#: contactfields.cpp:75
-msgid "Spouse"
+#: xxport/csv/csvimportdialog.cpp:273
+msgctxt "@label"
+msgid "File to import:"
 msgstr ""
 
-#: printing/mikesstyle.cpp:126 printing/detailledstyle.cpp:283
-#: printing/ringbinderstyle.cpp:176
-msgid "Setting up document"
+#: xxport/csv/csvimportdialog.cpp:284
+msgctxt "@title:group"
+msgid "Delimiter"
 msgstr ""
 
-#: printing/mikesstyle.cpp:133 printing/detailledstyle.cpp:290
-#: printing/ringbinderstyle.cpp:203
-msgid "Printing"
-msgstr "Argraffu"
-
-#: printing/mikesstyle.cpp:137 printing/detailledstyle.cpp:294
-#: printing/ringbinderstyle.cpp:207
-msgctxt "Finished printing"
-msgid "Done"
+#: xxport/csv/csvimportdialog.cpp:295
+msgctxt "@option:radio Field separator"
+msgid "Comma"
 msgstr ""
 
-#: printing/mikesstyle.cpp:153
-msgid "Mike's Printing Style"
-msgstr "Arddull Argraffu Meic"
-
-#: printing/detailledstyle.cpp:96
-msgid "Organization:"
+#: xxport/csv/csvimportdialog.cpp:300
+msgctxt "@option:radio Field separator"
+msgid "Semicolon"
 msgstr ""
 
-#: printing/detailledstyle.cpp:104
-msgid "Email address:"
-msgstr "Cyfeiriad Ebost:"
-
-#: printing/detailledstyle.cpp:104
-msgid "Email addresses:"
-msgstr "Cyfeiriadau ebost:"
-
-#: printing/detailledstyle.cpp:114
-msgid "Telephone:"
-msgstr "Ffôn:"
-
-#: printing/detailledstyle.cpp:114
-msgid "Telephones:"
-msgstr "Ffônau:"
-
-#: printing/detailledstyle.cpp:126
-msgid "Web page:"
-msgstr "Tudalen wê:"
-
-#: printing/detailledstyle.cpp:140
-msgid "Domestic Address"
-msgstr "Cyfeiriad Cartrefol"
-
-#: printing/detailledstyle.cpp:143
-msgid "International Address"
-msgstr "Cyfeiriad Rhyngwladol"
-
-#: printing/detailledstyle.cpp:146
-msgid "Postal Address"
-msgstr "Cyfeiriad Post"
+#: xxport/csv/csvimportdialog.cpp:304
+msgctxt "@option:radio Field separator"
+msgid "Tabulator"
+msgstr ""
 
-#: printing/detailledstyle.cpp:149
-msgid "Parcel Address"
-msgstr "Cyfeiriad Parsel"
+#: xxport/csv/csvimportdialog.cpp:308
+msgctxt "@option:radio Field separator"
+msgid "Space"
+msgstr ""
 
-#: printing/detailledstyle.cpp:155
-msgid "Work Address"
-msgstr "Cyfeiriad Gwaith"
+#: xxport/csv/csvimportdialog.cpp:312
+msgctxt "@option:radio Custum field separator"
+msgid "Other"
+msgstr ""
 
-#: printing/detailledstyle.cpp:159
-msgid "Preferred Address"
-msgstr "Cyfeiriad Dewisedig"
+#: xxport/csv/csvimportdialog.cpp:320
+msgctxt "@label:listbox"
+msgid "Text quote:"
+msgstr ""
 
-#: printing/detailledstyle.cpp:170
-msgid "Notes:"
+#: xxport/csv/csvimportdialog.cpp:325
+msgctxt "@item:inlistbox Qoute character option"
+msgid "\""
 msgstr ""
 
-#. i18n: file: printing/ds_appearance.ui:49
-#. i18n: ectx: property (text), widget (QLabel, labelHeader)
-#: printing/detailledstyle.cpp:247 rc.cpp:8
-msgid "Detailed Print Style - Appearance"
-msgstr "Arddull Manwl Argraffu - Ymddanosiad"
+#: xxport/csv/csvimportdialog.cpp:326
+msgctxt "@item:inlistbox Quote character option"
+msgid "'"
+msgstr ""
 
-#: printing/detailledstyle.cpp:252
-msgid "Click on the color button to change the header's background color."
+#: xxport/csv/csvimportdialog.cpp:327
+msgctxt "@item:inlistbox Quote character option"
+msgid "None"
 msgstr ""
 
-#: printing/detailledstyle.cpp:254
-msgid "Click on the color button to change the header's text color."
+#: xxport/csv/csvimportdialog.cpp:331
+msgctxt "@label:listbox"
+msgid "Date format:"
 msgstr ""
 
-#: printing/detailledstyle.cpp:266
-msgid "Setting up colors"
+#: xxport/csv/csvimportdialog.cpp:337
+msgctxt "@info:tooltip"
+msgid ""
+"<para><list><item>y: year with 2 digits</item><item>Y: year with 4 "
+"digits</item><item>m: month with 1 or 2 digits</item><item>M: month with 2 "
+"digits</item><item>d: day with 1 or 2 digits</item><item>D: day with 2 "
+"digits</item><item>H: hours with 2 digits</item><item>I: minutes with 2 "
+"digits</item><item>S: seconds with 2 digits</item></list></para>"
 msgstr ""
 
-#: printing/detailledstyle.cpp:309
-msgid "Detailed Style"
-msgstr "Arddull Manwl"
+#: xxport/csv/csvimportdialog.cpp:350
+msgctxt "@label:listbox"
+msgid "Text codec:"
+msgstr ""
 
-#: printing/stylepage.cpp:51
-msgctxt "Ascending sort order"
-msgid "Ascending"
+#: xxport/csv/csvimportdialog.cpp:357
+msgctxt "@option:check"
+msgid "Skip first row of file"
 msgstr ""
 
-#: printing/stylepage.cpp:52
-msgctxt "Descending sort order"
-msgid "Descending"
+#: xxport/csv/csvimportdialog.cpp:370
+msgctxt "@action:button"
+msgid "Apply Template..."
 msgstr ""
 
-#: printing/stylepage.cpp:64
-msgid "(No preview available.)"
-msgstr "(Dim rhagolwg ar gael.)"
+#: xxport/csv/csvimportdialog.cpp:371
+msgctxt "@action:button"
+msgid "Save Template..."
+msgstr ""
 
-#: printing/stylepage.cpp:121 printing/printingwizard.cpp:65
-msgid "Choose Printing Style"
-msgstr "Dewiswch Arddull Argraffu"
+#: xxport/csv/csvimportdialog.cpp:390
+#, kde-format
+msgctxt "@item:inlistbox Codec setting"
+msgid "Local (%1)"
+msgstr ""
 
-#: printing/stylepage.cpp:127
-msgid ""
-"What should the print look like?\n"
-"KAddressBook has several printing styles, designed for different purposes.\n"
-"Choose the style that suits your needs below."
+#: xxport/csv/csvimportdialog.cpp:391
+msgctxt "@item:inlistbox Codec setting"
+msgid "Latin1"
 msgstr ""
-"Sut ddylai'r argraff edrych?\n"
-" Mae gan KLlyfrCyfeiriadau sawl arddull argraffu, wedi'u dylunio ar gyfer "
-"bwriadau gwahanol.\n"
-" Dewiswch yr arddull sy'n addas at eich anghenion isod."
 
-#: printing/stylepage.cpp:132
-msgid "Sorting"
-msgstr "Yn Didoli"
+#: xxport/csv/csvimportdialog.cpp:392
+msgctxt "@item:inlistbox Codec setting"
+msgid "Unicode"
+msgstr ""
 
-#: printing/stylepage.cpp:139
-msgid "Criterion:"
-msgstr "Maen prawf:"
+#: xxport/csv/csvimportdialog.cpp:393
+msgctxt "@item:inlistbox Codec setting"
+msgid "Microsoft Unicode"
+msgstr ""
 
-#: printing/stylepage.cpp:145
-msgid "Order:"
-msgstr "Trefn:"
+#: xxport/csv/csvimportdialog.cpp:477
+msgctxt "@info:status"
+msgid "You have to assign at least one column."
+msgstr ""
 
-#: printing/stylepage.cpp:153
-msgid "Print Style"
-msgstr "Arddull Argraffu"
+#: xxport/csv/csvimportdialog.cpp:493
+msgctxt "@label"
+msgid "There are no templates available yet."
+msgstr ""
 
-#: printing/printingwizard.cpp:57
-msgid "Which contacts do you want to print?"
-msgstr "Pa cysylltiadau rydych eisiau argraffu?"
+#: xxport/csv/csvimportdialog.cpp:493
+msgctxt "@title:window"
+msgid "No templates available"
+msgstr ""
 
-#: printing/printingwizard.cpp:59
-msgid "Choose Contacts to Print"
-msgstr "Dewiswch Cysylltiadau i Argraffu"
+#: xxport/csv/csvimportdialog.cpp:557
+msgctxt "@title:window"
+msgid "Template Name"
+msgstr ""
 
-#: printing/printingwizard.cpp:133
-msgid "Print Progress"
-msgstr "Cynnydd Argraffu"
+#: xxport/csv/csvimportdialog.cpp:558
+msgctxt "@info"
+msgid "Please enter a name for the template:"
+msgstr ""
 
-#: printing/printprogress.cpp:41
-msgid "Printing: Progress"
-msgstr "Argraffu: Cynnydd"
+#: xxport/csv/csvimportdialog.cpp:600
+msgctxt "@info:status"
+msgid "Cannot open input file."
+msgstr ""
 
-#: printing/printprogress.cpp:65
-msgid "Progress"
-msgstr "Cynnydd"
+#: contactselectiondialog.cpp:29
+msgid "Select Contacts"
+msgstr ""
 
-#: printing/ringbinderstyle.cpp:142
-msgid "Ring Binder Printing Style - Appearance"
+#: modelcolumnmanager.cpp:76
+msgid "Full Name"
+msgstr "Enw Llawn"
+
+#: modelcolumnmanager.cpp:81
+msgid "Family Name"
 msgstr ""
 
-#: printing/ringbinderstyle.cpp:160
-msgid "Setting up fields"
+#: modelcolumnmanager.cpp:85
+msgid "Given Name"
 msgstr ""
 
-#: printing/ringbinderstyle.cpp:223
-msgid "Printout for Ring Binders"
+#: modelcolumnmanager.cpp:97
+msgid "Business Address"
 msgstr ""
 
-#: contactselectionwidget.cpp:95
-msgid "All contacts"
+#: modelcolumnmanager.cpp:101
+msgid "Phone Numbers"
 msgstr ""
 
-#: contactselectionwidget.cpp:96
-msgid "Selected contacts"
+#: modelcolumnmanager.cpp:105
+msgid "Preferred EMail"
 msgstr ""
 
-#: contactselectionwidget.cpp:97
-msgid "All contacts from:"
+#: modelcolumnmanager.cpp:109
+msgid "All EMails"
 msgstr ""
 
-#: contactselectionwidget.cpp:101
-msgid "Include Subfolders"
+#: quicksearchwidget.cpp:38
+msgctxt "Search contacts in list"
+msgid "Search"
 msgstr ""
 
 #: rc.cpp:1
@@ -794,78 +802,78 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: printing/ds_appearance.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, AppearancePage_Base)
-#: rc.cpp:5
-msgid "Appearance Page"
-msgstr "Tudalen Olwg"
-
-#. i18n: file: printing/ds_appearance.ui:68
-#. i18n: ectx: property (title), widget (QGroupBox, gbHeadline)
-#: rc.cpp:11
-msgid "Contact Headers"
-msgstr "Penawdau Cyswllt"
-
-#. i18n: file: printing/ds_appearance.ui:106
-#. i18n: ectx: property (text), widget (QLabel, tlBackgroundColor)
-#: rc.cpp:14
-msgid "Headline background color:"
-msgstr "Lliw cefndir y pennawd"
-
-#. i18n: file: printing/ds_appearance.ui:116
-#. i18n: ectx: property (text), widget (QLabel, tlHeaderColor)
-#: rc.cpp:17
-msgid "Headline text color:"
-msgstr "Lliw testun y pennawd"
-
 #. i18n: file: printing/rbs_appearance.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, RingBinderStyleAppearanceForm_Base)
-#: rc.cpp:20
+#: rc.cpp:5
 msgid "Appearance"
 msgstr ""
 
 #. i18n: file: printing/rbs_appearance.ui:26
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox2)
-#: rc.cpp:23
+#: rc.cpp:8
 msgid "Print Contact's Information"
 msgstr ""
 
 #. i18n: file: printing/rbs_appearance.ui:32
 #. i18n: ectx: property (text), widget (QCheckBox, cbPhoneNumbers)
-#: rc.cpp:26
+#: rc.cpp:11
 msgid "Phone numbers"
 msgstr ""
 
 #. i18n: file: printing/rbs_appearance.ui:42
 #. i18n: ectx: property (text), widget (QCheckBox, cbEmails)
-#: rc.cpp:29
+#: rc.cpp:14
 msgid "Email addresses"
 msgstr ""
 
 #. i18n: file: printing/rbs_appearance.ui:52
 #. i18n: ectx: property (text), widget (QCheckBox, cbStreetAddresses)
-#: rc.cpp:32
+#: rc.cpp:17
 msgid "Postal addresses"
 msgstr ""
 
 #. i18n: file: printing/rbs_appearance.ui:62
 #. i18n: ectx: property (text), widget (QCheckBox, cbOrganization)
-#: rc.cpp:35
+#: rc.cpp:20
 msgid "Organization"
 msgstr "Sefydliad"
 
 #. i18n: file: printing/rbs_appearance.ui:69
 #. i18n: ectx: property (text), widget (QCheckBox, cbBirthday)
-#: rc.cpp:38
+#: rc.cpp:23
 msgid "Birthday"
 msgstr ""
 
 #. i18n: file: printing/rbs_appearance.ui:76
 #. i18n: ectx: property (text), widget (QCheckBox, cbNote)
-#: rc.cpp:41
+#: rc.cpp:26
 msgid "Note"
 msgstr ""
 
+#. i18n: file: printing/ds_appearance.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, AppearancePage_Base)
+#: rc.cpp:29
+msgid "Appearance Page"
+msgstr "Tudalen Olwg"
+
+#. i18n: file: printing/ds_appearance.ui:68
+#. i18n: ectx: property (title), widget (QGroupBox, gbHeadline)
+#: rc.cpp:35
+msgid "Contact Headers"
+msgstr "Penawdau Cyswllt"
+
+#. i18n: file: printing/ds_appearance.ui:106
+#. i18n: ectx: property (text), widget (QLabel, tlBackgroundColor)
+#: rc.cpp:38
+msgid "Headline background color:"
+msgstr "Lliw cefndir y pennawd"
+
+#. i18n: file: printing/ds_appearance.ui:116
+#. i18n: ectx: property (text), widget (QLabel, tlHeaderColor)
+#: rc.cpp:41
+msgid "Headline text color:"
+msgstr "Lliw testun y pennawd"
+
 #. i18n: file: kaddressbookui.rc:5
 #. i18n: ectx: Menu (file)
 #: rc.cpp:44
@@ -902,7 +910,7 @@
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: kaddressbookui.rc:81
+#. i18n: file: kaddressbookui.rc:82
 #. i18n: ectx: ToolBar (mainToolBar)
 #: rc.cpp:62
 msgid "Main Toolbar"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kalarm.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kalarm.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kalarm.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kalarm.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: kalarm\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:54+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-11 17:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,860 +18,805 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:34+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: latecancel.cpp:44
-msgctxt "@option:check"
-msgid "Cancel if late"
+#: editdlgtypes.cpp:95
+msgctxt "@title:window"
+msgid "Choose Log File"
 msgstr ""
 
-#: latecancel.cpp:45
+#: editdlgtypes.cpp:108
 msgctxt "@option:check"
-msgid "Auto-close window after this time"
+msgid "Confirm acknowledgment"
 msgstr ""
 
-#: latecancel.cpp:46
-msgctxt "@option:check"
-msgid "Auto-close window after late-cancellation time"
+#: editdlgtypes.cpp:144
+msgctxt "@title:window"
+msgid "New Display Alarm Template"
 msgstr ""
 
-#: latecancel.cpp:56
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>If checked, the alarm will be canceled if it cannot be triggered "
-"within the specified period after its scheduled time. Possible reasons for "
-"not triggering include your being logged off, X not running, or "
-"<application>KAlarm</application> not running.</para><para>If unchecked, the "
-"alarm will be triggered at the first opportunity after its scheduled time, "
-"regardless of how late it is.</para>"
+#: editdlgtypes.cpp:144
+msgctxt "@title:window"
+msgid "Edit Display Alarm Template"
 msgstr ""
 
-#: latecancel.cpp:82
-msgctxt "@option:check Cancel if late by 10 minutes"
-msgid "Cancel if late by"
+#: editdlgtypes.cpp:145
+msgctxt "@title:window"
+msgid "New Display Alarm"
 msgstr ""
 
-#: latecancel.cpp:83
-msgctxt "@info:whatsthis"
-msgid "Enter how late will cause the alarm to be canceled"
+#: editdlgtypes.cpp:145
+msgctxt "@title:window"
+msgid "Edit Display Alarm"
 msgstr ""
 
-#: latecancel.cpp:99
+#: editdlgtypes.cpp:157
+msgctxt "@label:listbox"
+msgid "Display type:"
+msgstr ""
+
+#: editdlgtypes.cpp:160
+msgctxt "@item:inlistbox"
+msgid "Text message"
+msgstr ""
+
+#: editdlgtypes.cpp:161
+msgctxt "@item:inlistbox"
+msgid "File contents"
+msgstr ""
+
+#: editdlgtypes.cpp:162
+msgctxt "@item:inlistbox"
+msgid "Command output"
+msgstr ""
+
+#: editdlgtypes.cpp:183
+#, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
-"Automatically close the alarm window after the expiry of the late-"
-"cancellation period"
+"<para>Select what the alarm should "
+"display:<list><item><interface>%1</interface>: the alarm will display the "
+"text message you type in.</item><item><interface>%2</interface>: the alarm "
+"will display the contents of a text or image "
+"file.</item><item><interface>%3</interface>: the alarm will display the "
+"output from a command.</item></list></para>"
 msgstr ""
 
-#: templatedlg.cpp:69
-msgctxt "@title:window"
-msgid "Alarm Templates"
+#: editdlgtypes.cpp:194
+msgctxt "@info:whatsthis"
+msgid "Enter the text of the alarm message. It may be multi-line."
 msgstr ""
 
-#: templatedlg.cpp:95 templatelistview.cpp:44
+#: editdlgtypes.cpp:204
 msgctxt "@info:whatsthis"
-msgid "The list of alarm templates"
+msgid "Enter the name or URL of a text or image file to display."
 msgstr ""
 
-#: templatedlg.cpp:103
-msgctxt "@action:button"
-msgid "New"
+#: editdlgtypes.cpp:212 editdlgtypes.cpp:796 sounddlg.cpp:189
+msgctxt "@info:tooltip"
+msgid "Choose a file"
 msgstr ""
 
-#: templatedlg.cpp:104
-msgctxt "@action"
-msgid "New"
+#: editdlgtypes.cpp:213
+msgctxt "@info:whatsthis"
+msgid "Select a text or image file to display."
 msgstr ""
 
-#: templatedlg.cpp:107
+#: editdlgtypes.cpp:261
 msgctxt "@info:whatsthis"
-msgid "Create a new alarm template"
+msgid ""
+"Enter how long in advance of or after the main alarm to display a reminder "
+"alarm."
 msgstr ""
 
-#: templatedlg.cpp:110 resourceselector.cpp:132
-msgctxt "@action:button"
-msgid "Edit..."
+#: editdlgtypes.cpp:262
+msgctxt "@info:whatsthis"
+msgid ""
+"Check to additionally display a reminder in advance of or after the main "
+"alarm time(s)."
 msgstr ""
 
-#: templatedlg.cpp:112
+#: editdlgtypes.cpp:263
+#, kde-format
 msgctxt "@info:whatsthis"
-msgid "Edit the currently highlighted alarm template"
+msgid ""
+"<para>Enter how long in advance of or after the main alarm to display a "
+"reminder alarm.</para><para>%1</para>"
 msgstr ""
 
-#: templatedlg.cpp:115
-msgctxt "@action:button"
-msgid "Copy"
+#: editdlgtypes.cpp:264
+msgctxt "@info:whatsthis"
+msgid ""
+"Select whether the reminder should be triggered before or after the main "
+"alarm"
 msgstr ""
 
-#: templatedlg.cpp:117
+#: editdlgtypes.cpp:274
 msgctxt "@info:whatsthis"
-msgid ""
-"Create a new alarm template based on a copy of the currently highlighted "
-"template"
+msgid "Check to be prompted for confirmation when you acknowledge the alarm."
 msgstr ""
 
-#: templatedlg.cpp:120 recurrenceedit.cpp:364
-msgctxt "@action:button"
-msgid "Delete"
+#: editdlgtypes.cpp:608
+msgctxt "@info:whatsthis"
+msgid "Display the alarm message now"
 msgstr ""
 
-#: templatedlg.cpp:122
+#: editdlgtypes.cpp:617
 msgctxt "@info:whatsthis"
-msgid "Delete the currently highlighted alarm template"
+msgid "Display the file now"
 msgstr ""
 
-#: templatedlg.cpp:211
-#, kde-format
-msgctxt "@info"
-msgid "Do you really want to delete the selected alarm template?"
-msgid_plural "Do you really want to delete the %1 selected alarm templates?"
-msgstr[0] ""
-msgstr[1] ""
+#: editdlgtypes.cpp:627
+msgctxt "@info:whatsthis"
+msgid "Display the command output now"
+msgstr ""
 
-#: templatedlg.cpp:213
+#: editdlgtypes.cpp:641
 msgctxt "@title:window"
-msgid "Delete Alarm Template"
-msgid_plural "Delete Alarm Templates"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templatedlg.cpp:214 mainwindow.cpp:827
-msgctxt "@action:button"
-msgid "&Delete"
+msgid "Choose Text or Image File to Display"
 msgstr ""
 
-#: reminder.cpp:49
+#: editdlgtypes.cpp:716
 msgctxt "@option:check"
-msgid "Reminder for first recurrence only"
+msgid "Enter a script"
 msgstr ""
 
-#: reminder.cpp:51
-msgctxt "@item:inlistbox"
-msgid "in advance"
+#: editdlgtypes.cpp:717
+msgctxt "@option:radio"
+msgid "Execute in terminal window"
 msgstr ""
 
-#: reminder.cpp:65
+#: editdlgtypes.cpp:718
 msgctxt "@option:check"
-msgid "Reminder:"
+msgid "Execute in terminal window"
 msgstr ""
 
-#: reminder.cpp:69
-msgctxt "@item:inlistbox"
-msgid "afterwards"
+#: editdlgtypes.cpp:748
+msgctxt "@title:window"
+msgid "New Command Alarm Template"
 msgstr ""
 
-#: reminder.cpp:91
-msgctxt "@info:whatsthis"
-msgid "Display the reminder only for the first time the alarm is scheduled"
+#: editdlgtypes.cpp:748
+msgctxt "@title:window"
+msgid "Edit Command Alarm Template"
 msgstr ""
 
-#: newalarmaction.cpp:58
-msgctxt "@item:inmenu"
-msgid "&Display Alarm Template"
+#: editdlgtypes.cpp:749
+msgctxt "@title:window"
+msgid "New Command Alarm"
 msgstr ""
 
-#: newalarmaction.cpp:58
-msgctxt "@action"
-msgid "New Display Alarm"
+#: editdlgtypes.cpp:749
+msgctxt "@title:window"
+msgid "Edit Command Alarm"
 msgstr ""
 
-#: newalarmaction.cpp:61
-msgctxt "@item:inmenu"
-msgid "&Command Alarm Template"
+#: editdlgtypes.cpp:757
+msgctxt "@info:whatsthis"
+msgid "Execute the specified command now"
 msgstr ""
 
-#: newalarmaction.cpp:61
-msgctxt "@action"
-msgid "New Command Alarm"
+#: editdlgtypes.cpp:766
+msgctxt "@title:group"
+msgid "Command Output"
 msgstr ""
 
-#: newalarmaction.cpp:64
-msgctxt "@item:inmenu"
-msgid "&Email Alarm Template"
+#: editdlgtypes.cpp:777
+msgctxt "@info:whatsthis"
+msgid "Check to execute the command in a terminal window"
 msgstr ""
 
-#: newalarmaction.cpp:64
-msgctxt "@action"
-msgid "New Email Alarm"
+#: editdlgtypes.cpp:787
+msgctxt "@info:whatsthis"
+msgid "Enter the name or path of the log file."
 msgstr ""
 
-#: newalarmaction.cpp:67
-msgctxt "@item:inmenu"
-msgid "&Audio Alarm Template"
+#: editdlgtypes.cpp:797
+msgctxt "@info:whatsthis"
+msgid "Select a log file."
 msgstr ""
 
-#: newalarmaction.cpp:67
-msgctxt "@action"
-msgid "New Audio Alarm"
+#: editdlgtypes.cpp:800
+msgctxt "@option:radio"
+msgid "Log to file"
 msgstr ""
 
-#: newalarmaction.cpp:78
-msgctxt "@action"
-msgid "New Alarm From &Template"
+#: editdlgtypes.cpp:802
+msgctxt "@info:whatsthis"
+msgid ""
+"Check to log the command output to a local file. The output will be appended "
+"to any existing contents of the file."
 msgstr ""
 
-#: specialactions.cpp:48
-msgctxt "@action:button"
-msgid "Special Actions..."
+#: editdlgtypes.cpp:809
+msgctxt "@option:radio"
+msgid "Discard"
 msgstr ""
 
-#: specialactions.cpp:56
+#: editdlgtypes.cpp:811
 msgctxt "@info:whatsthis"
-msgid "Specify actions to execute before and after the alarm is displayed."
+msgid "Check to discard command output."
 msgstr ""
 
-#: specialactions.cpp:109
-msgctxt "@title:window"
-msgid "Special Alarm Actions"
+#: editdlgtypes.cpp:965
+msgctxt "@info"
+msgid ""
+"Log file must be the name or path of a local file, with write permission."
 msgstr ""
 
-#: specialactions.cpp:167
-msgctxt "@title:group"
-msgid "Pre-Alarm Action"
+#: editdlgtypes.cpp:985
+#, kde-format
+msgctxt "@info"
+msgid "Command executed: <icode>%1</icode>"
 msgstr ""
 
-#: specialactions.cpp:177 specialactions.cpp:207
-msgctxt "@label:textbox"
-msgid "Command:"
+#: editdlgtypes.cpp:1019
+msgctxt "@option:check"
+msgid "Copy email to self"
 msgstr ""
 
-#: specialactions.cpp:182
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>Enter a shell command to execute before the alarm is "
-"displayed.</para><para>Note that it is executed only when the alarm proper "
-"is displayed, not when a reminder or deferred alarm is "
-"displayed.</para><para><note>KAlarm will wait for the command to complete "
-"before displaying the alarm.</note></para>"
+#: editdlgtypes.cpp:1051
+msgctxt "@title:window"
+msgid "New Email Alarm Template"
 msgstr ""
 
-#: specialactions.cpp:188
-msgctxt "@option:check"
-msgid "Cancel alarm on error"
+#: editdlgtypes.cpp:1051
+msgctxt "@title:window"
+msgid "Edit Email Alarm Template"
 msgstr ""
 
-#: specialactions.cpp:189
-msgctxt "@info:whatsthis"
-msgid ""
-"Cancel the alarm if the pre-alarm command fails, i.e. do not display the "
-"alarm or execute any post-alarm action command."
+#: editdlgtypes.cpp:1052
+msgctxt "@title:window"
+msgid "New Email Alarm"
 msgstr ""
 
-#: specialactions.cpp:192
-msgctxt "@option:check"
-msgid "Do not notify errors"
+#: editdlgtypes.cpp:1052
+msgctxt "@title:window"
+msgid "Edit Email Alarm"
 msgstr ""
 
-#: specialactions.cpp:193
+#: editdlgtypes.cpp:1060
 msgctxt "@info:whatsthis"
-msgid ""
-"Do not show error status or error message if the pre-alarm command fails."
+msgid "Send the email to the specified addressees now"
 msgstr ""
 
-#: specialactions.cpp:197
-msgctxt "@title:group"
-msgid "Post-Alarm Action"
+#: editdlgtypes.cpp:1071
+msgctxt "@label:listbox 'From' email address"
+msgid "From:"
 msgstr ""
 
-#: specialactions.cpp:211
+#: editdlgtypes.cpp:1078
 msgctxt "@info:whatsthis"
 msgid ""
-"<para>Enter a shell command to execute after the alarm window is "
-"closed.</para><para>Note that it is not executed after closing a reminder "
-"window. If you defer the alarm, it is not executed until the alarm is "
-"finally acknowledged or closed.</para>"
-msgstr ""
-
-#: cal/kacalendar.cpp:200 main.cpp:38
-msgid "KAlarm"
-msgstr "KAlarm/KLarwm"
-
-#: cal/alarmtext.cpp:335
-msgctxt "@info/plain 'From' email address"
-msgid "From:"
+"Your email identity, used to identify you as the sender when sending email "
+"alarms."
 msgstr ""
 
-#: cal/alarmtext.cpp:336
-msgctxt "@info/plain Email addressee"
+#: editdlgtypes.cpp:1084
+msgctxt "@label:textbox Email addressee"
 msgid "To:"
 msgstr ""
 
-#: cal/alarmtext.cpp:337
-msgctxt "@info/plain Copy-to in email headers"
-msgid "Cc:"
+#: editdlgtypes.cpp:1090
+msgctxt "@info:whatsthis"
+msgid ""
+"Enter the addresses of the email recipients. Separate multiple addresses by "
+"commas or semicolons."
 msgstr ""
 
-#: cal/alarmtext.cpp:338
-msgctxt "@info/plain"
-msgid "Date:"
+#: editdlgtypes.cpp:1100
+msgctxt "@info:tooltip"
+msgid "Open address book"
 msgstr ""
 
-#: cal/alarmtext.cpp:339
-msgctxt "@info/plain Email subject"
-msgid "Subject:"
+#: editdlgtypes.cpp:1101
+msgctxt "@info:whatsthis"
+msgid "Select email addresses from your address book."
 msgstr ""
 
-#: cal/alarmtext.cpp:341
-msgctxt "@info/plain Todo calendar item's title field"
-msgid "To-do:"
+#: editdlgtypes.cpp:1105
+msgctxt "@label:textbox Email subject"
+msgid "Subject:"
 msgstr ""
 
-#: cal/alarmtext.cpp:342
-msgctxt "@info/plain Todo calendar item's location field"
-msgid "Location:"
+#: editdlgtypes.cpp:1112
+msgctxt "@info:whatsthis"
+msgid "Enter the email subject."
 msgstr ""
 
-#: cal/alarmtext.cpp:343
-msgctxt "@info/plain Todo calendar item's due date/time"
-msgid "Due:"
+#: editdlgtypes.cpp:1118
+msgctxt "@info:whatsthis"
+msgid "Enter the email message."
 msgstr ""
 
-#: cal/kaevent.cpp:3417
-msgctxt "@info/plain Brief form of 'At Login'"
-msgid "Login"
+#: editdlgtypes.cpp:1126
+msgctxt "@label:listbox"
+msgid "Attachments:"
 msgstr ""
 
-#: cal/kaevent.cpp:3417
-msgctxt "@info/plain"
-msgid "At login"
+#: editdlgtypes.cpp:1139
+msgctxt "@info:whatsthis"
+msgid "Files to send as attachments to the email."
 msgstr ""
 
-#: cal/kaevent.cpp:3425 cal/kaevent.cpp:3460
-#, kde-format
-msgctxt "@info/plain"
-msgid "1 Minute"
-msgid_plural "%1 Minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cal/kaevent.cpp:3427 cal/kaevent.cpp:3462
-#, kde-format
-msgctxt "@info/plain"
-msgid "1 Hour"
-msgid_plural "%1 Hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cal/kaevent.cpp:3431 cal/kaevent.cpp:3464
-#, kde-format
-msgctxt "@info/plain Hours and minutes"
-msgid "%1h %2m"
+#: editdlgtypes.cpp:1143 resourceselector.cpp:135
+msgctxt "@action:button"
+msgid "Add..."
 msgstr ""
 
-#: cal/kaevent.cpp:3434 cal/kaevent.cpp:3468
-#, kde-format
-msgctxt "@info/plain"
-msgid "1 Day"
-msgid_plural "%1 Days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cal/kaevent.cpp:3436 cal/kaevent.cpp:3469
-#, kde-format
-msgctxt "@info/plain"
-msgid "1 Week"
-msgid_plural "%1 Weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cal/kaevent.cpp:3438
-#, kde-format
-msgctxt "@info/plain"
-msgid "1 Month"
-msgid_plural "%1 Months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cal/kaevent.cpp:3440
-#, kde-format
-msgctxt "@info/plain"
-msgid "1 Year"
-msgid_plural "%1 Years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cal/kaevent.cpp:3446
-msgctxt "@info/plain No recurrence"
-msgid "None"
+#: editdlgtypes.cpp:1145
+msgctxt "@info:whatsthis"
+msgid "Add an attachment to the email."
 msgstr ""
 
-#: cal/kaevent.cpp:3471
-msgctxt "@info/plain No repetition"
-msgid "None"
+#: editdlgtypes.cpp:1148 resourceselector.cpp:137
+msgctxt "@action:button"
+msgid "Remove"
 msgstr ""
 
-#: eventlistview.cpp:51
+#: editdlgtypes.cpp:1150
 msgctxt "@info:whatsthis"
-msgid "List of scheduled alarms"
-msgstr ""
-
-#: resources/alarmresources.cpp:133 calendarmigrator.cpp:166
-msgctxt "@info/plain"
-msgid "Active Alarms"
+msgid "Remove the highlighted attachment from the email."
 msgstr ""
 
-#: resources/alarmresources.cpp:138 calendarmigrator.cpp:180
-msgctxt "@info/plain"
-msgid "Alarm Templates"
+#: editdlgtypes.cpp:1156
+msgctxt "@info:whatsthis"
+msgid "If checked, the email will be blind copied to you."
 msgstr ""
 
-#: resources/alarmresources.cpp:143 calendarmigrator.cpp:173
-msgctxt "@info/plain"
-msgid "Archived Alarms"
+#: editdlgtypes.cpp:1339
+#, kde-format
+msgctxt "@info"
+msgid "Invalid email address: <email>%1</email>"
 msgstr ""
 
-#: resources/alarmresources.cpp:157
-#, kde-format
+#: editdlgtypes.cpp:1346
 msgctxt "@info"
-msgid "%1: invalid calendar file name: <filename>%2</filename>"
+msgid "No email address specified"
 msgstr ""
 
-#: resources/alarmresources.cpp:165
+#: editdlgtypes.cpp:1363
 #, kde-format
 msgctxt "@info"
-msgid "%1: file name not permitted: <filename>%2</filename>"
+msgid "Invalid email attachment: <filename>%1</filename>"
 msgstr ""
 
-#: resources/resourcewidget.cpp:54
-#, kde-format
+#: editdlgtypes.cpp:1367
 msgctxt "@info"
 msgid ""
-"Calendar <resource>%1</resource> cannot be made writable since it either was "
-"not created by <application>KAlarm</application>, or was created by a newer "
-"version of <application>KAlarm</application>"
+"Do you really want to send the email now to the specified recipient(s)?"
 msgstr ""
 
-#: resources/resourcelocaldir.cpp:485 akonadimodel.cpp:912
-msgctxt "@info/plain Directory in filesystem"
-msgid "Directory"
+#: editdlgtypes.cpp:1368
+msgctxt "@action:button"
+msgid "Confirm Email"
 msgstr ""
 
-#: resources/resourcelocaldirwidget.cpp:40
-#: resources/resourcelocalwidget.cpp:42
-msgctxt "@label:textbox"
-msgid "Location:"
+#: editdlgtypes.cpp:1368
+msgctxt "@action:button"
+msgid "Send"
 msgstr ""
 
-#: resources/resourcelocaldirwidget.cpp:72
-#: resources/resourcelocalwidget.cpp:77
+#: editdlgtypes.cpp:1394
+#, kde-format
 msgctxt "@info"
-msgid "No location specified.  The calendar will be invalid."
-msgstr ""
-
-#: resources/resourceremotewidget.cpp:42
-msgctxt "@label:textbox"
-msgid "Download from:"
+msgid "Email sent to:<nl/>%1<nl/>Bcc: <email>%2</email>"
 msgstr ""
 
-#: resources/resourceremotewidget.cpp:48
-msgctxt "@label:textbox"
-msgid "Upload to:"
+#: editdlgtypes.cpp:1397
+#, kde-format
+msgctxt "@info"
+msgid "Email sent to:<nl/>%1"
 msgstr ""
 
-#: resources/resourceremotewidget.cpp:94
-msgctxt "@info"
-msgid ""
-"You have specified no upload URL: the alarm calendar will be read-only."
+#: editdlgtypes.cpp:1429
+msgctxt "@title:window"
+msgid "Choose File to Attach"
 msgstr ""
 
-#: resources/resourceremote.cpp:365 akonadimodel.cpp:911
-msgctxt "@info/plain"
-msgid "URL"
+#: editdlgtypes.cpp:1507
+msgctxt "@title:window"
+msgid "New Audio Alarm Template"
 msgstr ""
 
-#: resources/resourcelocal.cpp:269 akonadimodel.cpp:913
-msgctxt "@info/plain"
-msgid "File"
+#: editdlgtypes.cpp:1507
+msgctxt "@title:window"
+msgid "Edit Audio Alarm Template"
 msgstr ""
 
-#: resources/alarmresource.cpp:354
-msgctxt "@info/plain"
-msgid "Active alarms"
+#: editdlgtypes.cpp:1508
+msgctxt "@title:window"
+msgid "New Audio Alarm"
 msgstr ""
 
-#: resources/alarmresource.cpp:355
-msgctxt "@info/plain"
-msgid "Archived alarms"
+#: editdlgtypes.cpp:1508
+msgctxt "@title:window"
+msgid "Edit Audio Alarm"
 msgstr ""
 
-#: resources/alarmresource.cpp:356
-msgctxt "@info/plain"
-msgid "Alarm templates"
+#: editdlgtypes.cpp:1725
+msgctxt "@info:whatsthis"
+msgid ""
+"Check to enter the contents of a script instead of a shell command line"
 msgstr ""
 
-#: resources/alarmresource.cpp:359 akonadimodel.cpp:930
-#: resourcemodelview.cpp:114 resourceselector.cpp:798
-msgctxt "@info/plain"
-msgid "Read-only"
+#: editdlgtypes.cpp:1731
+msgctxt "@info:whatsthis"
+msgid "Enter a shell command to execute."
 msgstr ""
 
-#: resources/alarmresource.cpp:359 resourceselector.cpp:797
-msgctxt "@info/plain"
-msgid "Read-write"
+#: editdlgtypes.cpp:1736
+msgctxt "@info:whatsthis"
+msgid "Enter the contents of a script to execute"
 msgstr ""
 
-#: resources/alarmresource.cpp:360 resourceselector.cpp:801
-msgctxt "@info/plain"
-msgid "Enabled"
+#: editdlgtypes.cpp:1792
+msgctxt "@info"
+msgid "Please enter a command or script to execute"
 msgstr ""
 
-#: resources/alarmresource.cpp:360 resourcemodelview.cpp:113
-#: resourceselector.cpp:802
-msgctxt "@info/plain"
-msgid "Disabled (wrong alarm type)"
+#: mainwindow.cpp:125
+msgctxt "@action"
+msgid "Show &Alarm Times"
 msgstr ""
 
-#: resources/alarmresource.cpp:360 akonadimodel.cpp:929
-#: resourcemodelview.cpp:113 resourceselector.cpp:803
-msgctxt "@info/plain"
-msgid "Disabled"
+#: mainwindow.cpp:126
+msgctxt "@option:check"
+msgid "Show alarm time"
 msgstr ""
 
-#: resources/alarmresource.cpp:361 resourceselector.cpp:805
-msgctxt "@info/plain Parameter in 'Default calendar: Yes/No'"
-msgid "Yes"
+#: mainwindow.cpp:127
+msgctxt "@action"
+msgid "Show Time t&o Alarms"
 msgstr ""
 
-#: resources/alarmresource.cpp:361 resourceselector.cpp:806
-msgctxt "@info/plain Parameter in 'Default calendar: Yes/No'"
-msgid "No"
+#: mainwindow.cpp:128
+msgctxt "@option:check"
+msgid "Show time until alarm"
 msgstr ""
 
-#: resources/alarmresource.cpp:363
+#: mainwindow.cpp:435
 #, kde-format
 msgctxt "@info"
 msgid ""
-"<title>%1</title><para>Calendar type: %2<nl/>Contents: %3<nl/>%4: "
-"<filename>%5</filename><nl/>Permissions: %6<nl/>Status: %7<nl/>Default "
-"calendar: %8</para>"
+"Failure to create menus (perhaps <filename>%1</filename> missing or "
+"corrupted)"
 msgstr ""
 
-#: resources/resourcelocalwidget.cpp:45 alarmcalendar.cpp:839
-#: alarmcalendar.cpp:1040
-msgctxt "@info/plain"
-msgid "Calendar Files"
+#: mainwindow.cpp:456
+msgctxt "@action"
+msgid "&Templates..."
 msgstr ""
 
-#: wakedlg.cpp:53
-msgctxt "@title:window"
-msgid "Wake From Suspend"
+#: mainwindow.cpp:460
+msgctxt "@action"
+msgid "&New"
 msgstr ""
 
-#: wakedlg.cpp:178
-msgctxt "@info"
-msgid "Cannot schedule wakeup time for a date-only alarm"
+#: mainwindow.cpp:487
+msgctxt "@action"
+msgid "Create Tem&plate..."
 msgstr ""
 
-#: wakedlg.cpp:182
-msgctxt "@info"
-msgid ""
-"<para>This wakeup will cancel any existing wakeup which has been set by "
-"KAlarm or any other application, because your computer can only schedule a "
-"single wakeup time.</para><para><b>Note:</b> Wake From Suspend is not "
-"supported at all on some computers, especially older ones, and some "
-"computers only support setting a wakeup time up to 24 hours ahead. You may "
-"wish to set up a test alarm to check your system's capability.</para>"
+#: mainwindow.cpp:491
+msgctxt "@action"
+msgid "&Copy..."
 msgstr ""
 
-#: eventlistmodel.cpp:312 akonadimodel.cpp:449
-msgctxt "@info:tooltip"
-msgid "Command execution failed"
+#: mainwindow.cpp:496 resourceselector.cpp:518
+msgctxt "@action"
+msgid "&Edit..."
 msgstr ""
 
-#: eventlistmodel.cpp:314 akonadimodel.cpp:451
-msgctxt "@info:tooltip"
-msgid "Pre-alarm action execution failed"
+#: mainwindow.cpp:501
+msgctxt "@action"
+msgid "&Delete"
 msgstr ""
 
-#: eventlistmodel.cpp:316 akonadimodel.cpp:453
-msgctxt "@info:tooltip"
-msgid "Post-alarm action execution failed"
+#: mainwindow.cpp:507
+msgctxt "@action"
+msgid "Delete Without Confirmation"
 msgstr ""
 
-#: eventlistmodel.cpp:318 akonadimodel.cpp:455
-msgctxt "@info:tooltip"
-msgid "Pre- and post-alarm action execution failed"
+#: mainwindow.cpp:512
+msgctxt "@action"
+msgid "Reac&tivate"
 msgstr ""
 
-#: eventlistmodel.cpp:361 akonadimodel.cpp:626
-msgctxt "@title:column"
-msgid "Time"
+#: mainwindow.cpp:522
+msgctxt "@action"
+msgid "Wake From Suspend..."
 msgstr ""
 
-#: eventlistmodel.cpp:363 akonadimodel.cpp:628
-msgctxt "@title:column"
-msgid "Time To"
+#: mainwindow.cpp:539
+msgctxt "@action"
+msgid "Show Archi&ved Alarms"
 msgstr ""
 
-#: eventlistmodel.cpp:365 akonadimodel.cpp:630
-msgctxt "@title:column"
-msgid "Repeat"
+#: mainwindow.cpp:544
+msgctxt "@action"
+msgid "Show in System &Tray"
 msgstr ""
 
-#: eventlistmodel.cpp:371 akonadimodel.cpp:636
-msgctxt "@title:column"
-msgid "Message, File or Command"
+#: mainwindow.cpp:548
+msgctxt "@action"
+msgid "Show &Calendars"
 msgstr ""
 
-#: eventlistmodel.cpp:373 akonadimodel.cpp:638
-msgctxt "@title:column Template name"
-msgid "Name"
+#: mainwindow.cpp:556
+msgctxt "@action"
+msgid "Import &Alarms..."
 msgstr ""
 
-#: eventlistmodel.cpp:828 eventlistmodel.cpp:866 akonadimodel.cpp:658
-#: akonadimodel.cpp:696
-msgctxt "@info/plain Alarm never occurs"
-msgid "Never"
+#: mainwindow.cpp:560
+msgctxt "@action"
+msgid "Import &Birthdays..."
 msgstr ""
 
-#: eventlistmodel.cpp:872 akonadimodel.cpp:702
-#, kde-format, no-c-format
-msgctxt "@info/plain n days"
-msgid "%1d"
+#: mainwindow.cpp:564
+msgctxt "@action"
+msgid "E&xport Selected Alarms..."
 msgstr ""
 
-#: eventlistmodel.cpp:881 akonadimodel.cpp:711
-#, kde-format
-msgctxt "@info/plain hours:minutes"
-msgid "%1:%2"
+#: mainwindow.cpp:568 resourceselector.cpp:538
+msgctxt "@action"
+msgid "E&xport..."
+msgstr ""
+
+#: mainwindow.cpp:572
+msgctxt "@action"
+msgid "&Refresh Alarms"
 msgstr ""
 
-#: eventlistmodel.cpp:884 akonadimodel.cpp:714
+#: mainwindow.cpp:827
 #, kde-format
-msgctxt "@info/plain days hours:minutes"
-msgid "%1d %2:%3"
+msgctxt "@info"
+msgid "Do you really want to delete the selected alarm?"
+msgid_plural "Do you really want to delete the %1 selected alarms?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mainwindow.cpp:829
+msgctxt "@title:window"
+msgid "Delete Alarm"
+msgid_plural "Delete Alarms"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mainwindow.cpp:830 templatedlg.cpp:214
+msgctxt "@action:button"
+msgid "&Delete"
 msgstr ""
 
-#: eventlistmodel.cpp:968 akonadimodel.cpp:1031
-msgctxt "@info:whatsthis"
-msgid "Next scheduled date and time of the alarm"
+#: mainwindow.cpp:974
+msgctxt "@info:tooltip"
+msgid "Hide Archived Alarms"
 msgstr ""
 
-#: eventlistmodel.cpp:970 akonadimodel.cpp:1033
-msgctxt "@info:whatsthis"
-msgid "How long until the next scheduled trigger of the alarm"
+#: mainwindow.cpp:975
+msgctxt "@info:tooltip"
+msgid "Show Archived Alarms"
 msgstr ""
 
-#: eventlistmodel.cpp:972 akonadimodel.cpp:1035
-msgctxt "@info:whatsthis"
-msgid "How often the alarm recurs"
+#: mainwindow.cpp:1062
+msgctxt "@info"
+msgid "Import birthdays"
 msgstr ""
 
-#: eventlistmodel.cpp:974 akonadimodel.cpp:1037
-msgctxt "@info:whatsthis"
-msgid "Background color of alarm message"
+#: mainwindow.cpp:1232
+#, kde-format
+msgctxt "@action Undo/Redo [action]"
+msgid "%1 %2"
 msgstr ""
 
-#: eventlistmodel.cpp:976 akonadimodel.cpp:1039
-msgctxt "@info:whatsthis"
-msgid "Alarm type (message, file, command or email)"
+#: mainwindow.cpp:1233
+#, kde-format
+msgctxt "@action Undo [action]: message"
+msgid "%1 %2: %3"
 msgstr ""
 
-#: eventlistmodel.cpp:978 akonadimodel.cpp:1041
-msgctxt "@info:whatsthis"
-msgid ""
-"Alarm message text, URL of text file to display, command to execute, or "
-"email subject line"
+#: mainwindow.cpp:1519
+msgctxt "@item:inlistbox"
+msgid "Display Alarm"
 msgstr ""
 
-#: eventlistmodel.cpp:980 akonadimodel.cpp:1043
-msgctxt "@info:whatsthis"
-msgid "Name of the alarm template"
+#: mainwindow.cpp:1521
+msgctxt "@item:inlistbox"
+msgid "Email Alarm"
 msgstr ""
 
-#: soundpicker.cpp:49
-msgctxt "@label:listbox Listbox providing audio options"
-msgid "Sound:"
+#: mainwindow.cpp:1523
+msgctxt "@item:inlistbox"
+msgid "Command Alarm"
 msgstr ""
 
-#: soundpicker.cpp:50
-msgctxt "@item:inlistbox No sound"
-msgid "None"
+#: mainwindow.cpp:1525
+msgctxt "@title:window"
+msgid "Alarm Type"
 msgstr ""
 
-#: soundpicker.cpp:51
-msgctxt "@item:inlistbox"
-msgid "Beep"
+#: mainwindow.cpp:1526
+msgctxt "@info"
+msgid "Choose alarm type to create:"
 msgstr ""
 
-#: soundpicker.cpp:52
-msgctxt "@item:inlistbox"
-msgid "Speak"
+#: mainwindow.cpp:1679
+msgctxt "@action"
+msgid "Ena&ble"
 msgstr ""
 
-#: soundpicker.cpp:53
-msgctxt "@item:inlistbox"
-msgid "Sound file"
+#: mainwindow.cpp:1679
+msgctxt "@action"
+msgid "Disa&ble"
 msgstr ""
 
-#: soundpicker.cpp:97
-msgctxt "@info:tooltip"
-msgid "Configure sound file"
+#: resourcemodelview.cpp:119 resources/alarmresource.cpp:360
+msgctxt "@info/plain"
+msgid "Disabled (wrong alarm type)"
 msgstr ""
 
-#: soundpicker.cpp:98
-msgctxt "@info:whatsthis"
-msgid "Configure a sound file to play when the alarm is displayed."
+#: resourcemodelview.cpp:119 resources/alarmresource.cpp:360
+#: resourceselector.cpp:868 akonadimodel.cpp:965
+msgctxt "@info/plain"
+msgid "Disabled"
 msgstr ""
 
-#: soundpicker.cpp:131
-#, kde-format
-msgctxt "@info:whatsthis"
-msgid "<interface>%1</interface>: the message is displayed silently."
+#: resourcemodelview.cpp:120 resources/alarmresource.cpp:359
+#: akonadimodel.cpp:1001
+msgctxt "@info/plain"
+msgid "Read-only"
 msgstr ""
 
-#: soundpicker.cpp:132
+#: resourcemodelview.cpp:123 akonadimodel.cpp:970
 #, kde-format
-msgctxt "@info:whatsthis"
-msgid "<interface>%1</interface>: a simple beep is sounded."
+msgctxt "@info:tooltip"
+msgid "%1<nl/>%2: <filename>%3</filename><nl/>%4, %5"
 msgstr ""
 
-#: soundpicker.cpp:133
+#: resourcemodelview.cpp:129 akonadimodel.cpp:976
 #, kde-format
-msgctxt "@info:whatsthis"
-msgid ""
-"<interface>%1</interface>: an audio file is played. You will be prompted to "
-"choose the file and set play options."
+msgctxt "@info:tooltip"
+msgid "%1<nl/>%2: <filename>%3</filename><nl/>%4"
 msgstr ""
 
-#: soundpicker.cpp:137
+#: resourcemodelview.cpp:135 akonadimodel.cpp:981
 #, kde-format
-msgctxt "@info:whatsthis"
-msgid "<interface>%1</interface>: the message text is spoken."
+msgctxt "@info:tooltip"
+msgid "%1<nl/>%2: <filename>%3</filename>"
 msgstr ""
 
-#: soundpicker.cpp:139
-#, kde-format
-msgctxt "@info:whatsthis Combination of multiple whatsthis items"
-msgid ""
-"<para>Choose a sound to play when the message is "
-"displayed:<list><item>%1</item><item>%2</item><item>%3</item><item>%4</item><"
-"/list></para>"
+#: resourcemodelview.cpp:422 collectionmodel.cpp:358
+msgctxt "@info"
+msgid "You cannot disable your default active alarm calendar."
 msgstr ""
 
-#: soundpicker.cpp:147
-#, kde-format
-msgctxt "@info:whatsthis Combination of multiple whatsthis items"
+#: resourcemodelview.cpp:431 collectionmodel.cpp:364
+msgctxt "@info"
 msgid ""
-"<para>Choose a sound to play when the message is "
-"displayed:<list><item>%1</item><item>%2</item><item>%3</item></list></para>"
+"You cannot disable your default archived alarm calendar while expired alarms "
+"are configured to be kept."
 msgstr ""
 
-#: soundpicker.cpp:265
-msgctxt "@title:window"
-msgid "Sound File"
+#: resourcemodelview.cpp:436 collectionmodel.cpp:368
+msgctxt "@info"
+msgid "Do you really want to disable your default calendar?"
 msgstr ""
 
-#: soundpicker.cpp:329
-msgctxt "@title:window"
-msgid "Choose Sound File"
+#: templatelistview.cpp:44 templatedlg.cpp:95
+msgctxt "@info:whatsthis"
+msgid "The list of alarm templates"
 msgstr ""
 
-#: sounddlg.cpp:53
+#: sounddlg.cpp:54
 msgctxt "@option:check"
 msgid "Repeat"
 msgstr ""
 
-#: sounddlg.cpp:155
+#: sounddlg.cpp:157
 msgctxt "@label"
 msgid "Sound file:"
 msgstr ""
 
-#: sounddlg.cpp:169 sounddlg.cpp:434
+#: sounddlg.cpp:171 sounddlg.cpp:454
 msgctxt "@info:tooltip"
 msgid "Test the sound"
 msgstr ""
 
-#: sounddlg.cpp:170 sounddlg.cpp:435
+#: sounddlg.cpp:172 sounddlg.cpp:455
 msgctxt "@info:whatsthis"
 msgid "Play the selected sound file."
 msgstr ""
 
-#: sounddlg.cpp:176
+#: sounddlg.cpp:178
 msgctxt "@info:whatsthis"
 msgid "Enter the name or URL of a sound file to play."
 msgstr ""
 
-#: sounddlg.cpp:187 editdlgtypes.cpp:208 editdlgtypes.cpp:790
-msgctxt "@info:tooltip"
-msgid "Choose a file"
-msgstr ""
-
-#: sounddlg.cpp:188
+#: sounddlg.cpp:190
 msgctxt "@info:whatsthis"
 msgid "Select a sound file to play."
 msgstr ""
 
-#: sounddlg.cpp:202
+#: sounddlg.cpp:204
 msgctxt "@info:whatsthis"
 msgid ""
 "If checked, the sound file will be played repeatedly for as long as the "
 "message is displayed."
 msgstr ""
 
-#: sounddlg.cpp:208
+#: sounddlg.cpp:214
+msgctxt "@label:spinbox Length of time to pause between repetitions"
+msgid "Pause between repetitions:"
+msgstr ""
+
+#: sounddlg.cpp:221 sounddlg.cpp:275
+msgctxt "@label"
+msgid "seconds"
+msgstr ""
+
+#: sounddlg.cpp:223
+msgctxt "@info:whatsthis"
+msgid "Enter how many seconds to pause between repetitions."
+msgstr ""
+
+#: sounddlg.cpp:227
 msgctxt "@title:group Sound volume"
 msgid "Volume"
 msgstr ""
 
-#: sounddlg.cpp:223
+#: sounddlg.cpp:242
 msgctxt "@option:check"
 msgid "Set volume"
 msgstr ""
 
-#: sounddlg.cpp:226
+#: sounddlg.cpp:245
 msgctxt "@info:whatsthis"
 msgid "Select to choose the volume for playing the sound file."
 msgstr ""
 
-#: sounddlg.cpp:233
+#: sounddlg.cpp:252
 msgctxt "@info:whatsthis"
 msgid "Choose the volume for playing the sound file."
 msgstr ""
 
-#: sounddlg.cpp:238
+#: sounddlg.cpp:257
 msgctxt "@option:check"
 msgid "Fade"
 msgstr ""
 
-#: sounddlg.cpp:241
+#: sounddlg.cpp:260
 msgctxt "@info:whatsthis"
 msgid "Select to fade the volume when the sound file first starts to play."
 msgstr ""
 
-#: sounddlg.cpp:249
+#: sounddlg.cpp:268
 msgctxt "@label:spinbox Time period over which to fade the sound"
 msgid "Fade time:"
 msgstr ""
 
-#: sounddlg.cpp:256
-msgctxt "@label"
-msgid "seconds"
-msgstr ""
-
-#: sounddlg.cpp:258
+#: sounddlg.cpp:277
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter how many seconds to fade the sound before reaching the set volume."
 msgstr ""
 
-#: sounddlg.cpp:265
+#: sounddlg.cpp:284
 msgctxt "@label:slider"
 msgid "Initial volume:"
 msgstr ""
 
-#: sounddlg.cpp:273
+#: sounddlg.cpp:292
 msgctxt "@info:whatsthis"
 msgid "Choose the initial volume for playing the sound file."
 msgstr ""
 
-#: sounddlg.cpp:421 messagewin.cpp:735
+#: sounddlg.cpp:441 messagewin.cpp:752
 msgctxt "@info:tooltip"
 msgid "Stop sound"
 msgstr ""
 
-#: sounddlg.cpp:422 messagewin.cpp:736
+#: sounddlg.cpp:442 messagewin.cpp:753
 msgctxt "@info:whatsthis"
 msgid "Stop playing the sound"
 msgstr ""
@@ -891,7 +836,7 @@
 msgid "Alarm Text"
 msgstr ""
 
-#: birthdaydlg.cpp:90 prefdlg.cpp:1643
+#: birthdaydlg.cpp:90 prefdlg.cpp:1646
 msgctxt "@label:textbox"
 msgid "Prefix:"
 msgstr ""
@@ -954,7 +899,7 @@
 "Select whether the reminder should be triggered before or after the birthday."
 msgstr ""
 
-#: birthdaydlg.cpp:219 recurrenceedit.cpp:180
+#: birthdaydlg.cpp:219 recurrenceedit.cpp:181
 msgctxt "@action:button"
 msgid "Sub-Repetition"
 msgstr ""
@@ -964,2307 +909,2659 @@
 msgid "Set up an additional alarm repetition"
 msgstr ""
 
-#: autostart/autostart.cpp:44
-msgid "KAlarm Autostart"
+#: reminder.cpp:49
+msgctxt "@option:check"
+msgid "Reminder for first recurrence only"
 msgstr ""
 
-#: autostart/autostart.cpp:45
-msgid "KAlarm autostart at login"
+#: reminder.cpp:51
+msgctxt "@item:inlistbox"
+msgid "in advance"
 msgstr ""
 
-#: autostart/autostart.cpp:46
-msgid "Copyright 2001,2008 David Jarvie"
+#: reminder.cpp:65
+msgctxt "@option:check"
+msgid "Reminder:"
 msgstr ""
 
-#: autostart/autostart.cpp:48 main.cpp:42
-msgid "David Jarvie"
+#: reminder.cpp:69
+msgctxt "@item:inlistbox"
+msgid "afterwards"
 msgstr ""
 
-#: autostart/autostart.cpp:48
-msgid "Maintainer"
-msgstr "Cynhaliwr"
-
-#: autostart/autostart.cpp:53
-msgid "Application to autostart"
+#: reminder.cpp:91
+msgctxt "@info:whatsthis"
+msgid "Display the reminder only for the first time the alarm is scheduled"
 msgstr ""
 
-#: autostart/autostart.cpp:54
-msgid "Command line arguments"
+#: collectionmodel.cpp:847
+#, kde-format
+msgctxt "@info"
+msgid ""
+"The calendar <resource>%1</resource> has been made read-only. This was the "
+"default calendar for active alarms."
 msgstr ""
 
-#: calendarcompat.cpp:119
+#: collectionmodel.cpp:852
 #, kde-format
 msgctxt "@info"
 msgid ""
-"Calendar <resource>%1</resource> is in an old format "
-"(<application>KAlarm</application> version %2), and will be read-only unless "
-"you choose to update it to the current format."
+"The calendar <resource>%1</resource> has been made read-only. This was the "
+"default calendar for archived alarms."
 msgstr ""
 
-#: calendarcompat.cpp:126
+#: collectionmodel.cpp:857
 #, kde-format
 msgctxt "@info"
 msgid ""
-"Some or all of the alarms in calendar <resource>%1</resource> are in an old "
-"<application>KAlarm</application> format, and will be read-only unless you "
-"choose to update them to the current format."
+"The calendar <resource>%1</resource> has been made read-only. This was the "
+"default calendar for alarm templates."
 msgstr ""
 
-#: calendarcompat.cpp:134
+#: collectionmodel.cpp:862
 #, kde-format
 msgctxt "@info"
 msgid ""
-"<para>%1</para><para><warning>Do not update the calendar if it is shared "
-"with other users who run an older version of "
-"<application>KAlarm</application>. If you do so, they may be unable to use "
-"it any more.</warning></para><para>Do you wish to update the calendar?</para>"
+"<para>The calendar <resource>%1</resource> has been made read-only. This was "
+"the default calendar for:%2</para><para>Please select new default "
+"calendars.</para>"
 msgstr ""
 
-#: lib/timeperiod.cpp:41
-msgctxt "@item:inlistbox Time units"
-msgid "minutes"
+#: collectionmodel.cpp:870
+#, kde-format
+msgctxt "@info"
+msgid "<para>%1</para><para>Please select a new default calendar.</para>"
 msgstr ""
 
-#: lib/timeperiod.cpp:42
-msgctxt "@item:inlistbox Time units"
-msgid "hours/minutes"
+#: collectionmodel.cpp:926 resources/alarmresources.cpp:135
+#: calendarmigrator.cpp:278
+msgctxt "@info/plain"
+msgid "Active Alarms"
 msgstr ""
 
-#: lib/timeperiod.cpp:43
-msgctxt "@item:inlistbox Time units"
-msgid "days"
+#: collectionmodel.cpp:928 resources/alarmresources.cpp:145
+#: calendarmigrator.cpp:286
+msgctxt "@info/plain"
+msgid "Archived Alarms"
 msgstr ""
 
-#: lib/timeperiod.cpp:44
-msgctxt "@item:inlistbox Time units"
-msgid "weeks"
+#: collectionmodel.cpp:930 resources/alarmresources.cpp:140
+#: calendarmigrator.cpp:294
+msgctxt "@info/plain"
+msgid "Alarm Templates"
 msgstr ""
 
-#: lib/timeedit.cpp:177
-msgctxt "@item:inlistbox Morning, as in 2am"
-msgid "am"
+#: collectionmodel.cpp:1189
+msgctxt "@title:window"
+msgid "Choose Calendar"
 msgstr ""
 
-#: lib/timeedit.cpp:196
-msgctxt "@item:inlistbox Afternoon, as in 2pm"
-msgid "pm"
+#: templatepickdlg.cpp:46
+msgctxt "@title:window"
+msgid "Choose Alarm Template"
 msgstr ""
 
-#: lib/timespinbox.cpp:77
+#: templatepickdlg.cpp:77
 msgctxt "@info:whatsthis"
-msgid ""
-"Press the Shift key while clicking the spin buttons to adjust the time by a "
-"larger step (6 hours / 5 minutes)."
+msgid "Select a template to base the new alarm on."
 msgstr ""
 
-#: lib/filedialog.cpp:60
-msgctxt "@option:check"
-msgid "Append to existing file"
+#: undo.cpp:440
+msgctxt "@info/plain"
+msgid "Alarm not found"
 msgstr ""
 
-#: lib/shellprocess.cpp:158
-msgctxt "@info"
-msgid "Failed to execute command (shell access not authorized)"
+#: undo.cpp:441
+msgctxt "@info/plain"
+msgid "Error recreating alarm"
 msgstr ""
 
-#: lib/shellprocess.cpp:161
-msgctxt "@info"
-msgid "Failed to execute command"
-msgstr ""
-
-#: lib/shellprocess.cpp:163
-msgctxt "@info"
-msgid "Command execution error"
+#: undo.cpp:442
+msgctxt "@info/plain"
+msgid "Error recreating alarm template"
 msgstr ""
 
-#: lib/shellprocess.cpp:166
-#, kde-format
-msgctxt "@info"
-msgid "Command exit code: %1"
+#: undo.cpp:443
+msgctxt "@info/plain"
+msgid "Cannot reactivate archived alarm"
 msgstr ""
 
-#: lib/kalocale.cpp:51
-msgctxt "@option Name of the weekday"
-msgid "Monday"
+#: undo.cpp:444
+msgctxt "@info/plain"
+msgid "Program error"
 msgstr ""
 
-#: lib/kalocale.cpp:52
-msgctxt "@option Name of the weekday"
-msgid "Tuesday"
+#: undo.cpp:445
+msgctxt "@info/plain"
+msgid "Unknown error"
 msgstr ""
 
-#: lib/kalocale.cpp:53
-msgctxt "@option Name of the weekday"
-msgid "Wednesday"
+#: undo.cpp:447
+#, kde-format
+msgctxt "@info Undo-action: message"
+msgid "%1: %2"
 msgstr ""
 
-#: lib/kalocale.cpp:54
-msgctxt "@option Name of the weekday"
-msgid "Thursday"
+#: undo.cpp:684
+msgctxt "@info/plain Action to create a new alarm"
+msgid "New alarm"
 msgstr ""
 
-#: lib/kalocale.cpp:55
-msgctxt "@option Name of the weekday"
-msgid "Friday"
+#: undo.cpp:686
+msgctxt "@info/plain Action to delete an alarm"
+msgid "Delete alarm"
 msgstr ""
 
-#: lib/kalocale.cpp:56
-msgctxt "@option Name of the weekday"
-msgid "Saturday"
+#: undo.cpp:689
+msgctxt "@info/plain Action to create a new alarm template"
+msgid "New template"
 msgstr ""
 
-#: lib/kalocale.cpp:57
-msgctxt "@option Name of the weekday"
-msgid "Sunday"
+#: undo.cpp:691
+msgctxt "@info/plain Action to delete an alarm template"
+msgid "Delete template"
 msgstr ""
 
-#: akonadimodel.cpp:615
-msgctxt "@title:column"
-msgid "Calendars"
+#: undo.cpp:693
+msgctxt "@info/plain"
+msgid "Delete archived alarm"
 msgstr ""
 
-#: akonadimodel.cpp:934 resourcemodelview.cpp:117
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "%1<nl/>%2: <filename>%3</filename><nl/>%4, %5"
+#: undo.cpp:916
+msgctxt "@info/plain"
+msgid "Create multiple alarms"
 msgstr ""
 
-#: akonadimodel.cpp:940 resourcemodelview.cpp:123
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "%1<nl/>%2: <filename>%3</filename><nl/>%4"
+#: undo.cpp:1022
+msgctxt "@info/plain Action to edit an alarm"
+msgid "Edit alarm"
 msgstr ""
 
-#: akonadimodel.cpp:945 resourcemodelview.cpp:129
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "%1<nl/>%2: <filename>%3</filename>"
+#: undo.cpp:1024
+msgctxt "@info/plain Action to edit an alarm template"
+msgid "Edit template"
 msgstr ""
 
-#: akonadimodel.cpp:1101
+#: undo.cpp:1207
 msgctxt "@info/plain"
-msgid "Failed to create new calendar resource"
-msgstr ""
-
-#: akonadimodel.cpp:1100 akonadimodel.cpp:1179 akonadimodel.cpp:1225
-#: akonadimodel.cpp:1513
-#, kde-format
-msgctxt "@info"
-msgid "%1<nl/>(%2)"
-msgstr ""
-
-#: akonadimodel.cpp:1177
-#, kde-format
-msgctxt "@info"
-msgid "Failed to remove calendar <resource>%1</resource>."
+msgid "Delete multiple alarms"
 msgstr ""
 
-#: akonadimodel.cpp:1223
-#, kde-format
-msgctxt "@info"
-msgid "Failed to update calendar <resource>%1</resource>."
+#: undo.cpp:1209
+msgctxt "@info/plain"
+msgid "Delete multiple templates"
 msgstr ""
 
-#: akonadimodel.cpp:1497
+#: undo.cpp:1216
 msgctxt "@info/plain"
-msgid "Failed to create alarm."
+msgid "Delete multiple archived alarms"
 msgstr ""
 
-#: akonadimodel.cpp:1499
+#: undo.cpp:1259 undo.cpp:1303
 msgctxt "@info/plain"
-msgid "Failed to update alarm."
+msgid "Reactivate alarm"
 msgstr ""
 
-#: akonadimodel.cpp:1501
+#: undo.cpp:1326
 msgctxt "@info/plain"
-msgid "Failed to delete alarm."
+msgid "Reactivate multiple alarms"
 msgstr ""
 
-#: resourcemodelview.cpp:416 collectionmodel.cpp:329
+#: alarmcalendar.cpp:341 alarmcalendar.cpp:898
+#, kde-format
 msgctxt "@info"
-msgid "You cannot disable your default active alarm calendar."
+msgid "Cannot download calendar: <filename>%1</filename>"
 msgstr ""
 
-#: resourcemodelview.cpp:425 collectionmodel.cpp:335
+#: alarmcalendar.cpp:363
+#, kde-format
 msgctxt "@info"
 msgid ""
-"You cannot disable your default archived alarm calendar while expired alarms "
-"are configured to be kept."
+"<para>Error loading "
+"calendar:</para><para><filename>%1</filename></para><para>Please fix or "
+"delete the file.</para>"
 msgstr ""
 
-#: resourcemodelview.cpp:430 collectionmodel.cpp:339
+#: alarmcalendar.cpp:458
+#, kde-format
 msgctxt "@info"
-msgid "Do you really want to disable your default calendar?"
-msgstr ""
-
-#: kamail.cpp:88
-msgctxt "@info/plain"
-msgid ""
-"A 'From' email address must be configured in order to execute email alarms."
-msgstr ""
-
-#: kamail.cpp:91
-msgctxt ""
-"@info/plain KMail folder name: this should be translated the same as in kmail"
-msgid "sent-mail"
+msgid "Failed to save calendar to <filename>%1</filename>"
 msgstr ""
 
-#: kamail.cpp:123
+#: alarmcalendar.cpp:468
 #, kde-format
 msgctxt "@info"
-msgid ""
-"Invalid 'From' email address.<nl/>Email identity <resource>%1</resource> not "
-"found"
+msgid "Cannot upload calendar to <filename>%1</filename>"
 msgstr ""
 
-#: kamail.cpp:129
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Invalid 'From' email address.<nl/>Email identity <resource>%1</resource> has "
-"no email address"
+#: alarmcalendar.cpp:867 alarmcalendar.cpp:1068
+#: resources/resourcelocalwidget.cpp:45
+msgctxt "@info/plain"
+msgid "Calendar Files"
 msgstr ""
 
-#: kamail.cpp:139
+#: alarmcalendar.cpp:889 alarmcalendar.cpp:916
+#, kde-format
 msgctxt "@info"
-msgid ""
-"<para>No 'From' email address is configured (no default email identity "
-"found)</para><para>Please set it in <application>KMail</application> or in "
-"the <application>KAlarm</application> Configuration dialog.</para>"
+msgid "Could not load calendar <filename>%1</filename>."
 msgstr ""
 
-#: kamail.cpp:143
-msgctxt "@info"
-msgid ""
-"<para>No 'From' email address is configured.</para><para>Please set it in "
-"the KDE System Settings or in the <application>KAlarm</application> "
-"Configuration dialog.</para>"
+#: alarmcalendar.cpp:1069
+msgctxt "@title:window"
+msgid "Choose Export Calendar"
 msgstr ""
 
-#: kamail.cpp:148
+#: alarmcalendar.cpp:1098
+#, kde-format
 msgctxt "@info"
-msgid ""
-"<para>No 'From' email address is configured.</para><para>Please set it in "
-"the <application>KAlarm</application> Configuration dialog.</para>"
+msgid "Error loading calendar to append to:<nl/><filename>%1</filename>"
 msgstr ""
 
-#: kamail.cpp:196
+#: alarmcalendar.cpp:1148
 #, kde-format
 msgctxt "@info"
-msgid ""
-"No mail transport configured for email identity <resource>%1</resource>"
+msgid "Failed to save new calendar to:<nl/><filename>%1</filename>"
 msgstr ""
 
-#: kamail.cpp:258
+#: alarmcalendar.cpp:1155
+#, kde-format
 msgctxt "@info"
-msgid "Emails may not have been sent"
+msgid "Cannot upload new calendar to:<nl/><filename>%1</filename>"
 msgstr ""
 
-#: kamail.cpp:259
-msgctxt "@info"
-msgid "Program error"
+#: fontcolour.cpp:71
+msgctxt "@label:listbox"
+msgid "Foreground color:"
 msgstr ""
 
-#: kamail.cpp:364
-#, kde-format
-msgctxt "@info"
-msgid "Error attaching file: <filename>%1</filename>"
+#: fontcolour.cpp:76
+msgctxt "@info:whatsthis"
+msgid "Select the alarm message foreground color"
 msgstr ""
 
-#: kamail.cpp:369
-#, kde-format
-msgctxt "@info"
-msgid "Attachment not found: <filename>%1</filename>"
+#: fontcolour.cpp:84
+msgctxt "@label:listbox"
+msgid "Background color:"
 msgstr ""
 
-#: kamail.cpp:448
-msgctxt "@info"
-msgid "An email has been queued to be sent"
+#: fontcolour.cpp:89
+msgctxt "@info:whatsthis"
+msgid "Select the alarm message background color"
 msgstr ""
 
-#: kamail.cpp:618
-msgctxt "@info"
-msgid "Failed to send email"
+#: fontcolour.cpp:97
+msgctxt "@option:check"
+msgid "Use default font"
 msgstr ""
 
-#: kamail.cpp:619
-msgctxt "@info"
-msgid "Error sending email"
+#: fontcolour.cpp:100
+msgctxt "@info:whatsthis"
+msgid ""
+"Check to use the default font current at the time the alarm is displayed."
 msgstr ""
 
-#: resourceselector.cpp:96
+#: find.cpp:137
 msgctxt "@title:group"
-msgid "Calendars"
+msgid "Alarm Type"
 msgstr ""
 
-#: resourceselector.cpp:100
-msgctxt "@item:inlistbox"
-msgid "Active Alarms"
+#: find.cpp:145
+msgctxt "@option:check Alarm type"
+msgid "Active"
 msgstr ""
 
-#: resourceselector.cpp:101
-msgctxt "@item:inlistbox"
-msgid "Archived Alarms"
+#: find.cpp:147
+msgctxt "@info:whatsthis"
+msgid "Check to include active alarms in the search."
 msgstr ""
 
-#: resourceselector.cpp:102
-msgctxt "@item:inlistbox"
-msgid "Alarm Templates"
+#: find.cpp:150
+msgctxt "@option:check Alarm type"
+msgid "Archived"
 msgstr ""
 
-#: resourceselector.cpp:104
+#: find.cpp:152
 msgctxt "@info:whatsthis"
-msgid "Choose which type of data to show alarm calendars for"
+msgid ""
+"Check to include archived alarms in the search. This option is only "
+"available if archived alarms are currently being displayed."
 msgstr ""
 
-#: resourceselector.cpp:121
-msgctxt "@info:whatsthis"
-msgid ""
-"List of available calendars of the selected type. The checked state shows "
-"whether a calendar is enabled (checked) or disabled (unchecked). The default "
-"calendar is shown in bold."
+#: find.cpp:160
+msgctxt "@option:check Alarm action = text display"
+msgid "Text"
 msgstr ""
 
-#: resourceselector.cpp:131 editdlgtypes.cpp:1133
-msgctxt "@action:button"
-msgid "Add..."
+#: find.cpp:162
+msgctxt "@info:whatsthis"
+msgid "Check to include text message alarms in the search."
 msgstr ""
 
-#: resourceselector.cpp:133 editdlgtypes.cpp:1138
-msgctxt "@action:button"
-msgid "Remove"
+#: find.cpp:165
+msgctxt "@option:check Alarm action = file display"
+msgid "File"
 msgstr ""
 
-#: resourceselector.cpp:137
+#: find.cpp:167
 msgctxt "@info:whatsthis"
-msgid "Edit the highlighted calendar"
+msgid "Check to include file alarms in the search."
+msgstr ""
+
+#: find.cpp:170
+msgctxt "@option:check Alarm action"
+msgid "Command"
 msgstr ""
 
-#: resourceselector.cpp:138
+#: find.cpp:172
 msgctxt "@info:whatsthis"
-msgid ""
-"<para>Remove the highlighted calendar from the list.</para><para>The "
-"calendar itself is left intact, and may subsequently be reinstated in the "
-"list if desired.</para>"
+msgid "Check to include command alarms in the search."
 msgstr ""
 
-#: resourceselector.cpp:175
-msgctxt "@info:tooltip"
-msgid "Add a new active alarm calendar"
+#: find.cpp:175
+msgctxt "@option:check Alarm action"
+msgid "Email"
 msgstr ""
 
-#: resourceselector.cpp:179
-msgctxt "@info:tooltip"
-msgid "Add a new archived alarm calendar"
+#: find.cpp:177
+msgctxt "@info:whatsthis"
+msgid "Check to include email alarms in the search."
 msgstr ""
 
-#: resourceselector.cpp:183
-msgctxt "@info:tooltip"
-msgid "Add a new alarm template calendar"
+#: find.cpp:180
+msgctxt "@option:check Alarm action"
+msgid "Audio"
 msgstr ""
 
-#: resourceselector.cpp:233 resourceconfigdialog.cpp:48
-msgctxt "@title:window"
-msgid "Calendar Configuration"
+#: find.cpp:182
+msgctxt "@info:whatsthis"
+msgid "Check to include audio alarms in the search."
 msgstr ""
 
-#: resourceselector.cpp:234
+#: find.cpp:283
 msgctxt "@info"
-msgid "Select storage type of new calendar:"
-msgstr ""
-
-#: resourceselector.cpp:241
-#, kde-format
-msgctxt "@info"
-msgid "Unable to create calendar of type <resource>%1</resource>."
-msgstr ""
-
-#: resourceselector.cpp:244
-#, kde-format
-msgctxt "@info/plain"
-msgid "%1 calendar"
-msgstr ""
-
-#: resourceselector.cpp:363
-msgctxt "@info"
-msgid "You cannot make your default active alarm calendar read-only."
-msgstr ""
-
-#: resourceselector.cpp:370
-msgctxt "@info"
-msgid ""
-"You cannot make your default archived alarm calendar read-only while expired "
-"alarms are configured to be kept."
-msgstr ""
-
-#: resourceselector.cpp:374
-msgctxt "@info"
-msgid "Do you really want to make your default calendar read-only?"
-msgstr ""
-
-#: resourceselector.cpp:411
-msgctxt "@info"
-msgid "You cannot remove your default active alarm calendar."
-msgstr ""
-
-#: resourceselector.cpp:418
-msgctxt "@info"
-msgid ""
-"You cannot remove your default archived alarm calendar while expired alarms "
-"are configured to be kept."
+msgid "No alarm types are selected to search"
 msgstr ""
 
-#: resourceselector.cpp:426
-#, kde-format
+#: find.cpp:439
 msgctxt "@info"
 msgid ""
-"Do you really want to remove your default calendar (<resource>%1</resource>) "
-"from the list?"
+"<para>End of alarm list reached.</para><para>Continue from the "
+"beginning?</para>"
 msgstr ""
 
-#: resourceselector.cpp:427
-#, kde-format
+#: find.cpp:440
 msgctxt "@info"
 msgid ""
-"Do you really want to remove the calendar <resource>%1</resource> from the "
-"list?"
-msgstr ""
-
-#: resourceselector.cpp:463
-msgctxt "@action Reload calendar"
-msgid "Re&load"
-msgstr ""
-
-#: resourceselector.cpp:466
-msgctxt "@action"
-msgid "&Save"
-msgstr ""
-
-#: resourceselector.cpp:469
-msgctxt "@action"
-msgid "Show &Details"
+"<para>Beginning of alarm list reached.</para><para>Continue from the "
+"end?</para>"
 msgstr ""
 
-#: resourceselector.cpp:472
-msgctxt "@action"
-msgid "Set &Color..."
+#: newalarmaction.cpp:59
+msgctxt "@item:inmenu"
+msgid "&Display Alarm Template"
 msgstr ""
 
-#: resourceselector.cpp:475
+#: newalarmaction.cpp:59
 msgctxt "@action"
-msgid "Clear C&olor"
+msgid "New Display Alarm"
 msgstr ""
 
-#: resourceselector.cpp:478 mainwindow.cpp:493
-msgctxt "@action"
-msgid "&Edit..."
+#: newalarmaction.cpp:62
+msgctxt "@item:inmenu"
+msgid "&Command Alarm Template"
 msgstr ""
 
-#: resourceselector.cpp:481
+#: newalarmaction.cpp:62
 msgctxt "@action"
-msgid "&Remove"
+msgid "New Command Alarm"
 msgstr ""
 
-#: resourceselector.cpp:487
-msgctxt "@action"
-msgid "&Add..."
+#: newalarmaction.cpp:65
+msgctxt "@item:inmenu"
+msgid "&Email Alarm Template"
 msgstr ""
 
-#: resourceselector.cpp:490
+#: newalarmaction.cpp:65
 msgctxt "@action"
-msgid "Im&port..."
+msgid "New Email Alarm"
 msgstr ""
 
-#: resourceselector.cpp:493 mainwindow.cpp:565
-msgctxt "@action"
-msgid "E&xport..."
+#: newalarmaction.cpp:68
+msgctxt "@item:inmenu"
+msgid "&Audio Alarm Template"
 msgstr ""
 
-#: resourceselector.cpp:565
+#: newalarmaction.cpp:68
 msgctxt "@action"
-msgid "Use as &Default for Active Alarms"
+msgid "New Audio Alarm"
 msgstr ""
 
-#: resourceselector.cpp:566
+#: newalarmaction.cpp:79
 msgctxt "@action"
-msgid "Use as &Default for Archived Alarms"
+msgid "New Alarm From &Template"
 msgstr ""
 
-#: resourceselector.cpp:567
-msgctxt "@action"
-msgid "Use as &Default for Alarm Templates"
+#: lib/filedialog.cpp:60
+msgctxt "@option:check"
+msgid "Append to existing file"
 msgstr ""
 
-#: resourceselector.cpp:685
-msgctxt "@info/plain"
-msgid "It is not an active alarm calendar."
+#: lib/timeedit.cpp:177
+msgctxt "@item:inlistbox Morning, as in 2am"
+msgid "am"
 msgstr ""
 
-#: resourceselector.cpp:688
-msgctxt "@info/plain"
-msgid "It is not an archived alarm calendar."
+#: lib/timeedit.cpp:196
+msgctxt "@item:inlistbox Afternoon, as in 2pm"
+msgid "pm"
 msgstr ""
 
-#: resourceselector.cpp:691
-msgctxt "@info/plain"
-msgid "It is not an alarm template calendar."
+#: lib/shellprocess.cpp:158
+msgctxt "@info"
+msgid "Failed to execute command (shell access not authorized)"
 msgstr ""
 
-#: resourceselector.cpp:696
-#, kde-format
+#: lib/shellprocess.cpp:161
 msgctxt "@info"
-msgid ""
-"<para>Calendar <resource>%1</resource> has been "
-"disabled:</para><para>%2</para>"
+msgid "Failed to execute command"
 msgstr ""
 
-#: resourceselector.cpp:809
-#, kde-format
+#: lib/shellprocess.cpp:163
 msgctxt "@info"
-msgid ""
-"<title>%1</title>Contents: %2<nl/>%3: "
-"<filename>%4</filename><nl/>Permissions: %5<nl/>Status: %6<nl/>Default "
-"calendar: %7</para>"
+msgid "Command execution error"
 msgstr ""
 
-#: resourceselector.cpp:817
+#: lib/shellprocess.cpp:166
 #, kde-format
 msgctxt "@info"
-msgid ""
-"<title>%1</title><para>ID: %2<nl/>Contents: %3<nl/>%4: "
-"<filename>%5</filename><nl/>Permissions: %6<nl/>Status: %7<nl/>Default "
-"calendar: %8</para>"
+msgid "Command exit code: %1"
 msgstr ""
 
-#: find.cpp:134
-msgctxt "@title:group"
-msgid "Alarm Type"
+#: lib/timeperiod.cpp:41
+msgctxt "@item:inlistbox Time units"
+msgid "minutes"
 msgstr ""
 
-#: find.cpp:142
-msgctxt "@option:check Alarm type"
-msgid "Active"
+#: lib/timeperiod.cpp:42
+msgctxt "@item:inlistbox Time units"
+msgid "hours/minutes"
 msgstr ""
 
-#: find.cpp:144
-msgctxt "@info:whatsthis"
-msgid "Check to include active alarms in the search."
+#: lib/timeperiod.cpp:43
+msgctxt "@item:inlistbox Time units"
+msgid "days"
 msgstr ""
 
-#: find.cpp:147
-msgctxt "@option:check Alarm type"
-msgid "Archived"
+#: lib/timeperiod.cpp:44
+msgctxt "@item:inlistbox Time units"
+msgid "weeks"
 msgstr ""
 
-#: find.cpp:149
+#: lib/timespinbox.cpp:77
 msgctxt "@info:whatsthis"
 msgid ""
-"Check to include archived alarms in the search. This option is only "
-"available if archived alarms are currently being displayed."
+"Press the Shift key while clicking the spin buttons to adjust the time by a "
+"larger step (6 hours / 5 minutes)."
 msgstr ""
 
-#: find.cpp:157
-msgctxt "@option:check Alarm action = text display"
-msgid "Text"
+#: lib/kalocale.cpp:51
+msgctxt "@option Name of the weekday"
+msgid "Monday"
 msgstr ""
 
-#: find.cpp:159
-msgctxt "@info:whatsthis"
-msgid "Check to include text message alarms in the search."
+#: lib/kalocale.cpp:52
+msgctxt "@option Name of the weekday"
+msgid "Tuesday"
 msgstr ""
 
-#: find.cpp:162
-msgctxt "@option:check Alarm action = file display"
-msgid "File"
+#: lib/kalocale.cpp:53
+msgctxt "@option Name of the weekday"
+msgid "Wednesday"
 msgstr ""
 
-#: find.cpp:164
-msgctxt "@info:whatsthis"
-msgid "Check to include file alarms in the search."
+#: lib/kalocale.cpp:54
+msgctxt "@option Name of the weekday"
+msgid "Thursday"
 msgstr ""
 
-#: find.cpp:167
-msgctxt "@option:check Alarm action"
-msgid "Command"
+#: lib/kalocale.cpp:55
+msgctxt "@option Name of the weekday"
+msgid "Friday"
 msgstr ""
 
-#: find.cpp:169
-msgctxt "@info:whatsthis"
-msgid "Check to include command alarms in the search."
+#: lib/kalocale.cpp:56
+msgctxt "@option Name of the weekday"
+msgid "Saturday"
 msgstr ""
 
-#: find.cpp:172
-msgctxt "@option:check Alarm action"
-msgid "Email"
+#: lib/kalocale.cpp:57
+msgctxt "@option Name of the weekday"
+msgid "Sunday"
 msgstr ""
 
-#: find.cpp:174
-msgctxt "@info:whatsthis"
-msgid "Check to include email alarms in the search."
+#: resourceconfigdialog.cpp:48 resourceselector.cpp:238
+msgctxt "@title:window"
+msgid "Calendar Configuration"
 msgstr ""
 
-#: find.cpp:177
-msgctxt "@option:check Alarm action"
-msgid "Audio"
+#: resourceconfigdialog.cpp:61
+msgctxt "@title:group"
+msgid "General Settings"
 msgstr ""
 
-#: find.cpp:179
-msgctxt "@info:whatsthis"
-msgid "Check to include audio alarms in the search."
+#: resourceconfigdialog.cpp:63
+msgctxt "@label:textbox Calendar name"
+msgid "Name:"
 msgstr ""
 
-#: find.cpp:271
-msgctxt "@info"
-msgid "No alarm types are selected to search"
+#: resourceconfigdialog.cpp:68
+msgctxt "@option:check"
+msgid "Read-only"
 msgstr ""
 
-#: find.cpp:422
-msgctxt "@info"
-msgid ""
-"<para>End of alarm list reached.</para><para>Continue from the "
-"beginning?</para>"
+#: resourceconfigdialog.cpp:81
+#, kde-format
+msgctxt "@title:group"
+msgid "<resource>%1</resource> Calendar Settings"
 msgstr ""
 
-#: find.cpp:423
+#: resourceconfigdialog.cpp:123
 msgctxt "@info"
-msgid ""
-"<para>Beginning of alarm list reached.</para><para>Continue from the "
-"end?</para>"
+msgid "Please enter a calendar name."
 msgstr ""
 
-#: alarmcalendar.cpp:312 alarmcalendar.cpp:870
-#, kde-format
-msgctxt "@info"
-msgid "Cannot download calendar: <filename>%1</filename>"
+#: eventlistmodel.cpp:312 akonadimodel.cpp:449
+msgctxt "@info:tooltip"
+msgid "Command execution failed"
 msgstr ""
 
-#: alarmcalendar.cpp:334
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>Error loading "
-"calendar:</para><para><filename>%1</filename></para><para>Please fix or "
-"delete the file.</para>"
+#: eventlistmodel.cpp:314 akonadimodel.cpp:451
+msgctxt "@info:tooltip"
+msgid "Pre-alarm action execution failed"
 msgstr ""
 
-#: alarmcalendar.cpp:429
-#, kde-format
-msgctxt "@info"
-msgid "Failed to save calendar to <filename>%1</filename>"
+#: eventlistmodel.cpp:316 akonadimodel.cpp:453
+msgctxt "@info:tooltip"
+msgid "Post-alarm action execution failed"
 msgstr ""
 
-#: alarmcalendar.cpp:439
-#, kde-format
-msgctxt "@info"
-msgid "Cannot upload calendar to <filename>%1</filename>"
+#: eventlistmodel.cpp:318 akonadimodel.cpp:455
+msgctxt "@info:tooltip"
+msgid "Pre- and post-alarm action execution failed"
 msgstr ""
 
-#: alarmcalendar.cpp:861 alarmcalendar.cpp:888
-#, kde-format
-msgctxt "@info"
-msgid "Could not load calendar <filename>%1</filename>."
+#: eventlistmodel.cpp:361 akonadimodel.cpp:645
+msgctxt "@title:column"
+msgid "Time"
 msgstr ""
 
-#: alarmcalendar.cpp:1041
-msgctxt "@title:window"
-msgid "Choose Export Calendar"
+#: eventlistmodel.cpp:363 akonadimodel.cpp:647
+msgctxt "@title:column"
+msgid "Time To"
 msgstr ""
 
-#: alarmcalendar.cpp:1070
-#, kde-format
-msgctxt "@info"
-msgid "Error loading calendar to append to:<nl/><filename>%1</filename>"
+#: eventlistmodel.cpp:365 akonadimodel.cpp:649
+msgctxt "@title:column"
+msgid "Repeat"
 msgstr ""
 
-#: alarmcalendar.cpp:1120
-#, kde-format
-msgctxt "@info"
-msgid "Failed to save new calendar to:<nl/><filename>%1</filename>"
+#: eventlistmodel.cpp:371 akonadimodel.cpp:655
+msgctxt "@title:column"
+msgid "Message, File or Command"
 msgstr ""
 
-#: alarmcalendar.cpp:1127
-#, kde-format
-msgctxt "@info"
-msgid "Cannot upload new calendar to:<nl/><filename>%1</filename>"
+#: eventlistmodel.cpp:373 akonadimodel.cpp:657
+msgctxt "@title:column Template name"
+msgid "Name"
 msgstr ""
 
-#: main.cpp:39
-msgid "Personal alarm message, command and email scheduler for KDE"
+#: eventlistmodel.cpp:828 eventlistmodel.cpp:866 akonadimodel.cpp:677
+#: akonadimodel.cpp:715
+msgctxt "@info/plain Alarm never occurs"
+msgid "Never"
 msgstr ""
-"Trefnlennydd negeseuon larwm, gorchmynion, ac ebostau personol ar gyfer KDE"
 
-#: main.cpp:41
-msgid "Copyright 2001-2011, David Jarvie"
+#: eventlistmodel.cpp:872 akonadimodel.cpp:721
+#, kde-format, no-c-format
+msgctxt "@info/plain n days"
+msgid "%1d"
 msgstr ""
 
-#: main.cpp:49
-msgid "Prompt for confirmation when alarm is acknowledged"
-msgstr "Annog am gadarnhad pan wirir y larwm"
-
-#: main.cpp:51
-msgid "Attach file to email (repeat as needed)"
-msgstr "Atodi ffeil at ebost (ail-adroddwch fel bo'r angen)"
-
-#: main.cpp:52
-msgid "Auto-close alarm window after --late-cancel period"
+#: eventlistmodel.cpp:881 akonadimodel.cpp:730
+#, kde-format
+msgctxt "@info/plain hours:minutes"
+msgid "%1:%2"
 msgstr ""
 
-#: main.cpp:53
-msgid "Blind copy email to self"
-msgstr "Copïo ebost yn ddall ataf i fy hun"
-
-#: main.cpp:55
-msgid "Beep when message is displayed"
-msgstr "Blîpio pan ddengys y neges"
-
-#: main.cpp:58
-msgid "Message background color (name or hex 0xRRGGBB)"
-msgstr "Lliw cefndir y neges (enw neu hecs 0xCCGwGwGlGl)"
-
-#: main.cpp:61
-msgid "Message foreground color (name or hex 0xRRGGBB)"
-msgstr "Lliw blaendir y neges (enw neu hecs 0xRRGGBB)"
-
-#: main.cpp:62
-msgid "Cancel alarm with the specified event ID"
-msgstr "Diddymu larwm â'r dynodiad digwyddiad penodedig"
+#: eventlistmodel.cpp:884 akonadimodel.cpp:733
+#, kde-format
+msgctxt "@info/plain days hours:minutes"
+msgid "%1d %2:%3"
+msgstr ""
 
-#: main.cpp:64
-msgid "Disable the alarm"
+#: eventlistmodel.cpp:968 akonadimodel.cpp:1087
+msgctxt "@info:whatsthis"
+msgid "Next scheduled date and time of the alarm"
 msgstr ""
 
-#: main.cpp:65
-msgid "Disable monitoring of all alarms"
+#: eventlistmodel.cpp:970 akonadimodel.cpp:1089
+msgctxt "@info:whatsthis"
+msgid "How long until the next scheduled trigger of the alarm"
 msgstr ""
 
-#: main.cpp:67
-msgid "Execute a shell command line"
-msgstr "Gweithredu llinell orchymyn plisgyn"
+#: eventlistmodel.cpp:972 akonadimodel.cpp:1091
+msgctxt "@info:whatsthis"
+msgid "How often the alarm recurs"
+msgstr ""
 
-#: main.cpp:69
-msgid "Command line to generate alarm message text"
+#: eventlistmodel.cpp:974 akonadimodel.cpp:1093
+msgctxt "@info:whatsthis"
+msgid "Background color of alarm message"
 msgstr ""
 
-#: main.cpp:70
-msgid "Display the alarm edit dialog to edit the specified alarm"
+#: eventlistmodel.cpp:976 akonadimodel.cpp:1095
+msgctxt "@info:whatsthis"
+msgid "Alarm type (message, file, command or email)"
 msgstr ""
 
-#: main.cpp:71
-msgid "Display the alarm edit dialog to edit a new display alarm"
+#: eventlistmodel.cpp:978 akonadimodel.cpp:1097
+msgctxt "@info:whatsthis"
+msgid ""
+"Alarm message text, URL of text file to display, command to execute, or "
+"email subject line"
 msgstr ""
 
-#: main.cpp:72
-msgid "Display the alarm edit dialog to edit a new command alarm"
+#: eventlistmodel.cpp:980 akonadimodel.cpp:1099
+msgctxt "@info:whatsthis"
+msgid "Name of the alarm template"
 msgstr ""
 
-#: main.cpp:73
-msgid "Display the alarm edit dialog to edit a new email alarm"
+#: editdlg.cpp:98
+#, kde-format
+msgctxt "@title:tab"
+msgid "Recurrence - [%1]"
 msgstr ""
 
-#: main.cpp:74
-msgid "Display the alarm edit dialog to edit a new audio alarm"
+#: editdlg.cpp:103
+msgctxt "@option:check"
+msgid "Show in KOrganizer"
 msgstr ""
 
-#: main.cpp:75
-msgid "Display the alarm edit dialog, preset with a template"
+#: editdlg.cpp:239
+msgctxt "@title:window"
+msgid "Alarm Template [read-only]"
 msgstr ""
 
-#: main.cpp:77
-msgid "File to display"
-msgstr "Ffeil i'w dangos"
+#: editdlg.cpp:240
+msgctxt "@title:window"
+msgid "Archived Alarm [read-only]"
+msgstr ""
 
-#: main.cpp:79
-msgid "KMail identity to use as sender of email"
+#: editdlg.cpp:241
+msgctxt "@title:window"
+msgid "Alarm [read-only]"
 msgstr ""
 
-#: main.cpp:81
-msgid "Interval between alarm repetitions"
+#: editdlg.cpp:247
+msgctxt "@action:button"
+msgid "Load Template..."
 msgstr ""
 
-#: main.cpp:83
-msgid "Show alarm as an event in KOrganizer"
+#: editdlg.cpp:261
+msgctxt "@label:textbox"
+msgid "Template name:"
 msgstr ""
 
-#: main.cpp:85
-msgid "Cancel alarm if more than 'period' late when triggered"
+#: editdlg.cpp:267
+msgctxt "@info:whatsthis"
+msgid "Enter the name of the alarm template"
 msgstr ""
 
-#: main.cpp:87
-msgid "Repeat alarm at every login"
-msgstr "Ailadrodd y larwm ar bob mewngofnod"
+#: editdlg.cpp:274
+msgctxt "@title:tab"
+msgid "Alarm"
+msgstr ""
 
-#: main.cpp:89
-msgid "Send an email to the given address (repeat as needed)"
-msgstr "Anfon ebost at y cyfeiriad a roddwyd (ailadroddwch fel bo angen)"
+#: editdlg.cpp:298
+msgctxt "@title:group"
+msgid "Action"
+msgstr ""
 
-#: main.cpp:91
-msgid "Audio file to play once"
+#: editdlg.cpp:309
+msgctxt "@title:group"
+msgid "Deferred Alarm"
 msgstr ""
 
-#: main.cpp:93
-msgid "Audio file to play repeatedly"
+#: editdlg.cpp:314
+msgctxt "@label"
+msgid "Deferred to:"
 msgstr ""
 
-#: main.cpp:94
-msgid "Specify alarm recurrence using iCalendar syntax"
-msgstr "Penodi ail-ddigwydd y larwm yng nghystrawen iCalendar"
+#: editdlg.cpp:320
+msgctxt "@action:button"
+msgid "Change..."
+msgstr ""
 
-#: main.cpp:96
-msgid "Display reminder before or after alarm"
+#: editdlg.cpp:323
+msgctxt "@info:whatsthis"
+msgid "Change the alarm's deferred time, or cancel the deferral"
 msgstr ""
 
-#: main.cpp:97
-msgid "Display reminder once, before or after first alarm recurrence"
+#: editdlg.cpp:335 editdlg.cpp:402
+msgctxt "@title:group"
+msgid "Time"
 msgstr ""
 
-#: main.cpp:99
-msgid "Number of times to repeat alarm (including initial occasion)"
+#: editdlg.cpp:344
+msgctxt "@option:radio"
+msgid "Default time"
 msgstr ""
 
-#: main.cpp:101
-msgid "Speak the message when it is displayed"
+#: editdlg.cpp:347
+msgctxt "@info:whatsthis"
+msgid ""
+"Do not specify a start time for alarms based on this template. The normal "
+"default start time will be used."
 msgstr ""
 
-#: main.cpp:103
-msgid "Email subject line"
-msgstr "Llinell bwnc ebost"
+#: editdlg.cpp:355
+msgctxt "@option:radio"
+msgid "Time:"
+msgstr ""
 
-#: main.cpp:105
-msgid "Simulate system time [[[yyyy-]mm-]dd-]hh:mm [TZ] (debug mode)"
+#: editdlg.cpp:358
+msgctxt "@info:whatsthis"
+msgid "Specify a start time for alarms based on this template."
 msgstr ""
 
-#: main.cpp:108
+#: editdlg.cpp:364
+#, kde-format
+msgctxt "@info:whatsthis"
 msgid ""
-"Trigger alarm at time [[[yyyy-]mm-]dd-]hh:mm [TZ], or date yyyy-mm-dd [TZ]"
+"<para>Enter the start time for alarms based on this "
+"template.</para><para>%1</para>"
 msgstr ""
 
-#: main.cpp:109
-msgid "Display system tray icon"
-msgstr "Dangos eicon gafn gysawd"
-
-#: main.cpp:110
-msgid "Trigger alarm with the specified event ID"
-msgstr "Achosi larwm â'r dynodiad digwyddiad penodedig"
+#: editdlg.cpp:371
+msgctxt "@option:radio"
+msgid "Date only"
+msgstr ""
 
-#: main.cpp:112
+#: editdlg.cpp:374
+msgctxt "@info:whatsthis"
 msgid ""
-"Repeat until time [[[yyyy-]mm-]dd-]hh:mm [TZ], or date yyyy-mm-dd [TZ]"
+"Set the <interface>Any time</interface> option for alarms based on this "
+"template."
 msgstr ""
 
-#: main.cpp:114
-msgid "Volume to play audio file"
+#: editdlg.cpp:381 alarmtimewidget.cpp:151
+msgctxt "@option:radio"
+msgid "Time from now:"
 msgstr ""
 
-#: main.cpp:115
-msgid "Message text to display"
-msgstr "Testun neges i'w ddangos"
+#: editdlg.cpp:385
+msgctxt "@info:whatsthis"
+msgid ""
+"Set alarms based on this template to start after the specified time interval "
+"from when the alarm is created."
+msgstr ""
 
-#: templatepickdlg.cpp:46
-msgctxt "@title:window"
-msgid "Choose Alarm Template"
+#: editdlg.cpp:393 alarmtimewidget.cpp:162
+#, kde-format
+msgctxt "@info:whatsthis"
+msgid "<para>%1</para><para>%2</para>"
 msgstr ""
 
-#: templatepickdlg.cpp:77
+#: editdlg.cpp:451
 msgctxt "@info:whatsthis"
-msgid "Select a template to base the new alarm on."
+msgid "Check to copy the alarm into KOrganizer's calendar"
 msgstr ""
 
-#: collectionmodel.cpp:971
-msgctxt "@title:window"
-msgid "Choose Calendar"
+#: editdlg.cpp:455
+msgctxt "@info:whatsthis"
+msgid "Schedule the alarm at the specified time."
 msgstr ""
 
-#: undo.cpp:439
-msgctxt "@info/plain"
-msgid "Alarm not found"
+#: editdlg.cpp:958
+msgctxt "@info"
+msgid "You must enter a name for the alarm template"
 msgstr ""
 
-#: undo.cpp:440
-msgctxt "@info/plain"
-msgid "Error recreating alarm"
+#: editdlg.cpp:962
+msgctxt "@info"
+msgid "Template name is already in use"
 msgstr ""
 
-#: undo.cpp:441
-msgctxt "@info/plain"
-msgid "Error recreating alarm template"
+#: editdlg.cpp:1008
+#, kde-format
+msgctxt "@info The parameter is a date value"
+msgid ""
+"The start date does not match the alarm's recurrence pattern, so it will be "
+"adjusted to the date of the next recurrence (%1)."
 msgstr ""
 
-#: undo.cpp:442
-msgctxt "@info/plain"
-msgid "Cannot reactivate archived alarm"
+#: editdlg.cpp:1012
+#, kde-format
+msgctxt "@info The parameter is a date/time value"
+msgid ""
+"The start date/time does not match the alarm's recurrence pattern, so it "
+"will be adjusted to the date/time of the next recurrence (%1)."
 msgstr ""
 
-#: undo.cpp:443
-msgctxt "@info/plain"
-msgid "Program error"
+#: editdlg.cpp:1039
+msgctxt "@info"
+msgid "Recurrence has already expired"
 msgstr ""
 
-#: undo.cpp:444
-msgctxt "@info/plain"
-msgid "Unknown error"
+#: editdlg.cpp:1044
+msgctxt "@info"
+msgid "The alarm will never occur during working hours"
 msgstr ""
 
-#: undo.cpp:446
+#: editdlg.cpp:1073
 #, kde-format
-msgctxt "@info Undo-action: message"
-msgid "%1: %2"
+msgctxt "@info"
+msgid ""
+"Reminder period must be less than the recurrence interval, unless "
+"<interface>%1</interface> is checked."
 msgstr ""
 
-#: undo.cpp:683
-msgctxt "@info/plain Action to create a new alarm"
-msgid "New alarm"
+#: editdlg.cpp:1088
+msgctxt "@info"
+msgid ""
+"The duration of a repetition within the recurrence must be less than the "
+"recurrence interval minus any reminder period"
 msgstr ""
 
-#: undo.cpp:685
-msgctxt "@info/plain Action to delete an alarm"
-msgid "Delete alarm"
+#: editdlg.cpp:1095
+msgctxt "@info"
+msgid ""
+"For a repetition within the recurrence, its period must be in units of days "
+"or weeks for a date-only alarm"
 msgstr ""
 
-#: undo.cpp:688
-msgctxt "@info/plain Action to create a new alarm template"
-msgid "New template"
+#: editdlg.cpp:1127 editdlg.cpp:1156
+msgctxt "@info"
+msgid "You must select a calendar to save the alarm in"
 msgstr ""
 
-#: undo.cpp:690
-msgctxt "@info/plain Action to delete an alarm template"
-msgid "Delete template"
+#: editdlg.cpp:1242
+msgctxt "@action:button"
+msgid "Less Options <<"
 msgstr ""
 
-#: undo.cpp:692
-msgctxt "@info/plain"
-msgid "Delete archived alarm"
+#: editdlg.cpp:1247
+msgctxt "@action:button"
+msgid "More Options >>"
 msgstr ""
 
-#: undo.cpp:911
-msgctxt "@info/plain"
-msgid "Create multiple alarms"
+#: latecancel.cpp:44
+msgctxt "@option:check"
+msgid "Cancel if late"
 msgstr ""
 
-#: undo.cpp:1005
-msgctxt "@info/plain Action to edit an alarm"
-msgid "Edit alarm"
+#: latecancel.cpp:45
+msgctxt "@option:check"
+msgid "Auto-close window after this time"
 msgstr ""
 
-#: undo.cpp:1007
-msgctxt "@info/plain Action to edit an alarm template"
-msgid "Edit template"
+#: latecancel.cpp:46
+msgctxt "@option:check"
+msgid "Auto-close window after late-cancellation time"
 msgstr ""
 
-#: undo.cpp:1186
-msgctxt "@info/plain"
-msgid "Delete multiple alarms"
+#: latecancel.cpp:56
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>If checked, the alarm will be canceled if it cannot be triggered "
+"within the specified period after its scheduled time. Possible reasons for "
+"not triggering include your being logged off, X not running, or "
+"<application>KAlarm</application> not running.</para><para>If unchecked, the "
+"alarm will be triggered at the first opportunity after its scheduled time, "
+"regardless of how late it is.</para>"
 msgstr ""
 
-#: undo.cpp:1188
-msgctxt "@info/plain"
-msgid "Delete multiple templates"
+#: latecancel.cpp:82
+msgctxt "@option:check Cancel if late by 10 minutes"
+msgid "Cancel if late by"
 msgstr ""
 
-#: undo.cpp:1195
-msgctxt "@info/plain"
-msgid "Delete multiple archived alarms"
+#: latecancel.cpp:83
+msgctxt "@info:whatsthis"
+msgid "Enter how late will cause the alarm to be canceled"
 msgstr ""
 
-#: undo.cpp:1238 undo.cpp:1282
-msgctxt "@info/plain"
-msgid "Reactivate alarm"
+#: latecancel.cpp:99
+msgctxt "@info:whatsthis"
+msgid ""
+"Automatically close the alarm window after the expiry of the late-"
+"cancellation period"
 msgstr ""
 
-#: undo.cpp:1305
-msgctxt "@info/plain"
-msgid "Reactivate multiple alarms"
+#: wakedlg.cpp:56
+msgctxt "@title:window"
+msgid "Wake From Suspend"
 msgstr ""
 
-#: repetitionbutton.cpp:87
+#: wakedlg.cpp:181
+msgctxt "@info"
+msgid "Cannot schedule wakeup time for a date-only alarm"
+msgstr ""
+
+#: wakedlg.cpp:185
+msgctxt "@info"
+msgid ""
+"<para>This wakeup will cancel any existing wakeup which has been set by "
+"KAlarm or any other application, because your computer can only schedule a "
+"single wakeup time.</para><para><b>Note:</b> Wake From Suspend is not "
+"supported at all on some computers, especially older ones, and some "
+"computers only support setting a wakeup time up to 24 hours ahead. You may "
+"wish to set up a test alarm to check your system's capability.</para>"
+msgstr ""
+
+#: main.cpp:39
+msgid "KAlarm"
+msgstr "KAlarm/KLarwm"
+
+#: main.cpp:40
+msgid "Personal alarm message, command and email scheduler for KDE"
+msgstr ""
+"Trefnlennydd negeseuon larwm, gorchmynion, ac ebostau personol ar gyfer KDE"
+
+#: main.cpp:42
+msgid "Copyright 2001-2012, David Jarvie"
+msgstr ""
+
+#: main.cpp:43 autostart/autostart.cpp:48
+msgid "David Jarvie"
+msgstr ""
+
+#: main.cpp:50
+msgid "Prompt for confirmation when alarm is acknowledged"
+msgstr "Annog am gadarnhad pan wirir y larwm"
+
+#: main.cpp:52
+msgid "Attach file to email (repeat as needed)"
+msgstr "Atodi ffeil at ebost (ail-adroddwch fel bo'r angen)"
+
+#: main.cpp:53
+msgid "Auto-close alarm window after --late-cancel period"
+msgstr ""
+
+#: main.cpp:54
+msgid "Blind copy email to self"
+msgstr "Copïo ebost yn ddall ataf i fy hun"
+
+#: main.cpp:56
+msgid "Beep when message is displayed"
+msgstr "Blîpio pan ddengys y neges"
+
+#: main.cpp:59
+msgid "Message background color (name or hex 0xRRGGBB)"
+msgstr "Lliw cefndir y neges (enw neu hecs 0xCCGwGwGlGl)"
+
+#: main.cpp:62
+msgid "Message foreground color (name or hex 0xRRGGBB)"
+msgstr "Lliw blaendir y neges (enw neu hecs 0xRRGGBB)"
+
+#: main.cpp:63
+msgid "Cancel alarm with the specified event ID"
+msgstr "Diddymu larwm â'r dynodiad digwyddiad penodedig"
+
+#: main.cpp:65
+msgid "Disable the alarm"
+msgstr ""
+
+#: main.cpp:66
+msgid "Disable monitoring of all alarms"
+msgstr ""
+
+#: main.cpp:68
+msgid "Execute a shell command line"
+msgstr "Gweithredu llinell orchymyn plisgyn"
+
+#: main.cpp:70
+msgid "Command line to generate alarm message text"
+msgstr ""
+
+#: main.cpp:71
+msgid "Display the alarm edit dialog to edit the specified alarm"
+msgstr ""
+
+#: main.cpp:72
+msgid "Display the alarm edit dialog to edit a new display alarm"
+msgstr ""
+
+#: main.cpp:73
+msgid "Display the alarm edit dialog to edit a new command alarm"
+msgstr ""
+
+#: main.cpp:74
+msgid "Display the alarm edit dialog to edit a new email alarm"
+msgstr ""
+
+#: main.cpp:75
+msgid "Display the alarm edit dialog to edit a new audio alarm"
+msgstr ""
+
+#: main.cpp:76
+msgid "Display the alarm edit dialog, preset with a template"
+msgstr ""
+
+#: main.cpp:78
+msgid "File to display"
+msgstr "Ffeil i'w dangos"
+
+#: main.cpp:80
+msgid "KMail identity to use as sender of email"
+msgstr ""
+
+#: main.cpp:82
+msgid "Interval between alarm repetitions"
+msgstr ""
+
+#: main.cpp:84
+msgid "Show alarm as an event in KOrganizer"
+msgstr ""
+
+#: main.cpp:86
+msgid "Cancel alarm if more than 'period' late when triggered"
+msgstr ""
+
+#: main.cpp:88
+msgid "Repeat alarm at every login"
+msgstr "Ailadrodd y larwm ar bob mewngofnod"
+
+#: main.cpp:90
+msgid "Send an email to the given address (repeat as needed)"
+msgstr "Anfon ebost at y cyfeiriad a roddwyd (ailadroddwch fel bo angen)"
+
+#: main.cpp:92
+msgid "Audio file to play once"
+msgstr ""
+
+#: main.cpp:94
+msgid "Audio file to play repeatedly"
+msgstr ""
+
+#: main.cpp:95
+msgid "Specify alarm recurrence using iCalendar syntax"
+msgstr "Penodi ail-ddigwydd y larwm yng nghystrawen iCalendar"
+
+#: main.cpp:97
+msgid "Display reminder before or after alarm"
+msgstr ""
+
+#: main.cpp:98
+msgid "Display reminder once, before or after first alarm recurrence"
+msgstr ""
+
+#: main.cpp:100
+msgid "Number of times to repeat alarm (including initial occasion)"
+msgstr ""
+
+#: main.cpp:102
+msgid "Speak the message when it is displayed"
+msgstr ""
+
+#: main.cpp:104
+msgid "Email subject line"
+msgstr "Llinell bwnc ebost"
+
+#: main.cpp:106
+msgid "Simulate system time [[[yyyy-]mm-]dd-]hh:mm [TZ] (debug mode)"
+msgstr ""
+
+#: main.cpp:109
+msgid ""
+"Trigger alarm at time [[[yyyy-]mm-]dd-]hh:mm [TZ], or date yyyy-mm-dd [TZ]"
+msgstr ""
+
+#: main.cpp:110
+msgid "Display system tray icon"
+msgstr "Dangos eicon gafn gysawd"
+
+#: main.cpp:111
+msgid "Trigger alarm with the specified event ID"
+msgstr "Achosi larwm â'r dynodiad digwyddiad penodedig"
+
+#: main.cpp:113
+msgid ""
+"Repeat until time [[[yyyy-]mm-]dd-]hh:mm [TZ], or date yyyy-mm-dd [TZ]"
+msgstr ""
+
+#: main.cpp:115
+msgid "Volume to play audio file"
+msgstr ""
+
+#: main.cpp:116
+msgid "Message text to display"
+msgstr "Testun neges i'w ddangos"
+
+#: messagewin.cpp:438
 msgctxt "@title:window"
-msgid "Alarm Sub-Repetition"
+msgid "Reminder"
 msgstr ""
 
-#: repetitionbutton.cpp:165
-msgctxt "@option:check Repeat every 10 minutes"
-msgid "Repeat every"
+#: messagewin.cpp:438 messagewin.cpp:861
+msgctxt "@title:window"
+msgid "Message"
 msgstr ""
 
-#: repetitionbutton.cpp:166
+#: messagewin.cpp:456
 msgctxt "@info:whatsthis"
 msgid ""
-"Instead of the alarm triggering just once at each recurrence, checking this "
-"option makes the alarm trigger multiple times at each recurrence."
+"The scheduled date/time for the message (as opposed to the actual time of "
+"display)."
 msgstr ""
 
-#: repetitionbutton.cpp:168
+#: messagewin.cpp:463
+msgctxt "@info"
+msgid "Reminder"
+msgstr ""
+
+#: messagewin.cpp:487
 msgctxt "@info:whatsthis"
-msgid "Enter the time between repetitions of the alarm"
+msgid "The file whose contents are displayed below"
 msgstr ""
 
-#: repetitionbutton.cpp:186
-msgctxt "@option:radio"
-msgid "Number of repetitions:"
+#: messagewin.cpp:543
+msgctxt "@info:whatsthis"
+msgid "The contents of the file to be displayed"
 msgstr ""
 
-#: repetitionbutton.cpp:188
+#: messagewin.cpp:551
+msgctxt "@info"
+msgid "File is a folder"
+msgstr ""
+
+#: messagewin.cpp:551
+msgctxt "@info"
+msgid "Failed to open file"
+msgstr ""
+
+#: messagewin.cpp:551
+msgctxt "@info"
+msgid "File not found"
+msgstr ""
+
+#: messagewin.cpp:571
 msgctxt "@info:whatsthis"
-msgid ""
-"Check to specify the number of times the alarm should repeat after each "
-"recurrence"
+msgid "The alarm message"
 msgstr ""
 
-#: repetitionbutton.cpp:196
+#: messagewin.cpp:598
 msgctxt "@info:whatsthis"
-msgid ""
-"Enter the number of times to trigger the alarm after its initial occurrence"
+msgid "The output of the alarm's command"
 msgstr ""
 
-#: repetitionbutton.cpp:204
-msgctxt "@option:radio"
-msgid "Duration:"
+#: messagewin.cpp:640
+msgctxt "@info:whatsthis"
+msgid "The email to send"
 msgstr ""
 
-#: repetitionbutton.cpp:206
+#: messagewin.cpp:646
+msgctxt "@info Email addressee"
+msgid "To:"
+msgstr ""
+
+#: messagewin.cpp:653
+msgctxt "@info Email subject"
+msgid "Subject:"
+msgstr ""
+
+#: messagewin.cpp:679
+msgctxt "@title:window"
+msgid "Error"
+msgstr ""
+
+#: messagewin.cpp:699
+msgctxt "@option:check"
+msgid "Do not display this error message again for this alarm"
+msgstr ""
+
+#: messagewin.cpp:718
 msgctxt "@info:whatsthis"
-msgid "Check to specify how long the alarm is to be repeated"
+msgid "Acknowledge the alarm"
 msgstr ""
 
-#: repetitionbutton.cpp:212
+#: messagewin.cpp:723
+msgctxt "@action:button"
+msgid "&Edit..."
+msgstr ""
+
+#: messagewin.cpp:728
 msgctxt "@info:whatsthis"
-msgid "Enter the length of time to repeat the alarm"
+msgid "Edit the alarm."
 msgstr ""
 
-#: rtcwakeaction.cpp:89
-#, kde-format
-msgctxt "@text/plain"
-msgid "Could not run <command>%1</command> to set wake from suspend"
+#: messagewin.cpp:732
+msgctxt "@action:button"
+msgid "&Defer..."
 msgstr ""
 
-#: rtcwakeaction.cpp:92
-#, kde-format
-msgctxt "@text/plain"
+#: messagewin.cpp:737
+msgctxt "@info:whatsthis"
 msgid ""
-"Error setting wake from suspend.<nl/>Command was: "
-"<command>%1</command><nl/>Error code: %2."
+"<para>Defer the alarm until later.</para><para>You will be prompted to "
+"specify when the alarm should be redisplayed.</para>"
 msgstr ""
 
-#: traywindow.cpp:96
-msgctxt "@action"
-msgid "&New Alarm"
+#: messagewin.cpp:767
+msgctxt "@info:tooltip Locate this email in KMail"
+msgid "Locate in <application>KMail</application>"
 msgstr ""
 
-#: traywindow.cpp:272
-msgid "Disabled"
+#: messagewin.cpp:768
+msgctxt "@info:whatsthis"
+msgid "Locate and highlight this email in <application>KMail</application>"
 msgstr ""
 
-#: traywindow.cpp:277
-msgctxt "@info:tooltip Brief: some alarms are disabled"
-msgid "(Some alarms disabled)"
+#: messagewin.cpp:777
+msgctxt "@info:tooltip"
+msgid "Activate <application>KAlarm</application>"
+msgstr ""
+
+#: messagewin.cpp:778
+msgctxt "@info:whatsthis"
+msgid "Activate <application>KAlarm</application>"
+msgstr ""
+
+#: messagewin.cpp:938
+msgctxt "@info"
+msgid "Today"
 msgstr ""
 
-#: traywindow.cpp:354
+#: messagewin.cpp:940
 #, kde-format
-msgctxt "@info/plain prefix + hours:minutes"
-msgid "(%1%2:%3)"
+msgctxt "@info"
+msgid "Tomorrow"
+msgid_plural "in %1 days' time"
+msgstr[0] ""
+msgstr[1] ""
+
+#: messagewin.cpp:942
+#, kde-format
+msgctxt "@info"
+msgid "in 1 week's time"
+msgid_plural "in %1 weeks' time"
+msgstr[0] ""
+msgstr[1] ""
+
+#: messagewin.cpp:956
+#, kde-format
+msgctxt "@info"
+msgid "in 1 minute's time"
+msgid_plural "in %1 minutes' time"
+msgstr[0] ""
+msgstr[1] ""
+
+#: messagewin.cpp:958
+#, kde-format
+msgctxt "@info"
+msgid "in 1 hour's time"
+msgid_plural "in %1 hours' time"
+msgstr[0] ""
+msgstr[1] ""
+
+#: messagewin.cpp:961
+#, kde-format
+msgctxt "@item:intext inserted into 'in ... %1 minute's time' below"
+msgid "1 hour"
+msgid_plural "%1 hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: messagewin.cpp:962
+#, kde-format
+msgctxt "@info '%2' is the previous message '1 hour'/'%1 hours'"
+msgid "in %2 1 minute's time"
+msgid_plural "in %2 %1 minutes' time"
+msgstr[0] ""
+msgstr[1] ""
+
+#: messagewin.cpp:1464 messagewin.cpp:1474
+msgctxt "@info"
+msgid "Unable to speak message"
 msgstr ""
 
-#: traywindow.cpp:356
+#: messagewin.cpp:1474
+msgctxt "@info"
+msgid "D-Bus call say() failed"
+msgstr ""
+
+#: messagewin.cpp:1616
 #, kde-format
-msgctxt "@info/plain prefix + hours:minutes"
-msgid "%1%2:%3"
+msgctxt "@info"
+msgid "Cannot open audio file: <filename>%1</filename>"
 msgstr ""
 
-#: fontcolourbutton.cpp:43
+#: messagewin.cpp:1714
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>Error playing audio file: <filename>%1</filename></para><para>%2</para>"
+msgstr ""
+
+#: messagewin.cpp:2043
+msgctxt "@info"
+msgid "Do you really want to acknowledge this alarm?"
+msgstr ""
+
+#: messagewin.cpp:2044
 msgctxt "@action:button"
-msgid "Font && Color..."
+msgid "Acknowledge Alarm"
 msgstr ""
 
-#: fontcolourbutton.cpp:47
-msgctxt "@info:whatsthis"
-msgid ""
-"Choose the font, and foreground and background color, for the alarm message."
+#: messagewin.cpp:2044
+msgctxt "@action:button"
+msgid "Acknowledge"
 msgstr ""
 
-#: fontcolourbutton.cpp:71
-msgctxt "@title:window"
-msgid "Choose Alarm Font & Color"
+#: messagewin.cpp:2095
+msgctxt "@info"
+msgid "Unable to locate this email in <application>KMail</application>"
 msgstr ""
 
-#: editdlgtypes.cpp:91
-msgctxt "@title:window"
-msgid "Choose Log File"
+#: messagewin.cpp:2265
+msgctxt "@info"
+msgid "<para>Cannot defer alarm:</para><para>Alarm not found.</para>"
 msgstr ""
 
-#: editdlgtypes.cpp:104
-msgctxt "@option:check"
-msgid "Confirm acknowledgment"
+#: recurrenceedit.cpp:81
+msgctxt "@item:inlistbox Recurrence type"
+msgid "No Recurrence"
 msgstr ""
 
-#: editdlgtypes.cpp:140
-msgctxt "@title:window"
-msgid "New Display Alarm Template"
+#: recurrenceedit.cpp:82
+msgctxt "@item:inlistbox Recurrence type"
+msgid "At Login"
 msgstr ""
 
-#: editdlgtypes.cpp:140
-msgctxt "@title:window"
-msgid "Edit Display Alarm Template"
+#: recurrenceedit.cpp:83
+msgctxt "@item:inlistbox Recurrence type"
+msgid "Hourly/Minutely"
 msgstr ""
 
-#: editdlgtypes.cpp:141
-msgctxt "@title:window"
-msgid "New Display Alarm"
+#: recurrenceedit.cpp:84
+msgctxt "@item:inlistbox Recurrence type"
+msgid "Daily"
 msgstr ""
 
-#: editdlgtypes.cpp:141
-msgctxt "@title:window"
-msgid "Edit Display Alarm"
+#: recurrenceedit.cpp:85
+msgctxt "@item:inlistbox Recurrence type"
+msgid "Weekly"
 msgstr ""
 
-#: editdlgtypes.cpp:153
-msgctxt "@label:listbox"
-msgid "Display type:"
+#: recurrenceedit.cpp:86
+msgctxt "@item:inlistbox Recurrence type"
+msgid "Monthly"
 msgstr ""
 
-#: editdlgtypes.cpp:156
-msgctxt "@item:inlistbox"
-msgid "Text message"
+#: recurrenceedit.cpp:87
+msgctxt "@item:inlistbox Recurrence type"
+msgid "Yearly"
 msgstr ""
 
-#: editdlgtypes.cpp:157
-msgctxt "@item:inlistbox"
-msgid "File contents"
+#: recurrenceedit.cpp:113
+msgctxt "@title:group"
+msgid "Recurrence Rule"
 msgstr ""
 
-#: editdlgtypes.cpp:158
-msgctxt "@item:inlistbox"
-msgid "Command output"
+#: recurrenceedit.cpp:131
+msgctxt "@info:whatsthis"
+msgid "Do not repeat the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:179
-#, kde-format
+#: recurrenceedit.cpp:139
 msgctxt "@info:whatsthis"
 msgid ""
-"<para>Select what the alarm should "
-"display:<list><item><interface>%1</interface>: the alarm will display the "
-"text message you type in.</item><item><interface>%2</interface>: the alarm "
-"will display the contents of a text or image "
-"file.</item><item><interface>%3</interface>: the alarm will display the "
-"output from a command.</item></list></para>"
+"<para>Trigger the alarm at the specified date/time and at every login until "
+"then.</para><para>Note that it will also be triggered any time "
+"<application>KAlarm</application> is restarted.</para>"
 msgstr ""
 
-#: editdlgtypes.cpp:190
+#: recurrenceedit.cpp:147
 msgctxt "@info:whatsthis"
-msgid "Enter the text of the alarm message. It may be multi-line."
+msgid "Repeat the alarm at hourly/minutely intervals"
 msgstr ""
 
-#: editdlgtypes.cpp:200
+#: recurrenceedit.cpp:154
 msgctxt "@info:whatsthis"
-msgid "Enter the name or URL of a text or image file to display."
+msgid "Repeat the alarm at daily intervals"
 msgstr ""
 
-#: editdlgtypes.cpp:209
+#: recurrenceedit.cpp:161
 msgctxt "@info:whatsthis"
-msgid "Select a text or image file to display."
+msgid "Repeat the alarm at weekly intervals"
 msgstr ""
 
-#: editdlgtypes.cpp:257
+#: recurrenceedit.cpp:168
 msgctxt "@info:whatsthis"
-msgid ""
-"Enter how long in advance of or after the main alarm to display a reminder "
-"alarm."
+msgid "Repeat the alarm at monthly intervals"
 msgstr ""
 
-#: editdlgtypes.cpp:258
+#: recurrenceedit.cpp:175
 msgctxt "@info:whatsthis"
-msgid ""
-"Check to additionally display a reminder in advance of or after the main "
-"alarm time(s)."
+msgid "Repeat the alarm at annual intervals"
 msgstr ""
 
-#: editdlgtypes.cpp:259
-#, kde-format
+#: recurrenceedit.cpp:185
 msgctxt "@info:whatsthis"
 msgid ""
-"<para>Enter how long in advance of or after the main alarm to display a "
-"reminder alarm.</para><para>%1</para>"
+"Set up a repetition within the recurrence, to trigger the alarm multiple "
+"times each time the recurrence is due."
 msgstr ""
 
-#: editdlgtypes.cpp:260
-msgctxt "@info:whatsthis"
-msgid ""
-"Select whether the reminder should be triggered before or after the main "
-"alarm"
+#: recurrenceedit.cpp:233
+msgctxt "@title:group"
+msgid "Recurrence End"
 msgstr ""
 
-#: editdlgtypes.cpp:270
-msgctxt "@info:whatsthis"
-msgid "Check to be prompted for confirmation when you acknowledge the alarm."
+#: recurrenceedit.cpp:242
+msgctxt "@option:radio"
+msgid "No end"
 msgstr ""
 
-#: editdlgtypes.cpp:602
+#: recurrenceedit.cpp:245
 msgctxt "@info:whatsthis"
-msgid "Display the alarm message now"
+msgid "Repeat the alarm indefinitely"
 msgstr ""
 
-#: editdlgtypes.cpp:611
-msgctxt "@info:whatsthis"
-msgid "Display the file now"
+#: recurrenceedit.cpp:253
+msgctxt "@option:radio"
+msgid "End after:"
 msgstr ""
 
-#: editdlgtypes.cpp:621
+#: recurrenceedit.cpp:255
 msgctxt "@info:whatsthis"
-msgid "Display the command output now"
+msgid "Repeat the alarm for the number of times specified"
 msgstr ""
 
-#: editdlgtypes.cpp:635
-msgctxt "@title:window"
-msgid "Choose Text or Image File to Display"
+#: recurrenceedit.cpp:262
+msgctxt "@info:whatsthis"
+msgid "Enter the total number of times to trigger the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:710
-msgctxt "@option:check"
-msgid "Enter a script"
+#: recurrenceedit.cpp:266
+msgctxt "@label"
+msgid "occurrence(s)"
 msgstr ""
 
-#: editdlgtypes.cpp:711
+#: recurrenceedit.cpp:278
 msgctxt "@option:radio"
-msgid "Execute in terminal window"
+msgid "End by:"
 msgstr ""
 
-#: editdlgtypes.cpp:712
-msgctxt "@option:check"
-msgid "Execute in terminal window"
+#: recurrenceedit.cpp:281
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>Repeat the alarm until the date/time specified.</para><para><note>This "
+"applies to the main recurrence only. It does not limit any sub-repetition "
+"which will occur regardless after the last main recurrence.</note></para>"
 msgstr ""
 
-#: editdlgtypes.cpp:742
-msgctxt "@title:window"
-msgid "New Command Alarm Template"
+#: recurrenceedit.cpp:286
+msgctxt "@info/plain"
+msgid "This uses the same time zone as the start time."
 msgstr ""
 
-#: editdlgtypes.cpp:742
-msgctxt "@title:window"
-msgid "Edit Command Alarm Template"
+#: recurrenceedit.cpp:288
+#, kde-format
+msgctxt "@info:whatsthis"
+msgid "<para>Enter the last date to repeat the alarm.</para><para>%1</para>"
 msgstr ""
 
-#: editdlgtypes.cpp:743
-msgctxt "@title:window"
-msgid "New Command Alarm"
+#: recurrenceedit.cpp:295
+#, kde-format
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>Enter the last time to repeat the "
+"alarm.</para><para>%1</para><para>%2</para>"
 msgstr ""
 
-#: editdlgtypes.cpp:743
-msgctxt "@title:window"
-msgid "Edit Command Alarm"
+#: recurrenceedit.cpp:297 alarmtimewidget.cpp:143
+msgctxt "@option:check"
+msgid "Any time"
 msgstr ""
 
-#: editdlgtypes.cpp:751
+#: recurrenceedit.cpp:300
 msgctxt "@info:whatsthis"
-msgid "Execute the specified command now"
+msgid ""
+"Stop repeating the alarm after your first login on or after the specified "
+"end date"
 msgstr ""
 
-#: editdlgtypes.cpp:760
+#: recurrenceedit.cpp:318
 msgctxt "@title:group"
-msgid "Command Output"
-msgstr ""
-
-#: editdlgtypes.cpp:771
-msgctxt "@info:whatsthis"
-msgid "Check to execute the command in a terminal window"
+msgid "Exceptions"
 msgstr ""
 
-#: editdlgtypes.cpp:781
+#: recurrenceedit.cpp:329
 msgctxt "@info:whatsthis"
-msgid "Enter the name or path of the log file."
+msgid "The list of exceptions, i.e. dates/times excluded from the recurrence"
 msgstr ""
 
-#: editdlgtypes.cpp:791
+#: recurrenceedit.cpp:348
 msgctxt "@info:whatsthis"
-msgid "Select a log file."
+msgid ""
+"Enter a date to insert in the exceptions list. Use in conjunction with the "
+"Add or Change button below."
 msgstr ""
 
-#: editdlgtypes.cpp:794
-msgctxt "@option:radio"
-msgid "Log to file"
+#: recurrenceedit.cpp:355
+msgctxt "@action:button"
+msgid "Add"
 msgstr ""
 
-#: editdlgtypes.cpp:796
+#: recurrenceedit.cpp:356
 msgctxt "@info:whatsthis"
-msgid ""
-"Check to log the command output to a local file. The output will be appended "
-"to any existing contents of the file."
+msgid "Add the date entered above to the exceptions list"
 msgstr ""
 
-#: editdlgtypes.cpp:803
-msgctxt "@option:radio"
-msgid "Discard"
+#: recurrenceedit.cpp:360
+msgctxt "@action:button"
+msgid "Change"
 msgstr ""
 
-#: editdlgtypes.cpp:805
+#: recurrenceedit.cpp:362
 msgctxt "@info:whatsthis"
-msgid "Check to discard command output."
+msgid ""
+"Replace the currently highlighted item in the exceptions list with the date "
+"entered above"
 msgstr ""
 
-#: editdlgtypes.cpp:958
-msgctxt "@info"
-msgid ""
-"Log file must be the name or path of a local file, with write permission."
+#: recurrenceedit.cpp:366 templatedlg.cpp:120
+msgctxt "@action:button"
+msgid "Delete"
 msgstr ""
 
-#: editdlgtypes.cpp:975
-#, kde-format
-msgctxt "@info"
-msgid "Command executed: <icode>%1</icode>"
+#: recurrenceedit.cpp:367
+msgctxt "@info:whatsthis"
+msgid "Remove the currently highlighted item from the exceptions list"
 msgstr ""
 
-#: editdlgtypes.cpp:1009
+#: recurrenceedit.cpp:374
 msgctxt "@option:check"
-msgid "Copy email to self"
+msgid "Exclude holidays"
 msgstr ""
 
-#: editdlgtypes.cpp:1041
-msgctxt "@title:window"
-msgid "New Email Alarm Template"
+#: recurrenceedit.cpp:377
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>Do not trigger the alarm on holidays.</para><para>You can specify your "
+"holiday region in the Configuration dialog.</para>"
 msgstr ""
 
-#: editdlgtypes.cpp:1041
-msgctxt "@title:window"
-msgid "Edit Email Alarm Template"
+#: recurrenceedit.cpp:382
+msgctxt "@option:check"
+msgid "Only during working time"
 msgstr ""
 
-#: editdlgtypes.cpp:1042
-msgctxt "@title:window"
-msgid "New Email Alarm"
+#: recurrenceedit.cpp:385
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>Only execute the alarm during working hours, on working "
+"days.</para><para>You can specify working days and hours in the "
+"Configuration dialog.</para>"
 msgstr ""
 
-#: editdlgtypes.cpp:1042
-msgctxt "@title:window"
-msgid "Edit Email Alarm"
+#: recurrenceedit.cpp:428
+msgctxt "@info"
+msgid "End date is earlier than start date"
 msgstr ""
 
-#: editdlgtypes.cpp:1050
-msgctxt "@info:whatsthis"
-msgid "Send the email to the specified addressees now"
+#: recurrenceedit.cpp:429
+msgctxt "@info"
+msgid "End date/time is earlier than start date/time"
 msgstr ""
 
-#: editdlgtypes.cpp:1061
-msgctxt "@label:listbox 'From' email address"
-msgid "From:"
+#: recurrenceedit.cpp:699
+msgctxt "@info"
+msgid "Date cannot be earlier than start date"
 msgstr ""
 
-#: editdlgtypes.cpp:1068
-msgctxt "@info:whatsthis"
-msgid ""
-"Your email identity, used to identify you as the sender when sending email "
-"alarms."
+#: recurrenceedit.cpp:1114
+msgctxt "@label:spinbox"
+msgid "Recur e&very"
 msgstr ""
 
-#: editdlgtypes.cpp:1074
-msgctxt "@label:textbox Email addressee"
-msgid "To:"
+#: recurrenceedit.cpp:1183
+msgctxt "@label Time units for user-entered numbers"
+msgid "hours:minutes"
 msgstr ""
 
-#: editdlgtypes.cpp:1080
+#: recurrenceedit.cpp:1184
 msgctxt "@info:whatsthis"
 msgid ""
-"Enter the addresses of the email recipients. Separate multiple addresses by "
-"commas or semicolons."
+"Enter the number of hours and minutes between repetitions of the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:1090
-msgctxt "@info:tooltip"
-msgid "Open address book"
+#: recurrenceedit.cpp:1204
+msgctxt "@label On: Tuesday"
+msgid "O&n:"
 msgstr ""
 
-#: editdlgtypes.cpp:1091
-msgctxt "@info:whatsthis"
-msgid "Select email addresses from your address book."
+#: recurrenceedit.cpp:1285
+msgctxt "@info"
+msgid "No day selected"
 msgstr ""
 
-#: editdlgtypes.cpp:1095
-msgctxt "@label:textbox Email subject"
-msgid "Subject:"
+#: recurrenceedit.cpp:1314
+msgctxt "@label Time unit for user-entered number"
+msgid "day(s)"
 msgstr ""
 
-#: editdlgtypes.cpp:1102
+#: recurrenceedit.cpp:1315
 msgctxt "@info:whatsthis"
-msgid "Enter the email subject."
+msgid "Enter the number of days between repetitions of the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:1108
+#: recurrenceedit.cpp:1316
 msgctxt "@info:whatsthis"
-msgid "Enter the email message."
+msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr ""
 
-#: editdlgtypes.cpp:1116
-msgctxt "@label:listbox"
-msgid "Attachments:"
+#: recurrenceedit.cpp:1327
+msgctxt "@label Time unit for user-entered number"
+msgid "week(s)"
 msgstr ""
 
-#: editdlgtypes.cpp:1129
+#: recurrenceedit.cpp:1328
 msgctxt "@info:whatsthis"
-msgid "Files to send as attachments to the email."
+msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:1135
+#: recurrenceedit.cpp:1329
 msgctxt "@info:whatsthis"
-msgid "Add an attachment to the email."
+msgid "Select the days of the week on which to repeat the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:1140
-msgctxt "@info:whatsthis"
-msgid "Remove the highlighted attachment from the email."
+#: recurrenceedit.cpp:1352
+msgctxt "@option:radio On day number in the month"
+msgid "O&n day"
 msgstr ""
 
-#: editdlgtypes.cpp:1146
+#: recurrenceedit.cpp:1356
 msgctxt "@info:whatsthis"
-msgid "If checked, the email will be blind copied to you."
+msgid "Repeat the alarm on the selected day of the month"
 msgstr ""
 
-#: editdlgtypes.cpp:1323
-#, kde-format
-msgctxt "@info"
-msgid "Invalid email address: <email>%1</email>"
+#: recurrenceedit.cpp:1363
+msgctxt "@item:inlistbox Last day of month"
+msgid "Last"
 msgstr ""
 
-#: editdlgtypes.cpp:1330
-msgctxt "@info"
-msgid "No email address specified"
+#: recurrenceedit.cpp:1366
+msgctxt "@info:whatsthis"
+msgid "Select the day of the month on which to repeat the alarm"
 msgstr ""
 
-#: editdlgtypes.cpp:1347
-#, kde-format
-msgctxt "@info"
-msgid "Invalid email attachment: <filename>%1</filename>"
+#: recurrenceedit.cpp:1380
+msgctxt "@option:radio On the 1st Tuesday"
+msgid "On t&he"
 msgstr ""
 
-#: editdlgtypes.cpp:1351
-msgctxt "@info"
+#: recurrenceedit.cpp:1384
+msgctxt "@info:whatsthis"
 msgid ""
-"Do you really want to send the email now to the specified recipient(s)?"
+"Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr ""
 
-#: editdlgtypes.cpp:1352
-msgctxt "@action:button"
-msgid "Confirm Email"
+#: recurrenceedit.cpp:1388
+msgctxt "@item:inlistbox"
+msgid "1st"
 msgstr ""
 
-#: editdlgtypes.cpp:1352
-msgctxt "@action:button"
-msgid "Send"
+#: recurrenceedit.cpp:1389
+msgctxt "@item:inlistbox"
+msgid "2nd"
 msgstr ""
 
-#: editdlgtypes.cpp:1367
-#, kde-format
-msgctxt "@info"
-msgid "Email sent to:<nl/>%1<nl/>Bcc: <email>%2</email>"
+#: recurrenceedit.cpp:1390
+msgctxt "@item:inlistbox"
+msgid "3rd"
 msgstr ""
 
-#: editdlgtypes.cpp:1370
-#, kde-format
-msgctxt "@info"
-msgid "Email sent to:<nl/>%1"
+#: recurrenceedit.cpp:1391
+msgctxt "@item:inlistbox"
+msgid "4th"
 msgstr ""
 
-#: editdlgtypes.cpp:1402
-msgctxt "@title:window"
-msgid "Choose File to Attach"
+#: recurrenceedit.cpp:1392
+msgctxt "@item:inlistbox"
+msgid "5th"
 msgstr ""
 
-#: editdlgtypes.cpp:1475
-msgctxt "@title:window"
-msgid "New Audio Alarm Template"
+#: recurrenceedit.cpp:1393
+msgctxt "@item:inlistbox Last Monday in March"
+msgid "Last"
 msgstr ""
 
-#: editdlgtypes.cpp:1475
-msgctxt "@title:window"
-msgid "Edit Audio Alarm Template"
+#: recurrenceedit.cpp:1394
+msgctxt "@item:inlistbox"
+msgid "2nd Last"
 msgstr ""
 
-#: editdlgtypes.cpp:1476
-msgctxt "@title:window"
-msgid "New Audio Alarm"
+#: recurrenceedit.cpp:1395
+msgctxt "@item:inlistbox"
+msgid "3rd Last"
 msgstr ""
 
-#: editdlgtypes.cpp:1476
-msgctxt "@title:window"
-msgid "Edit Audio Alarm"
+#: recurrenceedit.cpp:1396
+msgctxt "@item:inlistbox"
+msgid "4th Last"
 msgstr ""
 
-#: editdlgtypes.cpp:1629
-msgctxt "@info:whatsthis"
-msgid ""
-"Check to enter the contents of a script instead of a shell command line"
+#: recurrenceedit.cpp:1397
+msgctxt "@item:inlistbox"
+msgid "5th Last"
 msgstr ""
 
-#: editdlgtypes.cpp:1635
-msgctxt "@info:whatsthis"
-msgid "Enter a shell command to execute."
+#: recurrenceedit.cpp:1400
+msgctxt "@item:inlistbox Every (Monday...) in month"
+msgid "Every"
 msgstr ""
 
-#: editdlgtypes.cpp:1640
+#: recurrenceedit.cpp:1403
 msgctxt "@info:whatsthis"
-msgid "Enter the contents of a script to execute"
-msgstr ""
-
-#: editdlgtypes.cpp:1696
-msgctxt "@info"
-msgid "Please enter a command or script to execute"
+msgid "Select the week of the month in which to repeat the alarm"
 msgstr ""
 
-#: messagewin.cpp:421
-msgctxt "@title:window"
-msgid "Reminder"
+#: recurrenceedit.cpp:1418
+msgctxt "@info:whatsthis"
+msgid "Select the day of the week on which to repeat the alarm"
 msgstr ""
 
-#: messagewin.cpp:421 messagewin.cpp:844
-msgctxt "@title:window"
-msgid "Message"
+#: recurrenceedit.cpp:1541
+msgctxt "@label Time unit for user-entered number"
+msgid "month(s)"
 msgstr ""
 
-#: messagewin.cpp:439
+#: recurrenceedit.cpp:1542
 msgctxt "@info:whatsthis"
-msgid ""
-"The scheduled date/time for the message (as opposed to the actual time of "
-"display)."
+msgid "Enter the number of months between repetitions of the alarm"
 msgstr ""
 
-#: messagewin.cpp:446
-msgctxt "@info"
-msgid "Reminder"
+#: recurrenceedit.cpp:1553
+msgctxt "@label Time unit for user-entered number"
+msgid "year(s)"
 msgstr ""
 
-#: messagewin.cpp:470
+#: recurrenceedit.cpp:1554
 msgctxt "@info:whatsthis"
-msgid "The file whose contents are displayed below"
+msgid "Enter the number of years between repetitions of the alarm"
 msgstr ""
 
-#: messagewin.cpp:526
-msgctxt "@info:whatsthis"
-msgid "The contents of the file to be displayed"
+#: recurrenceedit.cpp:1561
+msgctxt "@label List of months to select"
+msgid "Months:"
 msgstr ""
 
-#: messagewin.cpp:534
-msgctxt "@info"
-msgid "File is a folder"
+#: recurrenceedit.cpp:1583
+msgctxt "@info:whatsthis"
+msgid "Select the months of the year in which to repeat the alarm"
 msgstr ""
 
-#: messagewin.cpp:534
-msgctxt "@info"
-msgid "Failed to open file"
+#: recurrenceedit.cpp:1592
+msgctxt "@label:listbox"
+msgid "February 2&9th alarm in non-leap years:"
 msgstr ""
 
-#: messagewin.cpp:534
-msgctxt "@info"
-msgid "File not found"
+#: recurrenceedit.cpp:1596
+msgctxt "@item:inlistbox No date"
+msgid "None"
 msgstr ""
 
-#: messagewin.cpp:554
-msgctxt "@info:whatsthis"
-msgid "The alarm message"
+#: recurrenceedit.cpp:1597
+msgctxt "@item:inlistbox 1st March (short form)"
+msgid "1 Mar"
 msgstr ""
 
-#: messagewin.cpp:581
-msgctxt "@info:whatsthis"
-msgid "The output of the alarm's command"
+#: recurrenceedit.cpp:1598
+msgctxt "@item:inlistbox 28th February (short form)"
+msgid "28 Feb"
 msgstr ""
 
-#: messagewin.cpp:623
+#: recurrenceedit.cpp:1604
 msgctxt "@info:whatsthis"
-msgid "The email to send"
+msgid ""
+"Select which date, if any, the February 29th alarm should trigger in non-"
+"leap years"
 msgstr ""
 
-#: messagewin.cpp:629
-msgctxt "@info Email addressee"
-msgid "To:"
+#: recurrenceedit.cpp:1688
+msgctxt "@info"
+msgid "No month selected"
 msgstr ""
 
-#: messagewin.cpp:636
-msgctxt "@info Email subject"
-msgid "Subject:"
-msgstr ""
+#: fontcolour.h:39
+msgid "Requested font"
+msgstr "Wynebfath a ddymunwyd"
 
-#: messagewin.cpp:662
+#: templatedlg.cpp:69
 msgctxt "@title:window"
-msgid "Error"
+msgid "Alarm Templates"
 msgstr ""
 
-#: messagewin.cpp:682
-msgctxt "@option:check"
-msgid "Do not display this error message again for this alarm"
+#: templatedlg.cpp:103
+msgctxt "@action:button"
+msgid "New"
+msgstr ""
+
+#: templatedlg.cpp:104
+msgctxt "@action"
+msgid "New"
 msgstr ""
 
-#: messagewin.cpp:701
+#: templatedlg.cpp:107
 msgctxt "@info:whatsthis"
-msgid "Acknowledge the alarm"
+msgid "Create a new alarm template"
 msgstr ""
 
-#: messagewin.cpp:706
+#: templatedlg.cpp:110 resourceselector.cpp:136
 msgctxt "@action:button"
-msgid "&Edit..."
+msgid "Edit..."
 msgstr ""
 
-#: messagewin.cpp:711
+#: templatedlg.cpp:112
 msgctxt "@info:whatsthis"
-msgid "Edit the alarm."
+msgid "Edit the currently highlighted alarm template"
 msgstr ""
 
-#: messagewin.cpp:715
+#: templatedlg.cpp:115
 msgctxt "@action:button"
-msgid "&Defer..."
+msgid "Copy"
 msgstr ""
 
-#: messagewin.cpp:720
+#: templatedlg.cpp:117
 msgctxt "@info:whatsthis"
 msgid ""
-"<para>Defer the alarm until later.</para><para>You will be prompted to "
-"specify when the alarm should be redisplayed.</para>"
-msgstr ""
-
-#: messagewin.cpp:750
-msgctxt "@info:tooltip Locate this email in KMail"
-msgid "Locate in <application>KMail</application>"
+"Create a new alarm template based on a copy of the currently highlighted "
+"template"
 msgstr ""
 
-#: messagewin.cpp:751
+#: templatedlg.cpp:122
 msgctxt "@info:whatsthis"
-msgid "Locate and highlight this email in <application>KMail</application>"
+msgid "Delete the currently highlighted alarm template"
 msgstr ""
 
-#: messagewin.cpp:760
-msgctxt "@info:tooltip"
-msgid "Activate <application>KAlarm</application>"
+#: templatedlg.cpp:211
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to delete the selected alarm template?"
+msgid_plural "Do you really want to delete the %1 selected alarm templates?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templatedlg.cpp:213
+msgctxt "@title:window"
+msgid "Delete Alarm Template"
+msgid_plural "Delete Alarm Templates"
+msgstr[0] ""
+msgstr[1] ""
+
+#: fontcolourbutton.cpp:43
+msgctxt "@action:button"
+msgid "Font && Color..."
 msgstr ""
 
-#: messagewin.cpp:761
+#: fontcolourbutton.cpp:47
 msgctxt "@info:whatsthis"
-msgid "Activate <application>KAlarm</application>"
+msgid ""
+"Choose the font, and foreground and background color, for the alarm message."
 msgstr ""
 
-#: messagewin.cpp:921
-msgctxt "@info"
-msgid "Today"
+#: fontcolourbutton.cpp:71
+msgctxt "@title:window"
+msgid "Choose Alarm Font & Color"
 msgstr ""
 
-#: messagewin.cpp:923
+#: commandoptions.cpp:186
 #, kde-format
-msgctxt "@info"
-msgid "Tomorrow"
-msgid_plural "in %1 days' time"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info:shell"
+msgid "<icode>%1</icode>: invalid email address"
+msgstr ""
 
-#: messagewin.cpp:925
+#: commandoptions.cpp:303 commandoptions.cpp:318 commandoptions.cpp:394
 #, kde-format
-msgctxt "@info"
-msgid "in 1 week's time"
-msgid_plural "in %1 weeks' time"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info:shell"
+msgid "Invalid <icode>%1</icode> parameter for date-only alarm"
+msgstr ""
 
-#: messagewin.cpp:939
+#: commandoptions.cpp:307
 #, kde-format
-msgctxt "@info"
-msgid "in 1 minute's time"
-msgid_plural "in %1 minutes' time"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info:shell"
+msgid "<icode>%1</icode> earlier than <icode>%2</icode>"
+msgstr ""
 
-#: messagewin.cpp:941
+#: commandoptions.cpp:327
 #, kde-format
-msgctxt "@info"
-msgid "in 1 hour's time"
-msgid_plural "in %1 hours' time"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info:shell"
+msgid ""
+"Invalid <icode>%1</icode> and <icode>%2</icode> parameters: repetition is "
+"longer than <icode>%3</icode> interval"
+msgstr ""
 
-#: messagewin.cpp:944
+#: commandoptions.cpp:377
 #, kde-format
-msgctxt "@item:intext inserted into 'in ... %1 minute's time' below"
-msgid "1 hour"
-msgid_plural "%1 hours"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info:shell"
+msgid ""
+"<icode>%1</icode> requires speech synthesis to be configured using Jovie"
+msgstr ""
+
+#: commandoptions.cpp:479
+msgctxt "@info:shell"
+msgid ": option(s) only valid with an appropriate action option or message"
+msgstr ""
+
+#: commandoptions.cpp:499
+msgctxt "@info:shell"
+msgid ""
+"\n"
+"Use --help to get a list of available command line options.\n"
+msgstr ""
+
+#: commandoptions.cpp:528
+#, kde-format
+msgctxt "@info:shell"
+msgid "<icode>%1</icode> requires <icode>%2</icode>"
+msgstr ""
 
-#: messagewin.cpp:945
+#: commandoptions.cpp:530
 #, kde-format
-msgctxt "@info '%2' is the previous message '1 hour'/'%1 hours'"
-msgid "in %2 1 minute's time"
-msgid_plural "in %2 %1 minutes' time"
-msgstr[0] ""
-msgstr[1] ""
-
-#: messagewin.cpp:1430 messagewin.cpp:1440
-msgctxt "@info"
-msgid "Unable to speak message"
+msgctxt "@info:shell"
+msgid "<icode>%1</icode> requires <icode>%2</icode> or <icode>%3</icode>"
 msgstr ""
 
-#: messagewin.cpp:1440
-msgctxt "@info"
-msgid "D-Bus call say() failed"
+#: commandoptions.cpp:535
+#, kde-format
+msgctxt "@info:shell"
+msgid "Invalid <icode>%1</icode> parameter"
 msgstr ""
 
-#: messagewin.cpp:1578
+#: commandoptions.cpp:546
 #, kde-format
-msgctxt "@info"
-msgid "Cannot open audio file: <filename>%1</filename>"
+msgctxt "@info:shell"
+msgid "<icode>%1</icode> incompatible with <icode>%2</icode>"
 msgstr ""
 
-#: messagewin.cpp:1657
+#: kalarmapp.cpp:345
 #, kde-format
-msgctxt "@info"
+msgctxt "@info:shell"
 msgid ""
-"<para>Error playing audio file: <filename>%1</filename></para><para>%2</para>"
+"<icode>%1</icode>: Event <resource>%2</resource> not found, or not editable"
 msgstr ""
 
-#: messagewin.cpp:1986
+#: kalarmapp.cpp:523
 msgctxt "@info"
-msgid "Do you really want to acknowledge this alarm?"
+msgid ""
+"Time zones are not accessible:<nl/>KAlarm will use the UTC time "
+"zone.<nl/><nl/>(The KDE time zone service is not available:<nl/>check that "
+"<application>ktimezoned</application> is installed.)"
 msgstr ""
 
-#: messagewin.cpp:1987
-msgctxt "@action:button"
-msgid "Acknowledge Alarm"
+#: kalarmapp.cpp:600
+msgctxt "@info"
+msgid ""
+"Quitting will disable alarms (once any alarm message windows are closed)."
 msgstr ""
 
-#: messagewin.cpp:1987
-msgctxt "@action:button"
-msgid "Acknowledge"
+#: kalarmapp.cpp:608
+msgctxt "@info"
+msgid "Quitting will cancel the scheduled Wake from Suspend."
 msgstr ""
 
-#: messagewin.cpp:2034
+#: kalarmapp.cpp:620
 msgctxt "@info"
-msgid "Unable to locate this email in <application>KMail</application>"
+msgid ""
+"Do you want to start KAlarm at login?<nl/>(Note that alarms will be disabled "
+"if KAlarm is not started.)"
 msgstr ""
 
-#: messagewin.cpp:2204
+#: kalarmapp.cpp:2034
 msgctxt "@info"
-msgid "<para>Cannot defer alarm:</para><para>Alarm not found.</para>"
+msgid "Error creating temporary script file"
 msgstr ""
 
-#: editdlg.cpp:97
-#, kde-format
-msgctxt "@title:tab"
-msgid "Recurrence - [%1]"
+#: kalarmapp.cpp:2122
+msgctxt "@info"
+msgid "Pre-alarm action:"
 msgstr ""
 
-#: editdlg.cpp:102
-msgctxt "@option:check"
-msgid "Show in KOrganizer"
+#: kalarmapp.cpp:2128
+msgctxt "@info"
+msgid "Post-alarm action:"
 msgstr ""
 
-#: editdlg.cpp:238
-msgctxt "@title:window"
-msgid "Alarm Template [read-only]"
+#: traywindow.cpp:98
+msgctxt "@action"
+msgid "&New Alarm"
 msgstr ""
 
-#: editdlg.cpp:239
-msgctxt "@title:window"
-msgid "Archived Alarm [read-only]"
+#: traywindow.cpp:274
+msgid "Disabled"
 msgstr ""
 
-#: editdlg.cpp:240
-msgctxt "@title:window"
-msgid "Alarm [read-only]"
+#: traywindow.cpp:279
+msgctxt "@info:tooltip Brief: some alarms are disabled"
+msgid "(Some alarms disabled)"
 msgstr ""
 
-#: editdlg.cpp:246
-msgctxt "@action:button"
-msgid "Load Template..."
+#: traywindow.cpp:356
+#, kde-format
+msgctxt "@info/plain prefix + hours:minutes"
+msgid "(%1%2:%3)"
 msgstr ""
 
-#: editdlg.cpp:260
-msgctxt "@label:textbox"
-msgid "Template name:"
+#: traywindow.cpp:358
+#, kde-format
+msgctxt "@info/plain prefix + hours:minutes"
+msgid "%1%2:%3"
 msgstr ""
 
-#: editdlg.cpp:266
-msgctxt "@info:whatsthis"
-msgid "Enter the name of the alarm template"
+#: alarmtimewidget.cpp:52
+msgctxt "@info/plain"
+msgid ""
+"Enter the length of time (in hours and minutes) after the current time to "
+"schedule the alarm."
 msgstr ""
 
-#: editdlg.cpp:273
-msgctxt "@title:tab"
-msgid "Alarm"
+#: alarmtimewidget.cpp:84
+msgctxt "@info/plain"
+msgid ""
+"If a recurrence is configured, the start date/time will be adjusted to the "
+"first recurrence on or after the entered date/time."
 msgstr ""
 
-#: editdlg.cpp:297
-msgctxt "@title:group"
-msgid "Action"
+#: alarmtimewidget.cpp:87
+msgctxt "@info/plain"
+msgid ""
+"This uses KAlarm's default time zone, set in the Configuration dialog."
 msgstr ""
 
-#: editdlg.cpp:308
-msgctxt "@title:group"
-msgid "Deferred Alarm"
+#: alarmtimewidget.cpp:108
+msgctxt "@option:radio"
+msgid "Defer to date/time:"
 msgstr ""
 
-#: editdlg.cpp:313
-msgctxt "@label"
-msgid "Deferred to:"
+#: alarmtimewidget.cpp:108
+msgctxt "@option:radio"
+msgid "At date/time:"
 msgstr ""
 
-#: editdlg.cpp:319
-msgctxt "@action:button"
-msgid "Change..."
+#: alarmtimewidget.cpp:110
+msgctxt "@info:whatsthis"
+msgid "Reschedule the alarm to the specified date and time."
 msgstr ""
 
-#: editdlg.cpp:322
+#: alarmtimewidget.cpp:111
 msgctxt "@info:whatsthis"
-msgid "Change the alarm's deferred time, or cancel the deferral"
+msgid "Specify the date, or date and time, to schedule the alarm."
 msgstr ""
 
-#: editdlg.cpp:334 editdlg.cpp:401
-msgctxt "@title:group"
-msgid "Time"
+#: alarmtimewidget.cpp:119
+#, kde-format
+msgctxt "@info:whatsthis"
+msgid "<para>Enter the date to schedule the alarm.</para><para>%1</para>"
 msgstr ""
 
-#: editdlg.cpp:343
-msgctxt "@option:radio"
-msgid "Default time"
+#: alarmtimewidget.cpp:130
+#, kde-format
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>Enter the time to schedule the "
+"alarm.</para><para>%1</para><para>%2</para>"
 msgstr ""
 
-#: editdlg.cpp:346
+#: alarmtimewidget.cpp:147
 msgctxt "@info:whatsthis"
 msgid ""
-"Do not specify a start time for alarms based on this template. The normal "
-"default start time will be used."
+"Check to specify only a date (without a time) for the alarm. The alarm will "
+"trigger at the first opportunity on the selected date."
 msgstr ""
 
-#: editdlg.cpp:354
+#: alarmtimewidget.cpp:151
 msgctxt "@option:radio"
-msgid "Time:"
+msgid "Defer for time interval:"
 msgstr ""
 
-#: editdlg.cpp:357
+#: alarmtimewidget.cpp:153
 msgctxt "@info:whatsthis"
-msgid "Specify a start time for alarms based on this template."
+msgid "Reschedule the alarm for the specified time interval after now."
+msgstr ""
+
+#: alarmtimewidget.cpp:154
+msgctxt "@info:whatsthis"
+msgid "Schedule the alarm after the specified time interval from now."
 msgstr ""
 
-#: editdlg.cpp:363
+#: alarmtimewidget.cpp:163
 #, kde-format
 msgctxt "@info:whatsthis"
-msgid ""
-"<para>Enter the start time for alarms based on this "
-"template.</para><para>%1</para>"
+msgid "<para>%1</para><para>%2</para><para>%3</para>"
 msgstr ""
 
-#: editdlg.cpp:370
-msgctxt "@option:radio"
-msgid "Date only"
+#: alarmtimewidget.cpp:193
+msgctxt "@action:button"
+msgid "Time Zone..."
 msgstr ""
 
-#: editdlg.cpp:373
+#: alarmtimewidget.cpp:196
 msgctxt "@info:whatsthis"
 msgid ""
-"Set the <interface>Any time</interface> option for alarms based on this "
-"template."
+"Choose a time zone for this alarm which is different from the default time "
+"zone set in KAlarm's configuration dialog."
 msgstr ""
 
-#: editdlg.cpp:380 alarmtimewidget.cpp:150
-msgctxt "@option:radio"
-msgid "Time from now:"
+#: alarmtimewidget.cpp:210 prefdlg.cpp:616
+msgctxt "@label:listbox"
+msgid "Time zone:"
 msgstr ""
 
-#: editdlg.cpp:384
+#: alarmtimewidget.cpp:214
 msgctxt "@info:whatsthis"
-msgid ""
-"Set alarms based on this template to start after the specified time interval "
-"from when the alarm is created."
+msgid "Select the time zone to use for this alarm."
 msgstr ""
 
-#: editdlg.cpp:392 alarmtimewidget.cpp:161
-#, kde-format
+#: alarmtimewidget.cpp:219
+msgctxt "@option:check"
+msgid "Ignore time zone"
+msgstr ""
+
+#: alarmtimewidget.cpp:222
 msgctxt "@info:whatsthis"
-msgid "<para>%1</para><para>%2</para>"
+msgid ""
+"<para>Check to use the local computer time, ignoring time "
+"zones.</para><para>You are recommended not to use this option if the alarm "
+"has a recurrence specified in hours/minutes. If you do, the alarm may occur "
+"at unexpected times after daylight saving time shifts.</para>"
+msgstr ""
+
+#: alarmtimewidget.cpp:293 alarmtimewidget.cpp:319
+msgctxt "@info"
+msgid "Invalid time"
+msgstr ""
+
+#: alarmtimewidget.cpp:312
+msgctxt "@info"
+msgid "Invalid date"
+msgstr ""
+
+#: alarmtimewidget.cpp:333
+msgctxt "@info"
+msgid "Alarm date has already expired"
+msgstr ""
+
+#: alarmtimewidget.cpp:345
+msgctxt "@info"
+msgid "Alarm time has already expired"
+msgstr ""
+
+#: deferdlg.cpp:44
+msgctxt "@title:window"
+msgid "Defer Alarm"
+msgstr ""
+
+#: deferdlg.cpp:46
+msgctxt "@action:button"
+msgid "Cancel Deferral"
 msgstr ""
 
-#: editdlg.cpp:450
+#: deferdlg.cpp:65
 msgctxt "@info:whatsthis"
-msgid "Check to copy the alarm into KOrganizer's calendar"
+msgid "Defer the alarm until the specified time."
 msgstr ""
 
-#: editdlg.cpp:454
+#: deferdlg.cpp:66
 msgctxt "@info:whatsthis"
-msgid "Schedule the alarm at the specified time."
+msgid "Cancel the deferred alarm. This does not affect future recurrences."
 msgstr ""
 
-#: editdlg.cpp:952
+#: deferdlg.cpp:98
+#, kde-format
 msgctxt "@info"
-msgid "You must enter a name for the alarm template"
+msgid "Cannot defer past the alarm's next sub-repetition (currently %1)"
 msgstr ""
 
-#: editdlg.cpp:956
+#: deferdlg.cpp:102
+#, kde-format
 msgctxt "@info"
-msgid "Template name is already in use"
+msgid "Cannot defer past the alarm's next recurrence (currently %1)"
 msgstr ""
 
-#: editdlg.cpp:1002
+#: deferdlg.cpp:106
 #, kde-format
-msgctxt "@info The parameter is a date value"
-msgid ""
-"The start date does not match the alarm's recurrence pattern, so it will be "
-"adjusted to the date of the next recurrence (%1)."
+msgctxt "@info"
+msgid "Cannot defer past the alarm's next reminder (currently %1)"
 msgstr ""
 
-#: editdlg.cpp:1006
+#: deferdlg.cpp:110
 #, kde-format
-msgctxt "@info The parameter is a date/time value"
-msgid ""
-"The start date/time does not match the alarm's recurrence pattern, so it "
-"will be adjusted to the date/time of the next recurrence (%1)."
+msgctxt "@info"
+msgid "Cannot defer reminder past the main alarm time (%1)"
 msgstr ""
 
-#: editdlg.cpp:1033
+#: akonadiresourcecreator.cpp:109
+msgctxt "@info/plain"
+msgid "Failed to create new calendar resource"
+msgstr ""
+
+#: akonadiresourcecreator.cpp:109 calendarmigrator.cpp:456
+#: akonadimodel.cpp:1156 akonadimodel.cpp:1207 akonadimodel.cpp:1509
+#, kde-format
 msgctxt "@info"
-msgid "Recurrence has already expired"
+msgid "%1<nl/>(%2)"
+msgstr ""
+
+#: resources/resourcelocaldir.cpp:485 akonadimodel.cpp:949
+msgctxt "@info/plain Directory in filesystem"
+msgid "Directory"
+msgstr ""
+
+#: resources/resourcelocaldirwidget.cpp:40
+#: resources/resourcelocalwidget.cpp:42
+msgctxt "@label:textbox"
+msgid "Location:"
 msgstr ""
 
-#: editdlg.cpp:1038
+#: resources/resourcelocaldirwidget.cpp:72
+#: resources/resourcelocalwidget.cpp:77
 msgctxt "@info"
-msgid "The alarm will never occur during working hours"
+msgid "No location specified.  The calendar will be invalid."
+msgstr ""
+
+#: resources/alarmresource.cpp:354 resourceselector.cpp:856
+msgctxt "@info/plain"
+msgid "Active alarms"
+msgstr ""
+
+#: resources/alarmresource.cpp:355 resourceselector.cpp:858
+msgctxt "@info/plain"
+msgid "Archived alarms"
+msgstr ""
+
+#: resources/alarmresource.cpp:356 resourceselector.cpp:860
+msgctxt "@info/plain"
+msgid "Alarm templates"
+msgstr ""
+
+#: resources/alarmresource.cpp:359 resourceselector.cpp:865
+msgctxt "@info/plain"
+msgid "Read-write"
+msgstr ""
+
+#: resources/alarmresource.cpp:360 resourceselector.cpp:867
+msgctxt "@info/plain"
+msgid "Enabled"
 msgstr ""
 
-#: editdlg.cpp:1067
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Reminder period must be less than the recurrence interval, unless "
-"<interface>%1</interface> is checked."
+#: resources/alarmresource.cpp:361 resourceselector.cpp:870
+msgctxt "@info/plain Parameter in 'Default calendar: Yes/No'"
+msgid "Yes"
 msgstr ""
 
-#: editdlg.cpp:1082
-msgctxt "@info"
-msgid ""
-"The duration of a repetition within the recurrence must be less than the "
-"recurrence interval minus any reminder period"
+#: resources/alarmresource.cpp:361 resourceselector.cpp:871
+msgctxt "@info/plain Parameter in 'Default calendar: Yes/No'"
+msgid "No"
 msgstr ""
 
-#: editdlg.cpp:1089
+#: resources/alarmresource.cpp:363
+#, kde-format
 msgctxt "@info"
 msgid ""
-"For a repetition within the recurrence, its period must be in units of days "
-"or weeks for a date-only alarm"
+"<title>%1</title><para>Calendar type: %2<nl/>Contents: %3<nl/>%4: "
+"<filename>%5</filename><nl/>Permissions: %6<nl/>Status: %7<nl/>Default "
+"calendar: %8</para>"
 msgstr ""
 
-#: editdlg.cpp:1121 editdlg.cpp:1150
-msgctxt "@info"
-msgid "You must select a calendar to save the alarm in"
+#: resources/resourceremotewidget.cpp:42
+msgctxt "@label:textbox"
+msgid "Download from:"
 msgstr ""
 
-#: editdlg.cpp:1245
-msgctxt "@action:button"
-msgid "Less Options <<"
+#: resources/resourceremotewidget.cpp:48
+msgctxt "@label:textbox"
+msgid "Upload to:"
 msgstr ""
 
-#: editdlg.cpp:1250
-msgctxt "@action:button"
-msgid "More Options >>"
+#: resources/resourceremotewidget.cpp:94
+msgctxt "@info"
+msgid ""
+"You have specified no upload URL: the alarm calendar will be read-only."
 msgstr ""
 
-#: calendarmigrator.cpp:205
-#, kde-format
+#: resources/resourceremote.cpp:365 akonadimodel.cpp:948
 msgctxt "@info/plain"
-msgid "Failed to create default calendar <resource>%1</resource>"
+msgid "URL"
 msgstr ""
 
-#: calendarmigrator.cpp:207
+#: resources/resourcewidget.cpp:54
 #, kde-format
-msgctxt "@info/plain 'Import Alarms' is the name of a menu option"
+msgctxt "@info"
 msgid ""
-"Failed to convert old configuration for calendar <resource>%1</resource>. "
-"Please use Import Alarms to load its alarms into a new or existing calendar."
+"Calendar <resource>%1</resource> cannot be made writable since it either was "
+"not created by <application>KAlarm</application>, or was created by a newer "
+"version of <application>KAlarm</application>"
 msgstr ""
 
-#: calendarmigrator.cpp:209
-#, kde-format
-msgctxt "@info/plain File path or URL"
-msgid "Location: %1"
+#: resources/resourcelocal.cpp:269 akonadimodel.cpp:950
+msgctxt "@info/plain"
+msgid "File"
 msgstr ""
 
-#: calendarmigrator.cpp:211
+#: resources/alarmresources.cpp:159
 #, kde-format
 msgctxt "@info"
-msgid "<para>%1</para><para>%2</para>"
+msgid "%1: invalid calendar file name: <filename>%2</filename>"
 msgstr ""
 
-#: calendarmigrator.cpp:213
+#: resources/alarmresources.cpp:167
 #, kde-format
 msgctxt "@info"
-msgid "<para>%1</para><para>%2<nl/>(%3)</para>"
+msgid "%1: file name not permitted: <filename>%2</filename>"
 msgstr ""
 
-#: calendarmigrator.cpp:438
-msgctxt "@info/plain"
-msgid "New configuration timed out"
+#: eventlistview.cpp:51
+msgctxt "@info:whatsthis"
+msgid "List of scheduled alarms"
 msgstr ""
 
-#: calendarmigrator.cpp:451
-msgctxt "@info/plain"
-msgid "New configuration was corrupt"
+#: functions.cpp:180
+msgctxt "@action"
+msgid "Enable &Alarms"
 msgstr ""
 
-#: alarmtimewidget.cpp:52
-msgctxt "@info/plain"
-msgid ""
-"Enter the length of time (in hours and minutes) after the current time to "
-"schedule the alarm."
+#: functions.cpp:193
+msgctxt "@action"
+msgid "Stop Play"
 msgstr ""
 
-#: alarmtimewidget.cpp:84
-msgctxt "@info/plain"
-msgid ""
-"If a recurrence is configured, the start date/time will be adjusted to the "
-"first recurrence on or after the entered date/time."
+#: functions.cpp:206
+msgctxt "@action"
+msgid "Spread Windows"
 msgstr ""
 
-#: alarmtimewidget.cpp:87
-msgctxt "@info/plain"
-msgid ""
-"This uses KAlarm's default time zone, set in the Configuration dialog."
+#: functions.cpp:1072
+msgctxt "@info"
+msgid "Error saving alarms"
 msgstr ""
 
-#: alarmtimewidget.cpp:108
-msgctxt "@option:radio"
-msgid "Defer to date/time:"
+#: functions.cpp:1073
+msgctxt "@info"
+msgid "Error saving alarm"
 msgstr ""
 
-#: alarmtimewidget.cpp:108
-msgctxt "@option:radio"
-msgid "At date/time:"
+#: functions.cpp:1076
+msgctxt "@info"
+msgid "Error deleting alarms"
 msgstr ""
 
-#: alarmtimewidget.cpp:110
-msgctxt "@info:whatsthis"
-msgid "Reschedule the alarm to the specified date and time."
+#: functions.cpp:1077
+msgctxt "@info"
+msgid "Error deleting alarm"
 msgstr ""
 
-#: alarmtimewidget.cpp:111
-msgctxt "@info:whatsthis"
-msgid "Specify the date, or date and time, to schedule the alarm."
+#: functions.cpp:1080
+msgctxt "@info"
+msgid "Error saving reactivated alarms"
 msgstr ""
 
-#: alarmtimewidget.cpp:118
-#, kde-format
-msgctxt "@info:whatsthis"
-msgid "<para>Enter the date to schedule the alarm.</para><para>%1</para>"
+#: functions.cpp:1081
+msgctxt "@info"
+msgid "Error saving reactivated alarm"
 msgstr ""
 
-#: alarmtimewidget.cpp:129
-#, kde-format
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>Enter the time to schedule the "
-"alarm.</para><para>%1</para><para>%2</para>"
+#: functions.cpp:1084
+msgctxt "@info"
+msgid "Error saving alarm templates"
 msgstr ""
 
-#: alarmtimewidget.cpp:142 recurrenceedit.cpp:296
-msgctxt "@option:check"
-msgid "Any time"
+#: functions.cpp:1085
+msgctxt "@info"
+msgid "Error saving alarm template"
 msgstr ""
 
-#: alarmtimewidget.cpp:146
-msgctxt "@info:whatsthis"
-msgid ""
-"Check to specify only a date (without a time) for the alarm. The alarm will "
-"trigger at the first opportunity on the selected date."
+#: functions.cpp:1104
+msgctxt "@info"
+msgid "Unable to show alarms in KOrganizer"
 msgstr ""
 
-#: alarmtimewidget.cpp:150
-msgctxt "@option:radio"
-msgid "Defer for time interval:"
+#: functions.cpp:1105
+msgctxt "@info"
+msgid "Unable to show alarm in KOrganizer"
 msgstr ""
 
-#: alarmtimewidget.cpp:152
-msgctxt "@info:whatsthis"
-msgid "Reschedule the alarm for the specified time interval after now."
+#: functions.cpp:1108
+msgctxt "@info"
+msgid "Unable to update alarm in KOrganizer"
 msgstr ""
 
-#: alarmtimewidget.cpp:153
-msgctxt "@info:whatsthis"
-msgid "Schedule the alarm after the specified time interval from now."
+#: functions.cpp:1111
+msgctxt "@info"
+msgid "Unable to delete alarms from KOrganizer"
+msgstr ""
+
+#: functions.cpp:1112
+msgctxt "@info"
+msgid "Unable to delete alarm from KOrganizer"
 msgstr ""
 
-#: alarmtimewidget.cpp:162
+#: functions.cpp:1119
 #, kde-format
-msgctxt "@info:whatsthis"
-msgid "<para>%1</para><para>%2</para><para>%3</para>"
+msgctxt "@info"
+msgid "<para>%1</para><para>(KOrganizer not fully started)</para>"
 msgstr ""
 
-#: alarmtimewidget.cpp:192
-msgctxt "@action:button"
-msgid "Time Zone..."
+#: functions.cpp:1121
+#, kde-format
+msgctxt "@info"
+msgid "<para>%1</para><para>(Error communicating with KOrganizer)</para>"
 msgstr ""
 
-#: alarmtimewidget.cpp:195
-msgctxt "@info:whatsthis"
-msgid ""
-"Choose a time zone for this alarm which is different from the default time "
-"zone set in KAlarm's configuration dialog."
+#: functions.cpp:1341
+msgctxt "info"
+msgid "The scheduled Wake from Suspend has been cancelled."
 msgstr ""
 
-#: alarmtimewidget.cpp:209 prefdlg.cpp:613
-msgctxt "@label:listbox"
-msgid "Time zone:"
+#: functions.cpp:1385
+#, kde-format
+msgctxt "@info"
+msgid "Error obtaining authorization (%1)"
 msgstr ""
 
-#: alarmtimewidget.cpp:213
-msgctxt "@info:whatsthis"
-msgid "Select the time zone to use for this alarm."
+#: functions.cpp:1410
+msgctxt "@info"
+msgid "You must enable a template calendar to save the template in"
 msgstr ""
 
-#: alarmtimewidget.cpp:218
-msgctxt "@option:check"
-msgid "Ignore time zone"
+#: functions.cpp:1686
+#, kde-format
+msgctxt "@info Please set the 'From' email address..."
+msgid ""
+"<para>%1</para><para>Please set it in the Configuration dialog.</para>"
 msgstr ""
 
-#: alarmtimewidget.cpp:221
-msgctxt "@info:whatsthis"
+#: functions.cpp:1690
+msgctxt "@info"
 msgid ""
-"<para>Check to use the local computer time, ignoring time "
-"zones.</para><para>You are recommended not to use this option if the alarm "
-"has a recurrence specified in hours/minutes. If you do, the alarm may occur "
-"at unexpected times after daylight saving time shifts.</para>"
+"<para>Alarms are currently disabled.</para><para>Do you want to enable "
+"alarms now?</para>"
+msgstr ""
+
+#: functions.cpp:1691
+msgctxt "@action:button"
+msgid "Enable"
+msgstr ""
+
+#: functions.cpp:1691
+msgctxt "@action:button"
+msgid "Keep Disabled"
 msgstr ""
 
-#: alarmtimewidget.cpp:292 alarmtimewidget.cpp:318
+#: functions.cpp:1762
+#, kde-format
 msgctxt "@info"
-msgid "Invalid time"
+msgid ""
+"Unable to start <application>KMail</application><nl/>(<message>%1</message>)"
 msgstr ""
 
-#: alarmtimewidget.cpp:311
+#: functions.cpp:2071
 msgctxt "@info"
-msgid "Invalid date"
+msgid "Please select a file to display"
 msgstr ""
 
-#: alarmtimewidget.cpp:332
+#: functions.cpp:2073
 msgctxt "@info"
-msgid "Alarm date has already expired"
+msgid "Please select a file to play"
 msgstr ""
 
-#: alarmtimewidget.cpp:344
+#: functions.cpp:2079
+#, kde-format
 msgctxt "@info"
-msgid "Alarm time has already expired"
+msgid "<filename>%1</filename> is a folder"
 msgstr ""
 
-#: fontcolour.cpp:71
-msgctxt "@label:listbox"
-msgid "Foreground color:"
+#: functions.cpp:2081
+#, kde-format
+msgctxt "@info"
+msgid "<filename>%1</filename> not found"
 msgstr ""
 
-#: fontcolour.cpp:76
-msgctxt "@info:whatsthis"
-msgid "Select the alarm message foreground color"
+#: functions.cpp:2082
+#, kde-format
+msgctxt "@info"
+msgid "<filename>%1</filename> is not readable"
 msgstr ""
 
-#: fontcolour.cpp:84
-msgctxt "@label:listbox"
-msgid "Background color:"
+#: functions.cpp:2083
+#, kde-format
+msgctxt "@info"
+msgid "<filename>%1</filename> appears not to be a text or image file"
 msgstr ""
 
-#: fontcolour.cpp:89
-msgctxt "@info:whatsthis"
-msgid "Select the alarm message background color"
+#: functions.cpp:2333
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Calendar <resource>%1</resource> is in an old format "
+"(<application>KAlarm</application> version %2), and will be read-only unless "
+"you choose to update it to the current format."
 msgstr ""
 
-#: fontcolour.cpp:97
-msgctxt "@option:check"
-msgid "Use default font"
+#: functions.cpp:2336
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Some or all of the alarms in calendar <resource>%1</resource> are in an old "
+"<application>KAlarm</application> format, and will be read-only unless you "
+"choose to update them to the current format."
 msgstr ""
 
-#: fontcolour.cpp:100
-msgctxt "@info:whatsthis"
+#: functions.cpp:2339
+#, kde-format
+msgctxt "@info"
 msgid ""
-"Check to use the default font current at the time the alarm is displayed."
+"<para>%1</para><para><warning>Do not update the calendar if it is also used "
+"with an older version of <application>KAlarm</application> (e.g. on another "
+"computer). If you do so, the calendar may become unusable "
+"there.</warning></para><para>Do you wish to update the calendar?</para>"
 msgstr ""
 
-#: prefdlg.cpp:149
+#: prefdlg.cpp:152
 msgctxt "@title:window"
 msgid "Configure"
 msgstr ""
 
-#: prefdlg.cpp:157
+#: prefdlg.cpp:160
 msgctxt "@title:tab General preferences"
 msgid "General"
 msgstr ""
 
-#: prefdlg.cpp:158
+#: prefdlg.cpp:161
 msgctxt "@title General preferences"
 msgid "General"
 msgstr ""
 
-#: prefdlg.cpp:163
+#: prefdlg.cpp:166
 msgctxt "@title:tab"
 msgid "Time & Date"
 msgstr ""
 
-#: prefdlg.cpp:164
+#: prefdlg.cpp:167
 msgctxt "@title"
 msgid "Time and Date"
 msgstr ""
 
-#: prefdlg.cpp:169
+#: prefdlg.cpp:172
 msgctxt "@title:tab"
 msgid "Storage"
 msgstr ""
 
-#: prefdlg.cpp:170
+#: prefdlg.cpp:173
 msgctxt "@title"
 msgid "Alarm Storage"
 msgstr ""
 
-#: prefdlg.cpp:175
+#: prefdlg.cpp:178
 msgctxt "@title:tab Email preferences"
 msgid "Email"
 msgstr ""
 
-#: prefdlg.cpp:176
+#: prefdlg.cpp:179
 msgctxt "@title"
 msgid "Email Alarm Settings"
 msgstr ""
 
-#: prefdlg.cpp:181
+#: prefdlg.cpp:184
 msgctxt "@title:tab"
 msgid "View"
 msgstr ""
 
-#: prefdlg.cpp:182
+#: prefdlg.cpp:185
 msgctxt "@title"
 msgid "View Settings"
 msgstr ""
 
-#: prefdlg.cpp:187
+#: prefdlg.cpp:190
 msgctxt "@title:tab"
 msgid "Edit"
 msgstr ""
 
-#: prefdlg.cpp:188
+#: prefdlg.cpp:191
 msgctxt "@title"
 msgid "Default Alarm Edit Settings"
 msgstr ""
 
-#: prefdlg.cpp:264
+#: prefdlg.cpp:267
 msgctxt "@info"
 msgid ""
 "Reset all tabs to their default values, or only reset the current tab?"
 msgstr ""
 
-#: prefdlg.cpp:266
+#: prefdlg.cpp:269
 msgctxt "@action:button Reset ALL tabs"
 msgid "&All"
 msgstr ""
 
-#: prefdlg.cpp:267
+#: prefdlg.cpp:270
 msgctxt "@action:button Reset the CURRENT tab"
 msgid "C&urrent"
 msgstr ""
 
-#: prefdlg.cpp:411
+#: prefdlg.cpp:414
 msgctxt "@title:group"
 msgid "Run Mode"
 msgstr ""
 
-#: prefdlg.cpp:417
+#: prefdlg.cpp:420
 msgctxt "@option:check"
 msgid "Start at login"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:95
 #. i18n: ectx: whatsthis, entry (AutoStart), group (General)
-#: prefdlg.cpp:420 rc.cpp:50
+#: prefdlg.cpp:423 rc.cpp:122
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Automatically start <application>KAlarm</application> whenever you "
@@ -3272,67 +3569,67 @@
 "intend to discontinue use of <application>KAlarm</application>.</para>"
 msgstr ""
 
-#: prefdlg.cpp:424
+#: prefdlg.cpp:427
 msgctxt "@option:check"
 msgid "Warn before quitting"
 msgstr ""
 
-#: prefdlg.cpp:425
+#: prefdlg.cpp:428
 msgctxt "@info:whatsthis"
 msgid ""
 "Check to display a warning prompt before quitting "
 "<application>KAlarm</application>."
 msgstr ""
 
-#: prefdlg.cpp:433
+#: prefdlg.cpp:436
 msgctxt "@option:check"
 msgid "Confirm alarm deletions"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:379
 #. i18n: ectx: whatsthis, entry (Base_ConfirmAlarmDeletion), group (Notification Messages)
-#: prefdlg.cpp:435 rc.cpp:363
+#: prefdlg.cpp:438 rc.cpp:435
 msgctxt "@info:whatsthis"
 msgid "Check to be prompted for confirmation each time you delete an alarm."
 msgstr ""
 
-#: prefdlg.cpp:443
+#: prefdlg.cpp:446
 msgctxt "@label:spinbox"
 msgid "Default defer time interval:"
 msgstr ""
 
-#: prefdlg.cpp:447
+#: prefdlg.cpp:450
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter the default time interval (hours & minutes) to defer alarms, used by "
 "the Defer Alarm dialog."
 msgstr ""
 
-#: prefdlg.cpp:453
+#: prefdlg.cpp:456
 msgctxt "@title:group"
 msgid "Terminal for Command Alarms"
 msgstr ""
 
-#: prefdlg.cpp:454
+#: prefdlg.cpp:457
 msgctxt "@info:whatsthis"
 msgid ""
 "Choose which application to use when a command alarm is executed in a "
 "terminal window"
 msgstr ""
 
-#: prefdlg.cpp:480
+#: prefdlg.cpp:483
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
 "Check to execute command alarms in a terminal window by <icode>%1</icode>"
 msgstr ""
 
-#: prefdlg.cpp:489
+#: prefdlg.cpp:492
 msgctxt "@option:radio Other terminal window command"
 msgid "Other:"
 msgstr ""
 
-#: prefdlg.cpp:499
+#: prefdlg.cpp:502
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter the full command line needed to execute a command in your chosen "
@@ -3341,13 +3638,13 @@
 "details of special codes to tailor the command line."
 msgstr ""
 
-#: prefdlg.cpp:545
+#: prefdlg.cpp:548
 #, kde-format
 msgctxt "@info"
 msgid "Command to invoke terminal window not found: <command>%1</command>"
 msgstr ""
 
-#: prefdlg.cpp:588
+#: prefdlg.cpp:591
 msgctxt "@info"
 msgid ""
 "You should not uncheck this option unless you intend to discontinue use of "
@@ -3356,40 +3653,40 @@
 
 #. i18n: file: kalarmconfig.kcfg:63
 #. i18n: ectx: whatsthis, entry (Base_TimeZone), group (General)
-#: prefdlg.cpp:626 rc.cpp:14
+#: prefdlg.cpp:629 rc.cpp:86
 msgctxt "@info:whatsthis"
 msgid ""
 "Select the time zone which <application>KAlarm</application> should use as "
 "its default for displaying and entering dates and times."
 msgstr ""
 
-#: prefdlg.cpp:638
+#: prefdlg.cpp:641
 msgctxt "@label:listbox"
 msgid "Holiday region:"
 msgstr ""
 
-#: prefdlg.cpp:645
+#: prefdlg.cpp:648
 msgctxt "@info:whatsthis"
 msgid "Select which holiday region to use"
 msgstr ""
 
-#: prefdlg.cpp:653
+#: prefdlg.cpp:656
 #, kde-format
 msgctxt "Holiday region, region language"
 msgid "%1 (%2)"
 msgstr ""
 
-#: prefdlg.cpp:657
+#: prefdlg.cpp:660
 msgctxt "No holiday region"
 msgid "None"
 msgstr ""
 
-#: prefdlg.cpp:670
+#: prefdlg.cpp:673
 msgctxt "@label:spinbox"
 msgid "Start of day for date-only alarms:"
 msgstr ""
 
-#: prefdlg.cpp:675
+#: prefdlg.cpp:678
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
@@ -3397,49 +3694,49 @@
 "triggered.</para><para>%1</para>"
 msgstr ""
 
-#: prefdlg.cpp:681
+#: prefdlg.cpp:684
 msgctxt "@title:group"
 msgid "Working Hours"
 msgstr ""
 
-#: prefdlg.cpp:698
+#: prefdlg.cpp:701
 msgctxt "@info:whatsthis"
 msgid "Check the days in the week which are work days"
 msgstr ""
 
-#: prefdlg.cpp:706
+#: prefdlg.cpp:709
 msgctxt "@label:spinbox"
 msgid "Daily start time:"
 msgstr ""
 
-#: prefdlg.cpp:711
+#: prefdlg.cpp:714
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid "<para>Enter the start time of the working day.</para><para>%1</para>"
 msgstr ""
 
-#: prefdlg.cpp:721
+#: prefdlg.cpp:724
 msgctxt "@label:spinbox"
 msgid "Daily end time:"
 msgstr ""
 
-#: prefdlg.cpp:726
+#: prefdlg.cpp:729
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid "<para>Enter the end time of the working day.</para><para>%1</para>"
 msgstr ""
 
-#: prefdlg.cpp:732
+#: prefdlg.cpp:735
 msgctxt "@title:group"
 msgid "KOrganizer"
 msgstr ""
 
-#: prefdlg.cpp:743
+#: prefdlg.cpp:746
 msgctxt "@label:spinbox"
 msgid "KOrganizer event duration:"
 msgstr ""
 
-#: prefdlg.cpp:748
+#: prefdlg.cpp:751
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
@@ -3447,31 +3744,31 @@
 "copied to KOrganizer.</para><para>%1</para>"
 msgstr ""
 
-#: prefdlg.cpp:833
+#: prefdlg.cpp:836
 msgctxt "@title:group"
 msgid "New Alarms && Templates"
 msgstr ""
 
-#: prefdlg.cpp:839
+#: prefdlg.cpp:842
 msgctxt "@option:radio"
 msgid "Store in default calendar"
 msgstr ""
 
-#: prefdlg.cpp:841
+#: prefdlg.cpp:844
 msgctxt "@info:whatsthis"
 msgid ""
 "Add all new alarms and alarm templates to the default calendars, without "
 "prompting."
 msgstr ""
 
-#: prefdlg.cpp:843
+#: prefdlg.cpp:846
 msgctxt "@option:radio"
 msgid "Prompt for which calendar to store in"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:109
 #. i18n: ectx: whatsthis, entry (AskResource), group (General)
-#: prefdlg.cpp:846 rc.cpp:65
+#: prefdlg.cpp:849 rc.cpp:137
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>When saving a new alarm or alarm template, prompt for which calendar "
@@ -3480,58 +3777,58 @@
 "calendar.</para>"
 msgstr ""
 
-#: prefdlg.cpp:851
+#: prefdlg.cpp:854
 msgctxt "@title:group"
 msgid "Archived Alarms"
 msgstr ""
 
-#: prefdlg.cpp:857
+#: prefdlg.cpp:860
 msgctxt "@option:check"
 msgid "Keep alarms after expiry"
 msgstr ""
 
-#: prefdlg.cpp:860
+#: prefdlg.cpp:863
 msgctxt "@info:whatsthis"
 msgid ""
 "Check to archive alarms after expiry or deletion (except deleted alarms "
 "which were never triggered)."
 msgstr ""
 
-#: prefdlg.cpp:866
+#: prefdlg.cpp:869
 msgctxt "@option:check"
 msgid "Discard archived alarms after:"
 msgstr ""
 
-#: prefdlg.cpp:873
+#: prefdlg.cpp:876
 msgctxt "@label Time unit for user-entered number"
 msgid "days"
 msgstr ""
 
-#: prefdlg.cpp:876
+#: prefdlg.cpp:879
 msgctxt "@info:whatsthis"
 msgid ""
 "Uncheck to store archived alarms indefinitely. Check to enter how long "
 "archived alarms should be stored."
 msgstr ""
 
-#: prefdlg.cpp:879
+#: prefdlg.cpp:882
 msgctxt "@action:button"
 msgid "Clear Archived Alarms"
 msgstr ""
 
-#: prefdlg.cpp:887
+#: prefdlg.cpp:890
 msgctxt "@info:whatsthis"
 msgid "Delete all existing archived alarms."
 msgstr ""
 
-#: prefdlg.cpp:888
+#: prefdlg.cpp:891
 msgctxt "@info:whatsthis"
 msgid ""
 "Delete all existing archived alarms (from the default archived alarm "
 "calendar only)."
 msgstr ""
 
-#: prefdlg.cpp:939
+#: prefdlg.cpp:942
 msgctxt "@info"
 msgid ""
 "<para>A default calendar is required in order to archive alarms, but none is "
@@ -3540,34 +3837,34 @@
 "calendar.</para>"
 msgstr ""
 
-#: prefdlg.cpp:959
+#: prefdlg.cpp:962
 msgctxt "@info"
 msgid "Do you really want to delete all archived alarms?"
 msgstr ""
 
-#: prefdlg.cpp:960
+#: prefdlg.cpp:963
 msgctxt "@info"
 msgid ""
 "Do you really want to delete all alarms in the default archived alarm "
 "calendar?"
 msgstr ""
 
-#: prefdlg.cpp:979
+#: prefdlg.cpp:982
 msgctxt "@label"
 msgid "Email client:"
 msgstr ""
 
-#: prefdlg.cpp:981
+#: prefdlg.cpp:984
 msgctxt "@option:radio"
 msgid "KMail"
 msgstr ""
 
-#: prefdlg.cpp:982
+#: prefdlg.cpp:985
 msgctxt "@option:radio"
 msgid "Sendmail"
 msgstr ""
 
-#: prefdlg.cpp:992
+#: prefdlg.cpp:995
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
@@ -3581,7 +3878,7 @@
 "transport agent.</item></list></para>"
 msgstr ""
 
-#: prefdlg.cpp:1000
+#: prefdlg.cpp:1003
 #, kde-format
 msgctxt "@option:check"
 msgid ""
@@ -3589,7 +3886,7 @@
 "<resource>%1</resource> folder"
 msgstr ""
 
-#: prefdlg.cpp:1001
+#: prefdlg.cpp:1004
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
@@ -3597,14 +3894,14 @@
 "<resource>%1</resource> folder"
 msgstr ""
 
-#: prefdlg.cpp:1007
+#: prefdlg.cpp:1010
 msgctxt "@option:check"
 msgid "Notify when remote emails are queued"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:384
 #. i18n: ectx: whatsthis, entry (Base_EmailQueuedNotify), group (Notification Messages)
-#: prefdlg.cpp:1009 rc.cpp:369
+#: prefdlg.cpp:1012 rc.cpp:441
 msgctxt "@info:whatsthis"
 msgid ""
 "Display a notification message whenever an email alarm has queued an email "
@@ -3613,41 +3910,41 @@
 "actually transmitted."
 msgstr ""
 
-#: prefdlg.cpp:1015
+#: prefdlg.cpp:1018
 msgctxt "@title:group"
 msgid "Your Email Address"
 msgstr ""
 
-#: prefdlg.cpp:1022
+#: prefdlg.cpp:1025
 msgctxt "@label 'From' email address"
 msgid "From:"
 msgstr ""
 
-#: prefdlg.cpp:1034
+#: prefdlg.cpp:1037
 msgctxt "@info:whatsthis"
 msgid ""
 "Your email address, used to identify you as the sender when sending email "
 "alarms."
 msgstr ""
 
-#: prefdlg.cpp:1041 prefdlg.cpp:1077
+#: prefdlg.cpp:1044 prefdlg.cpp:1080
 msgctxt "@option:radio"
 msgid "Use address from System Settings"
 msgstr ""
 
-#: prefdlg.cpp:1044
+#: prefdlg.cpp:1047
 msgctxt "@info:whatsthis"
 msgid ""
 "Check to use the email address set in KDE System Settings, to identify you "
 "as the sender when sending email alarms."
 msgstr ""
 
-#: prefdlg.cpp:1048
+#: prefdlg.cpp:1051
 msgctxt "@option:radio"
 msgid "Use <application>KMail</application> identities"
 msgstr ""
 
-#: prefdlg.cpp:1051
+#: prefdlg.cpp:1054
 msgctxt "@info:whatsthis"
 msgid ""
 "Check to use <application>KMail</application>'s email identities to identify "
@@ -3657,12 +3954,12 @@
 "<application>KMail</application>'s identities to use."
 msgstr ""
 
-#: prefdlg.cpp:1058
+#: prefdlg.cpp:1061
 msgctxt "@label 'Bcc' email address"
 msgid "Bcc:"
 msgstr ""
 
-#: prefdlg.cpp:1069
+#: prefdlg.cpp:1072
 msgctxt "@info:whatsthis"
 msgid ""
 "Your email address, used for blind copying email alarms to yourself. If you "
@@ -3671,96 +3968,96 @@
 "login name."
 msgstr ""
 
-#: prefdlg.cpp:1080
+#: prefdlg.cpp:1083
 msgctxt "@info:whatsthis"
 msgid ""
 "Check to use the email address set in KDE System Settings, for blind copying "
 "email alarms to yourself."
 msgstr ""
 
-#: prefdlg.cpp:1164
+#: prefdlg.cpp:1167
 msgctxt "@info/plain"
 msgid "No valid 'Bcc' email address is specified."
 msgstr ""
 
-#: prefdlg.cpp:1171
+#: prefdlg.cpp:1174
 #, kde-format
 msgctxt "@info"
 msgid ""
 "<para>%1</para><para>Are you sure you want to save your changes?</para>"
 msgstr ""
 
-#: prefdlg.cpp:1177
+#: prefdlg.cpp:1180
 #, kde-format
 msgctxt "@info"
 msgid "No email address is currently set in KDE System Settings. %1"
 msgstr ""
 
-#: prefdlg.cpp:1182
+#: prefdlg.cpp:1185
 #, kde-format
 msgctxt "@info"
 msgid "No <application>KMail</application> identities currently exist. %1"
 msgstr ""
 
-#: prefdlg.cpp:1200
+#: prefdlg.cpp:1203
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
 "The default setting for <interface>%1</interface> in the alarm edit dialog."
 msgstr ""
 
-#: prefdlg.cpp:1207 prefdlg.cpp:1583
+#: prefdlg.cpp:1210 prefdlg.cpp:1586
 msgctxt "@title:tab"
 msgid "General"
 msgstr ""
 
-#: prefdlg.cpp:1211
+#: prefdlg.cpp:1214
 msgctxt "@title:tab"
 msgid "Alarm Types"
 msgstr ""
 
-#: prefdlg.cpp:1215
+#: prefdlg.cpp:1218
 msgctxt "@title:tab"
 msgid "Font && Color"
 msgstr ""
 
-#: prefdlg.cpp:1236
+#: prefdlg.cpp:1239
 msgctxt "@label:listbox"
 msgid "Recurrence:"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:319
 #. i18n: ectx: whatsthis, entry (DefaultRecurPeriod), group (Defaults)
-#: prefdlg.cpp:1249 rc.cpp:294
+#: prefdlg.cpp:1252 rc.cpp:366
 msgctxt "@info:whatsthis"
 msgid "The default setting for the recurrence rule in the alarm edit dialog."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:332
 #. i18n: ectx: label, entry (DefaultFeb29Type), group (Defaults)
-#: prefdlg.cpp:1256 rc.cpp:306
+#: prefdlg.cpp:1259 rc.cpp:378
 msgctxt "@label"
 msgid "In non-leap years, repeat yearly February 29th alarms on:"
 msgstr ""
 
-#: prefdlg.cpp:1265
+#: prefdlg.cpp:1268
 msgctxt "@option:radio"
 msgid "February 2&8th"
 msgstr ""
 
-#: prefdlg.cpp:1268
+#: prefdlg.cpp:1271
 msgctxt "@option:radio"
 msgid "March &1st"
 msgstr ""
 
-#: prefdlg.cpp:1271
+#: prefdlg.cpp:1274
 msgctxt "@option:radio"
 msgid "Do not repeat"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:333
 #. i18n: ectx: whatsthis, entry (DefaultFeb29Type), group (Defaults)
-#: prefdlg.cpp:1276 rc.cpp:309
+#: prefdlg.cpp:1279 rc.cpp:381
 msgctxt "@info:whatsthis"
 msgid ""
 "For yearly recurrences, choose what date, if any, alarms due on February "
@@ -3768,44 +4065,44 @@
 "existing alarms is not re-evaluated when you change this setting.</note>"
 msgstr ""
 
-#: prefdlg.cpp:1284
+#: prefdlg.cpp:1287
 msgctxt "@title:group"
 msgid "Display Alarms"
 msgstr ""
 
-#: prefdlg.cpp:1303
+#: prefdlg.cpp:1306
 msgctxt "@label:listbox"
 msgid "Reminder units:"
 msgstr ""
 
-#: prefdlg.cpp:1305
+#: prefdlg.cpp:1308
 msgctxt "@item:inlistbox"
 msgid "Minutes"
 msgstr ""
 
-#: prefdlg.cpp:1306
+#: prefdlg.cpp:1309
 msgctxt "@item:inlistbox"
 msgid "Hours/Minutes"
 msgstr ""
 
-#: prefdlg.cpp:1309
+#: prefdlg.cpp:1312
 msgctxt "@info:whatsthis"
 msgid ""
 "The default units for the reminder in the alarm edit dialog, for alarms due "
 "soon."
 msgstr ""
 
-#: prefdlg.cpp:1316
+#: prefdlg.cpp:1319
 msgctxt "@title:group Audio options group"
 msgid "Sound"
 msgstr ""
 
-#: prefdlg.cpp:1335
+#: prefdlg.cpp:1338
 msgctxt "@option:check"
 msgid "Repeat sound file"
 msgstr ""
 
-#: prefdlg.cpp:1338
+#: prefdlg.cpp:1341
 #, kde-format
 msgctxt "@info:whatsthis sound file 'Repeat' checkbox"
 msgid ""
@@ -3813,37 +4110,37 @@
 "edit dialog."
 msgstr ""
 
-#: prefdlg.cpp:1344
+#: prefdlg.cpp:1347
 msgctxt "@label:textbox"
 msgid "Sound file:"
 msgstr ""
 
-#: prefdlg.cpp:1352
+#: prefdlg.cpp:1355
 msgctxt "@info:tooltip"
 msgid "Choose a sound file"
 msgstr ""
 
-#: prefdlg.cpp:1353
+#: prefdlg.cpp:1356
 msgctxt "@info:whatsthis"
 msgid "Enter the default sound file to use in the alarm edit dialog."
 msgstr ""
 
-#: prefdlg.cpp:1359
+#: prefdlg.cpp:1362
 msgctxt "@title:group"
 msgid "Command Alarms"
 msgstr ""
 
-#: prefdlg.cpp:1379
+#: prefdlg.cpp:1382
 msgctxt "@title:group"
 msgid "Email Alarms"
 msgstr ""
 
-#: prefdlg.cpp:1395
+#: prefdlg.cpp:1398
 msgctxt "@title:group"
 msgid "Message Font && Color"
 msgstr ""
 
-#: prefdlg.cpp:1566
+#: prefdlg.cpp:1569
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -3851,19 +4148,19 @@
 "the default sound type"
 msgstr ""
 
-#: prefdlg.cpp:1587
+#: prefdlg.cpp:1590
 msgctxt "@title:tab"
 msgid "Alarm Windows"
 msgstr ""
 
-#: prefdlg.cpp:1592
+#: prefdlg.cpp:1595
 msgctxt "@option:check"
 msgid "Show in system tray"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:89
 #. i18n: ectx: whatsthis, entry (ShowInSystemTray), group (General)
-#: prefdlg.cpp:1594 rc.cpp:44
+#: prefdlg.cpp:1597 rc.cpp:116
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Check to show <application>KAlarm</application>'s icon in the system "
@@ -3871,29 +4168,29 @@
 "indication.</para>"
 msgstr ""
 
-#: prefdlg.cpp:1599
+#: prefdlg.cpp:1602
 msgctxt "@title:group"
 msgid "System Tray Tooltip"
 msgstr ""
 
-#: prefdlg.cpp:1607
+#: prefdlg.cpp:1610
 msgctxt "@option:check"
 msgid "Show next &24 hours' alarms"
 msgstr ""
 
-#: prefdlg.cpp:1611
+#: prefdlg.cpp:1614
 msgctxt "@info:whatsthis"
 msgid ""
 "Specify whether to include in the system tray tooltip, a summary of alarms "
 "due in the next 24 hours."
 msgstr ""
 
-#: prefdlg.cpp:1617
+#: prefdlg.cpp:1620
 msgctxt "@option:check"
 msgid "Maximum number of alarms to show:"
 msgstr ""
 
-#: prefdlg.cpp:1624
+#: prefdlg.cpp:1627
 msgctxt "@info:whatsthis"
 msgid ""
 "Uncheck to display all of the next 24 hours' alarms in the system tray "
@@ -3902,7 +4199,7 @@
 
 #. i18n: file: kalarmconfig.kcfg:142
 #. i18n: ectx: whatsthis, entry (ShowTooltipAlarmTime), group (General)
-#: prefdlg.cpp:1631 rc.cpp:97
+#: prefdlg.cpp:1634 rc.cpp:169
 msgctxt "@info:whatsthis"
 msgid ""
 "Specify whether to show in the system tray tooltip, the time at which each "
@@ -3911,7 +4208,7 @@
 
 #. i18n: file: kalarmconfig.kcfg:148
 #. i18n: ectx: whatsthis, entry (ShowTooltipTimeToAlarm), group (General)
-#: prefdlg.cpp:1637 rc.cpp:103
+#: prefdlg.cpp:1640 rc.cpp:175
 msgctxt "@info:whatsthis"
 msgid ""
 "Specify whether to show in the system tray tooltip, how long until each "
@@ -3920,48 +4217,48 @@
 
 #. i18n: file: kalarmconfig.kcfg:154
 #. i18n: ectx: whatsthis, entry (TooltipTimeToPrefix), group (General)
-#: prefdlg.cpp:1646 rc.cpp:109
+#: prefdlg.cpp:1649 rc.cpp:181
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter the text to be displayed in front of the time until the alarm, in the "
 "system tray tooltip."
 msgstr ""
 
-#: prefdlg.cpp:1651
+#: prefdlg.cpp:1654
 msgctxt "@title:group"
 msgid "Alarm List"
 msgstr ""
 
-#: prefdlg.cpp:1662
+#: prefdlg.cpp:1665
 msgctxt "@label:listbox"
 msgid "Disabled alarm color:"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:212
 #. i18n: ectx: whatsthis, entry (DisabledColour), group (General)
-#: prefdlg.cpp:1666 rc.cpp:175
+#: prefdlg.cpp:1669 rc.cpp:247
 msgctxt "@info:whatsthis"
 msgid "Choose the text color in the alarm list for disabled alarms."
 msgstr ""
 
-#: prefdlg.cpp:1672
+#: prefdlg.cpp:1675
 msgctxt "@label:listbox"
 msgid "Archived alarm color:"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:218
 #. i18n: ectx: whatsthis, entry (ArchivedColour), group (General)
-#: prefdlg.cpp:1676 rc.cpp:181
+#: prefdlg.cpp:1679 rc.cpp:253
 msgctxt "@info:whatsthis"
 msgid "Choose the text color in the alarm list for archived alarms."
 msgstr ""
 
-#: prefdlg.cpp:1683
+#: prefdlg.cpp:1686
 msgctxt "@title:group"
 msgid "Alarm Message Windows"
 msgstr ""
 
-#: prefdlg.cpp:1693
+#: prefdlg.cpp:1696
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Choose how to reduce the chance of alarm messages being accidentally "
@@ -3971,1155 +4268,988 @@
 "time after the window is displayed.</item></list></para>"
 msgstr ""
 
-#: prefdlg.cpp:1696
+#: prefdlg.cpp:1699
 msgctxt "@option:radio"
 msgid "Position windows far from mouse cursor"
 msgstr ""
 
-#: prefdlg.cpp:1700
+#: prefdlg.cpp:1703
 msgctxt "@option:radio"
 msgid "Center windows, delay activating window buttons"
 msgstr ""
 
-#: prefdlg.cpp:1710
+#: prefdlg.cpp:1713
 msgctxt "@label:spinbox"
-msgid "Button activation delay (seconds):"
-msgstr ""
-
-#: prefdlg.cpp:1715
-msgctxt "@info:whatsthis"
-msgid ""
-"Enter how long its buttons should remain disabled after the alarm message "
-"window is shown."
-msgstr ""
-
-#: prefdlg.cpp:1721
-msgctxt "@option:check"
-msgid "Message windows have a title bar and take keyboard focus"
-msgstr ""
-
-#. i18n: file: kalarmconfig.kcfg:115
-#. i18n: ectx: whatsthis, entry (ModalMessages), group (General)
-#: prefdlg.cpp:1724 rc.cpp:71
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>Specify the characteristics of alarm message windows:<list><item>If "
-"checked, the window is a normal window with a title bar, which grabs "
-"keyboard input when it is displayed.</item><item>If unchecked, the window "
-"does not interfere with your typing when it is displayed, but it has no "
-"title bar and cannot be moved or resized.</item></list></para>"
-msgstr ""
-
-#: mainwindow.cpp:122
-msgctxt "@action"
-msgid "Show &Alarm Times"
-msgstr ""
-
-#: mainwindow.cpp:123
-msgctxt "@option:check"
-msgid "Show alarm time"
-msgstr ""
-
-#: mainwindow.cpp:124
-msgctxt "@action"
-msgid "Show Time t&o Alarms"
-msgstr ""
-
-#: mainwindow.cpp:125
-msgctxt "@option:check"
-msgid "Show time until alarm"
-msgstr ""
-
-#: mainwindow.cpp:432
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Failure to create menus (perhaps <filename>%1</filename> missing or "
-"corrupted)"
-msgstr ""
-
-#: mainwindow.cpp:453
-msgctxt "@action"
-msgid "&Templates..."
-msgstr ""
-
-#: mainwindow.cpp:457
-msgctxt "@action"
-msgid "&New"
-msgstr ""
-
-#: mainwindow.cpp:484
-msgctxt "@action"
-msgid "Create Tem&plate..."
-msgstr ""
-
-#: mainwindow.cpp:488
-msgctxt "@action"
-msgid "&Copy..."
-msgstr ""
-
-#: mainwindow.cpp:498
-msgctxt "@action"
-msgid "&Delete"
-msgstr ""
-
-#: mainwindow.cpp:504
-msgctxt "@action"
-msgid "Delete Without Confirmation"
-msgstr ""
-
-#: mainwindow.cpp:509
-msgctxt "@action"
-msgid "Reac&tivate"
-msgstr ""
-
-#: mainwindow.cpp:519
-msgctxt "@action"
-msgid "Wake From Suspend"
-msgstr ""
-
-#: mainwindow.cpp:536
-msgctxt "@action"
-msgid "Show Archi&ved Alarms"
-msgstr ""
-
-#: mainwindow.cpp:541
-msgctxt "@action"
-msgid "Show in System &Tray"
-msgstr ""
-
-#: mainwindow.cpp:545
-msgctxt "@action"
-msgid "Show &Calendars"
-msgstr ""
-
-#: mainwindow.cpp:553
-msgctxt "@action"
-msgid "Import &Alarms..."
-msgstr ""
-
-#: mainwindow.cpp:557
-msgctxt "@action"
-msgid "Import &Birthdays..."
-msgstr ""
-
-#: mainwindow.cpp:561
-msgctxt "@action"
-msgid "E&xport Selected Alarms..."
-msgstr ""
-
-#: mainwindow.cpp:569
-msgctxt "@action"
-msgid "&Refresh Alarms"
-msgstr ""
-
-#: mainwindow.cpp:824
-#, kde-format
-msgctxt "@info"
-msgid "Do you really want to delete the selected alarm?"
-msgid_plural "Do you really want to delete the %1 selected alarms?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mainwindow.cpp:826
-msgctxt "@title:window"
-msgid "Delete Alarm"
-msgid_plural "Delete Alarms"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mainwindow.cpp:968
-msgctxt "@info:tooltip"
-msgid "Hide Archived Alarms"
-msgstr ""
-
-#: mainwindow.cpp:969
-msgctxt "@info:tooltip"
-msgid "Show Archived Alarms"
-msgstr ""
-
-#: mainwindow.cpp:1056
-msgctxt "@info"
-msgid "Import birthdays"
-msgstr ""
-
-#: mainwindow.cpp:1226
-#, kde-format
-msgctxt "@action Undo/Redo [action]"
-msgid "%1 %2"
-msgstr ""
-
-#: mainwindow.cpp:1227
-#, kde-format
-msgctxt "@action Undo [action]: message"
-msgid "%1 %2: %3"
-msgstr ""
-
-#: mainwindow.cpp:1513
-msgctxt "@item:inlistbox"
-msgid "Display Alarm"
-msgstr ""
-
-#: mainwindow.cpp:1515
-msgctxt "@item:inlistbox"
-msgid "Email Alarm"
-msgstr ""
-
-#: mainwindow.cpp:1517
-msgctxt "@item:inlistbox"
-msgid "Command Alarm"
-msgstr ""
-
-#: mainwindow.cpp:1519
-msgctxt "@title:window"
-msgid "Alarm Type"
-msgstr ""
-
-#: mainwindow.cpp:1520
-msgctxt "@info"
-msgid "Choose alarm type to create:"
-msgstr ""
-
-#: mainwindow.cpp:1673
-msgctxt "@action"
-msgid "Ena&ble"
-msgstr ""
-
-#: mainwindow.cpp:1673
-msgctxt "@action"
-msgid "Disa&ble"
-msgstr ""
-
-#: deferdlg.cpp:43
-msgctxt "@title:window"
-msgid "Defer Alarm"
-msgstr ""
-
-#: deferdlg.cpp:45
-msgctxt "@action:button"
-msgid "Cancel Deferral"
-msgstr ""
-
-#: deferdlg.cpp:64
-msgctxt "@info:whatsthis"
-msgid "Defer the alarm until the specified time."
-msgstr ""
-
-#: deferdlg.cpp:65
-msgctxt "@info:whatsthis"
-msgid "Cancel the deferred alarm. This does not affect future recurrences."
-msgstr ""
-
-#: deferdlg.cpp:97
-#, kde-format
-msgctxt "@info"
-msgid "Cannot defer past the alarm's next sub-repetition (currently %1)"
-msgstr ""
-
-#: deferdlg.cpp:101
-#, kde-format
-msgctxt "@info"
-msgid "Cannot defer past the alarm's next recurrence (currently %1)"
-msgstr ""
-
-#: deferdlg.cpp:105
-#, kde-format
-msgctxt "@info"
-msgid "Cannot defer past the alarm's next reminder (currently %1)"
-msgstr ""
-
-#: deferdlg.cpp:109
-#, kde-format
-msgctxt "@info"
-msgid "Cannot defer reminder past the main alarm time (%1)"
-msgstr ""
-
-#: commandoptions.cpp:185
-#, kde-format
-msgctxt "@info:shell"
-msgid "<icode>%1</icode>: invalid email address"
-msgstr ""
-
-#: commandoptions.cpp:302 commandoptions.cpp:317 commandoptions.cpp:393
-#, kde-format
-msgctxt "@info:shell"
-msgid "Invalid <icode>%1</icode> parameter for date-only alarm"
-msgstr ""
-
-#: commandoptions.cpp:306
-#, kde-format
-msgctxt "@info:shell"
-msgid "<icode>%1</icode> earlier than <icode>%2</icode>"
-msgstr ""
-
-#: commandoptions.cpp:326
-#, kde-format
-msgctxt "@info:shell"
-msgid ""
-"Invalid <icode>%1</icode> and <icode>%2</icode> parameters: repetition is "
-"longer than <icode>%3</icode> interval"
-msgstr ""
-
-#: commandoptions.cpp:376
-#, kde-format
-msgctxt "@info:shell"
-msgid ""
-"<icode>%1</icode> requires speech synthesis to be configured using Jovie"
-msgstr ""
-
-#: commandoptions.cpp:478
-msgctxt "@info:shell"
-msgid ": option(s) only valid with an appropriate action option or message"
-msgstr ""
-
-#: commandoptions.cpp:498
-msgctxt "@info:shell"
-msgid ""
-"\n"
-"Use --help to get a list of available command line options.\n"
+msgid "Button activation delay (seconds):"
 msgstr ""
 
-#: commandoptions.cpp:527
-#, kde-format
-msgctxt "@info:shell"
-msgid "<icode>%1</icode> requires <icode>%2</icode>"
+#: prefdlg.cpp:1718
+msgctxt "@info:whatsthis"
+msgid ""
+"Enter how long its buttons should remain disabled after the alarm message "
+"window is shown."
 msgstr ""
 
-#: commandoptions.cpp:529
-#, kde-format
-msgctxt "@info:shell"
-msgid "<icode>%1</icode> requires <icode>%2</icode> or <icode>%3</icode>"
+#: prefdlg.cpp:1724
+msgctxt "@option:check"
+msgid "Message windows have a title bar and take keyboard focus"
 msgstr ""
 
-#: commandoptions.cpp:534
-#, kde-format
-msgctxt "@info:shell"
-msgid "Invalid <icode>%1</icode> parameter"
+#. i18n: file: kalarmconfig.kcfg:115
+#. i18n: ectx: whatsthis, entry (ModalMessages), group (General)
+#: prefdlg.cpp:1727 rc.cpp:143
+msgctxt "@info:whatsthis"
+msgid ""
+"<para>Specify the characteristics of alarm message windows:<list><item>If "
+"checked, the window is a normal window with a title bar, which grabs "
+"keyboard input when it is displayed.</item><item>If unchecked, the window "
+"does not interfere with your typing when it is displayed, but it has no "
+"title bar and cannot be moved or resized.</item></list></para>"
 msgstr ""
 
-#: commandoptions.cpp:545
-#, kde-format
-msgctxt "@info:shell"
-msgid "<icode>%1</icode> incompatible with <icode>%2</icode>"
+#: repetitionbutton.cpp:87
+msgctxt "@title:window"
+msgid "Alarm Sub-Repetition"
 msgstr ""
 
-#: resourceconfigdialog.cpp:61
-msgctxt "@title:group"
-msgid "General Settings"
+#: repetitionbutton.cpp:165
+msgctxt "@option:check Repeat every 10 minutes"
+msgid "Repeat every"
 msgstr ""
 
-#: resourceconfigdialog.cpp:63
-msgctxt "@label:textbox Calendar name"
-msgid "Name:"
+#: repetitionbutton.cpp:166
+msgctxt "@info:whatsthis"
+msgid ""
+"Instead of the alarm triggering just once at each recurrence, checking this "
+"option makes the alarm trigger multiple times at each recurrence."
 msgstr ""
 
-#: resourceconfigdialog.cpp:68
-msgctxt "@option:check"
-msgid "Read-only"
+#: repetitionbutton.cpp:168
+msgctxt "@info:whatsthis"
+msgid "Enter the time between repetitions of the alarm"
 msgstr ""
 
-#: resourceconfigdialog.cpp:81
-#, kde-format
-msgctxt "@title:group"
-msgid "<resource>%1</resource> Calendar Settings"
+#: repetitionbutton.cpp:186
+msgctxt "@option:radio"
+msgid "Number of repetitions:"
 msgstr ""
 
-#: resourceconfigdialog.cpp:123
-msgctxt "@info"
-msgid "Please enter a calendar name."
+#: repetitionbutton.cpp:188
+msgctxt "@info:whatsthis"
+msgid ""
+"Check to specify the number of times the alarm should repeat after each "
+"recurrence"
 msgstr ""
 
-#: fontcolour.h:39
-msgid "Requested font"
-msgstr "Wynebfath a ddymunwyd"
+#: repetitionbutton.cpp:196
+msgctxt "@info:whatsthis"
+msgid ""
+"Enter the number of times to trigger the alarm after its initial occurrence"
+msgstr ""
 
-#: recurrenceedit.cpp:80
-msgctxt "@item:inlistbox Recurrence type"
-msgid "No Recurrence"
+#: repetitionbutton.cpp:204
+msgctxt "@option:radio"
+msgid "Duration:"
 msgstr ""
 
-#: recurrenceedit.cpp:81
-msgctxt "@item:inlistbox Recurrence type"
-msgid "At Login"
+#: repetitionbutton.cpp:206
+msgctxt "@info:whatsthis"
+msgid "Check to specify how long the alarm is to be repeated"
 msgstr ""
 
-#: recurrenceedit.cpp:82
-msgctxt "@item:inlistbox Recurrence type"
-msgid "Hourly/Minutely"
+#: repetitionbutton.cpp:212
+msgctxt "@info:whatsthis"
+msgid "Enter the length of time to repeat the alarm"
 msgstr ""
 
-#: recurrenceedit.cpp:83
-msgctxt "@item:inlistbox Recurrence type"
-msgid "Daily"
+#: autostart/autostart.cpp:44
+msgid "KAlarm Autostart"
 msgstr ""
 
-#: recurrenceedit.cpp:84
-msgctxt "@item:inlistbox Recurrence type"
-msgid "Weekly"
+#: autostart/autostart.cpp:45
+msgid "KAlarm autostart at login"
 msgstr ""
 
-#: recurrenceedit.cpp:85
-msgctxt "@item:inlistbox Recurrence type"
-msgid "Monthly"
+#: autostart/autostart.cpp:46
+msgid "Copyright 2001,2008 David Jarvie"
 msgstr ""
 
-#: recurrenceedit.cpp:86
-msgctxt "@item:inlistbox Recurrence type"
-msgid "Yearly"
+#: autostart/autostart.cpp:48
+msgid "Maintainer"
+msgstr "Cynhaliwr"
+
+#: autostart/autostart.cpp:53
+msgid "Application to autostart"
 msgstr ""
 
-#: recurrenceedit.cpp:112
-msgctxt "@title:group"
-msgid "Recurrence Rule"
+#: autostart/autostart.cpp:54
+msgid "Command line arguments"
 msgstr ""
 
-#: recurrenceedit.cpp:130
-msgctxt "@info:whatsthis"
-msgid "Do not repeat the alarm"
+#: specialactions.cpp:48
+msgctxt "@action:button"
+msgid "Special Actions..."
 msgstr ""
 
-#: recurrenceedit.cpp:138
+#: specialactions.cpp:56
 msgctxt "@info:whatsthis"
-msgid ""
-"<para>Trigger the alarm at the specified date/time and at every login until "
-"then.</para><para>Note that it will also be triggered any time "
-"<application>KAlarm</application> is restarted.</para>"
+msgid "Specify actions to execute before and after the alarm is displayed."
 msgstr ""
 
-#: recurrenceedit.cpp:146
-msgctxt "@info:whatsthis"
-msgid "Repeat the alarm at hourly/minutely intervals"
+#: specialactions.cpp:109
+msgctxt "@title:window"
+msgid "Special Alarm Actions"
 msgstr ""
 
-#: recurrenceedit.cpp:153
-msgctxt "@info:whatsthis"
-msgid "Repeat the alarm at daily intervals"
+#: specialactions.cpp:167
+msgctxt "@title:group"
+msgid "Pre-Alarm Action"
 msgstr ""
 
-#: recurrenceedit.cpp:160
-msgctxt "@info:whatsthis"
-msgid "Repeat the alarm at weekly intervals"
+#: specialactions.cpp:177 specialactions.cpp:207
+msgctxt "@label:textbox"
+msgid "Command:"
 msgstr ""
 
-#: recurrenceedit.cpp:167
+#: specialactions.cpp:182
 msgctxt "@info:whatsthis"
-msgid "Repeat the alarm at monthly intervals"
+msgid ""
+"<para>Enter a shell command to execute before the alarm is "
+"displayed.</para><para>Note that it is executed only when the alarm proper "
+"is displayed, not when a reminder or deferred alarm is "
+"displayed.</para><para><note>KAlarm will wait for the command to complete "
+"before displaying the alarm.</note></para>"
 msgstr ""
 
-#: recurrenceedit.cpp:174
-msgctxt "@info:whatsthis"
-msgid "Repeat the alarm at annual intervals"
+#: specialactions.cpp:188
+msgctxt "@option:check"
+msgid "Cancel alarm on error"
 msgstr ""
 
-#: recurrenceedit.cpp:184
+#: specialactions.cpp:189
 msgctxt "@info:whatsthis"
 msgid ""
-"Set up a repetition within the recurrence, to trigger the alarm multiple "
-"times each time the recurrence is due."
-msgstr ""
-
-#: recurrenceedit.cpp:232
-msgctxt "@title:group"
-msgid "Recurrence End"
+"Cancel the alarm if the pre-alarm command fails, i.e. do not display the "
+"alarm or execute any post-alarm action command."
 msgstr ""
 
-#: recurrenceedit.cpp:241
-msgctxt "@option:radio"
-msgid "No end"
+#: specialactions.cpp:192
+msgctxt "@option:check"
+msgid "Do not notify errors"
 msgstr ""
 
-#: recurrenceedit.cpp:244
+#: specialactions.cpp:193
 msgctxt "@info:whatsthis"
-msgid "Repeat the alarm indefinitely"
+msgid ""
+"Do not show error status or error message if the pre-alarm command fails."
 msgstr ""
 
-#: recurrenceedit.cpp:252
-msgctxt "@option:radio"
-msgid "End after:"
+#: specialactions.cpp:197
+msgctxt "@title:group"
+msgid "Post-Alarm Action"
 msgstr ""
 
-#: recurrenceedit.cpp:254
+#: specialactions.cpp:211
 msgctxt "@info:whatsthis"
-msgid "Repeat the alarm for the number of times specified"
+msgid ""
+"<para>Enter a shell command to execute after the alarm window is "
+"closed.</para><para>Note that it is not executed after closing a reminder "
+"window. If you defer the alarm, it is not executed until the alarm is "
+"finally acknowledged or closed.</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:261
-msgctxt "@info:whatsthis"
-msgid "Enter the total number of times to trigger the alarm"
+#: soundpicker.cpp:49
+msgctxt "@label:listbox Listbox providing audio options"
+msgid "Sound:"
 msgstr ""
 
-#: recurrenceedit.cpp:265
-msgctxt "@label"
-msgid "occurrence(s)"
+#: soundpicker.cpp:50
+msgctxt "@item:inlistbox No sound"
+msgid "None"
 msgstr ""
 
-#: recurrenceedit.cpp:277
-msgctxt "@option:radio"
-msgid "End by:"
+#: soundpicker.cpp:51
+msgctxt "@item:inlistbox"
+msgid "Beep"
 msgstr ""
 
-#: recurrenceedit.cpp:280
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>Repeat the alarm until the date/time specified.</para><para><note>This "
-"applies to the main recurrence only. It does not limit any sub-repetition "
-"which will occur regardless after the last main recurrence.</note></para>"
+#: soundpicker.cpp:52
+msgctxt "@item:inlistbox"
+msgid "Speak"
 msgstr ""
 
-#: recurrenceedit.cpp:285
-msgctxt "@info/plain"
-msgid "This uses the same time zone as the start time."
+#: soundpicker.cpp:53
+msgctxt "@item:inlistbox"
+msgid "Sound file"
 msgstr ""
 
-#: recurrenceedit.cpp:287
-#, kde-format
-msgctxt "@info:whatsthis"
-msgid "<para>Enter the last date to repeat the alarm.</para><para>%1</para>"
+#: soundpicker.cpp:97
+msgctxt "@info:tooltip"
+msgid "Configure sound file"
 msgstr ""
 
-#: recurrenceedit.cpp:294
-#, kde-format
+#: soundpicker.cpp:98
 msgctxt "@info:whatsthis"
-msgid ""
-"<para>Enter the last time to repeat the "
-"alarm.</para><para>%1</para><para>%2</para>"
+msgid "Configure a sound file to play when the alarm is displayed."
 msgstr ""
 
-#: recurrenceedit.cpp:299
+#: soundpicker.cpp:131
+#, kde-format
 msgctxt "@info:whatsthis"
-msgid ""
-"Stop repeating the alarm after your first login on or after the specified "
-"end date"
-msgstr ""
-
-#: recurrenceedit.cpp:317
-msgctxt "@title:group"
-msgid "Exceptions"
+msgid "<interface>%1</interface>: the message is displayed silently."
 msgstr ""
 
-#: recurrenceedit.cpp:328
+#: soundpicker.cpp:132
+#, kde-format
 msgctxt "@info:whatsthis"
-msgid "The list of exceptions, i.e. dates/times excluded from the recurrence"
+msgid "<interface>%1</interface>: a simple beep is sounded."
 msgstr ""
 
-#: recurrenceedit.cpp:346
+#: soundpicker.cpp:133
+#, kde-format
 msgctxt "@info:whatsthis"
 msgid ""
-"Enter a date to insert in the exceptions list. Use in conjunction with the "
-"Add or Change button below."
-msgstr ""
-
-#: recurrenceedit.cpp:353
-msgctxt "@action:button"
-msgid "Add"
+"<interface>%1</interface>: an audio file is played. You will be prompted to "
+"choose the file and set play options."
 msgstr ""
 
-#: recurrenceedit.cpp:354
+#: soundpicker.cpp:137
+#, kde-format
 msgctxt "@info:whatsthis"
-msgid "Add the date entered above to the exceptions list"
+msgid "<interface>%1</interface>: the message text is spoken."
 msgstr ""
 
-#: recurrenceedit.cpp:358
-msgctxt "@action:button"
-msgid "Change"
+#: soundpicker.cpp:139
+#, kde-format
+msgctxt "@info:whatsthis Combination of multiple whatsthis items"
+msgid ""
+"<para>Choose a sound to play when the message is "
+"displayed:<list><item>%1</item><item>%2</item><item>%3</item><item>%4</item><"
+"/list></para>"
 msgstr ""
 
-#: recurrenceedit.cpp:360
-msgctxt "@info:whatsthis"
+#: soundpicker.cpp:147
+#, kde-format
+msgctxt "@info:whatsthis Combination of multiple whatsthis items"
 msgid ""
-"Replace the currently highlighted item in the exceptions list with the date "
-"entered above"
+"<para>Choose a sound to play when the message is "
+"displayed:<list><item>%1</item><item>%2</item><item>%3</item></list></para>"
 msgstr ""
 
-#: recurrenceedit.cpp:365
-msgctxt "@info:whatsthis"
-msgid "Remove the currently highlighted item from the exceptions list"
+#: soundpicker.cpp:265
+msgctxt "@title:window"
+msgid "Sound File"
 msgstr ""
 
-#: recurrenceedit.cpp:372
-msgctxt "@option:check"
-msgid "Exclude holidays"
+#: soundpicker.cpp:330
+msgctxt "@title:window"
+msgid "Choose Sound File"
 msgstr ""
 
-#: recurrenceedit.cpp:375
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>Do not trigger the alarm on holidays.</para><para>You can specify your "
-"holiday region in the Configuration dialog.</para>"
+#: calendarmigrator.cpp:329
+#, kde-format
+msgctxt "@info/plain"
+msgid "Failed to create default calendar <resource>%1</resource>"
 msgstr ""
 
-#: recurrenceedit.cpp:380
-msgctxt "@option:check"
-msgid "Only during working time"
+#: calendarmigrator.cpp:331
+#, kde-format
+msgctxt "@info/plain 'Import Alarms' is the name of a menu option"
+msgid ""
+"Failed to convert old configuration for calendar <resource>%1</resource>. "
+"Please use Import Alarms to load its alarms into a new or existing calendar."
 msgstr ""
 
-#: recurrenceedit.cpp:383
-msgctxt "@info:whatsthis"
-msgid ""
-"<para>Only execute the alarm during working hours, on working "
-"days.</para><para>You can specify working days and hours in the "
-"Configuration dialog.</para>"
+#: calendarmigrator.cpp:333
+#, kde-format
+msgctxt "@info/plain File path or URL"
+msgid "Location: %1"
 msgstr ""
 
-#: recurrenceedit.cpp:426
+#: calendarmigrator.cpp:335
+#, kde-format
 msgctxt "@info"
-msgid "End date is earlier than start date"
+msgid "<para>%1</para><para>%2</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:427
+#: calendarmigrator.cpp:337
+#, kde-format
 msgctxt "@info"
-msgid "End date/time is earlier than start date/time"
+msgid "<para>%1</para><para>%2<nl/>(%3)</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:697
-msgctxt "@info"
-msgid "Date cannot be earlier than start date"
+#: calendarmigrator.cpp:443
+msgctxt "@info/plain"
+msgid "Invalid collection"
 msgstr ""
 
-#: recurrenceedit.cpp:1115
-msgctxt "@label:spinbox"
-msgid "Recur e&very"
+#: calendarmigrator.cpp:457
+#, kde-format
+msgctxt "@info/plain"
+msgid "Failed to update format of calendar <resource>%1</resource>"
 msgstr ""
 
-#: recurrenceedit.cpp:1184
-msgctxt "@label Time units for user-entered numbers"
-msgid "hours:minutes"
+#: calendarmigrator.cpp:735
+msgctxt "@info/plain"
+msgid "New configuration timed out"
 msgstr ""
 
-#: recurrenceedit.cpp:1185
-msgctxt "@info:whatsthis"
-msgid ""
-"Enter the number of hours and minutes between repetitions of the alarm"
+#: calendarmigrator.cpp:748
+msgctxt "@info/plain"
+msgid "New configuration was corrupt"
 msgstr ""
 
-#: recurrenceedit.cpp:1205
-msgctxt "@label On: Tuesday"
-msgid "O&n:"
+#: resourceselector.cpp:100
+msgctxt "@title:group"
+msgid "Calendars"
 msgstr ""
 
-#: recurrenceedit.cpp:1286
-msgctxt "@info"
-msgid "No day selected"
+#: resourceselector.cpp:104
+msgctxt "@item:inlistbox"
+msgid "Active Alarms"
 msgstr ""
 
-#: recurrenceedit.cpp:1315
-msgctxt "@label Time unit for user-entered number"
-msgid "day(s)"
+#: resourceselector.cpp:105
+msgctxt "@item:inlistbox"
+msgid "Archived Alarms"
 msgstr ""
 
-#: recurrenceedit.cpp:1316
-msgctxt "@info:whatsthis"
-msgid "Enter the number of days between repetitions of the alarm"
+#: resourceselector.cpp:106
+msgctxt "@item:inlistbox"
+msgid "Alarm Templates"
 msgstr ""
 
-#: recurrenceedit.cpp:1317
+#: resourceselector.cpp:108
 msgctxt "@info:whatsthis"
-msgid "Select the days of the week on which the alarm is allowed to occur"
+msgid "Choose which type of data to show alarm calendars for"
 msgstr ""
 
-#: recurrenceedit.cpp:1328
-msgctxt "@label Time unit for user-entered number"
-msgid "week(s)"
+#: resourceselector.cpp:125
+msgctxt "@info:whatsthis"
+msgid ""
+"List of available calendars of the selected type. The checked state shows "
+"whether a calendar is enabled (checked) or disabled (unchecked). The default "
+"calendar is shown in bold."
 msgstr ""
 
-#: recurrenceedit.cpp:1329
+#: resourceselector.cpp:141
 msgctxt "@info:whatsthis"
-msgid "Enter the number of weeks between repetitions of the alarm"
+msgid "Edit the highlighted calendar"
 msgstr ""
 
-#: recurrenceedit.cpp:1330
+#: resourceselector.cpp:142
 msgctxt "@info:whatsthis"
-msgid "Select the days of the week on which to repeat the alarm"
+msgid ""
+"<para>Remove the highlighted calendar from the list.</para><para>The "
+"calendar itself is left intact, and may subsequently be reinstated in the "
+"list if desired.</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:1353
-msgctxt "@option:radio On day number in the month"
-msgid "O&n day"
+#: resourceselector.cpp:175
+msgctxt "@info:tooltip"
+msgid "Add a new active alarm calendar"
 msgstr ""
 
-#: recurrenceedit.cpp:1357
-msgctxt "@info:whatsthis"
-msgid "Repeat the alarm on the selected day of the month"
+#: resourceselector.cpp:179
+msgctxt "@info:tooltip"
+msgid "Add a new archived alarm calendar"
 msgstr ""
 
-#: recurrenceedit.cpp:1364
-msgctxt "@item:inlistbox Last day of month"
-msgid "Last"
+#: resourceselector.cpp:183
+msgctxt "@info:tooltip"
+msgid "Add a new alarm template calendar"
 msgstr ""
 
-#: recurrenceedit.cpp:1367
-msgctxt "@info:whatsthis"
-msgid "Select the day of the month on which to repeat the alarm"
+#: resourceselector.cpp:239
+msgctxt "@info"
+msgid "Select storage type of new calendar:"
 msgstr ""
 
-#: recurrenceedit.cpp:1381
-msgctxt "@option:radio On the 1st Tuesday"
-msgid "On t&he"
+#: resourceselector.cpp:246
+#, kde-format
+msgctxt "@info"
+msgid "Unable to create calendar of type <resource>%1</resource>."
 msgstr ""
 
-#: recurrenceedit.cpp:1385
-msgctxt "@info:whatsthis"
+#: resourceselector.cpp:249
+#, kde-format
+msgctxt "@info/plain"
+msgid "%1 calendar"
+msgstr ""
+
+#: resourceselector.cpp:363
+msgctxt "@info"
+msgid "You cannot make your default active alarm calendar read-only."
+msgstr ""
+
+#: resourceselector.cpp:370
+msgctxt "@info"
 msgid ""
-"Repeat the alarm on one day of the week, in the selected week of the month"
+"You cannot make your default archived alarm calendar read-only while expired "
+"alarms are configured to be kept."
 msgstr ""
 
-#: recurrenceedit.cpp:1389
-msgctxt "@item:inlistbox"
-msgid "1st"
+#: resourceselector.cpp:374
+msgctxt "@info"
+msgid "Do you really want to make your default calendar read-only?"
 msgstr ""
 
-#: recurrenceedit.cpp:1390
-msgctxt "@item:inlistbox"
-msgid "2nd"
+#: resourceselector.cpp:427
+msgctxt "@info"
+msgid "You cannot remove your default active alarm calendar."
 msgstr ""
 
-#: recurrenceedit.cpp:1391
-msgctxt "@item:inlistbox"
-msgid "3rd"
+#: resourceselector.cpp:434
+msgctxt "@info"
+msgid ""
+"You cannot remove your default archived alarm calendar while expired alarms "
+"are configured to be kept."
 msgstr ""
 
-#: recurrenceedit.cpp:1392
-msgctxt "@item:inlistbox"
-msgid "4th"
+#: resourceselector.cpp:450
+#, kde-format
+msgctxt "@info"
+msgid "<para>It also contains:%1</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:1393
-msgctxt "@item:inlistbox"
-msgid "5th"
+#: resourceselector.cpp:451
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para><resource>%1</resource> is the default calendar "
+"for:%2</para>%3<para>Do you really want to remove it from all calendar "
+"lists?</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:1394
-msgctxt "@item:inlistbox Last Monday in March"
-msgid "Last"
+#: resourceselector.cpp:455 resourceselector.cpp:463
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Do you really want to remove your default calendar (<resource>%1</resource>) "
+"from the list?"
 msgstr ""
 
-#: recurrenceedit.cpp:1395
-msgctxt "@item:inlistbox"
-msgid "2nd Last"
+#: resourceselector.cpp:458
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para><resource>%1</resource> contains:%2</para><para>Do you really want to "
+"remove it from all calendar lists?</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:1396
-msgctxt "@item:inlistbox"
-msgid "3rd Last"
+#: resourceselector.cpp:461 resourceselector.cpp:464
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Do you really want to remove the calendar <resource>%1</resource> from the "
+"list?"
 msgstr ""
 
-#: recurrenceedit.cpp:1397
-msgctxt "@item:inlistbox"
-msgid "4th Last"
+#: resourceselector.cpp:501
+msgctxt "@action Reload calendar"
+msgid "Re&load"
 msgstr ""
 
-#: recurrenceedit.cpp:1398
-msgctxt "@item:inlistbox"
-msgid "5th Last"
+#: resourceselector.cpp:505
+msgctxt "@action"
+msgid "&Save"
 msgstr ""
 
-#: recurrenceedit.cpp:1401
-msgctxt "@item:inlistbox Every (Monday...) in month"
-msgid "Every"
+#: resourceselector.cpp:509
+msgctxt "@action"
+msgid "Show &Details"
 msgstr ""
 
-#: recurrenceedit.cpp:1404
-msgctxt "@info:whatsthis"
-msgid "Select the week of the month in which to repeat the alarm"
+#: resourceselector.cpp:512
+msgctxt "@action"
+msgid "Set &Color..."
 msgstr ""
 
-#: recurrenceedit.cpp:1419
-msgctxt "@info:whatsthis"
-msgid "Select the day of the week on which to repeat the alarm"
+#: resourceselector.cpp:515
+msgctxt "@action"
+msgid "Clear C&olor"
 msgstr ""
 
-#: recurrenceedit.cpp:1542
-msgctxt "@label Time unit for user-entered number"
-msgid "month(s)"
+#: resourceselector.cpp:522
+msgctxt "@action"
+msgid "&Update Calendar Format"
 msgstr ""
 
-#: recurrenceedit.cpp:1543
-msgctxt "@info:whatsthis"
-msgid "Enter the number of months between repetitions of the alarm"
+#: resourceselector.cpp:526
+msgctxt "@action"
+msgid "&Remove"
 msgstr ""
 
-#: recurrenceedit.cpp:1554
-msgctxt "@label Time unit for user-entered number"
-msgid "year(s)"
+#: resourceselector.cpp:532
+msgctxt "@action"
+msgid "&Add..."
 msgstr ""
 
-#: recurrenceedit.cpp:1555
-msgctxt "@info:whatsthis"
-msgid "Enter the number of years between repetitions of the alarm"
+#: resourceselector.cpp:535
+msgctxt "@action"
+msgid "Im&port..."
 msgstr ""
 
-#: recurrenceedit.cpp:1562
-msgctxt "@label List of months to select"
-msgid "Months:"
+#: resourceselector.cpp:621
+msgctxt "@action"
+msgid "Use as &Default for Active Alarms"
 msgstr ""
 
-#: recurrenceedit.cpp:1584
-msgctxt "@info:whatsthis"
-msgid "Select the months of the year in which to repeat the alarm"
+#: resourceselector.cpp:622
+msgctxt "@action"
+msgid "Use as &Default for Archived Alarms"
 msgstr ""
 
-#: recurrenceedit.cpp:1593
-msgctxt "@label:listbox"
-msgid "February 2&9th alarm in non-leap years:"
+#: resourceselector.cpp:623
+msgctxt "@action"
+msgid "Use as &Default for Alarm Templates"
+msgstr ""
+
+#: resourceselector.cpp:740
+msgctxt "@info/plain"
+msgid "It is not an active alarm calendar."
 msgstr ""
 
-#: recurrenceedit.cpp:1597
-msgctxt "@item:inlistbox No date"
-msgid "None"
+#: resourceselector.cpp:743
+msgctxt "@info/plain"
+msgid "It is not an archived alarm calendar."
 msgstr ""
 
-#: recurrenceedit.cpp:1598
-msgctxt "@item:inlistbox 1st March (short form)"
-msgid "1 Mar"
+#: resourceselector.cpp:746
+msgctxt "@info/plain"
+msgid "It is not an alarm template calendar."
 msgstr ""
 
-#: recurrenceedit.cpp:1599
-msgctxt "@item:inlistbox 28th February (short form)"
-msgid "28 Feb"
+#: resourceselector.cpp:751
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>Calendar <resource>%1</resource> has been "
+"disabled:</para><para>%2</para>"
 msgstr ""
 
-#: recurrenceedit.cpp:1605
-msgctxt "@info:whatsthis"
-msgid ""
-"Select which date, if any, the February 29th alarm should trigger in non-"
-"leap years"
+#: resourceselector.cpp:861
+msgctxt "@info/plain List separator"
+msgid ", "
 msgstr ""
 
-#: recurrenceedit.cpp:1689
+#: resourceselector.cpp:873
+#, kde-format
 msgctxt "@info"
-msgid "No month selected"
+msgid ""
+"<title>%1</title><para>ID: %2<nl/>Calendar type: %3<nl/>Contents: %4<nl/>%5: "
+"<filename>%6</filename><nl/>Permissions: %7<nl/>Status: %8<nl/>Default "
+"calendar: %9</para>"
 msgstr ""
 
-#: functions.cpp:179
-msgctxt "@action"
-msgid "Enable &Alarms"
+#: kamail.cpp:89
+msgctxt "@info/plain"
+msgid ""
+"A 'From' email address must be configured in order to execute email alarms."
 msgstr ""
 
-#: functions.cpp:192
-msgctxt "@action"
-msgid "Stop Play"
+#: kamail.cpp:92
+msgctxt ""
+"@info/plain KMail folder name: this should be translated the same as in kmail"
+msgid "sent-mail"
 msgstr ""
 
-#: functions.cpp:205
-msgctxt "@action"
-msgid "Spread Windows"
+#: kamail.cpp:124
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Invalid 'From' email address.<nl/>Email identity <resource>%1</resource> not "
+"found"
 msgstr ""
 
-#: functions.cpp:1052
+#: kamail.cpp:130
+#, kde-format
 msgctxt "@info"
-msgid "Error saving alarms"
+msgid ""
+"Invalid 'From' email address.<nl/>Email identity <resource>%1</resource> has "
+"no email address"
 msgstr ""
 
-#: functions.cpp:1053
+#: kamail.cpp:140
 msgctxt "@info"
-msgid "Error saving alarm"
+msgid ""
+"<para>No 'From' email address is configured (no default email identity "
+"found)</para><para>Please set it in <application>KMail</application> or in "
+"the <application>KAlarm</application> Configuration dialog.</para>"
 msgstr ""
 
-#: functions.cpp:1056
+#: kamail.cpp:144
 msgctxt "@info"
-msgid "Error deleting alarms"
+msgid ""
+"<para>No 'From' email address is configured.</para><para>Please set it in "
+"the KDE System Settings or in the <application>KAlarm</application> "
+"Configuration dialog.</para>"
 msgstr ""
 
-#: functions.cpp:1057
+#: kamail.cpp:149
 msgctxt "@info"
-msgid "Error deleting alarm"
+msgid ""
+"<para>No 'From' email address is configured.</para><para>Please set it in "
+"the <application>KAlarm</application> Configuration dialog.</para>"
 msgstr ""
 
-#: functions.cpp:1060
+#: kamail.cpp:197
+#, kde-format
 msgctxt "@info"
-msgid "Error saving reactivated alarms"
+msgid ""
+"No mail transport configured for email identity <resource>%1</resource>"
 msgstr ""
 
-#: functions.cpp:1061
+#: kamail.cpp:257
 msgctxt "@info"
-msgid "Error saving reactivated alarm"
+msgid "Emails may not have been sent"
 msgstr ""
 
-#: functions.cpp:1064
+#: kamail.cpp:258
 msgctxt "@info"
-msgid "Error saving alarm templates"
+msgid "Program error"
 msgstr ""
 
-#: functions.cpp:1065
+#: kamail.cpp:367
+#, kde-format
 msgctxt "@info"
-msgid "Error saving alarm template"
+msgid "Error attaching file: <filename>%1</filename>"
 msgstr ""
 
-#: functions.cpp:1084
+#: kamail.cpp:372
+#, kde-format
 msgctxt "@info"
-msgid "Unable to show alarms in KOrganizer"
+msgid "Attachment not found: <filename>%1</filename>"
 msgstr ""
 
-#: functions.cpp:1085
+#: kamail.cpp:454
 msgctxt "@info"
-msgid "Unable to show alarm in KOrganizer"
+msgid "An email has been queued to be sent"
 msgstr ""
 
-#: functions.cpp:1088
+#: kamail.cpp:628
 msgctxt "@info"
-msgid "Unable to update alarm in KOrganizer"
+msgid "Failed to send email"
 msgstr ""
 
-#: functions.cpp:1091
+#: kamail.cpp:629
 msgctxt "@info"
-msgid "Unable to delete alarms from KOrganizer"
+msgid "Error sending email"
 msgstr ""
 
-#: functions.cpp:1092
-msgctxt "@info"
-msgid "Unable to delete alarm from KOrganizer"
+#: akonadimodel.cpp:634
+msgctxt "@title:column"
+msgid "Calendars"
 msgstr ""
 
-#: functions.cpp:1099
-#, kde-format
-msgctxt "@info"
-msgid "<para>%1</para><para>(KOrganizer not fully started)</para>"
+#: akonadimodel.cpp:998
+msgctxt "@info/plain"
+msgid "Read-only (old format)"
+msgstr ""
+
+#: akonadimodel.cpp:1002
+msgctxt "@info/plain"
+msgid "Read-only (other format)"
 msgstr ""
 
-#: functions.cpp:1101
+#: akonadimodel.cpp:1154
 #, kde-format
 msgctxt "@info"
-msgid "<para>%1</para><para>(Error communicating with KOrganizer)</para>"
+msgid "Failed to remove calendar <resource>%1</resource>."
 msgstr ""
 
-#: functions.cpp:1354
+#: akonadimodel.cpp:1205
 #, kde-format
 msgctxt "@info"
-msgid "Error obtaining authorization (%1)"
+msgid "Failed to update calendar <resource>%1</resource>."
 msgstr ""
 
-#: functions.cpp:1379
-msgctxt "@info"
-msgid "You must enable a template calendar to save the template in"
+#: akonadimodel.cpp:1493
+msgctxt "@info/plain"
+msgid "Failed to create alarm."
+msgstr ""
+
+#: akonadimodel.cpp:1495
+msgctxt "@info/plain"
+msgid "Failed to update alarm."
+msgstr ""
+
+#: akonadimodel.cpp:1497
+msgctxt "@info/plain"
+msgid "Failed to delete alarm."
 msgstr ""
 
-#: functions.cpp:1635
+#: rtcwakeaction.cpp:89
 #, kde-format
-msgctxt "@info Please set the 'From' email address..."
-msgid ""
-"<para>%1</para><para>Please set it in the Configuration dialog.</para>"
+msgctxt "@text/plain"
+msgid "Could not run <command>%1</command> to set wake from suspend"
 msgstr ""
 
-#: functions.cpp:1639
-msgctxt "@info"
+#: rtcwakeaction.cpp:92
+#, kde-format
+msgctxt "@text/plain"
 msgid ""
-"<para>Alarms are currently disabled.</para><para>Do you want to enable "
-"alarms now?</para>"
+"Error setting wake from suspend.<nl/>Command was: "
+"<command>%1</command><nl/>Error code: %2."
 msgstr ""
 
-#: functions.cpp:1640
-msgctxt "@action:button"
-msgid "Enable"
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
 msgstr ""
+"Owain Green drwy KGyfieithu - Meddalwedd Gymraeg, ,Launchpad Contributions:"
 
-#: functions.cpp:1640
-msgctxt "@action:button"
-msgid "Keep Disabled"
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
+
+#. i18n: file: kalarmresource.kcfg:9
+#. i18n: ectx: label, entry (Path), group (General)
+#: rc.cpp:5
+msgid "Path to KAlarm calendar file."
 msgstr ""
 
-#: functions.cpp:1707
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Unable to start <application>KMail</application><nl/>(<message>%1</message>)"
+#. i18n: file: kalarmresource.kcfg:13
+#. i18n: ectx: label, entry (DisplayName), group (General)
+#. i18n: file: kalarmdirresource.kcfg:13
+#. i18n: ectx: label, entry (DisplayName), group (General)
+#: rc.cpp:8 rc.cpp:62
+msgid "Display name."
 msgstr ""
 
-#: functions.cpp:1985
-msgctxt "@info"
-msgid "Please select a file to display"
+#. i18n: file: kalarmresource.kcfg:17
+#. i18n: ectx: label, entry (ReadOnly), group (General)
+#. i18n: file: kalarmdirresource.kcfg:17
+#. i18n: ectx: label, entry (ReadOnly), group (General)
+#: rc.cpp:11 rc.cpp:65
+msgid "Do not change the actual backend data."
 msgstr ""
 
-#: functions.cpp:1987
-msgctxt "@info"
-msgid "Please select a file to play"
+#. i18n: file: kalarmresource.kcfg:21
+#. i18n: ectx: label, entry (MonitorFile), group (General)
+#: rc.cpp:14
+msgid "Monitor file for changes."
 msgstr ""
 
-#: functions.cpp:1993
-#, kde-format
-msgctxt "@info"
-msgid "<filename>%1</filename> is a folder"
+#. i18n: file: kalarmresource.kcfg:25
+#. i18n: ectx: label, entry (AlarmTypes), group (General)
+#. i18n: file: kalarmdirresource.kcfg:25
+#. i18n: ectx: label, entry (AlarmTypes), group (General)
+#: rc.cpp:17 rc.cpp:71
+msgid "Alarm types."
 msgstr ""
 
-#: functions.cpp:1995
-#, kde-format
-msgctxt "@info"
-msgid "<filename>%1</filename> not found"
+#. i18n: file: kalarmresource.kcfg:28
+#. i18n: ectx: label, entry (UpdateStorageFormat), group (General)
+#. i18n: file: kalarmdirresource.kcfg:28
+#. i18n: ectx: label, entry (UpdateStorageFormat), group (General)
+#: rc.cpp:20 rc.cpp:74
+msgid "Update backend storage format."
 msgstr ""
 
-#: functions.cpp:1996
-#, kde-format
-msgctxt "@info"
-msgid "<filename>%1</filename> is not readable"
+#. i18n: file: wakedlg.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:23
+msgid "Wake From Suspend Alarm"
 msgstr ""
 
-#: functions.cpp:1997
-#, kde-format
-msgctxt "@info"
-msgid "<filename>%1</filename> appears not to be a text or image file"
+#. i18n: file: wakedlg.ui:38
+#. i18n: ectx: property (toolTip), widget (QPushButton, showWakeButton)
+#: rc.cpp:26
+msgid "Show current wake-from-suspend alarm"
 msgstr ""
 
-#: kalarmapp.cpp:338
-#, kde-format
-msgctxt "@info:shell"
+#. i18n: file: wakedlg.ui:41
+#. i18n: ectx: property (whatsThis), widget (QPushButton, showWakeButton)
+#: rc.cpp:29
 msgid ""
-"<icode>%1</icode>: Event <resource>%2</resource> not found, or not editable"
+"Highlight the current wake-from-suspend alarm in the alarm list. This button "
+"is disabled if no wake-from-suspend alarm is configured."
 msgstr ""
 
-#: kalarmapp.cpp:516
-msgctxt "@info"
-msgid ""
-"Time zones are not accessible:<nl/>KAlarm will use the UTC time "
-"zone.<nl/><nl/>(The KDE time zone service is not available:<nl/>check that "
-"<application>ktimezoned</application> is installed.)"
+#. i18n: file: wakedlg.ui:44
+#. i18n: ectx: property (text), widget (QPushButton, showWakeButton)
+#: rc.cpp:32
+msgid "Show current alarm"
 msgstr ""
 
-#: kalarmapp.cpp:588
-msgctxt "@info"
+#. i18n: file: wakedlg.ui:51
+#. i18n: ectx: property (toolTip), widget (QPushButton, useWakeButton)
+#: rc.cpp:35
+msgid "Set highlighted alarm as the wake-from-suspend alarm"
+msgstr ""
+
+#. i18n: file: wakedlg.ui:54
+#. i18n: ectx: property (whatsThis), widget (QPushButton, useWakeButton)
+#: rc.cpp:38
 msgid ""
-"Quitting will disable alarms (once any alarm message windows are closed)."
+"Set the alarm highlighted in the alarm list to wake-from-suspend. This "
+"replaces any existing wake-from-suspend alarm."
 msgstr ""
 
-#: kalarmapp.cpp:598
-msgctxt "@info"
+#. i18n: file: wakedlg.ui:57
+#. i18n: ectx: property (text), widget (QPushButton, useWakeButton)
+#: rc.cpp:41
+msgid "Use highlighted alarm"
+msgstr ""
+
+#. i18n: file: wakedlg.ui:70
+#. i18n: ectx: property (toolTip), widget (QPushButton, cancelWakeButton)
+#: rc.cpp:44
+msgid "Cancel the current wake-from-suspend"
+msgstr ""
+
+#. i18n: file: wakedlg.ui:73
+#. i18n: ectx: property (whatsThis), widget (QPushButton, cancelWakeButton)
+#: rc.cpp:47
 msgid ""
-"Do you want to start KAlarm at login?<nl/>(Note that alarms will be disabled "
-"if KAlarm is not started.)"
+"Cancel the currently configured wake-from-suspend. Note that this does not "
+"cancel the alarm itself, which will still trigger in the normal way. This "
+"button is disabled if no wake-from-suspend alarm is configured."
 msgstr ""
 
-#: kalarmapp.cpp:1953
-msgctxt "@info"
-msgid "Error creating temporary script file"
+#. i18n: file: wakedlg.ui:76
+#. i18n: ectx: property (text), widget (QPushButton, cancelWakeButton)
+#: rc.cpp:50
+msgid "Cancel wake from suspend"
 msgstr ""
 
-#: kalarmapp.cpp:2041
-msgctxt "@info"
-msgid "Pre-alarm action:"
+#. i18n: file: wakedlg.ui:109
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, advanceWakeTime)
+#: rc.cpp:53
+msgid ""
+"Enter how many minutes before the alarm trigger time to wake the system from "
+"suspend. This can be used to ensure that the system is fully restored by the "
+"time the alarm triggers."
 msgstr ""
 
-#: kalarmapp.cpp:2047
-msgctxt "@info"
-msgid "Post-alarm action:"
+#. i18n: file: wakedlg.ui:119
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:56
+msgid "Number of minutes before alarm to wake from suspend"
 msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
+#. i18n: file: kalarmdirresource.kcfg:9
+#. i18n: ectx: label, entry (Path), group (General)
+#: rc.cpp:59
+msgid "Path to KAlarm directory."
 msgstr ""
-"Owain Green drwy KGyfieithu - Meddalwedd Gymraeg, ,Launchpad Contributions:"
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
+#. i18n: file: kalarmdirresource.kcfg:21
+#. i18n: ectx: label, entry (MonitorFiles), group (General)
+#: rc.cpp:68
+msgid "Monitor directory for changes."
+msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:58
 #. i18n: ectx: label, entry (Version), group (General)
-#: rc.cpp:5
+#: rc.cpp:77
 msgctxt "@label"
 msgid "KAlarm version"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:59
 #. i18n: ectx: whatsthis, entry (Version), group (General)
-#: rc.cpp:8
+#: rc.cpp:80
 msgctxt "@info:whatsthis"
 msgid "KAlarm version which wrote this file."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:62
 #. i18n: ectx: label, entry (Base_TimeZone), group (General)
-#: rc.cpp:11
+#: rc.cpp:83
 msgctxt "@label"
 msgid "Time zone"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:67
 #. i18n: ectx: label, entry (Base_HolidayRegion), group (General)
-#: rc.cpp:17
+#: rc.cpp:89
 msgctxt "@label"
 msgid "Holiday region"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:68
 #. i18n: ectx: whatsthis, entry (Base_HolidayRegion), group (General)
-#: rc.cpp:20
+#: rc.cpp:92
 msgctxt "@info:whatsthis"
 msgid "Select the holiday region to use."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:72
 #. i18n: ectx: label, entry (DefaultFgColour), group (General)
-#: rc.cpp:23
+#: rc.cpp:95
 msgctxt "@label"
 msgid "Foreground color"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:73
 #. i18n: ectx: whatsthis, entry (DefaultFgColour), group (General)
-#: rc.cpp:26
+#: rc.cpp:98
 msgctxt "@info:whatsthis"
 msgid "Default foreground color for alarm message windows."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:77
 #. i18n: ectx: label, entry (DefaultBgColour), group (General)
-#: rc.cpp:29
+#: rc.cpp:101
 msgctxt "@label"
 msgid "Background color"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:78
 #. i18n: ectx: whatsthis, entry (DefaultBgColour), group (General)
-#: rc.cpp:32
+#: rc.cpp:104
 msgctxt "@info:whatsthis"
 msgid "Default background color for alarm message windows."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:82
 #. i18n: ectx: label, entry (MessageFont), group (General)
-#: rc.cpp:35
+#: rc.cpp:107
 msgctxt "@label"
 msgid "Message font"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:83
 #. i18n: ectx: whatsthis, entry (MessageFont), group (General)
-#: rc.cpp:38
+#: rc.cpp:110
 msgctxt "@info:whatsthis"
 msgid "Default font for displaying alarm messages."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:88
 #. i18n: ectx: label, entry (ShowInSystemTray), group (General)
-#: rc.cpp:41
+#: rc.cpp:113
 msgctxt "@label"
 msgid "Show in system tray"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:94
 #. i18n: ectx: label, entry (AutoStart), group (General)
-#: rc.cpp:47
+#: rc.cpp:119
 msgctxt "@label"
 msgid "Start at login"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:99
 #. i18n: ectx: label, entry (NoAutoStart), group (General)
-#: rc.cpp:53
+#: rc.cpp:125
 msgctxt "@label"
 msgid "Suppress autostart at login"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:103
 #. i18n: ectx: label, entry (DefaultDeferTime), group (General)
-#: rc.cpp:56
+#: rc.cpp:128
 msgctxt "@label"
 msgid "Default defer time interval"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:104
 #. i18n: ectx: whatsthis, entry (DefaultDeferTime), group (General)
-#: rc.cpp:59
+#: rc.cpp:131
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter the default time interval (in minutes) to defer alarms, used by the "
@@ -5128,28 +5258,28 @@
 
 #. i18n: file: kalarmconfig.kcfg:108
 #. i18n: ectx: label, entry (AskResource), group (General)
-#: rc.cpp:62
+#: rc.cpp:134
 msgctxt "@label"
 msgid "Prompt for which calendar to store in"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:114
 #. i18n: ectx: label, entry (ModalMessages), group (General)
-#: rc.cpp:68
+#: rc.cpp:140
 msgctxt "@label"
 msgid "Message windows have a title bar and take keyboard focus"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:119
 #. i18n: ectx: label, entry (MessageButtonDelay), group (General)
-#: rc.cpp:74
+#: rc.cpp:146
 msgctxt "@label"
 msgid "Delay before message window buttons are enabled"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:124
 #. i18n: ectx: whatsthis, entry (MessageButtonDelay), group (General)
-#: rc.cpp:77
+#: rc.cpp:149
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Specify the positioning of alarm message windows, and the delay in "
@@ -5165,14 +5295,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:130
 #. i18n: ectx: label, entry (TooltipAlarmCount), group (General)
-#: rc.cpp:84
+#: rc.cpp:156
 msgctxt "@label"
 msgid "Number of alarms to show in system tray tooltip"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:135
 #. i18n: ectx: whatsthis, entry (TooltipAlarmCount), group (General)
-#: rc.cpp:87
+#: rc.cpp:159
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>How many alarms due in the next 24 hours to show in the system tray "
@@ -5185,35 +5315,35 @@
 
 #. i18n: file: kalarmconfig.kcfg:141
 #. i18n: ectx: label, entry (ShowTooltipAlarmTime), group (General)
-#: rc.cpp:94
+#: rc.cpp:166
 msgctxt "@label"
 msgid "Show alarm times in system tray tooltip"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:147
 #. i18n: ectx: label, entry (ShowTooltipTimeToAlarm), group (General)
-#: rc.cpp:100
+#: rc.cpp:172
 msgctxt "@label"
 msgid "Show time to alarms in system tray tooltip"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:153
 #. i18n: ectx: label, entry (TooltipTimeToPrefix), group (General)
-#: rc.cpp:106
+#: rc.cpp:178
 msgctxt "@label"
 msgid "Time-to-alarm prefix in system tray tooltip"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:159
 #. i18n: ectx: label, entry (EmailClient), group (General)
-#: rc.cpp:112
+#: rc.cpp:184
 msgctxt "@label"
 msgid "Email client"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:160
 #. i18n: ectx: whatsthis, entry (EmailClient), group (General)
-#: rc.cpp:115
+#: rc.cpp:187
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>How to send email when an email alarm is triggered.<list><item>KMail: "
@@ -5227,28 +5357,28 @@
 
 #. i18n: file: kalarmconfig.kcfg:162
 #. i18n: ectx: label, entry (EmailClient), group (General)
-#: rc.cpp:118
+#: rc.cpp:190
 msgctxt "@option"
 msgid "Sendmail"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:163
 #. i18n: ectx: label, entry (EmailClient), group (General)
-#: rc.cpp:121
+#: rc.cpp:193
 msgctxt "@option"
 msgid "KMail"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:168
 #. i18n: ectx: label, entry (Base_EmailCopyToKMail), group (General)
-#: rc.cpp:124
+#: rc.cpp:196
 msgctxt "@label"
 msgid "Whether to copy sent emails into KMail's Sent folder."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:169
 #. i18n: ectx: whatsthis, entry (Base_EmailCopyToKMail), group (General)
-#: rc.cpp:127
+#: rc.cpp:199
 msgctxt "@info:whatsthis"
 msgid ""
 "Whether after sending an email to store a copy in KMail's sent-mail folder. "
@@ -5257,14 +5387,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:173
 #. i18n: ectx: label, entry (Base_EmailFrom), group (General)
-#: rc.cpp:130
+#: rc.cpp:202
 msgctxt "@label"
 msgid "'From' email address"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:174
 #. i18n: ectx: whatsthis, entry (Base_EmailFrom), group (General)
-#: rc.cpp:133
+#: rc.cpp:205
 msgctxt "@info:whatsthis"
 msgid ""
 "Your email address, used to identify you as the sender when sending email "
@@ -5275,14 +5405,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:178
 #. i18n: ectx: label, entry (Base_EmailBccAddress), group (General)
-#: rc.cpp:136
+#: rc.cpp:208
 msgctxt "@label"
 msgid "'Bcc' email address"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:179
 #. i18n: ectx: whatsthis, entry (Base_EmailBccAddress), group (General)
-#: rc.cpp:139
+#: rc.cpp:211
 msgctxt "@info:whatsthis"
 msgid ""
 "Your email address, used for blind copying email alarms to yourself. If you "
@@ -5294,14 +5424,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:183
 #. i18n: ectx: label, entry (Base_CmdXTermCommand), group (General)
-#: rc.cpp:142
+#: rc.cpp:214
 msgctxt "@label"
 msgid "Terminal for command alarms"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:184
 #. i18n: ectx: whatsthis, entry (Base_CmdXTermCommand), group (General)
-#: rc.cpp:145
+#: rc.cpp:217
 msgctxt "@info:whatsthis"
 msgid ""
 "Command line to execute command alarms in a terminal window, including "
@@ -5310,14 +5440,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:187
 #. i18n: ectx: label, entry (Base_StartOfDay), group (General)
-#: rc.cpp:148
+#: rc.cpp:220
 msgctxt "@label"
 msgid "Start of day for date-only alarms"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:188
 #. i18n: ectx: whatsthis, entry (Base_StartOfDay), group (General)
-#: rc.cpp:151
+#: rc.cpp:223
 msgctxt "@info:whatsthis"
 msgid ""
 "The earliest time of day at which a date-only alarm will be triggered."
@@ -5325,42 +5455,42 @@
 
 #. i18n: file: kalarmconfig.kcfg:193
 #. i18n: ectx: label, entry (Base_WorkDayStart), group (General)
-#: rc.cpp:154
+#: rc.cpp:226
 msgctxt "@label"
 msgid "Start time of working day"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:194
 #. i18n: ectx: whatsthis, entry (Base_WorkDayStart), group (General)
-#: rc.cpp:157
+#: rc.cpp:229
 msgctxt "@info:whatsthis"
 msgid "The start time of the working day."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:199
 #. i18n: ectx: label, entry (Base_WorkDayEnd), group (General)
-#: rc.cpp:160
+#: rc.cpp:232
 msgctxt "@label"
 msgid "End time of working day"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:200
 #. i18n: ectx: whatsthis, entry (Base_WorkDayEnd), group (General)
-#: rc.cpp:163
+#: rc.cpp:235
 msgctxt "@info:whatsthis"
 msgid "The end time of the working day."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:205
 #. i18n: ectx: label, entry (Base_WorkDays), group (General)
-#: rc.cpp:166
+#: rc.cpp:238
 msgctxt "@label"
 msgid "Working days"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:206
 #. i18n: ectx: whatsthis, entry (Base_WorkDays), group (General)
-#: rc.cpp:169
+#: rc.cpp:241
 msgctxt "@info:whatsthis"
 msgid ""
 "OR'ed bits indicating which days of the week are work days, 1 = Monday ... "
@@ -5369,28 +5499,28 @@
 
 #. i18n: file: kalarmconfig.kcfg:211
 #. i18n: ectx: label, entry (DisabledColour), group (General)
-#: rc.cpp:172
+#: rc.cpp:244
 msgctxt "@label"
 msgid "Disabled alarm color"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:217
 #. i18n: ectx: label, entry (ArchivedColour), group (General)
-#: rc.cpp:178
+#: rc.cpp:250
 msgctxt "@label"
 msgid "Archived alarm color"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:223
 #. i18n: ectx: label, entry (ArchivedKeepDays), group (General)
-#: rc.cpp:184
+#: rc.cpp:256
 msgctxt "@label"
 msgid "Days to keep expired alarms"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:228
 #. i18n: ectx: whatsthis, entry (ArchivedKeepDays), group (General)
-#: rc.cpp:187
+#: rc.cpp:259
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Specify how many days to keep alarms after they expire or are deleted "
@@ -5403,14 +5533,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:234
 #. i18n: ectx: label, entry (KOrgEventDuration), group (General)
-#: rc.cpp:194
+#: rc.cpp:266
 msgctxt "@label"
 msgid "KOrganizer event duration"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:235
 #. i18n: ectx: whatsthis, entry (KOrgEventDuration), group (General)
-#: rc.cpp:197
+#: rc.cpp:269
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter the event duration in minutes, for alarms which are copied to "
@@ -5419,14 +5549,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:239
 #. i18n: ectx: label, entry (WakeFromSuspendAdvance), group (General)
-#: rc.cpp:200
+#: rc.cpp:272
 msgctxt "@label"
 msgid "Number of minutes before alarm to wake from suspend"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:240
 #. i18n: ectx: whatsthis, entry (WakeFromSuspendAdvance), group (General)
-#: rc.cpp:203
+#: rc.cpp:275
 msgctxt "@info:whatsthis"
 msgid ""
 "Enter how many minutes before the alarm trigger time to wake the system from "
@@ -5436,14 +5566,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:246
 #. i18n: ectx: label, entry (DefaultLateCancel), group (Defaults)
-#: rc.cpp:206
+#: rc.cpp:278
 msgctxt "@label"
 msgid "Cancel if late (minutes)"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:247
 #. i18n: ectx: whatsthis, entry (DefaultLateCancel), group (Defaults)
-#: rc.cpp:209
+#: rc.cpp:281
 msgctxt "@info:whatsthis"
 msgid ""
 "Default value in the alarm edit dialog for late cancellation time (in "
@@ -5452,28 +5582,28 @@
 
 #. i18n: file: kalarmconfig.kcfg:252
 #. i18n: ectx: label, entry (DefaultAutoClose), group (Defaults)
-#: rc.cpp:212
+#: rc.cpp:284
 msgctxt "@label"
 msgid "Auto-close window after late-cancellation time"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:253
 #. i18n: ectx: whatsthis, entry (DefaultAutoClose), group (Defaults)
-#: rc.cpp:215
+#: rc.cpp:287
 msgctxt "@info:whatsthis"
 msgid "Default setting in the alarm edit dialog for \"auto close if late\"."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:257
 #. i18n: ectx: label, entry (DefaultConfirmAck), group (Defaults)
-#: rc.cpp:218
+#: rc.cpp:290
 msgctxt "@label"
 msgid "Confirm acknowledgement"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:258
 #. i18n: ectx: whatsthis, entry (DefaultConfirmAck), group (Defaults)
-#: rc.cpp:221
+#: rc.cpp:293
 msgctxt "@info:whatsthis"
 msgid ""
 "Default setting in the alarm edit dialog for \"confirm alarm "
@@ -5482,63 +5612,63 @@
 
 #. i18n: file: kalarmconfig.kcfg:262
 #. i18n: ectx: label, entry (DefaultCopyToKOrganizer), group (Defaults)
-#: rc.cpp:224
+#: rc.cpp:296
 msgctxt "@label"
 msgid "Show in KOrganizer"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:263
 #. i18n: ectx: whatsthis, entry (DefaultCopyToKOrganizer), group (Defaults)
-#: rc.cpp:227
+#: rc.cpp:299
 msgctxt "@info:whatsthis"
 msgid "Default setting in the alarm edit dialog for \"show in KOrganizer\"."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:267
 #. i18n: ectx: label, entry (DefaultSoundType), group (Defaults)
-#: rc.cpp:230
+#: rc.cpp:302
 msgctxt "@label Label for audio options"
 msgid "Sound"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:268
 #. i18n: ectx: whatsthis, entry (DefaultSoundType), group (Defaults)
-#: rc.cpp:233
+#: rc.cpp:305
 msgctxt "@info:whatsthis"
 msgid "Default sound type in the alarm edit dialog."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:272
 #. i18n: ectx: label, entry (DefaultSoundType), group (Defaults)
-#: rc.cpp:236
+#: rc.cpp:308
 msgctxt "@option"
 msgid "Play File"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:278
 #. i18n: ectx: label, entry (DefaultSoundFile), group (Defaults)
-#: rc.cpp:239
+#: rc.cpp:311
 msgctxt "@label"
 msgid "Sound file"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:279
 #. i18n: ectx: whatsthis, entry (DefaultSoundFile), group (Defaults)
-#: rc.cpp:242
+#: rc.cpp:314
 msgctxt "@info:whatsthis"
 msgid "Default sound file path in the alarm edit dialog."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:282
 #. i18n: ectx: label, entry (Base_DefaultSoundVolume), group (Defaults)
-#: rc.cpp:245
+#: rc.cpp:317
 msgctxt "@label"
 msgid "Sound volume"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:283
 #. i18n: ectx: whatsthis, entry (Base_DefaultSoundVolume), group (Defaults)
-#: rc.cpp:249
+#: rc.cpp:321
 #, no-c-format
 msgctxt "@info:whatsthis"
 msgid ""
@@ -5548,42 +5678,42 @@
 
 #. i18n: file: kalarmconfig.kcfg:289
 #. i18n: ectx: label, entry (DefaultSoundRepeat), group (Defaults)
-#: rc.cpp:252
+#: rc.cpp:324
 msgctxt "@label"
 msgid "Repeat sound file"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:290
 #. i18n: ectx: whatsthis, entry (DefaultSoundRepeat), group (Defaults)
-#: rc.cpp:255
+#: rc.cpp:327
 msgctxt "@info:whatsthis"
 msgid "Default setting in the alarm edit dialog for sound repetition."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:294
 #. i18n: ectx: label, entry (DefaultCmdScript), group (Defaults)
-#: rc.cpp:258
+#: rc.cpp:330
 msgctxt "@label"
 msgid "Enter script"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:295
 #. i18n: ectx: whatsthis, entry (DefaultCmdScript), group (Defaults)
-#: rc.cpp:261
+#: rc.cpp:333
 msgctxt "@info:whatsthis"
 msgid "Default setting in the alarm edit dialog for command script entry."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:299
 #. i18n: ectx: label, entry (DefaultCmdLogType), group (Defaults)
-#: rc.cpp:264
+#: rc.cpp:336
 msgctxt "@label"
 msgid "Command output"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:300
 #. i18n: ectx: whatsthis, entry (DefaultCmdLogType), group (Defaults)
-#: rc.cpp:267
+#: rc.cpp:339
 msgctxt "@info:whatsthis"
 msgid ""
 "Default setting in the alarm edit dialog for where to send command alarm "
@@ -5592,49 +5722,49 @@
 
 #. i18n: file: kalarmconfig.kcfg:302
 #. i18n: ectx: label, entry (DefaultCmdLogType), group (Defaults)
-#: rc.cpp:270
+#: rc.cpp:342
 msgctxt "@option"
 msgid "Discard Output"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:303
 #. i18n: ectx: label, entry (DefaultCmdLogType), group (Defaults)
-#: rc.cpp:273
+#: rc.cpp:345
 msgctxt "@option"
 msgid "Log To File"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:304
 #. i18n: ectx: label, entry (DefaultCmdLogType), group (Defaults)
-#: rc.cpp:276
+#: rc.cpp:348
 msgctxt "@option"
 msgid "Execute in terminal window"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:309
 #. i18n: ectx: label, entry (DefaultCmdLogFile), group (Defaults)
-#: rc.cpp:279
+#: rc.cpp:351
 msgctxt "@label"
 msgid "Log file"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:310
 #. i18n: ectx: whatsthis, entry (DefaultCmdLogFile), group (Defaults)
-#: rc.cpp:282
+#: rc.cpp:354
 msgctxt "@info:whatsthis"
 msgid "Default log file path for command alarms in the alarm edit dialog."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:313
 #. i18n: ectx: label, entry (DefaultEmailBcc), group (Defaults)
-#: rc.cpp:285
+#: rc.cpp:357
 msgctxt "@label"
 msgid "Copy email to self"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:314
 #. i18n: ectx: whatsthis, entry (DefaultEmailBcc), group (Defaults)
-#: rc.cpp:288
+#: rc.cpp:360
 msgctxt "@info:whatsthis"
 msgid ""
 "Default setting in the alarm edit dialog for blind copying emails to self."
@@ -5642,98 +5772,98 @@
 
 #. i18n: file: kalarmconfig.kcfg:318
 #. i18n: ectx: label, entry (DefaultRecurPeriod), group (Defaults)
-#: rc.cpp:291
+#: rc.cpp:363
 msgctxt "@label"
 msgid "Recurrence period"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:321
 #. i18n: ectx: label, entry (DefaultRecurPeriod), group (Defaults)
-#: rc.cpp:297
+#: rc.cpp:369
 msgctxt "@option"
 msgid "No recurrence"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:322
 #. i18n: ectx: label, entry (DefaultRecurPeriod), group (Defaults)
-#: rc.cpp:300
+#: rc.cpp:372
 msgctxt "@option"
 msgid "At login"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:323
 #. i18n: ectx: label, entry (DefaultRecurPeriod), group (Defaults)
-#: rc.cpp:303
+#: rc.cpp:375
 msgctxt "@option"
 msgid "Hourly/minutely"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:335
 #. i18n: ectx: label, entry (DefaultFeb29Type), group (Defaults)
-#: rc.cpp:312
+#: rc.cpp:384
 msgctxt "@option"
 msgid "February 28th"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:336
 #. i18n: ectx: label, entry (DefaultFeb29Type), group (Defaults)
-#: rc.cpp:315
+#: rc.cpp:387
 msgctxt "@option"
 msgid "March 1st"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:337
 #. i18n: ectx: label, entry (DefaultFeb29Type), group (Defaults)
-#: rc.cpp:318
+#: rc.cpp:390
 msgctxt "@option"
 msgid "Do not repeat"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:343
 #. i18n: ectx: label, entry (DefaultReminderUnits), group (Defaults)
-#: rc.cpp:321
+#: rc.cpp:393
 msgctxt "@label"
 msgid "Reminder units"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:344
 #. i18n: ectx: whatsthis, entry (DefaultReminderUnits), group (Defaults)
-#: rc.cpp:324
+#: rc.cpp:396
 msgctxt "@info:whatsthis"
 msgid "Default reminder time units in the alarm edit dialog."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:347
 #. i18n: ectx: label, entry (DefaultReminderUnits), group (Defaults)
-#: rc.cpp:327
+#: rc.cpp:399
 msgctxt "@option"
 msgid "Hours/Minutes"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:352
 #. i18n: ectx: label, entry (DefaultPreAction), group (Defaults)
-#: rc.cpp:330
+#: rc.cpp:402
 msgctxt "@label"
 msgid "Pre-alarm action"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:353
 #. i18n: ectx: whatsthis, entry (DefaultPreAction), group (Defaults)
-#: rc.cpp:333
+#: rc.cpp:405
 msgctxt "@info:whatsthis"
 msgid "Default command to execute before displaying alarms."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:356
 #. i18n: ectx: label, entry (DefaultCancelOnPreActionError), group (Defaults)
-#: rc.cpp:336
+#: rc.cpp:408
 msgctxt "@label"
 msgid "Cancel alarm on pre-alarm action error"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:357
 #. i18n: ectx: whatsthis, entry (DefaultCancelOnPreActionError), group (Defaults)
-#: rc.cpp:339
+#: rc.cpp:411
 msgctxt "@info:whatsthis"
 msgid ""
 "Default setting for whether to cancel the alarm if the pre-alarm action "
@@ -5742,14 +5872,14 @@
 
 #. i18n: file: kalarmconfig.kcfg:361
 #. i18n: ectx: label, entry (DefaultDontShowPreActionError), group (Defaults)
-#: rc.cpp:342
+#: rc.cpp:414
 msgctxt "@label"
 msgid "Do not notify pre-alarm action errors"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:362
 #. i18n: ectx: whatsthis, entry (DefaultDontShowPreActionError), group (Defaults)
-#: rc.cpp:345
+#: rc.cpp:417
 msgctxt "@info:whatsthis"
 msgid ""
 "Default setting for whether to show no error status or error message if the "
@@ -5758,386 +5888,72 @@
 
 #. i18n: file: kalarmconfig.kcfg:366
 #. i18n: ectx: label, entry (DefaultPostAction), group (Defaults)
-#: rc.cpp:348
+#: rc.cpp:420
 msgctxt "@label"
 msgid "Post-alarm action"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:367
 #. i18n: ectx: whatsthis, entry (DefaultPostAction), group (Defaults)
-#: rc.cpp:351
+#: rc.cpp:423
 msgctxt "@info:whatsthis"
 msgid "Default command to execute after alarm message windows are closed."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:373
 #. i18n: ectx: label, entry (Base_QuitWarn), group (Notification Messages)
-#: rc.cpp:354
+#: rc.cpp:426
 msgctxt "@label"
 msgid "Warn before quitting"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:374
 #. i18n: ectx: whatsthis, entry (Base_QuitWarn), group (Notification Messages)
-#: rc.cpp:357
+#: rc.cpp:429
 msgctxt "@info:whatsthis"
 msgid "Whether to suppress a warning prompt before quitting KAlarm."
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:378
 #. i18n: ectx: label, entry (Base_ConfirmAlarmDeletion), group (Notification Messages)
-#: rc.cpp:360
+#: rc.cpp:432
 msgctxt "@label"
 msgid "Confirm alarm deletions"
 msgstr ""
 
 #. i18n: file: kalarmconfig.kcfg:383
 #. i18n: ectx: label, entry (Base_EmailQueuedNotify), group (Notification Messages)
-#: rc.cpp:366
+#: rc.cpp:438
 msgctxt "@label"
 msgid "Notify when remote emails are queued"
 msgstr ""
 
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:26
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:381
-msgid "Directory"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:384
-msgid "Directory Name"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:40
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:387
-msgid "&Directory:"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:390
-msgid ""
-"Select the directory whose contents should be represented by this resource. "
-"If the directory does not exist, it will be created."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:68
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:113
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:393 rc.cpp:471
-msgid "Display Name"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:76
-#. i18n: ectx: property (text), widget (QLabel, label_1)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:121
-#. i18n: ectx: property (text), widget (QLabel, label_1)
-#: rc.cpp:396 rc.cpp:474
-msgid "&Name:"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:91
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:399
-msgid ""
-"Enter the name used to identify this resource in displays. If not specified, "
-"the directory name will be used."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:104
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:18
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:402 rc.cpp:441
-msgid "Access Rights"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:110
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReadOnly)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_mobile.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReadOnly)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReadOnly)
-#: rc.cpp:405 rc.cpp:432 rc.cpp:444
-msgid "Read only"
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/settingsdialog.ui:117
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:408
-msgid ""
-"If read-only mode is enabled, no changes will be written to the directory "
-"selected above. Read-only mode will be automatically enabled if you do not "
-"have write access to the directory."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/kalarmdirresource.kcfg:9
-#. i18n: ectx: label, entry (Path), group (General)
-#: rc.cpp:411
-msgid "Path to KAlarm directory."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/kalarmdirresource.kcfg:13
-#. i18n: ectx: label, entry (DisplayName), group (General)
-#. i18n: file: akonadi/kalarm/kalarmresource.kcfg:13
-#. i18n: ectx: label, entry (DisplayName), group (General)
-#: rc.cpp:414 rc.cpp:495
-msgid "Display name."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/kalarmdirresource.kcfg:17
-#. i18n: ectx: label, entry (ReadOnly), group (General)
-#. i18n: file: akonadi/kalarm/kalarmresource.kcfg:17
-#. i18n: ectx: label, entry (ReadOnly), group (General)
-#: rc.cpp:417 rc.cpp:498
-msgid "Do not change the actual backend data."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/kalarmdirresource.kcfg:21
-#. i18n: ectx: label, entry (MonitorFiles), group (General)
-#: rc.cpp:420
-msgid "Monitor directory for changes."
-msgstr ""
-
-#. i18n: file: akonadi/kalarmdir/kalarmdirresource.kcfg:25
-#. i18n: ectx: label, entry (AlarmTypes), group (General)
-#. i18n: file: akonadi/kalarm/kalarmresource.kcfg:25
-#. i18n: ectx: label, entry (AlarmTypes), group (General)
-#: rc.cpp:423 rc.cpp:504
-msgid "Alarm types."
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_mobile.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:78
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:426 rc.cpp:462
-msgid "&Filename:"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_mobile.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:429
-msgid "&Display name:"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_mobile.ui:58
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_MonitorFile)
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:60
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_MonitorFile)
-#: rc.cpp:435 rc.cpp:456
-msgid "Enable file &monitoring"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:12
-#. i18n: ectx: attribute (title), widget (QWidget, SingleFileResourceConfigWidget)
-#: rc.cpp:438
-msgid "File"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:31
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:447
-msgid ""
-"If read-only mode is enabled, no changes will be written to the file "
-"selected above. Read-only mode will be automatically enabled if you do not "
-"have write access to the file or the file is on a remote server that does "
-"not support write access."
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:44
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_MonitorFile)
-#: rc.cpp:450
-msgid "Monitoring"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:50
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:453
-msgid ""
-"If file monitoring is enabled the resource will reload the file when changes "
-"are made by other programs. It also tries to create a backup in case of "
-"conflicts whenever possible."
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:70
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:459
-msgid "Filename"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:93
-#. i18n: ectx: property (text), widget (QLabel, statusLabel)
-#: rc.cpp:465
-msgid "Status:"
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:100
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:468
-msgid ""
-"Select the file whose contents should be represented by this resource. If "
-"the file does not exist, it will be created. A URL of a remote file can also "
-"be specified, but note that monitoring for file changes will not work in "
-"this case."
-msgstr ""
-
-#. i18n: file: akonadi/kdepim-runtime/shared/singlefileresourceconfigwidget_desktop.ui:136
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:477
-msgid ""
-"Enter the name used to identify this resource in displays. If not specified, "
-"the filename will be used."
-msgstr ""
-
-#. i18n: file: akonadi/common/alarmtypewidget.ui:8
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:480
-msgid "Alarm Types"
-msgstr ""
-
-#. i18n: file: akonadi/common/alarmtypewidget.ui:14
-#. i18n: ectx: property (text), widget (QCheckBox, activeCheckBox)
-#: rc.cpp:483
-msgid "Active Alarms"
-msgstr ""
-
-#. i18n: file: akonadi/common/alarmtypewidget.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, archivedCheckBox)
-#: rc.cpp:486
-msgid "Archived Alarms"
-msgstr ""
-
-#. i18n: file: akonadi/common/alarmtypewidget.ui:34
-#. i18n: ectx: property (text), widget (QCheckBox, templateCheckBox)
-#: rc.cpp:489
-msgid "Alarm Templates"
-msgstr ""
-
-#. i18n: file: akonadi/kalarm/kalarmresource.kcfg:9
-#. i18n: ectx: label, entry (Path), group (General)
-#: rc.cpp:492
-msgid "Path to KAlarm calendar file."
-msgstr ""
-
-#. i18n: file: akonadi/kalarm/kalarmresource.kcfg:21
-#. i18n: ectx: label, entry (MonitorFile), group (General)
-#: rc.cpp:501
-msgid "Monitor file for changes."
-msgstr ""
-
 #. i18n: file: kalarmui.rc:19
 #. i18n: ectx: Menu (file)
-#: rc.cpp:507
+#: rc.cpp:453
 msgid "&File"
 msgstr ""
 
 #. i18n: file: kalarmui.rc:31
 #. i18n: ectx: Menu (edit)
-#: rc.cpp:510
+#: rc.cpp:456
 msgid "&Edit"
 msgstr ""
 
 #. i18n: file: kalarmui.rc:46
 #. i18n: ectx: Menu (view)
-#: rc.cpp:513
+#: rc.cpp:459
 msgid "&View"
 msgstr ""
 
 #. i18n: file: kalarmui.rc:57
 #. i18n: ectx: Menu (actions)
-#: rc.cpp:516
+#: rc.cpp:462
 msgid "&Actions"
 msgstr "&Gweithredoedd"
 
 #. i18n: file: kalarmui.rc:69
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:519
+#: rc.cpp:465
 msgid "&Settings"
 msgstr ""
-
-#. i18n: file: wakedlg.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:522
-msgid "Wake From Suspend Alarm"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:38
-#. i18n: ectx: property (toolTip), widget (QPushButton, showWakeButton)
-#: rc.cpp:525
-msgid "Show current wake-from-suspend alarm"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:41
-#. i18n: ectx: property (whatsThis), widget (QPushButton, showWakeButton)
-#: rc.cpp:528
-msgid ""
-"Highlight the current wake-from-suspend alarm in the alarm list. This button "
-"is disabled if no wake-from-suspend alarm is configured."
-msgstr ""
-
-#. i18n: file: wakedlg.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, showWakeButton)
-#: rc.cpp:531
-msgid "Show current alarm"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:51
-#. i18n: ectx: property (toolTip), widget (QPushButton, useWakeButton)
-#: rc.cpp:534
-msgid "Set highlighted alarm as the wake-from-suspend alarm"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:54
-#. i18n: ectx: property (whatsThis), widget (QPushButton, useWakeButton)
-#: rc.cpp:537
-msgid ""
-"Set the alarm highlighted in the alarm list to wake-from-suspend. This "
-"replaces any existing wake-from-suspend alarm."
-msgstr ""
-
-#. i18n: file: wakedlg.ui:57
-#. i18n: ectx: property (text), widget (QPushButton, useWakeButton)
-#: rc.cpp:540
-msgid "Use highlighted alarm"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:70
-#. i18n: ectx: property (toolTip), widget (QPushButton, cancelWakeButton)
-#: rc.cpp:543
-msgid "Cancel the current wake-from-suspend"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:73
-#. i18n: ectx: property (whatsThis), widget (QPushButton, cancelWakeButton)
-#: rc.cpp:546
-msgid ""
-"Cancel the currently configured wake-from-suspend. Note that this does not "
-"cancel the alarm itself, which will still trigger in the normal way. This "
-"button is disabled if no wake-from-suspend alarm is configured."
-msgstr ""
-
-#. i18n: file: wakedlg.ui:76
-#. i18n: ectx: property (text), widget (QPushButton, cancelWakeButton)
-#: rc.cpp:549
-msgid "Cancel wake from suspend"
-msgstr ""
-
-#. i18n: file: wakedlg.ui:109
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, advanceWakeTime)
-#: rc.cpp:552
-msgid ""
-"Enter how many minutes before the alarm trigger time to wake the system from "
-"suspend. This can be used to ensure that the system is fully restored by the "
-"time the alarm triggers."
-msgstr ""
-
-#. i18n: file: wakedlg.ui:119
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:555
-msgid "Number of minutes before alarm to wake from suspend"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kalzium.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kalzium.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kalzium.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kalzium.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,15 +2,17 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kalzium.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-09 13:16+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2011-12-12 17:54+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -22,873 +24,898 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: src/tools/obconverterwidget.ui:22
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:438
-msgid "Files to convert"
-msgstr ""
-
-#. i18n: file: src/tools/obconverterwidget.ui:34
-#. i18n: ectx: property (text), widget (KPushButton, selectAllFileButton)
-#: rc.cpp:441
-msgid "&Select all"
-msgstr ""
-
-#. i18n: file: src/tools/obconverterwidget.ui:54
-#. i18n: ectx: property (text), widget (KPushButton, deleteFileButton)
-#: rc.cpp:444
-msgid "&Remove"
+#. i18n: file: src/calculator/concCalculator.ui:27
+#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
+#: rc.cpp:5
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Some of the following data is not necessary.  "
+"For instance, if you specify the amount of solute in moles, you do not have "
+"to specify the molar mass of the solute.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/obconverterwidget.ui:61
-#. i18n: ectx: property (text), widget (KPushButton, addFileButton)
-#: rc.cpp:447
-msgid "&Add"
+#. i18n: file: src/calculator/concCalculator.ui:34
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: src/calculator/gasCalculator.ui:37
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:12 rc.cpp:488
+msgid "Data"
 msgstr ""
 
-#. i18n: file: src/tools/obconverterwidget.ui:71
-#. i18n: ectx: property (whatsThis), widget (QListWidget, FileListView)
-#: rc.cpp:450
+#. i18n: file: src/calculator/concCalculator.ui:44
+#. i18n: ectx: property (text), widget (QLabel, label_36)
+#: rc.cpp:15
 msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal; text-decoration:none;\">\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">You see the files which "
-"will be converted here. Use the buttons to add and remove files from the "
-"list.</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/tools/obconverterwidget.ui:92
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:456
-msgid "Convert from:"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Amount of solute:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/obconverterwidget.ui:124
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:459
-msgid "Convert to:"
+#. i18n: file: src/calculator/concCalculator.ui:58
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, amtSolute)
+#: rc.cpp:22
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the amount of solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:34
-#. i18n: ectx: attribute (title), widget (QWidget, display)
-#: rc.cpp:342
-msgid "Display"
+#. i18n: file: src/calculator/concCalculator.ui:61
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, amtSolute)
+#: rc.cpp:29
+msgid "This is the box used to specify the amount of solute in the solution."
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:42
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:345
-msgid "Quality:"
+#. i18n: file: src/calculator/concCalculator.ui:74
+#. i18n: ectx: property (toolTip), widget (QComboBox, amtSltType)
+#: rc.cpp:32
+msgid "The method by which you want to specify the amount of solute"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:58
-#. i18n: ectx: property (text), item, widget (KComboBox, qualityCombo)
-#: rc.cpp:348
-msgid "Low"
+#. i18n: file: src/calculator/concCalculator.ui:77
+#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSltType)
+#: rc.cpp:35
+msgid ""
+"This box is used to change the mode in which the amount of solute is "
+"specified, i.e. mass, moles or volume."
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:63
-#. i18n: ectx: property (text), item, widget (KComboBox, qualityCombo)
-#: rc.cpp:351
-msgid "Medium"
+#. i18n: file: src/calculator/concCalculator.ui:81
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSltType)
+#. i18n: file: src/calculator/concCalculator.ui:252
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvtType)
+#. i18n: file: src/calculator/nuclearCalculator.ui:411
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmtType)
+#. i18n: file: src/calculator/nuclearCalculator.ui:435
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmtType)
+#. i18n: file: src/settings_gradients.ui:74
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicMassGradient)
+#. i18n: file: data/knowledge.xml:70
+#. i18n: file: data/knowledge.xml:135
+#: rc.cpp:38 rc.cpp:129 rc.cpp:1017 rc.cpp:1033 rc.cpp:1593 rc.cpp:2256
+#: rc.cpp:2324 src/exportdialog.cpp:126 src/detailinfodlg.cpp:333
+msgid "Mass"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:68
-#. i18n: ectx: property (text), item, widget (KComboBox, qualityCombo)
-#: rc.cpp:354
-msgid "High"
+#. i18n: file: src/calculator/concCalculator.ui:86
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSltType)
+#. i18n: file: src/calculator/concCalculator.ui:247
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvtType)
+#: rc.cpp:41 rc.cpp:126
+msgid "volume"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:357
-msgid "Style:"
+#. i18n: file: src/calculator/concCalculator.ui:91
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSltType)
+#. i18n: file: src/calculator/concCalculator.ui:257
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvtType)
+#. i18n: file: src/calculator/nuclearCalculator.ui:416
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmtType)
+#. i18n: file: src/calculator/nuclearCalculator.ui:440
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmtType)
+#: rc.cpp:44 rc.cpp:132 rc.cpp:1020 rc.cpp:1036
+msgid "moles"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:107
-#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
-#: rc.cpp:360
-msgid "Balls and sticks"
+#. i18n: file: src/calculator/concCalculator.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_39)
+#: rc.cpp:47
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Molar mass of solute:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:112
-#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
-#: rc.cpp:363
-msgid "Sticks"
+#. i18n: file: src/calculator/concCalculator.ui:117
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, molarMass)
+#: rc.cpp:54
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the molar mass of the solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:117
-#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
-#: rc.cpp:366
-msgid "Van der Waals"
+#. i18n: file: src/calculator/concCalculator.ui:120
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, molarMass)
+#: rc.cpp:61
+msgid "This box is used to specify the molar mass of the substance."
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:122
-#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
-#: rc.cpp:369
-msgid "Wireframe"
+#. i18n: file: src/calculator/concCalculator.ui:137
+#. i18n: ectx: property (text), widget (QLabel, label_40)
+#: rc.cpp:64
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Equivalent mass of "
+"solute:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:145
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:372
-msgid "2nd Style:"
+#. i18n: file: src/calculator/concCalculator.ui:151
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, eqtMass)
+#: rc.cpp:71
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the equivalent mass of the "
+"solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:161
-#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
-#. i18n: file: src/tools/moleculeviewerwidget.ui:215
-#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
-#: rc.cpp:375 rc.cpp:390 src/kalziumelementproperty.cpp:84
-msgid "None"
+#. i18n: file: src/calculator/concCalculator.ui:155
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, eqtMass)
+#: rc.cpp:78
+msgid ""
+"This box is used to specify the equivalent mass of the solute. This is "
+"required only if concentration in terms of normality is involved.\n"
+"Normality = Number of Equivalents / liter of solution"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:166
-#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
-#: rc.cpp:378
-msgid "Ribbon"
+#. i18n: file: src/calculator/concCalculator.ui:172
+#. i18n: ectx: property (text), widget (QLabel, label_52)
+#: rc.cpp:82
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Density of solute:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:171
-#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
-#: rc.cpp:381
-msgid "Ring"
+#. i18n: file: src/calculator/concCalculator.ui:186
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, densitySolute)
+#: rc.cpp:89
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the density of the solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:176
-#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
-#: rc.cpp:384
-msgid "Molecular Orbital"
+#. i18n: file: src/calculator/concCalculator.ui:189
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, densitySolute)
+#: rc.cpp:96
+msgid ""
+"This box is used to specify the value of the density of the solute. This is "
+"required only if you are specifying the amount of solute in terms of volume."
 msgstr ""
 
-#. i18n: file: src/tools/moleculeviewerwidget.ui:199
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:387
-msgid "Labels:"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:220
-#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
-#: rc.cpp:393
-msgid "Atom numbers"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:225
-#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
-#: rc.cpp:396
-msgid "Element symbols"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:230
-#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
-#: rc.cpp:399
-msgid "Element names"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:277
-#. i18n: ectx: attribute (title), widget (QWidget, edit)
-#: rc.cpp:402
-msgid "Edit"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:285
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:405
-msgid "Element:"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:318
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:408
-msgid "Bond Order:"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:353
-#. i18n: ectx: property (text), widget (QCheckBox, hydrogenBox)
-#: rc.cpp:411
-msgid "Adjust Hydrogens Automatically"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:378
-#. i18n: ectx: property (text), widget (QPushButton, hydrogensButton)
-#: rc.cpp:414
-msgid "Add Hydrogens"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:415
-#. i18n: ectx: property (text), widget (QPushButton, optimizeButton)
-#: rc.cpp:417
-msgid "Optimize"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:459
-#. i18n: ectx: attribute (title), widget (QWidget, measure)
-#: rc.cpp:420
-msgid "Measure"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:471
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:423
+#. i18n: file: src/calculator/concCalculator.ui:206
+#. i18n: ectx: property (text), widget (QLabel, label_31)
+#: rc.cpp:99
 msgid ""
-"Click on 2 atoms to measure a distance, on 3 atoms to measure an angle, on 4 "
-"atoms to measure a dihedral angle."
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:520
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:426
-msgid "Statistics"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:528
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:429
-msgid "Name:"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:545
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:432
-msgid "Formula:"
-msgstr ""
-
-#. i18n: file: src/tools/moleculeviewerwidget.ui:562
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:435
-msgid "Weight:"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Amount of Solvent:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/spectrumview.ui:14
-#. i18n: ectx: property (toolTip), widget (QWidget, SpectrumView)
-#: rc.cpp:32
+#. i18n: file: src/calculator/concCalculator.ui:220
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, amtSolvent)
+#: rc.cpp:106
 msgid ""
-"This page gives an overview of the spectrum of this element. Using the mouse "
-"you can zoom into the spectrum."
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:17
-#. i18n: ectx: property (whatsThis), widget (QWidget, SpectrumView)
-#: rc.cpp:35
-msgid "This page gives an overview of the spectrum of this element."
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:213
-#. i18n: ectx: property (toolTip), widget (SpectrumWidget, m_spectrumWidget)
-#. i18n: file: src/spectrumview.ui:216
-#. i18n: ectx: property (whatsThis), widget (SpectrumWidget, m_spectrumWidget)
-#: rc.cpp:83 rc.cpp:86
-msgid "This is the spectrum of the element."
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:132
-#. i18n: ectx: property (text), widget (QLabel, label1)
-#: rc.cpp:68
-msgid "&Minimum value:"
-msgstr "&Gwerth isaf:"
-
-#. i18n: file: src/spectrumview.ui:75
-#. i18n: ectx: property (toolTip), widget (QSpinBox, minimumValue)
-#. i18n: file: src/spectrumview.ui:78
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, minimumValue)
-#: rc.cpp:47 rc.cpp:50
-msgid "This sets the leftmost wavelength of the spectrum."
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:97
-#. i18n: ectx: property (text), widget (QLabel, label2)
-#: rc.cpp:56
-msgid "Maximum &value:"
-msgstr "&Gwerth uchaf:"
-
-#. i18n: file: src/spectrumview.ui:110
-#. i18n: ectx: property (toolTip), widget (QSpinBox, maximumValue)
-#. i18n: file: src/spectrumview.ui:113
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, maximumValue)
-#: rc.cpp:59 rc.cpp:62
-msgid "This sets the rightmost wavelength of the spectrum."
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:145
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:155
-msgid "Spectrum Settings"
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:155
-#. i18n: ectx: property (text), item, widget (QComboBox, m_spectrumType)
-#: rc.cpp:158
-msgid "Emission spectrum"
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:160
-#. i18n: ectx: property (text), item, widget (QComboBox, m_spectrumType)
-#: rc.cpp:161
-msgid "Absorption spectrum"
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:168
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:164
-msgid "Unit:"
-msgstr ""
-
-#. i18n: file: src/spectrumview.ui:175
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:167
-msgid "Type:"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the amount of solvent</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/spectrumview.ui:185
-#. i18n: ectx: property (text), widget (QPushButton, btn_resetZoom)
-#: rc.cpp:170
-msgid "Reset zoom"
+#. i18n: file: src/calculator/concCalculator.ui:223
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, amtSolvent)
+#: rc.cpp:113
+msgid "This box is used to specify the amount of solvent in the solution."
 msgstr ""
 
-#. i18n: file: src/settings_gradients.ui:45
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1730
+#. i18n: file: src/calculator/concCalculator.ui:240
+#. i18n: ectx: property (toolTip), widget (QComboBox, amtSlvtType)
+#: rc.cpp:116
 msgid ""
-"Instead of using a linear gradient to display the given property of an "
-"element in the periodic table, Kalzium can also use a logarithmic gradient.\n"
-"\n"
-"Check the properties you want to have displayed with a logarithmic gradient."
-msgstr ""
-
-#. i18n: file: src/plotsetupwidget.ui:146
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:298
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#. i18n: file: src/settings_gradients.ui:63
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicCovalentRadiusGradient)
-#. i18n: file: data/knowledge.xml:251
-#. i18n: file: data/knowledge.xml:260
-#. i18n: file: data/knowledge.xml:269
-#. i18n: file: data/knowledge.xml:275
-#: rc.cpp:122 rc.cpp:161 rc.cpp:1735 rc.cpp:2528 rc.cpp:2538 rc.cpp:2548
-#: rc.cpp:2554 src/kalziumgradienttype.cpp:168 src/exportdialog.cpp:130
-#: src/detailinfodlg.cpp:235
-msgid "Covalent Radius"
-msgstr ""
-
-#. i18n: file: src/settings_gradients.ui:70
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicVanDerWaalsRadiusGradient)
-#. i18n: file: data/knowledge.xml:253
-#. i18n: file: data/knowledge.xml:257
-#. i18n: file: data/knowledge.xml:270
-#. i18n: file: data/knowledge.xml:280
-#: rc.cpp:1738 rc.cpp:2532 rc.cpp:2534 rc.cpp:2550 rc.cpp:2562
-#: src/exportdialog.cpp:131
-msgid "Van der Waals Radius"
-msgstr ""
-
-#. i18n: file: src/plotsetupwidget.ui:121
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:273
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#. i18n: file: src/calculator/nuclearCalculator.ui:411
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmtType)
-#. i18n: file: src/calculator/nuclearCalculator.ui:435
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmtType)
-#. i18n: file: src/calculator/concCalculator.ui:81
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSltType)
-#. i18n: file: src/calculator/concCalculator.ui:252
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvtType)
-#. i18n: file: src/settings_gradients.ui:77
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicMassGradient)
-#. i18n: file: data/knowledge.xml:70
-#. i18n: file: data/knowledge.xml:135
-#: rc.cpp:107 rc.cpp:146 rc.cpp:671 rc.cpp:687 rc.cpp:850 rc.cpp:941
-#: rc.cpp:1741 rc.cpp:2345 rc.cpp:2413 src/exportdialog.cpp:125
-#: src/detailinfodlg.cpp:326
-msgid "Mass"
-msgstr ""
-
-#. i18n: file: src/plotsetupwidget.ui:136
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:288
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#. i18n: file: src/settings_gradients.ui:84
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicBoilingPointGradient)
-#: rc.cpp:116 rc.cpp:155 rc.cpp:1744 src/kalziumgradienttype.cpp:331
-#: src/exportdialog.cpp:133 src/detailinfodlg.cpp:214
-msgid "Boiling Point"
-msgstr ""
-
-#. i18n: file: src/plotsetupwidget.ui:131
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:283
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#. i18n: file: src/settings_gradients.ui:91
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicMeltingPointGradient)
-#: rc.cpp:113 rc.cpp:152 rc.cpp:1747 src/kalziumgradienttype.cpp:385
-#: src/exportdialog.cpp:132 src/detailinfodlg.cpp:207
-msgid "Melting Point"
-msgstr ""
-
-#. i18n: file: src/plotsetupwidget.ui:126
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:278
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#. i18n: file: src/settings_gradients.ui:98
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicElectronegativityGradient)
-#: rc.cpp:110 rc.cpp:149 rc.cpp:1750 src/elementdataviewer.cpp:234
-#: src/exportdialog.cpp:129 src/detailinfodlg.cpp:263
-msgid "Electronegativity"
-msgstr ""
-
-#. i18n: file: src/settings_gradients.ui:105
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicDiscoverydateGradient)
-#: rc.cpp:1753
-msgid "Discovery Date"
-msgstr ""
-
-#. i18n: file: src/settings_gradients.ui:112
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicElectronaffinityGradient)
-#: rc.cpp:1756 src/kalziumgradienttype.cpp:604
-msgid "Electronaffinity"
-msgstr ""
-
-#. i18n: file: src/settings_gradients.ui:119
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicIonizationGradient)
-#: rc.cpp:1759 src/exportdialog.cpp:127
-msgid "Ionization"
-msgstr ""
-
-#. i18n: file: src/settings_gradients.ui:139
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1762
-msgid "Maximal Value Color:"
-msgstr ""
-
-#. i18n: file: src/settings_gradients.ui:155
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1765
-msgid "Minimal Value Color:"
-msgstr ""
-
-#. i18n: file: src/settings_colors.ui:30
-#. i18n: ectx: attribute (title), widget (QWidget, tabBlocks)
-#: rc.cpp:1771 src/kalziumschemetype.cpp:158
-msgid "Blocks"
-msgstr ""
-
-#. i18n: file: src/settings_colors.ui:50
-#. i18n: ectx: property (text), widget (QLabel, textLabel13)
-#: rc.cpp:1774
-msgid "s-Block:"
-msgstr ""
-
-#. i18n: file: src/settings_colors.ui:70
-#. i18n: ectx: property (text), widget (QLabel, textLabel14)
-#: rc.cpp:1777
-msgid "p-Block:"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">The method by which you want to specify "
+"volume</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:90
-#. i18n: ectx: property (text), widget (QLabel, textLabel15)
-#: rc.cpp:1780
-msgid "d-Block:"
+#. i18n: file: src/calculator/concCalculator.ui:243
+#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSlvtType)
+#: rc.cpp:123
+msgid ""
+"This box is used to change the mode in which amount of solvent is specified, "
+"i.e. mass, moles or volume."
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:110
-#. i18n: ectx: property (text), widget (QLabel, textLabel16)
-#: rc.cpp:1783
-msgid "f-Block:"
+#. i18n: file: src/calculator/concCalculator.ui:269
+#. i18n: ectx: property (text), widget (QLabel, label_42)
+#: rc.cpp:135
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Molar mass of solvent:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:136
-#. i18n: ectx: attribute (title), widget (QWidget, tabGroups)
-#: rc.cpp:1786 src/kalziumschemetype.cpp:343
-msgid "Groups"
+#. i18n: file: src/calculator/concCalculator.ui:283
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, molarMassSolvent)
+#: rc.cpp:142
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the molar mass of the solvent</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:156
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2)
-#: rc.cpp:1789
-msgid "Group 1:"
+#. i18n: file: src/calculator/concCalculator.ui:286
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, molarMassSolvent)
+#: rc.cpp:149
+msgid "This box is used to specify the molar mass of the solvent."
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:176
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:1792
-msgid "Group 2:"
+#. i18n: file: src/calculator/concCalculator.ui:303
+#. i18n: ectx: property (text), widget (QLabel, label_55)
+#: rc.cpp:152
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Density of Solvent:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:196
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:1795
-msgid "Group 3:"
+#. i18n: file: src/calculator/concCalculator.ui:317
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, densitySolvent)
+#: rc.cpp:159
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the density of the solvent</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:216
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:1798
-msgid "Group 4:"
+#. i18n: file: src/calculator/concCalculator.ui:320
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, densitySolvent)
+#: rc.cpp:166
+msgid ""
+"This box is used to specify the density of the solution and is required only "
+"if the amount of solution is specified/needed in terms of mass."
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:236
-#. i18n: ectx: property (text), widget (QLabel, textLabel5_2)
-#: rc.cpp:1801
-msgid "Group 5:"
+#. i18n: file: src/calculator/concCalculator.ui:337
+#. i18n: ectx: property (text), widget (QLabel, label_41)
+#: rc.cpp:169
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Concentration:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:256
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#: rc.cpp:1804
-msgid "Group 6:"
+#. i18n: file: src/calculator/concCalculator.ui:351
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, concentration)
+#: rc.cpp:176
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the concentration of the "
+"solution</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:276
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:1807
-msgid "Group 7:"
+#. i18n: file: src/calculator/concCalculator.ui:354
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, concentration)
+#: rc.cpp:183
+msgid ""
+"This box is used to specify the concentration of the solution in respective "
+"units to the right."
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:296
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:1810
-msgid "Group 8:"
+#. i18n: file: src/calculator/concCalculator.ui:371
+#. i18n: ectx: property (text), widget (QLabel, label_37)
+#. i18n: file: src/calculator/gasCalculator.ui:328
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: src/calculator/nuclearCalculator.ui:253
+#. i18n: ectx: property (text), widget (QLabel, label_37)
+#: rc.cpp:186 rc.cpp:635 rc.cpp:930
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Calculate:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:322
-#. i18n: ectx: attribute (title), widget (QWidget, tabStateOfMatter)
-#: rc.cpp:1813
-msgid "State of Matter"
+#. i18n: file: src/calculator/concCalculator.ui:385
+#. i18n: ectx: property (toolTip), widget (QComboBox, mode)
+#: rc.cpp:193
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify what you want to calculate</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:342
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1816
-msgid "Solid:"
-msgstr "Solet :"
-
-#. i18n: file: src/settings_colors.ui:362
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:1819
-msgid "Liquid:"
+#. i18n: file: src/calculator/concCalculator.ui:388
+#. i18n: ectx: property (whatsThis), widget (QComboBox, mode)
+#: rc.cpp:200
+msgid ""
+"This is the list of quantities that you can calculate. Choose one of the "
+"quantities and specify the other required values to calculate it."
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:382
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:1822
-msgid "Vaporous:"
+#. i18n: file: src/calculator/concCalculator.ui:395
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:203
+msgid "Amount of Solute"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:408
-#. i18n: ectx: attribute (title), widget (QWidget, tabFamily)
-#: rc.cpp:1825 src/kalziumschemetype.cpp:261 src/exportdialog.cpp:134
-msgid "Family"
-msgstr "Teulu"
-
-#. i18n: file: src/settings_colors.ui:428
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2_2)
-#: rc.cpp:1828
-msgid "Alkali metals:"
+#. i18n: file: src/calculator/concCalculator.ui:400
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:206
+msgid "Molar Mass of Solute"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:448
-#. i18n: ectx: property (text), widget (QLabel, textLabel8_2)
-#: rc.cpp:1831
-msgid "Rare earth:"
+#. i18n: file: src/calculator/concCalculator.ui:405
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:209
+msgid "Equivalent Mass"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:468
-#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
-#: rc.cpp:1834
-msgid "Non-metals:"
+#. i18n: file: src/calculator/concCalculator.ui:410
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:212
+msgid "Amount of Solvent"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:488
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
-#: rc.cpp:1837
-msgid "Alkaline earth metals:"
+#. i18n: file: src/calculator/concCalculator.ui:415
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:215
+msgid "Molar Mass of Solvent"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:508
-#. i18n: ectx: property (text), widget (QLabel, textLabel5_2_2)
-#: rc.cpp:1840
-msgid "Other metals:"
+#. i18n: file: src/calculator/concCalculator.ui:420
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:218
+msgid "Concentration"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:528
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_2_2)
-#: rc.cpp:1843
-msgid "Halogens:"
+#. i18n: file: src/calculator/concCalculator.ui:441
+#. i18n: ectx: property (toolTip), widget (QComboBox, densSlvt_unit)
+#: rc.cpp:221
+msgid "Specify the units for density of solvent"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:548
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2_2)
-#: rc.cpp:1846
-msgid "Transition metals:"
+#. i18n: file: src/calculator/concCalculator.ui:445
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:611
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:224 rc.cpp:330
+msgid "grams per liter"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:568
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_3)
-#: rc.cpp:1849
-msgid "Noble gases:"
+#. i18n: file: src/calculator/concCalculator.ui:450
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:616
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:227 rc.cpp:333
+msgid "grams per milliliter"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:588
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_3_2)
-#: rc.cpp:1852
-msgid "Metalloids:"
+#. i18n: file: src/calculator/concCalculator.ui:455
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:621
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:230 rc.cpp:336
+msgid "kilograms per cubic meter"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:614
-#. i18n: ectx: attribute (title), widget (QWidget, tabNoColor)
-#: rc.cpp:1855
-msgid "No Color Scheme"
+#. i18n: file: src/calculator/concCalculator.ui:460
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:626
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:233 rc.cpp:339
+msgid "kilograms per liter"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:634
-#. i18n: ectx: property (text), widget (QLabel, textLabel8_2_2)
-#: rc.cpp:1858
-msgid "All the elements:"
+#. i18n: file: src/calculator/concCalculator.ui:465
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:631
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:236 rc.cpp:342
+msgid "ounces per cubic inch"
 msgstr ""
 
-#. i18n: file: src/settings_colors.ui:641
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_noscheme)
-#. i18n: file: src/settings_colors.ui:644
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_noscheme)
-#: rc.cpp:1861 rc.cpp:1864
-msgid "This color will be used if no other scheme is selected"
+#. i18n: file: src/calculator/concCalculator.ui:470
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:636
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:239 rc.cpp:345
+msgid "pounds per cubic inch"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:21
-#. i18n: ectx: attribute (title), widget (QWidget, calcTab)
-#: rc.cpp:230 src/kalzium.cpp:541
-msgid "Calculator"
+#. i18n: file: src/calculator/concCalculator.ui:475
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:641
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:242 rc.cpp:348
+msgid "pounds per cubic foot"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:51
-#. i18n: ectx: property (toolTip), widget (KLineEdit, formulaEdit)
-#: rc.cpp:233
-msgid "Enter molecular formula here"
+#. i18n: file: src/calculator/concCalculator.ui:480
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
+#. i18n: file: src/calculator/concCalculator.ui:646
+#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
+#: rc.cpp:245 rc.cpp:351
+msgid "pounds per cubic yard"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:58
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, formulaEdit)
-#: rc.cpp:236
+#. i18n: file: src/calculator/concCalculator.ui:492
+#. i18n: ectx: property (toolTip), widget (QComboBox, conc_unit)
+#: rc.cpp:248
 msgid ""
-"This box can be used to enter the formula for the molecule.\n"
-"e.g. 1.> CaCO3\n"
-"e.g. 2.> MeOH\n"
-"e.g. 3.> #EDTA#\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the unit/method for specifying "
+"concentration</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:65
-#. i18n: ectx: property (toolTip), widget (QPushButton, calcButton)
-#. i18n: file: src/molcalcwidgetbase.ui:68
-#. i18n: ectx: property (whatsThis), widget (QPushButton, calcButton)
-#: rc.cpp:243 rc.cpp:246
-msgid "Click on this button to calculate."
+#. i18n: file: src/calculator/concCalculator.ui:496
+#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
+#: rc.cpp:255
+msgid "molar"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:71
-#. i18n: ectx: property (text), widget (QPushButton, calcButton)
-#: rc.cpp:249
-msgid "Calc"
+#. i18n: file: src/calculator/concCalculator.ui:501
+#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
+#: rc.cpp:258
+msgid "Normal"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:164
-#. i18n: ectx: property (title), widget (QGroupBox, details)
-#: rc.cpp:252
-msgid "Details"
+#. i18n: file: src/calculator/concCalculator.ui:506
+#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
+#: rc.cpp:261
+msgid "molal"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:172
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:255
-msgid "Composition"
+#. i18n: file: src/calculator/concCalculator.ui:511
+#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
+#: rc.cpp:265
+#, no-c-format
+msgid "% ( mass )"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:185
-#. i18n: ectx: property (toolTip), widget (QTableWidget, table)
-#: rc.cpp:258
-msgid "Elemental composition"
+#. i18n: file: src/calculator/concCalculator.ui:516
+#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
+#: rc.cpp:269
+#, no-c-format
+msgid "% ( volume )"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:188
-#. i18n: ectx: property (whatsThis), widget (QTableWidget, table)
-#: rc.cpp:261
-msgid ""
-"This table previews the elemental composition of the molecule, i.e. the "
-"percentage of each element in the molecule."
+#. i18n: file: src/calculator/concCalculator.ui:521
+#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
+#: rc.cpp:273
+#, no-c-format
+msgid "% ( moles )"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:205
-#. i18n: ectx: property (text), widget (QTableWidget, table)
-#. i18n: file: data/knowledge.xml:15
-#. i18n: file: data/knowledge.xml:27
-#. i18n: file: data/knowledge.xml:117
-#: rc.cpp:264 rc.cpp:2293 rc.cpp:2303 rc.cpp:2393
-msgid "Element"
-msgstr "Elfen"
+#. i18n: file: src/calculator/concCalculator.ui:533
+#. i18n: ectx: property (toolTip), widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:276
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">The units for amount of solvent</span></p></body></html>"
+msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:210
-#. i18n: ectx: property (text), widget (QTableWidget, table)
-#: rc.cpp:267
-msgid "Atoms"
+#. i18n: file: src/calculator/concCalculator.ui:536
+#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:283
+msgid ""
+"This box is used to specify the units for the amount of solvent in the "
+"solution."
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:215
-#. i18n: ectx: property (text), widget (QTableWidget, table)
-#: rc.cpp:270 src/detailinfodlg.cpp:249
-msgid "Atomic mass"
+#. i18n: file: src/calculator/concCalculator.ui:540
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:286 src/calculator/concCalculator.cpp:718
+#: src/calculator/concCalculator.cpp:759
+msgid "liter"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:220
-#. i18n: ectx: property (text), widget (QTableWidget, table)
-#: rc.cpp:273
-msgid "Total mass"
+#. i18n: file: src/calculator/concCalculator.ui:545
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:289 src/calculator/concCalculator.cpp:720
+#: src/calculator/concCalculator.cpp:761
+msgid "cubic feet"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:225
-#. i18n: ectx: property (text), widget (QTableWidget, table)
-#: rc.cpp:276 src/detailinfodlg.cpp:330
-msgid "Percentage"
+#. i18n: file: src/calculator/concCalculator.ui:550
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:292 src/calculator/concCalculator.cpp:721
+#: src/calculator/concCalculator.cpp:762
+msgid "cubic inch"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:237
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:279
-msgid "Aliases used"
+#. i18n: file: src/calculator/concCalculator.ui:555
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:295 src/calculator/concCalculator.cpp:722
+#: src/calculator/concCalculator.cpp:763
+msgid "cubic mile"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:244
-#. i18n: ectx: property (toolTip), widget (QTableWidget, alias_list)
-#: rc.cpp:282
-msgid "Aliases used in the formula"
+#. i18n: file: src/calculator/concCalculator.ui:560
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:298 src/calculator/concCalculator.cpp:723
+#: src/calculator/concCalculator.cpp:764
+msgid "fluid ounce"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:248
-#. i18n: ectx: property (whatsThis), widget (QTableWidget, alias_list)
-#: rc.cpp:285
-msgid ""
-"This displays all the aliases used in the molecule.\n"
-"For instance, in the molecule MeOH, the alias used is Me = CH3."
+#. i18n: file: src/calculator/concCalculator.ui:565
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:301 src/calculator/concCalculator.cpp:724
+#: src/calculator/concCalculator.cpp:765
+msgid "cups"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:259
-#. i18n: ectx: property (text), widget (QTableWidget, alias_list)
-#: rc.cpp:289
-msgid "aliases"
+#. i18n: file: src/calculator/concCalculator.ui:570
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:304 src/calculator/concCalculator.cpp:725
+#: src/calculator/concCalculator.cpp:766
+msgid "gallons"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:273
-#. i18n: ectx: attribute (title), widget (QWidget, aliasTab)
-#: rc.cpp:292
-msgid "Aliases"
+#. i18n: file: src/calculator/concCalculator.ui:575
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
+#: rc.cpp:307 src/calculator/concCalculator.cpp:726
+#: src/calculator/concCalculator.cpp:767
+msgid "pints"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:279
-#. i18n: ectx: property (title), widget (QGroupBox, aliasBox)
-#: rc.cpp:295
-msgid "Define alias"
+#. i18n: file: src/calculator/concCalculator.ui:587
+#. i18n: ectx: property (toolTip), widget (QLabel, label_19)
+#: rc.cpp:310
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">The units for molar mass of solvent</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:300
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:298
-msgid "Short-form"
+#. i18n: file: src/calculator/concCalculator.ui:590
+#. i18n: ectx: property (text), widget (QLabel, label_19)
+#. i18n: file: src/calculator/concCalculator.ui:727
+#. i18n: ectx: property (text), widget (QLabel, label_18)
+#: rc.cpp:317 rc.cpp:402
+msgid "(g/mole)"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:307
-#. i18n: ectx: property (toolTip), widget (QLineEdit, shortForm)
-#: rc.cpp:301
-msgid "Short form of the alias"
+#. i18n: file: src/calculator/concCalculator.ui:604
+#. i18n: ectx: property (toolTip), widget (QComboBox, densSlt_unit)
+#: rc.cpp:320
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the units of density</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:311
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, shortForm)
-#: rc.cpp:304
+#. i18n: file: src/calculator/concCalculator.ui:607
+#. i18n: ectx: property (whatsThis), widget (QComboBox, densSlt_unit)
+#: rc.cpp:327
 msgid ""
-"You can specify the short form of the alias used here, \n"
-"for instance, Me."
+"This box is used to specify the units of the density of the solute. This is "
+"required only if you are specifying the amount of solute in terms of volume."
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:318
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:308
-msgid "Full-form"
+#. i18n: file: src/calculator/concCalculator.ui:658
+#. i18n: ectx: property (toolTip), widget (QComboBox, amtSlt_unit)
+#: rc.cpp:354
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the units for the amount of "
+"solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:326
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, fullForm)
-#: rc.cpp:311
+#. i18n: file: src/calculator/concCalculator.ui:661
+#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSlt_unit)
+#: rc.cpp:361
 msgid ""
-"You can enter the full form of the alias in this box, \n"
-"for instance, CH3."
+"This box is used to specify the units for the amount of solute in the "
+"solution."
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:333
-#. i18n: ectx: property (toolTip), widget (QPushButton, alias)
-#: rc.cpp:315
-msgid "Click to add the alias"
+#. i18n: file: src/calculator/concCalculator.ui:665
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:472
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:516
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
+#: rc.cpp:364 rc.cpp:1049 rc.cpp:1077 src/calculator/concCalculator.cpp:705
+#: src/calculator/concCalculator.cpp:774
+msgid "grams"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:336
-#. i18n: ectx: property (whatsThis), widget (QPushButton, alias)
-#: rc.cpp:318
-msgid "Click to add the alias if it is valid."
+#. i18n: file: src/calculator/concCalculator.ui:670
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#: rc.cpp:367
+msgid "kilograms"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:339
-#. i18n: ectx: property (text), widget (QPushButton, alias)
-#: rc.cpp:321
-msgid "Add Alias"
+#. i18n: file: src/calculator/concCalculator.ui:675
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:477
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:521
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
+#: rc.cpp:370 rc.cpp:1052 rc.cpp:1080 src/calculator/concCalculator.cpp:706
+#: src/calculator/concCalculator.cpp:775
+msgid "tons"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:373
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:324
-msgid "Pre-defined aliases"
+#. i18n: file: src/calculator/concCalculator.ui:680
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:482
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:526
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
+#: rc.cpp:373 rc.cpp:1055 rc.cpp:1083 src/calculator/concCalculator.cpp:707
+#: src/calculator/concCalculator.cpp:776
+msgid "carats"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:380
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:327
-msgid "User-defined aliases"
+#. i18n: file: src/calculator/concCalculator.ui:685
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:487
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:531
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
+#: rc.cpp:376 rc.cpp:1058 rc.cpp:1086 src/calculator/concCalculator.cpp:708
+#: src/calculator/concCalculator.cpp:777
+msgid "pounds"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:387
-#. i18n: ectx: property (toolTip), widget (QTableWidget, pre_defined)
-#: rc.cpp:330
-msgid "List of pre-defined aliases."
+#. i18n: file: src/calculator/concCalculator.ui:690
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:492
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:536
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
+#: rc.cpp:379 rc.cpp:1061 rc.cpp:1089 src/calculator/concCalculator.cpp:709
+#: src/calculator/concCalculator.cpp:778
+msgid "ounces"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:390
-#. i18n: ectx: property (whatsThis), widget (QTableWidget, pre_defined)
-#: rc.cpp:333
-msgid "This table displays all the pre-defined aliases."
+#. i18n: file: src/calculator/concCalculator.ui:695
+#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:497
+#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:541
+#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
+#: rc.cpp:382 rc.cpp:1064 rc.cpp:1092 src/calculator/concCalculator.cpp:710
+#: src/calculator/concCalculator.cpp:779
+msgid "troy ounces"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:419
-#. i18n: ectx: property (toolTip), widget (QTableWidget, user_defined)
-#: rc.cpp:336
-msgid "List of user-defined aliases."
+#. i18n: file: src/calculator/concCalculator.ui:707
+#. i18n: ectx: property (toolTip), widget (QLabel, label_17)
+#: rc.cpp:385
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Units for molar mass of solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/molcalcwidgetbase.ui:422
-#. i18n: ectx: property (whatsThis), widget (QTableWidget, user_defined)
-#: rc.cpp:339
-msgid "This is the list of aliases that you or some other user has added."
+#. i18n: file: src/calculator/concCalculator.ui:710
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#. i18n: file: src/calculator/gasCalculator.ui:365
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:392 rc.cpp:654
+msgid "(g/mol)"
 msgstr ""
 
-#. i18n: file: src/isotopetable/isotopedialog.ui:69
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1921
-msgid "Zoom IN / OUT"
+#. i18n: file: src/calculator/concCalculator.ui:724
+#. i18n: ectx: property (toolTip), widget (QLabel, label_18)
+#: rc.cpp:395
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Units for equivalent mass of solute</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/isotopetable/isotopedialog.ui:138
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1924
+#. i18n: file: src/calculator/concCalculator.ui:792
+#. i18n: ectx: property (toolTip), widget (QPushButton, reset)
+#: rc.cpp:405
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -899,259 +926,354 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Information</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
-"style=\" font-weight:400;\">Right click on an element to view information "
-"about it.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">zoom in and out using your "
-"mouse wheel / zoom feature.</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">scroll using left-clicking "
-"and dragging / scroll feature.</p></body></html>"
+"size:12pt;\">Reset all values to initial values</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/equationview.ui:131
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1867
-msgid "Equation:"
+#. i18n: file: src/calculator/concCalculator.ui:795
+#. i18n: ectx: property (text), widget (QPushButton, reset)
+#. i18n: file: src/calculator/gasCalculator.ui:521
+#. i18n: ectx: property (text), widget (QPushButton, reset)
+#. i18n: file: src/calculator/nuclearCalculator.ui:719
+#. i18n: ectx: property (text), widget (QPushButton, reset)
+#: rc.cpp:412 rc.cpp:701 rc.cpp:1160
+msgid "Reset"
 msgstr ""
 
-#. i18n: file: src/equationview.ui:152
-#. i18n: ectx: property (toolTip), widget (KLineEdit, lineEdit)
-#. i18n: file: src/equationview.ui:155
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, lineEdit)
-#: rc.cpp:1870 rc.cpp:1873
-msgid "Enter the equation you want to balance in this field."
+#. i18n: file: src/calculator/titrationCalculator.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:415
+msgid "X max:"
 msgstr ""
 
-#. i18n: file: src/equationview.ui:158
-#. i18n: ectx: property (text), widget (KLineEdit, lineEdit)
-#: rc.cpp:1876
-msgid "aCH3(CH2)3COOH + bO2 -> cH2O + dCO2"
+#. i18n: file: src/calculator/titrationCalculator.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, pushButton)
+#: rc.cpp:418
+msgid "Draw Plot"
 msgstr ""
 
-#. i18n: file: src/equationview.ui:171
-#. i18n: ectx: property (toolTip), widget (KPushButton, calculateButton)
-#. i18n: file: src/equationview.ui:174
-#. i18n: ectx: property (whatsThis), widget (KPushButton, calculateButton)
-#: rc.cpp:1879 rc.cpp:1882
-msgid "If you press this button the equation on the left will be balanced."
+#. i18n: file: src/calculator/titrationCalculator.ui:36
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:421
+msgid "Y max:"
 msgstr ""
 
-#. i18n: file: src/equationview.ui:177
-#. i18n: ectx: property (text), widget (KPushButton, calculateButton)
-#: rc.cpp:1885
-msgid "&Calculate"
+#. i18n: file: src/calculator/titrationCalculator.ui:43
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:424
+msgid "Y min:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:33
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:89
-msgid "Last element:"
+#. i18n: file: src/calculator/titrationCalculator.ui:80
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:427
+msgid "Notes:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:63
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:92
-msgid "First element:"
+#. i18n: file: src/calculator/titrationCalculator.ui:100
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:430
+msgid "X min:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:82
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:95
-msgid "X-Axis"
+#. i18n: file: src/calculator/titrationCalculator.ui:121
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:433
+msgid "Tab 1"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:102
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:98
-msgid "X:"
+#. i18n: file: src/calculator/titrationCalculator.ui:127
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:436
+msgid "Find the equivalence point from experimental values:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:112
-#. i18n: ectx: property (whatsThis), widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:261
-#. i18n: ectx: property (whatsThis), widget (KComboBox, KCB_y)
-#: rc.cpp:101 rc.cpp:140
-msgid "Here you can define what you want to plot"
+#. i18n: file: src/calculator/titrationCalculator.ui:191
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget_2)
+#: rc.cpp:439
+msgid "pH(Y)"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:116
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:268
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#: rc.cpp:104 rc.cpp:143 src/elementdataviewer.cpp:221
-#: src/exportdialog.cpp:122
-msgid "Atomic Number"
+#. i18n: file: src/calculator/titrationCalculator.ui:196
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget_2)
+#: rc.cpp:442
+msgid "Volume(X)"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:141
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
-#. i18n: file: src/plotsetupwidget.ui:293
-#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
-#. i18n: file: data/knowledge.xml:252
-#. i18n: file: data/knowledge.xml:261
-#. i18n: file: data/knowledge.xml:266
-#. i18n: file: data/knowledge.xml:278
-#: rc.cpp:119 rc.cpp:158 rc.cpp:2530 rc.cpp:2540 rc.cpp:2544 rc.cpp:2558
-msgid "Atomic Radius"
+#. i18n: file: src/calculator/titrationCalculator.ui:205
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:445
+msgid "Tab 2"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:164
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: src/plotsetupwidget.ui:315
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:125 rc.cpp:164
-msgid "Average value:"
+#. i18n: file: src/calculator/titrationCalculator.ui:211
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:448
+msgid ""
+"Solve an equilibrium system and see how the concentration of one ion (Y) "
+"changes in function of another one (X)"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:188
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: src/plotsetupwidget.ui:329
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:128 rc.cpp:167
-msgid "Maximum value:"
-msgstr "Gwerth uchaf:"
+#. i18n: file: src/calculator/titrationCalculator.ui:284
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:451
+msgid "Parameter"
+msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:212
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: src/plotsetupwidget.ui:336
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#: rc.cpp:131 rc.cpp:170
-msgid "Minimum value:"
-msgstr "Gwerth isaf:"
+#. i18n: file: src/calculator/titrationCalculator.ui:289
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:454
+msgid "Value"
+msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:231
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:134
-msgid "Y-Axis"
+#. i18n: file: src/calculator/titrationCalculator.ui:299
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:457
+msgid "X axis:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:251
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:137
-msgid "Y:"
+#. i18n: file: src/calculator/titrationCalculator.ui:316
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:460
+msgid "Y axis:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:361
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:173
-msgid "Display:"
+#. i18n: file: src/calculator/titrationCalculator.ui:332
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:463
+msgid "Choose what you want to do:"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:372
-#. i18n: ectx: property (text), item, widget (KComboBox, comboElementLabels)
-#: rc.cpp:176
-msgid "No Labels"
+#. i18n: file: src/calculator/titrationCalculator.ui:343
+#. i18n: ectx: property (text), widget (QPushButton, newfile)
+#: rc.cpp:466
+msgid "New"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:377
-#. i18n: ectx: property (text), item, widget (KComboBox, comboElementLabels)
-#: rc.cpp:179
-msgid "Element Names"
+#. i18n: file: src/calculator/titrationCalculator.ui:350
+#. i18n: ectx: property (text), widget (QPushButton, open)
+#: rc.cpp:469
+msgid "Open"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:382
-#. i18n: ectx: property (text), item, widget (KComboBox, comboElementLabels)
-#: rc.cpp:182
-msgid "Element Symbols"
+#. i18n: file: src/calculator/titrationCalculator.ui:357
+#. i18n: ectx: property (text), widget (QPushButton, save)
+#: rc.cpp:472
+msgid "Save"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:394
-#. i18n: ectx: property (text), widget (QPushButton, full)
-#: rc.cpp:185
-msgid "Full range"
+#. i18n: file: src/calculator/titrationCalculator.ui:364
+#. i18n: ectx: property (text), widget (QPushButton, saveimage)
+#: rc.cpp:475 src/calculator/titrationCalculator.cpp:655
+msgid "Save plot"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:407
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:188
-msgid "Element Type"
+#. i18n: file: src/calculator/titrationCalculator.ui:371
+#. i18n: ectx: property (text), widget (QPushButton, rapidhelp)
+#: rc.cpp:478
+msgid "Example"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:415
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:191
-msgid "All elements"
+#. i18n: file: src/calculator/gasCalculator.ui:30
+#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
+#: rc.cpp:481
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans'; font-size:12pt; font-weight:600;\">Change the "
+"quantities and observe the other quantities change dynamically.<br />Mass "
+"and moles are directly dependent for a given gas.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:420
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:194
-msgid "Metals"
+#. i18n: file: src/calculator/gasCalculator.ui:47
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:491
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">molar mass of the gas:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:425
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:197
-msgid "Non-Metals / Metalloids"
+#. i18n: file: src/calculator/gasCalculator.ui:61
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, molarMass)
+#: rc.cpp:498
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the molar mass of the gas</span></p></body></html>"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:64
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, molarMass)
+#: rc.cpp:505
+msgid ""
+"This box can be used to specify the molar mass of the gas, e.g. 2 for "
+"Hydrogen gas."
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:81
+#. i18n: ectx: property (text), widget (QLabel, label_25)
+#: rc.cpp:508
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">moles:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:430
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:200
-msgid "s block elements"
+#. i18n: file: src/calculator/gasCalculator.ui:95
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, moles)
+#: rc.cpp:515
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the number of moles of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:435
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:203
-msgid "p block elements"
+#. i18n: file: src/calculator/gasCalculator.ui:99
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, moles)
+#: rc.cpp:522
+msgid ""
+"This box can be used to specify the number of moles of the gas.\n"
+"moles = mass / molar mass"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:440
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:206
-msgid "d block elements"
+#. i18n: file: src/calculator/gasCalculator.ui:116
+#. i18n: ectx: property (text), widget (QLabel, label_24)
+#: rc.cpp:526
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Mass:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:445
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:209
-msgid "f block elements"
+#. i18n: file: src/calculator/gasCalculator.ui:130
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, mass)
+#: rc.cpp:533
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the Mass of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:450
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:212
-msgid "Noble gases"
+#. i18n: file: src/calculator/gasCalculator.ui:134
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, mass)
+#: rc.cpp:540
+msgid ""
+"This box can be used to specify the mass of the gas.\n"
+"Mass = moles * molar mass"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:455
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:215
-msgid "Alkalie metals"
+#. i18n: file: src/calculator/gasCalculator.ui:151
+#. i18n: ectx: property (toolTip), widget (QComboBox, mass_unit)
+#: rc.cpp:544
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the unit of mass of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:460
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:218
-msgid "Alkaline earth metals"
+#. i18n: file: src/calculator/gasCalculator.ui:154
+#. i18n: ectx: property (whatsThis), widget (QComboBox, mass_unit)
+#: rc.cpp:551
+msgid "This box is used to change the units of mass."
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:465
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:221
-msgid "Lanthanides"
+#. i18n: file: src/calculator/gasCalculator.ui:178
+#. i18n: ectx: property (text), widget (QLabel, label_27)
+#: rc.cpp:554
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Pressure:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:470
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:224
-msgid "Actinides"
+#. i18n: file: src/calculator/gasCalculator.ui:192
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, pressure)
+#: rc.cpp:561
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the Pressure of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/plotsetupwidget.ui:475
-#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
-#: rc.cpp:227
-msgid "Radio-active elements"
+#. i18n: file: src/calculator/gasCalculator.ui:195
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, pressure)
+#: rc.cpp:568
+msgid "This box can be used to change the pressure of the gas."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:27
-#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
-#: rc.cpp:817
+#. i18n: file: src/calculator/gasCalculator.ui:212
+#. i18n: ectx: property (toolTip), widget (QComboBox, pressure_unit)
+#: rc.cpp:571
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1162,22 +1284,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Some of the following data is not necessary.  "
-"For instance, if you specify the amount of solute in moles, you do not have "
-"to specify the molar mass of the solute.</span></p></body></html>"
+"size:12pt;\">Specify the units for pressure of the "
+"gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:34
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: src/calculator/gasCalculator.ui:37
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:824 rc.cpp:1334
-msgid "Data"
+#. i18n: file: src/calculator/gasCalculator.ui:215
+#. i18n: ectx: property (whatsThis), widget (QComboBox, pressure_unit)
+#: rc.cpp:578
+msgid ""
+"This box can be used to specify the units of pressure, e.g. atmospheres, "
+"bars, etc."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:44
-#. i18n: ectx: property (text), widget (QLabel, label_36)
-#: rc.cpp:827
+#. i18n: file: src/calculator/gasCalculator.ui:226
+#. i18n: ectx: property (text), widget (QLabel, label_29)
+#: rc.cpp:581
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1188,12 +1309,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Amount of solute:</span></p></body></html>"
+"size:12pt; font-weight:600;\">Temperature:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:58
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, amtSolute)
-#: rc.cpp:834
+#. i18n: file: src/calculator/gasCalculator.ui:240
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, temp)
+#: rc.cpp:588
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1204,52 +1325,43 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the amount of solute</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:61
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, amtSolute)
-#: rc.cpp:841
-msgid "This is the box used to specify the amount of solute in the solution."
+"size:12pt;\">Specify the temperature of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:74
-#. i18n: ectx: property (toolTip), widget (QComboBox, amtSltType)
-#: rc.cpp:844
-msgid "The method by which you want to specify the amount of solute"
+#. i18n: file: src/calculator/gasCalculator.ui:243
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, temp)
+#: rc.cpp:595
+msgid "This box can be used to specify the temperature of the gas."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:77
-#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSltType)
-#: rc.cpp:847
+#. i18n: file: src/calculator/gasCalculator.ui:260
+#. i18n: ectx: property (toolTip), widget (QComboBox, temp_unit)
+#: rc.cpp:598
 msgid ""
-"This box is used to change the mode in which the amount of solute is "
-"specified, i.e. mass, moles or volume."
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:86
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSltType)
-#. i18n: file: src/calculator/concCalculator.ui:247
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvtType)
-#: rc.cpp:853 rc.cpp:938
-msgid "volume"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt;\">Specify the units for the temperature of the "
+"gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:416
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmtType)
-#. i18n: file: src/calculator/nuclearCalculator.ui:440
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmtType)
-#. i18n: file: src/calculator/concCalculator.ui:91
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSltType)
-#. i18n: file: src/calculator/concCalculator.ui:257
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvtType)
-#: rc.cpp:674 rc.cpp:690 rc.cpp:856 rc.cpp:944
-msgid "moles"
+#. i18n: file: src/calculator/gasCalculator.ui:263
+#. i18n: ectx: property (whatsThis), widget (QComboBox, temp_unit)
+#: rc.cpp:605
+msgid ""
+"This box can be used to specify the units of temperature, e.g. Kelvin, "
+"Celsius, etc."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_39)
-#: rc.cpp:859
+#. i18n: file: src/calculator/gasCalculator.ui:274
+#. i18n: ectx: property (text), widget (QLabel, label_26)
+#: rc.cpp:608
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1260,12 +1372,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Molar mass of solute:</span></p></body></html>"
+"size:12pt; font-weight:600;\">Volume:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:117
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, molarMass)
-#: rc.cpp:866
+#. i18n: file: src/calculator/gasCalculator.ui:288
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, volume)
+#: rc.cpp:615
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1276,18 +1388,18 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the molar mass of the solute</span></p></body></html>"
+"size:12pt;\">Specify the volume of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:120
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, molarMass)
-#: rc.cpp:873
-msgid "This box is used to specify the molar mass of the substance."
+#. i18n: file: src/calculator/gasCalculator.ui:291
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, volume)
+#: rc.cpp:622
+msgid "This box can be used to specify the volume of the gas."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:137
-#. i18n: ectx: property (text), widget (QLabel, label_40)
-#: rc.cpp:876
+#. i18n: file: src/calculator/gasCalculator.ui:314
+#. i18n: ectx: property (toolTip), widget (QComboBox, volume_unit)
+#: rc.cpp:625
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1298,13 +1410,48 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Equivalent mass of "
-"solute:</span></p></body></html>"
+"size:12pt;\">Specify the units for volume of the gas</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:151
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, eqtMass)
-#: rc.cpp:883
+#. i18n: file: src/calculator/gasCalculator.ui:317
+#. i18n: ectx: property (whatsThis), widget (QComboBox, volume_unit)
+#: rc.cpp:632
+msgid "This box can be used to change the units of volume, e.g. liters."
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:342
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:642
+msgid "Moles / Mass"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:347
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:645
+msgid "Pressure"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:352
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:648
+msgid "Temperature"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:357
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:651
+msgid "Volume"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:375
+#. i18n: ectx: property (title), widget (QGroupBox, non_ideal)
+#: rc.cpp:657
+msgid "Data for non-ideal gases"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:387
+#. i18n: ectx: property (text), widget (QLabel, label_30)
+#: rc.cpp:660
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1315,22 +1462,13 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the equivalent mass of the "
-"solute</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:155
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, eqtMass)
-#: rc.cpp:890
-msgid ""
-"This box is used to specify the equivalent mass of the solute. This is "
-"required only only if concentration in terms of normality is involved.\n"
-"Normality = Number of Equivalents / liter of solution"
+"size:12pt; font-weight:600;\">Van der Waals constant "
+"'b':</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:172
-#. i18n: ectx: property (text), widget (QLabel, label_52)
-#: rc.cpp:894
+#. i18n: file: src/calculator/gasCalculator.ui:401
+#. i18n: ectx: property (text), widget (QLabel, label_28)
+#: rc.cpp:667
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1341,12 +1479,74 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Density of solute:</span></p></body></html>"
+"size:12pt; font-weight:600;\">Van der Waals constant "
+"'a':</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:186
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, densitySolute)
-#: rc.cpp:901
+#. i18n: file: src/calculator/gasCalculator.ui:411
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, b)
+#: rc.cpp:674
+msgid "Specify the units of the van der Waals constant 'b'"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:414
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, b)
+#: rc.cpp:677
+msgid ""
+"This box can be used to specify the van der Waals constant 'b' for the gas. "
+"This is required only for a real gas. It can be marked as 0.0 for an ideal "
+"gas."
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:427
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, a)
+#: rc.cpp:680
+msgid "Specify the units of the van der Waals constant 'a'"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:430
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, a)
+#: rc.cpp:683
+msgid ""
+"This box can be used to specify the van der Waals constant 'a' for the gas. "
+"This is required only for a real gas. It can be marked as 0.0 for an ideal "
+"gas."
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:445
+#. i18n: ectx: property (toolTip), widget (QComboBox, b_unit)
+#: rc.cpp:686
+msgid "The units of the van der Waals constant 'b'"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:448
+#. i18n: ectx: property (whatsThis), widget (QComboBox, b_unit)
+#: rc.cpp:689
+msgid ""
+"This can be used to specify the units of the van der Waals constant 'b'."
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:455
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:692
+msgid "per mole"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:477
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:695
+msgid "liter^2 atmosphere/mol^2"
+msgstr ""
+
+#. i18n: file: src/calculator/gasCalculator.ui:518
+#. i18n: ectx: property (toolTip), widget (QPushButton, reset)
+#: rc.cpp:698
+msgid "Click to reset all values to initial values"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:39
+#. i18n: ectx: property (toolTip), widget (QTreeWidget, tree)
+#: rc.cpp:704
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1357,36 +1557,86 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the density of the solute</span></p></body></html>"
+"size:14pt;\">Select the calculator that you want to "
+"use</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:189
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, densitySolute)
-#: rc.cpp:908
+#. i18n: file: src/calculator/calculator.ui:42
+#. i18n: ectx: property (whatsThis), widget (QTreeWidget, tree)
+#: rc.cpp:711
 msgid ""
-"This box is used to specify the value of the density of the solute. This is "
-"required only if you are specifying the amount of solute in terms of volume."
+"This is the index of the various calculators available. For more information "
+"on each calculator, click on 'Introduction'."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:206
-#. i18n: ectx: property (text), widget (QLabel, label_31)
-#: rc.cpp:911
+#. i18n: file: src/calculator/calculator.ui:49
+#. i18n: ectx: property (text), widget (QTreeWidget, tree)
+#: rc.cpp:714
+msgid "Calculators"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:54
+#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
+#: rc.cpp:717 src/calculator/calculator.cpp:88
+msgid "Introduction"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:59
+#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
+#: rc.cpp:720 src/calculator/calculator.cpp:108
+msgid "Molecular mass Calculator"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:64
+#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
+#. i18n: file: src/calculator/settings_calc.ui:123
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#: rc.cpp:723 rc.cpp:799 src/calculator/calculator.cpp:99
+msgid "Concentration Calculator"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:69
+#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
+#. i18n: file: src/calculator/settings_calc.ui:28
+#. i18n: ectx: attribute (title), widget (QWidget, nuclear)
+#: rc.cpp:726 rc.cpp:778 src/calculator/calculator.cpp:91
+msgid "Nuclear Calculator"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:74
+#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
+#. i18n: file: src/calculator/settings_calc.ui:55
+#. i18n: ectx: attribute (title), widget (QWidget, gas)
+#: rc.cpp:729 rc.cpp:784 src/calculator/calculator.cpp:95
+msgid "Gas Calculator"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:79
+#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
+#: rc.cpp:732 src/calculator/calculator.cpp:110
+msgid "Titration Calculator"
+msgstr ""
+
+#. i18n: file: src/calculator/calculator.ui:135
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:735
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Amount of Solvent:</span></p></body></html>"
+"family:'DejaVu Sans'; font-size:18pt; font-weight:600;\">The Kalzium "
+"Calculators</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:220
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, amtSolvent)
-#: rc.cpp:918
+#. i18n: file: src/calculator/calculator.ui:177
+#. i18n: ectx: property (toolTip), widget (KTextEdit, ktextedit)
+#: rc.cpp:742
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1397,43 +1647,94 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the amount of solvent</span></p></body></html>"
+"size:14pt;\">Information about the various "
+"calculators</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:223
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, amtSolvent)
-#: rc.cpp:925
-msgid "This box is used to specify the amount of solvent in the solution."
+#. i18n: file: src/calculator/calculator.ui:180
+#. i18n: ectx: property (whatsThis), widget (KTextEdit, ktextedit)
+#: rc.cpp:749
+msgid "This is the description of the function of each calculator in Kalzium"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:240
-#. i18n: ectx: property (toolTip), widget (QComboBox, amtSlvtType)
-#: rc.cpp:928
+#. i18n: file: src/calculator/calculator.ui:202
+#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
+#: rc.cpp:752
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">The method by which you want to specify "
-"volume</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:243
-#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSlvtType)
-#: rc.cpp:935
-msgid ""
-"This box is used to change the mode in which amount of solvent is specified, "
-"i.e. mass, moles or volume."
+"family:'DejaVu Sans'; font-size:12pt;\">Welcome to the Kalzium "
+"calculators!<br /></span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans'; font-size:10pt;\">This calculator contains a variety "
+"of calculators for different tasks performing different "
+"calculations.</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans'; font-size:10pt;\">You can find the following "
+"calculators in Kalzium</span></p>\n"
+"<ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-"
+"right: 0px; -qt-list-indent: 1;\"><li style=\" font-family:'DejaVu Sans';\" "
+"style=\" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Molecular mass calculator<br /></span> This calculator helps "
+"you calculate the molecular masses of different molecules.<br />You can "
+"specify short form of the molecule names add more such aliases.</li>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"><span style=\" font-weight:600;\">Concentrations calculator<br "
+"/></span>You can calculate quantities which include</li>\n"
+"<ul type=\"circle\" style=\"margin-top: 0px; margin-bottom: 0px; margin-"
+"left: 0px; margin-right: 0px; -qt-list-indent: 2;\"><li style=\" font-"
+"family:'DejaVu Sans';\" style=\" margin-top:0px; margin-bottom:0px; margin-"
+"left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Amount of "
+"substance\t</li>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\">Volume of solvent</li>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\">Concentration of substance</li></ul>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:1; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans';\"> There are a wide range of units to choose from and "
+"different methods to specify quantities.</span></p>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"><span style=\" font-weight:600;\">Nuclear calculator<br "
+"/></span>This calculator makes use of the nuclear data available in Kalzium "
+"to predict the expected masses of a material after time.</li>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"><span style=\" font-weight:600;\">Gas calculator<br "
+"/></span>This calculator can calculate the values of Temperature, pressure, "
+"volume, amount of gas etc. for various ideal as well as non-ideal "
+"gases.</li>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"><span style=\" font-weight:600;\">Equation Balancer<br "
+"/></span>This calculator can balance chemical equations.</li>\n"
+"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
+"bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"><span style=\" font-weight:600;\">Titration calculator<br "
+"/></span>This calculator tries to find out the equivalence point of a pH-"
+"meter followed titration best fitting it with an hyperbolic tangent. You can "
+"also let it solve an equilibrium system of equations and see how the "
+"concentration of a species changes in function of another "
+"one.</li></ul></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:269
-#. i18n: ectx: property (text), widget (QLabel, label_42)
-#: rc.cpp:947
+#. i18n: file: src/calculator/settings_calc.ui:21
+#. i18n: ectx: property (toolTip), widget (QTabWidget, tabWidget)
+#: rc.cpp:771
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1444,12 +1745,55 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Molar mass of solvent:</span></p></body></html>"
+"size:12pt;\">The settings of the molecular concentration "
+"calculator</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:283
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, molarMassSolvent)
-#: rc.cpp:954
+#. i18n: file: src/calculator/settings_calc.ui:34
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_mass)
+#: rc.cpp:781
+msgid "Amount is always specified in term of mass"
+msgstr ""
+
+#. i18n: file: src/calculator/settings_calc.ui:63
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ideal)
+#: rc.cpp:787
+msgid "Assume Gas is ideal (i.e. do not show Van der Waals co-efficients)"
+msgstr ""
+
+#. i18n: file: src/calculator/settings_calc.ui:89
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:790
+msgid "Mass Calculator"
+msgstr ""
+
+#. i18n: file: src/calculator/settings_calc.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_alias)
+#: rc.cpp:793
+msgid "Show details such as aliases"
+msgstr ""
+
+#. i18n: file: src/calculator/settings_calc.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox)
+#: rc.cpp:796
+msgid "Show the add alias tab"
+msgstr ""
+
+#. i18n: file: src/calculator/settings_calc.ui:129
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_soluteMass)
+#: rc.cpp:802
+msgid "Amount of solute is always specified in terms of mass"
+msgstr ""
+
+#. i18n: file: src/calculator/settings_calc.ui:136
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_solventVolume)
+#: rc.cpp:805
+msgid "Amount of solvent is always specified in terms of volume"
+msgstr ""
+
+#. i18n: file: src/calculator/nuclearCalculator.ui:30
+#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
+#: rc.cpp:808
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1460,18 +1804,20 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the molar mass of the solvent</span></p></body></html>"
+"size:12pt; font-weight:600;\">Select what you want to calculate from the "
+"combo box next to the \"calculate\" label and change the values / units to "
+"calculate.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:286
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, molarMassSolvent)
-#: rc.cpp:961
-msgid "This box is used to specify the molar mass of the solvent."
+#. i18n: file: src/calculator/nuclearCalculator.ui:37
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:815
+msgid "Elemental data"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:303
-#. i18n: ectx: property (text), widget (QLabel, label_55)
-#: rc.cpp:964
+#. i18n: file: src/calculator/nuclearCalculator.ui:47
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:818
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1482,12 +1828,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Density of Solvent:</span></p></body></html>"
+"size:12pt; font-weight:600;\">Element Name:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:317
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, densitySolvent)
-#: rc.cpp:971
+#. i18n: file: src/calculator/nuclearCalculator.ui:61
+#. i18n: ectx: property (toolTip), widget (QComboBox, element)
+#: rc.cpp:825
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1498,20 +1844,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the density of the solvent</span></p></body></html>"
+"size:14pt;\">Specify the Element you want to "
+"consider</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:320
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, densitySolvent)
-#: rc.cpp:978
+#. i18n: file: src/calculator/nuclearCalculator.ui:64
+#. i18n: ectx: property (whatsThis), widget (QComboBox, element)
+#: rc.cpp:832
 msgid ""
-"This box is used to specify the density of the solution and is required only "
-"if the amount of solution is specified/needed in terms of mass."
+"This box is used to specify the element on which calculation is to be "
+"performed."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:337
-#. i18n: ectx: property (text), widget (QLabel, label_41)
-#: rc.cpp:981
+#. i18n: file: src/calculator/nuclearCalculator.ui:75
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:835
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1522,12 +1869,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Concentration:</span></p></body></html>"
+"size:12pt; font-weight:600;\">Isotope mass</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:351
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, concentration)
-#: rc.cpp:988
+#. i18n: file: src/calculator/nuclearCalculator.ui:89
+#. i18n: ectx: property (toolTip), widget (QComboBox, isotope)
+#: rc.cpp:842
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1538,25 +1885,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the concentration of the "
-"solution</span></p></body></html>"
+"size:14pt;\">Specify an isotope of the current "
+"element</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:354
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, concentration)
-#: rc.cpp:995
+#. i18n: file: src/calculator/nuclearCalculator.ui:92
+#. i18n: ectx: property (whatsThis), widget (QComboBox, isotope)
+#: rc.cpp:849
 msgid ""
-"This box is used to specify the concentration of the solution in respective "
-"units to the right."
+"This box is used to specify the isotope of the above element on which "
+"calculation is performed."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:253
-#. i18n: ectx: property (text), widget (QLabel, label_37)
-#. i18n: file: src/calculator/concCalculator.ui:371
-#. i18n: ectx: property (text), widget (QLabel, label_37)
-#. i18n: file: src/calculator/gasCalculator.ui:453
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:584 rc.cpp:998 rc.cpp:1556
+#. i18n: file: src/calculator/nuclearCalculator.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#: rc.cpp:852
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1567,12 +1910,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Calculate:</span></p></body></html>"
+"size:12pt; font-weight:600;\">Half-life:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:385
-#. i18n: ectx: property (toolTip), widget (QComboBox, mode)
-#: rc.cpp:1005
+#. i18n: file: src/calculator/nuclearCalculator.ui:117
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, halfLife)
+#: rc.cpp:859
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1583,126 +1926,90 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify what you want to calculate</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:388
-#. i18n: ectx: property (whatsThis), widget (QComboBox, mode)
-#: rc.cpp:1012
-msgid ""
-"This is the list of quantities that you can calculate. Choose one of the "
-"quantities and specify the other required values to calculate it."
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:395
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1015
-msgid "Amount of Solute"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:400
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1018
-msgid "Molar Mass of Solute"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:405
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1021
-msgid "Equivalent Mass"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:410
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1024
-msgid "Amount of Solvent"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:415
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1027
-msgid "Molar Mass of Solvent"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:420
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1030
-msgid "Concentration"
+"size:14pt;\">Specify the half-life of the radioactive "
+"isotope</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:441
-#. i18n: ectx: property (toolTip), widget (QComboBox, densSlvt_unit)
-#: rc.cpp:1033
-msgid "Specify the units for density of solvent"
+#. i18n: file: src/calculator/nuclearCalculator.ui:120
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, halfLife)
+#: rc.cpp:866
+msgid "This box is used to specify the half-life of the above isotope."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:445
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:611
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1036 rc.cpp:1142
-msgid "grams per liter"
+#. i18n: file: src/calculator/nuclearCalculator.ui:137
+#. i18n: ectx: property (toolTip), widget (QComboBox, halfLife_unit)
+#: rc.cpp:869
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:14pt;\">The unit of Half-life</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:450
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:616
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1039 rc.cpp:1145
-msgid "grams per milliliter"
+#. i18n: file: src/calculator/nuclearCalculator.ui:140
+#. i18n: ectx: property (whatsThis), widget (QComboBox, halfLife_unit)
+#: rc.cpp:876
+msgid ""
+"This box is used to specify the unit of half-life, e.g. years, seconds, etc."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:455
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:621
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1042 rc.cpp:1148
-msgid "kilograms per cubic meter"
+#. i18n: file: src/calculator/nuclearCalculator.ui:144
+#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:560
+#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
+#: rc.cpp:879 rc.cpp:1105
+msgid "years"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:460
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:626
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1045 rc.cpp:1151
-msgid "kilograms per liter"
+#. i18n: file: src/calculator/nuclearCalculator.ui:149
+#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:565
+#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
+#: rc.cpp:882 rc.cpp:1108
+msgid "seconds"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:465
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:631
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1048 rc.cpp:1154
-msgid "ounces per cubic inch"
+#. i18n: file: src/calculator/nuclearCalculator.ui:154
+#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:570
+#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
+#: rc.cpp:885 rc.cpp:1111
+msgid "minutes"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:470
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:636
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1051 rc.cpp:1157
-msgid "pounds per cubic inch"
+#. i18n: file: src/calculator/nuclearCalculator.ui:159
+#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:575
+#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
+#: rc.cpp:888 rc.cpp:1114
+msgid "hours"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:475
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:641
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1054 rc.cpp:1160
-msgid "pounds per cubic foot"
+#. i18n: file: src/calculator/nuclearCalculator.ui:164
+#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:580
+#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
+#: rc.cpp:891 rc.cpp:1117
+msgid "days"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:480
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlvt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:646
-#. i18n: ectx: property (text), item, widget (QComboBox, densSlt_unit)
-#: rc.cpp:1057 rc.cpp:1163
-msgid "pounds per cubic yard"
+#. i18n: file: src/calculator/nuclearCalculator.ui:169
+#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
+#. i18n: file: src/calculator/nuclearCalculator.ui:585
+#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
+#: rc.cpp:894 rc.cpp:1120
+msgid "weeks"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:492
-#. i18n: ectx: property (toolTip), widget (QComboBox, conc_unit)
-#: rc.cpp:1060
+#. i18n: file: src/calculator/nuclearCalculator.ui:194
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:897
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1713,52 +2020,70 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the unit/method for specifying "
-"concentration</span></p></body></html>"
+"size:12pt; font-weight:600;\">Atomic mass</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:496
-#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
-#: rc.cpp:1067
-msgid "molar"
+#. i18n: file: src/calculator/nuclearCalculator.ui:208
+#. i18n: ectx: property (toolTip), widget (QLabel, mass)
+#: rc.cpp:904
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:14pt;\">Atomic mass of the isotope selected.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:501
-#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
-#: rc.cpp:1070
-msgid "Normal"
+#. i18n: file: src/calculator/nuclearCalculator.ui:211
+#. i18n: ectx: property (whatsThis), widget (QLabel, mass)
+#: rc.cpp:911
+msgid "This label displays the atomic mass of the isotope in grams per mole."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:506
-#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
-#: rc.cpp:1073
-msgid "molal"
+#. i18n: file: src/calculator/nuclearCalculator.ui:214
+#. i18n: ectx: property (text), widget (QLabel, mass)
+#. i18n: file: src/calculator/nuclearCalculator.ui:645
+#. i18n: ectx: property (text), widget (QLabel, numHalfLives)
+#: rc.cpp:914 rc.cpp:1147
+msgid "0"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:511
-#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
-#: rc.cpp:1077
-#, no-c-format
-msgid "% ( mass )"
+#. i18n: file: src/calculator/nuclearCalculator.ui:228
+#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
+#: rc.cpp:917
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:14pt;\">The unit of atomic mass</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:516
-#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
-#: rc.cpp:1081
-#, no-c-format
-msgid "% ( volume )"
+#. i18n: file: src/calculator/nuclearCalculator.ui:231
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:924
+msgid "grams / mole"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:521
-#. i18n: ectx: property (text), item, widget (QComboBox, conc_unit)
-#: rc.cpp:1085
-#, no-c-format
-msgid "% ( moles )"
+#. i18n: file: src/calculator/nuclearCalculator.ui:241
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:927
+msgid "Other data"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:533
-#. i18n: ectx: property (toolTip), widget (QComboBox, amtSlvt_unit)
-#: rc.cpp:1088
+#. i18n: file: src/calculator/nuclearCalculator.ui:267
+#. i18n: ectx: property (toolTip), widget (QComboBox, mode)
+#: rc.cpp:937
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1769,96 +2094,38 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">The units for amount of solvent</span></p></body></html>"
+"size:14pt;\">Specify what you want to calculate</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:536
-#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSlvt_unit)
-#: rc.cpp:1095
+#. i18n: file: src/calculator/nuclearCalculator.ui:270
+#. i18n: ectx: property (whatsThis), widget (QComboBox, mode)
+#: rc.cpp:944
 msgid ""
-"This box is used to specify the units for the amount of solvent in the "
-"solution."
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:540
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:411
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#: rc.cpp:1098 rc.cpp:1535 src/calculator/concCalculator.cpp:718
-#: src/calculator/concCalculator.cpp:759
-msgid "liter"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:545
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:416
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:587
-#. i18n: ectx: property (text), item, widget (QComboBox, b_unit)
-#: rc.cpp:1101 rc.cpp:1538 rc.cpp:1619 src/calculator/concCalculator.cpp:720
-#: src/calculator/concCalculator.cpp:761
-msgid "cubic feet"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:550
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:421
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#: rc.cpp:1104 rc.cpp:1541 src/calculator/concCalculator.cpp:721
-#: src/calculator/concCalculator.cpp:762
-msgid "cubic inch"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:555
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#: rc.cpp:1107 src/calculator/concCalculator.cpp:722
-#: src/calculator/concCalculator.cpp:763
-msgid "cubic mile"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:560
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:426
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#: rc.cpp:1110 rc.cpp:1544 src/calculator/concCalculator.cpp:723
-#: src/calculator/concCalculator.cpp:764
-msgid "fluid ounce"
+"This box is used to decide what you want to calculate, choose among 'Time', "
+"'Initial amount of the substance' and 'Final amount of the substance'."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:565
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:431
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:602
-#. i18n: ectx: property (text), item, widget (QComboBox, b_unit)
-#: rc.cpp:1113 rc.cpp:1547 rc.cpp:1628 src/calculator/concCalculator.cpp:724
-#: src/calculator/concCalculator.cpp:765
-msgid "cups"
+#. i18n: file: src/calculator/nuclearCalculator.ui:277
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:947
+msgid "Initial Amount"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:570
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:436
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:597
-#. i18n: ectx: property (text), item, widget (QComboBox, b_unit)
-#: rc.cpp:1116 rc.cpp:1550 rc.cpp:1625 src/calculator/concCalculator.cpp:725
-#: src/calculator/concCalculator.cpp:766
-msgid "gallons"
+#. i18n: file: src/calculator/nuclearCalculator.ui:282
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:950
+msgid "Final Amount"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:575
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlvt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:441
-#. i18n: ectx: property (text), item, widget (QComboBox, volume_unit)
-#: rc.cpp:1119 rc.cpp:1553 src/calculator/concCalculator.cpp:726
-#: src/calculator/concCalculator.cpp:767
-msgid "pints"
+#. i18n: file: src/calculator/nuclearCalculator.ui:287
+#. i18n: ectx: property (text), item, widget (QComboBox, mode)
+#: rc.cpp:953
+msgid "Time"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:587
-#. i18n: ectx: property (toolTip), widget (QLabel, label_19)
-#: rc.cpp:1122
+#. i18n: file: src/calculator/nuclearCalculator.ui:299
+#. i18n: ectx: property (text), widget (QLabel, label_69)
+#: rc.cpp:956
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1869,20 +2136,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">The units for molar mass of solvent</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:590
-#. i18n: ectx: property (text), widget (QLabel, label_19)
-#. i18n: file: src/calculator/concCalculator.ui:727
-#. i18n: ectx: property (text), widget (QLabel, label_18)
-#: rc.cpp:1129 rc.cpp:1214
-msgid "(g/mole)"
+"size:12pt; font-weight:600;\">Initial amount:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:604
-#. i18n: ectx: property (toolTip), widget (QComboBox, densSlt_unit)
-#: rc.cpp:1132
+#. i18n: file: src/calculator/nuclearCalculator.ui:313
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, initAmt)
+#: rc.cpp:963
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1893,20 +2152,20 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the units of density</span></p></body></html>"
+"size:14pt;\">Specify the initial amount of the "
+"substance</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:607
-#. i18n: ectx: property (whatsThis), widget (QComboBox, densSlt_unit)
-#: rc.cpp:1139
+#. i18n: file: src/calculator/nuclearCalculator.ui:316
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, initAmt)
+#: rc.cpp:970
 msgid ""
-"This box is used to specify the units of the density of the solute. This is "
-"required only if you are specifying the amount of solute in terms of volume."
+"This box is used to specify the initial amount of the radioactive substance."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:658
-#. i18n: ectx: property (toolTip), widget (QComboBox, amtSlt_unit)
-#: rc.cpp:1166
+#. i18n: file: src/calculator/nuclearCalculator.ui:333
+#. i18n: ectx: property (text), widget (QLabel, label_72)
+#: rc.cpp:973
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1917,105 +2176,36 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the units for the amount of "
-"solute</span></p></body></html>"
+"size:12pt; font-weight:600;\">Final amount:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:661
-#. i18n: ectx: property (whatsThis), widget (QComboBox, amtSlt_unit)
-#: rc.cpp:1173
+#. i18n: file: src/calculator/nuclearCalculator.ui:347
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, finalAmt)
+#: rc.cpp:980
 msgid ""
-"This box is used to specify the units for the amount of solute in the "
-"solution."
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:472
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:516
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:665
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:158
-#. i18n: ectx: property (text), item, widget (QComboBox, mass_unit)
-#: rc.cpp:703 rc.cpp:731 rc.cpp:1176 rc.cpp:1400
-#: src/calculator/concCalculator.cpp:705 src/calculator/concCalculator.cpp:774
-msgid "grams"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:670
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#: rc.cpp:1179
-msgid "kilograms"
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:477
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:521
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:675
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:163
-#. i18n: ectx: property (text), item, widget (QComboBox, mass_unit)
-#: rc.cpp:706 rc.cpp:734 rc.cpp:1182 rc.cpp:1403
-#: src/calculator/concCalculator.cpp:706 src/calculator/concCalculator.cpp:775
-msgid "tons"
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:482
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:526
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:680
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:168
-#. i18n: ectx: property (text), item, widget (QComboBox, mass_unit)
-#: rc.cpp:709 rc.cpp:737 rc.cpp:1185 rc.cpp:1406
-#: src/calculator/concCalculator.cpp:707 src/calculator/concCalculator.cpp:776
-msgid "carats"
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:487
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:531
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:685
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:173
-#. i18n: ectx: property (text), item, widget (QComboBox, mass_unit)
-#: rc.cpp:712 rc.cpp:740 rc.cpp:1188 rc.cpp:1409
-#: src/calculator/concCalculator.cpp:708 src/calculator/concCalculator.cpp:777
-msgid "pounds"
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:492
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:536
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:690
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:178
-#. i18n: ectx: property (text), item, widget (QComboBox, mass_unit)
-#: rc.cpp:715 rc.cpp:743 rc.cpp:1191 rc.cpp:1412
-#: src/calculator/concCalculator.cpp:709 src/calculator/concCalculator.cpp:778
-msgid "ounces"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:14pt;\">Specify the final amount of the "
+"substance</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:497
-#. i18n: ectx: property (text), item, widget (QComboBox, initAmt_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:541
-#. i18n: ectx: property (text), item, widget (QComboBox, finalAmt_unit)
-#. i18n: file: src/calculator/concCalculator.ui:695
-#. i18n: ectx: property (text), item, widget (QComboBox, amtSlt_unit)
-#. i18n: file: src/calculator/gasCalculator.ui:183
-#. i18n: ectx: property (text), item, widget (QComboBox, mass_unit)
-#: rc.cpp:718 rc.cpp:746 rc.cpp:1194 rc.cpp:1415
-#: src/calculator/concCalculator.cpp:710 src/calculator/concCalculator.cpp:779
-msgid "troy ounces"
+#. i18n: file: src/calculator/nuclearCalculator.ui:350
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, finalAmt)
+#: rc.cpp:987
+msgid ""
+"This box is used to specify the final amount of the radioactive substance."
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:707
-#. i18n: ectx: property (toolTip), widget (QLabel, label_17)
-#: rc.cpp:1197
+#. i18n: file: src/calculator/nuclearCalculator.ui:367
+#. i18n: ectx: property (text), widget (QLabel, label_19)
+#: rc.cpp:990
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2026,20 +2216,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Units for molar mass of solute</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/concCalculator.ui:710
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#. i18n: file: src/calculator/gasCalculator.ui:490
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:1204 rc.cpp:1575
-msgid "(g/mol)"
+"size:12pt; font-weight:600;\">Time:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:724
-#. i18n: ectx: property (toolTip), widget (QLabel, label_18)
-#: rc.cpp:1207
+#. i18n: file: src/calculator/nuclearCalculator.ui:381
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, time)
+#: rc.cpp:997
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2050,12 +2232,20 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Units for equivalent mass of solute</span></p></body></html>"
+"size:14pt;\">Specify the time elapsed here</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/concCalculator.ui:792
-#. i18n: ectx: property (toolTip), widget (QPushButton, reset)
-#: rc.cpp:1217
+#. i18n: file: src/calculator/nuclearCalculator.ui:384
+#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, time)
+#: rc.cpp:1004
+msgid ""
+"This box is used to specify the time after which the initial amount "
+"decreases to the final amount."
+msgstr ""
+
+#. i18n: file: src/calculator/nuclearCalculator.ui:404
+#. i18n: ectx: property (toolTip), widget (QComboBox, initAmtType)
+#: rc.cpp:1007
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2066,22 +2256,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Reset all values to initial values</span></p></body></html>"
+"size:14pt;\">The method by which you want to specify "
+"mass</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:719
-#. i18n: ectx: property (text), widget (QPushButton, reset)
-#. i18n: file: src/calculator/concCalculator.ui:795
-#. i18n: ectx: property (text), widget (QPushButton, reset)
-#. i18n: file: src/calculator/gasCalculator.ui:684
-#. i18n: ectx: property (text), widget (QPushButton, reset)
-#: rc.cpp:814 rc.cpp:1224 rc.cpp:1646
-msgid "Reset"
+#. i18n: file: src/calculator/nuclearCalculator.ui:407
+#. i18n: ectx: property (whatsThis), widget (QComboBox, initAmtType)
+#: rc.cpp:1014
+msgid ""
+"This box can be used to change the mode in which you want to specify the "
+"initial amount of the substance, i.e. mass or moles."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:30
-#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
-#: rc.cpp:462
+#. i18n: file: src/calculator/nuclearCalculator.ui:428
+#. i18n: ectx: property (toolTip), widget (QComboBox, finalAmtType)
+#: rc.cpp:1023
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2092,20 +2281,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Select what you want to calculate from the "
-"combo box next to the \"calculate\" label and change the values / units to "
-"calculate.</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:37
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:469
-msgid "Elemental data"
+"size:14pt;\">Method by which you want to specify the final "
+"amount</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:47
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:472
+#. i18n: file: src/calculator/nuclearCalculator.ui:431
+#. i18n: ectx: property (whatsThis), widget (QComboBox, finalAmtType)
+#: rc.cpp:1030
+msgid ""
+"This box can be used to change the mode in which you want to specify the "
+"final amount of the substance, i.e. mass or moles."
+msgstr ""
+
+#. i18n: file: src/calculator/nuclearCalculator.ui:465
+#. i18n: ectx: property (toolTip), widget (QComboBox, initAmt_unit)
+#: rc.cpp:1039
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2116,12 +2306,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Element Name:</span></p></body></html>"
+"size:14pt;\">Specify the unit of initial amount of the "
+"substance</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:61
-#. i18n: ectx: property (toolTip), widget (QComboBox, element)
-#: rc.cpp:479
+#. i18n: file: src/calculator/nuclearCalculator.ui:468
+#. i18n: ectx: property (whatsThis), widget (QComboBox, initAmt_unit)
+#: rc.cpp:1046
+msgid ""
+"This box can be used to specify the units of the initial amount of the "
+"substance. e.g. grams, pounds, etc."
+msgstr ""
+
+#. i18n: file: src/calculator/nuclearCalculator.ui:509
+#. i18n: ectx: property (toolTip), widget (QComboBox, finalAmt_unit)
+#: rc.cpp:1067
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2132,21 +2331,20 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the Element you want to "
-"consider</span></p></body></html>"
+"size:14pt;\">Specify the units of the final amount</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:64
-#. i18n: ectx: property (whatsThis), widget (QComboBox, element)
-#: rc.cpp:486
+#. i18n: file: src/calculator/nuclearCalculator.ui:512
+#. i18n: ectx: property (whatsThis), widget (QComboBox, finalAmt_unit)
+#: rc.cpp:1074
 msgid ""
-"This box is used to specify the element on which calculation is to be "
-"performed."
+"This box can be used to specify the units of the final amount of the "
+"substance. e.g. grams, pounds, etc."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:75
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:489
+#. i18n: file: src/calculator/nuclearCalculator.ui:553
+#. i18n: ectx: property (toolTip), widget (QComboBox, time_unit)
+#: rc.cpp:1095
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2157,12 +2355,19 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Isotope mass</span></p></body></html>"
+"size:14pt;\">Specify the units for the time elapsed</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:89
-#. i18n: ectx: property (toolTip), widget (QComboBox, isotope)
-#: rc.cpp:496
+#. i18n: file: src/calculator/nuclearCalculator.ui:556
+#. i18n: ectx: property (whatsThis), widget (QComboBox, time_unit)
+#: rc.cpp:1102
+msgid ""
+"This box is used to specify the units of time. e.g. years, seconds, etc."
+msgstr ""
+
+#. i18n: file: src/calculator/nuclearCalculator.ui:608
+#. i18n: ectx: property (text), widget (QLabel, label_15)
+#: rc.cpp:1123
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2173,21 +2378,12 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify an isotope of the current "
-"element</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: src/calculator/nuclearCalculator.ui:92
-#. i18n: ectx: property (whatsThis), widget (QComboBox, isotope)
-#: rc.cpp:503
-msgid ""
-"This box is used to specify the isotope of the above element on which "
-"calculation is performed."
+"size:12pt; font-weight:600;\">Time in half-lives</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: rc.cpp:506
+#. i18n: file: src/calculator/nuclearCalculator.ui:622
+#. i18n: ectx: property (toolTip), widget (QSlider, slider)
+#: rc.cpp:1130
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2198,12 +2394,21 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Half-life:</span></p></body></html>"
+"size:14pt;\">Specify the time elapsed by moving the "
+"slider</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:117
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, halfLife)
-#: rc.cpp:513
+#. i18n: file: src/calculator/nuclearCalculator.ui:625
+#. i18n: ectx: property (whatsThis), widget (QSlider, slider)
+#: rc.cpp:1137
+msgid ""
+"This slider can be used to specify the time in terms of number of half-lives "
+"between 0 half-lives to 10 half-lives."
+msgstr ""
+
+#. i18n: file: src/calculator/nuclearCalculator.ui:642
+#. i18n: ectx: property (toolTip), widget (QLabel, numHalfLives)
+#: rc.cpp:1140
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2214,19 +2419,18 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the half-life of the radioactive "
-"isotope</span></p></body></html>"
+"size:14pt;\">The number of half-lives elapsed</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:120
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, halfLife)
-#: rc.cpp:520
-msgid "This box is used to specify the half-life of the above isotope."
+#. i18n: file: src/calculator/nuclearCalculator.ui:674
+#. i18n: ectx: property (toolTip), widget (QLabel, error)
+#: rc.cpp:1150
+msgid "Information/Error message"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:137
-#. i18n: ectx: property (toolTip), widget (QComboBox, halfLife_unit)
-#: rc.cpp:523
+#. i18n: file: src/calculator/nuclearCalculator.ui:716
+#. i18n: ectx: property (toolTip), widget (QPushButton, reset)
+#: rc.cpp:1153
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2237,504 +2441,489 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">The unit of Half-life</span></p></body></html>"
+"size:14pt;\">Reset all values to initial values</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:140
-#. i18n: ectx: property (whatsThis), widget (QComboBox, halfLife_unit)
-#: rc.cpp:530
+#. i18n: file: src/rswidget.ui:28
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1163
+msgid "S-Phrases: "
+msgstr ""
+
+#. i18n: file: src/rswidget.ui:38
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1166 src/rsdialog.cpp:95
+msgid "R-Phrases:"
+msgstr ""
+
+#. i18n: file: src/rswidget.ui:48
+#. i18n: ectx: property (toolTip), widget (KLineEdit, r_le)
+#: rc.cpp:1169
 msgid ""
-"This box is used to specify the unit of half-life, e.g. years, seconds, etc."
+"Enter the R-Phrases you want to read. Only \"-\" is allowed as a delimiter. "
+"The combinations with \"/\" are not yet implemented."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:144
-#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:560
-#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
-#: rc.cpp:533 rc.cpp:759
-msgid "years"
+#. i18n: file: src/rswidget.ui:54
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, r_le)
+#: rc.cpp:1172
+msgid "Enter the R-Phrases you want to read"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:149
-#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:565
-#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
-#: rc.cpp:536 rc.cpp:762
-msgid "seconds"
+#. i18n: file: src/rswidget.ui:57
+#. i18n: ectx: property (text), widget (KLineEdit, r_le)
+#. i18n: file: src/rswidget.ui:70
+#. i18n: ectx: property (text), widget (KLineEdit, s_le)
+#: rc.cpp:1175 rc.cpp:1184
+msgid "1-2-3-4-5-6-7-8-9"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:154
-#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:570
-#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
-#: rc.cpp:539 rc.cpp:765
-msgid "minutes"
+#. i18n: file: src/rswidget.ui:64
+#. i18n: ectx: property (toolTip), widget (KLineEdit, s_le)
+#: rc.cpp:1178
+msgid ""
+"Enter the S-Phrases you want to read. Only \"-\" is allowed as a delimiter. "
+"The combinations with \"/\" are not yet implemented."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:159
-#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:575
-#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
-#: rc.cpp:542 rc.cpp:768
-msgid "hours"
+#. i18n: file: src/rswidget.ui:67
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, s_le)
+#: rc.cpp:1181
+msgid "Enter the S-Phrases you want to read"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:164
-#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:580
-#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
-#: rc.cpp:545 rc.cpp:771
-msgid "days"
+#. i18n: file: src/rswidget.ui:77
+#. i18n: ectx: property (toolTip), widget (QPushButton, filterButton)
+#. i18n: file: src/rswidget.ui:80
+#. i18n: ectx: property (whatsThis), widget (QPushButton, filterButton)
+#: rc.cpp:1187 rc.cpp:1190
+msgid "Click here to search for the phrases you entered on the left"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:169
-#. i18n: ectx: property (text), item, widget (QComboBox, halfLife_unit)
-#. i18n: file: src/calculator/nuclearCalculator.ui:585
-#. i18n: ectx: property (text), item, widget (QComboBox, time_unit)
-#: rc.cpp:548 rc.cpp:774
-msgid "weeks"
+#. i18n: file: src/rswidget.ui:83
+#. i18n: ectx: property (text), widget (QPushButton, filterButton)
+#: rc.cpp:1193
+msgid "&Filter"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, tabBlocks)
+#: rc.cpp:1196 src/kalziumschemetype.cpp:157
+msgid "Blocks"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:47
+#. i18n: ectx: property (text), widget (QLabel, textLabel13)
+#: rc.cpp:1199
+msgid "s-Block:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:67
+#. i18n: ectx: property (text), widget (QLabel, textLabel14)
+#: rc.cpp:1202
+msgid "p-Block:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:87
+#. i18n: ectx: property (text), widget (QLabel, textLabel15)
+#: rc.cpp:1205
+msgid "d-Block:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:107
+#. i18n: ectx: property (text), widget (QLabel, textLabel16)
+#: rc.cpp:1208
+msgid "f-Block:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:133
+#. i18n: ectx: attribute (title), widget (QWidget, tabGroups)
+#: rc.cpp:1211 src/kalziumschemetype.cpp:342
+msgid "Groups"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:153
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2)
+#: rc.cpp:1214
+msgid "Group 1:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:173
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#: rc.cpp:1217
+msgid "Group 2:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:193
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:1220
+msgid "Group 3:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:213
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:1223
+msgid "Group 4:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:233
+#. i18n: ectx: property (text), widget (QLabel, textLabel5_2)
+#: rc.cpp:1226
+msgid "Group 5:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:253
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
+#: rc.cpp:1229
+msgid "Group 6:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:273
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#: rc.cpp:1232
+msgid "Group 7:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:293
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:1235
+msgid "Group 8:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:319
+#. i18n: ectx: attribute (title), widget (QWidget, tabStateOfMatter)
+#: rc.cpp:1238
+msgid "State of Matter"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:339
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1241
+msgid "Solid:"
+msgstr "Solet :"
+
+#. i18n: file: src/settings_colors.ui:359
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1244
+msgid "Liquid:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:379
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1247
+msgid "Vaporous:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:405
+#. i18n: ectx: attribute (title), widget (QWidget, tabFamily)
+#: rc.cpp:1250 src/kalziumschemetype.cpp:260 src/exportdialog.cpp:135
+msgid "Family"
+msgstr "Teulu"
+
+#. i18n: file: src/settings_colors.ui:425
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2_2)
+#: rc.cpp:1253
+msgid "Alkali metals:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:445
+#. i18n: ectx: property (text), widget (QLabel, textLabel8_2)
+#: rc.cpp:1256
+msgid "Rare earth:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:465
+#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
+#: rc.cpp:1259
+msgid "Non-metals:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:485
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
+#: rc.cpp:1262
+msgid "Alkaline earth metals:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:505
+#. i18n: ectx: property (text), widget (QLabel, textLabel5_2_2)
+#: rc.cpp:1265
+msgid "Other metals:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:525
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_2_2)
+#: rc.cpp:1268
+msgid "Halogens:"
+msgstr ""
+
+#. i18n: file: src/settings_colors.ui:545
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2_2)
+#: rc.cpp:1271
+msgid "Transition metals:"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:194
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:551
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Atomic mass</span></p></body></html>"
+#. i18n: file: src/settings_colors.ui:565
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_3)
+#: rc.cpp:1274
+msgid "Noble gases:"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:208
-#. i18n: ectx: property (toolTip), widget (QLabel, mass)
-#: rc.cpp:558
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Atomic mass of the isotope selected.</span></p></body></html>"
+#. i18n: file: src/settings_colors.ui:585
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_3_2)
+#: rc.cpp:1277
+msgid "Metalloids:"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:211
-#. i18n: ectx: property (whatsThis), widget (QLabel, mass)
-#: rc.cpp:565
-msgid "This label displays the atomic mass of the isotope in grams per mole."
+#. i18n: file: src/settings_colors.ui:611
+#. i18n: ectx: attribute (title), widget (QWidget, tabNoColor)
+#: rc.cpp:1280
+msgid "No Color Scheme"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:214
-#. i18n: ectx: property (text), widget (QLabel, mass)
-#. i18n: file: src/calculator/nuclearCalculator.ui:645
-#. i18n: ectx: property (text), widget (QLabel, numHalfLives)
-#: rc.cpp:568 rc.cpp:801
-msgid "0"
+#. i18n: file: src/settings_colors.ui:631
+#. i18n: ectx: property (text), widget (QLabel, textLabel8_2_2)
+#: rc.cpp:1283
+msgid "All the elements:"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:228
-#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
-#: rc.cpp:571
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">The unit of atomic mass</span></p></body></html>"
+#. i18n: file: src/settings_colors.ui:638
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_noscheme)
+#. i18n: file: src/settings_colors.ui:641
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_noscheme)
+#: rc.cpp:1286 rc.cpp:1289
+msgid "This color will be used if no other scheme is selected"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:231
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:578
-msgid "grams / mole"
+#. i18n: file: src/molcalcwidgetbase.ui:21
+#. i18n: ectx: attribute (title), widget (QWidget, calcTab)
+#: rc.cpp:1292 src/kalzium.cpp:522
+msgid "Calculator"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:241
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:581
-msgid "Other data"
+#. i18n: file: src/molcalcwidgetbase.ui:51
+#. i18n: ectx: property (toolTip), widget (KLineEdit, formulaEdit)
+#: rc.cpp:1295
+msgid "Enter molecular formula here"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:267
-#. i18n: ectx: property (toolTip), widget (QComboBox, mode)
-#: rc.cpp:591
+#. i18n: file: src/molcalcwidgetbase.ui:58
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, formulaEdit)
+#: rc.cpp:1298
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify what you want to calculate</span></p></body></html>"
+"This box can be used to enter the formula for the molecule.\n"
+"e.g. 1.> CaCO3\n"
+"e.g. 2.> MeOH\n"
+"e.g. 3.> #EDTA#\n"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:270
-#. i18n: ectx: property (whatsThis), widget (QComboBox, mode)
-#: rc.cpp:598
-msgid ""
-"This box is used to decide what you want to calculate, choose among 'Time', "
-"'Initial amount of the substance' and 'Final amount of the substance'."
+#. i18n: file: src/molcalcwidgetbase.ui:65
+#. i18n: ectx: property (toolTip), widget (QPushButton, calcButton)
+#. i18n: file: src/molcalcwidgetbase.ui:68
+#. i18n: ectx: property (whatsThis), widget (QPushButton, calcButton)
+#: rc.cpp:1305 rc.cpp:1308
+msgid "Click on this button to calculate."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:277
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:601
-msgid "Initial Amount"
+#. i18n: file: src/molcalcwidgetbase.ui:71
+#. i18n: ectx: property (text), widget (QPushButton, calcButton)
+#: rc.cpp:1311
+msgid "Calc"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:282
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:604
-msgid "Final Amount"
+#. i18n: file: src/molcalcwidgetbase.ui:164
+#. i18n: ectx: property (title), widget (QGroupBox, details)
+#: rc.cpp:1314
+msgid "Details"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:287
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:607
-msgid "Time"
+#. i18n: file: src/molcalcwidgetbase.ui:172
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:1317
+msgid "Composition"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:299
-#. i18n: ectx: property (text), widget (QLabel, label_69)
-#: rc.cpp:610
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Initial amount:</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:185
+#. i18n: ectx: property (toolTip), widget (QTableWidget, table)
+#: rc.cpp:1320
+msgid "Elemental composition"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:313
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, initAmt)
-#: rc.cpp:617
+#. i18n: file: src/molcalcwidgetbase.ui:188
+#. i18n: ectx: property (whatsThis), widget (QTableWidget, table)
+#: rc.cpp:1323
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the initial amount of the "
-"substance</span></p></body></html>"
+"This table previews the elemental composition of the molecule, i.e. the "
+"percentage of each element in the molecule."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:316
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, initAmt)
-#: rc.cpp:624
-msgid ""
-"This box is used to specify the initial amount of the radioactive substance."
+#. i18n: file: src/molcalcwidgetbase.ui:205
+#. i18n: ectx: property (text), widget (QTableWidget, table)
+#. i18n: file: data/knowledge.xml:15
+#. i18n: file: data/knowledge.xml:27
+#. i18n: file: data/knowledge.xml:117
+#: rc.cpp:1326 rc.cpp:2204 rc.cpp:2214 rc.cpp:2304
+msgid "Element"
+msgstr "Elfen"
+
+#. i18n: file: src/molcalcwidgetbase.ui:210
+#. i18n: ectx: property (text), widget (QTableWidget, table)
+#: rc.cpp:1329
+msgid "Atoms"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:333
-#. i18n: ectx: property (text), widget (QLabel, label_72)
-#: rc.cpp:627
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Final amount:</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:215
+#. i18n: ectx: property (text), widget (QTableWidget, table)
+#: rc.cpp:1332 src/detailinfodlg.cpp:249
+msgid "Atomic mass"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:347
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, finalAmt)
-#: rc.cpp:634
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the final amount of the "
-"substance</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:220
+#. i18n: ectx: property (text), widget (QTableWidget, table)
+#: rc.cpp:1335
+msgid "Total mass"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:350
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, finalAmt)
-#: rc.cpp:641
-msgid ""
-"This box is used to specify the final amount of the radioactive substance."
+#. i18n: file: src/molcalcwidgetbase.ui:225
+#. i18n: ectx: property (text), widget (QTableWidget, table)
+#: rc.cpp:1338 src/detailinfodlg.cpp:337
+msgid "Percentage"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:367
-#. i18n: ectx: property (text), widget (QLabel, label_19)
-#: rc.cpp:644
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Time:</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:237
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1341
+msgid "Aliases used"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:381
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, time)
-#: rc.cpp:651
+#. i18n: file: src/molcalcwidgetbase.ui:244
+#. i18n: ectx: property (toolTip), widget (QTableWidget, alias_list)
+#: rc.cpp:1344
+msgid "Aliases used in the formula"
+msgstr ""
+
+#. i18n: file: src/molcalcwidgetbase.ui:248
+#. i18n: ectx: property (whatsThis), widget (QTableWidget, alias_list)
+#: rc.cpp:1347
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the time elapsed here</span></p></body></html>"
+"This displays all the aliases used in the molecule.\n"
+"For instance, in the molecule MeOH, the alias used is Me = CH3."
+msgstr ""
+
+#. i18n: file: src/molcalcwidgetbase.ui:259
+#. i18n: ectx: property (text), widget (QTableWidget, alias_list)
+#: rc.cpp:1351
+msgid "aliases"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:384
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, time)
-#: rc.cpp:658
-msgid ""
-"This box is used to specify the time after which the initial amount "
-"decreases to the final amount."
+#. i18n: file: src/molcalcwidgetbase.ui:273
+#. i18n: ectx: attribute (title), widget (QWidget, aliasTab)
+#: rc.cpp:1354
+msgid "Aliases"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:404
-#. i18n: ectx: property (toolTip), widget (QComboBox, initAmtType)
-#: rc.cpp:661
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">The method by which you want to specify "
-"mass</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:279
+#. i18n: ectx: property (title), widget (QGroupBox, aliasBox)
+#: rc.cpp:1357
+msgid "Define alias"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:407
-#. i18n: ectx: property (whatsThis), widget (QComboBox, initAmtType)
-#: rc.cpp:668
-msgid ""
-"This box can be used to change the mode in which you want to specify the "
-"initial amount of the substance, i.e. mass or moles."
+#. i18n: file: src/molcalcwidgetbase.ui:300
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1360
+msgid "Short-form"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:428
-#. i18n: ectx: property (toolTip), widget (QComboBox, finalAmtType)
-#: rc.cpp:677
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Method by which you want to specify the final "
-"amount</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:307
+#. i18n: ectx: property (toolTip), widget (QLineEdit, shortForm)
+#: rc.cpp:1363
+msgid "Short form of the alias"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:431
-#. i18n: ectx: property (whatsThis), widget (QComboBox, finalAmtType)
-#: rc.cpp:684
+#. i18n: file: src/molcalcwidgetbase.ui:311
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, shortForm)
+#: rc.cpp:1366
 msgid ""
-"This box can be used to change the mode in which you want to specify the "
-"final amount of the substance, i.e. mass or moles."
+"You can specify the short form of the alias used here, \n"
+"for instance, Me."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:465
-#. i18n: ectx: property (toolTip), widget (QComboBox, initAmt_unit)
-#: rc.cpp:693
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the unit of initial amount of the "
-"substance</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:318
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1370
+msgid "Full-form"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:468
-#. i18n: ectx: property (whatsThis), widget (QComboBox, initAmt_unit)
-#: rc.cpp:700
+#. i18n: file: src/molcalcwidgetbase.ui:326
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, fullForm)
+#: rc.cpp:1373
 msgid ""
-"This box can be used to specify the units of the initial amount of the "
-"substance. e.g. grams, pounds, etc."
+"You can enter the full form of the alias in this box, \n"
+"for instance, CH3."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:509
-#. i18n: ectx: property (toolTip), widget (QComboBox, finalAmt_unit)
-#: rc.cpp:721
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the units of the final amount</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:333
+#. i18n: ectx: property (toolTip), widget (QPushButton, alias)
+#: rc.cpp:1377
+msgid "Click to add the alias"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:512
-#. i18n: ectx: property (whatsThis), widget (QComboBox, finalAmt_unit)
-#: rc.cpp:728
-msgid ""
-"This box can be used to specify the units of the final amount of the "
-"substance. e.g. grams, pounds, etc."
+#. i18n: file: src/molcalcwidgetbase.ui:336
+#. i18n: ectx: property (whatsThis), widget (QPushButton, alias)
+#: rc.cpp:1380
+msgid "Click to add the alias if it is valid."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:553
-#. i18n: ectx: property (toolTip), widget (QComboBox, time_unit)
-#: rc.cpp:749
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the units for the time elapsed</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:339
+#. i18n: ectx: property (text), widget (QPushButton, alias)
+#: rc.cpp:1383
+msgid "Add Alias"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:556
-#. i18n: ectx: property (whatsThis), widget (QComboBox, time_unit)
-#: rc.cpp:756
-msgid ""
-"This box is used to specify the units of time. e.g. years, seconds, etc."
+#. i18n: file: src/molcalcwidgetbase.ui:373
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1386
+msgid "Pre-defined aliases"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:608
-#. i18n: ectx: property (text), widget (QLabel, label_15)
-#: rc.cpp:777
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Time in half-lives</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:380
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1389
+msgid "User-defined aliases"
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:622
-#. i18n: ectx: property (toolTip), widget (QSlider, slider)
-#: rc.cpp:784
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Specify the time elapsed by moving the "
-"slider</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:387
+#. i18n: ectx: property (toolTip), widget (QTableWidget, pre_defined)
+#: rc.cpp:1392
+msgid "List of pre-defined aliases."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:625
-#. i18n: ectx: property (whatsThis), widget (QSlider, slider)
-#: rc.cpp:791
-msgid ""
-"This slider can be used to specify the time in terms of number of half-lives "
-"between 0 half-lives to 10 half-lives."
+#. i18n: file: src/molcalcwidgetbase.ui:390
+#. i18n: ectx: property (whatsThis), widget (QTableWidget, pre_defined)
+#: rc.cpp:1395
+msgid "This table displays all the pre-defined aliases."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:642
-#. i18n: ectx: property (toolTip), widget (QLabel, numHalfLives)
-#: rc.cpp:794
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">The number of half-lives elapsed</span></p></body></html>"
+#. i18n: file: src/molcalcwidgetbase.ui:419
+#. i18n: ectx: property (toolTip), widget (QTableWidget, user_defined)
+#: rc.cpp:1398
+msgid "List of user-defined aliases."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:674
-#. i18n: ectx: property (toolTip), widget (QLabel, error)
-#: rc.cpp:804
-msgid "Information/Error message"
+#. i18n: file: src/molcalcwidgetbase.ui:422
+#. i18n: ectx: property (whatsThis), widget (QTableWidget, user_defined)
+#: rc.cpp:1401
+msgid "This is the list of aliases that you or some other user has added."
 msgstr ""
 
-#. i18n: file: src/calculator/nuclearCalculator.ui:716
-#. i18n: ectx: property (toolTip), widget (QPushButton, reset)
-#: rc.cpp:807
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Reset all values to initial values</span></p></body></html>"
+#. i18n: file: src/isotopetable/isotopedialog.ui:69
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1404
+msgid "Zoom IN / OUT"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:39
-#. i18n: ectx: property (toolTip), widget (QTreeWidget, tree)
-#: rc.cpp:1264
+#. i18n: file: src/isotopetable/isotopedialog.ui:138
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1407
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2745,975 +2934,789 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Select the calculator that you want to "
-"use</span></p></body></html>"
+"weight:600;\">Information</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
+"style=\" font-weight:400;\">Right click on an element to view information "
+"about it.</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">zoom in and out using your "
+"mouse wheel / zoom feature.</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">scroll using left-clicking "
+"and dragging / scroll feature.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:42
-#. i18n: ectx: property (whatsThis), widget (QTreeWidget, tree)
-#: rc.cpp:1271
-msgid ""
-"This is the index of the various calculators available.  For more "
-"information on each calculator, click on 'Introduction'."
+#. i18n: file: src/plotsetupwidget.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1417
+msgid "X-Axis"
+msgstr ""
+
+#. i18n: file: src/plotsetupwidget.ui:29
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: src/plotsetupwidget.ui:333
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:1420 rc.cpp:1519
+msgid "Average value:"
+msgstr ""
+
+#. i18n: file: src/plotsetupwidget.ui:50
+#. i18n: ectx: property (whatsThis), widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:368
+#. i18n: ectx: property (whatsThis), widget (KComboBox, KCB_y)
+#: rc.cpp:1423 rc.cpp:1528
+msgid "Here you can define what you want to plot"
+msgstr ""
+
+#. i18n: file: src/plotsetupwidget.ui:54
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:375
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#: rc.cpp:1426 rc.cpp:1531 src/exportdialog.cpp:123
+#: src/elementdataviewer.cpp:222
+msgid "Atomic Number"
+msgstr ""
+
+#. i18n: file: src/plotsetupwidget.ui:59
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:380
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#. i18n: file: data/knowledge.xml:131
+#: rc.cpp:1429 rc.cpp:1534 rc.cpp:2318 src/kalziumgradienttype.cpp:290
+#: src/elementdataviewer.cpp:228
+msgid "Atomic Mass"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:49
-#. i18n: ectx: property (text), widget (QTreeWidget, tree)
-#: rc.cpp:1274
-msgid "Calculators"
+#. i18n: file: src/plotsetupwidget.ui:64
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:385
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#. i18n: file: src/settings_gradients.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicElectronegativityGradient)
+#: rc.cpp:1432 rc.cpp:1537 rc.cpp:1602 src/exportdialog.cpp:130
+#: src/detailinfodlg.cpp:263 src/elementdataviewer.cpp:234
+msgid "Electronegativity"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:54
-#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
-#: rc.cpp:1277 src/calculator/calculator.cpp:86
-msgid "Introduction"
+#. i18n: file: src/plotsetupwidget.ui:69
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:390
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#. i18n: file: src/settings_gradients.ui:88
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicMeltingPointGradient)
+#: rc.cpp:1435 rc.cpp:1540 rc.cpp:1599 src/exportdialog.cpp:133
+#: src/kalziumgradienttype.cpp:399 src/detailinfodlg.cpp:207
+#: src/elementdataviewer.cpp:240
+msgid "Melting Point"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:59
-#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
-#: rc.cpp:1280 src/calculator/calculator.cpp:106
-msgid "Molecular mass Calculator"
+#. i18n: file: src/plotsetupwidget.ui:74
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:395
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#. i18n: file: src/settings_gradients.ui:81
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicBoilingPointGradient)
+#: rc.cpp:1438 rc.cpp:1543 rc.cpp:1596 src/exportdialog.cpp:134
+#: src/kalziumgradienttype.cpp:343 src/detailinfodlg.cpp:214
+#: src/elementdataviewer.cpp:247
+msgid "Boiling Point"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:123
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#. i18n: file: src/calculator/calculator.ui:64
-#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
-#: rc.cpp:1255 rc.cpp:1283 src/calculator/calculator.cpp:97
-msgid "Concentration Calculator"
+#. i18n: file: src/plotsetupwidget.ui:79
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:400
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#. i18n: file: data/knowledge.xml:252
+#. i18n: file: data/knowledge.xml:261
+#. i18n: file: data/knowledge.xml:266
+#. i18n: file: data/knowledge.xml:278
+#: rc.cpp:1441 rc.cpp:1546 rc.cpp:2441 rc.cpp:2451 rc.cpp:2455 rc.cpp:2469
+#: src/elementdataviewer.cpp:254
+msgid "Atomic Radius"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:28
-#. i18n: ectx: attribute (title), widget (QWidget, nuclear)
-#. i18n: file: src/calculator/calculator.ui:69
-#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
-#: rc.cpp:1234 rc.cpp:1286 src/calculator/calculator.cpp:89
-msgid "Nuclear Calculator"
+#. i18n: file: src/plotsetupwidget.ui:84
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_x)
+#. i18n: file: src/plotsetupwidget.ui:405
+#. i18n: ectx: property (text), item, widget (KComboBox, KCB_y)
+#. i18n: file: src/settings_gradients.ui:60
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicCovalentRadiusGradient)
+#. i18n: file: data/knowledge.xml:251
+#. i18n: file: data/knowledge.xml:260
+#. i18n: file: data/knowledge.xml:269
+#. i18n: file: data/knowledge.xml:275
+#: rc.cpp:1444 rc.cpp:1549 rc.cpp:1587 rc.cpp:2439 rc.cpp:2449 rc.cpp:2459
+#: rc.cpp:2465 src/exportdialog.cpp:131 src/kalziumgradienttype.cpp:175
+#: src/detailinfodlg.cpp:235 src/elementdataviewer.cpp:261
+msgid "Covalent Radius"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:55
-#. i18n: ectx: attribute (title), widget (QWidget, gas)
-#. i18n: file: src/calculator/calculator.ui:74
-#. i18n: ectx: property (text), item, widget (QTreeWidget, tree)
-#: rc.cpp:1240 rc.cpp:1289 src/calculator/calculator.cpp:93
-msgid "Gas Calculator"
-msgstr ""
+#. i18n: file: src/plotsetupwidget.ui:92
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: src/plotsetupwidget.ui:347
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:1447 rc.cpp:1522
+msgid "Maximum value:"
+msgstr "Gwerth uchaf:"
+
+#. i18n: file: src/plotsetupwidget.ui:106
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#. i18n: file: src/plotsetupwidget.ui:354
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
+#: rc.cpp:1450 rc.cpp:1525
+msgid "Minimum value:"
+msgstr "Gwerth isaf:"
 
-#. i18n: file: src/calculator/calculator.ui:130
+#. i18n: file: src/plotsetupwidget.ui:127
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1292
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:18pt; font-weight:600;\">The Kalzium Molecular "
-"Calculator</span></p></body></html>"
+#: rc.cpp:1453
+msgid "Display:"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:172
-#. i18n: ectx: property (toolTip), widget (KTextEdit, ktextedit)
-#: rc.cpp:1299
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:14pt;\">Information about the various "
-"calculators</span></p></body></html>"
+#. i18n: file: src/plotsetupwidget.ui:149
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1456
+msgid "Element Type"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:175
-#. i18n: ectx: property (whatsThis), widget (KTextEdit, ktextedit)
-#: rc.cpp:1306
-msgid "This is the description of the function of each calculator in Kalzium"
+#. i18n: file: src/plotsetupwidget.ui:175
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1459
+msgid "First element:"
 msgstr ""
 
-#. i18n: file: src/calculator/calculator.ui:196
-#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
-#: rc.cpp:1309
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'DejaVu Sans'; font-size:12pt;\">Welcome to the Kalzium molecular "
-"calculator!<br /></span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'DejaVu Sans'; font-size:10pt;\">This calculator contains a variety "
-"of calculators for different tasks performing different "
-"calculations.</span></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'DejaVu Sans'; font-size:10pt;\">You can find the following "
-"calculators in Kalzium</span></p>\n"
-"<ul style=\"margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-"
-"right: 0px; -qt-list-indent: 1;\"><li style=\" font-family:'DejaVu Sans';\" "
-"style=\" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Molecular mass calculator<br /></span> This calculator helps "
-"you calculate the molecular masses of different molecules.<br />You can "
-"specify short form of the molecule names add more such aliases.</li>\n"
-"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Concentrations calculator<br "
-"/></span>You can calculate quantities which include</li>\n"
-"<ul type=\"circle\" style=\"margin-top: 0px; margin-bottom: 0px; margin-"
-"left: 0px; margin-right: 0px; -qt-list-indent: 2;\"><li style=\" font-"
-"family:'DejaVu Sans';\" style=\" margin-top:0px; margin-bottom:0px; margin-"
-"left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Amount of "
-"substance\t</li>\n"
-"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\">Volume of solvent</li>\n"
-"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\">Concentration of substance</li></ul>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:1; text-indent:0px;\"><span style=\" font-"
-"family:'DejaVu Sans';\"> There are a wide range of units to choose from and "
-"different methods to specify quantities.</span></p>\n"
-"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Nuclear calculator<br "
-"/></span>This calculator makes use of the nuclear data available in Kalzium "
-"to predict the expected masses of a material after time.</li>\n"
-"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Gas calculator<br "
-"/></span>This calculator can calculate the values of Temperature, pressure, "
-"volume, amount of gas etc. for various ideal as well as non-ideal "
-"gases.</li>\n"
-"<li style=\" font-family:'DejaVu Sans';\" style=\" margin-top:0px; margin-"
-"bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Equation Balancer<br "
-"/></span>This calculator can balance chemical "
-"equations.</li></ul></body></html>"
+#. i18n: file: src/plotsetupwidget.ui:182
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:1462
+msgid "Last element:"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1422
-msgid "X max:"
+#. i18n: file: src/plotsetupwidget.ui:211
+#. i18n: ectx: property (text), widget (QPushButton, full)
+#: rc.cpp:1465
+msgid "Full range"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, pushButton)
-#: rc.cpp:1425
-msgid "Draw Plot"
+#. i18n: file: src/plotsetupwidget.ui:219
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1468
+msgid "All elements"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:90
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget_2)
-#: rc.cpp:1428
-msgid "pH(Y)"
+#. i18n: file: src/plotsetupwidget.ui:224
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1471
+msgid "Metals"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:95
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget_2)
-#: rc.cpp:1431
-msgid "Volume(X)"
+#. i18n: file: src/plotsetupwidget.ui:229
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1474
+msgid "Non-Metals / Metalloids"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:110
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:1434
-msgid "Theoretical equations:"
+#. i18n: file: src/plotsetupwidget.ui:234
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1477
+msgid "s block elements"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:117
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1437
-msgid "Y max:"
+#. i18n: file: src/plotsetupwidget.ui:239
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1480
+msgid "p block elements"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:124
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1440
-msgid "Y min:"
+#. i18n: file: src/plotsetupwidget.ui:244
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1483
+msgid "d block elements"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:133
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:1443
-msgid "X axis:"
+#. i18n: file: src/plotsetupwidget.ui:249
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1486
+msgid "f block elements"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:150
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:1446
-msgid "Y axis:"
+#. i18n: file: src/plotsetupwidget.ui:254
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1489
+msgid "Noble gases"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:249
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:1449
-msgid "Parameter"
+#. i18n: file: src/plotsetupwidget.ui:259
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1492
+msgid "Alkalie metals"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:254
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:1452
-msgid "Value"
+#. i18n: file: src/plotsetupwidget.ui:264
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1495
+msgid "Alkaline earth metals"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:262
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:1455
-msgid "Experimental values:"
+#. i18n: file: src/plotsetupwidget.ui:269
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1498
+msgid "Lanthanides"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:269
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:1458
-msgid "Notes:"
+#. i18n: file: src/plotsetupwidget.ui:274
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1501
+msgid "Actinides"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:296
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:1461
-msgid "X min:"
+#. i18n: file: src/plotsetupwidget.ui:279
+#. i18n: ectx: property (text), item, widget (QComboBox, comboElementType)
+#: rc.cpp:1504
+msgid "Radio-active elements"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:317
-#. i18n: ectx: property (text), widget (QPushButton, newfile)
-#: rc.cpp:1464
-msgid "New"
+#. i18n: file: src/plotsetupwidget.ui:294
+#. i18n: ectx: property (text), item, widget (KComboBox, comboElementLabels)
+#: rc.cpp:1507
+msgid "No Labels"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:324
-#. i18n: ectx: property (text), widget (QPushButton, open)
-#: rc.cpp:1467
-msgid "Open"
+#. i18n: file: src/plotsetupwidget.ui:299
+#. i18n: ectx: property (text), item, widget (KComboBox, comboElementLabels)
+#: rc.cpp:1510
+msgid "Element Names"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:331
-#. i18n: ectx: property (text), widget (QPushButton, save)
-#: rc.cpp:1470
-msgid "Save"
+#. i18n: file: src/plotsetupwidget.ui:304
+#. i18n: ectx: property (text), item, widget (KComboBox, comboElementLabels)
+#: rc.cpp:1513
+msgid "Element Symbols"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:338
-#. i18n: ectx: property (text), widget (QPushButton, saveimage)
-#: rc.cpp:1473
-msgid "Save plot"
+#. i18n: file: src/plotsetupwidget.ui:314
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:1516
+msgid "Y-Axis"
 msgstr ""
 
-#. i18n: file: src/calculator/titrationCalculator.ui:345
-#. i18n: ectx: property (text), widget (QPushButton, rapidhelp)
-#: rc.cpp:1476
-msgid "Example"
+#. i18n: file: src/equationview.ui:44
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1552
+msgid "Equation:"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:21
-#. i18n: ectx: property (toolTip), widget (QTabWidget, tabWidget)
-#: rc.cpp:1227
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">The settings of the molecular concentration "
-"calculator</span></p></body></html>"
+#. i18n: file: src/equationview.ui:63
+#. i18n: ectx: property (toolTip), widget (KLineEdit, lineEdit)
+#. i18n: file: src/equationview.ui:66
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, lineEdit)
+#: rc.cpp:1555 rc.cpp:1558
+msgid "Enter the equation you want to balance in this field."
+msgstr ""
+
+#. i18n: file: src/equationview.ui:69
+#. i18n: ectx: property (text), widget (KLineEdit, lineEdit)
+#: rc.cpp:1561
+msgid "aCH3(CH2)3COOH + bO2 -> cH2O + dCO2"
+msgstr ""
+
+#. i18n: file: src/equationview.ui:82
+#. i18n: ectx: property (toolTip), widget (KPushButton, calculateButton)
+#. i18n: file: src/equationview.ui:85
+#. i18n: ectx: property (whatsThis), widget (KPushButton, calculateButton)
+#: rc.cpp:1564 rc.cpp:1567
+msgid "If you press this button the equation on the left will be balanced."
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:34
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_mass)
-#: rc.cpp:1237
-msgid "Amount is always specified in term of mass"
+#. i18n: file: src/equationview.ui:88
+#. i18n: ectx: property (text), widget (KPushButton, calculateButton)
+#: rc.cpp:1570
+msgid "&Calculate"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:63
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ideal)
-#: rc.cpp:1243
-msgid "Assume Gas is ideal (i.e. do not show Van der Waals co-efficients)"
+#. i18n: file: src/equationview.ui:150
+#. i18n: ectx: property (text), widget (QPushButton, btnCopy)
+#: rc.cpp:1573
+msgid "Copy to Clipboard"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:89
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:1246
-msgid "Mass Calculator"
+#. i18n: file: src/exportdialog.ui:51
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1576
+msgid "File:"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:95
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_alias)
-#: rc.cpp:1249
-msgid "Show details such as aliases"
+#. i18n: file: src/exportdialog.ui:68
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1579
+msgid "Format:"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:102
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox)
-#: rc.cpp:1252
-msgid "Show the add alias tab"
+#. i18n: file: src/settings_gradients.ui:42
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1582
+msgid ""
+"Instead of using a linear gradient to display the given property of an "
+"element in the periodic table, Kalzium can also use a logarithmic gradient.\n"
+"\n"
+"Check the properties you want to have displayed with a logarithmic gradient."
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:129
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_soluteMass)
-#: rc.cpp:1258
-msgid "Amount of solute is always specified in terms of mass"
+#. i18n: file: src/settings_gradients.ui:67
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicVanDerWaalsRadiusGradient)
+#. i18n: file: data/knowledge.xml:253
+#. i18n: file: data/knowledge.xml:257
+#. i18n: file: data/knowledge.xml:270
+#. i18n: file: data/knowledge.xml:280
+#: rc.cpp:1590 rc.cpp:2443 rc.cpp:2445 rc.cpp:2461 rc.cpp:2473
+#: src/exportdialog.cpp:132
+msgid "Van der Waals Radius"
 msgstr ""
 
-#. i18n: file: src/calculator/settings_calc.ui:136
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_solventVolume)
-#: rc.cpp:1261
-msgid "Amount of solvent is always specified in terms of volume"
+#. i18n: file: src/settings_gradients.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicDiscoverydateGradient)
+#: rc.cpp:1605
+msgid "Discovery Date"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:30
-#. i18n: ectx: property (html), widget (KTextEdit, ktextedit)
-#: rc.cpp:1516
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'DejaVu Sans'; font-size:12pt; font-weight:600;\">Change the "
-"quantities and observe the other quantities change dynamically.<br />Mass "
-"and moles are directly dependent for a given gas.</span></p></body></html>"
+#. i18n: file: src/settings_gradients.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicElectronaffinityGradient)
+#: rc.cpp:1608 src/kalziumgradienttype.cpp:622
+msgid "Electronaffinity"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:47
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1337
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">molar mass of the gas:</span></p></body></html>"
+#. i18n: file: src/settings_gradients.ui:116
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_LogarithmicIonizationGradient)
+#: rc.cpp:1611 src/exportdialog.cpp:128
+msgid "Ionization"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:61
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, molarMass)
-#: rc.cpp:1344
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the molar mass of the gas</span></p></body></html>"
+#. i18n: file: src/settings_gradients.ui:136
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1614
+msgid "Maximal Value Color:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:64
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, molarMass)
-#: rc.cpp:1351
-msgid ""
-"This box can be used to specify the molar mass of the gas, e.g. 2 for "
-"Hydrogen gas."
+#. i18n: file: src/settings_gradients.ui:152
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1617
+msgid "Minimal Value Color:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:81
-#. i18n: ectx: property (text), widget (QLabel, label_25)
-#: rc.cpp:1354
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">moles:</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:34
+#. i18n: ectx: attribute (title), widget (QWidget, display)
+#: rc.cpp:1620
+msgid "Display"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:95
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, moles)
-#: rc.cpp:1361
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the number of moles of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:42
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1623
+msgid "Quality:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:99
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, moles)
-#: rc.cpp:1368
-msgid ""
-"This box can be used to specify the number of moles of the gas.\n"
-"moles = mass / molar mass"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:58
+#. i18n: ectx: property (text), item, widget (KComboBox, qualityCombo)
+#: rc.cpp:1626
+msgid "Low"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:116
-#. i18n: ectx: property (text), widget (QLabel, label_24)
-#: rc.cpp:1372
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Mass:</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:63
+#. i18n: ectx: property (text), item, widget (KComboBox, qualityCombo)
+#: rc.cpp:1629
+msgid "Medium"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:130
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, mass)
-#: rc.cpp:1379
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the Mass of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:68
+#. i18n: ectx: property (text), item, widget (KComboBox, qualityCombo)
+#: rc.cpp:1632
+msgid "High"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:134
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, mass)
-#: rc.cpp:1386
-msgid ""
-"This box can be used to specify the mass of the gas.\n"
-"Mass = moles * molar mass"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1635
+msgid "Style:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:151
-#. i18n: ectx: property (toolTip), widget (QComboBox, mass_unit)
-#: rc.cpp:1390
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the unit of mass of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:107
+#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
+#: rc.cpp:1638
+msgid "Balls and sticks"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:154
-#. i18n: ectx: property (whatsThis), widget (QComboBox, mass_unit)
-#: rc.cpp:1397
-msgid "This box is used to change the units of mass."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:112
+#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
+#: rc.cpp:1641
+msgid "Sticks"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:208
-#. i18n: ectx: property (text), widget (QLabel, label_27)
-#: rc.cpp:1418
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Pressure:</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:117
+#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
+#: rc.cpp:1644
+msgid "Van der Waals"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:222
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, pressure)
-#: rc.cpp:1425
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the Pressure of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:122
+#. i18n: ectx: property (text), item, widget (KComboBox, styleCombo)
+#: rc.cpp:1647
+msgid "Wireframe"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:225
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, pressure)
-#: rc.cpp:1432
-msgid "This box can be used to change the pressure of the gas."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:145
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:1650
+msgid "2nd Style:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:242
-#. i18n: ectx: property (toolTip), widget (QComboBox, pressure_unit)
-#: rc.cpp:1435
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the units for pressure of the "
-"gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:161
+#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
+#. i18n: file: src/tools/moleculeviewerwidget.ui:215
+#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
+#: rc.cpp:1653 rc.cpp:1668 src/kalziumelementproperty.cpp:88
+msgid "None"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:245
-#. i18n: ectx: property (whatsThis), widget (QComboBox, pressure_unit)
-#: rc.cpp:1442
-msgid ""
-"This box can be used to specify the units of pressure, e.g. atmospheres, "
-"bars, etc."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:166
+#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
+#: rc.cpp:1656
+msgid "Ribbon"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:291
-#. i18n: ectx: property (text), widget (QLabel, label_29)
-#: rc.cpp:1466
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Temperature:</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:171
+#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
+#: rc.cpp:1659
+msgid "Ring"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:305
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, temp)
-#: rc.cpp:1473
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the temperature of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:176
+#. i18n: ectx: property (text), item, widget (KComboBox, style2Combo)
+#: rc.cpp:1662
+msgid "Molecular Orbital"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:308
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, temp)
-#: rc.cpp:1480
-msgid "This box can be used to specify the temperature of the gas."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:199
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1665
+msgid "Labels:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:325
-#. i18n: ectx: property (toolTip), widget (QComboBox, temp_unit)
-#: rc.cpp:1483
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the units for the temperature of the "
-"gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:220
+#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
+#: rc.cpp:1671
+msgid "Atom numbers"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:328
-#. i18n: ectx: property (whatsThis), widget (QComboBox, temp_unit)
-#: rc.cpp:1490
-msgid ""
-"This box can be used to specify the units of temperature, e.g. Kelvin, "
-"Celsius, etc."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:225
+#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
+#: rc.cpp:1674
+msgid "Element symbols"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:364
-#. i18n: ectx: property (text), widget (QLabel, label_26)
-#: rc.cpp:1508
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Volume:</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:230
+#. i18n: ectx: property (text), item, widget (KComboBox, labelsCombo)
+#: rc.cpp:1677
+msgid "Element names"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:378
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, volume)
-#: rc.cpp:1515
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the volume of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:277
+#. i18n: ectx: attribute (title), widget (QWidget, edit)
+#: rc.cpp:1680
+msgid "Edit"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:381
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, volume)
-#: rc.cpp:1522
-msgid "This box can be used to specify the volume of the gas."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:285
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:1683
+msgid "Element:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:404
-#. i18n: ectx: property (toolTip), widget (QComboBox, volume_unit)
-#: rc.cpp:1525
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt;\">Specify the units for volume of the gas</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:318
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:1686
+msgid "Bond Order:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:407
-#. i18n: ectx: property (whatsThis), widget (QComboBox, volume_unit)
-#: rc.cpp:1532
-msgid "This box can be used to change the units of volume, e.g. liters."
+#. i18n: file: src/tools/moleculeviewerwidget.ui:353
+#. i18n: ectx: property (text), widget (QCheckBox, hydrogenBox)
+#: rc.cpp:1689
+msgid "Adjust Hydrogens Automatically"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:467
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1563
-msgid "Moles / Mass"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:378
+#. i18n: ectx: property (text), widget (QPushButton, hydrogensButton)
+#: rc.cpp:1692
+msgid "Add Hydrogens"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:472
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1566
-msgid "Pressure"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:415
+#. i18n: ectx: property (text), widget (QPushButton, optimizeButton)
+#: rc.cpp:1695
+msgid "Optimize"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:477
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1569
-msgid "Temperature"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:459
+#. i18n: ectx: attribute (title), widget (QWidget, measure)
+#: rc.cpp:1698
+msgid "Measure"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:482
-#. i18n: ectx: property (text), item, widget (QComboBox, mode)
-#: rc.cpp:1572
-msgid "Volume"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:471
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:1701
+msgid ""
+"Click on 2 atoms to measure a distance, on 3 atoms to measure an angle, on 4 "
+"atoms to measure a dihedral angle."
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:500
-#. i18n: ectx: property (title), widget (QGroupBox, non_ideal)
-#: rc.cpp:1578
-msgid "Data for non-ideal gases"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:520
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1704
+msgid "Statistics"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:512
-#. i18n: ectx: property (text), widget (QLabel, label_30)
-#: rc.cpp:1581
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Van der Waals constant "
-"'b':</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:528
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1707
+msgid "Name:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:526
-#. i18n: ectx: property (text), widget (QLabel, label_28)
-#: rc.cpp:1588
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Van der Waals constant "
-"'a':</span></p></body></html>"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:545
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:1710
+msgid "Formula:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:536
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, b)
-#: rc.cpp:1595
-msgid "Specify the units of the van der Waals constant 'b'"
+#. i18n: file: src/tools/moleculeviewerwidget.ui:562
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1713
+msgid "Weight:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:539
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, b)
-#: rc.cpp:1598
-msgid ""
-"This box can be used to specify the van der Waals constant 'b' for the gas. "
-"This is required only for a real gas. It can be marked as 0.0 for an ideal "
-"gas."
+#. i18n: file: src/tools/obconverterwidget.ui:22
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1716
+msgid "Files to convert"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:552
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, a)
-#: rc.cpp:1601
-msgid "Specify the units of the van der Waals constant 'a'"
+#. i18n: file: src/tools/obconverterwidget.ui:34
+#. i18n: ectx: property (text), widget (KPushButton, selectAllFileButton)
+#: rc.cpp:1719
+msgid "&Select all"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:555
-#. i18n: ectx: property (whatsThis), widget (QDoubleSpinBox, a)
-#: rc.cpp:1604
-msgid ""
-"This box can be used to specify the van der Waals constant 'a' for the gas. "
-"This is required only for a real gas. It can be marked as 0.0 for an ideal "
-"gas."
+#. i18n: file: src/tools/obconverterwidget.ui:54
+#. i18n: ectx: property (text), widget (KPushButton, deleteFileButton)
+#: rc.cpp:1722
+msgid "&Remove"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:570
-#. i18n: ectx: property (toolTip), widget (QComboBox, b_unit)
-#: rc.cpp:1607
-msgid "The units of the van der Waals constant 'b'"
+#. i18n: file: src/tools/obconverterwidget.ui:61
+#. i18n: ectx: property (text), widget (KPushButton, addFileButton)
+#: rc.cpp:1725
+msgid "&Add"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:573
-#. i18n: ectx: property (whatsThis), widget (QComboBox, b_unit)
-#: rc.cpp:1610
+#. i18n: file: src/tools/obconverterwidget.ui:71
+#. i18n: ectx: property (whatsThis), widget (QListWidget, FileListView)
+#: rc.cpp:1728
 msgid ""
-"This can be used to specify the units of the van der Waals constant 'b'."
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal; text-decoration:none;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">You see the files which "
+"will be converted here. Use the buttons to add and remove files from the "
+"list.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:610
+#. i18n: file: src/tools/obconverterwidget.ui:92
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1631
-msgid "per mole"
-msgstr ""
-
-#. i18n: file: src/calculator/gasCalculator.ui:626
-#. i18n: ectx: property (text), item, widget (QComboBox, a_unit)
-#: rc.cpp:1640
-msgid "liter^2 atmosphere/mol^2"
+#: rc.cpp:1734
+msgid "Convert from:"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:681
-#. i18n: ectx: property (toolTip), widget (QPushButton, reset)
-#: rc.cpp:1643
-msgid "Click to reset all values to initial values"
+#. i18n: file: src/tools/obconverterwidget.ui:124
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1737
+msgid "Convert to:"
 msgstr ""
 
 #. i18n: file: src/gradientwidget.ui:22
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1655
+#: rc.cpp:1740
 msgid "Scheme:"
 msgstr ""
 
-#. i18n: file: src/gradientwidget.ui:58
+#. i18n: file: src/gradientwidget.ui:50
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:1658
+#: rc.cpp:1743
 msgid "Gradient:"
 msgstr ""
 
-#. i18n: file: src/gradientwidget.ui:92
+#. i18n: file: src/gradientwidget.ui:99
 #. i18n: ectx: property (text), widget (QLabel, lblUnit)
-#: rc.cpp:1661 src/elementdataviewer.cpp:241 src/elementdataviewer.cpp:248
-#: src/kalziumgradienttype.cpp:343 src/kalziumgradienttype.cpp:397
-#: src/kalziumgradienttype.cpp:449
+#: rc.cpp:1746
 msgid "K"
 msgstr ""
 
-#. i18n: file: src/gradientwidget.ui:101
+#. i18n: file: src/gradientwidget.ui:108
 #. i18n: ectx: property (toolTip), widget (QSlider, gradient_slider)
-#: rc.cpp:1664
+#: rc.cpp:1749
 msgid "Slide to change current temperature"
 msgstr ""
 
-#. i18n: file: src/gradientwidget.ui:125
+#. i18n: file: src/gradientwidget.ui:132
 #. i18n: ectx: property (toolTip), widget (QPushButton, Play)
-#: rc.cpp:1667
+#: rc.cpp:1752
 msgid "Click to Play / Pause the increase in temperature."
 msgstr ""
 
-#. i18n: file: src/gradientwidget.ui:135
+#. i18n: file: src/gradientwidget.ui:142
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1670
+#: rc.cpp:1755
 msgid "Speed"
 msgstr ""
 
-#. i18n: file: src/gradientwidget.ui:142
+#. i18n: file: src/gradientwidget.ui:149
 #. i18n: ectx: property (toolTip), widget (QSlider, Speed)
-#: rc.cpp:1673
+#: rc.cpp:1758
 msgid "Slide to change the speed of increase in temperature."
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:85
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1888 src/rsdialog.cpp:95
-msgid "R-Phrases:"
-msgstr ""
-
-#. i18n: file: src/rswidget.ui:95
-#. i18n: ectx: property (toolTip), widget (KLineEdit, r_le)
-#: rc.cpp:1891
+#. i18n: file: src/spectrumview.ui:14
+#. i18n: ectx: property (toolTip), widget (QWidget, SpectrumView)
+#: rc.cpp:1761
 msgid ""
-"Enter the R-Phrases you want to read. Only \"-\" is allowed as a delimiter. "
-"The combinations with \"/\" are not yet implemented."
+"This page gives an overview of the spectrum of this element. Using the mouse "
+"you can zoom into the spectrum."
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:101
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, r_le)
-#: rc.cpp:1894
-msgid "Enter the R-Phrases you want to read"
+#. i18n: file: src/spectrumview.ui:17
+#. i18n: ectx: property (whatsThis), widget (QWidget, SpectrumView)
+#: rc.cpp:1764
+msgid "This page gives an overview of the spectrum of this element."
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:104
-#. i18n: ectx: property (text), widget (KLineEdit, r_le)
-#. i18n: file: src/rswidget.ui:146
-#. i18n: ectx: property (text), widget (KLineEdit, s_le)
-#: rc.cpp:1897 rc.cpp:1909
-msgid "1-2-3-4-5-6-7-8-9"
+#. i18n: file: src/spectrumview.ui:41
+#. i18n: ectx: property (toolTip), widget (SpectrumWidget, m_spectrumWidget)
+#. i18n: file: src/spectrumview.ui:44
+#. i18n: ectx: property (whatsThis), widget (SpectrumWidget, m_spectrumWidget)
+#: rc.cpp:1767 rc.cpp:1770
+msgid "This is the spectrum of the element."
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:130
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1900
-msgid "S-Phrases: "
+#. i18n: file: src/spectrumview.ui:53
+#. i18n: ectx: property (text), widget (QLabel, label1)
+#: rc.cpp:1773
+msgid "&Minimum value:"
+msgstr "&Gwerth isaf:"
+
+#. i18n: file: src/spectrumview.ui:66
+#. i18n: ectx: property (toolTip), widget (QSpinBox, minimumValue)
+#. i18n: file: src/spectrumview.ui:69
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, minimumValue)
+#: rc.cpp:1776 rc.cpp:1779
+msgid "This sets the leftmost wavelength of the spectrum."
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:140
-#. i18n: ectx: property (toolTip), widget (KLineEdit, s_le)
-#: rc.cpp:1903
-msgid ""
-"Enter the S-Phrases you want to read. Only \"-\" is allowed as a delimiter. "
-"The combinations with \"/\" are not yet implemented."
+#. i18n: file: src/spectrumview.ui:110
+#. i18n: ectx: property (text), widget (QLabel, label2)
+#: rc.cpp:1782
+msgid "Maximum &value:"
+msgstr "&Gwerth uchaf:"
+
+#. i18n: file: src/spectrumview.ui:123
+#. i18n: ectx: property (toolTip), widget (QSpinBox, maximumValue)
+#. i18n: file: src/spectrumview.ui:126
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, maximumValue)
+#: rc.cpp:1785 rc.cpp:1788
+msgid "This sets the rightmost wavelength of the spectrum."
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:143
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, s_le)
-#: rc.cpp:1906
-msgid "Enter the S-Phrases you want to read"
+#. i18n: file: src/spectrumview.ui:145
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1791
+msgid "Spectrum Settings"
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:157
-#. i18n: ectx: property (toolTip), widget (QPushButton, filterButton)
-#. i18n: file: src/rswidget.ui:160
-#. i18n: ectx: property (whatsThis), widget (QPushButton, filterButton)
-#: rc.cpp:1912 rc.cpp:1915
-msgid "Click here to search for the phrases you entered on the left"
+#. i18n: file: src/spectrumview.ui:155
+#. i18n: ectx: property (text), item, widget (QComboBox, m_spectrumType)
+#: rc.cpp:1794
+msgid "Emission spectrum"
 msgstr ""
 
-#. i18n: file: src/rswidget.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, filterButton)
-#: rc.cpp:1918
-msgid "&Filter"
+#. i18n: file: src/spectrumview.ui:160
+#. i18n: ectx: property (text), item, widget (QComboBox, m_spectrumType)
+#: rc.cpp:1797
+msgid "Absorption spectrum"
 msgstr ""
 
-#. i18n: file: src/exportdialog.ui:51
+#. i18n: file: src/spectrumview.ui:168
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1649
-msgid "File:"
+#: rc.cpp:1800
+msgid "Unit:"
 msgstr ""
 
-#. i18n: file: src/exportdialog.ui:68
+#. i18n: file: src/spectrumview.ui:175
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1652
-msgid "Format:"
+#: rc.cpp:1803
+msgid "Type:"
+msgstr ""
+
+#. i18n: file: src/spectrumview.ui:185
+#. i18n: ectx: property (text), widget (QPushButton, btn_resetZoom)
+#: rc.cpp:1806
+msgid "Reset zoom"
 msgstr ""
 
 #. i18n: file: src/kalziumui.rc:4
 #. i18n: ectx: Menu (file_menu)
-#: rc.cpp:1934
+#: rc.cpp:1809
 msgid "&File"
 msgstr ""
 
 #. i18n: file: src/kalziumui.rc:11
 #. i18n: ectx: Menu (table_menu)
-#: rc.cpp:1937
+#: rc.cpp:1812
 msgid "&View"
 msgstr ""
 
 #. i18n: file: src/kalziumui.rc:21
 #. i18n: ectx: Menu (miscmenu)
-#: rc.cpp:1940
+#: rc.cpp:1815
 msgid "&Tools"
 msgstr ""
 
 #. i18n: file: src/kalziumui.rc:35
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:1943
+#: rc.cpp:1818
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:9
 #. i18n: ectx: label, entry (schemaPSE), group (Periodic Table)
-#: rc.cpp:1946
+#: rc.cpp:1821
 msgid "Selects the PSE"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:10
 #. i18n: ectx: whatsthis, entry (schemaPSE), group (Periodic Table)
-#: rc.cpp:1949
+#: rc.cpp:1824
 msgid "Select the PSE you want"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:14
 #. i18n: ectx: label, entry (colorschemebox), group (Periodic Table)
-#: rc.cpp:1952
+#: rc.cpp:1827
 msgid "Selects the default color scheme"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:15
 #. i18n: ectx: whatsthis, entry (colorschemebox), group (Periodic Table)
-#: rc.cpp:1955
+#: rc.cpp:1830
 msgid ""
 "Select the color scheme you prefer by clicking on the corresponding radio "
 "button"
@@ -3721,25 +3724,25 @@
 
 #. i18n: file: src/kalzium.kcfg:19
 #. i18n: ectx: label, entry (gradient), group (Periodic Table)
-#: rc.cpp:1958
+#: rc.cpp:1833
 msgid "Selects the default gradient"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:20
 #. i18n: ectx: whatsthis, entry (gradient), group (Periodic Table)
-#: rc.cpp:1961
+#: rc.cpp:1836
 msgid "Select the gradient you want by clicking on the menu entry"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:24
 #. i18n: ectx: label, entry (numeration), group (Periodic Table)
-#: rc.cpp:1964
+#: rc.cpp:1839
 msgid "Selects the default numeration (IUPAC)"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:25
 #. i18n: ectx: whatsthis, entry (numeration), group (Periodic Table)
-#: rc.cpp:1967
+#: rc.cpp:1842
 msgid "Select the numeration you want"
 msgstr ""
 
@@ -3747,37 +3750,37 @@
 #. i18n: ectx: label, entry (showlegend), group (Periodic Table)
 #. i18n: file: src/kalzium.kcfg:30
 #. i18n: ectx: whatsthis, entry (showlegend), group (Periodic Table)
-#: rc.cpp:1970 rc.cpp:1973
+#: rc.cpp:1845 rc.cpp:1848
 msgid "Show or hide the legend"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:34
 #. i18n: ectx: label, entry (pselook), group (Periodic Table)
-#: rc.cpp:1976
+#: rc.cpp:1851
 msgid "Whether the atomic mass will be displayed in the PSE-Table"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:35
 #. i18n: ectx: whatsthis, entry (pselook), group (Periodic Table)
-#: rc.cpp:1979
+#: rc.cpp:1854
 msgid "Display the atomic mass in the PSE"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:39
 #. i18n: ectx: label, entry (table), group (Periodic Table)
-#: rc.cpp:1982
+#: rc.cpp:1857
 msgid "Selects the table view (default is classical)"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:40
 #. i18n: ectx: whatsthis, entry (table), group (Periodic Table)
-#: rc.cpp:1985
+#: rc.cpp:1860
 msgid "Display the table view"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:46
 #. i18n: ectx: label, entry (LogarithmicCovalentRadiusGradient), group (Logarithmic Gradients)
-#: rc.cpp:1988
+#: rc.cpp:1863
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Covalent Radius "
 "Gradient feature"
@@ -3785,7 +3788,7 @@
 
 #. i18n: file: src/kalzium.kcfg:47
 #. i18n: ectx: whatsthis, entry (LogarithmicCovalentRadiusGradient), group (Logarithmic Gradients)
-#: rc.cpp:1991
+#: rc.cpp:1866
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Covalent Radius Gradient feature"
@@ -3793,7 +3796,7 @@
 
 #. i18n: file: src/kalzium.kcfg:51
 #. i18n: ectx: label, entry (LogarithmicVanDerWaalsRadiusGradient), group (Logarithmic Gradients)
-#: rc.cpp:1994
+#: rc.cpp:1869
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium van der Waals Radius "
 "Gradient feature"
@@ -3801,7 +3804,7 @@
 
 #. i18n: file: src/kalzium.kcfg:52
 #. i18n: ectx: whatsthis, entry (LogarithmicVanDerWaalsRadiusGradient), group (Logarithmic Gradients)
-#: rc.cpp:1997
+#: rc.cpp:1872
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium van der Waals Radius Gradient feature"
@@ -3809,14 +3812,14 @@
 
 #. i18n: file: src/kalzium.kcfg:56
 #. i18n: ectx: label, entry (LogarithmicMassGradient), group (Logarithmic Gradients)
-#: rc.cpp:2000
+#: rc.cpp:1875
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Mass Gradient feature"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:57
 #. i18n: ectx: whatsthis, entry (LogarithmicMassGradient), group (Logarithmic Gradients)
-#: rc.cpp:2003
+#: rc.cpp:1878
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Mass Gradient feature"
@@ -3824,7 +3827,7 @@
 
 #. i18n: file: src/kalzium.kcfg:61
 #. i18n: ectx: label, entry (LogarithmicBoilingPointGradient), group (Logarithmic Gradients)
-#: rc.cpp:2006
+#: rc.cpp:1881
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Boiling Point Gradient "
 "feature"
@@ -3832,7 +3835,7 @@
 
 #. i18n: file: src/kalzium.kcfg:62
 #. i18n: ectx: whatsthis, entry (LogarithmicBoilingPointGradient), group (Logarithmic Gradients)
-#: rc.cpp:2009
+#: rc.cpp:1884
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Boiling Point Gradient feature"
@@ -3840,7 +3843,7 @@
 
 #. i18n: file: src/kalzium.kcfg:66
 #. i18n: ectx: label, entry (LogarithmicMeltingPointGradient), group (Logarithmic Gradients)
-#: rc.cpp:2012
+#: rc.cpp:1887
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Melting Point Gradient "
 "feature"
@@ -3848,7 +3851,7 @@
 
 #. i18n: file: src/kalzium.kcfg:67
 #. i18n: ectx: whatsthis, entry (LogarithmicMeltingPointGradient), group (Logarithmic Gradients)
-#: rc.cpp:2015
+#: rc.cpp:1890
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Melting Point Gradient feature"
@@ -3856,7 +3859,7 @@
 
 #. i18n: file: src/kalzium.kcfg:71
 #. i18n: ectx: label, entry (LogarithmicElectronegativityGradient), group (Logarithmic Gradients)
-#: rc.cpp:2018
+#: rc.cpp:1893
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Electronegativity "
 "Gradient feature"
@@ -3864,7 +3867,7 @@
 
 #. i18n: file: src/kalzium.kcfg:72
 #. i18n: ectx: whatsthis, entry (LogarithmicElectronegativityGradient), group (Logarithmic Gradients)
-#: rc.cpp:2021
+#: rc.cpp:1896
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Electronegativity Gradient feature"
@@ -3872,15 +3875,15 @@
 
 #. i18n: file: src/kalzium.kcfg:76
 #. i18n: ectx: label, entry (LogarithmicDiscoverydateGradient), group (Logarithmic Gradients)
-#: rc.cpp:2024
+#: rc.cpp:1899
 msgid ""
-"whether to use a logarithmic gradient for the Kalzium Discovery Date "
+"Whether to use a logarithmic gradient for the Kalzium Discovery Date "
 "Gradient feature"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:77
 #. i18n: ectx: whatsthis, entry (LogarithmicDiscoverydateGradient), group (Logarithmic Gradients)
-#: rc.cpp:2027
+#: rc.cpp:1902
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Discovery Date Gradient feature"
@@ -3888,7 +3891,7 @@
 
 #. i18n: file: src/kalzium.kcfg:81
 #. i18n: ectx: label, entry (LogarithmicElectronaffinityGradient), group (Logarithmic Gradients)
-#: rc.cpp:2030
+#: rc.cpp:1905
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Electron Affinity "
 "Gradient feature"
@@ -3896,7 +3899,7 @@
 
 #. i18n: file: src/kalzium.kcfg:82
 #. i18n: ectx: whatsthis, entry (LogarithmicElectronaffinityGradient), group (Logarithmic Gradients)
-#: rc.cpp:2033
+#: rc.cpp:1908
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Electron Affinity Gradient feature"
@@ -3904,7 +3907,7 @@
 
 #. i18n: file: src/kalzium.kcfg:86
 #. i18n: ectx: label, entry (LogarithmicIonizationGradient), group (Logarithmic Gradients)
-#: rc.cpp:2036
+#: rc.cpp:1911
 msgid ""
 "Whether to use a logarithmic gradient for the Kalzium Ionization Gradient "
 "feature"
@@ -3912,7 +3915,7 @@
 
 #. i18n: file: src/kalzium.kcfg:87
 #. i18n: ectx: whatsthis, entry (LogarithmicIonizationGradient), group (Logarithmic Gradients)
-#: rc.cpp:2039
+#: rc.cpp:1914
 msgid ""
 "Specifies whether to use a logarithmic instead of a linear gradient for the "
 "Kalzium Ionization Gradient feature"
@@ -3922,19 +3925,19 @@
 #. i18n: ectx: label, entry (colorgradientbox), group (Colors)
 #. i18n: file: src/kalzium.kcfg:94
 #. i18n: ectx: whatsthis, entry (colorgradientbox), group (Colors)
-#: rc.cpp:2042 rc.cpp:2045
+#: rc.cpp:1917 rc.cpp:1920
 msgid "Selects the default gradient color"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:98
 #. i18n: ectx: label, entry (noscheme), group (Colors)
-#: rc.cpp:2048
+#: rc.cpp:1923
 msgid "Selects the color if no scheme is selected"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:99
 #. i18n: ectx: whatsthis, entry (noscheme), group (Colors)
-#: rc.cpp:2051
+#: rc.cpp:1926
 msgid "Selects the color of the elements if no scheme is selected"
 msgstr ""
 
@@ -3942,7 +3945,7 @@
 #. i18n: ectx: label, entry (color_liquid), group (Colors)
 #. i18n: file: src/kalzium.kcfg:104
 #. i18n: ectx: whatsthis, entry (color_liquid), group (Colors)
-#: rc.cpp:2054 rc.cpp:2057
+#: rc.cpp:1929 rc.cpp:1932
 msgid "Selects the color of liquid elements"
 msgstr ""
 
@@ -3950,7 +3953,7 @@
 #. i18n: ectx: label, entry (color_solid), group (Colors)
 #. i18n: file: src/kalzium.kcfg:109
 #. i18n: ectx: whatsthis, entry (color_solid), group (Colors)
-#: rc.cpp:2060 rc.cpp:2063
+#: rc.cpp:1935 rc.cpp:1938
 msgid "Selects the color of solid elements"
 msgstr ""
 
@@ -3958,7 +3961,7 @@
 #. i18n: ectx: label, entry (color_vapor), group (Colors)
 #. i18n: file: src/kalzium.kcfg:114
 #. i18n: ectx: whatsthis, entry (color_vapor), group (Colors)
-#: rc.cpp:2066 rc.cpp:2069
+#: rc.cpp:1941 rc.cpp:1944
 msgid "Selects the color of vaporous elements"
 msgstr ""
 
@@ -3966,7 +3969,7 @@
 #. i18n: ectx: label, entry (color_radioactive), group (Colors)
 #. i18n: file: src/kalzium.kcfg:119
 #. i18n: ectx: whatsthis, entry (color_radioactive), group (Colors)
-#: rc.cpp:2072 rc.cpp:2075
+#: rc.cpp:1947 rc.cpp:1950
 msgid "Selects the color of radioactive elements"
 msgstr ""
 
@@ -3974,7 +3977,7 @@
 #. i18n: ectx: label, entry (color_artificial), group (Colors)
 #. i18n: file: src/kalzium.kcfg:124
 #. i18n: ectx: whatsthis, entry (color_artificial), group (Colors)
-#: rc.cpp:2078 rc.cpp:2081
+#: rc.cpp:1953 rc.cpp:1956
 msgid "Selects the color of artificial elements"
 msgstr ""
 
@@ -3982,7 +3985,7 @@
 #. i18n: ectx: label, entry (block_s), group (Colors)
 #. i18n: file: src/kalzium.kcfg:129
 #. i18n: ectx: whatsthis, entry (block_s), group (Colors)
-#: rc.cpp:2084 rc.cpp:2087
+#: rc.cpp:1959 rc.cpp:1962
 msgid "Selects the color of the elements in block s"
 msgstr ""
 
@@ -3990,7 +3993,7 @@
 #. i18n: ectx: label, entry (block_p), group (Colors)
 #. i18n: file: src/kalzium.kcfg:134
 #. i18n: ectx: whatsthis, entry (block_p), group (Colors)
-#: rc.cpp:2090 rc.cpp:2093
+#: rc.cpp:1965 rc.cpp:1968
 msgid "Selects the color of the elements in block p"
 msgstr ""
 
@@ -3998,7 +4001,7 @@
 #. i18n: ectx: label, entry (block_d), group (Colors)
 #. i18n: file: src/kalzium.kcfg:139
 #. i18n: ectx: whatsthis, entry (block_d), group (Colors)
-#: rc.cpp:2096 rc.cpp:2099
+#: rc.cpp:1971 rc.cpp:1974
 msgid "Selects the color of the elements in block d"
 msgstr ""
 
@@ -4006,7 +4009,7 @@
 #. i18n: ectx: label, entry (block_f), group (Colors)
 #. i18n: file: src/kalzium.kcfg:144
 #. i18n: ectx: whatsthis, entry (block_f), group (Colors)
-#: rc.cpp:2102 rc.cpp:2105
+#: rc.cpp:1977 rc.cpp:1980
 msgid "Selects the color of the elements in block f"
 msgstr ""
 
@@ -4014,7 +4017,7 @@
 #. i18n: ectx: label, entry (group_1), group (Colors)
 #. i18n: file: src/kalzium.kcfg:149
 #. i18n: ectx: whatsthis, entry (group_1), group (Colors)
-#: rc.cpp:2108 rc.cpp:2111
+#: rc.cpp:1983 rc.cpp:1986
 msgid "Selects the color of the elements in group 1"
 msgstr ""
 
@@ -4022,7 +4025,7 @@
 #. i18n: ectx: label, entry (group_2), group (Colors)
 #. i18n: file: src/kalzium.kcfg:154
 #. i18n: ectx: whatsthis, entry (group_2), group (Colors)
-#: rc.cpp:2114 rc.cpp:2117
+#: rc.cpp:1989 rc.cpp:1992
 msgid "Selects the color of the elements in group 2"
 msgstr ""
 
@@ -4030,7 +4033,7 @@
 #. i18n: ectx: label, entry (group_3), group (Colors)
 #. i18n: file: src/kalzium.kcfg:159
 #. i18n: ectx: whatsthis, entry (group_3), group (Colors)
-#: rc.cpp:2120 rc.cpp:2123
+#: rc.cpp:1995 rc.cpp:1998
 msgid "Selects the color of the elements in group 3"
 msgstr ""
 
@@ -4038,7 +4041,7 @@
 #. i18n: ectx: label, entry (group_4), group (Colors)
 #. i18n: file: src/kalzium.kcfg:164
 #. i18n: ectx: whatsthis, entry (group_4), group (Colors)
-#: rc.cpp:2126 rc.cpp:2129
+#: rc.cpp:2001 rc.cpp:2004
 msgid "Selects the color of the elements in group 4"
 msgstr ""
 
@@ -4046,7 +4049,7 @@
 #. i18n: ectx: label, entry (group_5), group (Colors)
 #. i18n: file: src/kalzium.kcfg:169
 #. i18n: ectx: whatsthis, entry (group_5), group (Colors)
-#: rc.cpp:2132 rc.cpp:2135
+#: rc.cpp:2007 rc.cpp:2010
 msgid "Selects the color of the elements in group 5"
 msgstr ""
 
@@ -4054,7 +4057,7 @@
 #. i18n: ectx: label, entry (group_6), group (Colors)
 #. i18n: file: src/kalzium.kcfg:174
 #. i18n: ectx: whatsthis, entry (group_6), group (Colors)
-#: rc.cpp:2138 rc.cpp:2141
+#: rc.cpp:2013 rc.cpp:2016
 msgid "Selects the color of the elements in group 6"
 msgstr ""
 
@@ -4062,7 +4065,7 @@
 #. i18n: ectx: label, entry (group_7), group (Colors)
 #. i18n: file: src/kalzium.kcfg:179
 #. i18n: ectx: whatsthis, entry (group_7), group (Colors)
-#: rc.cpp:2144 rc.cpp:2147
+#: rc.cpp:2019 rc.cpp:2022
 msgid "Selects the color of the elements in group 7"
 msgstr ""
 
@@ -4070,7 +4073,7 @@
 #. i18n: ectx: label, entry (group_8), group (Colors)
 #. i18n: file: src/kalzium.kcfg:184
 #. i18n: ectx: whatsthis, entry (group_8), group (Colors)
-#: rc.cpp:2150 rc.cpp:2153
+#: rc.cpp:2025 rc.cpp:2028
 msgid "Selects the color of the elements in group 8"
 msgstr ""
 
@@ -4078,7 +4081,7 @@
 #. i18n: ectx: label, entry (alkalie), group (Colors)
 #. i18n: file: src/kalzium.kcfg:189
 #. i18n: ectx: whatsthis, entry (alkalie), group (Colors)
-#: rc.cpp:2156 rc.cpp:2159
+#: rc.cpp:2031 rc.cpp:2034
 msgid "Selects the color of the alkali metals"
 msgstr ""
 
@@ -4086,7 +4089,7 @@
 #. i18n: ectx: label, entry (rare), group (Colors)
 #. i18n: file: src/kalzium.kcfg:194
 #. i18n: ectx: whatsthis, entry (rare), group (Colors)
-#: rc.cpp:2162 rc.cpp:2165
+#: rc.cpp:2037 rc.cpp:2040
 msgid "Selects the color of the rare-earth elements"
 msgstr ""
 
@@ -4094,7 +4097,7 @@
 #. i18n: ectx: label, entry (nonmetal), group (Colors)
 #. i18n: file: src/kalzium.kcfg:199
 #. i18n: ectx: whatsthis, entry (nonmetal), group (Colors)
-#: rc.cpp:2168 rc.cpp:2171
+#: rc.cpp:2043 rc.cpp:2046
 msgid "Selects the color of the non-metal elements"
 msgstr ""
 
@@ -4102,7 +4105,7 @@
 #. i18n: ectx: label, entry (alkaline), group (Colors)
 #. i18n: file: src/kalzium.kcfg:204
 #. i18n: ectx: whatsthis, entry (alkaline), group (Colors)
-#: rc.cpp:2174 rc.cpp:2177
+#: rc.cpp:2049 rc.cpp:2052
 msgid "Selects the color of the alkaline earth metals"
 msgstr ""
 
@@ -4110,7 +4113,7 @@
 #. i18n: ectx: label, entry (other_metal), group (Colors)
 #. i18n: file: src/kalzium.kcfg:209
 #. i18n: ectx: whatsthis, entry (other_metal), group (Colors)
-#: rc.cpp:2180 rc.cpp:2183
+#: rc.cpp:2055 rc.cpp:2058
 msgid ""
 "Selects the color of the metals which do not fit into the other categories"
 msgstr ""
@@ -4119,7 +4122,7 @@
 #. i18n: ectx: label, entry (halogene), group (Colors)
 #. i18n: file: src/kalzium.kcfg:214
 #. i18n: ectx: whatsthis, entry (halogene), group (Colors)
-#: rc.cpp:2186 rc.cpp:2189
+#: rc.cpp:2061 rc.cpp:2064
 msgid "Selects the color of the halogen elements"
 msgstr ""
 
@@ -4127,7 +4130,7 @@
 #. i18n: ectx: label, entry (transition), group (Colors)
 #. i18n: file: src/kalzium.kcfg:219
 #. i18n: ectx: whatsthis, entry (transition), group (Colors)
-#: rc.cpp:2192 rc.cpp:2195
+#: rc.cpp:2067 rc.cpp:2070
 msgid "Selects the color of the transition elements"
 msgstr ""
 
@@ -4135,7 +4138,7 @@
 #. i18n: ectx: label, entry (noble_gas), group (Colors)
 #. i18n: file: src/kalzium.kcfg:224
 #. i18n: ectx: whatsthis, entry (noble_gas), group (Colors)
-#: rc.cpp:2198 rc.cpp:2201
+#: rc.cpp:2073 rc.cpp:2076
 msgid "Selects the color of the noble gases"
 msgstr ""
 
@@ -4143,7 +4146,7 @@
 #. i18n: ectx: label, entry (metalloid), group (Colors)
 #. i18n: file: src/kalzium.kcfg:229
 #. i18n: ectx: whatsthis, entry (metalloid), group (Colors)
-#: rc.cpp:2204 rc.cpp:2207
+#: rc.cpp:2079 rc.cpp:2082
 msgid "Selects the color of the metalloid elements"
 msgstr ""
 
@@ -4151,7 +4154,7 @@
 #. i18n: ectx: label, entry (MaxColor), group (Colors)
 #. i18n: file: src/kalzium.kcfg:234
 #. i18n: ectx: whatsthis, entry (MaxColor), group (Colors)
-#: rc.cpp:2210 rc.cpp:2213
+#: rc.cpp:2085 rc.cpp:2088
 msgid "Selects the color of the maximal value from the gradient"
 msgstr ""
 
@@ -4159,32 +4162,40 @@
 #. i18n: ectx: label, entry (MinColor), group (Colors)
 #. i18n: file: src/kalzium.kcfg:239
 #. i18n: ectx: whatsthis, entry (MinColor), group (Colors)
-#: rc.cpp:2216 rc.cpp:2219
+#: rc.cpp:2091 rc.cpp:2094
 msgid "Selects the color of the minimal value from the gradient"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:245
-#. i18n: ectx: label, entry (energies), group (Units)
-#: rc.cpp:2222
+#. i18n: ectx: label, entry (energiesUnit), group (Units)
+#. i18n: file: src/kalzium.kcfg:260
+#. i18n: ectx: label, entry (combobox_energies), group (Units)
+#: rc.cpp:2097 rc.cpp:2115
 msgid "This value defines whether eV or kJ/mol should be used within Kalzium"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:246
-#. i18n: ectx: whatsthis, entry (energies), group (Units)
-#: rc.cpp:2225
+#. i18n: ectx: whatsthis, entry (energiesUnit), group (Units)
+#. i18n: file: src/kalzium.kcfg:261
+#. i18n: ectx: whatsthis, entry (combobox_energies), group (Units)
+#: rc.cpp:2100 rc.cpp:2118
 msgid "Use eV or kJ/mol"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:250
 #. i18n: ectx: label, entry (temperatureUnit), group (Units)
-#: rc.cpp:2228
+#. i18n: file: src/kalzium.kcfg:265
+#. i18n: ectx: label, entry (combobox_temperature), group (Units)
+#: rc.cpp:2103 rc.cpp:2121
 msgid ""
 "This value defines which temperature scale should be used within Kalzium"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:251
 #. i18n: ectx: whatsthis, entry (temperatureUnit), group (Units)
-#: rc.cpp:2231
+#. i18n: file: src/kalzium.kcfg:266
+#. i18n: ectx: whatsthis, entry (combobox_temperature), group (Units)
+#: rc.cpp:2106 rc.cpp:2124
 msgid "Select the scale for the temperature"
 msgstr ""
 
@@ -4192,7 +4203,7 @@
 #. i18n: ectx: label, entry (lengthUnit), group (Units)
 #. i18n: file: src/kalzium.kcfg:270
 #. i18n: ectx: label, entry (combobox_length), group (Units)
-#: rc.cpp:2099 rc.cpp:2117
+#: rc.cpp:2109 rc.cpp:2127
 msgid "This value defines which length scale should be used within Kalzium"
 msgstr ""
 
@@ -4200,33 +4211,33 @@
 #. i18n: ectx: whatsthis, entry (lengthUnit), group (Units)
 #. i18n: file: src/kalzium.kcfg:271
 #. i18n: ectx: whatsthis, entry (combobox_length), group (Units)
-#: rc.cpp:2102 rc.cpp:2120
+#: rc.cpp:2112 rc.cpp:2130
 msgid "Select the scale for the length"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:255
+#. i18n: file: src/kalzium.kcfg:275
 #. i18n: ectx: label, entry (schemaSelected), group (Units)
-#. i18n: file: src/kalzium.kcfg:256
+#. i18n: file: src/kalzium.kcfg:276
 #. i18n: ectx: whatsthis, entry (schemaSelected), group (Units)
-#: rc.cpp:2234 rc.cpp:2237
+#: rc.cpp:2133 rc.cpp:2136
 msgid "True if schema was last selected"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:282
 #. i18n: ectx: label, entry (spectrumWavelengthUnit), group (Spectrum)
-#: rc.cpp:2129
+#: rc.cpp:2139
 msgid "This value defines which unit is used for the wavelength"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:283
 #. i18n: ectx: whatsthis, entry (spectrumWavelengthUnit), group (Spectrum)
-#: rc.cpp:2132
+#: rc.cpp:2142
 msgid "Unit of the Wavelength"
 msgstr ""
 
 #. i18n: file: src/kalzium.kcfg:287
 #. i18n: ectx: label, entry (spectrumType), group (Spectrum)
-#: rc.cpp:2135
+#: rc.cpp:2145
 msgid ""
 "This value defines which Spectrum type is used. Emission or absorption "
 "spectrum"
@@ -4234,155 +4245,155 @@
 
 #. i18n: file: src/kalzium.kcfg:288
 #. i18n: ectx: whatsthis, entry (spectrumType), group (Spectrum)
-#: rc.cpp:2138
+#: rc.cpp:2148
 msgid "SpectrumType"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:262
+#. i18n: file: src/kalzium.kcfg:294
 #. i18n: ectx: label, entry (mass), group (Calculator)
-#: rc.cpp:2240
+#: rc.cpp:2151
 msgid ""
 "This setting tells the nuclear calculator whether the amounts are always in "
 "terms of mass"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:263
+#. i18n: file: src/kalzium.kcfg:295
 #. i18n: ectx: whatsthis, entry (mass), group (Calculator)
-#: rc.cpp:2243
+#: rc.cpp:2154
 msgid "True if the user wants to specify amount only in terms of mass"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:266
+#. i18n: file: src/kalzium.kcfg:298
 #. i18n: ectx: label, entry (ideal), group (Calculator)
-#: rc.cpp:2246
+#: rc.cpp:2157
 msgid ""
 "This setting says whether the user wants the gas to be ideal by default"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:267
+#. i18n: file: src/kalzium.kcfg:299
 #. i18n: ectx: whatsthis, entry (ideal), group (Calculator)
-#: rc.cpp:2249
+#: rc.cpp:2160
 msgid ""
 "True if gases are assumed to be ideal, the Van der Waals co-efficients will "
 "not be shown in the calculator"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:271
+#. i18n: file: src/kalzium.kcfg:303
 #. i18n: ectx: label, entry (soluteMass), group (Calculator)
-#: rc.cpp:2252
+#: rc.cpp:2163
 msgid ""
 "This setting tells the concentration calculator that amount of solute is "
 "always in mass"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:272
+#. i18n: file: src/kalzium.kcfg:304
 #. i18n: ectx: whatsthis, entry (soluteMass), group (Calculator)
-#: rc.cpp:2255
+#: rc.cpp:2166
 msgid "True if the amount of solute is specified only in terms of mass"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:275
+#. i18n: file: src/kalzium.kcfg:307
 #. i18n: ectx: label, entry (solventVolume), group (Calculator)
-#: rc.cpp:2258
+#: rc.cpp:2169
 msgid ""
 "This setting tells the concentration calculator that amount of solvent is "
 "always in volume"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:276
+#. i18n: file: src/kalzium.kcfg:308
 #. i18n: ectx: whatsthis, entry (solventVolume), group (Calculator)
-#: rc.cpp:2261
+#: rc.cpp:2172
 msgid "True if the amount of solvent is specified only in terms of volume"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:279
+#. i18n: file: src/kalzium.kcfg:311
 #. i18n: ectx: label, entry (alias), group (Calculator)
-#: rc.cpp:2264
+#: rc.cpp:2175
 msgid ""
 "This setting tells the molecular mass calculator whether extra details such "
 "as aliases should be shown"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:280
+#. i18n: file: src/kalzium.kcfg:312
 #. i18n: ectx: whatsthis, entry (alias), group (Calculator)
-#: rc.cpp:2267
+#: rc.cpp:2178
 msgid "True if the aliases and other details should be shown"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:283
+#. i18n: file: src/kalzium.kcfg:315
 #. i18n: ectx: label, entry (addAlias), group (Calculator)
-#: rc.cpp:2270
+#: rc.cpp:2181
 msgid ""
 "This setting tells the molecular calculator whether the add Alias tab should "
 "be shown"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:284
+#. i18n: file: src/kalzium.kcfg:316
 #. i18n: ectx: whatsthis, entry (addAlias), group (Calculator)
-#: rc.cpp:2273
+#: rc.cpp:2184
 msgid "True if the user wants to add aliases"
 msgstr ""
 
-#. i18n: file: src/kalzium.kcfg:289
+#. i18n: file: src/kalzium.kcfg:321
 #. i18n: ectx: label, entry (showsidebar), group (Sidebar)
-#. i18n: file: src/kalzium.kcfg:290
+#. i18n: file: src/kalzium.kcfg:322
 #. i18n: ectx: whatsthis, entry (showsidebar), group (Sidebar)
-#: rc.cpp:2276 rc.cpp:2279
+#: rc.cpp:2187 rc.cpp:2190
 msgid "Show or hide the sidebar"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:4
-#: rc.cpp:2281 src/kalziumgradienttype.cpp:438
+#: rc.cpp:2192 src/kalziumgradienttype.cpp:454
 msgid "State of matter"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:5
-#: rc.cpp:2283
+#: rc.cpp:2194
 msgid ""
 "Form of a substance; dependant on form stability and whether it takes up a "
 "definite volume: solid, liquid or gaseous."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:7
-#: rc.cpp:2285
+#: rc.cpp:2196
 msgid "Boiling point"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:8
-#: rc.cpp:2287
+#: rc.cpp:2198
 msgid "Melting point"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:12
-#: rc.cpp:2289
+#: rc.cpp:2200
 msgid "Chemical Symbol"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:13
-#: rc.cpp:2291
+#: rc.cpp:2202
 msgid ""
 "One, two, or three letter abbreviation; set through international convention."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:19
-#: rc.cpp:2295
+#: rc.cpp:2206
 msgid "Chromatography"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:20
-#: rc.cpp:2297
+#: rc.cpp:2208
 msgid ""
 "Matter separation in a moving medium (mobile phase) through differentiated "
 "absorption on a static medium (stationary phase)."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:23
-#: rc.cpp:2299
+#: rc.cpp:2210
 msgid "Distillation"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:24
-#: rc.cpp:2301
+#: rc.cpp:2212
 msgid ""
 "Separation of a liquid solution (homogeneous mix) into its components "
 "through evaporation and condensation. In a fractionary distillation the "
@@ -4390,7 +4401,7 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:28
-#: rc.cpp:2305
+#: rc.cpp:2216
 msgid ""
 "Matter that cannot be broken down into simpler matter. Chemical elements are "
 "cornerstones of Materials. Elements consist of atoms that consist of a "
@@ -4398,45 +4409,45 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:31
-#: rc.cpp:2307
+#: rc.cpp:2218
 msgid "Emulsion"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:32
-#: rc.cpp:2309
+#: rc.cpp:2220
 msgid "Heterogeneous mix of two liquids."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:35
-#: rc.cpp:2311
+#: rc.cpp:2222
 msgid "Extraction"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:36
-#: rc.cpp:2313
+#: rc.cpp:2224
 msgid "Processing a homogeneous or heterogeneous mix to get pure matter."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:38
 #. i18n: file: data/knowledge.xml:46
-#: rc.cpp:2315 rc.cpp:2321
+#: rc.cpp:2226 rc.cpp:2232
 msgid "Mix"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:42
-#: rc.cpp:2317
+#: rc.cpp:2228
 msgid "Filtering"
 msgstr "Hidlo"
 
 #. i18n: file: data/knowledge.xml:43
-#: rc.cpp:2319
+#: rc.cpp:2230
 msgid ""
 "Separation of a solid matter from a liquid matter or gaseous matter with a "
 "filter (porous separation wall)."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:47
-#: rc.cpp:2323
+#: rc.cpp:2234
 msgid ""
 "Matter consisting of differentiated matter, combined in non-set ratios. "
 "[i]Homogeneous mixes[/i] have a coherent look, [i]heterogeneous mixes[/i] "
@@ -4444,22 +4455,22 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:50
-#: rc.cpp:2325
+#: rc.cpp:2236
 msgid "Accuracy"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:51
-#: rc.cpp:2327
+#: rc.cpp:2238
 msgid "Consisting of accidental and systematic errors."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:54
-#: rc.cpp:2329
+#: rc.cpp:2240
 msgid "Law of Conservation of Mass"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:55
-#: rc.cpp:2331
+#: rc.cpp:2242
 msgid ""
 "During a chemical reaction mass is neither lost nor gained. The sum mass of "
 "the material going into the reaction equals the sum of the mass of the "
@@ -4467,61 +4478,61 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:58
-#: rc.cpp:2333
+#: rc.cpp:2244
 msgid "Law of multiple proportions"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:59
-#: rc.cpp:2335
+#: rc.cpp:2246
 msgid ""
 "An alloy always contains the same elements in the same mass ratio. Should "
 "two or more elements bind together then the mass ratio is constant."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:62
-#: rc.cpp:2337
+#: rc.cpp:2248
 msgid "Crystallization"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:63
-#: rc.cpp:2339
+#: rc.cpp:2250
 msgid ""
 "Separation of solid, crystalline matter from a solution, or the liquid or "
 "gaseous phases."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:66
-#: rc.cpp:2341
+#: rc.cpp:2252
 msgid "Solution"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:67
-#: rc.cpp:2343
+#: rc.cpp:2254
 msgid "Homogeneous mix of multiple pure materials"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:71
-#: rc.cpp:2347
+#: rc.cpp:2258
 msgid "Measurement of an amount of matter."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:74
-#: rc.cpp:2349
+#: rc.cpp:2260
 msgid "Matter"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:75
-#: rc.cpp:2351
+#: rc.cpp:2262
 msgid "All that takes up space and has mass."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:78
-#: rc.cpp:2353
+#: rc.cpp:2264
 msgid "Phase"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:79
-#: rc.cpp:2355
+#: rc.cpp:2266
 msgid ""
 "Through chemical composition and physical attributes, homogeneous portion of "
 "matter that separated from its environment in its expansion through a "
@@ -4529,83 +4540,83 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:82
-#: rc.cpp:2357
+#: rc.cpp:2268
 msgid "Accuracy and precision"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:83
-#: rc.cpp:2359
+#: rc.cpp:2270
 msgid ""
 "Expressed through standard deviation: Values given over accidental errors."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:86
-#: rc.cpp:2361
+#: rc.cpp:2272
 msgid "Correctness"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:87
-#: rc.cpp:2363
+#: rc.cpp:2274
 msgid "Values given over accidental errors."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:90
-#: rc.cpp:2365
+#: rc.cpp:2276
 msgid "SI-Unit"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:91
-#: rc.cpp:2367
+#: rc.cpp:2278
 msgid "Measurement unit using International Symbols."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:94
-#: rc.cpp:2369
+#: rc.cpp:2280
 msgid "Significant figures"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:95
-#: rc.cpp:2371
+#: rc.cpp:2282
 msgid "The number of digits which are meaningful in a number."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:98
-#: rc.cpp:2373
+#: rc.cpp:2284
 msgid "Standard deviation"
 msgstr "Gwyriad Safonol"
 
 #. i18n: file: data/knowledge.xml:99
-#: rc.cpp:2375
+#: rc.cpp:2286
 msgid "An amount with which the precision of a measurement can be estimated."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:102
-#: rc.cpp:2377
+#: rc.cpp:2288
 msgid "Suspension"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:103
-#: rc.cpp:2379
+#: rc.cpp:2290
 msgid "Heterogeneous mix consisting of a liquid and solid matter."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:106
-#: rc.cpp:2381
+#: rc.cpp:2292
 msgid "Alloys"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:107
-#: rc.cpp:2383
+#: rc.cpp:2294
 msgid "Pure matter consisting of multiple elements in a set ratio."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:110
-#: rc.cpp:2385
+#: rc.cpp:2296
 msgid "Alpha rays"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:111
-#: rc.cpp:2387
+#: rc.cpp:2298
 msgid ""
 "Rays consisting of alpha particles, consisting of two protons and two "
 "neutrons that are emitted from the Atoms of certain radioactive elements."
@@ -4618,13 +4629,13 @@
 #. i18n: file: data/knowledge.xml:219
 #. i18n: file: data/knowledge.xml:226
 #. i18n: file: data/knowledge.xml:235
-#: rc.cpp:2389 rc.cpp:2405 rc.cpp:2411 rc.cpp:2419 rc.cpp:2496 rc.cpp:2502
-#: rc.cpp:2512
+#: rc.cpp:2300 rc.cpp:2316 rc.cpp:2322 rc.cpp:2330 rc.cpp:2407 rc.cpp:2413
+#: rc.cpp:2423
 msgid "Atom"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:115
-#: rc.cpp:2391
+#: rc.cpp:2302
 msgid ""
 "Atoms are chemically inseparable and building blocks of matter. Atoms of one "
 "kind are called an Element."
@@ -4635,43 +4646,38 @@
 #. i18n: file: data/knowledge.xml:227
 #. i18n: file: data/knowledge.xml:236
 #. i18n: file: data/knowledge.xml:244
-#: rc.cpp:2395 rc.cpp:2491 rc.cpp:2504 rc.cpp:2514 rc.cpp:2522
+#: rc.cpp:2306 rc.cpp:2402 rc.cpp:2415 rc.cpp:2425 rc.cpp:2433
 msgid "Electron"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:119
 #. i18n: file: data/knowledge.xml:223
 #. i18n: file: data/knowledge.xml:237
-#: rc.cpp:2397 rc.cpp:2498 rc.cpp:2516
+#: rc.cpp:2308 rc.cpp:2409 rc.cpp:2427
 msgid "Proton"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:120
 #. i18n: file: data/knowledge.xml:228
 #. i18n: file: data/knowledge.xml:232
-#: rc.cpp:2399 rc.cpp:2506 rc.cpp:2508
+#: rc.cpp:2310 rc.cpp:2417 rc.cpp:2419
 msgid "Neutron"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:124
-#: rc.cpp:2401
+#: rc.cpp:2312
 msgid "Atomic nucleus"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:125
-#: rc.cpp:2403
+#: rc.cpp:2314
 msgid ""
 "The small, positively-charged center of an Atom, in which Protons and "
 "Neutrons are found."
 msgstr ""
 
-#. i18n: file: data/knowledge.xml:131
-#: rc.cpp:2407 src/kalziumgradienttype.cpp:278
-msgid "Atomic Mass"
-msgstr ""
-
 #. i18n: file: data/knowledge.xml:132
-#: rc.cpp:2409
+#: rc.cpp:2320
 msgid ""
 "Mass of an atom, taken on a scale where the mass of a carbon atom is 12u. In "
 "elements that consist of different isotopes the mid-range mass of the "
@@ -4687,13 +4693,13 @@
 #. i18n: file: data/knowledge.xml:187
 #. i18n: file: data/knowledge.xml:196
 #. i18n: file: data/knowledge.xml:205
-#: rc.cpp:2415 rc.cpp:2425 rc.cpp:2431 rc.cpp:2437 rc.cpp:2443 rc.cpp:2449
-#: rc.cpp:2461 rc.cpp:2471 rc.cpp:2481
+#: rc.cpp:2326 rc.cpp:2336 rc.cpp:2342 rc.cpp:2348 rc.cpp:2354 rc.cpp:2360
+#: rc.cpp:2372 rc.cpp:2382 rc.cpp:2392
 msgid "Isotope"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:140
-#: rc.cpp:2417
+#: rc.cpp:2328
 msgid ""
 "Isotopes are forms of a chemical element whose nuclei have the same atomic "
 "number, Z, but different atomic masses, A. The word isotope, meaning at the "
@@ -4702,12 +4708,12 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:146
-#: rc.cpp:2421
+#: rc.cpp:2332
 msgid "Spin"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:147
-#: rc.cpp:2423
+#: rc.cpp:2334
 msgid ""
 "The spin is an intrinsic angular momentum associated with microscopic "
 "particles. It is a purely quantum mechanical phenomenon without any analogy "
@@ -4717,12 +4723,12 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:153
-#: rc.cpp:2427 src/detailinfodlg.cpp:338
+#: rc.cpp:2338 src/detailinfodlg.cpp:345
 msgid "Magnetic Moment"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:154
-#: rc.cpp:2429
+#: rc.cpp:2340
 msgid ""
 "The magnetic moment of an object is a vector relating the aligning torque in "
 "a magnetic field experienced by the object to the field vector itself. It is "
@@ -4731,12 +4737,12 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:160
-#: rc.cpp:2433
+#: rc.cpp:2344
 msgid "Decay Mode"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:161
-#: rc.cpp:2435
+#: rc.cpp:2346
 msgid ""
 "The decay mode describes a particular way a particle decays. For radioactive "
 "decay (the decay of nuclides) the decay modes are:[br] -> alpha decay "
@@ -4747,22 +4753,22 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:167
-#: rc.cpp:2439
+#: rc.cpp:2350
 msgid "Decay Energy"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:168
-#: rc.cpp:2441
+#: rc.cpp:2352
 msgid "The decay energy is the energy released by a nuclear decay."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:174
-#: rc.cpp:2445
+#: rc.cpp:2356
 msgid "Nuclides"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:175
-#: rc.cpp:2447
+#: rc.cpp:2358
 msgid "[i]see isotopes[/i]"
 msgstr ""
 
@@ -4770,7 +4776,7 @@
 #. i18n: file: data/knowledge.xml:184
 #. i18n: file: data/knowledge.xml:197
 #. i18n: file: data/knowledge.xml:207
-#: rc.cpp:2451 rc.cpp:2457 rc.cpp:2473 rc.cpp:2485
+#: rc.cpp:2362 rc.cpp:2368 rc.cpp:2384 rc.cpp:2396
 msgid "Isotone"
 msgstr ""
 
@@ -4778,36 +4784,36 @@
 #. i18n: file: data/knowledge.xml:188
 #. i18n: file: data/knowledge.xml:198
 #. i18n: file: data/knowledge.xml:202
-#: rc.cpp:2453 rc.cpp:2463 rc.cpp:2475 rc.cpp:2477
+#: rc.cpp:2364 rc.cpp:2374 rc.cpp:2386 rc.cpp:2388
 msgid "Nuclear Isomer"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:180
-#: rc.cpp:2455
+#: rc.cpp:2366
 msgid "Isobars"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:185
-#: rc.cpp:2459
+#: rc.cpp:2370
 msgid "Two nuclides are isotones if they have the same number N of neutrons."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:189
 #. i18n: file: data/knowledge.xml:193
 #. i18n: file: data/knowledge.xml:206
-#: rc.cpp:2465 rc.cpp:2467 rc.cpp:2483
+#: rc.cpp:2376 rc.cpp:2378 rc.cpp:2394
 msgid "Isobar"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:194
-#: rc.cpp:2469
+#: rc.cpp:2380
 msgid ""
 "Isobars are nuclides having the same mass number, i.e. sum of protons plus "
 "neutrons."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:203
-#: rc.cpp:2479
+#: rc.cpp:2390
 msgid ""
 "A nuclear isomer is a metastable or isomeric state of an atom caused by the "
 "excitation of a proton or neutron in its nucleus so that it requires a "
@@ -4825,19 +4831,19 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:211
-#: rc.cpp:2487
+#: rc.cpp:2398
 msgid "Beta rays"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:212
-#: rc.cpp:2489
+#: rc.cpp:2400
 msgid ""
 "Rays consisting of electrons that are emitted from Atoms of radioactive "
 "elements."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:217
-#: rc.cpp:2493
+#: rc.cpp:2404
 msgid ""
 "The electron is a subatomic particle with a mass of m[sub]e[/sub]=(9.1093897 "
 "&#177; 0.0000054)e-31 kg and a negative charge of [i]e[/i]=(1.60217733 "
@@ -4846,7 +4852,7 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:224
-#: rc.cpp:2500
+#: rc.cpp:2411
 msgid ""
 "The proton is a subatomic particle with a mass of m[sub]e[/sub]=(1.6726231 "
 "&#177; 0.0000010) 10[sup]-27[/sup] kg and a positive charge of "
@@ -4855,19 +4861,19 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:233
-#: rc.cpp:2510
+#: rc.cpp:2421
 msgid ""
 "The neutron is a subatomic particle with a mass of m[sub]e[/sub]=(1.6749286 "
 "&#177; 0.0000010) 10[sup]-27[/sup] kg which occurs in the nucleus of an atom."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:241
-#: rc.cpp:2518
+#: rc.cpp:2429
 msgid "Cathode Rays"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:242
-#: rc.cpp:2520
+#: rc.cpp:2431
 msgid ""
 "Cathode rays are streams of electrons observed in vacuum tubes, i.e. "
 "evacuated glass tubes that are equipped with at least two electrodes, a "
@@ -4879,12 +4885,12 @@
 #. i18n: file: data/knowledge.xml:262
 #. i18n: file: data/knowledge.xml:271
 #. i18n: file: data/knowledge.xml:279
-#: rc.cpp:2524 rc.cpp:2542 rc.cpp:2552 rc.cpp:2560
+#: rc.cpp:2435 rc.cpp:2453 rc.cpp:2463 rc.cpp:2471
 msgid "Ionic Radius"
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:249
-#: rc.cpp:2526
+#: rc.cpp:2437
 msgid ""
 "The Ionic Radius is the radius of a charged atom, known as an ion. The ion "
 "can have a positive or a negative charge. The charge of the ion with the "
@@ -4894,7 +4900,7 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:258
-#: rc.cpp:2536
+#: rc.cpp:2447
 msgid ""
 "The van der Waals radius of an atom is the radius of an imaginary hard "
 "sphere which can be used to model the atom for many purposes. Van der Waals "
@@ -4903,26 +4909,26 @@
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:267
-#: rc.cpp:2546
+#: rc.cpp:2457
 msgid ""
 "The atomic radius is the distance from the atomic nucleus to the outmost "
 "stable electron orbital in a atom that is at equilibrium."
 msgstr ""
 
 #. i18n: file: data/knowledge.xml:276
-#: rc.cpp:2556
+#: rc.cpp:2467
 msgid ""
 "The covalent radius in chemistry corresponds to half of the distance between "
 "two identical atomic nuclei, bound by a covalent bond."
 msgstr ""
 
 #. i18n: file: data/tools.xml:5
-#: rc.cpp:2564
+#: rc.cpp:2475
 msgid "Watchglass"
 msgstr ""
 
 #. i18n: file: data/tools.xml:6
-#: rc.cpp:2566
+#: rc.cpp:2477
 msgid ""
 "Watchglasses are round glass panes with a diameter of around 5 - 10cm, used "
 "in various experimental techniques. The border is bent upwards to allow the "
@@ -4935,12 +4941,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:10
-#: rc.cpp:2568
+#: rc.cpp:2479
 msgid "Dehydrator"
 msgstr ""
 
 #. i18n: file: data/tools.xml:13
-#: rc.cpp:2570
+#: rc.cpp:2481
 msgid ""
 "A dehydrator is a piece of laboratory apparatus, often made of glass, and "
 "which serves to dry chemical matters; that is, to remove water or liquid "
@@ -4956,12 +4962,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:17
-#: rc.cpp:2574
+#: rc.cpp:2485
 msgid "Spatula"
 msgstr ""
 
 #. i18n: file: data/tools.xml:18
-#: rc.cpp:2576
+#: rc.cpp:2487
 msgid ""
 "The spatula is a laboratory tool to scrape off, grind, and transport "
 "chemicals. The material they are made of (e.g. iron, titanium, platinum) and "
@@ -4969,12 +4975,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:22
-#: rc.cpp:2578
+#: rc.cpp:2489
 msgid "Water Jet Pump"
 msgstr ""
 
 #. i18n: file: data/tools.xml:23
-#: rc.cpp:2580
+#: rc.cpp:2491
 msgid ""
 "The water jet pump has two entry pipes and one exit, and consists, in "
 "principle, of two pipes one inside the other. At the water entry a water jet "
@@ -4986,12 +4992,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:27
-#: rc.cpp:2582
+#: rc.cpp:2493
 msgid "Refractometer"
 msgstr ""
 
 #. i18n: file: data/tools.xml:28
-#: rc.cpp:2584
+#: rc.cpp:2495
 msgid ""
 "With a refractometer the refractive index of optical media is determined. If "
 "the refractive index of a chemical is known it can be used after a synthesis "
@@ -4999,12 +5005,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:32
-#: rc.cpp:2586
+#: rc.cpp:2497
 msgid "Mortar"
 msgstr ""
 
 #. i18n: file: data/tools.xml:33
-#: rc.cpp:2588
+#: rc.cpp:2499
 msgid ""
 "A mortar is used for manually grinding solids. It can also be used to "
 "homogenize a mixture of powders by grinding. A club-shaped tool known as a "
@@ -5012,12 +5018,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:37
-#: rc.cpp:2590
+#: rc.cpp:2501
 msgid "Heating Coil"
 msgstr ""
 
 #. i18n: file: data/tools.xml:38
-#: rc.cpp:2592
+#: rc.cpp:2503
 msgid ""
 "Heating coils are used to heat flasks and other containers. Multiple heating "
 "coils can be connected with a thermometer so that the heat will not exceed a "
@@ -5027,12 +5033,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:42
-#: rc.cpp:2594
+#: rc.cpp:2505
 msgid "Cork Ring"
 msgstr ""
 
 #. i18n: file: data/tools.xml:43
-#: rc.cpp:2596
+#: rc.cpp:2507
 msgid ""
 "Large containers like round-bottomed flasks are placed on rings made of "
 "cork, a special soft lightweight wood with good insulating qualities to "
@@ -5040,24 +5046,24 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:47
-#: rc.cpp:2598
+#: rc.cpp:2509
 msgid "Dropping Funnel"
 msgstr ""
 
 #. i18n: file: data/tools.xml:48
-#: rc.cpp:2600
+#: rc.cpp:2511
 msgid ""
 "A dropping funnel can be used to drop precise amounts of fluid. The dropping "
 "speed can be controlled with a valve."
 msgstr ""
 
 #. i18n: file: data/tools.xml:52
-#: rc.cpp:2602
+#: rc.cpp:2513
 msgid "Separating Funnel"
 msgstr ""
 
 #. i18n: file: data/tools.xml:53
-#: rc.cpp:2604
+#: rc.cpp:2515
 msgid ""
 "A separating funnel can be used to separate a mixture of fluids of differing "
 "densities. A valve at the bottom allows the denser fluid to be drained for "
@@ -5065,24 +5071,24 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:57
-#: rc.cpp:2606
+#: rc.cpp:2517
 msgid "Test Tube Rack"
 msgstr ""
 
 #. i18n: file: data/tools.xml:58
-#: rc.cpp:2608
+#: rc.cpp:2519
 msgid ""
 "This rack is useful when many small amounts of chemicals are to be tested in "
 "a row; or alternatively, to dry test tubes."
 msgstr ""
 
 #. i18n: file: data/tools.xml:62
-#: rc.cpp:2610
+#: rc.cpp:2521
 msgid "Vortexer"
 msgstr ""
 
 #. i18n: file: data/tools.xml:63
-#: rc.cpp:2612
+#: rc.cpp:2523
 msgid ""
 "A vortexer serves to homogenize reagents found in laboratories. The "
 "container containing liquid to be homogenized is put on a platform. The "
@@ -5093,12 +5099,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:67
-#: rc.cpp:2614
+#: rc.cpp:2525
 msgid "Wash Bottle"
 msgstr ""
 
 #. i18n: file: data/tools.xml:68
-#: rc.cpp:2616
+#: rc.cpp:2527
 msgid ""
 "These bottles are used for many purposes. In most laboratories they are "
 "usually filled with water, salt, acid or other commonly used fluids. They "
@@ -5106,12 +5112,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:72
-#: rc.cpp:2618
+#: rc.cpp:2529
 msgid "Rotary Evaporator"
 msgstr ""
 
 #. i18n: file: data/tools.xml:73
-#: rc.cpp:2620
+#: rc.cpp:2531
 msgid ""
 "A rotary evaporator consists of a round flask in a bath of hot water, and is "
 "designed to evaporate solvents. The flask is rotated and the solvent "
@@ -5122,12 +5128,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:77
-#: rc.cpp:2622
+#: rc.cpp:2533
 msgid "Reflux Condenser"
 msgstr ""
 
 #. i18n: file: data/tools.xml:78
-#: rc.cpp:2624
+#: rc.cpp:2535
 msgid ""
 "A reflux condenser subjects fluid to a process where a gas produced by "
 "heating is collected on the reflux condenser. The fluid is cooled until it "
@@ -5136,25 +5142,25 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:82
-#: rc.cpp:2626
+#: rc.cpp:2537
 msgid "Pipette Bulb"
 msgstr ""
 
 #. i18n: file: data/tools.xml:83
-#: rc.cpp:2628
+#: rc.cpp:2539
 msgid ""
-"A pipette bulb is used to fill pipettes.  Squeezing then releasing the bulb "
+"A pipette bulb is used to fill pipettes. Squeezing then releasing the bulb "
 "produces a negative pressure, causing fluid to flow into the pipette; "
 "squeezing the bulb then causes the fluid to flow out of the pipette."
 msgstr ""
 
 #. i18n: file: data/tools.xml:87
-#: rc.cpp:2630
+#: rc.cpp:2541
 msgid "Test Tube"
 msgstr ""
 
 #. i18n: file: data/tools.xml:88
-#: rc.cpp:2632
+#: rc.cpp:2543
 msgid ""
 "In a test tube small reactions or experiments are performed. There are many "
 "different types of tubes. For example some have connectors, some are etched "
@@ -5162,12 +5168,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:92
-#: rc.cpp:2634
+#: rc.cpp:2545
 msgid "Protective Goggles"
 msgstr ""
 
 #. i18n: file: data/tools.xml:93
-#: rc.cpp:2636
+#: rc.cpp:2547
 msgid ""
 "Most laboratories insist that protective goggles are worn. Without them, it "
 "is too risky to work with most chemicals. Usually, the lens is a special "
@@ -5176,12 +5182,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:97
-#: rc.cpp:2638
+#: rc.cpp:2549
 msgid "Round-Bottomed Flask"
 msgstr ""
 
 #. i18n: file: data/tools.xml:98
-#: rc.cpp:2640
+#: rc.cpp:2551
 msgid ""
 "A round-bottomed flask is used for many reactions. Some can be connected to "
 "other items, as the frosting on the neck shows. With cork rings they can be "
@@ -5189,51 +5195,51 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:102
-#: rc.cpp:2642
+#: rc.cpp:2553
 msgid "Full Pipette"
 msgstr ""
 
 #. i18n: file: data/tools.xml:103
-#: rc.cpp:2644
+#: rc.cpp:2555
 msgid ""
 "Unlike a regular pipette, a full pipette only has one marking for a specific "
 "volume."
 msgstr ""
 
 #. i18n: file: data/tools.xml:107
-#: rc.cpp:2646
+#: rc.cpp:2557
 msgid "Drying Tube"
 msgstr ""
 
 #. i18n: file: data/tools.xml:108
-#: rc.cpp:2648
+#: rc.cpp:2559
 msgid ""
 "Some reactions need to be kept free of water: to make this possible a drying "
-"tube can be used.  Drying tubes contains a hygroscopic chemical to absorb "
+"tube can be used. Drying tubes contains a hygroscopic chemical to absorb "
 "water from the atmosphere."
 msgstr ""
 
 #. i18n: file: data/tools.xml:112
-#: rc.cpp:2650
+#: rc.cpp:2561
 msgid "Test Tube Holder"
 msgstr ""
 
 #. i18n: file: data/tools.xml:113
-#: rc.cpp:2652
+#: rc.cpp:2563
 msgid ""
 "Test tube holders make it easier to hold test tubes. By using a holder, "
 "there is a safe distance between ones hand and the test tube when the tube "
-"is hot.  Typically, test tube holders are used to hold test tubes over open "
+"is hot. Typically, test tube holders are used to hold test tubes over open "
 "flames."
 msgstr ""
 
 #. i18n: file: data/tools.xml:117
-#: rc.cpp:2654
+#: rc.cpp:2565
 msgid "Measuring Cylinder"
 msgstr ""
 
 #. i18n: file: data/tools.xml:118
-#: rc.cpp:2656
+#: rc.cpp:2567
 msgid ""
 "A measuring cylinder can be used to measure amounts of liquids relatively "
 "precisely. Furthermore, the cylinder allows particulate matter to sink: "
@@ -5242,12 +5248,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:122
-#: rc.cpp:2658
+#: rc.cpp:2569
 msgid "Thermometer"
 msgstr ""
 
 #. i18n: file: data/tools.xml:123
-#: rc.cpp:2660
+#: rc.cpp:2571
 msgid ""
 "A thermometer can be used to determine the temperature of a sample. In a "
 "laboratory, special thermometers are used which can also be used within "
@@ -5255,12 +5261,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:127
-#: rc.cpp:2662
+#: rc.cpp:2573
 msgid "Magnetic Stir Bar"
 msgstr ""
 
 #. i18n: file: data/tools.xml:128
-#: rc.cpp:2664
+#: rc.cpp:2575
 msgid ""
 "Magnetic stir bars are highly chemically inert, small magnetic bars. Most "
 "heaters have a built-in magnet which can rotate: this causes the stir bar to "
@@ -5268,12 +5274,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:132
-#: rc.cpp:2666
+#: rc.cpp:2577
 msgid "Magnetic Stir Bar Retriever"
 msgstr ""
 
 #. i18n: file: data/tools.xml:133
-#: rc.cpp:2668
+#: rc.cpp:2579
 msgid ""
 "A magnetic stir bar retriever can be used to retrieve magnetic stir bars "
 "from containers. The retriever is a bar with a magnet at the end which "
@@ -5281,12 +5287,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:137
-#: rc.cpp:2670
+#: rc.cpp:2581
 msgid "Pipette"
 msgstr ""
 
 #. i18n: file: data/tools.xml:138
-#: rc.cpp:2672
+#: rc.cpp:2583
 msgid ""
 "Pipettes are used to introduce small quantities of liquids in laboratories. "
 "A pipette has a volume scale and, as a rule, pipette bulbs are used as "
@@ -5296,12 +5302,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:142
-#: rc.cpp:2674
+#: rc.cpp:2585
 msgid "Erlenmeyer Flask"
 msgstr ""
 
 #. i18n: file: data/tools.xml:148
-#: rc.cpp:2676
+#: rc.cpp:2587
 msgid ""
 "An Erlenmeyer flask, named after the chemist Emil Erlenmeyer (1825-1909), is "
 "different to a beaker in that it comes with an inverted conical base and a "
@@ -5321,12 +5327,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:153
-#: rc.cpp:2683
+#: rc.cpp:2594
 msgid "Ultrasonic Bath"
 msgstr ""
 
 #. i18n: file: data/tools.xml:154
-#: rc.cpp:2685
+#: rc.cpp:2596
 msgid ""
 "For some chemical reactions it is important that the solvent is gas free. To "
 "achieve this the reaction vessel is put for some time into a ultrasonic "
@@ -5335,12 +5341,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:158
-#: rc.cpp:2687
+#: rc.cpp:2598
 msgid "Scales"
 msgstr "Graddfeydd"
 
 #. i18n: file: data/tools.xml:159
-#: rc.cpp:2689
+#: rc.cpp:2600
 msgid ""
 "In a laboratory, very precise quantities of reagents often have to be "
 "weighed out. High precision scales can measure masses down to 1/10000 gram.  "
@@ -5349,12 +5355,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:163
-#: rc.cpp:2691
+#: rc.cpp:2602
 msgid "Distillation bridge"
 msgstr ""
 
 #. i18n: file: data/tools.xml:164
-#: rc.cpp:2693
+#: rc.cpp:2604
 msgid ""
 "One means of separating a mixture is to use distillation.  In this setting, "
 "a distillation bridge acts as a conduit between the two pots.  One pot "
@@ -5366,12 +5372,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:169
-#: rc.cpp:2695
+#: rc.cpp:2606
 msgid "Syringe"
 msgstr ""
 
 #. i18n: file: data/tools.xml:170
-#: rc.cpp:2697
+#: rc.cpp:2608
 msgid ""
 "A syringe consists of two parts, a glass tube and a plunger, both normally "
 "made of glass. Gasses flow into the glass tube, and as the syringe is a "
@@ -5380,12 +5386,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:174
-#: rc.cpp:2699
+#: rc.cpp:2610
 msgid "Separation Beaker"
 msgstr ""
 
 #. i18n: file: data/tools.xml:175
-#: rc.cpp:2701
+#: rc.cpp:2612
 msgid ""
 "First, four small caps are placed at the four ends of the separation beaker. "
 " Then, whilst distilling, the beaker is turned by 60 degrees after a certain "
@@ -5395,12 +5401,12 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:179
-#: rc.cpp:2703
+#: rc.cpp:2614
 msgid "Burner"
 msgstr "Llosgwr"
 
 #. i18n: file: data/tools.xml:180
-#: rc.cpp:2705
+#: rc.cpp:2616
 msgid ""
 "There are several types of burners; this picture shows a Teclu-Burner. Each "
 "type of burner has specific uses, and they vary in peak temperature and "
@@ -5408,24 +5414,24 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:184
-#: rc.cpp:2707
+#: rc.cpp:2618
 msgid "Extractor Hood"
 msgstr ""
 
 #. i18n: file: data/tools.xml:185
-#: rc.cpp:2709
+#: rc.cpp:2620
 msgid ""
 "Extractor hoods are used to filter out gases from chemical reactions.  The "
 "air, once cleaned, is pumped outside of the building."
 msgstr ""
 
 #. i18n: file: data/tools.xml:189
-#: rc.cpp:2711
+#: rc.cpp:2622
 msgid "Contact Thermometer"
 msgstr ""
 
 #. i18n: file: data/tools.xml:190
-#: rc.cpp:2713
+#: rc.cpp:2624
 msgid ""
 "Contact thermometers differ from regular thermometers in that they are "
 "connected to a heating coil, and are hence able to both sense and control "
@@ -5437,22 +5443,22 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:194
-#: rc.cpp:2715
+#: rc.cpp:2626
 msgid "Clamps"
 msgstr ""
 
 #. i18n: file: data/tools.xml:195
-#: rc.cpp:2717
+#: rc.cpp:2628
 msgid "Laboratory clamps make it easier to hold many kinds of tools."
 msgstr ""
 
 #. i18n: file: data/tools.xml:199
-#: rc.cpp:2719
+#: rc.cpp:2630
 msgid "Indicator Paper"
 msgstr ""
 
 #. i18n: file: data/tools.xml:200
-#: rc.cpp:2721
+#: rc.cpp:2632
 msgid ""
 "There are multiple ways of measuring the pH value of a solution, one of "
 "which is to use indicator paper. Indicator paper changes color depending on "
@@ -5463,24 +5469,24 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:204
-#: rc.cpp:2723
+#: rc.cpp:2634
 msgid "Short-Stem Funnel"
 msgstr ""
 
 #. i18n: file: data/tools.xml:205
-#: rc.cpp:2725
+#: rc.cpp:2636
 msgid ""
 "A funnel can be used to fill a narrow-necked vessel with a liquid or fine "
 "powder."
 msgstr ""
 
 #. i18n: file: data/tools.xml:209
-#: rc.cpp:2727
+#: rc.cpp:2638
 msgid "Buret"
 msgstr ""
 
 #. i18n: file: data/tools.xml:210
-#: rc.cpp:2729
+#: rc.cpp:2640
 msgid ""
 "Burets are used to titrate liquids.  A buret is filled with a specific "
 "volume of a liquid, and placed beneath it is a container such as an "
@@ -5491,38 +5497,38 @@
 msgstr ""
 
 #. i18n: file: data/tools.xml:214
-#: rc.cpp:2731
+#: rc.cpp:2642
 msgid "Beaker"
 msgstr ""
 
 #. i18n: file: data/tools.xml:215
-#: rc.cpp:2733
+#: rc.cpp:2644
 msgid ""
-"Beakers can be used for many tasks.  For instance, they are used to store "
-"chemicals and to perform chemical reactions.  They are often also used for "
+"Beakers can be used for many tasks. For instance, they are used to store "
+"chemicals and to perform chemical reactions. They are often also used for "
 "titrations."
 msgstr ""
 
 #. i18n: file: data/tools.xml:219
-#: rc.cpp:2735
+#: rc.cpp:2646
 msgid "DSC (Differential Scanning Calorimeter)"
 msgstr ""
 
 #. i18n: file: data/tools.xml:220
-#: rc.cpp:2737
+#: rc.cpp:2648
 msgid ""
-"A DSC measures the heat flow volume of a compound.  This value is very "
+"A DSC measures the heat flow volume of a compound. This value is very "
 "specific for every kind of matter, and thus a DSC can be used to identify "
 "chemicals or to describe them."
 msgstr ""
 
 #. i18n: file: data/tools.xml:224
-#: rc.cpp:2739
+#: rc.cpp:2650
 msgid "Dewar Vessel"
 msgstr ""
 
 #. i18n: file: data/tools.xml:225
-#: rc.cpp:2741
+#: rc.cpp:2652
 msgid ""
 "A Dewar vessel (or Dewar flask), named after the physicist Sir James Dewar "
 "(1842-1923), is a double-walled vacuum flask, designed to provide good "
@@ -5532,1340 +5538,1340 @@
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:2
-#: rc.cpp:2645
+#: rc.cpp:2655
 msgid "Dummy"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:3
-#: rc.cpp:2648
+#: rc.cpp:2658
 msgid "Hydrogen"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:5
-#: rc.cpp:2651
+#: rc.cpp:2661
 msgid "Helium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:7
-#: rc.cpp:2654
+#: rc.cpp:2664
 msgid "Lithium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:9
-#: rc.cpp:2657
+#: rc.cpp:2667
 msgid "Beryllium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:11
-#: rc.cpp:2660
+#: rc.cpp:2670
 msgid "Boron"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:13
-#: rc.cpp:2663
+#: rc.cpp:2673
 msgid "Carbon"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:15
-#: rc.cpp:2666
+#: rc.cpp:2676
 msgid "Nitrogen"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:17
-#: rc.cpp:2669
+#: rc.cpp:2679
 msgid "Oxygen"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:19
-#: rc.cpp:2672
+#: rc.cpp:2682
 msgid "Fluorine"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:21
-#: rc.cpp:2675
+#: rc.cpp:2685
 msgid "Neon"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:23
-#: rc.cpp:2678
+#: rc.cpp:2688
 msgid "Sodium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:25
-#: rc.cpp:2681
+#: rc.cpp:2691
 msgid "Magnesium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:27
-#: rc.cpp:2684
+#: rc.cpp:2694
 msgid "Aluminium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:29
-#: rc.cpp:2687
+#: rc.cpp:2697
 msgid "Silicon"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:31
-#: rc.cpp:2690
+#: rc.cpp:2700
 msgid "Phosphorus"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:33
-#: rc.cpp:2693
+#: rc.cpp:2703
 msgid "Sulfur"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:35
-#: rc.cpp:2696
+#: rc.cpp:2706
 msgid "Chlorine"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:37
-#: rc.cpp:2699
+#: rc.cpp:2709
 msgid "Argon"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:39
-#: rc.cpp:2702
+#: rc.cpp:2712
 msgid "Potassium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:41
-#: rc.cpp:2705
+#: rc.cpp:2715
 msgid "Calcium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:43
-#: rc.cpp:2708
+#: rc.cpp:2718
 msgid "Scandium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:45
-#: rc.cpp:2711
+#: rc.cpp:2721
 msgid "Titanium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:47
-#: rc.cpp:2714
+#: rc.cpp:2724
 msgid "Vanadium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:49
-#: rc.cpp:2717
+#: rc.cpp:2727
 msgid "Chromium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:51
-#: rc.cpp:2720
+#: rc.cpp:2730
 msgid "Manganese"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:53
-#: rc.cpp:2723
+#: rc.cpp:2733
 msgid "Iron"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:55
-#: rc.cpp:2726
+#: rc.cpp:2736
 msgid "Cobalt"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:57
-#: rc.cpp:2729
+#: rc.cpp:2739
 msgid "Nickel"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:59
-#: rc.cpp:2732
+#: rc.cpp:2742
 msgid "Copper"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:61
-#: rc.cpp:2735
+#: rc.cpp:2745
 msgid "Zinc"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:63
-#: rc.cpp:2738
+#: rc.cpp:2748
 msgid "Gallium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:65
-#: rc.cpp:2741
+#: rc.cpp:2751
 msgid "Germanium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:67
-#: rc.cpp:2744
+#: rc.cpp:2754
 msgid "Arsenic"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:69
-#: rc.cpp:2747
+#: rc.cpp:2757
 msgid "Selenium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:71
-#: rc.cpp:2750
+#: rc.cpp:2760
 msgid "Bromine"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:73
-#: rc.cpp:2753
+#: rc.cpp:2763
 msgid "Krypton"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:75
-#: rc.cpp:2756
+#: rc.cpp:2766
 msgid "Rubidium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:77
-#: rc.cpp:2759
+#: rc.cpp:2769
 msgid "Strontium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:79
-#: rc.cpp:2762
+#: rc.cpp:2772
 msgid "Yttrium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:81
-#: rc.cpp:2765
+#: rc.cpp:2775
 msgid "Zirconium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:83
-#: rc.cpp:2768
+#: rc.cpp:2778
 msgid "Niobium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:85
-#: rc.cpp:2771
+#: rc.cpp:2781
 msgid "Molybdenum"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:87
-#: rc.cpp:2774
+#: rc.cpp:2784
 msgid "Technetium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:89
-#: rc.cpp:2777
+#: rc.cpp:2787
 msgid "Ruthenium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:91
-#: rc.cpp:2780
+#: rc.cpp:2790
 msgid "Rhodium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:93
-#: rc.cpp:2783
+#: rc.cpp:2793
 msgid "Palladium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:95
-#: rc.cpp:2786
+#: rc.cpp:2796
 msgid "Silver"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:97
-#: rc.cpp:2789
+#: rc.cpp:2799
 msgid "Cadmium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:99
-#: rc.cpp:2792
+#: rc.cpp:2802
 msgid "Indium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:101
-#: rc.cpp:2795
+#: rc.cpp:2805
 msgid "Tin"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:103
-#: rc.cpp:2798
+#: rc.cpp:2808
 msgid "Antimony"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:105
-#: rc.cpp:2801
+#: rc.cpp:2811
 msgid "Tellurium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:107
-#: rc.cpp:2804
+#: rc.cpp:2814
 msgid "Iodine"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:109
-#: rc.cpp:2807
+#: rc.cpp:2817
 msgid "Xenon"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:111
-#: rc.cpp:2810
+#: rc.cpp:2820
 msgid "Caesium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:113
-#: rc.cpp:2813
+#: rc.cpp:2823
 msgid "Barium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:115
-#: rc.cpp:2816
+#: rc.cpp:2826
 msgid "Lanthanum"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:117
-#: rc.cpp:2819
+#: rc.cpp:2829
 msgid "Cerium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:119
-#: rc.cpp:2822
+#: rc.cpp:2832
 msgid "Praseodymium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:121
-#: rc.cpp:2825
+#: rc.cpp:2835
 msgid "Neodymium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:123
-#: rc.cpp:2828
+#: rc.cpp:2838
 msgid "Promethium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:125
-#: rc.cpp:2831
+#: rc.cpp:2841
 msgid "Samarium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:127
-#: rc.cpp:2834
+#: rc.cpp:2844
 msgid "Europium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:129
-#: rc.cpp:2837
+#: rc.cpp:2847
 msgid "Gadolinium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:131
-#: rc.cpp:2840
+#: rc.cpp:2850
 msgid "Terbium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:133
-#: rc.cpp:2843
+#: rc.cpp:2853
 msgid "Dysprosium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:135
-#: rc.cpp:2846
+#: rc.cpp:2856
 msgid "Holmium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:137
-#: rc.cpp:2849
+#: rc.cpp:2859
 msgid "Erbium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:139
-#: rc.cpp:2852
+#: rc.cpp:2862
 msgid "Thulium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:141
-#: rc.cpp:2855
+#: rc.cpp:2865
 msgid "Ytterbium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:143
-#: rc.cpp:2858
+#: rc.cpp:2868
 msgid "Lutetium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:145
-#: rc.cpp:2861
+#: rc.cpp:2871
 msgid "Hafnium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:147
-#: rc.cpp:2864
+#: rc.cpp:2874
 msgid "Tantalum"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:149
-#: rc.cpp:2867
+#: rc.cpp:2877
 msgid "Tungsten"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:151
-#: rc.cpp:2870
+#: rc.cpp:2880
 msgid "Rhenium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:153
-#: rc.cpp:2873
+#: rc.cpp:2883
 msgid "Osmium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:155
-#: rc.cpp:2876
+#: rc.cpp:2886
 msgid "Iridium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:157
-#: rc.cpp:2879
+#: rc.cpp:2889
 msgid "Platinum"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:159
-#: rc.cpp:2882
+#: rc.cpp:2892
 msgid "Gold"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:161
-#: rc.cpp:2885
+#: rc.cpp:2895
 msgid "Mercury"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:163
-#: rc.cpp:2888
+#: rc.cpp:2898
 msgid "Thallium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:165
-#: rc.cpp:2891
+#: rc.cpp:2901
 msgid "Lead"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:167
-#: rc.cpp:2894
+#: rc.cpp:2904
 msgid "Bismuth"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:169
-#: rc.cpp:2897
+#: rc.cpp:2907
 msgid "Polonium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:171
-#: rc.cpp:2900
+#: rc.cpp:2910
 msgid "Astatine"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:173
-#: rc.cpp:2903
+#: rc.cpp:2913
 msgid "Radon"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:175
-#: rc.cpp:2906
+#: rc.cpp:2916
 msgid "Francium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:177
-#: rc.cpp:2909
+#: rc.cpp:2919
 msgid "Radium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:179
-#: rc.cpp:2912
+#: rc.cpp:2922
 msgid "Actinium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:181
-#: rc.cpp:2915
+#: rc.cpp:2925
 msgid "Thorium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:183
-#: rc.cpp:2918
+#: rc.cpp:2928
 msgid "Protactinium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:185
-#: rc.cpp:2921
+#: rc.cpp:2931
 msgid "Uranium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:187
-#: rc.cpp:2924
+#: rc.cpp:2934
 msgid "Neptunium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:189
-#: rc.cpp:2927
+#: rc.cpp:2937
 msgid "Plutonium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:191
-#: rc.cpp:2930
+#: rc.cpp:2940
 msgid "Americium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:193
-#: rc.cpp:2933
+#: rc.cpp:2943
 msgid "Curium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:195
-#: rc.cpp:2936
+#: rc.cpp:2946
 msgid "Berkelium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:197
-#: rc.cpp:2939
+#: rc.cpp:2949
 msgid "Californium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:199
-#: rc.cpp:2942
+#: rc.cpp:2952
 msgid "Einsteinium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:201
-#: rc.cpp:2945
+#: rc.cpp:2955
 msgid "Fermium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:203
-#: rc.cpp:2948
+#: rc.cpp:2958
 msgid "Mendelevium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:205
-#: rc.cpp:2951
+#: rc.cpp:2961
 msgid "Nobelium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:207
-#: rc.cpp:2954
+#: rc.cpp:2964
 msgid "Lawrencium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:209
-#: rc.cpp:2957
+#: rc.cpp:2967
 msgid "Rutherfordium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:211
-#: rc.cpp:2960
+#: rc.cpp:2970
 msgid "Dubnium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:213
-#: rc.cpp:2963
+#: rc.cpp:2973
 msgid "Seaborgium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:215
-#: rc.cpp:2966
+#: rc.cpp:2976
 msgid "Bohrium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:217
-#: rc.cpp:2969
+#: rc.cpp:2979
 msgid "Hassium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:219
-#: rc.cpp:2972
+#: rc.cpp:2982
 msgid "Meitnerium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:221
-#: rc.cpp:2975
+#: rc.cpp:2985
 msgid "Darmstadtium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:223
-#: rc.cpp:2978
+#: rc.cpp:2988
 msgid "Roentgenium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:225
-#: rc.cpp:2981
+#: rc.cpp:2991
 msgid "Copernicium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:227
-#: rc.cpp:2984
+#: rc.cpp:2994
 msgid "Ununtrium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:229
-#: rc.cpp:2987
+#: rc.cpp:2997
 msgid "Ununquadium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:231
-#: rc.cpp:2990
+#: rc.cpp:3000
 msgid "Ununpentium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:233
-#: rc.cpp:2993
+#: rc.cpp:3003
 msgid "Ununhexium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:235
-#: rc.cpp:2996
+#: rc.cpp:3006
 msgid "Ununseptium"
 msgstr ""
 
 #. i18n: tag label attribute value
 #. i18n: file: element_tiny.xml:237
-#: rc.cpp:2999
+#: rc.cpp:3009
 msgid "Ununoctium"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:4
-#: rc.cpp:3001
+#: rc.cpp:3011
 msgid "Greek 'hydro' and 'gennao' for 'forms water'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:6
-#: rc.cpp:3003
+#: rc.cpp:3013
 msgid "The Greek word for the sun was 'helios'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:8
-#: rc.cpp:3005
+#: rc.cpp:3015
 msgid "Greek 'lithos' means 'stone'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:10
-#: rc.cpp:3007
+#: rc.cpp:3017
 msgid "Greek 'beryllos' for 'light-green stone'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:12
-#: rc.cpp:3009
+#: rc.cpp:3019
 msgid ""
 "Boron means 'Bor(ax) + (carb)on'. It is found in borax and behaves a lot "
 "like carbon"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:14
-#: rc.cpp:3011
+#: rc.cpp:3021
 msgid "Latin 'carboneum' for carbon"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:16
-#: rc.cpp:3013
+#: rc.cpp:3023
 msgid "Latin 'nitrogenium' ('forms saltpeter')"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:18
-#: rc.cpp:3015
+#: rc.cpp:3025
 msgid "Latin 'oxygenium' (forms acids)"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:20
-#: rc.cpp:3017
+#: rc.cpp:3027
 msgid "Latin 'fluere' ('floats')"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:22
-#: rc.cpp:3019
+#: rc.cpp:3029
 msgid "Greek 'neo'. meaning 'new'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:24
-#: rc.cpp:3021
+#: rc.cpp:3031
 msgid "Arabic 'natrun' for 'soda'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:26
-#: rc.cpp:3023
+#: rc.cpp:3033
 msgid "Named after the city of Magnesia"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:28
-#: rc.cpp:3025
+#: rc.cpp:3035
 msgid "Latin 'alumen'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:30
-#: rc.cpp:3027
+#: rc.cpp:3037
 msgid "Latin 'silex'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:32
-#: rc.cpp:3029
+#: rc.cpp:3039
 msgid "Greek 'phosphoros' for 'carries light'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:34
-#: rc.cpp:3031
+#: rc.cpp:3041
 msgid "In sanskrit 'sweb' means 'to sleep'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:36
-#: rc.cpp:3033
+#: rc.cpp:3043
 msgid "Greek 'chloros' for 'yellow-green'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:38
-#: rc.cpp:3035
+#: rc.cpp:3045
 msgid "Greek 'aergon' for 'inactive'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:40
-#: rc.cpp:3037
+#: rc.cpp:3047
 msgid "Arabic 'al qaliy' for potash"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:42
-#: rc.cpp:3039
+#: rc.cpp:3049
 msgid "Latin 'calx' for 'lime'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:44
-#: rc.cpp:3041
+#: rc.cpp:3051
 msgid "Named because it was found in Scandinavia"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:46
-#: rc.cpp:3043
+#: rc.cpp:3053
 msgid "The Titans were giants in Greek mythology"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:48
-#: rc.cpp:3045
+#: rc.cpp:3055
 msgid "'Vanadis' is another name for the Nordic goddess Freyja"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:50
-#: rc.cpp:3047
+#: rc.cpp:3057
 msgid "Greek 'chroma' means 'color'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:52
-#: rc.cpp:3049
+#: rc.cpp:3059
 msgid ""
 "It was discovered near a town named Magnesia in black earth. Thus, it was "
 "named 'magnesia nigra', or for short, Manganese."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:54
-#: rc.cpp:3051
+#: rc.cpp:3061
 msgid "Latin 'ferrum'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:56
-#: rc.cpp:3053
+#: rc.cpp:3063
 msgid "Named after the German word 'Kobold' for 'goblin'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:58
-#: rc.cpp:3055
+#: rc.cpp:3065
 msgid "'Nickel' was the name of a mountain goblin"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:60
-#: rc.cpp:3057
+#: rc.cpp:3067
 msgid "Greek 'cuprum' for Cypres"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:62
-#: rc.cpp:3059
+#: rc.cpp:3069
 msgid "German 'zinking' for 'rough', because zinc ore is very rough"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:64
-#: rc.cpp:3061
+#: rc.cpp:3071
 msgid "'Gallia' is an old name for France"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:66
-#: rc.cpp:3063
+#: rc.cpp:3073
 msgid "Latin 'germania' is an old name for Germany"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:68
-#: rc.cpp:3065
+#: rc.cpp:3075
 msgid "Greek 'arsenikos' for 'male' or 'bold'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:70
-#: rc.cpp:3067
+#: rc.cpp:3077
 msgid "Greek 'selena' for 'moon'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:72
-#: rc.cpp:3069
+#: rc.cpp:3079
 msgid "Greek 'bromos' for 'smells badly'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:74
-#: rc.cpp:3071
+#: rc.cpp:3081
 msgid "Greek 'kryptos' for 'hidden'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:76
-#: rc.cpp:3073
+#: rc.cpp:3083
 msgid "Latin 'rubidus' for 'dark red'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:78
-#: rc.cpp:3075
+#: rc.cpp:3085
 msgid "Named after the mineral Strontianit"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:80
-#: rc.cpp:3077
+#: rc.cpp:3087
 msgid ""
 "Named after the small town of Ytterby near Stockholm in Sweden. Terbium. "
 "Ytterbium and Gadolinium are also named after this town."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:82
-#: rc.cpp:3079
+#: rc.cpp:3089
 msgid "Named after the mineral zircon"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:84
-#: rc.cpp:3081
+#: rc.cpp:3091
 msgid "Named after Niobe, the daughter of the Greek god Tantalus."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:86
-#: rc.cpp:3083
+#: rc.cpp:3093
 msgid ""
 "This name has Greek roots. It means 'like Platinum' - it was difficult to "
 "distinguish Molybdenum from Platinum."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:88
-#: rc.cpp:3085
+#: rc.cpp:3095
 msgid "Greek 'technetos' for artificial"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:90
-#: rc.cpp:3087
+#: rc.cpp:3097
 msgid "Ruthenia is the old name of Russia"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:92
-#: rc.cpp:3089
+#: rc.cpp:3099
 msgid "Greek 'rhodeos' means 'red like a rose'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:94
-#: rc.cpp:3091
+#: rc.cpp:3101
 msgid "Named after the asteroid Pallas"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:96
-#: rc.cpp:3093
+#: rc.cpp:3103
 msgid "Latin 'argentum' for silver"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:98
-#: rc.cpp:3095
+#: rc.cpp:3105
 msgid "Greek 'kadmia' ('Galmei' = Zinc carbonate)"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:100
-#: rc.cpp:3097
+#: rc.cpp:3107
 msgid "Named after 'Indigo' because of its blue spectrum"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:102
-#: rc.cpp:3099
+#: rc.cpp:3109
 msgid "Latin 'stannum' for tin"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:104
-#: rc.cpp:3101
+#: rc.cpp:3111
 msgid "Arabic 'anthos ammonos' for 'blossom of the god Ammon'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:106
-#: rc.cpp:3103
+#: rc.cpp:3113
 msgid "Latin 'tellus' or 'telluris' for 'Planet Earth'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:108
-#: rc.cpp:3105
+#: rc.cpp:3115
 msgid "Greek 'ioeides' for 'violet'."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:110
-#: rc.cpp:3107
+#: rc.cpp:3117
 msgid "Greek 'xenos' for 'foreigner'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:112
-#: rc.cpp:3109
+#: rc.cpp:3119
 msgid "Latin 'caesius' for 'heaven blue'."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:114
-#: rc.cpp:3111
+#: rc.cpp:3121
 msgid "Greek 'barys' for 'heavy'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:116
-#: rc.cpp:3113
+#: rc.cpp:3123
 msgid ""
 "Greek 'lanthanein' for 'hidden'. The Lanthanoids are also called the 'rare "
 "earth' elements."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:118
-#: rc.cpp:3115
+#: rc.cpp:3125
 msgid "Named after the planetoid Ceres"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:120
-#: rc.cpp:3117
+#: rc.cpp:3127
 msgid "Greek 'prasinos didymos' for 'green twin'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:122
-#: rc.cpp:3119
+#: rc.cpp:3129
 msgid "Greek 'neos didymos' for 'new twin'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:124
-#: rc.cpp:3121
+#: rc.cpp:3131
 msgid ""
 "Named after the Greek Prometheus. Prometheus stole the fire from the gods "
 "and gave it to mankind."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:126
-#: rc.cpp:3123
+#: rc.cpp:3133
 msgid "Named after the mineral Samarskit"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:128
-#: rc.cpp:3125
+#: rc.cpp:3135
 msgid "Named after Europe"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:130
-#: rc.cpp:3127
+#: rc.cpp:3137
 msgid "Named after the Finnish chemist Johan Gadolin"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:132
-#: rc.cpp:3129
+#: rc.cpp:3139
 msgid "Named after the Swedish town of Ytterby"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:134
-#: rc.cpp:3131
+#: rc.cpp:3141
 msgid "Greek 'dysprositor' for 'difficult to reach'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:136
-#: rc.cpp:3133
+#: rc.cpp:3143
 msgid "Latin 'holmia' for the old name of Stockholm"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:138
-#: rc.cpp:3135
+#: rc.cpp:3145
 msgid ""
 "Named after the Swedish town of Ytterby. Terbium and Ytterbium are also "
 "named after this town."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:140
-#: rc.cpp:3137
+#: rc.cpp:3147
 msgid "Named after the old name of Scandinavia, 'Thule'."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:142
-#: rc.cpp:3139
+#: rc.cpp:3149
 msgid ""
 "Like Terbium and Gadolinium, this is named after the Swedish town of Ytterby."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:144
-#: rc.cpp:3141
+#: rc.cpp:3151
 msgid "Named after the Roman name 'Lutetia' for Paris"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:146
-#: rc.cpp:3143
+#: rc.cpp:3153
 msgid "'Hafnia' is the old name of Kopenhagen (Denmark)"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:148
-#: rc.cpp:3145
+#: rc.cpp:3155
 msgid "Named after the Greek myth of Tantalos"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:150
-#: rc.cpp:3147
+#: rc.cpp:3157
 msgid ""
 "'tung sten' means 'heavy stone' in Swedish. The old name (and thus the "
 "symbol 'W') was Wolfram, named after a mineral."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:152
-#: rc.cpp:3149
+#: rc.cpp:3159
 msgid "Named after the German river Rhine (latin 'Rhenium')."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:154
-#: rc.cpp:3151
+#: rc.cpp:3161
 msgid "Greek for 'smell'. Its oxides smell strongly like radishes."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:156
-#: rc.cpp:3153
+#: rc.cpp:3163
 msgid "Greek 'iris' for 'rainbow'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:158
-#: rc.cpp:3155
+#: rc.cpp:3165
 msgid "Spanish 'platina' means 'small silver'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:160
-#: rc.cpp:3157
+#: rc.cpp:3167
 msgid "Latin 'aurum'. Named after Aurora, the goddess of sunrise"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:162
-#: rc.cpp:3159
+#: rc.cpp:3169
 msgid "Graeco-Latin 'hydrargyrum' for 'liquid silver'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:164
-#: rc.cpp:3161
+#: rc.cpp:3171
 msgid "Greek 'tallos' for 'young twig'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:166
-#: rc.cpp:3163
+#: rc.cpp:3173
 msgid "Latin 'plumbum' for Lead"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:168
-#: rc.cpp:3165
+#: rc.cpp:3175
 msgid "The old name of Bismuth is 'Wismut', which stood for 'white mass'."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:170
-#: rc.cpp:3167
+#: rc.cpp:3177
 msgid "Named after Poland to honor Marie Curie"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:172
-#: rc.cpp:3169
+#: rc.cpp:3179
 msgid "Greek 'astator' for 'changing'"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:174
-#: rc.cpp:3171
+#: rc.cpp:3181
 msgid ""
 "Named after Radium. It ends with 'on' to make it clear that it is a noble "
 "gas."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:176
-#: rc.cpp:3173
+#: rc.cpp:3183
 msgid "Named after France to honor Marguerite Perey"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:178
-#: rc.cpp:3175
+#: rc.cpp:3185
 msgid "Latin 'radius' for 'beam', as it is radioactive"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:180
-#: rc.cpp:3177
+#: rc.cpp:3187
 msgid "Greek 'aktis' for 'beam' - actinium is radioactive"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:182
-#: rc.cpp:3179
+#: rc.cpp:3189
 msgid "Named after the German god of thunder: Thor"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:184
-#: rc.cpp:3181
+#: rc.cpp:3191
 msgid ""
 "Greek 'protos' for 'ancester'. Protactinium is before Actinium in the "
 "periodic table."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:186
-#: rc.cpp:3183
+#: rc.cpp:3193
 msgid "Greek 'ouranos' for 'heaven'. Named after the planet Uranus."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:188
-#: rc.cpp:3185
+#: rc.cpp:3195
 msgid "Named after the planet Neptune."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:190
-#: rc.cpp:3187
+#: rc.cpp:3197
 msgid "Named after the planet Pluto."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:192
-#: rc.cpp:3189
+#: rc.cpp:3199
 msgid "Named after America."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:194
-#: rc.cpp:3191
+#: rc.cpp:3201
 msgid "Named after Marie Curie."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:196
-#: rc.cpp:3193
+#: rc.cpp:3203
 msgid "Named after the town Berkeley where it was discovered."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:198
-#: rc.cpp:3195
+#: rc.cpp:3205
 msgid "Named after the US-State of California."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:200
-#: rc.cpp:3197
+#: rc.cpp:3207
 msgid "Named after the scientist Albert Einstein."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:202
-#: rc.cpp:3199
+#: rc.cpp:3209
 msgid "Named after the scientist Enrico Fermi."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:204
-#: rc.cpp:3201
+#: rc.cpp:3211
 msgid "Named after the scientist D.I. Mendeleev."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:206
-#: rc.cpp:3203
+#: rc.cpp:3213
 msgid "Named after the scientist Alfred Nobel."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:208
-#: rc.cpp:3205
+#: rc.cpp:3215
 msgid "Named after the scientist Ernest Orlando Lawrence."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:210
-#: rc.cpp:3207
+#: rc.cpp:3217
 msgid "Named after the scientist Ernest Rutherford"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:212
-#: rc.cpp:3209
+#: rc.cpp:3219
 msgid "Named after the science-town Dubna in Russia"
 msgstr ""
 
 #. i18n: file: element_tiny.xml:214
-#: rc.cpp:3211
+#: rc.cpp:3221
 msgid "Named after the scientist G. Theodore Seaborg."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:216
-#: rc.cpp:3213
+#: rc.cpp:3223
 msgid "Named after the scientist Niels Bohr."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:218
-#: rc.cpp:3215
+#: rc.cpp:3225
 msgid ""
 "Latin 'hassia' for the German county Hessen. In Hessen a lot elements have "
 "been discovered."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:220
-#: rc.cpp:3217
+#: rc.cpp:3227
 msgid "Named after the scientist Lise Meitner."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:222
-#: rc.cpp:3219
+#: rc.cpp:3229
 msgid ""
 "Named after the German city Darmstadt where many elements have been "
 "discovered."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:224
-#: rc.cpp:3221
+#: rc.cpp:3231
 msgid "Named after Wilhelm Conrad Röntgen."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:226
-#: rc.cpp:3223
+#: rc.cpp:3233
 msgid ""
 "Historically known as eka-mercury. Ununbium is a temporary IUPAC systematic "
 "element name."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:228
-#: rc.cpp:3225
+#: rc.cpp:3235
 msgid ""
 "Historically known as eka-thallium. Ununtrium is a temporary IUPAC "
 "systematic element name."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:230
-#: rc.cpp:3227
+#: rc.cpp:3237
 msgid ""
 "Historically known as eka-lead. Ununquadium is a temporary IUPAC systematic "
 "element name."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:232
-#: rc.cpp:3229
+#: rc.cpp:3239
 msgid ""
 "Historically known as eka-bismuth. Ununpentium is a temporary IUPAC "
 "systematic element name."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:234
-#: rc.cpp:3231
+#: rc.cpp:3241
 msgid ""
 "Historically known as eka-polonium. Ununhexium is a temporary IUPAC "
 "systematic element name."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:236
-#: rc.cpp:3233
+#: rc.cpp:3243
 msgid "Temporary symbol and name. Can also be referred to as eka-astatine."
 msgstr ""
 
 #. i18n: file: element_tiny.xml:238
-#: rc.cpp:3235
+#: rc.cpp:3245
 msgid ""
 "Historically known as eka-radon, eka-emanation before 1960. Ununoctium is a "
 "temporary IUPAC systematic element name."
@@ -6937,1254 +6943,735 @@
 msgid "DZ Periodic Table"
 msgstr ""
 
-#: src/kalziumutils.cpp:88
-msgid "Error"
-msgstr ""
-
-#: src/kalziumutils.cpp:127 src/kalziumutils.cpp:142
-msgid "Value not defined"
-msgstr ""
-
-#: src/kalziumutils.cpp:129
+#: src/molcalcwidget.cpp:104 src/molcalcwidget.cpp:146
+#: src/molcalcwidget.cpp:207 src/molcalcwidget.cpp:209
+#: src/molcalcwidget.cpp:211 src/molcalcwidget.cpp:213
+#: src/molcalcwidget.cpp:215
 #, kde-format
-msgctxt "Just a number"
 msgid "%1"
 msgstr ""
 
-#: src/kalziumutils.cpp:101 src/kalziumutils.cpp:114 src/kalziumutils.cpp:166
-#: src/kalziumutils.cpp:188 src/kalziumutils.cpp:197
-msgid "Unknown Value"
-msgstr ""
-
-#: src/kalziumutils.cpp:168
-#, kde-format
-msgctxt "x u (units). The atomic mass."
-msgid "%1 u"
-msgstr ""
-
-#: src/kalziumutils.cpp:175
-#, kde-format
-msgid "This element was discovered in the year <numid>%1</numid>."
-msgstr ""
-
-#: src/kalziumutils.cpp:177
-msgid "The element has not yet been officially recognized by the IUPAC."
-msgstr ""
-
-#: src/kalziumutils.cpp:180
-msgid "This element was known to ancient cultures."
-msgstr ""
-
-#: src/legendwidget.cpp:73
-msgctxt ""
-"one of the three states of matter (solid, liquid, vaporous or unknown)"
-msgid "Solid"
-msgstr ""
-
-#: src/legendwidget.cpp:74
-msgctxt ""
-"one of the three states of matter (solid, liquid, vaporous or unknown)"
-msgid "Liquid"
-msgstr ""
-
-#: src/legendwidget.cpp:75
-msgctxt ""
-"one of the three states of matter (solid, liquid, vaporous or unknown)"
-msgid "Vaporous"
-msgstr ""
-
-#: src/legendwidget.cpp:76
-msgctxt ""
-"one of the three states of matter (solid, liquid, vaporous or unknown)"
-msgid "Unknown"
-msgstr ""
-
-#: src/legendwidget.cpp:81
-msgctxt "one of the two types of gradients available"
-msgid "logarithmic"
-msgstr ""
-
-#: src/legendwidget.cpp:83
-msgctxt "one of the two types of gradients available"
-msgid "linear"
-msgstr ""
-
-#: src/legendwidget.cpp:84
-#, kde-format
-msgid "%1 (%2)"
-msgstr ""
-
-#: src/legendwidget.cpp:85
-#, kde-format
-msgctxt "Minimum value of the gradient"
-msgid "Minimum: %1"
-msgstr ""
-
-#: src/legendwidget.cpp:86
-#, kde-format
-msgctxt "Maximum value of the gradient"
-msgid "Maximum: %1"
-msgstr ""
-
-#: src/legendwidget.cpp:90
-#, kde-format
-msgid "Scheme: %1"
-msgstr ""
-
-#: src/kalziumnumerationtype.cpp:116
-msgid "No Numeration"
-msgstr ""
-
-#: src/kalziumnumerationtype.cpp:167
-msgid "IUPAC"
+#: src/molcalcwidget.cpp:176
+msgid ""
+"Enter a formula in the\n"
+"widget above and\n"
+"click on 'Calc'.\n"
+"E.g. #Et#OH"
 msgstr ""
 
-#: src/kalziumnumerationtype.cpp:207
-msgid "CAS"
+#: src/molcalcwidget.cpp:232
+msgid "Molecular mass: "
 msgstr ""
 
-#: src/kalziumnumerationtype.cpp:247
-msgid "Old IUPAC"
+#: src/molcalcwidget.cpp:248 src/molcalcwidget.cpp:252
+#: src/molcalcwidget.cpp:253 src/molcalcwidget.cpp:254
+msgid "Invalid input"
 msgstr ""
 
-#: src/unitsettingsdialog.cpp:31
-msgid "Energy:"
+#: src/molcalcwidget.cpp:263
+#, kde-format
+msgid "%1<sub>%2</sub> "
 msgstr ""
 
-#: src/unitsettingsdialog.cpp:37
-msgid "Length:"
+#: src/molcalcwidget.cpp:311
+msgid "Symbol should consist of two or more letters."
 msgstr ""
 
-#: src/unitsettingsdialog.cpp:43
-msgid "Temperature:"
+#: src/molcalcwidget.cpp:318
+msgid "Symbol already being used"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:117
-msgid "Monochrome"
+#: src/molcalcwidget.cpp:325
+msgid "Expansion is invalid, please specify a valid expansion"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:135
-msgid "All the Elements"
+#: src/molcalcwidget.cpp:339
+msgid "done!"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:193
-msgid "s-Block"
+#: src/molcalcwidget.cpp:345
+msgid "Unable to find the user defined alias file."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:194
-msgid "p-Block"
+#: src/kalziumutils.cpp:87
+msgid "Error"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:195
-msgid "d-Block"
+#: src/kalziumutils.cpp:103
+msgid "Value not defined"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:196
-msgid "f-Block"
+#: src/kalziumutils.cpp:105
+#, kde-format
+msgctxt "Just a number"
+msgid "%1"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:220
-msgid "Iconic"
+#: src/kalziumutils.cpp:117
+msgid "Unknown Value"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:237
-msgid "Each element is represented by an icon which represents its use."
+#: src/kalziumutils.cpp:119
+#, kde-format
+msgctxt "x u (units). The atomic mass."
+msgid "%1 u"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:311
-msgid "Alkaline"
+#: src/kalziumutils.cpp:126
+#, kde-format
+msgid "This element was discovered in the year <numid>%1</numid>."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:312
-msgid "Rare Earth"
+#: src/kalziumutils.cpp:128
+msgid "The element has not yet been officially recognized by the IUPAC."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:313
-msgid "Non-Metals"
+#: src/kalziumutils.cpp:131
+msgid "This element was known to ancient cultures."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:314
-msgid "Alkalie Metal"
+#: src/kalziumutils.cpp:164
+msgid "No Data"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:315
-msgid "Other Metal"
+#: src/eqchemview.cpp:86
+msgctxt "Help text for the chemical equation solver"
+msgid ""
+"The equation solver allows you to balance a chemical equation.<br> "
+"<br><b>Using Variables</b><br>To express variable quantities of an element, "
+"put a single character in front of the element's symbol, as shown in this "
+"example:<br><i>aH + bO -> 5H2O</i> (Result: <b>10</b> H + <b>5</b> O -&gt; "
+"<b>5</b> H<sub>2</sub>O)<br>Solving this expression will give you the needed "
+"amount of Hydrogen and Oxygen.<br><br><b>Defining electric "
+"charges</b><br>Use box brackets to specify the electric charge of an "
+"element, as shown in this example:<br><i>4H[+] + 2O -> cH2O[2+]</i> (Result: "
+"<b>4</b> H<b><sup>+</sup></b> + <b>2</b> O -&gt; <b>2</b> "
+"H<b><sub>2</sub></b>O<b><sup>2+</sub></b>)"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:316
-msgid "Halogen"
+#: src/kalzium.cpp:136
+msgid "Knowledge"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:317
-msgid "Transition Metal"
-msgstr ""
+#: src/kalzium.cpp:141
+msgid "Tools"
+msgstr "Offer"
 
-#: src/kalziumschemetype.cpp:318
-msgid "Noble Gas"
+#: src/kalzium.cpp:151
+msgid "&Export Data..."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:319
-msgid "Metalloid"
+#: src/kalzium.cpp:160
+msgid "&Scheme"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:390
-msgid "Group 1"
+#: src/kalzium.cpp:168
+msgid "&Gradients"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:391
-msgid "Group 2"
+#: src/kalzium.cpp:177
+msgid "&Tables"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:392
-msgid "Group 3"
+#: src/kalzium.cpp:184
+msgid "&Numeration"
 msgstr ""
 
-#: src/kalziumschemetype.cpp:393
-msgid "Group 4"
+#: src/kalzium.cpp:191
+msgid "&Plot Data..."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:394
-msgid "Group 5"
+#: src/kalzium.cpp:197
+msgid "Perform &Calculations..."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:395
-msgid "Group 6"
+#: src/kalzium.cpp:199
+msgctxt "WhatsThis Help"
+msgid "This is the calculator, it performs basic chemical calculations."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:396
-msgid "Group 7"
+#: src/kalzium.cpp:203
+msgid "&Isotope Table..."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:397
-msgid "Group 8"
+#: src/kalzium.cpp:205
+msgctxt "WhatsThis Help"
+msgid "This table shows all of the known isotopes of the chemical elements."
 msgstr ""
 
-#: src/kalziumschemetype.cpp:422
-msgid "Colors"
-msgstr "Lliwiau"
+#: src/kalzium.cpp:209
+msgid "&Glossary..."
+msgstr "&Geirfa ..."
 
-#: src/kalziumschemetype.cpp:442
-msgid "Nice colors without meaning. (From the Openbabel project)"
+#: src/kalzium.cpp:214
+msgid "&R/S Phrases..."
 msgstr ""
 
-#: src/elementdataviewer.cpp:51
-msgid "Plot Data"
+#: src/kalzium.cpp:219
+msgid "Convert chemical files..."
 msgstr ""
 
-#: src/rsdialog.cpp:37
-msgid "Risks/Security Phrases"
+#: src/kalzium.cpp:221
+msgctxt "WhatsThis Help"
+msgid ""
+"With this tool, you can convert files containing chemical data between "
+"various file formats."
 msgstr ""
 
-#: src/rsdialog.cpp:104
-msgid "S-Phrases:"
+#: src/kalzium.cpp:228
+msgid "Molecular Editor..."
 msgstr ""
 
-#: src/rsdialog.cpp:113
-msgid "You asked for no R/S-Phrases."
+#: src/kalzium.cpp:230
+msgctxt "WhatsThis Help"
+msgid "This tool allows you to view and edit 3D molecular structures."
 msgstr ""
 
-#: src/rsdialog.cpp:156
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S1: Keep locked up"
+#: src/kalzium.cpp:237
+msgid "&Tables..."
 msgstr ""
 
-#: src/rsdialog.cpp:157
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S2: Keep out of the reach of children"
+#: src/kalzium.cpp:239
+msgctxt "WhatsThis Help"
+msgid ""
+"This will open a dialog with listings of symbols and numbers related to "
+"chemistry."
 msgstr ""
 
-#: src/rsdialog.cpp:158
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S3: Keep in a cool place"
+#: src/kalzium.cpp:247
+msgctxt "WhatsThis Help"
+msgid "This will show or hide the legend for the periodic table."
 msgstr ""
 
-#: src/rsdialog.cpp:159
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S4: Keep away from living quarters"
+#: src/kalzium.cpp:252
+msgctxt "WhatsThis Help"
+msgid ""
+"This will show or hide a sidebar with additional information and a set of "
+"tools."
 msgstr ""
 
-#: src/rsdialog.cpp:160
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+#: src/kalzium.cpp:257
+msgctxt "WhatsThis Help"
 msgid ""
-"S5: Keep contents under ... ( appropriate liquid to be specified by the "
-"manufacturer )"
+"This will show or hide a sidebar with additional information about the table."
 msgstr ""
 
-#: src/rsdialog.cpp:161
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S6: Keep under ... ( inert gas to be specified by the manufacturer )"
+#: src/kalzium.cpp:288
+msgid "Legend"
 msgstr ""
 
-#: src/rsdialog.cpp:162
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S7: Keep container tightly closed"
+#: src/kalzium.cpp:301
+msgid "Table Information"
 msgstr ""
 
-#: src/rsdialog.cpp:163
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S8: Keep container dry"
+#: src/kalzium.cpp:307
+msgid "Information"
 msgstr ""
 
-#: src/rsdialog.cpp:164
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S9: Keep container in a well-ventilated place"
+#: src/kalzium.cpp:319
+msgid "Overview"
+msgstr "Trosolwg"
+
+#: src/kalzium.cpp:331
+msgid "View"
 msgstr ""
 
-#: src/rsdialog.cpp:165
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S12: Do not keep the container sealed"
+#: src/kalzium.cpp:336
+msgid "Calculate"
+msgstr "Cyfrifo"
+
+#: src/kalzium.cpp:347
+msgid "*.png *.xpm *.jpg *.svg"
 msgstr ""
 
-#: src/rsdialog.cpp:166
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S13: Keep away from food, drink and animal feedingstuffs"
+#: src/kalzium.cpp:349
+msgid "Save Kalzium's Table In"
 msgstr ""
 
-#: src/rsdialog.cpp:167
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S14: Keep away from ... ( incompatible materials to be indicated by the "
-"manufacturer )"
+#: src/kalzium.cpp:385
+msgid "This system does not support OpenGL."
 msgstr ""
 
-#: src/rsdialog.cpp:168
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S15: Keep away from heat"
+#: src/kalzium.cpp:385
+msgid "Kalzium Error"
 msgstr ""
 
-#: src/rsdialog.cpp:169
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S16: Keep away from sources of ignition - No smoking"
+#: src/kalzium.cpp:505
+msgid "Schemes"
 msgstr ""
 
-#: src/rsdialog.cpp:170
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S17: Keep away from combustible material"
+#: src/kalzium.cpp:512
+msgid "Gradients"
 msgstr ""
 
-#: src/rsdialog.cpp:171
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S18: Handle and open container with care"
+#: src/kalzium.cpp:517
+msgid "Units"
+msgstr "Unedau"
+
+#: src/kalzium.cpp:567
+#, kde-format
+msgctxt "For example: \"Carbon (6), Mass: 12.0107 u\""
+msgid "%1 (%2), Mass: %3 u"
 msgstr ""
 
-#: src/rsdialog.cpp:172
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S20: When using do not eat or drink"
+#: src/calculator/nuclearCalculator.cpp:407
+msgid "Initial amount cannot be zero."
 msgstr ""
 
-#: src/rsdialog.cpp:173
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S21: When using do not smoke"
+#: src/calculator/nuclearCalculator.cpp:410
+msgid "Final amount cannot be zero."
 msgstr ""
 
-#: src/rsdialog.cpp:174
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S22: Do not breathe dust"
+#: src/calculator/nuclearCalculator.cpp:413
+msgid "Time is zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:175
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S23: Do not breathe gas/fumes/vapour/spray ( appropriate wording to be "
-"specified by the manufacturer )"
+#: src/calculator/nuclearCalculator.cpp:416
+msgid "The final amount is greater than the initial amount."
 msgstr ""
 
-#: src/rsdialog.cpp:176
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S24: Avoid contact with skin"
+#: src/calculator/titrationCalculator.cpp:58
+msgid "Experimental values"
 msgstr ""
 
-#: src/rsdialog.cpp:177
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S25: Avoid contact with eyes"
+#: src/calculator/titrationCalculator.cpp:59
+msgid "Theoretical equations"
 msgstr ""
 
-#: src/rsdialog.cpp:178
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S26: In case of contact with eyes, rinse immediately with plenty of water "
-"and seek medical advice"
+#: src/calculator/titrationCalculator.cpp:140
+msgid "Theoretical curve"
 msgstr ""
 
-#: src/rsdialog.cpp:179
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S27: Take off immediately all contaminated clothing"
+#: src/calculator/titrationCalculator.cpp:216
+msgid "Approximated curve"
 msgstr ""
 
-#: src/rsdialog.cpp:180
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S28: After contact with skin, wash immediately with plenty of ... ( to be "
-"specified by the manufacturer )"
+#: src/calculator/titrationCalculator.cpp:216
+msgid "Equivalence point"
 msgstr ""
 
-#: src/rsdialog.cpp:181
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S29: Do not empty into drains"
+#: src/calculator/titrationCalculator.cpp:655
+msgid "Svg image (*.svg)"
 msgstr ""
 
-#: src/rsdialog.cpp:182
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S30: Never add water to this product"
+#: src/calculator/concCalculator.cpp:719 src/calculator/concCalculator.cpp:760
+msgid "cubic meters"
 msgstr ""
 
-#: src/rsdialog.cpp:183
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S33: Take precautionary measures against static discharges"
+#: src/calculator/concCalculator.cpp:929
+msgid "Percentage should be less than 100.0, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:184
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S35: This material and its container must be disposed of in a safe way"
+#: src/calculator/concCalculator.cpp:932
+msgid "Density cannot be zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:185
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S36: Wear suitable protective clothing"
+#: src/calculator/concCalculator.cpp:935
+msgid "Mass cannot be zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:186
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S37: Wear suitable gloves"
+#: src/calculator/concCalculator.cpp:938 src/calculator/gasCalculator.cpp:338
+msgid "Volume cannot be zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:187
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S38: In case of insufficient ventilation wear suitable respiratory equipment"
+#: src/calculator/concCalculator.cpp:941
+msgid "Number of moles cannot be zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:188
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S39: Wear eye/face protection"
+#: src/calculator/concCalculator.cpp:944
+msgid "Molar mass of solvent is zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:189
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S40: To clean the floor and all objects contaminated by this material use "
-"... ( to be specified by the manufacturer )"
+#: src/calculator/concCalculator.cpp:947
+msgid "Number of equivalents is zero. Cannot calculate equivalent mass."
 msgstr ""
 
-#: src/rsdialog.cpp:190
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S41: In case of fire and/or explosion do not breathe fumes"
+#: src/calculator/concCalculator.cpp:950
+msgid "Concentration is zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:191
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S42: During fumigation/spraying wear suitable respiratory equipment ( "
-"appropriate wording to be specified by the manufacturer )"
+#: src/calculator/concCalculator.cpp:953
+msgid "The volume of the solvent cannot be zero."
 msgstr ""
 
-#: src/rsdialog.cpp:192
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S43: In case of fire use ... ( indicate in the space the precise type of "
-"fire-fighting equipment. If water increases the risk add - Never use water )"
+#: src/calculator/concCalculator.cpp:956
+msgid "The number of moles of the solvent cannot be zero."
 msgstr ""
 
-#: src/rsdialog.cpp:193
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+#: src/calculator/concCalculator.cpp:959
+msgid "The mass of the solvent cannot be zero."
+msgstr ""
+
+#: src/calculator/concCalculator.cpp:962
 msgid ""
-"S45: In case of accident or if you feel unwell seek medical advice "
-"immediately ( show the label where possible )"
+"Insufficient data to calculate the required value, please specify normality."
 msgstr ""
 
-#: src/rsdialog.cpp:194
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+#: src/calculator/concCalculator.cpp:965
 msgid ""
-"S46: If swallowed, seek medical advice immediately and show this container "
-"or label"
+"Insufficient data, specify molarity / mole fraction / molality to calculate."
 msgstr ""
 
-#: src/rsdialog.cpp:195
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+#: src/calculator/concCalculator.cpp:968
 msgid ""
-"S47: Keep at temperature not exceeding ... °C ( to be specified by the "
-"manufacturer )"
+"The amount is specified in moles, cannot calculate molar/equivalent masses. "
+"Please specify mass/volume."
 msgstr ""
 
-#: src/rsdialog.cpp:196
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+#: src/calculator/concCalculator.cpp:971
 msgid ""
-"S48: Keep wet with ... ( appropriate material to be specified by the "
-"manufacturer )"
+"You can calculate the molar mass of solvent only if the mole fraction is "
+"specified."
 msgstr ""
 
-#: src/rsdialog.cpp:197
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S49: Keep only in the original container"
+#: src/calculator/concCalculator.cpp:974
+msgid "Molar mass cannot be zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:198
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S50: Do not mix with ... ( to be specified by the manufacturer )"
+#: src/calculator/concCalculator.cpp:977
+msgid "Equivalent mass cannot be zero, please enter a valid value."
 msgstr ""
 
-#: src/rsdialog.cpp:199
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S51: Use only in well-ventilated areas"
+#: src/calculator/gasCalculator.cpp:341
+msgid "Molar mass cannot be zero, please enter a non-zero value."
 msgstr ""
 
-#: src/rsdialog.cpp:200
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S52: Not recommended for interior use on large surface areas"
+#: src/calculator/calculator.cpp:31
+msgid "Chemical Calculator"
 msgstr ""
 
-#: src/rsdialog.cpp:201
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S53: Avoid exposure - obtain special instructions before use"
+#: src/calculator/calculator.cpp:56 src/calculator/calculator.cpp:105
+msgid "Equation Balancer"
 msgstr ""
 
-#: src/rsdialog.cpp:202
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S56: Dispose of this material and its container at hazardous or special "
-"waste collection point"
+#: src/unitsettingsdialog.cpp:31
+msgid "Energy:"
 msgstr ""
 
-#: src/rsdialog.cpp:203
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "S57: Use appropriate containment to avoid environmental contamination"
+#: src/unitsettingsdialog.cpp:37
+msgid "Length:"
 msgstr ""
 
-#: src/rsdialog.cpp:204
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S59: Refer to manufacturer/supplier for information on recovery/recycling"
+#: src/unitsettingsdialog.cpp:43
+msgid "Temperature:"
 msgstr ""
 
-#: src/rsdialog.cpp:205
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S60: This material and its container must be disposed of as hazardous waste"
+#: src/orbitswidget.cpp:208
+msgid "Unknown Electron Distribution"
 msgstr ""
 
-#: src/rsdialog.cpp:206
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S61: Avoid release to the environment. Refer to special instructions/safety "
-"data sheet"
+#: src/kalziumnumerationtype.cpp:116
+msgid "No Numeration"
 msgstr ""
 
-#: src/rsdialog.cpp:207
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S62: If swallowed, do not induce vomiting: seek medical advice immediately "
-"and show this container or label"
+#: src/kalziumnumerationtype.cpp:167
+msgid "IUPAC"
 msgstr ""
 
-#: src/rsdialog.cpp:208
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S63: In case of accident by inhalation: remove casualty to fresh air and "
-"keep at rest"
+#: src/kalziumnumerationtype.cpp:207
+msgid "CAS"
 msgstr ""
 
-#: src/rsdialog.cpp:209
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"S64: If swallowed, rinse mouth with water ( only if the person is conscious )"
+#: src/kalziumnumerationtype.cpp:247
+msgid "Old IUPAC"
 msgstr ""
 
-#: src/rsdialog.cpp:234
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R1: Explosive when dry"
+#: src/kdeeduglossary.cpp:142 src/kdeeduglossary.cpp:320
+msgid "Glossary"
 msgstr ""
 
-#: src/rsdialog.cpp:235
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"R2: Risk of explosion by shock, friction, fire or other sources of ignition"
+#: src/kdeeduglossary.cpp:336
+msgid "&Search:"
 msgstr ""
 
-#: src/rsdialog.cpp:236
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid ""
-"R3: Extreme risk of explosion by shock, friction, fire or other sources of "
-"ignition"
+#: src/kdeeduglossary.cpp:508
+msgid "References"
 msgstr ""
 
-#: src/rsdialog.cpp:237
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R4: Forms very sensitive explosive metallic compounds"
+#: src/kdeeduglossary.cpp:513
+#, kde-format
+msgid "Go to '%1'"
 msgstr ""
 
-#: src/rsdialog.cpp:238
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R5: Heating may cause an explosion"
+#: src/detailedgraphicaloverview.cpp:85
+msgid "No element selected"
 msgstr ""
 
-#: src/rsdialog.cpp:239
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R6: Explosive with or without contact with air"
+#: src/detailedgraphicaloverview.cpp:104
+msgid "No graphic found"
 msgstr ""
 
-#: src/rsdialog.cpp:240
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R7: May cause fire"
+#: src/detailedgraphicaloverview.cpp:152
+#, kde-format
+msgctxt "For example '1.0079u', the mass of an element in units"
+msgid "%1 u"
 msgstr ""
 
-#: src/rsdialog.cpp:241
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R8: Contact with combustible material may cause fire"
+#: src/psetable/elementitem.cpp:136
+msgid "n/a"
 msgstr ""
 
-#: src/rsdialog.cpp:242
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R9: Explosive when mixed with combustible material"
+#: src/kalziumschemetype.cpp:116
+msgid "Monochrome"
 msgstr ""
 
-#: src/rsdialog.cpp:243
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R10: Flammable"
+#: src/kalziumschemetype.cpp:134
+msgid "All the Elements"
 msgstr ""
 
-#: src/rsdialog.cpp:244
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R11: Highly flammable"
+#: src/kalziumschemetype.cpp:192
+msgid "s-Block"
 msgstr ""
 
-#: src/rsdialog.cpp:245
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R12: Extremely flammable"
+#: src/kalziumschemetype.cpp:193
+msgid "p-Block"
 msgstr ""
 
-#: src/rsdialog.cpp:246
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R14: Reacts violently with water"
+#: src/kalziumschemetype.cpp:194
+msgid "d-Block"
 msgstr ""
 
-#: src/rsdialog.cpp:247
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R15: Contact with water liberates extremely flammable gases"
+#: src/kalziumschemetype.cpp:195
+msgid "f-Block"
 msgstr ""
 
-#: src/rsdialog.cpp:248
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R16: Explosive when mixed with oxidising substances"
+#: src/kalziumschemetype.cpp:219
+msgid "Iconic"
 msgstr ""
 
-#: src/rsdialog.cpp:249
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R17: Spontaneously flammable in air"
+#: src/kalziumschemetype.cpp:236
+msgid "Each element is represented by an icon which represents its use."
 msgstr ""
 
-#: src/rsdialog.cpp:250
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R18: In use, may form flammable/explosive vapour-air mixture"
+#: src/kalziumschemetype.cpp:310
+msgid "Alkaline"
 msgstr ""
 
-#: src/rsdialog.cpp:251
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R19: May form explosive peroxides"
+#: src/kalziumschemetype.cpp:311
+msgid "Rare Earth"
 msgstr ""
 
-#: src/rsdialog.cpp:252
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R20: Harmful by inhalation"
+#: src/kalziumschemetype.cpp:312
+msgid "Non-Metals"
 msgstr ""
 
-#: src/rsdialog.cpp:253
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R21: Harmful in contact with skin"
+#: src/kalziumschemetype.cpp:313
+msgid "Alkalie Metal"
 msgstr ""
 
-#: src/rsdialog.cpp:254
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R22: Harmful if swallowed"
+#: src/kalziumschemetype.cpp:314
+msgid "Other Metal"
+msgstr ""
+
+#: src/kalziumschemetype.cpp:315
+msgid "Halogen"
 msgstr ""
 
-#: src/rsdialog.cpp:255
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R23: Toxic by inhalation"
+#: src/kalziumschemetype.cpp:316
+msgid "Transition Metal"
 msgstr ""
 
-#: src/rsdialog.cpp:256
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R24: Toxic in contact with skin"
+#: src/kalziumschemetype.cpp:317
+msgid "Noble Gas"
 msgstr ""
 
-#: src/rsdialog.cpp:257
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R25: Toxic if swallowed"
+#: src/kalziumschemetype.cpp:318
+msgid "Metalloid"
 msgstr ""
 
-#: src/rsdialog.cpp:258
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R26: Very toxic by inhalation"
+#: src/kalziumschemetype.cpp:389
+msgid "Group 1"
 msgstr ""
 
-#: src/rsdialog.cpp:259
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R27: Very toxic in contact with skin"
+#: src/kalziumschemetype.cpp:390
+msgid "Group 2"
 msgstr ""
 
-#: src/rsdialog.cpp:260
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R28: Very toxic if swallowed"
+#: src/kalziumschemetype.cpp:391
+msgid "Group 3"
 msgstr ""
 
-#: src/rsdialog.cpp:261
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R29: Contact with water liberates toxic gas."
+#: src/kalziumschemetype.cpp:392
+msgid "Group 4"
 msgstr ""
 
-#: src/rsdialog.cpp:262
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R30: Can become highly flammable in use"
+#: src/kalziumschemetype.cpp:393
+msgid "Group 5"
 msgstr ""
 
-#: src/rsdialog.cpp:263
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R31: Contact with acids liberates toxic gas"
+#: src/kalziumschemetype.cpp:394
+msgid "Group 6"
 msgstr ""
 
-#: src/rsdialog.cpp:264
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R32: Contact with acids liberates very toxic gas"
+#: src/kalziumschemetype.cpp:395
+msgid "Group 7"
 msgstr ""
 
-#: src/rsdialog.cpp:265
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R33: Danger of cumulative effects"
+#: src/kalziumschemetype.cpp:396
+msgid "Group 8"
 msgstr ""
 
-#: src/rsdialog.cpp:266
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R34: Causes burns"
+#: src/kalziumschemetype.cpp:421
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: src/kalziumschemetype.cpp:442
+msgid "Nice colors without meaning. (From the Openbabel project)"
 msgstr ""
 
-#: src/rsdialog.cpp:267
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R35: Causes severe burns"
+#: src/isotopetable/isotopetabledialog.cpp:39
+msgid "Isotope Table"
 msgstr ""
 
-#: src/rsdialog.cpp:268
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R36: Irritating to eyes"
+#: src/isotopetable/isotopetabledialog.cpp:55
+msgctxt "alpha ray emission"
+msgid "alpha"
 msgstr ""
 
-#: src/rsdialog.cpp:269
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R37: Irritating to respiratory system"
+#: src/isotopetable/isotopetabledialog.cpp:56
+msgctxt "Electron capture method"
+msgid "EC"
 msgstr ""
 
-#: src/rsdialog.cpp:270
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R38: Irritating to skin"
+#: src/isotopetable/isotopetabledialog.cpp:57
+msgctxt "Many ways"
+msgid "Multiple"
 msgstr ""
 
-#: src/rsdialog.cpp:271
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R39: Danger of very serious irreversible effects"
+#: src/isotopetable/isotopetabledialog.cpp:58
+msgctxt "Beta plus ray emission"
+msgid "Beta +"
 msgstr ""
 
-#: src/rsdialog.cpp:272
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R40: Limited evidence of a carcinogenic effect"
+#: src/isotopetable/isotopetabledialog.cpp:59
+msgctxt "Beta minus ray emission"
+msgid "Beta -"
 msgstr ""
 
-#: src/rsdialog.cpp:273
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R41: Risk of serious damage to eyes"
+#: src/isotopetable/isotopetabledialog.cpp:60
+msgctxt "Stable isotope"
+msgid "Stable"
 msgstr ""
 
-#: src/rsdialog.cpp:274
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R42: May cause sensitisation by inhalation"
+#: src/isotopetable/isotopetabledialog.cpp:61
+msgctxt "Default colour"
+msgid "default"
 msgstr ""
 
-#: src/rsdialog.cpp:275
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R43: May cause sensitisation by skin contact"
+#: src/isotopetable/isotopetabledialog.cpp:81
+#, kde-format
+msgid "<h1>%1 (%2)</h1>"
 msgstr ""
 
-#: src/rsdialog.cpp:276
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R44: Risk of explosion if heated under confinement"
+#: src/isotopetable/isotopetabledialog.cpp:82
+msgctxt "Unknown magnetic moment"
+msgid "Unknown"
 msgstr ""
 
-#: src/rsdialog.cpp:277
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R45: May cause cancer"
+#: src/isotopetable/isotopetabledialog.cpp:82
+#, kde-format
+msgid "Magnetic moment: %1"
 msgstr ""
 
-#: src/rsdialog.cpp:278
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R46: May cause heritable genetic damage"
+#: src/isotopetable/isotopetabledialog.cpp:86
+#, kde-format
+msgid "Halflife: %1 %2"
 msgstr ""
 
-#: src/rsdialog.cpp:279
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R48: Danger of serious damage to health by prolonged exposure"
+#: src/isotopetable/isotopetabledialog.cpp:89
+msgid "Halflife: Unknown"
 msgstr ""
 
-#: src/rsdialog.cpp:280
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R49: May cause cancer by inhalation"
+#: src/isotopetable/isotopetabledialog.cpp:92
+#, kde-format
+msgid "Abundance: %1 %"
 msgstr ""
 
-#: src/rsdialog.cpp:281
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R50: Very toxic to aquatic organisms"
+#: src/isotopetable/isotopetabledialog.cpp:93
+#, kde-format
+msgid "Number of nucleons: %1"
 msgstr ""
 
-#: src/rsdialog.cpp:282
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R51: Toxic to aquatic organisms"
+#: src/isotopetable/isotopetabledialog.cpp:94
+msgctxt "Unknown spin"
+msgid "Unknown"
 msgstr ""
 
-#: src/rsdialog.cpp:283
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R52: Harmful to aquatic organisms"
+#: src/isotopetable/isotopetabledialog.cpp:94
+#, kde-format
+msgid "Spin: %1"
 msgstr ""
 
-#: src/rsdialog.cpp:284
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R53: May cause long-term adverse effects in the aquatic environment"
+#: src/isotopetable/isotopetabledialog.cpp:95
+#, kde-format
+msgid "Exact mass: %1 u"
 msgstr ""
 
-#: src/rsdialog.cpp:285
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R54: Toxic to flora"
+#: src/isotopetable/isotopeitem.cpp:77
+#, kde-format
+msgid "Isotope of Element %1 (%2)"
 msgstr ""
 
-#: src/rsdialog.cpp:286
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R55: Toxic to fauna"
+#: src/gradientwidget_impl.cpp:176
+msgid "Elements with melting point around this temperature:"
 msgstr ""
 
-#: src/rsdialog.cpp:287
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R56: Toxic to soil organisms"
+#: src/gradientwidget_impl.cpp:178 src/gradientwidget_impl.cpp:189
+#, kde-format
+msgctxt "For example: Carbon (300K)"
+msgid "%1 (%2%3)"
 msgstr ""
 
-#: src/rsdialog.cpp:288
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R57: Toxic to bees"
+#: src/gradientwidget_impl.cpp:183
+msgid "No elements with a melting point around this temperature"
 msgstr ""
 
-#: src/rsdialog.cpp:289
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R58: May cause long-term adverse effects in the environment"
+#: src/gradientwidget_impl.cpp:187
+msgid "Elements with boiling point around this temperature:"
 msgstr ""
 
-#: src/rsdialog.cpp:290
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R59: Dangerous for the ozone layer"
+#: src/gradientwidget_impl.cpp:194
+msgid "No elements with a boiling point around this temperature"
 msgstr ""
 
-#: src/rsdialog.cpp:291
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R60: May impair fertility"
+#: src/searchwidget.cpp:38
+msgid "Search:"
 msgstr ""
 
-#: src/rsdialog.cpp:292
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R61: May cause harm to the unborn child"
+#: src/exportdialog.cpp:80
+msgid "Ok"
 msgstr ""
 
-#: src/rsdialog.cpp:293
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R62: Possible risk of impaired fertility"
+#: src/exportdialog.cpp:84
+msgid "Export Chemical Data"
 msgstr ""
 
-#: src/rsdialog.cpp:294
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R63: Possible risk of harm to the unborn child"
+#: src/exportdialog.cpp:105
+msgid "Elements"
 msgstr ""
 
-#: src/rsdialog.cpp:295
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R64: May cause harm to breast-fed babies"
+#: src/exportdialog.cpp:106
+msgid "Properties"
 msgstr ""
 
-#: src/rsdialog.cpp:296
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R65: Harmful: may cause lung damage if swallowed"
+#: src/exportdialog.cpp:124
+msgid "Symbol"
 msgstr ""
 
-#: src/rsdialog.cpp:297
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R66: Repeated exposure may cause skin dryness or cracking"
+#: src/exportdialog.cpp:127
+msgid "Exact Mass"
 msgstr ""
 
-#: src/rsdialog.cpp:298
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R67: Vapours may cause drowsiness and dizziness"
+#: src/exportdialog.cpp:129 src/detailinfodlg.cpp:221
+msgid "Electron Affinity"
 msgstr ""
 
-#: src/rsdialog.cpp:299
-msgctxt ""
-"Please take the official translations! You find them here: "
-"http://europa.eu.int/eur-"
-"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
-msgid "R68: Possible risk of irreversible effects"
+#: src/exportdialog.cpp:147
+msgid "File already exists. Do you want to overwrite it?"
 msgstr ""
 
-#: src/rsdialog.cpp:328
-msgid "At least one of the specified phrases is invalid."
+#: src/exportdialog.cpp:154
+msgid "Could not open file for writing."
 msgstr ""
 
 #: src/tools/obconverter.cpp:41
@@ -8283,8 +7770,8 @@
 "located."
 msgstr ""
 
-#: src/main.cpp:48 src/tools/moleculeview.cpp:143
-#: src/tools/moleculeview.cpp:389
+#: src/tools/moleculeview.cpp:143 src/tools/moleculeview.cpp:389
+#: src/main.cpp:48
 msgid "Kalzium"
 msgstr "Kalzium"
 
@@ -8330,6 +7817,11 @@
 msgid "%1 u"
 msgstr ""
 
+#: src/tools/moleculeview.cpp:285
+msgctxt "Other element"
+msgid "Other..."
+msgstr ""
+
 #: src/tools/moleculeview.cpp:365
 msgid "Remove hydrogens"
 msgstr ""
@@ -8342,1207 +7834,1710 @@
 msgid "Could not set up force field for this molecule"
 msgstr ""
 
-#: src/eqchemview.cpp:69
-msgid "Solve Chemical Equations Viewer"
+#: src/tablesdialog.cpp:49 src/tablesdialog.cpp:50
+msgid "Greek alphabet"
 msgstr ""
 
-#: src/eqchemview.cpp:76
-msgid "Copy"
+#: src/tablesdialog.cpp:60
+msgid "Uppercase"
 msgstr ""
 
-#: src/eqchemview.cpp:76
-msgid "Copy answer to clipboard"
+#: src/tablesdialog.cpp:61
+msgid "Lowercase"
 msgstr ""
 
-#: src/eqchemview.cpp:108
-msgctxt "Help text for the chemical equation solver"
-msgid ""
-"The equation solver allows you to balance a chemical equation.<br> "
-"<br><b>Using Variables</b><br>To express variable quantities of an element, "
-"put a single character in front of the element's symbol, as shown in this "
-"example:<br><i>aH + bO -> 5H2O</i> (Result: <b>10</b> H + <b>5</b> O -&gt; "
-"<b>5</b> H<sub>2</sub>O)<br>Solving this expression will give you the needed "
-"amount of Hydrogen and Oxygen.<br><br><b>Defining electric "
-"charges</b><br>Use box brackets to specify the electric charge of an "
-"element, as shown in this example:<br><i>4H[+] + 2O -> cH2O[2+]</i> (Result: "
-"<b>4</b> H<b><sup>+</sup></b> + <b>2</b> O -&gt; <b>2</b> "
-"H<b><sub>2</sub></b>O<b><sup>2+</sub></b>)"
+#: src/tablesdialog.cpp:62
+msgctxt ""
+"The name of the greek letter in your language. For example 'Alpha' for the "
+"first letter. "
+msgid "Name"
 msgstr ""
 
-#: src/eqchemview.cpp:122
-msgctxt "Window title for the chemical solver's help"
-msgid "Chemical Solver Help"
+#: src/tablesdialog.cpp:117
+msgid "alpha"
 msgstr ""
 
-#: src/spectrumviewimpl.cpp:29
-msgid "Wavelength"
+#: src/tablesdialog.cpp:118
+msgid "beta"
 msgstr ""
 
-#. i18n: file: src/spectrumview.ui:193
-#. i18n: ectx: property (text), widget (QTableWidget, peakListTable)
-#: rc.cpp:80
-msgid "Intensity"
+#: src/tablesdialog.cpp:119
+msgid "gamma"
 msgstr ""
 
-#: src/exportdialog.cpp:79
-msgid "Ok"
+#: src/tablesdialog.cpp:120
+msgid "delta"
 msgstr ""
 
-#: src/exportdialog.cpp:83
-msgid "Export Chemical Data"
+#: src/tablesdialog.cpp:121
+msgid "epsilon"
 msgstr ""
 
-#: src/exportdialog.cpp:104
-msgid "Elements"
+#: src/tablesdialog.cpp:122
+msgid "zeta"
 msgstr ""
 
-#: src/exportdialog.cpp:105
-msgid "Properties"
+#: src/tablesdialog.cpp:123
+msgid "eta"
 msgstr ""
 
-#: src/exportdialog.cpp:123
-msgid "Symbol"
+#: src/tablesdialog.cpp:124
+msgid "theta"
 msgstr ""
 
-#: src/exportdialog.cpp:126
-msgid "Exact Mass"
+#: src/tablesdialog.cpp:125
+msgid "iota"
 msgstr ""
 
-#: src/exportdialog.cpp:128 src/detailinfodlg.cpp:221
-msgid "Electron Affinity"
+#: src/tablesdialog.cpp:126
+msgid "kappa"
 msgstr ""
 
-#: src/exportdialog.cpp:146
-msgid "File already exists. Do you want to overwrite it?"
+#: src/tablesdialog.cpp:127
+msgid "lambda"
 msgstr ""
 
-#: src/exportdialog.cpp:153
-msgid "Could not open file for writing."
+#: src/tablesdialog.cpp:128
+msgid "mu"
 msgstr ""
 
-#: src/elementitem.cpp:113
-msgid "n/a"
+#: src/tablesdialog.cpp:129
+msgid "nu"
 msgstr ""
 
-#: src/main.cpp:32
-msgid "A periodic table of the elements"
+#: src/tablesdialog.cpp:130
+msgid "xi"
 msgstr ""
 
-#: src/main.cpp:49
-msgid "(C) 2002-2011 Carsten Niehaus"
+#: src/tablesdialog.cpp:131
+msgid "omicron"
 msgstr ""
 
-#: src/main.cpp:51
-msgid "Pino Toscano"
+#: src/tablesdialog.cpp:132
+msgid "pi"
 msgstr ""
 
-#: src/main.cpp:51
-msgid "Large code contributions; resident guru helping the other developers"
+#: src/tablesdialog.cpp:133
+msgid "rho"
 msgstr ""
 
-#: src/main.cpp:52
-msgid "Benoit Jacob"
+#: src/tablesdialog.cpp:134
+msgid "sigma"
 msgstr ""
 
-#: src/main.cpp:52
-msgid "Base work on the molecular viewer, mentored Marcus during his SoC"
+#: src/tablesdialog.cpp:135
+msgid "tau"
 msgstr ""
 
-#: src/main.cpp:53
-msgid "Marcus Hanwell"
+#: src/tablesdialog.cpp:136
+msgid "upsilon"
 msgstr ""
 
-#: src/main.cpp:53
-msgid "SoC on the molecular viewer and libavogadro porting/integration"
+#: src/tablesdialog.cpp:137
+msgid "phi"
+msgstr ""
+
+#: src/tablesdialog.cpp:138
+msgid "chi"
+msgstr ""
+
+#: src/tablesdialog.cpp:139
+msgid "psi"
+msgstr ""
+
+#: src/tablesdialog.cpp:140
+msgid "omega"
+msgstr ""
+
+#: src/tablesdialog.cpp:149
+msgid "Numbers"
+msgstr ""
+
+#: src/tablesdialog.cpp:150
+msgid "Numeric Prefixes and Roman Numerals"
+msgstr ""
+
+#: src/tablesdialog.cpp:160
+msgid "Number"
+msgstr ""
+
+#: src/tablesdialog.cpp:160
+msgctxt "For example 'Mono' for 1 and 'Tri' for 3"
+msgid "Prefix"
+msgstr ""
+
+#: src/tablesdialog.cpp:160
+msgid "Roman Numerals"
+msgstr ""
+
+#: src/tablesdialog.cpp:164
+msgid "0.5"
+msgstr ""
+
+#: src/tablesdialog.cpp:165
+msgid "1"
+msgstr ""
+
+#: src/tablesdialog.cpp:166
+msgid "1.5"
+msgstr ""
+
+#: src/tablesdialog.cpp:167
+msgid "2"
+msgstr ""
+
+#: src/tablesdialog.cpp:168
+msgid "2.5"
 msgstr ""
 
-#: src/main.cpp:54
-msgid "Kashyap R Puranik"
+#: src/tablesdialog.cpp:169
+msgid "3"
 msgstr ""
 
-#: src/main.cpp:54
-msgid "SoC on the calculator widget and a few smaller improvements"
+#: src/tablesdialog.cpp:170
+msgid "4"
 msgstr ""
 
-#: src/main.cpp:55
-msgid "Thomas Nagy"
+#: src/tablesdialog.cpp:171
+msgid "5"
 msgstr ""
 
-#: src/main.cpp:55
-msgid "EqChem, the equation solver"
+#: src/tablesdialog.cpp:172
+msgid "6"
 msgstr ""
 
-#: src/main.cpp:56
-msgid "Inge Wallin"
+#: src/tablesdialog.cpp:173
+msgid "7"
 msgstr ""
 
-#: src/main.cpp:56
-msgid ""
-"Code cleaning, parser for the molecule weight calculator, and a lot of "
-"smaller improvements"
+#: src/tablesdialog.cpp:174
+msgid "8"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "Anne-Marie Mahfouf"
+#: src/tablesdialog.cpp:175
+msgid "9"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "A lot of small things and the documentation"
+#: src/tablesdialog.cpp:176
+msgid "10"
 msgstr ""
 
-#: src/main.cpp:58
-msgid "Johannes Simon"
+#: src/tablesdialog.cpp:177
+msgid "11"
 msgstr ""
 
-#: src/main.cpp:58
-msgid ""
-"Code and documentation contributions to the equation solver and molecular "
-"viewer"
+#: src/tablesdialog.cpp:178
+msgid "12"
 msgstr ""
 
-#: src/main.cpp:59
-msgid "Jarle Akselsen"
+#: src/tablesdialog.cpp:179
+msgid "13"
 msgstr ""
 
-#: src/main.cpp:59
-msgid "Many beautiful element icons"
+#: src/tablesdialog.cpp:180
+msgid "14"
 msgstr ""
 
-#: src/main.cpp:60
-msgid "Noémie Scherer"
+#: src/tablesdialog.cpp:181
+msgid "15"
 msgstr ""
 
-#: src/main.cpp:60
-msgid "Many beautiful element icons, too!"
+#: src/tablesdialog.cpp:182
+msgid "16"
 msgstr ""
 
-#: src/main.cpp:61
-msgid "Danny Allen"
+#: src/tablesdialog.cpp:183
+msgid "17"
 msgstr ""
 
-#: src/main.cpp:61
-msgid "Several icons"
+#: src/tablesdialog.cpp:184
+msgid "18"
 msgstr ""
 
-#: src/main.cpp:62
-msgid "Lee Olson"
+#: src/tablesdialog.cpp:185
+msgid "19"
 msgstr ""
 
-#: src/main.cpp:62
-msgid "Several icons in the information dialog"
+#: src/tablesdialog.cpp:186
+msgid "20"
 msgstr ""
 
-#: src/main.cpp:64
-msgid "Jörg Buchwald"
+#: src/tablesdialog.cpp:187
+msgid "40"
 msgstr ""
 
-#: src/main.cpp:64
-msgid "Contributed most isotope information"
+#: src/tablesdialog.cpp:188
+msgid "50"
 msgstr ""
 
-#: src/main.cpp:65
-msgid "Marco Martin"
+#: src/tablesdialog.cpp:189
+msgid "60"
 msgstr ""
 
-#: src/main.cpp:65
-msgid "Some icons and inspiration for others"
+#: src/tablesdialog.cpp:190
+msgid "90"
 msgstr ""
 
-#: src/main.cpp:66
-msgid "Daniel Haas"
+#: src/tablesdialog.cpp:191
+msgid "100"
 msgstr ""
 
-#: src/main.cpp:66
-msgid "The design of the information dialog"
+#: src/tablesdialog.cpp:266
+msgid "&Copy"
 msgstr ""
 
-#: src/main.cpp:67
-msgid "Brian Beck"
+#: src/kalziumgradienttype.cpp:232
+msgid "van Der Waals"
 msgstr ""
 
-#: src/main.cpp:67
-msgid "The orbits icon"
+#: src/kalziumgradienttype.cpp:302
+msgid "u"
 msgstr ""
 
-#: src/main.cpp:69
-msgid "Paulo Cattai"
+#: src/kalziumgradienttype.cpp:510
+msgid "Electronegativity (Pauling)"
 msgstr ""
 
-#: src/main.cpp:69 src/main.cpp:70 src/main.cpp:71 src/main.cpp:72
-#: src/main.cpp:73
-msgid "New interface design and usability improvements"
+#: src/kalziumgradienttype.cpp:565
+msgid "Discovery date"
 msgstr ""
 
-#: src/main.cpp:70
-msgid "Danilo Balzaque"
+#: src/kalziumgradienttype.cpp:678
+msgid "First Ionization"
 msgstr ""
 
-#: src/main.cpp:71
-msgid "Roberto Cunha"
+#: src/spectrumviewimpl.cpp:29
+msgid "Wavelength"
 msgstr ""
 
-#: src/main.cpp:72
-msgid "Tadeu Araujo"
+#: src/spectrumviewimpl.cpp:29
+msgid "Intensity"
 msgstr ""
 
-#: src/main.cpp:73
-msgid "Tiago Porangaba"
+#: src/legendwidget.cpp:75
+msgctxt ""
+"one of the three states of matter (solid, liquid, vaporous or unknown)"
+msgid "Solid"
 msgstr ""
 
-#: src/main.cpp:74
-msgid "Etienne Rebetez"
+#: src/legendwidget.cpp:78
+msgctxt ""
+"one of the three states of matter (solid, liquid, vaporous or unknown)"
+msgid "Liquid"
 msgstr ""
 
-#: src/main.cpp:74
-msgid "Adding new sizable Periodic System"
+#: src/legendwidget.cpp:81
+msgctxt ""
+"one of the three states of matter (solid, liquid, vaporous or unknown)"
+msgid "Vaporous"
 msgstr ""
 
-#: src/detailinfodlg.cpp:52
-msgctxt "Next element"
-msgid "Next"
-msgstr "Nesaf"
+#: src/legendwidget.cpp:84
+msgctxt ""
+"one of the three states of matter (solid, liquid, vaporous or unknown)"
+msgid "Unknown"
+msgstr ""
 
-#: src/detailinfodlg.cpp:53
-msgid "Goes to the next element"
+#: src/legendwidget.cpp:89
+msgctxt "one of the two types of gradients available"
+msgid "logarithmic"
 msgstr ""
 
-#: src/detailinfodlg.cpp:54
-msgctxt "Previous element"
-msgid "Previous"
-msgstr "Cynt"
+#: src/legendwidget.cpp:91
+msgctxt "one of the two types of gradients available"
+msgid "linear"
+msgstr ""
 
-#: src/detailinfodlg.cpp:55
-msgid "Goes to the previous element"
+#: src/legendwidget.cpp:92
+#, kde-format
+msgid "%1 (%2)"
 msgstr ""
 
-#: src/detailinfodlg.cpp:159
+#: src/legendwidget.cpp:94
 #, kde-format
-msgid "Block: %1"
+msgctxt "Minimum value of the gradient"
+msgid "Minimum: %1"
 msgstr ""
 
-#: src/detailinfodlg.cpp:173
+#: src/legendwidget.cpp:98
 #, kde-format
-msgid "It was discovered by %1."
+msgctxt "Maximum value of the gradient"
+msgid "Maximum: %1"
 msgstr ""
 
-#: src/detailinfodlg.cpp:180
+#: src/legendwidget.cpp:103
 #, kde-format
-msgid "Origin of the name:<br/>%1"
+msgid "Scheme: %1"
 msgstr ""
 
-#: src/detailinfodlg.cpp:228
-msgid "Electronic configuration"
+#: src/rsdialog.cpp:37
+msgid "Risks/Security Phrases"
 msgstr ""
 
-#: src/detailinfodlg.cpp:242
-msgid "van der Waals Radius"
+#: src/rsdialog.cpp:104
+msgid "S-Phrases:"
 msgstr ""
 
-#: src/detailinfodlg.cpp:256
-msgid "Ionization energy"
+#: src/rsdialog.cpp:113
+msgid "You asked for no R/S-Phrases."
 msgstr ""
 
-#: src/detailinfodlg.cpp:256
-msgid "First Ionization energy"
+#: src/rsdialog.cpp:156
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S1: Keep locked up"
 msgstr ""
 
-#: src/detailinfodlg.cpp:270
-msgid "Oxidation numbers"
+#: src/rsdialog.cpp:157
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S2: Keep out of the reach of children"
 msgstr ""
 
-#: src/detailinfodlg.cpp:324
-msgid "Isotope-Table"
+#: src/rsdialog.cpp:158
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S3: Keep in a cool place"
 msgstr ""
 
-#: src/detailinfodlg.cpp:328
-msgid "Neutrons"
+#: src/rsdialog.cpp:159
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S4: Keep away from living quarters"
 msgstr ""
 
-#: src/detailinfodlg.cpp:332
-msgid "Half-life period"
+#: src/rsdialog.cpp:160
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S5: Keep contents under ... ( appropriate liquid to be specified by the "
+"manufacturer )"
 msgstr ""
 
-#: src/detailinfodlg.cpp:334
-msgid "Energy and Mode of Decay"
+#: src/rsdialog.cpp:161
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S6: Keep under ... ( inert gas to be specified by the manufacturer )"
+msgstr ""
+
+#: src/rsdialog.cpp:162
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S7: Keep container tightly closed"
+msgstr ""
+
+#: src/rsdialog.cpp:163
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S8: Keep container dry"
+msgstr ""
+
+#: src/rsdialog.cpp:164
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S9: Keep container in a well-ventilated place"
 msgstr ""
 
-#: src/detailinfodlg.cpp:336
-msgid "Spin and Parity"
+#: src/rsdialog.cpp:165
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S12: Do not keep the container sealed"
 msgstr ""
 
-#: src/detailinfodlg.cpp:345
-#, kde-format
-msgid "%1 u"
+#: src/rsdialog.cpp:166
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S13: Keep away from food, drink and animal feedingstuffs"
 msgstr ""
 
-#: src/detailinfodlg.cpp:350
-#, kde-format
-msgctxt "this can for example be '24%'"
-msgid "%1%"
-msgstr "%1%"
-
-#: src/detailinfodlg.cpp:353
-#, kde-format
+#: src/rsdialog.cpp:167
 msgctxt ""
-"The first argument is the value, the second is the unit. For example '17 s' "
-"for '17 seconds',."
-msgid "%1 %2"
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S14: Keep away from ... ( incompatible materials to be indicated by the "
+"manufacturer )"
 msgstr ""
 
-#: src/detailinfodlg.cpp:357 src/detailinfodlg.cpp:366
-#: src/detailinfodlg.cpp:376 src/detailinfodlg.cpp:380
-#: src/detailinfodlg.cpp:390
-#, kde-format
-msgid "%1 MeV"
+#: src/rsdialog.cpp:168
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S15: Keep away from heat"
 msgstr ""
 
-#: src/detailinfodlg.cpp:358
-#, kde-format
-msgid " %1"
+#: src/rsdialog.cpp:169
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S16: Keep away from sources of ignition - No smoking"
 msgstr ""
 
-#: src/detailinfodlg.cpp:360 src/detailinfodlg.cpp:369
-#: src/detailinfodlg.cpp:385 src/detailinfodlg.cpp:393
-#, kde-format
-msgid "(%1%)"
-msgstr "(%1%)"
-
-#: src/detailinfodlg.cpp:362 src/detailinfodlg.cpp:372
-msgid ", "
-msgstr ", "
-
-#: src/detailinfodlg.cpp:367
-#, kde-format
-msgid " %1<sup>-</sup>"
+#: src/rsdialog.cpp:170
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S17: Keep away from combustible material"
 msgstr ""
 
-#: src/detailinfodlg.cpp:377
-#, kde-format
-msgid " %1<sup>+</sup>"
+#: src/rsdialog.cpp:171
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S18: Handle and open container with care"
 msgstr ""
 
-#: src/detailinfodlg.cpp:382 src/detailinfodlg.cpp:391
-msgctxt "Acronym of Electron Capture"
-msgid " EC"
+#: src/rsdialog.cpp:172
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S20: When using do not eat or drink"
 msgstr ""
 
-#: src/detailinfodlg.cpp:399
-#, kde-format
-msgid "%1 %2<sub>n</sub>"
+#: src/rsdialog.cpp:173
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S21: When using do not smoke"
 msgstr ""
 
-#: src/detailinfodlg.cpp:438
-msgid "Data Overview"
+#: src/rsdialog.cpp:174
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S22: Do not breathe dust"
 msgstr ""
 
-#: src/detailinfodlg.cpp:442 src/detailinfodlg.cpp:443
-msgid "Atom Model"
+#: src/rsdialog.cpp:175
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S23: Do not breathe gas/fumes/vapour/spray ( appropriate wording to be "
+"specified by the manufacturer )"
 msgstr ""
 
-#: src/detailinfodlg.cpp:451
-msgid "Isotopes"
+#: src/rsdialog.cpp:176
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S24: Avoid contact with skin"
 msgstr ""
 
-#. i18n: file: src/settings_misc.ui:22
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1676 src/detailinfodlg.cpp:452
-msgid "Miscellaneous"
+#: src/rsdialog.cpp:177
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S25: Avoid contact with eyes"
 msgstr ""
 
-#: src/detailinfodlg.cpp:457 src/detailinfodlg.cpp:458
-msgid "Spectrum"
+#: src/rsdialog.cpp:178
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S26: In case of contact with eyes, rinse immediately with plenty of water "
+"and seek medical advice"
 msgstr ""
 
-#: src/detailinfodlg.cpp:471
-msgid "Extra information"
+#: src/rsdialog.cpp:179
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S27: Take off immediately all contaminated clothing"
 msgstr ""
 
-#: src/detailinfodlg.cpp:471
-msgid "Extra Information"
+#: src/rsdialog.cpp:180
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S28: After contact with skin, wash immediately with plenty of ... ( to be "
+"specified by the manufacturer )"
 msgstr ""
 
-#: src/detailinfodlg.cpp:481
-#, kde-format
-msgctxt "For example Carbon (6)"
-msgid "%1 (%2)"
-msgstr "%1(%2)"
-
-#: src/detailinfodlg.cpp:523
-#, kde-format
-msgid "No spectrum of %1 found."
+#: src/rsdialog.cpp:181
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S29: Do not empty into drains"
 msgstr ""
 
-#: src/kalziumgradienttype.cpp:223
-msgid "van Der Waals"
+#: src/rsdialog.cpp:182
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S30: Never add water to this product"
 msgstr ""
 
-#: src/elementdataviewer.cpp:228 src/kalziumgradienttype.cpp:290
-msgid "u"
+#: src/rsdialog.cpp:183
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S33: Take precautionary measures against static discharges"
 msgstr ""
 
-#: src/kalziumgradienttype.cpp:492
-msgid "Electronegativity (Pauling)"
+#: src/rsdialog.cpp:184
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S35: This material and its container must be disposed of in a safe way"
 msgstr ""
 
-#: src/kalziumgradienttype.cpp:547
-msgid "Discovery date"
+#: src/rsdialog.cpp:185
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S36: Wear suitable protective clothing"
 msgstr ""
 
-#: src/kalziumgradienttype.cpp:659
-msgid "First Ionization"
+#: src/rsdialog.cpp:186
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S37: Wear suitable gloves"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:39
-msgid "Isotope Table"
+#: src/rsdialog.cpp:187
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S38: In case of insufficient ventilation wear suitable respiratory equipment"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:57
-msgctxt "alpha ray emission"
-msgid "alpha"
+#: src/rsdialog.cpp:188
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S39: Wear eye/face protection"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:58
-msgctxt "Electron capture method"
-msgid "EC"
+#: src/rsdialog.cpp:189
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S40: To clean the floor and all objects contaminated by this material use "
+"... ( to be specified by the manufacturer )"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:59
-msgctxt "Many ways"
-msgid "Multiple"
+#: src/rsdialog.cpp:190
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S41: In case of fire and/or explosion do not breathe fumes"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:60
-msgctxt "Beta plus ray emission"
-msgid "Beta +"
+#: src/rsdialog.cpp:191
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S42: During fumigation/spraying wear suitable respiratory equipment ( "
+"appropriate wording to be specified by the manufacturer )"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:61
-msgctxt "Beta minus ray emission"
-msgid "Beta -"
+#: src/rsdialog.cpp:192
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S43: In case of fire use ... ( indicate in the space the precise type of "
+"fire-fighting equipment. If water increases the risk add - Never use water )"
 msgstr ""
-
-#: src/isotopetable/isotopetabledialog.cpp:62
-msgctxt "Stable isotope"
-msgid "Stable"
+
+#: src/rsdialog.cpp:193
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S45: In case of accident or if you feel unwell seek medical advice "
+"immediately ( show the label where possible )"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:63
-msgctxt "Default colour"
-msgid "default"
+#: src/rsdialog.cpp:194
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S46: If swallowed, seek medical advice immediately and show this container "
+"or label"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:83
-#, kde-format
-msgid "<h1>%1 (%2)</h1>"
+#: src/rsdialog.cpp:195
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S47: Keep at temperature not exceeding ... °C ( to be specified by the "
+"manufacturer )"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:84
-msgctxt "Unknown magnetic moment"
-msgid "Unknown"
+#: src/rsdialog.cpp:196
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S48: Keep wet with ... ( appropriate material to be specified by the "
+"manufacturer )"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:84
-#, kde-format
-msgid "Magnetic moment: %1"
+#: src/rsdialog.cpp:197
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S49: Keep only in the original container"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:88
-#, kde-format
-msgid "Halflife: %1 %2"
+#: src/rsdialog.cpp:198
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S50: Do not mix with ... ( to be specified by the manufacturer )"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:91
-msgid "Halflife: Unknown"
+#: src/rsdialog.cpp:199
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S51: Use only in well-ventilated areas"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:94
-#, kde-format
-msgid "Abundance: %1 %"
+#: src/rsdialog.cpp:200
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S52: Not recommended for interior use on large surface areas"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:95
-#, kde-format
-msgid "Number of nucleons: %1"
+#: src/rsdialog.cpp:201
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S53: Avoid exposure - obtain special instructions before use"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:96
-msgctxt "Unknown spin"
-msgid "Unknown"
+#: src/rsdialog.cpp:202
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S56: Dispose of this material and its container at hazardous or special "
+"waste collection point"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:96
-#, kde-format
-msgid "Spin: %1"
+#: src/rsdialog.cpp:203
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "S57: Use appropriate containment to avoid environmental contamination"
 msgstr ""
 
-#: src/isotopetable/isotopetabledialog.cpp:97
-#, kde-format
-msgid "Exact mass: %1 u"
+#: src/rsdialog.cpp:204
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S59: Refer to manufacturer/supplier for information on recovery/recycling"
 msgstr ""
 
-#: src/isotopetable/isotopeitem.cpp:77
-#, kde-format
-msgid "Isotope of Element %1 (%2)"
+#: src/rsdialog.cpp:205
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S60: This material and its container must be disposed of as hazardous waste"
 msgstr ""
 
-#. i18n: file: src/calculator/gasCalculator.ui:582
-#. i18n: ectx: property (text), item, widget (QComboBox, b_unit)
-#: rc.cpp:1616 src/calculator/concCalculator.cpp:719
-#: src/calculator/concCalculator.cpp:760
-msgid "cubic meters"
+#: src/rsdialog.cpp:206
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S61: Avoid release to the environment. Refer to special instructions/safety "
+"data sheet"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:929
-msgid "Percentage should be less than 100.0, please enter a valid value."
+#: src/rsdialog.cpp:207
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S62: If swallowed, do not induce vomiting: seek medical advice immediately "
+"and show this container or label"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:932
-msgid "Density cannot be zero, please enter a valid value."
+#: src/rsdialog.cpp:208
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S63: In case of accident by inhalation: remove casualty to fresh air and "
+"keep at rest"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:935
-msgid "Mass cannot be zero, please enter a valid value."
+#: src/rsdialog.cpp:209
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"S64: If swallowed, rinse mouth with water ( only if the person is conscious )"
 msgstr ""
 
-#: src/calculator/gasCalculator.cpp:354 src/calculator/concCalculator.cpp:938
-msgid "Volume cannot be zero, please enter a valid value."
+#: src/rsdialog.cpp:234
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R1: Explosive when dry"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:941
-msgid "Number of moles cannot be zero, please enter a valid value."
+#: src/rsdialog.cpp:235
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"R2: Risk of explosion by shock, friction, fire or other sources of ignition"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:944
-msgid "Molar mass of solvent is zero, please enter a valid value."
+#: src/rsdialog.cpp:236
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid ""
+"R3: Extreme risk of explosion by shock, friction, fire or other sources of "
+"ignition"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:947
-msgid "Number of equivalents is zero. Cannot calculate equivalent mass."
+#: src/rsdialog.cpp:237
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R4: Forms very sensitive explosive metallic compounds"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:950
-msgid "Concentration is zero, please enter a valid value."
+#: src/rsdialog.cpp:238
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R5: Heating may cause an explosion"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:953
-msgid "The volume of the solvent cannot be zero."
+#: src/rsdialog.cpp:239
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R6: Explosive with or without contact with air"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:956
-msgid "The number of moles of the solvent cannot be zero."
+#: src/rsdialog.cpp:240
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R7: May cause fire"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:959
-msgid "The mass of the solvent cannot be zero."
+#: src/rsdialog.cpp:241
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R8: Contact with combustible material may cause fire"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:962
-msgid ""
-"Insufficient data to calculate the required value, please specify normality."
+#: src/rsdialog.cpp:242
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R9: Explosive when mixed with combustible material"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:965
-msgid ""
-"Insufficient data, specify molarity / mole fraction / molality to calculate."
+#: src/rsdialog.cpp:243
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R10: Flammable"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:968
-msgid ""
-"The amount is specified in moles, cannot calculate molar/equivalent masses. "
-"Please specify mass/volume."
+#: src/rsdialog.cpp:244
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R11: Highly flammable"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:971
-msgid ""
-"You can calculate the molar mass of solvent only if the mole fraction is "
-"specified."
+#: src/rsdialog.cpp:245
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R12: Extremely flammable"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:974
-msgid "Molar mass cannot be zero, please enter a valid value."
+#: src/rsdialog.cpp:246
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R14: Reacts violently with water"
 msgstr ""
 
-#: src/calculator/concCalculator.cpp:977
-msgid "Equivalent mass cannot be zero, please enter a valid value."
+#: src/rsdialog.cpp:247
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R15: Contact with water liberates extremely flammable gases"
 msgstr ""
 
-#: src/calculator/nuclearCalculator.cpp:407
-msgid "Initial amount cannot be zero."
+#: src/rsdialog.cpp:248
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R16: Explosive when mixed with oxidising substances"
 msgstr ""
 
-#: src/calculator/nuclearCalculator.cpp:410
-msgid "Final amount cannot be zero."
+#: src/rsdialog.cpp:249
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R17: Spontaneously flammable in air"
 msgstr ""
 
-#: src/calculator/nuclearCalculator.cpp:413
-msgid "Time is zero, please enter a valid value."
+#: src/rsdialog.cpp:250
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R18: In use, may form flammable/explosive vapour-air mixture"
 msgstr ""
 
-#: src/calculator/nuclearCalculator.cpp:416
-msgid "The final amount is greater than the initial amount."
+#: src/rsdialog.cpp:251
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R19: May form explosive peroxides"
 msgstr ""
 
-#: src/calculator/gasCalculator.cpp:357
-msgid "Molar mass cannot be zero, please enter a non-zero value."
+#: src/rsdialog.cpp:252
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R20: Harmful by inhalation"
 msgstr ""
 
-#: src/calculator/calculator.cpp:31
-msgid "Molecular Calculator"
+#: src/rsdialog.cpp:253
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R21: Harmful in contact with skin"
 msgstr ""
 
-#: src/calculator/calculator.cpp:54 src/calculator/calculator.cpp:103
-msgid "Equation Balancer"
+#: src/rsdialog.cpp:254
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R22: Harmful if swallowed"
 msgstr ""
 
-#: src/calculator/titrationCalculator.cpp:137
-msgid "Theoretical curve"
+#: src/rsdialog.cpp:255
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R23: Toxic by inhalation"
 msgstr ""
 
-#: src/calculator/titrationCalculator.cpp:213
-msgid "Approximated curve"
+#: src/rsdialog.cpp:256
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R24: Toxic in contact with skin"
 msgstr ""
 
-#: src/calculator/titrationCalculator.cpp:213
-msgid "Equivalence point"
+#: src/rsdialog.cpp:257
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R25: Toxic if swallowed"
 msgstr ""
 
-#: src/orbitswidget.cpp:208
-msgid "Unknown Electron Distribution"
+#: src/rsdialog.cpp:258
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R26: Very toxic by inhalation"
 msgstr ""
 
-#: src/gradientwidget_impl.cpp:212
-msgid "Elements with melting point around this temperature:"
+#: src/rsdialog.cpp:259
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R27: Very toxic in contact with skin"
 msgstr ""
 
-#: src/gradientwidget_impl.cpp:214 src/gradientwidget_impl.cpp:225
-#, kde-format
-msgctxt "For example: Carbon (300K)"
-msgid "%1 (%2%3)"
+#: src/rsdialog.cpp:260
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R28: Very toxic if swallowed"
 msgstr ""
 
-#: src/gradientwidget_impl.cpp:219
-msgid "No elements with a melting point around this temperature"
+#: src/rsdialog.cpp:261
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R29: Contact with water liberates toxic gas."
 msgstr ""
 
-#: src/gradientwidget_impl.cpp:223
-msgid "Elements with boiling point around this temperature:"
+#: src/rsdialog.cpp:262
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R30: Can become highly flammable in use"
 msgstr ""
 
-#: src/gradientwidget_impl.cpp:230
-msgid "No elements with a boiling point around this temperature"
+#: src/rsdialog.cpp:263
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R31: Contact with acids liberates toxic gas"
 msgstr ""
 
-#: src/kalzium.cpp:138
-msgid "Knowledge"
+#: src/rsdialog.cpp:264
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R32: Contact with acids liberates very toxic gas"
 msgstr ""
 
-#: src/kalzium.cpp:143
-msgid "Tools"
-msgstr "Offer"
+#: src/rsdialog.cpp:265
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R33: Danger of cumulative effects"
+msgstr ""
 
-#: src/kalzium.cpp:153
-msgid "&Export Data..."
+#: src/rsdialog.cpp:266
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R34: Causes burns"
 msgstr ""
 
-#: src/kalzium.cpp:162
-msgid "&Scheme"
+#: src/rsdialog.cpp:267
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R35: Causes severe burns"
 msgstr ""
 
-#: src/kalzium.cpp:170
-msgid "&Gradients"
+#: src/rsdialog.cpp:268
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R36: Irritating to eyes"
 msgstr ""
 
-#: src/kalzium.cpp:179
-msgid "&Tables"
+#: src/rsdialog.cpp:269
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R37: Irritating to respiratory system"
 msgstr ""
 
-#: src/kalzium.cpp:186
-msgid "&Numeration"
+#: src/rsdialog.cpp:270
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R38: Irritating to skin"
 msgstr ""
 
-#: src/kalzium.cpp:192
-msgid "&Equation Solver..."
+#: src/rsdialog.cpp:271
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R39: Danger of very serious irreversible effects"
 msgstr ""
 
-#: src/kalzium.cpp:194
-msgctxt "WhatsThis Help"
-msgid "This tool allows you to solve chemical equations."
+#: src/rsdialog.cpp:272
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R40: Limited evidence of a carcinogenic effect"
 msgstr ""
 
-#: src/kalzium.cpp:205
-msgid "&Plot Data..."
+#: src/rsdialog.cpp:273
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R41: Risk of serious damage to eyes"
 msgstr ""
 
-#: src/kalzium.cpp:211
-msgid "Perform &Calculations..."
+#: src/rsdialog.cpp:274
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R42: May cause sensitisation by inhalation"
 msgstr ""
 
-#: src/kalzium.cpp:213
-msgctxt "WhatsThis Help"
-msgid "This is the calculator, it performs basic chemical calculations."
+#: src/rsdialog.cpp:275
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R43: May cause sensitisation by skin contact"
 msgstr ""
 
-#: src/kalzium.cpp:217
-msgid "&Isotope Table..."
+#: src/rsdialog.cpp:276
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R44: Risk of explosion if heated under confinement"
 msgstr ""
 
-#: src/kalzium.cpp:219
-msgctxt "WhatsThis Help"
-msgid "This table shows all of the known isotopes of the chemical elements."
+#: src/rsdialog.cpp:277
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R45: May cause cancer"
 msgstr ""
 
-#: src/kalzium.cpp:223
-msgid "&Glossary..."
-msgstr "&Geirfa ..."
+#: src/rsdialog.cpp:278
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R46: May cause heritable genetic damage"
+msgstr ""
 
-#: src/kalzium.cpp:228
-msgid "&R/S Phrases..."
+#: src/rsdialog.cpp:279
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R48: Danger of serious damage to health by prolonged exposure"
 msgstr ""
 
-#: src/kalzium.cpp:233
-msgid "Convert chemical files..."
+#: src/rsdialog.cpp:280
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R49: May cause cancer by inhalation"
 msgstr ""
 
-#: src/kalzium.cpp:235
-msgctxt "WhatsThis Help"
-msgid ""
-"With this tool, you can convert files containing chemical data between "
-"various file formats."
+#: src/rsdialog.cpp:281
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R50: Very toxic to aquatic organisms"
 msgstr ""
 
-#: src/kalzium.cpp:242
-msgid "Molecular Editor..."
+#: src/rsdialog.cpp:282
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R51: Toxic to aquatic organisms"
 msgstr ""
 
-#: src/kalzium.cpp:244
-msgctxt "WhatsThis Help"
-msgid "This tool allows you to view and edit 3D molecular structures."
+#: src/rsdialog.cpp:283
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R52: Harmful to aquatic organisms"
 msgstr ""
 
-#: src/kalzium.cpp:251
-msgid "&Tables..."
+#: src/rsdialog.cpp:284
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R53: May cause long-term adverse effects in the aquatic environment"
 msgstr ""
 
-#: src/kalzium.cpp:253
-msgctxt "WhatsThis Help"
-msgid ""
-"This will open a dialog with listings of symbols and numbers related to "
-"chemistry."
+#: src/rsdialog.cpp:285
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R54: Toxic to flora"
 msgstr ""
 
-#: src/kalzium.cpp:261
-msgctxt "WhatsThis Help"
-msgid "This will show or hide the legend for the periodic table."
+#: src/rsdialog.cpp:286
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R55: Toxic to fauna"
 msgstr ""
 
-#: src/kalzium.cpp:266
-msgctxt "WhatsThis Help"
-msgid ""
-"This will show or hide a sidebar with additional information and a set of "
-"tools."
+#: src/rsdialog.cpp:287
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R56: Toxic to soil organisms"
 msgstr ""
 
-#: src/kalzium.cpp:271
-msgctxt "WhatsThis Help"
-msgid ""
-"This will show or hide a sidebar with additional information about the table."
+#: src/rsdialog.cpp:288
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R57: Toxic to bees"
 msgstr ""
 
-#: src/kalzium.cpp:302
-msgid "Legend"
+#: src/rsdialog.cpp:289
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R58: May cause long-term adverse effects in the environment"
 msgstr ""
 
-#: src/kalzium.cpp:309
-msgid "Table Information"
+#: src/rsdialog.cpp:290
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R59: Dangerous for the ozone layer"
 msgstr ""
 
-#: src/kalzium.cpp:315
-msgid "Information"
+#: src/rsdialog.cpp:291
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R60: May impair fertility"
 msgstr ""
 
-#: src/kalzium.cpp:327
-msgid "Overview"
-msgstr "Trosolwg"
-
-#: src/kalzium.cpp:335
-msgid "View"
+#: src/rsdialog.cpp:292
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R61: May cause harm to the unborn child"
 msgstr ""
 
-#: src/kalzium.cpp:340
-msgid "Calculate"
-msgstr "Cyfrifo"
-
-#: src/kalzium.cpp:353
-msgid "*.png *.xpm *.jpg *.svg"
+#: src/rsdialog.cpp:293
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R62: Possible risk of impaired fertility"
 msgstr ""
 
-#: src/kalzium.cpp:355
-msgid "Save Kalzium's Table In"
+#: src/rsdialog.cpp:294
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R63: Possible risk of harm to the unborn child"
 msgstr ""
 
-#: src/kalzium.cpp:391
-msgid "This system does not support OpenGL."
+#: src/rsdialog.cpp:295
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R64: May cause harm to breast-fed babies"
 msgstr ""
 
-#: src/kalzium.cpp:391
-msgid "Kalzium Error"
+#: src/rsdialog.cpp:296
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R65: Harmful: may cause lung damage if swallowed"
 msgstr ""
 
-#: src/kalzium.cpp:522
-msgid "Schemes"
+#: src/rsdialog.cpp:297
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R66: Repeated exposure may cause skin dryness or cracking"
 msgstr ""
 
-#. i18n: file: src/settings_gradients.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, setupGradients)
-#: rc.cpp:1727 src/kalzium.cpp:529
-msgid "Gradients"
+#: src/rsdialog.cpp:298
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R67: Vapours may cause drowsiness and dizziness"
 msgstr ""
 
-#: src/kalzium.cpp:536
-msgid "Units"
-msgstr "Unedau"
-
-#: src/kalzium.cpp:574
-#, kde-format
-msgctxt "For example: \"Carbon (6), Mass: 12.0107 u\""
-msgid "%1 (%2), Mass: %3 u"
+#: src/rsdialog.cpp:299
+msgctxt ""
+"Please take the official translations! You find them here: "
+"http://europa.eu.int/eur-"
+"lex/lex/LexUriServ/LexUriServ.do?uri=CELEX:32001L0059:EN:HTML"
+msgid "R68: Possible risk of irreversible effects"
 msgstr ""
 
-#: src/searchwidget.cpp:38
-msgid "Search:"
+#: src/rsdialog.cpp:328
+msgid "At least one of the specified phrases is invalid."
 msgstr ""
 
-#: src/detailedgraphicaloverview.cpp:86
-msgid "No element selected"
+#: src/detailinfodlg.cpp:52
+msgctxt "Next element"
+msgid "Next"
+msgstr "Nesaf"
+
+#: src/detailinfodlg.cpp:53
+msgid "Goes to the next element"
 msgstr ""
 
-#: src/detailedgraphicaloverview.cpp:105
-msgid "No graphic found"
+#: src/detailinfodlg.cpp:54
+msgctxt "Previous element"
+msgid "Previous"
+msgstr "Cynt"
+
+#: src/detailinfodlg.cpp:55
+msgid "Goes to the previous element"
 msgstr ""
 
-#: src/detailedgraphicaloverview.cpp:153
+#: src/detailinfodlg.cpp:159
 #, kde-format
-msgctxt "For example '1.0079u', the mass of an element in units"
-msgid "%1 u"
+msgid "Block: %1"
 msgstr ""
 
-#: src/kdeeduglossary.cpp:142 src/kdeeduglossary.cpp:320
-msgid "Glossary"
+#: src/detailinfodlg.cpp:173
+#, kde-format
+msgid "It was discovered by %1."
 msgstr ""
 
-#: src/kdeeduglossary.cpp:336
-msgid "&Search:"
+#: src/detailinfodlg.cpp:180
+#, kde-format
+msgid "Origin of the name:<br/>%1"
 msgstr ""
 
-#: src/kdeeduglossary.cpp:508
-msgid "References"
+#: src/detailinfodlg.cpp:228
+msgid "Electronic configuration"
 msgstr ""
 
-#: src/kdeeduglossary.cpp:513
-#, kde-format
-msgid "Go to '%1'"
+#: src/detailinfodlg.cpp:242
+msgid "van der Waals Radius"
 msgstr ""
 
-#: src/tablesdialog.cpp:49 src/tablesdialog.cpp:50
-msgid "Greek alphabet"
+#: src/detailinfodlg.cpp:256
+msgid "Ionization energy"
 msgstr ""
 
-#: src/tablesdialog.cpp:60
-msgid "Uppercase"
+#: src/detailinfodlg.cpp:256
+msgid "First Ionization energy"
 msgstr ""
 
-#: src/tablesdialog.cpp:61
-msgid "Lowercase"
+#: src/detailinfodlg.cpp:270
+msgid "Oxidation states"
 msgstr ""
 
-#: src/tablesdialog.cpp:62
-msgctxt ""
-"The name of the greek letter in your language. For example 'Alpha' for the "
-"first letter. "
-msgid "Name"
+#: src/detailinfodlg.cpp:283
+#, kde-format
+msgctxt "Link to element's Wikipedia page, %1 is localized language name"
+msgid "Wikipedia (%1)"
 msgstr ""
 
-#: src/tablesdialog.cpp:117
-msgid "alpha"
+#: src/detailinfodlg.cpp:331
+msgid "Isotope-Table"
 msgstr ""
 
-#: src/tablesdialog.cpp:118
-msgid "beta"
+#: src/detailinfodlg.cpp:335
+msgid "Neutrons"
 msgstr ""
 
-#: src/tablesdialog.cpp:119
-msgid "gamma"
+#: src/detailinfodlg.cpp:339
+msgid "Half-life period"
 msgstr ""
 
-#: src/tablesdialog.cpp:120
-msgid "delta"
+#: src/detailinfodlg.cpp:341
+msgid "Energy and Mode of Decay"
 msgstr ""
 
-#: src/tablesdialog.cpp:121
-msgid "epsilon"
+#: src/detailinfodlg.cpp:343
+msgid "Spin and Parity"
 msgstr ""
 
-#: src/tablesdialog.cpp:122
-msgid "zeta"
+#: src/detailinfodlg.cpp:352
+#, kde-format
+msgid "%1 u"
 msgstr ""
 
-#: src/tablesdialog.cpp:123
-msgid "eta"
-msgstr ""
+#: src/detailinfodlg.cpp:357
+#, kde-format
+msgctxt "this can for example be '24%'"
+msgid "%1%"
+msgstr "%1%"
 
-#: src/tablesdialog.cpp:124
-msgid "theta"
+#: src/detailinfodlg.cpp:360
+#, kde-format
+msgctxt ""
+"The first argument is the value, the second is the unit. For example '17 s' "
+"for '17 seconds',."
+msgid "%1 %2"
 msgstr ""
 
-#: src/tablesdialog.cpp:125
-msgid "iota"
+#: src/detailinfodlg.cpp:364 src/detailinfodlg.cpp:373
+#: src/detailinfodlg.cpp:383 src/detailinfodlg.cpp:387
+#: src/detailinfodlg.cpp:397
+#, kde-format
+msgid "%1 MeV"
 msgstr ""
 
-#: src/tablesdialog.cpp:126
-msgid "kappa"
+#: src/detailinfodlg.cpp:365
+#, kde-format
+msgid " %1"
 msgstr ""
 
-#: src/tablesdialog.cpp:127
-msgid "lambda"
-msgstr ""
+#: src/detailinfodlg.cpp:367 src/detailinfodlg.cpp:376
+#: src/detailinfodlg.cpp:392 src/detailinfodlg.cpp:400
+#, kde-format
+msgid "(%1%)"
+msgstr "(%1%)"
 
-#: src/tablesdialog.cpp:128
-msgid "mu"
-msgstr ""
+#: src/detailinfodlg.cpp:369 src/detailinfodlg.cpp:379
+msgid ", "
+msgstr ", "
 
-#: src/tablesdialog.cpp:129
-msgid "nu"
+#: src/detailinfodlg.cpp:374
+#, kde-format
+msgid " %1<sup>-</sup>"
 msgstr ""
 
-#: src/tablesdialog.cpp:130
-msgid "xi"
+#: src/detailinfodlg.cpp:384
+#, kde-format
+msgid " %1<sup>+</sup>"
 msgstr ""
 
-#: src/tablesdialog.cpp:131
-msgid "omicron"
+#: src/detailinfodlg.cpp:389 src/detailinfodlg.cpp:398
+msgctxt "Acronym of Electron Capture"
+msgid " EC"
 msgstr ""
 
-#: src/tablesdialog.cpp:132
-msgid "pi"
+#: src/detailinfodlg.cpp:406
+#, kde-format
+msgid "%1 %2<sub>n</sub>"
 msgstr ""
 
-#: src/tablesdialog.cpp:133
-msgid "rho"
+#: src/detailinfodlg.cpp:445
+msgid "Data Overview"
 msgstr ""
 
-#: src/tablesdialog.cpp:134
-msgid "sigma"
+#: src/detailinfodlg.cpp:449 src/detailinfodlg.cpp:450
+msgid "Atom Model"
 msgstr ""
 
-#: src/tablesdialog.cpp:135
-msgid "tau"
+#: src/detailinfodlg.cpp:458
+msgid "Isotopes"
 msgstr ""
 
-#: src/tablesdialog.cpp:136
-msgid "upsilon"
+#: src/detailinfodlg.cpp:459
+msgid "Miscellaneous"
 msgstr ""
 
-#: src/tablesdialog.cpp:137
-msgid "phi"
+#: src/detailinfodlg.cpp:464 src/detailinfodlg.cpp:465
+msgid "Spectrum"
 msgstr ""
 
-#: src/tablesdialog.cpp:138
-msgid "chi"
+#: src/detailinfodlg.cpp:478
+msgid "Extra information"
 msgstr ""
 
-#: src/tablesdialog.cpp:139
-msgid "psi"
+#: src/detailinfodlg.cpp:478
+msgid "Extra Information"
 msgstr ""
 
-#: src/tablesdialog.cpp:140
-msgid "omega"
-msgstr ""
+#: src/detailinfodlg.cpp:488
+#, kde-format
+msgctxt "For example Carbon (6)"
+msgid "%1 (%2)"
+msgstr "%1(%2)"
 
-#: src/tablesdialog.cpp:149
-msgid "Numbers"
+#: src/detailinfodlg.cpp:530
+#, kde-format
+msgid "No spectrum of %1 found."
 msgstr ""
 
-#: src/tablesdialog.cpp:150
-msgid "Numeric Prefixes and Roman Numerals"
+#: src/elementdataviewer.cpp:53
+msgid "Plot Data"
 msgstr ""
 
-#: src/tablesdialog.cpp:160
-msgid "Number"
+#: src/main.cpp:32
+msgid "A periodic table of the elements"
 msgstr ""
 
-#: src/tablesdialog.cpp:160
-msgctxt "For example 'Mono' for 1 and 'Tri' for 3"
-msgid "Prefix"
+#: src/main.cpp:49
+msgid "(C) 2002-2011 Carsten Niehaus"
 msgstr ""
 
-#: src/tablesdialog.cpp:160
-msgid "Roman Numerals"
+#: src/main.cpp:51
+msgid "Pino Toscano"
 msgstr ""
 
-#: src/tablesdialog.cpp:164
-msgid "0.5"
+#: src/main.cpp:51
+msgid "Large code contributions; resident guru helping the other developers"
 msgstr ""
 
-#. i18n: file: src/spectrumview.ui:183
-#. i18n: ectx: property (text), widget (QTableWidget, peakListTable)
-#: rc.cpp:74 src/tablesdialog.cpp:165
-msgid "1"
+#: src/main.cpp:52
+msgid "Benoit Jacob"
 msgstr ""
 
-#: src/tablesdialog.cpp:166
-msgid "1.5"
+#: src/main.cpp:52
+msgid "Base work on the molecular viewer, mentored Marcus during his SoC"
 msgstr ""
 
-#: src/tablesdialog.cpp:167
-msgid "2"
+#: src/main.cpp:53
+msgid "Marcus Hanwell"
 msgstr ""
 
-#: src/tablesdialog.cpp:168
-msgid "2.5"
+#: src/main.cpp:53
+msgid "SoC on the molecular viewer and libavogadro porting/integration"
 msgstr ""
 
-#: src/tablesdialog.cpp:169
-msgid "3"
+#: src/main.cpp:54
+msgid "Kashyap R Puranik"
 msgstr ""
 
-#: src/tablesdialog.cpp:170
-msgid "4"
+#: src/main.cpp:54
+msgid "SoC on the calculator widget and a few smaller improvements"
 msgstr ""
 
-#: src/tablesdialog.cpp:171
-msgid "5"
+#: src/main.cpp:55
+msgid "Thomas Nagy"
 msgstr ""
 
-#: src/tablesdialog.cpp:172
-msgid "6"
+#: src/main.cpp:55
+msgid "EqChem, the equation solver"
 msgstr ""
 
-#: src/tablesdialog.cpp:173
-msgid "7"
+#: src/main.cpp:56
+msgid "Inge Wallin"
 msgstr ""
 
-#: src/tablesdialog.cpp:174
-msgid "8"
+#: src/main.cpp:56
+msgid ""
+"Code cleaning, parser for the molecule weight calculator, and a lot of "
+"smaller improvements"
 msgstr ""
 
-#: src/tablesdialog.cpp:175
-msgid "9"
+#: src/main.cpp:57
+msgid "Anne-Marie Mahfouf"
 msgstr ""
 
-#: src/tablesdialog.cpp:176
-msgid "10"
+#: src/main.cpp:57
+msgid "A lot of small things and the documentation"
 msgstr ""
 
-#: src/tablesdialog.cpp:177
-msgid "11"
+#: src/main.cpp:58
+msgid "Johannes Simon"
 msgstr ""
 
-#: src/tablesdialog.cpp:178
-msgid "12"
+#: src/main.cpp:58
+msgid ""
+"Code and documentation contributions to the equation solver and molecular "
+"viewer"
 msgstr ""
 
-#: src/tablesdialog.cpp:179
-msgid "13"
+#: src/main.cpp:59
+msgid "Jarle Akselsen"
 msgstr ""
 
-#: src/tablesdialog.cpp:180
-msgid "14"
+#: src/main.cpp:59
+msgid "Many beautiful element icons"
 msgstr ""
 
-#: src/tablesdialog.cpp:181
-msgid "15"
+#: src/main.cpp:60
+msgid "Noémie Scherer"
 msgstr ""
 
-#: src/tablesdialog.cpp:182
-msgid "16"
+#: src/main.cpp:60
+msgid "Many beautiful element icons, too!"
 msgstr ""
 
-#: src/tablesdialog.cpp:183
-msgid "17"
+#: src/main.cpp:61
+msgid "Danny Allen"
 msgstr ""
 
-#: src/tablesdialog.cpp:184
-msgid "18"
+#: src/main.cpp:61
+msgid "Several icons"
 msgstr ""
 
-#: src/tablesdialog.cpp:185
-msgid "19"
+#: src/main.cpp:62
+msgid "Lee Olson"
 msgstr ""
 
-#: src/tablesdialog.cpp:186
-msgid "20"
+#: src/main.cpp:62
+msgid "Several icons in the information dialog"
 msgstr ""
 
-#: src/tablesdialog.cpp:187
-msgid "40"
+#: src/main.cpp:64
+msgid "Jörg Buchwald"
 msgstr ""
 
-#: src/tablesdialog.cpp:188
-msgid "50"
+#: src/main.cpp:64
+msgid "Contributed most isotope information"
 msgstr ""
 
-#: src/tablesdialog.cpp:189
-msgid "60"
+#: src/main.cpp:65
+msgid "Marco Martin"
 msgstr ""
 
-#: src/tablesdialog.cpp:190
-msgid "90"
+#: src/main.cpp:65
+msgid "Some icons and inspiration for others"
 msgstr ""
 
-#: src/tablesdialog.cpp:191
-msgid "100"
+#: src/main.cpp:66
+msgid "Daniel Haas"
 msgstr ""
 
-#: src/tablesdialog.cpp:266
-msgid "&Copy"
+#: src/main.cpp:66
+msgid "The design of the information dialog"
 msgstr ""
 
-#: src/molcalcwidget.cpp:104 src/molcalcwidget.cpp:146
-#: src/molcalcwidget.cpp:207 src/molcalcwidget.cpp:209
-#: src/molcalcwidget.cpp:211 src/molcalcwidget.cpp:213
-#: src/molcalcwidget.cpp:215
-#, kde-format
-msgid "%1"
+#: src/main.cpp:67
+msgid "Brian Beck"
 msgstr ""
 
-#: src/molcalcwidget.cpp:176
-msgid ""
-"Enter a formula in the\n"
-"widget above and\n"
-"click on 'Calc'.\n"
-"E.g. #Et#OH"
+#: src/main.cpp:67
+msgid "The orbits icon"
 msgstr ""
 
-#: src/molcalcwidget.cpp:232
-msgid "Molecular mass: "
+#: src/main.cpp:69
+msgid "Paulo Cattai"
 msgstr ""
 
-#: src/molcalcwidget.cpp:248 src/molcalcwidget.cpp:252
-#: src/molcalcwidget.cpp:253 src/molcalcwidget.cpp:254
-msgid "Invalid input"
+#: src/main.cpp:69 src/main.cpp:70 src/main.cpp:71 src/main.cpp:72
+#: src/main.cpp:73
+msgid "New interface design and usability improvements"
 msgstr ""
 
-#: src/molcalcwidget.cpp:263
-#, kde-format
-msgid "%1<sub>%2</sub> "
+#: src/main.cpp:70
+msgid "Danilo Balzaque"
 msgstr ""
 
-#: src/molcalcwidget.cpp:311
-msgid "Symbol should consist of two or more letters."
+#: src/main.cpp:71
+msgid "Roberto Cunha"
 msgstr ""
 
-#: src/molcalcwidget.cpp:318
-msgid "Symbol already being used"
+#: src/main.cpp:72
+msgid "Tadeu Araujo"
 msgstr ""
 
-#: src/molcalcwidget.cpp:325
-msgid "Expansion is invalid, please specify a valid expansion"
+#: src/main.cpp:73
+msgid "Tiago Porangaba"
 msgstr ""
 
-#: src/molcalcwidget.cpp:339
-msgid "done!"
+#: src/main.cpp:74
+msgid "Etienne Rebetez"
 msgstr ""
 
-#: src/molcalcwidget.cpp:345
-msgid "Unable to find the user defined alias file."
+#: src/main.cpp:74
+msgid "Adding new sizable Periodic System"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kanagram.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kanagram.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kanagram.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kanagram.po	2012-04-18 08:59:39.000000000 +0000
@@ -2,85 +2,93 @@
 msgstr ""
 "Project-Id-Version: kanagram\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-09 14:12+0000\n"
-"PO-Revision-Date: 2012-03-12 22:07+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-16 23:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: KDE <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:25+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kanagram.cpp:61
+#: kanagram.cpp:56
 msgid "reveal word"
 msgstr ""
 
-#: kanagram.cpp:62
+#: kanagram.cpp:57
 msgid "hint"
 msgstr "awgrym"
 
-#: kanagram.cpp:63
+#: kanagram.cpp:58
 msgid "Next Anagram"
 msgstr ""
 
-#: kanagram.cpp:213
+#: kanagram.cpp:208
 msgid "Show Hint"
 msgstr ""
 
-#: kanagram.cpp:219
+#: kanagram.cpp:214
 msgid "Reveal Anagram"
 msgstr ""
 
-#: kanagram.cpp:388
+#: kanagram.cpp:220
+msgid "Previous Vocabulary"
+msgstr ""
+
+#: kanagram.cpp:225
+msgid "Next Vocabulary"
+msgstr ""
+
+#: kanagram.cpp:390
 msgid "About Kanagram"
 msgstr ""
 
-#: kanagram.cpp:403
+#: kanagram.cpp:405
 msgid "About KDE"
 msgstr "Ynglyn a Kde"
 
-#: kanagram.cpp:418
+#: kanagram.cpp:420
 msgid "Kanagram Handbook"
 msgstr ""
 
-#: kanagram.cpp:434
+#: kanagram.cpp:436
 msgid "Configure Kanagram"
 msgstr ""
 
-#: kanagram.cpp:438
+#: kanagram.cpp:440
 msgid "Quit Kanagram"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, MainSettingsWidget)
-#: kanagram.cpp:843 rc.cpp:15 rc.cpp:134
+#: kanagram.cpp:845 rc.cpp:5
 msgctxt "@title:group main settings page name"
 msgid "General"
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:20
 #. i18n: ectx: property (windowTitle), widget (QWidget, VocabSettingsWidget)
-#: kanagram.cpp:847 rc.cpp:102 rc.cpp:185
+#: kanagram.cpp:849 rc.cpp:44
 msgid "Vocabularies"
 msgstr ""
 
-#: kanagram.cpp:851
+#: kanagram.cpp:853
 msgid "Shortcuts"
 msgstr ""
 
-#: kanagram.cpp:934
+#: kanagram.cpp:936
 #, kde-format
 msgid ""
 "File %1 cannot be found.\n"
 " Please ensure that Kanagram is properly installed."
 msgstr ""
 
-#: kanagram.cpp:935
+#: kanagram.cpp:937
 msgid "Error"
 msgstr ""
 
-#: kanagramgame.cpp:204
+#: kanagramgame.cpp:192
 msgid "No hint"
 msgstr ""
 
@@ -192,19 +200,19 @@
 msgid "None"
 msgstr ""
 
-#: rc.cpp:130
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:131
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: mainsettingswidget.ui:16
 #. i18n: ectx: property (whatsThis), widget (QWidget, MainSettingsWidget)
-#: rc.cpp:18 rc.cpp:137
+#: rc.cpp:8
 msgid ""
 "This setting allows you to set the length of time Kanagram's hint bubble is "
 "shown."
@@ -212,168 +220,166 @@
 
 #. i18n: file: mainsettingswidget.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:21 rc.cpp:140
+#: rc.cpp:11
 msgid "Hints"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:28
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:24 rc.cpp:143
+#: rc.cpp:14
 msgid "Auto-hide hints after:"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:36
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_hintHideTime)
-#: rc.cpp:27 rc.cpp:146
+#: rc.cpp:17
 msgid "Do Not Auto-Hide Hints"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:41
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_hintHideTime)
-#: rc.cpp:30 rc.cpp:149
+#: rc.cpp:20
 msgid "3 Seconds"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:46
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_hintHideTime)
-#: rc.cpp:33 rc.cpp:152
+#: rc.cpp:23
 msgid "5 Seconds"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:51
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_hintHideTime)
-#: rc.cpp:36 rc.cpp:155
+#: rc.cpp:26
 msgid "7 Seconds"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:56
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_hintHideTime)
-#: rc.cpp:39 rc.cpp:158
+#: rc.cpp:29
 msgid "9 Seconds"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:67
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:42 rc.cpp:161
+#: rc.cpp:32
 msgid "Vocabulary Options"
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:75
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:45 rc.cpp:164
+#: rc.cpp:35
 msgid "Play using:"
 msgstr ""
 
-#. i18n: file: kanagram.kcfg:13
-#. i18n: ectx: label, entry (useSounds), group (kanagram)
 #. i18n: file: mainsettingswidget.ui:93
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_useSounds)
 #. i18n: file: kanagram.kcfg:13
 #. i18n: ectx: label, entry (useSounds), group (kanagram)
-#: rc.cpp:6 rc.cpp:48 rc.cpp:167 rc.cpp:176
+#: rc.cpp:38 rc.cpp:77
 msgid "Turns sounds on/off."
 msgstr ""
 
 #. i18n: file: mainsettingswidget.ui:96
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_useSounds)
-#: rc.cpp:51 rc.cpp:170
+#: rc.cpp:41
 msgid "Use sou&nds"
 msgstr "Defnydd&io sain"
 
-#. i18n: file: kanagram.kcfg:9
-#. i18n: ectx: label, entry (hintHideTime), group (kanagram)
-#: rc.cpp:3 rc.cpp:173
-msgid ""
-"This setting allows you to set how long Kanagram's hint bubble is shown."
-msgstr ""
-
-#. i18n: file: kanagram.kcfg:17
-#. i18n: ectx: label, entry (defaultVocab), group (kanagram)
-#: rc.cpp:9 rc.cpp:179
-msgid "Set the default vocabulary"
-msgstr ""
-
-#. i18n: file: kanagram.kcfg:21
-#. i18n: ectx: label, entry (dataLanguage), group (kanagram)
-#: rc.cpp:12 rc.cpp:182
-msgid "Set the default translation"
-msgstr ""
-
 #. i18n: file: vocabsettingswidget.ui:48
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnCreateNew)
-#: rc.cpp:105 rc.cpp:188
+#: rc.cpp:47
 msgid "Creates a new vocabulary."
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:51
 #. i18n: ectx: property (text), widget (QPushButton, btnCreateNew)
-#: rc.cpp:108 rc.cpp:191
+#: rc.cpp:50
 msgid "Create &New"
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:58
 #. i18n: ectx: property (toolTip), widget (QPushButton, btnDownloadNew)
-#: rc.cpp:111 rc.cpp:194
+#: rc.cpp:53
 msgid "Download new vocabulary from  \"Get hot new Stuff\""
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:61
 #. i18n: ectx: property (text), widget (QPushButton, btnDownloadNew)
-#: rc.cpp:114 rc.cpp:197
+#: rc.cpp:56
 msgid "Download new vocabulary"
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:73
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnEdit)
-#: rc.cpp:117 rc.cpp:200
+#: rc.cpp:59
 msgid "Edits the selected vocabulary."
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:76
 #. i18n: ectx: property (text), widget (QPushButton, btnEdit)
-#: rc.cpp:120 rc.cpp:203
+#: rc.cpp:62
 msgid "&Edit"
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:83
 #. i18n: ectx: property (whatsThis), widget (QTreeWidget, lviewVocab)
-#: rc.cpp:123 rc.cpp:206
+#: rc.cpp:65
 msgid "The list of installed vocabularies."
 msgstr ""
 
 #. i18n: file: vocabsettingswidget.ui:90
 #. i18n: ectx: property (text), widget (QTreeWidget, lviewVocab)
-#: rc.cpp:126 rc.cpp:209
+#: rc.cpp:68
 msgid "Title"
 msgstr "Teitl"
 
 #. i18n: file: vocabsettingswidget.ui:95
 #. i18n: ectx: property (text), widget (QTreeWidget, lviewVocab)
-#: rc.cpp:129 rc.cpp:212
+#: rc.cpp:71
 msgid "Description"
 msgstr "Disgrifiad"
 
+#. i18n: file: kanagram.kcfg:9
+#. i18n: ectx: label, entry (hintHideTime), group (kanagram)
+#: rc.cpp:74
+msgid ""
+"This setting allows you to set how long Kanagram's hint bubble is shown."
+msgstr ""
+
+#. i18n: file: kanagram.kcfg:17
+#. i18n: ectx: label, entry (defaultVocab), group (kanagram)
+#: rc.cpp:80
+msgid "Set the default vocabulary"
+msgstr ""
+
+#. i18n: file: kanagram.kcfg:21
+#. i18n: ectx: label, entry (dataLanguage), group (kanagram)
+#: rc.cpp:83
+msgid "Set the default translation"
+msgstr ""
+
 #. i18n: file: vocabeditwidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, VocabEditWidget)
-#: rc.cpp:54 rc.cpp:215
+#: rc.cpp:86
 msgid "Vocabulary Editor"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:74
 #. i18n: ectx: property (text), widget (QPushButton, btnSave)
-#: rc.cpp:57 rc.cpp:218
+#: rc.cpp:89
 msgid "&Save"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:81
 #. i18n: ectx: property (text), widget (QPushButton, btnClose)
-#: rc.cpp:60 rc.cpp:221
+#: rc.cpp:92
 msgid "&Close"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:127
 #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#: rc.cpp:63 rc.cpp:224
+#: rc.cpp:95
 msgid ""
 "The description of the vocabulary. If you are creating a new vocabulary, add "
 "a description so that users of your vocabulary will know what kinds of words "
@@ -382,73 +388,73 @@
 
 #. i18n: file: vocabeditwidget.ui:130
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:66 rc.cpp:227
+#: rc.cpp:98
 msgid "&Description:"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:143
 #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#: rc.cpp:69 rc.cpp:230
+#: rc.cpp:101
 msgid "The name of the vocabulary you are editing."
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:146
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:72 rc.cpp:233
+#: rc.cpp:104
 msgid "Vocabulary &name:"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:195
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnRemoveWord)
-#: rc.cpp:75 rc.cpp:236
+#: rc.cpp:107
 msgid "Removes the selected word."
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:198
 #. i18n: ectx: property (text), widget (QPushButton, btnRemoveWord)
-#: rc.cpp:78 rc.cpp:239
+#: rc.cpp:110
 msgid "&Remove Word"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:205
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnNewWord)
-#: rc.cpp:81 rc.cpp:242
+#: rc.cpp:113
 msgid "Creates a new word."
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:208
 #. i18n: ectx: property (text), widget (QPushButton, btnNewWord)
-#: rc.cpp:84 rc.cpp:245
+#: rc.cpp:116
 msgid "&New Word"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:217
 #. i18n: ectx: property (whatsThis), widget (QListWidget, lboxWords)
-#: rc.cpp:87 rc.cpp:248
+#: rc.cpp:119
 msgid "The list of words in the vocabulary."
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:246
 #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#: rc.cpp:90 rc.cpp:251
+#: rc.cpp:122
 msgid "The selected word. This box allows you to edit the selected word."
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:249
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:93 rc.cpp:254
+#: rc.cpp:125
 msgid "&Word:"
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:265
 #. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
-#: rc.cpp:96 rc.cpp:257
+#: rc.cpp:128
 msgid "The selected hint. Add a hint to aid in guessing the word."
 msgstr ""
 
 #. i18n: file: vocabeditwidget.ui:268
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:99 rc.cpp:260
+#: rc.cpp:131
 msgid "&Hint:"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/katomic.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/katomic.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/katomic.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/katomic.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: katomic\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:36+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:46+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:03+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: chooselevelsetdialog.cpp:39
 msgid "Level Sets"
@@ -144,63 +144,63 @@
 "your installation."
 msgstr ""
 
-#: rc.cpp:25
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Kyfieithu: Peter Bradley, dylunio, KD, Thierry Vignaud, ,Launchpad "
 "Contributions:"
 
-#: rc.cpp:26
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: katomicui.rc:16
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:15 rc.cpp:29
+#: rc.cpp:5
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: katomicui.rc:25
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:18 rc.cpp:32
+#: rc.cpp:8
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: levelsetwidget.ui:20
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:21 rc.cpp:35
+#: rc.cpp:11
 msgid "Choose a level set to play:"
 msgstr ""
 
 #. i18n: file: levelsetwidget.ui:45
 #. i18n: ectx: property (text), widget (KNS3::Button, m_pbNewStuff)
-#: rc.cpp:24 rc.cpp:38
+#: rc.cpp:14
 msgid "Get new levels"
 msgstr ""
 
 #. i18n: file: katomic.kcfg:9
 #. i18n: ectx: label, entry (AnimationSpeed), group (Game)
-#: rc.cpp:3 rc.cpp:41
+#: rc.cpp:17
 msgid "The speed of the animations."
 msgstr ""
 
 #. i18n: file: katomic.kcfg:20
 #. i18n: ectx: label, entry (SavedBackgroundWidth), group (General)
-#: rc.cpp:6 rc.cpp:44
+#: rc.cpp:20
 msgid "Width of saved background"
 msgstr ""
 
 #. i18n: file: katomic.kcfg:24
 #. i18n: ectx: label, entry (SavedBackgroundHeight), group (General)
-#: rc.cpp:9 rc.cpp:47
+#: rc.cpp:23
 msgid "Height of saved background"
 msgstr ""
 
 #. i18n: file: katomic.kcfg:28
 #. i18n: ectx: label, entry (LastPlayedLevelSet), group (General)
-#: rc.cpp:12 rc.cpp:50
+#: rc.cpp:26
 msgid "Last played levelset"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kbattleship.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kbattleship.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kbattleship.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kbattleship.po	2012-04-18 08:59:23.000000000 +0000
@@ -10,15 +10,19 @@
 msgstr ""
 "Project-Id-Version: kbattleship\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:36+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:46+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:03+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#: controller.cpp:50
+msgid "Computer"
+msgstr ""
 
 #: playerentity.cpp:167
 #, kde-format
@@ -29,6 +33,127 @@
 msgid "Your opponent disconnected from the game"
 msgstr ""
 
+#: playfield.cpp:163 playfield.cpp:185
+msgid "Shots"
+msgstr "Ergydion"
+
+#: playfield.cpp:164 playfield.cpp:186
+msgid "Hits"
+msgstr "Trawiadau"
+
+#: playfield.cpp:165 playfield.cpp:187
+msgid "Misses"
+msgstr ""
+
+#: playfield.cpp:205
+msgid "You win!"
+msgstr ""
+
+#: playfield.cpp:207
+msgid "You win. Excellent!"
+msgstr ""
+
+#: playfield.cpp:211
+msgid "You lose."
+msgstr ""
+
+#: playfield.cpp:213
+msgid "You lose. Try harder next time!"
+msgstr ""
+
+#: playfield.cpp:223
+msgid "Change Nickname"
+msgstr ""
+
+#: playfield.cpp:223
+msgid "Enter new nickname:"
+msgstr ""
+
+#: playfield.cpp:244
+msgid "Restart game"
+msgstr ""
+
+#: playfield.cpp:245
+msgid "Your opponent has requested to restart the game. Do you accept?"
+msgstr ""
+
+#: playfield.cpp:254
+msgid ""
+"Your opponent is using a pre-KDE4 version of Naval Battle. Note that, "
+"according to the rules enforced by old clients, ships cannot be placed "
+"adjacent to one another."
+msgstr ""
+
+#: playfield.cpp:267
+msgid "Enemy has shot. Shoot now!"
+msgstr ""
+
+#: playfield.cpp:271
+msgid "Waiting for enemy to shoot..."
+msgstr ""
+
+#: playfield.cpp:280
+msgid "Ships placed. Now shoot on the enemy field!"
+msgstr ""
+
+#: playfield.cpp:283
+msgid "Waiting for other player to start the game..."
+msgstr ""
+
+#: playfield.cpp:287
+msgid "Waiting for other player to place his ships..."
+msgstr ""
+
+#: playfield.cpp:296
+msgid "Place your ships. Use the right mouse button to rotate them."
+msgstr ""
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Kyfieithu: Thierry Vignaud, KD, dylunio, ,Launchpad Contributions:"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
+
+#. i18n: file: kbattleshipui.rc:27
+#. i18n: ectx: ToolBar (gameToolbar)
+#: rc.cpp:5
+msgid "Game Toolbar"
+msgstr ""
+
+#. i18n: file: kbattleship.kcfg:9
+#. i18n: ectx: label, entry (Hostname), group (network)
+#: rc.cpp:8
+msgid "Default hostname for multiplayer games."
+msgstr ""
+
+#. i18n: file: kbattleship.kcfg:13
+#. i18n: ectx: label, entry (Port), group (network)
+#: rc.cpp:11
+msgid "Default port for multiplayer games."
+msgstr ""
+
+#. i18n: file: kbattleship.kcfg:19
+#. i18n: ectx: label, entry (Nickname), group (general)
+#: rc.cpp:14
+msgid "User nickname."
+msgstr ""
+
+#. i18n: file: kbattleship.kcfg:22
+#. i18n: ectx: label, entry (EnableSounds), group (general)
+#: rc.cpp:17
+msgid "Whether sound effects should be played."
+msgstr ""
+
+#. i18n: file: kbattleship.kcfg:26
+#. i18n: ectx: label, entry (Difficulty), group (general)
+#: rc.cpp:20
+msgid "Game difficulty."
+msgstr ""
+
 #: simplemenu.cpp:46
 msgid "Single Player"
 msgstr ""
@@ -45,6 +170,74 @@
 msgid "Remote player"
 msgstr ""
 
+#: mainwindow.cpp:76
+msgid "&Single Player"
+msgstr ""
+
+#: mainwindow.cpp:79
+msgid "&Host Game..."
+msgstr ""
+
+#: mainwindow.cpp:82
+msgid "&Connect to Game..."
+msgstr ""
+
+#: mainwindow.cpp:85
+msgid "Change &Nickname..."
+msgstr ""
+
+#: mainwindow.cpp:88
+msgid "&Play Sounds"
+msgstr "Chwa&rae Sain"
+
+#: mainwindow.cpp:92
+msgid "Show End-of-Game Message"
+msgstr ""
+
+#: mainwindow.cpp:97
+msgid "Show &Left Grid"
+msgstr ""
+
+#: mainwindow.cpp:101
+msgid "Show &Right Grid"
+msgstr ""
+
+#: networkdialog.cpp:53
+msgid "&Nickname:"
+msgstr ""
+
+#: networkdialog.cpp:66
+msgid "&Join game:"
+msgstr ""
+
+#: networkdialog.cpp:81
+msgid "&Hostname:"
+msgstr ""
+
+#: networkdialog.cpp:94 networkdialog.cpp:124
+msgid "&Port:"
+msgstr "&Porth:"
+
+#: networkdialog.cpp:109
+msgid "&Enter server address manually"
+msgstr ""
+
+#: networkdialog.cpp:139
+msgid "Network Parameters"
+msgstr ""
+
+#: networkdialog.cpp:204
+msgid "Connecting to remote host..."
+msgstr ""
+
+#: networkdialog.cpp:211
+msgid "Waiting for an incoming connection..."
+msgstr ""
+
+#: networkdialog.cpp:234
+msgid "Could not connect to host"
+msgstr ""
+
 #: main.cpp:24
 msgid "Naval Battle"
 msgstr ""
@@ -194,196 +387,3 @@
 #: main.cpp:51
 msgid "URL of a Naval Battle game server to connect to after startup"
 msgstr ""
-
-#: mainwindow.cpp:76
-msgid "&Single Player"
-msgstr ""
-
-#: mainwindow.cpp:79
-msgid "&Host Game..."
-msgstr ""
-
-#: mainwindow.cpp:82
-msgid "&Connect to Game..."
-msgstr ""
-
-#: mainwindow.cpp:85
-msgid "Change &Nickname..."
-msgstr ""
-
-#: mainwindow.cpp:88
-msgid "&Play Sounds"
-msgstr "Chwa&rae Sain"
-
-#: mainwindow.cpp:92
-msgid "Show End-of-Game Message"
-msgstr ""
-
-#: mainwindow.cpp:97
-msgid "Show &Left Grid"
-msgstr ""
-
-#: mainwindow.cpp:101
-msgid "Show &Right Grid"
-msgstr ""
-
-#: playfield.cpp:163 playfield.cpp:185
-msgid "Shots"
-msgstr "Ergydion"
-
-#: playfield.cpp:164 playfield.cpp:186
-msgid "Hits"
-msgstr "Trawiadau"
-
-#: playfield.cpp:165 playfield.cpp:187
-msgid "Misses"
-msgstr ""
-
-#: playfield.cpp:205
-msgid "You win!"
-msgstr ""
-
-#: playfield.cpp:207
-msgid "You win. Excellent!"
-msgstr ""
-
-#: playfield.cpp:211
-msgid "You lose."
-msgstr ""
-
-#: playfield.cpp:213
-msgid "You lose. Try harder next time!"
-msgstr ""
-
-#: playfield.cpp:223
-msgid "Change Nickname"
-msgstr ""
-
-#: playfield.cpp:223
-msgid "Enter new nickname:"
-msgstr ""
-
-#: playfield.cpp:244
-msgid "Restart game"
-msgstr ""
-
-#: playfield.cpp:245
-msgid "Your opponent has requested to restart the game. Do you accept?"
-msgstr ""
-
-#: playfield.cpp:254
-msgid ""
-"Your opponent is using a pre-KDE4 version of Naval Battle. Note that, "
-"according to the rules enforced by old clients, ships cannot be placed "
-"adjacent to one another."
-msgstr ""
-
-#: playfield.cpp:267
-msgid "Enemy has shot. Shoot now!"
-msgstr ""
-
-#: playfield.cpp:271
-msgid "Waiting for enemy to shoot..."
-msgstr ""
-
-#: playfield.cpp:280
-msgid "Ships placed. Now shoot on the enemy field!"
-msgstr ""
-
-#: playfield.cpp:283
-msgid "Waiting for other player to start the game..."
-msgstr ""
-
-#: playfield.cpp:287
-msgid "Waiting for other player to place his ships..."
-msgstr ""
-
-#: playfield.cpp:296
-msgid "Place your ships. Use the right mouse button to rotate them."
-msgstr ""
-
-#: networkdialog.cpp:53
-msgid "&Nickname:"
-msgstr ""
-
-#: networkdialog.cpp:66
-msgid "&Join game:"
-msgstr ""
-
-#: networkdialog.cpp:81
-msgid "&Hostname:"
-msgstr ""
-
-#: networkdialog.cpp:94 networkdialog.cpp:124
-msgid "&Port:"
-msgstr "&Porth:"
-
-#: networkdialog.cpp:109
-msgid "&Enter server address manually"
-msgstr ""
-
-#: networkdialog.cpp:139
-msgid "Network Parameters"
-msgstr ""
-
-#: networkdialog.cpp:204
-msgid "Connecting to remote host..."
-msgstr ""
-
-#: networkdialog.cpp:211
-msgid "Waiting for an incoming connection..."
-msgstr ""
-
-#: networkdialog.cpp:234
-msgid "Could not connect to host"
-msgstr ""
-
-#: controller.cpp:50
-msgid "Computer"
-msgstr ""
-
-#: rc.cpp:19
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "Kyfieithu: Thierry Vignaud, KD, dylunio, ,Launchpad Contributions:"
-
-#: rc.cpp:20
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
-
-#. i18n: file: kbattleshipui.rc:27
-#. i18n: ectx: ToolBar (gameToolbar)
-#: rc.cpp:18 rc.cpp:23
-msgid "Game Toolbar"
-msgstr ""
-
-#. i18n: file: kbattleship.kcfg:9
-#. i18n: ectx: label, entry (Hostname), group (network)
-#: rc.cpp:3 rc.cpp:26
-msgid "Default hostname for multiplayer games."
-msgstr ""
-
-#. i18n: file: kbattleship.kcfg:13
-#. i18n: ectx: label, entry (Port), group (network)
-#: rc.cpp:6 rc.cpp:29
-msgid "Default port for multiplayer games."
-msgstr ""
-
-#. i18n: file: kbattleship.kcfg:19
-#. i18n: ectx: label, entry (Nickname), group (general)
-#: rc.cpp:9 rc.cpp:32
-msgid "User nickname."
-msgstr ""
-
-#. i18n: file: kbattleship.kcfg:22
-#. i18n: ectx: label, entry (EnableSounds), group (general)
-#: rc.cpp:12 rc.cpp:35
-msgid "Whether sound effects should be played."
-msgstr ""
-
-#. i18n: file: kbattleship.kcfg:26
-#. i18n: ectx: label, entry (Difficulty), group (general)
-#: rc.cpp:15 rc.cpp:38
-msgid "Game difficulty."
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kblackbox.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kblackbox.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kblackbox.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kblackbox.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kblackbox\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:36+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:47+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:03+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kbblevelconfigurationwidget.cpp:35
 msgctxt "A number between 1 and 99 is displayed in front of it."
@@ -572,19 +572,19 @@
 msgid "Artist"
 msgstr ""
 
-#: rc.cpp:16
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: dylunio, KD, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:17
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "KD wrth KGyfieithu,,"
 
 #. i18n: file: kblackbox.kcfg:9
 #. i18n: ectx: label, entry (theme), group (KBlackBox Setup)
-#: rc.cpp:3 rc.cpp:20
+#: rc.cpp:5
 msgid ""
 "File of the current theme of the graphic elements. (SVGZ file with path and "
 "file extension)"
@@ -592,24 +592,24 @@
 
 #. i18n: file: kblackbox.kcfg:13
 #. i18n: ectx: label, entry (balls), group (KBlackBox Setup)
-#: rc.cpp:6 rc.cpp:23
+#: rc.cpp:8
 msgid "Number of balls for custom difficulty level"
 msgstr ""
 
 #. i18n: file: kblackbox.kcfg:17
 #. i18n: ectx: label, entry (columns), group (KBlackBox Setup)
-#: rc.cpp:9 rc.cpp:26
+#: rc.cpp:11
 msgid "Number of columns of the board for custom difficulty level"
 msgstr ""
 
 #. i18n: file: kblackbox.kcfg:21
 #. i18n: ectx: label, entry (rows), group (KBlackBox Setup)
-#: rc.cpp:12 rc.cpp:29
+#: rc.cpp:14
 msgid "Number of rows of the board for custom difficuty level"
 msgstr ""
 
 #. i18n: file: kblackbox.kcfg:25
 #. i18n: ectx: label, entry (level), group (KBlackBox Setup)
-#: rc.cpp:15 rc.cpp:32
+#: rc.cpp:17
 msgid "Difficulty level"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kblankscrn.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kblankscrn.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kblankscrn.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kblankscrn.po	2012-04-18 08:59:37.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2012-01-10 18:53+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:45+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: blankscrn.cpp:33
 msgid "KBlankScreen"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kbounce.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kbounce.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kbounce.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kbounce.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,56 +9,56 @@
 msgstr ""
 "Project-Id-Version: kbounce\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:37+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:47+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: backgroundselector.cpp:110
 msgid "No background pictures found."
 msgstr ""
 
-#: gamewidget.cpp:407
+#: gamewidget.cpp:404
 msgid ""
 "Welcome to KBounce.\n"
 " Click to start a game"
 msgstr ""
 
-#: gamewidget.cpp:410
+#: gamewidget.cpp:407
 msgid "Paused"
 msgstr ""
 
-#: gamewidget.cpp:413
+#: gamewidget.cpp:410
 #, kde-format
 msgid "You have successfully cleared more than %1% of the board\n"
 msgstr ""
 
-#: gamewidget.cpp:414
+#: gamewidget.cpp:411
 #, kde-format
 msgid "%1 points: %2 points per remaining life\n"
 msgstr ""
 
-#: gamewidget.cpp:415
+#: gamewidget.cpp:412
 #, kde-format
 msgid "%1 points: Bonus\n"
 msgstr "%1 o bwyntiau: Bonws\n"
 
-#: gamewidget.cpp:416
+#: gamewidget.cpp:413
 #, kde-format
 msgid "%1 points: Total score for this level\n"
 msgstr "%1 o bwyntiau: Sgôr cyfan am y lefel yma\n"
 
-#: gamewidget.cpp:417
+#: gamewidget.cpp:414
 #, kde-format
 msgid "On to level %1. Remember you get %2 lives this time!"
 msgstr "Ymlaen i lefel %1. Cofiwch - byddwch yn cael %2 o fywydau y tro yma!"
 
-#: gamewidget.cpp:420
+#: gamewidget.cpp:417
 msgid ""
 "Game over.\n"
 " Click to start a game"
@@ -171,60 +171,60 @@
 msgid "Background"
 msgstr ""
 
-#: rc.cpp:25
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:26
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kbounceui.rc:17
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:24 rc.cpp:29
+#: rc.cpp:5
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: backgroundselector.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, KBounceBackgroundSelector)
-#: rc.cpp:3 rc.cpp:32
+#: rc.cpp:8
 msgid "kbouncebackgroundselector"
 msgstr ""
 
 #. i18n: file: backgroundselector.ui:24
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseRandomBackgroundPictures)
-#: rc.cpp:6 rc.cpp:35
+#: rc.cpp:11
 msgid "Enable random pictures as background"
 msgstr ""
 
 #. i18n: file: backgroundselector.ui:54
 #. i18n: ectx: property (text), widget (QLabel, backgoundPicturePathLabel)
-#: rc.cpp:9 rc.cpp:38
+#: rc.cpp:14
 msgid "Choose picture path:"
 msgstr ""
 
 #. i18n: file: backgroundselector.ui:75
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:12 rc.cpp:41
+#: rc.cpp:17
 msgid "Preview"
 msgstr ""
 
 #. i18n: file: kbounce.kcfg:14
 #. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:15 rc.cpp:44
+#: rc.cpp:20
 msgid "The graphical theme to be used."
 msgstr ""
 
-#. i18n: file: kbounce.kcfg:17
+#. i18n: file: kbounce.kcfg:18
 #. i18n: ectx: label, entry (level), group (General)
-#: rc.cpp:18 rc.cpp:47
+#: rc.cpp:23
 msgid "Difficulty level"
 msgstr ""
 
-#. i18n: file: kbounce.kcfg:23
+#. i18n: file: kbounce.kcfg:24
 #. i18n: ectx: label, entry (PlaySounds), group (Sound)
-#: rc.cpp:21 rc.cpp:50
+#: rc.cpp:26
 msgid "Whether game sounds are played."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kbruch.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kbruch.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kbruch.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kbruch.po	2012-04-18 08:59:39.000000000 +0000
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: kbruch\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-09 14:18+0000\n"
-"PO-Revision-Date: 2012-03-12 22:04+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-16 23:10+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,8 +13,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: AppMenuWidget.cpp:113
 msgid "KBruch modes:"
@@ -32,185 +32,10 @@
 msgid "Open learning KBruch"
 msgstr ""
 
-#: AppMenuWidget.cpp:141
+#: AppMenuWidget.cpp:141 FractionRingWidget.cpp:63
 msgid "Learning"
 msgstr ""
 
-#: taskview.cpp:108
-msgid "Enter the integer part of the fraction"
-msgstr ""
-
-#: ExerciseMixedNumbers.cpp:120
-msgid "Enter the numerator of the fraction"
-msgstr ""
-
-#: ExerciseMixedNumbers.cpp:138
-msgid "Enter the denominator of the fraction"
-msgstr ""
-
-#: exerciseconvert.cpp:139 exerciseconvert.cpp:189 exerciseconvert.cpp:430
-#: exercisefactorize.cpp:186 exercisefactorize.cpp:292
-#: exercisefactorize.cpp:513 exercisepercentage.cpp:121
-#: exercisepercentage.cpp:175 exercisepercentage.cpp:405 taskview.cpp:157
-#: taskview.cpp:265 taskview.cpp:479
-msgid "&Check"
-msgstr ""
-
-#: exerciseconvert.cpp:141 exerciseconvert.cpp:391 exercisefactorize.cpp:187
-#: exercisefactorize.cpp:415 exercisepercentage.cpp:123
-#: exercisepercentage.cpp:368
-msgid ""
-"Click on this button to check your result. The button will not work if you "
-"have not entered a result yet."
-msgstr ""
-"Cliciwch ar y botwm yma i wirio eich canlyniad.  Ni fydd y botwm yn gweithio "
-"os nad ydych wedi rhoi canlyniad eto."
-
-#: exercisecompare.cpp:131 exercisecompare.cpp:298 exerciseconvert.cpp:149
-#: exercisefactorize.cpp:177 exercisepercentage.cpp:131 taskview.cpp:167
-msgid "&Skip"
-msgstr ""
-
-#: exercisecompare.cpp:132 exerciseconvert.cpp:150 exercisefactorize.cpp:178
-#: exercisepercentage.cpp:132
-msgid "Click on this button to skip this question."
-msgstr ""
-
-#: ExerciseMixedNumbers.cpp:177 mainqtwidget.cpp:523
-msgid ""
-"In this exercise you have to convert a mixed number into a ratio and vice "
-"versa."
-msgstr ""
-
-#: ExerciseMixedNumbers.cpp:178
-msgid ""
-"In this exercise you have to convert a mixed number into a ratio and vice "
-"versa. Do not forget to reduce the result."
-msgstr ""
-
-#: taskview.cpp:159 taskview.cpp:419
-msgid ""
-"Click this button to check your result. The button will not work if you have "
-"not entered a result yet."
-msgstr ""
-
-#: taskview.cpp:299
-msgid "Click this button to get the next question."
-msgstr ""
-
-#: exerciseconvert.cpp:426 exercisefactorize.cpp:509
-#: exercisepercentage.cpp:401 taskview.cpp:475
-msgid "N&ext"
-msgstr ""
-
-#: taskview.cpp:392
-msgid ""
-"You entered 0 as the denominator. This means division by zero, which is not "
-"allowed. This question will be counted as not correctly solved."
-msgstr ""
-
-#: taskview.cpp:402
-msgid ""
-"You entered the correct result, but not in the mixed number notation. This "
-"question will be counted as not correctly solved."
-msgstr ""
-
-#: taskview.cpp:399
-msgid ""
-"You entered the correct result, but not reduced. This question will be "
-"counted as not correctly solved."
-msgstr ""
-
-#: FractionRingWidget.cpp:113 FractionRingWidget.cpp:118
-msgctxt ""
-"Expands the ratio shown on the left by the given factor. Please note, "
-"expanding is not the same as multiplying. For example, expanding a ratio by "
-"2 basically means multiplying the ratio with 2/2 and not with 2/1!"
-msgid "Expand"
-msgstr ""
-
-#: FractionRingWidget.cpp:144 mainqtwidget.cpp:494
-msgid "New"
-msgstr ""
-
-#: FractionRingWidget.cpp:197 mainqtwidget.cpp:526
-msgctxt "@action opens a new question"
-msgid "&New"
-msgstr ""
-
-#: FractionRingWidget.cpp:203 mainqtwidget.cpp:541
-msgctxt "@action go to the main screen"
-msgid "Back"
-msgstr ""
-
-#: FractionRingWidget.cpp:208
-msgctxt "@action opens hint"
-msgid "Hint"
-msgstr ""
-
-#. i18n: file: taskcolorsbase.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: FractionRingWidget.cpp:236 mainqtwidget.cpp:795 rc.cpp:132 rc.cpp:167
-msgid "Colors"
-msgstr "Lliwiau"
-
-#: FractionRingWidget.cpp:364 FractionRingWidget.cpp:396
-msgid ""
-"Now the parts of the inside ring and outside ring have the same size, and we "
-"can add the fractions!\n"
-"\n"
-"This is called finding the main denominator. The main denominator divides "
-"the rings into equal parts."
-msgstr ""
-
-#: FractionRingWidget.cpp:371 FractionRingWidget.cpp:403
-msgid "There is a smaller main denominator. Can you find it?"
-msgstr ""
-
-#: FractionRingWidget.cpp:378
-#, kde-format
-msgid ""
-"You have just expanded the first fraction by %1. Our main goal is to make "
-"all parts be the same size. Try expanding the first fraction by %2 and the "
-"second fraction by %3."
-msgstr ""
-
-#: FractionRingWidget.cpp:410
-#, kde-format
-msgid ""
-"You have just expanded the second fraction by %1. Our main goal is to make "
-"all parts be the same size. Try expanding the first fraction by %2 and the "
-"second fraction by %3."
-msgstr ""
-
-#: FractionRingWidget.cpp:449
-#, kde-format
-msgctxt "Inserted as %1 in the message below."
-msgid "%2 of 1 painted part."
-msgid_plural "%2 of %1 painted parts."
-msgstr[0] ""
-msgstr[1] ""
-
-#: FractionRingWidget.cpp:452
-#, kde-format
-msgctxt "Inserted as %2 in the message below."
-msgid "%2 of 1 painted part."
-msgid_plural "%2 of %1 painted parts."
-msgstr[0] ""
-msgstr[1] ""
-
-#: FractionRingWidget.cpp:455
-#, kde-format
-msgctxt "%1 and %2 are the two messages translated above."
-msgid ""
-"The outside ring represents the left fraction. %1\n"
-"\n"
-"The inside ring represents the right fraction. %2\n"
-"\n"
-"The 'Expand' spinboxes expand each fraction. Try to change one of the "
-"spinbox values!"
-msgstr ""
-
 #: exercisecompare.cpp:97
 msgid ">"
 msgstr ""
@@ -235,7 +60,18 @@
 msgid "Click on this button to select the 'equals' sign."
 msgstr ""
 
-#: exercisecompare.cpp:147
+#: exercisecompare.cpp:131 exercisecompare.cpp:294 exerciseconvert.cpp:149
+#: exercisefactorize.cpp:179 ExerciseMixedNumbers.cpp:170
+#: exercisepercentage.cpp:131 taskview.cpp:166
+msgid "&Skip"
+msgstr ""
+
+#: exercisecompare.cpp:132 exerciseconvert.cpp:150 exercisefactorize.cpp:180
+#: ExerciseMixedNumbers.cpp:171 exercisepercentage.cpp:132
+msgid "Click on this button to skip this question."
+msgstr ""
+
+#: exercisecompare.cpp:147 mainqtwidget.cpp:511
 msgid "In this exercise you have to compare two given fractions."
 msgstr ""
 
@@ -245,23 +81,43 @@
 "correct comparison sign."
 msgstr ""
 
-#: exercisecompare.cpp:263 exercisecompare.cpp:264 exercisecompare.cpp:265
+#: exercisecompare.cpp:260 exercisecompare.cpp:261 exercisecompare.cpp:262
 msgid "Click on this button to check your result."
 msgstr "Cliciwch ar y botwm yma i wirio'r canlyniad."
 
-#: exercisecompare.cpp:313 exercisecompare.cpp:327 exercisecompare.cpp:341
+#: exercisecompare.cpp:309 exercisecompare.cpp:323 exercisecompare.cpp:337
 msgid "&Next"
 msgstr ""
 
-#: exerciseconvert.cpp:103 taskview.cpp:121
+#: exerciseconvert.cpp:103 taskview.cpp:120
 msgid "Enter the numerator of your result"
 msgstr "Rhowch rhifiadur eich canlyniad"
 
-#: exerciseconvert.cpp:121 taskview.cpp:139
+#: exerciseconvert.cpp:121 taskview.cpp:138
 msgid "Enter the denominator of your result"
 msgstr "Rhowch enwadur eich canlyniad"
 
-#: exerciseconvert.cpp:160
+#: exerciseconvert.cpp:139 exerciseconvert.cpp:188 exerciseconvert.cpp:425
+#: exercisefactorize.cpp:188 exercisefactorize.cpp:293
+#: exercisefactorize.cpp:522 ExerciseMixedNumbers.cpp:160
+#: ExerciseMixedNumbers.cpp:201 ExerciseMixedNumbers.cpp:258
+#: exercisepercentage.cpp:121 exercisepercentage.cpp:175
+#: exercisepercentage.cpp:403 taskview.cpp:156 taskview.cpp:261
+#: taskview.cpp:458
+msgid "&Check"
+msgstr ""
+
+#: exerciseconvert.cpp:141 exerciseconvert.cpp:387 exercisefactorize.cpp:189
+#: exercisefactorize.cpp:420 ExerciseMixedNumbers.cpp:162
+#: exercisepercentage.cpp:123 exercisepercentage.cpp:367
+msgid ""
+"Click on this button to check your result. The button will not work if you "
+"have not entered a result yet."
+msgstr ""
+"Cliciwch ar y botwm yma i wirio eich canlyniad.  Ni fydd y botwm yn gweithio "
+"os nad ydych wedi rhoi canlyniad eto."
+
+#: exerciseconvert.cpp:160 mainqtwidget.cpp:517
 msgid "In this exercise you have to convert a number into a fraction."
 msgstr "Yn yr ymarfer yma, rhaid i chi drosi rhif i ffracsiwn."
 
@@ -271,101 +127,106 @@
 "entering a numerator and denominator. Do not forget to reduce the result."
 msgstr ""
 
-#: exerciseconvert.cpp:327 exercisefactorize.cpp:361
-#: exercisepercentage.cpp:334
+#: exerciseconvert.cpp:325 exercisefactorize.cpp:369
+#: exercisepercentage.cpp:333
 msgid "Click on this button to get to the next question."
 msgstr ""
 
-#: exerciseconvert.cpp:374
+#: exerciseconvert.cpp:370
 msgid ""
 "You entered a 0 as the denominator. This means division by zero, which is "
 "not allowed. This question will be counted as not correctly solved."
 msgstr ""
 
-#: exerciseconvert.cpp:380
+#: exerciseconvert.cpp:376
 msgid ""
 "You entered the correct result, but not reduced.\n"
 "Always enter your results as reduced. This question will be counted as not "
 "correctly solved."
 msgstr ""
 
-#: exercisefactorize.cpp:170
+#: exerciseconvert.cpp:421 exercisefactorize.cpp:518
+#: ExerciseMixedNumbers.cpp:299 exercisepercentage.cpp:399 taskview.cpp:454
+msgid "N&ext"
+msgstr ""
+
+#: exercisefactorize.cpp:172
 msgid "Backspace"
 msgstr ""
 
-#: exercisefactorize.cpp:214
+#: exercisefactorize.cpp:216
 msgid "2"
 msgstr "2"
 
-#: exercisefactorize.cpp:215
+#: exercisefactorize.cpp:217
 msgid "3"
 msgstr "3"
 
-#: exercisefactorize.cpp:216
+#: exercisefactorize.cpp:218
 msgid "5"
 msgstr "5"
 
-#: exercisefactorize.cpp:217
+#: exercisefactorize.cpp:219
 msgid "7"
 msgstr "7"
 
-#: exercisefactorize.cpp:218
+#: exercisefactorize.cpp:220
 msgid "11"
 msgstr "11"
 
-#: exercisefactorize.cpp:219
+#: exercisefactorize.cpp:221
 msgid "13"
 msgstr "13"
 
-#: exercisefactorize.cpp:220
+#: exercisefactorize.cpp:222
 msgid "17"
 msgstr "17"
 
-#: exercisefactorize.cpp:221
+#: exercisefactorize.cpp:223
 msgid "19"
 msgstr "19"
 
-#: exercisefactorize.cpp:232
+#: exercisefactorize.cpp:234
 msgid "Add prime factor 2."
 msgstr "Ychwanegu ffactor gysefin 2."
 
-#: exercisefactorize.cpp:233
+#: exercisefactorize.cpp:235
 msgid "Add prime factor 3."
 msgstr "Ychwanegu ffactor gysefin 3."
 
-#: exercisefactorize.cpp:234
+#: exercisefactorize.cpp:236
 msgid "Add prime factor 5."
 msgstr "Ychwanegu ffactor gysefin 5."
 
-#: exercisefactorize.cpp:235
+#: exercisefactorize.cpp:237
 msgid "Add prime factor 7."
 msgstr "Ychwanegu ffactor gysefin 7."
 
-#: exercisefactorize.cpp:236
+#: exercisefactorize.cpp:238
 msgid "Add prime factor 11."
 msgstr "Ychwanegu ffactor gysefin 11."
 
-#: exercisefactorize.cpp:237
+#: exercisefactorize.cpp:239
 msgid "Add prime factor 13."
 msgstr "Ychwanegu ffactor gysefin 13."
 
-#: exercisefactorize.cpp:238
+#: exercisefactorize.cpp:240
 msgid "Add prime factor 17."
 msgstr "Ychwanegu ffactor gysefin 17."
 
-#: exercisefactorize.cpp:239
+#: exercisefactorize.cpp:241
 msgid "Add prime factor 19."
 msgstr "Ychwanegu ffactor gysefin 19."
 
-#: exercisefactorize.cpp:244
+#: exercisefactorize.cpp:246
 msgid "Removes the last entered prime factor."
 msgstr "Gwaredu'r ffactor gysefin a roddwyd yn ddiwethaf."
 
-#: exercisefactorize.cpp:261
+#: exercisefactorize.cpp:263 mainqtwidget.cpp:529
 msgid "In this exercise you have to factorize a given number."
 msgstr "Yn yr ymarfer yma, rhaid i chi ffactorio rhif penodol."
 
-#: exercisefactorize.cpp:262
+#: exercisefactorize.cpp:264
 msgid ""
 "In this exercise you have to factorize a given number. You have to enter all "
 "prime factors of the number. You can add a prime factor by clicking on the "
@@ -375,7 +236,59 @@
 "entered prime factor."
 msgstr ""
 
-#: exercisepercentage.cpp:97 exercisepercentage.cpp:385
+#: ExerciseMixedNumbers.cpp:105 taskview.cpp:108
+msgid "Enter the integer part of the fraction"
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:120
+msgid "Enter the numerator of the fraction"
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:138
+msgid "Enter the denominator of the fraction"
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:177 mainqtwidget.cpp:523
+msgid ""
+"In this exercise you have to convert a mixed number into a ratio and vice "
+"versa."
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:178
+msgid ""
+"In this exercise you have to convert a mixed number into a ratio and vice "
+"versa. Do not forget to reduce the result."
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:257 taskview.cpp:158 taskview.cpp:399
+msgid ""
+"Click this button to check your result. The button will not work if you have "
+"not entered a result yet."
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:298 taskview.cpp:283
+msgid "Click this button to get the next question."
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:352 taskview.cpp:372
+msgid ""
+"You entered 0 as the denominator. This means division by zero, which is not "
+"allowed. This question will be counted as not correctly solved."
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:359 taskview.cpp:382
+msgid ""
+"You entered the correct result, but not in the mixed number notation. This "
+"question will be counted as not correctly solved."
+msgstr ""
+
+#: ExerciseMixedNumbers.cpp:362 taskview.cpp:379
+msgid ""
+"You entered the correct result, but not reduced. This question will be "
+"counted as not correctly solved."
+msgstr ""
+
+#: exercisepercentage.cpp:97 exercisepercentage.cpp:384
 #, kde-format
 msgctxt "%1 percentage of %2"
 msgid "%1% of %2 = "
@@ -385,7 +298,7 @@
 msgid "Enter the result of percentage question"
 msgstr ""
 
-#: exercisepercentage.cpp:146
+#: exercisepercentage.cpp:146 mainqtwidget.cpp:535
 msgid "In this exercise you have to work with percentage questions."
 msgstr ""
 
@@ -393,6 +306,96 @@
 msgid "In this exercise you have to enter the fraction of the given number."
 msgstr ""
 
+#: FractionRingWidget.cpp:115 FractionRingWidget.cpp:120
+msgctxt ""
+"Expands the ratio shown on the left by the given factor. Please note, "
+"expanding is not the same as multiplying. For example, expanding a ratio by "
+"2 basically means multiplying the ratio with 2/2 and not with 2/1!"
+msgid "Expand"
+msgstr ""
+
+#: FractionRingWidget.cpp:146 mainqtwidget.cpp:490
+msgid "New"
+msgstr ""
+
+#: FractionRingWidget.cpp:199 mainqtwidget.cpp:539
+msgctxt "@action opens a new question"
+msgid "&New"
+msgstr ""
+
+#: FractionRingWidget.cpp:205 mainqtwidget.cpp:554
+msgctxt "@action go to the main screen"
+msgid "Back"
+msgstr ""
+
+#: FractionRingWidget.cpp:210
+msgctxt "@action opens hint"
+msgid "Hint"
+msgstr ""
+
+#. i18n: file: taskcolorsbase.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: FractionRingWidget.cpp:238 mainqtwidget.cpp:804 rc.cpp:14
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: FractionRingWidget.cpp:361 FractionRingWidget.cpp:389
+msgid ""
+"Now the parts of the inside ring and outside ring have the same size, and we "
+"can add the fractions!\n"
+"\n"
+"This is called finding the main denominator. The main denominator divides "
+"the rings into equal parts."
+msgstr ""
+
+#: FractionRingWidget.cpp:367 FractionRingWidget.cpp:395
+msgid "There is a smaller main denominator. Can you find it?"
+msgstr ""
+
+#: FractionRingWidget.cpp:372
+#, kde-format
+msgid ""
+"You have just expanded the first fraction by %1. Our main goal is to make "
+"all parts be the same size. Try expanding the first fraction by %2 and the "
+"second fraction by %3."
+msgstr ""
+
+#: FractionRingWidget.cpp:400
+#, kde-format
+msgid ""
+"You have just expanded the second fraction by %1. Our main goal is to make "
+"all parts be the same size. Try expanding the first fraction by %2 and the "
+"second fraction by %3."
+msgstr ""
+
+#: FractionRingWidget.cpp:438
+#, kde-format
+msgctxt "Inserted as %1 in the message below."
+msgid "%2 of 1 painted part."
+msgid_plural "%2 of %1 painted parts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: FractionRingWidget.cpp:441
+#, kde-format
+msgctxt "Inserted as %2 in the message below."
+msgid "%2 of 1 painted part."
+msgid_plural "%2 of %1 painted parts."
+msgstr[0] ""
+msgstr[1] ""
+
+#: FractionRingWidget.cpp:444
+#, kde-format
+msgctxt "%1 and %2 are the two messages translated above."
+msgid ""
+"The outside ring represents the left fraction. %1\n"
+"\n"
+"The inside ring represents the right fraction. %2\n"
+"\n"
+"The 'Expand' spinboxes expand each fraction. Try to change one of the "
+"spinbox values!"
+msgstr ""
+
 #: kbruch.cpp:45
 msgid "Learn calculating with fractions"
 msgstr "Dysgu cyfrifiannu efo ffracsiynau"
@@ -433,31 +436,31 @@
 msgid "Tiago Porangaba"
 msgstr ""
 
-#: mainqtwidget.cpp:122
+#: mainqtwidget.cpp:117
 msgid "Question:"
 msgstr ""
 
-#: mainqtwidget.cpp:123
+#: mainqtwidget.cpp:118
 msgid "Answer:"
 msgstr ""
 
-#: mainqtwidget.cpp:125
+#: mainqtwidget.cpp:119
 msgid "Operations:"
 msgstr "Gweithrediadau :"
 
-#: mainqtwidget.cpp:131 mainqtwidget.cpp:897
+#: mainqtwidget.cpp:125 mainqtwidget.cpp:905
 msgid "Arithmetic"
 msgstr ""
 
-#: mainqtwidget.cpp:169
+#: mainqtwidget.cpp:167
 msgid "Options:"
 msgstr ""
 
-#: mainqtwidget.cpp:170
+#: mainqtwidget.cpp:168
 msgid "Set the options to solve the exercises."
 msgstr ""
 
-#: mainqtwidget.cpp:171
+#: mainqtwidget.cpp:169
 msgid ""
 "This part of the window shows the options to solve the exercises. Use the "
 "handle between the options and main window to change the size of this window "
@@ -465,87 +468,87 @@
 "window."
 msgstr ""
 
-#: mainqtwidget.cpp:175 mainqtwidget.cpp:186 mainqtwidget.cpp:197
+#: mainqtwidget.cpp:173 mainqtwidget.cpp:184
 msgid "Mixed number:"
 msgstr ""
 
-#: mainqtwidget.cpp:176
+#: mainqtwidget.cpp:174
 msgid ""
 "Set if the fractions will appear as mixed numbers or not in the question "
 "expression (mixed number example: 1 4/5 = 9/5 )."
 msgstr ""
 
-#: mainqtwidget.cpp:187
+#: mainqtwidget.cpp:185
 msgid ""
 "Set if the fractions will appear as mixed numbers or not in the answer "
 "(mixed number example: 1 4/5 = 9/5 )."
 msgstr ""
 
-#: mainqtwidget.cpp:208
+#: mainqtwidget.cpp:195
 msgid "Addition:"
 msgstr ""
 
-#: mainqtwidget.cpp:209
+#: mainqtwidget.cpp:196
 msgid "Check this to use addition operator."
 msgstr ""
 
-#: mainqtwidget.cpp:218
+#: mainqtwidget.cpp:205
 msgid "Subtraction:"
 msgstr ""
 
-#: mainqtwidget.cpp:219
+#: mainqtwidget.cpp:206
 msgid "Check this to use subtraction operator."
 msgstr ""
 
-#: mainqtwidget.cpp:228
+#: mainqtwidget.cpp:215
 msgid "Multiplication:"
 msgstr ""
 
-#: mainqtwidget.cpp:229
+#: mainqtwidget.cpp:216
 msgid "Check this to use multiplication operator."
 msgstr ""
 
-#: mainqtwidget.cpp:238
+#: mainqtwidget.cpp:225
 msgid "Division:"
 msgstr ""
 
-#: mainqtwidget.cpp:239
+#: mainqtwidget.cpp:226
 msgid "Check this to use division operator."
 msgstr ""
 
-#: mainqtwidget.cpp:248
+#: mainqtwidget.cpp:235
 msgid "Reduced form:"
 msgstr ""
 
-#: mainqtwidget.cpp:249
+#: mainqtwidget.cpp:236
 msgid "Check this to force the use of the reduced form."
 msgstr ""
 
-#: mainqtwidget.cpp:259
+#: mainqtwidget.cpp:246
 msgid "Number of terms:"
 msgstr ""
 
-#: mainqtwidget.cpp:260 mainqtwidget.cpp:270
+#: mainqtwidget.cpp:247 mainqtwidget.cpp:257
 msgid ""
 "The number of \n"
 "terms you want"
 msgstr ""
 
-#: mainqtwidget.cpp:271
+#: mainqtwidget.cpp:258
 msgid ""
 "Choose the number of terms (2, 3, 4 or 5) you \n"
 "want for calculating fractions."
 msgstr ""
 
-#: mainqtwidget.cpp:274
+#: mainqtwidget.cpp:261
 msgid "Maximum denominator:"
 msgstr ""
 
-#: mainqtwidget.cpp:284
+#: mainqtwidget.cpp:271
 msgid "The maximum number you can have as main denominator"
 msgstr "Y rhif mwyaf i'w gael fel prif enwadur"
 
-#: mainqtwidget.cpp:285
+#: mainqtwidget.cpp:272
 msgid ""
 "Choose the number which will be the maximum for the main denominator: 10, "
 "20, 30, 40 or 50."
@@ -553,30 +556,30 @@
 "Dewiswch y rhif fydd yr un mwyaf ar gyfer y prif enwadur: 10, 20, 30, 40 neu "
 "50."
 
-#: mainqtwidget.cpp:496
+#: mainqtwidget.cpp:492
 msgid "Reset statistics and set a new task."
 msgstr ""
 
-#: mainqtwidget.cpp:501
+#: mainqtwidget.cpp:497
 msgid "Back"
 msgstr ""
 
-#: mainqtwidget.cpp:503
+#: mainqtwidget.cpp:499
 msgid "Go back to Modes screen."
 msgstr ""
 
-#: mainqtwidget.cpp:508
+#: mainqtwidget.cpp:504
 msgid ""
 "\n"
 "\n"
 "Arithmetic"
 msgstr ""
 
-#: taskview.cpp:181
+#: mainqtwidget.cpp:505 taskview.cpp:176
 msgid "In this exercise you have to solve a given question with fractions."
 msgstr ""
 
-#: mainqtwidget.cpp:512
+#: mainqtwidget.cpp:510
 msgid ""
 "\n"
 "\n"
@@ -597,41 +600,41 @@
 "Mixed Numbers"
 msgstr ""
 
-#: mainqtwidget.cpp:520
+#: mainqtwidget.cpp:528
 msgid ""
 "\n"
 "\n"
 "Factorization"
 msgstr ""
 
-#: mainqtwidget.cpp:524
+#: mainqtwidget.cpp:534
 msgid ""
 "\n"
 "\n"
 "Percentage"
 msgstr ""
 
-#: mainqtwidget.cpp:531
+#: mainqtwidget.cpp:544
 msgctxt "@action opens a new question"
 msgid "New"
 msgstr ""
 
-#: mainqtwidget.cpp:536
+#: mainqtwidget.cpp:549
 msgctxt "@action go to the main screen"
 msgid "&Back"
 msgstr ""
 
-#: mainqtwidget.cpp:546
+#: mainqtwidget.cpp:559
 msgctxt "Arithmetic Exercise"
 msgid "Arithmetic"
 msgstr ""
 
-#: mainqtwidget.cpp:551
+#: mainqtwidget.cpp:564
 msgctxt "Comparison Exercise"
 msgid "Comparison"
 msgstr ""
 
-#: mainqtwidget.cpp:556
+#: mainqtwidget.cpp:569
 msgctxt "Conversion Exercise"
 msgid "Conversion"
 msgstr ""
@@ -641,29 +644,29 @@
 msgid "MixedNumbers"
 msgstr ""
 
-#: mainqtwidget.cpp:561
+#: mainqtwidget.cpp:579
 msgctxt "Factorization Exercise"
 msgid "Factorization"
 msgstr ""
 
-#: mainqtwidget.cpp:566
+#: mainqtwidget.cpp:584
 msgctxt "Percentage Exercise"
 msgid "Percentage"
 msgstr ""
 
-#: mainqtwidget.cpp:798
+#: mainqtwidget.cpp:807
 msgid "Fonts"
 msgstr ""
 
-#: mainqtwidget.cpp:882
+#: mainqtwidget.cpp:889
 msgid "Percentage"
 msgstr ""
 
-#: mainqtwidget.cpp:912
+#: mainqtwidget.cpp:921
 msgid "Comparison"
 msgstr "Cymharu"
 
-#: mainqtwidget.cpp:927
+#: mainqtwidget.cpp:937
 msgid "Conversion"
 msgstr "Trosi"
 
@@ -671,16 +674,16 @@
 msgid "Mixed Numbers"
 msgstr ""
 
-#: mainqtwidget.cpp:942
+#: mainqtwidget.cpp:969
 msgid "Factorization"
 msgstr "Ffactorio"
 
-#: rc.cpp:154
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, ,Launchpad Contributions:,Kevin Donnelly"
 
-#: rc.cpp:155
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
@@ -691,163 +694,157 @@
 #. i18n: ectx: Menu (file)
 #. i18n: file: kbruchui.rc:5
 #. i18n: ectx: Menu (file)
-#. i18n: file: AppMenuWidgetui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: FractionRingWidgetui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kbruchui.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:6 rc.cpp:129 rc.cpp:158 rc.cpp:161 rc.cpp:164
+#: rc.cpp:5 rc.cpp:8 rc.cpp:11
 msgid "&File"
 msgstr ""
 
 #. i18n: file: taskcolorsbase.ui:28
 #. i18n: ectx: property (text), widget (QLabel, numberLabel)
-#: rc.cpp:135 rc.cpp:170
+#: rc.cpp:17
 msgid "&Number:"
 msgstr ""
 
 #. i18n: file: taskcolorsbase.ui:38
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_numberColor)
-#: rc.cpp:138 rc.cpp:173
+#: rc.cpp:20
 msgid "Change the color of the numbers"
 msgstr "Newid lliw y rhifau"
 
 #. i18n: file: taskcolorsbase.ui:54
 #. i18n: ectx: property (text), widget (QLabel, operationLabel)
-#: rc.cpp:141 rc.cpp:176
+#: rc.cpp:23
 msgid "&Operation sign:"
 msgstr ""
 
 #. i18n: file: taskcolorsbase.ui:70
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_operationColor)
-#: rc.cpp:144 rc.cpp:179
+#: rc.cpp:26
 msgid "Change the color of the operation signs"
 msgstr "Newid lliw yr arwyddion gweithrediad"
 
 #. i18n: file: taskcolorsbase.ui:86
 #. i18n: ectx: property (text), widget (QLabel, fractionBarLabel)
-#: rc.cpp:147 rc.cpp:182
+#: rc.cpp:29
 msgid "&Fraction bar:"
 msgstr ""
 
 #. i18n: file: taskcolorsbase.ui:96
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_fractionBarColor)
-#: rc.cpp:150 rc.cpp:185
+#: rc.cpp:32
 msgid "Change the color of the fraction bar"
 msgstr "Newid lliw y bar ffracsiynau"
 
 #. i18n: file: taskfontsbase.ui:16
 #. i18n: ectx: property (toolTip), widget (KFontChooser, kcfg_taskFont)
-#: rc.cpp:153 rc.cpp:188
+#: rc.cpp:35
 msgid "Change the font of the numbers"
 msgstr "Newid wynebfathau'r rhifau"
 
 #. i18n: file: kbruch.kcfg:11
 #. i18n: ectx: label, entry, group (General)
-#: rc.cpp:9 rc.cpp:191
+#: rc.cpp:38
 msgid "Active exercise."
 msgstr "Ymarfer gweithredol."
 
 #. i18n: file: kbruch.kcfg:12
 #. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:12 rc.cpp:194
+#: rc.cpp:41
 msgid "Saves the active exercise's type."
 msgstr "Cadw math yr ymarfer gweithredol."
 
 #. i18n: file: kbruch.kcfg:19
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:15 rc.cpp:197
+#: rc.cpp:44
 msgid "Enable Addition"
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:20
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:18 rc.cpp:200
+#: rc.cpp:47
 msgid "Enable Addition for task generation."
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:24
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:21 rc.cpp:203
+#: rc.cpp:50
 msgid "Enable Subtraction"
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:25
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:24 rc.cpp:206
+#: rc.cpp:53
 msgid "Enable Addition/Subtraction for task generation."
 msgstr "Galluogi Adio/Tynnu ar gyfer creu tasgau."
 
 #. i18n: file: kbruch.kcfg:29
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:27 rc.cpp:209
+#: rc.cpp:56
 msgid "Enable Division"
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:30
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:30 rc.cpp:212
+#: rc.cpp:59
 msgid "Enable Division for task generation."
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:34
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:33 rc.cpp:215
+#: rc.cpp:62
 msgid "Enable Multiplication"
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:35
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:36 rc.cpp:218
+#: rc.cpp:65
 msgid "Enable Multiplication for task generation."
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:39
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:39 rc.cpp:221
+#: rc.cpp:68
 msgid "Enable Multiplication/Division"
 msgstr "Galluogi Lluosi/Rhannu"
 
 #. i18n: file: kbruch.kcfg:40
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:42 rc.cpp:224
+#: rc.cpp:71
 msgid "Enable Multiplication/Division for task generation."
 msgstr "Galluogi Lluosi/Rhannu ar gyfer creu tasgau."
 
 #. i18n: file: kbruch.kcfg:44
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:45 rc.cpp:227
+#: rc.cpp:74
 msgid "Number of fractions"
 msgstr "Nifer ffracsiynau"
 
 #. i18n: file: kbruch.kcfg:45
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:48 rc.cpp:230
+#: rc.cpp:77
 msgid "Set the number of fractions for task generation."
 msgstr "Gosod nifer y ffracsiynau ar gyfer creu tasgau."
 
 #. i18n: file: kbruch.kcfg:49
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:51 rc.cpp:233
+#: rc.cpp:80
 msgid "Max. main denominator"
 msgstr "Prif enwadur mwyaf"
 
 #. i18n: file: kbruch.kcfg:50
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:54 rc.cpp:236
+#: rc.cpp:83
 msgid "Set the maximum value of the main denominator."
 msgstr "Gosod gwerth mwyaf y prif enwadur."
 
 #. i18n: file: kbruch.kcfg:54
 #. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:57 rc.cpp:239
+#: rc.cpp:86
 msgid "Answer reduced fractions"
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:55
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:60 rc.cpp:242
+#: rc.cpp:89
 msgid "Set if the fractions need to be reduced."
 msgstr ""
 
@@ -857,32 +854,26 @@
 #. i18n: ectx: label, entry, group (Task)
 #. i18n: file: kbruch.kcfg:69
 #. i18n: ectx: label, entry, group (Task)
-#. i18n: file: kbruch.kcfg:59
-#. i18n: ectx: label, entry, group (Task)
-#. i18n: file: kbruch.kcfg:64
-#. i18n: ectx: label, entry, group (Task)
-#. i18n: file: kbruch.kcfg:69
-#. i18n: ectx: label, entry, group (Task)
-#: rc.cpp:63 rc.cpp:69 rc.cpp:75 rc.cpp:245 rc.cpp:251 rc.cpp:257
+#: rc.cpp:92 rc.cpp:98 rc.cpp:104
 msgid "Mixed number"
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:60
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:66 rc.cpp:248
+#: rc.cpp:95
 msgid "Set if the fractions will appear in mixed form or not on solution."
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:65
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:72 rc.cpp:254
+#: rc.cpp:101
 msgid ""
 "Set if the fractions will need answers in mixed form or not on solution."
 msgstr ""
 
 #. i18n: file: kbruch.kcfg:70
 #. i18n: ectx: whatsthis, entry, group (Task)
-#: rc.cpp:78 rc.cpp:260
+#: rc.cpp:107
 msgid "Set if the fractions will appear in mixed form or not in questions."
 msgstr ""
 
@@ -890,23 +881,19 @@
 #. i18n: ectx: label, entry, group (Statistics)
 #. i18n: file: kbruch.kcfg:78
 #. i18n: ectx: whatsthis, entry, group (Statistics)
-#. i18n: file: kbruch.kcfg:77
-#. i18n: ectx: label, entry, group (Statistics)
-#. i18n: file: kbruch.kcfg:78
-#. i18n: ectx: whatsthis, entry, group (Statistics)
-#: rc.cpp:81 rc.cpp:84 rc.cpp:263 rc.cpp:266
+#: rc.cpp:110 rc.cpp:113
 msgid "Number of correctly solved tasks"
 msgstr "Nifer y dasgau wedi'u datrys yn gywir"
 
 #. i18n: file: kbruch.kcfg:82
 #. i18n: ectx: label, entry, group (Statistics)
-#: rc.cpp:87 rc.cpp:269
+#: rc.cpp:116
 msgid "Number of solved tasks"
 msgstr "Nifer y dasgau wedi'u datrys"
 
 #. i18n: file: kbruch.kcfg:83
 #. i18n: ectx: whatsthis, entry, group (Statistics)
-#: rc.cpp:90 rc.cpp:272
+#: rc.cpp:119
 msgid "Total number of solved tasks"
 msgstr "Nifer cyfan y dasgau wedi'u datrys"
 
@@ -914,11 +901,7 @@
 #. i18n: ectx: label, entry, group (Statistics)
 #. i18n: file: kbruch.kcfg:88
 #. i18n: ectx: whatsthis, entry, group (Statistics)
-#. i18n: file: kbruch.kcfg:87
-#. i18n: ectx: label, entry, group (Statistics)
-#. i18n: file: kbruch.kcfg:88
-#. i18n: ectx: whatsthis, entry, group (Statistics)
-#: rc.cpp:93 rc.cpp:96 rc.cpp:275 rc.cpp:278
+#: rc.cpp:122 rc.cpp:125
 msgid "Number of skipped tasks"
 msgstr ""
 
@@ -926,11 +909,7 @@
 #. i18n: ectx: label, entry (numberColor), group (TaskViewer)
 #. i18n: file: kbruch.kcfg:96
 #. i18n: ectx: whatsthis, entry (numberColor), group (TaskViewer)
-#. i18n: file: kbruch.kcfg:95
-#. i18n: ectx: label, entry (numberColor), group (TaskViewer)
-#. i18n: file: kbruch.kcfg:96
-#. i18n: ectx: whatsthis, entry (numberColor), group (TaskViewer)
-#: rc.cpp:99 rc.cpp:102 rc.cpp:281 rc.cpp:284
+#: rc.cpp:128 rc.cpp:131
 msgid "Color of the numbers in the task view"
 msgstr "Lliw y rhifau yn y golwg tasgau"
 
@@ -938,11 +917,7 @@
 #. i18n: ectx: label, entry (operationColor), group (TaskViewer)
 #. i18n: file: kbruch.kcfg:101
 #. i18n: ectx: whatsthis, entry (operationColor), group (TaskViewer)
-#. i18n: file: kbruch.kcfg:100
-#. i18n: ectx: label, entry (operationColor), group (TaskViewer)
-#. i18n: file: kbruch.kcfg:101
-#. i18n: ectx: whatsthis, entry (operationColor), group (TaskViewer)
-#: rc.cpp:105 rc.cpp:108 rc.cpp:287 rc.cpp:290
+#: rc.cpp:134 rc.cpp:137
 msgid "Color of the operation signs in the task view"
 msgstr "Lliw yr arwyddion gweithrediad yn y golwg tasgau"
 
@@ -950,11 +925,7 @@
 #. i18n: ectx: label, entry (fractionBarColor), group (TaskViewer)
 #. i18n: file: kbruch.kcfg:106
 #. i18n: ectx: whatsthis, entry (fractionBarColor), group (TaskViewer)
-#. i18n: file: kbruch.kcfg:105
-#. i18n: ectx: label, entry (fractionBarColor), group (TaskViewer)
-#. i18n: file: kbruch.kcfg:106
-#. i18n: ectx: whatsthis, entry (fractionBarColor), group (TaskViewer)
-#: rc.cpp:111 rc.cpp:114 rc.cpp:293 rc.cpp:296
+#: rc.cpp:140 rc.cpp:143
 msgid "Color of the fraction bars in the task view"
 msgstr "Lliw y bariau ffracsiwn yn y golwg tasgau"
 
@@ -962,38 +933,34 @@
 #. i18n: ectx: label, entry, group (TaskViewer)
 #. i18n: file: kbruch.kcfg:111
 #. i18n: ectx: whatsthis, entry, group (TaskViewer)
-#. i18n: file: kbruch.kcfg:110
-#. i18n: ectx: label, entry, group (TaskViewer)
-#. i18n: file: kbruch.kcfg:111
-#. i18n: ectx: whatsthis, entry, group (TaskViewer)
-#: rc.cpp:117 rc.cpp:120 rc.cpp:299 rc.cpp:302
+#: rc.cpp:146 rc.cpp:149
 msgid "Font used for the task view"
 msgstr "Wynebfath a ddefnyddir ar gyfer y golwg tasgau"
 
 #. i18n: file: kbruch.kcfg:115
 #. i18n: ectx: label, entry, group (TaskViewer)
-#: rc.cpp:123 rc.cpp:305
+#: rc.cpp:152
 msgid "Enable showing the result also as a mixed number"
 msgstr "Galluogi dangos y canlyniad fel rhif cymysg hefyd"
 
 #. i18n: file: kbruch.kcfg:116
 #. i18n: ectx: whatsthis, entry, group (TaskViewer)
-#: rc.cpp:126 rc.cpp:308
+#: rc.cpp:155
 msgid ""
 "Enables/disables showing the result also in the special mixed-number "
 "notation."
 msgstr ""
 "(An)alluogi dangos y canlyniad yn y nodiant rhif-cymysg arbennig hefyd."
 
-#: mainqtwidget.cpp:124 resultwidget.cpp:101
+#: resultwidget.cpp:101
 msgid "Solution:"
 msgstr ""
 
-#: resultwidget.cpp:140
+#: resultwidget.cpp:139
 msgid "Correct!"
 msgstr ""
 
-#: resultwidget.cpp:147 resultwidget.cpp:154
+#: resultwidget.cpp:146 resultwidget.cpp:153
 msgid "Incorrect!"
 msgstr ""
 
@@ -1051,11 +1018,11 @@
 msgid "Click this button to reset the statistics."
 msgstr ""
 
-#: taskview.cpp:168
+#: taskview.cpp:167
 msgid "Click this button to skip this question."
 msgstr ""
 
-#: taskview.cpp:182
+#: taskview.cpp:177
 msgid ""
 "In this exercise you have to solve the generated question. You have to enter "
 "the integer part of the fraction and the numerator and the denominator. You "
@@ -1063,7 +1030,7 @@
 "forget to reduce the result, if the use of the reduced form is forced."
 msgstr ""
 
-#: taskwidget.cpp:119
+#: taskwidget.cpp:117
 msgctxt "division symbol"
 msgid "/"
 msgstr "/"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcachegrind.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcachegrind.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcachegrind.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcachegrind.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/kcachegrind.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2009-07-18 18:09+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:23+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -22,205 +22,51 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: kcachegrind/kcachegrindui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:5
-msgid "&File"
-msgstr ""
-
-#. i18n: file: kcachegrind/kcachegrindui.rc:10
-#. i18n: ectx: Menu (view)
-#: rc.cpp:8
-msgid "&View"
-msgstr ""
-
-#. i18n: file: kcachegrind/kcachegrindui.rc:15
-#. i18n: ectx: Menu (layouts)
-#: rc.cpp:11
-msgid "&Layout"
-msgstr "&Cynllun"
-
-#. i18n: file: kcachegrind/kcachegrindui.rc:33
-#. i18n: ectx: Menu
-#: rc.cpp:14
-msgid "Sidebars"
-msgstr ""
-
-#. i18n: file: kcachegrind/kcachegrindui.rc:42
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:17
-msgid "Main Toolbar"
-msgstr ""
-
-#. i18n: file: kcachegrind/kcachegrindui.rc:54
-#. i18n: ectx: ToolBar (stateToolBar)
-#: rc.cpp:20
-msgid "State Toolbar"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, configDlgBase)
-#: rc.cpp:23
-msgid "Configuration"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:26
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:26
-msgid "General"
-msgstr "Cyffredinol"
-
-#. i18n: file: kcachegrind/configdlgbase.ui:119
-#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:38
-msgid "Maximum number of items in lists:"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:44
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:32
-msgid "Truncate symbols in tooltips and context menus"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:70
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:35
-msgid "when more than:"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:80
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#: rc.cpp:38
-msgid "when longer than:"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:56
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4_3)
-#: rc.cpp:32
-msgid "Precision of percentage values:"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:134
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, maxListEdit)
-#: rc.cpp:44
-msgid "The Maximum Number of List Items should be below 500."
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:142
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:41
-msgid "Cost Item Colors"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:213
-#. i18n: ectx: property (text), widget (QCheckBox, fileCheck)
-#. i18n: file: kcachegrind/configdlgbase.ui:255
-#. i18n: ectx: property (text), widget (QCheckBox, classCheck)
-#. i18n: file: kcachegrind/configdlgbase.ui:269
-#. i18n: ectx: property (text), widget (QCheckBox, objectCheck)
-#: rc.cpp:44 rc.cpp:53 rc.cpp:56
-msgid "Automatic"
-msgstr "Awtomatig"
-
-#. i18n: file: kcachegrind/configdlgbase.ui:220
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#: rc.cpp:47
-msgid "Object:"
-msgstr "Gwrthrych :"
-
-#. i18n: file: kcachegrind/configdlgbase.ui:230
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_2)
-#: rc.cpp:50
-msgid "Class:"
-msgstr "Dosbarth:"
-
-#. i18n: file: kcachegrind/configdlgbase.ui:276
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4_2)
-#: rc.cpp:59
-msgid "File:"
-msgstr "Ffeil:"
-
-#. i18n: file: kcachegrind/configdlgbase.ui:340
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:62
-msgid "Annotations"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:348
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4_3_2)
-#: rc.cpp:65
-msgid "Context lines in annotations:"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:377
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
-#: rc.cpp:68
-msgid "Source Folders"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:355
-#. i18n: ectx: property (text), widget (KPushButton, addDirButton)
-#: rc.cpp:77
-msgid "Add"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:448
-#. i18n: ectx: property (text), widget (QPushButton, deleteDirButton)
-#: rc.cpp:77
-msgid "Delete"
-msgstr ""
-
-#. i18n: file: kcachegrind/configdlgbase.ui:409
-#. i18n: ectx: property (text), widget (Q3ListView, dirList)
-#: rc.cpp:71
-msgid "Object / Related Source Base"
-msgstr ""
-
 #. i18n: file: kcachegrind/dumpselectionbase.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, DumpSelectionBase)
-#: rc.cpp:86 kcachegrind/toplevel.cpp:297 kcachegrind/toplevel.cpp:520
+#: rc.cpp:5 kcachegrind/toplevel.cpp:300 kcachegrind/toplevel.cpp:523
 msgid "Profile Dumps"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:24
 #. i18n: ectx: property (text), widget (Q3ListView, listView1)
-#: rc.cpp:89
+#: rc.cpp:8
 msgid "Target"
 msgstr "Targed"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:46
 #. i18n: ectx: property (text), widget (Q3ListView, listView1)
-#: rc.cpp:92
+#: rc.cpp:11
 msgid "Time"
 msgstr "Amser"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:57
 #. i18n: ectx: property (text), widget (Q3ListView, listView1)
-#: rc.cpp:95
+#: rc.cpp:14
 msgid "Path"
 msgstr "Llwybr"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:70
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:98
+#: rc.cpp:17
 msgid "Options"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:87
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:101
+#: rc.cpp:20
 msgid "Target command:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:100
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:104
+#: rc.cpp:23
 msgid "Profiler options:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:111
 #. i18n: ectx: property (text), widget (Q3ListView, listView3)
-#: rc.cpp:107
+#: rc.cpp:26
 msgid "Option"
 msgstr "Dewisiad"
 
@@ -228,13 +74,13 @@
 #. i18n: ectx: property (text), widget (Q3ListView, listView3)
 #. i18n: file: kcachegrind/dumpselectionbase.ui:650
 #. i18n: ectx: property (text), widget (Q3ListView, listView4_3)
-#: rc.cpp:110 rc.cpp:221
+#: rc.cpp:29 rc.cpp:140
 msgid "Value"
 msgstr "Gwerth"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:133
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:113
+#: rc.cpp:32
 msgid "Trace"
 msgstr ""
 
@@ -242,13 +88,13 @@
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
 #. i18n: file: kcachegrind/dumpselectionbase.ui:730
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:116 rc.cpp:239
+#: rc.cpp:35 rc.cpp:158
 msgid "Jumps"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:160
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:119
+#: rc.cpp:38
 msgid "Instructions"
 msgstr "Cyfarwyddiadau"
 
@@ -256,49 +102,49 @@
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
 #. i18n: file: kcachegrind/dumpselectionbase.ui:745
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:122 rc.cpp:242
+#: rc.cpp:41 rc.cpp:161
 msgid "Events"
 msgstr "Digwyddiadau"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:188
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:125
+#: rc.cpp:44
 msgid "Full Cache"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:202
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:128
+#: rc.cpp:47
 msgid "Custom"
 msgstr "Addasiedig"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:217
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:131
+#: rc.cpp:50
 msgid "Collect"
 msgstr "Casglu"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:230
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:134
+#: rc.cpp:53
 msgid "At Startup"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:244
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:137
+#: rc.cpp:56
 msgid "While In"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:259
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:140
+#: rc.cpp:59
 msgid "Skip"
 msgstr "Hepgor"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:272
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:143
+#: rc.cpp:62
 msgid "PLT"
 msgstr ""
 
@@ -306,19 +152,19 @@
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
 #. i18n: file: kcachegrind/dumpselectionbase.ui:898
 #. i18n: ectx: property (text), widget (Q3ListView, listView7)
-#: rc.cpp:146 rc.cpp:275
+#: rc.cpp:65 rc.cpp:194
 msgid "Function"
 msgstr "Ffwythiant"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:301
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:149
+#: rc.cpp:68
 msgid "Dump Profile"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:314
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:152
+#: rc.cpp:71
 msgid "Every BBs"
 msgstr ""
 
@@ -326,304 +172,425 @@
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
 #. i18n: file: kcachegrind/dumpselectionbase.ui:370
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:155 rc.cpp:164
+#: rc.cpp:74 rc.cpp:83
 msgid "On Entering"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:342
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:158
+#: rc.cpp:77
 msgid "On Leaving"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:357
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:161
+#: rc.cpp:80
 msgid "Zero Events"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:385
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:167
+#: rc.cpp:86
 msgid "Separate"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:398
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:170
+#: rc.cpp:89
 msgid "Threads"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:412
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:173
+#: rc.cpp:92
 msgid "Recursions"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:426
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView3)
-#: rc.cpp:176
+#: rc.cpp:95
 msgid "Call Chain"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:452
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:179
+#: rc.cpp:98
 msgid "Custom profiler options:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:486
 #. i18n: ectx: property (text), widget (QPushButton, pushButton2)
-#: rc.cpp:182
+#: rc.cpp:101
 msgid "Run New Profile"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:496
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:185
+#: rc.cpp:104
 msgid "Info"
 msgstr "Gwybo"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:505
 #. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:188
+#: rc.cpp:107
 msgid "Dump reason:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:518
 #. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:191
+#: rc.cpp:110
 msgid "Event summary:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:529
 #. i18n: ectx: property (text), widget (Q3ListView, listView4)
-#: rc.cpp:194
+#: rc.cpp:113
 msgid "Name"
 msgstr "Enw"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:540
 #. i18n: ectx: property (text), widget (Q3ListView, listView4)
-#: rc.cpp:197
+#: rc.cpp:116
 msgid "Sum"
 msgstr "Swm"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:554
 #. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:200
+#: rc.cpp:119
 msgid "Miscellaneous:"
 msgstr "Amrywiol :"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:588
 #. i18n: ectx: property (text), widget (QPushButton, pushButton6)
-#: rc.cpp:203
+#: rc.cpp:122
 msgid "Show"
 msgstr "Dangos"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:595
 #. i18n: ectx: property (text), widget (QPushButton, pushButton5)
-#: rc.cpp:206
+#: rc.cpp:125
 msgid "Compare"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:605
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:209
+#: rc.cpp:128
 msgid "State"
 msgstr "Cyflwr"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:619
 #. i18n: ectx: property (text), widget (QPushButton, pushButton1)
-#: rc.cpp:212
+#: rc.cpp:131
 msgid "Update"
 msgstr "Diweddaru"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:626
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox1)
-#: rc.cpp:215
+#: rc.cpp:134
 msgid "Every [s]:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:639
 #. i18n: ectx: property (text), widget (Q3ListView, listView4_3)
-#: rc.cpp:218
+#: rc.cpp:137
 msgid "Counter"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:661
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:224
+#: rc.cpp:143
 msgid "Dumps Done"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:675
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:227
+#: rc.cpp:146
 msgid "Is Collecting"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:689
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:230
+#: rc.cpp:149
 msgid "Executed"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:702
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:233
+#: rc.cpp:152
 msgid "Basic Blocks"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:716
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:236
+#: rc.cpp:155
 msgid "Calls"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:758
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:245
+#: rc.cpp:164
 msgid "Ir"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:773
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:248
+#: rc.cpp:167
 msgid "Distinct"
 msgstr "Gwahanadwy"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:786
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:251 kcachegrind/configdlg.cpp:57
+#: rc.cpp:170
 msgid "ELF Objects"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:800
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:254
+#: rc.cpp:173
 msgid "Functions"
 msgstr "Ffwythiannau"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:814
 #. i18n: ectx: property (text), item, widget (Q3ListView, listView4_3)
-#: rc.cpp:257
+#: rc.cpp:176
 msgid "Contexts"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:845
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:260
+#: rc.cpp:179
 msgid "Stack trace:"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:855
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox2)
-#: rc.cpp:263
+#: rc.cpp:182
 msgid "Sync."
 msgstr "Cydweddu."
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:865
 #. i18n: ectx: property (text), widget (Q3ListView, listView7)
-#: rc.cpp:266
+#: rc.cpp:185
 msgid "#"
 msgstr "#"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:876
 #. i18n: ectx: property (text), widget (Q3ListView, listView7)
-#: rc.cpp:269
+#: rc.cpp:188
 msgid "Incl."
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:887
 #. i18n: ectx: property (text), widget (Q3ListView, listView7)
-#: rc.cpp:272
+#: rc.cpp:191
 msgid "Called"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:909
 #. i18n: ectx: property (text), widget (Q3ListView, listView7)
-#: rc.cpp:278
+#: rc.cpp:197
 msgid "Location"
 msgstr "Lleoliad"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:928
 #. i18n: ectx: property (text), widget (QPushButton, pushButton7)
-#: rc.cpp:281
+#: rc.cpp:200
 msgid "Start"
 msgstr "Dechrau"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:951
 #. i18n: ectx: property (text), widget (QPushButton, pushButton6_2)
-#: rc.cpp:284
+#: rc.cpp:203
 msgid "Zero"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:958
 #. i18n: ectx: property (text), widget (QPushButton, pushButton4)
-#: rc.cpp:287
+#: rc.cpp:206
 msgid "Dump"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:968
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:290
+#: rc.cpp:209
 msgid "Messages"
 msgstr "Negeseuon"
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:985
 #. i18n: ectx: property (text), widget (QPushButton, pushButton9)
-#: rc.cpp:293
+#: rc.cpp:212
 msgid "Kill Run"
 msgstr ""
 
 #. i18n: file: kcachegrind/dumpselectionbase.ui:1008
 #. i18n: ectx: property (text), widget (QPushButton, pushButton8)
-#: rc.cpp:296
+#: rc.cpp:215
 msgid "Clear"
 msgstr ""
 
-#: kcachegrind/configdlg.cpp:163 kcachegrind/configdlg.cpp:354
-#: kcachegrind/configdlg.cpp:373
-msgid "(always)"
+#. i18n: file: kcachegrind/configdlgbase.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, ConfigDlgBase)
+#: rc.cpp:218
+msgid "Configuration"
 msgstr ""
 
-#: kcachegrind/configdlg.cpp:381
-msgid "Choose Source Folder"
+#. i18n: file: kcachegrind/configdlgbase.ui:24
+#. i18n: ectx: attribute (title), widget (QWidget, tab1)
+#: rc.cpp:221
+msgid "General"
+msgstr "Cyffredinol"
+
+#. i18n: file: kcachegrind/configdlgbase.ui:34
+#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
+#: rc.cpp:224
+msgid "Maximum number of items in lists:"
 msgstr ""
 
-#: kcachegrind/main.cpp:40
-msgid "KCachegrind"
-msgstr "KCachegrind"
+#. i18n: file: kcachegrind/configdlgbase.ui:44
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
+#: rc.cpp:227
+msgid "Truncate symbols in tooltips and context menus"
+msgstr ""
 
-#: kcachegrind/main.cpp:42
-msgid "KDE Frontend for Callgrind/Cachegrind"
+#. i18n: file: kcachegrind/configdlgbase.ui:70
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:230
+msgid "when more than:"
 msgstr ""
 
-#: kcachegrind/main.cpp:44
-msgid "(C) 2002 - 2010"
+#. i18n: file: kcachegrind/configdlgbase.ui:80
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
+#: rc.cpp:233
+msgid "when longer than:"
 msgstr ""
 
-#: kcachegrind/main.cpp:46
-msgid "Josef Weidendorfer"
+#. i18n: file: kcachegrind/configdlgbase.ui:90
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4_3)
+#: rc.cpp:236
+msgid "Precision of percentage values:"
 msgstr ""
 
-#: kcachegrind/main.cpp:47
-msgid "Author/Maintainer"
+#. i18n: file: kcachegrind/configdlgbase.ui:134
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, maxListEdit)
+#: rc.cpp:239
+msgid "The Maximum Number of List Items should be below 500."
 msgstr ""
 
-#: kcachegrind/main.cpp:54
-msgid "Show information of this trace"
+#. i18n: file: kcachegrind/configdlgbase.ui:158
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:242
+msgid "Cost Item Colors"
+msgstr ""
+
+#. i18n: file: kcachegrind/configdlgbase.ui:176
+#. i18n: ectx: property (text), widget (QCheckBox, fileCheck)
+#. i18n: file: kcachegrind/configdlgbase.ui:210
+#. i18n: ectx: property (text), widget (QCheckBox, classCheck)
+#. i18n: file: kcachegrind/configdlgbase.ui:224
+#. i18n: ectx: property (text), widget (QCheckBox, objectCheck)
+#: rc.cpp:245 rc.cpp:254 rc.cpp:257
+msgid "Automatic"
+msgstr "Awtomatig"
+
+#. i18n: file: kcachegrind/configdlgbase.ui:183
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
+#: rc.cpp:248
+msgid "Object:"
+msgstr "Gwrthrych :"
+
+#. i18n: file: kcachegrind/configdlgbase.ui:193
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_2)
+#: rc.cpp:251
+msgid "Class:"
+msgstr "Dosbarth:"
+
+#. i18n: file: kcachegrind/configdlgbase.ui:231
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4_2)
+#: rc.cpp:260
+msgid "File:"
+msgstr "Ffeil:"
+
+#. i18n: file: kcachegrind/configdlgbase.ui:312
+#. i18n: ectx: attribute (title), widget (QWidget, tab2)
+#: rc.cpp:263
+msgid "Annotations"
+msgstr ""
+
+#. i18n: file: kcachegrind/configdlgbase.ui:320
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4_3_2)
+#: rc.cpp:266
+msgid "Context lines in annotations:"
+msgstr ""
+
+#. i18n: file: kcachegrind/configdlgbase.ui:341
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
+#: rc.cpp:269
+msgid "Source Folders"
+msgstr ""
+
+#. i18n: file: kcachegrind/configdlgbase.ui:355
+#. i18n: ectx: property (text), widget (KPushButton, addDirButton)
+#: rc.cpp:272
+msgid "Add"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:266 kcachegrind/toplevel.cpp:494
+#. i18n: file: kcachegrind/configdlgbase.ui:362
+#. i18n: ectx: property (text), widget (KPushButton, deleteDirButton)
+#: rc.cpp:275
+msgid "Delete"
+msgstr ""
+
+#. i18n: file: kcachegrind/configdlgbase.ui:400
+#. i18n: ectx: property (text), widget (QTreeWidget, dirList)
+#: rc.cpp:278
+msgid "Object / Related Source Base"
+msgstr ""
+
+#. i18n: file: kcachegrind/kcachegrindui.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:281
+msgid "&File"
+msgstr ""
+
+#. i18n: file: kcachegrind/kcachegrindui.rc:10
+#. i18n: ectx: Menu (view)
+#: rc.cpp:284
+msgid "&View"
+msgstr ""
+
+#. i18n: file: kcachegrind/kcachegrindui.rc:15
+#. i18n: ectx: Menu (layouts)
+#: rc.cpp:287
+msgid "&Layout"
+msgstr "&Cynllun"
+
+#. i18n: file: kcachegrind/kcachegrindui.rc:33
+#. i18n: ectx: Menu
+#: rc.cpp:290
+msgid "Sidebars"
+msgstr ""
+
+#. i18n: file: kcachegrind/kcachegrindui.rc:42
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:293
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: file: kcachegrind/kcachegrindui.rc:54
+#. i18n: ectx: ToolBar (stateToolBar)
+#: rc.cpp:296
+msgid "State Toolbar"
+msgstr ""
+
+#: kcachegrind/toplevel.cpp:269 kcachegrind/toplevel.cpp:497
 msgid "Parts Overview"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:275
+#: kcachegrind/toplevel.cpp:278
 msgid "Top Cost Call Stack"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:277
+#: kcachegrind/toplevel.cpp:280
 msgid ""
 "<b>The Top Cost Call Stack</b><p>This is a purely fictional 'most probable' "
 "call stack. It is built up by starting with the current selected function "
@@ -632,11 +599,11 @@
 "for all calls from the function in the line above.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:291
+#: kcachegrind/toplevel.cpp:294
 msgid "Flat Profile"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:304
+#: kcachegrind/toplevel.cpp:307
 msgid ""
 "<b>Profile Dumps</b><p>This dockable shows in the top part the list of "
 "loadable profile dumps in all subdirectories of: <ul><li>current working "
@@ -657,96 +624,96 @@
 "activate the top function in the current loaded dump.</li></ul></p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:375
+#: kcachegrind/toplevel.cpp:378
 msgid "&Duplicate"
 msgstr "&Dyblyg"
 
-#: kcachegrind/toplevel.cpp:378
+#: kcachegrind/toplevel.cpp:381
 msgid ""
 "<b>Duplicate Current Layout</b><p>Make a copy of the current layout.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:383
+#: kcachegrind/toplevel.cpp:386
 msgid "&Remove"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:385
+#: kcachegrind/toplevel.cpp:388
 msgid ""
 "<b>Remove Current Layout</b><p>Delete current layout and make the previous "
 "active.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:390
+#: kcachegrind/toplevel.cpp:393
 msgid "&Go to Next"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:393
+#: kcachegrind/toplevel.cpp:396
 msgid "Go to Next Layout"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:397
+#: kcachegrind/toplevel.cpp:400
 msgid "&Go to Previous"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:400
+#: kcachegrind/toplevel.cpp:403
 msgid "Go to Previous Layout"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:404
+#: kcachegrind/toplevel.cpp:407
 msgid "&Restore to Default"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:406
+#: kcachegrind/toplevel.cpp:409
 msgid "Restore Layouts to Default"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:410
+#: kcachegrind/toplevel.cpp:413
 msgid "&Save as Default"
 msgstr "&Cadw fel Rhagosodyn"
 
-#: kcachegrind/toplevel.cpp:412
+#: kcachegrind/toplevel.cpp:415
 msgid "Save Layouts as Default"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:423
+#: kcachegrind/toplevel.cpp:426
 msgid "<b>New</b><p>Open new empty KCachegrind window.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:427
+#: kcachegrind/toplevel.cpp:430
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
-#: kcachegrind/toplevel.cpp:429
+#: kcachegrind/toplevel.cpp:432
 msgid ""
 "<b>Add Profile Data</b><p>This opens an additional profile data file in the "
 "current window.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:435
+#: kcachegrind/toplevel.cpp:438
 msgctxt "Reload a document"
 msgid "&Reload"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:438
+#: kcachegrind/toplevel.cpp:441
 msgid ""
 "<b>Reload Profile Data</b><p>This loads any new created parts, too.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:443
+#: kcachegrind/toplevel.cpp:446
 msgid "&Export Graph"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:446
+#: kcachegrind/toplevel.cpp:449
 msgid ""
 "<b>Export Call Graph</b><p>Generates a file with extension .dot for the "
 "tools of the GraphViz package.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:454
+#: kcachegrind/toplevel.cpp:457
 msgid "&Force Dump"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:457
+#: kcachegrind/toplevel.cpp:460
 msgid ""
 "<b>Force Dump</b><p>This forces a dump for a Callgrind profile run in the "
 "current directory. This action is checked while KCachegrind looks for the "
@@ -764,53 +731,53 @@
 "the program.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:482
+#: kcachegrind/toplevel.cpp:485
 msgid ""
 "<b>Open Profile Data</b><p>This opens a profile data file, with possible "
 "multiple parts</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:497
+#: kcachegrind/toplevel.cpp:500
 msgid "Show/Hide the Parts Overview Dockable"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:502
+#: kcachegrind/toplevel.cpp:505
 msgid "Call Stack"
 msgstr "Pentwr galwadau"
 
-#: kcachegrind/toplevel.cpp:505
+#: kcachegrind/toplevel.cpp:508
 msgid "Show/Hide the Call Stack Dockable"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:510
+#: kcachegrind/toplevel.cpp:513
 msgid "Function Profile"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:513
+#: kcachegrind/toplevel.cpp:516
 msgid "Show/Hide the Function Profile Dockable"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:521
+#: kcachegrind/toplevel.cpp:524
 msgid "Show/Hide the Profile Dumps Dockable"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:528
+#: kcachegrind/toplevel.cpp:531
 msgid "Relative"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:530
+#: kcachegrind/toplevel.cpp:533
 msgid "Show relative instead of absolute costs"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:536
+#: kcachegrind/toplevel.cpp:539
 msgid "Relative to Parent"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:539
+#: kcachegrind/toplevel.cpp:542
 msgid "Show percentage costs relative to parent"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:543
+#: kcachegrind/toplevel.cpp:546
 msgid ""
 "<b>Show percentage costs relative to parent</b><p>If this is switched off, "
 "percentage costs are always shown relative to the total cost of the profile "
@@ -825,11 +792,11 @@
 "on (e.g. ELF object grouping).</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:560
+#: kcachegrind/toplevel.cpp:563
 msgid "Cycle Detection"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:563
+#: kcachegrind/toplevel.cpp:566
 msgid ""
 "<b>Detect recursive cycles</b><p>If this is switched off, the treemap "
 "drawing will show black areas when a recursive call is made instead of "
@@ -843,15 +810,15 @@
 "therefore, there is the option to switch this off.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:579
+#: kcachegrind/toplevel.cpp:582
 msgid "Shorten Templates"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:581
+#: kcachegrind/toplevel.cpp:584
 msgid "Hide Template Parameters in C++ Symbols"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:582
+#: kcachegrind/toplevel.cpp:585
 msgid ""
 "<b>Hide Template Parameters in C++ Symbols</b><p>If this is switched on, "
 "every symbol displayed will have any C++ template parameters hidden, just "
@@ -860,162 +827,203 @@
 "activated symbol label to show a tooltip with the unabbreviated symbol.</p>"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:599 kcachegrind/toplevel.cpp:640
+#: kcachegrind/toplevel.cpp:602 kcachegrind/toplevel.cpp:643
 msgid "Go back in function selection history"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:605 kcachegrind/toplevel.cpp:652
+#: kcachegrind/toplevel.cpp:608 kcachegrind/toplevel.cpp:655
 msgid "Go forward in function selection history"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:611 kcachegrind/toplevel.cpp:625
+#: kcachegrind/toplevel.cpp:614 kcachegrind/toplevel.cpp:628
 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 ""
 
-#: kcachegrind/toplevel.cpp:617
+#: kcachegrind/toplevel.cpp:620
 msgid "&Up"
 msgstr "I &Fyny"
 
-#: kcachegrind/toplevel.cpp:658 kcachegrind/toplevel.cpp:1513
+#: kcachegrind/toplevel.cpp:661 kcachegrind/toplevel.cpp:1516
 msgid "Primary Event Type"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:659
+#: kcachegrind/toplevel.cpp:662
 msgid "Select primary event type of costs"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:681 kcachegrind/toplevel.cpp:1518
+#: kcachegrind/toplevel.cpp:684 kcachegrind/toplevel.cpp:1521
 msgid "Secondary Event Type"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:682
+#: kcachegrind/toplevel.cpp:685
 msgid "Select secondary event type for cost e.g. shown in annotations"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:692
+#: kcachegrind/toplevel.cpp:695
 msgid "Grouping"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:694
+#: kcachegrind/toplevel.cpp:697
 msgid "Select how functions are grouped into higher level cost items"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:700
+#: kcachegrind/toplevel.cpp:703
 msgid "(No Grouping)"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:712
+#: kcachegrind/toplevel.cpp:715
 msgid "Split"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:715
+#: kcachegrind/toplevel.cpp:718
 msgid "Show two information panels"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:721
+#: kcachegrind/toplevel.cpp:724
 msgid "Split Horizontal"
 msgstr "Hollti'n Lorweddol"
 
-#: kcachegrind/toplevel.cpp:724
+#: kcachegrind/toplevel.cpp:727
 msgid "Change Split Orientation when main window is split."
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:926 kcachegrind/toplevel.cpp:984
+#: kcachegrind/toplevel.cpp:929 kcachegrind/toplevel.cpp:987
 msgid ""
 "cachegrind.out* callgrind.out*|Callgrind Profile Data\n"
 "*|All Files"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:928
+#: kcachegrind/toplevel.cpp:931
 msgid "Select Callgrind Profile Data"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:946 kcachegrind/toplevel.cpp:975
+#: kcachegrind/toplevel.cpp:949 kcachegrind/toplevel.cpp:978
 #, kde-format
 msgid ""
 "Could not open the file \"%1\". Check it exists and you have enough "
 "permissions to read it."
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:986
+#: kcachegrind/toplevel.cpp:989
 msgid "Add Callgrind Profile Data"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1137 kcachegrind/toplevel.cpp:1466
+#: kcachegrind/toplevel.cpp:1140 kcachegrind/toplevel.cpp:1469
 msgid "(Hidden)"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1523
+#: kcachegrind/toplevel.cpp:1526
 msgid "Hide"
 msgstr "Cuddio"
 
-#: kcachegrind/toplevel.cpp:1565
+#: kcachegrind/toplevel.cpp:1568
 msgid "Show Absolute Cost"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1568
+#: kcachegrind/toplevel.cpp:1571
 msgid "Show Relative Cost"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1600
+#: kcachegrind/toplevel.cpp:1603
 msgid "Go Back"
 msgstr "Ewch yn ?l"
 
-#: kcachegrind/toplevel.cpp:1601
+#: kcachegrind/toplevel.cpp:1604
 msgid "Go Forward"
 msgstr "Mynd Ymlaen"
 
-#: kcachegrind/toplevel.cpp:1602
+#: kcachegrind/toplevel.cpp:1605
 msgid "Go Up"
 msgstr "Ewch i Fyny"
 
-#: kcachegrind/toplevel.cpp:1814
+#: kcachegrind/toplevel.cpp:1817
 #, kde-format
 msgid "Layout Count: %1"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1821
+#: kcachegrind/toplevel.cpp:1824
 msgid "No profile data file loaded."
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1830
+#: kcachegrind/toplevel.cpp:1833
 #, kde-format
 msgid "Total %1 Cost: %2"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:1842
+#: kcachegrind/toplevel.cpp:1845
 msgid "No event type selected"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:2058 kcachegrind/toplevel.cpp:2097
-#: kcachegrind/toplevel.cpp:2136
+#: kcachegrind/toplevel.cpp:2036
+msgid "Cannot determine receiver PID for dump request"
+msgstr ""
+
+#: kcachegrind/toplevel.cpp:2077
+msgid "Error running callgrind_control"
+msgstr ""
+
+#: kcachegrind/toplevel.cpp:2116 kcachegrind/toplevel.cpp:2153
+#: kcachegrind/toplevel.cpp:2190
 msgid "(No Stack)"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:2064
+#: kcachegrind/toplevel.cpp:2122
 msgid "(No next function)"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:2103
+#: kcachegrind/toplevel.cpp:2159
 msgid "(No previous function)"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:2141
+#: kcachegrind/toplevel.cpp:2195
 msgid "(No Function Up)"
 msgstr ""
 
-#: kcachegrind/toplevel.cpp:2272 kcachegrind/toplevel.cpp:2286
+#: kcachegrind/toplevel.cpp:2327 kcachegrind/toplevel.cpp:2341
 #, kde-format
 msgid "Loading %1"
 msgstr "llwytho %1"
 
-#: kcachegrind/toplevel.cpp:2280
+#: kcachegrind/toplevel.cpp:2335
 #, kde-format
 msgid "Error loading %1: %2"
 msgstr ""
 
+#: kcachegrind/main.cpp:40
+msgid "KCachegrind"
+msgstr "KCachegrind"
+
+#: kcachegrind/main.cpp:42
+msgid "KDE Frontend for Callgrind/Cachegrind"
+msgstr ""
+
+#: kcachegrind/main.cpp:44
+msgid "(C) 2002 - 2011"
+msgstr ""
+
+#: kcachegrind/main.cpp:46
+msgid "Josef Weidendorfer"
+msgstr ""
+
+#: kcachegrind/main.cpp:47
+msgid "Author/Maintainer"
+msgstr ""
+
+#: kcachegrind/main.cpp:54
+msgid "Show information of this trace"
+msgstr ""
+
+#: kcachegrind/configdlg.cpp:145 kcachegrind/configdlg.cpp:333
+#: kcachegrind/configdlg.cpp:352
+msgid "(always)"
+msgstr ""
+
+#: kcachegrind/configdlg.cpp:360
+msgid "Choose Source Folder"
+msgstr ""
+
 #. i18n: file: tips:2
 #. i18n: ectx: @info:tipoftheday
 #: tips.cpp:3
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcertpart.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcertpart.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcertpart.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcertpart.po	2012-04-18 08:59:29.000000000 +0000
@@ -7,28 +7,28 @@
 msgstr ""
 "Project-Id-Version: kde4libs\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-18 01:41+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: rc.cpp:4
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:5
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ",,"
 
 #. i18n: file: kcertpart.rc:4
 #. i18n: ectx: Menu (Certificate)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid "&Certificate"
 msgstr "&Tystysgrif"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmaccess.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmaccess.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmaccess.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmaccess.po	2012-04-18 08:59:37.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmaccess\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:08+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:42+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmaccess.cpp:195
 msgid "AltGraph"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmaudiocd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmaudiocd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmaudiocd.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmaudiocd.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kcmaudiocd.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:37+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmaudiocd.cpp:65
 #, kde-format
@@ -45,12 +45,7 @@
 #. i18n: ectx: property (text), widget (QLabel, exampleOutput)
 #. i18n: file: audiocdconfig.ui:675
 #. i18n: ectx: property (text), widget (QLineEdit, example)
-#. i18n: file: audiocdconfig.ui:665
-#. i18n: ectx: property (text), widget (QLabel, exampleOutput)
-#. i18n: file: audiocdconfig.ui:675
-#. i18n: ectx: property (text), widget (QLineEdit, example)
-#: kcmaudiocd.cpp:153 kcmaudiocd.cpp:230 rc.cpp:192 rc.cpp:195 rc.cpp:392
-#: rc.cpp:395
+#: kcmaudiocd.cpp:153 kcmaudiocd.cpp:230 rc.cpp:194 rc.cpp:197
 msgid "Cool artist - example audio file.wav"
 msgstr ""
 
@@ -64,49 +59,49 @@
 "version of the LAME or Ogg Vorbis libraries."
 msgstr ""
 
-#: rc.cpp:199
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:200
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: audiocdconfig.ui:27
 #. i18n: ectx: attribute (title), widget (QWidget, tabGeneral)
-#: rc.cpp:3 rc.cpp:203
+#: rc.cpp:5
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file: audiocdconfig.ui:49
 #. i18n: ectx: property (title), widget (QGroupBox, encoderPriority)
-#: rc.cpp:6 rc.cpp:206
+#: rc.cpp:8
 msgid "Encoder Priority"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:74
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:9 rc.cpp:209
+#: rc.cpp:11
 msgid "Highest"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:84
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:12 rc.cpp:212
+#: rc.cpp:14
 msgid "Lowest"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:97
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:15 rc.cpp:215
+#: rc.cpp:17
 msgid "Normal"
 msgstr "Arferol"
 
 #. i18n: file: audiocdconfig.ui:116
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, cd_device_string)
-#: rc.cpp:18 rc.cpp:218
+#: rc.cpp:20
 msgid ""
 "Specify a location for the drive you want to use. Normally, this is a file "
 "inside the /dev folder representing your CD or DVD drive."
@@ -114,13 +109,13 @@
 
 #. i18n: file: audiocdconfig.ui:119
 #. i18n: ectx: property (text), widget (QLineEdit, cd_device_string)
-#: rc.cpp:21 rc.cpp:221
+#: rc.cpp:23
 msgid "/dev/cdrom"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:126
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cd_autosearch_check)
-#: rc.cpp:24 rc.cpp:224
+#: rc.cpp:26
 msgid ""
 "Uncheck this if you want to specify a CD device different from the one "
 "autoprobed"
@@ -128,13 +123,13 @@
 
 #. i18n: file: audiocdconfig.ui:129
 #. i18n: ectx: property (text), widget (QCheckBox, cd_autosearch_check)
-#: rc.cpp:27 rc.cpp:227
+#: rc.cpp:29
 msgid "&Specify CD Device:"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:136
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ec_enable_check)
-#: rc.cpp:30 rc.cpp:230
+#: rc.cpp:32
 msgid ""
 "If you uncheck this option, the slave will not try to use error correction "
 "which can be useful for reading damaged CDs. However, this feature can be "
@@ -143,25 +138,25 @@
 
 #. i18n: file: audiocdconfig.ui:139
 #. i18n: ectx: property (text), widget (QCheckBox, ec_enable_check)
-#: rc.cpp:33 rc.cpp:233
+#: rc.cpp:35
 msgid "Use &error correction when reading the CD"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:149
 #. i18n: ectx: property (text), widget (QCheckBox, ec_skip_check)
-#: rc.cpp:36 rc.cpp:236
+#: rc.cpp:38
 msgid "&Skip on errors"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:176
 #. i18n: ectx: attribute (title), widget (QWidget, tabNames)
-#: rc.cpp:39 rc.cpp:239
+#: rc.cpp:41
 msgid "&Names"
 msgstr "&Sylwadau"
 
 #. i18n: file: audiocdconfig.ui:182
 #. i18n: ectx: property (title), widget (QGroupBox, fileNameGroupBox)
-#: rc.cpp:42 rc.cpp:242
+#: rc.cpp:44
 msgid "File Name (without extension)"
 msgstr ""
 
@@ -171,13 +166,7 @@
 #. i18n: ectx: property (text), widget (QLabel, fileNameLabel_2)
 #. i18n: file: audiocdconfig.ui:485
 #. i18n: ectx: property (text), widget (QLabel, fileNameLabel_3)
-#. i18n: file: audiocdconfig.ui:188
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: audiocdconfig.ui:354
-#. i18n: ectx: property (text), widget (QLabel, fileNameLabel_2)
-#. i18n: file: audiocdconfig.ui:485
-#. i18n: ectx: property (text), widget (QLabel, fileNameLabel_3)
-#: rc.cpp:45 rc.cpp:100 rc.cpp:138 rc.cpp:245 rc.cpp:300 rc.cpp:338
+#: rc.cpp:47 rc.cpp:102 rc.cpp:140
 msgid "The following macros will be expanded:"
 msgstr ""
 
@@ -187,13 +176,7 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel21)
 #. i18n: file: audiocdconfig.ui:527
 #. i18n: ectx: property (text), widget (QLabel, textLabel21_2)
-#. i18n: file: audiocdconfig.ui:200
-#. i18n: ectx: property (text), widget (QLabel, textLabel13)
-#. i18n: file: audiocdconfig.ui:396
-#. i18n: ectx: property (text), widget (QLabel, textLabel21)
-#. i18n: file: audiocdconfig.ui:527
-#. i18n: ectx: property (text), widget (QLabel, textLabel21_2)
-#: rc.cpp:48 rc.cpp:114 rc.cpp:152 rc.cpp:248 rc.cpp:314 rc.cpp:352
+#: rc.cpp:50 rc.cpp:116 rc.cpp:154
 msgid "Genre"
 msgstr ""
 
@@ -203,20 +186,14 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel16)
 #. i18n: file: audiocdconfig.ui:517
 #. i18n: ectx: property (text), widget (QLabel, textLabel16_2)
-#. i18n: file: audiocdconfig.ui:210
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: audiocdconfig.ui:386
-#. i18n: ectx: property (text), widget (QLabel, textLabel16)
-#. i18n: file: audiocdconfig.ui:517
-#. i18n: ectx: property (text), widget (QLabel, textLabel16_2)
-#: rc.cpp:52 rc.cpp:111 rc.cpp:149 rc.cpp:252 rc.cpp:311 rc.cpp:349
+#: rc.cpp:54 rc.cpp:113 rc.cpp:151
 #, no-c-format
 msgid "%{year}"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:220
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:56 rc.cpp:256
+#: rc.cpp:58
 #, no-c-format
 msgid "%{title}"
 msgstr ""
@@ -227,13 +204,7 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel18)
 #. i18n: file: audiocdconfig.ui:547
 #. i18n: ectx: property (text), widget (QLabel, textLabel18_2)
-#. i18n: file: audiocdconfig.ui:230
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: audiocdconfig.ui:416
-#. i18n: ectx: property (text), widget (QLabel, textLabel18)
-#. i18n: file: audiocdconfig.ui:547
-#. i18n: ectx: property (text), widget (QLabel, textLabel18_2)
-#: rc.cpp:59 rc.cpp:120 rc.cpp:158 rc.cpp:259 rc.cpp:320 rc.cpp:358
+#: rc.cpp:61 rc.cpp:122 rc.cpp:160
 msgid "Album Title"
 msgstr ""
 
@@ -243,25 +214,19 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel20)
 #. i18n: file: audiocdconfig.ui:497
 #. i18n: ectx: property (text), widget (QLabel, textLabel20_2)
-#. i18n: file: audiocdconfig.ui:240
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: audiocdconfig.ui:366
-#. i18n: ectx: property (text), widget (QLabel, textLabel20)
-#. i18n: file: audiocdconfig.ui:497
-#. i18n: ectx: property (text), widget (QLabel, textLabel20_2)
-#: rc.cpp:62 rc.cpp:103 rc.cpp:141 rc.cpp:262 rc.cpp:303 rc.cpp:341
+#: rc.cpp:64 rc.cpp:105 rc.cpp:143
 msgid "Year"
 msgstr "Blwyddyn"
 
 #. i18n: file: audiocdconfig.ui:250
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_4)
-#: rc.cpp:65 rc.cpp:265
+#: rc.cpp:67
 msgid "Track Artist"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:260
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#: rc.cpp:68 rc.cpp:268
+#: rc.cpp:70
 msgid "Track Title"
 msgstr ""
 
@@ -271,13 +236,7 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel19)
 #. i18n: file: audiocdconfig.ui:537
 #. i18n: ectx: property (text), widget (QLabel, textLabel19_2)
-#. i18n: file: audiocdconfig.ui:270
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#. i18n: file: audiocdconfig.ui:406
-#. i18n: ectx: property (text), widget (QLabel, textLabel19)
-#. i18n: file: audiocdconfig.ui:537
-#. i18n: ectx: property (text), widget (QLabel, textLabel19_2)
-#: rc.cpp:71 rc.cpp:117 rc.cpp:155 rc.cpp:271 rc.cpp:317 rc.cpp:355
+#: rc.cpp:73 rc.cpp:119 rc.cpp:157
 msgid "Album Artist"
 msgstr ""
 
@@ -287,13 +246,7 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel15)
 #. i18n: file: audiocdconfig.ui:507
 #. i18n: ectx: property (text), widget (QLabel, textLabel15_2)
-#. i18n: file: audiocdconfig.ui:280
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: audiocdconfig.ui:376
-#. i18n: ectx: property (text), widget (QLabel, textLabel15)
-#. i18n: file: audiocdconfig.ui:507
-#. i18n: ectx: property (text), widget (QLabel, textLabel15_2)
-#: rc.cpp:75 rc.cpp:107 rc.cpp:145 rc.cpp:275 rc.cpp:307 rc.cpp:345
+#: rc.cpp:77 rc.cpp:109 rc.cpp:147
 #, no-c-format
 msgid "%{albumartist}"
 msgstr ""
@@ -304,20 +257,14 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel17)
 #. i18n: file: audiocdconfig.ui:557
 #. i18n: ectx: property (text), widget (QLabel, textLabel17_2)
-#. i18n: file: audiocdconfig.ui:290
-#. i18n: ectx: property (text), widget (QLabel, textLabel12)
-#. i18n: file: audiocdconfig.ui:426
-#. i18n: ectx: property (text), widget (QLabel, textLabel17)
-#. i18n: file: audiocdconfig.ui:557
-#. i18n: ectx: property (text), widget (QLabel, textLabel17_2)
-#: rc.cpp:79 rc.cpp:124 rc.cpp:162 rc.cpp:279 rc.cpp:324 rc.cpp:362
+#: rc.cpp:81 rc.cpp:126 rc.cpp:164
 #, no-c-format
 msgid "%{genre}"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:300
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:83 rc.cpp:283
+#: rc.cpp:85
 #, no-c-format
 msgid "%{trackartist}"
 msgstr ""
@@ -328,39 +275,33 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel14)
 #. i18n: file: audiocdconfig.ui:567
 #. i18n: ectx: property (text), widget (QLabel, textLabel14_2)
-#. i18n: file: audiocdconfig.ui:310
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: audiocdconfig.ui:436
-#. i18n: ectx: property (text), widget (QLabel, textLabel14)
-#. i18n: file: audiocdconfig.ui:567
-#. i18n: ectx: property (text), widget (QLabel, textLabel14_2)
-#: rc.cpp:87 rc.cpp:128 rc.cpp:166 rc.cpp:287 rc.cpp:328 rc.cpp:366
+#: rc.cpp:89 rc.cpp:130 rc.cpp:168
 #, no-c-format
 msgid "%{albumtitle}"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:320
 #. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:90 rc.cpp:290
+#: rc.cpp:92
 msgid "Track Number"
 msgstr "Rhif trac:"
 
 #. i18n: file: audiocdconfig.ui:330
 #. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#: rc.cpp:94 rc.cpp:294
+#: rc.cpp:96
 #, no-c-format
 msgid "%{number}"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:348
 #. i18n: ectx: property (title), widget (QGroupBox, albumNameGroupBox)
-#: rc.cpp:97 rc.cpp:297
+#: rc.cpp:99
 msgid "Album Name"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:470
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, fileLocationGroupBox)
-#: rc.cpp:132 rc.cpp:332
+#: rc.cpp:134
 #, no-c-format
 msgid ""
 "This defines where files will appear in relation to the encoder root, you "
@@ -369,32 +310,32 @@
 
 #. i18n: file: audiocdconfig.ui:473
 #. i18n: ectx: property (title), widget (QGroupBox, fileLocationGroupBox)
-#: rc.cpp:135 rc.cpp:335
+#: rc.cpp:137
 msgid "Files Location"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:595
 #. i18n: ectx: property (text), widget (KLineEdit, fileLocationLineEdit)
-#: rc.cpp:170 rc.cpp:370
+#: rc.cpp:172
 #, no-c-format
 msgid "%{albumtitle}/%{albumartist}"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:605
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:173 rc.cpp:373
+#: rc.cpp:175
 msgid "Name Regular Expression Replacement"
 msgstr ""
 
 #. i18n: file: audiocdconfig.ui:611
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:176 rc.cpp:376
+#: rc.cpp:178
 msgid "Selection:"
 msgstr "Dewisiad :"
 
 #. i18n: file: audiocdconfig.ui:622
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:179 rc.cpp:379
+#: rc.cpp:181
 msgid ""
 "Regular expression used on all file names. For example using selection \" \" "
 "and replace with \"_\" would replace all the spaces with underlines.\n"
@@ -402,24 +343,24 @@
 
 #. i18n: file: audiocdconfig.ui:635
 #. i18n: ectx: property (text), widget (QLabel, inputlabel)
-#: rc.cpp:183 rc.cpp:383
+#: rc.cpp:185
 msgid "Input:"
 msgstr "Mewnbwn:"
 
 #. i18n: file: audiocdconfig.ui:645
 #. i18n: ectx: property (text), widget (QLabel, outputLabel)
-#: rc.cpp:186 rc.cpp:386
+#: rc.cpp:188
 msgid "Output:"
 msgstr "Allbwn:"
 
 #. i18n: file: audiocdconfig.ui:655
 #. i18n: ectx: property (text), widget (QLabel, exampleLabel)
-#: rc.cpp:189 rc.cpp:389
+#: rc.cpp:191
 msgid "Example"
 msgstr "Enghraifft"
 
 #. i18n: file: audiocdconfig.ui:688
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:198 rc.cpp:398
+#: rc.cpp:200
 msgid "Replace with:"
 msgstr "Amnewid efo:"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmbackground.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmbackground.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmbackground.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmbackground.po	2012-04-18 08:59:37.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: kcmbackground\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-16 13:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: bgadvanced.cpp:53
 msgid "Advanced Background Settings"
@@ -57,11 +57,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
 #. i18n: file: bgwallpaper_ui.ui:115
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
-#. i18n: file: bgadvanced_ui.ui:47
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
-#. i18n: file: bgwallpaper_ui.ui:115
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonRemove)
-#: bgadvanced.cpp:256 rc.cpp:18 rc.cpp:189 rc.cpp:213 rc.cpp:384
+#: bgadvanced.cpp:256 rc.cpp:18 rc.cpp:189
 msgid "&Remove"
 msgstr ""
 
@@ -299,13 +295,13 @@
 
 #. i18n: file: bgadvanced_ui.ui:16
 #. i18n: ectx: property (title), widget (QGroupBox, m_groupProgram)
-#: rc.cpp:3 rc.cpp:198
+#: rc.cpp:3
 msgid "Background Program"
 msgstr "Rhaglen Gefndir"
 
 #. i18n: file: bgadvanced_ui.ui:31
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonAdd)
-#: rc.cpp:6 rc.cpp:201
+#: rc.cpp:6
 msgid ""
 "<qt>\n"
 "<p>Click here if you want to add a program to the listbox. This button opens "
@@ -332,17 +328,13 @@
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonAdd)
 #. i18n: file: bgwallpaper_ui.ui:92
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonAdd)
-#. i18n: file: bgadvanced_ui.ui:34
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonAdd)
-#. i18n: file: bgwallpaper_ui.ui:92
-#. i18n: ectx: property (text), widget (QPushButton, m_buttonAdd)
-#: rc.cpp:12 rc.cpp:186 rc.cpp:207 rc.cpp:381
+#: rc.cpp:12 rc.cpp:186
 msgid "&Add..."
 msgstr "&Ychwanegu..."
 
 #. i18n: file: bgadvanced_ui.ui:44
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonRemove)
-#: rc.cpp:15 rc.cpp:210
+#: rc.cpp:15
 msgid ""
 "Click here to remove programs from this list. Please note that it does not "
 "remove the program from your system, it only removes it from the available "
@@ -354,7 +346,7 @@
 
 #. i18n: file: bgadvanced_ui.ui:59
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonModify)
-#: rc.cpp:21 rc.cpp:216
+#: rc.cpp:21
 msgid ""
 "<qt>\n"
 "<p>Click here to modify the programs options. You usually can get the "
@@ -365,13 +357,13 @@
 
 #. i18n: file: bgadvanced_ui.ui:62
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonModify)
-#: rc.cpp:26 rc.cpp:221
+#: rc.cpp:26
 msgid "&Modify..."
 msgstr "&Addasu..."
 
 #. i18n: file: bgadvanced_ui.ui:101
 #. i18n: ectx: property (whatsThis), widget (QTreeWidget, m_listPrograms)
-#: rc.cpp:29 rc.cpp:224
+#: rc.cpp:29
 msgid ""
 "<qt>\n"
 "<p>Select from this listbox the program you want to use to draw your desktop "
@@ -390,25 +382,25 @@
 
 #. i18n: file: bgadvanced_ui.ui:105
 #. i18n: ectx: property (text), widget (QTreeWidget, m_listPrograms)
-#: rc.cpp:39 rc.cpp:234
+#: rc.cpp:39
 msgid "Program"
 msgstr "Rhaglen"
 
 #. i18n: file: bgadvanced_ui.ui:110
 #. i18n: ectx: property (text), widget (QTreeWidget, m_listPrograms)
-#: rc.cpp:42 rc.cpp:237
+#: rc.cpp:42
 msgid "Comment"
 msgstr "Sylwad"
 
 #. i18n: file: bgadvanced_ui.ui:115
 #. i18n: ectx: property (text), widget (QTreeWidget, m_listPrograms)
-#: rc.cpp:45 rc.cpp:240
+#: rc.cpp:45
 msgid "Refresh"
 msgstr "Adfywio"
 
 #. i18n: file: bgadvanced_ui.ui:123
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_cbProgram)
-#: rc.cpp:48 rc.cpp:243
+#: rc.cpp:48
 msgid ""
 "Check here if you want to allow a program to draw your desktop background. "
 "Below you can find the list of programs currently available for drawing the "
@@ -422,13 +414,13 @@
 
 #. i18n: file: bgadvanced_ui.ui:126
 #. i18n: ectx: property (text), widget (QCheckBox, m_cbProgram)
-#: rc.cpp:51 rc.cpp:246
+#: rc.cpp:51
 msgid "Use the following program for drawing the background:"
 msgstr "Defnyddio'r rhaglen ganlynol i arlunio'r cefndir:"
 
 #. i18n: file: bgadvanced_ui.ui:136
 #. i18n: ectx: property (title), widget (QGroupBox, m_groupCache)
-#: rc.cpp:54 rc.cpp:249
+#: rc.cpp:54
 msgid "Memory Usage"
 msgstr "Defnydd Cof"
 
@@ -436,11 +428,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, m_lblCache)
 #. i18n: file: bgadvanced_ui.ui:155
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, m_spinCache)
-#. i18n: file: bgadvanced_ui.ui:142
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_lblCache)
-#. i18n: file: bgadvanced_ui.ui:155
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, m_spinCache)
-#: rc.cpp:57 rc.cpp:63 rc.cpp:252 rc.cpp:258
+#: rc.cpp:57 rc.cpp:63
 msgid ""
 "In this box you can enter how much memory KDE should use for caching the "
 "background(s). If you have different backgrounds for the different desktops "
@@ -454,31 +442,31 @@
 
 #. i18n: file: bgadvanced_ui.ui:145
 #. i18n: ectx: property (text), widget (QLabel, m_lblCache)
-#: rc.cpp:60 rc.cpp:255
+#: rc.cpp:60
 msgid "Size of background cache:"
 msgstr "Maint y storfa cefndir:"
 
 #. i18n: file: bgadvanced_ui.ui:158
 #. i18n: ectx: property (suffix), widget (KIntSpinBox, m_spinCache)
-#: rc.cpp:66 rc.cpp:261
+#: rc.cpp:66
 msgid " KiB"
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:80
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonIdentifyScreens)
-#: rc.cpp:69 rc.cpp:264
+#: rc.cpp:69
 msgid "Click this button to show the identifying number for each screen."
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:83
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonIdentifyScreens)
-#: rc.cpp:72 rc.cpp:267
+#: rc.cpp:72
 msgid "Identify Screens"
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:132
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonAdvanced)
-#: rc.cpp:75 rc.cpp:270
+#: rc.cpp:75
 msgid ""
 "Click this button to set the icon text colors and shadow, set up a program "
 "to run for the background picture or control the size of the background "
@@ -490,13 +478,13 @@
 
 #. i18n: file: bgdialog_ui.ui:135
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonAdvanced)
-#: rc.cpp:78 rc.cpp:273
+#: rc.cpp:78
 msgid "Advanced Options"
 msgstr "Dewisiadau Uwch"
 
 #. i18n: file: bgdialog_ui.ui:184
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonGetNew)
-#: rc.cpp:81 rc.cpp:276
+#: rc.cpp:81
 msgid ""
 "Click this button to give you a list of new wallpapers to download from the "
 "Internet."
@@ -504,13 +492,13 @@
 
 #. i18n: file: bgdialog_ui.ui:187
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonGetNew)
-#: rc.cpp:84 rc.cpp:279
+#: rc.cpp:84
 msgid "Get New Wallpapers"
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:232
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:87 rc.cpp:282
+#: rc.cpp:87
 msgid "Options"
 msgstr ""
 
@@ -518,11 +506,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, m_lblWallpaperPos)
 #. i18n: file: bgdialog_ui.ui:438
 #. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboWallpaperPos)
-#. i18n: file: bgdialog_ui.ui:247
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_lblWallpaperPos)
-#. i18n: file: bgdialog_ui.ui:438
-#. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboWallpaperPos)
-#: rc.cpp:90 rc.cpp:135 rc.cpp:285 rc.cpp:330
+#: rc.cpp:90 rc.cpp:135
 msgid ""
 "<qt>You can choose here how a background picture is shown on the desktop:\n"
 "<ul>\n"
@@ -547,13 +531,13 @@
 
 #. i18n: file: bgdialog_ui.ui:250
 #. i18n: ectx: property (text), widget (QLabel, m_lblWallpaperPos)
-#: rc.cpp:102 rc.cpp:297
+#: rc.cpp:102
 msgid "Posi&tion:"
 msgstr "Lleo&liad:"
 
 #. i18n: file: bgdialog_ui.ui:266
 #. i18n: ectx: property (whatsThis), widget (QComboBox, m_comboBlend)
-#: rc.cpp:105 rc.cpp:300
+#: rc.cpp:105
 msgid ""
 "If you have selected to use a background picture you can choose various "
 "methods of blending the background colors with the picture. The default "
@@ -566,13 +550,13 @@
 
 #. i18n: file: bgdialog_ui.ui:275
 #. i18n: ectx: property (whatsThis), widget (KColorButton, m_colorPrimary)
-#: rc.cpp:108 rc.cpp:303
+#: rc.cpp:108
 msgid "Click to choose the primary background color."
 msgstr "Cliciwch i ddewis y lliw cefndir cynradd."
 
 #. i18n: file: bgdialog_ui.ui:285
 #. i18n: ectx: property (whatsThis), widget (KColorButton, m_colorSecondary)
-#: rc.cpp:111 rc.cpp:306
+#: rc.cpp:111
 msgid ""
 "Click to choose the secondary background color. If no secondary color is "
 "required by the pattern selected this button will be disabled."
@@ -582,13 +566,13 @@
 
 #. i18n: file: bgdialog_ui.ui:297
 #. i18n: ectx: property (text), widget (QLabel, m_lblColors)
-#: rc.cpp:114 rc.cpp:309
+#: rc.cpp:114
 msgid "Co&lors:"
 msgstr "Lli&wiau:"
 
 #. i18n: file: bgdialog_ui.ui:313
 #. i18n: ectx: property (text), widget (QLabel, m_lblBlending)
-#: rc.cpp:117 rc.cpp:312
+#: rc.cpp:117
 msgid "&Blending:"
 msgstr "Cyfu&no:"
 
@@ -596,11 +580,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, m_lblBlendBalance)
 #. i18n: file: bgdialog_ui.ui:347
 #. i18n: ectx: property (whatsThis), widget (QSlider, m_sliderBlend)
-#. i18n: file: bgdialog_ui.ui:331
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_lblBlendBalance)
-#. i18n: file: bgdialog_ui.ui:347
-#. i18n: ectx: property (whatsThis), widget (QSlider, m_sliderBlend)
-#: rc.cpp:120 rc.cpp:126 rc.cpp:315 rc.cpp:321
+#: rc.cpp:120 rc.cpp:126
 msgid ""
 "You can use this slider to control the degree of blending. You can "
 "experiment by moving the slider and looking at the effects in the preview "
@@ -611,13 +591,13 @@
 
 #. i18n: file: bgdialog_ui.ui:334
 #. i18n: ectx: property (text), widget (QLabel, m_lblBlendBalance)
-#: rc.cpp:123 rc.cpp:318
+#: rc.cpp:123
 msgid "Balance:"
 msgstr "Cydbwysedd:"
 
 #. i18n: file: bgdialog_ui.ui:374
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_cbBlendReverse)
-#: rc.cpp:129 rc.cpp:324
+#: rc.cpp:129
 msgid ""
 "For some types of blending, you can reverse the role of the background and "
 "the picture by checking this option."
@@ -627,43 +607,43 @@
 
 #. i18n: file: bgdialog_ui.ui:377
 #. i18n: ectx: property (text), widget (QCheckBox, m_cbBlendReverse)
-#: rc.cpp:132 rc.cpp:327
+#: rc.cpp:132
 msgid "Reverse roles"
 msgstr "Gwrthdroi rôlau"
 
 #. i18n: file: bgdialog_ui.ui:448
 #. i18n: ectx: property (title), widget (KButtonGroup, m_buttonGroupBackground)
-#: rc.cpp:147 rc.cpp:342
+#: rc.cpp:147
 msgid "Background"
 msgstr "Cefndir"
 
 #. i18n: file: bgdialog_ui.ui:454
 #. i18n: ectx: property (toolTip), widget (QRadioButton, m_radioNoPicture)
-#: rc.cpp:150 rc.cpp:345
+#: rc.cpp:150
 msgid "No picture, color only"
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:457
 #. i18n: ectx: property (text), widget (QRadioButton, m_radioNoPicture)
-#: rc.cpp:153 rc.cpp:348
+#: rc.cpp:153
 msgid "&No picture"
 msgstr "Dim ll&un:"
 
 #. i18n: file: bgdialog_ui.ui:464
 #. i18n: ectx: property (text), widget (QRadioButton, m_radioSlideShow)
-#: rc.cpp:156 rc.cpp:351
+#: rc.cpp:156
 msgid "&Slide show:"
 msgstr "Sioe Try&loywderau"
 
 #. i18n: file: bgdialog_ui.ui:471
 #. i18n: ectx: property (text), widget (QRadioButton, m_radioPicture)
-#: rc.cpp:159 rc.cpp:354
+#: rc.cpp:159
 msgid "&Picture:"
 msgstr "Llu&n:"
 
 #. i18n: file: bgdialog_ui.ui:497
 #. i18n: ectx: property (whatsThis), widget (QPushButton, m_buttonSetupWallpapers)
-#: rc.cpp:162 rc.cpp:357
+#: rc.cpp:162
 msgid ""
 "Click this button to select a set of images to be used as background "
 "pictures. One picture at a time will be shown for a specified amount of "
@@ -676,55 +656,55 @@
 
 #. i18n: file: bgdialog_ui.ui:500
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonSetupWallpapers)
-#: rc.cpp:165 rc.cpp:360
+#: rc.cpp:165
 msgid "Set&up..."
 msgstr "Goso&d..."
 
 #. i18n: file: bgdialog_ui.ui:558
 #. i18n: ectx: property (whatsThis), widget (KComboBox, m_comboScreen)
-#: rc.cpp:168 rc.cpp:363
+#: rc.cpp:168
 msgid ""
 "Choose the screen you wish to configure the background for from this list."
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:562
 #. i18n: ectx: property (text), item, widget (KComboBox, m_comboScreen)
-#: rc.cpp:171 rc.cpp:366
+#: rc.cpp:171
 msgid "Across All Screens"
 msgstr ""
 
 #. i18n: file: bgdialog_ui.ui:567
 #. i18n: ectx: property (text), item, widget (KComboBox, m_comboScreen)
-#: rc.cpp:174 rc.cpp:369
+#: rc.cpp:174
 msgid "On Each Screen"
 msgstr ""
 
 #. i18n: file: bgwallpaper_ui.ui:19
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:177 rc.cpp:372
+#: rc.cpp:177
 msgid "Show the following pictures:"
 msgstr "Dangos y lluniau canlynol:"
 
 #. i18n: file: bgwallpaper_ui.ui:29
 #. i18n: ectx: property (text), widget (QCheckBox, m_cbRandom)
-#: rc.cpp:180 rc.cpp:375
+#: rc.cpp:180
 msgid "&Show pictures in random order"
 msgstr "&Dangos lluniau mewn trefn hap"
 
 #. i18n: file: bgwallpaper_ui.ui:38
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:183 rc.cpp:378
+#: rc.cpp:183
 msgid "Change &picture after:"
 msgstr "Newid &llun wedi:"
 
 #. i18n: file: bgwallpaper_ui.ui:122
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonMoveDown)
-#: rc.cpp:192 rc.cpp:387
+#: rc.cpp:192
 msgid "Move &Down"
 msgstr "&Gostwng"
 
 #. i18n: file: bgwallpaper_ui.ui:129
 #. i18n: ectx: property (text), widget (QPushButton, m_buttonMoveUp)
-#: rc.cpp:195 rc.cpp:390
+#: rc.cpp:195
 msgid "Move &Up"
 msgstr "&Codi"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmbell.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmbell.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmbell.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmbell.po	2012-04-18 08:59:37.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmbell\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:07+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:41+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: bell.cpp:83
 msgid "Bell Settings"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcddb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcddb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcddb.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcddb.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,33 +2,33 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kcmcddb.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:00+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: cddbconfigwidget.cpp:52
+#: cddbconfigwidget.cpp:59
 msgid "Cache Locations"
 msgstr ""
 
-#: cddbconfigwidget.cpp:79
+#: cddbconfigwidget.cpp:98
 msgid "Could not fetch mirror list."
 msgstr ""
 
-#: cddbconfigwidget.cpp:79
+#: cddbconfigwidget.cpp:98
 msgid "Could Not Fetch"
 msgstr ""
 
-#: cddbconfigwidget.cpp:83
+#: cddbconfigwidget.cpp:102
 msgid "Select mirror"
 msgstr ""
 
-#: cddbconfigwidget.cpp:84
+#: cddbconfigwidget.cpp:103
 msgid "Select one of these mirrors"
 msgstr ""
 
@@ -36,17 +36,13 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_FreedbLookupTransport)
 #. i18n: file: cddbconfigwidget.ui:179
 #. i18n: ectx: property (text), widget (QRadioButton, httpButton)
-#. i18n: file: cddbconfigwidget.ui:129
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_FreedbLookupTransport)
-#. i18n: file: cddbconfigwidget.ui:179
-#. i18n: ectx: property (text), widget (QRadioButton, httpButton)
-#: cddbconfigwidget.cpp:101 rc.cpp:42 rc.cpp:57 rc.cpp:123 rc.cpp:138
+#: cddbconfigwidget.cpp:120 rc.cpp:42 rc.cpp:57
 msgid "HTTP"
 msgstr "HTTP"
 
 #. i18n: file: cddbconfigwidget.ui:124
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_FreedbLookupTransport)
-#: cddbconfigwidget.cpp:103 rc.cpp:39 rc.cpp:120
+#: cddbconfigwidget.cpp:122 rc.cpp:39
 msgid "CDDB"
 msgstr "CDDB"
 
@@ -68,49 +64,49 @@
 
 #. i18n: file: cddbconfigwidget.ui:7
 #. i18n: ectx: property (windowTitle), widget (QWidget, CDDBConfigWidgetBase)
-#: rc.cpp:3 rc.cpp:84
+#: rc.cpp:3
 msgid "CDDB Settings"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:20
 #. i18n: ectx: attribute (title), widget (QWidget, tabLookup)
-#: rc.cpp:6 rc.cpp:87
+#: rc.cpp:6
 msgid "&Lookup"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:26
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_MusicBrainzLookupEnabled)
-#: rc.cpp:9 rc.cpp:90
+#: rc.cpp:9
 msgid "Enable MusicBrainz lookup"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:33
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_FreedbLookupEnabled)
-#: rc.cpp:12 rc.cpp:93
+#: rc.cpp:12
 msgid "Enable freedb lookup"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:40
 #. i18n: ectx: property (title), widget (QGroupBox, freedbServerBox)
-#: rc.cpp:15 rc.cpp:96
+#: rc.cpp:15
 msgid "Freedb Server"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:46
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7)
-#: rc.cpp:18 rc.cpp:99
+#: rc.cpp:18
 msgid "Freedb server:"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:64
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, kcfg_hostname)
-#: rc.cpp:21 rc.cpp:102
+#: rc.cpp:21
 msgid "Name of CDDB server which will be used to look up CD information."
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:67
 #. i18n: ectx: property (text), widget (QLineEdit, kcfg_hostname)
-#: rc.cpp:24 rc.cpp:105
+#: rc.cpp:24
 msgid "freedb.freedb.org"
 msgstr ""
 
@@ -120,90 +116,84 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
 #. i18n: file: cddbconfigwidget.ui:242
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: cddbconfigwidget.ui:80
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#. i18n: file: cddbconfigwidget.ui:209
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: cddbconfigwidget.ui:242
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:27 rc.cpp:63 rc.cpp:69 rc.cpp:108 rc.cpp:144 rc.cpp:150
+#: rc.cpp:27 rc.cpp:63 rc.cpp:69
 msgid "Port:"
 msgstr "Porth:"
 
 #. i18n: file: cddbconfigwidget.ui:93
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, kcfg_port)
-#: rc.cpp:30 rc.cpp:111
+#: rc.cpp:30
 msgid "Port to connect to on CDDB server."
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:108
 #. i18n: ectx: property (text), widget (QLabel, TextLabel9)
-#: rc.cpp:33 rc.cpp:114
+#: rc.cpp:33
 msgid "&Transport:"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:120
 #. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_FreedbLookupTransport)
-#: rc.cpp:36 rc.cpp:117
+#: rc.cpp:36
 msgid "Type of lookup which should be tried at the CDDB server."
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:137
 #. i18n: ectx: property (text), widget (KPushButton, mirrorListButton)
-#: rc.cpp:45 rc.cpp:126
+#: rc.cpp:45
 msgid "Show &Mirror List"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:153
 #. i18n: ectx: attribute (title), widget (QWidget, tabSubmit)
-#: rc.cpp:48 rc.cpp:129
+#: rc.cpp:48
 msgid "&Submit"
 msgstr "&Cyflwyno"
 
 #. i18n: file: cddbconfigwidget.ui:161
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:51 rc.cpp:132
+#: rc.cpp:51
 msgid "Email address:"
 msgstr "Cyfeiriad Ebost:"
 
 #. i18n: file: cddbconfigwidget.ui:173
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_FreedbSubmitTransport)
-#: rc.cpp:54 rc.cpp:135
+#: rc.cpp:54
 msgid "Submit Method"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:189
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:60 rc.cpp:141
+#: rc.cpp:60
 msgid "Server:"
 msgstr "Gweinydd:"
 
 #. i18n: file: cddbconfigwidget.ui:221
 #. i18n: ectx: property (text), widget (QRadioButton, smtpButton)
-#: rc.cpp:66 rc.cpp:147
+#: rc.cpp:66
 msgid "SMTP (Email)"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:267
 #. i18n: ectx: property (text), widget (QCheckBox, needsAuthenticationBox)
-#: rc.cpp:72 rc.cpp:153
+#: rc.cpp:72
 msgid "Server needs authentication"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:287
 #. i18n: ectx: property (text), widget (QLabel, textLabel9_2)
-#: rc.cpp:75 rc.cpp:156
+#: rc.cpp:75
 msgid "Reply-To:"
 msgstr ""
 
 #. i18n: file: cddbconfigwidget.ui:300
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:78 rc.cpp:159
+#: rc.cpp:78
 msgid "SMTP server:"
 msgstr "Gweinydd SMTP:"
 
 #. i18n: file: cddbconfigwidget.ui:307
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:81 rc.cpp:162
+#: rc.cpp:81
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcgi.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcgi.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcgi.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcgi.po	2012-04-18 08:59:34.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kcmcgi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:31+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:46+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmcgi.cpp:47
 msgid "Paths to Local CGI Programs"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcolors.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcolors.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcolors.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcolors.po	2012-04-18 08:59:37.000000000 +0000
@@ -11,65 +11,65 @@
 msgstr ""
 "Project-Id-Version: kcmcolors\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:12+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:43+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:52+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: colorsettings.ui:267
 #. i18n: ectx: attribute (title), widget (QWidget, pageColors)
-#: colorscm.cpp:80 rc.cpp:69 rc.cpp:677
+#: colorscm.cpp:82 rc.cpp:71
 msgid "Colors"
 msgstr "Lliwiau"
 
-#: colorscm.cpp:82
+#: colorscm.cpp:84
 msgid "(c) 2007 Matthew Woehlke"
 msgstr ""
 
-#: colorscm.cpp:84
+#: colorscm.cpp:86
 msgid "Matthew Woehlke"
 msgstr ""
 
-#: colorscm.cpp:86
+#: colorscm.cpp:88
 msgid "Jeremy Whiting"
 msgstr ""
 
-#: colorscm.cpp:137 colorscm.cpp:265 colorscm.cpp:1244
+#: colorscm.cpp:139 colorscm.cpp:267 colorscm.cpp:1260
 msgctxt "Default color scheme"
 msgid "Default"
 msgstr ""
 
-#: colorscm.cpp:142 colorscm.cpp:277 colorscm.cpp:1079
+#: colorscm.cpp:144 colorscm.cpp:279 colorscm.cpp:1095
 msgctxt "Current color scheme"
 msgid "Current"
 msgstr ""
 
-#: colorscm.cpp:249
+#: colorscm.cpp:251
 msgid "Selecting another scheme will discard any changes you have made"
 msgstr ""
 
-#: colorscm.cpp:250
+#: colorscm.cpp:252
 msgid "Are you sure?"
 msgstr ""
 
-#: colorscm.cpp:316
+#: colorscm.cpp:318
 msgid "You do not have permission to delete that scheme"
 msgstr ""
 
-#: colorscm.cpp:316 colorscm.cpp:530
+#: colorscm.cpp:318 colorscm.cpp:534
 msgid "Error"
 msgstr ""
 
-#: colorscm.cpp:324
+#: colorscm.cpp:326
 msgid "Import Color Scheme"
 msgstr ""
 
-#: colorscm.cpp:337
+#: colorscm.cpp:339
 msgid ""
 "The scheme you have selected appears to be a KDE3 scheme.\n"
 "\n"
@@ -79,313 +79,310 @@
 "This scheme will not be saved automatically."
 msgstr ""
 
-#: colorscm.cpp:341
+#: colorscm.cpp:343
 msgid "Notice"
 msgstr ""
 
-#: colorscm.cpp:411
+#: colorscm.cpp:415
 msgid "Please save the color scheme before uploading it."
 msgstr ""
 
-#: colorscm.cpp:412
+#: colorscm.cpp:416
 msgid "Please save"
 msgstr ""
 
-#: colorscm.cpp:442 colorscm.cpp:473
+#: colorscm.cpp:446 colorscm.cpp:477
 msgid "Save Color Scheme"
 msgstr "Cadw cynllun lliwiau"
 
-#: colorscm.cpp:443
+#: colorscm.cpp:447
 msgid "&Enter a name for the color scheme:"
 msgstr ""
 
-#: colorscm.cpp:472
+#: colorscm.cpp:476
 msgid ""
 "A color scheme with that name already exists.\n"
 "Do you want to overwrite it?"
 msgstr ""
 
-#: colorscm.cpp:530
+#: colorscm.cpp:534
 msgid "You do not have permission to overwrite that scheme"
 msgstr ""
 
-#: colorscm.cpp:731 colorscm.cpp:747
+#: colorscm.cpp:737 colorscm.cpp:753
 msgid "Varies"
 msgstr ""
 
-#: colorscm.cpp:772
+#: colorscm.cpp:778
 msgid "Normal Background"
 msgstr ""
 
-#: colorscm.cpp:773
+#: colorscm.cpp:779
 msgid "Alternate Background"
 msgstr ""
 
-#: colorscm.cpp:774
+#: colorscm.cpp:780
 msgid "Normal Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:530
+#. i18n: file: colorsettings.ui:540
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:775 rc.cpp:201 rc.cpp:809
+#: colorscm.cpp:781 rc.cpp:215
 msgid "Inactive Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:535
+#. i18n: file: colorsettings.ui:545
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:776 rc.cpp:204 rc.cpp:812
+#: colorscm.cpp:782 rc.cpp:218
 msgid "Active Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:540
+#. i18n: file: colorsettings.ui:550
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:777 rc.cpp:207 rc.cpp:815
+#: colorscm.cpp:783 rc.cpp:221
 msgid "Link Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:545
+#. i18n: file: colorsettings.ui:555
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:778 rc.cpp:210 rc.cpp:818
+#: colorscm.cpp:784 rc.cpp:224
 msgid "Visited Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:550
+#. i18n: file: colorsettings.ui:560
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:779 rc.cpp:213 rc.cpp:821
+#: colorscm.cpp:785 rc.cpp:227
 msgid "Negative Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:555
+#. i18n: file: colorsettings.ui:565
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:780 rc.cpp:216 rc.cpp:824
+#: colorscm.cpp:786 rc.cpp:230
 msgid "Neutral Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:560
+#. i18n: file: colorsettings.ui:570
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:781 rc.cpp:219 rc.cpp:827
+#: colorscm.cpp:787 rc.cpp:233
 msgid "Positive Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:565
+#. i18n: file: colorsettings.ui:575
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:782 rc.cpp:222 rc.cpp:830
+#: colorscm.cpp:788 rc.cpp:236
 msgid "Focus Decoration"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:570
+#. i18n: file: colorsettings.ui:580
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: colorscm.cpp:783 rc.cpp:225 rc.cpp:833
+#: colorscm.cpp:789 rc.cpp:239
 msgid "Hover Decoration"
 msgstr ""
 
-#: rc.cpp:607
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:608
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: colorsettings.ui:24
 #. i18n: ectx: attribute (title), widget (QWidget, pageScheme)
-#: rc.cpp:3 rc.cpp:611
+#: rc.cpp:5
 msgid "&Scheme"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:48
 #. i18n: ectx: property (toolTip), widget (KPushButton, schemeKnsButton)
-#: rc.cpp:6 rc.cpp:614
+#: rc.cpp:8
 msgid "Get new color schemes from the Internet"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:51
 #. i18n: ectx: property (text), widget (KPushButton, schemeKnsButton)
-#: rc.cpp:9 rc.cpp:617
+#: rc.cpp:11
 msgid "Get &New Schemes..."
 msgstr ""
 
 #. i18n: file: colorsettings.ui:61
 #. i18n: ectx: property (toolTip), widget (KPushButton, schemeKnsUploadButton)
-#: rc.cpp:12 rc.cpp:620
+#: rc.cpp:14
 msgid "Share the selected scheme on the Internet"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:64
 #. i18n: ectx: property (text), widget (KPushButton, schemeKnsUploadButton)
-#: rc.cpp:15 rc.cpp:623
+#: rc.cpp:17
 msgid "&Upload Scheme..."
 msgstr ""
 
 #. i18n: file: colorsettings.ui:71
 #. i18n: ectx: property (toolTip), widget (KPushButton, schemeImportButton)
-#: rc.cpp:18 rc.cpp:626
+#: rc.cpp:20
 msgid "Import a color scheme from a file"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:74
 #. i18n: ectx: property (text), widget (KPushButton, schemeImportButton)
-#: rc.cpp:21 rc.cpp:629
+#: rc.cpp:23
 msgid "Import Scheme..."
 msgstr ""
 
 #. i18n: file: colorsettings.ui:81
 #. i18n: ectx: property (toolTip), widget (KPushButton, schemeSaveButton)
-#: rc.cpp:24 rc.cpp:632
+#: rc.cpp:26
 msgid "Save the current color scheme"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:84
 #. i18n: ectx: property (text), widget (KPushButton, schemeSaveButton)
-#: rc.cpp:27 rc.cpp:635
+#: rc.cpp:29
 msgid "Save Scheme..."
 msgstr ""
 
 #. i18n: file: colorsettings.ui:94
 #. i18n: ectx: property (toolTip), widget (KPushButton, schemeRemoveButton)
-#: rc.cpp:30 rc.cpp:638
+#: rc.cpp:32
 msgid "Remove the selected scheme"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:97
 #. i18n: ectx: property (text), widget (KPushButton, schemeRemoveButton)
-#: rc.cpp:33 rc.cpp:641
+#: rc.cpp:35
 msgid "Remove Scheme"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:125
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: colorsettings.ui:652
+#. i18n: file: colorsettings.ui:672
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#. i18n: file: colorsettings.ui:939
+#. i18n: file: colorsettings.ui:959
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: colorsettings.ui:1189
+#. i18n: file: colorsettings.ui:1209
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: colorsettings.ui:125
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: colorsettings.ui:652
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#. i18n: file: colorsettings.ui:939
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: colorsettings.ui:1189
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:36 rc.cpp:246 rc.cpp:315 rc.cpp:384 rc.cpp:644 rc.cpp:854 rc.cpp:923
-#: rc.cpp:992
+#: rc.cpp:38 rc.cpp:266 rc.cpp:335 rc.cpp:404
 msgid "Preview"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:151
 #. i18n: ectx: attribute (title), widget (QWidget, pageOptions)
-#: rc.cpp:39 rc.cpp:647
+#: rc.cpp:41
 msgid "Options"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:157
 #. i18n: ectx: property (text), widget (QCheckBox, useInactiveEffects)
-#: rc.cpp:42 rc.cpp:650
+#: rc.cpp:44
 msgid "Apply inactive window color &effects"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:164
 #. i18n: ectx: property (text), widget (QCheckBox, inactiveSelectionEffect)
-#: rc.cpp:45 rc.cpp:653
+#: rc.cpp:47
 msgid "In&active selection changes color"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:171
 #. i18n: ectx: property (text), widget (QCheckBox, shadeSortedColumn)
-#: rc.cpp:48 rc.cpp:656
+#: rc.cpp:50
 msgid "Shade sorted column &in lists"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:181
 #. i18n: ectx: property (text), widget (QCheckBox, applyToAlien)
-#: rc.cpp:51 rc.cpp:659
+#: rc.cpp:53
 msgid "Apply colors to &non-KDE4 applications"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:188
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_5)
-#: rc.cpp:54 rc.cpp:662
+#: rc.cpp:56
 msgid "Shading of frames and lighting (\"3D\") effects"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:191
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_5)
-#: rc.cpp:57 rc.cpp:665
+#: rc.cpp:59
 msgid "Shading"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:203
 #. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:60 rc.cpp:668
+#: rc.cpp:62
 msgid "Minimum"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:223
 #. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:63 rc.cpp:671
+#: rc.cpp:65
 msgid "Maximum"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:230
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:66 rc.cpp:674
+#: rc.cpp:68
 msgid "Contrast"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:279
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:72 rc.cpp:680
+#: rc.cpp:74
 msgid "Color set:"
 msgstr ""
 
 #. i18n: file: colorsettings.ui:292
 #. i18n: ectx: property (toolTip), widget (QComboBox, colorSet)
-#: rc.cpp:75 rc.cpp:683
+#: rc.cpp:77
 msgid "Colorset to view/modify"
 msgstr ""
 
+#. i18n: 'Common' here means &quot;frequent/not rare&quot;, not &quot;shared&quot;
 #. i18n: file: colorsettings.ui:296
 #. i18n: ectx: property (text), item, widget (QComboBox, colorSet)
-#: rc.cpp:78 rc.cpp:686
+#: rc.cpp:81
 msgctxt "color-sets"
 msgid "Common Colors"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: colorsettings.ui:301
 #. i18n: ectx: property (text), item, widget (QComboBox, colorSet)
-#: rc.cpp:81 rc.cpp:689
+#: rc.cpp:85
 msgctxt "color-sets"
 msgid "View"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: colorsettings.ui:306
 #. i18n: ectx: property (text), item, widget (QComboBox, colorSet)
-#: rc.cpp:84 rc.cpp:692
+#: rc.cpp:89
 msgctxt "color-sets"
 msgid "Window"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: colorsettings.ui:311
 #. i18n: ectx: property (text), item, widget (QComboBox, colorSet)
-#: rc.cpp:87 rc.cpp:695
+#: rc.cpp:93
 msgctxt "color-sets"
 msgid "Button"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: colorsettings.ui:316
 #. i18n: ectx: property (text), item, widget (QComboBox, colorSet)
-#: rc.cpp:90 rc.cpp:698
+#: rc.cpp:97
 msgctxt "color-sets"
 msgid "Selection"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: colorsettings.ui:321
 #. i18n: ectx: property (text), item, widget (QComboBox, colorSet)
-#: rc.cpp:93 rc.cpp:701
+#: rc.cpp:101
 msgctxt "color-sets"
 msgid "Tooltip"
 msgstr ""
@@ -438,152 +435,105 @@
 #. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
 #. i18n: file: colorsettings.ui:470
 #. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:355
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:360
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:365
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:370
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:375
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:380
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:385
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:390
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:395
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:400
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:405
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:410
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:415
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:420
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:425
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:430
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:435
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:440
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:445
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:450
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:455
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:460
-#. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:465
+#. i18n: file: colorsettings.ui:475
 #. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#. i18n: file: colorsettings.ui:470
+#. i18n: file: colorsettings.ui:480
 #. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#: rc.cpp:96 rc.cpp:99 rc.cpp:102 rc.cpp:105 rc.cpp:108 rc.cpp:111 rc.cpp:114
-#: rc.cpp:117 rc.cpp:120 rc.cpp:123 rc.cpp:126 rc.cpp:129 rc.cpp:132
-#: rc.cpp:135 rc.cpp:138 rc.cpp:141 rc.cpp:144 rc.cpp:147 rc.cpp:150
-#: rc.cpp:153 rc.cpp:156 rc.cpp:159 rc.cpp:162 rc.cpp:165 rc.cpp:704
-#: rc.cpp:707 rc.cpp:710 rc.cpp:713 rc.cpp:716 rc.cpp:719 rc.cpp:722
-#: rc.cpp:725 rc.cpp:728 rc.cpp:731 rc.cpp:734 rc.cpp:737 rc.cpp:740
-#: rc.cpp:743 rc.cpp:746 rc.cpp:749 rc.cpp:752 rc.cpp:755 rc.cpp:758
-#: rc.cpp:761 rc.cpp:764 rc.cpp:767 rc.cpp:770 rc.cpp:773
+#: rc.cpp:104 rc.cpp:107 rc.cpp:110 rc.cpp:113 rc.cpp:116 rc.cpp:119
+#: rc.cpp:122 rc.cpp:125 rc.cpp:128 rc.cpp:131 rc.cpp:134 rc.cpp:137
+#: rc.cpp:140 rc.cpp:143 rc.cpp:146 rc.cpp:149 rc.cpp:152 rc.cpp:155
+#: rc.cpp:158 rc.cpp:161 rc.cpp:164 rc.cpp:167 rc.cpp:170 rc.cpp:173
+#: rc.cpp:176 rc.cpp:179
 msgid "New Row"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:475
+#. i18n: file: colorsettings.ui:485
 #. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#: rc.cpp:168 rc.cpp:776
+#: rc.cpp:182
 msgid "0"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:480
+#. i18n: file: colorsettings.ui:490
 #. i18n: ectx: property (text), widget (QTableWidget, commonColorTable)
-#: rc.cpp:171 rc.cpp:779
+#: rc.cpp:185
 msgid "1"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:485
+#. i18n: file: colorsettings.ui:495
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:174 rc.cpp:782
+#: rc.cpp:188
 msgid "View Background"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:490
+#. i18n: file: colorsettings.ui:500
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:177 rc.cpp:785
+#: rc.cpp:191
 msgid "View Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:495
+#. i18n: file: colorsettings.ui:505
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:180 rc.cpp:788
+#: rc.cpp:194
 msgid "Window Background"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:500
+#. i18n: file: colorsettings.ui:510
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:183 rc.cpp:791
+#: rc.cpp:197
 msgid "Window Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:505
+#. i18n: file: colorsettings.ui:515
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:186 rc.cpp:794
+#: rc.cpp:200
 msgid "Button Background"
 msgstr "Cefndir Botwm"
 
-#. i18n: file: colorsettings.ui:510
+#. i18n: file: colorsettings.ui:520
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:189 rc.cpp:797
+#: rc.cpp:203
 msgid "Button Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:515
+#. i18n: file: colorsettings.ui:525
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:192 rc.cpp:800
+#: rc.cpp:206
 msgid "Selection Background"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:520
+#. i18n: file: colorsettings.ui:530
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:195 rc.cpp:803
+#: rc.cpp:209
 msgid "Selection Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:525
+#. i18n: file: colorsettings.ui:535
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:198 rc.cpp:806
+#: rc.cpp:212
 msgid "Selection Inactive Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:575
+#. i18n: file: colorsettings.ui:585
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:228 rc.cpp:836
+#: rc.cpp:242
 msgid "Tooltip Background"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:580
+#. i18n: file: colorsettings.ui:590
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:231 rc.cpp:839
+#: rc.cpp:245
 msgid "Tooltip Text"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:585
+#. i18n: file: colorsettings.ui:595
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:234 rc.cpp:842
+#: rc.cpp:248
 msgid "Active Titlebar"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:590
+#. i18n: file: colorsettings.ui:600
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:237 rc.cpp:845
+#: rc.cpp:251
 msgid "Active Titlebar Text"
 msgstr ""
 
@@ -593,15 +543,15 @@
 msgid "Active Titlebar Secondary"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:595
+#. i18n: file: colorsettings.ui:610
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:240 rc.cpp:848
+#: rc.cpp:257
 msgid "Inactive Titlebar"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:600
+#. i18n: file: colorsettings.ui:615
 #. i18n: ectx: property (text), item, widget (QTableWidget, commonColorTable)
-#: rc.cpp:243 rc.cpp:851
+#: rc.cpp:260
 msgid "Inactive Titlebar Text"
 msgstr ""
 
@@ -611,495 +561,439 @@
 msgid "Inactive Titlebar Secondary"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:715
+#. i18n: file: colorsettings.ui:735
 #. i18n: ectx: attribute (title), widget (QWidget, pageInactice)
-#: rc.cpp:249 rc.cpp:857
+#: rc.cpp:269
 msgctxt "@title:tab color transformations on inactive elements"
 msgid "Inactive"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:721
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: colorsettings.ui:971
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: colorsettings.ui:721
+#. i18n: file: colorsettings.ui:741
 #. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: colorsettings.ui:971
+#. i18n: file: colorsettings.ui:991
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:252 rc.cpp:321 rc.cpp:860 rc.cpp:929
+#: rc.cpp:272 rc.cpp:341
 msgid "Intensity:"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:731
+#. i18n: file: colorsettings.ui:751
 #. i18n: ectx: property (toolTip), widget (QComboBox, inactiveIntensityBox)
-#: rc.cpp:255 rc.cpp:863
+#: rc.cpp:275
 msgid "Inactive intensity effect type"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:735
+#. i18n: file: colorsettings.ui:755
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#: rc.cpp:258 rc.cpp:866
+#: rc.cpp:278
 msgctxt "no inactive intensity effect"
 msgid "None"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:740
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#. i18n: file: colorsettings.ui:990
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#. i18n: file: colorsettings.ui:740
+#. i18n: file: colorsettings.ui:760
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#. i18n: file: colorsettings.ui:990
+#. i18n: file: colorsettings.ui:1010
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#: rc.cpp:261 rc.cpp:330 rc.cpp:869 rc.cpp:938
+#: rc.cpp:281 rc.cpp:350
 msgid "Shade"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:745
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#. i18n: file: colorsettings.ui:995
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#. i18n: file: colorsettings.ui:745
+#. i18n: file: colorsettings.ui:765
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#. i18n: file: colorsettings.ui:995
+#. i18n: file: colorsettings.ui:1015
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#: rc.cpp:264 rc.cpp:333 rc.cpp:872 rc.cpp:941
+#: rc.cpp:284 rc.cpp:353
 msgid "Darken"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:750
+#. i18n: file: colorsettings.ui:770
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#. i18n: file: colorsettings.ui:1000
+#. i18n: file: colorsettings.ui:1020
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#. i18n: file: colorsettings.ui:750
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveIntensityBox)
-#. i18n: file: colorsettings.ui:1000
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#: rc.cpp:267 rc.cpp:336 rc.cpp:875 rc.cpp:944
+#: rc.cpp:287 rc.cpp:356
 msgid "Lighten"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:761
+#. i18n: file: colorsettings.ui:781
 #. i18n: ectx: property (toolTip), widget (QSlider, inactiveIntensitySlider)
-#: rc.cpp:270 rc.cpp:878
+#: rc.cpp:290
 msgid "Inactive intensity effect amount"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:793
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: colorsettings.ui:1043
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: colorsettings.ui:793
+#. i18n: file: colorsettings.ui:813
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: colorsettings.ui:1043
+#. i18n: file: colorsettings.ui:1063
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:273 rc.cpp:342 rc.cpp:881 rc.cpp:950
+#: rc.cpp:293 rc.cpp:362
 msgid "Color:"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:803
+#. i18n: file: colorsettings.ui:823
 #. i18n: ectx: property (toolTip), widget (QComboBox, inactiveColorBox)
-#: rc.cpp:276 rc.cpp:884
+#: rc.cpp:296
 msgid "Inactive color effect type"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:807
+#. i18n: file: colorsettings.ui:827
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#: rc.cpp:279 rc.cpp:887
+#: rc.cpp:299
 msgctxt "no inactive color effect"
 msgid "None"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:812
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#. i18n: file: colorsettings.ui:1062
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#. i18n: file: colorsettings.ui:812
+#. i18n: file: colorsettings.ui:832
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#. i18n: file: colorsettings.ui:1062
+#. i18n: file: colorsettings.ui:1082
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#: rc.cpp:282 rc.cpp:351 rc.cpp:890 rc.cpp:959
+#: rc.cpp:302 rc.cpp:371
 msgid "Desaturate"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:817
+#. i18n: file: colorsettings.ui:837
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#. i18n: file: colorsettings.ui:878
+#. i18n: file: colorsettings.ui:898
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveContrastBox)
-#. i18n: file: colorsettings.ui:1067
+#. i18n: file: colorsettings.ui:1087
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#. i18n: file: colorsettings.ui:1128
+#. i18n: file: colorsettings.ui:1148
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledContrastBox)
-#. i18n: file: colorsettings.ui:817
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#. i18n: file: colorsettings.ui:878
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveContrastBox)
-#. i18n: file: colorsettings.ui:1067
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#. i18n: file: colorsettings.ui:1128
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledContrastBox)
-#: rc.cpp:285 rc.cpp:306 rc.cpp:354 rc.cpp:375 rc.cpp:893 rc.cpp:914
-#: rc.cpp:962 rc.cpp:983
+#: rc.cpp:305 rc.cpp:326 rc.cpp:374 rc.cpp:395
 msgid "Fade"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:822
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#. i18n: file: colorsettings.ui:883
-#. i18n: ectx: property (text), item, widget (QComboBox, inactiveContrastBox)
-#. i18n: file: colorsettings.ui:1072
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#. i18n: file: colorsettings.ui:1133
-#. i18n: ectx: property (text), item, widget (QComboBox, disabledContrastBox)
-#. i18n: file: colorsettings.ui:822
+#. i18n: file: colorsettings.ui:842
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveColorBox)
-#. i18n: file: colorsettings.ui:883
+#. i18n: file: colorsettings.ui:903
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveContrastBox)
-#. i18n: file: colorsettings.ui:1072
+#. i18n: file: colorsettings.ui:1092
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#. i18n: file: colorsettings.ui:1133
+#. i18n: file: colorsettings.ui:1153
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledContrastBox)
-#: rc.cpp:288 rc.cpp:309 rc.cpp:357 rc.cpp:378 rc.cpp:896 rc.cpp:917
-#: rc.cpp:965 rc.cpp:986
+#: rc.cpp:308 rc.cpp:329 rc.cpp:377 rc.cpp:398
 msgid "Tint"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:833
+#. i18n: file: colorsettings.ui:853
 #. i18n: ectx: property (toolTip), widget (QSlider, inactiveColorSlider)
-#: rc.cpp:291 rc.cpp:899
+#: rc.cpp:311
 msgid "Inactive color amount"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:852
+#. i18n: file: colorsettings.ui:872
 #. i18n: ectx: property (toolTip), widget (KColorButton, inactiveColorButton)
-#: rc.cpp:294 rc.cpp:902
+#: rc.cpp:314
 msgid "Inactive color"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:859
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: colorsettings.ui:1109
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: colorsettings.ui:859
+#. i18n: file: colorsettings.ui:879
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: colorsettings.ui:1109
+#. i18n: file: colorsettings.ui:1129
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:297 rc.cpp:366 rc.cpp:905 rc.cpp:974
+#: rc.cpp:317 rc.cpp:386
 msgid "Contrast:"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:869
+#. i18n: file: colorsettings.ui:889
 #. i18n: ectx: property (toolTip), widget (QComboBox, inactiveContrastBox)
-#: rc.cpp:300 rc.cpp:908
+#: rc.cpp:320
 msgid "Inactive contrast effect type"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:873
+#. i18n: file: colorsettings.ui:893
 #. i18n: ectx: property (text), item, widget (QComboBox, inactiveContrastBox)
-#: rc.cpp:303 rc.cpp:911
+#: rc.cpp:323
 msgctxt "no inactive contrast effect"
 msgid "None"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:894
+#. i18n: file: colorsettings.ui:914
 #. i18n: ectx: property (toolTip), widget (QSlider, inactiveContrastSlider)
-#: rc.cpp:312 rc.cpp:920
+#: rc.cpp:332
 msgid "Inactive contrast effect amount"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:965
+#. i18n: file: colorsettings.ui:985
 #. i18n: ectx: attribute (title), widget (QWidget, pageDisabled)
-#: rc.cpp:318 rc.cpp:926
+#: rc.cpp:338
 msgctxt "@title:tab color transformations on disabled elements"
 msgid "Disabled"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:981
+#. i18n: file: colorsettings.ui:1001
 #. i18n: ectx: property (toolTip), widget (QComboBox, disabledIntensityBox)
-#: rc.cpp:324 rc.cpp:932
+#: rc.cpp:344
 msgid "Disabled intensity effect type"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:985
+#. i18n: file: colorsettings.ui:1005
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledIntensityBox)
-#: rc.cpp:327 rc.cpp:935
+#: rc.cpp:347
 msgctxt "no disabled intensity effect"
 msgid "None"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1011
+#. i18n: file: colorsettings.ui:1031
 #. i18n: ectx: property (toolTip), widget (QSlider, disabledIntensitySlider)
-#: rc.cpp:339 rc.cpp:947
+#: rc.cpp:359
 msgid "Disabled intensity effect amount"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1053
+#. i18n: file: colorsettings.ui:1073
 #. i18n: ectx: property (toolTip), widget (QComboBox, disabledColorBox)
-#: rc.cpp:345 rc.cpp:953
+#: rc.cpp:365
 msgid "Disabled color effect type"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1057
+#. i18n: file: colorsettings.ui:1077
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledColorBox)
-#: rc.cpp:348 rc.cpp:956
+#: rc.cpp:368
 msgctxt "no disabled color effect"
 msgid "None"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1083
+#. i18n: file: colorsettings.ui:1103
 #. i18n: ectx: property (toolTip), widget (QSlider, disabledColorSlider)
-#: rc.cpp:360 rc.cpp:968
+#: rc.cpp:380
 msgid "Disabled color effect amount"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1102
+#. i18n: file: colorsettings.ui:1122
 #. i18n: ectx: property (toolTip), widget (KColorButton, disabledColorButton)
-#: rc.cpp:363 rc.cpp:971
+#: rc.cpp:383
 msgid "Disabled color"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1119
+#. i18n: file: colorsettings.ui:1139
 #. i18n: ectx: property (toolTip), widget (QComboBox, disabledContrastBox)
-#: rc.cpp:369 rc.cpp:977
+#: rc.cpp:389
 msgid "Disabled contrast type"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1123
+#. i18n: file: colorsettings.ui:1143
 #. i18n: ectx: property (text), item, widget (QComboBox, disabledContrastBox)
-#: rc.cpp:372 rc.cpp:980
+#: rc.cpp:392
 msgctxt "no disabled contrast"
 msgid "None"
 msgstr ""
 
-#. i18n: file: colorsettings.ui:1144
+#. i18n: file: colorsettings.ui:1164
 #. i18n: ectx: property (toolTip), widget (QSlider, disabledContrastSlider)
-#: rc.cpp:381 rc.cpp:989
+#: rc.cpp:401
 msgid "Disabled contrast amount"
 msgstr ""
 
 #. i18n: file: preview.ui:29
 #. i18n: ectx: property (toolTip), widget (QLabel, label)
-#: rc.cpp:387 rc.cpp:995
+#: rc.cpp:407
 msgid "Window text on Window Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:32
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:390 rc.cpp:998
+#: rc.cpp:411
 msgctxt "color-kcm-preview"
 msgid "Window text"
 msgstr ""
 
 #. i18n: file: preview.ui:63
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView0)
-#: rc.cpp:393 rc.cpp:1001
+#: rc.cpp:414
 msgid "View Normal Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:66
 #. i18n: ectx: property (text), widget (QLabel, labelView0)
-#: rc.cpp:396 rc.cpp:1004
+#: rc.cpp:418
 msgctxt "color-kcm-preview"
 msgid "Normal text"
 msgstr ""
 
 #. i18n: file: preview.ui:78
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView3)
-#: rc.cpp:399 rc.cpp:1007
+#: rc.cpp:421
 msgid "View Link Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:81
 #. i18n: ectx: property (text), widget (QLabel, labelView3)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:199
 #. i18n: ectx: property (text), widget (QLabel, labelSelection3)
-#. i18n: file: preview.ui:81
-#. i18n: ectx: property (text), widget (QLabel, labelView3)
-#. i18n: file: preview.ui:199
-#. i18n: ectx: property (text), widget (QLabel, labelSelection3)
-#: rc.cpp:402 rc.cpp:450 rc.cpp:1010 rc.cpp:1058
+#: rc.cpp:425 rc.cpp:481
 msgctxt "color-kcm-preview"
 msgid "link"
 msgstr ""
 
 #. i18n: file: preview.ui:93
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView4)
-#: rc.cpp:405 rc.cpp:1013
+#: rc.cpp:428
 msgid "View Visited Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:96
 #. i18n: ectx: property (text), widget (QLabel, labelView4)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:214
 #. i18n: ectx: property (text), widget (QLabel, labelSelection4)
-#. i18n: file: preview.ui:96
-#. i18n: ectx: property (text), widget (QLabel, labelView4)
-#. i18n: file: preview.ui:214
-#. i18n: ectx: property (text), widget (QLabel, labelSelection4)
-#: rc.cpp:408 rc.cpp:456 rc.cpp:1016 rc.cpp:1064
+#: rc.cpp:432 rc.cpp:488
 msgctxt "color-kcm-preview"
 msgid "visited"
 msgstr ""
 
 #. i18n: file: preview.ui:103
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView2)
-#: rc.cpp:411 rc.cpp:1019
+#: rc.cpp:435
 msgid "View Active Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:106
 #. i18n: ectx: property (text), widget (QLabel, labelView2)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:224
 #. i18n: ectx: property (text), widget (QLabel, labelSelection2)
-#. i18n: file: preview.ui:106
-#. i18n: ectx: property (text), widget (QLabel, labelView2)
-#. i18n: file: preview.ui:224
-#. i18n: ectx: property (text), widget (QLabel, labelSelection2)
-#: rc.cpp:414 rc.cpp:462 rc.cpp:1022 rc.cpp:1070
+#: rc.cpp:439 rc.cpp:495
 msgctxt "color-kcm-preview"
 msgid "a"
 msgstr ""
 
 #. i18n: file: preview.ui:113
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView1)
-#: rc.cpp:417 rc.cpp:1025
+#: rc.cpp:442
 msgid "View Inactive Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:116
 #. i18n: ectx: property (text), widget (QLabel, labelView1)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:234
 #. i18n: ectx: property (text), widget (QLabel, labelSelection1)
-#. i18n: file: preview.ui:116
-#. i18n: ectx: property (text), widget (QLabel, labelView1)
-#. i18n: file: preview.ui:234
-#. i18n: ectx: property (text), widget (QLabel, labelSelection1)
-#: rc.cpp:420 rc.cpp:468 rc.cpp:1028 rc.cpp:1076
+#: rc.cpp:446 rc.cpp:502
 msgctxt "color-kcm-preview"
 msgid "i"
 msgstr ""
 
 #. i18n: file: preview.ui:123
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView5)
-#: rc.cpp:423 rc.cpp:1031
+#: rc.cpp:449
 msgid "View Negative Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:126
 #. i18n: ectx: property (text), widget (QLabel, labelView5)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:244
 #. i18n: ectx: property (text), widget (QLabel, labelSelection5)
-#. i18n: file: preview.ui:126
-#. i18n: ectx: property (text), widget (QLabel, labelView5)
-#. i18n: file: preview.ui:244
-#. i18n: ectx: property (text), widget (QLabel, labelSelection5)
-#: rc.cpp:426 rc.cpp:474 rc.cpp:1034 rc.cpp:1082
+#: rc.cpp:453 rc.cpp:509
 msgctxt "color-kcm-preview"
 msgid "!"
 msgstr ""
 
 #. i18n: file: preview.ui:133
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView6)
-#: rc.cpp:429 rc.cpp:1037
+#: rc.cpp:456
 msgid "View Neutral Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:136
 #. i18n: ectx: property (text), widget (QLabel, labelView6)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:254
 #. i18n: ectx: property (text), widget (QLabel, labelSelection6)
-#. i18n: file: preview.ui:136
-#. i18n: ectx: property (text), widget (QLabel, labelView6)
-#. i18n: file: preview.ui:254
-#. i18n: ectx: property (text), widget (QLabel, labelSelection6)
-#: rc.cpp:432 rc.cpp:480 rc.cpp:1040 rc.cpp:1088
+#: rc.cpp:460 rc.cpp:516
 msgctxt "color-kcm-preview"
 msgid "="
 msgstr ""
 
 #. i18n: file: preview.ui:143
 #. i18n: ectx: property (toolTip), widget (QLabel, labelView7)
-#: rc.cpp:435 rc.cpp:1043
+#: rc.cpp:463
 msgid "View Positive Text against View Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:146
 #. i18n: ectx: property (text), widget (QLabel, labelView7)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:264
 #. i18n: ectx: property (text), widget (QLabel, labelSelection7)
-#. i18n: file: preview.ui:146
-#. i18n: ectx: property (text), widget (QLabel, labelView7)
-#. i18n: file: preview.ui:264
-#. i18n: ectx: property (text), widget (QLabel, labelSelection7)
-#: rc.cpp:438 rc.cpp:486 rc.cpp:1046 rc.cpp:1094
+#: rc.cpp:467 rc.cpp:523
 msgctxt "color-kcm-preview"
 msgid "+"
 msgstr ""
 
 #. i18n: file: preview.ui:181
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection0)
-#: rc.cpp:441 rc.cpp:1049
+#: rc.cpp:470
 msgid "Selection Normal Text against Selection Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:184
 #. i18n: ectx: property (text), widget (QLabel, labelSelection0)
-#: rc.cpp:444 rc.cpp:1052
+#: rc.cpp:474
 msgctxt "color-kcm-preview"
 msgid "Selected text"
 msgstr ""
 
 #. i18n: file: preview.ui:196
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection3)
-#: rc.cpp:447 rc.cpp:1055
+#: rc.cpp:477
 msgid "Selection Link Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:211
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection4)
-#: rc.cpp:453 rc.cpp:1061
+#: rc.cpp:484
 msgid "Selection Visited Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:221
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection2)
-#: rc.cpp:459 rc.cpp:1067
+#: rc.cpp:491
 msgid "Selection Active Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:231
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection1)
-#: rc.cpp:465 rc.cpp:1073
+#: rc.cpp:498
 msgid "Selection Inactive Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:241
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection5)
-#: rc.cpp:471 rc.cpp:1079
+#: rc.cpp:505
 msgid "Selection Negative Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:251
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection6)
-#: rc.cpp:477 rc.cpp:1085
+#: rc.cpp:512
 msgid "Selection Neutral Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:261
 #. i18n: ectx: property (toolTip), widget (QLabel, labelSelection7)
-#: rc.cpp:483 rc.cpp:1091
+#: rc.cpp:519
 msgid "Selection Positive Text against Selection Normal Background"
 msgstr ""
 
 #. i18n: file: preview.ui:293
 #. i18n: ectx: property (toolTip), widget (QPushButton, pushButton)
-#: rc.cpp:489 rc.cpp:1097
+#: rc.cpp:526
 msgid "Button text on Button Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: preview.ui:296
 #. i18n: ectx: property (text), widget (QPushButton, pushButton)
-#: rc.cpp:492 rc.cpp:1100
+#: rc.cpp:530
 msgctxt "color-kcm-preview"
 msgid "Push Button"
 msgstr ""
@@ -1108,170 +1002,154 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore0)
 #. i18n: file: setpreview.ui:189
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack0)
-#. i18n: file: setpreview.ui:35
-#. i18n: ectx: property (toolTip), widget (QLabel, labelFore0)
-#. i18n: file: setpreview.ui:189
-#. i18n: ectx: property (toolTip), widget (QLabel, labelBack0)
-#: rc.cpp:495 rc.cpp:549 rc.cpp:1103 rc.cpp:1157
+#: rc.cpp:533 rc.cpp:596
 msgid "Normal Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:38
 #. i18n: ectx: property (text), widget (QLabel, labelFore0)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:192
 #. i18n: ectx: property (text), widget (QLabel, labelBack0)
-#. i18n: file: setpreview.ui:38
-#. i18n: ectx: property (text), widget (QLabel, labelFore0)
-#. i18n: file: setpreview.ui:192
-#. i18n: ectx: property (text), widget (QLabel, labelBack0)
-#: rc.cpp:498 rc.cpp:552 rc.cpp:1106 rc.cpp:1160
+#: rc.cpp:537 rc.cpp:600
 msgctxt "color-kcm-set-preview"
 msgid "normal"
 msgstr ""
 
 #. i18n: file: setpreview.ui:56
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore3)
-#: rc.cpp:501 rc.cpp:1109
+#: rc.cpp:540
 msgid "Link Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:59
 #. i18n: ectx: property (text), widget (QLabel, labelFore3)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:214
 #. i18n: ectx: property (text), widget (QLabel, labelBack3)
-#. i18n: file: setpreview.ui:59
-#. i18n: ectx: property (text), widget (QLabel, labelFore3)
-#. i18n: file: setpreview.ui:214
-#. i18n: ectx: property (text), widget (QLabel, labelBack3)
-#: rc.cpp:504 rc.cpp:559 rc.cpp:1112 rc.cpp:1167
+#: rc.cpp:544 rc.cpp:608
 msgctxt "color-kcm-set-preview"
 msgid "link"
 msgstr ""
 
 #. i18n: file: setpreview.ui:77
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore4)
-#: rc.cpp:507 rc.cpp:1115
+#: rc.cpp:547
 msgid "Visited Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:80
 #. i18n: ectx: property (text), widget (QLabel, labelFore4)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:236
 #. i18n: ectx: property (text), widget (QLabel, labelBack4)
-#. i18n: file: setpreview.ui:80
-#. i18n: ectx: property (text), widget (QLabel, labelFore4)
-#. i18n: file: setpreview.ui:236
-#. i18n: ectx: property (text), widget (QLabel, labelBack4)
-#: rc.cpp:510 rc.cpp:566 rc.cpp:1118 rc.cpp:1174
+#: rc.cpp:551 rc.cpp:616
 msgctxt "color-kcm-set-preview"
 msgid "visited"
 msgstr ""
 
 #. i18n: file: setpreview.ui:90
 #. i18n: ectx: property (toolTip), widget (QWidget, widgetFore2)
-#: rc.cpp:513 rc.cpp:1121
+#: rc.cpp:554
 msgid "Active Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:96
 #. i18n: ectx: property (text), widget (QLabel, labelFore2)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:253
 #. i18n: ectx: property (text), widget (QLabel, labelBack2)
-#. i18n: file: setpreview.ui:96
-#. i18n: ectx: property (text), widget (QLabel, labelFore2)
-#. i18n: file: setpreview.ui:253
-#. i18n: ectx: property (text), widget (QLabel, labelBack2)
-#: rc.cpp:516 rc.cpp:573 rc.cpp:1124 rc.cpp:1181
+#: rc.cpp:558 rc.cpp:624
 msgctxt "color-kcm-set-preview"
 msgid "active"
 msgstr ""
 
 #. i18n: file: setpreview.ui:109
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore1)
-#: rc.cpp:519 rc.cpp:1127
+#: rc.cpp:561
 msgid "Inactive Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:112
 #. i18n: ectx: property (text), widget (QLabel, labelFore1)
-#: rc.cpp:522 rc.cpp:1130
+#: rc.cpp:565
 msgctxt "color-kcm-set-preview"
 msgid "inactive"
 msgstr ""
 
 #. i18n: file: setpreview.ui:125
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore5)
-#: rc.cpp:525 rc.cpp:1133
+#: rc.cpp:568
 msgid "Negative Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:128
 #. i18n: ectx: property (text), widget (QLabel, labelFore5)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:286
 #. i18n: ectx: property (text), widget (QLabel, labelBack5)
-#. i18n: file: setpreview.ui:128
-#. i18n: ectx: property (text), widget (QLabel, labelFore5)
-#. i18n: file: setpreview.ui:286
-#. i18n: ectx: property (text), widget (QLabel, labelBack5)
-#: rc.cpp:528 rc.cpp:586 rc.cpp:1136 rc.cpp:1194
+#: rc.cpp:572 rc.cpp:639
 msgctxt "color-kcm-set-preview"
 msgid "negative"
 msgstr ""
 
 #. i18n: file: setpreview.ui:141
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore6)
-#: rc.cpp:531 rc.cpp:1139
+#: rc.cpp:575
 msgid "Neutral Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:144
 #. i18n: ectx: property (text), widget (QLabel, labelFore6)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:303
 #. i18n: ectx: property (text), widget (QLabel, labelBack6)
-#. i18n: file: setpreview.ui:144
-#. i18n: ectx: property (text), widget (QLabel, labelFore6)
-#. i18n: file: setpreview.ui:303
-#. i18n: ectx: property (text), widget (QLabel, labelBack6)
-#: rc.cpp:534 rc.cpp:593 rc.cpp:1142 rc.cpp:1201
+#: rc.cpp:579 rc.cpp:647
 msgctxt "color-kcm-set-preview"
 msgid "neutral"
 msgstr ""
 
 #. i18n: file: setpreview.ui:157
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore7)
-#: rc.cpp:537 rc.cpp:1145
+#: rc.cpp:582
 msgid "Positive Text on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:160
 #. i18n: ectx: property (text), widget (QLabel, labelFore7)
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:320
 #. i18n: ectx: property (text), widget (QLabel, labelBack7)
-#. i18n: file: setpreview.ui:160
-#. i18n: ectx: property (text), widget (QLabel, labelFore7)
-#. i18n: file: setpreview.ui:320
-#. i18n: ectx: property (text), widget (QLabel, labelBack7)
-#: rc.cpp:540 rc.cpp:600 rc.cpp:1148 rc.cpp:1208
+#: rc.cpp:586 rc.cpp:655
 msgctxt "color-kcm-set-preview"
 msgid "positive"
 msgstr ""
 
 #. i18n: file: setpreview.ui:170
 #. i18n: ectx: property (toolTip), widget (QWidget, widgetFore8)
-#: rc.cpp:543 rc.cpp:1151
+#: rc.cpp:589
 msgid "Hover on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:176
 #. i18n: ectx: property (text), widget (QLabel, labelFore8)
-#: rc.cpp:546 rc.cpp:1154
+#: rc.cpp:593
 msgctxt "color-kcm-set-preview"
 msgid "hover"
 msgstr ""
 
 #. i18n: file: setpreview.ui:211
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack3)
-#: rc.cpp:555 rc.cpp:1163
+#: rc.cpp:603
 msgid ""
 "Link Text on Link Background\n"
 "(Note: Link Background is derived from Link Text and cannot be separately "
@@ -1280,7 +1158,7 @@
 
 #. i18n: file: setpreview.ui:233
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack4)
-#: rc.cpp:562 rc.cpp:1170
+#: rc.cpp:611
 msgid ""
 "Visited Text on Visited Background\n"
 "(Note: Visited Background is derived from Visited Text and cannot be "
@@ -1289,7 +1167,7 @@
 
 #. i18n: file: setpreview.ui:250
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack2)
-#: rc.cpp:569 rc.cpp:1177
+#: rc.cpp:619
 msgid ""
 "Active Text on Active Background\n"
 "(Note: Active Background is derived from Active Text and cannot be "
@@ -1298,20 +1176,21 @@
 
 #. i18n: file: setpreview.ui:266
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack1)
-#: rc.cpp:576 rc.cpp:1184
+#: rc.cpp:627
 msgid "Inactive Text on Alternate Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:269
 #. i18n: ectx: property (text), widget (QLabel, labelBack1)
-#: rc.cpp:579 rc.cpp:1187
+#: rc.cpp:631
 msgctxt "color-kcm-set-preview"
 msgid "alternate"
 msgstr ""
 
 #. i18n: file: setpreview.ui:283
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack5)
-#: rc.cpp:582 rc.cpp:1190
+#: rc.cpp:634
 msgid ""
 "Negative Text on Negative Background\n"
 "(Note: Negative Background is derived from Negative Text and cannot be "
@@ -1320,7 +1199,7 @@
 
 #. i18n: file: setpreview.ui:300
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack6)
-#: rc.cpp:589 rc.cpp:1197
+#: rc.cpp:642
 msgid ""
 "Neutral Text on Neutral Background\n"
 "(Note: Neutral Background is derived from Neutral Text and cannot be "
@@ -1329,7 +1208,7 @@
 
 #. i18n: file: setpreview.ui:317
 #. i18n: ectx: property (toolTip), widget (QLabel, labelBack7)
-#: rc.cpp:596 rc.cpp:1204
+#: rc.cpp:650
 msgid ""
 "Positive Text on Positive Background\n"
 "(Note: Positive Background is derived from Positive Text and cannot be "
@@ -1338,13 +1217,14 @@
 
 #. i18n: file: setpreview.ui:333
 #. i18n: ectx: property (toolTip), widget (QLabel, labelFore9)
-#: rc.cpp:603 rc.cpp:1211
+#: rc.cpp:658
 msgid "Focus on Normal Background"
 msgstr ""
 
+#. i18n: see kdebase/workspace/kcontrol/colors/README.i18n
 #. i18n: file: setpreview.ui:336
 #. i18n: ectx: property (text), widget (QLabel, labelFore9)
-#: rc.cpp:606 rc.cpp:1214
+#: rc.cpp:662
 msgctxt "color-kcm-set-preview"
 msgid "focus"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcomponentchooser.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcomponentchooser.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcomponentchooser.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcomponentchooser.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:18+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:46+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: componentchooser.cpp:135
 msgid "Unknown"
@@ -138,31 +138,31 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: rc.cpp:93
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:94
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: browserconfig_ui.ui:12
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid "<qt>Open <b>http</b> and <b>https</b> URLs</qt>"
 msgstr "<qt>Agor URLau <b>http</b> ac <b>https</b></qt>"
 
 #. i18n: file: browserconfig_ui.ui:19
 #. i18n: ectx: property (text), widget (QRadioButton, radioKIO)
-#: rc.cpp:6
+#: rc.cpp:8
 msgid "in an application based on the contents of the URL"
 msgstr "mewn cymhwysiad a seilir ar gynnwys yr URL"
 
 #. i18n: file: browserconfig_ui.ui:29
 #. i18n: ectx: property (text), widget (QRadioButton, radioExec)
-#: rc.cpp:9
+#: rc.cpp:11
 msgid "in the following browser:"
 msgstr "yn y porydd gwe yma:"
 
@@ -174,13 +174,13 @@
 #. i18n: ectx: property (text), widget (QToolButton, btnSelectFileManager)
 #. i18n: file: terminalemulatorconfig_ui.ui:60
 #. i18n: ectx: property (text), widget (QToolButton, btnSelectTerminal)
-#: rc.cpp:12 rc.cpp:50 rc.cpp:65 rc.cpp:80
+#: rc.cpp:14 rc.cpp:52 rc.cpp:67 rc.cpp:82
 msgid "..."
 msgstr "..."
 
 #. i18n: file: componentchooser_ui.ui:26
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, GroupBox1)
-#: rc.cpp:15
+#: rc.cpp:17
 msgid ""
 "Here you can change the component program. Components are programs that "
 "handle basic tasks, like the terminal emulator, the text editor and the "
@@ -198,13 +198,13 @@
 
 #. i18n: file: componentchooser_ui.ui:29
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:18
+#: rc.cpp:20
 msgid "Default Component"
 msgstr "Cydran Ragosodedig"
 
 #. i18n: file: componentchooser_ui.ui:44
 #. i18n: ectx: property (whatsThis), widget (KListWidget, ServiceChooser)
-#: rc.cpp:21
+#: rc.cpp:23
 msgid ""
 "<qt>\n"
 "<p>This list shows the configurable component types. Click the component you "
@@ -230,32 +230,32 @@
 
 #. i18n: file: emailclientconfig_ui.ui:12
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, kmailCB)
-#: rc.cpp:27
+#: rc.cpp:29
 msgid "Kmail is the standard Mail program for the KDE desktop."
 msgstr "Kmail yw'r rhaglen safonol ebost ar gyfer y penbwrdd KDE."
 
 #. i18n: file: emailclientconfig_ui.ui:15
 #. i18n: ectx: property (text), widget (QRadioButton, kmailCB)
-#: rc.cpp:30
+#: rc.cpp:32
 msgid "&Use KMail as preferred email client"
 msgstr "&Defnyddio KMail yn hoff ddibynnydd ebost"
 
 #. i18n: file: emailclientconfig_ui.ui:22
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, otherCB)
-#: rc.cpp:33
+#: rc.cpp:35
 msgid "Select this option if you want to use any other mail program."
 msgstr ""
 "Dewiswch y dewisiad yma os hoffech ddefnyddio rhyw rhaglen ebost arall."
 
 #. i18n: file: emailclientconfig_ui.ui:25
 #. i18n: ectx: property (text), widget (QRadioButton, otherCB)
-#: rc.cpp:36
+#: rc.cpp:38
 msgid "Use a different &email client:"
 msgstr "Defnyddio dibynnydd &ebost arall:"
 
 #. i18n: file: emailclientconfig_ui.ui:53
 #. i18n: ectx: property (toolTip), widget (KLineEdit, txtEMailClient)
-#: rc.cpp:40
+#: rc.cpp:42
 #, no-c-format
 msgid ""
 "<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon "
@@ -265,7 +265,7 @@
 
 #. i18n: file: emailclientconfig_ui.ui:56
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, txtEMailClient)
-#: rc.cpp:44
+#: rc.cpp:46
 #, no-c-format
 msgid ""
 "Press this button to select your favorite email client. Please note that the "
@@ -279,13 +279,13 @@
 
 #. i18n: file: emailclientconfig_ui.ui:66
 #. i18n: ectx: property (whatsThis), widget (QToolButton, btnSelectEmail)
-#: rc.cpp:47
+#: rc.cpp:49
 msgid "Click here to browse for the mail program file."
 msgstr "Cliciwch yma i bori am y ffeil rhaglen ebost."
 
 #. i18n: file: emailclientconfig_ui.ui:99
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, chkRunTerminal)
-#: rc.cpp:53
+#: rc.cpp:55
 msgid ""
 "Activate this option if you want the selected email client to be executed in "
 "a terminal (e.g. <em>Konsole</em>)."
@@ -295,37 +295,37 @@
 
 #. i18n: file: emailclientconfig_ui.ui:102
 #. i18n: ectx: property (text), widget (QCheckBox, chkRunTerminal)
-#: rc.cpp:56
+#: rc.cpp:58
 msgid "&Run in terminal"
 msgstr "&Rhedeg mewn terfynnell"
 
 #. i18n: file: filemanagerconfig_ui.ui:12
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:59
+#: rc.cpp:61
 msgid "Browse directories using the following file manager:"
 msgstr ""
 
 #. i18n: file: filemanagerconfig_ui.ui:24
 #. i18n: ectx: property (text), widget (QRadioButton, radioExec)
-#: rc.cpp:62
+#: rc.cpp:64
 msgid "Other: click Add... in the dialog shown here:"
 msgstr ""
 
 #. i18n: file: terminalemulatorconfig_ui.ui:12
 #. i18n: ectx: property (text), widget (QRadioButton, terminalCB)
-#: rc.cpp:68
+#: rc.cpp:70
 msgid "&Use Konsole as terminal application"
 msgstr "&Defnyddio Konsole yn gymhwysiad terfynnell"
 
 #. i18n: file: terminalemulatorconfig_ui.ui:19
 #. i18n: ectx: property (text), widget (QRadioButton, otherCB)
-#: rc.cpp:71
+#: rc.cpp:73
 msgid "Use a different &terminal program:"
 msgstr "Defnyddio rhaglen d&erfynnell arall:"
 
 #. i18n: file: terminalemulatorconfig_ui.ui:47
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, terminalLE)
-#: rc.cpp:74
+#: rc.cpp:76
 msgid ""
 "Press this button to select your favorite terminal client. Please note that "
 "the file you select has to have the executable attribute set in order to be "
@@ -335,31 +335,31 @@
 
 #. i18n: file: terminalemulatorconfig_ui.ui:57
 #. i18n: ectx: property (whatsThis), widget (QToolButton, btnSelectTerminal)
-#: rc.cpp:77
+#: rc.cpp:79
 msgid "Click here to browse for terminal program."
 msgstr "Cliciwch yma i bori am y rhaglen derfynnell."
 
 #. i18n: file: wmconfig_ui.ui:12
 #. i18n: ectx: property (text), widget (QRadioButton, kwinRB)
-#: rc.cpp:83
+#: rc.cpp:85
 msgid "&Use the default KDE window manager (KWin)"
 msgstr ""
 
 #. i18n: file: wmconfig_ui.ui:19
 #. i18n: ectx: property (text), widget (QRadioButton, differentRB)
-#: rc.cpp:86
+#: rc.cpp:88
 msgid "Use a different &window manager:"
 msgstr ""
 
 #. i18n: file: wmconfig_ui.ui:60
 #. i18n: ectx: property (text), widget (KPushButton, configureButton)
-#: rc.cpp:89
+#: rc.cpp:91
 msgid "Configure"
 msgstr ""
 
 #. i18n: file: wmconfig_ui.ui:87
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:92
+#: rc.cpp:94
 msgid ""
 "Note: Most window managers have their own configuration and do not follow "
 "KDE settings."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcrypto.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcrypto.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmcrypto.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmcrypto.po	2012-04-18 08:59:29.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: kcmcrypto\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:22+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: certexport.cpp:49
 msgid "X509 Certificate Export"
@@ -788,115 +788,115 @@
 msgid "Second:"
 msgstr ""
 
-#: rc.cpp:52
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:53
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: certgen.ui:14
 #. i18n: ectx: property (windowTitle), widget (QDialog, D_GenCert)
-#: rc.cpp:3 rc.cpp:56
+#: rc.cpp:5
 msgid "Certificate Creation Wizard"
 msgstr ""
 
 #. i18n: file: certgen.ui:22
 #. i18n: ectx: property (text), widget (QLabel, T_CertType)
-#: rc.cpp:6 rc.cpp:59
+#: rc.cpp:8
 msgid "Certificate type:"
 msgstr ""
 
 #. i18n: file: certgen.ui:32
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:9 rc.cpp:62
+#: rc.cpp:11
 msgid "Passphrase:"
 msgstr ""
 
 #. i18n: file: certgen.ui:49
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#: rc.cpp:12 rc.cpp:65
+#: rc.cpp:14
 msgid "Passphrase (verify):"
 msgstr ""
 
 #. i18n: file: certgen.ui:69
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:15 rc.cpp:68
+#: rc.cpp:17
 msgid "Country code:"
 msgstr ""
 
 #. i18n: file: certgen.ui:83
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#: rc.cpp:18 rc.cpp:71
+#: rc.cpp:20
 msgid "State or province (in full):"
 msgstr ""
 
 #. i18n: file: certgen.ui:97
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:21 rc.cpp:74
+#: rc.cpp:23
 msgid "City:"
 msgstr ""
 
 #. i18n: file: certgen.ui:111
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#: rc.cpp:24 rc.cpp:77
+#: rc.cpp:26
 msgid "Organization name:"
 msgstr ""
 
 #. i18n: file: certgen.ui:125
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7)
-#: rc.cpp:27 rc.cpp:80
+#: rc.cpp:29
 msgid "Organizational unit/group:"
 msgstr ""
 
 #. i18n: file: certgen.ui:139
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8)
-#: rc.cpp:30 rc.cpp:83
+#: rc.cpp:32
 msgid "Full hostname of the server:"
 msgstr ""
 
 #. i18n: file: certgen.ui:153
 #. i18n: ectx: property (text), widget (QLabel, TextLabel9)
-#: rc.cpp:33 rc.cpp:86
+#: rc.cpp:35
 msgid "Email address:"
 msgstr ""
 
 #. i18n: file: certgen.ui:167
 #. i18n: ectx: property (text), widget (QLabel, TextLabel10)
-#: rc.cpp:36 rc.cpp:89
+#: rc.cpp:38
 msgid "Days valid:"
 msgstr ""
 
 #. i18n: file: certgen.ui:191
 #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1)
-#: rc.cpp:39 rc.cpp:92
+#: rc.cpp:41
 msgid "Self sign"
 msgstr ""
 
 #. i18n: file: certgen.ui:201
 #. i18n: ectx: property (text), widget (QLabel, TextLabel11)
-#: rc.cpp:42 rc.cpp:95
+#: rc.cpp:44
 msgid "Digest:"
 msgstr ""
 
 #. i18n: file: certgen.ui:211
 #. i18n: ectx: property (text), widget (QLabel, TextLabel12)
-#: rc.cpp:45 rc.cpp:98
+#: rc.cpp:47
 msgid "Alias:"
 msgstr ""
 
 #. i18n: file: certgen.ui:221
 #. i18n: ectx: property (text), widget (QCheckBox, CheckBox2)
-#: rc.cpp:48 rc.cpp:101
+#: rc.cpp:50
 msgid "Use DSA instead of RSA"
 msgstr ""
 
 #. i18n: file: certgen.ui:228
 #. i18n: ectx: property (text), widget (QLabel, TextLabel13)
-#: rc.cpp:51 rc.cpp:104
+#: rc.cpp:53
 msgid "Bit strength:"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmfonts.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmfonts.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmfonts.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmfonts.po	2012-04-18 08:59:37.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmfonts\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:10+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:20+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: fonts.cpp:229
 msgid "Configure Anti-Alias Settings"
@@ -100,101 +100,88 @@
 msgid "Desktop"
 msgstr ""
 
-#: fonts.cpp:541
+#: fonts.cpp:551
 msgid "Used for normal text (e.g. button labels, list items)."
 msgstr ""
 "Defnyddir ar gyfer testun arferol (e.e. labeli botymau, eitemau rhestr)."
 
-#: fonts.cpp:542
+#: fonts.cpp:552
 msgid "A non-proportional font (i.e. typewriter font)."
 msgstr "Wynebfath anghyfraneddol (h.y. wynebfath teipiadur)."
 
-#: fonts.cpp:543
+#: fonts.cpp:553
 msgid "Smallest font that is still readable well."
 msgstr ""
 
-#: fonts.cpp:544
+#: fonts.cpp:554
 msgid "Used to display text beside toolbar icons."
 msgstr "Defnyddir i ddangos testun heblaw am eiconau bar offer."
 
-#: fonts.cpp:545
+#: fonts.cpp:555
 msgid "Used by menu bars and popup menus."
 msgstr "Defnyddir gan farrau dewislenni a naidlenni."
 
-#: fonts.cpp:546
+#: fonts.cpp:556
 msgid "Used by the window titlebar."
 msgstr "Defnyddir gan far teitl y ffenestr."
 
-#: fonts.cpp:547
+#: fonts.cpp:557
 msgid "Used by the taskbar."
 msgstr "Defnyddir gan y bar tasgau."
 
-#: fonts.cpp:548
+#: fonts.cpp:558
 msgid "Used for desktop icons."
 msgstr "Defnyddir gan eiconau penbwrdd."
 
-#: fonts.cpp:587
+#: fonts.cpp:597
 #, kde-format
 msgctxt "Font role"
 msgid "%1: "
 msgstr ""
 
-#: fonts.cpp:600
+#: fonts.cpp:610
 msgid "Ad&just All Fonts..."
 msgstr "Adda&su Pob Wynebfath..."
 
-#: fonts.cpp:601
+#: fonts.cpp:611
 msgid "Click to change all fonts"
 msgstr "Cliciwch i newid pob wynebfath"
 
-#: fonts.cpp:612
+#: fonts.cpp:622
 msgid "Use a&nti-aliasing:"
 msgstr ""
 
-#: fonts.cpp:616
+#: fonts.cpp:626
 msgctxt "Use anti-aliasing"
 msgid "Enabled"
 msgstr ""
 
-#: fonts.cpp:617
+#: fonts.cpp:627
 msgctxt "Use anti-aliasing"
 msgid "System Settings"
 msgstr ""
 
-#: fonts.cpp:618
+#: fonts.cpp:628
 msgctxt "Use anti-aliasing"
 msgid "Disabled"
 msgstr ""
 
-#: fonts.cpp:619
+#: fonts.cpp:629
 msgid ""
 "If this option is selected, KDE will smooth the edges of curves in fonts."
 msgstr ""
 "Os dewisir y dewisiad yma, bydd KDE yn llyfnhau ymylon cromlinau mewn "
 "wynebfathau."
 
-#: fonts.cpp:621
+#: fonts.cpp:631
 msgid "Configure..."
 msgstr "Ffurfweddu..."
 
-#: fonts.cpp:628
+#: fonts.cpp:639
 msgid "Force fonts DPI:"
 msgstr ""
 
-#: fonts.cpp:633
-msgctxt "Force fonts DPI"
-msgid "Disabled"
-msgstr ""
-
-#: fonts.cpp:634
-msgid "96 DPI"
-msgstr ""
-
-#: fonts.cpp:635
-msgid "120 DPI"
-msgstr ""
-
-#: fonts.cpp:637
+#: fonts.cpp:645
 msgid ""
 "<p>This option forces a specific DPI value for fonts. It may be useful when "
 "the real DPI of the hardware is not detected properly and it is also often "
@@ -208,17 +195,17 @@
 "should be checked.</p>"
 msgstr ""
 
-#: fonts.cpp:780
+#: fonts.cpp:806
 msgid ""
-"<p>Some changes such as anti-aliasing will only affect newly started "
+"<p>Some changes such as anti-aliasing or DPI will only affect newly started "
 "applications.</p>"
 msgstr ""
 
-#: fonts.cpp:781 fonts.cpp:790
+#: fonts.cpp:807 fonts.cpp:817
 msgid "Font Settings Changed"
 msgstr ""
 
-#: fonts.cpp:789
+#: fonts.cpp:816
 msgid ""
 "<p>Some changes such as DPI will only affect newly started applications.</p>"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmhtmlsearch.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmhtmlsearch.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmhtmlsearch.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmhtmlsearch.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmhtmlsearch\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:33+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:47+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:10+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmhtmlsearch.cpp:48
 msgid "ht://dig"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmicons.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmicons.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmicons.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmicons.po	2012-04-18 08:59:34.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: kcmicons\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:15+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:47+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: icons.cpp:49
 msgid "Use of Icon"
@@ -92,55 +92,55 @@
 msgid "Setup Disabled Icon Effect"
 msgstr "Gosod Effaith Eicon Analluog"
 
-#: icons.cpp:518
+#: icons.cpp:517
 msgid "&Effect:"
 msgstr "&Effaith:"
 
-#: icons.cpp:521
+#: icons.cpp:520
 msgid "No Effect"
 msgstr "Dim Effaith"
 
-#: icons.cpp:522
+#: icons.cpp:521
 msgid "To Gray"
 msgstr "I Lwyd"
 
-#: icons.cpp:523
+#: icons.cpp:522
 msgid "Colorize"
 msgstr "Lliweiddio"
 
-#: icons.cpp:524
+#: icons.cpp:523
 msgid "Gamma"
 msgstr "Gama"
 
-#: icons.cpp:525
+#: icons.cpp:524
 msgid "Desaturate"
 msgstr "Dad-ddirlenwi"
 
-#: icons.cpp:526
+#: icons.cpp:525
 msgid "To Monochrome"
 msgstr ""
 
-#: icons.cpp:531
+#: icons.cpp:530
 msgid "&Semi-transparent"
 msgstr "&Lled-dryloyw"
 
-#: icons.cpp:535
+#: icons.cpp:534
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#: icons.cpp:546
+#: icons.cpp:545
 msgid "Effect Parameters"
 msgstr "Paramedrau Effaith"
 
-#: icons.cpp:555
+#: icons.cpp:554
 msgid "&Amount:"
 msgstr "&Maint:"
 
-#: icons.cpp:561
+#: icons.cpp:560
 msgid "Co&lor:"
 msgstr "&Lliw:"
 
-#: icons.cpp:567
+#: icons.cpp:566
 msgid "&Second color:"
 msgstr ""
 
@@ -152,61 +152,61 @@
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: iconthemes.cpp:100
+#: iconthemes.cpp:101
 msgid "Install Theme File..."
 msgstr ""
 
-#: iconthemes.cpp:102
+#: iconthemes.cpp:103
 msgid "Install a theme archive file you already have locally"
 msgstr ""
 
-#: iconthemes.cpp:103
+#: iconthemes.cpp:104
 msgid ""
 "If you already have a theme archive locally, this button will unpack it and "
 "make it available for KDE applications"
 msgstr ""
 
-#: iconthemes.cpp:106
+#: iconthemes.cpp:107
 msgid "Get New Themes..."
 msgstr ""
 
-#: iconthemes.cpp:108
+#: iconthemes.cpp:109
 msgid "Get new themes from the Internet"
 msgstr ""
 
-#: iconthemes.cpp:109
+#: iconthemes.cpp:110
 msgid ""
 "You need to be connected to the Internet to use this action. A dialog will "
 "display a list of themes from the http://www.kde.org website. Clicking the "
 "Install button associated with a theme will install this theme locally."
 msgstr ""
 
-#: iconthemes.cpp:112
+#: iconthemes.cpp:113
 msgid "Remove Theme"
 msgstr "Gwaredu Thema"
 
-#: iconthemes.cpp:114
+#: iconthemes.cpp:115
 msgid "Remove the selected theme from your disk"
 msgstr ""
 
-#: iconthemes.cpp:115
+#: iconthemes.cpp:116
 msgid "This will remove the selected theme from your disk."
 msgstr ""
 
-#: iconthemes.cpp:119
+#: iconthemes.cpp:120
 msgid "Select the icon theme you want to use:"
 msgstr "Dewiswch y thema eiconau yr hoffech ei defnyddio:"
 
-#: iconthemes.cpp:186
+#: iconthemes.cpp:188
 msgid "Drag or Type Theme URL"
 msgstr "Llusgwch neu Deipiwch URL Thema"
 
-#: iconthemes.cpp:197
+#: iconthemes.cpp:199
 #, kde-format
 msgid "Unable to find the icon theme archive %1."
 msgstr "Methu canfod yr archif thema eiconau %1."
 
-#: iconthemes.cpp:200
+#: iconthemes.cpp:202
 #, kde-format
 msgid ""
 "Unable to download the icon theme archive;\n"
@@ -215,11 +215,11 @@
 "Methu lawrlwytho'r archif thema eiconau;\n"
 "gwiriwch bod y cyfeiriad %1 yn gywir."
 
-#: iconthemes.cpp:209
+#: iconthemes.cpp:211
 msgid "The file is not a valid icon theme archive."
 msgstr "Nid yw'r ffeil yn archif thema eiconau dilys."
 
-#: iconthemes.cpp:220
+#: iconthemes.cpp:222
 msgid ""
 "A problem occurred during the installation process; however, most of the "
 "themes in the archive have been installed"
@@ -227,23 +227,23 @@
 "Bu problem yn ystod y broses gosod; serch hynny, arsefydlwyd y rhan fwyaf "
 "o'r themau oedd yn yr archif."
 
-#: iconthemes.cpp:242
+#: iconthemes.cpp:244
 msgid "Installing icon themes"
 msgstr "Yn gosod themau eiconau"
 
-#: iconthemes.cpp:261
+#: iconthemes.cpp:263
 #, kde-format
 msgid "<qt>Installing <strong>%1</strong> theme</qt>"
 msgstr "<qt>Yn gosod thema <strong>%1</strong></qt>"
 
-#: iconthemes.cpp:354
+#: iconthemes.cpp:355
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to remove the <strong>%1</strong> icon theme?<br "
 "/><br />This will delete the files installed by this theme.</qt>"
 msgstr ""
 
-#: iconthemes.cpp:362
+#: iconthemes.cpp:363
 msgid "Confirmation"
 msgstr "Gwiriad"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcminfo.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcminfo.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcminfo.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcminfo.po	2012-04-18 08:59:37.000000000 +0000
@@ -11,21 +11,23 @@
 msgstr ""
 "Project-Id-Version: kcminfo\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:04+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:38+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:21+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: info.cpp:40
 msgid "System Information Control Module"
 msgstr ""
 
-#: info.cpp:29
+#: info.cpp:42
 msgid ""
 "(c) 2008 Nicolas Ternisien\n"
 "(c) 1998 - 2002 Helge Deller"
@@ -33,47 +35,47 @@
 "(c) 2008 Nicolas Ternisien\n"
 "(c) 1998 - 2002 Helge Deller"
 
-#: info.cpp:32
+#: info.cpp:45
 msgid "Nicolas Ternisien"
 msgstr "Nicolas Ternisien"
 
-#: info.cpp:33
+#: info.cpp:46
 msgid "Helge Deller"
 msgstr "Helge Deller"
 
-#: info.cpp:53
+#: info.cpp:68
 msgid "This list displays system information on the selected category."
 msgstr "Mae'r rhestr yn dangos gwybodaeth ynglŷn â'r categori a ddewisoch."
 
-#: info.cpp:69
+#: info.cpp:84
 #, kde-format
 msgctxt "%1 is one of the modules of the kinfocenter, cpu info, os info, etc"
 msgid "No information available about %1."
 msgstr "Dim gwybodaeth ar gael am %1."
 
-#: info.cpp:100
+#: info.cpp:115
 msgid ""
 "All the information modules return information about a certain aspect of "
 "your computer hardware or your operating system."
 msgstr ""
 
-#: main.cpp:60
+#: main.cpp:57
 msgid "Interrupt"
 msgstr "Ymyriad"
 
-#: main.cpp:63
+#: main.cpp:60
 msgid "I/O-Port"
 msgstr "Porth I/O"
 
-#: main.cpp:69
+#: main.cpp:63
 msgid "SCSI"
 msgstr "SCSI"
 
-#: main.cpp:72
+#: main.cpp:66
 msgid "DMA-Channel"
 msgstr "Sianel DMA"
 
-#: main.cpp:78
+#: main.cpp:69
 msgid "X-Server"
 msgstr "Gweinydd-X"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcminput.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcminput.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcminput.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcminput.po	2012-04-18 08:59:37.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: kcminput\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:13+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:44+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmcursortheme.cpp:40
 msgid "Cursor Theme"
@@ -368,94 +368,75 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: rc.cpp:64
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:65
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: logitechmouse_base.ui:8
-#. i18n: ectx: property (text), widget (QLabel, cordlessNameLabel)
-#: rc.cpp:39 rc.cpp:113
-msgid "Cordless Name"
-msgstr ""
-
-#. i18n: file: logitechmouse_base.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, resolutionSelector)
-#: rc.cpp:42 rc.cpp:116
-msgid "Sensor Resolution"
-msgstr ""
-
-#. i18n: file: logitechmouse_base.ui:27
-#. i18n: ectx: property (text), widget (QRadioButton, button400cpi)
-#: rc.cpp:45 rc.cpp:119
-msgid "400 counts per inch"
-msgstr ""
-
-#. i18n: file: logitechmouse_base.ui:37
-#. i18n: ectx: property (text), widget (QRadioButton, button800cpi)
-#: rc.cpp:48 rc.cpp:122
-msgid "800 counts per inch"
+#. i18n: file: xcursor/themepage.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:5
+msgid ""
+"Select the cursor theme you want to use (hover preview to test cursor):"
 msgstr ""
 
-#. i18n: file: logitechmouse_base.ui:53
-#. i18n: ectx: property (title), widget (QGroupBox, batteryBox)
-#: rc.cpp:51 rc.cpp:125
-msgid "Battery Level"
+#. i18n: file: xcursor/themepage.ui:56
+#. i18n: ectx: property (toolTip), widget (KPushButton, installKnsButton)
+#: rc.cpp:8
+msgid "Get new color schemes from the Internet"
 msgstr ""
 
-#. i18n: file: logitechmouse_base.ui:72
-#. i18n: ectx: property (title), widget (QGroupBox, channelSelector)
-#: rc.cpp:54 rc.cpp:128
-msgid "RF Channel"
+#. i18n: file: xcursor/themepage.ui:59
+#. i18n: ectx: property (text), widget (KPushButton, installKnsButton)
+#: rc.cpp:11
+msgid "Get New Theme..."
 msgstr ""
 
-#. i18n: file: logitechmouse_base.ui:78
-#. i18n: ectx: property (text), widget (QRadioButton, channel1)
-#: rc.cpp:57 rc.cpp:131
-msgid "Channel 1"
+#. i18n: file: xcursor/themepage.ui:66
+#. i18n: ectx: property (text), widget (KPushButton, installButton)
+#: rc.cpp:14
+msgid "Install From File..."
 msgstr ""
 
-#. i18n: file: logitechmouse_base.ui:94
-#. i18n: ectx: property (text), widget (QRadioButton, channel2)
-#: rc.cpp:60 rc.cpp:134
-msgid "Channel 2"
-msgstr ""
+#. i18n: file: xcursor/themepage.ui:73
+#. i18n: ectx: property (text), widget (KPushButton, removeButton)
+#: rc.cpp:17
+msgid "Remove Theme"
+msgstr "Gwaredu Thema"
 
-#. i18n: file: logitechmouse_base.ui:107
-#. i18n: ectx: property (text), widget (QLabel, permissionProblemText)
-#: rc.cpp:63 rc.cpp:137
-msgid ""
-"You have a Logitech Mouse connected, and libusb was found at compile time, "
-"but it was not possible to access this mouse. This is probably caused by a "
-"permissions problem - you should consult the manual on how to fix this."
+#. i18n: file: xcursor/themepage.ui:99
+#. i18n: ectx: property (text), widget (QLabel, sizeLabel)
+#: rc.cpp:20
+msgctxt "@label:listbox cursor size"
+msgid "Size:"
 msgstr ""
 
 #. i18n: file: kmousedlg.ui:27
 #. i18n: ectx: property (title), widget (QGroupBox, handedBox)
-#: rc.cpp:3 rc.cpp:77
+#: rc.cpp:23
 msgid "Button Order"
 msgstr "Trefn Botymau"
 
 #. i18n: file: kmousedlg.ui:36
 #. i18n: ectx: property (text), widget (QRadioButton, rightHanded)
-#: rc.cpp:6 rc.cpp:80
+#: rc.cpp:26
 msgid "Righ&t handed"
 msgstr "Llaw &Dde"
 
 #. i18n: file: kmousedlg.ui:46
 #. i18n: ectx: property (text), widget (QRadioButton, leftHanded)
-#: rc.cpp:9 rc.cpp:83
+#: rc.cpp:29
 msgid "Le&ft handed"
 msgstr "Llaw &Chwith"
 
 #. i18n: file: kmousedlg.ui:72
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbScrollPolarity)
-#: rc.cpp:12 rc.cpp:86
+#: rc.cpp:32
 msgid ""
 "Change the direction of scrolling for the mouse wheel or the 4th and 5th "
 "mouse buttons."
@@ -465,103 +446,129 @@
 
 #. i18n: file: kmousedlg.ui:75
 #. i18n: ectx: property (text), widget (QCheckBox, cbScrollPolarity)
-#: rc.cpp:15 rc.cpp:89
+#: rc.cpp:35
 msgid "Re&verse scroll direction"
 msgstr "Gwrthdro&i cyfeiriad sgrolio"
 
 #. i18n: file: kmousedlg.ui:105
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:18 rc.cpp:92
+#: rc.cpp:38
 msgid "Icons"
 msgstr "Eiconau"
 
 #. i18n: file: kmousedlg.ui:111
 #. i18n: ectx: property (text), widget (QRadioButton, doubleClick)
-#: rc.cpp:21 rc.cpp:95
+#: rc.cpp:41
 msgid "Dou&ble-click to open files and folders (select icons on first click)"
 msgstr ""
 "Clicio'n ddw&bl i agor ffeiliau a phlygelli (dewis eiconau ar y clic gyntaf)"
 
 #. i18n: file: kmousedlg.ui:121
 #. i18n: ectx: property (text), widget (QRadioButton, singleClick)
-#: rc.cpp:24 rc.cpp:98
+#: rc.cpp:44
 msgid "&Single-click to open files and folders"
 msgstr "Clic &unigol i agor ffeiliau a phlygelli"
 
 #. i18n: file: kmousedlg.ui:151
 #. i18n: ectx: property (text), widget (QCheckBox, cb_pointershape)
-#: rc.cpp:27 rc.cpp:101
+#: rc.cpp:47
 msgid "Cha&nge pointer shape over icons"
 msgstr "&Newid ffurf y pwyntydd dros eiconau"
 
 #. i18n: file: kmousedlg.ui:161
 #. i18n: ectx: property (text), widget (QCheckBox, cbAutoSelect)
-#: rc.cpp:30 rc.cpp:104
+#: rc.cpp:50
 msgid "A&utomatically select icons"
 msgstr "Dewis eiconau'n &ymysgogol"
 
 #. i18n: file: kmousedlg.ui:195
 #. i18n: ectx: property (label), widget (KIntNumInput, slAutoSelect)
-#: rc.cpp:33 rc.cpp:107
+#: rc.cpp:53
 msgctxt "label. delay (on milliseconds) to automatically select icons"
 msgid "Delay"
 msgstr ""
 
 #. i18n: file: kmousedlg.ui:207
 #. i18n: ectx: property (suffix), widget (KIntNumInput, slAutoSelect)
-#: rc.cpp:36 rc.cpp:110
+#: rc.cpp:56
 msgctxt "milliseconds. time to automatically select the items"
 msgid " ms"
 msgstr ""
 
-#. i18n: file: xcursor/themepage.ui:31
-#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: logitechmouse_base.ui:8
+#. i18n: ectx: property (text), widget (QLabel, cordlessNameLabel)
+#: rc.cpp:59
+msgid "Cordless Name"
+msgstr ""
+
+#. i18n: file: logitechmouse_base.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, resolutionSelector)
+#: rc.cpp:62
+msgid "Sensor Resolution"
+msgstr ""
+
+#. i18n: file: logitechmouse_base.ui:27
+#. i18n: ectx: property (text), widget (QRadioButton, button400cpi)
+#: rc.cpp:65
+msgid "400 counts per inch"
+msgstr ""
+
+#. i18n: file: logitechmouse_base.ui:37
+#. i18n: ectx: property (text), widget (QRadioButton, button800cpi)
 #: rc.cpp:68
-msgid ""
-"Select the cursor theme you want to use (hover preview to test cursor):"
+msgid "800 counts per inch"
 msgstr ""
 
-#. i18n: file: xcursor/themepage.ui:56
-#. i18n: ectx: property (toolTip), widget (KPushButton, installKnsButton)
+#. i18n: file: logitechmouse_base.ui:53
+#. i18n: ectx: property (title), widget (QGroupBox, batteryBox)
 #: rc.cpp:71
-msgid "Get new color schemes from the Internet"
+msgid "Battery Level"
 msgstr ""
 
-#. i18n: file: xcursor/themepage.ui:59
-#. i18n: ectx: property (text), widget (KPushButton, installKnsButton)
+#. i18n: file: logitechmouse_base.ui:72
+#. i18n: ectx: property (title), widget (QGroupBox, channelSelector)
 #: rc.cpp:74
-msgid "Get New Theme..."
+msgid "RF Channel"
 msgstr ""
 
-#. i18n: file: xcursor/themepage.ui:66
-#. i18n: ectx: property (text), widget (KPushButton, installButton)
+#. i18n: file: logitechmouse_base.ui:78
+#. i18n: ectx: property (text), widget (QRadioButton, channel1)
 #: rc.cpp:77
-msgid "Install From File..."
+msgid "Channel 1"
 msgstr ""
 
-#. i18n: file: xcursor/themepage.ui:38
-#. i18n: ectx: property (text), widget (KPushButton, removeButton)
-#: rc.cpp:71
-msgid "Remove Theme"
-msgstr "Gwaredu Thema"
+#. i18n: file: logitechmouse_base.ui:94
+#. i18n: ectx: property (text), widget (QRadioButton, channel2)
+#: rc.cpp:80
+msgid "Channel 2"
+msgstr ""
+
+#. i18n: file: logitechmouse_base.ui:107
+#. i18n: ectx: property (text), widget (QLabel, permissionProblemText)
+#: rc.cpp:83
+msgid ""
+"You have a Logitech Mouse connected, and libusb was found at compile time, "
+"but it was not possible to access this mouse. This is probably caused by a "
+"permissions problem - you should consult the manual on how to fix this."
+msgstr ""
 
 #: core/themepage.cpp:54
 msgid "Select the cursor theme you want to use:"
 msgstr "Dewis y thema cyrchydd yr hoffech ddefnyddio:"
 
-#: core/themepage.cpp:59 xcursor/thememodel.cpp:67
+#: core/themepage.cpp:59 xcursor/thememodel.cpp:75
 msgid "Name"
 msgstr "Enw"
 
-#: core/themepage.cpp:59 xcursor/thememodel.cpp:70
+#: core/themepage.cpp:59 xcursor/thememodel.cpp:78
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: core/themepage.cpp:100 xcursor/themepage.cpp:196
+#: core/themepage.cpp:100 xcursor/themepage.cpp:328
 msgid "You have to restart KDE for these changes to take effect."
 msgstr "Rhaid ailgychwyn KDE i'r newidiadau yma ddod i rym."
 
-#: core/themepage.cpp:101 xcursor/themepage.cpp:197
+#: core/themepage.cpp:101 xcursor/themepage.cpp:329
 msgid "Cursor Settings Changed"
 msgstr "Newidwyd Gosodiadau'r Cyrchydd"
 
@@ -605,16 +612,21 @@
 msgid "The default cursor theme in KDE 2 and 3"
 msgstr ""
 
-#: xcursor/themepage.cpp:284
+#: xcursor/themepage.cpp:155
+msgctxt "@item:inlistbox size"
+msgid "resolution dependent"
+msgstr ""
+
+#: xcursor/themepage.cpp:444
 msgid "Drag or Type Theme URL"
 msgstr "Llusgo neu Deipio URL y Thema"
 
-#: xcursor/themepage.cpp:295
+#: xcursor/themepage.cpp:455
 #, kde-format
 msgid "Unable to find the cursor theme archive %1."
 msgstr "Methu canfod yr archif themau cyrchydd %1."
 
-#: xcursor/themepage.cpp:298
+#: xcursor/themepage.cpp:458
 #, kde-format
 msgid ""
 "Unable to download the cursor theme archive; please check that the address "
@@ -623,29 +635,29 @@
 "Methu lawrlwytho'r archif themau cyrchydd; gwiriwch bod y cyfeiriad %1 yn "
 "iawn."
 
-#: xcursor/themepage.cpp:307
+#: xcursor/themepage.cpp:467
 #, kde-format
 msgid "The file %1 does not appear to be a valid cursor theme archive."
 msgstr "Ymddengys nad yw'r ffeil %1 yn archif themau cyrchydd dilys."
 
-#: xcursor/themepage.cpp:322
+#: xcursor/themepage.cpp:482
 msgid ""
 "<qt>You cannot delete the theme you are currently using.<br />You have to "
 "switch to another theme first.</qt>"
 msgstr ""
 
-#: xcursor/themepage.cpp:328
+#: xcursor/themepage.cpp:488
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to remove the <i>%1</i> cursor theme?<br />This "
 "will delete all the files installed by this theme.</qt>"
 msgstr ""
 
-#: xcursor/themepage.cpp:334
+#: xcursor/themepage.cpp:494
 msgid "Confirmation"
 msgstr "Cadarnhad"
 
-#: xcursor/themepage.cpp:391
+#: xcursor/themepage.cpp:551
 #, kde-format
 msgid ""
 "A theme named %1 already exists in your icon theme folder. Do you want "
@@ -654,10 +666,14 @@
 "Mae thema o'r enw %1 yn bodoli eisoes yn eich plygell temau eicon.  Ydych "
 "eisiau ei amnewid efo'r un yma?"
 
-#: xcursor/themepage.cpp:395
+#: xcursor/themepage.cpp:555
 msgid "Overwrite Theme?"
 msgstr "Drosysgrifo'r thema?"
 
-#: xcursor/xcursortheme.cpp:39
-msgid "No description available"
-msgstr "Dim disgrifiad ar gael"
+#: xcursor/xcursortheme.cpp:74
+#, kde-format
+msgctxt ""
+"@info/plain The argument is the list of available sizes (in pixel). Example: "
+"'Available sizes: 24' or 'Available sizes: 24, 36, 48'"
+msgid "(Available sizes: %1)"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkamera.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkamera.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkamera.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkamera.po	2012-04-18 08:59:39.000000000 +0000
@@ -2,17 +2,25 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdegraphics/kcmkamera.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-09 13:28+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-02-15 21:41+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:52+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kamera.cpp:99
+#: kameraconfigdialog.cpp:230
+msgid "Button (not supported by KControl)"
+msgstr ""
+
+#: kameraconfigdialog.cpp:238
+msgid "Date (not supported by KControl)"
+msgstr ""
+
+#: kamera.cpp:94
 msgid "Unable to initialize the gPhoto2 libraries."
 msgstr ""
 
@@ -70,11 +78,11 @@
 msgid "Click this button to cancel the current camera operation."
 msgstr ""
 
-#: kamera.cpp:347
+#: kamera.cpp:351
 msgid "Camera test was successful."
 msgstr ""
 
-#: kamera.cpp:428
+#: kamera.cpp:433
 msgid ""
 "<h1>Digital Camera</h1>\n"
 "This module allows you to configure support for your digital camera.\n"
@@ -87,60 +95,52 @@
 "<a href=\"camera:/\">camera:/</a> in Konqueror and other KDE applications."
 msgstr ""
 
-#: kameraconfigdialog.cpp:226
-msgid "Button (not supported by KControl)"
-msgstr ""
-
-#: kameraconfigdialog.cpp:234
-msgid "Date (not supported by KControl)"
-msgstr ""
-
-#: kameradevice.cpp:82
+#: kameradevice.cpp:78
 msgid "Could not allocate memory for the abilities list."
 msgstr ""
 
-#: kameradevice.cpp:86
+#: kameradevice.cpp:82
 msgid "Could not load ability list."
 msgstr ""
 
-#: kameradevice.cpp:91 kameradevice.cpp:461 kameradevice.cpp:475
+#: kameradevice.cpp:87 kameradevice.cpp:469 kameradevice.cpp:483
 #, kde-format
 msgid ""
 "Description of abilities for camera %1 is not available. Configuration "
 "options may be incorrect."
 msgstr ""
 
-#: kameradevice.cpp:114
+#: kameradevice.cpp:110
 msgid "Could not access driver. Check your gPhoto2 installation."
 msgstr ""
 
-#: kameradevice.cpp:134
+#: kameradevice.cpp:130
 msgid ""
 "Unable to initialize camera. Check your port settings and camera "
 "connectivity and try again."
 msgstr ""
 
-#: kameradevice.cpp:158
+#: kameradevice.cpp:154
 msgid "No camera summary information is available.\n"
 msgstr ""
 
-#: kameradevice.cpp:171 kameradevice.cpp:181
+#: kameradevice.cpp:167 kameradevice.cpp:177
 msgid "Camera configuration failed."
 msgstr ""
 
-#: kameradevice.cpp:216 kameradevice.cpp:323
+#: kameradevice.cpp:212 kameradevice.cpp:322
 msgid "Serial"
 msgstr "Cyfresol"
 
-#: kameradevice.cpp:217 kameradevice.cpp:326
+#: kameradevice.cpp:213 kameradevice.cpp:325
 msgid "USB"
 msgstr "USB"
 
-#: kameradevice.cpp:218
+#: kameradevice.cpp:214
 msgid "Unknown port"
 msgstr ""
 
-#: kameradevice.cpp:279
+#: kameradevice.cpp:275
 msgid "Select Camera Device"
 msgstr ""
 
@@ -149,38 +149,38 @@
 msgid "Supported Cameras"
 msgstr ""
 
-#: kameradevice.cpp:314 kameradevice.cpp:333
+#: kameradevice.cpp:313 kameradevice.cpp:334
 msgid "Port"
 msgstr "Porth"
 
-#: kameradevice.cpp:318
+#: kameradevice.cpp:317
 msgid "Port Settings"
 msgstr ""
 
-#: kameradevice.cpp:325
+#: kameradevice.cpp:324
 msgid ""
 "If this option is checked, the camera has to be connected to one of the "
 "computer's serial ports (known as COM ports in Microsoft Windows.)"
 msgstr ""
 
-#: kameradevice.cpp:328
+#: kameradevice.cpp:327
 msgid ""
 "If this option is checked, the camera has to be connected to one of the "
 "computer's USB ports, or to a USB hub."
 msgstr ""
 
-#: kameradevice.cpp:342
+#: kameradevice.cpp:344
 msgid "No port type selected."
 msgstr ""
 
-#: kameradevice.cpp:348
+#: kameradevice.cpp:353
 msgid "Port:"
 msgstr "Porth:"
 
-#: kameradevice.cpp:351
+#: kameradevice.cpp:356
 msgid "Specify here the serial port to which you connect the camera."
 msgstr ""
 
-#: kameradevice.cpp:355
+#: kameradevice.cpp:363
 msgid "No further configuration is required for USB cameras."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkclock.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkclock.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkclock.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkclock.po	2012-04-18 08:59:37.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: kcmkclock\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:03+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:37+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: dtime.cpp:79
 msgid ""
@@ -123,37 +123,37 @@
 msgid "Unable to authenticate/execute the action: %1, %2"
 msgstr ""
 
-#: rc.cpp:22
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:23
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: dateandtime.ui:22
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:3 rc.cpp:26
+#: rc.cpp:5
 msgid "Date and Time"
 msgstr ""
 
 #. i18n: file: dateandtime.ui:30
 #. i18n: ectx: property (text), widget (QCheckBox, setDateTimeAuto)
-#: rc.cpp:6 rc.cpp:29
+#: rc.cpp:8
 msgid "Set date and time &automatically:"
 msgstr ""
 
 #. i18n: file: dateandtime.ui:53
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:9 rc.cpp:32
+#: rc.cpp:11
 msgid "Time server:"
 msgstr ""
 
 #. i18n: file: dateandtime.ui:83
 #. i18n: ectx: property (whatsThis), widget (KDatePicker, cal)
-#: rc.cpp:12 rc.cpp:35
+#: rc.cpp:14
 msgid ""
 "Here you can change the system date's day of the month, month and year."
 msgstr ""
@@ -162,18 +162,24 @@
 
 #. i18n: file: dateandtime.ui:116
 #. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:15 rc.cpp:38
+#: rc.cpp:17
 msgid "Time Zone"
 msgstr ""
 
 #. i18n: file: dateandtime.ui:122
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:18 rc.cpp:41
+#: rc.cpp:20
 msgid "To change the local time zone, select your area from the list below."
 msgstr ""
 
 #. i18n: file: dateandtime.ui:145
 #. i18n: ectx: property (text), widget (QLabel, m_local)
-#: rc.cpp:21 rc.cpp:44
+#: rc.cpp:23
 msgid "Current local time zone:"
 msgstr ""
+
+#. i18n: file: dateandtime.ui:155
+#. i18n: ectx: property (clickMessage), widget (KTreeWidgetSearchLine, tzonesearch)
+#: rc.cpp:26
+msgid "Search"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkded.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkded.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkded.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkded.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmkded\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:31+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:48+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmkded.cpp:72
 msgid "kcmkded"
@@ -75,23 +75,23 @@
 "Dyma restr o wasanaethau KDE sydd ar gael ac y cychwynnir pan fo galw. "
 "Rhestr er gwybodaeth yn unig yw hon, gan na allwch addasu'r gwasanaethau yma."
 
-#: kcmkded.cpp:102 kcmkded.cpp:122
+#: kcmkded.cpp:102 kcmkded.cpp:124
 msgid "Service"
 msgstr "Gwasanaeth"
 
-#: kcmkded.cpp:103 kcmkded.cpp:123
+#: kcmkded.cpp:103 kcmkded.cpp:125
 msgid "Status"
 msgstr "Cyflwr"
 
-#: kcmkded.cpp:104 kcmkded.cpp:124
+#: kcmkded.cpp:104 kcmkded.cpp:126
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: kcmkded.cpp:111
+#: kcmkded.cpp:113
 msgid "Startup Services"
 msgstr "Gwasanaethau Cychwyn"
 
-#: kcmkded.cpp:112
+#: kcmkded.cpp:114
 msgid ""
 "This shows all KDE services that can be loaded on KDE startup. Checked "
 "services will be invoked on next startup. Be careful with deactivation of "
@@ -101,38 +101,38 @@
 "ar y gwasanaethau dewisiedig wrth gychwyn tro nesaf. Byddwch yn ofalus wrth "
 "dadweithredoli gwasanaethau anhysbys."
 
-#: kcmkded.cpp:121
+#: kcmkded.cpp:123
 msgid "Use"
 msgstr "Defnyddio"
 
-#: kcmkded.cpp:132
+#: kcmkded.cpp:136
 msgid "Start"
 msgstr "Dechrau"
 
-#: kcmkded.cpp:133
+#: kcmkded.cpp:137
 msgid "Stop"
 msgstr "Atal"
 
-#: kcmkded.cpp:308
+#: kcmkded.cpp:305
 msgid "Unable to contact KDED."
 msgstr "Methu cysylltu â KDED."
 
-#: kcmkded.cpp:453
+#: kcmkded.cpp:450
 #, kde-format
 msgid "Unable to start server <em>%1</em>."
 msgstr ""
 
-#: kcmkded.cpp:456
+#: kcmkded.cpp:453
 #, kde-format
 msgid "Unable to start service <em>%1</em>.<br /><br /><i>Error: %2</i>"
 msgstr ""
 
-#: kcmkded.cpp:473
+#: kcmkded.cpp:470
 #, kde-format
 msgid "Unable to stop server <em>%1</em>."
 msgstr ""
 
-#: kcmkded.cpp:476
+#: kcmkded.cpp:473
 #, kde-format
 msgid "Unable to stop service <em>%1</em>.<br /><br /><i>Error: %2</i>"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkdnssd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkdnssd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkdnssd.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkdnssd.po	2012-04-18 08:59:34.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:32+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:48+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:12+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmdnssd.cpp:55
 msgid "ZeroConf configuration"
@@ -24,25 +24,27 @@
 msgid "Setup services browsing with ZeroConf"
 msgstr ""
 
-#: rc.cpp:7
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:8
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
-#. i18n: file: configdialog.ui:49
-#. i18n: ectx: property (title), widget (KEditListBox, kcfg_DomainList)
-#: rc.cpp:6
+#. i18n: file: configdialog.ui:29
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: configdialog.ui:44
+#. i18n: ectx: property (title), widget (KEditListWidget, kcfg_DomainList)
+#: rc.cpp:5 rc.cpp:11
 msgid "Additional Domains"
 msgstr ""
 
-#. i18n: file: configdialog.ui:46
-#. i18n: ectx: property (whatsThis), widget (KEditListBox, kcfg_DomainList)
-#: rc.cpp:3
+#. i18n: file: configdialog.ui:41
+#. i18n: ectx: property (whatsThis), widget (KEditListWidget, kcfg_DomainList)
+#: rc.cpp:8
 msgid ""
 "List of Internet domains that will be browsed for services in addition to "
 "default domain (typically local network). "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkgamma.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkgamma.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkgamma.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkgamma.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdegraphics/kgamma.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 02:06+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:49+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:32+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kgamma.cpp:147
 msgid "&Select test picture:"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkio.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkio.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkio.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkio.po	2012-04-18 08:59:36.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: kcmkio\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:24+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-16 13:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,10 +20,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: bookmarks.cpp:110
+#: bookmarks.cpp:108
 msgid ""
 "<h1>My Bookmarks</h1><p>This module lets you configure the bookmarks home "
 "page.</p><p>The bookmarks home page is accessible at <a "
@@ -56,11 +56,11 @@
 msgid "&Policy"
 msgstr "&Polisi"
 
-#: kcookiesmain.cpp:60
+#: kcookiesmain.cpp:59
 msgid "&Management"
 msgstr "&Rheolaeth"
 
-#: kcookiesmain.cpp:88
+#: kcookiesmain.cpp:87
 msgid ""
 "<p><h1>Cookies</h1> Cookies contain information that Konqueror (or other KDE "
 "applications using the HTTP protocol) stores on your computer, initiated by "
@@ -78,50 +78,50 @@
 "sites without being prompted every time KDE receives a cookie.</p>"
 msgstr ""
 
-#: kcookiesmanagement.cpp:152 kcookiesmanagement.cpp:169
+#: kcookiesmanagement.cpp:143 kcookiesmanagement.cpp:159
 msgid "D-Bus Communication Error"
 msgstr ""
 
-#: kcookiesmanagement.cpp:153
+#: kcookiesmanagement.cpp:144
 msgid "Unable to delete all the cookies as requested."
 msgstr "Methwyd dileu pob bisgïen fel gofynnwyd."
 
-#: kcookiesmanagement.cpp:170
+#: kcookiesmanagement.cpp:160
 msgid "Unable to delete cookies as requested."
 msgstr "Methwyd dileu bisgedi fel gofynnwyd."
 
-#: kcookiesmanagement.cpp:242
+#: kcookiesmanagement.cpp:231
 msgid "<h1>Cookie Management Quick Help</h1>"
 msgstr ""
 
-#: kcookiesmanagement.cpp:251
+#: kcookiesmanagement.cpp:241
 msgid "Information Lookup Failure"
 msgstr "Methiant Chwiliad Gwybodaeth"
 
-#: kcookiesmanagement.cpp:252
+#: kcookiesmanagement.cpp:242
 msgid ""
 "Unable to retrieve information about the cookies stored on your computer."
 msgstr "Methwyd nôl gwybodaeth am y bisgedi a gedwid ar eich cyfrifiadur."
 
-#: kcookiesmanagement.cpp:342
+#: kcookiesmanagement.cpp:332
 msgid "End of session"
 msgstr "Diwedd sesiwn"
 
-#: kcookiesmanagement.cpp:351
+#: kcookiesmanagement.cpp:341
 msgid "Yes"
 msgstr ""
 
-#: kcookiespolicies.cpp:178
+#: kcookiespolicies.cpp:175
 msgctxt "@title:window"
 msgid "New Cookie Policy"
 msgstr ""
 
-#: kcookiespolicies.cpp:217
+#: kcookiespolicies.cpp:213
 msgctxt "@title:window"
 msgid "Change Cookie Policy"
 msgstr ""
 
-#: kcookiespolicies.cpp:242
+#: kcookiespolicies.cpp:234
 #, kde-format
 msgid ""
 "<qt>A policy already exists for<center><b>%1</b></center>Do you want to "
@@ -130,16 +130,16 @@
 "<qt>Mae polisi ar gyfer <center><b>%1</b></center> yn bodoli eisioes. A "
 "ydych am ei amnewid?</qt>"
 
-#: kcookiespolicies.cpp:246
+#: kcookiespolicies.cpp:238
 msgctxt "@title:window"
 msgid "Duplicate Policy"
 msgstr ""
 
-#: kcookiespolicies.cpp:247 useragentdlg.cpp:215
+#: kcookiespolicies.cpp:239 useragentdlg.cpp:202
 msgid "Replace"
 msgstr ""
 
-#: kcookiespolicies.cpp:420
+#: kcookiespolicies.cpp:408
 msgid ""
 "Unable to communicate with the cookie handler service.\n"
 "Any changes you made will not take effect until the service is restarted."
@@ -148,7 +148,7 @@
 "Ni fydd unrhyw newidiadau y wnaethoch yn dod i rym tan i'r gwasanaeth gael "
 "ei ailgychwyn."
 
-#: kcookiespolicies.cpp:461
+#: kcookiespolicies.cpp:449
 msgid ""
 "<p><h1>Cookies</h1> Cookies contain information that Konqueror (or any other "
 "KDE application using the HTTP protocol) stores on your computer from a "
@@ -171,153 +171,7 @@
 "every time KDE receives a cookie.</p>"
 msgstr ""
 
-#: kenvvarproxydlg.cpp:49
-msgctxt "@title:window"
-msgid "Variable Proxy Configuration"
-msgstr ""
-
-#: kenvvarproxydlg.cpp:130 kenvvarproxydlg.cpp:292
-msgid "You must specify at least one valid proxy environment variable."
-msgstr "Rhaid i chi benodi o leiaf un newidyn amgylchedd dirprwy dilys."
-
-#: kenvvarproxydlg.cpp:133 kenvvarproxydlg.cpp:295
-msgid ""
-"<qt>Make sure you entered the actual environment variable name rather than "
-"its value. For example, if the environment variable is <br "
-"/><b>HTTP_PROXY=http://localhost:3128</b><br /> you need to enter "
-"<b>HTTP_PROXY</b> here instead of the actual value "
-"http://localhost:3128.</qt>"
-msgstr ""
-
-#: kenvvarproxydlg.cpp:141 kenvvarproxydlg.cpp:303 kproxydlg.cpp:311
-msgctxt "@title:window"
-msgid "Invalid Proxy Setup"
-msgstr ""
-
-#: kenvvarproxydlg.cpp:145
-msgid "Successfully verified."
-msgstr "Gwiriwyd yn llwyddiannus."
-
-#: kenvvarproxydlg.cpp:146
-msgctxt "@title:window"
-msgid "Proxy Setup"
-msgstr ""
-
-#: kenvvarproxydlg.cpp:222
-msgid ""
-"Did not detect any environment variables commonly used to set system wide "
-"proxy information."
-msgstr ""
-"Ni ganfuwyd unrhyw newidynnau amgylchedd a ddefnyddir yn gyffredin i osod "
-"gwybodaeth dirprwyon cysawd-eang."
-
-#: kenvvarproxydlg.cpp:226
-msgid ""
-"<qt>To learn about the variable names the automatic detection process "
-"searches for, press OK, click on the quick help button on the window title "
-"bar of the previous dialog and then click on the \"<b>Auto Detect</b>\" "
-"button.</qt>"
-msgstr ""
-"<qt>I ddysgu am enwau'r newidynnau y mae'r broses ganfod ymysgogol yn "
-"chwilio amdanynt, gwasgwch Iawn, cliciwch ar y botwm cymorth cyflym ar deitl "
-"ffenestr yr ymgom blaenorol ac wedyn cliciwch ar y botwm \"Canfod "
-"Ymysgogol\".</qt>"
-
-#: kenvvarproxydlg.cpp:234
-msgctxt "@title:window"
-msgid "Automatic Proxy Variable Detection"
-msgstr ""
-
-#: kmanualproxydlg.cpp:48
-msgctxt "@title:window"
-msgid "Manual Proxy Configuration"
-msgstr ""
-
-#: kmanualproxydlg.cpp:273
-msgctxt "@title:window"
-msgid "Invalid Proxy Setting"
-msgstr ""
-
-#: kmanualproxydlg.cpp:274
-msgid ""
-"One or more of the specified proxy settings are invalid. The incorrect "
-"entries are highlighted."
-msgstr ""
-"Mae un neu fwy o'r gosodiadau dirpwry a phenodwyd yn annilys.  Amlygir y "
-"cofnodion annilys."
-
-#: kmanualproxydlg.cpp:342
-msgid "You entered a duplicate address. Please try again."
-msgstr "Rhoesoch gyfeiriad dyblyg.  Ceisiwch eto."
-
-#: kmanualproxydlg.cpp:344
-#, kde-format
-msgid "<qt><center><b>%1</b></center> is already in the list.</qt>"
-msgstr "<qt><center>Mae <b>%1</b></center>yn y rhestr eisoes.</qt>"
-
-#: kmanualproxydlg.cpp:346
-msgctxt "@title:window"
-msgid "Duplicate Entry"
-msgstr ""
-
-#: kmanualproxydlg.cpp:356
-msgctxt "@title:window"
-msgid "New Exception"
-msgstr ""
-
-#: kmanualproxydlg.cpp:363
-msgctxt "@title:window"
-msgid "Change Exception"
-msgstr ""
-
-#: kmanualproxydlg.cpp:440
-msgctxt "@title:window"
-msgid "Invalid Entry"
-msgstr ""
-
-#: kmanualproxydlg.cpp:443
-msgid "The address you have entered is not valid."
-msgstr "Nid yw'r cyfeiriad a roesoch yn ddilys."
-
-#: kmanualproxydlg.cpp:445
-msgid ""
-"<qt>Make sure none of the addresses or URLs you specified contain invalid or "
-"wildcard characters such as spaces, asterisks (*), or question marks(?).<br "
-"/><br /><u>Examples of VALID entries:</u><br /><code>http://mycompany.com, "
-"192.168.10.1, mycompany.com, localhost, http://localhost</code><br /><br "
-"/><u>Examples of INVALID entries:</u><br /><code>http://my company.com, "
-"http:/mycompany,com file:/localhost</code></qt>"
-msgstr ""
-
-#: kmanualproxydlg.cpp:466
-msgid "Enter the URL or address that should use the above proxy settings:"
-msgstr ""
-"Rhowch y cyfeiriad neu URL y dylid defnyddio'r gosodiadau dirprwy uchod:"
-
-#: kmanualproxydlg.cpp:469
-msgid ""
-"Enter the address or URL that should be excluded from using the above proxy "
-"settings:"
-msgstr ""
-"Rhowch y cyfeiriad neu URL y dylid ei atal o ddefnyddio'r gosodiadau dirprwy "
-"uchod:"
-
-#: kmanualproxydlg.cpp:472
-msgid ""
-"<qt>Enter a valid address or URL.<br /><br /><b><u>NOTE:</u></b> Wildcard "
-"matching such as <code>*.kde.org</code> is not supported. If you want to "
-"match any host in the <code>.kde.org</code> domain, e.g. "
-"<code>printing.kde.org</code>, then simply enter <code>.kde.org</code>.</qt>"
-msgstr ""
-
-#: kproxydlg.cpp:160
-msgid ""
-"The address of the automatic proxy configuration script is invalid. Please "
-"correct this problem before proceeding. Otherwise, your changes will be "
-"ignored."
-msgstr ""
-
-#: kproxydlg.cpp:287
+#: kproxydlg.cpp:528
 msgid ""
 "<h1>Proxy</h1><p>A proxy server is an intermediate program that sits between "
 "your machine and the Internet and provides services such as web page caching "
@@ -328,19 +182,7 @@
 "block.</p><p><u>Note:</u> Some proxy servers provide both services.</p>"
 msgstr ""
 
-#: kproxydlg.cpp:306
-msgid ""
-"<qt>The proxy settings you specified are invalid.<br /><br />Please click on "
-"the <b>Setup...</b> button and correct the problem before proceeding; "
-"otherwise your changes will be ignored.</qt>"
-msgstr ""
-
-#: ksaveioconfig.cpp:224 ksaveioconfig.cpp:240
-msgctxt "@title:window"
-msgid "Update Failed"
-msgstr ""
-
-#: ksaveioconfig.cpp:225
+#: ksaveioconfig.cpp:218
 msgid ""
 "You have to restart the running applications for these changes to take "
 "effect."
@@ -348,7 +190,12 @@
 "Rhaid i chi ail-gychwyn y cymhwysiadau sy'n rhedeg er mwyn i'r newidiadau "
 "yma ddod i rym."
 
-#: ksaveioconfig.cpp:241
+#: ksaveioconfig.cpp:220 ksaveioconfig.cpp:234
+msgctxt "@title:window"
+msgid "Update Failed"
+msgstr ""
+
+#: ksaveioconfig.cpp:233
 msgid "You have to restart KDE for these changes to take effect."
 msgstr "Rhaid i chi ail-gychwyn KDE er mwyn i'r newidiadau yma ddod i rym."
 
@@ -551,7 +398,7 @@
 msgid "&Clear Cache"
 msgstr ""
 
-#. i18n: file: cache.ui:16
+#. i18n: file: cache.ui:17
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseCache)
 #: rc.cpp:59
 msgid ""
@@ -565,21 +412,21 @@
 "wedi'u cadw fel bo angen yn lle ar bob ymweld i'r safwe yna.  Mae hyn yn "
 "arbennig o ddefnyddiol os oes gennych cysylltiad araf i'r Rhyngrwyd."
 
-#. i18n: file: cache.ui:19
+#. i18n: file: cache.ui:20
 #. i18n: ectx: property (text), widget (QCheckBox, cbUseCache)
 #: rc.cpp:62
 msgid "&Use cache"
 msgstr "&Defnyddio celc"
 
-#. i18n: file: cache.ui:45
+#. i18n: file: cache.ui:46
 #. i18n: ectx: property (title), widget (QGroupBox, bgCachePolicy)
-#. i18n: file: kcookiespoliciesdlg.ui:211
+#. i18n: file: kcookiespolicies.ui:211
 #. i18n: ectx: property (text), widget (QTreeWidget, lvDomainPolicy)
-#: rc.cpp:65 rc.cpp:298
+#: rc.cpp:65 rc.cpp:226
 msgid "Policy"
 msgstr "Polisi"
 
-#. i18n: file: cache.ui:51
+#. i18n: file: cache.ui:52
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, rbVerifyCache)
 #: rc.cpp:68
 msgid ""
@@ -588,13 +435,13 @@
 msgstr ""
 "Gwirio os mae'r wê-ddalen gelciedig yn ddilys cyn geisio nôl y wê-ddalen eto."
 
-#. i18n: file: cache.ui:54
+#. i18n: file: cache.ui:55
 #. i18n: ectx: property (text), widget (QRadioButton, rbVerifyCache)
 #: rc.cpp:71
 msgid "&Keep cache in sync"
 msgstr "&Cadw'r celc yn gydwedd"
 
-#. i18n: file: cache.ui:61
+#. i18n: file: cache.ui:62
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, rbCacheIfPossible)
 #: rc.cpp:74
 msgid ""
@@ -604,13 +451,13 @@
 "Defnyddio o hyd dogfennau o'r gelc bob tro'u bod ar gael. Gallwch dal i "
 "ddefnyddio'r botwm ail-lwytho i gydweddu'r gelc â'r gwesteiwr pell."
 
-#. i18n: file: cache.ui:64
+#. i18n: file: cache.ui:65
 #. i18n: ectx: property (text), widget (QRadioButton, rbCacheIfPossible)
 #: rc.cpp:77
 msgid "Use cache whenever &possible"
 msgstr "Defnyddio celc pan yn &bosib"
 
-#. i18n: file: cache.ui:71
+#. i18n: file: cache.ui:72
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, rbOfflineMode)
 #: rc.cpp:80
 msgid ""
@@ -620,13 +467,13 @@
 "Peidio â nôl wê-ddalennau nas cedwyd yn barod yn y gelc.  Mae modd all-lein "
 "yn eich atal rhag weld tudalennau nad ydych wedi ymweld o'r blaen."
 
-#. i18n: file: cache.ui:74
+#. i18n: file: cache.ui:75
 #. i18n: ectx: property (text), widget (QRadioButton, rbOfflineMode)
 #: rc.cpp:83
 msgid "O&ffline browsing mode"
 msgstr "Modd pori &oddiar-lein"
 
-#. i18n: file: cache.ui:87
+#. i18n: file: cache.ui:88
 #. i18n: ectx: property (text), widget (QLabel, lbMaxCacheSize)
 #: rc.cpp:86
 msgid "Disk cache &size:"
@@ -634,267 +481,119 @@
 
 #. i18n: file: cache.ui:101
 #. i18n: ectx: property (suffix), widget (KIntNumInput, sbMaxCacheSize)
-#: rc.cpp:89 rc.cpp:757
+#: rc.cpp:89
 msgid " KiB"
 msgstr ""
 
-#. i18n: file: cache.ui:107
+#. i18n: file: cache.ui:111
 #. i18n: ectx: property (text), widget (QPushButton, clearCacheButton)
-#: rc.cpp:89
+#: rc.cpp:92
 msgid "C&lear Cache"
 msgstr "G&wagio'r Gelc"
 
-#. i18n: file: envvarproxy.ui:21
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbHttp)
-#. i18n: file: envvarproxy.ui:49
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leHttp)
-#. i18n: file: envvarproxy.ui:21
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbHttp)
-#. i18n: file: envvarproxy.ui:49
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leHttp)
-#: rc.cpp:95 rc.cpp:104 rc.cpp:763 rc.cpp:772
-msgid ""
-"<qt>\n"
-"Enter the name of the environment variable, e.g. <b>HTTP_PROXY</b>, used to "
-"store the address of the HTTP proxy server.<p>\n"
-"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-"automatic discovery of this variable.</p>\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file: envvarproxy.ui:24
-#. i18n: ectx: property (text), widget (QLabel, lbHttp)
-#. i18n: file: manualproxy.ui:66
-#. i18n: ectx: property (text), widget (QLabel, lbHttp)
-#: rc.cpp:98 rc.cpp:431
-msgid "H&TTP:"
-msgstr "H&TTP:"
-
-#. i18n: file: envvarproxy.ui:59
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbHttps)
-#. i18n: file: envvarproxy.ui:87
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leHttps)
-#. i18n: file: envvarproxy.ui:59
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbHttps)
-#. i18n: file: envvarproxy.ui:87
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leHttps)
-#: rc.cpp:110 rc.cpp:119 rc.cpp:778 rc.cpp:787
-msgid ""
-"<qt>\n"
-"Enter the name of the environment variable, e.g. <b>HTTPS_PROXY</b>, used to "
-"store the address of the HTTPS proxy server.<p>\n"
-"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-"an automatic discovery of this variable.</p>\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file: envvarproxy.ui:62
-#. i18n: ectx: property (text), widget (QLabel, lbHttps)
-#. i18n: file: manualproxy.ui:47
-#. i18n: ectx: property (text), widget (QLabel, lbHttps)
-#: rc.cpp:113 rc.cpp:428
-msgid "HTTP&S:"
-msgstr "HTTP&S:"
-
-#. i18n: file: envvarproxy.ui:97
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbFtp)
-#. i18n: file: envvarproxy.ui:125
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leFtp)
-#. i18n: file: envvarproxy.ui:97
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbFtp)
-#. i18n: file: envvarproxy.ui:125
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leFtp)
-#: rc.cpp:125 rc.cpp:134 rc.cpp:793 rc.cpp:802
-msgid ""
-"<qt>\n"
-"Enter the name of the environment variable, e.g. <b>FTP_PROXY</b>, used to "
-"store the address of the FTP proxy server.<p>\n"
-"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-"an automatic discovery of this variable.</p>\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file: envvarproxy.ui:100
-#. i18n: ectx: property (text), widget (QLabel, lbFtp)
-#. i18n: file: manualproxy.ui:28
-#. i18n: ectx: property (text), widget (QLabel, lbFtp)
-#: rc.cpp:128 rc.cpp:425
-msgid "&FTP:"
-msgstr "&FTP:"
-
-#. i18n: file: envvarproxy.ui:135
-#. i18n: ectx: property (whatsThis), widget (QLabel, lnNoProxy)
-#. i18n: file: envvarproxy.ui:163
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leNoProxy)
-#: rc.cpp:137 rc.cpp:146
-msgid ""
-"<qt>\n"
-"Enter the environment variable, e.g. <b>NO_PROXY</b>, used to store the "
-"addresses of sites for which the proxy server should not be used.<p>\n"
-"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
-"an automatic discovery of this variable.\n"
-"</qt>"
-msgstr ""
-"<qt>\n"
-"Rhowch enw'r newidyn amgylchedd, e.e.<b>NO_PROXY</b>, i'w ddefnyddio i gadw "
-"cyfeiriadau'r safweodd na ddylid defnyddio dirprwy iddynt.<p>Fel arall, "
-"gallwch glicio ar y botwm <b>\"Canfod yn Ymysgogol\"</b> i geisio canfod y "
-"newidyn yma'n ymysgogol.\n"
-"</qt>"
-
-#. i18n: file: envvarproxy.ui:138
-#. i18n: ectx: property (text), widget (QLabel, lnNoProxy)
-#: rc.cpp:143
-msgid "NO &PROXY:"
-msgstr "DIM &DIRPRWY:"
-
-#. i18n: file: envvarproxy.ui:170
-#. i18n: ectx: property (text), widget (QCheckBox, cbShowValue)
-#: rc.cpp:152
-msgid "Show the &value of the environment variables"
-msgstr "Dangos gwerthoedd y &newidynnau amgylchedd"
-
-#. i18n: file: envvarproxy.ui:181
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbVerify)
-#: rc.cpp:155
-msgid ""
-"<qt>Verify whether or not the environment variable names you supplied are "
-"valid. If an environment variable is not found, the associated labels will "
-"be <b>highlighted</b> to indicate that they are invalid.</qt>"
-msgstr ""
-"<qt>Gwirio a yw enwau'r newidynnau amgylchedd a roddwyd yn ddilys. Os na "
-"chanfyddir newidyn amgylchedd, fe <b>amlygir</b> y labeli cysylltiedig i "
-"ddangos y gosodiadau annilys.</qt>"
-
-#. i18n: file: envvarproxy.ui:184
-#. i18n: ectx: property (text), widget (QPushButton, pbVerify)
-#: rc.cpp:158
-msgid "&Verify"
-msgstr "&Gwirio"
-
-#. i18n: file: envvarproxy.ui:191
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbDetect)
-#: rc.cpp:161
-msgid ""
-"<qt>Attempt automatic discovery of the environment variables used for "
-"setting system wide proxy information.<p> This feature works by searching "
-"for commonly used variable names such as HTTP_PROXY, FTP_PROXY and "
-"NO_PROXY.</qt>"
-msgstr ""
-"<qt>Ceisio canfod yn ymysgogol y newidynnau amgylchedd a ddefnyddir i osod "
-"gwybodaeth dirprwyon cysawd-eang.<p> Gweithia'r canfod ymysgogol yma drwy "
-"chilio am enwau cyffredin y newidynnau fel HTTP_PROXY, FTP_PROXY a "
-"NO_PROXY.</qt>"
-
-#. i18n: file: envvarproxy.ui:194
-#. i18n: ectx: property (text), widget (QPushButton, pbDetect)
-#: rc.cpp:164
-msgid "Auto &Detect"
-msgstr "&Canfod Ymysgogol"
-
-#. i18n: file: kcookiesmanagementdlg.ui:23
-#. i18n: ectx: property (clickMessage), widget (KTreeWidgetSearchLine, kListViewSearchLine)
-#. i18n: file: kcookiespoliciesdlg.ui:225
+#. i18n: file: kcookiesmanagement.ui:20
+#. i18n: ectx: property (clickMessage), widget (KTreeWidgetSearchLine, searchLineEdit)
+#. i18n: file: kcookiespolicies.ui:225
 #. i18n: ectx: property (clickMessage), widget (KTreeWidgetSearchLine, kListViewSearchLine)
-#: rc.cpp:167 rc.cpp:304
+#: rc.cpp:95 rc.cpp:232
 msgid "Search"
 msgstr ""
 
-#. i18n: file: kcookiesmanagementdlg.ui:30
-#. i18n: ectx: property (toolTip), widget (QTreeWidget, lvCookies)
-#: rc.cpp:170
+#. i18n: file: kcookiesmanagement.ui:27
+#. i18n: ectx: property (toolTip), widget (QTreeWidget, cookiesTreeWidget)
+#: rc.cpp:98
 msgid "Search interactively for domains and hosts"
 msgstr ""
 
-#. i18n: file: kcookiesmanagementdlg.ui:43
+#. i18n: file: kcookiesmanagement.ui:43
 #. i18n: ectx: property (text), widget (QTreeWidget, cookiesTreeWidget)
-#: rc.cpp:176 rc.cpp:844
+#: rc.cpp:101
 msgid "Site"
 msgstr ""
 
-#. i18n: file: kcookiesmanagementdlg.ui:48
+#. i18n: file: kcookiesmanagement.ui:48
 #. i18n: ectx: property (text), widget (QTreeWidget, cookiesTreeWidget)
-#: rc.cpp:179 rc.cpp:847
+#: rc.cpp:104
 msgid "Cookie Name"
 msgstr ""
 
-#. i18n: file: kcookiesmanagementdlg.ui:57
-#. i18n: ectx: property (text), widget (QPushButton, pbDelete)
-#. i18n: file: kcookiespoliciesdlg.ui:156
+#. i18n: file: kcookiesmanagement.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
+#. i18n: file: kcookiespolicies.ui:156
 #. i18n: ectx: property (text), widget (KPushButton, pbDelete)
-#. i18n: file: useragentdlg.ui:208
+#. i18n: file: useragentdlg.ui:202
 #. i18n: ectx: property (text), widget (KPushButton, deleteButton)
-#: rc.cpp:179 rc.cpp:284 rc.cpp:618
+#: rc.cpp:107 rc.cpp:212 rc.cpp:557
 msgid "D&elete"
 msgstr "Dil&eu"
 
-#. i18n: file: kcookiesmanagementdlg.ui:64
-#. i18n: ectx: property (text), widget (QPushButton, pbDeleteAll)
-#. i18n: file: kcookiespoliciesdlg.ui:163
+#. i18n: file: kcookiesmanagement.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, deleteAllButton)
+#. i18n: file: kcookiespolicies.ui:163
 #. i18n: ectx: property (text), widget (KPushButton, pbDeleteAll)
-#. i18n: file: useragentdlg.ui:218
+#. i18n: file: useragentdlg.ui:212
 #. i18n: ectx: property (text), widget (KPushButton, deleteAllButton)
-#: rc.cpp:182 rc.cpp:287 rc.cpp:624
+#: rc.cpp:110 rc.cpp:215 rc.cpp:563
 msgid "Delete A&ll"
 msgstr "Dileu i &Gyd"
 
-#. i18n: file: kcookiesmanagementdlg.ui:71
-#. i18n: ectx: property (text), widget (QPushButton, pbPolicy)
-#: rc.cpp:185
+#. i18n: file: kcookiesmanagement.ui:70
+#. i18n: ectx: property (text), widget (QPushButton, changePolicyButton)
+#: rc.cpp:113
 msgid "Change &Policy..."
 msgstr "Newid &Polisi..."
 
-#. i18n: file: kcookiesmanagementdlg.ui:78
-#. i18n: ectx: property (text), widget (QPushButton, pbReload)
-#: rc.cpp:188
+#. i18n: file: kcookiesmanagement.ui:77
+#. i18n: ectx: property (text), widget (QPushButton, reloadButton)
+#: rc.cpp:116
 msgid "&Reload List"
 msgstr "&Ail-lwytho Rhestr"
 
-#. i18n: file: kcookiesmanagementdlg.ui:102
-#. i18n: ectx: property (title), widget (QGroupBox, gbDetails)
-#: rc.cpp:191
+#. i18n: file: kcookiesmanagement.ui:97
+#. i18n: ectx: property (title), widget (QGroupBox, detailsGroupBox)
+#: rc.cpp:119
 msgid "Details"
 msgstr "Manylion"
 
-#. i18n: file: kcookiesmanagementdlg.ui:111
-#. i18n: ectx: property (text), widget (QLabel, lbName)
-#: rc.cpp:194
+#. i18n: file: kcookiesmanagement.ui:106
+#. i18n: ectx: property (text), widget (QLabel, nameLabel)
+#: rc.cpp:122
 msgid "Name:"
 msgstr "Enw:"
 
-#. i18n: file: kcookiesmanagementdlg.ui:134
-#. i18n: ectx: property (text), widget (QLabel, lbValue)
-#: rc.cpp:197
+#. i18n: file: kcookiesmanagement.ui:129
+#. i18n: ectx: property (text), widget (QLabel, valueLabel)
+#: rc.cpp:125
 msgid "Value:"
 msgstr "Gwerth:"
 
-#. i18n: file: kcookiesmanagementdlg.ui:157
-#. i18n: ectx: property (text), widget (QLabel, lbDomain)
-#: rc.cpp:200
+#. i18n: file: kcookiesmanagement.ui:152
+#. i18n: ectx: property (text), widget (QLabel, domainLabel)
+#: rc.cpp:128
 msgid "Domain:"
 msgstr "Parth:"
 
-#. i18n: file: kcookiesmanagementdlg.ui:180
-#. i18n: ectx: property (text), widget (QLabel, lbPath)
-#: rc.cpp:203
+#. i18n: file: kcookiesmanagement.ui:175
+#. i18n: ectx: property (text), widget (QLabel, patchLabel)
+#: rc.cpp:131
 msgid "Path:"
 msgstr "Llwybr:"
 
-#. i18n: file: kcookiesmanagementdlg.ui:203
-#. i18n: ectx: property (text), widget (QLabel, lbExpires)
-#: rc.cpp:206
+#. i18n: file: kcookiesmanagement.ui:198
+#. i18n: ectx: property (text), widget (QLabel, expiresLabel)
+#: rc.cpp:134
 msgid "Expires:"
 msgstr "Darfoda:"
 
-#. i18n: file: kcookiesmanagementdlg.ui:226
-#. i18n: ectx: property (text), widget (QLabel, lbSecure)
-#: rc.cpp:209
+#. i18n: file: kcookiesmanagement.ui:221
+#. i18n: ectx: property (text), widget (QLabel, secureLabel)
+#: rc.cpp:137
 msgid "Secure:"
 msgstr "Diogel:"
 
-#. i18n: file: kcookiespoliciesdlg.ui:19
+#. i18n: file: kcookiespolicies.ui:19
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbEnableCookies)
-#: rc.cpp:212
+#: rc.cpp:140
 msgid ""
 "<qt>\n"
 "<p>Enable cookie support. Normally you will want to have cookie support "
@@ -904,15 +603,15 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kcookiespoliciesdlg.ui:22
+#. i18n: file: kcookiespolicies.ui:22
 #. i18n: ectx: property (text), widget (QCheckBox, cbEnableCookies)
-#: rc.cpp:218
+#: rc.cpp:146
 msgid "Enable coo&kies"
 msgstr "Galluogi bis&gedi"
 
-#. i18n: file: kcookiespoliciesdlg.ui:34
+#. i18n: file: kcookiespolicies.ui:34
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbRejectCrossDomainCookies)
-#: rc.cpp:221
+#: rc.cpp:149
 msgid ""
 "<qt>\n"
 "Reject the so called third-party cookies. These are cookies that originate "
@@ -932,15 +631,15 @@
 "bod gweithredwyr safweodd yn gallu crynhoi proffil am eich pori dyddiol.\n"
 "</qt>"
 
-#. i18n: file: kcookiespoliciesdlg.ui:37
+#. i18n: file: kcookiespolicies.ui:37
 #. i18n: ectx: property (text), widget (QCheckBox, cbRejectCrossDomainCookies)
-#: rc.cpp:226
+#: rc.cpp:154
 msgid "Only acce&pt cookies from originating server"
 msgstr "Der&byn bisgedi o'r gweinydd cychwynnol yn unig"
 
-#. i18n: file: kcookiespoliciesdlg.ui:47
+#. i18n: file: kcookiespolicies.ui:47
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAutoAcceptSessionCookies)
-#: rc.cpp:229
+#: rc.cpp:157
 msgid ""
 "<qt>\n"
 "<p>Automatically accept temporary cookies meant to expire at the end of the "
@@ -954,15 +653,15 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kcookiespoliciesdlg.ui:50
+#. i18n: file: kcookiespolicies.ui:50
 #. i18n: ectx: property (text), widget (QCheckBox, cbAutoAcceptSessionCookies)
-#: rc.cpp:235
+#: rc.cpp:163
 msgid "Automaticall&y accept session cookies"
 msgstr "Derbyn bisgedi sesiwn yn &ymysgogol"
 
-#. i18n: file: kcookiespoliciesdlg.ui:60
+#. i18n: file: kcookiespolicies.ui:60
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbIgnoreCookieExpirationDate)
-#: rc.cpp:238
+#: rc.cpp:166
 msgid ""
 "<qt>\n"
 "<p>Treat all cookies as session cookies. Session cookies are small pieces of "
@@ -977,15 +676,15 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kcookiespoliciesdlg.ui:63
+#. i18n: file: kcookiespolicies.ui:63
 #. i18n: ectx: property (text), widget (QCheckBox, cbIgnoreCookieExpirationDate)
-#: rc.cpp:244
+#: rc.cpp:172
 msgid "Treat &all cookies as session cookies"
 msgstr "Trin &pob bisgïen fel bisïen sesiwn"
 
-#. i18n: file: kcookiespoliciesdlg.ui:83
+#. i18n: file: kcookiespolicies.ui:83
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, bgDefault)
-#: rc.cpp:247
+#: rc.cpp:175
 msgid ""
 "<qt>\n"
 "Determines how cookies received from a remote machine will be handled: \n"
@@ -1002,33 +701,33 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kcookiespoliciesdlg.ui:86
+#. i18n: file: kcookiespolicies.ui:86
 #. i18n: ectx: property (title), widget (QGroupBox, bgDefault)
-#: rc.cpp:258
+#: rc.cpp:186
 msgid "Default Policy"
 msgstr "Polisi Rhagosodedig"
 
-#. i18n: file: kcookiespoliciesdlg.ui:92
+#. i18n: file: kcookiespolicies.ui:92
 #. i18n: ectx: property (text), widget (QRadioButton, rbPolicyAsk)
-#: rc.cpp:261
+#: rc.cpp:189
 msgid "Ask &for confirmation"
 msgstr "Gofy&n am wiriad"
 
-#. i18n: file: kcookiespoliciesdlg.ui:99
+#. i18n: file: kcookiespolicies.ui:99
 #. i18n: ectx: property (text), widget (QRadioButton, rbPolicyAccept)
-#: rc.cpp:264
+#: rc.cpp:192
 msgid "Accep&t all cookies"
 msgstr "Derbyn p&ob bisgïen"
 
-#. i18n: file: kcookiespoliciesdlg.ui:106
+#. i18n: file: kcookiespolicies.ui:106
 #. i18n: ectx: property (text), widget (QRadioButton, rbPolicyReject)
-#: rc.cpp:267
+#: rc.cpp:195
 msgid "Re&ject all cookies"
 msgstr "G&wrthod pob bisgïen"
 
-#. i18n: file: kcookiespoliciesdlg.ui:131
+#. i18n: file: kcookiespolicies.ui:131
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, gbDomainSpecific)
-#: rc.cpp:270
+#: rc.cpp:198
 msgid ""
 "<qt>\n"
 "To add a new policy, simply click on the <b>Add...</b> button and supply the "
@@ -1040,33 +739,31 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kcookiespoliciesdlg.ui:134
+#. i18n: file: kcookiespolicies.ui:134
 #. i18n: ectx: property (title), widget (QGroupBox, gbDomainSpecific)
-#: rc.cpp:275
+#: rc.cpp:203
 msgid "Site Policy"
 msgstr "Polisi Safwe"
 
-#. i18n: file: kcookiespoliciesdlg.ui:142
+#. i18n: file: kcookiespolicies.ui:142
 #. i18n: ectx: property (text), widget (KPushButton, pbNew)
-#. i18n: file: manualproxy.ui:214
-#. i18n: ectx: property (text), widget (QPushButton, pbNew)
-#. i18n: file: useragentdlg.ui:188
+#. i18n: file: useragentdlg.ui:182
 #. i18n: ectx: property (text), widget (KPushButton, newButton)
-#: rc.cpp:278 rc.cpp:481 rc.cpp:606
+#: rc.cpp:206 rc.cpp:545
 msgid "&New..."
 msgstr "&Newydd..."
 
-#. i18n: file: kcookiespoliciesdlg.ui:149
+#. i18n: file: kcookiespolicies.ui:149
 #. i18n: ectx: property (text), widget (KPushButton, pbChange)
-#. i18n: file: useragentdlg.ui:198
+#. i18n: file: useragentdlg.ui:192
 #. i18n: ectx: property (text), widget (KPushButton, changeButton)
-#: rc.cpp:281 rc.cpp:612
+#: rc.cpp:209 rc.cpp:551
 msgid "Chan&ge..."
 msgstr "New&id..."
 
-#. i18n: file: kcookiespoliciesdlg.ui:190
+#. i18n: file: kcookiespolicies.ui:190
 #. i18n: ectx: property (whatsThis), widget (QTreeWidget, lvDomainPolicy)
-#: rc.cpp:290
+#: rc.cpp:218
 msgid ""
 "<qt>\n"
 "List of sites for which you have set a specific cookie policy. Specific "
@@ -1078,21 +775,95 @@
 "polisïau yma flaenoriaeth dros y polisi rhagosod ar gyfer y safweoedd yma.\n"
 "</qt>"
 
-#. i18n: file: kcookiespoliciesdlg.ui:206
+#. i18n: file: kcookiespolicies.ui:206
 #. i18n: ectx: property (text), widget (QTreeWidget, lvDomainPolicy)
-#: rc.cpp:295
+#: rc.cpp:223
 msgid "Domain"
 msgstr "Parth"
 
-#. i18n: file: kcookiespoliciesdlg.ui:222
+#. i18n: file: kcookiespolicies.ui:222
 #. i18n: ectx: property (toolTip), widget (KTreeWidgetSearchLine, kListViewSearchLine)
-#: rc.cpp:301
+#: rc.cpp:229
 msgid "Search interactively for domains"
 msgstr ""
 
-#. i18n: file: kproxydlg.ui:19
-#. i18n: ectx: property (whatsThis), widget (QWidget, KProxyDialogUI)
-#: rc.cpp:319
+#. i18n: file: kcookiespolicyselectiondlg.ui:22
+#. i18n: ectx: property (whatsThis), widget (QLabel, lbDomain)
+#: rc.cpp:235
+msgid ""
+"<qt>\n"
+"Enter the host or domain to which this policy applies, e.g. "
+"<b>www.kde.org</b> or <b>.kde.org</b>.\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"Rhowch y gwesteiwr neu'r parth y  gweithreda'r polisi hwn arno, e.e. "
+"<b>www.kde.org</b> neu <b>.kde.org</b>\n"
+"</qt>"
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:25
+#. i18n: ectx: property (text), widget (QLabel, lbDomain)
+#: rc.cpp:240
+msgid "Site name:"
+msgstr ""
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:38
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, leDomain)
+#: rc.cpp:243
+msgid "Enter the host or domain name, e.g. .kde.org, this policy applies to."
+msgstr ""
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:52
+#. i18n: ectx: property (whatsThis), widget (QLabel, lbPolicy)
+#. i18n: file: kcookiespolicyselectiondlg.ui:75
+#. i18n: ectx: property (whatsThis), widget (KComboBox, cbPolicy)
+#: rc.cpp:246 rc.cpp:259
+msgid ""
+"<qt>\n"
+"Select the desired policy:\n"
+"<ul>\n"
+"<li><b>Accept</b> - Allows this site to set cookies</li>\n"
+"<li><b>Reject</b> - Refuse all cookies sent from this site</li>\n"
+"<li><b>Ask</b> - Prompt when cookies are received from this site</li>\n"
+"</ul>\n"
+"</qt>"
+msgstr ""
+"<qt>\n"
+"Dewiswch y polisi yr hoffech:\n"
+"<ul>\n"
+"<li><b>Derbyn</b> - Caniatâ i'r safwe yma osod bisgïen</li>\n"
+"<li><b>Gwrthod</b> - Gwrthodir pob bisgïen o'r safwe yma</li>\n"
+"<li><b>Gofyn</b> - Anogir pan dderbynnir bisgedi o'r safwe yma</li>\n"
+"</ul>\n"
+"</qt>"
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:55
+#. i18n: ectx: property (text), widget (QLabel, lbPolicy)
+#: rc.cpp:256
+msgid "Policy:"
+msgstr ""
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:79
+#. i18n: ectx: property (text), item, widget (KComboBox, cbPolicy)
+#: rc.cpp:269
+msgid "Accept"
+msgstr "Derbyn"
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:84
+#. i18n: ectx: property (text), item, widget (KComboBox, cbPolicy)
+#: rc.cpp:272
+msgid "Reject"
+msgstr "Gwrthod"
+
+#. i18n: file: kcookiespolicyselectiondlg.ui:89
+#. i18n: ectx: property (text), item, widget (KComboBox, cbPolicy)
+#: rc.cpp:275
+msgid "Ask"
+msgstr "Gofyn"
+
+#. i18n: file: kproxydlg.ui:20
+#. i18n: ectx: property (whatsThis), widget (QWidget, ProxyDialogUI)
+#: rc.cpp:278
 msgid ""
 "<qt>\n"
 "Setup proxy configuration.\n"
@@ -1110,21 +881,21 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kproxydlg.ui:37
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbNoProxy)
-#: rc.cpp:328
+#. i18n: file: kproxydlg.ui:26
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, noProxyRadioButton)
+#: rc.cpp:287
 msgid "Connect to the Internet directly."
 msgstr "Cysylltu â'r Rhyngrwyd yn uniongyrchol."
 
-#. i18n: file: kproxydlg.ui:40
-#. i18n: ectx: property (text), widget (QRadioButton, rbNoProxy)
-#: rc.cpp:331
-msgid "Connect to the &Internet directly"
-msgstr "Cysylltu â'r Rhyngrwyd yn &uniongyrchol"
-
-#. i18n: file: kproxydlg.ui:57
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbAutoDiscover)
-#: rc.cpp:334
+#. i18n: file: kproxydlg.ui:29
+#. i18n: ectx: property (text), widget (QRadioButton, noProxyRadioButton)
+#: rc.cpp:290
+msgid "No Proxy"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:46
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, autoDiscoverProxyRadioButton)
+#: rc.cpp:293
 msgid ""
 "<qt>\n"
 "Automatically detect and configure the proxy settings.<p>\n"
@@ -1136,378 +907,325 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: kproxydlg.ui:60
-#. i18n: ectx: property (text), widget (QRadioButton, rbAutoDiscover)
-#: rc.cpp:341
-msgid "A&utomatically detect proxy configuration"
-msgstr "Canfod ffurfweddiad y dirprwy yn y&mysgogol"
-
-#. i18n: file: kproxydlg.ui:75
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbAutoScript)
-#: rc.cpp:344
-msgid "Use the specified proxy script URL to configure the proxy settings."
-msgstr ""
-"Defnyddio'r URL sgript ffurfweddiad a phenodwyd i ffurfweddu gosodiadau'r "
-"dirprwy."
-
-#. i18n: file: kproxydlg.ui:78
-#. i18n: ectx: property (text), widget (QRadioButton, rbAutoScript)
-#: rc.cpp:347
-msgid "U&se proxy configuration URL:"
-msgstr ""
-
-#. i18n: file: kproxydlg.ui:94
-#. i18n: ectx: property (whatsThis), widget (KUrlRequester, location)
-#: rc.cpp:350
+#. i18n: file: kproxydlg.ui:49
+#. i18n: ectx: property (text), widget (QRadioButton, autoDiscoverProxyRadioButton)
+#: rc.cpp:300
+msgid "Detect proxy configuration automatically"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:59
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, autoScriptProxyRadioButton)
+#: rc.cpp:303
+msgid "Use the specified proxy script to configure the proxy settings."
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:62
+#. i18n: ectx: property (text), widget (QRadioButton, autoScriptProxyRadioButton)
+#: rc.cpp:306
+msgid "Use proxy auto configuration URL:"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:93
+#. i18n: ectx: property (whatsThis), widget (KUrlRequester, proxyScriptUrlRequester)
+#: rc.cpp:309
 msgid "Enter the address for the proxy configuration script."
 msgstr "Rhowch gyfeiriad y sgript ffurfweddu'r dirprwy."
 
+#. i18n: file: kproxydlg.ui:117
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, systemProxyRadioButton)
+#: rc.cpp:312
+msgid ""
+"<qt><p>Use proxy settings defined on the system.</p>\n"
+"<p>Some platforms offer system wide proxy configuration information and "
+"selecting this option allows you to use those settings.</p>\n"
+"<p>On Mac platforms</p>\n"
+"<p>On Windows platforms</p>\n"
+"<p>On Unix and Linux platforms, such system proxy settings are usually "
+"defined through environment variables. The following environment variables "
+"are detected and used when present: <b>HTTP_PROXY</b>, <b>HTTPS_PROXY</b>, "
+"<b>FTP_PROXY</b>, <b>NO_PROXY</b>.</p>\n"
+"</qt>"
+msgstr ""
+
 #. i18n: file: kproxydlg.ui:120
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbEnvVar)
-#: rc.cpp:353
+#. i18n: ectx: property (text), widget (QRadioButton, systemProxyRadioButton)
+#: rc.cpp:320
+msgid "Use system proxy configuration:"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:127
+#. i18n: ectx: property (whatsThis), widget (QPushButton, autoDetectButton)
+#: rc.cpp:323
+msgid ""
+"<qt>Attempt automatic discovery of the environment variables used for "
+"setting system wide proxy information.<p> This feature works by searching "
+"for commonly used variable names such as HTTP_PROXY, FTP_PROXY and "
+"NO_PROXY.</qt>"
+msgstr ""
+"<qt>Ceisio canfod yn ymysgogol y newidynnau amgylchedd a ddefnyddir i osod "
+"gwybodaeth dirprwyon cysawd-eang.<p> Gweithia'r canfod ymysgogol yma drwy "
+"chilio am enwau cyffredin y newidynnau fel HTTP_PROXY, FTP_PROXY a "
+"NO_PROXY.</qt>"
+
+#. i18n: file: kproxydlg.ui:130
+#. i18n: ectx: property (text), widget (QPushButton, autoDetectButton)
+#: rc.cpp:326
+msgid "Auto D&etect"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:158
+#. i18n: ectx: property (whatsThis), widget (QLabel, systemProxyHttpLabel)
+#. i18n: file: kproxydlg.ui:183
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, systemProxyHttpEdit)
+#: rc.cpp:329 rc.cpp:338
 msgid ""
 "<qt>\n"
-"Use environment variables to configure the proxy settings.<p>\n"
-"Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROXY</b> are "
-"usually used in multi-user UNIX installations, where both graphical and non-"
-"graphical applications need to share the same proxy configuration "
-"information.\n"
+"Enter the name of the environment variable, e.g. <b>HTTP_PROXY</b>, used to "
+"store the address of the HTTP proxy server.<p>\n"
+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
+"automatic discovery of this variable.</p>\n"
 "</qt>"
 msgstr ""
+
+#. i18n: file: kproxydlg.ui:161
+#. i18n: ectx: property (text), widget (QLabel, systemProxyHttpLabel)
+#. i18n: file: kproxydlg.ui:383
+#. i18n: ectx: property (text), widget (QLabel, manualProxyHttpEditLabel)
+#: rc.cpp:335 rc.cpp:407
+msgid "HTTP Proxy:"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:193
+#. i18n: ectx: property (whatsThis), widget (QLabel, systemProxyHttpsLabel)
+#. i18n: file: kproxydlg.ui:218
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, systemProxyHttpsEdit)
+#: rc.cpp:344 rc.cpp:353
+msgid ""
 "<qt>\n"
-"Defnyddio newidynnau amgylchedd i osod gosodiadau'r dirprwy.<p>\n"
-"Fel rheol, defnyddir newidynnau amgylchedd megis <b>HTTP_PROXY</b> a "
-"<b>NO_PROXY</b> mewn arsefydliadau UNIX aml-ddefnyddiwr, lle bo angen i "
-"gymwysiadau graffeg a di-raffeg rannu'r un gwybodaeth ffurfweddu dirprwy.\n"
-"</qt>"
-
-#. i18n: file: kproxydlg.ui:123
-#. i18n: ectx: property (text), widget (QRadioButton, rbEnvVar)
-#: rc.cpp:359
-msgid "Use preset proxy environment &variables"
-msgstr "Defnyddio &newidynnau amgylchedd dirpwry rhagosodedig"
-
-#. i18n: file: kproxydlg.ui:133
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbEnvSetup)
-#: rc.cpp:362
-msgid "Show the proxy environment variable configuration dialog."
-msgstr "Dangos yr ymgom ffurfweddu ar gyfer newidyn amgylchedd dirprwy."
-
-#. i18n: file: kproxydlg.ui:136
-#. i18n: ectx: property (text), widget (QPushButton, pbEnvSetup)
-#. i18n: file: kproxydlg.ui:175
-#. i18n: ectx: property (text), widget (QPushButton, pbManSetup)
-#: rc.cpp:365 rc.cpp:377
-msgid "Setup..."
-msgstr "Gosod..."
-
-#. i18n: file: kproxydlg.ui:159
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbManual)
-#: rc.cpp:368
-msgid "Manually enter proxy server configuration information."
+"Enter the name of the environment variable, e.g. <b>HTTPS_PROXY</b>, used to "
+"store the address of the HTTPS proxy server.<p>\n"
+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
+"an automatic discovery of this variable.</p>\n"
+"</qt>"
 msgstr ""
-"Mewnosod y wybodaeth ffurfweddiad ar gyfer y gweinydd dirprwyol â llaw."
 
-#. i18n: file: kproxydlg.ui:162
-#. i18n: ectx: property (text), widget (QRadioButton, rbManual)
-#: rc.cpp:371
-msgid "&Manually specify the proxy settings"
-msgstr "Penodi &gosodiadau y dirprwy â llaw"
+#. i18n: file: kproxydlg.ui:196
+#. i18n: ectx: property (text), widget (QLabel, systemProxyHttpsLabel)
+#. i18n: file: kproxydlg.ui:449
+#. i18n: ectx: property (text), widget (QLabel, manualProxyHttpsEditLabel)
+#: rc.cpp:350 rc.cpp:422
+msgid "SSL Proxy:"
+msgstr ""
 
-#. i18n: file: kproxydlg.ui:172
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbManSetup)
+#. i18n: file: kproxydlg.ui:228
+#. i18n: ectx: property (whatsThis), widget (QLabel, systemProxyFtpLabel)
+#. i18n: file: kproxydlg.ui:253
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, systemProxyFtpEdit)
+#: rc.cpp:359 rc.cpp:368
+msgid ""
+"<qt>\n"
+"Enter the name of the environment variable, e.g. <b>FTP_PROXY</b>, used to "
+"store the address of the FTP proxy server.<p>\n"
+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
+"an automatic discovery of this variable.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:231
+#. i18n: ectx: property (text), widget (QLabel, systemProxyFtpLabel)
+#. i18n: file: kproxydlg.ui:499
+#. i18n: ectx: property (text), widget (QLabel, manualProxyFtpEditLabel)
+#: rc.cpp:365 rc.cpp:434
+msgid "FTP Proxy:"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:263
+#. i18n: ectx: property (whatsThis), widget (QLabel, systemProxySocksLabel)
 #: rc.cpp:374
-msgid "Show the manual proxy configuration dialog."
-msgstr "Dangos yr ymgom ffurfweddu dirprwy â llaw."
+msgid ""
+"<qt>\n"
+"Enter the name of the environment variable, e.g. <b>SOCKS_PROXY</b>, used to "
+"store the address of the SOCKS proxy server.<p>\n"
+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
+"an automatic discovery of this variable.</p>\n"
+"</qt>"
+msgstr ""
 
-#. i18n: file: kproxydlg.ui:190
-#. i18n: ectx: property (title), widget (QGroupBox, gbAuth)
-#: rc.cpp:380
-msgid "Authori&zation"
-msgstr "Aw&durdodi"
+#. i18n: file: kproxydlg.ui:266
+#. i18n: ectx: property (text), widget (QLabel, systemProxySocksLabel)
+#. i18n: file: kproxydlg.ui:552
+#. i18n: ectx: property (text), widget (QLabel, manualProxySocksEditLabel)
+#: rc.cpp:380 rc.cpp:446
+msgid "SOCKS Proxy:"
+msgstr ""
 
-#. i18n: file: kproxydlg.ui:196
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbPrompt)
+#. i18n: file: kproxydlg.ui:285
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, systemProxySocksEdit)
 #: rc.cpp:383
-msgid "Prompt for login information whenever it is required."
-msgstr "Annog am wybodaeth fewngofnodi pan fo'n ofynnol."
-
-#. i18n: file: kproxydlg.ui:199
-#. i18n: ectx: property (text), widget (QRadioButton, rbPrompt)
-#: rc.cpp:386
-msgid "Prompt as &needed"
-msgstr "Annog pan fo &angen"
+msgid ""
+"<qt>Enter the name of the environment variable, e.g. <b>SOCKS_PROXY</b>, "
+"used to store the address of the SOCKS proxy server.<p>Alternatively, you "
+"can click on the <b>\"Auto Detect\"</b> button to attempt an automatic "
+"discovery of this variable.</p></qt>"
+msgstr ""
 
-#. i18n: file: kproxydlg.ui:217
-#. i18n: ectx: property (toolTip), widget (QRadioButton, rbPresetLogin)
-#: rc.cpp:389
-msgid "Use this login information."
+#. i18n: file: kproxydlg.ui:295
+#. i18n: ectx: property (whatsThis), widget (QLabel, sysNoProxyLabel)
+#. i18n: file: kproxydlg.ui:599
+#. i18n: ectx: property (whatsThis), widget (QLabel, manNoProxyLabel)
+#: rc.cpp:386 rc.cpp:458
+msgid ""
+"<qt>\n"
+"Enter the environment variable, e.g. <b>NO_PROXY</b>, used to store the "
+"addresses of sites for which the proxy server should not be used.<p>\n"
+"Alternatively, you can click on the <b>\"Auto Detect\"</b> button to attempt "
+"an automatic discovery of this variable.\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"Rhowch enw'r newidyn amgylchedd, e.e.<b>NO_PROXY</b>, i'w ddefnyddio i gadw "
+"cyfeiriadau'r safweodd na ddylid defnyddio dirprwy iddynt.<p>Fel arall, "
+"gallwch glicio ar y botwm <b>\"Canfod yn Ymysgogol\"</b> i geisio canfod y "
+"newidyn yma'n ymysgogol.\n"
+"</qt>"
 
-#. i18n: file: kproxydlg.ui:220
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, rbPresetLogin)
-#: rc.cpp:392
-msgid "Use information specified here to login into proxy servers as needed."
+#. i18n: file: kproxydlg.ui:298
+#. i18n: ectx: property (text), widget (QLabel, sysNoProxyLabel)
+#. i18n: file: kproxydlg.ui:602
+#. i18n: ectx: property (text), widget (QLabel, manNoProxyLabel)
+#: rc.cpp:392 rc.cpp:464
+msgid "Exceptions:"
 msgstr ""
 
-#. i18n: file: kproxydlg.ui:223
-#. i18n: ectx: property (text), widget (QRadioButton, rbPresetLogin)
+#. i18n: file: kproxydlg.ui:317
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, systemNoProxyEdit)
 #: rc.cpp:395
-msgid "Username:"
-msgstr "Enw defnyddiwr:"
+msgid ""
+"<qt>Enter the environment variable, e.g. <b>NO_PROXY</b>, used to store the "
+"addresses of sites for which the above proxy settings should not be "
+"used.<p>Alternatively, you can click on the <b>\"Auto Detect\"</b> button to "
+"attempt an automatic discovery of this variable.</p></qt>"
+msgstr ""
 
-#. i18n: file: kproxydlg.ui:233
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leUsername)
+#. i18n: file: kproxydlg.ui:324
+#. i18n: ectx: property (text), widget (QCheckBox, showEnvValueCheckBox)
 #: rc.cpp:398
-msgid "Login name."
-msgstr "Enw mewngofnodi."
+msgid "Show the &value of the environment variables"
+msgstr "Dangos gwerthoedd y &newidynnau amgylchedd"
 
-#. i18n: file: kproxydlg.ui:243
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbPassword)
-#. i18n: file: kproxydlg.ui:262
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, lePassword)
-#: rc.cpp:401 rc.cpp:407
-msgid "Login password."
-msgstr "Cyfrinair mewngofnodi."
+#. i18n: file: kproxydlg.ui:343
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, manualProxyRadioButton)
+#: rc.cpp:401
+msgid "Manually enter proxy server configuration information."
+msgstr ""
+"Mewnosod y wybodaeth ffurfweddiad ar gyfer y gweinydd dirprwyol â llaw."
 
-#. i18n: file: kproxydlg.ui:246
-#. i18n: ectx: property (text), widget (QLabel, lbPassword)
+#. i18n: file: kproxydlg.ui:346
+#. i18n: ectx: property (text), widget (QRadioButton, manualProxyRadioButton)
 #: rc.cpp:404
-msgid "Password:"
-msgstr "Cyfrinair:"
+msgid "Use manually specified proxy configuration:"
+msgstr ""
 
-#. i18n: file: kproxydlg.ui:280
-#. i18n: ectx: property (title), widget (QGroupBox, gbOptions)
+#. i18n: file: kproxydlg.ui:398
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, manualProxyHttpEdit)
 #: rc.cpp:410
-msgid "O&ptions"
-msgstr "De&wisiadau"
+msgid "Enter the address of the HTTP proxy server."
+msgstr "Rhowch gyfeiriad y gweinydd dirprwyol HTTP."
 
-#. i18n: file: kproxydlg.ui:289
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbPersConn)
-#: rc.cpp:413
-msgid ""
-"<qt>\n"
-"Use persistent proxy connection.<p>\n"
-"Although a persistent proxy connection is faster, note that it only works "
-"correctly with proxies that are fully HTTP 1.1 compliant. Do <b>not</b> use "
-"this option in combination with non-HTTP 1.1 compliant proxy servers such as "
-"JunkBuster and WWWOfle.\n"
-"</qt>"
+#. i18n: file: kproxydlg.ui:405
+#. i18n: ectx: property (text), widget (QLabel, manualProxyHttpSpinBoxLabel)
+#. i18n: file: kproxydlg.ui:471
+#. i18n: ectx: property (text), widget (QLabel, manualProxyHttpsSpinBoxLabel)
+#. i18n: file: kproxydlg.ui:524
+#. i18n: ectx: property (text), widget (QLabel, manualProxyFtpSpinBoxLabel)
+#. i18n: file: kproxydlg.ui:574
+#. i18n: ectx: property (text), widget (QLabel, manualProxySocksSpinBoxLabel)
+#: rc.cpp:413 rc.cpp:428 rc.cpp:440 rc.cpp:452
+msgid "Port:"
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:421
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, manualProxyHttpSpinBox)
+#: rc.cpp:416
+msgid "Enter the port number of the HTTP proxy server."
 msgstr ""
-"<qt>\n"
-"Defnyddio cysylltiad dirprwyol cyndyn<p>\n"
-"Er bod cysylltiad dirprwyol cyndyn yn gyflymach, noder bod dim ond gyda "
-"dirprwyon sy'n cydymffurfio'n llawn â HTTP 1.1 y mae'n gweithio'n gywir. "
-"<b>Peidiwch</b> â defnyddio'r dewisiad yma mewn cyswllt â gweinyddion sy "
-"ddim yn cydymffurfio â HTTP 1.1, megis JunkBuster neu WWWOfle.\n"
-"</qt>"
 
-#. i18n: file: kproxydlg.ui:292
-#. i18n: ectx: property (text), widget (QCheckBox, cbPersConn)
+#. i18n: file: kproxydlg.ui:436
+#. i18n: ectx: property (text), widget (QCheckBox, useSameProxyCheckBox)
 #: rc.cpp:419
-msgid "Use persistent connections to proxy"
-msgstr "Defnyddio cysylltiadau cyndyn i'r dirprwy"
-
-#. i18n: file: manualproxy.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, gbServers)
-#: rc.cpp:422
-msgid "Ser&vers"
-msgstr "Gwein&yddion"
-
-#. i18n: file: manualproxy.ui:79
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leHttp)
-#: rc.cpp:434
-msgid "Enter the address of the HTTP proxy server."
-msgstr "Rhowch gyfeiriad y gweinydd dirprwyol HTTP."
+msgid "Use this proxy server for a&ll protocols"
+msgstr ""
 
-#. i18n: file: manualproxy.ui:86
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leHttps)
-#: rc.cpp:437
+#. i18n: file: kproxydlg.ui:464
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, manualProxyHttpsEdit)
+#: rc.cpp:425
 msgid "Enter the address of the HTTPS proxy server."
 msgstr "Rhowch gyfeiriad y gweinydd dirprwyol HTTPS."
 
-#. i18n: file: manualproxy.ui:93
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leFtp)
-#: rc.cpp:440
+#. i18n: file: kproxydlg.ui:481
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, manualProxyHttpsSpinBox)
+#: rc.cpp:431
+msgid "Enter the port number of the HTTPS proxy server."
+msgstr ""
+
+#. i18n: file: kproxydlg.ui:517
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, manualProxyFtpEdit)
+#: rc.cpp:437
 msgid "Enter the address of the FTP proxy server."
 msgstr "Rhowch gyfeiriad y gweinydd dirprwyol FTP."
 
-#. i18n: file: manualproxy.ui:100
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, sbFtp)
+#. i18n: file: kproxydlg.ui:534
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, manualProxyFtpSpinBox)
 #: rc.cpp:443
-msgid ""
-"Enter the port number of the FTP proxy server. Default 8080. Another common "
-"value is 3128."
+msgid "Enter the port number of the FTP proxy server."
 msgstr ""
-"Rhowch rif porth y gweinydd dirprwyol FTP. 8080 yw'r rhagosodyn. Mae 3128 yn "
-"werth cyffredin arall."
 
-#. i18n: file: manualproxy.ui:110
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, sbHttps)
-#. i18n: file: manualproxy.ui:126
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, sbHttp)
-#: rc.cpp:446 rc.cpp:449
-msgid ""
-"Enter the port number of the HTTP proxy server. Default is 8080. Another "
-"common value is 3128."
-msgstr ""
-"Rhowch rif porth y gweinydd dirprwyol HTTP. 8080 yw'r rhagosodyn. Mae 3128 "
-"yn werth cyffredin arall."
-
-#. i18n: file: manualproxy.ui:136
-#. i18n: ectx: property (text), widget (QCheckBox, cbSameProxy)
-#: rc.cpp:452
-msgid "&Use the same proxy server for all protocols"
-msgstr "Defnyddio'r un &gweinydd dirprwyol i bob protocol."
+#. i18n: file: kproxydlg.ui:567
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, manualProxySocksEdit)
+#: rc.cpp:449
+msgid "Enter the address of the SOCKS proxy server."
+msgstr ""
 
-#. i18n: file: manualproxy.ui:153
-#. i18n: ectx: property (title), widget (QGroupBox, gbExceptions)
+#. i18n: file: kproxydlg.ui:584
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, manualProxySocksSpinBox)
 #: rc.cpp:455
-msgid "E&xceptions"
-msgstr "Eit&hriadau"
-
-#. i18n: file: manualproxy.ui:161
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbReverseProxy)
-#: rc.cpp:458
-msgid ""
-"<qt>\n"
-"Reverse the use of the exception list. Checking this box will result in the "
-"proxy servers being used only when the requested URL matches one of the "
-"addresses listed here.<p>This feature is useful if all you want or need is "
-"to use a proxy server  for a few specific sites.<p>If you have more complex "
-"requirements you might want to use a configuration script.\n"
-"</qt>"
+msgid "Enter the port number of the SOCKS proxy server."
 msgstr ""
-"<qt>\n"
-"Gwrthdroi defnydd y rhestr eithriadau.  Bydd britho'r blwch yma yn achosi "
-"defnyddio'r gweinyddion dirprwy pan fo'r URL ceisiedig yn cydweddu un o'r "
-"cyfeiriadau a restrir yma yn unig. <p>Mae'r nodwedd yma'n ddefnyddiol os oes "
-"eisiau neu angen defnyddio gweinydd dirprwy arnoch am rai safweoedd penodol "
-"yn unig.<p>Os oes gennych anghenion mwy cymhleth, efallai hoffech ddefnyddio "
-"sgript ffurfweddu.\n"
-"</qt>"
-
-#. i18n: file: manualproxy.ui:164
-#. i18n: ectx: property (text), widget (QCheckBox, cbReverseProxy)
-#: rc.cpp:463
-msgid "Use proxy only for entries in this list"
-msgstr "Defnyddio dirprwy i'r cofnodion yn y rhestr hon yn unig"
-
-#. i18n: file: manualproxy.ui:188
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbDeleteAll)
-#: rc.cpp:466
-msgid "Remove all proxy exception addresses from the list."
-msgstr "Gwaredu pob cyfeiriad eithriad dirprwy o'r rhestr."
-
-#. i18n: file: manualproxy.ui:191
-#. i18n: ectx: property (text), widget (QPushButton, pbDeleteAll)
-#: rc.cpp:469
-msgid "D&elete All"
-msgstr "D&ileu Popeth"
-
-#. i18n: file: manualproxy.ui:201
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbDelete)
-#: rc.cpp:472
-msgid "Remove the selected proxy exception address from the list."
-msgstr "Gwaredu'r cyfeiriad eithriad dirprwy a benodir o'r rhestr."
-
-#. i18n: file: manualproxy.ui:204
-#. i18n: ectx: property (text), widget (QPushButton, pbDelete)
-#: rc.cpp:475
-msgid "De&lete"
-msgstr "Di&leu"
 
-#. i18n: file: manualproxy.ui:211
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbNew)
-#: rc.cpp:478
-msgid "Add new proxy exception address to the list."
-msgstr "Ychwanegu cyfeiriad eithriad dirprwy newydd i'r rhestr."
-
-#. i18n: file: manualproxy.ui:224
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pbChange)
-#: rc.cpp:484
-msgid "Change the selected proxy exception address."
-msgstr "Newid y cyfeiriad eithriad dirprwy penodol."
-
-#. i18n: file: manualproxy.ui:227
-#. i18n: ectx: property (text), widget (QPushButton, pbChange)
-#: rc.cpp:487
-msgid "C&hange..."
-msgstr "N&ewid..."
-
-#. i18n: file: policydlg.ui:18
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbDomain)
-#. i18n: file: policydlg.ui:36
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, leDomain)
-#: rc.cpp:490 rc.cpp:498
+#. i18n: file: kproxydlg.ui:628
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, manualNoProxyEdit)
+#: rc.cpp:467
 msgid ""
 "<qt>\n"
-"Enter the host or domain to which this policy applies, e.g. "
-"<b>www.kde.org</b> or <b>.kde.org</b>.\n"
+"<p>Enter a comma separated list of hostnames or ip addresses that should be "
+"excluded from using the above proxy settings.</p>\n"
+"<p>If you want to exclude all hosts for a given domain, then simply enter "
+"the domain name preceded by a dot. For example, to exclude all hostnames for "
+"<i>kde.org</i>, enter <i>.kde.org</i>. Wildcard characters such as '*' or "
+"'?' are not supported and will have no effect.</p>\n"
+"<p>Additionally, you can also enter IP addresses, e.g. 127.0.0.1 and IP "
+"addresses with a subnet, e.g. 192.168.0.1/24.</p>\n"
 "</qt>"
 msgstr ""
-"<qt>\n"
-"Rhowch y gwesteiwr neu'r parth y  gweithreda'r polisi hwn arno, e.e. "
-"<b>www.kde.org</b> neu <b>.kde.org</b>\n"
-"</qt>"
-
-#. i18n: file: policydlg.ui:21
-#. i18n: ectx: property (text), widget (QLabel, lbDomain)
-#: rc.cpp:495
-msgid "&Domain name:"
-msgstr "Enw &Parth:"
 
-#. i18n: file: policydlg.ui:50
-#. i18n: ectx: property (whatsThis), widget (QLabel, lbPolicy)
-#. i18n: file: policydlg.ui:73
-#. i18n: ectx: property (whatsThis), widget (KComboBox, cbPolicy)
-#: rc.cpp:503 rc.cpp:516
+#. i18n: file: kproxydlg.ui:639
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, useReverseProxyCheckBox)
+#: rc.cpp:474
 msgid ""
 "<qt>\n"
-"Select the desired policy:\n"
-"<ul>\n"
-"<li><b>Accept</b> - Allows this site to set cookies</li>\n"
-"<li><b>Reject</b> - Refuse all cookies sent from this site</li>\n"
-"<li><b>Ask</b> - Prompt when cookies are received from this site</li>\n"
-"</ul>\n"
-"</qt>"
+"Check this box if you want the above proxy settings to apply only to the "
+"addresses listed in the <i>Exceptions</i> list.</qt>"
 msgstr ""
-"<qt>\n"
-"Dewiswch y polisi yr hoffech:\n"
-"<ul>\n"
-"<li><b>Derbyn</b> - Caniatâ i'r safwe yma osod bisgïen</li>\n"
-"<li><b>Gwrthod</b> - Gwrthodir pob bisgïen o'r safwe yma</li>\n"
-"<li><b>Gofyn</b> - Anogir pan dderbynnir bisgedi o'r safwe yma</li>\n"
-"</ul>\n"
-"</qt>"
-
-#. i18n: file: policydlg.ui:53
-#. i18n: ectx: property (text), widget (QLabel, lbPolicy)
-#: rc.cpp:513
-msgid "&Policy:"
-msgstr "P&olisi:"
 
-#. i18n: file: policydlg.ui:77
-#. i18n: ectx: property (text), item, widget (KComboBox, cbPolicy)
-#: rc.cpp:526
-msgid "Accept"
-msgstr "Derbyn"
-
-#. i18n: file: policydlg.ui:82
-#. i18n: ectx: property (text), item, widget (KComboBox, cbPolicy)
-#: rc.cpp:529
-msgid "Reject"
-msgstr "Gwrthod"
-
-#. i18n: file: policydlg.ui:87
-#. i18n: ectx: property (text), item, widget (KComboBox, cbPolicy)
-#: rc.cpp:532
-msgid "Ask"
-msgstr "Gofyn"
+#. i18n: file: kproxydlg.ui:642
+#. i18n: ectx: property (text), widget (QCheckBox, useReverseProxyCheckBox)
+#: rc.cpp:478
+msgid "Use proxy settings only for addresses in the Exceptions list"
+msgstr ""
 
-#. i18n: file: useragentdlg.ui:16
+#. i18n: file: useragentdlg.ui:17
 #. i18n: ectx: property (whatsThis), widget (QWidget, UserAgentUI)
-#: rc.cpp:535
+#: rc.cpp:481
 msgid ""
 "<qt>\n"
 "Here you can modify the default browser-identification text or set a site "
@@ -1522,9 +1240,9 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: useragentdlg.ui:26
+#. i18n: file: useragentdlg.ui:27
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, sendUACheckBox)
-#: rc.cpp:541
+#: rc.cpp:487
 msgid ""
 "<qt>\n"
 "Send the browser identification to web sites.<p>\n"
@@ -1544,15 +1262,15 @@
 "Gallwch weld y testun dynodiad isod.\n"
 "</qt>"
 
-#. i18n: file: useragentdlg.ui:29
+#. i18n: file: useragentdlg.ui:30
 #. i18n: ectx: property (text), widget (QCheckBox, sendUACheckBox)
-#: rc.cpp:548
+#: rc.cpp:494
 msgid "&Send identification"
 msgstr "&Anfon dynodiad"
 
-#. i18n: file: useragentdlg.ui:42
+#. i18n: file: useragentdlg.ui:43
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, defaultIdGroupBox)
-#: rc.cpp:551
+#: rc.cpp:497
 msgid ""
 "The browser identification text sent to the sites you visit. Use the "
 "provided options to customize it."
@@ -1560,15 +1278,15 @@
 "Y testun dynodiad porydd a anfonir i'r safweoedd yr ydych yn ymweld â nhw.  "
 "Defnyddiwch y dewisiadau a ddarperir i'w addasu."
 
-#. i18n: file: useragentdlg.ui:45
+#. i18n: file: useragentdlg.ui:46
 #. i18n: ectx: property (title), widget (QGroupBox, defaultIdGroupBox)
-#: rc.cpp:554
+#: rc.cpp:500
 msgid "Default Identification"
 msgstr "Dynodiad Rhagosodedig"
 
-#. i18n: file: useragentdlg.ui:57
+#. i18n: file: useragentdlg.ui:58
 #. i18n: ectx: property (whatsThis), widget (KSqueezedTextLabel, defaultIdLineEdit)
-#: rc.cpp:557
+#: rc.cpp:503
 msgid ""
 "The browser identification text sent to the sites you visit. You can "
 "customize it using the options provided below."
@@ -1576,23 +1294,23 @@
 "Y testun dynodiad rhagosodedig a anfonir i'r safweoedd yr ydych yn ymweld â "
 "nhw. Gallwch ei addasu gan ddefnyddio'r dewisiadau a ddarperir isod."
 
-#. i18n: file: useragentdlg.ui:70
+#. i18n: file: useragentdlg.ui:71
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, osNameCheckBox)
-#: rc.cpp:561
+#: rc.cpp:506
 msgid ""
 "Includes your operating system's name in the browser identification text."
 msgstr ""
 "Cynhwysa enw eich cysawd gweithredu yn y testun dynodiad rhagosodedig."
 
-#. i18n: file: useragentdlg.ui:73
+#. i18n: file: useragentdlg.ui:74
 #. i18n: ectx: property (text), widget (QCheckBox, osNameCheckBox)
-#: rc.cpp:564
+#: rc.cpp:509
 msgid "Add operating s&ystem name"
 msgstr "Ychwanegu enw c&ysawd weithredu"
 
-#. i18n: file: useragentdlg.ui:101
+#. i18n: file: useragentdlg.ui:102
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, osVersionCheckBox)
-#: rc.cpp:567
+#: rc.cpp:512
 msgid ""
 "Includes your operating system's version number in the browser "
 "identification text."
@@ -1600,83 +1318,83 @@
 "Cynhwysa rhif fersiwn eich cysawd gweithredu yn y testun dynodiad "
 "rhagosodedig."
 
-#. i18n: file: useragentdlg.ui:104
+#. i18n: file: useragentdlg.ui:105
 #. i18n: ectx: property (text), widget (QCheckBox, osVersionCheckBox)
-#: rc.cpp:570
+#: rc.cpp:515
 msgid "Add operating system &version"
 msgstr "Ychwanegu &fersiwn cysawd weithredu"
 
-#. i18n: file: useragentdlg.ui:123
+#. i18n: file: useragentdlg.ui:115
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, processorTypeCheckBox)
-#: rc.cpp:579
+#: rc.cpp:518
 msgid "Includes your machine's CPU type in the browser identification text."
 msgstr "Cynhwysa math CPU eich peiriant yn y testun dynodiad rhagosodedig."
 
-#. i18n: file: useragentdlg.ui:126
+#. i18n: file: useragentdlg.ui:118
 #. i18n: ectx: property (text), widget (QCheckBox, processorTypeCheckBox)
-#: rc.cpp:582
+#: rc.cpp:521
 msgid "Add &machine (processor) type"
 msgstr "Ychwanegu math p&eiriant (prosesydd)"
 
-#. i18n: file: useragentdlg.ui:133
+#. i18n: file: useragentdlg.ui:127
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, languageCheckBox)
-#: rc.cpp:585
+#: rc.cpp:524
 msgid ""
 "Includes your language settings in the browser identification text to obtain "
 "localized versions of the page."
 msgstr ""
 
-#. i18n: file: useragentdlg.ui:136
+#. i18n: file: useragentdlg.ui:130
 #. i18n: ectx: property (text), widget (QCheckBox, languageCheckBox)
-#: rc.cpp:588
+#: rc.cpp:527
 msgid "Add lang&uage information"
 msgstr "Ychwanegu gwybodaeth &iaith"
 
-#. i18n: file: useragentdlg.ui:149
+#. i18n: file: useragentdlg.ui:143
 #. i18n: ectx: property (title), widget (QGroupBox, domainPolicyGroupBox)
-#: rc.cpp:591
+#: rc.cpp:530
 msgid "Site Specific Identification"
 msgstr "Dynodiad sy'n Benodol i Safwe"
 
-#. i18n: file: useragentdlg.ui:162
+#. i18n: file: useragentdlg.ui:156
 #. i18n: ectx: property (text), widget (QTreeWidget, sitePolicyTreeWidget)
-#: rc.cpp:594
+#: rc.cpp:533
 msgid "Site Name"
 msgstr "Enw Safwe"
 
-#. i18n: file: useragentdlg.ui:167
+#. i18n: file: useragentdlg.ui:161
 #. i18n: ectx: property (text), widget (QTreeWidget, sitePolicyTreeWidget)
-#: rc.cpp:597
+#: rc.cpp:536
 msgid "Identification"
 msgstr "Dynodiad"
 
-#. i18n: file: useragentdlg.ui:172
+#. i18n: file: useragentdlg.ui:166
 #. i18n: ectx: property (text), widget (QTreeWidget, sitePolicyTreeWidget)
-#: rc.cpp:600
+#: rc.cpp:539
 msgid "User Agent"
 msgstr "Asiant Defnyddiwr"
 
-#. i18n: file: useragentdlg.ui:185
+#. i18n: file: useragentdlg.ui:179
 #. i18n: ectx: property (whatsThis), widget (KPushButton, newButton)
-#: rc.cpp:603
+#: rc.cpp:542
 msgid "Add new identification text for a site."
 msgstr "Ychwanegu testun dynodiad newydd ar gyfer safwe."
 
-#. i18n: file: useragentdlg.ui:195
+#. i18n: file: useragentdlg.ui:189
 #. i18n: ectx: property (whatsThis), widget (KPushButton, changeButton)
-#: rc.cpp:609
+#: rc.cpp:548
 msgid "Change the selected identifier text."
 msgstr "Newid y testun dynodiad dewisiedig."
 
-#. i18n: file: useragentdlg.ui:205
+#. i18n: file: useragentdlg.ui:199
 #. i18n: ectx: property (whatsThis), widget (KPushButton, deleteButton)
-#: rc.cpp:615
+#: rc.cpp:554
 msgid "Delete the selected identifier text."
 msgstr "Dileu'r testun dynodiad dewisiedig."
 
-#. i18n: file: useragentdlg.ui:215
+#. i18n: file: useragentdlg.ui:209
 #. i18n: ectx: property (whatsThis), widget (KPushButton, deleteAllButton)
-#: rc.cpp:621
+#: rc.cpp:560
 msgid "Delete all identifiers."
 msgstr "Dileu pob dynodiad."
 
@@ -1684,11 +1402,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, siteLabel)
 #. i18n: file: useragentselectordlg.ui:38
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, siteLineEdit)
-#. i18n: file: useragentselectordlg.ui:19
-#. i18n: ectx: property (whatsThis), widget (QLabel, siteLabel)
-#. i18n: file: useragentselectordlg.ui:38
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, siteLineEdit)
-#: rc.cpp:630 rc.cpp:639 rc.cpp:1286 rc.cpp:1295
+#: rc.cpp:566 rc.cpp:575
 msgid ""
 "<qt>\n"
 "Enter the site or domain name where a fake browser identification should be "
@@ -1703,7 +1417,7 @@
 
 #. i18n: file: useragentselectordlg.ui:22
 #. i18n: ectx: property (text), widget (QLabel, siteLabel)
-#: rc.cpp:633
+#: rc.cpp:572
 msgid "&When browsing the following site:"
 msgstr "&Pan yn pori'r safwe ganlynol:"
 
@@ -1711,7 +1425,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, aliasLabel)
 #. i18n: file: useragentselectordlg.ui:65
 #. i18n: ectx: property (whatsThis), widget (KComboBox, aliasComboBox)
-#: rc.cpp:642 rc.cpp:650
+#: rc.cpp:581 rc.cpp:589
 msgid ""
 "<qt>\n"
 "Select the browser identification to use whenever contacting the site you "
@@ -1725,7 +1439,7 @@
 
 #. i18n: file: useragentselectordlg.ui:50
 #. i18n: ectx: property (text), widget (QLabel, aliasLabel)
-#: rc.cpp:647
+#: rc.cpp:586
 msgid "&Use the following identification:"
 msgstr "&Defnyddio'r dynodiad canlynol:"
 
@@ -1733,7 +1447,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, identityLabel)
 #. i18n: file: useragentselectordlg.ui:89
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, identityLineEdit)
-#: rc.cpp:655 rc.cpp:663
+#: rc.cpp:594 rc.cpp:602
 msgid ""
 "<qt>\n"
 "The actual browser identification text that will be sent to the remote "
@@ -1746,19 +1460,19 @@
 
 #. i18n: file: useragentselectordlg.ui:77
 #. i18n: ectx: property (text), widget (QLabel, identityLabel)
-#: rc.cpp:660
+#: rc.cpp:599
 msgid "Real identification:"
 msgstr "Dynodiad gwir:"
 
 #. i18n: file: kio_ftprc.kcfg:10
 #. i18n: ectx: label, entry (DisablePassiveMode), group (DesktopIcons)
-#: rc.cpp:307
+#: rc.cpp:607
 msgid "Disable Passive FTP"
 msgstr ""
 
 #. i18n: file: kio_ftprc.kcfg:11
 #. i18n: ectx: whatsthis, entry (DisablePassiveMode), group (DesktopIcons)
-#: rc.cpp:310
+#: rc.cpp:610
 msgid ""
 "When FTP connections are passive the client connects to the server, instead "
 "of the other way round, so firewalls do not block the connection; old FTP "
@@ -1767,13 +1481,13 @@
 
 #. i18n: file: kio_ftprc.kcfg:16
 #. i18n: ectx: label, entry (MarkPartial), group (DesktopIcons)
-#: rc.cpp:313
+#: rc.cpp:613
 msgid "Mark partially uploaded files"
 msgstr "Nodi ffeiliau a lwythwyd i fyny'n rhannol"
 
 #. i18n: file: kio_ftprc.kcfg:17
 #. i18n: ectx: whatsthis, entry (MarkPartial), group (DesktopIcons)
-#: rc.cpp:316
+#: rc.cpp:616
 msgid ""
 "While a file is being uploaded its extension is \".part\". When fully "
 "uploaded it is renamed to its real name."
@@ -1812,17 +1526,17 @@
 "such.</p>"
 msgstr ""
 
-#: useragentdlg.cpp:80
+#: useragentdlg.cpp:81
 msgctxt "@title:window"
 msgid "Add Identification"
 msgstr ""
 
-#: useragentdlg.cpp:149
+#: useragentdlg.cpp:148
 msgctxt "@title:window"
 msgid "Modify Identification"
 msgstr ""
 
-#: useragentdlg.cpp:209
+#: useragentdlg.cpp:196
 #, kde-format
 msgid ""
 "<qt><center>Found an existing identification for<br/><b>%1</b><br/>Do you "
@@ -1831,12 +1545,12 @@
 "<qt><center>Canfuwyd dynodiad cyfredol ar gyfer<br/><b>%1</b><br/>A ydych am "
 "ei amnewid?</center></qt>"
 
-#: useragentdlg.cpp:206
+#: useragentdlg.cpp:201
 msgctxt "@title:window"
 msgid "Duplicate Identification"
 msgstr ""
 
-#: useragentdlg.cpp:396
+#: useragentdlg.cpp:373
 msgid ""
 "<p><h1>Browser Identification</h1> The browser-identification module allows "
 "you to have full control over how Konqueror will identify itself to web "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkonqhtml.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkonqhtml.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkonqhtml.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkonqhtml.po	2012-04-18 08:59:36.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: kcmkonqhtml\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:22+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 16:53+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: appearance.cpp:53
 msgctxt "@title:tab"
@@ -37,7 +37,7 @@
 
 #. i18n: file: css/csscustom.ui:761
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox3_2)
-#: appearance.cpp:64 rc.cpp:344
+#: appearance.cpp:64 rc.cpp:125
 msgid "Images"
 msgstr "Delweddau"
 
@@ -93,7 +93,7 @@
 msgid "A&nimations:"
 msgstr "&Bywluniau:"
 
-#: appearance.cpp:104 htmlopts.cpp:119
+#: appearance.cpp:104 htmlopts.cpp:120
 msgctxt "@title:group"
 msgid "Miscellaneous"
 msgstr ""
@@ -326,23 +326,23 @@
 msgid "You must first select a policy to delete."
 msgstr "Rhaid i chi ddewis polisi i'w ddileu yn gyntaf!"
 
-#: domainlistview.cpp:200 policydlg.cpp:61
+#: domainlistview.cpp:200 policydlg.cpp:60
 msgid "Use Global"
 msgstr "Defnyddio'r un Eang"
 
-#: domainlistview.cpp:202 policydlg.cpp:61
+#: domainlistview.cpp:202 policydlg.cpp:60
 msgid "Accept"
 msgstr "Derbyn"
 
-#: domainlistview.cpp:204 policydlg.cpp:61
+#: domainlistview.cpp:204 policydlg.cpp:60
 msgid "Reject"
 msgstr "Gwrthod"
 
-#: filteropts.cpp:59
+#: filteropts.cpp:61
 msgid "Enable filters"
 msgstr ""
 
-#: filteropts.cpp:62
+#: filteropts.cpp:64
 msgid "Hide filtered images"
 msgstr ""
 
@@ -350,11 +350,11 @@
 msgid "Manual Filter"
 msgstr ""
 
-#: filteropts.cpp:82
+#: filteropts.cpp:87
 msgid "Search:"
 msgstr ""
 
-#: filteropts.cpp:90
+#: filteropts.cpp:95
 msgid ""
 "<qt>Filter expression (e.g. <tt>http://www.example.com/ad/*</tt>, <a "
 "href=\"filterhelp\">more information</a>):"
@@ -374,51 +374,51 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: filteropts.cpp:101
+#: filteropts.cpp:129
 msgid "Insert"
 msgstr ""
 
-#: filteropts.cpp:103
+#: filteropts.cpp:131
 msgid "Update"
 msgstr "Diweddaru"
 
-#: filteropts.cpp:105
+#: filteropts.cpp:133
 msgid "Remove"
 msgstr ""
 
-#: filteropts.cpp:108
+#: filteropts.cpp:136
 msgid "Import..."
 msgstr "Mewnforio..."
 
-#: filteropts.cpp:110
+#: filteropts.cpp:138
 msgid "Export..."
 msgstr "Allforio..."
 
-#: filteropts.cpp:114
+#: filteropts.cpp:142
 msgid ""
 "<qt>More information on <a href=\"importhelp\">import format</a>, <a "
 "href=\"exporthelp\">export format</a>"
 msgstr ""
 
-#: filteropts.cpp:128
+#: filteropts.cpp:156
 msgid ""
 "Enable or disable AdBlocK filters. When enabled, a set of URL expressions "
 "should be defined in the filter list for blocking to take effect."
 msgstr ""
 
-#: filteropts.cpp:130
+#: filteropts.cpp:158
 msgid ""
 "When enabled blocked images will be removed from the page completely, "
 "otherwise a placeholder 'blocked' image will be used."
 msgstr ""
 
-#: filteropts.cpp:137
+#: filteropts.cpp:165
 msgid ""
 "This is the list of URL filters that will be applied to all embedded images "
 "and media objects."
 msgstr ""
 
-#: filteropts.cpp:141
+#: filteropts.cpp:169
 msgid ""
 "<qt><p>Enter an expression to filter. Filters can be defined as "
 "either:<ul><li>a shell-style wildcard, e.g. "
@@ -429,21 +429,21 @@
 "URL, which takes priority over any blacklist (blocking) filter."
 msgstr ""
 
-#: filteropts.cpp:157
+#: filteropts.cpp:185
 msgid ""
 "<qt><p>The filter import format is a plain text file. Blank lines, comment "
 "lines starting with '<tt>!</tt>' and the header line <tt>[AdBlock]</tt> are "
 "ignored. Any other line is added as a filter expression."
 msgstr ""
 
-#: filteropts.cpp:162
+#: filteropts.cpp:190
 msgid ""
 "<qt><p>The filter export format is a plain text file. The file begins with a "
 "header line <tt>[AdBlock]</tt>, then all of the filters follow each on a "
 "separate line."
 msgstr ""
 
-#: filteropts.cpp:411
+#: filteropts.cpp:452
 msgid ""
 "<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK allows you to create a list of "
 "filters that are checked against linked images and frames. URL's that match "
@@ -458,31 +458,31 @@
 msgid "URL"
 msgstr ""
 
-#: generalopts.cpp:53
+#: generalopts.cpp:56
 msgid "Tabbed Browsing"
 msgstr "Pori â Thabiau"
 
-#: generalopts.cpp:79
+#: generalopts.cpp:82
 msgctxt "@label:listbox"
 msgid "When &Konqueror starts:"
 msgstr ""
 
-#: generalopts.cpp:84
+#: generalopts.cpp:86
 msgctxt "@item:inlistbox"
 msgid "Show Introduction Page"
 msgstr ""
 
-#: generalopts.cpp:85
+#: generalopts.cpp:87
 msgctxt "@item:inlistbox"
 msgid "Show My Home Page"
 msgstr ""
 
-#: generalopts.cpp:86
+#: generalopts.cpp:88
 msgctxt "@item:inlistbox"
 msgid "Show Blank Page"
 msgstr ""
 
-#: generalopts.cpp:87
+#: generalopts.cpp:89
 msgctxt "@item:inlistbox"
 msgid "Show My Bookmarks"
 msgstr ""
@@ -496,7 +496,7 @@
 msgid "Select Home Page"
 msgstr ""
 
-#: generalopts.cpp:108
+#: generalopts.cpp:105
 msgid ""
 "This is the URL of the web page where Konqueror (as web browser) will jump "
 "to when the \"Home\" button is pressed. When Konqueror is started as a file "
@@ -507,7 +507,7 @@
 msgid "Default web browser engine:"
 msgstr ""
 
-#: htmlopts.cpp:45
+#: htmlopts.cpp:46
 msgid ""
 "<h1>Konqueror Browser</h1> Here you can configure Konqueror's browser "
 "functionality. Please note that the file manager functionality has to be "
@@ -521,15 +521,15 @@
 "Konqueror drin côd HTML yn y tudalennau gwê y llwytha. Nid yw'n angenrhaid "
 "newid unrhywbeth yma fel arfer."
 
-#: htmlopts.cpp:53
+#: htmlopts.cpp:54
 msgid "Boo&kmarks"
 msgstr "Tu&dnodau"
 
-#: htmlopts.cpp:56
+#: htmlopts.cpp:57
 msgid "Ask for name and folder when adding bookmarks"
 msgstr "Gofyn am enw a phlygell wrth ychwanegu tudnodau"
 
-#: htmlopts.cpp:59
+#: htmlopts.cpp:60
 msgid ""
 "If this box is checked, Konqueror will allow you to change the title of the "
 "bookmark and choose a folder in which to store it when you add a new "
@@ -538,11 +538,11 @@
 "Os brithir y blwch yma, bydd Konqueror yn gadael i chi newid teitl y tudnod "
 "a dewis plygell i'w gadw ynddi wrth i chi ychwanegu tudnod newydd."
 
-#: htmlopts.cpp:65
+#: htmlopts.cpp:66
 msgid "Show only marked bookmarks in bookmark toolbar"
 msgstr "Dangos tudnodau nodedig yn unig yn y bar offer tudnodau"
 
-#: htmlopts.cpp:67
+#: htmlopts.cpp:68
 msgid ""
 "If this box is checked, Konqueror will show only those bookmarks in the "
 "bookmark toolbar which you have marked to do so in the bookmark editor."
@@ -550,11 +550,11 @@
 "Os brithir y blwch yma, bydd Konqueror yn dangos yn y bar offer tudnodau y "
 "tudnodau yr ydych wedi eu nodi felly yn y golygydd tudnodau."
 
-#: htmlopts.cpp:74
+#: htmlopts.cpp:75
 msgid "Form Com&pletion"
 msgstr "Cyf&lawni ffurflenni"
 
-#: htmlopts.cpp:78
+#: htmlopts.cpp:79
 msgid ""
 "If this box is checked, Konqueror will remember the data you enter in web "
 "forms and suggest it in similar fields for all forms."
@@ -562,25 +562,25 @@
 "Os dewiswyd y blwch yma, cofia Konqueror y data y rhowch mewn ffurflenni gwê "
 "a'i awgrymu mewn meysydd tebyg ar bob ffurflen."
 
-#: htmlopts.cpp:84
+#: htmlopts.cpp:85
 msgid "&Maximum completions:"
 msgstr "&Uchafswm cylfawniadau:"
 
-#: htmlopts.cpp:86
+#: htmlopts.cpp:87
 msgid ""
 "Here you can select how many values Konqueror will remember for a form field."
 msgstr ""
 "Yma gallwch osod sawl gwerth y cofia Konqueror ar gyfer maes ffurflen."
 
-#: htmlopts.cpp:93
+#: htmlopts.cpp:94
 msgid "Mouse Beha&vior"
 msgstr "Ymddygiad &Llygoden"
 
-#: htmlopts.cpp:96
+#: htmlopts.cpp:97
 msgid "Chan&ge cursor over links"
 msgstr "Newi&d cyrchydd dros gysylltiadau"
 
-#: htmlopts.cpp:98
+#: htmlopts.cpp:99
 msgid ""
 "If this option is set, the shape of the cursor will change (usually to a "
 "hand) if it is moved over a hyperlink."
@@ -588,11 +588,11 @@
 "Os gosodir y dewisiad yma, fe newida siâp y cyrchydd (i law fel arfer) os "
 "y'i symudir dros gyswllt-hyper."
 
-#: htmlopts.cpp:102
+#: htmlopts.cpp:103
 msgid "M&iddle click opens URL in selection"
 msgstr "Mae &clic canol yn agor URL yn y dewisiad"
 
-#: htmlopts.cpp:105
+#: htmlopts.cpp:106
 msgid ""
 "If this box is checked, you can open the URL in the selection by middle "
 "clicking on a Konqueror view."
@@ -600,11 +600,11 @@
 "Os brithir y blwch yma, gallwch agor yr URL yn y dewisiad gan ganol-glicio "
 "ar olwg Konqueror."
 
-#: htmlopts.cpp:109
+#: htmlopts.cpp:110
 msgid "Right click goes &back in history"
 msgstr "Clic-dde'n mynd yn ôl &drwy'r hanes"
 
-#: htmlopts.cpp:112
+#: htmlopts.cpp:113
 msgid ""
 "If this box is checked, you can go back in history by right clicking on a "
 "Konqueror view. To access the context menu, press the right mouse button and "
@@ -614,11 +614,11 @@
 "olwg Konqueror. I gyrchu'r ddewislen gyd-destun, gwasgwch botwm dde'r "
 "lygoden a symudwch."
 
-#: htmlopts.cpp:123
+#: htmlopts.cpp:124
 msgid "Allow automatic delayed &reloading/redirecting"
 msgstr "Caniatáu &ail-lwytho/ailgyfeirio ymysgogol seibiedig"
 
-#: htmlopts.cpp:124
+#: htmlopts.cpp:125
 msgid ""
 "Some web pages request an automatic reload or redirection after a certain "
 "period of time. By unchecking this box Konqueror will ignore these requests."
@@ -627,11 +627,11 @@
 "amser penodol. Drwy ddatddewis y blwch yma anwybydda Konqueror y ceisiadau "
 "hyn."
 
-#: htmlopts.cpp:132
+#: htmlopts.cpp:131
 msgid "Enable Access Ke&y activation with Ctrl key"
 msgstr ""
 
-#: htmlopts.cpp:133
+#: htmlopts.cpp:132
 msgid ""
 "Pressing the Ctrl key when viewing webpages activates Access Keys. "
 "Unchecking this box will disable this accessibility feature. (Konqueror "
@@ -1274,11 +1274,7 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, NSConfigWidget)
 #. i18n: file: nsconfigwidget.ui:122
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: nsconfigwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, NSConfigWidget)
-#. i18n: file: nsconfigwidget.ui:122
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: pluginopts.cpp:170 rc.cpp:63 rc.cpp:87 rc.cpp:362 rc.cpp:386
+#: pluginopts.cpp:170 rc.cpp:233 rc.cpp:257
 msgid "Plugins"
 msgstr "Ategion"
 
@@ -1388,11 +1384,11 @@
 msgid "Select a plugin policy for the above host or domain."
 msgstr "Dewiswch bolisi ategion ar gyfer y gwesteiwr neu'r parth uchod."
 
-#: policydlg.cpp:44
+#: policydlg.cpp:43
 msgid "&Host or domain name:"
 msgstr "Enw &gwesteiwr neu barth:"
 
-#: policydlg.cpp:53
+#: policydlg.cpp:52
 msgid ""
 "Enter the name of a host (like www.kde.org) or a domain, starting with a dot "
 "(like .kde.org or .org)"
@@ -1400,25 +1396,25 @@
 "Rhowch enw gwesteiwr (fel www.kde.org) neu barth, yn dechrau â dot (fel "
 ".kde.org neu .org)"
 
-#: policydlg.cpp:125
+#: policydlg.cpp:124
 msgid "You must first enter a domain name."
 msgstr "Rhaid rhoi enw parth yn gyntaf."
 
-#: rc.cpp:97
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green ar ran KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:98
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "owaing@oceanfree.netkyfieithu@dotmon.com,,"
 
-#. i18n: file: css/cssconfig.ui:5
-#. i18n: ectx: property (whatsThis), widget (QWidget, CSSConfigWidget)
 #. i18n: file: css/csscustom.ui:13
 #. i18n: ectx: property (whatsThis), widget (QWidget, CSSCustomDialog)
-#: rc.cpp:101 rc.cpp:131
+#. i18n: file: css/cssconfig.ui:5
+#. i18n: ectx: property (whatsThis), widget (QWidget, CSSConfigWidget)
+#: rc.cpp:5 rc.cpp:143
 msgid ""
 "<b>Stylesheets</b><p>See http://www.w3.org/Style/CSS for further information "
 "on cascading style sheets.</p>"
@@ -1426,87 +1422,9 @@
 "<b>Llenni Arddull</b><p>Gweler http://www.w3.org/Style/CSS am wybodaeth "
 "bellach am lenni arddull rhaeadrol.</p>"
 
-#. i18n: file: css/cssconfig.ui:17
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, ButtonGroup1)
-#: rc.cpp:104
-msgid ""
-"<b>Stylesheets</b><p>Use this groupbox to determine how Konqueror will "
-"render style sheets.</p>"
-msgstr ""
-"<b>Llenni Ardull</b><p>Defnyddiwch y blwch casglu yma i bennu sut y llunia "
-"Konqueror lenni arddull.</p>"
-
-#. i18n: file: css/cssconfig.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup1)
-#: rc.cpp:107
-msgid "Stylesheets"
-msgstr "Llenni Arddull"
-
-#. i18n: file: css/cssconfig.ui:26
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, useDefault)
-#: rc.cpp:110
-msgid ""
-"<b>Use default stylesheet</b><p>Select this option to use the default "
-"stylesheet.</p>"
-msgstr ""
-"<b>Defnyddio llen arddull rhagosodedig</b><p>Dewiswch y dewisiad yma er mwyn "
-"defnyddio'r llen arddull rhagosodedig.</p>"
-
-#. i18n: file: css/cssconfig.ui:29
-#. i18n: ectx: property (text), widget (QRadioButton, useDefault)
-#: rc.cpp:113
-msgid "Us&e default stylesheet"
-msgstr "D&efnyddio llen arddull rhagosodedig"
-
-#. i18n: file: css/cssconfig.ui:39
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, useUser)
-#: rc.cpp:116
-msgid ""
-"<b>Use user-defined stylesheet</b><p>If this box is checked, Konqueror will "
-"try to load a user-defined style sheet as specified in the location below. "
-"The style sheet allows you to completely override the way web pages are "
-"rendered in your browser. The file specified should contain a valid style "
-"sheet (see http://www.w3.org/Style/CSS for further information on cascading "
-"style sheets).</p>"
-msgstr ""
-"<b>Defnyddio llen arddull defnyddiwr-ddiffiniedig</b><p>Os frithwyd y blwch "
-"yma, ceisia Konqueror lwytho llen arddull defnyddiwr-ddiffiniedig fel y "
-"penodir yn y lleoliad isod. Galluoga'r llen arddull i chi newid yn hollol y "
-"ffordd y llunir tudalennau gwê yn eich porwr. Dylai'r ffeil y penodir "
-"gynnwys llen arddull ddilys (gweler http://www.w3.org/Style/CSS am wybodaeth "
-"bellach am lenni arddull rhaeadrol).</p>"
-
-#. i18n: file: css/cssconfig.ui:42
-#. i18n: ectx: property (text), widget (QRadioButton, useUser)
-#: rc.cpp:119
-msgid "Use &user-defined stylesheet"
-msgstr "Defnyddio llen arddull  &defnyddiwr ddiffiniedig"
-
-#. i18n: file: css/cssconfig.ui:94
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, useAccess)
-#: rc.cpp:122
-msgid ""
-"<b>Use accessibility stylesheet</b><p>Selecting this option will allow you "
-"to define a default font, font size, and font color with a few simple clicks "
-"of the mouse. Simply wander over to the Customize... dialog and pick out "
-"your desired options.</p>"
-msgstr ""
-
-#. i18n: file: css/cssconfig.ui:97
-#. i18n: ectx: property (text), widget (QRadioButton, useAccess)
-#: rc.cpp:125
-msgid "U&se accessibility stylesheet"
-msgstr ""
-
-#. i18n: file: css/cssconfig.ui:137
-#. i18n: ectx: property (text), widget (QPushButton, customize)
-#: rc.cpp:128
-msgid "Custom&ize..."
-msgstr "&Addasu ..."
-
 #. i18n: file: css/csscustom.ui:21
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, GroupBox7)
-#: rc.cpp:134
+#: rc.cpp:8
 msgid ""
 "<b>Font family</b><p>A font family is a group of fonts that resemble one "
 "another, with family members that are e.g. bold, italic, or any number of "
@@ -1518,25 +1436,25 @@
 
 #. i18n: file: css/csscustom.ui:24
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox7)
-#: rc.cpp:137
+#: rc.cpp:11
 msgid "Font Family"
 msgstr "Teulu Wynebfathau"
 
 #. i18n: file: css/csscustom.ui:30
 #. i18n: ectx: property (text), widget (QLabel, txtBaseFontFamily)
-#: rc.cpp:140
+#: rc.cpp:14
 msgid "Base family:"
 msgstr ""
 
 #. i18n: file: css/csscustom.ui:37
 #. i18n: ectx: property (whatsThis), widget (KFontComboBox, fontFamily)
-#: rc.cpp:143
+#: rc.cpp:17
 msgid "<p>This is the currently selected font family</p>"
 msgstr "<p>Dyma'r teulu wynebfathau dewisiedig cyfredol.</p>"
 
 #. i18n: file: css/csscustom.ui:509
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, sameFamily)
-#: rc.cpp:239
+#: rc.cpp:20
 msgid ""
 "<b>Use same family for all text</b><p>Select this option to override custom "
 "fonts everywhere in favor of the base font.</p>"
@@ -1546,103 +1464,103 @@
 
 #. i18n: file: css/csscustom.ui:512
 #. i18n: ectx: property (text), widget (QCheckBox, sameFamily)
-#: rc.cpp:242
+#: rc.cpp:23
 msgid "Use same family for all text"
 msgstr "Defnyddio'r un teulu ar gyfer bob testun"
 
 #. i18n: file: css/csscustom.ui:522
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox3)
-#: rc.cpp:245
+#: rc.cpp:26
 msgid "Font Size"
 msgstr ""
 
 #. i18n: file: css/csscustom.ui:528
 #. i18n: ectx: property (text), widget (QLabel, txtFontsize)
-#: rc.cpp:248
+#: rc.cpp:29
 msgid "Base font si&ze:"
 msgstr ""
 
 #. i18n: file: css/csscustom.ui:545
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:251
+#: rc.cpp:32
 msgid "7"
 msgstr "7"
 
 #. i18n: file: css/csscustom.ui:550
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:254
+#: rc.cpp:35
 msgid "8"
 msgstr "8"
 
 #. i18n: file: css/csscustom.ui:555
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:257
+#: rc.cpp:38
 msgid "9"
 msgstr "9"
 
 #. i18n: file: css/csscustom.ui:560
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:260
+#: rc.cpp:41
 msgid "10"
 msgstr "10"
 
 #. i18n: file: css/csscustom.ui:565
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:263
+#: rc.cpp:44
 msgid "11"
 msgstr "11"
 
 #. i18n: file: css/csscustom.ui:570
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:266
+#: rc.cpp:47
 msgid "12"
 msgstr "12"
 
 #. i18n: file: css/csscustom.ui:575
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:269
+#: rc.cpp:50
 msgid "14"
 msgstr "14"
 
 #. i18n: file: css/csscustom.ui:580
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:272
+#: rc.cpp:53
 msgid "16"
 msgstr "16"
 
 #. i18n: file: css/csscustom.ui:585
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:275
+#: rc.cpp:56
 msgid "20"
 msgstr "20"
 
 #. i18n: file: css/csscustom.ui:590
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:278
+#: rc.cpp:59
 msgid "24"
 msgstr "24"
 
 #. i18n: file: css/csscustom.ui:595
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:281
+#: rc.cpp:62
 msgid "32"
 msgstr "32"
 
 #. i18n: file: css/csscustom.ui:600
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:284
+#: rc.cpp:65
 msgid "48"
 msgstr "48"
 
 #. i18n: file: css/csscustom.ui:605
 #. i18n: ectx: property (text), item, widget (QComboBox, basefontsize)
-#: rc.cpp:287
+#: rc.cpp:68
 msgid "64"
 msgstr "64"
 
 #. i18n: file: css/csscustom.ui:613
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, dontScale)
-#: rc.cpp:290
+#: rc.cpp:71
 msgid ""
 "<b>Use same size for all elements</b><p>Select this option to override "
 "custom font sizes in favor of the base font size. All fonts will be "
@@ -1654,31 +1572,31 @@
 
 #. i18n: file: css/csscustom.ui:616
 #. i18n: ectx: property (text), widget (QCheckBox, dontScale)
-#: rc.cpp:293
+#: rc.cpp:74
 msgid "&Use same size for all elements"
 msgstr "&Defnyddio'r un maint ar gyfer bob elfen"
 
 #. i18n: file: css/csscustom.ui:626
 #. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup2)
-#: rc.cpp:296
+#: rc.cpp:77
 msgid "Colors"
 msgstr ""
 
 #. i18n: file: css/csscustom.ui:648
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, blackOnWhite)
-#: rc.cpp:299
+#: rc.cpp:80
 msgid "<b>Black on White</b><p>This is what you normally see.</p>"
 msgstr "<b>Du ar Wyn</b><p>Dyma y gwelwch yn arferol.</p>"
 
 #. i18n: file: css/csscustom.ui:651
 #. i18n: ectx: property (text), widget (QRadioButton, blackOnWhite)
-#: rc.cpp:302
+#: rc.cpp:83
 msgid "&Black on white"
 msgstr "&Du ar wyn"
 
 #. i18n: file: css/csscustom.ui:661
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, whiteOnBlack)
-#: rc.cpp:305
+#: rc.cpp:86
 msgid ""
 "<b>White on Black</b><p>This is your classic inverse color scheme.</p>"
 msgstr ""
@@ -1686,13 +1604,13 @@
 
 #. i18n: file: css/csscustom.ui:664
 #. i18n: ectx: property (text), widget (QRadioButton, whiteOnBlack)
-#: rc.cpp:308
+#: rc.cpp:89
 msgid "&White on black"
 msgstr "&Gwyn ar ddu"
 
 #. i18n: file: css/csscustom.ui:671
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, customColor)
-#: rc.cpp:311
+#: rc.cpp:92
 msgid ""
 "<b>Custom</b><p>Select this option to define a custom color for the default "
 "font.</p>"
@@ -1702,13 +1620,13 @@
 
 #. i18n: file: css/csscustom.ui:674
 #. i18n: ectx: property (text), widget (QRadioButton, customColor)
-#: rc.cpp:314
+#: rc.cpp:95
 msgid "Cus&tom"
 msgstr "Adda&siedig"
 
 #. i18n: file: css/csscustom.ui:684
 #. i18n: ectx: property (whatsThis), widget (QLabel, txtBackground)
-#: rc.cpp:317
+#: rc.cpp:98
 msgid ""
 "<b>Background</b><p>This background color is the one displayed behind the "
 "text by default. A background image will override this.</p>"
@@ -1718,13 +1636,13 @@
 
 #. i18n: file: css/csscustom.ui:687
 #. i18n: ectx: property (text), widget (QLabel, txtBackground)
-#: rc.cpp:320
+#: rc.cpp:101
 msgid "Bac&kground:"
 msgstr "&Cefndir:"
 
 #. i18n: file: css/csscustom.ui:703
 #. i18n: ectx: property (whatsThis), widget (KColorButton, backgroundColorButton)
-#: rc.cpp:323
+#: rc.cpp:104
 msgid ""
 "<b>Background</b><p>Behind this door lays the ability to choose a custom "
 "default background.</p>"
@@ -1734,7 +1652,7 @@
 
 #. i18n: file: css/csscustom.ui:713
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, sameColor)
-#: rc.cpp:326
+#: rc.cpp:107
 msgid ""
 "<b>Use same color for all text</b><p>Select this option to apply your chosen "
 "color to the default font as well as any custom fonts as specified in a "
@@ -1746,7 +1664,7 @@
 
 #. i18n: file: css/csscustom.ui:716
 #. i18n: ectx: property (text), widget (QCheckBox, sameColor)
-#: rc.cpp:329
+#: rc.cpp:110
 msgid "Use same color for all text"
 msgstr "Defnyddio'r un lliw ar gyfer bob testun"
 
@@ -1754,7 +1672,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, txtForeground)
 #. i18n: file: css/csscustom.ui:745
 #. i18n: ectx: property (whatsThis), widget (KColorButton, foregroundColorButton)
-#: rc.cpp:332 rc.cpp:338
+#: rc.cpp:113 rc.cpp:119
 msgid ""
 "<b>Foreground color</b><p>The foreground color is the color that the text is "
 "drawn in.</p>"
@@ -1763,19 +1681,19 @@
 
 #. i18n: file: css/csscustom.ui:729
 #. i18n: ectx: property (text), widget (QLabel, txtForeground)
-#: rc.cpp:335
+#: rc.cpp:116
 msgid "&Foreground:"
 msgstr "&Blaendir:"
 
 #. i18n: file: css/csscustom.ui:758
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, GroupBox3_2)
-#: rc.cpp:341
+#: rc.cpp:122
 msgid "<b>Images</b>"
 msgstr ""
 
 #. i18n: file: css/csscustom.ui:767
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, hideImages)
-#: rc.cpp:347
+#: rc.cpp:128
 msgid ""
 "<b>Suppress images</b><p>Selecting this will prevent Konqueror from loading "
 "images.</p>"
@@ -1785,13 +1703,13 @@
 
 #. i18n: file: css/csscustom.ui:770
 #. i18n: ectx: property (text), widget (QCheckBox, hideImages)
-#: rc.cpp:350
+#: rc.cpp:131
 msgid "&Suppress images"
 msgstr "&Rhwystro delweddau"
 
 #. i18n: file: css/csscustom.ui:777
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, hideBackground)
-#: rc.cpp:353
+#: rc.cpp:134
 msgid ""
 "<b>Suppress background images</b><p>Selecting this option will prevent "
 "Konqueror from loading background images.</p>"
@@ -1801,79 +1719,97 @@
 
 #. i18n: file: css/csscustom.ui:780
 #. i18n: ectx: property (text), widget (QCheckBox, hideBackground)
-#: rc.cpp:356
+#: rc.cpp:137
 msgid "Suppress background images"
 msgstr "Rhwystro delweddau cefndir"
 
 #. i18n: file: css/csscustom.ui:812
 #. i18n: ectx: property (title), widget (QGroupBox, previewBox)
-#: rc.cpp:359
+#: rc.cpp:140
 msgid "Preview"
 msgstr "Rhagolwg"
 
-#. i18n: file: nsconfigwidget.ui:26
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:66 rc.cpp:365
-msgid "Folders"
+#. i18n: file: css/cssconfig.ui:17
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, ButtonGroup1)
+#: rc.cpp:146
+msgid ""
+"<b>Stylesheets</b><p>Use this groupbox to determine how Konqueror will "
+"render style sheets.</p>"
 msgstr ""
+"<b>Llenni Ardull</b><p>Defnyddiwch y blwch casglu yma i bennu sut y llunia "
+"Konqueror lenni arddull.</p>"
 
-#. i18n: file: nsconfigwidget.ui:51
-#. i18n: ectx: property (text), widget (QPushButton, dirRemove)
-#: rc.cpp:69 rc.cpp:368
-msgid "&Remove"
-msgstr ""
+#. i18n: file: css/cssconfig.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup1)
+#: rc.cpp:149
+msgid "Stylesheets"
+msgstr "Llenni Arddull"
 
-#. i18n: file: nsconfigwidget.ui:58
-#. i18n: ectx: property (text), widget (QPushButton, dirNew)
-#: rc.cpp:72 rc.cpp:371
-msgid "&New"
-msgstr "&Newydd"
+#. i18n: file: css/cssconfig.ui:26
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, useDefault)
+#: rc.cpp:152
+msgid ""
+"<b>Use default stylesheet</b><p>Select this option to use the default "
+"stylesheet.</p>"
+msgstr ""
+"<b>Defnyddio llen arddull rhagosodedig</b><p>Dewiswch y dewisiad yma er mwyn "
+"defnyddio'r llen arddull rhagosodedig.</p>"
 
-#. i18n: file: nsconfigwidget.ui:75
-#. i18n: ectx: property (text), widget (QPushButton, dirDown)
-#: rc.cpp:75 rc.cpp:374
-msgid "Do&wn"
-msgstr "I la&wr"
+#. i18n: file: css/cssconfig.ui:29
+#. i18n: ectx: property (text), widget (QRadioButton, useDefault)
+#: rc.cpp:155
+msgid "Us&e default stylesheet"
+msgstr "D&efnyddio llen arddull rhagosodedig"
 
-#. i18n: file: nsconfigwidget.ui:85
-#. i18n: ectx: property (text), widget (QPushButton, dirUp)
-#: rc.cpp:78 rc.cpp:377
-msgid "&Up"
-msgstr "I &fyny"
+#. i18n: file: css/cssconfig.ui:39
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, useUser)
+#: rc.cpp:158
+msgid ""
+"<b>Use user-defined stylesheet</b><p>If this box is checked, Konqueror will "
+"try to load a user-defined style sheet as specified in the location below. "
+"The style sheet allows you to completely override the way web pages are "
+"rendered in your browser. The file specified should contain a valid style "
+"sheet (see http://www.w3.org/Style/CSS for further information on cascading "
+"style sheets).</p>"
+msgstr ""
+"<b>Defnyddio llen arddull defnyddiwr-ddiffiniedig</b><p>Os frithwyd y blwch "
+"yma, ceisia Konqueror lwytho llen arddull defnyddiwr-ddiffiniedig fel y "
+"penodir yn y lleoliad isod. Galluoga'r llen arddull i chi newid yn hollol y "
+"ffordd y llunir tudalennau gwê yn eich porwr. Dylai'r ffeil y penodir "
+"gynnwys llen arddull ddilys (gweler http://www.w3.org/Style/CSS am wybodaeth "
+"bellach am lenni arddull rhaeadrol).</p>"
 
-#. i18n: file: nsconfigwidget.ui:102
-#. i18n: ectx: property (whatsThis), widget (QPushButton, scanButton)
-#: rc.cpp:81 rc.cpp:380
-msgid "Click here to scan for newly installed Netscape plugins now."
-msgstr "Cliciwch yma i chwilio nawr am ategion Netscape newydd eu gosod."
+#. i18n: file: css/cssconfig.ui:42
+#. i18n: ectx: property (text), widget (QRadioButton, useUser)
+#: rc.cpp:161
+msgid "Use &user-defined stylesheet"
+msgstr "Defnyddio llen arddull  &defnyddiwr ddiffiniedig"
 
-#. i18n: file: nsconfigwidget.ui:105
-#. i18n: ectx: property (text), widget (QPushButton, scanButton)
-#: rc.cpp:84 rc.cpp:383
-msgid "&Scan for Plugins"
+#. i18n: file: css/cssconfig.ui:94
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, useAccess)
+#: rc.cpp:164
+msgid ""
+"<b>Use accessibility stylesheet</b><p>Selecting this option will allow you "
+"to define a default font, font size, and font color with a few simple clicks "
+"of the mouse. Simply wander over to the Customize... dialog and pick out "
+"your desired options.</p>"
 msgstr ""
 
-#. i18n: file: nsconfigwidget.ui:128
-#. i18n: ectx: property (whatsThis), widget (QTreeWidget, pluginList)
-#: rc.cpp:90 rc.cpp:389
-msgid "Here you can see a list of the Netscape plugins KDE has found."
-msgstr "Yma gallwch weld rhestr o'r ategion Nescape mae KDE wedi'u canfod."
-
-#. i18n: file: nsconfigwidget.ui:135
-#. i18n: ectx: property (text), widget (QTreeWidget, pluginList)
-#: rc.cpp:93 rc.cpp:392
-msgid "Information"
+#. i18n: file: css/cssconfig.ui:97
+#. i18n: ectx: property (text), widget (QRadioButton, useAccess)
+#: rc.cpp:167
+msgid "U&se accessibility stylesheet"
 msgstr ""
 
-#. i18n: file: nsconfigwidget.ui:140
-#. i18n: ectx: property (text), widget (QTreeWidget, pluginList)
-#: rc.cpp:96 rc.cpp:395
-msgid "Value"
-msgstr "Gwerth"
+#. i18n: file: css/cssconfig.ui:137
+#. i18n: ectx: property (text), widget (QPushButton, customize)
+#: rc.cpp:170
+msgid "Custom&ize..."
+msgstr "&Addasu ..."
 
 #. i18n: file: advancedTabOptions.ui:21
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pShowMMBInTabs)
-#: rc.cpp:3 rc.cpp:398
+#: rc.cpp:173
 msgid ""
 "This will open a new tab instead of a new window in various situations, such "
 "as choosing a link or a folder with the middle mouse button."
@@ -1884,13 +1820,13 @@
 
 #. i18n: file: advancedTabOptions.ui:24
 #. i18n: ectx: property (text), widget (QCheckBox, m_pShowMMBInTabs)
-#: rc.cpp:6 rc.cpp:401
+#: rc.cpp:176
 msgid "Open &links in new tab instead of in new window"
 msgstr "Agor &cysylltiadau mewn tab newydd yn hytrach na ffenestr newydd"
 
 #. i18n: file: advancedTabOptions.ui:31
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pPopupsWithinTabs)
-#: rc.cpp:9 rc.cpp:404
+#: rc.cpp:179
 msgid ""
 "Whether or not JavaScript popups if allowed shall open in a new tab or in a "
 "new window."
@@ -1900,13 +1836,13 @@
 
 #. i18n: file: advancedTabOptions.ui:34
 #. i18n: ectx: property (text), widget (QCheckBox, m_pPopupsWithinTabs)
-#: rc.cpp:12 rc.cpp:407
+#: rc.cpp:182
 msgid "Open pop&ups in new tab instead of in new window"
 msgstr "Agor &cysylltiadau mewn tab newydd yn hytrach na ffenestr newydd"
 
 #. i18n: file: advancedTabOptions.ui:41
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pKonquerorTabforExternalURL)
-#: rc.cpp:15 rc.cpp:410
+#: rc.cpp:185
 msgid ""
 "When you click a URL in another KDE program or call kfmclient to open a URL, "
 "the current desktop will be searched for a non-minimized Konqueror and, if "
@@ -1920,26 +1856,26 @@
 
 #. i18n: file: advancedTabOptions.ui:44
 #. i18n: ectx: property (text), widget (QCheckBox, m_pKonquerorTabforExternalURL)
-#: rc.cpp:18 rc.cpp:413
+#: rc.cpp:188
 msgid "Open as tab in existing Konqueror when URL is called externally"
 msgstr "Agor fel tab mewn Konqueror mewn bod pan gelwir yr URL yn allanol"
 
 #. i18n: file: advancedTabOptions.ui:51
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pNewTabsInBackground)
-#: rc.cpp:21 rc.cpp:416
+#: rc.cpp:191
 msgid ""
 "This will open a new tab in the background, instead of in the foreground."
 msgstr "Agora hwn dabiau newydd yn y cefndir, yn hytrach nag yn y blaendir."
 
 #. i18n: file: advancedTabOptions.ui:54
 #. i18n: ectx: property (text), widget (QCheckBox, m_pNewTabsInBackground)
-#: rc.cpp:24 rc.cpp:419
+#: rc.cpp:194
 msgid "O&pen new tabs in the background"
 msgstr "&Agor tabiau newydd yn y cefndir"
 
 #. i18n: file: advancedTabOptions.ui:61
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pOpenAfterCurrentPage)
-#: rc.cpp:27 rc.cpp:422
+#: rc.cpp:197
 msgid ""
 "This will open a new tab opened from a page after the current tab, instead "
 "of after the last tab."
@@ -1947,13 +1883,13 @@
 
 #. i18n: file: advancedTabOptions.ui:64
 #. i18n: ectx: property (text), widget (QCheckBox, m_pOpenAfterCurrentPage)
-#: rc.cpp:30 rc.cpp:425
+#: rc.cpp:200
 msgid "Open &new tab after current tab"
 msgstr "Agor tab ne&wydd ar ôl y tab cyfredol"
 
 #. i18n: file: advancedTabOptions.ui:71
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pDynamicTabbarHide)
-#: rc.cpp:33 rc.cpp:428
+#: rc.cpp:203
 msgid ""
 "This will display the tab bar only if there are two or more tabs. Otherwise "
 "it will always be displayed."
@@ -1963,42 +1899,39 @@
 
 #. i18n: file: advancedTabOptions.ui:74
 #. i18n: ectx: property (text), widget (QCheckBox, m_pDynamicTabbarHide)
-#: rc.cpp:36 rc.cpp:431
+#: rc.cpp:206
 msgid "Hide the tab bar when only one tab is open"
 msgstr "Cuddio'r bar tabiau pan fo dim ond un tab yn agored"
 
 #. i18n: file: advancedTabOptions.ui:81
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pPermanentCloseButton)
-#: rc.cpp:39 rc.cpp:434
-msgid ""
-"This will display close buttons inside each tab instead of websites' icons."
+#: rc.cpp:209
+msgid "This will display close buttons inside each tab."
 msgstr ""
-"Bydd hwn yn dangos botymau cau tu mewn i bob tab yn lle eiconau safweoedd."
 
 #. i18n: file: advancedTabOptions.ui:84
 #. i18n: ectx: property (text), widget (QCheckBox, m_pPermanentCloseButton)
-#: rc.cpp:42 rc.cpp:437
+#: rc.cpp:212
 msgid "&Show close button on tabs"
 msgstr ""
 
 #. i18n: file: advancedTabOptions.ui:91
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pMiddleClickClose)
-#: rc.cpp:45 rc.cpp:440
+#: rc.cpp:215
 msgid ""
 "When you click on a tab using the middle mouse button or mouse wheel, it "
-"will close that tab. (Konqueror needs to be restarted for changes to take "
-"effect.)"
+"will close that tab."
 msgstr ""
 
 #. i18n: file: advancedTabOptions.ui:94
 #. i18n: ectx: property (text), widget (QCheckBox, m_pMiddleClickClose)
-#: rc.cpp:48 rc.cpp:443
+#: rc.cpp:218
 msgid "Middle-click on a tab to close it"
 msgstr ""
 
 #. i18n: file: advancedTabOptions.ui:101
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pTabConfirm)
-#: rc.cpp:51 rc.cpp:446
+#: rc.cpp:221
 msgid ""
 "This will ask you whether you are sure you want to close a window when it "
 "has multiple tabs opened in it."
@@ -2008,13 +1941,13 @@
 
 #. i18n: file: advancedTabOptions.ui:104
 #. i18n: ectx: property (text), widget (QCheckBox, m_pTabConfirm)
-#: rc.cpp:54 rc.cpp:449
+#: rc.cpp:224
 msgid "Confirm &when closing windows with multiple tabs"
 msgstr "Gwirio &pan yn cau ffenestri â sawl tab"
 
 #. i18n: file: advancedTabOptions.ui:111
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_pTabCloseActivatePrevious)
-#: rc.cpp:57 rc.cpp:452
+#: rc.cpp:227
 msgid ""
 "When checking this the previous used or opened tab will be activated when "
 "you close the current active tab instead of the one right to the current tab."
@@ -2024,10 +1957,70 @@
 
 #. i18n: file: advancedTabOptions.ui:114
 #. i18n: ectx: property (text), widget (QCheckBox, m_pTabCloseActivatePrevious)
-#: rc.cpp:60 rc.cpp:455
+#: rc.cpp:230
 msgid "Activate previously used tab when closing the current tab"
 msgstr ""
 
+#. i18n: file: nsconfigwidget.ui:26
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
+#: rc.cpp:236
+msgid "Folders"
+msgstr ""
+
+#. i18n: file: nsconfigwidget.ui:51
+#. i18n: ectx: property (text), widget (QPushButton, dirRemove)
+#: rc.cpp:239
+msgid "&Remove"
+msgstr ""
+
+#. i18n: file: nsconfigwidget.ui:58
+#. i18n: ectx: property (text), widget (QPushButton, dirNew)
+#: rc.cpp:242
+msgid "&New"
+msgstr "&Newydd"
+
+#. i18n: file: nsconfigwidget.ui:75
+#. i18n: ectx: property (text), widget (QPushButton, dirDown)
+#: rc.cpp:245
+msgid "Do&wn"
+msgstr "I la&wr"
+
+#. i18n: file: nsconfigwidget.ui:85
+#. i18n: ectx: property (text), widget (QPushButton, dirUp)
+#: rc.cpp:248
+msgid "&Up"
+msgstr "I &fyny"
+
+#. i18n: file: nsconfigwidget.ui:102
+#. i18n: ectx: property (whatsThis), widget (QPushButton, scanButton)
+#: rc.cpp:251
+msgid "Click here to scan for newly installed Netscape plugins now."
+msgstr "Cliciwch yma i chwilio nawr am ategion Netscape newydd eu gosod."
+
+#. i18n: file: nsconfigwidget.ui:105
+#. i18n: ectx: property (text), widget (QPushButton, scanButton)
+#: rc.cpp:254
+msgid "&Scan for Plugins"
+msgstr ""
+
+#. i18n: file: nsconfigwidget.ui:128
+#. i18n: ectx: property (whatsThis), widget (QTreeWidget, pluginList)
+#: rc.cpp:260
+msgid "Here you can see a list of the Netscape plugins KDE has found."
+msgstr "Yma gallwch weld rhestr o'r ategion Nescape mae KDE wedi'u canfod."
+
+#. i18n: file: nsconfigwidget.ui:135
+#. i18n: ectx: property (text), widget (QTreeWidget, pluginList)
+#: rc.cpp:263
+msgid "Information"
+msgstr ""
+
+#. i18n: file: nsconfigwidget.ui:140
+#. i18n: ectx: property (text), widget (QTreeWidget, pluginList)
+#: rc.cpp:266
+msgid "Value"
+msgstr "Gwerth"
+
 #: css/kcmcss.cpp:56
 msgid ""
 "<h1>Konqueror Stylesheets</h1> This module allows you to apply your own "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkonq.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkonq.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkonq.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkonq.po	2012-04-18 08:59:36.000000000 +0000
@@ -11,17 +11,19 @@
 msgstr ""
 "Project-Id-Version: kcmkonq\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-18 02:00+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: behaviour.cpp:44
+#: behaviour.cpp:45
 msgid ""
 "<h1>Konqueror Behavior</h1> You can configure how Konqueror behaves as a "
 "file manager here."
@@ -29,15 +31,15 @@
 "<h1>Ymddygiad Konqueror</h1> Gallwch ffurfweddu sut y mae Konqueror yn "
 "ymddwyn fel trefnydd ffeiliau yma."
 
-#: behaviour.cpp:48
+#: behaviour.cpp:49
 msgid "Misc Options"
 msgstr "Dewisiadau Amrywiol"
 
-#: behaviour.cpp:57
+#: behaviour.cpp:58
 msgid "Open folders in separate &windows"
 msgstr "Agor plygyll mewn &ffenestri ar wahân"
 
-#: behaviour.cpp:58
+#: behaviour.cpp:59
 msgid ""
 "If this option is checked, Konqueror will open a new window when you open a "
 "folder, rather than showing that folder's contents in the current window."
@@ -59,22 +61,22 @@
 msgid "Menu Editor"
 msgstr ""
 
-#: kcustommenueditor.cpp:103
+#: kcustommenueditor.cpp:102
 msgid "Menu"
 msgstr "Dewislen"
 
-#: kcustommenueditor.cpp:107
+#: kcustommenueditor.cpp:106
 msgid "New..."
 msgstr "Newydd..."
 
-#: kcustommenueditor.cpp:108
+#: kcustommenueditor.cpp:107
 msgid "Remove"
 msgstr "Tynnu"
 
-#: kcustommenueditor.cpp:109
+#: kcustommenueditor.cpp:108
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: kcustommenueditor.cpp:110
+#: kcustommenueditor.cpp:109
 msgid "Move Down"
 msgstr "Symud i Lawr"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcm_krfb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcm_krfb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcm_krfb.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcm_krfb.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kcm_krfb\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-01-12 21:50+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcm_krfb.cpp:61
 msgid "Desktop Sharing Control Module"
@@ -52,61 +52,61 @@
 "<h1>Rhannu Penbwrdd</h1> Galluoga'r modwl hwn i chi ffurfweddu rhannu "
 "penbwrdd KDE."
 
-#: rc.cpp:83
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:84
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: configurationwidget.ui:37
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:3 rc.cpp:87
+#: rc.cpp:5
 msgid "Acc&ess"
 msgstr "&Cyrchiad"
 
 #. i18n: file: configurationwidget.ui:54
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:6 rc.cpp:90
+#: rc.cpp:8
 msgid "Invitations"
 msgstr "Gwahoddiadau"
 
 #. i18n: file: configurationwidget.ui:74
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:9 rc.cpp:93
+#: rc.cpp:11
 msgid "You have no open invitations."
 msgstr "Nid oes gennych wahoddiadau agored."
 
 #. i18n: file: configurationwidget.ui:90
 #. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:12 rc.cpp:96
+#: rc.cpp:14
 msgid "Create && &Manage Invitations..."
 msgstr "Creu a &Threfnu Gwahoddiadau..."
 
 #. i18n: file: configurationwidget.ui:93
 #. i18n: ectx: property (whatsThis), widget (QPushButton)
-#: rc.cpp:15 rc.cpp:99
+#: rc.cpp:17
 msgid "Click to view or delete the open invitations."
 msgstr "Cliciwch i weld neu ddileu'r gwahoddiadau agored."
 
 #. i18n: file: configurationwidget.ui:111
 #. i18n: ectx: property (title), widget (QButtonGroup)
-#: rc.cpp:18 rc.cpp:102
+#: rc.cpp:20
 msgid "Uninvited Connections"
 msgstr "Cysylltiadau Anwahoddedig"
 
 #. i18n: file: configurationwidget.ui:128
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:21 rc.cpp:105
+#: rc.cpp:23
 msgid "Allow &uninvited connections"
 msgstr "Caniatáu cysylltiadau &anwahoddedig"
 
 #. i18n: file: configurationwidget.ui:134
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:24 rc.cpp:108
+#: rc.cpp:26
 msgid ""
 "Select this option to allow connecting without inviting. This is useful if "
 "you want to access your desktop remotely."
@@ -116,13 +116,13 @@
 
 #. i18n: file: configurationwidget.ui:142
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:27 rc.cpp:111
+#: rc.cpp:29
 msgid "Announce service &on the network"
 msgstr "Cyhoeddi'r gwasanaeth a&r y rhwydwaith"
 
 #. i18n: file: configurationwidget.ui:148
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:30 rc.cpp:114
+#: rc.cpp:32
 msgid ""
 "If you allow uninvited connections and enable this option, Desktop Sharing "
 "will announce the service and your identity on the local network, so people "
@@ -134,13 +134,13 @@
 
 #. i18n: file: configurationwidget.ui:156
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:33 rc.cpp:117
+#: rc.cpp:35
 msgid "Confirm uninvited connections &before accepting"
 msgstr "Cadarnhau cysylltiadau anwahoddedig &cyn eu derbyn"
 
 #. i18n: file: configurationwidget.ui:159
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:36 rc.cpp:120
+#: rc.cpp:38
 msgid ""
 "If enabled, a dialog will appear when somebody attempts to connect, asking "
 "you whether you want to accept the connection."
@@ -150,13 +150,13 @@
 
 #. i18n: file: configurationwidget.ui:167
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:39 rc.cpp:123
+#: rc.cpp:41
 msgid "A&llow uninvited connections to control the desktop"
 msgstr "C&aniatáu cysylltiadau anwahoddedig i reoli'r penbwrdd"
 
 #. i18n: file: configurationwidget.ui:170
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:42 rc.cpp:126
+#: rc.cpp:44
 msgid ""
 "Enable this option to allow uninvited user to control your desktop (using "
 "mouse and keyboard)."
@@ -166,13 +166,13 @@
 
 #. i18n: file: configurationwidget.ui:216
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:45 rc.cpp:129
+#: rc.cpp:47
 msgid "Pass&word:"
 msgstr "Cy&frinair:"
 
 #. i18n: file: configurationwidget.ui:233
 #. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#: rc.cpp:48 rc.cpp:132
+#: rc.cpp:50
 msgid ""
 "If you allow uninvited connections, it is highly recommended to set a "
 "password in order to protect your computer from unauthorized access."
@@ -183,25 +183,25 @@
 
 #. i18n: file: configurationwidget.ui:264
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:51 rc.cpp:135
+#: rc.cpp:53
 msgid "&Session"
 msgstr "&Sesiwn"
 
 #. i18n: file: configurationwidget.ui:281
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:54 rc.cpp:138
+#: rc.cpp:56
 msgid "Session Preferences"
 msgstr "Hoffiannau Sesiwn"
 
 #. i18n: file: configurationwidget.ui:298
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:57 rc.cpp:141
+#: rc.cpp:59
 msgid "Always disable &background image"
 msgstr "Analluogi'r ddelwedd gefndir &bob amser"
 
 #. i18n: file: configurationwidget.ui:304
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:60 rc.cpp:144
+#: rc.cpp:62
 msgid ""
 "Check this option to always disable the background image during a remote "
 "session. Otherwise the client decides whether the background will be enabled "
@@ -213,25 +213,25 @@
 
 #. i18n: file: configurationwidget.ui:333
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:63 rc.cpp:147
+#: rc.cpp:65
 msgid "&Network"
 msgstr "&Rhwydwaith"
 
 #. i18n: file: configurationwidget.ui:350
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:66 rc.cpp:150
+#: rc.cpp:68
 msgid "Network Port"
 msgstr "Porth Rhwydwaith"
 
 #. i18n: file: configurationwidget.ui:367
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:69 rc.cpp:153
+#: rc.cpp:71
 msgid "Assi&gn port automatically"
 msgstr "Neillt&uo porth yn ymysgogol"
 
 #. i18n: file: configurationwidget.ui:373
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:72 rc.cpp:156
+#: rc.cpp:74
 msgid ""
 "Check this option to assign the network port automatically. This is "
 "recommended unless your network setup requires you to use a fixed port, for "
@@ -243,19 +243,19 @@
 
 #. i18n: file: configurationwidget.ui:404
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:75 rc.cpp:159
+#: rc.cpp:77
 msgid "P&ort:"
 msgstr "P&orth:"
 
 #. i18n: file: configurationwidget.ui:424
 #. i18n: ectx: property (toolTip), widget (KIntNumInput)
-#: rc.cpp:78 rc.cpp:162
+#: rc.cpp:80
 msgid "Enter the TCP port number here"
 msgstr "Rhowch rif y porth TCP yma"
 
 #. i18n: file: configurationwidget.ui:428
 #. i18n: ectx: property (whatsThis), widget (KIntNumInput)
-#: rc.cpp:81 rc.cpp:165
+#: rc.cpp:83
 msgid ""
 "Use this field to set a static port number for the desktop sharing service. "
 "Note that if the port is already in use the Desktop Sharing service will not "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkwindecoration.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkwindecoration.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkwindecoration.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkwindecoration.po	2012-04-18 08:59:37.000000000 +0000
@@ -7,26 +7,26 @@
 msgstr ""
 "Project-Id-Version: kcmkwindecoration\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:08+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:43+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: buttons.cpp:613
 msgid "KDE"
 msgstr "KDE"
 
-#: buttons.cpp:643
+#: buttons.cpp:642
 #, kde-format
 msgid "%1 (unavailable)"
 msgstr ""
 
-#: buttons.cpp:666
+#: buttons.cpp:665
 msgid ""
 "To add or remove titlebar buttons, simply <i>drag</i> items between the "
 "available item list and the titlebar preview. Similarly, drag items within "
@@ -86,68 +86,68 @@
 
 #. i18n: file: auroraeconfig.ui:31
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:33 rc.cpp:6 rc.cpp:101
+#: configdialog.cpp:32 rc.cpp:8
 msgctxt "@item:inlistbox Border size:"
 msgid "Tiny"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:36
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:34 rc.cpp:9 rc.cpp:104
+#: configdialog.cpp:33 rc.cpp:11
 msgctxt "@item:inlistbox Border size:"
 msgid "Normal"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:41
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:35 rc.cpp:12 rc.cpp:107
+#: configdialog.cpp:34 rc.cpp:14
 msgctxt "@item:inlistbox Border size:"
 msgid "Large"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:46
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:36 rc.cpp:15 rc.cpp:110
+#: configdialog.cpp:35 rc.cpp:17
 msgctxt "@item:inlistbox Border size:"
 msgid "Very Large"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:51
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:37 rc.cpp:18 rc.cpp:113
+#: configdialog.cpp:36 rc.cpp:20
 msgctxt "@item:inlistbox Border size:"
 msgid "Huge"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:56
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:38 rc.cpp:21 rc.cpp:116
+#: configdialog.cpp:37 rc.cpp:23
 msgctxt "@item:inlistbox Border size:"
 msgid "Very Huge"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:61
 #. i18n: ectx: property (text), item, widget (KComboBox, borderSizesCombo)
-#: configdialog.cpp:39 rc.cpp:24 rc.cpp:119
+#: configdialog.cpp:38 rc.cpp:26
 msgctxt "@item:inlistbox Border size:"
 msgid "Oversized"
 msgstr ""
 
-#: configdialog.cpp:64 kwindecoration.cpp:315
+#: configdialog.cpp:63 kwindecoration.cpp:301
 msgid "Decoration Options"
 msgstr "Dewisiadau Addurniadau"
 
-#: decorationmodel.cpp:291
+#: decorationmodel.cpp:275
 #, kde-format
 msgctxt "Caption to decoration preview, %1 author name"
 msgid "by %1"
 msgstr ""
 
-#: decorationmodel.cpp:339 preview.cpp:386
+#: decorationmodel.cpp:321 preview.cpp:368
 msgid "Inactive Window"
 msgstr "Ffenestr anweithredol"
 
-#: decorationmodel.cpp:345 preview.cpp:386
+#: decorationmodel.cpp:327 preview.cpp:368
 msgid "Active Window"
 msgstr "Ffenestr Weithredol"
 
@@ -167,11 +167,11 @@
 msgid "Karol Szwed"
 msgstr ""
 
-#: kwindecoration.cpp:239
+#: kwindecoration.cpp:232
 msgid "Oxygen"
 msgstr ""
 
-#: kwindecoration.cpp:253
+#: kwindecoration.cpp:246
 msgid ""
 "<h1>Window Manager Decoration</h1><p>This module allows you to choose the "
 "window border decorations, as well as titlebar button positions and custom "
@@ -194,98 +194,115 @@
 "Mwy na thebyg mi roedd\n"
 "problem wrth lwytho'r ategyn."
 
-#: rc.cpp:82
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green ar ran KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:83
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: auroraeconfig.ui:20
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3 rc.cpp:98
+#: rc.cpp:5
 msgid "Border size:"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:69
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:27 rc.cpp:122
+#: rc.cpp:29
 msgid "Button size:"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:80
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:30 rc.cpp:125
+#: rc.cpp:32
 msgctxt "@item:inlistbox Button size:"
 msgid "Tiny"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:85
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:33 rc.cpp:128
+#: rc.cpp:35
 msgctxt "@item:inlistbox Button size:"
 msgid "Normal"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:90
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:36 rc.cpp:131
+#: rc.cpp:38
 msgctxt "@item:inlistbox Button size:"
 msgid "Large"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:95
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:39 rc.cpp:134
+#: rc.cpp:41
 msgctxt "@item:inlistbox Button size:"
 msgid "Very Large"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:100
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:42 rc.cpp:137
+#: rc.cpp:44
 msgctxt "@item:inlistbox Button size:"
 msgid "Huge"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:105
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:45 rc.cpp:140
+#: rc.cpp:47
 msgctxt "@item:inlistbox Button size:"
 msgid "Very Huge"
 msgstr ""
 
 #. i18n: file: auroraeconfig.ui:110
 #. i18n: ectx: property (text), item, widget (KComboBox, buttonSizesCombo)
-#: rc.cpp:48 rc.cpp:143
+#: rc.cpp:50
 msgctxt "@item:inlistbox Button size:"
 msgid "Oversized"
 msgstr ""
 
-#. i18n: file: config.ui:19
-#. i18n: ectx: property (text), widget (QLabel, borderLabel)
-#: rc.cpp:63 rc.cpp:161
-msgid "B&order size:"
+#. i18n: file: buttons.ui:20
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, showToolTipsCheckBox)
+#: rc.cpp:53
+msgid ""
+"Enabling this checkbox will show window button tooltips. If this checkbox is "
+"off, no window button tooltips will be shown."
 msgstr ""
+"Bydd galluogi'r blwch brith yma'n dangos cynghorion offer botymau ffenestri. "
+"Os yw'r blwch yma wedi'i ddiffodd, ni ddengys cynghorion offer botymau "
+"ffenestri."
 
-#. i18n: file: config.ui:29
-#. i18n: ectx: property (whatsThis), widget (KComboBox, bordersCombo)
-#: rc.cpp:66 rc.cpp:164
-msgid "Use this combobox to change the border size of the decoration."
+#. i18n: file: buttons.ui:23
+#. i18n: ectx: property (text), widget (QCheckBox, showToolTipsCheckBox)
+#: rc.cpp:56
+msgid "&Show window button tooltips"
+msgstr "&Dangos cynghorion offer botymau ffenestri"
+
+#. i18n: file: buttons.ui:30
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, useCustomButtonPositionsCheckBox)
+#: rc.cpp:59
+msgid "Please note that this option is not available on all styles yet."
 msgstr ""
 
+#. i18n: file: buttons.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, useCustomButtonPositionsCheckBox)
+#: rc.cpp:62
+msgid "Use custom titlebar button &positions"
+msgstr "Defnyddio &lleoliadau botymau bar teitl addasiedig"
+
 #. i18n: file: decoration.ui:17
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, searchEdit)
-#: rc.cpp:69 rc.cpp:146
+#: rc.cpp:65
 msgid "Search"
 msgstr ""
 
 #. i18n: file: decoration.ui:27
 #. i18n: ectx: property (whatsThis), widget (QListView, decorationList)
-#: rc.cpp:72 rc.cpp:149
+#: rc.cpp:68
 msgid ""
 "Select the window decoration. This is the look and feel of both the window "
 "borders and the window handle."
@@ -295,47 +312,30 @@
 
 #. i18n: file: decoration.ui:52
 #. i18n: ectx: property (text), widget (KPushButton, configureDecorationButton)
-#: rc.cpp:75 rc.cpp:152
+#: rc.cpp:71
 msgid "Configure Decoration..."
 msgstr ""
 
 #. i18n: file: decoration.ui:59
 #. i18n: ectx: property (text), widget (KPushButton, configureButtonsButton)
-#: rc.cpp:78 rc.cpp:155
+#: rc.cpp:74
 msgid "Configure Buttons..."
 msgstr ""
 
 #. i18n: file: decoration.ui:66
 #. i18n: ectx: property (text), widget (KPushButton, ghnsButton)
-#: rc.cpp:81 rc.cpp:158
+#: rc.cpp:77
 msgid "Get New Decorations..."
 msgstr ""
 
-#. i18n: file: buttons.ui:20
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, showToolTipsCheckBox)
-#: rc.cpp:51 rc.cpp:86
-msgid ""
-"Enabling this checkbox will show window button tooltips. If this checkbox is "
-"off, no window button tooltips will be shown."
+#. i18n: file: config.ui:19
+#. i18n: ectx: property (text), widget (QLabel, borderLabel)
+#: rc.cpp:80
+msgid "B&order size:"
 msgstr ""
-"Bydd galluogi'r blwch brith yma'n dangos cynghorion offer botymau ffenestri. "
-"Os yw'r blwch yma wedi'i ddiffodd, ni ddengys cynghorion offer botymau "
-"ffenestri."
-
-#. i18n: file: buttons.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, showToolTipsCheckBox)
-#: rc.cpp:54 rc.cpp:89
-msgid "&Show window button tooltips"
-msgstr "&Dangos cynghorion offer botymau ffenestri"
 
-#. i18n: file: buttons.ui:30
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, useCustomButtonPositionsCheckBox)
-#: rc.cpp:57 rc.cpp:92
-msgid "Please note that this option is not available on all styles yet."
+#. i18n: file: config.ui:29
+#. i18n: ectx: property (whatsThis), widget (KComboBox, bordersCombo)
+#: rc.cpp:83
+msgid "Use this combobox to change the border size of the decoration."
 msgstr ""
-
-#. i18n: file: buttons.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, useCustomButtonPositionsCheckBox)
-#: rc.cpp:60 rc.cpp:95
-msgid "Use custom titlebar button &positions"
-msgstr "Defnyddio &lleoliadau botymau bar teitl addasiedig"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkwinrules.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkwinrules.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkwinrules.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkwinrules.po	2012-04-18 08:59:38.000000000 +0000
@@ -6,137 +6,93 @@
 msgstr ""
 "Project-Id-Version: kcmkwinrules\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:13+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:44+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:25+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#. i18n: file: ruleswidgetbase.ui:266
+#. i18n: file: ruleswidgetbase.ui:428
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1832
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:266
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1832
+#. i18n: file: ruleswidgetbase.ui:2164
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:98 rc.cpp:125 rc.cpp:706 rc.cpp:971 rc.cpp:1552
+#: detectwidget.cpp:95 rc.cpp:160 rc.cpp:793
 msgid "Normal Window"
 msgstr "Ffenestr Arferol"
 
-#. i18n: file: ruleswidgetbase.ui:301
+#. i18n: file: ruleswidgetbase.ui:463
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1867
+#. i18n: file: ruleswidgetbase.ui:2199
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:301
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1867
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:99 rc.cpp:146 rc.cpp:727 rc.cpp:992 rc.cpp:1573
+#: detectwidget.cpp:96 rc.cpp:181 rc.cpp:814
 msgid "Desktop"
 msgstr "Penbwrdd"
 
-#. i18n: file: ruleswidgetbase.ui:281
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1847
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:281
+#. i18n: file: ruleswidgetbase.ui:443
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1847
+#. i18n: file: ruleswidgetbase.ui:2179
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:100 rc.cpp:134 rc.cpp:715 rc.cpp:980 rc.cpp:1561
+#: detectwidget.cpp:97 rc.cpp:169 rc.cpp:802
 msgid "Dock (panel)"
 msgstr "Docydd (panel)"
 
-#. i18n: file: ruleswidgetbase.ui:286
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1852
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:286
+#. i18n: file: ruleswidgetbase.ui:448
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1852
+#. i18n: file: ruleswidgetbase.ui:2184
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:101 rc.cpp:137 rc.cpp:718 rc.cpp:983 rc.cpp:1564
+#: detectwidget.cpp:98 rc.cpp:172 rc.cpp:805
 msgid "Toolbar"
 msgstr "Bar Offer"
 
-#. i18n: file: ruleswidgetbase.ui:291
+#. i18n: file: ruleswidgetbase.ui:453
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1857
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:291
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1857
+#. i18n: file: ruleswidgetbase.ui:2189
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:102 rc.cpp:140 rc.cpp:721 rc.cpp:986 rc.cpp:1567
+#: detectwidget.cpp:99 rc.cpp:175 rc.cpp:808
 msgid "Torn-Off Menu"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:271
+#. i18n: file: ruleswidgetbase.ui:433
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1837
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:271
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1837
+#. i18n: file: ruleswidgetbase.ui:2169
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:103 rc.cpp:128 rc.cpp:709 rc.cpp:974 rc.cpp:1555
+#: detectwidget.cpp:100 rc.cpp:163 rc.cpp:796
 msgid "Dialog Window"
 msgstr "Ffenestr Ymgom"
 
-#. i18n: file: ruleswidgetbase.ui:306
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1872
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:306
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1872
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:104 rc.cpp:149 rc.cpp:730 rc.cpp:995 rc.cpp:1576
+#: detectwidget.cpp:101
 msgid "Override Type"
 msgstr "Math Diystyru"
 
-#. i18n: file: ruleswidgetbase.ui:311
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1877
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:311
+#. i18n: file: ruleswidgetbase.ui:473
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1877
+#. i18n: file: ruleswidgetbase.ui:2204
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:105 rc.cpp:152 rc.cpp:733 rc.cpp:998 rc.cpp:1579
+#: detectwidget.cpp:102 rc.cpp:187 rc.cpp:817
 msgid "Standalone Menubar"
 msgstr "Bar Dewislen Unigol"
 
-#. i18n: file: ruleswidgetbase.ui:276
+#. i18n: file: ruleswidgetbase.ui:438
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1842
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:276
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1842
+#. i18n: file: ruleswidgetbase.ui:2174
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:106 rc.cpp:131 rc.cpp:712 rc.cpp:977 rc.cpp:1558
+#: detectwidget.cpp:103 rc.cpp:166 rc.cpp:799
 msgid "Utility Window"
 msgstr "Ffenestr Ddefnyddioldeb"
 
-#. i18n: file: ruleswidgetbase.ui:296
+#. i18n: file: ruleswidgetbase.ui:458
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1862
+#. i18n: file: ruleswidgetbase.ui:2194
 #. i18n: ectx: property (text), item, widget (KComboBox, type)
-#. i18n: file: ruleswidgetbase.ui:296
-#. i18n: ectx: property (text), item, widget (QListWidget, types)
-#. i18n: file: ruleswidgetbase.ui:1862
-#. i18n: ectx: property (text), item, widget (KComboBox, type)
-#: detectwidget.cpp:107 rc.cpp:143 rc.cpp:724 rc.cpp:989 rc.cpp:1570
+#: detectwidget.cpp:104 rc.cpp:178 rc.cpp:811
 msgid "Splash Screen"
 msgstr "Sgrin Croeso"
 
-#: detectwidget.cpp:117
+#: detectwidget.cpp:110
 msgid "Unknown - will be treated as Normal Window"
 msgstr "Anhysbys - trinir fel Ffenestr Arferol"
 
@@ -177,160 +133,116 @@
 msgid "Internal setting for remembering"
 msgstr ""
 
-#: main.cpp:153
+#: main.cpp:140
 #, kde-format
 msgid "Application settings for %1"
 msgstr ""
 
-#: main.cpp:177
+#: main.cpp:160
 #, kde-format
 msgid "Window settings for %1"
 msgstr ""
 
-#: main.cpp:270
+#: main.cpp:239
 msgid "KWin"
 msgstr "KWin"
 
-#: main.cpp:271
+#: main.cpp:240
 msgid "KWin helper utility"
 msgstr "Defnyddioldeb gymorth KWin"
 
-#: main.cpp:274
+#: main.cpp:243
 msgid "WId of the window for special window settings."
 msgstr ""
 
-#: main.cpp:275
+#: main.cpp:244
 msgid "Whether the settings should affect all windows of the application."
 msgstr ""
 
-#: main.cpp:285
+#: main.cpp:253
 msgid "This helper utility is not supposed to be called directly."
 msgstr ""
 
-#: rc.cpp:845
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD, ,Launchpad Contributions:"
 
-#: rc.cpp:846
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: detectwidget.ui:16
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#: rc.cpp:3 rc.cpp:849
+#. i18n: file: detectwidget.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:5
 msgid "Information About Selected Window"
 msgstr "Gwybodaeth Ynglyn â'r Ffenestr Benodol"
 
-#. i18n: file: detectwidget.ui:36
+#. i18n: file: detectwidget.ui:26
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:6 rc.cpp:852
+#: rc.cpp:8
 msgid "Class:"
 msgstr "Dosbarth:"
 
-#. i18n: file: detectwidget.ui:56
+#. i18n: file: detectwidget.ui:54
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:9 rc.cpp:855
+#: rc.cpp:11
 msgid "Role:"
 msgstr "Swyddogaeth:"
 
-#. i18n: file: detectwidget.ui:76
+#. i18n: file: detectwidget.ui:82
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:12 rc.cpp:858
+#: rc.cpp:14
 msgid "Type:"
 msgstr "Math:"
 
-#. i18n: file: detectwidget.ui:96
+#. i18n: file: detectwidget.ui:110
 #. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:15 rc.cpp:861
+#: rc.cpp:17
 msgid "Title:"
 msgstr "Teitl:"
 
-#. i18n: file: detectwidget.ui:116
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: ruleswidgetbase.ui:372
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: detectwidget.ui:116
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: ruleswidgetbase.ui:372
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:18 rc.cpp:173 rc.cpp:864 rc.cpp:1019
-msgid "Extra role:"
-msgstr "Swyddogaeth ychwanegol:"
-
-#. i18n: file: detectwidget.ui:136
+#. i18n: file: detectwidget.ui:138
 #. i18n: ectx: property (text), widget (QLabel, textLabel13)
-#: rc.cpp:21 rc.cpp:867
+#: rc.cpp:20
 msgid "Machine:"
 msgstr "Peiriant:"
 
-#. i18n: file: detectwidget.ui:175
+#. i18n: file: detectwidget.ui:169
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:26
-msgid "Match Strategy"
+#: rc.cpp:23
+msgid "Match by primary class name and"
 msgstr ""
 
-#. i18n: file: detectwidget.ui:159
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, use_class)
-#: rc.cpp:24 rc.cpp:870
-msgid ""
-"For selecting all windows belonging to a specific application, selecting "
-"only window class should usually work."
+#. i18n: file: detectwidget.ui:178
+#. i18n: ectx: property (text), widget (QCheckBox, match_whole_class)
+#: rc.cpp:26
+msgid "Secondary class name  (resulting in term in brackets)"
 msgstr ""
-"I ddewis pob ffenestr sy'n biau i gymhwysiad penodol, dylai ddewis dosbarth "
-"ffenestr yn unig weithio fel rheol."
-
-#. i18n: file: detectwidget.ui:162
-#. i18n: ectx: property (text), widget (QRadioButton, use_class)
-#: rc.cpp:27 rc.cpp:873
-msgid "Use window &class (whole application)"
-msgstr "Defnyddio &dosbarth ffenestr (holl gymhwysiad)"
-
-#. i18n: file: detectwidget.ui:172
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, use_role)
-#: rc.cpp:30 rc.cpp:876
-msgid ""
-"For selecting a specific window in an application, both window class and "
-"window role should be selected. Window class will determine the application, "
-"and window role the specific window in the application; many applications do "
-"not provide useful window roles though."
-msgstr ""
-
-#. i18n: file: detectwidget.ui:175
-#. i18n: ectx: property (text), widget (QRadioButton, use_role)
-#: rc.cpp:33 rc.cpp:879
-msgid "Use window class and window &role (specific window)"
-msgstr ""
-"Defnyddio dosbarth ffenestr a s&wyddogaeth ffenestr (ffenestr benodol)"
-
-#. i18n: file: detectwidget.ui:182
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, use_whole_class)
-#: rc.cpp:36 rc.cpp:882
-msgid ""
-"With some (non-KDE) applications whole window class can be sufficient for "
-"selecting a specific window in an application, as they set whole window "
-"class to contain both application and window role."
-msgstr ""
-"Efo rhai cymhwysiadau (di-KDE) gall holl ddosbarth ffenestr fod yn ddigonol "
-"i ddewis ffenestr benodol mewn cymhwysiad, gan eu bod nhw yn gosod holl "
-"ddosbarth ffenestr i gynnwys swyddogaeth gymhwysiad a ffenestr."
 
 #. i18n: file: detectwidget.ui:185
-#. i18n: ectx: property (text), widget (QRadioButton, use_whole_class)
-#: rc.cpp:39 rc.cpp:885
-msgid "Use &whole window class (specific window)"
-msgstr "Defnyddio &holl ddosbarth ffenestr (ffenestr benodol)"
+#. i18n: ectx: property (text), widget (QCheckBox, match_role)
+#: rc.cpp:29
+msgid "Window role (can be used to select windows by function)"
+msgstr ""
 
 #. i18n: file: detectwidget.ui:192
+#. i18n: ectx: property (text), widget (QCheckBox, match_type)
+#: rc.cpp:32
+msgid "Window type (eg. all dialogs, but not the main windows)"
+msgstr ""
+
+#. i18n: file: detectwidget.ui:199
 #. i18n: ectx: property (text), widget (QCheckBox, match_title)
-#: rc.cpp:42 rc.cpp:888
-msgid "Match also window &title"
+#: rc.cpp:35
+msgid ""
+"Window title (very specific, can fail due to content changes or translation)"
 msgstr ""
 
 #. i18n: file: editshortcut.ui:18
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:45 rc.cpp:891
+#: rc.cpp:38
 msgid ""
 "A single shortcut can be easily assigned or cleared using the two buttons. "
 "Only shortcuts with modifiers can be used.<p>\n"
@@ -344,1039 +256,668 @@
 
 #. i18n: file: editshortcut.ui:62
 #. i18n: ectx: property (text), widget (QPushButton, pushButton1)
-#: rc.cpp:50 rc.cpp:896
+#: rc.cpp:43
 msgid "&Single Shortcut"
 msgstr ""
 
 #. i18n: file: editshortcut.ui:85
 #. i18n: ectx: property (text), widget (QPushButton, pushButton2)
-#: rc.cpp:53 rc.cpp:899
+#: rc.cpp:46
 msgid "C&lear"
 msgstr "&Gwaredu"
 
-#. i18n: file: ruleslist.ui:22
+#. i18n: file: ruleslist.ui:23
 #. i18n: ectx: property (text), widget (KPushButton, new_button)
-#: rc.cpp:56 rc.cpp:902
+#: rc.cpp:49
 msgid "&New..."
 msgstr "&Newydd..."
 
-#. i18n: file: ruleslist.ui:29
+#. i18n: file: ruleslist.ui:30
 #. i18n: ectx: property (text), widget (KPushButton, modify_button)
-#: rc.cpp:59 rc.cpp:905
+#: rc.cpp:52
 msgid "&Modify..."
 msgstr "&Addasu..."
 
-#. i18n: file: ruleslist.ui:36
+#. i18n: file: ruleslist.ui:37
 #. i18n: ectx: property (text), widget (KPushButton, delete_button)
-#: rc.cpp:62 rc.cpp:908
+#: rc.cpp:55
 msgid "Delete"
 msgstr ""
 
-#. i18n: file: ruleslist.ui:46
+#. i18n: file: ruleslist.ui:47
 #. i18n: ectx: property (text), widget (KPushButton, moveup_button)
-#: rc.cpp:65 rc.cpp:911
+#: rc.cpp:58
 msgid "Move &Up"
 msgstr "Symud i &Fyny"
 
-#. i18n: file: ruleslist.ui:53
+#. i18n: file: ruleslist.ui:54
 #. i18n: ectx: property (text), widget (KPushButton, movedown_button)
-#: rc.cpp:68 rc.cpp:914
+#: rc.cpp:61
 msgid "Move &Down"
 msgstr "Symud i &Lawr"
 
 #. i18n: file: ruleslist.ui:91
 #. i18n: ectx: property (text), widget (QPushButton, import_button)
-#: rc.cpp:76
+#: rc.cpp:64
 msgid "&Import"
 msgstr ""
 
 #. i18n: file: ruleslist.ui:98
 #. i18n: ectx: property (text), widget (QPushButton, export_button)
-#: rc.cpp:79
+#: rc.cpp:67
 msgid "&Export"
 msgstr ""
 
 #. i18n: file: ruleswidgetbase.ui:21
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage1)
-#: rc.cpp:82
+#: rc.cpp:70
 msgid "&Window matching"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:30
+#. i18n: file: ruleswidgetbase.ui:27
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:74 rc.cpp:920
+#: rc.cpp:73
 msgid "De&scription:"
 msgstr "Di&sgrifiad:"
 
 #. i18n: file: ruleswidgetbase.ui:46
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:88
+#: rc.cpp:76
 msgid "Window &class (application):"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:70
+#. i18n: file: ruleswidgetbase.ui:63
 #. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:123
+#. i18n: file: ruleswidgetbase.ui:126
 #. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:336
+#. i18n: file: ruleswidgetbase.ui:195
 #. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:389
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:442
+#. i18n: file: ruleswidgetbase.ui:248
 #. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#. i18n: file: ruleswidgetbase.ui:70
-#. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:123
-#. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:336
-#. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:389
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:442
-#. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#: rc.cpp:83 rc.cpp:101 rc.cpp:158 rc.cpp:176 rc.cpp:194 rc.cpp:929 rc.cpp:947
-#: rc.cpp:1004 rc.cpp:1022 rc.cpp:1040
+#: rc.cpp:79 rc.cpp:100 rc.cpp:121 rc.cpp:139
 msgid "Unimportant"
 msgstr "Dim o bwys"
 
-#. i18n: file: ruleswidgetbase.ui:75
+#. i18n: file: ruleswidgetbase.ui:68
 #. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:128
+#. i18n: file: ruleswidgetbase.ui:131
 #. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:341
+#. i18n: file: ruleswidgetbase.ui:200
 #. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:394
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:447
+#. i18n: file: ruleswidgetbase.ui:253
 #. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#. i18n: file: ruleswidgetbase.ui:75
-#. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:128
-#. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:341
-#. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:394
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:447
-#. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#: rc.cpp:86 rc.cpp:104 rc.cpp:161 rc.cpp:179 rc.cpp:197 rc.cpp:932 rc.cpp:950
-#: rc.cpp:1007 rc.cpp:1025 rc.cpp:1043
+#: rc.cpp:82 rc.cpp:103 rc.cpp:124 rc.cpp:142
 msgid "Exact Match"
 msgstr "Cydweddiad Union"
 
-#. i18n: file: ruleswidgetbase.ui:80
-#. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:133
-#. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:346
-#. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:399
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:452
-#. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#. i18n: file: ruleswidgetbase.ui:80
+#. i18n: file: ruleswidgetbase.ui:73
 #. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:133
+#. i18n: file: ruleswidgetbase.ui:136
 #. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:346
+#. i18n: file: ruleswidgetbase.ui:205
 #. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:399
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:452
+#. i18n: file: ruleswidgetbase.ui:258
 #. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#: rc.cpp:89 rc.cpp:107 rc.cpp:164 rc.cpp:182 rc.cpp:200 rc.cpp:935 rc.cpp:953
-#: rc.cpp:1010 rc.cpp:1028 rc.cpp:1046
+#: rc.cpp:85 rc.cpp:106 rc.cpp:127 rc.cpp:145
 msgid "Substring Match"
 msgstr "Cydweddiad Is-linyn"
 
-#. i18n: file: ruleswidgetbase.ui:85
+#. i18n: file: ruleswidgetbase.ui:78
 #. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:138
+#. i18n: file: ruleswidgetbase.ui:141
 #. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:351
+#. i18n: file: ruleswidgetbase.ui:210
 #. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:404
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:457
+#. i18n: file: ruleswidgetbase.ui:263
 #. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#. i18n: file: ruleswidgetbase.ui:85
-#. i18n: ectx: property (text), item, widget (KComboBox, wmclass_match)
-#. i18n: file: ruleswidgetbase.ui:138
-#. i18n: ectx: property (text), item, widget (KComboBox, role_match)
-#. i18n: file: ruleswidgetbase.ui:351
-#. i18n: ectx: property (text), item, widget (KComboBox, title_match)
-#. i18n: file: ruleswidgetbase.ui:404
-#. i18n: ectx: property (text), item, widget (KComboBox, extra_match)
-#. i18n: file: ruleswidgetbase.ui:457
-#. i18n: ectx: property (text), item, widget (KComboBox, machine_match)
-#: rc.cpp:92 rc.cpp:110 rc.cpp:167 rc.cpp:185 rc.cpp:203 rc.cpp:938 rc.cpp:956
-#: rc.cpp:1013 rc.cpp:1031 rc.cpp:1049
+#: rc.cpp:88 rc.cpp:109 rc.cpp:130 rc.cpp:148
 msgid "Regular Expression"
 msgstr "Mynegiad Rheolaidd"
 
-#. i18n: file: ruleswidgetbase.ui:96
-#. i18n: ectx: property (text), widget (KPushButton, edit_reg_wmclass)
-#. i18n: file: ruleswidgetbase.ui:149
-#. i18n: ectx: property (text), widget (KPushButton, edit_reg_role)
-#. i18n: file: ruleswidgetbase.ui:362
-#. i18n: ectx: property (text), widget (KPushButton, edit_reg_title)
-#. i18n: file: ruleswidgetbase.ui:415
-#. i18n: ectx: property (text), widget (KPushButton, edit_reg_extra)
-#. i18n: file: ruleswidgetbase.ui:468
-#. i18n: ectx: property (text), widget (KPushButton, edit_reg_machine)
-#. i18n: file: ruleswidgetbase.ui:96
+#. i18n: file: ruleswidgetbase.ui:92
 #. i18n: ectx: property (text), widget (KPushButton, edit_reg_wmclass)
-#. i18n: file: ruleswidgetbase.ui:149
+#. i18n: file: ruleswidgetbase.ui:155
 #. i18n: ectx: property (text), widget (KPushButton, edit_reg_role)
-#. i18n: file: ruleswidgetbase.ui:362
+#. i18n: file: ruleswidgetbase.ui:221
 #. i18n: ectx: property (text), widget (KPushButton, edit_reg_title)
-#. i18n: file: ruleswidgetbase.ui:415
-#. i18n: ectx: property (text), widget (KPushButton, edit_reg_extra)
-#. i18n: file: ruleswidgetbase.ui:468
+#. i18n: file: ruleswidgetbase.ui:274
 #. i18n: ectx: property (text), widget (KPushButton, edit_reg_machine)
-#: rc.cpp:95 rc.cpp:113 rc.cpp:170 rc.cpp:188 rc.cpp:206 rc.cpp:941 rc.cpp:959
-#: rc.cpp:1016 rc.cpp:1034 rc.cpp:1052
+#: rc.cpp:91 rc.cpp:112 rc.cpp:133 rc.cpp:151
 msgid "Edit"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:62
+#. i18n: file: ruleswidgetbase.ui:102
 #. i18n: ectx: property (text), widget (QCheckBox, whole_wmclass)
-#: rc.cpp:80 rc.cpp:926
+#: rc.cpp:94
 msgid "Match w&hole window class"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:106
+#. i18n: file: ruleswidgetbase.ui:109
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:98 rc.cpp:944
+#: rc.cpp:97
 msgid "Window &role:"
 msgstr "&Rôl y ffenestr:"
 
-#. i18n: file: ruleswidgetbase.ui:249
+#. i18n: file: ruleswidgetbase.ui:162
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:122 rc.cpp:968
+#: rc.cpp:115
 msgid "Window &types:"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:319
+#. i18n: file: ruleswidgetbase.ui:178
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:155 rc.cpp:1001
+#: rc.cpp:118
 msgid "Window t&itle:"
 msgstr "Te&itl Ffenestr:"
 
-#. i18n: file: ruleswidgetbase.ui:425
+#. i18n: file: ruleswidgetbase.ui:231
 #. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:191 rc.cpp:1037
+#: rc.cpp:136
 msgid "&Machine (hostname):"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:171
+#. i18n: file: ruleswidgetbase.ui:318
 #. i18n: ectx: property (text), widget (KPushButton, detect)
-#: rc.cpp:116 rc.cpp:962
+#: rc.cpp:154
 msgid "&Detect Window Properties"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:381
+#. i18n: file: ruleswidgetbase.ui:325
 #. i18n: ectx: property (suffix), widget (QSpinBox, detection_delay)
-#: rc.cpp:187
+#: rc.cpp:157
 msgid "s delay"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:524
+#. i18n: file: ruleswidgetbase.ui:468
 #. i18n: ectx: property (text), item, widget (QListWidget, types)
-#: rc.cpp:214
+#: rc.cpp:184
 msgid "Unmanaged Window"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:545
+#. i18n: file: ruleswidgetbase.ui:489
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage3)
-#: rc.cpp:220
+#: rc.cpp:190
 msgid "&Size && Position"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:591
+#. i18n: file: ruleswidgetbase.ui:495
 #. i18n: ectx: property (text), widget (QCheckBox, enable_position)
-#: rc.cpp:236 rc.cpp:1082
+#: rc.cpp:193
 msgid "&Position"
 msgstr "&Lleoliad"
 
-#. i18n: file: ruleswidgetbase.ui:541
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:612
+#. i18n: file: ruleswidgetbase.ui:506
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:659
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:723
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:767
+#. i18n: file: ruleswidgetbase.ui:563
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
+#. i18n: file: ruleswidgetbase.ui:641
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:811
+#. i18n: file: ruleswidgetbase.ui:713
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:879
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:933
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
-#. i18n: file: ruleswidgetbase.ui:1035
+#. i18n: file: ruleswidgetbase.ui:785
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1149
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
-#. i18n: file: ruleswidgetbase.ui:1278
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
-#. i18n: file: ruleswidgetbase.ui:1300
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupfg)
-#. i18n: file: ruleswidgetbase.ui:1322
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
-#. i18n: file: ruleswidgetbase.ui:1344
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
-#. i18n: file: ruleswidgetbase.ui:1366
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
-#. i18n: file: ruleswidgetbase.ui:1388
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1425
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1462
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1499
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1536
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1589
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityinactive)
-#. i18n: file: ruleswidgetbase.ui:1638
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1696
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
-#. i18n: file: ruleswidgetbase.ui:1749
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:1810
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_type)
-#. i18n: file: ruleswidgetbase.ui:1920
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fsplevel)
-#. i18n: file: ruleswidgetbase.ui:1942
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_moveresizemode)
-#. i18n: file: ruleswidgetbase.ui:2013
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
-#. i18n: file: ruleswidgetbase.ui:2052
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
-#. i18n: file: ruleswidgetbase.ui:2081
+#. i18n: file: ruleswidgetbase.ui:846
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
+#. i18n: file: ruleswidgetbase.ui:938
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_ignoreposition)
-#. i18n: file: ruleswidgetbase.ui:2139
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
-#. i18n: file: ruleswidgetbase.ui:2191
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
-#. i18n: file: ruleswidgetbase.ui:541
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:612
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:659
+#. i18n: file: ruleswidgetbase.ui:981
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
+#. i18n: file: ruleswidgetbase.ui:1039
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:723
+#. i18n: file: ruleswidgetbase.ui:1076
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:767
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:811
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:879
+#. i18n: file: ruleswidgetbase.ui:1113
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:933
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
-#. i18n: file: ruleswidgetbase.ui:1035
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1149
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
-#. i18n: file: ruleswidgetbase.ui:1278
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
-#. i18n: file: ruleswidgetbase.ui:1300
+#. i18n: file: ruleswidgetbase.ui:1163
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
+#. i18n: file: ruleswidgetbase.ui:1238
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
+#. i18n: file: ruleswidgetbase.ui:1274
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
+#. i18n: file: ruleswidgetbase.ui:1325
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
+#. i18n: file: ruleswidgetbase.ui:1390
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupfg)
-#. i18n: file: ruleswidgetbase.ui:1322
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
-#. i18n: file: ruleswidgetbase.ui:1344
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
-#. i18n: file: ruleswidgetbase.ui:1366
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
-#. i18n: file: ruleswidgetbase.ui:1388
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1425
+#. i18n: file: ruleswidgetbase.ui:1426
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
+#. i18n: file: ruleswidgetbase.ui:1495
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
+#. i18n: file: ruleswidgetbase.ui:1564
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1462
+#. i18n: file: ruleswidgetbase.ui:1611
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
+#. i18n: file: ruleswidgetbase.ui:1665
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
+#. i18n: file: ruleswidgetbase.ui:1726
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
+#. i18n: file: ruleswidgetbase.ui:1832
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
+#. i18n: file: ruleswidgetbase.ui:1868
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1499
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1536
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1589
+#. i18n: file: ruleswidgetbase.ui:1919
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
+#. i18n: file: ruleswidgetbase.ui:1964
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityinactive)
-#. i18n: file: ruleswidgetbase.ui:1638
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1696
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
-#. i18n: file: ruleswidgetbase.ui:1749
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:1810
+#. i18n: file: ruleswidgetbase.ui:2043
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
+#. i18n: file: ruleswidgetbase.ui:2092
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
+#. i18n: file: ruleswidgetbase.ui:2142
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_type)
-#. i18n: file: ruleswidgetbase.ui:1920
+#. i18n: file: ruleswidgetbase.ui:2300
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
+#. i18n: file: ruleswidgetbase.ui:2322
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_blockcompositing)
+#. i18n: file: ruleswidgetbase.ui:2344
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fsplevel)
-#. i18n: file: ruleswidgetbase.ui:1942
+#. i18n: file: ruleswidgetbase.ui:2419
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_moveresizemode)
-#. i18n: file: ruleswidgetbase.ui:2013
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
-#. i18n: file: ruleswidgetbase.ui:2052
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
-#. i18n: file: ruleswidgetbase.ui:2081
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_ignoreposition)
-#. i18n: file: ruleswidgetbase.ui:2139
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
-#. i18n: file: ruleswidgetbase.ui:2191
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
-#: rc.cpp:212 rc.cpp:242 rc.cpp:260 rc.cpp:281 rc.cpp:302 rc.cpp:323
-#: rc.cpp:347 rc.cpp:368 rc.cpp:410 rc.cpp:462 rc.cpp:474 rc.cpp:483
-#: rc.cpp:492 rc.cpp:501 rc.cpp:510 rc.cpp:519 rc.cpp:537 rc.cpp:555
-#: rc.cpp:573 rc.cpp:591 rc.cpp:609 rc.cpp:628 rc.cpp:652 rc.cpp:673
-#: rc.cpp:697 rc.cpp:748 rc.cpp:757 rc.cpp:787 rc.cpp:802 rc.cpp:814
-#: rc.cpp:826 rc.cpp:838 rc.cpp:1058 rc.cpp:1088 rc.cpp:1106 rc.cpp:1127
-#: rc.cpp:1148 rc.cpp:1169 rc.cpp:1193 rc.cpp:1214 rc.cpp:1256 rc.cpp:1308
-#: rc.cpp:1320 rc.cpp:1329 rc.cpp:1338 rc.cpp:1347 rc.cpp:1356 rc.cpp:1365
-#: rc.cpp:1383 rc.cpp:1401 rc.cpp:1419 rc.cpp:1437 rc.cpp:1455 rc.cpp:1474
-#: rc.cpp:1498 rc.cpp:1519 rc.cpp:1543 rc.cpp:1594 rc.cpp:1603 rc.cpp:1633
-#: rc.cpp:1648 rc.cpp:1660 rc.cpp:1672 rc.cpp:1684
+#: rc.cpp:196 rc.cpp:223 rc.cpp:253 rc.cpp:277 rc.cpp:301 rc.cpp:322
+#: rc.cpp:370 rc.cpp:382 rc.cpp:397 rc.cpp:415 rc.cpp:433 rc.cpp:457
+#: rc.cpp:479 rc.cpp:494 rc.cpp:515 rc.cpp:539 rc.cpp:551 rc.cpp:563
+#: rc.cpp:584 rc.cpp:608 rc.cpp:632 rc.cpp:653 rc.cpp:674 rc.cpp:689
+#: rc.cpp:710 rc.cpp:726 rc.cpp:747 rc.cpp:769 rc.cpp:784 rc.cpp:823
+#: rc.cpp:832 rc.cpp:841 rc.cpp:875
 msgid "Do Not Affect"
 msgstr "Dim Effaith"
 
-#. i18n: file: ruleswidgetbase.ui:546
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:617
+#. i18n: file: ruleswidgetbase.ui:511
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:664
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:728
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:772
+#. i18n: file: ruleswidgetbase.ui:568
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
+#. i18n: file: ruleswidgetbase.ui:646
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:816
+#. i18n: file: ruleswidgetbase.ui:718
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:884
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:1040
+#. i18n: file: ruleswidgetbase.ui:790
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1393
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1430
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1467
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1504
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1541
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1643
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1754
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:546
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:617
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:664
+#. i18n: file: ruleswidgetbase.ui:1044
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:728
+#. i18n: file: ruleswidgetbase.ui:1081
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:772
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:816
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:884
+#. i18n: file: ruleswidgetbase.ui:1118
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:1040
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1393
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1430
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1467
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1504
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1541
+#. i18n: file: ruleswidgetbase.ui:1279
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1643
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1754
+#. i18n: file: ruleswidgetbase.ui:1330
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
+#. i18n: file: ruleswidgetbase.ui:1569
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
+#. i18n: file: ruleswidgetbase.ui:1616
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
+#. i18n: file: ruleswidgetbase.ui:1670
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#: rc.cpp:215 rc.cpp:245 rc.cpp:263 rc.cpp:284 rc.cpp:305 rc.cpp:326
-#: rc.cpp:350 rc.cpp:413 rc.cpp:522 rc.cpp:540 rc.cpp:558 rc.cpp:576
-#: rc.cpp:594 rc.cpp:631 rc.cpp:676 rc.cpp:1061 rc.cpp:1091 rc.cpp:1109
-#: rc.cpp:1130 rc.cpp:1151 rc.cpp:1172 rc.cpp:1196 rc.cpp:1259 rc.cpp:1368
-#: rc.cpp:1386 rc.cpp:1404 rc.cpp:1422 rc.cpp:1440 rc.cpp:1477 rc.cpp:1522
+#. i18n: file: ruleswidgetbase.ui:1731
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
+#. i18n: file: ruleswidgetbase.ui:1873
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
+#: rc.cpp:199 rc.cpp:226 rc.cpp:256 rc.cpp:280 rc.cpp:304 rc.cpp:400
+#: rc.cpp:418 rc.cpp:436 rc.cpp:497 rc.cpp:518 rc.cpp:587 rc.cpp:611
+#: rc.cpp:635 rc.cpp:656 rc.cpp:692
 msgid "Apply Initially"
 msgstr "Gweithredu yn Gychwynnol"
 
-#. i18n: file: ruleswidgetbase.ui:551
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:622
+#. i18n: file: ruleswidgetbase.ui:516
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:669
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:733
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:777
+#. i18n: file: ruleswidgetbase.ui:573
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
+#. i18n: file: ruleswidgetbase.ui:651
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:821
+#. i18n: file: ruleswidgetbase.ui:723
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:889
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:1045
+#. i18n: file: ruleswidgetbase.ui:795
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1398
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1435
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1472
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1509
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1546
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1648
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1759
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:551
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:622
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:669
+#. i18n: file: ruleswidgetbase.ui:1049
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:733
+#. i18n: file: ruleswidgetbase.ui:1086
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:777
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:821
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:889
+#. i18n: file: ruleswidgetbase.ui:1123
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:1045
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1398
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1435
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1472
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1509
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1546
+#. i18n: file: ruleswidgetbase.ui:1284
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1648
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1759
+#. i18n: file: ruleswidgetbase.ui:1335
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
+#. i18n: file: ruleswidgetbase.ui:1574
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
+#. i18n: file: ruleswidgetbase.ui:1621
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
+#. i18n: file: ruleswidgetbase.ui:1675
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#: rc.cpp:218 rc.cpp:248 rc.cpp:266 rc.cpp:287 rc.cpp:308 rc.cpp:329
-#: rc.cpp:353 rc.cpp:416 rc.cpp:525 rc.cpp:543 rc.cpp:561 rc.cpp:579
-#: rc.cpp:597 rc.cpp:634 rc.cpp:679 rc.cpp:1064 rc.cpp:1094 rc.cpp:1112
-#: rc.cpp:1133 rc.cpp:1154 rc.cpp:1175 rc.cpp:1199 rc.cpp:1262 rc.cpp:1371
-#: rc.cpp:1389 rc.cpp:1407 rc.cpp:1425 rc.cpp:1443 rc.cpp:1480 rc.cpp:1525
+#. i18n: file: ruleswidgetbase.ui:1736
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
+#. i18n: file: ruleswidgetbase.ui:1878
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
+#: rc.cpp:202 rc.cpp:229 rc.cpp:259 rc.cpp:283 rc.cpp:307 rc.cpp:403
+#: rc.cpp:421 rc.cpp:439 rc.cpp:500 rc.cpp:521 rc.cpp:590 rc.cpp:614
+#: rc.cpp:638 rc.cpp:659 rc.cpp:695
 msgid "Remember"
 msgstr "Cofio"
 
-#. i18n: file: ruleswidgetbase.ui:556
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:627
+#. i18n: file: ruleswidgetbase.ui:521
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:674
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:738
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:782
+#. i18n: file: ruleswidgetbase.ui:578
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
+#. i18n: file: ruleswidgetbase.ui:656
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:826
+#. i18n: file: ruleswidgetbase.ui:728
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:894
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:938
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
-#. i18n: file: ruleswidgetbase.ui:1050
+#. i18n: file: ruleswidgetbase.ui:800
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1154
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
-#. i18n: file: ruleswidgetbase.ui:1283
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
-#. i18n: file: ruleswidgetbase.ui:1305
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupfg)
-#. i18n: file: ruleswidgetbase.ui:1327
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
-#. i18n: file: ruleswidgetbase.ui:1349
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
-#. i18n: file: ruleswidgetbase.ui:1371
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
-#. i18n: file: ruleswidgetbase.ui:1403
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1440
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1477
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1514
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1551
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1594
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityinactive)
-#. i18n: file: ruleswidgetbase.ui:1653
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1701
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
-#. i18n: file: ruleswidgetbase.ui:1764
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:1815
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_type)
-#. i18n: file: ruleswidgetbase.ui:1925
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fsplevel)
-#. i18n: file: ruleswidgetbase.ui:1947
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_moveresizemode)
-#. i18n: file: ruleswidgetbase.ui:2018
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
-#. i18n: file: ruleswidgetbase.ui:2057
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
-#. i18n: file: ruleswidgetbase.ui:2086
+#. i18n: file: ruleswidgetbase.ui:851
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
+#. i18n: file: ruleswidgetbase.ui:943
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_ignoreposition)
-#. i18n: file: ruleswidgetbase.ui:2144
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
-#. i18n: file: ruleswidgetbase.ui:2196
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
-#. i18n: file: ruleswidgetbase.ui:556
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:627
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:674
+#. i18n: file: ruleswidgetbase.ui:986
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
+#. i18n: file: ruleswidgetbase.ui:1054
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:738
+#. i18n: file: ruleswidgetbase.ui:1091
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:782
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:826
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:894
+#. i18n: file: ruleswidgetbase.ui:1128
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:938
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
-#. i18n: file: ruleswidgetbase.ui:1050
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1154
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
-#. i18n: file: ruleswidgetbase.ui:1283
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
-#. i18n: file: ruleswidgetbase.ui:1305
+#. i18n: file: ruleswidgetbase.ui:1168
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
+#. i18n: file: ruleswidgetbase.ui:1243
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
+#. i18n: file: ruleswidgetbase.ui:1289
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
+#. i18n: file: ruleswidgetbase.ui:1340
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
+#. i18n: file: ruleswidgetbase.ui:1395
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupfg)
-#. i18n: file: ruleswidgetbase.ui:1327
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
-#. i18n: file: ruleswidgetbase.ui:1349
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
-#. i18n: file: ruleswidgetbase.ui:1371
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
-#. i18n: file: ruleswidgetbase.ui:1403
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1440
+#. i18n: file: ruleswidgetbase.ui:1431
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
+#. i18n: file: ruleswidgetbase.ui:1500
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
+#. i18n: file: ruleswidgetbase.ui:1579
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1477
+#. i18n: file: ruleswidgetbase.ui:1626
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
+#. i18n: file: ruleswidgetbase.ui:1680
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
+#. i18n: file: ruleswidgetbase.ui:1741
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
+#. i18n: file: ruleswidgetbase.ui:1837
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
+#. i18n: file: ruleswidgetbase.ui:1883
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1514
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1551
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1594
+#. i18n: file: ruleswidgetbase.ui:1924
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
+#. i18n: file: ruleswidgetbase.ui:1969
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityinactive)
-#. i18n: file: ruleswidgetbase.ui:1653
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1701
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
-#. i18n: file: ruleswidgetbase.ui:1764
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:1815
+#. i18n: file: ruleswidgetbase.ui:2048
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
+#. i18n: file: ruleswidgetbase.ui:2097
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
+#. i18n: file: ruleswidgetbase.ui:2147
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_type)
-#. i18n: file: ruleswidgetbase.ui:1925
+#. i18n: file: ruleswidgetbase.ui:2305
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
+#. i18n: file: ruleswidgetbase.ui:2327
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_blockcompositing)
+#. i18n: file: ruleswidgetbase.ui:2349
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fsplevel)
-#. i18n: file: ruleswidgetbase.ui:1947
+#. i18n: file: ruleswidgetbase.ui:2424
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_moveresizemode)
-#. i18n: file: ruleswidgetbase.ui:2018
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
-#. i18n: file: ruleswidgetbase.ui:2057
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
-#. i18n: file: ruleswidgetbase.ui:2086
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_ignoreposition)
-#. i18n: file: ruleswidgetbase.ui:2144
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
-#. i18n: file: ruleswidgetbase.ui:2196
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
-#: rc.cpp:221 rc.cpp:251 rc.cpp:269 rc.cpp:290 rc.cpp:311 rc.cpp:332
-#: rc.cpp:356 rc.cpp:371 rc.cpp:419 rc.cpp:465 rc.cpp:477 rc.cpp:486
-#: rc.cpp:495 rc.cpp:504 rc.cpp:513 rc.cpp:528 rc.cpp:546 rc.cpp:564
-#: rc.cpp:582 rc.cpp:600 rc.cpp:612 rc.cpp:637 rc.cpp:655 rc.cpp:682
-#: rc.cpp:700 rc.cpp:751 rc.cpp:760 rc.cpp:790 rc.cpp:805 rc.cpp:817
-#: rc.cpp:829 rc.cpp:841 rc.cpp:1067 rc.cpp:1097 rc.cpp:1115 rc.cpp:1136
-#: rc.cpp:1157 rc.cpp:1178 rc.cpp:1202 rc.cpp:1217 rc.cpp:1265 rc.cpp:1311
-#: rc.cpp:1323 rc.cpp:1332 rc.cpp:1341 rc.cpp:1350 rc.cpp:1359 rc.cpp:1374
-#: rc.cpp:1392 rc.cpp:1410 rc.cpp:1428 rc.cpp:1446 rc.cpp:1458 rc.cpp:1483
-#: rc.cpp:1501 rc.cpp:1528 rc.cpp:1546 rc.cpp:1597 rc.cpp:1606 rc.cpp:1636
-#: rc.cpp:1651 rc.cpp:1663 rc.cpp:1675 rc.cpp:1687
+#: rc.cpp:205 rc.cpp:232 rc.cpp:262 rc.cpp:286 rc.cpp:310 rc.cpp:325
+#: rc.cpp:373 rc.cpp:385 rc.cpp:406 rc.cpp:424 rc.cpp:442 rc.cpp:460
+#: rc.cpp:482 rc.cpp:503 rc.cpp:524 rc.cpp:542 rc.cpp:554 rc.cpp:566
+#: rc.cpp:593 rc.cpp:617 rc.cpp:641 rc.cpp:662 rc.cpp:677 rc.cpp:698
+#: rc.cpp:713 rc.cpp:729 rc.cpp:750 rc.cpp:772 rc.cpp:787 rc.cpp:826
+#: rc.cpp:835 rc.cpp:844 rc.cpp:878
 msgid "Force"
 msgstr "Gorfodi"
 
-#. i18n: file: ruleswidgetbase.ui:561
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:632
+#. i18n: file: ruleswidgetbase.ui:526
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:679
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:743
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:787
+#. i18n: file: ruleswidgetbase.ui:583
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
+#. i18n: file: ruleswidgetbase.ui:661
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:831
+#. i18n: file: ruleswidgetbase.ui:733
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:899
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:1055
+#. i18n: file: ruleswidgetbase.ui:805
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1408
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1445
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1482
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1519
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1556
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1658
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1769
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:561
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:632
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:679
+#. i18n: file: ruleswidgetbase.ui:1059
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:743
+#. i18n: file: ruleswidgetbase.ui:1096
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:787
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:831
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:899
+#. i18n: file: ruleswidgetbase.ui:1133
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:1055
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1408
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1445
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1482
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1519
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1556
+#. i18n: file: ruleswidgetbase.ui:1294
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1658
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1769
+#. i18n: file: ruleswidgetbase.ui:1345
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
+#. i18n: file: ruleswidgetbase.ui:1584
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
+#. i18n: file: ruleswidgetbase.ui:1631
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
+#. i18n: file: ruleswidgetbase.ui:1685
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#: rc.cpp:224 rc.cpp:254 rc.cpp:272 rc.cpp:293 rc.cpp:314 rc.cpp:335
-#: rc.cpp:359 rc.cpp:422 rc.cpp:531 rc.cpp:549 rc.cpp:567 rc.cpp:585
-#: rc.cpp:603 rc.cpp:640 rc.cpp:685 rc.cpp:1070 rc.cpp:1100 rc.cpp:1118
-#: rc.cpp:1139 rc.cpp:1160 rc.cpp:1181 rc.cpp:1205 rc.cpp:1268 rc.cpp:1377
-#: rc.cpp:1395 rc.cpp:1413 rc.cpp:1431 rc.cpp:1449 rc.cpp:1486 rc.cpp:1531
+#. i18n: file: ruleswidgetbase.ui:1746
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
+#. i18n: file: ruleswidgetbase.ui:1888
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
+#: rc.cpp:208 rc.cpp:235 rc.cpp:265 rc.cpp:289 rc.cpp:313 rc.cpp:409
+#: rc.cpp:427 rc.cpp:445 rc.cpp:506 rc.cpp:527 rc.cpp:596 rc.cpp:620
+#: rc.cpp:644 rc.cpp:665 rc.cpp:701
 msgid "Apply Now"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:566
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:637
+#. i18n: file: ruleswidgetbase.ui:531
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:684
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:748
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:792
+#. i18n: file: ruleswidgetbase.ui:588
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
+#. i18n: file: ruleswidgetbase.ui:666
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:836
+#. i18n: file: ruleswidgetbase.ui:738
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:904
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:943
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
-#. i18n: file: ruleswidgetbase.ui:1060
+#. i18n: file: ruleswidgetbase.ui:810
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1159
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
-#. i18n: file: ruleswidgetbase.ui:1288
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
-#. i18n: file: ruleswidgetbase.ui:1310
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupfg)
-#. i18n: file: ruleswidgetbase.ui:1332
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
-#. i18n: file: ruleswidgetbase.ui:1354
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
-#. i18n: file: ruleswidgetbase.ui:1376
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
-#. i18n: file: ruleswidgetbase.ui:1413
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1450
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1487
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1524
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1561
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1599
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityinactive)
-#. i18n: file: ruleswidgetbase.ui:1663
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1706
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
-#. i18n: file: ruleswidgetbase.ui:1774
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:1820
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_type)
-#. i18n: file: ruleswidgetbase.ui:1930
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_fsplevel)
-#. i18n: file: ruleswidgetbase.ui:1952
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_moveresizemode)
-#. i18n: file: ruleswidgetbase.ui:2023
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
-#. i18n: file: ruleswidgetbase.ui:2062
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
-#. i18n: file: ruleswidgetbase.ui:2091
+#. i18n: file: ruleswidgetbase.ui:856
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
+#. i18n: file: ruleswidgetbase.ui:948
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_ignoreposition)
-#. i18n: file: ruleswidgetbase.ui:2149
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
-#. i18n: file: ruleswidgetbase.ui:2201
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
-#. i18n: file: ruleswidgetbase.ui:566
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_size)
-#. i18n: file: ruleswidgetbase.ui:637
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_position)
-#. i18n: file: ruleswidgetbase.ui:684
+#. i18n: file: ruleswidgetbase.ui:991
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
+#. i18n: file: ruleswidgetbase.ui:1064
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizehoriz)
-#. i18n: file: ruleswidgetbase.ui:748
+#. i18n: file: ruleswidgetbase.ui:1101
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fullscreen)
-#. i18n: file: ruleswidgetbase.ui:792
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maximizevert)
-#. i18n: file: ruleswidgetbase.ui:836
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_desktop)
-#. i18n: file: ruleswidgetbase.ui:904
+#. i18n: file: ruleswidgetbase.ui:1138
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_minimize)
-#. i18n: file: ruleswidgetbase.ui:943
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_placement)
-#. i18n: file: ruleswidgetbase.ui:1060
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shade)
-#. i18n: file: ruleswidgetbase.ui:1159
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
-#. i18n: file: ruleswidgetbase.ui:1288
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
-#. i18n: file: ruleswidgetbase.ui:1310
+#. i18n: file: ruleswidgetbase.ui:1173
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
+#. i18n: file: ruleswidgetbase.ui:1248
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
+#. i18n: file: ruleswidgetbase.ui:1299
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
+#. i18n: file: ruleswidgetbase.ui:1350
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
+#. i18n: file: ruleswidgetbase.ui:1400
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupfg)
-#. i18n: file: ruleswidgetbase.ui:1332
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
-#. i18n: file: ruleswidgetbase.ui:1354
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
-#. i18n: file: ruleswidgetbase.ui:1376
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
-#. i18n: file: ruleswidgetbase.ui:1413
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
-#. i18n: file: ruleswidgetbase.ui:1450
+#. i18n: file: ruleswidgetbase.ui:1436
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroupid)
+#. i18n: file: ruleswidgetbase.ui:1505
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
+#. i18n: file: ruleswidgetbase.ui:1589
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_skiptaskbar)
-#. i18n: file: ruleswidgetbase.ui:1487
+#. i18n: file: ruleswidgetbase.ui:1636
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skippager)
+#. i18n: file: ruleswidgetbase.ui:1690
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
+#. i18n: file: ruleswidgetbase.ui:1751
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
+#. i18n: file: ruleswidgetbase.ui:1842
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_autogroup)
+#. i18n: file: ruleswidgetbase.ui:1893
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_noborder)
-#. i18n: file: ruleswidgetbase.ui:1524
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_below)
-#. i18n: file: ruleswidgetbase.ui:1561
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_above)
-#. i18n: file: ruleswidgetbase.ui:1599
+#. i18n: file: ruleswidgetbase.ui:1929
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityactive)
+#. i18n: file: ruleswidgetbase.ui:1974
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_opacityinactive)
-#. i18n: file: ruleswidgetbase.ui:1663
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_shortcut)
-#. i18n: file: ruleswidgetbase.ui:1706
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_tilingoption)
-#. i18n: file: ruleswidgetbase.ui:1774
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_skipswitcher)
-#. i18n: file: ruleswidgetbase.ui:1820
+#. i18n: file: ruleswidgetbase.ui:2053
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_acceptfocus)
+#. i18n: file: ruleswidgetbase.ui:2102
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
+#. i18n: file: ruleswidgetbase.ui:2152
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_type)
-#. i18n: file: ruleswidgetbase.ui:1930
+#. i18n: file: ruleswidgetbase.ui:2310
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_closeable)
+#. i18n: file: ruleswidgetbase.ui:2332
+#. i18n: ectx: property (text), item, widget (KComboBox, rule_blockcompositing)
+#. i18n: file: ruleswidgetbase.ui:2354
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_fsplevel)
-#. i18n: file: ruleswidgetbase.ui:1952
+#. i18n: file: ruleswidgetbase.ui:2429
 #. i18n: ectx: property (text), item, widget (KComboBox, rule_moveresizemode)
-#. i18n: file: ruleswidgetbase.ui:2023
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_minsize)
-#. i18n: file: ruleswidgetbase.ui:2062
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_maxsize)
-#. i18n: file: ruleswidgetbase.ui:2091
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_ignoreposition)
-#. i18n: file: ruleswidgetbase.ui:2149
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_strictgeometry)
-#. i18n: file: ruleswidgetbase.ui:2201
-#. i18n: ectx: property (text), item, widget (KComboBox, rule_disableglobalshortcuts)
-#: rc.cpp:227 rc.cpp:257 rc.cpp:275 rc.cpp:296 rc.cpp:317 rc.cpp:338
-#: rc.cpp:362 rc.cpp:374 rc.cpp:425 rc.cpp:468 rc.cpp:480 rc.cpp:489
-#: rc.cpp:498 rc.cpp:507 rc.cpp:516 rc.cpp:534 rc.cpp:552 rc.cpp:570
-#: rc.cpp:588 rc.cpp:606 rc.cpp:615 rc.cpp:643 rc.cpp:658 rc.cpp:688
-#: rc.cpp:703 rc.cpp:754 rc.cpp:763 rc.cpp:793 rc.cpp:808 rc.cpp:820
-#: rc.cpp:832 rc.cpp:844 rc.cpp:1073 rc.cpp:1103 rc.cpp:1121 rc.cpp:1142
-#: rc.cpp:1163 rc.cpp:1184 rc.cpp:1208 rc.cpp:1220 rc.cpp:1271 rc.cpp:1314
-#: rc.cpp:1326 rc.cpp:1335 rc.cpp:1344 rc.cpp:1353 rc.cpp:1362 rc.cpp:1380
-#: rc.cpp:1398 rc.cpp:1416 rc.cpp:1434 rc.cpp:1452 rc.cpp:1461 rc.cpp:1489
-#: rc.cpp:1504 rc.cpp:1534 rc.cpp:1549 rc.cpp:1600 rc.cpp:1609 rc.cpp:1639
-#: rc.cpp:1654 rc.cpp:1666 rc.cpp:1678 rc.cpp:1690
+#: rc.cpp:211 rc.cpp:238 rc.cpp:268 rc.cpp:292 rc.cpp:316 rc.cpp:328
+#: rc.cpp:376 rc.cpp:388 rc.cpp:412 rc.cpp:430 rc.cpp:448 rc.cpp:463
+#: rc.cpp:485 rc.cpp:509 rc.cpp:530 rc.cpp:545 rc.cpp:557 rc.cpp:569
+#: rc.cpp:599 rc.cpp:623 rc.cpp:647 rc.cpp:668 rc.cpp:680 rc.cpp:704
+#: rc.cpp:716 rc.cpp:732 rc.cpp:753 rc.cpp:775 rc.cpp:790 rc.cpp:829
+#: rc.cpp:838 rc.cpp:847 rc.cpp:881
 msgid "Force Temporarily"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:598
+#. i18n: file: ruleswidgetbase.ui:542
 #. i18n: ectx: property (placeholderText), widget (KRestrictedLine, position)
-#: rc.cpp:244
+#: rc.cpp:214
 msgid "x,y"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:577
-#. i18n: ectx: property (validChars), widget (KRestrictedLine, size)
-#. i18n: file: ruleswidgetbase.ui:601
+#. i18n: file: ruleswidgetbase.ui:545
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, position)
-#. i18n: file: ruleswidgetbase.ui:1995
-#. i18n: ectx: property (validChars), widget (KRestrictedLine, maxsize)
-#. i18n: file: ruleswidgetbase.ui:2041
-#. i18n: ectx: property (validChars), widget (KRestrictedLine, minsize)
-#. i18n: file: ruleswidgetbase.ui:577
+#. i18n: file: ruleswidgetbase.ui:602
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, size)
-#. i18n: file: ruleswidgetbase.ui:601
-#. i18n: ectx: property (validChars), widget (KRestrictedLine, position)
-#. i18n: file: ruleswidgetbase.ui:1995
+#. i18n: file: ruleswidgetbase.ui:1005
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, maxsize)
-#. i18n: file: ruleswidgetbase.ui:2041
+#. i18n: file: ruleswidgetbase.ui:1152
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, minsize)
-#: rc.cpp:230 rc.cpp:239 rc.cpp:781 rc.cpp:799 rc.cpp:1076 rc.cpp:1085
-#: rc.cpp:1627 rc.cpp:1645
+#: rc.cpp:217 rc.cpp:244 rc.cpp:394 rc.cpp:454
 msgid "0123456789-+,xX:"
 msgstr "0123456789-+,xX:"
 
-#. i18n: file: ruleswidgetbase.ui:584
+#. i18n: file: ruleswidgetbase.ui:552
 #. i18n: ectx: property (text), widget (QCheckBox, enable_size)
-#: rc.cpp:233 rc.cpp:1079
+#: rc.cpp:220
 msgid "&Size"
 msgstr "&Maint"
 
-#. i18n: file: ruleswidgetbase.ui:655
+#. i18n: file: ruleswidgetbase.ui:599
 #. i18n: ectx: property (placeholderText), widget (KRestrictedLine, size)
-#. i18n: file: ruleswidgetbase.ui:1058
+#. i18n: file: ruleswidgetbase.ui:1002
 #. i18n: ectx: property (placeholderText), widget (KRestrictedLine, maxsize)
-#. i18n: file: ruleswidgetbase.ui:1205
+#. i18n: file: ruleswidgetbase.ui:1149
 #. i18n: ectx: property (placeholderText), widget (KRestrictedLine, minsize)
-#: rc.cpp:271 rc.cpp:421 rc.cpp:481
+#: rc.cpp:241 rc.cpp:391 rc.cpp:451
 msgid "width,height"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:702
+#. i18n: file: ruleswidgetbase.ui:616
 #. i18n: ectx: property (text), widget (QCheckBox, enable_maximizehoriz)
-#: rc.cpp:278 rc.cpp:1124
+#: rc.cpp:247
 msgid "Maximized &horizontally"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:800
+#. i18n: file: ruleswidgetbase.ui:630
 #. i18n: ectx: property (text), widget (QCheckBox, enable_maximizevert)
-#: rc.cpp:320 rc.cpp:1166
+#: rc.cpp:250
 msgid "Maximized &vertically"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:756
+#. i18n: file: ruleswidgetbase.ui:688
 #. i18n: ectx: property (text), widget (QCheckBox, enable_fullscreen)
-#: rc.cpp:299 rc.cpp:1145
+#: rc.cpp:271
 msgid "&Fullscreen"
 msgstr "S&grîn Llawn"
 
-#. i18n: file: ruleswidgetbase.ui:851
+#. i18n: file: ruleswidgetbase.ui:702
 #. i18n: ectx: property (text), widget (QCheckBox, enable_desktop)
-#: rc.cpp:341 rc.cpp:1187
+#: rc.cpp:274
 msgid "&Desktop"
 msgstr "&Penbwrdd"
 
-#. i18n: file: ruleswidgetbase.ui:922
+#. i18n: file: ruleswidgetbase.ui:760
 #. i18n: ectx: property (text), widget (QCheckBox, enable_minimize)
-#: rc.cpp:365 rc.cpp:1211
+#: rc.cpp:295
 msgid "M&inimized"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:858
+#. i18n: file: ruleswidgetbase.ui:774
 #. i18n: ectx: property (text), widget (QCheckBox, enable_shade)
-#: rc.cpp:344 rc.cpp:1190
+#: rc.cpp:298
 msgid "Sh&aded"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:891
+#. i18n: file: ruleswidgetbase.ui:835
 #. i18n: ectx: property (text), widget (QCheckBox, enable_placement)
-#: rc.cpp:349
+#: rc.cpp:319
 msgid "Initial p&lacement"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:955
+#. i18n: file: ruleswidgetbase.ui:868
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:377 rc.cpp:1223
+#: rc.cpp:331
 msgid "Default"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:960
+#. i18n: file: ruleswidgetbase.ui:873
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:380 rc.cpp:1226
+#: rc.cpp:334
 msgid "No Placement"
 msgstr "Dim Lleoli"
 
-#. i18n: file: ruleswidgetbase.ui:965
+#. i18n: file: ruleswidgetbase.ui:878
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:383 rc.cpp:1229
+#: rc.cpp:337
 msgid "Smart"
 msgstr "Deallus"
 
-#. i18n: file: ruleswidgetbase.ui:970
+#. i18n: file: ruleswidgetbase.ui:883
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:386 rc.cpp:1232
+#: rc.cpp:340
 msgid "Maximizing"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:975
+#. i18n: file: ruleswidgetbase.ui:888
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:389 rc.cpp:1235
+#: rc.cpp:343
 msgid "Cascade"
 msgstr "Rhaeadr"
 
-#. i18n: file: ruleswidgetbase.ui:980
+#. i18n: file: ruleswidgetbase.ui:893
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:392 rc.cpp:1238
+#: rc.cpp:346
 msgid "Centered"
 msgstr "Canolig"
 
-#. i18n: file: ruleswidgetbase.ui:985
+#. i18n: file: ruleswidgetbase.ui:898
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:395 rc.cpp:1241
+#: rc.cpp:349
 msgid "Random"
 msgstr "Hap"
 
-#. i18n: file: ruleswidgetbase.ui:990
+#. i18n: file: ruleswidgetbase.ui:903
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:398 rc.cpp:1244
+#: rc.cpp:352
 msgid "Top-Left Corner"
 msgstr "Cornel Pen-chwith"
 
-#. i18n: file: ruleswidgetbase.ui:995
+#. i18n: file: ruleswidgetbase.ui:908
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:401 rc.cpp:1247
+#: rc.cpp:355
 msgid "Under Mouse"
 msgstr "Dan Lygoden"
 
-#. i18n: file: ruleswidgetbase.ui:1000
+#. i18n: file: ruleswidgetbase.ui:913
 #. i18n: ectx: property (text), item, widget (KComboBox, placement)
-#: rc.cpp:404 rc.cpp:1250
+#: rc.cpp:358
 msgid "On Main Window"
 msgstr "Ar Brif Ffenestr"
 
-#. i18n: file: ruleswidgetbase.ui:980
+#. i18n: file: ruleswidgetbase.ui:924
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_ignoreposition)
-#: rc.cpp:391
+#: rc.cpp:361
 msgid ""
 "Windows can ask to appear in a certain position.\n"
 "By default this overrides the placement strategy\n"
@@ -1384,27 +925,27 @@
 "to unconditionally popup in the middle of your screen."
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2070
+#. i18n: file: ruleswidgetbase.ui:927
 #. i18n: ectx: property (text), widget (QCheckBox, enable_ignoreposition)
-#: rc.cpp:811 rc.cpp:1657
+#: rc.cpp:367
 msgid "Ignore requested &geometry"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2031
+#. i18n: file: ruleswidgetbase.ui:970
 #. i18n: ectx: property (text), widget (QCheckBox, enable_maxsize)
-#: rc.cpp:796 rc.cpp:1642
+#: rc.cpp:379
 msgid "M&aximum size"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2002
+#. i18n: file: ruleswidgetbase.ui:1181
 #. i18n: ectx: property (text), widget (QCheckBox, enable_minsize)
-#: rc.cpp:784 rc.cpp:1630
+#: rc.cpp:466
 msgid "M&inimum size"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1274
+#. i18n: file: ruleswidgetbase.ui:1218
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_strictgeometry)
-#: rc.cpp:499
+#: rc.cpp:469
 msgid ""
 "Eg. terminals or video players can ask to keep a certain aspect ratio\n"
 "or only grow by values larger than one\n"
@@ -1413,171 +954,165 @@
 "like your complete screen area."
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1280
+#. i18n: file: ruleswidgetbase.ui:1224
 #. i18n: ectx: property (text), widget (QCheckBox, enable_strictgeometry)
-#: rc.cpp:506
+#: rc.cpp:476
 msgid "Obey geometry restrictions"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1313
+#. i18n: file: ruleswidgetbase.ui:1257
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage4)
-#: rc.cpp:518
+#: rc.cpp:488
 msgid "&Arrangement && Access"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1075
+#. i18n: file: ruleswidgetbase.ui:1263
 #. i18n: ectx: property (text), widget (QCheckBox, enable_above)
-#: rc.cpp:431 rc.cpp:1277
+#: rc.cpp:491
 msgid "Keep &above"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1082
+#. i18n: file: ruleswidgetbase.ui:1314
 #. i18n: ectx: property (text), widget (QCheckBox, enable_below)
-#: rc.cpp:434 rc.cpp:1280
+#: rc.cpp:512
 msgid "Keep &below"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1117
+#. i18n: file: ruleswidgetbase.ui:1372
 #. i18n: ectx: property (text), widget (QCheckBox, enable_autogroup)
-#: rc.cpp:449 rc.cpp:1295
+#: rc.cpp:533
 msgid "Autogroup with &identical"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1124
+#. i18n: file: ruleswidgetbase.ui:1379
 #. i18n: ectx: property (text), widget (QCheckBox, enable_autogroupfg)
-#: rc.cpp:452 rc.cpp:1298
+#: rc.cpp:536
 msgid "Autog&roup in foreground"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1131
+#. i18n: file: ruleswidgetbase.ui:1415
 #. i18n: ectx: property (text), widget (QCheckBox, enable_autogroupid)
-#: rc.cpp:455 rc.cpp:1301
+#: rc.cpp:548
 msgid "Autogroup by I&D"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1685
+#. i18n: file: ruleswidgetbase.ui:1484
 #. i18n: ectx: property (text), widget (QCheckBox, enable_tilingoption)
-#: rc.cpp:649 rc.cpp:1495
+#: rc.cpp:560
 msgid "T&iling"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1718
+#. i18n: file: ruleswidgetbase.ui:1517
 #. i18n: ectx: property (text), item, widget (KComboBox, tilingoption)
-#: rc.cpp:661 rc.cpp:1507
+#: rc.cpp:572
 msgid "Tiled"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1723
+#. i18n: file: ruleswidgetbase.ui:1522
 #. i18n: ectx: property (text), item, widget (KComboBox, tilingoption)
-#: rc.cpp:664 rc.cpp:1510
+#: rc.cpp:575
 msgid "Floating"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1606
+#. i18n: file: ruleswidgetbase.ui:1550
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_skiptaskbar)
-#: rc.cpp:608
+#: rc.cpp:578
 msgid "Window shall (not) appear in the taskbar."
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1089
+#. i18n: file: ruleswidgetbase.ui:1553
 #. i18n: ectx: property (text), widget (QCheckBox, enable_skiptaskbar)
-#: rc.cpp:437 rc.cpp:1283
+#: rc.cpp:581
 msgid "Skip &taskbar"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1653
+#. i18n: file: ruleswidgetbase.ui:1597
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_skippager)
-#: rc.cpp:632
+#: rc.cpp:602
 msgid "Window shall (not) appear in the manager for virtual desktops"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1731
+#. i18n: file: ruleswidgetbase.ui:1600
 #. i18n: ectx: property (text), widget (QCheckBox, enable_skippager)
-#: rc.cpp:667 rc.cpp:1513
+#: rc.cpp:605
 msgid "Skip pa&ger"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1707
+#. i18n: file: ruleswidgetbase.ui:1651
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_skipswitcher)
-#: rc.cpp:656
+#: rc.cpp:626
 msgid "Window shall (not) appear in the Alt+Tab list"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1738
+#. i18n: file: ruleswidgetbase.ui:1654
 #. i18n: ectx: property (text), widget (QCheckBox, enable_skipswitcher)
-#: rc.cpp:670 rc.cpp:1516
+#: rc.cpp:629
 msgid "Skip &switcher"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1624
+#. i18n: file: ruleswidgetbase.ui:1712
 #. i18n: ectx: property (text), widget (QCheckBox, enable_shortcut)
-#: rc.cpp:625 rc.cpp:1471
+#: rc.cpp:650
 msgid "Shortcut"
 msgstr "Byrlwybr"
 
-#. i18n: file: ruleswidgetbase.ui:1671
+#. i18n: file: ruleswidgetbase.ui:1769
 #. i18n: ectx: property (text), widget (QPushButton, shortcut_edit)
-#: rc.cpp:646 rc.cpp:1492
+#: rc.cpp:671
 msgid "Edit..."
 msgstr "Golygu..."
 
-#. i18n: file: ruleswidgetbase.ui:1907
+#. i18n: file: ruleswidgetbase.ui:1851
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:713
+#: rc.cpp:683
 msgid "Appearance && &Fixes"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1913
+#. i18n: file: ruleswidgetbase.ui:1857
 #. i18n: ectx: property (text), widget (QCheckBox, enable_noborder)
-#: rc.cpp:716
+#: rc.cpp:686
 msgid "&No titlebar and frame"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1964
+#. i18n: file: ruleswidgetbase.ui:1908
 #. i18n: ectx: property (text), widget (QCheckBox, enable_opacityactive)
-#: rc.cpp:737
+#: rc.cpp:707
 msgid "A&ctive opacity"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1996
+#. i18n: file: ruleswidgetbase.ui:1940
 #. i18n: ectx: property (suffix), widget (QSpinBox, opacityactive)
-#. i18n: file: ruleswidgetbase.ui:2041
+#. i18n: file: ruleswidgetbase.ui:1985
 #. i18n: ectx: property (suffix), widget (QSpinBox, opacityinactive)
-#: rc.cpp:750 rc.cpp:766
+#: rc.cpp:720 rc.cpp:736
 #, no-c-format
 msgid "%"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2009
+#. i18n: file: ruleswidgetbase.ui:1953
 #. i18n: ectx: property (text), widget (QCheckBox, enable_opacityinactive)
-#: rc.cpp:753
+#: rc.cpp:723
 msgid "I&nactive opacity"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1909
-#. i18n: ectx: property (text), widget (QCheckBox, enable_moveresizemode)
-#: rc.cpp:745 rc.cpp:1591
-msgid "&Moving/resizing"
-msgstr ""
-
-#. i18n: file: ruleswidgetbase.ui:2099
+#. i18n: file: ruleswidgetbase.ui:2029
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_acceptfocus)
-#: rc.cpp:772
+#: rc.cpp:739
 msgid ""
 "Windows may prevent to get the focus (activate) when being clicked.\n"
 "On the other hand you might wish to prevent a window\n"
 "from getting focused on a mouse click."
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1103
+#. i18n: file: ruleswidgetbase.ui:2032
 #. i18n: ectx: property (text), widget (QCheckBox, enable_acceptfocus)
-#: rc.cpp:443 rc.cpp:1289
+#: rc.cpp:744
 msgid "Accept &focus"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2145
+#. i18n: file: ruleswidgetbase.ui:2075
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_disableglobalshortcuts)
-#: rc.cpp:789
+#: rc.cpp:756
 msgid ""
 "When used, a window will receive\n"
 "all keyboard inputs while it is active, including Alt+Tab etc.\n"
@@ -1589,76 +1124,64 @@
 "while it's active!"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2148
+#. i18n: file: ruleswidgetbase.ui:2078
 #. i18n: ectx: property (text), widget (QCheckBox, enable_disableglobalshortcuts)
-#: rc.cpp:799
+#: rc.cpp:766
 msgid "Ignore global shortcuts"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1110
+#. i18n: file: ruleswidgetbase.ui:2124
 #. i18n: ectx: property (text), widget (QCheckBox, enable_closeable)
-#: rc.cpp:446 rc.cpp:1292
+#: rc.cpp:778
 msgid "&Closeable"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1902
+#. i18n: file: ruleswidgetbase.ui:2131
 #. i18n: ectx: property (text), widget (QCheckBox, enable_type)
-#: rc.cpp:742 rc.cpp:1588
+#: rc.cpp:781
 msgid "Window &type"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:2289
+#. i18n: file: ruleswidgetbase.ui:2219
 #. i18n: ectx: property (text), widget (QCheckBox, enable_blockcompositing)
-#: rc.cpp:853
+#: rc.cpp:820
 msgid "Block compositing"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1889
-#. i18n: ectx: property (text), item, widget (KComboBox, moveresizemode)
-#: rc.cpp:736 rc.cpp:1582
-msgid "Opaque"
-msgstr "Afloyw"
-
-#. i18n: file: ruleswidgetbase.ui:1894
-#. i18n: ectx: property (text), item, widget (KComboBox, moveresizemode)
-#: rc.cpp:739 rc.cpp:1585
-msgid "Transparent"
-msgstr "Tryloyw"
-
-#. i18n: file: ruleswidgetbase.ui:1964
+#. i18n: file: ruleswidgetbase.ui:2366
 #. i18n: ectx: property (text), item, widget (KComboBox, fsplevel)
-#: rc.cpp:766 rc.cpp:1612
+#: rc.cpp:850
 msgctxt "no focus stealing prevention"
 msgid "None"
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1969
+#. i18n: file: ruleswidgetbase.ui:2371
 #. i18n: ectx: property (text), item, widget (KComboBox, fsplevel)
-#: rc.cpp:769 rc.cpp:1615
+#: rc.cpp:853
 msgid "Low"
 msgstr "Isel"
 
-#. i18n: file: ruleswidgetbase.ui:1974
+#. i18n: file: ruleswidgetbase.ui:2376
 #. i18n: ectx: property (text), item, widget (KComboBox, fsplevel)
-#: rc.cpp:772 rc.cpp:1618
+#: rc.cpp:856
 msgid "Normal"
 msgstr "Arferol"
 
-#. i18n: file: ruleswidgetbase.ui:1979
+#. i18n: file: ruleswidgetbase.ui:2381
 #. i18n: ectx: property (text), item, widget (KComboBox, fsplevel)
-#: rc.cpp:775 rc.cpp:1621
+#: rc.cpp:859
 msgid "High"
 msgstr "Uchel"
 
-#. i18n: file: ruleswidgetbase.ui:1984
+#. i18n: file: ruleswidgetbase.ui:2386
 #. i18n: ectx: property (text), item, widget (KComboBox, fsplevel)
-#: rc.cpp:778 rc.cpp:1624
+#: rc.cpp:862
 msgid "Extreme"
 msgstr "Eithaf"
 
-#. i18n: file: ruleswidgetbase.ui:2507
+#. i18n: file: ruleswidgetbase.ui:2398
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enable_fsplevel)
-#: rc.cpp:913
+#: rc.cpp:865
 msgid ""
 "KWin tries to prevent windows from taking the focus\n"
 "(\"activate\") while you're working in another window,\n"
@@ -1667,12 +1190,30 @@
 "\"Extreme\" will completely prevent it from taking the focus."
 msgstr ""
 
-#. i18n: file: ruleswidgetbase.ui:1799
+#. i18n: file: ruleswidgetbase.ui:2401
 #. i18n: ectx: property (text), widget (QCheckBox, enable_fsplevel)
-#: rc.cpp:694 rc.cpp:1540
+#: rc.cpp:872
 msgid "&Focus stealing prevention"
 msgstr ""
 
+#. i18n: file: ruleswidgetbase.ui:2441
+#. i18n: ectx: property (text), item, widget (KComboBox, moveresizemode)
+#: rc.cpp:884
+msgid "Opaque"
+msgstr "Afloyw"
+
+#. i18n: file: ruleswidgetbase.ui:2446
+#. i18n: ectx: property (text), item, widget (KComboBox, moveresizemode)
+#: rc.cpp:887
+msgid "Transparent"
+msgstr "Tryloyw"
+
+#. i18n: file: ruleswidgetbase.ui:2454
+#. i18n: ectx: property (text), widget (QCheckBox, enable_moveresizemode)
+#: rc.cpp:890
+msgid "&Moving/resizing"
+msgstr ""
+
 #: ruleslist.cpp:155
 msgid "Export Rule"
 msgstr ""
@@ -1698,7 +1239,7 @@
 "Initially:</em> The window property will be only set to the given value "
 "after the window is created. No further changes will be "
 "affected.</li><li><em>Remember:</em> The value of the window property will "
-"be remembered and every time time the window is created, the last remembered "
+"be remembered and every time the window is created, the last remembered "
 "value will be applied.</li><li><em>Force:</em> The window property will be "
 "always forced to the given value.</li><li><em>Apply Now:</em> The window "
 "property will be set to the given value immediately and will not be affected "
@@ -1720,20 +1261,20 @@
 "hidden).</li></ul>"
 msgstr ""
 
-#: ruleswidget.cpp:123
+#: ruleswidget.cpp:133
 msgid "All Desktops"
 msgstr "Pob penbwrdd"
 
-#: ruleswidget.cpp:688
+#: ruleswidget.cpp:680
 #, kde-format
 msgid "Settings for %1"
 msgstr ""
 
-#: ruleswidget.cpp:690
+#: ruleswidget.cpp:682
 msgid "Unnamed entry"
 msgstr ""
 
-#: ruleswidget.cpp:701
+#: ruleswidget.cpp:692
 msgid ""
 "You have specified the window class as unimportant.\n"
 "This means the settings will possibly apply to windows from all "
@@ -1746,11 +1287,11 @@
 "cymhwysiad.  Os hoffech greu gosodiad generig o ddifrif, argymhellir o leiaf "
 "gyfyngu'r mathau ffenestr er mwyn osgoi mathau ffenestr arbennig."
 
-#: ruleswidget.cpp:731
+#: ruleswidget.cpp:722
 msgid "Edit Window-Specific Settings"
 msgstr ""
 
-#: ruleswidget.cpp:756
+#: ruleswidget.cpp:747
 msgid ""
 "This configuration dialog allows altering settings only for the selected "
 "window or application. Find the setting you want to affect, enable the "
@@ -1758,10 +1299,10 @@
 "affected and to which value."
 msgstr ""
 
-#: ruleswidget.cpp:760
+#: ruleswidget.cpp:751
 msgid "Consult the documentation for more details."
 msgstr ""
 
-#: ruleswidget.cpp:798
+#: ruleswidget.cpp:789
 msgid "Edit Shortcut"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkwm.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkwm.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmkwm.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmkwm.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: kcmkwm\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:08+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:42+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:26+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:81
 msgid "&Focus"
@@ -101,96 +101,96 @@
 "documentation for how to customize window behavior.</p>"
 msgstr ""
 
-#: mouse.cpp:158
+#: mouse.cpp:165
 msgctxt "@item:inlistbox behavior on double click"
 msgid "Maximize"
 msgstr ""
 
-#: mouse.cpp:159
+#: mouse.cpp:166
 msgid "Maximize (vertical only)"
 msgstr "Ehangu (fertigol yn unig)"
 
-#: mouse.cpp:160
+#: mouse.cpp:167
 msgid "Maximize (horizontal only)"
 msgstr "Ehangu (llorweddol yn unig)"
 
-#: mouse.cpp:161
+#: mouse.cpp:168
 msgctxt "@item:inlistbox behavior on double click"
 msgid "Minimize"
 msgstr ""
 
-#: mouse.cpp:162 mouse.cpp:282 mouse.cpp:320
+#: mouse.cpp:169 mouse.cpp:260 mouse.cpp:327
 msgid "Shade"
 msgstr "Rholio"
 
-#: mouse.cpp:163 mouse.cpp:253 mouse.cpp:276 mouse.cpp:323 mouse.cpp:814
+#: mouse.cpp:170 mouse.cpp:257 mouse.cpp:324 mouse.cpp:830
 msgid "Lower"
 msgstr "Gostwng"
 
-#: mouse.cpp:164
+#: mouse.cpp:171
 msgctxt "@item:inlistbox behavior on double click"
 msgid "Close"
 msgstr ""
 
-#: mouse.cpp:164
+#: mouse.cpp:172
 msgctxt "@item:inlistbox behavior on double click"
 msgid "On All Desktops"
 msgstr ""
 
-#: mouse.cpp:165 mouse.cpp:188 mouse.cpp:258 mouse.cpp:281 mouse.cpp:326
-#: mouse.cpp:816 mouse.cpp:864
+#: mouse.cpp:173 mouse.cpp:196 mouse.cpp:264 mouse.cpp:331 mouse.cpp:834
+#: mouse.cpp:882
 msgid "Nothing"
 msgstr "Dim"
 
-#: mouse.cpp:169
+#: mouse.cpp:177
 msgid "Behavior on <em>double</em> click into the titlebar."
 msgstr "Ymddygiad ar glic <em>dwbl</em> i'r bar teitl."
 
-#: mouse.cpp:172
+#: mouse.cpp:180
 msgid "&Titlebar double-click:"
 msgstr "Clic-dwbl ar y &Bar Teitl:"
 
-#: mouse.cpp:181 mouse.cpp:857
+#: mouse.cpp:189 mouse.cpp:875
 msgid "Raise/Lower"
 msgstr ""
 
-#: mouse.cpp:182 mouse.cpp:858
+#: mouse.cpp:190 mouse.cpp:876
 msgid "Shade/Unshade"
 msgstr ""
 
-#: mouse.cpp:183 mouse.cpp:859
+#: mouse.cpp:191 mouse.cpp:877
 msgid "Maximize/Restore"
 msgstr ""
 
-#: mouse.cpp:184 mouse.cpp:860
+#: mouse.cpp:192 mouse.cpp:878
 msgid "Keep Above/Below"
 msgstr ""
 
-#: mouse.cpp:185 mouse.cpp:861
+#: mouse.cpp:193 mouse.cpp:879
 msgid "Move to Previous/Next Desktop"
 msgstr ""
 
-#: mouse.cpp:186 mouse.cpp:862
+#: mouse.cpp:194 mouse.cpp:880
 msgid "Change Opacity"
 msgstr ""
 
-#: mouse.cpp:187 mouse.cpp:863
+#: mouse.cpp:195 mouse.cpp:881
 msgid "Switch to Window Tab to the Left/Right"
 msgstr ""
 
-#: mouse.cpp:192
+#: mouse.cpp:200
 msgid "Handle mouse wheel events"
 msgstr ""
 
-#: mouse.cpp:195
+#: mouse.cpp:203
 msgid "Titlebar wheel event:"
 msgstr ""
 
-#: mouse.cpp:203
+#: mouse.cpp:211
 msgid "Titlebar && Frame"
 msgstr "Bar Teitl && Ffrâm"
 
-#: mouse.cpp:206
+#: mouse.cpp:214
 msgid ""
 "Here you can customize mouse click behavior when clicking on the titlebar or "
 "the frame of a window."
@@ -198,11 +198,11 @@
 "Yma gallwch addasu ymddygiad clic-llygoden tra'n clicio ar far teitl neu "
 "ffrâm ffenestr."
 
-#: mouse.cpp:211 mouse.cpp:363 mouse.cpp:661 mouse.cpp:773
+#: mouse.cpp:219 mouse.cpp:371 mouse.cpp:679 mouse.cpp:790
 msgid "Left button:"
 msgstr "Botwm chwith:"
 
-#: mouse.cpp:212 mouse.cpp:662 mouse.cpp:774
+#: mouse.cpp:220 mouse.cpp:680 mouse.cpp:791
 msgid ""
 "In this row you can customize left click behavior when clicking into the "
 "titlebar or the frame."
@@ -210,11 +210,11 @@
 "Yn y res yma gallwch addasu ymddygiad clic-chwith tra'n clicio ar far teitl "
 "neu ffrâm ffenestr."
 
-#: mouse.cpp:215 mouse.cpp:365 mouse.cpp:669 mouse.cpp:781
+#: mouse.cpp:223 mouse.cpp:373 mouse.cpp:687 mouse.cpp:798
 msgid "Right button:"
 msgstr "Botwm dde:"
 
-#: mouse.cpp:216 mouse.cpp:670 mouse.cpp:782
+#: mouse.cpp:224 mouse.cpp:688 mouse.cpp:799
 msgid ""
 "In this row you can customize right click behavior when clicking into the "
 "titlebar or the frame."
@@ -222,11 +222,11 @@
 "Yn y res yma gallwch addasu ymddygiad clic-dde tra'n clicio ar far teitl neu "
 "ffrâm ffenestr."
 
-#: mouse.cpp:230 mouse.cpp:364 mouse.cpp:665 mouse.cpp:777
+#: mouse.cpp:237 mouse.cpp:372 mouse.cpp:683 mouse.cpp:794
 msgid "Middle button:"
 msgstr "Botwm canol:"
 
-#: mouse.cpp:233 mouse.cpp:666 mouse.cpp:778
+#: mouse.cpp:240 mouse.cpp:684 mouse.cpp:795
 msgid ""
 "In this row you can customize middle click behavior when clicking into the "
 "titlebar or the frame."
@@ -234,11 +234,11 @@
 "Yn y res yma gallwch addasu ymddygiad clic-ganol tra'n clicio ar far teitl "
 "neu ffrâm ffenestr."
 
-#: mouse.cpp:242
+#: mouse.cpp:249
 msgid "Active"
 msgstr "Gweithredol"
 
-#: mouse.cpp:245
+#: mouse.cpp:252
 msgid ""
 "In this column you can customize mouse clicks into the titlebar or the frame "
 "of an active window."
@@ -246,31 +246,31 @@
 "Yn y res yma gallwch addasu ymddygiad cliciau llygoden i'r bar teitl neu "
 "ffrâm ffenestr weithredol."
 
-#: mouse.cpp:252 mouse.cpp:275 mouse.cpp:322 mouse.cpp:813
+#: mouse.cpp:256 mouse.cpp:323 mouse.cpp:829
 msgid "Raise"
 msgstr "Codi"
 
-#: mouse.cpp:255 mouse.cpp:278 mouse.cpp:811
+#: mouse.cpp:258 mouse.cpp:325 mouse.cpp:827
 msgid "Toggle Raise & Lower"
 msgstr "Newid Codi neu Ostwng"
 
-#: mouse.cpp:815
+#: mouse.cpp:259 mouse.cpp:326 mouse.cpp:831
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: mouse.cpp:256 mouse.cpp:279 mouse.cpp:324
+#: mouse.cpp:261 mouse.cpp:328
 msgid "Close"
 msgstr ""
 
-#: mouse.cpp:254 mouse.cpp:277 mouse.cpp:321
+#: mouse.cpp:262 mouse.cpp:329
 msgid "Operations Menu"
 msgstr "Dewislen Weithredoedd"
 
-#: mouse.cpp:257 mouse.cpp:280 mouse.cpp:325
+#: mouse.cpp:263 mouse.cpp:330
 msgid "Start Window Tab Drag"
 msgstr ""
 
-#: mouse.cpp:262
+#: mouse.cpp:274
 msgid ""
 "Behavior on <em>left</em> click into the titlebar or frame of an "
 "<em>active</em> window."
@@ -278,7 +278,7 @@
 "Ymddygiad ar glic <em>chwith</em> i far teitl neu ffrâm ffenestr "
 "<em>weithredol</em>."
 
-#: mouse.cpp:265
+#: mouse.cpp:277
 msgid ""
 "Behavior on <em>right</em> click into the titlebar or frame of an "
 "<em>active</em> window."
@@ -286,7 +286,7 @@
 "Ymddygiad ar glic <em>dde</em> i far teitl neu ffrâm ffenestr "
 "<em>weithredol</em>."
 
-#: mouse.cpp:290
+#: mouse.cpp:292
 msgid ""
 "Behavior on <em>middle</em> click into the titlebar or frame of an "
 "<em>active</em> window."
@@ -294,7 +294,7 @@
 "Ymddygiad ar glic <em>canol</em> i far teitl neu ffrâm ffenestr "
 "<em>weithredol</em>."
 
-#: mouse.cpp:301
+#: mouse.cpp:303
 msgid ""
 "Behavior on <em>left</em> click into the titlebar or frame of an "
 "<em>inactive</em> window."
@@ -302,7 +302,7 @@
 "Ymddygiad ar glic <em>chwith</em> i far teitl neu ffrâm ffenestr "
 "<em>anweithredol</em>."
 
-#: mouse.cpp:304
+#: mouse.cpp:306
 msgid ""
 "Behavior on <em>right</em> click into the titlebar or frame of an "
 "<em>inactive</em> window."
@@ -310,11 +310,11 @@
 "Ymddygiad ar glic <em>dde</em> i far teitl neu ffrâm ffenestr "
 "<em>anweithredol</em>."
 
-#: mouse.cpp:310
+#: mouse.cpp:312
 msgid "Inactive"
 msgstr "Anweithredol"
 
-#: mouse.cpp:313
+#: mouse.cpp:315
 msgid ""
 "In this column you can customize mouse clicks into the titlebar or the frame "
 "of an inactive window."
@@ -322,19 +322,19 @@
 "Yn y golofn yma gallwch addasu ymddygiad cliciau llygoden i'r bar teitl neu "
 "ffrâm ffenestr anweithredol."
 
-#: mouse.cpp:317 mouse.cpp:700
+#: mouse.cpp:320 mouse.cpp:717
 msgid "Activate & Raise"
 msgstr "Gweithredoli a Chodi"
 
-#: mouse.cpp:318
+#: mouse.cpp:321
 msgid "Activate & Lower"
 msgstr "Gweithredoli a Gostwng"
 
-#: mouse.cpp:319 mouse.cpp:699
+#: mouse.cpp:322 mouse.cpp:716
 msgid "Activate"
 msgstr "Gweithredoli"
 
-#: mouse.cpp:342
+#: mouse.cpp:349
 msgid ""
 "Behavior on <em>middle</em> click into the titlebar or frame of an "
 "<em>inactive</em> window."
@@ -342,31 +342,31 @@
 "Ymddygiad ar glic <em>canol</em> i far teitl neu ffrâm ffenestr "
 "<em>anweithredol</em>."
 
-#: mouse.cpp:354
+#: mouse.cpp:362
 msgid "Maximize Button"
 msgstr ""
 
-#: mouse.cpp:358
+#: mouse.cpp:366
 msgid "Here you can customize behavior when clicking on the maximize button."
 msgstr ""
 
-#: mouse.cpp:368
+#: mouse.cpp:377
 msgid "Behavior on <em>left</em> click onto the maximize button."
 msgstr ""
 
-#: mouse.cpp:369
+#: mouse.cpp:378
 msgid "Behavior on <em>middle</em> click onto the maximize button."
 msgstr ""
 
-#: mouse.cpp:370
+#: mouse.cpp:379
 msgid "Behavior on <em>right</em> click onto the maximize button."
 msgstr ""
 
-#: mouse.cpp:653
+#: mouse.cpp:671
 msgid "Inactive Inner Window"
 msgstr "Ffenestr Mewnol Anweithredol"
 
-#: mouse.cpp:656
+#: mouse.cpp:674
 msgid ""
 "Here you can customize mouse click behavior when clicking on an inactive "
 "inner window ('inner' means: not titlebar, not frame)."
@@ -374,11 +374,11 @@
 "Yma gallwch addasu ymddygiad clic llygoden tra'n clicio ar ffenestr mewnol "
 "anweithredol (golyga 'mewnol': nid y bar teitl na'r ffrâm)."
 
-#: mouse.cpp:673
+#: mouse.cpp:691
 msgid "Wheel"
 msgstr ""
 
-#: mouse.cpp:681
+#: mouse.cpp:698
 msgid ""
 "In this row you can customize left click behavior when clicking into an "
 "inactive inner window ('inner' means: not titlebar, not frame)."
@@ -386,7 +386,7 @@
 "Yn y res yma gallwch addasu ymddygiad clic-chwith tra'n clicio ar ffenestr "
 "mewnol anweithredol (golyga 'mewnol': nid y bar teitl na'r ffrâm)."
 
-#: mouse.cpp:684
+#: mouse.cpp:701
 msgid ""
 "In this row you can customize middle click behavior when clicking into an "
 "inactive inner window ('inner' means: not titlebar, not frame)."
@@ -394,7 +394,7 @@
 "Yn y res yma gallwch addasu ymddygiad clic-ganol tra'n clicio ar ffenestr "
 "mewnol anweithredol (golyga 'mewnol': nid y bar teitl na'r ffrâm)."
 
-#: mouse.cpp:687
+#: mouse.cpp:704
 msgid ""
 "In this row you can customize right click behavior when clicking into an "
 "inactive inner window ('inner' means: not titlebar, not frame)."
@@ -402,37 +402,37 @@
 "Yn y res yma gallwch addasu ymddygiad clic-dde tra'n clicio ar ffenestr "
 "mewnol anweithredol (golyga 'mewnol': nid y bar teitl na'r ffrâm)."
 
-#: mouse.cpp:690
+#: mouse.cpp:707
 msgid ""
 "In this row you can customize behavior when scrolling into an inactive inner "
 "window ('inner' means: not titlebar, not frame)."
 msgstr ""
 
-#: mouse.cpp:697
+#: mouse.cpp:714
 msgid "Activate, Raise & Pass Click"
 msgstr "Gweithredoli, Codi a Phasio'r Clic"
 
-#: mouse.cpp:698
+#: mouse.cpp:715
 msgid "Activate & Pass Click"
 msgstr "Gweithredoli a Phasio'r Clic"
 
-#: mouse.cpp:739
+#: mouse.cpp:756
 msgid "Scroll"
 msgstr ""
 
-#: mouse.cpp:740
+#: mouse.cpp:757
 msgid "Activate & Scroll"
 msgstr ""
 
-#: mouse.cpp:741
+#: mouse.cpp:758
 msgid "Activate, Raise & Scroll"
 msgstr ""
 
-#: mouse.cpp:760
+#: mouse.cpp:777
 msgid "Inner Window, Titlebar && Frame"
 msgstr "Ffenestr Mewnol, Bar Teitl, a Ffrâm"
 
-#: mouse.cpp:763
+#: mouse.cpp:780
 msgid ""
 "Here you can customize KDE's behavior when clicking somewhere into a window "
 "while pressing a modifier key."
@@ -440,15 +440,15 @@
 "Yma gallwch addasu ymddygiad KDE tra'n clicio rywle mewn ffenestr tra'n "
 "gwasgu bysell addasu."
 
-#: mouse.cpp:793
+#: mouse.cpp:809
 msgid "Meta"
 msgstr "Meta"
 
-#: mouse.cpp:794
+#: mouse.cpp:810
 msgid "Alt"
 msgstr "Alt"
 
-#: mouse.cpp:797
+#: mouse.cpp:813
 msgid ""
 "Here you select whether holding the Meta key or Alt key will allow you to "
 "perform the following actions."
@@ -456,29 +456,37 @@
 "Yma dewiswch a wna dal y bysell Meta neu'r fysell Alt eich caniatáu i "
 "weithredu'r gweithredoedd canlynol."
 
-#: mouse.cpp:800
+#: mouse.cpp:816
 msgid "Modifier key:"
 msgstr "Bysell addasu:"
 
-#: mouse.cpp:809
+#: mouse.cpp:825
 msgid "Move"
 msgstr ""
 
-#: mouse.cpp:810
+#: mouse.cpp:826
 msgid "Activate, Raise and Move"
 msgstr "Gweithredoli, Codi a Symud"
 
-#: mouse.cpp:812
+#: mouse.cpp:828
 msgid "Resize"
 msgstr "Newid Maint"
 
-#: mouse.cpp:867
+#: mouse.cpp:832
+msgid "Decrease Opacity"
+msgstr ""
+
+#: mouse.cpp:833
+msgid "Increase Opacity"
+msgstr ""
+
+#: mouse.cpp:885
 msgid ""
 "Here you can customize KDE's behavior when scrolling with the mouse wheel in "
 "a window while pressing the modifier key."
 msgstr ""
 
-#: mouse.cpp:870
+#: mouse.cpp:888
 msgid "Mouse wheel:"
 msgstr ""
 
@@ -494,32 +502,71 @@
 "owaing@oceanfree.net\n"
 "kyfieithu@dotmon.com,,"
 
+#: windows.cpp:121
+msgid "Click to Focus"
+msgstr "Clicio i Ganolbwyntio"
+
+#: windows.cpp:122
+msgid "Focus Follows Mouse"
+msgstr "Canolbwynt yn Dilyn Llygoden"
+
 #: windows.cpp:123
+msgid "Focus Under Mouse"
+msgstr "Canolbwynt o Dan Lygoden"
+
+#: windows.cpp:124
+msgid "Focus Strictly Under Mouse"
+msgstr "Canolbwynt yn Union o Dan Lygoden"
+
+#: windows.cpp:126
+msgid "&Policy:"
+msgstr "&Polisi:"
+
+#: windows.cpp:134
+msgid ""
+"The focus policy is used to determine the active window, i.e. the window you "
+"can work in. <ul> <li><em>Click to focus:</em> A window becomes active when "
+"you click into it. This is the behavior you might know from other operating "
+"systems.</li> <li><em>Focus follows mouse:</em> Moving the mouse pointer "
+"actively on to a normal window activates it. New windows will receive the "
+"focus, without you having to point the mouse at them explicitly. Very "
+"practical if you are using the mouse a lot.</li> <li><em>Focus under "
+"mouse:</em> The window that happens to be under the mouse pointer is active. "
+"If the mouse points nowhere, the last window that was under the mouse has "
+"focus. New windows will not automatically receive the focus.</li> "
+"<li><em>Focus strictly under mouse:</em> Only the window under the mouse "
+"pointer is active. If the mouse points nowhere, nothing has focus.</li> "
+"</ul>Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent "
+"certain features such as the Alt+Tab walk through windows dialog in the KDE "
+"mode from working properly."
+msgstr ""
+
+#: windows.cpp:158
 msgctxt "Focus Stealing Prevention Level"
 msgid "None"
 msgstr "Dim"
 
-#: windows.cpp:124
+#: windows.cpp:159
 msgctxt "Focus Stealing Prevention Level"
 msgid "Low"
 msgstr "Isel"
 
-#: windows.cpp:125
+#: windows.cpp:160
 msgctxt "Focus Stealing Prevention Level"
 msgid "Medium"
 msgstr ""
 
-#: windows.cpp:126
+#: windows.cpp:161
 msgctxt "Focus Stealing Prevention Level"
 msgid "High"
 msgstr "Uchel"
 
-#: windows.cpp:127
+#: windows.cpp:162
 msgctxt "Focus Stealing Prevention Level"
 msgid "Extreme"
 msgstr "Eithaf"
 
-#: windows.cpp:128
+#: windows.cpp:163
 msgid ""
 "<p>This option specifies how much KWin will try to prevent unwanted focus "
 "stealing caused by unexpected activation of new windows. (Note: This feature "
@@ -540,66 +587,27 @@
 "Notifications control module.</p>"
 msgstr ""
 
-#: windows.cpp:150
+#: windows.cpp:185
 msgid "Focus stealing prevention level:"
 msgstr "Lefel o ataliad dwyn canolbwynt:"
 
-#: windows.cpp:158
-msgid "Click to Focus"
-msgstr "Clicio i Ganolbwyntio"
-
-#: windows.cpp:159
-msgid "Focus Follows Mouse"
-msgstr "Canolbwynt yn Dilyn Llygoden"
-
-#: windows.cpp:160
-msgid "Focus Under Mouse"
-msgstr "Canolbwynt o Dan Lygoden"
-
-#: windows.cpp:161
-msgid "Focus Strictly Under Mouse"
-msgstr "Canolbwynt yn Union o Dan Lygoden"
-
-#: windows.cpp:163
-msgid "&Policy:"
-msgstr "&Polisi:"
-
-#: windows.cpp:171
-msgid ""
-"The focus policy is used to determine the active window, i.e. the window you "
-"can work in. <ul> <li><em>Click to focus:</em> A window becomes active when "
-"you click into it. This is the behavior you might know from other operating "
-"systems.</li> <li><em>Focus follows mouse:</em> Moving the mouse pointer "
-"actively on to a normal window activates it. New windows will receive the "
-"focus, without you having to point the mouse at them explicitly. Very "
-"practical if you are using the mouse a lot.</li> <li><em>Focus under "
-"mouse:</em> The window that happens to be under the mouse pointer is active. "
-"If the mouse points nowhere, the last window that was under the mouse has "
-"focus. New windows will not automatically receive the focus.</li> "
-"<li><em>Focus strictly under mouse:</em> Only the window under the mouse "
-"pointer is active. If the mouse points nowhere, nothing has focus.</li> "
-"</ul>Note that 'Focus under mouse' and 'Focus strictly under mouse' prevent "
-"certain features such as the Alt+Tab walk through windows dialog in the KDE "
-"mode from working properly."
-msgstr ""
-
-#: windows.cpp:200 windows.cpp:216 windows.cpp:540
+#: windows.cpp:201 windows.cpp:215 windows.cpp:540
 msgid " ms"
 msgstr ""
 
-#: windows.cpp:202
+#: windows.cpp:203
 msgid "&Raise, with the following delay:"
 msgstr ""
 
-#: windows.cpp:218
+#: windows.cpp:217
 msgid "Delay focus by:"
 msgstr ""
 
-#: windows.cpp:225
+#: windows.cpp:224
 msgid "C&lick raises active window"
 msgstr ""
 
-#: windows.cpp:229
+#: windows.cpp:228
 msgid ""
 "When this option is enabled, a window in the background will automatically "
 "come to the front when the mouse pointer has been over it for some time."
@@ -607,7 +615,7 @@
 "Pan alluogir y dewisiad yma, daw ffenestr yn y cefndir i'r blaen yn ymsgogol "
 "wedi i'r pwyntydd llygoden fod drosto am ychydig amser."
 
-#: windows.cpp:231
+#: windows.cpp:230
 msgid ""
 "This is the delay after which the window that the mouse pointer is over will "
 "automatically come to the front."
@@ -615,7 +623,7 @@
 "Dyma'r saib y daw'r ffenestr y mae'r pwyntydd llygoden drosto yn dod i'r "
 "blaen yn ysgogol wedi iddo orffen."
 
-#: windows.cpp:235
+#: windows.cpp:234
 msgid ""
 "When this option is enabled, the active window will be brought to the front "
 "when you click somewhere into the window contents. To change it for inactive "
@@ -625,15 +633,7 @@
 "gliciwch rywle yng nghynnwys y ffenestr.  I amnewid hyn efo ffenestri "
 "anweithredol, rhaid i chi newid y gosodiadau yn y tab Gweithredoedd."
 
-#: windows.cpp:240
-msgid ""
-"When this option is enabled, there will be a delay after which the window "
-"the mouse pointer is over will become active (receive focus)."
-msgstr ""
-"Os alluogir y dewisiad yma, bydd saib, ac ar ei ôl bydd ffenestr y mae'r "
-"pwyntydd llygoden drosto yn dod yn weithredol (derbyn canolbwynt)."
-
-#: windows.cpp:242
+#: windows.cpp:239
 msgid ""
 "This is the delay after which the window the mouse pointer is over will "
 "automatically receive focus."
@@ -641,21 +641,21 @@
 "Dyma'r saib y derbynnia'r ffenestr y mae'r pwyntydd llygoden drosto "
 "ganolbwynt ar ei ôl."
 
-#: windows.cpp:245
+#: windows.cpp:242
 msgid "S&eparate screen focus"
 msgstr ""
 
-#: windows.cpp:247
+#: windows.cpp:244
 msgid ""
 "When this option is enabled, focus operations are limited only to the active "
 "Xinerama screen"
 msgstr ""
 
-#: windows.cpp:250
+#: windows.cpp:247
 msgid "Active screen follows &mouse"
 msgstr ""
 
-#: windows.cpp:252
+#: windows.cpp:249
 msgid ""
 "When this option is enabled, the active Xinerama screen (where new windows "
 "appear, for example) is the screen containing the mouse pointer. When "
@@ -838,43 +838,15 @@
 "keep floating windows on top, even when a tiled window is activated.</ul>"
 msgstr ""
 
-#: windows.cpp:912
+#: windows.cpp:927
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: windows.cpp:919
-msgid "Di&splay content in moving windows"
-msgstr "Dango&s cynnwys mewn ffenestri symudol"
-
-#: windows.cpp:921
-msgid ""
-"Enable this option if you want a window's content to be fully shown while "
-"moving it, instead of just showing a window 'skeleton'. The result may not "
-"be satisfying on slow machines without graphic acceleration."
-msgstr ""
-"Galluogwch y dewisiad yma os ydych am ddangos cynnwys ffenestr tra'n ei "
-"symud, yn hytrach na dangos 'sgerbwd' ffenestr. Efallai na fydd y canlyniad "
-"yn plesio ar beiriannau araf heb gyflymiad graffeg."
-
-#: windows.cpp:925
-msgid "Display content in &resizing windows"
-msgstr "Dangos cynnwys mewn ffenestri sy'n newid &maint"
-
-#: windows.cpp:927
-msgid ""
-"Enable this option if you want a window's content to be shown while resizing "
-"it, instead of just showing a window 'skeleton'. The result may not be "
-"satisfying on slow machines."
-msgstr ""
-"Galluogwch y dewisiad yma os ydych am ddangos cynnwys ffenestr tra'n newid "
-"ei maint, yn hytrach na dangos 'sgerbwd' ffenestr. Efallai na fydd y "
-"canlyniad yn plesio ar beiriannau araf."
-
-#: windows.cpp:931
+#: windows.cpp:934
 msgid "Display window &geometry when moving or resizing"
 msgstr "Dangos &geometreg ffenestr tra'n symud neu newid maint"
 
-#: windows.cpp:933
+#: windows.cpp:936
 msgid ""
 "Enable this option if you want a window's geometry to be displayed while it "
 "is being moved or resized. The window position relative to the top-left "
@@ -884,11 +856,11 @@
 "symud neu newid ei maint. Dengys lleoliad y ffenestr o gornel pen-chwith y "
 "sgrîn, ynghŷd â'i maint."
 
-#: windows.cpp:938
+#: windows.cpp:941
 msgid "Display borders on &maximized windows"
 msgstr ""
 
-#: windows.cpp:940
+#: windows.cpp:943
 msgid ""
 "When enabled, this feature activates the border of maximized windows and "
 "allows you to move or resize them, just like for normal windows"
@@ -896,16 +868,16 @@
 "Pan yn alluog, galluoga'r nodwedd hon ffin ffenestri ehangedig, a caniatâ i "
 "chi eu symud a newid eu maint, yn union fel ffenestri arferol."
 
-#: windows.cpp:966
+#: windows.cpp:969
 msgid "Snap Zones"
 msgstr "Cylchfeydd Snap"
 
-#: windows.cpp:970
+#: windows.cpp:973
 msgctxt "no border snap zone"
 msgid "none"
 msgstr ""
 
-#: windows.cpp:973
+#: windows.cpp:976
 msgid ""
 "Here you can set the snap zone for screen borders, i.e. the 'strength' of "
 "the magnetic field which will make windows snap to the border when moved "
@@ -914,47 +886,47 @@
 "Yma gallwch osod y gylchfa snap i ffiniau'r sgrîn, h.y. 'cryfder' y maes "
 "magnetig a wna i'r ffenestri snapio i'r ffin pan yn symud ato."
 
-#: windows.cpp:977
+#: windows.cpp:980
 msgid "&Border snap zone:"
 msgstr "Cylchfa snap ff&in"
 
-#: windows.cpp:984
+#: windows.cpp:987
 msgctxt "no window snap zone"
 msgid "none"
 msgstr ""
 
-#: windows.cpp:987
+#: windows.cpp:990
 msgid ""
 "Here you can set the snap zone for windows, i.e. the 'strength' of the "
 "magnetic field which will make windows snap to each other when they are "
 "moved near another window."
 msgstr ""
 
-#: windows.cpp:991
+#: windows.cpp:994
 msgid "&Window snap zone:"
 msgstr "Cylchfa snap &ffenestr"
 
-#: windows.cpp:998
+#: windows.cpp:1001
 msgctxt "no center snap zone"
 msgid "none"
 msgstr ""
 
-#: windows.cpp:1001
+#: windows.cpp:1004
 msgid ""
 "Here you can set the snap zone for the screen center, i.e. the 'strength' of "
 "the magnetic field which will make windows snap to the center of the screen "
 "when moved near it."
 msgstr ""
 
-#: windows.cpp:1005
+#: windows.cpp:1008
 msgid "&Center snap zone:"
 msgstr ""
 
-#: windows.cpp:1011
+#: windows.cpp:1014
 msgid "Snap windows onl&y when overlapping"
 msgstr "Snapio ffenestri pan yn gorgyffwrdd yn &unig"
 
-#: windows.cpp:1012
+#: windows.cpp:1015
 msgid ""
 "Here you can set that windows will be only snapped if you try to overlap "
 "them, i.e. they will not be snapped if the windows comes only near another "
@@ -964,7 +936,7 @@
 "h.y. ni chânt eu snapio os y daw'r ffenestr yn agos i ffenestr arall neu i "
 "ffin."
 
-#: windows.cpp:1076 windows.cpp:1080 windows.cpp:1084
+#: windows.cpp:1059 windows.cpp:1064 windows.cpp:1069
 msgid " pixel"
 msgid_plural " pixels"
 msgstr[0] ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmlaunch.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmlaunch.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmlaunch.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmlaunch.po	2012-04-18 08:59:38.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: kcmlaunch\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:13+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmlaunch.cpp:51
 msgid ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmlocale.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmlocale.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmlocale.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmlocale.po	2012-04-18 08:59:35.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: kcmlocale\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:32+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:12+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: countryselectordialog.cpp:217
 msgid "Country Selector"
@@ -50,7 +50,7 @@
 msgid "Maintainer"
 msgstr ""
 
-#: kcmlocale.cpp:447
+#: kcmlocale.cpp:462
 #, kde-format
 msgid ""
 "You have the language with code '%1' in your list of languages to use for "
@@ -60,7 +60,7 @@
 "again."
 msgstr ""
 
-#: toplevel.cpp:181
+#: kcmlocale.cpp:651
 msgid ""
 "Changed language settings apply only to newly started applications.\n"
 "To change the language of all programs, you will have to logout first."
@@ -69,11 +69,11 @@
 "unig.\n"
 " I newid iaith pob rhaglen, rhaid i chi allgofnodi gyntaf."
 
-#: toplevel.cpp:185
+#: kcmlocale.cpp:655
 msgid "Applying Language Settings"
 msgstr "Gweithredu Gosodiadau Iaith"
 
-#: kcmlocale.cpp:647
+#: kcmlocale.cpp:666
 msgid ""
 "<h1>Country/Region & Language</h1>\n"
 "<p>Here you can set your localization settings such as language, numeric "
@@ -84,139 +84,149 @@
 "and to restore those items to the country's default value.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:719
+#: kcmlocale.cpp:740
 msgid "Reset item to its default value"
 msgstr ""
 
-#: kcmlocale.cpp:935
+#: kcmlocale.cpp:959
 msgctxt "No separator symbol"
 msgid "None"
 msgstr ""
 
-#: kcmlocale.cpp:938
+#: kcmlocale.cpp:962
 msgctxt "Space separator symbol"
 msgid "Single Space"
 msgstr ""
 
 #. i18n: file: kcmlocalewidget.ui:27
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabLocation)
-#: kcmlocale.cpp:954 rc.cpp:3 rc.cpp:152
+#: kcmlocale.cpp:1006 rc.cpp:5
 msgid "Country"
 msgstr ""
 
 #. i18n: file: kcmlocalewidget.ui:104
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabTranslations)
-#: kcmlocale.cpp:955 rc.cpp:12 rc.cpp:161
+#: kcmlocale.cpp:1007 rc.cpp:14
 msgid "Languages"
 msgstr ""
 
 #. i18n: file: kcmlocalewidget.ui:154
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabNumbers)
-#: kcmlocale.cpp:956 rc.cpp:24 rc.cpp:173
+#: kcmlocale.cpp:1008 rc.cpp:26
 msgid "Numbers"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:401
+#. i18n: file: kcmlocalewidget.ui:437
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabMoney)
-#: kcmlocale.cpp:957 rc.cpp:45 rc.cpp:194
+#: kcmlocale.cpp:1009 rc.cpp:50
 msgid "Money"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:729
+#. i18n: file: kcmlocalewidget.ui:792
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabCalendar)
-#: kcmlocale.cpp:958 rc.cpp:72 rc.cpp:221
+#: kcmlocale.cpp:1010 rc.cpp:80
 msgid "Calendar"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:1023
+#. i18n: file: kcmlocalewidget.ui:1128
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabDateTime)
-#: kcmlocale.cpp:959 rc.cpp:99 rc.cpp:248
+#: kcmlocale.cpp:1011 rc.cpp:110
 msgid "Date && Time"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:1301
+#. i18n: file: kcmlocalewidget.ui:1406
 #. i18n: ectx: attribute (title), widget (QWidget, m_tabOther)
-#: kcmlocale.cpp:960 rc.cpp:123 rc.cpp:272
+#: kcmlocale.cpp:1012 rc.cpp:134
 msgid "Other"
 msgstr "Arall"
 
-#: klocalesample.cpp:46
+#. i18n: file: kcmlocalewidget.ui:1540
+#. i18n: ectx: property (text), widget (QLabel, m_labelNumbersSample)
+#: kcmlocale.cpp:1017 rc.cpp:146
 msgid "Numbers:"
 msgstr "Rhifau:"
 
-#: kcmlocale.cpp:966
+#: kcmlocale.cpp:1018
 msgid "This is how positive numbers will be displayed."
 msgstr ""
 
-#: kcmlocale.cpp:969
+#: kcmlocale.cpp:1021
 msgid "This is how negative numbers will be displayed."
 msgstr ""
 
-#: klocalesample.cpp:51
+#. i18n: file: kcmlocalewidget.ui:1561
+#. i18n: ectx: property (text), widget (QLabel, m_labelMoneySample)
+#: kcmlocale.cpp:1025 rc.cpp:149
 msgid "Money:"
 msgstr "Arian:"
 
-#: kcmlocale.cpp:974
+#: kcmlocale.cpp:1026
 msgid "This is how positive monetary values will be displayed."
 msgstr ""
 
-#: kcmlocale.cpp:977
+#: kcmlocale.cpp:1029
 msgid "This is how negative monetary values will be displayed."
 msgstr ""
 
-#: klocalesample.cpp:56
+#. i18n: file: kcmlocalewidget.ui:1575
+#. i18n: ectx: property (text), widget (QLabel, m_labelDateSample)
+#: kcmlocale.cpp:1033 rc.cpp:152
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#: kcmlocale.cpp:982
+#: kcmlocale.cpp:1034
 msgid "This is how long dates will be displayed."
 msgstr ""
 
-#: klocalesample.cpp:61
+#. i18n: file: kcmlocalewidget.ui:1589
+#. i18n: ectx: property (text), widget (QLabel, m_labelShortDateSample)
+#: kcmlocale.cpp:1038 rc.cpp:155
 msgid "Short date:"
 msgstr "Dyddiad byr:"
 
-#: kcmlocale.cpp:987
+#: kcmlocale.cpp:1039
 msgid "This is how short dates will be displayed."
 msgstr ""
 
-#: klocalesample.cpp:66
+#. i18n: file: kcmlocalewidget.ui:1603
+#. i18n: ectx: property (text), widget (QLabel, m_labelTimeSample)
+#: kcmlocale.cpp:1043 rc.cpp:158
 msgid "Time:"
 msgstr "Amser:"
 
-#: kcmlocale.cpp:992
+#: kcmlocale.cpp:1044
 msgid "This is how time will be displayed."
 msgstr ""
 
 #. i18n: file: kcmlocalewidget.ui:33
 #. i18n: ectx: property (text), widget (QLabel, m_labelCountry)
-#: kcmlocale.cpp:1020 rc.cpp:6 rc.cpp:155
+#: kcmlocale.cpp:1072 rc.cpp:8
 msgid "Country:"
 msgstr ""
 
-#: kcmlocale.cpp:1021
+#: kcmlocale.cpp:1073
 msgid ""
 "<p>This is the country where you live.  The KDE Workspace will use the "
 "settings for this country or region.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1037
+#: kcmlocale.cpp:1089
 #, kde-format
 msgctxt "%1 is the system country name"
 msgid "System Country (%1)"
 msgstr ""
 
-#: kcmlocale.cpp:1040
+#: kcmlocale.cpp:1092
 msgid "No Country (Default Settings)"
 msgstr ""
 
 #. i18n: file: kcmlocalewidget.ui:69
 #. i18n: ectx: property (text), widget (QLabel, m_labelCountryDivision)
-#: kcmlocale.cpp:1080 rc.cpp:9 rc.cpp:158
+#: kcmlocale.cpp:1132 rc.cpp:11
 msgid "Subdivision:"
 msgstr ""
 
-#: kcmlocale.cpp:1081
+#: kcmlocale.cpp:1133
 msgid ""
 "<p>This is the country subdivision where you live, e.g. your state or "
 "province.  The KDE Workspace will use this setting for local information "
@@ -225,11 +235,11 @@
 
 #. i18n: file: kcmlocalewidget.ui:110
 #. i18n: ectx: property (availableLabel), widget (KActionSelector, m_selectTranslations)
-#: kcmlocale.cpp:1118 rc.cpp:15 rc.cpp:164
+#: kcmlocale.cpp:1170 rc.cpp:17
 msgid "Available Languages:"
 msgstr ""
 
-#: kcmlocale.cpp:1119
+#: kcmlocale.cpp:1171
 msgid ""
 "<p>This is the list of installed KDE Workspace language translations not "
 "currently being used.  To use a language translation move it to the "
@@ -240,11 +250,11 @@
 
 #. i18n: file: kcmlocalewidget.ui:113
 #. i18n: ectx: property (selectedLabel), widget (KActionSelector, m_selectTranslations)
-#: kcmlocale.cpp:1128 rc.cpp:18 rc.cpp:167
+#: kcmlocale.cpp:1180 rc.cpp:20
 msgid "Preferred Languages:"
 msgstr ""
 
-#: kcmlocale.cpp:1129
+#: kcmlocale.cpp:1181
 msgid ""
 "<p>This is the list of installed KDE Workspace language translations "
 "currently being used, listed in order of preference.  If a translation is "
@@ -253,7 +263,7 @@
 "used.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1139
+#: kcmlocale.cpp:1191
 #, kde-format
 msgctxt "%1 = default language name"
 msgid "%1 (Default)"
@@ -261,11 +271,11 @@
 
 #. i18n: file: kcmlocalewidget.ui:128
 #. i18n: ectx: property (text), widget (KPushButton, m_buttonTranslationsInstall)
-#: kcmlocale.cpp:1233 rc.cpp:21 rc.cpp:170
+#: kcmlocale.cpp:1285 rc.cpp:23
 msgid "Install more languages"
 msgstr ""
 
-#: kcmlocale.cpp:1234
+#: kcmlocale.cpp:1286
 msgid "<p>Click here to install more languages</p>"
 msgstr ""
 
@@ -273,56 +283,41 @@
 #. i18n: ectx: property (text), widget (QLabel, m_labelNumericDigitGrouping)
 #. i18n: file: kcmlocalewidget.ui:524
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryDigitGrouping)
-#. i18n: file: kcmlocalewidget.ui:163
-#. i18n: ectx: property (text), widget (QLabel, m_labelNumericDigitGrouping)
-#. i18n: file: kcmlocalewidget.ui:524
-#. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryDigitGrouping)
-#: kcmlocale.cpp:1300 kcmlocale.cpp:1754 rc.cpp:29 rc.cpp:59 rc.cpp:187
-#: rc.cpp:217
+#: kcmlocale.cpp:1301 kcmlocale.cpp:1755 rc.cpp:29 rc.cpp:59
 msgid "Digit grouping:"
 msgstr ""
 
-#: kcmlocale.cpp:1301
+#: kcmlocale.cpp:1302
 msgid ""
 "<p>Here you can define the digit grouping used to display "
 "numbers.</p><p>Note that the digit grouping used to display monetary values "
 "has to be set separately (see the 'Money' tab).</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:169
+#. i18n: file: kcmlocalewidget.ui:196
 #. i18n: ectx: property (text), widget (QLabel, m_labelThousandsSeparator)
-#. i18n: file: kcmlocalewidget.ui:494
+#. i18n: file: kcmlocalewidget.ui:557
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryThousandsSeparator)
-#. i18n: file: kcmlocalewidget.ui:169
-#. i18n: ectx: property (text), widget (QLabel, m_labelThousandsSeparator)
-#. i18n: file: kcmlocalewidget.ui:494
-#. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryThousandsSeparator)
-#: kcmlocale.cpp:1249 kcmlocale.cpp:1642 rc.cpp:27 rc.cpp:54 rc.cpp:176
-#: rc.cpp:203
+#: kcmlocale.cpp:1339 kcmlocale.cpp:1794 rc.cpp:32 rc.cpp:62
 msgid "Group separator:"
 msgstr ""
 
-#: kcmlocale.cpp:1250
+#: kcmlocale.cpp:1340
 msgid ""
 "<p>Here you can define the digit group separator used to display "
 "numbers.</p><p>Note that the digit group separator used to display monetary "
 "values has to be set separately (see the 'Money' tab).</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:205
-#. i18n: ectx: property (text), widget (QLabel, m_labelDecimalSymbol)
-#. i18n: file: kcmlocalewidget.ui:533
-#. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryDecimalSymbol)
-#. i18n: file: kcmlocalewidget.ui:205
+#. i18n: file: kcmlocalewidget.ui:235
 #. i18n: ectx: property (text), widget (QLabel, m_labelDecimalSymbol)
-#. i18n: file: kcmlocalewidget.ui:533
+#. i18n: file: kcmlocalewidget.ui:596
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryDecimalSymbol)
-#: kcmlocale.cpp:1300 kcmlocale.cpp:1696 rc.cpp:30 rc.cpp:57 rc.cpp:179
-#: rc.cpp:206
+#: kcmlocale.cpp:1396 kcmlocale.cpp:1849 rc.cpp:35 rc.cpp:65
 msgid "Decimal separator:"
 msgstr ""
 
-#: localenum.cpp:230
+#: kcmlocale.cpp:1397
 msgid ""
 "<p>Here you can define the decimal separator used to display numbers (i.e. a "
 "dot or a comma in most countries).</p><p>Note that the decimal separator "
@@ -330,13 +325,15 @@
 "tab).</p>"
 msgstr ""
 
-#. i18n: file: localemon.ui:45
+#. i18n: file: kcmlocalewidget.ui:274
+#. i18n: ectx: property (text), widget (QLabel, m_labelDecimalPlaces)
+#. i18n: file: kcmlocalewidget.ui:635
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryDecimalPlaces)
-#: localemon.cpp:51 rc.cpp:33
+#: kcmlocale.cpp:1447 kcmlocale.cpp:1902 rc.cpp:38 rc.cpp:68
 msgid "Decimal places:"
 msgstr ""
 
-#: kcmlocale.cpp:1346
+#: kcmlocale.cpp:1448
 msgid ""
 "<p>Here you can set the number of decimal places displayed for numeric "
 "values, i.e. the number of digits <em>after</em> the decimal "
@@ -344,31 +341,31 @@
 "values has to be set separately (see the 'Money' tab).</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:289
+#. i18n: file: kcmlocalewidget.ui:322
 #. i18n: ectx: property (text), widget (QLabel, m_labelPositiveFormat)
-#: kcmlocale.cpp:1380 rc.cpp:36 rc.cpp:185
+#: kcmlocale.cpp:1485 rc.cpp:41
 msgid "Positive sign:"
 msgstr ""
 
-#: kcmlocale.cpp:1381
+#: kcmlocale.cpp:1486
 msgid ""
 "<p>Here you can specify text used to prefix positive numbers. Most locales "
 "leave this blank.</p><p>Note that the positive sign used to display monetary "
 "values has to be set separately (see the 'Money' tab).</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1389
+#: kcmlocale.cpp:1494
 msgctxt "No positive symbol"
 msgid "None"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:331
+#. i18n: file: kcmlocalewidget.ui:364
 #. i18n: ectx: property (text), widget (QLabel, m_labelNegativeFormat)
-#: kcmlocale.cpp:1433 rc.cpp:39 rc.cpp:188
+#: kcmlocale.cpp:1542 rc.cpp:44
 msgid "Negative sign:"
 msgstr ""
 
-#: kcmlocale.cpp:1434
+#: kcmlocale.cpp:1543
 msgid ""
 "<p>Here you can specify text used to prefix negative numbers. This should "
 "not be empty, so you can distinguish positive and negative numbers. It is "
@@ -376,18 +373,23 @@
 "monetary values has to be set separately (see the 'Money' tab).</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1443
+#: kcmlocale.cpp:1552
 msgctxt "No negative symbol"
 msgid "None"
 msgstr ""
 
-#. i18n: file: localemon.ui:65
-#. i18n: ectx: property (text), widget (QLabel, m_labMonDigSet)
-#: localemon.cpp:58 rc.cpp:36
+#. i18n: file: kcmlocalewidget.ui:406
+#. i18n: ectx: property (text), widget (QLabel, m_labelDigitSet)
+#. i18n: file: kcmlocalewidget.ui:761
+#. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryDigitSet)
+#. i18n: file: kcmlocalewidget.ui:1378
+#. i18n: ectx: property (text), widget (QLabel, m_labelDateTimeDigitSet)
+#: kcmlocale.cpp:1596 kcmlocale.cpp:2215 kcmlocale.cpp:3117 rc.cpp:47
+#: rc.cpp:77 rc.cpp:131
 msgid "Digit set:"
 msgstr ""
 
-#: kcmlocale.cpp:1488
+#: kcmlocale.cpp:1597
 msgid ""
 "<p>Here you can define the set of digits used to display numbers. If digits "
 "other than Arabic are selected, they will appear only if used in the "
@@ -396,58 +398,58 @@
 "has to be set separately (see the 'Money' tab).</p>"
 msgstr ""
 
-#. i18n: file: localemon.ui:78
+#. i18n: file: kcmlocalewidget.ui:452
 #. i18n: ectx: property (text), widget (QLabel, m_labelCurrencyCode)
-#: localemon.cpp:47 rc.cpp:39
+#: kcmlocale.cpp:1637 rc.cpp:53
 msgid "Currency:"
 msgstr ""
 
-#: kcmlocale.cpp:1526
+#: kcmlocale.cpp:1638
 msgid ""
 "<p>Here you can choose the currency to be used when displaying monetary "
 "values, e.g. United States Dollar or Pound Sterling.</p>"
 msgstr ""
 
-#: localemon.cpp:285 localemon.cpp:294
+#: kcmlocale.cpp:1649 kcmlocale.cpp:1660
 #, kde-format
 msgctxt "@item currency name and currency code"
 msgid "%1 (%2)"
 msgstr ""
 
-#. i18n: file: localemon.ui:91
+#. i18n: file: kcmlocalewidget.ui:494
 #. i18n: ectx: property (text), widget (QLabel, m_labelCurrencySymbol)
-#: localemon.cpp:48 rc.cpp:42
+#: kcmlocale.cpp:1698 rc.cpp:56
 msgid "Currency symbol:"
 msgstr "Nôd arian:"
 
-#: kcmlocale.cpp:1587
+#: kcmlocale.cpp:1699
 msgid ""
 "<p>Here you can choose the symbol to be used when displaying monetary "
 "values, e.g. $, US$ or USD.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1755
+#: kcmlocale.cpp:1756
 msgid ""
 "<p>Here you can define the digit grouping used to display monetary "
 "values.</p><p>Note that the digit grouping used to display other numbers has "
 "to be defined separately (see the 'Numbers' tab).</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1643
+#: kcmlocale.cpp:1795
 msgid ""
 "<p>Here you can define the group separator used to display monetary "
 "values.</p><p>Note that the thousands separator used to display other "
 "numbers has to be defined separately (see the 'Numbers' tab).</p>"
 msgstr ""
 
-#: localemon.cpp:347
+#: kcmlocale.cpp:1850
 msgid ""
 "<p>Here you can define the decimal separator used to display monetary "
 "values.</p><p>Note that the decimal separator used to display other numbers "
 "has to be defined separately (see the 'Numbers' tab).</p>"
 msgstr ""
 
-#: kcmlocale.cpp:1748
+#: kcmlocale.cpp:1903
 msgid ""
 "<p>Here you can set the number of decimal places displayed for monetary "
 "values, i.e. the number of digits <em>after</em> the decimal "
@@ -455,68 +457,44 @@
 "has to be defined separately (see the 'Numbers' tab).</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:620
+#. i18n: file: kcmlocalewidget.ui:683
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryPositiveFormat)
-#: kcmlocale.cpp:1797 rc.cpp:63 rc.cpp:212
+#: kcmlocale.cpp:1953 rc.cpp:71
 msgid "Positive format:"
 msgstr ""
 
-#: kcmlocale.cpp:1798
+#: kcmlocale.cpp:1954
 msgid ""
 "<p>Here you can set the format of positive monetary values.</p><p>Note that "
 "the positive sign used to display other numbers has to be defined separately "
 "(see the 'Numbers' tab).</p>"
 msgstr ""
 
-#. i18n: file: localemon.ui:123
-#. i18n: ectx: property (text), widget (QLabel, m_labMonPosMonSignPos)
-#. i18n: file: localemon.ui:192
-#. i18n: ectx: property (text), widget (QLabel, m_labMonNegMonSignPos)
-#: localemon.cpp:54 localemon.cpp:57 rc.cpp:51 rc.cpp:75
+#: kcmlocale.cpp:2005 kcmlocale.cpp:2115
 msgid "Sign position:"
 msgstr "Lleoliad arwydd:"
 
-#. i18n: file: localemon.ui:131
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonPosMonSignPos)
-#. i18n: file: localemon.ui:200
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonNegMonSignPos)
-#: localemon.cpp:317 rc.cpp:54 rc.cpp:78
+#: kcmlocale.cpp:2006 kcmlocale.cpp:2116
 msgid "Parentheses Around"
 msgstr "Cromfachau o Gwmpas"
 
-#. i18n: file: localemon.ui:136
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonPosMonSignPos)
-#. i18n: file: localemon.ui:205
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonNegMonSignPos)
-#: localemon.cpp:318 rc.cpp:57 rc.cpp:81
+#: kcmlocale.cpp:2007 kcmlocale.cpp:2117
 msgid "Before Quantity Money"
 msgstr "Cyn Nifer Arian"
 
-#. i18n: file: localemon.ui:141
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonPosMonSignPos)
-#. i18n: file: localemon.ui:210
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonNegMonSignPos)
-#: localemon.cpp:319 rc.cpp:60 rc.cpp:84
+#: kcmlocale.cpp:2008 kcmlocale.cpp:2118
 msgid "After Quantity Money"
 msgstr "Wedi Nifer Arian"
 
-#. i18n: file: localemon.ui:146
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonPosMonSignPos)
-#. i18n: file: localemon.ui:215
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonNegMonSignPos)
-#: localemon.cpp:320 rc.cpp:63 rc.cpp:87
+#: kcmlocale.cpp:2009 kcmlocale.cpp:2119
 msgid "Before Money"
 msgstr "Cyn Arian"
 
-#. i18n: file: localemon.ui:151
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonPosMonSignPos)
-#. i18n: file: localemon.ui:220
-#. i18n: ectx: property (text), item, widget (QComboBox, m_cmbMonNegMonSignPos)
-#: localemon.cpp:321 rc.cpp:66 rc.cpp:90
+#: kcmlocale.cpp:2010 kcmlocale.cpp:2120
 msgid "After Money"
 msgstr "Wedi Arian"
 
-#: localemon.cpp:384
+#: kcmlocale.cpp:2011
 msgid ""
 "Here you can select how a positive sign will be positioned. This only "
 "affects monetary values."
@@ -524,15 +502,11 @@
 "Yma gallwch ddewis sut y lleolir arwydd positif. Effeithia hyn ar werthoedd "
 "ariannol yn unig."
 
-#. i18n: file: localemon.ui:114
-#. i18n: ectx: property (text), widget (QCheckBox, m_chMonPosPreCurSym)
-#. i18n: file: localemon.ui:183
-#. i18n: ectx: property (text), widget (QCheckBox, m_chMonNegPreCurSym)
-#: localemon.cpp:53 localemon.cpp:56 rc.cpp:48 rc.cpp:72
+#: kcmlocale.cpp:2014 kcmlocale.cpp:2125
 msgid "Prefix currency symbol"
 msgstr "Nôd arian rhagddodiad"
 
-#: localemon.cpp:372
+#: kcmlocale.cpp:2015
 msgid ""
 "If this option is checked, the currency sign will be prefixed (i.e. to the "
 "left of the value) for all positive monetary values. If not, it will be "
@@ -542,20 +516,20 @@
 "chwith ohono) i bob gwerth ariannol positif. Os na wneir, bydd ar ei ôl "
 "(h.y. ar ei dde)."
 
-#. i18n: file: kcmlocalewidget.ui:659
+#. i18n: file: kcmlocalewidget.ui:722
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonetaryNegativeFormat)
-#: kcmlocale.cpp:1952 rc.cpp:66 rc.cpp:215
+#: kcmlocale.cpp:2108 rc.cpp:74
 msgid "Negative format:"
 msgstr ""
 
-#: kcmlocale.cpp:1953
+#: kcmlocale.cpp:2109
 msgid ""
 "<p>Here you can set the format of negative monetary values.</p><p>Note that "
 "the negative sign used to display other numbers has to be defined separately "
 "(see the 'Numbers' tab).</p>"
 msgstr ""
 
-#: localemon.cpp:389
+#: kcmlocale.cpp:2121
 msgid ""
 "Here you can select how a negative sign will be positioned. This only "
 "affects monetary values."
@@ -563,7 +537,7 @@
 "Yma gallwch ddewis sut y lleolir arwydd negatif. Effeithia hyn ar werthoedd "
 "ariannol yn unig."
 
-#: localemon.cpp:378
+#: kcmlocale.cpp:2126
 msgid ""
 "If this option is checked, the currency sign will be prefixed (i.e. to the "
 "left of the value) for all negative monetary values. If not, it will be "
@@ -573,7 +547,7 @@
 "chwith ohono) i bob gwerth ariannol negatif.  Os na wneir, bydd ar ei ôl "
 "(h.y. ar ei dde)."
 
-#: localemon.cpp:395
+#: kcmlocale.cpp:2216
 msgid ""
 "<p>Here you can define the set of digits used to display monetary values. If "
 "digits other than Arabic are selected, they will appear only if used in the "
@@ -582,40 +556,42 @@
 "to be defined separately (see the 'Numbers' tab).</p>"
 msgstr ""
 
-#: localetime.cpp:203
+#. i18n: file: kcmlocalewidget.ui:801
+#. i18n: ectx: property (text), widget (QLabel, m_labelCalendarSystem)
+#: kcmlocale.cpp:2258 rc.cpp:83
 msgid "Calendar system:"
 msgstr "Cysawd galendr:"
 
-#: kcmlocale.cpp:2098
+#: kcmlocale.cpp:2259
 msgid "<p>Here you can set the Calendar System to use to display dates.</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:789
+#. i18n: file: kcmlocalewidget.ui:852
 #. i18n: ectx: property (text), widget (QCheckBox, m_checkCalendarGregorianUseCommonEra)
-#: kcmlocale.cpp:2152 rc.cpp:78 rc.cpp:227
+#: kcmlocale.cpp:2314 rc.cpp:86
 msgid "Use Common Era"
 msgstr ""
 
-#: kcmlocale.cpp:2153
+#: kcmlocale.cpp:2315
 msgid ""
 "<p>This option determines if the Common Era (CE/BCE) should be used instead "
 "of the Christian Era (AD/BC).</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:801
+#. i18n: file: kcmlocalewidget.ui:864
 #. i18n: ectx: property (text), widget (QLabel, m_labelShortYearWindow)
-#: kcmlocale.cpp:2196 rc.cpp:81 rc.cpp:230
+#: kcmlocale.cpp:2358 rc.cpp:89
 msgid "Short year window:"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:829
+#. i18n: file: kcmlocalewidget.ui:895
 #. i18n: ectx: property (text), widget (QLabel, m_labelShortYearWindowTo)
-#: kcmlocale.cpp:2197 rc.cpp:84 rc.cpp:233
+#: kcmlocale.cpp:2359 rc.cpp:92
 msgctxt "label between two year inputs, i.e. 1930 to 2029"
 msgid "to"
 msgstr ""
 
-#: kcmlocale.cpp:2198
+#: kcmlocale.cpp:2360
 msgid ""
 "<p>This option determines what year range a two digit date is interpreted "
 "as, for example with a range of 1950 to 2049 the value 10 is interpreted as "
@@ -625,11 +601,11 @@
 
 #. i18n: file: kcmlocalewidget.ui:938
 #. i18n: ectx: property (text), widget (QLabel, m_labelWeekNumberSystem)
-#: kcmlocale.cpp:2401 rc.cpp:95 rc.cpp:253
+#: kcmlocale.cpp:2402 rc.cpp:95
 msgid "Week number system:"
 msgstr ""
 
-#: kcmlocale.cpp:2402
+#: kcmlocale.cpp:2403
 msgid ""
 "<p>This option determines how the Week Number will be calculated. There are "
 "four options available:</p> <ul><li><b>ISO Week</b> Use the ISO standard "
@@ -643,84 +619,86 @@
 "the first occurrence of the <i>First day of the week</i>, and lasts for "
 "seven days. The first week may not contain seven days.</li><li><b>Simple "
 "Week</b> The first week starts on the first day of the year and lasts seven "
-"days, will all new weeks starting on the same weekday as the first day of "
+"days, with all new weeks starting on the same weekday as the first day of "
 "the year.</li></ul>"
 msgstr ""
 
-#: kcmlocale.cpp:2425
+#: kcmlocale.cpp:2426
 msgid "ISO Week"
 msgstr ""
 
-#: kcmlocale.cpp:2427
+#: kcmlocale.cpp:2428
 msgid "Full First Week"
 msgstr ""
 
-#: kcmlocale.cpp:2429
+#: kcmlocale.cpp:2430
 msgid "Partial First Week"
 msgstr ""
 
-#: kcmlocale.cpp:2431
+#: kcmlocale.cpp:2432
 msgid "Simple Week"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:872
+#. i18n: file: kcmlocalewidget.ui:1000
 #. i18n: ectx: property (text), widget (QLabel, m_labelWeekStartDay)
-#: kcmlocale.cpp:2240 rc.cpp:87 rc.cpp:236
+#: kcmlocale.cpp:2461 rc.cpp:98
 msgid "First day of week:"
 msgstr ""
 
-#: kcmlocale.cpp:2461
+#: kcmlocale.cpp:2462
 msgid ""
 "<p>This option determines which day will be considered as the first one of "
 "the week.  This value may affect the Week Number System.</p> "
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:911
+#. i18n: file: kcmlocalewidget.ui:1016
 #. i18n: ectx: property (text), widget (QLabel, m_labelWorkingWeekStartDay)
-#: kcmlocale.cpp:2274 rc.cpp:90 rc.cpp:239
+#: kcmlocale.cpp:2496 rc.cpp:101
 msgid "First working day of week:"
 msgstr ""
 
-#: localetime.cpp:597
+#: kcmlocale.cpp:2497
 msgid ""
 "<p>This option determines which day will be considered as the first working "
 "day of the week.</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:950
+#. i18n: file: kcmlocalewidget.ui:1078
 #. i18n: ectx: property (text), widget (QLabel, m_labelWorkingWeekEndDay)
-#: kcmlocale.cpp:2308 rc.cpp:93 rc.cpp:242
+#: kcmlocale.cpp:2530 rc.cpp:104
 msgid "Last working day of week:"
 msgstr ""
 
-#: localetime.cpp:602
+#: kcmlocale.cpp:2531
 msgid ""
 "<p>This option determines which day will be considered as the last working "
 "day of the week.</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:989
+#. i18n: file: kcmlocalewidget.ui:1117
 #. i18n: ectx: property (text), widget (QLabel, m_labelWeekDayOfPray)
-#: kcmlocale.cpp:2342 rc.cpp:96 rc.cpp:245
+#: kcmlocale.cpp:2564 rc.cpp:107
 msgid "Week day for special religious observance:"
 msgstr ""
 
-#: kcmlocale.cpp:2343
+#: kcmlocale.cpp:2565
 msgid ""
 "<p>This option determines which day if any will be considered as the day of "
 "the week for special religious observance.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:2349
+#: kcmlocale.cpp:2571
 msgctxt "Day name list, option for no special day of religious observance"
 msgid "None / None in particular"
 msgstr ""
 
-#: localetime.cpp:225
+#. i18n: file: kcmlocalewidget.ui:1143
+#. i18n: ectx: property (text), widget (QLabel, m_labelTimeFormat)
+#: kcmlocale.cpp:2599 rc.cpp:113
 msgid "Time format:"
 msgstr "Fformat amser:"
 
-#: kcmlocale.cpp:2378
+#: kcmlocale.cpp:2600
 msgid ""
 "<p>The text in this textbox will be used to format time strings. The "
 "sequences below will be replaced:</p><table><tr><td><b>HH</b></td><td>The "
@@ -736,36 +714,36 @@
 "as 'AM'.</td></tr></table>"
 msgstr ""
 
-#: localetime.cpp:96
+#: kcmlocale.cpp:2623
 msgid "HH"
 msgstr "AA"
 
-#: localetime.cpp:97
+#: kcmlocale.cpp:2624
 msgid "hH"
 msgstr "aA"
 
-#: localetime.cpp:98
+#: kcmlocale.cpp:2625
 msgid "PH"
 msgstr "PA"
 
-#: localetime.cpp:99
+#: kcmlocale.cpp:2626
 msgid "pH"
 msgstr "pA"
 
-#: localetime.cpp:100
+#: kcmlocale.cpp:2627
 msgctxt "Minute"
 msgid "MM"
 msgstr "MM"
 
-#: localetime.cpp:101
+#: kcmlocale.cpp:2628
 msgid "SS"
 msgstr "EE"
 
-#: localetime.cpp:102
+#: kcmlocale.cpp:2629
 msgid "AMPM"
 msgstr "yByP"
 
-#: localetime.cpp:496
+#: kcmlocale.cpp:2639
 msgctxt "some reasonable time formats for the language"
 msgid ""
 "HH:MM:SS\n"
@@ -774,33 +752,33 @@
 "AA:MM:EE\n"
 "pA:MM:EE yByP"
 
-#. i18n: file: kcmlocalewidget.ui:1074
+#. i18n: file: kcmlocalewidget.ui:1179
 #. i18n: ectx: property (text), widget (QLabel, m_labelAmSymbol)
-#: kcmlocale.cpp:2487 rc.cpp:105 rc.cpp:254
+#: kcmlocale.cpp:2712 rc.cpp:116
 msgid "AM symbol:"
 msgstr ""
 
-#: kcmlocale.cpp:2488
+#: kcmlocale.cpp:2713
 msgid "<p>Here you can set the text to be displayed for AM.</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:1104
+#. i18n: file: kcmlocalewidget.ui:1209
 #. i18n: ectx: property (text), widget (QLabel, m_labelPmSymbol)
-#: kcmlocale.cpp:2492 rc.cpp:108 rc.cpp:257
+#: kcmlocale.cpp:2717 rc.cpp:119
 msgid "PM symbol:"
 msgstr ""
 
-#: kcmlocale.cpp:2493
+#: kcmlocale.cpp:2718
 msgid "<p>Here you can set the text to be displayed for PM.</p>"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:1140
+#. i18n: file: kcmlocalewidget.ui:1245
 #. i18n: ectx: property (text), widget (QLabel, m_labelDateFormat)
-#: kcmlocale.cpp:2597 rc.cpp:111 rc.cpp:260
+#: kcmlocale.cpp:2822 rc.cpp:122
 msgid "Long date format:"
 msgstr ""
 
-#: kcmlocale.cpp:2598
+#: kcmlocale.cpp:2823
 msgid ""
 "<p>The text in this textbox will be used to format long dates. The sequences "
 "below will be replaced:</p><table><tr><td><b>YYYY</b></td><td>The year with "
@@ -824,72 +802,72 @@
 "ISO Week as a decimal number.</td></tr></table>"
 msgstr ""
 
-#: localetime.cpp:112
+#: kcmlocale.cpp:2895
 msgid "YYYY"
 msgstr "BBBB"
 
-#: localetime.cpp:113
+#: kcmlocale.cpp:2896
 msgid "YY"
 msgstr "BB"
 
-#: localetime.cpp:114
+#: kcmlocale.cpp:2897
 msgid "mM"
 msgstr "mM"
 
-#: localetime.cpp:115
+#: kcmlocale.cpp:2898
 msgctxt "Month"
 msgid "MM"
 msgstr "MIS"
 
-#: localetime.cpp:116
+#: kcmlocale.cpp:2899
 msgid "SHORTMONTH"
 msgstr "MISBYR"
 
-#: localetime.cpp:117
+#: kcmlocale.cpp:2900
 msgid "MONTH"
 msgstr "MIS"
 
-#: localetime.cpp:118
+#: kcmlocale.cpp:2901
 msgid "dD"
 msgstr "dD"
 
-#: localetime.cpp:119
+#: kcmlocale.cpp:2902
 msgid "DD"
 msgstr "DD"
 
-#: localetime.cpp:120
+#: kcmlocale.cpp:2903
 msgid "SHORTWEEKDAY"
 msgstr "DIWRNODYRWYTHNOSBYR"
 
-#: localetime.cpp:121
+#: kcmlocale.cpp:2904
 msgid "WEEKDAY"
 msgstr "DIWRNODYRWYTHNOS"
 
-#: kcmlocale.cpp:2680
+#: kcmlocale.cpp:2905
 msgid "ERAYEAR"
 msgstr ""
 
-#: kcmlocale.cpp:2681
+#: kcmlocale.cpp:2906
 msgid "YEARINERA"
 msgstr ""
 
-#: kcmlocale.cpp:2682
+#: kcmlocale.cpp:2907
 msgid "SHORTERANAME"
 msgstr ""
 
-#: kcmlocale.cpp:2683
+#: kcmlocale.cpp:2908
 msgid "DAYOFYEAR"
 msgstr ""
 
-#: kcmlocale.cpp:2684
+#: kcmlocale.cpp:2909
 msgid "ISOWEEK"
 msgstr ""
 
-#: kcmlocale.cpp:2685
+#: kcmlocale.cpp:2910
 msgid "DAYOFISOWEEK"
 msgstr ""
 
-#: localetime.cpp:504
+#: kcmlocale.cpp:2920
 msgctxt "some reasonable date formats for the language"
 msgid ""
 "WEEKDAY MONTH dD YYYY\n"
@@ -898,11 +876,13 @@
 "DIWRNODYRWYTHNOS MIS dD BBBB\n"
 "DIWRNODYRWYTHNOSBYR MIS dD BBBB"
 
-#: localetime.cpp:243
+#. i18n: file: kcmlocalewidget.ui:1287
+#. i18n: ectx: property (text), widget (QLabel, m_labelShortDateFormat)
+#: kcmlocale.cpp:2956 rc.cpp:125
 msgid "Short date format:"
 msgstr "Fformat dyddiad byr:"
 
-#: kcmlocale.cpp:2732
+#: kcmlocale.cpp:2957
 msgid ""
 "<p>The text in this textbox will be used to format short dates. For "
 "instance, this is used when listing files. The sequences below will be "
@@ -927,7 +907,7 @@
 "ISO Week as a decimal number.</td></tr></table>"
 msgstr ""
 
-#: localetime.cpp:512
+#: kcmlocale.cpp:3038
 msgctxt "some reasonable short date formats for the language"
 msgid ""
 "YYYY-MM-DD\n"
@@ -938,13 +918,13 @@
 "dD.mM.BBBB\n"
 "DD.MM.BBBB"
 
-#. i18n: file: kcmlocalewidget.ui:1227
+#. i18n: file: kcmlocalewidget.ui:1332
 #. i18n: ectx: property (text), widget (QLabel, m_labelMonthNamePossessive)
-#: kcmlocale.cpp:2851 rc.cpp:117 rc.cpp:266
+#: kcmlocale.cpp:3076 rc.cpp:128
 msgid "Possessive month names:"
 msgstr ""
 
-#: localetime.cpp:614
+#: kcmlocale.cpp:3077
 msgid ""
 "<p>This option determines whether possessive form of month names should be "
 "used in dates.</p>"
@@ -952,7 +932,7 @@
 "<p>Penna'r gosodiad yma a ddylid defnyddio ffurf feddiannol enwau misoedd "
 "mewn dyddiadau.</p>"
 
-#: kcmlocale.cpp:2893
+#: kcmlocale.cpp:3118
 msgid ""
 "<p>Here you can define the set of digits used to display dates and times.  "
 "If digits other than Arabic are selected, they will appear only if used in "
@@ -962,193 +942,193 @@
 "tabs).</p>"
 msgstr ""
 
-#: kcmlocale.cpp:2930
+#: kcmlocale.cpp:3155
 msgid "Page size:"
 msgstr ""
 
-#: kcmlocale.cpp:2931
+#: kcmlocale.cpp:3156
 msgid ""
 "<p>Here you can define the default page size to be used in new "
 "documents.</p><p>Note that this setting has no effect on printer paper "
 "size.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:2939 kcmlocale.cpp:2951
+#: kcmlocale.cpp:3164 kcmlocale.cpp:3176
 msgctxt "Page size"
 msgid "A4"
 msgstr ""
 
-#: kcmlocale.cpp:2941 kcmlocale.cpp:2999
+#: kcmlocale.cpp:3166 kcmlocale.cpp:3224
 msgctxt "Page size"
 msgid "US Letter"
 msgstr ""
 
-#: kcmlocale.cpp:2943
+#: kcmlocale.cpp:3168
 msgctxt "Page size"
 msgid "A0"
 msgstr ""
 
-#: kcmlocale.cpp:2945
+#: kcmlocale.cpp:3170
 msgctxt "Page size"
 msgid "A1"
 msgstr ""
 
-#: kcmlocale.cpp:2947
+#: kcmlocale.cpp:3172
 msgctxt "Page size"
 msgid "A2"
 msgstr ""
 
-#: kcmlocale.cpp:2949
+#: kcmlocale.cpp:3174
 msgctxt "Page size"
 msgid "A3"
 msgstr ""
 
-#: kcmlocale.cpp:2953
+#: kcmlocale.cpp:3178
 msgctxt "Page size"
 msgid "A5"
 msgstr ""
 
-#: kcmlocale.cpp:2955
+#: kcmlocale.cpp:3180
 msgctxt "Page size"
 msgid "A6"
 msgstr ""
 
-#: kcmlocale.cpp:2957
+#: kcmlocale.cpp:3182
 msgctxt "Page size"
 msgid "A7"
 msgstr ""
 
-#: kcmlocale.cpp:2959
+#: kcmlocale.cpp:3184
 msgctxt "Page size"
 msgid "A8"
 msgstr ""
 
-#: kcmlocale.cpp:2961
+#: kcmlocale.cpp:3186
 msgctxt "Page size"
 msgid "A9"
 msgstr ""
 
-#: kcmlocale.cpp:2963
+#: kcmlocale.cpp:3188
 msgctxt "Page size"
 msgid "B0"
 msgstr ""
 
-#: kcmlocale.cpp:2965
+#: kcmlocale.cpp:3190
 msgctxt "Page size"
 msgid "B1"
 msgstr ""
 
-#: kcmlocale.cpp:2967
+#: kcmlocale.cpp:3192
 msgctxt "Page size"
 msgid "B2"
 msgstr ""
 
-#: kcmlocale.cpp:2969
+#: kcmlocale.cpp:3194
 msgctxt "Page size"
 msgid "B3"
 msgstr ""
 
-#: kcmlocale.cpp:2971
+#: kcmlocale.cpp:3196
 msgctxt "Page size"
 msgid "B4"
 msgstr ""
 
-#: kcmlocale.cpp:2973
+#: kcmlocale.cpp:3198
 msgctxt "Page size"
 msgid "B5"
 msgstr ""
 
-#: kcmlocale.cpp:2975
+#: kcmlocale.cpp:3200
 msgctxt "Page size"
 msgid "B6"
 msgstr ""
 
-#: kcmlocale.cpp:2977
+#: kcmlocale.cpp:3202
 msgctxt "Page size"
 msgid "B7"
 msgstr ""
 
-#: kcmlocale.cpp:2979
+#: kcmlocale.cpp:3204
 msgctxt "Page size"
 msgid "B8"
 msgstr ""
 
-#: kcmlocale.cpp:2981
+#: kcmlocale.cpp:3206
 msgctxt "Page size"
 msgid "B9"
 msgstr ""
 
-#: kcmlocale.cpp:2983
+#: kcmlocale.cpp:3208
 msgctxt "Page size"
 msgid "B10"
 msgstr ""
 
-#: kcmlocale.cpp:2985
+#: kcmlocale.cpp:3210
 msgctxt "Page size"
 msgid "C5 Envelope"
 msgstr ""
 
-#: kcmlocale.cpp:2987
+#: kcmlocale.cpp:3212
 msgctxt "Page size"
 msgid "US Common 10 Envelope"
 msgstr ""
 
-#: kcmlocale.cpp:2989
+#: kcmlocale.cpp:3214
 msgctxt "Page size"
 msgid "DLE Envelope"
 msgstr ""
 
-#: kcmlocale.cpp:2991
+#: kcmlocale.cpp:3216
 msgctxt "Page size"
 msgid "Executive"
 msgstr ""
 
-#: kcmlocale.cpp:2993
+#: kcmlocale.cpp:3218
 msgctxt "Page size"
 msgid "Folio"
 msgstr ""
 
-#: kcmlocale.cpp:2995
+#: kcmlocale.cpp:3220
 msgctxt "Page size"
 msgid "Ledger"
 msgstr ""
 
-#: kcmlocale.cpp:2997
+#: kcmlocale.cpp:3222
 msgctxt "Page size"
 msgid "US Legal"
 msgstr ""
 
-#: kcmlocale.cpp:3001
+#: kcmlocale.cpp:3226
 msgctxt "Page size"
 msgid "Tabloid"
 msgstr ""
 
-#: kcmlocale.cpp:3003
+#: kcmlocale.cpp:3228
 msgctxt "Page size"
 msgid "Custom"
 msgstr ""
 
-#: kcmlocale.cpp:3032
+#: kcmlocale.cpp:3257
 msgid "Measurement system:"
 msgstr ""
 
-#: kcmlocale.cpp:3033
+#: kcmlocale.cpp:3258
 msgid "<p>Here you can define the measurement system to use.</p>"
 msgstr ""
 
-#: kcmlocale.cpp:3039
+#: kcmlocale.cpp:3264
 msgid "Metric System"
 msgstr ""
 
-#: kcmlocale.cpp:3040
+#: kcmlocale.cpp:3265
 msgid "Imperial System"
 msgstr ""
 
-#: kcmlocale.cpp:3068
+#: kcmlocale.cpp:3293
 msgid "Byte size units:"
 msgstr ""
 
-#: kcmlocale.cpp:3069
+#: kcmlocale.cpp:3294
 msgid ""
 "<p>This changes the units used by most KDE programs to display numbers "
 "counted in bytes. Traditionally \"kilobytes\" meant units of 1024, instead "
@@ -1156,56 +1136,56 @@
 "confusion you can use the recently standardized IEC units which are always "
 "in multiples of 1024.</li><li>You can also select metric, which is always in "
 "units of 1000.</li><li>Selecting JEDEC restores the older-style units used "
-"in KDE 3.5 and some other operating systems.</li></p>"
+"in KDE 3.5 and some other operating systems.</li></ul></p>"
 msgstr ""
 
-#: kcmlocale.cpp:3084
+#: kcmlocale.cpp:3310
 msgctxt "Unit of binary measurement"
 msgid "IEC Units (KiB, MiB, etc)"
 msgstr ""
 
-#: kcmlocale.cpp:3086
+#: kcmlocale.cpp:3312
 msgctxt "Unit of binary measurement"
 msgid "JEDEC Units (KB, MB, etc)"
 msgstr ""
 
-#: kcmlocale.cpp:3088
+#: kcmlocale.cpp:3314
 msgctxt "Unit of binary measurement"
 msgid "Metric Units (kB, MB, etc)"
 msgstr ""
 
-#: kcmlocale.cpp:3113
+#: kcmlocale.cpp:3339
 #, kde-format
 msgctxt "Example test for binary unit dialect"
 msgid "Example: 2000 bytes equals %1"
 msgstr ""
 
-#: rc.cpp:91
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:92
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""
 "owaing@oceanfree.net\n"
 "kyfieithu@dotmon.com,,"
 
-#. i18n: file: kcmlocalewidget.ui:1313
+#. i18n: file: kcmlocalewidget.ui:1418
 #. i18n: ectx: property (text), widget (QLabel, m_labelPageSize)
-#: rc.cpp:126 rc.cpp:275
+#: rc.cpp:137
 msgid "Page size"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:1352
+#. i18n: file: kcmlocalewidget.ui:1457
 #. i18n: ectx: property (text), widget (QLabel, m_labelMeasureSystem)
-#: rc.cpp:129 rc.cpp:278
+#: rc.cpp:140
 msgid "Measurement system"
 msgstr ""
 
-#. i18n: file: kcmlocalewidget.ui:1408
+#. i18n: file: kcmlocalewidget.ui:1513
 #. i18n: ectx: property (text), widget (QLabel, m_labelBinaryUnitDialect)
-#: rc.cpp:132 rc.cpp:281
+#: rc.cpp:143
 msgid "Byte size units"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmnic.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmnic.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmnic.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmnic.po	2012-04-18 08:59:38.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: kcmnic\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2008-02-15 22:12+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:27+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: nic.cpp:99
 msgid "Name"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmnotify.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmnotify.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmnotify.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmnotify.po	2012-04-18 08:59:35.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: kcmnotify\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:33+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:13+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: knotify.cpp:55
 msgid ""
@@ -32,92 +32,92 @@
 msgid "Event source:"
 msgstr "Tarddiad y digwyddiad:"
 
-#: knotify.cpp:100
+#: knotify.cpp:101
 msgid "&Applications"
 msgstr "Rh&aglenni"
 
-#: knotify.cpp:101
+#: knotify.cpp:102
 msgid "&Player Settings"
 msgstr ""
 
-#: knotify.cpp:107
+#: knotify.cpp:110
 msgid "KNotify"
 msgstr "KHysbysu"
 
-#: knotify.cpp:108
+#: knotify.cpp:111
 msgid "System Notification Control Panel Module"
 msgstr "Modiwl Panel Rheoli am Hysbysu'r System"
 
-#: knotify.cpp:109
+#: knotify.cpp:112
 msgid "(c) 2002-2006 KDE Team"
 msgstr "(c) 2002-2006 Team KDE"
 
-#: knotify.cpp:111
+#: knotify.cpp:114
 msgid "Olivier Goffart"
 msgstr "Olivier Goffart"
 
-#: knotify.cpp:112
+#: knotify.cpp:115
 msgid "Carsten Pfeiffer"
 msgstr "Carsten Pfeiffer"
 
-#: knotify.cpp:113
+#: knotify.cpp:116
 msgid "Charles Samuels"
 msgstr "Charles Samuels"
 
-#: knotify.cpp:113
+#: knotify.cpp:116
 msgid "Original implementation"
 msgstr "Gweithredoliant gwreiddiol"
 
-#: rc.cpp:24
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KGyfieithu, ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:25
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: playersettings.ui:17
 #. i18n: ectx: property (text), widget (QRadioButton, cbArts)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid "Use the &KDE sound system"
 msgstr ""
 
 #. i18n: file: playersettings.ui:32
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:7
+#: rc.cpp:9
 #, no-c-format
 msgid "100%"
 msgstr "100%"
 
 #. i18n: file: playersettings.ui:55
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:11
+#: rc.cpp:13
 #, no-c-format
 msgid "0%"
 msgstr "0%"
 
 #. i18n: file: playersettings.ui:62
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:14
+#: rc.cpp:16
 msgid "&Volume:"
 msgstr "&Lefel sain:"
 
 #. i18n: file: playersettings.ui:106
 #. i18n: ectx: property (text), widget (QRadioButton, cbExternal)
-#: rc.cpp:17
+#: rc.cpp:19
 msgid "&Use an external player"
 msgstr ""
 
 #. i18n: file: playersettings.ui:137
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:20
+#: rc.cpp:22
 msgid "&Player:"
 msgstr "&Chwaraewr :"
 
 #. i18n: file: playersettings.ui:162
 #. i18n: ectx: property (text), widget (QRadioButton, cbNone)
-#: rc.cpp:23
+#: rc.cpp:25
 msgid "&No audio output"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmperformance.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmperformance.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmperformance.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmperformance.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmperformance\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 18:15+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:21+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:46+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmperformance.cpp:48
 msgid ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcm_phononxine.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcm_phononxine.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcm_phononxine.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcm_phononxine.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 01:43+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:45+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: xineoptions.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, deinterlaceGroupBox)
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcm_platform.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcm_platform.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcm_platform.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcm_platform.po	2012-04-18 08:59:34.000000000 +0000
@@ -7,39 +7,39 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 01:48+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:46+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: platform.cpp:39
 msgid "Platform"
 msgstr ""
 
-#: rc.cpp:121
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:122
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ",,"
 
 #. i18n: file: platform.ui:20
 #. i18n: ectx: property (windowTitle), widget (QWidget, PlatformThing)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid "Platform Specific Configuration Module"
 msgstr ""
 
 #. i18n: file: platform.ui:35
 #. i18n: ectx: property (title), widget (QGroupBox, shellChooser)
-#: rc.cpp:6
+#: rc.cpp:8
 msgctxt "'Windows' means the OS"
 msgid "Windows Desktop Shell"
 msgstr ""
@@ -69,7 +69,7 @@
 
 #. i18n: file: platform.ui:54
 #. i18n: ectx: property (text), widget (QLabel, descrNative)
-#: rc.cpp:18
+#: rc.cpp:23
 msgid "System's default desktop shell"
 msgstr ""
 
@@ -98,7 +98,7 @@
 
 #. i18n: file: platform.ui:74
 #. i18n: ectx: property (text), widget (QLabel, descrPlasma)
-#: rc.cpp:30
+#: rc.cpp:38
 msgid "KDE4 Plasma desktop shell"
 msgstr ""
 
@@ -127,7 +127,7 @@
 
 #. i18n: file: platform.ui:94
 #. i18n: ectx: property (text), widget (QLabel, descrCustom)
-#: rc.cpp:42
+#: rc.cpp:53
 msgid ""
 "This shell is reserved for the user's custom shell. Press the \"Setup\" "
 "button to setup your favorite shell."
@@ -151,13 +151,13 @@
 
 #. i18n: file: platform.ui:115
 #. i18n: ectx: property (text), widget (QPushButton, btnShellSetup)
-#: rc.cpp:51
+#: rc.cpp:64
 msgid "Setup..."
 msgstr "Gosod..."
 
 #. i18n: file: platform.ui:146
 #. i18n: ectx: property (title), widget (QGroupBox, systemIntegration)
-#: rc.cpp:54
+#: rc.cpp:67
 msgid "System Integration"
 msgstr ""
 
@@ -311,25 +311,25 @@
 
 #. i18n: file: shellEdit.ui:19
 #. i18n: ectx: property (windowTitle), widget (QDialog, ShellEditDlg)
-#: rc.cpp:111
+#: rc.cpp:142
 msgid "Setup Custom Shell"
 msgstr ""
 
 #. i18n: file: shellEdit.ui:28
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:114
+#: rc.cpp:145
 msgid "Name:"
 msgstr "Enw:"
 
 #. i18n: file: shellEdit.ui:48
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:117
+#: rc.cpp:148
 msgid "Command:"
 msgstr "Gorchymyn:"
 
 #. i18n: file: shellEdit.ui:61
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:120
+#: rc.cpp:151
 msgid "Description:"
 msgstr "Disgrifiad:"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmsamba.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmsamba.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmsamba.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmsamba.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,29 +11,29 @@
 msgstr ""
 "Project-Id-Version: kcmsamba\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:12+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:43+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:00+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kcmsambaimports.cpp:44 ksmbstatus.cpp:51
+#: kcmsambaimports.cpp:43 ksmbstatus.cpp:51
 msgid "Type"
 msgstr "Math"
 
-#: kcmsambaimports.cpp:45
+#: kcmsambaimports.cpp:43
 msgid "Resource"
 msgstr "Adnodd"
 
-#: kcmsambaimports.cpp:46
+#: kcmsambaimports.cpp:43
 msgid "Mounted Under"
 msgstr "Arosodwyd o Dan"
 
-#: kcmsambaimports.cpp:48
+#: kcmsambaimports.cpp:45
 msgid ""
 "This list shows the Samba and NFS shared resources mounted on your system "
 "from other hosts. The \"Type\" column tells you whether the mounted resource "
@@ -133,19 +133,19 @@
 "Cliciwch yma i ailfywio'r wybodaeth ar y dudalen hon. Darllenir y ffeil "
 "gofnodion (a ddengys uchod) i nôl y digwyddiadau a gofnodwyd gan samba."
 
-#: kcmsambalog.cpp:88
+#: kcmsambalog.cpp:88 kcmsambalog.cpp:89
 msgid "Date & Time"
 msgstr "Dyddiad ac Amser"
 
-#: kcmsambalog.cpp:89 kcmsambastatistics.cpp:65
+#: kcmsambalog.cpp:88 kcmsambalog.cpp:89 kcmsambastatistics.cpp:64
 msgid "Event"
 msgstr "Digwyddiad"
 
-#: kcmsambalog.cpp:90 kcmsambastatistics.cpp:66
+#: kcmsambalog.cpp:88 kcmsambalog.cpp:90 kcmsambastatistics.cpp:64
 msgid "Service/File"
 msgstr "Gwasanaeth/Ffeil"
 
-#: kcmsambalog.cpp:91 kcmsambastatistics.cpp:67
+#: kcmsambalog.cpp:89 kcmsambalog.cpp:90 kcmsambastatistics.cpp:64
 msgid "Host/User"
 msgstr "Gwesteiwr/Defnyddiwr"
 
@@ -160,7 +160,7 @@
 "be read and the list refreshed.</p>"
 msgstr ""
 
-#: kcmsambalog.cpp:204 kcmsambastatistics.cpp:150 kcmsambastatistics.cpp:198
+#: kcmsambalog.cpp:204 kcmsambastatistics.cpp:147 kcmsambastatistics.cpp:212
 msgid "CONNECTION OPENED"
 msgstr "AGORWYD CYSYLLTIAD"
 
@@ -221,81 +221,81 @@
 msgid "Nr"
 msgstr "Nifer"
 
-#: kcmsambastatistics.cpp:68
+#: kcmsambastatistics.cpp:64
 msgid "Hits"
 msgstr "Trawiadau"
 
-#: kcmsambastatistics.cpp:72 kcmsambastatistics.cpp:139
+#: kcmsambastatistics.cpp:68 kcmsambastatistics.cpp:135
 msgid "Connection"
 msgstr "Cysylltiad"
 
-#: kcmsambastatistics.cpp:73
+#: kcmsambastatistics.cpp:69
 msgid "File Access"
 msgstr "Cyrchiad Ffeil"
 
-#: kcmsambastatistics.cpp:129
+#: kcmsambastatistics.cpp:125
 #, kde-format
 msgid "Connections: %1"
 msgstr "Cysylltiadau: %1"
 
-#: kcmsambastatistics.cpp:130
+#: kcmsambastatistics.cpp:126
 #, kde-format
 msgid "File accesses: %1"
 msgstr "Cyrchiadau ffeil: %1"
 
-#: kcmsambastatistics.cpp:163 kcmsambastatistics.cpp:201
+#: kcmsambastatistics.cpp:160 kcmsambastatistics.cpp:215
 msgid "FILE OPENED"
 msgstr "AGORWYD FFEIL"
 
-#: ksmbstatus.cpp:52
+#: ksmbstatus.cpp:51
 msgid "Service"
 msgstr "Gwasanaeth"
 
-#: ksmbstatus.cpp:53
+#: ksmbstatus.cpp:51
 msgid "Accessed From"
 msgstr "Wedi'i Gyrchu o"
 
-#: ksmbstatus.cpp:54
+#: ksmbstatus.cpp:52
 msgid "UID"
 msgstr "UID"
 
-#: ksmbstatus.cpp:55
+#: ksmbstatus.cpp:52
 msgid "GID"
 msgstr "GID"
 
-#: ksmbstatus.cpp:56
+#: ksmbstatus.cpp:52
 msgid "PID"
 msgstr "PID"
 
-#: ksmbstatus.cpp:57
+#: ksmbstatus.cpp:52
 msgid "Open Files"
 msgstr "Agor Ffeiliau"
 
-#: ksmbstatus.cpp:158
+#: ksmbstatus.cpp:156
 msgid "Error: Unable to run smbstatus"
 msgstr "Gwall: Methu rhedeg smbstatus"
 
-#: ksmbstatus.cpp:160
+#: ksmbstatus.cpp:178
 msgid "Error: Unable to open configuration file \"smb.conf\""
 msgstr "Gwall: Methu agor ffeil ffurfwedd \"smb.conf\""
 
-#: main.cpp:61
+#: main.cpp:60
 msgid "&Exports"
 msgstr "&Allforiadau"
 
-#: main.cpp:62
+#: main.cpp:61
 msgid "&Imports"
 msgstr "&Mewnforiadau"
 
-#: main.cpp:63
+#: main.cpp:62
 msgid "&Log"
 msgstr "&Cofnodion"
 
-#: main.cpp:64
+#: main.cpp:63
 msgid "&Statistics"
 msgstr "&Ystadegaeth"
 
-#: main.cpp:68
+#: main.cpp:67
 msgid ""
 "<p>The Samba and NFS Status Monitor is a front end to the programs "
 "<em>smbstatus</em> and <em>showmount</em>. Smbstatus reports on current "
@@ -306,7 +306,7 @@
 "flavors of Microsoft Windows.</p>"
 msgstr ""
 
-#: main.cpp:76
+#: main.cpp:75
 msgid "kcmsamba"
 msgstr "kcmsamba"
 
@@ -314,31 +314,31 @@
 msgid "System Information Control Module"
 msgstr ""
 
-#: main.cpp:79
+#: main.cpp:78
 msgid "(c) 2002 KDE Information Control Module Samba Team"
 msgstr "(h)(c) 2002 Tîm Samba Modwl Reoli Gwybodaeth KDE"
 
-#: main.cpp:80
+#: main.cpp:79
 msgid "Michael Glauche"
 msgstr "Michael Glauche"
 
-#: main.cpp:81
+#: main.cpp:80
 msgid "Matthias Hoelzer"
 msgstr "Matthias Hoelzer"
 
-#: main.cpp:82
+#: main.cpp:81
 msgid "David Faure"
 msgstr "David Faure"
 
-#: main.cpp:83
+#: main.cpp:82
 msgid "Harald Koschinski"
 msgstr "Harald Koschinski"
 
-#: main.cpp:84
+#: main.cpp:83
 msgid "Wilco Greven"
 msgstr "Wilco Greven"
 
-#: main.cpp:85
+#: main.cpp:84
 msgid "Alexander Neundorf"
 msgstr "Alexander Neundorf"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmscreensaver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmscreensaver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmscreensaver.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmscreensaver.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: kcmscreensaver\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:13+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:44+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: category_list.cpp:7
 msgctxt "Screen saver category"
@@ -69,37 +69,37 @@
 msgid "Visit to Flatland"
 msgstr "Ymweliad â Wastatir"
 
-#: rc.cpp:46
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:47
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: screensaver.ui:70
 #. i18n: ectx: property (title), widget (QGroupBox, mSettingsGroup)
-#: rc.cpp:3 rc.cpp:50
+#: rc.cpp:5
 msgid "Settings"
 msgstr "Gosodiadau"
 
 #. i18n: file: screensaver.ui:76
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mEnabledCheckBox)
-#: rc.cpp:6 rc.cpp:53
+#: rc.cpp:8
 msgid "Automatically start the screen saver after a period of inactivity."
 msgstr ""
 
 #. i18n: file: screensaver.ui:79
 #. i18n: ectx: property (text), widget (QCheckBox, mEnabledCheckBox)
-#: rc.cpp:9 rc.cpp:56
+#: rc.cpp:11
 msgid "Start a&utomatically after:"
 msgstr ""
 
 #. i18n: file: screensaver.ui:102
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mLockCheckBox)
-#: rc.cpp:12 rc.cpp:59
+#: rc.cpp:14
 msgid ""
 "Prevent potential unauthorized use by requiring a password to stop the "
 "screen saver."
@@ -107,13 +107,13 @@
 
 #. i18n: file: screensaver.ui:105
 #. i18n: ectx: property (text), widget (QCheckBox, mLockCheckBox)
-#: rc.cpp:15 rc.cpp:62
+#: rc.cpp:17
 msgid "&Require password after:"
 msgstr ""
 
 #. i18n: file: screensaver.ui:112
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWaitLockEdit)
-#: rc.cpp:18 rc.cpp:65
+#: rc.cpp:20
 msgid ""
 "The amount of time, after the screen saver has started, to ask for the "
 "unlock password."
@@ -121,55 +121,55 @@
 
 #. i18n: file: screensaver.ui:132
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mPlasmaCheckBox)
-#: rc.cpp:21 rc.cpp:68
+#: rc.cpp:23
 msgid "Add widgets to your screensaver."
 msgstr ""
 
 #. i18n: file: screensaver.ui:135
 #. i18n: ectx: property (text), widget (QCheckBox, mPlasmaCheckBox)
-#: rc.cpp:24 rc.cpp:71
+#: rc.cpp:26
 msgid "Allow widgets on screen saver"
 msgstr ""
 
 #. i18n: file: screensaver.ui:160
 #. i18n: ectx: property (text), widget (KPushButton, mPlasmaSetup)
-#: rc.cpp:27 rc.cpp:74
+#: rc.cpp:29
 msgid "Configure Widgets..."
 msgstr ""
 
 #. i18n: file: screensaver.ui:185
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:30 rc.cpp:77
+#: rc.cpp:32
 msgid "Screen Saver"
 msgstr "arbedydd Sgrîn"
 
 #. i18n: file: screensaver.ui:207
 #. i18n: ectx: property (whatsThis), widget (KPushButton, mTestBt)
-#: rc.cpp:33 rc.cpp:80
+#: rc.cpp:35
 msgid "Show a full screen preview of the screen saver."
 msgstr ""
 
 #. i18n: file: screensaver.ui:210
 #. i18n: ectx: property (text), widget (KPushButton, mTestBt)
-#: rc.cpp:36 rc.cpp:83
+#: rc.cpp:38
 msgid "&Test"
 msgstr "&Profi"
 
 #. i18n: file: screensaver.ui:220
 #. i18n: ectx: property (whatsThis), widget (KPushButton, mSetupBt)
-#: rc.cpp:39 rc.cpp:86
+#: rc.cpp:41
 msgid "Configure the screen saver's options, if any."
 msgstr ""
 
 #. i18n: file: screensaver.ui:223
 #. i18n: ectx: property (text), widget (KPushButton, mSetupBt)
-#: rc.cpp:42 rc.cpp:89
+#: rc.cpp:44
 msgid "&Setup..."
 msgstr "&Gosod..."
 
 #. i18n: file: screensaver.ui:230
 #. i18n: ectx: property (whatsThis), widget (QTreeWidget, mSaverListView)
-#: rc.cpp:45 rc.cpp:92
+#: rc.cpp:47
 msgid "Select the screen saver to use."
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmshell.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmshell.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmshell.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmshell.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,69 +7,69 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2011-06-23 23:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:13+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: main.cpp:161
+#: main.cpp:168
 msgid "KDE Control Module"
 msgstr "Modiwl Reoli KDE"
 
-#: main.cpp:163
+#: main.cpp:170
 msgid "A tool to start single KDE control modules"
 msgstr "Erfyn i gychwyn modiylau rheoli unigol KDE."
 
-#: main.cpp:165
+#: main.cpp:172
 msgid "(c) 1999-2004, The KDE Developers"
 msgstr ""
 
-#: main.cpp:167
+#: main.cpp:174
 msgid "Frans Englich"
 msgstr "Frans Englich"
 
-#: main.cpp:167
+#: main.cpp:174
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: main.cpp:168
+#: main.cpp:175
 msgid "Daniel Molkentin"
 msgstr "Daniel Molkentin"
 
-#: main.cpp:169
+#: main.cpp:176
 msgid "Matthias Hoelzer-Kluepfel"
 msgstr "Matthias Hoelzer-Kluepfel"
 
-#: main.cpp:170
+#: main.cpp:177
 msgid "Matthias Elter"
 msgstr "Matthias Elter"
 
-#: main.cpp:171
+#: main.cpp:178
 msgid "Matthias Ettrich"
 msgstr "Matthias Ettrich"
 
-#: main.cpp:172
+#: main.cpp:179
 msgid "Waldo Bastian"
 msgstr "Waldo Bastian"
 
-#: main.cpp:177
+#: main.cpp:184
 msgid "List all possible modules"
 msgstr "Rhestri pob modiwl posib"
 
-#: main.cpp:178
+#: main.cpp:185
 msgid "Configuration module to open"
 msgstr "Modiwl ffurfweddu i'w agor"
 
-#: main.cpp:179
+#: main.cpp:186
 msgid "Specify a particular language"
 msgstr "Penodi iaith benodol"
 
-#: main.cpp:180
+#: main.cpp:187
 msgid "Do not display main window"
 msgstr "Peidio â dangos prif ffenestr"
 
@@ -77,15 +77,15 @@
 msgid "Arguments for the module"
 msgstr ""
 
-#: main.cpp:193
+#: main.cpp:201
 msgid "The following modules are available:"
 msgstr "Mae'r modiylau dilynnol ar gael:"
 
-#: main.cpp:212
+#: main.cpp:220
 msgid "No description available"
 msgstr "Dim disgrifiad ar gael"
 
-#: main.cpp:251
+#: main.cpp:252
 #, kde-format
 msgid ""
 "Could not find module '%1'. See kcmshell4 --list for the full list of "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmsmartcard.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmsmartcard.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmsmartcard.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmsmartcard.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,42 +7,42 @@
 msgstr ""
 "Project-Id-Version: kcmsmartcard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:13+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:46+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: rc.cpp:55
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Owain Green ar gyfer KGyfieithu, ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:56
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: nosmartcardbase.ui:24
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:3 rc.cpp:59
+#: rc.cpp:5
 msgid "<b>Unable to contact the KDE smartcard service.</b>"
 msgstr "<b>Methu cysylltu â gwasanaeth cerdyn deallus KDE.</b>"
 
 #. i18n: file: nosmartcardbase.ui:35
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:6 rc.cpp:62
+#: rc.cpp:8
 msgid "Possible Reasons"
 msgstr "Rhesymau Posib"
 
 #. i18n: file: nosmartcardbase.ui:49
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:9 rc.cpp:65
+#: rc.cpp:11
 msgid ""
 "\n"
 "1) The KDE daemon, 'kded' is not running. You can restart it by running the "
@@ -55,25 +55,25 @@
 
 #. i18n: file: smartcardbase.ui:31
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:15 rc.cpp:71
+#: rc.cpp:17
 msgid "Smartcard Support"
 msgstr "Cynhaliaeth Cardiau Deallus"
 
 #. i18n: file: smartcardbase.ui:42
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:18 rc.cpp:74
+#: rc.cpp:20
 msgid "&Enable smartcard support"
 msgstr "&Galluogi cynhaliaeth cardiau deallus"
 
 #. i18n: file: smartcardbase.ui:61
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:21 rc.cpp:77
+#: rc.cpp:23
 msgid "Enable &polling to autodetect card events"
 msgstr "Galluogi &gofyn i ganfod digwyddiadau cerdyn yn ymysgogol"
 
 #. i18n: file: smartcardbase.ui:64
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:24 rc.cpp:80
+#: rc.cpp:26
 msgid ""
 "In most cases you should have this enabled. It allows KDE to automatically "
 "detect card insertion and reader hotplug events."
@@ -83,7 +83,7 @@
 
 #. i18n: file: smartcardbase.ui:92
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:27 rc.cpp:83
+#: rc.cpp:29
 msgid "Automatically &launch card manager if inserted card is unclaimed"
 msgstr ""
 "&Cychwyn trefnydd cardiau'n ymysgogol os yw'r cerdyn mewnosodedig heb ei "
@@ -91,7 +91,7 @@
 
 #. i18n: file: smartcardbase.ui:95
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:30 rc.cpp:86
+#: rc.cpp:32
 msgid ""
 "When you insert a smartcard, KDE can automatically launch a management tool "
 "if no other application attempts to use the card."
@@ -101,49 +101,49 @@
 
 #. i18n: file: smartcardbase.ui:106
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:33 rc.cpp:89
+#: rc.cpp:35
 msgid "&Beep on card insert and removal"
 msgstr "&Blîpio ar fewnosodir neu waredu cerdyn"
 
 #. i18n: file: smartcardbase.ui:135
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:36 rc.cpp:92
+#: rc.cpp:38
 msgid "Readers"
 msgstr "Darllenyddion"
 
 #. i18n: file: smartcardbase.ui:152
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:39 rc.cpp:95
+#: rc.cpp:41
 msgid "Reader"
 msgstr "Darllenydd"
 
 #. i18n: file: smartcardbase.ui:163
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:42 rc.cpp:98
+#: rc.cpp:44
 msgid "Type"
 msgstr "Math"
 
 #. i18n: file: smartcardbase.ui:174
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:45 rc.cpp:101
+#: rc.cpp:47
 msgid "Subtype"
 msgstr "Isfath"
 
 #. i18n: file: smartcardbase.ui:185
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:48 rc.cpp:104
+#: rc.cpp:50
 msgid "SubSubtype"
 msgstr "IsIsfath"
 
 #. i18n: file: smartcardbase.ui:228
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:51 rc.cpp:107
+#: rc.cpp:53
 msgid "PCSCLite Configuration"
 msgstr "Ffurfwedd PCSCLite"
 
 #. i18n: file: smartcardbase.ui:251
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:54 rc.cpp:110
+#: rc.cpp:56
 msgid ""
 "To add new readers you have to modify /etc/readers.conf file and re-start "
 "pcscd"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmsmserver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmsmserver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmsmserver.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmsmserver.po	2012-04-18 08:59:38.000000000 +0000
@@ -8,15 +8,15 @@
 msgstr ""
 "Project-Id-Version: kcmsmserver\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:09+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:02+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmsmserver.cpp:52
 msgid ""
@@ -33,13 +33,13 @@
 
 #. i18n: file: smserverconfigdlg.ui:17
 #. i18n: ectx: property (title), widget (QGroupBox, topBox)
-#: rc.cpp:3 rc.cpp:55
+#: rc.cpp:3
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file: smserverconfigdlg.ui:23
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, confirmLogoutCheck)
-#: rc.cpp:6 rc.cpp:58
+#: rc.cpp:6
 msgid ""
 "Check this option if you want the session manager to display a logout "
 "confirmation dialog box."
@@ -49,19 +49,19 @@
 
 #. i18n: file: smserverconfigdlg.ui:26
 #. i18n: ectx: property (text), widget (QCheckBox, confirmLogoutCheck)
-#: rc.cpp:9 rc.cpp:61
+#: rc.cpp:9
 msgid "Conf&irm logout"
 msgstr "Cadarn&hau allgofnodi"
 
 #. i18n: file: smserverconfigdlg.ui:33
 #. i18n: ectx: property (text), widget (QCheckBox, offerShutdownCheck)
-#: rc.cpp:12 rc.cpp:64
+#: rc.cpp:12
 msgid "O&ffer shutdown options"
 msgstr "C&ynnig dewisiadau cau i lawr"
 
 #. i18n: file: smserverconfigdlg.ui:43
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, sdGroup)
-#: rc.cpp:15 rc.cpp:67
+#: rc.cpp:15
 msgid ""
 "Here you can choose what should happen by default when you log out. This "
 "only has meaning, if you logged in through KDM."
@@ -71,31 +71,31 @@
 
 #. i18n: file: smserverconfigdlg.ui:46
 #. i18n: ectx: property (title), widget (QGroupBox, sdGroup)
-#: rc.cpp:18 rc.cpp:70
+#: rc.cpp:18
 msgid "Default Leave Option"
 msgstr ""
 
 #. i18n: file: smserverconfigdlg.ui:52
 #. i18n: ectx: property (text), widget (QRadioButton, logoutRadio)
-#: rc.cpp:21 rc.cpp:73
+#: rc.cpp:21
 msgid "&End current session"
 msgstr "&Terfynu y sesiwn cyfredol"
 
 #. i18n: file: smserverconfigdlg.ui:59
 #. i18n: ectx: property (text), widget (QRadioButton, haltRadio)
-#: rc.cpp:24 rc.cpp:76
+#: rc.cpp:24
 msgid "&Turn off computer"
 msgstr "&Cau'r cyfrifiadur i lawr"
 
 #. i18n: file: smserverconfigdlg.ui:66
 #. i18n: ectx: property (text), widget (QRadioButton, rebootRadio)
-#: rc.cpp:27 rc.cpp:79
+#: rc.cpp:27
 msgid "&Restart computer"
 msgstr "&Ail-gychwyn y cyfrifiadur"
 
 #. i18n: file: smserverconfigdlg.ui:80
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, loginGroup)
-#: rc.cpp:30 rc.cpp:82
+#: rc.cpp:30
 msgid ""
 "<ul>\n"
 "<li><b>Restore previous session:</b> Will save all applications running on "
@@ -120,37 +120,37 @@
 
 #. i18n: file: smserverconfigdlg.ui:83
 #. i18n: ectx: property (title), widget (QGroupBox, loginGroup)
-#: rc.cpp:37 rc.cpp:89
+#: rc.cpp:37
 msgid "On Login"
 msgstr "Ar Fewngofnodi"
 
 #. i18n: file: smserverconfigdlg.ui:89
 #. i18n: ectx: property (text), widget (QRadioButton, previousSessionRadio)
-#: rc.cpp:40 rc.cpp:92
+#: rc.cpp:40
 msgid "Restore &previous session"
 msgstr "Adfer y sesiwn &cynt"
 
 #. i18n: file: smserverconfigdlg.ui:96
 #. i18n: ectx: property (text), widget (QRadioButton, savedSessionRadio)
-#: rc.cpp:43 rc.cpp:95
+#: rc.cpp:43
 msgid "Restore &manually saved session"
 msgstr "Adfer sesiwn a &gadwyd â llaw."
 
 #. i18n: file: smserverconfigdlg.ui:103
 #. i18n: ectx: property (text), widget (QRadioButton, emptySessionRadio)
-#: rc.cpp:46 rc.cpp:98
+#: rc.cpp:46
 msgid "Start with an empty &session"
 msgstr "Cychwyn efo sesiwn g&wag"
 
 #. i18n: file: smserverconfigdlg.ui:110
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:49 rc.cpp:101
+#: rc.cpp:49
 msgid "Applications to be e&xcluded from sessions:"
 msgstr "Cymhwysiadau i'w gwa&hardd o sesiynau:"
 
 #. i18n: file: smserverconfigdlg.ui:123
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, excludeLineedit)
-#: rc.cpp:52 rc.cpp:104
+#: rc.cpp:52
 msgid ""
 "Here you can enter a colon or comma separated list of applications that "
 "should not be saved in sessions, and therefore will not be started when "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmstyle.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmstyle.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmstyle.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmstyle.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: kcmstyle\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:12+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:43+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:02+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmstyle.cpp:165
 msgid ""
@@ -177,43 +177,43 @@
 "If you enable this option, KDE Applications will run internal animations."
 msgstr ""
 
-#: rc.cpp:67
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD, ,Launchpad Contributions:"
 
-#: rc.cpp:68
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: finetuning.ui:17
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:3 rc.cpp:71
+#: rc.cpp:5
 msgid "Graphical effects:"
 msgstr ""
 
 #. i18n: file: finetuning.ui:43
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:6 rc.cpp:74
+#: rc.cpp:8
 msgid "Show icons on buttons:"
 msgstr ""
 
 #. i18n: file: finetuning.ui:63
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:9 rc.cpp:77
+#: rc.cpp:11
 msgid "Show icons in menus:"
 msgstr ""
 
 #. i18n: file: finetuning.ui:83
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:12 rc.cpp:80
+#: rc.cpp:14
 msgid "Toolbars"
 msgstr ""
 
 #. i18n: file: finetuning.ui:89
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:15 rc.cpp:83
+#: rc.cpp:17
 msgid "Main toolbar text:"
 msgstr ""
 
@@ -221,11 +221,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
 #. i18n: file: finetuning.ui:140
 #. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#. i18n: file: finetuning.ui:103
-#. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
-#. i18n: file: finetuning.ui:140
-#. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#: rc.cpp:18 rc.cpp:33 rc.cpp:86 rc.cpp:101
+#: rc.cpp:20 rc.cpp:35
 msgid "No Text"
 msgstr ""
 
@@ -233,11 +229,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
 #. i18n: file: finetuning.ui:145
 #. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#. i18n: file: finetuning.ui:108
-#. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
-#. i18n: file: finetuning.ui:145
-#. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#: rc.cpp:21 rc.cpp:36 rc.cpp:89 rc.cpp:104
+#: rc.cpp:23 rc.cpp:38
 msgid "Text Only"
 msgstr "Testun yn Unig"
 
@@ -245,11 +237,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
 #. i18n: file: finetuning.ui:150
 #. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#. i18n: file: finetuning.ui:113
-#. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
-#. i18n: file: finetuning.ui:150
-#. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#: rc.cpp:24 rc.cpp:39 rc.cpp:92 rc.cpp:107
+#: rc.cpp:26 rc.cpp:41
 msgid "Text Beside Icons"
 msgstr ""
 
@@ -257,29 +245,25 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
 #. i18n: file: finetuning.ui:155
 #. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#. i18n: file: finetuning.ui:118
-#. i18n: ectx: property (text), item, widget (KComboBox, comboToolbarIcons)
-#. i18n: file: finetuning.ui:155
-#. i18n: ectx: property (text), item, widget (KComboBox, comboSecondaryToolbarIcons)
-#: rc.cpp:27 rc.cpp:42 rc.cpp:95 rc.cpp:110
+#: rc.cpp:29 rc.cpp:44
 msgid "Text Below Icons"
 msgstr ""
 
 #. i18n: file: finetuning.ui:126
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:30 rc.cpp:98
+#: rc.cpp:32
 msgid "Secondary toolbar text:"
 msgstr ""
 
 #. i18n: file: stylepreview.ui:19
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:45 rc.cpp:113
+#: rc.cpp:47
 msgid "Tab 1"
 msgstr "Tab 1"
 
 #. i18n: file: stylepreview.ui:29
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:48 rc.cpp:116
+#: rc.cpp:50
 msgid "Group Box"
 msgstr ""
 
@@ -287,35 +271,31 @@
 #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1)
 #. i18n: file: stylepreview.ui:45
 #. i18n: ectx: property (text), widget (QRadioButton, RadioButton2)
-#. i18n: file: stylepreview.ui:35
-#. i18n: ectx: property (text), widget (QRadioButton, RadioButton1)
-#. i18n: file: stylepreview.ui:45
-#. i18n: ectx: property (text), widget (QRadioButton, RadioButton2)
-#: rc.cpp:51 rc.cpp:54 rc.cpp:119 rc.cpp:122
+#: rc.cpp:53 rc.cpp:56
 msgid "Radio button"
 msgstr "Botwm radio"
 
 #. i18n: file: stylepreview.ui:62
 #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1)
-#: rc.cpp:57 rc.cpp:125
+#: rc.cpp:59
 msgid "Checkbox"
 msgstr "Blwch brith"
 
 #. i18n: file: stylepreview.ui:115
 #. i18n: ectx: property (text), widget (QPushButton, PushButton1)
-#: rc.cpp:60 rc.cpp:128
+#: rc.cpp:62
 msgid "Button"
 msgstr "Botwm"
 
 #. i18n: file: stylepreview.ui:125
 #. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1)
-#: rc.cpp:63 rc.cpp:131
+#: rc.cpp:65
 msgid "Combobox"
 msgstr "Blwch Cyfunol"
 
 #. i18n: file: stylepreview.ui:155
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:66 rc.cpp:134
+#: rc.cpp:68
 msgid "Tab 2"
 msgstr "Tab 2"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmusb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmusb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmusb.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmusb.po	2012-04-18 08:59:38.000000000 +0000
@@ -10,15 +10,15 @@
 msgstr ""
 "Project-Id-Version: kcmusb\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:07+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:42+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmusb.cpp:39
 msgid ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmview1394.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmview1394.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmview1394.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmview1394.po	2012-04-18 08:59:38.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kcmview1394\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:10+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: view1394widget.ui:20
 #. i18n: ectx: property (text), widget (QTreeWidget, m_listview)
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmxinerama.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmxinerama.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcmxinerama.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcmxinerama.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kcmxinerama\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:03+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:38+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:32+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcmxinerama.cpp:55
 msgid "kcmxinerama"
@@ -50,114 +50,109 @@
 msgid "Display Containing the Pointer"
 msgstr "Dangosydd sy'n Cynnwys y Pwyntydd"
 
-#: kcmxinerama.cpp:116
+#: kcmxinerama.cpp:121
 msgid ""
-"<qt><p>This module is only for configuring systems with a single desktop "
-"spread across multiple monitors. You do not appear to have this "
-"configuration.</p></qt>"
-msgstr ""
-"<qt><p>Ar gyfer ffurfweddu cysawdau âg un penbwrdd wedi'i daenu ar draws "
-"sawl dangosydd yw'r modwl hwn yn unig. Ni ymddengys fod gennych y ffurfwedd "
-"yma.</p></qt>"
+"You do not appear to have a single desktop spread across multiple monitors."
+msgstr ""
 
-#: kcmxinerama.cpp:180
+#: kcmxinerama.cpp:190
 msgid "Some settings may affect only newly started applications."
 msgstr ""
 
-#: kcmxinerama.cpp:180
+#: kcmxinerama.cpp:190
 msgid "KDE Multiple Monitors"
 msgstr "Aml Ddangosyddion KDE"
 
-#: rc.cpp:43
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green ar ran KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:44
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: xineramawidget.ui:17
 #. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup1)
-#: rc.cpp:3 rc.cpp:47
+#: rc.cpp:5
 msgid "Multiple Monitor Support"
 msgstr "Cynhaliaeth Aml Ddangosydd"
 
 #. i18n: file: xineramawidget.ui:23
 #. i18n: ectx: property (text), widget (QCheckBox, _enableXinerama)
-#: rc.cpp:6 rc.cpp:50
+#: rc.cpp:8
 msgid "Enable multiple monitor virtual desktop support"
 msgstr "Galluogi cynhaliaeth rhith-benbwrdd aml ddangosydd"
 
 #. i18n: file: xineramawidget.ui:33
 #. i18n: ectx: property (text), widget (QCheckBox, _enableResistance)
-#: rc.cpp:9 rc.cpp:53
+#: rc.cpp:11
 msgid "Enable multiple monitor window resistance support"
 msgstr "Galluogi cynhaliaeth gwrthiant ffenestri aml ddangosydd"
 
 #. i18n: file: xineramawidget.ui:43
 #. i18n: ectx: property (text), widget (QCheckBox, _enablePlacement)
-#: rc.cpp:12 rc.cpp:56
+#: rc.cpp:14
 msgid "Enable multiple monitor window placement support"
 msgstr "Galluogi cynhaliaeth lleoli ffenestri aml ddangosydd"
 
 #. i18n: file: xineramawidget.ui:53
 #. i18n: ectx: property (text), widget (QCheckBox, _enableMaximize)
-#: rc.cpp:15 rc.cpp:59
+#: rc.cpp:17
 msgid "Enable multiple monitor window maximize support"
 msgstr "Galluogi cynhaliaeth ehangu ffenestri aml ddangosydd"
 
 #. i18n: file: xineramawidget.ui:63
 #. i18n: ectx: property (text), widget (QCheckBox, _enableFullscreen)
-#: rc.cpp:18 rc.cpp:62
+#: rc.cpp:20
 msgid "Enable multiple monitor window fullscreen support"
 msgstr "Galluogi cynhaliaeth sgrin lawn ar gyfer ffenestri aml ddangosydd"
 
 #. i18n: file: xineramawidget.ui:92
 #. i18n: ectx: property (text), widget (QTableWidget, headTable)
-#: rc.cpp:21 rc.cpp:65
+#: rc.cpp:23
 msgid "1"
 msgstr ""
 
 #. i18n: file: xineramawidget.ui:97
 #. i18n: ectx: property (text), widget (QTableWidget, headTable)
-#: rc.cpp:24 rc.cpp:68
+#: rc.cpp:26
 msgid "2"
 msgstr ""
 
 #. i18n: file: xineramawidget.ui:102
 #. i18n: ectx: property (text), widget (QTableWidget, headTable)
-#: rc.cpp:27 rc.cpp:71
+#: rc.cpp:29
 msgid "X Coordinate"
 msgstr "Cyfesuryn X"
 
 #. i18n: file: xineramawidget.ui:107
 #. i18n: ectx: property (text), widget (QTableWidget, headTable)
-#: rc.cpp:30 rc.cpp:74
+#: rc.cpp:32
 msgid "Y Coordinate"
 msgstr "Cyfesuryn Y"
 
 #. i18n: file: xineramawidget.ui:112
 #. i18n: ectx: property (text), widget (QTableWidget, headTable)
-#: rc.cpp:33 rc.cpp:77
+#: rc.cpp:35
 msgid "Width"
 msgstr ""
 
 #. i18n: file: xineramawidget.ui:117
 #. i18n: ectx: property (text), widget (QTableWidget, headTable)
-#: rc.cpp:36 rc.cpp:80
+#: rc.cpp:38
 msgid "Height"
 msgstr ""
 
 #. i18n: file: xineramawidget.ui:133
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:39 rc.cpp:83
+#: rc.cpp:41
 msgid "Show unmanaged windows on:"
 msgstr "Dangos ffenestri anhrefnedig ar:"
 
 #. i18n: file: xineramawidget.ui:170
 #. i18n: ectx: property (text), widget (QPushButton, _identify)
-#: rc.cpp:42 rc.cpp:86
+#: rc.cpp:44
 msgid "&Identify All Displays"
 msgstr "&Dynodi Pob Dangosydd"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcolorchooser.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcolorchooser.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcolorchooser.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcolorchooser.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,37 +7,37 @@
 msgstr ""
 "Project-Id-Version: kdegraphics\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 14:21+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-01 11:14+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:26+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kcolorchooser.cpp:34
+#: kcolorchooser.cpp:38
 msgid "KDE Color Chooser"
 msgstr ""
 
-#: kcolorchooser.cpp:41
+#: kcolorchooser.cpp:45
 msgid "KColorChooser"
 msgstr ""
 
-#: kcolorchooser.cpp:43
+#: kcolorchooser.cpp:47
 msgid "(c) 2000, Waldo Bastian"
 msgstr "(c) 2000, Waldo Bastian"
 
-#: kcolorchooser.cpp:44
+#: kcolorchooser.cpp:48
 msgid "Waldo Bastian"
 msgstr "Waldo Bastian"
 
-#: kcolorchooser.cpp:48
+#: kcolorchooser.cpp:53
 msgid "Print the selected color to stdout"
 msgstr ""
 
-#: kcolorchooser.cpp:51
+#: kcolorchooser.cpp:54
 msgid "Set initially selected color"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcron.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcron.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kcron.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kcron.po	2012-04-18 08:59:22.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kcron\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 02:38+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:20+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -15,821 +15,821 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:40+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: src/kcmCron.cpp:75
-msgid "Task Scheduler"
-msgstr "Trefnlennydd Tasgau"
-
-#: src/kcmCron.cpp:76
-msgid "KDE Task Scheduler"
-msgstr "Trefnlennydd Tasgau KDE"
-
-#: src/kcmCron.cpp:76
-msgid ""
-"(c) 2008, Nicolas Ternisien\n"
-"(c) 1999-2000, Gary Meyer"
-msgstr ""
-
-#: src/kcmCron.cpp:78
-msgid "Nicolas Ternisien"
+#: src/crontablib/cttask.cpp:240
+msgid "At system startup"
 msgstr ""
 
-#: src/kcmCron.cpp:79
-msgid "Gary Meyer"
+#: src/crontablib/cttask.cpp:247
+#, kde-format
+msgctxt "1:Time Description, 2:Date Description"
+msgid "%1, %2"
 msgstr ""
 
-#: src/kcmCron.cpp:80
-msgid "Robert Berry"
+#: src/crontablib/cttask.cpp:251
+#, kde-format
+msgctxt "Every 'days of week'"
+msgid "every %1"
 msgstr ""
 
-#: src/kcmCron.cpp:81
-msgid "James Ots"
+#: src/crontablib/cttask.cpp:255
+#, kde-format
+msgctxt "'Days of month' of 'Months'"
+msgid "%1 of %2"
 msgstr ""
 
-#: src/kcmCron.cpp:82
-msgid "Alberto G. Hierro"
-msgstr ""
+#: src/crontablib/cttask.cpp:266 src/crontablib/ctdow.cpp:44
+#: src/crontablib/ctdom.cpp:23
+msgid "every day "
+msgstr "bob diwrnod "
 
-#: src/kcmCron.cpp:91
+#: src/crontablib/cttask.cpp:277
 #, kde-format
-msgid ""
-"The following error occurred while initializing KCron:\n"
-"\n"
-"%1\n"
-"\n"
-"KCron will now exit.\n"
+msgctxt "1:Day of month, 2:Day of week"
+msgid "%1 as well as %2"
 msgstr ""
-"Digwyddodd y gwall dilynnol wrth ymgychwyn KCron:\n"
-"\n"
-"%1\n"
-"\n"
-"Bydd KCron yn terfynu rwan.\n"
 
-#: src/kcmCron.cpp:158
-msgid ""
-"You can use this application to schedule programs to run in the background.\n"
-"To schedule a new task now, click on the Tasks folder and select Edit/New "
-"from the menu."
+#: src/crontablib/cttask.cpp:307
+#, kde-format
+msgctxt "1:Hour, 2:Minute"
+msgid "%1:%2"
 msgstr ""
-"Gallwch ddefnyddio'r cymhwysiad yma i drefnlennu rhaglenni i redeg yn y "
-"cefndir.\n"
-"I drefnlennu tasg newydd rwan, cliciwch ar y blygell Tasgau a dewis "
-"Golygu/Newydd o'r ddewislen."
-
-#: src/kcmCron.cpp:158
-msgid "Welcome to the Task Scheduler"
-msgstr "Croeso i'r Trefnlennydd Tasgau"
-
-#: src/crontabPrinter.cpp:125
-msgid "Scheduled Tasks"
-msgstr "Tasgau Trefnlenedig"
 
-#: src/crontabPrinter.cpp:140 src/tasksWidget.cpp:243
-msgid "Scheduling"
-msgstr ""
+#: src/crontablib/cttask.cpp:316
+msgid ", and "
+msgstr ", a "
 
-#: src/crontabPrinter.cpp:140 src/tasksWidget.cpp:245
-msgid "Command"
-msgstr ""
+#: src/crontablib/cttask.cpp:318 src/crontablib/ctunit.cpp:173
+msgid " and "
+msgstr " a "
 
-#: src/crontabPrinter.cpp:140 src/tasksWidget.cpp:247
-msgid "Description"
-msgstr "Disgrifiad"
+#: src/crontablib/cttask.cpp:321 src/crontablib/ctunit.cpp:176
+msgid ", "
+msgstr ", "
 
-#: src/crontabPrinter.cpp:164
-msgid "Environment Variables"
+#: src/crontablib/cttask.cpp:329
+#, kde-format
+msgctxt "Hour::Minute list"
+msgid "At %1"
 msgstr ""
 
-#: src/crontabPrinter.cpp:187 src/crontablib/ctSystemCron.cpp:53
-msgid "System Crontab"
-msgstr ""
+#: src/crontablib/cttask.cpp:337
+#, kde-format
+msgid "Every minute"
+msgid_plural "Every %1 minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/crontabPrinter.cpp:189
-msgid "All Users Crontabs"
+#: src/crontablib/ctHelper.cpp:22
+msgid "No comment"
 msgstr ""
 
-#: src/crontabPrinter.cpp:191
-#, kde-format
-msgctxt "Crontab of user login"
-msgid "Crontab of user %1"
-msgstr ""
+#: src/crontablib/ctvariable.cpp:126
+msgid "Override default home folder."
+msgstr "Anwybyddu'r blygell gartref ragosod."
 
-#: src/variablesWidget.cpp:48
-msgid "<b>Environment Variables</b>"
-msgstr ""
+#: src/crontablib/ctvariable.cpp:129
+msgid "Email output to specified account."
+msgstr "Ebostio'r allbwn i gyfrif penodol."
 
-#: src/variablesWidget.cpp:83
-msgid "Modify Variable"
-msgstr "Addasu Newidyn"
+#: src/crontablib/ctvariable.cpp:132
+msgid "Override default shell."
+msgstr "Anwybyddu'r plisgyn rhagosod."
 
-#: src/variablesWidget.cpp:159
-msgid "New Variable"
-msgstr ""
+#: src/crontablib/ctvariable.cpp:135
+msgid "Folders to search for program files."
+msgstr "Plygyll i'w chwilio ar gyfer ffeiliau rhaglen."
 
-#: src/variablesWidget.cpp:197 src/tasksWidget.cpp:240
-msgid "User"
+#: src/crontablib/ctvariable.cpp:138
+msgid "Dynamic libraries location."
 msgstr ""
 
-#: src/variablesWidget.cpp:200
-msgid "Variable"
+#: src/crontablib/ctvariable.cpp:141
+msgid "Local Variable"
 msgstr ""
 
-#: src/variablesWidget.cpp:201
-msgid "Value"
-msgstr "Gwerth"
-
-#: src/variablesWidget.cpp:202 src/tasksWidget.cpp:246
-msgid "Status"
+#: src/crontablib/ctGlobalCron.cpp:39
+msgid "All users"
 msgstr ""
 
-#: src/variablesWidget.cpp:203
-msgid "Comment"
+#: src/crontablib/cthost.cpp:60
+msgid ""
+"You have been blocked from using KCron\t                      by either the "
+"/etc/cron.allow file or the /etc/cron.deny file.\t                      \n"
+"\n"
+"Check the crontab man page for further details."
 msgstr ""
 
-#: src/variablesWidget.cpp:218
-msgctxt "Adds a new variable"
-msgid "New &Variable..."
+#: src/crontablib/cthost.cpp:142
+#, kde-format
+msgctxt "User login: errorMessage"
+msgid "User %1: %2"
 msgstr ""
 
-#: src/variablesWidget.cpp:219
-msgid "Create a new variable."
-msgstr ""
+#: src/crontablib/ctunit.cpp:172
+msgid ","
+msgstr ","
 
-#: src/variablesWidget.cpp:223 src/tasksWidget.cpp:277
-msgid "M&odify..."
-msgstr "&Addasu..."
+#: src/crontablib/ctdow.cpp:56
+msgid "Mon"
+msgstr "Llun"
 
-#: src/variablesWidget.cpp:225
-msgid "Modify the selected variable."
-msgstr ""
+#: src/crontablib/ctdow.cpp:56
+msgid "Tue"
+msgstr "Maw"
 
-#: src/variablesWidget.cpp:229 src/tasksWidget.cpp:283
-msgid "&Delete"
-msgstr ""
+#: src/crontablib/ctdow.cpp:56
+msgid "Wed"
+msgstr "Mer"
 
-#: src/variablesWidget.cpp:231
-msgid "Delete the selected variable."
-msgstr ""
+#: src/crontablib/ctdow.cpp:56
+msgid "Thu"
+msgstr "Iau"
 
-#: src/crontabPrinterWidget.cpp:24
-msgid "Cron Options"
-msgstr "Dewisiadau Cron"
+#: src/crontablib/ctdow.cpp:56
+msgid "Fri"
+msgstr "Gwe"
 
-#: src/crontabPrinterWidget.cpp:30
-msgid "Print cron&tab"
-msgstr "Argraffu cron&tab"
+#: src/crontablib/ctdow.cpp:56
+msgid "Sat"
+msgstr "Sad"
 
-#: src/crontabPrinterWidget.cpp:34
-msgid "Print &all users"
-msgstr "Argraffu p&ob defnyddiwr"
+#: src/crontablib/ctdow.cpp:56
+msgid "Sun"
+msgstr "Sul"
 
-#: src/crontabWidget.cpp:164
-msgid "Show the following Cron:"
+#: src/crontablib/ctdow.cpp:58
+msgid "Monday"
 msgstr ""
 
-#: src/crontabWidget.cpp:168
-msgid "Personal Cron"
+#: src/crontablib/ctdow.cpp:58
+msgid "Tuesday"
 msgstr ""
 
-#: src/crontabWidget.cpp:173
-msgid "System Cron"
+#: src/crontablib/ctdow.cpp:58
+msgid "Wednesday"
 msgstr ""
 
-#: src/crontabWidget.cpp:177
-msgid "Cron of User:"
+#: src/crontablib/ctdow.cpp:58
+msgid "Thursday"
 msgstr ""
 
-#: src/crontabWidget.cpp:200
-msgid "Show All Personal Crons"
+#: src/crontablib/ctdow.cpp:58
+msgid "Friday"
 msgstr ""
 
-#: src/variableWidget.cpp:44 src/taskWidget.cpp:49
-msgid "Enabled"
+#: src/crontablib/ctdow.cpp:58
+msgid "Saturday"
 msgstr ""
 
-#: src/variableWidget.cpp:48 src/taskWidget.cpp:52
-msgid "Disabled"
-msgstr "Analluogir"
-
-#: src/tasksWidget.cpp:57
-msgid "<b>Scheduled Tasks</b>"
+#: src/crontablib/ctdow.cpp:58
+msgid "Sunday"
 msgstr ""
 
-#: src/tasksWidget.cpp:111
-msgctxt "Do not use any quote characters (') in this string"
-msgid "End of script execution. Type Enter or Ctrl+C to exit."
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "1st"
+msgstr "1af"
 
-#: src/tasksWidget.cpp:144
-msgid "New Task"
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "2nd"
+msgstr "2il"
 
-#: src/tasksWidget.cpp:180
-msgid "Modify Task"
-msgstr "Addasu Tasg"
+#: src/crontablib/ctdom.cpp:33
+msgid "3rd"
+msgstr "3ydd"
 
-#: src/tasksWidget.cpp:248
-msgid "Scheduling Details"
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "4th"
+msgstr "4ydd"
 
-#: src/tasksWidget.cpp:272
-msgctxt "Adds a new task"
-msgid "New &Task..."
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "5th"
+msgstr "5ed"
 
-#: src/tasksWidget.cpp:273
-msgid "Create a new task."
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "6th"
+msgstr "6ed"
 
-#: src/tasksWidget.cpp:279
-msgid "Modify the selected task."
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "7th"
+msgstr "7ed"
 
-#: src/tasksWidget.cpp:285
-msgid "Delete the selected task."
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "8th"
+msgstr "8ed"
 
-#: src/tasksWidget.cpp:289
-msgid "&Run Now"
-msgstr "&Rhedeg Rwan"
+#: src/crontablib/ctdom.cpp:33
+msgid "9th"
+msgstr "9ed"
 
-#: src/tasksWidget.cpp:291
-msgid "Run the selected task now."
-msgstr "Rhedeg y dasg benodol rwan."
+#: src/crontablib/ctdom.cpp:33
+msgid "10th"
+msgstr "10ed"
 
-#: src/variableEditorDialog.cpp:60
-msgid "Add or modify a variable"
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "11th"
+msgstr "11ed"
 
-#: src/variableEditorDialog.cpp:64
-msgctxt "The environmental variable name ie HOME, MAILTO etc"
-msgid "&Variable:"
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "12th"
+msgstr "12ed"
 
-#: src/variableEditorDialog.cpp:93
-msgid "Va&lue:"
-msgstr "G&werth:"
+#: src/crontablib/ctdom.cpp:33
+msgid "13th"
+msgstr "13ydd"
 
-#: src/variableEditorDialog.cpp:102 src/taskEditorDialog.cpp:106
-msgid "&Run as:"
-msgstr "&Rhedeg fel:"
+#: src/crontablib/ctdom.cpp:33
+msgid "14th"
+msgstr "14ydd"
 
-#: src/variableEditorDialog.cpp:120 src/taskEditorDialog.cpp:122
-msgid "Co&mment:"
-msgstr "S&ylwad:"
+#: src/crontablib/ctdom.cpp:33
+msgid "15th"
+msgstr "15ed"
 
-#: src/variableEditorDialog.cpp:128
-msgid "&Enable this variable"
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "16th"
+msgstr "16ed"
 
-#: src/variableEditorDialog.cpp:156
-msgid "<i>This variable will be used by scheduled tasks.</i>"
-msgstr ""
+#: src/crontablib/ctdom.cpp:33
+msgid "17th"
+msgstr "17ed"
 
-#: src/variableEditorDialog.cpp:200
-msgid "<i>This variable is disabled.</i>"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "18th"
+msgstr "18ed"
 
-#: src/variableEditorDialog.cpp:207
-msgid "<i>Please enter the variable name...</i>"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "19th"
+msgstr "19ed"
 
-#: src/variableEditorDialog.cpp:214
-msgid "<i>Please enter the variable value ...</i>"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "20th"
+msgstr "20ed"
 
-#: src/taskEditorDialog.cpp:76
-msgid "Add or modify a scheduled task"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "21st"
+msgstr "21ed"
 
-#: src/taskEditorDialog.cpp:77 src/taskEditorDialog.cpp:848
-msgid "<i>This task will be executed at the specified intervals.</i>"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "22nd"
+msgstr "22il"
 
-#: src/taskEditorDialog.cpp:86
-msgid "&Command:"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "23rd"
+msgstr "23ydd"
 
-#: src/taskEditorDialog.cpp:135
-msgid "&Enable this task"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "24th"
+msgstr "24ydd"
 
-#: src/taskEditorDialog.cpp:140
-msgid "Run at system &bootup"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "25th"
+msgstr "25ed"
 
-#: src/taskEditorDialog.cpp:146
-msgid "Run &every day"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "26th"
+msgstr "26ed"
 
-#: src/taskEditorDialog.cpp:248
-msgid "Days of Month"
-msgstr "Diwrnodau'r Mis"
+#: src/crontablib/ctdom.cpp:34
+msgid "27th"
+msgstr "27ed"
 
-#: src/taskEditorDialog.cpp:286
-msgid "Months"
-msgstr "Misoedd"
+#: src/crontablib/ctdom.cpp:34
+msgid "28th"
+msgstr "28ed"
 
-#: src/taskEditorDialog.cpp:323
-msgid "Days of Week"
-msgstr "Diwrnodau'r Wythnos"
+#: src/crontablib/ctdom.cpp:34
+msgid "29th"
+msgstr "29ed"
 
-#: src/taskEditorDialog.cpp:461
-msgid "Minutes"
-msgstr "Munudau"
+#: src/crontablib/ctdom.cpp:34
+msgid "30th"
+msgstr "30ed"
 
-#: src/taskEditorDialog.cpp:471
-msgid "Preselection:"
-msgstr ""
+#: src/crontablib/ctdom.cpp:34
+msgid "31st"
+msgstr "31ed"
 
-#: src/taskEditorDialog.cpp:478
-msgid "Clear selection"
-msgstr ""
+#: src/crontablib/ctcron.cpp:104
+#, kde-format
+msgid "No password entry found for uid '%1'"
+msgstr "Dim cofnod cyfrinair ar gael ar gyfer uid '%1'"
 
-#: src/taskEditorDialog.cpp:479
-msgid "Custom selection"
+#: src/crontablib/ctcron.cpp:241
+#, kde-format
+msgctxt "Generation Message + current date"
+msgid "File generated by KCron the %1."
 msgstr ""
 
-#: src/taskEditorDialog.cpp:480
-msgid "Each minute"
+#: src/crontablib/ctcron.cpp:279
+msgid "<em>No output.</em>"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:481
-msgid "Every 2 minutes"
+#: src/crontablib/ctcron.cpp:285
+msgid "<em>No error.</em>"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:482
-msgid "Every 5 minutes"
+#: src/crontablib/ctcron.cpp:291
+#, kde-format
+msgid ""
+"<p><strong>Command:</strong> %1</p><strong>Command could not be "
+"started</strong>"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:483
-msgid "Every 10 minutes"
+#: src/crontablib/ctcron.cpp:293
+#, kde-format
+msgid ""
+"<p><strong>Command:</strong> %1</p><strong>Standard Output "
+":</strong><pre>%2</pre><strong>Error Output :</strong><pre>%3</pre>"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:484
-msgid "Every 15 minutes"
-msgstr ""
+#: src/crontablib/ctcron.cpp:295
+msgid "An error occurred while updating crontab."
+msgstr "Digwyddodd gwall wrth ddiweddaru crontab."
 
-#: src/taskEditorDialog.cpp:485
-msgid "Every 20 minutes"
+#: src/crontablib/ctcron.cpp:302
+msgid "Unable to open crontab file for writing"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:486
-msgid "Every 30 minutes"
+#: src/crontablib/ctcron.cpp:302
+#, kde-format
+msgid "The file %1 could not be opened."
 msgstr ""
 
-#: src/taskEditorDialog.cpp:518
-msgid "Hours"
-msgstr "Oriau"
-
-#: src/taskEditorDialog.cpp:522
-msgid "AM:"
+#: src/crontablib/ctSystemCron.cpp:53 src/crontabPrinter.cpp:187
+msgid "System Crontab"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:539
-msgid "PM:"
+#: src/crontablib/ctmonth.cpp:23
+msgid "every month"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:705 src/taskEditorDialog.cpp:716
-msgid "<i>Please type a valid command line...</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "January"
+msgstr "Ionawr"
 
-#: src/taskEditorDialog.cpp:738
-msgid "<i>Please select an executable program...</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "February"
+msgstr "Chwefror"
 
-#: src/taskEditorDialog.cpp:746 src/taskEditorDialog.cpp:772
-msgid "<i>Please browse for a program to execute...</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "March"
+msgstr "Mawrth"
 
-#: src/taskEditorDialog.cpp:759
-msgid "<i>This task is disabled.</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "April"
+msgstr "Ebrill"
 
-#: src/taskEditorDialog.cpp:766
-msgid "<i>This task will be run on system bootup.</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgctxt "May long"
+msgid "May"
+msgstr "Mai"
 
-#: src/taskEditorDialog.cpp:791
-msgid "<i>Please select from the 'Months' section...</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "June"
+msgstr "Mehefin"
 
-#: src/taskEditorDialog.cpp:810
-msgid ""
-"<i>Please select from either the 'Days of Month' or the 'Days of Week' "
-"section...</i>"
+#: src/crontablib/ctmonth.cpp:33
+msgctxt "July long"
+msgid "July"
 msgstr ""
 
-#: src/taskEditorDialog.cpp:825
-msgid "<i>Please select from the 'Hours' section...</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "August"
+msgstr "Awst"
 
-#: src/taskEditorDialog.cpp:840
-msgid "<i>Please select from the 'Minutes' section...</i>"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "September"
+msgstr "Medi"
 
-#: src/taskEditorDialog.cpp:1047
-msgid "Set All"
-msgstr ""
+#: src/crontablib/ctmonth.cpp:33
+msgid "October"
+msgstr "Hydref"
 
-#: src/taskEditorDialog.cpp:1049
-msgid "Clear All"
+#: src/crontablib/ctmonth.cpp:33
+msgid "November"
+msgstr "Tachwedd"
+
+#: src/crontablib/ctmonth.cpp:33
+msgid "December"
+msgstr "Rhagfyr"
+
+#: src/variableWidget.cpp:44 src/taskWidget.cpp:49
+msgid "Enabled"
 msgstr ""
 
-#: src/crontablib/ctvariable.cpp:126
-msgid "Override default home folder."
-msgstr "Anwybyddu'r blygell gartref ragosod."
+#: src/variableWidget.cpp:48 src/taskWidget.cpp:52
+msgid "Disabled"
+msgstr "Analluogir"
 
-#: src/crontablib/ctvariable.cpp:129
-msgid "Email output to specified account."
-msgstr "Ebostio'r allbwn i gyfrif penodol."
+#: src/kcmCron.cpp:75
+msgid "Task Scheduler"
+msgstr "Trefnlennydd Tasgau"
 
-#: src/crontablib/ctvariable.cpp:132
-msgid "Override default shell."
-msgstr "Anwybyddu'r plisgyn rhagosod."
+#: src/kcmCron.cpp:76
+msgid "KDE Task Scheduler"
+msgstr "Trefnlennydd Tasgau KDE"
 
-#: src/crontablib/ctvariable.cpp:135
-msgid "Folders to search for program files."
-msgstr "Plygyll i'w chwilio ar gyfer ffeiliau rhaglen."
+#: src/kcmCron.cpp:76
+msgid ""
+"(c) 2008, Nicolas Ternisien\n"
+"(c) 1999-2000, Gary Meyer"
+msgstr ""
 
-#: src/crontablib/ctvariable.cpp:138
-msgid "Dynamic libraries location."
+#: src/kcmCron.cpp:78
+msgid "Nicolas Ternisien"
 msgstr ""
 
-#: src/crontablib/ctvariable.cpp:141
-msgid "Local Variable"
+#: src/kcmCron.cpp:79
+msgid "Gary Meyer"
 msgstr ""
 
-#: src/crontablib/ctHelper.cpp:22
-msgid "No comment"
+#: src/kcmCron.cpp:80
+msgid "Robert Berry"
 msgstr ""
 
-#: src/crontablib/ctunit.cpp:172
-msgid ","
-msgstr ","
+#: src/kcmCron.cpp:81
+msgid "James Ots"
+msgstr ""
 
-#: src/crontablib/ctunit.cpp:173 src/crontablib/cttask.cpp:318
-msgid " and "
-msgstr " a "
+#: src/kcmCron.cpp:82
+msgid "Alberto G. Hierro"
+msgstr ""
 
-#: src/crontablib/ctunit.cpp:176 src/crontablib/cttask.cpp:321
-msgid ", "
-msgstr ", "
+#: src/kcmCron.cpp:91
+#, kde-format
+msgid ""
+"The following error occurred while initializing KCron:\n"
+"\n"
+"%1\n"
+"\n"
+"KCron will now exit.\n"
+msgstr ""
+"Digwyddodd y gwall dilynnol wrth ymgychwyn KCron:\n"
+"\n"
+"%1\n"
+"\n"
+"Bydd KCron yn terfynu rwan.\n"
 
-#: src/crontablib/ctdom.cpp:23 src/crontablib/ctdow.cpp:44
-#: src/crontablib/cttask.cpp:266
-msgid "every day "
-msgstr "bob diwrnod "
+#: src/kcmCron.cpp:158
+msgid ""
+"You can use this application to schedule programs to run in the background.\n"
+"To schedule a new task now, click on the Tasks folder and select Edit/New "
+"from the menu."
+msgstr ""
+"Gallwch ddefnyddio'r cymhwysiad yma i drefnlennu rhaglenni i redeg yn y "
+"cefndir.\n"
+"I drefnlennu tasg newydd rwan, cliciwch ar y blygell Tasgau a dewis "
+"Golygu/Newydd o'r ddewislen."
 
-#: src/crontablib/ctdom.cpp:33
-msgid "1st"
-msgstr "1af"
+#: src/kcmCron.cpp:158
+msgid "Welcome to the Task Scheduler"
+msgstr "Croeso i'r Trefnlennydd Tasgau"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "2nd"
-msgstr "2il"
+#: src/crontabPrinterWidget.cpp:24
+msgid "Cron Options"
+msgstr "Dewisiadau Cron"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "3rd"
-msgstr "3ydd"
+#: src/crontabPrinterWidget.cpp:30
+msgid "Print cron&tab"
+msgstr "Argraffu cron&tab"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "4th"
-msgstr "4ydd"
+#: src/crontabPrinterWidget.cpp:34
+msgid "Print &all users"
+msgstr "Argraffu p&ob defnyddiwr"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "5th"
-msgstr "5ed"
+#: src/crontabPrinter.cpp:125
+msgid "Scheduled Tasks"
+msgstr "Tasgau Trefnlenedig"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "6th"
-msgstr "6ed"
+#: src/crontabPrinter.cpp:140 src/tasksWidget.cpp:243
+msgid "Scheduling"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "7th"
-msgstr "7ed"
+#: src/crontabPrinter.cpp:140 src/tasksWidget.cpp:245
+msgid "Command"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "8th"
-msgstr "8ed"
+#: src/crontabPrinter.cpp:140 src/tasksWidget.cpp:247
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "9th"
-msgstr "9ed"
+#: src/crontabPrinter.cpp:164
+msgid "Environment Variables"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "10th"
-msgstr "10ed"
+#: src/crontabPrinter.cpp:189
+msgid "All Users Crontabs"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "11th"
-msgstr "11ed"
+#: src/crontabPrinter.cpp:191
+#, kde-format
+msgctxt "Crontab of user login"
+msgid "Crontab of user %1"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "12th"
-msgstr "12ed"
+#: src/variablesWidget.cpp:48
+msgid "<b>Environment Variables</b>"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "13th"
-msgstr "13ydd"
+#: src/variablesWidget.cpp:83
+msgid "Modify Variable"
+msgstr "Addasu Newidyn"
 
-#: src/crontablib/ctdom.cpp:33
-msgid "14th"
-msgstr "14ydd"
+#: src/variablesWidget.cpp:159
+msgid "New Variable"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "15th"
-msgstr "15ed"
+#: src/variablesWidget.cpp:197 src/tasksWidget.cpp:240
+msgid "User"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "16th"
-msgstr "16ed"
+#: src/variablesWidget.cpp:200
+msgid "Variable"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:33
-msgid "17th"
-msgstr "17ed"
+#: src/variablesWidget.cpp:201
+msgid "Value"
+msgstr "Gwerth"
 
-#: src/crontablib/ctdom.cpp:34
-msgid "18th"
-msgstr "18ed"
+#: src/variablesWidget.cpp:202 src/tasksWidget.cpp:246
+msgid "Status"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "19th"
-msgstr "19ed"
+#: src/variablesWidget.cpp:203
+msgid "Comment"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "20th"
-msgstr "20ed"
+#: src/variablesWidget.cpp:218
+msgctxt "Adds a new variable"
+msgid "New &Variable..."
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "21st"
-msgstr "21ed"
+#: src/variablesWidget.cpp:219
+msgid "Create a new variable."
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "22nd"
-msgstr "22il"
+#: src/variablesWidget.cpp:223 src/tasksWidget.cpp:277
+msgid "M&odify..."
+msgstr "&Addasu..."
 
-#: src/crontablib/ctdom.cpp:34
-msgid "23rd"
-msgstr "23ydd"
+#: src/variablesWidget.cpp:225
+msgid "Modify the selected variable."
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "24th"
-msgstr "24ydd"
+#: src/variablesWidget.cpp:229 src/tasksWidget.cpp:283
+msgid "&Delete"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "25th"
-msgstr "25ed"
+#: src/variablesWidget.cpp:231
+msgid "Delete the selected variable."
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "26th"
-msgstr "26ed"
+#: src/variableEditorDialog.cpp:60
+msgid "Add or modify a variable"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "27th"
-msgstr "27ed"
+#: src/variableEditorDialog.cpp:64
+msgctxt "The environmental variable name ie HOME, MAILTO etc"
+msgid "&Variable:"
+msgstr ""
 
-#: src/crontablib/ctdom.cpp:34
-msgid "28th"
-msgstr "28ed"
+#: src/variableEditorDialog.cpp:93
+msgid "Va&lue:"
+msgstr "G&werth:"
 
-#: src/crontablib/ctdom.cpp:34
-msgid "29th"
-msgstr "29ed"
+#: src/variableEditorDialog.cpp:102 src/taskEditorDialog.cpp:106
+msgid "&Run as:"
+msgstr "&Rhedeg fel:"
 
-#: src/crontablib/ctdom.cpp:34
-msgid "30th"
-msgstr "30ed"
+#: src/variableEditorDialog.cpp:120 src/taskEditorDialog.cpp:122
+msgid "Co&mment:"
+msgstr "S&ylwad:"
 
-#: src/crontablib/ctdom.cpp:34
-msgid "31st"
-msgstr "31ed"
+#: src/variableEditorDialog.cpp:128
+msgid "&Enable this variable"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Mon"
-msgstr "Llun"
+#: src/variableEditorDialog.cpp:156
+msgid "<i>This variable will be used by scheduled tasks.</i>"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Tue"
-msgstr "Maw"
+#: src/variableEditorDialog.cpp:200
+msgid "<i>This variable is disabled.</i>"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Wed"
-msgstr "Mer"
+#: src/variableEditorDialog.cpp:207
+msgid "<i>Please enter the variable name...</i>"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Thu"
-msgstr "Iau"
+#: src/variableEditorDialog.cpp:214
+msgid "<i>Please enter the variable value ...</i>"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Fri"
-msgstr "Gwe"
+#: src/taskEditorDialog.cpp:76
+msgid "Add or modify a scheduled task"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Sat"
-msgstr "Sad"
+#: src/taskEditorDialog.cpp:77 src/taskEditorDialog.cpp:848
+msgid "<i>This task will be executed at the specified intervals.</i>"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:56
-msgid "Sun"
-msgstr "Sul"
+#: src/taskEditorDialog.cpp:86
+msgid "&Command:"
+msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Monday"
+#: src/taskEditorDialog.cpp:135
+msgid "&Enable this task"
 msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Tuesday"
+#: src/taskEditorDialog.cpp:140
+msgid "Run at system &bootup"
 msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Wednesday"
+#: src/taskEditorDialog.cpp:146
+msgid "Run &every day"
 msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Thursday"
+#: src/taskEditorDialog.cpp:248
+msgid "Days of Month"
+msgstr "Diwrnodau'r Mis"
+
+#: src/taskEditorDialog.cpp:286
+msgid "Months"
+msgstr "Misoedd"
+
+#: src/taskEditorDialog.cpp:323
+msgid "Days of Week"
+msgstr "Diwrnodau'r Wythnos"
+
+#: src/taskEditorDialog.cpp:461
+msgid "Minutes"
+msgstr "Munudau"
+
+#: src/taskEditorDialog.cpp:471
+msgid "Preselection:"
 msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Friday"
+#: src/taskEditorDialog.cpp:478
+msgid "Clear selection"
 msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Saturday"
+#: src/taskEditorDialog.cpp:479
+msgid "Custom selection"
 msgstr ""
 
-#: src/crontablib/ctdow.cpp:58
-msgid "Sunday"
+#: src/taskEditorDialog.cpp:480
+msgid "Each minute"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:240
-msgid "At system startup"
+#: src/taskEditorDialog.cpp:481
+msgid "Every 2 minutes"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:247
-#, kde-format
-msgctxt "1:Time Description, 2:Date Description"
-msgid "%1, %2"
+#: src/taskEditorDialog.cpp:482
+msgid "Every 5 minutes"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:251
-#, kde-format
-msgctxt "Every 'days of week'"
-msgid "every %1"
+#: src/taskEditorDialog.cpp:483
+msgid "Every 10 minutes"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:255
-#, kde-format
-msgctxt "'Days of month' of 'Months'"
-msgid "%1 of %2"
+#: src/taskEditorDialog.cpp:484
+msgid "Every 15 minutes"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:277
-#, kde-format
-msgctxt "1:Day of month, 2:Day of week"
-msgid "%1 as well as %2"
+#: src/taskEditorDialog.cpp:485
+msgid "Every 20 minutes"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:307
-#, kde-format
-msgctxt "1:Hour, 2:Minute"
-msgid "%1:%2"
+#: src/taskEditorDialog.cpp:486
+msgid "Every 30 minutes"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:316
-msgid ", and "
-msgstr ", a "
+#: src/taskEditorDialog.cpp:518
+msgid "Hours"
+msgstr "Oriau"
 
-#: src/crontablib/cttask.cpp:329
-#, kde-format
-msgctxt "Hour::Minute list"
-msgid "At %1"
+#: src/taskEditorDialog.cpp:522
+msgid "AM:"
 msgstr ""
 
-#: src/crontablib/cttask.cpp:337
-#, kde-format
-msgid "Every minute"
-msgid_plural "Every %1 minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/taskEditorDialog.cpp:539
+msgid "PM:"
+msgstr ""
 
-#: src/crontablib/cthost.cpp:60
-msgid ""
-"You have been blocked from using KCron\t                      by either the "
-"/etc/cron.allow file or the /etc/cron.deny file.\t                      \n"
-"\n"
-"Check the crontab man page for further details."
+#: src/taskEditorDialog.cpp:705 src/taskEditorDialog.cpp:716
+msgid "<i>Please type a valid command line...</i>"
 msgstr ""
 
-#: src/crontablib/cthost.cpp:142
-#, kde-format
-msgctxt "User login: errorMessage"
-msgid "User %1: %2"
+#: src/taskEditorDialog.cpp:738
+msgid "<i>Please select an executable program...</i>"
 msgstr ""
 
-#: src/crontablib/ctmonth.cpp:23
-msgid "every month"
+#: src/taskEditorDialog.cpp:746 src/taskEditorDialog.cpp:772
+msgid "<i>Please browse for a program to execute...</i>"
 msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "January"
-msgstr "Ionawr"
+#: src/taskEditorDialog.cpp:759
+msgid "<i>This task is disabled.</i>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "February"
-msgstr "Chwefror"
+#: src/taskEditorDialog.cpp:766
+msgid "<i>This task will be run on system bootup.</i>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "March"
-msgstr "Mawrth"
+#: src/taskEditorDialog.cpp:791
+msgid "<i>Please select from the 'Months' section...</i>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "April"
-msgstr "Ebrill"
+#: src/taskEditorDialog.cpp:810
+msgid ""
+"<i>Please select from either the 'Days of Month' or the 'Days of Week' "
+"section...</i>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgctxt "May long"
-msgid "May"
-msgstr "Mai"
+#: src/taskEditorDialog.cpp:825
+msgid "<i>Please select from the 'Hours' section...</i>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "June"
-msgstr "Mehefin"
+#: src/taskEditorDialog.cpp:840
+msgid "<i>Please select from the 'Minutes' section...</i>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgctxt "July long"
-msgid "July"
+#: src/taskEditorDialog.cpp:1047
+msgid "Set All"
 msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "August"
-msgstr "Awst"
+#: src/taskEditorDialog.cpp:1049
+msgid "Clear All"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "September"
-msgstr "Medi"
+#: src/tasksWidget.cpp:57
+msgid "<b>Scheduled Tasks</b>"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "October"
-msgstr "Hydref"
+#: src/tasksWidget.cpp:111
+msgctxt "Do not use any quote characters (') in this string"
+msgid "End of script execution. Type Enter or Ctrl+C to exit."
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "November"
-msgstr "Tachwedd"
+#: src/tasksWidget.cpp:144
+msgid "New Task"
+msgstr ""
 
-#: src/crontablib/ctmonth.cpp:33
-msgid "December"
-msgstr "Rhagfyr"
+#: src/tasksWidget.cpp:180
+msgid "Modify Task"
+msgstr "Addasu Tasg"
 
-#: src/crontablib/ctGlobalCron.cpp:39
-msgid "All users"
+#: src/tasksWidget.cpp:248
+msgid "Scheduling Details"
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:104
-#, kde-format
-msgid "No password entry found for uid '%1'"
-msgstr "Dim cofnod cyfrinair ar gael ar gyfer uid '%1'"
+#: src/tasksWidget.cpp:272
+msgctxt "Adds a new task"
+msgid "New &Task..."
+msgstr ""
 
-#: src/crontablib/ctcron.cpp:241
-#, kde-format
-msgctxt "Generation Message + current date"
-msgid "File generated by KCron the %1."
+#: src/tasksWidget.cpp:273
+msgid "Create a new task."
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:279
-msgid "<em>No output.</em>"
+#: src/tasksWidget.cpp:279
+msgid "Modify the selected task."
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:285
-msgid "<em>No error.</em>"
+#: src/tasksWidget.cpp:285
+msgid "Delete the selected task."
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:291
-#, kde-format
-msgid ""
-"<p><strong>Command:</strong> %1</p><strong>Command could not be "
-"started</strong>"
+#: src/tasksWidget.cpp:289
+msgid "&Run Now"
+msgstr "&Rhedeg Rwan"
+
+#: src/tasksWidget.cpp:291
+msgid "Run the selected task now."
+msgstr "Rhedeg y dasg benodol rwan."
+
+#: src/crontabWidget.cpp:164
+msgid "Show the following Cron:"
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:293
-#, kde-format
-msgid ""
-"<p><strong>Command:</strong> %1</p><strong>Standard Output "
-":</strong><pre>%2</pre><strong>Error Output :</strong><pre>%3</pre>"
+#: src/crontabWidget.cpp:168
+msgid "Personal Cron"
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:295
-msgid "An error occurred while updating crontab."
-msgstr "Digwyddodd gwall wrth ddiweddaru crontab."
+#: src/crontabWidget.cpp:173
+msgid "System Cron"
+msgstr ""
 
-#: src/crontablib/ctcron.cpp:302
-msgid "Unable to open crontab file for writing"
+#: src/crontabWidget.cpp:177
+msgid "Cron of User:"
 msgstr ""
 
-#: src/crontablib/ctcron.cpp:302
-#, kde-format
-msgid "The file %1 could not be opened."
+#: src/crontabWidget.cpp:200
+msgid "Show All Personal Crons"
 msgstr ""
 
 #: rc.cpp:1
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdeasciiquarium.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdeasciiquarium.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdeasciiquarium.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdeasciiquarium.po	2012-04-18 08:59:23.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeartwork\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 15:58+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-23 08:56+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: aasaver.cpp:1386 aasaver.cpp:1387
 msgid "KDE Asciiquarium"
@@ -23,48 +23,48 @@
 
 #. i18n: file: settingswidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, SettingsWidget)
-#: aasaver.cpp:1407 rc.cpp:9 rc.cpp:23
+#: aasaver.cpp:1407 rc.cpp:5
 msgid "Asciiquarium Settings"
 msgstr ""
 
-#: rc.cpp:19
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:20
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ",,"
 
 #. i18n: file: settingswidget.ui:19
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:12 rc.cpp:26
+#: rc.cpp:8
 msgid "Number of Fish:"
 msgstr ""
 
 #. i18n: file: settingswidget.ui:29
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_fishCount)
-#: rc.cpp:15 rc.cpp:29
+#: rc.cpp:11
 msgid "Choose number of fish to show at once"
 msgstr ""
 
 #. i18n: file: settingswidget.ui:32
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, kcfg_fishCount)
-#: rc.cpp:18 rc.cpp:32
+#: rc.cpp:14
 msgid ""
 "This value controls the number of fish to show on screen at any given time."
 msgstr ""
 
 #. i18n: file: asciiquarium.kcfg:7
 #. i18n: ectx: label, entry (fishCount), group (Settings)
-#: rc.cpp:3 rc.cpp:35
+#: rc.cpp:17
 msgid "Number of fish to have in the sea."
 msgstr ""
 
 #. i18n: file: asciiquarium.kcfg:9
 #. i18n: ectx: whatsthis, entry (fishCount), group (Settings)
-#: rc.cpp:6 rc.cpp:38
+#: rc.cpp:20
 msgid ""
 "You can use this value to select the number of fish that will be on screen "
 "at a given time."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdebugdialog.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdebugdialog.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdebugdialog.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdebugdialog.po	2012-04-18 08:59:35.000000000 +0000
@@ -8,78 +8,40 @@
 msgstr ""
 "Project-Id-Version: kdebugdialog\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:32+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:14+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kdebugdialog.cpp:42 klistdebugdialog.cpp:36
 msgid "Debug Settings"
 msgstr "Gosodiadau Dad-namu"
 
-#: kdebugdialog.cpp:55
-msgid "Debug area:"
-msgstr "Ardal Dad-namu:"
-
-#: kdebugdialog.cpp:73
+#: kdebugdialog.cpp:57
 msgid "File"
 msgstr ""
 
-#: kdebugdialog.cpp:74
+#: kdebugdialog.cpp:58
 msgid "Message Box"
 msgstr "Blwch Neges"
 
-#: kdebugdialog.cpp:75
+#: kdebugdialog.cpp:59
 msgid "Shell"
 msgstr "Plisgyn"
 
-#: kdebugdialog.cpp:76
+#: kdebugdialog.cpp:60
 msgid "Syslog"
 msgstr "Cofnod cysawd"
 
-#: kdebugdialog.cpp:77
+#: kdebugdialog.cpp:61
 msgid "None"
 msgstr "Dim"
 
-#: kdebugdialog.cpp:82
-msgid "Information"
-msgstr ""
-
-#: kdebugdialog.cpp:87 kdebugdialog.cpp:114 kdebugdialog.cpp:141
-#: kdebugdialog.cpp:168
-msgid "Output to:"
-msgstr "Allbwn i:"
-
-#: kdebugdialog.cpp:95 kdebugdialog.cpp:122 kdebugdialog.cpp:149
-#: kdebugdialog.cpp:176
-msgid "Filename:"
-msgstr "Enw Ffeil :"
-
-#: kdebugdialog.cpp:109
-msgid "Warning"
-msgstr ""
-
-#: kdebugdialog.cpp:136
-msgid "Error"
-msgstr ""
-
-#: kdebugdialog.cpp:163
-msgid "Fatal Error"
-msgstr "Gwall Angheuol"
-
-#: kdebugdialog.cpp:188
-msgid "Abort on fatal errors"
-msgstr "Terfynu ar ôl gwall angheuol"
-
-#: kdebugdialog.cpp:192 klistdebugdialog.cpp:76
-msgid "Disable all debug output"
-msgstr ""
-
 #: klistdebugdialog.cpp:67
 msgid "&Select All"
 msgstr "&Dewis Popeth"
@@ -88,6 +50,10 @@
 msgid "&Deselect All"
 msgstr "Da&tddewis Popeth"
 
+#: klistdebugdialog.cpp:76
+msgid "Disable all debug output"
+msgstr ""
+
 #: main.cpp:98
 msgid "KDebugDialog"
 msgstr "KYmgomDad-namu (KDebugDialog)"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdelibs4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdelibs4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdelibs4.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdelibs4.po	2012-04-18 08:59:29.000000000 +0000
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: kdelibs4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:25+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg\n"
@@ -27,8 +27,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:11+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -40,84 +40,51 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:33
-#. i18n: ectx: property (text), widget (QToolButton, m_anytimeButton)
-#: rc.cpp:655
-#: obj-i686-linux-gnu/nepomuk/utils/ui_daterangeselectionwidget.h:127
-msgid "Anytime"
-msgstr ""
-
-#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:49
-#. i18n: ectx: property (text), widget (QToolButton, m_beforeButton)
-#: rc.cpp:661
-#: obj-i686-linux-gnu/nepomuk/utils/ui_daterangeselectionwidget.h:128
-msgid "Before"
-msgstr ""
-
-#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:65
-#. i18n: ectx: property (text), widget (QToolButton, m_afterButton)
-#: rc.cpp:667
-#: obj-i686-linux-gnu/nepomuk/utils/ui_daterangeselectionwidget.h:129
-msgid "After"
-msgstr ""
-
-#: kdecore/localization/klocale.cpp:2238
-msgid "Today"
-msgstr ""
-
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:16
 #. i18n: ectx: property (text), widget (QCheckBox, Sound_check)
-#: rc.cpp:3
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:146
+#: rc.cpp:5
 msgid "Play a &sound"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:42
 #. i18n: ectx: property (toolTip), widget (KUrlRequester, Sound_select)
-#: rc.cpp:6
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:149
+#: rc.cpp:8
 msgid "Select the sound to play"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:49
 #. i18n: ectx: property (text), widget (QCheckBox, Popup_check)
-#: rc.cpp:9
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:151
+#: rc.cpp:11
 msgid "Show a message in a &popup"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:56
 #. i18n: ectx: property (text), widget (QCheckBox, Logfile_check)
-#: rc.cpp:12
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:152
+#: rc.cpp:14
 msgid "Log to a file"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:76
 #. i18n: ectx: property (text), widget (QCheckBox, Taskbar_check)
-#: rc.cpp:15
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:153
+#: rc.cpp:17
 msgid "Mark &taskbar entry"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:83
 #. i18n: ectx: property (text), widget (QCheckBox, Execute_check)
-#: rc.cpp:18
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:154
+#: rc.cpp:20
 msgid "Run &command"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:99
 #. i18n: ectx: property (toolTip), widget (KUrlRequester, Execute_select)
-#: rc.cpp:21
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:156
+#: rc.cpp:23
 msgid "Select the command to run"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:106
 #. i18n: ectx: property (text), widget (QCheckBox, KTTS_check)
-#: rc.cpp:24
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:158
+#: rc.cpp:26
 msgid "Sp&eech"
 msgstr ""
 
@@ -125,9 +92,7 @@
 #. i18n: ectx: property (whatsThis), widget (KComboBox, KTTS_combo)
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:141
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, KTTS_select)
-#: rc.cpp:633 rc.cpp:646
-#: obj-i686-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:166
-#: obj-i686-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:169
+#: rc.cpp:30 rc.cpp:43
 #, no-c-format
 msgid ""
 "<qt>Specifies how Jovie should speak the event when received.  If you select "
@@ -139,22 +104,19 @@
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:123
 #. i18n: ectx: property (text), item, widget (KComboBox, KTTS_combo)
-#: rc.cpp:31
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:161
+#: rc.cpp:33
 msgid "Speak Event Message"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:128
 #. i18n: ectx: property (text), item, widget (KComboBox, KTTS_combo)
-#: rc.cpp:34
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:162
+#: rc.cpp:36
 msgid "Speak Event Name"
 msgstr ""
 
 #. i18n: file: knotify/config/knotifyconfigactionswidgetbase.ui:133
 #. i18n: ectx: property (text), item, widget (KComboBox, KTTS_combo)
-#: rc.cpp:37
-#: obj-sparc-linux-gnu/knotify/config/ui_knotifyconfigactionswidgetbase.h:163
+#: rc.cpp:39
 msgid "Speak Custom Text"
 msgstr ""
 
@@ -162,245 +124,229 @@
 #. i18n: ectx: property (windowTitle), widget (QWidget, UploadDialog)
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, UploadDialog)
-#: rc.cpp:44 rc.cpp:131 knewstuff/knewstuff2/ui/uploaddialog.cpp:58
-#: knewstuff/knewstuff3/uploaddialog.cpp:118
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:188
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:247
+#: rc.cpp:46 rc.cpp:151 knewstuff/knewstuff2/ui/uploaddialog.cpp:58
+#: knewstuff/knewstuff3/uploaddialog.cpp:363
 msgid "Share Hot New Stuff"
 msgstr "Rhannu y Diweddaraf"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:20
 #. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: knewstuff/knewstuff3/ui/entrydetailsdialog.ui:86
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:366
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:47 rc.cpp:185
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:189
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_entrydetailsdialog.h:267
+#: rc.cpp:49 rc.cpp:133
 msgid "Author:"
 msgstr "Awdur:"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:33
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:50 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:190
+#: rc.cpp:52
 msgid "Email address:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:46
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:98
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:53 rc.cpp:149 kross/ui/view.cpp:151
-#: kdeui/colors/kcolordialog.cpp:1186
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:191
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:254
+#: rc.cpp:55 kross/ui/view.cpp:151 kdeui/colors/kcolordialog.cpp:1246
 msgid "Name:"
 msgstr "Enw:"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:59
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:114
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:233
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:56 rc.cpp:152 kdeui/dialogs/kbugreport.cpp:196
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:192
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:255
+#: rc.cpp:58 rc.cpp:187 kdeui/dialogs/kbugreport.cpp:195
 msgid "Version:"
 msgstr "Fersiwn :"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:72
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:130
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:246
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:59 rc.cpp:155
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:193
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:256
+#: rc.cpp:61 rc.cpp:190
 msgid "License:"
 msgstr "Trwydded:"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:86
 #. i18n: ectx: property (text), item, widget (KComboBox, mLicenseCombo)
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:147
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:189
 #. i18n: ectx: property (text), item, widget (KComboBox, mLicenseCombo)
-#: rc.cpp:62 rc.cpp:158
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:196
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:259
+#: rc.cpp:64 rc.cpp:172
 msgid "GPL"
 msgstr "GPL"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:91
 #. i18n: ectx: property (text), item, widget (KComboBox, mLicenseCombo)
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:152
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:194
 #. i18n: ectx: property (text), item, widget (KComboBox, mLicenseCombo)
-#: rc.cpp:65 rc.cpp:161
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:197
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:260
+#: rc.cpp:67 rc.cpp:175
 msgid "LGPL"
 msgstr "LGPL"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:96
 #. i18n: ectx: property (text), item, widget (KComboBox, mLicenseCombo)
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:157
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:199
 #. i18n: ectx: property (text), item, widget (KComboBox, mLicenseCombo)
-#: rc.cpp:68 rc.cpp:164
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:198
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:261
+#: rc.cpp:70 rc.cpp:178
 msgid "BSD"
 msgstr "BSD"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:104
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:71 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:200
+#: rc.cpp:73
 msgid "Preview URL:"
 msgstr "URL Rhagolwg:"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:117
 #. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:74 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:201
+#: rc.cpp:76
 msgid "Language:"
 msgstr "Iaith:"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:133
 #. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:77 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:202
+#: rc.cpp:79
 msgid "In which language did you describe the above?"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:140
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:80 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:203
+#: rc.cpp:82
 msgid "Please describe your upload."
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:147
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:83 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:204
+#: rc.cpp:85
 msgid "Summary:"
 msgstr "Crynodeb:"
 
 #. i18n: file: knewstuff/knewstuff2/ui/UploadDialog.ui:157
 #. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:86 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_UploadDialog.h:205
+#: rc.cpp:88
 msgid "Please give some information about yourself."
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/DownloadDialog.ui:27
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:89 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_DownloadDialog.h:194
+#: rc.cpp:91
 msgid "&Source:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/DownloadDialog.ui:40
 #. i18n: ectx: property (text), widget (QLabel, m_providerLinkLabel)
-#: rc.cpp:92 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_DownloadDialog.h:195
+#: rc.cpp:94
 msgid "?"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/DownloadDialog.ui:64
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:95 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_DownloadDialog.h:196
+#: rc.cpp:97
 msgid "&Order by:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/DownloadDialog.ui:93
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, m_searchEdit)
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:200
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:211
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, m_searchEdit)
-#: rc.cpp:98 rc.cpp:128
-#: obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_DownloadDialog.h:197
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:243
+#: rc.cpp:100 rc.cpp:130
 msgid "Enter search phrase here"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff2/ui/DownloadDialog.ui:142
 #. i18n: ectx: property (text), widget (QToolButton, m_collaborationButton)
-#: rc.cpp:101 obj-sparc-linux-gnu/knewstuff/knewstuff2/ui_DownloadDialog.h:198
+#: rc.cpp:103
 msgid "Collaborate"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:46
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:54
 #. i18n: ectx: property (text), widget (QLabel, m_providerLabel)
-#: rc.cpp:104 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:235
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:127
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:106 rc.cpp:160
 msgid "Provider:"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:63
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:71
 #. i18n: ectx: property (text), widget (QLabel, m_categoryLabel)
-#: rc.cpp:107 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:236
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:297
+#. i18n: ectx: property (text), widget (QLabel, mCategoryLabel)
+#: rc.cpp:109 rc.cpp:199
 msgid "Category:"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:82
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:90
 #. i18n: ectx: property (text), widget (QRadioButton, newestRadio)
-#: rc.cpp:110 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:237
+#: rc.cpp:112
 msgid "Newest"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:92
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:103
 #. i18n: ectx: property (text), widget (QRadioButton, ratingRadio)
-#: rc.cpp:113 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:238
+#: rc.cpp:115
 msgid "Rating"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:110
 #. i18n: ectx: property (text), widget (QRadioButton, mostDownloadsRadio)
-#: rc.cpp:751 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_downloadwidget.h:457
+#: rc.cpp:118
 msgid "Most downloads"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:106
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:117
 #. i18n: ectx: property (text), widget (QRadioButton, installedRadio)
-#: rc.cpp:119 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:240
+#: rc.cpp:121
 msgid "Installed"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:164
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:175
 #. i18n: ectx: property (text), widget (QLabel, orderLabel)
-#: rc.cpp:122 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:241
+#: rc.cpp:124
 msgid "Order by:"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:174
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:185
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:125 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:242
+#: rc.cpp:127
 msgid "Search:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:391
 #. i18n: ectx: property (text), widget (QLabel, homepageLabel)
-#: rc.cpp:769 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_downloadwidget.h:464
+#: rc.cpp:136
 msgid "<a href=\"http://opendesktop.org\">Homepage</a>"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/ui/entrydetailsdialog.ui:261
-#. i18n: ectx: property (text), widget (QPushButton, updateButton)
-#: rc.cpp:209 knewstuff/knewstuff2/ui/kdxsbutton.cpp:138
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:567
+#. i18n: ectx: property (text), widget (KPushButton, updateButton)
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:164
+#. i18n: ectx: property (text), widget (QRadioButton, radioUpdate)
+#: rc.cpp:139 rc.cpp:169 knewstuff/knewstuff2/ui/kdxsbutton.cpp:138
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:192
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:218
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_entrydetailsdialog.h:279
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:330
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:124
 msgid "Update"
 msgstr "Diweddaru"
 
-#. i18n: file: knewstuff/knewstuff3/ui/entrydetailsdialog.ui:271
-#. i18n: ectx: property (text), widget (QPushButton, uninstallButton)
-#: rc.cpp:212 knewstuff/knewstuff2/ui/kdxsbutton.cpp:66
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:577
+#. i18n: ectx: property (text), widget (KPushButton, uninstallButton)
+#: rc.cpp:142 knewstuff/knewstuff2/ui/kdxsbutton.cpp:66
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:133
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:534
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:66
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:186
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:213
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_entrydetailsdialog.h:280
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:326
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:120
 msgid "Uninstall"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/ui/entrydetailsdialog.ui:221
-#. i18n: ectx: property (text), widget (QPushButton, becomeFanButton)
-#: rc.cpp:203
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_entrydetailsdialog.h:277
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:584
+#. i18n: ectx: property (text), widget (KPushButton, becomeFanButton)
+#: rc.cpp:145
 msgid "Become a Fan"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/ui/entrydetailsdialog.ui:251
-#. i18n: ectx: property (text), widget (QPushButton, installButton)
-#: rc.cpp:206 knewstuff/knewstuff2/ui/kdxsbutton.cpp:65
+#. i18n: file: knewstuff/knewstuff3/downloadwidget.ui:591
+#. i18n: ectx: property (text), widget (KPushButton, installButton)
+#: rc.cpp:148 knewstuff/knewstuff2/ui/kdxsbutton.cpp:65
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:144
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:149
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:448
@@ -408,73 +354,78 @@
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:65
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:201
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:209
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:238
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_entrydetailsdialog.h:278
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:345
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:355
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:139
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:149
 msgid "Install"
 msgstr "Arsefydlu"
 
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:89
+#. i18n: ectx: property (text), widget (QLabel, label_11)
 #. i18n: file: kdeui/dialogs/knewpassworddialog.ui:44
 #. i18n: ectx: property (text), widget (QLabel, labelPassword)
 #. i18n: file: kdeui/dialogs/kpassworddialog.ui:106
 #. i18n: ectx: property (text), widget (QLabel, passwordLabel)
-#: rc.cpp:735 rc.cpp:759 obj-sparc-linux-gnu/kdeui/ui_kpassworddialog.h:158
-#: obj-sparc-linux-gnu/kdeui/ui_knewpassworddialog.h:146
+#: rc.cpp:154 rc.cpp:478 rc.cpp:502
 msgid "Password:"
 msgstr "Cyfrinair:"
 
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:105
+#. i18n: ectx: property (text), widget (QLabel, label_10)
 #. i18n: file: kdeui/dialogs/kpassworddialog.ui:73
 #. i18n: ectx: property (text), widget (QLabel, userNameLabel)
-#: rc.cpp:750 obj-sparc-linux-gnu/kdeui/ui_kpassworddialog.h:155
+#: rc.cpp:157 rc.cpp:493
 msgid "Username:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:141
 #. i18n: ectx: property (text), widget (QLabel, uploadFileLabel)
-#: rc.cpp:796 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:622
+#: rc.cpp:163
 msgid "File to upload:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:151
 #. i18n: ectx: property (text), widget (QRadioButton, radioNewUpload)
-#: rc.cpp:799 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:623
+#: rc.cpp:166
 msgid "New Upload"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:181
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:207
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:170 khtml/khtml_part.cpp:1895
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:264
+#: rc.cpp:181 khtml/khtml_part.cpp:1855
 msgid "Description:"
 msgstr "Disgrifiad:"
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:223
 #. i18n: ectx: property (text), widget (QLabel, priceLabel_2)
-#: rc.cpp:817 knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:105
-#: obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:632
+#: rc.cpp:184 knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:104
 msgid "Changelog:"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:85
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:259
 #. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:143 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:252
+#: rc.cpp:193
 msgid "Please fill out the information about your upload in English."
 msgstr ""
 
-#. i18n: file: khtml/htmlpageinfo.ui:144
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:275
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: khtml/htmlpageinfo.ui:112
 #. i18n: ectx: property (text), widget (QLabel, titleLabel)
-#: rc.cpp:477 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:211
+#: rc.cpp:196 rc.cpp:701
 msgid "Title:"
 msgstr "Teitl:"
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:310
 #. i18n: ectx: property (toolTip), widget (KLineEdit, mNameEdit)
-#: rc.cpp:835 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:651
+#: rc.cpp:202
 msgid "Name of the file as it will appear on the website"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:313
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, mNameEdit)
-#: rc.cpp:838 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:654
+#: rc.cpp:205
 msgid ""
 "This should clearly describe the file content. It can be the same text as "
 "the title of the kvtml file."
@@ -482,7 +433,7 @@
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:327
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:841 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:656
+#: rc.cpp:208
 msgid "Preview Images"
 msgstr ""
 
@@ -492,82 +443,79 @@
 #. i18n: ectx: property (text), widget (QPushButton, changePreview3Button)
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:350
 #. i18n: ectx: property (text), widget (QPushButton, changePreview2Button)
-#: rc.cpp:844 rc.cpp:847 rc.cpp:850
-#: obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:657
-#: obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:658
-#: obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:659
+#: rc.cpp:211 rc.cpp:214 rc.cpp:217
 msgid "Select Preview..."
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:219
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:426
 #. i18n: ectx: property (text), widget (QCheckBox, priceCheckBox)
-#: rc.cpp:173 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:266
+#: rc.cpp:220
 msgid "Set a price for this item"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:436
 #. i18n: ectx: property (title), widget (QGroupBox, priceGroupBox)
-#: rc.cpp:856 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:664
+#: rc.cpp:223
 msgid "Price"
 msgstr ""
 
-#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:242
+#. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:445
 #. i18n: ectx: property (text), widget (QLabel, priceLabel)
-#: rc.cpp:176 obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:267
+#: rc.cpp:226
 msgid "Price:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:472
 #. i18n: ectx: property (text), widget (QLabel, priceReasonLabel)
-#: rc.cpp:862 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:667
+#: rc.cpp:229
 msgid "Reason for price:"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:589
 #. i18n: ectx: property (text), widget (QLabel, contentWebsiteLinkLabel)
-#: rc.cpp:865 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:672
+#: rc.cpp:232
 msgid "Fetch content link from server"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:602
 #. i18n: ectx: property (text), widget (QLabel, creatingContentLabel)
-#: rc.cpp:868 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:673
+#: rc.cpp:235
 msgid "Create content on server"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:615
 #. i18n: ectx: property (text), widget (QLabel, creatingContentLabel_2)
-#: rc.cpp:871 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:674
+#: rc.cpp:238
 msgid "Upload content"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:628
 #. i18n: ectx: property (text), widget (QLabel, uploadPreview1Label)
-#: rc.cpp:874 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:675
+#: rc.cpp:241
 msgid "Upload first preview"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:658
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:877 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:677
+#: rc.cpp:244
 msgid "Note: You can edit, update and delete your content on the website."
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:674
 #. i18n: ectx: property (text), widget (QLabel, uploadPreview2Label)
-#: rc.cpp:880 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:678
+#: rc.cpp:247
 msgid "Upload second preview"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:687
 #. i18n: ectx: property (text), widget (QLabel, uploadPreview3Label)
-#: rc.cpp:883 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:679
+#: rc.cpp:250
 msgid "Upload third preview"
 msgstr ""
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:732
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:886 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:682
+#: rc.cpp:253
 msgid ""
 "I ensure that this content does not violate any existing copyright, law or "
 "trademark. I agree for my IP address to be logged. (Distributing content "
@@ -576,396 +524,256 @@
 
 #. i18n: file: knewstuff/knewstuff3/uploaddialog.ui:757
 #. i18n: ectx: property (text), widget (QPushButton, uploadButton)
-#: rc.cpp:889 obj-i686-linux-gnu/knewstuff/knewstuff3/ui_uploaddialog.h:683
+#: rc.cpp:256
 msgid "Start Upload"
 msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:33
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: kde3support/kdeui/k3spellui.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_unknownWord)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:33
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_unknownWord)
-#: rc.cpp:221 rc.cpp:233 rc.cpp:837 rc.cpp:849
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:185
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:195
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:173
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:183
-msgid ""
-"<qt><p>This word was considered to be an \"unknown word\" because it does "
-"not match any entry in the dictionary currently in use. It may also be a "
-"word in a foreign language.</p>\n"
-"<p>If the word is not misspelled, you may add it to the dictionary by "
-"clicking <b>Add to Dictionary</b>. If you do not want to add the unknown "
-"word to the dictionary, but you want to leave it unchanged, click "
-"<b>Ignore</b> or <b>Ignore All</b>.</p>\n"
-"<p>However, if the word is misspelled, you can try to find the correct "
-"replacement in the list below. If you cannot find a replacement there, you "
-"may type it in the text box below, and click <b>Replace</b> or <b>Replace "
-"All</b>.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/docviewer/docviewer.ui:30
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:259
+msgid "<h1>KJSEmbed Documentation Viewer</h1>"
 msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:227 rc.cpp:843 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:190
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:178
-msgid "Unknown word:"
-msgstr "Gair anhysbys"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:13
+#. i18n: ectx: property (windowTitle), widget (QMainWindow, KJSConsole)
+#. i18n: file: kjsembed/examples/console/console.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, jsConsole)
+#: rc.cpp:262 rc.cpp:364
+msgid "MainWindow"
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:43
-#. i18n: ectx: property (toolTip), widget (QLabel, m_unknownWord)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:43
-#. i18n: ectx: property (toolTip), widget (QLabel, m_unknownWord)
-#: rc.cpp:230 rc.cpp:846 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:192
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:180
-msgid "Unknown word"
-msgstr "Gair anhysbys"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:106
+#. i18n: ectx: property (text), widget (QPushButton, mExecute)
+#: rc.cpp:265 kparts/browserrun.cpp:336
+msgid "Execute"
+msgstr "Gweithredu"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:52
-#. i18n: ectx: property (text), widget (QLabel, m_unknownWord)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:52
-#. i18n: ectx: property (text), widget (QLabel, m_unknownWord)
-#: rc.cpp:239 rc.cpp:855 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:200
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:188
-msgid "<b>misspelled</b>"
-msgstr "<b>wedi'i gamsillafu</b>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:125
+#. i18n: ectx: property (title), widget (QMenu, menuFile)
+#: rc.cpp:268
+msgid "File"
+msgstr "Ffeil"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:61
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
-#. i18n: file: kde3support/kdeui/k3spellui.ui:233
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_language)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:61
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:176
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_language)
-#: rc.cpp:242 rc.cpp:337 rc.cpp:858 rc.cpp:916
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:202
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:249
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:190
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:265
-msgid ""
-"<qt>\n"
-"<p>Select the language of the document you are proofing here.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:164
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#: rc.cpp:271
+msgid "Open Script"
 msgstr ""
-"<qt>\n"
-"<p>Dewiswch iaith y ddogfen a broflennir yma.</p>\n"
-"</qt>"
-
-#. i18n: file: kde3support/kdeui/k3spellui.ui:64
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:64
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:247 rc.cpp:863 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:206
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:194
-msgid "&Language:"
-msgstr "&Iaith:"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:74
-#. i18n: ectx: property (toolTip), widget (QLabel, m_contextLabel)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:74
-#. i18n: ectx: property (toolTip), widget (QLabel, m_contextLabel)
-#: rc.cpp:250 rc.cpp:866 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:208
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:196
-msgid "Text excerpt showing the unknown word in its context."
-msgstr "Detholiad arbrawf sy'n dangos y gair anhysbys yn ei gyd-destun."
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:167
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:274
+msgid "Open a script..."
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:79
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_contextLabel)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:79
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_contextLabel)
-#: rc.cpp:253 rc.cpp:869 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:211
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:199
-msgid ""
-"<qt>\n"
-"<p>Here you can see a text excerpt showing the unknown word in its context. "
-"If this information is not sufficient to choose the best replacement for the "
-"unknown word, you can click on the document you are proofing, read a larger "
-"part of the text and then return here to continue proofing.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:170
+#. i18n: ectx: property (shortcut), widget (QStatusBar, statusBar)
+#: rc.cpp:277
+msgid "Ctrl+O"
 msgstr ""
-"<qt>\n"
-"<p>Yma gallwch gweld detholiad testun sy'n dangos y gair anhysbys yn ei gyd-"
-"destun.  Os nad yw'r gwybodaeth yma yn ddigonol i ddewis yr amnewidiad gorau "
-"am y gair anhysbys, gallwch glicio ar y ddgogfen yr ydych yn ei broflennu, "
-"darllen darn mwyaf o'r testun, ac wedyn dychwelyd yma i barhau'r "
-"proflennu.</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:85
-#. i18n: ectx: property (text), widget (QLabel, m_contextLabel)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:85
-#. i18n: ectx: property (text), widget (QLabel, m_contextLabel)
-#: rc.cpp:258 rc.cpp:874 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:215
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:203
-msgid "... the <b>misspelled</b> word shown in context ..."
-msgstr "... y gair <b>a gamsillafwyd</b> yn ei gyd-destun ..."
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:175
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#: rc.cpp:280
+msgid "Close Script"
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:98
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_addBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:98
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_addBtn)
-#: rc.cpp:261 rc.cpp:877 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:217
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:205
-msgid ""
-"<qt>\n"
-"<p>The unknown word was detected and considered unknown because it is not "
-"included in the dictionary.<br>\n"
-"Click here if you consider the unknown word not to be misspelled, and you "
-"want to avoid wrongly detecting it again in the future. If you want to let "
-"it remain as is, but not add it to the dictionary, then click <b>Ignore</b> "
-"or <b>Ignore All</b> instead.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:178
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:283
+msgid "Close script..."
 msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:101
-#. i18n: ectx: property (text), widget (QPushButton, m_addBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:101
-#. i18n: ectx: property (text), widget (QPushButton, m_addBtn)
-#: rc.cpp:267 rc.cpp:883 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:222
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:210
-msgid "<< Add to Dictionary"
-msgstr "<< Ychwanegu i'r Geiriadur"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:183
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:97
+#. i18n: ectx: property (text), widget (QPushButton, pbQuit)
+#. i18n: file: threadweaver/Examples/QProcessJob/MainWindowUi.ui:36
+#. i18n: ectx: property (text), widget (QPushButton, pushButtonQuit)
+#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:66
+#. i18n: ectx: property (text), widget (QPushButton, pbQuit)
+#: rc.cpp:286 rc.cpp:1133 rc.cpp:1142 rc.cpp:1160
+msgid "Quit"
+msgstr "Terfynu"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:126
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceAllBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:212
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceAllBtn)
-#: rc.cpp:270 rc.cpp:932 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:261
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:212
-msgid ""
-"<qt>\n"
-"<p>Click here to replace all occurrences of the unknown text with the text "
-"in the edit box above (to the left).</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:186
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:289
+msgid "Quit application..."
 msgstr ""
-"<qt>\n"
-"<p>Cliciwch yma i amnewid pob digwyddiad o'r testun anghywir efo'r testun yn "
-"y blwch golygu uchod (i'r chwith).</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:129
-#. i18n: ectx: property (text), widget (QPushButton, m_replaceAllBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:215
-#. i18n: ectx: property (text), widget (QPushButton, m_replaceAllBtn)
-#: rc.cpp:275 rc.cpp:937 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:265
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:216
-msgid "R&eplace All"
-msgstr "Amnewid y &Cwbl"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:194
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#: rc.cpp:292 kross/ui/view.cpp:301
+msgid "Run"
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:136
-#. i18n: ectx: property (toolTip), widget (Q3ListView, m_suggestions)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:124
-#. i18n: ectx: property (toolTip), widget (QListView, m_suggestions)
-#: rc.cpp:278 rc.cpp:886 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:224
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:219
-msgid "Suggestion List"
-msgstr "Rhestr Awgrymiadau"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:197
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:295
+msgid "Run script..."
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:142
-#. i18n: ectx: property (whatsThis), widget (Q3ListView, m_suggestions)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:130
-#. i18n: ectx: property (whatsThis), widget (QListView, m_suggestions)
-#: rc.cpp:281 rc.cpp:889 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:227
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:222
-msgid ""
-"<qt>\n"
-"<p>If the unknown word is misspelled, you should check if the correction for "
-"it is available and if it is, click on it. If none of the words in this list "
-"is a good replacement you may type the correct word in the edit box "
-"above.</p>\n"
-"<p>To correct this word click <b>Replace</b> if you want to correct only "
-"this occurrence or <b>Replace All</b> if you want to correct all "
-"occurrences.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:205
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#: rc.cpp:298
+msgid "Run To..."
 msgstr ""
-"<qt>\n"
-"<p>Os camsillafwyd y gair anhysbys, dylech gwirio os mae'r cywiriad amdano "
-"ar gael, ac os mae, clicio arnodd.  Os nid yw unrhyw un o'r geiriau ar y "
-"rhestr yma yn amnewidiad da, gallwch deipio'r gair cywir i mewn i'r blwch "
-"golygu uchod.</p>\n"
-"<p>Gallwch glicio <b>Amnewid</b> wedyn os ydych eisiau cywiro'r digwyddiad "
-"yma o'r gair yn unig, neu <b>Amnewid Pob Un</b> os ydych eisiau cywiro pob "
-"digwyddiad.</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:149
-#. i18n: ectx: property (text), widget (Q3ListView, m_suggestions)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:137
-#. i18n: ectx: property (text), widget (QListView, m_suggestions)
-#: rc.cpp:287 rc.cpp:895 obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:107
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:217
-msgid "Suggested Words"
-msgstr "Geiriau Awgrymedig"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:208
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:301
+msgid "Run to breakpoint..."
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:159
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:200
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceBtn)
-#: rc.cpp:290 rc.cpp:924 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:255
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:228
-msgid ""
-"<qt>\n"
-"<p>Click here to replace this occurrence of the unknown text with the text "
-"in the edit box above (to the left).</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:216
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#: rc.cpp:304
+msgid "Step"
+msgstr "Cam"
+
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:219
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:307
+msgid "Step to next line..."
 msgstr ""
-"<qt>\n"
-"<p>Cliciwch yma i amnewid y digwyddiad yma o'r testun anghywir efo'r testun "
-"yn y blwch golygu uchod (i'r chwith).</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:162
-#. i18n: ectx: property (text), widget (QPushButton, m_replaceBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:203
-#. i18n: ectx: property (text), widget (QPushButton, m_replaceBtn)
-#: rc.cpp:295 rc.cpp:929 kdeui/findreplace/kfinddialog.cpp:198
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:259
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:232
-#: obj-sparc-linux-gnu/kate/ui_searchbarpower.h:244
-msgid "&Replace"
-msgstr "&Amnewid"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:227
+#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:87
+#. i18n: ectx: property (text), widget (QPushButton, pbStop)
+#: rc.cpp:310 rc.cpp:1130 kdeui/jobs/kstatusbarjobtracker.cpp:160
+#: kdeui/util/kkeyserver_x11.cpp:103 kdeui/util/kstandardguiitem.cpp:281
+#: kross/ui/view.cpp:308
+msgid "Stop"
+msgstr "Aros"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:172
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
-#. i18n: file: kde3support/kdeui/k3spellui.ui:214
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_replacement)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:148
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:164
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_replacement)
-#: rc.cpp:298 rc.cpp:325 rc.cpp:898 rc.cpp:907
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:233
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:240
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:234
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:255
-msgid ""
-"<qt>\n"
-"<p>If the unknown word is misspelled, you should type the correction for "
-"your misspelled word here or select it from the list below.</p>\n"
-"<p>You can then click <b>Replace</b> if you want to correct only this "
-"occurrence of the word or <b>Replace All</b> if you want to correct all "
-"occurrences.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:230
+#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
+#: rc.cpp:313
+msgid "Step execution..."
 msgstr ""
-"<qt>\n"
-"<p>Os camsillafwyd y gair anhysbys, dylech deipio'r cywiriad am y gair "
-"wedi'i gamsillafu yma, neu ei ddewis o'r rhestr isod.</p>\n"
-"<p>Gallwch glicio <b>Amnewid</b> wedyn os ydych eisiau cywiro'r digwyddiad "
-"yma o'r gair yn unig, neu <b>Amnewid Pob Un</b> os ydych eisiau cywiro pob "
-"digwyddiad.</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:175
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:151
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:304 rc.cpp:904 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:238
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:239
-msgid "Replace &with:"
-msgstr "Amnewid &efo:"
+#. i18n: file: kjsembed/examples/calc/calc.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, calc)
+#: rc.cpp:316
+msgid "JS Calculator"
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:188
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:225
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipBtn)
-#: rc.cpp:307 rc.cpp:940 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:267
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:241
-msgid ""
-"<qt>\n"
-"<p>Click here to let this occurrence of the unknown word remain as is.</p>\n"
-"<p>This action is useful when the word is a name, an acronym, a foreign word "
-"or any other unknown word that you want to use but not add to the "
-"dictionary.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/calc/calc.ui:40
+#. i18n: ectx: property (text), widget (QPushButton, plus)
+#: rc.cpp:319
+msgctxt "addition"
+msgid "+"
 msgstr ""
-"<qt>\n"
-"<p>Cliciwch yma i adael i'r digwyddiad yma o'r gair anhysbys aros fel y "
-"mae.</p>\n"
-"<p>Mae'r weithred yma yn ddefnyddiol pan mae'r gair yn enw, llythrenw, gair "
-"estron, neu unrhyw un gair yr ydych eisiau ei ddefnyddio, ond peidio a'i "
-"ychwanegu i'r geiriadur.</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:191
-#. i18n: ectx: property (text), widget (QPushButton, m_skipBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:228
-#. i18n: ectx: property (text), widget (QPushButton, m_skipBtn)
-#: rc.cpp:313 rc.cpp:946 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:272
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:246
-msgid "&Ignore"
-msgstr "&Anwybyddu:"
+#. i18n: file: kjsembed/examples/calc/calc.ui:47
+#. i18n: ectx: property (text), widget (QPushButton, all_clear)
+#: rc.cpp:322
+msgid "AC"
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:201
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipAllBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:238
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipAllBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:251
-#. i18n: ectx: property (whatsThis), widget (QPushButton, m_autoCorrect)
-#: rc.cpp:316 rc.cpp:949 rc.cpp:958
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:274
-#: obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:281
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:248
-msgid ""
-"<qt>\n"
-"<p>Click here to let all occurrences of the unknown word remain as they "
-"are.</p>\n"
-"<p>This action is useful when the word is a name, an acronym, a foreign word "
-"or any other unknown word that you want to use but not add to the "
-"dictionary.</p>\n"
-"</qt>"
+#. i18n: file: kjsembed/examples/calc/calc.ui:54
+#. i18n: ectx: property (text), widget (QPushButton, minus)
+#: rc.cpp:325
+msgctxt "subtraction"
+msgid "-"
 msgstr ""
-"<qt>\n"
-"<p>Cliciwch yma i adael i bob digwyddiad o'r gair anhysbys aros fel y "
-"maent.</p>\n"
-"<p>Mae'r weithred yma yn ddefnyddiol pan mae'r gair yn enw, llythrenw, gair "
-"estron, neu unrhyw un gair yr ydych eisiau ei ddefnyddio, ond peidio a'i "
-"ychwanegu i'r geiriadur.</p>\n"
-"</qt>"
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:204
-#. i18n: ectx: property (text), widget (QPushButton, m_skipAllBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:241
-#. i18n: ectx: property (text), widget (QPushButton, m_skipAllBtn)
-#: rc.cpp:322 rc.cpp:955 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:279
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:253
-msgid "I&gnore All"
-msgstr "A&nwybyddu Popeth:"
+#. i18n: file: kjsembed/examples/calc/calc.ui:61
+#. i18n: ectx: property (text), widget (QPushButton, equals)
+#: rc.cpp:328
+msgctxt "evaluation"
+msgid "="
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:221
-#. i18n: ectx: property (text), widget (QPushButton, m_suggestBtn)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:191
-#. i18n: ectx: property (text), widget (QPushButton, m_suggestBtn)
-#: rc.cpp:331 rc.cpp:921 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:253
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:260
-msgid "S&uggest"
-msgstr "A&wgrymu:"
+#. i18n: file: kjsembed/examples/calc/calc.ui:68
+#. i18n: ectx: property (text), widget (QPushButton, clear)
+#: rc.cpp:331
+msgid "CL"
+msgstr ""
 
-#. i18n: file: kde3support/kdeui/k3spellui.ui:228
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_language)
-#. i18n: file: kdeui/sonnet/sonnetui.ui:171
-#. i18n: ectx: property (toolTip), widget (KComboBox, m_language)
-#: rc.cpp:334 rc.cpp:913 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:246
-#: obj-sparc-linux-gnu/kde3support/ui_k3spellui.h:262
-msgid "Language Selection"
-msgstr "Dewis Iaith"
+#. i18n: file: kjsembed/examples/calc/calc.ui:75
+#. i18n: ectx: property (text), widget (QPushButton, zero)
+#. i18n: file: khtml/test_regression_gui.ui:47
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
+#: rc.cpp:334 rc.cpp:725
+msgid "0"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:82
+#. i18n: ectx: property (text), widget (QPushButton, four)
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:56
+#. i18n: ectx: property (text), widget (QRadioButton, fourUpRadioButton)
+#: rc.cpp:337 rc.cpp:424
+msgid "4"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:89
+#. i18n: ectx: property (text), widget (QPushButton, two)
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:42
+#. i18n: ectx: property (text), widget (QRadioButton, twoUpRadioButton)
+#: rc.cpp:340 rc.cpp:418
+msgid "2"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:96
+#. i18n: ectx: property (text), widget (QPushButton, five)
+#: rc.cpp:343
+msgid "5"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:103
+#. i18n: ectx: property (text), widget (QPushButton, three)
+#: rc.cpp:346
+msgid "3"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:110
+#. i18n: ectx: property (text), widget (QPushButton, seven)
+#: rc.cpp:349
+msgid "7"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:117
+#. i18n: ectx: property (text), widget (QPushButton, six)
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:35
+#. i18n: ectx: property (text), widget (QRadioButton, sixUpRadioButton)
+#: rc.cpp:352 rc.cpp:415
+msgid "6"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:124
+#. i18n: ectx: property (text), widget (QPushButton, eight)
+#: rc.cpp:355
+msgid "8"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:131
+#. i18n: ectx: property (text), widget (QPushButton, nine)
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:49
+#. i18n: ectx: property (text), widget (QRadioButton, nineUpRadioButton)
+#: rc.cpp:358 rc.cpp:421
+msgid "9"
+msgstr ""
+
+#. i18n: file: kjsembed/examples/calc/calc.ui:138
+#. i18n: ectx: property (text), widget (QPushButton, one)
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:25
+#. i18n: ectx: property (text), widget (QRadioButton, oneUpRadioButton)
+#: rc.cpp:361 rc.cpp:412
+msgid "1"
+msgstr ""
 
 #. i18n: file: interfaces/ktexteditor/editorchooser_ui.ui:5
 #. i18n: ectx: property (windowTitle), widget (QWidget, EditorChooser)
-#: rc.cpp:369
-#: obj-sparc-linux-gnu/interfaces/ktexteditor/ui_editorchooser_ui.h:68
+#: rc.cpp:367
 msgid "Editor Chooser"
 msgstr "Dewisydd Golygydd"
 
 #. i18n: file: interfaces/ktexteditor/editorchooser_ui.ui:19
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:372
-#: obj-sparc-linux-gnu/interfaces/ktexteditor/ui_editorchooser_ui.h:69
+#: rc.cpp:370
 msgid ""
 "Please choose the default text editing component that you wish to use in "
 "this application. If you choose <B>System Default</B>, the application will "
@@ -973,950 +781,689 @@
 "that setting."
 msgstr ""
 
-#. i18n: file: khtml/khtml_browser.rc:4
-#. i18n: ectx: Menu (file)
 #. i18n: file: kdeui/xmlgui/ui_standards.rc:5
 #. i18n: ectx: Menu (file)
-#: rc.cpp:375 rc.cpp:678
+#. i18n: file: khtml/khtml_browser.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:373 rc.cpp:803
 msgid "&File"
 msgstr "&Ffeil"
 
-#. i18n: file: khtml/khtml_browser.rc:11
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:34
+#. i18n: ectx: Menu (game)
+#: rc.cpp:376
+msgid "&Game"
+msgstr "&Gêm"
+
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:61
 #. i18n: ectx: Menu (edit)
 #. i18n: file: khtml/khtml.rc:4
 #. i18n: ectx: Menu (edit)
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:61
+#. i18n: file: khtml/khtml_browser.rc:11
 #. i18n: ectx: Menu (edit)
-#: rc.cpp:378 rc.cpp:399 rc.cpp:684
+#: rc.cpp:379 rc.cpp:800 rc.cpp:806
 msgid "&Edit"
 msgstr "&Golygu"
 
-#. i18n: file: khtml/khtml_browser.rc:20
-#. i18n: ectx: Menu (view)
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:84
+#. i18n: ectx: Menu (move)
+#: rc.cpp:382
+msgctxt "@title:menu Game move"
+msgid "&Move"
+msgstr ""
+
 #. i18n: file: kdeui/xmlgui/ui_standards.rc:101
 #. i18n: ectx: Menu (view)
-#: rc.cpp:381 rc.cpp:690
+#. i18n: file: khtml/khtml_browser.rc:18
+#. i18n: ectx: Menu (view)
+#: rc.cpp:385 rc.cpp:809
 msgid "&View"
 msgstr "&Golwg"
 
-#. i18n: file: khtml/khtml_browser.rc:35
-#. i18n: ectx: ToolBar (htmlToolBar)
-#: rc.cpp:384
-msgid "HTML Toolbar"
-msgstr ""
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:117
+#. i18n: ectx: Menu (go)
+#: rc.cpp:388
+msgid "&Go"
+msgstr "&Mynd"
 
-#. i18n: file: khtml/kjserrordlgbase.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, KJSErrorDlgBase)
-#: rc.cpp:387 obj-sparc-linux-gnu/khtml/ui_kjserrordlgbase.h:102
-msgid "JavaScript Errors"
-msgstr "Gwallau JavaScript"
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:138
+#. i18n: ectx: Menu (bookmarks)
+#: rc.cpp:391
+msgid "&Bookmarks"
+msgstr "&Tudnodau"
 
-#. i18n: file: khtml/kjserrordlgbase.ui:17
-#. i18n: ectx: property (whatsThis), widget (QDialog, KJSErrorDlgBase)
-#: rc.cpp:390 obj-sparc-linux-gnu/khtml/ui_kjserrordlgbase.h:104
-msgid ""
-"This dialog provides you with notification and details of scripting errors "
-"that occur on web pages.  In many cases it is due to an error in the web "
-"site as designed by its author.  In other cases it is the result of a "
-"programming error in Konqueror.  If you suspect the former, please contact "
-"the webmaster of the site in question.  Conversely if you suspect an error "
-"in Konqueror, please file a bug report at http://bugs.kde.org/.  A test case "
-"which illustrates the problem will be appreciated."
-msgstr ""
-"Mae'r ymgom yma yn cynhyrchu hysbysiad a manylion o wallau sgriptio sy'n "
-"digwydd ar dudalennau gwê.  Y mwyafrif o'r amser yr achos yw gwall yn "
-"nyluniad y safwe gan ei awdur.  Weithiau eraill mae'n ganlyniad o nam "
-"rhaglennu yn Konqueror.  Os ydych yn drwgdybio'r safwe, cysylltwch â "
-"gwefeistr y safwe mewn cwestiwn.  Ar y llaw arall, os ydych yn drwgdybio "
-"Konqueror, gwnewch adroddiad nam wrth http://bugs.kde.org/.  Gwerthfawrogir "
-"achos prawf sy'n llunio'r problem."
-
-#. i18n: file: khtml/kjserrordlgbase.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, _close)
-#: rc.cpp:393 kdeui/util/kstandardguiitem.cpp:184
-#: kdeui/actions/kstandardaction_p.h:49
-#: obj-sparc-linux-gnu/khtml/ui_kjserrordlgbase.h:106
-msgid "&Close"
-msgstr "&Cau"
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:144
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:394
+msgid "&Tools"
+msgstr "&Offer"
 
-#. i18n: file: khtml/kjserrordlgbase.ui:36
-#. i18n: ectx: property (text), widget (QPushButton, _clear)
-#: rc.cpp:396 kdeui/util/kstandardguiitem.cpp:171
-#: kdeui/actions/kstandardaction_p.h:61
-#: obj-sparc-linux-gnu/khtml/ui_kjserrordlgbase.h:107
-msgid "C&lear"
-msgstr "C&lirio"
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:148
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:397 khtml/ecma/debugger/debugwindow.cpp:240
+msgid "&Settings"
+msgstr "Gosod&iadau"
 
-#. i18n: file: khtml/test_regression_gui.ui:13
-#. i18n: ectx: property (windowTitle), widget (QMainWindow, MainWindow)
-#: rc.cpp:402
-msgid "KHTML Regression Testing Utility"
-msgstr ""
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:177
+#. i18n: ectx: Menu (help)
+#: rc.cpp:400 kdeui/widgets/khelpmenu.cpp:188
+msgid "&Help"
+msgstr "&Cymorth"
 
-#. i18n: file: khtml/test_regression_gui.ui:47
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#. i18n: file: kjsembed/examples/calc/calc.ui:75
-#. i18n: ectx: property (text), widget (QPushButton, zero)
-#: rc.cpp:405 rc.cpp:648
-msgid "0"
-msgstr ""
+#. i18n: file: kdeui/xmlgui/ui_standards.rc:194
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:403
+msgid "Main Toolbar"
+msgstr "Prif Far Offer"
 
-#. i18n: file: khtml/test_regression_gui.ui:56
-#. i18n: ectx: attribute (title), widget (QWidget, firstTab)
-#: rc.cpp:408
-msgid "Regression testing output"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, KCupsOptionsPagesWidget)
+#: rc.cpp:406
+msgid "Pages"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:111
-#. i18n: ectx: property (toolTip), widget (QPushButton, pauseContinueButton)
-#. i18n: file: khtml/test_regression_gui.ui:114
-#. i18n: ectx: property (whatsThis), widget (QPushButton, pauseContinueButton)
-#: rc.cpp:411 rc.cpp:414
-msgid "Pause/Continue regression testing process"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:19
+#. i18n: ectx: property (title), widget (KButtonGroup, pagesPerSheetButtonGroup)
+#: rc.cpp:409
+msgid "Pages Per Sheet"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:120
-#. i18n: ectx: property (text), widget (QPushButton, pauseContinueButton)
-#: rc.cpp:417 khtml/test_regression_gui_window.cpp:571
-#: khtml/rendering/media_controls.cpp:50
-msgid "Pause"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:63
+#. i18n: ectx: property (text), widget (QRadioButton, sixteenUpRadioButton)
+#: rc.cpp:427
+msgid "16"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:144
-#. i18n: ectx: property (toolTip), widget (QPushButton, saveLogButton)
-#. i18n: file: khtml/test_regression_gui.ui:147
-#. i18n: ectx: property (whatsThis), widget (QPushButton, saveLogButton)
-#: rc.cpp:420 rc.cpp:423
-msgid ""
-"You may select a file where the log content is stored, before the regression "
-"testing is started."
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:89
+#. i18n: ectx: property (title), widget (QGroupBox, bannerPagesGroupBox)
+#: rc.cpp:430
+msgid "Banner Pages"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:150
-#. i18n: ectx: property (text), widget (QPushButton, saveLogButton)
-#: rc.cpp:426
-msgid "Output to File..."
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:95
+#. i18n: ectx: property (text), widget (QLabel, startBannerLabel)
+#: rc.cpp:433
+msgctxt "Banner page at start"
+msgid "Start"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:162
-#. i18n: ectx: property (text), widget (QLabel, statusLabel)
-#: rc.cpp:429
-msgid "Regression Testing Status"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:105
+#. i18n: ectx: property (text), widget (QLabel, endBannerLabel)
+#: rc.cpp:436
+msgctxt "Banner page at end"
+msgid "End"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:182
-#. i18n: ectx: attribute (title), widget (QWidget, secondTab)
-#: rc.cpp:432
-msgid "View HTML Output"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:131
+#. i18n: ectx: property (title), widget (QGroupBox, pageLabelGroupBox)
+#: rc.cpp:439
+msgid "Page Label"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:203
-#. i18n: ectx: property (title), widget (QMenu, menuSettings)
-#: rc.cpp:435
-msgid "Settings"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:156
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:442
+msgid "Page Border"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:212
-#. i18n: ectx: property (title), widget (QMenu, menuMain)
-#: rc.cpp:438
-msgid "Tests"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:181
+#. i18n: ectx: property (title), widget (QGroupBox, mirrorPagesGroupBox)
+#: rc.cpp:445
+msgid "Mirror Pages"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:238
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:441
-msgid "Only Run JS Tests"
+#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:187
+#. i18n: ectx: property (text), widget (QCheckBox, mirrorPagesCheckBox)
+#: rc.cpp:448
+msgid "Mirror pages along vertical axis"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:246
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:444
-msgid "Only Run HTML Tests"
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:16
+#. i18n: ectx: property (whatsThis), widget (KTreeWidgetSearchLineWidget, searchFilter)
+#: rc.cpp:451
+msgid ""
+"Search interactively for shortcut names (e.g. Copy) or combination of keys "
+"(e.g. Ctrl+C) by typing them here."
 msgstr ""
+"Chwilio yn rhyngweithiol ar gyfer enwau byrlwybrau (e.e. Copïo) neu cyfuniad "
+"o fysellau (e.e. Ctrl+C) gan eu teipio yma."
 
-#. i18n: file: khtml/test_regression_gui.ui:254
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:447
-msgid "Do Not Suppress Debug Output"
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:23
+#. i18n: ectx: property (whatsThis), widget (QTreeWidget, list)
+#: rc.cpp:454
+msgid ""
+"Here you can see a list of key bindings, i.e. associations between actions "
+"(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
+"Ctrl+V) shown in the right column."
 msgstr ""
+"Gwelir yma rhestr o rhwymiadau bysell, h.y. cysylltiadau rhwng "
+"gweithrediadau (e.e.'Copi') sy'n ymddangos yn y golofn chwith a bysellau neu "
+"cyfuniad o fysellau (e.e. Ctrl+V) sy'n ymddangos yn y golofn dde."
 
-#. i18n: file: khtml/test_regression_gui.ui:262
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:450 khtml/test_regression.cpp:630
-msgid "Do not use Xvfb"
-msgstr ""
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:33
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:457
+msgid "Action"
+msgstr "Gweithrediad"
 
-#. i18n: file: khtml/test_regression_gui.ui:267
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:453
-msgid "Run Tests..."
-msgstr ""
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:38
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:460
+msgid "Shortcut"
+msgstr "Byrlwybr"
 
-#. i18n: file: khtml/test_regression_gui.ui:272
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:456
-msgid "Run Single Test..."
-msgstr ""
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:43
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:463
+msgid "Alternate"
+msgstr "Eiledol"
 
-#. i18n: file: khtml/test_regression_gui.ui:277
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:459
-msgid "Specify tests Directory..."
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:48
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:466
+msgid "Global"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:282
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:462
-msgid "Specify khtml Directory..."
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:53
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:469
+msgid "Global Alternate"
 msgstr ""
 
-#. i18n: file: khtml/test_regression_gui.ui:287
-#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
-#: rc.cpp:465
-msgid "Specify Output Directory..."
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:58
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:472
+msgid "Mouse Button Gesture"
 msgstr ""
 
-#. i18n: file: khtml/htmlpageinfo.ui:21
-#. i18n: ectx: property (windowTitle), widget (QDialog, KHTMLInfoDlg)
-#: rc.cpp:468 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:208
-msgid "Document Information"
-msgstr "Gwybodaeth am y Ddogfen"
-
-#. i18n: file: khtml/htmlpageinfo.ui:45
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:471
-msgctxt "@title:group Document information"
-msgid "General"
+#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:63
+#. i18n: ectx: property (text), widget (QTreeWidget, list)
+#: rc.cpp:475
+msgid "Mouse Shape Gesture"
 msgstr ""
 
-#. i18n: file: khtml/htmlpageinfo.ui:92
-#. i18n: ectx: property (text), widget (QLabel, urlLabel)
-#: rc.cpp:474 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:210
-msgid "URL:"
-msgstr "URL:"
+#. i18n: file: kdeui/dialogs/knewpassworddialog.ui:54
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:481 kde3support/kdeui/k3passworddialog.cpp:387
+msgid "&Verify:"
+msgstr "&Gwireddu:"
 
-#. i18n: file: khtml/htmlpageinfo.ui:160
-#. i18n: ectx: property (text), widget (QLabel, _lmLabel)
-#: rc.cpp:480 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:212
-msgid "Last modified:"
-msgstr "Newid diweddaraf:"
+#. i18n: file: kdeui/dialogs/knewpassworddialog.ui:82
+#. i18n: ectx: property (text), widget (QLabel, labelStrengthMeter)
+#: rc.cpp:484 kde3support/kdeui/k3passworddialog.cpp:408
+msgid "Password strength meter:"
+msgstr "Faint mor gryf yw'r cyfrinair:"
 
-#. i18n: file: khtml/htmlpageinfo.ui:176
-#. i18n: ectx: property (text), widget (QLabel, _eLabel)
-#: rc.cpp:483 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:213
-msgid "Document encoding:"
-msgstr "Amgodiad y ddogfen:"
+#. i18n: file: kdeui/dialogs/knewpassworddialog.ui:104
+#. i18n: ectx: property (text), widget (KTitleWidget, labelMatch)
+#: rc.cpp:487 kdeui/dialogs/knewpassworddialog.cpp:176
+#: kde3support/kdeui/k3passworddialog.cpp:430
+#: kde3support/kdeui/k3passworddialog.cpp:623
+msgid "Passwords do not match"
+msgstr "Nid yw'r cyfrineiriau yn cydweddu"
 
-#. i18n: file: khtml/htmlpageinfo.ui:167
-#. i18n: ectx: property (text), widget (QLabel, _modeLabel)
-#: rc.cpp:1143 obj-i686-linux-gnu/khtml/ui_htmlpageinfo.h:234
-msgid "Rendering mode:"
+#. i18n: file: kdeui/dialogs/kpassworddialog.ui:31
+#. i18n: ectx: property (text), widget (QLabel, prompt)
+#: rc.cpp:490
+msgid "Supply a username and password below."
 msgstr ""
 
-#. i18n: file: khtml/htmlpageinfo.ui:204
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:486 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:214
-msgid "HTTP Headers"
-msgstr "Penodau HTTP"
-
-#. i18n: file: khtml/htmlpageinfo.ui:241
-#. i18n: ectx: property (text), widget (QTreeWidget, _headers)
-#: rc.cpp:489 obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:217
-msgid "Property"
-msgstr "Priodwedd"
+#. i18n: file: kdeui/dialogs/kpassworddialog.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, anonymousCheckBox)
+#: rc.cpp:496
+msgid "Anonymous"
+msgstr "Dienw"
 
-#. i18n: file: khtml/htmlpageinfo.ui:246
-#. i18n: ectx: property (text), widget (QTreeWidget, _headers)
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:122
-#. i18n: ectx: property (text), widget (QTableWidget, jobOptionsTable)
-#: rc.cpp:492 rc.cpp:732 khtml/ecma/debugger/localvariabledock.cpp:52
-#: khtml/java/kjavaappletviewer.cpp:140
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:161
-#: obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:216
-msgid "Value"
-msgstr "Gwerth"
+#. i18n: file: kdeui/dialogs/kpassworddialog.ui:93
+#. i18n: ectx: property (text), widget (QLabel, domainLabel)
+#: rc.cpp:499
+msgid "Domain:"
+msgstr ""
 
-#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:39
-#. i18n: ectx: property (text), widget (QLabel, m_label)
-#: rc.cpp:495 khtml/ui/passwordbar/storepassbar.cpp:59
-#: obj-sparc-linux-gnu/khtml/ui_storepassbar_base.h:103
-msgid "Do you want to store this password?"
+#. i18n: file: kdeui/dialogs/kpassworddialog.ui:123
+#. i18n: ectx: property (text), widget (QCheckBox, keepCheckBox)
+#: rc.cpp:505
+msgid "Remember password"
 msgstr ""
 
-#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:62
-#. i18n: ectx: property (text), widget (QToolButton, m_store)
-#: rc.cpp:498 obj-sparc-linux-gnu/khtml/ui_storepassbar_base.h:104
-msgid "&Store"
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, KCupsOptionsJobWidget)
+#: rc.cpp:508
+msgid "Job"
 msgstr ""
 
-#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:72
-#. i18n: ectx: property (text), widget (QToolButton, m_neverForThisSite)
-#: rc.cpp:501 obj-sparc-linux-gnu/khtml/ui_storepassbar_base.h:105
-msgid "Ne&ver store for this site"
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, jobControlGroupBox)
+#: rc.cpp:511
+msgid "Job Control"
 msgstr ""
 
-#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:82
-#. i18n: ectx: property (text), widget (QToolButton, m_doNotStore)
-#: rc.cpp:504 obj-sparc-linux-gnu/khtml/ui_storepassbar_base.h:106
-msgid "Do &not store this time"
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:25
+#. i18n: ectx: property (text), widget (QLabel, jobHoldLabel)
+#: rc.cpp:514
+msgid "Scheduled printing:"
 msgstr ""
 
-#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:43
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:507 obj-sparc-linux-gnu/khtml/ui_khtmlfindbar_base.h:130
-#: obj-sparc-linux-gnu/kate/ui_searchbarincremental.h:130
-#: obj-sparc-linux-gnu/kate/ui_searchbarpower.h:225
-msgid "F&ind:"
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:38
+#. i18n: ectx: property (text), widget (QLabel, jobBillingLabel)
+#: rc.cpp:517
+msgid "Billing information:"
 msgstr ""
 
-#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:75
-#. i18n: ectx: property (text), widget (QToolButton, m_next)
-#: rc.cpp:510 obj-sparc-linux-gnu/khtml/ui_khtmlfindbar_base.h:131
-#: obj-sparc-linux-gnu/kate/ui_searchbarincremental.h:137
-#: obj-sparc-linux-gnu/kate/ui_searchbarpower.h:232
-msgid "&Next"
-msgstr "&Nesaf"
-
-#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:85
-#. i18n: ectx: property (text), widget (QToolButton, m_previous)
-#: rc.cpp:513 kdeui/dialogs/ktip.cpp:305
-#: obj-sparc-linux-gnu/khtml/ui_khtmlfindbar_base.h:132
-#: obj-sparc-linux-gnu/kate/ui_searchbarincremental.h:141
-#: obj-sparc-linux-gnu/kate/ui_searchbarpower.h:236
-msgid "&Previous"
-msgstr "&Blaenorol"
-
-#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:111
-#. i18n: ectx: property (text), widget (QToolButton, m_options)
-#: rc.cpp:516 obj-sparc-linux-gnu/khtml/ui_khtmlfindbar_base.h:133
-msgid "Opt&ions"
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:48
+#. i18n: ectx: property (text), widget (QLabel, jobPriorityLabel)
+#: rc.cpp:520
+msgid "Job priority:"
 msgstr ""
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, JobsBase)
-#: rc.cpp:519
-msgid "ThreadWeaver Jobs Examples"
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:94
+#. i18n: ectx: property (title), widget (QGroupBox, jobOptionsGroupBox)
+#: rc.cpp:523
+msgid "Job Options"
 msgstr ""
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:16
-#. i18n: ectx: property (toolTip), widget (QWidget, JobsBase)
-#: rc.cpp:522
-msgid ""
-"The program executes 100 jobs in 4 threads. Each job waits for a random "
-"number of milliseconds between 1 and 1000."
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:117
+#. i18n: ectx: property (text), widget (QTableWidget, jobOptionsTable)
+#: rc.cpp:526
+msgid "Option"
 msgstr ""
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:36
-#. i18n: ectx: property (toolTip), widget (QCheckBox, cbLog)
-#: rc.cpp:525
-msgid ""
-"Check to see logging information about thread activity. Watch the console "
-"output to see the log information."
-msgstr ""
+#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:122
+#. i18n: ectx: property (text), widget (QTableWidget, jobOptionsTable)
+#. i18n: file: khtml/htmlpageinfo.ui:219
+#. i18n: ectx: property (text), widget (QTreeWidget, _headers)
+#: rc.cpp:529 rc.cpp:719 khtml/ecma/debugger/localvariabledock.cpp:52
+#: khtml/java/kjavaappletviewer.cpp:140
+msgid "Value"
+msgstr "Gwerth"
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:39
-#. i18n: ectx: property (text), widget (QCheckBox, cbLog)
-#: rc.cpp:528
-msgid "Log thread activity"
+#. i18n: file: kdeui/widgets/kshortcutwidget.ui:22
+#. i18n: ectx: property (text), widget (QLabel, priLabel)
+#: rc.cpp:532 kdeui/dialogs/kshortcutseditor.cpp:648
+msgid "Main:"
 msgstr ""
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:59
-#. i18n: ectx: property (toolTip), widget (ThreadWeaver::WeaverThreadGrid, threadGrid)
-#: rc.cpp:531
-msgid "Displays Thread Activity"
+#. i18n: file: kdeui/widgets/kshortcutwidget.ui:52
+#. i18n: ectx: property (text), widget (QLabel, altLabel)
+#: rc.cpp:535 kdeui/dialogs/kshortcutseditor.cpp:649
+msgid "Alternate:"
 msgstr ""
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:77
-#. i18n: ectx: property (text), widget (QPushButton, pbStart)
-#: rc.cpp:534 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:218
-msgid "Start"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:33
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: kdeui/sonnet/sonnetui.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLabel, m_unknownWord)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:33
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLabel, m_unknownWord)
+#: rc.cpp:538 rc.cpp:550 rc.cpp:839 rc.cpp:851
+msgid ""
+"<qt><p>This word was considered to be an \"unknown word\" because it does "
+"not match any entry in the dictionary currently in use. It may also be a "
+"word in a foreign language.</p>\n"
+"<p>If the word is not misspelled, you may add it to the dictionary by "
+"clicking <b>Add to Dictionary</b>. If you do not want to add the unknown "
+"word to the dictionary, but you want to leave it unchanged, click "
+"<b>Ignore</b> or <b>Ignore All</b>.</p>\n"
+"<p>However, if the word is misspelled, you can try to find the correct "
+"replacement in the list below. If you cannot find a replacement there, you "
+"may type it in the text box below, and click <b>Replace</b> or <b>Replace "
+"All</b>.</p>\n"
+"</qt>"
 msgstr ""
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:87
-#. i18n: ectx: property (text), widget (QPushButton, pbStop)
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:227
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:537 rc.cpp:618 kross/ui/view.cpp:308
-#: kdeui/jobs/kstatusbarjobtracker.cpp:160 kdeui/util/kkeyserver_x11.cpp:103
-#: kdeui/util/kstandardguiitem.cpp:281
-msgid "Stop"
-msgstr "Aros"
-
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:97
-#. i18n: ectx: property (text), widget (QPushButton, pbQuit)
-#. i18n: file: threadweaver/Examples/QProcessJob/MainWindowUi.ui:36
-#. i18n: ectx: property (text), widget (QPushButton, pushButtonQuit)
-#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:66
-#. i18n: ectx: property (text), widget (QPushButton, pbQuit)
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:183
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:540 rc.cpp:549 rc.cpp:567 rc.cpp:594
-msgid "Quit"
-msgstr "Terfynu"
-
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:182
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:543
-msgid "GUI based example for the Weaver Thread Manager"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:544 rc.cpp:845
+msgid "Unknown word:"
+msgstr "Gair anhysbys"
 
-#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:205
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:546
-msgid "Remaining number of jobs:"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:43
+#. i18n: ectx: property (toolTip), widget (QLabel, m_unknownWord)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:43
+#. i18n: ectx: property (toolTip), widget (QLabel, m_unknownWord)
+#: rc.cpp:547 rc.cpp:848
+msgid "Unknown word"
+msgstr "Gair anhysbys"
 
-#. i18n: file: threadweaver/Examples/QProcessJob/MainWindowUi.ui:43
-#. i18n: ectx: property (text), widget (QPushButton, pushButtonStart)
-#: rc.cpp:552
-msgid "What time is it? Click to update."
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:52
+#. i18n: ectx: property (text), widget (QLabel, m_unknownWord)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:52
+#. i18n: ectx: property (text), widget (QLabel, m_unknownWord)
+#: rc.cpp:556 rc.cpp:857
+msgid "<b>misspelled</b>"
+msgstr "<b>wedi'i gamsillafu</b>"
 
-#. i18n: file: threadweaver/Examples/QProcessJob/MainWindowUi.ui:50
-#. i18n: ectx: property (text), widget (QLabel, labelTime)
-#: rc.cpp:555
+#. i18n: file: kdeui/sonnet/sonnetui.ui:61
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
+#. i18n: file: kdeui/sonnet/sonnetui.ui:176
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_language)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:61
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:233
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_language)
+#: rc.cpp:559 rc.cpp:617 rc.cpp:860 rc.cpp:955
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\" "
-"white-space: pre-wrap; font-family:Sans Serif; font-weight:400; font-"
-"style:normal; text-decoration:none;\"><p style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\">(do not know yet)</p></body></html>"
-msgstr ""
-
-#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, pbSelectFiles)
-#: rc.cpp:558
-msgid "Select Files..."
+"<qt>\n"
+"<p>Select the language of the document you are proofing here.</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Dewiswch iaith y ddogfen a broflennir yma.</p>\n"
+"</qt>"
 
-#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:39
-#. i18n: ectx: property (text), widget (QPushButton, pbCancel)
-#: rc.cpp:561
-msgid "Cancel"
-msgstr "Diddymu"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:64
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:64
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:564 rc.cpp:865
+msgid "&Language:"
+msgstr "&Iaith:"
 
-#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, pbSuspend)
-#: rc.cpp:564
-msgid "Suspend"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:74
+#. i18n: ectx: property (toolTip), widget (QLabel, m_contextLabel)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:74
+#. i18n: ectx: property (toolTip), widget (QLabel, m_contextLabel)
+#: rc.cpp:567 rc.cpp:868
+msgid "Text excerpt showing the unknown word in its context."
+msgstr "Detholiad arbrawf sy'n dangos y gair anhysbys yn ei gyd-destun."
 
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:13
-#. i18n: ectx: property (windowTitle), widget (QMainWindow, KJSConsole)
-#. i18n: file: kjsembed/examples/console/console.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, jsConsole)
-#: rc.cpp:570 rc.cpp:624
-msgid "MainWindow"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:79
+#. i18n: ectx: property (whatsThis), widget (QLabel, m_contextLabel)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:79
+#. i18n: ectx: property (whatsThis), widget (QLabel, m_contextLabel)
+#: rc.cpp:570 rc.cpp:871
+msgid ""
+"<qt>\n"
+"<p>Here you can see a text excerpt showing the unknown word in its context. "
+"If this information is not sufficient to choose the best replacement for the "
+"unknown word, you can click on the document you are proofing, read a larger "
+"part of the text and then return here to continue proofing.</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Yma gallwch gweld detholiad testun sy'n dangos y gair anhysbys yn ei gyd-"
+"destun.  Os nad yw'r gwybodaeth yma yn ddigonol i ddewis yr amnewidiad gorau "
+"am y gair anhysbys, gallwch glicio ar y ddgogfen yr ydych yn ei broflennu, "
+"darllen darn mwyaf o'r testun, ac wedyn dychwelyd yma i barhau'r "
+"proflennu.</p>\n"
+"</qt>"
 
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:106
-#. i18n: ectx: property (text), widget (QPushButton, mExecute)
-#: rc.cpp:573 kparts/browserrun.cpp:313
-msgid "Execute"
-msgstr "Gweithredu"
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:125
-#. i18n: ectx: property (title), widget (QMenu, menuFile)
-#: rc.cpp:576
-msgid "File"
-msgstr "Ffeil"
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:164
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:579
-msgid "Open Script"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:85
+#. i18n: ectx: property (text), widget (QLabel, m_contextLabel)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:85
+#. i18n: ectx: property (text), widget (QLabel, m_contextLabel)
+#: rc.cpp:575 rc.cpp:876
+msgid "... the <b>misspelled</b> word shown in context ..."
+msgstr "... y gair <b>a gamsillafwyd</b> yn ei gyd-destun ..."
 
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:167
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:582
-msgid "Open a script..."
+#. i18n: file: kdeui/sonnet/sonnetui.ui:98
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_addBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:98
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_addBtn)
+#: rc.cpp:578 rc.cpp:879
+msgid ""
+"<qt>\n"
+"<p>The unknown word was detected and considered unknown because it is not "
+"included in the dictionary.<br>\n"
+"Click here if you consider the unknown word not to be misspelled, and you "
+"want to avoid wrongly detecting it again in the future. If you want to let "
+"it remain as is, but not add it to the dictionary, then click <b>Ignore</b> "
+"or <b>Ignore All</b> instead.</p>\n"
+"</qt>"
 msgstr ""
 
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:170
-#. i18n: ectx: property (shortcut), widget (QStatusBar, statusBar)
-#: rc.cpp:585
-msgid "Ctrl+O"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:101
+#. i18n: ectx: property (text), widget (QPushButton, m_addBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:101
+#. i18n: ectx: property (text), widget (QPushButton, m_addBtn)
+#: rc.cpp:584 rc.cpp:885
+msgid "<< Add to Dictionary"
+msgstr "<< Ychwanegu i'r Geiriadur"
 
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:175
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:588
-msgid "Close Script"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:124
+#. i18n: ectx: property (toolTip), widget (QListView, m_suggestions)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:136
+#. i18n: ectx: property (toolTip), widget (Q3ListView, m_suggestions)
+#: rc.cpp:587 rc.cpp:896
+msgid "Suggestion List"
+msgstr "Rhestr Awgrymiadau"
 
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:178
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:591
-msgid "Close script..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:186
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:597
-msgid "Quit application..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:194
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:600 kross/ui/view.cpp:301
-msgid "Run"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:197
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:603
-msgid "Run script..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:205
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:606
-msgid "Run To..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:208
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:609
-msgid "Run to breakpoint..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:216
-#. i18n: ectx: property (text), widget (QStatusBar, statusBar)
-#: rc.cpp:612
-msgid "Step"
-msgstr "Cam"
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:219
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:615
-msgid "Step to next line..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/kjsconsole/jsconsole.ui:230
-#. i18n: ectx: property (statusTip), widget (QStatusBar, statusBar)
-#: rc.cpp:621
-msgid "Step execution..."
-msgstr ""
-
-#. i18n: file: kjsembed/examples/docviewer/docviewer.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:627
-msgid "<h1>KJSEmbed Documentation Viewer</h1>"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, calc)
-#: rc.cpp:630
-msgid "JS Calculator"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:40
-#. i18n: ectx: property (text), widget (QPushButton, plus)
-#: rc.cpp:633
-msgctxt "addition"
-msgid "+"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:47
-#. i18n: ectx: property (text), widget (QPushButton, all_clear)
-#: rc.cpp:636
-msgid "AC"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:54
-#. i18n: ectx: property (text), widget (QPushButton, minus)
-#: rc.cpp:639
-msgctxt "subtraction"
-msgid "-"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:61
-#. i18n: ectx: property (text), widget (QPushButton, equals)
-#: rc.cpp:642
-msgctxt "evaluation"
-msgid "="
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:68
-#. i18n: ectx: property (text), widget (QPushButton, clear)
-#: rc.cpp:645
-msgid "CL"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:82
-#. i18n: ectx: property (text), widget (QPushButton, four)
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:56
-#. i18n: ectx: property (text), widget (QRadioButton, fourUpRadioButton)
-#: rc.cpp:651 rc.cpp:810
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:215
-msgid "4"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:89
-#. i18n: ectx: property (text), widget (QPushButton, two)
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:42
-#. i18n: ectx: property (text), widget (QRadioButton, twoUpRadioButton)
-#: rc.cpp:654 rc.cpp:804
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:213
-msgid "2"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:96
-#. i18n: ectx: property (text), widget (QPushButton, five)
-#: rc.cpp:657
-msgid "5"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:103
-#. i18n: ectx: property (text), widget (QPushButton, three)
-#: rc.cpp:660
-msgid "3"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:110
-#. i18n: ectx: property (text), widget (QPushButton, seven)
-#: rc.cpp:663
-msgid "7"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:117
-#. i18n: ectx: property (text), widget (QPushButton, six)
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:35
-#. i18n: ectx: property (text), widget (QRadioButton, sixUpRadioButton)
-#: rc.cpp:666 rc.cpp:801
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:212
-msgid "6"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:124
-#. i18n: ectx: property (text), widget (QPushButton, eight)
-#: rc.cpp:669
-msgid "8"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:131
-#. i18n: ectx: property (text), widget (QPushButton, nine)
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:49
-#. i18n: ectx: property (text), widget (QRadioButton, nineUpRadioButton)
-#: rc.cpp:672 rc.cpp:807
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:214
-msgid "9"
-msgstr ""
-
-#. i18n: file: kjsembed/examples/calc/calc.ui:138
-#. i18n: ectx: property (text), widget (QPushButton, one)
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:25
-#. i18n: ectx: property (text), widget (QRadioButton, oneUpRadioButton)
-#: rc.cpp:675 rc.cpp:798
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:211
-msgid "1"
-msgstr ""
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:34
-#. i18n: ectx: Menu (game)
-#: rc.cpp:681
-msgid "&Game"
-msgstr "&Gêm"
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:84
-#. i18n: ectx: Menu (move)
-#: rc.cpp:687
-msgctxt "@title:menu Game move"
-msgid "&Move"
-msgstr ""
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:117
-#. i18n: ectx: Menu (go)
-#: rc.cpp:693
-msgid "&Go"
-msgstr "&Mynd"
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:138
-#. i18n: ectx: Menu (bookmarks)
-#: rc.cpp:696
-msgid "&Bookmarks"
-msgstr "&Tudnodau"
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:144
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:699
-msgid "&Tools"
-msgstr "&Offer"
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:148
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:702 khtml/ecma/debugger/debugwindow.cpp:240
-msgid "&Settings"
-msgstr "Gosod&iadau"
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:177
-#. i18n: ectx: Menu (help)
-#: rc.cpp:705 kdeui/widgets/khelpmenu.cpp:148
-msgid "&Help"
-msgstr "&Cymorth"
-
-#. i18n: file: kdeui/xmlgui/ui_standards.rc:194
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:708
-msgid "Main Toolbar"
-msgstr "Prif Far Offer"
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, KCupsOptionsJobWidget)
-#: rc.cpp:711 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:152
-msgid "Job"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, jobControlGroupBox)
-#: rc.cpp:714 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:153
-msgid "Job Control"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:25
-#. i18n: ectx: property (text), widget (QLabel, jobHoldLabel)
-#: rc.cpp:717 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:154
-msgid "Scheduled printing:"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:38
-#. i18n: ectx: property (text), widget (QLabel, jobBillingLabel)
-#: rc.cpp:720 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:155
-msgid "Billing information:"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:48
-#. i18n: ectx: property (text), widget (QLabel, jobPriorityLabel)
-#: rc.cpp:723 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:156
-msgid "Job priority:"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:94
-#. i18n: ectx: property (title), widget (QGroupBox, jobOptionsGroupBox)
-#: rc.cpp:726 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:157
-msgid "Job Options"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kcupsoptionsjobwidget.ui:117
-#. i18n: ectx: property (text), widget (QTableWidget, jobOptionsTable)
-#: rc.cpp:729 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionsjobwidget.h:159
-msgid "Option"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/knewpassworddialog.ui:54
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:738 kde3support/kdeui/k3passworddialog.cpp:389
-#: obj-sparc-linux-gnu/kdeui/ui_knewpassworddialog.h:147
-msgid "&Verify:"
-msgstr "&Gwireddu:"
-
-#. i18n: file: kdeui/dialogs/knewpassworddialog.ui:82
-#. i18n: ectx: property (text), widget (QLabel, labelStrengthMeter)
-#: rc.cpp:741 kde3support/kdeui/k3passworddialog.cpp:410
-#: obj-sparc-linux-gnu/kdeui/ui_knewpassworddialog.h:148
-msgid "Password strength meter:"
-msgstr "Faint mor gryf yw'r cyfrinair:"
-
-#. i18n: file: kdeui/dialogs/knewpassworddialog.ui:104
-#. i18n: ectx: property (text), widget (KTitleWidget, labelMatch)
-#: rc.cpp:744 kde3support/kdeui/k3passworddialog.cpp:432
-#: kde3support/kdeui/k3passworddialog.cpp:625
-#: kdeui/dialogs/knewpassworddialog.cpp:177
-#: obj-sparc-linux-gnu/kdeui/ui_knewpassworddialog.h:149
-msgid "Passwords do not match"
-msgstr "Nid yw'r cyfrineiriau yn cydweddu"
-
-#. i18n: file: kdeui/dialogs/kpassworddialog.ui:31
-#. i18n: ectx: property (text), widget (QLabel, prompt)
-#: rc.cpp:747 obj-sparc-linux-gnu/kdeui/ui_kpassworddialog.h:154
-msgid "Supply a username and password below."
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kpassworddialog.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, anonymousCheckBox)
-#: rc.cpp:753 obj-sparc-linux-gnu/kdeui/ui_kpassworddialog.h:156
-msgid "Anonymous"
-msgstr "Dienw"
-
-#. i18n: file: kdeui/dialogs/kpassworddialog.ui:93
-#. i18n: ectx: property (text), widget (QLabel, domainLabel)
-#: rc.cpp:756 obj-sparc-linux-gnu/kdeui/ui_kpassworddialog.h:157
-msgid "Domain:"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kpassworddialog.ui:123
-#. i18n: ectx: property (text), widget (QCheckBox, keepCheckBox)
-#: rc.cpp:762 obj-sparc-linux-gnu/kdeui/ui_kpassworddialog.h:159
-msgid "Remember password"
-msgstr ""
-
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:16
-#. i18n: ectx: property (whatsThis), widget (KTreeWidgetSearchLineWidget, searchFilter)
-#: rc.cpp:765 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:63
-msgid ""
-"Search interactively for shortcut names (e.g. Copy) or combination of keys "
-"(e.g. Ctrl+C) by typing them here."
-msgstr ""
-"Chwilio yn rhyngweithiol ar gyfer enwau byrlwybrau (e.e. Copïo) neu cyfuniad "
-"o fysellau (e.e. Ctrl+C) gan eu teipio yma."
-
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:23
-#. i18n: ectx: property (whatsThis), widget (QTreeWidget, list)
-#: rc.cpp:768 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:74
+#. i18n: file: kdeui/sonnet/sonnetui.ui:130
+#. i18n: ectx: property (whatsThis), widget (QListView, m_suggestions)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:142
+#. i18n: ectx: property (whatsThis), widget (Q3ListView, m_suggestions)
+#: rc.cpp:590 rc.cpp:899
 msgid ""
-"Here you can see a list of key bindings, i.e. associations between actions "
-"(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
-"Ctrl+V) shown in the right column."
-msgstr ""
-"Gwelir yma rhestr o rhwymiadau bysell, h.y. cysylltiadau rhwng "
-"gweithrediadau (e.e.'Copi') sy'n ymddangos yn y golofn chwith a bysellau neu "
-"cyfuniad o fysellau (e.e. Ctrl+V) sy'n ymddangos yn y golofn dde."
-
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:33
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:771 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:72
-msgid "Action"
-msgstr "Gweithrediad"
-
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:38
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:774 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:71
-msgid "Shortcut"
-msgstr "Byrlwybr"
-
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:43
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:777 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:70
-msgid "Alternate"
-msgstr "Eiledol"
-
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:48
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:780 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:69
-msgid "Global"
+"<qt>\n"
+"<p>If the unknown word is misspelled, you should check if the correction for "
+"it is available and if it is, click on it. If none of the words in this list "
+"is a good replacement you may type the correct word in the edit box "
+"above.</p>\n"
+"<p>To correct this word click <b>Replace</b> if you want to correct only "
+"this occurrence or <b>Replace All</b> if you want to correct all "
+"occurrences.</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Os camsillafwyd y gair anhysbys, dylech gwirio os mae'r cywiriad amdano "
+"ar gael, ac os mae, clicio arnodd.  Os nid yw unrhyw un o'r geiriau ar y "
+"rhestr yma yn amnewidiad da, gallwch deipio'r gair cywir i mewn i'r blwch "
+"golygu uchod.</p>\n"
+"<p>Gallwch glicio <b>Amnewid</b> wedyn os ydych eisiau cywiro'r digwyddiad "
+"yma o'r gair yn unig, neu <b>Amnewid Pob Un</b> os ydych eisiau cywiro pob "
+"digwyddiad.</p>\n"
+"</qt>"
 
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:53
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:783 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:68
-msgid "Global Alternate"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:137
+#. i18n: ectx: property (text), widget (QListView, m_suggestions)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:149
+#. i18n: ectx: property (text), widget (Q3ListView, m_suggestions)
+#: rc.cpp:596 rc.cpp:905
+msgid "Suggested Words"
+msgstr "Geiriau Awgrymedig"
 
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:58
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:786 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:67
-msgid "Mouse Button Gesture"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:148
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
+#. i18n: file: kdeui/sonnet/sonnetui.ui:164
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_replacement)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:172
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:214
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_replacement)
+#: rc.cpp:599 rc.cpp:608 rc.cpp:916 rc.cpp:943
+msgid ""
+"<qt>\n"
+"<p>If the unknown word is misspelled, you should type the correction for "
+"your misspelled word here or select it from the list below.</p>\n"
+"<p>You can then click <b>Replace</b> if you want to correct only this "
+"occurrence of the word or <b>Replace All</b> if you want to correct all "
+"occurrences.</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Os camsillafwyd y gair anhysbys, dylech deipio'r cywiriad am y gair "
+"wedi'i gamsillafu yma, neu ei ddewis o'r rhestr isod.</p>\n"
+"<p>Gallwch glicio <b>Amnewid</b> wedyn os ydych eisiau cywiro'r digwyddiad "
+"yma o'r gair yn unig, neu <b>Amnewid Pob Un</b> os ydych eisiau cywiro pob "
+"digwyddiad.</p>\n"
+"</qt>"
 
-#. i18n: file: kdeui/dialogs/kshortcutsdialog.ui:63
-#. i18n: ectx: property (text), widget (QTreeWidget, list)
-#: rc.cpp:789 obj-sparc-linux-gnu/kdeui/ui_kshortcutsdialog.h:66
-msgid "Mouse Shape Gesture"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:151
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:175
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:605 rc.cpp:922
+msgid "Replace &with:"
+msgstr "Amnewid &efo:"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, KCupsOptionsPagesWidget)
-#: rc.cpp:792 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:209
-msgid "Pages"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:171
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_language)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:228
+#. i18n: ectx: property (toolTip), widget (KComboBox, m_language)
+#: rc.cpp:614 rc.cpp:952
+msgid "Language Selection"
+msgstr "Dewis Iaith"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:19
-#. i18n: ectx: property (title), widget (KButtonGroup, pagesPerSheetButtonGroup)
-#: rc.cpp:795 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:210
-msgid "Pages Per Sheet"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:191
+#. i18n: ectx: property (text), widget (QPushButton, m_suggestBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:221
+#. i18n: ectx: property (text), widget (QPushButton, m_suggestBtn)
+#: rc.cpp:622 rc.cpp:949
+msgid "S&uggest"
+msgstr "A&wgrymu:"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:63
-#. i18n: ectx: property (text), widget (QRadioButton, sixteenUpRadioButton)
-#: rc.cpp:813 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:216
-msgid "16"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:200
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:159
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceBtn)
+#: rc.cpp:625 rc.cpp:908
+msgid ""
+"<qt>\n"
+"<p>Click here to replace this occurrence of the unknown text with the text "
+"in the edit box above (to the left).</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Cliciwch yma i amnewid y digwyddiad yma o'r testun anghywir efo'r testun "
+"yn y blwch golygu uchod (i'r chwith).</p>\n"
+"</qt>"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:89
-#. i18n: ectx: property (title), widget (QGroupBox, bannerPagesGroupBox)
-#: rc.cpp:816 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:217
-msgid "Banner Pages"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:203
+#. i18n: ectx: property (text), widget (QPushButton, m_replaceBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:162
+#. i18n: ectx: property (text), widget (QPushButton, m_replaceBtn)
+#: rc.cpp:630 rc.cpp:913 kdeui/findreplace/kfinddialog.cpp:198
+msgid "&Replace"
+msgstr "&Amnewid"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:95
-#. i18n: ectx: property (text), widget (QLabel, startBannerLabel)
-#: rc.cpp:819
-msgctxt "Banner page at start"
-msgid "Start"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:212
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceAllBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:126
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_replaceAllBtn)
+#: rc.cpp:633 rc.cpp:888
+msgid ""
+"<qt>\n"
+"<p>Click here to replace all occurrences of the unknown text with the text "
+"in the edit box above (to the left).</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Cliciwch yma i amnewid pob digwyddiad o'r testun anghywir efo'r testun yn "
+"y blwch golygu uchod (i'r chwith).</p>\n"
+"</qt>"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:105
-#. i18n: ectx: property (text), widget (QLabel, endBannerLabel)
-#: rc.cpp:822
-msgctxt "Banner page at end"
-msgid "End"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:215
+#. i18n: ectx: property (text), widget (QPushButton, m_replaceAllBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:129
+#. i18n: ectx: property (text), widget (QPushButton, m_replaceAllBtn)
+#: rc.cpp:638 rc.cpp:893
+msgid "R&eplace All"
+msgstr "Amnewid y &Cwbl"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:131
-#. i18n: ectx: property (title), widget (QGroupBox, pageLabelGroupBox)
-#: rc.cpp:825 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:220
-msgid "Page Label"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:225
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:188
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipBtn)
+#: rc.cpp:641 rc.cpp:925
+msgid ""
+"<qt>\n"
+"<p>Click here to let this occurrence of the unknown word remain as is.</p>\n"
+"<p>This action is useful when the word is a name, an acronym, a foreign word "
+"or any other unknown word that you want to use but not add to the "
+"dictionary.</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Cliciwch yma i adael i'r digwyddiad yma o'r gair anhysbys aros fel y "
+"mae.</p>\n"
+"<p>Mae'r weithred yma yn ddefnyddiol pan mae'r gair yn enw, llythrenw, gair "
+"estron, neu unrhyw un gair yr ydych eisiau ei ddefnyddio, ond peidio a'i "
+"ychwanegu i'r geiriadur.</p>\n"
+"</qt>"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:156
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:828 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:221
-msgid "Page Border"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:228
+#. i18n: ectx: property (text), widget (QPushButton, m_skipBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:191
+#. i18n: ectx: property (text), widget (QPushButton, m_skipBtn)
+#: rc.cpp:647 rc.cpp:931
+msgid "&Ignore"
+msgstr "&Anwybyddu:"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:181
-#. i18n: ectx: property (title), widget (QGroupBox, mirrorPagesGroupBox)
-#: rc.cpp:831 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:222
-msgid "Mirror Pages"
+#. i18n: file: kdeui/sonnet/sonnetui.ui:238
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipAllBtn)
+#. i18n: file: kdeui/sonnet/sonnetui.ui:251
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_autoCorrect)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:201
+#. i18n: ectx: property (whatsThis), widget (QPushButton, m_skipAllBtn)
+#: rc.cpp:650 rc.cpp:659 rc.cpp:934
+msgid ""
+"<qt>\n"
+"<p>Click here to let all occurrences of the unknown word remain as they "
+"are.</p>\n"
+"<p>This action is useful when the word is a name, an acronym, a foreign word "
+"or any other unknown word that you want to use but not add to the "
+"dictionary.</p>\n"
+"</qt>"
 msgstr ""
+"<qt>\n"
+"<p>Cliciwch yma i adael i bob digwyddiad o'r gair anhysbys aros fel y "
+"maent.</p>\n"
+"<p>Mae'r weithred yma yn ddefnyddiol pan mae'r gair yn enw, llythrenw, gair "
+"estron, neu unrhyw un gair yr ydych eisiau ei ddefnyddio, ond peidio a'i "
+"ychwanegu i'r geiriadur.</p>\n"
+"</qt>"
 
-#. i18n: file: kdeui/dialogs/kcupsoptionspageswidget.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, mirrorPagesCheckBox)
-#: rc.cpp:834 obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:223
-msgid "Mirror pages along vertical axis"
-msgstr ""
+#. i18n: file: kdeui/sonnet/sonnetui.ui:241
+#. i18n: ectx: property (text), widget (QPushButton, m_skipAllBtn)
+#. i18n: file: kde3support/kdeui/k3spellui.ui:204
+#. i18n: ectx: property (text), widget (QPushButton, m_skipAllBtn)
+#: rc.cpp:656 rc.cpp:940
+msgid "I&gnore All"
+msgstr "A&nwybyddu Popeth:"
 
 #. i18n: file: kdeui/sonnet/sonnetui.ui:254
 #. i18n: ectx: property (text), widget (QPushButton, m_autoCorrect)
-#: rc.cpp:964 obj-sparc-linux-gnu/kdeui/ui_sonnetui.h:286
+#: rc.cpp:665
 msgid "Autocorrect"
 msgstr "Hunan-gywiro"
 
 #. i18n: file: kdeui/sonnet/configui.ui:32
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:967 kdeui/findreplace/kfinddialog.cpp:123
-#: obj-sparc-linux-gnu/kdeui/ui_configui.h:114
+#: rc.cpp:668 kdeui/findreplace/kfinddialog.cpp:123
 msgid "Options"
 msgstr "Dewisiadau"
 
 #. i18n: file: kdeui/sonnet/configui.ui:38
 #. i18n: ectx: property (text), widget (QCheckBox, m_bgSpellCB)
-#: rc.cpp:970 obj-sparc-linux-gnu/kdeui/ui_configui.h:115
+#: rc.cpp:671
 msgid "Enable &background spellchecking"
 msgstr "Alluogi &gwirio sillafu yn y cefndir"
 
 #. i18n: file: kdeui/sonnet/configui.ui:45
 #. i18n: ectx: property (text), widget (QCheckBox, m_checkerEnabledByDefaultCB)
-#: rc.cpp:973 obj-sparc-linux-gnu/kdeui/ui_configui.h:116
+#: rc.cpp:674
 msgid "&Automatic spell checking enabled by default"
 msgstr ""
 
 #. i18n: file: kdeui/sonnet/configui.ui:52
 #. i18n: ectx: property (text), widget (QCheckBox, m_skipUpperCB)
-#: rc.cpp:976 obj-sparc-linux-gnu/kdeui/ui_configui.h:117
+#: rc.cpp:677
 msgid "Skip all &uppercase words"
 msgstr "Hepgor pob gair mewn &PRIFLYTHRENNAU"
 
 #. i18n: file: kdeui/sonnet/configui.ui:59
 #. i18n: ectx: property (text), widget (QCheckBox, m_skipRunTogetherCB)
-#: rc.cpp:979 obj-sparc-linux-gnu/kdeui/ui_configui.h:118
+#: rc.cpp:680
 msgid "S&kip run-together words"
 msgstr "H&epgor geiriau difwlch"
 
 #. i18n: file: kdeui/sonnet/configui.ui:69
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:982 obj-sparc-linux-gnu/kdeui/ui_configui.h:119
+#: rc.cpp:683
 msgid "Default language:"
 msgstr "Iaith rhagosodol:"
 
@@ -1924,785 +1471,800 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: kdeui/sonnet/configui.ui:85
 #. i18n: ectx: property (title), widget (KEditListWidget, m_ignoreListBox)
-#: rc.cpp:307 rc.cpp:310 obj-i686-linux-gnu/kdeui/ui_configui.h:130
-#: obj-i686-linux-gnu/kdeui/ui_configui.h:131
+#: rc.cpp:686 rc.cpp:689
 msgid "Ignored Words"
 msgstr ""
 
-#. i18n: file: kdeui/widgets/kshortcutwidget.ui:22
-#. i18n: ectx: property (text), widget (QLabel, priLabel)
-#: rc.cpp:985 kdeui/dialogs/kshortcutseditor.cpp:642
-#: obj-sparc-linux-gnu/kdeui/ui_kshortcutwidget.h:86
-msgid "Main:"
-msgstr ""
-
-#. i18n: file: kdeui/widgets/kshortcutwidget.ui:52
-#. i18n: ectx: property (text), widget (QLabel, altLabel)
-#: rc.cpp:988 kdeui/dialogs/kshortcutseditor.cpp:643
-#: obj-sparc-linux-gnu/kdeui/ui_kshortcutwidget.h:87
-msgid "Alternate:"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:9
-#. i18n: ectx: label, entry, group (DesktopIcons)
-#: rc.cpp:991
-msgid "Distance between desktop icons"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:10
-#. i18n: ectx: whatsthis, entry, group (DesktopIcons)
-#: rc.cpp:994
-msgid "The distance between icons specified in pixels."
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:23
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:997
-msgid "Widget style to use"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:24
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1000
-msgid ""
-"The name of the widget style, for example \"keramik\" or \"plastik\". "
-"Without quotes."
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:30
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1003
-msgid "Use the PC speaker"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:31
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1006
-msgid ""
-"Whether the ordinary PC speaker should be used instead of KDE's own "
-"notifications system."
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:35
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1009
-msgid "What terminal application to use"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:37
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1012
-msgid ""
-"Whenever a terminal application is launched this terminal emulator program "
-"will be used.\n"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:41
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1016
-msgid "Fixed width font"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:43
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1019
-msgid ""
-"This font is used when a fixed font is needed. A fixed font has a constant "
-"width.\n"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:46
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1023
-msgid "System wide font"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:49
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1026
-msgid "Font for menus"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:50
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1029
-msgid "What font to use for menus in applications."
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:53
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1032
-msgid "Color for links"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:54
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1035
-msgid "What color links should be that have not yet been clicked on"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:57
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1038
-msgid "Color for visited links"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:60
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1041
-msgid "Font for the taskbar"
-msgstr ""
-
-#. i18n: file: kutils/kdeglobals.kcfg:61
-#. i18n: ectx: whatsthis, entry, group (General)
-#: rc.cpp:1044
-msgid ""
-"What font to use for the panel at the bottom of the screen, where the "
-"currently running applications are."
-msgstr ""
+#. i18n: file: khtml/htmlpageinfo.ui:22
+#. i18n: ectx: property (windowTitle), widget (QDialog, KHTMLInfoDlg)
+#: rc.cpp:692
+msgid "Document Information"
+msgstr "Gwybodaeth am y Ddogfen"
 
-#. i18n: file: kutils/kdeglobals.kcfg:64
-#. i18n: ectx: label, entry, group (General)
-#: rc.cpp:1047
-msgid "Fonts for toolbars"
+#. i18n: file: khtml/htmlpageinfo.ui:34
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:695
+msgctxt "@title:group Document information"
+msgid "General"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:73
-#. i18n: ectx: label, entry (Desktop Screenshot), group (Global Shortcuts)
-#: rc.cpp:1050
-msgid "Shortcut for taking screenshot"
-msgstr ""
+#. i18n: file: khtml/htmlpageinfo.ui:60
+#. i18n: ectx: property (text), widget (QLabel, urlLabel)
+#: rc.cpp:698
+msgid "URL:"
+msgstr "URL:"
 
-#. i18n: file: kutils/kdeglobals.kcfg:78
-#. i18n: ectx: label, entry (Enable/Disable Clipboard Actions), group (Global Shortcuts)
-#: rc.cpp:1053
-msgid "Shortcut for toggling Clipboard Actions on and off"
-msgstr ""
+#. i18n: file: khtml/htmlpageinfo.ui:128
+#. i18n: ectx: property (text), widget (QLabel, _lmLabel)
+#: rc.cpp:704
+msgid "Last modified:"
+msgstr "Newid diweddaraf:"
 
-#. i18n: file: kutils/kdeglobals.kcfg:83
-#. i18n: ectx: label, entry (Halt without Confirmation), group (Global Shortcuts)
-#: rc.cpp:1056
-msgid "Shortcut for shutting down the computer without confirmation"
-msgstr ""
+#. i18n: file: khtml/htmlpageinfo.ui:144
+#. i18n: ectx: property (text), widget (QLabel, _eLabel)
+#: rc.cpp:707
+msgid "Document encoding:"
+msgstr "Amgodiad y ddogfen:"
 
-#. i18n: file: kutils/kdeglobals.kcfg:380
-#. i18n: ectx: label, entry (Sort directories first), group (KFileDialog Settings)
-#: rc.cpp:1059
-msgid "Show directories first"
+#. i18n: file: khtml/htmlpageinfo.ui:167
+#. i18n: ectx: property (text), widget (QLabel, _modeLabel)
+#: rc.cpp:710
+msgid "Rendering mode:"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:381
-#. i18n: ectx: whatsthis, entry (Sort directories first), group (KFileDialog Settings)
-#: rc.cpp:1062
-msgid "Whether directories should be placed at the top when displaying files"
-msgstr ""
+#. i18n: file: khtml/htmlpageinfo.ui:186
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:713
+msgid "HTTP Headers"
+msgstr "Penodau HTTP"
 
-#. i18n: file: kutils/kdeglobals.kcfg:389
-#. i18n: ectx: label, entry (Recent URLs), group (KFileDialog Settings)
-#: rc.cpp:1065
-msgid "The URLs recently visited"
+#. i18n: file: khtml/htmlpageinfo.ui:214
+#. i18n: ectx: property (text), widget (QTreeWidget, _headers)
+#: rc.cpp:716
+msgid "Property"
+msgstr "Priodwedd"
+
+#. i18n: file: khtml/test_regression_gui.ui:13
+#. i18n: ectx: property (windowTitle), widget (QMainWindow, MainWindow)
+#: rc.cpp:722
+msgid "KHTML Regression Testing Utility"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:390
-#. i18n: ectx: whatsthis, entry (Recent URLs), group (KFileDialog Settings)
-#: rc.cpp:1068
-msgid "Used for auto-completion in file dialogs, for example"
+#. i18n: file: khtml/test_regression_gui.ui:56
+#. i18n: ectx: attribute (title), widget (QWidget, firstTab)
+#: rc.cpp:728
+msgid "Regression testing output"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:394
-#. i18n: ectx: label, entry (Show Preview), group (KFileDialog Settings)
-#: rc.cpp:1071
-msgid "Show file preview in file dialog"
+#. i18n: file: khtml/test_regression_gui.ui:111
+#. i18n: ectx: property (toolTip), widget (QPushButton, pauseContinueButton)
+#. i18n: file: khtml/test_regression_gui.ui:114
+#. i18n: ectx: property (whatsThis), widget (QPushButton, pauseContinueButton)
+#: rc.cpp:731 rc.cpp:734
+msgid "Pause/Continue regression testing process"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:399
-#. i18n: ectx: label, entry (Show hidden files), group (KFileDialog Settings)
-#: rc.cpp:1074
-msgid "Show hidden files"
+#. i18n: file: khtml/test_regression_gui.ui:120
+#. i18n: ectx: property (text), widget (QPushButton, pauseContinueButton)
+#: rc.cpp:737 khtml/test_regression_gui_window.cpp:571
+#: khtml/rendering/media_controls.cpp:50
+msgid "Pause"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:400
-#. i18n: ectx: whatsthis, entry (Show hidden files), group (KFileDialog Settings)
-#: rc.cpp:1077
+#. i18n: file: khtml/test_regression_gui.ui:144
+#. i18n: ectx: property (toolTip), widget (QPushButton, saveLogButton)
+#. i18n: file: khtml/test_regression_gui.ui:147
+#. i18n: ectx: property (whatsThis), widget (QPushButton, saveLogButton)
+#: rc.cpp:740 rc.cpp:743
 msgid ""
-"Whether files starting with a dot (convention for hidden files) should be "
-"shown"
+"You may select a file where the log content is stored, before the regression "
+"testing is started."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:405
-#. i18n: ectx: label, entry (Show Speedbar), group (KFileDialog Settings)
-#: rc.cpp:1080
-msgid "Show speedbar"
+#. i18n: file: khtml/test_regression_gui.ui:150
+#. i18n: ectx: property (text), widget (QPushButton, saveLogButton)
+#: rc.cpp:746
+msgid "Output to File..."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:406
-#. i18n: ectx: whatsthis, entry (Show Speedbar), group (KFileDialog Settings)
-#: rc.cpp:1083
-msgid ""
-"Whether the shortcut icons to the left in the file dialog should be shown"
+#. i18n: file: khtml/test_regression_gui.ui:162
+#. i18n: ectx: property (text), widget (QLabel, statusLabel)
+#: rc.cpp:749
+msgid "Regression Testing Status"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:425
-#. i18n: ectx: label, entry, group (Locale)
-#: rc.cpp:1086
-msgid "What country"
+#. i18n: file: khtml/test_regression_gui.ui:182
+#. i18n: ectx: attribute (title), widget (QWidget, secondTab)
+#: rc.cpp:752
+msgid "View HTML Output"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:426
-#. i18n: ectx: whatsthis, entry, group (Locale)
-#: rc.cpp:1089
-msgid ""
-"Used to determine how to display numbers, currency and time/date, for example"
+#. i18n: file: khtml/test_regression_gui.ui:203
+#. i18n: ectx: property (title), widget (QMenu, menuSettings)
+#: rc.cpp:755
+msgid "Settings"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:430
-#. i18n: ectx: label, entry, group (Locale)
-#: rc.cpp:1092
-msgid "What language to use to display text"
+#. i18n: file: khtml/test_regression_gui.ui:212
+#. i18n: ectx: property (title), widget (QMenu, menuMain)
+#: rc.cpp:758
+msgid "Tests"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:433
-#. i18n: ectx: label, entry, group (Locale)
-#: rc.cpp:1095
-msgid "Character used for indicating positive numbers"
+#. i18n: file: khtml/test_regression_gui.ui:238
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:761
+msgid "Only Run JS Tests"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:434
-#. i18n: ectx: whatsthis, entry, group (Locale)
-#: rc.cpp:1098
-msgid "Most countries have no character for this"
+#. i18n: file: khtml/test_regression_gui.ui:246
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:764
+msgid "Only Run HTML Tests"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:439
-#. i18n: ectx: label, entry, group (Paths)
-#: rc.cpp:1101
-msgid "Path to the autostart directory"
+#. i18n: file: khtml/test_regression_gui.ui:254
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:767
+msgid "Do Not Suppress Debug Output"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:440
-#. i18n: ectx: whatsthis, entry, group (Paths)
-#: rc.cpp:1104
-msgid ""
-"Path to the directory containing executables to be run on session login"
+#. i18n: file: khtml/test_regression_gui.ui:262
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:770 khtml/test_regression.cpp:630
+msgid "Do not use Xvfb"
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:487
-#. i18n: ectx: label, entry, group (Socks)
-#: rc.cpp:1107
-msgid "Enable SOCKS support"
+#. i18n: file: khtml/test_regression_gui.ui:267
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:773
+msgid "Run Tests..."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:488
-#. i18n: ectx: whatsthis, entry, group (Socks)
-#: rc.cpp:1110
-msgid "Whether SOCKS version 4 and 5 should be enabled in KDE's sub systems"
+#. i18n: file: khtml/test_regression_gui.ui:272
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:776
+msgid "Run Single Test..."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:492
-#. i18n: ectx: label, entry, group (Socks)
-#: rc.cpp:1113
-msgid "Path to custom SOCKS library"
+#. i18n: file: khtml/test_regression_gui.ui:277
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:779
+msgid "Specify tests Directory..."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:498
-#. i18n: ectx: label, entry, group (Toolbar style)
-#: rc.cpp:1116
-msgid "Highlight toolbar buttons on mouse over"
+#. i18n: file: khtml/test_regression_gui.ui:282
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:782
+msgid "Specify khtml Directory..."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:502
-#. i18n: ectx: label, entry, group (Toolbar style)
-#: rc.cpp:1119
-msgid "Show text on toolbar icons "
+#. i18n: file: khtml/test_regression_gui.ui:287
+#. i18n: ectx: property (text), widget (QStatusBar, statusbar)
+#: rc.cpp:785
+msgid "Specify Output Directory..."
 msgstr ""
 
-#. i18n: file: kutils/kdeglobals.kcfg:503
-#. i18n: ectx: whatsthis, entry, group (Toolbar style)
-#: rc.cpp:1122
-msgid "Whether text should be shown in addition to icons on toolbar icons"
-msgstr ""
+#. i18n: file: khtml/kjserrordlgbase.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, KJSErrorDlgBase)
+#: rc.cpp:788
+msgid "JavaScript Errors"
+msgstr "Gwallau JavaScript"
 
-#. i18n: file: kutils/kdeglobals.kcfg:524
-#. i18n: ectx: label, entry (EchoMode), group (Passwords)
-#: rc.cpp:1125
-msgid "Password echo type"
+#. i18n: file: khtml/kjserrordlgbase.ui:17
+#. i18n: ectx: property (whatsThis), widget (QDialog, KJSErrorDlgBase)
+#: rc.cpp:791
+msgid ""
+"This dialog provides you with notification and details of scripting errors "
+"that occur on web pages.  In many cases it is due to an error in the web "
+"site as designed by its author.  In other cases it is the result of a "
+"programming error in Konqueror.  If you suspect the former, please contact "
+"the webmaster of the site in question.  Conversely if you suspect an error "
+"in Konqueror, please file a bug report at http://bugs.kde.org/.  A test case "
+"which illustrates the problem will be appreciated."
 msgstr ""
+"Mae'r ymgom yma yn cynhyrchu hysbysiad a manylion o wallau sgriptio sy'n "
+"digwydd ar dudalennau gwê.  Y mwyafrif o'r amser yr achos yw gwall yn "
+"nyluniad y safwe gan ei awdur.  Weithiau eraill mae'n ganlyniad o nam "
+"rhaglennu yn Konqueror.  Os ydych yn drwgdybio'r safwe, cysylltwch â "
+"gwefeistr y safwe mewn cwestiwn.  Ar y llaw arall, os ydych yn drwgdybio "
+"Konqueror, gwnewch adroddiad nam wrth http://bugs.kde.org/.  Gwerthfawrogir "
+"achos prawf sy'n llunio'r problem."
 
-#. i18n: file: kutils/kdeglobals.kcfg:534
-#. i18n: ectx: label, entry (Dialog Size), group (KKeyDialog Settings)
-#: rc.cpp:1128
-msgid "The size of the dialog"
-msgstr ""
+#. i18n: file: khtml/kjserrordlgbase.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, _close)
+#: rc.cpp:794 kdeui/util/kstandardguiitem.cpp:184
+#: kdeui/actions/kstandardaction_p.h:49
+msgid "&Close"
+msgstr "&Cau"
 
-#. i18n: file: dnssd/kcm_kdnssd.kcfg:9
-#. i18n: ectx: label, entry, group (browsing)
-#: rc.cpp:215
-msgid "Additional domains for browsing"
-msgstr ""
+#. i18n: file: khtml/kjserrordlgbase.ui:36
+#. i18n: ectx: property (text), widget (QPushButton, _clear)
+#: rc.cpp:797 kdeui/util/kstandardguiitem.cpp:171
+#: kdeui/actions/kstandardaction_p.h:61
+msgid "C&lear"
+msgstr "C&lirio"
 
-#. i18n: file: dnssd/kcm_kdnssd.kcfg:10
-#. i18n: ectx: whatsthis, entry, group (browsing)
-#: rc.cpp:218
-msgid "List of 'wide-area' (non link-local) domains that should be browsed."
+#. i18n: file: khtml/khtml_browser.rc:34
+#. i18n: ectx: ToolBar (htmlToolBar)
+#: rc.cpp:812
+msgid "HTML Toolbar"
 msgstr ""
 
-#: nepomuk/ui/tagwidget.cpp:61
-msgctxt "@label"
-msgid "Show all tags..."
+#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:43
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:815
+msgid "F&ind:"
 msgstr ""
 
-#: nepomuk/ui/tagwidget.cpp:112
-msgctxt "@label"
-msgid "Add Tags..."
-msgstr ""
+#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:75
+#. i18n: ectx: property (text), widget (QToolButton, m_next)
+#: rc.cpp:818
+msgid "&Next"
+msgstr "&Nesaf"
 
-#: nepomuk/ui/tagwidget.cpp:112
-msgctxt "@label"
-msgid "Change..."
-msgstr ""
+#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:85
+#. i18n: ectx: property (text), widget (QToolButton, m_previous)
+#: rc.cpp:821 kdeui/dialogs/ktip.cpp:305
+msgid "&Previous"
+msgstr "&Blaenorol"
 
-#: nepomuk/core/ui/nepomukmassupdatejob.cpp:76
-msgid "Changing annotations"
+#. i18n: file: khtml/ui/findbar/khtmlfindbar_base.ui:111
+#. i18n: ectx: property (text), widget (QToolButton, m_options)
+#: rc.cpp:824
+msgid "Opt&ions"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:49
-msgctxt "@title:window"
-msgid "Change Tags"
+#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:39
+#. i18n: ectx: property (text), widget (QLabel, m_label)
+#: rc.cpp:827 khtml/ui/passwordbar/storepassbar.cpp:59
+msgid "Do you want to store this password?"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:50
-msgctxt "@title:window"
-msgid "Add Tags"
+#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:59
+#. i18n: ectx: property (text), widget (QToolButton, m_store)
+#: rc.cpp:830
+msgid "&Store"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:59
-msgctxt "@label:textbox"
-msgid "Configure which tags should be applied."
+#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:69
+#. i18n: ectx: property (text), widget (QToolButton, m_neverForThisSite)
+#: rc.cpp:833
+msgid "Ne&ver store for this site"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:70
-msgctxt "@label"
-msgid "Create new tag:"
+#. i18n: file: khtml/ui/passwordbar/storepassbar_base.ui:79
+#. i18n: ectx: property (text), widget (QToolButton, m_doNotStore)
+#: rc.cpp:836
+msgid "Do &not store this time"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:92
-msgctxt "@info"
-msgid "Delete tag"
+#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:33
+#. i18n: ectx: property (text), widget (QToolButton, m_anytimeButton)
+#: rc.cpp:960
+msgid "Anytime"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:216
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Should the tag <resource>%1</resource> really be deleted for all files?"
+#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:49
+#. i18n: ectx: property (text), widget (QToolButton, m_beforeButton)
+#: rc.cpp:963
+msgid "Before"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:218
-msgctxt "@title"
-msgid "Delete tag"
+#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:65
+#. i18n: ectx: property (text), widget (QToolButton, m_afterButton)
+#: rc.cpp:966
+msgid "After"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:219
-msgctxt "@action:button"
-msgid "Delete"
+#. i18n: file: nepomuk/utils/daterangeselectionwidget.ui:81
+#. i18n: ectx: property (text), widget (QToolButton, m_rangesButton)
+#: rc.cpp:969 kdecore/localization/klocale_kde.cpp:2527
+#: nepomuk/utils/daterangeselectionwidget.cpp:193
+msgid "Today"
 msgstr ""
 
-#: nepomuk/ui/kedittagsdialog.cpp:220
-msgctxt "@action:button"
-msgid "Cancel"
+#. i18n: file: kutils/kdeglobals.kcfg:9
+#. i18n: ectx: label, entry, group (DesktopIcons)
+#: rc.cpp:972
+msgid "Distance between desktop icons"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:49 nepomuk/rcgen/rcgen.cpp:51
-msgid "Nepomuk Resource Class Generator"
+#. i18n: file: kutils/kdeglobals.kcfg:10
+#. i18n: ectx: whatsthis, entry, group (DesktopIcons)
+#: rc.cpp:975
+msgid "The distance between icons specified in pixels."
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:53
-msgid "(c) 2006-2009, Sebastian Trüg"
+#. i18n: file: kutils/kdeglobals.kcfg:23
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:978
+msgid "Widget style to use"
+msgstr ""
+
+#. i18n: file: kutils/kdeglobals.kcfg:24
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:981
+msgid ""
+"The name of the widget style, for example \"keramik\" or \"plastik\". "
+"Without quotes."
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:56
-msgid "Sebastian Trüg"
+#. i18n: file: kutils/kdeglobals.kcfg:30
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:984
+msgid "Use the PC speaker"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:56
-msgid "Maintainer"
+#. i18n: file: kutils/kdeglobals.kcfg:31
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:987
+msgid ""
+"Whether the ordinary PC speaker should be used instead of KDE's own "
+"notifications system."
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:57
-msgid "Tobias Koenig"
+#. i18n: file: kutils/kdeglobals.kcfg:35
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:990
+msgid "What terminal application to use"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:57
-msgid "Major cleanup - Personal hero of maintainer"
+#. i18n: file: kutils/kdeglobals.kcfg:37
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:993
+msgid ""
+"Whenever a terminal application is launched this terminal emulator program "
+"will be used.\n"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:64
-msgid "Verbose output debugging mode."
+#. i18n: file: kutils/kdeglobals.kcfg:41
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:997
+msgid "Fixed width font"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:65
+#. i18n: file: kutils/kdeglobals.kcfg:43
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:1000
 msgid ""
-"Generate simple and fast wrapper classes not based on Nepomuk::Resource "
-"which do not provide any data integrity checking"
+"This font is used when a fixed font is needed. A fixed font has a constant "
+"width.\n"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:66
-msgid "Actually generate the code."
+#. i18n: file: kutils/kdeglobals.kcfg:46
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:1004
+msgid "System wide font"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:67
-msgid "List all includes (deprecated)."
+#. i18n: file: kutils/kdeglobals.kcfg:49
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:1007
+msgid "Font for menus"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:68
-msgid ""
-"List all header files that will be generated via the --writeall command."
+#. i18n: file: kutils/kdeglobals.kcfg:50
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:1010
+msgid "What font to use for menus in applications."
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:69
-msgid ""
-"List all source files that will be generated via the --writeall command."
+#. i18n: file: kutils/kdeglobals.kcfg:53
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:1013
+msgid "Color for links"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:70
-msgid ""
-"The ontology files containing the ontologies to be generated, a space "
-"separated list (deprecated: use arguments instead.)"
+#. i18n: file: kutils/kdeglobals.kcfg:54
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:1016
+msgid "What color links should be that have not yet been clicked on"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:71
-msgid "Include path prefix (deprecated)"
+#. i18n: file: kutils/kdeglobals.kcfg:57
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:1019
+msgid "Color for visited links"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:72
-msgid "Specify the target folder to store generated files into."
+#. i18n: file: kutils/kdeglobals.kcfg:60
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:1022
+msgid "Font for the taskbar"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:76
-msgid "Templates to be used (deprecated)."
+#. i18n: file: kutils/kdeglobals.kcfg:61
+#. i18n: ectx: whatsthis, entry, group (General)
+#: rc.cpp:1025
+msgid ""
+"What font to use for the panel at the bottom of the screen, where the "
+"currently running applications are."
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:77
-msgid ""
-"Optionally specify the classes to be generated. Use option multiple times "
-"(defaults to all classes)"
+#. i18n: file: kutils/kdeglobals.kcfg:64
+#. i18n: ectx: label, entry, group (General)
+#: rc.cpp:1028
+msgid "Fonts for toolbars"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:78
-msgid ""
-"Serialization used in the ontology files. Will default to primitive file "
-"extension detection."
+#. i18n: file: kutils/kdeglobals.kcfg:73
+#. i18n: ectx: label, entry (Desktop Screenshot), group (Global Shortcuts)
+#: rc.cpp:1031
+msgid "Shortcut for taking screenshot"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:79
-msgid ""
-"Set the used visibility in case the classes are to be used in public API. "
-"<visibility-name> will be used to construct the export macro name and the "
-"export header. By default classes will not be exported."
+#. i18n: file: kutils/kdeglobals.kcfg:78
+#. i18n: ectx: label, entry (Enable/Disable Clipboard Actions), group (Global Shortcuts)
+#: rc.cpp:1034
+msgid "Shortcut for toggling Clipboard Actions on and off"
 msgstr ""
 
-#: nepomuk/rcgen/rcgen.cpp:80
-msgid "The ontology files containing the ontologies to be generated."
+#. i18n: file: kutils/kdeglobals.kcfg:83
+#. i18n: ectx: label, entry (Halt without Confirmation), group (Global Shortcuts)
+#: rc.cpp:1037
+msgid "Shortcut for shutting down the computer without confirmation"
 msgstr ""
 
-#: nepomuk/utils/dynamicresourcefacet.cpp:256
-msgctxt ""
-"@option:check An item in a list of resources that allows to query for more "
-"resources to put in the list"
-msgid "More..."
+#. i18n: file: kutils/kdeglobals.kcfg:380
+#. i18n: ectx: label, entry (Sort directories first), group (KFileDialog Settings)
+#: rc.cpp:1040
+msgid "Show directories first"
 msgstr ""
 
-#: nepomuk/utils/daterangeselectionwidget.cpp:201
-msgid "This Week"
+#. i18n: file: kutils/kdeglobals.kcfg:381
+#. i18n: ectx: whatsthis, entry (Sort directories first), group (KFileDialog Settings)
+#: rc.cpp:1043
+msgid "Whether directories should be placed at the top when displaying files"
 msgstr ""
 
-#: nepomuk/utils/daterangeselectionwidget.cpp:206
-msgid "This Month"
+#. i18n: file: kutils/kdeglobals.kcfg:389
+#. i18n: ectx: label, entry (Recent URLs), group (KFileDialog Settings)
+#: rc.cpp:1046
+msgid "The URLs recently visited"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:64 nepomuk/utils/facet.cpp:132
-msgctxt "@option:check A filter on file type"
-msgid "Documents"
+#. i18n: file: kutils/kdeglobals.kcfg:390
+#. i18n: ectx: whatsthis, entry (Recent URLs), group (KFileDialog Settings)
+#: rc.cpp:1049
+msgid "Used for auto-completion in file dialogs, for example"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:68 nepomuk/utils/facet.cpp:136
-msgctxt "@option:check A filter on file type - audio files"
-msgid "Audio"
+#. i18n: file: kutils/kdeglobals.kcfg:394
+#. i18n: ectx: label, entry (Show Preview), group (KFileDialog Settings)
+#: rc.cpp:1052
+msgid "Show file preview in file dialog"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:71 nepomuk/utils/facet.cpp:139
-msgctxt "@option:check A filter on file type - media video"
-msgid "Video"
+#. i18n: file: kutils/kdeglobals.kcfg:399
+#. i18n: ectx: label, entry (Show hidden files), group (KFileDialog Settings)
+#: rc.cpp:1055
+msgid "Show hidden files"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:75 nepomuk/utils/facet.cpp:143
-msgctxt "@option:check A filter on file type"
-msgid "Images"
+#. i18n: file: kutils/kdeglobals.kcfg:400
+#. i18n: ectx: whatsthis, entry (Show hidden files), group (KFileDialog Settings)
+#: rc.cpp:1058
+msgid ""
+"Whether files starting with a dot (convention for hidden files) should be "
+"shown"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:179
-msgctxt ""
-"@option:radio A filter on prioritizing/sorting a selection of resources"
-msgid "No priority"
+#. i18n: file: kutils/kdeglobals.kcfg:405
+#. i18n: ectx: label, entry (Show Speedbar), group (KFileDialog Settings)
+#: rc.cpp:1061
+msgid "Show speedbar"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:180
-msgctxt ""
-"@option:radio A filter on prioritizing/sorting a selection of resources"
-msgid "Last modified"
+#. i18n: file: kutils/kdeglobals.kcfg:406
+#. i18n: ectx: whatsthis, entry (Show Speedbar), group (KFileDialog Settings)
+#: rc.cpp:1064
+msgid ""
+"Whether the shortcut icons to the left in the file dialog should be shown"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:181
-msgctxt ""
-"@option:radio A filter on prioritizing/sorting a selection of resources"
-msgid "Most important"
+#. i18n: file: kutils/kdeglobals.kcfg:425
+#. i18n: ectx: label, entry, group (Locale)
+#: rc.cpp:1067
+msgid "What country"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:182
-msgctxt ""
-"@option:radio A filter on prioritizing/sorting a selection of resources"
-msgid "Never opened"
+#. i18n: file: kutils/kdeglobals.kcfg:426
+#. i18n: ectx: whatsthis, entry, group (Locale)
+#: rc.cpp:1070
+msgid ""
+"Used to determine how to display numbers, currency and time/date, for example"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:192
-msgctxt "@option:radio A filter on the rating of a resource"
-msgid "Any Rating"
+#. i18n: file: kutils/kdeglobals.kcfg:430
+#. i18n: ectx: label, entry, group (Locale)
+#: rc.cpp:1073
+msgid "What language to use to display text"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:193
-msgctxt "@option:radio A filter on the rating of a resource"
-msgid "1 or more"
+#. i18n: file: kutils/kdeglobals.kcfg:433
+#. i18n: ectx: label, entry, group (Locale)
+#: rc.cpp:1076
+msgid "Character used for indicating positive numbers"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:194
-msgctxt "@option:radio A filter on the rating of a resource"
-msgid "2 or more"
+#. i18n: file: kutils/kdeglobals.kcfg:434
+#. i18n: ectx: whatsthis, entry, group (Locale)
+#: rc.cpp:1079
+msgid "Most countries have no character for this"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:195
-msgctxt "@option:radio A filter on the rating of a resource"
-msgid "3 or more"
+#. i18n: file: kutils/kdeglobals.kcfg:439
+#. i18n: ectx: label, entry, group (Paths)
+#: rc.cpp:1082
+msgid "Path to the autostart directory"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:196
-msgctxt "@option:radio A filter on the rating of a resource"
-msgid "4 or more"
+#. i18n: file: kutils/kdeglobals.kcfg:440
+#. i18n: ectx: whatsthis, entry, group (Paths)
+#: rc.cpp:1085
+msgid ""
+"Path to the directory containing executables to be run on session login"
 msgstr ""
 
-#: nepomuk/utils/facet.cpp:197
-msgctxt "@option:radio A filter on the rating of a resource"
-msgid "Max Rating"
+#. i18n: file: kutils/kdeglobals.kcfg:487
+#. i18n: ectx: label, entry, group (Socks)
+#: rc.cpp:1088
+msgid "Enable SOCKS support"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:82
-msgctxt "@option:check A filter on resource type"
-msgid "Contacts"
+#. i18n: file: kutils/kdeglobals.kcfg:488
+#. i18n: ectx: whatsthis, entry, group (Socks)
+#: rc.cpp:1091
+msgid "Whether SOCKS version 4 and 5 should be enabled in KDE's sub systems"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:84
-msgctxt "@option:check A filter on resource type"
-msgid "Emails"
+#. i18n: file: kutils/kdeglobals.kcfg:492
+#. i18n: ectx: label, entry, group (Socks)
+#: rc.cpp:1094
+msgid "Path to custom SOCKS library"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:86
-msgctxt "@option:check A filter on resource type"
-msgid "Tasks"
+#. i18n: file: kutils/kdeglobals.kcfg:498
+#. i18n: ectx: label, entry, group (Toolbar style)
+#: rc.cpp:1097
+msgid "Highlight toolbar buttons on mouse over"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:88
-msgctxt "@option:check A filter on resource type"
-msgid "Tags"
+#. i18n: file: kutils/kdeglobals.kcfg:502
+#. i18n: ectx: label, entry, group (Toolbar style)
+#: rc.cpp:1100
+msgid "Show text on toolbar icons "
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:222 nepomuk/utils/typefacet.cpp:231
-msgctxt "@option:check Do filter on type - show only files"
-msgid "Files"
+#. i18n: file: kutils/kdeglobals.kcfg:503
+#. i18n: ectx: whatsthis, entry, group (Toolbar style)
+#: rc.cpp:1103
+msgid "Whether text should be shown in addition to icons on toolbar icons"
 msgstr ""
 
-#: nepomuk/utils/typefacet.cpp:224 nepomuk/utils/typefacet.cpp:233
-msgctxt "@option:check Do filter on type - show everything but files"
-msgid "Other"
+#. i18n: file: kutils/kdeglobals.kcfg:524
+#. i18n: ectx: label, entry (EchoMode), group (Passwords)
+#: rc.cpp:1106
+msgid "Password echo type"
 msgstr ""
 
-#: nepomuk/utils/searchlineedit.cpp:74
-msgid "Enter Search Terms..."
+#. i18n: file: kutils/kdeglobals.kcfg:534
+#. i18n: ectx: label, entry (Dialog Size), group (KKeyDialog Settings)
+#: rc.cpp:1109
+msgid "The size of the dialog"
 msgstr ""
 
-#: nepomuk/utils/resourcemodel.cpp:149
-msgctxt ""
-"@title KCategorizedSortFilterProxyModel grouping for all Nepomukj resources "
-"that are of type rdfs:Resource"
-msgid "Miscellaneous"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, JobsBase)
+#: rc.cpp:1112
+msgid "ThreadWeaver Jobs Examples"
 msgstr ""
 
-#: nepomuk/utils/resourcemodel.cpp:175
-msgctxt "@title:column The Nepomuk resource label and icon"
-msgid "Resource"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:16
+#. i18n: ectx: property (toolTip), widget (QWidget, JobsBase)
+#: rc.cpp:1115
+msgid ""
+"The program executes 100 jobs in 4 threads. Each job waits for a random "
+"number of milliseconds between 1 and 1000."
 msgstr ""
 
-#: nepomuk/utils/resourcemodel.cpp:177
-msgctxt "@title:column The Nepomuk resource's RDF type"
-msgid "Resource Type"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:36
+#. i18n: ectx: property (toolTip), widget (QCheckBox, cbLog)
+#: rc.cpp:1118
+msgid ""
+"Check to see logging information about thread activity. Watch the console "
+"output to see the log information."
 msgstr ""
 
-#: kdeui/itemviews/kfilterproxysearchline.cpp:73
-msgid "Search"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:39
+#. i18n: ectx: property (text), widget (QCheckBox, cbLog)
+#: rc.cpp:1121
+msgid "Log thread activity"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:119
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "Anytime"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:59
+#. i18n: ectx: property (toolTip), widget (ThreadWeaver::WeaverThreadGrid, threadGrid)
+#: rc.cpp:1124
+msgid "Displays Thread Activity"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:121
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "Today"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:77
+#. i18n: ectx: property (text), widget (QPushButton, pbStart)
+#: rc.cpp:1127
+msgid "Start"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:123
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "Yesterday"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:182
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1136
+msgid "GUI based example for the Weaver Thread Manager"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:125
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "This Week"
+#. i18n: file: threadweaver/Examples/Jobs/JobsBase.ui:205
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1139
+msgid "Remaining number of jobs:"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:127
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "Last Week"
+#. i18n: file: threadweaver/Examples/QProcessJob/MainWindowUi.ui:43
+#. i18n: ectx: property (text), widget (QPushButton, pushButtonStart)
+#: rc.cpp:1145
+msgid "What time is it? Click to update."
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:129
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "This Month"
+#. i18n: file: threadweaver/Examples/QProcessJob/MainWindowUi.ui:50
+#. i18n: ectx: property (text), widget (QLabel, labelTime)
+#: rc.cpp:1148
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\" "
+"white-space: pre-wrap; font-family:Sans Serif; font-weight:400; font-"
+"style:normal; text-decoration:none;\"><p style=\" margin-top:0px; margin-"
+"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\">(do not know yet)</p></body></html>"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:131
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "Last Month"
+#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, pbSelectFiles)
+#: rc.cpp:1151
+msgid "Select Files..."
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:133
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "This Year"
+#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:39
+#. i18n: ectx: property (text), widget (QPushButton, pbCancel)
+#: rc.cpp:1154
+msgid "Cancel"
+msgstr "Diddymu"
+
+#. i18n: file: threadweaver/Examples/SMIV/SMIVBase.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, pbSuspend)
+#: rc.cpp:1157
+msgid "Suspend"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:135
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources"
-msgid "Last Year"
+#: knotify/config/knotifyeventlist.cpp:92
+msgctxt "State of the notified event"
+msgid "State"
 msgstr ""
 
-#: nepomuk/utils/datefacet.cpp:137
-msgctxt ""
-"referring to a filter on the modification and usage date of files/resources "
-"that will open a dialog to choose a date range"
-msgid "Custom..."
+#: knotify/config/knotifyeventlist.cpp:92
+msgctxt "Title of the notified event"
+msgid "Title"
 msgstr ""
 
-#: nepomuk/query/queryparser.cpp:347
-msgctxt ""
-"Boolean AND keyword in desktop search strings. You can add several variants "
-"separated by spaces, e.g. retain the English one alongside the translation; "
-"keywords are not case sensitive. Make sure there is no conflict with the OR "
-"keyword."
-msgid "and"
+#: knotify/config/knotifyeventlist.cpp:92
+msgctxt "Description of the notified event"
+msgid "Description"
 msgstr ""
 
-#: nepomuk/query/queryparser.cpp:356
-msgctxt ""
-"Boolean OR keyword in desktop search strings. You can add several variants "
-"separated by spaces, e.g. retain the English one alongside the translation; "
-"keywords are not case sensitive. Make sure there is no conflict with the AND "
-"keyword."
-msgid "or"
+#: knotify/config/knotifyconfigwidget.cpp:107
+msgid "Configure Notifications"
 msgstr ""
 
-#: nepomuk/query/query.cpp:689
+#: knewstuff/knewstuff2/core/coreengine.cpp:428
 #, kde-format
-msgctxt ""
-"@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the "
-"user entered."
-msgid "Query Results from '%1'"
+msgid "loading %1"
 msgstr ""
 
-#: nepomuk/query/query.cpp:695
-msgctxt "@title UDS_DISPLAY_NAME for a KIO directory listing."
-msgid "Query Results"
+#: knewstuff/knewstuff2/core/security.cpp:75
+#: knewstuff/knewstuff3/core/security.cpp:86
+msgid ""
+"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that "
+"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
+"not be possible.</qt>"
 msgstr ""
 
-#: nepomuk/core/resource.cpp:509
-msgid "Success"
+#: knewstuff/knewstuff2/core/security.cpp:197
+#: knewstuff/knewstuff3/core/security.cpp:208
+#, kde-format
+msgid ""
+"<qt>Enter passphrase for key <b>0x%1</b>, belonging to<br "
+"/><i>%2&lt;%3&gt;</i><br />:</qt>"
 msgstr ""
 
-#: nepomuk/core/resource.cpp:511
-msgid "Communication error"
+#: knewstuff/knewstuff2/core/security.cpp:278
+#: knewstuff/knewstuff3/core/security.cpp:289
+msgid ""
+"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure "
+"that <i>gpg</i> is installed, otherwise verification of downloaded resources "
+"will not be possible.</qt>"
 msgstr ""
 
-#: nepomuk/core/resource.cpp:513
-msgid "Invalid type in Database"
+#: knewstuff/knewstuff2/core/security.cpp:333
+#: knewstuff/knewstuff3/core/security.cpp:344
+msgid "Select Signing Key"
 msgstr ""
 
-#: nepomuk/core/resource.cpp:515 kdecore/network/klocalsocket_unix.cpp:213
-#: kdecore/network/klocalsocket_unix.cpp:293
-msgid "Unknown error"
+#: knewstuff/knewstuff2/core/security.cpp:333
+#: knewstuff/knewstuff3/core/security.cpp:344
+msgid "Key used for signing:"
 msgstr ""
 
-#: knotify/config/knotifyconfigwidget.cpp:107
-msgid "Configure Notifications"
+#: knewstuff/knewstuff2/core/security.cpp:365
+#: knewstuff/knewstuff3/core/security.cpp:376
+msgid ""
+"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> is "
+"installed, otherwise signing of the resources will not be possible.</qt>"
 msgstr ""
 
-#: knotify/config/knotifyeventlist.cpp:92
-msgctxt "State of the notified event"
-msgid "State"
+#: knewstuff/knewstuff2/core/providerhandler.cpp:154
+#: knewstuff/knewstuff2/core/providerhandler.cpp:174
+msgctxt "describes the feed of the latest posted entries"
+msgid "Latest"
 msgstr ""
 
-#: knotify/config/knotifyeventlist.cpp:92
-msgctxt "Title of the notified event"
-msgid "Title"
-msgstr ""
+#: knewstuff/knewstuff2/core/providerhandler.cpp:160
+msgid "Highest Rated"
+msgstr "Ystyriedir y Gorau"
 
-#: knotify/config/knotifyeventlist.cpp:92
-msgctxt "Description of the notified event"
-msgid "Description"
-msgstr ""
+#: knewstuff/knewstuff2/core/providerhandler.cpp:166
+msgid "Most Downloads"
+msgstr "Lawrlwythir yn Amlaf"
 
-#: kpty/kptydevice.cpp:306
-msgid "Error reading from PTY"
+#: knewstuff/knewstuff2/ui/kdxsrating.cpp:33
+msgid "Rate this entry"
 msgstr ""
 
-#: kpty/kptydevice.cpp:340
-msgid "Error writing to PTY"
+#: knewstuff/knewstuff2/ui/providerdialog.cpp:54
+msgid "Hot New Stuff Providers"
+msgstr "Darparwyr y Diweddaraf"
+
+#: knewstuff/knewstuff2/ui/providerdialog.cpp:64
+msgid "Please select one of the providers listed below:"
+msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
+
+#: knewstuff/knewstuff2/ui/providerdialog.cpp:68
+#: knewstuff/knewstuff2/ui/kdxstranslation.cpp:46 dnssd/servicemodel.cpp:101
+msgid "Name"
+msgstr "Enw"
+
+#: knewstuff/knewstuff2/ui/providerdialog.cpp:95
+msgid "No provider selected."
+msgstr "Nid oes darparwr wedi ei dewis."
+
+#: knewstuff/knewstuff2/ui/kdxschanges.cpp:31
+#: knewstuff/knewstuff2/ui/kdxsbutton.cpp:70
+msgid "Changelog"
 msgstr ""
 
-#: kpty/kptydevice.cpp:425
-msgid "PTY operation timed out"
+#: knewstuff/knewstuff2/ui/kdxschanges.cpp:53
+#, kde-format
+msgid "Version %1"
 msgstr ""
 
-#: kpty/kptydevice.cpp:481 kpty/kptydevice.cpp:495
-msgid "Error opening PTY"
+#: knewstuff/knewstuff2/ui/kdxscomments.cpp:32
+msgid "User comments"
 msgstr ""
 
 #: knewstuff/knewstuff2/ui/downloaddialog.cpp:127
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:555
-#: knewstuff/knewstuff3/downloaddialog.cpp:85
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:154
-#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:84
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:558
+#: knewstuff/knewstuff3/downloaddialog.cpp:81
+#: knewstuff/knewstuff3/downloadwidget.cpp:199
 msgid "Get Hot New Stuff"
 msgstr ""
 
 #: knewstuff/knewstuff2/ui/downloaddialog.cpp:129
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:215
+#: knewstuff/knewstuff3/downloaddialog.cpp:88
 #, kde-format
 msgctxt "Program name followed by 'Add On Installer'"
 msgid "%1 Add-On Installer"
@@ -2723,115 +2285,82 @@
 msgstr ""
 
 #: knewstuff/knewstuff2/ui/downloaddialog.cpp:195
-#: knewstuff/knewstuff3/core/engine.cpp:396
+#: knewstuff/knewstuff3/core/engine.cpp:463
 #, kde-format
 msgid "Re: %1"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:312
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:68
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:314
+#: knewstuff/knewstuff3/downloadwidget.cpp:113
 msgid "Timeout. Check Internet connection."
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:405
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:407
 msgid "Entries failed to load"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:503
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:505
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:252
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:126
+#: knewstuff/knewstuff3/downloadwidget.cpp:171
 #, kde-format
 msgid "Server: %1"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:504
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:127
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:506
+#: knewstuff/knewstuff3/downloadwidget.cpp:172
 #, kde-format
 msgid "<br />Provider: %1"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:505
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:128
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:507
+#: knewstuff/knewstuff3/downloadwidget.cpp:173
 #, kde-format
 msgid "<br />Version: %1"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:509
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:511
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:82
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:258
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:132
+#: knewstuff/knewstuff3/downloadwidget.cpp:177
 msgid "Provider information"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:535
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:143
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:538
+#: knewstuff/knewstuff3/downloadwidget.cpp:188
 #, kde-format
 msgid "Could not install %1"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:536
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:144
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:539
+#: knewstuff/knewstuff3/downloadwidget.cpp:189
 msgid "Get Hot New Stuff!"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:554
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:557
 msgid "There was an error loading data providers."
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:585
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:588
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:379
 msgid "A protocol fault has occurred. The request has failed."
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:586
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:593
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:589
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:596
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:380
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:387
 msgid "Desktop Exchange Service"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/downloaddialog.cpp:592
+#: knewstuff/knewstuff2/ui/downloaddialog.cpp:595
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:386
 msgid "A network error has occurred. The request has failed."
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/uploaddialog.cpp:65
-#: knewstuff/knewstuff3/uploaddialog.cpp:126
-#, kde-format
-msgctxt "Program name followed by 'Add On Uploader'"
-msgid "%1 Add-On Uploader"
-msgstr ""
-
-#: knewstuff/knewstuff2/ui/uploaddialog.cpp:92
-#: knewstuff/knewstuff3/uploaddialog.cpp:220
-msgid "Please put in a name."
-msgstr "Rhowch enw, os gwelwch yn dda."
-
-#: knewstuff/knewstuff2/ui/uploaddialog.cpp:160
-msgid "Old upload information found, fill out fields?"
-msgstr "Canfuwyd hen wybodaeth lanlwytho, llenwi'r meyseydd?"
-
-#: knewstuff/knewstuff2/ui/uploaddialog.cpp:162
-msgid "Fill Out"
-msgstr ""
-
-#: knewstuff/knewstuff2/ui/uploaddialog.cpp:163
-msgid "Do Not Fill Out"
-msgstr ""
-
-#: knewstuff/knewstuff2/ui/kdxscomments.cpp:32
-msgid "User comments"
-msgstr ""
-
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:68
 msgid "Comments"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/kdxsbutton.cpp:70
-#: knewstuff/knewstuff2/ui/kdxschanges.cpp:31
-msgid "Changelog"
-msgstr ""
-
 #: knewstuff/knewstuff2/ui/kdxsbutton.cpp:73
 msgid "Switch version"
 msgstr ""
@@ -2934,27 +2463,12 @@
 msgid "This operation requires authentication."
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/kdxsrating.cpp:33
-msgid "Rate this entry"
-msgstr ""
-
 #: knewstuff/knewstuff2/ui/kdxstranslation.cpp:33
 msgid "Translate this entry"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/kdxstranslation.cpp:46
-#: knewstuff/knewstuff2/ui/providerdialog.cpp:69 dnssd/servicemodel.cpp:101
-#: obj-sparc-linux-gnu/kate/ui_commandmenuconfigwidget.h:161
-msgid "Name"
-msgstr "Enw"
-
-#. i18n: file: knewstuff/knewstuff3/ui/entrydetailsdialog.ui:64
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:182 knewstuff/knewstuff2/ui/kdxstranslation.cpp:47
-#: kdeui/dialogs/kshortcutseditor.cpp:667
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:264
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_entrydetailsdialog.h:265
-#: obj-sparc-linux-gnu/kate/ui_commandmenuconfigwidget.h:159
+#: knewstuff/knewstuff2/ui/kdxstranslation.cpp:47
+#: kdeui/dialogs/kshortcutseditor.cpp:673
 msgid "Description"
 msgstr ""
 
@@ -2962,24 +2476,20 @@
 msgid "Payload"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/providerdialog.cpp:54
-msgid "Hot New Stuff Providers"
-msgstr "Darparwyr y Diweddaraf"
-
-#: knewstuff/knewstuff2/ui/providerdialog.cpp:65
-msgid "Please select one of the providers listed below:"
-msgstr "Dewiswch un o'r darparwyr o'r rhestr isod:"
+#: knewstuff/knewstuff2/ui/knewstuffbutton.cpp:49
+#: knewstuff/knewstuff3/knewstuffbutton.cpp:48
+msgid "Download New Stuff..."
+msgstr ""
 
-#: knewstuff/knewstuff2/ui/providerdialog.cpp:96
-msgid "No provider selected."
-msgstr "Nid oes darparwr wedi ei dewis."
+#: knewstuff/knewstuff2/ui/kdxscomment.cpp:29
+msgid "Leave a comment"
+msgstr ""
 
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:150
 msgid "<p>No Downloads</p>"
 msgstr ""
 
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:150
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:189
 #, kde-format
 msgid "<p>Downloads: %1</p>\n"
 msgstr ""
@@ -2990,29 +2500,15 @@
 msgstr ""
 
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:254
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:291
 msgid "No Preview"
 msgstr ""
 
 #: knewstuff/knewstuff2/ui/itemsviewdelegate.cpp:264
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:301
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:248
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:310
 msgid "Loading Preview"
 msgstr ""
 
-#: knewstuff/knewstuff2/ui/kdxschanges.cpp:53
-#, kde-format
-msgid "Version %1"
-msgstr ""
-
-#: knewstuff/knewstuff2/ui/knewstuffbutton.cpp:49
-#: knewstuff/knewstuff3/knewstuffbutton.cpp:48
-msgid "Download New Stuff..."
-msgstr ""
-
-#: knewstuff/knewstuff2/ui/kdxscomment.cpp:29
-msgid "Leave a comment"
-msgstr ""
-
 #: knewstuff/knewstuff2/ui/itemsview.cpp:306
 msgid "Rating: "
 msgstr ""
@@ -3021,68 +2517,44 @@
 msgid "Downloads: "
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:451
+#: knewstuff/knewstuff2/ui/uploaddialog.cpp:64
+#: knewstuff/knewstuff3/uploaddialog.cpp:389
 #, kde-format
-msgid "loading %1"
+msgctxt "Program name followed by 'Add On Uploader'"
+msgid "%1 Add-On Uploader"
 msgstr ""
 
-#: knewstuff/knewstuff2/core/security.cpp:75
-#: knewstuff/knewstuff3/core/security.cpp:75
-msgid ""
-"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that "
-"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
-"not be possible.</qt>"
-msgstr ""
+#: knewstuff/knewstuff2/ui/uploaddialog.cpp:91
+msgid "Please put in a name."
+msgstr "Rhowch enw, os gwelwch yn dda."
 
-#: knewstuff/knewstuff2/core/security.cpp:197
-#: knewstuff/knewstuff3/core/security.cpp:197
-#, kde-format
-msgid ""
-"<qt>Enter passphrase for key <b>0x%1</b>, belonging to<br "
-"/><i>%2&lt;%3&gt;</i><br />:</qt>"
-msgstr ""
+#: knewstuff/knewstuff2/ui/uploaddialog.cpp:159
+msgid "Old upload information found, fill out fields?"
+msgstr "Canfuwyd hen wybodaeth lanlwytho, llenwi'r meyseydd?"
 
-#: knewstuff/knewstuff2/core/security.cpp:276
-#: knewstuff/knewstuff3/core/security.cpp:276
-msgid ""
-"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure "
-"that <i>gpg</i> is installed, otherwise verification of downloaded resources "
-"will not be possible.</qt>"
+#: knewstuff/knewstuff2/ui/uploaddialog.cpp:161
+msgid "Fill Out"
 msgstr ""
 
-#: knewstuff/knewstuff2/core/security.cpp:331
-#: knewstuff/knewstuff3/core/security.cpp:331
-msgid "Select Signing Key"
+#: knewstuff/knewstuff2/ui/uploaddialog.cpp:162
+msgid "Do Not Fill Out"
 msgstr ""
 
-#: knewstuff/knewstuff2/core/security.cpp:331
-#: knewstuff/knewstuff3/core/security.cpp:331
-msgid "Key used for signing:"
+#: knewstuff/knewstuff3/downloadwidget.cpp:241
+msgid "Icons view mode"
 msgstr ""
 
-#: knewstuff/knewstuff2/core/security.cpp:363
-#: knewstuff/knewstuff3/core/security.cpp:363
-msgid ""
-"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> is "
-"installed, otherwise signing of the resources will not be possible.</qt>"
+#: knewstuff/knewstuff3/downloadwidget.cpp:243
+msgid "Details view mode"
 msgstr ""
 
-#: knewstuff/knewstuff2/core/providerhandler.cpp:154
-#: knewstuff/knewstuff2/core/providerhandler.cpp:174
-msgctxt "describes the feed of the latest posted entries"
-msgid "Latest"
+#: knewstuff/knewstuff3/downloadwidget.cpp:258
+msgid "All Providers"
 msgstr ""
 
-#: knewstuff/knewstuff2/core/providerhandler.cpp:160
-msgid "Highest Rated"
-msgstr "Ystyriedir y Gorau"
-
-#. i18n: file: knewstuff/knewstuff3/downloaddialog.ui:99
-#. i18n: ectx: property (text), widget (QRadioButton, mostDownloadsRadio)
-#: rc.cpp:116 knewstuff/knewstuff2/core/providerhandler.cpp:166
-#: obj-sparc-linux-gnu/knewstuff/knewstuff3/ui_downloaddialog.h:239
-msgid "Most Downloads"
-msgstr "Lawrlwythir yn Amlaf"
+#: knewstuff/knewstuff3/downloadwidget.cpp:265
+msgid "All Categories"
+msgstr ""
 
 #: knewstuff/knewstuff3/uploaddialog.cpp:108
 msgid "Fetching license data from server..."
@@ -3119,16 +2591,19 @@
 msgid "Visit website"
 msgstr ""
 
+#: knewstuff/knewstuff3/uploaddialog.cpp:368
 #: kdeui/dialogs/kassistantdialog.cpp:94
 msgctxt "Opposite to Back"
 msgid "Next"
 msgstr ""
 
+#: knewstuff/knewstuff3/uploaddialog.cpp:370
 #: kdeui/dialogs/kassistantdialog.cpp:95
 msgid "Finish"
 msgstr ""
 
-#: knewstuff/knewstuff3/uploaddialog.cpp:301
+#: knewstuff/knewstuff3/uploaddialog.cpp:445
+#: knewstuff/knewstuff3/uploaddialog.cpp:696
 #, kde-format
 msgid "File not found: %1"
 msgstr ""
@@ -3150,8 +2625,9 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: khtml/rendering/render_form.cpp:755 kjs/object.cpp:585
-#: kdeui/dialogs/kmessagebox.cpp:830 kdeui/dialogs/kmessagebox.cpp:862
+#: knewstuff/knewstuff3/uploaddialog.cpp:528 kjs/object.cpp:553
+#: kdeui/dialogs/kmessagebox.cpp:841 kdeui/dialogs/kmessagebox.cpp:871
+#: khtml/rendering/render_form.cpp:810
 msgid "Error"
 msgstr "Gwall"
 
@@ -3166,16 +2642,16 @@
 msgid "Select preview image"
 msgstr ""
 
-#: knewstuff/knewstuff3/uploaddialog.cpp:268
+#: knewstuff/knewstuff3/uploaddialog.cpp:646
 msgid "There was a network error."
 msgstr ""
 
-#: knewstuff/knewstuff3/uploaddialog.cpp:268
-#: knewstuff/knewstuff3/uploaddialog.cpp:273
+#: knewstuff/knewstuff3/uploaddialog.cpp:646
+#: knewstuff/knewstuff3/uploaddialog.cpp:651
 msgid "Uploading Failed"
 msgstr ""
 
-#: knewstuff/knewstuff3/uploaddialog.cpp:273
+#: knewstuff/knewstuff3/uploaddialog.cpp:651
 msgid "Authentication error."
 msgstr ""
 
@@ -3184,137 +2660,6 @@
 msgid "Upload failed: %1"
 msgstr ""
 
-#: knewstuff/knewstuff3/downloadwidget.cpp:241
-msgid "Icons view mode"
-msgstr ""
-
-#: knewstuff/knewstuff3/downloadwidget.cpp:243
-msgid "Details view mode"
-msgstr ""
-
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:198
-msgid "All Providers"
-msgstr ""
-
-#: knewstuff/knewstuff3/downloaddialog_p.cpp:205
-msgid "All Categories"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:253
-#, kde-format
-msgid "Rating: %1%"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:175
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:177
-#, kde-format
-msgctxt "Show the author of this item in a list"
-msgid "By <i>%1</i>"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:237
-#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:178
-#, kde-format
-msgctxt "fan as in supporter"
-msgid "1 fan"
-msgid_plural "%1 fans"
-msgstr[0] ""
-msgstr[1] ""
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:240
-#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:181
-#, kde-format
-msgid "1 download"
-msgid_plural "%1 downloads"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kdeui/dialogs/kmessagebox.cpp:266
-msgid "Details"
-msgstr "Manylion"
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:228
-msgid "Installing"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:233
-msgid "Updating"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:144
-#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:350
-msgid "Install Again"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:85
-#, kde-format
-msgid "Details for %1"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:111
-msgctxt "A link to the description of this Get Hot New Stuff item"
-msgid "Homepage"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:114
-msgctxt ""
-"A link to make a donation for a Get Hot New Stuff item (opens a web browser)"
-msgid "Make a donation"
-msgstr ""
-
-#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:118
-#, kde-format
-msgctxt "A link to the knowledgebase (like a forum) (opens a web browser)"
-msgid "Knowledgebase (no entries)"
-msgid_plural "Knowledgebase (%1 entries)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:121
-msgctxt "Tooltip for a link in a dialog"
-msgid "Opens in a browser window"
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:351
-#, kde-format
-msgctxt ""
-"the price of a download item, parameter 1 is the currency, 2 is the price"
-msgid ""
-"This items costs %1 %2.\n"
-"Do you want to buy it?"
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:362
-#, kde-format
-msgid ""
-"Your account balance is too low:\n"
-"Your balance: %1\n"
-"Price: %2"
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:339
-msgctxt "voting for an item (good/bad)"
-msgid "Your vote was recorded."
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:426
-msgid "You are now a fan."
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:364
-#, kde-format
-msgid "Network error. (%1)"
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:368
-msgid "Too many requests to server. Please try again in a few minutes."
-msgstr ""
-
-#: knewstuff/knewstuff3/attica/atticaprovider.cpp:370
-#, kde-format
-msgid "Unknown Open Collaboration Service API error. (%1)"
-msgstr ""
-
 #: knewstuff/knewstuff3/core/installation.cpp:157
 msgid "Invalid item."
 msgstr ""
@@ -3349,9427 +2694,9915 @@
 msgid "Could not install \"%1\": file not found."
 msgstr ""
 
-#: knewstuff/knewstuff3/core/installation.cpp:494
+#: knewstuff/knewstuff3/core/installation.cpp:477
 msgid "Overwrite existing file?"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/installation.cpp:494
+#: knewstuff/knewstuff3/core/installation.cpp:477
 msgid "Download File:"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:97
+#: knewstuff/knewstuff3/core/engine.cpp:100
 msgid "Initializing"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:101
-#: knewstuff/knewstuff3/core/engine.cpp:110
+#: knewstuff/knewstuff3/core/engine.cpp:104
+#: knewstuff/knewstuff3/core/engine.cpp:113
 #, kde-format
 msgid "Configuration file not found: \"%1\""
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:123
+#: knewstuff/knewstuff3/core/engine.cpp:126
 #, kde-format
 msgid "Configuration file is invalid: \"%1\""
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:173
+#: knewstuff/knewstuff3/core/engine.cpp:176
 msgid "Loading provider information"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:237
+#: knewstuff/knewstuff3/core/engine.cpp:199
 #, kde-format
 msgid "Could not load get hot new stuff providers from file: %1"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:214
+#: knewstuff/knewstuff3/core/engine.cpp:217
 msgid "Error initializing provider."
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:218
-#: knewstuff/knewstuff3/core/engine.cpp:498
+#: knewstuff/knewstuff3/core/engine.cpp:221
+#: knewstuff/knewstuff3/core/engine.cpp:501
 msgid "Loading data"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:246
+#: knewstuff/knewstuff3/core/engine.cpp:249
 msgid "Loading data from provider"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:267
+#: knewstuff/knewstuff3/core/engine.cpp:254
 #, kde-format
 msgid "Loading of providers from file: %1 failed"
 msgstr ""
 
-#: knewstuff/knewstuff3/core/engine.cpp:500
+#: knewstuff/knewstuff3/core/engine.cpp:503
 #, kde-format
 msgid "Loading one preview"
 msgid_plural "Loading %1 previews"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dnssd/servicemodel.cpp:102
-msgid "Host"
+#: knewstuff/knewstuff3/core/engine.cpp:505
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:335
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:129
+msgid "Installing"
 msgstr ""
 
-#: dnssd/servicemodel.cpp:103
-msgid "Port"
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:286
+#, kde-format
+msgctxt ""
+"the price of a download item, parameter 1 is the currency, 2 is the price"
+msgid ""
+"This items costs %1 %2.\n"
+"Do you want to buy it?"
 msgstr ""
 
-#: kde3support/kio/kfile/k3fileview.cpp:123
-msgid "Unknown View"
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:300
+#, kde-format
+msgid ""
+"Your account balance is too low:\n"
+"Your balance: %1\n"
+"Price: %2"
 msgstr ""
 
-#: kde3support/kdeui/k3dockwidget.cpp:272
-msgid "Close"
-msgstr "Cau"
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:339
+msgctxt "voting for an item (good/bad)"
+msgid "Your vote was recorded."
+msgstr ""
 
-#: kde3support/kdeui/k3dockwidget.cpp:280
-msgctxt "Freeze the window geometry"
-msgid "Freeze"
-msgstr "Rhewi"
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:353
+msgid "You are now a fan."
+msgstr ""
 
-#: kde3support/kdeui/k3dockwidget.cpp:288
-msgctxt "Dock this window"
-msgid "Dock"
-msgstr "Clymu"
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:364
+#, kde-format
+msgid "Network error. (%1)"
+msgstr ""
 
-#: kde3support/kdeui/k3dockwidget.cpp:296
-msgid "Detach"
-msgstr "Dat-glymu"
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:368
+msgid "Too many requests to server. Please try again in a few minutes."
+msgstr ""
 
-#: kde3support/kdeui/k3dockwidget.cpp:3042
+#: knewstuff/knewstuff3/attica/atticaprovider.cpp:370
 #, kde-format
-msgid "Hide %1"
-msgstr "Cuddio %1"
+msgid "Unknown Open Collaboration Service API error. (%1)"
+msgstr ""
 
-#: kde3support/kdeui/k3dockwidget.cpp:3048
+#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:90
 #, kde-format
-msgid "Show %1"
-msgstr "Dangos %1"
+msgid "Details for %1"
+msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:109
-msgctxt "@option:check"
-msgid "Do Spellchecking"
+#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:110
+msgctxt "A link to the description of this Get Hot New Stuff item"
+msgid "Homepage"
+msgstr ""
+
+#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:113
+msgctxt ""
+"A link to make a donation for a Get Hot New Stuff item (opens a web browser)"
+msgid "Make a donation"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:113
-msgctxt "@option:check"
-msgid "Create &root/affix combinations not in dictionary"
+#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:117
+#, kde-format
+msgctxt "A link to the knowledgebase (like a forum) (opens a web browser)"
+msgid "Knowledgebase (no entries)"
+msgid_plural "Knowledgebase (%1 entries)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: knewstuff/knewstuff3/ui/entrydetailsdialog.cpp:120
+msgctxt "Tooltip for a link in a dialog"
+msgid "Opens in a browser window"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:120
-msgctxt "@option:check"
-msgid "Consider run-together &words as spelling errors"
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:100
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:259
+#, kde-format
+msgid "Rating: %1%"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:132
-msgctxt "@label:listbox"
-msgid "&Dictionary:"
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:151
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:153
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:155
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:219
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:221
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:223
+#, kde-format
+msgctxt "Show the author of this item in a list"
+msgid "By <i>%1</i>"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:159
-msgctxt "@label:listbox"
-msgid "&Encoding:"
-msgstr ""
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:178
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:237
+#, kde-format
+msgctxt "fan as in supporter"
+msgid "1 fan"
+msgid_plural "%1 fans"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kde3support/kdeui/k3sconfig.cpp:166
-msgctxt "@item:inlistbox Spell checker"
-msgid "International <application>Ispell</application>"
-msgstr ""
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:181
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:240
+#, kde-format
+msgid "1 download"
+msgid_plural "%1 downloads"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kde3support/kdeui/k3sconfig.cpp:167
-msgctxt "@item:inlistbox Spell checker"
-msgid "<application>Aspell</application>"
-msgstr ""
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:275
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:170
+#: kdeui/dialogs/kmessagebox.cpp:278
+msgid "Details"
+msgstr "Manylion"
 
-#: kde3support/kdeui/k3sconfig.cpp:168
-msgctxt "@item:inlistbox Spell checker"
-msgid "<application>Hspell</application>"
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:340
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:134
+msgid "Updating"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:169
-msgctxt "@item:inlistbox Spell checker"
-msgid "<application>Zemberek</application>"
+#: knewstuff/knewstuff3/ui/itemsgridviewdelegate.cpp:350
+#: knewstuff/knewstuff3/ui/itemsviewdelegate.cpp:144
+msgid "Install Again"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:171
-msgctxt "@item:inlistbox Spell checker"
-msgid "<application>Hunspell</application>"
+#: kjsembed/kjsembed/qaction_binding.cpp:59
+msgid "Action takes 2 args."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:174
-msgctxt "@label:listbox"
-msgid "&Client:"
+#: kjsembed/kjsembed/qaction_binding.cpp:86
+msgid "ActionGroup takes 2 args."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:256 kde3support/kdeui/k3sconfig.cpp:416
-#: kde3support/kdeui/k3sconfig.cpp:680
-msgctxt "@item Spelling dictionary"
-msgid "Hebrew"
+#: kjsembed/kjsembed/qaction_binding.cpp:91
+msgid "Must supply a valid parent."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:261 kde3support/kdeui/k3sconfig.cpp:421
-#: kde3support/kdeui/k3sconfig.cpp:685
-msgctxt "@item Spelling dictionary"
-msgid "Turkish"
+#: kjsembed/kjsembed/fileio.cpp:69
+#, kde-format
+msgid "Could not open file '%1'"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:314
-msgctxt "@item Spelling dictionary"
-msgid "English"
+#: kjsembed/kjsembed/fileio.cpp:104
+msgid "Could not create temporary file."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:317
-msgctxt "@item Spelling dictionary"
-msgid "Spanish"
+#: kjsembed/kjsembed/qformbuilder_binding.cpp:59
+#, kde-format
+msgid "There was an error reading the file '%1'"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:320
-msgctxt "@item Spelling dictionary"
-msgid "Danish"
+#: kjsembed/kjsembed/qformbuilder_binding.cpp:67
+#, kde-format
+msgid "Could not read file '%1'"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:323
-msgctxt "@item Spelling dictionary"
-msgid "German"
+#: kjsembed/kjsembed/qformbuilder_binding.cpp:70
+#: kjsembed/kjsembed/quiloader_binding.cpp:118
+msgid "Must supply a filename."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:326
-msgctxt "@item Spelling dictionary"
-msgid "German (new spelling)"
+#: kjsembed/kjsembed/builtins.cpp:89 kjsembed/kjsembed/builtins.cpp:129
+#, kde-format
+msgid "Error encountered while processing include '%1' line %2: %3"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:329
-msgctxt "@item Spelling dictionary"
-msgid "Brazilian Portuguese"
+#: kjsembed/kjsembed/builtins.cpp:95
+#, kde-format
+msgid "include only takes 1 argument, not %1."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:332
-msgctxt "@item Spelling dictionary"
-msgid "Portuguese"
+#: kjsembed/kjsembed/builtins.cpp:133
+#, kde-format
+msgid "File %1 not found."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:335
-msgctxt "@item Spelling dictionary"
-msgid "Esperanto"
+#: kjsembed/kjsembed/builtins.cpp:139
+#, kde-format
+msgid "library only takes 1 argument, not %1."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:338
-msgctxt "@item Spelling dictionary"
-msgid "Norwegian"
+#: kjsembed/kjsembed/builtins.cpp:154
+msgid "Alert"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:341
-msgctxt "@item Spelling dictionary"
-msgid "Polish"
+#: kjsembed/kjsembed/builtins.cpp:165
+msgid "Confirm"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:344
-msgctxt "@item Spelling dictionary"
-msgid "Russian"
+#: kjsembed/kjsembed/qlayout_binding.cpp:90
+#, kde-format
+msgid "'%1' is not a valid QLayout."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:347
-msgctxt "@item Spelling dictionary"
-msgid "Slovenian"
+#: kjsembed/kjsembed/qlayout_binding.cpp:96
+msgid "Must supply a layout name."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:350
-msgctxt "@item Spelling dictionary"
-msgid "Slovak"
+#: kjsembed/kjsembed/kjsembed.cpp:273 kjsembed/kjsembed/kjsembed.cpp:295
+#, kde-format
+msgid "%1 is not a function and cannot be called."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:353
-msgctxt "@item Spelling dictionary"
-msgid "Czech"
+#: kjsembed/kjsembed/slotproxy.cpp:115
+#, kde-format
+msgid "Bad slot handler: Object %1 Identifier %2 Method %3 Signature: %4."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:356
-msgctxt "@item Spelling dictionary"
-msgid "Swedish"
+#: kjsembed/kjsembed/slotproxy.cpp:140
+#, kde-format
+msgid "Exception calling '%1' slot from %2:%3:%4"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:359
-msgctxt "@item Spelling dictionary"
-msgid "Swiss German"
+#: kjsembed/kjsembed/qwidget_binding.cpp:161
+#, kde-format
+msgid "'%1' is not a valid QWidget."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:362
-msgctxt "@item Spelling dictionary"
-msgid "Ukrainian"
+#: kjsembed/kjsembed/qwidget_binding.cpp:170
+msgid "Must supply a widget name."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:365
-msgctxt "@item Spelling dictionary"
-msgid "Lithuanian"
+#: kjsembed/kjsembed/quiloader_binding.cpp:53
+msgid "Not enough arguments."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:368
-msgctxt "@item Spelling dictionary"
-msgid "French"
+#: kjsembed/kjsembed/quiloader_binding.cpp:70
+msgid "Failed to create Action."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:371
-msgctxt "@item Spelling dictionary"
-msgid "Belarusian"
+#: kjsembed/kjsembed/quiloader_binding.cpp:81
+msgid "Failed to create ActionGroup."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:374
-msgctxt "@item Spelling dictionary"
-msgid "Hungarian"
+#: kjsembed/kjsembed/quiloader_binding.cpp:88
+msgid "No classname specified"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:378
-msgctxt "@item Spelling dictionary"
-msgid "Unknown"
+#: kjsembed/kjsembed/quiloader_binding.cpp:95
+msgid "Failed to create Layout."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:462 kde3support/kdeui/k3sconfig.cpp:618
-msgctxt "@item Spelling dictionary"
-msgid "<application>ISpell</application> Default"
+#: kjsembed/kjsembed/quiloader_binding.cpp:103
+msgid "No classname specified."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:510 kde3support/kdeui/k3sconfig.cpp:666
-#, kde-format
-msgctxt "@item Spelling dictionary: %1 dictionary name, %2 file name"
-msgid "Default - %1 [%2]"
+#: kjsembed/kjsembed/quiloader_binding.cpp:110
+msgid "Failed to create Widget."
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:531 kde3support/kdeui/k3sconfig.cpp:693
-msgctxt "@item Spelling dictionary"
-msgid "<application>ASpell</application> Default"
+#: kjsembed/kjsembed/quiloader_binding.cpp:122
+#, kde-format
+msgid "Could not open file '%1': %2"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:596 kde3support/kdeui/k3sconfig.cpp:758
+#: kjsembed/kjsembed/quiloader_binding.cpp:129
 #, kde-format
-msgctxt "@item Spelling dictionary: %1 dictionary name"
-msgid "Default - %1"
+msgid "Failed to load file '%1'"
 msgstr ""
 
-#: kde3support/kdeui/k3sconfig.cpp:621 kde3support/kdeui/k3sconfig.cpp:835
-msgctxt "@item Spelling dictionary"
-msgid "<application>Hunspell</application> Default"
+#: kjsembed/kjsembed/qobject_binding.cpp:119
+msgid "Wrong object type."
 msgstr ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:184 kded/kbuildsycoca.cpp:638
-#: kded/kbuildsycoca.cpp:639 kded/khostname.cpp:220 kross/qts/main.cpp:63
-#: kross/test/main.cpp:149 kross/console/main.cpp:102
-msgid "Author"
-msgstr "Awdur"
+#: kjsembed/kjsembed/qobject_binding.cpp:127
+msgid "First argument must be a QObject."
+msgstr ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:185
-msgid "Email"
-msgstr "Ebost"
+#: kjsembed/kjsembed/qobject_binding.cpp:164
+msgid "Incorrect number of arguments."
+msgstr ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:186
-msgid "Homepage"
-msgstr "Tudalen gartref"
+#: kjsembed/kjsembed/qobject_binding.cpp:412
+#, kde-format
+msgid "The slot asked for %1 argument"
+msgid_plural "The slot asked for %1 arguments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:187
-msgid "Task"
-msgstr "Tasg"
+#: kjsembed/kjsembed/qobject_binding.cpp:413
+#, kde-format
+msgid "but there is only %1 available"
+msgid_plural "but there are only %1 available"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:684
+#: kjsembed/kjsembed/qobject_binding.cpp:414
 #, kde-format
-msgid ""
-"<html><font size=\"5\">%1</font><br/><b>version %2</b><br/>Using KDE "
-"%3</html>"
+msgctxt ""
+"%1 is 'the slot asked for foo arguments', %2 is 'but there are only bar "
+"available'"
+msgid "%1, %2."
 msgstr ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:686
+#: kjsembed/kjsembed/qobject_binding.cpp:613
 #, kde-format
-msgid "%1 %2, %3"
-msgstr "%1 %2, %3"
-
-#: kde3support/kdeui/k3aboutdialog.cpp:900
-msgid "Other Contributors:"
-msgstr "Cyfrannwyr Eraill:"
-
-#: kde3support/kdeui/k3aboutdialog.cpp:901
-msgid "(No logo available)"
-msgstr "(dim logo ar gael)"
+msgid "Failure to cast to %1 value from Type %2 (%3)"
+msgstr ""
 
-#: kde3support/kdeui/k3aboutdialog.cpp:1045
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:87
-#: kdeui/dialogs/kmessagebox.cpp:1044 kdeui/widgets/khelpmenu.cpp:264
+#: kjsembed/kjsembed/qobject_binding.cpp:648
 #, kde-format
-msgid "About %1"
-msgstr "Ynglyn â %1"
+msgid "No such method '%1'."
+msgstr ""
 
-#: kde3support/kdeui/k3listviewsearchline.cpp:287
-#: kdeui/itemviews/ktreewidgetsearchline.cpp:424
-msgid "Search Columns"
-msgstr "Chwilio Colofnau"
+#: kjsembed/kjsembed/qobject_binding.cpp:677
+#, kde-format
+msgid "Call to method '%1' failed, unable to get argument %2: %3"
+msgstr ""
 
-#: kde3support/kdeui/k3listviewsearchline.cpp:290
-#: kdeui/itemviews/ktreewidgetsearchline.cpp:426
-msgid "All Visible Columns"
-msgstr "Pob Colofn Weledig"
+#: kjsembed/kjsembed/qobject_binding.cpp:720
+#, kde-format
+msgid "Call to '%1' failed."
+msgstr ""
 
-#: kde3support/kdeui/k3listviewsearchline.cpp:307
+#: kjsembed/kjsembed/qobject_binding.cpp:785
+#: kjsembed/kjsembed/object_binding.h:219
 #, kde-format
-msgctxt "Column number %1"
-msgid "Column No. %1"
-msgstr "Colofn %1"
+msgid "%1 is not an Object type"
+msgstr ""
 
-#: kde3support/kdeui/k3listviewsearchline.cpp:557
-#: kdeui/itemviews/ktreewidgetsearchline.cpp:605
-msgid "S&earch:"
-msgstr "C&hwilio"
+#: kjsembed/kjsembed/qobject_binding.cpp:791
+msgid "Could not construct value"
+msgstr ""
 
-#: kde3support/kdeui/k3command.cpp:388
+#: kjsembed/kjsembed/eventproxy.cpp:108
 #, kde-format
-msgid "Undo: %1"
-msgstr "Dadwneud: %1"
+msgid "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4."
+msgstr ""
 
-#: kde3support/kdeui/k3command.cpp:394
+#: kjsembed/kjsembed/eventproxy.cpp:135
 #, kde-format
-msgid "Redo: %1"
-msgstr "Ail-wneud: %1"
+msgid "Exception calling '%1' function from %2:%3:%4"
+msgstr ""
 
-#: kde3support/kdeui/k3command.cpp:421 kdeui/actions/kstandardaction_p.h:55
-msgid "&Undo"
-msgstr "&Dad-wneud"
+#: kjsembed/kjscmd/kjscmd.cpp:152
+msgid "KJSCmd"
+msgstr ""
 
-#: kde3support/kdeui/k3command.cpp:421
-msgid "&Redo"
-msgstr "&Ail-wneud"
+#: kjsembed/kjscmd/kjscmd.cpp:153
+msgid "Utility for running KJSEmbed scripts \n"
+msgstr ""
 
-#: kde3support/kdeui/k3command.cpp:426
-#, kde-format
-msgid "&Undo: %1"
-msgstr "&Dadwneud: %1"
+#: kjsembed/kjscmd/kjscmd.cpp:156
+msgid "(C) 2005-2006 The KJSEmbed Authors"
+msgstr ""
 
-#: kde3support/kdeui/k3command.cpp:429
-#, kde-format
-msgid "&Redo: %1"
-msgstr "&Ail-wneud: %1"
+#: kjsembed/kjscmd/kjscmd.cpp:159 kjsembed/kjscmd/kjscmd.cpp:160
+msgid "Execute script without gui support"
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:360
-msgid "&Password:"
-msgstr "&Cyfrinair:"
+#: kjsembed/kjscmd/kjscmd.cpp:161 kjsembed/kjscmd/kjscmd.cpp:162
+msgid "start interactive kjs interpreter"
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:378
-msgid "&Keep password"
-msgstr "&Cadw cyfrinair"
+#: kjsembed/kjscmd/kjscmd.cpp:163 kjsembed/kjscmd/kjscmd.cpp:164
+msgid "start without KDE KApplication support."
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:416
-#: kdeui/dialogs/knewpassworddialog.cpp:77
-msgid ""
-"The password strength meter gives an indication of the security of the "
-"password you have entered.  To improve the strength of the password, try:\n"
-" - using a longer password;\n"
-" - using a mixture of upper- and lower-case letters;\n"
-" - using numbers or symbols, such as #, as well as letters."
+#: kjsembed/kjscmd/kjscmd.cpp:165
+msgid "Script to execute"
 msgstr ""
-"Mae mesur faint mor gryf yw'r cyfrinair yn rhoi rhyw syniad o faint mor "
-"ddiogel yw'r cyfrinair a roddwyd.  I wella cryfder y cyfrinair, ceisiwch:\n"
-"- ddefnyddio cyfrinair hirach;\n"
-"- gymysgu priflythrennau a llythrennau bach;\n"
-"- ddefnyddio rhifau, a symbolau fel #, ymysg y llythrennau."
 
-#: kde3support/kdeui/k3passworddialog.cpp:501
-#: kdeui/dialogs/knewpassworddialog.cpp:237
-msgid "You entered two different passwords. Please try again."
-msgstr "Rhoddwyd dau gyfrinair gwahanol.  Ceisiwch eto."
+#: interfaces/ktexteditor/editorchooser.cpp:72
+#, kde-format
+msgid "System Default (currently: %1)"
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:508
-#: kdeui/dialogs/knewpassworddialog.cpp:246
+#: interfaces/ktexteditor/templateinterface.cpp:66
 msgid ""
-"The password you have entered has a low strength. To improve the strength of "
-"the password, try:\n"
-" - using a longer password;\n"
-" - using a mixture of upper- and lower-case letters;\n"
-" - using numbers or symbols as well as letters.\n"
+"The template needs information about you, which is stored in your address "
+"book.\n"
+"However, the required plugin could not be loaded.\n"
 "\n"
-"Would you like to use this password anyway?"
+"Please install the KDEPIM/Kontact package for your system."
 msgstr ""
-"Nid yw'r cyfrinair a roddwyd yn gryf iawn.  I wella cryfder y cyfrinair, "
-"ceisiwch:\n"
-"- ddefnyddio cyfrinair hirach;\n"
-"- gymysgu priflythrennau a llythrennau bach;\n"
-"- ddefnyddio rhifau, a symbolau fel #, ymysg y llythrennau.\n"
-"\n"
-"Hoffech ddefnyddio'r cyfrinair yma serch hynny?"
 
-#: kde3support/kdeui/k3passworddialog.cpp:516
-#: kdeui/dialogs/knewpassworddialog.cpp:254
-msgid "Low Password Strength"
-msgstr "Nid yw'r cyfrinair yn gryf iawn"
+#: experimental/libkdeclarative/bindings/i18n.cpp:32
+msgid "i18n() takes at least one argument"
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:564
-#: kde3support/kdeui/k3passworddialog.cpp:568
-#: kde3support/kdeui/k3passworddialog.cpp:589
-msgid "Password Input"
+#: experimental/libkdeclarative/bindings/i18n.cpp:52
+msgid "i18nc() takes at least two arguments"
 msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:619
-#: kdeui/dialogs/knewpassworddialog.cpp:167
-msgid "Password is empty"
-msgstr "Mae'r cyfrineiriau yn wag"
+#: experimental/libkdeclarative/bindings/i18n.cpp:72
+msgid "i18np() takes at least two arguments"
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:622
-#: kdeui/dialogs/knewpassworddialog.cpp:172
-#, kde-format
-msgid "Password must be at least 1 character long"
-msgid_plural "Password must be at least %1 characters long"
-msgstr[0] ""
-msgstr[1] ""
+#: experimental/libkdeclarative/bindings/i18n.cpp:97
+msgid "i18ncp() takes at least three arguments"
+msgstr ""
 
-#: kde3support/kdeui/k3passworddialog.cpp:624
-#: kdeui/dialogs/knewpassworddialog.cpp:176
-msgid "Passwords match"
-msgstr "Mae'r cyfrineiriau yn cydweddu"
+#: kdewidgets/makekdewidgets.cpp:84
+msgid "Builds Qt widget plugins from an ini style description file."
+msgstr "Adeiladu ategion celfigyn Qt o ffeil ddisgrifiad arddull ini."
 
-#: kde3support/kdeui/k3aboutapplication.cpp:50
-msgid "??"
-msgstr "??"
+#: kdewidgets/makekdewidgets.cpp:88
+msgid "Input file"
+msgstr "Ffeil fewnbwn"
 
-#: kde3support/kdeui/k3aboutapplication.cpp:51
-#: kde3support/kdeui/k3aboutapplication.cpp:77
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:158
-msgid "&About"
-msgstr "&Ynghylch"
+#: kdewidgets/makekdewidgets.cpp:89
+msgid "Output file"
+msgstr "Ffeil allbwn"
 
-#: kde3support/kdeui/k3aboutapplication.cpp:54
-msgid ""
-"No information available.\n"
-"The supplied KAboutData object does not exist."
-msgstr ""
-"Dim gwybodaeth ar gael. \n"
-" Nid ydy'r gwrthrych KAboutData a ddarparwyd ddim yn bodoli."
+#: kdewidgets/makekdewidgets.cpp:90
+msgid "Name of the plugin class to generate"
+msgstr "Enw'r dosbarth ategyn i'w greu"
 
-#: kde3support/kdeui/k3aboutapplication.cpp:95
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:168
-msgid "A&uthor"
-msgstr "A&wdur"
+#: kdewidgets/makekdewidgets.cpp:91
+msgid "Default widget group name to display in designer"
+msgstr "Enw rhagosodol i'r grŵp celfigion i'w arddangos yn y dylunydd"
 
-#: kde3support/kdeui/k3aboutapplication.cpp:95
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:168
-msgid "A&uthors"
-msgstr "A&wduron"
+#: kdewidgets/makekdewidgets.cpp:94
+msgid "makekdewidgets"
+msgstr "makekdewidgets"
 
-#: kde3support/kdeui/k3aboutapplication.cpp:107
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:173
-msgid ""
-"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report "
-"bugs.\n"
+#: kdewidgets/makekdewidgets.cpp:94
+msgid "(C) 2004-2005 Ian Reinhart Geiser"
 msgstr ""
 
-#: kde3support/kdeui/k3aboutapplication.cpp:111
-#: kde3support/kdeui/k3aboutapplication.cpp:114
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:176
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:181
-#, kde-format
-msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+#: kdewidgets/makekdewidgets.cpp:95
+msgid "Ian Reinhart Geiser"
 msgstr ""
 
-#: kde3support/kdeui/k3aboutapplication.cpp:137
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:235
-msgid "&Thanks To"
-msgstr "&Diolch i"
+#: kdewidgets/makekdewidgets.cpp:96
+msgid "Daniel Molkentin"
+msgstr ""
 
-#: kde3support/kdeui/k3aboutapplication.cpp:164
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:258
-msgid "T&ranslation"
-msgstr "C&yfieithiad"
+#: kjs/object.cpp:554
+msgid "Evaluation error"
+msgstr "Gwall enrhifiad"
 
-#: kde3support/kdeui/k3aboutapplication.cpp:169
-msgid "&License Agreement"
-msgstr "Cytundeb &Trwydded"
+#: kjs/object.cpp:555
+msgid "Range error"
+msgstr "Gwall amrediad"
 
-#: kde3support/kdeui/k3spelldlg.cpp:49
-msgid "Check Spelling"
-msgstr "Gwirio Sillafu"
+#: kjs/object.cpp:556
+msgid "Reference error"
+msgstr "Gwall cyfeirnod"
 
-#: kde3support/kdeui/k3spelldlg.cpp:54
-msgid "&Finished"
-msgstr "Wedi'i Orffe&n"
+#: kjs/object.cpp:557
+msgid "Syntax error"
+msgstr "Gwall cystrawen"
 
-#: kde3support/kdeui/k3wizard.cpp:48
-msgid "&Back"
-msgstr "&Yn ôl"
+#: kjs/object.cpp:558
+msgid "Type error"
+msgstr "Gwall math"
 
-#: kde3support/kdeui/k3wizard.cpp:49
-msgctxt "Opposite to Back"
-msgid "&Next"
-msgstr "&Nesaf"
+#: kjs/object.cpp:559
+msgid "URI error"
+msgstr "Gwall URL"
 
-#: kde3support/kdeui/k3textedit.cpp:232 kdeui/widgets/ktextedit.cpp:492
-msgid "Check Spelling..."
-msgstr "Gwirio Sillafu..."
+#: kdeui/actions/kcodecaction.cpp:91
+msgctxt "Encodings menu"
+msgid "Default"
+msgstr ""
 
-#: kde3support/kdeui/k3textedit.cpp:238 kdeui/widgets/ktextedit.cpp:495
-msgid "Auto Spell Check"
-msgstr "Hunan-wirio Sillafu"
+#: kdeui/actions/kcodecaction.cpp:102
+msgctxt "Encodings menu"
+msgid "Autodetect"
+msgstr ""
 
-#: kde3support/kdeui/k3textedit.cpp:242 kdeui/widgets/ktextedit.cpp:499
-msgid "Allow Tabulations"
-msgstr "Gadael Tablyddion"
+#: kdeui/actions/ktogglefullscreenaction.cpp:48
+#: kdeui/actions/ktogglefullscreenaction.cpp:55
+#: kdeui/actions/ktogglefullscreenaction.cpp:85
+#: kdeui/actions/kstandardaction_p.h:101
+msgid "F&ull Screen Mode"
+msgstr "&Modd Sgrîn Llawn"
 
-#: kde3support/kdeui/k3textedit.cpp:348
-msgid "Spell Checking"
-msgstr "Cywiro Sillafu"
+#: kdeui/actions/ktogglefullscreenaction.cpp:51
+#: kdeui/actions/ktogglefullscreenaction.cpp:58
+#: kdeui/actions/ktogglefullscreenaction.cpp:86
+msgid "Full Screen"
+msgstr ""
+
+#: kdeui/actions/ktogglefullscreenaction.cpp:81
+msgid "Exit F&ull Screen Mode"
+msgstr "Gadael &Modd Sgrîn Llawn"
+
+#: kdeui/actions/ktogglefullscreenaction.cpp:82
+msgid "Exit Full Screen"
+msgstr ""
+
+#: kdeui/actions/kaction.cpp:122
+#, kde-format
+msgid ""
+"The key sequence '%1' is ambiguous. Use 'Configure Shortcuts'\n"
+"from the 'Settings' menu to solve the ambiguity.\n"
+"No action will be triggered."
+msgstr ""
+
+#: kdeui/actions/kaction.cpp:126
+msgid "Ambiguous shortcut detected"
+msgstr ""
+
+#: kdeui/actions/kstandardaction.cpp:93 kdeui/util/kstandardguiitem.cpp:210
+msgctxt "go back"
+msgid "&Back"
+msgstr "Y&n ôl"
+
+#: kdeui/actions/kstandardaction.cpp:99 kdeui/util/kstandardguiitem.cpp:218
+msgctxt "go forward"
+msgid "&Forward"
+msgstr "&Ymlaen"
 
-#: kde3support/kdeui/k3spell.cpp:1231
-msgid "You have to restart the dialog for changes to take effect"
-msgstr "Rhaid i chi ailgychwyn yr ymgom i'r newidiadau gymryd effaith"
+#: kdeui/actions/kstandardaction.cpp:105
+msgctxt "home page"
+msgid "&Home"
+msgstr ""
 
-#: kde3support/kdeui/k3spell.cpp:1467
-msgid "Spell Checker"
-msgstr "Cywirydd Sillafu"
+#: kdeui/actions/kstandardaction.cpp:108 kdeui/util/kstandardguiitem.cpp:178
+msgctxt "show help"
+msgid "&Help"
+msgstr "&Cymorth"
 
-#: kde3support/kdeui/k3syntaxhighlighter.cpp:470
-#: kde3support/kdeui/k3syntaxhighlighter.cpp:576
-#: kdeui/sonnet/highlighter.cpp:241 kdeui/sonnet/highlighter.cpp:264
-msgid "As-you-type spell checking enabled."
-msgstr "Galluogir cywiro sillafu wrth deipio."
+#: kdeui/actions/kstandardaction.cpp:516 kdeui/actions/kstandardaction_p.h:98
+msgid "Show &Menubar"
+msgstr "Dangos &Dewislen"
 
-#: kde3support/kdeui/k3syntaxhighlighter.cpp:472
-#: kdeui/sonnet/highlighter.cpp:266
-msgid "As-you-type spell checking disabled."
-msgstr "Galluogir cywiro sillafu wrth deipio."
+#: kdeui/actions/kstandardaction.cpp:522
+msgid "Show Menubar<p>Shows the menubar again after it has been hidden</p>"
+msgstr ""
 
-#: kde3support/kdeui/k3syntaxhighlighter.cpp:519
-msgid "Incremental Spellcheck"
-msgstr "Gwirio Sillafu Cynnyddol"
+#: kdeui/actions/kstandardaction.cpp:539 kdeui/actions/kstandardaction_p.h:100
+msgid "Show St&atusbar"
+msgstr "Dangos Bar Cyfl&wr"
 
-#: kde3support/kdeui/k3syntaxhighlighter.cpp:578
-#: kdeui/sonnet/highlighter.cpp:243
-msgid "Too many misspelled words. As-you-type spell checking disabled."
+#: kdeui/actions/kstandardaction.cpp:542
+msgid ""
+"Show Statusbar<br /><br />Shows the statusbar, which is the bar at the "
+"bottom of the window used for status information."
 msgstr ""
-"Gormod o eiriau sydd wedi cael eu cam-sillafu.  Analluogir cywiro sillafu "
-"wrth deipio."
 
-#: kde3support/kunittest/modrunner.cpp:41
-msgid "A command-line application that can be used to run KUnitTest modules."
+#: kdeui/actions/krecentfilesaction.cpp:81
+msgid "No Entries"
 msgstr ""
 
-#: kde3support/kunittest/modrunner.cpp:46
-msgid "Only run modules whose filenames match the regexp."
+#: kdeui/actions/krecentfilesaction.cpp:85
+msgid "Clear List"
 msgstr ""
 
-#: kde3support/kunittest/modrunner.cpp:47
-msgid ""
-"Only run tests modules which are found in the folder. Use the query option "
-"to select modules."
+#: kdeui/xmlgui/ktoolbarhandler.cpp:98
+msgid "Toolbars Shown"
 msgstr ""
 
-#: kde3support/kunittest/modrunner.cpp:48
-msgid ""
-"Disables debug capturing. You typically use this option when you use the GUI."
+#: kdeui/xmlgui/kmenumenuhandler_p.cpp:48
+msgid "Add to Toolbar"
 msgstr ""
 
-#: kde3support/kunittest/modrunner.cpp:50
-msgid "KUnitTest ModRunner"
+#: kdeui/xmlgui/kmenumenuhandler_p.cpp:56
+msgid "Configure Shortcut..."
 msgstr ""
 
-#: kde3support/kunittest/modrunner.cpp:51
-msgid "(C) 2005 Jeroen Wijnhout"
+#: kdeui/xmlgui/kxmlguibuilder.cpp:182 kdeui/xmlgui/kxmlguibuilder.cpp:349
+msgid "No text"
 msgstr ""
 
-#: experimental/libkdeclarative/bindings/i18n.cpp:32
-msgid "i18n() takes at least one argument"
+#: kdeui/dialogs/kdialog.cpp:250
+msgid "&Try"
+msgstr "&Arbrofi"
+
+#: kdeui/dialogs/kdialog.cpp:452
+msgid "modified"
+msgstr "newidwyd"
+
+#: kdeui/dialogs/kdialog.cpp:462
+msgctxt "Document/application separator in titlebar"
+msgid " – "
 msgstr ""
 
-#: experimental/libkdeclarative/bindings/i18n.cpp:51
-msgid "i18nc() takes at least two arguments"
+#: kdeui/dialogs/kdialog.cpp:833
+msgid "&Details"
+msgstr "&Manylion"
+
+#: kdeui/dialogs/kdialog.cpp:986
+msgid "Get help..."
+msgstr "Nôl cymorth..."
+
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:98
+msgid "Switch Application Language"
 msgstr ""
 
-#: experimental/libkdeclarative/bindings/i18n.cpp:71
-msgid "i18np() takes at least two arguments"
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:108
+msgid "Please choose the language which should be used for this application:"
 msgstr ""
 
-#: experimental/libkdeclarative/bindings/i18n.cpp:96
-msgid "i18ncp() takes at least three arguments"
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:136
+msgid "Add Fallback Language"
 msgstr ""
 
-#: kinit/klauncher_main.cpp:62
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:137
 msgid ""
-"klauncher: This program is not supposed to be started manually.\n"
-"klauncher: It is started automatically by kdeinit4.\n"
+"Adds one more language which will be used if other translations do not "
+"contain a proper translation."
 msgstr ""
 
-#: kinit/klauncher.cpp:563
-#, kde-format
-msgid "KDEInit could not launch '%1'."
-msgstr "Ni allodd KDEInit gychwyn '%1'."
-
-#: kinit/klauncher.cpp:736 kinit/klauncher.cpp:764 kinit/klauncher.cpp:779
-#, kde-format
-msgid "Could not find service '%1'."
-msgstr "Methu canfod gwasanaeth '%1'."
-
-#: kinit/klauncher.cpp:798
-#, kde-format
-msgid "Service '%1' must be executable to run."
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:227
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:255
+msgid ""
+"The language for this application has been changed. The change will take "
+"effect the next time the application is started."
 msgstr ""
 
-#: kinit/klauncher.cpp:800 kinit/klauncher.cpp:836
-#, kde-format
-msgid "Service '%1' is malformatted."
-msgstr "Mae gwasanaeth '%1' wedi'i gam-fformatio."
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:228
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:256
+msgid "Application Language Changed"
+msgstr ""
 
-#: kinit/klauncher.cpp:922
-#, kde-format
-msgid "Launching %1"
-msgstr "Ymgychwyn %1"
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:323
+msgid "Primary language:"
+msgstr ""
 
-#: kinit/klauncher.cpp:1124
-#, kde-format
-msgid "Unknown protocol '%1'.\n"
-msgstr "Protocol anhysbys '%1'.\n"
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:323
+msgid "Fallback language:"
+msgstr ""
 
-#: kinit/klauncher.cpp:1185
-#, kde-format
-msgid "Error loading '%1'.\n"
-msgstr "Gwall wrth lwytho '%1'.\n"
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:343
+#: kdeui/util/kstandardguiitem.cpp:291 kross/ui/view.cpp:329
+msgid "Remove"
+msgstr "Tynnu ymaith"
 
-#: kinit/kinit.cpp:518
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:354
 msgid ""
-"Unable to start new process.\n"
-"The system may have reached the maximum number of open files possible or the "
-"maximum number of open files that you are allowed to use has been reached."
+"This is the main application language which will be used first, before any "
+"other languages."
 msgstr ""
 
-#: kinit/kinit.cpp:537
+#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:355
 msgid ""
-"Unable to create new process.\n"
-"The system may have reached the maximum number of processes possible or the "
-"maximum number of processes that you are allowed to use has been reached."
+"This is the language which will be used if any previous languages do not "
+"contain a proper translation."
 msgstr ""
 
-#: kinit/kinit.cpp:629
-#, kde-format
-msgid "Could not find '%1' executable."
-msgstr "Methu canfod gweithredadwyn '%1'"
-
-#: kinit/kinit.cpp:647
-#, kde-format
+#: kdeui/dialogs/knewpassworddialog.cpp:76
+#: kde3support/kdeui/k3passworddialog.cpp:414
 msgid ""
-"Could not open library '%1'.\n"
-"%2"
+"The password strength meter gives an indication of the security of the "
+"password you have entered.  To improve the strength of the password, try:\n"
+" - using a longer password;\n"
+" - using a mixture of upper- and lower-case letters;\n"
+" - using numbers or symbols, such as #, as well as letters."
 msgstr ""
-"Methu agor rhaglengell '%1'.\n"
-"%2"
+"Mae mesur faint mor gryf yw'r cyfrinair yn rhoi rhyw syniad o faint mor "
+"ddiogel yw'r cyfrinair a roddwyd.  I wella cryfder y cyfrinair, ceisiwch:\n"
+"- ddefnyddio cyfrinair hirach;\n"
+"- gymysgu priflythrennau a llythrennau bach;\n"
+"- ddefnyddio rhifau, a symbolau fel #, ymysg y llythrennau."
 
-#: kinit/kinit.cpp:693
+#: kdeui/dialogs/knewpassworddialog.cpp:166
+#: kde3support/kdeui/k3passworddialog.cpp:617
+msgid "Password is empty"
+msgstr "Mae'r cyfrineiriau yn wag"
+
+#: kdeui/dialogs/knewpassworddialog.cpp:171
+#: kde3support/kdeui/k3passworddialog.cpp:620
 #, kde-format
-msgid ""
-"Could not find 'kdemain' in '%1'.\n"
-"%2"
-msgstr ""
-"Methu canfod 'kdemain' yn '%1'.\n"
-"%2"
+msgid "Password must be at least 1 character long"
+msgid_plural "Password must be at least %1 characters long"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kded/kded.cpp:869
-msgid "KDE Daemon"
-msgstr "Ellyll KDE"
+#: kdeui/dialogs/knewpassworddialog.cpp:175
+#: kde3support/kdeui/k3passworddialog.cpp:622
+msgid "Passwords match"
+msgstr "Mae'r cyfrineiriau yn cydweddu"
 
-#: kded/kded.cpp:871
-msgid "KDE Daemon - triggers Sycoca database updates when needed"
-msgstr "Ellyll KDE - yn diweddaru cronfa ddata Sycoca pan bo angen"
+#: kdeui/dialogs/knewpassworddialog.cpp:236
+#: kde3support/kdeui/k3passworddialog.cpp:499
+msgid "You entered two different passwords. Please try again."
+msgstr "Rhoddwyd dau gyfrinair gwahanol.  Ceisiwch eto."
 
-#: kded/kded.cpp:874
-msgid "Check Sycoca database only once"
-msgstr "Gwirio cronfa ddata Sycoca unwaith yn unig"
+#: kdeui/dialogs/knewpassworddialog.cpp:245
+#: kde3support/kdeui/k3passworddialog.cpp:506
+msgid ""
+"The password you have entered has a low strength. To improve the strength of "
+"the password, try:\n"
+" - using a longer password;\n"
+" - using a mixture of upper- and lower-case letters;\n"
+" - using numbers or symbols as well as letters.\n"
+"\n"
+"Would you like to use this password anyway?"
+msgstr ""
+"Nid yw'r cyfrinair a roddwyd yn gryf iawn.  I wella cryfder y cyfrinair, "
+"ceisiwch:\n"
+"- ddefnyddio cyfrinair hirach;\n"
+"- gymysgu priflythrennau a llythrennau bach;\n"
+"- ddefnyddio rhifau, a symbolau fel #, ymysg y llythrennau.\n"
+"\n"
+"Hoffech ddefnyddio'r cyfrinair yma serch hynny?"
 
-#: kded/kbuildsycoca.cpp:406 kded/kbuildsycoca.cpp:437
-#: kded/kbuildsycoca.cpp:635
-msgid "KBuildSycoca"
-msgstr "KBuildSycoca"
+#: kdeui/dialogs/knewpassworddialog.cpp:253
+#: kde3support/kdeui/k3passworddialog.cpp:514
+msgid "Low Password Strength"
+msgstr "Nid yw'r cyfrinair yn gryf iawn"
 
-#: kded/kbuildsycoca.cpp:636
-msgid "Rebuilds the system configuration cache."
-msgstr "Ail-adeiladu celc ffurfweddiad y cysawd."
+#: kdeui/dialogs/kconfigdialog.cpp:43 kutils/kcmultidialog.cpp:208
+msgid "Configure"
+msgstr "Ffurfweddu"
 
-#: kded/kbuildsycoca.cpp:637
-msgid "(c) 1999-2002 KDE Developers"
+#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:205
+#, kde-format
+msgctxt "City, Country"
+msgid "%1, %2"
 msgstr ""
 
-#: kded/kbuildsycoca.cpp:638
-msgid "David Faure"
+#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:311
+msgctxt "A generic social network or homepage link of an unlisted type."
+msgid "Other"
 msgstr ""
 
-#: kded/kbuildsycoca.cpp:639 kded/khostname.cpp:220 khtml/khtml_global.cpp:213
-#: kconf_update/kconf_update.cpp:963
-msgid "Waldo Bastian"
+#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:313
+msgctxt "A type of link."
+msgid "Blog"
 msgstr ""
 
-#: kded/kbuildsycoca.cpp:642
-msgid "Do not signal applications to update"
-msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
-
-#: kded/kbuildsycoca.cpp:643
-msgid "Disable incremental update, re-read everything"
-msgstr "Analluogi diweddariad cynnyddol, ail-ddarllen popeth"
-
-#: kded/kbuildsycoca.cpp:644
-msgid "Check file timestamps"
-msgstr "Gwirio stampiau amser ffeil"
-
-#: kded/kbuildsycoca.cpp:645
-msgid "Disable checking files (dangerous)"
-msgstr "Analluogi gwirio ffeiliau (peryglus)"
+#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:321
+msgctxt "A type of link."
+msgid "Homepage"
+msgstr ""
 
-#: kded/kbuildsycoca.cpp:646
-msgid "Create global database"
-msgstr "Creu cronfa ddata eang"
+#: kdeui/dialogs/kedittoolbar.cpp:58
+msgid "--- separator ---"
+msgstr "--- gwahanydd ---"
 
-#: kded/kbuildsycoca.cpp:647
-msgid "Perform menu generation test run only"
-msgstr "Gweithredu arbrofiad yn unig o'r cread dewislen"
+#: kdeui/dialogs/kedittoolbar.cpp:287
+msgid "Change Text"
+msgstr ""
 
-#: kded/kbuildsycoca.cpp:648
-msgid "Track menu id for debug purposes"
-msgstr "Dilyn dynodiad dewislen i pwrpas dadnamu"
+#: kdeui/dialogs/kedittoolbar.cpp:298
+msgid "Icon te&xt:"
+msgstr ""
 
-#: kross/ui/view.cpp:159
-msgid "Text:"
+#: kdeui/dialogs/kedittoolbar.cpp:303
+msgid "&Hide text when toolbar shows text alongside icons"
 msgstr ""
 
-#: kross/ui/view.cpp:166
-msgid "Comment:"
+#: kdeui/dialogs/kedittoolbar.cpp:553
+msgid "Configure Toolbars"
 msgstr ""
 
-#: kross/ui/view.cpp:173
-msgid "Icon:"
+#: kdeui/dialogs/kedittoolbar.cpp:602
+msgid ""
+"Do you really want to reset all toolbars of this application to their "
+"default? The changes will be applied immediately."
 msgstr ""
 
-#: kross/ui/view.cpp:194
-msgid "Interpreter:"
+#: kdeui/dialogs/kedittoolbar.cpp:602
+msgid "Reset Toolbars"
 msgstr ""
 
-#. i18n: file: kross/test/testguiform.ui:44
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:342 kross/ui/view.cpp:209
-msgid "File:"
-msgstr "Ffeil:"
+#: kdeui/dialogs/kedittoolbar.cpp:602 khtml/khtmlview.cpp:2814
+#: khtml/khtmlview.cpp:2847 khtml/html/html_formimpl.cpp:1845
+msgid "Reset"
+msgstr "Ail-osod"
 
-#: kross/ui/view.cpp:303
-msgid "Execute the selected script."
+#: kdeui/dialogs/kedittoolbar.cpp:896
+msgid "&Toolbar:"
 msgstr ""
 
-#: kross/ui/view.cpp:310
-msgid "Stop execution of the selected script."
-msgstr ""
+#: kdeui/dialogs/kedittoolbar.cpp:911
+msgid "A&vailable actions:"
+msgstr "G&weithrediadau ar gael:"
 
-#: kross/ui/view.cpp:315
-msgid "Edit..."
+#: kdeui/dialogs/kedittoolbar.cpp:926 kdeui/dialogs/kedittoolbar.cpp:945
+msgid "Filter"
 msgstr ""
 
-#: kross/ui/view.cpp:317
-msgid "Edit selected script."
+#: kdeui/dialogs/kedittoolbar.cpp:929
+msgid "Curr&ent actions:"
+msgstr "Gweith&rediadau cyfredol:"
+
+#: kdeui/dialogs/kedittoolbar.cpp:948
+msgid "Change &Icon..."
+msgstr "Newid E&icon..."
+
+#: kdeui/dialogs/kedittoolbar.cpp:958
+msgid "Change Te&xt..."
 msgstr ""
 
-#: kross/ui/view.cpp:322
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:274
-msgid "Add..."
+#: kdeui/dialogs/kedittoolbar.cpp:1109
+#, kde-format
+msgctxt "@item:intable Action name in toolbar editor"
+msgid "%1"
 msgstr ""
 
-#: kross/ui/view.cpp:324
-msgid "Add a new script."
+#: kdeui/dialogs/kedittoolbar.cpp:1130
+msgid ""
+"This element will be replaced with all the elements of an embedded component."
 msgstr ""
+"Amnewidir yr elfen yma gan yr elfennau i gyd sy'n biau i gydran mewnol."
 
-#: kross/ui/view.cpp:329 kdeui/dialogs/kswitchlanguagedialog_p.cpp:301
-#: kdeui/util/kstandardguiitem.cpp:291
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:278
-msgid "Remove"
-msgstr "Tynnu ymaith"
+#: kdeui/dialogs/kedittoolbar.cpp:1132
+msgid "<Merge>"
+msgstr "<Cyfuno>"
 
-#: kross/ui/view.cpp:331
-msgid "Remove selected script."
+#: kdeui/dialogs/kedittoolbar.cpp:1134
+#, kde-format
+msgid "<Merge %1>"
+msgstr "<Cyfuno %1>"
+
+#: kdeui/dialogs/kedittoolbar.cpp:1140
+msgid ""
+"This is a dynamic list of actions. You can move it, but if you remove it you "
+"will not be able to re-add it."
 msgstr ""
 
-#: kross/ui/view.cpp:504
-msgid "Edit"
-msgstr "Golygu"
+#: kdeui/dialogs/kedittoolbar.cpp:1141
+#, kde-format
+msgid "ActionList: %1"
+msgstr "RhestrGweithred: %1"
 
-#: kross/ui/view.cpp:511
-msgctxt "@title:group Script properties"
-msgid "General"
+#: kdeui/dialogs/kedittoolbar.cpp:1242 kdeui/dialogs/kedittoolbar.cpp:1272
+#, kde-format
+msgctxt "@label Action tooltip in toolbar editor, below the action list"
+msgid "%1"
 msgstr ""
 
-#: kross/qts/main.cpp:57 kross/console/main.cpp:94
-msgid "Kross"
+#: kdeui/dialogs/kedittoolbar.cpp:1525
+msgid "Change Icon"
 msgstr ""
 
-#: kross/qts/main.cpp:58 kross/console/main.cpp:96
-msgid "KDE application to run Kross scripts."
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:90
+msgid "Print Immediately"
 msgstr ""
 
-#: kross/qts/main.cpp:60 kross/console/main.cpp:98
-msgid "(C) 2006 Sebastian Sauer"
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:91
+msgid "Hold Indefinitely"
 msgstr ""
 
-#: kross/qts/main.cpp:61 kross/console/main.cpp:99
-msgid "Run Kross scripts."
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:92
+msgid "Day (06:00 to 17:59)"
 msgstr ""
 
-#: kross/qts/main.cpp:63 kross/test/main.cpp:149 kross/console/main.cpp:102
-msgid "Sebastian Sauer"
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:93
+msgid "Night (18:00 to 05:59)"
 msgstr ""
 
-#: kross/qts/main.cpp:69 kross/test/main.cpp:152 kross/console/main.cpp:108
-msgid "Scriptfile"
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:94
+msgid "Second Shift (16:00 to 23:59)"
 msgstr ""
 
-#: kross/core/manager.cpp:147
-msgid "Level of safety of the Ruby interpreter"
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:95
+msgid "Third Shift (00:00 to 07:59)"
 msgstr ""
 
-#: kross/core/action.cpp:455
-#, kde-format
-msgid "Scriptfile \"%1\" does not exist."
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:96
+msgid "Weekend (Saturday to Sunday)"
 msgstr ""
 
-#: kross/core/action.cpp:459
-#, kde-format
-msgid "Failed to determine interpreter for scriptfile \"%1\""
+#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:97
+msgid "Specific Time"
 msgstr ""
 
-#: kross/core/action.cpp:463
-#, kde-format
-msgid "Failed to open scriptfile \"%1\""
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:42
+msgid "About KDE"
 msgstr ""
 
-#: kross/core/action.cpp:474
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:46
 #, kde-format
-msgid "Failed to load interpreter \"%1\""
+msgid ""
+"<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version "
+"%1</b></html>"
 msgstr ""
 
-#: kross/core/action.cpp:476
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:56
 #, kde-format
-msgid "No such interpreter \"%1\""
+msgid ""
+"<html><b>KDE</b> is a world-wide network of software engineers, artists, "
+"writers, translators and facilitators who are committed to <a "
+"href=\"%1\">Free Software</a> development. This community has created "
+"hundreds of Free Software applications as part of the KDE Development "
+"Platform and KDE Software Distribution.<br /><br />KDE is a cooperative "
+"enterprise in which no single entity controls the efforts or products of KDE "
+"to the exclusion of others. Everyone is welcome to join and contribute to "
+"KDE, including you.<br /><br />Visit <a href=\"%2\">%2</a> for more "
+"information about the KDE community and the software we produce.</html>"
 msgstr ""
 
-#: kross/core/action.cpp:482
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:75
 #, kde-format
-msgid "Failed to create script for interpreter \"%1\""
-msgstr ""
-
-#: kross/modules/form.cpp:303
-msgid "Cancel?"
+msgid ""
+"<html>Software can always be improved, and the KDE team is ready to do so. "
+"However, you - the user - must tell us when something does not work as "
+"expected or could be done better.<br /><br />KDE has a bug tracking system. "
+"Visit <a href=\"%1\">%1</a> or use the \"Report Bug...\" dialog from the "
+"\"Help\" menu to report bugs.<br /><br />If you have a suggestion for "
+"improvement then you are welcome to use the bug tracking system to register "
+"your wish. Make sure you use the severity called \"Wishlist\".</html>"
 msgstr ""
 
-#: interfaces/ktexteditor/editorchooser.cpp:71
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:93
 #, kde-format
-msgid "System Default (currently: %1)"
-msgstr ""
-
-#: interfaces/ktexteditor/templateinterface.cpp:64
 msgid ""
-"The template needs information about you, which is stored in your address "
-"book.\n"
-"However, the required plugin could not be loaded.\n"
-"\n"
-"Please install the KDEPIM/Kontact package for your system."
+"<html>You do not have to be a software developer to be a member of the KDE "
+"team. You can join the national teams that translate program interfaces. You "
+"can provide graphics, themes, sounds, and improved documentation. You "
+"decide!<br /><br />Visit <a href=\"%1\">%1</a> for information on some "
+"projects in which you can participate.<br /><br />If you need more "
+"information or documentation, then a visit to <a href=\"%2\">%2</a> will "
+"provide you with what you need.</html>"
 msgstr ""
 
-#: khtml/test_regression_gui_window.cpp:76
-msgid "Available Tests: 0"
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:115
+#, kde-format
+msgid ""
+"<html>KDE software is and will always be available free of charge, however "
+"creating it is not free.<br /><br />To support development the KDE community "
+"has formed the KDE e.V., a non-profit organization legally founded in "
+"Germany. KDE e.V. represents the KDE community in legal and financial "
+"matters. See <a href=\"%1\">%1</a> for information on KDE e.V.<br /><br "
+"/>KDE benefits from many kinds of contributions, including financial. We use "
+"the funds to reimburse members and others for expenses they incur when "
+"contributing. Further funds are used for legal support and organizing "
+"conferences and meetings. <br /> <br />We would like to encourage you to "
+"support our efforts with a financial donation, using one of the ways "
+"described at <a href=\"%2\">%2</a>.<br /><br />Thank you very much in "
+"advance for your support.</html>"
 msgstr ""
 
-#: khtml/test_regression_gui_window.cpp:181
-msgid "Please choose a valid 'khtmltests/regression/' directory."
-msgstr ""
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:134
+msgctxt "About KDE"
+msgid "&About"
+msgstr "&Ynghylch"
 
-#: khtml/test_regression_gui_window.cpp:250
-msgid "Please choose a valid 'khtml/' build directory."
-msgstr ""
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:135
+msgid "&Report Bugs or Wishes"
+msgstr "&Adrodd Namau neu Dymuniadau"
 
-#: khtml/test_regression_gui_window.cpp:532
-#, kde-format
-msgid "Available Tests: %1 (ignored: %2)"
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:136
+msgid "&Join KDE"
 msgstr ""
 
-#: khtml/test_regression_gui_window.cpp:563
-#: khtml/ecma/debugger/debugwindow.cpp:192
-msgid "Continue"
-msgstr "Mynd ymlaen"
+#: kdeui/dialogs/kaboutkdedialog_p.cpp:137
+msgid "&Support KDE"
+msgstr "&Cefnogi KDE"
 
-#: khtml/test_regression_gui_window.cpp:632
-msgid "Cannot find testregression executable."
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:84
+msgid ""
+"<qt>No information available.<br />The supplied KAboutData object does not "
+"exist.</qt>"
 msgstr ""
 
-#: khtml/test_regression_gui_window.cpp:1102
-msgid "Run test..."
-msgstr ""
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:92
+#: kdeui/dialogs/kmessagebox.cpp:1049 kdeui/widgets/khelpmenu.cpp:290
+#: kde3support/kdeui/k3aboutdialog.cpp:1044
+#, kde-format
+msgid "About %1"
+msgstr "Ynglyn â %1"
 
-#: khtml/test_regression_gui_window.cpp:1104
-msgid "Add to ignores..."
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:113
+#, kde-format
+msgid ""
+"<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />&nbsp;</html>"
 msgstr ""
 
-#: khtml/test_regression_gui_window.cpp:1105
-msgid "Remove from ignores..."
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:117
+#, kde-format
+msgctxt ""
+"Program name, version and KDE platform version; do not translate "
+"'Development Platform'"
+msgid ""
+"<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE "
+"Development Platform %3</html>"
 msgstr ""
 
-#: khtml/khtmlimage.cpp:197
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:153
 #, kde-format
-msgid "%1 (%2 - %3x%4 Pixels)"
-msgstr "%1 (%2 - %3x%4 o Bicseli)"
+msgid "License: %1"
+msgstr ""
 
-#: khtml/khtmlimage.cpp:199
-#, kde-format
-msgid "%1 - %2x%3 Pixels"
-msgstr "%1 - %2x%3 o Bicseli"
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:166
+#: kde3support/kdeui/k3aboutapplication.cpp:51
+#: kde3support/kdeui/k3aboutapplication.cpp:77
+msgid "&About"
+msgstr "&Ynghylch"
 
-#: khtml/khtmlimage.cpp:204
-#, kde-format
-msgid "%1 (%2x%3 Pixels)"
-msgstr "%1 (%2x%3 o Bicseli)"
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:186
+#: kde3support/kdeui/k3aboutapplication.cpp:107
+msgid ""
+"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> to report "
+"bugs.\n"
+msgstr ""
 
-#: khtml/khtmlimage.cpp:206
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:190
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:195
+#: kde3support/kdeui/k3aboutapplication.cpp:111
+#: kde3support/kdeui/k3aboutapplication.cpp:114
 #, kde-format
-msgid "Image - %1x%2 Pixels"
-msgstr "Delwedd - %1x%2 o Bicseli"
-
-#: khtml/khtmlimage.cpp:212
-msgid "Done."
-msgstr "Wedi gorffen."
+msgid "Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+msgstr ""
 
-#: khtml/khtml_global.cpp:208
-msgid "KHTML"
-msgstr "KHTML"
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:222
+#: kde3support/kdeui/k3aboutapplication.cpp:95
+msgid "A&uthor"
+msgstr "A&wdur"
 
-#: khtml/khtml_global.cpp:209
-msgid "Embeddable HTML component"
-msgstr "Cydran HTML mewnadeiladedig"
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:222
+#: kde3support/kdeui/k3aboutapplication.cpp:95
+msgid "A&uthors"
+msgstr "A&wduron"
 
-#: khtml/khtml_global.cpp:211
-msgid "Lars Knoll"
-msgstr ""
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:249
+#: kde3support/kdeui/k3aboutapplication.cpp:137
+msgid "&Thanks To"
+msgstr "&Diolch i"
 
-#: khtml/khtml_global.cpp:212
-msgid "Antti Koivisto"
-msgstr ""
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:287
+#: kde3support/kdeui/k3aboutapplication.cpp:164
+msgid "T&ranslation"
+msgstr "C&yfieithiad"
 
-#: khtml/khtml_global.cpp:214
-msgid "Dirk Mueller"
+#: kdeui/dialogs/kaboutapplicationdialog.cpp:312
+msgid "License Agreement"
 msgstr ""
 
-#: khtml/khtml_global.cpp:215
-msgid "Peter Kelly"
+#: kdeui/dialogs/kshortcutsdialog.cpp:67
+msgid ""
+"The current shortcut scheme is modified. Save before switching to the new "
+"one?"
 msgstr ""
 
-#: khtml/khtml_global.cpp:216
-msgid "Torben Weis"
-msgstr ""
+#: kdeui/dialogs/kshortcutsdialog.cpp:122
+msgid "Configure Shortcuts"
+msgstr "Ffurfweddu Byrlwybrau"
 
-#: khtml/khtml_global.cpp:217
-msgid "Martin Jones"
-msgstr ""
+#: kdeui/dialogs/kshortcutsdialog.cpp:124 kdeui/util/kkeyserver_x11.cpp:113
+msgid "Print"
+msgstr "Argraffu"
 
-#: khtml/khtml_global.cpp:218
-msgid "Simon Hausmann"
+#: kdeui/dialogs/kshortcutsdialog.cpp:129
+msgid "Reset to Defaults"
 msgstr ""
 
-#: khtml/khtml_global.cpp:219
-msgid "Tobias Anton"
+#: kdeui/dialogs/kdeprintdialog.cpp:73
+msgctxt "@title:window"
+msgid "Print"
 msgstr ""
 
-#: khtml/khtmladaptorpart.cpp:29
-msgid "Inactive"
-msgstr ""
+#: kdeui/dialogs/kbugreport.cpp:92 kdeui/dialogs/kbugreport.cpp:116
+msgid "Submit Bug Report"
+msgstr "Cyflwyno Adroddiad Nam"
 
-#: khtml/test_regression_gui_main.cpp:34
-msgid "TestRegressionGui"
+#: kdeui/dialogs/kbugreport.cpp:128
+msgid ""
+"Your email address. If incorrect, use the Configure Email button to change it"
 msgstr ""
+"Eich cyfeiriad ebost. Os bo'n anghywir, defnyddiwch y botwm Ffurfweddu Ebost "
+"i'w newid."
 
-#: khtml/test_regression_gui_main.cpp:35
-msgid "GUI for the khtml regression tester"
+#: kdeui/dialogs/kbugreport.cpp:129
+msgctxt "Email sender address"
+msgid "From:"
 msgstr ""
 
-#: khtml/khtmlview.cpp:1987
-msgid "Access Keys activated"
-msgstr "Gweithredoliwyd Bysellau Cyrchiad"
+#: kdeui/dialogs/kbugreport.cpp:138
+msgid "Configure Email..."
+msgstr "Ffurfweddu Ebost ..."
 
-#: khtml/khtmlview.cpp:2948 khtml/khtmlview.cpp:2990 khtml/khtml_part.cpp:4699
-#: khtml/html/html_formimpl.cpp:1605 khtml/html/html_formimpl.cpp:1817
-msgid "Submit"
-msgstr "Cyflwyno"
+#: kdeui/dialogs/kbugreport.cpp:145
+msgid "The email address this bug report is sent to."
+msgstr "Y gyfeiriad ebost a anfonir yr adroddiad nam yma iddi."
 
-#: khtml/khtmlview.cpp:2962 khtml/khtmlview.cpp:2995
-#: khtml/html/html_formimpl.cpp:1809 kdeui/dialogs/kedittoolbar.cpp:533
-msgid "Reset"
-msgstr "Ail-osod"
+#: kdeui/dialogs/kbugreport.cpp:146
+msgctxt "Email receiver address"
+msgid "To:"
+msgstr ""
 
-#: khtml/khtml_run.cpp:95 khtml/khtml_part.cpp:3728 khtml/khtml_part.cpp:3938
-#: khtml/khtml_part.cpp:4330 kparts/browserrun.cpp:399
-msgid "Save As"
-msgstr "Cadw Fel"
+#: kdeui/dialogs/kbugreport.cpp:154
+msgid "&Send"
+msgstr "&Anfon"
 
-#: khtml/khtml_ext.cpp:425
-msgid "&Copy Text"
-msgstr "&Copïo Testun"
+#: kdeui/dialogs/kbugreport.cpp:154
+msgid "Send bug report."
+msgstr "Anfon Adroddiad Nam"
 
-#: khtml/khtml_ext.cpp:439
+#: kdeui/dialogs/kbugreport.cpp:155
 #, kde-format
-msgid "Open '%1'"
-msgstr "Agor '%1'"
+msgid "Send this bug report to %1."
+msgstr "Anfonwch yr adroddiad nam yma i %1."
 
-#: khtml/khtml_ext.cpp:456
-msgid "&Copy Email Address"
+#: kdeui/dialogs/kbugreport.cpp:165
+msgid ""
+"The application for which you wish to submit a bug report - if incorrect, "
+"please use the Report Bug menu item of the correct application"
 msgstr ""
+"Y cymhwysiad a ddymunir cyflwyno adroddiad nam amdano - os yn anghywir, "
+"defnyddiwch yr eitem dewislen Adrodd Nam o'r rhaglen cywir."
 
-#: khtml/khtml_ext.cpp:461
-msgid "&Save Link As..."
-msgstr "&Cadw Cyswllt Fel ..."
+#: kdeui/dialogs/kbugreport.cpp:166
+msgid "Application: "
+msgstr "Cymhwysiad: "
 
-#: khtml/khtml_ext.cpp:466
-msgid "&Copy Link Address"
+#: kdeui/dialogs/kbugreport.cpp:194
+msgid ""
+"The version of this application - please make sure that no newer version is "
+"available before sending a bug report"
 msgstr ""
+"Fersiwn y cymhwysiad yma - sicrhewch nad oes fersiwn newyddach ar gael cyn "
+"anfon adroddiad nam"
 
-#: khtml/khtml_ext.cpp:478
-msgctxt "@title:menu HTML frame/iframe"
-msgid "Frame"
+#: kdeui/dialogs/kbugreport.cpp:201
+msgid "no version set (programmer error)"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:479
-msgid "Open in New &Window"
-msgstr "Agor mewn &Ffenest Newydd"
-
-#: khtml/khtml_ext.cpp:485
-msgid "Open in &This Window"
-msgstr "Agor yn y Ffenest &Hon"
-
-#: khtml/khtml_ext.cpp:490
-msgid "Open in &New Tab"
-msgstr "Agor mewn Tab New&ydd"
-
-#: khtml/khtml_ext.cpp:500
-msgid "Reload Frame"
-msgstr "Ail-lwytho Ffrâm"
-
-#: khtml/khtml_ext.cpp:505 khtml/khtml_part.cpp:466
-msgid "Print Frame..."
-msgstr "Argraffu Ffrâm ..."
-
-#: khtml/khtml_ext.cpp:511 khtml/khtml_part.cpp:329
-msgid "Save &Frame As..."
-msgstr "Cadw &Ffram Fel ..."
-
-#: khtml/khtml_ext.cpp:516 khtml/khtml_part.cpp:304
-msgid "View Frame Source"
-msgstr "Gweld Ffynhonell y Ffram"
+#: kdeui/dialogs/kbugreport.cpp:212
+msgid "OS:"
+msgstr "SG:"
 
-#: khtml/khtml_ext.cpp:521
-msgid "View Frame Information"
-msgstr "Gweld Gwybodaeth Ffrâm"
+#: kdeui/dialogs/kbugreport.cpp:225
+msgid "Compiler:"
+msgstr "Crynhoydd:"
 
-#: khtml/khtml_ext.cpp:531
-msgid "Block IFrame..."
-msgstr ""
+#: kdeui/dialogs/kbugreport.cpp:234
+msgid "Se&verity"
+msgstr "Lly&mder"
 
-#: khtml/khtml_ext.cpp:556
-msgid "Save Image As..."
-msgstr "Cadw Delwedd Fel ..."
+#: kdeui/dialogs/kbugreport.cpp:236
+msgid "Critical"
+msgstr "Critigol"
 
-#: khtml/khtml_ext.cpp:561
-msgid "Send Image..."
-msgstr "Anfon Delwedd ..."
+#: kdeui/dialogs/kbugreport.cpp:236
+msgid "Grave"
+msgstr "Peryglus"
 
-#: khtml/khtml_ext.cpp:567
-msgid "Copy Image"
-msgstr "Copïo Delwedd"
+#: kdeui/dialogs/kbugreport.cpp:236
+msgctxt "normal severity"
+msgid "Normal"
+msgstr "Arferol"
 
-#: khtml/khtml_ext.cpp:575
-msgid "Copy Image Location"
-msgstr "Copïo Lleoliad Delwedd"
+#: kdeui/dialogs/kbugreport.cpp:236
+msgid "Wishlist"
+msgstr "Rhestr dymuniadau"
 
-#: khtml/khtml_ext.cpp:584
-#, kde-format
-msgid "View Image (%1)"
-msgstr "Gweld Delwedd (%1)"
+#: kdeui/dialogs/kbugreport.cpp:236
+msgid "Translation"
+msgstr "Cyfieithiad"
 
-#: khtml/khtml_ext.cpp:590
-msgid "Block Image..."
-msgstr ""
+#: kdeui/dialogs/kbugreport.cpp:253
+msgid "S&ubject: "
+msgstr "&Pwnc: "
 
-#: khtml/khtml_ext.cpp:598
-#, kde-format
-msgid "Block Images From %1"
+#: kdeui/dialogs/kbugreport.cpp:261
+msgid ""
+"Enter the text (in English if possible) that you wish to submit for the bug "
+"report.\n"
+"If you press \"Send\", a mail message will be sent to the maintainer of this "
+"program.\n"
 msgstr ""
+"Mewnosodwch y testun (mewn Saesneg os yn bosib) y dymunwch yrru ynglyn â'r "
+"adroddiad nam.\n"
+"Os gwthiwch \"Anfon\", anfonir neges ebost i ofalwr y rhaglen yma.\n"
 
-#: khtml/khtml_ext.cpp:610
-msgid "Stop Animations"
-msgstr "Atal Bywluniadau"
-
-#: khtml/khtml_ext.cpp:677
-#, kde-format
-msgid "Search for '%1' with %2"
+#: kdeui/dialogs/kbugreport.cpp:284
+msgid ""
+"<qt>To submit a bug report, click on the button below. This will open a web "
+"browser window on <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
+"where you will find a form to fill in. The information displayed above will "
+"be transferred to that server.</qt>"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:689
-#, kde-format
-msgid "Search for '%1' with"
-msgstr ""
+#: kdeui/dialogs/kbugreport.cpp:298
+msgid "&Launch Bug Report Wizard"
+msgstr "&Cychwyn Dewin Adrodd Namau"
 
-#: khtml/khtml_ext.cpp:749
-msgid "Save Link As"
-msgstr "Cadw Cyswllt Fel"
+#: kdeui/dialogs/kbugreport.cpp:349
+msgctxt "unknown program name"
+msgid "unknown"
+msgstr "anhysbys"
 
-#: khtml/khtml_ext.cpp:769
-msgid "Save Image As"
-msgstr "Cadw Delwedd Fel"
+#: kdeui/dialogs/kbugreport.cpp:417
+msgid ""
+"You must specify both a subject and a description before the report can be "
+"sent."
+msgstr "Mae'n rhaid penodi pwnc a disgrifiad hefyd cyn anfonir yr adroddiad."
 
-#: khtml/khtml_ext.cpp:783 khtml/khtml_ext.cpp:796
-msgid "Add URL to Filter"
+#: kdeui/dialogs/kbugreport.cpp:427
+msgid ""
+"<p>You chose the severity <b>Critical</b>. Please note that this severity is "
+"intended only for bugs that:</p><ul><li>break unrelated software on the "
+"system (or the whole system)</li><li>cause serious data "
+"loss</li><li>introduce a security hole on the system where the affected "
+"package is installed</li></ul>\n"
+"<p>Does the bug you are reporting cause any of the above damage? If it does "
+"not, please select a lower severity. Thank you.</p>"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:784 khtml/khtml_ext.cpp:797
-msgid "Enter the URL:"
+#: kdeui/dialogs/kbugreport.cpp:438
+msgid ""
+"<p>You chose the severity <b>Grave</b>. Please note that this severity is "
+"intended only for bugs that:</p><ul><li>make the package in question "
+"unusable or mostly so</li><li>cause data loss</li><li>introduce a security "
+"hole allowing access to the accounts of users who use the affected "
+"package</li></ul>\n"
+"<p>Does the bug you are reporting cause any of the above damage? If it does "
+"not, please select a lower severity. Thank you.</p>"
 msgstr ""
 
-#: khtml/khtml_ext.cpp:933
-#, kde-format
+#: kdeui/dialogs/kbugreport.cpp:452
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+"Unable to send the bug report.\n"
+"Please submit a bug report manually....\n"
+"See http://bugs.kde.org/ for instructions."
 msgstr ""
-"Mae ffeil o'r enw \"%1\" yn bodoli yn barod. Ydych chi'n sicr yr ydych "
-"eisiau sgrifennu drosto?"
-
-#: khtml/khtml_ext.cpp:933 kdewebkit/kwebpage.cpp:176
-msgid "Overwrite File?"
-msgstr "Ysgrifennu dros y Ffeil?"
-
-#: khtml/khtml_ext.cpp:933
-msgid "Overwrite"
-msgstr "Dros-ysgrifennu"
 
-#: khtml/khtml_ext.cpp:994 kparts/browserrun.cpp:370
-#, kde-format
-msgid "The Download Manager (%1) could not be found in your $PATH "
-msgstr "Methu canfod y Rheolydd Lawrlwytho (%1) yn eich $PATH "
+#: kdeui/dialogs/kbugreport.cpp:460
+msgid "Bug report sent, thank you for your input."
+msgstr "Wedi gyrru'r adroddiad nam, diolch am eich cymorth."
 
-#: khtml/khtml_ext.cpp:995 kparts/browserrun.cpp:371
+#: kdeui/dialogs/kbugreport.cpp:469
 msgid ""
-"Try to reinstall it  \n"
-"\n"
-"The integration with Konqueror will be disabled."
+"Close and discard\n"
+"edited message?"
 msgstr ""
+"Cau a taflu'r neges\n"
+" a olygwyd?"
 
-#: khtml/khtml_ext.cpp:1077
-#, no-c-format
-msgid "Default Font Size (100%)"
-msgstr "Maint yr Wynebfath Rhagosodol (100%)"
+#: kdeui/dialogs/kbugreport.cpp:470
+msgid "Close Message"
+msgstr "Cau Neges"
+
+#: kdeui/dialogs/kpixmapregionselectordialog.cpp:64
+msgid "Select Region of Image"
+msgstr "Dewis Ardal Delwedd"
 
-#: khtml/khtml_ext.cpp:1090 kdeui/jobs/kwidgetjobtracker.cpp:375
-#, kde-format, no-c-format
-msgid "%1%"
-msgstr "%1%"
+#: kdeui/dialogs/kpixmapregionselectordialog.cpp:68
+msgid "Please click and drag on the image to select the region of interest:"
+msgstr "Cliciwch a llusgo ar y ddelwedd er mwyn dewis yr ardal o ddiddordeb:"
 
-#: khtml/khtml_part.cpp:296
-msgid "View Do&cument Source"
-msgstr "Gweld Côd Ta&rddiad y Ddogfen"
+#: kdeui/dialogs/ktip.cpp:230
+msgid "Tip of the Day"
+msgstr "Awgrymiad y Dydd"
 
-#: khtml/khtml_part.cpp:312
-msgid "View Document Information"
-msgstr "Gweld Gwybodaeth y Ddogfen"
+#: kdeui/dialogs/ktip.cpp:249
+msgid "Did you know...?\n"
+msgstr "Oeddech chi'n gwybod ...?\n"
 
-#: khtml/khtml_part.cpp:320
-msgid "Save &Background Image As..."
-msgstr "Cadw Delwedd &Gefndir fel ..."
+#: kdeui/dialogs/ktip.cpp:301
+msgid "&Show tips on startup"
+msgstr "&Dangos awgrymiadau wrth gychwyn"
 
-#: khtml/khtml_part.cpp:341 khtml/khtml_part.cpp:4020
-msgid "SSL"
-msgstr "SSL"
+#: kdeui/dialogs/ktip.cpp:309
+msgctxt "Opposite to Previous"
+msgid "&Next"
+msgstr "&Nesaf"
 
-#: khtml/khtml_part.cpp:345
-msgid "Print Rendering Tree to STDOUT"
-msgstr "Argraffu'r Goeden Drosi i STDOUT"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:41
+msgid "Shortcut Schemes"
+msgstr ""
 
-#: khtml/khtml_part.cpp:349
-msgid "Print DOM Tree to STDOUT"
-msgstr "Argraffu'r Goeden DOM i STDOUT"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:59
+msgid "Current scheme:"
+msgstr ""
 
-#: khtml/khtml_part.cpp:308
-msgid "Print frame tree to STDOUT"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:69
+msgid "New..."
 msgstr ""
 
-#: khtml/khtml_part.cpp:353
-msgid "Stop Animated Images"
-msgstr "Stopio Delweddau Animeiddiedig"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:72
+msgid "Delete"
+msgstr "Dileu"
 
-#: khtml/khtml_part.cpp:357
-msgid "Set &Encoding"
-msgstr "&Gosod Amgodiad"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:75
+msgid "More Actions"
+msgstr ""
 
-#: khtml/khtml_part.cpp:396
-msgid "Use S&tylesheet"
-msgstr "&Defynddio Dalen Arddull"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:79
+msgid "Save as Scheme Defaults"
+msgstr ""
 
-#: khtml/khtml_part.cpp:401
-msgid "Enlarge Font"
-msgstr "Cynyddu Maint yr Wynebfath"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:81
+msgid "Export Scheme..."
+msgstr ""
 
-#: khtml/khtml_part.cpp:404
-msgid ""
-"<qt>Enlarge Font<br /><br />Make the font in this window bigger. Click and "
-"hold down the mouse button for a menu with all available font sizes.</qt>"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:98
+msgid "Name for New Scheme"
 msgstr ""
 
-#: khtml/khtml_part.cpp:408
-msgid "Shrink Font"
-msgstr "Lleihau Wynebfath"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:99
+msgid "Name for new scheme:"
+msgstr ""
 
-#: khtml/khtml_part.cpp:411
-msgid ""
-"<qt>Shrink Font<br /><br />Make the font in this window smaller. Click and "
-"hold down the mouse button for a menu with all available font sizes.</qt>"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:99
+msgid "New Scheme"
 msgstr ""
 
-#: khtml/khtml_part.cpp:429
-msgid ""
-"<qt>Find text<br /><br />Shows a dialog that allows you to find text on the "
-"displayed page.</qt>"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:105
+msgid "A scheme with this name already exists."
 msgstr ""
 
-#: khtml/khtml_part.cpp:434
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:133
+#, kde-format
 msgid ""
-"<qt>Find next<br /><br />Find the next occurrence of the text that you have "
-"found using the <b>Find Text</b> function.</qt>"
+"Do you really want to delete the scheme %1?\n"
+"Note that this will not remove any system wide shortcut schemes."
 msgstr ""
 
-#: khtml/khtml_part.cpp:440
-msgid ""
-"<qt>Find previous<br /><br />Find the previous occurrence of the text that "
-"you have found using the <b>Find Text</b> function.</qt>"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:162
+msgid "Export to Location"
 msgstr ""
 
-#: khtml/khtml_part.cpp:444
-msgid "Find Text as You Type"
+#: kdeui/dialogs/kshortcutschemeseditor.cpp:171
+msgid "Could not export shortcuts scheme because the location is invalid."
 msgstr ""
 
-#: khtml/khtml_part.cpp:407
-msgid ""
-"This shortcut shows the find bar, for finding text in the displayed page. It "
-"cancels the effect of \"Find Links as You Type\", which sets the \"Find "
-"links only\" option."
+#: kdeui/dialogs/klinkdialog.cpp:49
+msgid "Manage Link"
 msgstr ""
 
-#: khtml/khtml_part.cpp:449
-msgid "Find Links as You Type"
+#: kdeui/dialogs/klinkdialog.cpp:58
+msgid "Link Text:"
 msgstr ""
 
-#: khtml/khtml_part.cpp:416
-msgid ""
-"This shortcut shows the find bar, and sets the option \"Find links only\"."
+#: kdeui/dialogs/klinkdialog.cpp:61
+msgid "Link URL:"
 msgstr ""
 
-#: khtml/khtml_part.cpp:470
-msgid ""
-"<qt>Print Frame<br /><br />Some pages have several frames. To print only a "
-"single frame, click on it and then use this function.</qt>"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:167
+msgid "Left to Right, Top to Bottom"
 msgstr ""
 
-#: khtml/khtml_part.cpp:485
-msgid "Toggle Caret Mode"
-msgstr "Dangos/Cuddio Modd To Bach"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:168
+msgid "Left to Right, Bottom to Top"
+msgstr ""
 
-#: khtml/khtml_part.cpp:736
-#, kde-format
-msgid "The fake user-agent '%1' is in use."
-msgstr "Mae'r ffug asiant-defnyddiwr '%1' mewn defnydd."
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:169
+msgid "Right to Left, Bottom to Top"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1246
-msgid "This web page contains coding errors."
-msgstr "Mae'r dudalen wê yma yn cynnwys gwallau codio."
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:170
+msgid "Right to Left, Top to Bottom"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1288
-msgid "&Hide Errors"
-msgstr "C&uddio Gwallau"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:171
+msgid "Bottom to Top, Left to Right"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1289
-msgid "&Disable Error Reporting"
-msgstr "A&nalluogi Adrodd Gwallau"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:172
+msgid "Bottom to Top, Right to Left"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1333
-#, kde-format
-msgid "<qt><b>Error</b>: %1: %2</qt>"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:173
+msgid "Top to Bottom, Left to Right"
 msgstr ""
 
-#: khtml/khtml_part.cpp:1382
-#, kde-format
-msgid "<qt><b>Error</b>: node %1: %2</qt>"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:174
+msgid "Top to Bottom, Right to Left"
 msgstr ""
 
-#: khtml/khtml_part.cpp:1493
-msgid "Display Images on Page"
-msgstr "Arddangos Delweddau ar y Dudalen"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:191
+msgctxt "No border line"
+msgid "None"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1867
-#, kde-format
-msgid "Error: %1 - %2"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:192
+msgid "Single Line"
 msgstr ""
 
-#: khtml/khtml_part.cpp:1872
-msgid "The requested operation could not be completed"
-msgstr "Methu cwblhau'r gweithrediad ceisiedig"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:193
+msgid "Single Thick Line"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1878
-msgid "Technical Reason: "
-msgstr "Rheswm Technegol: "
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:194
+msgid "Double Line"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1883
-msgid "Details of the Request:"
-msgstr "Manylion y Cais:"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:195
+msgid "Double Thick Line"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1885
-#, kde-format
-msgid "URL: %1"
-msgstr "URL: %1"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:212
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:235
+msgctxt "Banner page"
+msgid "None"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1888
-#, kde-format
-msgid "Protocol: %1"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:213
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:236
+msgctxt "Banner page"
+msgid "Standard"
 msgstr ""
 
-#: khtml/khtml_part.cpp:1891
-#, kde-format
-msgid "Date and Time: %1"
-msgstr "Dyddiad ac Amser: %1"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:214
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:237
+msgctxt "Banner page"
+msgid "Unclassified"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1893
-#, kde-format
-msgid "Additional Information: %1"
-msgstr "Gwybodaeth Ychwanegol: %1"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:215
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:238
+msgctxt "Banner page"
+msgid "Confidential"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1901
-msgid "Possible Causes:"
-msgstr "Achosion Posib:"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:216
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:239
+msgctxt "Banner page"
+msgid "Classified"
+msgstr ""
 
-#: khtml/khtml_part.cpp:1908
-msgid "Possible Solutions:"
-msgstr "Datrysiadau Posib:"
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:217
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:240
+msgctxt "Banner page"
+msgid "Secret"
+msgstr ""
 
-#: khtml/khtml_part.cpp:2293
-msgid "Page loaded."
-msgstr "Ffeil wedi ei ail-lwytho."
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:218
+#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:241
+msgctxt "Banner page"
+msgid "Top Secret"
+msgstr ""
 
-#: khtml/khtml_part.cpp:2295
+#: kdeui/dialogs/kshortcutseditoritem.cpp:45
 #, kde-format
-msgid "%1 Image of %2 loaded."
-msgid_plural "%1 Images of %2 loaded."
-msgstr[0] "Llwythwyd %1 o %2 Delwedd..."
-msgstr[1] "Llwythwyd %1 o %2 Delwedd..."
-
-#: khtml/khtml_part.cpp:2457
-msgid "Automatic Detection"
-msgstr "Datganiad Awtomatig"
+msgctxt "@item:intable Action name in shortcuts configuration"
+msgid "%1"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3537 khtml/khtml_part.cpp:3624
-#: khtml/khtml_part.cpp:3635
-msgid " (In new window)"
-msgstr " (Mewn ffenest newydd)"
+#. i18n: Filter for the Yes-button text in standard message dialogs,
+#. after the message caption/text have been translated.
+#: kdeui/dialogs/kmessagebox.cpp:52
+#, kde-format
+msgctxt "@action:button filter-yes"
+msgid "%1"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3576
-msgid "Symbolic Link"
-msgstr "Cyswllt Symbolaidd"
+#. i18n: Filter for the No-button text in standard message dialogs,
+#. after the message caption/text have been translated.
+#: kdeui/dialogs/kmessagebox.cpp:58
+#, kde-format
+msgctxt "@action:button filter-no"
+msgid "%1"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3578
+#. i18n: Filter for the Continue-button text in standard message dialogs,
+#. after the message caption/text have been translated.
+#: kdeui/dialogs/kmessagebox.cpp:64
 #, kde-format
-msgid "%1 (Link)"
-msgstr "%1 (Cyswllt)"
+msgctxt "@action:button filter-continue"
+msgid "%1"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3598
+#. i18n: Filter for the Cancel-button text in standard message dialogs,
+#. after the message caption/text have been translated.
+#: kdeui/dialogs/kmessagebox.cpp:70
 #, kde-format
-msgid "%2 (%1 byte)"
-msgid_plural "%2 (%1 bytes)"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@action:button filter-cancel"
+msgid "%1"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3602
-#, kde-format
-msgid "%2 (%1 K)"
-msgstr "%2 (%1 K)"
+#. i18n: Called after the button texts in standard message dialogs
+#. have been filtered by the messages above. Not visible to user.
+#: kdeui/dialogs/kmessagebox.cpp:75
+msgctxt "@action:button post-filter"
+msgid "."
+msgstr ""
 
-#: khtml/khtml_part.cpp:3637
-msgid " (In other frame)"
-msgstr " (Mewn ffram arall)"
+#: kdeui/dialogs/kmessagebox.cpp:468 kdeui/dialogs/kmessagebox.cpp:529
+msgid "Question"
+msgstr "Cwestiwn"
 
-#: khtml/khtml_part.cpp:3642
-msgid "Email to: "
-msgstr "E-bostio i: "
+#: kdeui/dialogs/kmessagebox.cpp:485 kdeui/dialogs/kmessagebox.cpp:547
+#: kdeui/dialogs/kmessagebox.cpp:634 kdeui/dialogs/kmessagebox.cpp:714
+#: kdeui/dialogs/kmessagebox.cpp:801
+msgid "Do not ask again"
+msgstr "Peidiwch a gofyn eto"
 
-#: khtml/khtml_part.cpp:3648
-msgid " - Subject: "
-msgstr " - Pwnc: "
+#: kdeui/dialogs/kmessagebox.cpp:617 kdeui/dialogs/kmessagebox.cpp:697
+#: kdeui/dialogs/kmessagebox.cpp:784
+msgid "Warning"
+msgstr "Rhybudd"
 
-#: khtml/khtml_part.cpp:3650
-msgid " - CC: "
-msgstr " - CC: "
+#: kdeui/dialogs/kmessagebox.cpp:915 kdeui/dialogs/kmessagebox.cpp:944
+msgid "Sorry"
+msgstr "Ymddiheuriad"
 
-#: khtml/khtml_part.cpp:3652
-msgid " - BCC: "
-msgstr " - BCC: "
+#: kdeui/dialogs/kmessagebox.cpp:988
+msgid "Information"
+msgstr "Gwybodaeth"
+
+#: kdeui/dialogs/kmessagebox.cpp:1004
+msgid "Do not show this message again"
+msgstr "Peidiwch â dangos y neges yma eto"
+
+#: kdeui/dialogs/kshortcutseditor.cpp:127
+#: kdeui/widgets/kcharselectdata.cpp:685
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: kdeui/dialogs/kshortcutseditor.cpp:570
+#: kdeui/dialogs/kshortcutseditor.cpp:586
+msgid "Key Conflict"
+msgstr "Croestyniad Bysell"
 
-#: khtml/khtml_part.cpp:3733
+#: kdeui/dialogs/kshortcutseditor.cpp:571
 #, kde-format
 msgid ""
-"<qt>This untrusted page links to<br /><b>%1</b>.<br />Do you want to follow "
-"the link?</qt>"
+"The '%1' shape gesture has already been allocated to the \"%2\" action.\n"
+"Do you want to reassign it from that action to the current one?"
 msgstr ""
 
-#: khtml/khtml_part.cpp:3734
-msgid "Follow"
-msgstr "Dilyn"
+#: kdeui/dialogs/kshortcutseditor.cpp:575
+#: kdeui/dialogs/kshortcutseditor.cpp:591 kdeui/shortcuts/kglobalaccel.cpp:547
+#: kdeui/shortcuts/kglobalaccel.cpp:587
+#: kdeui/widgets/kkeysequencewidget.cpp:146
+#: kdeui/widgets/kkeysequencewidget.cpp:235
+#: kdeui/widgets/kkeysequencewidget.cpp:632
+msgid "Reassign"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3835
-msgid "Frame Information"
-msgstr "Gwybodaeth Ffrâm"
+#: kdeui/dialogs/kshortcutseditor.cpp:587
+#, kde-format
+msgid ""
+"The '%1' rocker gesture has already been allocated to the \"%2\" action.\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3841
+#: kdeui/dialogs/kshortcutseditor.cpp:630
 #, kde-format
-msgid "   <a href=\"%1\">[Properties]</a>"
-msgstr "   <a href=\"%1\">[Priodweddau]</a>"
+msgctxt "header for an applications shortcut list"
+msgid "Shortcuts for %1"
+msgstr ""
 
-#: khtml/khtml_part.cpp:3852
-msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)"
-msgid "Quirks"
+#: kdeui/dialogs/kshortcutseditor.cpp:650
+msgid "Global:"
 msgstr ""
 
-#: khtml/khtml_part.cpp:3855
-msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)"
-msgid "Almost standards"
+#: kdeui/dialogs/kshortcutseditor.cpp:665
+msgid "Action Name"
 msgstr ""
 
-#: khtml/khtml_part.cpp:3859
-msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)"
-msgid "Strict"
+#: kdeui/dialogs/kshortcutseditor.cpp:669
+msgid "Shortcuts"
+msgstr "Byrlwybrau"
+
+#: kdeui/dialogs/kshortcuteditwidget.cpp:59
+msgid "Default:"
 msgstr ""
 
-#: khtml/khtml_part.cpp:3926
-msgid "Save Background Image As"
-msgstr "Cadw Delwedd y Gefndir Fel ..."
+#: kdeui/dialogs/kshortcuteditwidget.cpp:60
+#: kdeui/dialogs/kshortcuteditwidget.cpp:63
+#: kdeui/widgets/kkeysequencewidget.cpp:666
+msgctxt "No shortcut defined"
+msgid "None"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4018
-msgid "The peer SSL certificate chain appears to be corrupt."
+#: kdeui/dialogs/kshortcuteditwidget.cpp:66
+msgid "Custom:"
 msgstr ""
 
-#: khtml/khtml_part.cpp:4037
-msgid "Save Frame As"
-msgstr "Cadw Ffram Fel"
+#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:66
+msgid "All Pages"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4081
-msgid "&Find in Frame..."
-msgstr "&Canfod mewn Ffrâm ..."
+#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:67
+msgid "Odd Pages"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4083 kdeui/actions/kstandardaction_p.h:64
-msgid "&Find..."
-msgstr "&Canfod"
+#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:68
+msgid "Even Pages"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4640
-msgid ""
-"Warning:  This is a secure form but it is attempting to send your data back "
-"unencrypted.\n"
-"A third party may be able to intercept and view this information.\n"
-"Are you sure you wish to continue?"
+#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:79
+msgid "Page Set"
 msgstr ""
-"Rhybudd: Ffurflen ddiogel yw hon, ond ma'en ceisio anfon eich data yn ôl heb "
-"ei amgryptio. \n"
-" Gall rhywun arall ryng-gipio a gweld yr wybodaeth yma. \n"
-" Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: khtml/khtml_part.cpp:4643 khtml/khtml_part.cpp:4652
-#: khtml/khtml_part.cpp:4676
-msgid "Network Transmission"
-msgstr "Trosglwyddiad Rhwydwaith"
+#: kdeui/dialogs/kpassworddialog.cpp:70
+msgid "Password"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4643 khtml/khtml_part.cpp:4653
-msgid "&Send Unencrypted"
-msgstr "&Anfon heb ei Gêl-ysgrifo"
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:60
+msgctxt "Action to send an email to a contributor"
+msgid "Email contributor"
+msgstr ""
+
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:65
+msgid "Visit contributor's homepage"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4650
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:126
+#, kde-format
+msgctxt "Action to send an email to a contributor"
 msgid ""
-"Warning: Your data is about to be transmitted across the network "
-"unencrypted.\n"
-"Are you sure you wish to continue?"
+"Email contributor\n"
+"%1"
 msgstr ""
-"Rhybudd: Mae eich data ar fin cael eu trosglwyddo heb eu amgryptio dros y "
-"rhwydwaith.\n"
-" Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: khtml/khtml_part.cpp:4674
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:131
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:168
+#, kde-format
 msgid ""
-"This site is attempting to submit form data via email.\n"
-"Do you want to continue?"
+"Visit contributor's homepage\n"
+"%1"
 msgstr ""
-"Mae'r safwê yma yn ceisio cyflwyno data ffurflen drwy e-bost. \n"
-" Ydych eisiau fynd ymlaen?"
 
-#: khtml/khtml_part.cpp:4677
-msgid "&Send Email"
-msgstr "Anfon E&bost"
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:138
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:172
+#, kde-format
+msgid ""
+"Visit contributor's profile on %1\n"
+"%2"
+msgstr ""
 
-#: khtml/khtml_part.cpp:4698
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:160
 #, kde-format
 msgid ""
-"<qt>The form will be submitted to <br /><b>%1</b><br />on your local "
-"filesystem.<br />Do you want to submit the form?</qt>"
+"Visit contributor's page\n"
+"%1"
 msgstr ""
 
-#: khtml/khtml_part.cpp:4752
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:164
+#, kde-format
 msgid ""
-"This site attempted to attach a file from your computer in the form "
-"submission. The attachment was removed for your protection."
+"Visit contributor's blog\n"
+"%1"
 msgstr ""
-"Ceisiodd y safwê yma glymu ffeil oddiar eich cyfrifiadur yn y cyflwyniad "
-"ffurflen.  Tynnwyd yr atodiad er eich gwarchodaeth."
 
-#: khtml/khtml_part.cpp:4752 kdecore/kernel/kcmdlineargs.cpp:498
-msgid "KDE"
-msgstr "KDE"
+#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:266
+#, kde-format
+msgctxt "@item Contributor name in about dialog."
+msgid "%1"
+msgstr ""
+
+#: kdeui/jobs/kstatusbarjobtracker.cpp:244
+msgid " Stalled "
+msgstr ""
 
-#: khtml/khtml_part.cpp:5769
+#: kdeui/jobs/kstatusbarjobtracker.cpp:246
 #, kde-format
-msgid "(%1/s)"
-msgstr "(%1/s)"
+msgid " %1/s "
+msgstr ""
 
-#: khtml/khtml_part.cpp:6682
-msgid "Security Warning"
-msgstr "Rhybudd Diogelwch"
+#: kdeui/jobs/kwidgetjobtracker.cpp:274 kdeui/jobs/kwidgetjobtracker.cpp:282
+#, kde-format
+msgctxt "%1 is the label, we add a ':' to it"
+msgid "%1:"
+msgstr ""
 
-#: khtml/khtml_part.cpp:6691
+#: kdeui/jobs/kwidgetjobtracker.cpp:329
 #, kde-format
-msgid "<qt>Access by untrusted page to<br /><b>%1</b><br /> denied.</qt>"
+msgid "%2 of %3 complete"
+msgid_plural "%2 of %3 complete"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:346 kdeui/jobs/kwidgetjobtracker.cpp:358
+#, kde-format
+msgid "%2 / %1 folder"
+msgid_plural "%2 / %1 folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:348 kdeui/jobs/kwidgetjobtracker.cpp:361
+#, kde-format
+msgid "%2 / %1 file"
+msgid_plural "%2 / %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:371
+#, kde-format
+msgid "%1% of %2"
 msgstr ""
 
-#: khtml/khtml_part.cpp:6692 khtml/java/kjavaappletserver.cpp:792
-msgid "Security Alert"
-msgstr "Larwm Diogelwch"
+#: kdeui/jobs/kwidgetjobtracker.cpp:374
+#, kde-format
+msgid "%2% of 1 file"
+msgid_plural "%2% of %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:376 khtml/khtml_ext.cpp:1036
+#, kde-format, no-c-format
+msgid "%1%"
+msgstr "%1%"
 
-#: khtml/khtml_part.cpp:7040
+#: kdeui/jobs/kwidgetjobtracker.cpp:389
+msgid "Stalled"
+msgstr ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:394
 #, kde-format
-msgid "The wallet '%1' is open and being used for form data and passwords."
+msgid "%2/s (%3 remaining)"
+msgid_plural "%2/s (%3 remaining)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:397
+#, kde-format
+msgctxt "speed in bytes per second"
+msgid "%1/s"
+msgstr ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:416
+#, kde-format
+msgid "%1/s (done)"
+msgstr ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:423
+msgid "&Resume"
+msgstr ""
+
+#: kdeui/jobs/kwidgetjobtracker.cpp:429 kdeui/jobs/kwidgetjobtracker.cpp:502
+msgid "&Pause"
 msgstr ""
-"Mae'r waled '%1' ar agor, ac yn cael ei ddefnyddio am ddata ffurflen a "
-"cyfrineiriau."
 
-#: khtml/khtml_part.cpp:7100
-msgid "&Close Wallet"
-msgstr "&Cau'r Waled"
+#: kdeui/jobs/kwidgetjobtracker.cpp:455
+msgctxt "The source url of a job"
+msgid "Source:"
+msgstr ""
 
-#: khtml/khtml_part.cpp:7103
-msgid "&Allow storing passwords for this site"
+#: kdeui/jobs/kwidgetjobtracker.cpp:463
+msgctxt "The destination url of a job"
+msgid "Destination:"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7108
-#, kde-format
-msgid "Remove password for form %1"
+#: kdeui/jobs/kwidgetjobtracker.cpp:487 kdeui/jobs/kwidgetjobtracker.cpp:660
+msgid "Click this to expand the dialog, to show details"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7213
-msgid "JavaScript &Debugger"
-msgstr "&Dadnamydd JavaScript"
+#: kdeui/jobs/kwidgetjobtracker.cpp:521
+msgid "&Keep this window open after transfer is complete"
+msgstr ""
 
-#: khtml/khtml_part.cpp:7245
-msgid "This page was prevented from opening a new window via JavaScript."
+#: kdeui/jobs/kwidgetjobtracker.cpp:529
+msgid "Open &File"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7251
-msgid "Popup Window Blocked"
+#: kdeui/jobs/kwidgetjobtracker.cpp:535
+msgid "Open &Destination"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7251
-msgid ""
-"This page has attempted to open a popup window but was blocked.\n"
-"You can click on this icon in the status bar to control this behavior\n"
-"or to open the popup."
+#: kdeui/jobs/kwidgetjobtracker.cpp:549
+msgid "Progress Dialog"
 msgstr ""
 
-#: khtml/khtml_part.cpp:7264
+#: kdeui/jobs/kwidgetjobtracker.cpp:562
 #, kde-format
-msgid "&Show Blocked Popup Window"
-msgid_plural "&Show %1 Blocked Popup Windows"
+msgid "%1 folder"
+msgid_plural "%1 folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: khtml/khtml_part.cpp:7265
-msgid "Show Blocked Window Passive Popup &Notification"
-msgstr ""
+#: kdeui/jobs/kwidgetjobtracker.cpp:563
+#, kde-format
+msgid "%1 file"
+msgid_plural "%1 files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: khtml/khtml_part.cpp:7267
-msgid "&Configure JavaScript New Window Policies..."
+#: kdeui/jobs/kwidgetjobtracker.cpp:653
+msgid "Click this to collapse the dialog, to hide details"
 msgstr ""
 
-#: khtml/khtml_printsettings.cpp:31
-msgid ""
-"<qt><p><strong>'Print images'</strong></p><p>If this checkbox is enabled, "
-"images contained in the HTML page will be printed. Printing may take longer "
-"and use more ink or toner.</p><p>If this checkbox is disabled, only the text "
-"of the HTML page will be printed, without the included images. Printing will "
-"be faster and use less ink or toner.</p> </qt>"
+#: kdeui/itemviews/kfilterproxysearchline.cpp:73
+#: nepomuk/utils/searchwidget.cpp:142
+msgid "Search"
 msgstr ""
 
-#: khtml/khtml_printsettings.cpp:43
-msgid ""
-"<qt><p><strong>'Print header'</strong></p><p>If this checkbox is enabled, "
-"the printout of the HTML document will contain a header line at the top of "
-"each page. This header contains the current date, the location URL of the "
-"printed page and the page number.</p><p>If this checkbox is disabled, the "
-"printout of the HTML document will not contain such a header line.</p> </qt>"
-msgstr ""
+#: kdeui/itemviews/ktreewidgetsearchline.cpp:420
+#: kde3support/kdeui/k3listviewsearchline.cpp:287
+msgid "Search Columns"
+msgstr "Chwilio Colofnau"
 
-#: khtml/khtml_printsettings.cpp:56
-msgid ""
-"<qt><p><strong>'Printerfriendly mode'</strong></p><p>If this checkbox is "
-"enabled, the printout of the HTML document will be black and white only, and "
-"all colored background will be converted into white. Printout will be faster "
-"and use less ink or toner.</p><p>If this checkbox is disabled, the printout "
-"of the HTML document will happen in the original color settings as you see "
-"in your application. This may result in areas of full-page color (or "
-"grayscale, if you use a black+white printer). Printout will possibly happen "
-"more slowly and will probably use more toner or ink.</p> </qt>"
+#: kdeui/itemviews/ktreewidgetsearchline.cpp:422
+#: kde3support/kdeui/k3listviewsearchline.cpp:290
+msgid "All Visible Columns"
+msgstr "Pob Colofn Weledig"
+
+#: kdeui/itemviews/ktreewidgetsearchline.cpp:601
+#: kde3support/kdeui/k3listviewsearchline.cpp:557
+msgid "S&earch:"
+msgstr "C&hwilio"
+
+#: kdeui/notifications/knotificationrestrictions.cpp:181
+msgid "Unknown Application"
 msgstr ""
 
-#: khtml/khtml_printsettings.cpp:71
-msgid "HTML Settings"
-msgstr "Gosodiadau HTML"
+#: kdeui/notifications/kstatusnotifieritem.cpp:488
+#: kdeui/notifications/kstatusnotifieritem.cpp:926
+#: kdeui/notifications/ksystemtrayicon.cpp:215
+msgid "&Minimize"
+msgstr "Llei&hau"
 
-#: khtml/khtml_printsettings.cpp:73
-msgid "Printer friendly mode (black text, no background)"
-msgstr "Modd sy'n gyfeillgar i argraffyddion (testun du, dim cefndir)"
+#: kdeui/notifications/kstatusnotifieritem.cpp:924
+#: kdeui/notifications/ksystemtrayicon.cpp:219
+msgid "&Restore"
+msgstr "Ad&fer"
 
-#: khtml/khtml_printsettings.cpp:76
-msgid "Print images"
-msgstr "Argraffu delweddau"
+#: kdeui/notifications/kstatusnotifieritem.cpp:934
+#: kdeui/notifications/ksystemtrayicon.cpp:239
+#, kde-format
+msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
+msgstr "<qt>Ydych wir eisiau terfynu <b>'%1'</b>?</qt>"
 
-#: khtml/khtml_printsettings.cpp:79
-msgid "Print header"
-msgstr "Pennawd argraffydd"
+#: kdeui/notifications/kstatusnotifieritem.cpp:937
+#: kdeui/notifications/ksystemtrayicon.cpp:242
+msgid "Confirm Quit From System Tray"
+msgstr "Cadarnhau Terfynu o'r Cafn Cysawd"
 
-#: khtml/testkhtml.cpp:39
-msgid "URL to open"
+#: kdeui/notifications/ksystemtrayicon.cpp:156
+msgid "Minimize"
+msgstr "Lleihau"
+
+#: kdeui/shortcuts/kglobalaccel.cpp:540
+msgid "Conflict with Global Shortcut"
+msgstr "Croestyniad efo Byrlwybr Eang"
+
+#: kdeui/shortcuts/kglobalaccel.cpp:541
+#, kde-format
+msgid ""
+"The '%1' key combination has already been allocated to the global action "
+"\"%2\" in %3.\n"
+"Do you want to reassign it from that action to the current one?"
 msgstr ""
 
-#: khtml/testkhtml.cpp:41
-msgid "Testkhtml"
+#: kdeui/shortcuts/kglobalaccel.cpp:568
+#, kde-format
+msgid ""
+"The '%1' key combination is registered by application %2 for action %3:"
 msgstr ""
 
-#: khtml/testkhtml.cpp:42
-msgid "a basic web browser using the KHTML library"
+#: kdeui/shortcuts/kglobalaccel.cpp:575
+#, kde-format
+msgid "In context '%1' for action '%2'\n"
 msgstr ""
 
-#: khtml/test_regression.cpp:619
-msgid "Directory containing tests, basedir and output directories."
+#: kdeui/shortcuts/kglobalaccel.cpp:579
+#, kde-format
+msgid ""
+"The '%1' key combination is registered by application %2.\n"
+"%3"
 msgstr ""
 
-#: khtml/test_regression.cpp:621
-msgid "Do not suppress debug output"
+#: kdeui/shortcuts/kglobalaccel.cpp:585
+msgid "Conflict With Registered Global Shortcut"
 msgstr ""
 
-#: khtml/test_regression.cpp:623
-msgid "Regenerate baseline (instead of checking)"
+#: kdeui/shortcuts/kgesture.cpp:517
+msgctxt "left mouse button"
+msgid "left button"
 msgstr ""
 
-#: khtml/test_regression.cpp:625
-msgid "Do not show the window while running tests"
+#: kdeui/shortcuts/kgesture.cpp:520
+msgctxt "middle mouse button"
+msgid "middle button"
 msgstr ""
 
-#: khtml/test_regression.cpp:627
-msgid "Only run a single test. Multiple options allowed."
+#: kdeui/shortcuts/kgesture.cpp:523
+msgctxt "right mouse button"
+msgid "right button"
 msgstr ""
 
-#: khtml/test_regression.cpp:628
-msgid "Only run .js tests"
+#: kdeui/shortcuts/kgesture.cpp:526
+msgctxt "a nonexistent value of mouse button"
+msgid "invalid button"
 msgstr ""
 
-#: khtml/test_regression.cpp:629
-msgid "Only run .html tests"
+#: kdeui/shortcuts/kgesture.cpp:540
+#, kde-format
+msgctxt ""
+"a kind of mouse gesture: hold down one mouse button, then press another "
+"button"
+msgid "Hold %1, then push %2"
 msgstr ""
 
-#: khtml/test_regression.cpp:632
-msgid "Put output in &lt;directory&gt; instead of &lt;base_dir&gt;/output"
+#: kdeui/shortcuts/kcheckaccelerators.cpp:209
+msgctxt "@title:window"
+msgid "Dr. Klash' Accelerator Diagnosis"
 msgstr ""
 
-#: khtml/test_regression.cpp:634
-msgid ""
-"Use &lt;directory&gt; as reference instead of &lt;base_dir&gt;/baseline"
+#: kdeui/shortcuts/kcheckaccelerators.cpp:216
+msgctxt "@option:check"
+msgid "Disable automatic checking"
 msgstr ""
 
-#: khtml/test_regression.cpp:635
-msgid ""
-"Directory containing tests, basedir and output directories. Only regarded if "
-"-b is not specified."
+#: kdeui/shortcuts/kcheckaccelerators.cpp:220
+#: kdeui/widgets/kdatepicker.cpp:656
+msgctxt "@action:button"
+msgid "Close"
 msgstr ""
 
-#: khtml/test_regression.cpp:636
-msgid ""
-"Relative path to testcase, or directory of testcases to be run (equivalent "
-"to -t)."
+#: kdeui/shortcuts/kcheckaccelerators.cpp:256
+msgid "<h2>Accelerators changed</h2>"
+msgstr "<h2>Newidwyd cyflymyddion</h2>"
+
+#: kdeui/shortcuts/kcheckaccelerators.cpp:262
+msgid "<h2>Accelerators removed</h2>"
+msgstr "<h2>Gwaredwyd cyflymyddion</h2>"
+
+#: kdeui/shortcuts/kcheckaccelerators.cpp:267
+msgid "<h2>Accelerators added (just for your info)</h2>"
+msgstr "<h2>Ychwanegwyd cyflymyddion (er eich gwybodaeth)</h2>"
+
+#: kdeui/shortcuts/kstandardshortcut.cpp:86
+msgctxt "@action"
+msgid "Open"
 msgstr ""
 
-#: khtml/test_regression.cpp:638
-msgid "TestRegression"
+#: kdeui/shortcuts/kstandardshortcut.cpp:87
+msgctxt "@action"
+msgid "New"
 msgstr ""
 
-#: khtml/test_regression.cpp:639
-msgid "Regression tester for khtml"
+#: kdeui/shortcuts/kstandardshortcut.cpp:88
+msgctxt "@action"
+msgid "Close"
 msgstr ""
 
-#: khtml/khtml_settings.cpp:156
-msgid "Accept"
-msgstr "Derbyn"
+#: kdeui/shortcuts/kstandardshortcut.cpp:89
+msgctxt "@action"
+msgid "Save"
+msgstr ""
 
-#: khtml/khtml_settings.cpp:157
-msgid "Reject"
-msgstr "Gwrthod"
+#: kdeui/shortcuts/kstandardshortcut.cpp:90
+msgctxt "@action"
+msgid "Print"
+msgstr ""
 
-#: khtml/khtml_settings.cpp:798
-msgid "Filter error"
+#: kdeui/shortcuts/kstandardshortcut.cpp:91
+msgctxt "@action"
+msgid "Quit"
 msgstr ""
 
-#: khtml/ui/passwordbar/storepassbar.cpp:61
-#, kde-format
-msgid "Do you want to store this password for %1?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:94
+msgctxt "@action"
+msgid "Undo"
 msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:48 kdeui/findreplace/kfinddialog.cpp:126
-msgid "C&ase sensitive"
-msgstr "Mae llythrennau bach/mawr o &bwys"
+#: kdeui/shortcuts/kstandardshortcut.cpp:95
+msgctxt "@action"
+msgid "Redo"
+msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:50 kdeui/findreplace/kfinddialog.cpp:127
-msgid "&Whole words only"
-msgstr "D&im ond geiriau cyfan"
+#: kdeui/shortcuts/kstandardshortcut.cpp:96
+msgctxt "@action"
+msgid "Cut"
+msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:52 kdeui/findreplace/kfinddialog.cpp:128
-msgid "From c&ursor"
-msgstr "&O'r cyrchyd"
+#: kdeui/shortcuts/kstandardshortcut.cpp:97
+msgctxt "@action"
+msgid "Copy"
+msgstr ""
+
+#: kdeui/shortcuts/kstandardshortcut.cpp:98
+msgctxt "@action"
+msgid "Paste"
+msgstr ""
+
+#: kdeui/shortcuts/kstandardshortcut.cpp:99
+msgctxt "@action"
+msgid "Paste Selection"
+msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:54 kdeui/findreplace/kfinddialog.cpp:130
-msgid "&Selected text"
-msgstr "&Testun dewisiedig"
+#: kdeui/shortcuts/kstandardshortcut.cpp:101
+msgctxt "@action"
+msgid "Select All"
+msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:56 kdeui/findreplace/kfinddialog.cpp:96
-msgid "Regular e&xpression"
-msgstr "&Mynegiad rheolaidd"
+#: kdeui/shortcuts/kstandardshortcut.cpp:102
+msgctxt "@action"
+msgid "Deselect"
+msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:58
-msgid "Find &links only"
+#: kdeui/shortcuts/kstandardshortcut.cpp:103
+msgctxt "@action"
+msgid "Delete Word Backwards"
 msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:205
-msgid "Not found"
+#: kdeui/shortcuts/kstandardshortcut.cpp:104
+msgctxt "@action"
+msgid "Delete Word Forward"
 msgstr ""
 
-#: khtml/ui/findbar/khtmlfindbar.cpp:219
-msgid "No more matches for this search direction."
+#: kdeui/shortcuts/kstandardshortcut.cpp:106
+msgctxt "@action"
+msgid "Find"
 msgstr ""
 
-#: khtml/html/html_objectimpl.cpp:605
-#, kde-format
-msgid ""
-"No plugin found for '%1'.\n"
-"Do you want to download one from %2?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:107
+msgctxt "@action"
+msgid "Find Next"
 msgstr ""
-"Methu canfod atodyn i '%1'. \n"
-" Ydych eisiau lawrlwytho un oddiwrth %2?"
 
-#: khtml/html/html_objectimpl.cpp:606
-msgid "Missing Plugin"
-msgstr "Ategyn ar Goll"
+#: kdeui/shortcuts/kstandardshortcut.cpp:108
+msgctxt "@action"
+msgid "Find Prev"
+msgstr ""
 
-#: khtml/html/html_objectimpl.cpp:606
-msgid "Download"
-msgstr "Lawrlwytho"
+#: kdeui/shortcuts/kstandardshortcut.cpp:109
+msgctxt "@action"
+msgid "Replace"
+msgstr ""
 
-#: khtml/html/html_objectimpl.cpp:606
-msgid "Do Not Download"
+#: kdeui/shortcuts/kstandardshortcut.cpp:112
+msgctxt "@action Go to main page"
+msgid "Home"
 msgstr ""
 
-#: khtml/html/html_formimpl.cpp:421
-msgid ""
-"The following files will not be uploaded because they could not be found.\n"
-"Do you want to continue?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:113
+msgctxt "@action Beginning of document"
+msgid "Begin"
 msgstr ""
-"Ni fydd y ffeiliau dilynol yn cael eu lanlwytho gan na ellir cael gafael "
-"arnynt.\n"
-"Hoffech fynd ymlaen?"
 
-#: khtml/html/html_formimpl.cpp:425
-msgid "Submit Confirmation"
-msgstr "Anfon Cadarnhad"
+#: kdeui/shortcuts/kstandardshortcut.cpp:114
+msgctxt "@action End of document"
+msgid "End"
+msgstr ""
 
-#: khtml/html/html_formimpl.cpp:425
-msgid "&Submit Anyway"
-msgstr "Anfon S&erch Hynny"
+#: kdeui/shortcuts/kstandardshortcut.cpp:115
+msgctxt "@action"
+msgid "Prior"
+msgstr ""
 
-#: khtml/html/html_formimpl.cpp:436
-msgid ""
-"You are about to transfer the following files from your local computer to "
-"the Internet.\n"
-"Do you really want to continue?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:116
+msgctxt "@action Opposite to Prior"
+msgid "Next"
 msgstr ""
 
-#: khtml/html/html_formimpl.cpp:440
-msgid "Send Confirmation"
-msgstr "Anfon Cadarnhad"
+#: kdeui/shortcuts/kstandardshortcut.cpp:118
+msgctxt "@action"
+msgid "Up"
+msgstr ""
 
-#: khtml/html/html_formimpl.cpp:440
-msgid "&Send File"
-msgid_plural "&Send Files"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/shortcuts/kstandardshortcut.cpp:119
+msgctxt "@action"
+msgid "Back"
+msgstr ""
 
-#: khtml/html/html_formimpl.cpp:2619
-msgid "Key Generator"
+#: kdeui/shortcuts/kstandardshortcut.cpp:120
+msgctxt "@action"
+msgid "Forward"
 msgstr ""
 
-#: khtml/html/htmlparser.cpp:1936
-msgid "This is a searchable index. Enter search keywords: "
-msgstr "Mynegai chwiliadwy yw hwn.  Rhowch allweddeiriau i'r ymchwil: "
+#: kdeui/shortcuts/kstandardshortcut.cpp:121
+msgctxt "@action"
+msgid "Reload"
+msgstr ""
 
-#: khtml/xml/xml_tokenizer.cpp:334
-msgid "the document is not in the correct file format"
-msgstr "nid yw'r ddogfen yn y fformat ffeil cywir"
+#: kdeui/shortcuts/kstandardshortcut.cpp:123
+msgctxt "@action"
+msgid "Beginning of Line"
+msgstr ""
 
-#: khtml/xml/xml_tokenizer.cpp:340
-#, kde-format
-msgid "fatal parsing error: %1 in line %2, column %3"
-msgstr "gwall gramadegu angheuol: %1 yn llinell %2, colofn %3"
+#: kdeui/shortcuts/kstandardshortcut.cpp:124
+msgctxt "@action"
+msgid "End of Line"
+msgstr ""
 
-#: khtml/xml/xml_tokenizer.cpp:550
-msgid "XML parsing error"
-msgstr "Gwall gramadegu XML"
+#: kdeui/shortcuts/kstandardshortcut.cpp:125
+msgctxt "@action"
+msgid "Go to Line"
+msgstr ""
 
-#: khtml/xml/dom_docimpl.cpp:2252
-msgid "Basic Page Style"
-msgstr "Ardull Sylfaenol i Dudalen"
+#: kdeui/shortcuts/kstandardshortcut.cpp:126
+msgctxt "@action"
+msgid "Backward Word"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:1593 khtml/ecma/kjs_html.cpp:2115
-msgid "Confirmation: JavaScript Popup"
-msgstr "Cadarnhad: Naidlen Javascript"
+#: kdeui/shortcuts/kstandardshortcut.cpp:127
+msgctxt "@action"
+msgid "Forward Word"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:1596
-msgid ""
-"This site is requesting to open up a new browser window via JavaScript.\n"
-"Do you want to allow this?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:129
+msgctxt "@action"
+msgid "Add Bookmark"
 msgstr ""
-"Mae'r safwe yma yn ceisio agor ffenestr newydd i borydd, wrth ddefnyddio "
-"Javascript. \n"
-" Ydych eisiau gadael hynny?"
 
-#: khtml/ecma/kjs_window.cpp:1599
-#, kde-format
-msgid ""
-"<qt>This site is requesting to open<p>%1</p>in a new browser window via "
-"JavaScript.<br />Do you want to allow this?</qt>"
+#: kdeui/shortcuts/kstandardshortcut.cpp:130
+msgctxt "@action"
+msgid "Zoom In"
 msgstr ""
-"<qt>Mae'r safwe yma yn gofyn agor <p>%1</p> mewn ffenestr newydd i borydd, "
-"wrth ddefnyddio Javascript. <br /> Ydych eisiau gadael hynny?</qt>"
 
-#: khtml/ecma/kjs_window.cpp:1601 khtml/ecma/kjs_html.cpp:2122
-msgid "Allow"
-msgstr "Caniatáu"
+#: kdeui/shortcuts/kstandardshortcut.cpp:131
+msgctxt "@action"
+msgid "Zoom Out"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:1601 khtml/ecma/kjs_html.cpp:2122
-msgid "Do Not Allow"
+#: kdeui/shortcuts/kstandardshortcut.cpp:132
+msgctxt "@action"
+msgid "Full Screen Mode"
 msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:1904
-msgid "Close window?"
-msgstr "Cau'r ffenest?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:134
+msgctxt "@action"
+msgid "Show Menu Bar"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:1904
-msgid "Confirmation Required"
-msgstr "Angen Cadarnhad"
+#: kdeui/shortcuts/kstandardshortcut.cpp:135
+msgctxt "@action"
+msgid "Activate Next Tab"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:2771
-#, kde-format
-msgid ""
-"Do you want a bookmark pointing to the location \"%1\" to be added to your "
-"collection?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:136
+msgctxt "@action"
+msgid "Activate Previous Tab"
 msgstr ""
-"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\" gael ei ychwanegu "
-"i'ch casgliad?"
 
-#: khtml/ecma/kjs_window.cpp:2774
-#, kde-format
-msgid ""
-"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
-"added to your collection?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:139
+msgctxt "@action"
+msgid "Help"
 msgstr ""
-"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\", efo'r teitl "
-"\"%2\",  gael ei ychwanegu i'ch casgliad?"
 
-#: khtml/ecma/kjs_window.cpp:2782
-msgid "JavaScript Attempted Bookmark Insert"
-msgstr "Ceisiodd JavaScript Mewnosod Tudnod"
+#: kdeui/shortcuts/kstandardshortcut.cpp:140
+msgctxt "@action"
+msgid "What's This"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:2786
-msgid "Insert"
-msgstr "Rhyngosod"
+#: kdeui/shortcuts/kstandardshortcut.cpp:143
+msgctxt "@action"
+msgid "Text Completion"
+msgstr ""
 
-#: khtml/ecma/kjs_window.cpp:2786
-msgid "Disallow"
-msgstr "Gwrthwneud"
+#: kdeui/shortcuts/kstandardshortcut.cpp:144
+msgctxt "@action"
+msgid "Previous Completion Match"
+msgstr ""
 
-#: khtml/ecma/kjs_binding.cpp:184
-msgid ""
-"A script on this page is causing KHTML to freeze. If it continues to run, "
-"other applications may become less responsive.\n"
-"Do you want to stop the script?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:145
+msgctxt "@action"
+msgid "Next Completion Match"
 msgstr ""
 
-#: khtml/ecma/kjs_binding.cpp:184
-msgid "JavaScript"
-msgstr "JavaScript"
+#: kdeui/shortcuts/kstandardshortcut.cpp:146
+msgctxt "@action"
+msgid "Substring Completion"
+msgstr ""
 
-#: khtml/ecma/kjs_binding.cpp:184
-msgid "&Stop Script"
+#: kdeui/shortcuts/kstandardshortcut.cpp:148
+msgctxt "@action"
+msgid "Previous Item in List"
 msgstr ""
 
-#: khtml/ecma/kjs_html.cpp:2117
-msgid ""
-"This site is submitting a form which will open up a new browser window via "
-"JavaScript.\n"
-"Do you want to allow the form to be submitted?"
+#: kdeui/shortcuts/kstandardshortcut.cpp:149
+msgctxt "@action"
+msgid "Next Item in List"
 msgstr ""
-"Mae'r safwe yma yn ceisio agor ffenestr newydd i borydd, wrth ddefnyddio "
-"Javascript. \n"
-" Ydych eisiau gadael i'r ffurflen gael ei anfon?"
 
-#: khtml/ecma/kjs_html.cpp:2120
-#, kde-format
-msgid ""
-"<qt>This site is submitting a form which will open <p>%1</p> in a new "
-"browser window via JavaScript.<br />Do you want to allow the form to be "
-"submitted?</qt>"
+#: kdeui/shortcuts/kstandardshortcut.cpp:151
+msgctxt "@action"
+msgid "Open Recent"
 msgstr ""
-"<qt>Mae'r safwe yma yn anfon ffurflen fydd yn agor <p>%1</p> mewn ffenestr "
-"newydd i borydd, wrth ddefnyddio Javascript. <br />Ydych eisiau gadael i'r "
-"ffurflen gael ei anfon?</qt>"
 
-#: khtml/ecma/debugger/debugdocument.cpp:187
-msgid ""
-"Unable to find the Kate editor component;\n"
-"please check your KDE installation."
+#: kdeui/shortcuts/kstandardshortcut.cpp:152
+msgctxt "@action"
+msgid "Save As"
 msgstr ""
 
-#: khtml/ecma/debugger/debugdocument.cpp:253
-msgid "Breakpoint"
+#: kdeui/shortcuts/kstandardshortcut.cpp:153
+msgctxt "@action"
+msgid "Revert"
 msgstr ""
 
-#: khtml/ecma/debugger/callstackdock.cpp:37
-msgid "Call Stack"
+#: kdeui/shortcuts/kstandardshortcut.cpp:154
+msgctxt "@action"
+msgid "Print Preview"
 msgstr ""
 
-#: khtml/ecma/debugger/callstackdock.cpp:41
-msgid "Call"
+#: kdeui/shortcuts/kstandardshortcut.cpp:155
+msgctxt "@action"
+msgid "Mail"
 msgstr ""
 
-#: khtml/ecma/debugger/callstackdock.cpp:41
-msgid "Line"
+#: kdeui/shortcuts/kstandardshortcut.cpp:156
+msgctxt "@action"
+msgid "Clear"
 msgstr ""
 
-#: khtml/ecma/debugger/localvariabledock.cpp:43
-msgid "Local Variables"
+#: kdeui/shortcuts/kstandardshortcut.cpp:157
+msgctxt "@action"
+msgid "Actual Size"
 msgstr ""
 
-#: khtml/ecma/debugger/localvariabledock.cpp:51
-msgid "Reference"
+#: kdeui/shortcuts/kstandardshortcut.cpp:158
+msgctxt "@action"
+msgid "Fit To Page"
 msgstr ""
 
-#: khtml/ecma/debugger/consoledock.cpp:220
-msgid "Console"
+#: kdeui/shortcuts/kstandardshortcut.cpp:159
+msgctxt "@action"
+msgid "Fit To Width"
 msgstr ""
 
-#: khtml/ecma/debugger/consoledock.cpp:243
-msgid "Enter"
+#: kdeui/shortcuts/kstandardshortcut.cpp:160
+msgctxt "@action"
+msgid "Fit To Height"
 msgstr ""
 
-#: khtml/ecma/debugger/scriptsdock.cpp:43
-msgid "Loaded Scripts"
+#: kdeui/shortcuts/kstandardshortcut.cpp:161
+msgctxt "@action"
+msgid "Zoom"
 msgstr ""
 
-#: khtml/ecma/debugger/errordlg.cpp:35
-msgid "JavaScript Error"
-msgstr "Gwall JavaScript"
-
-#: khtml/ecma/debugger/errordlg.cpp:50
-msgid "&Do not show this message again"
-msgstr "&Peidio a dangos y neges yma eto"
-
-#: khtml/ecma/debugger/debugwindow.cpp:111
-msgid "JavaScript Debugger"
-msgstr "Dadfygiwr JavaScript"
-
-#: khtml/ecma/debugger/debugwindow.cpp:186
-msgid "&Break at Next Statement"
-msgstr "&Torri wrth Ddatganiad Nesaf"
-
-#: khtml/ecma/debugger/debugwindow.cpp:187
-msgid "Break at Next"
+#: kdeui/shortcuts/kstandardshortcut.cpp:162
+msgctxt "@action"
+msgid "Goto"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:199
-msgid "Step Over"
+#: kdeui/shortcuts/kstandardshortcut.cpp:163
+msgctxt "@action"
+msgid "Goto Page"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:206
-msgid "Step Into"
+#: kdeui/shortcuts/kstandardshortcut.cpp:164
+msgctxt "@action"
+msgid "Document Back"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:213
-msgid "Step Out"
+#: kdeui/shortcuts/kstandardshortcut.cpp:165
+msgctxt "@action"
+msgid "Document Forward"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:219
-msgid "Reindent Sources"
+#: kdeui/shortcuts/kstandardshortcut.cpp:166
+msgctxt "@action"
+msgid "Edit Bookmarks"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:224
-msgid "Report Exceptions"
+#: kdeui/shortcuts/kstandardshortcut.cpp:167
+msgctxt "@action"
+msgid "Spelling"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:232
-msgid "&Debug"
+#: kdeui/shortcuts/kstandardshortcut.cpp:168
+msgctxt "@action"
+msgid "Show Toolbar"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:266
-msgid "Close source"
+#: kdeui/shortcuts/kstandardshortcut.cpp:169
+msgctxt "@action"
+msgid "Show Statusbar"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:272
-msgid "Ready"
+#: kdeui/shortcuts/kstandardshortcut.cpp:170
+msgctxt "@action"
+msgid "Save Options"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:621
-#, kde-format
-msgid "Parse error at %1 line %2"
-msgstr "Gwall dosrannu wrth %1 llinell %2"
-
-#: khtml/ecma/debugger/debugwindow.cpp:658
-#, kde-format
-msgid ""
-"An error occurred while attempting to run a script on this page.\n"
-"\n"
-"%1 line %2:\n"
-"%3"
+#: kdeui/shortcuts/kstandardshortcut.cpp:171
+msgctxt "@action"
+msgid "Key Bindings"
 msgstr ""
-"Digwyddodd gwall wrth geisio rhedeg sgript ar y dudalen yma.\n"
-"\n"
-"%1 llinell %2:\n"
-"%3"
 
-#: khtml/ecma/debugger/debugwindow.cpp:848
-msgid ""
-"Do not know where to evaluate the expression. Please pause a script or open "
-"a source file."
+#: kdeui/shortcuts/kstandardshortcut.cpp:172
+msgctxt "@action"
+msgid "Preferences"
 msgstr ""
 
-#: khtml/ecma/debugger/debugwindow.cpp:884
-#, kde-format
-msgid "Evaluation threw an exception %1"
+#: kdeui/shortcuts/kstandardshortcut.cpp:173
+msgctxt "@action"
+msgid "Configure Toolbars"
 msgstr ""
 
-#: khtml/java/kjavaappletserver.cpp:146
-msgid "Loading Applet"
-msgstr "Llwytho rhaglennig"
-
-#: khtml/java/kjavaappletserver.cpp:150
-msgid "Error: java executable not found"
-msgstr "Gwall: methu canfod gweithredadwyn java"
-
-#: khtml/java/kjavaappletserver.cpp:664
-#, kde-format
-msgid "Signed by (validation: %1)"
+#: kdeui/shortcuts/kstandardshortcut.cpp:174
+msgctxt "@action"
+msgid "Configure Notifications"
 msgstr ""
 
-#: khtml/java/kjavaappletserver.cpp:666
-#, kde-format
-msgid "Certificate (validation: %1)"
+#: kdeui/shortcuts/kstandardshortcut.cpp:175
+msgctxt "@action"
+msgid "Tip Of Day"
 msgstr ""
 
-#: khtml/java/kjavaappletserver.cpp:797
-msgid "Do you grant Java applet with certificate(s):"
-msgstr "Ydych am roi i'r rhaglennig Java gyda thystysgrif(au):"
-
-#: khtml/java/kjavaappletserver.cpp:799
-msgid "the following permission"
-msgstr "y caniatadau dilynol"
-
-#: khtml/java/kjavaappletserver.cpp:808 kdeui/util/kstandardguiitem.cpp:125
-msgid "&No"
-msgstr "&Nage"
-
-#: khtml/java/kjavaappletserver.cpp:812
-msgid "&Reject All"
-msgstr "&Gwrthod Popeth"
-
-#: khtml/java/kjavaappletserver.cpp:815 kdeui/util/kstandardguiitem.cpp:120
-msgid "&Yes"
-msgstr "&Ie"
-
-#: khtml/java/kjavaappletserver.cpp:818
-msgid "&Grant All"
-msgstr "&Caniatàu Popeth"
-
-#: khtml/java/kjavaappletviewer.cpp:128
-msgid "Applet Parameters"
-msgstr "Paramedrau'r Rhaglennig"
+#: kdeui/shortcuts/kstandardshortcut.cpp:176
+msgctxt "@action"
+msgid "Report Bug"
+msgstr ""
 
-#: khtml/java/kjavaappletviewer.cpp:139
-msgid "Parameter"
-msgstr "Paramedr"
+#: kdeui/shortcuts/kstandardshortcut.cpp:177
+msgctxt "@action"
+msgid "Switch Application Language"
+msgstr ""
 
-#: khtml/java/kjavaappletviewer.cpp:143
-msgid "Class"
-msgstr "Dosbarth"
+#: kdeui/shortcuts/kstandardshortcut.cpp:178
+msgctxt "@action"
+msgid "About Application"
+msgstr ""
 
-#: khtml/java/kjavaappletviewer.cpp:149
-msgid "Base URL"
-msgstr "URL Sylfaenol"
+#: kdeui/shortcuts/kstandardshortcut.cpp:179
+msgctxt "@action"
+msgid "About KDE"
+msgstr ""
 
-#: khtml/java/kjavaappletviewer.cpp:155
-msgid "Archives"
-msgstr "Archifau"
+#: kdeui/findreplace/kreplace.cpp:49 kdeui/findreplace/kreplace.cpp:53
+msgid "Replace"
+msgstr "Amnewid"
 
-#: khtml/java/kjavaappletviewer.cpp:475
-msgid "KDE Java Applet Plugin"
-msgstr "Ategyn Rhaglennig Jave KDE"
+#: kdeui/findreplace/kreplace.cpp:51
+msgctxt "@action:button Replace all occurrences"
+msgid "&All"
+msgstr ""
 
-#: khtml/java/kjavaapplet.cpp:224
-#, kde-format
-msgid "Initializing Applet \"%1\"..."
-msgstr "Ymgychwyn Rhaglennig \"%1\"..."
+#: kdeui/findreplace/kreplace.cpp:52
+msgid "&Skip"
+msgstr "&Hepgor"
 
-#: khtml/java/kjavaapplet.cpp:231
+#: kdeui/findreplace/kreplace.cpp:62
 #, kde-format
-msgid "Starting Applet \"%1\"..."
-msgstr "Cychwyn Rhaglennig \"%1\"..."
+msgid "Replace '%1' with '%2'?"
+msgstr "Amnewid '%1' efo '%2'?"
 
-#: khtml/java/kjavaapplet.cpp:238
-#, kde-format
-msgid "Applet \"%1\" started"
-msgstr "Mae rhaglennig \"%1\" wedi cychwyn"
+#: kdeui/findreplace/kreplace.cpp:136 kdeui/findreplace/kreplace.cpp:344
+msgid "No text was replaced."
+msgstr "Ni amnewidwyd testun."
 
-#: khtml/java/kjavaapplet.cpp:244
+#: kdeui/findreplace/kreplace.cpp:138 kdeui/findreplace/kreplace.cpp:346
 #, kde-format
-msgid "Applet \"%1\" stopped"
-msgstr "Mae rhaglennig \"%1\" wedi aros"
-
-#: khtml/kmultipart/kmultipart.cpp:567
-msgid "KMultiPart"
-msgstr "KMultiPart"
-
-#: khtml/kmultipart/kmultipart.cpp:569
-msgid "Embeddable component for multipart/mixed"
-msgstr "Cydran mewnadeiladadwy i aml-ran/cymysglyd"
-
-#: khtml/kmultipart/kmultipart.cpp:45
-msgid "Copyright 2001-2011, David Faure <email>faure@kde.org</email>"
-msgstr ""
+msgid "1 replacement done."
+msgid_plural "%1 replacements done."
+msgstr[0] "%1 o amnewidau wedi eu gwneud."
+msgstr[1] "%1 o amnewidau wedi eu gwneud."
 
-#: khtml/kmultipart/kmultipart.cpp:315
-#, kde-format
-msgid "No handler found for %1."
-msgstr ""
+#: kdeui/findreplace/kreplace.cpp:351 kdeui/findreplace/kfind.cpp:630
+msgid "Beginning of document reached."
+msgstr "Wedi cyrraedd diwedd y ddogfen."
 
-#: khtml/rendering/render_form.cpp:734
-msgid "New Web Shortcut"
-msgstr ""
+#: kdeui/findreplace/kreplace.cpp:353 kdeui/findreplace/kfind.cpp:632
+msgid "End of document reached."
+msgstr "Wedi cyrraedd diwedd y ddogfen."
 
-#: khtml/rendering/render_form.cpp:755
-#, kde-format
-msgid "%1 is already assigned to %2"
-msgstr ""
+#: kdeui/findreplace/kreplace.cpp:360
+msgid "Do you want to restart search from the end?"
+msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r diwedd?"
 
-#: khtml/rendering/render_form.cpp:800
-msgid "Search &provider name:"
+#: kdeui/findreplace/kreplace.cpp:361
+msgid "Do you want to restart search at the beginning?"
+msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r dechrau?"
+
+#: kdeui/findreplace/kreplace.cpp:364
+msgctxt "@action:button Restart find & replace"
+msgid "Restart"
 msgstr ""
 
-#: khtml/rendering/render_form.cpp:802
-msgid "New search provider"
+#: kdeui/findreplace/kreplace.cpp:365
+msgctxt "@action:button Stop find & replace"
+msgid "Stop"
 msgstr ""
 
-#: khtml/rendering/render_form.cpp:807
-msgid "UR&I shortcuts:"
+#: kdeui/findreplace/kreplacedialog.cpp:154
+#, kde-format
+msgid ""
+"Your replacement string is referencing a capture greater than '\\%1', "
 msgstr ""
 
-#: khtml/rendering/render_form.cpp:878 kdeui/widgets/khistorycombobox.cpp:177
-msgid "Clear &History"
-msgstr "Gwaredu &Hanes"
+#: kdeui/findreplace/kreplacedialog.cpp:156
+#, kde-format
+msgid "but your pattern only defines 1 capture."
+msgid_plural "but your pattern only defines %1 captures."
+msgstr[0] ""
+msgstr[1] ""
 
-#: khtml/rendering/render_form.cpp:893
-msgid "Create Web Shortcut"
+#: kdeui/findreplace/kreplacedialog.cpp:158
+msgid "but your pattern defines no captures."
 msgstr ""
 
-#: khtml/rendering/media_controls.cpp:47
-msgid "Play"
+#: kdeui/findreplace/kreplacedialog.cpp:159
+msgid ""
+"\n"
+"Please correct."
 msgstr ""
 
-#: kdewidgets/makekdewidgets.cpp:84
-msgid "Builds Qt widget plugins from an ini style description file."
-msgstr "Adeiladu ategion celfigyn Qt o ffeil ddisgrifiad arddull ini."
-
-#: kdewidgets/makekdewidgets.cpp:88
-msgid "Input file"
-msgstr "Ffeil fewnbwn"
-
-#: kdewidgets/makekdewidgets.cpp:89
-msgid "Output file"
-msgstr "Ffeil allbwn"
+#: kdeui/findreplace/kfind.cpp:50
+msgid "Find Next"
+msgstr "Canfod Nesaf"
 
-#: kdewidgets/makekdewidgets.cpp:90
-msgid "Name of the plugin class to generate"
-msgstr "Enw'r dosbarth ategyn i'w greu"
+#: kdeui/findreplace/kfind.cpp:55
+#, kde-format
+msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
+msgstr "<qt>Canfod y digwyddiad nesaf o '<b>%1</b>'?</qt>"
 
-#: kdewidgets/makekdewidgets.cpp:91
-msgid "Default widget group name to display in designer"
-msgstr "Enw rhagosodol i'r grŵp celfigion i'w arddangos yn y dylunydd"
+#: kdeui/findreplace/kfind.cpp:603 kdeui/findreplace/kfind.cpp:623
+#, kde-format
+msgid "1 match found."
+msgid_plural "%1 matches found."
+msgstr[0] "Canfuwyd %1 o gydweddiadau."
+msgstr[1] "Canfuwyd %1 o gydweddiadau."
 
-#: kdewidgets/makekdewidgets.cpp:94
-msgid "makekdewidgets"
-msgstr "makekdewidgets"
+#: kdeui/findreplace/kfind.cpp:605
+#, kde-format
+msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
+msgstr "<qt>Ni chanfuwyd cydweddiad am '<b>%1</b>'.</qt>"
 
-#: kdewidgets/makekdewidgets.cpp:94
-msgid "(C) 2004-2005 Ian Reinhart Geiser"
-msgstr ""
+#: kdeui/findreplace/kfind.cpp:625
+#, kde-format
+msgid "No matches found for '<b>%1</b>'."
+msgstr "Ni chanfuwyd cydweddiad am '<b>%1</b>'."
 
-#: kdewidgets/makekdewidgets.cpp:95
-msgid "Ian Reinhart Geiser"
+#: kdeui/findreplace/kfind.cpp:639
+msgid "Continue from the end?"
 msgstr ""
 
-#: kdewidgets/makekdewidgets.cpp:96
-msgid "Daniel Molkentin"
+#: kdeui/findreplace/kfind.cpp:640
+msgid "Continue from the beginning?"
 msgstr ""
 
-#: kconf_update/kconf_update.cpp:138
-msgid "Only local files are supported."
-msgstr "Ni chynhelir ond ffeiliau lleol."
-
-#: kconf_update/kconf_update.cpp:953
-msgid "Keep output results from scripts"
-msgstr "Cadw canlyniadau allbwn o'r sgriptiau"
+#: kdeui/findreplace/kfinddialog.cpp:47
+msgid "Find Text"
+msgstr "Canfod Testun"
 
-#: kconf_update/kconf_update.cpp:954
-msgid "Check whether config file itself requires updating"
-msgstr "Gwirio a yw'r ffeil ffurfweddu ei hun angen diweddaru"
+#: kdeui/findreplace/kfinddialog.cpp:89
+msgctxt "@title:group"
+msgid "Find"
+msgstr ""
 
-#: kconf_update/kconf_update.cpp:955
-msgid "File to read update instructions from"
-msgstr "Ffeil i ddarllen cyfarwyddiadau diweddaru oddiwrtho."
+#: kdeui/findreplace/kfinddialog.cpp:92
+msgid "&Text to find:"
+msgstr "&Testun i ganfod:"
 
-#: kconf_update/kconf_update.cpp:957
-msgid "KConf Update"
-msgstr "Diweddariad KConf"
+#: kdeui/findreplace/kfinddialog.cpp:96 khtml/ui/findbar/khtmlfindbar.cpp:56
+msgid "Regular e&xpression"
+msgstr "&Mynegiad rheolaidd"
 
-#: kconf_update/kconf_update.cpp:959
-msgid "KDE Tool for updating user configuration files"
-msgstr "Erfyn KDE am ddiweddaru ffeiliau ffurfweddiad y defnyddwyr."
+#: kdeui/findreplace/kfinddialog.cpp:97
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#: kconf_update/kconf_update.cpp:961
-msgid "(c) 2001, Waldo Bastian"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:106
+msgid "Replace With"
+msgstr "Amnewid Efo"
 
-#: kdecore/kde-config.cpp:68
-msgid "kde4-config"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:109
+msgid "Replace&ment text:"
+msgstr "Testun &amnewid:"
 
-#: kdecore/kde-config.cpp:69
-msgid "A little program to output installation paths"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:113
+msgid "Use p&laceholders"
+msgstr "De&fnyddio dalfannau"
 
-#: kdecore/kde-config.cpp:71
-msgid "(C) 2000 Stephan Kulow"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:114
+msgid "Insert Place&holder"
+msgstr "Mewnosod Da&lfan"
 
-#: kdecore/kde-config.cpp:75
-msgid "Left for legacy support"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:126 khtml/ui/findbar/khtmlfindbar.cpp:48
+msgid "C&ase sensitive"
+msgstr "Mae llythrennau bach/mawr o &bwys"
 
-#: kdecore/kde-config.cpp:76
-msgid "Compiled in prefix for KDE libraries"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:127 khtml/ui/findbar/khtmlfindbar.cpp:50
+msgid "&Whole words only"
+msgstr "D&im ond geiriau cyfan"
 
-#: kdecore/kde-config.cpp:77
-msgid "Compiled in exec_prefix for KDE libraries"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:128 khtml/ui/findbar/khtmlfindbar.cpp:52
+msgid "From c&ursor"
+msgstr "&O'r cyrchyd"
 
-#: kdecore/kde-config.cpp:78
-msgid "Compiled in library path suffix"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:129
+msgid "Find &backwards"
+msgstr "Canfod &yn ôl"
 
-#: kdecore/kde-config.cpp:79
-msgid "Prefix in $HOME used to write files"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:130 khtml/ui/findbar/khtmlfindbar.cpp:54
+msgid "&Selected text"
+msgstr "&Testun dewisiedig"
 
-#: kdecore/kde-config.cpp:80
-msgid "Compiled in version string for KDE libraries"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:137
+msgid "&Prompt on replace"
+msgstr "&Cofweini wrth amnewid"
 
-#: kdecore/kde-config.cpp:81
-msgid "Available KDE resource types"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:199
+msgid "Start replace"
+msgstr "Dechrau amnewid"
 
-#: kdecore/kde-config.cpp:82
-msgid "Search path for resource type"
+#: kdeui/findreplace/kfinddialog.cpp:200
+msgid ""
+"<qt>If you press the <b>Replace</b> button, the text you entered above is "
+"searched for within the document and any occurrence is replaced with the "
+"replacement text.</qt>"
 msgstr ""
+"<qt>Os gwasgwch y botwm <b>Amnewid</b>, mae'r testun a fewnosodwyd uchod yn "
+"cael ei chwilio amdano tu mewn y ddogfen, ac mae pob digwyddiad yn cael ei "
+"amnewid gan y testun amnewid.</qt>"
 
-#: kdecore/kde-config.cpp:83
-msgid "Find filename inside the resource type given to --path"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:206 kdeui/util/kstandardguiitem.cpp:276
+msgid "&Find"
+msgstr "&Canfod"
 
-#: kdecore/kde-config.cpp:84
-msgid "User path: desktop|autostart|document"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:207
+msgid "Start searching"
+msgstr "Dechrau chwilio"
 
-#: kdecore/kde-config.cpp:85
-msgid "Prefix to install resource files to"
+#: kdeui/findreplace/kfinddialog.cpp:208
+msgid ""
+"<qt>If you press the <b>Find</b> button, the text you entered above is "
+"searched for within the document.</qt>"
 msgstr ""
+"<qt>Os gwasgwch y botwm <b>Canfod</b>, mae'r testun a fewnosodwyd uchod yn "
+"cael ei chwilio amdano tu mewn i'r ddogfen.</qt>"
 
-#: kdecore/kde-config.cpp:86
-msgid "Installation prefix for Qt"
+#: kdeui/findreplace/kfinddialog.cpp:214
+msgid ""
+"Enter a pattern to search for, or select a previous pattern from the list."
 msgstr ""
+"Rhowch patrwm i chwilio amdano, neu ddewiswch patrwm blaenorol o'r rhestr."
 
-#: kdecore/kde-config.cpp:87
-msgid "Location of installed Qt binaries"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:217
+msgid "If enabled, search for a regular expression."
+msgstr "Os alluog, chwilio am fynegiad rheolaidd."
 
-#: kdecore/kde-config.cpp:88
-msgid "Location of installed Qt libraries"
+#: kdeui/findreplace/kfinddialog.cpp:219
+msgid "Click here to edit your regular expression using a graphical editor."
 msgstr ""
+"Cliciwch yma i olygu eich mynegiad rheolaidd gan ddefnyddio golygydd "
+"graffegol."
 
-#: kdecore/kde-config.cpp:89
-msgid "Location of installed Qt plugins"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:221
+msgid "Enter a replacement string, or select a previous one from the list."
+msgstr "Rhowch llinyn amnewid, neu ddewiswch un blaenorol o'r rhestr."
 
-#: kdecore/kde-config.cpp:136
-msgid "Applications menu (.desktop files)"
+#: kdeui/findreplace/kfinddialog.cpp:223
+msgid ""
+"<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where "
+"<code><b>N</b></code> is an integer number, will be replaced with the "
+"corresponding capture (\"parenthesized substring\") from the pattern.<p>To "
+"include (a literal <code><b>\\N</b></code> in your replacement, put an extra "
+"backslash in front of it, like <code><b>\\\\N</b></code>.</p></qt>"
 msgstr ""
 
-#: kdecore/kde-config.cpp:137
-msgid "Autostart directories"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:230
+msgid "Click for a menu of available captures."
+msgstr "Cliciwch am ddewislen o'r cipiadau sydd ar gael."
 
-#: kdecore/kde-config.cpp:138
-msgid "Cached information (e.g. favicons, web-pages)"
+#: kdeui/findreplace/kfinddialog.cpp:232
+msgid "Require word boundaries in both ends of a match to succeed."
 msgstr ""
+"Gofyn am ffiniau geiriau wrth ddechrau a diwedd cydweddiad er mwyn llwyddo."
 
-#: kdecore/kde-config.cpp:139
-msgid "CGIs to run from kdehelp"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:234
+msgid ""
+"Start searching at the current cursor location rather than at the top."
+msgstr "Dechrau chwilio o leoliad cyfredol y cyrchydd yn lle o'r pen."
 
-#: kdecore/kde-config.cpp:140
-msgid "Configuration files"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:236
+msgid "Only search within the current selection."
+msgstr "Chwilio tu mewn y detholiad cyfredol yn unig."
 
-#: kdecore/kde-config.cpp:141
-msgid "Where applications store data"
+#: kdeui/findreplace/kfinddialog.cpp:238
+msgid ""
+"Perform a case sensitive search: entering the pattern 'Joe' will not match "
+"'joe' or 'JOE', only 'Joe'."
 msgstr ""
+"Gweithredu chwiliad lle mae priflythrennau o bwys: ni fydd y patrwm 'Joe' yn "
+"cydweddu â 'joe' neu 'JOE', ond â 'Joe' yn unig."
 
-#: kdecore/kde-config.cpp:142
-msgid "Emoticons"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:241
+msgid "Search backwards."
+msgstr "Chwilio yn ôl."
 
-#: kdecore/kde-config.cpp:143
-msgid "Executables in $prefix/bin"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:243
+msgid "Ask before replacing each match found."
+msgstr "Gofyn cyn disodli pob cydweddiad a ganfyddir."
 
-#: kdecore/kde-config.cpp:144
-msgid "HTML documentation"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:437
+msgid "Any Character"
+msgstr "Unrhyw Nod"
 
-#: kdecore/kde-config.cpp:145
-msgid "Icons"
-msgstr "Eiconau"
+#: kdeui/findreplace/kfinddialog.cpp:438
+msgid "Start of Line"
+msgstr "Dechrau'r Llinell"
 
-#: kdecore/kde-config.cpp:146
-msgid "Configuration description files"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:439
+msgid "End of Line"
+msgstr "Diwedd y Llinell"
 
-#: kdecore/kde-config.cpp:147
-msgid "kdeinit shared executables (resource added by Debian)"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:440
+msgid "Set of Characters"
+msgstr "Set o Nodau"
 
-#: kdecore/kde-config.cpp:147
-msgid "Libraries"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:441
+msgid "Repeats, Zero or More Times"
+msgstr "Ailadrodd, Sero neu Mwy o Weithiau"
 
-#: kdecore/kde-config.cpp:148
-msgid "Includes/Headers"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:442
+msgid "Repeats, One or More Times"
+msgstr "Ailadrodd, Un neu Mwy o Weithiau"
 
-#: kdecore/kde-config.cpp:149
-msgid "Translation files for KLocale"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:443
+msgid "Optional"
+msgstr "Dewisol"
 
-#: kdecore/kde-config.cpp:150
-msgid "Mime types"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:444
+msgid "Escape"
+msgstr "Esc"
 
-#: kdecore/kde-config.cpp:151
-msgid "Loadable modules"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:445
+msgid "TAB"
+msgstr "TAB"
 
-#: kdecore/kde-config.cpp:152 kdecore/kde-config.cpp:162
-msgid "Legacy pixmaps"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:446
+msgid "Newline"
+msgstr "Llinell newydd"
 
-#: kdecore/kde-config.cpp:153
-msgid "Qt plugins"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:447
+msgid "Carriage Return"
+msgstr "Dychwelydd"
 
-#: kdecore/kde-config.cpp:154
-msgid "Services"
-msgstr "Gwasanaethau"
+#: kdeui/findreplace/kfinddialog.cpp:448
+msgid "White Space"
+msgstr "Gofodnod"
 
-#: kdecore/kde-config.cpp:155
-msgid "Service types"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:449
+msgid "Digit"
+msgstr "Digid"
 
-#: kdecore/kde-config.cpp:156
-msgid "Application sounds"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:542
+msgid "Complete Match"
+msgstr "Cydweddiad Cyfan"
 
-#: kdecore/kde-config.cpp:157
-msgid "Templates"
-msgstr "Patrymluniau"
+#: kdeui/findreplace/kfinddialog.cpp:547
+#, kde-format
+msgid "Captured Text (%1)"
+msgstr "Testun a Gipiwyd (%1)"
 
-#: kdecore/kde-config.cpp:158
-msgid "Wallpapers"
-msgstr "Papurau Wal"
+#: kdeui/findreplace/kfinddialog.cpp:555
+msgid "You must enter some text to search for."
+msgstr "Rhaid i chi fewnosod testun i chwilio amdano."
 
-#: kdecore/kde-config.cpp:159
-msgid "XDG Application menu (.desktop files)"
-msgstr ""
+#: kdeui/findreplace/kfinddialog.cpp:566
+msgid "Invalid regular expression."
+msgstr "Mynegiad rheolaidd annilys."
 
-#: kdecore/kde-config.cpp:160
-msgid "XDG Menu descriptions (.directory files)"
+#: kdeui/kernel/kuniqueapplication.cpp:88
+msgid "Do not run in the background."
 msgstr ""
 
-#: kdecore/kde-config.cpp:161
-msgid "XDG Icons"
+#: kdeui/kernel/kuniqueapplication.cpp:90
+msgid "Internally added if launched from Finder"
 msgstr ""
 
-#: kdecore/kde-config.cpp:163
-msgid "XDG Mime Types"
+#: kdeui/kernel/kapplication.cpp:830
+#, kde-format
+msgid "The style '%1' was not found"
 msgstr ""
 
-#: kdecore/kde-config.cpp:164
-msgid "XDG Menu layout (.menu files)"
+#. i18n: A shorter version of the alphabet test phrase translated in
+#. another message. It is displayed in the dropdown list of font previews
+#. (the font selection combo box), so keep it under the length equivalent
+#. to 60 or so proportional Latin characters.
+#: kdeui/fonts/kfontcombobox.cpp:49
+msgctxt "short"
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
 msgstr ""
 
-#: kdecore/kde-config.cpp:165
-msgid "XDG autostart directory"
+#. i18n: Integer which indicates the script you used in the sample text
+#. for font previews in your language. For the possible values, see
+#. http://doc.trolltech.com/qfontdatabase.html#WritingSystem-enum
+#. If the sample text contains several scripts, their IDs can be given
+#. as a comma-separated list (e.g. for Japanese it is "1,27").
+#: kdeui/fonts/kfontcombobox.cpp:120
+msgctxt "Numeric IDs of scripts for font previews"
+msgid "1"
 msgstr ""
 
-#: kdecore/kde-config.cpp:166
-msgid "Temporary files (specific for both current host and current user)"
+#: kdeui/fonts/kfontchooser.cpp:162
+msgctxt "@info:whatsthis"
+msgid "Here you can choose the font to be used."
 msgstr ""
 
-#: kdecore/kde-config.cpp:167
-msgid "UNIX Sockets (specific for both current host and current user)"
-msgstr ""
+#: kdeui/fonts/kfontchooser.cpp:184
+msgid "Requested Font"
+msgstr "Wynebfath a Ddymunwyd"
 
-#: kdecore/kde-config.cpp:179
-#, kde-format
-msgid "%1 - unknown type\n"
+#: kdeui/fonts/kfontchooser.cpp:203
+msgctxt "@option:check"
+msgid "Font"
 msgstr ""
 
-#: kdecore/kde-config.cpp:237
-#, kde-format
-msgid "%1 - unknown type of userpath\n"
+#: kdeui/fonts/kfontchooser.cpp:207
+msgctxt "@info:whatsthis"
+msgid "Enable this checkbox to change the font family settings."
 msgstr ""
 
-#: kdecore/config/kconfigini.cpp:559
-#, kde-format
-msgid "Configuration file \"%1\" not writable.\n"
-msgstr "Methu ysgrifennu i'r ffeil ffurfweddiad \"%1\".\n"
-
-#: kdecore/config/kconfig.cpp:681
-msgid "Please contact your system administrator."
-msgstr "Cysylltwch a'ch gwasanaethwr cysodau."
-
-#: kdecore/auth/backends/dbus/DBusHelperProxy.cpp:100
-#, kde-format
-msgid "DBus Backend error: connection to helper failed. %1"
+#: kdeui/fonts/kfontchooser.cpp:208
+msgctxt "@info:tooltip"
+msgid "Change font family?"
 msgstr ""
 
-#: kdecore/auth/backends/dbus/DBusHelperProxy.cpp:124
-#, kde-format
-msgid ""
-"DBus Backend error: could not contact the helper. Connection error: %1. "
-"Message error: %2"
+#: kdeui/fonts/kfontchooser.cpp:212
+msgctxt "@label"
+msgid "Font:"
 msgstr ""
 
-#: kdecore/auth/backends/dbus/DBusHelperProxy.cpp:134
-#, kde-format
-msgid "DBus Backend error: received corrupt data from helper %1 %2"
+#: kdeui/fonts/kfontchooser.cpp:219
+msgctxt "@option:check"
+msgid "Font style"
 msgstr ""
 
-#: kdecore/io/ksavefile.cpp:84
-msgid "No target filename has been given."
+#: kdeui/fonts/kfontchooser.cpp:223
+msgctxt "@info:whatsthis"
+msgid "Enable this checkbox to change the font style settings."
 msgstr ""
 
-#: kdecore/io/ksavefile.cpp:91
-msgid "Already opened."
+#: kdeui/fonts/kfontchooser.cpp:224
+msgctxt "@info:tooltip"
+msgid "Change font style?"
 msgstr ""
 
-#: kdecore/io/ksavefile.cpp:101
-msgid "Insufficient permissions in target directory."
+#: kdeui/fonts/kfontchooser.cpp:228
+msgid "Font style:"
+msgstr "Ardull wynebfath:"
+
+#: kdeui/fonts/kfontchooser.cpp:236
+msgctxt "@option:check"
+msgid "Size"
 msgstr ""
 
-#: kdecore/io/ksavefile.cpp:111
-msgid "Unable to open temporary file."
+#: kdeui/fonts/kfontchooser.cpp:240
+msgctxt "@info:whatsthis"
+msgid "Enable this checkbox to change the font size settings."
 msgstr ""
 
-#: kdecore/io/ksavefile.cpp:215
-msgid "Synchronization to disk failed"
+#: kdeui/fonts/kfontchooser.cpp:241
+msgctxt "@info:tooltip"
+msgid "Change font size?"
 msgstr ""
 
-#: kdecore/io/ksavefile.cpp:239
-msgid "Error during rename."
+#: kdeui/fonts/kfontchooser.cpp:245
+msgctxt "@label:listbox Font size"
+msgid "Size:"
 msgstr ""
 
-#: kdecore/network/k3socks.cpp:137
-msgid "NEC SOCKS client"
-msgstr "dibynnydd NEC SOCKS"
+#: kdeui/fonts/kfontchooser.cpp:261
+msgctxt "@info:whatsthis"
+msgid "Here you can choose the font family to be used."
+msgstr ""
 
-#: kdecore/network/k3socks.cpp:172
-msgid "Dante SOCKS client"
-msgstr "dibynnydd Dante SOCKS"
+#: kdeui/fonts/kfontchooser.cpp:287
+msgctxt "@info:whatsthis"
+msgid "Here you can choose the font style to be used."
+msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:153
-msgctxt "SSL error"
-msgid "No error"
+#: kdeui/fonts/kfontchooser.cpp:295 kdeui/fonts/kfontchooser.cpp:623
+#: kdeui/fonts/kfontchooser.cpp:640
+msgctxt "@item font"
+msgid "Regular"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:155
-msgctxt "SSL error"
-msgid "The certificate authority's certificate is invalid"
+#: kdeui/fonts/kfontchooser.cpp:296 kdeui/fonts/kfontchooser.cpp:644
+msgctxt "@item font"
+msgid "Italic"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:157
-msgctxt "SSL error"
-msgid "The certificate has expired"
+#: kdeui/fonts/kfontchooser.cpp:297 kdeui/fonts/kfontchooser.cpp:645
+msgctxt "@item font"
+msgid "Oblique"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:159
-msgctxt "SSL error"
-msgid "The certificate is invalid"
+#: kdeui/fonts/kfontchooser.cpp:298
+msgctxt "@item font"
+msgid "Bold"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:161
-msgctxt "SSL error"
-msgid "The certificate is not signed by any trusted certificate authority"
+#: kdeui/fonts/kfontchooser.cpp:299
+msgctxt "@item font"
+msgid "Bold Italic"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:163
-msgctxt "SSL error"
-msgid "The certificate has been revoked"
+#: kdeui/fonts/kfontchooser.cpp:320
+msgctxt "@item font size"
+msgid "Relative"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:165
-msgctxt "SSL error"
-msgid "The certificate is unsuitable for this purpose"
+#: kdeui/fonts/kfontchooser.cpp:322
+msgid "Font size<br /><i>fixed</i> or <i>relative</i><br />to environment"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:167
-msgctxt "SSL error"
+#: kdeui/fonts/kfontchooser.cpp:324
 msgid ""
-"The root certificate authority's certificate is not trusted for this purpose"
+"Here you can switch between fixed font size and font size to be calculated "
+"dynamically and adjusted to changing environment (e.g. widget dimensions, "
+"paper size)."
 msgstr ""
+"Yma y newidir rhwng maint wynebfath sy'n osodedig, a maint wynebfath a "
+"chyfrifir yn ddinamig ac a  addasir i amgychedd sy'n newid (e.e. "
+"dimensiynau'r celfigyn, maint y papur)."
 
-#: kdecore/network/ktcpsocket.cpp:169
-msgctxt "SSL error"
+#: kdeui/fonts/kfontchooser.cpp:349
+msgid "Here you can choose the font size to be used."
+msgstr "Yma y dewisir maint yr wynebfath a ddefnyddir."
+
+#. i18n: A classical test phrase, with all letters of the English alphabet.
+#. Replace it with a sample text in your language, such that it is
+#. representative of language's writing system.
+#. If you wish, you can input several lines of text separated by \n.
+#: kdeui/fonts/kfontchooser.cpp:387
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
+
+#: kdeui/fonts/kfontchooser.cpp:390
 msgid ""
-"The certificate authority's certificate is marked to reject this "
-"certificate's purpose"
+"This sample text illustrates the current settings. You may edit it to test "
+"special characters."
 msgstr ""
+"Mae'r testun engraifft yma yn dangos y gosodiadau cyfredol. Cewch ei golygu "
+"er mwyn arbrofi llythrennau arbennig."
 
-#: kdecore/network/ktcpsocket.cpp:171
-msgctxt "SSL error"
-msgid "The peer did not present any certificate"
-msgstr ""
+#: kdeui/fonts/kfontchooser.cpp:406 kdeui/fonts/kfontchooser.cpp:417
+msgid "Actual Font"
+msgstr "Gwir Wynebfath"
 
-#: kdecore/network/ktcpsocket.cpp:173
-msgctxt "SSL error"
-msgid "The certificate does not apply to the given host"
+#. i18n: Filtering message, so that translators can script the
+#. style string according to the font family name (e.g. may need
+#. noun-adjective congruence wrt. gender of the family name).
+#. The message provides the dynamic context 'family', which is
+#. the family name to which the style string corresponds.
+#: kdeui/fonts/kfontchooser.cpp:630
+#, kde-format
+msgctxt "@item Font style"
+msgid "%1"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:175
-msgctxt "SSL error"
-msgid "The certificate cannot be verified for internal reasons"
+#. i18n: Generic sans serif font presented in font choosers. When selected,
+#. the system will choose a real font, mandated by distro settings.
+#: kdeui/fonts/fonthelpers.cpp:32
+msgctxt "@item Font name"
+msgid "Sans Serif"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:177
-msgctxt "SSL error"
-msgid "The certificate chain is too long"
+#. i18n: Generic serif font presented in font choosers. When selected,
+#. the system will choose a real font, mandated by distro settings.
+#: kdeui/fonts/fonthelpers.cpp:35
+msgctxt "@item Font name"
+msgid "Serif"
 msgstr ""
 
-#: kdecore/network/ktcpsocket.cpp:180
-msgctxt "SSL error"
-msgid "Unknown error"
+#. i18n: Generic monospace font presented in font choosers. When selected,
+#. the system will choose a real font, mandated by distro settings.
+#: kdeui/fonts/fonthelpers.cpp:38
+msgctxt "@item Font name"
+msgid "Monospace"
 msgstr ""
 
-#: kdecore/network/k3socketbase.cpp:214
-msgctxt "Socket error code NoError"
-msgid "no error"
-msgstr "dim gwall"
-
-#: kdecore/network/k3socketbase.cpp:219
-msgctxt "Socket error code LookupFailure"
-msgid "name lookup has failed"
-msgstr "methodd chwilio'r enw"
-
-#: kdecore/network/k3socketbase.cpp:224
-msgctxt "Socket error code AddressInUse"
-msgid "address already in use"
-msgstr "mae'r cyfeiriad mewn defnydd eisoes"
-
-#: kdecore/network/k3socketbase.cpp:229
-msgctxt "Socket error code AlreadyBound"
-msgid "socket is already bound"
-msgstr "mae'r soced wedi'i rhwymo eisoes"
-
-#: kdecore/network/k3socketbase.cpp:234
-msgctxt "Socket error code AlreadyCreated"
-msgid "socket is already created"
-msgstr "mae'r soced wedi'i greu eisoes"
+#. i18n: Filter by which the translators can translate, or otherwise
+#. operate on the font names not put up for regular translation.
+#: kdeui/fonts/fonthelpers.cpp:81
+#, kde-format
+msgctxt "@item Font name"
+msgid "%1"
+msgstr ""
 
-#: kdecore/network/k3socketbase.cpp:239
-msgctxt "Socket error code NotBound"
-msgid "socket is not bound"
-msgstr "ni rhwymir y soced"
+#. i18n: Filter by which the translators can translate, or otherwise
+#. operate on the font names not put up for regular translation.
+#: kdeui/fonts/fonthelpers.cpp:85
+#, kde-format
+msgctxt "@item Font name [foundry]"
+msgid "%1 [%2]"
+msgstr ""
 
-#: kdecore/network/k3socketbase.cpp:244
-msgctxt "Socket error code NotCreated"
-msgid "socket has not been created"
-msgstr "ni chreuwyd y soced"
+#: kdeui/fonts/kfontdialog.cpp:75
+msgid "Select Font"
+msgstr "Dewis Wynebfath"
 
-#: kdecore/network/k3socketbase.cpp:249
-msgctxt "Socket error code WouldBlock"
-msgid "operation would block"
-msgstr "bydd y gweithrediad yn rhwystro"
+#: kdeui/fonts/kfontrequester.cpp:110
+msgid "Choose..."
+msgstr "Dewis..."
 
-#: kdecore/network/k3socketbase.cpp:254
-msgctxt "Socket error code ConnectionRefused"
-msgid "connection actively refused"
-msgstr "gwrthodwyd y cysyltiad yn weithredol"
+#: kdeui/fonts/kfontrequester.cpp:215
+msgid "Click to select a font"
+msgstr "Cliciwch i ddewis wynebfath"
 
-#: kdecore/network/k3socketbase.cpp:259
-msgctxt "Socket error code ConnectionTimedOut"
-msgid "connection timed out"
-msgstr "mae'r cysylltiad wedi goramseru"
+#: kdeui/fonts/kfontrequester.cpp:222
+msgid "Preview of the selected font"
+msgstr "Rhagolwg y r wynebfath penodol"
 
-#: kdecore/network/k3socketbase.cpp:264
-msgctxt "Socket error code InProgress"
-msgid "operation is already in progress"
-msgstr "mae'r gweithrediad ar y gweill eisoes"
+#: kdeui/fonts/kfontrequester.cpp:223
+msgid ""
+"This is a preview of the selected font. You can change it by clicking the "
+"\"Choose...\" button."
+msgstr ""
+"Mae hyn yn rhagolwg yr wynebfath penodol.  Cewch ei newid gan glicio'r botwm "
+"\"Dewis...\"."
 
-#: kdecore/network/k3socketbase.cpp:269
-msgctxt "Socket error code NetFailure"
-msgid "network failure occurred"
-msgstr "methodd y rhwydwaith"
+#: kdeui/fonts/kfontrequester.cpp:228
+#, kde-format
+msgid "Preview of the \"%1\" font"
+msgstr "Rhagolwg y font \"%1\""
 
-#: kdecore/network/k3socketbase.cpp:274
-msgctxt "Socket error code NotSupported"
-msgid "operation is not supported"
-msgstr "ni chynhelir y gweithrediad"
+#: kdeui/fonts/kfontrequester.cpp:229
+#, kde-format
+msgid ""
+"This is a preview of the \"%1\" font. You can change it by clicking the "
+"\"Choose...\" button."
+msgstr ""
+"Mae hyn yn rhagolwg o'r wynebfath \"%1\".  Cewch ei newid gan glicio'r botwm "
+"\"Dewis...\"."
 
-#: kdecore/network/k3socketbase.cpp:279
-msgctxt "Socket error code Timeout"
-msgid "timed operation timed out"
-msgstr "mae gweithrediad amseredig wedi goramseru"
+#: kdeui/util/kcompletion.cpp:693
+msgid ""
+"You reached the end of the list\n"
+"of matching items.\n"
+msgstr ""
+"Rydych wedi cyrraedd diwedd y rhestr\n"
+" o dermau cydweddol.\n"
 
-#: kdecore/network/k3socketbase.cpp:284
-msgctxt "Socket error code UnknownError"
-msgid "an unknown/unexpected error has happened"
-msgstr "digwyddodd gwall anhysbys/annisgwyl"
+#: kdeui/util/kcompletion.cpp:699
+msgid ""
+"The completion is ambiguous, more than one\n"
+"match is available.\n"
+msgstr ""
+"Mae'r cwblhâd yn amwys, mae mwy nac un \n"
+" cydweddiad ar gael\n"
 
-#: kdecore/network/k3socketbase.cpp:289
-msgctxt "Socket error code RemotelyDisconnected"
-msgid "remote host closed connection"
-msgstr "caeodd y gwesteiwr pell y cysylltiad"
+#: kdeui/util/kcompletion.cpp:705
+msgid "There is no matching item available.\n"
+msgstr "Dim cydweddiad ar gael.\n"
 
-#: kdecore/network/klocalsocket_win.cpp:31
-#: kdecore/network/klocalsocket_win.cpp:36
-msgid "Operation not supported"
+#: kdeui/util/kundostack.cpp:48
+msgid "Redo"
 msgstr ""
 
-#: kdecore/network/ksocketfactory.cpp:90
-#: kdecore/network/ksocketfactory.cpp:104
-msgid "Timed out trying to connect to remote host"
-msgstr ""
+#: kdeui/util/kundostack.cpp:67 kdeui/util/kkeyserver_x11.cpp:106
+msgid "Undo"
+msgstr "Dad-wneud"
 
-#: kdecore/network/k3socketaddress.cpp:623
-#, kde-format
-msgctxt "1: the unknown socket address family number"
-msgid "Unknown family %1"
-msgstr ""
+#: kdeui/util/kkeyserver_x11.cpp:95
+msgid "Backspace"
+msgstr "Yn ôl"
 
-#: kdecore/network/k3resolver.cpp:545 kdecore/network/netsupp.cpp:891
-msgid "no error"
-msgstr "dim gwall"
+#: kdeui/util/kkeyserver_x11.cpp:96
+msgid "SysReq"
+msgstr "SysReq"
 
-#: kdecore/network/k3resolver.cpp:546
-msgid "requested family not supported for this host name"
-msgstr "ni chynhelir y deulu benodol i'r enw gwesteiwr yma"
+#: kdeui/util/kkeyserver_x11.cpp:97
+msgid "CapsLock"
+msgstr "PriflythGlo"
 
-#: kdecore/network/k3resolver.cpp:547 kdecore/network/netsupp.cpp:893
-msgid "temporary failure in name resolution"
-msgstr "methiant dros dro wrth ddadansoddi'r enw"
+#: kdeui/util/kkeyserver_x11.cpp:98
+msgid "NumLock"
+msgstr "RhifGlo"
 
-#: kdecore/network/k3resolver.cpp:548 kdecore/network/netsupp.cpp:895
-msgid "non-recoverable failure in name resolution"
-msgstr "methiant anadferadwy wrth ddadansoddi'r enw"
+#: kdeui/util/kkeyserver_x11.cpp:99
+msgid "ScrollLock"
+msgstr "SgrolGlo"
 
-#: kdecore/network/k3resolver.cpp:549
-msgid "invalid flags"
-msgstr "baneri annilys"
+#: kdeui/util/kkeyserver_x11.cpp:100
+msgid "PageUp"
+msgstr "Tudalen i Fyny"
+
+#: kdeui/util/kkeyserver_x11.cpp:101
+msgid "PageDown"
+msgstr "Tudalen i Lawr"
 
-#: kdecore/network/k3resolver.cpp:550 kdecore/network/netsupp.cpp:897
-msgid "memory allocation failure"
-msgstr "methiant wrth ddyrannu cof"
+#: kdeui/util/kkeyserver_x11.cpp:104
+msgid "Again"
+msgstr "Eto"
 
-#: kdecore/network/k3resolver.cpp:551 kdecore/network/netsupp.cpp:899
-msgid "name or service not known"
-msgstr "ni adnabyddir enw neu gwasanaeth"
+#: kdeui/util/kkeyserver_x11.cpp:105
+msgid "Props"
+msgstr "Ategion"
 
-#: kdecore/network/k3resolver.cpp:552
-msgid "requested family not supported"
-msgstr "ni chynhelir deulu benodol"
+#: kdeui/util/kkeyserver_x11.cpp:107
+msgid "Front"
+msgstr "Ffront"
 
-#: kdecore/network/k3resolver.cpp:553
-msgid "requested service not supported for this socket type"
-msgstr "ni chynhelir y gwasanaeth benodol am y math yma o soced"
+#: kdeui/util/kkeyserver_x11.cpp:108
+msgid "Copy"
+msgstr "Copio"
 
-#: kdecore/network/k3resolver.cpp:554
-msgid "requested socket type not supported"
-msgstr "ni chynhelir y math penodol o soced"
+#: kdeui/util/kkeyserver_x11.cpp:109
+msgid "Open"
+msgstr "Agor"
 
-#: kdecore/network/k3resolver.cpp:555
-msgid "unknown error"
-msgstr "gwall anhysbys"
+#: kdeui/util/kkeyserver_x11.cpp:110
+msgid "Paste"
+msgstr "Gludo"
 
-#: kdecore/network/k3resolver.cpp:557
-#, kde-format
-msgctxt "1: the i18n'ed system error code, from errno"
-msgid "system error: %1"
-msgstr "gwall cysawd : %1"
+#: kdeui/util/kkeyserver_x11.cpp:111
+msgid "Find"
+msgstr "Canfod"
 
-#: kdecore/network/k3resolver.cpp:568
-msgid "request was canceled"
-msgstr "diddymwyd y cais"
+#: kdeui/util/kkeyserver_x11.cpp:112
+msgid "Cut"
+msgstr "Torri"
 
-#: kdecore/network/netsupp.cpp:892
-msgid "address family for nodename not supported"
-msgstr "ni chynhalir y teulu cyfeiriad am yr enw nôd"
+#: kdeui/util/kstandardguiitem.cpp:109
+msgid "&OK"
+msgstr "&Iawn"
 
-#: kdecore/network/netsupp.cpp:894
-msgid "invalid value for 'ai_flags'"
-msgstr "gwerth dilys am 'ai_flags'"
+#: kdeui/util/kstandardguiitem.cpp:115
+msgid "&Cancel"
+msgstr "&Diddymu"
 
-#: kdecore/network/netsupp.cpp:896
-msgid "'ai_family' not supported"
-msgstr "ni chynhelir 'ai_family'"
+#: kdeui/util/kstandardguiitem.cpp:120 khtml/java/kjavaappletserver.cpp:817
+msgid "&Yes"
+msgstr "&Ie"
 
-#: kdecore/network/netsupp.cpp:898
-msgid "no address associated with nodename"
-msgstr "ni chysylltir cyfeiriad efo enw'r nôd"
+#: kdeui/util/kstandardguiitem.cpp:120
+msgid "Yes"
+msgstr "Ie"
 
-#: kdecore/network/netsupp.cpp:900
-msgid "servname not supported for ai_socktype"
-msgstr "ni chynhelir servname am ai_socktype"
+#: kdeui/util/kstandardguiitem.cpp:125 khtml/java/kjavaappletserver.cpp:810
+msgid "&No"
+msgstr "&Nage"
 
-#: kdecore/network/netsupp.cpp:901
-msgid "'ai_socktype' not supported"
-msgstr "ni chynhelir 'ai_socktype'"
+#: kdeui/util/kstandardguiitem.cpp:125
+msgid "No"
+msgstr "Nage"
 
-#: kdecore/network/netsupp.cpp:902
-msgid "system error"
-msgstr "gwall cysawd"
+#: kdeui/util/kstandardguiitem.cpp:130
+msgid "&Discard"
+msgstr "&Taflu"
 
-#: kdecore/network/klocalsocket_unix.cpp:178
-#: kdecore/network/klocalsocket_unix.cpp:246
-msgid "Specified socket path is invalid"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:130
+msgid "Discard changes"
+msgstr "Taflu newidiadau"
 
-#: kdecore/network/klocalsocket_unix.cpp:187
-#: kdecore/network/klocalsocket_unix.cpp:234
-#: kdecore/network/klocalsocket_unix.cpp:255
-msgid "The socket operation is not supported"
+#: kdeui/util/kstandardguiitem.cpp:131
+msgid ""
+"Pressing this button will discard all recent changes made in this dialog."
 msgstr ""
 
-#: kdecore/network/klocalsocket_unix.cpp:200
-msgid "Connection refused"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:137 kdeui/actions/kstandardaction_p.h:46
+msgid "&Save"
+msgstr "&Cadw"
 
-#: kdecore/network/klocalsocket_unix.cpp:205
-#: kdecore/network/klocalsocket_unix.cpp:268
-msgid "Permission denied"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:137
+msgid "Save data"
+msgstr "Cadw'r data"
 
-#: kdecore/network/klocalsocket_unix.cpp:209
-msgid "Connection timed out"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:142
+msgid "&Do Not Save"
+msgstr "&Peidiwch â Chadw"
 
-#: kdecore/network/klocalsocket_unix.cpp:221
-#: kdecore/network/klocalsocket_unix.cpp:301
-msgid "Could not set non-blocking mode"
+#: kdeui/util/kstandardguiitem.cpp:143
+msgid "Do not save data"
 msgstr ""
 
-#: kdecore/network/klocalsocket_unix.cpp:272
-msgid "Address is already in use"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:148 kdeui/actions/kstandardaction_p.h:47
+msgid "Save &As..."
+msgstr "Cadw &Fel..."
 
-#: kdecore/network/klocalsocket_unix.cpp:277
-msgid "Path cannot be used"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:149
+msgid "Save file with another name"
+msgstr "Cadw'r ffeil efo enw arall"
 
-#: kdecore/network/klocalsocket_unix.cpp:281
-msgid "No such file or directory"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:154
+msgid "&Apply"
+msgstr "&Gosod"
 
-#: kdecore/network/klocalsocket_unix.cpp:285
-msgid "Not a directory"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:154
+msgid "Apply changes"
+msgstr "Cymhwyso'r newidiadau"
 
-#: kdecore/network/klocalsocket_unix.cpp:289
-msgid "Read-only filesystem"
+#: kdeui/util/kstandardguiitem.cpp:155
+msgid ""
+"When you click <b>Apply</b>, the settings will be handed over to the "
+"program, but the dialog will not be closed.\n"
+"Use this to try different settings."
 msgstr ""
 
-#: kdecore/network/klocalsocket_unix.cpp:354
-#: kdecore/network/klocalsocket_unix.cpp:386
-msgid "Unknown socket error"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:163
+msgid "Administrator &Mode..."
+msgstr "Modd G&weinyddwr..."
 
-#: kdecore/sonnet/loader.cpp:154
-msgctxt "dictionary variant"
-msgid "40"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:163
+msgid "Enter Administrator Mode"
+msgstr "Newid i Fodd Gweinyddwr"
 
-#: kdecore/sonnet/loader.cpp:155
-msgctxt "dictionary variant"
-msgid "60"
+#: kdeui/util/kstandardguiitem.cpp:164
+msgid ""
+"When you click <b>Administrator Mode</b> you will be prompted for the "
+"administrator (root) password in order to make changes which require root "
+"privileges."
 msgstr ""
 
-#: kdecore/sonnet/loader.cpp:156
-msgctxt "dictionary variant"
-msgid "80"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:172
+msgid "Clear input"
+msgstr "Clirio'r mewnbwn"
 
-#: kdecore/sonnet/loader.cpp:157
-msgctxt "dictionary variant"
-msgid "-ise suffixes"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:173
+msgid "Clear the input in the edit field"
+msgstr "Clirio'r mewnbwn yn y maes golygu"
 
-#: kdecore/sonnet/loader.cpp:158
-msgctxt "dictionary variant"
-msgid "-ize suffixes"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:179
+msgid "Show help"
+msgstr "Dangos cymorth"
 
-#: kdecore/sonnet/loader.cpp:159
-msgctxt "dictionary variant"
-msgid "-ise suffixes and with accents"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:185
+msgid "Close the current window or document"
+msgstr "Cau'r ffenest neu ddogfen cyfredol"
 
-#: kdecore/sonnet/loader.cpp:160
-msgctxt "dictionary variant"
-msgid "-ise suffixes and without accents"
+#: kdeui/util/kstandardguiitem.cpp:190
+msgid "&Close Window"
 msgstr ""
 
-#: kdecore/sonnet/loader.cpp:161
-msgctxt "dictionary variant"
-msgid "-ize suffixes and with accents"
+#: kdeui/util/kstandardguiitem.cpp:191
+msgid "Close the current window."
 msgstr ""
 
-#: kdecore/sonnet/loader.cpp:162
-msgctxt "dictionary variant"
-msgid "-ize suffixes and without accents"
+#: kdeui/util/kstandardguiitem.cpp:196
+msgid "&Close Document"
 msgstr ""
 
-#: kdecore/sonnet/loader.cpp:163
-msgctxt "dictionary variant"
-msgid "large"
+#: kdeui/util/kstandardguiitem.cpp:197
+msgid "Close the current document."
 msgstr ""
 
-#: kdecore/sonnet/loader.cpp:164
-msgctxt "dictionary variant"
-msgid "medium"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:202
+msgid "&Defaults"
+msgstr "&Rhagosodiadau"
 
-#: kdecore/sonnet/loader.cpp:165
-msgctxt "dictionary variant"
-msgid "small"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:203
+msgid "Reset all items to their default values"
+msgstr "Ailosod pob eitem i'w werth rhagosodol"
 
-#: kdecore/sonnet/loader.cpp:166
-msgctxt "dictionary variant"
-msgid "variant 0"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:211
+msgid "Go back one step"
+msgstr "Ewch cam yn ôl"
 
-#: kdecore/sonnet/loader.cpp:167
-msgctxt "dictionary variant"
-msgid "variant 1"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:219
+msgid "Go forward one step"
+msgstr "Ewch cam ymlaen"
 
-#: kdecore/sonnet/loader.cpp:168
-msgctxt "dictionary variant"
-msgid "variant 2"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:229 kdeui/actions/kstandardaction_p.h:50
+msgid "&Print..."
+msgstr "&Argraffu"
 
-#: kdecore/sonnet/loader.cpp:169
-msgctxt "dictionary variant"
-msgid "without accents"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:230
+msgid "Opens the print dialog to print the current document"
+msgstr "Agor y blwch dewisiadau argraffu er mwyn argraffu'r ddogfen gyfredol"
 
-#: kdecore/sonnet/loader.cpp:170
-msgctxt "dictionary variant"
-msgid "with accents"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:236
+msgid "C&ontinue"
+msgstr "&Mynd ymlaen"
 
-#: kdecore/sonnet/loader.cpp:171
-msgctxt "dictionary variant"
-msgid "with ye"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:237
+msgid "Continue operation"
+msgstr "Ewch ymlaen a'r gweithrediad"
 
-#: kdecore/sonnet/loader.cpp:172
-msgctxt "dictionary variant"
-msgid "with yeyo"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:242
+msgid "&Delete"
+msgstr "&Dileu"
 
-#: kdecore/sonnet/loader.cpp:173
-msgctxt "dictionary variant"
-msgid "with yo"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:243
+msgid "Delete item(s)"
+msgstr "Dileu eitem(au)"
 
-#: kdecore/sonnet/loader.cpp:174
-msgctxt "dictionary variant"
-msgid "extended"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:248 kdeui/actions/kstandardaction_p.h:44
+msgid "&Open..."
+msgstr "&Agor..."
 
-#: kdecore/sonnet/loader.cpp:219
-#, kde-format
-msgctxt "dictionary name. %1-language, %2-country and %3 variant name"
-msgid "%1 (%2) [%3]"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:249
+msgid "Open file"
+msgstr "Agor ffeil"
 
-#: kdecore/sonnet/loader.cpp:224
-#, kde-format
-msgctxt "dictionary name. %1-language and %2-country name"
-msgid "%1 (%2)"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:254 kdeui/actions/kstandardaction_p.h:53
+msgid "&Quit"
+msgstr "&Gorffen"
 
-#: kdecore/sonnet/loader.cpp:228
-#, kde-format
-msgctxt "dictionary name. %1-language and %2-variant name"
-msgid "%1 [%2]"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:255
+msgid "Quit application"
+msgstr "Gadael y cymhwysiant"
 
-#: kdecore/services/kmimetype.cpp:58
-#, kde-format
-msgid "Could not find mime type <resource>%2</resource>"
-msgid_plural ""
-"Could not find mime types:\n"
-"<resource>%2</resource>"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/util/kstandardguiitem.cpp:260
+msgid "&Reset"
+msgstr "A&ilosod"
 
-#: kdecore/services/kmimetype.cpp:126
-msgid ""
-"No mime types installed. Check that shared-mime-info is installed, and that "
-"XDG_DATA_DIRS is not set, or includes /usr/share."
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:261
+msgid "Reset configuration"
+msgstr "Ailodosd ffurfweddiad"
 
-#: kdecore/util/klibloader.cpp:98
-#, kde-format
-msgid "Library \"%1\" not found"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:266
+msgctxt "Verb"
+msgid "&Insert"
+msgstr "&Mewnosod"
 
-#: kdecore/util/klibloader.cpp:146
-msgid "No service matching the requirements was found."
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:271
+msgid "Confi&gure..."
+msgstr "Ffurf&weddu..."
 
-#: kdecore/util/klibloader.cpp:148
-msgid ""
-"The service provides no library, the Library key is missing in the .desktop "
-"file."
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:286
+msgid "Add"
+msgstr "Ychwanegu"
 
-#: kdecore/util/klibloader.cpp:152
-msgid "The library does not export a factory for creating components."
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:296
+msgid "Test"
+msgstr "Profi"
 
-#: kdecore/util/klibloader.cpp:154
-msgid ""
-"The factory does not support creating components of the specified type."
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:301
+msgid "Properties"
+msgstr "Priodweddau"
 
-#: kdecore/util/klibloader.cpp:156
-msgid "KLibLoader: Unknown error"
-msgstr ""
+#: kdeui/util/kstandardguiitem.cpp:306
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
 
-#: kdecore/util/kpluginloader.cpp:141 kdecore/util/kpluginloader.cpp:174
-#, kde-format
-msgid "Could not find plugin '%1' for application '%2'"
-msgstr ""
+#: kdeui/widgets/kactionselector.cpp:100
+msgid "&Available:"
+msgstr "&Ar gael:"
 
-#: kdecore/util/kpluginloader.cpp:160
-msgid "The provided service is not valid"
-msgstr ""
+#: kdeui/widgets/kactionselector.cpp:117
+msgid "&Selected:"
+msgstr "&Wedi'u dewis:"
 
-#: kdecore/util/kpluginloader.cpp:166
-#, kde-format
-msgid ""
-"The service '%1' provides no library or the Library key is missing in "
+#. i18n: Placeholder text in line edit widgets is the text appearing
+#. before any user input, briefly explaining to the user what to type
+#. (e.g. "Enter search pattern").
+#. By default the text is set in italic, which may not be appropriate
+#. for some languages and scripts (e.g. for CJK ideographs).
+#. i18n: Placeholder text in text edit widgets is the text appearing
+#. before any user input, briefly explaining to the user what to type
+#. (e.g. "Enter message").
+#. By default the text is set in italic, which may not be appropriate
+#. for some languages and scripts (e.g. for CJK ideographs).
+#: kdeui/widgets/klineedit.cpp:87 kdeui/widgets/ktextedit.cpp:79
+msgctxt "Italic placeholder text in line edits: 0 no, 1 yes"
+msgid "1"
 msgstr ""
 
-#: kdecore/util/kpluginloader.cpp:213
-#, kde-format
-msgid "The library %1 does not offer a KDE 4 compatible factory."
+#: kdeui/widgets/klineedit.cpp:296
+msgctxt "@action:button Clear current text in the line edit"
+msgid "Clear text"
 msgstr ""
 
-#: kdecore/util/kpluginloader.cpp:241
-#, kde-format
-msgid "The plugin '%1' uses an incompatible KDE library (%2)."
+#: kdeui/widgets/klineedit.cpp:1216
+msgctxt "@title:menu"
+msgid "Text Completion"
 msgstr ""
 
-#: kdecore/util/kpluginloader.cpp:286
-#, kde-format
-msgid ""
-"The plugin '%1' or its library dependencies are not compatible with "
-"currently loaded libraries: %2"
+#: kdeui/widgets/klineedit.cpp:1223
+msgctxt "@item:inmenu Text Completion"
+msgid "None"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation.cpp:80
-msgid "Function must be called from the main thread."
+#: kdeui/widgets/klineedit.cpp:1224
+msgctxt "@item:inmenu Text Completion"
+msgid "Manual"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation.cpp:121
-#, kde-format
-msgid ""
-"Error launching %1. Either KLauncher is not running anymore, or it failed to "
-"start the application."
+#: kdeui/widgets/klineedit.cpp:1225
+msgctxt "@item:inmenu Text Completion"
+msgid "Automatic"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation.cpp:124
-#, kde-format
-msgid ""
-"KLauncher could not be reached via D-Bus. Error when calling %1:\n"
-"%2\n"
+#: kdeui/widgets/klineedit.cpp:1226
+msgctxt "@item:inmenu Text Completion"
+msgid "Dropdown List"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation.cpp:299
-#, kde-format
-msgid ""
-"Could not launch the KDE Help Center:\n"
-"\n"
-"%1"
+#: kdeui/widgets/klineedit.cpp:1227
+msgctxt "@item:inmenu Text Completion"
+msgid "Short Automatic"
 msgstr ""
-"Methodd gychwyn y Ganolfan Gymorth KDE :\n"
-"\n"
-"%1"
-
-#: kdecore/kernel/ktoolinvocation.cpp:300
-msgid "Could not Launch Help Center"
-msgstr "Methodd gychwyn Canolfan Gymorth"
 
-#: kdecore/kernel/ktoolinvocation_x11.cpp:253
-#, kde-format
-msgid ""
-"Could not launch the mail client:\n"
-"\n"
-"%1"
+#: kdeui/widgets/klineedit.cpp:1228
+msgctxt "@item:inmenu Text Completion"
+msgid "Dropdown List && Automatic"
 msgstr ""
-"Methodd gychwyn y dibynnydd ebost:\n"
-"\n"
-"%1"
 
-#: kdecore/kernel/ktoolinvocation_x11.cpp:281
-msgid "Could not launch Mail Client"
+#: kdeui/widgets/klineedit.cpp:1259
+msgctxt "@item:inmenu Text Completion"
+msgid "Default"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation_x11.cpp:302
-#: kdecore/kernel/ktoolinvocation_x11.cpp:328
-#, kde-format
-msgid ""
-"Could not launch the browser:\n"
-"\n"
-"%1"
+#: kdeui/widgets/ktimecombobox.cpp:259
+msgctxt "@info"
+msgid "The time you entered is invalid"
 msgstr ""
-"Methodd gychwyn y porydd:\n"
-"\n"
-"%1"
 
-#: kdecore/kernel/ktoolinvocation_x11.cpp:334
-#: kdecore/kernel/ktoolinvocation_x11.cpp:360
-msgid "Could not launch Browser"
+#: kdeui/widgets/ktimecombobox.cpp:262
+#, kde-format
+msgctxt "@info"
+msgid "Time cannot be earlier than %1"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation_x11.cpp:368
+#: kdeui/widgets/ktimecombobox.cpp:269
 #, kde-format
-msgid ""
-"Could not launch the terminal client:\n"
-"\n"
-"%1"
+msgctxt "@info"
+msgid "Time cannot be later than %1"
 msgstr ""
 
-#: kdecore/kernel/ktoolinvocation_x11.cpp:400
-msgid "Could not launch Terminal Client"
+#: kdeui/widgets/kcharselect-translation.cpp:23
+msgctxt "KCharSelect section name"
+msgid "European Alphabets"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:257
-msgid ""
-"No licensing terms for this program have been specified.\n"
-"Please check the documentation or the source for any\n"
-"licensing terms.\n"
+#: kdeui/widgets/kcharselect-translation.cpp:24
+msgctxt "KCharSelect section name"
+msgid "African Scripts"
 msgstr ""
-"Ni phenodwyd termau trwyddedu am y rhaglen yma.\n"
-"Gwiriwch y ddogfeniaeth neu'r côd am unrhyw dermau \n"
-"trwyddedu.\n"
-
-#: kdecore/kernel/kaboutdata.cpp:263
-#, kde-format
-msgid "This program is distributed under the terms of the %1."
-msgstr "Dosbarthir y rhaglen yma dan dermau'r %1."
 
-#: kdecore/kernel/kaboutdata.cpp:289
-msgctxt "@item license (short name)"
-msgid "GPL v2"
+#: kdeui/widgets/kcharselect-translation.cpp:25
+msgctxt "KCharSelect section name"
+msgid "Middle Eastern Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:290
-msgctxt "@item license"
-msgid "GNU General Public License Version 2"
+#: kdeui/widgets/kcharselect-translation.cpp:26
+msgctxt "KCharSelect section name"
+msgid "South Asian Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:293
-msgctxt "@item license (short name)"
-msgid "LGPL v2"
+#: kdeui/widgets/kcharselect-translation.cpp:27
+msgctxt "KCharSelect section name"
+msgid "Philippine Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:294
-msgctxt "@item license"
-msgid "GNU Lesser General Public License Version 2"
+#: kdeui/widgets/kcharselect-translation.cpp:28
+msgctxt "KCharSelect section name"
+msgid "South East Asian Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:297
-msgctxt "@item license (short name)"
-msgid "BSD License"
+#: kdeui/widgets/kcharselect-translation.cpp:29
+msgctxt "KCharSelect section name"
+msgid "East Asian Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:298
-msgctxt "@item license"
-msgid "BSD License"
+#: kdeui/widgets/kcharselect-translation.cpp:30
+msgctxt "KCharSelect section name"
+msgid "Central Asian Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:301
-msgctxt "@item license (short name)"
-msgid "Artistic License"
+#: kdeui/widgets/kcharselect-translation.cpp:31
+msgctxt "KCharSelect section name"
+msgid "Other Scripts"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:302
-msgctxt "@item license"
-msgid "Artistic License"
+#: kdeui/widgets/kcharselect-translation.cpp:32
+msgctxt "KCharSelect section name"
+msgid "Symbols"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:305
-msgctxt "@item license (short name)"
-msgid "QPL v1.0"
+#: kdeui/widgets/kcharselect-translation.cpp:33
+msgctxt "KCharSelect section name"
+msgid "Mathematical Symbols"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:306
-msgctxt "@item license"
-msgid "Q Public License"
+#: kdeui/widgets/kcharselect-translation.cpp:34
+msgctxt "KCharSelect section name"
+msgid "Phonetic Symbols"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:309
-msgctxt "@item license (short name)"
-msgid "GPL v3"
+#: kdeui/widgets/kcharselect-translation.cpp:35
+#: kdeui/widgets/kcharselectdata.cpp:613
+msgctxt "KCharSelect section name"
+msgid "Combining Diacritical Marks"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:310
-msgctxt "@item license"
-msgid "GNU General Public License Version 3"
+#: kdeui/widgets/kcharselect-translation.cpp:36
+msgctxt "KCharSelect section name"
+msgid "Other"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:313
-msgctxt "@item license (short name)"
-msgid "LGPL v3"
+#: kdeui/widgets/kcharselect-translation.cpp:37
+msgctxt "KCharselect unicode block name"
+msgid "Basic Latin"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:314
-msgctxt "@item license"
-msgid "GNU Lesser General Public License Version 3"
+#: kdeui/widgets/kcharselect-translation.cpp:38
+msgctxt "KCharselect unicode block name"
+msgid "Latin-1 Supplement"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:318
-msgctxt "@item license"
-msgid "Custom"
+#: kdeui/widgets/kcharselect-translation.cpp:39
+msgctxt "KCharselect unicode block name"
+msgid "Latin Extended-A"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:321
-msgctxt "@item license"
-msgid "Not specified"
+#: kdeui/widgets/kcharselect-translation.cpp:40
+msgctxt "KCharselect unicode block name"
+msgid "Latin Extended-B"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:873
-msgctxt "replace this with information about your translation team"
-msgid ""
-"<p>KDE is translated into many languages thanks to the work of the "
-"translation teams all over the world.</p><p>For more information on KDE "
-"internationalization visit <a "
-"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+#: kdeui/widgets/kcharselect-translation.cpp:41
+msgctxt "KCharselect unicode block name"
+msgid "IPA Extensions"
 msgstr ""
 
-#: kdecore/kernel/kaboutdata.cpp:877
-msgid ""
-"<p>Kubuntu includes additions and alterations to the KDE translation from <a "
-"href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"
+#: kdeui/widgets/kcharselect-translation.cpp:42
+msgctxt "KCharselect unicode block name"
+msgid "Spacing Modifier Letters"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:276
-msgid "Use the X-server display 'displayname'"
-msgstr "Defnyddio'r arddangosydd gweinydd-X 'displayname'"
-
-#: kdecore/kernel/kcmdlineargs.cpp:278
-msgid "Use the QWS display 'displayname'"
-msgstr "Defnyddio'r arddangosydd QWS 'displayname'"
-
-#: kdecore/kernel/kcmdlineargs.cpp:281
-msgid "Restore the application for the given 'sessionId'"
-msgstr "Adfer y cymhwysiad ar gyfer y 'sessionId' a rhoddwyd"
-
-#: kdecore/kernel/kcmdlineargs.cpp:282
-msgid ""
-"Causes the application to install a private color\n"
-"map on an 8-bit display"
+#: kdeui/widgets/kcharselect-translation.cpp:43
+msgctxt "KCharselect unicode block name"
+msgid "Combining Diacritical Marks"
 msgstr ""
-"Achosi i'r cymhwysiad arsefydlu map lliw\n"
-" preifat ar arddangosydd 8-did"
 
-#: kdecore/kernel/kcmdlineargs.cpp:283
-msgid ""
-"Limits the number of colors allocated in the color\n"
-"cube on an 8-bit display, if the application is\n"
-"using the QApplication::ManyColor color\n"
-"specification"
+#: kdeui/widgets/kcharselect-translation.cpp:44
+msgctxt "KCharselect unicode block name"
+msgid "Greek and Coptic"
 msgstr ""
-"Cyfyngu'r nifer o liwiau a dyrannir yn y ciwb\n"
-" lliw ar arddangosydd 8-did, os mae'r cymhwysiad\n"
-" yn defnyddio y penodiad QApplication::ManyColor"
-
-#: kdecore/kernel/kcmdlineargs.cpp:284
-msgid "tells Qt to never grab the mouse or the keyboard"
-msgstr "Dweud wrth QT na ddylai fyth dwyn y llygoden na'r bysellfwrdd"
 
-#: kdecore/kernel/kcmdlineargs.cpp:285
-msgid ""
-"running under a debugger can cause an implicit\n"
-"-nograb, use -dograb to override"
+#: kdeui/widgets/kcharselect-translation.cpp:45
+msgctxt "KCharselect unicode block name"
+msgid "Cyrillic"
 msgstr ""
-"gall redeg dan ddadnamydd achosi -nograb\n"
-"ymhlyg, defnyddiwch -dograb i'w anwybyddu"
-
-#: kdecore/kernel/kcmdlineargs.cpp:286
-msgid "switches to synchronous mode for debugging"
-msgstr "newid i fodd cydamseredig i ddadnamu"
-
-#: kdecore/kernel/kcmdlineargs.cpp:288
-msgid "defines the application font"
-msgstr "diffinio wynebfath y cymhwysiad"
 
-#: kdecore/kernel/kcmdlineargs.cpp:290
-msgid ""
-"sets the default background color and an\n"
-"application palette (light and dark shades are\n"
-"calculated)"
+#: kdeui/widgets/kcharselect-translation.cpp:46
+msgctxt "KCharselect unicode block name"
+msgid "Cyrillic Supplement"
 msgstr ""
-"gosod y lliw cefndir rhagosodol a\n"
-"palêt cymhwysiad (mae cysgodau\n"
-" golau a tywyll yn cael eu cyfrifo)"
-
-#: kdecore/kernel/kcmdlineargs.cpp:292
-msgid "sets the default foreground color"
-msgstr "Gosod y lliw blaendir rhagosodol"
-
-#: kdecore/kernel/kcmdlineargs.cpp:294
-msgid "sets the default button color"
-msgstr "Gosod y lliw botwm rhagosodol"
-
-#: kdecore/kernel/kcmdlineargs.cpp:295
-msgid "sets the application name"
-msgstr "gosod enw'r cymhwysiad"
-
-#: kdecore/kernel/kcmdlineargs.cpp:296
-msgid "sets the application title (caption)"
-msgstr "gosod teitl y cymhwysiad (egluryn)"
 
-#: kdecore/kernel/kcmdlineargs.cpp:298
-msgid ""
-"forces the application to use a TrueColor visual on\n"
-"an 8-bit display"
+#: kdeui/widgets/kcharselect-translation.cpp:47
+msgctxt "KCharselect unicode block name"
+msgid "Armenian"
 msgstr ""
-"gorfod i'r cymhwysiad ddefnydio \n"
-" gwelediad WirLiw ar arddangosydd 8-did"
 
-#: kdecore/kernel/kcmdlineargs.cpp:299
-msgid ""
-"sets XIM (X Input Method) input style. Possible\n"
-"values are onthespot, overthespot, offthespot and\n"
-"root"
+#: kdeui/widgets/kcharselect-translation.cpp:48
+msgctxt "KCharselect unicode block name"
+msgid "Hebrew"
 msgstr ""
-"gosod arddull fewnbwn XIM (X Input Method). Gwerthoedd\n"
-"posib yw onthespot, overthespot, offthespot a root"
-
-#: kdecore/kernel/kcmdlineargs.cpp:300
-msgid "set XIM server"
-msgstr "gosod gweinydd XIM"
-
-#: kdecore/kernel/kcmdlineargs.cpp:301
-msgid "disable XIM"
-msgstr "analluogi XIM"
-
-#: kdecore/kernel/kcmdlineargs.cpp:304
-msgid "forces the application to run as QWS Server"
-msgstr "gorfod i'r cymhwysiad redeg fel Gweinydd QWS"
-
-#: kdecore/kernel/kcmdlineargs.cpp:306
-msgid "mirrors the whole layout of widgets"
-msgstr "adlewyrchu gosodiad cyfan y celfigion"
 
-#: kdecore/kernel/kcmdlineargs.cpp:307
-msgid "applies the Qt stylesheet to the application widgets"
+#: kdeui/widgets/kcharselect-translation.cpp:49
+msgctxt "KCharselect unicode block name"
+msgid "Arabic"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:308
-msgid ""
-"use a different graphics system instead of the default one, options are "
-"raster and opengl (experimental)"
+#: kdeui/widgets/kcharselect-translation.cpp:50
+msgctxt "KCharselect unicode block name"
+msgid "Syriac"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:310
-msgid "Use 'caption' as name in the titlebar"
-msgstr "defnyddio 'egluryn' fel enw yn y bar-teitl"
-
-#: kdecore/kernel/kcmdlineargs.cpp:311
-msgid "Use 'icon' as the application icon"
-msgstr "defnyddio 'eicon' fel eicon y cymhwysiad"
+#: kdeui/widgets/kcharselect-translation.cpp:51
+msgctxt "KCharselect unicode block name"
+msgid "Arabic Supplement"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:312
-msgid "Use alternative configuration file"
-msgstr "defnyddio ffeil ffurfweddiad arall"
+#: kdeui/widgets/kcharselect-translation.cpp:52
+msgctxt "KCharselect unicode block name"
+msgid "Thaana"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:313
-msgid "Disable crash handler, to get core dumps"
-msgstr "analluogi'r trinydd chwalfa, er mwyn cael dadlwythiadau craidd"
+#: kdeui/widgets/kcharselect-translation.cpp:53
+msgctxt "KCharselect unicode block name"
+msgid "NKo"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:315
-msgid "Waits for a WM_NET compatible windowmanager"
-msgstr "aros am reolydd ffenestri sy'n gyfaddas i WM_NET"
+#: kdeui/widgets/kcharselect-translation.cpp:54
+msgctxt "KCharselect unicode block name"
+msgid "Samaritan"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:317
-msgid "sets the application GUI style"
-msgstr "gosod arddull GUI y cymhwysiad"
+#: kdeui/widgets/kcharselect-translation.cpp:55
+msgctxt "KCharselect unicode block name"
+msgid "Mandaic"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:318
-msgid ""
-"sets the client geometry of the main widget - see man X for the argument "
-"format (usually WidthxHeight+XPos+YPos)"
+#: kdeui/widgets/kcharselect-translation.cpp:56
+msgctxt "KCharselect unicode block name"
+msgid "Devanagari"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:436
-msgid "KDE Application"
+#: kdeui/widgets/kcharselect-translation.cpp:57
+msgctxt "KCharselect unicode block name"
+msgid "Bengali"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:495
-msgid "Qt"
+#: kdeui/widgets/kcharselect-translation.cpp:58
+msgctxt "KCharselect unicode block name"
+msgid "Gurmukhi"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:801 kdecore/kernel/kcmdlineargs.cpp:817
-#, kde-format
-msgid "Unknown option '%1'."
-msgstr "Dewis anhysbys '%1'."
-
-#: kdecore/kernel/kcmdlineargs.cpp:825
-#, kde-format
-msgctxt "@info:shell %1 is cmdoption name"
-msgid "'%1' missing."
+#: kdeui/widgets/kcharselect-translation.cpp:59
+msgctxt "KCharselect unicode block name"
+msgid "Gujarati"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:892
-#, kde-format
-msgctxt ""
-"@info:shell message on appcmd --version; do not translate 'Development "
-"Platform'%3 application name, other %n version strings"
-msgid ""
-"Qt: %1\n"
-"KDE Development Platform: %2\n"
-"%3: %4\n"
+#: kdeui/widgets/kcharselect-translation.cpp:60
+msgctxt "KCharselect unicode block name"
+msgid "Oriya"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:917
-#, kde-format
-msgctxt "the 2nd argument is a list of name+address, one on each line"
-msgid ""
-"%1 was written by\n"
-"%2"
+#: kdeui/widgets/kcharselect-translation.cpp:61
+msgctxt "KCharselect unicode block name"
+msgid "Tamil"
 msgstr ""
-"ysgrifennwyd %1 gan\n"
-"%2"
 
-#: kdecore/kernel/kcmdlineargs.cpp:920
-msgid ""
-"This application was written by somebody who wants to remain anonymous."
+#: kdeui/widgets/kcharselect-translation.cpp:62
+msgctxt "KCharselect unicode block name"
+msgid "Telugu"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:927
-msgid "Please use http://bugs.kde.org to report bugs.\n"
+#: kdeui/widgets/kcharselect-translation.cpp:63
+msgctxt "KCharselect unicode block name"
+msgid "Kannada"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:929
-#, kde-format
-msgid "Please report bugs to %1.\n"
+#: kdeui/widgets/kcharselect-translation.cpp:64
+msgctxt "KCharselect unicode block name"
+msgid "Malayalam"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:954
-#, kde-format
-msgid "Unexpected argument '%1'."
-msgstr "Ymresymiad annisgwyl '%1'."
-
-#: kdecore/kernel/kcmdlineargs.cpp:1071
-msgid "Use --help to get a list of available command line options."
-msgstr "Defnyddiwch --help i gael rhestr o ddewisiadau llinell gorchymyn."
-
-#: kdecore/kernel/kcmdlineargs.cpp:1094
-msgid "[options] "
-msgstr "[dewisiadau] "
-
-#: kdecore/kernel/kcmdlineargs.cpp:1101
-#, kde-format
-msgid "[%1-options]"
-msgstr "[%1-dewisiadau]"
-
-#: kdecore/kernel/kcmdlineargs.cpp:1122
-#, kde-format
-msgid "Usage: %1 %2\n"
-msgstr "Defnyddir: %1 %2\n"
-
-#: kdecore/kernel/kcmdlineargs.cpp:1125
-msgid ""
-"\n"
-"Generic options:\n"
+#: kdeui/widgets/kcharselect-translation.cpp:65
+msgctxt "KCharselect unicode block name"
+msgid "Sinhala"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1127
-msgid "Show help about options"
-msgstr "Dangos cymorth am ddewisiadau"
+#: kdeui/widgets/kcharselect-translation.cpp:66
+msgctxt "KCharselect unicode block name"
+msgid "Thai"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1135
-#, kde-format
-msgid "Show %1 specific options"
-msgstr "Dangos %1 dewisiadau penodol"
+#: kdeui/widgets/kcharselect-translation.cpp:67
+msgctxt "KCharselect unicode block name"
+msgid "Lao"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1142
-msgid "Show all options"
-msgstr "Dangos y dewisiadau i gyd"
+#: kdeui/widgets/kcharselect-translation.cpp:68
+msgctxt "KCharselect unicode block name"
+msgid "Tibetan"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1143
-msgid "Show author information"
-msgstr "Dangos gwybodaeth awdur"
+#: kdeui/widgets/kcharselect-translation.cpp:69
+msgctxt "KCharselect unicode block name"
+msgid "Myanmar"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1144
-msgid "Show version information"
-msgstr "Dangos gwybodaeth fersiwn"
+#: kdeui/widgets/kcharselect-translation.cpp:70
+msgctxt "KCharselect unicode block name"
+msgid "Georgian"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1145
-msgid "Show license information"
-msgstr "Dangos gwybodaeth trwydded"
+#: kdeui/widgets/kcharselect-translation.cpp:71
+msgctxt "KCharselect unicode block name"
+msgid "Hangul Jamo"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1146
-msgid "End of options"
-msgstr "Diwedd y dewisiadau"
+#: kdeui/widgets/kcharselect-translation.cpp:72
+msgctxt "KCharselect unicode block name"
+msgid "Ethiopic"
+msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1167
-#, kde-format
-msgid ""
-"\n"
-"%1 options:\n"
+#: kdeui/widgets/kcharselect-translation.cpp:73
+msgctxt "KCharselect unicode block name"
+msgid "Ethiopic Supplement"
 msgstr ""
 
-#: kdecore/kernel/kcmdlineargs.cpp:1169
-msgid ""
-"\n"
-"Options:\n"
+#: kdeui/widgets/kcharselect-translation.cpp:74
+msgctxt "KCharselect unicode block name"
+msgid "Cherokee"
 msgstr ""
-"\n"
-"Dewisiadau:\n"
 
-#: kdecore/kernel/kcmdlineargs.cpp:1227
-msgid ""
-"\n"
-"Arguments:\n"
+#: kdeui/widgets/kcharselect-translation.cpp:75
+msgctxt "KCharselect unicode block name"
+msgid "Unified Canadian Aboriginal Syllabics"
 msgstr ""
-"\n"
-"Ymresymiadau:\n"
 
-#: kdecore/kernel/kcmdlineargs.cpp:1583
-msgid "The files/URLs opened by the application will be deleted after use"
+#: kdeui/widgets/kcharselect-translation.cpp:76
+msgctxt "KCharselect unicode block name"
+msgid "Ogham"
 msgstr ""
-"Bydd y ffeiliau/URLau a agorir gan y cymhwysiad yn cael eiu dileu wedi'u "
-"defnyddio"
 
-#: kdecore/kernel/kcmdlineargs.cpp:1584
-msgid "KDE-tempfile"
+#: kdeui/widgets/kcharselect-translation.cpp:77
+msgctxt "KCharselect unicode block name"
+msgid "Runic"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:155
-#: kdecore/localization/kencodingprober.cpp:242
-#: kdecore/localization/kencodingprober.cpp:301
-#: kdecore/localization/kencodingdetector.cpp:1149
-#: kdecore/localization/kencodingdetector.cpp:1232
-msgctxt "@item Text character set"
-msgid "Western European"
+#: kdeui/widgets/kcharselect-translation.cpp:78
+msgctxt "KCharselect unicode block name"
+msgid "Tagalog"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:161
-#: kdecore/localization/kencodingprober.cpp:244
-#: kdecore/localization/kencodingprober.cpp:283
-#: kdecore/localization/kencodingdetector.cpp:1151
-#: kdecore/localization/kencodingdetector.cpp:1214
-msgctxt "@item Text character set"
-msgid "Central European"
+#: kdeui/widgets/kcharselect-translation.cpp:79
+msgctxt "KCharselect unicode block name"
+msgid "Hanunoo"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:164
-#: kdecore/localization/kencodingprober.cpp:254
-#: kdecore/localization/kencodingprober.cpp:280
-#: kdecore/localization/kencodingdetector.cpp:1161
-#: kdecore/localization/kencodingdetector.cpp:1211
-msgctxt "@item Text character set"
-msgid "Baltic"
+#: kdeui/widgets/kcharselect-translation.cpp:80
+msgctxt "KCharselect unicode block name"
+msgid "Buhid"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:167
-msgctxt "@item Text character set"
-msgid "South-Eastern Europe"
+#: kdeui/widgets/kcharselect-translation.cpp:81
+msgctxt "KCharselect unicode block name"
+msgid "Tagbanwa"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:170
-#: kdecore/localization/kencodingprober.cpp:250
-#: kdecore/localization/kencodingprober.cpp:298
-#: kdecore/localization/kencodingdetector.cpp:1157
-#: kdecore/localization/kencodingdetector.cpp:1229
-msgctxt "@item Text character set"
-msgid "Turkish"
+#: kdeui/widgets/kcharselect-translation.cpp:82
+msgctxt "KCharselect unicode block name"
+msgid "Khmer"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:173
-#: kdecore/localization/kencodingprober.cpp:240
-#: kdecore/localization/kencodingprober.cpp:286
-#: kdecore/localization/kencodingdetector.cpp:1147
-#: kdecore/localization/kencodingdetector.cpp:1217
-msgctxt "@item Text character set"
-msgid "Cyrillic"
+#: kdeui/widgets/kcharselect-translation.cpp:83
+msgctxt "KCharselect unicode block name"
+msgid "Mongolian"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:179
-#: kdecore/localization/kencodingprober.cpp:256
-#: kdecore/localization/kencodingprober.cpp:304
-#: kdecore/localization/kencodingdetector.cpp:1235
-msgctxt "@item Text character set"
-msgid "Chinese Traditional"
+#: kdeui/widgets/kcharselect-translation.cpp:84
+msgctxt "KCharselect unicode block name"
+msgid "Unified Canadian Aboriginal Syllabics Extended"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:182
-#: kdecore/localization/kencodingprober.cpp:258
-#: kdecore/localization/kencodingprober.cpp:307
-#: kdecore/localization/kencodingdetector.cpp:1238
-msgctxt "@item Text character set"
-msgid "Chinese Simplified"
+#: kdeui/widgets/kcharselect-translation.cpp:85
+msgctxt "KCharselect unicode block name"
+msgid "Limbu"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:186
-#: kdecore/localization/kencodingprober.cpp:310
-#: kdecore/localization/kencodingdetector.cpp:1241
-msgctxt "@item Text character set"
-msgid "Korean"
+#: kdeui/widgets/kcharselect-translation.cpp:86
+msgctxt "KCharselect unicode block name"
+msgid "Tai Le"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:188
-#: kdecore/localization/kencodingprober.cpp:252
-#: kdecore/localization/kencodingprober.cpp:295
-#: kdecore/localization/kencodingdetector.cpp:1159
-#: kdecore/localization/kencodingdetector.cpp:1226
-msgctxt "@item Text character set"
-msgid "Japanese"
+#: kdeui/widgets/kcharselect-translation.cpp:87
+msgctxt "KCharselect unicode block name"
+msgid "New Tai Lue"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:192
-#: kdecore/localization/kencodingprober.cpp:246
-#: kdecore/localization/kencodingprober.cpp:289
-#: kdecore/localization/kencodingdetector.cpp:1153
-#: kdecore/localization/kencodingdetector.cpp:1220
-msgctxt "@item Text character set"
-msgid "Greek"
+#: kdeui/widgets/kcharselect-translation.cpp:88
+msgctxt "KCharselect unicode block name"
+msgid "Khmer Symbols"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:195
-#: kdecore/localization/kencodingprober.cpp:260
-#: kdecore/localization/kencodingprober.cpp:277
-#: kdecore/localization/kencodingdetector.cpp:1163
-#: kdecore/localization/kencodingdetector.cpp:1208
-msgctxt "@item Text character set"
-msgid "Arabic"
+#: kdeui/widgets/kcharselect-translation.cpp:89
+msgctxt "KCharselect unicode block name"
+msgid "Buginese"
+msgstr ""
+
+#: kdeui/widgets/kcharselect-translation.cpp:90
+msgctxt "KCharselect unicode block name"
+msgid "Tai Tham"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:198
-#: kdecore/localization/kencodingprober.cpp:248
-#: kdecore/localization/kencodingprober.cpp:292
-#: kdecore/localization/kencodingdetector.cpp:1155
-#: kdecore/localization/kencodingdetector.cpp:1223
-msgctxt "@item Text character set"
-msgid "Hebrew"
+#: kdeui/widgets/kcharselect-translation.cpp:91
+msgctxt "KCharselect unicode block name"
+msgid "Balinese"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:203
-#: kdecore/localization/kencodingprober.cpp:313
-#: kdecore/localization/kencodingdetector.cpp:1244
-msgctxt "@item Text character set"
-msgid "Thai"
+#: kdeui/widgets/kcharselect-translation.cpp:92
+msgctxt "KCharselect unicode block name"
+msgid "Sundanese"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:206
-#: kdecore/localization/kencodingprober.cpp:238
-#: kdecore/localization/kencodingprober.cpp:316
-#: kdecore/localization/kencodingdetector.cpp:1145
-#: kdecore/localization/kencodingdetector.cpp:1247
-msgctxt "@item Text character set"
-msgid "Unicode"
+#: kdeui/widgets/kcharselect-translation.cpp:93
+msgctxt "KCharselect unicode block name"
+msgid "Batak"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:212
-msgctxt "@item Text character set"
-msgid "Northern Saami"
+#: kdeui/widgets/kcharselect-translation.cpp:94
+msgctxt "KCharselect unicode block name"
+msgid "Lepcha"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:214
-#: kdecore/localization/kcharsets.cpp:651
-msgctxt "@item Text character set"
-msgid "Other"
+#: kdeui/widgets/kcharselect-translation.cpp:95
+msgctxt "KCharselect unicode block name"
+msgid "Ol Chiki"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:660
-#, kde-format
-msgctxt "@item %1 character set, %2 encoding"
-msgid "%1 ( %2 )"
+#: kdeui/widgets/kcharselect-translation.cpp:96
+msgctxt "KCharselect unicode block name"
+msgid "Vedic Extensions"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:663
-#, kde-format
-msgctxt "@item"
-msgid "Other encoding (%1)"
+#: kdeui/widgets/kcharselect-translation.cpp:97
+msgctxt "KCharselect unicode block name"
+msgid "Phonetic Extensions"
 msgstr ""
 
-#: kdecore/localization/kcharsets.cpp:689
-#, kde-format
-msgctxt "@item Text encoding: %1 character set, %2 encoding"
-msgid "%1 ( %2 )"
+#: kdeui/widgets/kcharselect-translation.cpp:98
+msgctxt "KCharselect unicode block name"
+msgid "Phonetic Extensions Supplement"
 msgstr ""
 
-#: kdecore/localization/kencodingprober.cpp:234
-#: kdecore/localization/kencodingprober.cpp:271
-msgctxt "@item Text character set"
-msgid "Disabled"
+#: kdeui/widgets/kcharselect-translation.cpp:99
+msgctxt "KCharselect unicode block name"
+msgid "Combining Diacritical Marks Supplement"
 msgstr ""
 
-#: kdecore/localization/kencodingprober.cpp:236
-#: kdecore/localization/kencodingprober.cpp:274
-msgctxt "@item Text character set"
-msgid "Universal"
+#: kdeui/widgets/kcharselect-translation.cpp:100
+msgctxt "KCharselect unicode block name"
+msgid "Latin Extended Additional"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1032
-msgctxt "digit set"
-msgid "Arabic-Indic"
+#: kdeui/widgets/kcharselect-translation.cpp:101
+msgctxt "KCharselect unicode block name"
+msgid "Greek Extended"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1089
-msgctxt "digit set"
-msgid "Bengali"
+#: kdeui/widgets/kcharselect-translation.cpp:102
+msgctxt "KCharselect unicode block name"
+msgid "General Punctuation"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1092
-msgctxt "digit set"
-msgid "Devanagari"
+#: kdeui/widgets/kcharselect-translation.cpp:103
+msgctxt "KCharselect unicode block name"
+msgid "Superscripts and Subscripts"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1035
-msgctxt "digit set"
-msgid "Eastern Arabic-Indic"
+#: kdeui/widgets/kcharselect-translation.cpp:104
+msgctxt "KCharselect unicode block name"
+msgid "Currency Symbols"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1098
-msgctxt "digit set"
-msgid "Gujarati"
+#: kdeui/widgets/kcharselect-translation.cpp:105
+msgctxt "KCharselect unicode block name"
+msgid "Combining Diacritical Marks for Symbols"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1101
-msgctxt "digit set"
-msgid "Gurmukhi"
+#: kdeui/widgets/kcharselect-translation.cpp:106
+msgctxt "KCharselect unicode block name"
+msgid "Letterlike Symbols"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1104
-msgctxt "digit set"
-msgid "Kannada"
+#: kdeui/widgets/kcharselect-translation.cpp:107
+msgctxt "KCharselect unicode block name"
+msgid "Number Forms"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1107
-msgctxt "digit set"
-msgid "Khmer"
+#: kdeui/widgets/kcharselect-translation.cpp:108
+msgctxt "KCharselect unicode block name"
+msgid "Arrows"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1110
-msgctxt "digit set"
-msgid "Malayalam"
+#: kdeui/widgets/kcharselect-translation.cpp:109
+msgctxt "KCharselect unicode block name"
+msgid "Mathematical Operators"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1113
-msgctxt "digit set"
-msgid "Oriya"
+#: kdeui/widgets/kcharselect-translation.cpp:110
+msgctxt "KCharselect unicode block name"
+msgid "Miscellaneous Technical"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1116
-msgctxt "digit set"
-msgid "Tamil"
+#: kdeui/widgets/kcharselect-translation.cpp:111
+msgctxt "KCharselect unicode block name"
+msgid "Control Pictures"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1119
-msgctxt "digit set"
-msgid "Telugu"
+#: kdeui/widgets/kcharselect-translation.cpp:112
+msgctxt "KCharselect unicode block name"
+msgid "Optical Character Recognition"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:1122
-msgctxt "digit set"
-msgid "Thai"
+#: kdeui/widgets/kcharselect-translation.cpp:113
+msgctxt "KCharselect unicode block name"
+msgid "Enclosed Alphanumerics"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1041
-msgctxt "digit set"
-msgid "Arabic"
+#: kdeui/widgets/kcharselect-translation.cpp:114
+msgctxt "KCharselect unicode block name"
+msgid "Box Drawing"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1046
-#, kde-format
-msgctxt "name of digit set with digit string, e.g. 'Arabic (0123456789)'"
-msgid "%1 (%2)"
+#: kdeui/widgets/kcharselect-translation.cpp:115
+msgctxt "KCharselect unicode block name"
+msgid "Block Elements"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1459
-#, kde-format
-msgctxt "size in bytes"
-msgid "%1 B"
+#: kdeui/widgets/kcharselect-translation.cpp:116
+msgctxt "KCharselect unicode block name"
+msgid "Geometric Shapes"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1464
-#, kde-format
-msgctxt "size in 1000 bytes"
-msgid "%1 kB"
+#: kdeui/widgets/kcharselect-translation.cpp:117
+msgctxt "KCharselect unicode block name"
+msgid "Miscellaneous Symbols"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1466
-#, kde-format
-msgctxt "size in 10^6 bytes"
-msgid "%1 MB"
+#: kdeui/widgets/kcharselect-translation.cpp:118
+msgctxt "KCharselect unicode block name"
+msgid "Dingbats"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1468
-#, kde-format
-msgctxt "size in 10^9 bytes"
-msgid "%1 GB"
+#: kdeui/widgets/kcharselect-translation.cpp:119
+msgctxt "KCharselect unicode block name"
+msgid "Miscellaneous Mathematical Symbols-A"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1470
-#, kde-format
-msgctxt "size in 10^12 bytes"
-msgid "%1 TB"
+#: kdeui/widgets/kcharselect-translation.cpp:120
+msgctxt "KCharselect unicode block name"
+msgid "Supplemental Arrows-A"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1472
-#, kde-format
-msgctxt "size in 10^15 bytes"
-msgid "%1 PB"
+#: kdeui/widgets/kcharselect-translation.cpp:121
+msgctxt "KCharselect unicode block name"
+msgid "Braille Patterns"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1474
-#, kde-format
-msgctxt "size in 10^18 bytes"
-msgid "%1 EB"
+#: kdeui/widgets/kcharselect-translation.cpp:122
+msgctxt "KCharselect unicode block name"
+msgid "Supplemental Arrows-B"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1476
-#, kde-format
-msgctxt "size in 10^21 bytes"
-msgid "%1 ZB"
+#: kdeui/widgets/kcharselect-translation.cpp:123
+msgctxt "KCharselect unicode block name"
+msgid "Miscellaneous Mathematical Symbols-B"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1478
-#, kde-format
-msgctxt "size in 10^24 bytes"
-msgid "%1 YB"
+#: kdeui/widgets/kcharselect-translation.cpp:124
+msgctxt "KCharselect unicode block name"
+msgid "Supplemental Mathematical Operators"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1483
-#, kde-format
-msgctxt "memory size in 1024 bytes"
-msgid "%1 KB"
+#: kdeui/widgets/kcharselect-translation.cpp:125
+msgctxt "KCharselect unicode block name"
+msgid "Miscellaneous Symbols and Arrows"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1485
-#, kde-format
-msgctxt "memory size in 2^20 bytes"
-msgid "%1 MB"
+#: kdeui/widgets/kcharselect-translation.cpp:126
+msgctxt "KCharselect unicode block name"
+msgid "Glagolitic"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1487
-#, kde-format
-msgctxt "memory size in 2^30 bytes"
-msgid "%1 GB"
+#: kdeui/widgets/kcharselect-translation.cpp:127
+msgctxt "KCharselect unicode block name"
+msgid "Latin Extended-C"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1489
-#, kde-format
-msgctxt "memory size in 2^40 bytes"
-msgid "%1 TB"
+#: kdeui/widgets/kcharselect-translation.cpp:128
+msgctxt "KCharselect unicode block name"
+msgid "Coptic"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1575
-#, kde-format
-msgctxt "memory size in 2^50 bytes"
-msgid "%1 PB"
+#: kdeui/widgets/kcharselect-translation.cpp:129
+msgctxt "KCharselect unicode block name"
+msgid "Georgian Supplement"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1577
-#, kde-format
-msgctxt "memory size in 2^60 bytes"
-msgid "%1 EB"
+#: kdeui/widgets/kcharselect-translation.cpp:130
+msgctxt "KCharselect unicode block name"
+msgid "Tifinagh"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1579
-#, kde-format
-msgctxt "memory size in 2^70 bytes"
-msgid "%1 ZB"
+#: kdeui/widgets/kcharselect-translation.cpp:131
+msgctxt "KCharselect unicode block name"
+msgid "Ethiopic Extended"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1581
-#, kde-format
-msgctxt "memory size in 2^80 bytes"
-msgid "%1 YB"
+#: kdeui/widgets/kcharselect-translation.cpp:132
+msgctxt "KCharselect unicode block name"
+msgid "Cyrillic Extended-A"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1503
-#, kde-format
-msgctxt "size in 1024 bytes"
-msgid "%1 KiB"
+#: kdeui/widgets/kcharselect-translation.cpp:133
+msgctxt "KCharselect unicode block name"
+msgid "Supplemental Punctuation"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1505
-#, kde-format
-msgctxt "size in 2^20 bytes"
-msgid "%1 MiB"
+#: kdeui/widgets/kcharselect-translation.cpp:134
+msgctxt "KCharselect unicode block name"
+msgid "CJK Radicals Supplement"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1507
-#, kde-format
-msgctxt "size in 2^30 bytes"
-msgid "%1 GiB"
+#: kdeui/widgets/kcharselect-translation.cpp:135
+msgctxt "KCharselect unicode block name"
+msgid "Kangxi Radicals"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale.cpp:1509
-#, kde-format
-msgctxt "size in 2^40 bytes"
-msgid "%1 TiB"
+#: kdeui/widgets/kcharselect-translation.cpp:136
+msgctxt "KCharselect unicode block name"
+msgid "Ideographic Description Characters"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1595
-#, kde-format
-msgctxt "size in 2^50 bytes"
-msgid "%1 PiB"
+#: kdeui/widgets/kcharselect-translation.cpp:137
+msgctxt "KCharselect unicode block name"
+msgid "CJK Symbols and Punctuation"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1597
-#, kde-format
-msgctxt "size in 2^60 bytes"
-msgid "%1 EiB"
+#: kdeui/widgets/kcharselect-translation.cpp:138
+msgctxt "KCharselect unicode block name"
+msgid "Hiragana"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1599
-#, kde-format
-msgctxt "size in 2^70 bytes"
-msgid "%1 ZiB"
+#: kdeui/widgets/kcharselect-translation.cpp:139
+msgctxt "KCharselect unicode block name"
+msgid "Katakana"
 msgstr ""
 
-#. i18n: Dumb message, avoid any markup or scripting.
-#: kdecore/localization/klocale_kde.cpp:1601
-#, kde-format
-msgctxt "size in 2^80 bytes"
-msgid "%1 YiB"
+#: kdeui/widgets/kcharselect-translation.cpp:140
+msgctxt "KCharselect unicode block name"
+msgid "Bopomofo"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1603
-#, kde-format
-msgctxt "@item:intext %1 is a real number, e.g. 1.23 days"
-msgid "%1 days"
+#: kdeui/widgets/kcharselect-translation.cpp:141
+msgctxt "KCharselect unicode block name"
+msgid "Hangul Compatibility Jamo"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1606
-#, kde-format
-msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours"
-msgid "%1 hours"
+#: kdeui/widgets/kcharselect-translation.cpp:142
+msgctxt "KCharselect unicode block name"
+msgid "Kanbun"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1609
-#, kde-format
-msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes"
-msgid "%1 minutes"
+#: kdeui/widgets/kcharselect-translation.cpp:143
+msgctxt "KCharselect unicode block name"
+msgid "Bopomofo Extended"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1612
-#, kde-format
-msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds"
-msgid "%1 seconds"
+#: kdeui/widgets/kcharselect-translation.cpp:144
+msgctxt "KCharselect unicode block name"
+msgid "CJK Strokes"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1615
-#, kde-format
-msgctxt "@item:intext"
-msgid "%1 millisecond"
-msgid_plural "%1 milliseconds"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselect-translation.cpp:145
+msgctxt "KCharselect unicode block name"
+msgid "Katakana Phonetic Extensions"
+msgstr ""
 
-#: kdecore/localization/klocale.cpp:1622
-#, kde-format
-msgctxt "@item:intext"
-msgid "1 day"
-msgid_plural "%1 days"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselect-translation.cpp:146
+msgctxt "KCharselect unicode block name"
+msgid "Enclosed CJK Letters and Months"
+msgstr ""
 
-#: kdecore/localization/klocale.cpp:1624
-#, kde-format
-msgctxt "@item:intext"
-msgid "1 hour"
-msgid_plural "%1 hours"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselect-translation.cpp:147
+msgctxt "KCharselect unicode block name"
+msgid "CJK Compatibility"
+msgstr ""
 
-#: kdecore/localization/klocale.cpp:1626
-#, kde-format
-msgctxt "@item:intext"
-msgid "1 minute"
-msgid_plural "%1 minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselect-translation.cpp:148
+msgctxt "KCharselect unicode block name"
+msgid "CJK Unified Ideographs Extension A"
+msgstr ""
 
-#: kdecore/localization/klocale.cpp:1628
-#, kde-format
-msgctxt "@item:intext"
-msgid "1 second"
-msgid_plural "%1 seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselect-translation.cpp:149
+msgctxt "KCharselect unicode block name"
+msgid "Yijing Hexagram Symbols"
+msgstr ""
 
-#: kdecore/localization/klocale.cpp:1652
-#, kde-format
-msgctxt ""
-"@item:intext days and hours. This uses the previous item:intext messages. If "
-"this does not fit the grammar of your language please contact the i18n team "
-"to solve the problem"
-msgid "%1 and %2"
+#: kdeui/widgets/kcharselect-translation.cpp:150
+msgctxt "KCharselect unicode block name"
+msgid "CJK Unified Ideographs"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1658
-#, kde-format
-msgctxt ""
-"@item:intext hours and minutes. This uses the previous item:intext messages. "
-"If this does not fit the grammar of your language please contact the i18n "
-"team to solve the problem"
-msgid "%1 and %2"
+#: kdeui/widgets/kcharselect-translation.cpp:151
+msgctxt "KCharselect unicode block name"
+msgid "Yi Syllables"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:1665
-#, kde-format
-msgctxt ""
-"@item:intext minutes and seconds. This uses the previous item:intext "
-"messages. If this does not fit the grammar of your language please contact "
-"the i18n team to solve the problem"
-msgid "%1 and %2"
+#: kdeui/widgets/kcharselect-translation.cpp:152
+msgctxt "KCharselect unicode block name"
+msgid "Yi Radicals"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:2332
-msgctxt "Before Noon KLocale::LongName"
-msgid "Ante Meridiem"
+#: kdeui/widgets/kcharselect-translation.cpp:153
+msgctxt "KCharselect unicode block name"
+msgid "Lisu"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:2333
-msgctxt "Before Noon KLocale::ShortName"
-msgid "AM"
+#: kdeui/widgets/kcharselect-translation.cpp:154
+msgctxt "KCharselect unicode block name"
+msgid "Vai"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:2334
-msgctxt "Before Noon KLocale::NarrowName"
-msgid "A"
+#: kdeui/widgets/kcharselect-translation.cpp:155
+msgctxt "KCharselect unicode block name"
+msgid "Cyrillic Extended-B"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:2337
-msgctxt "After Noon KLocale::LongName"
-msgid "Post Meridiem"
+#: kdeui/widgets/kcharselect-translation.cpp:156
+msgctxt "KCharselect unicode block name"
+msgid "Bamum"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:2338
-msgctxt "After Noon KLocale::ShortName"
-msgid "PM"
+#: kdeui/widgets/kcharselect-translation.cpp:157
+msgctxt "KCharselect unicode block name"
+msgid "Modifier Tone Letters"
 msgstr ""
 
-#: kdecore/localization/klocale_kde.cpp:2339
-msgctxt "After Noon KLocale::NarrowName"
-msgid "P"
+#: kdeui/widgets/kcharselect-translation.cpp:158
+msgctxt "KCharselect unicode block name"
+msgid "Latin Extended-D"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:2241
-msgid "Yesterday"
+#: kdeui/widgets/kcharselect-translation.cpp:159
+msgctxt "KCharselect unicode block name"
+msgid "Syloti Nagri"
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:2257
-#, kde-format
-msgctxt "concatenation of dates and time"
-msgid "%1 %2"
-msgstr "%1 %2"
+#: kdeui/widgets/kcharselect-translation.cpp:160
+msgctxt "KCharselect unicode block name"
+msgid "Common Indic Number Forms"
+msgstr ""
 
-#: kdecore/localization/klocale.cpp:2297
-#, kde-format
-msgctxt "concatenation of date/time and time zone"
-msgid "%1 %2"
+#: kdeui/widgets/kcharselect-translation.cpp:161
+msgctxt "KCharselect unicode block name"
+msgid "Phags-pa"
 msgstr ""
 
-#. i18n: The following messages, with msgctxt "@tag/modifier",
-#. are KUIT patterns for formatting the text found inside semantic tags.
-#. For review of the KUIT semantic markup, see the article on Techbase:
-#. http://techbase.kde.org/Development/Tutorials/Localization/i18n_Semantics
-#. The "/modifier" tells if the pattern is used for plain text, or rich text
-#. which can use HTML tags.
-#. You may be in general satisfied with the patterns as they are in the
-#. original. Some things you may think about changing:
-#. - the proper quotes, those used in msgid are English-standard
-#. - the <i> and <b> tags, does your language script work well with them?
-#: kdecore/localization/kuitsemantics.cpp:527
-#, kde-format
-msgctxt "@title/plain"
-msgid "== %1 =="
+#: kdeui/widgets/kcharselect-translation.cpp:162
+msgctxt "KCharselect unicode block name"
+msgid "Saurashtra"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:531
-#, kde-format
-msgctxt "@title/rich"
-msgid "<h2>%1</h2>"
+#: kdeui/widgets/kcharselect-translation.cpp:163
+msgctxt "KCharselect unicode block name"
+msgid "Devanagari Extended"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:537
-#, kde-format
-msgctxt "@subtitle/plain"
-msgid "~ %1 ~"
+#: kdeui/widgets/kcharselect-translation.cpp:164
+msgctxt "KCharselect unicode block name"
+msgid "Kayah Li"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:541
-#, kde-format
-msgctxt "@subtitle/rich"
-msgid "<h3>%1</h3>"
+#: kdeui/widgets/kcharselect-translation.cpp:165
+msgctxt "KCharselect unicode block name"
+msgid "Rejang"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:567
-#, kde-format
-msgctxt "@item/plain"
-msgid "  * %1"
+#: kdeui/widgets/kcharselect-translation.cpp:166
+msgctxt "KCharselect unicode block name"
+msgid "Hangul Jamo Extended-A"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:571
-#, kde-format
-msgctxt "@item/rich"
-msgid "<li>%1</li>"
+#: kdeui/widgets/kcharselect-translation.cpp:167
+msgctxt "KCharselect unicode block name"
+msgid "Javanese"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:577
-#, kde-format
-msgctxt "@note/plain"
-msgid "Note: %1"
+#: kdeui/widgets/kcharselect-translation.cpp:168
+msgctxt "KCharselect unicode block name"
+msgid "Cham"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:581
-#, kde-format
-msgctxt "@note/rich"
-msgid "<i>Note</i>: %1"
+#: kdeui/widgets/kcharselect-translation.cpp:169
+msgctxt "KCharselect unicode block name"
+msgid "Myanmar Extended-A"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:586
-#, kde-format
-msgctxt ""
-"@note-with-label/plain\n"
-"%1 is the note label, %2 is the text"
-msgid "%1: %2"
+#: kdeui/widgets/kcharselect-translation.cpp:170
+msgctxt "KCharselect unicode block name"
+msgid "Tai Viet"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:591
-#, kde-format
-msgctxt ""
-"@note-with-label/rich\n"
-"%1 is the note label, %2 is the text"
-msgid "<i>%1</i>: %2"
+#: kdeui/widgets/kcharselect-translation.cpp:171
+msgctxt "KCharselect unicode block name"
+msgid "Ethiopic Extended-A"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:597
-#, kde-format
-msgctxt "@warning/plain"
-msgid "WARNING: %1"
+#: kdeui/widgets/kcharselect-translation.cpp:172
+msgctxt "KCharselect unicode block name"
+msgid "Meetei Mayek"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:601
-#, kde-format
-msgctxt "@warning/rich"
-msgid "<b>Warning</b>: %1"
+#: kdeui/widgets/kcharselect-translation.cpp:173
+msgctxt "KCharselect unicode block name"
+msgid "Hangul Syllables"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:606
-#, kde-format
-msgctxt ""
-"@warning-with-label/plain\n"
-"%1 is the warning label, %2 is the text"
-msgid "%1: %2"
+#: kdeui/widgets/kcharselect-translation.cpp:174
+msgctxt "KCharselect unicode block name"
+msgid "Hangul Jamo Extended-B"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:611
-#, kde-format
-msgctxt ""
-"@warning-with-label/rich\n"
-"%1 is the warning label, %2 is the text"
-msgid "<b>%1</b>: %2"
+#: kdeui/widgets/kcharselect-translation.cpp:175
+msgctxt "KCharselect unicode block name"
+msgid "High Surrogates"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:626
-#, kde-format
-msgctxt ""
-"@link-with-description/plain\n"
-"%1 is the URL, %2 is the descriptive text"
-msgid "%2 (%1)"
+#: kdeui/widgets/kcharselect-translation.cpp:176
+msgctxt "KCharselect unicode block name"
+msgid "High Private Use Surrogates"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:631
-#, kde-format
-msgctxt ""
-"@link-with-description/rich\n"
-"%1 is the URL, %2 is the descriptive text"
-msgid "<a href=\"%1\">%2</a>"
+#: kdeui/widgets/kcharselect-translation.cpp:177
+msgctxt "KCharselect unicode block name"
+msgid "Low Surrogates"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:637
-#, kde-format
-msgctxt "@filename/plain"
-msgid "‘%1’"
+#: kdeui/widgets/kcharselect-translation.cpp:178
+msgctxt "KCharselect unicode block name"
+msgid "Private Use Area"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:641
-#, kde-format
-msgctxt "@filename/rich"
-msgid "<tt>%1</tt>"
+#: kdeui/widgets/kcharselect-translation.cpp:179
+msgctxt "KCharselect unicode block name"
+msgid "CJK Compatibility Ideographs"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:647
-#, kde-format
-msgctxt "@application/plain"
-msgid "%1"
+#: kdeui/widgets/kcharselect-translation.cpp:180
+msgctxt "KCharselect unicode block name"
+msgid "Alphabetic Presentation Forms"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:651
-#, kde-format
-msgctxt "@application/rich"
-msgid "%1"
+#: kdeui/widgets/kcharselect-translation.cpp:181
+msgctxt "KCharselect unicode block name"
+msgid "Arabic Presentation Forms-A"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:657
-#, kde-format
-msgctxt "@command/plain"
-msgid "%1"
+#: kdeui/widgets/kcharselect-translation.cpp:182
+msgctxt "KCharselect unicode block name"
+msgid "Variation Selectors"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:661
-#, kde-format
-msgctxt "@command/rich"
-msgid "<tt>%1</tt>"
+#: kdeui/widgets/kcharselect-translation.cpp:183
+msgctxt "KCharselect unicode block name"
+msgid "Vertical Forms"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:666
-#, kde-format
-msgctxt ""
-"@command-with-section/plain\n"
-"%1 is the command name, %2 is its man section"
-msgid "%1(%2)"
+#: kdeui/widgets/kcharselect-translation.cpp:184
+msgctxt "KCharselect unicode block name"
+msgid "Combining Half Marks"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:671
-#, kde-format
-msgctxt ""
-"@command-with-section/rich\n"
-"%1 is the command name, %2 is its man section"
-msgid "<tt>%1(%2)</tt>"
+#: kdeui/widgets/kcharselect-translation.cpp:185
+msgctxt "KCharselect unicode block name"
+msgid "CJK Compatibility Forms"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:677
-#, kde-format
-msgctxt "@resource/plain"
-msgid "“%1”"
+#: kdeui/widgets/kcharselect-translation.cpp:186
+msgctxt "KCharselect unicode block name"
+msgid "Small Form Variants"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:681
-#, kde-format
-msgctxt "@resource/rich"
-msgid "“%1”"
+#: kdeui/widgets/kcharselect-translation.cpp:187
+msgctxt "KCharselect unicode block name"
+msgid "Arabic Presentation Forms-B"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:687
-#, kde-format
-msgctxt "@icode/plain"
-msgid "“%1”"
+#: kdeui/widgets/kcharselect-translation.cpp:188
+msgctxt "KCharselect unicode block name"
+msgid "Halfwidth and Fullwidth Forms"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:691
-#, kde-format
-msgctxt "@icode/rich"
-msgid "<tt>%1</tt>"
+#: kdeui/widgets/kcharselect-translation.cpp:189
+msgctxt "KCharselect unicode block name"
+msgid "Specials"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:707
-#, kde-format
-msgctxt "@shortcut/plain"
-msgid "%1"
+#: kdeui/widgets/keditlistwidget.cpp:305 kdeui/widgets/keditlistbox.cpp:326
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#: kdeui/widgets/keditlistwidget.cpp:317 kdeui/widgets/keditlistbox.cpp:338
+msgid "&Remove"
+msgstr "&Tynnu ymaith"
+
+#: kdeui/widgets/keditlistwidget.cpp:329 kdeui/widgets/keditlistbox.cpp:350
+msgid "Move &Up"
+msgstr "Sym&ud i fyny"
+
+#: kdeui/widgets/keditlistwidget.cpp:334 kdeui/widgets/keditlistbox.cpp:355
+msgid "Move &Down"
+msgstr "Symu&d i lawr"
+
+#: kdeui/widgets/krichtextwidget.cpp:232
+msgctxt "@action"
+msgid "Text &Color..."
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:711
-#, kde-format
-msgctxt "@shortcut/rich"
-msgid "<b>%1</b>"
+#: kdeui/widgets/krichtextwidget.cpp:233
+msgctxt "@label stroke color"
+msgid "Color"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:717
-#, kde-format
-msgctxt "@interface/plain"
-msgid "|%1|"
+#: kdeui/widgets/krichtextwidget.cpp:244
+msgctxt "@action"
+msgid "Text &Highlight..."
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:721
-#, kde-format
-msgctxt "@interface/rich"
-msgid "<i>%1</i>"
+#: kdeui/widgets/krichtextwidget.cpp:255
+msgctxt "@action"
+msgid "&Font"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:727
-#, kde-format
-msgctxt "@emphasis/plain"
-msgid "*%1*"
+#: kdeui/widgets/krichtextwidget.cpp:266
+msgctxt "@action"
+msgid "Font &Size"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:731
-#, kde-format
-msgctxt "@emphasis/rich"
-msgid "<i>%1</i>"
+#: kdeui/widgets/krichtextwidget.cpp:276
+msgctxt "@action boldify selected text"
+msgid "&Bold"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:735
-#, kde-format
-msgctxt "@emphasis-strong/plain"
-msgid "**%1**"
+#: kdeui/widgets/krichtextwidget.cpp:290
+msgctxt "@action italicize selected text"
+msgid "&Italic"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:739
-#, kde-format
-msgctxt "@emphasis-strong/rich"
-msgid "<b>%1</b>"
+#: kdeui/widgets/krichtextwidget.cpp:305
+msgctxt "@action underline selected text"
+msgid "&Underline"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:745
-#, kde-format
-msgctxt "@placeholder/plain"
-msgid "&lt;%1&gt;"
+#: kdeui/widgets/krichtextwidget.cpp:320
+msgctxt "@action"
+msgid "&Strike Out"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:749
-#, kde-format
-msgctxt "@placeholder/rich"
-msgid "&lt;<i>%1</i>&gt;"
+#: kdeui/widgets/krichtextwidget.cpp:333
+msgctxt "@action"
+msgid "Align &Left"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:755
-#, kde-format
-msgctxt "@email/plain"
-msgid "&lt;%1&gt;"
+#: kdeui/widgets/krichtextwidget.cpp:334
+msgctxt "@label left justify"
+msgid "Left"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:759
-#, kde-format
-msgctxt "@email/rich"
-msgid "&lt;<a href=\"mailto:%1\">%1</a>&gt;"
+#: kdeui/widgets/krichtextwidget.cpp:340
+msgctxt "@action"
+msgid "Align &Center"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:764
-#, kde-format
-msgctxt ""
-"@email-with-name/plain\n"
-"%1 is name, %2 is address"
-msgid "%1 &lt;%2&gt;"
+#: kdeui/widgets/krichtextwidget.cpp:341
+msgctxt "@label center justify"
+msgid "Center"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:769
-#, kde-format
-msgctxt ""
-"@email-with-name/rich\n"
-"%1 is name, %2 is address"
-msgid "<a href=\"mailto:%2\">%1</a>"
+#: kdeui/widgets/krichtextwidget.cpp:347
+msgctxt "@action"
+msgid "Align &Right"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:775
-#, kde-format
-msgctxt "@envar/plain"
-msgid "$%1"
+#: kdeui/widgets/krichtextwidget.cpp:348
+msgctxt "@label right justify"
+msgid "Right"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:779
-#, kde-format
-msgctxt "@envar/rich"
-msgid "<tt>$%1</tt>"
+#: kdeui/widgets/krichtextwidget.cpp:354
+msgctxt "@action"
+msgid "&Justify"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:785
-#, kde-format
-msgctxt "@message/plain"
-msgid "/%1/"
+#: kdeui/widgets/krichtextwidget.cpp:355
+msgctxt "@label justify fill"
+msgid "Justify"
 msgstr ""
 
-#. i18n: KUIT pattern, see the comment to the first of these entries above.
-#: kdecore/localization/kuitsemantics.cpp:789
-#, kde-format
-msgctxt "@message/rich"
-msgid "<i>%1</i>"
+#: kdeui/widgets/krichtextwidget.cpp:380
+msgctxt "@action"
+msgid "Left-to-Right"
 msgstr ""
 
-#. i18n: Decide which string is used to delimit keys in a keyboard
-#. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text.
-#: kdecore/localization/kuitsemantics.cpp:810
-msgctxt "shortcut-key-delimiter/plain"
-msgid "+"
+#: kdeui/widgets/krichtextwidget.cpp:381
+msgctxt "@label left-to-right"
+msgid "Left-to-Right"
 msgstr ""
 
-#. i18n: Decide which string is used to delimit keys in a keyboard
-#. shortcut (e.g. + in Ctrl+Alt+Tab) in rich text.
-#: kdecore/localization/kuitsemantics.cpp:814
-msgctxt "shortcut-key-delimiter/rich"
-msgid "+"
+#: kdeui/widgets/krichtextwidget.cpp:387
+msgctxt "@action"
+msgid "Right-to-Left"
 msgstr ""
 
-#. i18n: Decide which string is used to delimit elements in a GUI path
-#. (e.g. -> in "Go to Settings->Advanced->Core tab.") in plain text.
-#: kdecore/localization/kuitsemantics.cpp:818
-msgctxt "gui-path-delimiter/plain"
-msgid "→"
+#: kdeui/widgets/krichtextwidget.cpp:388
+msgctxt "@label right-to-left"
+msgid "Right-to-Left"
 msgstr ""
 
-#. i18n: Decide which string is used to delimit elements in a GUI path
-#. (e.g. -> in "Go to Settings->Advanced->Core tab.") in rich text.
-#: kdecore/localization/kuitsemantics.cpp:822
-msgctxt "gui-path-delimiter/rich"
-msgid "→"
+#: kdeui/widgets/krichtextwidget.cpp:406
+msgctxt "@title:menu"
+msgid "List Style"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:837
-msgctxt "keyboard-key-name"
-msgid "Alt"
+#: kdeui/widgets/krichtextwidget.cpp:408
+msgctxt "@item:inmenu no list style"
+msgid "None"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:838
-msgctxt "keyboard-key-name"
-msgid "AltGr"
+#: kdeui/widgets/krichtextwidget.cpp:409
+msgctxt "@item:inmenu disc list style"
+msgid "Disc"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:839
-msgctxt "keyboard-key-name"
-msgid "Backspace"
+#: kdeui/widgets/krichtextwidget.cpp:410
+msgctxt "@item:inmenu circle list style"
+msgid "Circle"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:840
-msgctxt "keyboard-key-name"
-msgid "CapsLock"
+#: kdeui/widgets/krichtextwidget.cpp:411
+msgctxt "@item:inmenu square list style"
+msgid "Square"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:841
-msgctxt "keyboard-key-name"
-msgid "Control"
+#: kdeui/widgets/krichtextwidget.cpp:412
+msgctxt "@item:inmenu numbered lists"
+msgid "123"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:842
-msgctxt "keyboard-key-name"
-msgid "Ctrl"
+#: kdeui/widgets/krichtextwidget.cpp:413
+msgctxt "@item:inmenu lowercase abc lists"
+msgid "abc"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:843
-msgctxt "keyboard-key-name"
-msgid "Del"
+#: kdeui/widgets/krichtextwidget.cpp:414
+msgctxt "@item:inmenu uppercase abc lists"
+msgid "ABC"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:844
-msgctxt "keyboard-key-name"
-msgid "Delete"
+#: kdeui/widgets/krichtextwidget.cpp:430
+msgctxt "@action"
+msgid "Increase Indent"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:845
-msgctxt "keyboard-key-name"
-msgid "Down"
+#: kdeui/widgets/krichtextwidget.cpp:443
+msgctxt "@action"
+msgid "Decrease Indent"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:846
-msgctxt "keyboard-key-name"
-msgid "End"
+#: kdeui/widgets/krichtextwidget.cpp:456
+msgctxt "@action"
+msgid "Insert Rule Line"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:847
-msgctxt "keyboard-key-name"
-msgid "Enter"
+#: kdeui/widgets/krichtextwidget.cpp:467
+msgctxt "@action"
+msgid "Link"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:848
-msgctxt "keyboard-key-name"
-msgid "Esc"
+#: kdeui/widgets/krichtextwidget.cpp:478
+msgctxt "@action"
+msgid "Format Painter"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:849
-msgctxt "keyboard-key-name"
-msgid "Escape"
+#: kdeui/widgets/krichtextwidget.cpp:489
+msgctxt "@action"
+msgid "To Plain Text"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:850
-msgctxt "keyboard-key-name"
-msgid "Home"
+#: kdeui/widgets/krichtextwidget.cpp:500
+msgctxt "@action"
+msgid "Subscript"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:851
-msgctxt "keyboard-key-name"
-msgid "Hyper"
+#: kdeui/widgets/krichtextwidget.cpp:507
+msgctxt "@action"
+msgid "Superscript"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:852
-msgctxt "keyboard-key-name"
-msgid "Ins"
+#: kdeui/widgets/ktoolbar.cpp:292
+msgctxt "@title:menu"
+msgid "Show Text"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:853
-msgctxt "keyboard-key-name"
-msgid "Insert"
+#: kdeui/widgets/ktoolbar.cpp:295
+msgctxt "@title:menu"
+msgid "Toolbar Settings"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:854
-msgctxt "keyboard-key-name"
+#: kdeui/widgets/ktoolbar.cpp:297
+msgid "Orientation"
+msgstr "Gogwydd"
+
+#: kdeui/widgets/ktoolbar.cpp:299
+msgctxt "toolbar position string"
+msgid "Top"
+msgstr "Top"
+
+#: kdeui/widgets/ktoolbar.cpp:301
+msgctxt "toolbar position string"
 msgid "Left"
+msgstr "Chwith"
+
+#: kdeui/widgets/ktoolbar.cpp:302
+msgctxt "toolbar position string"
+msgid "Right"
+msgstr "De"
+
+#: kdeui/widgets/ktoolbar.cpp:303
+msgctxt "toolbar position string"
+msgid "Bottom"
+msgstr "Gwaelod"
+
+#: kdeui/widgets/ktoolbar.cpp:311
+msgid "Text Position"
+msgstr "Lleoliad Testun"
+
+#: kdeui/widgets/ktoolbar.cpp:313
+msgid "Icons Only"
+msgstr "Eiconau yn Unig"
+
+#: kdeui/widgets/ktoolbar.cpp:314
+msgid "Text Only"
+msgstr "Testun yn Unig"
+
+#: kdeui/widgets/ktoolbar.cpp:315
+msgid "Text Alongside Icons"
+msgstr "Testun wrth Ochr Eiconau"
+
+#: kdeui/widgets/ktoolbar.cpp:316
+msgid "Text Under Icons"
+msgstr "Testun dan Eiconau"
+
+#: kdeui/widgets/ktoolbar.cpp:324
+msgid "Icon Size"
+msgstr "Maint Eicon"
+
+#: kdeui/widgets/ktoolbar.cpp:326
+msgctxt "@item:inmenu Icon size"
+msgid "Default"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:855
-msgctxt "keyboard-key-name"
-msgid "Menu"
+#: kdeui/widgets/ktoolbar.cpp:343 kdeui/widgets/ktoolbar.cpp:363
+#, kde-format
+msgid "Small (%1x%2)"
+msgstr "Bach (%1x%2)"
+
+#: kdeui/widgets/ktoolbar.cpp:345 kdeui/widgets/ktoolbar.cpp:365
+#, kde-format
+msgid "Medium (%1x%2)"
+msgstr "Canol (%1x%2)"
+
+#: kdeui/widgets/ktoolbar.cpp:347 kdeui/widgets/ktoolbar.cpp:367
+#, kde-format
+msgid "Large (%1x%2)"
+msgstr "Mawr (%1x%2)"
+
+#: kdeui/widgets/ktoolbar.cpp:349 kdeui/widgets/ktoolbar.cpp:369
+#, kde-format
+msgid "Huge (%1x%2)"
+msgstr "Enfawr (%1x%2)"
+
+#: kdeui/widgets/ktoolbar.cpp:389
+msgid "Lock Toolbar Positions"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:856
-msgctxt "keyboard-key-name"
-msgid "Meta"
+#: kdeui/widgets/ktoolbar.cpp:1321
+#, kde-format
+msgctxt "@action:intoolbar Text label of toolbar button"
+msgid "%1"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:857
-msgctxt "keyboard-key-name"
-msgid "NumLock"
+#: kdeui/widgets/ktoolbar.cpp:1322
+#, kde-format
+msgctxt "@info:tooltip Tooltip of toolbar button"
+msgid "%1"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:858
-msgctxt "keyboard-key-name"
-msgid "PageDown"
+#: kdeui/widgets/kdatecombobox.cpp:149
+msgctxt "@option next year"
+msgid "Next Year"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:859
-msgctxt "keyboard-key-name"
-msgid "PageUp"
+#: kdeui/widgets/kdatecombobox.cpp:150
+msgctxt "@option next month"
+msgid "Next Month"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:860
-msgctxt "keyboard-key-name"
-msgid "PgDown"
+#: kdeui/widgets/kdatecombobox.cpp:151
+msgctxt "@option next week"
+msgid "Next Week"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:861
-msgctxt "keyboard-key-name"
-msgid "PgUp"
+#: kdeui/widgets/kdatecombobox.cpp:152
+msgctxt "@option tomorrow"
+msgid "Tomorrow"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:862
-msgctxt "keyboard-key-name"
-msgid "PauseBreak"
+#: kdeui/widgets/kdatecombobox.cpp:153
+msgctxt "@option today"
+msgid "Today"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:863
-msgctxt "keyboard-key-name"
-msgid "PrintScreen"
+#: kdeui/widgets/kdatecombobox.cpp:154
+msgctxt "@option yesterday"
+msgid "Yesterday"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:864
-msgctxt "keyboard-key-name"
-msgid "PrtScr"
+#: kdeui/widgets/kdatecombobox.cpp:155
+msgctxt "@option last week"
+msgid "Last Week"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:865
-msgctxt "keyboard-key-name"
-msgid "Return"
+#: kdeui/widgets/kdatecombobox.cpp:156
+msgctxt "@option last month"
+msgid "Last Month"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:866
-msgctxt "keyboard-key-name"
-msgid "Right"
+#: kdeui/widgets/kdatecombobox.cpp:157
+msgctxt "@option last year"
+msgid "Last Year"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:867
-msgctxt "keyboard-key-name"
-msgid "ScrollLock"
+#: kdeui/widgets/kdatecombobox.cpp:159
+msgctxt "@option do not specify a date"
+msgid "No Date"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:868
-msgctxt "keyboard-key-name"
-msgid "Shift"
+#: kdeui/widgets/kdatecombobox.cpp:255
+msgctxt "@info"
+msgid "The date you entered is invalid"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:869
-msgctxt "keyboard-key-name"
-msgid "Space"
+#: kdeui/widgets/kdatecombobox.cpp:258
+#, kde-format
+msgctxt "@info"
+msgid "Date cannot be earlier than %1"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:870
-msgctxt "keyboard-key-name"
-msgid "Super"
+#: kdeui/widgets/kdatecombobox.cpp:265
+#, kde-format
+msgctxt "@info"
+msgid "Date cannot be later than %1"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:871
-msgctxt "keyboard-key-name"
-msgid "SysReq"
+#: kdeui/widgets/ktimezonewidget.cpp:66
+msgctxt "Define an area in the time zone, like a town area"
+msgid "Area"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:872
-msgctxt "keyboard-key-name"
-msgid "Tab"
+#: kdeui/widgets/ktimezonewidget.cpp:66
+msgctxt "Time zone"
+msgid "Region"
 msgstr ""
 
-#: kdecore/localization/kuitsemantics.cpp:873
-msgctxt "keyboard-key-name"
-msgid "Up"
-msgstr ""
+#: kdeui/widgets/ktimezonewidget.cpp:66
+msgid "Comment"
+msgstr "Esboniad"
 
-#: kdecore/localization/kuitsemantics.cpp:874
-msgctxt "keyboard-key-name"
-msgid "Win"
+#: kdeui/widgets/khistorycombobox.cpp:177 khtml/rendering/render_form.cpp:933
+msgid "Clear &History"
+msgstr "Gwaredu &Hanes"
+
+#: kdeui/widgets/khistorycombobox.cpp:327
+msgid "No further items in the history."
 msgstr ""
 
-#. i18n: Pattern for the function keys.
-#: kdecore/localization/kuitsemantics.cpp:878
+#: kdeui/widgets/kkeysequencewidget.cpp:128
 #, kde-format
-msgctxt "keyboard-key-name"
-msgid "F%1"
+msgid "Shortcut '%1' in Application %2 for action %3\n"
 msgstr ""
 
-#: kdecore/sycoca/kmemfile.cpp:73 kdecore/sycoca/kmemfile.cpp:154
+#: kdeui/widgets/kkeysequencewidget.cpp:138
 #, kde-format
-msgid "File %1 does not exist"
-msgstr ""
+msgctxt ""
+"%1 is the number of conflicts (hidden), %2 is the key sequence of the "
+"shortcut that is problematic"
+msgid "The shortcut '%2' conflicts with the following key combination:\n"
+msgid_plural ""
+"The shortcut '%2' conflicts with the following key combinations:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/widgets/kkeysequencewidget.cpp:144
+msgctxt "%1 is the number of shortcuts with which there is a conflict"
+msgid "Conflict with Registered Global Shortcut"
+msgid_plural "Conflict with Registered Global Shortcuts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/widgets/kkeysequencewidget.cpp:216
+msgctxt "%1 is the number of conflicts"
+msgid "Shortcut Conflict"
+msgid_plural "Shortcut Conflicts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdecore/sycoca/kmemfile.cpp:78
+#: kdeui/widgets/kkeysequencewidget.cpp:220
 #, kde-format
-msgid "Cannot open %1 for reading"
+msgid "Shortcut '%1' for action '%2'\n"
 msgstr ""
 
-#: kdecore/sycoca/kmemfile.cpp:88 kdecore/sycoca/kmemfile.cpp:167
+#: kdeui/widgets/kkeysequencewidget.cpp:225
 #, kde-format
-msgid "Cannot create memory segment for file %1"
+msgctxt "%1 is the number of ambigious shortcut clashes (hidden)"
+msgid ""
+"The \"%2\" shortcut is ambiguous with the following shortcut.\n"
+"Do you want to assign an empty shortcut to this action?\n"
+"%3"
+msgid_plural ""
+"The \"%2\" shortcut is ambiguous with the following shortcuts.\n"
+"Do you want to assign an empty shortcut to these actions?\n"
+"%3"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kdeui/widgets/kkeysequencewidget.cpp:243
+msgid "Shortcut conflict"
 msgstr ""
 
-#: kdecore/sycoca/kmemfile.cpp:98
+#: kdeui/widgets/kkeysequencewidget.cpp:244
 #, kde-format
-msgid "Could not read data from %1 into shm"
+msgid ""
+"<qt>The '%1' key combination is already used by the <b>%2</b> "
+"action.<br>Please select a different one.</qt>"
 msgstr ""
 
-#: kdecore/sycoca/kmemfile.cpp:149
-msgid "Only 'ReadOnly' allowed"
+#: kdeui/widgets/kkeysequencewidget.cpp:276
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr ""
 
-#: kdecore/sycoca/kmemfile.cpp:205
-msgid "Cannot seek past eof"
+#: kdeui/widgets/kkeysequencewidget.cpp:485
+msgid "Reserved Shortcut"
 msgstr ""
 
-#: kjsembed/kjsembed/kjsembed.cpp:273 kjsembed/kjsembed/kjsembed.cpp:295
-#, kde-format
-msgid "%1 is not a function and cannot be called."
+#: kdeui/widgets/kkeysequencewidget.cpp:486
+msgid ""
+"The F12 key is reserved on Windows, so cannot be used for a global "
+"shortcut.\n"
+"Please choose another one."
 msgstr ""
 
-#: kjsembed/kjsembed/slotproxy.cpp:115
+#: kdeui/widgets/kkeysequencewidget.cpp:626
+msgid "Conflict with Standard Application Shortcut"
+msgstr "Croestyniad efo Byrlwybr Cymhwysiad Arferol"
+
+#: kdeui/widgets/kkeysequencewidget.cpp:627
 #, kde-format
-msgid "Bad slot handler: Object %1 Identifier %2 Method %3 Signature: %4."
+msgid ""
+"The '%1' key combination is also used for the standard action \"%2\" that "
+"some applications use.\n"
+"Do you really want to use it as a global shortcut as well?"
 msgstr ""
 
-#: kjsembed/kjsembed/slotproxy.cpp:140
-#, kde-format
-msgid "Exception calling '%1' slot from %2:%3:%4"
+#: kdeui/widgets/kkeysequencewidget.cpp:659
+msgctxt "What the user inputs now will be taken as the new shortcut"
+msgid "Input"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:53
-msgid "Not enough arguments."
+#: kdeui/widgets/kkeysequencewidget.cpp:709
+msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:70
-msgid "Failed to create Action."
+#: kdeui/widgets/kkeysequencewidget.cpp:710
+msgid "Unsupported Key"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:81
-msgid "Failed to create ActionGroup."
+#: kdeui/widgets/kdatepicker.cpp:174
+#, kde-format
+msgid "Week %1"
+msgstr "Wythnos %1"
+
+#: kdeui/widgets/kdatepicker.cpp:278
+msgid "Next year"
+msgstr "Blwyddyn nesaf"
+
+#: kdeui/widgets/kdatepicker.cpp:279
+msgid "Previous year"
+msgstr "Blwyddyn cynt"
+
+#: kdeui/widgets/kdatepicker.cpp:280
+msgid "Next month"
+msgstr "Mis nesaf"
+
+#: kdeui/widgets/kdatepicker.cpp:281
+msgid "Previous month"
+msgstr "Mis cynt"
+
+#: kdeui/widgets/kdatepicker.cpp:282
+msgid "Select a week"
+msgstr "Dewiswch wythnos"
+
+#: kdeui/widgets/kdatepicker.cpp:283
+msgid "Select a month"
+msgstr "Dewiswch mis"
+
+#: kdeui/widgets/kdatepicker.cpp:284
+msgid "Select a year"
+msgstr "Dewiswch blwyddyn"
+
+#: kdeui/widgets/kdatepicker.cpp:285
+msgid "Select the current day"
+msgstr "Dewis y diwrnod cyfredol"
+
+#: kdeui/widgets/ktextedit.cpp:493 kde3support/kdeui/k3textedit.cpp:232
+msgid "Check Spelling..."
+msgstr "Gwirio Sillafu..."
+
+#: kdeui/widgets/ktextedit.cpp:496 kde3support/kdeui/k3textedit.cpp:238
+msgid "Auto Spell Check"
+msgstr "Hunan-wirio Sillafu"
+
+#: kdeui/widgets/ktextedit.cpp:500 kde3support/kdeui/k3textedit.cpp:242
+msgid "Allow Tabulations"
+msgstr "Gadael Tablyddion"
+
+#: kdeui/widgets/ktextedit.cpp:527
+msgid "Speak Text"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:88
-msgid "No classname specified"
+#: kdeui/widgets/ktextedit.cpp:542
+msgid "Starting Jovie Text-to-Speech Service Failed"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:95
-msgid "Failed to create Layout."
+#: kdeui/widgets/ktextedit.cpp:631
+#, kde-format
+msgid "No suggestions for %1"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:103
-msgid "No classname specified."
+#: kdeui/widgets/ktextedit.cpp:642
+msgid "Ignore"
+msgstr "Anwybyddu"
+
+#: kdeui/widgets/ktextedit.cpp:643
+msgid "Add to Dictionary"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:110
-msgid "Failed to create Widget."
+#: kdeui/widgets/ktextedit.cpp:788
+msgid "Nothing to spell check."
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:118
-#: kjsembed/kjsembed/qformbuilder_binding.cpp:70
-msgid "Must supply a filename."
+#: kdeui/widgets/kcmodule.cpp:182
+msgid "You will be asked to authenticate before saving"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:122
-#, kde-format
-msgid "Could not open file '%1': %2"
+#: kdeui/widgets/kcmodule.cpp:186
+msgid "You are not allowed to save the configuration"
 msgstr ""
 
-#: kjsembed/kjsembed/quiloader_binding.cpp:129
-#, kde-format
-msgid "Failed to load file '%1'"
+#: kdeui/widgets/kcharselectdata.cpp:242
+msgid "<Non Private Use High Surrogate>"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:119
-msgid "Wrong object type."
+#: kdeui/widgets/kcharselectdata.cpp:244
+msgid "<Private Use High Surrogate>"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:127
-msgid "First argument must be a QObject."
+#: kdeui/widgets/kcharselectdata.cpp:246
+msgid "<Low Surrogate>"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:164
-msgid "Incorrect number of arguments."
+#: kdeui/widgets/kcharselectdata.cpp:248
+msgid "<Private Use>"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:412
-#, kde-format
-msgid "The slot asked for %1 argument"
-msgid_plural "The slot asked for %1 arguments"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselectdata.cpp:278
+msgid "<not assigned>"
+msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:413
-#, kde-format
-msgid "but there is only %1 available"
-msgid_plural "but there are only %1 available"
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselectdata.cpp:622
+msgid "Non-printable"
+msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:414
-#, kde-format
-msgctxt ""
-"%1 is 'the slot asked for foo arguments', %2 is 'but there are only bar "
-"available'"
-msgid "%1, %2."
+#: kdeui/widgets/kcharselectdata.cpp:655
+msgid "Other, Control"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:613
-#, kde-format
-msgid "Failure to cast to %1 value from Type %2 (%3)"
+#: kdeui/widgets/kcharselectdata.cpp:656
+msgid "Other, Format"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:648
-#, kde-format
-msgid "No such method '%1'."
+#: kdeui/widgets/kcharselectdata.cpp:657
+msgid "Other, Not Assigned"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:677
-#, kde-format
-msgid "Call to method '%1' failed, unable to get argument %2: %3"
+#: kdeui/widgets/kcharselectdata.cpp:658
+msgid "Other, Private Use"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:720
-#, kde-format
-msgid "Call to '%1' failed."
+#: kdeui/widgets/kcharselectdata.cpp:659
+msgid "Other, Surrogate"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:785
-#: kjsembed/kjsembed/object_binding.h:219
-#, kde-format
-msgid "%1 is not an Object type"
+#: kdeui/widgets/kcharselectdata.cpp:660
+msgid "Letter, Lowercase"
 msgstr ""
 
-#: kjsembed/kjsembed/qobject_binding.cpp:791
-msgid "Could not construct value"
+#: kdeui/widgets/kcharselectdata.cpp:661
+msgid "Letter, Modifier"
 msgstr ""
 
-#: kjsembed/kjsembed/fileio.cpp:69
-#, kde-format
-msgid "Could not open file '%1'"
+#: kdeui/widgets/kcharselectdata.cpp:662
+msgid "Letter, Other"
 msgstr ""
 
-#: kjsembed/kjsembed/fileio.cpp:104
-msgid "Could not create temporary file."
+#: kdeui/widgets/kcharselectdata.cpp:663
+msgid "Letter, Titlecase"
 msgstr ""
 
-#: kjsembed/kjsembed/qwidget_binding.cpp:161
-#, kde-format
-msgid "'%1' is not a valid QWidget."
+#: kdeui/widgets/kcharselectdata.cpp:664
+msgid "Letter, Uppercase"
 msgstr ""
 
-#: kjsembed/kjsembed/qwidget_binding.cpp:170
-msgid "Must supply a widget name."
+#: kdeui/widgets/kcharselectdata.cpp:665
+msgid "Mark, Spacing Combining"
 msgstr ""
 
-#: kjsembed/kjsembed/eventproxy.cpp:108
-#, kde-format
-msgid "Bad event handler: Object %1 Identifier %2 Method %3 Type: %4."
+#: kdeui/widgets/kcharselectdata.cpp:666
+msgid "Mark, Enclosing"
 msgstr ""
 
-#: kjsembed/kjsembed/eventproxy.cpp:135
-#, kde-format
-msgid "Exception calling '%1' function from %2:%3:%4"
+#: kdeui/widgets/kcharselectdata.cpp:667
+msgid "Mark, Non-Spacing"
 msgstr ""
 
-#: kjsembed/kjsembed/qlayout_binding.cpp:90
-#, kde-format
-msgid "'%1' is not a valid QLayout."
+#: kdeui/widgets/kcharselectdata.cpp:668
+msgid "Number, Decimal Digit"
 msgstr ""
 
-#: kjsembed/kjsembed/qlayout_binding.cpp:96
-msgid "Must supply a layout name."
+#: kdeui/widgets/kcharselectdata.cpp:669
+msgid "Number, Letter"
 msgstr ""
 
-#: kjsembed/kjsembed/qformbuilder_binding.cpp:59
-#, kde-format
-msgid "There was an error reading the file '%1'"
+#: kdeui/widgets/kcharselectdata.cpp:670
+msgid "Number, Other"
 msgstr ""
 
-#: kjsembed/kjsembed/qformbuilder_binding.cpp:67
-#, kde-format
-msgid "Could not read file '%1'"
+#: kdeui/widgets/kcharselectdata.cpp:671
+msgid "Punctuation, Connector"
 msgstr ""
 
-#: kjsembed/kjsembed/qaction_binding.cpp:59
-msgid "Action takes 2 args."
+#: kdeui/widgets/kcharselectdata.cpp:672
+msgid "Punctuation, Dash"
 msgstr ""
 
-#: kjsembed/kjsembed/qaction_binding.cpp:86
-msgid "ActionGroup takes 2 args."
+#: kdeui/widgets/kcharselectdata.cpp:673
+msgid "Punctuation, Close"
 msgstr ""
 
-#: kjsembed/kjsembed/qaction_binding.cpp:91
-msgid "Must supply a valid parent."
+#: kdeui/widgets/kcharselectdata.cpp:674
+msgid "Punctuation, Final Quote"
 msgstr ""
 
-#: kjsembed/kjsembed/builtins.cpp:89 kjsembed/kjsembed/builtins.cpp:129
-#, kde-format
-msgid "Error encountered while processing include '%1' line %2: %3"
+#: kdeui/widgets/kcharselectdata.cpp:675
+msgid "Punctuation, Initial Quote"
 msgstr ""
 
-#: kjsembed/kjsembed/builtins.cpp:95
-#, kde-format
-msgid "include only takes 1 argument, not %1."
+#: kdeui/widgets/kcharselectdata.cpp:676
+msgid "Punctuation, Other"
 msgstr ""
 
-#: kjsembed/kjsembed/builtins.cpp:133
-#, kde-format
-msgid "File %1 not found."
+#: kdeui/widgets/kcharselectdata.cpp:677
+msgid "Punctuation, Open"
 msgstr ""
 
-#: kjsembed/kjsembed/builtins.cpp:139
-#, kde-format
-msgid "library only takes 1 argument, not %1."
+#: kdeui/widgets/kcharselectdata.cpp:678
+msgid "Symbol, Currency"
 msgstr ""
 
-#: kjsembed/kjsembed/builtins.cpp:154
-msgid "Alert"
+#: kdeui/widgets/kcharselectdata.cpp:679
+msgid "Symbol, Modifier"
 msgstr ""
 
-#: kjsembed/kjsembed/builtins.cpp:165
-msgid "Confirm"
+#: kdeui/widgets/kcharselectdata.cpp:680
+msgid "Symbol, Math"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:152
-msgid "KJSCmd"
+#: kdeui/widgets/kcharselectdata.cpp:681
+msgid "Symbol, Other"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:153
-msgid "Utility for running KJSEmbed scripts \n"
+#: kdeui/widgets/kcharselectdata.cpp:682
+msgid "Separator, Line"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:156
-msgid "(C) 2005-2006 The KJSEmbed Authors"
+#: kdeui/widgets/kcharselectdata.cpp:683
+msgid "Separator, Paragraph"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:159 kjsembed/kjscmd/kjscmd.cpp:160
-msgid "Execute script without gui support"
+#: kdeui/widgets/kcharselectdata.cpp:684
+msgid "Separator, Space"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:161 kjsembed/kjscmd/kjscmd.cpp:162
-msgid "start interactive kjs interpreter"
+#: kdeui/widgets/kcharselect.cpp:340 kdeui/widgets/kcharselect.cpp:342
+msgid "Enter a search term or character here"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:163 kjsembed/kjscmd/kjscmd.cpp:164
-msgid "start without KDE KApplication support."
+#: kdeui/widgets/kcharselect.cpp:360
+msgctxt "Goes to previous character"
+msgid "Previous in History"
 msgstr ""
 
-#: kjsembed/kjscmd/kjscmd.cpp:165
-msgid "Script to execute"
+#: kdeui/widgets/kcharselect.cpp:362
+msgid "Previous Character in History"
 msgstr ""
 
-#: kjs/object.cpp:586
-msgid "Evaluation error"
-msgstr "Gwall enrhifiad"
+#: kdeui/widgets/kcharselect.cpp:367
+msgctxt "Goes to next character"
+msgid "Next in History"
+msgstr ""
 
-#: kjs/object.cpp:587
-msgid "Range error"
-msgstr "Gwall amrediad"
+#: kdeui/widgets/kcharselect.cpp:369
+msgid "Next Character in History"
+msgstr ""
 
-#: kjs/object.cpp:588
-msgid "Reference error"
-msgstr "Gwall cyfeirnod"
+#: kdeui/widgets/kcharselect.cpp:377
+msgid "Select a category"
+msgstr ""
 
-#: kjs/object.cpp:589
-msgid "Syntax error"
-msgstr "Gwall cystrawen"
+#: kdeui/widgets/kcharselect.cpp:380
+msgid "Select a block to be displayed"
+msgstr ""
 
-#: kjs/object.cpp:590
-msgid "Type error"
-msgstr "Gwall math"
+#: kdeui/widgets/kcharselect.cpp:393
+msgid "Set font"
+msgstr ""
 
-#: kjs/object.cpp:591
-msgid "URI error"
-msgstr "Gwall URL"
+#: kdeui/widgets/kcharselect.cpp:400
+msgid "Set font size"
+msgstr ""
 
-#: kdeui/findreplace/kreplacedialog.cpp:154
-#, kde-format
-msgid ""
-"Your replacement string is referencing a capture greater than '\\%1', "
+#: kdeui/widgets/kcharselect.cpp:631
+msgid "Character:"
 msgstr ""
 
-#: kdeui/findreplace/kreplacedialog.cpp:156
-#, kde-format
-msgid "but your pattern only defines 1 capture."
-msgid_plural "but your pattern only defines %1 captures."
-msgstr[0] ""
-msgstr[1] ""
+#: kdeui/widgets/kcharselect.cpp:637
+msgid "Name: "
+msgstr ""
 
-#: kdeui/findreplace/kreplacedialog.cpp:158
-msgid "but your pattern defines no captures."
+#: kdeui/widgets/kcharselect.cpp:645
+msgid "Annotations and Cross References"
 msgstr ""
 
-#: kdeui/findreplace/kreplacedialog.cpp:159
-msgid ""
-"\n"
-"Please correct."
+#: kdeui/widgets/kcharselect.cpp:649
+msgid "Alias names:"
 msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:49 kdeui/findreplace/kreplace.cpp:53
-msgid "Replace"
-msgstr "Amnewid"
+#: kdeui/widgets/kcharselect.cpp:657
+msgid "Notes:"
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:51
-msgctxt "@action:button Replace all occurrences"
-msgid "&All"
+#: kdeui/widgets/kcharselect.cpp:665
+msgid "See also:"
 msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:52
-msgid "&Skip"
-msgstr "&Hepgor"
+#: kdeui/widgets/kcharselect.cpp:677
+msgid "Equivalents:"
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:63
-#, kde-format
-msgid "Replace '%1' with '%2'?"
-msgstr "Amnewid '%1' efo '%2'?"
+#: kdeui/widgets/kcharselect.cpp:685
+msgid "Approximate equivalents:"
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:138 kdeui/findreplace/kreplace.cpp:332
-msgid "No text was replaced."
-msgstr "Ni amnewidwyd testun."
+#: kdeui/widgets/kcharselect.cpp:694
+msgid "CJK Ideograph Information"
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:140 kdeui/findreplace/kreplace.cpp:334
-#, kde-format
-msgid "1 replacement done."
-msgid_plural "%1 replacements done."
-msgstr[0] "%1 o amnewidau wedi eu gwneud."
-msgstr[1] "%1 o amnewidau wedi eu gwneud."
+#: kdeui/widgets/kcharselect.cpp:697
+msgid "Definition in English: "
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:339 kdeui/findreplace/kfind.cpp:612
-msgid "Beginning of document reached."
-msgstr "Wedi cyrraedd diwedd y ddogfen."
+#: kdeui/widgets/kcharselect.cpp:702
+msgid "Mandarin Pronunciation: "
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:341 kdeui/findreplace/kfind.cpp:614
-msgid "End of document reached."
-msgstr "Wedi cyrraedd diwedd y ddogfen."
+#: kdeui/widgets/kcharselect.cpp:707
+msgid "Cantonese Pronunciation: "
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:348
-msgid "Do you want to restart search from the end?"
-msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r diwedd?"
+#: kdeui/widgets/kcharselect.cpp:712
+msgid "Japanese On Pronunciation: "
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:349
-msgid "Do you want to restart search at the beginning?"
-msgstr "Ydych eisiau ail-ddechrau'r chwiliad o'r dechrau?"
+#: kdeui/widgets/kcharselect.cpp:717
+msgid "Japanese Kun Pronunciation: "
+msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:352
-msgctxt "@action:button Restart find & replace"
-msgid "Restart"
+#: kdeui/widgets/kcharselect.cpp:722
+msgid "Tang Pronunciation: "
 msgstr ""
 
-#: kdeui/findreplace/kreplace.cpp:353
-msgctxt "@action:button Stop find & replace"
-msgid "Stop"
+#: kdeui/widgets/kcharselect.cpp:727
+msgid "Korean Pronunciation: "
 msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:47
-msgid "Find Text"
-msgstr "Canfod Testun"
+#: kdeui/widgets/kcharselect.cpp:733
+msgid "General Character Properties"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:89
-msgctxt "@title:group"
-msgid "Find"
+#: kdeui/widgets/kcharselect.cpp:734
+msgid "Block: "
 msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:92
-msgid "&Text to find:"
-msgstr "&Testun i ganfod:"
+#: kdeui/widgets/kcharselect.cpp:735
+msgid "Unicode category: "
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:97
-msgid "&Edit..."
-msgstr "&Golygu..."
+#: kdeui/widgets/kcharselect.cpp:739
+msgid "Various Useful Representations"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:106
-msgid "Replace With"
-msgstr "Amnewid Efo"
+#: kdeui/widgets/kcharselect.cpp:740
+msgid "UTF-8:"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:109
-msgid "Replace&ment text:"
-msgstr "Testun &amnewid:"
+#: kdeui/widgets/kcharselect.cpp:743
+msgid "UTF-16: "
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:113
-msgid "Use p&laceholders"
-msgstr "De&fnyddio dalfannau"
+#: kdeui/widgets/kcharselect.cpp:744
+msgid "C octal escaped UTF-8: "
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:114
-msgid "Insert Place&holder"
-msgstr "Mewnosod Da&lfan"
+#: kdeui/widgets/kcharselect.cpp:747
+msgid "XML decimal entity:"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:129
-msgid "Find &backwards"
-msgstr "Canfod &yn ôl"
+#: kdeui/widgets/kcharselect.cpp:875
+msgid "Unicode code point:"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:137
-msgid "&Prompt on replace"
-msgstr "&Cofweini wrth amnewid"
+#: kdeui/widgets/kcharselect.cpp:876
+msgctxt "Character"
+msgid "In decimal:"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:199
-msgid "Start replace"
-msgstr "Dechrau amnewid"
+#: kdeui/widgets/klanguagebutton.cpp:177
+msgid "without name"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:200
-msgid ""
-"<qt>If you press the <b>Replace</b> button, the text you entered above is "
-"searched for within the document and any occurrence is replaced with the "
-"replacement text.</qt>"
+#: kdeui/widgets/ksqueezedtextlabel.cpp:165
+msgid "&Copy Full Text"
 msgstr ""
-"<qt>Os gwasgwch y botwm <b>Amnewid</b>, mae'r testun a fewnosodwyd uchod yn "
-"cael ei chwilio amdano tu mewn y ddogfen, ac mae pob digwyddiad yn cael ei "
-"amnewid gan y testun amnewid.</qt>"
 
-#: kdeui/findreplace/kfinddialog.cpp:206 kdeui/util/kstandardguiitem.cpp:276
-msgid "&Find"
-msgstr "&Canfod"
+#: kdeui/widgets/kdatetimeedit.cpp:195
+msgctxt "UTC time zone"
+msgid "UTC"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:207
-msgid "Start searching"
-msgstr "Dechrau chwilio"
+#: kdeui/widgets/kdatetimeedit.cpp:196
+msgctxt "No specific time zone"
+msgid "Floating"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:208
+#: kdeui/widgets/kdatetimeedit.cpp:243
+msgctxt "@info"
 msgid ""
-"<qt>If you press the <b>Find</b> button, the text you entered above is "
-"searched for within the document.</qt>"
+"The entered date and time is before the minimum allowed date and time."
 msgstr ""
-"<qt>Os gwasgwch y botwm <b>Canfod</b>, mae'r testun a fewnosodwyd uchod yn "
-"cael ei chwilio amdano tu mewn i'r ddogfen.</qt>"
 
-#: kdeui/findreplace/kfinddialog.cpp:214
-msgid ""
-"Enter a pattern to search for, or select a previous pattern from the list."
+#: kdeui/widgets/kdatetimeedit.cpp:253
+msgctxt "@info"
+msgid "The entered date and time is after the maximum allowed date and time."
 msgstr ""
-"Rhowch patrwm i chwilio amdano, neu ddewiswch patrwm blaenorol o'r rhestr."
 
-#: kdeui/findreplace/kfinddialog.cpp:217
-msgid "If enabled, search for a regular expression."
-msgstr "Os alluog, chwilio am fynegiad rheolaidd."
+#: kdeui/widgets/kpixmapregionselectorwidget.cpp:195
+msgid "Image Operations"
+msgstr "Gweithrediadau Delwedd"
 
-#: kdeui/findreplace/kfinddialog.cpp:219
-msgid "Click here to edit your regular expression using a graphical editor."
+#: kdeui/widgets/kpixmapregionselectorwidget.cpp:198
+msgid "&Rotate Clockwise"
+msgstr "Cylchdroi yn &Glocwedd"
+
+#: kdeui/widgets/kpixmapregionselectorwidget.cpp:205
+msgid "Rotate &Counterclockwise"
+msgstr "Cylchdroi yn &Wrthglocwedd"
+
+#: kdeui/sonnet/highlighter.cpp:240 kdeui/sonnet/highlighter.cpp:263
+#: kde3support/kdeui/k3syntaxhighlighter.cpp:470
+#: kde3support/kdeui/k3syntaxhighlighter.cpp:576
+msgid "As-you-type spell checking enabled."
+msgstr "Galluogir cywiro sillafu wrth deipio."
+
+#: kdeui/sonnet/highlighter.cpp:242
+#: kde3support/kdeui/k3syntaxhighlighter.cpp:578
+msgid "Too many misspelled words. As-you-type spell checking disabled."
 msgstr ""
-"Cliciwch yma i olygu eich mynegiad rheolaidd gan ddefnyddio golygydd "
-"graffegol."
+"Gormod o eiriau sydd wedi cael eu cam-sillafu.  Analluogir cywiro sillafu "
+"wrth deipio."
 
-#: kdeui/findreplace/kfinddialog.cpp:221
-msgid "Enter a replacement string, or select a previous one from the list."
-msgstr "Rhowch llinyn amnewid, neu ddewiswch un blaenorol o'r rhestr."
+#: kdeui/sonnet/highlighter.cpp:265
+#: kde3support/kdeui/k3syntaxhighlighter.cpp:472
+msgid "As-you-type spell checking disabled."
+msgstr "Galluogir cywiro sillafu wrth deipio."
 
-#: kdeui/findreplace/kfinddialog.cpp:223
-msgid ""
-"<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where "
-"<code><b>N</b></code> is an integer number, will be replaced with the "
-"corresponding capture (\"parenthesized substring\") from the pattern.<p>To "
-"include (a literal <code><b>\\N</b></code> in your replacement, put an extra "
-"backslash in front of it, like <code><b>\\\\N</b></code>.</p></qt>"
+#: kdeui/sonnet/configdialog.cpp:51
+msgid "Spell Checking Configuration"
 msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:230
-msgid "Click for a menu of available captures."
-msgstr "Cliciwch am ddewislen o'r cipiadau sydd ar gael."
+#: kdeui/sonnet/dialog.cpp:103 kdeui/sonnet/dialog.cpp:224
+#: kdeui/sonnet/dialog.cpp:445
+msgctxt "@title:window"
+msgid "Check Spelling"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:232
-msgid "Require word boundaries in both ends of a match to succeed."
+#: kdeui/sonnet/dialog.cpp:105
+msgctxt "@action:button"
+msgid "&Finished"
 msgstr ""
-"Gofyn am ffiniau geiriau wrth ddechrau a diwedd cydweddiad er mwyn llwyddo."
 
-#: kdeui/findreplace/kfinddialog.cpp:234
-msgid ""
-"Start searching at the current cursor location rather than at the top."
-msgstr "Dechrau chwilio o leoliad cyfredol y cyrchydd yn lle o'r pen."
+#: kdeui/sonnet/dialog.cpp:225
+msgctxt "progress label"
+msgid "Spell checking in progress..."
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:236
-msgid "Only search within the current selection."
-msgstr "Chwilio tu mewn y detholiad cyfredol yn unig."
+#: kdeui/sonnet/dialog.cpp:246
+msgid "Spell check stopped."
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:238
-msgid ""
-"Perform a case sensitive search: entering the pattern 'Joe' will not match "
-"'joe' or 'JOE', only 'Joe'."
+#: kdeui/sonnet/dialog.cpp:257
+msgid "Spell check canceled."
 msgstr ""
-"Gweithredu chwiliad lle mae priflythrennau o bwys: ni fydd y patrwm 'Joe' yn "
-"cydweddu â 'joe' neu 'JOE', ond â 'Joe' yn unig."
 
-#: kdeui/findreplace/kfinddialog.cpp:241
-msgid "Search backwards."
-msgstr "Chwilio yn ôl."
+#: kdeui/sonnet/dialog.cpp:441 kdeui/sonnet/dialog.cpp:445
+msgid "Spell check complete."
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:243
-msgid "Ask before replacing each match found."
-msgstr "Gofyn cyn disodli pob cydweddiad a ganfyddir."
+#: kdeui/windowmanagement/kwindowsystem_qws.cpp:176
+#: kdeui/windowmanagement/kwindowsystem_mac.cpp:563
+#: kdeui/windowmanagement/kwindowsystem_win.cpp:598
+#: kdeui/windowmanagement/kwindowsystem_x11.cpp:896
+#, kde-format
+msgid "Desktop %1"
+msgstr "Penbwrdd %1"
 
-#: kdeui/findreplace/kfinddialog.cpp:428
-msgid "Any Character"
-msgstr "Unrhyw Nod"
+#: kinit/klauncher.cpp:564
+#, kde-format
+msgid "KDEInit could not launch '%1'"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:429
-msgid "Start of Line"
-msgstr "Dechrau'r Llinell"
+#: kinit/klauncher.cpp:745 kinit/klauncher.cpp:774 kinit/klauncher.cpp:789
+#, kde-format
+msgid "Could not find service '%1'."
+msgstr "Methu canfod gwasanaeth '%1'."
 
-#: kdeui/findreplace/kfinddialog.cpp:430
-msgid "End of Line"
-msgstr "Diwedd y Llinell"
+#: kinit/klauncher.cpp:808
+#, kde-format
+msgid "Service '%1' must be executable to run."
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:431
-msgid "Set of Characters"
-msgstr "Set o Nodau"
+#: kinit/klauncher.cpp:810 kinit/klauncher.cpp:846
+#, kde-format
+msgid "Service '%1' is malformatted."
+msgstr "Mae gwasanaeth '%1' wedi'i gam-fformatio."
 
-#: kdeui/findreplace/kfinddialog.cpp:432
-msgid "Repeats, Zero or More Times"
-msgstr "Ailadrodd, Sero neu Mwy o Weithiau"
+#: kinit/klauncher.cpp:932
+#, kde-format
+msgid "Launching %1"
+msgstr "Ymgychwyn %1"
 
-#: kdeui/findreplace/kfinddialog.cpp:433
-msgid "Repeats, One or More Times"
-msgstr "Ailadrodd, Un neu Mwy o Weithiau"
+#: kinit/klauncher.cpp:1134
+#, kde-format
+msgid "Unknown protocol '%1'.\n"
+msgstr "Protocol anhysbys '%1'.\n"
 
-#: kdeui/findreplace/kfinddialog.cpp:434
-msgid "Optional"
-msgstr "Dewisol"
+#: kinit/klauncher.cpp:1202
+#, kde-format
+msgid "Error loading '%1'.\n"
+msgstr "Gwall wrth lwytho '%1'.\n"
 
-#: kdeui/findreplace/kfinddialog.cpp:435
-msgid "Escape"
-msgstr "Esc"
+#: kinit/kinit.cpp:539
+msgid ""
+"Unable to start new process.\n"
+"The system may have reached the maximum number of open files possible or the "
+"maximum number of open files that you are allowed to use has been reached."
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:436
-msgid "TAB"
-msgstr "TAB"
+#: kinit/kinit.cpp:564
+msgid ""
+"Unable to create new process.\n"
+"The system may have reached the maximum number of processes possible or the "
+"maximum number of processes that you are allowed to use has been reached."
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:437
-msgid "Newline"
-msgstr "Llinell newydd"
+#: kinit/kinit.cpp:659
+#, kde-format
+msgid "Could not find '%1' executable."
+msgstr "Methu canfod gweithredadwyn '%1'"
 
-#: kdeui/findreplace/kfinddialog.cpp:438
-msgid "Carriage Return"
-msgstr "Dychwelydd"
+#: kinit/kinit.cpp:677
+#, kde-format
+msgid ""
+"Could not open library '%1'.\n"
+"%2"
+msgstr ""
+"Methu agor rhaglengell '%1'.\n"
+"%2"
 
-#: kdeui/findreplace/kfinddialog.cpp:439
-msgid "White Space"
-msgstr "Gofodnod"
+#: kinit/kinit.cpp:722
+#, kde-format
+msgid ""
+"Could not find 'kdemain' in '%1'.\n"
+"%2"
+msgstr ""
+"Methu canfod 'kdemain' yn '%1'.\n"
+"%2"
 
-#: kdeui/findreplace/kfinddialog.cpp:440
-msgid "Digit"
-msgstr "Digid"
+#: kinit/klauncher_main.cpp:62
+msgid ""
+"klauncher: This program is not supposed to be started manually.\n"
+"klauncher: It is started automatically by kdeinit4.\n"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:533
-msgid "Complete Match"
-msgstr "Cydweddiad Cyfan"
+#: kded/kbuildsycoca.cpp:635
+msgid "KBuildSycoca"
+msgstr "KBuildSycoca"
 
-#: kdeui/findreplace/kfinddialog.cpp:538
-#, kde-format
-msgid "Captured Text (%1)"
-msgstr "Testun a Gipiwyd (%1)"
+#: kded/kbuildsycoca.cpp:636
+msgid "Rebuilds the system configuration cache."
+msgstr "Ail-adeiladu celc ffurfweddiad y cysawd."
 
-#: kdeui/findreplace/kfinddialog.cpp:546
-msgid "You must enter some text to search for."
-msgstr "Rhaid i chi fewnosod testun i chwilio amdano."
+#: kded/kbuildsycoca.cpp:637
+msgid "(c) 1999-2002 KDE Developers"
+msgstr ""
 
-#: kdeui/findreplace/kfinddialog.cpp:557
-msgid "Invalid regular expression."
-msgstr "Mynegiad rheolaidd annilys."
+#: kded/kbuildsycoca.cpp:638
+msgid "David Faure"
+msgstr ""
 
-#: kdeui/findreplace/kfind.cpp:51
-msgid "Find Next"
-msgstr "Canfod Nesaf"
+#: kded/kbuildsycoca.cpp:638 kded/kbuildsycoca.cpp:639
+#: kde3support/kdeui/k3aboutdialog.cpp:184 kross/qts/main.cpp:63
+#: kross/console/main.cpp:102
+msgid "Author"
+msgstr "Awdur"
 
-#: kdeui/findreplace/kfind.cpp:57
-#, kde-format
-msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
-msgstr "<qt>Canfod y digwyddiad nesaf o '<b>%1</b>'?</qt>"
+#: kded/kbuildsycoca.cpp:639 kconf_update/kconf_update.cpp:975
+#: khtml/khtml_global.cpp:213
+msgid "Waldo Bastian"
+msgstr ""
 
-#: kdeui/findreplace/kfind.cpp:585 kdeui/findreplace/kfind.cpp:605
-#, kde-format
-msgid "1 match found."
-msgid_plural "%1 matches found."
-msgstr[0] "Canfuwyd %1 o gydweddiadau."
-msgstr[1] "Canfuwyd %1 o gydweddiadau."
+#: kded/kbuildsycoca.cpp:642
+msgid "Do not signal applications to update"
+msgstr "Peidio â nodi cymwysiadau i'w diweddaru"
 
-#: kdeui/findreplace/kfind.cpp:587
-#, kde-format
-msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
-msgstr "<qt>Ni chanfuwyd cydweddiad am '<b>%1</b>'.</qt>"
+#: kded/kbuildsycoca.cpp:643
+msgid "Disable incremental update, re-read everything"
+msgstr "Analluogi diweddariad cynnyddol, ail-ddarllen popeth"
+
+#: kded/kbuildsycoca.cpp:644
+msgid "Check file timestamps"
+msgstr "Gwirio stampiau amser ffeil"
+
+#: kded/kbuildsycoca.cpp:645
+msgid "Disable checking files (dangerous)"
+msgstr "Analluogi gwirio ffeiliau (peryglus)"
 
-#: kdeui/findreplace/kfind.cpp:607
-#, kde-format
-msgid "No matches found for '<b>%1</b>'."
-msgstr "Ni chanfuwyd cydweddiad am '<b>%1</b>'."
+#: kded/kbuildsycoca.cpp:646
+msgid "Create global database"
+msgstr "Creu cronfa ddata eang"
 
-#: kdeui/findreplace/kfind.cpp:621
-msgid "Continue from the end?"
-msgstr ""
+#: kded/kbuildsycoca.cpp:647
+msgid "Perform menu generation test run only"
+msgstr "Gweithredu arbrofiad yn unig o'r cread dewislen"
 
-#: kdeui/findreplace/kfind.cpp:622
-msgid "Continue from the beginning?"
-msgstr ""
+#: kded/kbuildsycoca.cpp:648
+msgid "Track menu id for debug purposes"
+msgstr "Dilyn dynodiad dewislen i pwrpas dadnamu"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:86
-msgctxt "@action"
-msgid "Open"
-msgstr ""
+#: kded/kded.cpp:859
+msgid "KDE Daemon"
+msgstr "Ellyll KDE"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:87
-msgctxt "@action"
-msgid "New"
-msgstr ""
+#: kded/kded.cpp:861
+msgid "KDE Daemon - triggers Sycoca database updates when needed"
+msgstr "Ellyll KDE - yn diweddaru cronfa ddata Sycoca pan bo angen"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:88
-msgctxt "@action"
-msgid "Close"
-msgstr ""
+#: kded/kded.cpp:864
+msgid "Check Sycoca database only once"
+msgstr "Gwirio cronfa ddata Sycoca unwaith yn unig"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:89
-msgctxt "@action"
-msgid "Save"
+#: kdecore/kde-config.cpp:68
+msgid "kde4-config"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:90
-msgctxt "@action"
-msgid "Print"
+#: kdecore/kde-config.cpp:69
+msgid "A little program to output installation paths"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:91
-msgctxt "@action"
-msgid "Quit"
+#: kdecore/kde-config.cpp:71
+msgid "(C) 2000 Stephan Kulow"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:94
-msgctxt "@action"
-msgid "Undo"
+#: kdecore/kde-config.cpp:75
+msgid "Left for legacy support"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:95
-msgctxt "@action"
-msgid "Redo"
+#: kdecore/kde-config.cpp:76
+msgid "Compiled in prefix for KDE libraries"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:96
-msgctxt "@action"
-msgid "Cut"
+#: kdecore/kde-config.cpp:77
+msgid "Compiled in exec_prefix for KDE libraries"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:97
-msgctxt "@action"
-msgid "Copy"
+#: kdecore/kde-config.cpp:78
+msgid "Compiled in library path suffix"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:98
-msgctxt "@action"
-msgid "Paste"
+#: kdecore/kde-config.cpp:79
+msgid "Prefix in $HOME used to write files"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:99
-msgctxt "@action"
-msgid "Paste Selection"
+#: kdecore/kde-config.cpp:80
+msgid "Compiled in version string for KDE libraries"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:101
-msgctxt "@action"
-msgid "Select All"
+#: kdecore/kde-config.cpp:81
+msgid "Available KDE resource types"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:102
-msgctxt "@action"
-msgid "Deselect"
+#: kdecore/kde-config.cpp:82
+msgid "Search path for resource type"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:103
-msgctxt "@action"
-msgid "Delete Word Backwards"
+#: kdecore/kde-config.cpp:83
+msgid "Find filename inside the resource type given to --path"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:104
-msgctxt "@action"
-msgid "Delete Word Forward"
+#: kdecore/kde-config.cpp:84
+msgid "User path: desktop|autostart|document"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:106
-msgctxt "@action"
-msgid "Find"
+#: kdecore/kde-config.cpp:85
+msgid "Prefix to install resource files to"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:107
-msgctxt "@action"
-msgid "Find Next"
+#: kdecore/kde-config.cpp:86
+msgid "Installation prefix for Qt"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:108
-msgctxt "@action"
-msgid "Find Prev"
+#: kdecore/kde-config.cpp:87
+msgid "Location of installed Qt binaries"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:109
-msgctxt "@action"
-msgid "Replace"
+#: kdecore/kde-config.cpp:88
+msgid "Location of installed Qt libraries"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:112
-msgctxt "@action Go to main page"
-msgid "Home"
+#: kdecore/kde-config.cpp:89
+msgid "Location of installed Qt plugins"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:113
-msgctxt "@action Beginning of document"
-msgid "Begin"
+#: kdecore/kde-config.cpp:136
+msgid "Applications menu (.desktop files)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:114
-msgctxt "@action End of document"
-msgid "End"
+#: kdecore/kde-config.cpp:137
+msgid "Autostart directories"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:115
-msgctxt "@action"
-msgid "Prior"
+#: kdecore/kde-config.cpp:138
+msgid "Cached information (e.g. favicons, web-pages)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:116
-msgctxt "@action Opposite to Prior"
-msgid "Next"
+#: kdecore/kde-config.cpp:139
+msgid "CGIs to run from kdehelp"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:118
-msgctxt "@action"
-msgid "Up"
+#: kdecore/kde-config.cpp:140
+msgid "Configuration files"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:119
-msgctxt "@action"
-msgid "Back"
+#: kdecore/kde-config.cpp:141
+msgid "Where applications store data"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:120
-msgctxt "@action"
-msgid "Forward"
+#: kdecore/kde-config.cpp:142
+msgid "Emoticons"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:121
-msgctxt "@action"
-msgid "Reload"
+#: kdecore/kde-config.cpp:143
+msgid "Executables in $prefix/bin"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:123
-msgctxt "@action"
-msgid "Beginning of Line"
+#: kdecore/kde-config.cpp:144
+msgid "HTML documentation"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:124
-msgctxt "@action"
-msgid "End of Line"
-msgstr ""
+#: kdecore/kde-config.cpp:145
+msgid "Icons"
+msgstr "Eiconau"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:125
-msgctxt "@action"
-msgid "Go to Line"
+#: kdecore/kde-config.cpp:146
+msgid "Configuration description files"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:126
-msgctxt "@action"
-msgid "Backward Word"
+#: kdecore/kde-config.cpp:147
+msgid "kdeinit shared executables (resource added by Debian)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:127
-msgctxt "@action"
-msgid "Forward Word"
+#: kdecore/kde-config.cpp:148
+msgid "Libraries"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:129
-msgctxt "@action"
-msgid "Add Bookmark"
+#: kdecore/kde-config.cpp:149
+msgid "Includes/Headers"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:130
-msgctxt "@action"
-msgid "Zoom In"
+#: kdecore/kde-config.cpp:150
+msgid "Translation files for KLocale"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:131
-msgctxt "@action"
-msgid "Zoom Out"
+#: kdecore/kde-config.cpp:151
+msgid "Mime types"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:132
-msgctxt "@action"
-msgid "Full Screen Mode"
+#: kdecore/kde-config.cpp:152
+msgid "Loadable modules"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:134
-msgctxt "@action"
-msgid "Show Menu Bar"
+#: kdecore/kde-config.cpp:153 kdecore/kde-config.cpp:163
+msgid "Legacy pixmaps"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:135
-msgctxt "@action"
-msgid "Activate Next Tab"
+#: kdecore/kde-config.cpp:154
+msgid "Qt plugins"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:136
-msgctxt "@action"
-msgid "Activate Previous Tab"
-msgstr ""
+#: kdecore/kde-config.cpp:155
+msgid "Services"
+msgstr "Gwasanaethau"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:139
-msgctxt "@action"
-msgid "Help"
+#: kdecore/kde-config.cpp:156
+msgid "Service types"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:140
-msgctxt "@action"
-msgid "What's This"
+#: kdecore/kde-config.cpp:157
+msgid "Application sounds"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:143
-msgctxt "@action"
-msgid "Text Completion"
-msgstr ""
+#: kdecore/kde-config.cpp:158
+msgid "Templates"
+msgstr "Patrymluniau"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:144
-msgctxt "@action"
-msgid "Previous Completion Match"
-msgstr ""
+#: kdecore/kde-config.cpp:159
+msgid "Wallpapers"
+msgstr "Papurau Wal"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:145
-msgctxt "@action"
-msgid "Next Completion Match"
+#: kdecore/kde-config.cpp:160
+msgid "XDG Application menu (.desktop files)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:146
-msgctxt "@action"
-msgid "Substring Completion"
+#: kdecore/kde-config.cpp:161
+msgid "XDG Menu descriptions (.directory files)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:148
-msgctxt "@action"
-msgid "Previous Item in List"
+#: kdecore/kde-config.cpp:162
+msgid "XDG Icons"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:149
-msgctxt "@action"
-msgid "Next Item in List"
+#: kdecore/kde-config.cpp:164
+msgid "XDG Mime Types"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:151
-msgctxt "@action"
-msgid "Open Recent"
+#: kdecore/kde-config.cpp:165
+msgid "XDG Menu layout (.menu files)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:152
-msgctxt "@action"
-msgid "Save As"
+#: kdecore/kde-config.cpp:166
+msgid "XDG autostart directory"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:153
-msgctxt "@action"
-msgid "Revert"
+#: kdecore/kde-config.cpp:167
+msgid "Temporary files (specific for both current host and current user)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:154
-msgctxt "@action"
-msgid "Print Preview"
+#: kdecore/kde-config.cpp:168
+msgid "UNIX Sockets (specific for both current host and current user)"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:155
-msgctxt "@action"
-msgid "Mail"
+#: kdecore/kde-config.cpp:180
+#, kde-format
+msgid "%1 - unknown type\n"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:156
-msgctxt "@action"
-msgid "Clear"
+#: kdecore/kde-config.cpp:238
+#, kde-format
+msgid "%1 - unknown type of userpath\n"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:157
-msgctxt "@action"
-msgid "Actual Size"
+#: kdecore/io/ksavefile.cpp:84
+msgid "No target filename has been given."
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:158
-msgctxt "@action"
-msgid "Fit To Page"
+#: kdecore/io/ksavefile.cpp:91
+msgid "Already opened."
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:159
-msgctxt "@action"
-msgid "Fit To Width"
+#: kdecore/io/ksavefile.cpp:101
+msgid "Insufficient permissions in target directory."
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:160
-msgctxt "@action"
-msgid "Fit To Height"
+#: kdecore/io/ksavefile.cpp:111
+msgid "Unable to open temporary file."
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:161
-msgctxt "@action"
-msgid "Zoom"
+#: kdecore/io/ksavefile.cpp:215
+msgid "Synchronization to disk failed"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:162
-msgctxt "@action"
-msgid "Goto"
+#: kdecore/io/ksavefile.cpp:239
+msgid "Error during rename."
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:163
-msgctxt "@action"
-msgid "Goto Page"
-msgstr ""
+#: kdecore/services/kmimetyperepository.cpp:611
+#, kde-format
+msgid "Could not find mime type <resource>%2</resource>"
+msgid_plural ""
+"Could not find mime types:\n"
+"<resource>%2</resource>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:164
-msgctxt "@action"
-msgid "Document Back"
+#: kdecore/services/kmimetyperepository.cpp:629
+msgid ""
+"No mime types installed. Check that shared-mime-info is installed, and that "
+"XDG_DATA_DIRS is not set, or includes /usr/share."
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:165
-msgctxt "@action"
-msgid "Document Forward"
+#: kdecore/sycoca/kmemfile.cpp:75 kdecore/sycoca/kmemfile.cpp:156
+#, kde-format
+msgid "File %1 does not exist"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:166
-msgctxt "@action"
-msgid "Edit Bookmarks"
+#: kdecore/sycoca/kmemfile.cpp:80
+#, kde-format
+msgid "Cannot open %1 for reading"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:167
-msgctxt "@action"
-msgid "Spelling"
+#: kdecore/sycoca/kmemfile.cpp:90 kdecore/sycoca/kmemfile.cpp:169
+#, kde-format
+msgid "Cannot create memory segment for file %1"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:168
-msgctxt "@action"
-msgid "Show Toolbar"
+#: kdecore/sycoca/kmemfile.cpp:100
+#, kde-format
+msgid "Could not read data from %1 into shm"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:169
-msgctxt "@action"
-msgid "Show Statusbar"
+#: kdecore/sycoca/kmemfile.cpp:151
+msgid "Only 'ReadOnly' allowed"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:170
-msgctxt "@action"
-msgid "Save Options"
+#: kdecore/sycoca/kmemfile.cpp:207
+msgid "Cannot seek past eof"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:171
-msgctxt "@action"
-msgid "Key Bindings"
+#: kdecore/network/klocalsocket_win.cpp:31
+#: kdecore/network/klocalsocket_win.cpp:36
+msgid "Operation not supported"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:172
-msgctxt "@action"
-msgid "Preferences"
-msgstr ""
+#: kdecore/network/netsupp.cpp:891 kdecore/network/k3resolver.cpp:545
+msgid "no error"
+msgstr "dim gwall"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:173
-msgctxt "@action"
-msgid "Configure Toolbars"
-msgstr ""
+#: kdecore/network/netsupp.cpp:892
+msgid "address family for nodename not supported"
+msgstr "ni chynhalir y teulu cyfeiriad am yr enw nôd"
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:174
-msgctxt "@action"
-msgid "Configure Notifications"
+#: kdecore/network/netsupp.cpp:893 kdecore/network/k3resolver.cpp:547
+msgid "temporary failure in name resolution"
+msgstr "methiant dros dro wrth ddadansoddi'r enw"
+
+#: kdecore/network/netsupp.cpp:894
+msgid "invalid value for 'ai_flags'"
+msgstr "gwerth dilys am 'ai_flags'"
+
+#: kdecore/network/netsupp.cpp:895 kdecore/network/k3resolver.cpp:548
+msgid "non-recoverable failure in name resolution"
+msgstr "methiant anadferadwy wrth ddadansoddi'r enw"
+
+#: kdecore/network/netsupp.cpp:896
+msgid "'ai_family' not supported"
+msgstr "ni chynhelir 'ai_family'"
+
+#: kdecore/network/netsupp.cpp:897 kdecore/network/k3resolver.cpp:550
+msgid "memory allocation failure"
+msgstr "methiant wrth ddyrannu cof"
+
+#: kdecore/network/netsupp.cpp:898
+msgid "no address associated with nodename"
+msgstr "ni chysylltir cyfeiriad efo enw'r nôd"
+
+#: kdecore/network/netsupp.cpp:899 kdecore/network/k3resolver.cpp:551
+msgid "name or service not known"
+msgstr "ni adnabyddir enw neu gwasanaeth"
+
+#: kdecore/network/netsupp.cpp:900
+msgid "servname not supported for ai_socktype"
+msgstr "ni chynhelir servname am ai_socktype"
+
+#: kdecore/network/netsupp.cpp:901
+msgid "'ai_socktype' not supported"
+msgstr "ni chynhelir 'ai_socktype'"
+
+#: kdecore/network/netsupp.cpp:902
+msgid "system error"
+msgstr "gwall cysawd"
+
+#: kdecore/network/k3socketaddress.cpp:623
+#, kde-format
+msgctxt "1: the unknown socket address family number"
+msgid "Unknown family %1"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:175
-msgctxt "@action"
-msgid "Tip Of Day"
+#: kdecore/network/k3socketbase.cpp:214
+msgctxt "Socket error code NoError"
+msgid "no error"
+msgstr "dim gwall"
+
+#: kdecore/network/k3socketbase.cpp:219
+msgctxt "Socket error code LookupFailure"
+msgid "name lookup has failed"
+msgstr "methodd chwilio'r enw"
+
+#: kdecore/network/k3socketbase.cpp:224
+msgctxt "Socket error code AddressInUse"
+msgid "address already in use"
+msgstr "mae'r cyfeiriad mewn defnydd eisoes"
+
+#: kdecore/network/k3socketbase.cpp:229
+msgctxt "Socket error code AlreadyBound"
+msgid "socket is already bound"
+msgstr "mae'r soced wedi'i rhwymo eisoes"
+
+#: kdecore/network/k3socketbase.cpp:234
+msgctxt "Socket error code AlreadyCreated"
+msgid "socket is already created"
+msgstr "mae'r soced wedi'i greu eisoes"
+
+#: kdecore/network/k3socketbase.cpp:239
+msgctxt "Socket error code NotBound"
+msgid "socket is not bound"
+msgstr "ni rhwymir y soced"
+
+#: kdecore/network/k3socketbase.cpp:244
+msgctxt "Socket error code NotCreated"
+msgid "socket has not been created"
+msgstr "ni chreuwyd y soced"
+
+#: kdecore/network/k3socketbase.cpp:249
+msgctxt "Socket error code WouldBlock"
+msgid "operation would block"
+msgstr "bydd y gweithrediad yn rhwystro"
+
+#: kdecore/network/k3socketbase.cpp:254
+msgctxt "Socket error code ConnectionRefused"
+msgid "connection actively refused"
+msgstr "gwrthodwyd y cysyltiad yn weithredol"
+
+#: kdecore/network/k3socketbase.cpp:259
+msgctxt "Socket error code ConnectionTimedOut"
+msgid "connection timed out"
+msgstr "mae'r cysylltiad wedi goramseru"
+
+#: kdecore/network/k3socketbase.cpp:264
+msgctxt "Socket error code InProgress"
+msgid "operation is already in progress"
+msgstr "mae'r gweithrediad ar y gweill eisoes"
+
+#: kdecore/network/k3socketbase.cpp:269
+msgctxt "Socket error code NetFailure"
+msgid "network failure occurred"
+msgstr "methodd y rhwydwaith"
+
+#: kdecore/network/k3socketbase.cpp:274
+msgctxt "Socket error code NotSupported"
+msgid "operation is not supported"
+msgstr "ni chynhelir y gweithrediad"
+
+#: kdecore/network/k3socketbase.cpp:279
+msgctxt "Socket error code Timeout"
+msgid "timed operation timed out"
+msgstr "mae gweithrediad amseredig wedi goramseru"
+
+#: kdecore/network/k3socketbase.cpp:284
+msgctxt "Socket error code UnknownError"
+msgid "an unknown/unexpected error has happened"
+msgstr "digwyddodd gwall anhysbys/annisgwyl"
+
+#: kdecore/network/k3socketbase.cpp:289
+msgctxt "Socket error code RemotelyDisconnected"
+msgid "remote host closed connection"
+msgstr "caeodd y gwesteiwr pell y cysylltiad"
+
+#: kdecore/network/klocalsocket_unix.cpp:178
+#: kdecore/network/klocalsocket_unix.cpp:246
+msgid "Specified socket path is invalid"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:176
-msgctxt "@action"
-msgid "Report Bug"
+#: kdecore/network/klocalsocket_unix.cpp:187
+#: kdecore/network/klocalsocket_unix.cpp:234
+#: kdecore/network/klocalsocket_unix.cpp:255
+msgid "The socket operation is not supported"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:177
-msgctxt "@action"
-msgid "Switch Application Language"
+#: kdecore/network/klocalsocket_unix.cpp:200
+msgid "Connection refused"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:178
-msgctxt "@action"
-msgid "About Application"
+#: kdecore/network/klocalsocket_unix.cpp:205
+#: kdecore/network/klocalsocket_unix.cpp:268
+msgid "Permission denied"
 msgstr ""
 
-#: kdeui/shortcuts/kstandardshortcut.cpp:179
-msgctxt "@action"
-msgid "About KDE"
+#: kdecore/network/klocalsocket_unix.cpp:209
+msgid "Connection timed out"
 msgstr ""
 
-#: kdeui/shortcuts/kgesture.cpp:517
-msgctxt "left mouse button"
-msgid "left button"
+#: kdecore/network/klocalsocket_unix.cpp:213
+#: kdecore/network/klocalsocket_unix.cpp:293 nepomuk/core/resource.cpp:538
+msgid "Unknown error"
 msgstr ""
 
-#: kdeui/shortcuts/kgesture.cpp:520
-msgctxt "middle mouse button"
-msgid "middle button"
+#: kdecore/network/klocalsocket_unix.cpp:221
+#: kdecore/network/klocalsocket_unix.cpp:301
+msgid "Could not set non-blocking mode"
 msgstr ""
 
-#: kdeui/shortcuts/kgesture.cpp:523
-msgctxt "right mouse button"
-msgid "right button"
+#: kdecore/network/klocalsocket_unix.cpp:272
+msgid "Address is already in use"
 msgstr ""
 
-#: kdeui/shortcuts/kgesture.cpp:526
-msgctxt "a nonexistent value of mouse button"
-msgid "invalid button"
+#: kdecore/network/klocalsocket_unix.cpp:277
+msgid "Path cannot be used"
 msgstr ""
 
-#: kdeui/shortcuts/kgesture.cpp:540
-#, kde-format
-msgctxt ""
-"a kind of mouse gesture: hold down one mouse button, then press another "
-"button"
-msgid "Hold %1, then push %2"
+#: kdecore/network/klocalsocket_unix.cpp:281
+msgid "No such file or directory"
 msgstr ""
 
-#: kdeui/shortcuts/kcheckaccelerators.cpp:209
-msgctxt "@title:window"
-msgid "Dr. Klash' Accelerator Diagnosis"
+#: kdecore/network/klocalsocket_unix.cpp:285
+msgid "Not a directory"
 msgstr ""
 
-#: kdeui/shortcuts/kcheckaccelerators.cpp:216
-msgctxt "@option:check"
-msgid "Disable automatic checking"
+#: kdecore/network/klocalsocket_unix.cpp:289
+msgid "Read-only filesystem"
 msgstr ""
 
-#: kdeui/shortcuts/kcheckaccelerators.cpp:220
-#: kdeui/widgets/kdatepicker.cpp:703
-msgctxt "@action:button"
-msgid "Close"
+#: kdecore/network/klocalsocket_unix.cpp:354
+#: kdecore/network/klocalsocket_unix.cpp:386
+msgid "Unknown socket error"
 msgstr ""
 
-#: kdeui/shortcuts/kcheckaccelerators.cpp:256
-msgid "<h2>Accelerators changed</h2>"
-msgstr "<h2>Newidwyd cyflymyddion</h2>"
-
-#: kdeui/shortcuts/kcheckaccelerators.cpp:262
-msgid "<h2>Accelerators removed</h2>"
-msgstr "<h2>Gwaredwyd cyflymyddion</h2>"
-
-#: kdeui/shortcuts/kcheckaccelerators.cpp:267
-msgid "<h2>Accelerators added (just for your info)</h2>"
-msgstr "<h2>Ychwanegwyd cyflymyddion (er eich gwybodaeth)</h2>"
-
-#: kdeui/shortcuts/kglobalaccel.cpp:494
-msgid "Conflict with Global Shortcut"
-msgstr "Croestyniad efo Byrlwybr Eang"
-
-#: kdeui/shortcuts/kglobalaccel.cpp:495
-#, kde-format
-msgid ""
-"The '%1' key combination has already been allocated to the global action "
-"\"%2\" in %3.\n"
-"Do you want to reassign it from that action to the current one?"
+#: kdecore/network/ksocketfactory.cpp:92
+#: kdecore/network/ksocketfactory.cpp:106
+msgid "Timed out trying to connect to remote host"
 msgstr ""
 
-#: kdeui/shortcuts/kglobalaccel.cpp:501 kdeui/shortcuts/kglobalaccel.cpp:540
-#: kdeui/dialogs/kshortcutseditor.cpp:571
-#: kdeui/dialogs/kshortcutseditor.cpp:587
-#: kdeui/widgets/kkeysequencewidget.cpp:184
-#: kdeui/widgets/kkeysequencewidget.cpp:273
-#: kdeui/widgets/kkeysequencewidget.cpp:667
-msgid "Reassign"
+#: kdecore/network/ktcpsocket.cpp:152
+msgctxt "SSL error"
+msgid "No error"
 msgstr ""
 
-#: kdeui/shortcuts/kglobalaccel.cpp:521
-#, kde-format
-msgid ""
-"The '%1' key combination is registered by application %2 for action %3:"
+#: kdecore/network/ktcpsocket.cpp:154
+msgctxt "SSL error"
+msgid "The certificate authority's certificate is invalid"
 msgstr ""
 
-#: kdeui/shortcuts/kglobalaccel.cpp:528
-#, kde-format
-msgid "In context '%1' for action '%2'\n"
+#: kdecore/network/ktcpsocket.cpp:156
+msgctxt "SSL error"
+msgid "The certificate has expired"
 msgstr ""
 
-#: kdeui/shortcuts/kglobalaccel.cpp:532
-#, kde-format
-msgid ""
-"The '%1' key combination is registered by application %2.\n"
-"%3"
+#: kdecore/network/ktcpsocket.cpp:158
+msgctxt "SSL error"
+msgid "The certificate is invalid"
 msgstr ""
 
-#: kdeui/shortcuts/kglobalaccel.cpp:538
-msgid "Conflict With Registered Global Shortcut"
+#: kdecore/network/ktcpsocket.cpp:160
+msgctxt "SSL error"
+msgid "The certificate is not signed by any trusted certificate authority"
 msgstr ""
 
-#. i18n: A shorter version of the alphabet test phrase translated in
-#. another message. It is displayed in the dropdown list of font previews
-#. (the font selection combo box), so keep it under the length equivalent
-#. to 60 or so proportional Latin characters.
-#: kdeui/fonts/kfontcombobox.cpp:49
-msgctxt "short"
-msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+#: kdecore/network/ktcpsocket.cpp:162
+msgctxt "SSL error"
+msgid "The certificate has been revoked"
 msgstr ""
 
-#. i18n: Integer which indicates the script you used in the sample text
-#. for font previews in your language. For the possible values, see
-#. http://doc.trolltech.com/qfontdatabase.html#WritingSystem-enum
-#. If the sample text contains several scripts, their IDs can be given
-#. as a comma-separated list (e.g. for Japanese it is "1,27").
-#: kdeui/fonts/kfontcombobox.cpp:120
-msgctxt "Numeric IDs of scripts for font previews"
-msgid "1"
+#: kdecore/network/ktcpsocket.cpp:164
+msgctxt "SSL error"
+msgid "The certificate is unsuitable for this purpose"
 msgstr ""
 
-#: kdeui/fonts/kfontdialog.cpp:75
-msgid "Select Font"
-msgstr "Dewis Wynebfath"
-
-#: kdeui/fonts/kfontrequester.cpp:110
-msgid "Choose..."
-msgstr "Dewis..."
-
-#: kdeui/fonts/kfontrequester.cpp:215
-msgid "Click to select a font"
-msgstr "Cliciwch i ddewis wynebfath"
-
-#: kdeui/fonts/kfontrequester.cpp:222
-msgid "Preview of the selected font"
-msgstr "Rhagolwg y r wynebfath penodol"
-
-#: kdeui/fonts/kfontrequester.cpp:223
+#: kdecore/network/ktcpsocket.cpp:166
+msgctxt "SSL error"
 msgid ""
-"This is a preview of the selected font. You can change it by clicking the "
-"\"Choose...\" button."
+"The root certificate authority's certificate is not trusted for this purpose"
 msgstr ""
-"Mae hyn yn rhagolwg yr wynebfath penodol.  Cewch ei newid gan glicio'r botwm "
-"\"Dewis...\"."
-
-#: kdeui/fonts/kfontrequester.cpp:228
-#, kde-format
-msgid "Preview of the \"%1\" font"
-msgstr "Rhagolwg y font \"%1\""
 
-#: kdeui/fonts/kfontrequester.cpp:229
-#, kde-format
+#: kdecore/network/ktcpsocket.cpp:168
+msgctxt "SSL error"
 msgid ""
-"This is a preview of the \"%1\" font. You can change it by clicking the "
-"\"Choose...\" button."
-msgstr ""
-"Mae hyn yn rhagolwg o'r wynebfath \"%1\".  Cewch ei newid gan glicio'r botwm "
-"\"Dewis...\"."
-
-#. i18n: Generic sans serif font presented in font choosers. When selected,
-#. the system will choose a real font, mandated by distro settings.
-#: kdeui/fonts/fonthelpers.cpp:32
-msgctxt "@item Font name"
-msgid "Sans Serif"
+"The certificate authority's certificate is marked to reject this "
+"certificate's purpose"
 msgstr ""
 
-#. i18n: Generic serif font presented in font choosers. When selected,
-#. the system will choose a real font, mandated by distro settings.
-#: kdeui/fonts/fonthelpers.cpp:35
-msgctxt "@item Font name"
-msgid "Serif"
+#: kdecore/network/ktcpsocket.cpp:170
+msgctxt "SSL error"
+msgid "The peer did not present any certificate"
 msgstr ""
 
-#. i18n: Generic monospace font presented in font choosers. When selected,
-#. the system will choose a real font, mandated by distro settings.
-#: kdeui/fonts/fonthelpers.cpp:38
-msgctxt "@item Font name"
-msgid "Monospace"
+#: kdecore/network/ktcpsocket.cpp:172
+msgctxt "SSL error"
+msgid "The certificate does not apply to the given host"
 msgstr ""
 
-#. i18n: Filter by which the translators can translate, or otherwise
-#. operate on the font names not put up for regular translation.
-#: kdeui/fonts/fonthelpers.cpp:81
-#, kde-format
-msgctxt "@item Font name"
-msgid "%1"
+#: kdecore/network/ktcpsocket.cpp:174
+msgctxt "SSL error"
+msgid "The certificate cannot be verified for internal reasons"
 msgstr ""
 
-#. i18n: Filter by which the translators can translate, or otherwise
-#. operate on the font names not put up for regular translation.
-#: kdeui/fonts/fonthelpers.cpp:85
-#, kde-format
-msgctxt "@item Font name [foundry]"
-msgid "%1 [%2]"
+#: kdecore/network/ktcpsocket.cpp:176
+msgctxt "SSL error"
+msgid "The certificate chain is too long"
 msgstr ""
 
-#: kdeui/fonts/kfontchooser.cpp:162
-msgctxt "@info:whatsthis"
-msgid "Here you can choose the font to be used."
+#: kdecore/network/ktcpsocket.cpp:179
+msgctxt "SSL error"
+msgid "Unknown error"
 msgstr ""
 
-#: kdeui/fonts/kfontchooser.cpp:184
-msgid "Requested Font"
-msgstr "Wynebfath a Ddymunwyd"
-
-#: kdeui/fonts/kfontchooser.cpp:203
-msgctxt "@option:check"
-msgid "Font"
-msgstr ""
+#: kdecore/network/k3socks.cpp:137
+msgid "NEC SOCKS client"
+msgstr "dibynnydd NEC SOCKS"
 
-#: kdeui/fonts/kfontchooser.cpp:207
-msgctxt "@info:whatsthis"
-msgid "Enable this checkbox to change the font family settings."
-msgstr ""
+#: kdecore/network/k3socks.cpp:172
+msgid "Dante SOCKS client"
+msgstr "dibynnydd Dante SOCKS"
 
-#: kdeui/fonts/kfontchooser.cpp:208
-msgctxt "@info:tooltip"
-msgid "Change font family?"
-msgstr ""
+#: kdecore/network/k3resolver.cpp:546
+msgid "requested family not supported for this host name"
+msgstr "ni chynhelir y deulu benodol i'r enw gwesteiwr yma"
 
-#: kdeui/fonts/kfontchooser.cpp:212
-msgctxt "@label"
-msgid "Font:"
-msgstr ""
+#: kdecore/network/k3resolver.cpp:549
+msgid "invalid flags"
+msgstr "baneri annilys"
 
-#: kdeui/fonts/kfontchooser.cpp:219
-msgctxt "@option:check"
-msgid "Font style"
-msgstr ""
+#: kdecore/network/k3resolver.cpp:552
+msgid "requested family not supported"
+msgstr "ni chynhelir deulu benodol"
 
-#: kdeui/fonts/kfontchooser.cpp:223
-msgctxt "@info:whatsthis"
-msgid "Enable this checkbox to change the font style settings."
-msgstr ""
+#: kdecore/network/k3resolver.cpp:553
+msgid "requested service not supported for this socket type"
+msgstr "ni chynhelir y gwasanaeth benodol am y math yma o soced"
 
-#: kdeui/fonts/kfontchooser.cpp:224
-msgctxt "@info:tooltip"
-msgid "Change font style?"
-msgstr ""
+#: kdecore/network/k3resolver.cpp:554
+msgid "requested socket type not supported"
+msgstr "ni chynhelir y math penodol o soced"
 
-#: kdeui/fonts/kfontchooser.cpp:228
-msgid "Font style:"
-msgstr "Ardull wynebfath:"
+#: kdecore/network/k3resolver.cpp:555
+msgid "unknown error"
+msgstr "gwall anhysbys"
 
-#: kdeui/fonts/kfontchooser.cpp:236
-msgctxt "@option:check"
-msgid "Size"
-msgstr ""
+#: kdecore/network/k3resolver.cpp:557
+#, kde-format
+msgctxt "1: the i18n'ed system error code, from errno"
+msgid "system error: %1"
+msgstr "gwall cysawd : %1"
 
-#: kdeui/fonts/kfontchooser.cpp:240
-msgctxt "@info:whatsthis"
-msgid "Enable this checkbox to change the font size settings."
-msgstr ""
+#: kdecore/network/k3resolver.cpp:568
+msgid "request was canceled"
+msgstr "diddymwyd y cais"
 
-#: kdeui/fonts/kfontchooser.cpp:241
-msgctxt "@info:tooltip"
-msgid "Change font size?"
+#: kdecore/auth/backends/dbus/DBusHelperProxy.cpp:100
+#, kde-format
+msgid "DBus Backend error: connection to helper failed. %1"
 msgstr ""
 
-#: kdeui/fonts/kfontchooser.cpp:245
-msgctxt "@label:listbox Font size"
-msgid "Size:"
+#: kdecore/auth/backends/dbus/DBusHelperProxy.cpp:124
+#, kde-format
+msgid ""
+"DBus Backend error: could not contact the helper. Connection error: %1. "
+"Message error: %2"
 msgstr ""
 
-#: kdeui/fonts/kfontchooser.cpp:261
-msgctxt "@info:whatsthis"
-msgid "Here you can choose the font family to be used."
+#: kdecore/auth/backends/dbus/DBusHelperProxy.cpp:137
+#, kde-format
+msgid "DBus Backend error: received corrupt data from helper %1 %2"
 msgstr ""
 
-#: kdeui/fonts/kfontchooser.cpp:287
-msgctxt "@info:whatsthis"
-msgid "Here you can choose the font style to be used."
-msgstr ""
+#: kdecore/config/kconfig.cpp:814
+msgid "Please contact your system administrator."
+msgstr "Cysylltwch a'ch gwasanaethwr cysodau."
 
-#: kdeui/fonts/kfontchooser.cpp:295 kdeui/fonts/kfontchooser.cpp:623
-msgctxt "@item font"
-msgid "Regular"
-msgstr ""
+#: kdecore/config/kconfigini.cpp:523
+#, kde-format
+msgid "Configuration file \"%1\" not writable.\n"
+msgstr "Methu ysgrifennu i'r ffeil ffurfweddiad \"%1\".\n"
 
-#: kdeui/fonts/kfontchooser.cpp:296 kdeui/fonts/kfontchooser.cpp:644
-msgctxt "@item font"
-msgid "Italic"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:273
+msgid "Use the X-server display 'displayname'"
+msgstr "Defnyddio'r arddangosydd gweinydd-X 'displayname'"
 
-#: kdeui/fonts/kfontchooser.cpp:297 kdeui/fonts/kfontchooser.cpp:645
-msgctxt "@item font"
-msgid "Oblique"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:275
+msgid "Use the QWS display 'displayname'"
+msgstr "Defnyddio'r arddangosydd QWS 'displayname'"
 
-#: kdeui/fonts/kfontchooser.cpp:298
-msgctxt "@item font"
-msgid "Bold"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:278
+msgid "Restore the application for the given 'sessionId'"
+msgstr "Adfer y cymhwysiad ar gyfer y 'sessionId' a rhoddwyd"
 
-#: kdeui/fonts/kfontchooser.cpp:299
-msgctxt "@item font"
-msgid "Bold Italic"
+#: kdecore/kernel/kcmdlineargs.cpp:279
+msgid ""
+"Causes the application to install a private color\n"
+"map on an 8-bit display"
 msgstr ""
+"Achosi i'r cymhwysiad arsefydlu map lliw\n"
+" preifat ar arddangosydd 8-did"
 
-#: kdeui/fonts/kfontchooser.cpp:320
-msgctxt "@item font size"
-msgid "Relative"
+#: kdecore/kernel/kcmdlineargs.cpp:280
+msgid ""
+"Limits the number of colors allocated in the color\n"
+"cube on an 8-bit display, if the application is\n"
+"using the QApplication::ManyColor color\n"
+"specification"
 msgstr ""
+"Cyfyngu'r nifer o liwiau a dyrannir yn y ciwb\n"
+" lliw ar arddangosydd 8-did, os mae'r cymhwysiad\n"
+" yn defnyddio y penodiad QApplication::ManyColor"
 
-#: kdeui/fonts/kfontchooser.cpp:322
-msgid "Font size<br /><i>fixed</i> or <i>relative</i><br />to environment"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:281
+msgid "tells Qt to never grab the mouse or the keyboard"
+msgstr "Dweud wrth QT na ddylai fyth dwyn y llygoden na'r bysellfwrdd"
 
-#: kdeui/fonts/kfontchooser.cpp:324
+#: kdecore/kernel/kcmdlineargs.cpp:282
 msgid ""
-"Here you can switch between fixed font size and font size to be calculated "
-"dynamically and adjusted to changing environment (e.g. widget dimensions, "
-"paper size)."
+"running under a debugger can cause an implicit\n"
+"-nograb, use -dograb to override"
 msgstr ""
-"Yma y newidir rhwng maint wynebfath sy'n osodedig, a maint wynebfath a "
-"chyfrifir yn ddinamig ac a  addasir i amgychedd sy'n newid (e.e. "
-"dimensiynau'r celfigyn, maint y papur)."
+"gall redeg dan ddadnamydd achosi -nograb\n"
+"ymhlyg, defnyddiwch -dograb i'w anwybyddu"
 
-#: kdeui/fonts/kfontchooser.cpp:349
-msgid "Here you can choose the font size to be used."
-msgstr "Yma y dewisir maint yr wynebfath a ddefnyddir."
+#: kdecore/kernel/kcmdlineargs.cpp:283
+msgid "switches to synchronous mode for debugging"
+msgstr "newid i fodd cydamseredig i ddadnamu"
 
-#. i18n: A classical test phrase, with all letters of the English alphabet.
-#. Replace it with a sample text in your language, such that it is
-#. representative of language's writing system.
-#. If you wish, you can input several lines of text separated by \n.
-#: kdeui/fonts/kfontchooser.cpp:387
-msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
-msgstr "Duw a'm gwaredo, ni allaf ddianc rhag hon"
+#: kdecore/kernel/kcmdlineargs.cpp:285
+msgid "defines the application font"
+msgstr "diffinio wynebfath y cymhwysiad"
 
-#: kdeui/fonts/kfontchooser.cpp:390
+#: kdecore/kernel/kcmdlineargs.cpp:287
 msgid ""
-"This sample text illustrates the current settings. You may edit it to test "
-"special characters."
+"sets the default background color and an\n"
+"application palette (light and dark shades are\n"
+"calculated)"
 msgstr ""
-"Mae'r testun engraifft yma yn dangos y gosodiadau cyfredol. Cewch ei golygu "
-"er mwyn arbrofi llythrennau arbennig."
-
-#: kdeui/fonts/kfontchooser.cpp:406 kdeui/fonts/kfontchooser.cpp:417
-msgid "Actual Font"
-msgstr "Gwir Wynebfath"
+"gosod y lliw cefndir rhagosodol a\n"
+"palêt cymhwysiad (mae cysgodau\n"
+" golau a tywyll yn cael eu cyfrifo)"
 
-#. i18n: Filtering message, so that translators can script the
-#. style string according to the font family name (e.g. may need
-#. noun-adjective congruence wrt. gender of the family name).
-#. The message provides the dynamic context 'family', which is
-#. the family name to which the style string corresponds.
-#: kdeui/fonts/kfontchooser.cpp:630
-#, kde-format
-msgctxt "@item Font style"
-msgid "%1"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:289
+msgid "sets the default foreground color"
+msgstr "Gosod y lliw blaendir rhagosodol"
 
-#: kdeui/xmlgui/kxmlguibuilder.cpp:179 kdeui/xmlgui/kxmlguibuilder.cpp:346
-msgid "No text"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:291
+msgid "sets the default button color"
+msgstr "Gosod y lliw botwm rhagosodol"
 
-#: kdeui/xmlgui/kmenumenuhandler_p.cpp:48
-msgid "Add to Toolbar"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:292
+msgid "sets the application name"
+msgstr "gosod enw'r cymhwysiad"
 
-#: kdeui/xmlgui/kmenumenuhandler_p.cpp:56
-msgid "Configure Shortcut..."
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:293
+msgid "sets the application title (caption)"
+msgstr "gosod teitl y cymhwysiad (egluryn)"
 
-#: kdeui/xmlgui/ktoolbarhandler.cpp:97
-msgid "Toolbars Shown"
+#: kdecore/kernel/kcmdlineargs.cpp:295
+msgid ""
+"forces the application to use a TrueColor visual on\n"
+"an 8-bit display"
 msgstr ""
+"gorfod i'r cymhwysiad ddefnydio \n"
+" gwelediad WirLiw ar arddangosydd 8-did"
 
-#: kdeui/dialogs/kpassworddialog.cpp:70
-msgid "Password"
+#: kdecore/kernel/kcmdlineargs.cpp:296
+msgid ""
+"sets XIM (X Input Method) input style. Possible\n"
+"values are onthespot, overthespot, offthespot and\n"
+"root"
 msgstr ""
+"gosod arddull fewnbwn XIM (X Input Method). Gwerthoedd\n"
+"posib yw onthespot, overthespot, offthespot a root"
 
-#: kdeui/dialogs/klinkdialog.cpp:48
-msgid "Manage Link"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:297
+msgid "set XIM server"
+msgstr "gosod gweinydd XIM"
 
-#: kdeui/dialogs/klinkdialog.cpp:58
-msgid "Link Text:"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:298
+msgid "disable XIM"
+msgstr "analluogi XIM"
 
-#: kdeui/dialogs/klinkdialog.cpp:61
-msgid "Link URL:"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:301
+msgid "forces the application to run as QWS Server"
+msgstr "gorfod i'r cymhwysiad redeg fel Gweinydd QWS"
 
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:79
-msgid ""
-"<qt>No information available.<br />The supplied KAboutData object does not "
-"exist.</qt>"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:303
+msgid "mirrors the whole layout of widgets"
+msgstr "adlewyrchu gosodiad cyfan y celfigion"
 
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:107
-#, kde-format
-msgid ""
-"<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />&nbsp;</html>"
+#: kdecore/kernel/kcmdlineargs.cpp:304
+msgid "applies the Qt stylesheet to the application widgets"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:111
-#, kde-format
-msgctxt ""
-"Program name, version and KDE platform version; do not translate "
-"'Development Platform'"
+#: kdecore/kernel/kcmdlineargs.cpp:305
 msgid ""
-"<html><font size=\"5\">%1</font><br /><b>Version %2</b><br />Using KDE "
-"Development Platform %3</html>"
+"use a different graphics system instead of the default one, options are "
+"raster and opengl (experimental)"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:145
-#, kde-format
-msgid "License: %1"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:307
+msgid "Use 'caption' as name in the titlebar"
+msgstr "defnyddio 'egluryn' fel enw yn y bar-teitl"
 
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:282
-msgid "License Agreement"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:308
+msgid "Use 'icon' as the application icon"
+msgstr "defnyddio 'eicon' fel eicon y cymhwysiad"
 
-#: kdeui/dialogs/ktip.cpp:230
-msgid "Tip of the Day"
-msgstr "Awgrymiad y Dydd"
+#: kdecore/kernel/kcmdlineargs.cpp:309
+msgid "Use alternative configuration file"
+msgstr "defnyddio ffeil ffurfweddiad arall"
 
-#: kdeui/dialogs/ktip.cpp:249
-msgid "Did you know...?\n"
-msgstr "Oeddech chi'n gwybod ...?\n"
+#: kdecore/kernel/kcmdlineargs.cpp:310
+msgid "Disable crash handler, to get core dumps"
+msgstr "analluogi'r trinydd chwalfa, er mwyn cael dadlwythiadau craidd"
 
-#: kdeui/dialogs/ktip.cpp:301
-msgid "&Show tips on startup"
-msgstr "&Dangos awgrymiadau wrth gychwyn"
+#: kdecore/kernel/kcmdlineargs.cpp:312
+msgid "Waits for a WM_NET compatible windowmanager"
+msgstr "aros am reolydd ffenestri sy'n gyfaddas i WM_NET"
 
-#: kdeui/dialogs/ktip.cpp:309
-msgctxt "Opposite to Previous"
-msgid "&Next"
-msgstr "&Nesaf"
+#: kdecore/kernel/kcmdlineargs.cpp:314
+msgid "sets the application GUI style"
+msgstr "gosod arddull GUI y cymhwysiad"
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:41
-msgid "Shortcut Schemes"
+#: kdecore/kernel/kcmdlineargs.cpp:315
+msgid ""
+"sets the client geometry of the main widget - see man X for the argument "
+"format (usually WidthxHeight+XPos+YPos)"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:59
-msgid "Current scheme:"
+#: kdecore/kernel/kcmdlineargs.cpp:433
+msgid "KDE Application"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:69
-msgid "New..."
+#: kdecore/kernel/kcmdlineargs.cpp:492
+msgid "Qt"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:72
-msgid "Delete"
-msgstr "Dileu"
+#: kdecore/kernel/kcmdlineargs.cpp:495 khtml/khtml_part.cpp:4819
+msgid "KDE"
+msgstr "KDE"
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:75
-msgid "More Actions"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:798 kdecore/kernel/kcmdlineargs.cpp:814
+#, kde-format
+msgid "Unknown option '%1'."
+msgstr "Dewis anhysbys '%1'."
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:79
-msgid "Save as Scheme Defaults"
+#: kdecore/kernel/kcmdlineargs.cpp:822
+#, kde-format
+msgctxt "@info:shell %1 is cmdoption name"
+msgid "'%1' missing."
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:81
-msgid "Export Scheme..."
+#: kdecore/kernel/kcmdlineargs.cpp:888
+#, kde-format
+msgctxt ""
+"@info:shell message on appcmd --version; do not translate 'Development "
+"Platform'%3 application name, other %n version strings"
+msgid ""
+"Qt: %1\n"
+"KDE Development Platform: %2\n"
+"%3: %4\n"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:98
-msgid "Name for New Scheme"
+#: kdecore/kernel/kcmdlineargs.cpp:913
+#, kde-format
+msgctxt "the 2nd argument is a list of name+address, one on each line"
+msgid ""
+"%1 was written by\n"
+"%2"
 msgstr ""
+"ysgrifennwyd %1 gan\n"
+"%2"
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:99
-msgid "Name for new scheme:"
+#: kdecore/kernel/kcmdlineargs.cpp:916
+msgid ""
+"This application was written by somebody who wants to remain anonymous."
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:99
-msgid "New Scheme"
+#: kdecore/kernel/kcmdlineargs.cpp:923
+msgid "Please use http://bugs.kde.org to report bugs.\n"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:105
-msgid "A scheme with this name already exists."
+#: kdecore/kernel/kcmdlineargs.cpp:925
+#, kde-format
+msgid "Please report bugs to %1.\n"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:133
+#: kdecore/kernel/kcmdlineargs.cpp:962
 #, kde-format
-msgid ""
-"Do you really want to delete the scheme %1?\n"
-"Note that this will not remove any system wide shortcut schemes."
-msgstr ""
+msgid "Unexpected argument '%1'."
+msgstr "Ymresymiad annisgwyl '%1'."
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:162
-msgid "Export to Location"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1086
+msgid "Use --help to get a list of available command line options."
+msgstr "Defnyddiwch --help i gael rhestr o ddewisiadau llinell gorchymyn."
 
-#: kdeui/dialogs/kshortcutschemeseditor.cpp:171
-msgid "Could not export shortcuts scheme because the location is invalid."
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1109
+msgid "[options] "
+msgstr "[dewisiadau] "
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:167
-msgid "Left to Right, Top to Bottom"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1116
+#, kde-format
+msgid "[%1-options]"
+msgstr "[%1-dewisiadau]"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:168
-msgid "Left to Right, Bottom to Top"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1137
+#, kde-format
+msgid "Usage: %1 %2\n"
+msgstr "Defnyddir: %1 %2\n"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:169
-msgid "Right to Left, Bottom to Top"
+#: kdecore/kernel/kcmdlineargs.cpp:1140
+msgid ""
+"\n"
+"Generic options:\n"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:170
-msgid "Right to Left, Top to Bottom"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1142
+msgid "Show help about options"
+msgstr "Dangos cymorth am ddewisiadau"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:171
-msgid "Bottom to Top, Left to Right"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1150
+#, kde-format
+msgid "Show %1 specific options"
+msgstr "Dangos %1 dewisiadau penodol"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:172
-msgid "Bottom to Top, Right to Left"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1157
+msgid "Show all options"
+msgstr "Dangos y dewisiadau i gyd"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:173
-msgid "Top to Bottom, Left to Right"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1158
+msgid "Show author information"
+msgstr "Dangos gwybodaeth awdur"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:174
-msgid "Top to Bottom, Right to Left"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1159
+msgid "Show version information"
+msgstr "Dangos gwybodaeth fersiwn"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:191
-msgctxt "No border line"
-msgid "None"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1160
+msgid "Show license information"
+msgstr "Dangos gwybodaeth trwydded"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:192
-msgid "Single Line"
-msgstr ""
+#: kdecore/kernel/kcmdlineargs.cpp:1161
+msgid "End of options"
+msgstr "Diwedd y dewisiadau"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:193
-msgid "Single Thick Line"
+#: kdecore/kernel/kcmdlineargs.cpp:1182
+#, kde-format
+msgid ""
+"\n"
+"%1 options:\n"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:194
-msgid "Double Line"
+#: kdecore/kernel/kcmdlineargs.cpp:1184
+msgid ""
+"\n"
+"Options:\n"
 msgstr ""
+"\n"
+"Dewisiadau:\n"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:195
-msgid "Double Thick Line"
+#: kdecore/kernel/kcmdlineargs.cpp:1242
+msgid ""
+"\n"
+"Arguments:\n"
 msgstr ""
+"\n"
+"Ymresymiadau:\n"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:212
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:235
-msgctxt "Banner page"
-msgid "None"
+#: kdecore/kernel/kcmdlineargs.cpp:1596
+msgid "The files/URLs opened by the application will be deleted after use"
 msgstr ""
+"Bydd y ffeiliau/URLau a agorir gan y cymhwysiad yn cael eiu dileu wedi'u "
+"defnyddio"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:213
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:236
-msgctxt "Banner page"
-msgid "Standard"
+#: kdecore/kernel/kcmdlineargs.cpp:1597
+msgid "KDE-tempfile"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:214
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:237
-msgctxt "Banner page"
-msgid "Unclassified"
+#: kdecore/kernel/ktoolinvocation.cpp:79
+msgid "Function must be called from the main thread."
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:215
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:238
-msgctxt "Banner page"
-msgid "Confidential"
+#: kdecore/kernel/ktoolinvocation.cpp:120
+#, kde-format
+msgid ""
+"Error launching %1. Either KLauncher is not running anymore, or it failed to "
+"start the application."
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:216
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:239
-msgctxt "Banner page"
-msgid "Classified"
+#: kdecore/kernel/ktoolinvocation.cpp:123
+#, kde-format
+msgid ""
+"KLauncher could not be reached via D-Bus. Error when calling %1:\n"
+"%2\n"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:217
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:240
-msgctxt "Banner page"
-msgid "Secret"
+#: kdecore/kernel/ktoolinvocation.cpp:302
+#, kde-format
+msgid ""
+"Could not launch the KDE Help Center:\n"
+"\n"
+"%1"
 msgstr ""
+"Methodd gychwyn y Ganolfan Gymorth KDE :\n"
+"\n"
+"%1"
 
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:218
-#: kdeui/dialogs/kcupsoptionspageswidget_p.cpp:241
-msgctxt "Banner page"
-msgid "Top Secret"
-msgstr ""
+#: kdecore/kernel/ktoolinvocation.cpp:303
+msgid "Could not Launch Help Center"
+msgstr "Methodd gychwyn Canolfan Gymorth"
 
-#. i18n: Filter for the Yes-button text in standard message dialogs,
-#. after the message caption/text have been translated.
-#: kdeui/dialogs/kmessagebox.cpp:52
-#, kde-format
-msgctxt "@action:button filter-yes"
-msgid "%1"
+#: kdecore/kernel/kaboutdata.cpp:271
+msgid ""
+"No licensing terms for this program have been specified.\n"
+"Please check the documentation or the source for any\n"
+"licensing terms.\n"
 msgstr ""
+"Ni phenodwyd termau trwyddedu am y rhaglen yma.\n"
+"Gwiriwch y ddogfeniaeth neu'r côd am unrhyw dermau \n"
+"trwyddedu.\n"
 
-#. i18n: Filter for the No-button text in standard message dialogs,
-#. after the message caption/text have been translated.
-#: kdeui/dialogs/kmessagebox.cpp:58
+#: kdecore/kernel/kaboutdata.cpp:277
 #, kde-format
-msgctxt "@action:button filter-no"
-msgid "%1"
+msgid "This program is distributed under the terms of the %1."
+msgstr "Dosbarthir y rhaglen yma dan dermau'r %1."
+
+#: kdecore/kernel/kaboutdata.cpp:302
+msgctxt "@item license (short name)"
+msgid "GPL v2"
 msgstr ""
 
-#. i18n: Filter for the Continue-button text in standard message dialogs,
-#. after the message caption/text have been translated.
-#: kdeui/dialogs/kmessagebox.cpp:64
-#, kde-format
-msgctxt "@action:button filter-continue"
-msgid "%1"
+#: kdecore/kernel/kaboutdata.cpp:303
+msgctxt "@item license"
+msgid "GNU General Public License Version 2"
 msgstr ""
 
-#. i18n: Filter for the Cancel-button text in standard message dialogs,
-#. after the message caption/text have been translated.
-#: kdeui/dialogs/kmessagebox.cpp:70
-#, kde-format
-msgctxt "@action:button filter-cancel"
-msgid "%1"
+#: kdecore/kernel/kaboutdata.cpp:306
+msgctxt "@item license (short name)"
+msgid "LGPL v2"
 msgstr ""
 
-#. i18n: Called after the button texts in standard message dialogs
-#. have been filtered by the messages above. Not visible to user.
-#: kdeui/dialogs/kmessagebox.cpp:75
-msgctxt "@action:button post-filter"
-msgid "."
+#: kdecore/kernel/kaboutdata.cpp:307
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 2"
 msgstr ""
 
-#: kdeui/dialogs/kmessagebox.cpp:457 kdeui/dialogs/kmessagebox.cpp:518
-msgid "Question"
-msgstr "Cwestiwn"
-
-#: kdeui/dialogs/kmessagebox.cpp:474 kdeui/dialogs/kmessagebox.cpp:536
-#: kdeui/dialogs/kmessagebox.cpp:623 kdeui/dialogs/kmessagebox.cpp:703
-#: kdeui/dialogs/kmessagebox.cpp:790
-msgid "Do not ask again"
-msgstr "Peidiwch a gofyn eto"
+#: kdecore/kernel/kaboutdata.cpp:310
+msgctxt "@item license (short name)"
+msgid "BSD License"
+msgstr ""
 
-#: kdeui/dialogs/kmessagebox.cpp:606 kdeui/dialogs/kmessagebox.cpp:686
-#: kdeui/dialogs/kmessagebox.cpp:773
-msgid "Warning"
-msgstr "Rhybudd"
+#: kdecore/kernel/kaboutdata.cpp:311
+msgctxt "@item license"
+msgid "BSD License"
+msgstr ""
 
-#: kdeui/dialogs/kmessagebox.cpp:907 kdeui/dialogs/kmessagebox.cpp:937
-msgid "Sorry"
-msgstr "Ymddiheuriad"
+#: kdecore/kernel/kaboutdata.cpp:314
+msgctxt "@item license (short name)"
+msgid "Artistic License"
+msgstr ""
 
-#: kdeui/dialogs/kmessagebox.cpp:982
-msgid "Information"
-msgstr "Gwybodaeth"
+#: kdecore/kernel/kaboutdata.cpp:315
+msgctxt "@item license"
+msgid "Artistic License"
+msgstr ""
 
-#: kdeui/dialogs/kmessagebox.cpp:999
-msgid "Do not show this message again"
-msgstr "Peidiwch â dangos y neges yma eto"
+#: kdecore/kernel/kaboutdata.cpp:318
+msgctxt "@item license (short name)"
+msgid "QPL v1.0"
+msgstr ""
 
-#: kdeui/dialogs/kdeprintdialog.cpp:73
-msgctxt "@title:window"
-msgid "Print"
+#: kdecore/kernel/kaboutdata.cpp:319
+msgctxt "@item license"
+msgid "Q Public License"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutsdialog.cpp:67
-msgid ""
-"The current shortcut scheme is modified. Save before switching to the new "
-"one?"
+#: kdecore/kernel/kaboutdata.cpp:322
+msgctxt "@item license (short name)"
+msgid "GPL v3"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutsdialog.cpp:122
-msgid "Configure Shortcuts"
-msgstr "Ffurfweddu Byrlwybrau"
+#: kdecore/kernel/kaboutdata.cpp:323
+msgctxt "@item license"
+msgid "GNU General Public License Version 3"
+msgstr ""
 
-#: kdeui/dialogs/kshortcutsdialog.cpp:124 kdeui/util/kkeyserver_x11.cpp:113
-msgid "Print"
-msgstr "Argraffu"
+#: kdecore/kernel/kaboutdata.cpp:326
+msgctxt "@item license (short name)"
+msgid "LGPL v3"
+msgstr ""
 
-#: kdeui/dialogs/kshortcutsdialog.cpp:129
-msgid "Reset to Defaults"
+#: kdecore/kernel/kaboutdata.cpp:327
+msgctxt "@item license"
+msgid "GNU Lesser General Public License Version 3"
 msgstr ""
 
-#: kdeui/dialogs/kconfigdialog.cpp:69 kutils/kcmultidialog.cpp:163
-msgid "Configure"
-msgstr "Ffurfweddu"
+#: kdecore/kernel/kaboutdata.cpp:331
+msgctxt "@item license"
+msgid "Custom"
+msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:60
-msgctxt "Action to send an email to a contributor"
-msgid "Email contributor"
+#: kdecore/kernel/kaboutdata.cpp:334
+msgctxt "@item license"
+msgid "Not specified"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:65
-msgid "Visit contributor's homepage"
+#: kdecore/kernel/kaboutdata.cpp:875
+msgctxt "replace this with information about your translation team"
+msgid ""
+"<p>KDE is translated into many languages thanks to the work of the "
+"translation teams all over the world.</p><p>For more information on KDE "
+"internationalization visit <a "
+"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:126
-#, kde-format
-msgctxt "Action to send an email to a contributor"
+#: kdecore/kernel/kaboutdata.cpp:879
 msgid ""
-"Email contributor\n"
-"%1"
+"<p>Kubuntu includes additions and alterations to the KDE translation from <a "
+"href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:131
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:168
+#: kdecore/kernel/ktoolinvocation_x11.cpp:281
 #, kde-format
 msgid ""
-"Visit contributor's homepage\n"
+"Could not launch the mail client:\n"
+"\n"
 "%1"
 msgstr ""
+"Methodd gychwyn y dibynnydd ebost:\n"
+"\n"
+"%1"
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:138
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:172
-#, kde-format
-msgid ""
-"Visit contributor's profile on %1\n"
-"%2"
+#: kdecore/kernel/ktoolinvocation_x11.cpp:282
+msgid "Could not launch Mail Client"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:160
+#: kdecore/kernel/ktoolinvocation_x11.cpp:334
+#: kdecore/kernel/ktoolinvocation_x11.cpp:359
+#: kdecore/kernel/ktoolinvocation_x11.cpp:379
 #, kde-format
 msgid ""
-"Visit contributor's page\n"
+"Could not launch the browser:\n"
+"\n"
+"%1"
+msgstr ""
+"Methodd gychwyn y porydd:\n"
+"\n"
 "%1"
+
+#: kdecore/kernel/ktoolinvocation_x11.cpp:335
+#: kdecore/kernel/ktoolinvocation_x11.cpp:360
+#: kdecore/kernel/ktoolinvocation_x11.cpp:380
+msgid "Could not launch Browser"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonlistdelegate_p.cpp:164
+#: kdecore/kernel/ktoolinvocation_x11.cpp:419
 #, kde-format
 msgid ""
-"Visit contributor's blog\n"
+"Could not launch the terminal client:\n"
+"\n"
 "%1"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationdialog.cpp:219
-#, kde-format
-msgctxt "@item Contributor name in about dialog."
-msgid "%1"
+#: kdecore/kernel/ktoolinvocation_x11.cpp:420
+msgid "Could not launch Terminal Client"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:127
-#: kdeui/widgets/kcharselectdata.cpp:644
-msgid "Unknown"
-msgstr "Anhysbys"
+#: kdecore/localization/klocale_kde.cpp:1097
+msgctxt "digit set"
+msgid "Arabic-Indic"
+msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:566
-#: kdeui/dialogs/kshortcutseditor.cpp:582
-msgid "Key Conflict"
-msgstr "Croestyniad Bysell"
+#: kdecore/localization/klocale_kde.cpp:1100
+msgctxt "digit set"
+msgid "Bengali"
+msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:567
-#, kde-format
-msgid ""
-"The '%1' shape gesture has already been allocated to the \"%2\" action.\n"
-"Do you want to reassign it from that action to the current one?"
+#: kdecore/localization/klocale_kde.cpp:1103
+msgctxt "digit set"
+msgid "Devanagari"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:583
-#, kde-format
-msgid ""
-"The '%1' rocker gesture has already been allocated to the \"%2\" action.\n"
-"Do you want to reassign it from that action to the current one?"
+#: kdecore/localization/klocale_kde.cpp:1106
+msgctxt "digit set"
+msgid "Eastern Arabic-Indic"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:624
-#, kde-format
-msgctxt "header for an applications shortcut list"
-msgid "Shortcuts for %1"
+#: kdecore/localization/klocale_kde.cpp:1109
+msgctxt "digit set"
+msgid "Gujarati"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:644
-msgid "Global:"
+#: kdecore/localization/klocale_kde.cpp:1112
+msgctxt "digit set"
+msgid "Gurmukhi"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:659
-msgid "Action Name"
+#: kdecore/localization/klocale_kde.cpp:1115
+msgctxt "digit set"
+msgid "Kannada"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditor.cpp:663
-msgid "Shortcuts"
-msgstr "Byrlwybrau"
+#: kdecore/localization/klocale_kde.cpp:1118
+msgctxt "digit set"
+msgid "Khmer"
+msgstr ""
 
-#: kdeui/dialogs/kshortcuteditwidget.cpp:55
-msgid "Default:"
+#: kdecore/localization/klocale_kde.cpp:1121
+msgctxt "digit set"
+msgid "Malayalam"
 msgstr ""
 
-#: kdeui/dialogs/kshortcuteditwidget.cpp:56
-#: kdeui/dialogs/kshortcuteditwidget.cpp:59
-#: kdeui/widgets/kkeysequencewidget.cpp:701
-msgctxt "No shortcut defined"
-msgid "None"
+#: kdecore/localization/klocale_kde.cpp:1124
+msgctxt "digit set"
+msgid "Oriya"
 msgstr ""
 
-#: kdeui/dialogs/kshortcuteditwidget.cpp:62
-msgid "Custom:"
+#: kdecore/localization/klocale_kde.cpp:1127
+msgctxt "digit set"
+msgid "Tamil"
 msgstr ""
 
-#: kdeui/dialogs/kshortcutseditoritem.cpp:45
+#: kdecore/localization/klocale_kde.cpp:1130
+msgctxt "digit set"
+msgid "Telugu"
+msgstr ""
+
+#: kdecore/localization/klocale_kde.cpp:1133
+msgctxt "digit set"
+msgid "Thai"
+msgstr ""
+
+#: kdecore/localization/klocale_kde.cpp:1136
+msgctxt "digit set"
+msgid "Arabic"
+msgstr ""
+
+#: kdecore/localization/klocale_kde.cpp:1141
 #, kde-format
-msgctxt "@item:intable Action name in shortcuts configuration"
-msgid "%1"
+msgctxt "name of digit set with digit string, e.g. 'Arabic (0123456789)'"
+msgid "%1 (%2)"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:98
-msgid "Switch Application Language"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1638
+#, kde-format
+msgctxt "size in bytes"
+msgid "%1 B"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:108
-msgid "Please choose the language which should be used for this application:"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1643
+#, kde-format
+msgctxt "size in 1000 bytes"
+msgid "%1 kB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:136
-msgid "Add Fallback Language"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1645
+#, kde-format
+msgctxt "size in 10^6 bytes"
+msgid "%1 MB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:137
-msgid ""
-"Adds one more language which will be used if other translations do not "
-"contain a proper translation."
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1647
+#, kde-format
+msgctxt "size in 10^9 bytes"
+msgid "%1 GB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:227
-msgid ""
-"The language for this application has been changed. The change will take "
-"effect the next time the application is started."
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1649
+#, kde-format
+msgctxt "size in 10^12 bytes"
+msgid "%1 TB"
+msgstr ""
+
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1651
+#, kde-format
+msgctxt "size in 10^15 bytes"
+msgid "%1 PB"
+msgstr ""
+
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1653
+#, kde-format
+msgctxt "size in 10^18 bytes"
+msgid "%1 EB"
+msgstr ""
+
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1655
+#, kde-format
+msgctxt "size in 10^21 bytes"
+msgid "%1 ZB"
+msgstr ""
+
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1657
+#, kde-format
+msgctxt "size in 10^24 bytes"
+msgid "%1 YB"
+msgstr ""
+
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1662
+#, kde-format
+msgctxt "memory size in 1024 bytes"
+msgid "%1 KB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:228
-msgid "Application Language Changed"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1664
+#, kde-format
+msgctxt "memory size in 2^20 bytes"
+msgid "%1 MB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:281
-msgid "Primary language:"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1666
+#, kde-format
+msgctxt "memory size in 2^30 bytes"
+msgid "%1 GB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:281
-msgid "Fallback language:"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1668
+#, kde-format
+msgctxt "memory size in 2^40 bytes"
+msgid "%1 TB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:312
-msgid ""
-"This is the main application language which will be used first, before any "
-"other languages."
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1670
+#, kde-format
+msgctxt "memory size in 2^50 bytes"
+msgid "%1 PB"
 msgstr ""
 
-#: kdeui/dialogs/kswitchlanguagedialog_p.cpp:313
-msgid ""
-"This is the language which will be used if any previous languages do not "
-"contain a proper translation."
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1672
+#, kde-format
+msgctxt "memory size in 2^60 bytes"
+msgid "%1 EB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:42
-msgid "About KDE"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1674
+#, kde-format
+msgctxt "memory size in 2^70 bytes"
+msgid "%1 ZB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:46
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1676
 #, kde-format
-msgid ""
-"<html><font size=\"5\">KDE - Be Free!</font><br /><b>Platform Version "
-"%1</b></html>"
+msgctxt "memory size in 2^80 bytes"
+msgid "%1 YB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:56
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1682
 #, kde-format
-msgid ""
-"<html><b>KDE</b> is a world-wide network of software engineers, artists, "
-"writers, translators and facilitators who are committed to <a "
-"href=\"%1\">Free Software</a> development. This community has created "
-"hundreds of Free Software applications as part of the KDE Development "
-"Platform and KDE Software Distribution.<br /><br />KDE is a cooperative "
-"enterprise in which no single entity controls the efforts or products of KDE "
-"to the exclusion of others. Everyone is welcome to join and contribute to "
-"KDE, including you.<br /><br />Visit <a href=\"%2\">%2</a> for more "
-"information about the KDE community and the software we produce.</html>"
+msgctxt "size in 1024 bytes"
+msgid "%1 KiB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:75
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1684
 #, kde-format
-msgid ""
-"<html>Software can always be improved, and the KDE team is ready to do so. "
-"However, you - the user - must tell us when something does not work as "
-"expected or could be done better.<br /><br />KDE has a bug tracking system. "
-"Visit <a href=\"%1\">%1</a> or use the \"Report Bug...\" dialog from the "
-"\"Help\" menu to report bugs.<br /><br />If you have a suggestion for "
-"improvement then you are welcome to use the bug tracking system to register "
-"your wish. Make sure you use the severity called \"Wishlist\".</html>"
+msgctxt "size in 2^20 bytes"
+msgid "%1 MiB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:93
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1686
 #, kde-format
-msgid ""
-"<html>You do not have to be a software developer to be a member of the KDE "
-"team. You can join the national teams that translate program interfaces. You "
-"can provide graphics, themes, sounds, and improved documentation. You "
-"decide!<br /><br />Visit <a href=\"%1\">%1</a> for information on some "
-"projects in which you can participate.<br /><br />If you need more "
-"information or documentation, then a visit to <a href=\"%2\">%2</a> will "
-"provide you with what you need.</html>"
+msgctxt "size in 2^30 bytes"
+msgid "%1 GiB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:115
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1688
 #, kde-format
-msgid ""
-"<html>KDE software is and will always be available free of charge, however "
-"creating it is not free.<br /><br />To support development the KDE community "
-"has formed the KDE e.V., a non-profit organization legally founded in "
-"Germany. KDE e.V. represents the KDE community in legal and financial "
-"matters. See <a href=\"%1\">%1</a> for information on KDE e.V.<br /><br "
-"/>KDE benefits from many kinds of contributions, including financial. We use "
-"the funds to reimburse members and others for expenses they incur when "
-"contributing. Further funds are used for legal support and organizing "
-"conferences and meetings. <br /> <br />We would like to encourage you to "
-"support our efforts with a financial donation, using one of the ways "
-"described at <a href=\"%2\">%2</a>.<br /><br />Thank you very much in "
-"advance for your support.</html>"
+msgctxt "size in 2^40 bytes"
+msgid "%1 TiB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:126
-msgctxt "About KDE"
-msgid "&About"
-msgstr "&Ynghylch"
-
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:127
-msgid "&Report Bugs or Wishes"
-msgstr "&Adrodd Namau neu Dymuniadau"
-
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:128
-msgid "&Join KDE"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1690
+#, kde-format
+msgctxt "size in 2^50 bytes"
+msgid "%1 PiB"
 msgstr ""
 
-#: kdeui/dialogs/kaboutkdedialog_p.cpp:129
-msgid "&Support KDE"
-msgstr "&Cefnogi KDE"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1692
+#, kde-format
+msgctxt "size in 2^60 bytes"
+msgid "%1 EiB"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:92 kdeui/dialogs/kbugreport.cpp:117
-msgid "Submit Bug Report"
-msgstr "Cyflwyno Adroddiad Nam"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1694
+#, kde-format
+msgctxt "size in 2^70 bytes"
+msgid "%1 ZiB"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:129
-msgid ""
-"Your email address. If incorrect, use the Configure Email button to change it"
+#. i18n: Dumb message, avoid any markup or scripting.
+#: kdecore/localization/klocale_kde.cpp:1696
+#, kde-format
+msgctxt "size in 2^80 bytes"
+msgid "%1 YiB"
 msgstr ""
-"Eich cyfeiriad ebost. Os bo'n anghywir, defnyddiwch y botwm Ffurfweddu Ebost "
-"i'w newid."
 
-#: kdeui/dialogs/kbugreport.cpp:130
-msgctxt "Email sender address"
-msgid "From:"
+#: kdecore/localization/klocale_kde.cpp:1783
+#, kde-format
+msgctxt "@item:intext %1 is a real number, e.g. 1.23 days"
+msgid "%1 days"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:139
-msgid "Configure Email..."
-msgstr "Ffurfweddu Ebost ..."
+#: kdecore/localization/klocale_kde.cpp:1786
+#, kde-format
+msgctxt "@item:intext %1 is a real number, e.g. 1.23 hours"
+msgid "%1 hours"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:146
-msgid "The email address this bug report is sent to."
-msgstr "Y gyfeiriad ebost a anfonir yr adroddiad nam yma iddi."
+#: kdecore/localization/klocale_kde.cpp:1789
+#, kde-format
+msgctxt "@item:intext %1 is a real number, e.g. 1.23 minutes"
+msgid "%1 minutes"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:147
-msgctxt "Email receiver address"
-msgid "To:"
+#: kdecore/localization/klocale_kde.cpp:1792
+#, kde-format
+msgctxt "@item:intext %1 is a real number, e.g. 1.23 seconds"
+msgid "%1 seconds"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:155
-msgid "&Send"
-msgstr "&Anfon"
+#: kdecore/localization/klocale_kde.cpp:1795
+#, kde-format
+msgctxt "@item:intext"
+msgid "%1 millisecond"
+msgid_plural "%1 milliseconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/dialogs/kbugreport.cpp:155
-msgid "Send bug report."
-msgstr "Anfon Adroddiad Nam"
+#: kdecore/localization/klocale_kde.cpp:1802
+#, kde-format
+msgctxt "@item:intext"
+msgid "1 day"
+msgid_plural "%1 days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/dialogs/kbugreport.cpp:156
+#: kdecore/localization/klocale_kde.cpp:1804
 #, kde-format
-msgid "Send this bug report to %1."
-msgstr "Anfonwch yr adroddiad nam yma i %1."
+msgctxt "@item:intext"
+msgid "1 hour"
+msgid_plural "%1 hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/dialogs/kbugreport.cpp:166
-msgid ""
-"The application for which you wish to submit a bug report - if incorrect, "
-"please use the Report Bug menu item of the correct application"
-msgstr ""
-"Y cymhwysiad a ddymunir cyflwyno adroddiad nam amdano - os yn anghywir, "
-"defnyddiwch yr eitem dewislen Adrodd Nam o'r rhaglen cywir."
+#: kdecore/localization/klocale_kde.cpp:1806
+#, kde-format
+msgctxt "@item:intext"
+msgid "1 minute"
+msgid_plural "%1 minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/dialogs/kbugreport.cpp:167
-msgid "Application: "
-msgstr "Cymhwysiad: "
+#: kdecore/localization/klocale_kde.cpp:1808
+#, kde-format
+msgctxt "@item:intext"
+msgid "1 second"
+msgid_plural "%1 seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/dialogs/kbugreport.cpp:195
-msgid ""
-"The version of this application - please make sure that no newer version is "
-"available before sending a bug report"
+#: kdecore/localization/klocale_kde.cpp:1832
+#, kde-format
+msgctxt ""
+"@item:intext days and hours. This uses the previous item:intext messages. If "
+"this does not fit the grammar of your language please contact the i18n team "
+"to solve the problem"
+msgid "%1 and %2"
 msgstr ""
-"Fersiwn y cymhwysiad yma - sicrhewch nad oes fersiwn newyddach ar gael cyn "
-"anfon adroddiad nam"
 
-#: kdeui/dialogs/kbugreport.cpp:202
-msgid "no version set (programmer error)"
+#: kdecore/localization/klocale_kde.cpp:1838
+#, kde-format
+msgctxt ""
+"@item:intext hours and minutes. This uses the previous item:intext messages. "
+"If this does not fit the grammar of your language please contact the i18n "
+"team to solve the problem"
+msgid "%1 and %2"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:213
-msgid "OS:"
-msgstr "SG:"
-
-#: kdeui/dialogs/kbugreport.cpp:226
-msgid "Compiler:"
-msgstr "Crynhoydd:"
-
-#: kdeui/dialogs/kbugreport.cpp:235
-msgid "Se&verity"
-msgstr "Lly&mder"
-
-#: kdeui/dialogs/kbugreport.cpp:237
-msgid "Critical"
-msgstr "Critigol"
-
-#: kdeui/dialogs/kbugreport.cpp:237
-msgid "Grave"
-msgstr "Peryglus"
-
-#: kdeui/dialogs/kbugreport.cpp:237
-msgctxt "normal severity"
-msgid "Normal"
-msgstr "Arferol"
+#: kdecore/localization/klocale_kde.cpp:1845
+#, kde-format
+msgctxt ""
+"@item:intext minutes and seconds. This uses the previous item:intext "
+"messages. If this does not fit the grammar of your language please contact "
+"the i18n team to solve the problem"
+msgid "%1 and %2"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:237
-msgid "Wishlist"
-msgstr "Rhestr dymuniadau"
+#: kdecore/localization/klocale_kde.cpp:2472
+msgctxt "Before Noon KLocale::LongName"
+msgid "Ante Meridiem"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:237
-msgid "Translation"
-msgstr "Cyfieithiad"
+#: kdecore/localization/klocale_kde.cpp:2473
+msgctxt "Before Noon KLocale::ShortName"
+msgid "AM"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:254
-msgid "S&ubject: "
-msgstr "&Pwnc: "
+#: kdecore/localization/klocale_kde.cpp:2474
+msgctxt "Before Noon KLocale::NarrowName"
+msgid "A"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:262
-msgid ""
-"Enter the text (in English if possible) that you wish to submit for the bug "
-"report.\n"
-"If you press \"Send\", a mail message will be sent to the maintainer of this "
-"program.\n"
+#: kdecore/localization/klocale_kde.cpp:2477
+msgctxt "After Noon KLocale::LongName"
+msgid "Post Meridiem"
 msgstr ""
-"Mewnosodwch y testun (mewn Saesneg os yn bosib) y dymunwch yrru ynglyn â'r "
-"adroddiad nam.\n"
-"Os gwthiwch \"Anfon\", anfonir neges ebost i ofalwr y rhaglen yma.\n"
 
-#: kdeui/dialogs/kbugreport.cpp:285
-msgid ""
-"<qt>To submit a bug report, click on the button below. This will open a web "
-"browser window on <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
-"where you will find a form to fill in. The information displayed above will "
-"be transferred to that server.</qt>"
+#: kdecore/localization/klocale_kde.cpp:2478
+msgctxt "After Noon KLocale::ShortName"
+msgid "PM"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:299
-msgid "&Launch Bug Report Wizard"
-msgstr "&Cychwyn Dewin Adrodd Namau"
+#: kdecore/localization/klocale_kde.cpp:2479
+msgctxt "After Noon KLocale::NarrowName"
+msgid "P"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:350
-msgctxt "unknown program name"
-msgid "unknown"
-msgstr "anhysbys"
+#: kdecore/localization/klocale_kde.cpp:2530
+msgid "Yesterday"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:418
-msgid ""
-"You must specify both a subject and a description before the report can be "
-"sent."
-msgstr "Mae'n rhaid penodi pwnc a disgrifiad hefyd cyn anfonir yr adroddiad."
+#: kdecore/localization/klocale_kde.cpp:2546
+#, kde-format
+msgctxt "concatenation of dates and time"
+msgid "%1 %2"
+msgstr "%1 %2"
 
-#: kdeui/dialogs/kbugreport.cpp:428
-msgid ""
-"<p>You chose the severity <b>Critical</b>. Please note that this severity is "
-"intended only for bugs that:</p><ul><li>break unrelated software on the "
-"system (or the whole system)</li><li>cause serious data "
-"loss</li><li>introduce a security hole on the system where the affected "
-"package is installed</li></ul>\n"
-"<p>Does the bug you are reporting cause any of the above damage? If it does "
-"not, please select a lower severity. Thank you.</p>"
+#: kdecore/localization/klocale_kde.cpp:2586
+#, kde-format
+msgctxt "concatenation of date/time and time zone"
+msgid "%1 %2"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:439
-msgid ""
-"<p>You chose the severity <b>Grave</b>. Please note that this severity is "
-"intended only for bugs that:</p><ul><li>make the package in question "
-"unusable or mostly so</li><li>cause data loss</li><li>introduce a security "
-"hole allowing access to the accounts of users who use the affected "
-"package</li></ul>\n"
-"<p>Does the bug you are reporting cause any of the above damage? If it does "
-"not, please select a lower severity. Thank you.</p>"
+#: kdecore/localization/kencodingdetector.cpp:1145
+#: kdecore/localization/kencodingdetector.cpp:1247
+#: kdecore/localization/kencodingprober.cpp:240
+#: kdecore/localization/kencodingprober.cpp:318
+#: kdecore/localization/kcharsets.cpp:206
+msgctxt "@item Text character set"
+msgid "Unicode"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:453
-msgid ""
-"Unable to send the bug report.\n"
-"Please submit a bug report manually....\n"
-"See http://bugs.kde.org/ for instructions."
+#: kdecore/localization/kencodingdetector.cpp:1147
+#: kdecore/localization/kencodingdetector.cpp:1217
+#: kdecore/localization/kencodingprober.cpp:242
+#: kdecore/localization/kencodingprober.cpp:288
+#: kdecore/localization/kcharsets.cpp:173
+msgctxt "@item Text character set"
+msgid "Cyrillic"
 msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:461
-msgid "Bug report sent, thank you for your input."
-msgstr "Wedi gyrru'r adroddiad nam, diolch am eich cymorth."
+#: kdecore/localization/kencodingdetector.cpp:1149
+#: kdecore/localization/kencodingdetector.cpp:1232
+#: kdecore/localization/kencodingprober.cpp:244
+#: kdecore/localization/kencodingprober.cpp:303
+#: kdecore/localization/kcharsets.cpp:155
+msgctxt "@item Text character set"
+msgid "Western European"
+msgstr ""
 
-#: kdeui/dialogs/kbugreport.cpp:470
-msgid ""
-"Close and discard\n"
-"edited message?"
+#: kdecore/localization/kencodingdetector.cpp:1151
+#: kdecore/localization/kencodingdetector.cpp:1214
+#: kdecore/localization/kencodingprober.cpp:246
+#: kdecore/localization/kencodingprober.cpp:285
+#: kdecore/localization/kcharsets.cpp:161
+msgctxt "@item Text character set"
+msgid "Central European"
 msgstr ""
-"Cau a taflu'r neges\n"
-" a olygwyd?"
 
-#: kdeui/dialogs/kbugreport.cpp:471
-msgid "Close Message"
-msgstr "Cau Neges"
+#: kdecore/localization/kencodingdetector.cpp:1153
+#: kdecore/localization/kencodingdetector.cpp:1220
+#: kdecore/localization/kencodingprober.cpp:248
+#: kdecore/localization/kencodingprober.cpp:291
+#: kdecore/localization/kcharsets.cpp:192
+msgctxt "@item Text character set"
+msgid "Greek"
+msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:90
-msgid "Print Immediately"
+#: kdecore/localization/kencodingdetector.cpp:1155
+#: kdecore/localization/kencodingdetector.cpp:1223
+#: kdecore/localization/kencodingprober.cpp:250
+#: kdecore/localization/kencodingprober.cpp:294
+#: kdecore/localization/kcharsets.cpp:198
+msgctxt "@item Text character set"
+msgid "Hebrew"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:91
-msgid "Hold Indefinitely"
+#: kdecore/localization/kencodingdetector.cpp:1157
+#: kdecore/localization/kencodingdetector.cpp:1229
+#: kdecore/localization/kencodingprober.cpp:252
+#: kdecore/localization/kencodingprober.cpp:300
+#: kdecore/localization/kcharsets.cpp:170
+msgctxt "@item Text character set"
+msgid "Turkish"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:92
-msgid "Day (06:00 to 17:59)"
+#: kdecore/localization/kencodingdetector.cpp:1159
+#: kdecore/localization/kencodingdetector.cpp:1226
+#: kdecore/localization/kencodingprober.cpp:254
+#: kdecore/localization/kencodingprober.cpp:297
+#: kdecore/localization/kcharsets.cpp:188
+msgctxt "@item Text character set"
+msgid "Japanese"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:93
-msgid "Night (18:00 to 05:59)"
+#: kdecore/localization/kencodingdetector.cpp:1161
+#: kdecore/localization/kencodingdetector.cpp:1211
+#: kdecore/localization/kencodingprober.cpp:256
+#: kdecore/localization/kencodingprober.cpp:282
+#: kdecore/localization/kcharsets.cpp:164
+msgctxt "@item Text character set"
+msgid "Baltic"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:94
-msgid "Second Shift (16:00 to 23:59)"
+#: kdecore/localization/kencodingdetector.cpp:1163
+#: kdecore/localization/kencodingdetector.cpp:1208
+#: kdecore/localization/kencodingprober.cpp:262
+#: kdecore/localization/kencodingprober.cpp:279
+#: kdecore/localization/kcharsets.cpp:195
+msgctxt "@item Text character set"
+msgid "Arabic"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:95
-msgid "Third Shift (00:00 to 07:59)"
+#: kdecore/localization/kencodingdetector.cpp:1235
+#: kdecore/localization/kencodingprober.cpp:258
+#: kdecore/localization/kencodingprober.cpp:306
+#: kdecore/localization/kcharsets.cpp:179
+msgctxt "@item Text character set"
+msgid "Chinese Traditional"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:96
-msgid "Weekend (Saturday to Sunday)"
+#: kdecore/localization/kencodingdetector.cpp:1238
+#: kdecore/localization/kencodingprober.cpp:260
+#: kdecore/localization/kencodingprober.cpp:309
+#: kdecore/localization/kcharsets.cpp:182
+msgctxt "@item Text character set"
+msgid "Chinese Simplified"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionsjobwidget_p.cpp:97
-msgid "Specific Time"
+#: kdecore/localization/kencodingdetector.cpp:1241
+#: kdecore/localization/kencodingprober.cpp:312
+#: kdecore/localization/kcharsets.cpp:186
+msgctxt "@item Text character set"
+msgid "Korean"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:66
-msgid "All Pages"
+#: kdecore/localization/kencodingdetector.cpp:1244
+#: kdecore/localization/kencodingprober.cpp:315
+#: kdecore/localization/kcharsets.cpp:203
+msgctxt "@item Text character set"
+msgid "Thai"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:67
-msgid "Odd Pages"
+#: kdecore/localization/kencodingprober.cpp:236
+#: kdecore/localization/kencodingprober.cpp:273
+msgctxt "@item Text character set"
+msgid "Disabled"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:68
-msgid "Even Pages"
+#: kdecore/localization/kencodingprober.cpp:238
+#: kdecore/localization/kencodingprober.cpp:276
+msgctxt "@item Text character set"
+msgid "Universal"
 msgstr ""
 
-#: kdeui/dialogs/kcupsoptionssettingswidget_p.cpp:79
-msgid "Page Set"
+#. i18n: The following messages, with msgctxt "@tag/modifier",
+#. are KUIT patterns for formatting the text found inside semantic tags.
+#. For review of the KUIT semantic markup, see the article on Techbase:
+#. http://techbase.kde.org/Development/Tutorials/Localization/i18n_Semantics
+#. The "/modifier" tells if the pattern is used for plain text, or rich text
+#. which can use HTML tags.
+#. You may be in general satisfied with the patterns as they are in the
+#. original. Some things you may think about changing:
+#. - the proper quotes, those used in msgid are English-standard
+#. - the <i> and <b> tags, does your language script work well with them?
+#: kdecore/localization/kuitsemantics.cpp:501
+#, kde-format
+msgctxt "@title/plain"
+msgid "== %1 =="
 msgstr ""
 
-#: kdeui/dialogs/kpixmapregionselectordialog.cpp:47
-msgid "Select Region of Image"
-msgstr "Dewis Ardal Delwedd"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:505
+#, kde-format
+msgctxt "@title/rich"
+msgid "<h2>%1</h2>"
+msgstr ""
 
-#: kdeui/dialogs/kpixmapregionselectordialog.cpp:52
-msgid "Please click and drag on the image to select the region of interest:"
-msgstr "Cliciwch a llusgo ar y ddelwedd er mwyn dewis yr ardal o ddiddordeb:"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:511
+#, kde-format
+msgctxt "@subtitle/plain"
+msgid "~ %1 ~"
+msgstr ""
 
-#: kdeui/dialogs/kdialog.cpp:251
-msgid "&Try"
-msgstr "&Arbrofi"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:515
+#, kde-format
+msgctxt "@subtitle/rich"
+msgid "<h3>%1</h3>"
+msgstr ""
 
-#: kdeui/dialogs/kdialog.cpp:432
-msgid "modified"
-msgstr "newidwyd"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:541
+#, kde-format
+msgctxt "@item/plain"
+msgid "  * %1"
+msgstr ""
 
-#: kdeui/dialogs/kdialog.cpp:442
-msgctxt "Document/application separator in titlebar"
-msgid " – "
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:545
+#, kde-format
+msgctxt "@item/rich"
+msgid "<li>%1</li>"
 msgstr ""
 
-#: kdeui/dialogs/kdialog.cpp:812
-msgid "&Details"
-msgstr "&Manylion"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:551
+#, kde-format
+msgctxt "@note/plain"
+msgid "Note: %1"
+msgstr ""
 
-#: kdeui/dialogs/kdialog.cpp:958
-msgid "Get help..."
-msgstr "Nôl cymorth..."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:555
+#, kde-format
+msgctxt "@note/rich"
+msgid "<i>Note</i>: %1"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:56
-msgid "--- separator ---"
-msgstr "--- gwahanydd ---"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:560
+#, kde-format
+msgctxt ""
+"@note-with-label/plain\n"
+"%1 is the note label, %2 is the text"
+msgid "%1: %2"
+msgstr ""
+
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:565
+#, kde-format
+msgctxt ""
+"@note-with-label/rich\n"
+"%1 is the note label, %2 is the text"
+msgid "<i>%1</i>: %2"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1493
-msgid "Change Text"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:571
+#, kde-format
+msgctxt "@warning/plain"
+msgid "WARNING: %1"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:298
-msgid "Icon te&xt:"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:575
+#, kde-format
+msgctxt "@warning/rich"
+msgid "<b>Warning</b>: %1"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:303
-msgid "&Hide text when toolbar shows text alongside icons"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:580
+#, kde-format
+msgctxt ""
+"@warning-with-label/plain\n"
+"%1 is the warning label, %2 is the text"
+msgid "%1: %2"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:484
-msgid "Configure Toolbars"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:585
+#, kde-format
+msgctxt ""
+"@warning-with-label/rich\n"
+"%1 is the warning label, %2 is the text"
+msgid "<b>%1</b>: %2"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:533
-msgid ""
-"Do you really want to reset all toolbars of this application to their "
-"default? The changes will be applied immediately."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:600
+#, kde-format
+msgctxt ""
+"@link-with-description/plain\n"
+"%1 is the URL, %2 is the descriptive text"
+msgid "%2 (%1)"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:533
-msgid "Reset Toolbars"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:605
+#, kde-format
+msgctxt ""
+"@link-with-description/rich\n"
+"%1 is the URL, %2 is the descriptive text"
+msgid "<a href=\"%1\">%2</a>"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:831
-msgid "&Toolbar:"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:611
+#, kde-format
+msgctxt "@filename/plain"
+msgid "‘%1’"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:846
-msgid "A&vailable actions:"
-msgstr "G&weithrediadau ar gael:"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:615
+#, kde-format
+msgctxt "@filename/rich"
+msgid "<tt>%1</tt>"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:861 kdeui/dialogs/kedittoolbar.cpp:880
-msgid "Filter"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:621
+#, kde-format
+msgctxt "@application/plain"
+msgid "%1"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:864
-msgid "Curr&ent actions:"
-msgstr "Gweith&rediadau cyfredol:"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:625
+#, kde-format
+msgctxt "@application/rich"
+msgid "%1"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:883
-msgid "Change &Icon..."
-msgstr "Newid E&icon..."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:631
+#, kde-format
+msgctxt "@command/plain"
+msgid "%1"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:893
-msgid "Change Te&xt..."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:635
+#, kde-format
+msgctxt "@command/rich"
+msgid "<tt>%1</tt>"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1044
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:640
 #, kde-format
-msgctxt "@item:intable Action name in toolbar editor"
-msgid "%1"
+msgctxt ""
+"@command-with-section/plain\n"
+"%1 is the command name, %2 is its man section"
+msgid "%1(%2)"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1065
-msgid ""
-"This element will be replaced with all the elements of an embedded component."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:645
+#, kde-format
+msgctxt ""
+"@command-with-section/rich\n"
+"%1 is the command name, %2 is its man section"
+msgid "<tt>%1(%2)</tt>"
 msgstr ""
-"Amnewidir yr elfen yma gan yr elfennau i gyd sy'n biau i gydran mewnol."
 
-#: kdeui/dialogs/kedittoolbar.cpp:1067
-msgid "<Merge>"
-msgstr "<Cyfuno>"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:651
+#, kde-format
+msgctxt "@resource/plain"
+msgid "“%1”"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1069
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:655
 #, kde-format
-msgid "<Merge %1>"
-msgstr "<Cyfuno %1>"
+msgctxt "@resource/rich"
+msgid "“%1”"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1075
-msgid ""
-"This is a dynamic list of actions. You can move it, but if you remove it you "
-"will not be able to re-add it."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:661
+#, kde-format
+msgctxt "@icode/plain"
+msgid "“%1”"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1076
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:665
 #, kde-format
-msgid "ActionList: %1"
-msgstr "RhestrGweithred: %1"
+msgctxt "@icode/rich"
+msgid "<tt>%1</tt>"
+msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1176 kdeui/dialogs/kedittoolbar.cpp:1206
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:681
 #, kde-format
-msgctxt "@label Action tooltip in toolbar editor, below the action list"
+msgctxt "@shortcut/plain"
 msgid "%1"
 msgstr ""
 
-#: kdeui/dialogs/kedittoolbar.cpp:1461
-msgid "Change Icon"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:685
+#, kde-format
+msgctxt "@shortcut/rich"
+msgid "<b>%1</b>"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:205
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:691
 #, kde-format
-msgctxt "City, Country"
-msgid "%1, %2"
+msgctxt "@interface/plain"
+msgid "|%1|"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:311
-msgctxt "A generic social network or homepage link of an unlisted type."
-msgid "Other"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:695
+#, kde-format
+msgctxt "@interface/rich"
+msgid "<i>%1</i>"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:313
-msgctxt "A type of link."
-msgid "Blog"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:701
+#, kde-format
+msgctxt "@emphasis/plain"
+msgid "*%1*"
 msgstr ""
 
-#: kdeui/dialogs/kaboutapplicationpersonmodel_p.cpp:321
-msgctxt "A type of link."
-msgid "Homepage"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:705
+#, kde-format
+msgctxt "@emphasis/rich"
+msgid "<i>%1</i>"
 msgstr ""
 
-#: kdeui/windowmanagement/kwindowsystem_x11.cpp:858
-#: kdeui/windowmanagement/kwindowsystem_mac.cpp:564
-#: kdeui/windowmanagement/kwindowsystem_win.cpp:587
-#: kdeui/windowmanagement/kwindowsystem_qws.cpp:177
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:709
 #, kde-format
-msgid "Desktop %1"
-msgstr "Penbwrdd %1"
-
-#: kdeui/sonnet/dialog.cpp:103 kdeui/sonnet/dialog.cpp:225
-#: kdeui/sonnet/dialog.cpp:444
-msgctxt "@title:window"
-msgid "Check Spelling"
+msgctxt "@emphasis-strong/plain"
+msgid "**%1**"
 msgstr ""
 
-#: kdeui/sonnet/dialog.cpp:105
-msgctxt "@action:button"
-msgid "&Finished"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:713
+#, kde-format
+msgctxt "@emphasis-strong/rich"
+msgid "<b>%1</b>"
 msgstr ""
 
-#: kdeui/sonnet/dialog.cpp:226
-msgctxt "progress label"
-msgid "Spell checking in progress..."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:719
+#, kde-format
+msgctxt "@placeholder/plain"
+msgid "&lt;%1&gt;"
 msgstr ""
 
-#: kdeui/sonnet/dialog.cpp:247
-msgid "Spell check stopped."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:723
+#, kde-format
+msgctxt "@placeholder/rich"
+msgid "&lt;<i>%1</i>&gt;"
 msgstr ""
 
-#: kdeui/sonnet/dialog.cpp:258
-msgid "Spell check canceled."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:729
+#, kde-format
+msgctxt "@email/plain"
+msgid "&lt;%1&gt;"
 msgstr ""
 
-#: kdeui/sonnet/dialog.cpp:440 kdeui/sonnet/dialog.cpp:444
-msgid "Spell check complete."
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:733
+#, kde-format
+msgctxt "@email/rich"
+msgid "&lt;<a href=\"mailto:%1\">%1</a>&gt;"
 msgstr ""
 
-#: kdeui/sonnet/configdialog.cpp:51
-msgid "Spell Checking Configuration"
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:738
+#, kde-format
+msgctxt ""
+"@email-with-name/plain\n"
+"%1 is name, %2 is address"
+msgid "%1 &lt;%2&gt;"
 msgstr ""
 
-#: kdeui/jobs/kstatusbarjobtracker.cpp:244
-msgid " Stalled "
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:743
+#, kde-format
+msgctxt ""
+"@email-with-name/rich\n"
+"%1 is name, %2 is address"
+msgid "<a href=\"mailto:%2\">%1</a>"
 msgstr ""
 
-#: kdeui/jobs/kstatusbarjobtracker.cpp:246
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:749
 #, kde-format
-msgid " %1/s "
+msgctxt "@envar/plain"
+msgid "$%1"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:273 kdeui/jobs/kwidgetjobtracker.cpp:281
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:753
 #, kde-format
-msgctxt "%1 is the label, we add a ':' to it"
-msgid "%1:"
+msgctxt "@envar/rich"
+msgid "<tt>$%1</tt>"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:328
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:759
 #, kde-format
-msgid "%2 of %3 complete"
-msgid_plural "%2 of %3 complete"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@message/plain"
+msgid "/%1/"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:345 kdeui/jobs/kwidgetjobtracker.cpp:357
+#. i18n: KUIT pattern, see the comment to the first of these entries above.
+#: kdecore/localization/kuitsemantics.cpp:763
 #, kde-format
-msgid "%2 / %1 folder"
-msgid_plural "%2 / %1 folders"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@message/rich"
+msgid "<i>%1</i>"
+msgstr ""
+
+#. i18n: Decide which string is used to delimit keys in a keyboard
+#. shortcut (e.g. + in Ctrl+Alt+Tab) in plain text.
+#: kdecore/localization/kuitsemantics.cpp:784
+msgctxt "shortcut-key-delimiter/plain"
+msgid "+"
+msgstr ""
+
+#. i18n: Decide which string is used to delimit keys in a keyboard
+#. shortcut (e.g. + in Ctrl+Alt+Tab) in rich text.
+#: kdecore/localization/kuitsemantics.cpp:788
+msgctxt "shortcut-key-delimiter/rich"
+msgid "+"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:347 kdeui/jobs/kwidgetjobtracker.cpp:360
-#, kde-format
-msgid "%2 / %1 file"
-msgid_plural "%2 / %1 files"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: Decide which string is used to delimit elements in a GUI path
+#. (e.g. -> in "Go to Settings->Advanced->Core tab.") in plain text.
+#: kdecore/localization/kuitsemantics.cpp:792
+msgctxt "gui-path-delimiter/plain"
+msgid "→"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:370
-#, kde-format
-msgid "%1% of %2"
+#. i18n: Decide which string is used to delimit elements in a GUI path
+#. (e.g. -> in "Go to Settings->Advanced->Core tab.") in rich text.
+#: kdecore/localization/kuitsemantics.cpp:796
+msgctxt "gui-path-delimiter/rich"
+msgid "→"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:373
-#, kde-format
-msgid "%2% of 1 file"
-msgid_plural "%2% of %1 files"
-msgstr[0] ""
-msgstr[1] ""
+#: kdecore/localization/kuitsemantics.cpp:811
+msgctxt "keyboard-key-name"
+msgid "Alt"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:388
-msgid "Stalled"
+#: kdecore/localization/kuitsemantics.cpp:812
+msgctxt "keyboard-key-name"
+msgid "AltGr"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:393
-#, kde-format
-msgid "%2/s (%3 remaining)"
-msgid_plural "%2/s (%3 remaining)"
-msgstr[0] ""
-msgstr[1] ""
+#: kdecore/localization/kuitsemantics.cpp:813
+msgctxt "keyboard-key-name"
+msgid "Backspace"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:396
-#, kde-format
-msgctxt "speed in bytes per second"
-msgid "%1/s"
+#: kdecore/localization/kuitsemantics.cpp:814
+msgctxt "keyboard-key-name"
+msgid "CapsLock"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:415
-#, kde-format
-msgid "%1/s (done)"
+#: kdecore/localization/kuitsemantics.cpp:815
+msgctxt "keyboard-key-name"
+msgid "Control"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:422
-msgid "&Resume"
+#: kdecore/localization/kuitsemantics.cpp:816
+msgctxt "keyboard-key-name"
+msgid "Ctrl"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:428 kdeui/jobs/kwidgetjobtracker.cpp:501
-msgid "&Pause"
+#: kdecore/localization/kuitsemantics.cpp:817
+msgctxt "keyboard-key-name"
+msgid "Del"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:454
-msgctxt "The source url of a job"
-msgid "Source:"
+#: kdecore/localization/kuitsemantics.cpp:818
+msgctxt "keyboard-key-name"
+msgid "Delete"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:462
-msgctxt "The destination url of a job"
-msgid "Destination:"
+#: kdecore/localization/kuitsemantics.cpp:819
+msgctxt "keyboard-key-name"
+msgid "Down"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:486 kdeui/jobs/kwidgetjobtracker.cpp:664
-msgid "Click this to expand the dialog, to show details"
+#: kdecore/localization/kuitsemantics.cpp:820
+msgctxt "keyboard-key-name"
+msgid "End"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:521
-msgid "&Keep this window open after transfer is complete"
+#: kdecore/localization/kuitsemantics.cpp:821
+msgctxt "keyboard-key-name"
+msgid "Enter"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:530
-msgid "Open &File"
+#: kdecore/localization/kuitsemantics.cpp:822
+msgctxt "keyboard-key-name"
+msgid "Esc"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:537
-msgid "Open &Destination"
+#: kdecore/localization/kuitsemantics.cpp:823
+msgctxt "keyboard-key-name"
+msgid "Escape"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:553
-msgid "Progress Dialog"
+#: kdecore/localization/kuitsemantics.cpp:824
+msgctxt "keyboard-key-name"
+msgid "Home"
 msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:566
-#, kde-format
-msgid "%1 folder"
-msgid_plural "%1 folders"
-msgstr[0] ""
-msgstr[1] ""
+#: kdecore/localization/kuitsemantics.cpp:825
+msgctxt "keyboard-key-name"
+msgid "Hyper"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:567
-#, kde-format
-msgid "%1 file"
-msgid_plural "%1 files"
-msgstr[0] ""
-msgstr[1] ""
+#: kdecore/localization/kuitsemantics.cpp:826
+msgctxt "keyboard-key-name"
+msgid "Ins"
+msgstr ""
 
-#: kdeui/jobs/kwidgetjobtracker.cpp:657
-msgid "Click this to collapse the dialog, to hide details"
+#: kdecore/localization/kuitsemantics.cpp:827
+msgctxt "keyboard-key-name"
+msgid "Insert"
 msgstr ""
 
-#. i18n: Placeholder text in text edit widgets is the text appearing
-#. before any user input, briefly explaining to the user what to type
-#. (e.g. "Enter message").
-#. By default the text is set in italic, which may not be appropriate
-#. for some languages and scripts (e.g. for CJK ideographs).
-#. i18n: Placeholder text in line edit widgets is the text appearing
-#. before any user input, briefly explaining to the user what to type
-#. (e.g. "Enter search pattern").
-#. By default the text is set in italic, which may not be appropriate
-#. for some languages and scripts (e.g. for CJK ideographs).
-#: kdeui/widgets/ktextedit.cpp:76 kdeui/widgets/klineedit.cpp:89
-msgctxt "Italic placeholder text in line edits: 0 no, 1 yes"
-msgid "1"
+#: kdecore/localization/kuitsemantics.cpp:828
+msgctxt "keyboard-key-name"
+msgid "Left"
 msgstr ""
 
-#: kdeui/widgets/ktextedit.cpp:523
-msgid "Speak Text"
+#: kdecore/localization/kuitsemantics.cpp:829
+msgctxt "keyboard-key-name"
+msgid "Menu"
 msgstr ""
 
-#: kdeui/widgets/ktextedit.cpp:541
-msgid "Starting Jovie Text-to-Speech Service Failed"
+#: kdecore/localization/kuitsemantics.cpp:830
+msgctxt "keyboard-key-name"
+msgid "Meta"
 msgstr ""
 
-#: kdeui/widgets/ktextedit.cpp:626
-#, kde-format
-msgid "No suggestions for %1"
+#: kdecore/localization/kuitsemantics.cpp:831
+msgctxt "keyboard-key-name"
+msgid "NumLock"
 msgstr ""
 
-#: kdeui/widgets/ktextedit.cpp:637
-msgid "Ignore"
-msgstr "Anwybyddu"
+#: kdecore/localization/kuitsemantics.cpp:832
+msgctxt "keyboard-key-name"
+msgid "PageDown"
+msgstr ""
 
-#: kdeui/widgets/ktextedit.cpp:638
-msgid "Add to Dictionary"
+#: kdecore/localization/kuitsemantics.cpp:833
+msgctxt "keyboard-key-name"
+msgid "PageUp"
 msgstr ""
 
-#: kdeui/widgets/ktextedit.cpp:783
-msgid "Nothing to spell check."
+#: kdecore/localization/kuitsemantics.cpp:834
+msgctxt "keyboard-key-name"
+msgid "PgDown"
 msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:291
-msgctxt "@title:menu"
-msgid "Show Text"
+#: kdecore/localization/kuitsemantics.cpp:835
+msgctxt "keyboard-key-name"
+msgid "PgUp"
 msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:294
-msgctxt "@title:menu"
-msgid "Toolbar Settings"
+#: kdecore/localization/kuitsemantics.cpp:836
+msgctxt "keyboard-key-name"
+msgid "PauseBreak"
 msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:270
-msgid "Orientation"
-msgstr "Gogwydd"
+#: kdecore/localization/kuitsemantics.cpp:837
+msgctxt "keyboard-key-name"
+msgid "PrintScreen"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:272
-msgctxt "toolbar position string"
-msgid "Top"
-msgstr "Top"
+#: kdecore/localization/kuitsemantics.cpp:838
+msgctxt "keyboard-key-name"
+msgid "PrtScr"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:274
-msgctxt "toolbar position string"
-msgid "Left"
-msgstr "Chwith"
+#: kdecore/localization/kuitsemantics.cpp:839
+msgctxt "keyboard-key-name"
+msgid "Return"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:275
-msgctxt "toolbar position string"
+#: kdecore/localization/kuitsemantics.cpp:840
+msgctxt "keyboard-key-name"
 msgid "Right"
-msgstr "De"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:276
-msgctxt "toolbar position string"
-msgid "Bottom"
-msgstr "Gwaelod"
+#: kdecore/localization/kuitsemantics.cpp:841
+msgctxt "keyboard-key-name"
+msgid "ScrollLock"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:284
-msgid "Text Position"
-msgstr "Lleoliad Testun"
+#: kdecore/localization/kuitsemantics.cpp:842
+msgctxt "keyboard-key-name"
+msgid "Shift"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:286
-msgid "Icons Only"
-msgstr "Eiconau yn Unig"
+#: kdecore/localization/kuitsemantics.cpp:843
+msgctxt "keyboard-key-name"
+msgid "Space"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:287
-msgid "Text Only"
-msgstr "Testun yn Unig"
+#: kdecore/localization/kuitsemantics.cpp:844
+msgctxt "keyboard-key-name"
+msgid "Super"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:288
-msgid "Text Alongside Icons"
-msgstr "Testun wrth Ochr Eiconau"
+#: kdecore/localization/kuitsemantics.cpp:845
+msgctxt "keyboard-key-name"
+msgid "SysReq"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:289
-msgid "Text Under Icons"
-msgstr "Testun dan Eiconau"
+#: kdecore/localization/kuitsemantics.cpp:846
+msgctxt "keyboard-key-name"
+msgid "Tab"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:297
-msgid "Icon Size"
-msgstr "Maint Eicon"
+#: kdecore/localization/kuitsemantics.cpp:847
+msgctxt "keyboard-key-name"
+msgid "Up"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:299
-msgctxt "@item:inmenu Icon size"
-msgid "Default"
+#: kdecore/localization/kuitsemantics.cpp:848
+msgctxt "keyboard-key-name"
+msgid "Win"
 msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:316 kdeui/widgets/ktoolbar.cpp:336
+#. i18n: Pattern for the function keys.
+#: kdecore/localization/kuitsemantics.cpp:852
 #, kde-format
-msgid "Small (%1x%2)"
-msgstr "Bach (%1x%2)"
+msgctxt "keyboard-key-name"
+msgid "F%1"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:318 kdeui/widgets/ktoolbar.cpp:338
-#, kde-format
-msgid "Medium (%1x%2)"
-msgstr "Canol (%1x%2)"
+#: kdecore/localization/kcharsets.cpp:167
+msgctxt "@item Text character set"
+msgid "South-Eastern Europe"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:320 kdeui/widgets/ktoolbar.cpp:340
-#, kde-format
-msgid "Large (%1x%2)"
-msgstr "Mawr (%1x%2)"
+#: kdecore/localization/kcharsets.cpp:212
+msgctxt "@item Text character set"
+msgid "Northern Saami"
+msgstr ""
+
+#: kdecore/localization/kcharsets.cpp:214
+#: kdecore/localization/kcharsets.cpp:619
+msgctxt "@item Text character set"
+msgid "Other"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:322 kdeui/widgets/ktoolbar.cpp:342
+#: kdecore/localization/kcharsets.cpp:629
 #, kde-format
-msgid "Huge (%1x%2)"
-msgstr "Enfawr (%1x%2)"
+msgctxt "@item %1 character set, %2 encoding"
+msgid "%1 ( %2 )"
+msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:362
-msgid "Lock Toolbar Positions"
+#: kdecore/localization/kcharsets.cpp:632
+#, kde-format
+msgctxt "@item"
+msgid "Other encoding (%1)"
 msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:1220
+#: kdecore/localization/kcharsets.cpp:658
 #, kde-format
-msgctxt "@action:intoolbar Text label of toolbar button"
-msgid "%1"
+msgctxt "@item Text encoding: %1 character set, %2 encoding"
+msgid "%1 ( %2 )"
 msgstr ""
 
-#: kdeui/widgets/ktoolbar.cpp:1221
+#: kdecore/util/klibloader.cpp:98
 #, kde-format
-msgctxt "@info:tooltip Tooltip of toolbar button"
-msgid "%1"
+msgid "Library \"%1\" not found"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:241
-msgid "<Non Private Use High Surrogate>"
+#: kdecore/util/klibloader.cpp:146
+msgid "No service matching the requirements was found."
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:243
-msgid "<Private Use High Surrogate>"
+#: kdecore/util/klibloader.cpp:148
+msgid ""
+"The service provides no library, the Library key is missing in the .desktop "
+"file."
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:245
-msgid "<Low Surrogate>"
+#: kdecore/util/klibloader.cpp:152
+msgid "The library does not export a factory for creating components."
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:247
-msgid "<Private Use>"
+#: kdecore/util/klibloader.cpp:154
+msgid ""
+"The factory does not support creating components of the specified type."
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:277
-msgid "<not assigned>"
+#: kdecore/util/klibloader.cpp:156
+msgid "KLibLoader: Unknown error"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:572
-#: kdeui/widgets/kcharselect-translation.cpp:35
-msgctxt "KCharSelect section name"
-msgid "Combining Diacritical Marks"
+#: kdecore/util/kpluginloader.cpp:157 kdecore/util/kpluginloader.cpp:188
+#, kde-format
+msgid "Could not find plugin '%1' for application '%2'"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:581
-msgid "Non-printable"
+#: kdecore/util/kpluginloader.cpp:174
+msgid "The provided service is not valid"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:614
-msgid "Other, Control"
+#: kdecore/util/kpluginloader.cpp:180
+#, kde-format
+msgid "The service '%1' provides no library or the Library key is missing"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:615
-msgid "Other, Format"
+#: kdecore/util/kpluginloader.cpp:226
+#, kde-format
+msgid "The library %1 does not offer a KDE 4 compatible factory."
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:616
-msgid "Other, Not Assigned"
+#: kdecore/util/kpluginloader.cpp:256
+#, kde-format
+msgid "The plugin '%1' uses an incompatible KDE library (%2)."
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:617
-msgid "Other, Private Use"
+#: kdecore/util/kpluginloader.cpp:286
+#, kde-format
+msgid ""
+"The plugin '%1' or its library dependencies are not compatible with "
+"currently loaded libraries: %2"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:618
-msgid "Other, Surrogate"
+#: kdecore/sonnet/loader.cpp:154
+msgctxt "dictionary variant"
+msgid "40"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:619
-msgid "Letter, Lowercase"
+#: kdecore/sonnet/loader.cpp:155
+msgctxt "dictionary variant"
+msgid "60"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:620
-msgid "Letter, Modifier"
+#: kdecore/sonnet/loader.cpp:156
+msgctxt "dictionary variant"
+msgid "80"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:621
-msgid "Letter, Other"
+#: kdecore/sonnet/loader.cpp:157
+msgctxt "dictionary variant"
+msgid "-ise suffixes"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:622
-msgid "Letter, Titlecase"
+#: kdecore/sonnet/loader.cpp:158
+msgctxt "dictionary variant"
+msgid "-ize suffixes"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:623
-msgid "Letter, Uppercase"
+#: kdecore/sonnet/loader.cpp:159
+msgctxt "dictionary variant"
+msgid "-ise suffixes and with accents"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:624
-msgid "Mark, Spacing Combining"
+#: kdecore/sonnet/loader.cpp:160
+msgctxt "dictionary variant"
+msgid "-ise suffixes and without accents"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:625
-msgid "Mark, Enclosing"
+#: kdecore/sonnet/loader.cpp:161
+msgctxt "dictionary variant"
+msgid "-ize suffixes and with accents"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:626
-msgid "Mark, Non-Spacing"
+#: kdecore/sonnet/loader.cpp:162
+msgctxt "dictionary variant"
+msgid "-ize suffixes and without accents"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:627
-msgid "Number, Decimal Digit"
+#: kdecore/sonnet/loader.cpp:163
+msgctxt "dictionary variant"
+msgid "large"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:628
-msgid "Number, Letter"
+#: kdecore/sonnet/loader.cpp:164
+msgctxt "dictionary variant"
+msgid "medium"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:629
-msgid "Number, Other"
+#: kdecore/sonnet/loader.cpp:165
+msgctxt "dictionary variant"
+msgid "small"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:630
-msgid "Punctuation, Connector"
+#: kdecore/sonnet/loader.cpp:166
+msgctxt "dictionary variant"
+msgid "variant 0"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:631
-msgid "Punctuation, Dash"
+#: kdecore/sonnet/loader.cpp:167
+msgctxt "dictionary variant"
+msgid "variant 1"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:632
-msgid "Punctuation, Close"
+#: kdecore/sonnet/loader.cpp:168
+msgctxt "dictionary variant"
+msgid "variant 2"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:633
-msgid "Punctuation, Final Quote"
+#: kdecore/sonnet/loader.cpp:169
+msgctxt "dictionary variant"
+msgid "without accents"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:634
-msgid "Punctuation, Initial Quote"
+#: kdecore/sonnet/loader.cpp:170
+msgctxt "dictionary variant"
+msgid "with accents"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:635
-msgid "Punctuation, Other"
+#: kdecore/sonnet/loader.cpp:171
+msgctxt "dictionary variant"
+msgid "with ye"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:636
-msgid "Punctuation, Open"
+#: kdecore/sonnet/loader.cpp:172
+msgctxt "dictionary variant"
+msgid "with yeyo"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:637
-msgid "Symbol, Currency"
+#: kdecore/sonnet/loader.cpp:173
+msgctxt "dictionary variant"
+msgid "with yo"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:638
-msgid "Symbol, Modifier"
+#: kdecore/sonnet/loader.cpp:174
+msgctxt "dictionary variant"
+msgid "extended"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:639
-msgid "Symbol, Math"
+#: kdecore/sonnet/loader.cpp:218
+#, kde-format
+msgctxt "dictionary name. %1-language, %2-country and %3 variant name"
+msgid "%1 (%2) [%3]"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:640
-msgid "Symbol, Other"
+#: kdecore/sonnet/loader.cpp:223
+#, kde-format
+msgctxt "dictionary name. %1-language and %2-country name"
+msgid "%1 (%2)"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:641
-msgid "Separator, Line"
+#: kdecore/sonnet/loader.cpp:227
+#, kde-format
+msgctxt "dictionary name. %1-language and %2-variant name"
+msgid "%1 [%2]"
 msgstr ""
 
-#: kdeui/widgets/kcharselectdata.cpp:642
-msgid "Separator, Paragraph"
-msgstr ""
+#: kparts/htmlextension.cpp:117 khtml/khtml_settings.cpp:235
+msgid "Accept"
+msgstr "Derbyn"
 
-#: kdeui/widgets/kcharselectdata.cpp:643
-msgid "Separator, Space"
-msgstr ""
+#: kparts/htmlextension.cpp:119 khtml/khtml_settings.cpp:236
+msgid "Reject"
+msgstr "Gwrthod"
 
-#: kdeui/widgets/kcharselect-translation.cpp:23
-msgctxt "KCharSelect section name"
-msgid "European Alphabets"
+#: kparts/browserrun.cpp:335
+#, kde-format
+msgid "Do you really want to execute '%1'?"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:24
-msgctxt "KCharSelect section name"
-msgid "African Scripts"
+#: kparts/browserrun.cpp:336
+msgid "Execute File?"
+msgstr "Gweithredu Ffeil?"
+
+#: kparts/browserrun.cpp:397 khtml/khtml_ext.cpp:940
+#, kde-format
+msgid "The Download Manager (%1) could not be found in your $PATH "
+msgstr "Methu canfod y Rheolydd Lawrlwytho (%1) yn eich $PATH "
+
+#: kparts/browserrun.cpp:398 khtml/khtml_ext.cpp:941
+msgid ""
+"Try to reinstall it  \n"
+"\n"
+"The integration with Konqueror will be disabled."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:25
-msgctxt "KCharSelect section name"
-msgid "Middle Eastern Scripts"
+#: kparts/browserrun.cpp:426 khtml/khtml_part.cpp:3716
+#: khtml/khtml_part.cpp:3945 khtml/khtml_part.cpp:4366 khtml/khtml_run.cpp:104
+msgid "Save As"
+msgstr "Cadw Fel"
+
+#: kparts/browseropenorsavequestion.cpp:110
+#: kparts/browseropenorsavequestion.cpp:339
+#, kde-format
+msgctxt "@label Type of file"
+msgid "Type: %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:26
-msgctxt "KCharSelect section name"
-msgid "South Asian Scripts"
+#: kparts/browseropenorsavequestion.cpp:118
+msgctxt "@label:checkbox"
+msgid "Remember action for files of this type"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:27
-msgctxt "KCharSelect section name"
-msgid "Philippine Scripts"
+#: kparts/browseropenorsavequestion.cpp:149
+#: kparts/browseropenorsavequestion.cpp:225
+#, kde-format
+msgctxt "@label:button"
+msgid "&Open with %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:28
-msgctxt "KCharSelect section name"
-msgid "South East Asian Scripts"
+#: kparts/browseropenorsavequestion.cpp:199
+#, kde-format
+msgctxt "@action:inmenu"
+msgid "Open &with %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:29
-msgctxt "KCharSelect section name"
-msgid "East Asian Scripts"
+#: kparts/browseropenorsavequestion.cpp:210
+#: kparts/browseropenorsavequestion.cpp:304
+#, kde-format
+msgctxt "@info"
+msgid "Open '%1'?"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:30
-msgctxt "KCharSelect section name"
-msgid "Central Asian Scripts"
+#: kparts/browseropenorsavequestion.cpp:214
+msgctxt "@label:button"
+msgid "&Open with..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:31
-msgctxt "KCharSelect section name"
-msgid "Other Scripts"
+#: kparts/browseropenorsavequestion.cpp:234
+msgctxt "@label:button"
+msgid "&Open with"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:32
-msgctxt "KCharSelect section name"
-msgid "Symbols"
+#: kparts/browseropenorsavequestion.cpp:301
+msgctxt "@label:button"
+msgid "&Open"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:33
-msgctxt "KCharSelect section name"
-msgid "Mathematical Symbols"
+#: kparts/browseropenorsavequestion.cpp:326
+#, kde-format
+msgctxt "@label File name"
+msgid "Name: %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:34
-msgctxt "KCharSelect section name"
-msgid "Phonetic Symbols"
+#: kparts/browseropenorsavequestion.cpp:328
+msgctxt "@info:whatsthis"
+msgid "This is the file name suggested by the server"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:36
-msgctxt "KCharSelect section name"
-msgid "Other"
+#: kparts/part.cpp:815
+msgid "Untitled"
+msgstr "Heb deitl"
+
+#: kparts/part.cpp:821
+#, kde-format
+msgid ""
+"The document \"%1\" has been modified.\n"
+"Do you want to save your changes or discard them?"
 msgstr ""
+"Mae'r ddogfen \"%1\" wedi ei newid.\n"
+"Ydych eisiau cadw eich newidiadau, neu eu taflu?"
 
-#: kdeui/widgets/kcharselect-translation.cpp:37
-msgctxt "KCharselect unicode block name"
-msgid "Basic Latin"
+#: kparts/part.cpp:823
+msgid "Close Document"
+msgstr "Cau Dogfen"
+
+#: kparts/browserextension.cpp:644
+#, kde-format
+msgid "<qt>Do you want to search the Internet for <b>%1</b>?</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:38
-msgctxt "KCharselect unicode block name"
-msgid "Latin-1 Supplement"
-msgstr ""
+#: kparts/browserextension.cpp:645
+msgid "Internet Search"
+msgstr "Chwiliad Rhyngrwyd"
+
+#: kparts/browserextension.cpp:645
+msgid "&Search"
+msgstr "&Chwilio"
+
+#: kconf_update/kconf_update.cpp:143
+msgid "Only local files are supported."
+msgstr "Ni chynhelir ond ffeiliau lleol."
+
+#: kconf_update/kconf_update.cpp:965
+msgid "Keep output results from scripts"
+msgstr "Cadw canlyniadau allbwn o'r sgriptiau"
 
-#: kdeui/widgets/kcharselect-translation.cpp:39
-msgctxt "KCharselect unicode block name"
-msgid "Latin Extended-A"
-msgstr ""
+#: kconf_update/kconf_update.cpp:966
+msgid "Check whether config file itself requires updating"
+msgstr "Gwirio a yw'r ffeil ffurfweddu ei hun angen diweddaru"
 
-#: kdeui/widgets/kcharselect-translation.cpp:40
-msgctxt "KCharselect unicode block name"
-msgid "Latin Extended-B"
-msgstr ""
+#: kconf_update/kconf_update.cpp:967
+msgid "File to read update instructions from"
+msgstr "Ffeil i ddarllen cyfarwyddiadau diweddaru oddiwrtho."
 
-#: kdeui/widgets/kcharselect-translation.cpp:41
-msgctxt "KCharselect unicode block name"
-msgid "IPA Extensions"
-msgstr ""
+#: kconf_update/kconf_update.cpp:969
+msgid "KConf Update"
+msgstr "Diweddariad KConf"
 
-#: kdeui/widgets/kcharselect-translation.cpp:42
-msgctxt "KCharselect unicode block name"
-msgid "Spacing Modifier Letters"
-msgstr ""
+#: kconf_update/kconf_update.cpp:971
+msgid "KDE Tool for updating user configuration files"
+msgstr "Erfyn KDE am ddiweddaru ffeiliau ffurfweddiad y defnyddwyr."
 
-#: kdeui/widgets/kcharselect-translation.cpp:43
-msgctxt "KCharselect unicode block name"
-msgid "Combining Diacritical Marks"
+#: kconf_update/kconf_update.cpp:973
+msgid "(c) 2001, Waldo Bastian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:44
-msgctxt "KCharselect unicode block name"
-msgid "Greek and Coptic"
+#: khtml/khtmladaptorpart.cpp:29
+msgid "Inactive"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:45
-msgctxt "KCharselect unicode block name"
-msgid "Cyrillic"
+#: khtml/khtml_printsettings.cpp:31
+msgid ""
+"<qt><p><strong>'Print images'</strong></p><p>If this checkbox is enabled, "
+"images contained in the HTML page will be printed. Printing may take longer "
+"and use more ink or toner.</p><p>If this checkbox is disabled, only the text "
+"of the HTML page will be printed, without the included images. Printing will "
+"be faster and use less ink or toner.</p> </qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:46
-msgctxt "KCharselect unicode block name"
-msgid "Cyrillic Supplement"
+#: khtml/khtml_printsettings.cpp:43
+msgid ""
+"<qt><p><strong>'Print header'</strong></p><p>If this checkbox is enabled, "
+"the printout of the HTML document will contain a header line at the top of "
+"each page. This header contains the current date, the location URL of the "
+"printed page and the page number.</p><p>If this checkbox is disabled, the "
+"printout of the HTML document will not contain such a header line.</p> </qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:47
-msgctxt "KCharselect unicode block name"
-msgid "Armenian"
+#: khtml/khtml_printsettings.cpp:56
+msgid ""
+"<qt><p><strong>'Printerfriendly mode'</strong></p><p>If this checkbox is "
+"enabled, the printout of the HTML document will be black and white only, and "
+"all colored background will be converted into white. Printout will be faster "
+"and use less ink or toner.</p><p>If this checkbox is disabled, the printout "
+"of the HTML document will happen in the original color settings as you see "
+"in your application. This may result in areas of full-page color (or "
+"grayscale, if you use a black+white printer). Printout will possibly happen "
+"more slowly and will probably use more toner or ink.</p> </qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:48
-msgctxt "KCharselect unicode block name"
-msgid "Hebrew"
-msgstr ""
+#: khtml/khtml_printsettings.cpp:71
+msgid "HTML Settings"
+msgstr "Gosodiadau HTML"
 
-#: kdeui/widgets/kcharselect-translation.cpp:49
-msgctxt "KCharselect unicode block name"
-msgid "Arabic"
-msgstr ""
+#: khtml/khtml_printsettings.cpp:73
+msgid "Printer friendly mode (black text, no background)"
+msgstr "Modd sy'n gyfeillgar i argraffyddion (testun du, dim cefndir)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:50
-msgctxt "KCharselect unicode block name"
-msgid "Syriac"
-msgstr ""
+#: khtml/khtml_printsettings.cpp:76
+msgid "Print images"
+msgstr "Argraffu delweddau"
 
-#: kdeui/widgets/kcharselect-translation.cpp:51
-msgctxt "KCharselect unicode block name"
-msgid "Arabic Supplement"
-msgstr ""
+#: khtml/khtml_printsettings.cpp:79
+msgid "Print header"
+msgstr "Pennawd argraffydd"
 
-#: kdeui/widgets/kcharselect-translation.cpp:52
-msgctxt "KCharselect unicode block name"
-msgid "Thaana"
+#: khtml/testkhtml.cpp:39
+msgid "URL to open"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:53
-msgctxt "KCharselect unicode block name"
-msgid "NKo"
+#: khtml/testkhtml.cpp:41
+msgid "Testkhtml"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:54
-msgctxt "KCharselect unicode block name"
-msgid "Samaritan"
+#: khtml/testkhtml.cpp:42
+msgid "a basic web browser using the KHTML library"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:55
-msgctxt "KCharselect unicode block name"
-msgid "Mandaic"
+#: khtml/test_regression_gui_window.cpp:76
+msgid "Available Tests: 0"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:55
-msgctxt "KCharselect unicode block name"
-msgid "Devanagari"
+#: khtml/test_regression_gui_window.cpp:181
+msgid "Please choose a valid 'khtmltests/regression/' directory."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:56
-msgctxt "KCharselect unicode block name"
-msgid "Bengali"
+#: khtml/test_regression_gui_window.cpp:250
+msgid "Please choose a valid 'khtml/' build directory."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:57
-msgctxt "KCharselect unicode block name"
-msgid "Gurmukhi"
+#: khtml/test_regression_gui_window.cpp:532
+#, kde-format
+msgid "Available Tests: %1 (ignored: %2)"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:58
-msgctxt "KCharselect unicode block name"
-msgid "Gujarati"
-msgstr ""
+#: khtml/test_regression_gui_window.cpp:563
+#: khtml/ecma/debugger/debugwindow.cpp:192
+msgid "Continue"
+msgstr "Mynd ymlaen"
 
-#: kdeui/widgets/kcharselect-translation.cpp:59
-msgctxt "KCharselect unicode block name"
-msgid "Oriya"
+#: khtml/test_regression_gui_window.cpp:632
+msgid "Cannot find testregression executable."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:60
-msgctxt "KCharselect unicode block name"
-msgid "Tamil"
+#: khtml/test_regression_gui_window.cpp:1102
+msgid "Run test..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:61
-msgctxt "KCharselect unicode block name"
-msgid "Telugu"
+#: khtml/test_regression_gui_window.cpp:1104
+msgid "Add to ignores..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:62
-msgctxt "KCharselect unicode block name"
-msgid "Kannada"
+#: khtml/test_regression_gui_window.cpp:1105
+msgid "Remove from ignores..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:63
-msgctxt "KCharselect unicode block name"
-msgid "Malayalam"
-msgstr ""
+#: khtml/khtml_part.cpp:251
+msgid "View Do&cument Source"
+msgstr "Gweld Côd Ta&rddiad y Ddogfen"
 
-#: kdeui/widgets/kcharselect-translation.cpp:64
-msgctxt "KCharselect unicode block name"
-msgid "Sinhala"
-msgstr ""
+#: khtml/khtml_part.cpp:258 khtml/khtml_ext.cpp:509
+msgid "View Frame Source"
+msgstr "Gweld Ffynhonell y Ffram"
 
-#: kdeui/widgets/kcharselect-translation.cpp:65
-msgctxt "KCharselect unicode block name"
-msgid "Thai"
-msgstr ""
+#: khtml/khtml_part.cpp:265
+msgid "View Document Information"
+msgstr "Gweld Gwybodaeth y Ddogfen"
 
-#: kdeui/widgets/kcharselect-translation.cpp:66
-msgctxt "KCharselect unicode block name"
-msgid "Lao"
-msgstr ""
+#: khtml/khtml_part.cpp:272
+msgid "Save &Background Image As..."
+msgstr "Cadw Delwedd &Gefndir fel ..."
 
-#: kdeui/widgets/kcharselect-translation.cpp:67
-msgctxt "KCharselect unicode block name"
-msgid "Tibetan"
-msgstr ""
+#: khtml/khtml_part.cpp:281 khtml/khtml_ext.cpp:504
+msgid "Save &Frame As..."
+msgstr "Cadw &Ffram Fel ..."
 
-#: kdeui/widgets/kcharselect-translation.cpp:68
-msgctxt "KCharselect unicode block name"
-msgid "Myanmar"
-msgstr ""
+#: khtml/khtml_part.cpp:293 khtml/khtml_part.cpp:4027
+msgid "SSL"
+msgstr "SSL"
 
-#: kdeui/widgets/kcharselect-translation.cpp:69
-msgctxt "KCharselect unicode block name"
-msgid "Georgian"
-msgstr ""
+#: khtml/khtml_part.cpp:297
+msgid "Print Rendering Tree to STDOUT"
+msgstr "Argraffu'r Goeden Drosi i STDOUT"
 
-#: kdeui/widgets/kcharselect-translation.cpp:70
-msgctxt "KCharselect unicode block name"
-msgid "Hangul Jamo"
-msgstr ""
+#: khtml/khtml_part.cpp:301
+msgid "Print DOM Tree to STDOUT"
+msgstr "Argraffu'r Goeden DOM i STDOUT"
 
-#: kdeui/widgets/kcharselect-translation.cpp:71
-msgctxt "KCharselect unicode block name"
-msgid "Ethiopic"
+#: khtml/khtml_part.cpp:305
+msgid "Print frame tree to STDOUT"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:72
-msgctxt "KCharselect unicode block name"
-msgid "Ethiopic Supplement"
-msgstr ""
+#: khtml/khtml_part.cpp:309
+msgid "Stop Animated Images"
+msgstr "Stopio Delweddau Animeiddiedig"
 
-#: kdeui/widgets/kcharselect-translation.cpp:73
-msgctxt "KCharselect unicode block name"
-msgid "Cherokee"
-msgstr ""
+#: khtml/khtml_part.cpp:313
+msgid "Set &Encoding"
+msgstr "&Gosod Amgodiad"
 
-#: kdeui/widgets/kcharselect-translation.cpp:74
-msgctxt "KCharselect unicode block name"
-msgid "Unified Canadian Aboriginal Syllabics"
-msgstr ""
+#: khtml/khtml_part.cpp:352
+msgid "Use S&tylesheet"
+msgstr "&Defynddio Dalen Arddull"
 
-#: kdeui/widgets/kcharselect-translation.cpp:75
-msgctxt "KCharselect unicode block name"
-msgid "Ogham"
-msgstr ""
+#: khtml/khtml_part.cpp:357
+msgid "Enlarge Font"
+msgstr "Cynyddu Maint yr Wynebfath"
 
-#: kdeui/widgets/kcharselect-translation.cpp:76
-msgctxt "KCharselect unicode block name"
-msgid "Runic"
+#: khtml/khtml_part.cpp:360
+msgid ""
+"<qt>Enlarge Font<br /><br />Make the font in this window bigger. Click and "
+"hold down the mouse button for a menu with all available font sizes.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:77
-msgctxt "KCharselect unicode block name"
-msgid "Tagalog"
+#: khtml/khtml_part.cpp:364
+msgid "Shrink Font"
+msgstr "Lleihau Wynebfath"
+
+#: khtml/khtml_part.cpp:367
+msgid ""
+"<qt>Shrink Font<br /><br />Make the font in this window smaller. Click and "
+"hold down the mouse button for a menu with all available font sizes.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:78
-msgctxt "KCharselect unicode block name"
-msgid "Hanunoo"
+#: khtml/khtml_part.cpp:382
+msgid ""
+"<qt>Find text<br /><br />Shows a dialog that allows you to find text on the "
+"displayed page.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:79
-msgctxt "KCharselect unicode block name"
-msgid "Buhid"
+#: khtml/khtml_part.cpp:386
+msgid ""
+"<qt>Find next<br /><br />Find the next occurrence of the text that you have "
+"found using the <b>Find Text</b> function.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:80
-msgctxt "KCharselect unicode block name"
-msgid "Tagbanwa"
+#: khtml/khtml_part.cpp:392
+msgid ""
+"<qt>Find previous<br /><br />Find the previous occurrence of the text that "
+"you have found using the <b>Find Text</b> function.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:81
-msgctxt "KCharselect unicode block name"
-msgid "Khmer"
+#: khtml/khtml_part.cpp:397
+msgid "Find Text as You Type"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:82
-msgctxt "KCharselect unicode block name"
-msgid "Mongolian"
+#: khtml/khtml_part.cpp:400
+msgid ""
+"This shortcut shows the find bar, for finding text in the displayed page. It "
+"cancels the effect of \"Find Links as You Type\", which sets the \"Find "
+"links only\" option."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:83
-msgctxt "KCharselect unicode block name"
-msgid "Unified Canadian Aboriginal Syllabics Extended"
+#: khtml/khtml_part.cpp:403
+msgid "Find Links as You Type"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:84
-msgctxt "KCharselect unicode block name"
-msgid "Limbu"
+#: khtml/khtml_part.cpp:409
+msgid ""
+"This shortcut shows the find bar, and sets the option \"Find links only\"."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:85
-msgctxt "KCharselect unicode block name"
-msgid "Tai Le"
-msgstr ""
+#: khtml/khtml_part.cpp:421 khtml/khtml_ext.cpp:498
+msgid "Print Frame..."
+msgstr "Argraffu Ffrâm ..."
 
-#: kdeui/widgets/kcharselect-translation.cpp:86
-msgctxt "KCharselect unicode block name"
-msgid "New Tai Lue"
+#: khtml/khtml_part.cpp:425
+msgid ""
+"<qt>Print Frame<br /><br />Some pages have several frames. To print only a "
+"single frame, click on it and then use this function.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:87
-msgctxt "KCharselect unicode block name"
-msgid "Khmer Symbols"
-msgstr ""
+#: khtml/khtml_part.cpp:439
+msgid "Toggle Caret Mode"
+msgstr "Dangos/Cuddio Modd To Bach"
 
-#: kdeui/widgets/kcharselect-translation.cpp:88
-msgctxt "KCharselect unicode block name"
-msgid "Buginese"
-msgstr ""
+#: khtml/khtml_part.cpp:700
+#, kde-format
+msgid "The fake user-agent '%1' is in use."
+msgstr "Mae'r ffug asiant-defnyddiwr '%1' mewn defnydd."
 
-#: kdeui/widgets/kcharselect-translation.cpp:89
-msgctxt "KCharselect unicode block name"
-msgid "Tai Tham"
-msgstr ""
+#: khtml/khtml_part.cpp:1197
+msgid "This web page contains coding errors."
+msgstr "Mae'r dudalen wê yma yn cynnwys gwallau codio."
 
-#: kdeui/widgets/kcharselect-translation.cpp:90
-msgctxt "KCharselect unicode block name"
-msgid "Balinese"
-msgstr ""
+#: khtml/khtml_part.cpp:1239
+msgid "&Hide Errors"
+msgstr "C&uddio Gwallau"
 
-#: kdeui/widgets/kcharselect-translation.cpp:91
-msgctxt "KCharselect unicode block name"
-msgid "Sundanese"
-msgstr ""
+#: khtml/khtml_part.cpp:1240
+msgid "&Disable Error Reporting"
+msgstr "A&nalluogi Adrodd Gwallau"
 
-#: kdeui/widgets/kcharselect-translation.cpp:93
-msgctxt "KCharselect unicode block name"
-msgid "Batak"
+#: khtml/khtml_part.cpp:1284
+#, kde-format
+msgid "<qt><b>Error</b>: %1: %2</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:92
-msgctxt "KCharselect unicode block name"
-msgid "Lepcha"
+#: khtml/khtml_part.cpp:1333
+#, kde-format
+msgid "<qt><b>Error</b>: node %1: %2</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:93
-msgctxt "KCharselect unicode block name"
-msgid "Ol Chiki"
-msgstr ""
+#: khtml/khtml_part.cpp:1449
+msgid "Display Images on Page"
+msgstr "Arddangos Delweddau ar y Dudalen"
 
-#: kdeui/widgets/kcharselect-translation.cpp:94
-msgctxt "KCharselect unicode block name"
-msgid "Vedic Extensions"
+#: khtml/khtml_part.cpp:1826
+#, kde-format
+msgid "Error: %1 - %2"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:95
-msgctxt "KCharselect unicode block name"
-msgid "Phonetic Extensions"
-msgstr ""
+#: khtml/khtml_part.cpp:1831
+msgid "The requested operation could not be completed"
+msgstr "Methu cwblhau'r gweithrediad ceisiedig"
 
-#: kdeui/widgets/kcharselect-translation.cpp:96
-msgctxt "KCharselect unicode block name"
-msgid "Phonetic Extensions Supplement"
-msgstr ""
+#: khtml/khtml_part.cpp:1837
+msgid "Technical Reason: "
+msgstr "Rheswm Technegol: "
 
-#: kdeui/widgets/kcharselect-translation.cpp:97
-msgctxt "KCharselect unicode block name"
-msgid "Combining Diacritical Marks Supplement"
-msgstr ""
+#: khtml/khtml_part.cpp:1843
+msgid "Details of the Request:"
+msgstr "Manylion y Cais:"
 
-#: kdeui/widgets/kcharselect-translation.cpp:98
-msgctxt "KCharselect unicode block name"
-msgid "Latin Extended Additional"
-msgstr ""
+#: khtml/khtml_part.cpp:1845
+#, kde-format
+msgid "URL: %1"
+msgstr "URL: %1"
 
-#: kdeui/widgets/kcharselect-translation.cpp:99
-msgctxt "KCharselect unicode block name"
-msgid "Greek Extended"
+#: khtml/khtml_part.cpp:1848
+#, kde-format
+msgid "Protocol: %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:100
-msgctxt "KCharselect unicode block name"
-msgid "General Punctuation"
-msgstr ""
+#: khtml/khtml_part.cpp:1851
+#, kde-format
+msgid "Date and Time: %1"
+msgstr "Dyddiad ac Amser: %1"
 
-#: kdeui/widgets/kcharselect-translation.cpp:101
-msgctxt "KCharselect unicode block name"
-msgid "Superscripts and Subscripts"
-msgstr ""
+#: khtml/khtml_part.cpp:1853
+#, kde-format
+msgid "Additional Information: %1"
+msgstr "Gwybodaeth Ychwanegol: %1"
 
-#: kdeui/widgets/kcharselect-translation.cpp:102
-msgctxt "KCharselect unicode block name"
-msgid "Currency Symbols"
-msgstr ""
+#: khtml/khtml_part.cpp:1861
+msgid "Possible Causes:"
+msgstr "Achosion Posib:"
 
-#: kdeui/widgets/kcharselect-translation.cpp:103
-msgctxt "KCharselect unicode block name"
-msgid "Combining Diacritical Marks for Symbols"
-msgstr ""
+#: khtml/khtml_part.cpp:1868
+msgid "Possible Solutions:"
+msgstr "Datrysiadau Posib:"
 
-#: kdeui/widgets/kcharselect-translation.cpp:104
-msgctxt "KCharselect unicode block name"
-msgid "Letterlike Symbols"
-msgstr ""
+#: khtml/khtml_part.cpp:2286
+msgid "Page loaded."
+msgstr "Ffeil wedi ei ail-lwytho."
 
-#: kdeui/widgets/kcharselect-translation.cpp:105
-msgctxt "KCharselect unicode block name"
-msgid "Number Forms"
-msgstr ""
+#: khtml/khtml_part.cpp:2288
+#, kde-format
+msgid "%1 Image of %2 loaded."
+msgid_plural "%1 Images of %2 loaded."
+msgstr[0] "Llwythwyd %1 o %2 Delwedd..."
+msgstr[1] "Llwythwyd %1 o %2 Delwedd..."
 
-#: kdeui/widgets/kcharselect-translation.cpp:106
-msgctxt "KCharselect unicode block name"
-msgid "Arrows"
-msgstr ""
+#: khtml/khtml_part.cpp:2463
+msgid "Automatic Detection"
+msgstr "Datganiad Awtomatig"
 
-#: kdeui/widgets/kcharselect-translation.cpp:107
-msgctxt "KCharselect unicode block name"
-msgid "Mathematical Operators"
-msgstr ""
+#: khtml/khtml_part.cpp:3525 khtml/khtml_part.cpp:3612
+#: khtml/khtml_part.cpp:3623
+msgid " (In new window)"
+msgstr " (Mewn ffenest newydd)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:108
-msgctxt "KCharselect unicode block name"
-msgid "Miscellaneous Technical"
-msgstr ""
+#: khtml/khtml_part.cpp:3564
+msgid "Symbolic Link"
+msgstr "Cyswllt Symbolaidd"
 
-#: kdeui/widgets/kcharselect-translation.cpp:109
-msgctxt "KCharselect unicode block name"
-msgid "Control Pictures"
-msgstr ""
+#: khtml/khtml_part.cpp:3566
+#, kde-format
+msgid "%1 (Link)"
+msgstr "%1 (Cyswllt)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:110
-msgctxt "KCharselect unicode block name"
-msgid "Optical Character Recognition"
-msgstr ""
+#: khtml/khtml_part.cpp:3586
+#, kde-format
+msgid "%2 (%1 byte)"
+msgid_plural "%2 (%1 bytes)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:111
-msgctxt "KCharselect unicode block name"
-msgid "Enclosed Alphanumerics"
-msgstr ""
+#: khtml/khtml_part.cpp:3590
+#, kde-format
+msgid "%2 (%1 K)"
+msgstr "%2 (%1 K)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:112
-msgctxt "KCharselect unicode block name"
-msgid "Box Drawing"
-msgstr ""
+#: khtml/khtml_part.cpp:3625
+msgid " (In other frame)"
+msgstr " (Mewn ffram arall)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:113
-msgctxt "KCharselect unicode block name"
-msgid "Block Elements"
+#: khtml/khtml_part.cpp:3630
+msgid "Email to: "
+msgstr "E-bostio i: "
+
+#: khtml/khtml_part.cpp:3636
+msgid " - Subject: "
+msgstr " - Pwnc: "
+
+#: khtml/khtml_part.cpp:3638
+msgid " - CC: "
+msgstr " - CC: "
+
+#: khtml/khtml_part.cpp:3640
+msgid " - BCC: "
+msgstr " - BCC: "
+
+#: khtml/khtml_part.cpp:3721
+#, kde-format
+msgid ""
+"<qt>This untrusted page links to<br /><b>%1</b>.<br />Do you want to follow "
+"the link?</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:114
-msgctxt "KCharselect unicode block name"
-msgid "Geometric Shapes"
+#: khtml/khtml_part.cpp:3722
+msgid "Follow"
+msgstr "Dilyn"
+
+#: khtml/khtml_part.cpp:3823
+msgid "Frame Information"
+msgstr "Gwybodaeth Ffrâm"
+
+#: khtml/khtml_part.cpp:3829
+#, kde-format
+msgid "   <a href=\"%1\">[Properties]</a>"
+msgstr "   <a href=\"%1\">[Priodweddau]</a>"
+
+#: khtml/khtml_part.cpp:3855
+msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)"
+msgid "Quirks"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:115
-msgctxt "KCharselect unicode block name"
-msgid "Miscellaneous Symbols"
+#: khtml/khtml_part.cpp:3858
+msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)"
+msgid "Almost standards"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:116
-msgctxt "KCharselect unicode block name"
-msgid "Dingbats"
+#: khtml/khtml_part.cpp:3862
+msgctxt "HTML rendering mode (see http://en.wikipedia.org/wiki/Quirks_mode)"
+msgid "Strict"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:117
-msgctxt "KCharselect unicode block name"
-msgid "Miscellaneous Mathematical Symbols-A"
-msgstr ""
+#: khtml/khtml_part.cpp:3933
+msgid "Save Background Image As"
+msgstr "Cadw Delwedd y Gefndir Fel ..."
 
-#: kdeui/widgets/kcharselect-translation.cpp:118
-msgctxt "KCharselect unicode block name"
-msgid "Supplemental Arrows-A"
+#: khtml/khtml_part.cpp:4025
+msgid "The peer SSL certificate chain appears to be corrupt."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:119
-msgctxt "KCharselect unicode block name"
-msgid "Braille Patterns"
-msgstr ""
+#: khtml/khtml_part.cpp:4044
+msgid "Save Frame As"
+msgstr "Cadw Ffram Fel"
 
-#: kdeui/widgets/kcharselect-translation.cpp:120
-msgctxt "KCharselect unicode block name"
-msgid "Supplemental Arrows-B"
-msgstr ""
+#: khtml/khtml_part.cpp:4088
+msgid "&Find in Frame..."
+msgstr "&Canfod mewn Ffrâm ..."
 
-#: kdeui/widgets/kcharselect-translation.cpp:121
-msgctxt "KCharselect unicode block name"
-msgid "Miscellaneous Mathematical Symbols-B"
-msgstr ""
+#: khtml/khtml_part.cpp:4090 kdeui/actions/kstandardaction_p.h:64
+msgid "&Find..."
+msgstr "&Canfod"
 
-#: kdeui/widgets/kcharselect-translation.cpp:122
-msgctxt "KCharselect unicode block name"
-msgid "Supplemental Mathematical Operators"
+#: khtml/khtml_part.cpp:4707
+msgid ""
+"Warning:  This is a secure form but it is attempting to send your data back "
+"unencrypted.\n"
+"A third party may be able to intercept and view this information.\n"
+"Are you sure you wish to continue?"
 msgstr ""
+"Rhybudd: Ffurflen ddiogel yw hon, ond ma'en ceisio anfon eich data yn ôl heb "
+"ei amgryptio. \n"
+" Gall rhywun arall ryng-gipio a gweld yr wybodaeth yma. \n"
+" Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: kdeui/widgets/kcharselect-translation.cpp:123
-msgctxt "KCharselect unicode block name"
-msgid "Miscellaneous Symbols and Arrows"
-msgstr ""
+#: khtml/khtml_part.cpp:4710 khtml/khtml_part.cpp:4719
+#: khtml/khtml_part.cpp:4743
+msgid "Network Transmission"
+msgstr "Trosglwyddiad Rhwydwaith"
 
-#: kdeui/widgets/kcharselect-translation.cpp:124
-msgctxt "KCharselect unicode block name"
-msgid "Glagolitic"
-msgstr ""
+#: khtml/khtml_part.cpp:4710 khtml/khtml_part.cpp:4720
+msgid "&Send Unencrypted"
+msgstr "&Anfon heb ei Gêl-ysgrifo"
 
-#: kdeui/widgets/kcharselect-translation.cpp:125
-msgctxt "KCharselect unicode block name"
-msgid "Latin Extended-C"
+#: khtml/khtml_part.cpp:4717
+msgid ""
+"Warning: Your data is about to be transmitted across the network "
+"unencrypted.\n"
+"Are you sure you wish to continue?"
 msgstr ""
+"Rhybudd: Mae eich data ar fin cael eu trosglwyddo heb eu amgryptio dros y "
+"rhwydwaith.\n"
+" Ydych yn siwr eich bod chi eisiau fynd ymlaen?"
 
-#: kdeui/widgets/kcharselect-translation.cpp:126
-msgctxt "KCharselect unicode block name"
-msgid "Coptic"
+#: khtml/khtml_part.cpp:4741
+msgid ""
+"This site is attempting to submit form data via email.\n"
+"Do you want to continue?"
 msgstr ""
+"Mae'r safwê yma yn ceisio cyflwyno data ffurflen drwy e-bost. \n"
+" Ydych eisiau fynd ymlaen?"
 
-#: kdeui/widgets/kcharselect-translation.cpp:127
-msgctxt "KCharselect unicode block name"
-msgid "Georgian Supplement"
-msgstr ""
+#: khtml/khtml_part.cpp:4744
+msgid "&Send Email"
+msgstr "Anfon E&bost"
 
-#: kdeui/widgets/kcharselect-translation.cpp:128
-msgctxt "KCharselect unicode block name"
-msgid "Tifinagh"
+#: khtml/khtml_part.cpp:4765
+#, kde-format
+msgid ""
+"<qt>The form will be submitted to <br /><b>%1</b><br />on your local "
+"filesystem.<br />Do you want to submit the form?</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:129
-msgctxt "KCharselect unicode block name"
-msgid "Ethiopic Extended"
-msgstr ""
+#: khtml/khtml_part.cpp:4766 khtml/khtmlview.cpp:2800 khtml/khtmlview.cpp:2842
+#: khtml/html/html_formimpl.cpp:1641 khtml/html/html_formimpl.cpp:1853
+msgid "Submit"
+msgstr "Cyflwyno"
 
-#: kdeui/widgets/kcharselect-translation.cpp:130
-msgctxt "KCharselect unicode block name"
-msgid "Cyrillic Extended-A"
+#: khtml/khtml_part.cpp:4819
+msgid ""
+"This site attempted to attach a file from your computer in the form "
+"submission. The attachment was removed for your protection."
 msgstr ""
+"Ceisiodd y safwê yma glymu ffeil oddiar eich cyfrifiadur yn y cyflwyniad "
+"ffurflen.  Tynnwyd yr atodiad er eich gwarchodaeth."
 
-#: kdeui/widgets/kcharselect-translation.cpp:131
-msgctxt "KCharselect unicode block name"
-msgid "Supplemental Punctuation"
-msgstr ""
+#: khtml/khtml_part.cpp:5890
+#, kde-format
+msgid "(%1/s)"
+msgstr "(%1/s)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:132
-msgctxt "KCharselect unicode block name"
-msgid "CJK Radicals Supplement"
-msgstr ""
+#: khtml/khtml_part.cpp:6802
+msgid "Security Warning"
+msgstr "Rhybudd Diogelwch"
 
-#: kdeui/widgets/kcharselect-translation.cpp:133
-msgctxt "KCharselect unicode block name"
-msgid "Kangxi Radicals"
+#: khtml/khtml_part.cpp:6811
+#, kde-format
+msgid "<qt>Access by untrusted page to<br /><b>%1</b><br /> denied.</qt>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:134
-msgctxt "KCharselect unicode block name"
-msgid "Ideographic Description Characters"
-msgstr ""
+#: khtml/khtml_part.cpp:6812 khtml/java/kjavaappletserver.cpp:794
+msgid "Security Alert"
+msgstr "Larwm Diogelwch"
 
-#: kdeui/widgets/kcharselect-translation.cpp:135
-msgctxt "KCharselect unicode block name"
-msgid "CJK Symbols and Punctuation"
+#: khtml/khtml_part.cpp:7160
+#, kde-format
+msgid "The wallet '%1' is open and being used for form data and passwords."
 msgstr ""
+"Mae'r waled '%1' ar agor, ac yn cael ei ddefnyddio am ddata ffurflen a "
+"cyfrineiriau."
 
-#: kdeui/widgets/kcharselect-translation.cpp:136
-msgctxt "KCharselect unicode block name"
-msgid "Hiragana"
-msgstr ""
+#: khtml/khtml_part.cpp:7220
+msgid "&Close Wallet"
+msgstr "&Cau'r Waled"
 
-#: kdeui/widgets/kcharselect-translation.cpp:137
-msgctxt "KCharselect unicode block name"
-msgid "Katakana"
+#: khtml/khtml_part.cpp:7223
+msgid "&Allow storing passwords for this site"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:138
-msgctxt "KCharselect unicode block name"
-msgid "Bopomofo"
+#: khtml/khtml_part.cpp:7228
+#, kde-format
+msgid "Remove password for form %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:139
-msgctxt "KCharselect unicode block name"
-msgid "Hangul Compatibility Jamo"
-msgstr ""
+#: khtml/khtml_part.cpp:7333
+msgid "JavaScript &Debugger"
+msgstr "&Dadnamydd JavaScript"
 
-#: kdeui/widgets/kcharselect-translation.cpp:140
-msgctxt "KCharselect unicode block name"
-msgid "Kanbun"
+#: khtml/khtml_part.cpp:7365
+msgid "This page was prevented from opening a new window via JavaScript."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:141
-msgctxt "KCharselect unicode block name"
-msgid "Bopomofo Extended"
+#: khtml/khtml_part.cpp:7371
+msgid "Popup Window Blocked"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:142
-msgctxt "KCharselect unicode block name"
-msgid "CJK Strokes"
+#: khtml/khtml_part.cpp:7371
+msgid ""
+"This page has attempted to open a popup window but was blocked.\n"
+"You can click on this icon in the status bar to control this behavior\n"
+"or to open the popup."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:143
-msgctxt "KCharselect unicode block name"
-msgid "Katakana Phonetic Extensions"
-msgstr ""
+#: khtml/khtml_part.cpp:7384
+#, kde-format
+msgid "&Show Blocked Popup Window"
+msgid_plural "&Show %1 Blocked Popup Windows"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:144
-msgctxt "KCharselect unicode block name"
-msgid "Enclosed CJK Letters and Months"
+#: khtml/khtml_part.cpp:7385
+msgid "Show Blocked Window Passive Popup &Notification"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:145
-msgctxt "KCharselect unicode block name"
-msgid "CJK Compatibility"
+#: khtml/khtml_part.cpp:7387
+msgid "&Configure JavaScript New Window Policies..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:146
-msgctxt "KCharselect unicode block name"
-msgid "CJK Unified Ideographs Extension A"
-msgstr ""
+#: khtml/khtmlimage.cpp:202
+#, kde-format
+msgid "%1 (%2 - %3x%4 Pixels)"
+msgstr "%1 (%2 - %3x%4 o Bicseli)"
 
-#: kdeui/widgets/kcharselect-translation.cpp:147
-msgctxt "KCharselect unicode block name"
-msgid "Yijing Hexagram Symbols"
-msgstr ""
+#: khtml/khtmlimage.cpp:204
+#, kde-format
+msgid "%1 - %2x%3 Pixels"
+msgstr "%1 - %2x%3 o Bicseli"
 
-#: kdeui/widgets/kcharselect-translation.cpp:148
-msgctxt "KCharselect unicode block name"
-msgid "CJK Unified Ideographs"
+#: khtml/khtmlimage.cpp:209
+#, kde-format
+msgid "%1 (%2x%3 Pixels)"
+msgstr "%1 (%2x%3 o Bicseli)"
+
+#: khtml/khtmlimage.cpp:211
+#, kde-format
+msgid "Image - %1x%2 Pixels"
+msgstr "Delwedd - %1x%2 o Bicseli"
+
+#: khtml/khtmlimage.cpp:217
+msgid "Done."
+msgstr "Wedi gorffen."
+
+#: khtml/khtml_global.cpp:208
+msgid "KHTML"
+msgstr "KHTML"
+
+#: khtml/khtml_global.cpp:209
+msgid "Embeddable HTML component"
+msgstr "Cydran HTML mewnadeiladedig"
+
+#: khtml/khtml_global.cpp:211
+msgid "Lars Knoll"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:149
-msgctxt "KCharselect unicode block name"
-msgid "Yi Syllables"
+#: khtml/khtml_global.cpp:212
+msgid "Antti Koivisto"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:150
-msgctxt "KCharselect unicode block name"
-msgid "Yi Radicals"
+#: khtml/khtml_global.cpp:214
+msgid "Dirk Mueller"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:151
-msgctxt "KCharselect unicode block name"
-msgid "Lisu"
+#: khtml/khtml_global.cpp:215
+msgid "Peter Kelly"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:152
-msgctxt "KCharselect unicode block name"
-msgid "Vai"
+#: khtml/khtml_global.cpp:216
+msgid "Torben Weis"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:153
-msgctxt "KCharselect unicode block name"
-msgid "Cyrillic Extended-B"
+#: khtml/khtml_global.cpp:217
+msgid "Martin Jones"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:154
-msgctxt "KCharselect unicode block name"
-msgid "Bamum"
+#: khtml/khtml_global.cpp:218
+msgid "Simon Hausmann"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:155
-msgctxt "KCharselect unicode block name"
-msgid "Modifier Tone Letters"
+#: khtml/khtml_global.cpp:219
+msgid "Tobias Anton"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:156
-msgctxt "KCharselect unicode block name"
-msgid "Latin Extended-D"
+#: khtml/khtml_settings.cpp:916
+msgid "Filter error"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:157
-msgctxt "KCharselect unicode block name"
-msgid "Syloti Nagri"
+#: khtml/khtmlview.cpp:1842
+msgid "Access Keys activated"
+msgstr "Gweithredoliwyd Bysellau Cyrchiad"
+
+#: khtml/test_regression.cpp:619
+msgid "Directory containing tests, basedir and output directories."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:158
-msgctxt "KCharselect unicode block name"
-msgid "Common Indic Number Forms"
+#: khtml/test_regression.cpp:621
+msgid "Do not suppress debug output"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:159
-msgctxt "KCharselect unicode block name"
-msgid "Phags-pa"
+#: khtml/test_regression.cpp:623
+msgid "Regenerate baseline (instead of checking)"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:160
-msgctxt "KCharselect unicode block name"
-msgid "Saurashtra"
+#: khtml/test_regression.cpp:625
+msgid "Do not show the window while running tests"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:161
-msgctxt "KCharselect unicode block name"
-msgid "Devanagari Extended"
+#: khtml/test_regression.cpp:627
+msgid "Only run a single test. Multiple options allowed."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:162
-msgctxt "KCharselect unicode block name"
-msgid "Kayah Li"
+#: khtml/test_regression.cpp:628
+msgid "Only run .js tests"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:163
-msgctxt "KCharselect unicode block name"
-msgid "Rejang"
+#: khtml/test_regression.cpp:629
+msgid "Only run .html tests"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:164
-msgctxt "KCharselect unicode block name"
-msgid "Hangul Jamo Extended-A"
+#: khtml/test_regression.cpp:632
+msgid "Put output in &lt;directory&gt; instead of &lt;base_dir&gt;/output"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:165
-msgctxt "KCharselect unicode block name"
-msgid "Javanese"
+#: khtml/test_regression.cpp:634
+msgid ""
+"Use &lt;directory&gt; as reference instead of &lt;base_dir&gt;/baseline"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:166
-msgctxt "KCharselect unicode block name"
-msgid "Cham"
+#: khtml/test_regression.cpp:635
+msgid ""
+"Directory containing tests, basedir and output directories. Only regarded if "
+"-b is not specified."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:167
-msgctxt "KCharselect unicode block name"
-msgid "Myanmar Extended-A"
+#: khtml/test_regression.cpp:636
+msgid ""
+"Relative path to testcase, or directory of testcases to be run (equivalent "
+"to -t)."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:168
-msgctxt "KCharselect unicode block name"
-msgid "Tai Viet"
+#: khtml/test_regression.cpp:638
+msgid "TestRegression"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:171
-msgctxt "KCharselect unicode block name"
-msgid "Ethiopic Extended-A"
+#: khtml/test_regression.cpp:639
+msgid "Regression tester for khtml"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:169
-msgctxt "KCharselect unicode block name"
-msgid "Meetei Mayek"
+#: khtml/khtml_ext.cpp:418
+msgid "&Copy Text"
+msgstr "&Copïo Testun"
+
+#: khtml/khtml_ext.cpp:432
+#, kde-format
+msgid "Open '%1'"
+msgstr "Agor '%1'"
+
+#: khtml/khtml_ext.cpp:449
+msgid "&Copy Email Address"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:170
-msgctxt "KCharselect unicode block name"
-msgid "Hangul Syllables"
+#: khtml/khtml_ext.cpp:454
+msgid "&Save Link As..."
+msgstr "&Cadw Cyswllt Fel ..."
+
+#: khtml/khtml_ext.cpp:459
+msgid "&Copy Link Address"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:171
-msgctxt "KCharselect unicode block name"
-msgid "Hangul Jamo Extended-B"
+#: khtml/khtml_ext.cpp:471
+msgctxt "@title:menu HTML frame/iframe"
+msgid "Frame"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:172
-msgctxt "KCharselect unicode block name"
-msgid "High Surrogates"
+#: khtml/khtml_ext.cpp:472
+msgid "Open in New &Window"
+msgstr "Agor mewn &Ffenest Newydd"
+
+#: khtml/khtml_ext.cpp:478
+msgid "Open in &This Window"
+msgstr "Agor yn y Ffenest &Hon"
+
+#: khtml/khtml_ext.cpp:483
+msgid "Open in &New Tab"
+msgstr "Agor mewn Tab New&ydd"
+
+#: khtml/khtml_ext.cpp:493
+msgid "Reload Frame"
+msgstr "Ail-lwytho Ffrâm"
+
+#: khtml/khtml_ext.cpp:514
+msgid "View Frame Information"
+msgstr "Gweld Gwybodaeth Ffrâm"
+
+#: khtml/khtml_ext.cpp:524
+msgid "Block IFrame..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:173
-msgctxt "KCharselect unicode block name"
-msgid "High Private Use Surrogates"
+#: khtml/khtml_ext.cpp:549
+msgid "Save Image As..."
+msgstr "Cadw Delwedd Fel ..."
+
+#: khtml/khtml_ext.cpp:554
+msgid "Send Image..."
+msgstr "Anfon Delwedd ..."
+
+#: khtml/khtml_ext.cpp:560
+msgid "Copy Image"
+msgstr "Copïo Delwedd"
+
+#: khtml/khtml_ext.cpp:568
+msgid "Copy Image Location"
+msgstr "Copïo Lleoliad Delwedd"
+
+#: khtml/khtml_ext.cpp:577
+#, kde-format
+msgid "View Image (%1)"
+msgstr "Gweld Delwedd (%1)"
+
+#: khtml/khtml_ext.cpp:583
+msgid "Block Image..."
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:174
-msgctxt "KCharselect unicode block name"
-msgid "Low Surrogates"
+#: khtml/khtml_ext.cpp:591
+#, kde-format
+msgid "Block Images From %1"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:175
-msgctxt "KCharselect unicode block name"
-msgid "Private Use Area"
+#: khtml/khtml_ext.cpp:603
+msgid "Stop Animations"
+msgstr "Atal Bywluniadau"
+
+#: khtml/khtml_ext.cpp:640
+#, kde-format
+msgid "Search for '%1' with %2"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:176
-msgctxt "KCharselect unicode block name"
-msgid "CJK Compatibility Ideographs"
+#: khtml/khtml_ext.cpp:650
+#, kde-format
+msgid "Search for '%1' with"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:177
-msgctxt "KCharselect unicode block name"
-msgid "Alphabetic Presentation Forms"
+#: khtml/khtml_ext.cpp:694
+msgid "Save Link As"
+msgstr "Cadw Cyswllt Fel"
+
+#: khtml/khtml_ext.cpp:714
+msgid "Save Image As"
+msgstr "Cadw Delwedd Fel"
+
+#: khtml/khtml_ext.cpp:728 khtml/khtml_ext.cpp:741
+msgid "Add URL to Filter"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:178
-msgctxt "KCharselect unicode block name"
-msgid "Arabic Presentation Forms-A"
+#: khtml/khtml_ext.cpp:729 khtml/khtml_ext.cpp:742
+msgid "Enter the URL:"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:179
-msgctxt "KCharselect unicode block name"
-msgid "Variation Selectors"
+#: khtml/khtml_ext.cpp:879
+#, kde-format
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr ""
+"Mae ffeil o'r enw \"%1\" yn bodoli yn barod. Ydych chi'n sicr yr ydych "
+"eisiau sgrifennu drosto?"
 
-#: kdeui/widgets/kcharselect-translation.cpp:180
-msgctxt "KCharselect unicode block name"
-msgid "Vertical Forms"
+#: khtml/khtml_ext.cpp:879
+msgid "Overwrite File?"
+msgstr "Ysgrifennu dros y Ffeil?"
+
+#: khtml/khtml_ext.cpp:879
+msgid "Overwrite"
+msgstr "Dros-ysgrifennu"
+
+#: khtml/khtml_ext.cpp:1023
+#, no-c-format
+msgid "Default Font Size (100%)"
+msgstr "Maint yr Wynebfath Rhagosodol (100%)"
+
+#: khtml/test_regression_gui_main.cpp:34
+msgid "TestRegressionGui"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:181
-msgctxt "KCharselect unicode block name"
-msgid "Combining Half Marks"
+#: khtml/test_regression_gui_main.cpp:35
+msgid "GUI for the khtml regression tester"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:182
-msgctxt "KCharselect unicode block name"
-msgid "CJK Compatibility Forms"
+#: khtml/ecma/kjs_html.cpp:2162 khtml/ecma/kjs_window.cpp:1650
+msgid "Confirmation: JavaScript Popup"
+msgstr "Cadarnhad: Naidlen Javascript"
+
+#: khtml/ecma/kjs_html.cpp:2164
+msgid ""
+"This site is submitting a form which will open up a new browser window via "
+"JavaScript.\n"
+"Do you want to allow the form to be submitted?"
 msgstr ""
+"Mae'r safwe yma yn ceisio agor ffenestr newydd i borydd, wrth ddefnyddio "
+"Javascript. \n"
+" Ydych eisiau gadael i'r ffurflen gael ei anfon?"
 
-#: kdeui/widgets/kcharselect-translation.cpp:183
-msgctxt "KCharselect unicode block name"
-msgid "Small Form Variants"
+#: khtml/ecma/kjs_html.cpp:2167
+#, kde-format
+msgid ""
+"<qt>This site is submitting a form which will open <p>%1</p> in a new "
+"browser window via JavaScript.<br />Do you want to allow the form to be "
+"submitted?</qt>"
 msgstr ""
+"<qt>Mae'r safwe yma yn anfon ffurflen fydd yn agor <p>%1</p> mewn ffenestr "
+"newydd i borydd, wrth ddefnyddio Javascript. <br />Ydych eisiau gadael i'r "
+"ffurflen gael ei anfon?</qt>"
 
-#: kdeui/widgets/kcharselect-translation.cpp:184
-msgctxt "KCharselect unicode block name"
-msgid "Arabic Presentation Forms-B"
+#: khtml/ecma/kjs_html.cpp:2169 khtml/ecma/kjs_window.cpp:1658
+msgid "Allow"
+msgstr "Caniatáu"
+
+#: khtml/ecma/kjs_html.cpp:2169 khtml/ecma/kjs_window.cpp:1658
+msgid "Do Not Allow"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:185
-msgctxt "KCharselect unicode block name"
-msgid "Halfwidth and Fullwidth Forms"
+#: khtml/ecma/kjs_binding.cpp:185
+msgid ""
+"A script on this page is causing KHTML to freeze. If it continues to run, "
+"other applications may become less responsive.\n"
+"Do you want to stop the script?"
 msgstr ""
 
-#: kdeui/widgets/kcharselect-translation.cpp:186
-msgctxt "KCharselect unicode block name"
-msgid "Specials"
+#: khtml/ecma/kjs_binding.cpp:185
+msgid "JavaScript"
+msgstr "JavaScript"
+
+#: khtml/ecma/kjs_binding.cpp:185
+msgid "&Stop Script"
 msgstr ""
 
-#: kdeui/widgets/ksqueezedtextlabel.cpp:163
-msgid "&Copy Full Text"
+#: khtml/ecma/kjs_window.cpp:1653
+msgid ""
+"This site is requesting to open up a new browser window via JavaScript.\n"
+"Do you want to allow this?"
 msgstr ""
+"Mae'r safwe yma yn ceisio agor ffenestr newydd i borydd, wrth ddefnyddio "
+"Javascript. \n"
+" Ydych eisiau gadael hynny?"
 
-#: kdeui/widgets/kdatepicker.cpp:210
+#: khtml/ecma/kjs_window.cpp:1656
 #, kde-format
-msgid "Week %1"
-msgstr "Wythnos %1"
+msgid ""
+"<qt>This site is requesting to open<p>%1</p>in a new browser window via "
+"JavaScript.<br />Do you want to allow this?</qt>"
+msgstr ""
+"<qt>Mae'r safwe yma yn gofyn agor <p>%1</p> mewn ffenestr newydd i borydd, "
+"wrth ddefnyddio Javascript. <br /> Ydych eisiau gadael hynny?</qt>"
 
-#: kdeui/widgets/kdatepicker.cpp:317
-msgid "Next year"
-msgstr "Blwyddyn nesaf"
+#: khtml/ecma/kjs_window.cpp:1971
+msgid "Close window?"
+msgstr "Cau'r ffenest?"
 
-#: kdeui/widgets/kdatepicker.cpp:318
-msgid "Previous year"
-msgstr "Blwyddyn cynt"
+#: khtml/ecma/kjs_window.cpp:1971
+msgid "Confirmation Required"
+msgstr "Angen Cadarnhad"
 
-#: kdeui/widgets/kdatepicker.cpp:319
-msgid "Next month"
-msgstr "Mis nesaf"
+#: khtml/ecma/kjs_window.cpp:2874
+#, kde-format
+msgid ""
+"Do you want a bookmark pointing to the location \"%1\" to be added to your "
+"collection?"
+msgstr ""
+"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\" gael ei ychwanegu "
+"i'ch casgliad?"
 
-#: kdeui/widgets/kdatepicker.cpp:320
-msgid "Previous month"
-msgstr "Mis cynt"
+#: khtml/ecma/kjs_window.cpp:2877
+#, kde-format
+msgid ""
+"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
+"added to your collection?"
+msgstr ""
+"Ydych eisiau i dudnod sy'n cyfeirio at y lleoliad \"%1\", efo'r teitl "
+"\"%2\",  gael ei ychwanegu i'ch casgliad?"
 
-#: kdeui/widgets/kdatepicker.cpp:321
-msgid "Select a week"
-msgstr "Dewiswch wythnos"
+#: khtml/ecma/kjs_window.cpp:2885
+msgid "JavaScript Attempted Bookmark Insert"
+msgstr "Ceisiodd JavaScript Mewnosod Tudnod"
 
-#: kdeui/widgets/kdatepicker.cpp:322
-msgid "Select a month"
-msgstr "Dewiswch mis"
+#: khtml/ecma/kjs_window.cpp:2889
+msgid "Insert"
+msgstr "Rhyngosod"
 
-#: kdeui/widgets/kdatepicker.cpp:323
-msgid "Select a year"
-msgstr "Dewiswch blwyddyn"
+#: khtml/ecma/kjs_window.cpp:2889
+msgid "Disallow"
+msgstr "Gwrthwneud"
 
-#: kdeui/widgets/kdatepicker.cpp:324
-msgid "Select the current day"
-msgstr "Dewis y diwrnod cyfredol"
+#: khtml/ecma/debugger/consoledock.cpp:220
+msgid "Console"
+msgstr ""
 
-#: kdeui/widgets/khelpmenu.cpp:153 kdeui/actions/kstandardaction_p.h:111
-#, kde-format
-msgid "%1 &Handbook"
-msgstr "%1 &Llawlyfr"
+#: khtml/ecma/debugger/consoledock.cpp:243
+msgid "Enter"
+msgstr ""
 
-#: kdeui/widgets/khelpmenu.cpp:162
-msgid "What's &This"
-msgstr "Beth yw &Hyn"
+#: khtml/ecma/debugger/callstackdock.cpp:37
+msgid "Call Stack"
+msgstr ""
 
-#: kdeui/widgets/khelpmenu.cpp:173 kdeui/actions/kstandardaction_p.h:114
-msgid "&Report Bug..."
-msgstr "&Adroddi nam"
+#: khtml/ecma/debugger/callstackdock.cpp:41
+msgid "Call"
+msgstr ""
 
-#: kdeui/widgets/khelpmenu.cpp:183 kdeui/actions/kstandardaction_p.h:115
-msgid "Switch Application &Language..."
+#: khtml/ecma/debugger/callstackdock.cpp:41
+msgid "Line"
 msgstr ""
 
-#: kdeui/widgets/khelpmenu.cpp:194 kdeui/actions/kstandardaction_p.h:116
-#, kde-format
-msgid "&About %1"
-msgstr "&Ynglyn a %1"
+#: khtml/ecma/debugger/errordlg.cpp:35
+msgid "JavaScript Error"
+msgstr "Gwall JavaScript"
 
-#: kdeui/widgets/khelpmenu.cpp:199 kdeui/actions/kstandardaction_p.h:117
-msgid "About &KDE"
-msgstr "Ynglyn a &Kde"
+#: khtml/ecma/debugger/errordlg.cpp:49
+msgid "&Do not show this message again"
+msgstr "&Peidio a dangos y neges yma eto"
 
-#: kdeui/widgets/ktimecombobox.cpp:259
-msgctxt "@info"
-msgid "The time you entered is invalid"
+#: khtml/ecma/debugger/localvariabledock.cpp:43
+msgid "Local Variables"
 msgstr ""
 
-#: kdeui/widgets/ktimecombobox.cpp:262
-#, kde-format
-msgctxt "@info"
-msgid "Time cannot be earlier than %1"
+#: khtml/ecma/debugger/localvariabledock.cpp:51
+msgid "Reference"
 msgstr ""
 
-#: kdeui/widgets/ktimecombobox.cpp:269
-#, kde-format
-msgctxt "@info"
-msgid "Time cannot be later than %1"
+#: khtml/ecma/debugger/scriptsdock.cpp:43
+msgid "Loaded Scripts"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:166
-#, kde-format
-msgid "Shortcut '%1' in Application %2 for action %3\n"
+#: khtml/ecma/debugger/debugdocument.cpp:201
+msgid ""
+"Unable to find the Kate editor component;\n"
+"please check your KDE installation."
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:176
-#, kde-format
-msgctxt ""
-"%1 is the number of conflicts (hidden), %2 is the key sequence of the "
-"shortcut that is problematic"
-msgid "The shortcut '%2' conflicts with the following key combination:\n"
-msgid_plural ""
-"The shortcut '%2' conflicts with the following key combinations:\n"
-msgstr[0] ""
-msgstr[1] ""
+#: khtml/ecma/debugger/debugdocument.cpp:267
+msgid "Breakpoint"
+msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:182
-msgctxt "%1 is the number of shortcuts with which there is a conflict"
-msgid "Conflict with Registered Global Shortcut"
-msgid_plural "Conflict with Registered Global Shortcuts"
-msgstr[0] ""
-msgstr[1] ""
+#: khtml/ecma/debugger/debugwindow.cpp:111
+msgid "JavaScript Debugger"
+msgstr "Dadfygiwr JavaScript"
 
-#: kdeui/widgets/kkeysequencewidget.cpp:254
-msgctxt "%1 is the number of conflicts"
-msgid "Shortcut Conflict"
-msgid_plural "Shortcut Conflicts"
-msgstr[0] ""
-msgstr[1] ""
+#: khtml/ecma/debugger/debugwindow.cpp:186
+msgid "&Break at Next Statement"
+msgstr "&Torri wrth Ddatganiad Nesaf"
 
-#: kdeui/widgets/kkeysequencewidget.cpp:258
-#, kde-format
-msgid "Shortcut '%1' for action '%2'\n"
+#: khtml/ecma/debugger/debugwindow.cpp:187
+msgid "Break at Next"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:263
-#, kde-format
-msgctxt "%1 is the number of ambigious shortcut clashes (hidden)"
-msgid ""
-"The \"%2\" shortcut is ambiguous with the following shortcut.\n"
-"Do you want to assign an empty shortcut to this action?\n"
-"%3"
-msgid_plural ""
-"The \"%2\" shortcut is ambiguous with the following shortcuts.\n"
-"Do you want to assign an empty shortcut to these actions?\n"
-"%3"
-msgstr[0] ""
-msgstr[1] ""
+#: khtml/ecma/debugger/debugwindow.cpp:199
+msgid "Step Over"
+msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:281
-msgid "Shortcut conflict"
+#: khtml/ecma/debugger/debugwindow.cpp:206
+msgid "Step Into"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:282
-#, kde-format
-msgid ""
-"<qt>The '%1' key combination is already used by the <b>%2</b> "
-"action.<br>Please select a different one.</qt>"
+#: khtml/ecma/debugger/debugwindow.cpp:213
+msgid "Step Out"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:313
-msgid ""
-"Click on the button, then enter the shortcut like you would in the program.\n"
-"Example for Ctrl+a: hold the Ctrl key and press a."
+#: khtml/ecma/debugger/debugwindow.cpp:219
+msgid "Reindent Sources"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:520
-msgid "Reserved Shortcut"
+#: khtml/ecma/debugger/debugwindow.cpp:224
+msgid "Report Exceptions"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:521
-msgid ""
-"The F12 key is reserved on Windows, so cannot be used for a global "
-"shortcut.\n"
-"Please choose another one."
+#: khtml/ecma/debugger/debugwindow.cpp:232
+msgid "&Debug"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:661
-msgid "Conflict with Standard Application Shortcut"
-msgstr "Croestyniad efo Byrlwybr Cymhwysiad Arferol"
+#: khtml/ecma/debugger/debugwindow.cpp:266
+msgid "Close source"
+msgstr ""
+
+#: khtml/ecma/debugger/debugwindow.cpp:272
+msgid "Ready"
+msgstr ""
+
+#: khtml/ecma/debugger/debugwindow.cpp:621
+#, kde-format
+msgid "Parse error at %1 line %2"
+msgstr "Gwall dosrannu wrth %1 llinell %2"
 
-#: kdeui/widgets/kkeysequencewidget.cpp:662
+#: khtml/ecma/debugger/debugwindow.cpp:658
 #, kde-format
 msgid ""
-"The '%1' key combination is also used for the standard action \"%2\" that "
-"some applications use.\n"
-"Do you really want to use it as a global shortcut as well?"
+"An error occurred while attempting to run a script on this page.\n"
+"\n"
+"%1 line %2:\n"
+"%3"
 msgstr ""
+"Digwyddodd gwall wrth geisio rhedeg sgript ar y dudalen yma.\n"
+"\n"
+"%1 llinell %2:\n"
+"%3"
 
-#: kdeui/widgets/kkeysequencewidget.cpp:694
-msgctxt "What the user inputs now will be taken as the new shortcut"
-msgid "Input"
+#: khtml/ecma/debugger/debugwindow.cpp:853
+msgid ""
+"Do not know where to evaluate the expression. Please pause a script or open "
+"a source file."
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:744
-msgid "The key you just pressed is not supported by Qt."
+#: khtml/ecma/debugger/debugwindow.cpp:889
+#, kde-format
+msgid "Evaluation threw an exception %1"
 msgstr ""
 
-#: kdeui/widgets/kkeysequencewidget.cpp:745
-msgid "Unsupported Key"
-msgstr ""
+#: khtml/kmultipart/kmultipart.cpp:41
+msgid "KMultiPart"
+msgstr "KMultiPart"
 
-#: kdeui/widgets/krichtextwidget.cpp:227
-msgctxt "@action"
-msgid "Text &Color..."
-msgstr ""
+#: khtml/kmultipart/kmultipart.cpp:43
+msgid "Embeddable component for multipart/mixed"
+msgstr "Cydran mewnadeiladadwy i aml-ran/cymysglyd"
 
-#: kdeui/widgets/krichtextwidget.cpp:228
-msgctxt "@label stroke color"
-msgid "Color"
+#: khtml/kmultipart/kmultipart.cpp:45
+msgid "Copyright 2001-2011, David Faure <email>faure@kde.org</email>"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:239
-msgctxt "@action"
-msgid "Text &Highlight..."
+#: khtml/kmultipart/kmultipart.cpp:338
+#, kde-format
+msgid "No handler found for %1."
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:250
-msgctxt "@action"
-msgid "&Font"
+#: khtml/html/html_formimpl.cpp:422
+msgid ""
+"The following files will not be uploaded because they could not be found.\n"
+"Do you want to continue?"
 msgstr ""
+"Ni fydd y ffeiliau dilynol yn cael eu lanlwytho gan na ellir cael gafael "
+"arnynt.\n"
+"Hoffech fynd ymlaen?"
 
-#: kdeui/widgets/krichtextwidget.cpp:261
-msgctxt "@action"
-msgid "Font &Size"
-msgstr ""
+#: khtml/html/html_formimpl.cpp:426
+msgid "Submit Confirmation"
+msgstr "Anfon Cadarnhad"
 
-#: kdeui/widgets/krichtextwidget.cpp:271
-msgctxt "@action boldify selected text"
-msgid "&Bold"
+#: khtml/html/html_formimpl.cpp:426
+msgid "&Submit Anyway"
+msgstr "Anfon S&erch Hynny"
+
+#: khtml/html/html_formimpl.cpp:437
+msgid ""
+"You are about to transfer the following files from your local computer to "
+"the Internet.\n"
+"Do you really want to continue?"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:285
-msgctxt "@action italicize selected text"
-msgid "&Italic"
+#: khtml/html/html_formimpl.cpp:441
+msgid "Send Confirmation"
+msgstr "Anfon Cadarnhad"
+
+#: khtml/html/html_formimpl.cpp:441
+msgid "&Send File"
+msgid_plural "&Send Files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: khtml/html/html_formimpl.cpp:2717
+msgid "Key Generator"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:300
-msgctxt "@action underline selected text"
-msgid "&Underline"
-msgstr ""
+#: khtml/html/htmlparser.cpp:1938
+msgid "This is a searchable index. Enter search keywords: "
+msgstr "Mynegai chwiliadwy yw hwn.  Rhowch allweddeiriau i'r ymchwil: "
 
-#: kdeui/widgets/krichtextwidget.cpp:315
-msgctxt "@action"
-msgid "&Strike Out"
+#: khtml/html/html_objectimpl.cpp:608
+#, kde-format
+msgid ""
+"No plugin found for '%1'.\n"
+"Do you want to download one from %2?"
 msgstr ""
+"Methu canfod atodyn i '%1'. \n"
+" Ydych eisiau lawrlwytho un oddiwrth %2?"
 
-#: kdeui/widgets/krichtextwidget.cpp:328
-msgctxt "@action"
-msgid "Align &Left"
-msgstr ""
+#: khtml/html/html_objectimpl.cpp:609
+msgid "Missing Plugin"
+msgstr "Ategyn ar Goll"
 
-#: kdeui/widgets/krichtextwidget.cpp:329
-msgctxt "@label left justify"
-msgid "Left"
-msgstr ""
+#: khtml/html/html_objectimpl.cpp:609
+msgid "Download"
+msgstr "Lawrlwytho"
 
-#: kdeui/widgets/krichtextwidget.cpp:335
-msgctxt "@action"
-msgid "Align &Center"
+#: khtml/html/html_objectimpl.cpp:609
+msgid "Do Not Download"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:336
-msgctxt "@label center justify"
-msgid "Center"
+#: khtml/rendering/media_controls.cpp:47
+msgid "Play"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:342
-msgctxt "@action"
-msgid "Align &Right"
+#: khtml/rendering/render_form.cpp:789
+msgid "New Web Shortcut"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:343
-msgctxt "@label right justify"
-msgid "Right"
+#: khtml/rendering/render_form.cpp:810
+#, kde-format
+msgid "%1 is already assigned to %2"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:349
-msgctxt "@action"
-msgid "&Justify"
+#: khtml/rendering/render_form.cpp:855
+msgid "Search &provider name:"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:350
-msgctxt "@label justify fill"
-msgid "Justify"
+#: khtml/rendering/render_form.cpp:857
+msgid "New search provider"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:380
-msgctxt "@action"
-msgid "Left-to-Right"
+#: khtml/rendering/render_form.cpp:862
+msgid "UR&I shortcuts:"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:381
-msgctxt "@label left-to-right"
-msgid "Left-to-Right"
+#: khtml/rendering/render_form.cpp:948
+msgid "Create Web Shortcut"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:387
-msgctxt "@action"
-msgid "Right-to-Left"
-msgstr ""
+#: khtml/xml/xml_tokenizer.cpp:332
+msgid "the document is not in the correct file format"
+msgstr "nid yw'r ddogfen yn y fformat ffeil cywir"
 
-#: kdeui/widgets/krichtextwidget.cpp:388
-msgctxt "@label right-to-left"
-msgid "Right-to-Left"
-msgstr ""
+#: khtml/xml/xml_tokenizer.cpp:338
+#, kde-format
+msgid "fatal parsing error: %1 in line %2, column %3"
+msgstr "gwall gramadegu angheuol: %1 yn llinell %2, colofn %3"
 
-#: kdeui/widgets/krichtextwidget.cpp:375
-msgctxt "@title:menu"
-msgid "List Style"
-msgstr ""
+#: khtml/xml/xml_tokenizer.cpp:548
+msgid "XML parsing error"
+msgstr "Gwall gramadegu XML"
 
-#: kdeui/widgets/krichtextwidget.cpp:377
-msgctxt "@item:inmenu no list style"
-msgid "None"
-msgstr ""
+#: khtml/xml/dom_docimpl.cpp:2261
+msgid "Basic Page Style"
+msgstr "Ardull Sylfaenol i Dudalen"
 
-#: kdeui/widgets/krichtextwidget.cpp:378
-msgctxt "@item:inmenu disc list style"
-msgid "Disc"
-msgstr ""
+#: khtml/java/kjavaapplet.cpp:224
+#, kde-format
+msgid "Initializing Applet \"%1\"..."
+msgstr "Ymgychwyn Rhaglennig \"%1\"..."
 
-#: kdeui/widgets/krichtextwidget.cpp:379
-msgctxt "@item:inmenu circle list style"
-msgid "Circle"
-msgstr ""
+#: khtml/java/kjavaapplet.cpp:231
+#, kde-format
+msgid "Starting Applet \"%1\"..."
+msgstr "Cychwyn Rhaglennig \"%1\"..."
 
-#: kdeui/widgets/krichtextwidget.cpp:380
-msgctxt "@item:inmenu square list style"
-msgid "Square"
-msgstr ""
+#: khtml/java/kjavaapplet.cpp:238
+#, kde-format
+msgid "Applet \"%1\" started"
+msgstr "Mae rhaglennig \"%1\" wedi cychwyn"
 
-#: kdeui/widgets/krichtextwidget.cpp:381
-msgctxt "@item:inmenu numbered lists"
-msgid "123"
-msgstr ""
+#: khtml/java/kjavaapplet.cpp:244
+#, kde-format
+msgid "Applet \"%1\" stopped"
+msgstr "Mae rhaglennig \"%1\" wedi aros"
 
-#: kdeui/widgets/krichtextwidget.cpp:382
-msgctxt "@item:inmenu lowercase abc lists"
-msgid "abc"
-msgstr ""
+#: khtml/java/kjavaappletviewer.cpp:129
+msgid "Applet Parameters"
+msgstr "Paramedrau'r Rhaglennig"
 
-#: kdeui/widgets/krichtextwidget.cpp:383
-msgctxt "@item:inmenu uppercase abc lists"
-msgid "ABC"
-msgstr ""
+#: khtml/java/kjavaappletviewer.cpp:139
+msgid "Parameter"
+msgstr "Paramedr"
 
-#: kdeui/widgets/krichtextwidget.cpp:399
-msgctxt "@action"
-msgid "Increase Indent"
-msgstr ""
+#: khtml/java/kjavaappletviewer.cpp:143
+msgid "Class"
+msgstr "Dosbarth"
 
-#: kdeui/widgets/krichtextwidget.cpp:412
-msgctxt "@action"
-msgid "Decrease Indent"
-msgstr ""
+#: khtml/java/kjavaappletviewer.cpp:149
+msgid "Base URL"
+msgstr "URL Sylfaenol"
 
-#: kdeui/widgets/krichtextwidget.cpp:425
-msgctxt "@action"
-msgid "Insert Rule Line"
-msgstr ""
+#: khtml/java/kjavaappletviewer.cpp:155
+msgid "Archives"
+msgstr "Archifau"
 
-#: kdeui/widgets/krichtextwidget.cpp:436
-msgctxt "@action"
-msgid "Link"
-msgstr ""
+#: khtml/java/kjavaappletviewer.cpp:475
+msgid "KDE Java Applet Plugin"
+msgstr "Ategyn Rhaglennig Jave KDE"
 
-#: kdeui/widgets/krichtextwidget.cpp:447
-msgctxt "@action"
-msgid "Format Painter"
-msgstr ""
+#: khtml/java/kjavaappletserver.cpp:146
+msgid "Loading Applet"
+msgstr "Llwytho rhaglennig"
 
-#: kdeui/widgets/krichtextwidget.cpp:458
-msgctxt "@action"
-msgid "To Plain Text"
-msgstr ""
+#: khtml/java/kjavaappletserver.cpp:150
+msgid "Error: java executable not found"
+msgstr "Gwall: methu canfod gweithredadwyn java"
 
-#: kdeui/widgets/krichtextwidget.cpp:469
-msgctxt "@action"
-msgid "Subscript"
+#: khtml/java/kjavaappletserver.cpp:666
+#, kde-format
+msgid "Signed by (validation: %1)"
 msgstr ""
 
-#: kdeui/widgets/krichtextwidget.cpp:476
-msgctxt "@action"
-msgid "Superscript"
+#: khtml/java/kjavaappletserver.cpp:668
+#, kde-format
+msgid "Certificate (validation: %1)"
 msgstr ""
 
-#: kdeui/widgets/ktimezonewidget.cpp:66
-msgctxt "Define an area in the time zone, like a town area"
-msgid "Area"
-msgstr ""
+#: khtml/java/kjavaappletserver.cpp:799
+msgid "Do you grant Java applet with certificate(s):"
+msgstr "Ydych am roi i'r rhaglennig Java gyda thystysgrif(au):"
 
-#: kdeui/widgets/ktimezonewidget.cpp:66
-msgctxt "Time zone"
-msgid "Region"
-msgstr ""
+#: khtml/java/kjavaappletserver.cpp:801
+msgid "the following permission"
+msgstr "y caniatadau dilynol"
 
-#: kdeui/widgets/ktimezonewidget.cpp:66
-msgid "Comment"
-msgstr "Esboniad"
+#: khtml/java/kjavaappletserver.cpp:814
+msgid "&Reject All"
+msgstr "&Gwrthod Popeth"
 
-#: kdeui/widgets/kactionselector.cpp:94
-msgid "&Available:"
-msgstr "&Ar gael:"
+#: khtml/java/kjavaappletserver.cpp:820
+msgid "&Grant All"
+msgstr "&Caniatàu Popeth"
 
-#: kdeui/widgets/kactionselector.cpp:111
-msgid "&Selected:"
-msgstr "&Wedi'u dewis:"
+#: khtml/ui/findbar/khtmlfindbar.cpp:58
+msgid "Find &links only"
+msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:143
-msgctxt "@option next year"
-msgid "Next Year"
+#: khtml/ui/findbar/khtmlfindbar.cpp:211
+msgid "Not found"
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:144
-msgctxt "@option next month"
-msgid "Next Month"
+#: khtml/ui/findbar/khtmlfindbar.cpp:225
+msgid "No more matches for this search direction."
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:145
-msgctxt "@option next week"
-msgid "Next Week"
+#: khtml/ui/passwordbar/storepassbar.cpp:61
+#, kde-format
+msgid "Do you want to store this password for %1?"
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:146
-msgctxt "@option tomorrow"
-msgid "Tomorrow"
+#: kde3support/kunittest/modrunner.cpp:41
+msgid "A command-line application that can be used to run KUnitTest modules."
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:147
-msgctxt "@option today"
-msgid "Today"
+#: kde3support/kunittest/modrunner.cpp:46
+msgid "Only run modules whose filenames match the regexp."
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:148
-msgctxt "@option yesterday"
-msgid "Yesterday"
+#: kde3support/kunittest/modrunner.cpp:47
+msgid ""
+"Only run tests modules which are found in the folder. Use the query option "
+"to select modules."
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:149
-msgctxt "@option last week"
-msgid "Last Week"
+#: kde3support/kunittest/modrunner.cpp:48
+msgid ""
+"Disables debug capturing. You typically use this option when you use the GUI."
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:150
-msgctxt "@option last month"
-msgid "Last Month"
+#: kde3support/kunittest/modrunner.cpp:50
+msgid "KUnitTest ModRunner"
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:151
-msgctxt "@option last year"
-msgid "Last Year"
+#: kde3support/kunittest/modrunner.cpp:51
+msgid "(C) 2005 Jeroen Wijnhout"
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:153
-msgctxt "@option do not specify a date"
-msgid "No Date"
+#: kde3support/kio/kfile/k3fileview.cpp:123
+msgid "Unknown View"
 msgstr ""
 
-#: kdeui/widgets/kdatecombobox.cpp:230
-msgctxt "@info"
-msgid "The date you entered is invalid"
-msgstr ""
+#: kde3support/kdeui/k3spelldlg.cpp:49
+msgid "Check Spelling"
+msgstr "Gwirio Sillafu"
+
+#: kde3support/kdeui/k3spelldlg.cpp:53
+msgid "&Finished"
+msgstr "Wedi'i Orffe&n"
+
+#: kde3support/kdeui/k3dockwidget.cpp:272
+msgid "Close"
+msgstr "Cau"
+
+#: kde3support/kdeui/k3dockwidget.cpp:280
+msgctxt "Freeze the window geometry"
+msgid "Freeze"
+msgstr "Rhewi"
+
+#: kde3support/kdeui/k3dockwidget.cpp:288
+msgctxt "Dock this window"
+msgid "Dock"
+msgstr "Clymu"
+
+#: kde3support/kdeui/k3dockwidget.cpp:296
+msgid "Detach"
+msgstr "Dat-glymu"
 
-#: kdeui/widgets/kdatecombobox.cpp:233
+#: kde3support/kdeui/k3dockwidget.cpp:3045
 #, kde-format
-msgctxt "@info"
-msgid "Date cannot be earlier than %1"
-msgstr ""
+msgid "Hide %1"
+msgstr "Cuddio %1"
 
-#: kdeui/widgets/kdatecombobox.cpp:240
+#: kde3support/kdeui/k3dockwidget.cpp:3050
 #, kde-format
-msgctxt "@info"
-msgid "Date cannot be later than %1"
-msgstr ""
-
-#: kdeui/widgets/kpixmapregionselectorwidget.cpp:195
-msgid "Image Operations"
-msgstr "Gweithrediadau Delwedd"
+msgid "Show %1"
+msgstr "Dangos %1"
 
-#: kdeui/widgets/kpixmapregionselectorwidget.cpp:198
-msgid "&Rotate Clockwise"
-msgstr "Cylchdroi yn &Glocwedd"
+#: kde3support/kdeui/k3passworddialog.cpp:358
+msgid "&Password:"
+msgstr "&Cyfrinair:"
 
-#: kdeui/widgets/kpixmapregionselectorwidget.cpp:205
-msgid "Rotate &Counterclockwise"
-msgstr "Cylchdroi yn &Wrthglocwedd"
+#: kde3support/kdeui/k3passworddialog.cpp:376
+msgid "&Keep password"
+msgstr "&Cadw cyfrinair"
 
-#: kdeui/widgets/kcharselect.cpp:334 kdeui/widgets/kcharselect.cpp:336
-msgid "Enter a search term or character here"
+#: kde3support/kdeui/k3passworddialog.cpp:562
+#: kde3support/kdeui/k3passworddialog.cpp:566
+#: kde3support/kdeui/k3passworddialog.cpp:587
+msgid "Password Input"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:354
-msgctxt "Goes to previous character"
-msgid "Previous in History"
+#: kde3support/kdeui/k3sconfig.cpp:110
+msgctxt "@option:check"
+msgid "Do Spellchecking"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:356
-msgid "Previous Character in History"
+#: kde3support/kdeui/k3sconfig.cpp:114
+msgctxt "@option:check"
+msgid "Create &root/affix combinations not in dictionary"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:361
-msgctxt "Goes to next character"
-msgid "Next in History"
+#: kde3support/kdeui/k3sconfig.cpp:121
+msgctxt "@option:check"
+msgid "Consider run-together &words as spelling errors"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:363
-msgid "Next Character in History"
+#: kde3support/kdeui/k3sconfig.cpp:133
+msgctxt "@label:listbox"
+msgid "&Dictionary:"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:371
-msgid "Select a category"
+#: kde3support/kdeui/k3sconfig.cpp:160
+msgctxt "@label:listbox"
+msgid "&Encoding:"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:374
-msgid "Select a block to be displayed"
+#: kde3support/kdeui/k3sconfig.cpp:167
+msgctxt "@item:inlistbox Spell checker"
+msgid "International <application>Ispell</application>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:387
-msgid "Set font"
+#: kde3support/kdeui/k3sconfig.cpp:168
+msgctxt "@item:inlistbox Spell checker"
+msgid "<application>Aspell</application>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:394
-msgid "Set font size"
+#: kde3support/kdeui/k3sconfig.cpp:169
+msgctxt "@item:inlistbox Spell checker"
+msgid "<application>Hspell</application>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:625
-msgid "Character:"
+#: kde3support/kdeui/k3sconfig.cpp:170
+msgctxt "@item:inlistbox Spell checker"
+msgid "<application>Zemberek</application>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:631
-msgid "Name: "
+#: kde3support/kdeui/k3sconfig.cpp:171
+msgctxt "@item:inlistbox Spell checker"
+msgid "<application>Hunspell</application>"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:639
-msgid "Annotations and Cross References"
+#: kde3support/kdeui/k3sconfig.cpp:176
+msgctxt "@label:listbox"
+msgid "&Client:"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:643
-msgid "Alias names:"
+#: kde3support/kdeui/k3sconfig.cpp:258 kde3support/kdeui/k3sconfig.cpp:420
+#: kde3support/kdeui/k3sconfig.cpp:743
+msgctxt "@item Spelling dictionary"
+msgid "Hebrew"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:651
-msgid "Notes:"
+#: kde3support/kdeui/k3sconfig.cpp:263 kde3support/kdeui/k3sconfig.cpp:425
+#: kde3support/kdeui/k3sconfig.cpp:748
+msgctxt "@item Spelling dictionary"
+msgid "Turkish"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:659
-msgid "See also:"
+#: kde3support/kdeui/k3sconfig.cpp:318
+msgctxt "@item Spelling dictionary"
+msgid "English"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:671
-msgid "Equivalents:"
+#: kde3support/kdeui/k3sconfig.cpp:321
+msgctxt "@item Spelling dictionary"
+msgid "Spanish"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:679
-msgid "Approximate equivalents:"
+#: kde3support/kdeui/k3sconfig.cpp:324
+msgctxt "@item Spelling dictionary"
+msgid "Danish"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:688
-msgid "CJK Ideograph Information"
+#: kde3support/kdeui/k3sconfig.cpp:327
+msgctxt "@item Spelling dictionary"
+msgid "German"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:691
-msgid "Definition in English: "
+#: kde3support/kdeui/k3sconfig.cpp:330
+msgctxt "@item Spelling dictionary"
+msgid "German (new spelling)"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:696
-msgid "Mandarin Pronunciation: "
+#: kde3support/kdeui/k3sconfig.cpp:333
+msgctxt "@item Spelling dictionary"
+msgid "Brazilian Portuguese"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:701
-msgid "Cantonese Pronunciation: "
+#: kde3support/kdeui/k3sconfig.cpp:336
+msgctxt "@item Spelling dictionary"
+msgid "Portuguese"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:706
-msgid "Japanese On Pronunciation: "
+#: kde3support/kdeui/k3sconfig.cpp:339
+msgctxt "@item Spelling dictionary"
+msgid "Esperanto"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:711
-msgid "Japanese Kun Pronunciation: "
+#: kde3support/kdeui/k3sconfig.cpp:342
+msgctxt "@item Spelling dictionary"
+msgid "Norwegian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:716
-msgid "Tang Pronunciation: "
+#: kde3support/kdeui/k3sconfig.cpp:345
+msgctxt "@item Spelling dictionary"
+msgid "Polish"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:721
-msgid "Korean Pronunciation: "
+#: kde3support/kdeui/k3sconfig.cpp:348
+msgctxt "@item Spelling dictionary"
+msgid "Russian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:727
-msgid "General Character Properties"
+#: kde3support/kdeui/k3sconfig.cpp:351
+msgctxt "@item Spelling dictionary"
+msgid "Slovenian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:728
-msgid "Block: "
+#: kde3support/kdeui/k3sconfig.cpp:354
+msgctxt "@item Spelling dictionary"
+msgid "Slovak"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:729
-msgid "Unicode category: "
+#: kde3support/kdeui/k3sconfig.cpp:357
+msgctxt "@item Spelling dictionary"
+msgid "Czech"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:733
-msgid "Various Useful Representations"
+#: kde3support/kdeui/k3sconfig.cpp:360
+msgctxt "@item Spelling dictionary"
+msgid "Swedish"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:734
-msgid "UTF-8:"
+#: kde3support/kdeui/k3sconfig.cpp:363
+msgctxt "@item Spelling dictionary"
+msgid "Swiss German"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:737
-msgid "UTF-16: "
+#: kde3support/kdeui/k3sconfig.cpp:366
+msgctxt "@item Spelling dictionary"
+msgid "Ukrainian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:738
-msgid "C octal escaped UTF-8: "
+#: kde3support/kdeui/k3sconfig.cpp:369
+msgctxt "@item Spelling dictionary"
+msgid "Lithuanian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:741
-msgid "XML decimal entity:"
+#: kde3support/kdeui/k3sconfig.cpp:372
+msgctxt "@item Spelling dictionary"
+msgid "French"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:870
-msgid "Unicode code point:"
+#: kde3support/kdeui/k3sconfig.cpp:375
+msgctxt "@item Spelling dictionary"
+msgid "Belarusian"
 msgstr ""
 
-#: kdeui/widgets/kcharselect.cpp:871
-msgctxt "Character"
-msgid "In decimal:"
+#: kde3support/kdeui/k3sconfig.cpp:378
+msgctxt "@item Spelling dictionary"
+msgid "Hungarian"
 msgstr ""
 
-#: kdeui/widgets/kcmodule.cpp:171
-msgid "You will be asked to authenticate before saving"
+#: kde3support/kdeui/k3sconfig.cpp:382
+msgctxt "@item Spelling dictionary"
+msgid "Unknown"
 msgstr ""
 
-#: kdeui/widgets/kcmodule.cpp:175
-msgid "You are not allowed to save the configuration"
+#: kde3support/kdeui/k3sconfig.cpp:468 kde3support/kdeui/k3sconfig.cpp:681
+msgctxt "@item Spelling dictionary"
+msgid "<application>ISpell</application> Default"
 msgstr ""
 
-#: kdeui/widgets/klanguagebutton.cpp:177
-msgid "without name"
+#: kde3support/kdeui/k3sconfig.cpp:516 kde3support/kdeui/k3sconfig.cpp:658
+#: kde3support/kdeui/k3sconfig.cpp:729 kde3support/kdeui/k3sconfig.cpp:872
+#, kde-format
+msgctxt "@item Spelling dictionary: %1 dictionary name, %2 file name"
+msgid "Default - %1 [%2]"
 msgstr ""
 
-#: kdeui/widgets/klineedit.cpp:262
-msgctxt "@action:button Clear current text in the line edit"
-msgid "Clear text"
+#: kde3support/kdeui/k3sconfig.cpp:537 kde3support/kdeui/k3sconfig.cpp:755
+msgctxt "@item Spelling dictionary"
+msgid "<application>ASpell</application> Default"
 msgstr ""
 
-#: kdeui/widgets/klineedit.cpp:1130
-msgctxt "@title:menu"
-msgid "Text Completion"
+#: kde3support/kdeui/k3sconfig.cpp:602 kde3support/kdeui/k3sconfig.cpp:820
+#, kde-format
+msgctxt "@item Spelling dictionary: %1 dictionary name"
+msgid "Default - %1"
 msgstr ""
 
-#: kdeui/widgets/klineedit.cpp:1137
-msgctxt "@item:inmenu Text Completion"
-msgid "None"
+#: kde3support/kdeui/k3sconfig.cpp:621 kde3support/kdeui/k3sconfig.cpp:835
+msgctxt "@item Spelling dictionary"
+msgid "<application>Hunspell</application> Default"
 msgstr ""
 
-#: kdeui/widgets/klineedit.cpp:1138
-msgctxt "@item:inmenu Text Completion"
-msgid "Manual"
-msgstr ""
+#: kde3support/kdeui/k3syntaxhighlighter.cpp:519
+msgid "Incremental Spellcheck"
+msgstr "Gwirio Sillafu Cynnyddol"
 
-#: kdeui/widgets/klineedit.cpp:1139
-msgctxt "@item:inmenu Text Completion"
-msgid "Automatic"
-msgstr ""
+#: kde3support/kdeui/k3listviewsearchline.cpp:307
+#, kde-format
+msgctxt "Column number %1"
+msgid "Column No. %1"
+msgstr "Colofn %1"
 
-#: kdeui/widgets/klineedit.cpp:1140
-msgctxt "@item:inmenu Text Completion"
-msgid "Dropdown List"
-msgstr ""
+#: kde3support/kdeui/k3aboutdialog.cpp:185
+msgid "Email"
+msgstr "Ebost"
 
-#: kdeui/widgets/klineedit.cpp:1141
-msgctxt "@item:inmenu Text Completion"
-msgid "Short Automatic"
-msgstr ""
+#: kde3support/kdeui/k3aboutdialog.cpp:186
+msgid "Homepage"
+msgstr "Tudalen gartref"
 
-#: kdeui/widgets/klineedit.cpp:1142
-msgctxt "@item:inmenu Text Completion"
-msgid "Dropdown List && Automatic"
-msgstr ""
+#: kde3support/kdeui/k3aboutdialog.cpp:187
+msgid "Task"
+msgstr "Tasg"
 
-#: kdeui/widgets/klineedit.cpp:1173
-msgctxt "@item:inmenu Text Completion"
-msgid "Default"
+#: kde3support/kdeui/k3aboutdialog.cpp:684
+#, kde-format
+msgid ""
+"<html><font size=\"5\">%1</font><br/><b>version %2</b><br/>Using KDE "
+"%3</html>"
 msgstr ""
 
-#: kdeui/widgets/kdatetimeedit.cpp:195
-msgctxt "UTC time zone"
-msgid "UTC"
-msgstr ""
+#: kde3support/kdeui/k3aboutdialog.cpp:686
+#, kde-format
+msgid "%1 %2, %3"
+msgstr "%1 %2, %3"
 
-#: kdeui/widgets/kdatetimeedit.cpp:196
-msgctxt "No specific time zone"
-msgid "Floating"
-msgstr ""
+#: kde3support/kdeui/k3aboutdialog.cpp:900
+msgid "Other Contributors:"
+msgstr "Cyfrannwyr Eraill:"
+
+#: kde3support/kdeui/k3aboutdialog.cpp:901
+msgid "(No logo available)"
+msgstr "(dim logo ar gael)"
+
+#: kde3support/kdeui/k3textedit.cpp:348
+msgid "Spell Checking"
+msgstr "Cywiro Sillafu"
+
+#: kde3support/kdeui/k3command.cpp:389
+#, kde-format
+msgid "Undo: %1"
+msgstr "Dadwneud: %1"
+
+#: kde3support/kdeui/k3command.cpp:395
+#, kde-format
+msgid "Redo: %1"
+msgstr "Ail-wneud: %1"
+
+#: kde3support/kdeui/k3command.cpp:422 kdeui/actions/kstandardaction_p.h:55
+msgid "&Undo"
+msgstr "&Dad-wneud"
+
+#: kde3support/kdeui/k3command.cpp:422
+msgid "&Redo"
+msgstr "&Ail-wneud"
+
+#: kde3support/kdeui/k3command.cpp:427
+#, kde-format
+msgid "&Undo: %1"
+msgstr "&Dadwneud: %1"
+
+#: kde3support/kdeui/k3command.cpp:430
+#, kde-format
+msgid "&Redo: %1"
+msgstr "&Ail-wneud: %1"
 
-#: kdeui/widgets/kdatetimeedit.cpp:243
-msgctxt "@info"
+#: kde3support/kdeui/k3aboutapplication.cpp:50
+msgid "??"
+msgstr "??"
+
+#: kde3support/kdeui/k3aboutapplication.cpp:54
 msgid ""
-"The entered date and time is before the minimum allowed date and time."
+"No information available.\n"
+"The supplied KAboutData object does not exist."
 msgstr ""
+"Dim gwybodaeth ar gael. \n"
+" Nid ydy'r gwrthrych KAboutData a ddarparwyd ddim yn bodoli."
 
-#: kdeui/widgets/kdatetimeedit.cpp:253
-msgctxt "@info"
-msgid "The entered date and time is after the maximum allowed date and time."
-msgstr ""
+#: kde3support/kdeui/k3aboutapplication.cpp:169
+msgid "&License Agreement"
+msgstr "Cytundeb &Trwydded"
 
-#: kdeui/widgets/keditlistbox.cpp:326
-msgid "&Add"
-msgstr "&Ychwanegu"
+#: kde3support/kdeui/k3wizard.cpp:48
+msgid "&Back"
+msgstr "&Yn ôl"
 
-#: kdeui/widgets/keditlistbox.cpp:338
-msgid "&Remove"
-msgstr "&Tynnu ymaith"
+#: kde3support/kdeui/k3wizard.cpp:49
+msgctxt "Opposite to Back"
+msgid "&Next"
+msgstr "&Nesaf"
 
-#: kdeui/widgets/keditlistbox.cpp:350
-msgid "Move &Up"
-msgstr "Sym&ud i fyny"
+#: kde3support/kdeui/k3spell.cpp:1290
+msgid "You have to restart the dialog for changes to take effect"
+msgstr "Rhaid i chi ailgychwyn yr ymgom i'r newidiadau gymryd effaith"
 
-#: kdeui/widgets/keditlistbox.cpp:355
-msgid "Move &Down"
-msgstr "Symu&d i lawr"
+#: kde3support/kdeui/k3spell.cpp:1526
+msgid "Spell Checker"
+msgstr "Cywirydd Sillafu"
 
-#: kdeui/widgets/khistorycombobox.cpp:317
-msgid "No further items in the history."
+#: nepomuk/query/query.cpp:696
+#, kde-format
+msgctxt ""
+"@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the "
+"user entered."
+msgid "Query Results from '%1'"
 msgstr ""
 
-#: kdeui/actions/kcodecaction.cpp:91
-msgctxt "Encodings menu"
-msgid "Default"
+#: nepomuk/query/query.cpp:702
+msgctxt "@title UDS_DISPLAY_NAME for a KIO directory listing."
+msgid "Query Results"
 msgstr ""
 
-#: kdeui/actions/kcodecaction.cpp:102
-msgctxt "Encodings menu"
-msgid "Autodetect"
+#: nepomuk/query/queryparser.cpp:544
+msgctxt ""
+"Boolean AND keyword in desktop search strings. You can add several variants "
+"separated by spaces, e.g. retain the English one alongside the translation; "
+"keywords are not case sensitive. Make sure there is no conflict with the OR "
+"keyword."
+msgid "and"
 msgstr ""
 
-#: kdeui/actions/kaction.cpp:120
-#, kde-format
-msgid ""
-"The key sequence '%1' is ambiguous. Use 'Configure Shortcuts'\n"
-"from the 'Settings' menu to solve the ambiguity.\n"
-"No action will be triggered."
+#: nepomuk/query/queryparser.cpp:553
+msgctxt ""
+"Boolean OR keyword in desktop search strings. You can add several variants "
+"separated by spaces, e.g. retain the English one alongside the translation; "
+"keywords are not case sensitive. Make sure there is no conflict with the AND "
+"keyword."
+msgid "or"
 msgstr ""
 
-#: kdeui/actions/kaction.cpp:124
-msgid "Ambiguous shortcut detected"
+#: nepomuk/core/resource.cpp:532
+msgid "Success"
 msgstr ""
 
-#: kdeui/actions/krecentfilesaction.cpp:80
-msgid "No Entries"
+#: nepomuk/core/resource.cpp:534
+msgid "Communication error"
 msgstr ""
 
-#: kdeui/actions/krecentfilesaction.cpp:84
-msgid "Clear List"
+#: nepomuk/core/resource.cpp:536
+msgid "Invalid type in Database"
 msgstr ""
 
-#: kdeui/actions/ktogglefullscreenaction.cpp:48
-#: kdeui/actions/ktogglefullscreenaction.cpp:55
-#: kdeui/actions/ktogglefullscreenaction.cpp:85
-#: kdeui/actions/kstandardaction_p.h:101
-msgid "F&ull Screen Mode"
-msgstr "&Modd Sgrîn Llawn"
-
-#: kdeui/actions/ktogglefullscreenaction.cpp:51
-#: kdeui/actions/ktogglefullscreenaction.cpp:58
-#: kdeui/actions/ktogglefullscreenaction.cpp:86
-msgid "Full Screen"
+#: nepomuk/rcgen/rcgen.cpp:49 nepomuk/rcgen/rcgen.cpp:51
+msgid "Nepomuk Resource Class Generator"
 msgstr ""
 
-#: kdeui/actions/ktogglefullscreenaction.cpp:81
-msgid "Exit F&ull Screen Mode"
-msgstr "Gadael &Modd Sgrîn Llawn"
-
-#: kdeui/actions/ktogglefullscreenaction.cpp:82
-msgid "Exit Full Screen"
+#: nepomuk/rcgen/rcgen.cpp:53
+msgid "(c) 2006-2009, Sebastian Trüg"
 msgstr ""
 
-#: kdeui/actions/kstandardaction.cpp:92 kdeui/util/kstandardguiitem.cpp:210
-msgctxt "go back"
-msgid "&Back"
-msgstr "Y&n ôl"
-
-#: kdeui/actions/kstandardaction.cpp:98 kdeui/util/kstandardguiitem.cpp:218
-msgctxt "go forward"
-msgid "&Forward"
-msgstr "&Ymlaen"
-
-#: kdeui/actions/kstandardaction.cpp:104
-msgctxt "home page"
-msgid "&Home"
+#: nepomuk/rcgen/rcgen.cpp:56
+msgid "Sebastian Trüg"
 msgstr ""
 
-#: kdeui/actions/kstandardaction.cpp:107 kdeui/util/kstandardguiitem.cpp:178
-msgctxt "show help"
-msgid "&Help"
-msgstr "&Cymorth"
+#: nepomuk/rcgen/rcgen.cpp:56
+msgid "Maintainer"
+msgstr ""
 
-#: kdeui/actions/kstandardaction.cpp:515 kdeui/actions/kstandardaction_p.h:98
-msgid "Show &Menubar"
-msgstr "Dangos &Dewislen"
+#: nepomuk/rcgen/rcgen.cpp:57
+msgid "Tobias Koenig"
+msgstr ""
 
-#: kdeui/actions/kstandardaction.cpp:521
-msgid "Show Menubar<p>Shows the menubar again after it has been hidden</p>"
+#: nepomuk/rcgen/rcgen.cpp:57
+msgid "Major cleanup - Personal hero of maintainer"
 msgstr ""
 
-#: kdeui/actions/kstandardaction.cpp:538 kdeui/actions/kstandardaction_p.h:100
-msgid "Show St&atusbar"
-msgstr "Dangos Bar Cyfl&wr"
+#: nepomuk/rcgen/rcgen.cpp:64
+msgid "Verbose output debugging mode."
+msgstr ""
 
-#: kdeui/actions/kstandardaction.cpp:541
+#: nepomuk/rcgen/rcgen.cpp:65
 msgid ""
-"Show Statusbar<br /><br />Shows the statusbar, which is the bar at the "
-"bottom of the window used for status information."
+"Generate simple and fast wrapper classes not based on Nepomuk::Resource "
+"which do not provide any data integrity checking"
 msgstr ""
 
-#: kdeui/util/kkeyserver_x11.cpp:95
-msgid "Backspace"
-msgstr "Yn ôl"
-
-#: kdeui/util/kkeyserver_x11.cpp:96
-msgid "SysReq"
-msgstr "SysReq"
-
-#: kdeui/util/kkeyserver_x11.cpp:97
-msgid "CapsLock"
-msgstr "PriflythGlo"
-
-#: kdeui/util/kkeyserver_x11.cpp:98
-msgid "NumLock"
-msgstr "RhifGlo"
-
-#: kdeui/util/kkeyserver_x11.cpp:99
-msgid "ScrollLock"
-msgstr "SgrolGlo"
-
-#: kdeui/util/kkeyserver_x11.cpp:100
-msgid "PageUp"
-msgstr "Tudalen i Fyny"
-
-#: kdeui/util/kkeyserver_x11.cpp:101
-msgid "PageDown"
-msgstr "Tudalen i Lawr"
-
-#: kdeui/util/kkeyserver_x11.cpp:104
-msgid "Again"
-msgstr "Eto"
-
-#: kdeui/util/kkeyserver_x11.cpp:105
-msgid "Props"
-msgstr "Ategion"
-
-#: kdeui/util/kkeyserver_x11.cpp:106 kdeui/util/kundostack.cpp:67
-msgid "Undo"
-msgstr "Dad-wneud"
-
-#: kdeui/util/kkeyserver_x11.cpp:107
-msgid "Front"
-msgstr "Ffront"
-
-#: kdeui/util/kkeyserver_x11.cpp:108
-msgid "Copy"
-msgstr "Copio"
-
-#: kdeui/util/kkeyserver_x11.cpp:109
-msgid "Open"
-msgstr "Agor"
-
-#: kdeui/util/kkeyserver_x11.cpp:110
-msgid "Paste"
-msgstr "Gludo"
-
-#: kdeui/util/kkeyserver_x11.cpp:111
-msgid "Find"
-msgstr "Canfod"
-
-#: kdeui/util/kkeyserver_x11.cpp:112
-msgid "Cut"
-msgstr "Torri"
+#: nepomuk/rcgen/rcgen.cpp:66
+msgid "Actually generate the code."
+msgstr ""
 
-#: kdeui/util/kundostack.cpp:48
-msgid "Redo"
+#: nepomuk/rcgen/rcgen.cpp:67
+msgid "List all includes (deprecated)."
 msgstr ""
 
-#: kdeui/util/kcompletion.cpp:693
+#: nepomuk/rcgen/rcgen.cpp:68
 msgid ""
-"You reached the end of the list\n"
-"of matching items.\n"
+"List all header files that will be generated via the --writeall command."
 msgstr ""
-"Rydych wedi cyrraedd diwedd y rhestr\n"
-" o dermau cydweddol.\n"
 
-#: kdeui/util/kcompletion.cpp:699
+#: nepomuk/rcgen/rcgen.cpp:69
 msgid ""
-"The completion is ambiguous, more than one\n"
-"match is available.\n"
+"List all source files that will be generated via the --writeall command."
 msgstr ""
-"Mae'r cwblhâd yn amwys, mae mwy nac un \n"
-" cydweddiad ar gael\n"
-
-#: kdeui/util/kcompletion.cpp:705
-msgid "There is no matching item available.\n"
-msgstr "Dim cydweddiad ar gael.\n"
-
-#: kdeui/util/kstandardguiitem.cpp:109
-msgid "&OK"
-msgstr "&Iawn"
 
-#: kdeui/util/kstandardguiitem.cpp:115
-msgid "&Cancel"
-msgstr "&Diddymu"
+#: nepomuk/rcgen/rcgen.cpp:70
+msgid ""
+"The ontology files containing the ontologies to be generated, a space "
+"separated list (deprecated: use arguments instead.)"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:120
-msgid "Yes"
-msgstr "Ie"
+#: nepomuk/rcgen/rcgen.cpp:71
+msgid "Include path prefix (deprecated)"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:125
-msgid "No"
-msgstr "Nage"
+#: nepomuk/rcgen/rcgen.cpp:72
+msgid "Specify the target folder to store generated files into."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:130
-msgid "&Discard"
-msgstr "&Taflu"
+#: nepomuk/rcgen/rcgen.cpp:76
+msgid "Templates to be used (deprecated)."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:130
-msgid "Discard changes"
-msgstr "Taflu newidiadau"
+#: nepomuk/rcgen/rcgen.cpp:77
+msgid ""
+"Optionally specify the classes to be generated. Use option multiple times "
+"(defaults to all classes)"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:131
+#: nepomuk/rcgen/rcgen.cpp:78
 msgid ""
-"Pressing this button will discard all recent changes made in this dialog."
+"Serialization used in the ontology files. Will default to primitive file "
+"extension detection."
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:137 kdeui/actions/kstandardaction_p.h:46
-msgid "&Save"
-msgstr "&Cadw"
+#: nepomuk/rcgen/rcgen.cpp:79
+msgid ""
+"Set the used visibility in case the classes are to be used in public API. "
+"<visibility-name> will be used to construct the export macro name and the "
+"export header. By default classes will not be exported."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:137
-msgid "Save data"
-msgstr "Cadw'r data"
+#: nepomuk/rcgen/rcgen.cpp:80
+msgid "The ontology files containing the ontologies to be generated."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:142
-msgid "&Do Not Save"
-msgstr "&Peidiwch â Chadw"
+#: nepomuk/ui/nepomukmassupdatejob.cpp:76
+msgid "Changing annotations"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:143
-msgid "Do not save data"
+#: nepomuk/ui/kedittagsdialog.cpp:49
+msgctxt "@title:window"
+msgid "Change Tags"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:148 kdeui/actions/kstandardaction_p.h:47
-msgid "Save &As..."
-msgstr "Cadw &Fel..."
+#: nepomuk/ui/kedittagsdialog.cpp:50
+msgctxt "@title:window"
+msgid "Add Tags"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:149
-msgid "Save file with another name"
-msgstr "Cadw'r ffeil efo enw arall"
+#: nepomuk/ui/kedittagsdialog.cpp:59
+msgctxt "@label:textbox"
+msgid "Configure which tags should be applied."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:154
-msgid "&Apply"
-msgstr "&Gosod"
+#: nepomuk/ui/kedittagsdialog.cpp:70
+msgctxt "@label"
+msgid "Create new tag:"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:154
-msgid "Apply changes"
-msgstr "Cymhwyso'r newidiadau"
+#: nepomuk/ui/kedittagsdialog.cpp:92
+msgctxt "@info"
+msgid "Delete tag"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:155
+#: nepomuk/ui/kedittagsdialog.cpp:216
+#, kde-format
+msgctxt "@info"
 msgid ""
-"When you click <b>Apply</b>, the settings will be handed over to the "
-"program, but the dialog will not be closed.\n"
-"Use this to try different settings."
+"Should the tag <resource>%1</resource> really be deleted for all files?"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:163
-msgid "Administrator &Mode..."
-msgstr "Modd G&weinyddwr..."
+#: nepomuk/ui/kedittagsdialog.cpp:218
+msgctxt "@title"
+msgid "Delete tag"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:163
-msgid "Enter Administrator Mode"
-msgstr "Newid i Fodd Gweinyddwr"
+#: nepomuk/ui/kedittagsdialog.cpp:219
+msgctxt "@action:button"
+msgid "Delete"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:164
-msgid ""
-"When you click <b>Administrator Mode</b> you will be prompted for the "
-"administrator (root) password in order to make changes which require root "
-"privileges."
+#: nepomuk/ui/kedittagsdialog.cpp:220
+msgctxt "@action:button"
+msgid "Cancel"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:172
-msgid "Clear input"
-msgstr "Clirio'r mewnbwn"
+#: nepomuk/ui/tagwidget.cpp:61
+msgctxt "@label"
+msgid "Show all tags..."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:173
-msgid "Clear the input in the edit field"
-msgstr "Clirio'r mewnbwn yn y maes golygu"
+#: nepomuk/ui/tagwidget.cpp:112
+msgctxt "@label"
+msgid "Add Tags..."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:179
-msgid "Show help"
-msgstr "Dangos cymorth"
+#: nepomuk/ui/tagwidget.cpp:112
+msgctxt "@label"
+msgid "Change..."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:185
-msgid "Close the current window or document"
-msgstr "Cau'r ffenest neu ddogfen cyfredol"
+#: nepomuk/utils/facet.cpp:132 nepomuk/utils/typefacet.cpp:64
+msgctxt "@option:check A filter on file type"
+msgid "Documents"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:190
-msgid "&Close Window"
+#: nepomuk/utils/facet.cpp:136 nepomuk/utils/typefacet.cpp:68
+msgctxt "@option:check A filter on file type - audio files"
+msgid "Audio"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:191
-msgid "Close the current window."
+#: nepomuk/utils/facet.cpp:138 nepomuk/utils/typefacet.cpp:70
+msgctxt "@option:check A filter on file type - media video"
+msgid "Video"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:196
-msgid "&Close Document"
+#: nepomuk/utils/facet.cpp:141 nepomuk/utils/typefacet.cpp:73
+msgctxt "@option:check A filter on file type"
+msgid "Images"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:197
-msgid "Close the current document."
+#: nepomuk/utils/facet.cpp:177
+msgctxt ""
+"@option:radio A filter on prioritizing/sorting a selection of resources"
+msgid "No priority"
 msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:202
-msgid "&Defaults"
-msgstr "&Rhagosodiadau"
+#: nepomuk/utils/facet.cpp:178
+msgctxt ""
+"@option:radio A filter on prioritizing/sorting a selection of resources"
+msgid "Last modified"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:203
-msgid "Reset all items to their default values"
-msgstr "Ailosod pob eitem i'w werth rhagosodol"
+#: nepomuk/utils/facet.cpp:179
+msgctxt ""
+"@option:radio A filter on prioritizing/sorting a selection of resources"
+msgid "Most important"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:211
-msgid "Go back one step"
-msgstr "Ewch cam yn ôl"
+#: nepomuk/utils/facet.cpp:180
+msgctxt ""
+"@option:radio A filter on prioritizing/sorting a selection of resources"
+msgid "Never opened"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:219
-msgid "Go forward one step"
-msgstr "Ewch cam ymlaen"
+#: nepomuk/utils/facet.cpp:190
+msgctxt "@option:radio A filter on the rating of a resource"
+msgid "Any Rating"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:229 kdeui/actions/kstandardaction_p.h:50
-msgid "&Print..."
-msgstr "&Argraffu"
+#: nepomuk/utils/facet.cpp:191
+msgctxt "@option:radio A filter on the rating of a resource"
+msgid "1 or more"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:230
-msgid "Opens the print dialog to print the current document"
-msgstr "Agor y blwch dewisiadau argraffu er mwyn argraffu'r ddogfen gyfredol"
+#: nepomuk/utils/facet.cpp:192
+msgctxt "@option:radio A filter on the rating of a resource"
+msgid "2 or more"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:236
-msgid "C&ontinue"
-msgstr "&Mynd ymlaen"
+#: nepomuk/utils/facet.cpp:193
+msgctxt "@option:radio A filter on the rating of a resource"
+msgid "3 or more"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:237
-msgid "Continue operation"
-msgstr "Ewch ymlaen a'r gweithrediad"
+#: nepomuk/utils/facet.cpp:194
+msgctxt "@option:radio A filter on the rating of a resource"
+msgid "4 or more"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:242
-#: obj-sparc-linux-gnu/kate/ui_filetypeconfigwidget.h:253
-msgid "&Delete"
-msgstr "&Dileu"
+#: nepomuk/utils/facet.cpp:195
+msgctxt "@option:radio A filter on the rating of a resource"
+msgid "Max Rating"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:243
-msgid "Delete item(s)"
-msgstr "Dileu eitem(au)"
+#: nepomuk/utils/datefacet.cpp:119
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "Anytime"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:248 kdeui/actions/kstandardaction_p.h:44
-msgid "&Open..."
-msgstr "&Agor..."
+#: nepomuk/utils/datefacet.cpp:121
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "Today"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:249
-msgid "Open file"
-msgstr "Agor ffeil"
+#: nepomuk/utils/datefacet.cpp:123
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "Yesterday"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:254 kdeui/actions/kstandardaction_p.h:53
-msgid "&Quit"
-msgstr "&Gorffen"
+#: nepomuk/utils/datefacet.cpp:125
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "This Week"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:255
-msgid "Quit application"
-msgstr "Gadael y cymhwysiant"
+#: nepomuk/utils/datefacet.cpp:127
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "Last Week"
+msgstr ""
+
+#: nepomuk/utils/datefacet.cpp:129
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "This Month"
+msgstr ""
+
+#: nepomuk/utils/datefacet.cpp:131
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "Last Month"
+msgstr ""
+
+#: nepomuk/utils/datefacet.cpp:133
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "This Year"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:260
-msgid "&Reset"
-msgstr "A&ilosod"
+#: nepomuk/utils/datefacet.cpp:135
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources"
+msgid "Last Year"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:261
-msgid "Reset configuration"
-msgstr "Ailodosd ffurfweddiad"
+#: nepomuk/utils/datefacet.cpp:137
+msgctxt ""
+"referring to a filter on the modification and usage date of files/resources "
+"that will open a dialog to choose a date range"
+msgid "Custom..."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:266
-msgctxt "Verb"
-msgid "&Insert"
-msgstr "&Mewnosod"
+#: nepomuk/utils/searchlineedit.cpp:74
+msgid "Enter Search Terms..."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:271
-msgid "Confi&gure..."
-msgstr "Ffurf&weddu..."
+#: nepomuk/utils/dynamicresourcefacet.cpp:256
+msgctxt ""
+"@option:check An item in a list of resources that allows to query for more "
+"resources to put in the list"
+msgid "More..."
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:286
-msgid "Add"
-msgstr "Ychwanegu"
+#: nepomuk/utils/typefacet.cpp:80
+msgctxt "@option:check A filter on resource type"
+msgid "Contacts"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:296
-msgid "Test"
-msgstr "Profi"
+#: nepomuk/utils/typefacet.cpp:82
+msgctxt "@option:check A filter on resource type"
+msgid "Emails"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:301
-#: obj-sparc-linux-gnu/kate/ui_filetypeconfigwidget.h:254
-msgid "Properties"
-msgstr "Priodweddau"
+#: nepomuk/utils/typefacet.cpp:84
+msgctxt "@option:check A filter on resource type"
+msgid "Tasks"
+msgstr ""
 
-#: kdeui/util/kstandardguiitem.cpp:306
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
+#: nepomuk/utils/typefacet.cpp:86
+msgctxt "@option:check A filter on resource type"
+msgid "Tags"
+msgstr ""
 
-#: kdeui/kernel/kapplication.cpp:815
-#, kde-format
-msgid "The style '%1' was not found"
+#: nepomuk/utils/typefacet.cpp:220 nepomuk/utils/typefacet.cpp:229
+msgctxt "@option:check Do filter on type - show only files"
+msgid "Files"
 msgstr ""
 
-#: kdeui/kernel/kuniqueapplication.cpp:88
-msgid "Do not run in the background."
+#: nepomuk/utils/typefacet.cpp:222 nepomuk/utils/typefacet.cpp:231
+msgctxt "@option:check Do filter on type - show everything but files"
+msgid "Other"
 msgstr ""
 
-#: kdeui/kernel/kuniqueapplication.cpp:90
-msgid "Internally added if launched from Finder"
+#: nepomuk/utils/resourcemodel.cpp:149
+msgctxt ""
+"@title KCategorizedSortFilterProxyModel grouping for all Nepomukj resources "
+"that are of type rdfs:Resource"
+msgid "Miscellaneous"
 msgstr ""
 
-#: kdeui/notifications/knotificationrestrictions.cpp:180
-msgid "Unknown Application"
+#: nepomuk/utils/resourcemodel.cpp:175
+msgctxt "@title:column The Nepomuk resource label and icon"
+msgid "Resource"
 msgstr ""
 
-#: kdeui/notifications/ksystemtrayicon.cpp:156
-msgid "Minimize"
-msgstr "Lleihau"
+#: nepomuk/utils/resourcemodel.cpp:177
+msgctxt "@title:column The Nepomuk resource's RDF type"
+msgid "Resource Type"
+msgstr ""
 
-#: kdeui/notifications/ksystemtrayicon.cpp:215
-#: kdeui/notifications/kstatusnotifieritem.cpp:382
-#: kdeui/notifications/kstatusnotifieritem.cpp:809
-msgid "&Minimize"
-msgstr "Llei&hau"
+#: nepomuk/utils/daterangeselectionwidget.cpp:201
+msgid "This Week"
+msgstr ""
 
-#: kdeui/notifications/ksystemtrayicon.cpp:219
-#: kdeui/notifications/kstatusnotifieritem.cpp:807
-msgid "&Restore"
-msgstr "Ad&fer"
+#: nepomuk/utils/daterangeselectionwidget.cpp:206
+msgid "This Month"
+msgstr ""
 
-#: kdeui/notifications/ksystemtrayicon.cpp:239
-#: kdeui/notifications/kstatusnotifieritem.cpp:817
-#, kde-format
-msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
-msgstr "<qt>Ydych wir eisiau terfynu <b>'%1'</b>?</qt>"
+#: kpty/kptydevice.cpp:322
+msgid "Error reading from PTY"
+msgstr ""
 
-#: kdeui/notifications/ksystemtrayicon.cpp:242
-#: kdeui/notifications/kstatusnotifieritem.cpp:820
-msgid "Confirm Quit From System Tray"
-msgstr "Cadarnhau Terfynu o'r Cafn Cysawd"
+#: kpty/kptydevice.cpp:356
+msgid "Error writing to PTY"
+msgstr ""
 
-#: kutils/kprintpreview.cpp:123
-msgid "Could not load print preview part"
+#: kpty/kptydevice.cpp:441
+msgid "PTY operation timed out"
 msgstr ""
 
-#: kutils/kprintpreview.cpp:138
-msgid "Print Preview"
+#: kpty/kptydevice.cpp:497 kpty/kptydevice.cpp:511
+msgid "Error opening PTY"
 msgstr ""
 
 #: kutils/kcmoduleloader.cpp:75
@@ -12795,23 +12628,23 @@
 "or the module has been disabled by the administrator.</p></qt>"
 msgstr ""
 
-#: kutils/kcmoduleloader.cpp:132
+#: kutils/kcmoduleloader.cpp:134
 #, kde-format
 msgid "The module %1 is not a valid configuration module."
 msgstr "Nid modiwl ffurfweddu dilys yw modiwl %1."
 
-#: kutils/kcmoduleloader.cpp:133
+#: kutils/kcmoduleloader.cpp:135
 #, kde-format
 msgid ""
 "<qt>The diagnosis is:<br />The desktop file %1 does not specify a "
 "library.</qt>"
 msgstr ""
 
-#: kutils/kcmoduleloader.cpp:152
+#: kutils/kcmoduleloader.cpp:150
 msgid "There was an error loading the module."
 msgstr "Gwall wrth lwytho'r modiwl."
 
-#: kutils/kcmoduleloader.cpp:152
+#: kutils/kcmoduleloader.cpp:150
 #, kde-format
 msgid ""
 "<qt>The diagnosis is:<br />%1<p>Possible reasons:</p><ul><li>An error "
@@ -12822,7 +12655,7 @@
 "your distributor or packager.</p></qt>"
 msgstr ""
 
-#: kutils/kcmoduleloader.cpp:167
+#: kutils/kcmoduleloader.cpp:166
 msgid ""
 "<qt><p>Possible reasons:<ul><li>An error occurred during your last KDE "
 "upgrade leaving an orphaned control module</li><li>You have old third party "
@@ -12831,10 +12664,12 @@
 "contacting your distributor or packager.</p></qt>"
 msgstr ""
 
-#: kutils/kcmoduleproxy.cpp:165
-#, kde-format
-msgctxt "Argument is application name"
-msgid "This configuration section is already opened in %1"
+#: kutils/kprintpreview.cpp:123
+msgid "Could not load print preview part"
+msgstr ""
+
+#: kutils/kprintpreview.cpp:140
+msgid "Print Preview"
 msgstr ""
 
 #: kutils/kpluginselector.cpp:136
@@ -12891,7 +12726,7 @@
 msgid "Search Plugins"
 msgstr ""
 
-#: kutils/kpluginselector.cpp:768 kutils/kpluginselector.cpp:797
+#: kutils/kpluginselector.cpp:767 kutils/kpluginselector.cpp:796
 #, kde-format
 msgctxt "Used only for plugins"
 msgid "About %1"
@@ -12907,6 +12742,12 @@
 msgid "Apply Settings"
 msgstr ""
 
+#: kutils/kcmoduleproxy.cpp:165
+#, kde-format
+msgctxt "Argument is application name"
+msgid "This configuration section is already opened in %1"
+msgstr ""
+
 #: kutils/ksettings/dialog.cpp:232
 msgid "Enable component"
 msgstr ""
@@ -12915,142 +12756,173 @@
 msgid "Select Components"
 msgstr "Dewis Cydrannau"
 
-#: kparts/browseropenorsavequestion.cpp:100
+#: kross/qts/main.cpp:57 kross/console/main.cpp:94
+msgid "Kross"
+msgstr ""
+
+#: kross/qts/main.cpp:58 kross/console/main.cpp:96
+msgid "KDE application to run Kross scripts."
+msgstr ""
+
+#: kross/qts/main.cpp:60 kross/console/main.cpp:98
+msgid "(C) 2006 Sebastian Sauer"
+msgstr ""
+
+#: kross/qts/main.cpp:61 kross/console/main.cpp:99
+msgid "Run Kross scripts."
+msgstr ""
+
+#: kross/qts/main.cpp:63 kross/console/main.cpp:102
+msgid "Sebastian Sauer"
+msgstr ""
+
+#: kross/qts/main.cpp:69 kross/console/main.cpp:108
+msgid "Scriptfile"
+msgstr ""
+
+#: kross/modules/form.cpp:302
+msgid "Cancel?"
+msgstr ""
+
+#: kross/core/manager.cpp:147
+msgid "Level of safety of the Ruby interpreter"
+msgstr ""
+
+#: kross/core/action.cpp:455
 #, kde-format
-msgctxt "@label Type of file"
-msgid "Type: %1"
+msgid "Scriptfile \"%1\" does not exist."
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:107
-msgctxt "@label:checkbox"
-msgid "Remember action for files of this type"
+#: kross/core/action.cpp:459
+#, kde-format
+msgid "Failed to determine interpreter for scriptfile \"%1\""
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:140
-#: kparts/browseropenorsavequestion.cpp:210
+#: kross/core/action.cpp:463
 #, kde-format
-msgctxt "@label:button"
-msgid "&Open with %1"
+msgid "Failed to open scriptfile \"%1\""
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:186
+#: kross/core/action.cpp:474
 #, kde-format
-msgctxt "@action:inmenu"
-msgid "Open &with %1"
+msgid "Failed to load interpreter \"%1\""
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:197
-#: kparts/browseropenorsavequestion.cpp:274
+#: kross/core/action.cpp:476
 #, kde-format
-msgctxt "@info"
-msgid "Open '%1'?"
+msgid "No such interpreter \"%1\""
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:206
-msgctxt "@label:button"
-msgid "&Open with..."
+#: kross/core/action.cpp:482
+#, kde-format
+msgid "Failed to create script for interpreter \"%1\""
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:214
-msgctxt "@label:button"
-msgid "&Open with"
+#: kross/ui/view.cpp:159
+msgid "Text:"
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:271
-msgctxt "@label:button"
-msgid "&Open"
+#: kross/ui/view.cpp:166
+msgid "Comment:"
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:292
-#, kde-format
-msgctxt "@label File name"
-msgid "Name: %1"
+#: kross/ui/view.cpp:173
+msgid "Icon:"
 msgstr ""
 
-#: kparts/browseropenorsavequestion.cpp:293
-msgctxt "@info:whatsthis"
-msgid "This is the file name suggested by the server"
+#: kross/ui/view.cpp:194
+msgid "Interpreter:"
 msgstr ""
 
-#: kparts/part.cpp:757
-msgid "Untitled"
-msgstr "Heb deitl"
+#: kross/ui/view.cpp:209
+msgid "File:"
+msgstr "Ffeil:"
 
-#: kparts/part.cpp:763
-#, kde-format
-msgid ""
-"The document \"%1\" has been modified.\n"
-"Do you want to save your changes or discard them?"
+#: kross/ui/view.cpp:303
+msgid "Execute the selected script."
 msgstr ""
-"Mae'r ddogfen \"%1\" wedi ei newid.\n"
-"Ydych eisiau cadw eich newidiadau, neu eu taflu?"
 
-#: kparts/part.cpp:765
-msgid "Close Document"
-msgstr "Cau Dogfen"
+#: kross/ui/view.cpp:310
+msgid "Stop execution of the selected script."
+msgstr ""
 
-#: kparts/browserextension.cpp:645
-#, kde-format
-msgid "<qt>Do you want to search the Internet for <b>%1</b>?</qt>"
+#: kross/ui/view.cpp:315
+msgid "Edit..."
 msgstr ""
 
-#: kparts/browserextension.cpp:646
-msgid "Internet Search"
-msgstr "Chwiliad Rhyngrwyd"
+#: kross/ui/view.cpp:317
+msgid "Edit selected script."
+msgstr ""
 
-#: kparts/browserextension.cpp:646
-msgid "&Search"
-msgstr "&Chwilio"
+#: kross/ui/view.cpp:322
+msgid "Add..."
+msgstr ""
 
-#: kparts/browserrun.cpp:312
-#, kde-format
-msgid "Do you really want to execute '%1'?"
+#: kross/ui/view.cpp:324
+msgid "Add a new script."
+msgstr ""
+
+#: kross/ui/view.cpp:331
+msgid "Remove selected script."
+msgstr ""
+
+#: kross/ui/view.cpp:504
+msgid "Edit"
+msgstr "Golygu"
+
+#: kross/ui/view.cpp:511
+msgctxt "@title:group Script properties"
+msgid "General"
+msgstr ""
+
+#: dnssd/servicemodel.cpp:102
+msgid "Host"
 msgstr ""
 
-#: kparts/browserrun.cpp:313
-msgid "Execute File?"
-msgstr "Gweithredu Ffeil?"
+#: dnssd/servicemodel.cpp:103
+msgid "Port"
+msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:98
+#: kdeui/colors/kcolordialog.cpp:102
 msgctxt "palette name"
 msgid "* Recent Colors *"
 msgstr "* Lliwiau Diweddar *"
 
-#: kdeui/colors/kcolordialog.cpp:99
+#: kdeui/colors/kcolordialog.cpp:103
 msgctxt "palette name"
 msgid "* Custom Colors *"
 msgstr "* Lliwiau Arferu *"
 
-#: kdeui/colors/kcolordialog.cpp:100
+#: kdeui/colors/kcolordialog.cpp:104
 msgctxt "palette name"
 msgid "Forty Colors"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:101
+#: kdeui/colors/kcolordialog.cpp:105
 msgctxt "palette name"
 msgid "Oxygen Colors"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:102
+#: kdeui/colors/kcolordialog.cpp:106
 msgctxt "palette name"
 msgid "Rainbow Colors"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:103
+#: kdeui/colors/kcolordialog.cpp:107
 msgctxt "palette name"
 msgid "Royal Colors"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:104
+#: kdeui/colors/kcolordialog.cpp:108
 msgctxt "palette name"
 msgid "Web Colors"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:522
+#: kdeui/colors/kcolordialog.cpp:552
 msgid "Named Colors"
 msgstr "Lliwiau a Enwir"
 
-#: kdeui/colors/kcolordialog.cpp:709
+#: kdeui/colors/kcolordialog.cpp:739
 #, kde-format
 msgctxt ""
 "%1 is the number of paths, %2 is the list of paths (with newlines between "
@@ -13066,11 +12938,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kdeui/colors/kcolordialog.cpp:991
+#: kdeui/colors/kcolordialog.cpp:1014
 msgid "Select Color"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1060
+#: kdeui/colors/kcolordialog.cpp:1097
 msgid "Hue:"
 msgstr ""
 
@@ -13079,24 +12951,24 @@
 msgid "°"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1070
+#: kdeui/colors/kcolordialog.cpp:1108
 msgid "Saturation:"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1080
+#: kdeui/colors/kcolordialog.cpp:1118
 msgctxt "This is the V of HSV"
 msgid "Value:"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1094
+#: kdeui/colors/kcolordialog.cpp:1132
 msgid "Red:"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1103
+#: kdeui/colors/kcolordialog.cpp:1142
 msgid "Green:"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1113
+#: kdeui/colors/kcolordialog.cpp:1152
 msgid "Blue:"
 msgstr ""
 
@@ -13104,53 +12976,32 @@
 msgid "Alpha:"
 msgstr ""
 
-#: kdeui/colors/kcolordialog.cpp:1158
+#: kdeui/colors/kcolordialog.cpp:1218
 msgid "&Add to Custom Colors"
 msgstr "&Ychwanegu at Liwiau Rhagosodedig"
 
-#: kdeui/colors/kcolordialog.cpp:1193
+#: kdeui/colors/kcolordialog.cpp:1253
 msgid "HTML:"
 msgstr "HTML:"
 
-#: kdeui/colors/kcolordialog.cpp:1283
+#: kdeui/colors/kcolordialog.cpp:1344
 msgid "Default color"
 msgstr "Lliw rhagosodol"
 
-#: kdeui/colors/kcolordialog.cpp:1364
+#: kdeui/colors/kcolordialog.cpp:1411
 msgid "-default-"
 msgstr "-rhagosodol-"
 
-#: kdeui/colors/kcolordialog.cpp:1682
+#: kdeui/colors/kcolordialog.cpp:1658
 msgid "-unnamed-"
 msgstr "-ddi-enw-"
 
-#: kdeui/colors/kcolorcombo.cpp:355
+#: kdeui/colors/kcolorcombo.cpp:352
 msgctxt "Custom color"
 msgid "Custom..."
 msgstr ""
 
-#: kross/qts/values_p.h:69
-#, kde-format
-msgid "No such function \"%1\""
-msgstr ""
-
-#: kdecore/services/kservicetypetrader.h:192
-#: kdecore/services/kmimetypetrader.h:136
-#: kdecore/services/kmimetypetrader.h:169
-msgid "No service matching the requirements was found"
-msgstr ""
-
-#: kdecore/services/kservice.h:519
-#, kde-format
-msgid "The service '%1' does not provide an interface '%2' with keyword '%3'"
-msgstr ""
-
-#: kdecore/util/qtest_kde.h:77 kdecore/util/qtest_kde.h:128
-msgid "KDE Test Program"
-msgstr ""
-
 #: kdeui/actions/kstandardaction_p.h:43
-#: obj-sparc-linux-gnu/kate/ui_filetypeconfigwidget.h:249
 msgid "&New"
 msgstr "&Newydd"
 
@@ -13315,6 +13166,11 @@
 msgid "Configure &Notifications..."
 msgstr "Ffurfweddu &Negesau ..."
 
+#: kdeui/actions/kstandardaction_p.h:111
+#, kde-format
+msgid "%1 &Handbook"
+msgstr "%1 &Llawlyfr"
+
 #: kdeui/actions/kstandardaction_p.h:112
 msgid "What's &This?"
 msgstr "Beth yw &Hwn?"
@@ -13323,490 +13179,48 @@
 msgid "Tip of the &Day"
 msgstr "Awgrymiad y &Dydd"
 
-#: obj-sparc-linux-gnu/kdeui/ui_kcupsoptionspageswidget.h:219
-msgid "End"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:135
-msgid "Common name:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:136
-msgid "Acme Co."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:137
-msgid "Organization:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:138
-msgid "Acme Sundry Products Company"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:139
-msgid "Organizational unit:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:140
-msgid "Fraud Department"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:141
-msgid "Country:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:142
-msgid "Canada"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:143
-msgid "State:"
-msgstr "Talaith:"
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:144
-msgid "Quebec"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:145
-msgid "City:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_certificateparty.h:146
-msgid "Lakeridge Meadows"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:171
-msgid "Terminal"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:173
-msgid ""
-"Check this option if the application you want to run is a text mode "
-"application or if you want the information that is provided by the terminal "
-"emulator window."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:175
-msgid "&Run in terminal"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:176
-msgid "&Terminal options:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:178
-msgid ""
-"Check this option if the text mode application offers relevant information "
-"on exit. Keeping the terminal emulator open allows you to retrieve this "
-"information."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:180
-msgid "Do not &close when command exits"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:181
-msgid "User"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:183
-msgid ""
-"Check this option if you want to run this application with a different user "
-"id. Every process has a different user id associated with it. This id code "
-"determines file access and other permissions. The password of the user is "
-"required to use this option."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:185
-msgid "Ru&n as a different user"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:187
-msgid "Enter the user name you want to run the application as."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:189
-msgid "&Username:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:191
-msgid "Enter the user name you want to run the application as here."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:193
-msgid "Startup"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:195
-msgid ""
-"Check this option if you want to make clear that your application has "
-"started. This visual feedback may appear as a busy cursor or in the taskbar."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:197
-msgid "Enable &launch feedback"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:199
-msgid ""
-"Check this option if you want to have a system tray handle for your "
-"application."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:201
-msgid "&Place in system tray"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:202
-msgid "&D-Bus registration:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:205
-msgid "None"
-msgstr "Dim"
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:206
-msgid "Multiple Instances"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:207
-msgid "Single Instance"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopadvbase.h:208
-msgid "Run Until Finished"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:197
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:201
-msgid ""
-"Type the name you want to give to this application here. This application "
-"will appear under this name in the applications menu and in the panel."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:199
-#: obj-sparc-linux-gnu/kate/ui_commandmenueditwidget.h:168
-#: obj-sparc-linux-gnu/kate/ui_filetypeconfigwidget.h:255
-msgid "&Name:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:204
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:208
-msgid ""
-"Type the description of this application, based on its use, here. Examples: "
-"a dial up application (KPPP) would be \"Dial up tool\"."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:206
-#: obj-sparc-linux-gnu/kate/ui_commandmenueditwidget.h:176
-msgid "&Description:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:211
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:215
-msgid "Type any comment you think is useful here."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:213
-msgid "Comm&ent:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:218
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:233
-msgid ""
-"Type the command to start this application here.\n"
-"\n"
-"Following the command, you can have several place holders which will be "
-"replaced with the actual values when the actual program is run:\n"
-"%f - a single file name\n"
-"%F - a list of files; use for applications that can open several local files "
-"at once\n"
-"%u - a single URL\n"
-"%U - a list of URLs\n"
-"%d - the directory of the file to open\n"
-"%D - a list of directories\n"
-"%i - the icon\n"
-"%m - the mini-icon\n"
-"%c - the caption"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:231
-msgid "Co&mmand:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:247
-msgid ""
-"Click here to browse your file system in order to find the desired "
-"executable."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:249
-msgid "&Browse..."
-msgstr "&Pori..."
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:251
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:255
-msgid "Sets the working directory for your application."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:253
-msgid "&Work path:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:258
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:267
-msgid ""
-"<qt><p>This list should show the types of file that your application can "
-"handle. This list is organized by <u>mimetypes</u>.</p>\n"
-"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
-"identifying the type of data based on filename extensions and correspondent "
-"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
-"flower.bmp indicates that it is a specific kind of image, <u>image/x-"
-"bmp</u>. To know which application should open each type of file, the system "
-"should be informed about the abilities of each application to handle these "
-"extensions and mimetypes.</p>\n"
-"<p>If you want to associate this application with one or more mimetypes that "
-"are not in this list, click on the button <b>Add</b> below. If there are one "
-"or more filetypes that this application cannot handle, you may want to "
-"remove them from the list clicking on the button <b>Remove</b> "
-"below.</p></qt>"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:262
-msgid "&Supported file types:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:265
-msgid "Mimetype"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:272
-msgid ""
-"Click on this button if you want to add a type of file (mimetype) that your "
-"application can handle."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:276
-msgid ""
-"If you want to remove a type of file (mimetype) that your application cannot "
-"handle, select the mimetype in the list above and click on this button."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:280
-msgid ""
-"Click here to modify the way this application will run, launch feedback, D-"
-"Bus options or to run it as a different user."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_kpropertiesdesktopbase.h:282
-msgid "Ad&vanced Options"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_keygenwizard.h:61
-msgid ""
-"You have indicated that you wish to obtain or purchase a secure certificate. "
-"This wizard is intended to guide you through the procedure. You may cancel "
-"at any time, and this will abort the transaction."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_keygenwizard2.h:89
-msgid ""
-"You must now provide a password for the certificate request. Please choose a "
-"very secure password as this will be used to encrypt your private key."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_keygenwizard2.h:90
-msgid "&Repeat password:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_keygenwizard2.h:91
-msgid "&Choose password:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:217
-msgid "[padlock]"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:218
-msgid "Bruce Schneier secure"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:219
-msgid "Address:"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/ui_sslinfo.h:231
-msgid "KSqueezedTextLabel"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:221
-msgid "IP address:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:222
-msgid "is not there"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:223
-msgid "Encryption:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:224
-msgid "SnakeOilCrypt 3000"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:225
-msgid "Details:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:226
-msgid "Kx = DH, Auth = RSA, MAC = SHA1"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:227
-msgid "SSL version:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:228
-msgid "ElboniaTLS v0.0.0"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:229
-msgid "Certificate chain:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:230
-msgid "Trusted:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:231
-msgid "Maybe... no."
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:232
-msgid "Validity period:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:233
-msgid "August 34 2004 to Undecimber 0 2008"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:234
-msgid "Serial number:"
-msgstr "Rhif cyfres:"
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:235
-msgid "23"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:236
-msgid "MD5 digest:"
-msgstr "Crynodeb MD5:"
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:237
-msgid "SHA1 digest:"
-msgstr ""
-
-#: obj-sparc-linux-gnu/kio/ui_sslinfo.h:238
-msgid "B4:DB:00:2E"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:142
-msgid "<b>Subject Information</b>"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:143
-msgid "<b>Issuer Information</b>"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:144
-msgid "<b>Other</b>"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:145
-msgid "Validity period"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:146
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:148
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:150
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:152
-msgid "TextLabel"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:147
-msgid "Serial number"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:149
-msgid "MD5 digest"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_displaycert.h:151
-msgid "SHA1 digest"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_cacertificates.h:110
-msgid "Organizational Unit"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_cacertificates.h:111
-msgid "Organization / Common Name"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_cacertificates.h:112
-msgid "Display..."
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_cacertificates.h:113
-msgid "Disable"
-msgstr ""
-
-#: obj-i686-linux-gnu/kio/kssl/kcm/ui_cacertificates.h:114
-msgid "Enable"
-msgstr ""
+#: kdeui/actions/kstandardaction_p.h:114
+msgid "&Report Bug..."
+msgstr "&Adroddi nam"
 
-#: obj-sparc-linux-gnu/khtml/ui_htmlpageinfo.h:209
-#: obj-sparc-linux-gnu/kate/ui_completionconfigtab.h:106
-#: obj-sparc-linux-gnu/kate/ui_viinputmodeconfigwidget.h:151
-msgid "General"
+#: kdeui/actions/kstandardaction_p.h:115
+msgid "Switch Application &Language..."
 msgstr ""
 
-#: obj-sparc-linux-gnu/plasma/ui_publish.h:74
-msgid ""
-"Sharing a widget on the network allows you to access this widget from "
-"another computer as a remote control."
-msgstr ""
+#: kdeui/actions/kstandardaction_p.h:116
+#, kde-format
+msgid "&About %1"
+msgstr "&Ynglyn a %1"
 
-#: obj-sparc-linux-gnu/plasma/ui_publish.h:75
-msgid "Share this widget on the network"
-msgstr ""
+#: kdeui/actions/kstandardaction_p.h:117
+msgid "About &KDE"
+msgstr "Ynglyn a &Kde"
 
-#: obj-sparc-linux-gnu/plasma/ui_publish.h:76
-msgid "Allow everybody to freely access this widget"
+#: kdecore/services/kservice.h:555
+#, kde-format
+msgid "The service '%1' does not provide an interface '%2' with keyword '%3'"
 msgstr ""
 
-#: obj-sparc-linux-gnu/plasma/ui_pinpairing.h:97
-msgid ""
-"Enter a password below. Enter the same password on the device to which you "
-"are trying to connect."
+#: kdecore/services/kservicetypetrader.h:192
+#: kdecore/services/kmimetypetrader.h:136
+#: kdecore/services/kmimetypetrader.h:169
+msgid "No service matching the requirements was found"
 msgstr ""
 
-#: obj-sparc-linux-gnu/plasma/ui_pinpairing.h:98
-msgid "Allow this user access to any service"
+#: kdecore/util/qtest_kde.h:79 kdecore/util/qtest_kde.h:130
+msgid "KDE Test Program"
 msgstr ""
 
-#: obj-sparc-linux-gnu/plasma/ui_pinpairing.h:99
-msgid "Remember this user"
+#: kross/qts/values_p.h:69
+#, kde-format
+msgid "No such function \"%1\""
 msgstr ""
 
-#: kdecore/localization/klocale.cpp:2023 kdecore/localization/klocale.cpp:2181
-#: kdecore/date/kdatetime.cpp:1500 kdecore/date/kdatetime.cpp:1510
-#: kdecore/date/kdatetime.cpp:2872
+#: kdecore/date/kdatetime.cpp:1523 kdecore/date/kdatetime.cpp:1533
+#: kdecore/date/kdatetime.cpp:2983
 msgid "am"
 msgstr "yb"
 
-#: kdecore/localization/klocale.cpp:2017 kdecore/localization/klocale.cpp:2179
-#: kdecore/date/kdatetime.cpp:2880
+#: kdecore/date/kdatetime.cpp:2991
 msgid "pm"
 msgstr "yp"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdelibs_colors4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdelibs_colors4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdelibs_colors4.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdelibs_colors4.po	2012-04-18 08:59:29.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdelibs_colors4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:22+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:45+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: colors.cpp:1
 msgctxt "color"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kde-menu.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kde-menu.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kde-menu.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kde-menu.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2011-06-23 23:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:13+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kde-menu.cpp:93
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdepasswd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdepasswd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdepasswd.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdepasswd.po	2012-04-18 08:59:36.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: kdepasswd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 16:54+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:21+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:46+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kdepasswd.cpp:41
 msgid "KDE passwd"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdepimwizards.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdepimwizards.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdepimwizards.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdepimwizards.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:35+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: groupwaremain.cpp:35
 msgid "KDE-PIM Groupware Configuration Wizard"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdeqt.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdeqt.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdeqt.po	2012-03-23 07:39:17.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdeqt.po	2012-04-18 08:59:28.000000000 +0000
@@ -7,25 +7,25 @@
 msgstr ""
 "Project-Id-Version: kdeqt\n"
 "Report-Msgid-Bugs-To: qt-bugs@trolltech.com\n"
-"POT-Creation-Date: 2012-03-19 22:01+0000\n"
+"POT-Creation-Date: 2012-04-13 13:26+0000\n"
 "PO-Revision-Date: 2009-07-18 18:38+0000\n"
 "Last-Translator: KDE <Unknown>\n"
 "Language-Team: KDE <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:21+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: gui/dialogs/qprintpropertieswidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, QPrintPropertiesWidget)
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, QPageSetupWidget)
 #. i18n: file: gui/dialogs/qprintwidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, QPrintWidget)
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, QPrintSettingsOutput)
-#: rc.cpp:3 rc.cpp:12 rc.cpp:72 rc.cpp:99
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, QPageSetupWidget)
+#: rc.cpp:3 rc.cpp:12 rc.cpp:39 rc.cpp:99
 msgid "Form"
 msgstr ""
 
@@ -41,1908 +41,1638 @@
 msgid "Advanced"
 msgstr ""
 
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:42
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:15
-msgid "Paper"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:48
-#. i18n: ectx: property (text), widget (QLabel, pageSizeLabel)
-#: rc.cpp:18
-msgid "Page size:"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:61
-#. i18n: ectx: property (text), widget (QLabel, widthLabel)
-#: rc.cpp:21
-msgid "Width:"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:80
-#. i18n: ectx: property (text), widget (QLabel, heightLabel)
-#: rc.cpp:24
-msgid "Height:"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:99
-#. i18n: ectx: property (text), widget (QLabel, paperSourceLabel)
-#: rc.cpp:27
-msgid "Paper source:"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:128
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:30
-msgid "Orientation"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:134
-#. i18n: ectx: property (text), widget (QRadioButton, portrait)
-#: rc.cpp:33
-msgid "Portrait"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:144
-#. i18n: ectx: property (text), widget (QRadioButton, landscape)
-#: rc.cpp:36
-msgid "Landscape"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:151
-#. i18n: ectx: property (text), widget (QRadioButton, reverseLandscape)
-#: rc.cpp:39
-msgid "Reverse landscape"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:158
-#. i18n: ectx: property (text), widget (QRadioButton, reversePortrait)
-#: rc.cpp:42
-msgid "Reverse portrait"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:184
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:45
-msgid "Margins"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:192
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, topMargin)
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:195
-#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, topMargin)
-#: rc.cpp:48 rc.cpp:51
-msgid "top margin"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:223
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, leftMargin)
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:226
-#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, leftMargin)
-#: rc.cpp:54 rc.cpp:57
-msgid "left margin"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:255
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, rightMargin)
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:258
-#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, rightMargin)
-#: rc.cpp:60 rc.cpp:63
-msgid "right margin"
-msgstr ""
-
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:286
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, bottomMargin)
-#. i18n: file: gui/dialogs/qpagesetupwidget.ui:289
-#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, bottomMargin)
-#: rc.cpp:66 rc.cpp:69
-msgid "bottom margin"
-msgstr ""
-
 #. i18n: file: gui/dialogs/qprintwidget.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, printerGroup)
-#: rc.cpp:75
+#: rc.cpp:15
 msgid "Printer"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:28
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:78
+#: rc.cpp:18
 msgid "&Name:"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:54
 #. i18n: ectx: property (text), widget (QPushButton, properties)
-#: rc.cpp:81
+#: rc.cpp:21
 msgid "P&roperties"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:61
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:84
+#: rc.cpp:24
 msgid "Location:"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:71
 #. i18n: ectx: property (text), widget (QCheckBox, preview)
-#: rc.cpp:87
+#: rc.cpp:27
 msgid "Preview"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:78
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:90
+#: rc.cpp:30
 msgid "Type:"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:88
 #. i18n: ectx: property (text), widget (QLabel, lOutput)
-#: rc.cpp:93
+#: rc.cpp:33
 msgid "Output &file:"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintwidget.ui:103
 #. i18n: ectx: property (text), widget (QToolButton, fileBrowser)
-#: rc.cpp:96
+#: rc.cpp:36
 msgid "..."
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:27
 #. i18n: ectx: attribute (title), widget (QWidget, copiesTab)
-#: rc.cpp:102
+#: rc.cpp:42
 msgid "Copies"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:39
 #. i18n: ectx: property (title), widget (QGroupBox, gbPrintRange)
-#: rc.cpp:105 gui/dialogs/qprintdialog_qws.cpp:381
+#: rc.cpp:45 gui/dialogs/qprintdialog_qws.cpp:381
 msgid "Print range"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:51
 #. i18n: ectx: property (text), widget (QRadioButton, printAll)
-#: rc.cpp:108 gui/dialogs/qprintdialog_qws.cpp:379
+#: rc.cpp:48 gui/dialogs/qprintdialog_qws.cpp:379
 msgid "Print all"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:69
 #. i18n: ectx: property (text), widget (QRadioButton, printRange)
-#: rc.cpp:111
+#: rc.cpp:51
 msgid "Pages from"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:89
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:114
+#: rc.cpp:54
 msgid "to"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:124
 #. i18n: ectx: property (text), widget (QRadioButton, printCurrentPage)
-#: rc.cpp:117
+#: rc.cpp:57
 msgid "Current Page"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:131
 #. i18n: ectx: property (text), widget (QRadioButton, printSelection)
-#: rc.cpp:120
+#: rc.cpp:60
 msgid "Selection"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:154
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:123
+#: rc.cpp:63
 msgid "Output Settings"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:160
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:126
+#: rc.cpp:66
 msgid "Copies:"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:193
 #. i18n: ectx: property (text), widget (QCheckBox, collate)
-#: rc.cpp:129
+#: rc.cpp:69
 msgid "Collate"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:210
 #. i18n: ectx: property (text), widget (QCheckBox, reverse)
-#: rc.cpp:132
+#: rc.cpp:72
 msgid "Reverse"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:234
 #. i18n: ectx: attribute (title), widget (QWidget, optionsTab)
-#: rc.cpp:135 gui/kernel/qsoftkeymanager.cpp:73
+#: rc.cpp:75 gui/kernel/qsoftkeymanager.cpp:73
 msgid "Options"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:240
 #. i18n: ectx: property (title), widget (QGroupBox, colorMode)
-#: rc.cpp:138
+#: rc.cpp:78
 msgid "Color Mode"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:259
 #. i18n: ectx: property (text), widget (QRadioButton, color)
-#: rc.cpp:141
+#: rc.cpp:81
 msgid "Color"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:269
 #. i18n: ectx: property (text), widget (QRadioButton, grayscale)
-#: rc.cpp:144
+#: rc.cpp:84
 msgid "Grayscale"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:279
 #. i18n: ectx: property (title), widget (QGroupBox, duplex)
-#: rc.cpp:147
+#: rc.cpp:87
 msgid "Duplex Printing"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:285
 #. i18n: ectx: property (text), widget (QRadioButton, noDuplex)
-#: rc.cpp:150
+#: rc.cpp:90
 msgid "None"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:295
 #. i18n: ectx: property (text), widget (QRadioButton, duplexLong)
-#: rc.cpp:153
+#: rc.cpp:93
 msgid "Long side"
 msgstr ""
 
 #. i18n: file: gui/dialogs/qprintsettingsoutput.ui:302
 #. i18n: ectx: property (text), widget (QRadioButton, duplexShort)
-#: rc.cpp:156
+#: rc.cpp:96
 msgid "Short side"
 msgstr ""
 
-#: qt3support/dialogs/q3wizard.cpp:177
-msgid "&Cancel"
-msgstr "&Diddymu"
-
-#: qt3support/dialogs/q3wizard.cpp:178 gui/dialogs/qwizard.cpp:688
-msgid "< &Back"
-msgstr "< &Yn Ol"
-
-#: qt3support/dialogs/q3wizard.cpp:179 gui/dialogs/qwizard.cpp:694
-msgid "&Next >"
-msgstr "&Nesaf >"
-
-#: qt3support/dialogs/q3wizard.cpp:180 gui/dialogs/qwizard.cpp:698
-msgid "&Finish"
-msgstr "&Gorffen"
-
-#: qt3support/dialogs/q3wizard.cpp:181 gui/dialogs/qwizard.cpp:702
-msgid "&Help"
-msgstr "&Cymorth"
-
-#: qt3support/dialogs/q3tabdialog.cpp:190
-#: qt3support/dialogs/q3tabdialog.cpp:1014
-#: gui/dialogs/qprintdialog_win.cpp:272 gui/dialogs/qmessagebox.cpp:1937
-#: gui/dialogs/qmessagebox.cpp:2383 gui/kernel/qsoftkeymanager.cpp:64
-msgid "OK"
-msgstr "Iawn"
-
-#: qt3support/dialogs/q3tabdialog.cpp:648
-msgid "Apply"
-msgstr "Gweithredu"
-
-#: qt3support/dialogs/q3tabdialog.cpp:691 gui/dialogs/qwizard.cpp:702
-#: gui/widgets/qmdisubwindow.cpp:355
-msgid "Help"
-msgstr "Cymorth"
-
-#: qt3support/dialogs/q3tabdialog.cpp:736
-msgid "Defaults"
-msgstr "Rhagosodion"
-
-#: qt3support/dialogs/q3tabdialog.cpp:786
-#: qt3support/dialogs/q3progressdialog.cpp:224
-#: qt3support/dialogs/q3progressdialog.cpp:285 gui/dialogs/qwizard.cpp:700
-#: gui/dialogs/qprogressdialog.cpp:203 gui/kernel/qsoftkeymanager.cpp:76
-msgid "Cancel"
-msgstr "Diddymu"
-
-#: qt3support/other/q3accel.cpp:481
-#, qt-format
-msgid "%1, %2 not defined"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:42
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:102
+msgid "Paper"
 msgstr ""
 
-#: qt3support/other/q3accel.cpp:517
-#, qt-format
-msgid "Ambiguous %1 not handled"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:48
+#. i18n: ectx: property (text), widget (QLabel, pageSizeLabel)
+#: rc.cpp:105
+msgid "Page size:"
 msgstr ""
 
-#: qt3support/sql/q3datatable.cpp:285 gui/itemviews/qitemeditorfactory.cpp:557
-msgid "True"
-msgstr "Gwir"
-
-#: qt3support/sql/q3datatable.cpp:286 gui/itemviews/qitemeditorfactory.cpp:556
-msgid "False"
-msgstr "Ffug"
-
-#: qt3support/sql/q3datatable.cpp:791
-msgid "Insert"
-msgstr "Rhyngosod"
-
-#: qt3support/sql/q3datatable.cpp:792
-msgid "Update"
-msgstr "Diweddaru"
-
-#: qt3support/sql/q3datatable.cpp:793 gui/widgets/qlineedit.cpp:2158
-#: gui/text/qtextcontrol.cpp:2136
-#: scripttools/debugging/qscriptbreakpointswidget.cpp:304
-msgid "Delete"
-msgstr "Dileu"
-
-#: qt3support/sql/q3sqlmanager_p.cpp:890
-msgctxt "QSql"
-msgid "Delete"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:61
+#. i18n: ectx: property (text), widget (QLabel, widthLabel)
+#: rc.cpp:108
+msgid "Width:"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:891
-msgctxt "QSql"
-msgid "Delete this record?"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:80
+#. i18n: ectx: property (text), widget (QLabel, heightLabel)
+#: rc.cpp:111
+msgid "Height:"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:892 qt3support/sql/q3sqlmanager_p.cpp:908
-#: qt3support/sql/q3sqlmanager_p.cpp:944
-msgctxt "QSql"
-msgid "Yes"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:99
+#. i18n: ectx: property (text), widget (QLabel, paperSourceLabel)
+#: rc.cpp:114
+msgid "Paper source:"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:893 qt3support/sql/q3sqlmanager_p.cpp:909
-#: qt3support/sql/q3sqlmanager_p.cpp:945
-msgctxt "QSql"
-msgid "No"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:128
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:117
+msgid "Orientation"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:901
-msgctxt "QSql"
-msgid "Insert"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:134
+#. i18n: ectx: property (text), widget (QRadioButton, portrait)
+#: rc.cpp:120
+msgid "Portrait"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:903
-msgctxt "QSql"
-msgid "Update"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:144
+#. i18n: ectx: property (text), widget (QRadioButton, landscape)
+#: rc.cpp:123
+msgid "Landscape"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:907
-msgctxt "QSql"
-msgid "Save edits?"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:151
+#. i18n: ectx: property (text), widget (QRadioButton, reverseLandscape)
+#: rc.cpp:126
+msgid "Reverse landscape"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:910
-msgctxt "QSql"
-msgid "Cancel"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:158
+#. i18n: ectx: property (text), widget (QRadioButton, reversePortrait)
+#: rc.cpp:129
+msgid "Reverse portrait"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:942
-msgctxt "QSql"
-msgid "Confirm"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:184
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:132
+msgid "Margins"
 msgstr ""
 
-#: qt3support/sql/q3sqlmanager_p.cpp:943
-msgctxt "QSql"
-msgid "Cancel your edits?"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:192
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, topMargin)
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:195
+#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, topMargin)
+#: rc.cpp:135 rc.cpp:138
+msgid "top margin"
 msgstr ""
 
-#: qt3support/network/q3networkprotocol.cpp:854
-msgid "Operation stopped by the user"
-msgstr "Terfynwyd y gweithrediad gan y defnyddiwr"
-
-#: qt3support/widgets/q3toolbar.cpp:692
-msgid "More..."
-msgstr "Mwy..."
-
-#: qt3support/widgets/q3mainwindow.cpp:2051
-#: plugins/accessible/widgets/rangecontrols.cpp:551
-msgid "Line up"
-msgstr "Alinio"
-
-#: qt3support/widgets/q3mainwindow.cpp:2053
-msgid "Customize..."
-msgstr "Addasu..."
-
-#: qt3support/text/q3textedit.cpp:5429 gui/widgets/qlineedit.cpp:2126
-#: gui/text/qtextcontrol.cpp:2109
-msgid "&Undo"
-msgstr "&Dad-wneud"
-
-#: qt3support/text/q3textedit.cpp:5430 gui/widgets/qlineedit.cpp:2130
-#: gui/text/qtextcontrol.cpp:2111
-msgid "&Redo"
-msgstr "&Ail-wneud"
-
-#: qt3support/text/q3textedit.cpp:5435 gui/widgets/qlineedit.cpp:2139
-#: gui/text/qtextcontrol.cpp:2115
-msgid "Cu&t"
-msgstr "T&orri"
-
-#: qt3support/text/q3textedit.cpp:5436 gui/widgets/qlineedit.cpp:2145
-#: gui/text/qtextcontrol.cpp:2120
-msgid "&Copy"
-msgstr "&Copio"
-
-#: qt3support/text/q3textedit.cpp:5438 gui/widgets/qlineedit.cpp:2151
-#: gui/text/qtextcontrol.cpp:2133
-msgid "&Paste"
-msgstr "&Gludo"
-
-#: qt3support/text/q3textedit.cpp:5441
-msgid "Clear"
-msgstr "Clirio"
-
-#: qt3support/text/q3textedit.cpp:5445 qt3support/text/q3textedit.cpp:5447
-#: gui/widgets/qlineedit.cpp:2166 gui/text/qtextcontrol.cpp:2143
-msgid "Select All"
-msgstr "Dewis Popeth"
-
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2114
-#, qt-format
-msgid "JavaScript Alert - %1"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:223
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, leftMargin)
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:226
+#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, leftMargin)
+#: rc.cpp:141 rc.cpp:144
+msgid "left margin"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2131
-#, qt-format
-msgid "JavaScript Confirm - %1"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:255
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, rightMargin)
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:258
+#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, rightMargin)
+#: rc.cpp:147 rc.cpp:150
+msgid "right margin"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2151
-#, qt-format
-msgid "JavaScript Prompt - %1"
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:286
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, bottomMargin)
+#. i18n: file: gui/dialogs/qpagesetupwidget.ui:289
+#. i18n: ectx: property (accessibleName), widget (QDoubleSpinBox, bottomMargin)
+#: rc.cpp:153 rc.cpp:156
+msgid "bottom margin"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2177
-#, qt-format
-msgid "JavaScript Problem - %1"
+#: corelib/tools/qregexp.cpp:65
+msgctxt "QRegExp"
+msgid "no error occurred"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2177
-msgid ""
-"The script on this page appears to have a problem. Do you want to stop the "
-"script?"
+#: corelib/tools/qregexp.cpp:66
+msgctxt "QRegExp"
+msgid "disabled feature used"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2826
-msgid "Move the cursor to the next character"
+#: corelib/tools/qregexp.cpp:67
+msgctxt "QRegExp"
+msgid "bad char class syntax"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2829
-msgid "Move the cursor to the previous character"
+#: corelib/tools/qregexp.cpp:68
+msgctxt "QRegExp"
+msgid "bad lookahead syntax"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2832
-msgid "Move the cursor to the next word"
+#: corelib/tools/qregexp.cpp:69
+msgctxt "QRegExp"
+msgid "lookbehinds not supported, see QTBUG-2371"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2835
-msgid "Move the cursor to the previous word"
+#: corelib/tools/qregexp.cpp:70
+msgctxt "QRegExp"
+msgid "bad repetition syntax"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2838
-msgid "Move the cursor to the next line"
+#: corelib/tools/qregexp.cpp:71
+msgctxt "QRegExp"
+msgid "invalid octal value"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2841
-msgid "Move the cursor to the previous line"
+#: corelib/tools/qregexp.cpp:72
+msgctxt "QRegExp"
+msgid "missing left delim"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2844
-msgid "Move the cursor to the start of the line"
+#: corelib/tools/qregexp.cpp:73
+msgctxt "QRegExp"
+msgid "unexpected end"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2847
-msgid "Move the cursor to the end of the line"
+#: corelib/tools/qregexp.cpp:74
+msgctxt "QRegExp"
+msgid "met internal limit"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2850
-msgid "Move the cursor to the start of the block"
+#: corelib/tools/qregexp.cpp:75
+msgctxt "QRegExp"
+msgid "invalid interval"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2853
-msgid "Move the cursor to the end of the block"
+#: corelib/tools/qregexp.cpp:76
+msgctxt "QRegExp"
+msgid "invalid category"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2856
-msgid "Move the cursor to the start of the document"
+#: corelib/global/qglobal.cpp:2106 corelib/kernel/qsystemerror.cpp:112
+msgctxt "QIODevice"
+msgid "Permission denied"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2859
-msgid "Move the cursor to the end of the document"
+#: corelib/global/qglobal.cpp:2109 corelib/kernel/qsystemerror.cpp:115
+msgctxt "QIODevice"
+msgid "Too many open files"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2862
-msgid "Select to the next character"
+#: corelib/global/qglobal.cpp:2112 corelib/kernel/qsystemerror.cpp:118
+msgctxt "QIODevice"
+msgid "No such file or directory"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2865
-msgid "Select to the previous character"
+#: corelib/global/qglobal.cpp:2115 corelib/kernel/qsystemerror.cpp:121
+msgctxt "QIODevice"
+msgid "No space left on device"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2868
-msgid "Select to the next word"
+#: corelib/plugin/qelfparser_p.cpp:77
+#, qt-format
+msgid "'%1' is not an ELF object (%2)"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2871
-msgid "Select to the previous word"
+#: corelib/plugin/qelfparser_p.cpp:83
+#, qt-format
+msgid "'%1' is not an ELF object"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2874
-msgid "Select to the next line"
+#: corelib/plugin/qelfparser_p.cpp:89 corelib/plugin/qelfparser_p.cpp:99
+#: corelib/plugin/qelfparser_p.cpp:105 corelib/plugin/qelfparser_p.cpp:125
+#: corelib/plugin/qelfparser_p.cpp:137 corelib/plugin/qelfparser_p.cpp:148
+#: corelib/plugin/qelfparser_p.cpp:163 corelib/plugin/qelfparser_p.cpp:174
+#: corelib/plugin/qelfparser_p.cpp:196 corelib/plugin/qelfparser_p.cpp:210
+#: corelib/plugin/qelfparser_p.cpp:223
+#, qt-format
+msgid "'%1' is an invalid ELF object (%2)"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2877
-msgid "Select to the previous line"
+#: corelib/plugin/qlibrary.cpp:402
+#, qt-format
+msgid "Plugin verification data mismatch in '%1'"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2880
-msgid "Select to the start of the line"
+#: corelib/plugin/qlibrary.cpp:679 corelib/plugin/qlibrary.cpp:825
+#: corelib/plugin/qpluginloader.cpp:343
+msgid "The shared library was not found."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2883
-msgid "Select to the end of the line"
+#: corelib/plugin/qlibrary.cpp:827
+#, qt-format
+msgid "The file '%1' is not a valid Qt plugin."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2886
-msgid "Select to the start of the block"
+#: corelib/plugin/qlibrary.cpp:842
+#, qt-format
+msgid "The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2889
-msgid "Select to the end of the block"
+#: corelib/plugin/qlibrary.cpp:868
+#, qt-format
+msgid ""
+"The plugin '%1' uses incompatible Qt library. Expected build key \"%2\", got "
+"\"%3\""
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2892
-msgid "Select to the start of the document"
+#: corelib/plugin/qlibrary.cpp:876
+#, qt-format
+msgid ""
+"The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release "
+"libraries.)"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2895
-msgid "Select to the end of the document"
+#: corelib/plugin/qlibrary.cpp:1233 corelib/plugin/qpluginloader.cpp:367
+#: corelib/statemachine/qstatemachine.cpp:1046 corelib/io/qiodevice.cpp:1630
+#: network/ssl/qsslerror.cpp:289 network/kernel/qhostinfo_unix.cpp:300
+#: network/socket/qsymbiansocketengine.cpp:1435
+#: network/socket/qnativesocketengine.cpp:276
+msgid "Unknown error"
+msgstr "Gwall anhysbys"
+
+#: corelib/plugin/qlibrary_win.cpp:87 corelib/plugin/qlibrary_unix.cpp:244
+#, qt-format
+msgid "Cannot load library %1: %2"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2898
-msgid "Delete to the start of the word"
+#: corelib/plugin/qlibrary_win.cpp:109 corelib/plugin/qlibrary_unix.cpp:261
+#, qt-format
+msgid "Cannot unload library %1: %2"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2901
-msgid "Delete to the end of the word"
+#: corelib/plugin/qlibrary_win.cpp:124 corelib/plugin/qlibrary_unix.cpp:295
+#, qt-format
+msgid "Cannot resolve symbol \"%1\" in %2: %3"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2934
-msgid "Insert a new paragraph"
+#: corelib/plugin/qpluginloader.cpp:254
+msgid "The plugin was not loaded."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2937
-msgid "Insert a new line"
+#: corelib/xml/qxmlstream.cpp:611
+msgid "Extra content at end of document."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2941
-msgid "Paste and Match Style"
+#: corelib/xml/qxmlstream.cpp:887
+msgid "Invalid entity value."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2944
-msgid "Remove formatting"
+#: corelib/xml/qxmlstream.cpp:996
+msgid "Invalid XML character."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2948
-msgid "Strikethrough"
+#: corelib/xml/qxmlstream.cpp:1255
+msgid "Sequence ']]>' not allowed in content."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2952
-msgid "Subscript"
+#: corelib/xml/qxmlstream.cpp:1534
+msgid "Encountered incorrectly encoded content."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2956
-msgid "Superscript"
+#: corelib/xml/qxmlstream.cpp:1564
+#, qt-format
+msgid "Namespace prefix '%1' not declared"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2960
-msgid "Insert Bulleted List"
+#: corelib/xml/qxmlstream.cpp:1597 corelib/xml/qxmlstream.cpp:1609
+msgid "Illegal namespace declaration."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2964
-msgid "Insert Numbered List"
+#: corelib/xml/qxmlstream.cpp:1642
+msgid "Attribute redefined."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2968
-msgid "Indent"
+#: corelib/xml/qxmlstream.cpp:1757
+#, qt-format
+msgid "Unexpected character '%1' in public id literal."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2971
-msgid "Outdent"
+#: corelib/xml/qxmlstream.cpp:1785
+msgid "Invalid XML version string."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2974
-msgid "Center"
+#: corelib/xml/qxmlstream.cpp:1787
+msgid "Unsupported XML version."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2977
-msgid "Justify"
+#: corelib/xml/qxmlstream.cpp:1808
+msgid "The standalone pseudo attribute must appear after the encoding."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2980
-msgid "Align Left"
+#: corelib/xml/qxmlstream.cpp:1810
+#, qt-format
+msgid "%1 is an invalid encoding name."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2983
-msgid "Align Right"
+#: corelib/xml/qxmlstream.cpp:1817
+#, qt-format
+msgid "Encoding %1 is unsupported"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:372
-#, qt-format
-msgctxt "QWebPage"
-msgid "Web Inspector - %2"
+#: corelib/xml/qxmlstream.cpp:1833
+msgid "Standalone accepts only yes or no."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:152
-msgctxt ""
-"Submit (input element) alt text for <input> elements with no alt, title, or "
-"value"
-msgid "Submit"
+#: corelib/xml/qxmlstream.cpp:1835
+msgid "Invalid attribute in XML declaration."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:157
-msgctxt "default label for Reset buttons in forms on web pages"
-msgid "Reset"
+#: corelib/xml/qxmlstream.cpp:1851
+msgid "Premature end of document."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:162
-msgctxt ""
-"text that appears at the start of nearly-obsolete web pages in the form of a "
-"'searchable index'"
-msgid "This is a searchable index. Enter search keywords: "
+#: corelib/xml/qxmlstream.cpp:1853
+msgid "Invalid document."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:167
-msgctxt "default label for Submit buttons in forms on web pages"
-msgid "Submit"
+#: corelib/xml/qxmlstream.cpp:1893
+msgid "Expected "
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:172
-msgctxt "title for file button used in HTML forms"
-msgid "Choose File"
+#: corelib/xml/qxmlstream.cpp:1904
+msgid ", but got '"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:177
-msgctxt ""
-"text to display in file button used in HTML forms when no file is selected"
-msgid "No file selected"
+#: corelib/xml/qxmlstream.cpp:1908
+msgid "Unexpected '"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:182
-msgctxt "text to display in <details> tag when it has no <summary> child"
-msgid "Details"
+#: corelib/xml/qxmlstream.cpp:2133
+msgid "Expected character data."
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:187
-msgctxt "Open in New Window context menu item"
-msgid "Open in New Window"
+#: corelib/statemachine/qstatemachine.cpp:1028
+#, qt-format
+msgid "Missing initial state in compound state '%1'"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:192
-msgctxt "Download Linked File context menu item"
-msgid "Save Link..."
+#: corelib/statemachine/qstatemachine.cpp:1035
+#, qt-format
+msgid "Missing default state in history state '%1'"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:197
-msgctxt "Copy Link context menu item"
-msgid "Copy Link"
+#: corelib/statemachine/qstatemachine.cpp:1042
+#, qt-format
+msgid ""
+"No common ancestor for targets and source of transition from state '%1'"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:202
-msgctxt "Open Image in New Window context menu item"
-msgid "Open Image"
+#: corelib/io/qprocess_unix.cpp:402 corelib/io/qprocess_win.cpp:138
+msgid "Could not open input redirection for reading"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:207
-msgctxt "Download Image context menu item"
-msgid "Save Image"
+#: corelib/io/qprocess_unix.cpp:414 corelib/io/qprocess_win.cpp:158
+msgid "Could not open output redirection for writing"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:212
-msgctxt "Copy Link context menu item"
-msgid "Copy Image"
+#: corelib/io/qprocess_unix.cpp:694
+#, qt-format
+msgid "Resource error (fork failure): %1"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:217
-msgctxt "Copy Image Address menu item"
-msgid "Copy Image Address"
+#: corelib/io/qprocess_unix.cpp:1041 corelib/io/qprocess_unix.cpp:1093
+#: corelib/io/qprocess_unix.cpp:1167 corelib/io/qprocess_unix.cpp:1233
+#: corelib/io/qprocess_win.cpp:591 corelib/io/qprocess_win.cpp:641
+#: corelib/io/qprocess_win.cpp:716 corelib/io/qprocess_win.cpp:758
+#: corelib/io/qprocess_win.cpp:812
+msgid "Process operation timed out"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:222
-msgctxt "Open Video in New Window"
-msgid "Open Video"
+#: corelib/io/qfile.cpp:736 corelib/io/qfile.cpp:890
+msgid "Destination file exists"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:227
-msgctxt "Open Audio in New Window"
-msgid "Open Audio"
+#: corelib/io/qfile.cpp:751
+msgid "Will not rename sequential file using block copy"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:232
-msgctxt "Copy Video Link Location"
-msgid "Copy Video"
+#: corelib/io/qfile.cpp:774
+msgid "Cannot remove source file"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:237
-msgctxt "Copy Audio Link Location"
-msgid "Copy Audio"
+#: corelib/io/qfile.cpp:903
+#, qt-format
+msgid "Cannot open %1 for input"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:242
-msgctxt "Toggle Media Controls"
-msgid "Toggle Controls"
+#: corelib/io/qfile.cpp:921
+msgid "Cannot open for output"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:247
-msgctxt "Toggle Media Loop Playback"
-msgid "Toggle Loop"
+#: corelib/io/qfile.cpp:932
+msgid "Failure to write block"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:252
-msgctxt "Switch Video to Fullscreen"
-msgid "Enter Fullscreen"
+#: corelib/io/qfile.cpp:946
+#, qt-format
+msgid "Cannot create %1 for output"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:257
-msgctxt "Play"
-msgid "Play"
+#: corelib/io/qfile.cpp:1416
+msgid "No file engine available or engine does not support UnMapExtension"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:262
-msgctxt "Pause"
-msgid "Pause"
+#: corelib/io/qprocess_win.cpp:431
+#, qt-format
+msgid "Process failed to start: %1"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:267
-msgctxt "Mute"
-msgid "Mute"
+#: corelib/io/qprocess_win.cpp:601 corelib/io/qprocess_win.cpp:651
+#: corelib/io/qprocess.cpp:884 corelib/io/qprocess.cpp:936
+msgid "Error reading from process"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:272
-msgctxt "Open Frame in New Window context menu item"
-msgid "Open Frame"
+#: corelib/io/qprocess_win.cpp:791 corelib/io/qprocess.cpp:983
+#: corelib/io/qprocess.cpp:1852
+msgid "Error writing to process"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:277
-msgctxt "Copy context menu item"
-msgid "Copy"
+#: corelib/io/qprocess.cpp:1052
+msgid "Process crashed"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:282
-msgctxt "Back context menu item"
-msgid "Go Back"
+#: corelib/io/qprocess.cpp:2054
+msgid "No program defined"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:287
-msgctxt "Forward context menu item"
-msgid "Go Forward"
+#: corelib/kernel/qsharedmemory_unix.cpp:91
+#: corelib/kernel/qsharedmemory_symbian.cpp:86
+#: corelib/kernel/qsharedmemory_win.cpp:93
+#, qt-format
+msgid "%1: permission denied"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:292
-msgctxt "Stop context menu item"
-msgid "Stop"
+#: corelib/kernel/qsharedmemory_unix.cpp:95
+#: corelib/kernel/qsharedmemory_symbian.cpp:70
+#: corelib/kernel/qsharedmemory_win.cpp:71
+#, qt-format
+msgid "%1: already exists"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:297
-msgctxt "Reload context menu item"
-msgid "Reload"
+#: corelib/kernel/qsharedmemory_unix.cpp:99
+#: corelib/kernel/qsharedmemory_win.cpp:80
+#, qt-format
+msgid "%1: doesn't exist"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:302
-msgctxt "Cut context menu item"
-msgid "Cut"
+#: corelib/kernel/qsharedmemory_unix.cpp:107
+#: corelib/kernel/qsharedmemory_symbian.cpp:82
+#: corelib/kernel/qsharedmemory_win.cpp:89
+#, qt-format
+msgid "%1: out of resources"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:307
-msgctxt "Paste context menu item"
-msgid "Paste"
+#: corelib/kernel/qsharedmemory_unix.cpp:111
+#: corelib/kernel/qsharedmemory_symbian.cpp:78
+#: corelib/kernel/qsharedmemory_win.cpp:84
+#, qt-format
+msgid "%1: invalid size"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:312
-msgctxt "Select All context menu item"
-msgid "Select All"
+#: corelib/kernel/qsharedmemory_unix.cpp:115
+#: corelib/kernel/qsharedmemory_symbian.cpp:89
+#: corelib/kernel/qsharedmemory_win.cpp:96
+#, qt-format
+msgid "%1: unknown error %2"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:317
-msgctxt "No Guesses Found context menu item"
-msgid "No Guesses Found"
+#: corelib/kernel/qsharedmemory_unix.cpp:138
+#: corelib/kernel/qsharedmemory_unix.cpp:164
+#: corelib/kernel/qsharedmemory_symbian.cpp:103
+#: corelib/kernel/qsharedmemory_win.cpp:111
+#: corelib/kernel/qsharedmemory_win.cpp:139
+#, qt-format
+msgid "%1: key is empty"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:322
-msgctxt "Ignore Spelling context menu item"
-msgid "Ignore"
+#: corelib/kernel/qsharedmemory_unix.cpp:145
+#, qt-format
+msgid "%1: UNIX key file doesn't exist"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:327
-msgctxt "Learn Spelling context menu item"
-msgid "Add To Dictionary"
+#: corelib/kernel/qsharedmemory_unix.cpp:152
+#, qt-format
+msgid "%1: ftok failed"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:332
-msgctxt "Search The Web context menu item"
-msgid "Search The Web"
+#: corelib/kernel/qsharedmemory_unix.cpp:227
+#, qt-format
+msgid "%1: unable to make key"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:337
-msgctxt "Look Up in Dictionary context menu item"
-msgid "Look Up In Dictionary"
+#: corelib/kernel/qsharedmemory_unix.cpp:245
+#, qt-format
+msgid "%1: system-imposed size restrictions"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:342
-msgctxt "Open Link context menu item"
-msgid "Open Link"
+#: corelib/kernel/qsharedmemory_unix.cpp:268
+#: corelib/kernel/qsharedmemory_unix.cpp:330
+#, qt-format
+msgid "%1: bad name"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:347
-msgctxt "Ignore Grammar context menu item"
-msgid "Ignore"
+#: corelib/kernel/qsharedmemory_unix.cpp:372
+#, qt-format
+msgid "%1: not attached"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:352
-msgctxt "Spelling and Grammar context sub-menu item"
-msgid "Spelling"
+#: corelib/kernel/qsharedmemory_symbian.cpp:74
+#, qt-format
+msgid "%1: doesn't exists"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:357
-msgctxt "menu item title"
-msgid "Show Spelling and Grammar"
+#: corelib/kernel/qsharedmemory.cpp:268
+#, qt-format
+msgid "%1: unable to set key on lock"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:358
-msgctxt "menu item title"
-msgid "Hide Spelling and Grammar"
+#: corelib/kernel/qsharedmemory.cpp:352
+#, qt-format
+msgid "%1: create size is less then 0"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:363
-msgctxt "Check spelling context menu item"
-msgid "Check Spelling"
+#: corelib/kernel/qsharedmemory.cpp:528
+#, qt-format
+msgid "%1: unable to lock"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:368
-msgctxt "Check spelling while typing context menu item"
-msgid "Check Spelling While Typing"
+#: corelib/kernel/qsharedmemory.cpp:550
+#, qt-format
+msgid "%1: unable to unlock"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:373
-msgctxt "Check grammar with spelling context menu item"
-msgid "Check Grammar With Spelling"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:87
+#: corelib/kernel/qsystemsemaphore_symbian.cpp:81
+#: corelib/kernel/qsystemsemaphore_win.cpp:72
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: permission denied"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:378
-msgctxt "Font context sub-menu item"
-msgid "Fonts"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:91
+#: corelib/kernel/qsystemsemaphore_symbian.cpp:68
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: already exists"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:383
-msgctxt "Bold context menu item"
-msgid "Bold"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:95
+#: corelib/kernel/qsystemsemaphore_symbian.cpp:72
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: does not exist"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:388
-msgctxt "Italic context menu item"
-msgid "Italic"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:104
+#: corelib/kernel/qsystemsemaphore_symbian.cpp:77
+#: corelib/kernel/qsystemsemaphore_win.cpp:68
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: out of resources"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:393
-msgctxt "Underline context menu item"
-msgid "Underline"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:108
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: name error"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:398
-msgctxt "Outline context menu item"
-msgid "Outline"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:112
+#: corelib/kernel/qsystemsemaphore_symbian.cpp:85
+#: corelib/kernel/qsystemsemaphore_win.cpp:75
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: unknown error %2"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:403
-msgctxt "Writing direction context sub-menu item"
-msgid "Direction"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:133
+#: corelib/kernel/qsystemsemaphore_unix.cpp:195
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: key is empty"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:408
-msgctxt "Text direction context sub-menu item"
-msgid "Text Direction"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:141
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: unable to make key"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:413
-msgctxt "Default writing direction context menu item"
-msgid "Default"
+#: corelib/kernel/qsystemsemaphore_unix.cpp:150
+#, qt-format
+msgctxt "QSystemSemaphore"
+msgid "%1: ftok failed"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:418
-msgctxt "Left to Right context menu item"
-msgid "Left to Right"
+#: corelib/kernel/qsharedmemory_win.cpp:168
+#, qt-format
+msgid "%1: size query failed"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:423
-msgctxt "Right to Left context menu item"
-msgid "Right to Left"
+#: gui/painting/qprinterinfo_unix.cpp:135
+msgid "locally connected"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:428
-msgctxt "Inspect Element context menu item"
-msgid "Inspect"
+#: gui/painting/qprinterinfo_unix.cpp:158
+#: gui/painting/qprinterinfo_unix.cpp:383
+#, qt-format
+msgid "Aliases: %1"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:433
-msgctxt ""
-"Label for only item in menu that appears when clicking on the search field "
-"image, when no searches have been performed"
-msgid "No recent searches"
+#: gui/painting/qprinterinfo_unix.cpp:608
+#: gui/painting/qprinterinfo_unix.cpp:807
+msgid "unknown"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:438
-msgctxt ""
-"label for first item in the menu that appears when clicking on the search "
-"field image, used as embedded menu title"
-msgid "Recent searches"
+#: gui/accessible/qaccessibleobject.cpp:374
+#: plugins/accessible/widgets/complexwidgets.cpp:1617
+msgid "Activate"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:443
-msgctxt "menu item in Recent Searches menu that empties menu's contents"
-msgid "Clear recent searches"
+#: gui/accessible/qaccessibleobject.cpp:376
+msgid "Activates the program's main window"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:538
-msgctxt "Label text to be used when a plug-in is missing"
-msgid "Missing Plug-in"
+#: gui/util/qundoview.cpp:101
+msgid "<empty>"
+msgstr "<gwag>"
+
+#: gui/util/qundostack.cpp:877 gui/util/qundogroup.cpp:388
+#, qt-format
+msgid "Undo %1"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:555
-msgctxt "Unknown filesize FTP directory listing item"
-msgid "Unknown"
+#: gui/util/qundostack.cpp:877 gui/util/qundogroup.cpp:388
+msgctxt "Default text for undo action"
+msgid "Undo"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:560
+#: gui/util/qundostack.cpp:907 gui/util/qundogroup.cpp:419
 #, qt-format
-msgctxt "Title string for images"
-msgid "%1 (%2x%3 pixels)"
+msgid "Redo %1"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:565
-msgctxt "Media controller status message when the media is loading"
-msgid "Loading..."
+#: gui/util/qundostack.cpp:907 gui/util/qundogroup.cpp:419
+msgctxt "Default text for redo action"
+msgid "Redo"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:570
-msgctxt "Media controller status message when watching a live broadcast"
-msgid "Live Broadcast"
+#: gui/util/qdesktopservices_mac.cpp:171
+msgid "Home"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:578
-msgctxt "Media controller element"
-msgid "Audio Element"
+#: gui/text/qfontdatabase.cpp:108 gui/text/qfontdatabase.cpp:1526
+msgctxt "QFontDatabase"
+msgid "Normal"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:580
-msgctxt "Media controller element"
-msgid "Video Element"
+#: gui/text/qfontdatabase.cpp:111 gui/text/qfontdatabase.cpp:123
+#: gui/text/qfontdatabase.cpp:1514
+msgctxt "QFontDatabase"
+msgid "Bold"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:582
-msgctxt "Media controller element"
-msgid "Mute Button"
+#: gui/text/qfontdatabase.cpp:114 gui/text/qfontdatabase.cpp:1516
+msgctxt "QFontDatabase"
+msgid "Demi Bold"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:584
-msgctxt "Media controller element"
-msgid "Unmute Button"
+#: gui/text/qfontdatabase.cpp:117 gui/text/qfontdatabase.cpp:135
+#: gui/text/qfontdatabase.cpp:1512
+msgctxt "QFontDatabase"
+msgid "Black"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:586
-msgctxt "Media controller element"
-msgid "Play Button"
+#: gui/text/qfontdatabase.cpp:125
+msgctxt "QFontDatabase"
+msgid "Demi"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:588
-msgctxt "Media controller element"
-msgid "Pause Button"
+#: gui/text/qfontdatabase.cpp:131 gui/text/qfontdatabase.cpp:1518
+msgctxt "QFontDatabase"
+msgid "Light"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:590
-msgctxt "Media controller element"
-msgid "Slider"
+#: gui/text/qfontdatabase.cpp:301 gui/text/qfontdatabase.cpp:1521
+msgctxt "QFontDatabase"
+msgid "Italic"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:592
-msgctxt "Media controller element"
-msgid "Slider Thumb"
+#: gui/text/qfontdatabase.cpp:304 gui/text/qfontdatabase.cpp:1523
+msgctxt "QFontDatabase"
+msgid "Oblique"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:594
-msgctxt "Media controller element"
-msgid "Rewind Button"
+#: gui/text/qfontdatabase.cpp:2252
+msgctxt "QFontDatabase"
+msgid "Any"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:596
-msgctxt "Media controller element"
-msgid "Return to Real-time Button"
+#: gui/text/qfontdatabase.cpp:2255
+msgctxt "QFontDatabase"
+msgid "Latin"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:598
-msgctxt "Media controller element"
-msgid "Elapsed Time"
+#: gui/text/qfontdatabase.cpp:2258
+msgctxt "QFontDatabase"
+msgid "Greek"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:600
-msgctxt "Media controller element"
-msgid "Remaining Time"
+#: gui/text/qfontdatabase.cpp:2261
+msgctxt "QFontDatabase"
+msgid "Cyrillic"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:602
-msgctxt "Media controller element"
-msgid "Status Display"
+#: gui/text/qfontdatabase.cpp:2264
+msgctxt "QFontDatabase"
+msgid "Armenian"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:604
-msgctxt "Media controller element"
-msgid "Fullscreen Button"
+#: gui/text/qfontdatabase.cpp:2267
+msgctxt "QFontDatabase"
+msgid "Hebrew"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:606
-msgctxt "Media controller element"
-msgid "Seek Forward Button"
+#: gui/text/qfontdatabase.cpp:2270
+msgctxt "QFontDatabase"
+msgid "Arabic"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:608
-msgctxt "Media controller element"
-msgid "Seek Back Button"
+#: gui/text/qfontdatabase.cpp:2273
+msgctxt "QFontDatabase"
+msgid "Syriac"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:616
-msgctxt "Media controller element"
-msgid "Audio element playback controls and status display"
+#: gui/text/qfontdatabase.cpp:2276
+msgctxt "QFontDatabase"
+msgid "Thaana"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:618
-msgctxt "Media controller element"
-msgid "Video element playback controls and status display"
+#: gui/text/qfontdatabase.cpp:2279
+msgctxt "QFontDatabase"
+msgid "Devanagari"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:620
-msgctxt "Media controller element"
-msgid "Mute audio tracks"
+#: gui/text/qfontdatabase.cpp:2282
+msgctxt "QFontDatabase"
+msgid "Bengali"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:622
-msgctxt "Media controller element"
-msgid "Unmute audio tracks"
+#: gui/text/qfontdatabase.cpp:2285
+msgctxt "QFontDatabase"
+msgid "Gurmukhi"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:624
-msgctxt "Media controller element"
-msgid "Begin playback"
+#: gui/text/qfontdatabase.cpp:2288
+msgctxt "QFontDatabase"
+msgid "Gujarati"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:626
-msgctxt "Media controller element"
-msgid "Pause playback"
+#: gui/text/qfontdatabase.cpp:2291
+msgctxt "QFontDatabase"
+msgid "Oriya"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:628
-msgctxt "Media controller element"
-msgid "Movie time scrubber"
+#: gui/text/qfontdatabase.cpp:2294
+msgctxt "QFontDatabase"
+msgid "Tamil"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:630
-msgctxt "Media controller element"
-msgid "Movie time scrubber thumb"
+#: gui/text/qfontdatabase.cpp:2297
+msgctxt "QFontDatabase"
+msgid "Telugu"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:632
-msgctxt "Media controller element"
-msgid "Rewind movie"
+#: gui/text/qfontdatabase.cpp:2300
+msgctxt "QFontDatabase"
+msgid "Kannada"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:634
-msgctxt "Media controller element"
-msgid "Return streaming movie to real-time"
+#: gui/text/qfontdatabase.cpp:2303
+msgctxt "QFontDatabase"
+msgid "Malayalam"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:636
-msgctxt "Media controller element"
-msgid "Current movie time"
+#: gui/text/qfontdatabase.cpp:2306
+msgctxt "QFontDatabase"
+msgid "Sinhala"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:638
-msgctxt "Media controller element"
-msgid "Remaining movie time"
+#: gui/text/qfontdatabase.cpp:2309
+msgctxt "QFontDatabase"
+msgid "Thai"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:640
-msgctxt "Media controller element"
-msgid "Current movie status"
+#: gui/text/qfontdatabase.cpp:2312
+msgctxt "QFontDatabase"
+msgid "Lao"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:642
-msgctxt "Media controller element"
-msgid "Play movie in full-screen mode"
+#: gui/text/qfontdatabase.cpp:2315
+msgctxt "QFontDatabase"
+msgid "Tibetan"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:644
-msgctxt "Media controller element"
-msgid "Seek quickly back"
+#: gui/text/qfontdatabase.cpp:2318
+msgctxt "QFontDatabase"
+msgid "Myanmar"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:646
-msgctxt "Media controller element"
-msgid "Seek quickly forward"
+#: gui/text/qfontdatabase.cpp:2321
+msgctxt "QFontDatabase"
+msgid "Georgian"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:655
-msgctxt "Media time description"
-msgid "Indefinite time"
+#: gui/text/qfontdatabase.cpp:2324
+msgctxt "QFontDatabase"
+msgid "Khmer"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:664
-#, qt-format
-msgctxt "Media time description"
-msgid "%1 days %2 hours %3 minutes %4 seconds"
+#: gui/text/qfontdatabase.cpp:2327
+msgctxt "QFontDatabase"
+msgid "Simplified Chinese"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:667
-#, qt-format
-msgctxt "Media time description"
-msgid "%1 hours %2 minutes %3 seconds"
+#: gui/text/qfontdatabase.cpp:2330
+msgctxt "QFontDatabase"
+msgid "Traditional Chinese"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:670
-#, qt-format
-msgctxt "Media time description"
-msgid "%1 minutes %2 seconds"
+#: gui/text/qfontdatabase.cpp:2333
+msgctxt "QFontDatabase"
+msgid "Japanese"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:672
-#, qt-format
-msgctxt "Media time description"
-msgid "%1 seconds"
+#: gui/text/qfontdatabase.cpp:2336
+msgctxt "QFontDatabase"
+msgid "Korean"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp:129
-msgid "weba_ti_texlist_single"
+#: gui/text/qfontdatabase.cpp:2339
+msgctxt "QFontDatabase"
+msgid "Vietnamese"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp:176
-msgid "weba_ti_textlist_multi"
+#: gui/text/qfontdatabase.cpp:2342
+msgctxt "QFontDatabase"
+msgid "Symbol"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp:202
-msgid "wdgt_bd_done"
+#: gui/text/qfontdatabase.cpp:2345
+msgctxt "QFontDatabase"
+msgid "Ogham"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2321
-msgid "Fake error!"
+#: gui/text/qfontdatabase.cpp:2348
+msgctxt "QFontDatabase"
+msgid "Runic"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2326
-#: 3rdparty/phonon/mmf/utils.cpp:134
-msgid "Invalid URL"
+#: gui/text/qfontdatabase.cpp:2351
+msgctxt "QFontDatabase"
+msgid "N'Ko"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:59
-msgctxt "QWebPage"
-msgid "Scroll here"
-msgstr ""
+#: gui/text/qtextcontrol.cpp:2120 gui/widgets/qlineedit.cpp:2126
+#: qt3support/text/q3textedit.cpp:5429
+msgid "&Undo"
+msgstr "&Dad-wneud"
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:62
-msgctxt "QWebPage"
-msgid "Left edge"
+#: gui/text/qtextcontrol.cpp:2122 gui/widgets/qlineedit.cpp:2130
+#: qt3support/text/q3textedit.cpp:5430
+msgid "&Redo"
+msgstr "&Ail-wneud"
+
+#: gui/text/qtextcontrol.cpp:2126 gui/widgets/qlineedit.cpp:2139
+#: qt3support/text/q3textedit.cpp:5435
+msgid "Cu&t"
+msgstr "T&orri"
+
+#: gui/text/qtextcontrol.cpp:2131 gui/widgets/qlineedit.cpp:2145
+#: qt3support/text/q3textedit.cpp:5436
+msgid "&Copy"
+msgstr "&Copio"
+
+#: gui/text/qtextcontrol.cpp:2138
+msgid "Copy &Link Location"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:62
-msgctxt "QWebPage"
-msgid "Top"
+#: gui/text/qtextcontrol.cpp:2144 gui/widgets/qlineedit.cpp:2151
+#: qt3support/text/q3textedit.cpp:5438
+msgid "&Paste"
+msgstr "&Gludo"
+
+#: gui/text/qtextcontrol.cpp:2147 gui/widgets/qlineedit.cpp:2158
+#: scripttools/debugging/qscriptbreakpointswidget.cpp:304
+#: qt3support/sql/q3datatable.cpp:793
+msgid "Delete"
+msgstr "Dileu"
+
+#: gui/text/qtextcontrol.cpp:2154 gui/widgets/qlineedit.cpp:2166
+#: qt3support/text/q3textedit.cpp:5445 qt3support/text/q3textedit.cpp:5447
+msgid "Select All"
+msgstr "Dewis Popeth"
+
+#: gui/text/qtextcontrol.cpp:3079
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "LRM Left-to-right mark"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:63
-msgctxt "QWebPage"
-msgid "Right edge"
+#: gui/text/qtextcontrol.cpp:3080
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "RLM Right-to-left mark"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:63
-msgctxt "QWebPage"
-msgid "Bottom"
+#: gui/text/qtextcontrol.cpp:3081
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "ZWJ Zero width joiner"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:66
-msgctxt "QWebPage"
-msgid "Page left"
+#: gui/text/qtextcontrol.cpp:3082
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "ZWNJ Zero width non-joiner"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:66
-msgctxt "QWebPage"
-msgid "Page up"
+#: gui/text/qtextcontrol.cpp:3083
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "ZWSP Zero width space"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:67
-msgctxt "QWebPage"
-msgid "Page right"
+#: gui/text/qtextcontrol.cpp:3084
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "LRE Start of left-to-right embedding"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:67
-msgctxt "QWebPage"
-msgid "Page down"
+#: gui/text/qtextcontrol.cpp:3085
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "RLE Start of right-to-left embedding"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:70
-msgctxt "QWebPage"
-msgid "Scroll left"
+#: gui/text/qtextcontrol.cpp:3086
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "LRO Start of left-to-right override"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:70
-msgctxt "QWebPage"
-msgid "Scroll up"
+#: gui/text/qtextcontrol.cpp:3087
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "RLO Start of right-to-left override"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:71
-msgctxt "QWebPage"
-msgid "Scroll right"
+#: gui/text/qtextcontrol.cpp:3088
+msgctxt "QUnicodeControlCharacterMenu"
+msgid "PDF Pop directional formatting"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:71
-msgctxt "QWebPage"
-msgid "Scroll down"
+#: gui/text/qtextcontrol.cpp:3094
+msgid "Insert Unicode control character"
 msgstr ""
 
-#: 3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:540
-msgctxt "QWebPage"
-msgid "Redirection limit reached"
+#: gui/inputmethod/qinputcontextfactory.cpp:301
+msgid "XIM"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/phononnamespace.cpp:55
-msgctxt "Phonon::"
-msgid "Notifications"
+#: gui/inputmethod/qinputcontextfactory.cpp:305
+msgid "FEP"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/phononnamespace.cpp:57
-msgctxt "Phonon::"
-msgid "Music"
+#: gui/inputmethod/qinputcontextfactory.cpp:328
+msgid "XIM input method"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/phononnamespace.cpp:59
-msgctxt "Phonon::"
-msgid "Video"
+#: gui/inputmethod/qinputcontextfactory.cpp:332
+msgid "Windows input method"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/phononnamespace.cpp:61
-msgctxt "Phonon::"
-msgid "Communication"
+#: gui/inputmethod/qinputcontextfactory.cpp:336
+msgid "Mac OS X input method"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/phononnamespace.cpp:63
-msgctxt "Phonon::"
-msgid "Games"
+#: gui/inputmethod/qinputcontextfactory.cpp:340
+msgid "S60 FEP input method"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/phononnamespace.cpp:65
-msgctxt "Phonon::"
-msgid "Accessibility"
+#: gui/dialogs/qprogressdialog.cpp:203 gui/dialogs/qwizard.cpp:700
+#: gui/kernel/qsoftkeymanager.cpp:76
+#: qt3support/dialogs/q3progressdialog.cpp:224
+#: qt3support/dialogs/q3progressdialog.cpp:285
+#: qt3support/dialogs/q3tabdialog.cpp:786
+msgid "Cancel"
+msgstr "Diddymu"
+
+#: gui/dialogs/qabstractpagesetupdialog.cpp:68
+#: gui/dialogs/qabstractpagesetupdialog.cpp:80
+msgctxt "QPrintPreviewDialog"
+msgid "Page Setup"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/volumeslider.cpp:42
-#: 3rdparty/phonon/phonon/volumeslider.cpp:60
-#: 3rdparty/phonon/phonon/volumeslider.cpp:189
-#: 3rdparty/phonon/phonon/volumeslider.cpp:204
-#, qt-format
-msgid "Volume: %1%"
+#: gui/dialogs/qabstractprintdialog.cpp:116
+#: gui/dialogs/qabstractprintdialog.cpp:129
+msgctxt "QPrintDialog"
+msgid "Print"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/volumeslider.cpp:45
-#: 3rdparty/phonon/phonon/volumeslider.cpp:63
-#: 3rdparty/phonon/phonon/volumeslider.cpp:117
-#, qt-format
-msgid ""
-"Use this slider to adjust the volume. The leftmost position is 0%. The "
-"rightmost is %1%"
+#: gui/dialogs/qmessagebox.cpp:139
+msgid "Show Details..."
 msgstr ""
 
-#: 3rdparty/phonon/phonon/volumeslider.cpp:184
-msgid "Muted"
+#: gui/dialogs/qmessagebox.cpp:139
+msgid "Hide Details..."
 msgstr ""
 
-#: 3rdparty/phonon/phonon/audiooutput.cpp:444
-#: 3rdparty/phonon/phonon/audiooutput.cpp:478
-#, qt-format
-msgid ""
-"<html>The audio playback device <b>%1</b> does not work.<br/>Falling back to "
-"<b>%2</b>.</html>"
+#: gui/dialogs/qmessagebox.cpp:427 gui/dialogs/qmessagebox.cpp:1272
+msgctxt "QMessageBox"
+msgid "OK"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/audiooutput.cpp:457
-#, qt-format
-msgid ""
-"<html>Switching to the audio playback device <b>%1</b><br/>which just became "
-"available and has higher preference.</html>"
+#: gui/dialogs/qmessagebox.cpp:1273
+msgctxt "QMessageBox"
+msgid "Help"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/audiooutput.cpp:460
-#: 3rdparty/phonon/phonon/audiooutput.cpp:474
+#: gui/dialogs/qmessagebox.cpp:1762
 #, qt-format
-msgid "Revert back to device '%1'"
+msgid "<h3>About Qt</h3><p>This program uses Qt version %1.</p>"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/audiooutput.cpp:471
-#, qt-format
+#: gui/dialogs/qmessagebox.cpp:1767
 msgid ""
-"<html>Switching to the audio playback device <b>%1</b><br/>which has higher "
-"preference or is specifically configured for this stream.</html>"
+"<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt "
+"provides single-source portability across MS&nbsp;Windows, "
+"Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is "
+"also available for embedded devices as Qt for Embedded Linux and Qt for "
+"Windows CE.</p><p>Qt is available under three different licensing options "
+"designed to accommodate the needs of our various users.</p><p>Qt licensed "
+"under our commercial license agreement is appropriate for development of "
+"proprietary/commercial software where you do not want to share any source "
+"code with third parties or otherwise cannot comply with the terms of the GNU "
+"LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU "
+"LGPL version 2.1 is appropriate for the development of Qt applications "
+"(proprietary or open source) provided you can comply with the terms and "
+"conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU "
+"General Public License version 3.0 is appropriate for the development of Qt "
+"applications where you wish to use such applications in combination with "
+"software subject to the terms of the GNU GPL version 3.0 or where you are "
+"otherwise willing to comply with the terms of the GNU GPL version "
+"3.0.</p><p>Please see <a "
+"href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensi"
+"ng</a> for an overview of Qt licensing.</p><p>Copyright (C) 2012 Nokia "
+"Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a "
+"href=\"http://qt.nokia.com/\">qt.nokia.com</a> for more information.</p>"
 msgstr ""
 
-#: 3rdparty/phonon/phonon/pulsesupport.cpp:162
-#: 3rdparty/phonon/phonon/pulsesupport.cpp:173
-msgid "PulseAudio Sound Server"
+#: gui/dialogs/qmessagebox.cpp:1797
+msgid "About Qt"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:82
-msgid "Not ready to play"
-msgstr ""
+#: gui/dialogs/qmessagebox.cpp:1937 gui/dialogs/qmessagebox.cpp:2383
+#: gui/dialogs/qprintdialog_win.cpp:272 gui/kernel/qsoftkeymanager.cpp:64
+#: qt3support/dialogs/q3tabdialog.cpp:190
+#: qt3support/dialogs/q3tabdialog.cpp:1014
+msgid "OK"
+msgstr "Iawn"
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:252
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:263
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:609
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:630
-msgid "Error opening file"
+#: gui/dialogs/qfilesystemmodel.cpp:763 gui/itemviews/qdirmodel.cpp:1334
+#, qt-format
+msgid "%1 TB"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:283
-msgid "Error opening URL"
+#: gui/dialogs/qfilesystemmodel.cpp:765 gui/itemviews/qdirmodel.cpp:1336
+#, qt-format
+msgid "%1 GB"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:295
-msgid "Error opening resource"
+#: gui/dialogs/qfilesystemmodel.cpp:767 gui/itemviews/qdirmodel.cpp:1338
+#, qt-format
+msgid "%1 MB"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:297
-msgid "Error opening source: resource not opened"
+#: gui/dialogs/qfilesystemmodel.cpp:769 gui/itemviews/qdirmodel.cpp:1340
+#, qt-format
+msgid "%1 KB"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:389
-msgid "Setting volume failed"
+#: gui/dialogs/qfilesystemmodel.cpp:770
+#, qt-format
+msgid "%1 bytes"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:450
-msgid "Loading clip failed"
+#: gui/dialogs/qfilesystemmodel.cpp:859
+msgid "Invalid filename"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:479
-msgid "Playback complete"
+#: gui/dialogs/qfilesystemmodel.cpp:860
+#, qt-format
+msgid ""
+"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer "
+"characters or no punctuations marks."
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:636
-msgid "Download error"
-msgstr ""
+#: gui/dialogs/qfilesystemmodel.cpp:924 gui/itemviews/qdirmodel.cpp:438
+msgid "Name"
+msgstr "Enw"
 
-#: 3rdparty/phonon/mmf/mediaobject.cpp:321
-#: 3rdparty/phonon/mmf/mediaobject.cpp:339
-msgid "Error opening source: type not supported"
+#: gui/dialogs/qfilesystemmodel.cpp:926 gui/itemviews/qdirmodel.cpp:439
+msgid "Size"
+msgstr "Maint"
+
+#: gui/dialogs/qfilesystemmodel.cpp:930 gui/itemviews/qdirmodel.cpp:442
+msgctxt "Match OS X Finder"
+msgid "Kind"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/mediaobject.cpp:332
-msgid "Error opening source: resource is compressed"
+#: gui/dialogs/qfilesystemmodel.cpp:932 gui/itemviews/qdirmodel.cpp:444
+msgctxt "All other platforms"
+msgid "Type"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/mediaobject.cpp:336
-msgid "Error opening source: resource not valid"
+#: gui/dialogs/qfilesystemmodel.cpp:939 gui/itemviews/qdirmodel.cpp:450
+msgid "Date Modified"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/mediaobject.cpp:362
-msgid "Error opening source: media type could not be determined"
+#: gui/dialogs/qinputdialog.cpp:223
+msgid "Enter a value:"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/mediaobject.cpp:520
-msgid "Failed to set requested IAP"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:72
+msgid "A0"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/videoplayer_surface.cpp:139
-#: 3rdparty/phonon/mmf/videoplayer_surface.cpp:165
-#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:241
-#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:256
-#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:264
-#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:286
-#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:308
-msgid "Video display error"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:73
+msgid "A1"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:146
-msgid "Decay HF ratio (%)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:74
+msgid "A2"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:152
-msgid "Decay time (ms)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:75
+msgid "A3"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:159
-msgid "Density (%)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:76
+msgid "A4"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:165
-msgid "Diffusion (%)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:77
+msgid "A5"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:170
-msgid "Reflections delay (ms)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:78
+msgid "A6"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:177
-msgid "Reflections level (mB)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:79
+msgid "A7"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:184
-msgid "Reverb delay (ms)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:80
+msgid "A8"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:192
-msgid "Reverb level (mB)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:81
+msgid "A9"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:199
-msgid "Room HF level"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:82
+msgid "B0"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/environmentalreverb.cpp:205
-msgid "Room level (mB)"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:83
+msgid "B1"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:89 network/ssl/qsslerror.cpp:214
-msgid "No error"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:84
+msgid "B2"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:91
-msgid "Not found"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:85
+msgid "B3"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:93
-msgid "Out of memory"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:86
+msgid "B4"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:95
-msgid "Not supported"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:87
+msgid "B5"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:97
-msgid "Overflow"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:88
+msgid "B6"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:99
-msgid "Underflow"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:89
+msgid "B7"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:101
-msgid "Already exists"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:90
+msgid "B8"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:103
-msgid "Path not found"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:91
+msgid "B9"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:105
-msgid "In use"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:92
+msgid "B10"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:107
-msgid "Not ready"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:93
+msgid "C5E"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:109
-msgid "Access denied"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:94
+msgid "DLE"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:111
-msgid "Could not connect"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:95
+msgid "Executive"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:113
-msgid "Disconnected"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:96
+msgid "Folio"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:115
-#: network/socket/qnativesocketengine.cpp:234
-#: network/socket/qsymbiansocketengine.cpp:1387
-msgid "Permission denied"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:97
+msgid "Ledger"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:119
-msgid "Insufficient bandwidth"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:98
+msgid "Legal"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:122
-msgid "Network unavailable"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:99
+msgid "Letter"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:126
-msgid "Network communication error"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:100
+msgid "Tabloid"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:128
-msgid "Streaming not supported"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:101
+msgid "US Common #10 Envelope"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:130
-msgid "Server alert"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:102
+msgid "Custom"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:132
-msgid "Invalid protocol"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:304
+msgid "Centimeters (cm)"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:136
-msgid "Multicast error"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:304
+msgid "Millimeters (mm)"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:139
-msgid "Proxy server error"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:304
+msgid "Inches (in)"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:141
-msgid "Proxy server not supported"
+#: gui/dialogs/qpagesetupdialog_unix.cpp:304
+msgid "Points (pt)"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:143
-msgid "Audio output error"
-msgstr ""
+#: gui/dialogs/qfontdialog.cpp:183
+msgid "Select Font"
+msgstr "Dewis Wynebfath"
 
-#: 3rdparty/phonon/mmf/utils.cpp:145
-msgid "Video output error"
-msgstr ""
+#: gui/dialogs/qfontdialog.cpp:768
+msgid "&Font"
+msgstr "&Wynebfath"
 
-#: 3rdparty/phonon/mmf/utils.cpp:147
-msgid "Decoder error"
-msgstr ""
+#: gui/dialogs/qfontdialog.cpp:769
+msgid "Font st&yle"
+msgstr "Ar&ddull wynebfath"
 
-#: 3rdparty/phonon/mmf/utils.cpp:149
-msgid "Audio or video components could not be played"
-msgstr ""
+#: gui/dialogs/qfontdialog.cpp:770 gui/widgets/qworkspace.cpp:1091
+#: gui/widgets/qmdisubwindow.cpp:1058
+msgid "&Size"
+msgstr "&Maint"
 
-#: 3rdparty/phonon/mmf/utils.cpp:151
-msgid "DRM error"
+#: gui/dialogs/qfontdialog.cpp:774
+msgid "Effects"
+msgstr "Effeithiau"
+
+#: gui/dialogs/qfontdialog.cpp:776
+msgid "Stri&keout"
+msgstr "Ta&ro Drwodd"
+
+#: gui/dialogs/qfontdialog.cpp:777
+msgid "&Underline"
+msgstr "&Danlinellu"
+
+#: gui/dialogs/qfontdialog.cpp:778
+msgid "Sample"
+msgstr "Engraifft"
+
+#: gui/dialogs/qfontdialog.cpp:779
+msgid "Wr&iting System"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/utils.cpp:166
+#: gui/dialogs/qprintpreviewdialog.cpp:249
 #, qt-format
-msgid "Unknown error (%1)"
+msgid "%1%"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/audiooutput.cpp:106
-msgctxt "Phonon::MMF"
-msgid "Audio Output"
+#: gui/dialogs/qprintpreviewdialog.cpp:333
+msgctxt "QPrintPreviewDialog"
+msgid "Print Preview"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/audiooutput.cpp:107
-msgctxt "Phonon::MMF"
-msgid "The audio output device"
+#: gui/dialogs/qprintpreviewdialog.cpp:363
+msgctxt "QPrintPreviewDialog"
+msgid "Next page"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/stereowidening.cpp:79
-msgid "Level (%)"
+#: gui/dialogs/qprintpreviewdialog.cpp:364
+msgctxt "QPrintPreviewDialog"
+msgid "Previous page"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:111
-msgid "Pause failed"
+#: gui/dialogs/qprintpreviewdialog.cpp:365
+msgctxt "QPrintPreviewDialog"
+msgid "First page"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:127
-msgid "Seek failed"
+#: gui/dialogs/qprintpreviewdialog.cpp:366
+msgctxt "QPrintPreviewDialog"
+msgid "Last page"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:194
-#: 3rdparty/phonon/mmf/audioplayer.cpp:187
-msgid "Getting position failed"
+#: gui/dialogs/qprintpreviewdialog.cpp:375
+msgctxt "QPrintPreviewDialog"
+msgid "Fit width"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:264
-msgid "Opening clip failed"
+#: gui/dialogs/qprintpreviewdialog.cpp:376
+msgctxt "QPrintPreviewDialog"
+msgid "Fit page"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/effectfactory.cpp:181
-msgid "Enabled"
+#: gui/dialogs/qprintpreviewdialog.cpp:387
+msgctxt "QPrintPreviewDialog"
+msgid "Zoom in"
 msgstr ""
 
-#: 3rdparty/phonon/mmf/audioequalizer.cpp:92
-#, qt-format
-msgid "%1 Hz"
+#: gui/dialogs/qprintpreviewdialog.cpp:388
+msgctxt "QPrintPreviewDialog"
+msgid "Zoom out"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:93
-msgid ""
-"Cannot start playback. \n"
-"\n"
-"Check your GStreamer installation and make sure you \n"
-"have libgstreamer-plugins-base installed."
+#: gui/dialogs/qprintpreviewdialog.cpp:394
+msgctxt "QPrintPreviewDialog"
+msgid "Portrait"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:222
-msgid "Missing codec helper script assistant."
+#: gui/dialogs/qprintpreviewdialog.cpp:395
+msgctxt "QPrintPreviewDialog"
+msgid "Landscape"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:224
-#, qt-format
-msgid "Plugin codec installation failed for codec: %0"
+#: gui/dialogs/qprintpreviewdialog.cpp:405
+msgctxt "QPrintPreviewDialog"
+msgid "Show single page"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:235
-#, qt-format
-msgid ""
-"A required codec is missing. You need to install the following codec(s) to "
-"play this content: %0"
+#: gui/dialogs/qprintpreviewdialog.cpp:406
+msgctxt "QPrintPreviewDialog"
+msgid "Show facing pages"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:965
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:971
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:984
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1008
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1014
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1032
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1466
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1490
-msgid "Could not open media source."
+#: gui/dialogs/qprintpreviewdialog.cpp:407
+msgctxt "QPrintPreviewDialog"
+msgid "Show overview of all pages"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:976
-msgid "Invalid source type."
+#: gui/dialogs/qprintpreviewdialog.cpp:422
+msgctxt "QPrintPreviewDialog"
+msgid "Print"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1464
-msgid "Could not locate media source."
+#: gui/dialogs/qprintpreviewdialog.cpp:423
+msgctxt "QPrintPreviewDialog"
+msgid "Page setup"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1474
-msgid "Could not open audio device. The device is already in use."
+#: gui/dialogs/qprintpreviewdialog.cpp:429
+msgctxt "QPrintPreviewDialog"
+msgid "Close"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1487
-msgid "Could not decode media source."
+#: gui/dialogs/qprintpreviewdialog.cpp:577
+msgctxt "QPrintPreviewDialog"
+msgid "Export to PDF"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/backend.cpp:188
-msgid ""
-"Warning: You do not seem to have the package gstreamer0.10-plugins-good "
-"installed.\n"
-"          Some video features have been disabled."
+#: gui/dialogs/qprintpreviewdialog.cpp:580
+msgctxt "QPrintPreviewDialog"
+msgid "Export to PostScript"
 msgstr ""
 
-#: 3rdparty/phonon/gstreamer/backend.cpp:193
-msgid ""
-"Warning: You do not seem to have the base GStreamer plugins installed.\n"
-"          All audio and video support has been disabled"
-msgstr ""
-
-#: xml/sax/qxml.cpp:58
-msgctxt "QXml"
-msgid "no error occurred"
-msgstr "ni ddigwyddodd gwall"
-
-#: xml/sax/qxml.cpp:59
-msgctxt "QXml"
-msgid "error triggered by consumer"
-msgstr "gwall a achoswyd gan y defnyddiwr"
-
-#: xml/sax/qxml.cpp:60
-msgctxt "QXml"
-msgid "unexpected end of file"
-msgstr "diwedd annisgwyl i'r ffeil"
-
-#: xml/sax/qxml.cpp:61
-msgctxt "QXml"
-msgid "more than one document type definition"
-msgstr "mwy nag un diffiniad math y dogfen"
-
-#: xml/sax/qxml.cpp:62
-msgctxt "QXml"
-msgid "error occurred while parsing element"
-msgstr "digwyddodd gwall wrth dosrannu'r elfen"
-
-#: xml/sax/qxml.cpp:63
-msgctxt "QXml"
-msgid "tag mismatch"
-msgstr "camgydweddu tag"
-
-#: xml/sax/qxml.cpp:64
-msgctxt "QXml"
-msgid "error occurred while parsing content"
-msgstr "digwyddodd gwall wrth dosrannu cynnwys"
-
-#: xml/sax/qxml.cpp:65
-msgctxt "QXml"
-msgid "unexpected character"
-msgstr "nod annisgwyl"
-
-#: xml/sax/qxml.cpp:66
-msgctxt "QXml"
-msgid "invalid name for processing instruction"
-msgstr "enw annilys am gyfarwyddiad brosesu"
-
-#: xml/sax/qxml.cpp:67
-msgctxt "QXml"
-msgid "version expected while reading the XML declaration"
-msgstr "disgwylir fersiwn wrth ddarllen y datganiad XML"
-
-#: xml/sax/qxml.cpp:68
-msgctxt "QXml"
-msgid "wrong value for standalone declaration"
-msgstr "gwerth anghywir am ddatganiad unigol"
-
-#: xml/sax/qxml.cpp:69
-msgctxt "QXml"
-msgid ""
-"encoding declaration or standalone declaration expected while reading the "
-"XML declaration"
-msgstr ""
-"disgwylir datganiad codio neu datganiad unigol wrth ddarllen y datganiad XML"
-
-#: xml/sax/qxml.cpp:70
-msgctxt "QXml"
-msgid "standalone declaration expected while reading the XML declaration"
-msgstr "disgwylir datganiad unigol wrth ddarllen y datganiad XML"
-
-#: xml/sax/qxml.cpp:71
-msgctxt "QXml"
-msgid "error occurred while parsing document type definition"
-msgstr "digwyddodd gwall wrth dosrannu diffiniad math y ddogfen"
-
-#: xml/sax/qxml.cpp:72
-msgctxt "QXml"
-msgid "letter is expected"
-msgstr "disgwylir llythyren"
-
-#: xml/sax/qxml.cpp:73
-msgctxt "QXml"
-msgid "error occurred while parsing comment"
-msgstr "digwyddodd gwall wrth dosrannu sylwad"
-
-#: xml/sax/qxml.cpp:74
-msgctxt "QXml"
-msgid "error occurred while parsing reference"
-msgstr "digwyddodd gwall wrth dosrannu cyfeirnod"
-
-#: xml/sax/qxml.cpp:75
-msgctxt "QXml"
-msgid "internal general entity reference not allowed in DTD"
-msgstr "ni chaniateir cyfeiriant elfen cyffredinol mewnol mewn DTD"
-
-#: xml/sax/qxml.cpp:76
-msgctxt "QXml"
-msgid ""
-"external parsed general entity reference not allowed in attribute value"
-msgstr ""
-"ni chaniateir cyfeiriant endid  cyffredinol dosranedig mewn gwerthpriodoledd"
-
-#: xml/sax/qxml.cpp:77
-msgctxt "QXml"
-msgid "external parsed general entity reference not allowed in DTD"
-msgstr "ni chaniateir cyfeiriant endid  cyffredinol dosranedig mewn DTD"
-
-#: xml/sax/qxml.cpp:78
-msgctxt "QXml"
-msgid "unparsed entity reference in wrong context"
-msgstr "cyfeiriant endid di-ddosranedig mewn cyd-destun anghywir"
-
-#: xml/sax/qxml.cpp:79
-msgctxt "QXml"
-msgid "recursive entities"
-msgstr "endidau dychweliadol"
-
-#: xml/sax/qxml.cpp:80
-msgctxt "QXml"
-msgid "error in the text declaration of an external entity"
-msgstr "gwall yn y datganiad testun o endid allanol"
-
-#: gui/itemviews/qfileiconprovider.cpp:475
-msgctxt "QFileDialog"
-msgid "Drive"
-msgstr ""
-
-#: gui/itemviews/qfileiconprovider.cpp:478
-#: gui/itemviews/qfileiconprovider.cpp:479
-msgctxt "QFileDialog"
-msgid "File"
-msgstr ""
-
-#: gui/itemviews/qfileiconprovider.cpp:484
-msgctxt "Match Windows Explorer"
-msgid "File Folder"
-msgstr ""
-
-#: gui/itemviews/qfileiconprovider.cpp:486
-msgctxt "All other platforms"
-msgid "Folder"
-msgstr ""
-
-#: gui/itemviews/qfileiconprovider.cpp:495
-msgctxt "Mac OS X Finder"
-msgid "Alias"
-msgstr ""
-
-#: gui/itemviews/qfileiconprovider.cpp:497
-msgctxt "All other platforms"
-msgid "Shortcut"
-msgstr ""
-
-#: gui/itemviews/qfileiconprovider.cpp:504
-msgctxt "QFileDialog"
-msgid "Unknown"
-msgstr ""
-
-#: gui/itemviews/qdirmodel.cpp:438 gui/dialogs/qfilesystemmodel.cpp:924
-msgid "Name"
-msgstr "Enw"
-
-#: gui/itemviews/qdirmodel.cpp:439 gui/dialogs/qfilesystemmodel.cpp:926
-msgid "Size"
-msgstr "Maint"
-
-#: gui/itemviews/qdirmodel.cpp:442 gui/dialogs/qfilesystemmodel.cpp:930
-msgctxt "Match OS X Finder"
-msgid "Kind"
-msgstr ""
-
-#: gui/itemviews/qdirmodel.cpp:444 gui/dialogs/qfilesystemmodel.cpp:932
-msgctxt "All other platforms"
-msgid "Type"
+#: gui/dialogs/qdialog.cpp:526 gui/dialogs/qwizard.cpp:698
+#: gui/kernel/qsoftkeymanager.cpp:70
+msgid "Done"
 msgstr ""
 
-#: gui/itemviews/qdirmodel.cpp:450 gui/dialogs/qfilesystemmodel.cpp:939
-msgid "Date Modified"
-msgstr ""
+#: gui/dialogs/qdialog.cpp:653 gui/kernel/qwhatsthis.cpp:527
+msgid "What's This?"
+msgstr "Beth Yw Hyn?"
 
-#: gui/itemviews/qdirmodel.cpp:852
-msgctxt "QFileDialog"
-msgid "My Computer"
+#: gui/dialogs/qwizard.cpp:688
+msgid "Go Back"
 msgstr ""
 
-#: gui/itemviews/qdirmodel.cpp:1334 gui/dialogs/qfilesystemmodel.cpp:763
-#, qt-format
-msgid "%1 TB"
-msgstr ""
+#: gui/dialogs/qwizard.cpp:688 qt3support/dialogs/q3wizard.cpp:178
+msgid "< &Back"
+msgstr "< &Yn Ol"
 
-#: gui/itemviews/qdirmodel.cpp:1336 gui/dialogs/qfilesystemmodel.cpp:765
-#, qt-format
-msgid "%1 GB"
+#: gui/dialogs/qwizard.cpp:691 scripttools/debugging/qscriptdebugger.cpp:1694
+msgid "Continue"
 msgstr ""
 
-#: gui/itemviews/qdirmodel.cpp:1338 gui/dialogs/qfilesystemmodel.cpp:767
-#, qt-format
-msgid "%1 MB"
+#: gui/dialogs/qwizard.cpp:694
+msgid "&Next"
 msgstr ""
 
-#: gui/itemviews/qdirmodel.cpp:1340 gui/dialogs/qfilesystemmodel.cpp:769
-#, qt-format
-msgid "%1 KB"
-msgstr ""
+#: gui/dialogs/qwizard.cpp:694 qt3support/dialogs/q3wizard.cpp:179
+msgid "&Next >"
+msgstr "&Nesaf >"
 
-#: gui/itemviews/qdirmodel.cpp:1341
-#, qt-format
-msgid "%1 byte(s)"
+#: gui/dialogs/qwizard.cpp:696
+msgid "Commit"
 msgstr ""
 
-#: gui/painting/qprinterinfo_unix.cpp:135
-msgid "locally connected"
-msgstr ""
+#: gui/dialogs/qwizard.cpp:698 qt3support/dialogs/q3wizard.cpp:180
+msgid "&Finish"
+msgstr "&Gorffen"
 
-#: gui/painting/qprinterinfo_unix.cpp:158
-#: gui/painting/qprinterinfo_unix.cpp:383
-#, qt-format
-msgid "Aliases: %1"
-msgstr ""
+#: gui/dialogs/qwizard.cpp:702 gui/widgets/qmdisubwindow.cpp:355
+#: qt3support/dialogs/q3tabdialog.cpp:691
+msgid "Help"
+msgstr "Cymorth"
 
-#: gui/painting/qprinterinfo_unix.cpp:608
-#: gui/painting/qprinterinfo_unix.cpp:807
-msgid "unknown"
-msgstr ""
+#: gui/dialogs/qwizard.cpp:702 qt3support/dialogs/q3wizard.cpp:181
+msgid "&Help"
+msgstr "&Cymorth"
 
-#: gui/dialogs/qdialog.cpp:524 gui/dialogs/qwizard.cpp:698
-#: gui/kernel/qsoftkeymanager.cpp:70
-msgid "Done"
+#: gui/dialogs/qsidebar.cpp:442
+msgid "Remove"
 msgstr ""
 
-#: gui/dialogs/qdialog.cpp:651 gui/kernel/qwhatsthis.cpp:527
-msgid "What's This?"
-msgstr "Beth Yw Hyn?"
-
 #: gui/dialogs/qprintdialog_qws.cpp:148
 msgid "File exists"
 msgstr ""
@@ -2079,22 +1809,6 @@
 msgid "Print current page"
 msgstr ""
 
-#: gui/dialogs/qwizard.cpp:688
-msgid "Go Back"
-msgstr ""
-
-#: gui/dialogs/qwizard.cpp:691 scripttools/debugging/qscriptdebugger.cpp:1694
-msgid "Continue"
-msgstr ""
-
-#: gui/dialogs/qwizard.cpp:694
-msgid "&Next"
-msgstr ""
-
-#: gui/dialogs/qwizard.cpp:696
-msgid "Commit"
-msgstr ""
-
 #: gui/dialogs/qprintdialog_unix.cpp:396 gui/dialogs/qprintdialog_unix.cpp:464
 msgid "&Options >>"
 msgstr ""
@@ -2159,3460 +1873,3910 @@
 msgid "Value"
 msgstr ""
 
-#: gui/dialogs/qinputdialog.cpp:223
-msgid "Enter a value:"
+#: gui/dialogs/qprintdialog_win.cpp:270
+msgid "Print"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:249
-#, qt-format
-msgid "%1%"
+#: gui/dialogs/qprintdialog_win.cpp:271
+msgid "The 'From' value cannot be greater than the 'To' value."
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:333
-msgctxt "QPrintPreviewDialog"
-msgid "Print Preview"
+#: gui/kernel/qkeysequence.cpp:396
+msgctxt "QShortcut"
+msgid "Space"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:363
-msgctxt "QPrintPreviewDialog"
-msgid "Next page"
+#: gui/kernel/qkeysequence.cpp:397
+msgctxt "QShortcut"
+msgid "Esc"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:364
-msgctxt "QPrintPreviewDialog"
-msgid "Previous page"
+#: gui/kernel/qkeysequence.cpp:398
+msgctxt "QShortcut"
+msgid "Tab"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:365
-msgctxt "QPrintPreviewDialog"
-msgid "First page"
+#: gui/kernel/qkeysequence.cpp:399
+msgctxt "QShortcut"
+msgid "Backtab"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:366
-msgctxt "QPrintPreviewDialog"
-msgid "Last page"
+#: gui/kernel/qkeysequence.cpp:400
+msgctxt "QShortcut"
+msgid "Backspace"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:375
-msgctxt "QPrintPreviewDialog"
-msgid "Fit width"
+#: gui/kernel/qkeysequence.cpp:401
+msgctxt "QShortcut"
+msgid "Return"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:376
-msgctxt "QPrintPreviewDialog"
-msgid "Fit page"
+#: gui/kernel/qkeysequence.cpp:402
+msgctxt "QShortcut"
+msgid "Enter"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:387
-msgctxt "QPrintPreviewDialog"
-msgid "Zoom in"
+#: gui/kernel/qkeysequence.cpp:403
+msgctxt "QShortcut"
+msgid "Ins"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:388
-msgctxt "QPrintPreviewDialog"
-msgid "Zoom out"
+#: gui/kernel/qkeysequence.cpp:404
+msgctxt "QShortcut"
+msgid "Del"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:394
-msgctxt "QPrintPreviewDialog"
-msgid "Portrait"
+#: gui/kernel/qkeysequence.cpp:405
+msgctxt "QShortcut"
+msgid "Pause"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:395
-msgctxt "QPrintPreviewDialog"
-msgid "Landscape"
+#: gui/kernel/qkeysequence.cpp:406
+msgctxt "QShortcut"
+msgid "Print"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:405
-msgctxt "QPrintPreviewDialog"
-msgid "Show single page"
+#: gui/kernel/qkeysequence.cpp:407
+msgctxt "QShortcut"
+msgid "SysReq"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:406
-msgctxt "QPrintPreviewDialog"
-msgid "Show facing pages"
+#: gui/kernel/qkeysequence.cpp:408
+msgctxt "QShortcut"
+msgid "Home"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:407
-msgctxt "QPrintPreviewDialog"
-msgid "Show overview of all pages"
+#: gui/kernel/qkeysequence.cpp:409
+msgctxt "QShortcut"
+msgid "End"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:422
-msgctxt "QPrintPreviewDialog"
-msgid "Print"
+#: gui/kernel/qkeysequence.cpp:410
+msgctxt "QShortcut"
+msgid "Left"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:423
-msgctxt "QPrintPreviewDialog"
-msgid "Page setup"
+#: gui/kernel/qkeysequence.cpp:411
+msgctxt "QShortcut"
+msgid "Up"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:429
-msgctxt "QPrintPreviewDialog"
-msgid "Close"
+#: gui/kernel/qkeysequence.cpp:412
+msgctxt "QShortcut"
+msgid "Right"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:577
-msgctxt "QPrintPreviewDialog"
-msgid "Export to PDF"
+#: gui/kernel/qkeysequence.cpp:413
+msgctxt "QShortcut"
+msgid "Down"
 msgstr ""
 
-#: gui/dialogs/qprintpreviewdialog.cpp:580
-msgctxt "QPrintPreviewDialog"
-msgid "Export to PostScript"
+#: gui/kernel/qkeysequence.cpp:414
+msgctxt "QShortcut"
+msgid "PgUp"
 msgstr ""
 
-#: gui/dialogs/qsidebar.cpp:442
-msgid "Remove"
+#: gui/kernel/qkeysequence.cpp:415
+msgctxt "QShortcut"
+msgid "PgDown"
 msgstr ""
 
-#: gui/dialogs/qprintdialog_win.cpp:270
-msgid "Print"
+#: gui/kernel/qkeysequence.cpp:416
+msgctxt "QShortcut"
+msgid "CapsLock"
 msgstr ""
 
-#: gui/dialogs/qprintdialog_win.cpp:271
-msgid "The 'From' value cannot be greater than the 'To' value."
+#: gui/kernel/qkeysequence.cpp:417
+msgctxt "QShortcut"
+msgid "NumLock"
 msgstr ""
 
-#: gui/dialogs/qfontdialog.cpp:183
-msgid "Select Font"
-msgstr "Dewis Wynebfath"
-
-#: gui/dialogs/qfontdialog.cpp:768
-msgid "&Font"
-msgstr "&Wynebfath"
-
-#: gui/dialogs/qfontdialog.cpp:769
-msgid "Font st&yle"
-msgstr "Ar&ddull wynebfath"
-
-#: gui/dialogs/qfontdialog.cpp:770 gui/widgets/qmdisubwindow.cpp:1058
-#: gui/widgets/qworkspace.cpp:1091
-msgid "&Size"
-msgstr "&Maint"
-
-#: gui/dialogs/qfontdialog.cpp:774
-msgid "Effects"
-msgstr "Effeithiau"
-
-#: gui/dialogs/qfontdialog.cpp:776
-msgid "Stri&keout"
-msgstr "Ta&ro Drwodd"
-
-#: gui/dialogs/qfontdialog.cpp:777
-msgid "&Underline"
-msgstr "&Danlinellu"
-
-#: gui/dialogs/qfontdialog.cpp:778
-msgid "Sample"
-msgstr "Engraifft"
+#: gui/kernel/qkeysequence.cpp:418
+msgctxt "QShortcut"
+msgid "ScrollLock"
+msgstr ""
 
-#: gui/dialogs/qfontdialog.cpp:779
-msgid "Wr&iting System"
+#: gui/kernel/qkeysequence.cpp:419
+msgctxt "QShortcut"
+msgid "Menu"
 msgstr ""
 
-#: gui/dialogs/qfilesystemmodel.cpp:770
-#, qt-format
-msgid "%1 bytes"
+#: gui/kernel/qkeysequence.cpp:420
+msgctxt "QShortcut"
+msgid "Help"
 msgstr ""
 
-#: gui/dialogs/qfilesystemmodel.cpp:859
-msgid "Invalid filename"
+#: gui/kernel/qkeysequence.cpp:425
+msgctxt "QShortcut"
+msgid "Back"
 msgstr ""
 
-#: gui/dialogs/qfilesystemmodel.cpp:860
-#, qt-format
-msgid ""
-"<b>The name \"%1\" can not be used.</b><p>Try using another name, with fewer "
-"characters or no punctuations marks."
+#: gui/kernel/qkeysequence.cpp:426
+msgctxt "QShortcut"
+msgid "Forward"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:72
-msgid "A0"
+#: gui/kernel/qkeysequence.cpp:427
+msgctxt "QShortcut"
+msgid "Stop"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:73
-msgid "A1"
+#: gui/kernel/qkeysequence.cpp:428
+msgctxt "QShortcut"
+msgid "Refresh"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:74
-msgid "A2"
+#: gui/kernel/qkeysequence.cpp:429
+msgctxt "QShortcut"
+msgid "Volume Down"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:75
-msgid "A3"
+#: gui/kernel/qkeysequence.cpp:430
+msgctxt "QShortcut"
+msgid "Volume Mute"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:76
-msgid "A4"
+#: gui/kernel/qkeysequence.cpp:431
+msgctxt "QShortcut"
+msgid "Volume Up"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:77
-msgid "A5"
+#: gui/kernel/qkeysequence.cpp:432
+msgctxt "QShortcut"
+msgid "Bass Boost"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:78
-msgid "A6"
+#: gui/kernel/qkeysequence.cpp:433
+msgctxt "QShortcut"
+msgid "Bass Up"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:79
-msgid "A7"
+#: gui/kernel/qkeysequence.cpp:434
+msgctxt "QShortcut"
+msgid "Bass Down"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:80
-msgid "A8"
+#: gui/kernel/qkeysequence.cpp:435
+msgctxt "QShortcut"
+msgid "Treble Up"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:81
-msgid "A9"
+#: gui/kernel/qkeysequence.cpp:436
+msgctxt "QShortcut"
+msgid "Treble Down"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:82
-msgid "B0"
+#: gui/kernel/qkeysequence.cpp:437
+msgctxt "QShortcut"
+msgid "Media Play"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:83
-msgid "B1"
+#: gui/kernel/qkeysequence.cpp:438
+msgctxt "QShortcut"
+msgid "Media Stop"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:84
-msgid "B2"
+#: gui/kernel/qkeysequence.cpp:439
+msgctxt "QShortcut"
+msgid "Media Previous"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:85
-msgid "B3"
+#: gui/kernel/qkeysequence.cpp:440
+msgctxt "QShortcut"
+msgid "Media Next"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:86
-msgid "B4"
+#: gui/kernel/qkeysequence.cpp:441
+msgctxt "QShortcut"
+msgid "Media Record"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:87
-msgid "B5"
+#: gui/kernel/qkeysequence.cpp:443
+msgctxt "QShortcut"
+msgid "Media Pause"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:88
-msgid "B6"
+#: gui/kernel/qkeysequence.cpp:445
+msgctxt "QShortcut"
+msgid "Toggle Media Play/Pause"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:89
-msgid "B7"
+#: gui/kernel/qkeysequence.cpp:446
+msgctxt "QShortcut"
+msgid "Home Page"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:90
-msgid "B8"
+#: gui/kernel/qkeysequence.cpp:447
+msgctxt "QShortcut"
+msgid "Favorites"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:91
-msgid "B9"
+#: gui/kernel/qkeysequence.cpp:448
+msgctxt "QShortcut"
+msgid "Search"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:92
-msgid "B10"
+#: gui/kernel/qkeysequence.cpp:449
+msgctxt "QShortcut"
+msgid "Standby"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:93
-msgid "C5E"
+#: gui/kernel/qkeysequence.cpp:450
+msgctxt "QShortcut"
+msgid "Open URL"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:94
-msgid "DLE"
+#: gui/kernel/qkeysequence.cpp:451
+msgctxt "QShortcut"
+msgid "Launch Mail"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:95
-msgid "Executive"
+#: gui/kernel/qkeysequence.cpp:452
+msgctxt "QShortcut"
+msgid "Launch Media"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:96
-msgid "Folio"
+#: gui/kernel/qkeysequence.cpp:453
+msgctxt "QShortcut"
+msgid "Launch (0)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:97
-msgid "Ledger"
+#: gui/kernel/qkeysequence.cpp:454
+msgctxt "QShortcut"
+msgid "Launch (1)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:98
-msgid "Legal"
+#: gui/kernel/qkeysequence.cpp:455
+msgctxt "QShortcut"
+msgid "Launch (2)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:99
-msgid "Letter"
+#: gui/kernel/qkeysequence.cpp:456
+msgctxt "QShortcut"
+msgid "Launch (3)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:100
-msgid "Tabloid"
+#: gui/kernel/qkeysequence.cpp:457
+msgctxt "QShortcut"
+msgid "Launch (4)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:101
-msgid "US Common #10 Envelope"
+#: gui/kernel/qkeysequence.cpp:458
+msgctxt "QShortcut"
+msgid "Launch (5)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:102
-msgid "Custom"
+#: gui/kernel/qkeysequence.cpp:459
+msgctxt "QShortcut"
+msgid "Launch (6)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:304
-msgid "Centimeters (cm)"
+#: gui/kernel/qkeysequence.cpp:460
+msgctxt "QShortcut"
+msgid "Launch (7)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:304
-msgid "Millimeters (mm)"
+#: gui/kernel/qkeysequence.cpp:461
+msgctxt "QShortcut"
+msgid "Launch (8)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:304
-msgid "Inches (in)"
+#: gui/kernel/qkeysequence.cpp:462
+msgctxt "QShortcut"
+msgid "Launch (9)"
 msgstr ""
 
-#: gui/dialogs/qpagesetupdialog_unix.cpp:304
-msgid "Points (pt)"
+#: gui/kernel/qkeysequence.cpp:463
+msgctxt "QShortcut"
+msgid "Launch (A)"
 msgstr ""
 
-#: gui/dialogs/qabstractprintdialog.cpp:116
-#: gui/dialogs/qabstractprintdialog.cpp:129
-msgctxt "QPrintDialog"
-msgid "Print"
+#: gui/kernel/qkeysequence.cpp:464
+msgctxt "QShortcut"
+msgid "Launch (B)"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:139
-msgid "Show Details..."
+#: gui/kernel/qkeysequence.cpp:465
+msgctxt "QShortcut"
+msgid "Launch (C)"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:139
-msgid "Hide Details..."
+#: gui/kernel/qkeysequence.cpp:466
+msgctxt "QShortcut"
+msgid "Launch (D)"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:427 gui/dialogs/qmessagebox.cpp:1272
-msgctxt "QMessageBox"
-msgid "OK"
+#: gui/kernel/qkeysequence.cpp:467
+msgctxt "QShortcut"
+msgid "Launch (E)"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:1273
-msgctxt "QMessageBox"
-msgid "Help"
+#: gui/kernel/qkeysequence.cpp:468
+msgctxt "QShortcut"
+msgid "Launch (F)"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:1762
-#, qt-format
-msgid "<h3>About Qt</h3><p>This program uses Qt version %1.</p>"
+#: gui/kernel/qkeysequence.cpp:469
+msgctxt "QShortcut"
+msgid "Monitor Brightness Up"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:1767
-msgid ""
-"<p>Qt is a C++ toolkit for cross-platform application development.</p><p>Qt "
-"provides single-source portability across MS&nbsp;Windows, "
-"Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. Qt is "
-"also available for embedded devices as Qt for Embedded Linux and Qt for "
-"Windows CE.</p><p>Qt is available under three different licensing options "
-"designed to accommodate the needs of our various users.</p><p>Qt licensed "
-"under our commercial license agreement is appropriate for development of "
-"proprietary/commercial software where you do not want to share any source "
-"code with third parties or otherwise cannot comply with the terms of the GNU "
-"LGPL version 2.1 or GNU GPL version 3.0.</p><p>Qt licensed under the GNU "
-"LGPL version 2.1 is appropriate for the development of Qt applications "
-"(proprietary or open source) provided you can comply with the terms and "
-"conditions of the GNU LGPL version 2.1.</p><p>Qt licensed under the GNU "
-"General Public License version 3.0 is appropriate for the development of Qt "
-"applications where you wish to use such applications in combination with "
-"software subject to the terms of the GNU GPL version 3.0 or where you are "
-"otherwise willing to comply with the terms of the GNU GPL version "
-"3.0.</p><p>Please see <a "
-"href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensi"
-"ng</a> for an overview of Qt licensing.</p><p>Copyright (C) 2011 Nokia "
-"Corporation and/or its subsidiary(-ies).</p><p>Qt is a Nokia product. See <a "
-"href=\"http://qt.nokia.com/\">qt.nokia.com</a> for more information.</p>"
+#: gui/kernel/qkeysequence.cpp:470
+msgctxt "QShortcut"
+msgid "Monitor Brightness Down"
 msgstr ""
 
-#: gui/dialogs/qmessagebox.cpp:1797
-msgid "About Qt"
+#: gui/kernel/qkeysequence.cpp:471
+msgctxt "QShortcut"
+msgid "Keyboard Light On/Off"
 msgstr ""
 
-#: gui/dialogs/qabstractpagesetupdialog.cpp:68
-#: gui/dialogs/qabstractpagesetupdialog.cpp:80
-msgctxt "QPrintPreviewDialog"
-msgid "Page Setup"
+#: gui/kernel/qkeysequence.cpp:472
+msgctxt "QShortcut"
+msgid "Keyboard Brightness Up"
 msgstr ""
 
-#: gui/inputmethod/qinputcontextfactory.cpp:301
-msgid "XIM"
+#: gui/kernel/qkeysequence.cpp:473
+msgctxt "QShortcut"
+msgid "Keyboard Brightness Down"
 msgstr ""
 
-#: gui/inputmethod/qinputcontextfactory.cpp:305
-msgid "FEP"
+#: gui/kernel/qkeysequence.cpp:474
+msgctxt "QShortcut"
+msgid "Power Off"
 msgstr ""
 
-#: gui/inputmethod/qinputcontextfactory.cpp:328
-msgid "XIM input method"
+#: gui/kernel/qkeysequence.cpp:475
+msgctxt "QShortcut"
+msgid "Wake Up"
 msgstr ""
 
-#: gui/inputmethod/qinputcontextfactory.cpp:332
-msgid "Windows input method"
+#: gui/kernel/qkeysequence.cpp:476
+msgctxt "QShortcut"
+msgid "Eject"
 msgstr ""
 
-#: gui/inputmethod/qinputcontextfactory.cpp:336
-msgid "Mac OS X input method"
+#: gui/kernel/qkeysequence.cpp:477
+msgctxt "QShortcut"
+msgid "Screensaver"
 msgstr ""
 
-#: gui/inputmethod/qinputcontextfactory.cpp:340
-msgid "S60 FEP input method"
+#: gui/kernel/qkeysequence.cpp:478
+msgctxt "QShortcut"
+msgid "WWW"
 msgstr ""
 
-#: gui/accessible/qaccessibleobject.cpp:374
-msgid "Activate"
+#: gui/kernel/qkeysequence.cpp:479
+msgctxt "QShortcut"
+msgid "Sleep"
 msgstr ""
 
-#: gui/accessible/qaccessibleobject.cpp:376
-msgid "Activates the program's main window"
+#: gui/kernel/qkeysequence.cpp:480
+msgctxt "QShortcut"
+msgid "LightBulb"
 msgstr ""
 
-#: gui/util/qundogroup.cpp:388 gui/util/qundostack.cpp:877
-#, qt-format
-msgid "Undo %1"
+#: gui/kernel/qkeysequence.cpp:481
+msgctxt "QShortcut"
+msgid "Shop"
 msgstr ""
 
-#: gui/util/qundogroup.cpp:388 gui/util/qundostack.cpp:877
-msgctxt "Default text for undo action"
-msgid "Undo"
+#: gui/kernel/qkeysequence.cpp:482
+msgctxt "QShortcut"
+msgid "History"
 msgstr ""
 
-#: gui/util/qundogroup.cpp:419 gui/util/qundostack.cpp:907
-#, qt-format
-msgid "Redo %1"
+#: gui/kernel/qkeysequence.cpp:483
+msgctxt "QShortcut"
+msgid "Add Favorite"
 msgstr ""
 
-#: gui/util/qundogroup.cpp:419 gui/util/qundostack.cpp:907
-msgctxt "Default text for redo action"
-msgid "Redo"
+#: gui/kernel/qkeysequence.cpp:484
+msgctxt "QShortcut"
+msgid "Hot Links"
 msgstr ""
 
-#: gui/util/qdesktopservices_mac.cpp:171
-msgid "Home"
+#: gui/kernel/qkeysequence.cpp:485
+msgctxt "QShortcut"
+msgid "Adjust Brightness"
 msgstr ""
 
-#: gui/util/qundoview.cpp:101
-msgid "<empty>"
-msgstr "<gwag>"
-
-#: gui/widgets/qabstractspinbox.cpp:1257
-msgid "&Select All"
+#: gui/kernel/qkeysequence.cpp:486
+msgctxt "QShortcut"
+msgid "Finance"
 msgstr ""
 
-#: gui/widgets/qabstractspinbox.cpp:1263
-msgid "&Step up"
+#: gui/kernel/qkeysequence.cpp:487
+msgctxt "QShortcut"
+msgid "Community"
 msgstr ""
 
-#: gui/widgets/qabstractspinbox.cpp:1265
-msgid "Step &down"
+#: gui/kernel/qkeysequence.cpp:488
+msgctxt "QShortcut"
+msgid "Audio Rewind"
 msgstr ""
 
-#: gui/widgets/qmenu_symbian.cpp:457
-msgid "Actions"
+#: gui/kernel/qkeysequence.cpp:489
+msgctxt "QShortcut"
+msgid "Back Forward"
 msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:279
-#, qt-format
-msgid "- [%1]"
+#: gui/kernel/qkeysequence.cpp:490
+msgctxt "QShortcut"
+msgid "Application Left"
 msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:280 gui/widgets/qworkspace.cpp:1886
-#: gui/widgets/qworkspace.cpp:1946
-#, qt-format
-msgid "%1 - [%2]"
-msgstr "%1 - [%2]"
-
-#: gui/widgets/qmdisubwindow.cpp:334 gui/widgets/qworkspace.cpp:115
-#: plugins/accessible/compat/q3complexwidgets.cpp:250
-msgid "Minimize"
-msgstr "Lleihau"
+#: gui/kernel/qkeysequence.cpp:491
+msgctxt "QShortcut"
+msgid "Application Right"
+msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:337
-#: plugins/accessible/compat/q3complexwidgets.cpp:254
-msgid "Maximize"
-msgstr "Chwyddo"
+#: gui/kernel/qkeysequence.cpp:492
+msgctxt "QShortcut"
+msgid "Book"
+msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:340
-msgid "Unshade"
+#: gui/kernel/qkeysequence.cpp:493
+msgctxt "QShortcut"
+msgid "CD"
 msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:343
-msgid "Shade"
+#: gui/kernel/qkeysequence.cpp:494
+msgctxt "QShortcut"
+msgid "Calculator"
 msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:347 gui/widgets/qworkspace.cpp:117
-msgid "Restore Down"
-msgstr "Adfer i Lawr"
+#: gui/kernel/qkeysequence.cpp:495
+msgctxt "QShortcut"
+msgid "Clear"
+msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:349
-msgid "Restore"
+#: gui/kernel/qkeysequence.cpp:496
+msgctxt "QShortcut"
+msgid "Clear Grab"
 msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:352 gui/widgets/qworkspace.cpp:113
-#: plugins/accessible/compat/q3complexwidgets.cpp:256
-#: plugins/accessible/widgets/complexwidgets.cpp:1847
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:157
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:382
-#: plugins/accessible/widgets/qaccessiblewidgets.cpp:1249
-#: scripttools/debugging/qscriptbreakpointswidget.cpp:81
-#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:141
+#: gui/kernel/qkeysequence.cpp:497
+msgctxt "QShortcut"
 msgid "Close"
-msgstr "Cau"
-
-#: gui/widgets/qmdisubwindow.cpp:358
-msgid "Menu"
 msgstr ""
 
-#: gui/widgets/qmdisubwindow.cpp:1054 gui/widgets/qworkspace.cpp:1089
-msgid "&Restore"
-msgstr "Ad&fer"
-
-#: gui/widgets/qmdisubwindow.cpp:1057 gui/widgets/qworkspace.cpp:1090
-msgid "&Move"
-msgstr "&Symud"
-
-#: gui/widgets/qmdisubwindow.cpp:1059 gui/widgets/qworkspace.cpp:1093
-msgid "Mi&nimize"
-msgstr "&Lleihau"
-
-#: gui/widgets/qmdisubwindow.cpp:1061 gui/widgets/qworkspace.cpp:1095
-msgid "Ma&ximize"
-msgstr "&Chwyddo"
-
-#: gui/widgets/qmdisubwindow.cpp:1063 gui/widgets/qworkspace.cpp:1103
-msgid "Stay on &Top"
-msgstr "Aros ar &Ben"
-
-#: gui/widgets/qmdisubwindow.cpp:1066 gui/widgets/qworkspace.cpp:1097
-msgid "&Close"
-msgstr "&Cau"
-
-#: gui/widgets/qscrollbar.cpp:453
-msgid "Scroll here"
+#: gui/kernel/qkeysequence.cpp:498
+msgctxt "QShortcut"
+msgid "Copy"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:455
-msgid "Left edge"
+#: gui/kernel/qkeysequence.cpp:499
+msgctxt "QShortcut"
+msgid "Cut"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:455
-msgid "Top"
-msgstr "Top"
-
-#: gui/widgets/qscrollbar.cpp:456
-msgid "Right edge"
+#: gui/kernel/qkeysequence.cpp:500
+msgctxt "QShortcut"
+msgid "Display"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:456
-msgid "Bottom"
-msgstr "Gwaelod"
-
-#: gui/widgets/qscrollbar.cpp:458
-#: plugins/accessible/widgets/rangecontrols.cpp:706
-msgid "Page left"
+#: gui/kernel/qkeysequence.cpp:501
+msgctxt "QShortcut"
+msgid "DOS"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:458
-#: plugins/accessible/widgets/rangecontrols.cpp:553
-#: plugins/accessible/widgets/rangecontrols.cpp:706
-msgid "Page up"
+#: gui/kernel/qkeysequence.cpp:502
+msgctxt "QShortcut"
+msgid "Documents"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:459
-#: plugins/accessible/widgets/rangecontrols.cpp:711
-msgid "Page right"
+#: gui/kernel/qkeysequence.cpp:503
+msgctxt "QShortcut"
+msgid "Spreadsheet"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:459
-#: plugins/accessible/widgets/rangecontrols.cpp:557
-#: plugins/accessible/widgets/rangecontrols.cpp:711
-msgid "Page down"
+#: gui/kernel/qkeysequence.cpp:504
+msgctxt "QShortcut"
+msgid "Browser"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:461
-msgid "Scroll left"
+#: gui/kernel/qkeysequence.cpp:505
+msgctxt "QShortcut"
+msgid "Game"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:461
-msgid "Scroll up"
+#: gui/kernel/qkeysequence.cpp:506
+msgctxt "QShortcut"
+msgid "Go"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:462
-msgid "Scroll right"
+#: gui/kernel/qkeysequence.cpp:507
+msgctxt "QShortcut"
+msgid "iTouch"
 msgstr ""
 
-#: gui/widgets/qscrollbar.cpp:462
-msgid "Scroll down"
+#: gui/kernel/qkeysequence.cpp:508
+msgctxt "QShortcut"
+msgid "Logoff"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:658
-msgctxt "QDialogButtonBox"
-msgid "&OK"
+#: gui/kernel/qkeysequence.cpp:509
+msgctxt "QShortcut"
+msgid "Market"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:658
-msgctxt "QDialogButtonBox"
-msgid "OK"
+#: gui/kernel/qkeysequence.cpp:510
+msgctxt "QShortcut"
+msgid "Meeting"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:661
-msgctxt "QDialogButtonBox"
-msgid "&Save"
+#: gui/kernel/qkeysequence.cpp:511
+msgctxt "QShortcut"
+msgid "Keyboard Menu"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:661
-msgctxt "QDialogButtonBox"
-msgid "Save"
+#: gui/kernel/qkeysequence.cpp:512
+msgctxt "QShortcut"
+msgid "Menu PB"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:664
-msgctxt "QDialogButtonBox"
-msgid "Open"
+#: gui/kernel/qkeysequence.cpp:513
+msgctxt "QShortcut"
+msgid "My Sites"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:667
-msgctxt "QDialogButtonBox"
-msgid "&Cancel"
+#: gui/kernel/qkeysequence.cpp:514
+msgctxt "QShortcut"
+msgid "News"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:667
-msgctxt "QDialogButtonBox"
-msgid "Cancel"
+#: gui/kernel/qkeysequence.cpp:515
+msgctxt "QShortcut"
+msgid "Home Office"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:670
-msgctxt "QDialogButtonBox"
-msgid "&Close"
+#: gui/kernel/qkeysequence.cpp:516
+msgctxt "QShortcut"
+msgid "Option"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:670
-msgctxt "QDialogButtonBox"
-msgid "Close"
+#: gui/kernel/qkeysequence.cpp:517
+msgctxt "QShortcut"
+msgid "Paste"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:673
-msgctxt "QDialogButtonBox"
-msgid "Apply"
+#: gui/kernel/qkeysequence.cpp:518
+msgctxt "QShortcut"
+msgid "Phone"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:676
-msgctxt "QDialogButtonBox"
-msgid "Reset"
+#: gui/kernel/qkeysequence.cpp:519
+msgctxt "QShortcut"
+msgid "Reply"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:679
-msgctxt "QDialogButtonBox"
-msgid "Help"
+#: gui/kernel/qkeysequence.cpp:520
+msgctxt "QShortcut"
+msgid "Reload"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:683
-msgctxt "QDialogButtonBox"
-msgid "Don't Save"
+#: gui/kernel/qkeysequence.cpp:521
+msgctxt "QShortcut"
+msgid "Rotate Windows"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:685
-msgctxt "QDialogButtonBox"
-msgid "Close without Saving"
+#: gui/kernel/qkeysequence.cpp:522
+msgctxt "QShortcut"
+msgid "Rotation PB"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:687
-msgctxt "QDialogButtonBox"
-msgid "Discard"
+#: gui/kernel/qkeysequence.cpp:523
+msgctxt "QShortcut"
+msgid "Rotation KB"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:690
-msgctxt "QDialogButtonBox"
-msgid "&Yes"
+#: gui/kernel/qkeysequence.cpp:524
+msgctxt "QShortcut"
+msgid "Save"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:693
-msgctxt "QDialogButtonBox"
-msgid "Yes to &All"
+#: gui/kernel/qkeysequence.cpp:525
+msgctxt "QShortcut"
+msgid "Send"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:696
-msgctxt "QDialogButtonBox"
-msgid "&No"
+#: gui/kernel/qkeysequence.cpp:526
+msgctxt "QShortcut"
+msgid "Spellchecker"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:699
-msgctxt "QDialogButtonBox"
-msgid "N&o to All"
+#: gui/kernel/qkeysequence.cpp:527
+msgctxt "QShortcut"
+msgid "Split Screen"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:702
-msgctxt "QDialogButtonBox"
-msgid "Save All"
+#: gui/kernel/qkeysequence.cpp:528
+msgctxt "QShortcut"
+msgid "Support"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:705
-msgctxt "QDialogButtonBox"
-msgid "Abort"
+#: gui/kernel/qkeysequence.cpp:529
+msgctxt "QShortcut"
+msgid "Task Panel"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:708
-msgctxt "QDialogButtonBox"
-msgid "Retry"
+#: gui/kernel/qkeysequence.cpp:530
+msgctxt "QShortcut"
+msgid "Terminal"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:711
-msgctxt "QDialogButtonBox"
-msgid "Ignore"
+#: gui/kernel/qkeysequence.cpp:531
+msgctxt "QShortcut"
+msgid "Tools"
 msgstr ""
 
-#: gui/widgets/qdialogbuttonbox.cpp:714
-msgctxt "QDialogButtonBox"
-msgid "Restore Defaults"
+#: gui/kernel/qkeysequence.cpp:532
+msgctxt "QShortcut"
+msgid "Travel"
 msgstr ""
 
-#: gui/widgets/qworkspace.cpp:1106 gui/widgets/qworkspace.cpp:2164
-msgid "Sh&ade"
-msgstr "Cys&godi"
-
-#: gui/widgets/qworkspace.cpp:2160
-msgid "&Unshade"
-msgstr "&Dat-gysgodi"
-
-#: gui/widgets/qtabbar.cpp:2322
-msgid "Close Tab"
+#: gui/kernel/qkeysequence.cpp:533
+msgctxt "QShortcut"
+msgid "Video"
 msgstr ""
 
-#: gui/widgets/qmenubar.cpp:1927
-msgctxt "QMenuBar"
-msgid "Corner Toolbar"
+#: gui/kernel/qkeysequence.cpp:534
+msgctxt "QShortcut"
+msgid "Word Processor"
 msgstr ""
 
-#: gui/widgets/qmdiarea.cpp:290
-msgid "(Untitled)"
+#: gui/kernel/qkeysequence.cpp:535
+msgctxt "QShortcut"
+msgid "XFer"
 msgstr ""
 
-#: gui/widgets/qdatetimeedit.cpp:2289
-msgid "AM"
+#: gui/kernel/qkeysequence.cpp:536
+msgctxt "QShortcut"
+msgid "Zoom In"
 msgstr ""
 
-#: gui/widgets/qdatetimeedit.cpp:2289
-msgid "am"
-msgstr "yb"
-
-#: gui/widgets/qdatetimeedit.cpp:2291
-msgid "PM"
+#: gui/kernel/qkeysequence.cpp:537
+msgctxt "QShortcut"
+msgid "Zoom Out"
 msgstr ""
 
-#: gui/widgets/qdatetimeedit.cpp:2291
-msgid "pm"
-msgstr "yp"
+#: gui/kernel/qkeysequence.cpp:538
+msgctxt "QShortcut"
+msgid "Away"
+msgstr ""
 
-#: gui/text/qfontdatabase.cpp:108 gui/text/qfontdatabase.cpp:1526
-msgctxt "QFontDatabase"
-msgid "Normal"
+#: gui/kernel/qkeysequence.cpp:539
+msgctxt "QShortcut"
+msgid "Messenger"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:111 gui/text/qfontdatabase.cpp:123
-#: gui/text/qfontdatabase.cpp:1514
-msgctxt "QFontDatabase"
-msgid "Bold"
+#: gui/kernel/qkeysequence.cpp:540
+msgctxt "QShortcut"
+msgid "WebCam"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:114 gui/text/qfontdatabase.cpp:1516
-msgctxt "QFontDatabase"
-msgid "Demi Bold"
+#: gui/kernel/qkeysequence.cpp:541
+msgctxt "QShortcut"
+msgid "Mail Forward"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:117 gui/text/qfontdatabase.cpp:135
-#: gui/text/qfontdatabase.cpp:1512
-msgctxt "QFontDatabase"
-msgid "Black"
+#: gui/kernel/qkeysequence.cpp:542
+msgctxt "QShortcut"
+msgid "Pictures"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:125
-msgctxt "QFontDatabase"
-msgid "Demi"
+#: gui/kernel/qkeysequence.cpp:543
+msgctxt "QShortcut"
+msgid "Music"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:131 gui/text/qfontdatabase.cpp:1518
-msgctxt "QFontDatabase"
-msgid "Light"
+#: gui/kernel/qkeysequence.cpp:544
+msgctxt "QShortcut"
+msgid "Battery"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:301 gui/text/qfontdatabase.cpp:1521
-msgctxt "QFontDatabase"
-msgid "Italic"
+#: gui/kernel/qkeysequence.cpp:545
+msgctxt "QShortcut"
+msgid "Bluetooth"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:304 gui/text/qfontdatabase.cpp:1523
-msgctxt "QFontDatabase"
-msgid "Oblique"
+#: gui/kernel/qkeysequence.cpp:546
+msgctxt "QShortcut"
+msgid "Wireless"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2252
-msgctxt "QFontDatabase"
-msgid "Any"
+#: gui/kernel/qkeysequence.cpp:547
+msgctxt "QShortcut"
+msgid "Ultra Wide Band"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2255
-msgctxt "QFontDatabase"
-msgid "Latin"
+#: gui/kernel/qkeysequence.cpp:548
+msgctxt "QShortcut"
+msgid "Audio Forward"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2258
-msgctxt "QFontDatabase"
-msgid "Greek"
+#: gui/kernel/qkeysequence.cpp:549
+msgctxt "QShortcut"
+msgid "Audio Repeat"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2261
-msgctxt "QFontDatabase"
-msgid "Cyrillic"
+#: gui/kernel/qkeysequence.cpp:550
+msgctxt "QShortcut"
+msgid "Audio Random Play"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2264
-msgctxt "QFontDatabase"
-msgid "Armenian"
+#: gui/kernel/qkeysequence.cpp:551
+msgctxt "QShortcut"
+msgid "Subtitle"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2267
-msgctxt "QFontDatabase"
-msgid "Hebrew"
+#: gui/kernel/qkeysequence.cpp:552
+msgctxt "QShortcut"
+msgid "Audio Cycle Track"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2270
-msgctxt "QFontDatabase"
-msgid "Arabic"
+#: gui/kernel/qkeysequence.cpp:553
+msgctxt "QShortcut"
+msgid "Time"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2273
-msgctxt "QFontDatabase"
-msgid "Syriac"
+#: gui/kernel/qkeysequence.cpp:554 gui/kernel/qkeysequence.cpp:576
+msgctxt "QShortcut"
+msgid "Select"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2276
-msgctxt "QFontDatabase"
-msgid "Thaana"
+#: gui/kernel/qkeysequence.cpp:555
+msgctxt "QShortcut"
+msgid "View"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2279
-msgctxt "QFontDatabase"
-msgid "Devanagari"
+#: gui/kernel/qkeysequence.cpp:556
+msgctxt "QShortcut"
+msgid "Top Menu"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2282
-msgctxt "QFontDatabase"
-msgid "Bengali"
+#: gui/kernel/qkeysequence.cpp:557
+msgctxt "QShortcut"
+msgid "Suspend"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2285
-msgctxt "QFontDatabase"
-msgid "Gurmukhi"
+#: gui/kernel/qkeysequence.cpp:558
+msgctxt "QShortcut"
+msgid "Hibernate"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2288
-msgctxt "QFontDatabase"
-msgid "Gujarati"
+#: gui/kernel/qkeysequence.cpp:562
+msgctxt "QShortcut"
+msgid "Print Screen"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2291
-msgctxt "QFontDatabase"
-msgid "Oriya"
+#: gui/kernel/qkeysequence.cpp:563
+msgctxt "QShortcut"
+msgid "Page Up"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2294
-msgctxt "QFontDatabase"
-msgid "Tamil"
+#: gui/kernel/qkeysequence.cpp:564
+msgctxt "QShortcut"
+msgid "Page Down"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2297
-msgctxt "QFontDatabase"
-msgid "Telugu"
+#: gui/kernel/qkeysequence.cpp:565
+msgctxt "QShortcut"
+msgid "Caps Lock"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2300
-msgctxt "QFontDatabase"
-msgid "Kannada"
+#: gui/kernel/qkeysequence.cpp:566
+msgctxt "QShortcut"
+msgid "Num Lock"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2303
-msgctxt "QFontDatabase"
-msgid "Malayalam"
+#: gui/kernel/qkeysequence.cpp:567
+msgctxt "QShortcut"
+msgid "Number Lock"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2306
-msgctxt "QFontDatabase"
-msgid "Sinhala"
+#: gui/kernel/qkeysequence.cpp:568
+msgctxt "QShortcut"
+msgid "Scroll Lock"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2309
-msgctxt "QFontDatabase"
-msgid "Thai"
+#: gui/kernel/qkeysequence.cpp:569
+msgctxt "QShortcut"
+msgid "Insert"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2312
-msgctxt "QFontDatabase"
-msgid "Lao"
-msgstr ""
-
-#: gui/text/qfontdatabase.cpp:2315
-msgctxt "QFontDatabase"
-msgid "Tibetan"
-msgstr ""
-
-#: gui/text/qfontdatabase.cpp:2318
-msgctxt "QFontDatabase"
-msgid "Myanmar"
-msgstr ""
-
-#: gui/text/qfontdatabase.cpp:2321
-msgctxt "QFontDatabase"
-msgid "Georgian"
+#: gui/kernel/qkeysequence.cpp:570
+msgctxt "QShortcut"
+msgid "Delete"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2324
-msgctxt "QFontDatabase"
-msgid "Khmer"
+#: gui/kernel/qkeysequence.cpp:571
+msgctxt "QShortcut"
+msgid "Escape"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2327
-msgctxt "QFontDatabase"
-msgid "Simplified Chinese"
+#: gui/kernel/qkeysequence.cpp:572
+msgctxt "QShortcut"
+msgid "System Request"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2330
-msgctxt "QFontDatabase"
-msgid "Traditional Chinese"
+#: gui/kernel/qkeysequence.cpp:577
+msgctxt "QShortcut"
+msgid "Yes"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2333
-msgctxt "QFontDatabase"
-msgid "Japanese"
+#: gui/kernel/qkeysequence.cpp:578
+msgctxt "QShortcut"
+msgid "No"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2336
-msgctxt "QFontDatabase"
-msgid "Korean"
+#: gui/kernel/qkeysequence.cpp:582
+msgctxt "QShortcut"
+msgid "Context1"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2339
-msgctxt "QFontDatabase"
-msgid "Vietnamese"
+#: gui/kernel/qkeysequence.cpp:583
+msgctxt "QShortcut"
+msgid "Context2"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2342
-msgctxt "QFontDatabase"
-msgid "Symbol"
+#: gui/kernel/qkeysequence.cpp:584
+msgctxt "QShortcut"
+msgid "Context3"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2345
-msgctxt "QFontDatabase"
-msgid "Ogham"
+#: gui/kernel/qkeysequence.cpp:585
+msgctxt "QShortcut"
+msgid "Context4"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2348
-msgctxt "QFontDatabase"
-msgid "Runic"
+#: gui/kernel/qkeysequence.cpp:587
+msgctxt "QShortcut"
+msgid "Call"
 msgstr ""
 
-#: gui/text/qfontdatabase.cpp:2351
-msgctxt "QFontDatabase"
-msgid "N'Ko"
+#: gui/kernel/qkeysequence.cpp:589
+msgctxt "QShortcut"
+msgid "Hangup"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:2127
-msgid "Copy &Link Location"
+#: gui/kernel/qkeysequence.cpp:591
+msgctxt "QShortcut"
+msgid "Toggle Call/Hangup"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3068
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "LRM Left-to-right mark"
+#: gui/kernel/qkeysequence.cpp:592
+msgctxt "QShortcut"
+msgid "Flip"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3069
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "RLM Right-to-left mark"
+#: gui/kernel/qkeysequence.cpp:594
+msgctxt "QShortcut"
+msgid "Voice Dial"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3070
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "ZWJ Zero width joiner"
+#: gui/kernel/qkeysequence.cpp:596
+msgctxt "QShortcut"
+msgid "Last Number Redial"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3071
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "ZWNJ Zero width non-joiner"
+#: gui/kernel/qkeysequence.cpp:598
+msgctxt "QShortcut"
+msgid "Camera Shutter"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3072
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "ZWSP Zero width space"
+#: gui/kernel/qkeysequence.cpp:600
+msgctxt "QShortcut"
+msgid "Camera Focus"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3073
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "LRE Start of left-to-right embedding"
+#: gui/kernel/qkeysequence.cpp:604
+msgctxt "QShortcut"
+msgid "Kanji"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3074
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "RLE Start of right-to-left embedding"
+#: gui/kernel/qkeysequence.cpp:605
+msgctxt "QShortcut"
+msgid "Muhenkan"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3075
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "LRO Start of left-to-right override"
+#: gui/kernel/qkeysequence.cpp:606
+msgctxt "QShortcut"
+msgid "Henkan"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3076
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "RLO Start of right-to-left override"
+#: gui/kernel/qkeysequence.cpp:607
+msgctxt "QShortcut"
+msgid "Romaji"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3077
-msgctxt "QUnicodeControlCharacterMenu"
-msgid "PDF Pop directional formatting"
+#: gui/kernel/qkeysequence.cpp:608
+msgctxt "QShortcut"
+msgid "Hiragana"
 msgstr ""
 
-#: gui/text/qtextcontrol.cpp:3083
-msgid "Insert Unicode control character"
+#: gui/kernel/qkeysequence.cpp:609
+msgctxt "QShortcut"
+msgid "Katakana"
 msgstr ""
 
-#: gui/kernel/qsoftkeymanager.cpp:67
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:67
-msgid "Select"
+#: gui/kernel/qkeysequence.cpp:610
+msgctxt "QShortcut"
+msgid "Hiragana Katakana"
 msgstr ""
 
-#: gui/kernel/qsoftkeymanager_s60.cpp:373
-msgid "Exit"
+#: gui/kernel/qkeysequence.cpp:611
+msgctxt "QShortcut"
+msgid "Zenkaku"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2423
-msgctxt ""
-"Translate this string to the string 'LTR' in left-to-right languages or to "
-"'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper "
-"widget layout."
-msgid "QT_LAYOUT_DIRECTION"
+#: gui/kernel/qkeysequence.cpp:612
+msgctxt "QShortcut"
+msgid "Hankaku"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2430
-msgctxt "MAC_APPLICATION_MENU"
-msgid "Services"
+#: gui/kernel/qkeysequence.cpp:613
+msgctxt "QShortcut"
+msgid "Zenkaku Hankaku"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2431
-#, qt-format
-msgctxt "MAC_APPLICATION_MENU"
-msgid "Hide %1"
+#: gui/kernel/qkeysequence.cpp:614
+msgctxt "QShortcut"
+msgid "Touroku"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2432
-msgctxt "MAC_APPLICATION_MENU"
-msgid "Hide Others"
+#: gui/kernel/qkeysequence.cpp:615
+msgctxt "QShortcut"
+msgid "Massyo"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2433
-msgctxt "MAC_APPLICATION_MENU"
-msgid "Show All"
+#: gui/kernel/qkeysequence.cpp:616
+msgctxt "QShortcut"
+msgid "Kana Lock"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2434
-msgctxt "MAC_APPLICATION_MENU"
-msgid "Preferences..."
+#: gui/kernel/qkeysequence.cpp:617
+msgctxt "QShortcut"
+msgid "Kana Shift"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2435
-#, qt-format
-msgctxt "MAC_APPLICATION_MENU"
-msgid "Quit %1"
+#: gui/kernel/qkeysequence.cpp:618
+msgctxt "QShortcut"
+msgid "Eisu Shift"
 msgstr ""
 
-#: gui/kernel/qapplication.cpp:2436
-#, qt-format
-msgctxt "MAC_APPLICATION_MENU"
-msgid "About %1"
+#: gui/kernel/qkeysequence.cpp:619
+msgctxt "QShortcut"
+msgid "Eisu toggle"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:396
+#: gui/kernel/qkeysequence.cpp:620
 msgctxt "QShortcut"
-msgid "Space"
+msgid "Code input"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:397
+#: gui/kernel/qkeysequence.cpp:621
 msgctxt "QShortcut"
-msgid "Esc"
+msgid "Multiple Candidate"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:398
+#: gui/kernel/qkeysequence.cpp:622
 msgctxt "QShortcut"
-msgid "Tab"
+msgid "Previous Candidate"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:399
+#: gui/kernel/qkeysequence.cpp:626
 msgctxt "QShortcut"
-msgid "Backtab"
+msgid "Hangul"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:400
+#: gui/kernel/qkeysequence.cpp:627
 msgctxt "QShortcut"
-msgid "Backspace"
+msgid "Hangul Start"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:401
+#: gui/kernel/qkeysequence.cpp:628
 msgctxt "QShortcut"
-msgid "Return"
+msgid "Hangul End"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:402
+#: gui/kernel/qkeysequence.cpp:629
 msgctxt "QShortcut"
-msgid "Enter"
+msgid "Hangul Hanja"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:403
+#: gui/kernel/qkeysequence.cpp:630
 msgctxt "QShortcut"
-msgid "Ins"
+msgid "Hangul Jamo"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:404
+#: gui/kernel/qkeysequence.cpp:631
 msgctxt "QShortcut"
-msgid "Del"
+msgid "Hangul Romaja"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:405
+#: gui/kernel/qkeysequence.cpp:632
 msgctxt "QShortcut"
-msgid "Pause"
+msgid "Hangul Jeonja"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:406
+#: gui/kernel/qkeysequence.cpp:633
 msgctxt "QShortcut"
-msgid "Print"
+msgid "Hangul Banja"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:407
+#: gui/kernel/qkeysequence.cpp:634
 msgctxt "QShortcut"
-msgid "SysReq"
+msgid "Hangul PreHanja"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:408
+#: gui/kernel/qkeysequence.cpp:635
 msgctxt "QShortcut"
-msgid "Home"
+msgid "Hangul PostHanja"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:409
+#: gui/kernel/qkeysequence.cpp:636
 msgctxt "QShortcut"
-msgid "End"
+msgid "Hangul Special"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:410
-msgctxt "QShortcut"
-msgid "Left"
-msgstr ""
+#: gui/kernel/qkeysequence.cpp:1237 gui/kernel/qkeysequence.cpp:1372
+msgid "Ctrl"
+msgstr "Rheoli (Ctrl)"
 
-#: gui/kernel/qkeysequence.cpp:411
-msgctxt "QShortcut"
-msgid "Up"
-msgstr ""
+#: gui/kernel/qkeysequence.cpp:1238 gui/kernel/qkeysequence.cpp:1376
+msgid "Shift"
+msgstr "Syflyd (Shift)"
 
-#: gui/kernel/qkeysequence.cpp:412
-msgctxt "QShortcut"
-msgid "Right"
-msgstr ""
+#: gui/kernel/qkeysequence.cpp:1239 gui/kernel/qkeysequence.cpp:1374
+msgid "Alt"
+msgstr "Arall (Alt)"
 
-#: gui/kernel/qkeysequence.cpp:413
-msgctxt "QShortcut"
-msgid "Down"
-msgstr ""
+#: gui/kernel/qkeysequence.cpp:1240 gui/kernel/qkeysequence.cpp:1370
+msgid "Meta"
+msgstr "Meta"
 
-#: gui/kernel/qkeysequence.cpp:414
-msgctxt "QShortcut"
-msgid "PgUp"
-msgstr ""
+#: gui/kernel/qkeysequence.cpp:1330
+msgid "+"
+msgstr "+"
 
-#: gui/kernel/qkeysequence.cpp:415
-msgctxt "QShortcut"
-msgid "PgDown"
-msgstr ""
+#: gui/kernel/qkeysequence.cpp:1391
+#, qt-format
+msgid "F%1"
+msgstr "F%1"
 
-#: gui/kernel/qkeysequence.cpp:416
-msgctxt "QShortcut"
-msgid "CapsLock"
+#: gui/kernel/qsoftkeymanager_s60.cpp:373
+msgid "Exit"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:417
-msgctxt "QShortcut"
-msgid "NumLock"
+#: gui/kernel/qapplication.cpp:2427
+msgctxt ""
+"Translate this string to the string 'LTR' in left-to-right languages or to "
+"'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper "
+"widget layout."
+msgid "QT_LAYOUT_DIRECTION"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:418
-msgctxt "QShortcut"
-msgid "ScrollLock"
+#: gui/kernel/qapplication.cpp:2434
+msgctxt "MAC_APPLICATION_MENU"
+msgid "Services"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:419
-msgctxt "QShortcut"
-msgid "Menu"
+#: gui/kernel/qapplication.cpp:2435
+#, qt-format
+msgctxt "MAC_APPLICATION_MENU"
+msgid "Hide %1"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:420
-msgctxt "QShortcut"
-msgid "Help"
+#: gui/kernel/qapplication.cpp:2436
+msgctxt "MAC_APPLICATION_MENU"
+msgid "Hide Others"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:425
-msgctxt "QShortcut"
-msgid "Back"
+#: gui/kernel/qapplication.cpp:2437
+msgctxt "MAC_APPLICATION_MENU"
+msgid "Show All"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:426
-msgctxt "QShortcut"
-msgid "Forward"
+#: gui/kernel/qapplication.cpp:2438
+msgctxt "MAC_APPLICATION_MENU"
+msgid "Preferences..."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:427
-msgctxt "QShortcut"
-msgid "Stop"
+#: gui/kernel/qapplication.cpp:2439
+#, qt-format
+msgctxt "MAC_APPLICATION_MENU"
+msgid "Quit %1"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:428
-msgctxt "QShortcut"
-msgid "Refresh"
+#: gui/kernel/qapplication.cpp:2440
+#, qt-format
+msgctxt "MAC_APPLICATION_MENU"
+msgid "About %1"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:429
-msgctxt "QShortcut"
-msgid "Volume Down"
+#: gui/kernel/qsoftkeymanager.cpp:67
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:67
+msgid "Select"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:430
-msgctxt "QShortcut"
-msgid "Volume Mute"
+#: gui/kernel/qwidget.cpp:6050
+msgid "*"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:431
-msgctxt "QShortcut"
-msgid "Volume Up"
+#: gui/widgets/qmenubar.cpp:1929
+msgctxt "QMenuBar"
+msgid "Corner Toolbar"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:432
-msgctxt "QShortcut"
-msgid "Bass Boost"
+#: gui/widgets/qdatetimeedit.cpp:2289
+msgid "AM"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:433
-msgctxt "QShortcut"
-msgid "Bass Up"
-msgstr ""
+#: gui/widgets/qdatetimeedit.cpp:2289
+msgid "am"
+msgstr "yb"
 
-#: gui/kernel/qkeysequence.cpp:434
-msgctxt "QShortcut"
-msgid "Bass Down"
+#: gui/widgets/qdatetimeedit.cpp:2291
+msgid "PM"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:435
-msgctxt "QShortcut"
-msgid "Treble Up"
-msgstr ""
+#: gui/widgets/qdatetimeedit.cpp:2291
+msgid "pm"
+msgstr "yp"
 
-#: gui/kernel/qkeysequence.cpp:436
-msgctxt "QShortcut"
-msgid "Treble Down"
-msgstr ""
+#: gui/widgets/qworkspace.cpp:113 gui/widgets/qmdisubwindow.cpp:352
+#: plugins/accessible/widgets/complexwidgets.cpp:1614
+#: plugins/accessible/widgets/complexwidgets.cpp:1910
+#: plugins/accessible/widgets/qaccessiblewidgets.cpp:1277
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:157
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:382
+#: plugins/accessible/compat/q3complexwidgets.cpp:256
+#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:141
+#: scripttools/debugging/qscriptbreakpointswidget.cpp:81
+msgid "Close"
+msgstr "Cau"
 
-#: gui/kernel/qkeysequence.cpp:437
-msgctxt "QShortcut"
-msgid "Media Play"
-msgstr ""
+#: gui/widgets/qworkspace.cpp:115 gui/widgets/qmdisubwindow.cpp:334
+#: plugins/accessible/compat/q3complexwidgets.cpp:250
+msgid "Minimize"
+msgstr "Lleihau"
 
-#: gui/kernel/qkeysequence.cpp:438
-msgctxt "QShortcut"
-msgid "Media Stop"
+#: gui/widgets/qworkspace.cpp:117 gui/widgets/qmdisubwindow.cpp:347
+msgid "Restore Down"
+msgstr "Adfer i Lawr"
+
+#: gui/widgets/qworkspace.cpp:1089 gui/widgets/qmdisubwindow.cpp:1054
+msgid "&Restore"
+msgstr "Ad&fer"
+
+#: gui/widgets/qworkspace.cpp:1090 gui/widgets/qmdisubwindow.cpp:1057
+msgid "&Move"
+msgstr "&Symud"
+
+#: gui/widgets/qworkspace.cpp:1093 gui/widgets/qmdisubwindow.cpp:1059
+msgid "Mi&nimize"
+msgstr "&Lleihau"
+
+#: gui/widgets/qworkspace.cpp:1095 gui/widgets/qmdisubwindow.cpp:1061
+msgid "Ma&ximize"
+msgstr "&Chwyddo"
+
+#: gui/widgets/qworkspace.cpp:1097 gui/widgets/qmdisubwindow.cpp:1066
+msgid "&Close"
+msgstr "&Cau"
+
+#: gui/widgets/qworkspace.cpp:1103 gui/widgets/qmdisubwindow.cpp:1063
+msgid "Stay on &Top"
+msgstr "Aros ar &Ben"
+
+#: gui/widgets/qworkspace.cpp:1106 gui/widgets/qworkspace.cpp:2164
+msgid "Sh&ade"
+msgstr "Cys&godi"
+
+#: gui/widgets/qworkspace.cpp:1886 gui/widgets/qworkspace.cpp:1946
+#: gui/widgets/qmdisubwindow.cpp:280
+#, qt-format
+msgid "%1 - [%2]"
+msgstr "%1 - [%2]"
+
+#: gui/widgets/qworkspace.cpp:2160
+msgid "&Unshade"
+msgstr "&Dat-gysgodi"
+
+#: gui/widgets/qmdisubwindow.cpp:279
+#, qt-format
+msgid "- [%1]"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:439
-msgctxt "QShortcut"
-msgid "Media Previous"
+#: gui/widgets/qmdisubwindow.cpp:337
+#: plugins/accessible/compat/q3complexwidgets.cpp:254
+msgid "Maximize"
+msgstr "Chwyddo"
+
+#: gui/widgets/qmdisubwindow.cpp:340
+msgid "Unshade"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:440
-msgctxt "QShortcut"
-msgid "Media Next"
+#: gui/widgets/qmdisubwindow.cpp:343
+msgid "Shade"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:441
-msgctxt "QShortcut"
-msgid "Media Record"
+#: gui/widgets/qmdisubwindow.cpp:349
+msgid "Restore"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:443
-msgctxt "QShortcut"
-msgid "Media Pause"
+#: gui/widgets/qmdisubwindow.cpp:358
+msgid "Menu"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:445
-msgctxt "QShortcut"
-msgid "Toggle Media Play/Pause"
+#: gui/widgets/qmdiarea.cpp:290
+msgid "(Untitled)"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:446
-msgctxt "QShortcut"
-msgid "Home Page"
+#: gui/widgets/qtabbar.cpp:2324
+msgid "Close Tab"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:447
-msgctxt "QShortcut"
-msgid "Favorites"
+#: gui/widgets/qabstractspinbox.cpp:1257
+msgid "&Select All"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:448
-msgctxt "QShortcut"
-msgid "Search"
+#: gui/widgets/qabstractspinbox.cpp:1263
+msgid "&Step up"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:449
-msgctxt "QShortcut"
-msgid "Standby"
+#: gui/widgets/qabstractspinbox.cpp:1265
+msgid "Step &down"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:450
-msgctxt "QShortcut"
-msgid "Open URL"
+#: gui/widgets/qmenu_symbian.cpp:457
+msgid "Actions"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:451
-msgctxt "QShortcut"
-msgid "Launch Mail"
+#: gui/widgets/qscrollbar.cpp:453
+msgid "Scroll here"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:452
-msgctxt "QShortcut"
-msgid "Launch Media"
+#: gui/widgets/qscrollbar.cpp:455
+msgid "Left edge"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:453
-msgctxt "QShortcut"
-msgid "Launch (0)"
-msgstr ""
+#: gui/widgets/qscrollbar.cpp:455
+msgid "Top"
+msgstr "Top"
 
-#: gui/kernel/qkeysequence.cpp:454
-msgctxt "QShortcut"
-msgid "Launch (1)"
+#: gui/widgets/qscrollbar.cpp:456
+msgid "Right edge"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:455
-msgctxt "QShortcut"
-msgid "Launch (2)"
-msgstr ""
+#: gui/widgets/qscrollbar.cpp:456
+msgid "Bottom"
+msgstr "Gwaelod"
 
-#: gui/kernel/qkeysequence.cpp:456
-msgctxt "QShortcut"
-msgid "Launch (3)"
+#: gui/widgets/qscrollbar.cpp:458
+#: plugins/accessible/widgets/rangecontrols.cpp:706
+msgid "Page left"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:457
-msgctxt "QShortcut"
-msgid "Launch (4)"
+#: gui/widgets/qscrollbar.cpp:458
+#: plugins/accessible/widgets/rangecontrols.cpp:553
+#: plugins/accessible/widgets/rangecontrols.cpp:706
+msgid "Page up"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:458
-msgctxt "QShortcut"
-msgid "Launch (5)"
+#: gui/widgets/qscrollbar.cpp:459
+#: plugins/accessible/widgets/rangecontrols.cpp:711
+msgid "Page right"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:459
-msgctxt "QShortcut"
-msgid "Launch (6)"
+#: gui/widgets/qscrollbar.cpp:459
+#: plugins/accessible/widgets/rangecontrols.cpp:557
+#: plugins/accessible/widgets/rangecontrols.cpp:711
+msgid "Page down"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:460
-msgctxt "QShortcut"
-msgid "Launch (7)"
+#: gui/widgets/qscrollbar.cpp:461
+msgid "Scroll left"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:461
-msgctxt "QShortcut"
-msgid "Launch (8)"
+#: gui/widgets/qscrollbar.cpp:461
+msgid "Scroll up"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:462
-msgctxt "QShortcut"
-msgid "Launch (9)"
+#: gui/widgets/qscrollbar.cpp:462
+msgid "Scroll right"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:463
-msgctxt "QShortcut"
-msgid "Launch (A)"
+#: gui/widgets/qscrollbar.cpp:462
+msgid "Scroll down"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:464
-msgctxt "QShortcut"
-msgid "Launch (B)"
+#: gui/widgets/qdialogbuttonbox.cpp:658
+msgctxt "QDialogButtonBox"
+msgid "&OK"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:465
-msgctxt "QShortcut"
-msgid "Launch (C)"
+#: gui/widgets/qdialogbuttonbox.cpp:658
+msgctxt "QDialogButtonBox"
+msgid "OK"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:466
-msgctxt "QShortcut"
-msgid "Launch (D)"
+#: gui/widgets/qdialogbuttonbox.cpp:661
+msgctxt "QDialogButtonBox"
+msgid "&Save"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:467
-msgctxt "QShortcut"
-msgid "Launch (E)"
+#: gui/widgets/qdialogbuttonbox.cpp:661
+msgctxt "QDialogButtonBox"
+msgid "Save"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:468
-msgctxt "QShortcut"
-msgid "Launch (F)"
+#: gui/widgets/qdialogbuttonbox.cpp:664
+msgctxt "QDialogButtonBox"
+msgid "Open"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:469
-msgctxt "QShortcut"
-msgid "Monitor Brightness Up"
+#: gui/widgets/qdialogbuttonbox.cpp:667
+msgctxt "QDialogButtonBox"
+msgid "&Cancel"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:470
-msgctxt "QShortcut"
-msgid "Monitor Brightness Down"
+#: gui/widgets/qdialogbuttonbox.cpp:667
+msgctxt "QDialogButtonBox"
+msgid "Cancel"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:471
-msgctxt "QShortcut"
-msgid "Keyboard Light On/Off"
+#: gui/widgets/qdialogbuttonbox.cpp:670
+msgctxt "QDialogButtonBox"
+msgid "&Close"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:472
-msgctxt "QShortcut"
-msgid "Keyboard Brightness Up"
+#: gui/widgets/qdialogbuttonbox.cpp:670
+msgctxt "QDialogButtonBox"
+msgid "Close"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:473
-msgctxt "QShortcut"
-msgid "Keyboard Brightness Down"
+#: gui/widgets/qdialogbuttonbox.cpp:673
+msgctxt "QDialogButtonBox"
+msgid "Apply"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:474
-msgctxt "QShortcut"
-msgid "Power Off"
+#: gui/widgets/qdialogbuttonbox.cpp:676
+msgctxt "QDialogButtonBox"
+msgid "Reset"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:475
-msgctxt "QShortcut"
-msgid "Wake Up"
+#: gui/widgets/qdialogbuttonbox.cpp:679
+msgctxt "QDialogButtonBox"
+msgid "Help"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:476
-msgctxt "QShortcut"
-msgid "Eject"
+#: gui/widgets/qdialogbuttonbox.cpp:683
+msgctxt "QDialogButtonBox"
+msgid "Don't Save"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:477
-msgctxt "QShortcut"
-msgid "Screensaver"
+#: gui/widgets/qdialogbuttonbox.cpp:685
+msgctxt "QDialogButtonBox"
+msgid "Close without Saving"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:478
-msgctxt "QShortcut"
-msgid "WWW"
+#: gui/widgets/qdialogbuttonbox.cpp:687
+msgctxt "QDialogButtonBox"
+msgid "Discard"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:479
-msgctxt "QShortcut"
-msgid "Sleep"
+#: gui/widgets/qdialogbuttonbox.cpp:690
+msgctxt "QDialogButtonBox"
+msgid "&Yes"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:480
-msgctxt "QShortcut"
-msgid "LightBulb"
+#: gui/widgets/qdialogbuttonbox.cpp:693
+msgctxt "QDialogButtonBox"
+msgid "Yes to &All"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:481
-msgctxt "QShortcut"
-msgid "Shop"
+#: gui/widgets/qdialogbuttonbox.cpp:696
+msgctxt "QDialogButtonBox"
+msgid "&No"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:482
-msgctxt "QShortcut"
-msgid "History"
+#: gui/widgets/qdialogbuttonbox.cpp:699
+msgctxt "QDialogButtonBox"
+msgid "N&o to All"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:483
-msgctxt "QShortcut"
-msgid "Add Favorite"
+#: gui/widgets/qdialogbuttonbox.cpp:702
+msgctxt "QDialogButtonBox"
+msgid "Save All"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:484
-msgctxt "QShortcut"
-msgid "Hot Links"
+#: gui/widgets/qdialogbuttonbox.cpp:705
+msgctxt "QDialogButtonBox"
+msgid "Abort"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:485
-msgctxt "QShortcut"
-msgid "Adjust Brightness"
+#: gui/widgets/qdialogbuttonbox.cpp:708
+msgctxt "QDialogButtonBox"
+msgid "Retry"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:486
-msgctxt "QShortcut"
-msgid "Finance"
+#: gui/widgets/qdialogbuttonbox.cpp:711
+msgctxt "QDialogButtonBox"
+msgid "Ignore"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:487
-msgctxt "QShortcut"
-msgid "Community"
+#: gui/widgets/qdialogbuttonbox.cpp:714
+msgctxt "QDialogButtonBox"
+msgid "Restore Defaults"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:488
-msgctxt "QShortcut"
-msgid "Audio Rewind"
+#: gui/itemviews/qdirmodel.cpp:852
+msgctxt "QFileDialog"
+msgid "My Computer"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:489
-msgctxt "QShortcut"
-msgid "Back Forward"
+#: gui/itemviews/qdirmodel.cpp:1341
+#, qt-format
+msgid "%1 byte(s)"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:490
-msgctxt "QShortcut"
-msgid "Application Left"
-msgstr ""
+#: gui/itemviews/qitemeditorfactory.cpp:556 qt3support/sql/q3datatable.cpp:286
+msgid "False"
+msgstr "Ffug"
 
-#: gui/kernel/qkeysequence.cpp:491
-msgctxt "QShortcut"
-msgid "Application Right"
+#: gui/itemviews/qitemeditorfactory.cpp:557 qt3support/sql/q3datatable.cpp:285
+msgid "True"
+msgstr "Gwir"
+
+#: gui/itemviews/qfileiconprovider.cpp:475
+msgctxt "QFileDialog"
+msgid "Drive"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:492
-msgctxt "QShortcut"
-msgid "Book"
+#: gui/itemviews/qfileiconprovider.cpp:478
+#: gui/itemviews/qfileiconprovider.cpp:479
+msgctxt "QFileDialog"
+msgid "File"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:493
-msgctxt "QShortcut"
-msgid "CD"
+#: gui/itemviews/qfileiconprovider.cpp:484
+msgctxt "Match Windows Explorer"
+msgid "File Folder"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:494
-msgctxt "QShortcut"
-msgid "Calculator"
+#: gui/itemviews/qfileiconprovider.cpp:486
+msgctxt "All other platforms"
+msgid "Folder"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:495
-msgctxt "QShortcut"
-msgid "Clear"
+#: gui/itemviews/qfileiconprovider.cpp:495
+msgctxt "Mac OS X Finder"
+msgid "Alias"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:496
-msgctxt "QShortcut"
-msgid "Clear Grab"
+#: gui/itemviews/qfileiconprovider.cpp:497
+msgctxt "All other platforms"
+msgid "Shortcut"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:497
-msgctxt "QShortcut"
-msgid "Close"
+#: gui/itemviews/qfileiconprovider.cpp:504
+msgctxt "QFileDialog"
+msgid "Unknown"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:498
-msgctxt "QShortcut"
-msgid "Copy"
+#: sql/drivers/oci/qsql_oci.cpp:1315 sql/drivers/oci/qsql_oci.cpp:1509
+#: sql/drivers/oci/qsql_oci.cpp:1524
+msgctxt "QOCIResult"
+msgid "Unable to bind column for batch execute"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:499
-msgctxt "QShortcut"
-msgid "Cut"
+#: sql/drivers/oci/qsql_oci.cpp:1539
+msgctxt "QOCIResult"
+msgid "Unable to execute batch statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:500
-msgctxt "QShortcut"
-msgid "Display"
+#: sql/drivers/oci/qsql_oci.cpp:1858
+msgctxt "QOCIResult"
+msgid "Unable to goto next"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:501
-msgctxt "QShortcut"
-msgid "DOS"
+#: sql/drivers/oci/qsql_oci.cpp:1917
+msgctxt "QOCIResult"
+msgid "Unable to alloc statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:502
-msgctxt "QShortcut"
-msgid "Documents"
+#: sql/drivers/oci/qsql_oci.cpp:1932
+msgctxt "QOCIResult"
+msgid "Unable to prepare statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:503
-msgctxt "QShortcut"
-msgid "Spreadsheet"
+#: sql/drivers/oci/qsql_oci.cpp:1958
+msgctxt "QOCIResult"
+msgid "Unable to get statement type"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:504
-msgctxt "QShortcut"
-msgid "Browser"
+#: sql/drivers/oci/qsql_oci.cpp:1977
+msgctxt "QOCIResult"
+msgid "Unable to bind value"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:505
-msgctxt "QShortcut"
-msgid "Game"
+#: sql/drivers/oci/qsql_oci.cpp:1997
+msgctxt "QOCIResult"
+msgid "Unable to execute statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:506
-msgctxt "QShortcut"
-msgid "Go"
+#: sql/drivers/oci/qsql_oci.cpp:2081
+msgctxt "QOCIDriver"
+msgid "Unable to initialize"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:507
-msgctxt "QShortcut"
-msgid "iTouch"
+#: sql/drivers/oci/qsql_oci.cpp:2225
+msgid "Unable to logon"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:508
-msgctxt "QShortcut"
-msgid "Logoff"
+#: sql/drivers/oci/qsql_oci.cpp:2297
+msgctxt "QOCIDriver"
+msgid "Unable to begin transaction"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:509
-msgctxt "QShortcut"
-msgid "Market"
+#: sql/drivers/oci/qsql_oci.cpp:2316
+msgctxt "QOCIDriver"
+msgid "Unable to commit transaction"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:510
-msgctxt "QShortcut"
-msgid "Meeting"
+#: sql/drivers/oci/qsql_oci.cpp:2335
+msgctxt "QOCIDriver"
+msgid "Unable to rollback transaction"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:511
-msgctxt "QShortcut"
-msgid "Keyboard Menu"
+#: sql/drivers/mysql/qsql_mysql.cpp:506 sql/drivers/mysql/qsql_mysql.cpp:537
+msgctxt "QMYSQLResult"
+msgid "Unable to fetch data"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:512
-msgctxt "QShortcut"
-msgid "Menu PB"
+#: sql/drivers/mysql/qsql_mysql.cpp:697
+msgctxt "QMYSQLResult"
+msgid "Unable to execute query"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:513
-msgctxt "QShortcut"
-msgid "My Sites"
+#: sql/drivers/mysql/qsql_mysql.cpp:703
+msgctxt "QMYSQLResult"
+msgid "Unable to store result"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:514
-msgctxt "QShortcut"
-msgid "News"
+#: sql/drivers/mysql/qsql_mysql.cpp:806
+msgctxt "QMYSQLResult"
+msgid "Unable to execute next query"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:515
-msgctxt "QShortcut"
-msgid "Home Office"
+#: sql/drivers/mysql/qsql_mysql.cpp:816
+msgctxt "QMYSQLResult"
+msgid "Unable to store next result"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:516
-msgctxt "QShortcut"
-msgid "Option"
+#: sql/drivers/mysql/qsql_mysql.cpp:894 sql/drivers/mysql/qsql_mysql.cpp:903
+msgctxt "QMYSQLResult"
+msgid "Unable to prepare statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:517
-msgctxt "QShortcut"
-msgid "Paste"
+#: sql/drivers/mysql/qsql_mysql.cpp:940
+msgctxt "QMYSQLResult"
+msgid "Unable to reset statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:518
-msgctxt "QShortcut"
-msgid "Phone"
+#: sql/drivers/mysql/qsql_mysql.cpp:1026
+msgctxt "QMYSQLResult"
+msgid "Unable to bind value"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:519
-msgctxt "QShortcut"
-msgid "Reply"
+#: sql/drivers/mysql/qsql_mysql.cpp:1037
+msgctxt "QMYSQLResult"
+msgid "Unable to execute statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:520
-msgctxt "QShortcut"
-msgid "Reload"
+#: sql/drivers/mysql/qsql_mysql.cpp:1051 sql/drivers/mysql/qsql_mysql.cpp:1072
+msgctxt "QMYSQLResult"
+msgid "Unable to bind outvalues"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:521
-msgctxt "QShortcut"
-msgid "Rotate Windows"
+#: sql/drivers/mysql/qsql_mysql.cpp:1060
+msgctxt "QMYSQLResult"
+msgid "Unable to store statement results"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:522
-msgctxt "QShortcut"
-msgid "Rotation PB"
+#: sql/drivers/mysql/qsql_mysql.cpp:1287
+msgid "Unable to open database '"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:523
-msgctxt "QShortcut"
-msgid "Rotation KB"
+#: sql/drivers/mysql/qsql_mysql.cpp:1298 sql/drivers/db2/qsql_db2.cpp:1253
+#: sql/drivers/psql/qsql_psql.cpp:819 sql/drivers/odbc/qsql_odbc.cpp:1879
+msgid "Unable to connect"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:524
-msgctxt "QShortcut"
-msgid "Save"
+#: sql/drivers/mysql/qsql_mysql.cpp:1452
+#: sql/drivers/sqlite/qsql_sqlite.cpp:578
+#: sql/drivers/sqlite2/qsql_sqlite2.cpp:440
+#: sql/drivers/symsql/qsql_symsql.cpp:1041
+msgid "Unable to begin transaction"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:525
-msgctxt "QShortcut"
-msgid "Send"
+#: sql/drivers/mysql/qsql_mysql.cpp:1469
+#: sql/drivers/sqlite/qsql_sqlite.cpp:593 sql/drivers/db2/qsql_db2.cpp:1551
+#: sql/drivers/sqlite2/qsql_sqlite2.cpp:457
+#: sql/drivers/symsql/qsql_symsql.cpp:1056 sql/drivers/odbc/qsql_odbc.cpp:2165
+msgid "Unable to commit transaction"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:526
-msgctxt "QShortcut"
-msgid "Spellchecker"
+#: sql/drivers/mysql/qsql_mysql.cpp:1486
+#: sql/drivers/sqlite/qsql_sqlite.cpp:608 sql/drivers/db2/qsql_db2.cpp:1568
+#: sql/drivers/sqlite2/qsql_sqlite2.cpp:474
+#: sql/drivers/symsql/qsql_symsql.cpp:1071 sql/drivers/odbc/qsql_odbc.cpp:2182
+msgid "Unable to rollback transaction"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:527
-msgctxt "QShortcut"
-msgid "Split Screen"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:205
+#: sql/drivers/sqlite/qsql_sqlite.cpp:269
+#: sql/drivers/sqlite/qsql_sqlite.cpp:277
+msgctxt "QSQLiteResult"
+msgid "Unable to fetch row"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:528
-msgctxt "QShortcut"
-msgid "Support"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:206
+msgctxt "QSQLiteResult"
+msgid "No query"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:529
-msgctxt "QShortcut"
-msgid "Task Panel"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:338
+msgctxt "QSQLiteResult"
+msgid "Unable to execute statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:530
-msgctxt "QShortcut"
-msgid "Terminal"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:343
+msgctxt "QSQLiteResult"
+msgid "Unable to execute multiple statements at a time"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:531
-msgctxt "QShortcut"
-msgid "Tools"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:363
+msgctxt "QSQLiteResult"
+msgid "Unable to reset statement"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:532
-msgctxt "QShortcut"
-msgid "Travel"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:408
+msgctxt "QSQLiteResult"
+msgid "Unable to bind parameters"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:533
-msgctxt "QShortcut"
-msgid "Video"
+#: sql/drivers/sqlite/qsql_sqlite.cpp:415
+msgctxt "QSQLiteResult"
+msgid "Parameter count mismatch"
+msgstr ""
+
+#: sql/drivers/sqlite/qsql_sqlite.cpp:547
+#: sql/drivers/sqlite2/qsql_sqlite2.cpp:399
+#: sql/drivers/symsql/qsql_symsql.cpp:985
+#: sql/drivers/symsql/qsql_symsql.cpp:1002
+msgid "Error opening database"
+msgstr ""
+
+#: sql/drivers/sqlite/qsql_sqlite.cpp:558
+msgid "Error closing database"
+msgstr ""
+
+#: sql/drivers/tds/qsql_tds.cpp:595
+msgid "Unable to open connection"
+msgstr ""
+
+#: sql/drivers/tds/qsql_tds.cpp:600
+msgid "Unable to use database"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:554 sql/drivers/db2/qsql_db2.cpp:794
+msgctxt "QDB2Result"
+msgid "Unable to execute statement"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:591
+msgctxt "QDB2Result"
+msgid "Unable to prepare statement"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:784
+msgctxt "QDB2Result"
+msgid "Unable to bind variable"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:873
+#, qt-format
+msgctxt "QDB2Result"
+msgid "Unable to fetch record %1"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:892
+msgctxt "QDB2Result"
+msgid "Unable to fetch next"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:912
+msgctxt "QDB2Result"
+msgid "Unable to fetch first"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:1102 sql/drivers/odbc/qsql_odbc.cpp:1115
+#: sql/drivers/odbc/qsql_odbc.cpp:1693
+msgctxt "QODBCResult"
+msgid "Unable to fetch last"
+msgstr ""
+
+#: sql/drivers/db2/qsql_db2.cpp:1583
+msgid "Unable to set autocommit"
+msgstr ""
+
+#: sql/drivers/sqlite2/qsql_sqlite2.cpp:149
+msgctxt "QSQLite2Result"
+msgid "Unable to fetch results"
+msgstr ""
+
+#: sql/drivers/sqlite2/qsql_sqlite2.cpp:299
+msgctxt "QSQLite2Result"
+msgid "Unable to execute statement"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:422
+msgctxt "QIBaseResult"
+msgid "Unable to create BLOB"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:428
+msgctxt "QIBaseResult"
+msgid "Unable to write BLOB"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:442
+msgctxt "QIBaseResult"
+msgid "Unable to open BLOB"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:459
+msgctxt "QIBaseResult"
+msgid "Unable to read BLOB"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:583 sql/drivers/ibase/qsql_ibase.cpp:770
+msgctxt "QIBaseResult"
+msgid "Could not find array"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:615
+msgctxt "QIBaseResult"
+msgid "Could not get array data"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:825
+msgctxt "QIBaseResult"
+msgid "Could not get query info"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:845
+msgctxt "QIBaseResult"
+msgid "Could not start transaction"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:864
+msgctxt "QIBaseResult"
+msgid "Unable to commit transaction"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:906
+msgctxt "QIBaseResult"
+msgid "Could not allocate statement"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:911
+msgctxt "QIBaseResult"
+msgid "Could not prepare statement"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:917 sql/drivers/ibase/qsql_ibase.cpp:928
+msgctxt "QIBaseResult"
+msgid "Could not describe input statement"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:941
+msgctxt "QIBaseResult"
+msgid "Could not describe statement"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1056
+msgctxt "QIBaseResult"
+msgid "Unable to close statement"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1064
+msgctxt "QIBaseResult"
+msgid "Unable to execute query"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1110
+msgctxt "QIBaseResult"
+msgid "Could not fetch next item"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1307
+msgctxt "QIBaseResult"
+msgid "Could not get statement info"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1491
+msgctxt "QIBaseDriver"
+msgid "Error opening database"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1545
+msgctxt "QIBaseDriver"
+msgid "Could not start transaction"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1558
+msgctxt "QIBaseDriver"
+msgid "Unable to commit transaction"
+msgstr ""
+
+#: sql/drivers/ibase/qsql_ibase.cpp:1571
+msgctxt "QIBaseDriver"
+msgid "Unable to rollback transaction"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:198
+msgctxt "QPSQLResult"
+msgid "Unable to create query"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:570
+msgctxt "QPSQLResult"
+msgid "Unable to prepare statement"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:868
+msgid "Could not begin transaction"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:901
+msgid "Could not commit transaction"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:917
+msgid "Could not rollback transaction"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:1303
+msgid "Unable to subscribe"
+msgstr ""
+
+#: sql/drivers/psql/qsql_psql.cpp:1335
+msgid "Unable to unsubscribe"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:220
+msgctxt "QSymSQLResult"
+msgid "Error retrieving column count"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:230
+msgctxt "QSymSQLResult"
+msgid "Error retrieving column name"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:243
+msgctxt "QSymSQLResult"
+msgid "Error retrieving column type"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:279
+#: sql/drivers/symsql/qsql_symsql.cpp:287
+msgctxt "QSymSQLResult"
+msgid "Unable to fetch row"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:331
+msgctxt "QSymSQLResult"
+msgid "Unable to execute statement"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:345
+msgctxt "QSymSQLResult"
+msgid "Statement is not prepared"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:359
+msgctxt "QSymSQLResult"
+msgid "Unable to reset statement"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:407
+msgctxt "QSymSQLResult"
+msgid "Unable to bind parameters"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:414
+msgctxt "QSymSQLResult"
+msgid "Parameter count mismatch"
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:975
+#: sql/drivers/symsql/qsql_symsql.cpp:991
+msgid "Invalid option: "
+msgstr ""
+
+#: sql/drivers/symsql/qsql_symsql.cpp:1005
+msgid ""
+"POLICY_DB_DEFAULT must be defined before any other POLICY definitions can be "
+"used"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:945 sql/drivers/odbc/qsql_odbc.cpp:1296
+msgctxt "QODBCResult"
+msgid ""
+"QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement "
+"attribute. Please check your ODBC driver configuration"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:962 sql/drivers/odbc/qsql_odbc.cpp:1589
+msgctxt "QODBCResult"
+msgid "Unable to execute statement"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1021
+msgctxt "QODBCResult"
+msgid "Unable to fetch"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1043
+msgctxt "QODBCResult"
+msgid "Unable to fetch next"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1065
+msgctxt "QODBCResult"
+msgid "Unable to fetch first"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1084
+msgctxt "QODBCResult"
+msgid "Unable to fetch previous"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1314
+msgctxt "QODBCResult"
+msgid "Unable to prepare statement"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1581
+msgctxt "QODBCResult"
+msgid "Unable to bind variable"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:1885
+msgid "Unable to connect - Driver doesn't support all functionality required"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:2148
+msgid "Unable to disable autocommit"
+msgstr ""
+
+#: sql/drivers/odbc/qsql_odbc.cpp:2197
+msgid "Unable to enable autocommit"
+msgstr ""
+
+#: xml/sax/qxml.cpp:58
+msgctxt "QXml"
+msgid "no error occurred"
+msgstr "ni ddigwyddodd gwall"
+
+#: xml/sax/qxml.cpp:59
+msgctxt "QXml"
+msgid "error triggered by consumer"
+msgstr "gwall a achoswyd gan y defnyddiwr"
+
+#: xml/sax/qxml.cpp:60
+msgctxt "QXml"
+msgid "unexpected end of file"
+msgstr "diwedd annisgwyl i'r ffeil"
+
+#: xml/sax/qxml.cpp:61
+msgctxt "QXml"
+msgid "more than one document type definition"
+msgstr "mwy nag un diffiniad math y dogfen"
+
+#: xml/sax/qxml.cpp:62
+msgctxt "QXml"
+msgid "error occurred while parsing element"
+msgstr "digwyddodd gwall wrth dosrannu'r elfen"
+
+#: xml/sax/qxml.cpp:63
+msgctxt "QXml"
+msgid "tag mismatch"
+msgstr "camgydweddu tag"
+
+#: xml/sax/qxml.cpp:64
+msgctxt "QXml"
+msgid "error occurred while parsing content"
+msgstr "digwyddodd gwall wrth dosrannu cynnwys"
+
+#: xml/sax/qxml.cpp:65
+msgctxt "QXml"
+msgid "unexpected character"
+msgstr "nod annisgwyl"
+
+#: xml/sax/qxml.cpp:66
+msgctxt "QXml"
+msgid "invalid name for processing instruction"
+msgstr "enw annilys am gyfarwyddiad brosesu"
+
+#: xml/sax/qxml.cpp:67
+msgctxt "QXml"
+msgid "version expected while reading the XML declaration"
+msgstr "disgwylir fersiwn wrth ddarllen y datganiad XML"
+
+#: xml/sax/qxml.cpp:68
+msgctxt "QXml"
+msgid "wrong value for standalone declaration"
+msgstr "gwerth anghywir am ddatganiad unigol"
+
+#: xml/sax/qxml.cpp:69
+msgctxt "QXml"
+msgid ""
+"encoding declaration or standalone declaration expected while reading the "
+"XML declaration"
+msgstr ""
+"disgwylir datganiad codio neu datganiad unigol wrth ddarllen y datganiad XML"
+
+#: xml/sax/qxml.cpp:70
+msgctxt "QXml"
+msgid "standalone declaration expected while reading the XML declaration"
+msgstr "disgwylir datganiad unigol wrth ddarllen y datganiad XML"
+
+#: xml/sax/qxml.cpp:71
+msgctxt "QXml"
+msgid "error occurred while parsing document type definition"
+msgstr "digwyddodd gwall wrth dosrannu diffiniad math y ddogfen"
+
+#: xml/sax/qxml.cpp:72
+msgctxt "QXml"
+msgid "letter is expected"
+msgstr "disgwylir llythyren"
+
+#: xml/sax/qxml.cpp:73
+msgctxt "QXml"
+msgid "error occurred while parsing comment"
+msgstr "digwyddodd gwall wrth dosrannu sylwad"
+
+#: xml/sax/qxml.cpp:74
+msgctxt "QXml"
+msgid "error occurred while parsing reference"
+msgstr "digwyddodd gwall wrth dosrannu cyfeirnod"
+
+#: xml/sax/qxml.cpp:75
+msgctxt "QXml"
+msgid "internal general entity reference not allowed in DTD"
+msgstr "ni chaniateir cyfeiriant elfen cyffredinol mewnol mewn DTD"
+
+#: xml/sax/qxml.cpp:76
+msgctxt "QXml"
+msgid ""
+"external parsed general entity reference not allowed in attribute value"
+msgstr ""
+"ni chaniateir cyfeiriant endid  cyffredinol dosranedig mewn gwerthpriodoledd"
+
+#: xml/sax/qxml.cpp:77
+msgctxt "QXml"
+msgid "external parsed general entity reference not allowed in DTD"
+msgstr "ni chaniateir cyfeiriant endid  cyffredinol dosranedig mewn DTD"
+
+#: xml/sax/qxml.cpp:78
+msgctxt "QXml"
+msgid "unparsed entity reference in wrong context"
+msgstr "cyfeiriant endid di-ddosranedig mewn cyd-destun anghywir"
+
+#: xml/sax/qxml.cpp:79
+msgctxt "QXml"
+msgid "recursive entities"
+msgstr "endidau dychweliadol"
+
+#: xml/sax/qxml.cpp:80
+msgctxt "QXml"
+msgid "error in the text declaration of an external entity"
+msgstr "gwall yn y datganiad testun o endid allanol"
+
+#: imports/gestures/qdeclarativegesturearea.cpp:183
+#: declarative/util/qdeclarativepropertychanges.cpp:424
+#: declarative/util/qdeclarativeconnections.cpp:207
+#: declarative/util/qdeclarativeconnections.cpp:271
+#: declarative/qml/qdeclarativecompiler.cpp:1542
+#: declarative/qml/qdeclarativecompiler.cpp:1898
+#: declarative/qml/qdeclarativecompiler.cpp:1901
+#, qt-format
+msgid "Cannot assign to non-existent property \"%1\""
+msgstr ""
+
+#: imports/gestures/qdeclarativegesturearea.cpp:193
+msgid "GestureArea: nested objects not allowed"
+msgstr ""
+
+#: imports/gestures/qdeclarativegesturearea.cpp:196
+msgid "GestureArea: syntax error"
+msgstr ""
+
+#: imports/gestures/qdeclarativegesturearea.cpp:205
+msgid "GestureArea: script expected"
+msgstr ""
+
+#: xmlpatterns/parser/qmaintainingreader.cpp:184
+#, qt-format
+msgid ""
+"Attribute %1 cannot appear on the element %2. Only the standard attributes "
+"can appear."
+msgstr ""
+
+#: xmlpatterns/parser/qmaintainingreader.cpp:190
+#, qt-format
+msgid ""
+"Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the "
+"standard attributes."
+msgstr ""
+
+#: xmlpatterns/parser/qmaintainingreader.cpp:198
+#, qt-format
+msgid ""
+"Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the "
+"standard attributes."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:534
-msgctxt "QShortcut"
-msgid "Word Processor"
+#: xmlpatterns/parser/qmaintainingreader.cpp:207
+#, qt-format
+msgid ""
+"Attribute %1 cannot appear on the element %2. Allowed is %3, and the "
+"standard attributes."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:535
-msgctxt "QShortcut"
-msgid "XFer"
+#: xmlpatterns/parser/qmaintainingreader.cpp:220
+#, qt-format
+msgid ""
+"XSL-T attributes on XSL-T elements must be in the null namespace, not in the "
+"XSL-T namespace which %1 is."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:536
-msgctxt "QShortcut"
-msgid "Zoom In"
+#: xmlpatterns/parser/qmaintainingreader.cpp:232
+#, qt-format
+msgid "The attribute %1 must appear on element %2."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:537
-msgctxt "QShortcut"
-msgid "Zoom Out"
+#: xmlpatterns/parser/qmaintainingreader.cpp:240
+#, qt-format
+msgid "The element with local name %1 does not exist in XSL-T."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:538
-msgctxt "QShortcut"
-msgid "Away"
+#: querytransformparser.ypp:202
+msgid "W3C XML Schema identity constraint selector"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:539
-msgctxt "QShortcut"
-msgid "Messenger"
+#: querytransformparser.ypp:205
+msgid "W3C XML Schema identity constraint field"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:540
-msgctxt "QShortcut"
-msgid "WebCam"
+#: querytransformparser.ypp:209
+#, qt-format
+msgid ""
+"A construct was encountered which is disallowed in the current language(%1)."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:541
-msgctxt "QShortcut"
-msgid "Mail Forward"
+#: querytransformparser.ypp:259 querytransformparser.ypp:4492
+#, qt-format
+msgid "%1 is an unknown schema type."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:542
-msgctxt "QShortcut"
-msgid "Pictures"
+#: querytransformparser.ypp:328
+#, qt-format
+msgid "A template with name %1 has already been declared."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:543
-msgctxt "QShortcut"
-msgid "Music"
+#: querytransformparser.ypp:354
+#, qt-format
+msgid "%1 is not a valid numeric literal."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:544
-msgctxt "QShortcut"
-msgid "Battery"
+#: querytransformparser.ypp:541
+#, qt-format
+msgid "Only one %1 declaration can occur in the query prolog."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:545
-msgctxt "QShortcut"
-msgid "Bluetooth"
+#: querytransformparser.ypp:729
+#, qt-format
+msgid "The initialization of variable %1 depends on itself"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:546
-msgctxt "QShortcut"
-msgid "Wireless"
+#: querytransformparser.ypp:792
+#, qt-format
+msgid "No variable with name %1 exists"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:547
-msgctxt "QShortcut"
-msgid "Ultra Wide Band"
+#: querytransformparser.ypp:1403
+#, qt-format
+msgid "Version %1 is not supported. The supported XQuery version is 1.0."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:548
-msgctxt "QShortcut"
-msgid "Audio Forward"
+#: querytransformparser.ypp:1417
+#, qt-format
+msgid ""
+"The encoding %1 is invalid. It must contain Latin characters only, must not "
+"contain whitespace, and must match the regular expression %2."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:549
-msgctxt "QShortcut"
-msgid "Audio Repeat"
+#: querytransformparser.ypp:1469
+#, qt-format
+msgid "No function with signature %1 is available"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:550
-msgctxt "QShortcut"
-msgid "Audio Random Play"
+#: querytransformparser.ypp:1539 querytransformparser.ypp:1545
+msgid ""
+"A default namespace declaration must occur before function, variable, and "
+"option declarations."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:551
-msgctxt "QShortcut"
-msgid "Subtitle"
+#: querytransformparser.ypp:1551
+msgid ""
+"Namespace declarations must occur before function, variable, and option "
+"declarations."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:552
-msgctxt "QShortcut"
-msgid "Audio Cycle Track"
+#: querytransformparser.ypp:1558
+msgid ""
+"Module imports must occur before function, variable, and option declarations."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:553
-msgctxt "QShortcut"
-msgid "Time"
+#: querytransformparser.ypp:1659
+#, qt-format
+msgid "The keyword %1 cannot occur with any other mode name."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:554 gui/kernel/qkeysequence.cpp:576
-msgctxt "QShortcut"
-msgid "Select"
+#: querytransformparser.ypp:1682
+#, qt-format
+msgid "The value of attribute %1 must be of type %2, which %3 isn't."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:555
-msgctxt "QShortcut"
-msgid "View"
+#: querytransformparser.ypp:1736
+#, qt-format
+msgid "It is not possible to redeclare prefix %1."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:556
-msgctxt "QShortcut"
-msgid "Top Menu"
+#: querytransformparser.ypp:1743
+#, qt-format
+msgid ""
+"The prefix %1 cannot be bound. By default, it is already bound to the "
+"namespace %2."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:557
-msgctxt "QShortcut"
-msgid "Suspend"
+#: querytransformparser.ypp:1754
+#, qt-format
+msgid "Prefix %1 is already declared in the prolog."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:558
-msgctxt "QShortcut"
-msgid "Hibernate"
+#: querytransformparser.ypp:1836
+msgid ""
+"The name of an option must have a prefix. There is no default namespace for "
+"options."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:562
-msgctxt "QShortcut"
-msgid "Print Screen"
+#: querytransformparser.ypp:1964
+#, qt-format
+msgid ""
+"The Schema Import feature is not supported, and therefore %1 declarations "
+"cannot occur."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:563
-msgctxt "QShortcut"
-msgid "Page Up"
+#: querytransformparser.ypp:1978
+#, qt-format
+msgid "The target namespace of a %1 cannot be empty."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:564
-msgctxt "QShortcut"
-msgid "Page Down"
+#: querytransformparser.ypp:1986
+msgid "The module import feature is not supported"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:565
-msgctxt "QShortcut"
-msgid "Caps Lock"
+#: querytransformparser.ypp:2006
+#, qt-format
+msgid "A variable with name %1 has already been declared."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:566
-msgctxt "QShortcut"
-msgid "Num Lock"
+#: querytransformparser.ypp:2045
+#, qt-format
+msgid "No value is available for the external variable with name %1."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:567
-msgctxt "QShortcut"
-msgid "Number Lock"
+#: querytransformparser.ypp:2110
+msgid "A stylesheet function must have a prefixed name."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:568
-msgctxt "QShortcut"
-msgid "Scroll Lock"
+#: querytransformparser.ypp:2119
+#, qt-format
+msgid ""
+"The namespace for a user defined function cannot be empty (try the "
+"predefined prefix %1, which exists for cases like this)"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:569
-msgctxt "QShortcut"
-msgid "Insert"
+#: querytransformparser.ypp:2129
+#, qt-format
+msgid ""
+"The namespace %1 is reserved; therefore user defined functions may not use "
+"it. Try the predefined prefix %2, which exists for these cases."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:570
-msgctxt "QShortcut"
-msgid "Delete"
+#: querytransformparser.ypp:2141
+#, qt-format
+msgid ""
+"The namespace of a user defined function in a library module must be "
+"equivalent to the module namespace. In other words, it should be %1 instead "
+"of %2"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:571
-msgctxt "QShortcut"
-msgid "Escape"
+#: querytransformparser.ypp:2174
+#, qt-format
+msgid "A function already exists with the signature %1."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:572
-msgctxt "QShortcut"
-msgid "System Request"
+#: querytransformparser.ypp:2197
+msgid ""
+"No external functions are supported. All supported functions can be used "
+"directly, without first declaring them as external"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:577
-msgctxt "QShortcut"
-msgid "Yes"
+#: querytransformparser.ypp:2223
+#, qt-format
+msgid ""
+"An argument with name %1 has already been declared. Every argument name must "
+"be unique."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:578
-msgctxt "QShortcut"
-msgid "No"
+#: querytransformparser.ypp:2382
+#, qt-format
+msgid ""
+"When function %1 is used for matching inside a pattern, the argument must be "
+"a variable reference or a string literal."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:582
-msgctxt "QShortcut"
-msgid "Context1"
+#: querytransformparser.ypp:2393
+#, qt-format
+msgid ""
+"In an XSL-T pattern, the first argument to function %1 must be a string "
+"literal, when used for matching."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:583
-msgctxt "QShortcut"
-msgid "Context2"
+#: querytransformparser.ypp:2407
+#, qt-format
+msgid ""
+"In an XSL-T pattern, the first argument to function %1 must be a literal or "
+"a variable reference, when used for matching."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:584
-msgctxt "QShortcut"
-msgid "Context3"
+#: querytransformparser.ypp:2416
+#, qt-format
+msgid "In an XSL-T pattern, function %1 cannot have a third argument."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:585
-msgctxt "QShortcut"
-msgid "Context4"
+#: querytransformparser.ypp:2426
+#, qt-format
+msgid ""
+"In an XSL-T pattern, only function %1 and %2, not %3, can be used for "
+"matching."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:587
-msgctxt "QShortcut"
-msgid "Call"
+#: querytransformparser.ypp:2480
+#, qt-format
+msgid "In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:589
-msgctxt "QShortcut"
-msgid "Hangup"
+#: querytransformparser.ypp:2571
+#, qt-format
+msgid "%1 is an invalid template mode name."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:591
-msgctxt "QShortcut"
-msgid "Toggle Call/Hangup"
+#: querytransformparser.ypp:2608
+#, qt-format
+msgid ""
+"The name of a variable bound in a for-expression must be different from the "
+"positional variable. Hence, the two variables named %1 collide."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:592
-msgctxt "QShortcut"
-msgid "Flip"
+#: querytransformparser.ypp:3123
+#, qt-format
+msgid ""
+"The Schema Validation Feature is not supported. Hence, %1-expressions may "
+"not be used."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:594
-msgctxt "QShortcut"
-msgid "Voice Dial"
+#: querytransformparser.ypp:3148
+msgid ""
+"None of the pragma expressions are supported. Therefore, a fallback "
+"expression must be present"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:596
-msgctxt "QShortcut"
-msgid "Last Number Redial"
+#: querytransformparser.ypp:3340
+#, qt-format
+msgid "Each name of a template parameter must be unique; %1 is duplicated."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:598
-msgctxt "QShortcut"
-msgid "Camera Shutter"
+#: querytransformparser.ypp:3443
+#, qt-format
+msgid "The %1-axis is unsupported in XQuery"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:600
-msgctxt "QShortcut"
-msgid "Camera Focus"
+#: querytransformparser.ypp:3653
+#, qt-format
+msgid "No function with name %1 is available."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:604
-msgctxt "QShortcut"
-msgid "Kanji"
+#: querytransformparser.ypp:3784
+#, qt-format
+msgid ""
+"The namespace URI cannot be the empty string when binding to a prefix, %1."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:605
-msgctxt "QShortcut"
-msgid "Muhenkan"
+#: querytransformparser.ypp:3791
+#, qt-format
+msgid "%1 is an invalid namespace URI."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:606
-msgctxt "QShortcut"
-msgid "Henkan"
+#: querytransformparser.ypp:3797
+#, qt-format
+msgid "It is not possible to bind to the prefix %1"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:607
-msgctxt "QShortcut"
-msgid "Romaji"
+#: querytransformparser.ypp:3804
+#, qt-format
+msgid ""
+"Namespace %1 can only be bound to %2 (and it is, in either case, pre-"
+"declared)."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:608
-msgctxt "QShortcut"
-msgid "Hiragana"
+#: querytransformparser.ypp:3812
+#, qt-format
+msgid ""
+"Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared)."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:609
-msgctxt "QShortcut"
-msgid "Katakana"
+#: querytransformparser.ypp:3827
+#, qt-format
+msgid "Two namespace declaration attributes have the same name: %1."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:610
-msgctxt "QShortcut"
-msgid "Hiragana Katakana"
+#: querytransformparser.ypp:3914
+msgid ""
+"The namespace URI must be a constant and cannot use enclosed expressions."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:611
-msgctxt "QShortcut"
-msgid "Zenkaku"
+#: querytransformparser.ypp:3930
+#, qt-format
+msgid "An attribute with name %1 has already appeared on this element."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:612
-msgctxt "QShortcut"
-msgid "Hankaku"
+#: querytransformparser.ypp:3984
+#, qt-format
+msgid "A direct element constructor is not well-formed. %1 is ended with %2."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:613
-msgctxt "QShortcut"
-msgid "Zenkaku Hankaku"
+#: querytransformparser.ypp:4310
+#, qt-format
+msgid "The name %1 does not refer to any schema type."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:614
-msgctxt "QShortcut"
-msgid "Touroku"
+#: querytransformparser.ypp:4320
+#, qt-format
+msgid ""
+"%1 is an complex type. Casting to complex types is not possible. However, "
+"casting to atomic types such as %2 works."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:615
-msgctxt "QShortcut"
-msgid "Massyo"
+#: querytransformparser.ypp:4329
+#, qt-format
+msgid "%1 is not an atomic type. Casting is only possible to atomic types."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:616
-msgctxt "QShortcut"
-msgid "Kana Lock"
+#: querytransformparser.ypp:4395
+#, qt-format
+msgid "%1 is not a valid name for a processing-instruction."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:617
-msgctxt "QShortcut"
-msgid "Kana Shift"
+#: querytransformparser.ypp:4447 querytransformparser.ypp:4503
+#, qt-format
+msgid ""
+"%1 is not in the in-scope attribute declarations. Note that the schema "
+"import feature is not supported."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:618
-msgctxt "QShortcut"
-msgid "Eisu Shift"
+#: querytransformparser.ypp:4553
+msgid "The name of an extension expression must be in a namespace."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:619
-msgctxt "QShortcut"
-msgid "Eisu toggle"
+#: xmlpatterns/parser/qparsercontext.cpp:93
+#, qt-format
+msgid "The variable %1 is unused"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:620
-msgctxt "QShortcut"
-msgid "Code input"
+#: xmlpatterns/parser/qxslttokenizer.cpp:519
+#, qt-format
+msgid "Element %1 is not allowed at this location."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:621
-msgctxt "QShortcut"
-msgid "Multiple Candidate"
+#: xmlpatterns/parser/qxslttokenizer.cpp:528
+msgid "Text nodes are not allowed at this location."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:622
-msgctxt "QShortcut"
-msgid "Previous Candidate"
+#: xmlpatterns/parser/qxslttokenizer.cpp:548
+#, qt-format
+msgid "Parse error: %1"
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:626
-msgctxt "QShortcut"
-msgid "Hangul"
+#: xmlpatterns/parser/qxslttokenizer.cpp:610
+#, qt-format
+msgid ""
+"The value of the XSL-T version attribute must be a value of type %1, which "
+"%2 isn't."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:627
-msgctxt "QShortcut"
-msgid "Hangul Start"
+#: xmlpatterns/parser/qxslttokenizer.cpp:630
+msgid "Running an XSL-T 1.0 stylesheet with a 2.0 processor."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:628
-msgctxt "QShortcut"
-msgid "Hangul End"
+#: xmlpatterns/parser/qxslttokenizer.cpp:738
+#, qt-format
+msgid "Unknown XSL-T attribute %1."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:629
-msgctxt "QShortcut"
-msgid "Hangul Hanja"
+#: xmlpatterns/parser/qxslttokenizer.cpp:761
+#, qt-format
+msgid "Attribute %1 and %2 are mutually exclusive."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:630
-msgctxt "QShortcut"
-msgid "Hangul Jamo"
+#: xmlpatterns/parser/qxslttokenizer.cpp:927
+#, qt-format
+msgid "In a simplified stylesheet module, attribute %1 must be present."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:631
-msgctxt "QShortcut"
-msgid "Hangul Romaja"
+#: xmlpatterns/parser/qxslttokenizer.cpp:999
+#, qt-format
+msgid "If element %1 has no attribute %2, it cannot have attribute %3 or %4."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:632
-msgctxt "QShortcut"
-msgid "Hangul Jeonja"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1008
+#, qt-format
+msgid "Element %1 must have at least one of the attributes %2 or %3."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:633
-msgctxt "QShortcut"
-msgid "Hangul Banja"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1036
+#, qt-format
+msgid ""
+"At least one mode must be specified in the %1-attribute on element %2."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:634
-msgctxt "QShortcut"
-msgid "Hangul PreHanja"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1159
+#, qt-format
+msgid "Element %1 must come last."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:635
-msgctxt "QShortcut"
-msgid "Hangul PostHanja"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1183
+#, qt-format
+msgid "At least one %1-element must occur before %2."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:636
-msgctxt "QShortcut"
-msgid "Hangul Special"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1190
+#, qt-format
+msgid "Only one %1-element can appear."
 msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:1237 gui/kernel/qkeysequence.cpp:1372
-msgid "Ctrl"
-msgstr "Rheoli (Ctrl)"
-
-#: gui/kernel/qkeysequence.cpp:1238 gui/kernel/qkeysequence.cpp:1376
-msgid "Shift"
-msgstr "Syflyd (Shift)"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1221
+#, qt-format
+msgid "At least one %1-element must occur inside %2."
+msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:1239 gui/kernel/qkeysequence.cpp:1374
-msgid "Alt"
-msgstr "Arall (Alt)"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1279
+#, qt-format
+msgid ""
+"When attribute %1 is present on %2, a sequence constructor cannot be used."
+msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:1240 gui/kernel/qkeysequence.cpp:1370
-msgid "Meta"
-msgstr "Meta"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1292
+#, qt-format
+msgid "Element %1 must have either a %2-attribute or a sequence constructor."
+msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:1330
-msgid "+"
-msgstr "+"
+#: xmlpatterns/parser/qxslttokenizer.cpp:1417
+#, qt-format
+msgid ""
+"When a parameter is required, a default value cannot be supplied through a "
+"%1-attribute or a sequence constructor."
+msgstr ""
 
-#: gui/kernel/qkeysequence.cpp:1391
+#: xmlpatterns/parser/qxslttokenizer.cpp:1687
 #, qt-format
-msgid "F%1"
-msgstr "F%1"
+msgid "Element %1 cannot have children."
+msgstr ""
 
-#: gui/kernel/qwidget.cpp:6049
-msgid "*"
+#: xmlpatterns/parser/qxslttokenizer.cpp:2121
+#, qt-format
+msgid "Element %1 cannot have a sequence constructor."
 msgstr ""
 
-#: xmlpatterns/expr/qprocessinginstructionconstructor.cpp:84
+#: xmlpatterns/parser/qxslttokenizer.cpp:2207
+#: xmlpatterns/parser/qxslttokenizer.cpp:2216
 #, qt-format
-msgid "The data of a processing instruction cannot contain the string %1"
+msgid "The attribute %1 cannot appear on %2, when it is a child of %3."
 msgstr ""
 
-#: xmlpatterns/expr/qcommentconstructor.cpp:67
+#: xmlpatterns/parser/qxslttokenizer.cpp:2231
+msgid "A parameter in a function cannot be declared to be a tunnel."
+msgstr ""
+
+#: xmlpatterns/parser/qxslttokenizer.cpp:2380
 #, qt-format
-msgid "A comment cannot contain %1"
+msgid "This processor is not Schema-aware and therefore %1 cannot be used."
 msgstr ""
 
-#: xmlpatterns/expr/qcommentconstructor.cpp:73
+#: xmlpatterns/parser/qxslttokenizer.cpp:2437
 #, qt-format
-msgid "A comment cannot end with a %1."
+msgid ""
+"Top level stylesheet elements must be in a non-null namespace, which %1 "
+"isn't."
 msgstr ""
 
-#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:69
+#: xmlpatterns/parser/qxslttokenizer.cpp:2485
+#, qt-format
 msgid ""
-"In a namespace constructor, the value for a namespace cannot be an empty "
-"string."
+"The value for attribute %1 on element %2 must either be %3 or %4, not %5."
 msgstr ""
 
-#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:80
+#: xmlpatterns/parser/qxslttokenizer.cpp:2505
 #, qt-format
-msgid "The prefix must be a valid %1, which %2 is not."
+msgid "Attribute %1 cannot have the value %2."
 msgstr ""
 
-#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:94
+#: xmlpatterns/parser/qxslttokenizer.cpp:2563
 #, qt-format
-msgid "The prefix %1 cannot be bound."
+msgid "The attribute %1 can only appear on the first %2 element."
 msgstr ""
 
-#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:104
+#: xmlpatterns/parser/qxslttokenizer.cpp:2662
 #, qt-format
-msgid "Only the prefix %1 can be bound to %2 and vice versa."
+msgid "At least one %1 element must appear as child of %2."
 msgstr ""
 
-#: xmlpatterns/expr/qarithmeticexpression.cpp:208
+#: xmlpatterns/api/qcoloringmessagehandler.cpp:87
 #, qt-format
-msgid "Operator %1 cannot be used on type %2."
+msgid "Warning in %1, at line %2, column %3: %4"
 msgstr ""
 
-#: xmlpatterns/expr/qarithmeticexpression.cpp:224
+#: xmlpatterns/api/qcoloringmessagehandler.cpp:94
 #, qt-format
-msgid "Operator %1 cannot be used on atomic values of type %2 and %3."
+msgid "Warning in %1: %2"
 msgstr ""
 
-#: xmlpatterns/expr/qcastas.cpp:88
+#: xmlpatterns/api/qcoloringmessagehandler.cpp:110
+msgid "Unknown location"
+msgstr ""
+
+#: xmlpatterns/api/qcoloringmessagehandler.cpp:124
 #, qt-format
-msgid "Type error in cast, expected %1, received %2."
+msgid "Error %1 in %2, at line %3, column %4: %5"
 msgstr ""
 
-#: xmlpatterns/expr/qcastas.cpp:117
+#: xmlpatterns/api/qcoloringmessagehandler.cpp:132
 #, qt-format
-msgid ""
-"When casting to %1 or types derived from it, the source value must be of the "
-"same type, or it must be a string literal. Type %2 is not allowed."
+msgid "Error %1 in %2: %3"
 msgstr ""
 
-#: xmlpatterns/expr/qpath.cpp:109
+#: xmlpatterns/api/qxmlserializer.cpp:321
+#, qt-format
 msgid ""
-"The last step in a path must contain either nodes or atomic values. It "
-"cannot be a mixture between the two."
+"Element %1 can't be serialized because it appears outside the document "
+"element."
 msgstr ""
 
-#: xmlpatterns/expr/qgenericpredicate.cpp:106
+#: xmlpatterns/api/qxmlserializer.cpp:381
 #, qt-format
-msgid ""
-"A value of type %1 cannot be a predicate. A predicate must have either a "
-"numeric type or an Effective Boolean Value type."
+msgid "Attribute %1 can't be serialized because it appears at the top level."
 msgstr ""
 
-#: xmlpatterns/expr/qgenericpredicate.cpp:138
-msgid "A positional predicate must evaluate to a single numeric value."
+#: xmlpatterns/api/qiodevicedelegate.cpp:84
+msgid "Network timeout."
 msgstr ""
 
-#: xmlpatterns/expr/qapplytemplate.cpp:119
-msgid "Ambiguous rule match."
+#: xmlpatterns/utils/qoutputvalidator.cpp:86
+msgid "It's not possible to add attributes after any other kind of node."
 msgstr ""
 
-#: xmlpatterns/expr/qcomparisonplatform.cpp:167
+#: xmlpatterns/utils/qoutputvalidator.cpp:93
 #, qt-format
-msgid "No comparisons can be done involving the type %1."
+msgid "An attribute by name %1 has already been created."
 msgstr ""
 
-#: xmlpatterns/expr/qcomparisonplatform.cpp:181
+#: xmlpatterns/functions/qdatetimefn.cpp:86
 #, qt-format
-msgid "Operator %1 is not available between atomic values of type %2 and %3."
+msgid ""
+"If both values have zone offsets, they must have the same zone offset. %1 "
+"and %2 are not the same."
 msgstr ""
 
-#: xmlpatterns/expr/qqnameconstructor.cpp:82
+#: xmlpatterns/functions/qassemblestringfns.cpp:88
 #, qt-format
-msgid "No namespace binding exists for the prefix %1"
+msgid "%1 is not a valid XML 1.0 character."
 msgstr ""
 
-#: xmlpatterns/expr/qcastingplatform.cpp:136
+#: xmlpatterns/functions/qqnamefns.cpp:69
 #, qt-format
-msgid "No casting is possible with %1 as the target type."
+msgid "%1 is an invalid %2"
 msgstr ""
 
-#: xmlpatterns/expr/qcastingplatform.cpp:151
+#: xmlpatterns/functions/qqnamefns.cpp:87
 #, qt-format
-msgid "It is not possible to cast from %1 to %2."
+msgid ""
+"If the first argument is the empty sequence or a zero-length string (no "
+"namespace), a prefix cannot be specified. Prefix %1 was specified."
 msgstr ""
 
-#: xmlpatterns/expr/qcastingplatform.cpp:178
+#: xmlpatterns/functions/qaggregatefns.cpp:120
 #, qt-format
 msgid ""
-"Casting to %1 is not possible because it is an abstract type, and can "
-"therefore never be instantiated."
+"The first argument to %1 cannot be of type %2. It must be a numeric type, "
+"xs:yearMonthDuration or xs:dayTimeDuration."
 msgstr ""
 
-#: xmlpatterns/expr/qcastingplatform.cpp:201
+#: xmlpatterns/functions/qaggregatefns.cpp:194
 #, qt-format
-msgid "It's not possible to cast the value %1 of type %2 to %3"
+msgid ""
+"The first argument to %1 cannot be of type %2. It must be of type %3, %4, or "
+"%5."
 msgstr ""
 
-#: xmlpatterns/expr/qcastingplatform.cpp:209
+#: xmlpatterns/functions/qaggregatefns.cpp:285
 #, qt-format
-msgid "Failure when casting from %1 to %2: %3"
+msgid ""
+"The second argument to %1 cannot be of type %2. It must be of type %3, %4, "
+"or %5."
 msgstr ""
 
-#: xmlpatterns/expr/qattributenamevalidator.cpp:66
+#: xmlpatterns/functions/qpatternmatchingfns.cpp:94
 #, qt-format
-msgid "The namespace URI in the name for a computed attribute cannot be %1."
+msgid ""
+"%1 must be followed by %2 or %3, not at the end of the replacement string."
 msgstr ""
 
-#: xmlpatterns/expr/qattributenamevalidator.cpp:75
+#: xmlpatterns/functions/qpatternmatchingfns.cpp:133
 #, qt-format
 msgid ""
-"The name for a computed attribute cannot have the namespace URI %1 with the "
-"local name %2."
+"In the replacement string, %1 must be followed by at least one digit when "
+"not escaped."
 msgstr ""
 
-#: xmlpatterns/expr/qdocumentcontentvalidator.cpp:86
+#: xmlpatterns/functions/qpatternmatchingfns.cpp:159
 #, qt-format
 msgid ""
-"An attribute node cannot be a child of a document node. Therefore, the "
-"attribute %1 is out of place."
+"In the replacement string, %1 can only be used to escape itself or %2, not %3"
 msgstr ""
 
-#: xmlpatterns/expr/qevaluationcache.cpp:116
-msgid "Circularity detected"
+#: xmlpatterns/functions/qtimezonefns.cpp:87
+#, qt-format
+msgid ""
+"A zone offset must be in the range %1..%2 inclusive. %3 is out of range."
 msgstr ""
 
-#: xmlpatterns/expr/qtemplate.cpp:74
+#: xmlpatterns/functions/qtimezonefns.cpp:99
 #, qt-format
-msgid "The parameter %1 is passed, but no corresponding %2 exists."
+msgid "%1 is not a whole number of minutes."
 msgstr ""
 
-#: xmlpatterns/expr/qtemplate.cpp:145
+#: xmlpatterns/functions/qerrorfn.cpp:61
 #, qt-format
-msgid "The parameter %1 is required, but no corresponding %2 is supplied."
+msgid "%1 was called."
 msgstr ""
 
-#: xmlpatterns/expr/qexpressionfactory.cpp:162
-msgid ""
-"A library module cannot be evaluated directly. It must be imported from a "
-"main module."
+#: xmlpatterns/functions/qsequencegeneratingfns.cpp:282
+msgid "The default collection is undefined"
 msgstr ""
 
-#: xmlpatterns/expr/qexpressionfactory.cpp:202
+#: xmlpatterns/functions/qsequencegeneratingfns.cpp:295
 #, qt-format
-msgid "No template by name %1 exists."
+msgid "%1 cannot be retrieved"
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:519
+#: xmlpatterns/functions/qcontextnodechecker.cpp:54
 #, qt-format
-msgid "Element %1 is not allowed at this location."
+msgid ""
+"The root node of the second argument to function %1 must be a document node. "
+"%2 is not a document node."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:528
-msgid "Text nodes are not allowed at this location."
+#: xmlpatterns/functions/qunparsedtextfn.cpp:65
+msgid "The URI cannot have a fragment"
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:548
+#: xmlpatterns/functions/qcomparingaggregator.cpp:197
 #, qt-format
-msgid "Parse error: %1"
+msgid "The first argument to %1 cannot be of type %2."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:610
+#: xmlpatterns/functions/qsequencefns.cpp:346
+#, qt-format
+msgid "It will not be possible to retrieve %1."
+msgstr ""
+
+#: xmlpatterns/functions/qpatternplatform.cpp:92
 #, qt-format
+msgid "%1 matches newline characters"
+msgstr ""
+
+#: xmlpatterns/functions/qpatternplatform.cpp:96
+#, qt-format
+msgid "%1 and %2 match the start and end of a line."
+msgstr ""
+
+#: xmlpatterns/functions/qpatternplatform.cpp:102
+msgid "Matches are case insensitive"
+msgstr ""
+
+#: xmlpatterns/functions/qpatternplatform.cpp:106
 msgid ""
-"The value of the XSL-T version attribute must be a value of type %1, which "
-"%2 isn't."
+"Whitespace characters are removed, except when they appear in character "
+"classes"
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:630
-msgid "Running an XSL-T 1.0 stylesheet with a 2.0 processor."
+#: xmlpatterns/functions/qpatternplatform.cpp:206
+#, qt-format
+msgid "%1 is an invalid regular expression pattern: %2"
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:738
+#: xmlpatterns/functions/qpatternplatform.cpp:236
 #, qt-format
-msgid "Unknown XSL-T attribute %1."
+msgid "%1 is an invalid flag for regular expressions. Valid flags are:"
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:761
+#: xmlpatterns/functions/qstringvaluefns.cpp:252
 #, qt-format
-msgid "Attribute %1 and %2 are mutually exclusive."
+msgid ""
+"The normalization form %1 is unsupported. The supported forms are %2, %3, "
+"%4, and %5, and none, i.e. the empty string (no normalization)."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:927
+#: xmlpatterns/schema/qxsdtypechecker.cpp:235
+#: xmlpatterns/schema/qxsdtypechecker.cpp:242
+#: xmlpatterns/schema/qxsdtypechecker.cpp:263
 #, qt-format
-msgid "In a simplified stylesheet module, attribute %1 must be present."
+msgid "%1 is not valid according to %2."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:999
-#, qt-format
-msgid "If element %1 has no attribute %2, it cannot have attribute %3 or %4."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:430
+msgid "String content does not match the length facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1008
-#, qt-format
-msgid "Element %1 must have at least one of the attributes %2 or %3."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:438
+msgid "String content does not match the minLength facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1036
-#, qt-format
-msgid ""
-"At least one mode must be specified in the %1-attribute on element %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:446
+msgid "String content does not match the maxLength facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1159
-#, qt-format
-msgid "Element %1 must come last."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:464
+msgid "String content does not match pattern facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1183
-#, qt-format
-msgid "At least one %1-element must occur before %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:482
+msgid "String content is not listed in the enumeration facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1190
-#, qt-format
-msgid "Only one %1-element can appear."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:499
+msgid "Signed integer content does not match the maxInclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1221
-#, qt-format
-msgid "At least one %1-element must occur inside %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:507
+msgid "Signed integer content does not match the maxExclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1279
-#, qt-format
-msgid ""
-"When attribute %1 is present on %2, a sequence constructor cannot be used."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:515
+msgid "Signed integer content does not match the minInclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1292
-#, qt-format
-msgid "Element %1 must have either a %2-attribute or a sequence constructor."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:523
+msgid "Signed integer content does not match the minExclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1417
-#, qt-format
-msgid ""
-"When a parameter is required, a default value cannot be supplied through a "
-"%1-attribute or a sequence constructor."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:541
+msgid "Signed integer content is not listed in the enumeration facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:1687
-#, qt-format
-msgid "Element %1 cannot have children."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:559
+msgid "Signed integer content does not match pattern facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2121
-#, qt-format
-msgid "Element %1 cannot have a sequence constructor."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:568
+msgid "Signed integer content does not match in the totalDigits facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2207
-#: xmlpatterns/parser/qxslttokenizer.cpp:2216
-#, qt-format
-msgid "The attribute %1 cannot appear on %2, when it is a child of %3."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:585
+msgid "Unsigned integer content does not match the maxInclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2231
-msgid "A parameter in a function cannot be declared to be a tunnel."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:593
+msgid "Unsigned integer content does not match the maxExclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2380
-#, qt-format
-msgid "This processor is not Schema-aware and therefore %1 cannot be used."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:601
+msgid "Unsigned integer content does not match the minInclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2437
-#, qt-format
-msgid ""
-"Top level stylesheet elements must be in a non-null namespace, which %1 "
-"isn't."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:609
+msgid "Unsigned integer content does not match the minExclusive facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2485
-#, qt-format
-msgid ""
-"The value for attribute %1 on element %2 must either be %3 or %4, not %5."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:627
+msgid "Unsigned integer content is not listed in the enumeration facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2505
-#, qt-format
-msgid "Attribute %1 cannot have the value %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:645
+msgid "Unsigned integer content does not match pattern facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2563
-#, qt-format
-msgid "The attribute %1 can only appear on the first %2 element."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:654
+msgid "Unsigned integer content does not match in the totalDigits facet."
 msgstr ""
 
-#: xmlpatterns/parser/qxslttokenizer.cpp:2662
-#, qt-format
-msgid "At least one %1 element must appear as child of %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:671
+msgid "Double content does not match the maxInclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:202
-msgid "W3C XML Schema identity constraint selector"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:679
+msgid "Double content does not match the maxExclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:205
-msgid "W3C XML Schema identity constraint field"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:687
+msgid "Double content does not match the minInclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:209
-#, qt-format
-msgid ""
-"A construct was encountered which is disallowed in the current language(%1)."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:695
+msgid "Double content does not match the minExclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:259 querytransformparser.ypp:4492
-#, qt-format
-msgid "%1 is an unknown schema type."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:721
+msgid "Double content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:328
-#, qt-format
-msgid "A template with name %1 has already been declared."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:739
+msgid "Double content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:354
-#, qt-format
-msgid "%1 is not a valid numeric literal."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:757
+msgid "Decimal content does not match in the fractionDigits facet."
 msgstr ""
 
-#: querytransformparser.ypp:541
-#, qt-format
-msgid "Only one %1 declaration can occur in the query prolog."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:766
+msgid "Decimal content does not match in the totalDigits facet."
 msgstr ""
 
-#: querytransformparser.ypp:729
-#, qt-format
-msgid "The initialization of variable %1 depends on itself"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:780
+msgid "Date time content does not match the maxInclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:792
-#, qt-format
-msgid "No variable with name %1 exists"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:788
+msgid "Date time content does not match the maxExclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1403
-#, qt-format
-msgid "Version %1 is not supported. The supported XQuery version is 1.0."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:796
+msgid "Date time content does not match the minInclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1417
-#, qt-format
-msgid ""
-"The encoding %1 is invalid. It must contain Latin characters only, must not "
-"contain whitespace, and must match the regular expression %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:804
+msgid "Date time content does not match the minExclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1469
-#, qt-format
-msgid "No function with signature %1 is available"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:822
+msgid "Date time content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:1539 querytransformparser.ypp:1545
-msgid ""
-"A default namespace declaration must occur before function, variable, and "
-"option declarations."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:840
+msgid "Date time content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:1551
-msgid ""
-"Namespace declarations must occur before function, variable, and option "
-"declarations."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:855
+msgid "Duration content does not match the maxInclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1558
-msgid ""
-"Module imports must occur before function, variable, and option declarations."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:864
+msgid "Duration content does not match the maxExclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1659
-#, qt-format
-msgid "The keyword %1 cannot occur with any other mode name."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:873
+msgid "Duration content does not match the minInclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1682
-#, qt-format
-msgid "The value of attribute %1 must be of type %2, which %3 isn't."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:882
+msgid "Duration content does not match the minExclusive facet."
 msgstr ""
 
-#: querytransformparser.ypp:1736
-#, qt-format
-msgid "It is not possible to redeclare prefix %1."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:900
+msgid "Duration content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:1743
-#, qt-format
-msgid ""
-"The prefix %1 cannot be bound. By default, it is already bound to the "
-"namespace %2."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:918
+msgid "Duration content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:1754
-#, qt-format
-msgid "Prefix %1 is already declared in the prolog."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:945
+msgid "Boolean content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:1836
-msgid ""
-"The name of an option must have a prefix. There is no default namespace for "
-"options."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:962
+msgid "Binary content does not match the length facet."
 msgstr ""
 
-#: querytransformparser.ypp:1964
-#, qt-format
-msgid ""
-"The Schema Import feature is not supported, and therefore %1 declarations "
-"cannot occur."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:970
+msgid "Binary content does not match the minLength facet."
 msgstr ""
 
-#: querytransformparser.ypp:1978
-#, qt-format
-msgid "The target namespace of a %1 cannot be empty."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:978
+msgid "Binary content does not match the maxLength facet."
 msgstr ""
 
-#: querytransformparser.ypp:1986
-msgid "The module import feature is not supported"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:996
+msgid "Binary content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:2006
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1023
 #, qt-format
-msgid "A variable with name %1 has already been declared."
+msgid "Invalid QName content: %1."
 msgstr ""
 
-#: querytransformparser.ypp:2045
-#, qt-format
-msgid "No value is available for the external variable with name %1."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1040
+msgid "QName content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:2110
-msgid "A stylesheet function must have a prefixed name."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1058
+msgid "QName content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:2119
-#, qt-format
-msgid ""
-"The namespace for a user defined function cannot be empty (try the "
-"predefined prefix %1, which exists for cases like this)"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1094
+msgid "Notation content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:2129
-#, qt-format
-msgid ""
-"The namespace %1 is reserved; therefore user defined functions may not use "
-"it. Try the predefined prefix %2, which exists for these cases."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1113
+msgid "List content does not match length facet."
 msgstr ""
 
-#: querytransformparser.ypp:2141
-#, qt-format
-msgid ""
-"The namespace of a user defined function in a library module must be "
-"equivalent to the module namespace. In other words, it should be %1 instead "
-"of %2"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1120
+msgid "List content does not match minLength facet."
 msgstr ""
 
-#: querytransformparser.ypp:2174
-#, qt-format
-msgid "A function already exists with the signature %1."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1127
+msgid "List content does not match maxLength facet."
 msgstr ""
 
-#: querytransformparser.ypp:2197
-msgid ""
-"No external functions are supported. All supported functions can be used "
-"directly, without first declaring them as external"
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1217
+msgid "List content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:2223
-#, qt-format
-msgid ""
-"An argument with name %1 has already been declared. Every argument name must "
-"be unique."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1235
+msgid "List content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:2382
-#, qt-format
-msgid ""
-"When function %1 is used for matching inside a pattern, the argument must be "
-"a variable reference or a string literal."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1274
+msgid "Union content is not listed in the enumeration facet."
 msgstr ""
 
-#: querytransformparser.ypp:2393
-#, qt-format
-msgid ""
-"In an XSL-T pattern, the first argument to function %1 must be a string "
-"literal, when used for matching."
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1292
+msgid "Union content does not match pattern facet."
 msgstr ""
 
-#: querytransformparser.ypp:2407
+#: xmlpatterns/schema/qxsdtypechecker.cpp:1307
 #, qt-format
-msgid ""
-"In an XSL-T pattern, the first argument to function %1 must be a literal or "
-"a variable reference, when used for matching."
+msgid "Data of type %1 are not allowed to be empty."
 msgstr ""
 
-#: querytransformparser.ypp:2416
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:354
 #, qt-format
-msgid "In an XSL-T pattern, function %1 cannot have a third argument."
+msgid "%1 references unknown %2 or %3 element %4."
 msgstr ""
 
-#: querytransformparser.ypp:2426
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:364
 #, qt-format
-msgid ""
-"In an XSL-T pattern, only function %1 and %2, not %3, can be used for "
-"matching."
+msgid "%1 references identity constraint %2 that is no %3 or %4 element."
 msgstr ""
 
-#: querytransformparser.ypp:2480
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:374
 #, qt-format
-msgid "In an XSL-T pattern, axis %1 cannot be used, only axis %2 or %3 can."
+msgid ""
+"%1 has a different number of fields from the identity constraint %2 that it "
+"references."
 msgstr ""
 
-#: querytransformparser.ypp:2571
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:397
 #, qt-format
-msgid "%1 is an invalid template mode name."
+msgid "Base type %1 of %2 element cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:2608
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:481
 #, qt-format
-msgid ""
-"The name of a variable bound in a for-expression must be different from the "
-"positional variable. Hence, the two variables named %1 collide."
+msgid "Item type %1 of %2 element cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:3123
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:512
 #, qt-format
-msgid ""
-"The Schema Validation Feature is not supported. Hence, %1-expressions may "
-"not be used."
+msgid "Member type %1 of %2 element cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:3148
-msgid ""
-"None of the pragma expressions are supported. Therefore, a fallback "
-"expression must be present"
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:540
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:955
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:985
+#, qt-format
+msgid "Type %1 of %2 element cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:3340
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:562
 #, qt-format
-msgid "Each name of a template parameter must be unique; %1 is duplicated."
+msgid "Base type %1 of complex type cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:3443
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:571
 #, qt-format
-msgid "The %1-axis is unsupported in XQuery"
+msgid "%1 cannot have complex base type that has a %2."
 msgstr ""
 
-#: querytransformparser.ypp:3653
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:857
 #, qt-format
-msgid "No function with name %1 is available."
+msgid ""
+"Content model of complex type %1 contains %2 element, so it cannot be "
+"derived by extension from a non-empty type."
 msgstr ""
 
-#: querytransformparser.ypp:3784
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:863
 #, qt-format
 msgid ""
-"The namespace URI cannot be the empty string when binding to a prefix, %1."
+"Complex type %1 cannot be derived by extension from %2 as the latter "
+"contains %3 element in its content model."
 msgstr ""
 
-#: querytransformparser.ypp:3791
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:964
 #, qt-format
-msgid "%1 is an invalid namespace URI."
+msgid "Type of %1 element must be a simple type, %2 is not."
 msgstr ""
 
-#: querytransformparser.ypp:3797
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1026
 #, qt-format
-msgid "It is not possible to bind to the prefix %1"
+msgid "Substitution group %1 of %2 element cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:3804
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1035
 #, qt-format
-msgid ""
-"Namespace %1 can only be bound to %2 (and it is, in either case, pre-"
-"declared)."
+msgid "Substitution group %1 has circular definition."
 msgstr ""
 
-#: querytransformparser.ypp:3812
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1155
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1162
 #, qt-format
-msgid ""
-"Prefix %1 can only be bound to %2 (and it is, in either case, pre-declared)."
+msgid "Duplicated element names %1 in %2 element."
 msgstr ""
 
-#: querytransformparser.ypp:3827
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1191
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1243
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1314
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1342
 #, qt-format
-msgid "Two namespace declaration attributes have the same name: %1."
+msgid "Reference %1 of %2 element cannot be resolved."
 msgstr ""
 
-#: querytransformparser.ypp:3914
-msgid ""
-"The namespace URI must be a constant and cannot use enclosed expressions."
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1204
+#, qt-format
+msgid "Circular group reference for %1."
 msgstr ""
 
-#: querytransformparser.ypp:3930
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1220
 #, qt-format
-msgid "An attribute with name %1 has already appeared on this element."
+msgid "%1 element is not allowed in this scope"
 msgstr ""
 
-#: querytransformparser.ypp:3984
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1225
 #, qt-format
-msgid "A direct element constructor is not well-formed. %1 is ended with %2."
+msgid "%1 element cannot have %2 attribute with value other than %3."
 msgstr ""
 
-#: querytransformparser.ypp:4310
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1233
 #, qt-format
-msgid "The name %1 does not refer to any schema type."
+msgid "%1 element cannot have %2 attribute with value other than %3 or %4."
 msgstr ""
 
-#: querytransformparser.ypp:4320
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1324
 #, qt-format
 msgid ""
-"%1 is an complex type. Casting to complex types is not possible. However, "
-"casting to atomic types such as %2 works."
+"%1 or %2 attribute of reference %3 does not match with the attribute "
+"declaration %4."
 msgstr ""
 
-#: querytransformparser.ypp:4329
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1349
 #, qt-format
-msgid "%1 is not an atomic type. Casting is only possible to atomic types."
+msgid "Attribute group %1 has circular reference."
 msgstr ""
 
-#: querytransformparser.ypp:4395
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1480
 #, qt-format
-msgid "%1 is not a valid name for a processing-instruction."
+msgid "%1 attribute in %2 must have %3 use like in base type %4."
 msgstr ""
 
-#: querytransformparser.ypp:4447 querytransformparser.ypp:4503
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1532
 #, qt-format
 msgid ""
-"%1 is not in the in-scope attribute declarations. Note that the schema "
-"import feature is not supported."
+"Attribute wildcard of %1 is not a valid restriction of attribute wildcard of "
+"base type %2."
 msgstr ""
 
-#: querytransformparser.ypp:4553
-msgid "The name of an extension expression must be in a namespace."
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1539
+#, qt-format
+msgid "%1 has attribute wildcard but its base type %2 has not."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:184
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1565
 #, qt-format
 msgid ""
-"Attribute %1 cannot appear on the element %2. Only the standard attributes "
-"can appear."
+"Union of attribute wildcard of type %1 and attribute wildcard of its base "
+"type %2 is not expressible."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:190
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1613
 #, qt-format
 msgid ""
-"Attribute %1 cannot appear on the element %2. Only %3 is allowed, and the "
-"standard attributes."
+"Enumeration facet contains invalid content: {%1} is not a value of type %2."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:198
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1623
 #, qt-format
-msgid ""
-"Attribute %1 cannot appear on the element %2. Allowed is %3, %4, and the "
-"standard attributes."
+msgid "Namespace prefix of qualified name %1 is not defined."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:207
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1674
+#: xmlpatterns/schema/qxsdschemaresolver.cpp:1692
 #, qt-format
 msgid ""
-"Attribute %1 cannot appear on the element %2. Allowed is %3, and the "
-"standard attributes."
+"%1 element %2 is not a valid restriction of the %3 element it redefines: %4."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:220
+#: xmlpatterns/schema/qxsdschemaparser.cpp:170
 #, qt-format
-msgid ""
-"XSL-T attributes on XSL-T elements must be in the null namespace, not in the "
-"XSL-T namespace which %1 is."
+msgid "Can not process unknown element %1, expected elements are: %2."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:232
+#: xmlpatterns/schema/qxsdschemaparser.cpp:183
 #, qt-format
-msgid "The attribute %1 must appear on element %2."
+msgid "Element %1 is not allowed in this scope, possible elements are: %2."
 msgstr ""
 
-#: xmlpatterns/parser/qmaintainingreader.cpp:240
+#: xmlpatterns/schema/qxsdschemaparser.cpp:199
 #, qt-format
-msgid "The element with local name %1 does not exist in XSL-T."
+msgid ""
+"Child element is missing in that scope, possible child elements are: %1."
 msgstr ""
 
-#: xmlpatterns/parser/qparsercontext.cpp:93
-#, qt-format
-msgid "The variable %1 is unused"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:342
+msgid "Document is not a XML schema."
 msgstr ""
 
-#: xmlpatterns/functions/qcontextnodechecker.cpp:54
+#: xmlpatterns/schema/qxsdschemaparser.cpp:364
 #, qt-format
 msgid ""
-"The root node of the second argument to function %1 must be a document node. "
-"%2 is not a document node."
-msgstr ""
-
-#: xmlpatterns/functions/qsequencegeneratingfns.cpp:282
-msgid "The default collection is undefined"
+"%1 attribute of %2 element contains invalid content: {%3} is not a value of "
+"type %4."
 msgstr ""
 
-#: xmlpatterns/functions/qsequencegeneratingfns.cpp:295
+#: xmlpatterns/schema/qxsdschemaparser.cpp:370
 #, qt-format
-msgid "%1 cannot be retrieved"
+msgid "%1 attribute of %2 element contains invalid content: {%3}."
 msgstr ""
 
-#: xmlpatterns/functions/qcomparingaggregator.cpp:197
+#: xmlpatterns/schema/qxsdschemaparser.cpp:396
 #, qt-format
-msgid "The first argument to %1 cannot be of type %2."
+msgid ""
+"Target namespace %1 of included schema is different from the target "
+"namespace %2 as defined by the including schema."
 msgstr ""
 
-#: xmlpatterns/functions/qtimezonefns.cpp:87
+#: xmlpatterns/schema/qxsdschemaparser.cpp:410
+#: xmlpatterns/schema/qxsdschemaparser.cpp:421
 #, qt-format
 msgid ""
-"A zone offset must be in the range %1..%2 inclusive. %3 is out of range."
+"Target namespace %1 of imported schema is different from the target "
+"namespace %2 as defined by the importing schema."
 msgstr ""
 
-#: xmlpatterns/functions/qtimezonefns.cpp:99
+#: xmlpatterns/schema/qxsdschemaparser.cpp:664
 #, qt-format
-msgid "%1 is not a whole number of minutes."
+msgid ""
+"%1 element is not allowed to have the same %2 attribute value as the target "
+"namespace %3."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternplatform.cpp:92
+#: xmlpatterns/schema/qxsdschemaparser.cpp:672
 #, qt-format
-msgid "%1 matches newline characters"
+msgid ""
+"%1 element without %2 attribute is not allowed inside schema without target "
+"namespace."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternplatform.cpp:96
+#: xmlpatterns/schema/qxsdschemaparser.cpp:1523
+#: xmlpatterns/schema/qxsdschemaparser.cpp:1681
 #, qt-format
-msgid "%1 and %2 match the start and end of a line."
+msgid ""
+"%1 element is not allowed inside %2 element if %3 attribute is present."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternplatform.cpp:102
-msgid "Matches are case insensitive"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:1584
+#: xmlpatterns/schema/qxsdschemaparser.cpp:1703
+#: xmlpatterns/schema/qxsdschemaparser.cpp:1795
+#, qt-format
+msgid "%1 element has neither %2 attribute nor %3 child element."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternplatform.cpp:106
-msgid ""
-"Whitespace characters are removed, except when they appear in character "
-"classes"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:2630
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4104
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4336
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4343
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4603
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4620
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4878
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4884
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4901
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4907
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4924
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4935
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4946
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4957
+#, qt-format
+msgid "%1 element with %2 child element must not have a %3 attribute."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternplatform.cpp:206
+#: xmlpatterns/schema/qxsdschemaparser.cpp:3632
 #, qt-format
-msgid "%1 is an invalid regular expression pattern: %2"
+msgid "%1 attribute of %2 element must be %3 or %4."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternplatform.cpp:236
+#: xmlpatterns/schema/qxsdschemaparser.cpp:3668
 #, qt-format
-msgid "%1 is an invalid flag for regular expressions. Valid flags are:"
+msgid "%1 attribute of %2 element must have a value of %3."
 msgstr ""
 
-#: xmlpatterns/functions/qsequencefns.cpp:346
+#: xmlpatterns/schema/qxsdschemaparser.cpp:3675
+#: xmlpatterns/schema/qxsdschemaparser.cpp:3709
 #, qt-format
-msgid "It will not be possible to retrieve %1."
+msgid "%1 attribute of %2 element must have a value of %3 or %4."
 msgstr ""
 
-#: xmlpatterns/functions/qassemblestringfns.cpp:88
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4028
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4157
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4166
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4173
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4180
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4507
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4710
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4716
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4722
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4728
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4734
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4740
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4746
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4823
 #, qt-format
-msgid "%1 is not a valid XML 1.0 character."
+msgid "%1 element must not have %2 and %3 attribute together."
 msgstr ""
 
-#: xmlpatterns/functions/qdatetimefn.cpp:86
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4055
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4277
 #, qt-format
-msgid ""
-"If both values have zone offsets, they must have the same zone offset. %1 "
-"and %2 are not the same."
+msgid "Content of %1 attribute of %2 element must not be from namespace %3."
 msgstr ""
 
-#: xmlpatterns/functions/qqnamefns.cpp:69
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4062
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4284
 #, qt-format
-msgid "%1 is an invalid %2"
+msgid "%1 attribute of %2 element must not be %3."
 msgstr ""
 
-#: xmlpatterns/functions/qqnamefns.cpp:87
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4220
 #, qt-format
 msgid ""
-"If the first argument is the empty sequence or a zero-length string (no "
-"namespace), a prefix cannot be specified. Prefix %1 was specified."
+"%1 attribute of %2 element must have the value %3 because the %4 attribute "
+"is set."
 msgstr ""
 
-#: xmlpatterns/functions/qunparsedtextfn.cpp:65
-msgid "The URI cannot have a fragment"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4407
+msgid "Specifying use='prohibited' inside an attribute group has no effect."
 msgstr ""
 
-#: xmlpatterns/functions/qstringvaluefns.cpp:252
+#: xmlpatterns/schema/qxsdschemaparser.cpp:4760
 #, qt-format
-msgid ""
-"The normalization form %1 is unsupported. The supported forms are %2, %3, "
-"%4, and %5, and none, i.e. the empty string (no normalization)."
+msgid "%1 element must have either %2 or %3 attribute."
 msgstr ""
 
-#: xmlpatterns/functions/qerrorfn.cpp:61
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5314
 #, qt-format
-msgid "%1 was called."
+msgid ""
+"%1 element must have either %2 attribute or %3 or %4 as child element."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternmatchingfns.cpp:94
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5369
 #, qt-format
-msgid ""
-"%1 must be followed by %2 or %3, not at the end of the replacement string."
+msgid "%1 element requires either %2 or %3 attribute."
 msgstr ""
 
-#: xmlpatterns/functions/qpatternmatchingfns.cpp:133
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5388
 #, qt-format
-msgid ""
-"In the replacement string, %1 must be followed by at least one digit when "
-"not escaped."
+msgid "Text or entity references not allowed inside %1 element"
 msgstr ""
 
-#: xmlpatterns/functions/qpatternmatchingfns.cpp:159
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5429
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5541
 #, qt-format
-msgid ""
-"In the replacement string, %1 can only be used to escape itself or %2, not %3"
+msgid "%1 attribute of %2 element must contain %3, %4 or a list of URIs."
 msgstr ""
 
-#: xmlpatterns/functions/qaggregatefns.cpp:120
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5667
 #, qt-format
-msgid ""
-"The first argument to %1 cannot be of type %2. It must be a numeric type, "
-"xs:yearMonthDuration or xs:dayTimeDuration."
+msgid "%1 element is not allowed in this context."
 msgstr ""
 
-#: xmlpatterns/functions/qaggregatefns.cpp:194
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5720
 #, qt-format
-msgid ""
-"The first argument to %1 cannot be of type %2. It must be of type %3, %4, or "
-"%5."
+msgid "%1 attribute of %2 element has larger value than %3 attribute."
 msgstr ""
 
-#: xmlpatterns/functions/qaggregatefns.cpp:285
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5745
 #, qt-format
-msgid ""
-"The second argument to %1 cannot be of type %2. It must be of type %3, %4, "
-"or %5."
+msgid "Prefix of qualified name %1 is not defined."
 msgstr ""
 
-#: xmlpatterns/type/qtypechecker.cpp:63
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5810
+#: xmlpatterns/schema/qxsdschemaparser.cpp:5871
 #, qt-format
-msgid "Required type is %1, but %2 was found."
+msgid ""
+"%1 attribute of %2 element must either contain %3 or the other values."
 msgstr ""
 
-#: xmlpatterns/type/qtypechecker.cpp:107
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6002
 #, qt-format
-msgid "Promoting %1 to %2 may cause loss of precision."
+msgid "Component with ID %1 has been defined previously."
 msgstr ""
 
-#: xmlpatterns/type/qtypechecker.cpp:156
-msgid "The focus is undefined."
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6019
+#, qt-format
+msgid "Element %1 already defined."
 msgstr ""
 
-#: xmlpatterns/type/qcardinality.cpp:55
-msgid "empty"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6030
+#, qt-format
+msgid "Attribute %1 already defined."
 msgstr ""
 
-#: xmlpatterns/type/qcardinality.cpp:57
-msgid "zero or one"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6045
+#, qt-format
+msgid "Type %1 already defined."
 msgstr ""
 
-#: xmlpatterns/type/qcardinality.cpp:59
-msgid "exactly one"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6068
+#, qt-format
+msgid "Attribute group %1 already defined."
 msgstr ""
 
-#: xmlpatterns/type/qcardinality.cpp:61
-msgid "one or more"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6079
+#, qt-format
+msgid "Element group %1 already defined."
 msgstr ""
 
-#: xmlpatterns/type/qcardinality.cpp:63
-msgid "zero or more"
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6090
+#, qt-format
+msgid "Notation %1 already defined."
 msgstr ""
 
-#: xmlpatterns/data/qabstractduration.cpp:99
-#: xmlpatterns/data/qabstractduration.cpp:114
-msgid "At least one component must be present."
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6101
+#, qt-format
+msgid "Identity constraint %1 already defined."
 msgstr ""
 
-#: xmlpatterns/data/qabstractduration.cpp:107
+#: xmlpatterns/schema/qxsdschemaparser.cpp:6112
 #, qt-format
-msgid "At least one time component must appear after the %1-delimiter."
+msgid "Duplicated facets in simple type %1."
 msgstr ""
 
-#: xmlpatterns/data/qatomicvalue.cpp:79
-#, qt-format
-msgid "A value of type %1 cannot have an Effective Boolean Value."
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:165
+msgid "Empty particle cannot be derived from non-empty particle."
 msgstr ""
 
-#: xmlpatterns/data/qhexbinary.cpp:92
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:180
 #, qt-format
-msgid ""
-"A value of type %1 must contain an even number of digits. The value %2 does "
-"not."
+msgid "Derived particle is missing element %1."
 msgstr ""
 
-#: xmlpatterns/data/qhexbinary.cpp:111
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:187
 #, qt-format
-msgid "%1 is not valid as a value of type %2."
+msgid ""
+"Derived element %1 is missing value constraint as defined in base particle."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:80
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:192
 #, qt-format
-msgid "Year %1 is invalid because it begins with %2."
+msgid "Derived element %1 has weaker value constraint than base particle."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:99
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:199
 #, qt-format
-msgid "Day %1 is outside the range %2..%3."
+msgid ""
+"Fixed value constraint of element %1 differs from value constraint in base "
+"particle."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:106
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:206
 #, qt-format
-msgid "Month %1 is outside the range %2..%3."
+msgid ""
+"Derived element %1 cannot be nillable as base element is not nillable."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:117
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:216
 #, qt-format
-msgid "Overflow: Can't represent date %1."
+msgid ""
+"Block constraints of derived element %1 must not be more weaker than in the "
+"base element."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:125
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:227
 #, qt-format
-msgid "Day %1 is invalid for month %2."
+msgid ""
+"Simple type of derived element %1 cannot be validly derived from base "
+"element."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:174
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:232
 #, qt-format
 msgid ""
-"Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and "
-"milliseconds are not all 0; "
+"Complex type of derived element %1 cannot be validly derived from base "
+"element."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:187
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:256
 #, qt-format
-msgid "Time %1:%2:%3.%4 is invalid."
+msgid "Element %1 is missing in derived particle."
 msgstr ""
 
-#: xmlpatterns/data/qabstractdatetime.cpp:302
-msgid "Overflow: Date can't be represented."
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:274
+#, qt-format
+msgid ""
+"Element %1 does not match namespace constraint of wildcard in base particle."
 msgstr ""
 
-#: xmlpatterns/data/qatomicmathematicians.cpp:65
-#, qt-format
-msgid "Integer division (%1) by zero (%2) is undefined."
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:285
+msgid ""
+"Wildcard in derived particle is not a valid subset of wildcard in base "
+"particle."
 msgstr ""
 
-#: xmlpatterns/data/qatomicmathematicians.cpp:72
-#, qt-format
-msgid "Division (%1) by zero (%2) is undefined."
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:290
+msgid ""
+"processContent of wildcard in derived particle is weaker than wildcard in "
+"base particle."
 msgstr ""
 
-#: xmlpatterns/data/qatomicmathematicians.cpp:79
-#, qt-format
-msgid "Modulus division (%1) by zero (%2) is undefined."
+#: xmlpatterns/schema/qxsdparticlechecker.cpp:560
+msgid ""
+"Derived particle allows content that is not allowed in the base particle."
 msgstr ""
 
-#: xmlpatterns/data/qatomicmathematicians.cpp:202
-#: xmlpatterns/data/qatomicmathematicians.cpp:234
+#: xmlpatterns/schema/qxsdschemahelper.cpp:691
+#: xmlpatterns/schema/qxsdschemahelper.cpp:754
 #, qt-format
-msgid "Dividing a value of type %1 by %2 (not-a-number) is not allowed."
+msgid "Base attribute %1 is required but derived attribute is not."
 msgstr ""
 
-#: xmlpatterns/data/qatomicmathematicians.cpp:214
+#: xmlpatterns/schema/qxsdschemahelper.cpp:697
 #, qt-format
 msgid ""
-"Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed."
+"Type of derived attribute %1 cannot be validly derived from type of base "
+"attribute."
 msgstr ""
 
-#: xmlpatterns/data/qatomicmathematicians.cpp:246
+#: xmlpatterns/schema/qxsdschemahelper.cpp:725
 #, qt-format
 msgid ""
-"Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is "
-"not allowed."
+"Value constraint of derived attribute %1 does not match value constraint of "
+"base attribute."
 msgstr ""
 
-#: xmlpatterns/data/qabstractfloatmathematician.cpp:64
+#: xmlpatterns/schema/qxsdschemahelper.cpp:730
 #, qt-format
-msgid "No operand in an integer division, %1, can be %2."
+msgid "Derived attribute %1 does not exist in the base definition."
 msgstr ""
 
-#: xmlpatterns/data/qabstractfloatmathematician.cpp:71
+#: xmlpatterns/schema/qxsdschemahelper.cpp:741
 #, qt-format
 msgid ""
-"The first operand in an integer division, %1, cannot be infinity (%2)."
+"Derived attribute %1 does not match the wildcard in the base definition."
 msgstr ""
 
-#: xmlpatterns/data/qabstractfloatmathematician.cpp:77
+#: xmlpatterns/schema/qxsdschemahelper.cpp:758
 #, qt-format
-msgid "The second operand in a division, %1, cannot be zero (%2)."
+msgid "Base attribute %1 is required but missing in derived definition."
 msgstr ""
 
-#: xmlpatterns/data/qboolean.cpp:78
+#: xmlpatterns/schema/qxsdschemahelper.cpp:767
+#, qt-format
 msgid ""
-"Effective Boolean Value cannot be calculated for a sequence containing two "
-"or more atomic values."
-msgstr ""
-
-#: xmlpatterns/utils/qoutputvalidator.cpp:86
-msgid "It's not possible to add attributes after any other kind of node."
+"Derived definition contains an %1 element that does not exists in the base "
+"definition"
 msgstr ""
 
-#: xmlpatterns/utils/qoutputvalidator.cpp:93
-#, qt-format
-msgid "An attribute by name %1 has already been created."
+#: xmlpatterns/schema/qxsdschemahelper.cpp:772
+msgid "Derived wildcard is not a subset of the base wildcard."
 msgstr ""
 
-#: xmlpatterns/api/qxmlserializer.cpp:321
+#: xmlpatterns/schema/qxsdschemahelper.cpp:777
 #, qt-format
 msgid ""
-"Element %1 can't be serialized because it appears outside the document "
-"element."
+"%1 of derived wildcard is not a valid restriction of %2 of base wildcard"
 msgstr ""
 
-#: xmlpatterns/api/qxmlserializer.cpp:381
+#: xmlpatterns/schema/qxsdschemahelper.cpp:800
 #, qt-format
-msgid "Attribute %1 can't be serialized because it appears at the top level."
-msgstr ""
-
-#: xmlpatterns/api/qiodevicedelegate.cpp:84
-msgid "Network timeout."
+msgid "Attribute %1 from base type is missing in derived type."
 msgstr ""
 
-#: xmlpatterns/api/qcoloringmessagehandler.cpp:87
+#: xmlpatterns/schema/qxsdschemahelper.cpp:805
 #, qt-format
-msgid "Warning in %1, at line %2, column %3: %4"
+msgid "Type of derived attribute %1 differs from type of base attribute."
 msgstr ""
 
-#: xmlpatterns/api/qcoloringmessagehandler.cpp:94
+#: xmlpatterns/schema/qxsdschemahelper.cpp:813
 #, qt-format
-msgid "Warning in %1: %2"
+msgid ""
+"Base definition contains an %1 element that is missing in the derived "
+"definition"
 msgstr ""
 
-#: xmlpatterns/api/qcoloringmessagehandler.cpp:110
-msgid "Unknown location"
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:160
+#, qt-format
+msgid "Element %1 is missing child element."
 msgstr ""
 
-#: xmlpatterns/api/qcoloringmessagehandler.cpp:124
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:176
 #, qt-format
-msgid "Error %1 in %2, at line %3, column %4: %5"
+msgid "There is one IDREF value with no corresponding ID: %1."
 msgstr ""
 
-#: xmlpatterns/api/qcoloringmessagehandler.cpp:132
-#, qt-format
-msgid "Error %1 in %2: %3"
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:203
+msgid "Loaded schema file is invalid."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:170
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:219
 #, qt-format
-msgid "Can not process unknown element %1, expected elements are: %2."
+msgid "%1 contains invalid data."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:183
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:232
 #, qt-format
-msgid "Element %1 is not allowed in this scope, possible elements are: %2."
+msgid ""
+"xsi:schemaLocation namespace %1 has already appeared earlier in the instance "
+"document."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:199
-#, qt-format
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:254
 msgid ""
-"Child element is missing in that scope, possible child elements are: %1."
+"xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace "
+"element or attribute."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:342
-msgid "Document is not a XML schema."
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:272
+msgid "No schema defined for validation."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:364
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:282
 #, qt-format
-msgid ""
-"%1 attribute of %2 element contains invalid content: {%3} is not a value of "
-"type %4."
+msgid "No definition for element %1 available."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:370
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:300
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:349
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:491
 #, qt-format
-msgid "%1 attribute of %2 element contains invalid content: {%3}."
+msgid "Specified type %1 is not known to the schema."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:396
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:315
 #, qt-format
-msgid ""
-"Target namespace %1 of included schema is different from the target "
-"namespace %2 as defined by the including schema."
+msgid "Element %1 is not defined in this scope."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:410
-#: xmlpatterns/schema/qxsdschemaparser.cpp:421
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:358
 #, qt-format
-msgid ""
-"Target namespace %1 of imported schema is different from the target "
-"namespace %2 as defined by the importing schema."
+msgid "Declaration for element %1 does not exist."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:664
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:370
 #, qt-format
-msgid ""
-"%1 element is not allowed to have the same %2 attribute value as the target "
-"namespace %3."
+msgid "Element %1 contains invalid content."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:672
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:443
 #, qt-format
-msgid ""
-"%1 element without %2 attribute is not allowed inside schema without target "
-"namespace."
+msgid "Element %1 is declared as abstract."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:1523
-#: xmlpatterns/schema/qxsdschemaparser.cpp:1681
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:450
 #, qt-format
-msgid ""
-"%1 element is not allowed inside %2 element if %3 attribute is present."
+msgid "Element %1 is not nillable."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:1584
-#: xmlpatterns/schema/qxsdschemaparser.cpp:1703
-#: xmlpatterns/schema/qxsdschemaparser.cpp:1795
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:458
 #, qt-format
-msgid "%1 element has neither %2 attribute nor %3 child element."
+msgid "Attribute %1 contains invalid data: %2"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:2630
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4104
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4336
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4343
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4603
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4620
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4878
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4884
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4901
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4907
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4924
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4935
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4946
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4957
-#, qt-format
-msgid "%1 element with %2 child element must not have a %3 attribute."
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:466
+msgid "Element contains content although it is nillable."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:3632
-#, qt-format
-msgid "%1 attribute of %2 element must be %3 or %4."
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:472
+msgid "Fixed value constraint not allowed if element is nillable."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:3668
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:504
 #, qt-format
-msgid "%1 attribute of %2 element must have a value of %3."
+msgid "Specified type %1 is not validly substitutable with element type %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:3675
-#: xmlpatterns/schema/qxsdschemaparser.cpp:3709
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:527
 #, qt-format
-msgid "%1 attribute of %2 element must have a value of %3 or %4."
+msgid "Complex type %1 is not allowed to be abstract."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4028
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4157
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4166
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4173
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4180
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4507
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4710
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4716
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4722
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4728
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4734
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4740
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4746
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4823
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:548
 #, qt-format
-msgid "%1 element must not have %2 and %3 attribute together."
+msgid "Element %1 contains not allowed attributes."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4055
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4277
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:554
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:651
 #, qt-format
-msgid "Content of %1 attribute of %2 element must not be from namespace %3."
+msgid "Element %1 contains not allowed child element."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4062
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4284
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:575
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:668
 #, qt-format
-msgid "%1 attribute of %2 element must not be %3."
+msgid "Content of element %1 does not match its type definition: %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4220
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:583
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:675
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:716
 #, qt-format
-msgid ""
-"%1 attribute of %2 element must have the value %3 because the %4 attribute "
-"is set."
+msgid "Content of element %1 does not match defined value constraint."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4407
-msgid "Specifying use='prohibited' inside an attribute group has no effect."
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:643
+#, qt-format
+msgid "Element %1 contains not allowed child content."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:4760
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:684
 #, qt-format
-msgid "%1 element must have either %2 or %3 attribute."
+msgid "Element %1 contains not allowed text content."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5314
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:702
 #, qt-format
-msgid ""
-"%1 element must have either %2 attribute or %3 or %4 as child element."
+msgid "Element %1 cannot contain other elements, as it has fixed content."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5369
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:745
 #, qt-format
-msgid "%1 element requires either %2 or %3 attribute."
+msgid "Element %1 is missing required attribute %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5388
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:774
 #, qt-format
-msgid "Text or entity references not allowed inside %1 element"
+msgid "Attribute %1 does not match the attribute wildcard."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5429
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5541
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:783
 #, qt-format
-msgid "%1 attribute of %2 element must contain %3, %4 or a list of URIs."
+msgid "Declaration for attribute %1 does not exist."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5667
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:789
 #, qt-format
-msgid "%1 element is not allowed in this context."
+msgid "Element %1 contains two attributes of type %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5720
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:800
 #, qt-format
-msgid "%1 attribute of %2 element has larger value than %3 attribute."
+msgid "Attribute %1 contains invalid content."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5745
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:807
 #, qt-format
-msgid "Prefix of qualified name %1 is not defined."
+msgid "Element %1 contains unknown attribute %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5810
-#: xmlpatterns/schema/qxsdschemaparser.cpp:5871
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:847
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:893
 #, qt-format
-msgid ""
-"%1 attribute of %2 element must either contain %3 or the other values."
+msgid "Content of attribute %1 does not match its type definition: %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6002
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:855
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:901
 #, qt-format
-msgid "Component with ID %1 has been defined previously."
+msgid "Content of attribute %1 does not match defined value constraint."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6019
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:989
 #, qt-format
-msgid "Element %1 already defined."
+msgid "Non-unique value found for constraint %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6030
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1009
 #, qt-format
-msgid "Attribute %1 already defined."
+msgid "Key constraint %1 contains absent fields."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6045
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1027
 #, qt-format
-msgid "Type %1 already defined."
+msgid "Key constraint %1 contains references nillable element %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6068
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1067
 #, qt-format
-msgid "Attribute group %1 already defined."
+msgid "No referenced value found for key reference %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6079
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1131
 #, qt-format
-msgid "Element group %1 already defined."
+msgid "More than one value found for field %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6090
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1151
 #, qt-format
-msgid "Notation %1 already defined."
+msgid "Field %1 has no simple type."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6101
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1224
 #, qt-format
-msgid "Identity constraint %1 already defined."
+msgid "ID value '%1' is not unique."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaparser.cpp:6112
+#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1235
 #, qt-format
-msgid "Duplicated facets in simple type %1."
+msgid "'%1' attribute contains invalid QName content: %2."
 msgstr ""
 
 #: xmlpatterns/schema/qxsdschemachecker.cpp:227
@@ -6061,2570 +6225,2378 @@
 msgid "Particle contains non-deterministic wildcards."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:354
-#, qt-format
-msgid "%1 references unknown %2 or %3 element %4."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:364
-#, qt-format
-msgid "%1 references identity constraint %2 that is no %3 or %4 element."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:374
-#, qt-format
-msgid ""
-"%1 has a different number of fields from the identity constraint %2 that it "
-"references."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:397
-#, qt-format
-msgid "Base type %1 of %2 element cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:481
-#, qt-format
-msgid "Item type %1 of %2 element cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:512
-#, qt-format
-msgid "Member type %1 of %2 element cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:540
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:955
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:985
-#, qt-format
-msgid "Type %1 of %2 element cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:562
-#, qt-format
-msgid "Base type %1 of complex type cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:571
-#, qt-format
-msgid "%1 cannot have complex base type that has a %2."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:857
-#, qt-format
-msgid ""
-"Content model of complex type %1 contains %2 element, so it cannot be "
-"derived by extension from a non-empty type."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:863
-#, qt-format
-msgid ""
-"Complex type %1 cannot be derived by extension from %2 as the latter "
-"contains %3 element in its content model."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:964
-#, qt-format
-msgid "Type of %1 element must be a simple type, %2 is not."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1026
-#, qt-format
-msgid "Substitution group %1 of %2 element cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1035
-#, qt-format
-msgid "Substitution group %1 has circular definition."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1155
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1162
-#, qt-format
-msgid "Duplicated element names %1 in %2 element."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1191
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1243
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1314
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1342
-#, qt-format
-msgid "Reference %1 of %2 element cannot be resolved."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1204
-#, qt-format
-msgid "Circular group reference for %1."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1220
-#, qt-format
-msgid "%1 element is not allowed in this scope"
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1225
-#, qt-format
-msgid "%1 element cannot have %2 attribute with value other than %3."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1233
-#, qt-format
-msgid "%1 element cannot have %2 attribute with value other than %3 or %4."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1324
-#, qt-format
-msgid ""
-"%1 or %2 attribute of reference %3 does not match with the attribute "
-"declaration %4."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1349
-#, qt-format
-msgid "Attribute group %1 has circular reference."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1480
-#, qt-format
-msgid "%1 attribute in %2 must have %3 use like in base type %4."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1532
-#, qt-format
-msgid ""
-"Attribute wildcard of %1 is not a valid restriction of attribute wildcard of "
-"base type %2."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1539
-#, qt-format
-msgid "%1 has attribute wildcard but its base type %2 has not."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1565
-#, qt-format
-msgid ""
-"Union of attribute wildcard of type %1 and attribute wildcard of its base "
-"type %2 is not expressible."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1613
-#, qt-format
-msgid ""
-"Enumeration facet contains invalid content: {%1} is not a value of type %2."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1623
-#, qt-format
-msgid "Namespace prefix of qualified name %1 is not defined."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1674
-#: xmlpatterns/schema/qxsdschemaresolver.cpp:1692
-#, qt-format
-msgid ""
-"%1 element %2 is not a valid restriction of the %3 element it redefines: %4."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:160
+#: xmlpatterns/data/qatomicmathematicians.cpp:65
 #, qt-format
-msgid "Element %1 is missing child element."
+msgid "Integer division (%1) by zero (%2) is undefined."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:176
+#: xmlpatterns/data/qatomicmathematicians.cpp:72
 #, qt-format
-msgid "There is one IDREF value with no corresponding ID: %1."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:203
-msgid "Loaded schema file is invalid."
+msgid "Division (%1) by zero (%2) is undefined."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:219
+#: xmlpatterns/data/qatomicmathematicians.cpp:79
 #, qt-format
-msgid "%1 contains invalid data."
+msgid "Modulus division (%1) by zero (%2) is undefined."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:232
+#: xmlpatterns/data/qatomicmathematicians.cpp:202
+#: xmlpatterns/data/qatomicmathematicians.cpp:234
 #, qt-format
-msgid ""
-"xsi:schemaLocation namespace %1 has already appeared earlier in the instance "
-"document."
+msgid "Dividing a value of type %1 by %2 (not-a-number) is not allowed."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:254
+#: xmlpatterns/data/qatomicmathematicians.cpp:214
+#, qt-format
 msgid ""
-"xsi:noNamespaceSchemaLocation cannot appear after the first no-namespace "
-"element or attribute."
-msgstr ""
-
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:272
-msgid "No schema defined for validation."
+"Dividing a value of type %1 by %2 or %3 (plus or minus zero) is not allowed."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:282
+#: xmlpatterns/data/qatomicmathematicians.cpp:246
 #, qt-format
-msgid "No definition for element %1 available."
+msgid ""
+"Multiplication of a value of type %1 by %2 or %3 (plus or minus infinity) is "
+"not allowed."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:300
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:349
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:491
+#: xmlpatterns/data/qabstractdatetime.cpp:80
 #, qt-format
-msgid "Specified type %1 is not known to the schema."
+msgid "Year %1 is invalid because it begins with %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:315
+#: xmlpatterns/data/qabstractdatetime.cpp:99
 #, qt-format
-msgid "Element %1 is not defined in this scope."
+msgid "Day %1 is outside the range %2..%3."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:358
+#: xmlpatterns/data/qabstractdatetime.cpp:106
 #, qt-format
-msgid "Declaration for element %1 does not exist."
+msgid "Month %1 is outside the range %2..%3."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:370
+#: xmlpatterns/data/qabstractdatetime.cpp:117
 #, qt-format
-msgid "Element %1 contains invalid content."
+msgid "Overflow: Can't represent date %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:443
+#: xmlpatterns/data/qabstractdatetime.cpp:125
 #, qt-format
-msgid "Element %1 is declared as abstract."
+msgid "Day %1 is invalid for month %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:450
+#: xmlpatterns/data/qabstractdatetime.cpp:174
 #, qt-format
-msgid "Element %1 is not nillable."
+msgid ""
+"Time 24:%1:%2.%3 is invalid. Hour is 24, but minutes, seconds, and "
+"milliseconds are not all 0; "
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:458
+#: xmlpatterns/data/qabstractdatetime.cpp:187
 #, qt-format
-msgid "Attribute %1 contains invalid data: %2"
+msgid "Time %1:%2:%3.%4 is invalid."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:466
-msgid "Element contains content although it is nillable."
+#: xmlpatterns/data/qabstractdatetime.cpp:302
+msgid "Overflow: Date can't be represented."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:472
-msgid "Fixed value constraint not allowed if element is nillable."
+#: xmlpatterns/data/qabstractfloatmathematician.cpp:64
+#, qt-format
+msgid "No operand in an integer division, %1, can be %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:504
+#: xmlpatterns/data/qabstractfloatmathematician.cpp:71
 #, qt-format
-msgid "Specified type %1 is not validly substitutable with element type %2."
+msgid ""
+"The first operand in an integer division, %1, cannot be infinity (%2)."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:527
+#: xmlpatterns/data/qabstractfloatmathematician.cpp:77
 #, qt-format
-msgid "Complex type %1 is not allowed to be abstract."
+msgid "The second operand in a division, %1, cannot be zero (%2)."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:548
-#, qt-format
-msgid "Element %1 contains not allowed attributes."
+#: xmlpatterns/data/qabstractduration.cpp:99
+#: xmlpatterns/data/qabstractduration.cpp:114
+msgid "At least one component must be present."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:554
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:651
+#: xmlpatterns/data/qabstractduration.cpp:107
 #, qt-format
-msgid "Element %1 contains not allowed child element."
+msgid "At least one time component must appear after the %1-delimiter."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:575
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:668
-#, qt-format
-msgid "Content of element %1 does not match its type definition: %2."
+#: xmlpatterns/data/qboolean.cpp:78
+msgid ""
+"Effective Boolean Value cannot be calculated for a sequence containing two "
+"or more atomic values."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:583
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:675
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:716
+#: xmlpatterns/data/qatomicvalue.cpp:79
 #, qt-format
-msgid "Content of element %1 does not match defined value constraint."
+msgid "A value of type %1 cannot have an Effective Boolean Value."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:643
+#: xmlpatterns/data/qhexbinary.cpp:92
 #, qt-format
-msgid "Element %1 contains not allowed child content."
+msgid ""
+"A value of type %1 must contain an even number of digits. The value %2 does "
+"not."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:684
+#: xmlpatterns/data/qhexbinary.cpp:111
 #, qt-format
-msgid "Element %1 contains not allowed text content."
+msgid "%1 is not valid as a value of type %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:702
+#: xmlpatterns/acceltree/qacceltreeresourceloader.cpp:344
 #, qt-format
-msgid "Element %1 cannot contain other elements, as it has fixed content."
+msgid "%1 is an unsupported encoding."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:745
+#: xmlpatterns/acceltree/qacceltreeresourceloader.cpp:360
 #, qt-format
-msgid "Element %1 is missing required attribute %2."
+msgid "%1 contains octets which are disallowed in the requested encoding %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:774
+#: xmlpatterns/acceltree/qacceltreeresourceloader.cpp:378
 #, qt-format
-msgid "Attribute %1 does not match the attribute wildcard."
+msgid ""
+"The codepoint %1, occurring in %2 using encoding %3, is an invalid XML "
+"character."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:783
+#: xmlpatterns/acceltree/qacceltreebuilder.cpp:216
 #, qt-format
-msgid "Declaration for attribute %1 does not exist."
+msgid "An %1-attribute with value %2 has already been declared."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:789
+#: xmlpatterns/acceltree/qacceltreebuilder.cpp:229
 #, qt-format
-msgid "Element %1 contains two attributes of type %2."
+msgid "An %1-attribute must have a valid %2 as value, which %3 isn't."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:800
+#: xmlpatterns/expr/qcommentconstructor.cpp:67
 #, qt-format
-msgid "Attribute %1 contains invalid content."
+msgid "A comment cannot contain %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:807
+#: xmlpatterns/expr/qcommentconstructor.cpp:73
 #, qt-format
-msgid "Element %1 contains unknown attribute %2."
+msgid "A comment cannot end with a %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:847
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:893
+#: xmlpatterns/expr/qarithmeticexpression.cpp:208
 #, qt-format
-msgid "Content of attribute %1 does not match its type definition: %2."
+msgid "Operator %1 cannot be used on type %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:855
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:901
+#: xmlpatterns/expr/qarithmeticexpression.cpp:224
 #, qt-format
-msgid "Content of attribute %1 does not match defined value constraint."
+msgid "Operator %1 cannot be used on atomic values of type %2 and %3."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:989
-#, qt-format
-msgid "Non-unique value found for constraint %1."
+#: xmlpatterns/expr/qevaluationcache.cpp:116
+msgid "Circularity detected"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1009
-#, qt-format
-msgid "Key constraint %1 contains absent fields."
+#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:69
+msgid ""
+"In a namespace constructor, the value for a namespace cannot be an empty "
+"string."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1027
+#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:80
 #, qt-format
-msgid "Key constraint %1 contains references nillable element %2."
+msgid "The prefix must be a valid %1, which %2 is not."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1067
+#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:94
 #, qt-format
-msgid "No referenced value found for key reference %1."
+msgid "The prefix %1 cannot be bound."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1131
+#: xmlpatterns/expr/qcomputednamespaceconstructor.cpp:104
 #, qt-format
-msgid "More than one value found for field %1."
+msgid "Only the prefix %1 can be bound to %2 and vice versa."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1151
+#: xmlpatterns/expr/qcastas.cpp:88
 #, qt-format
-msgid "Field %1 has no simple type."
+msgid "Type error in cast, expected %1, received %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1224
+#: xmlpatterns/expr/qcastas.cpp:117
 #, qt-format
-msgid "ID value '%1' is not unique."
+msgid ""
+"When casting to %1 or types derived from it, the source value must be of the "
+"same type, or it must be a string literal. Type %2 is not allowed."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdvalidatinginstancereader.cpp:1235
-#, qt-format
-msgid "'%1' attribute contains invalid QName content: %2."
+#: xmlpatterns/expr/qapplytemplate.cpp:119
+msgid "Ambiguous rule match."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:691
-#: xmlpatterns/schema/qxsdschemahelper.cpp:754
+#: xmlpatterns/expr/qcomparisonplatform.cpp:167
 #, qt-format
-msgid "Base attribute %1 is required but derived attribute is not."
+msgid "No comparisons can be done involving the type %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:697
+#: xmlpatterns/expr/qcomparisonplatform.cpp:181
 #, qt-format
-msgid ""
-"Type of derived attribute %1 cannot be validly derived from type of base "
-"attribute."
+msgid "Operator %1 is not available between atomic values of type %2 and %3."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:725
+#: xmlpatterns/expr/qgenericpredicate.cpp:106
 #, qt-format
 msgid ""
-"Value constraint of derived attribute %1 does not match value constraint of "
-"base attribute."
+"A value of type %1 cannot be a predicate. A predicate must have either a "
+"numeric type or an Effective Boolean Value type."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:730
-#, qt-format
-msgid "Derived attribute %1 does not exist in the base definition."
+#: xmlpatterns/expr/qgenericpredicate.cpp:138
+msgid "A positional predicate must evaluate to a single numeric value."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:741
+#: xmlpatterns/expr/qcastingplatform.cpp:136
 #, qt-format
-msgid ""
-"Derived attribute %1 does not match the wildcard in the base definition."
+msgid "No casting is possible with %1 as the target type."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:758
+#: xmlpatterns/expr/qcastingplatform.cpp:151
 #, qt-format
-msgid "Base attribute %1 is required but missing in derived definition."
+msgid "It is not possible to cast from %1 to %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:767
+#: xmlpatterns/expr/qcastingplatform.cpp:178
 #, qt-format
 msgid ""
-"Derived definition contains an %1 element that does not exists in the base "
-"definition"
-msgstr ""
-
-#: xmlpatterns/schema/qxsdschemahelper.cpp:772
-msgid "Derived wildcard is not a subset of the base wildcard."
+"Casting to %1 is not possible because it is an abstract type, and can "
+"therefore never be instantiated."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:777
+#: xmlpatterns/expr/qcastingplatform.cpp:201
 #, qt-format
-msgid ""
-"%1 of derived wildcard is not a valid restriction of %2 of base wildcard"
+msgid "It's not possible to cast the value %1 of type %2 to %3"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:800
+#: xmlpatterns/expr/qcastingplatform.cpp:209
 #, qt-format
-msgid "Attribute %1 from base type is missing in derived type."
+msgid "Failure when casting from %1 to %2: %3"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:805
+#: xmlpatterns/expr/qqnameconstructor.cpp:82
 #, qt-format
-msgid "Type of derived attribute %1 differs from type of base attribute."
+msgid "No namespace binding exists for the prefix %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdschemahelper.cpp:813
+#: xmlpatterns/expr/qprocessinginstructionconstructor.cpp:84
 #, qt-format
-msgid ""
-"Base definition contains an %1 element that is missing in the derived "
-"definition"
+msgid "The data of a processing instruction cannot contain the string %1"
 msgstr ""
-
-#: xmlpatterns/schema/qxsdtypechecker.cpp:235
-#: xmlpatterns/schema/qxsdtypechecker.cpp:242
-#: xmlpatterns/schema/qxsdtypechecker.cpp:263
+
+#: xmlpatterns/expr/qattributenamevalidator.cpp:66
 #, qt-format
-msgid "%1 is not valid according to %2."
+msgid "The namespace URI in the name for a computed attribute cannot be %1."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:430
-msgid "String content does not match the length facet."
+#: xmlpatterns/expr/qattributenamevalidator.cpp:75
+#, qt-format
+msgid ""
+"The name for a computed attribute cannot have the namespace URI %1 with the "
+"local name %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:438
-msgid "String content does not match the minLength facet."
+#: xmlpatterns/expr/qdocumentcontentvalidator.cpp:86
+#, qt-format
+msgid ""
+"An attribute node cannot be a child of a document node. Therefore, the "
+"attribute %1 is out of place."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:446
-msgid "String content does not match the maxLength facet."
+#: xmlpatterns/expr/qexpressionfactory.cpp:162
+msgid ""
+"A library module cannot be evaluated directly. It must be imported from a "
+"main module."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:464
-msgid "String content does not match pattern facet."
+#: xmlpatterns/expr/qexpressionfactory.cpp:202
+#, qt-format
+msgid "No template by name %1 exists."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:482
-msgid "String content is not listed in the enumeration facet."
+#: xmlpatterns/expr/qpath.cpp:109
+msgid ""
+"The last step in a path must contain either nodes or atomic values. It "
+"cannot be a mixture between the two."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:499
-msgid "Signed integer content does not match the maxInclusive facet."
+#: xmlpatterns/expr/qtemplate.cpp:74
+#, qt-format
+msgid "The parameter %1 is passed, but no corresponding %2 exists."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:507
-msgid "Signed integer content does not match the maxExclusive facet."
+#: xmlpatterns/expr/qtemplate.cpp:145
+#, qt-format
+msgid "The parameter %1 is required, but no corresponding %2 is supplied."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:515
-msgid "Signed integer content does not match the minInclusive facet."
+#: xmlpatterns/type/qtypechecker.cpp:63
+#, qt-format
+msgid "Required type is %1, but %2 was found."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:523
-msgid "Signed integer content does not match the minExclusive facet."
+#: xmlpatterns/type/qtypechecker.cpp:107
+#, qt-format
+msgid "Promoting %1 to %2 may cause loss of precision."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:541
-msgid "Signed integer content is not listed in the enumeration facet."
+#: xmlpatterns/type/qtypechecker.cpp:156
+msgid "The focus is undefined."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:559
-msgid "Signed integer content does not match pattern facet."
+#: xmlpatterns/type/qcardinality.cpp:55
+msgid "empty"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:568
-msgid "Signed integer content does not match in the totalDigits facet."
+#: xmlpatterns/type/qcardinality.cpp:57
+msgid "zero or one"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:585
-msgid "Unsigned integer content does not match the maxInclusive facet."
+#: xmlpatterns/type/qcardinality.cpp:59
+msgid "exactly one"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:593
-msgid "Unsigned integer content does not match the maxExclusive facet."
+#: xmlpatterns/type/qcardinality.cpp:61
+msgid "one or more"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:601
-msgid "Unsigned integer content does not match the minInclusive facet."
+#: xmlpatterns/type/qcardinality.cpp:63
+msgid "zero or more"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:609
-msgid "Unsigned integer content does not match the minExclusive facet."
+#: xmlpatterns/janitors/qcardinalityverifier.cpp:58
+#, qt-format
+msgid "Required cardinality is %1; got cardinality %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:627
-msgid "Unsigned integer content is not listed in the enumeration facet."
+#: xmlpatterns/janitors/qitemverifier.cpp:67
+#, qt-format
+msgid "The item %1 did not match the required type %2."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:645
-msgid "Unsigned integer content does not match pattern facet."
+#: network/ssl/qsslerror.cpp:214 3rdparty/phonon/mmf/utils.cpp:89
+msgid "No error"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:654
-msgid "Unsigned integer content does not match in the totalDigits facet."
+#: network/ssl/qsslerror.cpp:217
+msgid "The issuer certificate could not be found"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:671
-msgid "Double content does not match the maxInclusive facet."
+#: network/ssl/qsslerror.cpp:220
+msgid "The certificate signature could not be decrypted"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:679
-msgid "Double content does not match the maxExclusive facet."
+#: network/ssl/qsslerror.cpp:223
+msgid "The public key in the certificate could not be read"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:687
-msgid "Double content does not match the minInclusive facet."
+#: network/ssl/qsslerror.cpp:226
+msgid "The signature of the certificate is invalid"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:695
-msgid "Double content does not match the minExclusive facet."
+#: network/ssl/qsslerror.cpp:229
+msgid "The certificate is not yet valid"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:721
-msgid "Double content is not listed in the enumeration facet."
+#: network/ssl/qsslerror.cpp:232
+msgid "The certificate has expired"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:739
-msgid "Double content does not match pattern facet."
+#: network/ssl/qsslerror.cpp:235
+msgid "The certificate's notBefore field contains an invalid time"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:757
-msgid "Decimal content does not match in the fractionDigits facet."
+#: network/ssl/qsslerror.cpp:238
+msgid "The certificate's notAfter field contains an invalid time"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:766
-msgid "Decimal content does not match in the totalDigits facet."
+#: network/ssl/qsslerror.cpp:241
+msgid "The certificate is self-signed, and untrusted"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:780
-msgid "Date time content does not match the maxInclusive facet."
+#: network/ssl/qsslerror.cpp:244
+msgid ""
+"The root certificate of the certificate chain is self-signed, and untrusted"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:788
-msgid "Date time content does not match the maxExclusive facet."
+#: network/ssl/qsslerror.cpp:247
+msgid ""
+"The issuer certificate of a locally looked up certificate could not be found"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:796
-msgid "Date time content does not match the minInclusive facet."
+#: network/ssl/qsslerror.cpp:250
+msgid "No certificates could be verified"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:804
-msgid "Date time content does not match the minExclusive facet."
+#: network/ssl/qsslerror.cpp:253
+msgid "One of the CA certificates is invalid"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:822
-msgid "Date time content is not listed in the enumeration facet."
+#: network/ssl/qsslerror.cpp:256
+msgid "The basicConstraints path length parameter has been exceeded"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:840
-msgid "Date time content does not match pattern facet."
+#: network/ssl/qsslerror.cpp:259
+msgid "The supplied certificate is unsuitable for this purpose"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:855
-msgid "Duration content does not match the maxInclusive facet."
+#: network/ssl/qsslerror.cpp:262
+msgid "The root CA certificate is not trusted for this purpose"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:864
-msgid "Duration content does not match the maxExclusive facet."
+#: network/ssl/qsslerror.cpp:265
+msgid "The root CA certificate is marked to reject the specified purpose"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:873
-msgid "Duration content does not match the minInclusive facet."
+#: network/ssl/qsslerror.cpp:268
+msgid ""
+"The current candidate issuer certificate was rejected because its subject "
+"name did not match the issuer name of the current certificate"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:882
-msgid "Duration content does not match the minExclusive facet."
+#: network/ssl/qsslerror.cpp:272
+msgid ""
+"The current candidate issuer certificate was rejected because its issuer "
+"name and serial number was present and did not match the authority key "
+"identifier of the current certificate"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:900
-msgid "Duration content is not listed in the enumeration facet."
+#: network/ssl/qsslerror.cpp:277
+msgid "The peer did not present any certificate"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:918
-msgid "Duration content does not match pattern facet."
+#: network/ssl/qsslerror.cpp:280
+msgid ""
+"The host name did not match any of the valid hosts for this certificate"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:945
-msgid "Boolean content does not match pattern facet."
+#: network/ssl/qsslerror.cpp:286
+msgid "The peer certificate is blacklisted"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:962
-msgid "Binary content does not match the length facet."
+#: network/ssl/qsslsocket_openssl.cpp:287
+#, qt-format
+msgid "Error creating SSL context (%1)"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:970
-msgid "Binary content does not match the minLength facet."
+#: network/ssl/qsslsocket_openssl.cpp:341
+#, qt-format
+msgid "Invalid or empty cipher list (%1)"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:978
-msgid "Binary content does not match the maxLength facet."
+#: network/ssl/qsslsocket_openssl.cpp:385
+#, qt-format
+msgid "Cannot provide a certificate with no key, %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:996
-msgid "Binary content is not listed in the enumeration facet."
+#: network/ssl/qsslsocket_openssl.cpp:392
+#, qt-format
+msgid "Error loading local certificate, %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1023
+#: network/ssl/qsslsocket_openssl.cpp:407
 #, qt-format
-msgid "Invalid QName content: %1."
+msgid "Error loading private key, %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1040
-msgid "QName content is not listed in the enumeration facet."
+#: network/ssl/qsslsocket_openssl.cpp:414
+#, qt-format
+msgid "Private key does not certify public key, %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1058
-msgid "QName content does not match pattern facet."
+#: network/ssl/qsslsocket_openssl.cpp:434
+#, qt-format
+msgid "Error creating SSL session, %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1094
-msgid "Notation content is not listed in the enumeration facet."
+#: network/ssl/qsslsocket_openssl.cpp:470
+#, qt-format
+msgid "Error creating SSL session: %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1113
-msgid "List content does not match length facet."
+#: network/ssl/qsslsocket_openssl.cpp:1023
+#, qt-format
+msgid "Unable to write data: %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1120
-msgid "List content does not match minLength facet."
+#: network/ssl/qsslsocket_openssl.cpp:1093
+#, qt-format
+msgid "Unable to decrypt data: %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1127
-msgid "List content does not match maxLength facet."
+#: network/ssl/qsslsocket_openssl.cpp:1171
+#: network/ssl/qsslsocket_openssl.cpp:1181
+#, qt-format
+msgid "Error while reading: %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1217
-msgid "List content is not listed in the enumeration facet."
+#: network/ssl/qsslsocket_openssl.cpp:1276
+#, qt-format
+msgid "Error during SSL handshake: %1"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1235
-msgid "List content does not match pattern facet."
+#: network/bearer/qnetworksession.cpp:456
+msgid "Invalid configuration."
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1274
-msgid "Union content is not listed in the enumeration facet."
+#: network/kernel/qhostinfo.cpp:173
+msgctxt "QHostInfo"
+msgid "No host name given"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1292
-msgid "Union content does not match pattern facet."
+#: network/kernel/qhostinfo_symbian.cpp:73
+#: network/kernel/qhostinfo_unix.cpp:264 network/kernel/qhostinfo_unix.cpp:296
+#: network/kernel/qhostinfo_win.cpp:115 network/socket/qabstractsocket.cpp:928
+#: network/socket/qsocks5socketengine.cpp:668
+#: network/socket/qsocks5socketengine.cpp:694
+msgid "Host not found"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdtypechecker.cpp:1307
-#, qt-format
-msgid "Data of type %1 are not allowed to be empty."
+#: network/kernel/qhostinfo_symbian.cpp:137
+#: network/kernel/qhostinfo_symbian.cpp:287
+#: network/kernel/qhostinfo_unix.cpp:196
+msgctxt "QHostInfoAgent"
+msgid "No host name given"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:165
-msgid "Empty particle cannot be derived from non-empty particle."
+#: network/kernel/qhostinfo_symbian.cpp:138
+#: network/kernel/qhostinfo_symbian.cpp:288
+#: network/kernel/qhostinfo_unix.cpp:197
+msgctxt "QHostInfoAgent"
+msgid "Invalid hostname"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:180
-#, qt-format
-msgid "Derived particle is missing element %1."
+#: network/kernel/qhostinfo_unix.cpp:251 network/kernel/qhostinfo_unix.cpp:290
+#: network/kernel/qhostinfo_win.cpp:215 network/kernel/qhostinfo_win.cpp:240
+msgid "Unknown address type"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:187
+#: network/kernel/qhostinfo_win.cpp:119 3rdparty/phonon/mmf/utils.cpp:166
 #, qt-format
-msgid ""
-"Derived element %1 is missing value constraint as defined in base particle."
+msgid "Unknown error (%1)"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:192
-#, qt-format
-msgid "Derived element %1 has weaker value constraint than base particle."
+#: network/kernel/qhostinfo_win.cpp:185
+msgid "No host name given"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:199
-#, qt-format
-msgid ""
-"Fixed value constraint of element %1 differs from value constraint in base "
-"particle."
+#: network/kernel/qhostinfo_win.cpp:185
+msgid "Invalid hostname"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:206
-#, qt-format
-msgid ""
-"Derived element %1 cannot be nillable as base element is not nillable."
+#: network/socket/qabstractsocket.cpp:555
+#: network/socket/qabstractsocket.cpp:1392
+#: network/socket/qabstractsocket.cpp:1617 network/socket/qtcpserver.cpp:292
+#: network/socket/qtcpserver.cpp:421
+msgid "Operation on socket is not supported"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:216
-#, qt-format
-msgid ""
-"Block constraints of derived element %1 must not be more weaker than in the "
-"base element."
+#: network/socket/qabstractsocket.cpp:978
+#: network/socket/qsymbiansocketengine.cpp:1393
+#: network/socket/qsocks5socketengine.cpp:698
+#: network/socket/qnativesocketengine.cpp:240
+msgid "Connection refused"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:227
-#, qt-format
-msgid ""
-"Simple type of derived element %1 cannot be validly derived from base "
-"element."
+#: network/socket/qabstractsocket.cpp:1120
+#: network/socket/qsymbiansocketengine.cpp:1390
+#: network/socket/qnativesocketengine.cpp:237
+msgid "Connection timed out"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:232
-#, qt-format
-msgid ""
-"Complex type of derived element %1 cannot be validly derived from base "
-"element."
+#: network/socket/qabstractsocket.cpp:1836
+msgid "Socket operation timed out"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:256
-#, qt-format
-msgid "Element %1 is missing in derived particle."
+#: network/socket/qabstractsocket.cpp:2273
+msgid "Socket is not connected"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:274
-#, qt-format
-msgid ""
-"Element %1 does not match namespace constraint of wildcard in base particle."
+#: network/socket/qsymbiansocketengine.cpp:1354
+#: network/socket/qnativesocketengine.cpp:201
+msgid "Unable to initialize non-blocking socket"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:285
-msgid ""
-"Wildcard in derived particle is not a valid subset of wildcard in base "
-"particle."
+#: network/socket/qsymbiansocketengine.cpp:1357
+#: network/socket/qnativesocketengine.cpp:204
+msgid "Unable to initialize broadcast socket"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:290
-msgid ""
-"processContent of wildcard in derived particle is weaker than wildcard in "
-"base particle."
+#: network/socket/qsymbiansocketengine.cpp:1360
+#: network/socket/qnativesocketengine.cpp:207
+msgid "Attempt to use IPv6 socket on a platform with no IPv6 support"
 msgstr ""
 
-#: xmlpatterns/schema/qxsdparticlechecker.cpp:560
-msgid ""
-"Derived particle allows content that is not allowed in the base particle."
+#: network/socket/qsymbiansocketengine.cpp:1363
+#: network/socket/qnativesocketengine.cpp:210
+msgid "The remote host closed the connection"
 msgstr ""
 
-#: xmlpatterns/janitors/qitemverifier.cpp:67
-#, qt-format
-msgid "The item %1 did not match the required type %2."
+#: network/socket/qsymbiansocketengine.cpp:1366
+#: network/socket/qnativesocketengine.cpp:213
+msgid "Network operation timed out"
 msgstr ""
 
-#: xmlpatterns/janitors/qcardinalityverifier.cpp:58
-#, qt-format
-msgid "Required cardinality is %1; got cardinality %2."
+#: network/socket/qsymbiansocketengine.cpp:1369
+#: network/socket/qnativesocketengine.cpp:216
+msgid "Out of resources"
 msgstr ""
 
-#: xmlpatterns/acceltree/qacceltreeresourceloader.cpp:344
-#, qt-format
-msgid "%1 is an unsupported encoding."
+#: network/socket/qsymbiansocketengine.cpp:1372
+#: network/socket/qnativesocketengine.cpp:219
+msgid "Unsupported socket operation"
 msgstr ""
 
-#: xmlpatterns/acceltree/qacceltreeresourceloader.cpp:360
-#, qt-format
-msgid "%1 contains octets which are disallowed in the requested encoding %2."
+#: network/socket/qsymbiansocketengine.cpp:1375
+#: network/socket/qnativesocketengine.cpp:222
+msgid "Protocol type not supported"
 msgstr ""
 
-#: xmlpatterns/acceltree/qacceltreeresourceloader.cpp:378
-#, qt-format
-msgid ""
-"The codepoint %1, occurring in %2 using encoding %3, is an invalid XML "
-"character."
+#: network/socket/qsymbiansocketengine.cpp:1378
+#: network/socket/qnativesocketengine.cpp:225
+msgid "Invalid socket descriptor"
 msgstr ""
 
-#: xmlpatterns/acceltree/qacceltreebuilder.cpp:216
-#, qt-format
-msgid "An %1-attribute with value %2 has already been declared."
+#: network/socket/qsymbiansocketengine.cpp:1381
+#: network/socket/qnativesocketengine.cpp:228
+msgid "Host unreachable"
 msgstr ""
 
-#: xmlpatterns/acceltree/qacceltreebuilder.cpp:229
-#, qt-format
-msgid "An %1-attribute must have a valid %2 as value, which %3 isn't."
+#: network/socket/qsymbiansocketengine.cpp:1384
+#: network/socket/qsocks5socketengine.cpp:690
+#: network/socket/qnativesocketengine.cpp:231
+msgid "Network unreachable"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:198
-msgctxt "QPSQLResult"
-msgid "Unable to create query"
+#: network/socket/qsymbiansocketengine.cpp:1387
+#: network/socket/qnativesocketengine.cpp:234
+#: 3rdparty/phonon/mmf/utils.cpp:115
+msgid "Permission denied"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:570
-msgctxt "QPSQLResult"
-msgid "Unable to prepare statement"
+#: network/socket/qsymbiansocketengine.cpp:1396
+#: network/socket/qnativesocketengine.cpp:243
+msgid "The bound address is already in use"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:819 sql/drivers/db2/qsql_db2.cpp:1253
-#: sql/drivers/mysql/qsql_mysql.cpp:1298 sql/drivers/odbc/qsql_odbc.cpp:1879
-msgid "Unable to connect"
+#: network/socket/qsymbiansocketengine.cpp:1399
+#: network/socket/qnativesocketengine.cpp:246
+msgid "The address is not available"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:868
-msgid "Could not begin transaction"
+#: network/socket/qsymbiansocketengine.cpp:1402
+#: network/socket/qnativesocketengine.cpp:249
+msgid "The address is protected"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:901
-msgid "Could not commit transaction"
+#: network/socket/qsymbiansocketengine.cpp:1405
+#: network/socket/qnativesocketengine.cpp:252
+msgid "Datagram was too large to send"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:917
-msgid "Could not rollback transaction"
+#: network/socket/qsymbiansocketengine.cpp:1408
+#: network/socket/qnativesocketengine.cpp:255
+msgid "Unable to send a message"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:1303
-msgid "Unable to subscribe"
+#: network/socket/qsymbiansocketengine.cpp:1411
+#: network/socket/qnativesocketengine.cpp:258
+msgid "Unable to receive a message"
 msgstr ""
 
-#: sql/drivers/psql/qsql_psql.cpp:1335
-msgid "Unable to unsubscribe"
+#: network/socket/qsymbiansocketengine.cpp:1414
+#: network/socket/qnativesocketengine.cpp:261
+msgid "Unable to write"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:422
-msgctxt "QIBaseResult"
-msgid "Unable to create BLOB"
+#: network/socket/qsymbiansocketengine.cpp:1417
+#: network/socket/qnativesocketengine.cpp:264
+msgid "Network error"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:428
-msgctxt "QIBaseResult"
-msgid "Unable to write BLOB"
+#: network/socket/qsymbiansocketengine.cpp:1420
+#: network/socket/qnativesocketengine.cpp:267
+msgid "Another socket is already listening on the same port"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:442
-msgctxt "QIBaseResult"
-msgid "Unable to open BLOB"
+#: network/socket/qsymbiansocketengine.cpp:1423
+#: network/socket/qnativesocketengine.cpp:270
+msgid "Operation on non-socket"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:459
-msgctxt "QIBaseResult"
-msgid "Unable to read BLOB"
+#: network/socket/qsymbiansocketengine.cpp:1426
+#: network/socket/qnativesocketengine.cpp:273
+msgid "The proxy type is invalid for this operation"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:583 sql/drivers/ibase/qsql_ibase.cpp:770
-msgctxt "QIBaseResult"
-msgid "Could not find array"
+#: network/socket/qsymbiansocketengine.cpp:1429
+msgid "The address is invalid for this operation"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:615
-msgctxt "QIBaseResult"
-msgid "Could not get array data"
+#: network/socket/qsymbiansocketengine.cpp:1432
+msgid "The specified network session is not opened"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:825
-msgctxt "QIBaseResult"
-msgid "Could not get query info"
+#: network/socket/qudpsocket.cpp:199
+msgid "This platform does not support IPv6"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:845
-msgctxt "QIBaseResult"
-msgid "Could not start transaction"
+#: network/socket/qsocks5socketengine.cpp:623
+msgid "Connection to proxy refused"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:864
-msgctxt "QIBaseResult"
-msgid "Unable to commit transaction"
+#: network/socket/qsocks5socketengine.cpp:627
+msgid "Connection to proxy closed prematurely"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:906
-msgctxt "QIBaseResult"
-msgid "Could not allocate statement"
+#: network/socket/qsocks5socketengine.cpp:631
+msgid "Proxy host not found"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:911
-msgctxt "QIBaseResult"
-msgid "Could not prepare statement"
+#: network/socket/qsocks5socketengine.cpp:636
+msgid "Connection to proxy timed out"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:917 sql/drivers/ibase/qsql_ibase.cpp:928
-msgctxt "QIBaseResult"
-msgid "Could not describe input statement"
+#: network/socket/qsocks5socketengine.cpp:653
+msgid "Proxy authentication failed"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:941
-msgctxt "QIBaseResult"
-msgid "Could not describe statement"
+#: network/socket/qsocks5socketengine.cpp:654
+#, qt-format
+msgid "Proxy authentication failed: %1"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1056
-msgctxt "QIBaseResult"
-msgid "Unable to close statement"
+#: network/socket/qsocks5socketengine.cpp:663
+msgid "SOCKS version 5 protocol error"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1064
-msgctxt "QIBaseResult"
-msgid "Unable to execute query"
+#: network/socket/qsocks5socketengine.cpp:682
+msgid "General SOCKSv5 server failure"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1110
-msgctxt "QIBaseResult"
-msgid "Could not fetch next item"
+#: network/socket/qsocks5socketengine.cpp:686
+msgid "Connection not allowed by SOCKSv5 server"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1307
-msgctxt "QIBaseResult"
-msgid "Could not get statement info"
+#: network/socket/qsocks5socketengine.cpp:702
+msgid "TTL expired"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1491
-msgctxt "QIBaseDriver"
-msgid "Error opening database"
+#: network/socket/qsocks5socketengine.cpp:706
+msgid "SOCKSv5 command not supported"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1545
-msgctxt "QIBaseDriver"
-msgid "Could not start transaction"
+#: network/socket/qsocks5socketengine.cpp:710
+msgid "Address type not supported"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1558
-msgctxt "QIBaseDriver"
-msgid "Unable to commit transaction"
+#: network/socket/qsocks5socketengine.cpp:715
+#, qt-format
+msgid "Unknown SOCKSv5 proxy error code 0x%1"
 msgstr ""
 
-#: sql/drivers/ibase/qsql_ibase.cpp:1571
-msgctxt "QIBaseDriver"
-msgid "Unable to rollback transaction"
+#: network/socket/qsocks5socketengine.cpp:1409
+msgctxt "QSocks5SocketEngine"
+msgid "Network operation timed out"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:554 sql/drivers/db2/qsql_db2.cpp:794
-msgctxt "QDB2Result"
-msgid "Unable to execute statement"
+#: network/access/qnetworkaccesscachebackend.cpp:66
+#, qt-format
+msgctxt "QNetworkAccessCacheBackend"
+msgid "Error opening %1"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:591
-msgctxt "QDB2Result"
-msgid "Unable to prepare statement"
+#: network/access/qnetworkaccessdebugpipebackend.cpp:195
+#, qt-format
+msgctxt "QNetworkAccessDebugPipeBackend"
+msgid "Write error writing to %1: %2"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:784
-msgctxt "QDB2Result"
-msgid "Unable to bind variable"
+#: network/access/qnetworkaccessdebugpipebackend.cpp:255
+#, qt-format
+msgid "Socket error on %1: %2"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:873
+#: network/access/qnetworkaccessdebugpipebackend.cpp:270
 #, qt-format
-msgctxt "QDB2Result"
-msgid "Unable to fetch record %1"
+msgid "Remote host closed the connection prematurely on %1"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:892
-msgctxt "QDB2Result"
-msgid "Unable to fetch next"
+#: network/access/qnetworkreplyimpl.cpp:88
+#, qt-format
+msgctxt "QNetworkReply"
+msgid "Protocol \"%1\" is unknown"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:912
-msgctxt "QDB2Result"
-msgid "Unable to fetch first"
+#: network/access/qnetworkreplyimpl.cpp:114
+#: network/access/qnetworkreplyimpl.cpp:305
+msgctxt "QNetworkReply"
+msgid "Network session error."
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:1102 sql/drivers/odbc/qsql_odbc.cpp:1115
-#: sql/drivers/odbc/qsql_odbc.cpp:1693
-msgctxt "QODBCResult"
-msgid "Unable to fetch last"
+#: network/access/qnetworkreplyimpl.cpp:121
+msgctxt "QNetworkReply"
+msgid "backend start error."
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:1551 sql/drivers/symsql/qsql_symsql.cpp:1056
-#: sql/drivers/mysql/qsql_mysql.cpp:1469
-#: sql/drivers/sqlite2/qsql_sqlite2.cpp:457
-#: sql/drivers/odbc/qsql_odbc.cpp:2165 sql/drivers/sqlite/qsql_sqlite.cpp:592
-msgid "Unable to commit transaction"
+#: network/access/qnetworkreplyimpl.cpp:763
+msgid "Temporary network failure."
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:1568 sql/drivers/symsql/qsql_symsql.cpp:1071
-#: sql/drivers/mysql/qsql_mysql.cpp:1486
-#: sql/drivers/sqlite2/qsql_sqlite2.cpp:474
-#: sql/drivers/odbc/qsql_odbc.cpp:2182 sql/drivers/sqlite/qsql_sqlite.cpp:607
-msgid "Unable to rollback transaction"
+#: network/access/qnetworkreplyimpl.cpp:882
+#: network/access/qnetworkreplyimpl.cpp:912
+msgid "Operation canceled"
 msgstr ""
 
-#: sql/drivers/db2/qsql_db2.cpp:1583
-msgid "Unable to set autocommit"
+#: network/access/qnetworkreplyimpl.cpp:1102
+msgctxt "QNetworkAccessManager"
+msgid "Network access is disabled."
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:220
-msgctxt "QSymSQLResult"
-msgid "Error retrieving column count"
+#: network/access/qnetworkaccessftpbackend.cpp:131
+#: network/access/qnetworkaccesshttpbackend.cpp:429
+msgid "No suitable proxy found"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:230
-msgctxt "QSymSQLResult"
-msgid "Error retrieving column name"
+#: network/access/qnetworkaccessftpbackend.cpp:145
+#, qt-format
+msgid "Cannot open %1: is a directory"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:243
-msgctxt "QSymSQLResult"
-msgid "Error retrieving column type"
+#: network/access/qnetworkaccessftpbackend.cpp:240
+#, qt-format
+msgid "Logging in to %1 failed: authentication required"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:279
-#: sql/drivers/symsql/qsql_symsql.cpp:287
-msgctxt "QSymSQLResult"
-msgid "Unable to fetch row"
+#: network/access/qnetworkaccessftpbackend.cpp:279
+#, qt-format
+msgid "Error while downloading %1: %2"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:331
-msgctxt "QSymSQLResult"
-msgid "Unable to execute statement"
+#: network/access/qnetworkaccessftpbackend.cpp:281
+#, qt-format
+msgid "Error while uploading %1: %2"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:345
-msgctxt "QSymSQLResult"
-msgid "Statement is not prepared"
+#: network/access/qnetworkaccessfilebackend.cpp:108
+#: network/access/qnetworkreplyfileimpl.cpp:79
+#, qt-format
+msgctxt "QNetworkAccessFileBackend"
+msgid "Request for opening non-local file %1"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:359
-msgctxt "QSymSQLResult"
-msgid "Unable to reset statement"
+#: network/access/qnetworkaccessfilebackend.cpp:153
+#: network/access/qnetworkreplyfileimpl.cpp:115
+#, qt-format
+msgctxt "QNetworkAccessFileBackend"
+msgid "Error opening %1: %2"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:407
-msgctxt "QSymSQLResult"
-msgid "Unable to bind parameters"
+#: network/access/qnetworkaccessfilebackend.cpp:191
+#, qt-format
+msgctxt "QNetworkAccessFileBackend"
+msgid "Write error writing to %1: %2"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:414
-msgctxt "QSymSQLResult"
-msgid "Parameter count mismatch"
+#: network/access/qnetworkaccessfilebackend.cpp:233
+#: network/access/qnetworkreplyfileimpl.cpp:102
+#, qt-format
+msgctxt "QNetworkAccessFileBackend"
+msgid "Cannot open %1: Path is a directory"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:975
-#: sql/drivers/symsql/qsql_symsql.cpp:991
-msgid "Invalid option: "
+#: network/access/qnetworkaccessfilebackend.cpp:254
+#, qt-format
+msgctxt "QNetworkAccessFileBackend"
+msgid "Read error reading from %1: %2"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:985
-#: sql/drivers/symsql/qsql_symsql.cpp:1002
-#: sql/drivers/sqlite2/qsql_sqlite2.cpp:399
-#: sql/drivers/sqlite/qsql_sqlite.cpp:546
-msgid "Error opening database"
+#: network/access/qnetworkreplydataimpl.cpp:95
+#, qt-format
+msgctxt "QNetworkAccessDataBackend"
+msgid "Invalid URI: %1"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:1005
-msgid ""
-"POLICY_DB_DEFAULT must be defined before any other POLICY definitions can be "
-"used"
+#: plugins/platforms/blackberry/qbbinputcontext_imf.cpp:888
+msgid "PlayBook IMF"
 msgstr ""
 
-#: sql/drivers/symsql/qsql_symsql.cpp:1041
-#: sql/drivers/mysql/qsql_mysql.cpp:1452
-#: sql/drivers/sqlite2/qsql_sqlite2.cpp:440
-#: sql/drivers/sqlite/qsql_sqlite.cpp:577
-msgid "Unable to begin transaction"
+#: plugins/imageformats/tga/qtgafile.cpp:136
+msgid "Could not read image data"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:506 sql/drivers/mysql/qsql_mysql.cpp:537
-msgctxt "QMYSQLResult"
-msgid "Unable to fetch data"
+#: plugins/imageformats/tga/qtgafile.cpp:141
+msgid "Sequential device (eg socket) for image read not supported"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:697
-msgctxt "QMYSQLResult"
-msgid "Unable to execute query"
+#: plugins/imageformats/tga/qtgafile.cpp:146
+msgid "Seek file/device for image read failed"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:703
-msgctxt "QMYSQLResult"
-msgid "Unable to store result"
+#: plugins/imageformats/tga/qtgafile.cpp:152
+msgid "Image mHeader read failed"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:806
-msgctxt "QMYSQLResult"
-msgid "Unable to execute next query"
+#: plugins/imageformats/tga/qtgafile.cpp:158
+msgid "Image type not supported"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:816
-msgctxt "QMYSQLResult"
-msgid "Unable to store next result"
+#: plugins/imageformats/tga/qtgafile.cpp:165
+msgid "Image depth not valid"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:894 sql/drivers/mysql/qsql_mysql.cpp:903
-msgctxt "QMYSQLResult"
-msgid "Unable to prepare statement"
+#: plugins/imageformats/tga/qtgafile.cpp:171
+msgid "Could not seek to image read footer"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:940
-msgctxt "QMYSQLResult"
-msgid "Unable to reset statement"
+#: plugins/imageformats/tga/qtgafile.cpp:178
+msgid "Could not read footer"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:1026
-msgctxt "QMYSQLResult"
-msgid "Unable to bind value"
+#: plugins/imageformats/tga/qtgafile.cpp:182
+msgid "Image type (non-TrueVision 2.0) not supported"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:1037
-msgctxt "QMYSQLResult"
-msgid "Unable to execute statement"
+#: plugins/imageformats/tga/qtgafile.cpp:186
+msgid "Could not reset to read data"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:1051 sql/drivers/mysql/qsql_mysql.cpp:1072
-msgctxt "QMYSQLResult"
-msgid "Unable to bind outvalues"
-msgstr ""
+#: plugins/accessible/widgets/simplewidgets.cpp:117
+#: plugins/accessible/widgets/simplewidgets.cpp:452
+#: plugins/accessible/widgets/simplewidgets.cpp:460
+#: plugins/accessible/widgets/complexwidgets.cpp:1844
+#: plugins/accessible/widgets/complexwidgets.cpp:1910
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:158
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:383
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:437
+msgid "Open"
+msgstr "Agor"
 
-#: sql/drivers/mysql/qsql_mysql.cpp:1060
-msgctxt "QMYSQLResult"
-msgid "Unable to store statement results"
+#: plugins/accessible/widgets/simplewidgets.cpp:121
+#: plugins/accessible/widgets/simplewidgets.cpp:266
+msgid "Uncheck"
 msgstr ""
 
-#: sql/drivers/mysql/qsql_mysql.cpp:1287
-msgid "Unable to open database '"
+#: plugins/accessible/widgets/simplewidgets.cpp:124
+#: plugins/accessible/widgets/simplewidgets.cpp:129
+#: plugins/accessible/widgets/simplewidgets.cpp:268
+msgid "Check"
 msgstr ""
 
-#: sql/drivers/sqlite2/qsql_sqlite2.cpp:149
-msgctxt "QSQLite2Result"
-msgid "Unable to fetch results"
+#: plugins/accessible/widgets/simplewidgets.cpp:125
+#: plugins/accessible/widgets/simplewidgets.cpp:748
+msgid "Toggle"
 msgstr ""
 
-#: sql/drivers/sqlite2/qsql_sqlite2.cpp:299
-msgctxt "QSQLite2Result"
-msgid "Unable to execute statement"
+#: plugins/accessible/widgets/simplewidgets.cpp:271
+#: plugins/accessible/widgets/simplewidgets.cpp:450
+#: plugins/accessible/widgets/simplewidgets.cpp:456
+#: plugins/accessible/widgets/complexwidgets.cpp:1619
+msgid "Press"
 msgstr ""
 
-#: sql/drivers/tds/qsql_tds.cpp:595
-msgid "Unable to open connection"
+#: plugins/accessible/widgets/complexwidgets.cpp:1515
+msgid "Scroll Left"
 msgstr ""
 
-#: sql/drivers/tds/qsql_tds.cpp:600
-msgid "Unable to use database"
+#: plugins/accessible/widgets/complexwidgets.cpp:1515
+msgid "Scroll Right"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:945 sql/drivers/odbc/qsql_odbc.cpp:1296
-msgctxt "QODBCResult"
-msgid ""
-"QODBCResult::reset: Unable to set 'SQL_CURSOR_STATIC' as statement "
-"attribute. Please check your ODBC driver configuration"
+#: plugins/accessible/widgets/complexwidgets.cpp:1624
+msgid "Close the tab"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:962 sql/drivers/odbc/qsql_odbc.cpp:1589
-msgctxt "QODBCResult"
-msgid "Unable to execute statement"
+#: plugins/accessible/widgets/complexwidgets.cpp:1627
+msgid "Activate the tab"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1021
-msgctxt "QODBCResult"
-msgid "Unable to fetch"
+#: plugins/accessible/widgets/qaccessiblewidgets.cpp:1279
+msgid "Dock"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1043
-msgctxt "QODBCResult"
-msgid "Unable to fetch next"
+#: plugins/accessible/widgets/qaccessiblewidgets.cpp:1280
+msgid "Float"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1065
-msgctxt "QODBCResult"
-msgid "Unable to fetch first"
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:160
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:385
+#: plugins/accessible/widgets/qaccessiblemenu.cpp:438
+msgid "Execute"
+msgstr "Gweithredu"
+
+#: plugins/accessible/widgets/rangecontrols.cpp:149
+#: plugins/accessible/widgets/rangecontrols.cpp:412
+msgid "More"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1084
-msgctxt "QODBCResult"
-msgid "Unable to fetch previous"
+#: plugins/accessible/widgets/rangecontrols.cpp:151
+#: plugins/accessible/widgets/rangecontrols.cpp:414
+msgid "Less"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1314
-msgctxt "QODBCResult"
-msgid "Unable to prepare statement"
+#: plugins/accessible/widgets/rangecontrols.cpp:551
+#: qt3support/widgets/q3mainwindow.cpp:2051
+msgid "Line up"
+msgstr "Alinio"
+
+#: plugins/accessible/widgets/rangecontrols.cpp:555
+#: plugins/accessible/widgets/rangecontrols.cpp:708
+msgid "Position"
+msgstr "Safle"
+
+#: plugins/accessible/widgets/rangecontrols.cpp:559
+msgid "Line down"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1581
-msgctxt "QODBCResult"
-msgid "Unable to bind variable"
+#: plugins/accessible/widgets/rangecontrols.cpp:933
+msgid "QDial"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:1885
-msgid "Unable to connect - Driver doesn't support all functionality required"
+#: plugins/accessible/widgets/rangecontrols.cpp:935
+msgid "SpeedoMeter"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:2148
-msgid "Unable to disable autocommit"
+#: plugins/accessible/widgets/rangecontrols.cpp:937
+msgid "SliderHandle"
 msgstr ""
 
-#: sql/drivers/odbc/qsql_odbc.cpp:2197
-msgid "Unable to enable autocommit"
+#: plugins/accessible/compat/q3complexwidgets.cpp:246
+msgid "System"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1315 sql/drivers/oci/qsql_oci.cpp:1509
-#: sql/drivers/oci/qsql_oci.cpp:1524
-msgctxt "QOCIResult"
-msgid "Unable to bind column for batch execute"
+#: plugins/accessible/compat/q3complexwidgets.cpp:249
+msgid "Restore up"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1539
-msgctxt "QOCIResult"
-msgid "Unable to execute batch statement"
+#: plugins/accessible/compat/q3complexwidgets.cpp:253
+msgid "Restore down"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1858
-msgctxt "QOCIResult"
-msgid "Unable to goto next"
+#: plugins/accessible/compat/q3complexwidgets.cpp:274
+msgid "Contains commands to manipulate the window"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1917
-msgctxt "QOCIResult"
-msgid "Unable to alloc statement"
+#: plugins/accessible/compat/q3complexwidgets.cpp:277
+msgid "Puts a minimized window back to normal"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1932
-msgctxt "QOCIResult"
-msgid "Unable to prepare statement"
+#: plugins/accessible/compat/q3complexwidgets.cpp:278
+msgid "Moves the window out of the way"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1958
-msgctxt "QOCIResult"
-msgid "Unable to get statement type"
+#: plugins/accessible/compat/q3complexwidgets.cpp:281
+msgid "Puts a maximized window back to normal"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1977
-msgctxt "QOCIResult"
-msgid "Unable to bind value"
+#: plugins/accessible/compat/q3complexwidgets.cpp:282
+msgid "Makes the window full screen"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:1997
-msgctxt "QOCIResult"
-msgid "Unable to execute statement"
+#: plugins/accessible/compat/q3complexwidgets.cpp:284
+msgid "Closes the window"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:2081
-msgctxt "QOCIDriver"
-msgid "Unable to initialize"
+#: plugins/accessible/compat/q3complexwidgets.cpp:286
+msgid ""
+"Displays the name of the window and contains controls to manipulate it"
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:2225
-msgid "Unable to logon"
+#: plugins/bearer/symbian/qnetworksession_impl.cpp:301
+#: plugins/bearer/qnetworksession_impl.cpp:254
+msgid "Unknown session error."
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:2297
-msgctxt "QOCIDriver"
-msgid "Unable to begin transaction"
+#: plugins/bearer/symbian/qnetworksession_impl.cpp:303
+#: plugins/bearer/qnetworksession_impl.cpp:256
+msgid "The session was aborted by the user or system."
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:2316
-msgctxt "QOCIDriver"
-msgid "Unable to commit transaction"
+#: plugins/bearer/symbian/qnetworksession_impl.cpp:305
+#: plugins/bearer/qnetworksession_impl.cpp:258
+msgid "The requested operation is not supported by the system."
 msgstr ""
 
-#: sql/drivers/oci/qsql_oci.cpp:2335
-msgctxt "QOCIDriver"
-msgid "Unable to rollback transaction"
+#: plugins/bearer/symbian/qnetworksession_impl.cpp:307
+#: plugins/bearer/icd/qnetworksession_impl.cpp:1036
+#: plugins/bearer/qnetworksession_impl.cpp:260
+msgid "The specified configuration cannot be used."
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:204
-#: sql/drivers/sqlite/qsql_sqlite.cpp:268
-#: sql/drivers/sqlite/qsql_sqlite.cpp:276
-msgctxt "QSQLiteResult"
-msgid "Unable to fetch row"
+#: plugins/bearer/symbian/qnetworksession_impl.cpp:309
+#: plugins/bearer/qnetworksession_impl.cpp:262
+msgid "Roaming was aborted or is not possible."
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:205
-msgctxt "QSQLiteResult"
-msgid "No query"
+#: plugins/bearer/icd/qnetworksession_impl.cpp:1030
+msgid "Roaming error"
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:337
-msgctxt "QSQLiteResult"
-msgid "Unable to execute statement"
+#: plugins/bearer/icd/qnetworksession_impl.cpp:1033
+msgid "Session aborted by user or system"
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:342
-msgctxt "QSQLiteResult"
-msgid "Unable to execute multiple statements at a time"
+#: plugins/bearer/icd/qnetworksession_impl.cpp:1040
+msgid "Unidentified Error"
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:362
-msgctxt "QSQLiteResult"
-msgid "Unable to reset statement"
+#: plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp:95
+msgid "Multiple input method switcher"
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:407
-msgctxt "QSQLiteResult"
-msgid "Unable to bind parameters"
+#: plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp:102
+msgid ""
+"Multiple input method switcher that uses the context menu of the text widgets"
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:414
-msgctxt "QSQLiteResult"
-msgid "Parameter count mismatch"
+#: plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp:88
+msgid "Select IM"
 msgstr ""
 
-#: sql/drivers/sqlite/qsql_sqlite.cpp:557
-msgid "Error closing database"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:65
+msgid "Inspector Mode"
 msgstr ""
 
-#: imports/gestures/qdeclarativegesturearea.cpp:183
-#: declarative/qml/qdeclarativecompiler.cpp:1542
-#: declarative/qml/qdeclarativecompiler.cpp:1898
-#: declarative/qml/qdeclarativecompiler.cpp:1901
-#: declarative/util/qdeclarativepropertychanges.cpp:424
-#: declarative/util/qdeclarativeconnections.cpp:207
-#: declarative/util/qdeclarativeconnections.cpp:271
-#, qt-format
-msgid "Cannot assign to non-existent property \"%1\""
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:66
+msgid "Play/Pause Animations"
 msgstr ""
 
-#: imports/gestures/qdeclarativegesturearea.cpp:193
-msgid "GestureArea: nested objects not allowed"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:69
+msgid "Select (Marquee)"
 msgstr ""
 
-#: imports/gestures/qdeclarativegesturearea.cpp:196
-msgid "GestureArea: syntax error"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:70
+msgid "Zoom"
 msgstr ""
 
-#: imports/gestures/qdeclarativegesturearea.cpp:205
-msgid "GestureArea: script expected"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:72
+msgid "Color Picker"
 msgstr ""
 
-#: declarative/debugger/qjsdebuggeragent.cpp:119
-#, qt-format
-msgctxt "Debugger::JSAgentWatchData"
-msgid "[Array of length %1]"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:74
+msgid "Apply Changes to QML Viewer"
 msgstr ""
 
-#: declarative/debugger/qjsdebuggeragent.cpp:121
-msgctxt "Debugger::JSAgentWatchData"
-msgid "<undefined>"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:76
+msgid "Apply Changes to Document"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:545
-#: declarative/qml/parser/qdeclarativejslexer.cpp:668
-#: declarative/qml/parser/qdeclarativejslexer.cpp:722
-msgctxt "QDeclarativeParser"
-msgid "Illegal unicode escape sequence"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:86
+msgid "Tools"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:582
-msgctxt "QDeclarativeParser"
-msgid "Illegal character"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:112
+msgid "1x"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:596
-msgctxt "QDeclarativeParser"
-msgid "Unclosed string at end of line"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:118
+msgid "0.5x"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:622
-msgctxt "QDeclarativeParser"
-msgid "Illegal escape sequence"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:123
+msgid "0.25x"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:694
-msgctxt "QDeclarativeParser"
-msgid "Unclosed comment at end of file"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:128
+msgid "0.125x"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:796
-msgctxt "QDeclarativeParser"
-msgid "Illegal syntax for exponential number"
+#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:133
+msgid "0.1x"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:822
-msgctxt "QDeclarativeParser"
-msgid "Identifier cannot start with numeric literal"
+#: plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp:65
+msgid "Copy Color"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:1160
-msgctxt "QDeclarativeParser"
-msgid "Unterminated regular expression literal"
+#: plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp:63
+msgid "Zoom to &100%"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:1175
-#, qt-format
-msgctxt "QDeclarativeParser"
-msgid "Invalid regular expression flag '%0'"
+#: plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp:64
+msgid "Zoom In"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:1191
-#: declarative/qml/parser/qdeclarativejslexer.cpp:1213
-msgctxt "QDeclarativeParser"
-msgid "Unterminated regular expression backslash sequence"
+#: plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp:65
+msgid "Zoom Out"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejslexer.cpp:1226
-msgctxt "QDeclarativeParser"
-msgid "Unterminated regular expression class"
+#: plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp:143
+msgid "Items"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejsparser.cpp:1828
-#: declarative/qml/parser/qdeclarativejsparser.cpp:1895
-msgctxt "QDeclarativeParser"
-msgid "Syntax error"
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:104
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:211
+msgctxt "QDeclarativeAnimatedImage"
+msgid "Qt was built without support for QMovie"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejsparser.cpp:1830
-#, qt-format
-msgctxt "QDeclarativeParser"
-msgid "Unexpected token `%1'"
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:176
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:263
+msgid "KeyNavigation is only available via attached properties"
 msgstr ""
 
-#: declarative/qml/parser/qdeclarativejsparser.cpp:1858
-#: declarative/qml/parser/qdeclarativejsparser.cpp:1882
-#, qt-format
-msgctxt "QDeclarativeParser"
-msgid "Expected token `%1'"
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:177
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:264
+msgid "Keys is only available via attached properties"
 msgstr ""
 
-#: declarative/qml/qdeclarativebinding.cpp:459
-#, qt-format
-msgid "Binding loop detected for property \"%1\""
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:179
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:180
+msgid "Accessible is only available via attached properties"
 msgstr ""
 
-#: declarative/qml/qdeclarativetypeloader.cpp:919
-#, qt-format
-msgid "Script %1 unavailable"
+#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:206
+msgid "LayoutMirroring is only available via attached properties"
 msgstr ""
 
-#: declarative/qml/qdeclarativetypeloader.cpp:937
-#, qt-format
-msgid "Type %1 unavailable"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:198
+msgid "Possible anchor loop detected on fill."
 msgstr ""
 
-#: declarative/qml/qdeclarativetypeloader.cpp:1113
-#, qt-format
-msgid "Namespace %1 cannot be used as a type"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:227
+msgid "Possible anchor loop detected on centerIn."
 msgstr ""
 
-#: declarative/qml/qdeclarativetypeloader.cpp:1115
-#, qt-format
-msgid "%1 %2"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:435
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:469
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1115
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1152
+msgid "Cannot anchor to an item that isn't a parent or sibling."
 msgstr ""
 
-#: declarative/qml/qdeclarativesqldatabase.cpp:211
-msgid "executeSql called outside transaction()"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:582
+msgid "Possible anchor loop detected on vertical anchor."
 msgstr ""
 
-#: declarative/qml/qdeclarativesqldatabase.cpp:269
-msgid "Read-only Transaction"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:677
+msgid "Possible anchor loop detected on horizontal anchor."
 msgstr ""
 
-#: declarative/qml/qdeclarativesqldatabase.cpp:289
-#, qt-format
-msgid "Version mismatch: expected %1, found %2"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1099
+msgid "Cannot specify left, right, and hcenter anchors."
 msgstr ""
 
-#: declarative/qml/qdeclarativesqldatabase.cpp:303
-msgid "SQL transaction failed"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1109
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1146
+msgid "Cannot anchor to a null item."
 msgstr ""
 
-#: declarative/qml/qdeclarativesqldatabase.cpp:326
-msgid "transaction: missing callback"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1112
+msgid "Cannot anchor a horizontal edge to a vertical edge."
 msgstr ""
 
-#: declarative/qml/qdeclarativesqldatabase.cpp:386
-#: declarative/qml/qdeclarativesqldatabase.cpp:401
-msgid "SQL: database version mismatch"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1118
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1155
+msgid "Cannot anchor item to self."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:185
-#: declarative/qml/qdeclarativecompiler.cpp:1853
-#: declarative/qml/qdeclarativecompiler.cpp:2058
-#: declarative/qml/qdeclarativecompiler.cpp:2139
-#: declarative/qml/qdeclarativecompiler.cpp:2214
-#: declarative/qml/qdeclarativecompiler.cpp:2796
-#, qt-format
-msgid "Invalid property assignment: \"%1\" is a read-only property"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1130
+msgid "Cannot specify top, bottom, and vcenter anchors."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:194
-msgid "Invalid property assignment: unknown enumeration"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1136
+msgid ""
+"Baseline anchor cannot be used in conjunction with top, bottom, or vcenter "
+"anchors."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:202
-msgid "Invalid property assignment: string expected"
+#: declarative/graphicsitems/qdeclarativeanchors.cpp:1149
+msgid "Cannot anchor a vertical edge to a horizontal edge."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:205
-msgid "Invalid property assignment: url expected"
+#: declarative/graphicsitems/qdeclarativeitem.cpp:818
+msgid "LayoutDirection attached property only works with Items"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:215
-msgid "Invalid property assignment: unsigned int expected"
+#: declarative/graphicsitems/qdeclarativetextinput.cpp:962
+#: declarative/graphicsitems/qdeclarativetextinput.cpp:970
+msgid "Could not load cursor delegate"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:226
-msgid "Invalid property assignment: int expected"
+#: declarative/graphicsitems/qdeclarativetextinput.cpp:981
+msgid "Could not instantiate cursor delegate"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:230
-#: declarative/qml/qdeclarativecompiler.cpp:233
-msgid "Invalid property assignment: number expected"
+#: declarative/graphicsitems/qdeclarativeflipable.cpp:138
+msgid "front is a write-once property"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:239
-msgid "Invalid property assignment: color expected"
+#: declarative/graphicsitems/qdeclarativeflipable.cpp:158
+msgid "back is a write-once property"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:247
-msgid "Invalid property assignment: date expected"
+#: declarative/graphicsitems/qdeclarativevisualitemmodel.cpp:1099
+msgid "Delegate component must be Item type."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:254
-msgid "Invalid property assignment: time expected"
+#: declarative/graphicsitems/qdeclarativeloader.cpp:407
+msgid "Loader does not support loading non-visual elements."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:261
-msgid "Invalid property assignment: datetime expected"
+#: declarative/util/qdeclarativestateoperations.cpp:110
+#: declarative/util/qdeclarativeanimation.cpp:2701
+msgid "Unable to preserve appearance under complex transform"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:270
-msgid "Invalid property assignment: point expected"
+#: declarative/util/qdeclarativestateoperations.cpp:121
+#: declarative/util/qdeclarativestateoperations.cpp:128
+#: declarative/util/qdeclarativeanimation.cpp:2712
+#: declarative/util/qdeclarativeanimation.cpp:2719
+msgid "Unable to preserve appearance under non-uniform scale"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:278
-msgid "Invalid property assignment: size expected"
+#: declarative/util/qdeclarativestateoperations.cpp:135
+#: declarative/util/qdeclarativeanimation.cpp:2726
+msgid "Unable to preserve appearance under scale of 0"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:286
-msgid "Invalid property assignment: rect expected"
+#: declarative/util/qdeclarativebehavior.cpp:128
+msgid "Cannot change the animation assigned to a Behavior."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:291
-msgid "Invalid property assignment: boolean expected"
+#: declarative/util/qdeclarativepropertychanges.cpp:256
+msgid "PropertyChanges does not support creating state-specific objects."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:298
-msgid "Invalid property assignment: 3D vector expected"
+#: declarative/util/qdeclarativepropertychanges.cpp:427
+#, qt-format
+msgid "Cannot assign to read-only property \"%1\""
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:307
+#: declarative/util/qdeclarativelistmodel.cpp:392
 #, qt-format
-msgid "Invalid property assignment: unsupported type \"%1\""
+msgid "remove: index %1 out of range"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:589
-msgid "Element is not creatable."
+#: declarative/util/qdeclarativelistmodel.cpp:425
+msgid "insert: value is not an object"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1239
-msgid "Component elements may not contain properties other than id"
+#: declarative/util/qdeclarativelistmodel.cpp:430
+#, qt-format
+msgid "insert: index %1 out of range"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1246
-msgid "Invalid component id specification"
+#: declarative/util/qdeclarativelistmodel.cpp:460
+msgid "move: out of range"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1252
-#: declarative/qml/qdeclarativecompiler.cpp:1767
-msgid "id is not unique"
+#: declarative/util/qdeclarativelistmodel.cpp:500
+msgid "append: value is not an object"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1262
-msgid "Invalid component body specification"
+#: declarative/util/qdeclarativelistmodel.cpp:571
+msgid "set: value is not an object"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1265
-msgid "Component objects cannot declare new properties."
+#: declarative/util/qdeclarativelistmodel.cpp:575
+#: declarative/util/qdeclarativelistmodel.cpp:613
+#, qt-format
+msgid "set: index %1 out of range"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1267
-msgid "Component objects cannot declare new signals."
+#: declarative/util/qdeclarativelistmodel.cpp:650
+#: declarative/util/qdeclarativelistmodel.cpp:667
+msgid "ListElement: cannot contain nested elements"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1269
-msgid "Component objects cannot declare new functions."
+#: declarative/util/qdeclarativelistmodel.cpp:671
+msgid "ListElement: cannot use reserved \"id\" property"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1276
-msgid "Cannot create empty component specification"
+#: declarative/util/qdeclarativelistmodel.cpp:724
+msgid "ListElement: cannot use script for property value"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1364
-#: declarative/qml/qdeclarativecompiler.cpp:1485
+#: declarative/util/qdeclarativelistmodel.cpp:755
 #, qt-format
-msgid "\"%1.%2\" is not available in %3 %4.%5."
+msgid "ListModel: undefined property '%1'"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1366
-#: declarative/qml/qdeclarativecompiler.cpp:1487
+#: declarative/util/qdeclarativeanimation.cpp:173
 #, qt-format
-msgid "\"%1.%2\" is not available due to component versioning."
+msgid "Cannot animate non-existent property \"%1\""
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1377
-msgid "Incorrectly specified signal assignment"
+#: declarative/util/qdeclarativeanimation.cpp:176
+#, qt-format
+msgid "Cannot animate read-only property \"%1\""
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1389
-msgid "Cannot assign a value to a signal (expecting a script to be run)"
+#: declarative/util/qdeclarativeanimation.cpp:611
+#: declarative/util/qdeclarativeanimation.cpp:1849
+#: declarative/util/qdeclarativeanimation.cpp:2869
+msgid "Cannot set a duration of < 0"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1393
-msgid "Empty signal assignment"
+#: declarative/util/qdeclarativexmllistmodel.cpp:581
+#, qt-format
+msgid "\"%1\" duplicates a previous role name and will be disabled."
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1431
-msgid "Empty property assignment"
+#: declarative/util/qdeclarativexmllistmodel.cpp:826
+msgctxt "QDeclarativeXmlRoleList"
+msgid "An XmlListModel query must start with '/' or \"//\""
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1443
-msgid "Attached properties cannot be used here"
+#: declarative/util/qdeclarativexmllistmodel.cpp:1105
+#: declarative/util/qdeclarativexmllistmodel.cpp:1109
+#, qt-format
+msgid "invalid query: \"%1\""
+msgstr ""
+
+#: declarative/util/qdeclarativeconnections.cpp:217
+msgid "Connections: nested objects not allowed"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1457
-#: declarative/qml/qdeclarativecompiler.cpp:1585
-msgid "Non-existent attached object"
+#: declarative/util/qdeclarativeconnections.cpp:220
+msgid "Connections: syntax error"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1461
-#: declarative/qml/qdeclarativecompiler.cpp:1588
-msgid "Invalid attached object assignment"
+#: declarative/util/qdeclarativeconnections.cpp:228
+msgid "Connections: script expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1540
-msgid "Cannot assign to non-existent default property"
+#: declarative/util/qdeclarativepixmapcache.cpp:311
+#, qt-format
+msgid "Error decoding: %1: %2"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1572
-msgid "Invalid use of namespace"
+#: declarative/util/qdeclarativepixmapcache.cpp:478
+#: declarative/util/qdeclarativepixmapcache.cpp:838
+#, qt-format
+msgid "Failed to get image from provider: %1"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1577
-msgid "Not an attached property name"
+#: declarative/util/qdeclarativepixmapcache.cpp:496
+#: declarative/util/qdeclarativepixmapcache.cpp:856
+#, qt-format
+msgid "Cannot open: %1"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1759
-msgid "Invalid use of id property"
+#: declarative/util/qdeclarativeutilmodule.cpp:79
+msgid "Application is an abstract class"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1846
-#: declarative/qml/qdeclarativecompiler.cpp:1848
-msgid "Property has already been assigned a value"
+#: declarative/util/qdeclarativeutilmodule.cpp:111
+#: declarative/util/qdeclarativeutilmodule.cpp:113
+#: declarative/util/qdeclarativeutilmodule.cpp:160
+#: declarative/util/qdeclarativeutilmodule.cpp:162
+msgctxt "QDeclarativeXmlListModel"
+msgid "Qt was built without support for xmlpatterns"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1866
-#: declarative/qml/qdeclarativecompiler.cpp:1873
-msgid "Invalid grouped property access"
+#: declarative/util/qdeclarativeutilmodule.cpp:123
+#: declarative/util/qdeclarativeutilmodule.cpp:168
+msgid "Animation is an abstract class"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1876
-msgid "Cannot assign a value directly to a grouped property"
+#: declarative/debugger/qjsdebuggeragent.cpp:119
+#, qt-format
+msgctxt "Debugger::JSAgentWatchData"
+msgid "[Array of length %1]"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1892
-msgid "Invalid property use"
+#: declarative/debugger/qjsdebuggeragent.cpp:121
+msgctxt "Debugger::JSAgentWatchData"
+msgid "<undefined>"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1907
-msgid "Property assignment expected"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:545
+#: declarative/qml/parser/qdeclarativejslexer.cpp:668
+#: declarative/qml/parser/qdeclarativejslexer.cpp:722
+msgctxt "QDeclarativeParser"
+msgid "Illegal unicode escape sequence"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1910
-msgid "Single property assignment expected"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:582
+msgctxt "QDeclarativeParser"
+msgid "Illegal character"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1915
-msgid "Unexpected object assignment"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:596
+msgctxt "QDeclarativeParser"
+msgid "Unclosed string at end of line"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1980
-msgid "Cannot assign object to list"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:622
+msgctxt "QDeclarativeParser"
+msgid "Illegal escape sequence"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1986
-msgid "Can only assign one binding to lists"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:694
+msgctxt "QDeclarativeParser"
+msgid "Unclosed comment at end of file"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:1992
-msgid "Cannot assign primitives to lists"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:796
+msgctxt "QDeclarativeParser"
+msgid "Illegal syntax for exponential number"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2005
-msgid "Cannot assign multiple values to a script property"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:822
+msgctxt "QDeclarativeParser"
+msgid "Identifier cannot start with numeric literal"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2008
-msgid "Invalid property assignment: script expected"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:1160
+msgctxt "QDeclarativeParser"
+msgid "Unterminated regular expression literal"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2023
-msgid "Cannot assign multiple values to a singular property"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:1175
+#, qt-format
+msgctxt "QDeclarativeParser"
+msgid "Invalid regular expression flag '%0'"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2116
-msgid "Cannot assign object to property"
+#: declarative/qml/parser/qdeclarativejslexer.cpp:1191
+#: declarative/qml/parser/qdeclarativejslexer.cpp:1213
+msgctxt "QDeclarativeParser"
+msgid "Unterminated regular expression backslash sequence"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2166
-#, qt-format
-msgid "\"%1\" cannot operate on \"%2\""
+#: declarative/qml/parser/qdeclarativejslexer.cpp:1226
+msgctxt "QDeclarativeParser"
+msgid "Unterminated regular expression class"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2330
-msgid "Duplicate default property"
+#: declarative/qml/parser/qdeclarativejsparser.cpp:1828
+#: declarative/qml/parser/qdeclarativejsparser.cpp:1895
+msgctxt "QDeclarativeParser"
+msgid "Syntax error"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2335
-msgid "Duplicate property name"
+#: declarative/qml/parser/qdeclarativejsparser.cpp:1830
+#, qt-format
+msgctxt "QDeclarativeParser"
+msgid "Unexpected token `%1'"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2339
-msgid "Property names cannot begin with an upper case letter"
+#: declarative/qml/parser/qdeclarativejsparser.cpp:1858
+#: declarative/qml/parser/qdeclarativejsparser.cpp:1882
+#, qt-format
+msgctxt "QDeclarativeParser"
+msgid "Expected token `%1'"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2342
-msgid "Illegal property name"
+#: declarative/qml/qdeclarativevme.cpp:231
+#, qt-format
+msgctxt "QDeclarativeVME"
+msgid "Unable to create object of type %1"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2350
-msgid "Duplicate signal name"
+#: declarative/qml/qdeclarativevme.cpp:672
+#, qt-format
+msgctxt "QDeclarativeVME"
+msgid "Cannot assign value %1 to property %2"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2353
-msgid "Signal names cannot begin with an upper case letter"
+#: declarative/qml/qdeclarativevme.cpp:694
+#, qt-format
+msgctxt "QDeclarativeVME"
+msgid "Cannot assign object type %1 with no default method"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2355
-msgid "Illegal signal name"
+#: declarative/qml/qdeclarativevme.cpp:697
+#, qt-format
+msgctxt "QDeclarativeVME"
+msgid "Cannot connect mismatched signal/slot %1 %vs. %2"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2361
-msgid "Duplicate method name"
+#: declarative/qml/qdeclarativevme.cpp:702
+#, qt-format
+msgctxt "QDeclarativeVME"
+msgid "Cannot assign an object to signal property %1"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2364
-msgid "Method names cannot begin with an upper case letter"
+#: declarative/qml/qdeclarativevme.cpp:856
+msgctxt "QDeclarativeVME"
+msgid "Cannot assign object to list"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2366
-msgid "Illegal method name"
+#: declarative/qml/qdeclarativevme.cpp:899
+msgctxt "QDeclarativeVME"
+msgid "Cannot assign object to interface property"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2387
-msgid "Property value set multiple times"
+#: declarative/qml/qdeclarativevme.cpp:910
+msgctxt "QDeclarativeVME"
+msgid "Unable to create attached object"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2391
-msgid "Invalid property nesting"
+#: declarative/qml/qdeclarativevme.cpp:942
+#, qt-format
+msgctxt "QDeclarativeVME"
+msgid "Cannot set properties on %1 as it is null"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2443
-msgid "Cannot override FINAL property"
+#: declarative/qml/qdeclarativecompiler.cpp:185
+#: declarative/qml/qdeclarativecompiler.cpp:1853
+#: declarative/qml/qdeclarativecompiler.cpp:2058
+#: declarative/qml/qdeclarativecompiler.cpp:2139
+#: declarative/qml/qdeclarativecompiler.cpp:2214
+#: declarative/qml/qdeclarativecompiler.cpp:2796
+#, qt-format
+msgid "Invalid property assignment: \"%1\" is a read-only property"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2466
-msgid "Invalid property type"
+#: declarative/qml/qdeclarativecompiler.cpp:194
+msgid "Invalid property assignment: unknown enumeration"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2643
-msgid "Invalid empty ID"
+#: declarative/qml/qdeclarativecompiler.cpp:202
+msgid "Invalid property assignment: string expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2646
-msgid "IDs cannot start with an uppercase letter"
+#: declarative/qml/qdeclarativecompiler.cpp:205
+msgid "Invalid property assignment: url expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2652
-msgid "IDs must start with a letter or underscore"
+#: declarative/qml/qdeclarativecompiler.cpp:215
+msgid "Invalid property assignment: unsigned int expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2654
-msgid "IDs must contain only letters, numbers, and underscores"
+#: declarative/qml/qdeclarativecompiler.cpp:226
+msgid "Invalid property assignment: int expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2660
-msgid "ID illegally masks global JavaScript property"
+#: declarative/qml/qdeclarativecompiler.cpp:230
+#: declarative/qml/qdeclarativecompiler.cpp:233
+msgid "Invalid property assignment: number expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2691
-#: declarative/qml/qdeclarativecompiler.cpp:2700
-msgid "No property alias location"
+#: declarative/qml/qdeclarativecompiler.cpp:239
+msgid "Invalid property assignment: color expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2696
-#: declarative/qml/qdeclarativecompiler.cpp:2721
-#: declarative/qml/qdeclarativecompiler.cpp:2728
-#: declarative/qml/qdeclarativecompiler.cpp:2735
-#: declarative/qml/qdeclarativecompiler.cpp:2741
-msgid "Invalid alias location"
+#: declarative/qml/qdeclarativecompiler.cpp:247
+msgid "Invalid property assignment: date expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2705
-msgid ""
-"Invalid alias reference. An alias reference must be specified as <id>, "
-"<id>.<property> or <id>.<value property>.<property>"
+#: declarative/qml/qdeclarativecompiler.cpp:254
+msgid "Invalid property assignment: time expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2708
-#, qt-format
-msgid "Invalid alias reference. Unable to find id \"%1\""
+#: declarative/qml/qdeclarativecompiler.cpp:261
+msgid "Invalid property assignment: datetime expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiler.cpp:2723
-msgid "Alias property exceeds alias bounds"
+#: declarative/qml/qdeclarativecompiler.cpp:270
+msgid "Invalid property assignment: point expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:231
-#, qt-format
-msgctxt "QDeclarativeVME"
-msgid "Unable to create object of type %1"
+#: declarative/qml/qdeclarativecompiler.cpp:278
+msgid "Invalid property assignment: size expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:672
-#, qt-format
-msgctxt "QDeclarativeVME"
-msgid "Cannot assign value %1 to property %2"
+#: declarative/qml/qdeclarativecompiler.cpp:286
+msgid "Invalid property assignment: rect expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:694
-#, qt-format
-msgctxt "QDeclarativeVME"
-msgid "Cannot assign object type %1 with no default method"
+#: declarative/qml/qdeclarativecompiler.cpp:291
+msgid "Invalid property assignment: boolean expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:697
-#, qt-format
-msgctxt "QDeclarativeVME"
-msgid "Cannot connect mismatched signal/slot %1 %vs. %2"
+#: declarative/qml/qdeclarativecompiler.cpp:298
+msgid "Invalid property assignment: 3D vector expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:702
+#: declarative/qml/qdeclarativecompiler.cpp:307
 #, qt-format
-msgctxt "QDeclarativeVME"
-msgid "Cannot assign an object to signal property %1"
+msgid "Invalid property assignment: unsupported type \"%1\""
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:856
-msgctxt "QDeclarativeVME"
-msgid "Cannot assign object to list"
+#: declarative/qml/qdeclarativecompiler.cpp:589
+msgid "Element is not creatable."
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:899
-msgctxt "QDeclarativeVME"
-msgid "Cannot assign object to interface property"
+#: declarative/qml/qdeclarativecompiler.cpp:1239
+msgid "Component elements may not contain properties other than id"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:910
-msgctxt "QDeclarativeVME"
-msgid "Unable to create attached object"
+#: declarative/qml/qdeclarativecompiler.cpp:1246
+msgid "Invalid component id specification"
 msgstr ""
 
-#: declarative/qml/qdeclarativevme.cpp:942
-#, qt-format
-msgctxt "QDeclarativeVME"
-msgid "Cannot set properties on %1 as it is null"
+#: declarative/qml/qdeclarativecompiler.cpp:1252
+#: declarative/qml/qdeclarativecompiler.cpp:1767
+msgid "id is not unique"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:254
-#: declarative/qml/qdeclarativescriptparser.cpp:683
-#: declarative/qml/qdeclarativescriptparser.cpp:742
-msgctxt "QDeclarativeParser"
-msgid "Property value set multiple times"
+#: declarative/qml/qdeclarativecompiler.cpp:1262
+msgid "Invalid component body specification"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:265
-msgctxt "QDeclarativeParser"
-msgid "Expected type name"
+#: declarative/qml/qdeclarativecompiler.cpp:1265
+msgid "Component objects cannot declare new properties."
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:399
-msgctxt "QDeclarativeParser"
-msgid "Invalid import qualifier ID"
+#: declarative/qml/qdeclarativecompiler.cpp:1267
+msgid "Component objects cannot declare new signals."
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:407
-msgctxt "QDeclarativeParser"
-msgid "Reserved name \"Qt\" cannot be used as an qualifier"
+#: declarative/qml/qdeclarativecompiler.cpp:1269
+msgid "Component objects cannot declare new functions."
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:422
-msgctxt "QDeclarativeParser"
-msgid "Script import qualifiers must be unique."
+#: declarative/qml/qdeclarativecompiler.cpp:1276
+msgid "Cannot create empty component specification"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:432
-msgctxt "QDeclarativeParser"
-msgid "Script import requires a qualifier"
+#: declarative/qml/qdeclarativecompiler.cpp:1364
+#: declarative/qml/qdeclarativecompiler.cpp:1485
+#, qt-format
+msgid "\"%1.%2\" is not available in %3 %4.%5."
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:443
-msgctxt "QDeclarativeParser"
-msgid "Library import requires a version"
+#: declarative/qml/qdeclarativecompiler.cpp:1366
+#: declarative/qml/qdeclarativecompiler.cpp:1487
+#, qt-format
+msgid "\"%1.%2\" is not available due to component versioning."
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:502
-msgctxt "QDeclarativeParser"
-msgid "Expected parameter type"
+#: declarative/qml/qdeclarativecompiler.cpp:1377
+msgid "Incorrectly specified signal assignment"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:544
-msgctxt "QDeclarativeParser"
-msgid "Invalid property type modifier"
+#: declarative/qml/qdeclarativecompiler.cpp:1389
+msgid "Cannot assign a value to a signal (expecting a script to be run)"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:553
-msgctxt "QDeclarativeParser"
-msgid "Unexpected property type modifier"
+#: declarative/qml/qdeclarativecompiler.cpp:1393
+msgid "Empty signal assignment"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:562
-msgctxt "QDeclarativeParser"
-msgid "Expected property type"
+#: declarative/qml/qdeclarativecompiler.cpp:1431
+msgid "Empty property assignment"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:571
-msgctxt "QDeclarativeParser"
-msgid "Readonly not yet supported"
+#: declarative/qml/qdeclarativecompiler.cpp:1443
+msgid "Attached properties cannot be used here"
 msgstr ""
 
-#: declarative/qml/qdeclarativescriptparser.cpp:789
-msgctxt "QDeclarativeParser"
-msgid "JavaScript declaration outside Script element"
+#: declarative/qml/qdeclarativecompiler.cpp:1457
+#: declarative/qml/qdeclarativecompiler.cpp:1585
+msgid "Non-existent attached object"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:390
-#, qt-format
-msgid "plugin cannot be loaded for module \"%1\": %2"
+#: declarative/qml/qdeclarativecompiler.cpp:1461
+#: declarative/qml/qdeclarativecompiler.cpp:1588
+msgid "Invalid attached object assignment"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:395
-#, qt-format
-msgid "module \"%1\" plugin \"%2\" not found"
+#: declarative/qml/qdeclarativecompiler.cpp:1540
+msgid "Cannot assign to non-existent default property"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:529
-#: declarative/qml/qdeclarativeimport.cpp:597
-#, qt-format
-msgid "module \"%1\" version %2.%3 is not installed"
+#: declarative/qml/qdeclarativecompiler.cpp:1572
+msgid "Invalid use of namespace"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:531
-#, qt-format
-msgid "module \"%1\" is not installed"
+#: declarative/qml/qdeclarativecompiler.cpp:1577
+msgid "Not an attached property name"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:545
-#: declarative/qml/qdeclarativeimport.cpp:565
-#, qt-format
-msgid "\"%1\": no such directory"
+#: declarative/qml/qdeclarativecompiler.cpp:1759
+msgid "Invalid use of id property"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:563
-#, qt-format
-msgid "import \"%1\" has no qmldir and no namespace"
+#: declarative/qml/qdeclarativecompiler.cpp:1846
+#: declarative/qml/qdeclarativecompiler.cpp:1848
+msgid "Property has already been assigned a value"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:622
-#, qt-format
-msgid "- %1 is not a namespace"
+#: declarative/qml/qdeclarativecompiler.cpp:1866
+#: declarative/qml/qdeclarativecompiler.cpp:1873
+msgid "Invalid grouped property access"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:628
-msgid "- nested namespaces not allowed"
+#: declarative/qml/qdeclarativecompiler.cpp:1876
+msgid "Cannot assign a value directly to a grouped property"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:675
-#: declarative/qml/qdeclarativeimport.cpp:679
-msgid "local directory"
+#: declarative/qml/qdeclarativecompiler.cpp:1892
+msgid "Invalid property use"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:685
-#, qt-format
-msgid "is ambiguous. Found in %1 and in %2"
+#: declarative/qml/qdeclarativecompiler.cpp:1907
+msgid "Property assignment expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:689
-#, qt-format
-msgid "is ambiguous. Found in %1 in version %2.%3 and %4.%5"
+#: declarative/qml/qdeclarativecompiler.cpp:1910
+msgid "Single property assignment expected"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:703
-msgid "is instantiated recursively"
+#: declarative/qml/qdeclarativecompiler.cpp:1915
+msgid "Unexpected object assignment"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:705
-msgid "is not a type"
+#: declarative/qml/qdeclarativecompiler.cpp:1980
+msgid "Cannot assign object to list"
 msgstr ""
 
-#: declarative/qml/qdeclarativeimport.cpp:1041
-#, qt-format
-msgid "File name case mismatch for \"%1\""
+#: declarative/qml/qdeclarativecompiler.cpp:1986
+msgid "Can only assign one binding to lists"
 msgstr ""
 
-#: declarative/qml/qdeclarativecompiledbindings.cpp:396
-#, qt-format
-msgctxt "QDeclarativeCompiledBindings"
-msgid "Binding loop detected for property \"%1\""
+#: declarative/qml/qdeclarativecompiler.cpp:1992
+msgid "Cannot assign primitives to lists"
 msgstr ""
 
-#: declarative/qml/qdeclarativecomponent.cpp:531
-msgid "Invalid empty URL"
+#: declarative/qml/qdeclarativecompiler.cpp:2005
+msgid "Cannot assign multiple values to a script property"
 msgstr ""
 
-#: declarative/qml/qdeclarativecomponent.cpp:679
-msgid "createObject: value is not an object"
+#: declarative/qml/qdeclarativecompiler.cpp:2008
+msgid "Invalid property assignment: script expected"
 msgstr ""
 
-#: declarative/util/qdeclarativepropertychanges.cpp:256
-msgid "PropertyChanges does not support creating state-specific objects."
+#: declarative/qml/qdeclarativecompiler.cpp:2023
+msgid "Cannot assign multiple values to a singular property"
 msgstr ""
 
-#: declarative/util/qdeclarativepropertychanges.cpp:427
-#, qt-format
-msgid "Cannot assign to read-only property \"%1\""
+#: declarative/qml/qdeclarativecompiler.cpp:2116
+msgid "Cannot assign object to property"
 msgstr ""
 
-#: declarative/util/qdeclarativeanimation.cpp:173
+#: declarative/qml/qdeclarativecompiler.cpp:2166
 #, qt-format
-msgid "Cannot animate non-existent property \"%1\""
+msgid "\"%1\" cannot operate on \"%2\""
 msgstr ""
 
-#: declarative/util/qdeclarativeanimation.cpp:176
-#, qt-format
-msgid "Cannot animate read-only property \"%1\""
+#: declarative/qml/qdeclarativecompiler.cpp:2330
+msgid "Duplicate default property"
 msgstr ""
 
-#: declarative/util/qdeclarativeanimation.cpp:618
-#: declarative/util/qdeclarativeanimation.cpp:1856
-#: declarative/util/qdeclarativeanimation.cpp:2876
-msgid "Cannot set a duration of < 0"
+#: declarative/qml/qdeclarativecompiler.cpp:2335
+msgid "Duplicate property name"
 msgstr ""
 
-#: declarative/util/qdeclarativeanimation.cpp:2708
-#: declarative/util/qdeclarativestateoperations.cpp:103
-msgid "Unable to preserve appearance under complex transform"
+#: declarative/qml/qdeclarativecompiler.cpp:2339
+msgid "Property names cannot begin with an upper case letter"
 msgstr ""
 
-#: declarative/util/qdeclarativeanimation.cpp:2719
-#: declarative/util/qdeclarativeanimation.cpp:2726
-#: declarative/util/qdeclarativestateoperations.cpp:114
-#: declarative/util/qdeclarativestateoperations.cpp:121
-msgid "Unable to preserve appearance under non-uniform scale"
+#: declarative/qml/qdeclarativecompiler.cpp:2342
+msgid "Illegal property name"
 msgstr ""
 
-#: declarative/util/qdeclarativeanimation.cpp:2733
-#: declarative/util/qdeclarativestateoperations.cpp:128
-msgid "Unable to preserve appearance under scale of 0"
+#: declarative/qml/qdeclarativecompiler.cpp:2350
+msgid "Duplicate signal name"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:392
-#, qt-format
-msgid "remove: index %1 out of range"
+#: declarative/qml/qdeclarativecompiler.cpp:2353
+msgid "Signal names cannot begin with an upper case letter"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:425
-msgid "insert: value is not an object"
+#: declarative/qml/qdeclarativecompiler.cpp:2355
+msgid "Illegal signal name"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:430
-#, qt-format
-msgid "insert: index %1 out of range"
+#: declarative/qml/qdeclarativecompiler.cpp:2361
+msgid "Duplicate method name"
+msgstr ""
+
+#: declarative/qml/qdeclarativecompiler.cpp:2364
+msgid "Method names cannot begin with an upper case letter"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:460
-msgid "move: out of range"
+#: declarative/qml/qdeclarativecompiler.cpp:2366
+msgid "Illegal method name"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:500
-msgid "append: value is not an object"
+#: declarative/qml/qdeclarativecompiler.cpp:2387
+msgid "Property value set multiple times"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:571
-msgid "set: value is not an object"
+#: declarative/qml/qdeclarativecompiler.cpp:2391
+msgid "Invalid property nesting"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:575
-#: declarative/util/qdeclarativelistmodel.cpp:613
-#, qt-format
-msgid "set: index %1 out of range"
+#: declarative/qml/qdeclarativecompiler.cpp:2443
+msgid "Cannot override FINAL property"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:650
-#: declarative/util/qdeclarativelistmodel.cpp:667
-msgid "ListElement: cannot contain nested elements"
+#: declarative/qml/qdeclarativecompiler.cpp:2466
+msgid "Invalid property type"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:671
-msgid "ListElement: cannot use reserved \"id\" property"
+#: declarative/qml/qdeclarativecompiler.cpp:2643
+msgid "Invalid empty ID"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:724
-msgid "ListElement: cannot use script for property value"
+#: declarative/qml/qdeclarativecompiler.cpp:2646
+msgid "IDs cannot start with an uppercase letter"
 msgstr ""
 
-#: declarative/util/qdeclarativelistmodel.cpp:755
-#, qt-format
-msgid "ListModel: undefined property '%1'"
+#: declarative/qml/qdeclarativecompiler.cpp:2652
+msgid "IDs must start with a letter or underscore"
 msgstr ""
 
-#: declarative/util/qdeclarativepixmapcache.cpp:311
-#, qt-format
-msgid "Error decoding: %1: %2"
+#: declarative/qml/qdeclarativecompiler.cpp:2654
+msgid "IDs must contain only letters, numbers, and underscores"
 msgstr ""
 
-#: declarative/util/qdeclarativepixmapcache.cpp:478
-#: declarative/util/qdeclarativepixmapcache.cpp:838
-#, qt-format
-msgid "Failed to get image from provider: %1"
+#: declarative/qml/qdeclarativecompiler.cpp:2660
+msgid "ID illegally masks global JavaScript property"
 msgstr ""
 
-#: declarative/util/qdeclarativepixmapcache.cpp:496
-#: declarative/util/qdeclarativepixmapcache.cpp:856
-#, qt-format
-msgid "Cannot open: %1"
+#: declarative/qml/qdeclarativecompiler.cpp:2691
+#: declarative/qml/qdeclarativecompiler.cpp:2700
+msgid "No property alias location"
 msgstr ""
 
-#: declarative/util/qdeclarativeconnections.cpp:217
-msgid "Connections: nested objects not allowed"
+#: declarative/qml/qdeclarativecompiler.cpp:2696
+#: declarative/qml/qdeclarativecompiler.cpp:2721
+#: declarative/qml/qdeclarativecompiler.cpp:2728
+#: declarative/qml/qdeclarativecompiler.cpp:2735
+#: declarative/qml/qdeclarativecompiler.cpp:2741
+msgid "Invalid alias location"
 msgstr ""
 
-#: declarative/util/qdeclarativeconnections.cpp:220
-msgid "Connections: syntax error"
+#: declarative/qml/qdeclarativecompiler.cpp:2705
+msgid ""
+"Invalid alias reference. An alias reference must be specified as <id>, "
+"<id>.<property> or <id>.<value property>.<property>"
 msgstr ""
 
-#: declarative/util/qdeclarativeconnections.cpp:228
-msgid "Connections: script expected"
+#: declarative/qml/qdeclarativecompiler.cpp:2708
+#, qt-format
+msgid "Invalid alias reference. Unable to find id \"%1\""
 msgstr ""
 
-#: declarative/util/qdeclarativeutilmodule.cpp:79
-msgid "Application is an abstract class"
+#: declarative/qml/qdeclarativecompiler.cpp:2723
+msgid "Alias property exceeds alias bounds"
 msgstr ""
 
-#: declarative/util/qdeclarativeutilmodule.cpp:111
-#: declarative/util/qdeclarativeutilmodule.cpp:113
-#: declarative/util/qdeclarativeutilmodule.cpp:160
-#: declarative/util/qdeclarativeutilmodule.cpp:162
-msgctxt "QDeclarativeXmlListModel"
-msgid "Qt was built without support for xmlpatterns"
+#: declarative/qml/qdeclarativecomponent.cpp:531
+msgid "Invalid empty URL"
 msgstr ""
 
-#: declarative/util/qdeclarativeutilmodule.cpp:123
-#: declarative/util/qdeclarativeutilmodule.cpp:168
-msgid "Animation is an abstract class"
+#: declarative/qml/qdeclarativecomponent.cpp:679
+msgid "createObject: value is not an object"
 msgstr ""
 
-#: declarative/util/qdeclarativexmllistmodel.cpp:581
-#, qt-format
-msgid "\"%1\" duplicates a previous role name and will be disabled."
+#: declarative/qml/qdeclarativesqldatabase.cpp:211
+msgid "executeSql called outside transaction()"
 msgstr ""
 
-#: declarative/util/qdeclarativexmllistmodel.cpp:826
-msgctxt "QDeclarativeXmlRoleList"
-msgid "An XmlListModel query must start with '/' or \"//\""
+#: declarative/qml/qdeclarativesqldatabase.cpp:269
+msgid "Read-only Transaction"
 msgstr ""
 
-#: declarative/util/qdeclarativexmllistmodel.cpp:1105
-#: declarative/util/qdeclarativexmllistmodel.cpp:1109
+#: declarative/qml/qdeclarativesqldatabase.cpp:289
 #, qt-format
-msgid "invalid query: \"%1\""
+msgid "Version mismatch: expected %1, found %2"
 msgstr ""
 
-#: declarative/util/qdeclarativebehavior.cpp:128
-msgid "Cannot change the animation assigned to a Behavior."
+#: declarative/qml/qdeclarativesqldatabase.cpp:303
+msgid "SQL transaction failed"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativevisualitemmodel.cpp:1099
-msgid "Delegate component must be Item type."
+#: declarative/qml/qdeclarativesqldatabase.cpp:326
+msgid "transaction: missing callback"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:198
-msgid "Possible anchor loop detected on fill."
+#: declarative/qml/qdeclarativesqldatabase.cpp:386
+#: declarative/qml/qdeclarativesqldatabase.cpp:401
+msgid "SQL: database version mismatch"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:227
-msgid "Possible anchor loop detected on centerIn."
+#: declarative/qml/qdeclarativescriptparser.cpp:254
+#: declarative/qml/qdeclarativescriptparser.cpp:683
+#: declarative/qml/qdeclarativescriptparser.cpp:742
+msgctxt "QDeclarativeParser"
+msgid "Property value set multiple times"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:435
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:469
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1115
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1152
-msgid "Cannot anchor to an item that isn't a parent or sibling."
+#: declarative/qml/qdeclarativescriptparser.cpp:265
+msgctxt "QDeclarativeParser"
+msgid "Expected type name"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:582
-msgid "Possible anchor loop detected on vertical anchor."
+#: declarative/qml/qdeclarativescriptparser.cpp:399
+msgctxt "QDeclarativeParser"
+msgid "Invalid import qualifier ID"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:677
-msgid "Possible anchor loop detected on horizontal anchor."
+#: declarative/qml/qdeclarativescriptparser.cpp:407
+msgctxt "QDeclarativeParser"
+msgid "Reserved name \"Qt\" cannot be used as an qualifier"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1099
-msgid "Cannot specify left, right, and hcenter anchors."
+#: declarative/qml/qdeclarativescriptparser.cpp:422
+msgctxt "QDeclarativeParser"
+msgid "Script import qualifiers must be unique."
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1109
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1146
-msgid "Cannot anchor to a null item."
+#: declarative/qml/qdeclarativescriptparser.cpp:432
+msgctxt "QDeclarativeParser"
+msgid "Script import requires a qualifier"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1112
-msgid "Cannot anchor a horizontal edge to a vertical edge."
+#: declarative/qml/qdeclarativescriptparser.cpp:443
+msgctxt "QDeclarativeParser"
+msgid "Library import requires a version"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1118
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1155
-msgid "Cannot anchor item to self."
+#: declarative/qml/qdeclarativescriptparser.cpp:502
+msgctxt "QDeclarativeParser"
+msgid "Expected parameter type"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1130
-msgid "Cannot specify top, bottom, and vcenter anchors."
+#: declarative/qml/qdeclarativescriptparser.cpp:544
+msgctxt "QDeclarativeParser"
+msgid "Invalid property type modifier"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1136
-msgid ""
-"Baseline anchor cannot be used in conjunction with top, bottom, or vcenter "
-"anchors."
+#: declarative/qml/qdeclarativescriptparser.cpp:553
+msgctxt "QDeclarativeParser"
+msgid "Unexpected property type modifier"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeanchors.cpp:1149
-msgid "Cannot anchor a vertical edge to a horizontal edge."
+#: declarative/qml/qdeclarativescriptparser.cpp:562
+msgctxt "QDeclarativeParser"
+msgid "Expected property type"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativetextinput.cpp:962
-#: declarative/graphicsitems/qdeclarativetextinput.cpp:970
-msgid "Could not load cursor delegate"
+#: declarative/qml/qdeclarativescriptparser.cpp:571
+msgctxt "QDeclarativeParser"
+msgid "Readonly not yet supported"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativetextinput.cpp:981
-msgid "Could not instantiate cursor delegate"
+#: declarative/qml/qdeclarativescriptparser.cpp:789
+msgctxt "QDeclarativeParser"
+msgid "JavaScript declaration outside Script element"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeitem.cpp:818
-msgid "LayoutDirection attached property only works with Items"
+#: declarative/qml/qdeclarativecompiledbindings.cpp:396
+#, qt-format
+msgctxt "QDeclarativeCompiledBindings"
+msgid "Binding loop detected for property \"%1\""
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeflipable.cpp:138
-msgid "front is a write-once property"
+#: declarative/qml/qdeclarativetypeloader.cpp:919
+#, qt-format
+msgid "Script %1 unavailable"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeflipable.cpp:158
-msgid "back is a write-once property"
+#: declarative/qml/qdeclarativetypeloader.cpp:937
+#, qt-format
+msgid "Type %1 unavailable"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeloader.cpp:407
-msgid "Loader does not support loading non-visual elements."
+#: declarative/qml/qdeclarativetypeloader.cpp:1113
+#, qt-format
+msgid "Namespace %1 cannot be used as a type"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:104
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:211
-msgctxt "QDeclarativeAnimatedImage"
-msgid "Qt was built without support for QMovie"
+#: declarative/qml/qdeclarativetypeloader.cpp:1115
+#, qt-format
+msgid "%1 %2"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:176
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:263
-msgid "KeyNavigation is only available via attached properties"
+#: declarative/qml/qdeclarativeimport.cpp:390
+#, qt-format
+msgid "plugin cannot be loaded for module \"%1\": %2"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:177
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:264
-msgid "Keys is only available via attached properties"
+#: declarative/qml/qdeclarativeimport.cpp:395
+#, qt-format
+msgid "module \"%1\" plugin \"%2\" not found"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:179
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:180
-msgid "Accessible is only available via attached properties"
+#: declarative/qml/qdeclarativeimport.cpp:529
+#: declarative/qml/qdeclarativeimport.cpp:597
+#, qt-format
+msgid "module \"%1\" version %2.%3 is not installed"
 msgstr ""
 
-#: declarative/graphicsitems/qdeclarativeitemsmodule.cpp:206
-msgid "LayoutMirroring is only available via attached properties"
+#: declarative/qml/qdeclarativeimport.cpp:531
+#, qt-format
+msgid "module \"%1\" is not installed"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:136
-msgid "Could not read image data"
+#: declarative/qml/qdeclarativeimport.cpp:545
+#: declarative/qml/qdeclarativeimport.cpp:565
+#, qt-format
+msgid "\"%1\": no such directory"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:141
-msgid "Sequential device (eg socket) for image read not supported"
+#: declarative/qml/qdeclarativeimport.cpp:563
+#, qt-format
+msgid "import \"%1\" has no qmldir and no namespace"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:146
-msgid "Seek file/device for image read failed"
+#: declarative/qml/qdeclarativeimport.cpp:622
+#, qt-format
+msgid "- %1 is not a namespace"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:152
-msgid "Image mHeader read failed"
+#: declarative/qml/qdeclarativeimport.cpp:628
+msgid "- nested namespaces not allowed"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:158
-msgid "Image type not supported"
+#: declarative/qml/qdeclarativeimport.cpp:675
+#: declarative/qml/qdeclarativeimport.cpp:679
+msgid "local directory"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:165
-msgid "Image dpeth not valid"
+#: declarative/qml/qdeclarativeimport.cpp:685
+#, qt-format
+msgid "is ambiguous. Found in %1 and in %2"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:171
-msgid "Could not seek to image read footer"
+#: declarative/qml/qdeclarativeimport.cpp:689
+#, qt-format
+msgid "is ambiguous. Found in %1 in version %2.%3 and %4.%5"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:178
-msgid "Could not read footer"
+#: declarative/qml/qdeclarativeimport.cpp:703
+msgid "is instantiated recursively"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:182
-msgid "Image type (non-TrueVision 2.0) not supported"
+#: declarative/qml/qdeclarativeimport.cpp:705
+msgid "is not a type"
 msgstr ""
 
-#: plugins/imageformats/tga/qtgafile.cpp:186
-msgid "Could not reset to read data"
+#: declarative/qml/qdeclarativeimport.cpp:1041
+#, qt-format
+msgid "File name case mismatch for \"%1\""
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:65
-msgid "Inspector Mode"
+#: declarative/qml/qdeclarativebinding.cpp:459
+#, qt-format
+msgid "Binding loop detected for property \"%1\""
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:66
-msgid "Play/Pause Animations"
+#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:154
+msgid "Previous"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:69
-msgid "Select (Marquee)"
+#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:161
+msgid "Next"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:70
-msgid "Zoom"
+#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:166
+msgid "Case Sensitive"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:72
-msgid "Color Picker"
+#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:169
+msgid "Whole words"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:74
-msgid "Apply Changes to QML Viewer"
+#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:178
+msgid ""
+"<img src=\":/qt/scripttools/debugging/images/wrap.png\">&nbsp;Search wrapped"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:76
-msgid "Apply Changes to Document"
+#: scripttools/debugging/qscriptedit.cpp:411
+#: scripttools/debugging/qscriptdebugger.cpp:1795
+msgid "Toggle Breakpoint"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:86
-msgid "Tools"
+#: scripttools/debugging/qscriptedit.cpp:413
+msgid "Disable Breakpoint"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:112
-msgid "1x"
+#: scripttools/debugging/qscriptedit.cpp:414
+msgid "Enable Breakpoint"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:118
-msgid "0.5x"
+#: scripttools/debugging/qscriptedit.cpp:418
+msgid "Breakpoint Condition:"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:123
-msgid "0.25x"
+#: scripttools/debugging/qscriptenginedebugger.cpp:523
+msgid "Loaded Scripts"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:128
-msgid "0.125x"
+#: scripttools/debugging/qscriptenginedebugger.cpp:529
+msgid "Breakpoints"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/qmltoolbar.cpp:133
-msgid "0.1x"
+#: scripttools/debugging/qscriptenginedebugger.cpp:535
+msgid "Stack"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp:143
-msgid "Items"
+#: scripttools/debugging/qscriptenginedebugger.cpp:541
+msgid "Locals"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp:63
-msgid "Zoom to &100%"
+#: scripttools/debugging/qscriptenginedebugger.cpp:547
+msgid "Console"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp:64
-msgid "Zoom In"
+#: scripttools/debugging/qscriptenginedebugger.cpp:553
+msgid "Debug Output"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/zoomtool.cpp:65
-msgid "Zoom Out"
+#: scripttools/debugging/qscriptenginedebugger.cpp:559
+msgid "Error Log"
 msgstr ""
 
-#: plugins/qmltooling/qmldbg_inspector/editor/toolbarcolorbox.cpp:65
-msgid "Copy Color"
+#: scripttools/debugging/qscriptenginedebugger.cpp:571
+msgid "Search"
 msgstr ""
 
-#: plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp:88
-msgid "Select IM"
+#: scripttools/debugging/qscriptenginedebugger.cpp:578
+msgid "View"
 msgstr ""
 
-#: plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp:95
-msgid "Multiple input method switcher"
+#: scripttools/debugging/qscriptenginedebugger.cpp:596
+msgid "Qt Script Debugger"
 msgstr ""
 
-#: plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp:102
-msgid ""
-"Multiple input method switcher that uses the context menu of the text widgets"
+#: scripttools/debugging/qscriptbreakpointsmodel.cpp:455
+msgctxt "QScriptBreakpointsModel"
+msgid "ID"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:246
-msgid "System"
+#: scripttools/debugging/qscriptbreakpointsmodel.cpp:457
+msgctxt "QScriptBreakpointsModel"
+msgid "Location"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:249
-msgid "Restore up"
+#: scripttools/debugging/qscriptbreakpointsmodel.cpp:459
+msgctxt "QScriptBreakpointsModel"
+msgid "Condition"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:253
-msgid "Restore down"
+#: scripttools/debugging/qscriptbreakpointsmodel.cpp:461
+msgctxt "QScriptBreakpointsModel"
+msgid "Ignore-count"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:274
-msgid "Contains commands to manipulate the window"
+#: scripttools/debugging/qscriptbreakpointsmodel.cpp:463
+msgctxt "QScriptBreakpointsModel"
+msgid "Single-shot"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:277
-msgid "Puts a minimized window back to normal"
+#: scripttools/debugging/qscriptbreakpointsmodel.cpp:465
+msgctxt "QScriptBreakpointsModel"
+msgid "Hit-count"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:278
-msgid "Moves the window out of the way"
+#: scripttools/debugging/qscriptbreakpointswidget.cpp:298
+msgid "New"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:281
-msgid "Puts a maximized window back to normal"
+#: scripttools/debugging/qscriptdebugger.cpp:885
+#: scripttools/debugging/qscriptdebugger.cpp:1898
+msgid "Go to Line"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:282
-msgid "Makes the window full screen"
+#: scripttools/debugging/qscriptdebugger.cpp:886
+msgid "Line:"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:284
-msgid "Closes the window"
+#: scripttools/debugging/qscriptdebugger.cpp:1677
+msgid "Interrupt"
 msgstr ""
 
-#: plugins/accessible/compat/q3complexwidgets.cpp:286
-msgid ""
-"Displays the name of the window and contains controls to manipulate it"
+#: scripttools/debugging/qscriptdebugger.cpp:1679
+msgid "Shift+F5"
 msgstr ""
 
-#: plugins/accessible/widgets/rangecontrols.cpp:149
-#: plugins/accessible/widgets/rangecontrols.cpp:412
-msgid "More"
+#: scripttools/debugging/qscriptdebugger.cpp:1696
+msgid "F5"
 msgstr ""
 
-#: plugins/accessible/widgets/rangecontrols.cpp:151
-#: plugins/accessible/widgets/rangecontrols.cpp:414
-msgid "Less"
+#: scripttools/debugging/qscriptdebugger.cpp:1711
+msgid "Step Into"
 msgstr ""
 
-#: plugins/accessible/widgets/rangecontrols.cpp:555
-#: plugins/accessible/widgets/rangecontrols.cpp:708
-msgid "Position"
-msgstr "Safle"
-
-#: plugins/accessible/widgets/rangecontrols.cpp:559
-msgid "Line down"
+#: scripttools/debugging/qscriptdebugger.cpp:1713
+msgid "F11"
 msgstr ""
 
-#: plugins/accessible/widgets/rangecontrols.cpp:933
-msgid "QDial"
+#: scripttools/debugging/qscriptdebugger.cpp:1728
+msgid "Step Over"
 msgstr ""
 
-#: plugins/accessible/widgets/rangecontrols.cpp:935
-msgid "SpeedoMeter"
+#: scripttools/debugging/qscriptdebugger.cpp:1730
+msgid "F10"
 msgstr ""
 
-#: plugins/accessible/widgets/rangecontrols.cpp:937
-msgid "SliderHandle"
+#: scripttools/debugging/qscriptdebugger.cpp:1745
+msgid "Step Out"
 msgstr ""
 
-#: plugins/accessible/widgets/simplewidgets.cpp:117
-#: plugins/accessible/widgets/simplewidgets.cpp:452
-#: plugins/accessible/widgets/simplewidgets.cpp:460
-#: plugins/accessible/widgets/complexwidgets.cpp:1781
-#: plugins/accessible/widgets/complexwidgets.cpp:1847
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:158
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:383
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:437
-msgid "Open"
-msgstr "Agor"
-
-#: plugins/accessible/widgets/simplewidgets.cpp:121
-#: plugins/accessible/widgets/simplewidgets.cpp:266
-msgid "Uncheck"
+#: scripttools/debugging/qscriptdebugger.cpp:1747
+msgid "Shift+F11"
 msgstr ""
 
-#: plugins/accessible/widgets/simplewidgets.cpp:124
-#: plugins/accessible/widgets/simplewidgets.cpp:129
-#: plugins/accessible/widgets/simplewidgets.cpp:268
-msgid "Check"
+#: scripttools/debugging/qscriptdebugger.cpp:1762
+msgid "Run to Cursor"
 msgstr ""
 
-#: plugins/accessible/widgets/simplewidgets.cpp:125
-msgid "Toggle"
+#: scripttools/debugging/qscriptdebugger.cpp:1764
+msgid "Ctrl+F10"
 msgstr ""
 
-#: plugins/accessible/widgets/simplewidgets.cpp:271
-#: plugins/accessible/widgets/simplewidgets.cpp:450
-#: plugins/accessible/widgets/simplewidgets.cpp:456
-msgid "Press"
+#: scripttools/debugging/qscriptdebugger.cpp:1780
+msgid "Run to New Script"
 msgstr ""
 
-#: plugins/accessible/widgets/complexwidgets.cpp:1515
-msgid "Scroll Left"
+#: scripttools/debugging/qscriptdebugger.cpp:1796
+msgid "F9"
 msgstr ""
 
-#: plugins/accessible/widgets/complexwidgets.cpp:1515
-msgid "Scroll Right"
+#: scripttools/debugging/qscriptdebugger.cpp:1810
+msgid "Clear Debug Output"
 msgstr ""
 
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:160
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:385
-#: plugins/accessible/widgets/qaccessiblemenu.cpp:438
-msgid "Execute"
-msgstr "Gweithredu"
-
-#: plugins/accessible/widgets/qaccessiblewidgets.cpp:1251
-msgid "Dock"
+#: scripttools/debugging/qscriptdebugger.cpp:1823
+msgid "Clear Error Log"
 msgstr ""
 
-#: plugins/accessible/widgets/qaccessiblewidgets.cpp:1252
-msgid "Float"
+#: scripttools/debugging/qscriptdebugger.cpp:1836
+msgid "Clear Console"
 msgstr ""
-
-#: plugins/bearer/icd/qnetworksession_impl.cpp:1030
-msgid "Roaming error"
+
+#: scripttools/debugging/qscriptdebugger.cpp:1850
+msgid "&Find in Script..."
 msgstr ""
 
-#: plugins/bearer/icd/qnetworksession_impl.cpp:1033
-msgid "Session aborted by user or system"
+#: scripttools/debugging/qscriptdebugger.cpp:1851
+msgid "Ctrl+F"
 msgstr ""
 
-#: plugins/bearer/icd/qnetworksession_impl.cpp:1036
-#: plugins/bearer/symbian/qnetworksession_impl.cpp:307
-#: plugins/bearer/qnetworksession_impl.cpp:260
-msgid "The specified configuration cannot be used."
+#: scripttools/debugging/qscriptdebugger.cpp:1868
+msgid "Find &Next"
 msgstr ""
 
-#: plugins/bearer/icd/qnetworksession_impl.cpp:1040
-msgid "Unidentified Error"
+#: scripttools/debugging/qscriptdebugger.cpp:1870
+msgid "F3"
 msgstr ""
 
-#: plugins/bearer/symbian/qnetworksession_impl.cpp:301
-#: plugins/bearer/qnetworksession_impl.cpp:254
-msgid "Unknown session error."
+#: scripttools/debugging/qscriptdebugger.cpp:1883
+msgid "Find &Previous"
 msgstr ""
 
-#: plugins/bearer/symbian/qnetworksession_impl.cpp:303
-#: plugins/bearer/qnetworksession_impl.cpp:256
-msgid "The session was aborted by the user or system."
+#: scripttools/debugging/qscriptdebugger.cpp:1885
+msgid "Shift+F3"
 msgstr ""
 
-#: plugins/bearer/symbian/qnetworksession_impl.cpp:305
-#: plugins/bearer/qnetworksession_impl.cpp:258
-msgid "The requested operation is not supported by the system."
+#: scripttools/debugging/qscriptdebugger.cpp:1899
+msgid "Ctrl+G"
 msgstr ""
 
-#: plugins/bearer/symbian/qnetworksession_impl.cpp:309
-#: plugins/bearer/qnetworksession_impl.cpp:262
-msgid "Roaming was aborted or is not possible."
+#: scripttools/debugging/qscriptdebugger.cpp:1910
+msgid "Debug"
 msgstr ""
 
 #: scripttools/debugging/qscriptdebuggerstackmodel.cpp:161
@@ -8642,1280 +8614,1323 @@
 msgid "Location"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:523
-msgid "Loaded Scripts"
+#: scripttools/debugging/qscriptdebuggerlocalsmodel.cpp:897
+msgctxt "QScriptDebuggerLocalsModel"
+msgid "Name"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:529
-msgid "Breakpoints"
+#: scripttools/debugging/qscriptdebuggerlocalsmodel.cpp:899
+msgctxt "QScriptDebuggerLocalsModel"
+msgid "Value"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:535
-msgid "Stack"
+#: 3rdparty/webkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:540
+msgctxt "QWebPage"
+msgid "Redirection limit reached"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:541
-msgid "Locals"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:59
+msgctxt "QWebPage"
+msgid "Scroll here"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:547
-msgid "Console"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:62
+msgctxt "QWebPage"
+msgid "Left edge"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:553
-msgid "Debug Output"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:62
+msgctxt "QWebPage"
+msgid "Top"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:559
-msgid "Error Log"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:63
+msgctxt "QWebPage"
+msgid "Right edge"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:571
-msgid "Search"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:63
+msgctxt "QWebPage"
+msgid "Bottom"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:578
-msgid "View"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:66
+msgctxt "QWebPage"
+msgid "Page left"
 msgstr ""
 
-#: scripttools/debugging/qscriptenginedebugger.cpp:596
-msgid "Qt Script Debugger"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:66
+msgctxt "QWebPage"
+msgid "Page up"
 msgstr ""
 
-#: scripttools/debugging/qscriptedit.cpp:411
-#: scripttools/debugging/qscriptdebugger.cpp:1795
-msgid "Toggle Breakpoint"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:67
+msgctxt "QWebPage"
+msgid "Page right"
 msgstr ""
 
-#: scripttools/debugging/qscriptedit.cpp:413
-msgid "Disable Breakpoint"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:67
+msgctxt "QWebPage"
+msgid "Page down"
 msgstr ""
 
-#: scripttools/debugging/qscriptedit.cpp:414
-msgid "Enable Breakpoint"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:70
+msgctxt "QWebPage"
+msgid "Scroll left"
 msgstr ""
 
-#: scripttools/debugging/qscriptedit.cpp:418
-msgid "Breakpoint Condition:"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:70
+msgctxt "QWebPage"
+msgid "Scroll up"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointswidget.cpp:298
-msgid "New"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:71
+msgctxt "QWebPage"
+msgid "Scroll right"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointsmodel.cpp:455
-msgctxt "QScriptBreakpointsModel"
-msgid "ID"
+#: 3rdparty/webkit/Source/WebCore/platform/qt/ScrollbarQt.cpp:71
+msgctxt "QWebPage"
+msgid "Scroll down"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointsmodel.cpp:457
-msgctxt "QScriptBreakpointsModel"
-msgid "Location"
+#: 3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2321
+msgid "Fake error!"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointsmodel.cpp:459
-msgctxt "QScriptBreakpointsModel"
-msgid "Condition"
+#: 3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp:2326
+#: 3rdparty/phonon/mmf/utils.cpp:134
+msgid "Invalid URL"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointsmodel.cpp:461
-msgctxt "QScriptBreakpointsModel"
-msgid "Ignore-count"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp:372
+#, qt-format
+msgctxt "QWebPage"
+msgid "Web Inspector - %2"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointsmodel.cpp:463
-msgctxt "QScriptBreakpointsModel"
-msgid "Single-shot"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:152
+msgctxt ""
+"Submit (input element) alt text for <input> elements with no alt, title, or "
+"value"
+msgid "Submit"
 msgstr ""
 
-#: scripttools/debugging/qscriptbreakpointsmodel.cpp:465
-msgctxt "QScriptBreakpointsModel"
-msgid "Hit-count"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:157
+msgctxt "default label for Reset buttons in forms on web pages"
+msgid "Reset"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:154
-msgid "Previous"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:162
+msgctxt ""
+"text that appears at the start of nearly-obsolete web pages in the form of a "
+"'searchable index'"
+msgid "This is a searchable index. Enter search keywords: "
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:161
-msgid "Next"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:167
+msgctxt "default label for Submit buttons in forms on web pages"
+msgid "Submit"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:166
-msgid "Case Sensitive"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:172
+msgctxt "title for file button used in HTML forms"
+msgid "Choose File"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:169
-msgid "Whole words"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:177
+msgctxt ""
+"text to display in file button used in HTML forms when no file is selected"
+msgid "No file selected"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggercodefinderwidget.cpp:178
-msgid ""
-"<img src=\":/qt/scripttools/debugging/images/wrap.png\">&nbsp;Search wrapped"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:182
+msgctxt "text to display in <details> tag when it has no <summary> child"
+msgid "Details"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:885
-#: scripttools/debugging/qscriptdebugger.cpp:1898
-msgid "Go to Line"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:187
+msgctxt "Open in New Window context menu item"
+msgid "Open in New Window"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:886
-msgid "Line:"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:192
+msgctxt "Download Linked File context menu item"
+msgid "Save Link..."
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1677
-msgid "Interrupt"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:197
+msgctxt "Copy Link context menu item"
+msgid "Copy Link"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1679
-msgid "Shift+F5"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:202
+msgctxt "Open Image in New Window context menu item"
+msgid "Open Image"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1696
-msgid "F5"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:207
+msgctxt "Download Image context menu item"
+msgid "Save Image"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1711
-msgid "Step Into"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:212
+msgctxt "Copy Link context menu item"
+msgid "Copy Image"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1713
-msgid "F11"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:217
+msgctxt "Copy Image Address menu item"
+msgid "Copy Image Address"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1728
-msgid "Step Over"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:222
+msgctxt "Open Video in New Window"
+msgid "Open Video"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1730
-msgid "F10"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:227
+msgctxt "Open Audio in New Window"
+msgid "Open Audio"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1745
-msgid "Step Out"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:232
+msgctxt "Copy Video Link Location"
+msgid "Copy Video"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1747
-msgid "Shift+F11"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:237
+msgctxt "Copy Audio Link Location"
+msgid "Copy Audio"
+msgstr ""
+
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:242
+msgctxt "Toggle Media Controls"
+msgid "Toggle Controls"
+msgstr ""
+
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:247
+msgctxt "Toggle Media Loop Playback"
+msgid "Toggle Loop"
+msgstr ""
+
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:252
+msgctxt "Switch Video to Fullscreen"
+msgid "Enter Fullscreen"
+msgstr ""
+
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:257
+msgctxt "Play"
+msgid "Play"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1762
-msgid "Run to Cursor"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:262
+msgctxt "Pause"
+msgid "Pause"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1764
-msgid "Ctrl+F10"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:267
+msgctxt "Mute"
+msgid "Mute"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1780
-msgid "Run to New Script"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:272
+msgctxt "Open Frame in New Window context menu item"
+msgid "Open Frame"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1796
-msgid "F9"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:277
+msgctxt "Copy context menu item"
+msgid "Copy"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1810
-msgid "Clear Debug Output"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:282
+msgctxt "Back context menu item"
+msgid "Go Back"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1823
-msgid "Clear Error Log"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:287
+msgctxt "Forward context menu item"
+msgid "Go Forward"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1836
-msgid "Clear Console"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:292
+msgctxt "Stop context menu item"
+msgid "Stop"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1850
-msgid "&Find in Script..."
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:297
+msgctxt "Reload context menu item"
+msgid "Reload"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1851
-msgid "Ctrl+F"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:302
+msgctxt "Cut context menu item"
+msgid "Cut"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1868
-msgid "Find &Next"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:307
+msgctxt "Paste context menu item"
+msgid "Paste"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1870
-msgid "F3"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:312
+msgctxt "Select All context menu item"
+msgid "Select All"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1883
-msgid "Find &Previous"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:317
+msgctxt "No Guesses Found context menu item"
+msgid "No Guesses Found"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1885
-msgid "Shift+F3"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:322
+msgctxt "Ignore Spelling context menu item"
+msgid "Ignore"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1899
-msgid "Ctrl+G"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:327
+msgctxt "Learn Spelling context menu item"
+msgid "Add To Dictionary"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebugger.cpp:1910
-msgid "Debug"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:332
+msgctxt "Search The Web context menu item"
+msgid "Search The Web"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggerlocalsmodel.cpp:897
-msgctxt "QScriptDebuggerLocalsModel"
-msgid "Name"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:337
+msgctxt "Look Up in Dictionary context menu item"
+msgid "Look Up In Dictionary"
 msgstr ""
 
-#: scripttools/debugging/qscriptdebuggerlocalsmodel.cpp:899
-msgctxt "QScriptDebuggerLocalsModel"
-msgid "Value"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:342
+msgctxt "Open Link context menu item"
+msgid "Open Link"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:217
-msgid "The issuer certificate could not be found"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:347
+msgctxt "Ignore Grammar context menu item"
+msgid "Ignore"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:220
-msgid "The certificate signature could not be decrypted"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:352
+msgctxt "Spelling and Grammar context sub-menu item"
+msgid "Spelling"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:223
-msgid "The public key in the certificate could not be read"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:357
+msgctxt "menu item title"
+msgid "Show Spelling and Grammar"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:226
-msgid "The signature of the certificate is invalid"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:358
+msgctxt "menu item title"
+msgid "Hide Spelling and Grammar"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:229
-msgid "The certificate is not yet valid"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:363
+msgctxt "Check spelling context menu item"
+msgid "Check Spelling"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:232
-msgid "The certificate has expired"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:368
+msgctxt "Check spelling while typing context menu item"
+msgid "Check Spelling While Typing"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:235
-msgid "The certificate's notBefore field contains an invalid time"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:373
+msgctxt "Check grammar with spelling context menu item"
+msgid "Check Grammar With Spelling"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:238
-msgid "The certificate's notAfter field contains an invalid time"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:378
+msgctxt "Font context sub-menu item"
+msgid "Fonts"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:241
-msgid "The certificate is self-signed, and untrusted"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:383
+msgctxt "Bold context menu item"
+msgid "Bold"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:244
-msgid ""
-"The root certificate of the certificate chain is self-signed, and untrusted"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:388
+msgctxt "Italic context menu item"
+msgid "Italic"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:247
-msgid ""
-"The issuer certificate of a locally looked up certificate could not be found"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:393
+msgctxt "Underline context menu item"
+msgid "Underline"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:250
-msgid "No certificates could be verified"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:398
+msgctxt "Outline context menu item"
+msgid "Outline"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:253
-msgid "One of the CA certificates is invalid"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:403
+msgctxt "Writing direction context sub-menu item"
+msgid "Direction"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:256
-msgid "The basicConstraints path length parameter has been exceeded"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:408
+msgctxt "Text direction context sub-menu item"
+msgid "Text Direction"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:259
-msgid "The supplied certificate is unsuitable for this purpose"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:413
+msgctxt "Default writing direction context menu item"
+msgid "Default"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:262
-msgid "The root CA certificate is not trusted for this purpose"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:418
+msgctxt "Left to Right context menu item"
+msgid "Left to Right"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:265
-msgid "The root CA certificate is marked to reject the specified purpose"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:423
+msgctxt "Right to Left context menu item"
+msgid "Right to Left"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:268
-msgid ""
-"The current candidate issuer certificate was rejected because its subject "
-"name did not match the issuer name of the current certificate"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:428
+msgctxt "Inspect Element context menu item"
+msgid "Inspect"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:272
-msgid ""
-"The current candidate issuer certificate was rejected because its issuer "
-"name and serial number was present and did not match the authority key "
-"identifier of the current certificate"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:433
+msgctxt ""
+"Label for only item in menu that appears when clicking on the search field "
+"image, when no searches have been performed"
+msgid "No recent searches"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:277
-msgid "The peer did not present any certificate"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:438
+msgctxt ""
+"label for first item in the menu that appears when clicking on the search "
+"field image, used as embedded menu title"
+msgid "Recent searches"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:280
-msgid ""
-"The host name did not match any of the valid hosts for this certificate"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:443
+msgctxt "menu item in Recent Searches menu that empties menu's contents"
+msgid "Clear recent searches"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:286
-msgid "The peer certificate is blacklisted"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:538
+msgctxt "Label text to be used when a plug-in is missing"
+msgid "Missing Plug-in"
 msgstr ""
 
-#: network/ssl/qsslerror.cpp:289 network/socket/qnativesocketengine.cpp:276
-#: network/socket/qsymbiansocketengine.cpp:1435
-#: network/kernel/qhostinfo_unix.cpp:300 network/kernel/qhostinfo_win.cpp:209
-#: network/kernel/qhostinfo_win.cpp:236 corelib/io/qiodevice.cpp:1629
-#: corelib/plugin/qpluginloader.cpp:367 corelib/plugin/qlibrary.cpp:1233
-#: corelib/statemachine/qstatemachine.cpp:1046
-msgid "Unknown error"
-msgstr "Gwall anhysbys"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:555
+msgctxt "Unknown filesize FTP directory listing item"
+msgid "Unknown"
+msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:286
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:560
 #, qt-format
-msgid "Error creating SSL context (%1)"
+msgctxt "Title string for images"
+msgid "%1 (%2x%3 pixels)"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:340
-#, qt-format
-msgid "Invalid or empty cipher list (%1)"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:565
+msgctxt "Media controller status message when the media is loading"
+msgid "Loading..."
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:384
-#, qt-format
-msgid "Cannot provide a certificate with no key, %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:570
+msgctxt "Media controller status message when watching a live broadcast"
+msgid "Live Broadcast"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:391
-#, qt-format
-msgid "Error loading local certificate, %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:578
+msgctxt "Media controller element"
+msgid "Audio Element"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:406
-#, qt-format
-msgid "Error loading private key, %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:580
+msgctxt "Media controller element"
+msgid "Video Element"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:413
-#, qt-format
-msgid "Private key does not certify public key, %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:582
+msgctxt "Media controller element"
+msgid "Mute Button"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:433
-#, qt-format
-msgid "Error creating SSL session, %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:584
+msgctxt "Media controller element"
+msgid "Unmute Button"
+msgstr ""
+
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:586
+msgctxt "Media controller element"
+msgid "Play Button"
+msgstr ""
+
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:588
+msgctxt "Media controller element"
+msgid "Pause Button"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:473
-#, qt-format
-msgid "Error creating SSL session: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:590
+msgctxt "Media controller element"
+msgid "Slider"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:1010
-#, qt-format
-msgid "Unable to write data: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:592
+msgctxt "Media controller element"
+msgid "Slider Thumb"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:1073
-#, qt-format
-msgid "Unable to decrypt data: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:594
+msgctxt "Media controller element"
+msgid "Rewind Button"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:1151
-#: network/ssl/qsslsocket_openssl.cpp:1161
-#, qt-format
-msgid "Error while reading: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:596
+msgctxt "Media controller element"
+msgid "Return to Real-time Button"
 msgstr ""
 
-#: network/ssl/qsslsocket_openssl.cpp:1256
-#, qt-format
-msgid "Error during SSL handshake: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:598
+msgctxt "Media controller element"
+msgid "Elapsed Time"
 msgstr ""
 
-#: network/access/qnetworkaccesscachebackend.cpp:66
-#, qt-format
-msgctxt "QNetworkAccessCacheBackend"
-msgid "Error opening %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:600
+msgctxt "Media controller element"
+msgid "Remaining Time"
 msgstr ""
 
-#: network/access/qnetworkaccessdebugpipebackend.cpp:195
-#, qt-format
-msgctxt "QNetworkAccessDebugPipeBackend"
-msgid "Write error writing to %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:602
+msgctxt "Media controller element"
+msgid "Status Display"
 msgstr ""
 
-#: network/access/qnetworkaccessdebugpipebackend.cpp:255
-#, qt-format
-msgid "Socket error on %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:604
+msgctxt "Media controller element"
+msgid "Fullscreen Button"
 msgstr ""
 
-#: network/access/qnetworkaccessdebugpipebackend.cpp:270
-#, qt-format
-msgid "Remote host closed the connection prematurely on %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:606
+msgctxt "Media controller element"
+msgid "Seek Forward Button"
 msgstr ""
 
-#: network/access/qnetworkaccesshttpbackend.cpp:429
-#: network/access/qnetworkaccessftpbackend.cpp:131
-msgid "No suitable proxy found"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:608
+msgctxt "Media controller element"
+msgid "Seek Back Button"
 msgstr ""
 
-#: network/access/qnetworkreplydataimpl.cpp:95
-#, qt-format
-msgctxt "QNetworkAccessDataBackend"
-msgid "Invalid URI: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:616
+msgctxt "Media controller element"
+msgid "Audio element playback controls and status display"
 msgstr ""
 
-#: network/access/qnetworkreplyimpl.cpp:88
-#, qt-format
-msgctxt "QNetworkReply"
-msgid "Protocol \"%1\" is unknown"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:618
+msgctxt "Media controller element"
+msgid "Video element playback controls and status display"
 msgstr ""
 
-#: network/access/qnetworkreplyimpl.cpp:114
-#: network/access/qnetworkreplyimpl.cpp:305
-msgctxt "QNetworkReply"
-msgid "Network session error."
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:620
+msgctxt "Media controller element"
+msgid "Mute audio tracks"
 msgstr ""
 
-#: network/access/qnetworkreplyimpl.cpp:121
-msgctxt "QNetworkReply"
-msgid "backend start error."
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:622
+msgctxt "Media controller element"
+msgid "Unmute audio tracks"
 msgstr ""
 
-#: network/access/qnetworkreplyimpl.cpp:763
-msgid "Temporary network failure."
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:624
+msgctxt "Media controller element"
+msgid "Begin playback"
 msgstr ""
 
-#: network/access/qnetworkreplyimpl.cpp:882
-#: network/access/qnetworkreplyimpl.cpp:912
-msgid "Operation canceled"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:626
+msgctxt "Media controller element"
+msgid "Pause playback"
 msgstr ""
 
-#: network/access/qnetworkreplyimpl.cpp:1102
-msgctxt "QNetworkAccessManager"
-msgid "Network access is disabled."
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:628
+msgctxt "Media controller element"
+msgid "Movie time scrubber"
 msgstr ""
 
-#: network/access/qnetworkaccessfilebackend.cpp:108
-#: network/access/qnetworkreplyfileimpl.cpp:79
-#, qt-format
-msgctxt "QNetworkAccessFileBackend"
-msgid "Request for opening non-local file %1"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:630
+msgctxt "Media controller element"
+msgid "Movie time scrubber thumb"
 msgstr ""
 
-#: network/access/qnetworkaccessfilebackend.cpp:153
-#: network/access/qnetworkreplyfileimpl.cpp:115
-#, qt-format
-msgctxt "QNetworkAccessFileBackend"
-msgid "Error opening %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:632
+msgctxt "Media controller element"
+msgid "Rewind movie"
 msgstr ""
 
-#: network/access/qnetworkaccessfilebackend.cpp:191
-#, qt-format
-msgctxt "QNetworkAccessFileBackend"
-msgid "Write error writing to %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:634
+msgctxt "Media controller element"
+msgid "Return streaming movie to real-time"
 msgstr ""
 
-#: network/access/qnetworkaccessfilebackend.cpp:233
-#: network/access/qnetworkreplyfileimpl.cpp:102
-#, qt-format
-msgctxt "QNetworkAccessFileBackend"
-msgid "Cannot open %1: Path is a directory"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:636
+msgctxt "Media controller element"
+msgid "Current movie time"
 msgstr ""
 
-#: network/access/qnetworkaccessfilebackend.cpp:254
-#, qt-format
-msgctxt "QNetworkAccessFileBackend"
-msgid "Read error reading from %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:638
+msgctxt "Media controller element"
+msgid "Remaining movie time"
 msgstr ""
 
-#: network/access/qnetworkaccessftpbackend.cpp:145
-#, qt-format
-msgid "Cannot open %1: is a directory"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:640
+msgctxt "Media controller element"
+msgid "Current movie status"
 msgstr ""
 
-#: network/access/qnetworkaccessftpbackend.cpp:244
-#, qt-format
-msgid "Logging in to %1 failed: authentication required"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:642
+msgctxt "Media controller element"
+msgid "Play movie in full-screen mode"
 msgstr ""
 
-#: network/access/qnetworkaccessftpbackend.cpp:283
-#, qt-format
-msgid "Error while downloading %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:644
+msgctxt "Media controller element"
+msgid "Seek quickly back"
 msgstr ""
 
-#: network/access/qnetworkaccessftpbackend.cpp:285
-#, qt-format
-msgid "Error while uploading %1: %2"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:646
+msgctxt "Media controller element"
+msgid "Seek quickly forward"
 msgstr ""
 
-#: network/socket/qudpsocket.cpp:199
-msgid "This platform does not support IPv6"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:655
+msgctxt "Media time description"
+msgid "Indefinite time"
 msgstr ""
 
-#: network/socket/qabstractsocket.cpp:552
-#: network/socket/qabstractsocket.cpp:1389
-#: network/socket/qabstractsocket.cpp:1614 network/socket/qtcpserver.cpp:292
-#: network/socket/qtcpserver.cpp:421
-msgid "Operation on socket is not supported"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:664
+#, qt-format
+msgctxt "Media time description"
+msgid "%1 days %2 hours %3 minutes %4 seconds"
 msgstr ""
 
-#: network/socket/qabstractsocket.cpp:925
-#: network/socket/qsocks5socketengine.cpp:668
-#: network/socket/qsocks5socketengine.cpp:694
-#: network/kernel/qhostinfo_unix.cpp:264 network/kernel/qhostinfo_unix.cpp:296
-#: network/kernel/qhostinfo_win.cpp:206 network/kernel/qhostinfo_win.cpp:233
-#: network/kernel/qhostinfo_symbian.cpp:73
-msgid "Host not found"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:667
+#, qt-format
+msgctxt "Media time description"
+msgid "%1 hours %2 minutes %3 seconds"
 msgstr ""
 
-#: network/socket/qabstractsocket.cpp:975
-#: network/socket/qnativesocketengine.cpp:240
-#: network/socket/qsocks5socketengine.cpp:698
-#: network/socket/qsymbiansocketengine.cpp:1393
-msgid "Connection refused"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:670
+#, qt-format
+msgctxt "Media time description"
+msgid "%1 minutes %2 seconds"
 msgstr ""
 
-#: network/socket/qabstractsocket.cpp:1117
-#: network/socket/qnativesocketengine.cpp:237
-#: network/socket/qsymbiansocketengine.cpp:1390
-msgid "Connection timed out"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebPlatformStrategies.cpp:672
+#, qt-format
+msgctxt "Media time description"
+msgid "%1 seconds"
 msgstr ""
 
-#: network/socket/qabstractsocket.cpp:1833
-msgid "Socket operation timed out"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp:129
+msgid "weba_ti_texlist_single"
 msgstr ""
 
-#: network/socket/qabstractsocket.cpp:2270
-msgid "Socket is not connected"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp:176
+msgid "weba_ti_textlist_multi"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:201
-#: network/socket/qsymbiansocketengine.cpp:1354
-msgid "Unable to initialize non-blocking socket"
+#: 3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp:202
+msgid "wdgt_bd_done"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:204
-#: network/socket/qsymbiansocketengine.cpp:1357
-msgid "Unable to initialize broadcast socket"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2114
+#, qt-format
+msgid "JavaScript Alert - %1"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:207
-#: network/socket/qsymbiansocketengine.cpp:1360
-msgid "Attempt to use IPv6 socket on a platform with no IPv6 support"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2131
+#, qt-format
+msgid "JavaScript Confirm - %1"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:210
-#: network/socket/qsymbiansocketengine.cpp:1363
-msgid "The remote host closed the connection"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2151
+#, qt-format
+msgid "JavaScript Prompt - %1"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:213
-#: network/socket/qsymbiansocketengine.cpp:1366
-msgid "Network operation timed out"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2177
+#, qt-format
+msgid "JavaScript Problem - %1"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:216
-#: network/socket/qsymbiansocketengine.cpp:1369
-msgid "Out of resources"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2177
+msgid ""
+"The script on this page appears to have a problem. Do you want to stop the "
+"script?"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:219
-#: network/socket/qsymbiansocketengine.cpp:1372
-msgid "Unsupported socket operation"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2826
+msgid "Move the cursor to the next character"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:222
-#: network/socket/qsymbiansocketengine.cpp:1375
-msgid "Protocol type not supported"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2829
+msgid "Move the cursor to the previous character"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:225
-#: network/socket/qsymbiansocketengine.cpp:1378
-msgid "Invalid socket descriptor"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2832
+msgid "Move the cursor to the next word"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:228
-#: network/socket/qsymbiansocketengine.cpp:1381
-msgid "Host unreachable"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2835
+msgid "Move the cursor to the previous word"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:231
-#: network/socket/qsocks5socketengine.cpp:690
-#: network/socket/qsymbiansocketengine.cpp:1384
-msgid "Network unreachable"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2838
+msgid "Move the cursor to the next line"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:243
-#: network/socket/qsymbiansocketengine.cpp:1396
-msgid "The bound address is already in use"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2841
+msgid "Move the cursor to the previous line"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:246
-#: network/socket/qsymbiansocketengine.cpp:1399
-msgid "The address is not available"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2844
+msgid "Move the cursor to the start of the line"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:249
-#: network/socket/qsymbiansocketengine.cpp:1402
-msgid "The address is protected"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2847
+msgid "Move the cursor to the end of the line"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:252
-#: network/socket/qsymbiansocketengine.cpp:1405
-msgid "Datagram was too large to send"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2850
+msgid "Move the cursor to the start of the block"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:255
-#: network/socket/qsymbiansocketengine.cpp:1408
-msgid "Unable to send a message"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2853
+msgid "Move the cursor to the end of the block"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:258
-#: network/socket/qsymbiansocketengine.cpp:1411
-msgid "Unable to receive a message"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2856
+msgid "Move the cursor to the start of the document"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:261
-#: network/socket/qsymbiansocketengine.cpp:1414
-msgid "Unable to write"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2859
+msgid "Move the cursor to the end of the document"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:264
-#: network/socket/qsymbiansocketengine.cpp:1417
-msgid "Network error"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2862
+msgid "Select to the next character"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:267
-#: network/socket/qsymbiansocketengine.cpp:1420
-msgid "Another socket is already listening on the same port"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2865
+msgid "Select to the previous character"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:270
-#: network/socket/qsymbiansocketengine.cpp:1423
-msgid "Operation on non-socket"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2868
+msgid "Select to the next word"
 msgstr ""
 
-#: network/socket/qnativesocketengine.cpp:273
-#: network/socket/qsymbiansocketengine.cpp:1426
-msgid "The proxy type is invalid for this operation"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2871
+msgid "Select to the previous word"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:623
-msgid "Connection to proxy refused"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2874
+msgid "Select to the next line"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:627
-msgid "Connection to proxy closed prematurely"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2877
+msgid "Select to the previous line"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:631
-msgid "Proxy host not found"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2880
+msgid "Select to the start of the line"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:636
-msgid "Connection to proxy timed out"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2883
+msgid "Select to the end of the line"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:653
-msgid "Proxy authentication failed"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2886
+msgid "Select to the start of the block"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:654
-#, qt-format
-msgid "Proxy authentication failed: %1"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2889
+msgid "Select to the end of the block"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:663
-msgid "SOCKS version 5 protocol error"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2892
+msgid "Select to the start of the document"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:682
-msgid "General SOCKSv5 server failure"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2895
+msgid "Select to the end of the document"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:686
-msgid "Connection not allowed by SOCKSv5 server"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2898
+msgid "Delete to the start of the word"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:702
-msgid "TTL expired"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2901
+msgid "Delete to the end of the word"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:706
-msgid "SOCKSv5 command not supported"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2934
+msgid "Insert a new paragraph"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:710
-msgid "Address type not supported"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2937
+msgid "Insert a new line"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:715
-#, qt-format
-msgid "Unknown SOCKSv5 proxy error code 0x%1"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2941
+msgid "Paste and Match Style"
 msgstr ""
 
-#: network/socket/qsocks5socketengine.cpp:1409
-msgctxt "QSocks5SocketEngine"
-msgid "Network operation timed out"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2944
+msgid "Remove formatting"
 msgstr ""
 
-#: network/socket/qsymbiansocketengine.cpp:1429
-msgid "The address is invalid for this operation"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2948
+msgid "Strikethrough"
 msgstr ""
 
-#: network/socket/qsymbiansocketengine.cpp:1432
-msgid "The specified network session is not opened"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2952
+msgid "Subscript"
 msgstr ""
 
-#: network/bearer/qnetworksession.cpp:456
-msgid "Invalid configuration."
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2956
+msgid "Superscript"
 msgstr ""
 
-#: network/kernel/qhostinfo_unix.cpp:196
-#: network/kernel/qhostinfo_symbian.cpp:137
-#: network/kernel/qhostinfo_symbian.cpp:287
-msgctxt "QHostInfoAgent"
-msgid "No host name given"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2960
+msgid "Insert Bulleted List"
 msgstr ""
 
-#: network/kernel/qhostinfo_unix.cpp:197
-#: network/kernel/qhostinfo_symbian.cpp:138
-#: network/kernel/qhostinfo_symbian.cpp:288
-msgctxt "QHostInfoAgent"
-msgid "Invalid hostname"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2964
+msgid "Insert Numbered List"
 msgstr ""
 
-#: network/kernel/qhostinfo_unix.cpp:251 network/kernel/qhostinfo_unix.cpp:290
-#: network/kernel/qhostinfo_win.cpp:199 network/kernel/qhostinfo_win.cpp:228
-msgid "Unknown address type"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2968
+msgid "Indent"
 msgstr ""
 
-#: network/kernel/qhostinfo_win.cpp:169
-msgid "No host name given"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2971
+msgid "Outdent"
 msgstr ""
 
-#: network/kernel/qhostinfo_win.cpp:169
-msgid "Invalid hostname"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2974
+msgid "Center"
 msgstr ""
 
-#: network/kernel/qhostinfo.cpp:173
-msgctxt "QHostInfo"
-msgid "No host name given"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2977
+msgid "Justify"
 msgstr ""
 
-#: corelib/io/qprocess_unix.cpp:401 corelib/io/qprocess_win.cpp:138
-msgid "Could not open input redirection for reading"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2980
+msgid "Align Left"
 msgstr ""
 
-#: corelib/io/qprocess_unix.cpp:413 corelib/io/qprocess_win.cpp:158
-msgid "Could not open output redirection for writing"
+#: 3rdparty/webkit/Source/WebKit/qt/Api/qwebpage.cpp:2983
+msgid "Align Right"
 msgstr ""
 
-#: corelib/io/qprocess_unix.cpp:685
-#, qt-format
-msgid "Resource error (fork failure): %1"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:93
+msgid ""
+"Cannot start playback. \n"
+"\n"
+"Check your GStreamer installation and make sure you \n"
+"have libgstreamer-plugins-base installed."
 msgstr ""
 
-#: corelib/io/qprocess_unix.cpp:1035 corelib/io/qprocess_unix.cpp:1090
-#: corelib/io/qprocess_unix.cpp:1168 corelib/io/qprocess_unix.cpp:1238
-#: corelib/io/qprocess_win.cpp:591 corelib/io/qprocess_win.cpp:641
-#: corelib/io/qprocess_win.cpp:716 corelib/io/qprocess_win.cpp:758
-#: corelib/io/qprocess_win.cpp:812
-msgid "Process operation timed out"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:222
+msgid "Missing codec helper script assistant."
 msgstr ""
 
-#: corelib/io/qprocess.cpp:887 corelib/io/qprocess.cpp:939
-#: corelib/io/qprocess_win.cpp:601 corelib/io/qprocess_win.cpp:651
-msgid "Error reading from process"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:224
+#, qt-format
+msgid "Plugin codec installation failed for codec: %0"
 msgstr ""
 
-#: corelib/io/qprocess.cpp:986 corelib/io/qprocess.cpp:1854
-#: corelib/io/qprocess_win.cpp:791
-msgid "Error writing to process"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:235
+#, qt-format
+msgid ""
+"A required codec is missing. You need to install the following codec(s) to "
+"play this content: %0"
 msgstr ""
 
-#: corelib/io/qprocess.cpp:1055
-msgid "Process crashed"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:965
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:971
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:984
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1008
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1014
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1032
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1466
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1490
+msgid "Could not open media source."
 msgstr ""
 
-#: corelib/io/qprocess.cpp:2056
-msgid "No program defined"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:976
+msgid "Invalid source type."
 msgstr ""
 
-#: corelib/io/qfile.cpp:736 corelib/io/qfile.cpp:890
-msgid "Destination file exists"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1464
+msgid "Could not locate media source."
 msgstr ""
 
-#: corelib/io/qfile.cpp:751
-msgid "Will not rename sequential file using block copy"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1474
+msgid "Could not open audio device. The device is already in use."
 msgstr ""
 
-#: corelib/io/qfile.cpp:774
-msgid "Cannot remove source file"
+#: 3rdparty/phonon/gstreamer/mediaobject.cpp:1487
+msgid "Could not decode media source."
 msgstr ""
 
-#: corelib/io/qfile.cpp:903
-#, qt-format
-msgid "Cannot open %1 for input"
+#: 3rdparty/phonon/gstreamer/backend.cpp:188
+msgid ""
+"Warning: You do not seem to have the package gstreamer0.10-plugins-good "
+"installed.\n"
+"          Some video features have been disabled."
 msgstr ""
 
-#: corelib/io/qfile.cpp:921
-msgid "Cannot open for output"
+#: 3rdparty/phonon/gstreamer/backend.cpp:193
+msgid ""
+"Warning: You do not seem to have the base GStreamer plugins installed.\n"
+"          All audio and video support has been disabled"
 msgstr ""
 
-#: corelib/io/qfile.cpp:932
-msgid "Failure to write block"
+#: 3rdparty/phonon/phonon/phononnamespace.cpp:55
+msgctxt "Phonon::"
+msgid "Notifications"
 msgstr ""
 
-#: corelib/io/qfile.cpp:946
-#, qt-format
-msgid "Cannot create %1 for output"
+#: 3rdparty/phonon/phonon/phononnamespace.cpp:57
+msgctxt "Phonon::"
+msgid "Music"
 msgstr ""
 
-#: corelib/io/qfile.cpp:1416
-msgid "No file engine available or engine does not support UnMapExtension"
+#: 3rdparty/phonon/phonon/phononnamespace.cpp:59
+msgctxt "Phonon::"
+msgid "Video"
 msgstr ""
 
-#: corelib/io/qprocess_win.cpp:431
-#, qt-format
-msgid "Process failed to start: %1"
+#: 3rdparty/phonon/phonon/phononnamespace.cpp:61
+msgctxt "Phonon::"
+msgid "Communication"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:65
-msgctxt "QRegExp"
-msgid "no error occurred"
+#: 3rdparty/phonon/phonon/phononnamespace.cpp:63
+msgctxt "Phonon::"
+msgid "Games"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:66
-msgctxt "QRegExp"
-msgid "disabled feature used"
+#: 3rdparty/phonon/phonon/phononnamespace.cpp:65
+msgctxt "Phonon::"
+msgid "Accessibility"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:67
-msgctxt "QRegExp"
-msgid "bad char class syntax"
+#: 3rdparty/phonon/phonon/pulsesupport.cpp:162
+#: 3rdparty/phonon/phonon/pulsesupport.cpp:173
+msgid "PulseAudio Sound Server"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:68
-msgctxt "QRegExp"
-msgid "bad lookahead syntax"
+#: 3rdparty/phonon/phonon/volumeslider.cpp:42
+#: 3rdparty/phonon/phonon/volumeslider.cpp:60
+#: 3rdparty/phonon/phonon/volumeslider.cpp:189
+#: 3rdparty/phonon/phonon/volumeslider.cpp:204
+#, qt-format
+msgid "Volume: %1%"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:69
-msgctxt "QRegExp"
-msgid "lookbehinds not supported, see QTBUG-2371"
+#: 3rdparty/phonon/phonon/volumeslider.cpp:45
+#: 3rdparty/phonon/phonon/volumeslider.cpp:63
+#: 3rdparty/phonon/phonon/volumeslider.cpp:117
+#, qt-format
+msgid ""
+"Use this slider to adjust the volume. The leftmost position is 0%. The "
+"rightmost is %1%"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:70
-msgctxt "QRegExp"
-msgid "bad repetition syntax"
+#: 3rdparty/phonon/phonon/volumeslider.cpp:184
+msgid "Muted"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:71
-msgctxt "QRegExp"
-msgid "invalid octal value"
+#: 3rdparty/phonon/phonon/audiooutput.cpp:444
+#: 3rdparty/phonon/phonon/audiooutput.cpp:478
+#, qt-format
+msgid ""
+"<html>The audio playback device <b>%1</b> does not work.<br/>Falling back to "
+"<b>%2</b>.</html>"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:72
-msgctxt "QRegExp"
-msgid "missing left delim"
+#: 3rdparty/phonon/phonon/audiooutput.cpp:457
+#, qt-format
+msgid ""
+"<html>Switching to the audio playback device <b>%1</b><br/>which just became "
+"available and has higher preference.</html>"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:73
-msgctxt "QRegExp"
-msgid "unexpected end"
+#: 3rdparty/phonon/phonon/audiooutput.cpp:460
+#: 3rdparty/phonon/phonon/audiooutput.cpp:474
+#, qt-format
+msgid "Revert back to device '%1'"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:74
-msgctxt "QRegExp"
-msgid "met internal limit"
+#: 3rdparty/phonon/phonon/audiooutput.cpp:471
+#, qt-format
+msgid ""
+"<html>Switching to the audio playback device <b>%1</b><br/>which has higher "
+"preference or is specifically configured for this stream.</html>"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:75
-msgctxt "QRegExp"
-msgid "invalid interval"
+#: 3rdparty/phonon/mmf/stereowidening.cpp:79
+msgid "Level (%)"
 msgstr ""
 
-#: corelib/tools/qregexp.cpp:76
-msgctxt "QRegExp"
-msgid "invalid category"
+#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:111
+msgid "Pause failed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:611
-msgid "Extra content at end of document."
+#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:127
+msgid "Seek failed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:887
-msgid "Invalid entity value."
+#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:194
+#: 3rdparty/phonon/mmf/audioplayer.cpp:187
+msgid "Getting position failed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:996
-msgid "Invalid XML character."
+#: 3rdparty/phonon/mmf/abstractvideoplayer.cpp:264
+msgid "Opening clip failed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1255
-msgid "Sequence ']]>' not allowed in content."
+#: 3rdparty/phonon/mmf/videoplayer_surface.cpp:139
+#: 3rdparty/phonon/mmf/videoplayer_surface.cpp:165
+#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:241
+#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:256
+#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:264
+#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:286
+#: 3rdparty/phonon/mmf/videoplayer_dsa.cpp:308
+msgid "Video display error"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1534
-msgid "Encountered incorrectly encoded content."
+#: 3rdparty/phonon/mmf/effectfactory.cpp:181
+msgid "Enabled"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1564
-#, qt-format
-msgid "Namespace prefix '%1' not declared"
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:82
+msgid "Not ready to play"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1597 corelib/xml/qxmlstream.cpp:1609
-msgid "Illegal namespace declaration."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:252
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:263
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:609
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:630
+msgid "Error opening file"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1642
-msgid "Attribute redefined."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:283
+msgid "Error opening URL"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1757
-#, qt-format
-msgid "Unexpected character '%1' in public id literal."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:295
+msgid "Error opening resource"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1785
-msgid "Invalid XML version string."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:297
+msgid "Error opening source: resource not opened"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1787
-msgid "Unsupported XML version."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:389
+msgid "Setting volume failed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1808
-msgid "The standalone pseudo attribute must appear after the encoding."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:450
+msgid "Loading clip failed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1810
-#, qt-format
-msgid "%1 is an invalid encoding name."
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:479
+msgid "Playback complete"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1817
-#, qt-format
-msgid "Encoding %1 is unsupported"
+#: 3rdparty/phonon/mmf/abstractmediaplayer.cpp:636
+msgid "Download error"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1833
-msgid "Standalone accepts only yes or no."
+#: 3rdparty/phonon/mmf/mediaobject.cpp:321
+#: 3rdparty/phonon/mmf/mediaobject.cpp:339
+msgid "Error opening source: type not supported"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1835
-msgid "Invalid attribute in XML declaration."
+#: 3rdparty/phonon/mmf/mediaobject.cpp:332
+msgid "Error opening source: resource is compressed"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1851
-msgid "Premature end of document."
+#: 3rdparty/phonon/mmf/mediaobject.cpp:336
+msgid "Error opening source: resource not valid"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1853
-msgid "Invalid document."
+#: 3rdparty/phonon/mmf/mediaobject.cpp:362
+msgid "Error opening source: media type could not be determined"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1893
-msgid "Expected "
+#: 3rdparty/phonon/mmf/mediaobject.cpp:520
+msgid "Failed to set requested IAP"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1904
-msgid ", but got '"
+#: 3rdparty/phonon/mmf/utils.cpp:91
+msgid "Not found"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:1908
-msgid "Unexpected '"
+#: 3rdparty/phonon/mmf/utils.cpp:93
+msgid "Out of memory"
 msgstr ""
 
-#: corelib/xml/qxmlstream.cpp:2133
-msgid "Expected character data."
+#: 3rdparty/phonon/mmf/utils.cpp:95
+msgid "Not supported"
 msgstr ""
 
-#: corelib/plugin/qpluginloader.cpp:254
-msgid "The plugin was not loaded."
+#: 3rdparty/phonon/mmf/utils.cpp:97
+msgid "Overflow"
 msgstr ""
 
-#: corelib/plugin/qpluginloader.cpp:343 corelib/plugin/qlibrary.cpp:679
-#: corelib/plugin/qlibrary.cpp:825
-msgid "The shared library was not found."
+#: 3rdparty/phonon/mmf/utils.cpp:99
+msgid "Underflow"
 msgstr ""
 
-#: corelib/plugin/qlibrary.cpp:402
-#, qt-format
-msgid "Plugin verification data mismatch in '%1'"
+#: 3rdparty/phonon/mmf/utils.cpp:101
+msgid "Already exists"
 msgstr ""
 
-#: corelib/plugin/qlibrary.cpp:827
-#, qt-format
-msgid "The file '%1' is not a valid Qt plugin."
+#: 3rdparty/phonon/mmf/utils.cpp:103
+msgid "Path not found"
 msgstr ""
 
-#: corelib/plugin/qlibrary.cpp:842
-#, qt-format
-msgid "The plugin '%1' uses incompatible Qt library. (%2.%3.%4) [%5]"
+#: 3rdparty/phonon/mmf/utils.cpp:105
+msgid "In use"
 msgstr ""
 
-#: corelib/plugin/qlibrary.cpp:868
-#, qt-format
-msgid ""
-"The plugin '%1' uses incompatible Qt library. Expected build key \"%2\", got "
-"\"%3\""
+#: 3rdparty/phonon/mmf/utils.cpp:107
+msgid "Not ready"
 msgstr ""
 
-#: corelib/plugin/qlibrary.cpp:876
-#, qt-format
-msgid ""
-"The plugin '%1' uses incompatible Qt library. (Cannot mix debug and release "
-"libraries.)"
+#: 3rdparty/phonon/mmf/utils.cpp:109
+msgid "Access denied"
 msgstr ""
 
-#: corelib/plugin/qlibrary_unix.cpp:244 corelib/plugin/qlibrary_win.cpp:87
-#, qt-format
-msgid "Cannot load library %1: %2"
+#: 3rdparty/phonon/mmf/utils.cpp:111
+msgid "Could not connect"
 msgstr ""
 
-#: corelib/plugin/qlibrary_unix.cpp:261 corelib/plugin/qlibrary_win.cpp:109
-#, qt-format
-msgid "Cannot unload library %1: %2"
+#: 3rdparty/phonon/mmf/utils.cpp:113
+msgid "Disconnected"
 msgstr ""
 
-#: corelib/plugin/qlibrary_unix.cpp:295 corelib/plugin/qlibrary_win.cpp:124
-#, qt-format
-msgid "Cannot resolve symbol \"%1\" in %2: %3"
+#: 3rdparty/phonon/mmf/utils.cpp:119
+msgid "Insufficient bandwidth"
 msgstr ""
 
-#: corelib/plugin/qelfparser_p.cpp:77
-#, qt-format
-msgid "'%1' is not an ELF object (%2)"
+#: 3rdparty/phonon/mmf/utils.cpp:122
+msgid "Network unavailable"
 msgstr ""
 
-#: corelib/plugin/qelfparser_p.cpp:83
-#, qt-format
-msgid "'%1' is not an ELF object"
+#: 3rdparty/phonon/mmf/utils.cpp:126
+msgid "Network communication error"
 msgstr ""
-
-#: corelib/plugin/qelfparser_p.cpp:89 corelib/plugin/qelfparser_p.cpp:99
-#: corelib/plugin/qelfparser_p.cpp:105 corelib/plugin/qelfparser_p.cpp:125
-#: corelib/plugin/qelfparser_p.cpp:137 corelib/plugin/qelfparser_p.cpp:148
-#: corelib/plugin/qelfparser_p.cpp:163 corelib/plugin/qelfparser_p.cpp:174
-#: corelib/plugin/qelfparser_p.cpp:196 corelib/plugin/qelfparser_p.cpp:210
-#: corelib/plugin/qelfparser_p.cpp:223
-#, qt-format
-msgid "'%1' is an invalid ELF object (%2)"
+
+#: 3rdparty/phonon/mmf/utils.cpp:128
+msgid "Streaming not supported"
 msgstr ""
 
-#: corelib/statemachine/qstatemachine.cpp:1028
-#, qt-format
-msgid "Missing initial state in compound state '%1'"
+#: 3rdparty/phonon/mmf/utils.cpp:130
+msgid "Server alert"
 msgstr ""
 
-#: corelib/statemachine/qstatemachine.cpp:1035
-#, qt-format
-msgid "Missing default state in history state '%1'"
+#: 3rdparty/phonon/mmf/utils.cpp:132
+msgid "Invalid protocol"
 msgstr ""
 
-#: corelib/statemachine/qstatemachine.cpp:1042
-#, qt-format
-msgid ""
-"No common ancestor for targets and source of transition from state '%1'"
+#: 3rdparty/phonon/mmf/utils.cpp:136
+msgid "Multicast error"
 msgstr ""
 
-#: corelib/global/qglobal.cpp:2106 corelib/kernel/qsystemerror.cpp:87
-msgctxt "QIODevice"
-msgid "Permission denied"
+#: 3rdparty/phonon/mmf/utils.cpp:139
+msgid "Proxy server error"
 msgstr ""
 
-#: corelib/global/qglobal.cpp:2109 corelib/kernel/qsystemerror.cpp:90
-msgctxt "QIODevice"
-msgid "Too many open files"
+#: 3rdparty/phonon/mmf/utils.cpp:141
+msgid "Proxy server not supported"
 msgstr ""
 
-#: corelib/global/qglobal.cpp:2112 corelib/kernel/qsystemerror.cpp:93
-msgctxt "QIODevice"
-msgid "No such file or directory"
+#: 3rdparty/phonon/mmf/utils.cpp:143
+msgid "Audio output error"
 msgstr ""
 
-#: corelib/global/qglobal.cpp:2115 corelib/kernel/qsystemerror.cpp:96
-msgctxt "QIODevice"
-msgid "No space left on device"
+#: 3rdparty/phonon/mmf/utils.cpp:145
+msgid "Video output error"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:70
-#: corelib/kernel/qsharedmemory_unix.cpp:95
-#: corelib/kernel/qsharedmemory_win.cpp:71
-#, qt-format
-msgid "%1: already exists"
+#: 3rdparty/phonon/mmf/utils.cpp:147
+msgid "Decoder error"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:74
-#, qt-format
-msgid "%1: doesn't exists"
+#: 3rdparty/phonon/mmf/utils.cpp:149
+msgid "Audio or video components could not be played"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:78
-#: corelib/kernel/qsharedmemory_unix.cpp:111
-#: corelib/kernel/qsharedmemory_win.cpp:84
-#, qt-format
-msgid "%1: invalid size"
+#: 3rdparty/phonon/mmf/utils.cpp:151
+msgid "DRM error"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:82
-#: corelib/kernel/qsharedmemory_unix.cpp:107
-#: corelib/kernel/qsharedmemory_win.cpp:89
+#: 3rdparty/phonon/mmf/audioequalizer.cpp:92
 #, qt-format
-msgid "%1: out of resources"
+msgid "%1 Hz"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:86
-#: corelib/kernel/qsharedmemory_unix.cpp:91
-#: corelib/kernel/qsharedmemory_win.cpp:93
-#, qt-format
-msgid "%1: permission denied"
+#: 3rdparty/phonon/mmf/audiooutput.cpp:106
+msgctxt "Phonon::MMF"
+msgid "Audio Output"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:89
-#: corelib/kernel/qsharedmemory_unix.cpp:115
-#: corelib/kernel/qsharedmemory_win.cpp:96
-#, qt-format
-msgid "%1: unknown error %2"
+#: 3rdparty/phonon/mmf/audiooutput.cpp:107
+msgctxt "Phonon::MMF"
+msgid "The audio output device"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_symbian.cpp:103
-#: corelib/kernel/qsharedmemory_unix.cpp:138
-#: corelib/kernel/qsharedmemory_unix.cpp:164
-#: corelib/kernel/qsharedmemory_win.cpp:111
-#: corelib/kernel/qsharedmemory_win.cpp:139
-#, qt-format
-msgid "%1: key is empty"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:146
+msgid "Decay HF ratio (%)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:99
-#: corelib/kernel/qsharedmemory_win.cpp:80
-#, qt-format
-msgid "%1: doesn't exist"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:152
+msgid "Decay time (ms)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:145
-#, qt-format
-msgid "%1: UNIX key file doesn't exist"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:159
+msgid "Density (%)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:152
-#, qt-format
-msgid "%1: ftok failed"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:165
+msgid "Diffusion (%)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:227
-#, qt-format
-msgid "%1: unable to make key"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:170
+msgid "Reflections delay (ms)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:245
-#, qt-format
-msgid "%1: system-imposed size restrictions"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:177
+msgid "Reflections level (mB)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:268
-#: corelib/kernel/qsharedmemory_unix.cpp:330
-#, qt-format
-msgid "%1: bad name"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:184
+msgid "Reverb delay (ms)"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_unix.cpp:372
-#, qt-format
-msgid "%1: not attached"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:192
+msgid "Reverb level (mB)"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_win.cpp:68
-#: corelib/kernel/qsystemsemaphore_unix.cpp:104
-#: corelib/kernel/qsystemsemaphore_symbian.cpp:77
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: out of resources"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:199
+msgid "Room HF level"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_win.cpp:72
-#: corelib/kernel/qsystemsemaphore_unix.cpp:87
-#: corelib/kernel/qsystemsemaphore_symbian.cpp:81
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: permission denied"
+#: 3rdparty/phonon/mmf/environmentalreverb.cpp:205
+msgid "Room level (mB)"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_win.cpp:75
-#: corelib/kernel/qsystemsemaphore_unix.cpp:112
-#: corelib/kernel/qsystemsemaphore_symbian.cpp:85
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: unknown error %2"
+#: qt3support/sql/q3datatable.cpp:791
+msgid "Insert"
+msgstr "Rhyngosod"
+
+#: qt3support/sql/q3datatable.cpp:792
+msgid "Update"
+msgstr "Diweddaru"
+
+#: qt3support/sql/q3sqlmanager_p.cpp:890
+msgctxt "QSql"
+msgid "Delete"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_unix.cpp:91
-#: corelib/kernel/qsystemsemaphore_symbian.cpp:68
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: already exists"
+#: qt3support/sql/q3sqlmanager_p.cpp:891
+msgctxt "QSql"
+msgid "Delete this record?"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_unix.cpp:95
-#: corelib/kernel/qsystemsemaphore_symbian.cpp:72
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: does not exist"
+#: qt3support/sql/q3sqlmanager_p.cpp:892 qt3support/sql/q3sqlmanager_p.cpp:908
+#: qt3support/sql/q3sqlmanager_p.cpp:944
+msgctxt "QSql"
+msgid "Yes"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_unix.cpp:108
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: name error"
+#: qt3support/sql/q3sqlmanager_p.cpp:893 qt3support/sql/q3sqlmanager_p.cpp:909
+#: qt3support/sql/q3sqlmanager_p.cpp:945
+msgctxt "QSql"
+msgid "No"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_unix.cpp:133
-#: corelib/kernel/qsystemsemaphore_unix.cpp:195
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: key is empty"
+#: qt3support/sql/q3sqlmanager_p.cpp:901
+msgctxt "QSql"
+msgid "Insert"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_unix.cpp:141
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: unable to make key"
+#: qt3support/sql/q3sqlmanager_p.cpp:903
+msgctxt "QSql"
+msgid "Update"
 msgstr ""
 
-#: corelib/kernel/qsystemsemaphore_unix.cpp:150
-#, qt-format
-msgctxt "QSystemSemaphore"
-msgid "%1: ftok failed"
+#: qt3support/sql/q3sqlmanager_p.cpp:907
+msgctxt "QSql"
+msgid "Save edits?"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory.cpp:268
-#, qt-format
-msgid "%1: unable to set key on lock"
+#: qt3support/sql/q3sqlmanager_p.cpp:910
+msgctxt "QSql"
+msgid "Cancel"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory.cpp:352
-#, qt-format
-msgid "%1: create size is less then 0"
+#: qt3support/sql/q3sqlmanager_p.cpp:942
+msgctxt "QSql"
+msgid "Confirm"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory.cpp:528
-#, qt-format
-msgid "%1: unable to lock"
+#: qt3support/sql/q3sqlmanager_p.cpp:943
+msgctxt "QSql"
+msgid "Cancel your edits?"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory.cpp:550
+#: qt3support/text/q3textedit.cpp:5441
+msgid "Clear"
+msgstr "Clirio"
+
+#: qt3support/network/q3networkprotocol.cpp:854
+msgid "Operation stopped by the user"
+msgstr "Terfynwyd y gweithrediad gan y defnyddiwr"
+
+#: qt3support/dialogs/q3wizard.cpp:177
+msgid "&Cancel"
+msgstr "&Diddymu"
+
+#: qt3support/dialogs/q3tabdialog.cpp:648
+msgid "Apply"
+msgstr "Gweithredu"
+
+#: qt3support/dialogs/q3tabdialog.cpp:736
+msgid "Defaults"
+msgstr "Rhagosodion"
+
+#: qt3support/other/q3accel.cpp:481
 #, qt-format
-msgid "%1: unable to unlock"
+msgid "%1, %2 not defined"
 msgstr ""
 
-#: corelib/kernel/qsharedmemory_win.cpp:168
+#: qt3support/other/q3accel.cpp:517
 #, qt-format
-msgid "%1: size query failed"
+msgid "Ambiguous %1 not handled"
 msgstr ""
+
+#: qt3support/widgets/q3mainwindow.cpp:2053
+msgid "Customize..."
+msgstr "Addasu..."
+
+#: qt3support/widgets/q3toolbar.cpp:692
+msgid "More..."
+msgstr "Mwy..."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdesud.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdesud.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdesud.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdesud.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,33 +6,33 @@
 msgstr ""
 "Project-Id-Version: kdesud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:33+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:52+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:15+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kdesud.cpp:263
+#: kdesud.cpp:260
 msgid "KDE su daemon"
 msgstr "Ellyll su KDE"
 
-#: kdesud.cpp:264
+#: kdesud.cpp:261
 msgid "Daemon used by kdesu"
 msgstr "Ellyll (daemon) a ddefnyddir gan kdesu"
 
-#: kdesud.cpp:266
+#: kdesud.cpp:263
 msgid "Copyright (c) 1999,2000 Geert Jansen"
 msgstr "Hawlfraint (c) 1999,2000 Geert Jansen"
 
-#: kdesud.cpp:267
+#: kdesud.cpp:264
 msgid "Geert Jansen"
 msgstr "Geert Jansen"
 
-#: kdesud.cpp:267
+#: kdesud.cpp:264
 msgid "Author"
 msgstr "Awdur"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdesu.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdesu.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdesu.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdesu.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,41 +6,41 @@
 msgstr ""
 "Project-Id-Version: kdesu\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:33+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:14+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kdesu.cpp:85
+#: kdesu.cpp:86
 msgid "KDE su"
 msgstr "su KDE"
 
-#: kdesu.cpp:86
+#: kdesu.cpp:87
 msgid "Runs a program with elevated privileges."
 msgstr "Rheda raglen â breintiau dyrchafedig."
 
-#: kdesu.cpp:88
+#: kdesu.cpp:89
 msgid "Copyright (c) 1998-2000 Geert Jansen, Pietro Iglio"
 msgstr ""
 
-#: kdesu.cpp:89
+#: kdesu.cpp:90
 msgid "Geert Jansen"
 msgstr ""
 
-#: kdesu.cpp:89
+#: kdesu.cpp:90
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: kdesu.cpp:91
+#: kdesu.cpp:92
 msgid "Pietro Iglio"
 msgstr ""
 
-#: kdesu.cpp:91
+#: kdesu.cpp:92
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
@@ -52,47 +52,47 @@
 msgid "Specifies the command to run as one string"
 msgstr ""
 
-#: kdesu.cpp:102
+#: kdesu.cpp:103
 msgid "Run command under target uid if <file> is not writable"
 msgstr ""
 
-#: kdesu.cpp:103
+#: kdesu.cpp:104
 msgid "Specifies the target uid"
 msgstr ""
 
-#: kdesu.cpp:104
+#: kdesu.cpp:105
 msgid "Do not keep password"
 msgstr ""
 
-#: kdesu.cpp:105
+#: kdesu.cpp:106
 msgid "Stop the daemon (forgets all passwords)"
 msgstr ""
 
-#: kdesu.cpp:106
+#: kdesu.cpp:107
 msgid "Enable terminal output (no password keeping)"
 msgstr ""
 
-#: kdesu.cpp:107
+#: kdesu.cpp:108
 msgid "Set priority value: 0 <= prio <= 100, 0 is lowest"
 msgstr ""
 
-#: kdesu.cpp:108
+#: kdesu.cpp:109
 msgid "Use realtime scheduling"
 msgstr ""
 
-#: kdesu.cpp:109
+#: kdesu.cpp:110
 msgid "Do not display ignore button"
 msgstr ""
 
-#: kdesu.cpp:110
+#: kdesu.cpp:111
 msgid "Specify icon to use in the password dialog"
 msgstr ""
 
-#: kdesu.cpp:111
+#: kdesu.cpp:112
 msgid "Do not show the command to be run in the dialog"
 msgstr ""
 
-#: kdesu.cpp:115
+#: kdesu.cpp:116
 msgctxt ""
 "Transient means that the kdesu app will be attached to the app specified by "
 "the winid so that it is like a dialog box rather than some separate program"
@@ -104,28 +104,28 @@
 msgid "Cannot execute command '%1'."
 msgstr ""
 
-#: kdesu.cpp:215
+#: kdesu.cpp:225
 #, kde-format
 msgid "Illegal priority: %1"
 msgstr "Blaenoriaeth anghyfreithlon: %1"
 
-#: kdesu.cpp:246
+#: kdesu.cpp:250
 msgid "No command specified."
 msgstr "Dim gorchymyn wedi'i benodi."
 
-#: kdesu.cpp:363
+#: kdesu.cpp:361
 msgid "Su returned with an error.\n"
 msgstr ""
 
-#: kdesu.cpp:386
+#: kdesu.cpp:384
 msgid "Command:"
 msgstr "Gorchymyn:"
 
-#: kdesu.cpp:394
+#: kdesu.cpp:392
 msgid "realtime: "
 msgstr "gwir-amser: "
 
-#: kdesu.cpp:397
+#: kdesu.cpp:395
 msgid "Priority:"
 msgstr "Blaenoriaeth:"
 
@@ -201,7 +201,7 @@
 "this program."
 msgstr ""
 
-#: sudlg.cpp:99
+#: sudlg.cpp:101
 msgid "Internal error: illegal return from SuProcess::checkInstall()"
 msgstr ""
 "Gwall mewnol: Dychweliad anghyfreithlon oddiwrth SuProcess::checkInstall()"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdialog.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdialog.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdialog.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdialog.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,239 +7,239 @@
 msgstr ""
 "Project-Id-Version: kdialog\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:21+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 16:52+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:21+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:47+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kdialog.cpp:563 kdialog.cpp:675
+#: kdialog.cpp:564 kdialog.cpp:680
 msgctxt "@title:window"
 msgid "Open"
 msgstr ""
 
-#: kdialog.cpp:604
+#: kdialog.cpp:609
 msgctxt "@title:window"
 msgid "Save As"
 msgstr ""
 
-#: kdialog.cpp:776
+#: kdialog.cpp:781
 msgctxt "@title:window"
 msgid "Choose Color"
 msgstr ""
 
-#: kdialog.cpp:757
+#: kdialog.cpp:832
 msgid "KDialog"
 msgstr "KDialog"
 
-#: kdialog.cpp:758
+#: kdialog.cpp:833
 msgid "KDialog can be used to show nice dialog boxes from shell scripts"
 msgstr ""
 "Gellir defnyddio KDialog i ddangos blychau ymgom dymunol o sgriptiau plisgyn"
 
-#: kdialog.cpp:760
+#: kdialog.cpp:835
 msgid "(C) 2000, Nick Thompson"
 msgstr ""
 
-#: kdialog.cpp:761
+#: kdialog.cpp:836
 msgid "David Faure"
 msgstr ""
 
-#: kdialog.cpp:761
+#: kdialog.cpp:836
 msgid "Current maintainer"
 msgstr "Cynhaliwr cyfredol"
 
-#: kdialog.cpp:762
+#: kdialog.cpp:837
 msgid "Brad Hards"
 msgstr ""
 
-#: kdialog.cpp:763
+#: kdialog.cpp:838
 msgid "Nick Thompson"
 msgstr ""
 
-#: kdialog.cpp:764
+#: kdialog.cpp:839
 msgid "Matthias Hölzer"
 msgstr ""
 
-#: kdialog.cpp:765
+#: kdialog.cpp:840
 msgid "David Gümbel"
 msgstr ""
 
-#: kdialog.cpp:766
+#: kdialog.cpp:841
 msgid "Richard Moore"
 msgstr ""
 
-#: kdialog.cpp:767
+#: kdialog.cpp:842
 msgid "Dawit Alemayehu"
 msgstr ""
 
-#: kdialog.cpp:838
+#: kdialog.cpp:843
 msgid "Kai Uwe Broulik"
 msgstr ""
 
-#: kdialog.cpp:774
+#: kdialog.cpp:850
 msgid "Question message box with yes/no buttons"
 msgstr "Blwch neges cwestiwn â botymau ie/na"
 
-#: kdialog.cpp:775
+#: kdialog.cpp:851
 msgid "Question message box with yes/no/cancel buttons"
 msgstr "Blwch neges cwestiwn â botymau ĩe/na/diddymu"
 
-#: kdialog.cpp:776
+#: kdialog.cpp:852
 msgid "Warning message box with yes/no buttons"
 msgstr "Blwch neges rybydd â botymau ĩe/na"
 
-#: kdialog.cpp:777
+#: kdialog.cpp:853
 msgid "Warning message box with continue/cancel buttons"
 msgstr "Blwch neges rybydd â botymau mynd ymlaen/diddymu"
 
-#: kdialog.cpp:778
+#: kdialog.cpp:854
 msgid "Warning message box with yes/no/cancel buttons"
 msgstr "Blwch neges rybydd â botymau ĩe/na/diddymu"
 
-#: kdialog.cpp:824
+#: kdialog.cpp:855
 msgid "Use text as Yes button label"
 msgstr ""
 
-#: kdialog.cpp:825
+#: kdialog.cpp:856
 msgid "Use text as No button label"
 msgstr ""
 
-#: kdialog.cpp:826
+#: kdialog.cpp:857
 msgid "Use text as Cancel button label"
 msgstr ""
 
-#: kdialog.cpp:827
+#: kdialog.cpp:858
 msgid "Use text as Continue button label"
 msgstr ""
 
-#: kdialog.cpp:779
+#: kdialog.cpp:859
 msgid "'Sorry' message box"
 msgstr "Blwch neges 'Ymddiheuro'"
 
-#: kdialog.cpp:780
+#: kdialog.cpp:860
 msgid "'Error' message box"
 msgstr "Blwch neges 'Gwall'"
 
-#: kdialog.cpp:781
+#: kdialog.cpp:861
 msgid "Message Box dialog"
 msgstr "Ymgom Blwch Neges"
 
-#: kdialog.cpp:782
+#: kdialog.cpp:862
 msgid "Input Box dialog"
 msgstr "Ymgom Blwch Mewnbwn"
 
-#: kdialog.cpp:783
+#: kdialog.cpp:863
 msgid "Password dialog"
 msgstr "Ymgom Cyfrinair"
 
-#: kdialog.cpp:784
+#: kdialog.cpp:864
 msgid "Text Box dialog"
 msgstr "Ymgom Blwch Testun"
 
-#: kdialog.cpp:785
+#: kdialog.cpp:865
 msgid "Text Input Box dialog"
 msgstr ""
 
-#: kdialog.cpp:786
+#: kdialog.cpp:866
 msgid "ComboBox dialog"
 msgstr "Ymgom Blwch Cyfun"
 
-#: kdialog.cpp:787
+#: kdialog.cpp:867
 msgid "Menu dialog"
 msgstr "Ymgom Ddewislen"
 
-#: kdialog.cpp:788
+#: kdialog.cpp:868
 msgid "Check List dialog"
 msgstr "Ymgom Rhestr Fritho"
 
-#: kdialog.cpp:789
+#: kdialog.cpp:869
 msgid "Radio List dialog"
 msgstr "Ymgom Rhestr Radio"
 
-#: kdialog.cpp:790
+#: kdialog.cpp:870
 msgid "Passive Popup"
 msgstr ""
 
-#: kdialog.cpp:791
+#: kdialog.cpp:871
 msgid "File dialog to open an existing file"
 msgstr "Ymgom ffeil i agor ffeil cyfredol"
 
-#: kdialog.cpp:792
+#: kdialog.cpp:872
 msgid "File dialog to save a file"
 msgstr "Ymgom ffeil i gadw ffeil"
 
-#: kdialog.cpp:793
+#: kdialog.cpp:873
 msgid "File dialog to select an existing directory"
 msgstr "Ymgom ffeil i ddewis cyfeiriadur cyfredol"
 
-#: kdialog.cpp:794
+#: kdialog.cpp:874
 msgid "File dialog to open an existing URL"
 msgstr "Ymgom ffeil i agor URL cyfredol"
 
-#: kdialog.cpp:795
+#: kdialog.cpp:875
 msgid "File dialog to save a URL"
 msgstr "Ymgom ffeil i gadw URL"
 
-#: kdialog.cpp:796
+#: kdialog.cpp:876
 msgid "Icon chooser dialog"
 msgstr ""
 
-#: kdialog.cpp:797
+#: kdialog.cpp:877
 msgid "Progress bar dialog, returns a D-Bus reference for communication"
 msgstr ""
 
-#: kdialog.cpp:798
+#: kdialog.cpp:878
 msgid "Color dialog to select a color"
 msgstr ""
 
-#: kdialog.cpp:800
+#: kdialog.cpp:880
 msgid "Dialog title"
 msgstr "Teitl ymgom"
 
-#: kdialog.cpp:801
+#: kdialog.cpp:881
 msgid "Default entry to use for combobox, menu and color"
 msgstr ""
 
-#: kdialog.cpp:802
+#: kdialog.cpp:882
 msgid ""
 "Allows the --getopenurl and --getopenfilename options to return multiple "
 "files"
 msgstr ""
 
-#: kdialog.cpp:803
+#: kdialog.cpp:883
 msgid ""
 "Return list items on separate lines (for checklist option and file open with "
 "--multiple)"
 msgstr ""
 
-#: kdialog.cpp:804
+#: kdialog.cpp:884
 msgid "Outputs the winId of each dialog"
 msgstr "Allbynnu y winid o bob ymgom"
 
-#: kdialog.cpp:805
+#: kdialog.cpp:885
 msgid ""
 "Config file and option name for saving the \"do-not-show/ask-again\" state"
 msgstr ""
 
-#: kdialog.cpp:806
+#: kdialog.cpp:886
 msgid "Slider dialog box, returns selected value"
 msgstr ""
 
-#: kdialog.cpp:807
+#: kdialog.cpp:887
 msgid "Calendar dialog box, returns selected date"
 msgstr ""
 
-#: kdialog.cpp:810
+#: kdialog.cpp:890
 msgid "Makes the dialog transient for an X app specified by winid"
 msgstr ""
 "Gwneud yr ymgom yn fyrhoedlog ar gyfer cymhwysiad X wedi'i benodi gan winid"
 
-#: kdialog.cpp:813
+#: kdialog.cpp:893
 msgid "Arguments - depending on main option"
 msgstr "Ymresymiadau - yn ddibynnol ar y prif ddewisiad"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdmconfig.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdmconfig.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdmconfig.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdmconfig.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: kdmconfig\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:14+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:05+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: background.cpp:39
 msgid "E&nable background"
@@ -273,42 +273,48 @@
 msgstr ""
 
 #: kdm-gen.cpp:70
-msgid "&Use themed greeter"
+msgid ""
+"&Use themed greeter\n"
+"(Warning: poor accessibility)"
 msgstr ""
 
 #: kdm-gen.cpp:73
-msgid "Enable this if you would like to use a themed Login Manager."
+msgid ""
+"Enable this if you would like to use a themed Login Manager.<br>Note that "
+"the themed greeter is challenged accessibility-wise (keyboard usage), and "
+"themes may lack support for features like a user list or alternative "
+"authentication methods."
 msgstr ""
 
-#: kdm-gen.cpp:77 kdm-gen.cpp:88 kdm-users.cpp:114
+#: kdm-gen.cpp:80 kdm-gen.cpp:91 kdm-users.cpp:114
 msgid "<placeholder>default</placeholder>"
 msgstr ""
 
-#: kdm-gen.cpp:82
+#: kdm-gen.cpp:85
 msgid "GUI s&tyle:"
 msgstr "Ar&ddull GUI:"
 
-#: kdm-gen.cpp:84
+#: kdm-gen.cpp:87
 msgid "You can choose a basic GUI style here that will be used by KDM only."
 msgstr ""
 "Gallwch ddewis arddull GUI sylfaenol yma i'w ddefnyddio gan KDM yn unig."
 
-#: kdm-gen.cpp:92
+#: kdm-gen.cpp:95
 msgid "Color sche&me:"
 msgstr ""
 
-#: kdm-gen.cpp:94
+#: kdm-gen.cpp:97
 msgid ""
 "You can choose a basic Color Scheme here that will be used by KDM only."
 msgstr ""
 "Gallwch ddewis Cynllun Lliwiau sylfaenol yma i'w ddefnyddio gan KDM yn unig."
 
-#: kdm-gen.cpp:97
+#: kdm-gen.cpp:100
 msgctxt "@title:group"
 msgid "Fonts"
 msgstr ""
 
-#: kdm-gen.cpp:104
+#: kdm-gen.cpp:107
 msgid ""
 "This changes the font which is used for all the text in the login manager "
 "except for the greeting and failure messages."
@@ -316,12 +322,12 @@
 "Mae hwn yn newid y ffont a ddefnyddir am y testun i gyd yn y rheolydd "
 "mewngofnodi, heblaw am y negeseuon cyfarchiad a methiant."
 
-#: kdm-gen.cpp:107
+#: kdm-gen.cpp:110
 msgctxt "... font"
 msgid "&General:"
 msgstr ""
 
-#: kdm-gen.cpp:111
+#: kdm-gen.cpp:114
 msgid ""
 "This changes the font which is used for failure messages in the login "
 "manager."
@@ -329,26 +335,26 @@
 "Mae hwn yn newid y ffont a ddefnyddir am negeseuon methiant yn y rheolydd "
 "mewngofnodi."
 
-#: kdm-gen.cpp:113
+#: kdm-gen.cpp:116
 msgctxt "font for ..."
 msgid "&Failure:"
 msgstr ""
 
-#: kdm-gen.cpp:117
+#: kdm-gen.cpp:120
 msgid "This changes the font which is used for the login manager's greeting."
 msgstr ""
 "Mae hwn yn newid y ffont a ddefnyddir am gyfarchiad y rheolydd mewngofnodi."
 
-#: kdm-gen.cpp:119
+#: kdm-gen.cpp:122
 msgctxt "font for ..."
 msgid "Gree&ting:"
 msgstr ""
 
-#: kdm-gen.cpp:121
+#: kdm-gen.cpp:124
 msgid "Use anti-aliasing for fonts"
 msgstr "Defnyddio gwrthamgenu wynebfathau"
 
-#: kdm-gen.cpp:123
+#: kdm-gen.cpp:126
 msgid ""
 "If you check this box and your X-Server has the Xft extension, fonts will be "
 "antialiased (smoothed) in the login dialog."
@@ -440,14 +446,18 @@
 msgstr ""
 
 #: kdm-shut.cpp:101
+msgid "Burg"
+msgstr ""
+
+#: kdm-shut.cpp:103
 msgid "Lilo"
 msgstr "Lilo"
 
-#: kdm-shut.cpp:103
+#: kdm-shut.cpp:105
 msgid "Boot manager:"
 msgstr ""
 
-#: kdm-shut.cpp:106
+#: kdm-shut.cpp:108
 msgid "Enable boot options in the \"Shutdown...\" dialog."
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdmgreet.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdmgreet.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kdmgreet.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kdmgreet.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kdmgreet\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:18+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:05+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: utils.cpp:87
 #, kde-format
@@ -48,110 +48,186 @@
 msgid "X login on %1"
 msgstr ""
 
-#: kdmconfig.cpp:131
-msgctxt ""
-"@item:intext substitution for an undefined %X placeholder wrongly given in "
-"the config file 'kdmrc', telling the user to fix it"
-msgid "[fix kdmrc]"
+#: kdmshutdown.cpp:90
+msgid "Root authorization required."
 msgstr ""
 
-#: themer/kdmthemer.cpp:67
-#, kde-format
-msgid "Cannot open theme file %1"
+#: kdmshutdown.cpp:122
+msgctxt "@action:inmenu verb"
+msgid "&Schedule..."
 msgstr ""
 
-#: themer/kdmthemer.cpp:72
-#, kde-format
-msgid "Cannot parse theme file %1"
+#: kdmshutdown.cpp:264
+msgid "Shutdown Type"
+msgstr "Math o gau i lawr"
+
+#: kdmshutdown.cpp:268
+msgid "&Turn off computer"
+msgstr "&Diffodd y cyfrifiadur"
+
+#: kdmshutdown.cpp:272
+msgid "&Restart computer"
+msgstr "&Ail-gychwyn y cyfrifiadur"
+
+#: kdmshutdown.cpp:298
+msgctxt "@title:group ... of shutdown"
+msgid "Scheduling"
 msgstr ""
 
-#: themer/kdmthemer.cpp:79
+#: kdmshutdown.cpp:302
+msgid "&Start:"
+msgstr "&Dechrau:"
+
+#: kdmshutdown.cpp:306
+msgid "T&imeout:"
+msgstr "G&oramser:"
+
+#: kdmshutdown.cpp:309
+msgid "&Force after timeout"
+msgstr ""
+
+#: kdmshutdown.cpp:357
+msgid "Entered start date is invalid."
+msgstr ""
+
+#: kdmshutdown.cpp:366
+msgid "Entered timeout date is invalid."
+msgstr ""
+
+#: kdmshutdown.cpp:480
+msgid "&Turn Off Computer"
+msgstr "&Cau'r cyfrifiadur i lawr"
+
+#: kdmshutdown.cpp:487
+msgid "&Restart Computer"
+msgstr "&Ail-gychwyn y cyfrifiadur"
+
+#: kdmshutdown.cpp:497
 #, kde-format
-msgid "%1 does not seem to be a correct theme file"
+msgctxt "current option in boot loader"
+msgid "%1 (current)"
 msgstr ""
 
-#: themer/kdmlabel.cpp:247
-msgctxt "@action:button"
-msgid "Lan_guage"
+#: kdmshutdown.cpp:508
+msgctxt "@action:button verb"
+msgid "&Schedule..."
 msgstr ""
 
-#: themer/kdmlabel.cpp:248
-msgctxt "@action:button"
-msgid "Session _Type"
+#: kdmshutdown.cpp:587
+msgid ""
+"<br/>Switching to console mode will terminate all local X servers and leave "
+"you with console logins only. Graphical mode is automatically resumed 10 "
+"seconds after the last console session ends or after 40 seconds if no-one "
+"logs in in the first place.<br/>"
 msgstr ""
 
-#: themer/kdmlabel.cpp:249
-msgctxt "@action:button"
-msgid "_Menu"
+#: kdmshutdown.cpp:608
+msgid "Turn Off Computer"
+msgstr "Cau'r cyfrifiadur i lawr"
+
+#: kdmshutdown.cpp:611
+msgid "Switch to Console"
 msgstr ""
 
-#. i18n("Actions");
-#: themer/kdmlabel.cpp:250
-msgctxt "@action:button ... from XDMCP server"
-msgid "Disconn_ect"
+#: kdmshutdown.cpp:613
+msgid "Restart Computer"
+msgstr "Ail-gychwyn y cyfrifiadur"
+
+#: kdmshutdown.cpp:615
+#, kde-format
+msgid "<br/>(Next boot: %1)"
 msgstr ""
 
-#: themer/kdmlabel.cpp:251
-msgctxt "@action:button"
-msgid "_Quit"
+#: kdmshutdown.cpp:633
+msgid "Abort active sessions:"
 msgstr ""
 
-#: themer/kdmlabel.cpp:252
-msgctxt "@action:button"
-msgid "Power o_ff"
+#: kdmshutdown.cpp:634
+msgid "No permission to abort active sessions:"
 msgstr ""
 
-#: themer/kdmlabel.cpp:254
-msgctxt "@action:button"
-msgid "Re_boot"
+#: kdmshutdown.cpp:645
+msgctxt "@title:column"
+msgid "Session"
 msgstr ""
 
-#: themer/kdmlabel.cpp:255
-msgctxt "@action:button"
-msgid "_Remote login"
+#: kdmshutdown.cpp:646
+msgctxt "@title:column ... of session"
+msgid "Location"
 msgstr ""
 
-#: themer/kdmlabel.cpp:256
-msgid "Caps Lock is enabled"
+#: kdmshutdown.cpp:688
+msgid "Cancel pending shutdown:"
 msgstr ""
 
-#: themer/kdmlabel.cpp:257
-msgid "User %u will log in in %t"
+#: kdmshutdown.cpp:689
+msgid "No permission to cancel pending shutdown:"
 msgstr ""
 
-#: themer/kdmlabel.cpp:258
-msgid "Welcome to %h"
+#: kdmshutdown.cpp:695
+msgctxt "start of shutdown:"
+msgid "now"
 msgstr ""
 
-#: themer/kdmlabel.cpp:259
-msgid "_Domain:"
+#: kdmshutdown.cpp:701
+msgctxt "timeout of shutdown:"
+msgid "infinite"
 msgstr ""
 
-#: themer/kdmlabel.cpp:260
-msgid "_Username:"
+#: kdmshutdown.cpp:712
+msgctxt "owner of shutdown:"
+msgid "console user"
 msgstr ""
 
-#: themer/kdmlabel.cpp:261
-msgid "_Password:"
+#: kdmshutdown.cpp:714
+msgctxt "owner of shutdown:"
+msgid "control socket"
 msgstr ""
 
-#: themer/kdmlabel.cpp:262
-msgctxt "@action:button"
-msgid "_Login"
+#: kdmshutdown.cpp:717
+msgid "turn off computer"
+msgstr "cau'r cyfrifiadur i lawr"
+
+#: kdmshutdown.cpp:718
+msgid "restart computer"
+msgstr "ail-gychwyn y cyfrifiadur"
+
+#: kdmshutdown.cpp:721
+#, kde-format
+msgid ""
+"\n"
+"Next boot: %1"
 msgstr ""
 
-#: themer/kdmlabel.cpp:293
+#: kdmshutdown.cpp:707
 #, kde-format
-msgctxt "will login in ..."
-msgid "1 second"
-msgid_plural "%1 seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Owner: %1\n"
+"Type: %2%5\n"
+"Start: %3\n"
+"Timeout: %4"
+msgstr ""
 
-#: themer/kdmlabel.cpp:301
-#, no-c-format
-msgctxt "date format"
-msgid "%a %d %B"
+#: kdmshutdown.cpp:726
+msgctxt "after timeout:"
+msgid "abort all sessions"
+msgstr ""
+
+#: kdmshutdown.cpp:728
+msgctxt "after timeout:"
+msgid "abort own sessions"
+msgstr ""
+
+#: kdmshutdown.cpp:729
+msgctxt "after timeout:"
+msgid "cancel shutdown"
+msgstr ""
+
+#: kdmshutdown.cpp:724
+#, kde-format
+msgid ""
+"\n"
+"After timeout: %1"
 msgstr ""
 
 #: kgdialog.cpp:57
@@ -196,6 +272,16 @@
 msgid "Name of the configuration file"
 msgstr ""
 
+#: kconsole.cpp:70
+msgid "*** Cannot connect to console log ***"
+msgstr ""
+
+#: kconsole.cpp:154
+msgid ""
+"\n"
+"*** Lost connection with console log ***"
+msgstr ""
+
 #: kgreeter.cpp:481
 msgctxt "@item:inlistbox session type"
 msgid "Default"
@@ -237,7 +323,7 @@
 msgid "L&ogin"
 msgstr ""
 
-#: kchooser.cpp:105 kgreeter.cpp:800
+#: kgreeter.cpp:800 kchooser.cpp:105
 msgctxt "@action:button"
 msgid "&Menu"
 msgstr ""
@@ -257,10 +343,17 @@
 msgid "&Remote Login"
 msgstr ""
 
-#: kgverify.cpp:1086 kgreeter.cpp:919
+#: kgreeter.cpp:919 kgverify.cpp:1085
 msgid "Login failed"
 msgstr "Methwyd mewngofnodi"
 
+#: kdmconfig.cpp:131
+msgctxt ""
+"@item:intext substitution for an undefined %X placeholder wrongly given in "
+"the config file 'kdmrc', telling the user to fix it"
+msgid "[fix kdmrc]"
+msgstr ""
+
 #: kgverify.cpp:187
 msgid "No greeter widget plugin loaded. Check the configuration."
 msgstr "Ni lwythir ategyn celfigyn cyfarchydd.  Gwiriwch y gosodiad."
@@ -341,7 +434,7 @@
 msgid "Your password expires today."
 msgstr "Mae eich cyfrinair yn darfod heddiw."
 
-#: kgverify.cpp:626 kgverify.cpp:1087
+#: kgverify.cpp:626 kgverify.cpp:1086
 msgid "Authentication failed"
 msgstr "Methodd dilysiant"
 
@@ -352,268 +445,175 @@
 "Nid yw'r defnyddiwr wedi'i ddilysu (%1) yn cydweddu â'r defnyddiwr a "
 "ofynnwyd amdano (%2).\n"
 
-#: kgverify.cpp:1068
+#: kgverify.cpp:1067
 #, kde-format
 msgid "Automatic login in 1 second..."
 msgid_plural "Automatic login in %1 seconds..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: kgverify.cpp:1080
+#: kgverify.cpp:1079
 msgid "Warning: Caps Lock is on"
 msgstr ""
 
-#: kgverify.cpp:1084
+#: kgverify.cpp:1083
 msgid "Change failed"
 msgstr "Methodd y newidiad"
 
-#: kgverify.cpp:1137
+#: kgverify.cpp:1136
 #, kde-format
 msgid "Theme not usable with authentication method '%1'."
 msgstr ""
 
-#: kgverify.cpp:1174
+#: kgverify.cpp:1173
 msgctxt "@title:window"
 msgid "<qt><b>Changing authentication token</b></qt>"
 msgstr ""
 
-#: kdmshutdown.cpp:90
-msgid "Root authorization required."
-msgstr ""
-
-#: kdmshutdown.cpp:122
-msgctxt "@action:inmenu verb"
-msgid "&Schedule..."
-msgstr ""
-
-#: kdmshutdown.cpp:264
-msgid "Shutdown Type"
-msgstr "Math o gau i lawr"
-
-#: kdmshutdown.cpp:268
-msgid "&Turn off computer"
-msgstr "&Diffodd y cyfrifiadur"
-
-#: kdmshutdown.cpp:272
-msgid "&Restart computer"
-msgstr "&Ail-gychwyn y cyfrifiadur"
-
-#: kdmshutdown.cpp:298
-msgctxt "@title:group ... of shutdown"
-msgid "Scheduling"
+#: kchooser.cpp:59
+msgctxt "@action:inmenu"
+msgid "&Local Login"
 msgstr ""
 
-#: kdmshutdown.cpp:302
-msgid "&Start:"
-msgstr "&Dechrau:"
-
-#: kdmshutdown.cpp:306
-msgid "T&imeout:"
-msgstr "G&oramser:"
+#: kchooser.cpp:63
+msgid "XDMCP Host Menu"
+msgstr "Dewislen Gwesteiwyr XDMCP"
 
-#: kdmshutdown.cpp:309
-msgid "&Force after timeout"
+#: kchooser.cpp:73
+msgctxt "@title:column"
+msgid "Hostname"
 msgstr ""
 
-#: kdmshutdown.cpp:357
-msgid "Entered start date is invalid."
+#: kchooser.cpp:74
+msgctxt "@title:column ... of named host"
+msgid "Status"
 msgstr ""
 
-#: kdmshutdown.cpp:366
-msgid "Entered timeout date is invalid."
+#: kchooser.cpp:82
+msgctxt "XDMCP server"
+msgid "Hos&t:"
 msgstr ""
 
-#: kdmshutdown.cpp:480
-msgid "&Turn Off Computer"
-msgstr "&Cau'r cyfrifiadur i lawr"
-
-#: kdmshutdown.cpp:487
-msgid "&Restart Computer"
-msgstr "&Ail-gychwyn y cyfrifiadur"
-
-#: kdmshutdown.cpp:497
-#, kde-format
-msgctxt "current option in boot loader"
-msgid "%1 (current)"
+#: kchooser.cpp:84
+msgctxt "@action:button"
+msgid "A&dd"
 msgstr ""
 
-#: kdmshutdown.cpp:508
-msgctxt "@action:button verb"
-msgid "&Schedule..."
+#: kchooser.cpp:93
+msgctxt "@action:button"
+msgid "&Accept"
 msgstr ""
 
-#: kdmshutdown.cpp:587
-msgid ""
-"<br/>Switching to console mode will terminate all local X servers and leave "
-"you with console logins only. Graphical mode is automatically resumed 10 "
-"seconds after the last console session ends or after 40 seconds if no-one "
-"logs in in the first place.<br/>"
+#: kchooser.cpp:95
+msgctxt "@action:button"
+msgid "&Refresh"
 msgstr ""
 
-#: kdmshutdown.cpp:608
-msgid "Turn Off Computer"
-msgstr "Cau'r cyfrifiadur i lawr"
-
-#: kdmshutdown.cpp:611
-msgid "Switch to Console"
+#: kchooser.cpp:203
+msgctxt "hostname or status"
+msgid "<unknown>"
 msgstr ""
 
-#: kdmshutdown.cpp:613
-msgid "Restart Computer"
-msgstr "Ail-gychwyn y cyfrifiadur"
-
-#: kdmshutdown.cpp:615
+#: kchooser.cpp:242
 #, kde-format
-msgid "<br/>(Next boot: %1)"
-msgstr ""
+msgid "Unknown host %1"
+msgstr "Gwesteiwr anhysbys %1"
 
-#: kdmshutdown.cpp:633
-msgid "Abort active sessions:"
+#: themer/kdmlabel.cpp:247
+msgctxt "@action:button"
+msgid "Lan_guage"
 msgstr ""
 
-#: kdmshutdown.cpp:634
-msgid "No permission to abort active sessions:"
+#: themer/kdmlabel.cpp:248
+msgctxt "@action:button"
+msgid "Session _Type"
 msgstr ""
 
-#: kdmshutdown.cpp:645
-msgctxt "@title:column"
-msgid "Session"
+#: themer/kdmlabel.cpp:249
+msgctxt "@action:button"
+msgid "_Menu"
 msgstr ""
 
-#: kdmshutdown.cpp:646
-msgctxt "@title:column ... of session"
-msgid "Location"
+#. i18n("Actions");
+#: themer/kdmlabel.cpp:250
+msgctxt "@action:button ... from XDMCP server"
+msgid "Disconn_ect"
 msgstr ""
 
-#: kdmshutdown.cpp:688
-msgid "Cancel pending shutdown:"
+#: themer/kdmlabel.cpp:251
+msgctxt "@action:button"
+msgid "_Quit"
 msgstr ""
 
-#: kdmshutdown.cpp:689
-msgid "No permission to cancel pending shutdown:"
+#: themer/kdmlabel.cpp:252
+msgctxt "@action:button"
+msgid "Power o_ff"
 msgstr ""
 
-#: kdmshutdown.cpp:695
-msgctxt "start of shutdown:"
-msgid "now"
+#: themer/kdmlabel.cpp:254
+msgctxt "@action:button"
+msgid "Re_boot"
 msgstr ""
 
-#: kdmshutdown.cpp:701
-msgctxt "timeout of shutdown:"
-msgid "infinite"
+#: themer/kdmlabel.cpp:255
+msgctxt "@action:button"
+msgid "_Remote login"
 msgstr ""
 
-#: kdmshutdown.cpp:712
-msgctxt "owner of shutdown:"
-msgid "console user"
+#: themer/kdmlabel.cpp:256
+msgid "Caps Lock is enabled"
 msgstr ""
 
-#: kdmshutdown.cpp:714
-msgctxt "owner of shutdown:"
-msgid "control socket"
+#: themer/kdmlabel.cpp:257
+msgid "User %u will log in in %t"
 msgstr ""
 
-#: kdmshutdown.cpp:717
-msgid "turn off computer"
-msgstr "cau'r cyfrifiadur i lawr"
-
-#: kdmshutdown.cpp:718
-msgid "restart computer"
-msgstr "ail-gychwyn y cyfrifiadur"
-
-#: kdmshutdown.cpp:721
-#, kde-format
-msgid ""
-"\n"
-"Next boot: %1"
+#: themer/kdmlabel.cpp:258
+msgid "Welcome to %h"
 msgstr ""
 
-#: kdmshutdown.cpp:707
-#, kde-format
-msgid ""
-"Owner: %1\n"
-"Type: %2%5\n"
-"Start: %3\n"
-"Timeout: %4"
+#: themer/kdmlabel.cpp:259
+msgid "_Domain:"
 msgstr ""
 
-#: kdmshutdown.cpp:726
-msgctxt "after timeout:"
-msgid "abort all sessions"
+#: themer/kdmlabel.cpp:260
+msgid "_Username:"
 msgstr ""
 
-#: kdmshutdown.cpp:728
-msgctxt "after timeout:"
-msgid "abort own sessions"
+#: themer/kdmlabel.cpp:261
+msgid "_Password:"
 msgstr ""
 
-#: kdmshutdown.cpp:729
-msgctxt "after timeout:"
-msgid "cancel shutdown"
+#: themer/kdmlabel.cpp:262
+msgctxt "@action:button"
+msgid "_Login"
 msgstr ""
 
-#: kdmshutdown.cpp:724
+#: themer/kdmlabel.cpp:293
 #, kde-format
-msgid ""
-"\n"
-"After timeout: %1"
-msgstr ""
-
-#: kconsole.cpp:70
-msgid "*** Cannot connect to console log ***"
-msgstr ""
-
-#: kconsole.cpp:154
-msgid ""
-"\n"
-"*** Lost connection with console log ***"
-msgstr ""
-
-#: kchooser.cpp:59
-msgctxt "@action:inmenu"
-msgid "&Local Login"
-msgstr ""
-
-#: kchooser.cpp:63
-msgid "XDMCP Host Menu"
-msgstr "Dewislen Gwesteiwyr XDMCP"
-
-#: kchooser.cpp:73
-msgctxt "@title:column"
-msgid "Hostname"
-msgstr ""
-
-#: kchooser.cpp:74
-msgctxt "@title:column ... of named host"
-msgid "Status"
-msgstr ""
-
-#: kchooser.cpp:82
-msgctxt "XDMCP server"
-msgid "Hos&t:"
-msgstr ""
-
-#: kchooser.cpp:84
-msgctxt "@action:button"
-msgid "A&dd"
-msgstr ""
+msgctxt "will login in ..."
+msgid "1 second"
+msgid_plural "%1 seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kchooser.cpp:93
-msgctxt "@action:button"
-msgid "&Accept"
+#: themer/kdmlabel.cpp:301
+#, no-c-format
+msgctxt "date format"
+msgid "%a %d %B"
 msgstr ""
 
-#: kchooser.cpp:95
-msgctxt "@action:button"
-msgid "&Refresh"
+#: themer/kdmthemer.cpp:67
+#, kde-format
+msgid "Cannot open theme file %1"
 msgstr ""
 
-#: kchooser.cpp:203
-msgctxt "hostname or status"
-msgid "<unknown>"
+#: themer/kdmthemer.cpp:72
+#, kde-format
+msgid "Cannot parse theme file %1"
 msgstr ""
 
-#: kchooser.cpp:242
+#: themer/kdmthemer.cpp:79
 #, kde-format
-msgid "Unknown host %1"
-msgstr "Gwesteiwr anhysbys %1"
+msgid "%1 does not seem to be a correct theme file"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfileaudiopreview4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfileaudiopreview4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfileaudiopreview4.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfileaudiopreview4.po	2012-04-18 08:59:29.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kfileaudiopreview4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:25+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: mediacontrols_p.h:51
 msgid "start playback"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_avi.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_avi.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_avi.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_avi.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_avi.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2010-12-23 08:47+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_avi.cpp:55
 msgid "Technical Details"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_drgeo.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_drgeo.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_drgeo.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_drgeo.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kfile_drgeo.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:45+0000\n"
-"PO-Revision-Date: 2012-03-13 13:14+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 13:48+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile/kfile_drgeo.cpp:37
 msgid "Summary"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_flac.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_flac.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_flac.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_flac.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_flac.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:00+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_flac.cpp:78
 msgid "Comment"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_kig.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_kig.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_kig.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_kig.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kfile_kig.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:45+0000\n"
-"PO-Revision-Date: 2012-03-13 00:21+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 14:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:34+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile/kfile_kig.cpp:46
 msgid "Summary"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_mp3.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_mp3.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_mp3.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_mp3.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_mp3.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:00+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_mp3.cpp:54
 msgid "ID3 Tag"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_mpc.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_mpc.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_mpc.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_mpc.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_mpc.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_mpc.cpp:61
 msgid "Comment"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_ogg.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_ogg.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_ogg.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_ogg.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_ogg.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:00+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_ogg.cpp:49 kfile_ogg.cpp:85
 msgid "Title"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfilereplace.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfilereplace.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfilereplace.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfilereplace.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kdewebdev\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 15:07+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-12-16 12:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:35+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: configurationclasses.cpp:168
 #, kde-format
@@ -475,12 +475,12 @@
 msgid "Starting folder"
 msgstr ""
 
-#: rc.cpp:344
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: rc.cpp:345
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
@@ -489,46 +489,34 @@
 #. i18n: ectx: Menu (kfilerepace)
 #. i18n: file: kfilereplaceui.rc:7
 #. i18n: ectx: Menu (kfilerepace)
-#. i18n: file: kfilereplacepartui.rc:4
-#. i18n: ectx: Menu (kfilerepace)
-#. i18n: file: kfilereplaceui.rc:7
-#. i18n: ectx: Menu (kfilerepace)
-#: rc.cpp:42 rc.cpp:66 rc.cpp:348 rc.cpp:372
+#: rc.cpp:5 rc.cpp:29
 msgid "Search/&Replace"
 msgstr ""
 
 #. i18n: file: kfilereplacepartui.rc:11
 #. i18n: ectx: Menu (strings)
-#: rc.cpp:45 rc.cpp:351
+#: rc.cpp:8
 msgid "&Strings"
 msgstr ""
 
 #. i18n: file: kfilereplacepartui.rc:24
 #. i18n: ectx: Menu (results)
-#: rc.cpp:48 rc.cpp:354
+#: rc.cpp:11
 msgid "&Results"
 msgstr "&Canlyniadau"
 
 #. i18n: file: kfilereplacepartui.rc:36
 #. i18n: ectx: Menu (options)
-#: rc.cpp:51 rc.cpp:357
+#: rc.cpp:14
 msgid "&Options"
 msgstr ""
 
 #. i18n: file: kfilereplacepartui.rc:44
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:54 rc.cpp:360
+#: rc.cpp:17
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: kaddstringdlgs.ui:365
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: kfilereplacepartui.rc:47
-#. i18n: ectx: Menu (help)
-#. i18n: file: knewprojectdlgs.ui:64
-#. i18n: ectx: property (text), widget (KPushButton)
-#. i18n: file: koptionsdlgs.ui:271
-#. i18n: ectx: property (text), widget (QPushButton)
 #. i18n: file: kfilereplacepartui.rc:47
 #. i18n: ectx: Menu (help)
 #. i18n: file: kaddstringdlgs.ui:365
@@ -537,56 +525,55 @@
 #. i18n: ectx: property (text), widget (KPushButton)
 #. i18n: file: koptionsdlgs.ui:271
 #. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:33 rc.cpp:57 rc.cpp:138 rc.cpp:334 rc.cpp:363 rc.cpp:405 rc.cpp:483
-#: rc.cpp:679
+#: rc.cpp:20 rc.cpp:59 rc.cpp:137 rc.cpp:323
 msgid "&Help"
 msgstr ""
 
 #. i18n: file: kfilereplacepartui.rc:55
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:60 rc.cpp:366
+#: rc.cpp:23
 msgid "KFileReplace Main Toolbar"
 msgstr ""
 
 #. i18n: file: kfilereplaceui.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:63 rc.cpp:369
+#: rc.cpp:26
 msgid "&File"
 msgstr ""
 
 #. i18n: file: kaddstringdlgs.ui:16
 #. i18n: ectx: property (caption), widget (QDialog)
-#: rc.cpp:3 rc.cpp:375
+#: rc.cpp:32
 msgid "Insert Searching/Replacing Strings"
 msgstr ""
 
 #. i18n: file: kaddstringdlgs.ui:38
 #. i18n: ectx: property (title), widget (QButtonGroup)
-#: rc.cpp:6 rc.cpp:378
+#: rc.cpp:35
 msgid "Choose String Adding Mode"
 msgstr ""
 
 #. i18n: file: kaddstringdlgs.ui:52
 #. i18n: ectx: property (text), widget (QRadioButton)
-#: rc.cpp:9 rc.cpp:381
+#: rc.cpp:38
 msgid "Search and replace mode"
 msgstr ""
 
 #. i18n: file: kaddstringdlgs.ui:63
 #. i18n: ectx: property (text), widget (QRadioButton)
-#: rc.cpp:13 rc.cpp:385
+#: rc.cpp:41
 msgid "Search only mode"
 msgstr ""
 
 #. i18n: file: kaddstringdlgs.ui:106
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:16 rc.cpp:388
+#: rc.cpp:44
 msgid "Search for:"
 msgstr "Chwilio am:"
 
 #. i18n: file: kaddstringdlgs.ui:135
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:19 rc.cpp:391
+#: rc.cpp:47
 msgid "Replace with:"
 msgstr "Amnewid efo:"
 
@@ -598,16 +585,7 @@
 #. i18n: ectx: property (text), widget (K3ListView)
 #. i18n: file: kfilereplaceviewwdg.ui:361
 #. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kaddstringdlgs.ui:270
-#. i18n: ectx: property (text), widget (QListView)
-#. i18n: file: kaddstringdlgs.ui:311
-#. i18n: ectx: property (text), widget (QListView)
-#. i18n: file: kfilereplaceviewwdg.ui:306
-#. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:361
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:24 rc.cpp:27 rc.cpp:108 rc.cpp:114 rc.cpp:396 rc.cpp:399 rc.cpp:453
-#: rc.cpp:459
+#: rc.cpp:50 rc.cpp:53 rc.cpp:107 rc.cpp:113
 msgid "Search For"
 msgstr "Chwilio am:"
 
@@ -615,11 +593,7 @@
 #. i18n: ectx: property (text), widget (QListView)
 #. i18n: file: kfilereplaceviewwdg.ui:317
 #. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kaddstringdlgs.ui:322
-#. i18n: ectx: property (text), widget (QListView)
-#. i18n: file: kfilereplaceviewwdg.ui:317
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:30 rc.cpp:111 rc.cpp:402 rc.cpp:456
+#: rc.cpp:56 rc.cpp:110
 msgid "Replace With"
 msgstr "Amnewid Efo"
 
@@ -627,11 +601,7 @@
 #. i18n: ectx: property (text), widget (QPushButton)
 #. i18n: file: koptionsdlgs.ui:304
 #. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: kaddstringdlgs.ui:398
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: koptionsdlgs.ui:304
-#. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:36 rc.cpp:340 rc.cpp:408 rc.cpp:685
+#: rc.cpp:62 rc.cpp:329
 msgid "&OK"
 msgstr ""
 
@@ -641,13 +611,7 @@
 #. i18n: ectx: property (text), widget (KPushButton)
 #. i18n: file: koptionsdlgs.ui:312
 #. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: kaddstringdlgs.ui:406
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: knewprojectdlgs.ui:128
-#. i18n: ectx: property (text), widget (KPushButton)
-#. i18n: file: koptionsdlgs.ui:312
-#. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:39 rc.cpp:149 rc.cpp:343 rc.cpp:411 rc.cpp:494 rc.cpp:688
+#: rc.cpp:65 rc.cpp:146 rc.cpp:332
 msgid "&Cancel"
 msgstr ""
 
@@ -659,16 +623,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox)
 #. i18n: file: knewprojectdlgs.ui:495
 #. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: kfilereplaceviewwdg.ui:58
-#. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:181
-#. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: knewprojectdlgs.ui:423
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:495
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#: rc.cpp:69 rc.cpp:90 rc.cpp:213 rc.cpp:231 rc.cpp:414 rc.cpp:435 rc.cpp:558
-#: rc.cpp:576 report.cpp:116
+#: rc.cpp:68 rc.cpp:89 rc.cpp:206 rc.cpp:224 report.cpp:116
 msgid "Name"
 msgstr "Enw"
 
@@ -676,29 +631,25 @@
 #. i18n: ectx: property (text), widget (K3ListView)
 #. i18n: file: kfilereplaceviewwdg.ui:192
 #. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:69
-#. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:192
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:72 rc.cpp:93 rc.cpp:417 rc.cpp:438 report.cpp:117
+#: rc.cpp:71 rc.cpp:92 report.cpp:117
 msgid "Folder"
 msgstr "Plygell"
 
 #. i18n: file: kfilereplaceviewwdg.ui:80
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:75 rc.cpp:420 report.cpp:124
+#: rc.cpp:74 report.cpp:124
 msgid "Old Size"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:91
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:78 rc.cpp:423 report.cpp:125
+#: rc.cpp:77 report.cpp:125
 msgid "New Size"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:102
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:81 rc.cpp:426 report.cpp:56
+#: rc.cpp:80 report.cpp:56
 msgid "Replaced Strings"
 msgstr ""
 
@@ -706,11 +657,7 @@
 #. i18n: ectx: property (text), widget (K3ListView)
 #. i18n: file: kfilereplaceviewwdg.ui:225
 #. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:113
-#. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:225
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:84 rc.cpp:102 rc.cpp:429 rc.cpp:447 report.cpp:128
+#: rc.cpp:83 rc.cpp:101 report.cpp:128
 msgid "Owner User"
 msgstr ""
 
@@ -718,131 +665,127 @@
 #. i18n: ectx: property (text), widget (K3ListView)
 #. i18n: file: kfilereplaceviewwdg.ui:236
 #. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:124
-#. i18n: ectx: property (text), widget (K3ListView)
-#. i18n: file: kfilereplaceviewwdg.ui:236
-#. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:87 rc.cpp:105 rc.cpp:432 rc.cpp:450 report.cpp:129
+#: rc.cpp:86 rc.cpp:104 report.cpp:129
 msgid "Owner Group"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:203
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:96 rc.cpp:441 report.cpp:120
+#: rc.cpp:95 report.cpp:120
 msgid "Size"
 msgstr "Maint"
 
 #. i18n: file: kfilereplaceviewwdg.ui:214
 #. i18n: ectx: property (text), widget (K3ListView)
-#: rc.cpp:99 rc.cpp:444
+#: rc.cpp:98
 msgid "Found Strings"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:427
 #. i18n: ectx: property (toolTip), widget (KLed)
-#: rc.cpp:117 rc.cpp:462
+#: rc.cpp:116
 msgid "Green means ready"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:430
 #. i18n: ectx: property (whatsThis), widget (KLed)
-#: rc.cpp:120 rc.cpp:465
+#: rc.cpp:119
 msgid "Ready"
 msgstr "Parod"
 
 #. i18n: file: kfilereplaceviewwdg.ui:454
 #. i18n: ectx: property (toolTip), widget (KLed)
-#: rc.cpp:123 rc.cpp:468
+#: rc.cpp:122
 msgid "Yellow means wait while sorting list"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:457
 #. i18n: ectx: property (whatsThis), widget (KLed)
-#: rc.cpp:126 rc.cpp:471
+#: rc.cpp:125
 msgid "Please wait while sorting list"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:478
 #. i18n: ectx: property (toolTip), widget (KLed)
-#: rc.cpp:129 rc.cpp:474
+#: rc.cpp:128
 msgid "Red means scanning files"
 msgstr ""
 
 #. i18n: file: kfilereplaceviewwdg.ui:513
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:132 rc.cpp:477
+#: rc.cpp:131
 msgid "Scanned files:"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:16
 #. i18n: ectx: property (caption), widget (QDialog)
-#: rc.cpp:135 rc.cpp:480
+#: rc.cpp:134
 msgid "Search & Replace in Files"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:89
 #. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:141 rc.cpp:486
+#: rc.cpp:140
 msgid "Search Now"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:103
 #. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:145 rc.cpp:490
+#: rc.cpp:143
 msgid "Search Later"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:142
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:152 rc.cpp:497
+#: rc.cpp:149
 msgid "&General"
 msgstr "&Cyffredinol"
 
 #. i18n: file: knewprojectdlgs.ui:153
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:155 rc.cpp:500
+#: rc.cpp:152
 msgid "Startup Folder Options"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:164
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:158 rc.cpp:503
+#: rc.cpp:155
 msgid "Filter:"
 msgstr "Hidl:"
 
 #. i18n: file: knewprojectdlgs.ui:175
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:161 rc.cpp:506
+#: rc.cpp:158
 msgid "Location:"
 msgstr "Lleoliad:"
 
 #. i18n: file: knewprojectdlgs.ui:209
 #. i18n: ectx: property (whatsThis), widget (KComboBox)
-#: rc.cpp:164 rc.cpp:509
+#: rc.cpp:161
 msgid "Insert a search path here. You can use the search path button."
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:256
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:170 rc.cpp:515
+#: rc.cpp:164
 msgid "&Include subfolders"
 msgstr "&Cynnwys is-blygyll"
 
 #. i18n: file: knewprojectdlgs.ui:269
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:173 rc.cpp:518
+#: rc.cpp:167
 msgid "Search/Replace Strings"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:290
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:176 rc.cpp:521
+#: rc.cpp:170
 msgid "Search:"
 msgstr "Chwiliad:"
 
 #. i18n: file: knewprojectdlgs.ui:298
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:179 rc.cpp:524
+#: rc.cpp:173
 msgid "Replace:"
 msgstr "Amnewid:"
 
@@ -850,35 +793,31 @@
 #. i18n: ectx: property (title), widget (QGroupBox)
 #. i18n: file: koptionsdlgs.ui:45
 #. i18n: ectx: property (title), widget (QGroupBox)
-#. i18n: file: knewprojectdlgs.ui:308
-#. i18n: ectx: property (title), widget (QGroupBox)
-#. i18n: file: koptionsdlgs.ui:45
-#. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:182 rc.cpp:279 rc.cpp:527 rc.cpp:624
+#: rc.cpp:176 rc.cpp:272
 msgid "General Options"
 msgstr "Dewisiadau Cyffredinol"
 
 #. i18n: file: knewprojectdlgs.ui:322
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:185 rc.cpp:530
+#: rc.cpp:179
 msgid "Enable &regular expressions"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:330
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:188 rc.cpp:533
+#: rc.cpp:182
 msgid "Do &backup copy instead of overwrite"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:338
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:191 rc.cpp:536
+#: rc.cpp:185
 msgid "&Case sensitive"
 msgstr "&Llythrennau mawr/bach o bwys"
 
 #. i18n: file: knewprojectdlgs.ui:346
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:194 rc.cpp:539
+#: rc.cpp:188
 msgid "Enable co&mmands in the replace string"
 msgstr ""
 
@@ -886,11 +825,7 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. i18n: file: koptionsdlgs.ui:67
 #. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: knewprojectdlgs.ui:354
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: koptionsdlgs.ui:67
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:197 rc.cpp:286 rc.cpp:542 rc.cpp:631
+#: rc.cpp:191 rc.cpp:278
 msgid "Backup copy suffix:"
 msgstr ""
 
@@ -898,11 +833,7 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. i18n: file: koptionsdlgs.ui:132
 #. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: knewprojectdlgs.ui:383
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: koptionsdlgs.ui:132
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:201 rc.cpp:307 rc.cpp:546 rc.cpp:652
+#: rc.cpp:194 rc.cpp:296
 msgid "Encoding of the files:"
 msgstr ""
 
@@ -910,23 +841,19 @@
 #. i18n: ectx: attribute (title), widget (QWidget)
 #. i18n: file: koptionsdlgs.ui:157
 #. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: knewprojectdlgs.ui:395
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: koptionsdlgs.ui:157
-#. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:204 rc.cpp:310 rc.cpp:549 rc.cpp:655
+#: rc.cpp:197 rc.cpp:299
 msgid "&Advanced"
 msgstr "&Uwch"
 
 #. i18n: file: knewprojectdlgs.ui:406
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:207 rc.cpp:552
+#: rc.cpp:200
 msgid "Ownership Filtering"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:417
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:210 rc.cpp:555
+#: rc.cpp:203
 msgid "User: "
 msgstr "Defnyddiwr: "
 
@@ -934,11 +861,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox)
 #. i18n: file: knewprojectdlgs.ui:500
 #. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:428
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:500
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#: rc.cpp:216 rc.cpp:234 rc.cpp:561 rc.cpp:579
+#: rc.cpp:209 rc.cpp:227
 msgid "ID (Number)"
 msgstr ""
 
@@ -946,11 +869,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox)
 #. i18n: file: knewprojectdlgs.ui:471
 #. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:447
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:471
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#: rc.cpp:219 rc.cpp:225 rc.cpp:564 rc.cpp:570
+#: rc.cpp:212 rc.cpp:218
 msgid "Equals To"
 msgstr ""
 
@@ -958,71 +877,67 @@
 #. i18n: ectx: property (text), item, widget (KComboBox)
 #. i18n: file: knewprojectdlgs.ui:476
 #. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:452
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#. i18n: file: knewprojectdlgs.ui:476
-#. i18n: ectx: property (text), item, widget (KComboBox)
-#: rc.cpp:222 rc.cpp:228 rc.cpp:567 rc.cpp:573
+#: rc.cpp:215 rc.cpp:221
 msgid "Is Not"
 msgstr "Nid Yw"
 
 #. i18n: file: knewprojectdlgs.ui:521
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:237 rc.cpp:582
+#: rc.cpp:230
 msgid "Group:"
 msgstr "Gr?p:"
 
 #. i18n: file: knewprojectdlgs.ui:547
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:240 rc.cpp:585
+#: rc.cpp:233
 msgid "Access Date Filtering"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:574
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:243 rc.cpp:588
+#: rc.cpp:236
 msgid "Dates valid for:"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:582
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:246 rc.cpp:591
+#: rc.cpp:239
 msgid "Accessed after:"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:590
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:249 rc.cpp:594
+#: rc.cpp:242
 msgid "Accessed before: "
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:606
 #. i18n: ectx: property (text), item, widget (KComboBox)
-#: rc.cpp:252 rc.cpp:597
+#: rc.cpp:245
 msgid "Last Writing Access"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:611
 #. i18n: ectx: property (text), item, widget (KComboBox)
-#: rc.cpp:255 rc.cpp:600
+#: rc.cpp:248
 msgid "Last Reading Access"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:716
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:258 rc.cpp:603
+#: rc.cpp:251
 msgid "Size Filtering"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:743
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:261 rc.cpp:606
+#: rc.cpp:254
 msgid "Minimum si&ze:"
 msgstr ""
 
 #. i18n: file: knewprojectdlgs.ui:751
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:264 rc.cpp:609
+#: rc.cpp:257
 msgid "Maximum size:"
 msgstr ""
 
@@ -1030,107 +945,103 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. i18n: file: knewprojectdlgs.ui:809
 #. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: knewprojectdlgs.ui:801
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: knewprojectdlgs.ui:809
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:267 rc.cpp:270 rc.cpp:612 rc.cpp:615
+#: rc.cpp:260 rc.cpp:263
 msgid "KB"
 msgstr "KB"
 
 #. i18n: file: koptionsdlgs.ui:16
 #. i18n: ectx: property (caption), widget (QDialog)
-#: rc.cpp:273 rc.cpp:618
+#: rc.cpp:266
 msgid "Options"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:34
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:276 rc.cpp:621
+#: rc.cpp:269
 msgid "General"
 msgstr "Cyffredinol"
 
 #. i18n: file: koptionsdlgs.ui:56
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:282 rc.cpp:627
+#: rc.cpp:275
 msgid "Enable commands in replace strings"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:83
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:290 rc.cpp:635
+#: rc.cpp:281
 msgid "Notif&y on errors"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:91
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:293 rc.cpp:638
+#: rc.cpp:284
 msgid "Case sensitive"
 msgstr "Llythrennau mawr/bach o bwys"
 
 #. i18n: file: koptionsdlgs.ui:102
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:297 rc.cpp:642
+#: rc.cpp:287
 msgid "Recursive (search/replace in all sub folders)"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:116
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:301 rc.cpp:646
+#: rc.cpp:290
 msgid "Enable regular e&xpressions"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:124
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:304 rc.cpp:649
+#: rc.cpp:293
 msgid "Do &backup copy"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:168
 #. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:313 rc.cpp:658
+#: rc.cpp:302
 msgid "Advanced Options"
 msgstr "Dewisiadau Uwch"
 
 #. i18n: file: koptionsdlgs.ui:179
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:316 rc.cpp:661
+#: rc.cpp:305
 msgid "Ignore hidden files and folders"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:187
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:319 rc.cpp:664
+#: rc.cpp:308
 msgid "Follow s&ymbolic links"
 msgstr "Dilyn cy&sylltau symbolaidd"
 
 #. i18n: file: koptionsdlgs.ui:195
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:322 rc.cpp:667
+#: rc.cpp:311
 msgid "When searching, stop on first string found (faster but no details)"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:206
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:325 rc.cpp:670
+#: rc.cpp:314
 msgid "Do not show file if no strings are found or replaced"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:242
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:328 rc.cpp:673
+#: rc.cpp:317
 msgid "Show confirmation dialog"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:255
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:331 rc.cpp:676
+#: rc.cpp:320
 msgid "Confirm before replace each string"
 msgstr ""
 
 #. i18n: file: koptionsdlgs.ui:296
 #. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:337 rc.cpp:682
+#: rc.cpp:326
 msgid "&Default Values"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_rpm.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_rpm.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_rpm.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_rpm.po	2012-04-18 08:59:22.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: kfile_rpm\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 02:38+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2006-04-21 16:54+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:40+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_rpm.cpp:44
 msgid "General"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfileshare.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfileshare.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfileshare.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfileshare.po	2012-04-18 08:59:25.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdenetwork/kfileshare.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:59+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: samba/filepropertiesplugin/sambausershareplugin.ui:19
 #. i18n: ectx: property (text), widget (QCheckBox, sambaChk)
@@ -30,25 +30,19 @@
 msgid "Allow Guests"
 msgstr ""
 
-#: samba/filepropertiesplugin/sambausershareplugin.cpp:62
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:61
 msgid "&Share"
 msgstr "&Rhaniad"
 
-#: samba/filepropertiesplugin/sambausershareplugin.cpp:74
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:73
 msgid "Samba is not installed on your system."
 msgstr ""
 
-#: samba/filepropertiesplugin/sambausershareplugin.cpp:77
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:76
 msgid "Install Samba..."
 msgstr ""
 
-#: samba/filepropertiesplugin/sambausershareplugin.cpp:129
-msgid ""
-"<qt><strong>Samba could not be installed.</strong><br />Please, check if "
-"kpackagekit is properly installed</qt>"
-msgstr ""
-
-#: samba/filepropertiesplugin/sambausershareplugin.cpp:207
+#: samba/filepropertiesplugin/sambausershareplugin.cpp:195
 #, kde-format
 msgid ""
 "<qt>There is already a share with the name <strong>%1</strong>.<br /> Please "
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_sid.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_sid.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_sid.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_sid.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_sid.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:00+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_sid.cpp:51
 msgid "General"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_theora.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_theora.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_theora.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_theora.po	2012-04-18 08:59:24.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: all.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2010-12-23 08:48+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_theora.cpp:70
 msgid "Video Details"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_wav.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_wav.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfile_wav.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfile_wav.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kfile_wav.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfile_wav.cpp:55
 msgid "Technical Details"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfindpart.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfindpart.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfindpart.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfindpart.po	2012-04-18 08:59:36.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: kfindpart\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:22+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 16:53+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,102 +20,102 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:22+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kfinddlg.cpp:51
 msgctxt "@title:window"
 msgid "Find Files/Folders"
 msgstr ""
 
-#: kfinddlg.cpp:71 kfinddlg.cpp:198
+#: kfinddlg.cpp:73 kfinddlg.cpp:202
 msgctxt "the application is currently idle, there is no active search"
 msgid "Idle."
 msgstr ""
 
-#: kfinddlg.cpp:133 kfinddlg.cpp:237 kfinddlg.cpp:266
+#: kfinddlg.cpp:138 kfinddlg.cpp:241 kfinddlg.cpp:270
 #, kde-format
 msgid "one file found"
 msgid_plural "%1 files found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kfinddlg.cpp:173
+#: kfinddlg.cpp:177
 msgid "Searching..."
 msgstr "Yn chwilio..."
 
-#: kfinddlg.cpp:200
+#: kfinddlg.cpp:204
 msgid "Canceled."
 msgstr ""
 
-#: kfinddlg.cpp:203 kfinddlg.cpp:208 kfinddlg.cpp:214
+#: kfinddlg.cpp:207 kfinddlg.cpp:212 kfinddlg.cpp:218
 msgid "Error."
 msgstr "Gwall."
 
-#: kfinddlg.cpp:204
+#: kfinddlg.cpp:208
 msgid "Please specify an absolute path in the \"Look in\" box."
 msgstr ""
 "Penodwch lwybr uniongyrchol yn y blwch \"Edrych yn\" os gwelwch yn dda."
 
-#: kfinddlg.cpp:209
+#: kfinddlg.cpp:213
 msgid "Could not find the specified folder."
 msgstr "Methu canfod y blygell a benodwyd."
 
-#: kfindtreeview.cpp:50
+#: kfindtreeview.cpp:52
 msgid "Read-write"
 msgstr "Darllen-ysgrifennu"
 
-#: kfindtreeview.cpp:51
+#: kfindtreeview.cpp:53
 msgid "Read-only"
 msgstr "Darllen-yn-unig"
 
-#: kfindtreeview.cpp:52
+#: kfindtreeview.cpp:54
 msgid "Write-only"
 msgstr "Ysgrifennu-yn-unig"
 
-#: kfindtreeview.cpp:53
+#: kfindtreeview.cpp:55
 msgid "Inaccessible"
 msgstr "Anhygyrch"
 
-#: kfindtreeview.cpp:72
+#: kfindtreeview.cpp:74
 msgctxt "file name column"
 msgid "Name"
 msgstr ""
 
-#: kfindtreeview.cpp:74
+#: kfindtreeview.cpp:76
 msgctxt "name of the containing folder"
 msgid "In Subfolder"
 msgstr ""
 
-#: kfindtreeview.cpp:76
+#: kfindtreeview.cpp:78
 msgctxt "file size column"
 msgid "Size"
 msgstr ""
 
-#: kfindtreeview.cpp:78
+#: kfindtreeview.cpp:80
 msgctxt "modified date column"
 msgid "Modified"
 msgstr ""
 
-#: kfindtreeview.cpp:80
+#: kfindtreeview.cpp:82
 msgctxt "file permissions column"
 msgid "Permissions"
 msgstr ""
 
-#: kfindtreeview.cpp:82
+#: kfindtreeview.cpp:84
 msgctxt "first matching line of the query string in this file"
 msgid "First Matching Line"
 msgstr ""
 
-#: kfindtreeview.cpp:350
+#: kfindtreeview.cpp:353
 msgid "&Open containing folder(s)"
 msgstr ""
 
-#: kfindtreeview.cpp:354
+#: kfindtreeview.cpp:357
 msgid "&Delete"
 msgstr ""
 
-#: kfindtreeview.cpp:359
+#: kfindtreeview.cpp:362
 msgid "&Move to Trash"
 msgstr ""
 
@@ -124,19 +124,19 @@
 msgid "Save Results As"
 msgstr ""
 
-#: kfindtreeview.cpp:443
+#: kfindtreeview.cpp:446
 msgid "HTML page"
 msgstr ""
 
-#: kfindtreeview.cpp:443
+#: kfindtreeview.cpp:446
 msgid "Text file"
 msgstr ""
 
-#: kfindtreeview.cpp:463
+#: kfindtreeview.cpp:466
 msgid "Unable to save results."
 msgstr ""
 
-#: kfindtreeview.cpp:479
+#: kfindtreeview.cpp:482
 msgid "KFind Results File"
 msgstr "Ffeil Ganlyniadau KFind"
 
@@ -146,40 +146,40 @@
 msgid "Results were saved to: %1"
 msgstr ""
 
-#: kftabdlg.cpp:77
+#: kftabdlg.cpp:76
 msgctxt "this is the label for the name textfield"
 msgid "&Named:"
 msgstr ""
 
-#: kftabdlg.cpp:80
+#: kftabdlg.cpp:79
 msgid "You can use wildcard matching and \";\" for separating multiple names"
 msgstr "Gallwch ddefnyddio cydweddu gwylltnod a \";\" i wahanu sawl enw"
 
-#: kftabdlg.cpp:86
+#: kftabdlg.cpp:85
 msgid "Look &in:"
 msgstr ""
 
-#: kftabdlg.cpp:89
+#: kftabdlg.cpp:88
 msgid "Include &subfolders"
 msgstr "Cynnwys i&s-blygyll"
 
-#: kftabdlg.cpp:90
+#: kftabdlg.cpp:89
 msgid "Case s&ensitive search"
 msgstr "Chwiliad â &braslythrennau o bwys"
 
-#: kftabdlg.cpp:91
+#: kftabdlg.cpp:90
 msgid "&Browse..."
 msgstr "&Pori..."
 
-#: kftabdlg.cpp:92
+#: kftabdlg.cpp:91
 msgid "&Use files index"
 msgstr ""
 
-#: kftabdlg.cpp:93
+#: kftabdlg.cpp:92
 msgid "Show &hidden files"
 msgstr ""
 
-#: kftabdlg.cpp:111
+#: kftabdlg.cpp:110
 msgid ""
 "<qt>Enter the filename you are looking for. <br />Alternatives may be "
 "separated by a semicolon \";\".<br /><br />The filename may contain the "
@@ -193,82 +193,82 @@
 "finds a file of exactly that name</li></ul></qt>"
 msgstr ""
 
-#: kftabdlg.cpp:132
+#: kftabdlg.cpp:131
 msgid ""
 "<qt>This lets you use the files' index created by the <i>slocate</i> package "
 "to speed-up the search; remember to update the index from time to time "
 "(using <i>updatedb</i>).</qt>"
 msgstr ""
 
-#: kftabdlg.cpp:178
+#: kftabdlg.cpp:180
 msgid "Find all files created or &modified:"
 msgstr "Canfod yr holl ffeiliau a grëwyd neu &addaswyd:"
 
-#: kftabdlg.cpp:180
+#: kftabdlg.cpp:182
 msgid "&between"
 msgstr "&rhwng"
 
-#: kftabdlg.cpp:182
+#: kftabdlg.cpp:184
 msgid "and"
 msgstr "a"
 
-#: kftabdlg.cpp:203
+#: kftabdlg.cpp:205
 msgid "File &size is:"
 msgstr "&Maint y ffeil yw:"
 
-#: kftabdlg.cpp:216
+#: kftabdlg.cpp:218
 msgid "Files owned by &user:"
 msgstr "Ffeiliau'n perchen i'r &defnyddiwr:"
 
-#: kftabdlg.cpp:221
+#: kftabdlg.cpp:223
 msgid "Owned by &group:"
 msgstr "Yn perchen i'r &grŵp:"
 
-#: kftabdlg.cpp:224
+#: kftabdlg.cpp:226
 msgctxt "file size isn't considered in the search"
 msgid "(none)"
 msgstr ""
 
-#: kftabdlg.cpp:225
+#: kftabdlg.cpp:227
 msgid "At Least"
 msgstr "O leiaf"
 
-#: kftabdlg.cpp:226
+#: kftabdlg.cpp:228
 msgid "At Most"
 msgstr "Ar y mwyaf"
 
-#: kftabdlg.cpp:227
+#: kftabdlg.cpp:229
 msgid "Equal To"
 msgstr "Yn hafal â"
 
-#: kftabdlg.cpp:229 kftabdlg.cpp:895
+#: kftabdlg.cpp:231 kftabdlg.cpp:897
 msgid "Byte"
 msgid_plural "Bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kftabdlg.cpp:230
+#: kftabdlg.cpp:232
 msgid "KiB"
 msgstr ""
 
-#: kftabdlg.cpp:231
+#: kftabdlg.cpp:233
 msgid "MiB"
 msgstr ""
 
-#: kftabdlg.cpp:232
+#: kftabdlg.cpp:234
 msgid "GiB"
 msgstr ""
 
-#: kftabdlg.cpp:299
+#: kftabdlg.cpp:301
 msgctxt "label for the file type combobox"
 msgid "File &type:"
 msgstr ""
 
-#: kftabdlg.cpp:304
+#: kftabdlg.cpp:306
 msgid "C&ontaining text:"
 msgstr "Yn cy&nnwys testun:"
 
-#: kftabdlg.cpp:310
+#: kftabdlg.cpp:312
 msgid ""
 "<qt>If specified, only files that contain this text are found. Note that not "
 "all file types from the list above are supported. Please refer to the "
@@ -278,19 +278,19 @@
 "ganfyddir. Noder nas cynhelir bob math ffeil o'r restr uchod. Cyfeiriwch at "
 "y ddogfennaeth am restr o'r mathau ffeil y cynhelir os gwelwch yn dda.</qt>"
 
-#: kftabdlg.cpp:318
+#: kftabdlg.cpp:320
 msgid "Case s&ensitive"
 msgstr "Priflythrennau &o bwys"
 
-#: kftabdlg.cpp:319
+#: kftabdlg.cpp:321
 msgid "Include &binary files"
 msgstr "Cynnwys ffeiliau &deuol"
 
-#: kftabdlg.cpp:320
+#: kftabdlg.cpp:322
 msgid "Regular e&xpression"
 msgstr "Mynegiad &rheolaidd"
 
-#: kftabdlg.cpp:323
+#: kftabdlg.cpp:325
 msgid ""
 "<qt>This lets you search in any type of file, even those that usually do not "
 "contain text (for example program files and images).</qt>"
@@ -299,72 +299,73 @@
 "sy ddim yn cynnwys testun fel arfer (er enghraifft, ffeiliau rhaglen a "
 "delweddau).</qt>"
 
-#: kftabdlg.cpp:331
+#: kftabdlg.cpp:333
 msgid "&Edit..."
 msgstr "&Golygu"
 
-#: kftabdlg.cpp:337
+#: kftabdlg.cpp:339
+msgctxt "as in search for"
 msgid "fo&r:"
-msgstr "ar gyfe&r:"
+msgstr ""
 
-#: kftabdlg.cpp:339
+#: kftabdlg.cpp:341
 msgid "Search &metainfo sections:"
 msgstr "Chwilio adrannau &metagwybodaeth:"
 
-#: kftabdlg.cpp:343
+#: kftabdlg.cpp:345
 msgid "All Files & Folders"
 msgstr "Pob Ffeil a Plygell"
 
-#: kftabdlg.cpp:344
+#: kftabdlg.cpp:346
 msgid "Files"
 msgstr ""
 
-#: kftabdlg.cpp:345
+#: kftabdlg.cpp:347
 msgid "Folders"
 msgstr "Plygyll"
 
-#: kftabdlg.cpp:346
+#: kftabdlg.cpp:348
 msgid "Symbolic Links"
 msgstr "Cysylltau Symbolaidd"
 
-#: kftabdlg.cpp:347
+#: kftabdlg.cpp:349
 msgid "Special Files (Sockets, Device Files, ...)"
 msgstr ""
 
-#: kftabdlg.cpp:348
+#: kftabdlg.cpp:350
 msgid "Executable Files"
 msgstr "Ffeiliau Gweithredadwy"
 
-#: kftabdlg.cpp:349
+#: kftabdlg.cpp:351
 msgid "SUID Executable Files"
 msgstr "Ffeiliau Gweithredadwy SUID"
 
-#: kftabdlg.cpp:350
+#: kftabdlg.cpp:352
 msgid "All Images"
 msgstr "Pob Delwedd"
 
-#: kftabdlg.cpp:351
+#: kftabdlg.cpp:353
 msgid "All Video"
 msgstr ""
 
-#: kftabdlg.cpp:352
+#: kftabdlg.cpp:354
 msgid "All Sounds"
 msgstr ""
 
-#: kftabdlg.cpp:403
+#: kftabdlg.cpp:405
 msgid "Name/&Location"
 msgstr "Enw/&Lleoliad"
 
-#: kftabdlg.cpp:404
+#: kftabdlg.cpp:406
 msgctxt "tab name: search by contents"
 msgid "C&ontents"
 msgstr ""
 
-#: kftabdlg.cpp:405
+#: kftabdlg.cpp:407
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: kftabdlg.cpp:410
+#: kftabdlg.cpp:412
 msgid ""
 "<qt>Search within files' specific comments/metainfo<br />These are some "
 "examples:<br /><ul><li><b>Audio files (mp3...)</b> Search in id3 tag for a "
@@ -372,46 +373,46 @@
 "resolution, comment...</li></ul></qt>"
 msgstr ""
 
-#: kftabdlg.cpp:418
+#: kftabdlg.cpp:420
 msgid ""
 "<qt>If specified, search only in this field<br /><ul><li><b>Audio files "
 "(mp3...)</b> This can be Title, Album...</li><li><b>Images (png...)</b> "
 "Search only in Resolution, Bitdepth...</li></ul></qt>"
 msgstr ""
 
-#: kftabdlg.cpp:611
+#: kftabdlg.cpp:613
 msgid "Unable to search within a period which is less than a minute."
 msgstr "Methu chwilio o fewn cyfnod sy'n fyrrach na munud."
 
-#: kftabdlg.cpp:622
+#: kftabdlg.cpp:624
 msgid "The date is not valid."
 msgstr ""
 
-#: kftabdlg.cpp:624
+#: kftabdlg.cpp:626
 msgid "Invalid date range."
 msgstr ""
 
-#: kftabdlg.cpp:626
+#: kftabdlg.cpp:628
 msgid "Unable to search dates in the future."
 msgstr "Methu chwilio am ddydiadau sydd yn y dyfodol."
 
-#: kftabdlg.cpp:688
+#: kftabdlg.cpp:690
 msgid "Size is too big. Set maximum size value?"
 msgstr ""
 
-#: kftabdlg.cpp:688
+#: kftabdlg.cpp:690
 msgid "Error"
 msgstr ""
 
-#: kftabdlg.cpp:688
+#: kftabdlg.cpp:690
 msgid "Set"
 msgstr "Set"
 
-#: kftabdlg.cpp:688
+#: kftabdlg.cpp:690
 msgid "Do Not Set"
 msgstr ""
 
-#: kftabdlg.cpp:885
+#: kftabdlg.cpp:887
 msgctxt ""
 "during the previous minute(s)/hour(s)/...; dynamic context 'type': 'i' "
 "minutes, 'h' hours, 'd' days, 'm' months, 'y' years"
@@ -420,35 +421,35 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kftabdlg.cpp:886
+#: kftabdlg.cpp:888
 msgctxt "use date ranges to search files by modified time"
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kftabdlg.cpp:887
+#: kftabdlg.cpp:889
 msgctxt "use date ranges to search files by modified time"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kftabdlg.cpp:888
+#: kftabdlg.cpp:890
 msgctxt "use date ranges to search files by modified time"
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kftabdlg.cpp:889
+#: kftabdlg.cpp:891
 msgctxt "use date ranges to search files by modified time"
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kftabdlg.cpp:890
+#: kftabdlg.cpp:892
 msgctxt "use date ranges to search files by modified time"
 msgid "year"
 msgid_plural "years"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfmclient.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfmclient.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfmclient.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfmclient.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,41 +7,41 @@
 msgstr ""
 "Project-Id-Version: kfmclient\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 18:09+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:23+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kfmclient.cpp:55
+#: kfmclient.cpp:56
 msgid "kfmclient"
 msgstr "kfmclient"
 
-#: kfmclient.cpp:56
+#: kfmclient.cpp:57
 msgid "KDE tool for opening URLs from the command line"
 msgstr "Erfyn KDE ar gyfer agor URLau o'r linell orchymyn"
 
-#: kfmclient.cpp:74
+#: kfmclient.cpp:75
 msgid "Non interactive use: no message boxes"
 msgstr ""
 
-#: kfmclient.cpp:76
+#: kfmclient.cpp:77
 msgid "Show available commands"
 msgstr ""
 
-#: kfmclient.cpp:78
+#: kfmclient.cpp:79
 msgid "Command (see --commands)"
 msgstr ""
 
-#: kfmclient.cpp:80
+#: kfmclient.cpp:81
 msgid "Arguments for command"
 msgstr ""
 
-#: kfmclient.cpp:90
+#: kfmclient.cpp:91
 msgid ""
 "\n"
 "Syntax:\n"
@@ -49,7 +49,7 @@
 "\n"
 "Cystrawen:\n"
 
-#: kfmclient.cpp:91
+#: kfmclient.cpp:92
 msgid ""
 "  kfmclient openURL 'url' ['mimetype']\n"
 "            # Opens a window showing 'url'.\n"
@@ -65,7 +65,7 @@
 "            #   Os hepgorir 'url', defnyddir $HOME yn ei le.\n"
 "\n"
 
-#: kfmclient.cpp:96
+#: kfmclient.cpp:97
 msgid ""
 "            # If 'mimetype' is specified, it will be used to determine the\n"
 "            #   component that Konqueror should use. For instance, set it "
@@ -80,7 +80,7 @@
 "gynt\n"
 "\n"
 
-#: kfmclient.cpp:100
+#: kfmclient.cpp:101
 msgid ""
 "  kfmclient newTab 'url' ['mimetype']\n"
 "            # Same as above but opens a new tab with 'url' in an existing "
@@ -89,7 +89,7 @@
 "\n"
 msgstr ""
 
-#: kfmclient.cpp:104
+#: kfmclient.cpp:105
 msgid ""
 "  kfmclient openProfile 'profile' ['url']\n"
 "            # Opens a window using the given profile.\n"
@@ -110,20 +110,20 @@
 "            # See kioclient exec for more information.\n"
 msgstr ""
 
-#: kfmclient.cpp:450
+#: kfmclient.cpp:475
 #, kde-format
 msgid "Profile %1 not found\n"
 msgstr "Proffil %1 heb ei ganfod\n"
 
-#: kfmclient.cpp:481
+#: kfmclient.cpp:506
 msgid "Syntax Error: Not enough arguments\n"
 msgstr "Gwall Cystrawen: Dim digon o ymresymiadau\n"
 
-#: kfmclient.cpp:486
+#: kfmclient.cpp:511
 msgid "Syntax Error: Too many arguments\n"
 msgstr "Gwall Cystrawen: Gormod o ymresymiadau\n"
 
-#: kfmclient.cpp:553
+#: kfmclient.cpp:579
 #, kde-format
 msgid "Syntax Error: Unknown command '%1'\n"
 msgstr "Gwall Cystrawen: Gorchymyn anhysbys '%1'\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfontinst.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfontinst.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfontinst.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfontinst.po	2012-04-18 08:59:38.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: kfontinst\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:13+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:43+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg\n"
 "MIME-Version: 1.0\n"
@@ -17,8 +17,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:06+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:34+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -36,13 +36,13 @@
 msgid "&Main Toolbar"
 msgstr ""
 
-#: apps/Installer.cpp:54 kcmfontinst/KCmFontInst.cpp:984
+#: apps/Installer.cpp:54 kcmfontinst/KCmFontInst.cpp:1023
 msgid ""
 "Do you wish to install the font(s) for personal use (only available to you), "
 "or system-wide (available to all users)?"
 msgstr ""
 
-#: apps/Installer.cpp:57 kcmfontinst/KCmFontInst.cpp:987
+#: apps/Installer.cpp:57 kcmfontinst/KCmFontInst.cpp:1026
 msgid "Where to Install"
 msgstr "Lle i Arsefydlu"
 
@@ -54,11 +54,11 @@
 msgid "Simple font installer"
 msgstr ""
 
-#: apps/Installer.cpp:125 apps/Printer.cpp:354
+#: apps/Installer.cpp:125 apps/Printer.cpp:420
 msgid "(C) Craig Drummond, 2007"
 msgstr ""
 
-#: apps/Installer.cpp:132 apps/Printer.cpp:361
+#: apps/Installer.cpp:132 apps/Printer.cpp:427
 msgid "Makes the dialog transient for an X app specified by winid"
 msgstr ""
 
@@ -66,37 +66,37 @@
 msgid "URL to install"
 msgstr ""
 
-#: apps/Printer.cpp:194
+#: apps/Printer.cpp:343
 msgid "Print"
 msgstr ""
 
-#: kcmfontinst/DuplicatesDialog.cpp:250
+#: apps/Printer.cpp:408 kcmfontinst/DuplicatesDialog.cpp:250
 msgid "Canceling..."
 msgstr ""
 
-#: apps/Printer.cpp:353
+#: apps/Printer.cpp:419
 msgid "Font Printer"
 msgstr ""
 
-#: apps/Printer.cpp:353
+#: apps/Printer.cpp:419
 msgid "Simple font printer"
 msgstr ""
 
-#: apps/Printer.cpp:362
+#: apps/Printer.cpp:428
 msgid "Size index to print fonts"
 msgstr ""
 
-#: apps/Printer.cpp:363
+#: apps/Printer.cpp:429
 msgid ""
 "Font to print, specified as \"Family,Style\" where Style is a 24-bit decimal "
 "number composed as: <weight><width><slant>"
 msgstr ""
 
-#: apps/Printer.cpp:364
+#: apps/Printer.cpp:430
 msgid "File containing list of fonts to print"
 msgstr ""
 
-#: apps/Printer.cpp:365
+#: apps/Printer.cpp:431
 msgid "Remove file containing list of fonts to print"
 msgstr ""
 
@@ -174,79 +174,87 @@
 msgid "Links To"
 msgstr ""
 
-#: kcmfontinst/DuplicatesDialog.cpp:424 kcmfontinst/FontList.cpp:1394
+#: kcmfontinst/DuplicatesDialog.cpp:425 kcmfontinst/FontList.cpp:1426
 msgid "Open in Font Viewer"
 msgstr ""
 
-#: kcmfontinst/DuplicatesDialog.cpp:426
+#: kcmfontinst/DuplicatesDialog.cpp:427
 msgid "Properties"
 msgstr ""
 
-#: kcmfontinst/DuplicatesDialog.cpp:429
+#: kcmfontinst/DuplicatesDialog.cpp:430
 msgid "Unmark for Deletion"
 msgstr ""
 
-#: kcmfontinst/DuplicatesDialog.cpp:431
+#: kcmfontinst/DuplicatesDialog.cpp:432
 msgid "Mark for Deletion"
 msgstr ""
 
-#: kcmfontinst/DuplicatesDialog.cpp:531 kcmfontinst/FontList.cpp:1832
+#: kcmfontinst/DuplicatesDialog.cpp:532 kcmfontinst/FontList.cpp:1868
 #, kde-format
 msgid "Open all %1 fonts in font viewer?"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:82
+#: kcmfontinst/FontFilter.cpp:127
 msgid "Set Criteria"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:94
+#: kcmfontinst/FontFilter.cpp:140
 msgid "Family"
 msgstr "Teulu"
 
-#: kcmfontinst/FontFilter.cpp:95
+#: kcmfontinst/FontFilter.cpp:141
 msgid "Style"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:97
+#: kcmfontinst/FontFilter.cpp:143
 msgid "Foundry"
 msgstr "Ffowndri"
 
-#: kcmfontinst/FontFilter.cpp:104
+#: kcmfontinst/FontFilter.cpp:150
 msgid "FontConfig Match"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:105
-msgid "File"
+#: kcmfontinst/FontFilter.cpp:152
+msgid "File Type"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:106
+#: kcmfontinst/FontFilter.cpp:183
+msgid "File Name"
+msgstr ""
+
+#: kcmfontinst/FontFilter.cpp:184
 msgid "File Location"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:108
+#: kcmfontinst/FontFilter.cpp:186
 msgid "Writing System"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:117
+#: kcmfontinst/FontFilter.cpp:195
 msgid "Symbol/Other"
 msgstr ""
 
-#: kcmfontinst/FontFilter.cpp:191 kcmfontinst/FontFilter.cpp:256
+#: kcmfontinst/FontFilter.cpp:288 kcmfontinst/FontFilter.cpp:350
 #, kde-format
 msgid "Type here to filter on %1"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:602
+#: kcmfontinst/FontList.cpp:614
 msgid "Font"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:615
+#: kcmfontinst/FontList.cpp:616
+msgid "Status"
+msgstr ""
+
+#: kcmfontinst/FontList.cpp:629
 msgid ""
 "This column shows the status of the font family, and of the individual font "
 "styles."
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:721
+#: kcmfontinst/FontList.cpp:735
 msgid ""
 "<p>This list shows your installed fonts. The fonts are grouped by family, "
 "and the number in square brackets represents the number of styles in which "
@@ -255,35 +263,35 @@
 "Italic</li><li>Italic</li></ul></li></ul>"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:1019 kcmfontinst/FontList.cpp:1043
+#: kcmfontinst/FontList.cpp:1033 kcmfontinst/FontList.cpp:1057
 #, kde-format
 msgid "...plus %1 more"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:1071
+#: kcmfontinst/FontList.cpp:1085
 #, kde-format
 msgid "%1 [%2]"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:1384 kcmfontinst/KCmFontInst.cpp:301
+#: kcmfontinst/FontList.cpp:1415 kcmfontinst/KCmFontInst.cpp:305
 msgid "Delete"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:1387 kcmfontinst/GroupList.cpp:832
-#: kcmfontinst/KCmFontInst.cpp:1165 kcmfontinst/KCmFontInst.cpp:1189
+#: kcmfontinst/FontList.cpp:1418 kcmfontinst/GroupList.cpp:833
+#: kcmfontinst/KCmFontInst.cpp:1204 kcmfontinst/KCmFontInst.cpp:1228
 msgid "Enable"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:1389 kcmfontinst/GroupList.cpp:834
-#: kcmfontinst/KCmFontInst.cpp:1166 kcmfontinst/KCmFontInst.cpp:1190
+#: kcmfontinst/FontList.cpp:1420 kcmfontinst/GroupList.cpp:835
+#: kcmfontinst/KCmFontInst.cpp:1205 kcmfontinst/KCmFontInst.cpp:1229
 msgid "Disable"
 msgstr ""
 
-#: kcmfontinst/FontList.cpp:1392 kcmfontinst/GroupList.cpp:839
+#: kcmfontinst/FontList.cpp:1424 kcmfontinst/GroupList.cpp:844
 msgid "Print..."
 msgstr "Argraffu"
 
-#: kcmfontinst/FontList.cpp:1397
+#: kcmfontinst/FontList.cpp:1429
 msgid "Reload"
 msgstr ""
 
@@ -322,7 +330,7 @@
 msgid "Remove"
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:580 kcmfontinst/KCmFontInst.cpp:246
+#: kcmfontinst/GroupList.cpp:580 kcmfontinst/KCmFontInst.cpp:250
 msgid "Remove group"
 msgstr ""
 
@@ -360,222 +368,226 @@
 msgid "<qt>A group named <b>'%1'</b> already exists.</qt>"
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:837
+#: kcmfontinst/GroupList.cpp:838
 msgid "Rename..."
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:842
+#: kcmfontinst/GroupList.cpp:850
 msgid "Export..."
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:939
+#: kcmfontinst/GroupList.cpp:948
 #, kde-format
 msgid "Add to \"%1\"."
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:941
+#: kcmfontinst/GroupList.cpp:950
 msgid "Remove from current group."
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:943
+#: kcmfontinst/GroupList.cpp:952
 msgid "Move to personal folder."
 msgstr ""
 
-#: kcmfontinst/GroupList.cpp:945
+#: kcmfontinst/GroupList.cpp:954
 msgid "Move to system folder."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:175
+#: kcmfontinst/JobRunner.cpp:187
 msgid "<h3>Cancel?</h3><p>Are you sure you wish to cancel?</p>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:190
+#: kcmfontinst/JobRunner.cpp:202
 msgid ""
 "<h3>Finished</h3><p>Please note that any open applications will need to be "
 "restarted in order for any changes to be noticed.</p>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:198
+#: kcmfontinst/JobRunner.cpp:210
 msgid "Do not show this message again"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:273
+#: kcmfontinst/JobRunner.cpp:310
 msgid "Installing"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:276
+#: kcmfontinst/JobRunner.cpp:313
 msgid "Uninstalling"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:279
+#: kcmfontinst/JobRunner.cpp:316 kcmfontinst/JobRunner.cpp:422
 msgid "Enabling"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:282
+#: kcmfontinst/JobRunner.cpp:319 kcmfontinst/JobRunner.cpp:428
 msgid "Moving"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:285
+#: kcmfontinst/JobRunner.cpp:322
 msgid "Updating"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:288
+#: kcmfontinst/JobRunner.cpp:326
 msgid "Removing"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:292
+#: kcmfontinst/JobRunner.cpp:330
 msgid "Disabling"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:330
+#: kcmfontinst/JobRunner.cpp:370
 msgid "Updating font configuration. Please wait..."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:399
+#: kcmfontinst/JobRunner.cpp:451
 msgid "Unable to start backend."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:409
+#: kcmfontinst/JobRunner.cpp:461
 msgid "Backend died, but has been restarted. Please try again."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:587 kcmfontinst/JobRunner.cpp:593
+#: kcmfontinst/JobRunner.cpp:639 kcmfontinst/JobRunner.cpp:645
 msgid "<h3>Error</h3>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:589
+#: kcmfontinst/JobRunner.cpp:641
 msgid "Skip"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:590
+#: kcmfontinst/JobRunner.cpp:642
 msgid "AutoSkip"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:651
+#: kcmfontinst/JobRunner.cpp:703
 #, kde-format
 msgid "Failed to download <i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:653
+#: kcmfontinst/JobRunner.cpp:705
 #, kde-format
 msgid "System backend died. Please try again.<br><i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:655
+#: kcmfontinst/JobRunner.cpp:707
 #, kde-format
 msgid ""
 "<i>%1</i> is a bitmap font, and these have been disabled on your system."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:657
+#: kcmfontinst/JobRunner.cpp:709
 #, kde-format
 msgid ""
 "<i>%1</i> contains the font <b>%2</b>, which is already installed on your "
 "system."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:660
+#: kcmfontinst/JobRunner.cpp:712
 #, kde-format
 msgid "<i>%1</i> is not a font."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:662
+#: kcmfontinst/JobRunner.cpp:714
 #, kde-format
 msgid "Could not remove all files associated with <i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:664
+#: kcmfontinst/JobRunner.cpp:716
 #, kde-format
 msgid "Failed to start the system daemon.<br><i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:666
+#: kcmfontinst/JobRunner.cpp:721 kio/KioFonts.cpp:809
 #, kde-format
 msgid "<i>%1</i> already exists."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:668
+#: kcmfontinst/JobRunner.cpp:724
 #, kde-format
 msgid "<i>%1</i> does not exist."
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:670
+#: kcmfontinst/JobRunner.cpp:726
 #, kde-format
 msgid "Permission denied.<br><i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:672
+#: kcmfontinst/JobRunner.cpp:728
 #, kde-format
 msgid "Unsupported action.<br><i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:674
+#: kcmfontinst/JobRunner.cpp:730
 #, kde-format
 msgid "Authentication failed.<br><i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/JobRunner.cpp:676
+#: kcmfontinst/JobRunner.cpp:732
 #, kde-format
 msgid "Unexpected error while processing: <i>%1</i>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:189
-msgid "KDE Font Installer"
-msgstr "Arsefydlydd Wynebfathau KDE"
+#: kcmfontinst/KCmFontInst.cpp:191
+msgid "KDE Font Manager"
+msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:190
+#: kcmfontinst/KCmFontInst.cpp:192
 msgid "(C) Craig Drummond, 2000 - 2009"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:191
+#: kcmfontinst/KCmFontInst.cpp:193
 msgid "Craig Drummond"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:191
+#: kcmfontinst/KCmFontInst.cpp:193
 msgid "Developer and maintainer"
 msgstr "Datblygiwr a chynhaliwr"
 
-#: kcmfontinst/KCmFontInst.cpp:225
+#: kcmfontinst/KCmFontInst.cpp:227
 msgid "Scan for Duplicate Fonts..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:229
+#: kcmfontinst/KCmFontInst.cpp:231
+msgid "Get New Fonts..."
+msgstr ""
+
+#: kcmfontinst/KCmFontInst.cpp:232
 msgid "Tools"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:242
+#: kcmfontinst/KCmFontInst.cpp:246
 msgid "Create a new group"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:250
+#: kcmfontinst/KCmFontInst.cpp:254
 msgid "Enable all disabled fonts in the current group"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:254
+#: kcmfontinst/KCmFontInst.cpp:258
 msgid "Disable all enabled fonts in the current group"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:281
+#: kcmfontinst/KCmFontInst.cpp:285
 msgid "This displays a preview of the selected font."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:297
+#: kcmfontinst/KCmFontInst.cpp:301
 msgid "Add..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:298
+#: kcmfontinst/KCmFontInst.cpp:302
 msgid "Install fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:302
+#: kcmfontinst/KCmFontInst.cpp:306
 msgid "Delete all selected fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:359
+#: kcmfontinst/KCmFontInst.cpp:364
 msgid "Change Preview Text..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:424
+#: kcmfontinst/KCmFontInst.cpp:432
 msgid ""
 "<h1>Font Installer</h1><p> This module allows you to install TrueType, "
 "Type1, and Bitmap fonts.</p><p>You may also install fonts using Konqueror: "
@@ -588,7 +600,7 @@
 "Konqueror a bydd hyn yn dangos eich wynebfathau arsefydliedig.  Er mwyn "
 "arsefydlu wynebfath, copiwch un i mewn i'r blygell addas.</p>"
 
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:438
 #, kde-format
 msgid ""
 "<h1>Font Installer</h1><p> This module allows you to install TrueType, "
@@ -599,241 +611,249 @@
 "wide fonts (available to all).</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:483
+#: kcmfontinst/KCmFontInst.cpp:497
 msgid "Add Fonts"
 msgstr "Ychwanegu Wynebfathau"
 
-#: kcmfontinst/KCmFontInst.cpp:606
+#: kcmfontinst/KCmFontInst.cpp:617
 msgid "Failed to save list of fonts to print."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:631
+#: kcmfontinst/KCmFontInst.cpp:642
 msgid "Failed to start font printer."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:637
+#: kcmfontinst/KCmFontInst.cpp:648
 msgid ""
 "There are no printable fonts.\n"
 "You can only print non-bitmap and enabled fonts."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:639
+#: kcmfontinst/KCmFontInst.cpp:650
 msgid "Cannot Print"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:654
+#: kcmfontinst/KCmFontInst.cpp:664
 msgid "You did not select anything to delete."
 msgstr "Ni ddewisoch rywbeth i'w ddileu."
 
-#: kcmfontinst/KCmFontInst.cpp:655
+#: kcmfontinst/KCmFontInst.cpp:665
 msgid "Nothing to Delete"
 msgstr "Dim byd i'w Dileu"
 
-#: kcmfontinst/KCmFontInst.cpp:671
+#: kcmfontinst/KCmFontInst.cpp:681
 #, kde-format
 msgid "<p>Do you really want to delete</p><p>'<b>%1</b>'?</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:673
+#: kcmfontinst/KCmFontInst.cpp:683
 msgid "Delete Font"
 msgstr "Dileu Wynebfath"
 
-#: kcmfontinst/KCmFontInst.cpp:677
+#: kcmfontinst/KCmFontInst.cpp:687
 #, kde-format
 msgid "Do you really want to delete this font?"
 msgid_plural "Do you really want to delete these %1 fonts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:680
+#: kcmfontinst/KCmFontInst.cpp:690
 msgid "Delete Fonts"
 msgstr "Dileu Wynebfathau"
 
-#: kcmfontinst/KCmFontInst.cpp:685
+#: kcmfontinst/KCmFontInst.cpp:695
 msgid "Deleting font(s)..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:700
+#: kcmfontinst/KCmFontInst.cpp:710
 msgid "You did not select anything to move."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:701
+#: kcmfontinst/KCmFontInst.cpp:711
 msgid "Nothing to Move"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:712
+#: kcmfontinst/KCmFontInst.cpp:722
 #, kde-format
-msgid "<p>Do you really want to move</p><p>'<b>%1</b>'?</p>"
+msgid ""
+"<p>Do you really want to move</p><p>'<b>%1</b>'</p><p>from <i>%2</i> to "
+"<i>%3</i>?</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:714
+#: kcmfontinst/KCmFontInst.cpp:727
 msgid "Move Font"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:714 kcmfontinst/KCmFontInst.cpp:721
+#: kcmfontinst/KCmFontInst.cpp:727 kcmfontinst/KCmFontInst.cpp:736
 msgid "Move"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:718
+#: kcmfontinst/KCmFontInst.cpp:731
 #, kde-format
-msgid "Do you really want to move this font?"
-msgid_plural "Do you really want to move these %1 fonts?"
+msgid ""
+"<p>Do you really want to move this font from <i>%2</i> to <i>%3</i>?</p>"
+msgid_plural ""
+"<p>Do you really want to move these %1 fonts from <i>%2</i> to <i>%3</i>?</p>"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:721
+#: kcmfontinst/KCmFontInst.cpp:736
 msgid "Move Fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:726
+#: kcmfontinst/KCmFontInst.cpp:741
 msgid "Moving font(s)..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:742
+#: kcmfontinst/KCmFontInst.cpp:757
 msgid "Export Group"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:766
+#: kcmfontinst/KCmFontInst.cpp:781
 msgid "No files?"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:769
+#: kcmfontinst/KCmFontInst.cpp:784
 #, kde-format
 msgid "Failed to open %1 for writing"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:788
+#: kcmfontinst/KCmFontInst.cpp:803
 msgid "Create New Group"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:789
+#: kcmfontinst/KCmFontInst.cpp:804
 msgid "Please enter the name of the new group:"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:790
+#: kcmfontinst/KCmFontInst.cpp:805
 msgid "New Group"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:817
+#: kcmfontinst/KCmFontInst.cpp:832
 msgid "Preview Text"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:818
+#: kcmfontinst/KCmFontInst.cpp:833
 msgid "Please enter new text:"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:858
+#: kcmfontinst/KCmFontInst.cpp:893
 msgid "Scanning font list..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:924
+#: kcmfontinst/KCmFontInst.cpp:959
 msgid "No fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:930
+#: kcmfontinst/KCmFontInst.cpp:965
 #, kde-format
 msgid "1 Font"
 msgid_plural "%1 Fonts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:934
+#: kcmfontinst/KCmFontInst.cpp:975
 #, kde-format
-msgid " (<img src=\"%1\" />%2 <img src=\"%3\" />%4 <img src=\"%5\" />%6)"
+msgid ""
+"<table><tr><td align=\"right\">Enabled:</td><td>%1</td></tr><tr><td "
+"align=\"right\">Disabled:</td><td>%2</td></tr><tr><td "
+"align=\"right\">Partially enabled:</td><td>%3</td></tr><tr><td "
+"align=\"right\">Total:</td><td>%4</td></tr></table>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:941
+#: kcmfontinst/KCmFontInst.cpp:981
 #, kde-format
 msgid ""
-"<table><tr><td>Enabled fonts:</td><td>%1</td></tr><tr><td>Disabled "
-"fonts:</td><td>%2</td></tr><tr><td>Partially enabled "
-"fonts:</td><td>%3</td></tr><tr><td>Total fonts:</td><td>%4</td></tr></table>"
+"<table><tr><td align=\"right\">Enabled:</td><td>%1</td></tr><tr><td "
+"align=\"right\">Disabled:</td><td>%2</td></tr><tr><td "
+"align=\"right\">Total:</td><td>%3</td></tr></table>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1018
+#: kcmfontinst/KCmFontInst.cpp:1057
 msgid "Looking for any associated files..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1022
+#: kcmfontinst/KCmFontInst.cpp:1061
 msgid "Scanning Files..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1023
+#: kcmfontinst/KCmFontInst.cpp:1062
 msgid "Looking for additional files to install..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1040
+#: kcmfontinst/KCmFontInst.cpp:1079
 #, kde-format
 msgid "Looking for files associated with %1"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1067
+#: kcmfontinst/KCmFontInst.cpp:1106
 msgid "Installing font(s)..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1133
+#: kcmfontinst/KCmFontInst.cpp:1172
 msgid "You did not select anything to enable."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1134
+#: kcmfontinst/KCmFontInst.cpp:1173
 msgid "You did not select anything to disable."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1135
+#: kcmfontinst/KCmFontInst.cpp:1174
 msgid "Nothing to Enable"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1135
+#: kcmfontinst/KCmFontInst.cpp:1174
 msgid "Nothing to Disable"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1152
+#: kcmfontinst/KCmFontInst.cpp:1191
 #, kde-format
 msgid "<p>Do you really want to enable</p><p>'<b>%1</b>'?</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1154
+#: kcmfontinst/KCmFontInst.cpp:1193
 #, kde-format
 msgid "<p>Do you really want to disable</p><p>'<b>%1</b>'?</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1156
+#: kcmfontinst/KCmFontInst.cpp:1195
 #, kde-format
 msgid ""
 "<p>Do you really want to enable</p><p>'<b>%1</b>', contained within group "
 "'<b>%2</b>'?</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1160
+#: kcmfontinst/KCmFontInst.cpp:1199
 #, kde-format
 msgid ""
 "<p>Do you really want to disable</p><p>'<b>%1</b>', contained within group "
 "'<b>%2</b>'?</p>"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1164 kcmfontinst/KCmFontInst.cpp:1165
+#: kcmfontinst/KCmFontInst.cpp:1203 kcmfontinst/KCmFontInst.cpp:1204
 msgid "Enable Font"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1164 kcmfontinst/KCmFontInst.cpp:1166
+#: kcmfontinst/KCmFontInst.cpp:1203 kcmfontinst/KCmFontInst.cpp:1205
 msgid "Disable Font"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1171
+#: kcmfontinst/KCmFontInst.cpp:1210
 #, kde-format
 msgid "Do you really want to enable this font?"
 msgid_plural "Do you really want to enable these %1 fonts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:1174
+#: kcmfontinst/KCmFontInst.cpp:1213
 #, kde-format
 msgid "Do you really want to disable this font?"
 msgid_plural "Do you really want to disable these %1 fonts?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:1177
+#: kcmfontinst/KCmFontInst.cpp:1216
 #, kde-format
 msgid ""
 "<p>Do you really want to enable this font contained within group "
@@ -844,7 +864,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:1182
+#: kcmfontinst/KCmFontInst.cpp:1221
 #, kde-format
 msgid ""
 "<p>Do you really want to disable this font contained within group "
@@ -855,19 +875,19 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcmfontinst/KCmFontInst.cpp:1188 kcmfontinst/KCmFontInst.cpp:1189
+#: kcmfontinst/KCmFontInst.cpp:1227 kcmfontinst/KCmFontInst.cpp:1228
 msgid "Enable Fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1188 kcmfontinst/KCmFontInst.cpp:1190
+#: kcmfontinst/KCmFontInst.cpp:1227 kcmfontinst/KCmFontInst.cpp:1229
 msgid "Disable Fonts"
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1196
+#: kcmfontinst/KCmFontInst.cpp:1235
 msgid "Enabling font(s)..."
 msgstr ""
 
-#: kcmfontinst/KCmFontInst.cpp:1198
+#: kcmfontinst/KCmFontInst.cpp:1237
 msgid "Disabling font(s)..."
 msgstr ""
 
@@ -903,78 +923,78 @@
 msgid "48pt"
 msgstr ""
 
-#: kio/KioFonts.cpp:228
+#: kio/KioFonts.cpp:227
 #, kde-format
 msgid "Can only install fonts to either \"%1\" or \"%2\"."
 msgstr ""
 
-#: kio/KioFonts.cpp:231
+#: kio/KioFonts.cpp:230
 #, kde-format
 msgid ""
 "You cannot install a fonts package directly.\n"
 "Please extract %1, and install the components individually."
 msgstr ""
 
-#: kio/KioFonts.cpp:479
+#: kio/KioFonts.cpp:478
 msgid "Cannot copy fonts"
 msgstr ""
 
-#: kio/KioFonts.cpp:484
+#: kio/KioFonts.cpp:483
 msgid "Cannot move fonts"
 msgstr ""
 
-#: kio/KioFonts.cpp:495
+#: kio/KioFonts.cpp:494
 msgid "Only fonts may be deleted."
 msgstr ""
 
-#: kio/KioFonts.cpp:498
+#: kio/KioFonts.cpp:497
 #, kde-format
 msgid "Can only remove fonts from either \"%1\" or \"%2\"."
 msgstr ""
 
-#: kio/KioFonts.cpp:528
+#: kio/KioFonts.cpp:527
 #, kde-format
 msgid "Please specify \"%1\" or \"%2\"."
 msgstr "Penodwch \"%1\" neu \"%2\"."
 
-#: kio/KioFonts.cpp:552
+#: kio/KioFonts.cpp:551
 msgid "No special methods supported."
 msgstr ""
 
-#: kio/KioFonts.cpp:632
+#: kio/KioFonts.cpp:631
 msgid "Fonts"
 msgstr ""
 
-#: kio/KioFonts.cpp:786
+#: kio/KioFonts.cpp:785
 msgid "Failed to start the system daemon"
 msgstr ""
 
-#: kio/KioFonts.cpp:789
+#: kio/KioFonts.cpp:788
 msgid "Backend died"
 msgstr ""
 
-#: kio/KioFonts.cpp:793
+#: kio/KioFonts.cpp:792
 #, kde-format
 msgid "%1 is a bitmap font, and these have been disabled on your system."
 msgstr ""
 
-#: kio/KioFonts.cpp:797
+#: kio/KioFonts.cpp:796
 #, kde-format
 msgid ""
 "%1 contains the font <b>%2</b>, which is already installed on your system."
 msgstr ""
 
-#: kio/KioFonts.cpp:801
+#: kio/KioFonts.cpp:800
 #, kde-format
 msgid "%1 is not a font."
 msgstr ""
 
-#: kio/KioFonts.cpp:804
+#: kio/KioFonts.cpp:803
 #, kde-format
 msgid "Could not remove all files associated with %1"
 msgstr ""
 
-#: lib/Fc.cpp:421 lib/KfiConstants.h:135
+#: lib/Fc.cpp:421 lib/KfiConstants.h:128
 msgid "Unknown"
 msgstr ""
 
@@ -1144,23 +1164,23 @@
 msgid "Separator, Space"
 msgstr ""
 
-#: viewpart/CharTip.cpp:172
+#: viewpart/CharTip.cpp:174
 msgid "Category"
 msgstr ""
 
-#: viewpart/CharTip.cpp:174
+#: viewpart/CharTip.cpp:176
 msgid "UCS-4"
 msgstr ""
 
-#: viewpart/CharTip.cpp:178
+#: viewpart/CharTip.cpp:180
 msgid "UTF-16"
 msgstr ""
 
-#: viewpart/CharTip.cpp:189
+#: viewpart/CharTip.cpp:191
 msgid "UTF-8"
 msgstr ""
 
-#: viewpart/CharTip.cpp:206
+#: viewpart/CharTip.cpp:208
 msgid "XML Decimal Entity"
 msgstr ""
 
@@ -1176,19 +1196,19 @@
 msgid "Change Text..."
 msgstr "Newid Testun ..."
 
-#: viewpart/FontViewPart.cpp:387
+#: viewpart/FontViewPart.cpp:389
 msgid "Could not read font."
 msgstr ""
 
-#: viewpart/FontViewPart.cpp:434
+#: viewpart/FontViewPart.cpp:436
 msgid "Preview String"
 msgstr "LLinyn Rhagolwg"
 
-#: viewpart/FontViewPart.cpp:435
+#: viewpart/FontViewPart.cpp:437
 msgid "Please enter new string:"
 msgstr "Rhowch llinyn newydd:"
 
-#: viewpart/FontViewPart.cpp:535
+#: viewpart/FontViewPart.cpp:530
 msgid "<p>No information</p>"
 msgstr ""
 
@@ -1214,131 +1234,131 @@
 msgid "Unicode Script: %1"
 msgstr ""
 
-#: lib/KfiConstants.h:47
+#: lib/KfiConstants.h:40
 msgid "Personal"
 msgstr ""
 
-#: lib/KfiConstants.h:48
+#: lib/KfiConstants.h:41
 msgid "System"
 msgstr ""
 
-#: lib/KfiConstants.h:49
+#: lib/KfiConstants.h:42
 msgid "All"
 msgstr ""
 
-#: lib/KfiConstants.h:63
+#: lib/KfiConstants.h:56
 msgid "Administrator"
 msgstr ""
 
-#: lib/KfiConstants.h:102
+#: lib/KfiConstants.h:95
 msgid "Thin"
 msgstr ""
 
-#: lib/KfiConstants.h:103
+#: lib/KfiConstants.h:96
 msgid "Extra Light"
 msgstr ""
 
-#: lib/KfiConstants.h:104
+#: lib/KfiConstants.h:97
 msgid "Ultra Light"
 msgstr ""
 
-#: lib/KfiConstants.h:105
+#: lib/KfiConstants.h:98
 msgid "Light"
 msgstr ""
 
-#: lib/KfiConstants.h:106
+#: lib/KfiConstants.h:99
 msgid "Regular"
 msgstr ""
 
-#: lib/KfiConstants.h:107 lib/KfiConstants.h:125
+#: lib/KfiConstants.h:100 lib/KfiConstants.h:118
 msgid "Normal"
 msgstr ""
 
-#: lib/KfiConstants.h:108
+#: lib/KfiConstants.h:101
 msgid "Medium"
 msgstr ""
 
-#: lib/KfiConstants.h:109
+#: lib/KfiConstants.h:102
 msgid "Demi Bold"
 msgstr ""
 
-#: lib/KfiConstants.h:110
+#: lib/KfiConstants.h:103
 msgid "Semi Bold"
 msgstr ""
 
-#: lib/KfiConstants.h:111
+#: lib/KfiConstants.h:104
 msgid "Bold"
 msgstr ""
 
-#: lib/KfiConstants.h:112
+#: lib/KfiConstants.h:105
 msgid "Extra Bold"
 msgstr ""
 
-#: lib/KfiConstants.h:113
+#: lib/KfiConstants.h:106
 msgid "Ultra Bold"
 msgstr ""
 
-#: lib/KfiConstants.h:114
+#: lib/KfiConstants.h:107
 msgid "Black"
 msgstr ""
 
-#: lib/KfiConstants.h:115
+#: lib/KfiConstants.h:108
 msgid "Heavy"
 msgstr ""
 
-#: lib/KfiConstants.h:117
+#: lib/KfiConstants.h:110
 msgid "Roman"
 msgstr ""
 
-#: lib/KfiConstants.h:118
+#: lib/KfiConstants.h:111
 msgid "Italic"
 msgstr ""
 
-#: lib/KfiConstants.h:119
+#: lib/KfiConstants.h:112
 msgid "Oblique"
 msgstr ""
 
-#: lib/KfiConstants.h:121
+#: lib/KfiConstants.h:114
 msgid "Ultra Condensed"
 msgstr ""
 
-#: lib/KfiConstants.h:122
+#: lib/KfiConstants.h:115
 msgid "Extra Condensed"
 msgstr ""
 
-#: lib/KfiConstants.h:123
+#: lib/KfiConstants.h:116
 msgid "Condensed"
 msgstr ""
 
-#: lib/KfiConstants.h:124
+#: lib/KfiConstants.h:117
 msgid "Semi Condensed"
 msgstr ""
 
-#: lib/KfiConstants.h:126
+#: lib/KfiConstants.h:119
 msgid "Semi Expanded"
 msgstr ""
 
-#: lib/KfiConstants.h:127
+#: lib/KfiConstants.h:120
 msgid "Expanded"
 msgstr ""
 
-#: lib/KfiConstants.h:128
+#: lib/KfiConstants.h:121
 msgid "Extra Expanded"
 msgstr ""
 
-#: lib/KfiConstants.h:129
+#: lib/KfiConstants.h:122
 msgid "Ultra Expanded"
 msgstr ""
 
-#: lib/KfiConstants.h:131
+#: lib/KfiConstants.h:124
 msgid "Monospaced"
 msgstr ""
 
-#: lib/KfiConstants.h:132
+#: lib/KfiConstants.h:125
 msgid "Charcell"
 msgstr ""
 
-#: lib/KfiConstants.h:133
+#: lib/KfiConstants.h:126
 msgid "Proportional"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfourinline.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfourinline.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kfourinline.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kfourinline.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kwin4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:47+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: chatdlg.cpp:44
 msgid "Chat Dlg"
@@ -67,13 +67,13 @@
 msgstr ""
 
 #. i18n: file: kwin4.kcfg:32
-#: kwin4.cpp:82 rc.cpp:30 rc.cpp:289
+#: kwin4.cpp:82 rc.cpp:143
 msgctxt "default name of first player"
 msgid "Player 1"
 msgstr ""
 
 #. i18n: file: kwin4.kcfg:39
-#: kwin4.cpp:83 rc.cpp:34 rc.cpp:293
+#: kwin4.cpp:83 rc.cpp:148
 msgctxt "default name of second player"
 msgid "Player 2"
 msgstr ""
@@ -237,71 +237,69 @@
 msgid "Run game in demo (autoplay) mode"
 msgstr ""
 
-#: rc.cpp:147
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: dylunio, KD, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:148
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kfourinlineui.rc:10
 #. i18n: ectx: Menu (game)
-#: rc.cpp:3 rc.cpp:151
+#: rc.cpp:5
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: kfourinlineui.rc:18
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:6 rc.cpp:154
+#: rc.cpp:8
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: kfourinlineui.rc:24
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:9 rc.cpp:157
+#: rc.cpp:11
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: settings.ui:38
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:38 rc.cpp:160
+#: rc.cpp:14
 msgid "Computer Difficulty"
 msgstr "Anhawster Cyfrifiadurol"
 
-#. i18n: file: kwin4.kcfg:21
-#. i18n: ectx: label, entry (level), group (Parameter)
 #. i18n: file: settings.ui:50
 #. i18n: ectx: property (whatsThis), widget (QSlider, kcfg_level)
 #. i18n: file: kwin4.kcfg:21
 #. i18n: ectx: label, entry (level), group (Parameter)
-#: rc.cpp:21 rc.cpp:41 rc.cpp:163 rc.cpp:280
+#: rc.cpp:17 rc.cpp:134
 msgid "Change the strength of the computer player."
 msgstr "Newid nerth y chwaraewr cyfrifiadurol."
 
 #. i18n: file: settings.ui:83
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:44 rc.cpp:166
+#: rc.cpp:20
 msgid "Easy"
 msgstr "Hawdd"
 
 #. i18n: file: settings.ui:90
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:47 rc.cpp:169
+#: rc.cpp:23
 msgid "Hard"
 msgstr "Anodd"
 
 #. i18n: file: settings.ui:102
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_learning)
-#: rc.cpp:50 rc.cpp:172
+#: rc.cpp:26
 msgid "Use AI learning"
 msgstr ""
 
 #. i18n: file: settings.ui:112
 #. i18n: ectx: property (title), widget (QGroupBox, Input1)
-#: rc.cpp:53 rc.cpp:175
+#: rc.cpp:29
 msgid "Red Plays With"
 msgstr "Mae Coch yn Chwarae efo"
 
@@ -309,11 +307,7 @@
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_input1mouse)
 #. i18n: file: settings.ui:181
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_input0mouse)
-#. i18n: file: settings.ui:132
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_input1mouse)
-#. i18n: file: settings.ui:181
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_input0mouse)
-#: rc.cpp:56 rc.cpp:68 rc.cpp:178 rc.cpp:190
+#: rc.cpp:32 rc.cpp:44
 msgid "Mouse"
 msgstr "Llygoden"
 
@@ -321,11 +315,7 @@
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_input1key)
 #. i18n: file: settings.ui:191
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_input0key)
-#. i18n: file: settings.ui:142
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_input1key)
-#. i18n: file: settings.ui:191
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_input0key)
-#: rc.cpp:59 rc.cpp:71 rc.cpp:181 rc.cpp:193
+#: rc.cpp:35 rc.cpp:47
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
@@ -333,59 +323,55 @@
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_input1ai)
 #. i18n: file: settings.ui:198
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_input0ai)
-#. i18n: file: settings.ui:149
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_input1ai)
-#. i18n: file: settings.ui:198
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_input0ai)
-#: rc.cpp:62 rc.cpp:74 rc.cpp:184 rc.cpp:196
+#: rc.cpp:38 rc.cpp:50
 msgid "Computer"
 msgstr "Cyfrifiadur"
 
 #. i18n: file: settings.ui:161
 #. i18n: ectx: property (title), widget (QGroupBox, Input0)
-#: rc.cpp:65 rc.cpp:187
+#: rc.cpp:41
 msgid "Black Plays With"
 msgstr ""
 
 #. i18n: file: settings.ui:216
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:77 rc.cpp:199
+#: rc.cpp:53
 msgid "Player Names"
 msgstr "Enwau Chwaraewyr"
 
 #. i18n: file: settings.ui:242
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:80 rc.cpp:202
+#: rc.cpp:56
 msgid "Player 1:"
 msgstr "Chwaraewr 1:"
 
 #. i18n: file: settings.ui:249
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:83 rc.cpp:205
+#: rc.cpp:59
 msgid "Player 2:"
 msgstr "Chwaraewr 2:"
 
 #. i18n: file: settings.ui:267
 #. i18n: ectx: property (title), widget (QGroupBox, StartColour)
-#: rc.cpp:86 rc.cpp:208
+#: rc.cpp:62
 msgid "Starting Player Color"
 msgstr "Lliw Cychwynnol y Chwaraewr"
 
 #. i18n: file: settings.ui:287
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_startcolourred)
-#: rc.cpp:89 rc.cpp:211
+#: rc.cpp:65
 msgid "Red"
 msgstr "Coch"
 
 #. i18n: file: settings.ui:297
 #. i18n: ectx: property (text), widget (QRadioButton, kcfg_startcolouryellow)
-#: rc.cpp:92 rc.cpp:214
+#: rc.cpp:68
 msgid "Black"
 msgstr ""
 
 #. i18n: file: statistics.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, Statistics)
-#: rc.cpp:95 rc.cpp:217
+#: rc.cpp:71
 msgid "Statistics"
 msgstr "Ystadegau"
 
@@ -393,53 +379,49 @@
 #. i18n: ectx: property (text), widget (QLabel, p1_name)
 #. i18n: file: statuswidget.ui:113
 #. i18n: ectx: property (text), widget (QLabel, p1_name)
-#. i18n: file: statistics.ui:57
-#. i18n: ectx: property (text), widget (QLabel, p1_name)
-#. i18n: file: statuswidget.ui:113
-#. i18n: ectx: property (text), widget (QLabel, p1_name)
-#: rc.cpp:98 rc.cpp:143 rc.cpp:220 rc.cpp:265
+#: rc.cpp:74 rc.cpp:119
 msgid "Player 1"
 msgstr "Chwaraewr 1"
 
 #. i18n: file: statistics.ui:64
 #. i18n: ectx: property (text), widget (QLabel, Name)
-#: rc.cpp:101 rc.cpp:223
+#: rc.cpp:77
 msgid "Name"
 msgstr "Enw"
 
 #. i18n: file: statistics.ui:74
 #. i18n: ectx: property (text), widget (QLabel, won)
-#: rc.cpp:104 rc.cpp:226
+#: rc.cpp:80
 msgid "Won"
 msgstr "Wedi Ennill"
 
 #. i18n: file: statistics.ui:87
 #. i18n: ectx: property (text), widget (QLabel, lost)
-#: rc.cpp:107 rc.cpp:229
+#: rc.cpp:83
 msgid "Lost"
 msgstr "Wedi Colli"
 
 #. i18n: file: statistics.ui:103
 #. i18n: ectx: property (text), widget (QLabel, sum)
-#: rc.cpp:110 rc.cpp:232
+#: rc.cpp:86
 msgid "Sum"
 msgstr "Swm"
 
 #. i18n: file: statistics.ui:113
 #. i18n: ectx: property (text), widget (QLabel, aborted)
-#: rc.cpp:113 rc.cpp:235
+#: rc.cpp:89
 msgid "Aborted"
 msgstr "Terfynwyd"
 
 #. i18n: file: statistics.ui:131
 #. i18n: ectx: property (text), widget (QPushButton, pushButton1)
-#: rc.cpp:116 rc.cpp:238
+#: rc.cpp:92
 msgid "Clear All Statistics"
 msgstr "Gwagu'r Holl Ystadegau"
 
 #. i18n: file: statistics.ui:154
 #. i18n: ectx: property (text), widget (QPushButton, pushButton2)
-#: rc.cpp:119 rc.cpp:241
+#: rc.cpp:95
 msgid "&Close"
 msgstr ""
 
@@ -447,77 +429,73 @@
 #. i18n: ectx: property (text), widget (QLabel, p2_name)
 #. i18n: file: statuswidget.ui:220
 #. i18n: ectx: property (text), widget (QLabel, p2_name)
-#. i18n: file: statistics.ui:166
-#. i18n: ectx: property (text), widget (QLabel, p2_name)
-#. i18n: file: statuswidget.ui:220
-#. i18n: ectx: property (text), widget (QLabel, p2_name)
-#: rc.cpp:122 rc.cpp:146 rc.cpp:244 rc.cpp:268
+#: rc.cpp:98 rc.cpp:122
 msgid "Player 2"
 msgstr "Chwaraewr 2"
 
 #. i18n: file: statistics.ui:176
 #. i18n: ectx: property (text), widget (QLabel, drawn)
-#: rc.cpp:125 rc.cpp:247
+#: rc.cpp:101
 msgid "Drawn"
 msgstr "Cyfartal"
 
 #. i18n: file: statuswidget.ui:63
 #. i18n: ectx: property (text), widget (QLabel, wins)
-#: rc.cpp:128 rc.cpp:250
+#: rc.cpp:104
 msgid "W"
 msgstr "W"
 
 #. i18n: file: statuswidget.ui:73
 #. i18n: ectx: property (text), widget (QLabel, draws)
-#: rc.cpp:131 rc.cpp:253
+#: rc.cpp:107
 msgid "D"
 msgstr "D"
 
 #. i18n: file: statuswidget.ui:83
 #. i18n: ectx: property (text), widget (QLabel, loses)
-#: rc.cpp:134 rc.cpp:256
+#: rc.cpp:110
 msgid "L"
 msgstr "L"
 
 #. i18n: file: statuswidget.ui:93
 #. i18n: ectx: property (text), widget (QLabel, num)
-#: rc.cpp:137 rc.cpp:259
+#: rc.cpp:113
 msgid "No"
 msgstr ""
 
 #. i18n: file: statuswidget.ui:103
 #. i18n: ectx: property (text), widget (QLabel, bk)
-#: rc.cpp:140 rc.cpp:262
+#: rc.cpp:116
 msgid "Bk"
 msgstr "Bk"
 
 #. i18n: file: kwin4.kcfg:10
 #. i18n: ectx: label, entry (port), group (Parameter)
-#: rc.cpp:12 rc.cpp:271
+#: rc.cpp:125
 msgid "Network connection port"
 msgstr "Porth cysylltiad rhwydwaith"
 
 #. i18n: file: kwin4.kcfg:14
 #. i18n: ectx: label, entry (gamename), group (Parameter)
-#: rc.cpp:15 rc.cpp:274
+#: rc.cpp:128
 msgid "Game name"
 msgstr "Enw gêm"
 
 #. i18n: file: kwin4.kcfg:17
 #. i18n: ectx: label, entry (host), group (Parameter)
-#: rc.cpp:18 rc.cpp:277
+#: rc.cpp:131
 msgid "Network connection host"
 msgstr "Gweinydd cysylltiad rhwydwaith"
 
 #. i18n: file: kwin4.kcfg:28
 #. i18n: ectx: label, entry (Name1), group (Parameter)
-#: rc.cpp:24 rc.cpp:283
+#: rc.cpp:137
 msgid "Player 1 name"
 msgstr "Enw chwaraewr 1"
 
 #. i18n: file: kwin4.kcfg:35
 #. i18n: ectx: label, entry (Name2), group (Parameter)
-#: rc.cpp:27 rc.cpp:286
+#: rc.cpp:140
 msgid "Player 2 name"
 msgstr "Enw chwaraewr 2"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgeography.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgeography.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgeography.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgeography.po	2012-04-18 08:59:28.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: kgeography\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:36+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:38+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: answersdialog.cpp:24
 msgid "Your Answers Were"
@@ -35,12 +35,12 @@
 msgid "Correct Answer"
 msgstr "Ateb Cywir"
 
-#: askwidget.cpp:111
+#: askwidget.cpp:131
 #, kde-format
 msgid "Correct answers: %1/%2"
 msgstr "Atebion cywir: %1/%2"
 
-#: boxasker.cpp:132
+#: boxasker.cpp:254
 msgid "&Accept"
 msgstr "&Derbyn"
 
@@ -58,7 +58,7 @@
 msgstr ""
 
 #: divisioncapitalasker.cpp:32 divisionflagasker.cpp:34 mapasker.cpp:154
-#: placeasker.cpp:118
+#: placeasker.cpp:188
 #, kde-format
 msgctxt "@item:intable column Question, %1 is region name"
 msgid "%1"
@@ -100,11 +100,11 @@
 msgid "%1 by Flag"
 msgstr ""
 
-#: kgeography.cpp:61
+#: kgeography.cpp:63
 msgid "E&xplore Map"
 msgstr ""
 
-#: kgeography.cpp:62
+#: kgeography.cpp:64
 msgid ""
 "In this section left click on any part of the map to learn about the "
 "divisions"
@@ -112,15 +112,15 @@
 "Yn yr adran yma, cliciwch ar unrhyw ran o'r map er mwyn dysgu am y "
 "rhanbarthau"
 
-#: kgeography.cpp:63
+#: kgeography.cpp:65
 msgid "Test Yourself:"
 msgstr ""
 
-#: kgeography.cpp:65
+#: kgeography.cpp:67
 msgid "&Location of Regions"
 msgstr ""
 
-#: kgeography.cpp:66
+#: kgeography.cpp:68
 msgid ""
 "In this challenge you are given a division name on the left under the menu "
 "and you must find it on the map and click on it"
@@ -128,124 +128,128 @@
 "Yn yr her yma, rhoddir enw rhanbarth ar y chwith dan y ddewislen, a rhaid i "
 "chi ei ganfod ar y map a clicio arnodd"
 
-#: kgeography.cpp:67
+#: kgeography.cpp:69
 msgid "&Place Regions in the Map"
 msgstr ""
 
-#: kgeography.cpp:68
+#: kgeography.cpp:70
 msgid ""
 "In this challenge you are given the shape of a region and you must place it "
 "on the map"
 msgstr ""
 
-#: kgeography.cpp:69
+#: kgeography.cpp:71
 msgid "&Regions by Capital"
 msgstr ""
 
-#: kgeography.cpp:70
+#: kgeography.cpp:72
 msgid "In this quiz you have to guess the division name given its capital"
 msgstr ""
 "Yn y pôs yma, rhaid i chi ddyfalu enw'r rhanbarth pan roddir ei brifddinas"
 
-#: kgeography.cpp:71
+#: kgeography.cpp:73
 msgid "&Capitals of Regions"
 msgstr ""
 
-#: kgeography.cpp:72
+#: kgeography.cpp:74
 msgid "In this quiz you have to guess the capital of a given division name"
 msgstr "Yn y pôs yma, rhaid i chi ddyfalu prifddinas y rhanbarth penodol"
 
-#: kgeography.cpp:73
+#: kgeography.cpp:75
 msgid "Re&gions by Flag"
 msgstr ""
 
-#: kgeography.cpp:74
+#: kgeography.cpp:76
 msgid "In this quiz you have to guess the division name given its flag"
 msgstr ""
 "Yn y pôs yma, rhaid i chi ddyfalu enw'r rhanbarth pan roddir ei faner"
 
-#: kgeography.cpp:75
+#: kgeography.cpp:77
 msgid "&Flags of Regions"
 msgstr ""
 
-#: kgeography.cpp:76
+#: kgeography.cpp:78
 msgid "In this quiz you have to guess the flag of a division given its name"
 msgstr ""
 "Yn y pôs yma, rhaid i chi ddyfalu baner y rhanbarth pan roddir ei enw"
 
-#: kgeography.cpp:105
+#: kgeography.cpp:107
 msgid "&Open Map..."
 msgstr "&Agor Map..."
 
-#: kgeography.cpp:110
+#: kgeography.cpp:112
 msgid "&Zoom"
 msgstr ""
 
-#: kgeography.cpp:115
+#: kgeography.cpp:117
 msgid "&Original Size"
 msgstr "&Maint Gwreiddiol"
 
-#: kgeography.cpp:120
+#: kgeography.cpp:122
 msgid "&Automatic Zoom"
 msgstr ""
 
-#: kgeography.cpp:125
+#: kgeography.cpp:127
 msgid "&Move"
 msgstr "Sy&mud"
 
-#: kgeography.cpp:130 kgeography.cpp:402
+#: kgeography.cpp:132 kgeography.cpp:440
 msgid "Disclaimer"
 msgstr "Ymwadiad"
 
-#: kgeography.cpp:134
+#: kgeography.cpp:136
 msgid "Map author"
 msgstr ""
 
-#: kgeography.cpp:165
+#: kgeography.cpp:166
+msgid "General"
+msgstr ""
+
+#: kgeography.cpp:200
 #, kde-format
 msgid "Could not open last used map. Error parsing %1: %2"
 msgstr ""
 "Methu agor y map diwethaf a gafodd ei ddefnyddio.  Gwall wrth ddosrannu %1:%2"
 
-#: kgeography.cpp:173
+#: kgeography.cpp:208
 msgid "There is no current map"
 msgstr "Nid oes map cyfredol"
 
-#: kgeography.cpp:224
+#: kgeography.cpp:259
 msgid "Number of Questions"
 msgstr "Nifer Cwestiynau"
 
-#: kgeography.cpp:225
+#: kgeography.cpp:260
 #, kde-format
 msgid "How many questions do you want? (1 to %1)"
 msgstr "Faint o gwestiynau ydych eisiau? (1 i %1)"
 
-#: kgeography.cpp:380
+#: kgeography.cpp:418
 #, kde-format
 msgid "&Location of %1"
 msgstr ""
 
-#: kgeography.cpp:381
+#: kgeography.cpp:419
 #, kde-format
 msgid "&Place %1 in the Map"
 msgstr ""
 
-#: kgeography.cpp:384
+#: kgeography.cpp:422
 #, kde-format
 msgid "%1 by Flag"
 msgstr ""
 
-#: kgeography.cpp:385
+#: kgeography.cpp:423
 #, kde-format
 msgid "&Flags of %1"
 msgstr ""
 
-#: kgeography.cpp:387
+#: kgeography.cpp:425
 #, kde-format
 msgid "<qt>Current map:<br /><b>%1</b></qt>"
 msgstr ""
 
-#: kgeography.cpp:401
+#: kgeography.cpp:439
 msgid ""
 "Maps, flags, translations, etc. are as accurate as their respective authors "
 "could achieve, but KGeography should not be taken as an authoritative source."
@@ -253,12 +257,12 @@
 "Mae mapiau, baneri, cyfieithiadau, ayyb mor cywir ac y gallent eu hawduron "
 "gyflawni, ond ni ddylid cymryd KGeography fel ffynhonell awdurdodol."
 
-#: kgeography.cpp:409
+#: kgeography.cpp:447
 #, kde-format
 msgid "This map has been created by %1."
 msgstr ""
 
-#: kgeography.cpp:409
+#: kgeography.cpp:447
 msgid "Map Author"
 msgstr ""
 
@@ -290,23 +294,7 @@
 msgid "Got some flags from it"
 msgstr "Wedi cael rhai baneri ganddo"
 
-#: map.cpp:25
-#, kde-format
-msgctxt "@title:group"
-msgid "%1 is the capital of..."
-msgstr ""
-
-#: map.cpp:26
-#, kde-format
-msgctxt "@title:group"
-msgid "The capital of %1 is..."
-msgstr ""
-
-#: map.cpp:161
-msgid "Regions"
-msgstr ""
-
-#: mapasker.cpp:120 placeasker.cpp:96
+#: mapasker.cpp:120 placeasker.cpp:97
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -338,19 +326,35 @@
 msgid "%1 in Map"
 msgstr ""
 
-#: mapchooser.cpp:31
+#: mapchooser.cpp:33
 msgid "Choose Map to Use"
 msgstr "Dewis Map i'w Ddefnyddio"
 
-#: mapchooser.cpp:54
+#: mapchooser.cpp:60
 #, kde-format
 msgid "Error parsing %1: %2"
 msgstr "Gwall wrth ddosrannu %1:%2"
 
-#: mapchooser.cpp:66
+#: mapchooser.cpp:80
 msgid "Error parsing"
 msgstr ""
 
+#: map.cpp:25
+#, kde-format
+msgctxt "@title:group"
+msgid "%1 is the capital of..."
+msgstr ""
+
+#: map.cpp:26
+#, kde-format
+msgctxt "@title:group"
+msgid "The capital of %1 is..."
+msgstr ""
+
+#: map.cpp:161
+msgid "Regions"
+msgstr ""
+
 #: mapparser.cpp:49
 #, kde-format
 msgid "The map image file for %1 does not exist"
@@ -363,7 +367,7 @@
 
 #: mapparser.cpp:93
 #, kde-format
-msgid "&Capitals of %1"
+msgid "Capitals of %1"
 msgstr ""
 
 #: mapparser.cpp:118
@@ -1230,32886 +1234,32936 @@
 
 #: mapsdatatranslation.cpp:185
 msgctxt "africa.kgm"
+msgid "South Sudan"
+msgstr ""
+
+#: mapsdatatranslation.cpp:186
+msgctxt "africa.kgm"
+msgid "Juba"
+msgstr ""
+
+#: mapsdatatranslation.cpp:187
+msgctxt "africa.kgm"
 msgid "Swaziland"
 msgstr "Gwlad y Swasi"
 
-#: mapsdatatranslation.cpp:186
+#: mapsdatatranslation.cpp:188
 msgctxt "africa.kgm"
 msgid "Mbabane"
 msgstr "Mbabane"
 
-#: mapsdatatranslation.cpp:187
+#: mapsdatatranslation.cpp:189
 msgctxt "africa.kgm"
 msgid "São Tomé and Príncipe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:188
+#: mapsdatatranslation.cpp:190
 msgctxt "africa.kgm"
 msgid "São Tomé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:189
+#: mapsdatatranslation.cpp:191
 msgctxt "africa.kgm"
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: mapsdatatranslation.cpp:190
+#: mapsdatatranslation.cpp:192
 msgctxt "africa.kgm"
 msgid "Dodoma"
 msgstr "Dodoma"
 
-#: mapsdatatranslation.cpp:191
+#: mapsdatatranslation.cpp:193
 msgctxt "africa.kgm"
 msgid "Togo"
 msgstr "Togo"
 
-#: mapsdatatranslation.cpp:192
+#: mapsdatatranslation.cpp:194
 msgctxt "africa.kgm"
 msgid "Lomé"
 msgstr "Lomé"
 
-#: mapsdatatranslation.cpp:193
+#: mapsdatatranslation.cpp:195
 msgctxt "africa.kgm"
 msgid "Tunisia"
 msgstr "Tiwnisia"
 
-#: mapsdatatranslation.cpp:194
+#: mapsdatatranslation.cpp:196
 msgctxt "africa.kgm"
 msgid "Tunis"
 msgstr "Tiwnis"
 
-#: mapsdatatranslation.cpp:195
+#: mapsdatatranslation.cpp:197
 msgctxt "africa.kgm"
 msgid "Uganda"
 msgstr "Wganda"
 
-#: mapsdatatranslation.cpp:196
+#: mapsdatatranslation.cpp:198
 msgctxt "africa.kgm"
 msgid "Kampala"
 msgstr "Campala"
 
-#: mapsdatatranslation.cpp:197
+#: mapsdatatranslation.cpp:199
 msgctxt "africa.kgm"
 msgid "Western Sahara"
 msgstr "Gorllewin Sahara"
 
-#: mapsdatatranslation.cpp:198
+#: mapsdatatranslation.cpp:200
 msgctxt "africa.kgm"
 msgid "El Aaiún"
 msgstr ""
 
-#: mapsdatatranslation.cpp:199
+#: mapsdatatranslation.cpp:201
 msgctxt "africa.kgm"
 msgid "Zambia"
 msgstr "Zambia"
 
-#: mapsdatatranslation.cpp:200
+#: mapsdatatranslation.cpp:202
 msgctxt "africa.kgm"
 msgid "Lusaka"
 msgstr "Lwsaca"
 
-#: mapsdatatranslation.cpp:201
+#: mapsdatatranslation.cpp:203
 msgctxt "africa.kgm"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: mapsdatatranslation.cpp:202
+#: mapsdatatranslation.cpp:204
 msgctxt "africa.kgm"
 msgid "Harare"
 msgstr "Harare"
 
-#: mapsdatatranslation.cpp:203
+#: mapsdatatranslation.cpp:205
 msgctxt "africa.kgm"
 msgid "Canary Islands (Spain)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:204
+#: mapsdatatranslation.cpp:206
 msgctxt "africa.kgm"
 msgid "Las Palmas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:205
+#: mapsdatatranslation.cpp:207
 msgctxt "africa.kgm"
 msgid "Madeira (Portugal)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:206
+#: mapsdatatranslation.cpp:208
 msgctxt "africa.kgm"
 msgid "Funchal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:207
+#: mapsdatatranslation.cpp:209
 msgctxt "africa.kgm"
 msgid "Réunion (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:208
+#: mapsdatatranslation.cpp:210
 msgctxt "africa.kgm"
 msgid "Saint Denis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:209
+#: mapsdatatranslation.cpp:211
 msgctxt "africa.kgm"
 msgid "Saint Helena (UK)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:210
+#: mapsdatatranslation.cpp:212
 msgctxt "africa.kgm"
 msgid "Jamestown"
 msgstr ""
 
-#: mapsdatatranslation.cpp:211
+#: mapsdatatranslation.cpp:213
 msgctxt "albania_districts.kgm"
 msgid "Albania (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:212
+#: mapsdatatranslation.cpp:214
 msgctxt "albania_districts.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:213 mapsdatatranslation.cpp:214
+#: mapsdatatranslation.cpp:215 mapsdatatranslation.cpp:216
 msgctxt "albania_districts.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:215
+#: mapsdatatranslation.cpp:217
 msgctxt "albania_districts.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:216
+#: mapsdatatranslation.cpp:218
 msgctxt "albania_districts.kgm"
 msgid "Not Albania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:217
+#: mapsdatatranslation.cpp:219
 msgctxt "albania_districts.kgm"
 msgid "Berat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:218
+#: mapsdatatranslation.cpp:220
 msgctxt "albania_districts.kgm"
 msgid "Bulqizë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:219
+#: mapsdatatranslation.cpp:221
 msgctxt "albania_districts.kgm"
 msgid "Delvinë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:220
+#: mapsdatatranslation.cpp:222
 msgctxt "albania_districts.kgm"
 msgid "Devoll"
 msgstr ""
 
-#: mapsdatatranslation.cpp:221
+#: mapsdatatranslation.cpp:223
 msgctxt "albania_districts.kgm"
 msgid "Dibër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:222
+#: mapsdatatranslation.cpp:224
 msgctxt "albania_districts.kgm"
 msgid "Durrës"
 msgstr ""
 
-#: mapsdatatranslation.cpp:223
+#: mapsdatatranslation.cpp:225
 msgctxt "albania_districts.kgm"
 msgid "Elbasan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:224
+#: mapsdatatranslation.cpp:226
 msgctxt "albania_districts.kgm"
 msgid "Fier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:225
+#: mapsdatatranslation.cpp:227
 msgctxt "albania_districts.kgm"
 msgid "Gjirokastër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:226
+#: mapsdatatranslation.cpp:228
 msgctxt "albania_districts.kgm"
 msgid "Gramsh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:227
+#: mapsdatatranslation.cpp:229
 msgctxt "albania_districts.kgm"
 msgid "Has"
 msgstr ""
 
-#: mapsdatatranslation.cpp:228
+#: mapsdatatranslation.cpp:230
 msgctxt "albania_districts.kgm"
 msgid "Kavajë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:229
+#: mapsdatatranslation.cpp:231
 msgctxt "albania_districts.kgm"
 msgid "Kolonjë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:230
+#: mapsdatatranslation.cpp:232
 msgctxt "albania_districts.kgm"
 msgid "Korçë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:231
+#: mapsdatatranslation.cpp:233
 msgctxt "albania_districts.kgm"
 msgid "Krujë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:232
+#: mapsdatatranslation.cpp:234
 msgctxt "albania_districts.kgm"
 msgid "Kuçovë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:233
+#: mapsdatatranslation.cpp:235
 msgctxt "albania_districts.kgm"
 msgid "Kukës"
 msgstr ""
 
-#: mapsdatatranslation.cpp:234
+#: mapsdatatranslation.cpp:236
 msgctxt "albania_districts.kgm"
 msgid "Kurbin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:235
+#: mapsdatatranslation.cpp:237
 msgctxt "albania_districts.kgm"
 msgid "Lezhë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:236
+#: mapsdatatranslation.cpp:238
 msgctxt "albania_districts.kgm"
 msgid "Librazhd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:237
+#: mapsdatatranslation.cpp:239
 msgctxt "albania_districts.kgm"
 msgid "Lushnjë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:238
+#: mapsdatatranslation.cpp:240
 msgctxt "albania_districts.kgm"
 msgid "Malësi e Madhe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:239
+#: mapsdatatranslation.cpp:241
 msgctxt "albania_districts.kgm"
 msgid "Mallakastër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:240
+#: mapsdatatranslation.cpp:242
 msgctxt "albania_districts.kgm"
 msgid "Mat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:241
+#: mapsdatatranslation.cpp:243
 msgctxt "albania_districts.kgm"
 msgid "Mirditë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:242
+#: mapsdatatranslation.cpp:244
 msgctxt "albania_districts.kgm"
 msgid "Peqin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:243
+#: mapsdatatranslation.cpp:245
 msgctxt "albania_districts.kgm"
 msgid "Përmet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:244
+#: mapsdatatranslation.cpp:246
 msgctxt "albania_districts.kgm"
 msgid "Pogradec"
 msgstr ""
 
-#: mapsdatatranslation.cpp:245
+#: mapsdatatranslation.cpp:247
 msgctxt "albania_districts.kgm"
 msgid "Pukë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:246
+#: mapsdatatranslation.cpp:248
 msgctxt "albania_districts.kgm"
 msgid "Sarandë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:247
+#: mapsdatatranslation.cpp:249
 msgctxt "albania_districts.kgm"
 msgid "Shkodër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:248
+#: mapsdatatranslation.cpp:250
 msgctxt "albania_districts.kgm"
 msgid "Skrapar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:249
+#: mapsdatatranslation.cpp:251
 msgctxt "albania_districts.kgm"
 msgid "Tepelenë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:250
+#: mapsdatatranslation.cpp:252
 msgctxt "albania_districts.kgm"
 msgid "Tiranë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:251
+#: mapsdatatranslation.cpp:253
 msgctxt "albania_districts.kgm"
 msgid "Tropojë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:252
+#: mapsdatatranslation.cpp:254
 msgctxt "albania_districts.kgm"
 msgid "Vlorë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:253
+#: mapsdatatranslation.cpp:255
 msgctxt "albania_prefectures.kgm"
 msgid "Albania (Prefectures)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:254
+#: mapsdatatranslation.cpp:256
 msgctxt "albania_prefectures.kgm"
 msgid "Prefectures"
 msgstr ""
 
-#: mapsdatatranslation.cpp:255 mapsdatatranslation.cpp:256
+#: mapsdatatranslation.cpp:257 mapsdatatranslation.cpp:258
 msgctxt "albania_prefectures.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:257
+#: mapsdatatranslation.cpp:259
 msgctxt "albania_prefectures.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:258
+#: mapsdatatranslation.cpp:260
 msgctxt "albania_prefectures.kgm"
 msgid "Not Albania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:259 mapsdatatranslation.cpp:260
+#: mapsdatatranslation.cpp:261 mapsdatatranslation.cpp:262
 msgctxt "albania_prefectures.kgm"
 msgid "Berat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:261
+#: mapsdatatranslation.cpp:263
 msgctxt "albania_prefectures.kgm"
 msgid "Dibër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:262
+#: mapsdatatranslation.cpp:264
 msgctxt "albania_prefectures.kgm"
 msgid "Peshkopi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:263 mapsdatatranslation.cpp:264
+#: mapsdatatranslation.cpp:265 mapsdatatranslation.cpp:266
 msgctxt "albania_prefectures.kgm"
 msgid "Durrès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:265 mapsdatatranslation.cpp:266
+#: mapsdatatranslation.cpp:267 mapsdatatranslation.cpp:268
 msgctxt "albania_prefectures.kgm"
 msgid "Elbasan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:267 mapsdatatranslation.cpp:268
+#: mapsdatatranslation.cpp:269 mapsdatatranslation.cpp:270
 msgctxt "albania_prefectures.kgm"
 msgid "Fier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:269 mapsdatatranslation.cpp:270
+#: mapsdatatranslation.cpp:271 mapsdatatranslation.cpp:272
 msgctxt "albania_prefectures.kgm"
 msgid "Gjirokastër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:271 mapsdatatranslation.cpp:272
+#: mapsdatatranslation.cpp:273 mapsdatatranslation.cpp:274
 msgctxt "albania_prefectures.kgm"
 msgid "Korçë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:273 mapsdatatranslation.cpp:274
+#: mapsdatatranslation.cpp:275 mapsdatatranslation.cpp:276
 msgctxt "albania_prefectures.kgm"
 msgid "Kukës"
 msgstr ""
 
-#: mapsdatatranslation.cpp:275 mapsdatatranslation.cpp:276
+#: mapsdatatranslation.cpp:277 mapsdatatranslation.cpp:278
 msgctxt "albania_prefectures.kgm"
 msgid "Lezhë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:277 mapsdatatranslation.cpp:278
+#: mapsdatatranslation.cpp:279 mapsdatatranslation.cpp:280
 msgctxt "albania_prefectures.kgm"
 msgid "Shkodër"
 msgstr ""
 
-#: mapsdatatranslation.cpp:279 mapsdatatranslation.cpp:280
+#: mapsdatatranslation.cpp:281 mapsdatatranslation.cpp:282
 msgctxt "albania_prefectures.kgm"
 msgid "Tirana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:281 mapsdatatranslation.cpp:282
+#: mapsdatatranslation.cpp:283 mapsdatatranslation.cpp:284
 msgctxt "albania_prefectures.kgm"
 msgid "Vlorë"
 msgstr ""
 
-#: mapsdatatranslation.cpp:283
+#: mapsdatatranslation.cpp:285
 msgctxt "algeria.kgm"
 msgid "Algeria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:284
+#: mapsdatatranslation.cpp:286
 msgctxt "algeria.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:285
+#: mapsdatatranslation.cpp:287
 msgctxt "algeria.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:286
+#: mapsdatatranslation.cpp:288
 msgctxt "algeria.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:287
+#: mapsdatatranslation.cpp:289
 msgctxt "algeria.kgm"
 msgid "Not Algeria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:288
+#: mapsdatatranslation.cpp:290
 msgctxt "algeria.kgm"
 msgid "Adrar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:289
+#: mapsdatatranslation.cpp:291
 msgctxt "algeria.kgm"
 msgid "Aïn Defla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:290
+#: mapsdatatranslation.cpp:292
 msgctxt "algeria.kgm"
 msgid "Aïn Témouchent"
 msgstr ""
 
-#: mapsdatatranslation.cpp:291
+#: mapsdatatranslation.cpp:293
 msgctxt "algeria.kgm"
 msgid "Algiers"
 msgstr ""
 
-#: mapsdatatranslation.cpp:292
+#: mapsdatatranslation.cpp:294
 msgctxt "algeria.kgm"
 msgid "Annaba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:293
+#: mapsdatatranslation.cpp:295
 msgctxt "algeria.kgm"
 msgid "Batna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:294
+#: mapsdatatranslation.cpp:296
 msgctxt "algeria.kgm"
 msgid "Béchar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:295
+#: mapsdatatranslation.cpp:297
 msgctxt "algeria.kgm"
 msgid "Béjaïa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:296
+#: mapsdatatranslation.cpp:298
 msgctxt "algeria.kgm"
 msgid "Biskra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:297
+#: mapsdatatranslation.cpp:299
 msgctxt "algeria.kgm"
 msgid "Blida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:298
+#: mapsdatatranslation.cpp:300
 msgctxt "algeria.kgm"
 msgid "Bordj Bou Arréridj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:299
+#: mapsdatatranslation.cpp:301
 msgctxt "algeria.kgm"
 msgid "Bouira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:300
+#: mapsdatatranslation.cpp:302
 msgctxt "algeria.kgm"
 msgid "Boumerdès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:301
+#: mapsdatatranslation.cpp:303
 msgctxt "algeria.kgm"
 msgid "Chlef"
 msgstr ""
 
-#: mapsdatatranslation.cpp:302
+#: mapsdatatranslation.cpp:304
 msgctxt "algeria.kgm"
 msgid "Constantine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:303
+#: mapsdatatranslation.cpp:305
 msgctxt "algeria.kgm"
 msgid "Djelfa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:304
+#: mapsdatatranslation.cpp:306
 msgctxt "algeria.kgm"
 msgid "El Bayadh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:305
+#: mapsdatatranslation.cpp:307
 msgctxt "algeria.kgm"
 msgid "El Oued"
 msgstr ""
 
-#: mapsdatatranslation.cpp:306
+#: mapsdatatranslation.cpp:308
 msgctxt "algeria.kgm"
 msgid "El Tarf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:307
+#: mapsdatatranslation.cpp:309
 msgctxt "algeria.kgm"
 msgid "Ghardaïa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:308
+#: mapsdatatranslation.cpp:310
 msgctxt "algeria.kgm"
 msgid "Guelma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:309
+#: mapsdatatranslation.cpp:311
 msgctxt "algeria.kgm"
 msgid "Illizi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:310
+#: mapsdatatranslation.cpp:312
 msgctxt "algeria.kgm"
 msgid "Jijel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:311
+#: mapsdatatranslation.cpp:313
 msgctxt "algeria.kgm"
 msgid "Khenchela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:312
+#: mapsdatatranslation.cpp:314
 msgctxt "algeria.kgm"
 msgid "Laghouat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:313
+#: mapsdatatranslation.cpp:315
 msgctxt "algeria.kgm"
 msgid "Médéa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:314
+#: mapsdatatranslation.cpp:316
 msgctxt "algeria.kgm"
 msgid "Mila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:315
+#: mapsdatatranslation.cpp:317
 msgctxt "algeria.kgm"
 msgid "Mostaganem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:316
+#: mapsdatatranslation.cpp:318
 msgctxt "algeria.kgm"
 msgid "M'Sila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:317
+#: mapsdatatranslation.cpp:319
 msgctxt "algeria.kgm"
 msgid "Muaskar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:318
+#: mapsdatatranslation.cpp:320
 msgctxt "algeria.kgm"
 msgid "Naama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:319
+#: mapsdatatranslation.cpp:321
 msgctxt "algeria.kgm"
 msgid "Oran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:320
+#: mapsdatatranslation.cpp:322
 msgctxt "algeria.kgm"
 msgid "Ouargla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:321
+#: mapsdatatranslation.cpp:323
 msgctxt "algeria.kgm"
 msgid "Oum el-Bouaghi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:322
+#: mapsdatatranslation.cpp:324
 msgctxt "algeria.kgm"
 msgid "Relizane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:323
+#: mapsdatatranslation.cpp:325
 msgctxt "algeria.kgm"
 msgid "Saida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:324
+#: mapsdatatranslation.cpp:326
 msgctxt "algeria.kgm"
 msgid "Sétif"
 msgstr ""
 
-#: mapsdatatranslation.cpp:325
+#: mapsdatatranslation.cpp:327
 msgctxt "algeria.kgm"
 msgid "Sidi Bel Abbes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:326
+#: mapsdatatranslation.cpp:328
 msgctxt "algeria.kgm"
 msgid "Skikda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:327
+#: mapsdatatranslation.cpp:329
 msgctxt "algeria.kgm"
 msgid "Souk Ahras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:328
+#: mapsdatatranslation.cpp:330
 msgctxt "algeria.kgm"
 msgid "Tamanghasset"
 msgstr ""
 
-#: mapsdatatranslation.cpp:329
+#: mapsdatatranslation.cpp:331
 msgctxt "algeria.kgm"
 msgid "Tébessa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:330
+#: mapsdatatranslation.cpp:332
 msgctxt "algeria.kgm"
 msgid "Tiaret"
 msgstr ""
 
-#: mapsdatatranslation.cpp:331
+#: mapsdatatranslation.cpp:333
 msgctxt "algeria.kgm"
 msgid "Tindouf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:332
+#: mapsdatatranslation.cpp:334
 msgctxt "algeria.kgm"
 msgid "Tipasa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:333
+#: mapsdatatranslation.cpp:335
 msgctxt "algeria.kgm"
 msgid "Tissemsilt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:334
+#: mapsdatatranslation.cpp:336
 msgctxt "algeria.kgm"
 msgid "Tizi Ouzou"
 msgstr ""
 
-#: mapsdatatranslation.cpp:335
+#: mapsdatatranslation.cpp:337
 msgctxt "algeria.kgm"
 msgid "Tlemcen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:336
+#: mapsdatatranslation.cpp:338
 msgctxt "andhrapradesh.kgm"
 msgid "Andhra Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:337
+#: mapsdatatranslation.cpp:339
 msgctxt "andhrapradesh.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:338
+#: mapsdatatranslation.cpp:340
 msgctxt "andhrapradesh.kgm"
 msgid "Not Andhra Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:339
+#: mapsdatatranslation.cpp:341
 msgctxt "andhrapradesh.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:340 mapsdatatranslation.cpp:341
+#: mapsdatatranslation.cpp:342 mapsdatatranslation.cpp:343
 msgctxt "andhrapradesh.kgm"
 msgid "Adilabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:342 mapsdatatranslation.cpp:343
+#: mapsdatatranslation.cpp:344 mapsdatatranslation.cpp:345
 msgctxt "andhrapradesh.kgm"
 msgid "Nizamabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:344 mapsdatatranslation.cpp:345
+#: mapsdatatranslation.cpp:346 mapsdatatranslation.cpp:347
 msgctxt "andhrapradesh.kgm"
 msgid "Karimnagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:346
+#: mapsdatatranslation.cpp:348
 msgctxt "andhrapradesh.kgm"
 msgid "Medak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:347
+#: mapsdatatranslation.cpp:349
 msgctxt "andhrapradesh.kgm"
 msgid "Sangareddy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:348 mapsdatatranslation.cpp:349
+#: mapsdatatranslation.cpp:350 mapsdatatranslation.cpp:351
 msgctxt "andhrapradesh.kgm"
 msgid "Warangal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:350
+#: mapsdatatranslation.cpp:352
 msgctxt "andhrapradesh.kgm"
 msgid "Rangareddy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:351 mapsdatatranslation.cpp:352
-#: mapsdatatranslation.cpp:353
+#: mapsdatatranslation.cpp:353 mapsdatatranslation.cpp:354
+#: mapsdatatranslation.cpp:355
 msgctxt "andhrapradesh.kgm"
 msgid "Hyderabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:354 mapsdatatranslation.cpp:355
+#: mapsdatatranslation.cpp:356 mapsdatatranslation.cpp:357
 msgctxt "andhrapradesh.kgm"
 msgid "Khammam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:356 mapsdatatranslation.cpp:357
+#: mapsdatatranslation.cpp:358 mapsdatatranslation.cpp:359
 msgctxt "andhrapradesh.kgm"
 msgid "Nalgonda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:358 mapsdatatranslation.cpp:359
+#: mapsdatatranslation.cpp:360 mapsdatatranslation.cpp:361
 msgctxt "andhrapradesh.kgm"
 msgid "Mahbubnagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:360 mapsdatatranslation.cpp:361
+#: mapsdatatranslation.cpp:362 mapsdatatranslation.cpp:363
 msgctxt "andhrapradesh.kgm"
 msgid "Kurnool"
 msgstr ""
 
-#: mapsdatatranslation.cpp:362 mapsdatatranslation.cpp:363
+#: mapsdatatranslation.cpp:364 mapsdatatranslation.cpp:365
 msgctxt "andhrapradesh.kgm"
 msgid "Anantapur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:364 mapsdatatranslation.cpp:365
+#: mapsdatatranslation.cpp:366 mapsdatatranslation.cpp:367
 msgctxt "andhrapradesh.kgm"
 msgid "Chittoor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:366 mapsdatatranslation.cpp:367
+#: mapsdatatranslation.cpp:368 mapsdatatranslation.cpp:369
 msgctxt "andhrapradesh.kgm"
 msgid "Cuddapah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:368 mapsdatatranslation.cpp:369
+#: mapsdatatranslation.cpp:370 mapsdatatranslation.cpp:371
 msgctxt "andhrapradesh.kgm"
 msgid "Nellore"
 msgstr ""
 
-#: mapsdatatranslation.cpp:370
+#: mapsdatatranslation.cpp:372
 msgctxt "andhrapradesh.kgm"
 msgid "Prakasam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:371
+#: mapsdatatranslation.cpp:373
 msgctxt "andhrapradesh.kgm"
 msgid "Ongole"
 msgstr ""
 
-#: mapsdatatranslation.cpp:372 mapsdatatranslation.cpp:373
+#: mapsdatatranslation.cpp:374 mapsdatatranslation.cpp:375
 msgctxt "andhrapradesh.kgm"
 msgid "Guntur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:374
+#: mapsdatatranslation.cpp:376
 msgctxt "andhrapradesh.kgm"
 msgid "Krishna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:375
+#: mapsdatatranslation.cpp:377
 msgctxt "andhrapradesh.kgm"
 msgid "Machilipatnam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:376
+#: mapsdatatranslation.cpp:378
 msgctxt "andhrapradesh.kgm"
 msgid "West Godavari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:377
+#: mapsdatatranslation.cpp:379
 msgctxt "andhrapradesh.kgm"
 msgid "Eluru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:378
+#: mapsdatatranslation.cpp:380
 msgctxt "andhrapradesh.kgm"
 msgid "East Godavari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:379
+#: mapsdatatranslation.cpp:381
 msgctxt "andhrapradesh.kgm"
 msgid "Kakinada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:380 mapsdatatranslation.cpp:381
+#: mapsdatatranslation.cpp:382 mapsdatatranslation.cpp:383
 msgctxt "andhrapradesh.kgm"
 msgid "Vishakhapatnam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:382 mapsdatatranslation.cpp:383
+#: mapsdatatranslation.cpp:384 mapsdatatranslation.cpp:385
 msgctxt "andhrapradesh.kgm"
 msgid "Vizianagaram"
 msgstr ""
 
-#: mapsdatatranslation.cpp:384 mapsdatatranslation.cpp:385
+#: mapsdatatranslation.cpp:386 mapsdatatranslation.cpp:387
 msgctxt "andhrapradesh.kgm"
 msgid "Srikakulam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:386
+#: mapsdatatranslation.cpp:388
 msgctxt "andorra.kgm"
 msgid "Andorra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:387
+#: mapsdatatranslation.cpp:389
 msgctxt "andorra.kgm"
 msgid "Parishes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:388 mapsdatatranslation.cpp:389
+#: mapsdatatranslation.cpp:390 mapsdatatranslation.cpp:391
 msgctxt "andorra.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:390
+#: mapsdatatranslation.cpp:392
 msgctxt "andorra.kgm"
 msgid "Spain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:391
+#: mapsdatatranslation.cpp:393
 msgctxt "andorra.kgm"
 msgid "France"
 msgstr ""
 
-#: mapsdatatranslation.cpp:392
+#: mapsdatatranslation.cpp:394
 msgctxt "andorra.kgm"
 msgid "Andorra la Vella"
 msgstr ""
 
-#: mapsdatatranslation.cpp:393
+#: mapsdatatranslation.cpp:395
 msgctxt "andorra.kgm"
 msgid "La Massana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:394
+#: mapsdatatranslation.cpp:396
 msgctxt "andorra.kgm"
 msgid "Ordino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:395
+#: mapsdatatranslation.cpp:397
 msgctxt "andorra.kgm"
 msgid "Canillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:396
+#: mapsdatatranslation.cpp:398
 msgctxt "andorra.kgm"
 msgid "Encamp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:397
+#: mapsdatatranslation.cpp:399
 msgctxt "andorra.kgm"
 msgid "Escaldes-Engordany"
 msgstr ""
 
-#: mapsdatatranslation.cpp:398
+#: mapsdatatranslation.cpp:400
 msgctxt "andorra.kgm"
 msgid "Sant Julià de Lòria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:399
+#: mapsdatatranslation.cpp:401
 msgctxt "angola_provinces.kgm"
 msgid "Angola (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:400
+#: mapsdatatranslation.cpp:402
 msgctxt "angola_provinces.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:401
+#: mapsdatatranslation.cpp:403
 msgctxt "angola_provinces.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:402
+#: mapsdatatranslation.cpp:404
 msgctxt "angola_provinces.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:403
+#: mapsdatatranslation.cpp:405
 msgctxt "angola_provinces.kgm"
 msgid "Not Angola (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:404
+#: mapsdatatranslation.cpp:406
 msgctxt "angola_provinces.kgm"
 msgid "Bengo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:405
+#: mapsdatatranslation.cpp:407
 msgctxt "angola_provinces.kgm"
 msgid "Caxito"
 msgstr ""
 
-#: mapsdatatranslation.cpp:406 mapsdatatranslation.cpp:407
+#: mapsdatatranslation.cpp:408 mapsdatatranslation.cpp:409
 msgctxt "angola_provinces.kgm"
 msgid "Benguela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:408
+#: mapsdatatranslation.cpp:410
 msgctxt "angola_provinces.kgm"
 msgid "Bié"
 msgstr ""
 
-#: mapsdatatranslation.cpp:409
+#: mapsdatatranslation.cpp:411
 msgctxt "angola_provinces.kgm"
 msgid "Kuito"
 msgstr ""
 
-#: mapsdatatranslation.cpp:410 mapsdatatranslation.cpp:411
+#: mapsdatatranslation.cpp:412 mapsdatatranslation.cpp:413
 msgctxt "angola_provinces.kgm"
 msgid "Cabinda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:412
+#: mapsdatatranslation.cpp:414
 msgctxt "angola_provinces.kgm"
 msgid "Cuando Cubango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:413
+#: mapsdatatranslation.cpp:415
 msgctxt "angola_provinces.kgm"
 msgid "Menongue"
 msgstr ""
 
-#: mapsdatatranslation.cpp:414
+#: mapsdatatranslation.cpp:416
 msgctxt "angola_provinces.kgm"
 msgid "Cuanza Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:415
+#: mapsdatatranslation.cpp:417
 msgctxt "angola_provinces.kgm"
 msgid "Ndalatando"
 msgstr ""
 
-#: mapsdatatranslation.cpp:416
+#: mapsdatatranslation.cpp:418
 msgctxt "angola_provinces.kgm"
 msgid "Cuanza Sul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:417
+#: mapsdatatranslation.cpp:419
 msgctxt "angola_provinces.kgm"
 msgid "Sumbe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:418
+#: mapsdatatranslation.cpp:420
 msgctxt "angola_provinces.kgm"
 msgid "Cunene"
 msgstr ""
 
-#: mapsdatatranslation.cpp:419
+#: mapsdatatranslation.cpp:421
 msgctxt "angola_provinces.kgm"
 msgid "Ondjiva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:420 mapsdatatranslation.cpp:421
+#: mapsdatatranslation.cpp:422 mapsdatatranslation.cpp:423
 msgctxt "angola_provinces.kgm"
 msgid "Huambo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:422
+#: mapsdatatranslation.cpp:424
 msgctxt "angola_provinces.kgm"
 msgid "Huíla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:423
+#: mapsdatatranslation.cpp:425
 msgctxt "angola_provinces.kgm"
 msgid "Lubango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:424 mapsdatatranslation.cpp:425
+#: mapsdatatranslation.cpp:426 mapsdatatranslation.cpp:427
 msgctxt "angola_provinces.kgm"
 msgid "Luanda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:426
+#: mapsdatatranslation.cpp:428
 msgctxt "angola_provinces.kgm"
 msgid "Lunda Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:427
+#: mapsdatatranslation.cpp:429
 msgctxt "angola_provinces.kgm"
 msgid "Lucapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:428
+#: mapsdatatranslation.cpp:430
 msgctxt "angola_provinces.kgm"
 msgid "Lunda Sul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:429
+#: mapsdatatranslation.cpp:431
 msgctxt "angola_provinces.kgm"
 msgid "Saurimo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:430 mapsdatatranslation.cpp:431
+#: mapsdatatranslation.cpp:432 mapsdatatranslation.cpp:433
 msgctxt "angola_provinces.kgm"
 msgid "Malanje"
 msgstr ""
 
-#: mapsdatatranslation.cpp:432 mapsdatatranslation.cpp:433
+#: mapsdatatranslation.cpp:434 mapsdatatranslation.cpp:435
 msgctxt "angola_provinces.kgm"
 msgid "Namibe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:434
+#: mapsdatatranslation.cpp:436
 msgctxt "angola_provinces.kgm"
 msgid "Moxico"
 msgstr ""
 
-#: mapsdatatranslation.cpp:435
+#: mapsdatatranslation.cpp:437
 msgctxt "angola_provinces.kgm"
 msgid "Luena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:436 mapsdatatranslation.cpp:437
+#: mapsdatatranslation.cpp:438 mapsdatatranslation.cpp:439
 msgctxt "angola_provinces.kgm"
 msgid "Uíge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:438
+#: mapsdatatranslation.cpp:440
 msgctxt "angola_provinces.kgm"
 msgid "Zaire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:439
+#: mapsdatatranslation.cpp:441
 msgctxt "angola_provinces.kgm"
 msgid "Mbanza Congo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:440
+#: mapsdatatranslation.cpp:442
 msgctxt "argentina.kgm"
 msgid "Argentina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:441
+#: mapsdatatranslation.cpp:443
 msgctxt "argentina.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:442 mapsdatatranslation.cpp:443
+#: mapsdatatranslation.cpp:444 mapsdatatranslation.cpp:445
 msgctxt "argentina.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:444
+#: mapsdatatranslation.cpp:446
 msgctxt "argentina.kgm"
 msgid "Not Argentina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:445
+#: mapsdatatranslation.cpp:447
 msgctxt "argentina.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:446
+#: mapsdatatranslation.cpp:448
 msgctxt "argentina.kgm"
 msgid "Buenos Aires(city)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:447
+#: mapsdatatranslation.cpp:449
 msgctxt "argentina.kgm"
 msgid "Buenos Aires"
 msgstr ""
 
-#: mapsdatatranslation.cpp:448
+#: mapsdatatranslation.cpp:450
 msgctxt "argentina.kgm"
 msgid "La Plata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:449
+#: mapsdatatranslation.cpp:451
 msgctxt "argentina.kgm"
 msgid "Catamarca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:450
+#: mapsdatatranslation.cpp:452
 msgctxt "argentina.kgm"
 msgid "San Fernando del Valle de Catamarca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:451
+#: mapsdatatranslation.cpp:453
 msgctxt "argentina.kgm"
 msgid "Chaco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:452
+#: mapsdatatranslation.cpp:454
 msgctxt "argentina.kgm"
 msgid "Resistencia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:453
+#: mapsdatatranslation.cpp:455
 msgctxt "argentina.kgm"
 msgid "Chubut"
 msgstr ""
 
-#: mapsdatatranslation.cpp:454
+#: mapsdatatranslation.cpp:456
 msgctxt "argentina.kgm"
 msgid "Rawson"
 msgstr ""
 
-#: mapsdatatranslation.cpp:455 mapsdatatranslation.cpp:456
+#: mapsdatatranslation.cpp:457 mapsdatatranslation.cpp:458
 msgctxt "argentina.kgm"
 msgid "Córdoba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:457 mapsdatatranslation.cpp:458
+#: mapsdatatranslation.cpp:459 mapsdatatranslation.cpp:460
 msgctxt "argentina.kgm"
 msgid "Corrientes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:459
+#: mapsdatatranslation.cpp:461
 msgctxt "argentina.kgm"
 msgid "Entre Ríos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:460
+#: mapsdatatranslation.cpp:462
 msgctxt "argentina.kgm"
 msgid "Paraná"
 msgstr ""
 
-#: mapsdatatranslation.cpp:461 mapsdatatranslation.cpp:462
+#: mapsdatatranslation.cpp:463 mapsdatatranslation.cpp:464
 msgctxt "argentina.kgm"
 msgid "Formosa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:463
+#: mapsdatatranslation.cpp:465
 msgctxt "argentina.kgm"
 msgid "Jujuy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:464
+#: mapsdatatranslation.cpp:466
 msgctxt "argentina.kgm"
 msgid "San Salvador de Jujuy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:465
+#: mapsdatatranslation.cpp:467
 msgctxt "argentina.kgm"
 msgid "La Pampa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:466
+#: mapsdatatranslation.cpp:468
 msgctxt "argentina.kgm"
 msgid "Santa Rosa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:467 mapsdatatranslation.cpp:468
+#: mapsdatatranslation.cpp:469 mapsdatatranslation.cpp:470
 msgctxt "argentina.kgm"
 msgid "La Rioja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:469 mapsdatatranslation.cpp:470
+#: mapsdatatranslation.cpp:471 mapsdatatranslation.cpp:472
 msgctxt "argentina.kgm"
 msgid "Mendoza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:471
+#: mapsdatatranslation.cpp:473
 msgctxt "argentina.kgm"
 msgid "Misiones"
 msgstr ""
 
-#: mapsdatatranslation.cpp:472
+#: mapsdatatranslation.cpp:474
 msgctxt "argentina.kgm"
 msgid "Posadas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:473 mapsdatatranslation.cpp:474
+#: mapsdatatranslation.cpp:475 mapsdatatranslation.cpp:476
 msgctxt "argentina.kgm"
 msgid "Neuquén"
 msgstr ""
 
-#: mapsdatatranslation.cpp:475
+#: mapsdatatranslation.cpp:477
 msgctxt "argentina.kgm"
 msgid "Río Negro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:476
+#: mapsdatatranslation.cpp:478
 msgctxt "argentina.kgm"
 msgid "Viedma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:477 mapsdatatranslation.cpp:478
+#: mapsdatatranslation.cpp:479 mapsdatatranslation.cpp:480
 msgctxt "argentina.kgm"
 msgid "Salta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:479 mapsdatatranslation.cpp:480
+#: mapsdatatranslation.cpp:481 mapsdatatranslation.cpp:482
 msgctxt "argentina.kgm"
 msgid "San Juan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:481 mapsdatatranslation.cpp:482
+#: mapsdatatranslation.cpp:483 mapsdatatranslation.cpp:484
 msgctxt "argentina.kgm"
 msgid "San Luis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:483
+#: mapsdatatranslation.cpp:485
 msgctxt "argentina.kgm"
 msgid "Santa Cruz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:484
+#: mapsdatatranslation.cpp:486
 msgctxt "argentina.kgm"
 msgid "Río Gallegos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:485 mapsdatatranslation.cpp:486
+#: mapsdatatranslation.cpp:487 mapsdatatranslation.cpp:488
 msgctxt "argentina.kgm"
 msgid "Santa Fe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:487 mapsdatatranslation.cpp:488
+#: mapsdatatranslation.cpp:489 mapsdatatranslation.cpp:490
 msgctxt "argentina.kgm"
 msgid "Santiago del Estero"
 msgstr ""
 
-#: mapsdatatranslation.cpp:489
+#: mapsdatatranslation.cpp:491
 msgctxt "argentina.kgm"
 msgid "Tierra del Fuego"
 msgstr ""
 
-#: mapsdatatranslation.cpp:490
+#: mapsdatatranslation.cpp:492
 msgctxt "argentina.kgm"
 msgid "Ushuaia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:491
+#: mapsdatatranslation.cpp:493
 msgctxt "argentina.kgm"
 msgid "Tucumán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:492
+#: mapsdatatranslation.cpp:494
 msgctxt "argentina.kgm"
 msgid "San Miguel de Tucumán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:493
+#: mapsdatatranslation.cpp:495
 msgctxt "armenia.kgm"
 msgid "Armenia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:494
+#: mapsdatatranslation.cpp:496
 msgctxt "armenia.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:495 mapsdatatranslation.cpp:496
+#: mapsdatatranslation.cpp:497 mapsdatatranslation.cpp:498
 msgctxt "armenia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:497
+#: mapsdatatranslation.cpp:499
 msgctxt "armenia.kgm"
 msgid "Lake Van"
 msgstr ""
 
-#: mapsdatatranslation.cpp:498
+#: mapsdatatranslation.cpp:500
 msgctxt "armenia.kgm"
 msgid "Lake Sevan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:499
+#: mapsdatatranslation.cpp:501
 msgctxt "armenia.kgm"
 msgid "Azerbaijan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:500
+#: mapsdatatranslation.cpp:502
 msgctxt "armenia.kgm"
 msgid "Georgia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:501
+#: mapsdatatranslation.cpp:503
 msgctxt "armenia.kgm"
 msgid "Iran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:502
+#: mapsdatatranslation.cpp:504
 msgctxt "armenia.kgm"
 msgid "Turkey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:503
+#: mapsdatatranslation.cpp:505
 msgctxt "armenia.kgm"
 msgid "Aragatsotn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:504
+#: mapsdatatranslation.cpp:506
 msgctxt "armenia.kgm"
 msgid "Ashtarak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:505
+#: mapsdatatranslation.cpp:507
 msgctxt "armenia.kgm"
 msgid "Ararat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:506
+#: mapsdatatranslation.cpp:508
 msgctxt "armenia.kgm"
 msgid "Artashat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:507 mapsdatatranslation.cpp:508
+#: mapsdatatranslation.cpp:509 mapsdatatranslation.cpp:510
 msgctxt "armenia.kgm"
 msgid "Armavir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:509
+#: mapsdatatranslation.cpp:511
 msgctxt "armenia.kgm"
 msgid "Gegharkunik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:510
+#: mapsdatatranslation.cpp:512
 msgctxt "armenia.kgm"
 msgid "Gavar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:511
+#: mapsdatatranslation.cpp:513
 msgctxt "armenia.kgm"
 msgid "Kotayk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:512
+#: mapsdatatranslation.cpp:514
 msgctxt "armenia.kgm"
 msgid "Hrazdan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:513
+#: mapsdatatranslation.cpp:515
 msgctxt "armenia.kgm"
 msgid "Lori"
 msgstr ""
 
-#: mapsdatatranslation.cpp:514
+#: mapsdatatranslation.cpp:516
 msgctxt "armenia.kgm"
 msgid "Vanadzor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:515
+#: mapsdatatranslation.cpp:517
 msgctxt "armenia.kgm"
 msgid "Shirak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:516
+#: mapsdatatranslation.cpp:518
 msgctxt "armenia.kgm"
 msgid "Gyumri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:517
+#: mapsdatatranslation.cpp:519
 msgctxt "armenia.kgm"
 msgid "Syunik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:518
+#: mapsdatatranslation.cpp:520
 msgctxt "armenia.kgm"
 msgid "Kapan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:519
+#: mapsdatatranslation.cpp:521
 msgctxt "armenia.kgm"
 msgid "Tavush"
 msgstr ""
 
-#: mapsdatatranslation.cpp:520
+#: mapsdatatranslation.cpp:522
 msgctxt "armenia.kgm"
 msgid "Ijevan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:521
+#: mapsdatatranslation.cpp:523
 msgctxt "armenia.kgm"
 msgid "Vayots Dzor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:522
+#: mapsdatatranslation.cpp:524
 msgctxt "armenia.kgm"
 msgid "Yeghegnadzor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:523
+#: mapsdatatranslation.cpp:525
 msgctxt "armenia.kgm"
 msgid "Yerevan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:524
+#: mapsdatatranslation.cpp:526
 msgctxt "arunachalpradesh.kgm"
 msgid "Arunachal Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:525
+#: mapsdatatranslation.cpp:527
 msgctxt "arunachalpradesh.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:526
+#: mapsdatatranslation.cpp:528
 msgctxt "arunachalpradesh.kgm"
 msgid "Not Arunachal Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:527
+#: mapsdatatranslation.cpp:529
 msgctxt "arunachalpradesh.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:528
+#: mapsdatatranslation.cpp:530
 msgctxt "arunachalpradesh.kgm"
 msgid "Tirap"
 msgstr ""
 
-#: mapsdatatranslation.cpp:529
+#: mapsdatatranslation.cpp:531
 msgctxt "arunachalpradesh.kgm"
 msgid "Khonsa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:530 mapsdatatranslation.cpp:531
+#: mapsdatatranslation.cpp:532 mapsdatatranslation.cpp:533
 msgctxt "arunachalpradesh.kgm"
 msgid "Changlang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:532
+#: mapsdatatranslation.cpp:534
 msgctxt "arunachalpradesh.kgm"
 msgid "Lohit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:533
+#: mapsdatatranslation.cpp:535
 msgctxt "arunachalpradesh.kgm"
 msgid "Tezu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:534
+#: mapsdatatranslation.cpp:536
 msgctxt "arunachalpradesh.kgm"
 msgid "Anjaw"
 msgstr ""
 
-#: mapsdatatranslation.cpp:535
+#: mapsdatatranslation.cpp:537
 msgctxt "arunachalpradesh.kgm"
 msgid "Hawai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:536
+#: mapsdatatranslation.cpp:538
 msgctxt "arunachalpradesh.kgm"
 msgid "Lower Dibang Valley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:537
+#: mapsdatatranslation.cpp:539
 msgctxt "arunachalpradesh.kgm"
 msgid "Roing"
 msgstr ""
 
-#: mapsdatatranslation.cpp:538
+#: mapsdatatranslation.cpp:540
 msgctxt "arunachalpradesh.kgm"
 msgid "Dibang Valley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:539
+#: mapsdatatranslation.cpp:541
 msgctxt "arunachalpradesh.kgm"
 msgid "Anini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:540
+#: mapsdatatranslation.cpp:542
 msgctxt "arunachalpradesh.kgm"
 msgid "Upper Siang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:541
+#: mapsdatatranslation.cpp:543
 msgctxt "arunachalpradesh.kgm"
 msgid "Yingkiong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:542
+#: mapsdatatranslation.cpp:544
 msgctxt "arunachalpradesh.kgm"
 msgid "East Siang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:543
+#: mapsdatatranslation.cpp:545
 msgctxt "arunachalpradesh.kgm"
 msgid "Pasighat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:544
+#: mapsdatatranslation.cpp:546
 msgctxt "arunachalpradesh.kgm"
 msgid "West Siang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:545
+#: mapsdatatranslation.cpp:547
 msgctxt "arunachalpradesh.kgm"
 msgid "Along"
 msgstr ""
 
-#: mapsdatatranslation.cpp:546 mapsdatatranslation.cpp:547
+#: mapsdatatranslation.cpp:548 mapsdatatranslation.cpp:549
 msgctxt "arunachalpradesh.kgm"
 msgid "Tawang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:548
+#: mapsdatatranslation.cpp:550
 msgctxt "arunachalpradesh.kgm"
 msgid "West Kameng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:549
+#: mapsdatatranslation.cpp:551
 msgctxt "arunachalpradesh.kgm"
 msgid "Bomdila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:550
+#: mapsdatatranslation.cpp:552
 msgctxt "arunachalpradesh.kgm"
 msgid "East Kameng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:551
+#: mapsdatatranslation.cpp:553
 msgctxt "arunachalpradesh.kgm"
 msgid "Seppa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:552
+#: mapsdatatranslation.cpp:554
 msgctxt "arunachalpradesh.kgm"
 msgid "Papum Pare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:553
+#: mapsdatatranslation.cpp:555
 msgctxt "arunachalpradesh.kgm"
 msgid "Yupia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:554
+#: mapsdatatranslation.cpp:556
 msgctxt "arunachalpradesh.kgm"
 msgid "Lower Subansiri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:555
+#: mapsdatatranslation.cpp:557
 msgctxt "arunachalpradesh.kgm"
 msgid "Ziro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:556
+#: mapsdatatranslation.cpp:558
 msgctxt "arunachalpradesh.kgm"
 msgid "Kurung Kumey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:557
+#: mapsdatatranslation.cpp:559
 msgctxt "arunachalpradesh.kgm"
 msgid "Koloriang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:558
+#: mapsdatatranslation.cpp:560
 msgctxt "arunachalpradesh.kgm"
 msgid "Upper Subansiri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:559
+#: mapsdatatranslation.cpp:561
 msgctxt "arunachalpradesh.kgm"
 msgid "Daporijo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:560
+#: mapsdatatranslation.cpp:562
 msgctxt "asia.kgm"
 msgid "Asia"
 msgstr "Asia"
 
-#: mapsdatatranslation.cpp:561
+#: mapsdatatranslation.cpp:563
 msgctxt "asia.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:562
+#: mapsdatatranslation.cpp:564
 msgctxt "asia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:563
+#: mapsdatatranslation.cpp:565
 msgctxt "asia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:564
+#: mapsdatatranslation.cpp:566
 msgctxt "asia.kgm"
 msgid "Russia"
 msgstr "Rwsia"
 
-#: mapsdatatranslation.cpp:565
+#: mapsdatatranslation.cpp:567
 msgctxt "asia.kgm"
 msgid "Moscow"
 msgstr "Mosgo"
 
-#: mapsdatatranslation.cpp:566
+#: mapsdatatranslation.cpp:568
 msgctxt "asia.kgm"
 msgid "Turkey"
 msgstr "Twrci"
 
-#: mapsdatatranslation.cpp:567
+#: mapsdatatranslation.cpp:569
 msgctxt "asia.kgm"
 msgid "Ankara"
 msgstr "Ankara"
 
-#: mapsdatatranslation.cpp:568
+#: mapsdatatranslation.cpp:570
 msgctxt "asia.kgm"
 msgid "Egypt"
 msgstr "Yr Aifft"
 
-#: mapsdatatranslation.cpp:569
+#: mapsdatatranslation.cpp:571
 msgctxt "asia.kgm"
 msgid "Djibouti"
 msgstr "Jibwti"
 
-#: mapsdatatranslation.cpp:570
+#: mapsdatatranslation.cpp:572
 msgctxt "asia.kgm"
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: mapsdatatranslation.cpp:571
+#: mapsdatatranslation.cpp:573
 msgctxt "asia.kgm"
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: mapsdatatranslation.cpp:572
+#: mapsdatatranslation.cpp:574
 msgctxt "asia.kgm"
 msgid "Iran"
 msgstr "Iran"
 
-#: mapsdatatranslation.cpp:573
+#: mapsdatatranslation.cpp:575
 msgctxt "asia.kgm"
 msgid "Tehran"
 msgstr "Tehran"
 
-#: mapsdatatranslation.cpp:574
+#: mapsdatatranslation.cpp:576
 msgctxt "asia.kgm"
 msgid "Iraq"
 msgstr "Irac"
 
-#: mapsdatatranslation.cpp:575
+#: mapsdatatranslation.cpp:577
 msgctxt "asia.kgm"
 msgid "Baghdad"
 msgstr "Baghdad"
 
-#: mapsdatatranslation.cpp:576
+#: mapsdatatranslation.cpp:578
 msgctxt "asia.kgm"
 msgid "Israel"
 msgstr "Israel"
 
-#: mapsdatatranslation.cpp:577
+#: mapsdatatranslation.cpp:579
 msgctxt "asia.kgm"
 msgid "Jerusalem"
 msgstr "Jerwsalem"
 
-#: mapsdatatranslation.cpp:578
+#: mapsdatatranslation.cpp:580
 msgctxt "asia.kgm"
 msgid "Jordan"
 msgstr "Iorddonen"
 
-#: mapsdatatranslation.cpp:579
+#: mapsdatatranslation.cpp:581
 msgctxt "asia.kgm"
 msgid "Amman"
 msgstr "Aman"
 
-#: mapsdatatranslation.cpp:580
+#: mapsdatatranslation.cpp:582
 msgctxt "asia.kgm"
 msgid "Kenya"
 msgstr "Cenia"
 
-#: mapsdatatranslation.cpp:581
+#: mapsdatatranslation.cpp:583
 msgctxt "asia.kgm"
 msgid "Kuwait"
 msgstr "Coweit"
 
-#: mapsdatatranslation.cpp:582
+#: mapsdatatranslation.cpp:584
 msgctxt "asia.kgm"
 msgid "Kuwait City"
 msgstr "Dinas Coweit"
 
-#: mapsdatatranslation.cpp:583
+#: mapsdatatranslation.cpp:585
 msgctxt "asia.kgm"
 msgid "Lebanon"
 msgstr "Libanus"
 
-#: mapsdatatranslation.cpp:584
+#: mapsdatatranslation.cpp:586
 msgctxt "asia.kgm"
 msgid "Beirut"
 msgstr "Beirŵt"
 
-#: mapsdatatranslation.cpp:585
+#: mapsdatatranslation.cpp:587
 msgctxt "asia.kgm"
 msgid "Qatar"
 msgstr "Qatar"
 
-#: mapsdatatranslation.cpp:586
+#: mapsdatatranslation.cpp:588
 msgctxt "asia.kgm"
 msgid "Doha"
 msgstr "Doha"
 
-#: mapsdatatranslation.cpp:587
+#: mapsdatatranslation.cpp:589
 msgctxt "asia.kgm"
 msgid "Saudi Arabia"
 msgstr "Sawdi-Arabia"
 
-#: mapsdatatranslation.cpp:588
+#: mapsdatatranslation.cpp:590
 msgctxt "asia.kgm"
 msgid "Riyadh"
 msgstr "Riadd"
 
-#: mapsdatatranslation.cpp:589
+#: mapsdatatranslation.cpp:591
 msgctxt "asia.kgm"
 msgid "Somalia"
 msgstr "Somalia"
 
-#: mapsdatatranslation.cpp:590
+#: mapsdatatranslation.cpp:592
 msgctxt "asia.kgm"
 msgid "Sudan"
 msgstr "Swdan"
 
-#: mapsdatatranslation.cpp:591
+#: mapsdatatranslation.cpp:593
+msgctxt "asia.kgm"
+msgid "South Sudan"
+msgstr ""
+
+#: mapsdatatranslation.cpp:594
 msgctxt "asia.kgm"
 msgid "Syria"
 msgstr "Syria"
 
-#: mapsdatatranslation.cpp:592
+#: mapsdatatranslation.cpp:595
 msgctxt "asia.kgm"
 msgid "Damascus"
 msgstr "Damascws"
 
-#: mapsdatatranslation.cpp:593
+#: mapsdatatranslation.cpp:596
 msgctxt "asia.kgm"
 msgid "Uganda"
 msgstr "Wganda"
 
-#: mapsdatatranslation.cpp:594
+#: mapsdatatranslation.cpp:597
 msgctxt "asia.kgm"
 msgid "United Arab Emirates"
 msgstr "Emiraethau Arabaidd Unedig"
 
-#: mapsdatatranslation.cpp:595
+#: mapsdatatranslation.cpp:598
 msgctxt "asia.kgm"
 msgid "Abu Dhabi City"
 msgstr "Dinas Abw Ddabi"
 
-#: mapsdatatranslation.cpp:596
+#: mapsdatatranslation.cpp:599
 msgctxt "asia.kgm"
 msgid "Oman"
 msgstr "Oman"
 
-#: mapsdatatranslation.cpp:597
+#: mapsdatatranslation.cpp:600
 msgctxt "asia.kgm"
 msgid "Muscat"
 msgstr "Mwscat"
 
-#: mapsdatatranslation.cpp:598
+#: mapsdatatranslation.cpp:601
 msgctxt "asia.kgm"
 msgid "West Bank"
 msgstr "Y Lan Orllewin"
 
-#: mapsdatatranslation.cpp:599
+#: mapsdatatranslation.cpp:602
 msgctxt "asia.kgm"
 msgid "Yemen"
 msgstr "Iemen"
 
-#: mapsdatatranslation.cpp:600
+#: mapsdatatranslation.cpp:603
 msgctxt "asia.kgm"
 msgid "Sana'a"
 msgstr "Sana'a"
 
-#: mapsdatatranslation.cpp:601
+#: mapsdatatranslation.cpp:604
 msgctxt "asia.kgm"
 msgid "Ukraine"
 msgstr "Wcrain"
 
-#: mapsdatatranslation.cpp:602
+#: mapsdatatranslation.cpp:605
 msgctxt "asia.kgm"
 msgid "China"
 msgstr "Tseina"
 
-#: mapsdatatranslation.cpp:603
+#: mapsdatatranslation.cpp:606
 msgctxt "asia.kgm"
 msgid "Beijing"
 msgstr "Beijing"
 
-#: mapsdatatranslation.cpp:604
+#: mapsdatatranslation.cpp:607
 msgctxt "asia.kgm"
 msgid "India"
 msgstr "India"
 
-#: mapsdatatranslation.cpp:605
+#: mapsdatatranslation.cpp:608
 msgctxt "asia.kgm"
 msgid "New Delhi"
 msgstr "Delhi Newydd"
 
-#: mapsdatatranslation.cpp:606
+#: mapsdatatranslation.cpp:609
 msgctxt "asia.kgm"
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: mapsdatatranslation.cpp:607
+#: mapsdatatranslation.cpp:610
 msgctxt "asia.kgm"
 msgid "Colombo and Sri Jayewardenepura"
 msgstr "Colombo a Sri Jayewardenepura"
 
-#: mapsdatatranslation.cpp:608
+#: mapsdatatranslation.cpp:611
 msgctxt "asia.kgm"
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: mapsdatatranslation.cpp:609
+#: mapsdatatranslation.cpp:612
 msgctxt "asia.kgm"
 msgid "Ulaanbaatar"
 msgstr "Ulaanbaatar"
 
-#: mapsdatatranslation.cpp:610
+#: mapsdatatranslation.cpp:613
 msgctxt "asia.kgm"
 msgid "Kazakhstan"
 msgstr "Casachstan"
 
-#: mapsdatatranslation.cpp:611
+#: mapsdatatranslation.cpp:614
 msgctxt "asia.kgm"
 msgid "Astana"
 msgstr "Astana"
 
-#: mapsdatatranslation.cpp:612
+#: mapsdatatranslation.cpp:615
 msgctxt "asia.kgm"
 msgid "Japan"
 msgstr "Siapan"
 
-#: mapsdatatranslation.cpp:613
+#: mapsdatatranslation.cpp:616
 msgctxt "asia.kgm"
 msgid "Tokyo"
 msgstr "Tocio"
 
-#: mapsdatatranslation.cpp:614
+#: mapsdatatranslation.cpp:617
 msgctxt "asia.kgm"
 msgid "Myanmar"
 msgstr "Mianmar"
 
-#: mapsdatatranslation.cpp:615
+#: mapsdatatranslation.cpp:618
 msgctxt "asia.kgm"
 msgid "Naypyidaw"
 msgstr ""
 
-#: mapsdatatranslation.cpp:616
+#: mapsdatatranslation.cpp:619
 msgctxt "asia.kgm"
 msgid "Nepal"
 msgstr "Nepal"
 
-#: mapsdatatranslation.cpp:617
+#: mapsdatatranslation.cpp:620
 msgctxt "asia.kgm"
 msgid "Kathmandu"
 msgstr "Catmandŵ"
 
-#: mapsdatatranslation.cpp:618
+#: mapsdatatranslation.cpp:621
 msgctxt "asia.kgm"
 msgid "Bhutan"
 msgstr "Bhwtan"
 
-#: mapsdatatranslation.cpp:619
+#: mapsdatatranslation.cpp:622
 msgctxt "asia.kgm"
 msgid "Thimphu"
 msgstr "Thimphu"
 
-#: mapsdatatranslation.cpp:620
+#: mapsdatatranslation.cpp:623
 msgctxt "asia.kgm"
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: mapsdatatranslation.cpp:621
+#: mapsdatatranslation.cpp:624
 msgctxt "asia.kgm"
 msgid "Jakarta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:622
+#: mapsdatatranslation.cpp:625
 msgctxt "asia.kgm"
 msgid "Malaysia"
 msgstr "Maleisia"
 
-#: mapsdatatranslation.cpp:623
+#: mapsdatatranslation.cpp:626
 msgctxt "asia.kgm"
 msgid "Kuala Lumpur"
 msgstr "Cwala Lwmpwr"
 
-#: mapsdatatranslation.cpp:624
+#: mapsdatatranslation.cpp:627
 msgctxt "asia.kgm"
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: mapsdatatranslation.cpp:625
+#: mapsdatatranslation.cpp:628
 msgctxt "asia.kgm"
 msgid "Dhaka"
 msgstr "Dhaka"
 
-#: mapsdatatranslation.cpp:626
+#: mapsdatatranslation.cpp:629
 msgctxt "asia.kgm"
 msgid "Afghanistan"
 msgstr "Affganistan"
 
-#: mapsdatatranslation.cpp:627
+#: mapsdatatranslation.cpp:630
 msgctxt "asia.kgm"
 msgid "Kabul"
 msgstr "Cabwl"
 
-#: mapsdatatranslation.cpp:628
+#: mapsdatatranslation.cpp:631
 msgctxt "asia.kgm"
 msgid "Azerbaijan"
 msgstr "Aserbaijan"
 
-#: mapsdatatranslation.cpp:629
+#: mapsdatatranslation.cpp:632
 msgctxt "asia.kgm"
 msgid "Baku"
 msgstr "Bacw"
 
-#: mapsdatatranslation.cpp:630
+#: mapsdatatranslation.cpp:633
 msgctxt "asia.kgm"
 msgid "Armenia"
 msgstr "Armenia"
 
-#: mapsdatatranslation.cpp:631
+#: mapsdatatranslation.cpp:634
 msgctxt "asia.kgm"
 msgid "Yerevan"
 msgstr "Ierevan"
 
-#: mapsdatatranslation.cpp:632
+#: mapsdatatranslation.cpp:635
 msgctxt "asia.kgm"
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: mapsdatatranslation.cpp:633
+#: mapsdatatranslation.cpp:636
 msgctxt "asia.kgm"
 msgid "Manama"
 msgstr "Manama"
 
-#: mapsdatatranslation.cpp:634
+#: mapsdatatranslation.cpp:637
 msgctxt "asia.kgm"
 msgid "Georgia"
 msgstr "Georgia"
 
-#: mapsdatatranslation.cpp:635
+#: mapsdatatranslation.cpp:638
 msgctxt "asia.kgm"
 msgid "Tbilisi"
 msgstr "Tbilisi"
 
-#: mapsdatatranslation.cpp:636
+#: mapsdatatranslation.cpp:639
 msgctxt "asia.kgm"
 msgid "Turkmenistan"
 msgstr "Twrcmenistan"
 
-#: mapsdatatranslation.cpp:637
+#: mapsdatatranslation.cpp:640
 msgctxt "asia.kgm"
 msgid "Ashgabat"
 msgstr "Ashgabat"
 
-#: mapsdatatranslation.cpp:638
+#: mapsdatatranslation.cpp:641
 msgctxt "asia.kgm"
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: mapsdatatranslation.cpp:639
+#: mapsdatatranslation.cpp:642
 msgctxt "asia.kgm"
 msgid "Tashkent"
 msgstr "Tashkent"
 
-#: mapsdatatranslation.cpp:640
+#: mapsdatatranslation.cpp:643
 msgctxt "asia.kgm"
 msgid "Kyrgyzstan"
 msgstr "Cirgistan"
 
-#: mapsdatatranslation.cpp:641
+#: mapsdatatranslation.cpp:644
 msgctxt "asia.kgm"
 msgid "Bishkek"
 msgstr "Bishcec"
 
-#: mapsdatatranslation.cpp:642
+#: mapsdatatranslation.cpp:645
 msgctxt "asia.kgm"
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: mapsdatatranslation.cpp:643
+#: mapsdatatranslation.cpp:646
 msgctxt "asia.kgm"
 msgid "Dushanbe"
 msgstr "Dushanbe"
 
-#: mapsdatatranslation.cpp:644
+#: mapsdatatranslation.cpp:647
 msgctxt "asia.kgm"
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: mapsdatatranslation.cpp:645
+#: mapsdatatranslation.cpp:648
 msgctxt "asia.kgm"
 msgid "Islamabad"
 msgstr "Islamabad"
 
-#: mapsdatatranslation.cpp:646
+#: mapsdatatranslation.cpp:649
 msgctxt "asia.kgm"
 msgid "Laos"
 msgstr "Laos"
 
-#: mapsdatatranslation.cpp:647
+#: mapsdatatranslation.cpp:650
 msgctxt "asia.kgm"
 msgid "Vientiane"
 msgstr "Vientiane"
 
-#: mapsdatatranslation.cpp:648
+#: mapsdatatranslation.cpp:651
 msgctxt "asia.kgm"
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: mapsdatatranslation.cpp:649
+#: mapsdatatranslation.cpp:652
 msgctxt "asia.kgm"
 msgid "Phnom Penh"
 msgstr "Phnom Penh"
 
-#: mapsdatatranslation.cpp:650
+#: mapsdatatranslation.cpp:653
 msgctxt "asia.kgm"
 msgid "Brunei"
 msgstr "Brwnei"
 
-#: mapsdatatranslation.cpp:651
+#: mapsdatatranslation.cpp:654
 msgctxt "asia.kgm"
 msgid "Bandar Seri Begawan"
 msgstr "Bandar Seri Begawan"
 
-#: mapsdatatranslation.cpp:652
+#: mapsdatatranslation.cpp:655
 msgctxt "asia.kgm"
 msgid "Philippines"
 msgstr "Philipinau"
 
-#: mapsdatatranslation.cpp:653
+#: mapsdatatranslation.cpp:656
 msgctxt "asia.kgm"
 msgid "Manila"
 msgstr "Manila"
 
-#: mapsdatatranslation.cpp:654
+#: mapsdatatranslation.cpp:657
 msgctxt "asia.kgm"
 msgid "Thailand"
 msgstr "Gwlad y Thai"
 
-#: mapsdatatranslation.cpp:655
+#: mapsdatatranslation.cpp:658
 msgctxt "asia.kgm"
 msgid "Bangkok"
 msgstr "Bangcoc"
 
-#: mapsdatatranslation.cpp:656
+#: mapsdatatranslation.cpp:659
 msgctxt "asia.kgm"
 msgid "Vietnam"
 msgstr "Fietnam"
 
-#: mapsdatatranslation.cpp:657
+#: mapsdatatranslation.cpp:660
 msgctxt "asia.kgm"
 msgid "Hanoi"
 msgstr "Hanoi"
 
-#: mapsdatatranslation.cpp:658
+#: mapsdatatranslation.cpp:661
 msgctxt "asia.kgm"
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: mapsdatatranslation.cpp:659
+#: mapsdatatranslation.cpp:662
 msgctxt "asia.kgm"
 msgid "Taipei"
 msgstr "Taipei"
 
-#: mapsdatatranslation.cpp:660 mapsdatatranslation.cpp:661
+#: mapsdatatranslation.cpp:663 mapsdatatranslation.cpp:664
 msgctxt "asia.kgm"
 msgid "Singapore"
 msgstr "Singapor"
 
-#: mapsdatatranslation.cpp:662
+#: mapsdatatranslation.cpp:665
 msgctxt "asia.kgm"
 msgid "North Korea"
 msgstr "Gogledd Corea"
 
-#: mapsdatatranslation.cpp:663
+#: mapsdatatranslation.cpp:666
 msgctxt "asia.kgm"
 msgid "Pyeongyang"
 msgstr "Piwngiang"
 
-#: mapsdatatranslation.cpp:664
+#: mapsdatatranslation.cpp:667
 msgctxt "asia.kgm"
 msgid "South Korea"
 msgstr "De Corea"
 
-#: mapsdatatranslation.cpp:665
+#: mapsdatatranslation.cpp:668
 msgctxt "asia.kgm"
 msgid "Seoul"
 msgstr "Seoul"
 
-#: mapsdatatranslation.cpp:666
+#: mapsdatatranslation.cpp:669
 msgctxt "asia.kgm"
 msgid "East Timor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:667
+#: mapsdatatranslation.cpp:670
 msgctxt "asia.kgm"
 msgid "Dili"
 msgstr ""
 
-#: mapsdatatranslation.cpp:668
+#: mapsdatatranslation.cpp:671
 msgctxt "asia.kgm"
 msgid "Tanzania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:669
+#: mapsdatatranslation.cpp:672
 msgctxt "asia.kgm"
 msgid "Zambia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:670
+#: mapsdatatranslation.cpp:673
 msgctxt "asia.kgm"
 msgid "Mozambique"
 msgstr ""
 
-#: mapsdatatranslation.cpp:671
+#: mapsdatatranslation.cpp:674
 msgctxt "asia.kgm"
 msgid "Malawi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:672
+#: mapsdatatranslation.cpp:675
 msgctxt "asia.kgm"
 msgid "Madagascar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:673
+#: mapsdatatranslation.cpp:676
 msgctxt "asia.kgm"
 msgid "Papua New Guinea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:674
+#: mapsdatatranslation.cpp:677
 msgctxt "asia.kgm"
 msgid "Australia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:675
+#: mapsdatatranslation.cpp:678
 msgctxt "asia.kgm"
 msgid "Cyprus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:676
+#: mapsdatatranslation.cpp:679
 msgctxt "assam.kgm"
 msgid "Assam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:677
+#: mapsdatatranslation.cpp:680
 msgctxt "assam.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:678
+#: mapsdatatranslation.cpp:681
 msgctxt "assam.kgm"
 msgid "Not Assam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:679
+#: mapsdatatranslation.cpp:682
 msgctxt "assam.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:680 mapsdatatranslation.cpp:681
+#: mapsdatatranslation.cpp:683 mapsdatatranslation.cpp:684
 msgctxt "assam.kgm"
 msgid "Kokrajhar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:682 mapsdatatranslation.cpp:683
+#: mapsdatatranslation.cpp:685 mapsdatatranslation.cpp:686
 msgctxt "assam.kgm"
 msgid "Dhuburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:684 mapsdatatranslation.cpp:685
+#: mapsdatatranslation.cpp:687 mapsdatatranslation.cpp:688
 msgctxt "assam.kgm"
 msgid "Goalpara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:686 mapsdatatranslation.cpp:687
+#: mapsdatatranslation.cpp:689 mapsdatatranslation.cpp:690
 msgctxt "assam.kgm"
 msgid "Bongaigaon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:688 mapsdatatranslation.cpp:689
+#: mapsdatatranslation.cpp:691 mapsdatatranslation.cpp:692
 msgctxt "assam.kgm"
 msgid "Barpeta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:690 mapsdatatranslation.cpp:691
+#: mapsdatatranslation.cpp:693 mapsdatatranslation.cpp:694
 msgctxt "assam.kgm"
 msgid "Nalbari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:692 mapsdatatranslation.cpp:693
+#: mapsdatatranslation.cpp:695 mapsdatatranslation.cpp:696
 msgctxt "assam.kgm"
 msgid "Dispur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:694
+#: mapsdatatranslation.cpp:697
 msgctxt "assam.kgm"
 msgid "Kamrup"
 msgstr ""
 
-#: mapsdatatranslation.cpp:695
+#: mapsdatatranslation.cpp:698
 msgctxt "assam.kgm"
 msgid "Guwahati"
 msgstr ""
 
-#: mapsdatatranslation.cpp:696 mapsdatatranslation.cpp:697
+#: mapsdatatranslation.cpp:699 mapsdatatranslation.cpp:700
 msgctxt "assam.kgm"
 msgid "Darrang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:698 mapsdatatranslation.cpp:699
+#: mapsdatatranslation.cpp:701 mapsdatatranslation.cpp:702
 msgctxt "assam.kgm"
 msgid "Marigaon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:700
+#: mapsdatatranslation.cpp:703
 msgctxt "assam.kgm"
 msgid "Karbi Anglong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:701
+#: mapsdatatranslation.cpp:704
 msgctxt "assam.kgm"
 msgid "Diphu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:702
+#: mapsdatatranslation.cpp:705
 msgctxt "assam.kgm"
 msgid "North Cachar Hills"
 msgstr ""
 
-#: mapsdatatranslation.cpp:703
+#: mapsdatatranslation.cpp:706
 msgctxt "assam.kgm"
 msgid "Haflong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:704
+#: mapsdatatranslation.cpp:707
 msgctxt "assam.kgm"
 msgid "Cachar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:705
+#: mapsdatatranslation.cpp:708
 msgctxt "assam.kgm"
 msgid "Silchar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:706 mapsdatatranslation.cpp:707
+#: mapsdatatranslation.cpp:709 mapsdatatranslation.cpp:710
 msgctxt "assam.kgm"
 msgid "Hailakandi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:708 mapsdatatranslation.cpp:709
+#: mapsdatatranslation.cpp:711 mapsdatatranslation.cpp:712
 msgctxt "assam.kgm"
 msgid "Karimganj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:710 mapsdatatranslation.cpp:711
+#: mapsdatatranslation.cpp:713 mapsdatatranslation.cpp:714
 msgctxt "assam.kgm"
 msgid "Golaghat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:712 mapsdatatranslation.cpp:713
+#: mapsdatatranslation.cpp:715 mapsdatatranslation.cpp:716
 msgctxt "assam.kgm"
 msgid "Nagaon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:714 mapsdatatranslation.cpp:715
+#: mapsdatatranslation.cpp:717 mapsdatatranslation.cpp:718
 msgctxt "assam.kgm"
 msgid "Sonitpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:716
+#: mapsdatatranslation.cpp:719
 msgctxt "assam.kgm"
 msgid "Lakhimpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:717
+#: mapsdatatranslation.cpp:720
 msgctxt "assam.kgm"
 msgid "North Lakhimpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:718 mapsdatatranslation.cpp:719
+#: mapsdatatranslation.cpp:721 mapsdatatranslation.cpp:722
 msgctxt "assam.kgm"
 msgid "Jorhat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:720 mapsdatatranslation.cpp:721
+#: mapsdatatranslation.cpp:723 mapsdatatranslation.cpp:724
 msgctxt "assam.kgm"
 msgid "Dhemaji"
 msgstr ""
 
-#: mapsdatatranslation.cpp:722 mapsdatatranslation.cpp:723
+#: mapsdatatranslation.cpp:725 mapsdatatranslation.cpp:726
 msgctxt "assam.kgm"
 msgid "Sibsagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:724 mapsdatatranslation.cpp:725
+#: mapsdatatranslation.cpp:727 mapsdatatranslation.cpp:728
 msgctxt "assam.kgm"
 msgid "Dibrugarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:726 mapsdatatranslation.cpp:727
+#: mapsdatatranslation.cpp:729 mapsdatatranslation.cpp:730
 msgctxt "assam.kgm"
 msgid "Tinsukia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:728
+#: mapsdatatranslation.cpp:731
 msgctxt "australia.kgm"
 msgid "Australia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:729
+#: mapsdatatranslation.cpp:732
 msgctxt "australia.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:730
+#: mapsdatatranslation.cpp:733
 msgctxt "australia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:731
+#: mapsdatatranslation.cpp:734
 msgctxt "australia.kgm"
 msgid "Not Australia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:732
+#: mapsdatatranslation.cpp:735
 msgctxt "australia.kgm"
 msgid "Coast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:733
+#: mapsdatatranslation.cpp:736
 msgctxt "australia.kgm"
 msgid "Australian Capital Territory"
 msgstr ""
 
-#: mapsdatatranslation.cpp:734
+#: mapsdatatranslation.cpp:737
 msgctxt "australia.kgm"
 msgid "Canberra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:735
+#: mapsdatatranslation.cpp:738
 msgctxt "australia.kgm"
 msgid "New South Wales"
 msgstr ""
 
-#: mapsdatatranslation.cpp:736
+#: mapsdatatranslation.cpp:739
 msgctxt "australia.kgm"
 msgid "Sydney"
 msgstr ""
 
-#: mapsdatatranslation.cpp:737
+#: mapsdatatranslation.cpp:740
 msgctxt "australia.kgm"
 msgid "Victoria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:738
+#: mapsdatatranslation.cpp:741
 msgctxt "australia.kgm"
 msgid "Melbourne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:739
+#: mapsdatatranslation.cpp:742
 msgctxt "australia.kgm"
 msgid "Queensland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:740
+#: mapsdatatranslation.cpp:743
 msgctxt "australia.kgm"
 msgid "Brisbane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:741
+#: mapsdatatranslation.cpp:744
 msgctxt "australia.kgm"
 msgid "South Australia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:742
+#: mapsdatatranslation.cpp:745
 msgctxt "australia.kgm"
 msgid "Adelaide"
 msgstr ""
 
-#: mapsdatatranslation.cpp:743
+#: mapsdatatranslation.cpp:746
 msgctxt "australia.kgm"
 msgid "Western Australia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:744
+#: mapsdatatranslation.cpp:747
 msgctxt "australia.kgm"
 msgid "Perth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:745
+#: mapsdatatranslation.cpp:748
 msgctxt "australia.kgm"
 msgid "Tasmania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:746
+#: mapsdatatranslation.cpp:749
 msgctxt "australia.kgm"
 msgid "Hobart"
 msgstr ""
 
-#: mapsdatatranslation.cpp:747
+#: mapsdatatranslation.cpp:750
 msgctxt "australia.kgm"
 msgid "Northern Territory"
 msgstr ""
 
-#: mapsdatatranslation.cpp:748
+#: mapsdatatranslation.cpp:751
 msgctxt "australia.kgm"
 msgid "Darwin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:749
+#: mapsdatatranslation.cpp:752
 msgctxt "austria.kgm"
 msgid "Austria"
 msgstr "Awstria"
 
-#: mapsdatatranslation.cpp:750
+#: mapsdatatranslation.cpp:753
 msgctxt "austria.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:751
+#: mapsdatatranslation.cpp:754
 msgctxt "austria.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:752
+#: mapsdatatranslation.cpp:755
 msgctxt "austria.kgm"
 msgid "Not Austria"
 msgstr "Dim Awstria"
 
-#: mapsdatatranslation.cpp:753 mapsdatatranslation.cpp:754
+#: mapsdatatranslation.cpp:756 mapsdatatranslation.cpp:757
 msgctxt "austria.kgm"
 msgid "Vienna"
 msgstr "Fiena"
 
-#: mapsdatatranslation.cpp:755
+#: mapsdatatranslation.cpp:758
 msgctxt "austria.kgm"
 msgid "Burgenland"
 msgstr "Burgenland"
 
-#: mapsdatatranslation.cpp:756
+#: mapsdatatranslation.cpp:759
 msgctxt "austria.kgm"
 msgid "Eisenstadt"
 msgstr "Eisenstadt"
 
-#: mapsdatatranslation.cpp:757
+#: mapsdatatranslation.cpp:760
 msgctxt "austria.kgm"
 msgid "Styria"
 msgstr "Styria"
 
-#: mapsdatatranslation.cpp:758
+#: mapsdatatranslation.cpp:761
 msgctxt "austria.kgm"
 msgid "Graz"
 msgstr "Graz"
 
-#: mapsdatatranslation.cpp:759
+#: mapsdatatranslation.cpp:762
 msgctxt "austria.kgm"
 msgid "Carinthia"
 msgstr "Carinthia"
 
-#: mapsdatatranslation.cpp:760
+#: mapsdatatranslation.cpp:763
 msgctxt "austria.kgm"
 msgid "Klagenfurt"
 msgstr "Klagenfurt"
 
-#: mapsdatatranslation.cpp:761
+#: mapsdatatranslation.cpp:764
 msgctxt "austria.kgm"
 msgid "Tyrol"
 msgstr "Tyrol"
 
-#: mapsdatatranslation.cpp:762
+#: mapsdatatranslation.cpp:765
 msgctxt "austria.kgm"
 msgid "Innsbruck"
 msgstr "Innsbruck"
 
-#: mapsdatatranslation.cpp:763
+#: mapsdatatranslation.cpp:766
 msgctxt "austria.kgm"
 msgid "Vorarlberg"
 msgstr "Vorarlberg"
 
-#: mapsdatatranslation.cpp:764
+#: mapsdatatranslation.cpp:767
 msgctxt "austria.kgm"
 msgid "Bregenz"
 msgstr "Bregenz"
 
-#: mapsdatatranslation.cpp:765 mapsdatatranslation.cpp:766
+#: mapsdatatranslation.cpp:768 mapsdatatranslation.cpp:769
 msgctxt "austria.kgm"
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: mapsdatatranslation.cpp:767
+#: mapsdatatranslation.cpp:770
 msgctxt "austria.kgm"
 msgid "Upper Austria"
 msgstr "Upper Awstria"
 
-#: mapsdatatranslation.cpp:768
+#: mapsdatatranslation.cpp:771
 msgctxt "austria.kgm"
 msgid "Linz"
 msgstr "Linz"
 
-#: mapsdatatranslation.cpp:769
+#: mapsdatatranslation.cpp:772
 msgctxt "austria.kgm"
 msgid "Lower Austria"
 msgstr "Lower Awstria"
 
-#: mapsdatatranslation.cpp:770
+#: mapsdatatranslation.cpp:773
 msgctxt "austria.kgm"
 msgid "St. Pölten"
 msgstr "St. Pölten"
 
-#: mapsdatatranslation.cpp:771
+#: mapsdatatranslation.cpp:774
 msgctxt "azerbaijan.kgm"
 msgid "Azerbaijan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:772
+#: mapsdatatranslation.cpp:775
 msgctxt "azerbaijan.kgm"
 msgid "Rayons"
 msgstr ""
 
-#: mapsdatatranslation.cpp:773
+#: mapsdatatranslation.cpp:776
 msgctxt "azerbaijan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:774
+#: mapsdatatranslation.cpp:777
 msgctxt "azerbaijan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:775
+#: mapsdatatranslation.cpp:778
 msgctxt "azerbaijan.kgm"
 msgid "Not Azerbaijan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:776
+#: mapsdatatranslation.cpp:779
 msgctxt "azerbaijan.kgm"
 msgid "Absheron"
 msgstr ""
 
-#: mapsdatatranslation.cpp:777
+#: mapsdatatranslation.cpp:780
 msgctxt "azerbaijan.kgm"
 msgid "Agjabadi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:778
+#: mapsdatatranslation.cpp:781
 msgctxt "azerbaijan.kgm"
 msgid "Agdam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:779
+#: mapsdatatranslation.cpp:782
 msgctxt "azerbaijan.kgm"
 msgid "Agdash"
 msgstr ""
 
-#: mapsdatatranslation.cpp:780
+#: mapsdatatranslation.cpp:783
 msgctxt "azerbaijan.kgm"
 msgid "Agstafa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:781
+#: mapsdatatranslation.cpp:784
 msgctxt "azerbaijan.kgm"
 msgid "Agsu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:782
+#: mapsdatatranslation.cpp:785
 msgctxt "azerbaijan.kgm"
-msgid "Ali Bayramli city"
+msgid "Shirvan city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:783
+#: mapsdatatranslation.cpp:786
 msgctxt "azerbaijan.kgm"
 msgid "Astara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:784
+#: mapsdatatranslation.cpp:787
 msgctxt "azerbaijan.kgm"
 msgid "Baku city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:785
+#: mapsdatatranslation.cpp:788
 msgctxt "azerbaijan.kgm"
 msgid "Balakan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:786
+#: mapsdatatranslation.cpp:789
 msgctxt "azerbaijan.kgm"
 msgid "Barda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:787
+#: mapsdatatranslation.cpp:790
 msgctxt "azerbaijan.kgm"
 msgid "Beylagan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:788
+#: mapsdatatranslation.cpp:791
 msgctxt "azerbaijan.kgm"
 msgid "Bilasuvar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:789
+#: mapsdatatranslation.cpp:792
 msgctxt "azerbaijan.kgm"
 msgid "Jabrayil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:790
+#: mapsdatatranslation.cpp:793
 msgctxt "azerbaijan.kgm"
 msgid "Jalilabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:791
+#: mapsdatatranslation.cpp:794
 msgctxt "azerbaijan.kgm"
 msgid "Dashkasan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:792
+#: mapsdatatranslation.cpp:795
 msgctxt "azerbaijan.kgm"
 msgid "Davachi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:793
+#: mapsdatatranslation.cpp:796
 msgctxt "azerbaijan.kgm"
 msgid "Fizuli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:794
+#: mapsdatatranslation.cpp:797
 msgctxt "azerbaijan.kgm"
 msgid "Gadabay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:795
+#: mapsdatatranslation.cpp:798
 msgctxt "azerbaijan.kgm"
 msgid "Ganja city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:796
+#: mapsdatatranslation.cpp:799
 msgctxt "azerbaijan.kgm"
 msgid "Goranboy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:797
+#: mapsdatatranslation.cpp:800
 msgctxt "azerbaijan.kgm"
 msgid "Goychay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:798
+#: mapsdatatranslation.cpp:801
 msgctxt "azerbaijan.kgm"
 msgid "Hajigabul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:799
+#: mapsdatatranslation.cpp:802
 msgctxt "azerbaijan.kgm"
 msgid "Imishli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:800
+#: mapsdatatranslation.cpp:803
 msgctxt "azerbaijan.kgm"
 msgid "Ismailli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:801
+#: mapsdatatranslation.cpp:804
 msgctxt "azerbaijan.kgm"
 msgid "Kalbajar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:802
+#: mapsdatatranslation.cpp:805
 msgctxt "azerbaijan.kgm"
 msgid "Kurdamir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:803
+#: mapsdatatranslation.cpp:806
 msgctxt "azerbaijan.kgm"
 msgid "Lachin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:804
+#: mapsdatatranslation.cpp:807
 msgctxt "azerbaijan.kgm"
 msgid "Lankaran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:805
+#: mapsdatatranslation.cpp:808
 msgctxt "azerbaijan.kgm"
 msgid "Lankaran city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:806
+#: mapsdatatranslation.cpp:809
 msgctxt "azerbaijan.kgm"
 msgid "Lerik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:807
+#: mapsdatatranslation.cpp:810
 msgctxt "azerbaijan.kgm"
 msgid "Masally"
 msgstr ""
 
-#: mapsdatatranslation.cpp:808
+#: mapsdatatranslation.cpp:811
 msgctxt "azerbaijan.kgm"
 msgid "Mingachevir city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:809
+#: mapsdatatranslation.cpp:812
 msgctxt "azerbaijan.kgm"
 msgid "Naftalan city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:810
+#: mapsdatatranslation.cpp:813
 msgctxt "azerbaijan.kgm"
 msgid "Neftchala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:811
+#: mapsdatatranslation.cpp:814
 msgctxt "azerbaijan.kgm"
 msgid "Oguz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:812
+#: mapsdatatranslation.cpp:815
 msgctxt "azerbaijan.kgm"
 msgid "Qabala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:813
+#: mapsdatatranslation.cpp:816
 msgctxt "azerbaijan.kgm"
 msgid "Qakh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:814
+#: mapsdatatranslation.cpp:817
 msgctxt "azerbaijan.kgm"
 msgid "Qazakh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:815
+#: mapsdatatranslation.cpp:818
 msgctxt "azerbaijan.kgm"
 msgid "Qobustan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:816
+#: mapsdatatranslation.cpp:819
 msgctxt "azerbaijan.kgm"
 msgid "Quba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:817
+#: mapsdatatranslation.cpp:820
 msgctxt "azerbaijan.kgm"
 msgid "Qubadli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:818
+#: mapsdatatranslation.cpp:821
 msgctxt "azerbaijan.kgm"
 msgid "Qusar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:819
+#: mapsdatatranslation.cpp:822
 msgctxt "azerbaijan.kgm"
 msgid "Saatly"
 msgstr ""
 
-#: mapsdatatranslation.cpp:820
+#: mapsdatatranslation.cpp:823
 msgctxt "azerbaijan.kgm"
 msgid "Sabirabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:821
+#: mapsdatatranslation.cpp:824
 msgctxt "azerbaijan.kgm"
 msgid "Shaki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:822
+#: mapsdatatranslation.cpp:825
 msgctxt "azerbaijan.kgm"
 msgid "Shaki city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:823
+#: mapsdatatranslation.cpp:826
 msgctxt "azerbaijan.kgm"
 msgid "Salyan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:824
+#: mapsdatatranslation.cpp:827
 msgctxt "azerbaijan.kgm"
 msgid "Shamakhi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:825
+#: mapsdatatranslation.cpp:828
 msgctxt "azerbaijan.kgm"
 msgid "Shamkir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:826
+#: mapsdatatranslation.cpp:829
 msgctxt "azerbaijan.kgm"
 msgid "Samukh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:827
+#: mapsdatatranslation.cpp:830
 msgctxt "azerbaijan.kgm"
 msgid "Siazan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:828
+#: mapsdatatranslation.cpp:831
 msgctxt "azerbaijan.kgm"
 msgid "Sumqayit city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:829
+#: mapsdatatranslation.cpp:832
 msgctxt "azerbaijan.kgm"
 msgid "Shusha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:830
+#: mapsdatatranslation.cpp:833
 msgctxt "azerbaijan.kgm"
 msgid "Shusha city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:831
+#: mapsdatatranslation.cpp:834
 msgctxt "azerbaijan.kgm"
 msgid "Tartar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:832
+#: mapsdatatranslation.cpp:835
 msgctxt "azerbaijan.kgm"
 msgid "Tovuz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:833
+#: mapsdatatranslation.cpp:836
 msgctxt "azerbaijan.kgm"
 msgid "Ujar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:834
+#: mapsdatatranslation.cpp:837
 msgctxt "azerbaijan.kgm"
 msgid "Khachmaz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:835
+#: mapsdatatranslation.cpp:838
 msgctxt "azerbaijan.kgm"
 msgid "Khankendi city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:836
+#: mapsdatatranslation.cpp:839
 msgctxt "azerbaijan.kgm"
 msgid "Goygol"
 msgstr ""
 
-#: mapsdatatranslation.cpp:837
+#: mapsdatatranslation.cpp:840
 msgctxt "azerbaijan.kgm"
 msgid "Khizi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:838
+#: mapsdatatranslation.cpp:841
 msgctxt "azerbaijan.kgm"
 msgid "Khojali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:839
+#: mapsdatatranslation.cpp:842
 msgctxt "azerbaijan.kgm"
 msgid "Khojavend"
 msgstr ""
 
-#: mapsdatatranslation.cpp:840
+#: mapsdatatranslation.cpp:843
 msgctxt "azerbaijan.kgm"
 msgid "Yardymli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:841
+#: mapsdatatranslation.cpp:844
 msgctxt "azerbaijan.kgm"
 msgid "Yevlakh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:842
+#: mapsdatatranslation.cpp:845
 msgctxt "azerbaijan.kgm"
 msgid "Yevlakh city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:843
+#: mapsdatatranslation.cpp:846
 msgctxt "azerbaijan.kgm"
 msgid "Zangilan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:844
+#: mapsdatatranslation.cpp:847
 msgctxt "azerbaijan.kgm"
 msgid "Zaqatala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:845
+#: mapsdatatranslation.cpp:848
 msgctxt "azerbaijan.kgm"
 msgid "Zardab"
 msgstr ""
 
-#: mapsdatatranslation.cpp:846
+#: mapsdatatranslation.cpp:849
 msgctxt "azerbaijan.kgm"
 msgid "Babek"
 msgstr ""
 
-#: mapsdatatranslation.cpp:847
+#: mapsdatatranslation.cpp:850
 msgctxt "azerbaijan.kgm"
 msgid "Julfa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:848
+#: mapsdatatranslation.cpp:851
 msgctxt "azerbaijan.kgm"
 msgid "Kangarli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:849
+#: mapsdatatranslation.cpp:852
 msgctxt "azerbaijan.kgm"
 msgid "Nakhichevan City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:850
+#: mapsdatatranslation.cpp:853
 msgctxt "azerbaijan.kgm"
 msgid "Ordubad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:851
+#: mapsdatatranslation.cpp:854
 msgctxt "azerbaijan.kgm"
 msgid "Sadarak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:852
+#: mapsdatatranslation.cpp:855
 msgctxt "azerbaijan.kgm"
 msgid "Shakhbuz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:853
+#: mapsdatatranslation.cpp:856
 msgctxt "azerbaijan.kgm"
 msgid "Sharur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:854
+#: mapsdatatranslation.cpp:857
 msgctxt "bangladesh.kgm"
 msgid "Bangladesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:855
+#: mapsdatatranslation.cpp:858
 msgctxt "bangladesh.kgm"
 msgid "Divisions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:856
+#: mapsdatatranslation.cpp:859
 msgctxt "bangladesh.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:857
+#: mapsdatatranslation.cpp:860
 msgctxt "bangladesh.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:858
+#: mapsdatatranslation.cpp:861
 msgctxt "bangladesh.kgm"
 msgid "Not Bangladesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:859
+#: mapsdatatranslation.cpp:862
 msgctxt "bangladesh.kgm"
 msgid "Barisa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:860
+#: mapsdatatranslation.cpp:863
 msgctxt "bangladesh.kgm"
 msgid "Chittagong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:861
+#: mapsdatatranslation.cpp:864
 msgctxt "bangladesh.kgm"
 msgid "Dhaka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:862
+#: mapsdatatranslation.cpp:865
 msgctxt "bangladesh.kgm"
 msgid "Khulna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:863
+#: mapsdatatranslation.cpp:866
 msgctxt "bangladesh.kgm"
 msgid "Rajshahi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:864
+#: mapsdatatranslation.cpp:867
 msgctxt "bangladesh.kgm"
 msgid "Sylhet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:865
+#: mapsdatatranslation.cpp:868
 msgctxt "belarus.kgm"
 msgid "Belarus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:866
+#: mapsdatatranslation.cpp:869
 msgctxt "belarus.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:867 mapsdatatranslation.cpp:868
+#: mapsdatatranslation.cpp:870 mapsdatatranslation.cpp:871
 msgctxt "belarus.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:869
+#: mapsdatatranslation.cpp:872
 msgctxt "belarus.kgm"
 msgid "Not Belarus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:870
+#: mapsdatatranslation.cpp:873
 msgctxt "belarus.kgm"
 msgid "Minsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:871
+#: mapsdatatranslation.cpp:874
 msgctxt "belarus.kgm"
 msgid "Brest Voblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:872
+#: mapsdatatranslation.cpp:875
 msgctxt "belarus.kgm"
 msgid "Homyel Voblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:873
+#: mapsdatatranslation.cpp:876
 msgctxt "belarus.kgm"
 msgid "Hrodna Voblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:874
+#: mapsdatatranslation.cpp:877
 msgctxt "belarus.kgm"
 msgid "Mahilyow Voblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:875
+#: mapsdatatranslation.cpp:878
 msgctxt "belarus.kgm"
 msgid "Minsk Voblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:876
+#: mapsdatatranslation.cpp:879
 msgctxt "belarus.kgm"
 msgid "Vitebsk Voblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:877
+#: mapsdatatranslation.cpp:880
 msgctxt "belgium.kgm"
 msgid "Belgium"
 msgstr ""
 
-#: mapsdatatranslation.cpp:878
+#: mapsdatatranslation.cpp:881
 msgctxt "belgium.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:879
+#: mapsdatatranslation.cpp:882
 msgctxt "belgium.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:880
+#: mapsdatatranslation.cpp:883
 msgctxt "belgium.kgm"
 msgid "Not Belgium"
 msgstr ""
 
-#: mapsdatatranslation.cpp:881
+#: mapsdatatranslation.cpp:884
 msgctxt "belgium.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:882 mapsdatatranslation.cpp:883
+#: mapsdatatranslation.cpp:885 mapsdatatranslation.cpp:886
 msgctxt "belgium.kgm"
 msgid "Antwerp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:884 mapsdatatranslation.cpp:885
+#: mapsdatatranslation.cpp:887 mapsdatatranslation.cpp:888
 msgctxt "belgium.kgm"
 msgid "Brussels"
 msgstr ""
 
-#: mapsdatatranslation.cpp:886
+#: mapsdatatranslation.cpp:889
 msgctxt "belgium.kgm"
 msgid "Flemish Brabant"
 msgstr ""
 
-#: mapsdatatranslation.cpp:887
+#: mapsdatatranslation.cpp:890
 msgctxt "belgium.kgm"
 msgid "Louvain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:888
+#: mapsdatatranslation.cpp:891
 msgctxt "belgium.kgm"
 msgid "West Flanders"
 msgstr ""
 
-#: mapsdatatranslation.cpp:889
+#: mapsdatatranslation.cpp:892
 msgctxt "belgium.kgm"
 msgid "Bruges"
 msgstr ""
 
-#: mapsdatatranslation.cpp:890
+#: mapsdatatranslation.cpp:893
 msgctxt "belgium.kgm"
 msgid "East Flanders"
 msgstr ""
 
-#: mapsdatatranslation.cpp:891
+#: mapsdatatranslation.cpp:894
 msgctxt "belgium.kgm"
 msgid "Ghent"
 msgstr ""
 
-#: mapsdatatranslation.cpp:892
+#: mapsdatatranslation.cpp:895
 msgctxt "belgium.kgm"
 msgid "Limburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:893
+#: mapsdatatranslation.cpp:896
 msgctxt "belgium.kgm"
 msgid "Hasselt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:894
+#: mapsdatatranslation.cpp:897
 msgctxt "belgium.kgm"
 msgid "Walloon Brabant"
 msgstr ""
 
-#: mapsdatatranslation.cpp:895
+#: mapsdatatranslation.cpp:898
 msgctxt "belgium.kgm"
 msgid "Wavre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:896
+#: mapsdatatranslation.cpp:899
 msgctxt "belgium.kgm"
 msgid "Hainaut"
 msgstr ""
 
-#: mapsdatatranslation.cpp:897
+#: mapsdatatranslation.cpp:900
 msgctxt "belgium.kgm"
 msgid "Mons"
 msgstr ""
 
-#: mapsdatatranslation.cpp:898 mapsdatatranslation.cpp:899
+#: mapsdatatranslation.cpp:901 mapsdatatranslation.cpp:902
 msgctxt "belgium.kgm"
 msgid "Liege"
 msgstr ""
 
-#: mapsdatatranslation.cpp:900
+#: mapsdatatranslation.cpp:903
 msgctxt "belgium.kgm"
 msgid "Luxembourg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:901
+#: mapsdatatranslation.cpp:904
 msgctxt "belgium.kgm"
 msgid "Arlon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:902 mapsdatatranslation.cpp:903
+#: mapsdatatranslation.cpp:905 mapsdatatranslation.cpp:906
 msgctxt "belgium.kgm"
 msgid "Namur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:904
+#: mapsdatatranslation.cpp:907
 msgctxt "belize.kgm"
 msgid "Belize"
 msgstr ""
 
-#: mapsdatatranslation.cpp:905
+#: mapsdatatranslation.cpp:908
 msgctxt "belize.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:906 mapsdatatranslation.cpp:907
+#: mapsdatatranslation.cpp:909 mapsdatatranslation.cpp:910
 msgctxt "belize.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:908
+#: mapsdatatranslation.cpp:911
 msgctxt "belize.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:909
+#: mapsdatatranslation.cpp:912
 msgctxt "belize.kgm"
 msgid "Not Belize"
 msgstr ""
 
-#: mapsdatatranslation.cpp:910
+#: mapsdatatranslation.cpp:913
 msgctxt "belize.kgm"
 msgid "Belize District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:911
+#: mapsdatatranslation.cpp:914
 msgctxt "belize.kgm"
 msgid "Belize City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:912
+#: mapsdatatranslation.cpp:915
 msgctxt "belize.kgm"
 msgid "Cayo District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:913
+#: mapsdatatranslation.cpp:916
 msgctxt "belize.kgm"
 msgid "San Ignacio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:914
+#: mapsdatatranslation.cpp:917
 msgctxt "belize.kgm"
 msgid "Corozal District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:915
+#: mapsdatatranslation.cpp:918
 msgctxt "belize.kgm"
 msgid "Corozal Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:916
+#: mapsdatatranslation.cpp:919
 msgctxt "belize.kgm"
 msgid "Orange Walk District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:917
+#: mapsdatatranslation.cpp:920
 msgctxt "belize.kgm"
 msgid "Orange Walk Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:918
+#: mapsdatatranslation.cpp:921
 msgctxt "belize.kgm"
 msgid "Stann Creek District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:919
+#: mapsdatatranslation.cpp:922
 msgctxt "belize.kgm"
 msgid "Dangriga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:920
+#: mapsdatatranslation.cpp:923
 msgctxt "belize.kgm"
 msgid "Toledo District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:921
+#: mapsdatatranslation.cpp:924
 msgctxt "belize.kgm"
 msgid "Punta Gorda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:922
+#: mapsdatatranslation.cpp:925
 msgctxt "bhutan.kgm"
 msgid "Bhutan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:923
+#: mapsdatatranslation.cpp:926
 msgctxt "bhutan.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:924
+#: mapsdatatranslation.cpp:927
 msgctxt "bhutan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:925
+#: mapsdatatranslation.cpp:928
 msgctxt "bhutan.kgm"
 msgid "Not Bhutan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:926
+#: mapsdatatranslation.cpp:929
 msgctxt "bhutan.kgm"
 msgid "Bumthang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:927
+#: mapsdatatranslation.cpp:930
 msgctxt "bhutan.kgm"
 msgid "Chukha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:928
+#: mapsdatatranslation.cpp:931
 msgctxt "bhutan.kgm"
 msgid "Dagana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:929
+#: mapsdatatranslation.cpp:932
 msgctxt "bhutan.kgm"
 msgid "Gasa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:930
+#: mapsdatatranslation.cpp:933
 msgctxt "bhutan.kgm"
 msgid "Haa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:931
+#: mapsdatatranslation.cpp:934
 msgctxt "bhutan.kgm"
 msgid "Lhuntse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:932
+#: mapsdatatranslation.cpp:935
 msgctxt "bhutan.kgm"
 msgid "Mongar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:933
+#: mapsdatatranslation.cpp:936
 msgctxt "bhutan.kgm"
 msgid "Paro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:934
+#: mapsdatatranslation.cpp:937
 msgctxt "bhutan.kgm"
 msgid "Pemagatshel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:935
+#: mapsdatatranslation.cpp:938
 msgctxt "bhutan.kgm"
 msgid "Punakha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:936
+#: mapsdatatranslation.cpp:939
 msgctxt "bhutan.kgm"
 msgid "Samdrup Jongkhar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:937
+#: mapsdatatranslation.cpp:940
 msgctxt "bhutan.kgm"
 msgid "Samtse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:938
+#: mapsdatatranslation.cpp:941
 msgctxt "bhutan.kgm"
 msgid "Sarpang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:939
+#: mapsdatatranslation.cpp:942
 msgctxt "bhutan.kgm"
 msgid "Thimphu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:940
+#: mapsdatatranslation.cpp:943
 msgctxt "bhutan.kgm"
 msgid "Trashigang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:941
+#: mapsdatatranslation.cpp:944
 msgctxt "bhutan.kgm"
 msgid "Trashiyangste"
 msgstr ""
 
-#: mapsdatatranslation.cpp:942
+#: mapsdatatranslation.cpp:945
 msgctxt "bhutan.kgm"
 msgid "Trongsa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:943
+#: mapsdatatranslation.cpp:946
 msgctxt "bhutan.kgm"
 msgid "Tsirang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:944
+#: mapsdatatranslation.cpp:947
 msgctxt "bhutan.kgm"
 msgid "Wangdue Phodrang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:945
+#: mapsdatatranslation.cpp:948
 msgctxt "bhutan.kgm"
 msgid "Zhemgang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:946
+#: mapsdatatranslation.cpp:949
 msgctxt "bolivia.kgm"
 msgid "Bolivia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:947
+#: mapsdatatranslation.cpp:950
 msgctxt "bolivia.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:948 mapsdatatranslation.cpp:949
+#: mapsdatatranslation.cpp:951 mapsdatatranslation.cpp:952
 msgctxt "bolivia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:950
+#: mapsdatatranslation.cpp:953
 msgctxt "bolivia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:951
+#: mapsdatatranslation.cpp:954
 msgctxt "bolivia.kgm"
 msgid "Not Bolivia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:952
+#: mapsdatatranslation.cpp:955
 msgctxt "bolivia.kgm"
 msgid "Beni"
 msgstr ""
 
-#: mapsdatatranslation.cpp:953
+#: mapsdatatranslation.cpp:956
 msgctxt "bolivia.kgm"
 msgid "Trinidad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:954
+#: mapsdatatranslation.cpp:957
 msgctxt "bolivia.kgm"
 msgid "Chuquisaca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:955
+#: mapsdatatranslation.cpp:958
 msgctxt "bolivia.kgm"
 msgid "Sucre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:956 mapsdatatranslation.cpp:957
+#: mapsdatatranslation.cpp:959 mapsdatatranslation.cpp:960
 msgctxt "bolivia.kgm"
 msgid "Cochabamba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:958 mapsdatatranslation.cpp:959
+#: mapsdatatranslation.cpp:961 mapsdatatranslation.cpp:962
 msgctxt "bolivia.kgm"
 msgid "La Paz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:960 mapsdatatranslation.cpp:961
+#: mapsdatatranslation.cpp:963 mapsdatatranslation.cpp:964
 msgctxt "bolivia.kgm"
 msgid "Oruro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:962
+#: mapsdatatranslation.cpp:965
 msgctxt "bolivia.kgm"
 msgid "Pando"
 msgstr ""
 
-#: mapsdatatranslation.cpp:963
+#: mapsdatatranslation.cpp:966
 msgctxt "bolivia.kgm"
 msgid "Cobija"
 msgstr ""
 
-#: mapsdatatranslation.cpp:964 mapsdatatranslation.cpp:965
+#: mapsdatatranslation.cpp:967 mapsdatatranslation.cpp:968
 msgctxt "bolivia.kgm"
 msgid "Potosí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:966 mapsdatatranslation.cpp:967
+#: mapsdatatranslation.cpp:969 mapsdatatranslation.cpp:970
 msgctxt "bolivia.kgm"
 msgid "Santa Cruz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:968 mapsdatatranslation.cpp:969
+#: mapsdatatranslation.cpp:971 mapsdatatranslation.cpp:972
 msgctxt "bolivia.kgm"
 msgid "Tarija"
 msgstr ""
 
-#: mapsdatatranslation.cpp:970
+#: mapsdatatranslation.cpp:973
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Bosnia-Herzegovina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:971
+#: mapsdatatranslation.cpp:974
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Cantons"
 msgstr ""
 
-#: mapsdatatranslation.cpp:972
+#: mapsdatatranslation.cpp:975
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:973
+#: mapsdatatranslation.cpp:976
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:974
+#: mapsdatatranslation.cpp:977
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Not Bosnia-Herzegovina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:975
+#: mapsdatatranslation.cpp:978
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Brčko"
 msgstr ""
 
-#: mapsdatatranslation.cpp:976
+#: mapsdatatranslation.cpp:979
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Bosnian Podrinje"
 msgstr ""
 
-#: mapsdatatranslation.cpp:977
+#: mapsdatatranslation.cpp:980
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Central Bosnia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:978
+#: mapsdatatranslation.cpp:981
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Herzegovina-Neretva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:979
+#: mapsdatatranslation.cpp:982
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Posavina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:980
+#: mapsdatatranslation.cpp:983
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Sarajevo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:981
+#: mapsdatatranslation.cpp:984
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Tuzla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:982
+#: mapsdatatranslation.cpp:985
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Una Sana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:983
+#: mapsdatatranslation.cpp:986
 msgctxt "bosnia-herzegovina.kgm"
 msgid "West Bosnia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:984
+#: mapsdatatranslation.cpp:987
 msgctxt "bosnia-herzegovina.kgm"
 msgid "West Herzegovina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:985
+#: mapsdatatranslation.cpp:988
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Zenica-Doboj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:986
+#: mapsdatatranslation.cpp:989
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Banja Luka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:987
+#: mapsdatatranslation.cpp:990
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Doboj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:988
+#: mapsdatatranslation.cpp:991
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Bijeljina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:989
+#: mapsdatatranslation.cpp:992
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Vlasenica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:990
+#: mapsdatatranslation.cpp:993
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Sarajevo-Romanija or Sokolac"
 msgstr ""
 
-#: mapsdatatranslation.cpp:991
+#: mapsdatatranslation.cpp:994
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Foča"
 msgstr ""
 
-#: mapsdatatranslation.cpp:992
+#: mapsdatatranslation.cpp:995
 msgctxt "bosnia-herzegovina.kgm"
 msgid "Trebinje"
 msgstr ""
 
-#: mapsdatatranslation.cpp:993
+#: mapsdatatranslation.cpp:996
 msgctxt "botswana.kgm"
 msgid "Botswana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:994
+#: mapsdatatranslation.cpp:997
 msgctxt "botswana.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:995
+#: mapsdatatranslation.cpp:998
 msgctxt "botswana.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:996
+#: mapsdatatranslation.cpp:999
 msgctxt "botswana.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:997
+#: mapsdatatranslation.cpp:1000
 msgctxt "botswana.kgm"
 msgid "Not Botswana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:998
+#: mapsdatatranslation.cpp:1001
 msgctxt "botswana.kgm"
 msgid "Central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:999
+#: mapsdatatranslation.cpp:1002
 msgctxt "botswana.kgm"
 msgid "Serowe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1000 mapsdatatranslation.cpp:1001
+#: mapsdatatranslation.cpp:1003 mapsdatatranslation.cpp:1004
 msgctxt "botswana.kgm"
 msgid "Ghanzi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1002
+#: mapsdatatranslation.cpp:1005
 msgctxt "botswana.kgm"
 msgid "Kgalagadi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1003
+#: mapsdatatranslation.cpp:1006
 msgctxt "botswana.kgm"
 msgid "Tshabong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1004
+#: mapsdatatranslation.cpp:1007
 msgctxt "botswana.kgm"
 msgid "Kgatleng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1005
+#: mapsdatatranslation.cpp:1008
 msgctxt "botswana.kgm"
 msgid "Mochudi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1006
+#: mapsdatatranslation.cpp:1009
 msgctxt "botswana.kgm"
 msgid "Kweneng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1007
+#: mapsdatatranslation.cpp:1010
 msgctxt "botswana.kgm"
 msgid "Molepolole"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1008
+#: mapsdatatranslation.cpp:1011
 msgctxt "botswana.kgm"
 msgid "North-East"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1009
+#: mapsdatatranslation.cpp:1012
 msgctxt "botswana.kgm"
 msgid "Francistown"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1010
+#: mapsdatatranslation.cpp:1013
 msgctxt "botswana.kgm"
 msgid "North-West"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1011
+#: mapsdatatranslation.cpp:1014
 msgctxt "botswana.kgm"
 msgid "Maun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1012
+#: mapsdatatranslation.cpp:1015
 msgctxt "botswana.kgm"
 msgid "South-East"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1013
+#: mapsdatatranslation.cpp:1016
 msgctxt "botswana.kgm"
 msgid "Gaborone"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1014
+#: mapsdatatranslation.cpp:1017
 msgctxt "botswana.kgm"
 msgid "Southern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1015
+#: mapsdatatranslation.cpp:1018
 msgctxt "botswana.kgm"
 msgid "Kanye"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1016
+#: mapsdatatranslation.cpp:1019
 msgctxt "brazil.kgm"
 msgid "Brazil"
 msgstr "Brasil"
 
-#: mapsdatatranslation.cpp:1017
+#: mapsdatatranslation.cpp:1020
 msgctxt "brazil.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1018
+#: mapsdatatranslation.cpp:1021
 msgctxt "brazil.kgm"
 msgid "Sergipe"
 msgstr "Sergipe"
 
-#: mapsdatatranslation.cpp:1019
+#: mapsdatatranslation.cpp:1022
 msgctxt "brazil.kgm"
 msgid "Aracaju"
 msgstr "Aracaju"
 
-#: mapsdatatranslation.cpp:1020
+#: mapsdatatranslation.cpp:1023
 msgctxt "brazil.kgm"
 msgid "Para"
 msgstr "Para"
 
-#: mapsdatatranslation.cpp:1021
+#: mapsdatatranslation.cpp:1024
 msgctxt "brazil.kgm"
 msgid "Belem"
 msgstr "Belem"
 
-#: mapsdatatranslation.cpp:1022
+#: mapsdatatranslation.cpp:1025
 msgctxt "brazil.kgm"
 msgid "Minas Gerais"
 msgstr "Minas Gerais"
 
-#: mapsdatatranslation.cpp:1023
+#: mapsdatatranslation.cpp:1026
 msgctxt "brazil.kgm"
 msgid "Belo Horizonte"
 msgstr "Belo Horizonte"
 
-#: mapsdatatranslation.cpp:1024
+#: mapsdatatranslation.cpp:1027
 msgctxt "brazil.kgm"
 msgid "Roraima"
 msgstr "Roraima"
 
-#: mapsdatatranslation.cpp:1025
+#: mapsdatatranslation.cpp:1028
 msgctxt "brazil.kgm"
 msgid "Boa Vista"
 msgstr "Boa Vista"
 
-#: mapsdatatranslation.cpp:1026
+#: mapsdatatranslation.cpp:1029
 msgctxt "brazil.kgm"
 msgid "Federal District"
 msgstr "Rhanbarth Ffederal"
 
-#: mapsdatatranslation.cpp:1027
+#: mapsdatatranslation.cpp:1030
 msgctxt "brazil.kgm"
 msgid "Brasilia"
 msgstr "Brasilia"
 
-#: mapsdatatranslation.cpp:1028
+#: mapsdatatranslation.cpp:1031
 msgctxt "brazil.kgm"
 msgid "Mato Grosso do Sul"
 msgstr "Mato Grosso do Sul"
 
-#: mapsdatatranslation.cpp:1029
+#: mapsdatatranslation.cpp:1032
 msgctxt "brazil.kgm"
 msgid "Campo Grande"
 msgstr "Campo Grande"
 
-#: mapsdatatranslation.cpp:1030
+#: mapsdatatranslation.cpp:1033
 msgctxt "brazil.kgm"
 msgid "Mato Grosso"
 msgstr "Mato Grosso"
 
-#: mapsdatatranslation.cpp:1031
+#: mapsdatatranslation.cpp:1034
 msgctxt "brazil.kgm"
 msgid "Cuiaba"
 msgstr "Cuiaba"
 
-#: mapsdatatranslation.cpp:1032
+#: mapsdatatranslation.cpp:1035
 msgctxt "brazil.kgm"
 msgid "Parana"
 msgstr "Parana"
 
-#: mapsdatatranslation.cpp:1033
+#: mapsdatatranslation.cpp:1036
 msgctxt "brazil.kgm"
 msgid "Curitiba"
 msgstr "Curitiba"
 
-#: mapsdatatranslation.cpp:1034
+#: mapsdatatranslation.cpp:1037
 msgctxt "brazil.kgm"
 msgid "Santa Catarina"
 msgstr "Santa Catarina"
 
-#: mapsdatatranslation.cpp:1035
+#: mapsdatatranslation.cpp:1038
 msgctxt "brazil.kgm"
 msgid "Florianopolis"
 msgstr "Florianopolis"
 
-#: mapsdatatranslation.cpp:1036
+#: mapsdatatranslation.cpp:1039
 msgctxt "brazil.kgm"
 msgid "Ceara"
 msgstr "Ceara"
 
-#: mapsdatatranslation.cpp:1037
+#: mapsdatatranslation.cpp:1040
 msgctxt "brazil.kgm"
 msgid "Fortaleza"
 msgstr "Fortaleza"
 
-#: mapsdatatranslation.cpp:1038
+#: mapsdatatranslation.cpp:1041
 msgctxt "brazil.kgm"
 msgid "Goias"
 msgstr "Goias"
 
-#: mapsdatatranslation.cpp:1039
+#: mapsdatatranslation.cpp:1042
 msgctxt "brazil.kgm"
 msgid "Goiânia"
 msgstr "Goiânia"
 
-#: mapsdatatranslation.cpp:1040
+#: mapsdatatranslation.cpp:1043
 msgctxt "brazil.kgm"
 msgid "Paraiba"
 msgstr "Paraiba"
 
-#: mapsdatatranslation.cpp:1041
+#: mapsdatatranslation.cpp:1044
 msgctxt "brazil.kgm"
 msgid "Joao Pessoa"
 msgstr "Joao Pessoa"
 
-#: mapsdatatranslation.cpp:1042
+#: mapsdatatranslation.cpp:1045
 msgctxt "brazil.kgm"
 msgid "Amapa"
 msgstr "Amapa"
 
-#: mapsdatatranslation.cpp:1043
+#: mapsdatatranslation.cpp:1046
 msgctxt "brazil.kgm"
 msgid "Macapa"
 msgstr "Macapa"
 
-#: mapsdatatranslation.cpp:1044
+#: mapsdatatranslation.cpp:1047
 msgctxt "brazil.kgm"
 msgid "Alagoas"
 msgstr "Alagoas"
 
-#: mapsdatatranslation.cpp:1045
+#: mapsdatatranslation.cpp:1048
 msgctxt "brazil.kgm"
 msgid "Maceio"
 msgstr "Maceio"
 
-#: mapsdatatranslation.cpp:1046
+#: mapsdatatranslation.cpp:1049
 msgctxt "brazil.kgm"
 msgid "Amazonas"
 msgstr "Amazonas"
 
-#: mapsdatatranslation.cpp:1047
+#: mapsdatatranslation.cpp:1050
 msgctxt "brazil.kgm"
 msgid "Manaus"
 msgstr "Manaus"
 
-#: mapsdatatranslation.cpp:1048
+#: mapsdatatranslation.cpp:1051
 msgctxt "brazil.kgm"
 msgid "Rio Grande do Norte"
 msgstr "Rio Grande do Norte"
 
-#: mapsdatatranslation.cpp:1049
+#: mapsdatatranslation.cpp:1052
 msgctxt "brazil.kgm"
 msgid "Natal"
 msgstr "Natal"
 
-#: mapsdatatranslation.cpp:1050
+#: mapsdatatranslation.cpp:1053
 msgctxt "brazil.kgm"
 msgid "Tocantins"
 msgstr "Tocantins"
 
-#: mapsdatatranslation.cpp:1051
+#: mapsdatatranslation.cpp:1054
 msgctxt "brazil.kgm"
 msgid "Palmas"
 msgstr "Palmas"
 
-#: mapsdatatranslation.cpp:1052
+#: mapsdatatranslation.cpp:1055
 msgctxt "brazil.kgm"
 msgid "Rio Grande do Sul"
 msgstr "Rio Grande do Sul"
 
-#: mapsdatatranslation.cpp:1053
+#: mapsdatatranslation.cpp:1056
 msgctxt "brazil.kgm"
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: mapsdatatranslation.cpp:1054
+#: mapsdatatranslation.cpp:1057
 msgctxt "brazil.kgm"
 msgid "Rondonia"
 msgstr "Rondonia"
 
-#: mapsdatatranslation.cpp:1055
+#: mapsdatatranslation.cpp:1058
 msgctxt "brazil.kgm"
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: mapsdatatranslation.cpp:1056
+#: mapsdatatranslation.cpp:1059
 msgctxt "brazil.kgm"
 msgid "Pernambuco"
 msgstr "Pernambuco"
 
-#: mapsdatatranslation.cpp:1057
+#: mapsdatatranslation.cpp:1060
 msgctxt "brazil.kgm"
 msgid "Recife"
 msgstr "Recife"
 
-#: mapsdatatranslation.cpp:1058
+#: mapsdatatranslation.cpp:1061
 msgctxt "brazil.kgm"
 msgid "Acre"
 msgstr "Acre"
 
-#: mapsdatatranslation.cpp:1059
+#: mapsdatatranslation.cpp:1062
 msgctxt "brazil.kgm"
 msgid "Rio Branco"
 msgstr "Rio Branco"
 
-#: mapsdatatranslation.cpp:1060
+#: mapsdatatranslation.cpp:1063
 msgctxt "brazil.kgm"
 msgid "Rio de Janeiro State"
 msgstr "Talaith Rio de Janeiro"
 
-#: mapsdatatranslation.cpp:1061
+#: mapsdatatranslation.cpp:1064
 msgctxt "brazil.kgm"
 msgid "Rio de Janeiro"
 msgstr "Rio de Janeiro"
 
-#: mapsdatatranslation.cpp:1062
+#: mapsdatatranslation.cpp:1065
 msgctxt "brazil.kgm"
 msgid "Bahia"
 msgstr "Bahia"
 
-#: mapsdatatranslation.cpp:1063
+#: mapsdatatranslation.cpp:1066
 msgctxt "brazil.kgm"
 msgid "Salvador"
 msgstr "Salvador"
 
-#: mapsdatatranslation.cpp:1064
+#: mapsdatatranslation.cpp:1067
 msgctxt "brazil.kgm"
 msgid "Maranhao"
 msgstr "Maranhao"
 
-#: mapsdatatranslation.cpp:1065
+#: mapsdatatranslation.cpp:1068
 msgctxt "brazil.kgm"
 msgid "Sao Luis"
 msgstr "Sao Luis"
 
-#: mapsdatatranslation.cpp:1066
+#: mapsdatatranslation.cpp:1069
 msgctxt "brazil.kgm"
 msgid "Sao Paulo State"
 msgstr "Sao Paulo State"
 
-#: mapsdatatranslation.cpp:1067
+#: mapsdatatranslation.cpp:1070
 msgctxt "brazil.kgm"
 msgid "Sao Paulo (city)"
 msgstr "Sao Paulo (dinas)"
 
-#: mapsdatatranslation.cpp:1068
+#: mapsdatatranslation.cpp:1071
 msgctxt "brazil.kgm"
 msgid "Piaui"
 msgstr "Piaui"
 
-#: mapsdatatranslation.cpp:1069
+#: mapsdatatranslation.cpp:1072
 msgctxt "brazil.kgm"
 msgid "Teresina"
 msgstr "Teresina"
 
-#: mapsdatatranslation.cpp:1070
+#: mapsdatatranslation.cpp:1073
 msgctxt "brazil.kgm"
 msgid "Espirito Santo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1071
+#: mapsdatatranslation.cpp:1074
 msgctxt "brazil.kgm"
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: mapsdatatranslation.cpp:1072
+#: mapsdatatranslation.cpp:1075
 msgctxt "brazil.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:1073
+#: mapsdatatranslation.cpp:1076
 msgctxt "brazil.kgm"
 msgid "Out of Bounds"
 msgstr "Gwaharddedig"
 
-#: mapsdatatranslation.cpp:1074
+#: mapsdatatranslation.cpp:1077
 msgctxt "bulgaria.kgm"
 msgid "Bulgaria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1075
+#: mapsdatatranslation.cpp:1078
 msgctxt "bulgaria.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1076
+#: mapsdatatranslation.cpp:1079
 msgctxt "bulgaria.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1077
+#: mapsdatatranslation.cpp:1080
 msgctxt "bulgaria.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1078
+#: mapsdatatranslation.cpp:1081
 msgctxt "bulgaria.kgm"
 msgid "Not Bulgaria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1079
+#: mapsdatatranslation.cpp:1082
 msgctxt "bulgaria.kgm"
 msgid "Blagoevgrad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1080
+#: mapsdatatranslation.cpp:1083
 msgctxt "bulgaria.kgm"
 msgid "Burgas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1081
+#: mapsdatatranslation.cpp:1084
 msgctxt "bulgaria.kgm"
 msgid "Dobrich"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1082
+#: mapsdatatranslation.cpp:1085
 msgctxt "bulgaria.kgm"
 msgid "Gabrovo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1083
+#: mapsdatatranslation.cpp:1086
 msgctxt "bulgaria.kgm"
 msgid "Haskovo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1084
+#: mapsdatatranslation.cpp:1087
 msgctxt "bulgaria.kgm"
 msgid "Kardzhali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1085
+#: mapsdatatranslation.cpp:1088
 msgctxt "bulgaria.kgm"
 msgid "Kyustendil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1086
+#: mapsdatatranslation.cpp:1089
 msgctxt "bulgaria.kgm"
 msgid "Lovech"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1087
+#: mapsdatatranslation.cpp:1090
 msgctxt "bulgaria.kgm"
 msgid "Montana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1088
+#: mapsdatatranslation.cpp:1091
 msgctxt "bulgaria.kgm"
 msgid "Pazardzhik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1089
+#: mapsdatatranslation.cpp:1092
 msgctxt "bulgaria.kgm"
 msgid "Pernik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1090
+#: mapsdatatranslation.cpp:1093
 msgctxt "bulgaria.kgm"
 msgid "Pleven"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1091
+#: mapsdatatranslation.cpp:1094
 msgctxt "bulgaria.kgm"
 msgid "Plovdiv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1092
+#: mapsdatatranslation.cpp:1095
 msgctxt "bulgaria.kgm"
 msgid "Razgrad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1093
+#: mapsdatatranslation.cpp:1096
 msgctxt "bulgaria.kgm"
 msgid "Ruse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1094
+#: mapsdatatranslation.cpp:1097
 msgctxt "bulgaria.kgm"
 msgid "Shumen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1095
+#: mapsdatatranslation.cpp:1098
 msgctxt "bulgaria.kgm"
 msgid "Silistra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1096
+#: mapsdatatranslation.cpp:1099
 msgctxt "bulgaria.kgm"
 msgid "Sliven"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1097
+#: mapsdatatranslation.cpp:1100
 msgctxt "bulgaria.kgm"
 msgid "Smolyan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1098
+#: mapsdatatranslation.cpp:1101
 msgctxt "bulgaria.kgm"
 msgid "Sofia Province"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1099
+#: mapsdatatranslation.cpp:1102
 msgctxt "bulgaria.kgm"
 msgid "Sofia City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1100
+#: mapsdatatranslation.cpp:1103
 msgctxt "bulgaria.kgm"
 msgid "Stara Zagora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1101
+#: mapsdatatranslation.cpp:1104
 msgctxt "bulgaria.kgm"
 msgid "Targovishte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1102
+#: mapsdatatranslation.cpp:1105
 msgctxt "bulgaria.kgm"
 msgid "Veliko Tarnovo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1103
+#: mapsdatatranslation.cpp:1106
 msgctxt "bulgaria.kgm"
 msgid "Varna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1104
+#: mapsdatatranslation.cpp:1107
 msgctxt "bulgaria.kgm"
 msgid "Vidin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1105
+#: mapsdatatranslation.cpp:1108
 msgctxt "bulgaria.kgm"
 msgid "Vratsa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1106
+#: mapsdatatranslation.cpp:1109
 msgctxt "bulgaria.kgm"
 msgid "Yambol"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1107
+#: mapsdatatranslation.cpp:1110
 msgctxt "burma.kgm"
 msgid "Myanmar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1108
+#: mapsdatatranslation.cpp:1111
 msgctxt "burma.kgm"
 msgid "States and divisions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1109
+#: mapsdatatranslation.cpp:1112
 msgctxt "burma.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1110
+#: mapsdatatranslation.cpp:1113
 msgctxt "burma.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1111
+#: mapsdatatranslation.cpp:1114
 msgctxt "burma.kgm"
 msgid "Not Myanmar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1112
+#: mapsdatatranslation.cpp:1115
 msgctxt "burma.kgm"
 msgid "Ayeyarwady"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1113
+#: mapsdatatranslation.cpp:1116
 msgctxt "burma.kgm"
 msgid "Pathein"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1114 mapsdatatranslation.cpp:1115
+#: mapsdatatranslation.cpp:1117 mapsdatatranslation.cpp:1118
 msgctxt "burma.kgm"
 msgid "Bago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1116
+#: mapsdatatranslation.cpp:1119
 msgctxt "burma.kgm"
 msgid "Magway"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1117
+#: mapsdatatranslation.cpp:1120
 msgctxt "burma.kgm"
 msgid "Magwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1118 mapsdatatranslation.cpp:1119
+#: mapsdatatranslation.cpp:1121 mapsdatatranslation.cpp:1122
 msgctxt "burma.kgm"
 msgid "Mandalay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1120 mapsdatatranslation.cpp:1121
+#: mapsdatatranslation.cpp:1123 mapsdatatranslation.cpp:1124
 msgctxt "burma.kgm"
 msgid "Sagaing"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1122
+#: mapsdatatranslation.cpp:1125
 msgctxt "burma.kgm"
 msgid "Tanintharyi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1123
+#: mapsdatatranslation.cpp:1126
 msgctxt "burma.kgm"
 msgid "Dawei"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1124
+#: mapsdatatranslation.cpp:1127
 msgctxt "burma.kgm"
 msgid "Yangon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1125
+#: mapsdatatranslation.cpp:1128
 msgctxt "burma.kgm"
 msgid "Yangon (former Rangoon)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1126
+#: mapsdatatranslation.cpp:1129
 msgctxt "burma.kgm"
 msgid "Chin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1127
+#: mapsdatatranslation.cpp:1130
 msgctxt "burma.kgm"
 msgid "Hakha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1128
+#: mapsdatatranslation.cpp:1131
 msgctxt "burma.kgm"
 msgid "Kachin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1129
+#: mapsdatatranslation.cpp:1132
 msgctxt "burma.kgm"
 msgid "Myitkyina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1130
+#: mapsdatatranslation.cpp:1133
 msgctxt "burma.kgm"
 msgid "Kayin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1131
+#: mapsdatatranslation.cpp:1134
 msgctxt "burma.kgm"
 msgid "Hpa-an"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1132
+#: mapsdatatranslation.cpp:1135
 msgctxt "burma.kgm"
 msgid "Kayah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1133
+#: mapsdatatranslation.cpp:1136
 msgctxt "burma.kgm"
 msgid "Loikaw"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1134
+#: mapsdatatranslation.cpp:1137
 msgctxt "burma.kgm"
 msgid "Mon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1135
+#: mapsdatatranslation.cpp:1138
 msgctxt "burma.kgm"
 msgid "Mawlamyine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1136
+#: mapsdatatranslation.cpp:1139
 msgctxt "burma.kgm"
 msgid "Rakhine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1137
+#: mapsdatatranslation.cpp:1140
 msgctxt "burma.kgm"
 msgid "Sittwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1138
+#: mapsdatatranslation.cpp:1141
 msgctxt "burma.kgm"
 msgid "Shan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1139
+#: mapsdatatranslation.cpp:1142
 msgctxt "burma.kgm"
 msgid "Taunggyi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1140
+#: mapsdatatranslation.cpp:1143
 msgctxt "cameroon_departments.kgm"
 msgid "Cameroon (Departments)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1141
+#: mapsdatatranslation.cpp:1144
 msgctxt "cameroon_departments.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1142
+#: mapsdatatranslation.cpp:1145
 msgctxt "cameroon_departments.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1143
+#: mapsdatatranslation.cpp:1146
 msgctxt "cameroon_departments.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1144
+#: mapsdatatranslation.cpp:1147
 msgctxt "cameroon_departments.kgm"
 msgid "Not Cameroon (Departments)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1145
+#: mapsdatatranslation.cpp:1148
 msgctxt "cameroon_departments.kgm"
 msgid "Djérem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1146
+#: mapsdatatranslation.cpp:1149
 msgctxt "cameroon_departments.kgm"
 msgid "Tibati"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1147
+#: mapsdatatranslation.cpp:1150
 msgctxt "cameroon_departments.kgm"
 msgid "Faro-et-Déo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1148
+#: mapsdatatranslation.cpp:1151
 msgctxt "cameroon_departments.kgm"
 msgid "Tignère"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1149
+#: mapsdatatranslation.cpp:1152
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Banyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1150
+#: mapsdatatranslation.cpp:1153
 msgctxt "cameroon_departments.kgm"
 msgid "Banyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1151
+#: mapsdatatranslation.cpp:1154
 msgctxt "cameroon_departments.kgm"
 msgid "Mbéré"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1152
+#: mapsdatatranslation.cpp:1155
 msgctxt "cameroon_departments.kgm"
 msgid "Meiganga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1153
+#: mapsdatatranslation.cpp:1156
 msgctxt "cameroon_departments.kgm"
 msgid "Vina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1154
+#: mapsdatatranslation.cpp:1157
 msgctxt "cameroon_departments.kgm"
 msgid "Ngaoundéré"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1155
+#: mapsdatatranslation.cpp:1158
 msgctxt "cameroon_departments.kgm"
 msgid "Haute-Sanaga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1156
+#: mapsdatatranslation.cpp:1159
 msgctxt "cameroon_departments.kgm"
 msgid "Nanga-Eboko"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1157
+#: mapsdatatranslation.cpp:1160
 msgctxt "cameroon_departments.kgm"
 msgid "Lekié"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1158
+#: mapsdatatranslation.cpp:1161
 msgctxt "cameroon_departments.kgm"
 msgid "Monatele"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1159
+#: mapsdatatranslation.cpp:1162
 msgctxt "cameroon_departments.kgm"
 msgid "Mbam-et-Inoubou"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1160
+#: mapsdatatranslation.cpp:1163
 msgctxt "cameroon_departments.kgm"
 msgid "Bafia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1161
+#: mapsdatatranslation.cpp:1164
 msgctxt "cameroon_departments.kgm"
 msgid "Mbam-et-Kim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1162
+#: mapsdatatranslation.cpp:1165
 msgctxt "cameroon_departments.kgm"
 msgid "Ntui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1163
+#: mapsdatatranslation.cpp:1166
 msgctxt "cameroon_departments.kgm"
 msgid "Méfou-et-Afamba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1164
+#: mapsdatatranslation.cpp:1167
 msgctxt "cameroon_departments.kgm"
 msgid "Mfou"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1165
+#: mapsdatatranslation.cpp:1168
 msgctxt "cameroon_departments.kgm"
 msgid "Méfou-et-Akono"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1166
+#: mapsdatatranslation.cpp:1169
 msgctxt "cameroon_departments.kgm"
 msgid "Ngoumou"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1167
+#: mapsdatatranslation.cpp:1170
 msgctxt "cameroon_departments.kgm"
 msgid "Mfoundi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1168
+#: mapsdatatranslation.cpp:1171
 msgctxt "cameroon_departments.kgm"
 msgid "Yaoundé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1169
+#: mapsdatatranslation.cpp:1172
 msgctxt "cameroon_departments.kgm"
 msgid "Nyong-et-Kellé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1170
+#: mapsdatatranslation.cpp:1173
 msgctxt "cameroon_departments.kgm"
 msgid "Éséka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1171
+#: mapsdatatranslation.cpp:1174
 msgctxt "cameroon_departments.kgm"
 msgid "Nyong-et-Mfoumou"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1172
+#: mapsdatatranslation.cpp:1175
 msgctxt "cameroon_departments.kgm"
 msgid "Akonolinga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1173
+#: mapsdatatranslation.cpp:1176
 msgctxt "cameroon_departments.kgm"
 msgid "Nyong-et-So'o"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1174
+#: mapsdatatranslation.cpp:1177
 msgctxt "cameroon_departments.kgm"
 msgid "Mbalmayo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1175
+#: mapsdatatranslation.cpp:1178
 msgctxt "cameroon_departments.kgm"
 msgid "Boumba-et-Ngoko"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1176
+#: mapsdatatranslation.cpp:1179
 msgctxt "cameroon_departments.kgm"
 msgid "Yokadouma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1177
+#: mapsdatatranslation.cpp:1180
 msgctxt "cameroon_departments.kgm"
 msgid "Haut-Nyong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1178
+#: mapsdatatranslation.cpp:1181
 msgctxt "cameroon_departments.kgm"
 msgid "Abong-Mbang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1179
+#: mapsdatatranslation.cpp:1182
 msgctxt "cameroon_departments.kgm"
 msgid "Kadey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1180
+#: mapsdatatranslation.cpp:1183
 msgctxt "cameroon_departments.kgm"
 msgid "Batouri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1181
+#: mapsdatatranslation.cpp:1184
 msgctxt "cameroon_departments.kgm"
 msgid "Lom-et-Djérem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1182
+#: mapsdatatranslation.cpp:1185
 msgctxt "cameroon_departments.kgm"
 msgid "Bertoua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1183
+#: mapsdatatranslation.cpp:1186
 msgctxt "cameroon_departments.kgm"
 msgid "Diamaré"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1184
+#: mapsdatatranslation.cpp:1187
 msgctxt "cameroon_departments.kgm"
 msgid "Maroua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1185
+#: mapsdatatranslation.cpp:1188
 msgctxt "cameroon_departments.kgm"
 msgid "Logone-et-Chari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1186
+#: mapsdatatranslation.cpp:1189
 msgctxt "cameroon_departments.kgm"
 msgid "Kousséri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1187
+#: mapsdatatranslation.cpp:1190
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Danay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1188
+#: mapsdatatranslation.cpp:1191
 msgctxt "cameroon_departments.kgm"
 msgid "Yagoua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1189
+#: mapsdatatranslation.cpp:1192
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Kani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1190
+#: mapsdatatranslation.cpp:1193
 msgctxt "cameroon_departments.kgm"
 msgid "Kaélé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1191
+#: mapsdatatranslation.cpp:1194
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Sava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1192
+#: mapsdatatranslation.cpp:1195
 msgctxt "cameroon_departments.kgm"
 msgid "Mora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1193
+#: mapsdatatranslation.cpp:1196
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Tsanaga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1194
+#: mapsdatatranslation.cpp:1197
 msgctxt "cameroon_departments.kgm"
 msgid "Mokolo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1195
+#: mapsdatatranslation.cpp:1198
 msgctxt "cameroon_departments.kgm"
 msgid "Moungo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1196
+#: mapsdatatranslation.cpp:1199
 msgctxt "cameroon_departments.kgm"
 msgid "Nkongsamba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1197
+#: mapsdatatranslation.cpp:1200
 msgctxt "cameroon_departments.kgm"
 msgid "Nkam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1198
+#: mapsdatatranslation.cpp:1201
 msgctxt "cameroon_departments.kgm"
 msgid "Yabassi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1199
+#: mapsdatatranslation.cpp:1202
 msgctxt "cameroon_departments.kgm"
 msgid "Sanaga-Maritime"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1200
+#: mapsdatatranslation.cpp:1203
 msgctxt "cameroon_departments.kgm"
 msgid "Édéa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1201
+#: mapsdatatranslation.cpp:1204
 msgctxt "cameroon_departments.kgm"
 msgid "Wouri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1202
+#: mapsdatatranslation.cpp:1205
 msgctxt "cameroon_departments.kgm"
 msgid "Douala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1203
+#: mapsdatatranslation.cpp:1206
 msgctxt "cameroon_departments.kgm"
 msgid "Bénoué"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1204
+#: mapsdatatranslation.cpp:1207
 msgctxt "cameroon_departments.kgm"
 msgid "Garoua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1205
+#: mapsdatatranslation.cpp:1208
 msgctxt "cameroon_departments.kgm"
 msgid "Faro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1206
+#: mapsdatatranslation.cpp:1209
 msgctxt "cameroon_departments.kgm"
 msgid "Poli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1207
+#: mapsdatatranslation.cpp:1210
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Louti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1208
+#: mapsdatatranslation.cpp:1211
 msgctxt "cameroon_departments.kgm"
 msgid "Guider"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1209
+#: mapsdatatranslation.cpp:1212
 msgctxt "cameroon_departments.kgm"
 msgid "Mayo-Rey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1210
+#: mapsdatatranslation.cpp:1213
 msgctxt "cameroon_departments.kgm"
 msgid "Tchollire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1211
+#: mapsdatatranslation.cpp:1214
 msgctxt "cameroon_departments.kgm"
 msgid "Boyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1212
+#: mapsdatatranslation.cpp:1215
 msgctxt "cameroon_departments.kgm"
 msgid "Fundong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1213
+#: mapsdatatranslation.cpp:1216
 msgctxt "cameroon_departments.kgm"
 msgid "Bui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1214
+#: mapsdatatranslation.cpp:1217
 msgctxt "cameroon_departments.kgm"
 msgid "Kumbo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1215
+#: mapsdatatranslation.cpp:1218
 msgctxt "cameroon_departments.kgm"
 msgid "Donga-Mantung"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1216
+#: mapsdatatranslation.cpp:1219
 msgctxt "cameroon_departments.kgm"
 msgid "Nkambé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1217
+#: mapsdatatranslation.cpp:1220
 msgctxt "cameroon_departments.kgm"
 msgid "Menchum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1218
+#: mapsdatatranslation.cpp:1221
 msgctxt "cameroon_departments.kgm"
 msgid "Wum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1219
+#: mapsdatatranslation.cpp:1222
 msgctxt "cameroon_departments.kgm"
 msgid "Mezam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1220
+#: mapsdatatranslation.cpp:1223
 msgctxt "cameroon_departments.kgm"
 msgid "Bamenda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1221
+#: mapsdatatranslation.cpp:1224
 msgctxt "cameroon_departments.kgm"
 msgid "Momo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1222
+#: mapsdatatranslation.cpp:1225
 msgctxt "cameroon_departments.kgm"
 msgid "Mbengwi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1223
+#: mapsdatatranslation.cpp:1226
 msgctxt "cameroon_departments.kgm"
 msgid "Ngo-Ketunjia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1224
+#: mapsdatatranslation.cpp:1227
 msgctxt "cameroon_departments.kgm"
 msgid "Ndop"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1225
+#: mapsdatatranslation.cpp:1228
 msgctxt "cameroon_departments.kgm"
 msgid "Bamboutos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1226
+#: mapsdatatranslation.cpp:1229
 msgctxt "cameroon_departments.kgm"
 msgid "Mbouda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1227
+#: mapsdatatranslation.cpp:1230
 msgctxt "cameroon_departments.kgm"
 msgid "Haut-Nkam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1228
+#: mapsdatatranslation.cpp:1231
 msgctxt "cameroon_departments.kgm"
 msgid "Bafang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1229
+#: mapsdatatranslation.cpp:1232
 msgctxt "cameroon_departments.kgm"
 msgid "Hauts-Plateaux"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1230
+#: mapsdatatranslation.cpp:1233
 msgctxt "cameroon_departments.kgm"
 msgid "Baham"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1231
+#: mapsdatatranslation.cpp:1234
 msgctxt "cameroon_departments.kgm"
 msgid "Koung-Khi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1232
+#: mapsdatatranslation.cpp:1235
 msgctxt "cameroon_departments.kgm"
 msgid "Bandjoun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1233
+#: mapsdatatranslation.cpp:1236
 msgctxt "cameroon_departments.kgm"
 msgid "Menoua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1234
+#: mapsdatatranslation.cpp:1237
 msgctxt "cameroon_departments.kgm"
 msgid "Dschang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1235
+#: mapsdatatranslation.cpp:1238
 msgctxt "cameroon_departments.kgm"
 msgid "Mifi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1236
+#: mapsdatatranslation.cpp:1239
 msgctxt "cameroon_departments.kgm"
 msgid "Bafoussam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1237
+#: mapsdatatranslation.cpp:1240
 msgctxt "cameroon_departments.kgm"
 msgid "Ndé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1238
+#: mapsdatatranslation.cpp:1241
 msgctxt "cameroon_departments.kgm"
 msgid "Bangangté"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1239
+#: mapsdatatranslation.cpp:1242
 msgctxt "cameroon_departments.kgm"
 msgid "Noun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1240
+#: mapsdatatranslation.cpp:1243
 msgctxt "cameroon_departments.kgm"
 msgid "Foumban"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1241
+#: mapsdatatranslation.cpp:1244
 msgctxt "cameroon_departments.kgm"
 msgid "Dja-et-Lobo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1242
+#: mapsdatatranslation.cpp:1245
 msgctxt "cameroon_departments.kgm"
 msgid "Sangmélima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1243
+#: mapsdatatranslation.cpp:1246
 msgctxt "cameroon_departments.kgm"
 msgid "Mvila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1244
+#: mapsdatatranslation.cpp:1247
 msgctxt "cameroon_departments.kgm"
 msgid "Ebolowa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1245
+#: mapsdatatranslation.cpp:1248
 msgctxt "cameroon_departments.kgm"
 msgid "Océan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1246
+#: mapsdatatranslation.cpp:1249
 msgctxt "cameroon_departments.kgm"
 msgid "Kribi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1247
+#: mapsdatatranslation.cpp:1250
 msgctxt "cameroon_departments.kgm"
 msgid "Vallée-du-Ntem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1248
+#: mapsdatatranslation.cpp:1251
 msgctxt "cameroon_departments.kgm"
 msgid "Ambam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1249
+#: mapsdatatranslation.cpp:1252
 msgctxt "cameroon_departments.kgm"
 msgid "Fako"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1250
+#: mapsdatatranslation.cpp:1253
 msgctxt "cameroon_departments.kgm"
 msgid "Limbé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1251
+#: mapsdatatranslation.cpp:1254
 msgctxt "cameroon_departments.kgm"
 msgid "Koupé-Manengouba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1252
+#: mapsdatatranslation.cpp:1255
 msgctxt "cameroon_departments.kgm"
 msgid "Bangem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1253
+#: mapsdatatranslation.cpp:1256
 msgctxt "cameroon_departments.kgm"
 msgid "Lebialem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1254
+#: mapsdatatranslation.cpp:1257
 msgctxt "cameroon_departments.kgm"
 msgid "Menji"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1255
+#: mapsdatatranslation.cpp:1258
 msgctxt "cameroon_departments.kgm"
 msgid "Manyu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1256
+#: mapsdatatranslation.cpp:1259
 msgctxt "cameroon_departments.kgm"
 msgid "Mamfé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1257
+#: mapsdatatranslation.cpp:1260
 msgctxt "cameroon_departments.kgm"
 msgid "Meme"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1258
+#: mapsdatatranslation.cpp:1261
 msgctxt "cameroon_departments.kgm"
 msgid "Kumba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1259
+#: mapsdatatranslation.cpp:1262
 msgctxt "cameroon_departments.kgm"
 msgid "Ndian"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1260
+#: mapsdatatranslation.cpp:1263
 msgctxt "cameroon_departments.kgm"
 msgid "Mudemba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1261
+#: mapsdatatranslation.cpp:1264
 msgctxt "cameroon_provinces.kgm"
 msgid "Cameroon (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1262
+#: mapsdatatranslation.cpp:1265
 msgctxt "cameroon_provinces.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1263
+#: mapsdatatranslation.cpp:1266
 msgctxt "cameroon_provinces.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1264
+#: mapsdatatranslation.cpp:1267
 msgctxt "cameroon_provinces.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1265
+#: mapsdatatranslation.cpp:1268
 msgctxt "cameroon_provinces.kgm"
 msgid "Not Cameroon (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1266
+#: mapsdatatranslation.cpp:1269
 msgctxt "cameroon_provinces.kgm"
 msgid "Adamawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1267
+#: mapsdatatranslation.cpp:1270
 msgctxt "cameroon_provinces.kgm"
 msgid "Ngaoundéré"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1268
+#: mapsdatatranslation.cpp:1271
 msgctxt "cameroon_provinces.kgm"
 msgid "Centre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1269
+#: mapsdatatranslation.cpp:1272
 msgctxt "cameroon_provinces.kgm"
 msgid "Yaoundé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1270
+#: mapsdatatranslation.cpp:1273
 msgctxt "cameroon_provinces.kgm"
 msgid "East"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1271
+#: mapsdatatranslation.cpp:1274
 msgctxt "cameroon_provinces.kgm"
 msgid "Bertoua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1272
+#: mapsdatatranslation.cpp:1275
 msgctxt "cameroon_provinces.kgm"
 msgid "Far North"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1273
+#: mapsdatatranslation.cpp:1276
 msgctxt "cameroon_provinces.kgm"
 msgid "Maroua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1274
+#: mapsdatatranslation.cpp:1277
 msgctxt "cameroon_provinces.kgm"
 msgid "Littoral"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1275
+#: mapsdatatranslation.cpp:1278
 msgctxt "cameroon_provinces.kgm"
 msgid "Douala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1276
+#: mapsdatatranslation.cpp:1279
 msgctxt "cameroon_provinces.kgm"
 msgid "North"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1277
+#: mapsdatatranslation.cpp:1280
 msgctxt "cameroon_provinces.kgm"
 msgid "Garoua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1278
+#: mapsdatatranslation.cpp:1281
 msgctxt "cameroon_provinces.kgm"
 msgid "Northwest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1279
+#: mapsdatatranslation.cpp:1282
 msgctxt "cameroon_provinces.kgm"
 msgid "Bamenda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1280
+#: mapsdatatranslation.cpp:1283
 msgctxt "cameroon_provinces.kgm"
 msgid "South"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1281
+#: mapsdatatranslation.cpp:1284
 msgctxt "cameroon_provinces.kgm"
 msgid "Ebolowa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1282
+#: mapsdatatranslation.cpp:1285
 msgctxt "cameroon_provinces.kgm"
 msgid "Southwest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1283
+#: mapsdatatranslation.cpp:1286
 msgctxt "cameroon_provinces.kgm"
 msgid "Buea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1284
+#: mapsdatatranslation.cpp:1287
 msgctxt "cameroon_provinces.kgm"
 msgid "West"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1285
+#: mapsdatatranslation.cpp:1288
 msgctxt "cameroon_provinces.kgm"
 msgid "Bafoussam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1286
+#: mapsdatatranslation.cpp:1289
 msgctxt "canada.kgm"
 msgid "Canada"
 msgstr "Canada"
 
-#: mapsdatatranslation.cpp:1287
+#: mapsdatatranslation.cpp:1290
 msgctxt "canada.kgm"
 msgid "Provinces and Territories"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1288
+#: mapsdatatranslation.cpp:1291
 msgctxt "canada.kgm"
 msgid "Out of Bounds"
 msgstr "Gwaharddedig"
 
-#: mapsdatatranslation.cpp:1289
+#: mapsdatatranslation.cpp:1292
 msgctxt "canada.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:1290
+#: mapsdatatranslation.cpp:1293
 msgctxt "canada.kgm"
 msgid "Prince Edward Island"
 msgstr "Ynys y Tywysog Edward"
 
-#: mapsdatatranslation.cpp:1291
+#: mapsdatatranslation.cpp:1294
 msgctxt "canada.kgm"
 msgid "Charlottetown"
 msgstr "Charlottetown"
 
-#: mapsdatatranslation.cpp:1292
+#: mapsdatatranslation.cpp:1295
 msgctxt "canada.kgm"
 msgid "British Columbia"
 msgstr "British Columbia"
 
-#: mapsdatatranslation.cpp:1293
+#: mapsdatatranslation.cpp:1296
 msgctxt "canada.kgm"
 msgid "Victoria"
 msgstr "Victoria"
 
-#: mapsdatatranslation.cpp:1294
+#: mapsdatatranslation.cpp:1297
 msgctxt "canada.kgm"
 msgid "Ontario"
 msgstr "Ontario"
 
-#: mapsdatatranslation.cpp:1295
+#: mapsdatatranslation.cpp:1298
 msgctxt "canada.kgm"
 msgid "Toronto"
 msgstr "Toronto"
 
-#: mapsdatatranslation.cpp:1296
+#: mapsdatatranslation.cpp:1299
 msgctxt "canada.kgm"
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: mapsdatatranslation.cpp:1297
+#: mapsdatatranslation.cpp:1300
 msgctxt "canada.kgm"
 msgid "St John's"
 msgstr "St John's"
 
-#: mapsdatatranslation.cpp:1298
+#: mapsdatatranslation.cpp:1301
 msgctxt "canada.kgm"
 msgid "Nunavut"
 msgstr "Nunavut"
 
-#: mapsdatatranslation.cpp:1299
+#: mapsdatatranslation.cpp:1302
 msgctxt "canada.kgm"
 msgid "Iqaluit"
 msgstr "Iqaluit"
 
-#: mapsdatatranslation.cpp:1300
+#: mapsdatatranslation.cpp:1303
 msgctxt "canada.kgm"
 msgid "Alberta"
 msgstr "Alberta"
 
-#: mapsdatatranslation.cpp:1301
+#: mapsdatatranslation.cpp:1304
 msgctxt "canada.kgm"
 msgid "Edmonton"
 msgstr "Edmonton"
 
-#: mapsdatatranslation.cpp:1302
+#: mapsdatatranslation.cpp:1305
 msgctxt "canada.kgm"
 msgid "North West Territories"
 msgstr "Tiriogaethau y Gogledd-Orllewin"
 
-#: mapsdatatranslation.cpp:1303
+#: mapsdatatranslation.cpp:1306
 msgctxt "canada.kgm"
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: mapsdatatranslation.cpp:1304
+#: mapsdatatranslation.cpp:1307
 msgctxt "canada.kgm"
 msgid "Quebec"
 msgstr "Quebec"
 
-#: mapsdatatranslation.cpp:1305
+#: mapsdatatranslation.cpp:1308
 msgctxt "canada.kgm"
 msgid "Quebec City"
 msgstr "Dinas Quebec"
 
-#: mapsdatatranslation.cpp:1306
+#: mapsdatatranslation.cpp:1309
 msgctxt "canada.kgm"
 msgid "New Brunswick"
 msgstr "Brunswick Newydd"
 
-#: mapsdatatranslation.cpp:1307
+#: mapsdatatranslation.cpp:1310
 msgctxt "canada.kgm"
 msgid "Fredericton"
 msgstr "Fredericton"
 
-#: mapsdatatranslation.cpp:1308
+#: mapsdatatranslation.cpp:1311
 msgctxt "canada.kgm"
 msgid "Manitoba"
 msgstr "Manitoba"
 
-#: mapsdatatranslation.cpp:1309
+#: mapsdatatranslation.cpp:1312
 msgctxt "canada.kgm"
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: mapsdatatranslation.cpp:1310
+#: mapsdatatranslation.cpp:1313
 msgctxt "canada.kgm"
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: mapsdatatranslation.cpp:1311
+#: mapsdatatranslation.cpp:1314
 msgctxt "canada.kgm"
 msgid "Halifax"
 msgstr "Halifax"
 
-#: mapsdatatranslation.cpp:1312
+#: mapsdatatranslation.cpp:1315
 msgctxt "canada.kgm"
 msgid "Yukon Territory"
 msgstr "Tiriogaeth Iwcon"
 
-#: mapsdatatranslation.cpp:1313
+#: mapsdatatranslation.cpp:1316
 msgctxt "canada.kgm"
 msgid "Whitehorse"
 msgstr "Whitehorse"
 
-#: mapsdatatranslation.cpp:1314
+#: mapsdatatranslation.cpp:1317
 msgctxt "canada.kgm"
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: mapsdatatranslation.cpp:1315
+#: mapsdatatranslation.cpp:1318
 msgctxt "canada.kgm"
 msgid "Regina"
 msgstr "Regina"
 
-#: mapsdatatranslation.cpp:1316
+#: mapsdatatranslation.cpp:1319
 msgctxt "caribbean.kgm"
 msgid "Caribbean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1317
+#: mapsdatatranslation.cpp:1320
 msgctxt "caribbean.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1318
+#: mapsdatatranslation.cpp:1321
 msgctxt "caribbean.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1319
+#: mapsdatatranslation.cpp:1322
 msgctxt "caribbean.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1320
+#: mapsdatatranslation.cpp:1323
 msgctxt "caribbean.kgm"
 msgid "Not Caribbean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1321
+#: mapsdatatranslation.cpp:1324
 msgctxt "caribbean.kgm"
 msgid "Bahamas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1322
+#: mapsdatatranslation.cpp:1325
 msgctxt "caribbean.kgm"
 msgid "Nassau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1323
+#: mapsdatatranslation.cpp:1326
 msgctxt "caribbean.kgm"
 msgid "Turks and Caicos Islands (UK)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1324
+#: mapsdatatranslation.cpp:1327
 msgctxt "caribbean.kgm"
 msgid "Cockburn Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1325
+#: mapsdatatranslation.cpp:1328
 msgctxt "caribbean.kgm"
 msgid "Cuba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1326
+#: mapsdatatranslation.cpp:1329
 msgctxt "caribbean.kgm"
 msgid "Havana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1327
+#: mapsdatatranslation.cpp:1330
 msgctxt "caribbean.kgm"
 msgid "Haiti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1328
+#: mapsdatatranslation.cpp:1331
 msgctxt "caribbean.kgm"
 msgid "Port-au-Prince"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1329
+#: mapsdatatranslation.cpp:1332
 msgctxt "caribbean.kgm"
 msgid "Dominican Republic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1330
+#: mapsdatatranslation.cpp:1333
 msgctxt "caribbean.kgm"
 msgid "Santo Domingo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1331
+#: mapsdatatranslation.cpp:1334
 msgctxt "caribbean.kgm"
 msgid "Puerto Rico (USA)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1332
+#: mapsdatatranslation.cpp:1335
 msgctxt "caribbean.kgm"
 msgid "San Juan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1333
+#: mapsdatatranslation.cpp:1336
 msgctxt "caribbean.kgm"
 msgid "U.S Virgin Islands (USA)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1334
+#: mapsdatatranslation.cpp:1337
 msgctxt "caribbean.kgm"
 msgid "Charlotte Amalie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1335
+#: mapsdatatranslation.cpp:1338
 msgctxt "caribbean.kgm"
 msgid "British Virgin Islands (UK)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1336
+#: mapsdatatranslation.cpp:1339
 msgctxt "caribbean.kgm"
 msgid "Road Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1337
+#: mapsdatatranslation.cpp:1340
 msgctxt "caribbean.kgm"
 msgid "Anguilla (UK)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1338
+#: mapsdatatranslation.cpp:1341
 msgctxt "caribbean.kgm"
 msgid "The Valley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1339
+#: mapsdatatranslation.cpp:1342
 msgctxt "caribbean.kgm"
 msgid "Saint Martin (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1340
+#: mapsdatatranslation.cpp:1343
 msgctxt "caribbean.kgm"
 msgid "Marigot"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1341
+#: mapsdatatranslation.cpp:1344
 msgctxt "caribbean.kgm"
 msgid "Saint Barthelemy (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1342
+#: mapsdatatranslation.cpp:1345
 msgctxt "caribbean.kgm"
 msgid "Gustavia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1343
+#: mapsdatatranslation.cpp:1346
 msgctxt "caribbean.kgm"
 msgid "Antigua and Barbuda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1344
+#: mapsdatatranslation.cpp:1347
 msgctxt "caribbean.kgm"
 msgid "Saint John's"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1345
+#: mapsdatatranslation.cpp:1348
 msgctxt "caribbean.kgm"
 msgid "Saint Kitts and Nevis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1346
+#: mapsdatatranslation.cpp:1349
 msgctxt "caribbean.kgm"
 msgid "Basseterre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1347
+#: mapsdatatranslation.cpp:1350
 msgctxt "caribbean.kgm"
 msgid "Montserrat (UK)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1348
+#: mapsdatatranslation.cpp:1351
 msgctxt "caribbean.kgm"
 msgid "Plymouth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1349
+#: mapsdatatranslation.cpp:1352
 msgctxt "caribbean.kgm"
 msgid "Guadeloupe (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1350
+#: mapsdatatranslation.cpp:1353
 msgctxt "caribbean.kgm"
 msgid "Basse-Terre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1351
+#: mapsdatatranslation.cpp:1354
 msgctxt "caribbean.kgm"
 msgid "Dominica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1352
+#: mapsdatatranslation.cpp:1355
 msgctxt "caribbean.kgm"
 msgid "Roseau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1353
+#: mapsdatatranslation.cpp:1356
 msgctxt "caribbean.kgm"
 msgid "Martinique (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1354
+#: mapsdatatranslation.cpp:1357
 msgctxt "caribbean.kgm"
 msgid "Fort de France"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1355
+#: mapsdatatranslation.cpp:1358
 msgctxt "caribbean.kgm"
 msgid "Saint Lucia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1356
+#: mapsdatatranslation.cpp:1359
 msgctxt "caribbean.kgm"
 msgid "Castries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1357
+#: mapsdatatranslation.cpp:1360
 msgctxt "caribbean.kgm"
 msgid "Barbados"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1358
+#: mapsdatatranslation.cpp:1361
 msgctxt "caribbean.kgm"
 msgid "Bridgetown"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1359
+#: mapsdatatranslation.cpp:1362
 msgctxt "caribbean.kgm"
 msgid "Saint Vincent and the Grenadines"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1360
+#: mapsdatatranslation.cpp:1363
 msgctxt "caribbean.kgm"
 msgid "Kingstown"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1361
+#: mapsdatatranslation.cpp:1364
 msgctxt "caribbean.kgm"
 msgid "Grenada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1362
+#: mapsdatatranslation.cpp:1365
 msgctxt "caribbean.kgm"
 msgid "Saint George's"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1363
+#: mapsdatatranslation.cpp:1366
 msgctxt "caribbean.kgm"
 msgid "Trinidad and Tobago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1364
+#: mapsdatatranslation.cpp:1367
 msgctxt "caribbean.kgm"
 msgid "Port of Spain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1365
+#: mapsdatatranslation.cpp:1368
 msgctxt "caribbean.kgm"
 msgid "Netherlands Antilles (NL)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1366
+#: mapsdatatranslation.cpp:1369
 msgctxt "caribbean.kgm"
 msgid "Willemstad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1367
+#: mapsdatatranslation.cpp:1370
 msgctxt "caribbean.kgm"
 msgid "Aruba (NL)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1368
+#: mapsdatatranslation.cpp:1371
 msgctxt "caribbean.kgm"
 msgid "Oranjestad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1369
+#: mapsdatatranslation.cpp:1372
 msgctxt "caribbean.kgm"
 msgid "Jamaica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1370
+#: mapsdatatranslation.cpp:1373
 msgctxt "caribbean.kgm"
 msgid "Kingston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1371
+#: mapsdatatranslation.cpp:1374
 msgctxt "caribbean.kgm"
 msgid "Cayman Islands (UK)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1372
+#: mapsdatatranslation.cpp:1375
 msgctxt "caribbean.kgm"
 msgid "George Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1373
+#: mapsdatatranslation.cpp:1376
 msgctxt "catalonia_comarques.kgm"
 msgid "Catalonia (Comarques)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1374
+#: mapsdatatranslation.cpp:1377
 msgctxt "catalonia_comarques.kgm"
 msgid "Comarques"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1375 mapsdatatranslation.cpp:1376
+#: mapsdatatranslation.cpp:1378 mapsdatatranslation.cpp:1379
 msgctxt "catalonia_comarques.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1377
+#: mapsdatatranslation.cpp:1380
 msgctxt "catalonia_comarques.kgm"
 msgid "Outside Catalonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1378
+#: mapsdatatranslation.cpp:1381
 msgctxt "catalonia_comarques.kgm"
 msgid "Alt Camp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1379
+#: mapsdatatranslation.cpp:1382
 msgctxt "catalonia_comarques.kgm"
 msgid "Valls"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1380
+#: mapsdatatranslation.cpp:1383
 msgctxt "catalonia_comarques.kgm"
 msgid "Alt Empordà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1381
+#: mapsdatatranslation.cpp:1384
 msgctxt "catalonia_comarques.kgm"
 msgid "Figueres"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1382
+#: mapsdatatranslation.cpp:1385
 msgctxt "catalonia_comarques.kgm"
 msgid "Alt Penedès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1383
+#: mapsdatatranslation.cpp:1386
 msgctxt "catalonia_comarques.kgm"
 msgid "Vilafranca del Penedès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1384
+#: mapsdatatranslation.cpp:1387
 msgctxt "catalonia_comarques.kgm"
 msgid "Alt Urgell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1385
+#: mapsdatatranslation.cpp:1388
 msgctxt "catalonia_comarques.kgm"
 msgid "La Seu d'Urgell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1386
+#: mapsdatatranslation.cpp:1389
 msgctxt "catalonia_comarques.kgm"
 msgid "Alta Ribagorça"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1387
+#: mapsdatatranslation.cpp:1390
 msgctxt "catalonia_comarques.kgm"
 msgid "Pont de Suert"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1388
+#: mapsdatatranslation.cpp:1391
 msgctxt "catalonia_comarques.kgm"
 msgid "Anoia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1389
+#: mapsdatatranslation.cpp:1392
 msgctxt "catalonia_comarques.kgm"
 msgid "Igualada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1390
+#: mapsdatatranslation.cpp:1393
 msgctxt "catalonia_comarques.kgm"
 msgid "Bages"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1391
+#: mapsdatatranslation.cpp:1394
 msgctxt "catalonia_comarques.kgm"
 msgid "Manresa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1392
+#: mapsdatatranslation.cpp:1395
 msgctxt "catalonia_comarques.kgm"
 msgid "Baix Camp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1393
+#: mapsdatatranslation.cpp:1396
 msgctxt "catalonia_comarques.kgm"
 msgid "Reus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1394
+#: mapsdatatranslation.cpp:1397
 msgctxt "catalonia_comarques.kgm"
 msgid "Baix Ebre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1395
+#: mapsdatatranslation.cpp:1398
 msgctxt "catalonia_comarques.kgm"
 msgid "Tortosa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1396
+#: mapsdatatranslation.cpp:1399
 msgctxt "catalonia_comarques.kgm"
 msgid "Baix Empordà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1397
+#: mapsdatatranslation.cpp:1400
 msgctxt "catalonia_comarques.kgm"
 msgid "La Bisbal d'Empordà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1398
+#: mapsdatatranslation.cpp:1401
 msgctxt "catalonia_comarques.kgm"
 msgid "Baix Llobregat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1399
+#: mapsdatatranslation.cpp:1402
 msgctxt "catalonia_comarques.kgm"
 msgid "Sant Feliu de Llobregat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1400
+#: mapsdatatranslation.cpp:1403
 msgctxt "catalonia_comarques.kgm"
 msgid "Baix Penedès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1401
+#: mapsdatatranslation.cpp:1404
 msgctxt "catalonia_comarques.kgm"
 msgid "El Vendrell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1402
+#: mapsdatatranslation.cpp:1405
 msgctxt "catalonia_comarques.kgm"
 msgid "Barcelonès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1403
+#: mapsdatatranslation.cpp:1406
 msgctxt "catalonia_comarques.kgm"
 msgid "Barcelona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1404
+#: mapsdatatranslation.cpp:1407
 msgctxt "catalonia_comarques.kgm"
 msgid "Berguedà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1405
+#: mapsdatatranslation.cpp:1408
 msgctxt "catalonia_comarques.kgm"
 msgid "Berga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1406
+#: mapsdatatranslation.cpp:1409
 msgctxt "catalonia_comarques.kgm"
 msgid "Cerdanya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1407
+#: mapsdatatranslation.cpp:1410
 msgctxt "catalonia_comarques.kgm"
 msgid "Puigcerdà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1408
+#: mapsdatatranslation.cpp:1411
 msgctxt "catalonia_comarques.kgm"
 msgid "Conca de Barberà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1409
+#: mapsdatatranslation.cpp:1412
 msgctxt "catalonia_comarques.kgm"
 msgid "Montblanc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1410
+#: mapsdatatranslation.cpp:1413
 msgctxt "catalonia_comarques.kgm"
 msgid "Garraf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1411
+#: mapsdatatranslation.cpp:1414
 msgctxt "catalonia_comarques.kgm"
 msgid "Vilanova i la Geltrú"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1412
+#: mapsdatatranslation.cpp:1415
 msgctxt "catalonia_comarques.kgm"
 msgid "Garrigues"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1413
+#: mapsdatatranslation.cpp:1416
 msgctxt "catalonia_comarques.kgm"
 msgid "Les Borges Blanques"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1414
+#: mapsdatatranslation.cpp:1417
 msgctxt "catalonia_comarques.kgm"
 msgid "Garrotxa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1415
+#: mapsdatatranslation.cpp:1418
 msgctxt "catalonia_comarques.kgm"
 msgid "Olot"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1416
+#: mapsdatatranslation.cpp:1419
 msgctxt "catalonia_comarques.kgm"
 msgid "Gironès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1417
+#: mapsdatatranslation.cpp:1420
 msgctxt "catalonia_comarques.kgm"
 msgid "Girona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1418
+#: mapsdatatranslation.cpp:1421
 msgctxt "catalonia_comarques.kgm"
 msgid "Maresme"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1419
+#: mapsdatatranslation.cpp:1422
 msgctxt "catalonia_comarques.kgm"
 msgid "Mataró"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1420
+#: mapsdatatranslation.cpp:1423
 msgctxt "catalonia_comarques.kgm"
 msgid "Montsià"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1421
+#: mapsdatatranslation.cpp:1424
 msgctxt "catalonia_comarques.kgm"
 msgid "Amposta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1422
+#: mapsdatatranslation.cpp:1425
 msgctxt "catalonia_comarques.kgm"
 msgid "Noguera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1423
+#: mapsdatatranslation.cpp:1426
 msgctxt "catalonia_comarques.kgm"
 msgid "Balaguer"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1424
+#: mapsdatatranslation.cpp:1427
 msgctxt "catalonia_comarques.kgm"
 msgid "Osona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1425
+#: mapsdatatranslation.cpp:1428
 msgctxt "catalonia_comarques.kgm"
 msgid "Vic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1426
+#: mapsdatatranslation.cpp:1429
 msgctxt "catalonia_comarques.kgm"
 msgid "Pallars Jussà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1427
+#: mapsdatatranslation.cpp:1430
 msgctxt "catalonia_comarques.kgm"
 msgid "Tremp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1428
+#: mapsdatatranslation.cpp:1431
 msgctxt "catalonia_comarques.kgm"
 msgid "Pallars Sobirà"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1429
+#: mapsdatatranslation.cpp:1432
 msgctxt "catalonia_comarques.kgm"
 msgid "Sort"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1430
+#: mapsdatatranslation.cpp:1433
 msgctxt "catalonia_comarques.kgm"
 msgid "Pla de l'Estany"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1431
+#: mapsdatatranslation.cpp:1434
 msgctxt "catalonia_comarques.kgm"
 msgid "Banyoles"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1432
+#: mapsdatatranslation.cpp:1435
 msgctxt "catalonia_comarques.kgm"
 msgid "Pla d'Urgell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1433
+#: mapsdatatranslation.cpp:1436
 msgctxt "catalonia_comarques.kgm"
 msgid "Mollerussa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1434
+#: mapsdatatranslation.cpp:1437
 msgctxt "catalonia_comarques.kgm"
 msgid "Priorat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1435
+#: mapsdatatranslation.cpp:1438
 msgctxt "catalonia_comarques.kgm"
 msgid "Falset"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1436
+#: mapsdatatranslation.cpp:1439
 msgctxt "catalonia_comarques.kgm"
 msgid "Ribera d'Ebre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1437
+#: mapsdatatranslation.cpp:1440
 msgctxt "catalonia_comarques.kgm"
 msgid "Móra d'Ebre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1438
+#: mapsdatatranslation.cpp:1441
 msgctxt "catalonia_comarques.kgm"
 msgid "Ripollès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1439
+#: mapsdatatranslation.cpp:1442
 msgctxt "catalonia_comarques.kgm"
 msgid "Ripoll"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1440
+#: mapsdatatranslation.cpp:1443
 msgctxt "catalonia_comarques.kgm"
 msgid "Segarra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1441
+#: mapsdatatranslation.cpp:1444
 msgctxt "catalonia_comarques.kgm"
 msgid "Cervera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1442
+#: mapsdatatranslation.cpp:1445
 msgctxt "catalonia_comarques.kgm"
 msgid "Segrià"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1443
+#: mapsdatatranslation.cpp:1446
 msgctxt "catalonia_comarques.kgm"
 msgid "Lleida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1444
+#: mapsdatatranslation.cpp:1447
 msgctxt "catalonia_comarques.kgm"
 msgid "Selva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1445
+#: mapsdatatranslation.cpp:1448
 msgctxt "catalonia_comarques.kgm"
 msgid "Santa Coloma de Farners"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1446
+#: mapsdatatranslation.cpp:1449
 msgctxt "catalonia_comarques.kgm"
 msgid "Solsonès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1447
+#: mapsdatatranslation.cpp:1450
 msgctxt "catalonia_comarques.kgm"
 msgid "Solsona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1448
+#: mapsdatatranslation.cpp:1451
 msgctxt "catalonia_comarques.kgm"
 msgid "Tarragonès"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1449
+#: mapsdatatranslation.cpp:1452
 msgctxt "catalonia_comarques.kgm"
 msgid "Tarragona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1450
+#: mapsdatatranslation.cpp:1453
 msgctxt "catalonia_comarques.kgm"
 msgid "Terra Alta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1451
+#: mapsdatatranslation.cpp:1454
 msgctxt "catalonia_comarques.kgm"
 msgid "Gandesa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1452
+#: mapsdatatranslation.cpp:1455
 msgctxt "catalonia_comarques.kgm"
 msgid "Urgell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1453
+#: mapsdatatranslation.cpp:1456
 msgctxt "catalonia_comarques.kgm"
 msgid "Tàrrega"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1454
+#: mapsdatatranslation.cpp:1457
 msgctxt "catalonia_comarques.kgm"
 msgid "Vall d'Aran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1455
+#: mapsdatatranslation.cpp:1458
 msgctxt "catalonia_comarques.kgm"
 msgid "Vielha e Mijaran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1456
+#: mapsdatatranslation.cpp:1459
 msgctxt "catalonia_comarques.kgm"
 msgid "Vallès Occidental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1457
+#: mapsdatatranslation.cpp:1460
 msgctxt "catalonia_comarques.kgm"
 msgid "Sabadell and Terrassa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1458
+#: mapsdatatranslation.cpp:1461
 msgctxt "catalonia_comarques.kgm"
 msgid "Vallès Oriental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1459
+#: mapsdatatranslation.cpp:1462
 msgctxt "catalonia_comarques.kgm"
 msgid "Granollers"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1460
+#: mapsdatatranslation.cpp:1463
 msgctxt "chhattisgarh.kgm"
 msgid "Chhattisgarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1461
+#: mapsdatatranslation.cpp:1464
 msgctxt "chhattisgarh.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1462
+#: mapsdatatranslation.cpp:1465
 msgctxt "chhattisgarh.kgm"
 msgid "Not Chhattisgarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1463
+#: mapsdatatranslation.cpp:1466
 msgctxt "chhattisgarh.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1464
+#: mapsdatatranslation.cpp:1467
 msgctxt "chhattisgarh.kgm"
 msgid "Surguja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1465
+#: mapsdatatranslation.cpp:1468
 msgctxt "chhattisgarh.kgm"
 msgid "Ambikapur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1466 mapsdatatranslation.cpp:1467
+#: mapsdatatranslation.cpp:1469 mapsdatatranslation.cpp:1470
 msgctxt "chhattisgarh.kgm"
 msgid "Koriya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1468 mapsdatatranslation.cpp:1469
+#: mapsdatatranslation.cpp:1471 mapsdatatranslation.cpp:1472
 msgctxt "chhattisgarh.kgm"
 msgid "Jashpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1470 mapsdatatranslation.cpp:1471
+#: mapsdatatranslation.cpp:1473 mapsdatatranslation.cpp:1474
 msgctxt "chhattisgarh.kgm"
 msgid "Korba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1472 mapsdatatranslation.cpp:1473
+#: mapsdatatranslation.cpp:1475 mapsdatatranslation.cpp:1476
 msgctxt "chhattisgarh.kgm"
 msgid "Bilaspur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1474 mapsdatatranslation.cpp:1475
+#: mapsdatatranslation.cpp:1477 mapsdatatranslation.cpp:1478
 msgctxt "chhattisgarh.kgm"
 msgid "Raigarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1476
+#: mapsdatatranslation.cpp:1479
 msgctxt "chhattisgarh.kgm"
 msgid "Kabirdham"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1477
+#: mapsdatatranslation.cpp:1480
 msgctxt "chhattisgarh.kgm"
 msgid "Kawardha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1478
+#: mapsdatatranslation.cpp:1481
 msgctxt "chhattisgarh.kgm"
 msgid "Janjgir-Champa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1479
+#: mapsdatatranslation.cpp:1482
 msgctxt "chhattisgarh.kgm"
 msgid "Janjgir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1480 mapsdatatranslation.cpp:1481
+#: mapsdatatranslation.cpp:1483 mapsdatatranslation.cpp:1484
 msgctxt "chhattisgarh.kgm"
 msgid "Durg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1482 mapsdatatranslation.cpp:1483
+#: mapsdatatranslation.cpp:1485 mapsdatatranslation.cpp:1486
 msgctxt "chhattisgarh.kgm"
 msgid "Raipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1484 mapsdatatranslation.cpp:1485
+#: mapsdatatranslation.cpp:1487 mapsdatatranslation.cpp:1488
 msgctxt "chhattisgarh.kgm"
 msgid "Rajnandgaon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1486 mapsdatatranslation.cpp:1487
+#: mapsdatatranslation.cpp:1489 mapsdatatranslation.cpp:1490
 msgctxt "chhattisgarh.kgm"
 msgid "Mahasamund"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1488 mapsdatatranslation.cpp:1489
+#: mapsdatatranslation.cpp:1491 mapsdatatranslation.cpp:1492
 msgctxt "chhattisgarh.kgm"
 msgid "Kanker"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1490
+#: mapsdatatranslation.cpp:1493
 msgctxt "chhattisgarh.kgm"
 msgid "Bastar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1491
+#: mapsdatatranslation.cpp:1494
 msgctxt "chhattisgarh.kgm"
 msgid "Jagdalpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1492 mapsdatatranslation.cpp:1493
+#: mapsdatatranslation.cpp:1495 mapsdatatranslation.cpp:1496
 msgctxt "chhattisgarh.kgm"
 msgid "Dantewada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1494 mapsdatatranslation.cpp:1495
+#: mapsdatatranslation.cpp:1497 mapsdatatranslation.cpp:1498
 msgctxt "chhattisgarh.kgm"
 msgid "Dhamtari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1496
+#: mapsdatatranslation.cpp:1499
 msgctxt "chile.kgm"
 msgid "Chile"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1497
+#: mapsdatatranslation.cpp:1500
 msgctxt "chile.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1498
+#: mapsdatatranslation.cpp:1501
 msgctxt "chile.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1499
+#: mapsdatatranslation.cpp:1502
 msgctxt "chile.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1500
+#: mapsdatatranslation.cpp:1503
 msgctxt "chile.kgm"
 msgid "Not Chile"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1501
+#: mapsdatatranslation.cpp:1504
 msgctxt "chile.kgm"
 msgid "Tarapacá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1502
+#: mapsdatatranslation.cpp:1505
 msgctxt "chile.kgm"
 msgid "Iquique"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1503 mapsdatatranslation.cpp:1504
+#: mapsdatatranslation.cpp:1506 mapsdatatranslation.cpp:1507
 msgctxt "chile.kgm"
 msgid "Antofagasta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1505
+#: mapsdatatranslation.cpp:1508
 msgctxt "chile.kgm"
 msgid "Atacama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1506
+#: mapsdatatranslation.cpp:1509
 msgctxt "chile.kgm"
 msgid "Copiapo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1507
+#: mapsdatatranslation.cpp:1510
 msgctxt "chile.kgm"
 msgid "Coquimbo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1508
+#: mapsdatatranslation.cpp:1511
 msgctxt "chile.kgm"
 msgid "La Serena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1509
+#: mapsdatatranslation.cpp:1512
 msgctxt "chile.kgm"
 msgid "Valparaíso"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1510
+#: mapsdatatranslation.cpp:1513
 msgctxt "chile.kgm"
 msgid "Valparaiso"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1511
+#: mapsdatatranslation.cpp:1514
 msgctxt "chile.kgm"
 msgid "O'Higgins"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1512
+#: mapsdatatranslation.cpp:1515
 msgctxt "chile.kgm"
 msgid "Rancagua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1513
+#: mapsdatatranslation.cpp:1516
 msgctxt "chile.kgm"
 msgid "Maule"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1514
+#: mapsdatatranslation.cpp:1517
 msgctxt "chile.kgm"
 msgid "Talca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1515
+#: mapsdatatranslation.cpp:1518
 msgctxt "chile.kgm"
 msgid "Bío-Bío"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1516
+#: mapsdatatranslation.cpp:1519
 msgctxt "chile.kgm"
 msgid "Concepción"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1517
+#: mapsdatatranslation.cpp:1520
 msgctxt "chile.kgm"
 msgid "Araucanía"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1518
+#: mapsdatatranslation.cpp:1521
 msgctxt "chile.kgm"
 msgid "Temuco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1519
+#: mapsdatatranslation.cpp:1522
 msgctxt "chile.kgm"
 msgid "Los Lagos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1520
+#: mapsdatatranslation.cpp:1523
 msgctxt "chile.kgm"
 msgid "Puerto Montt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1521
+#: mapsdatatranslation.cpp:1524
 msgctxt "chile.kgm"
 msgid "Aysen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1522
+#: mapsdatatranslation.cpp:1525
 msgctxt "chile.kgm"
 msgid "Coyhaique"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1523
+#: mapsdatatranslation.cpp:1526
 msgctxt "chile.kgm"
 msgid "Magallanes y la Antártica Chilena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1524
+#: mapsdatatranslation.cpp:1527
 msgctxt "chile.kgm"
 msgid "Punta Arenas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1525
+#: mapsdatatranslation.cpp:1528
 msgctxt "chile.kgm"
 msgid "Santiago Metropolitan Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1526
+#: mapsdatatranslation.cpp:1529
 msgctxt "chile.kgm"
 msgid "Santiago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1527
+#: mapsdatatranslation.cpp:1530
 msgctxt "chile.kgm"
 msgid "Los Rios"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1528
+#: mapsdatatranslation.cpp:1531
 msgctxt "chile.kgm"
 msgid "Valdivia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1529
+#: mapsdatatranslation.cpp:1532
 msgctxt "chile.kgm"
 msgid "Arica and Parinacota"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1530
+#: mapsdatatranslation.cpp:1533
 msgctxt "chile.kgm"
 msgid "Arica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1531
+#: mapsdatatranslation.cpp:1534
 msgctxt "china.kgm"
 msgid "China"
 msgstr "Tseina"
 
-#: mapsdatatranslation.cpp:1532
+#: mapsdatatranslation.cpp:1535
 msgctxt "china.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1533
+#: mapsdatatranslation.cpp:1536
 msgctxt "china.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:1534
+#: mapsdatatranslation.cpp:1537
 msgctxt "china.kgm"
 msgid "Water"
 msgstr "Dŵr"
 
-#: mapsdatatranslation.cpp:1535
+#: mapsdatatranslation.cpp:1538
 msgctxt "china.kgm"
 msgid "Coast"
 msgstr "Arfordir"
 
-#: mapsdatatranslation.cpp:1536
+#: mapsdatatranslation.cpp:1539
 msgctxt "china.kgm"
 msgid "Russia"
 msgstr "Rwsia"
 
-#: mapsdatatranslation.cpp:1537
+#: mapsdatatranslation.cpp:1540
 msgctxt "china.kgm"
 msgid "Japan"
 msgstr "Siapan"
 
-#: mapsdatatranslation.cpp:1538
+#: mapsdatatranslation.cpp:1541
 msgctxt "china.kgm"
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: mapsdatatranslation.cpp:1539
+#: mapsdatatranslation.cpp:1542
 msgctxt "china.kgm"
 msgid "North Korea"
 msgstr "Gogledd Corea"
 
-#: mapsdatatranslation.cpp:1540
+#: mapsdatatranslation.cpp:1543
 msgctxt "china.kgm"
 msgid "South Korea"
 msgstr "De Corea"
 
-#: mapsdatatranslation.cpp:1541
+#: mapsdatatranslation.cpp:1544
 msgctxt "china.kgm"
 msgid "Kazakhstan"
 msgstr "Casachstan"
 
-#: mapsdatatranslation.cpp:1542
+#: mapsdatatranslation.cpp:1545
 msgctxt "china.kgm"
 msgid "Kyrgyzstan"
 msgstr "Cirgistan"
 
-#: mapsdatatranslation.cpp:1543
+#: mapsdatatranslation.cpp:1546
 msgctxt "china.kgm"
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: mapsdatatranslation.cpp:1544
+#: mapsdatatranslation.cpp:1547
 msgctxt "china.kgm"
 msgid "Afghanistan"
 msgstr "Affganistan"
 
-#: mapsdatatranslation.cpp:1545
+#: mapsdatatranslation.cpp:1548
 msgctxt "china.kgm"
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: mapsdatatranslation.cpp:1546
+#: mapsdatatranslation.cpp:1549
 msgctxt "china.kgm"
 msgid "India"
 msgstr "India"
 
-#: mapsdatatranslation.cpp:1547
+#: mapsdatatranslation.cpp:1550
 msgctxt "china.kgm"
 msgid "Bhutan"
 msgstr "Bhwtan"
 
-#: mapsdatatranslation.cpp:1548
+#: mapsdatatranslation.cpp:1551
 msgctxt "china.kgm"
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: mapsdatatranslation.cpp:1549
+#: mapsdatatranslation.cpp:1552
 msgctxt "china.kgm"
 msgid "Myanmar"
 msgstr "Mianmar"
 
-#: mapsdatatranslation.cpp:1550
+#: mapsdatatranslation.cpp:1553
 msgctxt "china.kgm"
 msgid "Thailand"
 msgstr "Gwlad y Thai"
 
-#: mapsdatatranslation.cpp:1551
+#: mapsdatatranslation.cpp:1554
 msgctxt "china.kgm"
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: mapsdatatranslation.cpp:1552
+#: mapsdatatranslation.cpp:1555
 msgctxt "china.kgm"
 msgid "Vietnam"
 msgstr "Fietnam"
 
-#: mapsdatatranslation.cpp:1553
+#: mapsdatatranslation.cpp:1556
 msgctxt "china.kgm"
 msgid "Laos"
 msgstr "Laos"
 
-#: mapsdatatranslation.cpp:1554
+#: mapsdatatranslation.cpp:1557
 msgctxt "china.kgm"
 msgid "Nepal"
 msgstr "Nepal"
 
-#: mapsdatatranslation.cpp:1555
+#: mapsdatatranslation.cpp:1558
 msgctxt "china.kgm"
 msgid "Anhui"
 msgstr "Anhui"
 
-#: mapsdatatranslation.cpp:1556
+#: mapsdatatranslation.cpp:1559
 msgctxt "china.kgm"
 msgid "Hefei"
 msgstr "Hefei"
 
-#: mapsdatatranslation.cpp:1557
+#: mapsdatatranslation.cpp:1560
 msgctxt "china.kgm"
 msgid "Beijing"
 msgstr "Beijing"
 
-#: mapsdatatranslation.cpp:1558
+#: mapsdatatranslation.cpp:1561
 msgctxt "china.kgm"
 msgid "Chongqing"
 msgstr "Chongqing"
 
-#: mapsdatatranslation.cpp:1559
+#: mapsdatatranslation.cpp:1562
 msgctxt "china.kgm"
 msgid "Fujian"
 msgstr "Fujian"
 
-#: mapsdatatranslation.cpp:1560
+#: mapsdatatranslation.cpp:1563
 msgctxt "china.kgm"
 msgid "Fuzhou"
 msgstr "Fuzhou"
 
-#: mapsdatatranslation.cpp:1561
+#: mapsdatatranslation.cpp:1564
 msgctxt "china.kgm"
 msgid "Gansu"
 msgstr "Gansu"
 
-#: mapsdatatranslation.cpp:1562
+#: mapsdatatranslation.cpp:1565
 msgctxt "china.kgm"
 msgid "Lanzhou"
 msgstr "Lanzhou"
 
-#: mapsdatatranslation.cpp:1563
+#: mapsdatatranslation.cpp:1566
 msgctxt "china.kgm"
 msgid "Guangdong"
 msgstr "Guangdong"
 
-#: mapsdatatranslation.cpp:1564
+#: mapsdatatranslation.cpp:1567
 msgctxt "china.kgm"
 msgid "Guangzhou"
 msgstr "Guangzhou"
 
-#: mapsdatatranslation.cpp:1565
+#: mapsdatatranslation.cpp:1568
 msgctxt "china.kgm"
 msgid "Guangxi Zhuang"
 msgstr "Guangxi Zhuang"
 
-#: mapsdatatranslation.cpp:1566
+#: mapsdatatranslation.cpp:1569
 msgctxt "china.kgm"
 msgid "Nanning"
 msgstr "Nanning"
 
-#: mapsdatatranslation.cpp:1567
+#: mapsdatatranslation.cpp:1570
 msgctxt "china.kgm"
 msgid "Guizhou"
 msgstr "Guizhou"
 
-#: mapsdatatranslation.cpp:1568
+#: mapsdatatranslation.cpp:1571
 msgctxt "china.kgm"
 msgid "Guiyang"
 msgstr "Guiyang"
 
-#: mapsdatatranslation.cpp:1569
+#: mapsdatatranslation.cpp:1572
 msgctxt "china.kgm"
 msgid "Hainan"
 msgstr "Hainan"
 
-#: mapsdatatranslation.cpp:1570
+#: mapsdatatranslation.cpp:1573
 msgctxt "china.kgm"
 msgid "Haikou"
 msgstr "Haikou"
 
-#: mapsdatatranslation.cpp:1571
+#: mapsdatatranslation.cpp:1574
 msgctxt "china.kgm"
 msgid "Hebei"
 msgstr "Hebei"
 
-#: mapsdatatranslation.cpp:1572
+#: mapsdatatranslation.cpp:1575
 msgctxt "china.kgm"
 msgid "Shijiazhuang"
 msgstr "Shijiazhuang"
 
-#: mapsdatatranslation.cpp:1573
+#: mapsdatatranslation.cpp:1576
 msgctxt "china.kgm"
 msgid "Heilongjiang"
 msgstr "Heilongjiang"
 
-#: mapsdatatranslation.cpp:1574
+#: mapsdatatranslation.cpp:1577
 msgctxt "china.kgm"
 msgid "Harbin"
 msgstr "Harbin"
 
-#: mapsdatatranslation.cpp:1575
+#: mapsdatatranslation.cpp:1578
 msgctxt "china.kgm"
 msgid "Henan"
 msgstr "Henan"
 
-#: mapsdatatranslation.cpp:1576
+#: mapsdatatranslation.cpp:1579
 msgctxt "china.kgm"
 msgid "Zhengzhou"
 msgstr "Zhengzhou"
 
-#: mapsdatatranslation.cpp:1577
+#: mapsdatatranslation.cpp:1580
 msgctxt "china.kgm"
 msgid "Hubei"
 msgstr "Hubei"
 
-#: mapsdatatranslation.cpp:1578
+#: mapsdatatranslation.cpp:1581
 msgctxt "china.kgm"
 msgid "Wuhan"
 msgstr "Wuhan"
 
-#: mapsdatatranslation.cpp:1579
+#: mapsdatatranslation.cpp:1582
 msgctxt "china.kgm"
 msgid "Hunan"
 msgstr "Hunan"
 
-#: mapsdatatranslation.cpp:1580
+#: mapsdatatranslation.cpp:1583
 msgctxt "china.kgm"
 msgid "Changsha"
 msgstr "Changsha"
 
-#: mapsdatatranslation.cpp:1581
+#: mapsdatatranslation.cpp:1584
 msgctxt "china.kgm"
 msgid "Jiangsu"
 msgstr "Jiangsu"
 
-#: mapsdatatranslation.cpp:1582
+#: mapsdatatranslation.cpp:1585
 msgctxt "china.kgm"
 msgid "Nanjing"
 msgstr "Nanjing"
 
-#: mapsdatatranslation.cpp:1583
+#: mapsdatatranslation.cpp:1586
 msgctxt "china.kgm"
 msgid "Jiangxi"
 msgstr "Jiangxi"
 
-#: mapsdatatranslation.cpp:1584
+#: mapsdatatranslation.cpp:1587
 msgctxt "china.kgm"
 msgid "Nanchang"
 msgstr "Nanchang"
 
-#: mapsdatatranslation.cpp:1585
+#: mapsdatatranslation.cpp:1588
 msgctxt "china.kgm"
 msgid "Jilin"
 msgstr "Jilin"
 
-#: mapsdatatranslation.cpp:1586
+#: mapsdatatranslation.cpp:1589
 msgctxt "china.kgm"
 msgid "Changchun"
 msgstr "Changchun"
 
-#: mapsdatatranslation.cpp:1587
+#: mapsdatatranslation.cpp:1590
 msgctxt "china.kgm"
 msgid "Liaoning"
 msgstr "Liaoning"
 
-#: mapsdatatranslation.cpp:1588
+#: mapsdatatranslation.cpp:1591
 msgctxt "china.kgm"
 msgid "Shenyang"
 msgstr "Shenyang"
 
-#: mapsdatatranslation.cpp:1589
+#: mapsdatatranslation.cpp:1592
 msgctxt "china.kgm"
 msgid "Nei Mongol"
 msgstr "Nei Mongol"
 
-#: mapsdatatranslation.cpp:1590
+#: mapsdatatranslation.cpp:1593
 msgctxt "china.kgm"
 msgid "Hohhot"
 msgstr "Hohhot"
 
-#: mapsdatatranslation.cpp:1591
+#: mapsdatatranslation.cpp:1594
 msgctxt "china.kgm"
 msgid "Ningxia Hui"
 msgstr "Ningxia Hui"
 
-#: mapsdatatranslation.cpp:1592
+#: mapsdatatranslation.cpp:1595
 msgctxt "china.kgm"
 msgid "Yinchuan"
 msgstr "Yinchuan"
 
-#: mapsdatatranslation.cpp:1593
+#: mapsdatatranslation.cpp:1596
 msgctxt "china.kgm"
 msgid "Qinghai"
 msgstr "Qinghai"
 
-#: mapsdatatranslation.cpp:1594
+#: mapsdatatranslation.cpp:1597
 msgctxt "china.kgm"
 msgid "Xining"
 msgstr "Xining"
 
-#: mapsdatatranslation.cpp:1595
+#: mapsdatatranslation.cpp:1598
 msgctxt "china.kgm"
 msgid "Shanxi"
 msgstr "Shanxi"
 
-#: mapsdatatranslation.cpp:1596
+#: mapsdatatranslation.cpp:1599
 msgctxt "china.kgm"
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: mapsdatatranslation.cpp:1597
+#: mapsdatatranslation.cpp:1600
 msgctxt "china.kgm"
 msgid "Shandong"
 msgstr "Shandong"
 
-#: mapsdatatranslation.cpp:1598
+#: mapsdatatranslation.cpp:1601
 msgctxt "china.kgm"
 msgid "Jinan"
 msgstr "Jinan"
 
-#: mapsdatatranslation.cpp:1599
+#: mapsdatatranslation.cpp:1602
 msgctxt "china.kgm"
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: mapsdatatranslation.cpp:1600
+#: mapsdatatranslation.cpp:1603
 msgctxt "china.kgm"
 msgid "Shaanxi"
 msgstr "Shaanxi"
 
-#: mapsdatatranslation.cpp:1601
+#: mapsdatatranslation.cpp:1604
 msgctxt "china.kgm"
 msgid "Xian"
 msgstr "Xian"
 
-#: mapsdatatranslation.cpp:1602
+#: mapsdatatranslation.cpp:1605
 msgctxt "china.kgm"
 msgid "Sichuan"
 msgstr "Sichuan"
 
-#: mapsdatatranslation.cpp:1603
+#: mapsdatatranslation.cpp:1606
 msgctxt "china.kgm"
 msgid "Chengdu"
 msgstr "Chengdu"
 
-#: mapsdatatranslation.cpp:1604
+#: mapsdatatranslation.cpp:1607
 msgctxt "china.kgm"
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: mapsdatatranslation.cpp:1605
+#: mapsdatatranslation.cpp:1608
 msgctxt "china.kgm"
 msgid "Xinjiang Uygur"
 msgstr "Xinjiang Uygur"
 
-#: mapsdatatranslation.cpp:1606
+#: mapsdatatranslation.cpp:1609
 msgctxt "china.kgm"
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: mapsdatatranslation.cpp:1607
+#: mapsdatatranslation.cpp:1610
 msgctxt "china.kgm"
 msgid "Xizang"
 msgstr "Xizang"
 
-#: mapsdatatranslation.cpp:1608
+#: mapsdatatranslation.cpp:1611
 msgctxt "china.kgm"
 msgid "Lhasa"
 msgstr "Lhasa"
 
-#: mapsdatatranslation.cpp:1609
+#: mapsdatatranslation.cpp:1612
 msgctxt "china.kgm"
 msgid "Yunnan"
 msgstr "Yunnan"
 
-#: mapsdatatranslation.cpp:1610
+#: mapsdatatranslation.cpp:1613
 msgctxt "china.kgm"
 msgid "Kunming"
 msgstr "Kunming"
 
-#: mapsdatatranslation.cpp:1611
+#: mapsdatatranslation.cpp:1614
 msgctxt "china.kgm"
 msgid "Zhejiang"
 msgstr "Zhejiang"
 
-#: mapsdatatranslation.cpp:1612
+#: mapsdatatranslation.cpp:1615
 msgctxt "china.kgm"
 msgid "Hangzhou"
 msgstr "Hangzhou"
 
-#: mapsdatatranslation.cpp:1613
+#: mapsdatatranslation.cpp:1616
 msgctxt "china.kgm"
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: mapsdatatranslation.cpp:1614
+#: mapsdatatranslation.cpp:1617
 msgctxt "china.kgm"
 msgid "Macao"
 msgstr "Macao"
 
-#: mapsdatatranslation.cpp:1615
+#: mapsdatatranslation.cpp:1618
 msgctxt "colombia.kgm"
 msgid "Colombia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1616
+#: mapsdatatranslation.cpp:1619
 msgctxt "colombia.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1617
+#: mapsdatatranslation.cpp:1620
 msgctxt "colombia.kgm"
 msgid "Amazonas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1618
+#: mapsdatatranslation.cpp:1621
 msgctxt "colombia.kgm"
 msgid "Leticia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1619
+#: mapsdatatranslation.cpp:1622
 msgctxt "colombia.kgm"
 msgid "Antioquia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1620
+#: mapsdatatranslation.cpp:1623
 msgctxt "colombia.kgm"
 msgid "Medellin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1621 mapsdatatranslation.cpp:1622
+#: mapsdatatranslation.cpp:1624 mapsdatatranslation.cpp:1625
 msgctxt "colombia.kgm"
 msgid "Arauca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1623
+#: mapsdatatranslation.cpp:1626
 msgctxt "colombia.kgm"
 msgid "Atlantico"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1624
+#: mapsdatatranslation.cpp:1627
 msgctxt "colombia.kgm"
 msgid "Barranquilla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1625
+#: mapsdatatranslation.cpp:1628
 msgctxt "colombia.kgm"
 msgid "Bolivar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1626
+#: mapsdatatranslation.cpp:1629
 msgctxt "colombia.kgm"
 msgid "Cartagena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1627
+#: mapsdatatranslation.cpp:1630
 msgctxt "colombia.kgm"
 msgid "Boyaca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1628
+#: mapsdatatranslation.cpp:1631
 msgctxt "colombia.kgm"
 msgid "Tunja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1629
+#: mapsdatatranslation.cpp:1632
 msgctxt "colombia.kgm"
 msgid "Caldas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1630
+#: mapsdatatranslation.cpp:1633
 msgctxt "colombia.kgm"
 msgid "Manizales"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1631
+#: mapsdatatranslation.cpp:1634
 msgctxt "colombia.kgm"
 msgid "Caqueta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1632
+#: mapsdatatranslation.cpp:1635
 msgctxt "colombia.kgm"
 msgid "Florencia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1633
+#: mapsdatatranslation.cpp:1636
 msgctxt "colombia.kgm"
 msgid "Casanare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1634
+#: mapsdatatranslation.cpp:1637
 msgctxt "colombia.kgm"
 msgid "Yopal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1635
+#: mapsdatatranslation.cpp:1638
 msgctxt "colombia.kgm"
 msgid "Cauca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1636
+#: mapsdatatranslation.cpp:1639
 msgctxt "colombia.kgm"
 msgid "Popayan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1637
+#: mapsdatatranslation.cpp:1640
 msgctxt "colombia.kgm"
 msgid "Cesar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1638
+#: mapsdatatranslation.cpp:1641
 msgctxt "colombia.kgm"
 msgid "Valledupar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1639
+#: mapsdatatranslation.cpp:1642
 msgctxt "colombia.kgm"
 msgid "Choco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1640
+#: mapsdatatranslation.cpp:1643
 msgctxt "colombia.kgm"
 msgid "Quibdo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1641
+#: mapsdatatranslation.cpp:1644
 msgctxt "colombia.kgm"
 msgid "Cordoba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1642
+#: mapsdatatranslation.cpp:1645
 msgctxt "colombia.kgm"
 msgid "Monteria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1643
+#: mapsdatatranslation.cpp:1646
 msgctxt "colombia.kgm"
 msgid "Cundinamarca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1644 mapsdatatranslation.cpp:1646
+#: mapsdatatranslation.cpp:1647 mapsdatatranslation.cpp:1649
 msgctxt "colombia.kgm"
 msgid "Bogota"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1645
+#: mapsdatatranslation.cpp:1648
 msgctxt "colombia.kgm"
 msgid "Capital District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1647
+#: mapsdatatranslation.cpp:1650
 msgctxt "colombia.kgm"
 msgid "Guainia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1648
+#: mapsdatatranslation.cpp:1651
 msgctxt "colombia.kgm"
 msgid "Inírida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1649
+#: mapsdatatranslation.cpp:1652
 msgctxt "colombia.kgm"
 msgid "Guaviare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1650
+#: mapsdatatranslation.cpp:1653
 msgctxt "colombia.kgm"
 msgid "San Jose"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1651
+#: mapsdatatranslation.cpp:1654
 msgctxt "colombia.kgm"
 msgid "Huila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1652
+#: mapsdatatranslation.cpp:1655
 msgctxt "colombia.kgm"
 msgid "Neiva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1653
+#: mapsdatatranslation.cpp:1656
 msgctxt "colombia.kgm"
 msgid "La Guajira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1654
+#: mapsdatatranslation.cpp:1657
 msgctxt "colombia.kgm"
 msgid "Riohacha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1655
+#: mapsdatatranslation.cpp:1658
 msgctxt "colombia.kgm"
 msgid "Magdalena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1656
+#: mapsdatatranslation.cpp:1659
 msgctxt "colombia.kgm"
 msgid "Santa Marta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1657
+#: mapsdatatranslation.cpp:1660
 msgctxt "colombia.kgm"
 msgid "Meta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1658
+#: mapsdatatranslation.cpp:1661
 msgctxt "colombia.kgm"
 msgid "Villavicencio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1659
+#: mapsdatatranslation.cpp:1662
 msgctxt "colombia.kgm"
 msgid "Narinyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1660
+#: mapsdatatranslation.cpp:1663
 msgctxt "colombia.kgm"
 msgid "Pasto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1661
+#: mapsdatatranslation.cpp:1664
 msgctxt "colombia.kgm"
 msgid "Norte de Santander"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1662
+#: mapsdatatranslation.cpp:1665
 msgctxt "colombia.kgm"
 msgid "Cucuta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1663
+#: mapsdatatranslation.cpp:1666
 msgctxt "colombia.kgm"
 msgid "Putumayo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1664
+#: mapsdatatranslation.cpp:1667
 msgctxt "colombia.kgm"
 msgid "Mocoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1665
+#: mapsdatatranslation.cpp:1668
 msgctxt "colombia.kgm"
 msgid "Quindio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1666
+#: mapsdatatranslation.cpp:1669
 msgctxt "colombia.kgm"
 msgid "Armenia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1667
+#: mapsdatatranslation.cpp:1670
 msgctxt "colombia.kgm"
 msgid "Risaralda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1668
+#: mapsdatatranslation.cpp:1671
 msgctxt "colombia.kgm"
 msgid "Pereira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1669
+#: mapsdatatranslation.cpp:1672
 msgctxt "colombia.kgm"
 msgid "St Andrew and Providence"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1670
+#: mapsdatatranslation.cpp:1673
 msgctxt "colombia.kgm"
 msgid "St Andrew"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1671
+#: mapsdatatranslation.cpp:1674
 msgctxt "colombia.kgm"
 msgid "Santander"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1672
+#: mapsdatatranslation.cpp:1675
 msgctxt "colombia.kgm"
 msgid "Bucaramanga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1673
+#: mapsdatatranslation.cpp:1676
 msgctxt "colombia.kgm"
 msgid "Sucre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1674
+#: mapsdatatranslation.cpp:1677
 msgctxt "colombia.kgm"
 msgid "Sincelejo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1675
+#: mapsdatatranslation.cpp:1678
 msgctxt "colombia.kgm"
 msgid "Tolima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1676
+#: mapsdatatranslation.cpp:1679
 msgctxt "colombia.kgm"
 msgid "Ibague"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1677
+#: mapsdatatranslation.cpp:1680
 msgctxt "colombia.kgm"
 msgid "Valle del Cauca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1678
+#: mapsdatatranslation.cpp:1681
 msgctxt "colombia.kgm"
 msgid "Cali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1679
+#: mapsdatatranslation.cpp:1682
 msgctxt "colombia.kgm"
 msgid "Vaupes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1680
+#: mapsdatatranslation.cpp:1683
 msgctxt "colombia.kgm"
 msgid "Mitu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1681
+#: mapsdatatranslation.cpp:1684
 msgctxt "colombia.kgm"
 msgid "Vichada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1682
+#: mapsdatatranslation.cpp:1685
 msgctxt "colombia.kgm"
 msgid "Puerto Carrenyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1683
+#: mapsdatatranslation.cpp:1686
 msgctxt "colombia.kgm"
 msgid "Ocean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1684
+#: mapsdatatranslation.cpp:1687
 msgctxt "colombia.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1685
+#: mapsdatatranslation.cpp:1688
 msgctxt "colombia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1686
+#: mapsdatatranslation.cpp:1689
 msgctxt "colombia.kgm"
 msgid "Other Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1687
+#: mapsdatatranslation.cpp:1690
 msgctxt "costa_rica.kgm"
 msgid "Costa Rica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1688
+#: mapsdatatranslation.cpp:1691
 msgctxt "costa_rica.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1689 mapsdatatranslation.cpp:1690
+#: mapsdatatranslation.cpp:1692 mapsdatatranslation.cpp:1693
 msgctxt "costa_rica.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1691
+#: mapsdatatranslation.cpp:1694
 msgctxt "costa_rica.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1692
+#: mapsdatatranslation.cpp:1695
 msgctxt "costa_rica.kgm"
 msgid "Not Costa Rica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1693 mapsdatatranslation.cpp:1694
+#: mapsdatatranslation.cpp:1696 mapsdatatranslation.cpp:1697
 msgctxt "costa_rica.kgm"
 msgid "Alajuela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1695 mapsdatatranslation.cpp:1696
+#: mapsdatatranslation.cpp:1698 mapsdatatranslation.cpp:1699
 msgctxt "costa_rica.kgm"
 msgid "Cartago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1697
+#: mapsdatatranslation.cpp:1700
 msgctxt "costa_rica.kgm"
 msgid "Guanacaste"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1698
+#: mapsdatatranslation.cpp:1701
 msgctxt "costa_rica.kgm"
 msgid "Liberia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1699 mapsdatatranslation.cpp:1700
+#: mapsdatatranslation.cpp:1702 mapsdatatranslation.cpp:1703
 msgctxt "costa_rica.kgm"
 msgid "Heredia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1701 mapsdatatranslation.cpp:1702
+#: mapsdatatranslation.cpp:1704 mapsdatatranslation.cpp:1705
 msgctxt "costa_rica.kgm"
 msgid "Limón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1703 mapsdatatranslation.cpp:1704
+#: mapsdatatranslation.cpp:1706 mapsdatatranslation.cpp:1707
 msgctxt "costa_rica.kgm"
 msgid "Puntarenas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1705 mapsdatatranslation.cpp:1706
+#: mapsdatatranslation.cpp:1708 mapsdatatranslation.cpp:1709
 msgctxt "costa_rica.kgm"
 msgid "San José"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1707
+#: mapsdatatranslation.cpp:1710
 msgctxt "cuba.kgm"
 msgid "Cuba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1708
+#: mapsdatatranslation.cpp:1711
 msgctxt "cuba.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1709 mapsdatatranslation.cpp:1710
+#: mapsdatatranslation.cpp:1712 mapsdatatranslation.cpp:1713
 msgctxt "cuba.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1711
+#: mapsdatatranslation.cpp:1714
 msgctxt "cuba.kgm"
 msgid "Not Cuba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1712
+#: mapsdatatranslation.cpp:1715
 msgctxt "cuba.kgm"
 msgid "Isla de la Juventud"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1713
+#: mapsdatatranslation.cpp:1716
 msgctxt "cuba.kgm"
 msgid "Nueva Gerona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1714
+#: mapsdatatranslation.cpp:1717
 msgctxt "cuba.kgm"
 msgid "Pinar del Río"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1715
+#: mapsdatatranslation.cpp:1718
 msgctxt "cuba.kgm"
 msgid "La Habana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1716
+#: mapsdatatranslation.cpp:1719
 msgctxt "cuba.kgm"
 msgid "Ciudad de La Habana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1717
+#: mapsdatatranslation.cpp:1720
 msgctxt "cuba.kgm"
 msgid "Matanzas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1718
+#: mapsdatatranslation.cpp:1721
 msgctxt "cuba.kgm"
 msgid "Cienfuegos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1719
+#: mapsdatatranslation.cpp:1722
 msgctxt "cuba.kgm"
 msgid "Villa Clara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1720
+#: mapsdatatranslation.cpp:1723
 msgctxt "cuba.kgm"
 msgid "Santa Clara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1721
+#: mapsdatatranslation.cpp:1724
 msgctxt "cuba.kgm"
 msgid "Sancti Spíritus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1722
+#: mapsdatatranslation.cpp:1725
 msgctxt "cuba.kgm"
 msgid "Ciego de Ávila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1723
+#: mapsdatatranslation.cpp:1726
 msgctxt "cuba.kgm"
 msgid "Camagüey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1724
+#: mapsdatatranslation.cpp:1727
 msgctxt "cuba.kgm"
 msgid "Las Tunas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1725
+#: mapsdatatranslation.cpp:1728
 msgctxt "cuba.kgm"
 msgid "Victoria de Las Tunas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1726
+#: mapsdatatranslation.cpp:1729
 msgctxt "cuba.kgm"
 msgid "Granma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1727
+#: mapsdatatranslation.cpp:1730
 msgctxt "cuba.kgm"
 msgid "Bayamo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1728
+#: mapsdatatranslation.cpp:1731
 msgctxt "cuba.kgm"
 msgid "Holguín"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1729
+#: mapsdatatranslation.cpp:1732
 msgctxt "cuba.kgm"
 msgid "Santiago de Cuba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1730
+#: mapsdatatranslation.cpp:1733
 msgctxt "cuba.kgm"
 msgid "Guantánamo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1731
+#: mapsdatatranslation.cpp:1734
 msgctxt "cyprus.kgm"
 msgid "Cyprus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1732
+#: mapsdatatranslation.cpp:1735
 msgctxt "cyprus.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1733
+#: mapsdatatranslation.cpp:1736
 msgctxt "cyprus.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1734
+#: mapsdatatranslation.cpp:1737
 msgctxt "cyprus.kgm"
 msgid "Not Cyprus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1735
+#: mapsdatatranslation.cpp:1738
 msgctxt "cyprus.kgm"
 msgid "Paphos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1736
+#: mapsdatatranslation.cpp:1739
 msgctxt "cyprus.kgm"
 msgid "Limassol"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1737
+#: mapsdatatranslation.cpp:1740
 msgctxt "cyprus.kgm"
 msgid "Larnaca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1738
+#: mapsdatatranslation.cpp:1741
 msgctxt "cyprus.kgm"
 msgid "Famagusta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1739
+#: mapsdatatranslation.cpp:1742
 msgctxt "cyprus.kgm"
 msgid "Kyrenia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1740
+#: mapsdatatranslation.cpp:1743
 msgctxt "cyprus.kgm"
 msgid "Nicosia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1741
+#: mapsdatatranslation.cpp:1744
 msgctxt "czech.kgm"
 msgid "Czech Republic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1742
+#: mapsdatatranslation.cpp:1745
 msgctxt "czech.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1743 mapsdatatranslation.cpp:1744
+#: mapsdatatranslation.cpp:1746 mapsdatatranslation.cpp:1747
 msgctxt "czech.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1745
+#: mapsdatatranslation.cpp:1748
 msgctxt "czech.kgm"
 msgid "Not Czech"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1746 mapsdatatranslation.cpp:1748
+#: mapsdatatranslation.cpp:1749 mapsdatatranslation.cpp:1751
 msgctxt "czech.kgm"
 msgid "Prague"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1747
+#: mapsdatatranslation.cpp:1750
 msgctxt "czech.kgm"
 msgid "Central Bohemia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1749
+#: mapsdatatranslation.cpp:1752
 msgctxt "czech.kgm"
 msgid "South Bohemia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1750
+#: mapsdatatranslation.cpp:1753
 msgctxt "czech.kgm"
 msgid "České Budějovice"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1751 mapsdatatranslation.cpp:1752
+#: mapsdatatranslation.cpp:1754 mapsdatatranslation.cpp:1755
 msgctxt "czech.kgm"
 msgid "Plzeň"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1753 mapsdatatranslation.cpp:1754
+#: mapsdatatranslation.cpp:1756 mapsdatatranslation.cpp:1757
 msgctxt "czech.kgm"
 msgid "Karlovy Vary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1755 mapsdatatranslation.cpp:1756
+#: mapsdatatranslation.cpp:1758 mapsdatatranslation.cpp:1759
 msgctxt "czech.kgm"
 msgid "Ústí nad Labem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1757 mapsdatatranslation.cpp:1758
+#: mapsdatatranslation.cpp:1760 mapsdatatranslation.cpp:1761
 msgctxt "czech.kgm"
 msgid "Liberec"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1759 mapsdatatranslation.cpp:1760
+#: mapsdatatranslation.cpp:1762 mapsdatatranslation.cpp:1763
 msgctxt "czech.kgm"
 msgid "Hradec Králové"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1761 mapsdatatranslation.cpp:1762
+#: mapsdatatranslation.cpp:1764 mapsdatatranslation.cpp:1765
 msgctxt "czech.kgm"
 msgid "Pardubice"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1763 mapsdatatranslation.cpp:1764
+#: mapsdatatranslation.cpp:1766 mapsdatatranslation.cpp:1767
 msgctxt "czech.kgm"
 msgid "Olomouc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1765
+#: mapsdatatranslation.cpp:1768
 msgctxt "czech.kgm"
 msgid "Moravia-Silesia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1766
+#: mapsdatatranslation.cpp:1769
 msgctxt "czech.kgm"
 msgid "Ostrava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1767
+#: mapsdatatranslation.cpp:1770
 msgctxt "czech.kgm"
 msgid "South Moravia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1768
+#: mapsdatatranslation.cpp:1771
 msgctxt "czech.kgm"
 msgid "Brno"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1769 mapsdatatranslation.cpp:1770
+#: mapsdatatranslation.cpp:1772 mapsdatatranslation.cpp:1773
 msgctxt "czech.kgm"
 msgid "Zlín"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1771
+#: mapsdatatranslation.cpp:1774
 msgctxt "czech.kgm"
 msgid "Vysočina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1772
+#: mapsdatatranslation.cpp:1775
 msgctxt "czech.kgm"
 msgid "Jihlava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1773
+#: mapsdatatranslation.cpp:1776
 msgctxt "denmark_counties.kgm"
 msgid "Denmark (Counties) (1970-2006)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1774
+#: mapsdatatranslation.cpp:1777
 msgctxt "denmark_counties.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1775
+#: mapsdatatranslation.cpp:1778
 msgctxt "denmark_counties.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1776
+#: mapsdatatranslation.cpp:1779
 msgctxt "denmark_counties.kgm"
 msgid "Not Denmark (Counties)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1777
+#: mapsdatatranslation.cpp:1780
 msgctxt "denmark_counties.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1778
+#: mapsdatatranslation.cpp:1781
 msgctxt "denmark_counties.kgm"
 msgid "Copenhagen (city)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1779
+#: mapsdatatranslation.cpp:1782
 msgctxt "denmark_counties.kgm"
 msgid "Frederiksberg (city)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1780
+#: mapsdatatranslation.cpp:1783
 msgctxt "denmark_counties.kgm"
 msgid "Copenhagen (county)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1781
+#: mapsdatatranslation.cpp:1784
 msgctxt "denmark_counties.kgm"
 msgid "Glostrup"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1782
+#: mapsdatatranslation.cpp:1785
 msgctxt "denmark_counties.kgm"
 msgid "Frederiksborg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1783
+#: mapsdatatranslation.cpp:1786
 msgctxt "denmark_counties.kgm"
 msgid "Hillerød"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1784 mapsdatatranslation.cpp:1785
+#: mapsdatatranslation.cpp:1787 mapsdatatranslation.cpp:1788
 msgctxt "denmark_counties.kgm"
 msgid "Roskilde"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1786
+#: mapsdatatranslation.cpp:1789
 msgctxt "denmark_counties.kgm"
 msgid "West Zealand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1787
+#: mapsdatatranslation.cpp:1790
 msgctxt "denmark_counties.kgm"
 msgid "Sorø"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1788
+#: mapsdatatranslation.cpp:1791
 msgctxt "denmark_counties.kgm"
 msgid "Storstrøm"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1789
+#: mapsdatatranslation.cpp:1792
 msgctxt "denmark_counties.kgm"
 msgid "Næstved"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1790
+#: mapsdatatranslation.cpp:1793
 msgctxt "denmark_counties.kgm"
 msgid "Funen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1791
+#: mapsdatatranslation.cpp:1794
 msgctxt "denmark_counties.kgm"
 msgid "Odense"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1792
+#: mapsdatatranslation.cpp:1795
 msgctxt "denmark_counties.kgm"
 msgid "South Jutland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1793
+#: mapsdatatranslation.cpp:1796
 msgctxt "denmark_counties.kgm"
 msgid "Aabenraa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1794 mapsdatatranslation.cpp:1795
+#: mapsdatatranslation.cpp:1797 mapsdatatranslation.cpp:1798
 msgctxt "denmark_counties.kgm"
 msgid "Ribe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1796 mapsdatatranslation.cpp:1797
+#: mapsdatatranslation.cpp:1799 mapsdatatranslation.cpp:1800
 msgctxt "denmark_counties.kgm"
 msgid "Vejle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1798
+#: mapsdatatranslation.cpp:1801
 msgctxt "denmark_counties.kgm"
 msgid "Ringkjøbing"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1799
+#: mapsdatatranslation.cpp:1802
 msgctxt "denmark_counties.kgm"
 msgid "Ringkøbing"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1800 mapsdatatranslation.cpp:1801
+#: mapsdatatranslation.cpp:1803 mapsdatatranslation.cpp:1804
 msgctxt "denmark_counties.kgm"
 msgid "Viborg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1802
+#: mapsdatatranslation.cpp:1805
 msgctxt "denmark_counties.kgm"
 msgid "North Jutland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1803
+#: mapsdatatranslation.cpp:1806
 msgctxt "denmark_counties.kgm"
 msgid "Ålborg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1804 mapsdatatranslation.cpp:1805
+#: mapsdatatranslation.cpp:1807 mapsdatatranslation.cpp:1808
 msgctxt "denmark_counties.kgm"
 msgid "Århus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1806
+#: mapsdatatranslation.cpp:1809
 msgctxt "denmark_counties.kgm"
 msgid "Bornholm"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1807
+#: mapsdatatranslation.cpp:1810
 msgctxt "denmark_counties.kgm"
 msgid "Rønne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1808
+#: mapsdatatranslation.cpp:1811
 msgctxt "dominican_republic.kgm"
 msgid "Dominican Republic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1809
+#: mapsdatatranslation.cpp:1812
 msgctxt "dominican_republic.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1810 mapsdatatranslation.cpp:1811
+#: mapsdatatranslation.cpp:1813 mapsdatatranslation.cpp:1814
 msgctxt "dominican_republic.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1812
+#: mapsdatatranslation.cpp:1815
 msgctxt "dominican_republic.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1813
+#: mapsdatatranslation.cpp:1816
 msgctxt "dominican_republic.kgm"
 msgid "Not Dominican Republic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1814
+#: mapsdatatranslation.cpp:1817
 msgctxt "dominican_republic.kgm"
 msgid "Azua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1815
+#: mapsdatatranslation.cpp:1818
 msgctxt "dominican_republic.kgm"
 msgid "Azua de Compostela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1816
+#: mapsdatatranslation.cpp:1819
 msgctxt "dominican_republic.kgm"
 msgid "Baoruco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1817
+#: mapsdatatranslation.cpp:1820
 msgctxt "dominican_republic.kgm"
 msgid "Neiba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1818
+#: mapsdatatranslation.cpp:1821
 msgctxt "dominican_republic.kgm"
 msgid "Barahona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1819
+#: mapsdatatranslation.cpp:1822
 msgctxt "dominican_republic.kgm"
 msgid "Santa Cruz de Barahona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1820 mapsdatatranslation.cpp:1821
+#: mapsdatatranslation.cpp:1823 mapsdatatranslation.cpp:1824
 msgctxt "dominican_republic.kgm"
 msgid "Dajabón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1822
+#: mapsdatatranslation.cpp:1825
 msgctxt "dominican_republic.kgm"
 msgid "Duarte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1823
+#: mapsdatatranslation.cpp:1826
 msgctxt "dominican_republic.kgm"
 msgid "San Francisco de Macorís"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1824
+#: mapsdatatranslation.cpp:1827
 msgctxt "dominican_republic.kgm"
 msgid "Elías Piña"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1825
+#: mapsdatatranslation.cpp:1828
 msgctxt "dominican_republic.kgm"
 msgid "Comendador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1826
+#: mapsdatatranslation.cpp:1829
 msgctxt "dominican_republic.kgm"
 msgid "El Seibo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1827
+#: mapsdatatranslation.cpp:1830
 msgctxt "dominican_republic.kgm"
 msgid "Santa Cruz del Seibo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1828
+#: mapsdatatranslation.cpp:1831
 msgctxt "dominican_republic.kgm"
 msgid "Espaillat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1829
+#: mapsdatatranslation.cpp:1832
 msgctxt "dominican_republic.kgm"
 msgid "Moca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1830
+#: mapsdatatranslation.cpp:1833
 msgctxt "dominican_republic.kgm"
 msgid "Hato Mayor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1831
+#: mapsdatatranslation.cpp:1834
 msgctxt "dominican_republic.kgm"
 msgid "Hato Mayor del Rey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1832
+#: mapsdatatranslation.cpp:1835
 msgctxt "dominican_republic.kgm"
 msgid "Independencia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1833
+#: mapsdatatranslation.cpp:1836
 msgctxt "dominican_republic.kgm"
 msgid "Jimaní"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1834
+#: mapsdatatranslation.cpp:1837
 msgctxt "dominican_republic.kgm"
 msgid "La Altagracia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1835
+#: mapsdatatranslation.cpp:1838
 msgctxt "dominican_republic.kgm"
 msgid "Salvaleón de Higüey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1836 mapsdatatranslation.cpp:1837
+#: mapsdatatranslation.cpp:1839 mapsdatatranslation.cpp:1840
 msgctxt "dominican_republic.kgm"
 msgid "La Romana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1838
+#: mapsdatatranslation.cpp:1841
 msgctxt "dominican_republic.kgm"
 msgid "La Vega"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1839
+#: mapsdatatranslation.cpp:1842
 msgctxt "dominican_republic.kgm"
 msgid "Concepción de La Vega"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1840
+#: mapsdatatranslation.cpp:1843
 msgctxt "dominican_republic.kgm"
 msgid "María Trinidad Sánchez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1841
+#: mapsdatatranslation.cpp:1844
 msgctxt "dominican_republic.kgm"
 msgid "Nagua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1842
+#: mapsdatatranslation.cpp:1845
 msgctxt "dominican_republic.kgm"
 msgid "Monseñor Nouel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1843
+#: mapsdatatranslation.cpp:1846
 msgctxt "dominican_republic.kgm"
 msgid "Bonao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1844
+#: mapsdatatranslation.cpp:1847
 msgctxt "dominican_republic.kgm"
 msgid "Monte Cristi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1845
+#: mapsdatatranslation.cpp:1848
 msgctxt "dominican_republic.kgm"
 msgid "San Fernando de Monte Cristi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1846 mapsdatatranslation.cpp:1847
+#: mapsdatatranslation.cpp:1849 mapsdatatranslation.cpp:1850
 msgctxt "dominican_republic.kgm"
 msgid "Monte Plata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1848 mapsdatatranslation.cpp:1849
+#: mapsdatatranslation.cpp:1851 mapsdatatranslation.cpp:1852
 msgctxt "dominican_republic.kgm"
 msgid "Pedernales"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1850
+#: mapsdatatranslation.cpp:1853
 msgctxt "dominican_republic.kgm"
 msgid "Peravia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1851
+#: mapsdatatranslation.cpp:1854
 msgctxt "dominican_republic.kgm"
 msgid "Baní"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1852
+#: mapsdatatranslation.cpp:1855
 msgctxt "dominican_republic.kgm"
 msgid "Puerto Plata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1853
+#: mapsdatatranslation.cpp:1856
 msgctxt "dominican_republic.kgm"
 msgid "San Felipe de Puerto Plata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1854 mapsdatatranslation.cpp:1855
+#: mapsdatatranslation.cpp:1857
+msgctxt "dominican_republic.kgm"
+msgid "Hermanas Mirabal"
+msgstr ""
+
+#: mapsdatatranslation.cpp:1858
 msgctxt "dominican_republic.kgm"
 msgid "Salcedo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1856
+#: mapsdatatranslation.cpp:1859
 msgctxt "dominican_republic.kgm"
 msgid "Samaná"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1857
+#: mapsdatatranslation.cpp:1860
 msgctxt "dominican_republic.kgm"
 msgid "Santa Bárbara de Samaná"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1858
+#: mapsdatatranslation.cpp:1861
 msgctxt "dominican_republic.kgm"
 msgid "Sánchez Ramírez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1859
+#: mapsdatatranslation.cpp:1862
 msgctxt "dominican_republic.kgm"
 msgid "Cotuí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1860 mapsdatatranslation.cpp:1861
+#: mapsdatatranslation.cpp:1863 mapsdatatranslation.cpp:1864
 msgctxt "dominican_republic.kgm"
 msgid "San Cristóbal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1862 mapsdatatranslation.cpp:1863
+#: mapsdatatranslation.cpp:1865 mapsdatatranslation.cpp:1866
 msgctxt "dominican_republic.kgm"
 msgid "San José de Ocoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1864
+#: mapsdatatranslation.cpp:1867
 msgctxt "dominican_republic.kgm"
 msgid "San Juan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1865
+#: mapsdatatranslation.cpp:1868
 msgctxt "dominican_republic.kgm"
 msgid "San Juan de la Maguana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1866 mapsdatatranslation.cpp:1867
+#: mapsdatatranslation.cpp:1869 mapsdatatranslation.cpp:1870
 msgctxt "dominican_republic.kgm"
 msgid "San Pedro de Macorís"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1868
+#: mapsdatatranslation.cpp:1871
 msgctxt "dominican_republic.kgm"
 msgid "Santiago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1869
+#: mapsdatatranslation.cpp:1872
 msgctxt "dominican_republic.kgm"
 msgid "Santiago de los Caballeros"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1870
+#: mapsdatatranslation.cpp:1873
 msgctxt "dominican_republic.kgm"
 msgid "Santiago Rodríguez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1871
+#: mapsdatatranslation.cpp:1874
 msgctxt "dominican_republic.kgm"
 msgid "San Ignacio de Sabaneta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1872
+#: mapsdatatranslation.cpp:1875
 msgctxt "dominican_republic.kgm"
 msgid "Santo Domingo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1873 mapsdatatranslation.cpp:1877
+#: mapsdatatranslation.cpp:1876 mapsdatatranslation.cpp:1880
 msgctxt "dominican_republic.kgm"
 msgid "Santo Domingo de Guzmán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1874
+#: mapsdatatranslation.cpp:1877
 msgctxt "dominican_republic.kgm"
 msgid "Valverde"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1875
+#: mapsdatatranslation.cpp:1878
 msgctxt "dominican_republic.kgm"
 msgid "Santa Cruz de Mao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1876
+#: mapsdatatranslation.cpp:1879
 msgctxt "dominican_republic.kgm"
 msgid "National District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1878
+#: mapsdatatranslation.cpp:1881
 msgctxt "ecuador.kgm"
 msgid "Ecuador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1879
+#: mapsdatatranslation.cpp:1882
 msgctxt "ecuador.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1880 mapsdatatranslation.cpp:1881
+#: mapsdatatranslation.cpp:1883 mapsdatatranslation.cpp:1884
 msgctxt "ecuador.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1882
+#: mapsdatatranslation.cpp:1885
 msgctxt "ecuador.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1883
+#: mapsdatatranslation.cpp:1886
 msgctxt "ecuador.kgm"
 msgid "Not Ecuador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1884
+#: mapsdatatranslation.cpp:1887
 msgctxt "ecuador.kgm"
 msgid "Azuay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1885
+#: mapsdatatranslation.cpp:1888
 msgctxt "ecuador.kgm"
 msgid "Cuenca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1886
+#: mapsdatatranslation.cpp:1889
 msgctxt "ecuador.kgm"
 msgid "Bolívar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1887
+#: mapsdatatranslation.cpp:1890
 msgctxt "ecuador.kgm"
 msgid "Guaranda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1888
+#: mapsdatatranslation.cpp:1891
 msgctxt "ecuador.kgm"
 msgid "Cañar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1889
+#: mapsdatatranslation.cpp:1892
 msgctxt "ecuador.kgm"
 msgid "Azogues"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1890
+#: mapsdatatranslation.cpp:1893
 msgctxt "ecuador.kgm"
 msgid "Carchi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1891
+#: mapsdatatranslation.cpp:1894
 msgctxt "ecuador.kgm"
 msgid "Tulcán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1892
+#: mapsdatatranslation.cpp:1895
 msgctxt "ecuador.kgm"
 msgid "Chimborazo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1893
+#: mapsdatatranslation.cpp:1896
 msgctxt "ecuador.kgm"
 msgid "Riobamba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1894
+#: mapsdatatranslation.cpp:1897
 msgctxt "ecuador.kgm"
 msgid "Cotopaxi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1895
+#: mapsdatatranslation.cpp:1898
 msgctxt "ecuador.kgm"
 msgid "Latacunga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1896
+#: mapsdatatranslation.cpp:1899
 msgctxt "ecuador.kgm"
 msgid "El Oro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1897
+#: mapsdatatranslation.cpp:1900
 msgctxt "ecuador.kgm"
 msgid "Machala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1898 mapsdatatranslation.cpp:1899
+#: mapsdatatranslation.cpp:1901 mapsdatatranslation.cpp:1902
 msgctxt "ecuador.kgm"
 msgid "Esmeraldas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1900
+#: mapsdatatranslation.cpp:1903
 msgctxt "ecuador.kgm"
 msgid "Galápagos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1901
+#: mapsdatatranslation.cpp:1904
 msgctxt "ecuador.kgm"
 msgid "Puerto Baquerizo Moreno"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1902
+#: mapsdatatranslation.cpp:1905
 msgctxt "ecuador.kgm"
 msgid "Guayas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1903
+#: mapsdatatranslation.cpp:1906
 msgctxt "ecuador.kgm"
 msgid "Guayaquil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1904
+#: mapsdatatranslation.cpp:1907
 msgctxt "ecuador.kgm"
 msgid "Imbabura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1905
+#: mapsdatatranslation.cpp:1908
 msgctxt "ecuador.kgm"
 msgid "Ibarra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1906 mapsdatatranslation.cpp:1907
+#: mapsdatatranslation.cpp:1909 mapsdatatranslation.cpp:1910
 msgctxt "ecuador.kgm"
 msgid "Loja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1908
+#: mapsdatatranslation.cpp:1911
 msgctxt "ecuador.kgm"
 msgid "Los Ríos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1909
+#: mapsdatatranslation.cpp:1912
 msgctxt "ecuador.kgm"
 msgid "Babahoyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1910
+#: mapsdatatranslation.cpp:1913
 msgctxt "ecuador.kgm"
 msgid "Manabí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1911
+#: mapsdatatranslation.cpp:1914
 msgctxt "ecuador.kgm"
 msgid "Portoviejo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1912
+#: mapsdatatranslation.cpp:1915
 msgctxt "ecuador.kgm"
 msgid "Morona Santiago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1913
+#: mapsdatatranslation.cpp:1916
 msgctxt "ecuador.kgm"
 msgid "Macas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1914
+#: mapsdatatranslation.cpp:1917 mapsdatatranslation.cpp:1918
+msgctxt "ecuador.kgm"
+msgid "Santa Elena"
+msgstr ""
+
+#: mapsdatatranslation.cpp:1919
+msgctxt "ecuador.kgm"
+msgid "Santo Domingo de los Tsáchilas"
+msgstr ""
+
+#: mapsdatatranslation.cpp:1920
+msgctxt "ecuador.kgm"
+msgid "Santo Domingo de Los Colorados"
+msgstr ""
+
+#: mapsdatatranslation.cpp:1921
 msgctxt "ecuador.kgm"
 msgid "Napo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1915
+#: mapsdatatranslation.cpp:1922
 msgctxt "ecuador.kgm"
 msgid "Tena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1916
+#: mapsdatatranslation.cpp:1923
 msgctxt "ecuador.kgm"
 msgid "Orellana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1917
+#: mapsdatatranslation.cpp:1924
 msgctxt "ecuador.kgm"
 msgid "Puerto Francisco de Orellana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1918
+#: mapsdatatranslation.cpp:1925
 msgctxt "ecuador.kgm"
 msgid "Pastaza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1919
+#: mapsdatatranslation.cpp:1926
 msgctxt "ecuador.kgm"
 msgid "Puyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1920
+#: mapsdatatranslation.cpp:1927
 msgctxt "ecuador.kgm"
 msgid "Pichincha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1921
+#: mapsdatatranslation.cpp:1928
 msgctxt "ecuador.kgm"
 msgid "Quito"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1922
+#: mapsdatatranslation.cpp:1929
 msgctxt "ecuador.kgm"
 msgid "Sucumbíos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1923
+#: mapsdatatranslation.cpp:1930
 msgctxt "ecuador.kgm"
 msgid "Nueva Loja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1924
+#: mapsdatatranslation.cpp:1931
 msgctxt "ecuador.kgm"
 msgid "Tungurahua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1925
+#: mapsdatatranslation.cpp:1932
 msgctxt "ecuador.kgm"
 msgid "Ambato"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1926
+#: mapsdatatranslation.cpp:1933
 msgctxt "ecuador.kgm"
 msgid "Zamora Chinchipe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1927
+#: mapsdatatranslation.cpp:1934
 msgctxt "ecuador.kgm"
 msgid "Zamora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1928
+#: mapsdatatranslation.cpp:1935
 msgctxt "egypt.kgm"
 msgid "Egypt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1929
+#: mapsdatatranslation.cpp:1936
 msgctxt "egypt.kgm"
 msgid "Governorates"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1930
+#: mapsdatatranslation.cpp:1937
 msgctxt "egypt.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1931
+#: mapsdatatranslation.cpp:1938
 msgctxt "egypt.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1932
+#: mapsdatatranslation.cpp:1939
 msgctxt "egypt.kgm"
 msgid "Not Egypt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1933 mapsdatatranslation.cpp:1934
+#: mapsdatatranslation.cpp:1940 mapsdatatranslation.cpp:1941
 msgctxt "egypt.kgm"
 msgid "Alexandria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1935 mapsdatatranslation.cpp:1936
+#: mapsdatatranslation.cpp:1942 mapsdatatranslation.cpp:1943
 msgctxt "egypt.kgm"
 msgid "Aswan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1937 mapsdatatranslation.cpp:1938
+#: mapsdatatranslation.cpp:1944 mapsdatatranslation.cpp:1945
 msgctxt "egypt.kgm"
 msgid "Asyut"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1939
+#: mapsdatatranslation.cpp:1946
 msgctxt "egypt.kgm"
 msgid "Beheira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1940
+#: mapsdatatranslation.cpp:1947
 msgctxt "egypt.kgm"
 msgid "Damanhur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1941 mapsdatatranslation.cpp:1942
+#: mapsdatatranslation.cpp:1948 mapsdatatranslation.cpp:1949
 msgctxt "egypt.kgm"
 msgid "Beni Suef"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1943 mapsdatatranslation.cpp:1944
+#: mapsdatatranslation.cpp:1950 mapsdatatranslation.cpp:1951
 msgctxt "egypt.kgm"
 msgid "Cairo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1945
+#: mapsdatatranslation.cpp:1952
 msgctxt "egypt.kgm"
 msgid "Dakahlia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1946
+#: mapsdatatranslation.cpp:1953
 msgctxt "egypt.kgm"
 msgid "Mansura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1947 mapsdatatranslation.cpp:1948
+#: mapsdatatranslation.cpp:1954 mapsdatatranslation.cpp:1955
 msgctxt "egypt.kgm"
 msgid "Damietta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1949 mapsdatatranslation.cpp:1950
+#: mapsdatatranslation.cpp:1956 mapsdatatranslation.cpp:1957
 msgctxt "egypt.kgm"
 msgid "Faiyum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1951
+#: mapsdatatranslation.cpp:1958
 msgctxt "egypt.kgm"
 msgid "Gharbia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1952
+#: mapsdatatranslation.cpp:1959
 msgctxt "egypt.kgm"
 msgid "Tanta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1953 mapsdatatranslation.cpp:1954
+#: mapsdatatranslation.cpp:1960 mapsdatatranslation.cpp:1961
 msgctxt "egypt.kgm"
 msgid "Giza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1955 mapsdatatranslation.cpp:1956
+#: mapsdatatranslation.cpp:1962 mapsdatatranslation.cpp:1963
 msgctxt "egypt.kgm"
 msgid "Ismailia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1957 mapsdatatranslation.cpp:1958
+#: mapsdatatranslation.cpp:1964 mapsdatatranslation.cpp:1965
 msgctxt "egypt.kgm"
 msgid "Kafr el-Sheikh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1959
+#: mapsdatatranslation.cpp:1966
 msgctxt "egypt.kgm"
 msgid "Matruh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1960
+#: mapsdatatranslation.cpp:1967
 msgctxt "egypt.kgm"
 msgid "Mersa Matruh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1961 mapsdatatranslation.cpp:1962
+#: mapsdatatranslation.cpp:1968 mapsdatatranslation.cpp:1969
 msgctxt "egypt.kgm"
 msgid "Minya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1963
+#: mapsdatatranslation.cpp:1970
 msgctxt "egypt.kgm"
 msgid "Monufia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1964
+#: mapsdatatranslation.cpp:1971
 msgctxt "egypt.kgm"
 msgid "Shibin el-Kom"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1965
+#: mapsdatatranslation.cpp:1972
 msgctxt "egypt.kgm"
 msgid "New Valley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1966
+#: mapsdatatranslation.cpp:1973
 msgctxt "egypt.kgm"
 msgid "Kharga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1967
+#: mapsdatatranslation.cpp:1974
 msgctxt "egypt.kgm"
 msgid "North Sinai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1968
+#: mapsdatatranslation.cpp:1975
 msgctxt "egypt.kgm"
 msgid "Arish"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1969 mapsdatatranslation.cpp:1970
+#: mapsdatatranslation.cpp:1976 mapsdatatranslation.cpp:1977
 msgctxt "egypt.kgm"
 msgid "Port Said"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1971
+#: mapsdatatranslation.cpp:1978
 msgctxt "egypt.kgm"
 msgid "Qalyubia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1972
+#: mapsdatatranslation.cpp:1979
 msgctxt "egypt.kgm"
 msgid "Banha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1973 mapsdatatranslation.cpp:1974
+#: mapsdatatranslation.cpp:1980 mapsdatatranslation.cpp:1981
 msgctxt "egypt.kgm"
 msgid "Qena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1975
+#: mapsdatatranslation.cpp:1982
 msgctxt "egypt.kgm"
 msgid "Red Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1976
+#: mapsdatatranslation.cpp:1983
 msgctxt "egypt.kgm"
 msgid "Hurghada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1977
+#: mapsdatatranslation.cpp:1984
 msgctxt "egypt.kgm"
 msgid "Sharqia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1978
+#: mapsdatatranslation.cpp:1985
 msgctxt "egypt.kgm"
 msgid "Zagazig"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1979 mapsdatatranslation.cpp:1980
+#: mapsdatatranslation.cpp:1986 mapsdatatranslation.cpp:1987
 msgctxt "egypt.kgm"
 msgid "Sohag"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1981
+#: mapsdatatranslation.cpp:1988
 msgctxt "egypt.kgm"
 msgid "South Sinai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1982
+#: mapsdatatranslation.cpp:1989
 msgctxt "egypt.kgm"
 msgid "el-Tor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1983 mapsdatatranslation.cpp:1984
+#: mapsdatatranslation.cpp:1990 mapsdatatranslation.cpp:1991
 msgctxt "egypt.kgm"
 msgid "Suez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1985
+#: mapsdatatranslation.cpp:1992
 msgctxt "egypt.kgm"
 msgid "Luxor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1986
+#: mapsdatatranslation.cpp:1993
 msgctxt "egypt.kgm"
 msgid "Luxo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1987
+#: mapsdatatranslation.cpp:1994
 msgctxt "el_salvador.kgm"
 msgid "El Salvador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1988
+#: mapsdatatranslation.cpp:1995
 msgctxt "el_salvador.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1989 mapsdatatranslation.cpp:1990
+#: mapsdatatranslation.cpp:1996 mapsdatatranslation.cpp:1997
 msgctxt "el_salvador.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1991
+#: mapsdatatranslation.cpp:1998
 msgctxt "el_salvador.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1992
+#: mapsdatatranslation.cpp:1999
 msgctxt "el_salvador.kgm"
 msgid "Not El Salvador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1993 mapsdatatranslation.cpp:1994
+#: mapsdatatranslation.cpp:2000 mapsdatatranslation.cpp:2001
 msgctxt "el_salvador.kgm"
 msgid "Ahuachapán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1995 mapsdatatranslation.cpp:1996
+#: mapsdatatranslation.cpp:2002 mapsdatatranslation.cpp:2003
 msgctxt "el_salvador.kgm"
 msgid "Santa Ana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1997 mapsdatatranslation.cpp:1998
+#: mapsdatatranslation.cpp:2004 mapsdatatranslation.cpp:2005
 msgctxt "el_salvador.kgm"
 msgid "Sonsonate"
 msgstr ""
 
-#: mapsdatatranslation.cpp:1999 mapsdatatranslation.cpp:2000
+#: mapsdatatranslation.cpp:2006 mapsdatatranslation.cpp:2007
 msgctxt "el_salvador.kgm"
 msgid "Usulután"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2001 mapsdatatranslation.cpp:2002
+#: mapsdatatranslation.cpp:2008 mapsdatatranslation.cpp:2009
 msgctxt "el_salvador.kgm"
 msgid "San Miguel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2003
+#: mapsdatatranslation.cpp:2010
 msgctxt "el_salvador.kgm"
 msgid "Morazán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2004
+#: mapsdatatranslation.cpp:2011
 msgctxt "el_salvador.kgm"
 msgid "San Francisco Gotera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2005 mapsdatatranslation.cpp:2006
+#: mapsdatatranslation.cpp:2012 mapsdatatranslation.cpp:2013
 msgctxt "el_salvador.kgm"
 msgid "La Unión"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2007
+#: mapsdatatranslation.cpp:2014
 msgctxt "el_salvador.kgm"
 msgid "La Libertad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2008
+#: mapsdatatranslation.cpp:2015
 msgctxt "el_salvador.kgm"
 msgid "Santa Tecla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2009 mapsdatatranslation.cpp:2010
+#: mapsdatatranslation.cpp:2016 mapsdatatranslation.cpp:2017
 msgctxt "el_salvador.kgm"
 msgid "Chalatenango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2011
+#: mapsdatatranslation.cpp:2018
 msgctxt "el_salvador.kgm"
 msgid "Cuscatlán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2012
+#: mapsdatatranslation.cpp:2019
 msgctxt "el_salvador.kgm"
 msgid "Cojutepeque"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2013 mapsdatatranslation.cpp:2014
+#: mapsdatatranslation.cpp:2020 mapsdatatranslation.cpp:2021
 msgctxt "el_salvador.kgm"
 msgid "San Salvador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2015
+#: mapsdatatranslation.cpp:2022
 msgctxt "el_salvador.kgm"
 msgid "La Paz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2016
+#: mapsdatatranslation.cpp:2023
 msgctxt "el_salvador.kgm"
 msgid "Zacatecoluca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2017
+#: mapsdatatranslation.cpp:2024
 msgctxt "el_salvador.kgm"
 msgid "Cabañas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2018
+#: mapsdatatranslation.cpp:2025
 msgctxt "el_salvador.kgm"
 msgid "Sensuntepeque"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2019 mapsdatatranslation.cpp:2020
+#: mapsdatatranslation.cpp:2026 mapsdatatranslation.cpp:2027
 msgctxt "el_salvador.kgm"
 msgid "San Vicente"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2021
+#: mapsdatatranslation.cpp:2028
 msgctxt "emirates.kgm"
 msgid "United Arab Emirates"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2022
+#: mapsdatatranslation.cpp:2029
 msgctxt "emirates.kgm"
 msgid "Emirates"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2023
+#: mapsdatatranslation.cpp:2030
 msgctxt "emirates.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2024
+#: mapsdatatranslation.cpp:2031
 msgctxt "emirates.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2025
+#: mapsdatatranslation.cpp:2032
 msgctxt "emirates.kgm"
 msgid "Not Emirates"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2026
+#: mapsdatatranslation.cpp:2033
 msgctxt "emirates.kgm"
 msgid "Abu Dhabi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2027
+#: mapsdatatranslation.cpp:2034
 msgctxt "emirates.kgm"
 msgid "Ajman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2028
+#: mapsdatatranslation.cpp:2035
 msgctxt "emirates.kgm"
 msgid "Dubaï"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2029
+#: mapsdatatranslation.cpp:2036
 msgctxt "emirates.kgm"
 msgid "Fujairah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2030
+#: mapsdatatranslation.cpp:2037
 msgctxt "emirates.kgm"
 msgid "Ras al-Khaimah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2031
+#: mapsdatatranslation.cpp:2038
 msgctxt "emirates.kgm"
 msgid "Sharjah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2032
+#: mapsdatatranslation.cpp:2039
 msgctxt "emirates.kgm"
 msgid "Umm al-Qaiwain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2033
+#: mapsdatatranslation.cpp:2040
 msgctxt "estonia.kgm"
 msgid "Estonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2034
+#: mapsdatatranslation.cpp:2041
 msgctxt "estonia.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2035 mapsdatatranslation.cpp:2036
+#: mapsdatatranslation.cpp:2042 mapsdatatranslation.cpp:2043
 msgctxt "estonia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2037
+#: mapsdatatranslation.cpp:2044
 msgctxt "estonia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2038
+#: mapsdatatranslation.cpp:2045
 msgctxt "estonia.kgm"
 msgid "Not Estonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2039
+#: mapsdatatranslation.cpp:2046
 msgctxt "estonia.kgm"
 msgid "Harju"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2040
+#: mapsdatatranslation.cpp:2047
 msgctxt "estonia.kgm"
 msgid "Tallinn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2041
+#: mapsdatatranslation.cpp:2048
 msgctxt "estonia.kgm"
 msgid "Hiiu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2042
+#: mapsdatatranslation.cpp:2049
 msgctxt "estonia.kgm"
 msgid "Kärdla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2043
+#: mapsdatatranslation.cpp:2050
 msgctxt "estonia.kgm"
 msgid "Ida-Viru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2044
+#: mapsdatatranslation.cpp:2051
 msgctxt "estonia.kgm"
 msgid "Jõhvi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2045
+#: mapsdatatranslation.cpp:2052
 msgctxt "estonia.kgm"
 msgid "Järva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2046
+#: mapsdatatranslation.cpp:2053
 msgctxt "estonia.kgm"
 msgid "Paide"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2047 mapsdatatranslation.cpp:2048
+#: mapsdatatranslation.cpp:2054 mapsdatatranslation.cpp:2055
 msgctxt "estonia.kgm"
 msgid "Jõgeva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2049
+#: mapsdatatranslation.cpp:2056
 msgctxt "estonia.kgm"
 msgid "Lääne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2050
+#: mapsdatatranslation.cpp:2057
 msgctxt "estonia.kgm"
 msgid "Haapsalu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2051
+#: mapsdatatranslation.cpp:2058
 msgctxt "estonia.kgm"
 msgid "Lääne-Viru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2052
+#: mapsdatatranslation.cpp:2059
 msgctxt "estonia.kgm"
 msgid "Rakvere"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2053 mapsdatatranslation.cpp:2054
+#: mapsdatatranslation.cpp:2060 mapsdatatranslation.cpp:2061
 msgctxt "estonia.kgm"
 msgid "Pärnu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2055 mapsdatatranslation.cpp:2056
+#: mapsdatatranslation.cpp:2062 mapsdatatranslation.cpp:2063
 msgctxt "estonia.kgm"
 msgid "Põlva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2057 mapsdatatranslation.cpp:2058
+#: mapsdatatranslation.cpp:2064 mapsdatatranslation.cpp:2065
 msgctxt "estonia.kgm"
 msgid "Rapla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2059
+#: mapsdatatranslation.cpp:2066
 msgctxt "estonia.kgm"
 msgid "Saare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2060
+#: mapsdatatranslation.cpp:2067
 msgctxt "estonia.kgm"
 msgid "Kuressaare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2061 mapsdatatranslation.cpp:2062
+#: mapsdatatranslation.cpp:2068 mapsdatatranslation.cpp:2069
 msgctxt "estonia.kgm"
 msgid "Tartu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2063 mapsdatatranslation.cpp:2064
+#: mapsdatatranslation.cpp:2070 mapsdatatranslation.cpp:2071
 msgctxt "estonia.kgm"
 msgid "Valga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2065 mapsdatatranslation.cpp:2066
+#: mapsdatatranslation.cpp:2072 mapsdatatranslation.cpp:2073
 msgctxt "estonia.kgm"
 msgid "Viljandi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2067 mapsdatatranslation.cpp:2068
+#: mapsdatatranslation.cpp:2074 mapsdatatranslation.cpp:2075
 msgctxt "estonia.kgm"
 msgid "Võru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2069
+#: mapsdatatranslation.cpp:2076
 msgctxt "europe.kgm"
 msgid "Europe"
 msgstr "Ewrop"
 
-#: mapsdatatranslation.cpp:2070
+#: mapsdatatranslation.cpp:2077
 msgctxt "europe.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2071
+#: mapsdatatranslation.cpp:2078
 msgctxt "europe.kgm"
 msgid "Water"
 msgstr "Dŵr"
 
-#: mapsdatatranslation.cpp:2072
+#: mapsdatatranslation.cpp:2079
 msgctxt "europe.kgm"
 msgid "Coast"
 msgstr "Arfordir"
 
-#: mapsdatatranslation.cpp:2073
+#: mapsdatatranslation.cpp:2080
 msgctxt "europe.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:2074
+#: mapsdatatranslation.cpp:2081
 msgctxt "europe.kgm"
 msgid "Albania"
 msgstr "Albania"
 
-#: mapsdatatranslation.cpp:2075
+#: mapsdatatranslation.cpp:2082
 msgctxt "europe.kgm"
 msgid "Tirana"
 msgstr "Tirana"
 
-#: mapsdatatranslation.cpp:2076
+#: mapsdatatranslation.cpp:2083
 msgctxt "europe.kgm"
 msgid "Algeria"
 msgstr "Algeria"
 
-#: mapsdatatranslation.cpp:2077
+#: mapsdatatranslation.cpp:2084
 msgctxt "europe.kgm"
 msgid "Andorra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2078
+#: mapsdatatranslation.cpp:2085
 msgctxt "europe.kgm"
 msgid "Andorra la Vella"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2079
+#: mapsdatatranslation.cpp:2086
 msgctxt "europe.kgm"
 msgid "Austria"
 msgstr "Awstria"
 
-#: mapsdatatranslation.cpp:2080
+#: mapsdatatranslation.cpp:2087
 msgctxt "europe.kgm"
 msgid "Vienna"
 msgstr "Fiena"
 
-#: mapsdatatranslation.cpp:2081
+#: mapsdatatranslation.cpp:2088
 msgctxt "europe.kgm"
 msgid "Belarus"
 msgstr "Belarws"
 
-#: mapsdatatranslation.cpp:2082
+#: mapsdatatranslation.cpp:2089
 msgctxt "europe.kgm"
 msgid "Minsk"
 msgstr "Minsk"
 
-#: mapsdatatranslation.cpp:2083
+#: mapsdatatranslation.cpp:2090
 msgctxt "europe.kgm"
 msgid "Belgium"
 msgstr "Gwlad y Belg"
 
-#: mapsdatatranslation.cpp:2084
+#: mapsdatatranslation.cpp:2091
 msgctxt "europe.kgm"
 msgid "Brussels"
 msgstr "Brwsel"
 
-#: mapsdatatranslation.cpp:2085
+#: mapsdatatranslation.cpp:2092
 msgctxt "europe.kgm"
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ac Hertsegofina"
 
-#: mapsdatatranslation.cpp:2086
+#: mapsdatatranslation.cpp:2093
 msgctxt "europe.kgm"
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: mapsdatatranslation.cpp:2087
+#: mapsdatatranslation.cpp:2094
 msgctxt "europe.kgm"
 msgid "Bulgaria"
 msgstr "Bwlgaria"
 
-#: mapsdatatranslation.cpp:2088
+#: mapsdatatranslation.cpp:2095
 msgctxt "europe.kgm"
 msgid "Sofia"
 msgstr "Soffia"
 
-#: mapsdatatranslation.cpp:2089
+#: mapsdatatranslation.cpp:2096
 msgctxt "europe.kgm"
 msgid "Croatia"
 msgstr "Croatia"
 
-#: mapsdatatranslation.cpp:2090
+#: mapsdatatranslation.cpp:2097
 msgctxt "europe.kgm"
 msgid "Zagreb"
 msgstr "Sagreb"
 
-#: mapsdatatranslation.cpp:2091
+#: mapsdatatranslation.cpp:2098
 msgctxt "europe.kgm"
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: mapsdatatranslation.cpp:2092
+#: mapsdatatranslation.cpp:2099
 msgctxt "europe.kgm"
 msgid "Prague"
 msgstr "Prag"
 
-#: mapsdatatranslation.cpp:2093
+#: mapsdatatranslation.cpp:2100
 msgctxt "europe.kgm"
 msgid "Denmark"
 msgstr "Denmarc"
 
-#: mapsdatatranslation.cpp:2094
+#: mapsdatatranslation.cpp:2101
 msgctxt "europe.kgm"
 msgid "Copenhagen"
 msgstr "Copenhagen"
 
-#: mapsdatatranslation.cpp:2095
+#: mapsdatatranslation.cpp:2102
 msgctxt "europe.kgm"
 msgid "Estonia"
 msgstr "Estonia"
 
-#: mapsdatatranslation.cpp:2096
+#: mapsdatatranslation.cpp:2103
 msgctxt "europe.kgm"
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: mapsdatatranslation.cpp:2097
+#: mapsdatatranslation.cpp:2104
 msgctxt "europe.kgm"
 msgid "Finland"
 msgstr "Y Ffindir"
 
-#: mapsdatatranslation.cpp:2098
+#: mapsdatatranslation.cpp:2105
 msgctxt "europe.kgm"
 msgid "Helsinki"
 msgstr "Helsinci"
 
-#: mapsdatatranslation.cpp:2099
+#: mapsdatatranslation.cpp:2106
 msgctxt "europe.kgm"
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: mapsdatatranslation.cpp:2100
+#: mapsdatatranslation.cpp:2107
 msgctxt "europe.kgm"
 msgid "Skopje"
 msgstr "Skopje"
 
-#: mapsdatatranslation.cpp:2101
+#: mapsdatatranslation.cpp:2108
 msgctxt "europe.kgm"
 msgid "France"
 msgstr "France"
 
-#: mapsdatatranslation.cpp:2102
+#: mapsdatatranslation.cpp:2109
 msgctxt "europe.kgm"
 msgid "Paris"
 msgstr "Paris"
 
-#: mapsdatatranslation.cpp:2103
+#: mapsdatatranslation.cpp:2110
 msgctxt "europe.kgm"
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: mapsdatatranslation.cpp:2104
+#: mapsdatatranslation.cpp:2111
 msgctxt "europe.kgm"
 msgid "Berlin"
 msgstr "Berlin"
 
-#: mapsdatatranslation.cpp:2105
+#: mapsdatatranslation.cpp:2112
 msgctxt "europe.kgm"
 msgid "Greece"
 msgstr "Groeg"
 
-#: mapsdatatranslation.cpp:2106
+#: mapsdatatranslation.cpp:2113
 msgctxt "europe.kgm"
 msgid "Athens"
 msgstr "Athens"
 
-#: mapsdatatranslation.cpp:2107
+#: mapsdatatranslation.cpp:2114
 msgctxt "europe.kgm"
 msgid "Hungary"
 msgstr "Hungary"
 
-#: mapsdatatranslation.cpp:2108
+#: mapsdatatranslation.cpp:2115
 msgctxt "europe.kgm"
 msgid "Budapest"
 msgstr "Budapest"
 
-#: mapsdatatranslation.cpp:2109
+#: mapsdatatranslation.cpp:2116
 msgctxt "europe.kgm"
 msgid "Iceland"
 msgstr "Iceland"
 
-#: mapsdatatranslation.cpp:2110
+#: mapsdatatranslation.cpp:2117
 msgctxt "europe.kgm"
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: mapsdatatranslation.cpp:2111
+#: mapsdatatranslation.cpp:2118
 msgctxt "europe.kgm"
 msgid "Ireland"
 msgstr "Ireland"
 
-#: mapsdatatranslation.cpp:2112
+#: mapsdatatranslation.cpp:2119
 msgctxt "europe.kgm"
 msgid "Dublin"
 msgstr "Dublin"
 
-#: mapsdatatranslation.cpp:2113
+#: mapsdatatranslation.cpp:2120
 msgctxt "europe.kgm"
 msgid "Italy"
 msgstr "yr Eidal"
 
-#: mapsdatatranslation.cpp:2114
+#: mapsdatatranslation.cpp:2121
 msgctxt "europe.kgm"
 msgid "Rome"
 msgstr "Rome"
 
-#: mapsdatatranslation.cpp:2115
+#: mapsdatatranslation.cpp:2122
 msgctxt "europe.kgm"
 msgid "Latvia"
 msgstr "Latvia"
 
-#: mapsdatatranslation.cpp:2116
+#: mapsdatatranslation.cpp:2123
 msgctxt "europe.kgm"
 msgid "Riga"
 msgstr "Riga"
 
-#: mapsdatatranslation.cpp:2117
+#: mapsdatatranslation.cpp:2124
 msgctxt "europe.kgm"
 msgid "Liechtenstein"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2118
+#: mapsdatatranslation.cpp:2125
 msgctxt "europe.kgm"
 msgid "Vaduz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2119
+#: mapsdatatranslation.cpp:2126
 msgctxt "europe.kgm"
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: mapsdatatranslation.cpp:2120
+#: mapsdatatranslation.cpp:2127
 msgctxt "europe.kgm"
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: mapsdatatranslation.cpp:2121 mapsdatatranslation.cpp:2122
+#: mapsdatatranslation.cpp:2128 mapsdatatranslation.cpp:2129
 msgctxt "europe.kgm"
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: mapsdatatranslation.cpp:2123
+#: mapsdatatranslation.cpp:2130
 msgctxt "europe.kgm"
 msgid "Moldova"
 msgstr "Moldova"
 
-#: mapsdatatranslation.cpp:2124
+#: mapsdatatranslation.cpp:2131
 msgctxt "europe.kgm"
 msgid "Chisinau"
 msgstr "Chisinau"
 
-#: mapsdatatranslation.cpp:2125 mapsdatatranslation.cpp:2126
+#: mapsdatatranslation.cpp:2132 mapsdatatranslation.cpp:2133
 msgctxt "europe.kgm"
 msgid "Monaco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2127
+#: mapsdatatranslation.cpp:2134
 msgctxt "europe.kgm"
 msgid "Morocco"
 msgstr "Moroco"
 
-#: mapsdatatranslation.cpp:2128
+#: mapsdatatranslation.cpp:2135
 msgctxt "europe.kgm"
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: mapsdatatranslation.cpp:2129
+#: mapsdatatranslation.cpp:2136
 msgctxt "europe.kgm"
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: mapsdatatranslation.cpp:2130
+#: mapsdatatranslation.cpp:2137
 msgctxt "europe.kgm"
 msgid "Norway"
 msgstr "Norwy"
 
-#: mapsdatatranslation.cpp:2131
+#: mapsdatatranslation.cpp:2138
 msgctxt "europe.kgm"
 msgid "Oslo"
 msgstr "Oslo"
 
-#: mapsdatatranslation.cpp:2132
+#: mapsdatatranslation.cpp:2139
 msgctxt "europe.kgm"
 msgid "Poland"
 msgstr "Poland"
 
-#: mapsdatatranslation.cpp:2133
+#: mapsdatatranslation.cpp:2140
 msgctxt "europe.kgm"
 msgid "Warsaw"
 msgstr "Warsaw"
 
-#: mapsdatatranslation.cpp:2134
+#: mapsdatatranslation.cpp:2141
 msgctxt "europe.kgm"
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: mapsdatatranslation.cpp:2135
+#: mapsdatatranslation.cpp:2142
 msgctxt "europe.kgm"
 msgid "Lisbon"
 msgstr "Lisbon"
 
-#: mapsdatatranslation.cpp:2136
+#: mapsdatatranslation.cpp:2143
 msgctxt "europe.kgm"
 msgid "Romania"
 msgstr "Romania"
 
-#: mapsdatatranslation.cpp:2137
+#: mapsdatatranslation.cpp:2144
 msgctxt "europe.kgm"
 msgid "Bucharest"
 msgstr "Bucharest"
 
-#: mapsdatatranslation.cpp:2138
+#: mapsdatatranslation.cpp:2145
 msgctxt "europe.kgm"
 msgid "Russia"
 msgstr "Rwsia"
 
-#: mapsdatatranslation.cpp:2139
+#: mapsdatatranslation.cpp:2146
 msgctxt "europe.kgm"
 msgid "Moscow"
 msgstr "Mosgo"
 
-#: mapsdatatranslation.cpp:2140 mapsdatatranslation.cpp:2141
+#: mapsdatatranslation.cpp:2147 mapsdatatranslation.cpp:2148
 msgctxt "europe.kgm"
 msgid "San Marino"
 msgstr "San Marino"
 
-#: mapsdatatranslation.cpp:2142
+#: mapsdatatranslation.cpp:2149
 msgctxt "europe.kgm"
 msgid "Serbia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2143
+#: mapsdatatranslation.cpp:2150
 msgctxt "europe.kgm"
 msgid "Belgrade"
 msgstr "Belgrade"
 
-#: mapsdatatranslation.cpp:2144
+#: mapsdatatranslation.cpp:2151
 msgctxt "europe.kgm"
 msgid "Montenegro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2145
+#: mapsdatatranslation.cpp:2152
 msgctxt "europe.kgm"
 msgid "Podgorica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2146
+#: mapsdatatranslation.cpp:2153
 msgctxt "europe.kgm"
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: mapsdatatranslation.cpp:2147
+#: mapsdatatranslation.cpp:2154
 msgctxt "europe.kgm"
 msgid "Bratislava"
 msgstr "Bratislava"
 
-#: mapsdatatranslation.cpp:2148
+#: mapsdatatranslation.cpp:2155
 msgctxt "europe.kgm"
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: mapsdatatranslation.cpp:2149
+#: mapsdatatranslation.cpp:2156
 msgctxt "europe.kgm"
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: mapsdatatranslation.cpp:2150
+#: mapsdatatranslation.cpp:2157
 msgctxt "europe.kgm"
 msgid "Spain"
 msgstr "Sbaen"
 
-#: mapsdatatranslation.cpp:2151
+#: mapsdatatranslation.cpp:2158
 msgctxt "europe.kgm"
 msgid "Madrid"
 msgstr "Madrid"
 
-#: mapsdatatranslation.cpp:2152
+#: mapsdatatranslation.cpp:2159
 msgctxt "europe.kgm"
 msgid "Sweden"
 msgstr "Sweden"
 
-#: mapsdatatranslation.cpp:2153
+#: mapsdatatranslation.cpp:2160
 msgctxt "europe.kgm"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: mapsdatatranslation.cpp:2154
+#: mapsdatatranslation.cpp:2161
 msgctxt "europe.kgm"
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: mapsdatatranslation.cpp:2155
+#: mapsdatatranslation.cpp:2162
 msgctxt "europe.kgm"
 msgid "Bern"
 msgstr "Bern"
 
-#: mapsdatatranslation.cpp:2156
+#: mapsdatatranslation.cpp:2163
 msgctxt "europe.kgm"
 msgid "Syria"
 msgstr "Syria"
 
-#: mapsdatatranslation.cpp:2157
+#: mapsdatatranslation.cpp:2164
 msgctxt "europe.kgm"
 msgid "Tunisia"
 msgstr "Tiwnisia"
 
-#: mapsdatatranslation.cpp:2158
+#: mapsdatatranslation.cpp:2165
 msgctxt "europe.kgm"
 msgid "Turkey"
 msgstr "Twrci"
 
-#: mapsdatatranslation.cpp:2159
+#: mapsdatatranslation.cpp:2166
 msgctxt "europe.kgm"
 msgid "Ankara"
 msgstr "Ankara"
 
-#: mapsdatatranslation.cpp:2160
+#: mapsdatatranslation.cpp:2167
 msgctxt "europe.kgm"
 msgid "Ukraine"
 msgstr "Wcrain"
 
-#: mapsdatatranslation.cpp:2161
+#: mapsdatatranslation.cpp:2168
 msgctxt "europe.kgm"
 msgid "Kiev"
 msgstr "Kiev"
 
-#: mapsdatatranslation.cpp:2162
+#: mapsdatatranslation.cpp:2169
 msgctxt "europe.kgm"
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: mapsdatatranslation.cpp:2163
+#: mapsdatatranslation.cpp:2170
 msgctxt "europe.kgm"
 msgid "London"
 msgstr "London"
 
-#: mapsdatatranslation.cpp:2164 mapsdatatranslation.cpp:2165
+#: mapsdatatranslation.cpp:2171 mapsdatatranslation.cpp:2172
 msgctxt "europe.kgm"
 msgid "Vatican City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2166
+#: mapsdatatranslation.cpp:2173
 msgctxt "finland_regions.kgm"
 msgid "Finland (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2167
+#: mapsdatatranslation.cpp:2174
 msgctxt "finland_regions.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2168
+#: mapsdatatranslation.cpp:2175
 msgctxt "finland_regions.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2169
+#: mapsdatatranslation.cpp:2176
 msgctxt "finland_regions.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2170
+#: mapsdatatranslation.cpp:2177
 msgctxt "finland_regions.kgm"
 msgid "Not Finland (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2171
+#: mapsdatatranslation.cpp:2178
 msgctxt "finland_regions.kgm"
 msgid "Åland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2172
+#: mapsdatatranslation.cpp:2179
 msgctxt "finland_regions.kgm"
 msgid "Mariehamn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2173
+#: mapsdatatranslation.cpp:2180
 msgctxt "finland_regions.kgm"
 msgid "North Carelia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2174
+#: mapsdatatranslation.cpp:2181
 msgctxt "finland_regions.kgm"
 msgid "Joensuu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2175
+#: mapsdatatranslation.cpp:2182
 msgctxt "finland_regions.kgm"
 msgid "South Carelia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2176
+#: mapsdatatranslation.cpp:2183
 msgctxt "finland_regions.kgm"
 msgid "Lappeenranta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2177
+#: mapsdatatranslation.cpp:2184
 msgctxt "finland_regions.kgm"
 msgid "Central Finland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2178
+#: mapsdatatranslation.cpp:2185
 msgctxt "finland_regions.kgm"
 msgid "Jyväskylä"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2179
+#: mapsdatatranslation.cpp:2186
 msgctxt "finland_regions.kgm"
 msgid "Finland Proper"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2180
+#: mapsdatatranslation.cpp:2187
 msgctxt "finland_regions.kgm"
 msgid "Turku"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2181
+#: mapsdatatranslation.cpp:2188
 msgctxt "finland_regions.kgm"
 msgid "Kainuu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2182
+#: mapsdatatranslation.cpp:2189
 msgctxt "finland_regions.kgm"
 msgid "Kajaani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2183
+#: mapsdatatranslation.cpp:2190
 msgctxt "finland_regions.kgm"
 msgid "Lapland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2184
+#: mapsdatatranslation.cpp:2191
 msgctxt "finland_regions.kgm"
 msgid "Rovaniemi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2185
+#: mapsdatatranslation.cpp:2192
 msgctxt "finland_regions.kgm"
 msgid "Ostrobothnia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2186
+#: mapsdatatranslation.cpp:2193
 msgctxt "finland_regions.kgm"
 msgid "Vaasa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2187
+#: mapsdatatranslation.cpp:2194
 msgctxt "finland_regions.kgm"
 msgid "Central Ostrobothnia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2188
+#: mapsdatatranslation.cpp:2195
 msgctxt "finland_regions.kgm"
 msgid "Kokkola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2189
+#: mapsdatatranslation.cpp:2196
 msgctxt "finland_regions.kgm"
 msgid "Northern Ostrobothnia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2190
+#: mapsdatatranslation.cpp:2197
 msgctxt "finland_regions.kgm"
 msgid "Oulu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2191
+#: mapsdatatranslation.cpp:2198
 msgctxt "finland_regions.kgm"
 msgid "Southern Ostrobothnia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2192
+#: mapsdatatranslation.cpp:2199
 msgctxt "finland_regions.kgm"
 msgid "Seinäjoki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2193
+#: mapsdatatranslation.cpp:2200
 msgctxt "finland_regions.kgm"
 msgid "Päijänne-Tavastia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2194
+#: mapsdatatranslation.cpp:2201
 msgctxt "finland_regions.kgm"
 msgid "Lahti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2195
+#: mapsdatatranslation.cpp:2202
 msgctxt "finland_regions.kgm"
 msgid "Tavastia Proper"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2196
+#: mapsdatatranslation.cpp:2203
 msgctxt "finland_regions.kgm"
 msgid "Hämeenlinna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2197
+#: mapsdatatranslation.cpp:2204
 msgctxt "finland_regions.kgm"
 msgid "Pirkanmaa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2198
+#: mapsdatatranslation.cpp:2205
 msgctxt "finland_regions.kgm"
 msgid "Tampere"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2199
+#: mapsdatatranslation.cpp:2206
 msgctxt "finland_regions.kgm"
 msgid "Satakunta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2200
+#: mapsdatatranslation.cpp:2207
 msgctxt "finland_regions.kgm"
 msgid "Pori"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2201
+#: mapsdatatranslation.cpp:2208
 msgctxt "finland_regions.kgm"
 msgid "Northern Savonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2202
+#: mapsdatatranslation.cpp:2209
 msgctxt "finland_regions.kgm"
 msgid "Kuopio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2203
+#: mapsdatatranslation.cpp:2210
 msgctxt "finland_regions.kgm"
 msgid "Southern Savonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2204
+#: mapsdatatranslation.cpp:2211
 msgctxt "finland_regions.kgm"
 msgid "Mikkeli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2205
+#: mapsdatatranslation.cpp:2212
 msgctxt "finland_regions.kgm"
 msgid "Nylandia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2206
+#: mapsdatatranslation.cpp:2213
 msgctxt "finland_regions.kgm"
 msgid "Helsinki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2207
-msgctxt "finland_regions.kgm"
-msgid "Eastern Nylandia"
-msgstr ""
-
-#: mapsdatatranslation.cpp:2208
-msgctxt "finland_regions.kgm"
-msgid "Porvoo"
-msgstr ""
-
-#: mapsdatatranslation.cpp:2209
+#: mapsdatatranslation.cpp:2214
 msgctxt "finland_regions.kgm"
 msgid "Kymenlaakso"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2210
+#: mapsdatatranslation.cpp:2215
 msgctxt "finland_regions.kgm"
 msgid "Kouvola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2211
+#: mapsdatatranslation.cpp:2216
 msgctxt "france.kgm"
 msgid "France"
 msgstr "France"
 
-#: mapsdatatranslation.cpp:2212
+#: mapsdatatranslation.cpp:2217
 msgctxt "france.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2213
+#: mapsdatatranslation.cpp:2218
 msgctxt "france.kgm"
 msgid "Not France"
 msgstr "Not France"
 
-#: mapsdatatranslation.cpp:2214 mapsdatatranslation.cpp:2215
+#: mapsdatatranslation.cpp:2219 mapsdatatranslation.cpp:2220
 msgctxt "france.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:2216
+#: mapsdatatranslation.cpp:2221
 msgctxt "france.kgm"
 msgid "Ain"
 msgstr "Ain"
 
-#: mapsdatatranslation.cpp:2217
+#: mapsdatatranslation.cpp:2222
 msgctxt "france.kgm"
 msgid "Bourg en Bresse"
 msgstr "Bourg en Bresse"
 
-#: mapsdatatranslation.cpp:2218
+#: mapsdatatranslation.cpp:2223
 msgctxt "france.kgm"
 msgid "Aisne"
 msgstr "Aisne"
 
-#: mapsdatatranslation.cpp:2219
+#: mapsdatatranslation.cpp:2224
 msgctxt "france.kgm"
 msgid "Laon"
 msgstr "Laon"
 
-#: mapsdatatranslation.cpp:2220
+#: mapsdatatranslation.cpp:2225
 msgctxt "france.kgm"
 msgid "Allier"
 msgstr "Allier"
 
-#: mapsdatatranslation.cpp:2221
+#: mapsdatatranslation.cpp:2226
 msgctxt "france.kgm"
 msgid "Moulins"
 msgstr "Moulins"
 
-#: mapsdatatranslation.cpp:2222
+#: mapsdatatranslation.cpp:2227
 msgctxt "france.kgm"
 msgid "Alpes de Haute-Provence"
 msgstr "Alpes de Haute-Provence"
 
-#: mapsdatatranslation.cpp:2223
+#: mapsdatatranslation.cpp:2228
 msgctxt "france.kgm"
 msgid "Digne"
 msgstr "Digne"
 
-#: mapsdatatranslation.cpp:2224
+#: mapsdatatranslation.cpp:2229
 msgctxt "france.kgm"
 msgid "Hautes-Alpes"
 msgstr "Hautes-Alpes"
 
-#: mapsdatatranslation.cpp:2225
+#: mapsdatatranslation.cpp:2230
 msgctxt "france.kgm"
 msgid "Gap"
 msgstr "Gap"
 
-#: mapsdatatranslation.cpp:2226
+#: mapsdatatranslation.cpp:2231
 msgctxt "france.kgm"
 msgid "Alpes Maritimes"
 msgstr "Alpes Maritimes"
 
-#: mapsdatatranslation.cpp:2227
+#: mapsdatatranslation.cpp:2232
 msgctxt "france.kgm"
 msgid "Nice"
 msgstr "Nice"
 
-#: mapsdatatranslation.cpp:2228
+#: mapsdatatranslation.cpp:2233
 msgctxt "france.kgm"
 msgid "Ardèche"
 msgstr "Ardèche"
 
-#: mapsdatatranslation.cpp:2229
+#: mapsdatatranslation.cpp:2234
 msgctxt "france.kgm"
 msgid "Privas"
 msgstr "Privas"
 
-#: mapsdatatranslation.cpp:2230
+#: mapsdatatranslation.cpp:2235
 msgctxt "france.kgm"
 msgid "Ardennes"
 msgstr "Ardennes"
 
-#: mapsdatatranslation.cpp:2231
+#: mapsdatatranslation.cpp:2236
 msgctxt "france.kgm"
 msgid "Charleville-Mézières"
 msgstr "Charleville-Mézières"
 
-#: mapsdatatranslation.cpp:2232
+#: mapsdatatranslation.cpp:2237
 msgctxt "france.kgm"
 msgid "Ariège"
 msgstr "Ariège"
 
-#: mapsdatatranslation.cpp:2233
+#: mapsdatatranslation.cpp:2238
 msgctxt "france.kgm"
 msgid "Foix"
 msgstr "Foix"
 
-#: mapsdatatranslation.cpp:2234
+#: mapsdatatranslation.cpp:2239
 msgctxt "france.kgm"
 msgid "Aube"
 msgstr "Aube"
 
-#: mapsdatatranslation.cpp:2235
+#: mapsdatatranslation.cpp:2240
 msgctxt "france.kgm"
 msgid "Troyes"
 msgstr "Troyes"
 
-#: mapsdatatranslation.cpp:2236
+#: mapsdatatranslation.cpp:2241
 msgctxt "france.kgm"
 msgid "Aude"
 msgstr "Aude"
 
-#: mapsdatatranslation.cpp:2237
+#: mapsdatatranslation.cpp:2242
 msgctxt "france.kgm"
 msgid "Carcassonne"
 msgstr "Carcassonne"
 
-#: mapsdatatranslation.cpp:2238
+#: mapsdatatranslation.cpp:2243
 msgctxt "france.kgm"
 msgid "Aveyron"
 msgstr "Aveyron"
 
-#: mapsdatatranslation.cpp:2239
+#: mapsdatatranslation.cpp:2244
 msgctxt "france.kgm"
 msgid "Rodez"
 msgstr "Rodez"
 
-#: mapsdatatranslation.cpp:2240
+#: mapsdatatranslation.cpp:2245
 msgctxt "france.kgm"
 msgid "Bouches-du-Rhône"
 msgstr "Bouches-du-Rhône"
 
-#: mapsdatatranslation.cpp:2241
+#: mapsdatatranslation.cpp:2246
 msgctxt "france.kgm"
 msgid "Marseille"
 msgstr "Marseille"
 
-#: mapsdatatranslation.cpp:2242
+#: mapsdatatranslation.cpp:2247
 msgctxt "france.kgm"
 msgid "Calvados"
 msgstr "Calvados"
 
-#: mapsdatatranslation.cpp:2243
+#: mapsdatatranslation.cpp:2248
 msgctxt "france.kgm"
 msgid "Caen"
 msgstr "Caen"
 
-#: mapsdatatranslation.cpp:2244
+#: mapsdatatranslation.cpp:2249
 msgctxt "france.kgm"
 msgid "Cantal"
 msgstr "Cantal"
 
-#: mapsdatatranslation.cpp:2245
+#: mapsdatatranslation.cpp:2250
 msgctxt "france.kgm"
 msgid "Aurillac"
 msgstr "Aurillac"
 
-#: mapsdatatranslation.cpp:2246
+#: mapsdatatranslation.cpp:2251
 msgctxt "france.kgm"
 msgid "Charente"
 msgstr "Charente"
 
-#: mapsdatatranslation.cpp:2247
+#: mapsdatatranslation.cpp:2252
 msgctxt "france.kgm"
 msgid "Angoulème"
 msgstr "Angoulème"
 
-#: mapsdatatranslation.cpp:2248
+#: mapsdatatranslation.cpp:2253
 msgctxt "france.kgm"
 msgid "Charente-Maritime"
 msgstr "Charente-Maritime"
 
-#: mapsdatatranslation.cpp:2249
+#: mapsdatatranslation.cpp:2254
 msgctxt "france.kgm"
 msgid "La Rochelle"
 msgstr "La Rochelle"
 
-#: mapsdatatranslation.cpp:2250
+#: mapsdatatranslation.cpp:2255
 msgctxt "france.kgm"
 msgid "Cher"
 msgstr "Cher"
 
-#: mapsdatatranslation.cpp:2251
+#: mapsdatatranslation.cpp:2256
 msgctxt "france.kgm"
 msgid "Bourges"
 msgstr "Bourges"
 
-#: mapsdatatranslation.cpp:2252
+#: mapsdatatranslation.cpp:2257
 msgctxt "france.kgm"
 msgid "Corrèze"
 msgstr "Corrèze"
 
-#: mapsdatatranslation.cpp:2253
+#: mapsdatatranslation.cpp:2258
 msgctxt "france.kgm"
 msgid "Tulle"
 msgstr "Tulle"
 
-#: mapsdatatranslation.cpp:2254
+#: mapsdatatranslation.cpp:2259
 msgctxt "france.kgm"
 msgid "Corse du Sud"
 msgstr "Corse du Sud"
 
-#: mapsdatatranslation.cpp:2255
+#: mapsdatatranslation.cpp:2260
 msgctxt "france.kgm"
 msgid "Ajaccio"
 msgstr "Ajaccio"
 
-#: mapsdatatranslation.cpp:2256
+#: mapsdatatranslation.cpp:2261
 msgctxt "france.kgm"
 msgid "Haute-Corse"
 msgstr "Haute-Corse"
 
-#: mapsdatatranslation.cpp:2257
+#: mapsdatatranslation.cpp:2262
 msgctxt "france.kgm"
 msgid "Bastia"
 msgstr "Bastia"
 
-#: mapsdatatranslation.cpp:2258
+#: mapsdatatranslation.cpp:2263
 msgctxt "france.kgm"
 msgid "Côte d'Or"
 msgstr "Côte d'Or"
 
-#: mapsdatatranslation.cpp:2259
+#: mapsdatatranslation.cpp:2264
 msgctxt "france.kgm"
 msgid "Dijon"
 msgstr "Dijon"
 
-#: mapsdatatranslation.cpp:2260
+#: mapsdatatranslation.cpp:2265
 msgctxt "france.kgm"
 msgid "Côtes d'Armor"
 msgstr "Côtes d'Armor"
 
-#: mapsdatatranslation.cpp:2261
+#: mapsdatatranslation.cpp:2266
 msgctxt "france.kgm"
 msgid "Saint Brieuc"
 msgstr "Saint Brieuc"
 
-#: mapsdatatranslation.cpp:2262
+#: mapsdatatranslation.cpp:2267
 msgctxt "france.kgm"
 msgid "Creuse"
 msgstr "Creuse"
 
-#: mapsdatatranslation.cpp:2263
+#: mapsdatatranslation.cpp:2268
 msgctxt "france.kgm"
 msgid "Guéret"
 msgstr "Guéret"
 
-#: mapsdatatranslation.cpp:2264
+#: mapsdatatranslation.cpp:2269
 msgctxt "france.kgm"
 msgid "Dordogne"
 msgstr "Dordogne"
 
-#: mapsdatatranslation.cpp:2265
+#: mapsdatatranslation.cpp:2270
 msgctxt "france.kgm"
 msgid "Périgueux"
 msgstr "Périgueux"
 
-#: mapsdatatranslation.cpp:2266
+#: mapsdatatranslation.cpp:2271
 msgctxt "france.kgm"
 msgid "Doubs"
 msgstr "Doubs"
 
-#: mapsdatatranslation.cpp:2267
+#: mapsdatatranslation.cpp:2272
 msgctxt "france.kgm"
 msgid "Besançon"
 msgstr "Besançon"
 
-#: mapsdatatranslation.cpp:2268
+#: mapsdatatranslation.cpp:2273
 msgctxt "france.kgm"
 msgid "Drôme"
 msgstr "Drôme"
 
-#: mapsdatatranslation.cpp:2269
+#: mapsdatatranslation.cpp:2274
 msgctxt "france.kgm"
 msgid "Valence"
 msgstr "Valence"
 
-#: mapsdatatranslation.cpp:2270
+#: mapsdatatranslation.cpp:2275
 msgctxt "france.kgm"
 msgid "Eure"
 msgstr "Eure"
 
-#: mapsdatatranslation.cpp:2271
+#: mapsdatatranslation.cpp:2276
 msgctxt "france.kgm"
 msgid "Evreux"
 msgstr "Evreux"
 
-#: mapsdatatranslation.cpp:2272
+#: mapsdatatranslation.cpp:2277
 msgctxt "france.kgm"
 msgid "Eure et Loir"
 msgstr "Eure et Loir"
 
-#: mapsdatatranslation.cpp:2273
+#: mapsdatatranslation.cpp:2278
 msgctxt "france.kgm"
 msgid "Chartres"
 msgstr "Chartres"
 
-#: mapsdatatranslation.cpp:2274
+#: mapsdatatranslation.cpp:2279
 msgctxt "france.kgm"
 msgid "Finistère"
 msgstr "Finistère"
 
-#: mapsdatatranslation.cpp:2275
+#: mapsdatatranslation.cpp:2280
 msgctxt "france.kgm"
 msgid "Quimper"
 msgstr "Quimper"
 
-#: mapsdatatranslation.cpp:2276
+#: mapsdatatranslation.cpp:2281
 msgctxt "france.kgm"
 msgid "Gard"
 msgstr "Gard"
 
-#: mapsdatatranslation.cpp:2277
+#: mapsdatatranslation.cpp:2282
 msgctxt "france.kgm"
 msgid "Nîmes"
 msgstr "Nîmes"
 
-#: mapsdatatranslation.cpp:2278
+#: mapsdatatranslation.cpp:2283
 msgctxt "france.kgm"
 msgid "Haute-Garonne"
 msgstr "Haute-Garonne"
 
-#: mapsdatatranslation.cpp:2279
+#: mapsdatatranslation.cpp:2284
 msgctxt "france.kgm"
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: mapsdatatranslation.cpp:2280
+#: mapsdatatranslation.cpp:2285
 msgctxt "france.kgm"
 msgid "Gers"
 msgstr "Gers"
 
-#: mapsdatatranslation.cpp:2281
+#: mapsdatatranslation.cpp:2286
 msgctxt "france.kgm"
 msgid "Auch"
 msgstr "Auch"
 
-#: mapsdatatranslation.cpp:2282
+#: mapsdatatranslation.cpp:2287
 msgctxt "france.kgm"
 msgid "Gironde"
 msgstr "Gironde"
 
-#: mapsdatatranslation.cpp:2283
+#: mapsdatatranslation.cpp:2288
 msgctxt "france.kgm"
 msgid "Bordeaux"
 msgstr "Bordeaux"
 
-#: mapsdatatranslation.cpp:2284
+#: mapsdatatranslation.cpp:2289
 msgctxt "france.kgm"
 msgid "Hérault"
 msgstr "Hérault"
 
-#: mapsdatatranslation.cpp:2285
+#: mapsdatatranslation.cpp:2290
 msgctxt "france.kgm"
 msgid "Montpellier"
 msgstr "Montpellier"
 
-#: mapsdatatranslation.cpp:2286
+#: mapsdatatranslation.cpp:2291
 msgctxt "france.kgm"
 msgid "Ille et Vilaine"
 msgstr "Ille et Vilaine"
 
-#: mapsdatatranslation.cpp:2287
+#: mapsdatatranslation.cpp:2292
 msgctxt "france.kgm"
 msgid "Rennes"
 msgstr "Rennes"
 
-#: mapsdatatranslation.cpp:2288
+#: mapsdatatranslation.cpp:2293
 msgctxt "france.kgm"
 msgid "Indre"
 msgstr "Indre"
 
-#: mapsdatatranslation.cpp:2289
+#: mapsdatatranslation.cpp:2294
 msgctxt "france.kgm"
 msgid "Châteauroux"
 msgstr "Châteauroux"
 
-#: mapsdatatranslation.cpp:2290
+#: mapsdatatranslation.cpp:2295
 msgctxt "france.kgm"
 msgid "Indre et Loire"
 msgstr "Indre et Loire"
 
-#: mapsdatatranslation.cpp:2291
+#: mapsdatatranslation.cpp:2296
 msgctxt "france.kgm"
 msgid "Tours"
 msgstr "Tours"
 
-#: mapsdatatranslation.cpp:2292
+#: mapsdatatranslation.cpp:2297
 msgctxt "france.kgm"
 msgid "Isère"
 msgstr "Isère"
 
-#: mapsdatatranslation.cpp:2293
+#: mapsdatatranslation.cpp:2298
 msgctxt "france.kgm"
 msgid "Grenoble"
 msgstr "Grenoble"
 
-#: mapsdatatranslation.cpp:2294
+#: mapsdatatranslation.cpp:2299
 msgctxt "france.kgm"
 msgid "Jura"
 msgstr "Jura"
 
-#: mapsdatatranslation.cpp:2295
+#: mapsdatatranslation.cpp:2300
 msgctxt "france.kgm"
 msgid "Lons le Saunier"
 msgstr "Lons le Saunier"
 
-#: mapsdatatranslation.cpp:2296
+#: mapsdatatranslation.cpp:2301
 msgctxt "france.kgm"
 msgid "Landes"
 msgstr "Landes"
 
-#: mapsdatatranslation.cpp:2297
+#: mapsdatatranslation.cpp:2302
 msgctxt "france.kgm"
 msgid "Mont de Marsan"
 msgstr "Mont de Marsan"
 
-#: mapsdatatranslation.cpp:2298
+#: mapsdatatranslation.cpp:2303
 msgctxt "france.kgm"
 msgid "Loir et Cher"
 msgstr "Loir et Cher"
 
-#: mapsdatatranslation.cpp:2299
+#: mapsdatatranslation.cpp:2304
 msgctxt "france.kgm"
 msgid "Blois"
 msgstr "Blois"
 
-#: mapsdatatranslation.cpp:2300
+#: mapsdatatranslation.cpp:2305
 msgctxt "france.kgm"
 msgid "Loire"
 msgstr "Loire"
 
-#: mapsdatatranslation.cpp:2301
+#: mapsdatatranslation.cpp:2306
 msgctxt "france.kgm"
 msgid "Saint Etienne"
 msgstr "Saint Etienne"
 
-#: mapsdatatranslation.cpp:2302
+#: mapsdatatranslation.cpp:2307
 msgctxt "france.kgm"
 msgid "Haute-Loire"
 msgstr "Haute-Loire"
 
-#: mapsdatatranslation.cpp:2303
+#: mapsdatatranslation.cpp:2308
 msgctxt "france.kgm"
 msgid "Le Puy"
 msgstr "Le Puy"
 
-#: mapsdatatranslation.cpp:2304
+#: mapsdatatranslation.cpp:2309
 msgctxt "france.kgm"
 msgid "Loire-Atlantique"
 msgstr "Loire-Atlantique"
 
-#: mapsdatatranslation.cpp:2305
+#: mapsdatatranslation.cpp:2310
 msgctxt "france.kgm"
 msgid "Nantes"
 msgstr "Nantes"
 
-#: mapsdatatranslation.cpp:2306
+#: mapsdatatranslation.cpp:2311
 msgctxt "france.kgm"
 msgid "Loiret"
 msgstr "Loiret"
 
-#: mapsdatatranslation.cpp:2307
+#: mapsdatatranslation.cpp:2312
 msgctxt "france.kgm"
 msgid "Orléans"
 msgstr "Orléans"
 
-#: mapsdatatranslation.cpp:2308
+#: mapsdatatranslation.cpp:2313
 msgctxt "france.kgm"
 msgid "Lot"
 msgstr "Lot"
 
-#: mapsdatatranslation.cpp:2309
+#: mapsdatatranslation.cpp:2314
 msgctxt "france.kgm"
 msgid "Cahors"
 msgstr "Cahors"
 
-#: mapsdatatranslation.cpp:2310
+#: mapsdatatranslation.cpp:2315
 msgctxt "france.kgm"
 msgid "Lot et Garonne"
 msgstr "Lot et Garonne"
 
-#: mapsdatatranslation.cpp:2311
+#: mapsdatatranslation.cpp:2316
 msgctxt "france.kgm"
 msgid "Agen"
 msgstr "Agen"
 
-#: mapsdatatranslation.cpp:2312
+#: mapsdatatranslation.cpp:2317
 msgctxt "france.kgm"
 msgid "Lozère"
 msgstr "Lozère"
 
-#: mapsdatatranslation.cpp:2313
+#: mapsdatatranslation.cpp:2318
 msgctxt "france.kgm"
 msgid "Mende"
 msgstr "Mende"
 
-#: mapsdatatranslation.cpp:2314
+#: mapsdatatranslation.cpp:2319
 msgctxt "france.kgm"
 msgid "Maine et Loire"
 msgstr "Maine et Loire"
 
-#: mapsdatatranslation.cpp:2315
+#: mapsdatatranslation.cpp:2320
 msgctxt "france.kgm"
 msgid "Angers"
 msgstr "Angers"
 
-#: mapsdatatranslation.cpp:2316
+#: mapsdatatranslation.cpp:2321
 msgctxt "france.kgm"
 msgid "Manche"
 msgstr "Manche"
 
-#: mapsdatatranslation.cpp:2317
+#: mapsdatatranslation.cpp:2322
 msgctxt "france.kgm"
 msgid "Saint Lô"
 msgstr "Saint Lô"
 
-#: mapsdatatranslation.cpp:2318
+#: mapsdatatranslation.cpp:2323
 msgctxt "france.kgm"
 msgid "Marne"
 msgstr "Marne"
 
-#: mapsdatatranslation.cpp:2319
+#: mapsdatatranslation.cpp:2324
 msgctxt "france.kgm"
 msgid "Châlon en Champagne"
 msgstr "Châlon en Champagne"
 
-#: mapsdatatranslation.cpp:2320
+#: mapsdatatranslation.cpp:2325
 msgctxt "france.kgm"
 msgid "Haute-Marne"
 msgstr "Haute-Marne"
 
-#: mapsdatatranslation.cpp:2321
+#: mapsdatatranslation.cpp:2326
 msgctxt "france.kgm"
 msgid "Chaumont"
 msgstr "Chaumont"
 
-#: mapsdatatranslation.cpp:2322
+#: mapsdatatranslation.cpp:2327
 msgctxt "france.kgm"
 msgid "Mayenne"
 msgstr "Mayenne"
 
-#: mapsdatatranslation.cpp:2323
+#: mapsdatatranslation.cpp:2328
 msgctxt "france.kgm"
 msgid "Laval"
 msgstr "Laval"
 
-#: mapsdatatranslation.cpp:2324
+#: mapsdatatranslation.cpp:2329
 msgctxt "france.kgm"
 msgid "Meurthe et Moselle"
 msgstr "Meurthe et Moselle"
 
-#: mapsdatatranslation.cpp:2325
+#: mapsdatatranslation.cpp:2330
 msgctxt "france.kgm"
 msgid "Nancy"
 msgstr "Nancy"
 
-#: mapsdatatranslation.cpp:2326
+#: mapsdatatranslation.cpp:2331
 msgctxt "france.kgm"
 msgid "Meuse"
 msgstr "Meuse"
 
-#: mapsdatatranslation.cpp:2327
+#: mapsdatatranslation.cpp:2332
 msgctxt "france.kgm"
 msgid "Bar le Duc"
 msgstr "Bar le Duc"
 
-#: mapsdatatranslation.cpp:2328
+#: mapsdatatranslation.cpp:2333
 msgctxt "france.kgm"
 msgid "Morbihan"
 msgstr "Morbihan"
 
-#: mapsdatatranslation.cpp:2329
+#: mapsdatatranslation.cpp:2334
 msgctxt "france.kgm"
 msgid "Vannes"
 msgstr "Vannes"
 
-#: mapsdatatranslation.cpp:2330
+#: mapsdatatranslation.cpp:2335
 msgctxt "france.kgm"
 msgid "Moselle"
 msgstr "Moselle"
 
-#: mapsdatatranslation.cpp:2331
+#: mapsdatatranslation.cpp:2336
 msgctxt "france.kgm"
 msgid "Metz"
 msgstr "Metz"
 
-#: mapsdatatranslation.cpp:2332
+#: mapsdatatranslation.cpp:2337
 msgctxt "france.kgm"
 msgid "Nièvre"
 msgstr "Nièvre"
 
-#: mapsdatatranslation.cpp:2333
+#: mapsdatatranslation.cpp:2338
 msgctxt "france.kgm"
 msgid "Nevers"
 msgstr "Nevers"
 
-#: mapsdatatranslation.cpp:2334
+#: mapsdatatranslation.cpp:2339
 msgctxt "france.kgm"
 msgid "Nord"
 msgstr "Nord"
 
-#: mapsdatatranslation.cpp:2335
+#: mapsdatatranslation.cpp:2340
 msgctxt "france.kgm"
 msgid "Lille"
 msgstr "Lille"
 
-#: mapsdatatranslation.cpp:2336
+#: mapsdatatranslation.cpp:2341
 msgctxt "france.kgm"
 msgid "Oise"
 msgstr "Oise"
 
-#: mapsdatatranslation.cpp:2337
+#: mapsdatatranslation.cpp:2342
 msgctxt "france.kgm"
 msgid "Beauvais"
 msgstr "Beauvais"
 
-#: mapsdatatranslation.cpp:2338
+#: mapsdatatranslation.cpp:2343
 msgctxt "france.kgm"
 msgid "Orne"
 msgstr "Orne"
 
-#: mapsdatatranslation.cpp:2339
+#: mapsdatatranslation.cpp:2344
 msgctxt "france.kgm"
 msgid "Alençon"
 msgstr "Alençon"
 
-#: mapsdatatranslation.cpp:2340
+#: mapsdatatranslation.cpp:2345
 msgctxt "france.kgm"
 msgid "Pas-de-Calais"
 msgstr "Pas-de-Calais"
 
-#: mapsdatatranslation.cpp:2341
+#: mapsdatatranslation.cpp:2346
 msgctxt "france.kgm"
 msgid "Arras"
 msgstr "Arras"
 
-#: mapsdatatranslation.cpp:2342
+#: mapsdatatranslation.cpp:2347
 msgctxt "france.kgm"
 msgid "Puy-de-Dôme"
 msgstr "Puy-de-Dôme"
 
-#: mapsdatatranslation.cpp:2343
+#: mapsdatatranslation.cpp:2348
 msgctxt "france.kgm"
 msgid "Clermont Ferrand"
 msgstr "Clermont Ferrand"
 
-#: mapsdatatranslation.cpp:2344
+#: mapsdatatranslation.cpp:2349
 msgctxt "france.kgm"
 msgid "Pyrénées-Atlantiques"
 msgstr "Pyrénées-Atlantiques"
 
-#: mapsdatatranslation.cpp:2345
+#: mapsdatatranslation.cpp:2350
 msgctxt "france.kgm"
 msgid "Pau"
 msgstr "Pau"
 
-#: mapsdatatranslation.cpp:2346
+#: mapsdatatranslation.cpp:2351
 msgctxt "france.kgm"
 msgid "Hautes-Pyrénées"
 msgstr "Hautes-Pyrénées"
 
-#: mapsdatatranslation.cpp:2347
+#: mapsdatatranslation.cpp:2352
 msgctxt "france.kgm"
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: mapsdatatranslation.cpp:2348
+#: mapsdatatranslation.cpp:2353
 msgctxt "france.kgm"
 msgid "Pyrénées-Orientales"
 msgstr "Pyrénées-Orientales"
 
-#: mapsdatatranslation.cpp:2349
+#: mapsdatatranslation.cpp:2354
 msgctxt "france.kgm"
 msgid "Perpignan"
 msgstr "Perpignan"
 
-#: mapsdatatranslation.cpp:2350
+#: mapsdatatranslation.cpp:2355
 msgctxt "france.kgm"
 msgid "Bas-Rhin"
 msgstr "Bas-Rhin"
 
-#: mapsdatatranslation.cpp:2351
+#: mapsdatatranslation.cpp:2356
 msgctxt "france.kgm"
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: mapsdatatranslation.cpp:2352
+#: mapsdatatranslation.cpp:2357
 msgctxt "france.kgm"
 msgid "Haut-Rhin"
 msgstr "Haut-Rhin"
 
-#: mapsdatatranslation.cpp:2353
+#: mapsdatatranslation.cpp:2358
 msgctxt "france.kgm"
 msgid "Colmar"
 msgstr "Colmar"
 
-#: mapsdatatranslation.cpp:2354
+#: mapsdatatranslation.cpp:2359
 msgctxt "france.kgm"
 msgid "Rhône"
 msgstr "Rhône"
 
-#: mapsdatatranslation.cpp:2355
+#: mapsdatatranslation.cpp:2360
 msgctxt "france.kgm"
 msgid "Lyon"
 msgstr "Lyon"
 
-#: mapsdatatranslation.cpp:2356
+#: mapsdatatranslation.cpp:2361
 msgctxt "france.kgm"
 msgid "Haute-Saône"
 msgstr "Haute-Saône"
 
-#: mapsdatatranslation.cpp:2357
+#: mapsdatatranslation.cpp:2362
 msgctxt "france.kgm"
 msgid "Vesoul"
 msgstr "Vesoul"
 
-#: mapsdatatranslation.cpp:2358
+#: mapsdatatranslation.cpp:2363
 msgctxt "france.kgm"
 msgid "Saône et Loire"
 msgstr "Saône et Loire"
 
-#: mapsdatatranslation.cpp:2359
+#: mapsdatatranslation.cpp:2364
 msgctxt "france.kgm"
 msgid "Mâcon"
 msgstr "Mâcon"
 
-#: mapsdatatranslation.cpp:2360
+#: mapsdatatranslation.cpp:2365
 msgctxt "france.kgm"
 msgid "Sarthe"
 msgstr "Sarthe"
 
-#: mapsdatatranslation.cpp:2361
+#: mapsdatatranslation.cpp:2366
 msgctxt "france.kgm"
 msgid "Le Mans"
 msgstr "Le Mans"
 
-#: mapsdatatranslation.cpp:2362
+#: mapsdatatranslation.cpp:2367
 msgctxt "france.kgm"
 msgid "Savoie"
 msgstr "Savoie"
 
-#: mapsdatatranslation.cpp:2363
+#: mapsdatatranslation.cpp:2368
 msgctxt "france.kgm"
 msgid "Chambéry"
 msgstr "Chambéry"
 
-#: mapsdatatranslation.cpp:2364
+#: mapsdatatranslation.cpp:2369
 msgctxt "france.kgm"
 msgid "Haute-Savoie"
 msgstr "Haute-Savoie"
 
-#: mapsdatatranslation.cpp:2365
+#: mapsdatatranslation.cpp:2370
 msgctxt "france.kgm"
 msgid "Annecy"
 msgstr "Annecy"
 
-#: mapsdatatranslation.cpp:2366 mapsdatatranslation.cpp:2367
+#: mapsdatatranslation.cpp:2371 mapsdatatranslation.cpp:2372
 msgctxt "france.kgm"
 msgid "Paris"
 msgstr "Paris"
 
-#: mapsdatatranslation.cpp:2368
+#: mapsdatatranslation.cpp:2373
 msgctxt "france.kgm"
 msgid "Seine-Maritime"
 msgstr "Seine-Maritime"
 
-#: mapsdatatranslation.cpp:2369
+#: mapsdatatranslation.cpp:2374
 msgctxt "france.kgm"
 msgid "Rouen"
 msgstr "Rouen"
 
-#: mapsdatatranslation.cpp:2370
+#: mapsdatatranslation.cpp:2375
 msgctxt "france.kgm"
 msgid "Seine et Marne"
 msgstr "Seine et Marne"
 
-#: mapsdatatranslation.cpp:2371
+#: mapsdatatranslation.cpp:2376
 msgctxt "france.kgm"
 msgid "Melun"
 msgstr "Melun"
 
-#: mapsdatatranslation.cpp:2372
+#: mapsdatatranslation.cpp:2377
 msgctxt "france.kgm"
 msgid "Yvelines"
 msgstr "Yvelines"
 
-#: mapsdatatranslation.cpp:2373
+#: mapsdatatranslation.cpp:2378
 msgctxt "france.kgm"
 msgid "Versailles"
 msgstr "Versailles"
 
-#: mapsdatatranslation.cpp:2374
+#: mapsdatatranslation.cpp:2379
 msgctxt "france.kgm"
 msgid "Deux-Sèvres"
 msgstr "Deux-Sèvres"
 
-#: mapsdatatranslation.cpp:2375
+#: mapsdatatranslation.cpp:2380
 msgctxt "france.kgm"
 msgid "Niort"
 msgstr "Niort"
 
-#: mapsdatatranslation.cpp:2376
+#: mapsdatatranslation.cpp:2381
 msgctxt "france.kgm"
 msgid "Somme"
 msgstr "Somme"
 
-#: mapsdatatranslation.cpp:2377
+#: mapsdatatranslation.cpp:2382
 msgctxt "france.kgm"
 msgid "Amiens"
 msgstr "Amiens"
 
-#: mapsdatatranslation.cpp:2378
+#: mapsdatatranslation.cpp:2383
 msgctxt "france.kgm"
 msgid "Tarn"
 msgstr "Tarn"
 
-#: mapsdatatranslation.cpp:2379
+#: mapsdatatranslation.cpp:2384
 msgctxt "france.kgm"
 msgid "Albi"
 msgstr "Albi"
 
-#: mapsdatatranslation.cpp:2380
+#: mapsdatatranslation.cpp:2385
 msgctxt "france.kgm"
 msgid "Tarn et Garonne"
 msgstr "Tarn et Garonne"
 
-#: mapsdatatranslation.cpp:2381
+#: mapsdatatranslation.cpp:2386
 msgctxt "france.kgm"
 msgid "Montauban"
 msgstr "Montauban"
 
-#: mapsdatatranslation.cpp:2382
+#: mapsdatatranslation.cpp:2387
 msgctxt "france.kgm"
 msgid "Var"
 msgstr "Var"
 
-#: mapsdatatranslation.cpp:2383
+#: mapsdatatranslation.cpp:2388
 msgctxt "france.kgm"
 msgid "Toulon"
 msgstr "Toulon"
 
-#: mapsdatatranslation.cpp:2384
+#: mapsdatatranslation.cpp:2389
 msgctxt "france.kgm"
 msgid "Vaucluse"
 msgstr "Vaucluse"
 
-#: mapsdatatranslation.cpp:2385
+#: mapsdatatranslation.cpp:2390
 msgctxt "france.kgm"
 msgid "Avignon"
 msgstr "Avignon"
 
-#: mapsdatatranslation.cpp:2386
+#: mapsdatatranslation.cpp:2391
 msgctxt "france.kgm"
 msgid "Vendée"
 msgstr "Vendée"
 
-#: mapsdatatranslation.cpp:2387
+#: mapsdatatranslation.cpp:2392
 msgctxt "france.kgm"
 msgid "La Roche sur Yon"
 msgstr "La Roche sur Yon"
 
-#: mapsdatatranslation.cpp:2388
+#: mapsdatatranslation.cpp:2393
 msgctxt "france.kgm"
 msgid "Vienne"
 msgstr "Vienne"
 
-#: mapsdatatranslation.cpp:2389
+#: mapsdatatranslation.cpp:2394
 msgctxt "france.kgm"
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: mapsdatatranslation.cpp:2390
+#: mapsdatatranslation.cpp:2395
 msgctxt "france.kgm"
 msgid "Haute-Vienne"
 msgstr "Haute-Vienne"
 
-#: mapsdatatranslation.cpp:2391
+#: mapsdatatranslation.cpp:2396
 msgctxt "france.kgm"
 msgid "Limoges"
 msgstr "Limoges"
 
-#: mapsdatatranslation.cpp:2392
+#: mapsdatatranslation.cpp:2397
 msgctxt "france.kgm"
 msgid "Vosges"
 msgstr "Vosges"
 
-#: mapsdatatranslation.cpp:2393
+#: mapsdatatranslation.cpp:2398
 msgctxt "france.kgm"
 msgid "Epinal"
 msgstr "Epinal"
 
-#: mapsdatatranslation.cpp:2394
+#: mapsdatatranslation.cpp:2399
 msgctxt "france.kgm"
 msgid "Yonne"
 msgstr "Yonne"
 
-#: mapsdatatranslation.cpp:2395
+#: mapsdatatranslation.cpp:2400
 msgctxt "france.kgm"
 msgid "Auxerre"
 msgstr "Auxerre"
 
-#: mapsdatatranslation.cpp:2396
+#: mapsdatatranslation.cpp:2401
 msgctxt "france.kgm"
 msgid "Territoire de Belfort"
 msgstr "Territoire de Belfort"
 
-#: mapsdatatranslation.cpp:2397
+#: mapsdatatranslation.cpp:2402
 msgctxt "france.kgm"
 msgid "Belfort"
 msgstr "Belfort"
 
-#: mapsdatatranslation.cpp:2398
+#: mapsdatatranslation.cpp:2403
 msgctxt "france.kgm"
 msgid "Essonne"
 msgstr "Essonne"
 
-#: mapsdatatranslation.cpp:2399
+#: mapsdatatranslation.cpp:2404
 msgctxt "france.kgm"
 msgid "Evry"
 msgstr "Evry"
 
-#: mapsdatatranslation.cpp:2400
+#: mapsdatatranslation.cpp:2405
 msgctxt "france.kgm"
 msgid "Hauts-de-Seine"
 msgstr "Hauts-de-Seine"
 
-#: mapsdatatranslation.cpp:2401
+#: mapsdatatranslation.cpp:2406
 msgctxt "france.kgm"
 msgid "Nanterre"
 msgstr "Nanterre"
 
-#: mapsdatatranslation.cpp:2402
+#: mapsdatatranslation.cpp:2407
 msgctxt "france.kgm"
 msgid "Seine-Saint-Denis"
 msgstr "Seine-Saint-Denis"
 
-#: mapsdatatranslation.cpp:2403
+#: mapsdatatranslation.cpp:2408
 msgctxt "france.kgm"
 msgid "Bobigny"
 msgstr "Bobigny"
 
-#: mapsdatatranslation.cpp:2404
+#: mapsdatatranslation.cpp:2409
 msgctxt "france.kgm"
 msgid "Val-de-Marne"
 msgstr "Val-de-Marne"
 
-#: mapsdatatranslation.cpp:2405
+#: mapsdatatranslation.cpp:2410
 msgctxt "france.kgm"
 msgid "Créteil"
 msgstr "Créteil"
 
-#: mapsdatatranslation.cpp:2406
+#: mapsdatatranslation.cpp:2411
 msgctxt "france.kgm"
 msgid "Val d'Oise"
 msgstr "Val d'Oise"
 
-#: mapsdatatranslation.cpp:2407
+#: mapsdatatranslation.cpp:2412
 msgctxt "france.kgm"
 msgid "Cergy-Pontoise"
 msgstr "Cergy-Pontoise"
 
-#: mapsdatatranslation.cpp:2408
+#: mapsdatatranslation.cpp:2413
 msgctxt "france_regions.kgm"
 msgid "France (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2409
+#: mapsdatatranslation.cpp:2414
 msgctxt "france_regions.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2410
+#: mapsdatatranslation.cpp:2415
 msgctxt "france_regions.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2411
+#: mapsdatatranslation.cpp:2416
 msgctxt "france_regions.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2412
+#: mapsdatatranslation.cpp:2417
 msgctxt "france_regions.kgm"
 msgid "Not France (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2413
+#: mapsdatatranslation.cpp:2418
 msgctxt "france_regions.kgm"
 msgid "Provence-Alpes-Côte d'Azur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2414
+#: mapsdatatranslation.cpp:2419
 msgctxt "france_regions.kgm"
 msgid "Marseille"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2415
+#: mapsdatatranslation.cpp:2420
 msgctxt "france_regions.kgm"
 msgid "Basse Normandie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2416
+#: mapsdatatranslation.cpp:2421
 msgctxt "france_regions.kgm"
 msgid "Caen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2417
+#: mapsdatatranslation.cpp:2422
 msgctxt "france_regions.kgm"
 msgid "Corse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2418
+#: mapsdatatranslation.cpp:2423
 msgctxt "france_regions.kgm"
 msgid "Ajaccio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2419
+#: mapsdatatranslation.cpp:2424
 msgctxt "france_regions.kgm"
 msgid "Bourgogne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2420
+#: mapsdatatranslation.cpp:2425
 msgctxt "france_regions.kgm"
 msgid "Dijon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2421
+#: mapsdatatranslation.cpp:2426
 msgctxt "france_regions.kgm"
 msgid "Franche Comté"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2422
+#: mapsdatatranslation.cpp:2427
 msgctxt "france_regions.kgm"
 msgid "Besançon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2423
+#: mapsdatatranslation.cpp:2428
 msgctxt "france_regions.kgm"
 msgid "Midi-Pyrénées"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2424
+#: mapsdatatranslation.cpp:2429
 msgctxt "france_regions.kgm"
 msgid "Toulouse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2425
+#: mapsdatatranslation.cpp:2430
 msgctxt "france_regions.kgm"
 msgid "Aquitaine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2426
+#: mapsdatatranslation.cpp:2431
 msgctxt "france_regions.kgm"
 msgid "Bordeaux"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2427
+#: mapsdatatranslation.cpp:2432
 msgctxt "france_regions.kgm"
 msgid "Languedoc-Roussilon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2428
+#: mapsdatatranslation.cpp:2433
 msgctxt "france_regions.kgm"
 msgid "Montpellier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2429
+#: mapsdatatranslation.cpp:2434
 msgctxt "france_regions.kgm"
 msgid "Bretagne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2430
+#: mapsdatatranslation.cpp:2435
 msgctxt "france_regions.kgm"
 msgid "Rennes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2431
+#: mapsdatatranslation.cpp:2436
 msgctxt "france_regions.kgm"
 msgid "Pays de Loire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2432
+#: mapsdatatranslation.cpp:2437
 msgctxt "france_regions.kgm"
 msgid "Nantes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2433
+#: mapsdatatranslation.cpp:2438
 msgctxt "france_regions.kgm"
 msgid "Centre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2434
+#: mapsdatatranslation.cpp:2439
 msgctxt "france_regions.kgm"
 msgid "Orléans"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2435
+#: mapsdatatranslation.cpp:2440
 msgctxt "france_regions.kgm"
 msgid "Champagne-Ardennes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2436
+#: mapsdatatranslation.cpp:2441
 msgctxt "france_regions.kgm"
 msgid "Châlon en Champagne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2437
+#: mapsdatatranslation.cpp:2442
 msgctxt "france_regions.kgm"
 msgid "Lorraine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2438
+#: mapsdatatranslation.cpp:2443
 msgctxt "france_regions.kgm"
 msgid "Metz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2439
+#: mapsdatatranslation.cpp:2444
 msgctxt "france_regions.kgm"
 msgid "Nord-Pas de Calais"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2440
+#: mapsdatatranslation.cpp:2445
 msgctxt "france_regions.kgm"
 msgid "Lille"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2441
+#: mapsdatatranslation.cpp:2446
 msgctxt "france_regions.kgm"
 msgid "Auvergne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2442
+#: mapsdatatranslation.cpp:2447
 msgctxt "france_regions.kgm"
 msgid "Clermont Ferrand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2443
+#: mapsdatatranslation.cpp:2448
 msgctxt "france_regions.kgm"
 msgid "Alsace"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2444
+#: mapsdatatranslation.cpp:2449
 msgctxt "france_regions.kgm"
 msgid "Strasbourg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2445
+#: mapsdatatranslation.cpp:2450
 msgctxt "france_regions.kgm"
 msgid "Rhône-Alpes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2446
+#: mapsdatatranslation.cpp:2451
 msgctxt "france_regions.kgm"
 msgid "Lyon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2447
+#: mapsdatatranslation.cpp:2452
 msgctxt "france_regions.kgm"
 msgid "Île de France"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2448
+#: mapsdatatranslation.cpp:2453
 msgctxt "france_regions.kgm"
 msgid "Paris"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2449
+#: mapsdatatranslation.cpp:2454
 msgctxt "france_regions.kgm"
 msgid "Haute Normandie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2450
+#: mapsdatatranslation.cpp:2455
 msgctxt "france_regions.kgm"
 msgid "Rouen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2451
+#: mapsdatatranslation.cpp:2456
 msgctxt "france_regions.kgm"
 msgid "Picardie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2452
+#: mapsdatatranslation.cpp:2457
 msgctxt "france_regions.kgm"
 msgid "Amiens"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2453
+#: mapsdatatranslation.cpp:2458
 msgctxt "france_regions.kgm"
 msgid "Poitou-Charentes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2454
+#: mapsdatatranslation.cpp:2459
 msgctxt "france_regions.kgm"
 msgid "Poitiers"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2455
+#: mapsdatatranslation.cpp:2460
 msgctxt "france_regions.kgm"
 msgid "Limousin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2456
+#: mapsdatatranslation.cpp:2461
 msgctxt "france_regions.kgm"
 msgid "Limoges"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2457
+#: mapsdatatranslation.cpp:2462
 msgctxt "georgia.kgm"
 msgid "Georgia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2458
+#: mapsdatatranslation.cpp:2463
 msgctxt "georgia.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2459
+#: mapsdatatranslation.cpp:2464
 msgctxt "georgia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2460
+#: mapsdatatranslation.cpp:2465
 msgctxt "georgia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2461
+#: mapsdatatranslation.cpp:2466
 msgctxt "georgia.kgm"
 msgid "Not Georgia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2462
+#: mapsdatatranslation.cpp:2467
 msgctxt "georgia.kgm"
 msgid "Abkhazia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2463
+#: mapsdatatranslation.cpp:2468
 msgctxt "georgia.kgm"
 msgid "Sokhumi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2464
+#: mapsdatatranslation.cpp:2469
 msgctxt "georgia.kgm"
 msgid "Samegrelo-Zemo Svaneti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2465
+#: mapsdatatranslation.cpp:2470
 msgctxt "georgia.kgm"
 msgid "Zugdidi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2466
+#: mapsdatatranslation.cpp:2471
 msgctxt "georgia.kgm"
 msgid "Guria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2467
+#: mapsdatatranslation.cpp:2472
 msgctxt "georgia.kgm"
 msgid "Ozurgeti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2468
+#: mapsdatatranslation.cpp:2473
 msgctxt "georgia.kgm"
 msgid "Ajaria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2469
+#: mapsdatatranslation.cpp:2474
 msgctxt "georgia.kgm"
 msgid "Batumi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2470
+#: mapsdatatranslation.cpp:2475
 msgctxt "georgia.kgm"
 msgid "Racha-Lechkhumi and Kvemo Svaneti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2471
+#: mapsdatatranslation.cpp:2476
 msgctxt "georgia.kgm"
 msgid "Ambrolauri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2472
+#: mapsdatatranslation.cpp:2477
 msgctxt "georgia.kgm"
 msgid "Imereti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2473
+#: mapsdatatranslation.cpp:2478
 msgctxt "georgia.kgm"
 msgid "Kutaisi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2474
+#: mapsdatatranslation.cpp:2479
 msgctxt "georgia.kgm"
 msgid "Samtskhe-Javakheti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2475
+#: mapsdatatranslation.cpp:2480
 msgctxt "georgia.kgm"
 msgid "Akhaltsikhe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2476
+#: mapsdatatranslation.cpp:2481
 msgctxt "georgia.kgm"
 msgid "Shida Kartli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2477
+#: mapsdatatranslation.cpp:2482
 msgctxt "georgia.kgm"
 msgid "Gori"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2478
+#: mapsdatatranslation.cpp:2483
 msgctxt "georgia.kgm"
 msgid "Mtskheta-Mtianeti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2479
+#: mapsdatatranslation.cpp:2484
 msgctxt "georgia.kgm"
 msgid "Mtskheta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2480
+#: mapsdatatranslation.cpp:2485
 msgctxt "georgia.kgm"
 msgid "Kvemo Kartli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2481
+#: mapsdatatranslation.cpp:2486
 msgctxt "georgia.kgm"
 msgid "Rustavi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2482
+#: mapsdatatranslation.cpp:2487
 msgctxt "georgia.kgm"
 msgid "Kakheti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2483
+#: mapsdatatranslation.cpp:2488
 msgctxt "georgia.kgm"
 msgid "Telavi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2484 mapsdatatranslation.cpp:2485
+#: mapsdatatranslation.cpp:2489 mapsdatatranslation.cpp:2490
 msgctxt "georgia.kgm"
 msgid "Tbilisi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2486
+#: mapsdatatranslation.cpp:2491
 msgctxt "germany.kgm"
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: mapsdatatranslation.cpp:2487
+#: mapsdatatranslation.cpp:2492
 msgctxt "germany.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2488
+#: mapsdatatranslation.cpp:2493
 msgctxt "germany.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:2489
+#: mapsdatatranslation.cpp:2494
 msgctxt "germany.kgm"
 msgid "Not Germany"
 msgstr "Dim Yr Almaen"
 
-#: mapsdatatranslation.cpp:2490
+#: mapsdatatranslation.cpp:2495
 msgctxt "germany.kgm"
 msgid "Baden-Württemberg"
 msgstr "Baden-Württemberg"
 
-#: mapsdatatranslation.cpp:2491
+#: mapsdatatranslation.cpp:2496
 msgctxt "germany.kgm"
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: mapsdatatranslation.cpp:2492
+#: mapsdatatranslation.cpp:2497
 msgctxt "germany.kgm"
 msgid "Bavaria"
 msgstr "Bayern"
 
-#: mapsdatatranslation.cpp:2493
+#: mapsdatatranslation.cpp:2498
 msgctxt "germany.kgm"
 msgid "Munich"
 msgstr "Munich"
 
-#: mapsdatatranslation.cpp:2494 mapsdatatranslation.cpp:2495
+#: mapsdatatranslation.cpp:2499 mapsdatatranslation.cpp:2500
 msgctxt "germany.kgm"
 msgid "Berlin"
 msgstr "Berlin"
 
-#: mapsdatatranslation.cpp:2496
+#: mapsdatatranslation.cpp:2501
 msgctxt "germany.kgm"
 msgid "Brandenburg"
 msgstr "Brandenburg"
 
-#: mapsdatatranslation.cpp:2497
+#: mapsdatatranslation.cpp:2502
 msgctxt "germany.kgm"
 msgid "Potsdam"
 msgstr "Potsdam"
 
-#: mapsdatatranslation.cpp:2498 mapsdatatranslation.cpp:2499
+#: mapsdatatranslation.cpp:2503 mapsdatatranslation.cpp:2504
 msgctxt "germany.kgm"
 msgid "Bremen"
 msgstr "Bremen"
 
-#: mapsdatatranslation.cpp:2500 mapsdatatranslation.cpp:2501
+#: mapsdatatranslation.cpp:2505 mapsdatatranslation.cpp:2506
 msgctxt "germany.kgm"
 msgid "Hamburg"
 msgstr "Hamburg"
 
-#: mapsdatatranslation.cpp:2502
+#: mapsdatatranslation.cpp:2507
 msgctxt "germany.kgm"
 msgid "Hesse"
 msgstr "Hesse"
 
-#: mapsdatatranslation.cpp:2503
+#: mapsdatatranslation.cpp:2508
 msgctxt "germany.kgm"
 msgid "Wiesbaden"
 msgstr "Wiesbaden"
 
-#: mapsdatatranslation.cpp:2504
+#: mapsdatatranslation.cpp:2509
 msgctxt "germany.kgm"
 msgid "Mecklenburg-Western Pomerania"
 msgstr "Mecklenburg-Western Pomerania"
 
-#: mapsdatatranslation.cpp:2505
+#: mapsdatatranslation.cpp:2510
 msgctxt "germany.kgm"
 msgid "Schwerin"
 msgstr "Schwerin"
 
-#: mapsdatatranslation.cpp:2506
+#: mapsdatatranslation.cpp:2511
 msgctxt "germany.kgm"
 msgid "Lower Saxony"
 msgstr "Lower Saxony"
 
-#: mapsdatatranslation.cpp:2507
+#: mapsdatatranslation.cpp:2512
 msgctxt "germany.kgm"
 msgid "Hanover"
 msgstr "Hanover"
 
-#: mapsdatatranslation.cpp:2508
+#: mapsdatatranslation.cpp:2513
 msgctxt "germany.kgm"
 msgid "North Rhine-Westphalia"
 msgstr "North Rhine-Westphalia"
 
-#: mapsdatatranslation.cpp:2509
+#: mapsdatatranslation.cpp:2514
 msgctxt "germany.kgm"
 msgid "Düsseldorf"
 msgstr "Düsseldorf"
 
-#: mapsdatatranslation.cpp:2510
+#: mapsdatatranslation.cpp:2515
 msgctxt "germany.kgm"
 msgid "Rhineland-Palatinate"
 msgstr "Rhineland-Palatinate"
 
-#: mapsdatatranslation.cpp:2511
+#: mapsdatatranslation.cpp:2516
 msgctxt "germany.kgm"
 msgid "Mainz"
 msgstr "Mainz"
 
-#: mapsdatatranslation.cpp:2512
+#: mapsdatatranslation.cpp:2517
 msgctxt "germany.kgm"
 msgid "Saarland"
 msgstr "Saarland"
 
-#: mapsdatatranslation.cpp:2513
+#: mapsdatatranslation.cpp:2518
 msgctxt "germany.kgm"
 msgid "Saarbrücken"
 msgstr "Saarbrücken"
 
-#: mapsdatatranslation.cpp:2514
+#: mapsdatatranslation.cpp:2519
 msgctxt "germany.kgm"
 msgid "Saxony"
 msgstr "Saxony"
 
-#: mapsdatatranslation.cpp:2515
+#: mapsdatatranslation.cpp:2520
 msgctxt "germany.kgm"
 msgid "Dresden"
 msgstr "Dresden"
 
-#: mapsdatatranslation.cpp:2516
+#: mapsdatatranslation.cpp:2521
 msgctxt "germany.kgm"
 msgid "Saxony-Anhalt"
 msgstr "Saxony-Anhalt"
 
-#: mapsdatatranslation.cpp:2517
+#: mapsdatatranslation.cpp:2522
 msgctxt "germany.kgm"
 msgid "Magdeburg"
 msgstr "Magdeburg"
 
-#: mapsdatatranslation.cpp:2518
+#: mapsdatatranslation.cpp:2523
 msgctxt "germany.kgm"
 msgid "Schleswig-Holstein"
 msgstr "Schleswig-Holstein"
 
-#: mapsdatatranslation.cpp:2519
+#: mapsdatatranslation.cpp:2524
 msgctxt "germany.kgm"
 msgid "Kiel"
 msgstr "Kiel"
 
-#: mapsdatatranslation.cpp:2520
+#: mapsdatatranslation.cpp:2525
 msgctxt "germany.kgm"
 msgid "Thuringia"
 msgstr "Thuringia"
 
-#: mapsdatatranslation.cpp:2521
+#: mapsdatatranslation.cpp:2526
 msgctxt "germany.kgm"
 msgid "Erfurt"
 msgstr "Erfurt"
 
-#: mapsdatatranslation.cpp:2522
+#: mapsdatatranslation.cpp:2527
 msgctxt "goa.kgm"
 msgid "Goa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2523
+#: mapsdatatranslation.cpp:2528
 msgctxt "goa.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2524
+#: mapsdatatranslation.cpp:2529
 msgctxt "goa.kgm"
 msgid "Not Goa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2525
+#: mapsdatatranslation.cpp:2530
 msgctxt "goa.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2526
+#: mapsdatatranslation.cpp:2531
 msgctxt "goa.kgm"
 msgid "Canacona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2527
+#: mapsdatatranslation.cpp:2532
 msgctxt "goa.kgm"
 msgid "Chaudi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2528 mapsdatatranslation.cpp:2529
+#: mapsdatatranslation.cpp:2533 mapsdatatranslation.cpp:2534
 msgctxt "goa.kgm"
 msgid "Quepem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2530
+#: mapsdatatranslation.cpp:2535
 msgctxt "goa.kgm"
 msgid "Mormugao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2531
+#: mapsdatatranslation.cpp:2536
 msgctxt "goa.kgm"
 msgid "Vasco da Gama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2532 mapsdatatranslation.cpp:2533
+#: mapsdatatranslation.cpp:2537 mapsdatatranslation.cpp:2538
 msgctxt "goa.kgm"
 msgid "Sanguem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2534
+#: mapsdatatranslation.cpp:2539
 msgctxt "goa.kgm"
 msgid "Salcette"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2535
+#: mapsdatatranslation.cpp:2540
 msgctxt "goa.kgm"
 msgid "Margao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2536 mapsdatatranslation.cpp:2537
+#: mapsdatatranslation.cpp:2541 mapsdatatranslation.cpp:2542
 msgctxt "goa.kgm"
 msgid "Ponda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2538 mapsdatatranslation.cpp:2539
+#: mapsdatatranslation.cpp:2543 mapsdatatranslation.cpp:2544
 msgctxt "goa.kgm"
 msgid "Pernem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2540
+#: mapsdatatranslation.cpp:2545
 msgctxt "goa.kgm"
 msgid "Bardez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2541
+#: mapsdatatranslation.cpp:2546
 msgctxt "goa.kgm"
 msgid "Mapusa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2542 mapsdatatranslation.cpp:2543
+#: mapsdatatranslation.cpp:2547 mapsdatatranslation.cpp:2548
 msgctxt "goa.kgm"
 msgid "Bicholim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2544
+#: mapsdatatranslation.cpp:2549
 msgctxt "goa.kgm"
 msgid "Tiswadi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2545
+#: mapsdatatranslation.cpp:2550
 msgctxt "goa.kgm"
 msgid "Panjim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2546
+#: mapsdatatranslation.cpp:2551
 msgctxt "goa.kgm"
 msgid "Satari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2547
+#: mapsdatatranslation.cpp:2552
 msgctxt "goa.kgm"
 msgid "Valpoi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2548
+#: mapsdatatranslation.cpp:2553
 msgctxt "great-britain_counties.kgm"
 msgid "Great-Britain (Counties)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2549
+#: mapsdatatranslation.cpp:2554
 msgctxt "great-britain_counties.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2550
+#: mapsdatatranslation.cpp:2555
 msgctxt "great-britain_counties.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2551
+#: mapsdatatranslation.cpp:2556
 msgctxt "great-britain_counties.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2552
+#: mapsdatatranslation.cpp:2557
 msgctxt "great-britain_counties.kgm"
 msgid "Not Great-Britain (Counties)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2553
+#: mapsdatatranslation.cpp:2558
 msgctxt "great-britain_counties.kgm"
 msgid "Shetland islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2554
+#: mapsdatatranslation.cpp:2559
 msgctxt "great-britain_counties.kgm"
 msgid "Lerwick"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2555
+#: mapsdatatranslation.cpp:2560
 msgctxt "great-britain_counties.kgm"
 msgid "Orkney"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2556
+#: mapsdatatranslation.cpp:2561
 msgctxt "great-britain_counties.kgm"
 msgid "Kirkwall"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2557
+#: mapsdatatranslation.cpp:2562
 msgctxt "great-britain_counties.kgm"
 msgid "Caithness"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2558
+#: mapsdatatranslation.cpp:2563
 msgctxt "great-britain_counties.kgm"
 msgid "Wick"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2559
+#: mapsdatatranslation.cpp:2564
 msgctxt "great-britain_counties.kgm"
 msgid "Sutherland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2560
+#: mapsdatatranslation.cpp:2565
 msgctxt "great-britain_counties.kgm"
 msgid "Dornoch"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2561
+#: mapsdatatranslation.cpp:2566
 msgctxt "great-britain_counties.kgm"
 msgid "Ross-shire and Cromarty"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2562
+#: mapsdatatranslation.cpp:2567
 msgctxt "great-britain_counties.kgm"
 msgid "Dingwall"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2563
+#: mapsdatatranslation.cpp:2568
 msgctxt "great-britain_counties.kgm"
 msgid "Inverness-shire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2564
+#: mapsdatatranslation.cpp:2569
 msgctxt "great-britain_counties.kgm"
 msgid "Inverness"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2565
+#: mapsdatatranslation.cpp:2570
 msgctxt "great-britain_counties.kgm"
 msgid "Nairnshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2566
+#: mapsdatatranslation.cpp:2571
 msgctxt "great-britain_counties.kgm"
 msgid "Nairn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2567
+#: mapsdatatranslation.cpp:2572
 msgctxt "great-britain_counties.kgm"
 msgid "Morayshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2568
+#: mapsdatatranslation.cpp:2573
 msgctxt "great-britain_counties.kgm"
 msgid "Elgin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2569
+#: mapsdatatranslation.cpp:2574
 msgctxt "great-britain_counties.kgm"
 msgid "Banffshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2570
+#: mapsdatatranslation.cpp:2575
 msgctxt "great-britain_counties.kgm"
 msgid "Banff"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2571
+#: mapsdatatranslation.cpp:2576
 msgctxt "great-britain_counties.kgm"
 msgid "Aberdeenshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2572
+#: mapsdatatranslation.cpp:2577
 msgctxt "great-britain_counties.kgm"
 msgid "Aberdeen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2573
+#: mapsdatatranslation.cpp:2578
 msgctxt "great-britain_counties.kgm"
 msgid "Kincardineshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2574
+#: mapsdatatranslation.cpp:2579
 msgctxt "great-britain_counties.kgm"
 msgid "Stonehaven"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2575
+#: mapsdatatranslation.cpp:2580
 msgctxt "great-britain_counties.kgm"
 msgid "Angus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2576
+#: mapsdatatranslation.cpp:2581
 msgctxt "great-britain_counties.kgm"
 msgid "Forfar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2577
+#: mapsdatatranslation.cpp:2582
 msgctxt "great-britain_counties.kgm"
 msgid "Perthshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2578
+#: mapsdatatranslation.cpp:2583
 msgctxt "great-britain_counties.kgm"
 msgid "Perth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2579
+#: mapsdatatranslation.cpp:2584
 msgctxt "great-britain_counties.kgm"
 msgid "Argyllshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2580
+#: mapsdatatranslation.cpp:2585
 msgctxt "great-britain_counties.kgm"
 msgid "Inveraray"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2581
+#: mapsdatatranslation.cpp:2586
 msgctxt "great-britain_counties.kgm"
 msgid "Dumbartonshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2582
+#: mapsdatatranslation.cpp:2587
 msgctxt "great-britain_counties.kgm"
 msgid "Dumbarton"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2583
+#: mapsdatatranslation.cpp:2588
 msgctxt "great-britain_counties.kgm"
 msgid "Stirlingshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2584
+#: mapsdatatranslation.cpp:2589
 msgctxt "great-britain_counties.kgm"
 msgid "Stirling"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2585
+#: mapsdatatranslation.cpp:2590
 msgctxt "great-britain_counties.kgm"
 msgid "Clackmannanshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2586
+#: mapsdatatranslation.cpp:2591
 msgctxt "great-britain_counties.kgm"
 msgid "Alloa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2587
+#: mapsdatatranslation.cpp:2592
 msgctxt "great-britain_counties.kgm"
 msgid "Kinross-shire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2588
+#: mapsdatatranslation.cpp:2593
 msgctxt "great-britain_counties.kgm"
 msgid "Kinross"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2589
+#: mapsdatatranslation.cpp:2594
 msgctxt "great-britain_counties.kgm"
 msgid "Fife"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2590
+#: mapsdatatranslation.cpp:2595
 msgctxt "great-britain_counties.kgm"
 msgid "Glenrothes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2591
+#: mapsdatatranslation.cpp:2596
 msgctxt "great-britain_counties.kgm"
 msgid "East Lothian"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2592
+#: mapsdatatranslation.cpp:2597
 msgctxt "great-britain_counties.kgm"
 msgid "Haddington"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2593
+#: mapsdatatranslation.cpp:2598
 msgctxt "great-britain_counties.kgm"
 msgid "Midlothian"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2594
+#: mapsdatatranslation.cpp:2599
 msgctxt "great-britain_counties.kgm"
 msgid "Dalkeith"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2595
+#: mapsdatatranslation.cpp:2600
 msgctxt "great-britain_counties.kgm"
 msgid "West Lothian"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2596
+#: mapsdatatranslation.cpp:2601
 msgctxt "great-britain_counties.kgm"
 msgid "Livingston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2597
+#: mapsdatatranslation.cpp:2602
 msgctxt "great-britain_counties.kgm"
 msgid "Lanarkshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2598
+#: mapsdatatranslation.cpp:2603
 msgctxt "great-britain_counties.kgm"
 msgid "Lanark"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2599
+#: mapsdatatranslation.cpp:2604
 msgctxt "great-britain_counties.kgm"
 msgid "Renfrewshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2600
+#: mapsdatatranslation.cpp:2605
 msgctxt "great-britain_counties.kgm"
 msgid "Paisley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2601
+#: mapsdatatranslation.cpp:2606
 msgctxt "great-britain_counties.kgm"
 msgid "Ayrshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2602
+#: mapsdatatranslation.cpp:2607
 msgctxt "great-britain_counties.kgm"
 msgid "Ayr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2603
+#: mapsdatatranslation.cpp:2608
 msgctxt "great-britain_counties.kgm"
 msgid "Buteshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2604
+#: mapsdatatranslation.cpp:2609
 msgctxt "great-britain_counties.kgm"
 msgid "Rothesay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2605
+#: mapsdatatranslation.cpp:2610
 msgctxt "great-britain_counties.kgm"
 msgid "Wigtownshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2606
+#: mapsdatatranslation.cpp:2611
 msgctxt "great-britain_counties.kgm"
 msgid "Wigtown"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2607
+#: mapsdatatranslation.cpp:2612
 msgctxt "great-britain_counties.kgm"
 msgid "Kirkcudbrightshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2608
+#: mapsdatatranslation.cpp:2613
 msgctxt "great-britain_counties.kgm"
 msgid "Kirkcudbright"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2609
+#: mapsdatatranslation.cpp:2614
 msgctxt "great-britain_counties.kgm"
 msgid "Dumfriesshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2610
+#: mapsdatatranslation.cpp:2615
 msgctxt "great-britain_counties.kgm"
 msgid "Dumfries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2611
+#: mapsdatatranslation.cpp:2616
 msgctxt "great-britain_counties.kgm"
 msgid "Peeblesshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2612
+#: mapsdatatranslation.cpp:2617
 msgctxt "great-britain_counties.kgm"
 msgid "Peebles"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2613
+#: mapsdatatranslation.cpp:2618
 msgctxt "great-britain_counties.kgm"
 msgid "Selkirkshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2614
+#: mapsdatatranslation.cpp:2619
 msgctxt "great-britain_counties.kgm"
 msgid "Selkirk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2615
+#: mapsdatatranslation.cpp:2620
 msgctxt "great-britain_counties.kgm"
 msgid "Roxburghshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2616
+#: mapsdatatranslation.cpp:2621
 msgctxt "great-britain_counties.kgm"
 msgid "Roxburgh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2617
+#: mapsdatatranslation.cpp:2622
 msgctxt "great-britain_counties.kgm"
 msgid "Berwickshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2618
+#: mapsdatatranslation.cpp:2623
 msgctxt "great-britain_counties.kgm"
 msgid "Berwick"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2619
+#: mapsdatatranslation.cpp:2624
 msgctxt "great-britain_counties.kgm"
 msgid "Northumberland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2620
+#: mapsdatatranslation.cpp:2625
 msgctxt "great-britain_counties.kgm"
 msgid "Morpeth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2621
+#: mapsdatatranslation.cpp:2626
 msgctxt "great-britain_counties.kgm"
 msgid "Cumberland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2622
+#: mapsdatatranslation.cpp:2627
 msgctxt "great-britain_counties.kgm"
 msgid "Carlisle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2623 mapsdatatranslation.cpp:2624
+#: mapsdatatranslation.cpp:2628 mapsdatatranslation.cpp:2629
 msgctxt "great-britain_counties.kgm"
 msgid "Durham"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2625
+#: mapsdatatranslation.cpp:2630
 msgctxt "great-britain_counties.kgm"
 msgid "Westmorland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2626
+#: mapsdatatranslation.cpp:2631
 msgctxt "great-britain_counties.kgm"
 msgid "Appleby-in-Westmorland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2627
+#: mapsdatatranslation.cpp:2632
 msgctxt "great-britain_counties.kgm"
 msgid "Lancashire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2628
+#: mapsdatatranslation.cpp:2633
 msgctxt "great-britain_counties.kgm"
 msgid "Preston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2629
+#: mapsdatatranslation.cpp:2634
 msgctxt "great-britain_counties.kgm"
 msgid "Yorkshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2630
+#: mapsdatatranslation.cpp:2635
 msgctxt "great-britain_counties.kgm"
 msgid "York"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2631
+#: mapsdatatranslation.cpp:2636
 msgctxt "great-britain_counties.kgm"
 msgid "Lincolnshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2632
+#: mapsdatatranslation.cpp:2637
 msgctxt "great-britain_counties.kgm"
 msgid "Lincoln"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2633
+#: mapsdatatranslation.cpp:2638
 msgctxt "great-britain_counties.kgm"
 msgid "Nottinghamshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2634
+#: mapsdatatranslation.cpp:2639
 msgctxt "great-britain_counties.kgm"
 msgid "West Bridgford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2635
+#: mapsdatatranslation.cpp:2640
 msgctxt "great-britain_counties.kgm"
 msgid "Derbyshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2636
+#: mapsdatatranslation.cpp:2641
 msgctxt "great-britain_counties.kgm"
 msgid "Matlock"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2637
+#: mapsdatatranslation.cpp:2642
 msgctxt "great-britain_counties.kgm"
 msgid "Cheshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2638
+#: mapsdatatranslation.cpp:2643
 msgctxt "great-britain_counties.kgm"
 msgid "Chester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2639
+#: mapsdatatranslation.cpp:2644
 msgctxt "great-britain_counties.kgm"
 msgid "Shropshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2640
+#: mapsdatatranslation.cpp:2645
 msgctxt "great-britain_counties.kgm"
 msgid "Shrewbury"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2641
+#: mapsdatatranslation.cpp:2646
 msgctxt "great-britain_counties.kgm"
 msgid "Staffordshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2642
+#: mapsdatatranslation.cpp:2647
 msgctxt "great-britain_counties.kgm"
 msgid "Stafford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2643
+#: mapsdatatranslation.cpp:2648
 msgctxt "great-britain_counties.kgm"
 msgid "Leicestershire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2644
+#: mapsdatatranslation.cpp:2649
 msgctxt "great-britain_counties.kgm"
 msgid "Glenfield"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2645
+#: mapsdatatranslation.cpp:2650
 msgctxt "great-britain_counties.kgm"
 msgid "Rutland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2646
+#: mapsdatatranslation.cpp:2651
 msgctxt "great-britain_counties.kgm"
 msgid "Oakham"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2647
+#: mapsdatatranslation.cpp:2652
 msgctxt "great-britain_counties.kgm"
 msgid "Northamptonshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2648
+#: mapsdatatranslation.cpp:2653
 msgctxt "great-britain_counties.kgm"
 msgid "Northampton"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2649
+#: mapsdatatranslation.cpp:2654
 msgctxt "great-britain_counties.kgm"
 msgid "Huntingdonshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2650
+#: mapsdatatranslation.cpp:2655
 msgctxt "great-britain_counties.kgm"
 msgid "Huntingdon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2651
+#: mapsdatatranslation.cpp:2656
 msgctxt "great-britain_counties.kgm"
 msgid "Cambridgeshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2652
+#: mapsdatatranslation.cpp:2657
 msgctxt "great-britain_counties.kgm"
 msgid "Cambridge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2653
+#: mapsdatatranslation.cpp:2658
 msgctxt "great-britain_counties.kgm"
 msgid "Norfolk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2654
+#: mapsdatatranslation.cpp:2659
 msgctxt "great-britain_counties.kgm"
 msgid "Norwich"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2655
+#: mapsdatatranslation.cpp:2660
 msgctxt "great-britain_counties.kgm"
 msgid "Suffolk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2656
+#: mapsdatatranslation.cpp:2661
 msgctxt "great-britain_counties.kgm"
 msgid "Ipswich"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2657
+#: mapsdatatranslation.cpp:2662
 msgctxt "great-britain_counties.kgm"
 msgid "Essex"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2658
+#: mapsdatatranslation.cpp:2663
 msgctxt "great-britain_counties.kgm"
 msgid "Chelmsford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2659
+#: mapsdatatranslation.cpp:2664
 msgctxt "great-britain_counties.kgm"
 msgid "Kent"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2660
+#: mapsdatatranslation.cpp:2665
 msgctxt "great-britain_counties.kgm"
 msgid "Maidstone"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2661
+#: mapsdatatranslation.cpp:2666
 msgctxt "great-britain_counties.kgm"
 msgid "Sussex"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2662
+#: mapsdatatranslation.cpp:2667
 msgctxt "great-britain_counties.kgm"
 msgid "Chichester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2663
+#: mapsdatatranslation.cpp:2668
 msgctxt "great-britain_counties.kgm"
 msgid "Surrey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2664
+#: mapsdatatranslation.cpp:2669
 msgctxt "great-britain_counties.kgm"
 msgid "Kingston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2665
+#: mapsdatatranslation.cpp:2670
 msgctxt "great-britain_counties.kgm"
 msgid "Middlesex"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2666
+#: mapsdatatranslation.cpp:2671
 msgctxt "great-britain_counties.kgm"
 msgid "London"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2667
+#: mapsdatatranslation.cpp:2672
 msgctxt "great-britain_counties.kgm"
 msgid "Hertfordshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2668
+#: mapsdatatranslation.cpp:2673
 msgctxt "great-britain_counties.kgm"
 msgid "Hertford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2669
+#: mapsdatatranslation.cpp:2674
 msgctxt "great-britain_counties.kgm"
 msgid "Bedfordshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2670
+#: mapsdatatranslation.cpp:2675
 msgctxt "great-britain_counties.kgm"
 msgid "Bedford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2671
+#: mapsdatatranslation.cpp:2676
 msgctxt "great-britain_counties.kgm"
 msgid "Buckinghamshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2672
+#: mapsdatatranslation.cpp:2677
 msgctxt "great-britain_counties.kgm"
 msgid "Aylesbury"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2673
+#: mapsdatatranslation.cpp:2678
 msgctxt "great-britain_counties.kgm"
 msgid "Oxfordshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2674
+#: mapsdatatranslation.cpp:2679
 msgctxt "great-britain_counties.kgm"
 msgid "Oxford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2675
+#: mapsdatatranslation.cpp:2680
 msgctxt "great-britain_counties.kgm"
 msgid "Berkshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2676
+#: mapsdatatranslation.cpp:2681
 msgctxt "great-britain_counties.kgm"
 msgid "Reading"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2677
+#: mapsdatatranslation.cpp:2682
 msgctxt "great-britain_counties.kgm"
 msgid "Hampshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2678
+#: mapsdatatranslation.cpp:2683
 msgctxt "great-britain_counties.kgm"
 msgid "Winchester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2679
+#: mapsdatatranslation.cpp:2684
 msgctxt "great-britain_counties.kgm"
 msgid "Dorset"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2680
+#: mapsdatatranslation.cpp:2685
 msgctxt "great-britain_counties.kgm"
 msgid "Dorchester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2681
+#: mapsdatatranslation.cpp:2686
 msgctxt "great-britain_counties.kgm"
 msgid "Devon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2682
+#: mapsdatatranslation.cpp:2687
 msgctxt "great-britain_counties.kgm"
 msgid "Exeter"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2683
+#: mapsdatatranslation.cpp:2688
 msgctxt "great-britain_counties.kgm"
 msgid "Cornwall"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2684
+#: mapsdatatranslation.cpp:2689
 msgctxt "great-britain_counties.kgm"
 msgid "Truro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2685
+#: mapsdatatranslation.cpp:2690
 msgctxt "great-britain_counties.kgm"
 msgid "Somerset"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2686
+#: mapsdatatranslation.cpp:2691
 msgctxt "great-britain_counties.kgm"
 msgid "Taunton"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2687
+#: mapsdatatranslation.cpp:2692
 msgctxt "great-britain_counties.kgm"
 msgid "Wiltshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2688
+#: mapsdatatranslation.cpp:2693
 msgctxt "great-britain_counties.kgm"
 msgid "Trowbridge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2689
+#: mapsdatatranslation.cpp:2694
 msgctxt "great-britain_counties.kgm"
 msgid "Gloucestershire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2690
+#: mapsdatatranslation.cpp:2695
 msgctxt "great-britain_counties.kgm"
 msgid "Gloucester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2691
+#: mapsdatatranslation.cpp:2696
 msgctxt "great-britain_counties.kgm"
 msgid "Warwickshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2692
+#: mapsdatatranslation.cpp:2697
 msgctxt "great-britain_counties.kgm"
 msgid "Warwick"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2693 mapsdatatranslation.cpp:2694
+#: mapsdatatranslation.cpp:2698
+msgctxt "great-britain_counties.kgm"
+msgid "Worcestershire"
+msgstr ""
+
+#: mapsdatatranslation.cpp:2699
 msgctxt "great-britain_counties.kgm"
 msgid "Worcester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2695
+#: mapsdatatranslation.cpp:2700
 msgctxt "great-britain_counties.kgm"
 msgid "Herefordshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2696
+#: mapsdatatranslation.cpp:2701
 msgctxt "great-britain_counties.kgm"
 msgid "Hereford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2697
+#: mapsdatatranslation.cpp:2702
 msgctxt "great-britain_counties.kgm"
 msgid "Monmouthshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2698
+#: mapsdatatranslation.cpp:2703
 msgctxt "great-britain_counties.kgm"
 msgid "Monmouth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2699
+#: mapsdatatranslation.cpp:2704
 msgctxt "great-britain_counties.kgm"
 msgid "Glamorgan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2700
+#: mapsdatatranslation.cpp:2705
 msgctxt "great-britain_counties.kgm"
 msgid "Cardiff"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2701
+#: mapsdatatranslation.cpp:2706
 msgctxt "great-britain_counties.kgm"
 msgid "Carmarthenshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2702
+#: mapsdatatranslation.cpp:2707
 msgctxt "great-britain_counties.kgm"
 msgid "Llanelli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2703
+#: mapsdatatranslation.cpp:2708
 msgctxt "great-britain_counties.kgm"
 msgid "Pembrokeshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2704
+#: mapsdatatranslation.cpp:2709
 msgctxt "great-britain_counties.kgm"
 msgid "Haverfordwest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2705
+#: mapsdatatranslation.cpp:2710
 msgctxt "great-britain_counties.kgm"
 msgid "Cardiganshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2706
+#: mapsdatatranslation.cpp:2711
 msgctxt "great-britain_counties.kgm"
 msgid "Cardigan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2707
+#: mapsdatatranslation.cpp:2712
 msgctxt "great-britain_counties.kgm"
 msgid "Brecknockshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2708
+#: mapsdatatranslation.cpp:2713
 msgctxt "great-britain_counties.kgm"
 msgid "Brecon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2709
+#: mapsdatatranslation.cpp:2714
 msgctxt "great-britain_counties.kgm"
 msgid "Radnorshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2710
+#: mapsdatatranslation.cpp:2715
 msgctxt "great-britain_counties.kgm"
 msgid "New Radnor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2711
+#: mapsdatatranslation.cpp:2716
 msgctxt "great-britain_counties.kgm"
 msgid "Montgomeryshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2712
+#: mapsdatatranslation.cpp:2717
 msgctxt "great-britain_counties.kgm"
 msgid "Montgomery"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2713
+#: mapsdatatranslation.cpp:2718
 msgctxt "great-britain_counties.kgm"
 msgid "Merionethshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2714
+#: mapsdatatranslation.cpp:2719
 msgctxt "great-britain_counties.kgm"
 msgid "Dolgellau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2715
+#: mapsdatatranslation.cpp:2720
 msgctxt "great-britain_counties.kgm"
 msgid "Caernarfonshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2716
+#: mapsdatatranslation.cpp:2721
 msgctxt "great-britain_counties.kgm"
 msgid "Caernarfon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2717
+#: mapsdatatranslation.cpp:2722
 msgctxt "great-britain_counties.kgm"
 msgid "Anglesey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2718
+#: mapsdatatranslation.cpp:2723
 msgctxt "great-britain_counties.kgm"
 msgid "Holyhead"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2719
+#: mapsdatatranslation.cpp:2724
 msgctxt "great-britain_counties.kgm"
 msgid "Denbighshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2720
+#: mapsdatatranslation.cpp:2725
 msgctxt "great-britain_counties.kgm"
 msgid "Denbigh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2721
+#: mapsdatatranslation.cpp:2726
 msgctxt "great-britain_counties.kgm"
 msgid "Flintshire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2722
+#: mapsdatatranslation.cpp:2727
 msgctxt "great-britain_counties.kgm"
 msgid "Mold"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2723
+#: mapsdatatranslation.cpp:2728
 msgctxt "greece.kgm"
 msgid "Greece"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2724
+#: mapsdatatranslation.cpp:2729
 msgctxt "greece.kgm"
 msgid "Peripheries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2725 mapsdatatranslation.cpp:2726
+#: mapsdatatranslation.cpp:2730 mapsdatatranslation.cpp:2731
 msgctxt "greece.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2727
+#: mapsdatatranslation.cpp:2732
 msgctxt "greece.kgm"
 msgid "Aegean Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2728
+#: mapsdatatranslation.cpp:2733
 msgctxt "greece.kgm"
 msgid "Balkans"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2729
+#: mapsdatatranslation.cpp:2734
 msgctxt "greece.kgm"
 msgid "Sea of Crete"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2730
+#: mapsdatatranslation.cpp:2735
 msgctxt "greece.kgm"
 msgid "Ionian Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2731
+#: mapsdatatranslation.cpp:2736
 msgctxt "greece.kgm"
 msgid "Mediterranean Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2732
+#: mapsdatatranslation.cpp:2737
 msgctxt "greece.kgm"
 msgid "Not Greece"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2733
+#: mapsdatatranslation.cpp:2738
 msgctxt "greece.kgm"
 msgid "Attica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2734
+#: mapsdatatranslation.cpp:2739
 msgctxt "greece.kgm"
 msgid "Athens"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2735
+#: mapsdatatranslation.cpp:2740
 msgctxt "greece.kgm"
 msgid "Central Greece"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2736
+#: mapsdatatranslation.cpp:2741
 msgctxt "greece.kgm"
 msgid "Lamia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2737
+#: mapsdatatranslation.cpp:2742
 msgctxt "greece.kgm"
 msgid "Central Macedonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2738
+#: mapsdatatranslation.cpp:2743
 msgctxt "greece.kgm"
 msgid "Thessaloniki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2739
+#: mapsdatatranslation.cpp:2744
 msgctxt "greece.kgm"
 msgid "Crete"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2740
+#: mapsdatatranslation.cpp:2745
 msgctxt "greece.kgm"
 msgid "Heraklion"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2741
+#: mapsdatatranslation.cpp:2746
 msgctxt "greece.kgm"
 msgid "East Macedonia and Thrace"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2742
+#: mapsdatatranslation.cpp:2747
 msgctxt "greece.kgm"
 msgid "Komotini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2743
+#: mapsdatatranslation.cpp:2748
 msgctxt "greece.kgm"
 msgid "Epirus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2744
+#: mapsdatatranslation.cpp:2749
 msgctxt "greece.kgm"
 msgid "Ioannina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2745
+#: mapsdatatranslation.cpp:2750
 msgctxt "greece.kgm"
 msgid "Ionian Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2746
+#: mapsdatatranslation.cpp:2751
 msgctxt "greece.kgm"
 msgid "Corfu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2747
+#: mapsdatatranslation.cpp:2752
 msgctxt "greece.kgm"
 msgid "North Aegean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2748
+#: mapsdatatranslation.cpp:2753
 msgctxt "greece.kgm"
 msgid "Mytilene"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2749
+#: mapsdatatranslation.cpp:2754
 msgctxt "greece.kgm"
 msgid "Peloponnese"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2750
+#: mapsdatatranslation.cpp:2755
 msgctxt "greece.kgm"
 msgid "Tripoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2751
+#: mapsdatatranslation.cpp:2756
 msgctxt "greece.kgm"
 msgid "South Aegean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2752
+#: mapsdatatranslation.cpp:2757
 msgctxt "greece.kgm"
 msgid "Ermoupoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2753
+#: mapsdatatranslation.cpp:2758
 msgctxt "greece.kgm"
 msgid "Thessaly"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2754
+#: mapsdatatranslation.cpp:2759
 msgctxt "greece.kgm"
 msgid "Larissa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2755
+#: mapsdatatranslation.cpp:2760
 msgctxt "greece.kgm"
 msgid "West Greece"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2756
+#: mapsdatatranslation.cpp:2761
 msgctxt "greece.kgm"
 msgid "Patras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2757
+#: mapsdatatranslation.cpp:2762
 msgctxt "greece.kgm"
 msgid "West Macedonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2758
+#: mapsdatatranslation.cpp:2763
 msgctxt "greece.kgm"
 msgid "Kozani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2759
+#: mapsdatatranslation.cpp:2764
 msgctxt "greece.kgm"
 msgid "Mount Athos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2760
+#: mapsdatatranslation.cpp:2765
 msgctxt "greece.kgm"
 msgid "Karyes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2761
+#: mapsdatatranslation.cpp:2766
 msgctxt "greece_peripheries.kgm"
 msgid "Greece (Peripheries)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2762
+#: mapsdatatranslation.cpp:2767
 msgctxt "greece_peripheries.kgm"
 msgid "Peripheries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2763
+#: mapsdatatranslation.cpp:2768
 msgctxt "greece_peripheries.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2764
+#: mapsdatatranslation.cpp:2769
 msgctxt "greece_peripheries.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2765
+#: mapsdatatranslation.cpp:2770
 msgctxt "greece_peripheries.kgm"
 msgid "Not Greece (Peripheries)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2766
+#: mapsdatatranslation.cpp:2771
 msgctxt "greece_peripheries.kgm"
 msgid "Eastern Macedonia and Thrace"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2767
+#: mapsdatatranslation.cpp:2772
 msgctxt "greece_peripheries.kgm"
 msgid "Komotini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2768
+#: mapsdatatranslation.cpp:2773
 msgctxt "greece_peripheries.kgm"
 msgid "Central Macedonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2769
+#: mapsdatatranslation.cpp:2774
 msgctxt "greece_peripheries.kgm"
 msgid "Thessaloniki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2770
+#: mapsdatatranslation.cpp:2775
 msgctxt "greece_peripheries.kgm"
 msgid "West Macedonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2771
+#: mapsdatatranslation.cpp:2776
 msgctxt "greece_peripheries.kgm"
 msgid "Kozani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2772
+#: mapsdatatranslation.cpp:2777
 msgctxt "greece_peripheries.kgm"
 msgid "Ionian Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2773
+#: mapsdatatranslation.cpp:2778
 msgctxt "greece_peripheries.kgm"
 msgid "Corfu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2774
+#: mapsdatatranslation.cpp:2779
 msgctxt "greece_peripheries.kgm"
 msgid "Epirus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2775
+#: mapsdatatranslation.cpp:2780
 msgctxt "greece_peripheries.kgm"
 msgid "Ioannina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2776
+#: mapsdatatranslation.cpp:2781
 msgctxt "greece_peripheries.kgm"
 msgid "West Greece"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2777
+#: mapsdatatranslation.cpp:2782
 msgctxt "greece_peripheries.kgm"
 msgid "Patra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2778
+#: mapsdatatranslation.cpp:2783
 msgctxt "greece_peripheries.kgm"
 msgid "Thessaly"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2779
+#: mapsdatatranslation.cpp:2784
 msgctxt "greece_peripheries.kgm"
 msgid "Larisa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2780
+#: mapsdatatranslation.cpp:2785
 msgctxt "greece_peripheries.kgm"
 msgid "Central Greece"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2781
+#: mapsdatatranslation.cpp:2786
 msgctxt "greece_peripheries.kgm"
 msgid "Lamia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2782
+#: mapsdatatranslation.cpp:2787
 msgctxt "greece_peripheries.kgm"
 msgid "Attica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2783
+#: mapsdatatranslation.cpp:2788
 msgctxt "greece_peripheries.kgm"
 msgid "Athens"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2784
+#: mapsdatatranslation.cpp:2789
 msgctxt "greece_peripheries.kgm"
 msgid "Peloponnese"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2785
+#: mapsdatatranslation.cpp:2790
 msgctxt "greece_peripheries.kgm"
 msgid "Tripoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2786
+#: mapsdatatranslation.cpp:2791
 msgctxt "greece_peripheries.kgm"
 msgid "North Aegean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2787
+#: mapsdatatranslation.cpp:2792
 msgctxt "greece_peripheries.kgm"
 msgid "Mytilene"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2788
+#: mapsdatatranslation.cpp:2793
 msgctxt "greece_peripheries.kgm"
 msgid "South Aegean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2789
+#: mapsdatatranslation.cpp:2794
 msgctxt "greece_peripheries.kgm"
 msgid "Ermoupoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2790
+#: mapsdatatranslation.cpp:2795
 msgctxt "greece_peripheries.kgm"
 msgid "Crete"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2791
+#: mapsdatatranslation.cpp:2796
 msgctxt "greece_peripheries.kgm"
 msgid "Iraklio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2792
+#: mapsdatatranslation.cpp:2797
 msgctxt "greece_peripheries.kgm"
 msgid "Mont Athos autonomous region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2793
+#: mapsdatatranslation.cpp:2798
 msgctxt "greece_peripheries.kgm"
 msgid "Karyes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2794
+#: mapsdatatranslation.cpp:2799
 msgctxt "greece_prefectures.kgm"
 msgid "Greece (Prefectures)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2795
+#: mapsdatatranslation.cpp:2800
 msgctxt "greece_prefectures.kgm"
 msgid "Prefectures"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2796
+#: mapsdatatranslation.cpp:2801
 msgctxt "greece_prefectures.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2797
+#: mapsdatatranslation.cpp:2802
 msgctxt "greece_prefectures.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2798
+#: mapsdatatranslation.cpp:2803
 msgctxt "greece_prefectures.kgm"
 msgid "Not Greece (Prefectures)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2799 mapsdatatranslation.cpp:2800
+#: mapsdatatranslation.cpp:2804 mapsdatatranslation.cpp:2805
 msgctxt "greece_prefectures.kgm"
 msgid "Drama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2801
+#: mapsdatatranslation.cpp:2806
 msgctxt "greece_prefectures.kgm"
 msgid "Evros"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2802
+#: mapsdatatranslation.cpp:2807
 msgctxt "greece_prefectures.kgm"
 msgid "Alexandroupolis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2803 mapsdatatranslation.cpp:2804
+#: mapsdatatranslation.cpp:2808 mapsdatatranslation.cpp:2809
 msgctxt "greece_prefectures.kgm"
 msgid "Kavala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2805
+#: mapsdatatranslation.cpp:2810
 msgctxt "greece_prefectures.kgm"
 msgid "Rodopi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2806
+#: mapsdatatranslation.cpp:2811
 msgctxt "greece_prefectures.kgm"
 msgid "Komotini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2807 mapsdatatranslation.cpp:2808
+#: mapsdatatranslation.cpp:2812 mapsdatatranslation.cpp:2813
 msgctxt "greece_prefectures.kgm"
 msgid "Xanthi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2809
+#: mapsdatatranslation.cpp:2814
 msgctxt "greece_prefectures.kgm"
 msgid "Chalcidice"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2810
+#: mapsdatatranslation.cpp:2815
 msgctxt "greece_prefectures.kgm"
 msgid "Polygyros"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2811
+#: mapsdatatranslation.cpp:2816
 msgctxt "greece_prefectures.kgm"
 msgid "Imathia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2812
+#: mapsdatatranslation.cpp:2817
 msgctxt "greece_prefectures.kgm"
 msgid "Veria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2813 mapsdatatranslation.cpp:2814
+#: mapsdatatranslation.cpp:2818 mapsdatatranslation.cpp:2819
 msgctxt "greece_prefectures.kgm"
 msgid "Kilkis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2815
+#: mapsdatatranslation.cpp:2820
 msgctxt "greece_prefectures.kgm"
 msgid "Pella"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2816
+#: mapsdatatranslation.cpp:2821
 msgctxt "greece_prefectures.kgm"
 msgid "Edhessa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2817
+#: mapsdatatranslation.cpp:2822
 msgctxt "greece_prefectures.kgm"
 msgid "Pieria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2818
+#: mapsdatatranslation.cpp:2823
 msgctxt "greece_prefectures.kgm"
 msgid "Katerini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2819 mapsdatatranslation.cpp:2820
+#: mapsdatatranslation.cpp:2824 mapsdatatranslation.cpp:2825
 msgctxt "greece_prefectures.kgm"
 msgid "Serres"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2821 mapsdatatranslation.cpp:2822
+#: mapsdatatranslation.cpp:2826 mapsdatatranslation.cpp:2827
 msgctxt "greece_prefectures.kgm"
 msgid "Thessaloniki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2823 mapsdatatranslation.cpp:2824
+#: mapsdatatranslation.cpp:2828 mapsdatatranslation.cpp:2829
 msgctxt "greece_prefectures.kgm"
 msgid "Florina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2825 mapsdatatranslation.cpp:2826
+#: mapsdatatranslation.cpp:2830 mapsdatatranslation.cpp:2831
 msgctxt "greece_prefectures.kgm"
 msgid "Grevena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2827 mapsdatatranslation.cpp:2828
+#: mapsdatatranslation.cpp:2832 mapsdatatranslation.cpp:2833
 msgctxt "greece_prefectures.kgm"
 msgid "Kastoria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2829 mapsdatatranslation.cpp:2830
+#: mapsdatatranslation.cpp:2834 mapsdatatranslation.cpp:2835
 msgctxt "greece_prefectures.kgm"
 msgid "Kozani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2831
+#: mapsdatatranslation.cpp:2836 mapsdatatranslation.cpp:2837
 msgctxt "greece_prefectures.kgm"
 msgid "Arta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2832
-msgctxt "greece_prefectures.kgm"
-msgid "arta"
-msgstr ""
-
-#: mapsdatatranslation.cpp:2833 mapsdatatranslation.cpp:2834
+#: mapsdatatranslation.cpp:2838 mapsdatatranslation.cpp:2839
 msgctxt "greece_prefectures.kgm"
 msgid "Ioannina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2835 mapsdatatranslation.cpp:2836
+#: mapsdatatranslation.cpp:2840 mapsdatatranslation.cpp:2841
 msgctxt "greece_prefectures.kgm"
 msgid "Preveza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2837
+#: mapsdatatranslation.cpp:2842
 msgctxt "greece_prefectures.kgm"
 msgid "Thresprotia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2838
+#: mapsdatatranslation.cpp:2843
 msgctxt "greece_prefectures.kgm"
 msgid "Igoumenitsa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2839 mapsdatatranslation.cpp:2840
+#: mapsdatatranslation.cpp:2844 mapsdatatranslation.cpp:2845
 msgctxt "greece_prefectures.kgm"
 msgid "Karditsa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2841 mapsdatatranslation.cpp:2842
+#: mapsdatatranslation.cpp:2846 mapsdatatranslation.cpp:2847
 msgctxt "greece_prefectures.kgm"
 msgid "Larisa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2843
+#: mapsdatatranslation.cpp:2848
 msgctxt "greece_prefectures.kgm"
 msgid "Magnesia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2844
+#: mapsdatatranslation.cpp:2849
 msgctxt "greece_prefectures.kgm"
 msgid "Volos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2845 mapsdatatranslation.cpp:2846
+#: mapsdatatranslation.cpp:2850 mapsdatatranslation.cpp:2851
 msgctxt "greece_prefectures.kgm"
 msgid "Trikala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2847 mapsdatatranslation.cpp:2848
+#: mapsdatatranslation.cpp:2852 mapsdatatranslation.cpp:2853
 msgctxt "greece_prefectures.kgm"
 msgid "Corfu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2849
+#: mapsdatatranslation.cpp:2854
 msgctxt "greece_prefectures.kgm"
 msgid "Kefallinia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2850
+#: mapsdatatranslation.cpp:2855
 msgctxt "greece_prefectures.kgm"
 msgid "Argostoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2851 mapsdatatranslation.cpp:2852
+#: mapsdatatranslation.cpp:2856 mapsdatatranslation.cpp:2857
 msgctxt "greece_prefectures.kgm"
 msgid "Lefkada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2853
+#: mapsdatatranslation.cpp:2858
 msgctxt "greece_prefectures.kgm"
 msgid "Zante"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2854
+#: mapsdatatranslation.cpp:2859
 msgctxt "greece_prefectures.kgm"
 msgid "Zakynthos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2855
+#: mapsdatatranslation.cpp:2860
 msgctxt "greece_prefectures.kgm"
 msgid "Achaea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2856
+#: mapsdatatranslation.cpp:2861
 msgctxt "greece_prefectures.kgm"
 msgid "Patras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2857
+#: mapsdatatranslation.cpp:2862
 msgctxt "greece_prefectures.kgm"
 msgid "Aetolia-Acarnania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2858
+#: mapsdatatranslation.cpp:2863
 msgctxt "greece_prefectures.kgm"
 msgid "Missolonghi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2859
+#: mapsdatatranslation.cpp:2864
 msgctxt "greece_prefectures.kgm"
 msgid "Ileia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2860
+#: mapsdatatranslation.cpp:2865
 msgctxt "greece_prefectures.kgm"
 msgid "Pyrgos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2861
+#: mapsdatatranslation.cpp:2866
 msgctxt "greece_prefectures.kgm"
 msgid "Euboea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2862
+#: mapsdatatranslation.cpp:2867
 msgctxt "greece_prefectures.kgm"
 msgid "Chalcis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2863
+#: mapsdatatranslation.cpp:2868
 msgctxt "greece_prefectures.kgm"
 msgid "Evrytania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2864
+#: mapsdatatranslation.cpp:2869
 msgctxt "greece_prefectures.kgm"
 msgid "Karpenisi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2865
+#: mapsdatatranslation.cpp:2870
 msgctxt "greece_prefectures.kgm"
 msgid "Phocis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2866
+#: mapsdatatranslation.cpp:2871
 msgctxt "greece_prefectures.kgm"
 msgid "Amphissa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2867
+#: mapsdatatranslation.cpp:2872
 msgctxt "greece_prefectures.kgm"
 msgid "Phtiotis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2868
+#: mapsdatatranslation.cpp:2873
 msgctxt "greece_prefectures.kgm"
 msgid "Lamia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2869
+#: mapsdatatranslation.cpp:2874
 msgctxt "greece_prefectures.kgm"
 msgid "Boeotia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2870
+#: mapsdatatranslation.cpp:2875
 msgctxt "greece_prefectures.kgm"
 msgid "Livadia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2871 mapsdatatranslation.cpp:2872
+#: mapsdatatranslation.cpp:2876 mapsdatatranslation.cpp:2877
 msgctxt "greece_prefectures.kgm"
 msgid "Athens"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2873 mapsdatatranslation.cpp:2874
+#: mapsdatatranslation.cpp:2878 mapsdatatranslation.cpp:2879
 msgctxt "greece_prefectures.kgm"
 msgid "Piraeus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2875
+#: mapsdatatranslation.cpp:2880
 msgctxt "greece_prefectures.kgm"
 msgid "West Attica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2876
+#: mapsdatatranslation.cpp:2881
 msgctxt "greece_prefectures.kgm"
 msgid "Elefsina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2877
+#: mapsdatatranslation.cpp:2882
 msgctxt "greece_prefectures.kgm"
 msgid "East Attica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2878
+#: mapsdatatranslation.cpp:2883
 msgctxt "greece_prefectures.kgm"
 msgid "Pallini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2879
+#: mapsdatatranslation.cpp:2884
 msgctxt "greece_prefectures.kgm"
 msgid "Arcadia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2880
+#: mapsdatatranslation.cpp:2885
 msgctxt "greece_prefectures.kgm"
 msgid "Tripoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2881
+#: mapsdatatranslation.cpp:2886
 msgctxt "greece_prefectures.kgm"
 msgid "Argolis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2882
+#: mapsdatatranslation.cpp:2887
 msgctxt "greece_prefectures.kgm"
 msgid "Nauplie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2883
+#: mapsdatatranslation.cpp:2888
 msgctxt "greece_prefectures.kgm"
 msgid "Corinthia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2884
+#: mapsdatatranslation.cpp:2889
 msgctxt "greece_prefectures.kgm"
 msgid "Corinthe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2885
+#: mapsdatatranslation.cpp:2890
 msgctxt "greece_prefectures.kgm"
 msgid "Laconia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2886
+#: mapsdatatranslation.cpp:2891
 msgctxt "greece_prefectures.kgm"
 msgid "Sparte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2887
+#: mapsdatatranslation.cpp:2892
 msgctxt "greece_prefectures.kgm"
 msgid "Messinia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2888
+#: mapsdatatranslation.cpp:2893
 msgctxt "greece_prefectures.kgm"
 msgid "Kalamata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2889 mapsdatatranslation.cpp:2890
+#: mapsdatatranslation.cpp:2894 mapsdatatranslation.cpp:2895
 msgctxt "greece_prefectures.kgm"
 msgid "Chios"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2891
+#: mapsdatatranslation.cpp:2896
 msgctxt "greece_prefectures.kgm"
 msgid "Lesbos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2892
+#: mapsdatatranslation.cpp:2897
 msgctxt "greece_prefectures.kgm"
 msgid "Mytilene"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2893 mapsdatatranslation.cpp:2894
+#: mapsdatatranslation.cpp:2898 mapsdatatranslation.cpp:2899
 msgctxt "greece_prefectures.kgm"
 msgid "Samos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2895
+#: mapsdatatranslation.cpp:2900
 msgctxt "greece_prefectures.kgm"
 msgid "Cyclades"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2896
+#: mapsdatatranslation.cpp:2901
 msgctxt "greece_prefectures.kgm"
 msgid "Ermoupoli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2897
+#: mapsdatatranslation.cpp:2902
 msgctxt "greece_prefectures.kgm"
 msgid "Dodecanese"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2898
+#: mapsdatatranslation.cpp:2903
 msgctxt "greece_prefectures.kgm"
 msgid "Rhodes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2899 mapsdatatranslation.cpp:2900
+#: mapsdatatranslation.cpp:2904 mapsdatatranslation.cpp:2905
 msgctxt "greece_prefectures.kgm"
 msgid "Chania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2901
+#: mapsdatatranslation.cpp:2906
 msgctxt "greece_prefectures.kgm"
 msgid "Heraklion"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2902
+#: mapsdatatranslation.cpp:2907
 msgctxt "greece_prefectures.kgm"
 msgid "Iraklio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2903
+#: mapsdatatranslation.cpp:2908
 msgctxt "greece_prefectures.kgm"
 msgid "Lasithi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2904
+#: mapsdatatranslation.cpp:2909
 msgctxt "greece_prefectures.kgm"
 msgid "Nikolaos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2905
+#: mapsdatatranslation.cpp:2910
 msgctxt "greece_prefectures.kgm"
 msgid "Rethymnon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2906
+#: mapsdatatranslation.cpp:2911
 msgctxt "greece_prefectures.kgm"
 msgid "Rethymno"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2907
+#: mapsdatatranslation.cpp:2912
 msgctxt "greece_prefectures.kgm"
 msgid "Mont Athos autonomous region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2908
+#: mapsdatatranslation.cpp:2913
 msgctxt "greece_prefectures.kgm"
 msgid "Karyes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2909 mapsdatatranslation.cpp:2931
+#: mapsdatatranslation.cpp:2914 mapsdatatranslation.cpp:2936
 msgctxt "guatemala.kgm"
 msgid "Guatemala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2910
+#: mapsdatatranslation.cpp:2915
 msgctxt "guatemala.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2911 mapsdatatranslation.cpp:2912
+#: mapsdatatranslation.cpp:2916 mapsdatatranslation.cpp:2917
 msgctxt "guatemala.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2913
+#: mapsdatatranslation.cpp:2918
 msgctxt "guatemala.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2914
+#: mapsdatatranslation.cpp:2919
 msgctxt "guatemala.kgm"
 msgid "Not Guatemala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2915
+#: mapsdatatranslation.cpp:2920
 msgctxt "guatemala.kgm"
 msgid "Alta Verapaz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2916
+#: mapsdatatranslation.cpp:2921
 msgctxt "guatemala.kgm"
 msgid "Cobán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2917
+#: mapsdatatranslation.cpp:2922
 msgctxt "guatemala.kgm"
 msgid "Baja Verapaz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2918
+#: mapsdatatranslation.cpp:2923
 msgctxt "guatemala.kgm"
 msgid "Salamá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2919 mapsdatatranslation.cpp:2920
+#: mapsdatatranslation.cpp:2924 mapsdatatranslation.cpp:2925
 msgctxt "guatemala.kgm"
 msgid "Chimaltenango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2921 mapsdatatranslation.cpp:2922
+#: mapsdatatranslation.cpp:2926 mapsdatatranslation.cpp:2927
 msgctxt "guatemala.kgm"
 msgid "Chiquimula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2923
+#: mapsdatatranslation.cpp:2928
 msgctxt "guatemala.kgm"
 msgid "Petén"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2924
+#: mapsdatatranslation.cpp:2929
 msgctxt "guatemala.kgm"
 msgid "Flores"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2925
+#: mapsdatatranslation.cpp:2930
 msgctxt "guatemala.kgm"
 msgid "El Progreso"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2926
+#: mapsdatatranslation.cpp:2931
 msgctxt "guatemala.kgm"
 msgid "Guastatoya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2927
+#: mapsdatatranslation.cpp:2932
 msgctxt "guatemala.kgm"
 msgid "El Quiché"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2928
+#: mapsdatatranslation.cpp:2933
 msgctxt "guatemala.kgm"
 msgid "Santa Cruz del Quiché"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2929 mapsdatatranslation.cpp:2930
+#: mapsdatatranslation.cpp:2934 mapsdatatranslation.cpp:2935
 msgctxt "guatemala.kgm"
 msgid "Escuintla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2932
+#: mapsdatatranslation.cpp:2937
 msgctxt "guatemala.kgm"
 msgid "Ciudad Guatemala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2933 mapsdatatranslation.cpp:2934
+#: mapsdatatranslation.cpp:2938 mapsdatatranslation.cpp:2939
 msgctxt "guatemala.kgm"
 msgid "Huehuetenango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2935
+#: mapsdatatranslation.cpp:2940
 msgctxt "guatemala.kgm"
 msgid "Izabal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2936
+#: mapsdatatranslation.cpp:2941
 msgctxt "guatemala.kgm"
 msgid "Puerto Barrios"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2937 mapsdatatranslation.cpp:2938
+#: mapsdatatranslation.cpp:2942 mapsdatatranslation.cpp:2943
 msgctxt "guatemala.kgm"
 msgid "Jalapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2939 mapsdatatranslation.cpp:2940
+#: mapsdatatranslation.cpp:2944 mapsdatatranslation.cpp:2945
 msgctxt "guatemala.kgm"
 msgid "Jutiapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2941 mapsdatatranslation.cpp:2942
+#: mapsdatatranslation.cpp:2946 mapsdatatranslation.cpp:2947
 msgctxt "guatemala.kgm"
 msgid "Quetzaltenango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2943 mapsdatatranslation.cpp:2944
+#: mapsdatatranslation.cpp:2948 mapsdatatranslation.cpp:2949
 msgctxt "guatemala.kgm"
 msgid "Retalhuleu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2945
+#: mapsdatatranslation.cpp:2950
 msgctxt "guatemala.kgm"
 msgid "Sacatepéquez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2946
+#: mapsdatatranslation.cpp:2951
 msgctxt "guatemala.kgm"
 msgid "Antigua Guatemala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2947 mapsdatatranslation.cpp:2948
+#: mapsdatatranslation.cpp:2952 mapsdatatranslation.cpp:2953
 msgctxt "guatemala.kgm"
 msgid "San Marcos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2949
+#: mapsdatatranslation.cpp:2954
 msgctxt "guatemala.kgm"
 msgid "Santa Rosa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2950
+#: mapsdatatranslation.cpp:2955
 msgctxt "guatemala.kgm"
 msgid "Cuilapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2951 mapsdatatranslation.cpp:2952
+#: mapsdatatranslation.cpp:2956 mapsdatatranslation.cpp:2957
 msgctxt "guatemala.kgm"
 msgid "Sololá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2953
+#: mapsdatatranslation.cpp:2958
 msgctxt "guatemala.kgm"
 msgid "Suchitepéquez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2954
+#: mapsdatatranslation.cpp:2959
 msgctxt "guatemala.kgm"
 msgid "Mazatenango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2955 mapsdatatranslation.cpp:2956
+#: mapsdatatranslation.cpp:2960 mapsdatatranslation.cpp:2961
 msgctxt "guatemala.kgm"
 msgid "Totonicapán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2957 mapsdatatranslation.cpp:2958
+#: mapsdatatranslation.cpp:2962 mapsdatatranslation.cpp:2963
 msgctxt "guatemala.kgm"
 msgid "Zacapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2959
+#: mapsdatatranslation.cpp:2964
 msgctxt "gujarat.kgm"
 msgid "Gujarat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2960
+#: mapsdatatranslation.cpp:2965
 msgctxt "gujarat.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2961
+#: mapsdatatranslation.cpp:2966
 msgctxt "gujarat.kgm"
 msgid "Not Gujarat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2962
+#: mapsdatatranslation.cpp:2967
 msgctxt "gujarat.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2963
+#: mapsdatatranslation.cpp:2968
 msgctxt "gujarat.kgm"
 msgid "Kutch / Kachchh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2964
+#: mapsdatatranslation.cpp:2969
 msgctxt "gujarat.kgm"
 msgid "Bhuj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2965
+#: mapsdatatranslation.cpp:2970
 msgctxt "gujarat.kgm"
 msgid "Banaskantha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2966
+#: mapsdatatranslation.cpp:2971
 msgctxt "gujarat.kgm"
 msgid "Palanpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2967 mapsdatatranslation.cpp:2968
+#: mapsdatatranslation.cpp:2972 mapsdatatranslation.cpp:2973
 msgctxt "gujarat.kgm"
 msgid "Patan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2969 mapsdatatranslation.cpp:2970
+#: mapsdatatranslation.cpp:2974 mapsdatatranslation.cpp:2975
 msgctxt "gujarat.kgm"
 msgid "Mehsana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2971
+#: mapsdatatranslation.cpp:2976
 msgctxt "gujarat.kgm"
 msgid "Sabarkantha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2972
+#: mapsdatatranslation.cpp:2977
 msgctxt "gujarat.kgm"
 msgid "Himmatnagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2973 mapsdatatranslation.cpp:2974
+#: mapsdatatranslation.cpp:2978 mapsdatatranslation.cpp:2979
 msgctxt "gujarat.kgm"
 msgid "Gandhinagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2975 mapsdatatranslation.cpp:2976
+#: mapsdatatranslation.cpp:2980 mapsdatatranslation.cpp:2981
 msgctxt "gujarat.kgm"
 msgid "Surendranagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2977 mapsdatatranslation.cpp:2978
+#: mapsdatatranslation.cpp:2982 mapsdatatranslation.cpp:2983
 msgctxt "gujarat.kgm"
 msgid "Ahmedabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2979 mapsdatatranslation.cpp:2980
+#: mapsdatatranslation.cpp:2984 mapsdatatranslation.cpp:2985
 msgctxt "gujarat.kgm"
 msgid "Kheda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2981
+#: mapsdatatranslation.cpp:2986
 msgctxt "gujarat.kgm"
 msgid "Panch Mahal / Panchmahal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2982
+#: mapsdatatranslation.cpp:2987
 msgctxt "gujarat.kgm"
 msgid "Godhra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2983 mapsdatatranslation.cpp:2984
+#: mapsdatatranslation.cpp:2988 mapsdatatranslation.cpp:2989
 msgctxt "gujarat.kgm"
 msgid "Dahod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2985 mapsdatatranslation.cpp:2986
+#: mapsdatatranslation.cpp:2990 mapsdatatranslation.cpp:2991
 msgctxt "gujarat.kgm"
 msgid "Jamnagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2987 mapsdatatranslation.cpp:2988
+#: mapsdatatranslation.cpp:2992 mapsdatatranslation.cpp:2993
 msgctxt "gujarat.kgm"
 msgid "Rajkot"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2989 mapsdatatranslation.cpp:2990
+#: mapsdatatranslation.cpp:2994 mapsdatatranslation.cpp:2995
 msgctxt "gujarat.kgm"
 msgid "Junagadh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2991 mapsdatatranslation.cpp:2992
+#: mapsdatatranslation.cpp:2996 mapsdatatranslation.cpp:2997
 msgctxt "gujarat.kgm"
 msgid "Amreli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2993 mapsdatatranslation.cpp:2994
+#: mapsdatatranslation.cpp:2998 mapsdatatranslation.cpp:2999
 msgctxt "gujarat.kgm"
 msgid "Bhavnagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2995 mapsdatatranslation.cpp:2996
+#: mapsdatatranslation.cpp:3000 mapsdatatranslation.cpp:3001
 msgctxt "gujarat.kgm"
 msgid "Anand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2997 mapsdatatranslation.cpp:2998
+#: mapsdatatranslation.cpp:3002 mapsdatatranslation.cpp:3003
 msgctxt "gujarat.kgm"
 msgid "Vadodara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:2999 mapsdatatranslation.cpp:3000
+#: mapsdatatranslation.cpp:3004 mapsdatatranslation.cpp:3005
 msgctxt "gujarat.kgm"
 msgid "Bharuch"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3001
+#: mapsdatatranslation.cpp:3006
 msgctxt "gujarat.kgm"
 msgid "Narmada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3002
+#: mapsdatatranslation.cpp:3007
 msgctxt "gujarat.kgm"
 msgid "Rajpipla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3003 mapsdatatranslation.cpp:3004
+#: mapsdatatranslation.cpp:3008 mapsdatatranslation.cpp:3009
 msgctxt "gujarat.kgm"
 msgid "Surat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3005
+#: mapsdatatranslation.cpp:3010
 msgctxt "gujarat.kgm"
 msgid "Tapi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3006
+#: mapsdatatranslation.cpp:3011
 msgctxt "gujarat.kgm"
 msgid "Vyara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3007
+#: mapsdatatranslation.cpp:3012
 msgctxt "gujarat.kgm"
 msgid "The Dangs / Dang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3008
+#: mapsdatatranslation.cpp:3013
 msgctxt "gujarat.kgm"
 msgid "Ahwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3009 mapsdatatranslation.cpp:3010
+#: mapsdatatranslation.cpp:3014 mapsdatatranslation.cpp:3015
 msgctxt "gujarat.kgm"
 msgid "Navsari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3011 mapsdatatranslation.cpp:3012
+#: mapsdatatranslation.cpp:3016 mapsdatatranslation.cpp:3017
 msgctxt "gujarat.kgm"
 msgid "Valsad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3013 mapsdatatranslation.cpp:3014
+#: mapsdatatranslation.cpp:3018 mapsdatatranslation.cpp:3019
 msgctxt "gujarat.kgm"
 msgid "Porbandar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3015
+#: mapsdatatranslation.cpp:3020
 msgctxt "guyana.kgm"
 msgid "Guyana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3016
+#: mapsdatatranslation.cpp:3021
 msgctxt "guyana.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3017 mapsdatatranslation.cpp:3018
+#: mapsdatatranslation.cpp:3022 mapsdatatranslation.cpp:3023
 msgctxt "guyana.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3019
+#: mapsdatatranslation.cpp:3024
 msgctxt "guyana.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3020
+#: mapsdatatranslation.cpp:3025
 msgctxt "guyana.kgm"
 msgid "Not Guyana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3021
+#: mapsdatatranslation.cpp:3026
 msgctxt "guyana.kgm"
 msgid "Barima-Waini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3022
+#: mapsdatatranslation.cpp:3027
 msgctxt "guyana.kgm"
 msgid "Mabaruma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3023
+#: mapsdatatranslation.cpp:3028
 msgctxt "guyana.kgm"
 msgid "Pomeroon-Supenaam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3024
+#: mapsdatatranslation.cpp:3029
 msgctxt "guyana.kgm"
 msgid "Anna Regina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3025
+#: mapsdatatranslation.cpp:3030
 msgctxt "guyana.kgm"
 msgid "Essequibo Islands-West Demerara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3026
+#: mapsdatatranslation.cpp:3031
 msgctxt "guyana.kgm"
 msgid "Vreed en Hoop"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3027
+#: mapsdatatranslation.cpp:3032
 msgctxt "guyana.kgm"
 msgid "Demerara-Mahaica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3028
+#: mapsdatatranslation.cpp:3033
 msgctxt "guyana.kgm"
 msgid "Paradise"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3029
+#: mapsdatatranslation.cpp:3034
 msgctxt "guyana.kgm"
 msgid "Mahaica-Berbice"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3030
+#: mapsdatatranslation.cpp:3035
 msgctxt "guyana.kgm"
 msgid "Fort Wellington"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3031
+#: mapsdatatranslation.cpp:3036
 msgctxt "guyana.kgm"
 msgid "Upper Demerara-Berbice"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3032
+#: mapsdatatranslation.cpp:3037
 msgctxt "guyana.kgm"
 msgid "Linden"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3033
+#: mapsdatatranslation.cpp:3038
 msgctxt "guyana.kgm"
 msgid "Cuyuni-Mazaruni"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3034
+#: mapsdatatranslation.cpp:3039
 msgctxt "guyana.kgm"
 msgid "Bartica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3035
+#: mapsdatatranslation.cpp:3040
 msgctxt "guyana.kgm"
 msgid "Potaro-Siparuni"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3036
+#: mapsdatatranslation.cpp:3041
 msgctxt "guyana.kgm"
 msgid "Mahdia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3037
+#: mapsdatatranslation.cpp:3042
 msgctxt "guyana.kgm"
 msgid "Upper Takutu-Upper Essequibo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3038
+#: mapsdatatranslation.cpp:3043
 msgctxt "guyana.kgm"
 msgid "Lethem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3039
+#: mapsdatatranslation.cpp:3044
 msgctxt "guyana.kgm"
 msgid "East Berbice-Corentyne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3040
+#: mapsdatatranslation.cpp:3045
 msgctxt "guyana.kgm"
 msgid "New Amsterdam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3041
+#: mapsdatatranslation.cpp:3046
 msgctxt "haiti.kgm"
 msgid "Haiti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3042
+#: mapsdatatranslation.cpp:3047
 msgctxt "haiti.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3043 mapsdatatranslation.cpp:3044
+#: mapsdatatranslation.cpp:3048 mapsdatatranslation.cpp:3049
 msgctxt "haiti.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3045
+#: mapsdatatranslation.cpp:3050
 msgctxt "haiti.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3046
+#: mapsdatatranslation.cpp:3051
 msgctxt "haiti.kgm"
 msgid "Not Haiti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3047
+#: mapsdatatranslation.cpp:3052
 msgctxt "haiti.kgm"
 msgid "Artibonite"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3048
+#: mapsdatatranslation.cpp:3053
 msgctxt "haiti.kgm"
 msgid "Les Gonaïves"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3049
+#: mapsdatatranslation.cpp:3054
 msgctxt "haiti.kgm"
 msgid "Centre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3050
+#: mapsdatatranslation.cpp:3055
 msgctxt "haiti.kgm"
 msgid "Hinche"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3051
+#: mapsdatatranslation.cpp:3056
 msgctxt "haiti.kgm"
 msgid "Grand'Anse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3052
+#: mapsdatatranslation.cpp:3057
 msgctxt "haiti.kgm"
 msgid "Jérémie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3053
+#: mapsdatatranslation.cpp:3058
 msgctxt "haiti.kgm"
 msgid "Nippes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3054
+#: mapsdatatranslation.cpp:3059
 msgctxt "haiti.kgm"
 msgid "Miragoâne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3055
+#: mapsdatatranslation.cpp:3060
 msgctxt "haiti.kgm"
 msgid "Nord"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3056
+#: mapsdatatranslation.cpp:3061
 msgctxt "haiti.kgm"
 msgid "Cap-Haïtien"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3057
+#: mapsdatatranslation.cpp:3062
 msgctxt "haiti.kgm"
 msgid "Nord-Est"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3058
+#: mapsdatatranslation.cpp:3063
 msgctxt "haiti.kgm"
 msgid "Fort-Liberté"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3059
+#: mapsdatatranslation.cpp:3064
 msgctxt "haiti.kgm"
 msgid "Nord-Ouest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3060
+#: mapsdatatranslation.cpp:3065
 msgctxt "haiti.kgm"
 msgid "Port-de-Paix"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3061
+#: mapsdatatranslation.cpp:3066
 msgctxt "haiti.kgm"
 msgid "Ouest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3062
+#: mapsdatatranslation.cpp:3067
 msgctxt "haiti.kgm"
 msgid "Port-au-Prince"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3063
+#: mapsdatatranslation.cpp:3068
 msgctxt "haiti.kgm"
 msgid "Sud"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3064
+#: mapsdatatranslation.cpp:3069
 msgctxt "haiti.kgm"
 msgid "Les Cayes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3065
+#: mapsdatatranslation.cpp:3070
 msgctxt "haiti.kgm"
 msgid "Sud-Est"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3066
+#: mapsdatatranslation.cpp:3071
 msgctxt "haiti.kgm"
 msgid "Jacmel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3067
+#: mapsdatatranslation.cpp:3072
 msgctxt "haryana.kgm"
 msgid "Haryana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3068
+#: mapsdatatranslation.cpp:3073
 msgctxt "haryana.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3069
+#: mapsdatatranslation.cpp:3074
 msgctxt "haryana.kgm"
 msgid "Not Haryana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3070
+#: mapsdatatranslation.cpp:3075
 msgctxt "haryana.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3071 mapsdatatranslation.cpp:3072
+#: mapsdatatranslation.cpp:3076 mapsdatatranslation.cpp:3077
 msgctxt "haryana.kgm"
 msgid "Chandigarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3073 mapsdatatranslation.cpp:3074
+#: mapsdatatranslation.cpp:3078 mapsdatatranslation.cpp:3079
 msgctxt "haryana.kgm"
 msgid "Panchkula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3075 mapsdatatranslation.cpp:3076
+#: mapsdatatranslation.cpp:3080 mapsdatatranslation.cpp:3081
 msgctxt "haryana.kgm"
 msgid "Ambala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3077
+#: mapsdatatranslation.cpp:3082 mapsdatatranslation.cpp:3083
 msgctxt "haryana.kgm"
 msgid "Yamuna Nagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3078
-msgctxt "haryana.kgm"
-msgid "Yamunanagar"
-msgstr ""
-
-#: mapsdatatranslation.cpp:3079 mapsdatatranslation.cpp:3080
+#: mapsdatatranslation.cpp:3084 mapsdatatranslation.cpp:3085
 msgctxt "haryana.kgm"
 msgid "Kurukshetra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3081 mapsdatatranslation.cpp:3082
+#: mapsdatatranslation.cpp:3086 mapsdatatranslation.cpp:3087
 msgctxt "haryana.kgm"
 msgid "Karnal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3083 mapsdatatranslation.cpp:3084
+#: mapsdatatranslation.cpp:3088 mapsdatatranslation.cpp:3089
 msgctxt "haryana.kgm"
 msgid "Kaithal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3085 mapsdatatranslation.cpp:3086
+#: mapsdatatranslation.cpp:3090 mapsdatatranslation.cpp:3091
 msgctxt "haryana.kgm"
 msgid "Jind"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3087 mapsdatatranslation.cpp:3088
+#: mapsdatatranslation.cpp:3092 mapsdatatranslation.cpp:3093
 msgctxt "haryana.kgm"
 msgid "Panipat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3089 mapsdatatranslation.cpp:3090
+#: mapsdatatranslation.cpp:3094 mapsdatatranslation.cpp:3095
 msgctxt "haryana.kgm"
 msgid "Sonipat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3091 mapsdatatranslation.cpp:3092
+#: mapsdatatranslation.cpp:3096 mapsdatatranslation.cpp:3097
 msgctxt "haryana.kgm"
 msgid "Faridabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3093
+#: mapsdatatranslation.cpp:3098
 msgctxt "haryana.kgm"
 msgid "Mewat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3094
+#: mapsdatatranslation.cpp:3099
 msgctxt "haryana.kgm"
 msgid "Nuh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3095 mapsdatatranslation.cpp:3096
+#: mapsdatatranslation.cpp:3100 mapsdatatranslation.cpp:3101
 msgctxt "haryana.kgm"
 msgid "Gurgaon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3097 mapsdatatranslation.cpp:3098
+#: mapsdatatranslation.cpp:3102 mapsdatatranslation.cpp:3103
 msgctxt "haryana.kgm"
 msgid "Rewari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3099
+#: mapsdatatranslation.cpp:3104
 msgctxt "haryana.kgm"
 msgid "Mahendragarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3100
+#: mapsdatatranslation.cpp:3105
 msgctxt "haryana.kgm"
 msgid "Narnaul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3101 mapsdatatranslation.cpp:3102
+#: mapsdatatranslation.cpp:3106 mapsdatatranslation.cpp:3107
 msgctxt "haryana.kgm"
 msgid "Jhajjar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3103 mapsdatatranslation.cpp:3104
+#: mapsdatatranslation.cpp:3108 mapsdatatranslation.cpp:3109
 msgctxt "haryana.kgm"
 msgid "Bhiwani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3105 mapsdatatranslation.cpp:3106
+#: mapsdatatranslation.cpp:3110 mapsdatatranslation.cpp:3111
 msgctxt "haryana.kgm"
 msgid "Rohtak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3107 mapsdatatranslation.cpp:3108
+#: mapsdatatranslation.cpp:3112 mapsdatatranslation.cpp:3113
 msgctxt "haryana.kgm"
 msgid "Hisar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3109 mapsdatatranslation.cpp:3110
+#: mapsdatatranslation.cpp:3114 mapsdatatranslation.cpp:3115
 msgctxt "haryana.kgm"
 msgid "Sirsa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3111 mapsdatatranslation.cpp:3112
+#: mapsdatatranslation.cpp:3116 mapsdatatranslation.cpp:3117
 msgctxt "haryana.kgm"
 msgid "Fatehabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3113 mapsdatatranslation.cpp:3114
+#: mapsdatatranslation.cpp:3118 mapsdatatranslation.cpp:3119
 msgctxt "haryana.kgm"
 msgid "Palwal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3115
+#: mapsdatatranslation.cpp:3120
 msgctxt "himachal_pradesh.kgm"
 msgid "Himachal Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3116
+#: mapsdatatranslation.cpp:3121
 msgctxt "himachal_pradesh.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3117
+#: mapsdatatranslation.cpp:3122
 msgctxt "himachal_pradesh.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3118
+#: mapsdatatranslation.cpp:3123
 msgctxt "himachal_pradesh.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3119 mapsdatatranslation.cpp:3120
+#: mapsdatatranslation.cpp:3124 mapsdatatranslation.cpp:3125
 msgctxt "himachal_pradesh.kgm"
 msgid "Chamba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3121
+#: mapsdatatranslation.cpp:3126
 msgctxt "himachal_pradesh.kgm"
 msgid "Kangra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3122
+#: mapsdatatranslation.cpp:3127
 msgctxt "himachal_pradesh.kgm"
 msgid "Dharamsala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3123 mapsdatatranslation.cpp:3124
+#: mapsdatatranslation.cpp:3128 mapsdatatranslation.cpp:3129
 msgctxt "himachal_pradesh.kgm"
 msgid "Una"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3125 mapsdatatranslation.cpp:3126
+#: mapsdatatranslation.cpp:3130 mapsdatatranslation.cpp:3131
 msgctxt "himachal_pradesh.kgm"
 msgid "Hamirpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3127 mapsdatatranslation.cpp:3128
+#: mapsdatatranslation.cpp:3132 mapsdatatranslation.cpp:3133
 msgctxt "himachal_pradesh.kgm"
 msgid "Bilaspur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3129 mapsdatatranslation.cpp:3130
+#: mapsdatatranslation.cpp:3134 mapsdatatranslation.cpp:3135
 msgctxt "himachal_pradesh.kgm"
 msgid "Solan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3131 mapsdatatranslation.cpp:3132
+#: mapsdatatranslation.cpp:3136 mapsdatatranslation.cpp:3137
 msgctxt "himachal_pradesh.kgm"
 msgid "Shimla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3133 mapsdatatranslation.cpp:3134
+#: mapsdatatranslation.cpp:3138 mapsdatatranslation.cpp:3139
 msgctxt "himachal_pradesh.kgm"
 msgid "Mandi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3135 mapsdatatranslation.cpp:3136
+#: mapsdatatranslation.cpp:3140 mapsdatatranslation.cpp:3141
 msgctxt "himachal_pradesh.kgm"
 msgid "Kullu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3137
+#: mapsdatatranslation.cpp:3142
 msgctxt "himachal_pradesh.kgm"
 msgid "Lahaul and Spiti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3138
+#: mapsdatatranslation.cpp:3143
 msgctxt "himachal_pradesh.kgm"
 msgid "Kyelang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3139 mapsdatatranslation.cpp:3140
+#: mapsdatatranslation.cpp:3144 mapsdatatranslation.cpp:3145
 msgctxt "himachal_pradesh.kgm"
 msgid "Sirmaur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3141
+#: mapsdatatranslation.cpp:3146
 msgctxt "himachal_pradesh.kgm"
 msgid "Kinnaur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3142
+#: mapsdatatranslation.cpp:3147
 msgctxt "himachal_pradesh.kgm"
 msgid "Reckong Peo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3143
+#: mapsdatatranslation.cpp:3148
 msgctxt "honduras.kgm"
 msgid "Honduras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3144
+#: mapsdatatranslation.cpp:3149
 msgctxt "honduras.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3145 mapsdatatranslation.cpp:3146
+#: mapsdatatranslation.cpp:3150 mapsdatatranslation.cpp:3151
 msgctxt "honduras.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3147
+#: mapsdatatranslation.cpp:3152
 msgctxt "honduras.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3148
+#: mapsdatatranslation.cpp:3153
 msgctxt "honduras.kgm"
 msgid "Not Honduras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3149
+#: mapsdatatranslation.cpp:3154
 msgctxt "honduras.kgm"
 msgid "Atlántida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3150
+#: mapsdatatranslation.cpp:3155
 msgctxt "honduras.kgm"
 msgid "La Ceiba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3151 mapsdatatranslation.cpp:3152
+#: mapsdatatranslation.cpp:3156 mapsdatatranslation.cpp:3157
 msgctxt "honduras.kgm"
 msgid "Choluteca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3153
+#: mapsdatatranslation.cpp:3158
 msgctxt "honduras.kgm"
 msgid "Colón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3154
+#: mapsdatatranslation.cpp:3159
 msgctxt "honduras.kgm"
 msgid "Trujillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3155 mapsdatatranslation.cpp:3156
+#: mapsdatatranslation.cpp:3160 mapsdatatranslation.cpp:3161
 msgctxt "honduras.kgm"
 msgid "Comayagua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3157
+#: mapsdatatranslation.cpp:3162
 msgctxt "honduras.kgm"
 msgid "Copán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3158
+#: mapsdatatranslation.cpp:3163
 msgctxt "honduras.kgm"
 msgid "Santa Rosa de Copán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3159
+#: mapsdatatranslation.cpp:3164
 msgctxt "honduras.kgm"
 msgid "Cortés"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3160
+#: mapsdatatranslation.cpp:3165
 msgctxt "honduras.kgm"
 msgid "San Pedro Sula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3161
+#: mapsdatatranslation.cpp:3166
 msgctxt "honduras.kgm"
 msgid "El Paraíso"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3162
+#: mapsdatatranslation.cpp:3167
 msgctxt "honduras.kgm"
 msgid "Yuscarán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3163
+#: mapsdatatranslation.cpp:3168
 msgctxt "honduras.kgm"
 msgid "Francisco Morazán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3164
+#: mapsdatatranslation.cpp:3169
 msgctxt "honduras.kgm"
 msgid "Tegucigalpa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3165
+#: mapsdatatranslation.cpp:3170
 msgctxt "honduras.kgm"
 msgid "Gracias a Dios"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3166
+#: mapsdatatranslation.cpp:3171
 msgctxt "honduras.kgm"
 msgid "Puerto Lempira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3167
+#: mapsdatatranslation.cpp:3172
 msgctxt "honduras.kgm"
 msgid "Intibucá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3168
+#: mapsdatatranslation.cpp:3173
 msgctxt "honduras.kgm"
 msgid "La Esperanza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3169
+#: mapsdatatranslation.cpp:3174
 msgctxt "honduras.kgm"
 msgid "Islas de la Bahía"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3170
+#: mapsdatatranslation.cpp:3175
 msgctxt "honduras.kgm"
 msgid "Roatán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3171 mapsdatatranslation.cpp:3172
+#: mapsdatatranslation.cpp:3176 mapsdatatranslation.cpp:3177
 msgctxt "honduras.kgm"
 msgid "La Paz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3173
+#: mapsdatatranslation.cpp:3178
 msgctxt "honduras.kgm"
 msgid "Lempira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3174
+#: mapsdatatranslation.cpp:3179
 msgctxt "honduras.kgm"
 msgid "Gracias"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3175
+#: mapsdatatranslation.cpp:3180
 msgctxt "honduras.kgm"
 msgid "Ocotepeque"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3176
+#: mapsdatatranslation.cpp:3181
 msgctxt "honduras.kgm"
 msgid "Nueva Octopeque"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3177
+#: mapsdatatranslation.cpp:3182
 msgctxt "honduras.kgm"
 msgid "Olancho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3178
+#: mapsdatatranslation.cpp:3183
 msgctxt "honduras.kgm"
 msgid "Juticalpa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3179 mapsdatatranslation.cpp:3180
+#: mapsdatatranslation.cpp:3184 mapsdatatranslation.cpp:3185
 msgctxt "honduras.kgm"
 msgid "Santa Bárbara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3181
+#: mapsdatatranslation.cpp:3186
 msgctxt "honduras.kgm"
 msgid "Valle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3182
+#: mapsdatatranslation.cpp:3187
 msgctxt "honduras.kgm"
 msgid "Nacaome"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3183 mapsdatatranslation.cpp:3184
+#: mapsdatatranslation.cpp:3188 mapsdatatranslation.cpp:3189
 msgctxt "honduras.kgm"
 msgid "Yoro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3185
+#: mapsdatatranslation.cpp:3190
 msgctxt "hungary.kgm"
 msgid "Hungary (Counties)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3186
+#: mapsdatatranslation.cpp:3191
 msgctxt "hungary.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3187 mapsdatatranslation.cpp:3188
+#: mapsdatatranslation.cpp:3192 mapsdatatranslation.cpp:3193
 msgctxt "hungary.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3189
+#: mapsdatatranslation.cpp:3194
 msgctxt "hungary.kgm"
 msgid "Not Hungary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3190
+#: mapsdatatranslation.cpp:3195
 msgctxt "hungary.kgm"
 msgid "Bács-Kiskun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3191
+#: mapsdatatranslation.cpp:3196
 msgctxt "hungary.kgm"
 msgid "Kecskemét"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3192
+#: mapsdatatranslation.cpp:3197
 msgctxt "hungary.kgm"
 msgid "Baranya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3193
+#: mapsdatatranslation.cpp:3198
 msgctxt "hungary.kgm"
 msgid "Pécs"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3194
+#: mapsdatatranslation.cpp:3199
 msgctxt "hungary.kgm"
 msgid "Békés"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3195
+#: mapsdatatranslation.cpp:3200
 msgctxt "hungary.kgm"
 msgid "Békéscsaba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3196
+#: mapsdatatranslation.cpp:3201
 msgctxt "hungary.kgm"
 msgid "Borsod-Abaúj-Zemplén"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3197
+#: mapsdatatranslation.cpp:3202
 msgctxt "hungary.kgm"
 msgid "Miskolc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3198
+#: mapsdatatranslation.cpp:3203
 msgctxt "hungary.kgm"
 msgid "Csongrád"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3199
+#: mapsdatatranslation.cpp:3204
 msgctxt "hungary.kgm"
 msgid "Szeged"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3200
+#: mapsdatatranslation.cpp:3205
 msgctxt "hungary.kgm"
 msgid "Fejér"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3201
+#: mapsdatatranslation.cpp:3206
 msgctxt "hungary.kgm"
 msgid "Székesfehérvár"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3202
+#: mapsdatatranslation.cpp:3207
 msgctxt "hungary.kgm"
 msgid "Győr-Moson-Sopron"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3203
+#: mapsdatatranslation.cpp:3208
 msgctxt "hungary.kgm"
 msgid "Győr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3204
+#: mapsdatatranslation.cpp:3209
 msgctxt "hungary.kgm"
 msgid "Hajdú-Bihar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3205
+#: mapsdatatranslation.cpp:3210
 msgctxt "hungary.kgm"
 msgid "Debrecen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3206
+#: mapsdatatranslation.cpp:3211
 msgctxt "hungary.kgm"
 msgid "Heves"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3207
+#: mapsdatatranslation.cpp:3212
 msgctxt "hungary.kgm"
 msgid "Eger"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3208
+#: mapsdatatranslation.cpp:3213
 msgctxt "hungary.kgm"
 msgid "Jász-Nagykun-Szolnok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3209
+#: mapsdatatranslation.cpp:3214
 msgctxt "hungary.kgm"
 msgid "Szolnok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3210
+#: mapsdatatranslation.cpp:3215
 msgctxt "hungary.kgm"
 msgid "Komárom-Esztergom"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3211
+#: mapsdatatranslation.cpp:3216
 msgctxt "hungary.kgm"
 msgid "Tatabánya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3212
+#: mapsdatatranslation.cpp:3217
 msgctxt "hungary.kgm"
 msgid "Nógrád"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3213
+#: mapsdatatranslation.cpp:3218
 msgctxt "hungary.kgm"
 msgid "Salgótarján"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3214
+#: mapsdatatranslation.cpp:3219
 msgctxt "hungary.kgm"
 msgid "Pest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3215 mapsdatatranslation.cpp:3228
+#: mapsdatatranslation.cpp:3220 mapsdatatranslation.cpp:3233
 msgctxt "hungary.kgm"
 msgid "Budapest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3216
+#: mapsdatatranslation.cpp:3221
 msgctxt "hungary.kgm"
 msgid "Somogy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3217
+#: mapsdatatranslation.cpp:3222
 msgctxt "hungary.kgm"
 msgid "Kaposvár"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3218
+#: mapsdatatranslation.cpp:3223
 msgctxt "hungary.kgm"
 msgid "Szabolcs-Szatmár-Bereg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3219
+#: mapsdatatranslation.cpp:3224
 msgctxt "hungary.kgm"
 msgid "Nyíregyháza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3220
+#: mapsdatatranslation.cpp:3225
 msgctxt "hungary.kgm"
 msgid "Tolna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3221
+#: mapsdatatranslation.cpp:3226
 msgctxt "hungary.kgm"
 msgid "Szekszárd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3222
+#: mapsdatatranslation.cpp:3227
 msgctxt "hungary.kgm"
 msgid "Vas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3223
+#: mapsdatatranslation.cpp:3228
 msgctxt "hungary.kgm"
 msgid "Szombathely"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3224 mapsdatatranslation.cpp:3225
+#: mapsdatatranslation.cpp:3229 mapsdatatranslation.cpp:3230
 msgctxt "hungary.kgm"
 msgid "Veszprém"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3226
+#: mapsdatatranslation.cpp:3231
 msgctxt "hungary.kgm"
 msgid "Zala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3227
+#: mapsdatatranslation.cpp:3232
 msgctxt "hungary.kgm"
 msgid "Zalaegerszeg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3229
+#: mapsdatatranslation.cpp:3234
 msgctxt "hungary_regions.kgm"
 msgid "Hungary (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3230
+#: mapsdatatranslation.cpp:3235
 msgctxt "hungary_regions.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3231 mapsdatatranslation.cpp:3232
+#: mapsdatatranslation.cpp:3236 mapsdatatranslation.cpp:3237
 msgctxt "hungary_regions.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3233
+#: mapsdatatranslation.cpp:3238
 msgctxt "hungary_regions.kgm"
 msgid "Not Hungary (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3234
+#: mapsdatatranslation.cpp:3239
 msgctxt "hungary_regions.kgm"
 msgid "Western Transdanubia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3235
+#: mapsdatatranslation.cpp:3240
 msgctxt "hungary_regions.kgm"
 msgid "Győr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3236
+#: mapsdatatranslation.cpp:3241
 msgctxt "hungary_regions.kgm"
 msgid "Southern Transdanubia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3237
+#: mapsdatatranslation.cpp:3242
 msgctxt "hungary_regions.kgm"
 msgid "Pécs"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3238
+#: mapsdatatranslation.cpp:3243
 msgctxt "hungary_regions.kgm"
 msgid "Central Transdanubia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3239
+#: mapsdatatranslation.cpp:3244
 msgctxt "hungary_regions.kgm"
 msgid "Székesfehérvár"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3240
+#: mapsdatatranslation.cpp:3245
 msgctxt "hungary_regions.kgm"
 msgid "Central Hungary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3241
+#: mapsdatatranslation.cpp:3246
 msgctxt "hungary_regions.kgm"
 msgid "Budapest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3242
+#: mapsdatatranslation.cpp:3247
 msgctxt "hungary_regions.kgm"
 msgid "Northern Hungary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3243
+#: mapsdatatranslation.cpp:3248
 msgctxt "hungary_regions.kgm"
 msgid "Miskolc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3244
+#: mapsdatatranslation.cpp:3249
 msgctxt "hungary_regions.kgm"
 msgid "Northern Great Plain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3245
+#: mapsdatatranslation.cpp:3250
 msgctxt "hungary_regions.kgm"
 msgid "Debrecen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3246
+#: mapsdatatranslation.cpp:3251
 msgctxt "hungary_regions.kgm"
 msgid "Southern Great Plain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3247
+#: mapsdatatranslation.cpp:3252
 msgctxt "hungary_regions.kgm"
 msgid "Szeged"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3248
+#: mapsdatatranslation.cpp:3253
 msgctxt "iceland_regions.kgm"
 msgid "Iceland (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3249
+#: mapsdatatranslation.cpp:3254
 msgctxt "iceland_regions.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3250 mapsdatatranslation.cpp:3251
+#: mapsdatatranslation.cpp:3255 mapsdatatranslation.cpp:3256
 msgctxt "iceland_regions.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3252
+#: mapsdatatranslation.cpp:3257
 msgctxt "iceland_regions.kgm"
 msgid "Not Iceland (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3253
+#: mapsdatatranslation.cpp:3258
 msgctxt "iceland_regions.kgm"
 msgid "East Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3254
+#: mapsdatatranslation.cpp:3259
 msgctxt "iceland_regions.kgm"
 msgid "Egilsstaðir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3255
+#: mapsdatatranslation.cpp:3260
 msgctxt "iceland_regions.kgm"
 msgid "Capital Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3256
+#: mapsdatatranslation.cpp:3261
 msgctxt "iceland_regions.kgm"
 msgid "Reykjavík"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3257
+#: mapsdatatranslation.cpp:3262
 msgctxt "iceland_regions.kgm"
 msgid "Northeast Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3258
+#: mapsdatatranslation.cpp:3263
 msgctxt "iceland_regions.kgm"
 msgid "Akureyri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3259
+#: mapsdatatranslation.cpp:3264
 msgctxt "iceland_regions.kgm"
 msgid "Northwest Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3260
+#: mapsdatatranslation.cpp:3265
 msgctxt "iceland_regions.kgm"
 msgid "Sauðárkrókur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3261
+#: mapsdatatranslation.cpp:3266
 msgctxt "iceland_regions.kgm"
 msgid "South Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3262
+#: mapsdatatranslation.cpp:3267
 msgctxt "iceland_regions.kgm"
 msgid "Selfoss"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3263
+#: mapsdatatranslation.cpp:3268
 msgctxt "iceland_regions.kgm"
 msgid "Southern Peninsula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3264
+#: mapsdatatranslation.cpp:3269
 msgctxt "iceland_regions.kgm"
 msgid "Keflavík"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3265
+#: mapsdatatranslation.cpp:3270
 msgctxt "iceland_regions.kgm"
 msgid "Westfjords"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3266
+#: mapsdatatranslation.cpp:3271
 msgctxt "iceland_regions.kgm"
 msgid "Ísafjörður"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3267
+#: mapsdatatranslation.cpp:3272
 msgctxt "iceland_regions.kgm"
 msgid "West Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3268
+#: mapsdatatranslation.cpp:3273
 msgctxt "iceland_regions.kgm"
 msgid "Borgarnes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3269
+#: mapsdatatranslation.cpp:3274
 msgctxt "iceland_regions.kgm"
 msgid "Vatnajökull Glacier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3270
+#: mapsdatatranslation.cpp:3275
 msgctxt "iceland_regions.kgm"
 msgid "Langjökull Glacier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3271
+#: mapsdatatranslation.cpp:3276
 msgctxt "iceland_regions.kgm"
 msgid "Hofsjökull Glacier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3272
+#: mapsdatatranslation.cpp:3277
 msgctxt "iceland_regions.kgm"
 msgid "Mýrdalsjökull Glacier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3273
+#: mapsdatatranslation.cpp:3278
 msgctxt "iceland_regions.kgm"
 msgid "Drangajökull Glacier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3274
+#: mapsdatatranslation.cpp:3279
 msgctxt "india.kgm"
 msgid "India"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3275
+#: mapsdatatranslation.cpp:3280
 msgctxt "india.kgm"
 msgid "States and Territories"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3276
+#: mapsdatatranslation.cpp:3281
 msgctxt "india.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3277
+#: mapsdatatranslation.cpp:3282
 msgctxt "india.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3278
+#: mapsdatatranslation.cpp:3283
 msgctxt "india.kgm"
 msgid "Not India"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3279
+#: mapsdatatranslation.cpp:3284
 msgctxt "india.kgm"
 msgid "Andhra Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3280
+#: mapsdatatranslation.cpp:3285
 msgctxt "india.kgm"
 msgid "Hyderabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3281
+#: mapsdatatranslation.cpp:3286
 msgctxt "india.kgm"
 msgid "Arunachal Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3282
+#: mapsdatatranslation.cpp:3287
 msgctxt "india.kgm"
 msgid "Itanagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3283
+#: mapsdatatranslation.cpp:3288
 msgctxt "india.kgm"
 msgid "Assam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3284
+#: mapsdatatranslation.cpp:3289
 msgctxt "india.kgm"
 msgid "Dispur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3285
+#: mapsdatatranslation.cpp:3290
 msgctxt "india.kgm"
 msgid "Bihar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3286
+#: mapsdatatranslation.cpp:3291
 msgctxt "india.kgm"
 msgid "Patna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3287
+#: mapsdatatranslation.cpp:3292
 msgctxt "india.kgm"
 msgid "Chhatisgarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3288
+#: mapsdatatranslation.cpp:3293
 msgctxt "india.kgm"
 msgid "Raipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3289
+#: mapsdatatranslation.cpp:3294
 msgctxt "india.kgm"
 msgid "Goa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3290
+#: mapsdatatranslation.cpp:3295
 msgctxt "india.kgm"
 msgid "Panaji"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3291
+#: mapsdatatranslation.cpp:3296
 msgctxt "india.kgm"
 msgid "Gujarat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3292
+#: mapsdatatranslation.cpp:3297
 msgctxt "india.kgm"
 msgid "Gandhinagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3293
+#: mapsdatatranslation.cpp:3298
 msgctxt "india.kgm"
 msgid "Haryana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3294
+#: mapsdatatranslation.cpp:3299
 msgctxt "india.kgm"
 msgid "Himachal Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3295
+#: mapsdatatranslation.cpp:3300
 msgctxt "india.kgm"
 msgid "Shimla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3296
+#: mapsdatatranslation.cpp:3301
 msgctxt "india.kgm"
 msgid "Jammu and Kashmir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3297
+#: mapsdatatranslation.cpp:3302
 msgctxt "india.kgm"
 msgid "Srinagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3298
+#: mapsdatatranslation.cpp:3303
 msgctxt "india.kgm"
 msgid "Jharkhand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3299
+#: mapsdatatranslation.cpp:3304
 msgctxt "india.kgm"
 msgid "Ranchi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3300
+#: mapsdatatranslation.cpp:3305
 msgctxt "india.kgm"
 msgid "Karnataka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3301
+#: mapsdatatranslation.cpp:3306
 msgctxt "india.kgm"
 msgid "Bangalore"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3302
+#: mapsdatatranslation.cpp:3307
 msgctxt "india.kgm"
 msgid "Kerala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3303
+#: mapsdatatranslation.cpp:3308
 msgctxt "india.kgm"
 msgid "Thiruvananthapuram"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3304
+#: mapsdatatranslation.cpp:3309
 msgctxt "india.kgm"
 msgid "Madhya Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3305
+#: mapsdatatranslation.cpp:3310
 msgctxt "india.kgm"
 msgid "Bhopal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3306
+#: mapsdatatranslation.cpp:3311
 msgctxt "india.kgm"
 msgid "Maharashtra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3307
+#: mapsdatatranslation.cpp:3312
 msgctxt "india.kgm"
 msgid "Mumbai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3308
+#: mapsdatatranslation.cpp:3313
 msgctxt "india.kgm"
 msgid "Manipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3309
+#: mapsdatatranslation.cpp:3314
 msgctxt "india.kgm"
 msgid "Imphal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3310
+#: mapsdatatranslation.cpp:3315
 msgctxt "india.kgm"
 msgid "Meghalaya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3311
+#: mapsdatatranslation.cpp:3316
 msgctxt "india.kgm"
 msgid "Shillong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3312
+#: mapsdatatranslation.cpp:3317
 msgctxt "india.kgm"
 msgid "Mizoram"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3313
+#: mapsdatatranslation.cpp:3318
 msgctxt "india.kgm"
 msgid "Aizawl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3314
+#: mapsdatatranslation.cpp:3319
 msgctxt "india.kgm"
 msgid "Nagaland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3315
+#: mapsdatatranslation.cpp:3320
 msgctxt "india.kgm"
 msgid "Kohima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3316
+#: mapsdatatranslation.cpp:3321
 msgctxt "india.kgm"
 msgid "Orissa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3317
+#: mapsdatatranslation.cpp:3322
 msgctxt "india.kgm"
 msgid "Bhubaneswar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3318
+#: mapsdatatranslation.cpp:3323
 msgctxt "india.kgm"
 msgid "Punjab"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3319
+#: mapsdatatranslation.cpp:3324
 msgctxt "india.kgm"
 msgid "Rajasthan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3320
+#: mapsdatatranslation.cpp:3325
 msgctxt "india.kgm"
 msgid "Jaipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3321
+#: mapsdatatranslation.cpp:3326
 msgctxt "india.kgm"
 msgid "Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3322
+#: mapsdatatranslation.cpp:3327
 msgctxt "india.kgm"
 msgid "Gangtok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3323
+#: mapsdatatranslation.cpp:3328
 msgctxt "india.kgm"
 msgid "Tamil Nadu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3324
+#: mapsdatatranslation.cpp:3329
 msgctxt "india.kgm"
 msgid "Chennai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3325
+#: mapsdatatranslation.cpp:3330
 msgctxt "india.kgm"
 msgid "Tripura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3326
+#: mapsdatatranslation.cpp:3331
 msgctxt "india.kgm"
 msgid "Agartala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3327
+#: mapsdatatranslation.cpp:3332
 msgctxt "india.kgm"
 msgid "Uttaranchal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3328
+#: mapsdatatranslation.cpp:3333
 msgctxt "india.kgm"
 msgid "Dehradun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3329
+#: mapsdatatranslation.cpp:3334
 msgctxt "india.kgm"
 msgid "Uttar Pradesh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3330
+#: mapsdatatranslation.cpp:3335
 msgctxt "india.kgm"
 msgid "Lucknow"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3331
+#: mapsdatatranslation.cpp:3336
 msgctxt "india.kgm"
 msgid "West Bengal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3332
+#: mapsdatatranslation.cpp:3337
 msgctxt "india.kgm"
 msgid "Kolkata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3333
+#: mapsdatatranslation.cpp:3338
 msgctxt "india.kgm"
 msgid "Andaman and Nicobar Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3334
+#: mapsdatatranslation.cpp:3339
 msgctxt "india.kgm"
 msgid "Port Blair"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3335
+#: mapsdatatranslation.cpp:3340
 msgctxt "india.kgm"
 msgid "Chandigarh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3336
+#: mapsdatatranslation.cpp:3341
 msgctxt "india.kgm"
 msgid "Dadra and Nagar Haveli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3337
+#: mapsdatatranslation.cpp:3342
 msgctxt "india.kgm"
 msgid "Dadra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3338
+#: mapsdatatranslation.cpp:3343
 msgctxt "india.kgm"
 msgid "Daman and Diu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3339
+#: mapsdatatranslation.cpp:3344
 msgctxt "india.kgm"
 msgid "Daman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3340
+#: mapsdatatranslation.cpp:3345
 msgctxt "india.kgm"
 msgid "Lakshadweep"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3341
+#: mapsdatatranslation.cpp:3346
 msgctxt "india.kgm"
 msgid "Kavaratti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3342 mapsdatatranslation.cpp:3343
+#: mapsdatatranslation.cpp:3347 mapsdatatranslation.cpp:3348
 msgctxt "india.kgm"
 msgid "Pondicherry"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3344
+#: mapsdatatranslation.cpp:3349
 msgctxt "india.kgm"
 msgid "Delhi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3345
+#: mapsdatatranslation.cpp:3350
 msgctxt "indonesia.kgm"
 msgid "Indonesia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3346
+#: mapsdatatranslation.cpp:3351
 msgctxt "indonesia.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3347
+#: mapsdatatranslation.cpp:3352
 msgctxt "indonesia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3348
+#: mapsdatatranslation.cpp:3353
 msgctxt "indonesia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3349
+#: mapsdatatranslation.cpp:3354
 msgctxt "indonesia.kgm"
 msgid "Not Indonesia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3350
+#: mapsdatatranslation.cpp:3355
 msgctxt "indonesia.kgm"
 msgid "Nanggroe Aceh Darussalam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3351
+#: mapsdatatranslation.cpp:3356
 msgctxt "indonesia.kgm"
 msgid "Banda Aceh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3352
+#: mapsdatatranslation.cpp:3357
 msgctxt "indonesia.kgm"
 msgid "North Sumatra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3353
+#: mapsdatatranslation.cpp:3358
 msgctxt "indonesia.kgm"
 msgid "Medan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3354
+#: mapsdatatranslation.cpp:3359
 msgctxt "indonesia.kgm"
 msgid "West Sumatra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3355
+#: mapsdatatranslation.cpp:3360
 msgctxt "indonesia.kgm"
 msgid "Padang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3356
+#: mapsdatatranslation.cpp:3361
 msgctxt "indonesia.kgm"
 msgid "Riau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3357
+#: mapsdatatranslation.cpp:3362
 msgctxt "indonesia.kgm"
 msgid "Pekanbaru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3358
+#: mapsdatatranslation.cpp:3363
 msgctxt "indonesia.kgm"
 msgid "Riau Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3359
+#: mapsdatatranslation.cpp:3364
 msgctxt "indonesia.kgm"
 msgid "Tanjung Pinang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3360 mapsdatatranslation.cpp:3361
+#: mapsdatatranslation.cpp:3365 mapsdatatranslation.cpp:3366
 msgctxt "indonesia.kgm"
 msgid "Jambi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3362 mapsdatatranslation.cpp:3363
+#: mapsdatatranslation.cpp:3367 mapsdatatranslation.cpp:3368
 msgctxt "indonesia.kgm"
 msgid "Bengkulu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3364
+#: mapsdatatranslation.cpp:3369
 msgctxt "indonesia.kgm"
 msgid "South Sumatra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3365
+#: mapsdatatranslation.cpp:3370
 msgctxt "indonesia.kgm"
 msgid "Palembang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3366
+#: mapsdatatranslation.cpp:3371
 msgctxt "indonesia.kgm"
 msgid "Bangka-Belitung"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3367
+#: mapsdatatranslation.cpp:3372
 msgctxt "indonesia.kgm"
 msgid "Pangkal Pinang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3368
+#: mapsdatatranslation.cpp:3373
 msgctxt "indonesia.kgm"
 msgid "Lampung"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3369
+#: mapsdatatranslation.cpp:3374
 msgctxt "indonesia.kgm"
 msgid "Bandar Lampung"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3370
+#: mapsdatatranslation.cpp:3375
 msgctxt "indonesia.kgm"
 msgid "Jakarta Special Capital Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3371
+#: mapsdatatranslation.cpp:3376
 msgctxt "indonesia.kgm"
 msgid "Jakarta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3372
+#: mapsdatatranslation.cpp:3377
 msgctxt "indonesia.kgm"
 msgid "Banten"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3373
+#: mapsdatatranslation.cpp:3378
 msgctxt "indonesia.kgm"
 msgid "Serang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3374
+#: mapsdatatranslation.cpp:3379
 msgctxt "indonesia.kgm"
 msgid "West Java"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3375
+#: mapsdatatranslation.cpp:3380
 msgctxt "indonesia.kgm"
 msgid "Bandung"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3376
+#: mapsdatatranslation.cpp:3381
 msgctxt "indonesia.kgm"
 msgid "Central Java"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3377
+#: mapsdatatranslation.cpp:3382
 msgctxt "indonesia.kgm"
 msgid "Semarang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3378
+#: mapsdatatranslation.cpp:3383
 msgctxt "indonesia.kgm"
 msgid "Yogyakarta Special Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3379
+#: mapsdatatranslation.cpp:3384
 msgctxt "indonesia.kgm"
 msgid "Yogyakarta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3380
+#: mapsdatatranslation.cpp:3385
 msgctxt "indonesia.kgm"
 msgid "East Java"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3381
+#: mapsdatatranslation.cpp:3386
 msgctxt "indonesia.kgm"
 msgid "Surabaya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3382
+#: mapsdatatranslation.cpp:3387
 msgctxt "indonesia.kgm"
 msgid "Bali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3383
+#: mapsdatatranslation.cpp:3388
 msgctxt "indonesia.kgm"
 msgid "Denpasar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3384
+#: mapsdatatranslation.cpp:3389
 msgctxt "indonesia.kgm"
 msgid "West Nusa Tenggara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3385
+#: mapsdatatranslation.cpp:3390
 msgctxt "indonesia.kgm"
 msgid "Mataram"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3386
+#: mapsdatatranslation.cpp:3391
 msgctxt "indonesia.kgm"
 msgid "East Nusa Tenggara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3387
+#: mapsdatatranslation.cpp:3392
 msgctxt "indonesia.kgm"
 msgid "Kupang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3388
+#: mapsdatatranslation.cpp:3393
 msgctxt "indonesia.kgm"
 msgid "West Kalimantan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3389
+#: mapsdatatranslation.cpp:3394
 msgctxt "indonesia.kgm"
 msgid "Pontianak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3390
+#: mapsdatatranslation.cpp:3395
 msgctxt "indonesia.kgm"
 msgid "Central Kalimantan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3391
+#: mapsdatatranslation.cpp:3396
 msgctxt "indonesia.kgm"
 msgid "Palangkaraya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3392
+#: mapsdatatranslation.cpp:3397
 msgctxt "indonesia.kgm"
 msgid "South Kalimantan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3393
+#: mapsdatatranslation.cpp:3398
 msgctxt "indonesia.kgm"
 msgid "Banjarmasin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3394
+#: mapsdatatranslation.cpp:3399
 msgctxt "indonesia.kgm"
 msgid "East Kalimantan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3395
+#: mapsdatatranslation.cpp:3400
 msgctxt "indonesia.kgm"
 msgid "Samarinda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3396
+#: mapsdatatranslation.cpp:3401
 msgctxt "indonesia.kgm"
 msgid "North Sulawesi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3397
+#: mapsdatatranslation.cpp:3402
 msgctxt "indonesia.kgm"
 msgid "Manado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3398 mapsdatatranslation.cpp:3399
+#: mapsdatatranslation.cpp:3403 mapsdatatranslation.cpp:3404
 msgctxt "indonesia.kgm"
 msgid "Gorontalo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3400
+#: mapsdatatranslation.cpp:3405
 msgctxt "indonesia.kgm"
 msgid "Central Sulawesi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3401
+#: mapsdatatranslation.cpp:3406
 msgctxt "indonesia.kgm"
 msgid "Palu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3402
+#: mapsdatatranslation.cpp:3407
 msgctxt "indonesia.kgm"
 msgid "South East Sulawesi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3403
+#: mapsdatatranslation.cpp:3408
 msgctxt "indonesia.kgm"
 msgid "Kendari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3404
+#: mapsdatatranslation.cpp:3409
 msgctxt "indonesia.kgm"
 msgid "South Sulawesi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3405
+#: mapsdatatranslation.cpp:3410
 msgctxt "indonesia.kgm"
 msgid "Makassar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3406
+#: mapsdatatranslation.cpp:3411
 msgctxt "indonesia.kgm"
 msgid "West Sulawesi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3407
+#: mapsdatatranslation.cpp:3412
 msgctxt "indonesia.kgm"
 msgid "Mamuju"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3408
+#: mapsdatatranslation.cpp:3413
 msgctxt "indonesia.kgm"
 msgid "Maluku"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3409
+#: mapsdatatranslation.cpp:3414
 msgctxt "indonesia.kgm"
 msgid "Ambon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3410
+#: mapsdatatranslation.cpp:3415
 msgctxt "indonesia.kgm"
 msgid "North Maluku"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3411
+#: mapsdatatranslation.cpp:3416
 msgctxt "indonesia.kgm"
 msgid "Ternate"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3412
+#: mapsdatatranslation.cpp:3417
 msgctxt "indonesia.kgm"
 msgid "Papua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3413
+#: mapsdatatranslation.cpp:3418
 msgctxt "indonesia.kgm"
 msgid "Jayapura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3414
+#: mapsdatatranslation.cpp:3419
 msgctxt "indonesia.kgm"
 msgid "West Irian Jaya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3415
+#: mapsdatatranslation.cpp:3420
 msgctxt "indonesia.kgm"
 msgid "Manokwari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3416
+#: mapsdatatranslation.cpp:3421
 msgctxt "iran.kgm"
 msgid "Iran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3417
+#: mapsdatatranslation.cpp:3422
 msgctxt "iran.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3418 mapsdatatranslation.cpp:3419
+#: mapsdatatranslation.cpp:3423 mapsdatatranslation.cpp:3424
 msgctxt "iran.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3420 mapsdatatranslation.cpp:3421
+#: mapsdatatranslation.cpp:3425 mapsdatatranslation.cpp:3426
 msgctxt "iran.kgm"
 msgid "Tehran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3422 mapsdatatranslation.cpp:3423
+#: mapsdatatranslation.cpp:3427
+msgctxt "iran.kgm"
+msgid "Alborz"
+msgstr ""
+
+#: mapsdatatranslation.cpp:3428
+msgctxt "iran.kgm"
+msgid "Karaj"
+msgstr ""
+
+#: mapsdatatranslation.cpp:3429 mapsdatatranslation.cpp:3430
 msgctxt "iran.kgm"
 msgid "Qom"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3424
+#: mapsdatatranslation.cpp:3431
 msgctxt "iran.kgm"
 msgid "Markazi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3425
+#: mapsdatatranslation.cpp:3432
 msgctxt "iran.kgm"
 msgid "Arak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3426 mapsdatatranslation.cpp:3427
+#: mapsdatatranslation.cpp:3433 mapsdatatranslation.cpp:3434
 msgctxt "iran.kgm"
 msgid "Qazvin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3428
+#: mapsdatatranslation.cpp:3435
 msgctxt "iran.kgm"
 msgid "Gilan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3429
+#: mapsdatatranslation.cpp:3436
 msgctxt "iran.kgm"
 msgid "Rasht"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3430 mapsdatatranslation.cpp:3431
+#: mapsdatatranslation.cpp:3437 mapsdatatranslation.cpp:3438
 msgctxt "iran.kgm"
 msgid "Ardabil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3432 mapsdatatranslation.cpp:3433
+#: mapsdatatranslation.cpp:3439 mapsdatatranslation.cpp:3440
 msgctxt "iran.kgm"
 msgid "Zanjan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3434
+#: mapsdatatranslation.cpp:3441
 msgctxt "iran.kgm"
 msgid "East Azarbaijan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3435
+#: mapsdatatranslation.cpp:3442
 msgctxt "iran.kgm"
 msgid "Tabriz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3436
+#: mapsdatatranslation.cpp:3443
 msgctxt "iran.kgm"
 msgid "West Azarbaijan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3437
+#: mapsdatatranslation.cpp:3444
 msgctxt "iran.kgm"
 msgid "Oroomieh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3438
+#: mapsdatatranslation.cpp:3445
 msgctxt "iran.kgm"
 msgid "Kurdistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3439
+#: mapsdatatranslation.cpp:3446
 msgctxt "iran.kgm"
 msgid "Sanandaj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3440 mapsdatatranslation.cpp:3441
+#: mapsdatatranslation.cpp:3447 mapsdatatranslation.cpp:3448
 msgctxt "iran.kgm"
 msgid "Hamedan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3442 mapsdatatranslation.cpp:3443
+#: mapsdatatranslation.cpp:3449 mapsdatatranslation.cpp:3450
 msgctxt "iran.kgm"
 msgid "Kermanshah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3444 mapsdatatranslation.cpp:3445
+#: mapsdatatranslation.cpp:3451 mapsdatatranslation.cpp:3452
 msgctxt "iran.kgm"
 msgid "Ilam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3446
+#: mapsdatatranslation.cpp:3453
 msgctxt "iran.kgm"
 msgid "Lorestan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3447
+#: mapsdatatranslation.cpp:3454
 msgctxt "iran.kgm"
 msgid "Khoram Abad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3448
+#: mapsdatatranslation.cpp:3455
 msgctxt "iran.kgm"
 msgid "Khuzestan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3449
+#: mapsdatatranslation.cpp:3456
 msgctxt "iran.kgm"
 msgid "Ahvaz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3450
+#: mapsdatatranslation.cpp:3457
 msgctxt "iran.kgm"
 msgid "Chaharmahal and Bakhtiari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3451
+#: mapsdatatranslation.cpp:3458
 msgctxt "iran.kgm"
 msgid "shahr-e Kord"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3452
+#: mapsdatatranslation.cpp:3459
 msgctxt "iran.kgm"
 msgid "Kohkiluyeh and Buyer Ahmah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3453
+#: mapsdatatranslation.cpp:3460
 msgctxt "iran.kgm"
 msgid "Yasooj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3454 mapsdatatranslation.cpp:3455
+#: mapsdatatranslation.cpp:3461 mapsdatatranslation.cpp:3462
 msgctxt "iran.kgm"
 msgid "Bushehr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3456
+#: mapsdatatranslation.cpp:3463
 msgctxt "iran.kgm"
 msgid "Fars"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3457
+#: mapsdatatranslation.cpp:3464
 msgctxt "iran.kgm"
 msgid "Shiraz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3458
+#: mapsdatatranslation.cpp:3465
 msgctxt "iran.kgm"
 msgid "Hormozgan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3459
+#: mapsdatatranslation.cpp:3466
 msgctxt "iran.kgm"
 msgid "Bandar-e Abbas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3460
+#: mapsdatatranslation.cpp:3467
 msgctxt "iran.kgm"
 msgid "Systan and Baluchistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3461
+#: mapsdatatranslation.cpp:3468
 msgctxt "iran.kgm"
 msgid "Zahedan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3462 mapsdatatranslation.cpp:3463
+#: mapsdatatranslation.cpp:3469 mapsdatatranslation.cpp:3470
 msgctxt "iran.kgm"
 msgid "Kerman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3464 mapsdatatranslation.cpp:3465
+#: mapsdatatranslation.cpp:3471 mapsdatatranslation.cpp:3472
 msgctxt "iran.kgm"
 msgid "Yazd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3466 mapsdatatranslation.cpp:3467
+#: mapsdatatranslation.cpp:3473 mapsdatatranslation.cpp:3474
 msgctxt "iran.kgm"
 msgid "Esfahan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3468 mapsdatatranslation.cpp:3469
+#: mapsdatatranslation.cpp:3475 mapsdatatranslation.cpp:3476
 msgctxt "iran.kgm"
 msgid "Semnan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3470
+#: mapsdatatranslation.cpp:3477
 msgctxt "iran.kgm"
 msgid "Mazandaran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3471
+#: mapsdatatranslation.cpp:3478
 msgctxt "iran.kgm"
 msgid "Sari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3472
+#: mapsdatatranslation.cpp:3479
 msgctxt "iran.kgm"
 msgid "Golestan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3473
+#: mapsdatatranslation.cpp:3480
 msgctxt "iran.kgm"
 msgid "Gorgan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3474
+#: mapsdatatranslation.cpp:3481
 msgctxt "iran.kgm"
 msgid "South Khorasan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3475
+#: mapsdatatranslation.cpp:3482
 msgctxt "iran.kgm"
 msgid "Birjand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3476
+#: mapsdatatranslation.cpp:3483
 msgctxt "iran.kgm"
 msgid "Razavi Khorasan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3477
+#: mapsdatatranslation.cpp:3484
 msgctxt "iran.kgm"
 msgid "Mashhad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3478
+#: mapsdatatranslation.cpp:3485
 msgctxt "iran.kgm"
 msgid "North Khorasan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3479
+#: mapsdatatranslation.cpp:3486
 msgctxt "iran.kgm"
 msgid "Bojnoord"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3480
+#: mapsdatatranslation.cpp:3487
 msgctxt "iran.kgm"
 msgid "Persian Gulf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3481
+#: mapsdatatranslation.cpp:3488
 msgctxt "iran.kgm"
 msgid "Gulf of Oman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3482
+#: mapsdatatranslation.cpp:3489
 msgctxt "iran.kgm"
 msgid "Caspian Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3483
+#: mapsdatatranslation.cpp:3490
 msgctxt "iran.kgm"
 msgid "Oroomieh Lake"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3484
+#: mapsdatatranslation.cpp:3491
 msgctxt "iran.kgm"
 msgid "Saudi Arabia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3485
+#: mapsdatatranslation.cpp:3492
 msgctxt "iran.kgm"
 msgid "Oman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3486
+#: mapsdatatranslation.cpp:3493
 msgctxt "iran.kgm"
 msgid "Iraq"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3487
+#: mapsdatatranslation.cpp:3494
 msgctxt "iran.kgm"
 msgid "Kuwait"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3488
+#: mapsdatatranslation.cpp:3495
 msgctxt "iran.kgm"
 msgid "Turkmenistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3489
+#: mapsdatatranslation.cpp:3496
 msgctxt "iran.kgm"
 msgid "Afghanistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3490
+#: mapsdatatranslation.cpp:3497
 msgctxt "iran.kgm"
 msgid "Pakistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3491
+#: mapsdatatranslation.cpp:3498
 msgctxt "iran.kgm"
 msgid "Azerbaijan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3492
+#: mapsdatatranslation.cpp:3499
 msgctxt "iran.kgm"
 msgid "Armenia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3493
+#: mapsdatatranslation.cpp:3500
 msgctxt "iran.kgm"
 msgid "Turkey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3494
+#: mapsdatatranslation.cpp:3501
 msgctxt "iran.kgm"
 msgid "Qatar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3495
+#: mapsdatatranslation.cpp:3502
 msgctxt "iran.kgm"
 msgid "United Arab Emirates"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3496
+#: mapsdatatranslation.cpp:3503
 msgctxt "iraq.kgm"
 msgid "Iraq"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3497
+#: mapsdatatranslation.cpp:3504
 msgctxt "iraq.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3498
+#: mapsdatatranslation.cpp:3505
 msgctxt "iraq.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3499
+#: mapsdatatranslation.cpp:3506
 msgctxt "iraq.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3500
+#: mapsdatatranslation.cpp:3507
 msgctxt "iraq.kgm"
 msgid "Not Iraq"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3501
+#: mapsdatatranslation.cpp:3508
 msgctxt "iraq.kgm"
 msgid "Baghdad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3502
+#: mapsdatatranslation.cpp:3509
 msgctxt "iraq.kgm"
 msgid "Salah ad Din"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3503
+#: mapsdatatranslation.cpp:3510
 msgctxt "iraq.kgm"
 msgid "Diyala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3504
+#: mapsdatatranslation.cpp:3511
 msgctxt "iraq.kgm"
 msgid "Wasit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3505
+#: mapsdatatranslation.cpp:3512
 msgctxt "iraq.kgm"
 msgid "Maysan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3506
+#: mapsdatatranslation.cpp:3513
 msgctxt "iraq.kgm"
 msgid "Al Basrah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3507
+#: mapsdatatranslation.cpp:3514
 msgctxt "iraq.kgm"
 msgid "Dhi Qar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3508
+#: mapsdatatranslation.cpp:3515
 msgctxt "iraq.kgm"
 msgid "Al Muthanna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3509
+#: mapsdatatranslation.cpp:3516
 msgctxt "iraq.kgm"
 msgid "Al-Qādisiyyah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3510
+#: mapsdatatranslation.cpp:3517
 msgctxt "iraq.kgm"
 msgid "Babil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3511
+#: mapsdatatranslation.cpp:3518
 msgctxt "iraq.kgm"
 msgid "Karbala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3512
+#: mapsdatatranslation.cpp:3519
 msgctxt "iraq.kgm"
 msgid "An Najaf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3513
+#: mapsdatatranslation.cpp:3520
 msgctxt "iraq.kgm"
 msgid "Al Anbar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3514
+#: mapsdatatranslation.cpp:3521
 msgctxt "iraq.kgm"
 msgid "Ninawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3515
+#: mapsdatatranslation.cpp:3522
 msgctxt "iraq.kgm"
 msgid "Dahuk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3516
+#: mapsdatatranslation.cpp:3523
 msgctxt "iraq.kgm"
 msgid "Arbil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3517
+#: mapsdatatranslation.cpp:3524
 msgctxt "iraq.kgm"
 msgid "At Ta'mim (Kirkuk)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3518
+#: mapsdatatranslation.cpp:3525
 msgctxt "iraq.kgm"
 msgid "As Sulaymaniyah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3519
+#: mapsdatatranslation.cpp:3526
 msgctxt "ireland_provinces.kgm"
 msgid "Ireland (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3520
+#: mapsdatatranslation.cpp:3527
 msgctxt "ireland_provinces.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3521
+#: mapsdatatranslation.cpp:3528
 msgctxt "ireland_provinces.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3522
+#: mapsdatatranslation.cpp:3529
 msgctxt "ireland_provinces.kgm"
 msgid "Not Ireland (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3523
+#: mapsdatatranslation.cpp:3530
 msgctxt "ireland_provinces.kgm"
 msgid "Leinster"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3524
+#: mapsdatatranslation.cpp:3531
 msgctxt "ireland_provinces.kgm"
 msgid "Dublin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3525
+#: mapsdatatranslation.cpp:3532
 msgctxt "ireland_provinces.kgm"
 msgid "Munster"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3526
+#: mapsdatatranslation.cpp:3533
 msgctxt "ireland_provinces.kgm"
 msgid "Cork"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3527
+#: mapsdatatranslation.cpp:3534
 msgctxt "ireland_provinces.kgm"
 msgid "Connacht"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3528
+#: mapsdatatranslation.cpp:3535
 msgctxt "ireland_provinces.kgm"
 msgid "Galway"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3529
+#: mapsdatatranslation.cpp:3536
 msgctxt "ireland_provinces.kgm"
 msgid "Ulster"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3530
+#: mapsdatatranslation.cpp:3537
 msgctxt "ireland_provinces.kgm"
 msgid "Belfast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3531
+#: mapsdatatranslation.cpp:3538
 msgctxt "israel.kgm"
 msgid "Israel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3532
+#: mapsdatatranslation.cpp:3539
 msgctxt "israel.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3533
+#: mapsdatatranslation.cpp:3540
 msgctxt "israel.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3534
+#: mapsdatatranslation.cpp:3541
 msgctxt "israel.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3535
+#: mapsdatatranslation.cpp:3542
 msgctxt "israel.kgm"
 msgid "Not Israel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3536
+#: mapsdatatranslation.cpp:3543
 msgctxt "israel.kgm"
 msgid "Jerusalem"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3537
+#: mapsdatatranslation.cpp:3544
 msgctxt "israel.kgm"
 msgid "Northern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3538
+#: mapsdatatranslation.cpp:3545
 msgctxt "israel.kgm"
 msgid "Nazareth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3539
+#: mapsdatatranslation.cpp:3546
 msgctxt "israel.kgm"
 msgid "Haifa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3540
+#: mapsdatatranslation.cpp:3547
 msgctxt "israel.kgm"
 msgid "Center"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3541
+#: mapsdatatranslation.cpp:3548
 msgctxt "israel.kgm"
 msgid "Ramla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3542
+#: mapsdatatranslation.cpp:3549
 msgctxt "israel.kgm"
 msgid "Tel Aviv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3543
+#: mapsdatatranslation.cpp:3550
 msgctxt "israel.kgm"
 msgid "Southern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3544
+#: mapsdatatranslation.cpp:3551
 msgctxt "israel.kgm"
 msgid "Beersheba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3545
+#: mapsdatatranslation.cpp:3552
 msgctxt "italy.kgm"
 msgid "Italy"
 msgstr "yr Eidal"
 
-#: mapsdatatranslation.cpp:3546
+#: mapsdatatranslation.cpp:3553
 msgctxt "italy.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3547
+#: mapsdatatranslation.cpp:3554
 msgctxt "italy.kgm"
 msgid "Not Italy"
 msgstr "Not yr Eidal"
 
-#: mapsdatatranslation.cpp:3548 mapsdatatranslation.cpp:3549
+#: mapsdatatranslation.cpp:3555 mapsdatatranslation.cpp:3556
 msgctxt "italy.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:3550
+#: mapsdatatranslation.cpp:3557
 msgctxt "italy.kgm"
 msgid "Sicily"
 msgstr "Sicily"
 
-#: mapsdatatranslation.cpp:3551
+#: mapsdatatranslation.cpp:3558
 msgctxt "italy.kgm"
 msgid "Palermo"
 msgstr "Palermo"
 
-#: mapsdatatranslation.cpp:3552
+#: mapsdatatranslation.cpp:3559
 msgctxt "italy.kgm"
 msgid "Friuli Venezia Giulia"
 msgstr "Friuli Venezia Giulia"
 
-#: mapsdatatranslation.cpp:3553
+#: mapsdatatranslation.cpp:3560
 msgctxt "italy.kgm"
 msgid "Trieste"
 msgstr "Trieste"
 
-#: mapsdatatranslation.cpp:3554
+#: mapsdatatranslation.cpp:3561
 msgctxt "italy.kgm"
 msgid "Abruzzo"
 msgstr "Abruzzo"
 
-#: mapsdatatranslation.cpp:3555
+#: mapsdatatranslation.cpp:3562
 msgctxt "italy.kgm"
 msgid "L'Aquila"
 msgstr "L'Aquila"
 
-#: mapsdatatranslation.cpp:3556
+#: mapsdatatranslation.cpp:3563
 msgctxt "italy.kgm"
 msgid "Latium"
 msgstr "Latium"
 
-#: mapsdatatranslation.cpp:3557
+#: mapsdatatranslation.cpp:3564
 msgctxt "italy.kgm"
 msgid "Rome"
 msgstr "Rome"
 
-#: mapsdatatranslation.cpp:3558
+#: mapsdatatranslation.cpp:3565
 msgctxt "italy.kgm"
 msgid "Calabria"
 msgstr "Calabria"
 
-#: mapsdatatranslation.cpp:3559
+#: mapsdatatranslation.cpp:3566
 msgctxt "italy.kgm"
 msgid "Catanzaro"
 msgstr "Catanzaro"
 
-#: mapsdatatranslation.cpp:3560
+#: mapsdatatranslation.cpp:3567
 msgctxt "italy.kgm"
 msgid "Piedmont"
 msgstr "Piedmont"
 
-#: mapsdatatranslation.cpp:3561
+#: mapsdatatranslation.cpp:3568
 msgctxt "italy.kgm"
 msgid "Turin"
 msgstr "Turin"
 
-#: mapsdatatranslation.cpp:3562
+#: mapsdatatranslation.cpp:3569
 msgctxt "italy.kgm"
 msgid "Apulia"
 msgstr "Apulia"
 
-#: mapsdatatranslation.cpp:3563
+#: mapsdatatranslation.cpp:3570
 msgctxt "italy.kgm"
 msgid "Bari"
 msgstr "Bari"
 
-#: mapsdatatranslation.cpp:3564
+#: mapsdatatranslation.cpp:3571
 msgctxt "italy.kgm"
 msgid "Lombardy"
 msgstr "Lombardy"
 
-#: mapsdatatranslation.cpp:3565
+#: mapsdatatranslation.cpp:3572
 msgctxt "italy.kgm"
 msgid "Milan"
 msgstr "Milan"
 
-#: mapsdatatranslation.cpp:3566
+#: mapsdatatranslation.cpp:3573
 msgctxt "italy.kgm"
 msgid "Umbria"
 msgstr "Umbria"
 
-#: mapsdatatranslation.cpp:3567
+#: mapsdatatranslation.cpp:3574
 msgctxt "italy.kgm"
 msgid "Perugia"
 msgstr "Perugia"
 
-#: mapsdatatranslation.cpp:3568
+#: mapsdatatranslation.cpp:3575
 msgctxt "italy.kgm"
 msgid "Trentino Alto Adige"
 msgstr "Trentino Alto Adige"
 
-#: mapsdatatranslation.cpp:3569
+#: mapsdatatranslation.cpp:3576
 msgctxt "italy.kgm"
 msgid "Trento"
 msgstr "Trento"
 
-#: mapsdatatranslation.cpp:3570
+#: mapsdatatranslation.cpp:3577
 msgctxt "italy.kgm"
 msgid "Molise"
 msgstr "Molise"
 
-#: mapsdatatranslation.cpp:3571
+#: mapsdatatranslation.cpp:3578
 msgctxt "italy.kgm"
 msgid "Campobasso"
 msgstr "Campobasso"
 
-#: mapsdatatranslation.cpp:3572
+#: mapsdatatranslation.cpp:3579
 msgctxt "italy.kgm"
 msgid "Tuscany"
 msgstr "Tuscany"
 
-#: mapsdatatranslation.cpp:3573
+#: mapsdatatranslation.cpp:3580
 msgctxt "italy.kgm"
 msgid "Florence"
 msgstr "Florence"
 
-#: mapsdatatranslation.cpp:3574
+#: mapsdatatranslation.cpp:3581
 msgctxt "italy.kgm"
 msgid "Emilia Romagna"
 msgstr "Emilia Romagna"
 
-#: mapsdatatranslation.cpp:3575
+#: mapsdatatranslation.cpp:3582
 msgctxt "italy.kgm"
 msgid "Bologna"
 msgstr "Bologna"
 
-#: mapsdatatranslation.cpp:3576
+#: mapsdatatranslation.cpp:3583
 msgctxt "italy.kgm"
 msgid "Val d'Aosta"
 msgstr "Val d'Aosta"
 
-#: mapsdatatranslation.cpp:3577
+#: mapsdatatranslation.cpp:3584
 msgctxt "italy.kgm"
 msgid "Aosta"
 msgstr "Aosta"
 
-#: mapsdatatranslation.cpp:3578
+#: mapsdatatranslation.cpp:3585
 msgctxt "italy.kgm"
 msgid "Campania"
 msgstr "Campania"
 
-#: mapsdatatranslation.cpp:3579
+#: mapsdatatranslation.cpp:3586
 msgctxt "italy.kgm"
 msgid "Naples"
 msgstr "Naples"
 
-#: mapsdatatranslation.cpp:3580
+#: mapsdatatranslation.cpp:3587
 msgctxt "italy.kgm"
 msgid "Basilicata"
 msgstr "Basilicata"
 
-#: mapsdatatranslation.cpp:3581
+#: mapsdatatranslation.cpp:3588
 msgctxt "italy.kgm"
 msgid "Potenza"
 msgstr "Potenza"
 
-#: mapsdatatranslation.cpp:3582
+#: mapsdatatranslation.cpp:3589
 msgctxt "italy.kgm"
 msgid "Liguria"
 msgstr "Liguria"
 
-#: mapsdatatranslation.cpp:3583
+#: mapsdatatranslation.cpp:3590
 msgctxt "italy.kgm"
 msgid "Genoa"
 msgstr "Genoa"
 
-#: mapsdatatranslation.cpp:3584
+#: mapsdatatranslation.cpp:3591
 msgctxt "italy.kgm"
 msgid "Sardinia"
 msgstr "Sardinia"
 
-#: mapsdatatranslation.cpp:3585
+#: mapsdatatranslation.cpp:3592
 msgctxt "italy.kgm"
 msgid "Cagliari"
 msgstr "Cagliari"
 
-#: mapsdatatranslation.cpp:3586
+#: mapsdatatranslation.cpp:3593
 msgctxt "italy.kgm"
 msgid "Marches"
 msgstr "Marches"
 
-#: mapsdatatranslation.cpp:3587
+#: mapsdatatranslation.cpp:3594
 msgctxt "italy.kgm"
 msgid "Ancona"
 msgstr "Ancona"
 
-#: mapsdatatranslation.cpp:3588
+#: mapsdatatranslation.cpp:3595
 msgctxt "italy.kgm"
 msgid "Veneto"
 msgstr "Veneto"
 
-#: mapsdatatranslation.cpp:3589
+#: mapsdatatranslation.cpp:3596
 msgctxt "italy.kgm"
 msgid "Venice"
 msgstr "Venice"
 
-#: mapsdatatranslation.cpp:3590
+#: mapsdatatranslation.cpp:3597
 msgctxt "italyprovince.kgm"
 msgid "Italy by Provinces"
 msgstr "yr Eidal by Provinces"
 
-#: mapsdatatranslation.cpp:3591
+#: mapsdatatranslation.cpp:3598
 msgctxt "italyprovince.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3592
+#: mapsdatatranslation.cpp:3599
 msgctxt "italyprovince.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:3593
+#: mapsdatatranslation.cpp:3600
 msgctxt "italyprovince.kgm"
 msgid "Not Italy"
 msgstr "Not yr Eidal"
 
-#: mapsdatatranslation.cpp:3594
+#: mapsdatatranslation.cpp:3601
 msgctxt "italyprovince.kgm"
 msgid "Alessandria"
 msgstr "Alessandria"
 
-#: mapsdatatranslation.cpp:3595
+#: mapsdatatranslation.cpp:3602
 msgctxt "italyprovince.kgm"
 msgid "Asti"
 msgstr "Asti"
 
-#: mapsdatatranslation.cpp:3596
+#: mapsdatatranslation.cpp:3603
 msgctxt "italyprovince.kgm"
 msgid "Biella"
 msgstr "Biella"
 
-#: mapsdatatranslation.cpp:3597
+#: mapsdatatranslation.cpp:3604
 msgctxt "italyprovince.kgm"
 msgid "Cuneo"
 msgstr "Cuneo"
 
-#: mapsdatatranslation.cpp:3598
+#: mapsdatatranslation.cpp:3605
 msgctxt "italyprovince.kgm"
 msgid "Novara"
 msgstr "Novara"
 
-#: mapsdatatranslation.cpp:3599
+#: mapsdatatranslation.cpp:3606
 msgctxt "italyprovince.kgm"
 msgid "Turin"
 msgstr "Turin"
 
-#: mapsdatatranslation.cpp:3600
+#: mapsdatatranslation.cpp:3607
 msgctxt "italyprovince.kgm"
 msgid "Verbano-Cusio-Ossola"
 msgstr "Verbano-Cusio-Ossola"
 
-#: mapsdatatranslation.cpp:3601
+#: mapsdatatranslation.cpp:3608
 msgctxt "italyprovince.kgm"
 msgid "Vercelli"
 msgstr "Vercelli"
 
-#: mapsdatatranslation.cpp:3602
+#: mapsdatatranslation.cpp:3609
 msgctxt "italyprovince.kgm"
 msgid "Bergamo"
 msgstr "Bergamo"
 
-#: mapsdatatranslation.cpp:3603
+#: mapsdatatranslation.cpp:3610
 msgctxt "italyprovince.kgm"
 msgid "Brescia"
 msgstr "Brescia"
 
-#: mapsdatatranslation.cpp:3604
+#: mapsdatatranslation.cpp:3611
 msgctxt "italyprovince.kgm"
 msgid "Como"
 msgstr "Como"
 
-#: mapsdatatranslation.cpp:3605
+#: mapsdatatranslation.cpp:3612
 msgctxt "italyprovince.kgm"
 msgid "Cremona"
 msgstr "Cremona"
 
-#: mapsdatatranslation.cpp:3606
+#: mapsdatatranslation.cpp:3613
 msgctxt "italyprovince.kgm"
 msgid "Lecco"
 msgstr "Lecco"
 
-#: mapsdatatranslation.cpp:3607
+#: mapsdatatranslation.cpp:3614
 msgctxt "italyprovince.kgm"
 msgid "Lodi"
 msgstr "Lodi"
 
-#: mapsdatatranslation.cpp:3608
+#: mapsdatatranslation.cpp:3615
 msgctxt "italyprovince.kgm"
 msgid "Mantova"
 msgstr "Mantova"
 
-#: mapsdatatranslation.cpp:3609
+#: mapsdatatranslation.cpp:3616
 msgctxt "italyprovince.kgm"
 msgid "Milan"
 msgstr "Milan"
 
-#: mapsdatatranslation.cpp:3610
+#: mapsdatatranslation.cpp:3617
 msgctxt "italyprovince.kgm"
 msgid "Pavia"
 msgstr "Pavia"
 
-#: mapsdatatranslation.cpp:3611
+#: mapsdatatranslation.cpp:3618
 msgctxt "italyprovince.kgm"
 msgid "Sondrio"
 msgstr "Sondrio"
 
-#: mapsdatatranslation.cpp:3612
+#: mapsdatatranslation.cpp:3619
 msgctxt "italyprovince.kgm"
 msgid "Varese"
 msgstr "Varese"
 
-#: mapsdatatranslation.cpp:3613
+#: mapsdatatranslation.cpp:3620
 msgctxt "italyprovince.kgm"
 msgid "Aosta"
 msgstr "Aosta"
 
-#: mapsdatatranslation.cpp:3614
+#: mapsdatatranslation.cpp:3621
 msgctxt "italyprovince.kgm"
 msgid "Bolzano"
 msgstr "Bolzano"
 
-#: mapsdatatranslation.cpp:3615
+#: mapsdatatranslation.cpp:3622
 msgctxt "italyprovince.kgm"
 msgid "Trento"
 msgstr "Trento"
 
-#: mapsdatatranslation.cpp:3616
+#: mapsdatatranslation.cpp:3623
 msgctxt "italyprovince.kgm"
 msgid "Belluno"
 msgstr "Belluno"
 
-#: mapsdatatranslation.cpp:3617
+#: mapsdatatranslation.cpp:3624
 msgctxt "italyprovince.kgm"
 msgid "Padova"
 msgstr "Padova"
 
-#: mapsdatatranslation.cpp:3618
+#: mapsdatatranslation.cpp:3625
 msgctxt "italyprovince.kgm"
 msgid "Rovigo"
 msgstr "Rovigo"
 
-#: mapsdatatranslation.cpp:3619
+#: mapsdatatranslation.cpp:3626
 msgctxt "italyprovince.kgm"
 msgid "Treviso"
 msgstr "Treviso"
 
-#: mapsdatatranslation.cpp:3620
+#: mapsdatatranslation.cpp:3627
 msgctxt "italyprovince.kgm"
 msgid "Venice"
 msgstr "Venice"
 
-#: mapsdatatranslation.cpp:3621
+#: mapsdatatranslation.cpp:3628
 msgctxt "italyprovince.kgm"
 msgid "Verona"
 msgstr "Verona"
 
-#: mapsdatatranslation.cpp:3622
+#: mapsdatatranslation.cpp:3629
 msgctxt "italyprovince.kgm"
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: mapsdatatranslation.cpp:3623
+#: mapsdatatranslation.cpp:3630
 msgctxt "italyprovince.kgm"
 msgid "Gorizia"
 msgstr "Gorizia"
 
-#: mapsdatatranslation.cpp:3624
+#: mapsdatatranslation.cpp:3631
 msgctxt "italyprovince.kgm"
 msgid "Pordenone"
 msgstr "Pordenone"
 
-#: mapsdatatranslation.cpp:3625
+#: mapsdatatranslation.cpp:3632
 msgctxt "italyprovince.kgm"
 msgid "Trieste"
 msgstr "Trieste"
 
-#: mapsdatatranslation.cpp:3626
+#: mapsdatatranslation.cpp:3633
 msgctxt "italyprovince.kgm"
 msgid "Udine"
 msgstr "Udine"
 
-#: mapsdatatranslation.cpp:3627
+#: mapsdatatranslation.cpp:3634
 msgctxt "italyprovince.kgm"
 msgid "Genoa"
 msgstr "Genoa"
 
-#: mapsdatatranslation.cpp:3628
+#: mapsdatatranslation.cpp:3635
 msgctxt "italyprovince.kgm"
 msgid "Imperia"
 msgstr "Imperia"
 
-#: mapsdatatranslation.cpp:3629
+#: mapsdatatranslation.cpp:3636
 msgctxt "italyprovince.kgm"
 msgid "La Spezia"
 msgstr "La Spezia"
 
-#: mapsdatatranslation.cpp:3630
+#: mapsdatatranslation.cpp:3637
 msgctxt "italyprovince.kgm"
 msgid "Savona"
 msgstr "Savona"
 
-#: mapsdatatranslation.cpp:3631
+#: mapsdatatranslation.cpp:3638
 msgctxt "italyprovince.kgm"
 msgid "Bologna"
 msgstr "Bologna"
 
-#: mapsdatatranslation.cpp:3632
+#: mapsdatatranslation.cpp:3639
 msgctxt "italyprovince.kgm"
 msgid "Ferrara"
 msgstr "Ferrara"
 
-#: mapsdatatranslation.cpp:3633
+#: mapsdatatranslation.cpp:3640
 msgctxt "italyprovince.kgm"
 msgid "Forlì-Cesena"
 msgstr "Forlì-Cesena"
 
-#: mapsdatatranslation.cpp:3634
+#: mapsdatatranslation.cpp:3641
 msgctxt "italyprovince.kgm"
 msgid "Modena"
 msgstr "Modena"
 
-#: mapsdatatranslation.cpp:3635
+#: mapsdatatranslation.cpp:3642
 msgctxt "italyprovince.kgm"
 msgid "Parma"
 msgstr "Parma"
 
-#: mapsdatatranslation.cpp:3636
+#: mapsdatatranslation.cpp:3643
 msgctxt "italyprovince.kgm"
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: mapsdatatranslation.cpp:3637
+#: mapsdatatranslation.cpp:3644
 msgctxt "italyprovince.kgm"
 msgid "Ravenna"
 msgstr "Ravenna"
 
-#: mapsdatatranslation.cpp:3638
+#: mapsdatatranslation.cpp:3645
 msgctxt "italyprovince.kgm"
 msgid "Reggio nell'Emilia"
 msgstr "Reggio nell'Emilia"
 
-#: mapsdatatranslation.cpp:3639
+#: mapsdatatranslation.cpp:3646
 msgctxt "italyprovince.kgm"
 msgid "Rimini"
 msgstr "Rimini"
 
-#: mapsdatatranslation.cpp:3640
+#: mapsdatatranslation.cpp:3647
 msgctxt "italyprovince.kgm"
 msgid "Arezzo"
 msgstr "Arezzo"
 
-#: mapsdatatranslation.cpp:3641
+#: mapsdatatranslation.cpp:3648
 msgctxt "italyprovince.kgm"
 msgid "Florence"
 msgstr "Florence"
 
-#: mapsdatatranslation.cpp:3642
+#: mapsdatatranslation.cpp:3649
 msgctxt "italyprovince.kgm"
 msgid "Grosseto"
 msgstr "Grosseto"
 
-#: mapsdatatranslation.cpp:3643
+#: mapsdatatranslation.cpp:3650
 msgctxt "italyprovince.kgm"
 msgid "Livorno"
 msgstr "Livorno"
 
-#: mapsdatatranslation.cpp:3644
+#: mapsdatatranslation.cpp:3651
 msgctxt "italyprovince.kgm"
 msgid "Lucca"
 msgstr "Lucca"
 
-#: mapsdatatranslation.cpp:3645
+#: mapsdatatranslation.cpp:3652
 msgctxt "italyprovince.kgm"
 msgid "Massa-Carrara"
 msgstr "Massa-Carrara"
 
-#: mapsdatatranslation.cpp:3646
+#: mapsdatatranslation.cpp:3653
 msgctxt "italyprovince.kgm"
 msgid "Pisa"
 msgstr "Pisa"
 
-#: mapsdatatranslation.cpp:3647
+#: mapsdatatranslation.cpp:3654
 msgctxt "italyprovince.kgm"
 msgid "Pistoia"
 msgstr "Pistoia"
 
-#: mapsdatatranslation.cpp:3648
+#: mapsdatatranslation.cpp:3655
 msgctxt "italyprovince.kgm"
 msgid "Prato"
 msgstr "Prato"
 
-#: mapsdatatranslation.cpp:3649
+#: mapsdatatranslation.cpp:3656
 msgctxt "italyprovince.kgm"
 msgid "Siena"
 msgstr "Siena"
 
-#: mapsdatatranslation.cpp:3650
+#: mapsdatatranslation.cpp:3657
 msgctxt "italyprovince.kgm"
 msgid "Perugia"
 msgstr "Perugia"
 
-#: mapsdatatranslation.cpp:3651
+#: mapsdatatranslation.cpp:3658
 msgctxt "italyprovince.kgm"
 msgid "Terni"
 msgstr "Terni"
 
-#: mapsdatatranslation.cpp:3652
+#: mapsdatatranslation.cpp:3659
 msgctxt "italyprovince.kgm"
 msgid "Ancona"
 msgstr "Ancona"
 
-#: mapsdatatranslation.cpp:3653
+#: mapsdatatranslation.cpp:3660
 msgctxt "italyprovince.kgm"
 msgid "Ascoli Piceno"
 msgstr "Ascoli Piceno"
 
-#: mapsdatatranslation.cpp:3654
+#: mapsdatatranslation.cpp:3661
 msgctxt "italyprovince.kgm"
 msgid "Macerata"
 msgstr "Macerata"
 
-#: mapsdatatranslation.cpp:3655
+#: mapsdatatranslation.cpp:3662
 msgctxt "italyprovince.kgm"
 msgid "Pesaro and Urbino"
 msgstr "Pesaro and Urbino"
 
-#: mapsdatatranslation.cpp:3656
+#: mapsdatatranslation.cpp:3663
 msgctxt "italyprovince.kgm"
 msgid "Frosinone"
 msgstr "Frosinone"
 
-#: mapsdatatranslation.cpp:3657
+#: mapsdatatranslation.cpp:3664
 msgctxt "italyprovince.kgm"
 msgid "Latina"
 msgstr "Latina"
 
-#: mapsdatatranslation.cpp:3658
+#: mapsdatatranslation.cpp:3665
 msgctxt "italyprovince.kgm"
 msgid "Rieti"
 msgstr "Rieti"
 
-#: mapsdatatranslation.cpp:3659
+#: mapsdatatranslation.cpp:3666
 msgctxt "italyprovince.kgm"
 msgid "Rome"
 msgstr "Rome"
 
-#: mapsdatatranslation.cpp:3660
+#: mapsdatatranslation.cpp:3667
 msgctxt "italyprovince.kgm"
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: mapsdatatranslation.cpp:3661
+#: mapsdatatranslation.cpp:3668
 msgctxt "italyprovince.kgm"
 msgid "Chieti"
 msgstr "Chieti"
 
-#: mapsdatatranslation.cpp:3662
+#: mapsdatatranslation.cpp:3669
 msgctxt "italyprovince.kgm"
 msgid "L'Aquila"
 msgstr "L'Aquila"
 
-#: mapsdatatranslation.cpp:3663
+#: mapsdatatranslation.cpp:3670
 msgctxt "italyprovince.kgm"
 msgid "Pescara"
 msgstr "Pescara"
 
-#: mapsdatatranslation.cpp:3664
+#: mapsdatatranslation.cpp:3671
 msgctxt "italyprovince.kgm"
 msgid "Teramo"
 msgstr "Teramo"
 
-#: mapsdatatranslation.cpp:3665
+#: mapsdatatranslation.cpp:3672
 msgctxt "italyprovince.kgm"
 msgid "Campobasso"
 msgstr "Campobasso"
 
-#: mapsdatatranslation.cpp:3666
+#: mapsdatatranslation.cpp:3673
 msgctxt "italyprovince.kgm"
 msgid "Isernia"
 msgstr "Isernia"
 
-#: mapsdatatranslation.cpp:3667
+#: mapsdatatranslation.cpp:3674
 msgctxt "italyprovince.kgm"
 msgid "Avellino"
 msgstr "Avellino"
 
-#: mapsdatatranslation.cpp:3668
+#: mapsdatatranslation.cpp:3675
 msgctxt "italyprovince.kgm"
 msgid "Benevento"
 msgstr "Benevento"
 
-#: mapsdatatranslation.cpp:3669
+#: mapsdatatranslation.cpp:3676
 msgctxt "italyprovince.kgm"
 msgid "Caserta"
 msgstr "Caserta"
 
-#: mapsdatatranslation.cpp:3670
+#: mapsdatatranslation.cpp:3677
 msgctxt "italyprovince.kgm"
 msgid "Naples"
 msgstr "Naples"
 
-#: mapsdatatranslation.cpp:3671
+#: mapsdatatranslation.cpp:3678
 msgctxt "italyprovince.kgm"
 msgid "Salerno"
 msgstr "Salerno"
 
-#: mapsdatatranslation.cpp:3672
+#: mapsdatatranslation.cpp:3679
 msgctxt "italyprovince.kgm"
 msgid "Bari"
 msgstr "Bari"
 
-#: mapsdatatranslation.cpp:3673
+#: mapsdatatranslation.cpp:3680
 msgctxt "italyprovince.kgm"
 msgid "Brindisi"
 msgstr "Brindisi"
 
-#: mapsdatatranslation.cpp:3674
+#: mapsdatatranslation.cpp:3681
 msgctxt "italyprovince.kgm"
 msgid "Foggia"
 msgstr "Foggia"
 
-#: mapsdatatranslation.cpp:3675
+#: mapsdatatranslation.cpp:3682
 msgctxt "italyprovince.kgm"
 msgid "Lecce"
 msgstr "Lecce"
 
-#: mapsdatatranslation.cpp:3676
+#: mapsdatatranslation.cpp:3683
 msgctxt "italyprovince.kgm"
 msgid "Taranto"
 msgstr "Taranto"
 
-#: mapsdatatranslation.cpp:3677
+#: mapsdatatranslation.cpp:3684
 msgctxt "italyprovince.kgm"
 msgid "Matera"
 msgstr "Matera"
 
-#: mapsdatatranslation.cpp:3678
+#: mapsdatatranslation.cpp:3685
 msgctxt "italyprovince.kgm"
 msgid "Potenza"
 msgstr "Potenza"
 
-#: mapsdatatranslation.cpp:3679
+#: mapsdatatranslation.cpp:3686
 msgctxt "italyprovince.kgm"
 msgid "Catanzaro"
 msgstr "Catanzaro"
 
-#: mapsdatatranslation.cpp:3680
+#: mapsdatatranslation.cpp:3687
 msgctxt "italyprovince.kgm"
 msgid "Cosenza"
 msgstr "Cosenza"
 
-#: mapsdatatranslation.cpp:3681
+#: mapsdatatranslation.cpp:3688
 msgctxt "italyprovince.kgm"
 msgid "Crotone"
 msgstr "Crotone"
 
-#: mapsdatatranslation.cpp:3682
+#: mapsdatatranslation.cpp:3689
 msgctxt "italyprovince.kgm"
 msgid "Reggio di Calabria"
 msgstr "Reggio di Calabria"
 
-#: mapsdatatranslation.cpp:3683
+#: mapsdatatranslation.cpp:3690
 msgctxt "italyprovince.kgm"
 msgid "Vibo Valentia"
 msgstr "Vibo Valentia"
 
-#: mapsdatatranslation.cpp:3684
+#: mapsdatatranslation.cpp:3691
 msgctxt "italyprovince.kgm"
 msgid "Agrigento"
 msgstr "Agrigento"
 
-#: mapsdatatranslation.cpp:3685
+#: mapsdatatranslation.cpp:3692
 msgctxt "italyprovince.kgm"
 msgid "Caltanissetta"
 msgstr "Caltanissetta"
 
-#: mapsdatatranslation.cpp:3686
+#: mapsdatatranslation.cpp:3693
 msgctxt "italyprovince.kgm"
 msgid "Catania"
 msgstr "Catania"
 
-#: mapsdatatranslation.cpp:3687
+#: mapsdatatranslation.cpp:3694
 msgctxt "italyprovince.kgm"
 msgid "Enna"
 msgstr "Enna"
 
-#: mapsdatatranslation.cpp:3688
+#: mapsdatatranslation.cpp:3695
 msgctxt "italyprovince.kgm"
 msgid "Messina"
 msgstr "Messina"
 
-#: mapsdatatranslation.cpp:3689
+#: mapsdatatranslation.cpp:3696
 msgctxt "italyprovince.kgm"
 msgid "Palermo"
 msgstr "Palermo"
 
-#: mapsdatatranslation.cpp:3690
+#: mapsdatatranslation.cpp:3697
 msgctxt "italyprovince.kgm"
 msgid "Ragusa"
 msgstr "Ragusa"
 
-#: mapsdatatranslation.cpp:3691
+#: mapsdatatranslation.cpp:3698
 msgctxt "italyprovince.kgm"
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: mapsdatatranslation.cpp:3692
+#: mapsdatatranslation.cpp:3699
 msgctxt "italyprovince.kgm"
 msgid "Trapani"
 msgstr "Trapani"
 
-#: mapsdatatranslation.cpp:3693
+#: mapsdatatranslation.cpp:3700
 msgctxt "italyprovince.kgm"
 msgid "Cagliari"
 msgstr "Cagliari"
 
-#: mapsdatatranslation.cpp:3694
+#: mapsdatatranslation.cpp:3701
 msgctxt "italyprovince.kgm"
 msgid "Nuoro"
 msgstr "Nuoro"
 
-#: mapsdatatranslation.cpp:3695
+#: mapsdatatranslation.cpp:3702
 msgctxt "italyprovince.kgm"
 msgid "Oristano"
 msgstr "Oristano"
 
-#: mapsdatatranslation.cpp:3696
+#: mapsdatatranslation.cpp:3703
 msgctxt "italyprovince.kgm"
 msgid "Sassari"
 msgstr "Sassari"
 
-#: mapsdatatranslation.cpp:3697
+#: mapsdatatranslation.cpp:3704
 msgctxt "jamaica.kgm"
 msgid "Jamaica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3698
+#: mapsdatatranslation.cpp:3705
 msgctxt "jamaica.kgm"
 msgid "Parishes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3699 mapsdatatranslation.cpp:3700
+#: mapsdatatranslation.cpp:3706 mapsdatatranslation.cpp:3707
 msgctxt "jamaica.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3701
+#: mapsdatatranslation.cpp:3708
 msgctxt "jamaica.kgm"
 msgid "Not Jamaica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3702 mapsdatatranslation.cpp:3703
+#: mapsdatatranslation.cpp:3709 mapsdatatranslation.cpp:3710
 msgctxt "jamaica.kgm"
 msgid "Kingston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3704
+#: mapsdatatranslation.cpp:3711
 msgctxt "jamaica.kgm"
 msgid "Portland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3705
+#: mapsdatatranslation.cpp:3712
 msgctxt "jamaica.kgm"
 msgid "Port Antonio"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3706
+#: mapsdatatranslation.cpp:3713
 msgctxt "jamaica.kgm"
 msgid "Saint Andrew"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3707
+#: mapsdatatranslation.cpp:3714
 msgctxt "jamaica.kgm"
 msgid "Half Way Tree"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3708
+#: mapsdatatranslation.cpp:3715
 msgctxt "jamaica.kgm"
 msgid "Saint Thomas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3709
+#: mapsdatatranslation.cpp:3716
 msgctxt "jamaica.kgm"
 msgid "Morant Bay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3710
+#: mapsdatatranslation.cpp:3717
 msgctxt "jamaica.kgm"
 msgid "Clarendon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3711
+#: mapsdatatranslation.cpp:3718
 msgctxt "jamaica.kgm"
 msgid "May Pen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3712
+#: mapsdatatranslation.cpp:3719
 msgctxt "jamaica.kgm"
 msgid "Manchester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3713
+#: mapsdatatranslation.cpp:3720
 msgctxt "jamaica.kgm"
 msgid "Mandeville"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3714
+#: mapsdatatranslation.cpp:3721
 msgctxt "jamaica.kgm"
 msgid "Saint Ann"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3715
+#: mapsdatatranslation.cpp:3722
 msgctxt "jamaica.kgm"
 msgid "Saint Ann's Bay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3716
+#: mapsdatatranslation.cpp:3723
 msgctxt "jamaica.kgm"
 msgid "Saint Catherine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3717
+#: mapsdatatranslation.cpp:3724
 msgctxt "jamaica.kgm"
 msgid "Spanish Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3718
+#: mapsdatatranslation.cpp:3725
 msgctxt "jamaica.kgm"
 msgid "Saint Mary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3719
+#: mapsdatatranslation.cpp:3726
 msgctxt "jamaica.kgm"
 msgid "Port Maria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3720
+#: mapsdatatranslation.cpp:3727
 msgctxt "jamaica.kgm"
 msgid "Hanover"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3721
+#: mapsdatatranslation.cpp:3728
 msgctxt "jamaica.kgm"
 msgid "Lucea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3722
+#: mapsdatatranslation.cpp:3729
 msgctxt "jamaica.kgm"
 msgid "Saint Elizabeth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3723
+#: mapsdatatranslation.cpp:3730
 msgctxt "jamaica.kgm"
 msgid "Black River"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3724
+#: mapsdatatranslation.cpp:3731
 msgctxt "jamaica.kgm"
 msgid "Saint James"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3725
+#: mapsdatatranslation.cpp:3732
 msgctxt "jamaica.kgm"
 msgid "Montego Bay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3726
+#: mapsdatatranslation.cpp:3733
 msgctxt "jamaica.kgm"
 msgid "Trelawny"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3727
+#: mapsdatatranslation.cpp:3734
 msgctxt "jamaica.kgm"
 msgid "Falmouth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3728
+#: mapsdatatranslation.cpp:3735
 msgctxt "jamaica.kgm"
 msgid "Westmoreland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3729
+#: mapsdatatranslation.cpp:3736
 msgctxt "jamaica.kgm"
 msgid "Savanna-la-Mar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3730
+#: mapsdatatranslation.cpp:3737
 msgctxt "japan.kgm"
 msgid "Japan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3731
+#: mapsdatatranslation.cpp:3738
 msgctxt "japan.kgm"
 msgid "Prefectures"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3732
+#: mapsdatatranslation.cpp:3739
 msgctxt "japan.kgm"
 msgid "Out of Bounds"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3733
+#: mapsdatatranslation.cpp:3740
 msgctxt "japan.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3734
+#: mapsdatatranslation.cpp:3741
 msgctxt "japan.kgm"
 msgid "Hokkaido"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3735
+#: mapsdatatranslation.cpp:3742
 msgctxt "japan.kgm"
 msgid "Sapporo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3736 mapsdatatranslation.cpp:3737
+#: mapsdatatranslation.cpp:3743 mapsdatatranslation.cpp:3744
 msgctxt "japan.kgm"
 msgid "Aomori"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3738
+#: mapsdatatranslation.cpp:3745
 msgctxt "japan.kgm"
 msgid "Iwate"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3739
+#: mapsdatatranslation.cpp:3746
 msgctxt "japan.kgm"
 msgid "Morioka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3740 mapsdatatranslation.cpp:3741
+#: mapsdatatranslation.cpp:3747 mapsdatatranslation.cpp:3748
 msgctxt "japan.kgm"
 msgid "Akita"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3742 mapsdatatranslation.cpp:3743
+#: mapsdatatranslation.cpp:3749 mapsdatatranslation.cpp:3750
 msgctxt "japan.kgm"
 msgid "Yamagata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3744
+#: mapsdatatranslation.cpp:3751
 msgctxt "japan.kgm"
 msgid "Miyagi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3745
+#: mapsdatatranslation.cpp:3752
 msgctxt "japan.kgm"
 msgid "Sendai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3746 mapsdatatranslation.cpp:3747
+#: mapsdatatranslation.cpp:3753 mapsdatatranslation.cpp:3754
 msgctxt "japan.kgm"
 msgid "Niigata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3748 mapsdatatranslation.cpp:3749
+#: mapsdatatranslation.cpp:3755 mapsdatatranslation.cpp:3756
 msgctxt "japan.kgm"
 msgid "Fukushima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3750 mapsdatatranslation.cpp:3751
+#: mapsdatatranslation.cpp:3757 mapsdatatranslation.cpp:3758
 msgctxt "japan.kgm"
 msgid "Nagano"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3752
+#: mapsdatatranslation.cpp:3759
 msgctxt "japan.kgm"
 msgid "Gunma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3753
+#: mapsdatatranslation.cpp:3760
 msgctxt "japan.kgm"
 msgid "Maebashi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3754
+#: mapsdatatranslation.cpp:3761
 msgctxt "japan.kgm"
 msgid "Tochigi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3755
+#: mapsdatatranslation.cpp:3762
 msgctxt "japan.kgm"
 msgid "Utsunomiya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3756
+#: mapsdatatranslation.cpp:3763
 msgctxt "japan.kgm"
 msgid "Ibaraki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3757
+#: mapsdatatranslation.cpp:3764
 msgctxt "japan.kgm"
 msgid "Mito"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3758 mapsdatatranslation.cpp:3759
+#: mapsdatatranslation.cpp:3765 mapsdatatranslation.cpp:3766
 msgctxt "japan.kgm"
 msgid "Chiba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3760 mapsdatatranslation.cpp:3761
+#: mapsdatatranslation.cpp:3767 mapsdatatranslation.cpp:3768
 msgctxt "japan.kgm"
 msgid "Gifu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3762 mapsdatatranslation.cpp:3763
+#: mapsdatatranslation.cpp:3769 mapsdatatranslation.cpp:3770
 msgctxt "japan.kgm"
 msgid "Shizuoka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3764 mapsdatatranslation.cpp:3765
+#: mapsdatatranslation.cpp:3771 mapsdatatranslation.cpp:3772
 msgctxt "japan.kgm"
 msgid "Saitama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3766
+#: mapsdatatranslation.cpp:3773
 msgctxt "japan.kgm"
 msgid "Yamanashi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3767
+#: mapsdatatranslation.cpp:3774
 msgctxt "japan.kgm"
 msgid "Koufu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3768 mapsdatatranslation.cpp:3769
+#: mapsdatatranslation.cpp:3775 mapsdatatranslation.cpp:3776
 msgctxt "japan.kgm"
 msgid "Toyama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3770
+#: mapsdatatranslation.cpp:3777
 msgctxt "japan.kgm"
 msgid "Ishikawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3771
+#: mapsdatatranslation.cpp:3778
 msgctxt "japan.kgm"
 msgid "Kanazawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3772
+#: mapsdatatranslation.cpp:3779
 msgctxt "japan.kgm"
 msgid "Aichi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3773
+#: mapsdatatranslation.cpp:3780
 msgctxt "japan.kgm"
 msgid "Nagoya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3774 mapsdatatranslation.cpp:3775
+#: mapsdatatranslation.cpp:3781 mapsdatatranslation.cpp:3782
 msgctxt "japan.kgm"
 msgid "Fukui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3776
+#: mapsdatatranslation.cpp:3783
 msgctxt "japan.kgm"
 msgid "Shiga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3777
+#: mapsdatatranslation.cpp:3784
 msgctxt "japan.kgm"
 msgid "Otsu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3778
+#: mapsdatatranslation.cpp:3785
 msgctxt "japan.kgm"
 msgid "Mie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3779
+#: mapsdatatranslation.cpp:3786
 msgctxt "japan.kgm"
 msgid "Tsu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3780 mapsdatatranslation.cpp:3781
+#: mapsdatatranslation.cpp:3787 mapsdatatranslation.cpp:3788
 msgctxt "japan.kgm"
 msgid "Kyoto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3782
+#: mapsdatatranslation.cpp:3789
 msgctxt "japan.kgm"
 msgid "Hyogo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3783
+#: mapsdatatranslation.cpp:3790
 msgctxt "japan.kgm"
 msgid "Kobe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3784 mapsdatatranslation.cpp:3785
+#: mapsdatatranslation.cpp:3791 mapsdatatranslation.cpp:3792
 msgctxt "japan.kgm"
 msgid "Nara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3786 mapsdatatranslation.cpp:3787
+#: mapsdatatranslation.cpp:3793 mapsdatatranslation.cpp:3794
 msgctxt "japan.kgm"
 msgid "Osaka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3788 mapsdatatranslation.cpp:3789
+#: mapsdatatranslation.cpp:3795 mapsdatatranslation.cpp:3796
 msgctxt "japan.kgm"
 msgid "Wakayama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3790 mapsdatatranslation.cpp:3791
+#: mapsdatatranslation.cpp:3797 mapsdatatranslation.cpp:3798
 msgctxt "japan.kgm"
 msgid "Okayama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3792 mapsdatatranslation.cpp:3793
+#: mapsdatatranslation.cpp:3799 mapsdatatranslation.cpp:3800
 msgctxt "japan.kgm"
 msgid "Tottori"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3794
+#: mapsdatatranslation.cpp:3801
 msgctxt "japan.kgm"
 msgid "Shimane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3795
+#: mapsdatatranslation.cpp:3802
 msgctxt "japan.kgm"
 msgid "Matsue"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3796 mapsdatatranslation.cpp:3797
+#: mapsdatatranslation.cpp:3803 mapsdatatranslation.cpp:3804
 msgctxt "japan.kgm"
 msgid "Hiroshima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3798 mapsdatatranslation.cpp:3799
+#: mapsdatatranslation.cpp:3805 mapsdatatranslation.cpp:3806
 msgctxt "japan.kgm"
 msgid "Yamaguchi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3800 mapsdatatranslation.cpp:3801
+#: mapsdatatranslation.cpp:3807 mapsdatatranslation.cpp:3808
 msgctxt "japan.kgm"
 msgid "Fukuoka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3802 mapsdatatranslation.cpp:3803
+#: mapsdatatranslation.cpp:3809 mapsdatatranslation.cpp:3810
 msgctxt "japan.kgm"
 msgid "Oita"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3804 mapsdatatranslation.cpp:3805
+#: mapsdatatranslation.cpp:3811 mapsdatatranslation.cpp:3812
 msgctxt "japan.kgm"
 msgid "Miyazaki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3806 mapsdatatranslation.cpp:3807
+#: mapsdatatranslation.cpp:3813 mapsdatatranslation.cpp:3814
 msgctxt "japan.kgm"
 msgid "Kagoshima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3808 mapsdatatranslation.cpp:3809
+#: mapsdatatranslation.cpp:3815 mapsdatatranslation.cpp:3816
 msgctxt "japan.kgm"
 msgid "Kumamoto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3810 mapsdatatranslation.cpp:3811
+#: mapsdatatranslation.cpp:3817 mapsdatatranslation.cpp:3818
 msgctxt "japan.kgm"
 msgid "Saga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3812 mapsdatatranslation.cpp:3813
+#: mapsdatatranslation.cpp:3819 mapsdatatranslation.cpp:3820
 msgctxt "japan.kgm"
 msgid "Nagasaki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3814
+#: mapsdatatranslation.cpp:3821
 msgctxt "japan.kgm"
 msgid "Ehime"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3815
+#: mapsdatatranslation.cpp:3822
 msgctxt "japan.kgm"
 msgid "Matsuyama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3816 mapsdatatranslation.cpp:3817
+#: mapsdatatranslation.cpp:3823 mapsdatatranslation.cpp:3824
 msgctxt "japan.kgm"
 msgid "Kochi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3818 mapsdatatranslation.cpp:3819
+#: mapsdatatranslation.cpp:3825 mapsdatatranslation.cpp:3826
 msgctxt "japan.kgm"
 msgid "Tokushima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3820
+#: mapsdatatranslation.cpp:3827
 msgctxt "japan.kgm"
 msgid "Kagawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3821
+#: mapsdatatranslation.cpp:3828
 msgctxt "japan.kgm"
 msgid "Takamatsu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3822
+#: mapsdatatranslation.cpp:3829
 msgctxt "japan.kgm"
 msgid "Kanagawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3823
+#: mapsdatatranslation.cpp:3830
 msgctxt "japan.kgm"
 msgid "Yokohama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3824 mapsdatatranslation.cpp:3825
+#: mapsdatatranslation.cpp:3831 mapsdatatranslation.cpp:3832
 msgctxt "japan.kgm"
 msgid "Tokyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3826
+#: mapsdatatranslation.cpp:3833
 msgctxt "japan.kgm"
 msgid "Okinawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3827
+#: mapsdatatranslation.cpp:3834
 msgctxt "japan.kgm"
 msgid "Naha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3828
+#: mapsdatatranslation.cpp:3835
 msgctxt "jharkhand.kgm"
 msgid "Jharkhand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3829
+#: mapsdatatranslation.cpp:3836
 msgctxt "jharkhand.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3830
+#: mapsdatatranslation.cpp:3837
 msgctxt "jharkhand.kgm"
 msgid "Not Jharkhand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3831
+#: mapsdatatranslation.cpp:3838
 msgctxt "jharkhand.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3832 mapsdatatranslation.cpp:3833
+#: mapsdatatranslation.cpp:3839 mapsdatatranslation.cpp:3840
 msgctxt "jharkhand.kgm"
 msgid "Garhwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3834 mapsdatatranslation.cpp:3835
+#: mapsdatatranslation.cpp:3841 mapsdatatranslation.cpp:3842
 msgctxt "jharkhand.kgm"
 msgid "Latehar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3836 mapsdatatranslation.cpp:3837
+#: mapsdatatranslation.cpp:3843 mapsdatatranslation.cpp:3844
 msgctxt "jharkhand.kgm"
 msgid "Gumla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3838 mapsdatatranslation.cpp:3839
+#: mapsdatatranslation.cpp:3845 mapsdatatranslation.cpp:3846
 msgctxt "jharkhand.kgm"
 msgid "Lohardaga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3840 mapsdatatranslation.cpp:3841
+#: mapsdatatranslation.cpp:3847 mapsdatatranslation.cpp:3848
 msgctxt "jharkhand.kgm"
 msgid "Simdega"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3842
+#: mapsdatatranslation.cpp:3849
 msgctxt "jharkhand.kgm"
 msgid "Paschim Singhbhum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3843
+#: mapsdatatranslation.cpp:3850
 msgctxt "jharkhand.kgm"
 msgid "Chaibasa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3844 mapsdatatranslation.cpp:3845
+#: mapsdatatranslation.cpp:3851 mapsdatatranslation.cpp:3852
 msgctxt "jharkhand.kgm"
 msgid "Ranchi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3846 mapsdatatranslation.cpp:3847
+#: mapsdatatranslation.cpp:3853 mapsdatatranslation.cpp:3854
 msgctxt "jharkhand.kgm"
 msgid "Seraikela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3848
+#: mapsdatatranslation.cpp:3855
 msgctxt "jharkhand.kgm"
 msgid "Purba Singhbhum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3849
+#: mapsdatatranslation.cpp:3856
 msgctxt "jharkhand.kgm"
 msgid "Jamshedpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3850 mapsdatatranslation.cpp:3851
+#: mapsdatatranslation.cpp:3857 mapsdatatranslation.cpp:3858
 msgctxt "jharkhand.kgm"
 msgid "Hazaribag"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3852 mapsdatatranslation.cpp:3853
+#: mapsdatatranslation.cpp:3859 mapsdatatranslation.cpp:3860
 msgctxt "jharkhand.kgm"
 msgid "Koderma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3854 mapsdatatranslation.cpp:3855
+#: mapsdatatranslation.cpp:3861 mapsdatatranslation.cpp:3862
 msgctxt "jharkhand.kgm"
 msgid "Giridih"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3856 mapsdatatranslation.cpp:3857
+#: mapsdatatranslation.cpp:3863 mapsdatatranslation.cpp:3864
 msgctxt "jharkhand.kgm"
 msgid "Bokaro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3858 mapsdatatranslation.cpp:3859
+#: mapsdatatranslation.cpp:3865 mapsdatatranslation.cpp:3866
 msgctxt "jharkhand.kgm"
 msgid "Dhanbad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3860 mapsdatatranslation.cpp:3861
+#: mapsdatatranslation.cpp:3867 mapsdatatranslation.cpp:3868
 msgctxt "jharkhand.kgm"
 msgid "Jamtara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3862 mapsdatatranslation.cpp:3863
+#: mapsdatatranslation.cpp:3869 mapsdatatranslation.cpp:3870
 msgctxt "jharkhand.kgm"
 msgid "Deoghar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3864
+#: mapsdatatranslation.cpp:3871
 msgctxt "jharkhand.kgm"
 msgid "Santhal Pargana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3865
+#: mapsdatatranslation.cpp:3872
 msgctxt "jharkhand.kgm"
 msgid "Dumka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3866 mapsdatatranslation.cpp:3867
+#: mapsdatatranslation.cpp:3873 mapsdatatranslation.cpp:3874
 msgctxt "jharkhand.kgm"
 msgid "Pakur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3868 mapsdatatranslation.cpp:3869
+#: mapsdatatranslation.cpp:3875 mapsdatatranslation.cpp:3876
 msgctxt "jharkhand.kgm"
 msgid "Sahibganj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3870 mapsdatatranslation.cpp:3871
+#: mapsdatatranslation.cpp:3877 mapsdatatranslation.cpp:3878
 msgctxt "jharkhand.kgm"
 msgid "Godda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3872
+#: mapsdatatranslation.cpp:3879
 msgctxt "jharkhand.kgm"
 msgid "Palamu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3873
+#: mapsdatatranslation.cpp:3880
 msgctxt "jharkhand.kgm"
 msgid "Daltonganj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3874 mapsdatatranslation.cpp:3875
+#: mapsdatatranslation.cpp:3881 mapsdatatranslation.cpp:3882
 msgctxt "jharkhand.kgm"
 msgid "Chatra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3876
+#: mapsdatatranslation.cpp:3883
 msgctxt "kazakhstan.kgm"
 msgid "Kazakhstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3877
+#: mapsdatatranslation.cpp:3884
 msgctxt "kazakhstan.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3878
+#: mapsdatatranslation.cpp:3885
 msgctxt "kazakhstan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3879
+#: mapsdatatranslation.cpp:3886
 msgctxt "kazakhstan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3880
+#: mapsdatatranslation.cpp:3887
 msgctxt "kazakhstan.kgm"
 msgid "Not Kazakhstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3881
+#: mapsdatatranslation.cpp:3888
 msgctxt "kazakhstan.kgm"
 msgid "Astana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3882
+#: mapsdatatranslation.cpp:3889
 msgctxt "kazakhstan.kgm"
 msgid "Almaty city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3883
+#: mapsdatatranslation.cpp:3890
 msgctxt "kazakhstan.kgm"
 msgid "Baikonur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3884
+#: mapsdatatranslation.cpp:3891
 msgctxt "kazakhstan.kgm"
 msgid "Almaty"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3885
+#: mapsdatatranslation.cpp:3892
 msgctxt "kazakhstan.kgm"
 msgid "Taldykorgan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3886
+#: mapsdatatranslation.cpp:3893
 msgctxt "kazakhstan.kgm"
 msgid "Aqmola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3887
+#: mapsdatatranslation.cpp:3894
 msgctxt "kazakhstan.kgm"
 msgid "Koksetau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3888 mapsdatatranslation.cpp:3889
+#: mapsdatatranslation.cpp:3895 mapsdatatranslation.cpp:3896
 msgctxt "kazakhstan.kgm"
 msgid "Aqtöbe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3890 mapsdatatranslation.cpp:3891
+#: mapsdatatranslation.cpp:3897 mapsdatatranslation.cpp:3898
 msgctxt "kazakhstan.kgm"
 msgid "Atyrau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3892
+#: mapsdatatranslation.cpp:3899
 msgctxt "kazakhstan.kgm"
 msgid "Batys Qazaqstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3893
+#: mapsdatatranslation.cpp:3900
 msgctxt "kazakhstan.kgm"
 msgid "Oral"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3894
+#: mapsdatatranslation.cpp:3901
 msgctxt "kazakhstan.kgm"
 msgid "Mangghystau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3895
+#: mapsdatatranslation.cpp:3902
 msgctxt "kazakhstan.kgm"
 msgid "Aqtau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3896
+#: mapsdatatranslation.cpp:3903
 msgctxt "kazakhstan.kgm"
 msgid "Ongtüstik Qazaqstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3897
+#: mapsdatatranslation.cpp:3904
 msgctxt "kazakhstan.kgm"
 msgid "Shymkent"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3898 mapsdatatranslation.cpp:3899
+#: mapsdatatranslation.cpp:3905 mapsdatatranslation.cpp:3906
 msgctxt "kazakhstan.kgm"
 msgid "Pavlodar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3900
+#: mapsdatatranslation.cpp:3907
 msgctxt "kazakhstan.kgm"
 msgid "Qaraghandy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3901
+#: mapsdatatranslation.cpp:3908
 msgctxt "kazakhstan.kgm"
 msgid "Karaganda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3902
+#: mapsdatatranslation.cpp:3909
 msgctxt "kazakhstan.kgm"
 msgid "Qostanay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3903
+#: mapsdatatranslation.cpp:3910
 msgctxt "kazakhstan.kgm"
 msgid "Kostanai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3904 mapsdatatranslation.cpp:3905
+#: mapsdatatranslation.cpp:3911 mapsdatatranslation.cpp:3912
 msgctxt "kazakhstan.kgm"
 msgid "Qyzylorda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3906
+#: mapsdatatranslation.cpp:3913
 msgctxt "kazakhstan.kgm"
 msgid "Shyghys Qazaqstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3907
+#: mapsdatatranslation.cpp:3914
 msgctxt "kazakhstan.kgm"
 msgid "Öskemen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3908
+#: mapsdatatranslation.cpp:3915
 msgctxt "kazakhstan.kgm"
 msgid "Soltustik Qazaqstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3909
+#: mapsdatatranslation.cpp:3916
 msgctxt "kazakhstan.kgm"
 msgid "Petropavl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3910
+#: mapsdatatranslation.cpp:3917
 msgctxt "kazakhstan.kgm"
 msgid "Zhambyl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3911
+#: mapsdatatranslation.cpp:3918
 msgctxt "kazakhstan.kgm"
 msgid "Taraz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3912
+#: mapsdatatranslation.cpp:3919
 msgctxt "kyrgyzstan.kgm"
 msgid "Kyrgyzstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3913
+#: mapsdatatranslation.cpp:3920
 msgctxt "kyrgyzstan.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3914
+#: mapsdatatranslation.cpp:3921
 msgctxt "kyrgyzstan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3915
+#: mapsdatatranslation.cpp:3922
 msgctxt "kyrgyzstan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3916
+#: mapsdatatranslation.cpp:3923
 msgctxt "kyrgyzstan.kgm"
 msgid "Not Kyrgyzstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3917
+#: mapsdatatranslation.cpp:3924
 msgctxt "kyrgyzstan.kgm"
 msgid "Bishkek"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3918
+#: mapsdatatranslation.cpp:3925
 msgctxt "kyrgyzstan.kgm"
 msgid "Batken"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3919
+#: mapsdatatranslation.cpp:3926
 msgctxt "kyrgyzstan.kgm"
 msgid "Chui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3920
+#: mapsdatatranslation.cpp:3927
 msgctxt "kyrgyzstan.kgm"
 msgid "Jalal-Abad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3921
+#: mapsdatatranslation.cpp:3928
 msgctxt "kyrgyzstan.kgm"
 msgid "Naryn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3922
+#: mapsdatatranslation.cpp:3929
 msgctxt "kyrgyzstan.kgm"
 msgid "Osh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3923
+#: mapsdatatranslation.cpp:3930
 msgctxt "kyrgyzstan.kgm"
 msgid "Talas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3924
+#: mapsdatatranslation.cpp:3931
 msgctxt "kyrgyzstan.kgm"
 msgid "Issyk Kul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3925
+#: mapsdatatranslation.cpp:3932
 msgctxt "kyrgyzstan.kgm"
 msgid "Osh city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3926
+#: mapsdatatranslation.cpp:3933
 msgctxt "latvia.kgm"
 msgid "Latvia Districts (Pre 2009)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3927
+#: mapsdatatranslation.cpp:3934
 msgctxt "latvia.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3928 mapsdatatranslation.cpp:3929
+#: mapsdatatranslation.cpp:3935 mapsdatatranslation.cpp:3936
 msgctxt "latvia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3930
+#: mapsdatatranslation.cpp:3937
 msgctxt "latvia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3931
+#: mapsdatatranslation.cpp:3938
 msgctxt "latvia.kgm"
 msgid "Lithuania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3932
+#: mapsdatatranslation.cpp:3939
 msgctxt "latvia.kgm"
 msgid "Belarus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3933
+#: mapsdatatranslation.cpp:3940
 msgctxt "latvia.kgm"
 msgid "Russia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3934
+#: mapsdatatranslation.cpp:3941
 msgctxt "latvia.kgm"
 msgid "Estonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3935
+#: mapsdatatranslation.cpp:3942
 msgctxt "latvia.kgm"
 msgid "Aizkraukle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3936
+#: mapsdatatranslation.cpp:3943
 msgctxt "latvia.kgm"
 msgid "Alūksne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3937
+#: mapsdatatranslation.cpp:3944
 msgctxt "latvia.kgm"
 msgid "Balvi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3938
+#: mapsdatatranslation.cpp:3945
 msgctxt "latvia.kgm"
 msgid "Bauska"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3939
+#: mapsdatatranslation.cpp:3946
 msgctxt "latvia.kgm"
 msgid "Cēsis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3940
+#: mapsdatatranslation.cpp:3947
 msgctxt "latvia.kgm"
 msgid "Daugavpils"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3941
+#: mapsdatatranslation.cpp:3948
 msgctxt "latvia.kgm"
 msgid "Daugavpils city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3942
+#: mapsdatatranslation.cpp:3949
 msgctxt "latvia.kgm"
 msgid "Dobele"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3943
+#: mapsdatatranslation.cpp:3950
 msgctxt "latvia.kgm"
 msgid "Gulbene"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3944
+#: mapsdatatranslation.cpp:3951
 msgctxt "latvia.kgm"
 msgid "Jēkabpils"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3945
+#: mapsdatatranslation.cpp:3952
 msgctxt "latvia.kgm"
 msgid "Jelgava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3946
+#: mapsdatatranslation.cpp:3953
 msgctxt "latvia.kgm"
 msgid "Jelgava city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3947
+#: mapsdatatranslation.cpp:3954
 msgctxt "latvia.kgm"
 msgid "Jūrmala city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3948
+#: mapsdatatranslation.cpp:3955
 msgctxt "latvia.kgm"
 msgid "Krāslava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3949
+#: mapsdatatranslation.cpp:3956
 msgctxt "latvia.kgm"
 msgid "Kuldīga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3950
+#: mapsdatatranslation.cpp:3957
 msgctxt "latvia.kgm"
 msgid "Liepāja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3951
+#: mapsdatatranslation.cpp:3958
 msgctxt "latvia.kgm"
 msgid "Liepāja city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3952
+#: mapsdatatranslation.cpp:3959
 msgctxt "latvia.kgm"
 msgid "Limbaži"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3953
+#: mapsdatatranslation.cpp:3960
 msgctxt "latvia.kgm"
 msgid "Ludza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3954
+#: mapsdatatranslation.cpp:3961
 msgctxt "latvia.kgm"
 msgid "Madona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3955
+#: mapsdatatranslation.cpp:3962
 msgctxt "latvia.kgm"
 msgid "Ogre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3956
+#: mapsdatatranslation.cpp:3963
 msgctxt "latvia.kgm"
 msgid "Preiļi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3957
+#: mapsdatatranslation.cpp:3964
 msgctxt "latvia.kgm"
 msgid "Rēzekne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3958
+#: mapsdatatranslation.cpp:3965
 msgctxt "latvia.kgm"
 msgid "Rēzekne city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3959
+#: mapsdatatranslation.cpp:3966
 msgctxt "latvia.kgm"
 msgid "Rīga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3960
+#: mapsdatatranslation.cpp:3967
 msgctxt "latvia.kgm"
 msgid "Rīga city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3961
+#: mapsdatatranslation.cpp:3968
 msgctxt "latvia.kgm"
 msgid "Saldus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3962
+#: mapsdatatranslation.cpp:3969
 msgctxt "latvia.kgm"
 msgid "Talsi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3963
+#: mapsdatatranslation.cpp:3970
 msgctxt "latvia.kgm"
 msgid "Tukums"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3964
+#: mapsdatatranslation.cpp:3971
 msgctxt "latvia.kgm"
 msgid "Valka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3965
+#: mapsdatatranslation.cpp:3972
 msgctxt "latvia.kgm"
 msgid "Valmiera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3966
+#: mapsdatatranslation.cpp:3973
 msgctxt "latvia.kgm"
 msgid "Ventspils"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3967
+#: mapsdatatranslation.cpp:3974
 msgctxt "latvia.kgm"
 msgid "Ventspils city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3968
+#: mapsdatatranslation.cpp:3975
 msgctxt "liechtenstein.kgm"
 msgid "Liechtenstein"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3969
+#: mapsdatatranslation.cpp:3976
 msgctxt "liechtenstein.kgm"
 msgid "Municipalities"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3970
+#: mapsdatatranslation.cpp:3977
 msgctxt "liechtenstein.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3971
+#: mapsdatatranslation.cpp:3978
 msgctxt "liechtenstein.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3972
+#: mapsdatatranslation.cpp:3979
 msgctxt "liechtenstein.kgm"
 msgid "Not Liechtenstein"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3973
+#: mapsdatatranslation.cpp:3980
 msgctxt "liechtenstein.kgm"
 msgid "Balzers"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3974
+#: mapsdatatranslation.cpp:3981
 msgctxt "liechtenstein.kgm"
 msgid "Eschen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3975
+#: mapsdatatranslation.cpp:3982
 msgctxt "liechtenstein.kgm"
 msgid "Gamprin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3976
+#: mapsdatatranslation.cpp:3983
 msgctxt "liechtenstein.kgm"
 msgid "Mauren"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3977
+#: mapsdatatranslation.cpp:3984
 msgctxt "liechtenstein.kgm"
 msgid "Planken"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3978
+#: mapsdatatranslation.cpp:3985
 msgctxt "liechtenstein.kgm"
 msgid "Ruggell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3979
+#: mapsdatatranslation.cpp:3986
 msgctxt "liechtenstein.kgm"
 msgid "Schaan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3980
+#: mapsdatatranslation.cpp:3987
 msgctxt "liechtenstein.kgm"
 msgid "Schelienberg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3981
+#: mapsdatatranslation.cpp:3988
 msgctxt "liechtenstein.kgm"
 msgid "Triesen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3982
+#: mapsdatatranslation.cpp:3989
 msgctxt "liechtenstein.kgm"
 msgid "Triesenberg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3983
+#: mapsdatatranslation.cpp:3990
 msgctxt "liechtenstein.kgm"
 msgid "Vaduz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3984
+#: mapsdatatranslation.cpp:3991
 msgctxt "lithuania_municipalities.kgm"
 msgid "Lithuania (Municipalities)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3985
+#: mapsdatatranslation.cpp:3992
 msgctxt "lithuania_municipalities.kgm"
 msgid "Municipalities"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3986
+#: mapsdatatranslation.cpp:3993
 msgctxt "lithuania_municipalities.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3987
+#: mapsdatatranslation.cpp:3994
 msgctxt "lithuania_municipalities.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3988
+#: mapsdatatranslation.cpp:3995
 msgctxt "lithuania_municipalities.kgm"
 msgid "Not Lithuania (Municipalities)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3989
+#: mapsdatatranslation.cpp:3996
 msgctxt "lithuania_municipalities.kgm"
 msgid "Akmenė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3990
+#: mapsdatatranslation.cpp:3997
 msgctxt "lithuania_municipalities.kgm"
 msgid "Naujoji Akmenė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3991
+#: mapsdatatranslation.cpp:3998
 msgctxt "lithuania_municipalities.kgm"
 msgid "Alytus city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3992
+#: mapsdatatranslation.cpp:3999
 msgctxt "lithuania_municipalities.kgm"
 msgid "Alytus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3993
+#: mapsdatatranslation.cpp:4000
 msgctxt "lithuania_municipalities.kgm"
 msgid "Anykščiai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3994
+#: mapsdatatranslation.cpp:4001
 msgctxt "lithuania_municipalities.kgm"
 msgid "Birštonas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3995
+#: mapsdatatranslation.cpp:4002
 msgctxt "lithuania_municipalities.kgm"
 msgid "Biržai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3996
+#: mapsdatatranslation.cpp:4003
 msgctxt "lithuania_municipalities.kgm"
 msgid "Druskininkai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3997
+#: mapsdatatranslation.cpp:4004
 msgctxt "lithuania_municipalities.kgm"
 msgid "Elektrėnai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3998
+#: mapsdatatranslation.cpp:4005
 msgctxt "lithuania_municipalities.kgm"
 msgid "Ignalina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:3999
+#: mapsdatatranslation.cpp:4006
 msgctxt "lithuania_municipalities.kgm"
 msgid "Jonava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4000
+#: mapsdatatranslation.cpp:4007
 msgctxt "lithuania_municipalities.kgm"
 msgid "Joniškis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4001
+#: mapsdatatranslation.cpp:4008
 msgctxt "lithuania_municipalities.kgm"
 msgid "Jurbarkas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4002
+#: mapsdatatranslation.cpp:4009
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kaišiadorys"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4003
+#: mapsdatatranslation.cpp:4010
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kalvarija"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4004
+#: mapsdatatranslation.cpp:4011
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kaunas city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4005
+#: mapsdatatranslation.cpp:4012
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kaunas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4006
+#: mapsdatatranslation.cpp:4013
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kazlų Rūda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4007
+#: mapsdatatranslation.cpp:4014
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kėdainiai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4008
+#: mapsdatatranslation.cpp:4015
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kelmė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4009
+#: mapsdatatranslation.cpp:4016
 msgctxt "lithuania_municipalities.kgm"
 msgid "Klaipėda city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4010
+#: mapsdatatranslation.cpp:4017
 msgctxt "lithuania_municipalities.kgm"
 msgid "Klaipėda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4011
+#: mapsdatatranslation.cpp:4018
 msgctxt "lithuania_municipalities.kgm"
 msgid "Gargždai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4012
+#: mapsdatatranslation.cpp:4019
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kretinga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4013
+#: mapsdatatranslation.cpp:4020
 msgctxt "lithuania_municipalities.kgm"
 msgid "Kupiškis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4014
+#: mapsdatatranslation.cpp:4021
 msgctxt "lithuania_municipalities.kgm"
 msgid "Lazdijai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4015
+#: mapsdatatranslation.cpp:4022
 msgctxt "lithuania_municipalities.kgm"
 msgid "Marijampolė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4016
+#: mapsdatatranslation.cpp:4023
 msgctxt "lithuania_municipalities.kgm"
 msgid "Mažeikiai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4017
+#: mapsdatatranslation.cpp:4024
 msgctxt "lithuania_municipalities.kgm"
 msgid "Molėtai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4018
+#: mapsdatatranslation.cpp:4025
 msgctxt "lithuania_municipalities.kgm"
 msgid "Neringa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4019
+#: mapsdatatranslation.cpp:4026
 msgctxt "lithuania_municipalities.kgm"
 msgid "Nida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4020
+#: mapsdatatranslation.cpp:4027
 msgctxt "lithuania_municipalities.kgm"
 msgid "Pagėgiai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4021
+#: mapsdatatranslation.cpp:4028
 msgctxt "lithuania_municipalities.kgm"
 msgid "Pakruojis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4022
+#: mapsdatatranslation.cpp:4029
 msgctxt "lithuania_municipalities.kgm"
 msgid "Palanga city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4023
+#: mapsdatatranslation.cpp:4030
 msgctxt "lithuania_municipalities.kgm"
 msgid "Panevėžys city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4024
+#: mapsdatatranslation.cpp:4031
 msgctxt "lithuania_municipalities.kgm"
 msgid "Panevėžys"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4025
+#: mapsdatatranslation.cpp:4032
 msgctxt "lithuania_municipalities.kgm"
 msgid "Pasvalys"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4026
+#: mapsdatatranslation.cpp:4033
 msgctxt "lithuania_municipalities.kgm"
 msgid "Plungė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4027
+#: mapsdatatranslation.cpp:4034
 msgctxt "lithuania_municipalities.kgm"
 msgid "Prienai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4028
+#: mapsdatatranslation.cpp:4035
 msgctxt "lithuania_municipalities.kgm"
 msgid "Radviliškis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4029
+#: mapsdatatranslation.cpp:4036
 msgctxt "lithuania_municipalities.kgm"
 msgid "Raseiniai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4030
+#: mapsdatatranslation.cpp:4037
 msgctxt "lithuania_municipalities.kgm"
 msgid "Rietavas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4031
+#: mapsdatatranslation.cpp:4038
 msgctxt "lithuania_municipalities.kgm"
 msgid "Rokiškis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4032
+#: mapsdatatranslation.cpp:4039
 msgctxt "lithuania_municipalities.kgm"
 msgid "Skuodas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4033
+#: mapsdatatranslation.cpp:4040
 msgctxt "lithuania_municipalities.kgm"
 msgid "Šakiai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4034
+#: mapsdatatranslation.cpp:4041
 msgctxt "lithuania_municipalities.kgm"
 msgid "Šalčininkai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4035
+#: mapsdatatranslation.cpp:4042
 msgctxt "lithuania_municipalities.kgm"
 msgid "Šiauliai city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4036
+#: mapsdatatranslation.cpp:4043
 msgctxt "lithuania_municipalities.kgm"
 msgid "Šiauliai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4037
+#: mapsdatatranslation.cpp:4044
 msgctxt "lithuania_municipalities.kgm"
 msgid "Šilalė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4038
+#: mapsdatatranslation.cpp:4045
 msgctxt "lithuania_municipalities.kgm"
 msgid "Šilutė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4039
+#: mapsdatatranslation.cpp:4046
 msgctxt "lithuania_municipalities.kgm"
 msgid "Širvintos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4040
+#: mapsdatatranslation.cpp:4047
 msgctxt "lithuania_municipalities.kgm"
 msgid "Švenčionys"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4041
+#: mapsdatatranslation.cpp:4048
 msgctxt "lithuania_municipalities.kgm"
 msgid "Tauragė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4042
+#: mapsdatatranslation.cpp:4049
 msgctxt "lithuania_municipalities.kgm"
 msgid "Telšiai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4043
+#: mapsdatatranslation.cpp:4050
 msgctxt "lithuania_municipalities.kgm"
 msgid "Trakai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4044
+#: mapsdatatranslation.cpp:4051
 msgctxt "lithuania_municipalities.kgm"
 msgid "Ukmergė"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4045
+#: mapsdatatranslation.cpp:4052
 msgctxt "lithuania_municipalities.kgm"
 msgid "Utena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4046
+#: mapsdatatranslation.cpp:4053
 msgctxt "lithuania_municipalities.kgm"
 msgid "Varėna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4047
+#: mapsdatatranslation.cpp:4054
 msgctxt "lithuania_municipalities.kgm"
 msgid "Vilkaviškis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4048
+#: mapsdatatranslation.cpp:4055
 msgctxt "lithuania_municipalities.kgm"
 msgid "Vilnius city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4049
+#: mapsdatatranslation.cpp:4056
 msgctxt "lithuania_municipalities.kgm"
 msgid "Vilnius"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4050
+#: mapsdatatranslation.cpp:4057
 msgctxt "lithuania_municipalities.kgm"
 msgid "Visaginas city"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4051
+#: mapsdatatranslation.cpp:4058
 msgctxt "lithuania_municipalities.kgm"
 msgid "Zarasai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4052
+#: mapsdatatranslation.cpp:4059
 msgctxt "luxembourg_cantons.kgm"
 msgid "Luxembourg (Cantons)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4053
+#: mapsdatatranslation.cpp:4060
 msgctxt "luxembourg_cantons.kgm"
 msgid "Cantons"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4054
+#: mapsdatatranslation.cpp:4061
 msgctxt "luxembourg_cantons.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4055
+#: mapsdatatranslation.cpp:4062
 msgctxt "luxembourg_cantons.kgm"
 msgid "Not Luxembourg (Cantons)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4056
+#: mapsdatatranslation.cpp:4063
 msgctxt "luxembourg_cantons.kgm"
 msgid "Clervaux"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4057
+#: mapsdatatranslation.cpp:4064
 msgctxt "luxembourg_cantons.kgm"
 msgid "Diekirch"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4058
+#: mapsdatatranslation.cpp:4065
 msgctxt "luxembourg_cantons.kgm"
 msgid "Redange"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4059
+#: mapsdatatranslation.cpp:4066
 msgctxt "luxembourg_cantons.kgm"
 msgid "Vianden"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4060
+#: mapsdatatranslation.cpp:4067
 msgctxt "luxembourg_cantons.kgm"
 msgid "Wiltz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4061
+#: mapsdatatranslation.cpp:4068
 msgctxt "luxembourg_cantons.kgm"
 msgid "Echternach"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4062
+#: mapsdatatranslation.cpp:4069
 msgctxt "luxembourg_cantons.kgm"
 msgid "Grevenmacher"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4063
+#: mapsdatatranslation.cpp:4070
 msgctxt "luxembourg_cantons.kgm"
 msgid "Remich"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4064
+#: mapsdatatranslation.cpp:4071
 msgctxt "luxembourg_cantons.kgm"
 msgid "Capellen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4065
+#: mapsdatatranslation.cpp:4072
 msgctxt "luxembourg_cantons.kgm"
 msgid "Esch-sur-Alzette"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4066
+#: mapsdatatranslation.cpp:4073
 msgctxt "luxembourg_cantons.kgm"
 msgid "Luxembourg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4067
+#: mapsdatatranslation.cpp:4074
 msgctxt "luxembourg_cantons.kgm"
 msgid "Mersch"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4068
+#: mapsdatatranslation.cpp:4075
 msgctxt "malaysia.kgm"
 msgid "Malaysia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4069
+#: mapsdatatranslation.cpp:4076
 msgctxt "malaysia.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4070
+#: mapsdatatranslation.cpp:4077
 msgctxt "malaysia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4071
+#: mapsdatatranslation.cpp:4078
 msgctxt "malaysia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4072
+#: mapsdatatranslation.cpp:4079
 msgctxt "malaysia.kgm"
 msgid "Not Malaysia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4073
+#: mapsdatatranslation.cpp:4080
 msgctxt "malaysia.kgm"
 msgid "Kedah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4074
+#: mapsdatatranslation.cpp:4081
 msgctxt "malaysia.kgm"
 msgid "Alor Star"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4075
+#: mapsdatatranslation.cpp:4082
 msgctxt "malaysia.kgm"
 msgid "Johor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4076
+#: mapsdatatranslation.cpp:4083
 msgctxt "malaysia.kgm"
 msgid "Johor Bahru (Pasir Pelangi)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4077
+#: mapsdatatranslation.cpp:4084
 msgctxt "malaysia.kgm"
 msgid "Kelantan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4078
+#: mapsdatatranslation.cpp:4085
 msgctxt "malaysia.kgm"
 msgid "Kota Bahru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4079 mapsdatatranslation.cpp:4080
+#: mapsdatatranslation.cpp:4086 mapsdatatranslation.cpp:4087
 msgctxt "malaysia.kgm"
 msgid "Malacca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4081
+#: mapsdatatranslation.cpp:4088
 msgctxt "malaysia.kgm"
 msgid "Negeri Sembilan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4082
+#: mapsdatatranslation.cpp:4089
 msgctxt "malaysia.kgm"
 msgid "Seremban"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4083
+#: mapsdatatranslation.cpp:4090
 msgctxt "malaysia.kgm"
 msgid "Pahang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4084
+#: mapsdatatranslation.cpp:4091
 msgctxt "malaysia.kgm"
 msgid "Kuantan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4085
+#: mapsdatatranslation.cpp:4092
 msgctxt "malaysia.kgm"
 msgid "Perak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4086
+#: mapsdatatranslation.cpp:4093
 msgctxt "malaysia.kgm"
 msgid "Ipoh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4087
+#: mapsdatatranslation.cpp:4094
 msgctxt "malaysia.kgm"
 msgid "Perlis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4088
+#: mapsdatatranslation.cpp:4095
 msgctxt "malaysia.kgm"
 msgid "Kangar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4089
+#: mapsdatatranslation.cpp:4096
 msgctxt "malaysia.kgm"
 msgid "Penang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4090
+#: mapsdatatranslation.cpp:4097
 msgctxt "malaysia.kgm"
 msgid "George Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4091
+#: mapsdatatranslation.cpp:4098
 msgctxt "malaysia.kgm"
 msgid "Sabah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4092
+#: mapsdatatranslation.cpp:4099
 msgctxt "malaysia.kgm"
 msgid "Kota Kinabalu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4093
+#: mapsdatatranslation.cpp:4100
 msgctxt "malaysia.kgm"
 msgid "Sarawak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4094
+#: mapsdatatranslation.cpp:4101
 msgctxt "malaysia.kgm"
 msgid "Kuching"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4095
+#: mapsdatatranslation.cpp:4102
 msgctxt "malaysia.kgm"
 msgid "Selangor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4096
+#: mapsdatatranslation.cpp:4103
 msgctxt "malaysia.kgm"
 msgid "Shah Alam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4097
+#: mapsdatatranslation.cpp:4104
 msgctxt "malaysia.kgm"
 msgid "Terengganu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4098
+#: mapsdatatranslation.cpp:4105
 msgctxt "malaysia.kgm"
 msgid "Kuala Terengganu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4099
+#: mapsdatatranslation.cpp:4106
 msgctxt "manipur.kgm"
 msgid "Manipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4100
+#: mapsdatatranslation.cpp:4107
 msgctxt "manipur.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4101
+#: mapsdatatranslation.cpp:4108
 msgctxt "manipur.kgm"
 msgid "Not Manipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4102
+#: mapsdatatranslation.cpp:4109
 msgctxt "manipur.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4103 mapsdatatranslation.cpp:4104
+#: mapsdatatranslation.cpp:4110 mapsdatatranslation.cpp:4111
 msgctxt "manipur.kgm"
 msgid "Tamenglong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4105 mapsdatatranslation.cpp:4106
+#: mapsdatatranslation.cpp:4112 mapsdatatranslation.cpp:4113
 msgctxt "manipur.kgm"
 msgid "Senapati"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4107 mapsdatatranslation.cpp:4108
+#: mapsdatatranslation.cpp:4114
 msgctxt "manipur.kgm"
-msgid "Imphal"
+msgid "Imphal West"
+msgstr ""
+
+#: mapsdatatranslation.cpp:4115
+msgctxt "manipur.kgm"
+msgid "Lamphelpat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4109 mapsdatatranslation.cpp:4110
+#: mapsdatatranslation.cpp:4116 mapsdatatranslation.cpp:4117
 msgctxt "manipur.kgm"
 msgid "Thoubal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4111 mapsdatatranslation.cpp:4112
+#: mapsdatatranslation.cpp:4118 mapsdatatranslation.cpp:4119
 msgctxt "manipur.kgm"
 msgid "Bishnupur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4113 mapsdatatranslation.cpp:4114
+#: mapsdatatranslation.cpp:4120 mapsdatatranslation.cpp:4121
 msgctxt "manipur.kgm"
 msgid "Ukhrul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4115 mapsdatatranslation.cpp:4116
+#: mapsdatatranslation.cpp:4122
+msgctxt "manipur.kgm"
+msgid "Imphal East"
+msgstr ""
+
+#: mapsdatatranslation.cpp:4123
 msgctxt "manipur.kgm"
-msgid "Jiribam"
+msgid "Porompat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4117 mapsdatatranslation.cpp:4118
+#: mapsdatatranslation.cpp:4124 mapsdatatranslation.cpp:4125
 msgctxt "manipur.kgm"
 msgid "Chandel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4119 mapsdatatranslation.cpp:4120
+#: mapsdatatranslation.cpp:4126 mapsdatatranslation.cpp:4127
 msgctxt "manipur.kgm"
 msgid "Churachandpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4121
+#: mapsdatatranslation.cpp:4128
 msgctxt "mexico_states.kgm"
 msgid "Mexico (States)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4122
+#: mapsdatatranslation.cpp:4129
 msgctxt "mexico_states.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4123
+#: mapsdatatranslation.cpp:4130
 msgctxt "mexico_states.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4124
+#: mapsdatatranslation.cpp:4131
 msgctxt "mexico_states.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4125
+#: mapsdatatranslation.cpp:4132
 msgctxt "mexico_states.kgm"
 msgid "Not Mexico (States)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4126 mapsdatatranslation.cpp:4127
+#: mapsdatatranslation.cpp:4133 mapsdatatranslation.cpp:4134
 msgctxt "mexico_states.kgm"
 msgid "Aguascalientes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4128
+#: mapsdatatranslation.cpp:4135
 msgctxt "mexico_states.kgm"
 msgid "Baja California"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4129
+#: mapsdatatranslation.cpp:4136
 msgctxt "mexico_states.kgm"
 msgid "Mexicali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4130
+#: mapsdatatranslation.cpp:4137
 msgctxt "mexico_states.kgm"
 msgid "Baja California Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4131
+#: mapsdatatranslation.cpp:4138
 msgctxt "mexico_states.kgm"
 msgid "La Paz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4132 mapsdatatranslation.cpp:4133
+#: mapsdatatranslation.cpp:4139 mapsdatatranslation.cpp:4140
 msgctxt "mexico_states.kgm"
 msgid "Campeche"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4134
+#: mapsdatatranslation.cpp:4141
 msgctxt "mexico_states.kgm"
 msgid "Chiapas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4135
+#: mapsdatatranslation.cpp:4142
 msgctxt "mexico_states.kgm"
 msgid "Tuxtla Gutiérrez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4136 mapsdatatranslation.cpp:4137
+#: mapsdatatranslation.cpp:4143 mapsdatatranslation.cpp:4144
 msgctxt "mexico_states.kgm"
 msgid "Chihuahua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4138
+#: mapsdatatranslation.cpp:4145
 msgctxt "mexico_states.kgm"
 msgid "Coahuila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4139
+#: mapsdatatranslation.cpp:4146
 msgctxt "mexico_states.kgm"
 msgid "Saltillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4140 mapsdatatranslation.cpp:4141
+#: mapsdatatranslation.cpp:4147 mapsdatatranslation.cpp:4148
 msgctxt "mexico_states.kgm"
 msgid "Colima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4142 mapsdatatranslation.cpp:4143
+#: mapsdatatranslation.cpp:4149 mapsdatatranslation.cpp:4150
 msgctxt "mexico_states.kgm"
 msgid "Durango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4144 mapsdatatranslation.cpp:4145
+#: mapsdatatranslation.cpp:4151 mapsdatatranslation.cpp:4152
 msgctxt "mexico_states.kgm"
 msgid "Guanajuato"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4146
+#: mapsdatatranslation.cpp:4153
 msgctxt "mexico_states.kgm"
 msgid "Guerrero"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4147
+#: mapsdatatranslation.cpp:4154
 msgctxt "mexico_states.kgm"
 msgid "Chilpancingo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4148
+#: mapsdatatranslation.cpp:4155
 msgctxt "mexico_states.kgm"
 msgid "Hidalgo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4149
+#: mapsdatatranslation.cpp:4156
 msgctxt "mexico_states.kgm"
 msgid "Pachuca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4150
+#: mapsdatatranslation.cpp:4157
 msgctxt "mexico_states.kgm"
 msgid "Jalisco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4151
+#: mapsdatatranslation.cpp:4158
 msgctxt "mexico_states.kgm"
 msgid "Guadalajara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4152
+#: mapsdatatranslation.cpp:4159
 msgctxt "mexico_states.kgm"
 msgid "México"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4153
+#: mapsdatatranslation.cpp:4160
 msgctxt "mexico_states.kgm"
 msgid "Toluca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4154
+#: mapsdatatranslation.cpp:4161
 msgctxt "mexico_states.kgm"
 msgid "Michoacán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4155
+#: mapsdatatranslation.cpp:4162
 msgctxt "mexico_states.kgm"
 msgid "Morelia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4156
+#: mapsdatatranslation.cpp:4163
 msgctxt "mexico_states.kgm"
 msgid "Morelos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4157
+#: mapsdatatranslation.cpp:4164
 msgctxt "mexico_states.kgm"
 msgid "Cuernavaca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4158
+#: mapsdatatranslation.cpp:4165
 msgctxt "mexico_states.kgm"
 msgid "Nayarit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4159
+#: mapsdatatranslation.cpp:4166
 msgctxt "mexico_states.kgm"
 msgid "Tepic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4160
+#: mapsdatatranslation.cpp:4167
 msgctxt "mexico_states.kgm"
 msgid "Nuevo León"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4161
+#: mapsdatatranslation.cpp:4168
 msgctxt "mexico_states.kgm"
 msgid "Monterrey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4162 mapsdatatranslation.cpp:4163
+#: mapsdatatranslation.cpp:4169 mapsdatatranslation.cpp:4170
 msgctxt "mexico_states.kgm"
 msgid "Oaxaca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4164 mapsdatatranslation.cpp:4165
+#: mapsdatatranslation.cpp:4171 mapsdatatranslation.cpp:4172
 msgctxt "mexico_states.kgm"
 msgid "Puebla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4166
+#: mapsdatatranslation.cpp:4173
 msgctxt "mexico_states.kgm"
 msgid "Querétaro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4167
+#: mapsdatatranslation.cpp:4174
 msgctxt "mexico_states.kgm"
 msgid "Santiago de Querétaro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4168
+#: mapsdatatranslation.cpp:4175
 msgctxt "mexico_states.kgm"
 msgid "Quintana Roo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4169
+#: mapsdatatranslation.cpp:4176
 msgctxt "mexico_states.kgm"
 msgid "Chetumal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4170 mapsdatatranslation.cpp:4171
+#: mapsdatatranslation.cpp:4177 mapsdatatranslation.cpp:4178
 msgctxt "mexico_states.kgm"
 msgid "San Luis Potosí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4172
+#: mapsdatatranslation.cpp:4179
 msgctxt "mexico_states.kgm"
 msgid "Sinaloa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4173
+#: mapsdatatranslation.cpp:4180
 msgctxt "mexico_states.kgm"
 msgid "Culiacán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4174
+#: mapsdatatranslation.cpp:4181
 msgctxt "mexico_states.kgm"
 msgid "Sonora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4175
+#: mapsdatatranslation.cpp:4182
 msgctxt "mexico_states.kgm"
 msgid "Hermosillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4176
+#: mapsdatatranslation.cpp:4183
 msgctxt "mexico_states.kgm"
 msgid "Tabasco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4177
+#: mapsdatatranslation.cpp:4184
 msgctxt "mexico_states.kgm"
 msgid "Villahermosa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4178
+#: mapsdatatranslation.cpp:4185
 msgctxt "mexico_states.kgm"
 msgid "Tamaulipas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4179
+#: mapsdatatranslation.cpp:4186
 msgctxt "mexico_states.kgm"
 msgid "Ciudad Victoria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4180 mapsdatatranslation.cpp:4181
+#: mapsdatatranslation.cpp:4187 mapsdatatranslation.cpp:4188
 msgctxt "mexico_states.kgm"
 msgid "Tlaxcala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4182
+#: mapsdatatranslation.cpp:4189
 msgctxt "mexico_states.kgm"
 msgid "Veracruz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4183
+#: mapsdatatranslation.cpp:4190
 msgctxt "mexico_states.kgm"
 msgid "Xalapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4184
+#: mapsdatatranslation.cpp:4191
 msgctxt "mexico_states.kgm"
 msgid "Yucatán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4185
+#: mapsdatatranslation.cpp:4192
 msgctxt "mexico_states.kgm"
 msgid "Mérida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4186 mapsdatatranslation.cpp:4187
+#: mapsdatatranslation.cpp:4193 mapsdatatranslation.cpp:4194
 msgctxt "mexico_states.kgm"
 msgid "Zacatecas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4188
+#: mapsdatatranslation.cpp:4195
 msgctxt "mexico_states.kgm"
 msgid "Federal District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4189
+#: mapsdatatranslation.cpp:4196
 msgctxt "mexico_states.kgm"
 msgid "Mexico City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4190
+#: mapsdatatranslation.cpp:4197
 msgctxt "mongolia.kgm"
 msgid "Mongolia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4191
+#: mapsdatatranslation.cpp:4198
 msgctxt "mongolia.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4192
+#: mapsdatatranslation.cpp:4199
 msgctxt "mongolia.kgm"
 msgid "Not Mongolia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4193
+#: mapsdatatranslation.cpp:4200
 msgctxt "mongolia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4194
+#: mapsdatatranslation.cpp:4201
 msgctxt "mongolia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4195
+#: mapsdatatranslation.cpp:4202
 msgctxt "mongolia.kgm"
 msgid "Arhangay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4196
+#: mapsdatatranslation.cpp:4203
 msgctxt "mongolia.kgm"
 msgid "Tsetserleg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4197
+#: mapsdatatranslation.cpp:4204
 msgctxt "mongolia.kgm"
 msgid "Bayan-Ölgiy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4198
+#: mapsdatatranslation.cpp:4205
 msgctxt "mongolia.kgm"
 msgid "Ölgiy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4199 mapsdatatranslation.cpp:4200
+#: mapsdatatranslation.cpp:4206 mapsdatatranslation.cpp:4207
 msgctxt "mongolia.kgm"
 msgid "Bayanhongor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4201 mapsdatatranslation.cpp:4202
+#: mapsdatatranslation.cpp:4208 mapsdatatranslation.cpp:4209
 msgctxt "mongolia.kgm"
 msgid "Bulgan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4203
+#: mapsdatatranslation.cpp:4210
 msgctxt "mongolia.kgm"
 msgid "Darhan-Uul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4204
+#: mapsdatatranslation.cpp:4211
 msgctxt "mongolia.kgm"
 msgid "Darhan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4205
+#: mapsdatatranslation.cpp:4212
 msgctxt "mongolia.kgm"
 msgid "Dornod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4206
+#: mapsdatatranslation.cpp:4213
 msgctxt "mongolia.kgm"
 msgid "Choybalsan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4207
+#: mapsdatatranslation.cpp:4214
 msgctxt "mongolia.kgm"
 msgid "Dornogovĭ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4208
+#: mapsdatatranslation.cpp:4215
 msgctxt "mongolia.kgm"
 msgid "Saynshand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4209
+#: mapsdatatranslation.cpp:4216
 msgctxt "mongolia.kgm"
 msgid "Dundgovĭ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4210
+#: mapsdatatranslation.cpp:4217
 msgctxt "mongolia.kgm"
 msgid "Mandalgovĭ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4211
+#: mapsdatatranslation.cpp:4218
 msgctxt "mongolia.kgm"
 msgid "Govĭ-Altay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4212
+#: mapsdatatranslation.cpp:4219
 msgctxt "mongolia.kgm"
 msgid "Altay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4213
+#: mapsdatatranslation.cpp:4220
 msgctxt "mongolia.kgm"
 msgid "Govĭsümber"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4214
+#: mapsdatatranslation.cpp:4221
 msgctxt "mongolia.kgm"
 msgid "Choyr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4215
+#: mapsdatatranslation.cpp:4222
 msgctxt "mongolia.kgm"
 msgid "Hentiy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4216
+#: mapsdatatranslation.cpp:4223
 msgctxt "mongolia.kgm"
 msgid "Öndörhaan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4217 mapsdatatranslation.cpp:4218
+#: mapsdatatranslation.cpp:4224 mapsdatatranslation.cpp:4225
 msgctxt "mongolia.kgm"
 msgid "Hovd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4219
+#: mapsdatatranslation.cpp:4226
 msgctxt "mongolia.kgm"
 msgid "Hövsgöl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4220
+#: mapsdatatranslation.cpp:4227
 msgctxt "mongolia.kgm"
 msgid "Mörön"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4221
+#: mapsdatatranslation.cpp:4228
 msgctxt "mongolia.kgm"
 msgid "Ömnögovĭ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4222
+#: mapsdatatranslation.cpp:4229
 msgctxt "mongolia.kgm"
 msgid "Dalanzadgad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4223
+#: mapsdatatranslation.cpp:4230
 msgctxt "mongolia.kgm"
 msgid "Orhon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4224
+#: mapsdatatranslation.cpp:4231
 msgctxt "mongolia.kgm"
 msgid "Erdenet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4225
+#: mapsdatatranslation.cpp:4232
 msgctxt "mongolia.kgm"
 msgid "Övörhangay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4226
+#: mapsdatatranslation.cpp:4233
 msgctxt "mongolia.kgm"
 msgid "Arvayheer"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4227
+#: mapsdatatranslation.cpp:4234
 msgctxt "mongolia.kgm"
 msgid "Selenge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4228 mapsdatatranslation.cpp:4229
+#: mapsdatatranslation.cpp:4235 mapsdatatranslation.cpp:4236
 msgctxt "mongolia.kgm"
 msgid "Sühbaatar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4230
+#: mapsdatatranslation.cpp:4237
 msgctxt "mongolia.kgm"
 msgid "Baruun-Urt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4231
+#: mapsdatatranslation.cpp:4238
 msgctxt "mongolia.kgm"
 msgid "Töv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4232
+#: mapsdatatranslation.cpp:4239
 msgctxt "mongolia.kgm"
 msgid "Zuunmod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4233
+#: mapsdatatranslation.cpp:4240
 msgctxt "mongolia.kgm"
 msgid "Uvs"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4234
+#: mapsdatatranslation.cpp:4241
 msgctxt "mongolia.kgm"
 msgid "Ulaangom"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4235
+#: mapsdatatranslation.cpp:4242
 msgctxt "mongolia.kgm"
 msgid "Zavhan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4236
+#: mapsdatatranslation.cpp:4243
 msgctxt "mongolia.kgm"
 msgid "Uliastay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4237
+#: mapsdatatranslation.cpp:4244
 msgctxt "mongolia.kgm"
 msgid "Ulan Bator"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4238
+#: mapsdatatranslation.cpp:4245
 msgctxt "ncamerica.kgm"
 msgid "North and Central America"
 msgstr "North and Central America"
 
-#: mapsdatatranslation.cpp:4239
+#: mapsdatatranslation.cpp:4246
 msgctxt "ncamerica.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4240
+#: mapsdatatranslation.cpp:4247
 msgctxt "ncamerica.kgm"
 msgid "Water"
 msgstr "Dŵr"
 
-#: mapsdatatranslation.cpp:4241
+#: mapsdatatranslation.cpp:4248
 msgctxt "ncamerica.kgm"
 msgid "Not North and Central America"
 msgstr "Not North and Central America"
 
-#: mapsdatatranslation.cpp:4242
+#: mapsdatatranslation.cpp:4249
 msgctxt "ncamerica.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:4243
+#: mapsdatatranslation.cpp:4250
 msgctxt "ncamerica.kgm"
 msgid "Canada"
 msgstr "Canada"
 
-#: mapsdatatranslation.cpp:4244
+#: mapsdatatranslation.cpp:4251
 msgctxt "ncamerica.kgm"
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: mapsdatatranslation.cpp:4245
+#: mapsdatatranslation.cpp:4252
 msgctxt "ncamerica.kgm"
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: mapsdatatranslation.cpp:4246
+#: mapsdatatranslation.cpp:4253
 msgctxt "ncamerica.kgm"
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: mapsdatatranslation.cpp:4247
+#: mapsdatatranslation.cpp:4254
 msgctxt "ncamerica.kgm"
 msgid "The United States of America"
 msgstr "The United States of America"
 
-#: mapsdatatranslation.cpp:4248
+#: mapsdatatranslation.cpp:4255
 msgctxt "ncamerica.kgm"
 msgid "Washington D.C."
 msgstr "Washington D.C."
 
-#: mapsdatatranslation.cpp:4249
+#: mapsdatatranslation.cpp:4256
 msgctxt "ncamerica.kgm"
 msgid "The Bahamas"
 msgstr "The Bahamas"
 
-#: mapsdatatranslation.cpp:4250
+#: mapsdatatranslation.cpp:4257
 msgctxt "ncamerica.kgm"
 msgid "Nassau"
 msgstr "Nassau"
 
-#: mapsdatatranslation.cpp:4251
+#: mapsdatatranslation.cpp:4258
 msgctxt "ncamerica.kgm"
 msgid "The Dominican Republic"
 msgstr "The Dominican Republic"
 
-#: mapsdatatranslation.cpp:4252
+#: mapsdatatranslation.cpp:4259
 msgctxt "ncamerica.kgm"
 msgid "Santo Domingo"
 msgstr "Santo Domingo"
 
-#: mapsdatatranslation.cpp:4253
+#: mapsdatatranslation.cpp:4260
 msgctxt "ncamerica.kgm"
 msgid "Haiti"
 msgstr "Haiti"
 
-#: mapsdatatranslation.cpp:4254
+#: mapsdatatranslation.cpp:4261
 msgctxt "ncamerica.kgm"
 msgid "Port-au-Prince"
 msgstr "Port-au-Prince"
 
-#: mapsdatatranslation.cpp:4255
+#: mapsdatatranslation.cpp:4262
 msgctxt "ncamerica.kgm"
 msgid "Cuba"
 msgstr "Cuba"
 
-#: mapsdatatranslation.cpp:4256
+#: mapsdatatranslation.cpp:4263
 msgctxt "ncamerica.kgm"
 msgid "Havana"
 msgstr "Havana"
 
-#: mapsdatatranslation.cpp:4257
+#: mapsdatatranslation.cpp:4264
 msgctxt "ncamerica.kgm"
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: mapsdatatranslation.cpp:4258
+#: mapsdatatranslation.cpp:4265
 msgctxt "ncamerica.kgm"
 msgid "Kingston"
 msgstr "Kingston"
 
-#: mapsdatatranslation.cpp:4259
+#: mapsdatatranslation.cpp:4266
 msgctxt "ncamerica.kgm"
 msgid "Dominica"
 msgstr "Dominica"
 
-#: mapsdatatranslation.cpp:4260
+#: mapsdatatranslation.cpp:4267
 msgctxt "ncamerica.kgm"
 msgid "Roseau"
 msgstr "Roseau"
 
-#: mapsdatatranslation.cpp:4261
+#: mapsdatatranslation.cpp:4268
 msgctxt "ncamerica.kgm"
 msgid "Antigua and Barbuda"
 msgstr "Antigua and Barbuda"
 
-#: mapsdatatranslation.cpp:4262
+#: mapsdatatranslation.cpp:4269
 msgctxt "ncamerica.kgm"
 msgid "St. John's"
 msgstr "St. John's"
 
-#: mapsdatatranslation.cpp:4263
+#: mapsdatatranslation.cpp:4270
 msgctxt "ncamerica.kgm"
 msgid "Barbados"
 msgstr "Barbados"
 
-#: mapsdatatranslation.cpp:4264
+#: mapsdatatranslation.cpp:4271
 msgctxt "ncamerica.kgm"
 msgid "Bridgetown"
 msgstr "Bridgetown"
 
-#: mapsdatatranslation.cpp:4265
+#: mapsdatatranslation.cpp:4272
 msgctxt "ncamerica.kgm"
 msgid "Trinidad and Tobago"
 msgstr "Trinidad and Tobago"
 
-#: mapsdatatranslation.cpp:4266
+#: mapsdatatranslation.cpp:4273
 msgctxt "ncamerica.kgm"
 msgid "Port of Spain"
 msgstr "Port of Sbaen"
 
-#: mapsdatatranslation.cpp:4267
+#: mapsdatatranslation.cpp:4274
 msgctxt "ncamerica.kgm"
 msgid "Mexico"
 msgstr "Mexico"
 
-#: mapsdatatranslation.cpp:4268
+#: mapsdatatranslation.cpp:4275
 msgctxt "ncamerica.kgm"
 msgid "Mexico City"
 msgstr "Mexico City"
 
-#: mapsdatatranslation.cpp:4269
+#: mapsdatatranslation.cpp:4276
 msgctxt "ncamerica.kgm"
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: mapsdatatranslation.cpp:4270
+#: mapsdatatranslation.cpp:4277
 msgctxt "ncamerica.kgm"
 msgid "Guatemala City"
 msgstr "Guatemala City"
 
-#: mapsdatatranslation.cpp:4271
+#: mapsdatatranslation.cpp:4278
 msgctxt "ncamerica.kgm"
 msgid "Belize"
 msgstr "Belize"
 
-#: mapsdatatranslation.cpp:4272
+#: mapsdatatranslation.cpp:4279
 msgctxt "ncamerica.kgm"
 msgid "Belmopan"
 msgstr "Belmopan"
 
-#: mapsdatatranslation.cpp:4273
+#: mapsdatatranslation.cpp:4280
 msgctxt "ncamerica.kgm"
 msgid "Honduras"
 msgstr "Honduras"
 
-#: mapsdatatranslation.cpp:4274
+#: mapsdatatranslation.cpp:4281
 msgctxt "ncamerica.kgm"
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: mapsdatatranslation.cpp:4275
+#: mapsdatatranslation.cpp:4282
 msgctxt "ncamerica.kgm"
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: mapsdatatranslation.cpp:4276
+#: mapsdatatranslation.cpp:4283
 msgctxt "ncamerica.kgm"
 msgid "Managua"
 msgstr "Managua"
 
-#: mapsdatatranslation.cpp:4277
+#: mapsdatatranslation.cpp:4284
 msgctxt "ncamerica.kgm"
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: mapsdatatranslation.cpp:4278
+#: mapsdatatranslation.cpp:4285
 msgctxt "ncamerica.kgm"
 msgid "San José"
 msgstr "San José"
 
-#: mapsdatatranslation.cpp:4279
+#: mapsdatatranslation.cpp:4286
 msgctxt "ncamerica.kgm"
 msgid "Panama"
 msgstr "Panama"
 
-#: mapsdatatranslation.cpp:4280
+#: mapsdatatranslation.cpp:4287
 msgctxt "ncamerica.kgm"
 msgid "Panama City"
 msgstr "Panama City"
 
-#: mapsdatatranslation.cpp:4281
+#: mapsdatatranslation.cpp:4288
 msgctxt "ncamerica.kgm"
 msgid "Greenland [Denmark]"
 msgstr "Greenland [Denmarc]"
 
-#: mapsdatatranslation.cpp:4282
+#: mapsdatatranslation.cpp:4289
 msgctxt "ncamerica.kgm"
 msgid "Guyana"
 msgstr "Guyana"
 
-#: mapsdatatranslation.cpp:4283
+#: mapsdatatranslation.cpp:4290
 msgctxt "ncamerica.kgm"
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: mapsdatatranslation.cpp:4284
+#: mapsdatatranslation.cpp:4291
 msgctxt "ncamerica.kgm"
 msgid "Colombia"
 msgstr "Colombia"
 
-#: mapsdatatranslation.cpp:4285
+#: mapsdatatranslation.cpp:4292
 msgctxt "nepal_zones.kgm"
 msgid "Nepal (Zones)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4286
+#: mapsdatatranslation.cpp:4293
 msgctxt "nepal_zones.kgm"
 msgid "Zones"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4287
+#: mapsdatatranslation.cpp:4294
 msgctxt "nepal_zones.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4288
+#: mapsdatatranslation.cpp:4295
 msgctxt "nepal_zones.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4289
+#: mapsdatatranslation.cpp:4296
 msgctxt "nepal_zones.kgm"
 msgid "Not Nepal (Zones)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4290
+#: mapsdatatranslation.cpp:4297
 msgctxt "nepal_zones.kgm"
 msgid "Bagmati"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4291
+#: mapsdatatranslation.cpp:4298
 msgctxt "nepal_zones.kgm"
 msgid "Bheri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4292
+#: mapsdatatranslation.cpp:4299
 msgctxt "nepal_zones.kgm"
 msgid "Dhawalagiri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4293
+#: mapsdatatranslation.cpp:4300
 msgctxt "nepal_zones.kgm"
 msgid "Gandaki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4294
+#: mapsdatatranslation.cpp:4301
 msgctxt "nepal_zones.kgm"
 msgid "Janakpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4295
+#: mapsdatatranslation.cpp:4302
 msgctxt "nepal_zones.kgm"
 msgid "Karnali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4296
+#: mapsdatatranslation.cpp:4303
 msgctxt "nepal_zones.kgm"
 msgid "Koshi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4297
+#: mapsdatatranslation.cpp:4304
 msgctxt "nepal_zones.kgm"
 msgid "Lumbini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4298
+#: mapsdatatranslation.cpp:4305
 msgctxt "nepal_zones.kgm"
 msgid "Mahakali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4299
+#: mapsdatatranslation.cpp:4306
 msgctxt "nepal_zones.kgm"
 msgid "Mechi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4300
+#: mapsdatatranslation.cpp:4307
 msgctxt "nepal_zones.kgm"
 msgid "Narayani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4301
+#: mapsdatatranslation.cpp:4308
 msgctxt "nepal_zones.kgm"
 msgid "Rapti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4302
+#: mapsdatatranslation.cpp:4309
 msgctxt "nepal_zones.kgm"
 msgid "Sagarmatha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4303
+#: mapsdatatranslation.cpp:4310
 msgctxt "nepal_zones.kgm"
 msgid "Seti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4304
+#: mapsdatatranslation.cpp:4311
 msgctxt "netherlands.kgm"
 msgid "The Netherlands"
 msgstr "The Netherlands"
 
-#: mapsdatatranslation.cpp:4305
+#: mapsdatatranslation.cpp:4312
 msgctxt "netherlands.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4306
+#: mapsdatatranslation.cpp:4313
 msgctxt "netherlands.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:4307
+#: mapsdatatranslation.cpp:4314
 msgctxt "netherlands.kgm"
 msgid "Not The Netherlands"
 msgstr "Not The Netherlands"
 
-#: mapsdatatranslation.cpp:4308
+#: mapsdatatranslation.cpp:4315
 msgctxt "netherlands.kgm"
 msgid "Water"
 msgstr "Dŵr"
 
-#: mapsdatatranslation.cpp:4309
+#: mapsdatatranslation.cpp:4316
 msgctxt "netherlands.kgm"
 msgid "Friesland"
 msgstr "Friesland"
 
-#: mapsdatatranslation.cpp:4310
+#: mapsdatatranslation.cpp:4317
 msgctxt "netherlands.kgm"
 msgid "Leeuwarden"
 msgstr "Leeuwarden"
 
-#: mapsdatatranslation.cpp:4311 mapsdatatranslation.cpp:4312
+#: mapsdatatranslation.cpp:4318 mapsdatatranslation.cpp:4319
 msgctxt "netherlands.kgm"
 msgid "Groningen"
 msgstr "Groningen"
 
-#: mapsdatatranslation.cpp:4313
+#: mapsdatatranslation.cpp:4320
 msgctxt "netherlands.kgm"
 msgid "Drenthe"
 msgstr "Drenthe"
 
-#: mapsdatatranslation.cpp:4314
+#: mapsdatatranslation.cpp:4321
 msgctxt "netherlands.kgm"
 msgid "Assen"
 msgstr "Assen"
 
-#: mapsdatatranslation.cpp:4315
+#: mapsdatatranslation.cpp:4322
 msgctxt "netherlands.kgm"
 msgid "Overijssel"
 msgstr "Overijssel"
 
-#: mapsdatatranslation.cpp:4316
+#: mapsdatatranslation.cpp:4323
 msgctxt "netherlands.kgm"
 msgid "Zwolle"
 msgstr "Zwolle"
 
-#: mapsdatatranslation.cpp:4317
+#: mapsdatatranslation.cpp:4324
 msgctxt "netherlands.kgm"
 msgid "Gelderland"
 msgstr "Gelderland"
 
-#: mapsdatatranslation.cpp:4318
+#: mapsdatatranslation.cpp:4325
 msgctxt "netherlands.kgm"
 msgid "Arnhem"
 msgstr "Arnhem"
 
-#: mapsdatatranslation.cpp:4319
+#: mapsdatatranslation.cpp:4326
 msgctxt "netherlands.kgm"
 msgid "North Brabant"
 msgstr "North Brabant"
 
-#: mapsdatatranslation.cpp:4320
+#: mapsdatatranslation.cpp:4327
 msgctxt "netherlands.kgm"
 msgid "'s Hertogenbosch"
 msgstr "'s Hertogenbosch"
 
-#: mapsdatatranslation.cpp:4321
+#: mapsdatatranslation.cpp:4328
 msgctxt "netherlands.kgm"
 msgid "Limburg"
 msgstr "Limburg"
 
-#: mapsdatatranslation.cpp:4322
+#: mapsdatatranslation.cpp:4329
 msgctxt "netherlands.kgm"
 msgid "Maastricht"
 msgstr "Maastricht"
 
-#: mapsdatatranslation.cpp:4323
+#: mapsdatatranslation.cpp:4330
 msgctxt "netherlands.kgm"
 msgid "Flevoland"
 msgstr "Gwlad Pwyl"
 
-#: mapsdatatranslation.cpp:4324
+#: mapsdatatranslation.cpp:4331
 msgctxt "netherlands.kgm"
 msgid "Lelystad"
 msgstr "Lelystad"
 
-#: mapsdatatranslation.cpp:4325 mapsdatatranslation.cpp:4326
+#: mapsdatatranslation.cpp:4332 mapsdatatranslation.cpp:4333
 msgctxt "netherlands.kgm"
 msgid "Utrecht"
 msgstr "Utrecht"
 
-#: mapsdatatranslation.cpp:4327
+#: mapsdatatranslation.cpp:4334
 msgctxt "netherlands.kgm"
 msgid "Zeeland"
 msgstr "Zeeland"
 
-#: mapsdatatranslation.cpp:4328
+#: mapsdatatranslation.cpp:4335
 msgctxt "netherlands.kgm"
 msgid "Middelburg"
 msgstr "Middelburg"
 
-#: mapsdatatranslation.cpp:4329
+#: mapsdatatranslation.cpp:4336
 msgctxt "netherlands.kgm"
 msgid "North Holland"
 msgstr "North Holland"
 
-#: mapsdatatranslation.cpp:4330
+#: mapsdatatranslation.cpp:4337
 msgctxt "netherlands.kgm"
 msgid "Haarlem"
 msgstr "Haarlem"
 
-#: mapsdatatranslation.cpp:4331
+#: mapsdatatranslation.cpp:4338
 msgctxt "netherlands.kgm"
 msgid "South Holland"
 msgstr "South Holland"
 
-#: mapsdatatranslation.cpp:4332
+#: mapsdatatranslation.cpp:4339
 msgctxt "netherlands.kgm"
 msgid "The Hague"
 msgstr "The Hague"
 
-#: mapsdatatranslation.cpp:4333
+#: mapsdatatranslation.cpp:4340
 msgctxt "new-zealand.kgm"
 msgid "New-Zealand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4334
+#: mapsdatatranslation.cpp:4341
 msgctxt "new-zealand.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4335
+#: mapsdatatranslation.cpp:4342
 msgctxt "new-zealand.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4336
+#: mapsdatatranslation.cpp:4343
 msgctxt "new-zealand.kgm"
 msgid "Not New-Zealand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4337
+#: mapsdatatranslation.cpp:4344
 msgctxt "new-zealand.kgm"
 msgid "Northland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4338
+#: mapsdatatranslation.cpp:4345
 msgctxt "new-zealand.kgm"
 msgid "Whangarei"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4339
+#: mapsdatatranslation.cpp:4346
 msgctxt "new-zealand.kgm"
 msgid "Auckland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4340
+#: mapsdatatranslation.cpp:4347
 msgctxt "new-zealand.kgm"
 msgid "Auckland City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4341
+#: mapsdatatranslation.cpp:4348
 msgctxt "new-zealand.kgm"
 msgid "Waikato"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4342
+#: mapsdatatranslation.cpp:4349
 msgctxt "new-zealand.kgm"
 msgid "Hamilton"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4343
+#: mapsdatatranslation.cpp:4350
 msgctxt "new-zealand.kgm"
 msgid "Bay of Plenty"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4344
+#: mapsdatatranslation.cpp:4351
 msgctxt "new-zealand.kgm"
 msgid "Whakatane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4345
-msgctxt "new-zealand.kgm"
-msgid "East Cape"
-msgstr ""
-
-#: mapsdatatranslation.cpp:4346
+#: mapsdatatranslation.cpp:4352 mapsdatatranslation.cpp:4353
 msgctxt "new-zealand.kgm"
 msgid "Gisborne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4347
+#: mapsdatatranslation.cpp:4354
 msgctxt "new-zealand.kgm"
 msgid "Hawke's Bay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4348
+#: mapsdatatranslation.cpp:4355
 msgctxt "new-zealand.kgm"
 msgid "Napier/Hastings"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4349
+#: mapsdatatranslation.cpp:4356
 msgctxt "new-zealand.kgm"
 msgid "Taranaki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4350
+#: mapsdatatranslation.cpp:4357
 msgctxt "new-zealand.kgm"
 msgid "New Plymouth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4351
+#: mapsdatatranslation.cpp:4358
 msgctxt "new-zealand.kgm"
 msgid "Manawatu-Wanganui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4352
+#: mapsdatatranslation.cpp:4359
 msgctxt "new-zealand.kgm"
 msgid "Wanganui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4353 mapsdatatranslation.cpp:4354
+#: mapsdatatranslation.cpp:4360 mapsdatatranslation.cpp:4361
 msgctxt "new-zealand.kgm"
 msgid "Wellington"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4355
+#: mapsdatatranslation.cpp:4362
 msgctxt "new-zealand.kgm"
 msgid "Tasman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4356
+#: mapsdatatranslation.cpp:4363
 msgctxt "new-zealand.kgm"
 msgid "Nelson City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4357
+#: mapsdatatranslation.cpp:4364
 msgctxt "new-zealand.kgm"
 msgid "Marlborough"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4358
+#: mapsdatatranslation.cpp:4365
 msgctxt "new-zealand.kgm"
 msgid "Blenheim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4359
+#: mapsdatatranslation.cpp:4366
 msgctxt "new-zealand.kgm"
 msgid "West Coast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4360
+#: mapsdatatranslation.cpp:4367
 msgctxt "new-zealand.kgm"
 msgid "Grey Mouth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4361
+#: mapsdatatranslation.cpp:4368
 msgctxt "new-zealand.kgm"
 msgid "Canterbury"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4362
+#: mapsdatatranslation.cpp:4369
 msgctxt "new-zealand.kgm"
 msgid "Christchurch"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4363
+#: mapsdatatranslation.cpp:4370
 msgctxt "new-zealand.kgm"
 msgid "Otago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4364
+#: mapsdatatranslation.cpp:4371
 msgctxt "new-zealand.kgm"
 msgid "Dunedin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4365
+#: mapsdatatranslation.cpp:4372
 msgctxt "new-zealand.kgm"
 msgid "Southland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4366
+#: mapsdatatranslation.cpp:4373
 msgctxt "new-zealand.kgm"
 msgid "Invercargil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4367
+#: mapsdatatranslation.cpp:4374
 msgctxt "nicaragua.kgm"
 msgid "Nicaragua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4368
+#: mapsdatatranslation.cpp:4375
 msgctxt "nicaragua.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4369 mapsdatatranslation.cpp:4370
+#: mapsdatatranslation.cpp:4376 mapsdatatranslation.cpp:4377
 msgctxt "nicaragua.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4371
+#: mapsdatatranslation.cpp:4378
 msgctxt "nicaragua.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4372
+#: mapsdatatranslation.cpp:4379
 msgctxt "nicaragua.kgm"
 msgid "Not Nicaragua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4373
+#: mapsdatatranslation.cpp:4380
 msgctxt "nicaragua.kgm"
 msgid "Nueva Segovia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4374
+#: mapsdatatranslation.cpp:4381
 msgctxt "nicaragua.kgm"
 msgid "Ocotal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4375
+#: mapsdatatranslation.cpp:4382
 msgctxt "nicaragua.kgm"
 msgid "Madriz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4376
+#: mapsdatatranslation.cpp:4383
 msgctxt "nicaragua.kgm"
 msgid "Somoto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4377 mapsdatatranslation.cpp:4378
+#: mapsdatatranslation.cpp:4384 mapsdatatranslation.cpp:4385
 msgctxt "nicaragua.kgm"
 msgid "Estelí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4379 mapsdatatranslation.cpp:4380
+#: mapsdatatranslation.cpp:4386 mapsdatatranslation.cpp:4387
 msgctxt "nicaragua.kgm"
 msgid "Chinandega"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4381 mapsdatatranslation.cpp:4382
+#: mapsdatatranslation.cpp:4388 mapsdatatranslation.cpp:4389
 msgctxt "nicaragua.kgm"
 msgid "León"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4383 mapsdatatranslation.cpp:4384
+#: mapsdatatranslation.cpp:4390 mapsdatatranslation.cpp:4391
 msgctxt "nicaragua.kgm"
 msgid "Managua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4385 mapsdatatranslation.cpp:4386
+#: mapsdatatranslation.cpp:4392 mapsdatatranslation.cpp:4393
 msgctxt "nicaragua.kgm"
 msgid "Masaya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4387
+#: mapsdatatranslation.cpp:4394
 msgctxt "nicaragua.kgm"
 msgid "Carazo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4388
+#: mapsdatatranslation.cpp:4395
 msgctxt "nicaragua.kgm"
 msgid "Jinotepe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4389 mapsdatatranslation.cpp:4390
+#: mapsdatatranslation.cpp:4396 mapsdatatranslation.cpp:4397
 msgctxt "nicaragua.kgm"
 msgid "Granada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4391 mapsdatatranslation.cpp:4392
+#: mapsdatatranslation.cpp:4398 mapsdatatranslation.cpp:4399
 msgctxt "nicaragua.kgm"
 msgid "Rivas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4393
+#: mapsdatatranslation.cpp:4400
 msgctxt "nicaragua.kgm"
 msgid "Chontales"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4394
+#: mapsdatatranslation.cpp:4401
 msgctxt "nicaragua.kgm"
 msgid "Juigalpa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4395 mapsdatatranslation.cpp:4396
+#: mapsdatatranslation.cpp:4402 mapsdatatranslation.cpp:4403
 msgctxt "nicaragua.kgm"
 msgid "Boaco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4397 mapsdatatranslation.cpp:4398
+#: mapsdatatranslation.cpp:4404 mapsdatatranslation.cpp:4405
 msgctxt "nicaragua.kgm"
 msgid "Matagalpa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4399 mapsdatatranslation.cpp:4400
+#: mapsdatatranslation.cpp:4406 mapsdatatranslation.cpp:4407
 msgctxt "nicaragua.kgm"
 msgid "Jinotega"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4401
+#: mapsdatatranslation.cpp:4408
 msgctxt "nicaragua.kgm"
 msgid "Río San Juan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4402
+#: mapsdatatranslation.cpp:4409
 msgctxt "nicaragua.kgm"
 msgid "San Carlos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4403
+#: mapsdatatranslation.cpp:4410
 msgctxt "nicaragua.kgm"
 msgid "Atlántico Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4404
+#: mapsdatatranslation.cpp:4411
 msgctxt "nicaragua.kgm"
 msgid "Puerto Cabezas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4405
+#: mapsdatatranslation.cpp:4412
 msgctxt "nicaragua.kgm"
 msgid "Atlántico Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4406
+#: mapsdatatranslation.cpp:4413
 msgctxt "nicaragua.kgm"
 msgid "Bluefields"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4407
+#: mapsdatatranslation.cpp:4414
 msgctxt "north_korea.kgm"
 msgid "North Korea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4408
+#: mapsdatatranslation.cpp:4415
 msgctxt "north_korea.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4409
+#: mapsdatatranslation.cpp:4416
 msgctxt "north_korea.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4410
+#: mapsdatatranslation.cpp:4417
 msgctxt "north_korea.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4411
+#: mapsdatatranslation.cpp:4418
 msgctxt "north_korea.kgm"
 msgid "Not North (Korea)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4412
+#: mapsdatatranslation.cpp:4419
 msgctxt "north_korea.kgm"
 msgid "Chagang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4413
+#: mapsdatatranslation.cpp:4420
 msgctxt "north_korea.kgm"
 msgid "Chagang-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4414
+#: mapsdatatranslation.cpp:4421
 msgctxt "north_korea.kgm"
 msgid "North Hamgyŏng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4415
+#: mapsdatatranslation.cpp:4422
 msgctxt "north_korea.kgm"
 msgid "Hamgyŏng-pukto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4416
+#: mapsdatatranslation.cpp:4423
 msgctxt "north_korea.kgm"
 msgid "South Hamgyŏng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4417
+#: mapsdatatranslation.cpp:4424
 msgctxt "north_korea.kgm"
 msgid "Hamgyŏng-namdo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4418
+#: mapsdatatranslation.cpp:4425
 msgctxt "north_korea.kgm"
 msgid "North Hwanghae"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4419
+#: mapsdatatranslation.cpp:4426
 msgctxt "north_korea.kgm"
 msgid "Hwanghae-pukto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4420
+#: mapsdatatranslation.cpp:4427
 msgctxt "north_korea.kgm"
 msgid "South Hwanghae"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4421
+#: mapsdatatranslation.cpp:4428
 msgctxt "north_korea.kgm"
 msgid "Hwanghae-namdo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4422
+#: mapsdatatranslation.cpp:4429
 msgctxt "north_korea.kgm"
 msgid "Kangwŏn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4423
+#: mapsdatatranslation.cpp:4430
 msgctxt "north_korea.kgm"
 msgid "Kangwŏndo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4424
+#: mapsdatatranslation.cpp:4431
 msgctxt "north_korea.kgm"
 msgid "North P'yŏngan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4425
+#: mapsdatatranslation.cpp:4432
 msgctxt "north_korea.kgm"
 msgid "P'yŏngan-pukto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4426
+#: mapsdatatranslation.cpp:4433
 msgctxt "north_korea.kgm"
 msgid "South P'yŏngan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4427
+#: mapsdatatranslation.cpp:4434
 msgctxt "north_korea.kgm"
 msgid "P'yŏngan-namdo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4428
+#: mapsdatatranslation.cpp:4435
 msgctxt "north_korea.kgm"
 msgid "Ryanggang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4429
+#: mapsdatatranslation.cpp:4436
 msgctxt "north_korea.kgm"
 msgid "Ryanggang-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4430
+#: mapsdatatranslation.cpp:4437
 msgctxt "north_korea.kgm"
 msgid "Kaesŏng Industrial Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4431
+#: mapsdatatranslation.cpp:4438
 msgctxt "north_korea.kgm"
 msgid "Kaesŏng Kong-ŏp Chigu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4432
+#: mapsdatatranslation.cpp:4439
 msgctxt "north_korea.kgm"
 msgid "Kŭmgangsan Tourist Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4433
+#: mapsdatatranslation.cpp:4440
 msgctxt "north_korea.kgm"
 msgid "Kŭmgangsan Kwangwang Chigu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4434
+#: mapsdatatranslation.cpp:4441
 msgctxt "north_korea.kgm"
 msgid "Sinŭiju Special Administrative Region"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4435
+#: mapsdatatranslation.cpp:4442
 msgctxt "north_korea.kgm"
 msgid "Sinŭiju T'ŭkpyŏl Haengjŏnggu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4436
+#: mapsdatatranslation.cpp:4443
 msgctxt "north_korea.kgm"
 msgid "P'yŏngyang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4437
+#: mapsdatatranslation.cpp:4444
 msgctxt "north_korea.kgm"
 msgid "P'yŏngyang Chikhalsi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4438
+#: mapsdatatranslation.cpp:4445
 msgctxt "north_korea.kgm"
 msgid "Rasŏn (Rajin-Sŏnbong)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4439
+#: mapsdatatranslation.cpp:4446
 msgctxt "north_korea.kgm"
 msgid "Rasŏn (Rajin-Sŏnbong) Chikhalsi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4440
+#: mapsdatatranslation.cpp:4447
 msgctxt "norway.kgm"
 msgid "Norway"
 msgstr "Norwy"
 
-#: mapsdatatranslation.cpp:4441
+#: mapsdatatranslation.cpp:4448
 msgctxt "norway.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4442
+#: mapsdatatranslation.cpp:4449
 msgctxt "norway.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:4443
+#: mapsdatatranslation.cpp:4450
 msgctxt "norway.kgm"
 msgid "Not Norway"
 msgstr "Dim  Norwy"
 
-#: mapsdatatranslation.cpp:4444
+#: mapsdatatranslation.cpp:4451
 msgctxt "norway.kgm"
 msgid "Finnmark"
 msgstr "Finnmark"
 
-#: mapsdatatranslation.cpp:4445
+#: mapsdatatranslation.cpp:4452
 msgctxt "norway.kgm"
 msgid "Vadsø"
 msgstr "Vadsø"
 
-#: mapsdatatranslation.cpp:4446
+#: mapsdatatranslation.cpp:4453
 msgctxt "norway.kgm"
 msgid "Troms"
 msgstr "Troms"
 
-#: mapsdatatranslation.cpp:4447
+#: mapsdatatranslation.cpp:4454
 msgctxt "norway.kgm"
 msgid "Tromsø"
 msgstr "Tromsø"
 
-#: mapsdatatranslation.cpp:4448
+#: mapsdatatranslation.cpp:4455
 msgctxt "norway.kgm"
 msgid "Nordland"
 msgstr "Nordland"
 
-#: mapsdatatranslation.cpp:4449
+#: mapsdatatranslation.cpp:4456
 msgctxt "norway.kgm"
 msgid "Bodø"
 msgstr "Bodø"
 
-#: mapsdatatranslation.cpp:4450
+#: mapsdatatranslation.cpp:4457
 msgctxt "norway.kgm"
 msgid "Nord-Trøndelag"
 msgstr "Nord-Trøndelag"
 
-#: mapsdatatranslation.cpp:4451
+#: mapsdatatranslation.cpp:4458
 msgctxt "norway.kgm"
 msgid "Steinkjer"
 msgstr "Steinkjer"
 
-#: mapsdatatranslation.cpp:4452
+#: mapsdatatranslation.cpp:4459
 msgctxt "norway.kgm"
 msgid "Sør-Trøndelag"
 msgstr "Sør-Trøndelag"
 
-#: mapsdatatranslation.cpp:4453
+#: mapsdatatranslation.cpp:4460
 msgctxt "norway.kgm"
 msgid "Trondheim"
 msgstr "Trondheim"
 
-#: mapsdatatranslation.cpp:4454
+#: mapsdatatranslation.cpp:4461
 msgctxt "norway.kgm"
 msgid "Møre Og Romsdal"
 msgstr "Møre Og Romsdal"
 
-#: mapsdatatranslation.cpp:4455
+#: mapsdatatranslation.cpp:4462
 msgctxt "norway.kgm"
 msgid "Molde"
 msgstr "Molde"
 
-#: mapsdatatranslation.cpp:4456
+#: mapsdatatranslation.cpp:4463
 msgctxt "norway.kgm"
 msgid "Oppland"
 msgstr "Oppland"
 
-#: mapsdatatranslation.cpp:4457
+#: mapsdatatranslation.cpp:4464
 msgctxt "norway.kgm"
 msgid "Lillehammer"
 msgstr "Lillehammer"
 
-#: mapsdatatranslation.cpp:4458
+#: mapsdatatranslation.cpp:4465
 msgctxt "norway.kgm"
 msgid "Hedmark"
 msgstr "Hedmark"
 
-#: mapsdatatranslation.cpp:4459
+#: mapsdatatranslation.cpp:4466
 msgctxt "norway.kgm"
 msgid "Hamar"
 msgstr "Hamar"
 
-#: mapsdatatranslation.cpp:4460
+#: mapsdatatranslation.cpp:4467
 msgctxt "norway.kgm"
 msgid "Sogn Og Fjordane"
 msgstr "Sogn Og Fjordane"
 
-#: mapsdatatranslation.cpp:4461
+#: mapsdatatranslation.cpp:4468
 msgctxt "norway.kgm"
 msgid "Hermansverk"
 msgstr "Hermansverk"
 
-#: mapsdatatranslation.cpp:4462
+#: mapsdatatranslation.cpp:4469
 msgctxt "norway.kgm"
 msgid "Hordaland"
 msgstr "Hordaland"
 
-#: mapsdatatranslation.cpp:4463
+#: mapsdatatranslation.cpp:4470
 msgctxt "norway.kgm"
 msgid "Bergen"
 msgstr "Bergen"
 
-#: mapsdatatranslation.cpp:4464
+#: mapsdatatranslation.cpp:4471
 msgctxt "norway.kgm"
 msgid "Rogaland"
 msgstr "Rogaland"
 
-#: mapsdatatranslation.cpp:4465
+#: mapsdatatranslation.cpp:4472
 msgctxt "norway.kgm"
 msgid "Stavanger"
 msgstr "Stavanger"
 
-#: mapsdatatranslation.cpp:4466
+#: mapsdatatranslation.cpp:4473
 msgctxt "norway.kgm"
 msgid "Vest-Agder"
 msgstr "Vest-Agder"
 
-#: mapsdatatranslation.cpp:4467
+#: mapsdatatranslation.cpp:4474
 msgctxt "norway.kgm"
 msgid "Kristiansand"
 msgstr "Kristiansand"
 
-#: mapsdatatranslation.cpp:4468
+#: mapsdatatranslation.cpp:4475
 msgctxt "norway.kgm"
 msgid "Aust-Agder"
 msgstr "Aust-Agder"
 
-#: mapsdatatranslation.cpp:4469
+#: mapsdatatranslation.cpp:4476
 msgctxt "norway.kgm"
 msgid "Arendal"
 msgstr "Arendal"
 
-#: mapsdatatranslation.cpp:4470
+#: mapsdatatranslation.cpp:4477
 msgctxt "norway.kgm"
 msgid "Telemark"
 msgstr "Telemark"
 
-#: mapsdatatranslation.cpp:4471
+#: mapsdatatranslation.cpp:4478
 msgctxt "norway.kgm"
 msgid "Skien"
 msgstr "Skien"
 
-#: mapsdatatranslation.cpp:4472
+#: mapsdatatranslation.cpp:4479
 msgctxt "norway.kgm"
 msgid "Buskerud"
 msgstr "Buskerud"
 
-#: mapsdatatranslation.cpp:4473
+#: mapsdatatranslation.cpp:4480
 msgctxt "norway.kgm"
 msgid "Drammen"
 msgstr "Drammen"
 
-#: mapsdatatranslation.cpp:4474
+#: mapsdatatranslation.cpp:4481
 msgctxt "norway.kgm"
 msgid "Vestfold"
 msgstr "Vestfold"
 
-#: mapsdatatranslation.cpp:4475
+#: mapsdatatranslation.cpp:4482
 msgctxt "norway.kgm"
 msgid "Tønsberg"
 msgstr "Tønsberg"
 
-#: mapsdatatranslation.cpp:4476 mapsdatatranslation.cpp:4477
-#: mapsdatatranslation.cpp:4479
+#: mapsdatatranslation.cpp:4483 mapsdatatranslation.cpp:4484
+#: mapsdatatranslation.cpp:4486
 msgctxt "norway.kgm"
 msgid "Oslo"
 msgstr "Oslo"
 
-#: mapsdatatranslation.cpp:4478
+#: mapsdatatranslation.cpp:4485
 msgctxt "norway.kgm"
 msgid "Akershus"
 msgstr "Akershus"
 
-#: mapsdatatranslation.cpp:4480
+#: mapsdatatranslation.cpp:4487
 msgctxt "norway.kgm"
 msgid "Østfold"
 msgstr "Østfold"
 
-#: mapsdatatranslation.cpp:4481
+#: mapsdatatranslation.cpp:4488
 msgctxt "norway.kgm"
 msgid "Sarpsborg"
 msgstr "Sarpsborg"
 
-#: mapsdatatranslation.cpp:4482
+#: mapsdatatranslation.cpp:4489
 msgctxt "oceania.kgm"
 msgid "Oceania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4483
+#: mapsdatatranslation.cpp:4490
 msgctxt "oceania.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4484
+#: mapsdatatranslation.cpp:4491
 msgctxt "oceania.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4485
+#: mapsdatatranslation.cpp:4492
 msgctxt "oceania.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4486
+#: mapsdatatranslation.cpp:4493
 msgctxt "oceania.kgm"
 msgid "Not Oceania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4487
+#: mapsdatatranslation.cpp:4494
 msgctxt "oceania.kgm"
 msgid "Australia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4488
+#: mapsdatatranslation.cpp:4495
 msgctxt "oceania.kgm"
 msgid "Canberra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4489
+#: mapsdatatranslation.cpp:4496
 msgctxt "oceania.kgm"
 msgid "Norfolk island (Australia)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4490
+#: mapsdatatranslation.cpp:4497
 msgctxt "oceania.kgm"
 msgid "Kingston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4491
+#: mapsdatatranslation.cpp:4498
 msgctxt "oceania.kgm"
 msgid "New Zealand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4492
+#: mapsdatatranslation.cpp:4499
 msgctxt "oceania.kgm"
 msgid "Wellington"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4493
+#: mapsdatatranslation.cpp:4500
 msgctxt "oceania.kgm"
 msgid "Cook islands (New Zealand)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4494
+#: mapsdatatranslation.cpp:4501
 msgctxt "oceania.kgm"
 msgid "Avarua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4495
+#: mapsdatatranslation.cpp:4502
 msgctxt "oceania.kgm"
 msgid "Niue (New Zealand)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4496
+#: mapsdatatranslation.cpp:4503
 msgctxt "oceania.kgm"
 msgid "Alofi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4497
+#: mapsdatatranslation.cpp:4504
 msgctxt "oceania.kgm"
 msgid "Tokelau (New Zealand)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4498
+#: mapsdatatranslation.cpp:4505
 msgctxt "oceania.kgm"
 msgid "East Timor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4499
+#: mapsdatatranslation.cpp:4506
 msgctxt "oceania.kgm"
 msgid "Dili"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4500
+#: mapsdatatranslation.cpp:4507
 msgctxt "oceania.kgm"
 msgid "Easter Island"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4501
+#: mapsdatatranslation.cpp:4508
 msgctxt "oceania.kgm"
 msgid "Hanga Roa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4502
+#: mapsdatatranslation.cpp:4509
 msgctxt "oceania.kgm"
 msgid "Fiji"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4503
+#: mapsdatatranslation.cpp:4510
 msgctxt "oceania.kgm"
 msgid "Suva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4504
+#: mapsdatatranslation.cpp:4511
 msgctxt "oceania.kgm"
 msgid "Indonesia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4505
+#: mapsdatatranslation.cpp:4512
 msgctxt "oceania.kgm"
 msgid "Jakarta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4506
+#: mapsdatatranslation.cpp:4513
 msgctxt "oceania.kgm"
 msgid "Papua New Guinea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4507
+#: mapsdatatranslation.cpp:4514
 msgctxt "oceania.kgm"
 msgid "Port Moresby"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4508
+#: mapsdatatranslation.cpp:4515
 msgctxt "oceania.kgm"
 msgid "Solomon Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4509
+#: mapsdatatranslation.cpp:4516
 msgctxt "oceania.kgm"
 msgid "Honiara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4510
+#: mapsdatatranslation.cpp:4517
 msgctxt "oceania.kgm"
 msgid "Vanuatu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4511
+#: mapsdatatranslation.cpp:4518
 msgctxt "oceania.kgm"
 msgid "Port Vila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4512
+#: mapsdatatranslation.cpp:4519
 msgctxt "oceania.kgm"
 msgid "Federated States of Micronesia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4513
+#: mapsdatatranslation.cpp:4520
 msgctxt "oceania.kgm"
 msgid "Palikir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4514
+#: mapsdatatranslation.cpp:4521
 msgctxt "oceania.kgm"
 msgid "Kiribati"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4515
+#: mapsdatatranslation.cpp:4522
 msgctxt "oceania.kgm"
 msgid "South Tarawa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4516
+#: mapsdatatranslation.cpp:4523
 msgctxt "oceania.kgm"
 msgid "Marshall Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4517
+#: mapsdatatranslation.cpp:4524
 msgctxt "oceania.kgm"
 msgid "Majuro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4518
+#: mapsdatatranslation.cpp:4525
 msgctxt "oceania.kgm"
 msgid "Nauru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4519
+#: mapsdatatranslation.cpp:4526
 msgctxt "oceania.kgm"
 msgid "Yaren"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4520
+#: mapsdatatranslation.cpp:4527
 msgctxt "oceania.kgm"
 msgid "Palau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4521
+#: mapsdatatranslation.cpp:4528
 msgctxt "oceania.kgm"
 msgid "Melekeok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4522
+#: mapsdatatranslation.cpp:4529
 msgctxt "oceania.kgm"
 msgid "New Caledonia (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4523
+#: mapsdatatranslation.cpp:4530
 msgctxt "oceania.kgm"
 msgid "Noumea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4524
+#: mapsdatatranslation.cpp:4531
 msgctxt "oceania.kgm"
 msgid "French Polynesia (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4525
+#: mapsdatatranslation.cpp:4532
 msgctxt "oceania.kgm"
 msgid "Papeete"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4526
+#: mapsdatatranslation.cpp:4533
 msgctxt "oceania.kgm"
 msgid "Wallis and Futuna (France)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4527
+#: mapsdatatranslation.cpp:4534
 msgctxt "oceania.kgm"
 msgid "Mata Utu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4528
+#: mapsdatatranslation.cpp:4535
 msgctxt "oceania.kgm"
 msgid "Samoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4529
+#: mapsdatatranslation.cpp:4536
 msgctxt "oceania.kgm"
 msgid "Apia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4530
+#: mapsdatatranslation.cpp:4537
 msgctxt "oceania.kgm"
 msgid "Tonga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4531
+#: mapsdatatranslation.cpp:4538
 msgctxt "oceania.kgm"
 msgid "Nuku'alofa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4532
+#: mapsdatatranslation.cpp:4539
 msgctxt "oceania.kgm"
 msgid "Tuvalu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4533
+#: mapsdatatranslation.cpp:4540
 msgctxt "oceania.kgm"
 msgid "Funafuti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4534
+#: mapsdatatranslation.cpp:4541
 msgctxt "oceania.kgm"
 msgid "Pitcairn islands (United Kingdom)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4535
+#: mapsdatatranslation.cpp:4542
 msgctxt "oceania.kgm"
 msgid "Adamstown"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4536
+#: mapsdatatranslation.cpp:4543
 msgctxt "oceania.kgm"
 msgid "Hawaii (USA)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4537
+#: mapsdatatranslation.cpp:4544
 msgctxt "oceania.kgm"
 msgid "Honolulu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4538
+#: mapsdatatranslation.cpp:4545
 msgctxt "oceania.kgm"
 msgid "American Samoa (USA)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4539
+#: mapsdatatranslation.cpp:4546
 msgctxt "oceania.kgm"
 msgid "Pago Pago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4540
+#: mapsdatatranslation.cpp:4547
 msgctxt "oceania.kgm"
 msgid "Guam (USA)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4541
+#: mapsdatatranslation.cpp:4548
 msgctxt "oceania.kgm"
 msgid "Hagåtña"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4542
+#: mapsdatatranslation.cpp:4549
 msgctxt "oceania.kgm"
 msgid "Northern Mariana islands (USA)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4543
+#: mapsdatatranslation.cpp:4550
 msgctxt "oceania.kgm"
 msgid "Saipan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4544
+#: mapsdatatranslation.cpp:4551
 msgctxt "oceania.kgm"
 msgid "United States Minor Outlying Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4545
+#: mapsdatatranslation.cpp:4552
 msgctxt "oman.kgm"
 msgid "Oman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4546
+#: mapsdatatranslation.cpp:4553
 msgctxt "oman.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4547
+#: mapsdatatranslation.cpp:4554
 msgctxt "oman.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4548
+#: mapsdatatranslation.cpp:4555
 msgctxt "oman.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4549
+#: mapsdatatranslation.cpp:4556
 msgctxt "oman.kgm"
 msgid "Not Oman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4550
+#: mapsdatatranslation.cpp:4557
 msgctxt "oman.kgm"
 msgid "Ad Dakhiliyah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4551
+#: mapsdatatranslation.cpp:4558
 msgctxt "oman.kgm"
 msgid "Al Batinah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4552
+#: mapsdatatranslation.cpp:4559
 msgctxt "oman.kgm"
 msgid "Al Wusta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4553
+#: mapsdatatranslation.cpp:4560
 msgctxt "oman.kgm"
 msgid "Ash Sharqiyah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4554
+#: mapsdatatranslation.cpp:4561
 msgctxt "oman.kgm"
 msgid "Ad Dhahirah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4555
+#: mapsdatatranslation.cpp:4562
 msgctxt "oman.kgm"
 msgid "Muscat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4556
+#: mapsdatatranslation.cpp:4563
 msgctxt "oman.kgm"
 msgid "Musandam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4557
+#: mapsdatatranslation.cpp:4564
 msgctxt "oman.kgm"
 msgid "Dhofar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4558
+#: mapsdatatranslation.cpp:4565
 msgctxt "pakistan.kgm"
 msgid "Pakistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4559
+#: mapsdatatranslation.cpp:4566
 msgctxt "pakistan.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4560
+#: mapsdatatranslation.cpp:4567
 msgctxt "pakistan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4561
+#: mapsdatatranslation.cpp:4568
 msgctxt "pakistan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4562
+#: mapsdatatranslation.cpp:4569
 msgctxt "pakistan.kgm"
 msgid "Not Pakistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4563
+#: mapsdatatranslation.cpp:4570
 msgctxt "pakistan.kgm"
 msgid "Balochistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4564
+#: mapsdatatranslation.cpp:4571
 msgctxt "pakistan.kgm"
 msgid "Quetta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4565
+#: mapsdatatranslation.cpp:4572
 msgctxt "pakistan.kgm"
 msgid "Khyber Pakhtunkhwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4566
+#: mapsdatatranslation.cpp:4573
 msgctxt "pakistan.kgm"
 msgid "Peshawar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4567
+#: mapsdatatranslation.cpp:4574
 msgctxt "pakistan.kgm"
 msgid "Punjab"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4568
+#: mapsdatatranslation.cpp:4575
 msgctxt "pakistan.kgm"
 msgid "Lahore"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4569
+#: mapsdatatranslation.cpp:4576
 msgctxt "pakistan.kgm"
 msgid "Sindh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4570
+#: mapsdatatranslation.cpp:4577
 msgctxt "pakistan.kgm"
 msgid "Karachi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4571
+#: mapsdatatranslation.cpp:4578
 msgctxt "pakistan.kgm"
 msgid "Islamabad Capital Territory"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4572
+#: mapsdatatranslation.cpp:4579
 msgctxt "pakistan.kgm"
 msgid "Islamabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4573
+#: mapsdatatranslation.cpp:4580
 msgctxt "pakistan.kgm"
 msgid "Federally Administered Tribal Areas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4574
+#: mapsdatatranslation.cpp:4581
 msgctxt "pakistan.kgm"
 msgid "Peshawar and Islamabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4575
+#: mapsdatatranslation.cpp:4582
 msgctxt "pakistan.kgm"
 msgid "Azad Kashmir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4576
+#: mapsdatatranslation.cpp:4583
 msgctxt "pakistan.kgm"
 msgid "Muzaffarabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4577
+#: mapsdatatranslation.cpp:4584
 msgctxt "pakistan.kgm"
 msgid "Gilgit-Baltistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4578
+#: mapsdatatranslation.cpp:4585
 msgctxt "pakistan.kgm"
 msgid "Gilgit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4579
+#: mapsdatatranslation.cpp:4586
 msgctxt "panama.kgm"
 msgid "Panama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4580
+#: mapsdatatranslation.cpp:4587
 msgctxt "panama.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4581 mapsdatatranslation.cpp:4582
+#: mapsdatatranslation.cpp:4588 mapsdatatranslation.cpp:4589
 msgctxt "panama.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4583
+#: mapsdatatranslation.cpp:4590
 msgctxt "panama.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4584
+#: mapsdatatranslation.cpp:4591
 msgctxt "panama.kgm"
 msgid "Not Panama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4585 mapsdatatranslation.cpp:4586
+#: mapsdatatranslation.cpp:4592 mapsdatatranslation.cpp:4593
 msgctxt "panama.kgm"
 msgid "Bocas del Toro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4587
+#: mapsdatatranslation.cpp:4594
 msgctxt "panama.kgm"
 msgid "Chiriquí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4588
+#: mapsdatatranslation.cpp:4595
 msgctxt "panama.kgm"
 msgid "David"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4589
+#: mapsdatatranslation.cpp:4596
 msgctxt "panama.kgm"
 msgid "Coclé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4590
+#: mapsdatatranslation.cpp:4597
 msgctxt "panama.kgm"
 msgid "Penonomé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4591 mapsdatatranslation.cpp:4592
+#: mapsdatatranslation.cpp:4598 mapsdatatranslation.cpp:4599
 msgctxt "panama.kgm"
 msgid "Colón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4593
+#: mapsdatatranslation.cpp:4600
 msgctxt "panama.kgm"
 msgid "Darién"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4594
+#: mapsdatatranslation.cpp:4601
 msgctxt "panama.kgm"
 msgid "La Palma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4595
+#: mapsdatatranslation.cpp:4602
 msgctxt "panama.kgm"
 msgid "Herrera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4596
+#: mapsdatatranslation.cpp:4603
 msgctxt "panama.kgm"
 msgid "Chitré"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4597
+#: mapsdatatranslation.cpp:4604
 msgctxt "panama.kgm"
 msgid "Los Santos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4598
+#: mapsdatatranslation.cpp:4605
 msgctxt "panama.kgm"
 msgid "Las Tablas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4599 mapsdatatranslation.cpp:4600
+#: mapsdatatranslation.cpp:4606 mapsdatatranslation.cpp:4607
 msgctxt "panama.kgm"
 msgid "Panamá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4601
+#: mapsdatatranslation.cpp:4608
 msgctxt "panama.kgm"
 msgid "Veraguas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4602
+#: mapsdatatranslation.cpp:4609
 msgctxt "panama.kgm"
 msgid "Santiago de Veraguas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4603
+#: mapsdatatranslation.cpp:4610
 msgctxt "panama.kgm"
 msgid "Emberá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4604
+#: mapsdatatranslation.cpp:4611
 msgctxt "panama.kgm"
 msgid "Union Choco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4605
+#: mapsdatatranslation.cpp:4612
 msgctxt "panama.kgm"
 msgid "Kuna Yala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4606
+#: mapsdatatranslation.cpp:4613
 msgctxt "panama.kgm"
 msgid "El Porvenir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4607
+#: mapsdatatranslation.cpp:4614
 msgctxt "panama.kgm"
 msgid "Ngöbe-Buglé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4608
+#: mapsdatatranslation.cpp:4615
 msgctxt "panama.kgm"
 msgid "Chichica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4609
+#: mapsdatatranslation.cpp:4616
 msgctxt "paraguay.kgm"
 msgid "Paraguay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4610
+#: mapsdatatranslation.cpp:4617
 msgctxt "paraguay.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4611 mapsdatatranslation.cpp:4612
+#: mapsdatatranslation.cpp:4618 mapsdatatranslation.cpp:4619
 msgctxt "paraguay.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4613
+#: mapsdatatranslation.cpp:4620
 msgctxt "paraguay.kgm"
 msgid "Not Paraguay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4614
+#: mapsdatatranslation.cpp:4621
 msgctxt "paraguay.kgm"
 msgid "Alto Paraguay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4615
+#: mapsdatatranslation.cpp:4622
 msgctxt "paraguay.kgm"
 msgid "Fuerte Olimpo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4616
+#: mapsdatatranslation.cpp:4623
 msgctxt "paraguay.kgm"
 msgid "Alto Paraná"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4617
+#: mapsdatatranslation.cpp:4624
 msgctxt "paraguay.kgm"
 msgid "Ciudad del Este"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4618
+#: mapsdatatranslation.cpp:4625
 msgctxt "paraguay.kgm"
 msgid "Amambay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4619
+#: mapsdatatranslation.cpp:4626
 msgctxt "paraguay.kgm"
 msgid "Pedro Juan Caballero"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4620
+#: mapsdatatranslation.cpp:4627
 msgctxt "paraguay.kgm"
 msgid "Asunción Capital District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4621
+#: mapsdatatranslation.cpp:4628
 msgctxt "paraguay.kgm"
 msgid "Asunción"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4622
+#: mapsdatatranslation.cpp:4629
 msgctxt "paraguay.kgm"
 msgid "Boquerón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4623
+#: mapsdatatranslation.cpp:4630
 msgctxt "paraguay.kgm"
 msgid "Filadelfia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4624
+#: mapsdatatranslation.cpp:4631
 msgctxt "paraguay.kgm"
 msgid "Caaguazú"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4625
+#: mapsdatatranslation.cpp:4632
 msgctxt "paraguay.kgm"
 msgid "Coronel Oviedo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4626 mapsdatatranslation.cpp:4627
+#: mapsdatatranslation.cpp:4633 mapsdatatranslation.cpp:4634
 msgctxt "paraguay.kgm"
 msgid "Caazapá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4628
+#: mapsdatatranslation.cpp:4635
 msgctxt "paraguay.kgm"
 msgid "Canindeyú"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4629
+#: mapsdatatranslation.cpp:4636
 msgctxt "paraguay.kgm"
 msgid "Salto del Guairá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4630
+#: mapsdatatranslation.cpp:4637
 msgctxt "paraguay.kgm"
 msgid "Central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4631
+#: mapsdatatranslation.cpp:4638
 msgctxt "paraguay.kgm"
 msgid "Areguá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4632 mapsdatatranslation.cpp:4633
+#: mapsdatatranslation.cpp:4639 mapsdatatranslation.cpp:4640
 msgctxt "paraguay.kgm"
 msgid "Concepción"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4634
+#: mapsdatatranslation.cpp:4641
 msgctxt "paraguay.kgm"
 msgid "Cordillera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4635
+#: mapsdatatranslation.cpp:4642
 msgctxt "paraguay.kgm"
 msgid "Caacupé"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4636
+#: mapsdatatranslation.cpp:4643
 msgctxt "paraguay.kgm"
 msgid "Guairá"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4637
+#: mapsdatatranslation.cpp:4644
 msgctxt "paraguay.kgm"
 msgid "Villarrica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4638
+#: mapsdatatranslation.cpp:4645
 msgctxt "paraguay.kgm"
 msgid "Itapúa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4639
+#: mapsdatatranslation.cpp:4646
 msgctxt "paraguay.kgm"
 msgid "Encarnación"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4640
+#: mapsdatatranslation.cpp:4647
 msgctxt "paraguay.kgm"
 msgid "Misiones"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4641
+#: mapsdatatranslation.cpp:4648
 msgctxt "paraguay.kgm"
 msgid "San Juan Bautista"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4642
+#: mapsdatatranslation.cpp:4649
 msgctxt "paraguay.kgm"
 msgid "Ñeembucú"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4643
+#: mapsdatatranslation.cpp:4650
 msgctxt "paraguay.kgm"
 msgid "Pilar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4644 mapsdatatranslation.cpp:4645
+#: mapsdatatranslation.cpp:4651 mapsdatatranslation.cpp:4652
 msgctxt "paraguay.kgm"
 msgid "Paraguarí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4646
+#: mapsdatatranslation.cpp:4653
 msgctxt "paraguay.kgm"
 msgid "Presidente Hayes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4647
+#: mapsdatatranslation.cpp:4654
 msgctxt "paraguay.kgm"
 msgid "Pozo Colorado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4648 mapsdatatranslation.cpp:4649
+#: mapsdatatranslation.cpp:4655 mapsdatatranslation.cpp:4656
 msgctxt "paraguay.kgm"
 msgid "San Pedro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4650
+#: mapsdatatranslation.cpp:4657
 msgctxt "peru.kgm"
 msgid "Peru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4651
+#: mapsdatatranslation.cpp:4658
 msgctxt "peru.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4652
+#: mapsdatatranslation.cpp:4659
 msgctxt "peru.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4653
+#: mapsdatatranslation.cpp:4660
 msgctxt "peru.kgm"
 msgid "Pacific Ocean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4654
+#: mapsdatatranslation.cpp:4661
 msgctxt "peru.kgm"
 msgid "Ecuador"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4655
+#: mapsdatatranslation.cpp:4662
 msgctxt "peru.kgm"
 msgid "Colombia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4656
+#: mapsdatatranslation.cpp:4663
 msgctxt "peru.kgm"
 msgid "Brazil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4657
+#: mapsdatatranslation.cpp:4664
 msgctxt "peru.kgm"
 msgid "Bolivia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4658
+#: mapsdatatranslation.cpp:4665
 msgctxt "peru.kgm"
 msgid "Chile"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4659
+#: mapsdatatranslation.cpp:4666
 msgctxt "peru.kgm"
 msgid "Amazonas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4660
+#: mapsdatatranslation.cpp:4667
 msgctxt "peru.kgm"
 msgid "Chachapoyas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4661
+#: mapsdatatranslation.cpp:4668
 msgctxt "peru.kgm"
 msgid "Ancash"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4662
+#: mapsdatatranslation.cpp:4669
 msgctxt "peru.kgm"
 msgid "Huaraz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4663
+#: mapsdatatranslation.cpp:4670
 msgctxt "peru.kgm"
 msgid "Apurimac"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4664
+#: mapsdatatranslation.cpp:4671
 msgctxt "peru.kgm"
 msgid "Abancay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4665 mapsdatatranslation.cpp:4666
+#: mapsdatatranslation.cpp:4672 mapsdatatranslation.cpp:4673
 msgctxt "peru.kgm"
 msgid "Arequipa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4667 mapsdatatranslation.cpp:4668
+#: mapsdatatranslation.cpp:4674 mapsdatatranslation.cpp:4675
 msgctxt "peru.kgm"
 msgid "Ayacucho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4669 mapsdatatranslation.cpp:4670
+#: mapsdatatranslation.cpp:4676 mapsdatatranslation.cpp:4677
 msgctxt "peru.kgm"
 msgid "Cajamarca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4671 mapsdatatranslation.cpp:4672
+#: mapsdatatranslation.cpp:4678 mapsdatatranslation.cpp:4679
 msgctxt "peru.kgm"
 msgid "Cusco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4673 mapsdatatranslation.cpp:4674
+#: mapsdatatranslation.cpp:4680 mapsdatatranslation.cpp:4681
 msgctxt "peru.kgm"
 msgid "Huancavelica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4675 mapsdatatranslation.cpp:4676
+#: mapsdatatranslation.cpp:4682 mapsdatatranslation.cpp:4683
 msgctxt "peru.kgm"
 msgid "Huanuco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4677 mapsdatatranslation.cpp:4678
+#: mapsdatatranslation.cpp:4684 mapsdatatranslation.cpp:4685
 msgctxt "peru.kgm"
 msgid "Ica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4679 mapsdatatranslation.cpp:4680
+#: mapsdatatranslation.cpp:4686
 msgctxt "peru.kgm"
 msgid "Junin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4681
+#: mapsdatatranslation.cpp:4687
+msgctxt "peru.kgm"
+msgid "Huancayo"
+msgstr ""
+
+#: mapsdatatranslation.cpp:4688
 msgctxt "peru.kgm"
 msgid "Lambayeque"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4682
+#: mapsdatatranslation.cpp:4689
 msgctxt "peru.kgm"
 msgid "Chiclayo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4683
+#: mapsdatatranslation.cpp:4690
 msgctxt "peru.kgm"
 msgid "La Libertad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4684
+#: mapsdatatranslation.cpp:4691
 msgctxt "peru.kgm"
 msgid "Trujillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4685 mapsdatatranslation.cpp:4686
+#: mapsdatatranslation.cpp:4692
 msgctxt "peru.kgm"
 msgid "Lima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4687
+#: mapsdatatranslation.cpp:4693
+msgctxt "peru.kgm"
+msgid "Huacho"
+msgstr ""
+
+#: mapsdatatranslation.cpp:4694
 msgctxt "peru.kgm"
 msgid "Loreto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4688
+#: mapsdatatranslation.cpp:4695
 msgctxt "peru.kgm"
 msgid "Iquitos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4689
+#: mapsdatatranslation.cpp:4696
 msgctxt "peru.kgm"
 msgid "Madre de Dios"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4690
+#: mapsdatatranslation.cpp:4697
 msgctxt "peru.kgm"
 msgid "Puerto Maldonado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4691 mapsdatatranslation.cpp:4692
+#: mapsdatatranslation.cpp:4698 mapsdatatranslation.cpp:4699
 msgctxt "peru.kgm"
 msgid "Moquegua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4693 mapsdatatranslation.cpp:4694
+#: mapsdatatranslation.cpp:4700 mapsdatatranslation.cpp:4701
 msgctxt "peru.kgm"
 msgid "Piura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4695 mapsdatatranslation.cpp:4696
+#: mapsdatatranslation.cpp:4702 mapsdatatranslation.cpp:4703
 msgctxt "peru.kgm"
 msgid "Tacna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4697 mapsdatatranslation.cpp:4698
+#: mapsdatatranslation.cpp:4704 mapsdatatranslation.cpp:4705
 msgctxt "peru.kgm"
 msgid "Tumbes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4699
+#: mapsdatatranslation.cpp:4706
 msgctxt "peru.kgm"
 msgid "Pasco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4700
+#: mapsdatatranslation.cpp:4707
 msgctxt "peru.kgm"
 msgid "Cerro de Pasco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4701 mapsdatatranslation.cpp:4702
+#: mapsdatatranslation.cpp:4708 mapsdatatranslation.cpp:4709
 msgctxt "peru.kgm"
 msgid "Puno"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4703
+#: mapsdatatranslation.cpp:4710
 msgctxt "peru.kgm"
 msgid "San Martin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4704
+#: mapsdatatranslation.cpp:4711
 msgctxt "peru.kgm"
 msgid "Moyobamba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4705
+#: mapsdatatranslation.cpp:4712
 msgctxt "peru.kgm"
 msgid "Ucayali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4706
+#: mapsdatatranslation.cpp:4713
 msgctxt "peru.kgm"
 msgid "Pucallpa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4707
+#: mapsdatatranslation.cpp:4714
 msgctxt "philippines.kgm"
 msgid "Philippines"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4708
+#: mapsdatatranslation.cpp:4715
 msgctxt "philippines.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4709
+#: mapsdatatranslation.cpp:4716
 msgctxt "philippines.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4710
+#: mapsdatatranslation.cpp:4717
 msgctxt "philippines.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4711
+#: mapsdatatranslation.cpp:4718
 msgctxt "philippines.kgm"
 msgid "Not Philippines"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4712
+#: mapsdatatranslation.cpp:4719
 msgctxt "philippines.kgm"
 msgid "Abra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4713
+#: mapsdatatranslation.cpp:4720
 msgctxt "philippines.kgm"
 msgid "Bangued"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4714
+#: mapsdatatranslation.cpp:4721
 msgctxt "philippines.kgm"
 msgid "Agusan del Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4715
+#: mapsdatatranslation.cpp:4722
 msgctxt "philippines.kgm"
 msgid "Cabadbaran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4716
+#: mapsdatatranslation.cpp:4723
 msgctxt "philippines.kgm"
 msgid "Agusan del Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4717
+#: mapsdatatranslation.cpp:4724
 msgctxt "philippines.kgm"
 msgid "Prosperidad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4718
+#: mapsdatatranslation.cpp:4725
 msgctxt "philippines.kgm"
 msgid "Aklan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4719
+#: mapsdatatranslation.cpp:4726
 msgctxt "philippines.kgm"
 msgid "Kalibo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4720
+#: mapsdatatranslation.cpp:4727
 msgctxt "philippines.kgm"
 msgid "Albay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4721
+#: mapsdatatranslation.cpp:4728
 msgctxt "philippines.kgm"
 msgid "Legazpi City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4722
+#: mapsdatatranslation.cpp:4729
 msgctxt "philippines.kgm"
 msgid "Antique"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4723
+#: mapsdatatranslation.cpp:4730
 msgctxt "philippines.kgm"
 msgid "San Jose"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4724
+#: mapsdatatranslation.cpp:4731
 msgctxt "philippines.kgm"
 msgid "Apayao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4725
+#: mapsdatatranslation.cpp:4732
 msgctxt "philippines.kgm"
 msgid "Kabugao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4726
+#: mapsdatatranslation.cpp:4733
 msgctxt "philippines.kgm"
 msgid "Aurora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4727
+#: mapsdatatranslation.cpp:4734
 msgctxt "philippines.kgm"
 msgid "Baler"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4728
+#: mapsdatatranslation.cpp:4735
 msgctxt "philippines.kgm"
 msgid "Basilan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4729
+#: mapsdatatranslation.cpp:4736
 msgctxt "philippines.kgm"
 msgid "Isabela City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4730
+#: mapsdatatranslation.cpp:4737
 msgctxt "philippines.kgm"
 msgid "Bataan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4731
+#: mapsdatatranslation.cpp:4738
 msgctxt "philippines.kgm"
 msgid "Balanga City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4732
+#: mapsdatatranslation.cpp:4739
 msgctxt "philippines.kgm"
 msgid "Batanes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4733
+#: mapsdatatranslation.cpp:4740
 msgctxt "philippines.kgm"
 msgid "Basco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4734
+#: mapsdatatranslation.cpp:4741
 msgctxt "philippines.kgm"
 msgid "Batangas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4735
+#: mapsdatatranslation.cpp:4742
 msgctxt "philippines.kgm"
 msgid "Batangas City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4736
+#: mapsdatatranslation.cpp:4743
 msgctxt "philippines.kgm"
 msgid "Benguet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4737
+#: mapsdatatranslation.cpp:4744
 msgctxt "philippines.kgm"
 msgid "La Trinidad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4738
+#: mapsdatatranslation.cpp:4745
 msgctxt "philippines.kgm"
 msgid "Biliran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4739
+#: mapsdatatranslation.cpp:4746
 msgctxt "philippines.kgm"
 msgid "Naval"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4740
+#: mapsdatatranslation.cpp:4747
 msgctxt "philippines.kgm"
 msgid "Bohol"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4741
+#: mapsdatatranslation.cpp:4748
 msgctxt "philippines.kgm"
 msgid "Tagbilaran City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4742
+#: mapsdatatranslation.cpp:4749
 msgctxt "philippines.kgm"
 msgid "Bukidnon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4743
+#: mapsdatatranslation.cpp:4750
 msgctxt "philippines.kgm"
 msgid "Malaybalay City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4744
+#: mapsdatatranslation.cpp:4751
 msgctxt "philippines.kgm"
 msgid "Bulacan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4745
+#: mapsdatatranslation.cpp:4752
 msgctxt "philippines.kgm"
 msgid "Malolos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4746
+#: mapsdatatranslation.cpp:4753
 msgctxt "philippines.kgm"
 msgid "Cagayan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4747
+#: mapsdatatranslation.cpp:4754
 msgctxt "philippines.kgm"
 msgid "Tuguegarao City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4748
+#: mapsdatatranslation.cpp:4755
 msgctxt "philippines.kgm"
 msgid "Camarines Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4749
+#: mapsdatatranslation.cpp:4756
 msgctxt "philippines.kgm"
 msgid "Daet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4750
+#: mapsdatatranslation.cpp:4757
 msgctxt "philippines.kgm"
 msgid "Camarines Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4751
+#: mapsdatatranslation.cpp:4758
 msgctxt "philippines.kgm"
 msgid "Pili"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4752
+#: mapsdatatranslation.cpp:4759
 msgctxt "philippines.kgm"
 msgid "Camiguin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4753
+#: mapsdatatranslation.cpp:4760
 msgctxt "philippines.kgm"
 msgid "Mambajao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4754
+#: mapsdatatranslation.cpp:4761
 msgctxt "philippines.kgm"
 msgid "Capiz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4755
+#: mapsdatatranslation.cpp:4762
 msgctxt "philippines.kgm"
 msgid "Roxas City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4756
+#: mapsdatatranslation.cpp:4763
 msgctxt "philippines.kgm"
 msgid "Catanduanes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4757
+#: mapsdatatranslation.cpp:4764
 msgctxt "philippines.kgm"
 msgid "Virac"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4758
+#: mapsdatatranslation.cpp:4765
 msgctxt "philippines.kgm"
 msgid "Cavite"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4759
+#: mapsdatatranslation.cpp:4766
 msgctxt "philippines.kgm"
 msgid "Trece Martires City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4760
+#: mapsdatatranslation.cpp:4767
 msgctxt "philippines.kgm"
 msgid "Cebu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4761
+#: mapsdatatranslation.cpp:4768
 msgctxt "philippines.kgm"
 msgid "Cebu City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4762
+#: mapsdatatranslation.cpp:4769
 msgctxt "philippines.kgm"
 msgid "Compostela Valley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4763
+#: mapsdatatranslation.cpp:4770
 msgctxt "philippines.kgm"
 msgid "Nabunturan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4764
+#: mapsdatatranslation.cpp:4771
 msgctxt "philippines.kgm"
 msgid "Cotabato"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4765
+#: mapsdatatranslation.cpp:4772
 msgctxt "philippines.kgm"
 msgid "Kidapawan City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4766
+#: mapsdatatranslation.cpp:4773
 msgctxt "philippines.kgm"
 msgid "Davao del Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4767
+#: mapsdatatranslation.cpp:4774
 msgctxt "philippines.kgm"
 msgid "Tagum City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4768
+#: mapsdatatranslation.cpp:4775
 msgctxt "philippines.kgm"
 msgid "Davao del Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4769
+#: mapsdatatranslation.cpp:4776
 msgctxt "philippines.kgm"
 msgid "Digos City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4770
+#: mapsdatatranslation.cpp:4777
 msgctxt "philippines.kgm"
 msgid "Davao Oriental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4771
+#: mapsdatatranslation.cpp:4778
 msgctxt "philippines.kgm"
 msgid "Mati"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4772
+#: mapsdatatranslation.cpp:4779
 msgctxt "philippines.kgm"
 msgid "Eastern Samar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4773
+#: mapsdatatranslation.cpp:4780
 msgctxt "philippines.kgm"
 msgid "Borongan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4774
+#: mapsdatatranslation.cpp:4781
 msgctxt "philippines.kgm"
 msgid "Guimaras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4775
+#: mapsdatatranslation.cpp:4782
 msgctxt "philippines.kgm"
 msgid "Jordan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4776
+#: mapsdatatranslation.cpp:4783
 msgctxt "philippines.kgm"
 msgid "Ifugao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4777
+#: mapsdatatranslation.cpp:4784
 msgctxt "philippines.kgm"
 msgid "Lagawe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4778
+#: mapsdatatranslation.cpp:4785
 msgctxt "philippines.kgm"
 msgid "Ilocos Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4779
+#: mapsdatatranslation.cpp:4786
 msgctxt "philippines.kgm"
 msgid "Laoag City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4780
+#: mapsdatatranslation.cpp:4787
 msgctxt "philippines.kgm"
 msgid "Ilocos Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4781
+#: mapsdatatranslation.cpp:4788
 msgctxt "philippines.kgm"
 msgid "Vigan City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4782
+#: mapsdatatranslation.cpp:4789
 msgctxt "philippines.kgm"
 msgid "Iloilo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4783
+#: mapsdatatranslation.cpp:4790
 msgctxt "philippines.kgm"
 msgid "Iloilo City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4784
+#: mapsdatatranslation.cpp:4791
 msgctxt "philippines.kgm"
 msgid "Isabela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4785
+#: mapsdatatranslation.cpp:4792
 msgctxt "philippines.kgm"
 msgid "Ilagan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4786
+#: mapsdatatranslation.cpp:4793
 msgctxt "philippines.kgm"
 msgid "Kalinga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4787
+#: mapsdatatranslation.cpp:4794
 msgctxt "philippines.kgm"
 msgid "Tabuk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4788
+#: mapsdatatranslation.cpp:4795
 msgctxt "philippines.kgm"
 msgid "La Union"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4789 mapsdatatranslation.cpp:4827
+#: mapsdatatranslation.cpp:4796 mapsdatatranslation.cpp:4834
 msgctxt "philippines.kgm"
 msgid "San Fernando City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4790
+#: mapsdatatranslation.cpp:4797
 msgctxt "philippines.kgm"
 msgid "Laguna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4791
+#: mapsdatatranslation.cpp:4798
 msgctxt "philippines.kgm"
 msgid "Santa Cruz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4792
+#: mapsdatatranslation.cpp:4799
 msgctxt "philippines.kgm"
 msgid "Lanao del Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4793
+#: mapsdatatranslation.cpp:4800
 msgctxt "philippines.kgm"
 msgid "Tubod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4794
+#: mapsdatatranslation.cpp:4801
 msgctxt "philippines.kgm"
 msgid "Lanao del Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4795
+#: mapsdatatranslation.cpp:4802
 msgctxt "philippines.kgm"
 msgid "Marawi City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4796
+#: mapsdatatranslation.cpp:4803
 msgctxt "philippines.kgm"
 msgid "Leyte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4797
+#: mapsdatatranslation.cpp:4804
 msgctxt "philippines.kgm"
 msgid "Tacloban City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4798
+#: mapsdatatranslation.cpp:4805
 msgctxt "philippines.kgm"
 msgid "Maguindanao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4799
+#: mapsdatatranslation.cpp:4806
 msgctxt "philippines.kgm"
 msgid "Shariff Aguak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4800
+#: mapsdatatranslation.cpp:4807
 msgctxt "philippines.kgm"
 msgid "Marinduque"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4801
+#: mapsdatatranslation.cpp:4808
 msgctxt "philippines.kgm"
 msgid "Boac"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4802
+#: mapsdatatranslation.cpp:4809
 msgctxt "philippines.kgm"
 msgid "Masbate"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4803
+#: mapsdatatranslation.cpp:4810
 msgctxt "philippines.kgm"
 msgid "Masbate City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4804
+#: mapsdatatranslation.cpp:4811
 msgctxt "philippines.kgm"
 msgid "Misamis Occidental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4805
+#: mapsdatatranslation.cpp:4812
 msgctxt "philippines.kgm"
 msgid "Oroquieta City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4806
+#: mapsdatatranslation.cpp:4813
 msgctxt "philippines.kgm"
 msgid "Misamis Oriental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4807
+#: mapsdatatranslation.cpp:4814
 msgctxt "philippines.kgm"
 msgid "Cagayan de Oro City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4808
+#: mapsdatatranslation.cpp:4815
 msgctxt "philippines.kgm"
 msgid "Mountain Province"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4809
+#: mapsdatatranslation.cpp:4816
 msgctxt "philippines.kgm"
 msgid "Bontoc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4810
+#: mapsdatatranslation.cpp:4817
 msgctxt "philippines.kgm"
 msgid "Negros Occidental [2]"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4811
+#: mapsdatatranslation.cpp:4818
 msgctxt "philippines.kgm"
 msgid "Bacolod City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4812
+#: mapsdatatranslation.cpp:4819
 msgctxt "philippines.kgm"
 msgid "Negros Oriental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4813
+#: mapsdatatranslation.cpp:4820
 msgctxt "philippines.kgm"
 msgid "Dumaguete City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4814
+#: mapsdatatranslation.cpp:4821
 msgctxt "philippines.kgm"
 msgid "Northern Samar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4815
+#: mapsdatatranslation.cpp:4822
 msgctxt "philippines.kgm"
 msgid "Catarman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4816
+#: mapsdatatranslation.cpp:4823
 msgctxt "philippines.kgm"
 msgid "Nueva Ecija"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4817
+#: mapsdatatranslation.cpp:4824
 msgctxt "philippines.kgm"
 msgid "Palayan City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4818
+#: mapsdatatranslation.cpp:4825
 msgctxt "philippines.kgm"
 msgid "Nueva Vizcaya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4819
+#: mapsdatatranslation.cpp:4826
 msgctxt "philippines.kgm"
 msgid "Bayombong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4820
+#: mapsdatatranslation.cpp:4827
 msgctxt "philippines.kgm"
 msgid "Occidental Mindoro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4821
+#: mapsdatatranslation.cpp:4828
 msgctxt "philippines.kgm"
 msgid "Mamburao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4822
+#: mapsdatatranslation.cpp:4829
 msgctxt "philippines.kgm"
 msgid "Oriental Mindoro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4823
+#: mapsdatatranslation.cpp:4830
 msgctxt "philippines.kgm"
 msgid "Calapan City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4824
+#: mapsdatatranslation.cpp:4831
 msgctxt "philippines.kgm"
 msgid "Palawan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4825
+#: mapsdatatranslation.cpp:4832
 msgctxt "philippines.kgm"
 msgid "Puerto Princesa City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4826
+#: mapsdatatranslation.cpp:4833
 msgctxt "philippines.kgm"
 msgid "Pampanga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4828
+#: mapsdatatranslation.cpp:4835
 msgctxt "philippines.kgm"
 msgid "Pangasinan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4829
+#: mapsdatatranslation.cpp:4836
 msgctxt "philippines.kgm"
 msgid "Lingayen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4830
+#: mapsdatatranslation.cpp:4837
 msgctxt "philippines.kgm"
 msgid "Quezon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4831
+#: mapsdatatranslation.cpp:4838
 msgctxt "philippines.kgm"
 msgid "Lucena City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4832
+#: mapsdatatranslation.cpp:4839
 msgctxt "philippines.kgm"
 msgid "Quirino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4833
+#: mapsdatatranslation.cpp:4840
 msgctxt "philippines.kgm"
 msgid "Cabarroguis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4834
+#: mapsdatatranslation.cpp:4841
 msgctxt "philippines.kgm"
 msgid "Rizal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4835
+#: mapsdatatranslation.cpp:4842
 msgctxt "philippines.kgm"
 msgid "Antipolo City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4836 mapsdatatranslation.cpp:4837
+#: mapsdatatranslation.cpp:4843 mapsdatatranslation.cpp:4844
 msgctxt "philippines.kgm"
 msgid "Romblon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4838
+#: mapsdatatranslation.cpp:4845
 msgctxt "philippines.kgm"
 msgid "Samar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4839
+#: mapsdatatranslation.cpp:4846
 msgctxt "philippines.kgm"
 msgid "Catbalogan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4840
+#: mapsdatatranslation.cpp:4847
 msgctxt "philippines.kgm"
 msgid "Sarangani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4841
+#: mapsdatatranslation.cpp:4848
 msgctxt "philippines.kgm"
 msgid "Alabel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4842
-msgctxt "philippines.kgm"
-msgid "Shariff Kabunsuan"
-msgstr ""
-
-#: mapsdatatranslation.cpp:4843
-msgctxt "philippines.kgm"
-msgid "Kabuntalan"
-msgstr ""
-
-#: mapsdatatranslation.cpp:4844 mapsdatatranslation.cpp:4845
+#: mapsdatatranslation.cpp:4849 mapsdatatranslation.cpp:4850
 msgctxt "philippines.kgm"
 msgid "Siquijor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4846
+#: mapsdatatranslation.cpp:4851
 msgctxt "philippines.kgm"
 msgid "Sorsogon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4847
+#: mapsdatatranslation.cpp:4852
 msgctxt "philippines.kgm"
 msgid "Sorsogon City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4848
+#: mapsdatatranslation.cpp:4853
 msgctxt "philippines.kgm"
 msgid "South Cotabato"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4849
+#: mapsdatatranslation.cpp:4854
 msgctxt "philippines.kgm"
 msgid "Koronadal City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4850
+#: mapsdatatranslation.cpp:4855
 msgctxt "philippines.kgm"
 msgid "Southern Leyte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4851
+#: mapsdatatranslation.cpp:4856
 msgctxt "philippines.kgm"
 msgid "Maasin City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4852
+#: mapsdatatranslation.cpp:4857
 msgctxt "philippines.kgm"
 msgid "Sultan Kudarat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4853
+#: mapsdatatranslation.cpp:4858
 msgctxt "philippines.kgm"
 msgid "Isulan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4854
+#: mapsdatatranslation.cpp:4859
 msgctxt "philippines.kgm"
 msgid "Sulu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4855
+#: mapsdatatranslation.cpp:4860
 msgctxt "philippines.kgm"
 msgid "Jolo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4856
+#: mapsdatatranslation.cpp:4861
 msgctxt "philippines.kgm"
 msgid "Surigao del Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4857
+#: mapsdatatranslation.cpp:4862
 msgctxt "philippines.kgm"
 msgid "Surigao City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4858
+#: mapsdatatranslation.cpp:4863
 msgctxt "philippines.kgm"
 msgid "Surigao del Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4859
+#: mapsdatatranslation.cpp:4864
 msgctxt "philippines.kgm"
 msgid "Tandag"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4860
+#: mapsdatatranslation.cpp:4865
 msgctxt "philippines.kgm"
 msgid "Tarlac"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4861
+#: mapsdatatranslation.cpp:4866
 msgctxt "philippines.kgm"
 msgid "Tarlac City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4862
+#: mapsdatatranslation.cpp:4867
 msgctxt "philippines.kgm"
 msgid "Tawi-Tawi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4863
+#: mapsdatatranslation.cpp:4868
 msgctxt "philippines.kgm"
 msgid "Panglima Sugala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4864
+#: mapsdatatranslation.cpp:4869
 msgctxt "philippines.kgm"
 msgid "Zambales"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4865
+#: mapsdatatranslation.cpp:4870
 msgctxt "philippines.kgm"
 msgid "Iba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4866
+#: mapsdatatranslation.cpp:4871
 msgctxt "philippines.kgm"
 msgid "Zamboanga del Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4867
+#: mapsdatatranslation.cpp:4872
 msgctxt "philippines.kgm"
 msgid "Dipolog City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4868
+#: mapsdatatranslation.cpp:4873
 msgctxt "philippines.kgm"
 msgid "Zamboanga del Sur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4869
+#: mapsdatatranslation.cpp:4874
 msgctxt "philippines.kgm"
 msgid "Pagadian City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4870
+#: mapsdatatranslation.cpp:4875
 msgctxt "philippines.kgm"
 msgid "Zamboanga Sibugay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4871
+#: mapsdatatranslation.cpp:4876
 msgctxt "philippines.kgm"
 msgid "Ipil"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4872
+#: mapsdatatranslation.cpp:4877
 msgctxt "philippines.kgm"
 msgid "National Capital"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4873
+#: mapsdatatranslation.cpp:4878
 msgctxt "philippines.kgm"
 msgid "Manila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4874
+#: mapsdatatranslation.cpp:4879
 msgctxt "poland.kgm"
 msgid "Poland"
 msgstr "Poland"
 
-#: mapsdatatranslation.cpp:4875
+#: mapsdatatranslation.cpp:4880
 msgctxt "poland.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4876
+#: mapsdatatranslation.cpp:4881
 msgctxt "poland.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:4877
+#: mapsdatatranslation.cpp:4882
 msgctxt "poland.kgm"
 msgid "Not Poland"
 msgstr "Not Poland"
 
-#: mapsdatatranslation.cpp:4878
+#: mapsdatatranslation.cpp:4883
 msgctxt "poland.kgm"
 msgid "Masovia"
 msgstr "Masovia"
 
-#: mapsdatatranslation.cpp:4879
+#: mapsdatatranslation.cpp:4884
 msgctxt "poland.kgm"
 msgid "Warsaw"
 msgstr "Warsaw"
 
-#: mapsdatatranslation.cpp:4880
+#: mapsdatatranslation.cpp:4885
 msgctxt "poland.kgm"
 msgid "Warmia and Masuria"
 msgstr "Warmia and Masuria"
 
-#: mapsdatatranslation.cpp:4881
+#: mapsdatatranslation.cpp:4886
 msgctxt "poland.kgm"
 msgid "Olsztyn"
 msgstr "Olsztyn"
 
-#: mapsdatatranslation.cpp:4882
+#: mapsdatatranslation.cpp:4887
 msgctxt "poland.kgm"
 msgid "Podlachia"
 msgstr "Podlachia"
 
-#: mapsdatatranslation.cpp:4883
+#: mapsdatatranslation.cpp:4888
 msgctxt "poland.kgm"
 msgid "Białystok"
 msgstr "Białystok"
 
-#: mapsdatatranslation.cpp:4884 mapsdatatranslation.cpp:4885
+#: mapsdatatranslation.cpp:4889 mapsdatatranslation.cpp:4890
 msgctxt "poland.kgm"
 msgid "Lublin"
 msgstr "Lublin"
 
-#: mapsdatatranslation.cpp:4886
+#: mapsdatatranslation.cpp:4891
 msgctxt "poland.kgm"
 msgid "Subcarpathia"
 msgstr "Subcarpathia"
 
-#: mapsdatatranslation.cpp:4887
+#: mapsdatatranslation.cpp:4892
 msgctxt "poland.kgm"
 msgid "Rzeszów"
 msgstr "Rzeszów"
 
-#: mapsdatatranslation.cpp:4888
+#: mapsdatatranslation.cpp:4893
 msgctxt "poland.kgm"
 msgid "Świętokrzyskie"
 msgstr "Świętokrzyskie"
 
-#: mapsdatatranslation.cpp:4889
+#: mapsdatatranslation.cpp:4894
 msgctxt "poland.kgm"
 msgid "Kielce"
 msgstr "Kielce"
 
-#: mapsdatatranslation.cpp:4890
+#: mapsdatatranslation.cpp:4895
 msgctxt "poland.kgm"
 msgid "Lesser Poland"
 msgstr "Lesser Poland"
 
-#: mapsdatatranslation.cpp:4891
+#: mapsdatatranslation.cpp:4896
 msgctxt "poland.kgm"
 msgid "Kraków"
 msgstr "Kraków"
 
-#: mapsdatatranslation.cpp:4892 mapsdatatranslation.cpp:4893
+#: mapsdatatranslation.cpp:4897 mapsdatatranslation.cpp:4898
 msgctxt "poland.kgm"
 msgid "Łódź"
 msgstr "Łódź"
 
-#: mapsdatatranslation.cpp:4894
+#: mapsdatatranslation.cpp:4899
 msgctxt "poland.kgm"
 msgid "Silesia"
 msgstr "Silesia"
 
-#: mapsdatatranslation.cpp:4895
+#: mapsdatatranslation.cpp:4900
 msgctxt "poland.kgm"
 msgid "Katowice"
 msgstr "Katowice"
 
-#: mapsdatatranslation.cpp:4896 mapsdatatranslation.cpp:4897
+#: mapsdatatranslation.cpp:4901 mapsdatatranslation.cpp:4902
 msgctxt "poland.kgm"
 msgid "Opole"
 msgstr "Opole"
 
-#: mapsdatatranslation.cpp:4898
+#: mapsdatatranslation.cpp:4903
 msgctxt "poland.kgm"
 msgid "Pomerania"
 msgstr "Pomerania"
 
-#: mapsdatatranslation.cpp:4899
+#: mapsdatatranslation.cpp:4904
 msgctxt "poland.kgm"
 msgid "Gdańsk"
 msgstr "Gdańsk"
 
-#: mapsdatatranslation.cpp:4900
+#: mapsdatatranslation.cpp:4905
 msgctxt "poland.kgm"
 msgid "West Pomerania"
 msgstr "West Pomerania"
 
-#: mapsdatatranslation.cpp:4901
+#: mapsdatatranslation.cpp:4906
 msgctxt "poland.kgm"
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: mapsdatatranslation.cpp:4902
+#: mapsdatatranslation.cpp:4907
 msgctxt "poland.kgm"
 msgid "Greater Poland"
 msgstr "Greater Poland"
 
-#: mapsdatatranslation.cpp:4903
+#: mapsdatatranslation.cpp:4908
 msgctxt "poland.kgm"
 msgid "Poznań"
 msgstr "Poznań"
 
-#: mapsdatatranslation.cpp:4904
+#: mapsdatatranslation.cpp:4909
 msgctxt "poland.kgm"
 msgid "Lower Silesia"
 msgstr "Lower Silesia"
 
-#: mapsdatatranslation.cpp:4905
+#: mapsdatatranslation.cpp:4910
 msgctxt "poland.kgm"
 msgid "Wrocław"
 msgstr "Wrocław"
 
-#: mapsdatatranslation.cpp:4906
+#: mapsdatatranslation.cpp:4911
 msgctxt "poland.kgm"
 msgid "Lubusz"
 msgstr "Lubusz"
 
-#: mapsdatatranslation.cpp:4907
+#: mapsdatatranslation.cpp:4912
 msgctxt "poland.kgm"
 msgid "Zielona Góra, Gorzów Wielkopolski"
 msgstr "Zielona Góra, Gorzów Wielkopolski"
 
-#: mapsdatatranslation.cpp:4908
+#: mapsdatatranslation.cpp:4913
 msgctxt "poland.kgm"
 msgid "Kuyavia-Pomerania"
 msgstr "Kuyavia-Pomerania"
 
-#: mapsdatatranslation.cpp:4909
+#: mapsdatatranslation.cpp:4914
 msgctxt "poland.kgm"
 msgid "Bydgoszcz, Toruń"
 msgstr "Bydgoszcz, Toruń"
 
-#: mapsdatatranslation.cpp:4910
+#: mapsdatatranslation.cpp:4915
 msgctxt "portugal_districts.kgm"
 msgid "Portugal Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4911
+#: mapsdatatranslation.cpp:4916
 msgctxt "portugal_districts.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4912
+#: mapsdatatranslation.cpp:4917
 msgctxt "portugal_districts.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4913
+#: mapsdatatranslation.cpp:4918
 msgctxt "portugal_districts.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4914
+#: mapsdatatranslation.cpp:4919
 msgctxt "portugal_districts.kgm"
 msgid "Spain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4915
+#: mapsdatatranslation.cpp:4920
 msgctxt "portugal_districts.kgm"
 msgid "Border2"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4916 mapsdatatranslation.cpp:4917
+#: mapsdatatranslation.cpp:4921 mapsdatatranslation.cpp:4922
 msgctxt "portugal_districts.kgm"
 msgid "Viana do Castelo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4918
+#: mapsdatatranslation.cpp:4923
 msgctxt "portugal_districts.kgm"
 msgid "Açores"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4919
+#: mapsdatatranslation.cpp:4924
 msgctxt "portugal_districts.kgm"
 msgid "Ponta Delgada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4920
+#: mapsdatatranslation.cpp:4925
 msgctxt "portugal_districts.kgm"
 msgid "Madeira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4921
+#: mapsdatatranslation.cpp:4926
 msgctxt "portugal_districts.kgm"
 msgid "Funchal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4922 mapsdatatranslation.cpp:4923
+#: mapsdatatranslation.cpp:4927 mapsdatatranslation.cpp:4928
 msgctxt "portugal_districts.kgm"
 msgid "Braga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4924 mapsdatatranslation.cpp:4925
+#: mapsdatatranslation.cpp:4929 mapsdatatranslation.cpp:4930
 msgctxt "portugal_districts.kgm"
 msgid "Vila Real"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4926 mapsdatatranslation.cpp:4927
+#: mapsdatatranslation.cpp:4931 mapsdatatranslation.cpp:4932
 msgctxt "portugal_districts.kgm"
 msgid "Bragança"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4928 mapsdatatranslation.cpp:4929
+#: mapsdatatranslation.cpp:4933 mapsdatatranslation.cpp:4934
 msgctxt "portugal_districts.kgm"
 msgid "Porto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4930 mapsdatatranslation.cpp:4931
+#: mapsdatatranslation.cpp:4935 mapsdatatranslation.cpp:4936
 msgctxt "portugal_districts.kgm"
 msgid "Aveiro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4932 mapsdatatranslation.cpp:4933
+#: mapsdatatranslation.cpp:4937 mapsdatatranslation.cpp:4938
 msgctxt "portugal_districts.kgm"
 msgid "Viseu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4934 mapsdatatranslation.cpp:4935
+#: mapsdatatranslation.cpp:4939 mapsdatatranslation.cpp:4940
 msgctxt "portugal_districts.kgm"
 msgid "Guarda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4936 mapsdatatranslation.cpp:4937
+#: mapsdatatranslation.cpp:4941 mapsdatatranslation.cpp:4942
 msgctxt "portugal_districts.kgm"
 msgid "Coimbra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4938 mapsdatatranslation.cpp:4939
+#: mapsdatatranslation.cpp:4943 mapsdatatranslation.cpp:4944
 msgctxt "portugal_districts.kgm"
 msgid "Castelo Branco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4940 mapsdatatranslation.cpp:4941
+#: mapsdatatranslation.cpp:4945 mapsdatatranslation.cpp:4946
 msgctxt "portugal_districts.kgm"
 msgid "Leiria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4942 mapsdatatranslation.cpp:4943
+#: mapsdatatranslation.cpp:4947 mapsdatatranslation.cpp:4948
 msgctxt "portugal_districts.kgm"
 msgid "Santarém"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4944 mapsdatatranslation.cpp:4945
+#: mapsdatatranslation.cpp:4949 mapsdatatranslation.cpp:4950
 msgctxt "portugal_districts.kgm"
 msgid "Lisboa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4946 mapsdatatranslation.cpp:4947
+#: mapsdatatranslation.cpp:4951 mapsdatatranslation.cpp:4952
 msgctxt "portugal_districts.kgm"
 msgid "Évora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4948 mapsdatatranslation.cpp:4949
+#: mapsdatatranslation.cpp:4953 mapsdatatranslation.cpp:4954
 msgctxt "portugal_districts.kgm"
 msgid "Setúbal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4950 mapsdatatranslation.cpp:4951
+#: mapsdatatranslation.cpp:4955 mapsdatatranslation.cpp:4956
 msgctxt "portugal_districts.kgm"
 msgid "Beja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4952 mapsdatatranslation.cpp:4953
+#: mapsdatatranslation.cpp:4957 mapsdatatranslation.cpp:4958
 msgctxt "portugal_districts.kgm"
 msgid "Faro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4954 mapsdatatranslation.cpp:4955
+#: mapsdatatranslation.cpp:4959 mapsdatatranslation.cpp:4960
 msgctxt "portugal_districts.kgm"
 msgid "Portalegre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4956
+#: mapsdatatranslation.cpp:4961
 msgctxt "portugal_provinces.kgm"
 msgid "Portugal Provinces (traditional)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4957
+#: mapsdatatranslation.cpp:4962
 msgctxt "portugal_provinces.kgm"
 msgid "Provinces (traditional)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4958
+#: mapsdatatranslation.cpp:4963
 msgctxt "portugal_provinces.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4959
+#: mapsdatatranslation.cpp:4964
 msgctxt "portugal_provinces.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4960
+#: mapsdatatranslation.cpp:4965
 msgctxt "portugal_provinces.kgm"
 msgid "Spain"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4961
+#: mapsdatatranslation.cpp:4966
 msgctxt "portugal_provinces.kgm"
 msgid "Border2"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4962
+#: mapsdatatranslation.cpp:4967
 msgctxt "portugal_provinces.kgm"
 msgid "Minho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4963
+#: mapsdatatranslation.cpp:4968
 msgctxt "portugal_provinces.kgm"
 msgid "Braga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4964
+#: mapsdatatranslation.cpp:4969
 msgctxt "portugal_provinces.kgm"
 msgid "Trás-os-Montes e Alto Douro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4965
+#: mapsdatatranslation.cpp:4970
 msgctxt "portugal_provinces.kgm"
 msgid "Vila Real"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4966
+#: mapsdatatranslation.cpp:4971
 msgctxt "portugal_provinces.kgm"
 msgid "Douro Litoral"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4967
+#: mapsdatatranslation.cpp:4972
 msgctxt "portugal_provinces.kgm"
 msgid "Porto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4968
+#: mapsdatatranslation.cpp:4973
 msgctxt "portugal_provinces.kgm"
 msgid "Beira Alta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4969
+#: mapsdatatranslation.cpp:4974
 msgctxt "portugal_provinces.kgm"
 msgid "Viseu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4970
+#: mapsdatatranslation.cpp:4975
 msgctxt "portugal_provinces.kgm"
 msgid "Beira Litoral"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4971
+#: mapsdatatranslation.cpp:4976
 msgctxt "portugal_provinces.kgm"
 msgid "Coimbra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4972
+#: mapsdatatranslation.cpp:4977
 msgctxt "portugal_provinces.kgm"
 msgid "Beira Baixa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4973
+#: mapsdatatranslation.cpp:4978
 msgctxt "portugal_provinces.kgm"
 msgid "Castelo Branco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4974
+#: mapsdatatranslation.cpp:4979
 msgctxt "portugal_provinces.kgm"
 msgid "Ribatejo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4975
+#: mapsdatatranslation.cpp:4980
 msgctxt "portugal_provinces.kgm"
 msgid "Santarém"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4976
+#: mapsdatatranslation.cpp:4981
 msgctxt "portugal_provinces.kgm"
 msgid "Estremadura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4977
+#: mapsdatatranslation.cpp:4982
 msgctxt "portugal_provinces.kgm"
 msgid "Lisboa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4978
+#: mapsdatatranslation.cpp:4983
 msgctxt "portugal_provinces.kgm"
 msgid "Alto Alentejo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4979
+#: mapsdatatranslation.cpp:4984
 msgctxt "portugal_provinces.kgm"
 msgid "Évora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4980
+#: mapsdatatranslation.cpp:4985
 msgctxt "portugal_provinces.kgm"
 msgid "Baixo Alentejo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4981
+#: mapsdatatranslation.cpp:4986
 msgctxt "portugal_provinces.kgm"
 msgid "Beja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4982
+#: mapsdatatranslation.cpp:4987
 msgctxt "portugal_provinces.kgm"
 msgid "Algarve"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4983
+#: mapsdatatranslation.cpp:4988
 msgctxt "portugal_provinces.kgm"
 msgid "Faro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4984
+#: mapsdatatranslation.cpp:4989
 msgctxt "portugal_provinces.kgm"
 msgid "Açores"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4985
+#: mapsdatatranslation.cpp:4990
 msgctxt "portugal_provinces.kgm"
 msgid "Ponta Delgada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4986
+#: mapsdatatranslation.cpp:4991
 msgctxt "portugal_provinces.kgm"
 msgid "Madeira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4987
+#: mapsdatatranslation.cpp:4992
 msgctxt "portugal_provinces.kgm"
 msgid "Funchal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4988
+#: mapsdatatranslation.cpp:4993
 msgctxt "portugal_regions.kgm"
 msgid "Portugal (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4989
+#: mapsdatatranslation.cpp:4994
 msgctxt "portugal_regions.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4990
+#: mapsdatatranslation.cpp:4995
 msgctxt "portugal_regions.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4991
+#: mapsdatatranslation.cpp:4996
 msgctxt "portugal_regions.kgm"
 msgid "Not Portugal (Regions)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4992
+#: mapsdatatranslation.cpp:4997
 msgctxt "portugal_regions.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4993
+#: mapsdatatranslation.cpp:4998
 msgctxt "portugal_regions.kgm"
 msgid "Alentejo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4994
+#: mapsdatatranslation.cpp:4999
 msgctxt "portugal_regions.kgm"
 msgid "Evora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4995
+#: mapsdatatranslation.cpp:5000
 msgctxt "portugal_regions.kgm"
 msgid "Algarve"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4996
+#: mapsdatatranslation.cpp:5001
 msgctxt "portugal_regions.kgm"
 msgid "Faro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4997
+#: mapsdatatranslation.cpp:5002
 msgctxt "portugal_regions.kgm"
 msgid "Centro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4998
+#: mapsdatatranslation.cpp:5003
 msgctxt "portugal_regions.kgm"
 msgid "Coimbra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:4999
+#: mapsdatatranslation.cpp:5004
 msgctxt "portugal_regions.kgm"
 msgid "Lisboa(region)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5000
+#: mapsdatatranslation.cpp:5005
 msgctxt "portugal_regions.kgm"
 msgid "Lisboa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5001
+#: mapsdatatranslation.cpp:5006
 msgctxt "portugal_regions.kgm"
 msgid "Norte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5002
+#: mapsdatatranslation.cpp:5007
 msgctxt "portugal_regions.kgm"
 msgid "Porto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5003
+#: mapsdatatranslation.cpp:5008
 msgctxt "portugal_regions.kgm"
 msgid "Madeira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5004
+#: mapsdatatranslation.cpp:5009
 msgctxt "portugal_regions.kgm"
 msgid "Funchal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5005
+#: mapsdatatranslation.cpp:5010
 msgctxt "portugal_regions.kgm"
 msgid "Azores"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5006
+#: mapsdatatranslation.cpp:5011
 msgctxt "portugal_regions.kgm"
 msgid "Ponta Delgada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5007
+#: mapsdatatranslation.cpp:5012
 msgctxt "puertorico.kgm"
 msgid "Puerto Rico"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5008
+#: mapsdatatranslation.cpp:5013
 msgctxt "puertorico.kgm"
 msgid "Municipalities"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5009 mapsdatatranslation.cpp:5010
+#: mapsdatatranslation.cpp:5014 mapsdatatranslation.cpp:5015
 msgctxt "puertorico.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5011
+#: mapsdatatranslation.cpp:5016
 msgctxt "puertorico.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5012
+#: mapsdatatranslation.cpp:5017
 msgctxt "puertorico.kgm"
 msgid "Mona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5013
+#: mapsdatatranslation.cpp:5018
 msgctxt "puertorico.kgm"
 msgid "Adjuntas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5014
+#: mapsdatatranslation.cpp:5019
 msgctxt "puertorico.kgm"
 msgid "Aguada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5015
+#: mapsdatatranslation.cpp:5020
 msgctxt "puertorico.kgm"
 msgid "Aguadilla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5016
+#: mapsdatatranslation.cpp:5021
 msgctxt "puertorico.kgm"
 msgid "Aguas Buenas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5017
+#: mapsdatatranslation.cpp:5022
 msgctxt "puertorico.kgm"
 msgid "Aibonito"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5018
+#: mapsdatatranslation.cpp:5023
 msgctxt "puertorico.kgm"
 msgid "Añasco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5019
+#: mapsdatatranslation.cpp:5024
 msgctxt "puertorico.kgm"
 msgid "Arecibo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5020
+#: mapsdatatranslation.cpp:5025
 msgctxt "puertorico.kgm"
 msgid "Arroyo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5021
+#: mapsdatatranslation.cpp:5026
 msgctxt "puertorico.kgm"
 msgid "Barceloneta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5022
+#: mapsdatatranslation.cpp:5027
 msgctxt "puertorico.kgm"
 msgid "Barranquitas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5023
+#: mapsdatatranslation.cpp:5028
 msgctxt "puertorico.kgm"
 msgid "Bayamón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5024
+#: mapsdatatranslation.cpp:5029
 msgctxt "puertorico.kgm"
 msgid "Cabo Rojo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5025
+#: mapsdatatranslation.cpp:5030
 msgctxt "puertorico.kgm"
 msgid "Caguas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5026
+#: mapsdatatranslation.cpp:5031
 msgctxt "puertorico.kgm"
 msgid "Camuy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5027
+#: mapsdatatranslation.cpp:5032
 msgctxt "puertorico.kgm"
 msgid "Canóvanas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5028
+#: mapsdatatranslation.cpp:5033
 msgctxt "puertorico.kgm"
 msgid "Carolina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5029
+#: mapsdatatranslation.cpp:5034
 msgctxt "puertorico.kgm"
 msgid "Cataño"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5030
+#: mapsdatatranslation.cpp:5035
 msgctxt "puertorico.kgm"
 msgid "Cayey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5031
+#: mapsdatatranslation.cpp:5036
 msgctxt "puertorico.kgm"
 msgid "Ceiba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5032
+#: mapsdatatranslation.cpp:5037
 msgctxt "puertorico.kgm"
 msgid "Ciales"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5033
+#: mapsdatatranslation.cpp:5038
 msgctxt "puertorico.kgm"
 msgid "Cidra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5034
+#: mapsdatatranslation.cpp:5039
 msgctxt "puertorico.kgm"
 msgid "Coamo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5035
+#: mapsdatatranslation.cpp:5040
 msgctxt "puertorico.kgm"
 msgid "Comerío"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5036
+#: mapsdatatranslation.cpp:5041
 msgctxt "puertorico.kgm"
 msgid "Corozal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5037
+#: mapsdatatranslation.cpp:5042
 msgctxt "puertorico.kgm"
 msgid "Culebra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5038
+#: mapsdatatranslation.cpp:5043
 msgctxt "puertorico.kgm"
 msgid "Dorado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5039
+#: mapsdatatranslation.cpp:5044
 msgctxt "puertorico.kgm"
 msgid "Fajardo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5040
+#: mapsdatatranslation.cpp:5045
 msgctxt "puertorico.kgm"
 msgid "Florida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5041
+#: mapsdatatranslation.cpp:5046
 msgctxt "puertorico.kgm"
 msgid "Guánica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5042
+#: mapsdatatranslation.cpp:5047
 msgctxt "puertorico.kgm"
 msgid "Guayama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5043
+#: mapsdatatranslation.cpp:5048
 msgctxt "puertorico.kgm"
 msgid "Guayanilla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5044
+#: mapsdatatranslation.cpp:5049
 msgctxt "puertorico.kgm"
 msgid "Guaynabo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5045
+#: mapsdatatranslation.cpp:5050
 msgctxt "puertorico.kgm"
 msgid "Gurabo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5046
+#: mapsdatatranslation.cpp:5051
 msgctxt "puertorico.kgm"
 msgid "Hatillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5047
+#: mapsdatatranslation.cpp:5052
 msgctxt "puertorico.kgm"
 msgid "Hormigueros"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5048
+#: mapsdatatranslation.cpp:5053
 msgctxt "puertorico.kgm"
 msgid "Humacao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5049
+#: mapsdatatranslation.cpp:5054
 msgctxt "puertorico.kgm"
 msgid "Isabela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5050
+#: mapsdatatranslation.cpp:5055
 msgctxt "puertorico.kgm"
 msgid "Jayuya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5051
+#: mapsdatatranslation.cpp:5056
 msgctxt "puertorico.kgm"
 msgid "Juana Díaz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5052
+#: mapsdatatranslation.cpp:5057
 msgctxt "puertorico.kgm"
 msgid "Juncos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5053
+#: mapsdatatranslation.cpp:5058
 msgctxt "puertorico.kgm"
 msgid "Lajas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5054
+#: mapsdatatranslation.cpp:5059
 msgctxt "puertorico.kgm"
 msgid "Lares"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5055
+#: mapsdatatranslation.cpp:5060
 msgctxt "puertorico.kgm"
 msgid "Las Marías"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5056
+#: mapsdatatranslation.cpp:5061
 msgctxt "puertorico.kgm"
 msgid "Las Piedras"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5057
+#: mapsdatatranslation.cpp:5062
 msgctxt "puertorico.kgm"
 msgid "Loíza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5058
+#: mapsdatatranslation.cpp:5063
 msgctxt "puertorico.kgm"
 msgid "Luquillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5059
+#: mapsdatatranslation.cpp:5064
 msgctxt "puertorico.kgm"
 msgid "Manatí"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5060
+#: mapsdatatranslation.cpp:5065
 msgctxt "puertorico.kgm"
 msgid "Maricao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5061
+#: mapsdatatranslation.cpp:5066
 msgctxt "puertorico.kgm"
 msgid "Maunabo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5062
+#: mapsdatatranslation.cpp:5067
 msgctxt "puertorico.kgm"
 msgid "Mayagüez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5063
+#: mapsdatatranslation.cpp:5068
 msgctxt "puertorico.kgm"
 msgid "Moca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5064
+#: mapsdatatranslation.cpp:5069
 msgctxt "puertorico.kgm"
 msgid "Morovis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5065
+#: mapsdatatranslation.cpp:5070
 msgctxt "puertorico.kgm"
 msgid "Nagüabo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5066
+#: mapsdatatranslation.cpp:5071
 msgctxt "puertorico.kgm"
 msgid "Naranjito"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5067
+#: mapsdatatranslation.cpp:5072
 msgctxt "puertorico.kgm"
 msgid "Orocovis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5068
+#: mapsdatatranslation.cpp:5073
 msgctxt "puertorico.kgm"
 msgid "Patillas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5069
+#: mapsdatatranslation.cpp:5074
 msgctxt "puertorico.kgm"
 msgid "Peñuelas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5070
+#: mapsdatatranslation.cpp:5075
 msgctxt "puertorico.kgm"
 msgid "Ponce"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5071
+#: mapsdatatranslation.cpp:5076
 msgctxt "puertorico.kgm"
 msgid "Quebradillas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5072
+#: mapsdatatranslation.cpp:5077
 msgctxt "puertorico.kgm"
 msgid "Rincón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5073
+#: mapsdatatranslation.cpp:5078
 msgctxt "puertorico.kgm"
 msgid "Río Grande"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5074
+#: mapsdatatranslation.cpp:5079
 msgctxt "puertorico.kgm"
 msgid "Sabana Grande"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5075
+#: mapsdatatranslation.cpp:5080
 msgctxt "puertorico.kgm"
 msgid "Salinas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5076
+#: mapsdatatranslation.cpp:5081
 msgctxt "puertorico.kgm"
 msgid "San Germán"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5077
+#: mapsdatatranslation.cpp:5082
 msgctxt "puertorico.kgm"
 msgid "San Juan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5078
+#: mapsdatatranslation.cpp:5083
 msgctxt "puertorico.kgm"
 msgid "San Lorenzo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5079
+#: mapsdatatranslation.cpp:5084
 msgctxt "puertorico.kgm"
 msgid "San Sebastián"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5080
+#: mapsdatatranslation.cpp:5085
 msgctxt "puertorico.kgm"
 msgid "Santa Isabel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5081
+#: mapsdatatranslation.cpp:5086
 msgctxt "puertorico.kgm"
 msgid "Toa Alta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5082
+#: mapsdatatranslation.cpp:5087
 msgctxt "puertorico.kgm"
 msgid "Toa Baja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5083
+#: mapsdatatranslation.cpp:5088
 msgctxt "puertorico.kgm"
 msgid "Trujillo Alto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5084
+#: mapsdatatranslation.cpp:5089
 msgctxt "puertorico.kgm"
 msgid "Utuado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5085
+#: mapsdatatranslation.cpp:5090
 msgctxt "puertorico.kgm"
 msgid "Vega Alta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5086
+#: mapsdatatranslation.cpp:5091
 msgctxt "puertorico.kgm"
 msgid "Vega Baja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5087
+#: mapsdatatranslation.cpp:5092
 msgctxt "puertorico.kgm"
 msgid "Vieques"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5088
+#: mapsdatatranslation.cpp:5093
 msgctxt "puertorico.kgm"
 msgid "Villalba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5089
+#: mapsdatatranslation.cpp:5094
 msgctxt "puertorico.kgm"
 msgid "Yabucoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5090
+#: mapsdatatranslation.cpp:5095
 msgctxt "puertorico.kgm"
 msgid "Yauco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5091
+#: mapsdatatranslation.cpp:5096
 msgctxt "republic_of_ireland.kgm"
 msgid "Republic Of Ireland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5092
+#: mapsdatatranslation.cpp:5097
 msgctxt "republic_of_ireland.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5093
+#: mapsdatatranslation.cpp:5098
 msgctxt "republic_of_ireland.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5094
+#: mapsdatatranslation.cpp:5099
 msgctxt "republic_of_ireland.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5095
+#: mapsdatatranslation.cpp:5100
 msgctxt "republic_of_ireland.kgm"
 msgid "Not Republic Of Ireland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5096 mapsdatatranslation.cpp:5097
+#: mapsdatatranslation.cpp:5101 mapsdatatranslation.cpp:5102
 msgctxt "republic_of_ireland.kgm"
 msgid "Dublin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5098 mapsdatatranslation.cpp:5099
+#: mapsdatatranslation.cpp:5103 mapsdatatranslation.cpp:5104
 msgctxt "republic_of_ireland.kgm"
 msgid "Wicklow"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5100 mapsdatatranslation.cpp:5101
+#: mapsdatatranslation.cpp:5105 mapsdatatranslation.cpp:5106
 msgctxt "republic_of_ireland.kgm"
 msgid "Wexford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5102 mapsdatatranslation.cpp:5103
+#: mapsdatatranslation.cpp:5107 mapsdatatranslation.cpp:5108
 msgctxt "republic_of_ireland.kgm"
 msgid "Carlow"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5104
+#: mapsdatatranslation.cpp:5109
 msgctxt "republic_of_ireland.kgm"
 msgid "Kildare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5105
+#: mapsdatatranslation.cpp:5110
 msgctxt "republic_of_ireland.kgm"
 msgid "Naas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5106
+#: mapsdatatranslation.cpp:5111
 msgctxt "republic_of_ireland.kgm"
 msgid "Meath"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5107
+#: mapsdatatranslation.cpp:5112
 msgctxt "republic_of_ireland.kgm"
 msgid "Navan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5108
+#: mapsdatatranslation.cpp:5113
 msgctxt "republic_of_ireland.kgm"
 msgid "Louth"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5109
+#: mapsdatatranslation.cpp:5114
 msgctxt "republic_of_ireland.kgm"
 msgid "Dundalk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5110 mapsdatatranslation.cpp:5111
+#: mapsdatatranslation.cpp:5115 mapsdatatranslation.cpp:5116
 msgctxt "republic_of_ireland.kgm"
 msgid "Monaghan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5112 mapsdatatranslation.cpp:5113
+#: mapsdatatranslation.cpp:5117 mapsdatatranslation.cpp:5118
 msgctxt "republic_of_ireland.kgm"
 msgid "Cavan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5114 mapsdatatranslation.cpp:5115
+#: mapsdatatranslation.cpp:5119 mapsdatatranslation.cpp:5120
 msgctxt "republic_of_ireland.kgm"
 msgid "Longford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5116
+#: mapsdatatranslation.cpp:5121
 msgctxt "republic_of_ireland.kgm"
 msgid "Westmeath"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5117
+#: mapsdatatranslation.cpp:5122
 msgctxt "republic_of_ireland.kgm"
 msgid "Mullingar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5118
+#: mapsdatatranslation.cpp:5123
 msgctxt "republic_of_ireland.kgm"
 msgid "Offaly"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5119
+#: mapsdatatranslation.cpp:5124
 msgctxt "republic_of_ireland.kgm"
 msgid "Tullamore"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5120
+#: mapsdatatranslation.cpp:5125
 msgctxt "republic_of_ireland.kgm"
 msgid "Laois"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5121
+#: mapsdatatranslation.cpp:5126
 msgctxt "republic_of_ireland.kgm"
 msgid "Portlaois"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5122 mapsdatatranslation.cpp:5123
+#: mapsdatatranslation.cpp:5127 mapsdatatranslation.cpp:5128
 msgctxt "republic_of_ireland.kgm"
 msgid "Kilkenny"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5124 mapsdatatranslation.cpp:5125
+#: mapsdatatranslation.cpp:5129 mapsdatatranslation.cpp:5130
 msgctxt "republic_of_ireland.kgm"
 msgid "Waterford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5126 mapsdatatranslation.cpp:5127
+#: mapsdatatranslation.cpp:5131 mapsdatatranslation.cpp:5132
 msgctxt "republic_of_ireland.kgm"
 msgid "Cork"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5128
+#: mapsdatatranslation.cpp:5133
 msgctxt "republic_of_ireland.kgm"
 msgid "Kerry"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5129
+#: mapsdatatranslation.cpp:5134
 msgctxt "republic_of_ireland.kgm"
 msgid "Tralee"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5130 mapsdatatranslation.cpp:5131
+#: mapsdatatranslation.cpp:5135 mapsdatatranslation.cpp:5136
 msgctxt "republic_of_ireland.kgm"
 msgid "Limerick"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5132
+#: mapsdatatranslation.cpp:5137
 msgctxt "republic_of_ireland.kgm"
 msgid "North Tipperary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5133
+#: mapsdatatranslation.cpp:5138
 msgctxt "republic_of_ireland.kgm"
 msgid "Nenagh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5134
+#: mapsdatatranslation.cpp:5139
 msgctxt "republic_of_ireland.kgm"
 msgid "South Tipperary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5135
+#: mapsdatatranslation.cpp:5140
 msgctxt "republic_of_ireland.kgm"
 msgid "Clonmel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5136
+#: mapsdatatranslation.cpp:5141
 msgctxt "republic_of_ireland.kgm"
 msgid "Clare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5137
+#: mapsdatatranslation.cpp:5142
 msgctxt "republic_of_ireland.kgm"
 msgid "Ennis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5138 mapsdatatranslation.cpp:5139
+#: mapsdatatranslation.cpp:5143 mapsdatatranslation.cpp:5144
 msgctxt "republic_of_ireland.kgm"
 msgid "Galway"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5140
+#: mapsdatatranslation.cpp:5145
 msgctxt "republic_of_ireland.kgm"
 msgid "Mayo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5141
+#: mapsdatatranslation.cpp:5146
 msgctxt "republic_of_ireland.kgm"
 msgid "Castlebar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5142 mapsdatatranslation.cpp:5143
+#: mapsdatatranslation.cpp:5147 mapsdatatranslation.cpp:5148
 msgctxt "republic_of_ireland.kgm"
 msgid "Roscommon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5144 mapsdatatranslation.cpp:5145
+#: mapsdatatranslation.cpp:5149 mapsdatatranslation.cpp:5150
 msgctxt "republic_of_ireland.kgm"
 msgid "Sligo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5146
+#: mapsdatatranslation.cpp:5151
 msgctxt "republic_of_ireland.kgm"
 msgid "Leitrim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5147
+#: mapsdatatranslation.cpp:5152
 msgctxt "republic_of_ireland.kgm"
 msgid "Carrick-on-Shannon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5148
+#: mapsdatatranslation.cpp:5153
 msgctxt "republic_of_ireland.kgm"
 msgid "Donegal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5149
+#: mapsdatatranslation.cpp:5154
 msgctxt "republic_of_ireland.kgm"
 msgid "Lifford"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5150
+#: mapsdatatranslation.cpp:5155
 msgctxt "romania.kgm"
 msgid "Romania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5151
+#: mapsdatatranslation.cpp:5156
 msgctxt "romania.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5152
+#: mapsdatatranslation.cpp:5157
 msgctxt "romania.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5153
+#: mapsdatatranslation.cpp:5158
 msgctxt "romania.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5154
+#: mapsdatatranslation.cpp:5159
 msgctxt "romania.kgm"
 msgid "Not Romania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5155
+#: mapsdatatranslation.cpp:5160
 msgctxt "romania.kgm"
 msgid "Alba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5156
+#: mapsdatatranslation.cpp:5161
 msgctxt "romania.kgm"
 msgid "Alba Iulia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5157 mapsdatatranslation.cpp:5158
+#: mapsdatatranslation.cpp:5162 mapsdatatranslation.cpp:5163
 msgctxt "romania.kgm"
 msgid "Arad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5159
+#: mapsdatatranslation.cpp:5164
 msgctxt "romania.kgm"
 msgid "Argeş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5160
+#: mapsdatatranslation.cpp:5165
 msgctxt "romania.kgm"
 msgid "Piteşti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5161 mapsdatatranslation.cpp:5162
+#: mapsdatatranslation.cpp:5166 mapsdatatranslation.cpp:5167
 msgctxt "romania.kgm"
 msgid "Bacău"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5163
+#: mapsdatatranslation.cpp:5168
 msgctxt "romania.kgm"
 msgid "Bihor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5164
+#: mapsdatatranslation.cpp:5169
 msgctxt "romania.kgm"
 msgid "Oradea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5165
+#: mapsdatatranslation.cpp:5170
 msgctxt "romania.kgm"
 msgid "Bistriţa-Năsăud"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5166
+#: mapsdatatranslation.cpp:5171
 msgctxt "romania.kgm"
 msgid "Bistriţa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5167 mapsdatatranslation.cpp:5168
+#: mapsdatatranslation.cpp:5172 mapsdatatranslation.cpp:5173
 msgctxt "romania.kgm"
 msgid "Botoşani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5169 mapsdatatranslation.cpp:5170
+#: mapsdatatranslation.cpp:5174 mapsdatatranslation.cpp:5175
 msgctxt "romania.kgm"
 msgid "Braşov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5171 mapsdatatranslation.cpp:5172
+#: mapsdatatranslation.cpp:5176 mapsdatatranslation.cpp:5177
 msgctxt "romania.kgm"
 msgid "Brăila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5173 mapsdatatranslation.cpp:5174
+#: mapsdatatranslation.cpp:5178 mapsdatatranslation.cpp:5179
 msgctxt "romania.kgm"
 msgid "Buzău"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5175
+#: mapsdatatranslation.cpp:5180
 msgctxt "romania.kgm"
 msgid "Caraş-Severin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5176
+#: mapsdatatranslation.cpp:5181
 msgctxt "romania.kgm"
 msgid "Reşiţa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5177 mapsdatatranslation.cpp:5178
+#: mapsdatatranslation.cpp:5182 mapsdatatranslation.cpp:5183
 msgctxt "romania.kgm"
 msgid "Călăraşi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5179
+#: mapsdatatranslation.cpp:5184
 msgctxt "romania.kgm"
 msgid "Cluj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5180
+#: mapsdatatranslation.cpp:5185
 msgctxt "romania.kgm"
 msgid "Cluj-Napoca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5181 mapsdatatranslation.cpp:5182
+#: mapsdatatranslation.cpp:5186 mapsdatatranslation.cpp:5187
 msgctxt "romania.kgm"
 msgid "Constanţa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5183
+#: mapsdatatranslation.cpp:5188
 msgctxt "romania.kgm"
 msgid "Covasna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5184
+#: mapsdatatranslation.cpp:5189
 msgctxt "romania.kgm"
 msgid "Sfântu Gheorghe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5185
+#: mapsdatatranslation.cpp:5190
 msgctxt "romania.kgm"
 msgid "Dâmboviţa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5186
+#: mapsdatatranslation.cpp:5191
 msgctxt "romania.kgm"
 msgid "Târgovişte"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5187
+#: mapsdatatranslation.cpp:5192
 msgctxt "romania.kgm"
 msgid "Dolj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5188
+#: mapsdatatranslation.cpp:5193
 msgctxt "romania.kgm"
 msgid "Craiova"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5189 mapsdatatranslation.cpp:5190
+#: mapsdatatranslation.cpp:5194 mapsdatatranslation.cpp:5195
 msgctxt "romania.kgm"
 msgid "Galaţi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5191 mapsdatatranslation.cpp:5192
+#: mapsdatatranslation.cpp:5196 mapsdatatranslation.cpp:5197
 msgctxt "romania.kgm"
 msgid "Giurgiu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5193
+#: mapsdatatranslation.cpp:5198
 msgctxt "romania.kgm"
 msgid "Gorj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5194
+#: mapsdatatranslation.cpp:5199
 msgctxt "romania.kgm"
 msgid "Târgu Jiu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5195
+#: mapsdatatranslation.cpp:5200
 msgctxt "romania.kgm"
 msgid "Harghita"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5196
+#: mapsdatatranslation.cpp:5201
 msgctxt "romania.kgm"
 msgid "Miercurea Ciuc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5197
+#: mapsdatatranslation.cpp:5202
 msgctxt "romania.kgm"
 msgid "Hunedoara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5198
+#: mapsdatatranslation.cpp:5203
 msgctxt "romania.kgm"
 msgid "Deva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5199
+#: mapsdatatranslation.cpp:5204
 msgctxt "romania.kgm"
 msgid "Ialomiţa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5200
+#: mapsdatatranslation.cpp:5205
 msgctxt "romania.kgm"
 msgid "Slobozia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5201 mapsdatatranslation.cpp:5202
+#: mapsdatatranslation.cpp:5206 mapsdatatranslation.cpp:5207
 msgctxt "romania.kgm"
 msgid "Iaşi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5203
+#: mapsdatatranslation.cpp:5208
 msgctxt "romania.kgm"
 msgid "Ilfov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5204
+#: mapsdatatranslation.cpp:5209
 msgctxt "romania.kgm"
 msgid "Buftea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5205
+#: mapsdatatranslation.cpp:5210
 msgctxt "romania.kgm"
 msgid "Maramureş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5206
+#: mapsdatatranslation.cpp:5211
 msgctxt "romania.kgm"
 msgid "Baia Mare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5207
+#: mapsdatatranslation.cpp:5212
 msgctxt "romania.kgm"
 msgid "Mehedinţi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5208
+#: mapsdatatranslation.cpp:5213
 msgctxt "romania.kgm"
 msgid "Drobeta-Turnu Severin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5209
+#: mapsdatatranslation.cpp:5214
 msgctxt "romania.kgm"
 msgid "Mureş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5210
+#: mapsdatatranslation.cpp:5215
 msgctxt "romania.kgm"
 msgid "Târgu Mureş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5211
+#: mapsdatatranslation.cpp:5216
 msgctxt "romania.kgm"
 msgid "Neamţ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5212
+#: mapsdatatranslation.cpp:5217
 msgctxt "romania.kgm"
 msgid "Piatra Neamţ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5213
+#: mapsdatatranslation.cpp:5218
 msgctxt "romania.kgm"
 msgid "Olt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5214
+#: mapsdatatranslation.cpp:5219
 msgctxt "romania.kgm"
 msgid "Slatina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5215
+#: mapsdatatranslation.cpp:5220
 msgctxt "romania.kgm"
 msgid "Prahova"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5216
+#: mapsdatatranslation.cpp:5221
 msgctxt "romania.kgm"
 msgid "Ploieşti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5217 mapsdatatranslation.cpp:5218
+#: mapsdatatranslation.cpp:5222 mapsdatatranslation.cpp:5223
 msgctxt "romania.kgm"
 msgid "Satu Mare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5219
+#: mapsdatatranslation.cpp:5224
 msgctxt "romania.kgm"
 msgid "Sălaj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5220
+#: mapsdatatranslation.cpp:5225
 msgctxt "romania.kgm"
 msgid "Zalău"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5221 mapsdatatranslation.cpp:5222
+#: mapsdatatranslation.cpp:5226 mapsdatatranslation.cpp:5227
 msgctxt "romania.kgm"
 msgid "Sibiu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5223 mapsdatatranslation.cpp:5224
+#: mapsdatatranslation.cpp:5228 mapsdatatranslation.cpp:5229
 msgctxt "romania.kgm"
 msgid "Suceava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5225
+#: mapsdatatranslation.cpp:5230
 msgctxt "romania.kgm"
 msgid "Teleorman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5226
+#: mapsdatatranslation.cpp:5231
 msgctxt "romania.kgm"
 msgid "Alexandria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5227
+#: mapsdatatranslation.cpp:5232
 msgctxt "romania.kgm"
 msgid "Timiş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5228
+#: mapsdatatranslation.cpp:5233
 msgctxt "romania.kgm"
 msgid "Timişoara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5229 mapsdatatranslation.cpp:5230
+#: mapsdatatranslation.cpp:5234 mapsdatatranslation.cpp:5235
 msgctxt "romania.kgm"
 msgid "Tulcea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5231 mapsdatatranslation.cpp:5232
+#: mapsdatatranslation.cpp:5236 mapsdatatranslation.cpp:5237
 msgctxt "romania.kgm"
 msgid "Vaslui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5233
+#: mapsdatatranslation.cpp:5238
 msgctxt "romania.kgm"
 msgid "Vâlcea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5234
+#: mapsdatatranslation.cpp:5239
 msgctxt "romania.kgm"
 msgid "Râmnicu Vâlcea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5235
+#: mapsdatatranslation.cpp:5240
 msgctxt "romania.kgm"
 msgid "Vrancea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5236
+#: mapsdatatranslation.cpp:5241
 msgctxt "romania.kgm"
 msgid "Focşani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5237
+#: mapsdatatranslation.cpp:5242
 msgctxt "romania.kgm"
 msgid "Bucureşti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5238
+#: mapsdatatranslation.cpp:5243
 msgctxt "romania.kgm"
 msgid "(Bucharest municipality)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5239
+#: mapsdatatranslation.cpp:5244
 msgctxt "russia_districts.kgm"
 msgid "Russia (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5240
+#: mapsdatatranslation.cpp:5245
 msgctxt "russia_districts.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5241
+#: mapsdatatranslation.cpp:5246
 msgctxt "russia_districts.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5242
+#: mapsdatatranslation.cpp:5247
 msgctxt "russia_districts.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5243
+#: mapsdatatranslation.cpp:5248
 msgctxt "russia_districts.kgm"
 msgid "Not Russia (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5244
+#: mapsdatatranslation.cpp:5249
 msgctxt "russia_districts.kgm"
 msgid "Central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5245
+#: mapsdatatranslation.cpp:5250
 msgctxt "russia_districts.kgm"
 msgid "Moscow"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5246
+#: mapsdatatranslation.cpp:5251
 msgctxt "russia_districts.kgm"
 msgid "Far Eastern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5247
+#: mapsdatatranslation.cpp:5252
 msgctxt "russia_districts.kgm"
 msgid "Khabarovsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5248
+#: mapsdatatranslation.cpp:5253
 msgctxt "russia_districts.kgm"
 msgid "Northwestern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5249
+#: mapsdatatranslation.cpp:5254
 msgctxt "russia_districts.kgm"
 msgid "St. Petersburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5250
+#: mapsdatatranslation.cpp:5255
 msgctxt "russia_districts.kgm"
 msgid "Siberian"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5251
+#: mapsdatatranslation.cpp:5256
 msgctxt "russia_districts.kgm"
 msgid "Novosibirsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5252
+#: mapsdatatranslation.cpp:5257
 msgctxt "russia_districts.kgm"
 msgid "Southern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5253
+#: mapsdatatranslation.cpp:5258
 msgctxt "russia_districts.kgm"
 msgid "Rostov-na-Donu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5254
+#: mapsdatatranslation.cpp:5259
 msgctxt "russia_districts.kgm"
 msgid "Urals"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5255
+#: mapsdatatranslation.cpp:5260
 msgctxt "russia_districts.kgm"
 msgid "Yekaterinburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5256
+#: mapsdatatranslation.cpp:5261
 msgctxt "russia_districts.kgm"
 msgid "Privolzhsky"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5257
+#: mapsdatatranslation.cpp:5262
 msgctxt "russia_districts.kgm"
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5258
+#: mapsdatatranslation.cpp:5263
 msgctxt "russia_subjects.kgm"
 msgid "Russia (Subjects)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5259
+#: mapsdatatranslation.cpp:5264
 msgctxt "russia_subjects.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5260
+#: mapsdatatranslation.cpp:5265
 msgctxt "russia_subjects.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5261
+#: mapsdatatranslation.cpp:5266
 msgctxt "russia_subjects.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5262
+#: mapsdatatranslation.cpp:5267
 msgctxt "russia_subjects.kgm"
 msgid "Not Russia (Subjects)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5263
+#: mapsdatatranslation.cpp:5268
 msgctxt "russia_subjects.kgm"
 msgid "Adygeya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5264
+#: mapsdatatranslation.cpp:5269
 msgctxt "russia_subjects.kgm"
 msgid "Maykop"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5265
+#: mapsdatatranslation.cpp:5270
 msgctxt "russia_subjects.kgm"
 msgid "Bashkortostan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5266
+#: mapsdatatranslation.cpp:5271
 msgctxt "russia_subjects.kgm"
 msgid "Ufa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5267
+#: mapsdatatranslation.cpp:5272
 msgctxt "russia_subjects.kgm"
 msgid "Buryatia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5268
+#: mapsdatatranslation.cpp:5273
 msgctxt "russia_subjects.kgm"
 msgid "Ulan-Ude"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5269
+#: mapsdatatranslation.cpp:5274
 msgctxt "russia_subjects.kgm"
 msgid "Altai Republic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5270
+#: mapsdatatranslation.cpp:5275
 msgctxt "russia_subjects.kgm"
 msgid "Gorno-Altaysk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5271
+#: mapsdatatranslation.cpp:5276
 msgctxt "russia_subjects.kgm"
 msgid "Dagestan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5272
+#: mapsdatatranslation.cpp:5277
 msgctxt "russia_subjects.kgm"
 msgid "Makhachkala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5273
+#: mapsdatatranslation.cpp:5278
 msgctxt "russia_subjects.kgm"
 msgid "Ingushetia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5274
+#: mapsdatatranslation.cpp:5279
 msgctxt "russia_subjects.kgm"
 msgid "Magas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5275
+#: mapsdatatranslation.cpp:5280
 msgctxt "russia_subjects.kgm"
 msgid "Kabardino-Balkaria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5276
+#: mapsdatatranslation.cpp:5281
 msgctxt "russia_subjects.kgm"
 msgid "Nalchik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5277
+#: mapsdatatranslation.cpp:5282
 msgctxt "russia_subjects.kgm"
 msgid "Kalmykia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5278
+#: mapsdatatranslation.cpp:5283
 msgctxt "russia_subjects.kgm"
 msgid "Elista"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5279
+#: mapsdatatranslation.cpp:5284
 msgctxt "russia_subjects.kgm"
 msgid "Karachay-Cherkessia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5280
+#: mapsdatatranslation.cpp:5285
 msgctxt "russia_subjects.kgm"
 msgid "Cherkessk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5281
+#: mapsdatatranslation.cpp:5286
 msgctxt "russia_subjects.kgm"
 msgid "Karelia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5282
+#: mapsdatatranslation.cpp:5287
 msgctxt "russia_subjects.kgm"
 msgid "Petrozavodsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5283
+#: mapsdatatranslation.cpp:5288
 msgctxt "russia_subjects.kgm"
 msgid "Komi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5284
+#: mapsdatatranslation.cpp:5289
 msgctxt "russia_subjects.kgm"
 msgid "Syktyvkar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5285
+#: mapsdatatranslation.cpp:5290
 msgctxt "russia_subjects.kgm"
 msgid "Mari El"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5286
+#: mapsdatatranslation.cpp:5291
 msgctxt "russia_subjects.kgm"
 msgid "Yoshkar-Ola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5287
+#: mapsdatatranslation.cpp:5292
 msgctxt "russia_subjects.kgm"
 msgid "Mordovia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5288
+#: mapsdatatranslation.cpp:5293
 msgctxt "russia_subjects.kgm"
 msgid "Saransk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5289
+#: mapsdatatranslation.cpp:5294
 msgctxt "russia_subjects.kgm"
 msgid "Sakha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5290
+#: mapsdatatranslation.cpp:5295
 msgctxt "russia_subjects.kgm"
 msgid "Yakutsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5291
+#: mapsdatatranslation.cpp:5296
 msgctxt "russia_subjects.kgm"
 msgid "North Ossetia-Alania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5292
+#: mapsdatatranslation.cpp:5297
 msgctxt "russia_subjects.kgm"
 msgid "Vladikavkaz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5293
+#: mapsdatatranslation.cpp:5298
 msgctxt "russia_subjects.kgm"
 msgid "Tatarstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5294
+#: mapsdatatranslation.cpp:5299
 msgctxt "russia_subjects.kgm"
 msgid "Kazan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5295
+#: mapsdatatranslation.cpp:5300
 msgctxt "russia_subjects.kgm"
 msgid "Tyva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5296
+#: mapsdatatranslation.cpp:5301
 msgctxt "russia_subjects.kgm"
 msgid "Kyzyl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5297
+#: mapsdatatranslation.cpp:5302
 msgctxt "russia_subjects.kgm"
 msgid "Udmurtia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5298
+#: mapsdatatranslation.cpp:5303
 msgctxt "russia_subjects.kgm"
 msgid "Izhevsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5299
+#: mapsdatatranslation.cpp:5304
 msgctxt "russia_subjects.kgm"
 msgid "Khakassia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5300
+#: mapsdatatranslation.cpp:5305
 msgctxt "russia_subjects.kgm"
 msgid "Abakan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5301
+#: mapsdatatranslation.cpp:5306
 msgctxt "russia_subjects.kgm"
 msgid "Chechnya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5302
+#: mapsdatatranslation.cpp:5307
 msgctxt "russia_subjects.kgm"
 msgid "Grozny"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5303
+#: mapsdatatranslation.cpp:5308
 msgctxt "russia_subjects.kgm"
 msgid "Chuvashia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5304
+#: mapsdatatranslation.cpp:5309
 msgctxt "russia_subjects.kgm"
 msgid "Cheboksary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5305
+#: mapsdatatranslation.cpp:5310
 msgctxt "russia_subjects.kgm"
 msgid "Altai Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5306
+#: mapsdatatranslation.cpp:5311
 msgctxt "russia_subjects.kgm"
 msgid "Barnaul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5307
+#: mapsdatatranslation.cpp:5312
 msgctxt "russia_subjects.kgm"
 msgid "Krasnodar Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5308
+#: mapsdatatranslation.cpp:5313
 msgctxt "russia_subjects.kgm"
 msgid "Krasnodar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5309
+#: mapsdatatranslation.cpp:5314
 msgctxt "russia_subjects.kgm"
 msgid "Krasnoyarsk Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5310
+#: mapsdatatranslation.cpp:5315
 msgctxt "russia_subjects.kgm"
 msgid "Krasnoyarsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5311
+#: mapsdatatranslation.cpp:5316
 msgctxt "russia_subjects.kgm"
 msgid "Primorsky Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5312
+#: mapsdatatranslation.cpp:5317
 msgctxt "russia_subjects.kgm"
 msgid "Vladivostok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5313
+#: mapsdatatranslation.cpp:5318
 msgctxt "russia_subjects.kgm"
 msgid "Stavropol Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5314
+#: mapsdatatranslation.cpp:5319
 msgctxt "russia_subjects.kgm"
 msgid "Stavropol"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5315
+#: mapsdatatranslation.cpp:5320
 msgctxt "russia_subjects.kgm"
 msgid "Khabarovsk Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5316
+#: mapsdatatranslation.cpp:5321
 msgctxt "russia_subjects.kgm"
 msgid "Khabarovsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5317
+#: mapsdatatranslation.cpp:5322
 msgctxt "russia_subjects.kgm"
 msgid "Perm Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5318
+#: mapsdatatranslation.cpp:5323
 msgctxt "russia_subjects.kgm"
 msgid "Perm"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5319
+#: mapsdatatranslation.cpp:5324
 msgctxt "russia_subjects.kgm"
 msgid "Amur Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5320
+#: mapsdatatranslation.cpp:5325
 msgctxt "russia_subjects.kgm"
 msgid "Blagoveshchensk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5321
+#: mapsdatatranslation.cpp:5326
 msgctxt "russia_subjects.kgm"
 msgid "Arkhangelsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5322
+#: mapsdatatranslation.cpp:5327
 msgctxt "russia_subjects.kgm"
 msgid "Arkhangelsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5323
+#: mapsdatatranslation.cpp:5328
 msgctxt "russia_subjects.kgm"
 msgid "Astrakhan Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5324
+#: mapsdatatranslation.cpp:5329
 msgctxt "russia_subjects.kgm"
 msgid "Astrakhan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5325
+#: mapsdatatranslation.cpp:5330
 msgctxt "russia_subjects.kgm"
 msgid "Belgorod Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5326
+#: mapsdatatranslation.cpp:5331
 msgctxt "russia_subjects.kgm"
 msgid "Belgorod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5327
+#: mapsdatatranslation.cpp:5332
 msgctxt "russia_subjects.kgm"
 msgid "Bryansk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5328
+#: mapsdatatranslation.cpp:5333
 msgctxt "russia_subjects.kgm"
 msgid "Bryansk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5329
+#: mapsdatatranslation.cpp:5334
 msgctxt "russia_subjects.kgm"
 msgid "Vladimir Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5330
+#: mapsdatatranslation.cpp:5335
 msgctxt "russia_subjects.kgm"
 msgid "Vladimir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5331
+#: mapsdatatranslation.cpp:5336
 msgctxt "russia_subjects.kgm"
 msgid "Volgograd Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5332
+#: mapsdatatranslation.cpp:5337
 msgctxt "russia_subjects.kgm"
 msgid "Volgograd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5333
+#: mapsdatatranslation.cpp:5338
 msgctxt "russia_subjects.kgm"
 msgid "Vologda Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5334
+#: mapsdatatranslation.cpp:5339
 msgctxt "russia_subjects.kgm"
 msgid "Vologda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5335
+#: mapsdatatranslation.cpp:5340
 msgctxt "russia_subjects.kgm"
 msgid "Voronezh Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5336
+#: mapsdatatranslation.cpp:5341
 msgctxt "russia_subjects.kgm"
 msgid "Voronezh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5337
+#: mapsdatatranslation.cpp:5342
 msgctxt "russia_subjects.kgm"
 msgid "Ivanovo Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5338
+#: mapsdatatranslation.cpp:5343
 msgctxt "russia_subjects.kgm"
 msgid "Ivanovo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5339
+#: mapsdatatranslation.cpp:5344
 msgctxt "russia_subjects.kgm"
 msgid "Irkutsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5340
+#: mapsdatatranslation.cpp:5345
 msgctxt "russia_subjects.kgm"
 msgid "Irkutsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5341
+#: mapsdatatranslation.cpp:5346
 msgctxt "russia_subjects.kgm"
 msgid "Kaliningrad Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5342
+#: mapsdatatranslation.cpp:5347
 msgctxt "russia_subjects.kgm"
 msgid "Kaliningrad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5343
+#: mapsdatatranslation.cpp:5348
 msgctxt "russia_subjects.kgm"
 msgid "Kaluga Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5344
+#: mapsdatatranslation.cpp:5349
 msgctxt "russia_subjects.kgm"
 msgid "Kaluga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5345
+#: mapsdatatranslation.cpp:5350
 msgctxt "russia_subjects.kgm"
 msgid "Kamchatka Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5346
+#: mapsdatatranslation.cpp:5351
 msgctxt "russia_subjects.kgm"
 msgid "Petropavlovsk-Kamchatsky"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5347
+#: mapsdatatranslation.cpp:5352
 msgctxt "russia_subjects.kgm"
 msgid "Kemerovo Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5348
+#: mapsdatatranslation.cpp:5353
 msgctxt "russia_subjects.kgm"
 msgid "Kemerovo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5349
+#: mapsdatatranslation.cpp:5354
 msgctxt "russia_subjects.kgm"
 msgid "Kirov Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5350
+#: mapsdatatranslation.cpp:5355
 msgctxt "russia_subjects.kgm"
 msgid "Kirov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5351
+#: mapsdatatranslation.cpp:5356
 msgctxt "russia_subjects.kgm"
 msgid "Kostroma Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5352
+#: mapsdatatranslation.cpp:5357
 msgctxt "russia_subjects.kgm"
 msgid "Kostroma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5353
+#: mapsdatatranslation.cpp:5358
 msgctxt "russia_subjects.kgm"
 msgid "Kurgan Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5354
+#: mapsdatatranslation.cpp:5359
 msgctxt "russia_subjects.kgm"
 msgid "Kurgan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5355
+#: mapsdatatranslation.cpp:5360
 msgctxt "russia_subjects.kgm"
 msgid "Kursk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5356
+#: mapsdatatranslation.cpp:5361
 msgctxt "russia_subjects.kgm"
 msgid "Kursk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5357
+#: mapsdatatranslation.cpp:5362
 msgctxt "russia_subjects.kgm"
 msgid "Leningrad Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5358 mapsdatatranslation.cpp:5417
-#: mapsdatatranslation.cpp:5418
+#: mapsdatatranslation.cpp:5363 mapsdatatranslation.cpp:5422
+#: mapsdatatranslation.cpp:5423
 msgctxt "russia_subjects.kgm"
 msgid "St. Petersburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5359
+#: mapsdatatranslation.cpp:5364
 msgctxt "russia_subjects.kgm"
 msgid "Lipetsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5360
+#: mapsdatatranslation.cpp:5365
 msgctxt "russia_subjects.kgm"
 msgid "Lipetsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5361
+#: mapsdatatranslation.cpp:5366
 msgctxt "russia_subjects.kgm"
 msgid "Magadan Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5362
+#: mapsdatatranslation.cpp:5367
 msgctxt "russia_subjects.kgm"
 msgid "Magadan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5363
+#: mapsdatatranslation.cpp:5368
 msgctxt "russia_subjects.kgm"
 msgid "Moscow Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5364 mapsdatatranslation.cpp:5415
-#: mapsdatatranslation.cpp:5416
+#: mapsdatatranslation.cpp:5369 mapsdatatranslation.cpp:5420
+#: mapsdatatranslation.cpp:5421
 msgctxt "russia_subjects.kgm"
 msgid "Moscow"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5365
+#: mapsdatatranslation.cpp:5370
 msgctxt "russia_subjects.kgm"
 msgid "Murmansk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5366
+#: mapsdatatranslation.cpp:5371
 msgctxt "russia_subjects.kgm"
 msgid "Murmansk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5367
+#: mapsdatatranslation.cpp:5372
 msgctxt "russia_subjects.kgm"
 msgid "Nizhny Novgorod Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5368
+#: mapsdatatranslation.cpp:5373
 msgctxt "russia_subjects.kgm"
 msgid "Nizhny Novgorod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5369
+#: mapsdatatranslation.cpp:5374
 msgctxt "russia_subjects.kgm"
 msgid "Novgorod Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5370
+#: mapsdatatranslation.cpp:5375
 msgctxt "russia_subjects.kgm"
 msgid "Novgorod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5371
+#: mapsdatatranslation.cpp:5376
 msgctxt "russia_subjects.kgm"
 msgid "Novosibirsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5372
+#: mapsdatatranslation.cpp:5377
 msgctxt "russia_subjects.kgm"
 msgid "Novosibirsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5373
+#: mapsdatatranslation.cpp:5378
 msgctxt "russia_subjects.kgm"
 msgid "Omsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5374
+#: mapsdatatranslation.cpp:5379
 msgctxt "russia_subjects.kgm"
 msgid "Omsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5375
+#: mapsdatatranslation.cpp:5380
 msgctxt "russia_subjects.kgm"
 msgid "Orenburg Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5376
+#: mapsdatatranslation.cpp:5381
 msgctxt "russia_subjects.kgm"
 msgid "Orenburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5377
+#: mapsdatatranslation.cpp:5382
 msgctxt "russia_subjects.kgm"
 msgid "Oryol Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5378
+#: mapsdatatranslation.cpp:5383
 msgctxt "russia_subjects.kgm"
 msgid "Oryol"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5379
+#: mapsdatatranslation.cpp:5384
 msgctxt "russia_subjects.kgm"
 msgid "Penza Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5380
+#: mapsdatatranslation.cpp:5385
 msgctxt "russia_subjects.kgm"
 msgid "Penza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5381
+#: mapsdatatranslation.cpp:5386
 msgctxt "russia_subjects.kgm"
 msgid "Pskov Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5382
+#: mapsdatatranslation.cpp:5387
 msgctxt "russia_subjects.kgm"
 msgid "Pskov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5383
+#: mapsdatatranslation.cpp:5388
 msgctxt "russia_subjects.kgm"
 msgid "Rostov Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5384
+#: mapsdatatranslation.cpp:5389
 msgctxt "russia_subjects.kgm"
 msgid "Rostov-na-Donu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5385
+#: mapsdatatranslation.cpp:5390
 msgctxt "russia_subjects.kgm"
 msgid "Ryazan Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5386
+#: mapsdatatranslation.cpp:5391
 msgctxt "russia_subjects.kgm"
 msgid "Ryazan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5387
+#: mapsdatatranslation.cpp:5392
 msgctxt "russia_subjects.kgm"
 msgid "Samara Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5388
+#: mapsdatatranslation.cpp:5393
 msgctxt "russia_subjects.kgm"
 msgid "Samara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5389
+#: mapsdatatranslation.cpp:5394
 msgctxt "russia_subjects.kgm"
 msgid "Saratov Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5390
+#: mapsdatatranslation.cpp:5395
 msgctxt "russia_subjects.kgm"
 msgid "Saratov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5391
+#: mapsdatatranslation.cpp:5396
 msgctxt "russia_subjects.kgm"
 msgid "Sakhalin Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5392
+#: mapsdatatranslation.cpp:5397
 msgctxt "russia_subjects.kgm"
 msgid "Yuzhno-Sakhalinsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5393
+#: mapsdatatranslation.cpp:5398
 msgctxt "russia_subjects.kgm"
 msgid "Sverdlovsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5394
+#: mapsdatatranslation.cpp:5399
 msgctxt "russia_subjects.kgm"
 msgid "Yekaterinburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5395
+#: mapsdatatranslation.cpp:5400
 msgctxt "russia_subjects.kgm"
 msgid "Smolensk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5396
+#: mapsdatatranslation.cpp:5401
 msgctxt "russia_subjects.kgm"
 msgid "Smolensk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5397
+#: mapsdatatranslation.cpp:5402
 msgctxt "russia_subjects.kgm"
 msgid "Tambov Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5398
+#: mapsdatatranslation.cpp:5403
 msgctxt "russia_subjects.kgm"
 msgid "Tambov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5399
+#: mapsdatatranslation.cpp:5404
 msgctxt "russia_subjects.kgm"
 msgid "Tver Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5400
+#: mapsdatatranslation.cpp:5405
 msgctxt "russia_subjects.kgm"
 msgid "Tver"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5401
+#: mapsdatatranslation.cpp:5406
 msgctxt "russia_subjects.kgm"
 msgid "Tomsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5402
+#: mapsdatatranslation.cpp:5407
 msgctxt "russia_subjects.kgm"
 msgid "Tomsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5403
+#: mapsdatatranslation.cpp:5408
 msgctxt "russia_subjects.kgm"
 msgid "Tula Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5404
+#: mapsdatatranslation.cpp:5409
 msgctxt "russia_subjects.kgm"
 msgid "Tula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5405
+#: mapsdatatranslation.cpp:5410
 msgctxt "russia_subjects.kgm"
 msgid "Tyumen Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5406
+#: mapsdatatranslation.cpp:5411
 msgctxt "russia_subjects.kgm"
 msgid "Tyumen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5407
+#: mapsdatatranslation.cpp:5412
 msgctxt "russia_subjects.kgm"
 msgid "Ulyanovsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5408
+#: mapsdatatranslation.cpp:5413
 msgctxt "russia_subjects.kgm"
 msgid "Ulyanovsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5409
+#: mapsdatatranslation.cpp:5414
 msgctxt "russia_subjects.kgm"
 msgid "Chelyabinsk Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5410
+#: mapsdatatranslation.cpp:5415
 msgctxt "russia_subjects.kgm"
 msgid "Chelyabinsk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5411
+#: mapsdatatranslation.cpp:5416
 msgctxt "russia_subjects.kgm"
 msgid "Zabaykalsky Krai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5412
+#: mapsdatatranslation.cpp:5417
 msgctxt "russia_subjects.kgm"
 msgid "Chita"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5413
+#: mapsdatatranslation.cpp:5418
 msgctxt "russia_subjects.kgm"
 msgid "Yaroslavl Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5414
+#: mapsdatatranslation.cpp:5419
 msgctxt "russia_subjects.kgm"
 msgid "Yaroslavl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5419
+#: mapsdatatranslation.cpp:5424
 msgctxt "russia_subjects.kgm"
 msgid "Jewish Autonomous Oblast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5420
+#: mapsdatatranslation.cpp:5425
 msgctxt "russia_subjects.kgm"
 msgid "Birobidzhan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5421
+#: mapsdatatranslation.cpp:5426
 msgctxt "russia_subjects.kgm"
 msgid "Nenetsia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5422
+#: mapsdatatranslation.cpp:5427
 msgctxt "russia_subjects.kgm"
 msgid "Naryan-Mar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5423
+#: mapsdatatranslation.cpp:5428
 msgctxt "russia_subjects.kgm"
 msgid "Khantia-Mansia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5424
+#: mapsdatatranslation.cpp:5429
 msgctxt "russia_subjects.kgm"
 msgid "Khanty-Mansiysk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5425
+#: mapsdatatranslation.cpp:5430
 msgctxt "russia_subjects.kgm"
 msgid "Chukotka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5426
+#: mapsdatatranslation.cpp:5431
 msgctxt "russia_subjects.kgm"
 msgid "Anadyr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5427
+#: mapsdatatranslation.cpp:5432
 msgctxt "russia_subjects.kgm"
 msgid "Yamalia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5428
+#: mapsdatatranslation.cpp:5433
 msgctxt "russia_subjects.kgm"
 msgid "Salekhard"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5429
+#: mapsdatatranslation.cpp:5434
 msgctxt "san-marino.kgm"
 msgid "San Marino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5430
+#: mapsdatatranslation.cpp:5435
 msgctxt "san-marino.kgm"
 msgid "Municipalities"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5431
+#: mapsdatatranslation.cpp:5436
 msgctxt "san-marino.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5432
+#: mapsdatatranslation.cpp:5437
 msgctxt "san-marino.kgm"
 msgid "Not San-Marino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5433
+#: mapsdatatranslation.cpp:5438
 msgctxt "san-marino.kgm"
 msgid "Acquaviva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5434
+#: mapsdatatranslation.cpp:5439
 msgctxt "san-marino.kgm"
 msgid "Città di San Marino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5435
+#: mapsdatatranslation.cpp:5440
 msgctxt "san-marino.kgm"
 msgid "Chiesanouva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5436
+#: mapsdatatranslation.cpp:5441
 msgctxt "san-marino.kgm"
 msgid "Fiorentino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5437
+#: mapsdatatranslation.cpp:5442
 msgctxt "san-marino.kgm"
 msgid "Montegiardino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5438
+#: mapsdatatranslation.cpp:5443
 msgctxt "san-marino.kgm"
 msgid "Featano"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5439
+#: mapsdatatranslation.cpp:5444
 msgctxt "san-marino.kgm"
 msgid "Domagnano"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5440
+#: mapsdatatranslation.cpp:5445
 msgctxt "san-marino.kgm"
 msgid "Serravalle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5441
+#: mapsdatatranslation.cpp:5446
 msgctxt "san-marino.kgm"
 msgid "Borgo Maggiore"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5442
+#: mapsdatatranslation.cpp:5447
 msgctxt "saudi_arabia.kgm"
 msgid "Saudi Arabia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5443
+#: mapsdatatranslation.cpp:5448
 msgctxt "saudi_arabia.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5444
+#: mapsdatatranslation.cpp:5449
 msgctxt "saudi_arabia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5445
+#: mapsdatatranslation.cpp:5450
 msgctxt "saudi_arabia.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5446
+#: mapsdatatranslation.cpp:5451
 msgctxt "saudi_arabia.kgm"
 msgid "Not Saudi (Arabia)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5447
+#: mapsdatatranslation.cpp:5452
 msgctxt "saudi_arabia.kgm"
 msgid "Al-Bahah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5448
+#: mapsdatatranslation.cpp:5453
 msgctxt "saudi_arabia.kgm"
 msgid "Al Hudud ash Shamaliyah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5449
+#: mapsdatatranslation.cpp:5454
 msgctxt "saudi_arabia.kgm"
 msgid "Al Jawf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5450
+#: mapsdatatranslation.cpp:5455
 msgctxt "saudi_arabia.kgm"
 msgid "Al Madinah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5451
+#: mapsdatatranslation.cpp:5456
 msgctxt "saudi_arabia.kgm"
 msgid "Al Gassim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5452
+#: mapsdatatranslation.cpp:5457
 msgctxt "saudi_arabia.kgm"
 msgid "Ar-Riyad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5453
+#: mapsdatatranslation.cpp:5458
 msgctxt "saudi_arabia.kgm"
 msgid "Ash-Sharqiyah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5454
+#: mapsdatatranslation.cpp:5459
 msgctxt "saudi_arabia.kgm"
 msgid "'Asir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5455
+#: mapsdatatranslation.cpp:5460
 msgctxt "saudi_arabia.kgm"
 msgid "Ha'il"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5456
+#: mapsdatatranslation.cpp:5461
 msgctxt "saudi_arabia.kgm"
 msgid "Jizan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5457
+#: mapsdatatranslation.cpp:5462
 msgctxt "saudi_arabia.kgm"
 msgid "Makkah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5458
+#: mapsdatatranslation.cpp:5463
 msgctxt "saudi_arabia.kgm"
 msgid "Najran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5459
+#: mapsdatatranslation.cpp:5464
 msgctxt "saudi_arabia.kgm"
 msgid "Tabuk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5460
+#: mapsdatatranslation.cpp:5465
 msgctxt "sikkim.kgm"
 msgid "Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5461
+#: mapsdatatranslation.cpp:5466
 msgctxt "sikkim.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5462
+#: mapsdatatranslation.cpp:5467
 msgctxt "sikkim.kgm"
 msgid "Not Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5463
+#: mapsdatatranslation.cpp:5468
 msgctxt "sikkim.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5464
+#: mapsdatatranslation.cpp:5469
 msgctxt "sikkim.kgm"
 msgid "North Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5465
+#: mapsdatatranslation.cpp:5470
 msgctxt "sikkim.kgm"
 msgid "Mangan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5466
+#: mapsdatatranslation.cpp:5471
 msgctxt "sikkim.kgm"
 msgid "West Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5467
+#: mapsdatatranslation.cpp:5472
 msgctxt "sikkim.kgm"
 msgid "Geyzing"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5468
+#: mapsdatatranslation.cpp:5473
 msgctxt "sikkim.kgm"
 msgid "South Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5469
+#: mapsdatatranslation.cpp:5474
 msgctxt "sikkim.kgm"
 msgid "Namchi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5470
+#: mapsdatatranslation.cpp:5475
 msgctxt "sikkim.kgm"
 msgid "East Sikkim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5471
+#: mapsdatatranslation.cpp:5476
 msgctxt "sikkim.kgm"
 msgid "Gangtok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5472
+#: mapsdatatranslation.cpp:5477
 msgctxt "slovakia.kgm"
 msgid "Slovakia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5473
+#: mapsdatatranslation.cpp:5478
 msgctxt "slovakia.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5474 mapsdatatranslation.cpp:5475
+#: mapsdatatranslation.cpp:5479 mapsdatatranslation.cpp:5480
 msgctxt "slovakia.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5476
+#: mapsdatatranslation.cpp:5481
 msgctxt "slovakia.kgm"
 msgid "Not Slovakia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5477
+#: mapsdatatranslation.cpp:5482
 msgctxt "slovakia.kgm"
 msgid "Bratislava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5478
+#: mapsdatatranslation.cpp:5483
 msgctxt "slovakia.kgm"
 msgid "Trnava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5479
+#: mapsdatatranslation.cpp:5484
 msgctxt "slovakia.kgm"
 msgid "Trenčín"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5480
+#: mapsdatatranslation.cpp:5485
 msgctxt "slovakia.kgm"
 msgid "Nitra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5481
+#: mapsdatatranslation.cpp:5486
 msgctxt "slovakia.kgm"
 msgid "Žilina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5482
+#: mapsdatatranslation.cpp:5487
 msgctxt "slovakia.kgm"
 msgid "Banská Bystrica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5483
+#: mapsdatatranslation.cpp:5488
 msgctxt "slovakia.kgm"
 msgid "Prešov"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5484
+#: mapsdatatranslation.cpp:5489
 msgctxt "slovakia.kgm"
 msgid "Košice"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5485
+#: mapsdatatranslation.cpp:5490
 msgctxt "slovenia_traditional.kgm"
 msgid "Slovenia (Traditional)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5486
+#: mapsdatatranslation.cpp:5491
 msgctxt "slovenia_traditional.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5487
+#: mapsdatatranslation.cpp:5492
 msgctxt "slovenia_traditional.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5488
+#: mapsdatatranslation.cpp:5493
 msgctxt "slovenia_traditional.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5489
+#: mapsdatatranslation.cpp:5494
 msgctxt "slovenia_traditional.kgm"
 msgid "Not Slovenia (Traditional)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5490
+#: mapsdatatranslation.cpp:5495
 msgctxt "slovenia_traditional.kgm"
 msgid "Upper Carniola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5491
+#: mapsdatatranslation.cpp:5496
 msgctxt "slovenia_traditional.kgm"
 msgid "Kranj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5492
+#: mapsdatatranslation.cpp:5497
 msgctxt "slovenia_traditional.kgm"
 msgid "Styria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5493
+#: mapsdatatranslation.cpp:5498
 msgctxt "slovenia_traditional.kgm"
 msgid "Maribor"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5494
+#: mapsdatatranslation.cpp:5499
 msgctxt "slovenia_traditional.kgm"
 msgid "Prekmurje"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5495
+#: mapsdatatranslation.cpp:5500
 msgctxt "slovenia_traditional.kgm"
 msgid "Murska Sobota"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5496
+#: mapsdatatranslation.cpp:5501
 msgctxt "slovenia_traditional.kgm"
 msgid "Carinthia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5497
+#: mapsdatatranslation.cpp:5502
 msgctxt "slovenia_traditional.kgm"
 msgid "Dravograd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5498
+#: mapsdatatranslation.cpp:5503
 msgctxt "slovenia_traditional.kgm"
 msgid "Inner Carniola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5499
+#: mapsdatatranslation.cpp:5504
 msgctxt "slovenia_traditional.kgm"
 msgid "Postojna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5500
+#: mapsdatatranslation.cpp:5505
 msgctxt "slovenia_traditional.kgm"
 msgid "Lower Carniola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5501
+#: mapsdatatranslation.cpp:5506
 msgctxt "slovenia_traditional.kgm"
 msgid "Novo Mesto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5502
+#: mapsdatatranslation.cpp:5507
 msgctxt "slovenia_traditional.kgm"
 msgid "Goriška"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5503
+#: mapsdatatranslation.cpp:5508
 msgctxt "slovenia_traditional.kgm"
 msgid "Nova Gorica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5504
+#: mapsdatatranslation.cpp:5509
 msgctxt "slovenia_traditional.kgm"
 msgid "Slovenian Istria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5505
+#: mapsdatatranslation.cpp:5510
 msgctxt "slovenia_traditional.kgm"
 msgid "Koper"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5506
+#: mapsdatatranslation.cpp:5511
 msgctxt "south_africa.kgm"
 msgid "South Africa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5507
+#: mapsdatatranslation.cpp:5512
 msgctxt "south_africa.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5508
+#: mapsdatatranslation.cpp:5513
 msgctxt "south_africa.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5509
+#: mapsdatatranslation.cpp:5514
 msgctxt "south_africa.kgm"
 msgid "Not South Africa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5510
+#: mapsdatatranslation.cpp:5515
 msgctxt "south_africa.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5511
+#: mapsdatatranslation.cpp:5516
 msgctxt "south_africa.kgm"
 msgid "Eastern Cape"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5512
+#: mapsdatatranslation.cpp:5517
 msgctxt "south_africa.kgm"
 msgid "Bisho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5513
+#: mapsdatatranslation.cpp:5518
 msgctxt "south_africa.kgm"
 msgid "Free State"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5514
+#: mapsdatatranslation.cpp:5519
 msgctxt "south_africa.kgm"
 msgid "Bloemfontein"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5515
+#: mapsdatatranslation.cpp:5520
 msgctxt "south_africa.kgm"
 msgid "Gauteng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5516
+#: mapsdatatranslation.cpp:5521
 msgctxt "south_africa.kgm"
 msgid "Johannesburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5517
+#: mapsdatatranslation.cpp:5522
 msgctxt "south_africa.kgm"
 msgid "KwaZulu-Natal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5518
+#: mapsdatatranslation.cpp:5523
 msgctxt "south_africa.kgm"
 msgid "Pietermaritzburg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5519
+#: mapsdatatranslation.cpp:5524
 msgctxt "south_africa.kgm"
 msgid "Mpumalanga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5520
+#: mapsdatatranslation.cpp:5525
 msgctxt "south_africa.kgm"
 msgid "Nelspruit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5521
+#: mapsdatatranslation.cpp:5526
 msgctxt "south_africa.kgm"
 msgid "Limpopo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5522
+#: mapsdatatranslation.cpp:5527
 msgctxt "south_africa.kgm"
 msgid "Polokwane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5523
+#: mapsdatatranslation.cpp:5528
 msgctxt "south_africa.kgm"
 msgid "Northern Cape"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5524
+#: mapsdatatranslation.cpp:5529
 msgctxt "south_africa.kgm"
 msgid "Kimberley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5525
+#: mapsdatatranslation.cpp:5530
 msgctxt "south_africa.kgm"
 msgid "North West"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5526
+#: mapsdatatranslation.cpp:5531
 msgctxt "south_africa.kgm"
 msgid "Mafikeng"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5527
+#: mapsdatatranslation.cpp:5532
 msgctxt "south_africa.kgm"
 msgid "Western Cape"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5528
+#: mapsdatatranslation.cpp:5533
 msgctxt "south_africa.kgm"
 msgid "Cape Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5529
+#: mapsdatatranslation.cpp:5534
 msgctxt "southamerica.kgm"
 msgid "South America"
 msgstr "South America"
 
-#: mapsdatatranslation.cpp:5530
+#: mapsdatatranslation.cpp:5535
 msgctxt "southamerica.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5531
+#: mapsdatatranslation.cpp:5536
 msgctxt "southamerica.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:5532
+#: mapsdatatranslation.cpp:5537
 msgctxt "southamerica.kgm"
 msgid "Water"
 msgstr "Dŵr"
 
-#: mapsdatatranslation.cpp:5533
+#: mapsdatatranslation.cpp:5538
 msgctxt "southamerica.kgm"
 msgid "Coast"
 msgstr "Arfordir"
 
-#: mapsdatatranslation.cpp:5534
+#: mapsdatatranslation.cpp:5539
 msgctxt "southamerica.kgm"
 msgid "Panama"
 msgstr "Panama"
 
-#: mapsdatatranslation.cpp:5535
+#: mapsdatatranslation.cpp:5540
 msgctxt "southamerica.kgm"
 msgid "Colombia"
 msgstr "Colombia"
 
-#: mapsdatatranslation.cpp:5536
+#: mapsdatatranslation.cpp:5541
 msgctxt "southamerica.kgm"
 msgid "Bogotá"
 msgstr "Bogotá"
 
-#: mapsdatatranslation.cpp:5537
+#: mapsdatatranslation.cpp:5542
 msgctxt "southamerica.kgm"
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: mapsdatatranslation.cpp:5538
+#: mapsdatatranslation.cpp:5543
 msgctxt "southamerica.kgm"
 msgid "Caracas"
 msgstr "Caracas"
 
-#: mapsdatatranslation.cpp:5539
+#: mapsdatatranslation.cpp:5544
 msgctxt "southamerica.kgm"
 msgid "Guyana"
 msgstr "Guyana"
 
-#: mapsdatatranslation.cpp:5540
+#: mapsdatatranslation.cpp:5545
 msgctxt "southamerica.kgm"
 msgid "Georgetown"
 msgstr "Georgetown"
 
-#: mapsdatatranslation.cpp:5541
+#: mapsdatatranslation.cpp:5546
 msgctxt "southamerica.kgm"
 msgid "Suriname"
 msgstr "Suriname"
 
-#: mapsdatatranslation.cpp:5542
+#: mapsdatatranslation.cpp:5547
 msgctxt "southamerica.kgm"
 msgid "Paramaribo"
 msgstr "Paramaribo"
 
-#: mapsdatatranslation.cpp:5543
+#: mapsdatatranslation.cpp:5548
 msgctxt "southamerica.kgm"
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: mapsdatatranslation.cpp:5544
+#: mapsdatatranslation.cpp:5549
 msgctxt "southamerica.kgm"
 msgid "Cayenne"
 msgstr "Cayenne"
 
-#: mapsdatatranslation.cpp:5545
+#: mapsdatatranslation.cpp:5550
 msgctxt "southamerica.kgm"
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: mapsdatatranslation.cpp:5546
+#: mapsdatatranslation.cpp:5551
 msgctxt "southamerica.kgm"
 msgid "Quito"
 msgstr "Quito"
 
-#: mapsdatatranslation.cpp:5547
+#: mapsdatatranslation.cpp:5552
 msgctxt "southamerica.kgm"
 msgid "Peru"
 msgstr "Peru"
 
-#: mapsdatatranslation.cpp:5548
+#: mapsdatatranslation.cpp:5553
 msgctxt "southamerica.kgm"
 msgid "Lima"
 msgstr "Lima"
 
-#: mapsdatatranslation.cpp:5549
+#: mapsdatatranslation.cpp:5554
 msgctxt "southamerica.kgm"
 msgid "Brazil"
 msgstr "Brasil"
 
-#: mapsdatatranslation.cpp:5550
+#: mapsdatatranslation.cpp:5555
 msgctxt "southamerica.kgm"
 msgid "Brasilia"
 msgstr "Brasilia"
 
-#: mapsdatatranslation.cpp:5551
+#: mapsdatatranslation.cpp:5556
 msgctxt "southamerica.kgm"
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: mapsdatatranslation.cpp:5552
+#: mapsdatatranslation.cpp:5557
 msgctxt "southamerica.kgm"
 msgid "La Paz"
 msgstr "La Paz"
 
-#: mapsdatatranslation.cpp:5553
+#: mapsdatatranslation.cpp:5558
 msgctxt "southamerica.kgm"
 msgid "Chile"
 msgstr "Chile"
 
-#: mapsdatatranslation.cpp:5554
+#: mapsdatatranslation.cpp:5559
 msgctxt "southamerica.kgm"
 msgid "Santiago"
 msgstr "Santiago"
 
-#: mapsdatatranslation.cpp:5555
+#: mapsdatatranslation.cpp:5560
 msgctxt "southamerica.kgm"
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: mapsdatatranslation.cpp:5556
+#: mapsdatatranslation.cpp:5561
 msgctxt "southamerica.kgm"
 msgid "Asunción"
 msgstr "Asunción"
 
-#: mapsdatatranslation.cpp:5557
+#: mapsdatatranslation.cpp:5562
 msgctxt "southamerica.kgm"
 msgid "Argentina"
 msgstr "Argentina"
 
-#: mapsdatatranslation.cpp:5558
+#: mapsdatatranslation.cpp:5563
 msgctxt "southamerica.kgm"
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: mapsdatatranslation.cpp:5559
+#: mapsdatatranslation.cpp:5564
 msgctxt "southamerica.kgm"
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: mapsdatatranslation.cpp:5560
+#: mapsdatatranslation.cpp:5565
 msgctxt "southamerica.kgm"
 msgid "Montevideo"
 msgstr "Montevideo"
 
-#: mapsdatatranslation.cpp:5561
+#: mapsdatatranslation.cpp:5566
 msgctxt "southkorea.kgm"
 msgid "Republic of Korea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5562
+#: mapsdatatranslation.cpp:5567
 msgctxt "southkorea.kgm"
 msgid "Regions"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5563
+#: mapsdatatranslation.cpp:5568
 msgctxt "southkorea.kgm"
 msgid "Out of Bounds"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5564
+#: mapsdatatranslation.cpp:5569
 msgctxt "southkorea.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5565
+#: mapsdatatranslation.cpp:5570
 msgctxt "southkorea.kgm"
 msgid "Chungcheongbuk-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5566
+#: mapsdatatranslation.cpp:5571
 msgctxt "southkorea.kgm"
 msgid "Cheongju"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5567
+#: mapsdatatranslation.cpp:5572
 msgctxt "southkorea.kgm"
 msgid "Chungcheongnam-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5568 mapsdatatranslation.cpp:5569
+#: mapsdatatranslation.cpp:5573 mapsdatatranslation.cpp:5574
 msgctxt "southkorea.kgm"
 msgid "Daejon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5570
+#: mapsdatatranslation.cpp:5575
 msgctxt "southkorea.kgm"
 msgid "Jeollabuk-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5571
+#: mapsdatatranslation.cpp:5576
 msgctxt "southkorea.kgm"
 msgid "Jeonju"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5572
+#: mapsdatatranslation.cpp:5577
 msgctxt "southkorea.kgm"
 msgid "Jeollanam-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5573
+#: mapsdatatranslation.cpp:5578
 msgctxt "southkorea.kgm"
 msgid "Muan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5574
+#: mapsdatatranslation.cpp:5579
 msgctxt "southkorea.kgm"
 msgid "Jeju-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5575
+#: mapsdatatranslation.cpp:5580
 msgctxt "southkorea.kgm"
 msgid "Jeju"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5576
+#: mapsdatatranslation.cpp:5581
 msgctxt "southkorea.kgm"
 msgid "Gyeongsangnam-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5577
+#: mapsdatatranslation.cpp:5582
 msgctxt "southkorea.kgm"
 msgid "Changwon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5578
+#: mapsdatatranslation.cpp:5583
 msgctxt "southkorea.kgm"
 msgid "Gyeongsangbuk-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5579 mapsdatatranslation.cpp:5580
+#: mapsdatatranslation.cpp:5584 mapsdatatranslation.cpp:5585
 msgctxt "southkorea.kgm"
 msgid "Daegu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5581
+#: mapsdatatranslation.cpp:5586
 msgctxt "southkorea.kgm"
 msgid "Gangwon-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5582
+#: mapsdatatranslation.cpp:5587
 msgctxt "southkorea.kgm"
 msgid "Chuncheon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5583
+#: mapsdatatranslation.cpp:5588
 msgctxt "southkorea.kgm"
 msgid "Gyeonggi-do"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5584
+#: mapsdatatranslation.cpp:5589
 msgctxt "southkorea.kgm"
 msgid "Suwon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5585
+#: mapsdatatranslation.cpp:5590
 msgctxt "southkorea.kgm"
 msgid "Ulsan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5586
+#: mapsdatatranslation.cpp:5591
 msgctxt "southkorea.kgm"
 msgid "Gwangju"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5587
+#: mapsdatatranslation.cpp:5592
 msgctxt "southkorea.kgm"
 msgid "Busan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5588
+#: mapsdatatranslation.cpp:5593
 msgctxt "southkorea.kgm"
 msgid "Seoul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5589
+#: mapsdatatranslation.cpp:5594
 msgctxt "southkorea.kgm"
 msgid "Incheon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5590
+#: mapsdatatranslation.cpp:5595
 msgctxt "spain.kgm"
 msgid "Spain"
 msgstr "Sbaen"
 
-#: mapsdatatranslation.cpp:5591
+#: mapsdatatranslation.cpp:5596
 msgctxt "spain.kgm"
 msgid "Autonomous communities"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5592
+#: mapsdatatranslation.cpp:5597
 msgctxt "spain.kgm"
 msgid "Not Spain"
 msgstr "Not Sbaen"
 
-#: mapsdatatranslation.cpp:5593
+#: mapsdatatranslation.cpp:5598
 msgctxt "spain.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:5594
+#: mapsdatatranslation.cpp:5599
 msgctxt "spain.kgm"
 msgid "External frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5595
+#: mapsdatatranslation.cpp:5600
 msgctxt "spain.kgm"
 msgid "Andalucia"
 msgstr "Andalucia"
 
-#: mapsdatatranslation.cpp:5596
+#: mapsdatatranslation.cpp:5601
 msgctxt "spain.kgm"
 msgid "Seville"
 msgstr "Seville"
 
-#: mapsdatatranslation.cpp:5597
+#: mapsdatatranslation.cpp:5602
 msgctxt "spain.kgm"
 msgid "Aragon"
 msgstr "Aragon"
 
-#: mapsdatatranslation.cpp:5598
+#: mapsdatatranslation.cpp:5603
 msgctxt "spain.kgm"
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: mapsdatatranslation.cpp:5599
+#: mapsdatatranslation.cpp:5604
 msgctxt "spain.kgm"
 msgid "Asturias"
 msgstr "Asturias"
 
-#: mapsdatatranslation.cpp:5600
+#: mapsdatatranslation.cpp:5605
 msgctxt "spain.kgm"
 msgid "Oviedo"
 msgstr "Oviedo"
 
-#: mapsdatatranslation.cpp:5601
+#: mapsdatatranslation.cpp:5606
 msgctxt "spain.kgm"
 msgid "Balearic Islands"
 msgstr "Balearic Islands"
 
-#: mapsdatatranslation.cpp:5602
+#: mapsdatatranslation.cpp:5607
 msgctxt "spain.kgm"
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: mapsdatatranslation.cpp:5603
+#: mapsdatatranslation.cpp:5608
 msgctxt "spain.kgm"
 msgid "Basque Country"
 msgstr "Basque Country"
 
-#: mapsdatatranslation.cpp:5604
+#: mapsdatatranslation.cpp:5609
 msgctxt "spain.kgm"
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: mapsdatatranslation.cpp:5605
+#: mapsdatatranslation.cpp:5610
 msgctxt "spain.kgm"
 msgid "Canary Islands"
 msgstr "Canary Islands"
 
-#: mapsdatatranslation.cpp:5606
+#: mapsdatatranslation.cpp:5611
 msgctxt "spain.kgm"
 msgid "Las Palmas de Gran Canaria and Santa Cruz de Tenerife"
 msgstr "Las Palmas de Gran Canaria and Santa Cruz de Tenerife"
 
-#: mapsdatatranslation.cpp:5607
+#: mapsdatatranslation.cpp:5612
 msgctxt "spain.kgm"
 msgid "Cantabria"
 msgstr "Cantabria"
 
-#: mapsdatatranslation.cpp:5608
+#: mapsdatatranslation.cpp:5613
 msgctxt "spain.kgm"
 msgid "Santander"
 msgstr "Santander"
 
-#: mapsdatatranslation.cpp:5609
+#: mapsdatatranslation.cpp:5614
 msgctxt "spain.kgm"
 msgid "Castile-La Mancha"
 msgstr "Castile-La Mancha"
 
-#: mapsdatatranslation.cpp:5610
+#: mapsdatatranslation.cpp:5615
 msgctxt "spain.kgm"
 msgid "Toledo"
 msgstr "Toledo"
 
-#: mapsdatatranslation.cpp:5611
+#: mapsdatatranslation.cpp:5616
 msgctxt "spain.kgm"
 msgid "Castile and Leon"
 msgstr "Castile and Leon"
 
-#: mapsdatatranslation.cpp:5612
+#: mapsdatatranslation.cpp:5617
 msgctxt "spain.kgm"
 msgid "Valladolid"
 msgstr "Valladolid"
 
-#: mapsdatatranslation.cpp:5613
+#: mapsdatatranslation.cpp:5618
 msgctxt "spain.kgm"
 msgid "Catalonia"
 msgstr "Catalonia"
 
-#: mapsdatatranslation.cpp:5614
+#: mapsdatatranslation.cpp:5619
 msgctxt "spain.kgm"
 msgid "Barcelona"
 msgstr "Barcelona"
 
-#: mapsdatatranslation.cpp:5615
+#: mapsdatatranslation.cpp:5620
 msgctxt "spain.kgm"
 msgid "Extremadura"
 msgstr "Extremadura"
 
-#: mapsdatatranslation.cpp:5616
+#: mapsdatatranslation.cpp:5621
 msgctxt "spain.kgm"
 msgid "Mérida"
 msgstr "Mérida"
 
-#: mapsdatatranslation.cpp:5617
+#: mapsdatatranslation.cpp:5622
 msgctxt "spain.kgm"
 msgid "Galicia"
 msgstr "Galicia"
 
-#: mapsdatatranslation.cpp:5618
+#: mapsdatatranslation.cpp:5623
 msgctxt "spain.kgm"
 msgid "Santiago de Compostela"
 msgstr "Santiago de Compostela"
 
-#: mapsdatatranslation.cpp:5619
+#: mapsdatatranslation.cpp:5624
 msgctxt "spain.kgm"
 msgid "La Rioja"
 msgstr "La Rioja"
 
-#: mapsdatatranslation.cpp:5620
+#: mapsdatatranslation.cpp:5625
 msgctxt "spain.kgm"
 msgid "Logroño"
 msgstr "Logroño"
 
-#: mapsdatatranslation.cpp:5621 mapsdatatranslation.cpp:5622
+#: mapsdatatranslation.cpp:5626 mapsdatatranslation.cpp:5627
 msgctxt "spain.kgm"
 msgid "Madrid"
 msgstr "Madrid"
 
-#: mapsdatatranslation.cpp:5623 mapsdatatranslation.cpp:5624
+#: mapsdatatranslation.cpp:5628 mapsdatatranslation.cpp:5629
 msgctxt "spain.kgm"
 msgid "Murcia"
 msgstr "Murcia"
 
-#: mapsdatatranslation.cpp:5625
+#: mapsdatatranslation.cpp:5630
 msgctxt "spain.kgm"
 msgid "Navarre"
 msgstr "Navarre"
 
-#: mapsdatatranslation.cpp:5626
+#: mapsdatatranslation.cpp:5631
 msgctxt "spain.kgm"
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: mapsdatatranslation.cpp:5627
+#: mapsdatatranslation.cpp:5632
 msgctxt "spain.kgm"
 msgid "Valencian Community"
 msgstr "Valencian Community"
 
-#: mapsdatatranslation.cpp:5628
+#: mapsdatatranslation.cpp:5633
 msgctxt "spain.kgm"
 msgid "Valencia"
 msgstr "Valencia"
 
-#: mapsdatatranslation.cpp:5629
+#: mapsdatatranslation.cpp:5634
 msgctxt "spain_provinces.kgm"
 msgid "Spain (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5630
+#: mapsdatatranslation.cpp:5635
 msgctxt "spain_provinces.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5631 mapsdatatranslation.cpp:5632
+#: mapsdatatranslation.cpp:5636 mapsdatatranslation.cpp:5637
 msgctxt "spain_provinces.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5633
+#: mapsdatatranslation.cpp:5638
 msgctxt "spain_provinces.kgm"
 msgid "France"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5634
+#: mapsdatatranslation.cpp:5639
 msgctxt "spain_provinces.kgm"
 msgid "Andorra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5635
+#: mapsdatatranslation.cpp:5640
 msgctxt "spain_provinces.kgm"
 msgid "Portugal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5636
+#: mapsdatatranslation.cpp:5641
 msgctxt "spain_provinces.kgm"
 msgid "Morocco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5637
+#: mapsdatatranslation.cpp:5642
 msgctxt "spain_provinces.kgm"
 msgid "Algeria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5638
+#: mapsdatatranslation.cpp:5643
 msgctxt "spain_provinces.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5639
+#: mapsdatatranslation.cpp:5644
 msgctxt "spain_provinces.kgm"
 msgid "Álava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5640
+#: mapsdatatranslation.cpp:5645
 msgctxt "spain_provinces.kgm"
 msgid "Vitoria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5641 mapsdatatranslation.cpp:5642
+#: mapsdatatranslation.cpp:5646 mapsdatatranslation.cpp:5647
 msgctxt "spain_provinces.kgm"
 msgid "Albacete"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5643 mapsdatatranslation.cpp:5644
+#: mapsdatatranslation.cpp:5648 mapsdatatranslation.cpp:5649
 msgctxt "spain_provinces.kgm"
 msgid "Alicante"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5645 mapsdatatranslation.cpp:5646
+#: mapsdatatranslation.cpp:5650 mapsdatatranslation.cpp:5651
 msgctxt "spain_provinces.kgm"
 msgid "Almería"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5647
+#: mapsdatatranslation.cpp:5652
 msgctxt "spain_provinces.kgm"
 msgid "Asturias"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5648
+#: mapsdatatranslation.cpp:5653
 msgctxt "spain_provinces.kgm"
 msgid "Oviedo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5649 mapsdatatranslation.cpp:5650
+#: mapsdatatranslation.cpp:5654 mapsdatatranslation.cpp:5655
 msgctxt "spain_provinces.kgm"
 msgid "Ávila"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5651 mapsdatatranslation.cpp:5652
+#: mapsdatatranslation.cpp:5656 mapsdatatranslation.cpp:5657
 msgctxt "spain_provinces.kgm"
 msgid "Badajoz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5653 mapsdatatranslation.cpp:5654
+#: mapsdatatranslation.cpp:5658 mapsdatatranslation.cpp:5659
 msgctxt "spain_provinces.kgm"
 msgid "Barcelona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5655 mapsdatatranslation.cpp:5656
+#: mapsdatatranslation.cpp:5660 mapsdatatranslation.cpp:5661
 msgctxt "spain_provinces.kgm"
 msgid "Burgos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5657 mapsdatatranslation.cpp:5658
+#: mapsdatatranslation.cpp:5662 mapsdatatranslation.cpp:5663
 msgctxt "spain_provinces.kgm"
 msgid "Cáceres"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5659 mapsdatatranslation.cpp:5660
+#: mapsdatatranslation.cpp:5664 mapsdatatranslation.cpp:5665
 msgctxt "spain_provinces.kgm"
 msgid "Cádiz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5661
+#: mapsdatatranslation.cpp:5666
 msgctxt "spain_provinces.kgm"
 msgid "Cantabria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5662
+#: mapsdatatranslation.cpp:5667
 msgctxt "spain_provinces.kgm"
 msgid "Santander"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5663
+#: mapsdatatranslation.cpp:5668
 msgctxt "spain_provinces.kgm"
 msgid "Castellón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5664
+#: mapsdatatranslation.cpp:5669
 msgctxt "spain_provinces.kgm"
 msgid "Castellón de la Plana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5665 mapsdatatranslation.cpp:5666
+#: mapsdatatranslation.cpp:5670 mapsdatatranslation.cpp:5671
 msgctxt "spain_provinces.kgm"
 msgid "Ciudad Real"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5667 mapsdatatranslation.cpp:5668
+#: mapsdatatranslation.cpp:5672 mapsdatatranslation.cpp:5673
 msgctxt "spain_provinces.kgm"
 msgid "Córdoba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5669 mapsdatatranslation.cpp:5670
+#: mapsdatatranslation.cpp:5674 mapsdatatranslation.cpp:5675
 msgctxt "spain_provinces.kgm"
 msgid "A Coruña"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5671 mapsdatatranslation.cpp:5672
+#: mapsdatatranslation.cpp:5676 mapsdatatranslation.cpp:5677
 msgctxt "spain_provinces.kgm"
 msgid "Cuenca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5673
+#: mapsdatatranslation.cpp:5678
 msgctxt "spain_provinces.kgm"
 msgid "Girona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5674
+#: mapsdatatranslation.cpp:5679
 msgctxt "spain_provinces.kgm"
 msgid "Gerona/Girona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5675 mapsdatatranslation.cpp:5676
+#: mapsdatatranslation.cpp:5680 mapsdatatranslation.cpp:5681
 msgctxt "spain_provinces.kgm"
 msgid "Granada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5677 mapsdatatranslation.cpp:5678
+#: mapsdatatranslation.cpp:5682 mapsdatatranslation.cpp:5683
 msgctxt "spain_provinces.kgm"
 msgid "Guadalajara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5679
+#: mapsdatatranslation.cpp:5684
 msgctxt "spain_provinces.kgm"
 msgid "Guipúzcoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5680
+#: mapsdatatranslation.cpp:5685
 msgctxt "spain_provinces.kgm"
 msgid "San Sebastián"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5681 mapsdatatranslation.cpp:5682
+#: mapsdatatranslation.cpp:5686 mapsdatatranslation.cpp:5687
 msgctxt "spain_provinces.kgm"
 msgid "Huelva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5683 mapsdatatranslation.cpp:5684
+#: mapsdatatranslation.cpp:5688 mapsdatatranslation.cpp:5689
 msgctxt "spain_provinces.kgm"
 msgid "Huesca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5685
+#: mapsdatatranslation.cpp:5690
 msgctxt "spain_provinces.kgm"
 msgid "Balearic Islands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5686
+#: mapsdatatranslation.cpp:5691
 msgctxt "spain_provinces.kgm"
 msgid "Palma de Mallorca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5687 mapsdatatranslation.cpp:5688
+#: mapsdatatranslation.cpp:5692 mapsdatatranslation.cpp:5693
 msgctxt "spain_provinces.kgm"
 msgid "Jaén"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5689
+#: mapsdatatranslation.cpp:5694
 msgctxt "spain_provinces.kgm"
 msgid "La Rioja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5690
+#: mapsdatatranslation.cpp:5695
 msgctxt "spain_provinces.kgm"
 msgid "Logroño"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5691 mapsdatatranslation.cpp:5692
+#: mapsdatatranslation.cpp:5696 mapsdatatranslation.cpp:5697
 msgctxt "spain_provinces.kgm"
 msgid "León"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5693 mapsdatatranslation.cpp:5694
+#: mapsdatatranslation.cpp:5698 mapsdatatranslation.cpp:5699
 msgctxt "spain_provinces.kgm"
 msgid "Lérida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5695 mapsdatatranslation.cpp:5696
+#: mapsdatatranslation.cpp:5700 mapsdatatranslation.cpp:5701
 msgctxt "spain_provinces.kgm"
 msgid "Lugo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5697 mapsdatatranslation.cpp:5698
+#: mapsdatatranslation.cpp:5702 mapsdatatranslation.cpp:5703
 msgctxt "spain_provinces.kgm"
 msgid "Madrid"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5699 mapsdatatranslation.cpp:5700
+#: mapsdatatranslation.cpp:5704 mapsdatatranslation.cpp:5705
 msgctxt "spain_provinces.kgm"
 msgid "Málaga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5701 mapsdatatranslation.cpp:5702
+#: mapsdatatranslation.cpp:5706 mapsdatatranslation.cpp:5707
 msgctxt "spain_provinces.kgm"
 msgid "Murcia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5703
+#: mapsdatatranslation.cpp:5708
 msgctxt "spain_provinces.kgm"
 msgid "Navarre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5704
+#: mapsdatatranslation.cpp:5709
 msgctxt "spain_provinces.kgm"
 msgid "Pamplona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5705 mapsdatatranslation.cpp:5706
+#: mapsdatatranslation.cpp:5710 mapsdatatranslation.cpp:5711
 msgctxt "spain_provinces.kgm"
 msgid "Ourense"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5707 mapsdatatranslation.cpp:5708
+#: mapsdatatranslation.cpp:5712 mapsdatatranslation.cpp:5713
 msgctxt "spain_provinces.kgm"
 msgid "Palencia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5709
+#: mapsdatatranslation.cpp:5714
 msgctxt "spain_provinces.kgm"
 msgid "Las Palmas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5710
+#: mapsdatatranslation.cpp:5715
 msgctxt "spain_provinces.kgm"
 msgid "Las Palmas de Gran Canaria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5711 mapsdatatranslation.cpp:5712
+#: mapsdatatranslation.cpp:5716 mapsdatatranslation.cpp:5717
 msgctxt "spain_provinces.kgm"
 msgid "Pontevedra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5713 mapsdatatranslation.cpp:5714
+#: mapsdatatranslation.cpp:5718 mapsdatatranslation.cpp:5719
 msgctxt "spain_provinces.kgm"
 msgid "Salamanca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5715
-msgctxt "spain_provinces.kgm"
-msgid "Tenerife"
-msgstr ""
-
-#: mapsdatatranslation.cpp:5716
+#: mapsdatatranslation.cpp:5720 mapsdatatranslation.cpp:5721
 msgctxt "spain_provinces.kgm"
 msgid "Santa Cruz de Tenerife"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5717 mapsdatatranslation.cpp:5718
+#: mapsdatatranslation.cpp:5722 mapsdatatranslation.cpp:5723
 msgctxt "spain_provinces.kgm"
 msgid "Segovia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5719 mapsdatatranslation.cpp:5720
+#: mapsdatatranslation.cpp:5724 mapsdatatranslation.cpp:5725
 msgctxt "spain_provinces.kgm"
 msgid "Seville"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5721 mapsdatatranslation.cpp:5722
+#: mapsdatatranslation.cpp:5726 mapsdatatranslation.cpp:5727
 msgctxt "spain_provinces.kgm"
 msgid "Soria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5723 mapsdatatranslation.cpp:5724
+#: mapsdatatranslation.cpp:5728 mapsdatatranslation.cpp:5729
 msgctxt "spain_provinces.kgm"
 msgid "Tarragona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5725 mapsdatatranslation.cpp:5726
+#: mapsdatatranslation.cpp:5730 mapsdatatranslation.cpp:5731
 msgctxt "spain_provinces.kgm"
 msgid "Teruel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5727 mapsdatatranslation.cpp:5728
+#: mapsdatatranslation.cpp:5732 mapsdatatranslation.cpp:5733
 msgctxt "spain_provinces.kgm"
 msgid "Toledo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5729 mapsdatatranslation.cpp:5730
+#: mapsdatatranslation.cpp:5734 mapsdatatranslation.cpp:5735
 msgctxt "spain_provinces.kgm"
 msgid "Valencia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5731 mapsdatatranslation.cpp:5732
+#: mapsdatatranslation.cpp:5736 mapsdatatranslation.cpp:5737
 msgctxt "spain_provinces.kgm"
 msgid "Valladolid"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5733
+#: mapsdatatranslation.cpp:5738
 msgctxt "spain_provinces.kgm"
 msgid "Biscay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5734
+#: mapsdatatranslation.cpp:5739
 msgctxt "spain_provinces.kgm"
 msgid "Bilbao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5735 mapsdatatranslation.cpp:5736
+#: mapsdatatranslation.cpp:5740 mapsdatatranslation.cpp:5741
 msgctxt "spain_provinces.kgm"
 msgid "Zamora"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5737 mapsdatatranslation.cpp:5738
+#: mapsdatatranslation.cpp:5742 mapsdatatranslation.cpp:5743
 msgctxt "spain_provinces.kgm"
 msgid "Zaragoza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5739
-msgctxt "sudan.kgm"
-msgid "Sudan"
-msgstr ""
-
-#: mapsdatatranslation.cpp:5740
-msgctxt "sudan.kgm"
-msgid "States"
-msgstr ""
-
-#: mapsdatatranslation.cpp:5741
-msgctxt "sudan.kgm"
-msgid "Frontier"
-msgstr ""
-
-#: mapsdatatranslation.cpp:5742
-msgctxt "sudan.kgm"
-msgid "Not Sudan"
-msgstr ""
-
-#: mapsdatatranslation.cpp:5743
-msgctxt "sudan.kgm"
-msgid "Water"
-msgstr ""
-
 #: mapsdatatranslation.cpp:5744
-msgctxt "sudan.kgm"
-msgid "Al Jazirah"
+msgctxt "sri-lanka.kgm"
+msgid "Sri-Lanka"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5745
-msgctxt "sudan.kgm"
-msgid "Wad-Madani"
+msgctxt "sri-lanka.kgm"
+msgid "Provinces"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5746
-msgctxt "sudan.kgm"
-msgid "Blue Nile/Central"
+msgctxt "sri-lanka.kgm"
+msgid "Frontier"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5747
-msgctxt "sudan.kgm"
-msgid "Ad-Damazin"
+msgctxt "sri-lanka.kgm"
+msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5748 mapsdatatranslation.cpp:5749
-msgctxt "sudan.kgm"
-msgid "Sennar"
+#: mapsdatatranslation.cpp:5748
+msgctxt "sri-lanka.kgm"
+msgid "Not Sri-Lanka"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5749
+msgctxt "sri-lanka.kgm"
+msgid "Central"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5750
-msgctxt "sudan.kgm"
-msgid "White Nile"
+msgctxt "sri-lanka.kgm"
+msgid "Kandy"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5751
-msgctxt "sudan.kgm"
-msgid "Rabak"
+msgctxt "sri-lanka.kgm"
+msgid "North Central"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5752
-msgctxt "sudan.kgm"
-msgid "North Darfur"
+msgctxt "sri-lanka.kgm"
+msgid "Anuradhapura"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5753
-msgctxt "sudan.kgm"
-msgid "Al-Fashir"
+msgctxt "sri-lanka.kgm"
+msgid "North"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5754
-msgctxt "sudan.kgm"
-msgid "South Darfur"
+msgctxt "sri-lanka.kgm"
+msgid "Jaffna"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5755
-msgctxt "sudan.kgm"
-msgid "Nyala"
+msgctxt "sri-lanka.kgm"
+msgid "Eastern"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5756
-msgctxt "sudan.kgm"
-msgid "West Darfur"
+msgctxt "sri-lanka.kgm"
+msgid "Trincomalee"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5757
-msgctxt "sudan.kgm"
-msgid "Al-Junaynah"
+msgctxt "sri-lanka.kgm"
+msgid "North Western"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5758
-msgctxt "sudan.kgm"
-msgid "Lakes"
+msgctxt "sri-lanka.kgm"
+msgid "Kurunegala"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5759
-msgctxt "sudan.kgm"
-msgid "Rumbek"
+msgctxt "sri-lanka.kgm"
+msgid "Southern"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5760
-msgctxt "sudan.kgm"
-msgid "North Bahr al Ghazal"
+msgctxt "sri-lanka.kgm"
+msgid "Galle"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5761
-msgctxt "sudan.kgm"
-msgid "Aweil"
+msgctxt "sri-lanka.kgm"
+msgid "Uva"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5762
-msgctxt "sudan.kgm"
-msgid "West Bahr al Ghazal"
+msgctxt "sri-lanka.kgm"
+msgid "Badulla"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5763
-msgctxt "sudan.kgm"
-msgid "Wau"
+msgctxt "sri-lanka.kgm"
+msgid "Sabaragamuwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5764 mapsdatatranslation.cpp:5765
-msgctxt "sudan.kgm"
-msgid "Warab"
+#: mapsdatatranslation.cpp:5764
+msgctxt "sri-lanka.kgm"
+msgid "Ratnapura"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5765
+msgctxt "sri-lanka.kgm"
+msgid "Western"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5766
-msgctxt "sudan.kgm"
-msgid "Central Equatoria"
+msgctxt "sri-lanka.kgm"
+msgid "Colombo"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5767
 msgctxt "sudan.kgm"
-msgid "Juba"
+msgid "Sudan"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5768
 msgctxt "sudan.kgm"
-msgid "East Equatoria"
+msgid "States"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5769
 msgctxt "sudan.kgm"
-msgid "Kapoita"
+msgid "Frontier"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5770
 msgctxt "sudan.kgm"
-msgid "West Equatoria"
+msgid "Not Sudan"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5771
 msgctxt "sudan.kgm"
-msgid "Yambio"
+msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5772 mapsdatatranslation.cpp:5773
+#: mapsdatatranslation.cpp:5772
 msgctxt "sudan.kgm"
-msgid "Kassala"
+msgid "Al Jazirah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5774 mapsdatatranslation.cpp:5775
+#: mapsdatatranslation.cpp:5773
 msgctxt "sudan.kgm"
-msgid "Al Qadarif"
+msgid "Wad-Madani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5776
+#: mapsdatatranslation.cpp:5774
 msgctxt "sudan.kgm"
-msgid "Red Sea"
+msgid "Blue Nile/Central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5777
+#: mapsdatatranslation.cpp:5775
 msgctxt "sudan.kgm"
-msgid "Port Sudan"
+msgid "Ad-Damazin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5778 mapsdatatranslation.cpp:5779
+#: mapsdatatranslation.cpp:5776 mapsdatatranslation.cpp:5777
 msgctxt "sudan.kgm"
-msgid "Khartoum"
+msgid "Sennar"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5778
+msgctxt "sudan.kgm"
+msgid "White Nile"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5779
+msgctxt "sudan.kgm"
+msgid "Rabak"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5780
 msgctxt "sudan.kgm"
-msgid "North Kurdufan"
+msgid "North Darfur"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5781
 msgctxt "sudan.kgm"
-msgid "Al-Ubayyid"
+msgid "Al-Fashir"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5782
 msgctxt "sudan.kgm"
-msgid "South Kurdufan"
+msgid "South Darfur"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5783
 msgctxt "sudan.kgm"
-msgid "Kaduqli"
+msgid "Nyala"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5784
 msgctxt "sudan.kgm"
-msgid "West Kurdufan"
+msgid "West Darfur"
 msgstr ""
 
 #: mapsdatatranslation.cpp:5785
 msgctxt "sudan.kgm"
-msgid "Al-Fulah"
+msgid "Al-Junaynah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5786
+#: mapsdatatranslation.cpp:5786 mapsdatatranslation.cpp:5787
 msgctxt "sudan.kgm"
-msgid "Northern"
+msgid "Kassala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5787
+#: mapsdatatranslation.cpp:5788 mapsdatatranslation.cpp:5789
 msgctxt "sudan.kgm"
-msgid "Dongola"
+msgid "Al Qadarif"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5788
+#: mapsdatatranslation.cpp:5790
 msgctxt "sudan.kgm"
-msgid "River Nile"
+msgid "Red Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5789
+#: mapsdatatranslation.cpp:5791
 msgctxt "sudan.kgm"
-msgid "Ad-Damir"
+msgid "Port Sudan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5790
+#: mapsdatatranslation.cpp:5792 mapsdatatranslation.cpp:5793
 msgctxt "sudan.kgm"
-msgid "Jonglei"
+msgid "Khartoum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5791
+#: mapsdatatranslation.cpp:5794
 msgctxt "sudan.kgm"
-msgid "Bor"
+msgid "North Kurdufan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5792
+#: mapsdatatranslation.cpp:5795
 msgctxt "sudan.kgm"
-msgid "Unity"
+msgid "Al-Ubayyid"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5793
+#: mapsdatatranslation.cpp:5796
 msgctxt "sudan.kgm"
-msgid "Bentiu"
+msgid "South Kurdufan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5794
+#: mapsdatatranslation.cpp:5797
 msgctxt "sudan.kgm"
-msgid "Upper Nile"
+msgid "Kaduqli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5795
+#: mapsdatatranslation.cpp:5798
 msgctxt "sudan.kgm"
-msgid "Malakal"
+msgid "Northern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5796
+#: mapsdatatranslation.cpp:5799
+msgctxt "sudan.kgm"
+msgid "Dongola"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5800
+msgctxt "sudan.kgm"
+msgid "River Nile"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5801
+msgctxt "sudan.kgm"
+msgid "Ad-Damir"
+msgstr ""
+
+#: mapsdatatranslation.cpp:5802
 msgctxt "suriname.kgm"
 msgid "Suriname"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5797
+#: mapsdatatranslation.cpp:5803
 msgctxt "suriname.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5798 mapsdatatranslation.cpp:5799
+#: mapsdatatranslation.cpp:5804 mapsdatatranslation.cpp:5805
 msgctxt "suriname.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5800
+#: mapsdatatranslation.cpp:5806
 msgctxt "suriname.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5801
+#: mapsdatatranslation.cpp:5807
 msgctxt "suriname.kgm"
 msgid "Not Surinam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5802
+#: mapsdatatranslation.cpp:5808
 msgctxt "suriname.kgm"
 msgid "Nickerie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5803
+#: mapsdatatranslation.cpp:5809
 msgctxt "suriname.kgm"
 msgid "Nieuw Nickerie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5804
+#: mapsdatatranslation.cpp:5810
 msgctxt "suriname.kgm"
 msgid "Coronie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5805
+#: mapsdatatranslation.cpp:5811
 msgctxt "suriname.kgm"
 msgid "Totness"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5806
+#: mapsdatatranslation.cpp:5812
 msgctxt "suriname.kgm"
 msgid "Saramacca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5807
+#: mapsdatatranslation.cpp:5813
 msgctxt "suriname.kgm"
 msgid "Groningen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5808
+#: mapsdatatranslation.cpp:5814
 msgctxt "suriname.kgm"
 msgid "Wanica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5809
+#: mapsdatatranslation.cpp:5815
 msgctxt "suriname.kgm"
 msgid "Lelydorp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5810
+#: mapsdatatranslation.cpp:5816
 msgctxt "suriname.kgm"
 msgid "Comewijne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5811
+#: mapsdatatranslation.cpp:5817
 msgctxt "suriname.kgm"
 msgid "Nieuw Amsterdam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5812
+#: mapsdatatranslation.cpp:5818
 msgctxt "suriname.kgm"
 msgid "Marowijne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5813
+#: mapsdatatranslation.cpp:5819
 msgctxt "suriname.kgm"
 msgid "Albina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5814
+#: mapsdatatranslation.cpp:5820
 msgctxt "suriname.kgm"
 msgid "Para"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5815
+#: mapsdatatranslation.cpp:5821
 msgctxt "suriname.kgm"
 msgid "Onverwacht"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5816 mapsdatatranslation.cpp:5817
+#: mapsdatatranslation.cpp:5822 mapsdatatranslation.cpp:5823
 msgctxt "suriname.kgm"
 msgid "Paramaribo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5818 mapsdatatranslation.cpp:5819
+#: mapsdatatranslation.cpp:5824 mapsdatatranslation.cpp:5825
 msgctxt "suriname.kgm"
 msgid "Brokopondo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5820
+#: mapsdatatranslation.cpp:5826
 msgctxt "suriname.kgm"
 msgid "Sipaliwini"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5821
+#: mapsdatatranslation.cpp:5827
 msgctxt "sweden.kgm"
 msgid "Sweden by Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5822
+#: mapsdatatranslation.cpp:5828
 msgctxt "sweden.kgm"
 msgid "Counties"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5823
+#: mapsdatatranslation.cpp:5829
 msgctxt "sweden.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5824
+#: mapsdatatranslation.cpp:5830
 msgctxt "sweden.kgm"
 msgid "County Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5825
+#: mapsdatatranslation.cpp:5831
 msgctxt "sweden.kgm"
 msgid "CoastLine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5826
+#: mapsdatatranslation.cpp:5832
 msgctxt "sweden.kgm"
 msgid "Not Sweden"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5827
+#: mapsdatatranslation.cpp:5833
 msgctxt "sweden.kgm"
 msgid "Stockholm County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5828
+#: mapsdatatranslation.cpp:5834
 msgctxt "sweden.kgm"
 msgid "Stockholm"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5829
+#: mapsdatatranslation.cpp:5835
 msgctxt "sweden.kgm"
 msgid "Västerbotten County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5830
+#: mapsdatatranslation.cpp:5836
 msgctxt "sweden.kgm"
 msgid "Umeå"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5831
+#: mapsdatatranslation.cpp:5837
 msgctxt "sweden.kgm"
 msgid "Norrbotten County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5832
+#: mapsdatatranslation.cpp:5838
 msgctxt "sweden.kgm"
 msgid "Luleå"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5833
+#: mapsdatatranslation.cpp:5839
 msgctxt "sweden.kgm"
 msgid "Uppsala County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5834
+#: mapsdatatranslation.cpp:5840
 msgctxt "sweden.kgm"
 msgid "Uppsala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5835
+#: mapsdatatranslation.cpp:5841
 msgctxt "sweden.kgm"
 msgid "Södermanland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5836
+#: mapsdatatranslation.cpp:5842
 msgctxt "sweden.kgm"
 msgid "Nyköping"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5837
+#: mapsdatatranslation.cpp:5843
 msgctxt "sweden.kgm"
 msgid "Östergötland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5838
+#: mapsdatatranslation.cpp:5844
 msgctxt "sweden.kgm"
 msgid "Linköping"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5839
+#: mapsdatatranslation.cpp:5845
 msgctxt "sweden.kgm"
 msgid "Jönköping County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5840
+#: mapsdatatranslation.cpp:5846
 msgctxt "sweden.kgm"
 msgid "Jönköping"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5841
+#: mapsdatatranslation.cpp:5847
 msgctxt "sweden.kgm"
 msgid "Kronoberg County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5842
+#: mapsdatatranslation.cpp:5848
 msgctxt "sweden.kgm"
 msgid "Växjö"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5843
+#: mapsdatatranslation.cpp:5849
 msgctxt "sweden.kgm"
 msgid "Kalmar County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5844
+#: mapsdatatranslation.cpp:5850
 msgctxt "sweden.kgm"
 msgid "Kalmar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5845
+#: mapsdatatranslation.cpp:5851
 msgctxt "sweden.kgm"
 msgid "Gotland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5846
+#: mapsdatatranslation.cpp:5852
 msgctxt "sweden.kgm"
 msgid "Visby"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5847
+#: mapsdatatranslation.cpp:5853
 msgctxt "sweden.kgm"
 msgid "Blekinge County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5848
+#: mapsdatatranslation.cpp:5854
 msgctxt "sweden.kgm"
 msgid "Karlskrona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5849
+#: mapsdatatranslation.cpp:5855
 msgctxt "sweden.kgm"
 msgid "Skåne County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5850
+#: mapsdatatranslation.cpp:5856
 msgctxt "sweden.kgm"
 msgid "Malmö"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5851
+#: mapsdatatranslation.cpp:5857
 msgctxt "sweden.kgm"
 msgid "Halland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5852
+#: mapsdatatranslation.cpp:5858
 msgctxt "sweden.kgm"
 msgid "Halmstad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5853
+#: mapsdatatranslation.cpp:5859
 msgctxt "sweden.kgm"
 msgid "Västra Götaland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5854
+#: mapsdatatranslation.cpp:5860
 msgctxt "sweden.kgm"
 msgid "Göteborg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5855
+#: mapsdatatranslation.cpp:5861
 msgctxt "sweden.kgm"
 msgid "Värmland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5856
+#: mapsdatatranslation.cpp:5862
 msgctxt "sweden.kgm"
 msgid "Karlstad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5857
+#: mapsdatatranslation.cpp:5863
 msgctxt "sweden.kgm"
 msgid "Örebro County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5858
+#: mapsdatatranslation.cpp:5864
 msgctxt "sweden.kgm"
 msgid "Örebro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5859
+#: mapsdatatranslation.cpp:5865
 msgctxt "sweden.kgm"
 msgid "Västmanland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5860
+#: mapsdatatranslation.cpp:5866
 msgctxt "sweden.kgm"
 msgid "Västerås"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5861
+#: mapsdatatranslation.cpp:5867
 msgctxt "sweden.kgm"
 msgid "Dalarna County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5862
+#: mapsdatatranslation.cpp:5868
 msgctxt "sweden.kgm"
 msgid "Falun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5863
+#: mapsdatatranslation.cpp:5869
 msgctxt "sweden.kgm"
 msgid "Gävleborg County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5864
+#: mapsdatatranslation.cpp:5870
 msgctxt "sweden.kgm"
 msgid "Gävle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5865
+#: mapsdatatranslation.cpp:5871
 msgctxt "sweden.kgm"
 msgid "Västernorrland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5866
+#: mapsdatatranslation.cpp:5872
 msgctxt "sweden.kgm"
 msgid "Härnösand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5867
+#: mapsdatatranslation.cpp:5873
 msgctxt "sweden.kgm"
 msgid "Jämtland County"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5868
+#: mapsdatatranslation.cpp:5874
 msgctxt "sweden.kgm"
 msgid "Östersund"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5869
+#: mapsdatatranslation.cpp:5875
 msgctxt "switzerland.kgm"
 msgid "Switzerland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5870
+#: mapsdatatranslation.cpp:5876
 msgctxt "switzerland.kgm"
 msgid "Cantons"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5871
+#: mapsdatatranslation.cpp:5877
 msgctxt "switzerland.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5872
+#: mapsdatatranslation.cpp:5878
 msgctxt "switzerland.kgm"
 msgid "Not Switzerland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5873
+#: mapsdatatranslation.cpp:5879
 msgctxt "switzerland.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5874
+#: mapsdatatranslation.cpp:5880
 msgctxt "switzerland.kgm"
 msgid "Zurich"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5875
+#: mapsdatatranslation.cpp:5881
 msgctxt "switzerland.kgm"
 msgid "Zürich"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5876
+#: mapsdatatranslation.cpp:5882
 msgctxt "switzerland.kgm"
 msgid "Berne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5877
+#: mapsdatatranslation.cpp:5883
 msgctxt "switzerland.kgm"
 msgid "Bern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5878 mapsdatatranslation.cpp:5879
+#: mapsdatatranslation.cpp:5884 mapsdatatranslation.cpp:5885
 msgctxt "switzerland.kgm"
 msgid "Lucerne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5880
+#: mapsdatatranslation.cpp:5886
 msgctxt "switzerland.kgm"
 msgid "Uri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5881
+#: mapsdatatranslation.cpp:5887
 msgctxt "switzerland.kgm"
 msgid "Altdorf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5882 mapsdatatranslation.cpp:5883
+#: mapsdatatranslation.cpp:5888 mapsdatatranslation.cpp:5889
 msgctxt "switzerland.kgm"
 msgid "Schwyz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5884
+#: mapsdatatranslation.cpp:5890
 msgctxt "switzerland.kgm"
 msgid "Obwald"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5885
+#: mapsdatatranslation.cpp:5891
 msgctxt "switzerland.kgm"
 msgid "Sarnen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5886
+#: mapsdatatranslation.cpp:5892
 msgctxt "switzerland.kgm"
 msgid "Nidwald"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5887
+#: mapsdatatranslation.cpp:5893
 msgctxt "switzerland.kgm"
 msgid "Stans"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5888 mapsdatatranslation.cpp:5889
+#: mapsdatatranslation.cpp:5894 mapsdatatranslation.cpp:5895
 msgctxt "switzerland.kgm"
 msgid "Glarus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5890 mapsdatatranslation.cpp:5891
+#: mapsdatatranslation.cpp:5896 mapsdatatranslation.cpp:5897
 msgctxt "switzerland.kgm"
 msgid "Zug"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5892 mapsdatatranslation.cpp:5893
+#: mapsdatatranslation.cpp:5898 mapsdatatranslation.cpp:5899
 msgctxt "switzerland.kgm"
 msgid "Fribourg"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5894 mapsdatatranslation.cpp:5895
+#: mapsdatatranslation.cpp:5900 mapsdatatranslation.cpp:5901
 msgctxt "switzerland.kgm"
 msgid "Solothurn"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5896
+#: mapsdatatranslation.cpp:5902
 msgctxt "switzerland.kgm"
 msgid "Basle-City"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5897
+#: mapsdatatranslation.cpp:5903
 msgctxt "switzerland.kgm"
 msgid "Basel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5898
+#: mapsdatatranslation.cpp:5904
 msgctxt "switzerland.kgm"
 msgid "Basle-Country"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5899
+#: mapsdatatranslation.cpp:5905
 msgctxt "switzerland.kgm"
 msgid "Liestal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5900 mapsdatatranslation.cpp:5901
+#: mapsdatatranslation.cpp:5906 mapsdatatranslation.cpp:5907
 msgctxt "switzerland.kgm"
 msgid "Schaffhausen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5902
+#: mapsdatatranslation.cpp:5908
 msgctxt "switzerland.kgm"
 msgid "Appenzell Outer Rhodes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5903
+#: mapsdatatranslation.cpp:5909
 msgctxt "switzerland.kgm"
 msgid "Herisau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5904
+#: mapsdatatranslation.cpp:5910
 msgctxt "switzerland.kgm"
 msgid "Appenzell Inner Rhodes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5905
+#: mapsdatatranslation.cpp:5911
 msgctxt "switzerland.kgm"
 msgid "Appenzell"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5906
+#: mapsdatatranslation.cpp:5912
 msgctxt "switzerland.kgm"
 msgid "St. Gall"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5907
+#: mapsdatatranslation.cpp:5913
 msgctxt "switzerland.kgm"
 msgid "St. Gallen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5908
+#: mapsdatatranslation.cpp:5914
 msgctxt "switzerland.kgm"
 msgid "Grisons"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5909
+#: mapsdatatranslation.cpp:5915
 msgctxt "switzerland.kgm"
 msgid "Chur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5910
+#: mapsdatatranslation.cpp:5916
 msgctxt "switzerland.kgm"
 msgid "Argovia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5911
+#: mapsdatatranslation.cpp:5917
 msgctxt "switzerland.kgm"
 msgid "Aarau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5912
+#: mapsdatatranslation.cpp:5918
 msgctxt "switzerland.kgm"
 msgid "Thurgovia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5913
+#: mapsdatatranslation.cpp:5919
 msgctxt "switzerland.kgm"
 msgid "Frauenfeld"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5914
+#: mapsdatatranslation.cpp:5920
 msgctxt "switzerland.kgm"
 msgid "Ticino"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5915
+#: mapsdatatranslation.cpp:5921
 msgctxt "switzerland.kgm"
 msgid "Bellinzona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5916
+#: mapsdatatranslation.cpp:5922
 msgctxt "switzerland.kgm"
 msgid "Vaud"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5917
+#: mapsdatatranslation.cpp:5923
 msgctxt "switzerland.kgm"
 msgid "Lausanne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5918
+#: mapsdatatranslation.cpp:5924
 msgctxt "switzerland.kgm"
 msgid "Valais"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5919
+#: mapsdatatranslation.cpp:5925
 msgctxt "switzerland.kgm"
 msgid "Sion"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5920 mapsdatatranslation.cpp:5921
+#: mapsdatatranslation.cpp:5926 mapsdatatranslation.cpp:5927
 msgctxt "switzerland.kgm"
 msgid "Neuchâtel"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5922 mapsdatatranslation.cpp:5923
+#: mapsdatatranslation.cpp:5928 mapsdatatranslation.cpp:5929
 msgctxt "switzerland.kgm"
 msgid "Geneva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5924
+#: mapsdatatranslation.cpp:5930
 msgctxt "switzerland.kgm"
 msgid "Jura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5925
+#: mapsdatatranslation.cpp:5931
 msgctxt "switzerland.kgm"
 msgid "Delémont"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5926
+#: mapsdatatranslation.cpp:5932
 msgctxt "tajikistan.kgm"
 msgid "Tajikistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5927
+#: mapsdatatranslation.cpp:5933
 msgctxt "tajikistan.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5928
+#: mapsdatatranslation.cpp:5934
 msgctxt "tajikistan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5929
+#: mapsdatatranslation.cpp:5935
 msgctxt "tajikistan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5930
+#: mapsdatatranslation.cpp:5936
 msgctxt "tajikistan.kgm"
 msgid "Not Tajikistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5931
+#: mapsdatatranslation.cpp:5937
 msgctxt "tajikistan.kgm"
 msgid "Sughd"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5932
+#: mapsdatatranslation.cpp:5938
 msgctxt "tajikistan.kgm"
 msgid "Khujand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5933
+#: mapsdatatranslation.cpp:5939
 msgctxt "tajikistan.kgm"
 msgid "Districts of Republican Subordination"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5934
+#: mapsdatatranslation.cpp:5940
 msgctxt "tajikistan.kgm"
 msgid "Dushanbe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5935
+#: mapsdatatranslation.cpp:5941
 msgctxt "tajikistan.kgm"
 msgid "Khatlon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5936
+#: mapsdatatranslation.cpp:5942
 msgctxt "tajikistan.kgm"
 msgid "Qurghonteppa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5937
+#: mapsdatatranslation.cpp:5943
 msgctxt "tajikistan.kgm"
 msgid "Gorno-Badakhshan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5938
+#: mapsdatatranslation.cpp:5944
 msgctxt "tajikistan.kgm"
 msgid "Khorugh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5939
+#: mapsdatatranslation.cpp:5945
 msgctxt "thailand.kgm"
 msgid "Thailand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5940
+#: mapsdatatranslation.cpp:5946
 msgctxt "thailand.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5941
+#: mapsdatatranslation.cpp:5947
 msgctxt "thailand.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5942
+#: mapsdatatranslation.cpp:5948
 msgctxt "thailand.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5943
+#: mapsdatatranslation.cpp:5949
 msgctxt "thailand.kgm"
 msgid "Not Thailand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5944
+#: mapsdatatranslation.cpp:5950
 msgctxt "thailand.kgm"
 msgid "Chiang Mai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5945
+#: mapsdatatranslation.cpp:5951
 msgctxt "thailand.kgm"
 msgid "Chiang Rai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5946
+#: mapsdatatranslation.cpp:5952
 msgctxt "thailand.kgm"
 msgid "Kamphaeng Phet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5947
+#: mapsdatatranslation.cpp:5953
 msgctxt "thailand.kgm"
 msgid "Lampang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5948
+#: mapsdatatranslation.cpp:5954
 msgctxt "thailand.kgm"
 msgid "Lamphun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5949
+#: mapsdatatranslation.cpp:5955
 msgctxt "thailand.kgm"
 msgid "Mae Hong Son"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5950
+#: mapsdatatranslation.cpp:5956
 msgctxt "thailand.kgm"
 msgid "Nakhon Sawan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5951
+#: mapsdatatranslation.cpp:5957
 msgctxt "thailand.kgm"
 msgid "Nan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5952
+#: mapsdatatranslation.cpp:5958
 msgctxt "thailand.kgm"
 msgid "Phayao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5953
+#: mapsdatatranslation.cpp:5959
 msgctxt "thailand.kgm"
 msgid "Phetchabun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5954
+#: mapsdatatranslation.cpp:5960
 msgctxt "thailand.kgm"
 msgid "Phichit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5955
+#: mapsdatatranslation.cpp:5961
 msgctxt "thailand.kgm"
 msgid "Phitsanulok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5956
+#: mapsdatatranslation.cpp:5962
 msgctxt "thailand.kgm"
 msgid "Phrae"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5957
+#: mapsdatatranslation.cpp:5963
 msgctxt "thailand.kgm"
 msgid "Sukhothai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5958
+#: mapsdatatranslation.cpp:5964
 msgctxt "thailand.kgm"
 msgid "Tak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5959
+#: mapsdatatranslation.cpp:5965
 msgctxt "thailand.kgm"
 msgid "Uthai Thani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5960
+#: mapsdatatranslation.cpp:5966
 msgctxt "thailand.kgm"
 msgid "Uttaradit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5961
+#: mapsdatatranslation.cpp:5967
 msgctxt "thailand.kgm"
 msgid "Amnat Charoen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5962
+#: mapsdatatranslation.cpp:5968
 msgctxt "thailand.kgm"
 msgid "Buri Ram"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5963
+#: mapsdatatranslation.cpp:5969
 msgctxt "thailand.kgm"
 msgid "Chaiyaphum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5964
+#: mapsdatatranslation.cpp:5970
 msgctxt "thailand.kgm"
 msgid "Kalasin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5965
+#: mapsdatatranslation.cpp:5971
 msgctxt "thailand.kgm"
 msgid "Khon Kaen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5966
+#: mapsdatatranslation.cpp:5972
 msgctxt "thailand.kgm"
 msgid "Loei"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5967
+#: mapsdatatranslation.cpp:5973
 msgctxt "thailand.kgm"
 msgid "Maha Sarakham"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5968
+#: mapsdatatranslation.cpp:5974
 msgctxt "thailand.kgm"
 msgid "Mukdahan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5969
+#: mapsdatatranslation.cpp:5975
 msgctxt "thailand.kgm"
 msgid "Nakhon Phanom"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5970
+#: mapsdatatranslation.cpp:5976
 msgctxt "thailand.kgm"
 msgid "Nakhon Ratchasima"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5971
+#: mapsdatatranslation.cpp:5977
 msgctxt "thailand.kgm"
 msgid "Nong Bua Lamphu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5972
+#: mapsdatatranslation.cpp:5978
 msgctxt "thailand.kgm"
 msgid "Nong Khai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5973
+#: mapsdatatranslation.cpp:5979
 msgctxt "thailand.kgm"
 msgid "Roi Et"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5974
+#: mapsdatatranslation.cpp:5980
 msgctxt "thailand.kgm"
 msgid "Sakon Nakhon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5975
+#: mapsdatatranslation.cpp:5981
 msgctxt "thailand.kgm"
 msgid "Si Sa Ket"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5976
+#: mapsdatatranslation.cpp:5982
 msgctxt "thailand.kgm"
 msgid "Surin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5977
+#: mapsdatatranslation.cpp:5983
 msgctxt "thailand.kgm"
 msgid "Ubon Ratchathani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5978
+#: mapsdatatranslation.cpp:5984
 msgctxt "thailand.kgm"
 msgid "Udon Thani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5979
+#: mapsdatatranslation.cpp:5985
 msgctxt "thailand.kgm"
 msgid "Yasothon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5980
+#: mapsdatatranslation.cpp:5986
 msgctxt "thailand.kgm"
 msgid "Chachoengsao"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5981
+#: mapsdatatranslation.cpp:5987
 msgctxt "thailand.kgm"
 msgid "Chanthaburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5982
+#: mapsdatatranslation.cpp:5988
 msgctxt "thailand.kgm"
 msgid "Chon Buri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5983
+#: mapsdatatranslation.cpp:5989
 msgctxt "thailand.kgm"
 msgid "Prachin Buri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5984
+#: mapsdatatranslation.cpp:5990
 msgctxt "thailand.kgm"
 msgid "Rayong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5985
+#: mapsdatatranslation.cpp:5991
 msgctxt "thailand.kgm"
 msgid "Sa Kaeo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5986
+#: mapsdatatranslation.cpp:5992
 msgctxt "thailand.kgm"
 msgid "Trat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5987
+#: mapsdatatranslation.cpp:5993
 msgctxt "thailand.kgm"
 msgid "Ang Thong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5988
+#: mapsdatatranslation.cpp:5994
 msgctxt "thailand.kgm"
 msgid "Phra Nakhon Si Ayutthaya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5989
+#: mapsdatatranslation.cpp:5995
 msgctxt "thailand.kgm"
 msgid "Bangkok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5990
+#: mapsdatatranslation.cpp:5996
 msgctxt "thailand.kgm"
 msgid "Chainat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5991
+#: mapsdatatranslation.cpp:5997
 msgctxt "thailand.kgm"
 msgid "Kanchanaburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5992
+#: mapsdatatranslation.cpp:5998
 msgctxt "thailand.kgm"
 msgid "Lop Buri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5993
+#: mapsdatatranslation.cpp:5999
 msgctxt "thailand.kgm"
 msgid "Nakhon Nayok"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5994
+#: mapsdatatranslation.cpp:6000
 msgctxt "thailand.kgm"
 msgid "Nakhon Pathom"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5995
+#: mapsdatatranslation.cpp:6001
 msgctxt "thailand.kgm"
 msgid "Nonthaburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5996
+#: mapsdatatranslation.cpp:6002
 msgctxt "thailand.kgm"
 msgid "Pathum Thani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5997
+#: mapsdatatranslation.cpp:6003
 msgctxt "thailand.kgm"
 msgid "Phetchaburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5998
+#: mapsdatatranslation.cpp:6004
 msgctxt "thailand.kgm"
 msgid "Prachuap Khiri Khan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:5999
+#: mapsdatatranslation.cpp:6005
 msgctxt "thailand.kgm"
 msgid "Ratchaburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6000
+#: mapsdatatranslation.cpp:6006
 msgctxt "thailand.kgm"
 msgid "Samut Prakan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6001
+#: mapsdatatranslation.cpp:6007
 msgctxt "thailand.kgm"
 msgid "Samut Sakhon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6002
+#: mapsdatatranslation.cpp:6008
 msgctxt "thailand.kgm"
 msgid "Samut Songkhram"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6003
+#: mapsdatatranslation.cpp:6009
 msgctxt "thailand.kgm"
 msgid "Saraburi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6004
+#: mapsdatatranslation.cpp:6010
 msgctxt "thailand.kgm"
 msgid "Sing Buri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6005
+#: mapsdatatranslation.cpp:6011
 msgctxt "thailand.kgm"
 msgid "Suphan Buri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6006
+#: mapsdatatranslation.cpp:6012
 msgctxt "thailand.kgm"
 msgid "Chumphon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6007
+#: mapsdatatranslation.cpp:6013
 msgctxt "thailand.kgm"
 msgid "Krabi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6008
+#: mapsdatatranslation.cpp:6014
 msgctxt "thailand.kgm"
 msgid "Nakhon Si Thammarat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6009
+#: mapsdatatranslation.cpp:6015
 msgctxt "thailand.kgm"
 msgid "Narathiwat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6010
+#: mapsdatatranslation.cpp:6016
 msgctxt "thailand.kgm"
 msgid "Pattani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6011
+#: mapsdatatranslation.cpp:6017
 msgctxt "thailand.kgm"
 msgid "Phang Nga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6012
+#: mapsdatatranslation.cpp:6018
 msgctxt "thailand.kgm"
 msgid "Phatthalung"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6013
+#: mapsdatatranslation.cpp:6019
 msgctxt "thailand.kgm"
 msgid "Phuket"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6014
+#: mapsdatatranslation.cpp:6020
 msgctxt "thailand.kgm"
 msgid "Ranong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6015
+#: mapsdatatranslation.cpp:6021
 msgctxt "thailand.kgm"
 msgid "Satun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6016
+#: mapsdatatranslation.cpp:6022
 msgctxt "thailand.kgm"
 msgid "Songkhla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6017
+#: mapsdatatranslation.cpp:6023
 msgctxt "thailand.kgm"
 msgid "Surat Thani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6018
+#: mapsdatatranslation.cpp:6024
 msgctxt "thailand.kgm"
 msgid "Trang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6019
+#: mapsdatatranslation.cpp:6025
 msgctxt "thailand.kgm"
 msgid "Yala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6020
+#: mapsdatatranslation.cpp:6026
 msgctxt "tripura.kgm"
 msgid "Tripura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6021
+#: mapsdatatranslation.cpp:6027
 msgctxt "tripura.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6022
+#: mapsdatatranslation.cpp:6028
 msgctxt "tripura.kgm"
 msgid "Not Tripura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6023
+#: mapsdatatranslation.cpp:6029
 msgctxt "tripura.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6024
+#: mapsdatatranslation.cpp:6030
 msgctxt "tripura.kgm"
 msgid "Dhalai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6025
+#: mapsdatatranslation.cpp:6031
 msgctxt "tripura.kgm"
 msgid "Ambassa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6026
+#: mapsdatatranslation.cpp:6032
 msgctxt "tripura.kgm"
 msgid "North Tripura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6027
+#: mapsdatatranslation.cpp:6033
 msgctxt "tripura.kgm"
 msgid "Kailashahar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6028
+#: mapsdatatranslation.cpp:6034
 msgctxt "tripura.kgm"
 msgid "South Tripura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6029
+#: mapsdatatranslation.cpp:6035
 msgctxt "tripura.kgm"
 msgid "Udaipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6030
+#: mapsdatatranslation.cpp:6036
 msgctxt "tripura.kgm"
 msgid "West Tripura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6031
+#: mapsdatatranslation.cpp:6037
 msgctxt "tripura.kgm"
 msgid "Agartala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6032
+#: mapsdatatranslation.cpp:6038
 msgctxt "turkey.kgm"
 msgid "Turkey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6033
+#: mapsdatatranslation.cpp:6039
 msgctxt "turkey.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6034
+#: mapsdatatranslation.cpp:6040
 msgctxt "turkey.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6035
+#: mapsdatatranslation.cpp:6041
 msgctxt "turkey.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6036
+#: mapsdatatranslation.cpp:6042
 msgctxt "turkey.kgm"
 msgid "Not Turkey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6037 mapsdatatranslation.cpp:6038
+#: mapsdatatranslation.cpp:6043 mapsdatatranslation.cpp:6044
 msgctxt "turkey.kgm"
 msgid "Adana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6039 mapsdatatranslation.cpp:6040
+#: mapsdatatranslation.cpp:6045 mapsdatatranslation.cpp:6046
 msgctxt "turkey.kgm"
 msgid "Adıyaman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6041
+#: mapsdatatranslation.cpp:6047
 msgctxt "turkey.kgm"
 msgid "Afyonkarahisar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6042
+#: mapsdatatranslation.cpp:6048
 msgctxt "turkey.kgm"
 msgid "Afyon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6043 mapsdatatranslation.cpp:6044
+#: mapsdatatranslation.cpp:6049 mapsdatatranslation.cpp:6050
 msgctxt "turkey.kgm"
 msgid "Ağrı"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6045 mapsdatatranslation.cpp:6046
+#: mapsdatatranslation.cpp:6051 mapsdatatranslation.cpp:6052
 msgctxt "turkey.kgm"
 msgid "Amasya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6047 mapsdatatranslation.cpp:6048
+#: mapsdatatranslation.cpp:6053 mapsdatatranslation.cpp:6054
 msgctxt "turkey.kgm"
 msgid "Ankara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6049 mapsdatatranslation.cpp:6050
+#: mapsdatatranslation.cpp:6055 mapsdatatranslation.cpp:6056
 msgctxt "turkey.kgm"
 msgid "Antalya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6051 mapsdatatranslation.cpp:6052
+#: mapsdatatranslation.cpp:6057 mapsdatatranslation.cpp:6058
 msgctxt "turkey.kgm"
 msgid "Artvin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6053 mapsdatatranslation.cpp:6054
+#: mapsdatatranslation.cpp:6059 mapsdatatranslation.cpp:6060
 msgctxt "turkey.kgm"
 msgid "Aydın"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6055 mapsdatatranslation.cpp:6056
+#: mapsdatatranslation.cpp:6061 mapsdatatranslation.cpp:6062
 msgctxt "turkey.kgm"
 msgid "Balıkesir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6057 mapsdatatranslation.cpp:6058
+#: mapsdatatranslation.cpp:6063 mapsdatatranslation.cpp:6064
 msgctxt "turkey.kgm"
 msgid "Bilecik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6059 mapsdatatranslation.cpp:6060
+#: mapsdatatranslation.cpp:6065 mapsdatatranslation.cpp:6066
 msgctxt "turkey.kgm"
 msgid "Bingöl"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6061 mapsdatatranslation.cpp:6062
+#: mapsdatatranslation.cpp:6067 mapsdatatranslation.cpp:6068
 msgctxt "turkey.kgm"
 msgid "Bitlis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6063 mapsdatatranslation.cpp:6064
+#: mapsdatatranslation.cpp:6069 mapsdatatranslation.cpp:6070
 msgctxt "turkey.kgm"
 msgid "Bolu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6065 mapsdatatranslation.cpp:6066
+#: mapsdatatranslation.cpp:6071 mapsdatatranslation.cpp:6072
 msgctxt "turkey.kgm"
 msgid "Burdur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6067 mapsdatatranslation.cpp:6068
+#: mapsdatatranslation.cpp:6073 mapsdatatranslation.cpp:6074
 msgctxt "turkey.kgm"
 msgid "Bursa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6069 mapsdatatranslation.cpp:6070
+#: mapsdatatranslation.cpp:6075 mapsdatatranslation.cpp:6076
 msgctxt "turkey.kgm"
 msgid "Çanakkale"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6071 mapsdatatranslation.cpp:6072
+#: mapsdatatranslation.cpp:6077 mapsdatatranslation.cpp:6078
 msgctxt "turkey.kgm"
 msgid "Çankırı"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6073 mapsdatatranslation.cpp:6074
+#: mapsdatatranslation.cpp:6079 mapsdatatranslation.cpp:6080
 msgctxt "turkey.kgm"
 msgid "Çorum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6075 mapsdatatranslation.cpp:6076
+#: mapsdatatranslation.cpp:6081 mapsdatatranslation.cpp:6082
 msgctxt "turkey.kgm"
 msgid "Denizli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6077 mapsdatatranslation.cpp:6078
+#: mapsdatatranslation.cpp:6083 mapsdatatranslation.cpp:6084
 msgctxt "turkey.kgm"
 msgid "Diyarbakır"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6079 mapsdatatranslation.cpp:6080
+#: mapsdatatranslation.cpp:6085 mapsdatatranslation.cpp:6086
 msgctxt "turkey.kgm"
 msgid "Edirne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6081 mapsdatatranslation.cpp:6082
+#: mapsdatatranslation.cpp:6087 mapsdatatranslation.cpp:6088
 msgctxt "turkey.kgm"
 msgid "Elazığ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6083 mapsdatatranslation.cpp:6084
+#: mapsdatatranslation.cpp:6089 mapsdatatranslation.cpp:6090
 msgctxt "turkey.kgm"
 msgid "Erzincan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6085 mapsdatatranslation.cpp:6086
+#: mapsdatatranslation.cpp:6091 mapsdatatranslation.cpp:6092
 msgctxt "turkey.kgm"
 msgid "Erzurum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6087 mapsdatatranslation.cpp:6088
+#: mapsdatatranslation.cpp:6093 mapsdatatranslation.cpp:6094
 msgctxt "turkey.kgm"
 msgid "Eskişehir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6089 mapsdatatranslation.cpp:6090
+#: mapsdatatranslation.cpp:6095 mapsdatatranslation.cpp:6096
 msgctxt "turkey.kgm"
 msgid "Gaziantep"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6091 mapsdatatranslation.cpp:6092
+#: mapsdatatranslation.cpp:6097 mapsdatatranslation.cpp:6098
 msgctxt "turkey.kgm"
 msgid "Giresun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6093 mapsdatatranslation.cpp:6094
+#: mapsdatatranslation.cpp:6099 mapsdatatranslation.cpp:6100
 msgctxt "turkey.kgm"
 msgid "Gümüşhane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6095 mapsdatatranslation.cpp:6096
+#: mapsdatatranslation.cpp:6101 mapsdatatranslation.cpp:6102
 msgctxt "turkey.kgm"
 msgid "Hakkari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6097
+#: mapsdatatranslation.cpp:6103
 msgctxt "turkey.kgm"
 msgid "Hatay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6098
+#: mapsdatatranslation.cpp:6104
 msgctxt "turkey.kgm"
 msgid "Antakya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6099 mapsdatatranslation.cpp:6100
+#: mapsdatatranslation.cpp:6105 mapsdatatranslation.cpp:6106
 msgctxt "turkey.kgm"
 msgid "Isparta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6101 mapsdatatranslation.cpp:6102
+#: mapsdatatranslation.cpp:6107 mapsdatatranslation.cpp:6108
 msgctxt "turkey.kgm"
 msgid "Mersin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6103 mapsdatatranslation.cpp:6104
+#: mapsdatatranslation.cpp:6109 mapsdatatranslation.cpp:6110
 msgctxt "turkey.kgm"
 msgid "İstanbul"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6105 mapsdatatranslation.cpp:6106
+#: mapsdatatranslation.cpp:6111 mapsdatatranslation.cpp:6112
 msgctxt "turkey.kgm"
 msgid "İzmir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6107 mapsdatatranslation.cpp:6108
+#: mapsdatatranslation.cpp:6113 mapsdatatranslation.cpp:6114
 msgctxt "turkey.kgm"
 msgid "Kars"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6109 mapsdatatranslation.cpp:6110
+#: mapsdatatranslation.cpp:6115 mapsdatatranslation.cpp:6116
 msgctxt "turkey.kgm"
 msgid "Kastamonu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6111 mapsdatatranslation.cpp:6112
+#: mapsdatatranslation.cpp:6117 mapsdatatranslation.cpp:6118
 msgctxt "turkey.kgm"
 msgid "Kayseri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6113 mapsdatatranslation.cpp:6114
+#: mapsdatatranslation.cpp:6119 mapsdatatranslation.cpp:6120
 msgctxt "turkey.kgm"
 msgid "Kırklareli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6115 mapsdatatranslation.cpp:6116
+#: mapsdatatranslation.cpp:6121 mapsdatatranslation.cpp:6122
 msgctxt "turkey.kgm"
 msgid "Kırşehir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6117
+#: mapsdatatranslation.cpp:6123
 msgctxt "turkey.kgm"
 msgid "Kocaeli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6118
+#: mapsdatatranslation.cpp:6124
 msgctxt "turkey.kgm"
 msgid "İzmit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6119 mapsdatatranslation.cpp:6120
+#: mapsdatatranslation.cpp:6125 mapsdatatranslation.cpp:6126
 msgctxt "turkey.kgm"
 msgid "Konya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6121 mapsdatatranslation.cpp:6122
+#: mapsdatatranslation.cpp:6127 mapsdatatranslation.cpp:6128
 msgctxt "turkey.kgm"
 msgid "Kütahya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6123 mapsdatatranslation.cpp:6124
+#: mapsdatatranslation.cpp:6129 mapsdatatranslation.cpp:6130
 msgctxt "turkey.kgm"
 msgid "Malatya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6125 mapsdatatranslation.cpp:6126
+#: mapsdatatranslation.cpp:6131 mapsdatatranslation.cpp:6132
 msgctxt "turkey.kgm"
 msgid "Manisa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6127 mapsdatatranslation.cpp:6128
+#: mapsdatatranslation.cpp:6133 mapsdatatranslation.cpp:6134
 msgctxt "turkey.kgm"
 msgid "Kahramanmaraş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6129 mapsdatatranslation.cpp:6130
+#: mapsdatatranslation.cpp:6135 mapsdatatranslation.cpp:6136
 msgctxt "turkey.kgm"
 msgid "Mardin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6131 mapsdatatranslation.cpp:6132
+#: mapsdatatranslation.cpp:6137 mapsdatatranslation.cpp:6138
 msgctxt "turkey.kgm"
 msgid "Muğla"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6133 mapsdatatranslation.cpp:6134
+#: mapsdatatranslation.cpp:6139 mapsdatatranslation.cpp:6140
 msgctxt "turkey.kgm"
 msgid "Muş"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6135 mapsdatatranslation.cpp:6136
+#: mapsdatatranslation.cpp:6141 mapsdatatranslation.cpp:6142
 msgctxt "turkey.kgm"
 msgid "Nevşehir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6137 mapsdatatranslation.cpp:6138
+#: mapsdatatranslation.cpp:6143 mapsdatatranslation.cpp:6144
 msgctxt "turkey.kgm"
 msgid "Niğde"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6139 mapsdatatranslation.cpp:6140
+#: mapsdatatranslation.cpp:6145 mapsdatatranslation.cpp:6146
 msgctxt "turkey.kgm"
 msgid "Ordu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6141 mapsdatatranslation.cpp:6142
+#: mapsdatatranslation.cpp:6147 mapsdatatranslation.cpp:6148
 msgctxt "turkey.kgm"
 msgid "Rize"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6143
+#: mapsdatatranslation.cpp:6149
 msgctxt "turkey.kgm"
 msgid "Sakarya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6144
+#: mapsdatatranslation.cpp:6150
 msgctxt "turkey.kgm"
 msgid "Adapazarı"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6145 mapsdatatranslation.cpp:6146
+#: mapsdatatranslation.cpp:6151 mapsdatatranslation.cpp:6152
 msgctxt "turkey.kgm"
 msgid "Samsun"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6147 mapsdatatranslation.cpp:6148
+#: mapsdatatranslation.cpp:6153 mapsdatatranslation.cpp:6154
 msgctxt "turkey.kgm"
 msgid "Siirt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6149 mapsdatatranslation.cpp:6150
+#: mapsdatatranslation.cpp:6155 mapsdatatranslation.cpp:6156
 msgctxt "turkey.kgm"
 msgid "Sinop"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6151 mapsdatatranslation.cpp:6152
+#: mapsdatatranslation.cpp:6157 mapsdatatranslation.cpp:6158
 msgctxt "turkey.kgm"
 msgid "Sivas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6153 mapsdatatranslation.cpp:6154
+#: mapsdatatranslation.cpp:6159 mapsdatatranslation.cpp:6160
 msgctxt "turkey.kgm"
 msgid "Tekirdağ"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6155 mapsdatatranslation.cpp:6156
+#: mapsdatatranslation.cpp:6161 mapsdatatranslation.cpp:6162
 msgctxt "turkey.kgm"
 msgid "Tokat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6157 mapsdatatranslation.cpp:6158
+#: mapsdatatranslation.cpp:6163 mapsdatatranslation.cpp:6164
 msgctxt "turkey.kgm"
 msgid "Trabzon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6159 mapsdatatranslation.cpp:6160
+#: mapsdatatranslation.cpp:6165 mapsdatatranslation.cpp:6166
 msgctxt "turkey.kgm"
 msgid "Tunceli"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6161 mapsdatatranslation.cpp:6162
+#: mapsdatatranslation.cpp:6167 mapsdatatranslation.cpp:6168
 msgctxt "turkey.kgm"
 msgid "Şanlıurfa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6163 mapsdatatranslation.cpp:6164
+#: mapsdatatranslation.cpp:6169 mapsdatatranslation.cpp:6170
 msgctxt "turkey.kgm"
 msgid "Uşak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6165 mapsdatatranslation.cpp:6166
+#: mapsdatatranslation.cpp:6171 mapsdatatranslation.cpp:6172
 msgctxt "turkey.kgm"
 msgid "Van"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6167 mapsdatatranslation.cpp:6168
+#: mapsdatatranslation.cpp:6173 mapsdatatranslation.cpp:6174
 msgctxt "turkey.kgm"
 msgid "Yozgat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6169 mapsdatatranslation.cpp:6170
+#: mapsdatatranslation.cpp:6175 mapsdatatranslation.cpp:6176
 msgctxt "turkey.kgm"
 msgid "Zonguldak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6171 mapsdatatranslation.cpp:6172
+#: mapsdatatranslation.cpp:6177 mapsdatatranslation.cpp:6178
 msgctxt "turkey.kgm"
 msgid "Aksaray"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6173 mapsdatatranslation.cpp:6174
+#: mapsdatatranslation.cpp:6179 mapsdatatranslation.cpp:6180
 msgctxt "turkey.kgm"
 msgid "Bayburt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6175 mapsdatatranslation.cpp:6176
+#: mapsdatatranslation.cpp:6181 mapsdatatranslation.cpp:6182
 msgctxt "turkey.kgm"
 msgid "Karaman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6177 mapsdatatranslation.cpp:6178
+#: mapsdatatranslation.cpp:6183 mapsdatatranslation.cpp:6184
 msgctxt "turkey.kgm"
 msgid "Kırıkkale"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6179 mapsdatatranslation.cpp:6180
+#: mapsdatatranslation.cpp:6185 mapsdatatranslation.cpp:6186
 msgctxt "turkey.kgm"
 msgid "Batman"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6181 mapsdatatranslation.cpp:6182
+#: mapsdatatranslation.cpp:6187 mapsdatatranslation.cpp:6188
 msgctxt "turkey.kgm"
 msgid "Şırnak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6183 mapsdatatranslation.cpp:6184
+#: mapsdatatranslation.cpp:6189 mapsdatatranslation.cpp:6190
 msgctxt "turkey.kgm"
 msgid "Bartın"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6185 mapsdatatranslation.cpp:6186
+#: mapsdatatranslation.cpp:6191 mapsdatatranslation.cpp:6192
 msgctxt "turkey.kgm"
 msgid "Ardahan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6187 mapsdatatranslation.cpp:6188
+#: mapsdatatranslation.cpp:6193 mapsdatatranslation.cpp:6194
 msgctxt "turkey.kgm"
 msgid "Iğdır"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6189 mapsdatatranslation.cpp:6190
+#: mapsdatatranslation.cpp:6195 mapsdatatranslation.cpp:6196
 msgctxt "turkey.kgm"
 msgid "Yalova"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6191 mapsdatatranslation.cpp:6192
+#: mapsdatatranslation.cpp:6197 mapsdatatranslation.cpp:6198
 msgctxt "turkey.kgm"
 msgid "Karabük"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6193 mapsdatatranslation.cpp:6194
+#: mapsdatatranslation.cpp:6199 mapsdatatranslation.cpp:6200
 msgctxt "turkey.kgm"
 msgid "Kilis"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6195 mapsdatatranslation.cpp:6196
+#: mapsdatatranslation.cpp:6201 mapsdatatranslation.cpp:6202
 msgctxt "turkey.kgm"
 msgid "Osmaniye"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6197 mapsdatatranslation.cpp:6198
+#: mapsdatatranslation.cpp:6203 mapsdatatranslation.cpp:6204
 msgctxt "turkey.kgm"
 msgid "Düzce"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6199
+#: mapsdatatranslation.cpp:6205
 msgctxt "turkmenistan.kgm"
 msgid "Turkmenistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6200
+#: mapsdatatranslation.cpp:6206
 msgctxt "turkmenistan.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6201
+#: mapsdatatranslation.cpp:6207
 msgctxt "turkmenistan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6202
+#: mapsdatatranslation.cpp:6208
 msgctxt "turkmenistan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6203
+#: mapsdatatranslation.cpp:6209
 msgctxt "turkmenistan.kgm"
 msgid "Not Turkmenistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6204
+#: mapsdatatranslation.cpp:6210
 msgctxt "turkmenistan.kgm"
 msgid "Ahal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6205
+#: mapsdatatranslation.cpp:6211
 msgctxt "turkmenistan.kgm"
 msgid "Balkan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6206
+#: mapsdatatranslation.cpp:6212
 msgctxt "turkmenistan.kgm"
 msgid "Dashhowuz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6207
+#: mapsdatatranslation.cpp:6213
 msgctxt "turkmenistan.kgm"
 msgid "Lebap"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6208
+#: mapsdatatranslation.cpp:6214
 msgctxt "turkmenistan.kgm"
 msgid "Mary"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6209
+#: mapsdatatranslation.cpp:6215
 msgctxt "ukraine.kgm"
 msgid "Ukraine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6210
+#: mapsdatatranslation.cpp:6216
 msgctxt "ukraine.kgm"
 msgid "Oblasts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6211
+#: mapsdatatranslation.cpp:6217
 msgctxt "ukraine.kgm"
 msgid "Volyns'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6212
+#: mapsdatatranslation.cpp:6218
 msgctxt "ukraine.kgm"
 msgid "Luts'k"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6213
+#: mapsdatatranslation.cpp:6219
 msgctxt "ukraine.kgm"
 msgid "L'vivs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6214
+#: mapsdatatranslation.cpp:6220
 msgctxt "ukraine.kgm"
 msgid "L'viv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6215
+#: mapsdatatranslation.cpp:6221
 msgctxt "ukraine.kgm"
 msgid "Zakarpats'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6216
+#: mapsdatatranslation.cpp:6222
 msgctxt "ukraine.kgm"
 msgid "Uzhhorod"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6217
+#: mapsdatatranslation.cpp:6223
 msgctxt "ukraine.kgm"
 msgid "Rivnens'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6218
+#: mapsdatatranslation.cpp:6224
 msgctxt "ukraine.kgm"
 msgid "Rivne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6219
+#: mapsdatatranslation.cpp:6225
 msgctxt "ukraine.kgm"
 msgid "Ternopil's'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6220
+#: mapsdatatranslation.cpp:6226
 msgctxt "ukraine.kgm"
 msgid "Ternopil'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6221
+#: mapsdatatranslation.cpp:6227
 msgctxt "ukraine.kgm"
 msgid "Khmel'nyts'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6222
+#: mapsdatatranslation.cpp:6228
 msgctxt "ukraine.kgm"
 msgid "Khmel'nyts'ky"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6223
+#: mapsdatatranslation.cpp:6229
 msgctxt "ukraine.kgm"
 msgid "Ivano-Frankivs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6224
+#: mapsdatatranslation.cpp:6230
 msgctxt "ukraine.kgm"
 msgid "Ivano-Frankivs'k"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6225
+#: mapsdatatranslation.cpp:6231
 msgctxt "ukraine.kgm"
 msgid "Chernivets'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6226
+#: mapsdatatranslation.cpp:6232
 msgctxt "ukraine.kgm"
 msgid "Chernivtsi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6227
+#: mapsdatatranslation.cpp:6233
 msgctxt "ukraine.kgm"
 msgid "Zhytomyrs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6228
+#: mapsdatatranslation.cpp:6234
 msgctxt "ukraine.kgm"
 msgid "Zhytomyr"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6229
+#: mapsdatatranslation.cpp:6235
 msgctxt "ukraine.kgm"
 msgid "Vinnyts'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6230
+#: mapsdatatranslation.cpp:6236
 msgctxt "ukraine.kgm"
 msgid "Vinnytsya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6231
+#: mapsdatatranslation.cpp:6237
 msgctxt "ukraine.kgm"
 msgid "Kyivs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6232
+#: mapsdatatranslation.cpp:6238
 msgctxt "ukraine.kgm"
 msgid "Kyiv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6233
+#: mapsdatatranslation.cpp:6239
 msgctxt "ukraine.kgm"
 msgid "Cherkas'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6234
+#: mapsdatatranslation.cpp:6240
 msgctxt "ukraine.kgm"
 msgid "Cherkasy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6235
+#: mapsdatatranslation.cpp:6241
 msgctxt "ukraine.kgm"
 msgid "Kirovohrads'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6236
+#: mapsdatatranslation.cpp:6242
 msgctxt "ukraine.kgm"
 msgid "Kirovohrad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6237
+#: mapsdatatranslation.cpp:6243
 msgctxt "ukraine.kgm"
 msgid "Mykolayivs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6238
+#: mapsdatatranslation.cpp:6244
 msgctxt "ukraine.kgm"
 msgid "Mykolayiv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6239
+#: mapsdatatranslation.cpp:6245
 msgctxt "ukraine.kgm"
 msgid "Odes'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6240
+#: mapsdatatranslation.cpp:6246
 msgctxt "ukraine.kgm"
 msgid "Odesa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6241
+#: mapsdatatranslation.cpp:6247
 msgctxt "ukraine.kgm"
 msgid "Chernihivs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6242
+#: mapsdatatranslation.cpp:6248
 msgctxt "ukraine.kgm"
 msgid "Chernihiv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6243
+#: mapsdatatranslation.cpp:6249
 msgctxt "ukraine.kgm"
 msgid "Sums'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6244
+#: mapsdatatranslation.cpp:6250
 msgctxt "ukraine.kgm"
 msgid "Sumy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6245
+#: mapsdatatranslation.cpp:6251
 msgctxt "ukraine.kgm"
 msgid "Poltavs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6246
+#: mapsdatatranslation.cpp:6252
 msgctxt "ukraine.kgm"
 msgid "Poltava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6247
+#: mapsdatatranslation.cpp:6253
 msgctxt "ukraine.kgm"
 msgid "Kharkivs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6248
+#: mapsdatatranslation.cpp:6254
 msgctxt "ukraine.kgm"
 msgid "Kharkiv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6249
+#: mapsdatatranslation.cpp:6255
 msgctxt "ukraine.kgm"
 msgid "Dnipropetrovs'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6250
+#: mapsdatatranslation.cpp:6256
 msgctxt "ukraine.kgm"
 msgid "Dnipropetrovs'k"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6251
+#: mapsdatatranslation.cpp:6257
 msgctxt "ukraine.kgm"
 msgid "Donets'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6252
+#: mapsdatatranslation.cpp:6258
 msgctxt "ukraine.kgm"
 msgid "Donets'k"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6253
+#: mapsdatatranslation.cpp:6259
 msgctxt "ukraine.kgm"
 msgid "Zaporiz'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6254
+#: mapsdatatranslation.cpp:6260
 msgctxt "ukraine.kgm"
 msgid "Zaporizhzhia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6255
+#: mapsdatatranslation.cpp:6261
 msgctxt "ukraine.kgm"
 msgid "Khersons'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6256
+#: mapsdatatranslation.cpp:6262
 msgctxt "ukraine.kgm"
 msgid "Kherson"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6257
+#: mapsdatatranslation.cpp:6263
 msgctxt "ukraine.kgm"
 msgid "Luhans'ka oblast'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6258
+#: mapsdatatranslation.cpp:6264
 msgctxt "ukraine.kgm"
 msgid "Luhans'k"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6259
+#: mapsdatatranslation.cpp:6265
 msgctxt "ukraine.kgm"
 msgid "Autonomous Republic of Crimea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6260
+#: mapsdatatranslation.cpp:6266
 msgctxt "ukraine.kgm"
 msgid "Simferopol'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6261
+#: mapsdatatranslation.cpp:6267
 msgctxt "ukraine.kgm"
 msgid "City of Kyiv"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6262
+#: mapsdatatranslation.cpp:6268
 msgctxt "ukraine.kgm"
 msgid "City of Sevastopol'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6263
+#: mapsdatatranslation.cpp:6269
 msgctxt "ukraine.kgm"
 msgid "Dnipro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6264
+#: mapsdatatranslation.cpp:6270
 msgctxt "ukraine.kgm"
 msgid "Azov Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6265
+#: mapsdatatranslation.cpp:6271
 msgctxt "ukraine.kgm"
 msgid "Black Sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6266
+#: mapsdatatranslation.cpp:6272
 msgctxt "ukraine.kgm"
 msgid "Not Ukraine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6267
+#: mapsdatatranslation.cpp:6273
 msgctxt "ukraine.kgm"
 msgid "Border/Coast"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6268
+#: mapsdatatranslation.cpp:6274
 msgctxt "ukraine.kgm"
 msgid "River"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6269
+#: mapsdatatranslation.cpp:6275
 msgctxt "uruguay.kgm"
 msgid "Uruguay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6270
+#: mapsdatatranslation.cpp:6276
 msgctxt "uruguay.kgm"
 msgid "Departments"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6271 mapsdatatranslation.cpp:6272
+#: mapsdatatranslation.cpp:6277 mapsdatatranslation.cpp:6278
 msgctxt "uruguay.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6273
+#: mapsdatatranslation.cpp:6279
 msgctxt "uruguay.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6274
+#: mapsdatatranslation.cpp:6280
 msgctxt "uruguay.kgm"
 msgid "Not Uruguay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6275 mapsdatatranslation.cpp:6276
+#: mapsdatatranslation.cpp:6281 mapsdatatranslation.cpp:6282
 msgctxt "uruguay.kgm"
 msgid "Artigas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6277 mapsdatatranslation.cpp:6278
+#: mapsdatatranslation.cpp:6283 mapsdatatranslation.cpp:6284
 msgctxt "uruguay.kgm"
 msgid "Canelones"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6279
+#: mapsdatatranslation.cpp:6285
 msgctxt "uruguay.kgm"
 msgid "Cerro Largo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6280
+#: mapsdatatranslation.cpp:6286
 msgctxt "uruguay.kgm"
 msgid "Melo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6281 mapsdatatranslation.cpp:6282
+#: mapsdatatranslation.cpp:6287 mapsdatatranslation.cpp:6288
 msgctxt "uruguay.kgm"
 msgid "Colonia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6283 mapsdatatranslation.cpp:6284
+#: mapsdatatranslation.cpp:6289 mapsdatatranslation.cpp:6290
 msgctxt "uruguay.kgm"
 msgid "Durazno"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6285
+#: mapsdatatranslation.cpp:6291
 msgctxt "uruguay.kgm"
 msgid "Flores"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6286
+#: mapsdatatranslation.cpp:6292
 msgctxt "uruguay.kgm"
 msgid "Trinidad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6287 mapsdatatranslation.cpp:6288
+#: mapsdatatranslation.cpp:6293 mapsdatatranslation.cpp:6294
 msgctxt "uruguay.kgm"
 msgid "Florida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6289
+#: mapsdatatranslation.cpp:6295
 msgctxt "uruguay.kgm"
 msgid "Lavalleja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6290
+#: mapsdatatranslation.cpp:6296
 msgctxt "uruguay.kgm"
 msgid "Minas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6291 mapsdatatranslation.cpp:6292
+#: mapsdatatranslation.cpp:6297 mapsdatatranslation.cpp:6298
 msgctxt "uruguay.kgm"
 msgid "Maldonado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6293 mapsdatatranslation.cpp:6294
+#: mapsdatatranslation.cpp:6299 mapsdatatranslation.cpp:6300
 msgctxt "uruguay.kgm"
 msgid "Montevideo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6295 mapsdatatranslation.cpp:6296
+#: mapsdatatranslation.cpp:6301 mapsdatatranslation.cpp:6302
 msgctxt "uruguay.kgm"
 msgid "Paysandú"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6297
+#: mapsdatatranslation.cpp:6303
 msgctxt "uruguay.kgm"
 msgid "Río Negro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6298
+#: mapsdatatranslation.cpp:6304
 msgctxt "uruguay.kgm"
 msgid "Fray Bentos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6299 mapsdatatranslation.cpp:6300
+#: mapsdatatranslation.cpp:6305 mapsdatatranslation.cpp:6306
 msgctxt "uruguay.kgm"
 msgid "Rivera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6301 mapsdatatranslation.cpp:6302
+#: mapsdatatranslation.cpp:6307 mapsdatatranslation.cpp:6308
 msgctxt "uruguay.kgm"
 msgid "Rocha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6303 mapsdatatranslation.cpp:6304
+#: mapsdatatranslation.cpp:6309 mapsdatatranslation.cpp:6310
 msgctxt "uruguay.kgm"
 msgid "Salto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6305 mapsdatatranslation.cpp:6306
+#: mapsdatatranslation.cpp:6311 mapsdatatranslation.cpp:6312
 msgctxt "uruguay.kgm"
 msgid "San José"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6307
+#: mapsdatatranslation.cpp:6313
 msgctxt "uruguay.kgm"
 msgid "Soriano"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6308
+#: mapsdatatranslation.cpp:6314
 msgctxt "uruguay.kgm"
 msgid "Mercedes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6309 mapsdatatranslation.cpp:6310
+#: mapsdatatranslation.cpp:6315 mapsdatatranslation.cpp:6316
 msgctxt "uruguay.kgm"
 msgid "Tacuarembó"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6311 mapsdatatranslation.cpp:6312
+#: mapsdatatranslation.cpp:6317 mapsdatatranslation.cpp:6318
 msgctxt "uruguay.kgm"
 msgid "Treinta y Tres"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6313
+#: mapsdatatranslation.cpp:6319
 msgctxt "usa.kgm"
 msgid "USA"
 msgstr "USA"
 
-#: mapsdatatranslation.cpp:6314
+#: mapsdatatranslation.cpp:6320
 msgctxt "usa.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6315
+#: mapsdatatranslation.cpp:6321
 msgctxt "usa.kgm"
 msgid "Frontier"
 msgstr "Goror"
 
-#: mapsdatatranslation.cpp:6316
+#: mapsdatatranslation.cpp:6322
 msgctxt "usa.kgm"
 msgid "Coast"
 msgstr "Arfordir"
 
-#: mapsdatatranslation.cpp:6317
+#: mapsdatatranslation.cpp:6323
 msgctxt "usa.kgm"
 msgid "Water"
 msgstr "Dŵr"
 
-#: mapsdatatranslation.cpp:6318
+#: mapsdatatranslation.cpp:6324
 msgctxt "usa.kgm"
 msgid "Lake Superior"
 msgstr "Lake Superior"
 
-#: mapsdatatranslation.cpp:6319
+#: mapsdatatranslation.cpp:6325
 msgctxt "usa.kgm"
 msgid "Lake Michigan"
 msgstr "Lake Michigan"
 
-#: mapsdatatranslation.cpp:6320
+#: mapsdatatranslation.cpp:6326
 msgctxt "usa.kgm"
 msgid "Lake Huron"
 msgstr "Lake Huron"
 
-#: mapsdatatranslation.cpp:6321
+#: mapsdatatranslation.cpp:6327
 msgctxt "usa.kgm"
 msgid "Lake Erie"
 msgstr "Lake Erie"
 
-#: mapsdatatranslation.cpp:6322
+#: mapsdatatranslation.cpp:6328
 msgctxt "usa.kgm"
 msgid "Lake Ontario"
 msgstr "Lake Ontario"
 
-#: mapsdatatranslation.cpp:6323
+#: mapsdatatranslation.cpp:6329
 msgctxt "usa.kgm"
 msgid "The Bahamas"
 msgstr "The Bahamas"
 
-#: mapsdatatranslation.cpp:6324
+#: mapsdatatranslation.cpp:6330
 msgctxt "usa.kgm"
 msgid "Cuba"
 msgstr "Cuba"
 
-#: mapsdatatranslation.cpp:6325
+#: mapsdatatranslation.cpp:6331
 msgctxt "usa.kgm"
 msgid "Canada"
 msgstr "Canada"
 
-#: mapsdatatranslation.cpp:6326
+#: mapsdatatranslation.cpp:6332
 msgctxt "usa.kgm"
 msgid "Mexico"
 msgstr "Mexico"
 
-#: mapsdatatranslation.cpp:6327
+#: mapsdatatranslation.cpp:6333
 msgctxt "usa.kgm"
 msgid "Russia"
 msgstr "Rwsia"
 
-#: mapsdatatranslation.cpp:6328
+#: mapsdatatranslation.cpp:6334
 msgctxt "usa.kgm"
 msgid "Washington DC"
 msgstr "Washington DC"
 
-#: mapsdatatranslation.cpp:6329
+#: mapsdatatranslation.cpp:6335
 msgctxt "usa.kgm"
 msgid "Alabama"
 msgstr "Alabama"
 
-#: mapsdatatranslation.cpp:6330
+#: mapsdatatranslation.cpp:6336
 msgctxt "usa.kgm"
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: mapsdatatranslation.cpp:6331
+#: mapsdatatranslation.cpp:6337
 msgctxt "usa.kgm"
 msgid "Alaska"
 msgstr "Alaska"
 
-#: mapsdatatranslation.cpp:6332
+#: mapsdatatranslation.cpp:6338
 msgctxt "usa.kgm"
 msgid "Juneau"
 msgstr "Juneau"
 
-#: mapsdatatranslation.cpp:6333
+#: mapsdatatranslation.cpp:6339
 msgctxt "usa.kgm"
 msgid "Arizona"
 msgstr "Arizona"
 
-#: mapsdatatranslation.cpp:6334
+#: mapsdatatranslation.cpp:6340
 msgctxt "usa.kgm"
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: mapsdatatranslation.cpp:6335
+#: mapsdatatranslation.cpp:6341
 msgctxt "usa.kgm"
 msgid "Arkansas"
 msgstr "Arkansas"
 
-#: mapsdatatranslation.cpp:6336
+#: mapsdatatranslation.cpp:6342
 msgctxt "usa.kgm"
 msgid "Little Rock"
 msgstr "Little Rock"
 
-#: mapsdatatranslation.cpp:6337
+#: mapsdatatranslation.cpp:6343
 msgctxt "usa.kgm"
 msgid "California"
 msgstr "California"
 
-#: mapsdatatranslation.cpp:6338
+#: mapsdatatranslation.cpp:6344
 msgctxt "usa.kgm"
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: mapsdatatranslation.cpp:6339
+#: mapsdatatranslation.cpp:6345
 msgctxt "usa.kgm"
 msgid "Colorado"
 msgstr "Colorado"
 
-#: mapsdatatranslation.cpp:6340
+#: mapsdatatranslation.cpp:6346
 msgctxt "usa.kgm"
 msgid "Denver"
 msgstr "Denver"
 
-#: mapsdatatranslation.cpp:6341
+#: mapsdatatranslation.cpp:6347
 msgctxt "usa.kgm"
 msgid "Connecticut"
 msgstr "Connecticut"
 
-#: mapsdatatranslation.cpp:6342
+#: mapsdatatranslation.cpp:6348
 msgctxt "usa.kgm"
 msgid "Hartford"
 msgstr "Hartford"
 
-#: mapsdatatranslation.cpp:6343
+#: mapsdatatranslation.cpp:6349
 msgctxt "usa.kgm"
 msgid "Delaware"
 msgstr "Delaware"
 
-#: mapsdatatranslation.cpp:6344
+#: mapsdatatranslation.cpp:6350
 msgctxt "usa.kgm"
 msgid "Dover"
 msgstr "Dover"
 
-#: mapsdatatranslation.cpp:6345
+#: mapsdatatranslation.cpp:6351
 msgctxt "usa.kgm"
 msgid "Florida"
 msgstr "Florida"
 
-#: mapsdatatranslation.cpp:6346
+#: mapsdatatranslation.cpp:6352
 msgctxt "usa.kgm"
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: mapsdatatranslation.cpp:6347
+#: mapsdatatranslation.cpp:6353
 msgctxt "usa.kgm"
 msgid "Georgia"
 msgstr "Georgia"
 
-#: mapsdatatranslation.cpp:6348
+#: mapsdatatranslation.cpp:6354
 msgctxt "usa.kgm"
 msgid "Atlanta"
 msgstr "Atlanta"
 
-#: mapsdatatranslation.cpp:6349
+#: mapsdatatranslation.cpp:6355
 msgctxt "usa.kgm"
 msgid "Hawaii"
 msgstr "Hawaii"
 
-#: mapsdatatranslation.cpp:6350
+#: mapsdatatranslation.cpp:6356
 msgctxt "usa.kgm"
 msgid "Honolulu"
 msgstr "Honolulu"
 
-#: mapsdatatranslation.cpp:6351
+#: mapsdatatranslation.cpp:6357
 msgctxt "usa.kgm"
 msgid "Idaho"
 msgstr "Idaho"
 
-#: mapsdatatranslation.cpp:6352
+#: mapsdatatranslation.cpp:6358
 msgctxt "usa.kgm"
 msgid "Boise"
 msgstr "Boise"
 
-#: mapsdatatranslation.cpp:6353
+#: mapsdatatranslation.cpp:6359
 msgctxt "usa.kgm"
 msgid "Illinois"
 msgstr "Illinois"
 
-#: mapsdatatranslation.cpp:6354
+#: mapsdatatranslation.cpp:6360
 msgctxt "usa.kgm"
 msgid "Springfield"
 msgstr "Springfield"
 
-#: mapsdatatranslation.cpp:6355
+#: mapsdatatranslation.cpp:6361
 msgctxt "usa.kgm"
 msgid "Indiana"
 msgstr "Indiana"
 
-#: mapsdatatranslation.cpp:6356
+#: mapsdatatranslation.cpp:6362
 msgctxt "usa.kgm"
 msgid "Indianapolis"
 msgstr "Indianapolis"
 
-#: mapsdatatranslation.cpp:6357
+#: mapsdatatranslation.cpp:6363
 msgctxt "usa.kgm"
 msgid "Iowa"
 msgstr "Iowa"
 
-#: mapsdatatranslation.cpp:6358
+#: mapsdatatranslation.cpp:6364
 msgctxt "usa.kgm"
 msgid "Des Moines"
 msgstr "Des Moines"
 
-#: mapsdatatranslation.cpp:6359
+#: mapsdatatranslation.cpp:6365
 msgctxt "usa.kgm"
 msgid "Kansas"
 msgstr "Kansas"
 
-#: mapsdatatranslation.cpp:6360
+#: mapsdatatranslation.cpp:6366
 msgctxt "usa.kgm"
 msgid "Topeka"
 msgstr "Topeka"
 
-#: mapsdatatranslation.cpp:6361
+#: mapsdatatranslation.cpp:6367
 msgctxt "usa.kgm"
 msgid "Kentucky"
 msgstr "Kentucky"
 
-#: mapsdatatranslation.cpp:6362
+#: mapsdatatranslation.cpp:6368
 msgctxt "usa.kgm"
 msgid "Frankfort"
 msgstr "Frankfort"
 
-#: mapsdatatranslation.cpp:6363
+#: mapsdatatranslation.cpp:6369
 msgctxt "usa.kgm"
 msgid "Louisiana"
 msgstr "Louisiana"
 
-#: mapsdatatranslation.cpp:6364
+#: mapsdatatranslation.cpp:6370
 msgctxt "usa.kgm"
 msgid "Baton Rouge"
 msgstr "Baton Rouge"
 
-#: mapsdatatranslation.cpp:6365
+#: mapsdatatranslation.cpp:6371
 msgctxt "usa.kgm"
 msgid "Maine"
 msgstr "Maine"
 
-#: mapsdatatranslation.cpp:6366
+#: mapsdatatranslation.cpp:6372
 msgctxt "usa.kgm"
 msgid "Augusta"
 msgstr "Augusta"
 
-#: mapsdatatranslation.cpp:6367
+#: mapsdatatranslation.cpp:6373
 msgctxt "usa.kgm"
 msgid "Maryland"
 msgstr "Maryland"
 
-#: mapsdatatranslation.cpp:6368
+#: mapsdatatranslation.cpp:6374
 msgctxt "usa.kgm"
 msgid "Annapolis"
 msgstr "Annapolis"
 
-#: mapsdatatranslation.cpp:6369
+#: mapsdatatranslation.cpp:6375
 msgctxt "usa.kgm"
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: mapsdatatranslation.cpp:6370
+#: mapsdatatranslation.cpp:6376
 msgctxt "usa.kgm"
 msgid "Boston"
 msgstr "Boston"
 
-#: mapsdatatranslation.cpp:6371
+#: mapsdatatranslation.cpp:6377
 msgctxt "usa.kgm"
 msgid "Michigan"
 msgstr "Michigan"
 
-#: mapsdatatranslation.cpp:6372
+#: mapsdatatranslation.cpp:6378
 msgctxt "usa.kgm"
 msgid "Lansing"
 msgstr "Lansing"
 
-#: mapsdatatranslation.cpp:6373
+#: mapsdatatranslation.cpp:6379
 msgctxt "usa.kgm"
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: mapsdatatranslation.cpp:6374
+#: mapsdatatranslation.cpp:6380
 msgctxt "usa.kgm"
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: mapsdatatranslation.cpp:6375
+#: mapsdatatranslation.cpp:6381
 msgctxt "usa.kgm"
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: mapsdatatranslation.cpp:6376
+#: mapsdatatranslation.cpp:6382
 msgctxt "usa.kgm"
 msgid "Jackson"
 msgstr "Jackson"
 
-#: mapsdatatranslation.cpp:6377
+#: mapsdatatranslation.cpp:6383
 msgctxt "usa.kgm"
 msgid "Missouri"
 msgstr "Missouri"
 
-#: mapsdatatranslation.cpp:6378
+#: mapsdatatranslation.cpp:6384
 msgctxt "usa.kgm"
 msgid "Jefferson City"
 msgstr "Jefferson City"
 
-#: mapsdatatranslation.cpp:6379
+#: mapsdatatranslation.cpp:6385
 msgctxt "usa.kgm"
 msgid "Montana"
 msgstr "Montana"
 
-#: mapsdatatranslation.cpp:6380
+#: mapsdatatranslation.cpp:6386
 msgctxt "usa.kgm"
 msgid "Helena"
 msgstr "Helena"
 
-#: mapsdatatranslation.cpp:6381
+#: mapsdatatranslation.cpp:6387
 msgctxt "usa.kgm"
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: mapsdatatranslation.cpp:6382
+#: mapsdatatranslation.cpp:6388
 msgctxt "usa.kgm"
 msgid "Lincoln"
 msgstr "Lincoln"
 
-#: mapsdatatranslation.cpp:6383
+#: mapsdatatranslation.cpp:6389
 msgctxt "usa.kgm"
 msgid "Nevada"
 msgstr "Nevada"
 
-#: mapsdatatranslation.cpp:6384
+#: mapsdatatranslation.cpp:6390
 msgctxt "usa.kgm"
 msgid "Carson City"
 msgstr "Carson City"
 
-#: mapsdatatranslation.cpp:6385
+#: mapsdatatranslation.cpp:6391
 msgctxt "usa.kgm"
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: mapsdatatranslation.cpp:6386
+#: mapsdatatranslation.cpp:6392
 msgctxt "usa.kgm"
 msgid "Concord"
 msgstr "Concord"
 
-#: mapsdatatranslation.cpp:6387
+#: mapsdatatranslation.cpp:6393
 msgctxt "usa.kgm"
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: mapsdatatranslation.cpp:6388
+#: mapsdatatranslation.cpp:6394
 msgctxt "usa.kgm"
 msgid "Trenton"
 msgstr "Trenton"
 
-#: mapsdatatranslation.cpp:6389
+#: mapsdatatranslation.cpp:6395
 msgctxt "usa.kgm"
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: mapsdatatranslation.cpp:6390
+#: mapsdatatranslation.cpp:6396
 msgctxt "usa.kgm"
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: mapsdatatranslation.cpp:6391
+#: mapsdatatranslation.cpp:6397
 msgctxt "usa.kgm"
 msgid "New York"
 msgstr "New York"
 
-#: mapsdatatranslation.cpp:6392
+#: mapsdatatranslation.cpp:6398
 msgctxt "usa.kgm"
 msgid "Albany"
 msgstr "Albany"
 
-#: mapsdatatranslation.cpp:6393
+#: mapsdatatranslation.cpp:6399
 msgctxt "usa.kgm"
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: mapsdatatranslation.cpp:6394
+#: mapsdatatranslation.cpp:6400
 msgctxt "usa.kgm"
 msgid "Raleigh"
 msgstr "Raleigh"
 
-#: mapsdatatranslation.cpp:6395
+#: mapsdatatranslation.cpp:6401
 msgctxt "usa.kgm"
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: mapsdatatranslation.cpp:6396
+#: mapsdatatranslation.cpp:6402
 msgctxt "usa.kgm"
 msgid "Bismarck"
 msgstr "Bismarck"
 
-#: mapsdatatranslation.cpp:6397
+#: mapsdatatranslation.cpp:6403
 msgctxt "usa.kgm"
 msgid "Ohio"
 msgstr "Ohio"
 
-#: mapsdatatranslation.cpp:6398
+#: mapsdatatranslation.cpp:6404
 msgctxt "usa.kgm"
 msgid "Columbus"
 msgstr "Columbus"
 
-#: mapsdatatranslation.cpp:6399
+#: mapsdatatranslation.cpp:6405
 msgctxt "usa.kgm"
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: mapsdatatranslation.cpp:6400
+#: mapsdatatranslation.cpp:6406
 msgctxt "usa.kgm"
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: mapsdatatranslation.cpp:6401
+#: mapsdatatranslation.cpp:6407
 msgctxt "usa.kgm"
 msgid "Oregon"
 msgstr "Oregon"
 
-#: mapsdatatranslation.cpp:6402
+#: mapsdatatranslation.cpp:6408
 msgctxt "usa.kgm"
 msgid "Salem"
 msgstr "Salem"
 
-#: mapsdatatranslation.cpp:6403
+#: mapsdatatranslation.cpp:6409
 msgctxt "usa.kgm"
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: mapsdatatranslation.cpp:6404
+#: mapsdatatranslation.cpp:6410
 msgctxt "usa.kgm"
 msgid "Harrisburg"
 msgstr "Harrisburg"
 
-#: mapsdatatranslation.cpp:6405
+#: mapsdatatranslation.cpp:6411
 msgctxt "usa.kgm"
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: mapsdatatranslation.cpp:6406
+#: mapsdatatranslation.cpp:6412
 msgctxt "usa.kgm"
 msgid "Providence"
 msgstr "Providence"
 
-#: mapsdatatranslation.cpp:6407
+#: mapsdatatranslation.cpp:6413
 msgctxt "usa.kgm"
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: mapsdatatranslation.cpp:6408
+#: mapsdatatranslation.cpp:6414
 msgctxt "usa.kgm"
 msgid "Columbia"
 msgstr "Columbia"
 
-#: mapsdatatranslation.cpp:6409
+#: mapsdatatranslation.cpp:6415
 msgctxt "usa.kgm"
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: mapsdatatranslation.cpp:6410
+#: mapsdatatranslation.cpp:6416
 msgctxt "usa.kgm"
 msgid "Pierre"
 msgstr "Pierre"
 
-#: mapsdatatranslation.cpp:6411
+#: mapsdatatranslation.cpp:6417
 msgctxt "usa.kgm"
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: mapsdatatranslation.cpp:6412
+#: mapsdatatranslation.cpp:6418
 msgctxt "usa.kgm"
 msgid "Nashville"
 msgstr "Nashville"
 
-#: mapsdatatranslation.cpp:6413
+#: mapsdatatranslation.cpp:6419
 msgctxt "usa.kgm"
 msgid "Texas"
 msgstr "Texas"
 
-#: mapsdatatranslation.cpp:6414
+#: mapsdatatranslation.cpp:6420
 msgctxt "usa.kgm"
 msgid "Austin"
 msgstr "Austin"
 
-#: mapsdatatranslation.cpp:6415
+#: mapsdatatranslation.cpp:6421
 msgctxt "usa.kgm"
 msgid "Utah"
 msgstr "Utah"
 
-#: mapsdatatranslation.cpp:6416
+#: mapsdatatranslation.cpp:6422
 msgctxt "usa.kgm"
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: mapsdatatranslation.cpp:6417
+#: mapsdatatranslation.cpp:6423
 msgctxt "usa.kgm"
 msgid "Vermont"
 msgstr "Vermont"
 
-#: mapsdatatranslation.cpp:6418
+#: mapsdatatranslation.cpp:6424
 msgctxt "usa.kgm"
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: mapsdatatranslation.cpp:6419
+#: mapsdatatranslation.cpp:6425
 msgctxt "usa.kgm"
 msgid "Virginia"
 msgstr "Virginia"
 
-#: mapsdatatranslation.cpp:6420
+#: mapsdatatranslation.cpp:6426
 msgctxt "usa.kgm"
 msgid "Richmond"
 msgstr "Richmond"
 
-#: mapsdatatranslation.cpp:6421
+#: mapsdatatranslation.cpp:6427
 msgctxt "usa.kgm"
 msgid "Washington"
 msgstr "Washington"
 
-#: mapsdatatranslation.cpp:6422
+#: mapsdatatranslation.cpp:6428
 msgctxt "usa.kgm"
 msgid "Olympia"
 msgstr "Olympia"
 
-#: mapsdatatranslation.cpp:6423
+#: mapsdatatranslation.cpp:6429
 msgctxt "usa.kgm"
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: mapsdatatranslation.cpp:6424
+#: mapsdatatranslation.cpp:6430
 msgctxt "usa.kgm"
 msgid "Charleston"
 msgstr "Charleston"
 
-#: mapsdatatranslation.cpp:6425
+#: mapsdatatranslation.cpp:6431
 msgctxt "usa.kgm"
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: mapsdatatranslation.cpp:6426
+#: mapsdatatranslation.cpp:6432
 msgctxt "usa.kgm"
 msgid "Madison"
 msgstr "Madison"
 
-#: mapsdatatranslation.cpp:6427
+#: mapsdatatranslation.cpp:6433
 msgctxt "usa.kgm"
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: mapsdatatranslation.cpp:6428
+#: mapsdatatranslation.cpp:6434
 msgctxt "usa.kgm"
 msgid "Cheyenne"
 msgstr "Cheyenne"
 
-#: mapsdatatranslation.cpp:6429
+#: mapsdatatranslation.cpp:6435
 msgctxt "uzbekistan.kgm"
 msgid "Uzbekistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6430
+#: mapsdatatranslation.cpp:6436
 msgctxt "uzbekistan.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6431
+#: mapsdatatranslation.cpp:6437
 msgctxt "uzbekistan.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6432
+#: mapsdatatranslation.cpp:6438
 msgctxt "uzbekistan.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6433
+#: mapsdatatranslation.cpp:6439
 msgctxt "uzbekistan.kgm"
 msgid "Not Uzbekistan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6434 mapsdatatranslation.cpp:6435
+#: mapsdatatranslation.cpp:6440 mapsdatatranslation.cpp:6441
 msgctxt "uzbekistan.kgm"
 msgid "Andijon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6436
+#: mapsdatatranslation.cpp:6442
 msgctxt "uzbekistan.kgm"
 msgid "Buxoro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6437
+#: mapsdatatranslation.cpp:6443
 msgctxt "uzbekistan.kgm"
 msgid "Buxoro (Bukhara)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6438
+#: mapsdatatranslation.cpp:6444
 msgctxt "uzbekistan.kgm"
 msgid "Farg'ona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6439
+#: mapsdatatranslation.cpp:6445
 msgctxt "uzbekistan.kgm"
 msgid "Farg'ona (Fergana)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6440 mapsdatatranslation.cpp:6441
+#: mapsdatatranslation.cpp:6446 mapsdatatranslation.cpp:6447
 msgctxt "uzbekistan.kgm"
 msgid "Jizzax"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6442
+#: mapsdatatranslation.cpp:6448
 msgctxt "uzbekistan.kgm"
 msgid "Xorazm"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6443
+#: mapsdatatranslation.cpp:6449
 msgctxt "uzbekistan.kgm"
 msgid "Urganch"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6444 mapsdatatranslation.cpp:6445
+#: mapsdatatranslation.cpp:6450 mapsdatatranslation.cpp:6451
 msgctxt "uzbekistan.kgm"
 msgid "Namangan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6446 mapsdatatranslation.cpp:6447
+#: mapsdatatranslation.cpp:6452 mapsdatatranslation.cpp:6453
 msgctxt "uzbekistan.kgm"
 msgid "Navoiy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6448
+#: mapsdatatranslation.cpp:6454
 msgctxt "uzbekistan.kgm"
 msgid "Qashqadaryo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6449
+#: mapsdatatranslation.cpp:6455
 msgctxt "uzbekistan.kgm"
 msgid "Qarshi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6450
+#: mapsdatatranslation.cpp:6456
 msgctxt "uzbekistan.kgm"
 msgid "Qaraqalpaqstan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6451
+#: mapsdatatranslation.cpp:6457
 msgctxt "uzbekistan.kgm"
 msgid "Nukus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6452 mapsdatatranslation.cpp:6453
+#: mapsdatatranslation.cpp:6458 mapsdatatranslation.cpp:6459
 msgctxt "uzbekistan.kgm"
 msgid "Samarqand"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6454
+#: mapsdatatranslation.cpp:6460
 msgctxt "uzbekistan.kgm"
 msgid "Sirdaryo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6455
+#: mapsdatatranslation.cpp:6461
 msgctxt "uzbekistan.kgm"
 msgid "Guliston"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6456
+#: mapsdatatranslation.cpp:6462
 msgctxt "uzbekistan.kgm"
 msgid "Surxondaryo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6457
+#: mapsdatatranslation.cpp:6463
 msgctxt "uzbekistan.kgm"
 msgid "Termez"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6458
+#: mapsdatatranslation.cpp:6464
 msgctxt "uzbekistan.kgm"
 msgid "Toshkent (Viloyati)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6459 mapsdatatranslation.cpp:6461
+#: mapsdatatranslation.cpp:6465 mapsdatatranslation.cpp:6467
 msgctxt "uzbekistan.kgm"
 msgid "Tashkent"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6460
+#: mapsdatatranslation.cpp:6466
 msgctxt "uzbekistan.kgm"
 msgid "Toshkent (Shahri )"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6462
+#: mapsdatatranslation.cpp:6468
 msgctxt "venezuela.kgm"
 msgid "Venezuela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6463
+#: mapsdatatranslation.cpp:6469
 msgctxt "venezuela.kgm"
 msgid "States"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6464 mapsdatatranslation.cpp:6465
+#: mapsdatatranslation.cpp:6470 mapsdatatranslation.cpp:6471
 msgctxt "venezuela.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6466
+#: mapsdatatranslation.cpp:6472
 msgctxt "venezuela.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6467
+#: mapsdatatranslation.cpp:6473
 msgctxt "venezuela.kgm"
 msgid "Not Venezuela"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6468
+#: mapsdatatranslation.cpp:6474
 msgctxt "venezuela.kgm"
 msgid "Amazonas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6469
+#: mapsdatatranslation.cpp:6475
 msgctxt "venezuela.kgm"
 msgid "Puerto Ayacucho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6470
+#: mapsdatatranslation.cpp:6476
 msgctxt "venezuela.kgm"
 msgid "Anzoátegui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6471
+#: mapsdatatranslation.cpp:6477
 msgctxt "venezuela.kgm"
 msgid "Barcelona"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6472
+#: mapsdatatranslation.cpp:6478
 msgctxt "venezuela.kgm"
 msgid "Apure"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6473
+#: mapsdatatranslation.cpp:6479
 msgctxt "venezuela.kgm"
 msgid "San Fernando de Apure"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6474
+#: mapsdatatranslation.cpp:6480
 msgctxt "venezuela.kgm"
 msgid "Aragua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6475
+#: mapsdatatranslation.cpp:6481
 msgctxt "venezuela.kgm"
 msgid "Maracay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6476 mapsdatatranslation.cpp:6477
+#: mapsdatatranslation.cpp:6482 mapsdatatranslation.cpp:6483
 msgctxt "venezuela.kgm"
 msgid "Barinas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6478
+#: mapsdatatranslation.cpp:6484
 msgctxt "venezuela.kgm"
 msgid "Bolívar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6479
+#: mapsdatatranslation.cpp:6485
 msgctxt "venezuela.kgm"
 msgid "Ciudad Bolívar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6480
+#: mapsdatatranslation.cpp:6486
 msgctxt "venezuela.kgm"
 msgid "Carabobo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6481
+#: mapsdatatranslation.cpp:6487
 msgctxt "venezuela.kgm"
 msgid "Valencia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6482
+#: mapsdatatranslation.cpp:6488
 msgctxt "venezuela.kgm"
 msgid "Cojedes"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6483
+#: mapsdatatranslation.cpp:6489
 msgctxt "venezuela.kgm"
 msgid "San Carlos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6484
+#: mapsdatatranslation.cpp:6490
 msgctxt "venezuela.kgm"
 msgid "Delta Amacuro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6485
+#: mapsdatatranslation.cpp:6491
 msgctxt "venezuela.kgm"
 msgid "Tucupita"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6486
+#: mapsdatatranslation.cpp:6492
 msgctxt "venezuela.kgm"
 msgid "Falcón"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6487
+#: mapsdatatranslation.cpp:6493
 msgctxt "venezuela.kgm"
 msgid "Coro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6488
+#: mapsdatatranslation.cpp:6494
 msgctxt "venezuela.kgm"
 msgid "Guárico"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6489
+#: mapsdatatranslation.cpp:6495
 msgctxt "venezuela.kgm"
 msgid "San Juan De Los Morros"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6490
+#: mapsdatatranslation.cpp:6496
 msgctxt "venezuela.kgm"
 msgid "Lara"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6491
+#: mapsdatatranslation.cpp:6497
 msgctxt "venezuela.kgm"
 msgid "Barquisimeto"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6492 mapsdatatranslation.cpp:6493
+#: mapsdatatranslation.cpp:6498 mapsdatatranslation.cpp:6499
 msgctxt "venezuela.kgm"
 msgid "Mérida"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6494
+#: mapsdatatranslation.cpp:6500
 msgctxt "venezuela.kgm"
 msgid "Miranda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6495
+#: mapsdatatranslation.cpp:6501
 msgctxt "venezuela.kgm"
 msgid "Los Teques"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6496
+#: mapsdatatranslation.cpp:6502
 msgctxt "venezuela.kgm"
 msgid "Monagas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6497
+#: mapsdatatranslation.cpp:6503
 msgctxt "venezuela.kgm"
 msgid "Maturín"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6498
+#: mapsdatatranslation.cpp:6504
 msgctxt "venezuela.kgm"
 msgid "Nueva Esparta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6499
+#: mapsdatatranslation.cpp:6505
 msgctxt "venezuela.kgm"
 msgid "La Asunción"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6500
+#: mapsdatatranslation.cpp:6506
 msgctxt "venezuela.kgm"
 msgid "Portuguesa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6501
+#: mapsdatatranslation.cpp:6507
 msgctxt "venezuela.kgm"
 msgid "Guanare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6502
+#: mapsdatatranslation.cpp:6508
 msgctxt "venezuela.kgm"
 msgid "Sucre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6503
+#: mapsdatatranslation.cpp:6509
 msgctxt "venezuela.kgm"
 msgid "Cumaná"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6504
+#: mapsdatatranslation.cpp:6510
 msgctxt "venezuela.kgm"
 msgid "Táchira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6505
+#: mapsdatatranslation.cpp:6511
 msgctxt "venezuela.kgm"
 msgid "San Cristóbal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6506 mapsdatatranslation.cpp:6507
+#: mapsdatatranslation.cpp:6512 mapsdatatranslation.cpp:6513
 msgctxt "venezuela.kgm"
 msgid "Trujillo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6508
+#: mapsdatatranslation.cpp:6514
 msgctxt "venezuela.kgm"
 msgid "Yaracuy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6509
+#: mapsdatatranslation.cpp:6515
 msgctxt "venezuela.kgm"
 msgid "San Felipe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6510
+#: mapsdatatranslation.cpp:6516
 msgctxt "venezuela.kgm"
 msgid "Vargas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6511
+#: mapsdatatranslation.cpp:6517
 msgctxt "venezuela.kgm"
 msgid "La Guaira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6512
+#: mapsdatatranslation.cpp:6518
 msgctxt "venezuela.kgm"
 msgid "Zulia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6513
+#: mapsdatatranslation.cpp:6519
 msgctxt "venezuela.kgm"
 msgid "Maracaibo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6514
+#: mapsdatatranslation.cpp:6520
 msgctxt "venezuela.kgm"
 msgid "Federal Dependencies"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6515
+#: mapsdatatranslation.cpp:6521
 msgctxt "venezuela.kgm"
 msgid "Caracas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6516
+#: mapsdatatranslation.cpp:6522
 msgctxt "venezuela.kgm"
 msgid "Capital District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6517
+#: mapsdatatranslation.cpp:6523
 msgctxt "venezuela.kgm"
 msgid "Caracas ciudad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6518
+#: mapsdatatranslation.cpp:6524
 msgctxt "vietnam.kgm"
 msgid "Vietnam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6519
+#: mapsdatatranslation.cpp:6525
 msgctxt "vietnam.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6520
+#: mapsdatatranslation.cpp:6526
 msgctxt "vietnam.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6521
+#: mapsdatatranslation.cpp:6527
 msgctxt "vietnam.kgm"
 msgid "Not Vietnam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6522
+#: mapsdatatranslation.cpp:6528
 msgctxt "vietnam.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6523
+#: mapsdatatranslation.cpp:6529
 msgctxt "vietnam.kgm"
 msgid "An Giang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6524
+#: mapsdatatranslation.cpp:6530
 msgctxt "vietnam.kgm"
 msgid "Long Xuyen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6525 mapsdatatranslation.cpp:6526
+#: mapsdatatranslation.cpp:6531 mapsdatatranslation.cpp:6532
 msgctxt "vietnam.kgm"
 msgid "Bac Giang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6527 mapsdatatranslation.cpp:6528
+#: mapsdatatranslation.cpp:6533 mapsdatatranslation.cpp:6534
 msgctxt "vietnam.kgm"
 msgid "Bac Kan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6529 mapsdatatranslation.cpp:6530
+#: mapsdatatranslation.cpp:6535 mapsdatatranslation.cpp:6536
 msgctxt "vietnam.kgm"
 msgid "Bac Lieu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6531 mapsdatatranslation.cpp:6532
+#: mapsdatatranslation.cpp:6537 mapsdatatranslation.cpp:6538
 msgctxt "vietnam.kgm"
 msgid "Bac Ninh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6533
+#: mapsdatatranslation.cpp:6539
 msgctxt "vietnam.kgm"
 msgid "Ba Ria-Vung Tau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6534
+#: mapsdatatranslation.cpp:6540
 msgctxt "vietnam.kgm"
 msgid "Vung Tau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6535 mapsdatatranslation.cpp:6536
+#: mapsdatatranslation.cpp:6541 mapsdatatranslation.cpp:6542
 msgctxt "vietnam.kgm"
 msgid "Ben Tre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6537
+#: mapsdatatranslation.cpp:6543
 msgctxt "vietnam.kgm"
 msgid "Binh Dinh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6538
+#: mapsdatatranslation.cpp:6544
 msgctxt "vietnam.kgm"
 msgid "Qui Nhon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6539
+#: mapsdatatranslation.cpp:6545
 msgctxt "vietnam.kgm"
 msgid "Binh Duong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6540
+#: mapsdatatranslation.cpp:6546
 msgctxt "vietnam.kgm"
 msgid "Thu Dau Mot"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6541
+#: mapsdatatranslation.cpp:6547
 msgctxt "vietnam.kgm"
 msgid "Binh Phuoc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6542
+#: mapsdatatranslation.cpp:6548
 msgctxt "vietnam.kgm"
 msgid "Dong Xoai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6543
+#: mapsdatatranslation.cpp:6549
 msgctxt "vietnam.kgm"
 msgid "Binh Thuan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6544
+#: mapsdatatranslation.cpp:6550
 msgctxt "vietnam.kgm"
 msgid "Phan Thiet"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6545 mapsdatatranslation.cpp:6546
+#: mapsdatatranslation.cpp:6551 mapsdatatranslation.cpp:6552
 msgctxt "vietnam.kgm"
 msgid "Ca Mau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6547
+#: mapsdatatranslation.cpp:6553
 msgctxt "vietnam.kgm"
 msgid "Can Tho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6548 mapsdatatranslation.cpp:6549
+#: mapsdatatranslation.cpp:6554 mapsdatatranslation.cpp:6555
 msgctxt "vietnam.kgm"
 msgid "Cao Bang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6550
+#: mapsdatatranslation.cpp:6556
 msgctxt "vietnam.kgm"
 msgid "Dak Lak"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6551
+#: mapsdatatranslation.cpp:6557
 msgctxt "vietnam.kgm"
 msgid "Buon Ma Thuot"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6552
+#: mapsdatatranslation.cpp:6558
 msgctxt "vietnam.kgm"
 msgid "Dak Nong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6553
+#: mapsdatatranslation.cpp:6559
 msgctxt "vietnam.kgm"
 msgid "Gia Nghia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6554
+#: mapsdatatranslation.cpp:6560
 msgctxt "vietnam.kgm"
 msgid "Da Nang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6555
+#: mapsdatatranslation.cpp:6561
 msgctxt "vietnam.kgm"
 msgid "Dien Bien"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6556
+#: mapsdatatranslation.cpp:6562
 msgctxt "vietnam.kgm"
 msgid "Dien Bien Phu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6557
+#: mapsdatatranslation.cpp:6563
 msgctxt "vietnam.kgm"
 msgid "Dong Nai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6558
+#: mapsdatatranslation.cpp:6564
 msgctxt "vietnam.kgm"
 msgid "Bien Hoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6559
+#: mapsdatatranslation.cpp:6565
 msgctxt "vietnam.kgm"
 msgid "Dong Thap"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6560
+#: mapsdatatranslation.cpp:6566
 msgctxt "vietnam.kgm"
 msgid "Cao Lanh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6561
+#: mapsdatatranslation.cpp:6567
 msgctxt "vietnam.kgm"
 msgid "Gia Lai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6562
+#: mapsdatatranslation.cpp:6568
 msgctxt "vietnam.kgm"
 msgid "PleiKu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6563 mapsdatatranslation.cpp:6564
+#: mapsdatatranslation.cpp:6569 mapsdatatranslation.cpp:6570
 msgctxt "vietnam.kgm"
 msgid "Ha Giang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6565 mapsdatatranslation.cpp:6566
+#: mapsdatatranslation.cpp:6571 mapsdatatranslation.cpp:6572
 msgctxt "vietnam.kgm"
 msgid "Hai Duong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6567
+#: mapsdatatranslation.cpp:6573
 msgctxt "vietnam.kgm"
 msgid "Hai Phong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6568
+#: mapsdatatranslation.cpp:6574
 msgctxt "vietnam.kgm"
 msgid "Ha Nam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6569
+#: mapsdatatranslation.cpp:6575
 msgctxt "vietnam.kgm"
 msgid "Phu Ly"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6570
+#: mapsdatatranslation.cpp:6576
 msgctxt "vietnam.kgm"
 msgid "Ha Noi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6571
+#: mapsdatatranslation.cpp:6577
 msgctxt "vietnam.kgm"
 msgid "Ha Tay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6572
+#: mapsdatatranslation.cpp:6578
 msgctxt "vietnam.kgm"
 msgid "Ha Dong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6573 mapsdatatranslation.cpp:6574
+#: mapsdatatranslation.cpp:6579 mapsdatatranslation.cpp:6580
 msgctxt "vietnam.kgm"
 msgid "Ha Tinh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6575 mapsdatatranslation.cpp:6576
+#: mapsdatatranslation.cpp:6581 mapsdatatranslation.cpp:6582
 msgctxt "vietnam.kgm"
 msgid "Hoa Binh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6577
+#: mapsdatatranslation.cpp:6583
 msgctxt "vietnam.kgm"
 msgid "Ho Chi Minh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6578
+#: mapsdatatranslation.cpp:6584
 msgctxt "vietnam.kgm"
 msgid "Hau Giang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6579
+#: mapsdatatranslation.cpp:6585
 msgctxt "vietnam.kgm"
 msgid "Vi Thanh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6580 mapsdatatranslation.cpp:6581
+#: mapsdatatranslation.cpp:6586 mapsdatatranslation.cpp:6587
 msgctxt "vietnam.kgm"
 msgid "Hung Yen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6582
+#: mapsdatatranslation.cpp:6588
 msgctxt "vietnam.kgm"
 msgid "Khanh Hoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6583
+#: mapsdatatranslation.cpp:6589
 msgctxt "vietnam.kgm"
 msgid "Nha Trang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6584
+#: mapsdatatranslation.cpp:6590
 msgctxt "vietnam.kgm"
 msgid "Kien Giang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6585
+#: mapsdatatranslation.cpp:6591
 msgctxt "vietnam.kgm"
 msgid "Rach Gia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6586 mapsdatatranslation.cpp:6587
+#: mapsdatatranslation.cpp:6592 mapsdatatranslation.cpp:6593
 msgctxt "vietnam.kgm"
 msgid "Kon Tum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6588 mapsdatatranslation.cpp:6589
+#: mapsdatatranslation.cpp:6594 mapsdatatranslation.cpp:6595
 msgctxt "vietnam.kgm"
 msgid "Lai Chau"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6590
+#: mapsdatatranslation.cpp:6596
 msgctxt "vietnam.kgm"
 msgid "Lam Dong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6591
+#: mapsdatatranslation.cpp:6597
 msgctxt "vietnam.kgm"
 msgid "Da Lat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6592 mapsdatatranslation.cpp:6593
+#: mapsdatatranslation.cpp:6598 mapsdatatranslation.cpp:6599
 msgctxt "vietnam.kgm"
 msgid "Lang Son"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6594 mapsdatatranslation.cpp:6595
+#: mapsdatatranslation.cpp:6600 mapsdatatranslation.cpp:6601
 msgctxt "vietnam.kgm"
 msgid "Lao Cai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6596
+#: mapsdatatranslation.cpp:6602
 msgctxt "vietnam.kgm"
 msgid "Long An"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6597
+#: mapsdatatranslation.cpp:6603
 msgctxt "vietnam.kgm"
 msgid "Tan An"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6598 mapsdatatranslation.cpp:6599
+#: mapsdatatranslation.cpp:6604 mapsdatatranslation.cpp:6605
 msgctxt "vietnam.kgm"
 msgid "Nam Dinh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6600
+#: mapsdatatranslation.cpp:6606
 msgctxt "vietnam.kgm"
 msgid "Nghe An"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6601
+#: mapsdatatranslation.cpp:6607
 msgctxt "vietnam.kgm"
 msgid "Vinh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6602 mapsdatatranslation.cpp:6603
+#: mapsdatatranslation.cpp:6608 mapsdatatranslation.cpp:6609
 msgctxt "vietnam.kgm"
 msgid "Ninh Binh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6604
+#: mapsdatatranslation.cpp:6610
 msgctxt "vietnam.kgm"
 msgid "Ninh Thuan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6605
+#: mapsdatatranslation.cpp:6611
 msgctxt "vietnam.kgm"
 msgid "Phan Rang-Thap Cham"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6606
+#: mapsdatatranslation.cpp:6612
 msgctxt "vietnam.kgm"
 msgid "Phu Tho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6607
+#: mapsdatatranslation.cpp:6613
 msgctxt "vietnam.kgm"
 msgid "Viet Tri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6608
+#: mapsdatatranslation.cpp:6614
 msgctxt "vietnam.kgm"
 msgid "Phu Yen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6609
+#: mapsdatatranslation.cpp:6615
 msgctxt "vietnam.kgm"
 msgid "Tuy Hoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6610
+#: mapsdatatranslation.cpp:6616
 msgctxt "vietnam.kgm"
 msgid "Quang Binh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6611
+#: mapsdatatranslation.cpp:6617
 msgctxt "vietnam.kgm"
 msgid "Dong Hoi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6612
+#: mapsdatatranslation.cpp:6618
 msgctxt "vietnam.kgm"
 msgid "Quang Nam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6613
+#: mapsdatatranslation.cpp:6619
 msgctxt "vietnam.kgm"
 msgid "Tam Ky"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6614 mapsdatatranslation.cpp:6615
+#: mapsdatatranslation.cpp:6620 mapsdatatranslation.cpp:6621
 msgctxt "vietnam.kgm"
 msgid "Quang Ngai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6616
+#: mapsdatatranslation.cpp:6622
 msgctxt "vietnam.kgm"
 msgid "Quang Ninh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6617
+#: mapsdatatranslation.cpp:6623
 msgctxt "vietnam.kgm"
 msgid "Ha Long"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6618
+#: mapsdatatranslation.cpp:6624
 msgctxt "vietnam.kgm"
 msgid "Quang Tri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6619
+#: mapsdatatranslation.cpp:6625
 msgctxt "vietnam.kgm"
 msgid "Dong Ha"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6620 mapsdatatranslation.cpp:6621
+#: mapsdatatranslation.cpp:6626 mapsdatatranslation.cpp:6627
 msgctxt "vietnam.kgm"
 msgid "Soc Trang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6622 mapsdatatranslation.cpp:6623
+#: mapsdatatranslation.cpp:6628 mapsdatatranslation.cpp:6629
 msgctxt "vietnam.kgm"
 msgid "Son La"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6624 mapsdatatranslation.cpp:6625
+#: mapsdatatranslation.cpp:6630 mapsdatatranslation.cpp:6631
 msgctxt "vietnam.kgm"
 msgid "Tay Ninh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6626 mapsdatatranslation.cpp:6627
+#: mapsdatatranslation.cpp:6632 mapsdatatranslation.cpp:6633
 msgctxt "vietnam.kgm"
 msgid "Thai Binh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6628 mapsdatatranslation.cpp:6629
+#: mapsdatatranslation.cpp:6634 mapsdatatranslation.cpp:6635
 msgctxt "vietnam.kgm"
 msgid "Thai Nguyen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6630 mapsdatatranslation.cpp:6631
+#: mapsdatatranslation.cpp:6636 mapsdatatranslation.cpp:6637
 msgctxt "vietnam.kgm"
 msgid "Thanh Hoa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6632
+#: mapsdatatranslation.cpp:6638
 msgctxt "vietnam.kgm"
 msgid "Thua Thien-Hue"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6633
+#: mapsdatatranslation.cpp:6639
 msgctxt "vietnam.kgm"
 msgid "Hue"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6634
+#: mapsdatatranslation.cpp:6640
 msgctxt "vietnam.kgm"
 msgid "Tien Giang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6635
+#: mapsdatatranslation.cpp:6641
 msgctxt "vietnam.kgm"
 msgid "My Tho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6636 mapsdatatranslation.cpp:6637
+#: mapsdatatranslation.cpp:6642 mapsdatatranslation.cpp:6643
 msgctxt "vietnam.kgm"
 msgid "Tra Vinh"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6638 mapsdatatranslation.cpp:6639
+#: mapsdatatranslation.cpp:6644 mapsdatatranslation.cpp:6645
 msgctxt "vietnam.kgm"
 msgid "Tuyen Quang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6640 mapsdatatranslation.cpp:6641
+#: mapsdatatranslation.cpp:6646 mapsdatatranslation.cpp:6647
 msgctxt "vietnam.kgm"
 msgid "Vinh Long"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6642
+#: mapsdatatranslation.cpp:6648
 msgctxt "vietnam.kgm"
 msgid "Vinh Phuc"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6643
+#: mapsdatatranslation.cpp:6649
 msgctxt "vietnam.kgm"
 msgid "Vinh Yen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6644 mapsdatatranslation.cpp:6645
+#: mapsdatatranslation.cpp:6650 mapsdatatranslation.cpp:6651
 msgctxt "vietnam.kgm"
 msgid "Yen Bai"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6646
+#: mapsdatatranslation.cpp:6652
 msgctxt "waters_world-class.kgm"
 msgid "Waters (World-Class)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6647
+#: mapsdatatranslation.cpp:6653
 msgctxt "waters_world-class.kgm"
 msgid "Oceans and basins"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6648
+#: mapsdatatranslation.cpp:6654
 msgctxt "waters_world-class.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6649
+#: mapsdatatranslation.cpp:6655
 msgctxt "waters_world-class.kgm"
 msgid "Not Waters (World-Class)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6650
+#: mapsdatatranslation.cpp:6656
 msgctxt "waters_world-class.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6651
+#: mapsdatatranslation.cpp:6657
 msgctxt "waters_world-class.kgm"
 msgid "Arctic ocean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6652
+#: mapsdatatranslation.cpp:6658
 msgctxt "waters_world-class.kgm"
 msgid "Northern Pacific"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6653
+#: mapsdatatranslation.cpp:6659
 msgctxt "waters_world-class.kgm"
 msgid "Northern Atlantic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6654
+#: mapsdatatranslation.cpp:6660
 msgctxt "waters_world-class.kgm"
 msgid "Southern Pacific"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6655
+#: mapsdatatranslation.cpp:6661
 msgctxt "waters_world-class.kgm"
 msgid "Southern Atlantic"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6656
+#: mapsdatatranslation.cpp:6662
 msgctxt "waters_world-class.kgm"
 msgid "Indian ocean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6657
+#: mapsdatatranslation.cpp:6663
 msgctxt "waters_world-class.kgm"
 msgid "Antarctic ocean"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6658
+#: mapsdatatranslation.cpp:6664
 msgctxt "waters_world-class.kgm"
 msgid "Congo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6659
+#: mapsdatatranslation.cpp:6665
 msgctxt "waters_world-class.kgm"
 msgid "Lake Chad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6660
+#: mapsdatatranslation.cpp:6666
 msgctxt "waters_world-class.kgm"
 msgid "Jubba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6661
+#: mapsdatatranslation.cpp:6667
 msgctxt "waters_world-class.kgm"
 msgid "Limpopo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6662
+#: mapsdatatranslation.cpp:6668
 msgctxt "waters_world-class.kgm"
 msgid "Mangoky"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6663
+#: mapsdatatranslation.cpp:6669
 msgctxt "waters_world-class.kgm"
 msgid "Mania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6664
+#: mapsdatatranslation.cpp:6670
 msgctxt "waters_world-class.kgm"
 msgid "Niger"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6665
+#: mapsdatatranslation.cpp:6671
 msgctxt "waters_world-class.kgm"
 msgid "Nile"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6666
+#: mapsdatatranslation.cpp:6672
 msgctxt "waters_world-class.kgm"
 msgid "Ogooue"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6667
+#: mapsdatatranslation.cpp:6673
 msgctxt "waters_world-class.kgm"
 msgid "Okavango swamp"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6668
+#: mapsdatatranslation.cpp:6674
 msgctxt "waters_world-class.kgm"
 msgid "Orange"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6669
+#: mapsdatatranslation.cpp:6675
 msgctxt "waters_world-class.kgm"
 msgid "Oued Draa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6670
+#: mapsdatatranslation.cpp:6676
 msgctxt "waters_world-class.kgm"
 msgid "Senegal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6671
+#: mapsdatatranslation.cpp:6677
 msgctxt "waters_world-class.kgm"
 msgid "Shabelle"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6672
+#: mapsdatatranslation.cpp:6678
 msgctxt "waters_world-class.kgm"
 msgid "Turkana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6673
+#: mapsdatatranslation.cpp:6679
 msgctxt "waters_world-class.kgm"
 msgid "Volta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6674
+#: mapsdatatranslation.cpp:6680
 msgctxt "waters_world-class.kgm"
 msgid "Zambezi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6675
+#: mapsdatatranslation.cpp:6681
 msgctxt "waters_world-class.kgm"
 msgid "Dalalven"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6676
+#: mapsdatatranslation.cpp:6682
 msgctxt "waters_world-class.kgm"
 msgid "Danube"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6677
+#: mapsdatatranslation.cpp:6683
 msgctxt "waters_world-class.kgm"
 msgid "Daugava"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6678
+#: mapsdatatranslation.cpp:6684
 msgctxt "waters_world-class.kgm"
 msgid "Dnieper"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6679
+#: mapsdatatranslation.cpp:6685
 msgctxt "waters_world-class.kgm"
 msgid "Dniester"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6680
+#: mapsdatatranslation.cpp:6686
 msgctxt "waters_world-class.kgm"
 msgid "Don"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6681
+#: mapsdatatranslation.cpp:6687
 msgctxt "waters_world-class.kgm"
 msgid "Ebro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6682
+#: mapsdatatranslation.cpp:6688
 msgctxt "waters_world-class.kgm"
 msgid "Elbe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6683
+#: mapsdatatranslation.cpp:6689
 msgctxt "waters_world-class.kgm"
 msgid "Garonne"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6684
+#: mapsdatatranslation.cpp:6690
 msgctxt "waters_world-class.kgm"
 msgid "Glama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6685
+#: mapsdatatranslation.cpp:6691
 msgctxt "waters_world-class.kgm"
 msgid "Guadalquivir"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6686
+#: mapsdatatranslation.cpp:6692
 msgctxt "waters_world-class.kgm"
 msgid "Kemijoki"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6687
+#: mapsdatatranslation.cpp:6693
 msgctxt "waters_world-class.kgm"
 msgid "Kura (& Araks)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6688
+#: mapsdatatranslation.cpp:6694
 msgctxt "waters_world-class.kgm"
 msgid "Loire"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6689
+#: mapsdatatranslation.cpp:6695
 msgctxt "waters_world-class.kgm"
 msgid "Neva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6690
+#: mapsdatatranslation.cpp:6696
 msgctxt "waters_world-class.kgm"
 msgid "Dvina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6691
+#: mapsdatatranslation.cpp:6697
 msgctxt "waters_world-class.kgm"
 msgid "Oder"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6692
+#: mapsdatatranslation.cpp:6698
 msgctxt "waters_world-class.kgm"
 msgid "Po"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6693
+#: mapsdatatranslation.cpp:6699
 msgctxt "waters_world-class.kgm"
 msgid "Rhine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6694
+#: mapsdatatranslation.cpp:6700
 msgctxt "waters_world-class.kgm"
 msgid "Rhone"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6695
+#: mapsdatatranslation.cpp:6701
 msgctxt "waters_world-class.kgm"
 msgid "Seine"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6696
+#: mapsdatatranslation.cpp:6702
 msgctxt "waters_world-class.kgm"
 msgid "Tagus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6697
+#: mapsdatatranslation.cpp:6703
 msgctxt "waters_world-class.kgm"
 msgid "Tigris (& Euphrates)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6698
+#: mapsdatatranslation.cpp:6704
 msgctxt "waters_world-class.kgm"
 msgid "Ural"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6699
+#: mapsdatatranslation.cpp:6705
 msgctxt "waters_world-class.kgm"
 msgid "Vistula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6700
+#: mapsdatatranslation.cpp:6706
 msgctxt "waters_world-class.kgm"
 msgid "Volga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6701
+#: mapsdatatranslation.cpp:6707
 msgctxt "waters_world-class.kgm"
 msgid "Weser"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6702
+#: mapsdatatranslation.cpp:6708
 msgctxt "waters_world-class.kgm"
 msgid "Amu Darya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6703
+#: mapsdatatranslation.cpp:6709
 msgctxt "waters_world-class.kgm"
 msgid "Amur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6704
+#: mapsdatatranslation.cpp:6710
 msgctxt "waters_world-class.kgm"
 msgid "Lake Balkhash"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6705
+#: mapsdatatranslation.cpp:6711
 msgctxt "waters_world-class.kgm"
 msgid "Brahmaputra"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6706
+#: mapsdatatranslation.cpp:6712
 msgctxt "waters_world-class.kgm"
 msgid "Chao Phrya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6707
+#: mapsdatatranslation.cpp:6713
 msgctxt "waters_world-class.kgm"
 msgid "Fly"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6708
+#: mapsdatatranslation.cpp:6714
 msgctxt "waters_world-class.kgm"
 msgid "Ganges"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6709
+#: mapsdatatranslation.cpp:6715
 msgctxt "waters_world-class.kgm"
 msgid "Godavari"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6710
+#: mapsdatatranslation.cpp:6716
 msgctxt "waters_world-class.kgm"
 msgid "Hong (Red river)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6711
+#: mapsdatatranslation.cpp:6717
 msgctxt "waters_world-class.kgm"
 msgid "Hwang He"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6712
+#: mapsdatatranslation.cpp:6718
 msgctxt "waters_world-class.kgm"
 msgid "Indigirka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6713
+#: mapsdatatranslation.cpp:6719
 msgctxt "waters_world-class.kgm"
 msgid "Indus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6714
+#: mapsdatatranslation.cpp:6720
 msgctxt "waters_world-class.kgm"
 msgid "Irrawaddy"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6715
+#: mapsdatatranslation.cpp:6721
 msgctxt "waters_world-class.kgm"
 msgid "Kapuas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6716
+#: mapsdatatranslation.cpp:6722
 msgctxt "waters_world-class.kgm"
 msgid "Kolyma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6717
+#: mapsdatatranslation.cpp:6723
 msgctxt "waters_world-class.kgm"
 msgid "Krishna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6718
+#: mapsdatatranslation.cpp:6724
 msgctxt "waters_world-class.kgm"
 msgid "Lena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6719
+#: mapsdatatranslation.cpp:6725
 msgctxt "waters_world-class.kgm"
 msgid "Mahakam"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6720
+#: mapsdatatranslation.cpp:6726
 msgctxt "waters_world-class.kgm"
 msgid "Mahanadi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6721
+#: mapsdatatranslation.cpp:6727
 msgctxt "waters_world-class.kgm"
 msgid "Mekong"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6722
+#: mapsdatatranslation.cpp:6728
 msgctxt "waters_world-class.kgm"
 msgid "Murray (& Darling)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6723
+#: mapsdatatranslation.cpp:6729
 msgctxt "waters_world-class.kgm"
 msgid "Narmada"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6724
+#: mapsdatatranslation.cpp:6730
 msgctxt "waters_world-class.kgm"
 msgid "Ob"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6725
+#: mapsdatatranslation.cpp:6731
 msgctxt "waters_world-class.kgm"
 msgid "Salween"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6726
+#: mapsdatatranslation.cpp:6732
 msgctxt "waters_world-class.kgm"
 msgid "Sepik"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6727
+#: mapsdatatranslation.cpp:6733
 msgctxt "waters_world-class.kgm"
 msgid "Syr Daria"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6728
+#: mapsdatatranslation.cpp:6734
 msgctxt "waters_world-class.kgm"
 msgid "Tapti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6729
+#: mapsdatatranslation.cpp:6735
 msgctxt "waters_world-class.kgm"
 msgid "Tarim"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6730
+#: mapsdatatranslation.cpp:6736
 msgctxt "waters_world-class.kgm"
 msgid "Xi Jiang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6731
+#: mapsdatatranslation.cpp:6737
 msgctxt "waters_world-class.kgm"
 msgid "Yalu Jiang"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6732
+#: mapsdatatranslation.cpp:6738
 msgctxt "waters_world-class.kgm"
 msgid "Yangtze"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6733
+#: mapsdatatranslation.cpp:6739
 msgctxt "waters_world-class.kgm"
 msgid "Yenisey"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6734
+#: mapsdatatranslation.cpp:6740
 msgctxt "waters_world-class.kgm"
 msgid "Alabama (& Tombigbee)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6735
+#: mapsdatatranslation.cpp:6741
 msgctxt "waters_world-class.kgm"
 msgid "Balsas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6736
+#: mapsdatatranslation.cpp:6742
 msgctxt "waters_world-class.kgm"
 msgid "Brazos"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6737
+#: mapsdatatranslation.cpp:6743
 msgctxt "waters_world-class.kgm"
 msgid "Colorado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6738
+#: mapsdatatranslation.cpp:6744
 msgctxt "waters_world-class.kgm"
 msgid "Columbia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6739
+#: mapsdatatranslation.cpp:6745
 msgctxt "waters_world-class.kgm"
 msgid "Fraser"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6740
+#: mapsdatatranslation.cpp:6746
 msgctxt "waters_world-class.kgm"
 msgid "Hudson"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6741
+#: mapsdatatranslation.cpp:6747
 msgctxt "waters_world-class.kgm"
 msgid "Mackenzie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6742
+#: mapsdatatranslation.cpp:6748
 msgctxt "waters_world-class.kgm"
 msgid "Mississippi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6743
+#: mapsdatatranslation.cpp:6749
 msgctxt "waters_world-class.kgm"
 msgid "Nelson"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6744
+#: mapsdatatranslation.cpp:6750
 msgctxt "waters_world-class.kgm"
 msgid "Rio Grande"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6745
+#: mapsdatatranslation.cpp:6751
 msgctxt "waters_world-class.kgm"
 msgid "Rio Grande de Santiago"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6746
+#: mapsdatatranslation.cpp:6752
 msgctxt "waters_world-class.kgm"
 msgid "Sacramento"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6747
+#: mapsdatatranslation.cpp:6753
 msgctxt "waters_world-class.kgm"
 msgid "Saint Lawrence"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6748
+#: mapsdatatranslation.cpp:6754
 msgctxt "waters_world-class.kgm"
 msgid "Susquehanna"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6749
+#: mapsdatatranslation.cpp:6755
 msgctxt "waters_world-class.kgm"
 msgid "Thelon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6750
+#: mapsdatatranslation.cpp:6756
 msgctxt "waters_world-class.kgm"
 msgid "Usumacinta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6751
+#: mapsdatatranslation.cpp:6757
 msgctxt "waters_world-class.kgm"
 msgid "Yaqui"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6752
+#: mapsdatatranslation.cpp:6758
 msgctxt "waters_world-class.kgm"
 msgid "Yukon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6753
+#: mapsdatatranslation.cpp:6759
 msgctxt "waters_world-class.kgm"
 msgid "Amazon"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6754
+#: mapsdatatranslation.cpp:6760
 msgctxt "waters_world-class.kgm"
 msgid "Chubut"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6755
+#: mapsdatatranslation.cpp:6761
 msgctxt "waters_world-class.kgm"
 msgid "Magdalena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6756
+#: mapsdatatranslation.cpp:6762
 msgctxt "waters_world-class.kgm"
 msgid "Orinoco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6757
+#: mapsdatatranslation.cpp:6763
 msgctxt "waters_world-class.kgm"
 msgid "Parana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6758
+#: mapsdatatranslation.cpp:6764
 msgctxt "waters_world-class.kgm"
 msgid "Pamaiba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6759
+#: mapsdatatranslation.cpp:6765
 msgctxt "waters_world-class.kgm"
 msgid "Rio Colorado"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6760
+#: mapsdatatranslation.cpp:6766
 msgctxt "waters_world-class.kgm"
 msgid "Sao Francisco"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6761
+#: mapsdatatranslation.cpp:6767
 msgctxt "waters_world-class.kgm"
 msgid "Lake Titicaca"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6762
+#: mapsdatatranslation.cpp:6768
 msgctxt "waters_world-class.kgm"
 msgid "Tocantins"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6763
+#: mapsdatatranslation.cpp:6769
 msgctxt "waters_world-class.kgm"
 msgid "Uruguay"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6764
+#: mapsdatatranslation.cpp:6770
 msgctxt "waters_world-class.kgm"
 msgid "Douro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6765
+#: mapsdatatranslation.cpp:6771
 msgctxt "waters_world-class.kgm"
 msgid "Guadiana"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6766
+#: mapsdatatranslation.cpp:6772
 msgctxt "waters_world-class.kgm"
 msgid "Meuse"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6767
+#: mapsdatatranslation.cpp:6773
 msgctxt "waters_world-class.kgm"
 msgid "Lake Eyre"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6768
+#: mapsdatatranslation.cpp:6774
 msgctxt "waters_world-class.kgm"
 msgid "Caspian sea"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6769
+#: mapsdatatranslation.cpp:6775
 msgctxt "waters_world-class.kgm"
 msgid "Tiber"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6770
+#: mapsdatatranslation.cpp:6776
 msgctxt "westbengal.kgm"
 msgid "West Bengal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6771
+#: mapsdatatranslation.cpp:6777
 msgctxt "westbengal.kgm"
 msgid "District"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6772
+#: mapsdatatranslation.cpp:6778
 msgctxt "westbengal.kgm"
 msgid "Not West Bengal"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6773
+#: mapsdatatranslation.cpp:6779
 msgctxt "westbengal.kgm"
 msgid "Border"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6774 mapsdatatranslation.cpp:6775
+#: mapsdatatranslation.cpp:6780 mapsdatatranslation.cpp:6781
 msgctxt "westbengal.kgm"
 msgid "Purulia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6776 mapsdatatranslation.cpp:6777
+#: mapsdatatranslation.cpp:6782 mapsdatatranslation.cpp:6783
 msgctxt "westbengal.kgm"
 msgid "Bankura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6778
+#: mapsdatatranslation.cpp:6784
 msgctxt "westbengal.kgm"
 msgid "Paschim Medinipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6779
+#: mapsdatatranslation.cpp:6785
 msgctxt "westbengal.kgm"
 msgid "Midnapore"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6780
+#: mapsdatatranslation.cpp:6786
 msgctxt "westbengal.kgm"
 msgid "Purba Medinipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6781
+#: mapsdatatranslation.cpp:6787
 msgctxt "westbengal.kgm"
 msgid "Tamluk"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6782 mapsdatatranslation.cpp:6783
+#: mapsdatatranslation.cpp:6788 mapsdatatranslation.cpp:6789
 msgctxt "westbengal.kgm"
 msgid "Howrah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6784
+#: mapsdatatranslation.cpp:6790
 msgctxt "westbengal.kgm"
 msgid "South 24-Parganas "
 msgstr ""
 
-#: mapsdatatranslation.cpp:6785
+#: mapsdatatranslation.cpp:6791
 msgctxt "westbengal.kgm"
 msgid "Alipur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6786
+#: mapsdatatranslation.cpp:6792
 msgctxt "westbengal.kgm"
 msgid "North 24-Parganas"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6787
+#: mapsdatatranslation.cpp:6793
 msgctxt "westbengal.kgm"
 msgid "Barasat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6788 mapsdatatranslation.cpp:6789
+#: mapsdatatranslation.cpp:6794 mapsdatatranslation.cpp:6795
 msgctxt "westbengal.kgm"
 msgid "Kolkata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6790
+#: mapsdatatranslation.cpp:6796
 msgctxt "westbengal.kgm"
 msgid "Hooghly "
 msgstr ""
 
-#: mapsdatatranslation.cpp:6791
+#: mapsdatatranslation.cpp:6797
 msgctxt "westbengal.kgm"
 msgid "Chunchura "
 msgstr ""
 
-#: mapsdatatranslation.cpp:6792 mapsdatatranslation.cpp:6793
+#: mapsdatatranslation.cpp:6798 mapsdatatranslation.cpp:6799
 msgctxt "westbengal.kgm"
 msgid "Burdwan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6794
+#: mapsdatatranslation.cpp:6800
 msgctxt "westbengal.kgm"
 msgid "Nadia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6795
+#: mapsdatatranslation.cpp:6801
 msgctxt "westbengal.kgm"
 msgid "Krishnanagar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6796
+#: mapsdatatranslation.cpp:6802
 msgctxt "westbengal.kgm"
 msgid "Birbhum"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6797
+#: mapsdatatranslation.cpp:6803
 msgctxt "westbengal.kgm"
 msgid "Suri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6798
+#: mapsdatatranslation.cpp:6804
 msgctxt "westbengal.kgm"
 msgid "Murshidabad"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6799
+#: mapsdatatranslation.cpp:6805
 msgctxt "westbengal.kgm"
 msgid "Baharampur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6800
+#: mapsdatatranslation.cpp:6806
 msgctxt "westbengal.kgm"
 msgid "Malda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6801
+#: mapsdatatranslation.cpp:6807
 msgctxt "westbengal.kgm"
 msgid "Inreg Bazar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6802
+#: mapsdatatranslation.cpp:6808
 msgctxt "westbengal.kgm"
 msgid "Dakshin Dinajpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6803
+#: mapsdatatranslation.cpp:6809
 msgctxt "westbengal.kgm"
 msgid "Balurghat"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6804
+#: mapsdatatranslation.cpp:6810
 msgctxt "westbengal.kgm"
 msgid "Uttar Dinajpur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6805
+#: mapsdatatranslation.cpp:6811
 msgctxt "westbengal.kgm"
 msgid "Raiganj"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6806 mapsdatatranslation.cpp:6807
+#: mapsdatatranslation.cpp:6812 mapsdatatranslation.cpp:6813
 msgctxt "westbengal.kgm"
 msgid "Darjeeling"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6808 mapsdatatranslation.cpp:6809
+#: mapsdatatranslation.cpp:6814 mapsdatatranslation.cpp:6815
 msgctxt "westbengal.kgm"
 msgid "Jalpaiguri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6810 mapsdatatranslation.cpp:6811
+#: mapsdatatranslation.cpp:6816 mapsdatatranslation.cpp:6817
 msgctxt "westbengal.kgm"
 msgid "Cooch Behar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6812
+#: mapsdatatranslation.cpp:6818
 msgctxt "world.kgm"
 msgid "World"
 msgstr "World"
 
-#: mapsdatatranslation.cpp:6813
+#: mapsdatatranslation.cpp:6819
 msgctxt "world.kgm"
 msgid "Countries"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6814
+#: mapsdatatranslation.cpp:6820
 msgctxt "world.kgm"
 msgid "Not a Nation"
 msgstr "Not a Nation"
 
-#: mapsdatatranslation.cpp:6815
+#: mapsdatatranslation.cpp:6821
 msgctxt "world.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6816
+#: mapsdatatranslation.cpp:6822
 msgctxt "world.kgm"
 msgid "Algeria"
 msgstr "Algeria"
 
-#: mapsdatatranslation.cpp:6817
+#: mapsdatatranslation.cpp:6823
 msgctxt "world.kgm"
 msgid "Algiers"
 msgstr "Algiers"
 
-#: mapsdatatranslation.cpp:6818
+#: mapsdatatranslation.cpp:6824
 msgctxt "world.kgm"
 msgid "Angola"
 msgstr "Angola"
 
-#: mapsdatatranslation.cpp:6819
+#: mapsdatatranslation.cpp:6825
 msgctxt "world.kgm"
 msgid "Luanda"
 msgstr "Lwanda"
 
-#: mapsdatatranslation.cpp:6820
+#: mapsdatatranslation.cpp:6826
 msgctxt "world.kgm"
 msgid "Benin"
 msgstr "Benin"
 
-#: mapsdatatranslation.cpp:6821
+#: mapsdatatranslation.cpp:6827
 msgctxt "world.kgm"
 msgid "Porto Novo"
 msgstr "Porto Novo"
 
-#: mapsdatatranslation.cpp:6822
+#: mapsdatatranslation.cpp:6828
 msgctxt "world.kgm"
 msgid "Botswana"
 msgstr "Botswana"
 
-#: mapsdatatranslation.cpp:6823
+#: mapsdatatranslation.cpp:6829
 msgctxt "world.kgm"
 msgid "Gaborone"
 msgstr "Gaborone"
 
-#: mapsdatatranslation.cpp:6824
+#: mapsdatatranslation.cpp:6830
 msgctxt "world.kgm"
 msgid "Burkina Faso"
 msgstr "Burcina Ffaso"
 
-#: mapsdatatranslation.cpp:6825
+#: mapsdatatranslation.cpp:6831
 msgctxt "world.kgm"
 msgid "Ouagadougou"
 msgstr "Wagadwgw"
 
-#: mapsdatatranslation.cpp:6826
+#: mapsdatatranslation.cpp:6832
 msgctxt "world.kgm"
 msgid "Burundi"
 msgstr "Bwrwndi"
 
-#: mapsdatatranslation.cpp:6827
+#: mapsdatatranslation.cpp:6833
 msgctxt "world.kgm"
 msgid "Bujumbura"
 msgstr "Bwsiwmbwra"
 
-#: mapsdatatranslation.cpp:6828
+#: mapsdatatranslation.cpp:6834
 msgctxt "world.kgm"
 msgid "Cameroon"
 msgstr "Camerŵn"
 
-#: mapsdatatranslation.cpp:6829
+#: mapsdatatranslation.cpp:6835
 msgctxt "world.kgm"
 msgid "Yaoundé"
 msgstr "Iaẅnde"
 
-#: mapsdatatranslation.cpp:6830
+#: mapsdatatranslation.cpp:6836
 msgctxt "world.kgm"
 msgid "Central African Republic"
 msgstr "Gweriniaeth Ganolbarth Affrica"
 
-#: mapsdatatranslation.cpp:6831
+#: mapsdatatranslation.cpp:6837
 msgctxt "world.kgm"
 msgid "Bangui"
 msgstr "Bangi"
 
-#: mapsdatatranslation.cpp:6832
+#: mapsdatatranslation.cpp:6838
 msgctxt "world.kgm"
 msgid "Chad"
 msgstr "Tsiad"
 
-#: mapsdatatranslation.cpp:6833
+#: mapsdatatranslation.cpp:6839
 msgctxt "world.kgm"
 msgid "N'Djamena"
 msgstr "Nsiamena"
 
-#: mapsdatatranslation.cpp:6834
+#: mapsdatatranslation.cpp:6840
 msgctxt "world.kgm"
 msgid "Côte d'Ivoire"
 msgstr "Côte d'Ivoire"
 
-#: mapsdatatranslation.cpp:6835
+#: mapsdatatranslation.cpp:6841
 msgctxt "world.kgm"
 msgid "Yamoussoukro"
 msgstr "Iamwswcro"
 
-#: mapsdatatranslation.cpp:6836
+#: mapsdatatranslation.cpp:6842
 msgctxt "world.kgm"
 msgid "Democratic Republic of the Congo"
 msgstr "Gweriniaeth Ddemocrataidd y Congo"
 
-#: mapsdatatranslation.cpp:6837
+#: mapsdatatranslation.cpp:6843
 msgctxt "world.kgm"
 msgid "Kinshasa"
 msgstr "Cinsiasa"
 
-#: mapsdatatranslation.cpp:6838 mapsdatatranslation.cpp:6839
+#: mapsdatatranslation.cpp:6844 mapsdatatranslation.cpp:6845
 msgctxt "world.kgm"
 msgid "Djibouti"
 msgstr "Jibwti"
 
-#: mapsdatatranslation.cpp:6840
+#: mapsdatatranslation.cpp:6846
 msgctxt "world.kgm"
 msgid "Egypt"
 msgstr "Yr Aifft"
 
-#: mapsdatatranslation.cpp:6841
+#: mapsdatatranslation.cpp:6847
 msgctxt "world.kgm"
 msgid "Cairo"
 msgstr "Cairo"
 
-#: mapsdatatranslation.cpp:6842
+#: mapsdatatranslation.cpp:6848
 msgctxt "world.kgm"
 msgid "Equatorial Guinea"
 msgstr "Gini Cyhydeddol"
 
-#: mapsdatatranslation.cpp:6843
+#: mapsdatatranslation.cpp:6849
 msgctxt "world.kgm"
 msgid "Malabo"
 msgstr "Malabo"
 
-#: mapsdatatranslation.cpp:6844
+#: mapsdatatranslation.cpp:6850
 msgctxt "world.kgm"
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: mapsdatatranslation.cpp:6845
+#: mapsdatatranslation.cpp:6851
 msgctxt "world.kgm"
 msgid "Asmara"
 msgstr "Asmara"
 
-#: mapsdatatranslation.cpp:6846
+#: mapsdatatranslation.cpp:6852
 msgctxt "world.kgm"
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: mapsdatatranslation.cpp:6847
+#: mapsdatatranslation.cpp:6853
 msgctxt "world.kgm"
 msgid "Addis Ababa"
 msgstr "Adis Ababa"
 
-#: mapsdatatranslation.cpp:6848
+#: mapsdatatranslation.cpp:6854
 msgctxt "world.kgm"
 msgid "Gabon"
 msgstr "Gabon"
 
-#: mapsdatatranslation.cpp:6849
+#: mapsdatatranslation.cpp:6855
 msgctxt "world.kgm"
 msgid "Libreville"
 msgstr "Libreville"
 
-#: mapsdatatranslation.cpp:6850
+#: mapsdatatranslation.cpp:6856
 msgctxt "world.kgm"
 msgid "Ghana"
 msgstr "Gana"
 
-#: mapsdatatranslation.cpp:6851
+#: mapsdatatranslation.cpp:6857
 msgctxt "world.kgm"
 msgid "Accra"
 msgstr "Acra"
 
-#: mapsdatatranslation.cpp:6852
+#: mapsdatatranslation.cpp:6858
 msgctxt "world.kgm"
 msgid "Guinea"
 msgstr "Gini"
 
-#: mapsdatatranslation.cpp:6853
+#: mapsdatatranslation.cpp:6859
 msgctxt "world.kgm"
 msgid "Conakry"
 msgstr "Conacri"
 
-#: mapsdatatranslation.cpp:6854
+#: mapsdatatranslation.cpp:6860
 msgctxt "world.kgm"
 msgid "Guinea-Bissau"
 msgstr "Gini-Biso"
 
-#: mapsdatatranslation.cpp:6855
+#: mapsdatatranslation.cpp:6861
 msgctxt "world.kgm"
 msgid "Bissau"
 msgstr "Biso"
 
-#: mapsdatatranslation.cpp:6856
+#: mapsdatatranslation.cpp:6862
 msgctxt "world.kgm"
 msgid "Iran"
 msgstr "Iran"
 
-#: mapsdatatranslation.cpp:6857
+#: mapsdatatranslation.cpp:6863
 msgctxt "world.kgm"
 msgid "Tehran"
 msgstr "Tehran"
 
-#: mapsdatatranslation.cpp:6858
+#: mapsdatatranslation.cpp:6864
 msgctxt "world.kgm"
 msgid "Iraq"
 msgstr "Irac"
 
-#: mapsdatatranslation.cpp:6859
+#: mapsdatatranslation.cpp:6865
 msgctxt "world.kgm"
 msgid "Baghdad"
 msgstr "Baghdad"
 
-#: mapsdatatranslation.cpp:6860
+#: mapsdatatranslation.cpp:6866
 msgctxt "world.kgm"
 msgid "Israel"
 msgstr "Israel"
 
-#: mapsdatatranslation.cpp:6861
+#: mapsdatatranslation.cpp:6867
 msgctxt "world.kgm"
 msgid "Jerusalem"
 msgstr "Jerwsalem"
 
-#: mapsdatatranslation.cpp:6862
+#: mapsdatatranslation.cpp:6868
 msgctxt "world.kgm"
 msgid "Jordan"
 msgstr "Iorddonen"
 
-#: mapsdatatranslation.cpp:6863
+#: mapsdatatranslation.cpp:6869
 msgctxt "world.kgm"
 msgid "Amman"
 msgstr "Aman"
 
-#: mapsdatatranslation.cpp:6864
+#: mapsdatatranslation.cpp:6870
 msgctxt "world.kgm"
 msgid "Kenya"
 msgstr "Cenia"
 
-#: mapsdatatranslation.cpp:6865
+#: mapsdatatranslation.cpp:6871
 msgctxt "world.kgm"
 msgid "Nairobi"
 msgstr "Nairobi"
 
-#: mapsdatatranslation.cpp:6866
+#: mapsdatatranslation.cpp:6872
 msgctxt "world.kgm"
 msgid "Kuwait"
 msgstr "Coweit"
 
-#: mapsdatatranslation.cpp:6867
+#: mapsdatatranslation.cpp:6873
 msgctxt "world.kgm"
 msgid "Kuwait City"
 msgstr "Dinas Coweit"
 
-#: mapsdatatranslation.cpp:6868
+#: mapsdatatranslation.cpp:6874
 msgctxt "world.kgm"
 msgid "Lebanon"
 msgstr "Libanus"
 
-#: mapsdatatranslation.cpp:6869
+#: mapsdatatranslation.cpp:6875
 msgctxt "world.kgm"
 msgid "Beirut"
 msgstr "Beirŵt"
 
-#: mapsdatatranslation.cpp:6870
+#: mapsdatatranslation.cpp:6876
 msgctxt "world.kgm"
 msgid "Lesotho"
 msgstr "Leswtw"
 
-#: mapsdatatranslation.cpp:6871
+#: mapsdatatranslation.cpp:6877
 msgctxt "world.kgm"
 msgid "Maseru"
 msgstr "Maserw"
 
-#: mapsdatatranslation.cpp:6872
+#: mapsdatatranslation.cpp:6878
 msgctxt "world.kgm"
 msgid "Liberia"
 msgstr "Liberia"
 
-#: mapsdatatranslation.cpp:6873
+#: mapsdatatranslation.cpp:6879
 msgctxt "world.kgm"
 msgid "Monrovia"
 msgstr "Monrofia"
 
-#: mapsdatatranslation.cpp:6874
+#: mapsdatatranslation.cpp:6880
 msgctxt "world.kgm"
 msgid "Libya"
 msgstr "Libia"
 
-#: mapsdatatranslation.cpp:6875
+#: mapsdatatranslation.cpp:6881
 msgctxt "world.kgm"
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: mapsdatatranslation.cpp:6876
+#: mapsdatatranslation.cpp:6882
 msgctxt "world.kgm"
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: mapsdatatranslation.cpp:6877
+#: mapsdatatranslation.cpp:6883
 msgctxt "world.kgm"
 msgid "Vaduz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6878
+#: mapsdatatranslation.cpp:6884
 msgctxt "world.kgm"
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: mapsdatatranslation.cpp:6879
+#: mapsdatatranslation.cpp:6885
 msgctxt "world.kgm"
 msgid "Antananarivo"
 msgstr "Antananarifo"
 
-#: mapsdatatranslation.cpp:6880
+#: mapsdatatranslation.cpp:6886
 msgctxt "world.kgm"
 msgid "Malawi"
 msgstr "Malawi"
 
-#: mapsdatatranslation.cpp:6881
+#: mapsdatatranslation.cpp:6887
 msgctxt "world.kgm"
 msgid "Lilongwe"
 msgstr "Lilongwe"
 
-#: mapsdatatranslation.cpp:6882
+#: mapsdatatranslation.cpp:6888
 msgctxt "world.kgm"
 msgid "Mali"
 msgstr "Mali"
 
-#: mapsdatatranslation.cpp:6883
+#: mapsdatatranslation.cpp:6889
 msgctxt "world.kgm"
 msgid "Bamako"
 msgstr "Bamaco"
 
-#: mapsdatatranslation.cpp:6884
+#: mapsdatatranslation.cpp:6890
 msgctxt "world.kgm"
 msgid "Mauritania"
 msgstr "Mawritania"
 
-#: mapsdatatranslation.cpp:6885
+#: mapsdatatranslation.cpp:6891
 msgctxt "world.kgm"
 msgid "Nouakchott"
 msgstr "Nwaksiot"
 
-#: mapsdatatranslation.cpp:6886
+#: mapsdatatranslation.cpp:6892
 msgctxt "world.kgm"
 msgid "Morocco"
 msgstr "Moroco"
 
-#: mapsdatatranslation.cpp:6887
+#: mapsdatatranslation.cpp:6893
 msgctxt "world.kgm"
 msgid "Rabat"
 msgstr "Rabat"
 
-#: mapsdatatranslation.cpp:6888
+#: mapsdatatranslation.cpp:6894
 msgctxt "world.kgm"
 msgid "Mozambique"
 msgstr "Mosambîc"
 
-#: mapsdatatranslation.cpp:6889
+#: mapsdatatranslation.cpp:6895
 msgctxt "world.kgm"
 msgid "Maputo"
 msgstr "Mapwto"
 
-#: mapsdatatranslation.cpp:6890
+#: mapsdatatranslation.cpp:6896
 msgctxt "world.kgm"
 msgid "Namibia"
 msgstr "Namibia"
 
-#: mapsdatatranslation.cpp:6891
+#: mapsdatatranslation.cpp:6897
 msgctxt "world.kgm"
 msgid "Windhoek"
 msgstr "Windhoek"
 
-#: mapsdatatranslation.cpp:6892
+#: mapsdatatranslation.cpp:6898
 msgctxt "world.kgm"
 msgid "Niger"
 msgstr "Niger"
 
-#: mapsdatatranslation.cpp:6893
+#: mapsdatatranslation.cpp:6899
 msgctxt "world.kgm"
 msgid "Niamey"
 msgstr "Niamei"
 
-#: mapsdatatranslation.cpp:6894
+#: mapsdatatranslation.cpp:6900
 msgctxt "world.kgm"
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: mapsdatatranslation.cpp:6895
+#: mapsdatatranslation.cpp:6901
 msgctxt "world.kgm"
 msgid "Abuja"
 msgstr "Abwsia"
 
-#: mapsdatatranslation.cpp:6896
+#: mapsdatatranslation.cpp:6902
 msgctxt "world.kgm"
 msgid "Qatar"
 msgstr "Qatar"
 
-#: mapsdatatranslation.cpp:6897
+#: mapsdatatranslation.cpp:6903
 msgctxt "world.kgm"
 msgid "Doha"
 msgstr "Doha"
 
-#: mapsdatatranslation.cpp:6898
+#: mapsdatatranslation.cpp:6904
 msgctxt "world.kgm"
 msgid "Republic of the Congo"
 msgstr "Gweriniaeth y Congo"
 
-#: mapsdatatranslation.cpp:6899
+#: mapsdatatranslation.cpp:6905
 msgctxt "world.kgm"
 msgid "Brazzaville"
 msgstr "Brazzaville"
 
-#: mapsdatatranslation.cpp:6900
+#: mapsdatatranslation.cpp:6906
 msgctxt "world.kgm"
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: mapsdatatranslation.cpp:6901
+#: mapsdatatranslation.cpp:6907
 msgctxt "world.kgm"
 msgid "Kigali"
 msgstr "Cigali"
 
-#: mapsdatatranslation.cpp:6902
+#: mapsdatatranslation.cpp:6908
 msgctxt "world.kgm"
 msgid "Saudi Arabia"
 msgstr "Sawdi-Arabia"
 
-#: mapsdatatranslation.cpp:6903
+#: mapsdatatranslation.cpp:6909
 msgctxt "world.kgm"
 msgid "Riyadh"
 msgstr "Riadd"
 
-#: mapsdatatranslation.cpp:6904
+#: mapsdatatranslation.cpp:6910
 msgctxt "world.kgm"
 msgid "Senegal"
 msgstr "Senegal"
 
-#: mapsdatatranslation.cpp:6905
+#: mapsdatatranslation.cpp:6911
 msgctxt "world.kgm"
 msgid "Dakar"
 msgstr "Dacar"
 
-#: mapsdatatranslation.cpp:6906
+#: mapsdatatranslation.cpp:6912
 msgctxt "world.kgm"
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: mapsdatatranslation.cpp:6907
+#: mapsdatatranslation.cpp:6913
 msgctxt "world.kgm"
 msgid "Freetown"
 msgstr "Freetown"
 
-#: mapsdatatranslation.cpp:6908
+#: mapsdatatranslation.cpp:6914
 msgctxt "world.kgm"
 msgid "Somalia"
 msgstr "Somalia"
 
-#: mapsdatatranslation.cpp:6909
+#: mapsdatatranslation.cpp:6915
 msgctxt "world.kgm"
 msgid "Mogadishu"
 msgstr "Mogadisw"
 
-#: mapsdatatranslation.cpp:6910
+#: mapsdatatranslation.cpp:6916
 msgctxt "world.kgm"
 msgid "South Africa"
 msgstr "De Affrica"
 
-#: mapsdatatranslation.cpp:6911
+#: mapsdatatranslation.cpp:6917
 msgctxt "world.kgm"
 msgid "Pretoria, Bloemfontein and Cape Town"
 msgstr ""
 
-#: mapsdatatranslation.cpp:6912
+#: mapsdatatranslation.cpp:6918
 msgctxt "world.kgm"
 msgid "Sudan"
 msgstr "Swdan"
 
-#: mapsdatatranslation.cpp:6913
+#: mapsdatatranslation.cpp:6919
 msgctxt "world.kgm"
 msgid "Khartoum"
 msgstr "Cartŵm"
 
-#: mapsdatatranslation.cpp:6914
+#: mapsdatatranslation.cpp:6920
+msgctxt "world.kgm"
+msgid "South Sudan"
+msgstr ""
+
+#: mapsdatatranslation.cpp:6921
+msgctxt "world.kgm"
+msgid "Juba"
+msgstr ""
+
+#: mapsdatatranslation.cpp:6922
 msgctxt "world.kgm"
 msgid "Swaziland"
 msgstr "Gwlad y Swasi"
 
-#: mapsdatatranslation.cpp:6915
+#: mapsdatatranslation.cpp:6923
 msgctxt "world.kgm"
 msgid "Mbabane"
 msgstr "Mbabane"
 
-#: mapsdatatranslation.cpp:6916
+#: mapsdatatranslation.cpp:6924
 msgctxt "world.kgm"
 msgid "Syria"
 msgstr "Syria"
 
-#: mapsdatatranslation.cpp:6917
+#: mapsdatatranslation.cpp:6925
 msgctxt "world.kgm"
 msgid "Damascus"
 msgstr "Damascws"
 
-#: mapsdatatranslation.cpp:6918
+#: mapsdatatranslation.cpp:6926
 msgctxt "world.kgm"
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: mapsdatatranslation.cpp:6919
+#: mapsdatatranslation.cpp:6927
 msgctxt "world.kgm"
 msgid "Dodoma"
 msgstr "Dodoma"
 
-#: mapsdatatranslation.cpp:6920
+#: mapsdatatranslation.cpp:6928
 msgctxt "world.kgm"
 msgid "The Gambia"
 msgstr "Y Gambia"
 
-#: mapsdatatranslation.cpp:6921
+#: mapsdatatranslation.cpp:6929
 msgctxt "world.kgm"
 msgid "Banjul"
 msgstr "Banjul"
 
-#: mapsdatatranslation.cpp:6922
+#: mapsdatatranslation.cpp:6930
 msgctxt "world.kgm"
 msgid "Togo"
 msgstr "Togo"
 
-#: mapsdatatranslation.cpp:6923
+#: mapsdatatranslation.cpp:6931
 msgctxt "world.kgm"
 msgid "Lomé"
 msgstr "Lomé"
 
-#: mapsdatatranslation.cpp:6924
+#: mapsdatatranslation.cpp:6932
 msgctxt "world.kgm"
 msgid "Tunisia"
 msgstr "Tiwnisia"
 
-#: mapsdatatranslation.cpp:6925
+#: mapsdatatranslation.cpp:6933
 msgctxt "world.kgm"
 msgid "Tunis"
 msgstr "Tiwnis"
 
-#: mapsdatatranslation.cpp:6926
+#: mapsdatatranslation.cpp:6934
 msgctxt "world.kgm"
 msgid "Uganda"
 msgstr "Wganda"
 
-#: mapsdatatranslation.cpp:6927
+#: mapsdatatranslation.cpp:6935
 msgctxt "world.kgm"
 msgid "Kampala"
 msgstr "Campala"
 
-#: mapsdatatranslation.cpp:6928
+#: mapsdatatranslation.cpp:6936
 msgctxt "world.kgm"
 msgid "United Arab Emirates"
 msgstr "Emiraethau Arabaidd Unedig"
 
-#: mapsdatatranslation.cpp:6929
+#: mapsdatatranslation.cpp:6937
 msgctxt "world.kgm"
 msgid "Abu Dhabi City"
 msgstr "Dinas Abw Ddabi"
 
-#: mapsdatatranslation.cpp:6930
+#: mapsdatatranslation.cpp:6938
 msgctxt "world.kgm"
 msgid "Oman"
 msgstr "Oman"
 
-#: mapsdatatranslation.cpp:6931
+#: mapsdatatranslation.cpp:6939
 msgctxt "world.kgm"
 msgid "Muscat"
 msgstr "Mwscat"
 
-#: mapsdatatranslation.cpp:6932
+#: mapsdatatranslation.cpp:6940
 msgctxt "world.kgm"
 msgid "West Bank"
 msgstr "Y Lan Orllewin"
 
-#: mapsdatatranslation.cpp:6933
+#: mapsdatatranslation.cpp:6941
 msgctxt "world.kgm"
 msgid "Western Sahara"
 msgstr "Gorllewin Sahara"
 
-#: mapsdatatranslation.cpp:6934
+#: mapsdatatranslation.cpp:6942
 msgctxt "world.kgm"
 msgid "Laayoune"
 msgstr "Laayoune"
 
-#: mapsdatatranslation.cpp:6935
+#: mapsdatatranslation.cpp:6943
 msgctxt "world.kgm"
 msgid "Yemen"
 msgstr "Iemen"
 
-#: mapsdatatranslation.cpp:6936
+#: mapsdatatranslation.cpp:6944
 msgctxt "world.kgm"
 msgid "Sana'a"
 msgstr "Sana'a"
 
-#: mapsdatatranslation.cpp:6937
+#: mapsdatatranslation.cpp:6945
 msgctxt "world.kgm"
 msgid "Zambia"
 msgstr "Zambia"
 
-#: mapsdatatranslation.cpp:6938
+#: mapsdatatranslation.cpp:6946
 msgctxt "world.kgm"
 msgid "Lusaka"
 msgstr "Lwsaca"
 
-#: mapsdatatranslation.cpp:6939
+#: mapsdatatranslation.cpp:6947
 msgctxt "world.kgm"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: mapsdatatranslation.cpp:6940
+#: mapsdatatranslation.cpp:6948
 msgctxt "world.kgm"
 msgid "Harare"
 msgstr "Harare"
 
-#: mapsdatatranslation.cpp:6941
+#: mapsdatatranslation.cpp:6949
 msgctxt "world.kgm"
 msgid "Albania"
 msgstr "Albania"
 
-#: mapsdatatranslation.cpp:6942
+#: mapsdatatranslation.cpp:6950
 msgctxt "world.kgm"
 msgid "Tirana"
 msgstr "Tirana"
 
-#: mapsdatatranslation.cpp:6943
+#: mapsdatatranslation.cpp:6951
 msgctxt "world.kgm"
 msgid "Austria"
 msgstr "Awstria"
 
-#: mapsdatatranslation.cpp:6944
+#: mapsdatatranslation.cpp:6952
 msgctxt "world.kgm"
 msgid "Vienna"
 msgstr "Fiena"
 
-#: mapsdatatranslation.cpp:6945
+#: mapsdatatranslation.cpp:6953
 msgctxt "world.kgm"
 msgid "Belarus"
 msgstr "Belarws"
 
-#: mapsdatatranslation.cpp:6946
+#: mapsdatatranslation.cpp:6954
 msgctxt "world.kgm"
 msgid "Minsk"
 msgstr "Minsk"
 
-#: mapsdatatranslation.cpp:6947
+#: mapsdatatranslation.cpp:6955
 msgctxt "world.kgm"
 msgid "Belgium"
 msgstr "Gwlad y Belg"
 
-#: mapsdatatranslation.cpp:6948
+#: mapsdatatranslation.cpp:6956
 msgctxt "world.kgm"
 msgid "Brussels"
 msgstr "Brwsel"
 
-#: mapsdatatranslation.cpp:6949
+#: mapsdatatranslation.cpp:6957
 msgctxt "world.kgm"
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ac Hertsegofina"
 
-#: mapsdatatranslation.cpp:6950
+#: mapsdatatranslation.cpp:6958
 msgctxt "world.kgm"
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: mapsdatatranslation.cpp:6951
+#: mapsdatatranslation.cpp:6959
 msgctxt "world.kgm"
 msgid "Bulgaria"
 msgstr "Bwlgaria"
 
-#: mapsdatatranslation.cpp:6952
+#: mapsdatatranslation.cpp:6960
 msgctxt "world.kgm"
 msgid "Sofia"
 msgstr "Soffia"
 
-#: mapsdatatranslation.cpp:6953
+#: mapsdatatranslation.cpp:6961
 msgctxt "world.kgm"
 msgid "Croatia"
 msgstr "Croatia"
 
-#: mapsdatatranslation.cpp:6954
+#: mapsdatatranslation.cpp:6962
 msgctxt "world.kgm"
 msgid "Zagreb"
 msgstr "Sagreb"
 
-#: mapsdatatranslation.cpp:6955
+#: mapsdatatranslation.cpp:6963
 msgctxt "world.kgm"
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: mapsdatatranslation.cpp:6956
+#: mapsdatatranslation.cpp:6964
 msgctxt "world.kgm"
 msgid "Prague"
 msgstr "Prag"
 
-#: mapsdatatranslation.cpp:6957
+#: mapsdatatranslation.cpp:6965
 msgctxt "world.kgm"
 msgid "Denmark"
 msgstr "Denmarc"
 
-#: mapsdatatranslation.cpp:6958
+#: mapsdatatranslation.cpp:6966
 msgctxt "world.kgm"
 msgid "Copenhagen"
 msgstr "Copenhagen"
 
-#: mapsdatatranslation.cpp:6959
+#: mapsdatatranslation.cpp:6967
 msgctxt "world.kgm"
 msgid "Estonia"
 msgstr "Estonia"
 
-#: mapsdatatranslation.cpp:6960
+#: mapsdatatranslation.cpp:6968
 msgctxt "world.kgm"
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: mapsdatatranslation.cpp:6961
+#: mapsdatatranslation.cpp:6969
 msgctxt "world.kgm"
 msgid "Finland"
 msgstr "Y Ffindir"
 
-#: mapsdatatranslation.cpp:6962
+#: mapsdatatranslation.cpp:6970
 msgctxt "world.kgm"
 msgid "Helsinki"
 msgstr "Helsinci"
 
-#: mapsdatatranslation.cpp:6963
+#: mapsdatatranslation.cpp:6971
 msgctxt "world.kgm"
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: mapsdatatranslation.cpp:6964
+#: mapsdatatranslation.cpp:6972
 msgctxt "world.kgm"
 msgid "Skopje"
 msgstr "Skopje"
 
-#: mapsdatatranslation.cpp:6965
+#: mapsdatatranslation.cpp:6973
 msgctxt "world.kgm"
 msgid "France"
 msgstr "France"
 
-#: mapsdatatranslation.cpp:6966
+#: mapsdatatranslation.cpp:6974
 msgctxt "world.kgm"
 msgid "Paris"
 msgstr "Paris"
 
-#: mapsdatatranslation.cpp:6967
+#: mapsdatatranslation.cpp:6975
 msgctxt "world.kgm"
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: mapsdatatranslation.cpp:6968
+#: mapsdatatranslation.cpp:6976
 msgctxt "world.kgm"
 msgid "Berlin"
 msgstr "Berlin"
 
-#: mapsdatatranslation.cpp:6969
+#: mapsdatatranslation.cpp:6977
 msgctxt "world.kgm"
 msgid "Greece"
 msgstr "Groeg"
 
-#: mapsdatatranslation.cpp:6970
+#: mapsdatatranslation.cpp:6978
 msgctxt "world.kgm"
 msgid "Athens"
 msgstr "Athens"
 
-#: mapsdatatranslation.cpp:6971
+#: mapsdatatranslation.cpp:6979
 msgctxt "world.kgm"
 msgid "Hungary"
 msgstr "Hungary"
 
-#: mapsdatatranslation.cpp:6972
+#: mapsdatatranslation.cpp:6980
 msgctxt "world.kgm"
 msgid "Budapest"
 msgstr "Budapest"
 
-#: mapsdatatranslation.cpp:6973
+#: mapsdatatranslation.cpp:6981
 msgctxt "world.kgm"
 msgid "Iceland"
 msgstr "Iceland"
 
-#: mapsdatatranslation.cpp:6974
+#: mapsdatatranslation.cpp:6982
 msgctxt "world.kgm"
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: mapsdatatranslation.cpp:6975
+#: mapsdatatranslation.cpp:6983
 msgctxt "world.kgm"
 msgid "Ireland"
 msgstr "Ireland"
 
-#: mapsdatatranslation.cpp:6976
+#: mapsdatatranslation.cpp:6984
 msgctxt "world.kgm"
 msgid "Dublin"
 msgstr "Dublin"
 
-#: mapsdatatranslation.cpp:6977
+#: mapsdatatranslation.cpp:6985
 msgctxt "world.kgm"
 msgid "Italy"
 msgstr "yr Eidal"
 
-#: mapsdatatranslation.cpp:6978
+#: mapsdatatranslation.cpp:6986
 msgctxt "world.kgm"
 msgid "Rome"
 msgstr "Rome"
 
-#: mapsdatatranslation.cpp:6979
+#: mapsdatatranslation.cpp:6987
 msgctxt "world.kgm"
 msgid "Latvia"
 msgstr "Latvia"
 
-#: mapsdatatranslation.cpp:6980
+#: mapsdatatranslation.cpp:6988
 msgctxt "world.kgm"
 msgid "Riga"
 msgstr "Riga"
 
-#: mapsdatatranslation.cpp:6981
+#: mapsdatatranslation.cpp:6989
 msgctxt "world.kgm"
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: mapsdatatranslation.cpp:6982
+#: mapsdatatranslation.cpp:6990
 msgctxt "world.kgm"
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: mapsdatatranslation.cpp:6983 mapsdatatranslation.cpp:6984
+#: mapsdatatranslation.cpp:6991 mapsdatatranslation.cpp:6992
 msgctxt "world.kgm"
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: mapsdatatranslation.cpp:6985
+#: mapsdatatranslation.cpp:6993
 msgctxt "world.kgm"
 msgid "Moldova"
 msgstr "Moldova"
 
-#: mapsdatatranslation.cpp:6986
+#: mapsdatatranslation.cpp:6994
 msgctxt "world.kgm"
 msgid "Chisinau"
 msgstr "Chisinau"
 
-#: mapsdatatranslation.cpp:6987
+#: mapsdatatranslation.cpp:6995
 msgctxt "world.kgm"
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: mapsdatatranslation.cpp:6988
+#: mapsdatatranslation.cpp:6996
 msgctxt "world.kgm"
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
-#: mapsdatatranslation.cpp:6989
+#: mapsdatatranslation.cpp:6997
 msgctxt "world.kgm"
 msgid "Norway"
 msgstr "Norwy"
 
-#: mapsdatatranslation.cpp:6990
+#: mapsdatatranslation.cpp:6998
 msgctxt "world.kgm"
 msgid "Oslo"
 msgstr "Oslo"
 
-#: mapsdatatranslation.cpp:6991
+#: mapsdatatranslation.cpp:6999
 msgctxt "world.kgm"
 msgid "Poland"
 msgstr "Poland"
 
-#: mapsdatatranslation.cpp:6992
+#: mapsdatatranslation.cpp:7000
 msgctxt "world.kgm"
 msgid "Warsaw"
 msgstr "Warsaw"
 
-#: mapsdatatranslation.cpp:6993
+#: mapsdatatranslation.cpp:7001
 msgctxt "world.kgm"
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: mapsdatatranslation.cpp:6994
+#: mapsdatatranslation.cpp:7002
 msgctxt "world.kgm"
 msgid "Lisbon"
 msgstr "Lisbon"
 
-#: mapsdatatranslation.cpp:6995
+#: mapsdatatranslation.cpp:7003
 msgctxt "world.kgm"
 msgid "Romania"
 msgstr "Romania"
 
-#: mapsdatatranslation.cpp:6996
+#: mapsdatatranslation.cpp:7004
 msgctxt "world.kgm"
 msgid "Bucharest"
 msgstr "Bucharest"
 
-#: mapsdatatranslation.cpp:6997
+#: mapsdatatranslation.cpp:7005
 msgctxt "world.kgm"
 msgid "Russia"
 msgstr "Rwsia"
 
-#: mapsdatatranslation.cpp:6998
+#: mapsdatatranslation.cpp:7006
 msgctxt "world.kgm"
 msgid "Moscow"
 msgstr "Mosgo"
 
-#: mapsdatatranslation.cpp:6999 mapsdatatranslation.cpp:7000
+#: mapsdatatranslation.cpp:7007 mapsdatatranslation.cpp:7008
 msgctxt "world.kgm"
 msgid "San Marino"
 msgstr "San Marino"
 
-#: mapsdatatranslation.cpp:7001
+#: mapsdatatranslation.cpp:7009
 msgctxt "world.kgm"
 msgid "Serbia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7002
+#: mapsdatatranslation.cpp:7010
 msgctxt "world.kgm"
 msgid "Belgrade"
 msgstr "Belgrade"
 
-#: mapsdatatranslation.cpp:7003
+#: mapsdatatranslation.cpp:7011
 msgctxt "world.kgm"
 msgid "Montenegro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7004
+#: mapsdatatranslation.cpp:7012
 msgctxt "world.kgm"
 msgid "Podgorica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7005
+#: mapsdatatranslation.cpp:7013
 msgctxt "world.kgm"
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: mapsdatatranslation.cpp:7006
+#: mapsdatatranslation.cpp:7014
 msgctxt "world.kgm"
 msgid "Bratislava"
 msgstr "Bratislava"
 
-#: mapsdatatranslation.cpp:7007
+#: mapsdatatranslation.cpp:7015
 msgctxt "world.kgm"
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: mapsdatatranslation.cpp:7008
+#: mapsdatatranslation.cpp:7016
 msgctxt "world.kgm"
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
-#: mapsdatatranslation.cpp:7009
+#: mapsdatatranslation.cpp:7017
 msgctxt "world.kgm"
 msgid "Spain"
 msgstr "Sbaen"
 
-#: mapsdatatranslation.cpp:7010
+#: mapsdatatranslation.cpp:7018
 msgctxt "world.kgm"
 msgid "Madrid"
 msgstr "Madrid"
 
-#: mapsdatatranslation.cpp:7011
+#: mapsdatatranslation.cpp:7019
 msgctxt "world.kgm"
 msgid "Sweden"
 msgstr "Sweden"
 
-#: mapsdatatranslation.cpp:7012
+#: mapsdatatranslation.cpp:7020
 msgctxt "world.kgm"
 msgid "Stockholm"
 msgstr "Stockholm"
 
-#: mapsdatatranslation.cpp:7013
+#: mapsdatatranslation.cpp:7021
 msgctxt "world.kgm"
 msgid "Switzerland"
 msgstr "Switzerland"
 
-#: mapsdatatranslation.cpp:7014
+#: mapsdatatranslation.cpp:7022
 msgctxt "world.kgm"
 msgid "Bern"
 msgstr "Bern"
 
-#: mapsdatatranslation.cpp:7015
+#: mapsdatatranslation.cpp:7023
 msgctxt "world.kgm"
 msgid "Turkey"
 msgstr "Twrci"
 
-#: mapsdatatranslation.cpp:7016
+#: mapsdatatranslation.cpp:7024
 msgctxt "world.kgm"
 msgid "Ankara"
 msgstr "Ankara"
 
-#: mapsdatatranslation.cpp:7017
+#: mapsdatatranslation.cpp:7025
 msgctxt "world.kgm"
 msgid "Ukraine"
 msgstr "Wcrain"
 
-#: mapsdatatranslation.cpp:7018
+#: mapsdatatranslation.cpp:7026
 msgctxt "world.kgm"
 msgid "Kiev"
 msgstr "Kiev"
 
-#: mapsdatatranslation.cpp:7019
+#: mapsdatatranslation.cpp:7027
 msgctxt "world.kgm"
 msgid "United Kingdom"
 msgstr "United Kingdom"
 
-#: mapsdatatranslation.cpp:7020
+#: mapsdatatranslation.cpp:7028
 msgctxt "world.kgm"
 msgid "London"
 msgstr "London"
 
-#: mapsdatatranslation.cpp:7021
+#: mapsdatatranslation.cpp:7029
 msgctxt "world.kgm"
 msgid "Canada"
 msgstr "Canada"
 
-#: mapsdatatranslation.cpp:7022
+#: mapsdatatranslation.cpp:7030
 msgctxt "world.kgm"
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: mapsdatatranslation.cpp:7023
+#: mapsdatatranslation.cpp:7031
 msgctxt "world.kgm"
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: mapsdatatranslation.cpp:7024
+#: mapsdatatranslation.cpp:7032
 msgctxt "world.kgm"
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: mapsdatatranslation.cpp:7025
+#: mapsdatatranslation.cpp:7033
 msgctxt "world.kgm"
 msgid "The United States of America"
 msgstr "The United States of America"
 
-#: mapsdatatranslation.cpp:7026
+#: mapsdatatranslation.cpp:7034
 msgctxt "world.kgm"
 msgid "Washington D.C."
 msgstr "Washington D.C."
 
-#: mapsdatatranslation.cpp:7027
+#: mapsdatatranslation.cpp:7035
 msgctxt "world.kgm"
 msgid "The Bahamas"
 msgstr "The Bahamas"
 
-#: mapsdatatranslation.cpp:7028
+#: mapsdatatranslation.cpp:7036
 msgctxt "world.kgm"
 msgid "Nassau"
 msgstr "Nassau"
 
-#: mapsdatatranslation.cpp:7029
+#: mapsdatatranslation.cpp:7037
 msgctxt "world.kgm"
 msgid "The Dominican Republic"
 msgstr "The Dominican Republic"
 
-#: mapsdatatranslation.cpp:7030
+#: mapsdatatranslation.cpp:7038
 msgctxt "world.kgm"
 msgid "Santo Domingo"
 msgstr "Santo Domingo"
 
-#: mapsdatatranslation.cpp:7031
+#: mapsdatatranslation.cpp:7039
 msgctxt "world.kgm"
 msgid "Haiti"
 msgstr "Haiti"
 
-#: mapsdatatranslation.cpp:7032
+#: mapsdatatranslation.cpp:7040
 msgctxt "world.kgm"
 msgid "Port-au-Prince"
 msgstr "Port-au-Prince"
 
-#: mapsdatatranslation.cpp:7033
+#: mapsdatatranslation.cpp:7041
 msgctxt "world.kgm"
 msgid "Cuba"
 msgstr "Cuba"
 
-#: mapsdatatranslation.cpp:7034
+#: mapsdatatranslation.cpp:7042
 msgctxt "world.kgm"
 msgid "Havana"
 msgstr "Havana"
 
-#: mapsdatatranslation.cpp:7035
+#: mapsdatatranslation.cpp:7043
 msgctxt "world.kgm"
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: mapsdatatranslation.cpp:7036
+#: mapsdatatranslation.cpp:7044
 msgctxt "world.kgm"
 msgid "Kingston"
 msgstr "Kingston"
 
-#: mapsdatatranslation.cpp:7037
+#: mapsdatatranslation.cpp:7045
 msgctxt "world.kgm"
 msgid "Dominica"
 msgstr "Dominica"
 
-#: mapsdatatranslation.cpp:7038
+#: mapsdatatranslation.cpp:7046
 msgctxt "world.kgm"
 msgid "Roseau"
 msgstr "Roseau"
 
-#: mapsdatatranslation.cpp:7039
+#: mapsdatatranslation.cpp:7047
 msgctxt "world.kgm"
 msgid "Barbados"
 msgstr "Barbados"
 
-#: mapsdatatranslation.cpp:7040
+#: mapsdatatranslation.cpp:7048
 msgctxt "world.kgm"
 msgid "Bridgetown"
 msgstr "Bridgetown"
 
-#: mapsdatatranslation.cpp:7041
+#: mapsdatatranslation.cpp:7049
 msgctxt "world.kgm"
 msgid "Antigua and Barbuda"
 msgstr "Antigua and Barbuda"
 
-#: mapsdatatranslation.cpp:7042
+#: mapsdatatranslation.cpp:7050
 msgctxt "world.kgm"
 msgid "St. John's"
 msgstr "St. John's"
 
-#: mapsdatatranslation.cpp:7043
+#: mapsdatatranslation.cpp:7051
 msgctxt "world.kgm"
 msgid "Trinidad and Tobago"
 msgstr "Trinidad and Tobago"
 
-#: mapsdatatranslation.cpp:7044
+#: mapsdatatranslation.cpp:7052
 msgctxt "world.kgm"
 msgid "Port of Spain"
 msgstr "Port of Sbaen"
 
-#: mapsdatatranslation.cpp:7045
+#: mapsdatatranslation.cpp:7053
 msgctxt "world.kgm"
 msgid "Mexico"
 msgstr "Mexico"
 
-#: mapsdatatranslation.cpp:7046
+#: mapsdatatranslation.cpp:7054
 msgctxt "world.kgm"
 msgid "Mexico City"
 msgstr "Mexico City"
 
-#: mapsdatatranslation.cpp:7047
+#: mapsdatatranslation.cpp:7055
 msgctxt "world.kgm"
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: mapsdatatranslation.cpp:7048
+#: mapsdatatranslation.cpp:7056
 msgctxt "world.kgm"
 msgid "Guatemala City"
 msgstr "Guatemala City"
 
-#: mapsdatatranslation.cpp:7049
+#: mapsdatatranslation.cpp:7057
 msgctxt "world.kgm"
 msgid "Belize"
 msgstr "Belize"
 
-#: mapsdatatranslation.cpp:7050
+#: mapsdatatranslation.cpp:7058
 msgctxt "world.kgm"
 msgid "Belmopan"
 msgstr "Belmopan"
 
-#: mapsdatatranslation.cpp:7051
+#: mapsdatatranslation.cpp:7059
 msgctxt "world.kgm"
 msgid "Honduras"
 msgstr "Honduras"
 
-#: mapsdatatranslation.cpp:7052
+#: mapsdatatranslation.cpp:7060
 msgctxt "world.kgm"
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: mapsdatatranslation.cpp:7053
+#: mapsdatatranslation.cpp:7061
 msgctxt "world.kgm"
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: mapsdatatranslation.cpp:7054
+#: mapsdatatranslation.cpp:7062
 msgctxt "world.kgm"
 msgid "Managua"
 msgstr "Managua"
 
-#: mapsdatatranslation.cpp:7055
+#: mapsdatatranslation.cpp:7063
 msgctxt "world.kgm"
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: mapsdatatranslation.cpp:7056
+#: mapsdatatranslation.cpp:7064
 msgctxt "world.kgm"
 msgid "San José"
 msgstr "San José"
 
-#: mapsdatatranslation.cpp:7057
+#: mapsdatatranslation.cpp:7065
 msgctxt "world.kgm"
 msgid "Panama"
 msgstr "Panama"
 
-#: mapsdatatranslation.cpp:7058
+#: mapsdatatranslation.cpp:7066
 msgctxt "world.kgm"
 msgid "Panama City"
 msgstr "Panama City"
 
-#: mapsdatatranslation.cpp:7059
+#: mapsdatatranslation.cpp:7067
 msgctxt "world.kgm"
 msgid "Colombia"
 msgstr "Colombia"
 
-#: mapsdatatranslation.cpp:7060
+#: mapsdatatranslation.cpp:7068
 msgctxt "world.kgm"
 msgid "Bogotá"
 msgstr "Bogotá"
 
-#: mapsdatatranslation.cpp:7061
+#: mapsdatatranslation.cpp:7069
 msgctxt "world.kgm"
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: mapsdatatranslation.cpp:7062
+#: mapsdatatranslation.cpp:7070
 msgctxt "world.kgm"
 msgid "Caracas"
 msgstr "Caracas"
 
-#: mapsdatatranslation.cpp:7063
+#: mapsdatatranslation.cpp:7071
 msgctxt "world.kgm"
 msgid "Guyana"
 msgstr "Guyana"
 
-#: mapsdatatranslation.cpp:7064
+#: mapsdatatranslation.cpp:7072
 msgctxt "world.kgm"
 msgid "Georgetown"
 msgstr "Georgetown"
 
-#: mapsdatatranslation.cpp:7065
+#: mapsdatatranslation.cpp:7073
 msgctxt "world.kgm"
 msgid "Suriname"
 msgstr "Suriname"
 
-#: mapsdatatranslation.cpp:7066
+#: mapsdatatranslation.cpp:7074
 msgctxt "world.kgm"
 msgid "Paramaribo"
 msgstr "Paramaribo"
 
-#: mapsdatatranslation.cpp:7067
+#: mapsdatatranslation.cpp:7075
 msgctxt "world.kgm"
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: mapsdatatranslation.cpp:7068
+#: mapsdatatranslation.cpp:7076
 msgctxt "world.kgm"
 msgid "Cayenne"
 msgstr "Cayenne"
 
-#: mapsdatatranslation.cpp:7069
+#: mapsdatatranslation.cpp:7077
 msgctxt "world.kgm"
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: mapsdatatranslation.cpp:7070
+#: mapsdatatranslation.cpp:7078
 msgctxt "world.kgm"
 msgid "Quito"
 msgstr "Quito"
 
-#: mapsdatatranslation.cpp:7071
+#: mapsdatatranslation.cpp:7079
 msgctxt "world.kgm"
 msgid "Peru"
 msgstr "Peru"
 
-#: mapsdatatranslation.cpp:7072
+#: mapsdatatranslation.cpp:7080
 msgctxt "world.kgm"
 msgid "Lima"
 msgstr "Lima"
 
-#: mapsdatatranslation.cpp:7073
+#: mapsdatatranslation.cpp:7081
 msgctxt "world.kgm"
 msgid "Brazil"
 msgstr "Brasil"
 
-#: mapsdatatranslation.cpp:7074
+#: mapsdatatranslation.cpp:7082
 msgctxt "world.kgm"
 msgid "Brasilia"
 msgstr "Brasilia"
 
-#: mapsdatatranslation.cpp:7075
+#: mapsdatatranslation.cpp:7083
 msgctxt "world.kgm"
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: mapsdatatranslation.cpp:7076
+#: mapsdatatranslation.cpp:7084
 msgctxt "world.kgm"
 msgid "La Paz"
 msgstr "La Paz"
 
-#: mapsdatatranslation.cpp:7077
+#: mapsdatatranslation.cpp:7085
 msgctxt "world.kgm"
 msgid "Chile"
 msgstr "Chile"
 
-#: mapsdatatranslation.cpp:7078
+#: mapsdatatranslation.cpp:7086
 msgctxt "world.kgm"
 msgid "Santiago"
 msgstr "Santiago"
 
-#: mapsdatatranslation.cpp:7079
+#: mapsdatatranslation.cpp:7087
 msgctxt "world.kgm"
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: mapsdatatranslation.cpp:7080
+#: mapsdatatranslation.cpp:7088
 msgctxt "world.kgm"
 msgid "Asunción"
 msgstr "Asunción"
 
-#: mapsdatatranslation.cpp:7081
+#: mapsdatatranslation.cpp:7089
 msgctxt "world.kgm"
 msgid "Argentina"
 msgstr "Argentina"
 
-#: mapsdatatranslation.cpp:7082
+#: mapsdatatranslation.cpp:7090
 msgctxt "world.kgm"
 msgid "Buenos Aires"
 msgstr "Buenos Aires"
 
-#: mapsdatatranslation.cpp:7083
+#: mapsdatatranslation.cpp:7091
 msgctxt "world.kgm"
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: mapsdatatranslation.cpp:7084
+#: mapsdatatranslation.cpp:7092
 msgctxt "world.kgm"
 msgid "Montevideo"
 msgstr "Montevideo"
 
-#: mapsdatatranslation.cpp:7085
+#: mapsdatatranslation.cpp:7093
 msgctxt "world.kgm"
 msgid "Australia"
 msgstr "Australia"
 
-#: mapsdatatranslation.cpp:7086
+#: mapsdatatranslation.cpp:7094
 msgctxt "world.kgm"
 msgid "Canberra"
 msgstr "Canberra"
 
-#: mapsdatatranslation.cpp:7087
+#: mapsdatatranslation.cpp:7095
 msgctxt "world.kgm"
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: mapsdatatranslation.cpp:7088
+#: mapsdatatranslation.cpp:7096
 msgctxt "world.kgm"
 msgid "Wellington"
 msgstr "Wellington"
 
-#: mapsdatatranslation.cpp:7089 mapsdatatranslation.cpp:7090
+#: mapsdatatranslation.cpp:7097 mapsdatatranslation.cpp:7098
 msgctxt "world.kgm"
 msgid "Vatican City"
 msgstr "Vatican City"
 
-#: mapsdatatranslation.cpp:7091
+#: mapsdatatranslation.cpp:7099
 msgctxt "world.kgm"
 msgid "Andorra"
 msgstr "Andorra"
 
-#: mapsdatatranslation.cpp:7092
+#: mapsdatatranslation.cpp:7100
 msgctxt "world.kgm"
 msgid "Andorra la Vella"
 msgstr "Andorra la Vella"
 
-#: mapsdatatranslation.cpp:7093
+#: mapsdatatranslation.cpp:7101
 msgctxt "world.kgm"
 msgid "Monaco"
 msgstr "Monaco"
 
-#: mapsdatatranslation.cpp:7094
+#: mapsdatatranslation.cpp:7102
 msgctxt "world.kgm"
 msgid "Monaco-Ville"
 msgstr "Monaco-Ville"
 
-#: mapsdatatranslation.cpp:7095
+#: mapsdatatranslation.cpp:7103
 msgctxt "world.kgm"
 msgid "China"
 msgstr "Tseina"
 
-#: mapsdatatranslation.cpp:7096
+#: mapsdatatranslation.cpp:7104
 msgctxt "world.kgm"
 msgid "Beijing"
 msgstr "Beijing"
 
-#: mapsdatatranslation.cpp:7097
+#: mapsdatatranslation.cpp:7105
 msgctxt "world.kgm"
 msgid "India"
 msgstr "India"
 
-#: mapsdatatranslation.cpp:7098
+#: mapsdatatranslation.cpp:7106
 msgctxt "world.kgm"
 msgid "New Delhi"
 msgstr "Delhi Newydd"
 
-#: mapsdatatranslation.cpp:7099
+#: mapsdatatranslation.cpp:7107
 msgctxt "world.kgm"
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: mapsdatatranslation.cpp:7100
+#: mapsdatatranslation.cpp:7108
 msgctxt "world.kgm"
 msgid "Colombo and Sri Jayewardenepura"
 msgstr "Colombo a Sri Jayewardenepura"
 
-#: mapsdatatranslation.cpp:7101
+#: mapsdatatranslation.cpp:7109
 msgctxt "world.kgm"
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: mapsdatatranslation.cpp:7102
+#: mapsdatatranslation.cpp:7110
 msgctxt "world.kgm"
 msgid "Ulaanbaatar"
 msgstr "Ulaanbaatar"
 
-#: mapsdatatranslation.cpp:7103
+#: mapsdatatranslation.cpp:7111
 msgctxt "world.kgm"
 msgid "Kazakhstan"
 msgstr "Casachstan"
 
-#: mapsdatatranslation.cpp:7104
+#: mapsdatatranslation.cpp:7112
 msgctxt "world.kgm"
 msgid "Astana"
 msgstr "Astana"
 
-#: mapsdatatranslation.cpp:7105
+#: mapsdatatranslation.cpp:7113
 msgctxt "world.kgm"
 msgid "Japan"
 msgstr "Siapan"
 
-#: mapsdatatranslation.cpp:7106
+#: mapsdatatranslation.cpp:7114
 msgctxt "world.kgm"
 msgid "Tokyo"
 msgstr "Tocio"
 
-#: mapsdatatranslation.cpp:7107
+#: mapsdatatranslation.cpp:7115
 msgctxt "world.kgm"
 msgid "Myanmar"
 msgstr "Mianmar"
 
-#: mapsdatatranslation.cpp:7108
+#: mapsdatatranslation.cpp:7116
 msgctxt "world.kgm"
 msgid "Naypyidaw"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7109
+#: mapsdatatranslation.cpp:7117
 msgctxt "world.kgm"
 msgid "Nepal"
 msgstr "Nepal"
 
-#: mapsdatatranslation.cpp:7110
+#: mapsdatatranslation.cpp:7118
 msgctxt "world.kgm"
 msgid "Kathmandu"
 msgstr "Catmandŵ"
 
-#: mapsdatatranslation.cpp:7111
+#: mapsdatatranslation.cpp:7119
 msgctxt "world.kgm"
 msgid "Bhutan"
 msgstr "Bhwtan"
 
-#: mapsdatatranslation.cpp:7112
+#: mapsdatatranslation.cpp:7120
 msgctxt "world.kgm"
 msgid "Thimphu"
 msgstr "Thimphu"
 
-#: mapsdatatranslation.cpp:7113
+#: mapsdatatranslation.cpp:7121
 msgctxt "world.kgm"
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: mapsdatatranslation.cpp:7114
+#: mapsdatatranslation.cpp:7122
 msgctxt "world.kgm"
 msgid "Jakarta"
 msgstr "Jakarta"
 
-#: mapsdatatranslation.cpp:7115
+#: mapsdatatranslation.cpp:7123
 msgctxt "world.kgm"
 msgid "Malaysia"
 msgstr "Maleisia"
 
-#: mapsdatatranslation.cpp:7116
+#: mapsdatatranslation.cpp:7124
 msgctxt "world.kgm"
 msgid "Kuala Lumpur"
 msgstr "Cwala Lwmpwr"
 
-#: mapsdatatranslation.cpp:7117
+#: mapsdatatranslation.cpp:7125
 msgctxt "world.kgm"
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: mapsdatatranslation.cpp:7118
+#: mapsdatatranslation.cpp:7126
 msgctxt "world.kgm"
 msgid "Dhaka"
 msgstr "Dhaka"
 
-#: mapsdatatranslation.cpp:7119
+#: mapsdatatranslation.cpp:7127
 msgctxt "world.kgm"
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: mapsdatatranslation.cpp:7120
+#: mapsdatatranslation.cpp:7128
 msgctxt "world.kgm"
 msgid "Nicosia"
 msgstr "Nicosia"
 
-#: mapsdatatranslation.cpp:7121
+#: mapsdatatranslation.cpp:7129
 msgctxt "world.kgm"
 msgid "Afghanistan"
 msgstr "Affganistan"
 
-#: mapsdatatranslation.cpp:7122
+#: mapsdatatranslation.cpp:7130
 msgctxt "world.kgm"
 msgid "Kabul"
 msgstr "Cabwl"
 
-#: mapsdatatranslation.cpp:7123
+#: mapsdatatranslation.cpp:7131
 msgctxt "world.kgm"
 msgid "Azerbaijan"
 msgstr "Aserbaijan"
 
-#: mapsdatatranslation.cpp:7124
+#: mapsdatatranslation.cpp:7132
 msgctxt "world.kgm"
 msgid "Baku"
 msgstr "Bacw"
 
-#: mapsdatatranslation.cpp:7125
+#: mapsdatatranslation.cpp:7133
 msgctxt "world.kgm"
 msgid "Armenia"
 msgstr "Armenia"
 
-#: mapsdatatranslation.cpp:7126
+#: mapsdatatranslation.cpp:7134
 msgctxt "world.kgm"
 msgid "Yerevan"
 msgstr "Ierevan"
 
-#: mapsdatatranslation.cpp:7127
+#: mapsdatatranslation.cpp:7135
 msgctxt "world.kgm"
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: mapsdatatranslation.cpp:7128
+#: mapsdatatranslation.cpp:7136
 msgctxt "world.kgm"
 msgid "Manama"
 msgstr "Manama"
 
-#: mapsdatatranslation.cpp:7129
+#: mapsdatatranslation.cpp:7137
 msgctxt "world.kgm"
 msgid "Georgia"
 msgstr "Georgia"
 
-#: mapsdatatranslation.cpp:7130
+#: mapsdatatranslation.cpp:7138
 msgctxt "world.kgm"
 msgid "Tbilisi"
 msgstr "Tbilisi"
 
-#: mapsdatatranslation.cpp:7131
+#: mapsdatatranslation.cpp:7139
 msgctxt "world.kgm"
 msgid "Turkmenistan"
 msgstr "Twrcmenistan"
 
-#: mapsdatatranslation.cpp:7132
+#: mapsdatatranslation.cpp:7140
 msgctxt "world.kgm"
 msgid "Ashgabat"
 msgstr "Ashgabat"
 
-#: mapsdatatranslation.cpp:7133
+#: mapsdatatranslation.cpp:7141
 msgctxt "world.kgm"
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: mapsdatatranslation.cpp:7134
+#: mapsdatatranslation.cpp:7142
 msgctxt "world.kgm"
 msgid "Tashkent"
 msgstr "Tashkent"
 
-#: mapsdatatranslation.cpp:7135
+#: mapsdatatranslation.cpp:7143
 msgctxt "world.kgm"
 msgid "Kyrgyzstan"
 msgstr "Cirgistan"
 
-#: mapsdatatranslation.cpp:7136
+#: mapsdatatranslation.cpp:7144
 msgctxt "world.kgm"
 msgid "Bishkek"
 msgstr "Bishcec"
 
-#: mapsdatatranslation.cpp:7137
+#: mapsdatatranslation.cpp:7145
 msgctxt "world.kgm"
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: mapsdatatranslation.cpp:7138
+#: mapsdatatranslation.cpp:7146
 msgctxt "world.kgm"
 msgid "Dushanbe"
 msgstr "Dushanbe"
 
-#: mapsdatatranslation.cpp:7139
+#: mapsdatatranslation.cpp:7147
 msgctxt "world.kgm"
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: mapsdatatranslation.cpp:7140
+#: mapsdatatranslation.cpp:7148
 msgctxt "world.kgm"
 msgid "Islamabad"
 msgstr "Islamabad"
 
-#: mapsdatatranslation.cpp:7141
+#: mapsdatatranslation.cpp:7149
 msgctxt "world.kgm"
 msgid "Laos"
 msgstr "Laos"
 
-#: mapsdatatranslation.cpp:7142
+#: mapsdatatranslation.cpp:7150
 msgctxt "world.kgm"
 msgid "Vientiane"
 msgstr "Vientiane"
 
-#: mapsdatatranslation.cpp:7143
+#: mapsdatatranslation.cpp:7151
 msgctxt "world.kgm"
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: mapsdatatranslation.cpp:7144
+#: mapsdatatranslation.cpp:7152
 msgctxt "world.kgm"
 msgid "Phnom Penh"
 msgstr "Phnom Penh"
 
-#: mapsdatatranslation.cpp:7145
+#: mapsdatatranslation.cpp:7153
 msgctxt "world.kgm"
 msgid "East Timor"
 msgstr "Dwyrain Timor"
 
-#: mapsdatatranslation.cpp:7146
+#: mapsdatatranslation.cpp:7154
 msgctxt "world.kgm"
 msgid "Dili"
 msgstr "Dili"
 
-#: mapsdatatranslation.cpp:7147
+#: mapsdatatranslation.cpp:7155
 msgctxt "world.kgm"
 msgid "Brunei"
 msgstr "Brwnei"
 
-#: mapsdatatranslation.cpp:7148
+#: mapsdatatranslation.cpp:7156
 msgctxt "world.kgm"
 msgid "Bandar Seri Begawan"
 msgstr "Bandar Seri Begawan"
 
-#: mapsdatatranslation.cpp:7149
+#: mapsdatatranslation.cpp:7157
 msgctxt "world.kgm"
 msgid "Philippines"
 msgstr "Philipinau"
 
-#: mapsdatatranslation.cpp:7150
+#: mapsdatatranslation.cpp:7158
 msgctxt "world.kgm"
 msgid "Manila"
 msgstr "Manila"
 
-#: mapsdatatranslation.cpp:7151
+#: mapsdatatranslation.cpp:7159
 msgctxt "world.kgm"
 msgid "Thailand"
 msgstr "Gwlad y Thai"
 
-#: mapsdatatranslation.cpp:7152
+#: mapsdatatranslation.cpp:7160
 msgctxt "world.kgm"
 msgid "Bangkok"
 msgstr "Bangcoc"
 
-#: mapsdatatranslation.cpp:7153
+#: mapsdatatranslation.cpp:7161
 msgctxt "world.kgm"
 msgid "Vietnam"
 msgstr "Fietnam"
 
-#: mapsdatatranslation.cpp:7154
+#: mapsdatatranslation.cpp:7162
 msgctxt "world.kgm"
 msgid "Hanoi"
 msgstr "Hanoi"
 
-#: mapsdatatranslation.cpp:7155
+#: mapsdatatranslation.cpp:7163
 msgctxt "world.kgm"
 msgid "Republic of China (Taiwan)"
 msgstr "Gweriniaeth Tseina (Taiwan)"
 
-#: mapsdatatranslation.cpp:7156
+#: mapsdatatranslation.cpp:7164
 msgctxt "world.kgm"
 msgid "Taipei"
 msgstr "Taipei"
 
-#: mapsdatatranslation.cpp:7157 mapsdatatranslation.cpp:7158
+#: mapsdatatranslation.cpp:7165 mapsdatatranslation.cpp:7166
 msgctxt "world.kgm"
 msgid "Singapore"
 msgstr "Singapor"
 
-#: mapsdatatranslation.cpp:7159
+#: mapsdatatranslation.cpp:7167
 msgctxt "world.kgm"
 msgid "Democratic People's Republic of Korea"
 msgstr "Gweriniaeth Werinol Ddemocrataidd Corea"
 
-#: mapsdatatranslation.cpp:7160
+#: mapsdatatranslation.cpp:7168
 msgctxt "world.kgm"
 msgid "Pyeongyang"
 msgstr "Piwngiang"
 
-#: mapsdatatranslation.cpp:7161
+#: mapsdatatranslation.cpp:7169
 msgctxt "world.kgm"
 msgid "Republic of Korea"
 msgstr "Gweriniaeth Corea"
 
-#: mapsdatatranslation.cpp:7162
+#: mapsdatatranslation.cpp:7170
 msgctxt "world.kgm"
 msgid "Seoul"
 msgstr "Seoul"
 
-#: mapsdatatranslation.cpp:7163
+#: mapsdatatranslation.cpp:7171
 msgctxt "world.kgm"
 msgid "Fiji"
 msgstr "Ffiji"
 
-#: mapsdatatranslation.cpp:7164
+#: mapsdatatranslation.cpp:7172
 msgctxt "world.kgm"
 msgid "Suva"
 msgstr "Swfa"
 
-#: mapsdatatranslation.cpp:7165
+#: mapsdatatranslation.cpp:7173
 msgctxt "world.kgm"
 msgid "Tonga"
 msgstr "Tonga"
 
-#: mapsdatatranslation.cpp:7166
+#: mapsdatatranslation.cpp:7174
 msgctxt "world.kgm"
 msgid "Nuku'alofa"
 msgstr "Nwcw'alofa"
 
-#: mapsdatatranslation.cpp:7167
+#: mapsdatatranslation.cpp:7175
 msgctxt "world.kgm"
 msgid "Papua New Guinea"
 msgstr "Papwa Gini Newydd"
 
-#: mapsdatatranslation.cpp:7168
+#: mapsdatatranslation.cpp:7176
 msgctxt "world.kgm"
 msgid "Port Moresby"
 msgstr "Port Moresby"
 
-#: mapsdatatranslation.cpp:7169
+#: mapsdatatranslation.cpp:7177
 msgctxt "world.kgm"
 msgid "Greenland (Denmark)"
 msgstr "Yr Ynys Las (Denmarc)"
 
-#: mapsdatatranslation.cpp:7170
+#: mapsdatatranslation.cpp:7178
 msgctxt "world.kgm"
 msgid "Nuuk"
 msgstr "Nŵc"
 
-#: mapsdatatranslation.cpp:7171
+#: mapsdatatranslation.cpp:7179
 msgctxt "world_continents.kgm"
 msgid "World continents (from North Pole)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7172
+#: mapsdatatranslation.cpp:7180
 msgctxt "world_continents.kgm"
 msgid "Continents"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7173
+#: mapsdatatranslation.cpp:7181
 #, kde-format
 msgctxt "@title:group"
 msgid "What is the highest summit of %1?"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7174
+#: mapsdatatranslation.cpp:7182
 msgctxt "@title"
 msgid "Continents by highest summit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7175
+#: mapsdatatranslation.cpp:7183
 #, kde-format
 msgctxt "@title:group"
 msgid "Which has %1 as its highest summit?"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7176
+#: mapsdatatranslation.cpp:7184
 msgctxt "@title"
 msgid "Highest summit of continents"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7177
+#: mapsdatatranslation.cpp:7185
 msgctxt "world_continents.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7178
+#: mapsdatatranslation.cpp:7186
 msgctxt "world_continents.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7179
+#: mapsdatatranslation.cpp:7187
 msgctxt "world_continents.kgm"
 msgid "Africa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7180
+#: mapsdatatranslation.cpp:7188
 msgctxt "world_continents.kgm"
 msgid "Kilimanjaro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7181
+#: mapsdatatranslation.cpp:7189
 msgctxt "world_continents.kgm"
 msgid "North America"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7182
+#: mapsdatatranslation.cpp:7190
 msgctxt "world_continents.kgm"
 msgid "Mac Kinley"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7183
+#: mapsdatatranslation.cpp:7191
 msgctxt "world_continents.kgm"
 msgid "South America"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7184
+#: mapsdatatranslation.cpp:7192
 msgctxt "world_continents.kgm"
 msgid "Aconcagua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7185
+#: mapsdatatranslation.cpp:7193
 msgctxt "world_continents.kgm"
 msgid "Antarctica"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7186
+#: mapsdatatranslation.cpp:7194
 msgctxt "world_continents.kgm"
 msgid "Vinson"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7187
+#: mapsdatatranslation.cpp:7195
 msgctxt "world_continents.kgm"
 msgid "Asia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7188
+#: mapsdatatranslation.cpp:7196
 msgctxt "world_continents.kgm"
 msgid "Everest"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7189
+#: mapsdatatranslation.cpp:7197
 msgctxt "world_continents.kgm"
 msgid "Europe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7190
+#: mapsdatatranslation.cpp:7198
 msgctxt "world_continents.kgm"
 msgid "Elbrus"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7191
+#: mapsdatatranslation.cpp:7199
 msgctxt "world_continents.kgm"
 msgid "Oceania"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7192
+#: mapsdatatranslation.cpp:7200
 msgctxt "world_continents.kgm"
 msgid "Carstenz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7193
+#: mapsdatatranslation.cpp:7201
 msgctxt "yemen.kgm"
 msgid "Yemen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7194
+#: mapsdatatranslation.cpp:7202
 msgctxt "yemen.kgm"
 msgid "Governorates"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7195
+#: mapsdatatranslation.cpp:7203
 msgctxt "yemen.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7196
+#: mapsdatatranslation.cpp:7204
 msgctxt "yemen.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7197
+#: mapsdatatranslation.cpp:7205
 msgctxt "yemen.kgm"
 msgid "Not Yemen"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7198
+#: mapsdatatranslation.cpp:7206
 msgctxt "yemen.kgm"
 msgid "Abyan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7199
+#: mapsdatatranslation.cpp:7207
 msgctxt "yemen.kgm"
 msgid "'Adan"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7200
+#: mapsdatatranslation.cpp:7208
 msgctxt "yemen.kgm"
 msgid "Ad Dali'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7201
+#: mapsdatatranslation.cpp:7209
 msgctxt "yemen.kgm"
 msgid "Al Bayda'"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7202
+#: mapsdatatranslation.cpp:7210
 msgctxt "yemen.kgm"
 msgid "Al Hudaydah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7203
+#: mapsdatatranslation.cpp:7211
 msgctxt "yemen.kgm"
 msgid "Al Jawf"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7204
+#: mapsdatatranslation.cpp:7212
 msgctxt "yemen.kgm"
 msgid "Al Mahri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7205
+#: mapsdatatranslation.cpp:7213
 msgctxt "yemen.kgm"
 msgid "Al Mahwit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7206
+#: mapsdatatranslation.cpp:7214
 msgctxt "yemen.kgm"
 msgid "'Amran"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7207
+#: mapsdatatranslation.cpp:7215
 msgctxt "yemen.kgm"
 msgid "Dhamar"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7208
+#: mapsdatatranslation.cpp:7216
 msgctxt "yemen.kgm"
 msgid "Hadramaout"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7209
+#: mapsdatatranslation.cpp:7217
 msgctxt "yemen.kgm"
 msgid "Hajjah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7210
+#: mapsdatatranslation.cpp:7218
 msgctxt "yemen.kgm"
 msgid "Ibb"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7211
+#: mapsdatatranslation.cpp:7219
 msgctxt "yemen.kgm"
 msgid "Lahij"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7212
+#: mapsdatatranslation.cpp:7220
 msgctxt "yemen.kgm"
 msgid "Ma'rib"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7213
+#: mapsdatatranslation.cpp:7221
 msgctxt "yemen.kgm"
 msgid "Sa'dah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7214
+#: mapsdatatranslation.cpp:7222
 msgctxt "yemen.kgm"
 msgid "Sanaa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7215
+#: mapsdatatranslation.cpp:7223
 msgctxt "yemen.kgm"
 msgid "Shabwah"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7216
+#: mapsdatatranslation.cpp:7224
 msgctxt "yemen.kgm"
 msgid "Ta'izz"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7217
+#: mapsdatatranslation.cpp:7225
 msgctxt "zaire2006.kgm"
 msgid "Democratic Republic of the Congo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7218
+#: mapsdatatranslation.cpp:7226
 msgctxt "zaire2006.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7219
+#: mapsdatatranslation.cpp:7227
 msgctxt "zaire2006.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7220
+#: mapsdatatranslation.cpp:7228
 msgctxt "zaire2006.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7221
+#: mapsdatatranslation.cpp:7229
 msgctxt "zaire2006.kgm"
 msgid "Not Democratic Republic of the Congo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7222 mapsdatatranslation.cpp:7223
+#: mapsdatatranslation.cpp:7230 mapsdatatranslation.cpp:7231
 msgctxt "zaire2006.kgm"
 msgid "Kinshasa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7224
+#: mapsdatatranslation.cpp:7232
 msgctxt "zaire2006.kgm"
 msgid "Kongo central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7225
+#: mapsdatatranslation.cpp:7233
 msgctxt "zaire2006.kgm"
 msgid "Matadi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7226
+#: mapsdatatranslation.cpp:7234
 msgctxt "zaire2006.kgm"
 msgid "Kwango"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7227
+#: mapsdatatranslation.cpp:7235
 msgctxt "zaire2006.kgm"
 msgid "Kenge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7228
+#: mapsdatatranslation.cpp:7236
 msgctxt "zaire2006.kgm"
 msgid "Kwilu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7229
+#: mapsdatatranslation.cpp:7237
 msgctxt "zaire2006.kgm"
 msgid "Kikwit"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7230
+#: mapsdatatranslation.cpp:7238
 msgctxt "zaire2006.kgm"
 msgid "Mai-Ndombe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7231
+#: mapsdatatranslation.cpp:7239
 msgctxt "zaire2006.kgm"
 msgid "Inongo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7232
+#: mapsdatatranslation.cpp:7240
 msgctxt "zaire2006.kgm"
 msgid "Kasaï"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7233
+#: mapsdatatranslation.cpp:7241
 msgctxt "zaire2006.kgm"
 msgid "Luebo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7234
+#: mapsdatatranslation.cpp:7242
 msgctxt "zaire2006.kgm"
 msgid "Lulua"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7235
+#: mapsdatatranslation.cpp:7243
 msgctxt "zaire2006.kgm"
 msgid "Kananga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7236
+#: mapsdatatranslation.cpp:7244
 msgctxt "zaire2006.kgm"
 msgid "Kasaï oriental"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7237
+#: mapsdatatranslation.cpp:7245
 msgctxt "zaire2006.kgm"
 msgid "Mbuji-Mayi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7238
+#: mapsdatatranslation.cpp:7246
 msgctxt "zaire2006.kgm"
 msgid "Lomami"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7239
+#: mapsdatatranslation.cpp:7247
 msgctxt "zaire2006.kgm"
 msgid "Kabinda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7240
+#: mapsdatatranslation.cpp:7248
 msgctxt "zaire2006.kgm"
 msgid "Sankuru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7241
+#: mapsdatatranslation.cpp:7249
 msgctxt "zaire2006.kgm"
 msgid "Lodja"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7242
+#: mapsdatatranslation.cpp:7250
 msgctxt "zaire2006.kgm"
 msgid "Maniema"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7243
+#: mapsdatatranslation.cpp:7251
 msgctxt "zaire2006.kgm"
 msgid "Kindu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7244
+#: mapsdatatranslation.cpp:7252
 msgctxt "zaire2006.kgm"
 msgid "Sud-Kivu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7245
+#: mapsdatatranslation.cpp:7253
 msgctxt "zaire2006.kgm"
 msgid "Bukavu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7246
+#: mapsdatatranslation.cpp:7254
 msgctxt "zaire2006.kgm"
 msgid "Nord-Kivu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7247
+#: mapsdatatranslation.cpp:7255
 msgctxt "zaire2006.kgm"
 msgid "Goma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7248
+#: mapsdatatranslation.cpp:7256
 msgctxt "zaire2006.kgm"
 msgid "Ituri"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7249
+#: mapsdatatranslation.cpp:7257
 msgctxt "zaire2006.kgm"
 msgid "Bunia"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7250
+#: mapsdatatranslation.cpp:7258
 msgctxt "zaire2006.kgm"
 msgid "Haut-Uele"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7251
+#: mapsdatatranslation.cpp:7259
 msgctxt "zaire2006.kgm"
 msgid "Isiro"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7252
+#: mapsdatatranslation.cpp:7260
 msgctxt "zaire2006.kgm"
 msgid "Tshopo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7253
+#: mapsdatatranslation.cpp:7261
 msgctxt "zaire2006.kgm"
 msgid "Kisangani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7254
+#: mapsdatatranslation.cpp:7262
 msgctxt "zaire2006.kgm"
 msgid "Bas-Uele"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7255
+#: mapsdatatranslation.cpp:7263
 msgctxt "zaire2006.kgm"
 msgid "Buta"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7256
+#: mapsdatatranslation.cpp:7264
 msgctxt "zaire2006.kgm"
 msgid "Nord-Ubangi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7257
+#: mapsdatatranslation.cpp:7265
 msgctxt "zaire2006.kgm"
 msgid "Gbadolite"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7258
+#: mapsdatatranslation.cpp:7266
 msgctxt "zaire2006.kgm"
 msgid "Mongala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7259
+#: mapsdatatranslation.cpp:7267
 msgctxt "zaire2006.kgm"
 msgid "Lisala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7260
+#: mapsdatatranslation.cpp:7268
 msgctxt "zaire2006.kgm"
 msgid "Sud-Ubangi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7261
+#: mapsdatatranslation.cpp:7269
 msgctxt "zaire2006.kgm"
 msgid "Gemena"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7262
+#: mapsdatatranslation.cpp:7270
 msgctxt "zaire2006.kgm"
 msgid "Équateur"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7263
+#: mapsdatatranslation.cpp:7271
 msgctxt "zaire2006.kgm"
 msgid "Mbandaka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7264
+#: mapsdatatranslation.cpp:7272
 msgctxt "zaire2006.kgm"
 msgid "Tshuapa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7265
+#: mapsdatatranslation.cpp:7273
 msgctxt "zaire2006.kgm"
 msgid "Boende"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7266
+#: mapsdatatranslation.cpp:7274
 msgctxt "zaire2006.kgm"
 msgid "Tanganyika"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7267
+#: mapsdatatranslation.cpp:7275
 msgctxt "zaire2006.kgm"
 msgid "Kalemie"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7268
+#: mapsdatatranslation.cpp:7276
 msgctxt "zaire2006.kgm"
 msgid "Haut-Lomami"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7269
+#: mapsdatatranslation.cpp:7277
 msgctxt "zaire2006.kgm"
 msgid "Kamina"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7270
+#: mapsdatatranslation.cpp:7278
 msgctxt "zaire2006.kgm"
 msgid "Lualaba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7271
+#: mapsdatatranslation.cpp:7279
 msgctxt "zaire2006.kgm"
 msgid "Kolwezi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7272
+#: mapsdatatranslation.cpp:7280
 msgctxt "zaire2006.kgm"
 msgid "Haut-Katanga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7273
+#: mapsdatatranslation.cpp:7281
 msgctxt "zaire2006.kgm"
 msgid "Lubumbashi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7274
+#: mapsdatatranslation.cpp:7282
 msgctxt "zambia_districts.kgm"
 msgid "Zambia (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7275
+#: mapsdatatranslation.cpp:7283
 msgctxt "zambia_districts.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7276
+#: mapsdatatranslation.cpp:7284
 msgctxt "zambia_districts.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7277
+#: mapsdatatranslation.cpp:7285
 msgctxt "zambia_districts.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7278
+#: mapsdatatranslation.cpp:7286
 msgctxt "zambia_districts.kgm"
 msgid "Not Zambia (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7279
+#: mapsdatatranslation.cpp:7287
 msgctxt "zambia_districts.kgm"
 msgid "Chibombo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7280
+#: mapsdatatranslation.cpp:7288
 msgctxt "zambia_districts.kgm"
 msgid "Kabwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7281
+#: mapsdatatranslation.cpp:7289
 msgctxt "zambia_districts.kgm"
 msgid "Kapiri Mposhi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7282
+#: mapsdatatranslation.cpp:7290
 msgctxt "zambia_districts.kgm"
 msgid "Mkushi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7283
+#: mapsdatatranslation.cpp:7291
 msgctxt "zambia_districts.kgm"
 msgid "Mumbwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7284
+#: mapsdatatranslation.cpp:7292
 msgctxt "zambia_districts.kgm"
 msgid "Serenje"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7285
+#: mapsdatatranslation.cpp:7293
 msgctxt "zambia_districts.kgm"
 msgid "Chililabombwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7286
+#: mapsdatatranslation.cpp:7294
 msgctxt "zambia_districts.kgm"
 msgid "Chingola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7287
+#: mapsdatatranslation.cpp:7295
 msgctxt "zambia_districts.kgm"
 msgid "Kalulushi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7288
+#: mapsdatatranslation.cpp:7296
 msgctxt "zambia_districts.kgm"
 msgid "Kitwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7289
+#: mapsdatatranslation.cpp:7297
 msgctxt "zambia_districts.kgm"
 msgid "Luanshya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7290
+#: mapsdatatranslation.cpp:7298
 msgctxt "zambia_districts.kgm"
 msgid "Lufwanyama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7291
+#: mapsdatatranslation.cpp:7299
 msgctxt "zambia_districts.kgm"
 msgid "Masaiti"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7292
+#: mapsdatatranslation.cpp:7300
 msgctxt "zambia_districts.kgm"
 msgid "Mpongwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7293
+#: mapsdatatranslation.cpp:7301
 msgctxt "zambia_districts.kgm"
 msgid "Mufulira"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7294
+#: mapsdatatranslation.cpp:7302
 msgctxt "zambia_districts.kgm"
 msgid "Ndola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7295
+#: mapsdatatranslation.cpp:7303
 msgctxt "zambia_districts.kgm"
 msgid "Chadiza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7296
+#: mapsdatatranslation.cpp:7304
 msgctxt "zambia_districts.kgm"
 msgid "Chama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7297
+#: mapsdatatranslation.cpp:7305
 msgctxt "zambia_districts.kgm"
 msgid "Chipata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7298
+#: mapsdatatranslation.cpp:7306
 msgctxt "zambia_districts.kgm"
 msgid "Katete"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7299
+#: mapsdatatranslation.cpp:7307
 msgctxt "zambia_districts.kgm"
 msgid "Lundazi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7300
+#: mapsdatatranslation.cpp:7308
 msgctxt "zambia_districts.kgm"
 msgid "Mambwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7301
+#: mapsdatatranslation.cpp:7309
 msgctxt "zambia_districts.kgm"
 msgid "Nyimba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7302
+#: mapsdatatranslation.cpp:7310
 msgctxt "zambia_districts.kgm"
 msgid "Petauke"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7303
+#: mapsdatatranslation.cpp:7311
 msgctxt "zambia_districts.kgm"
 msgid "Chiengi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7304
+#: mapsdatatranslation.cpp:7312
 msgctxt "zambia_districts.kgm"
 msgid "Kawambwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7305
+#: mapsdatatranslation.cpp:7313
 msgctxt "zambia_districts.kgm"
 msgid "Mansa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7306
+#: mapsdatatranslation.cpp:7314
 msgctxt "zambia_districts.kgm"
 msgid "Milenge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7307
+#: mapsdatatranslation.cpp:7315
 msgctxt "zambia_districts.kgm"
 msgid "Mwense"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7308
+#: mapsdatatranslation.cpp:7316
 msgctxt "zambia_districts.kgm"
 msgid "Nchelenge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7309
+#: mapsdatatranslation.cpp:7317
 msgctxt "zambia_districts.kgm"
 msgid "Samfya"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7310
+#: mapsdatatranslation.cpp:7318
 msgctxt "zambia_districts.kgm"
 msgid "Chongwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7311
+#: mapsdatatranslation.cpp:7319
 msgctxt "zambia_districts.kgm"
 msgid "Kafue"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7312
+#: mapsdatatranslation.cpp:7320
 msgctxt "zambia_districts.kgm"
 msgid "Luangwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7313
+#: mapsdatatranslation.cpp:7321
 msgctxt "zambia_districts.kgm"
 msgid "Lusaka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7314
+#: mapsdatatranslation.cpp:7322
 msgctxt "zambia_districts.kgm"
 msgid "Chavuma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7315
+#: mapsdatatranslation.cpp:7323
 msgctxt "zambia_districts.kgm"
 msgid "Kabompo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7316
+#: mapsdatatranslation.cpp:7324
 msgctxt "zambia_districts.kgm"
 msgid "Kasempa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7317
+#: mapsdatatranslation.cpp:7325
 msgctxt "zambia_districts.kgm"
 msgid "Mufumbwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7318
+#: mapsdatatranslation.cpp:7326
 msgctxt "zambia_districts.kgm"
 msgid "Mwinilunga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7319
+#: mapsdatatranslation.cpp:7327
 msgctxt "zambia_districts.kgm"
 msgid "Solwezi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7320
+#: mapsdatatranslation.cpp:7328
 msgctxt "zambia_districts.kgm"
 msgid "Zambezi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7321
+#: mapsdatatranslation.cpp:7329
 msgctxt "zambia_districts.kgm"
 msgid "Chilubi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7322
+#: mapsdatatranslation.cpp:7330
 msgctxt "zambia_districts.kgm"
 msgid "Chinsali"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7323
+#: mapsdatatranslation.cpp:7331
 msgctxt "zambia_districts.kgm"
 msgid "Isoka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7324
+#: mapsdatatranslation.cpp:7332
 msgctxt "zambia_districts.kgm"
 msgid "Kaputa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7325
+#: mapsdatatranslation.cpp:7333
 msgctxt "zambia_districts.kgm"
 msgid "Kasama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7326
+#: mapsdatatranslation.cpp:7334
 msgctxt "zambia_districts.kgm"
 msgid "Luwingu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7327
+#: mapsdatatranslation.cpp:7335
 msgctxt "zambia_districts.kgm"
 msgid "Mbala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7328
+#: mapsdatatranslation.cpp:7336
 msgctxt "zambia_districts.kgm"
 msgid "Mpika"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7329
+#: mapsdatatranslation.cpp:7337
 msgctxt "zambia_districts.kgm"
 msgid "Mporokoso"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7330
+#: mapsdatatranslation.cpp:7338
 msgctxt "zambia_districts.kgm"
 msgid "Mpulungu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7331
+#: mapsdatatranslation.cpp:7339
 msgctxt "zambia_districts.kgm"
 msgid "Mungwi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7332
+#: mapsdatatranslation.cpp:7340
 msgctxt "zambia_districts.kgm"
 msgid "Nakonde"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7333
+#: mapsdatatranslation.cpp:7341
 msgctxt "zambia_districts.kgm"
 msgid "Choma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7334
+#: mapsdatatranslation.cpp:7342
 msgctxt "zambia_districts.kgm"
 msgid "Gwembe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7335
+#: mapsdatatranslation.cpp:7343
 msgctxt "zambia_districts.kgm"
 msgid "Itezhi-Tezhi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7336
+#: mapsdatatranslation.cpp:7344
 msgctxt "zambia_districts.kgm"
 msgid "Kalomo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7337
+#: mapsdatatranslation.cpp:7345
 msgctxt "zambia_districts.kgm"
 msgid "Kazungula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7338
+#: mapsdatatranslation.cpp:7346
 msgctxt "zambia_districts.kgm"
 msgid "Livingstone"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7339
+#: mapsdatatranslation.cpp:7347
 msgctxt "zambia_districts.kgm"
 msgid "Mazabuka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7340
+#: mapsdatatranslation.cpp:7348
 msgctxt "zambia_districts.kgm"
 msgid "Monze"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7341
+#: mapsdatatranslation.cpp:7349
 msgctxt "zambia_districts.kgm"
 msgid "Namwala"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7342
+#: mapsdatatranslation.cpp:7350
 msgctxt "zambia_districts.kgm"
 msgid "Siavonga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7343
+#: mapsdatatranslation.cpp:7351
 msgctxt "zambia_districts.kgm"
 msgid "Sinazongwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7344
+#: mapsdatatranslation.cpp:7352
 msgctxt "zambia_districts.kgm"
 msgid "Kalabo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7345
+#: mapsdatatranslation.cpp:7353
 msgctxt "zambia_districts.kgm"
 msgid "Kaoma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7346
+#: mapsdatatranslation.cpp:7354
 msgctxt "zambia_districts.kgm"
 msgid "Lukulu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7347
+#: mapsdatatranslation.cpp:7355
 msgctxt "zambia_districts.kgm"
 msgid "Mongu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7348
+#: mapsdatatranslation.cpp:7356
 msgctxt "zambia_districts.kgm"
 msgid "Senanga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7349
+#: mapsdatatranslation.cpp:7357
 msgctxt "zambia_districts.kgm"
 msgid "Sesheke"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7350
+#: mapsdatatranslation.cpp:7358
 msgctxt "zambia_districts.kgm"
 msgid "Shangombo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7351
+#: mapsdatatranslation.cpp:7359
 msgctxt "zambia_provinces.kgm"
 msgid "Zambia (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7352
+#: mapsdatatranslation.cpp:7360
 msgctxt "zambia_provinces.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7353
+#: mapsdatatranslation.cpp:7361
 msgctxt "zambia_provinces.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7354
+#: mapsdatatranslation.cpp:7362
 msgctxt "zambia_provinces.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7355
+#: mapsdatatranslation.cpp:7363
 msgctxt "zambia_provinces.kgm"
 msgid "Not Zambia (Provinces)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7356
+#: mapsdatatranslation.cpp:7364
 msgctxt "zambia_provinces.kgm"
 msgid "Central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7357
+#: mapsdatatranslation.cpp:7365
 msgctxt "zambia_provinces.kgm"
 msgid "Kabwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7358
+#: mapsdatatranslation.cpp:7366
 msgctxt "zambia_provinces.kgm"
 msgid "Copperbelt"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7359
+#: mapsdatatranslation.cpp:7367
 msgctxt "zambia_provinces.kgm"
 msgid "Ndola"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7360
+#: mapsdatatranslation.cpp:7368
 msgctxt "zambia_provinces.kgm"
 msgid "Eastern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7361
+#: mapsdatatranslation.cpp:7369
 msgctxt "zambia_provinces.kgm"
 msgid "Chipata"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7362
+#: mapsdatatranslation.cpp:7370
 msgctxt "zambia_provinces.kgm"
 msgid "Luapula"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7363
+#: mapsdatatranslation.cpp:7371
 msgctxt "zambia_provinces.kgm"
 msgid "Mansa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7364 mapsdatatranslation.cpp:7365
+#: mapsdatatranslation.cpp:7372 mapsdatatranslation.cpp:7373
 msgctxt "zambia_provinces.kgm"
 msgid "Lusaka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7366
+#: mapsdatatranslation.cpp:7374
 msgctxt "zambia_provinces.kgm"
 msgid "Northern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7367
+#: mapsdatatranslation.cpp:7375
 msgctxt "zambia_provinces.kgm"
 msgid "Kasama"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7368
+#: mapsdatatranslation.cpp:7376
 msgctxt "zambia_provinces.kgm"
 msgid "North-Western"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7369
+#: mapsdatatranslation.cpp:7377
 msgctxt "zambia_provinces.kgm"
 msgid "Solwezi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7370
+#: mapsdatatranslation.cpp:7378
 msgctxt "zambia_provinces.kgm"
 msgid "Southern"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7371
+#: mapsdatatranslation.cpp:7379
 msgctxt "zambia_provinces.kgm"
 msgid "Livingstone"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7372
+#: mapsdatatranslation.cpp:7380
 msgctxt "zambia_provinces.kgm"
 msgid "Western"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7373
+#: mapsdatatranslation.cpp:7381
 msgctxt "zambia_provinces.kgm"
 msgid "Mongu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7374
+#: mapsdatatranslation.cpp:7382
 msgctxt "zimbabwe.kgm"
 msgid "Zimbabwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7375
+#: mapsdatatranslation.cpp:7383
 msgctxt "zimbabwe.kgm"
 msgid "Provinces"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7376 mapsdatatranslation.cpp:7377
+#: mapsdatatranslation.cpp:7384 mapsdatatranslation.cpp:7385
 msgctxt "zimbabwe.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7378
+#: mapsdatatranslation.cpp:7386
 msgctxt "zimbabwe.kgm"
 msgid "Not Zimbabwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7379
+#: mapsdatatranslation.cpp:7387
 msgctxt "zimbabwe.kgm"
 msgid "Bulawayo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7380
+#: mapsdatatranslation.cpp:7388
 msgctxt "zimbabwe.kgm"
 msgid "Harare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7381
+#: mapsdatatranslation.cpp:7389
 msgctxt "zimbabwe.kgm"
 msgid "Manicaland"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7382
+#: mapsdatatranslation.cpp:7390
 msgctxt "zimbabwe.kgm"
 msgid "Mutare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7383
+#: mapsdatatranslation.cpp:7391
 msgctxt "zimbabwe.kgm"
 msgid "Mashonaland central"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7384
+#: mapsdatatranslation.cpp:7392
 msgctxt "zimbabwe.kgm"
 msgid "Bindura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7385
+#: mapsdatatranslation.cpp:7393
 msgctxt "zimbabwe.kgm"
 msgid "Mashonaland east"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7386
+#: mapsdatatranslation.cpp:7394
 msgctxt "zimbabwe.kgm"
 msgid "Marondera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7387
+#: mapsdatatranslation.cpp:7395
 msgctxt "zimbabwe.kgm"
 msgid "Mashonaland west"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7388
+#: mapsdatatranslation.cpp:7396
 msgctxt "zimbabwe.kgm"
 msgid "Chinhoyi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7389 mapsdatatranslation.cpp:7390
+#: mapsdatatranslation.cpp:7397 mapsdatatranslation.cpp:7398
 msgctxt "zimbabwe.kgm"
 msgid "Masvingo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7391
+#: mapsdatatranslation.cpp:7399
 msgctxt "zimbabwe.kgm"
 msgid "Matabeleland north"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7392
+#: mapsdatatranslation.cpp:7400
 msgctxt "zimbabwe.kgm"
 msgid "Lupane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7393
+#: mapsdatatranslation.cpp:7401
 msgctxt "zimbabwe.kgm"
 msgid "Matabeleland south"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7394
+#: mapsdatatranslation.cpp:7402
 msgctxt "zimbabwe.kgm"
 msgid "Gwanda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7395
+#: mapsdatatranslation.cpp:7403
 msgctxt "zimbabwe.kgm"
 msgid "Midlands"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7396
+#: mapsdatatranslation.cpp:7404
 msgctxt "zimbabwe.kgm"
 msgid "Gweru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7397
+#: mapsdatatranslation.cpp:7405
 msgctxt "zimbabwe_districts.kgm"
 msgid "Zimbabwe (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7398
+#: mapsdatatranslation.cpp:7406
 msgctxt "zimbabwe_districts.kgm"
 msgid "Districts"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7399
+#: mapsdatatranslation.cpp:7407
 msgctxt "zimbabwe_districts.kgm"
 msgid "Frontier"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7400
+#: mapsdatatranslation.cpp:7408
 msgctxt "zimbabwe_districts.kgm"
 msgid "Water"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7401
+#: mapsdatatranslation.cpp:7409
 msgctxt "zimbabwe_districts.kgm"
 msgid "Not Zimbabwe (Districts)"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7402
+#: mapsdatatranslation.cpp:7410
 msgctxt "zimbabwe_districts.kgm"
 msgid "Bulawayo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7403
+#: mapsdatatranslation.cpp:7411
 msgctxt "zimbabwe_districts.kgm"
 msgid "Harare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7404
+#: mapsdatatranslation.cpp:7412
 msgctxt "zimbabwe_districts.kgm"
 msgid "Buhera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7405
+#: mapsdatatranslation.cpp:7413
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chimanimani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7406
+#: mapsdatatranslation.cpp:7414
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chipinge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7407
+#: mapsdatatranslation.cpp:7415
 msgctxt "zimbabwe_districts.kgm"
 msgid "Makoni"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7408
+#: mapsdatatranslation.cpp:7416
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mutare"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7409
+#: mapsdatatranslation.cpp:7417
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mutasa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7410
+#: mapsdatatranslation.cpp:7418
 msgctxt "zimbabwe_districts.kgm"
 msgid "Nyanga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7411
+#: mapsdatatranslation.cpp:7419
 msgctxt "zimbabwe_districts.kgm"
 msgid "Bindura"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7412
+#: mapsdatatranslation.cpp:7420
 msgctxt "zimbabwe_districts.kgm"
 msgid "Guruve"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7413
+#: mapsdatatranslation.cpp:7421
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mazowe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7414
+#: mapsdatatranslation.cpp:7422
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mount Darwin"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7415
+#: mapsdatatranslation.cpp:7423
 msgctxt "zimbabwe_districts.kgm"
 msgid "Muzarabani"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7416
+#: mapsdatatranslation.cpp:7424
 msgctxt "zimbabwe_districts.kgm"
 msgid "Rushinga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7417
+#: mapsdatatranslation.cpp:7425
 msgctxt "zimbabwe_districts.kgm"
 msgid "Shamva"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7418
+#: mapsdatatranslation.cpp:7426
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chikomba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7419
+#: mapsdatatranslation.cpp:7427
 msgctxt "zimbabwe_districts.kgm"
 msgid "Goromonzi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7420
+#: mapsdatatranslation.cpp:7428
 msgctxt "zimbabwe_districts.kgm"
 msgid "Marondera"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7421
+#: mapsdatatranslation.cpp:7429
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mudzi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7422
+#: mapsdatatranslation.cpp:7430
 msgctxt "zimbabwe_districts.kgm"
 msgid "Murehwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7423
+#: mapsdatatranslation.cpp:7431
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mutoko"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7424
+#: mapsdatatranslation.cpp:7432
 msgctxt "zimbabwe_districts.kgm"
 msgid "Seke"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7425
+#: mapsdatatranslation.cpp:7433
 msgctxt "zimbabwe_districts.kgm"
 msgid "UMP"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7426
+#: mapsdatatranslation.cpp:7434
 msgctxt "zimbabwe_districts.kgm"
 msgid "Wedza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7427
+#: mapsdatatranslation.cpp:7435
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chegutu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7428
+#: mapsdatatranslation.cpp:7436
 msgctxt "zimbabwe_districts.kgm"
 msgid "Hurungwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7429
+#: mapsdatatranslation.cpp:7437
 msgctxt "zimbabwe_districts.kgm"
 msgid "Kadoma"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7430
+#: mapsdatatranslation.cpp:7438
 msgctxt "zimbabwe_districts.kgm"
 msgid "Kariba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7431
+#: mapsdatatranslation.cpp:7439
 msgctxt "zimbabwe_districts.kgm"
 msgid "Makonde"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7432
+#: mapsdatatranslation.cpp:7440
 msgctxt "zimbabwe_districts.kgm"
 msgid "Zvimba"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7433
+#: mapsdatatranslation.cpp:7441
 msgctxt "zimbabwe_districts.kgm"
 msgid "Bikita"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7434
+#: mapsdatatranslation.cpp:7442
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chiredzi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7435
+#: mapsdatatranslation.cpp:7443
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chivi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7436
+#: mapsdatatranslation.cpp:7444
 msgctxt "zimbabwe_districts.kgm"
 msgid "Gutu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7437
+#: mapsdatatranslation.cpp:7445
 msgctxt "zimbabwe_districts.kgm"
 msgid "Masvingo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7438
+#: mapsdatatranslation.cpp:7446
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mwenezi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7439
+#: mapsdatatranslation.cpp:7447
 msgctxt "zimbabwe_districts.kgm"
 msgid "Zaka"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7440
+#: mapsdatatranslation.cpp:7448
 msgctxt "zimbabwe_districts.kgm"
 msgid "Binga"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7441
+#: mapsdatatranslation.cpp:7449
 msgctxt "zimbabwe_districts.kgm"
 msgid "Bubi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7442
+#: mapsdatatranslation.cpp:7450
 msgctxt "zimbabwe_districts.kgm"
 msgid "Hwange"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7443
+#: mapsdatatranslation.cpp:7451
 msgctxt "zimbabwe_districts.kgm"
 msgid "Lupane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7444
+#: mapsdatatranslation.cpp:7452
 msgctxt "zimbabwe_districts.kgm"
 msgid "Nkayi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7445
+#: mapsdatatranslation.cpp:7453
 msgctxt "zimbabwe_districts.kgm"
 msgid "Tsholotsho"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7446
+#: mapsdatatranslation.cpp:7454
 msgctxt "zimbabwe_districts.kgm"
 msgid "Umguza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7447
+#: mapsdatatranslation.cpp:7455
 msgctxt "zimbabwe_districts.kgm"
 msgid "Beitbridge"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7448
+#: mapsdatatranslation.cpp:7456
 msgctxt "zimbabwe_districts.kgm"
 msgid "Bulilimamangwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7449
+#: mapsdatatranslation.cpp:7457
 msgctxt "zimbabwe_districts.kgm"
 msgid "Gwanda"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7450
+#: mapsdatatranslation.cpp:7458
 msgctxt "zimbabwe_districts.kgm"
 msgid "Insiza"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7451
+#: mapsdatatranslation.cpp:7459
 msgctxt "zimbabwe_districts.kgm"
 msgid "Matobo"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7452
+#: mapsdatatranslation.cpp:7460
 msgctxt "zimbabwe_districts.kgm"
 msgid "Umzingwane"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7453
+#: mapsdatatranslation.cpp:7461
 msgctxt "zimbabwe_districts.kgm"
 msgid "Chirumhanzu"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7454
+#: mapsdatatranslation.cpp:7462
 msgctxt "zimbabwe_districts.kgm"
 msgid "Gokwe north"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7455
+#: mapsdatatranslation.cpp:7463
 msgctxt "zimbabwe_districts.kgm"
 msgid "Gokwe south"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7456
+#: mapsdatatranslation.cpp:7464
 msgctxt "zimbabwe_districts.kgm"
 msgid "Gweru"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7457
+#: mapsdatatranslation.cpp:7465
 msgctxt "zimbabwe_districts.kgm"
 msgid "Kwekwe"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7458
+#: mapsdatatranslation.cpp:7466
 msgctxt "zimbabwe_districts.kgm"
 msgid "Mberengwa"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7459
+#: mapsdatatranslation.cpp:7467
 msgctxt "zimbabwe_districts.kgm"
 msgid "Shurugwi"
 msgstr ""
 
-#: mapsdatatranslation.cpp:7460
+#: mapsdatatranslation.cpp:7468
 msgctxt "zimbabwe_districts.kgm"
 msgid "Zvishavane"
 msgstr ""
@@ -34118,30 +34172,135 @@
 msgid "Wikipedia page"
 msgstr ""
 
-#: placeasker.cpp:116
+#: placeasker.cpp:186
 #, kde-format
 msgctxt "@info:status"
 msgid "Please place in the map:<nl/>%1"
 msgstr ""
 
-#: placeasker.cpp:127
+#: placeasker.cpp:199
 #, kde-format
 msgctxt "@title"
 msgid "Place %1 in Map"
 msgstr ""
 
-#: rc.cpp:4
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, ,Launchpad Contributions:,Kevin Donnelly"
 
-#: rc.cpp:5
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
+#. i18n: file: kgeographyoptions.ui:17
+#. i18n: ectx: property (title), widget (KButtonGroup, kcfg_questionPlacingScheme)
+#: rc.cpp:5
+msgid "&Question Alignment"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:23
+#. i18n: ectx: property (text), widget (QRadioButton, topleftRadio)
+#: rc.cpp:8
+msgid "Top-l&eft"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:30
+#. i18n: ectx: property (text), widget (QRadioButton, topRadio)
+#: rc.cpp:11
+msgid "&Top"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:37
+#. i18n: ectx: property (text), widget (QRadioButton, toprightRadio)
+#: rc.cpp:14
+msgid "Top-r&ight"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:44
+#. i18n: ectx: property (text), widget (QRadioButton, leftRadio)
+#: rc.cpp:17
+msgid "&Left"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:51
+#. i18n: ectx: property (text), widget (QRadioButton, centerRadio)
+#: rc.cpp:20
+msgid "&Center"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:58
+#. i18n: ectx: property (text), widget (QRadioButton, rightRadio)
+#: rc.cpp:23
+msgid "&Right"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:65
+#. i18n: ectx: property (text), widget (QRadioButton, bottomleftRadio)
+#: rc.cpp:26
+msgid "Bottom-le&ft"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:72
+#. i18n: ectx: property (text), widget (QRadioButton, bottomRadio)
+#: rc.cpp:29
+msgid "&Bottom"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:79
+#. i18n: ectx: property (text), widget (QRadioButton, bottomrightRadio)
+#: rc.cpp:32
+msgid "Bottom-ri&ght"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:89
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_waitsForValidation)
+#: rc.cpp:35
+msgid ""
+"Whether the user will have to click \"Accept\" after choosing an answer or "
+"not"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:92
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_waitsForValidation)
+#: rc.cpp:38
+msgid "&Wait for validation"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:99
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_focusFollowsMouse)
+#: rc.cpp:41
+msgid "Whether pressing space will trigger button under mouse or not"
+msgstr ""
+
+#. i18n: file: kgeographyoptions.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_focusFollowsMouse)
+#: rc.cpp:44
+msgid "&Focus follows mouse"
+msgstr ""
+
 #. i18n: file: kgeography.kcfg:9
 #. i18n: ectx: label, entry (lastMap), group (general)
-#: rc.cpp:3 rc.cpp:8
+#: rc.cpp:47
 msgid "The last opened map"
 msgstr "Y map diwethaf i'w agor"
+
+#. i18n: file: kgeography.kcfg:12
+#. i18n: ectx: label, entry (questionPlacingScheme), group (general)
+#: rc.cpp:50
+msgid "Placement alignment of the question"
+msgstr ""
+
+#. i18n: file: kgeography.kcfg:27
+#. i18n: ectx: label, entry (waitsForValidation), group (general)
+#: rc.cpp:53
+msgid "Ask for validation before next question"
+msgstr ""
+
+#. i18n: file: kgeography.kcfg:31
+#. i18n: ectx: label, entry (focusFollowsMouse), group (general)
+#: rc.cpp:56
+msgid ""
+"Whether press on space while hovering a button should trigger that button"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kget.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kget.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kget.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kget.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kget\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:58+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,12 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:00+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: conf/transfersgrouptree.cpp:110 conf/transfersgrouptree.cpp:115
-msgid "New Group"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-04-18 00:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: conf/autopastemodel.cpp:174
 msgid "Pattern"
@@ -41,119 +37,126 @@
 msgid "Regular expression"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:49
-msgid "Xml"
+#: conf/integrationpreferences.cpp:32
+msgid "Include"
+msgstr ""
+
+#: conf/integrationpreferences.cpp:33
+msgid "Exclude"
+msgstr ""
+
+#: conf/transfersgrouptree.cpp:110 conf/transfersgrouptree.cpp:115
+msgid "New Group"
+msgstr ""
+
+#: conf/dlgwebinterface.cpp:44 conf/dlgwebinterface.cpp:59
+msgid "Could not open KWallet"
+msgstr ""
+
+#. i18n: file: conf/dlgintegration.ui:100
+#. i18n: ectx: property (text), widget (KPushButton, increase)
+#: conf/verificationpreferences.cpp:35 rc.cpp:98
+msgid "&Increase Priority"
+msgstr ""
+
+#. i18n: file: conf/dlgintegration.ui:107
+#. i18n: ectx: property (text), widget (KPushButton, decrease)
+#: conf/verificationpreferences.cpp:36 rc.cpp:101
+msgid "&Decrease Priority"
 msgstr ""
 
 #: conf/preferencesdialog.cpp:51
+msgid "Xml"
+msgstr ""
+
+#: conf/preferencesdialog.cpp:53
 msgid "Sqlite"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:54
+#: conf/preferencesdialog.cpp:56
 msgid "Nepomuk"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:58
+#: conf/preferencesdialog.cpp:60 mainwindow.cpp:367
 msgid "Turn Off Computer"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:59
+#: conf/preferencesdialog.cpp:61 mainwindow.cpp:372
 msgid "Hibernate Computer"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:60
+#: conf/preferencesdialog.cpp:62 mainwindow.cpp:377
 msgid "Suspend Computer"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:75
+#: conf/preferencesdialog.cpp:74
 msgid "Appearance"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:75
+#: conf/preferencesdialog.cpp:74
 msgid "Change appearance settings"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:76
+#: conf/preferencesdialog.cpp:75
 msgid "Groups"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:76
+#: conf/preferencesdialog.cpp:75
 msgid "Manage the groups"
 msgstr ""
 
 #. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:23
 #. i18n: ectx: property (title), widget (QGroupBox, networkGroupBox)
-#: conf/preferencesdialog.cpp:77 rc.cpp:317
+#: conf/preferencesdialog.cpp:76 rc.cpp:343
 msgid "Network"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:77
+#: conf/preferencesdialog.cpp:76
 msgid "Network and Downloads"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:78
+#: conf/preferencesdialog.cpp:77
 msgid "Web Interface"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:78
+#: conf/preferencesdialog.cpp:77
 msgid "Control KGet over a Network or the Internet"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:79
+#: conf/preferencesdialog.cpp:78
 msgid "Verification"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:80
+#: conf/preferencesdialog.cpp:79
 msgctxt "integration of KGet with other applications"
 msgid "Integration"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:81
+#: conf/preferencesdialog.cpp:80
 msgctxt "Advanced Options"
 msgid "Advanced"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:81
+#: conf/preferencesdialog.cpp:80
 msgid "Advanced Options"
 msgstr "Dewisiadau Uwch"
 
-#: conf/preferencesdialog.cpp:82 conf/pluginselector.cpp:26
+#: conf/preferencesdialog.cpp:81 conf/pluginselector.cpp:26
 msgid "Plugins"
 msgstr ""
 
-#: conf/preferencesdialog.cpp:82
+#: conf/preferencesdialog.cpp:81
 msgid "Transfer Plugins"
 msgstr ""
 
-#: conf/integrationpreferences.cpp:32
-msgid "Include"
-msgstr ""
-
-#: conf/integrationpreferences.cpp:33
-msgid "Exclude"
-msgstr ""
-
-#: core/transfergrouphandler.cpp:97
-#, kde-format
-msgid "1 Item"
-msgid_plural "%1 Items"
-msgstr[0] ""
-msgstr[1] ""
+#: core/kget.h:371 ui/tray.cpp:41 main.cpp:104 mainwindow.cpp:92
+#: mainwindow.cpp:521
+msgid "KGet"
+msgstr "KGet"
 
-#: core/transfergrouphandler.cpp:113 core/transferhandler.cpp:150
-#: ui/transferdetails.cpp:100
+#: core/linkimporter.cpp:90
 #, kde-format
-msgid "%1/s"
-msgstr "%1/eil"
-
-#: core/transfergrouphandler.cpp:169
-msgctxt "start transfergroup downloads"
-msgid "Start"
-msgstr ""
-
-#: core/transfergrouphandler.cpp:175
-msgctxt "stop transfergroup downloads"
-msgid "Stop"
+msgid "Error trying to get %1"
 msgstr ""
 
 #: core/transfer.cpp:37
@@ -165,11 +168,10 @@
 msgid "Delayed"
 msgstr ""
 
-#: core/transfer.cpp:39 core/transfer.cpp:267 core/transfer.cpp:286
-#: transfer-plugins/mms/mmsTransfer.cpp:52
-#: transfer-plugins/mmsclient/mmsTransfer.cpp:48
-#: transfer-plugins/bittorrent/bttransfer.cpp:298
+#: core/transfer.cpp:39 core/transfer.cpp:252 core/transfer.cpp:271
 #: transfer-plugins/contentfetch/contentfetch.cpp:69
+#: transfer-plugins/mmsthreads/mmstransfer.cpp:85
+#: transfer-plugins/bittorrent/bttransfer.cpp:304
 msgctxt "transfer state: stopped"
 msgid "Stopped"
 msgstr ""
@@ -179,45 +181,76 @@
 msgid "Aborted"
 msgstr ""
 
-#: core/transfer.cpp:41 transfer-plugins/bittorrent/bttransfer.cpp:216
-#: transfer-plugins/bittorrent/bttransfer.cpp:294
+#: core/transfer.cpp:41 transfer-plugins/bittorrent/bttransfer.cpp:222
+#: transfer-plugins/bittorrent/bttransfer.cpp:300
 msgctxt "transfer state: finished"
 msgid "Finished"
 msgstr ""
 
-#: core/transfer.cpp:43 transfer-plugins/bittorrent/bttransfer.cpp:160
+#: core/transfer.cpp:43 transfer-plugins/bittorrent/bttransfer.cpp:166
 msgctxt "changing the destination of the file"
 msgid "Changing destination"
 msgstr ""
 
-#: core/transfertreemodel.cpp:644
-msgctxt "name of download"
-msgid "Name"
+#: core/transfergrouphandler.cpp:97
+#, kde-format
+msgid "1 Item"
+msgid_plural "%1 Items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/transfergrouphandler.cpp:113 core/transferhandler.cpp:150
+#: ui/transferdetails.cpp:97
+#, kde-format
+msgid "%1/s"
+msgstr "%1/eil"
+
+#: core/transfergrouphandler.cpp:169
+msgctxt "start transfergroup downloads"
+msgid "Start"
 msgstr ""
 
-#: core/transfertreemodel.cpp:646
-msgctxt "status of download"
-msgid "Status"
+#: core/transfergrouphandler.cpp:175
+msgctxt "stop transfergroup downloads"
+msgid "Stop"
 msgstr ""
 
-#: core/transfertreemodel.cpp:648
-msgctxt "size of download"
-msgid "Size"
+#: core/kgetglobaljob.cpp:56
+#, kde-format
+msgid "KGet is downloading %1 file"
+msgid_plural "KGet is downloading %1 files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/signature.cpp:228
+msgid ""
+"The key to verify the signature is missing, do you want to download it?"
 msgstr ""
 
-#: core/transfertreemodel.cpp:650
-msgctxt "progress of download"
-msgid "Progress"
+#: core/signature.cpp:250
+#, kde-format
+msgid ""
+"The signature could not be verified for %1. See transfer settings for more "
+"information."
 msgstr ""
 
-#: core/transfertreemodel.cpp:652
-msgctxt "speed of download"
-msgid "Speed"
+#: core/signature.cpp:251
+msgid "Signature not verified"
 msgstr ""
 
-#: core/transfertreemodel.cpp:654
-msgctxt "remaining time of download"
-msgid "Remaining Time"
+#: core/verificationmodel.cpp:151
+msgctxt "the type of the hash, e.g. MD5"
+msgid "Type"
+msgstr ""
+
+#: core/verificationmodel.cpp:153
+msgctxt "the used hash for verification"
+msgid "Hash"
+msgstr ""
+
+#: core/verificationmodel.cpp:155
+msgctxt "verification-result of a file, can be true/false"
+msgid "Verified"
 msgstr ""
 
 #: core/transferhandler.cpp:137
@@ -242,135 +275,109 @@
 msgid "n/a"
 msgstr ""
 
-#: core/transferhandler.cpp:145 ui/transferdetails.cpp:95
+#: core/transferhandler.cpp:145 ui/transferdetails.cpp:92
 msgid "Stalled"
 msgstr "Wedi Seibio"
 
-#: core/datasourcefactory.cpp:286
-msgid "Filesize is larger than maximum file size supported by VFAT."
+#: core/filemodel.cpp:283
+msgctxt "file in a filesystem"
+msgid "File"
 msgstr ""
 
-#: core/datasourcefactory.cpp:286 core/datasourcefactory.cpp:612
-#: core/kget.cpp:1358 transfer-plugins/metalink/metalink.cpp:200
-#: ui/metalinkcreator/metalinkcreator.cpp:156
-#: ui/metalinkcreator/metalinkcreator.cpp:173
-msgid "Error"
+#: core/filemodel.cpp:283
+msgctxt "status of the download"
+msgid "Status"
 msgstr ""
 
-#: core/datasourcefactory.cpp:612
-#, kde-format
-msgctxt "A mirror is removed when the file has the wrong download size"
-msgid "%1 removed as it did report a wrong file size."
+#: core/filemodel.cpp:283
+msgctxt "size of the download"
+msgid "Size"
 msgstr ""
 
-#: core/kgetglobaljob.cpp:56
-#, kde-format
-msgid "KGet is downloading %1 file"
-msgid_plural "KGet is downloading %1 files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: core/kget.h:366 ui/tray.cpp:41 main.cpp:123 mainwindow.cpp:91
-#: mainwindow.cpp:470
-msgid "KGet"
-msgstr "KGet"
-
-#: core/verifier.cpp:412
-msgctxt "the type of the hash, e.g. MD5"
-msgid "Type"
+#: core/filemodel.cpp:283
+msgctxt "checksum of a file"
+msgid "Checksum"
 msgstr ""
 
-#: core/verifier.cpp:414
-msgctxt "the used hash for verification"
-msgid "Hash"
+#: core/filemodel.cpp:283
+msgctxt "signature of a file"
+msgid "Signature"
 msgstr ""
 
-#: core/verifier.cpp:416
-msgctxt "verification-result of a file, can be true/false"
-msgid "Verified"
+#: core/datasourcefactory.cpp:287
+msgid "Filesize is larger than maximum file size supported by VFAT."
 msgstr ""
 
-#: core/kgetkjobadapter.cpp:44
-msgid "KGet Transfer"
+#: core/datasourcefactory.cpp:287 core/datasourcefactory.cpp:614
+#: core/kget.cpp:1404 transfer-plugins/metalink/metalink.cpp:202
+#: ui/metalinkcreator/metalinkcreator.cpp:161
+#: ui/metalinkcreator/metalinkcreator.cpp:178
+msgid "Error"
 msgstr ""
 
-#: core/linkimporter.cpp:90
+#: core/datasourcefactory.cpp:614
 #, kde-format
-msgid "Error trying to get %1"
-msgstr ""
-
-#: core/verifier.cpp:1357
-msgid ""
-"No server for downloading keys is specified in settings. Downloading aborted."
-msgstr ""
-
-#: core/verifier.cpp:1358 core/verifier.cpp:1378
-msgid "No key server"
-msgstr ""
-
-#: core/verifier.cpp:1377
-msgid ""
-"No useful key server found, key not downloaded. Add more servers to the "
-"settings or restart KGet and retry downloading."
+msgctxt "A mirror is removed when the file has the wrong download size"
+msgid "%1 removed as it did report a wrong file size."
 msgstr ""
 
-#: core/kget.cpp:121
+#: core/kget.cpp:122
 #, kde-format
 msgid "Are you sure that you want to remove the group named %1?"
 msgstr ""
 
-#: core/kget.cpp:122
+#: core/kget.cpp:123
 msgid "Remove Group"
 msgstr ""
 
-#: core/kget.cpp:146
+#: core/kget.cpp:147
 msgid "Are you sure that you want to remove the following groups?"
 msgstr ""
 
-#: core/kget.cpp:148
+#: core/kget.cpp:149
 msgid "Remove groups"
 msgstr ""
 
-#: core/kget.cpp:256
+#: core/kget.cpp:257
 #, kde-format
 msgid ""
 "<p>The following transfer has been added to the download list:</p><p "
 "style=\"font-size: small;\">\\%1</p>"
 msgstr ""
 
-#: core/kget.cpp:257 core/kget.cpp:353
+#: core/kget.cpp:258 core/kget.cpp:354
 msgid "Download added"
 msgstr ""
 
-#: core/kget.cpp:348
+#: core/kget.cpp:349
 msgid "<p>The following transfer has been added to the download list:</p>"
 msgstr ""
 
-#: core/kget.cpp:350
+#: core/kget.cpp:351
 msgid "<p>The following transfers have been added to the download list:</p>"
 msgstr ""
 
-#: core/kget.cpp:576
+#: core/kget.cpp:497 core/kget.cpp:856
+msgid "My Downloads"
+msgstr ""
+
+#: core/kget.cpp:592
 #, kde-format
 msgid ""
 "The file %1 already exists.\n"
 "Overwrite?"
 msgstr ""
 
-#: core/kget.cpp:577
+#: core/kget.cpp:593
 msgid "Overwrite existing file?"
 msgstr ""
 
-#: core/kget.cpp:590 ui/metalinkcreator/metalinkcreator.cpp:173
+#: core/kget.cpp:606 ui/metalinkcreator/metalinkcreator.cpp:178
 #, kde-format
 msgid "Unable to save to: %1"
 msgstr ""
 
-#: core/kget.cpp:834 ui/contextmenu.cpp:141
-msgid "My Downloads"
-msgstr ""
-
-#: core/kget.cpp:898
+#: core/kget.cpp:920
 msgid ""
 "<p>The following URL cannot be downloaded, its protocol is not supported by "
 "KGet:</p>"
@@ -380,25 +387,23 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/kget.cpp:908
+#: core/kget.cpp:930
 msgid "Protocol unsupported"
 msgstr ""
 
-#. i18n: file: ui/newtransferwidget.ui:17
-#. i18n: ectx: property (text), widget (KTitleWidget, titleWidget)
-#: core/kget.cpp:962 ui/newtransferdialog.cpp:49 rc.cpp:493
+#: core/kget.cpp:984 ui/newtransferdialog.cpp:50
 msgid "New Download"
 msgstr ""
 
-#: core/kget.cpp:962
+#: core/kget.cpp:984
 msgid "Enter URL:"
 msgstr ""
 
-#: core/kget.cpp:999
+#: core/kget.cpp:1021
 msgid "Save As"
 msgstr ""
 
-#: core/kget.cpp:1012 core/urlchecker.cpp:319
+#: core/kget.cpp:1034 core/urlchecker.cpp:362
 #, kde-format
 msgid ""
 "Malformed URL:\n"
@@ -407,14 +412,14 @@
 "URL wedi'i gamffurfio:\n"
 " %1"
 
-#: core/kget.cpp:1019 core/urlchecker.cpp:321
+#: core/kget.cpp:1041 core/urlchecker.cpp:364
 #, kde-format
 msgid ""
 "Malformed URL, protocol missing:\n"
 "%1"
 msgstr ""
 
-#: core/kget.cpp:1030 core/urlchecker.cpp:377
+#: core/kget.cpp:1052 core/urlchecker.cpp:420
 #, kde-format
 msgid ""
 "You have already completed a download from the location: \n"
@@ -424,11 +429,11 @@
 "Download it again?"
 msgstr ""
 
-#: core/kget.cpp:1031 core/urlchecker.cpp:588
+#: core/kget.cpp:1053 core/urlchecker.cpp:636
 msgid "Download it again?"
 msgstr ""
 
-#: core/kget.cpp:1043 core/urlchecker.cpp:379
+#: core/kget.cpp:1065 core/urlchecker.cpp:422
 #, kde-format
 msgid ""
 "You have a download in progress from the location: \n"
@@ -438,40 +443,48 @@
 "Delete it and download again?"
 msgstr ""
 
-#: core/kget.cpp:1044 core/urlchecker.cpp:585
+#: core/kget.cpp:1066 core/urlchecker.cpp:633
 msgid "Delete it and download again?"
 msgstr ""
 
-#: core/kget.cpp:1067 core/kget.cpp:1074
+#: core/kget.cpp:1089 core/kget.cpp:1096
 msgid "Directory is not writable"
 msgstr ""
 
-#: core/kget.cpp:1102
+#: core/kget.cpp:1124
 msgid ""
 "You have already downloaded that file from another location.\n"
 "\n"
 "Download and delete the previous one?"
 msgstr ""
 
-#: core/kget.cpp:1103 core/urlchecker.cpp:597
+#: core/kget.cpp:1125 core/urlchecker.cpp:645
 msgid "File already downloaded. Download anyway?"
 msgstr ""
 
-#: core/kget.cpp:1112
+#: core/kget.cpp:1134
 msgid "You are already downloading the same file"
 msgstr ""
 
-#: core/kget.cpp:1116 core/kget.cpp:1119 core/urlchecker.cpp:600
-#: core/urlchecker.cpp:701 transfer-plugins/metalink/metalink.cpp:735
+#: core/kget.cpp:1138 core/kget.cpp:1141 core/urlchecker.cpp:648
+#: core/urlchecker.cpp:744 transfer-plugins/metalink/metalink.cpp:738
 msgid "File already exists"
 msgstr ""
 
-#: core/kget.cpp:1220
+#: core/kget.cpp:1242
+msgid "Internet connection established, resuming transfers."
+msgstr ""
+
+#: core/kget.cpp:1247
+msgid "No internet connection, stopping transfers."
+msgstr ""
+
+#: core/kget.cpp:1261
 #, kde-format
 msgid "Plugin loader could not load the plugin: %1."
 msgstr ""
 
-#: core/kget.cpp:1238
+#: core/kget.cpp:1279
 #, kde-format
 msgid ""
 "Not deleting\n"
@@ -482,7 +495,7 @@
 " %1\n"
 " gan ei fod yn gyfeiriadur."
 
-#: core/kget.cpp:1248
+#: core/kget.cpp:1289
 #, kde-format
 msgid ""
 "Not deleting\n"
@@ -493,29 +506,29 @@
 " %1\n"
 " gan na'i fod yn ffeil lleol."
 
-#: core/kget.cpp:1351
+#: core/kget.cpp:1397
 #, kde-format
 msgid ""
 "<p>The following file has finished downloading:</p><p style=\"font-size: "
 "small;\">\\%1</p>"
 msgstr ""
 
-#: core/kget.cpp:1352
+#: core/kget.cpp:1398
 msgid "Download completed"
 msgstr ""
 
-#: core/kget.cpp:1355
+#: core/kget.cpp:1401
 #, kde-format
 msgid ""
 "<p>The following transfer has been started:</p><p style=\"font-size: "
 "small;\">\\%1</p>"
 msgstr ""
 
-#: core/kget.cpp:1356
+#: core/kget.cpp:1402
 msgid "Download started"
 msgstr ""
 
-#: core/kget.cpp:1358
+#: core/kget.cpp:1404
 #, kde-format
 msgid ""
 "<p>There has been an error in the following transfer:</p><p style=\"font-"
@@ -523,202 +536,170 @@
 "small;\">\\%2</p>"
 msgstr ""
 
-#: core/kget.cpp:1363
+#: core/kget.cpp:1409
 msgid "Resolve"
 msgstr ""
 
-#: core/kget.cpp:1411
+#: core/kget.cpp:1461
 msgid "KGet is now closing, as all downloads have completed."
 msgstr ""
 
-#: core/kget.cpp:1415
+#: core/kget.cpp:1465
 msgid "The computer will now turn off, as all downloads have completed."
 msgstr ""
 
-#: core/kget.cpp:1415
+#: core/kget.cpp:1465
 msgctxt "Shutting down computer"
 msgid "Shutdown"
 msgstr ""
 
-#: core/kget.cpp:1418
+#: core/kget.cpp:1468
 msgid ""
 "The computer will now suspend to disk, as all downloads have completed."
 msgstr ""
 
-#: core/kget.cpp:1418
+#: core/kget.cpp:1468
 msgctxt "Hibernating computer"
 msgid "Hibernating"
 msgstr ""
 
-#: core/kget.cpp:1421
+#: core/kget.cpp:1471
 msgid ""
 "The computer will now suspend to RAM, as all downloads have completed."
 msgstr ""
 
-#: core/kget.cpp:1421
+#: core/kget.cpp:1471
 msgctxt "Suspending computer"
 msgid "Suspending"
 msgstr ""
 
-#: core/kget.cpp:1429
+#: core/kget.cpp:1479
 msgctxt "abort the proposed action"
 msgid "Abort"
 msgstr ""
 
-#: core/kget.cpp:1439
+#: core/kget.cpp:1489
 msgid "<p>All transfers have been finished.</p>"
 msgstr ""
 
-#: core/kget.cpp:1440
+#: core/kget.cpp:1490
 msgid "Downloads completed"
 msgstr ""
 
-#: core/verifier.cpp:1233
-msgid ""
-"The key to verify the signature is missing, do you want to download it?"
-msgstr ""
-
-#: core/verifier.cpp:1251
-#, kde-format
-msgid ""
-"The signature could not be verified for %1. See transfer settings for more "
-"information."
-msgstr ""
-
-#: core/verifier.cpp:1252
-msgid "Signature not verified"
-msgstr ""
-
-#: core/filemodel.cpp:280
-msgctxt "file in a filesystem"
-msgid "File"
-msgstr ""
-
-#: core/filemodel.cpp:280
-msgctxt "status of the download"
-msgid "Status"
-msgstr ""
-
-#: core/filemodel.cpp:280
-msgctxt "size of the download"
-msgid "Size"
-msgstr ""
-
-#: core/filemodel.cpp:280
-msgctxt "checksum of a file"
-msgid "Checksum"
-msgstr ""
+#: core/urlchecker.cpp:47
+msgid "Question"
+msgstr "Cwestiwn"
 
-#: core/filemodel.cpp:280
-msgctxt "signature of a file"
-msgid "Signature"
+#: core/urlchecker.cpp:59
+msgid "Appl&y to all"
 msgstr ""
 
-#: core/urlchecker.cpp:253 core/urlchecker.cpp:293
+#: core/urlchecker.cpp:296 core/urlchecker.cpp:336
 msgid "No download directory specified."
 msgstr ""
 
-#: core/urlchecker.cpp:255
+#: core/urlchecker.cpp:298
 msgid "Invalid download directory specified."
 msgstr ""
 
-#: core/urlchecker.cpp:257
+#: core/urlchecker.cpp:300
 msgid "Download directory is not writeable."
 msgstr ""
 
-#: core/urlchecker.cpp:265 core/urlchecker.cpp:305
+#: core/urlchecker.cpp:308 core/urlchecker.cpp:348
 msgid "No download destination specified."
 msgstr ""
 
-#: core/urlchecker.cpp:267
+#: core/urlchecker.cpp:310
 msgid "Invalid download destination specified."
 msgstr ""
 
-#: core/urlchecker.cpp:269
+#: core/urlchecker.cpp:312
 msgid "Download destination is not writeable."
 msgstr ""
 
-#: core/urlchecker.cpp:277 core/urlchecker.cpp:317 core/urlchecker.cpp:407
-#: core/urlchecker.cpp:421
+#: core/urlchecker.cpp:320 core/urlchecker.cpp:360 core/urlchecker.cpp:450
+#: core/urlchecker.cpp:464
 msgid "No URL specified."
 msgstr ""
 
-#: core/urlchecker.cpp:279 transfer-plugins/bittorrent/bttransfer.cpp:256
+#: core/urlchecker.cpp:322
 #: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:94
+#: transfer-plugins/bittorrent/bttransfer.cpp:262
 msgid "Malformed URL."
 msgstr ""
 
-#: core/urlchecker.cpp:281
+#: core/urlchecker.cpp:324
 msgid "Malformed URL, protocol missing."
 msgstr ""
 
-#: core/urlchecker.cpp:283
+#: core/urlchecker.cpp:326
 msgid "Malformed URL, host missing."
 msgstr ""
 
-#: core/urlchecker.cpp:295
+#: core/urlchecker.cpp:338
 #, kde-format
 msgid ""
 "Invalid download directory specified:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:297
+#: core/urlchecker.cpp:340
 #, kde-format
 msgid ""
 "Download directory is not writeable:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:307
+#: core/urlchecker.cpp:350
 #, kde-format
 msgid ""
 "Invalid download destination specified:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:309
+#: core/urlchecker.cpp:352
 #, kde-format
 msgid ""
 "Download destination is not writeable:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:323
+#: core/urlchecker.cpp:366
 #, kde-format
 msgid ""
 "Malformed URL, host missing:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:339 core/urlchecker.cpp:351
+#: core/urlchecker.cpp:382 core/urlchecker.cpp:394
 msgid "File already exists. Overwrite it?"
 msgstr ""
 
-#: core/urlchecker.cpp:341 core/urlchecker.cpp:367
+#: core/urlchecker.cpp:384 core/urlchecker.cpp:410
 msgid ""
 "You have already downloaded that file from another location.\n"
 "Download and delete the previous one?"
 msgstr ""
 
-#: core/urlchecker.cpp:343 core/urlchecker.cpp:369
+#: core/urlchecker.cpp:386 core/urlchecker.cpp:412
 msgid ""
 "You are already downloading that file from another location.\n"
 "Download and delete the previous one?"
 msgstr ""
 
-#: core/urlchecker.cpp:353
+#: core/urlchecker.cpp:396
 msgid ""
 "You have already completed a download from that location. Download it again?"
 msgstr ""
 
-#: core/urlchecker.cpp:355
+#: core/urlchecker.cpp:398
 msgid ""
 "You have a download in progress from that location.\n"
 "Delete it and download again?"
 msgstr ""
 
-#: core/urlchecker.cpp:365
+#: core/urlchecker.cpp:408
 #, kde-format
 msgid ""
 "File already exists:\n"
@@ -726,75 +707,75 @@
 "Overwrite it?"
 msgstr ""
 
-#: core/urlchecker.cpp:409
+#: core/urlchecker.cpp:452
 msgid "Malformed URLs."
 msgstr ""
 
-#: core/urlchecker.cpp:411
+#: core/urlchecker.cpp:454
 msgid "Malformed URLs, protocol missing."
 msgstr ""
 
-#: core/urlchecker.cpp:413
+#: core/urlchecker.cpp:456
 msgid "Malformed URLs, host missing."
 msgstr ""
 
-#: core/urlchecker.cpp:423
+#: core/urlchecker.cpp:466
 #, kde-format
 msgid ""
 "Malformed URLs:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:425
+#: core/urlchecker.cpp:468
 #, kde-format
 msgid ""
 "Malformed URLs, protocol missing:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:427
+#: core/urlchecker.cpp:470
 #, kde-format
 msgid ""
 "Malformed URLs, host missing:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:429
+#: core/urlchecker.cpp:472
 #, kde-format
 msgid ""
 "Destinations are not writable:\n"
 "%1"
 msgstr ""
 
-#: core/urlchecker.cpp:453
+#: core/urlchecker.cpp:496
 msgid "Files exist already. Overwrite them?"
 msgstr ""
 
-#: core/urlchecker.cpp:455
+#: core/urlchecker.cpp:498
 msgid ""
 "You have already completed downloads at those destinations. Download them "
 "again?"
 msgstr ""
 
-#: core/urlchecker.cpp:457
+#: core/urlchecker.cpp:500
 msgid ""
 "You have downloads in progress to these destinations.\n"
 "Delete them and download again?"
 msgstr ""
 
-#: core/urlchecker.cpp:465
+#: core/urlchecker.cpp:508
 msgid ""
 "You have already completed downloads from these locations. Download them "
 "again?"
 msgstr ""
 
-#: core/urlchecker.cpp:467
+#: core/urlchecker.cpp:510
 msgid ""
 "You have downloads in progress from these locations.\n"
 "Delete them and download again?"
 msgstr ""
 
-#: core/urlchecker.cpp:476
+#: core/urlchecker.cpp:519
 #, kde-format
 msgid ""
 "Files exist already:\n"
@@ -802,7 +783,7 @@
 "Overwrite them?"
 msgstr ""
 
-#: core/urlchecker.cpp:478
+#: core/urlchecker.cpp:521
 #, kde-format
 msgid ""
 "You have already completed downloads at those destinations: \n"
@@ -812,7 +793,7 @@
 " Download them again?"
 msgstr ""
 
-#: core/urlchecker.cpp:480
+#: core/urlchecker.cpp:523
 #, kde-format
 msgid ""
 "You have downloads in progress to these destinations: \n"
@@ -822,7 +803,7 @@
 "Delete them and download again?"
 msgstr ""
 
-#: core/urlchecker.cpp:488
+#: core/urlchecker.cpp:531
 #, kde-format
 msgid ""
 "You have already completed downloads from these locations: \n"
@@ -832,7 +813,7 @@
 "Download them again?"
 msgstr ""
 
-#: core/urlchecker.cpp:490
+#: core/urlchecker.cpp:533
 #, kde-format
 msgid ""
 "You have downloads in progress from these locations: \n"
@@ -842,145 +823,216 @@
 "Delete them and download again?"
 msgstr ""
 
-#: core/urlchecker.cpp:610
-msgid "Question"
-msgstr "Cwestiwn"
-
-#: core/urlchecker.cpp:612
-msgctxt "on a question"
-msgid "Yes all"
+#: core/transfertreemodel.cpp:643
+msgctxt "name of download"
+msgid "Name"
 msgstr ""
 
-#: core/urlchecker.cpp:613
-msgctxt "on a question"
-msgid "No all"
+#: core/transfertreemodel.cpp:645
+msgctxt "status of download"
+msgid "Status"
 msgstr ""
 
-#: transfer-plugins/mirrorsearch/dlgmirrorsearch.cpp:23
-msgid "Insert Engine"
+#: core/transfertreemodel.cpp:647
+msgctxt "size of download"
+msgid "Size"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgengineediting.ui:16
-#. i18n: ectx: property (text), widget (QLabel, engineNameLabel)
-#: transfer-plugins/mirrorsearch/dlgmirrorsearch.cpp:28 rc.cpp:185
-msgid "Engine name:"
+#: core/transfertreemodel.cpp:649
+msgctxt "progress of download"
+msgid "Progress"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgengineediting.ui:30
-#. i18n: ectx: property (text), widget (QLabel, urlLabel)
-#. i18n: file: ui/newtransferwidget.ui:59
-#. i18n: ectx: property (text), widget (QLabel, urlLabel)
-#. i18n: file: ui/metalinkcreator/commondata.ui:170
-#. i18n: ectx: property (text), widget (QLabel, label_21)
-#: transfer-plugins/mirrorsearch/dlgmirrorsearch.cpp:29 rc.cpp:188 rc.cpp:496
-#: rc.cpp:694
-msgid "URL:"
+#: core/transfertreemodel.cpp:651
+msgctxt "speed of download"
+msgid "Speed"
 msgstr ""
 
-#: transfer-plugins/mms/mmsTransfer.cpp:36
-#: transfer-plugins/mmsclient/mmsTransfer.cpp:38
-msgctxt "transfer state: running"
-msgid "Running...."
+#: core/transfertreemodel.cpp:653
+msgctxt "remaining time of download"
+msgid "Remaining Time"
 msgstr ""
 
-#: transfer-plugins/mmsthreads/mmstransfer.cpp:113
-msgctxt "Transfer State:Finished"
-msgid "Finished"
+#: core/keydownloader.cpp:73
+msgid ""
+"No server for downloading keys is specified in settings. Downloading aborted."
 msgstr ""
 
-#: transfer-plugins/mmsthreads/mmstransfer.cpp:156
-msgid "Download failed, could not access this URL."
+#: core/keydownloader.cpp:74 core/keydownloader.cpp:94
+msgid "No key server"
 msgstr ""
 
-#: transfer-plugins/mmsthreads/mmstransfer.cpp:166
+#: core/keydownloader.cpp:93
 msgid ""
-"This URL does not allow multiple connections,\n"
-"the download will take longer."
+"No useful key server found, key not downloaded. Add more servers to the "
+"settings or restart KGet and retry downloading."
 msgstr ""
 
-#: transfer-plugins/kio/transferKio.cpp:93
-msgctxt "transfer state: connecting"
-msgid "Connecting...."
+#: core/kgetkjobadapter.cpp:45
+msgid "KGet Transfer"
 msgstr ""
 
-#: transfer-plugins/kio/transferKio.cpp:264
-#: transfer-plugins/multisegmentkio/transfermultisegkio.cpp:226
+#: transfer-plugins/multisegmentkio/segment.cpp:288
+msgid "Failed to write to the file."
+msgstr ""
+
+#: transfer-plugins/multisegmentkio/transfermultisegkio.cpp:228
+#: transfer-plugins/kio/transferKio.cpp:265
 #, kde-format
 msgid "The download (%1) could not be verified. Do you want to repair it?"
 msgstr ""
 
-#: transfer-plugins/kio/transferKio.cpp:267
-#: transfer-plugins/multisegmentkio/transfermultisegkio.cpp:229
+#: transfer-plugins/multisegmentkio/transfermultisegkio.cpp:231
+#: transfer-plugins/kio/transferKio.cpp:268
 #, kde-format
 msgid ""
 "The download (%1) could not be verified. Do you want to redownload it?"
 msgstr ""
 
-#: transfer-plugins/kio/transferKio.cpp:271
-#: transfer-plugins/multisegmentkio/transfermultisegkio.cpp:233
+#: transfer-plugins/multisegmentkio/transfermultisegkio.cpp:235
+#: transfer-plugins/kio/transferKio.cpp:272
 msgid "Verification failed."
 msgstr ""
 
-#: transfer-plugins/multisegmentkio/segment.cpp:288
-msgid "Failed to write to the file."
+#: transfer-plugins/kio/transferKio.cpp:94
+msgctxt "transfer state: connecting"
+msgid "Connecting...."
 msgstr ""
 
 #: transfer-plugins/metalink/fileselectiondlg.cpp:31
 msgid "File Selection"
 msgstr ""
 
-#: transfer-plugins/metalink/metalink.cpp:82
+#: transfer-plugins/metalink/metalink.cpp:83
 msgid "Downloading Metalink File...."
 msgstr ""
 
-#: transfer-plugins/metalink/metalink.cpp:116
+#: transfer-plugins/metalink/metalink.cpp:117
 msgid ""
 "A newer version of this Metalink might exist, do you want to download it?"
 msgstr ""
 
-#: transfer-plugins/metalink/metalink.cpp:117
+#: transfer-plugins/metalink/metalink.cpp:118
 msgid "Redownload Metalink"
 msgstr ""
 
-#: transfer-plugins/metalink/metalink.cpp:200
+#: transfer-plugins/metalink/metalink.cpp:202
 msgid "Download failed, no working URLs were found."
 msgstr ""
 
-#: transfer-plugins/metalink/metalink.cpp:509
+#: transfer-plugins/metalink/metalink.cpp:511
 msgid ""
 "The download could not be verified, do you want to repair (if repairing does "
 "not work the download would be restarted) it?"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:132
-msgid "Downloading Torrent File...."
+#: transfer-plugins/contentfetch/contentfetch.cpp:52
+msgctxt "Transfer state: processing script"
+msgid "Processing script...."
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:174
-#: transfer-plugins/bittorrent/bttransfer.cpp:277
-msgctxt "transfer state: downloading"
-msgid "Downloading...."
+#: transfer-plugins/contentfetch/contentfetch.cpp:83
+msgctxt "Transfer State: Finished"
+msgid "Finished"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:251
-msgid "Cannot add a tracker to a private torrent."
+#: transfer-plugins/contentfetch/contentfetch.cpp:92
+msgctxt "Transfer State: Aborted"
+msgid "Aborted"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:412
-msgid "Torrent file does not exist"
+#: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.cpp:116
+msgctxt "Configure script"
+msgid "Configure script"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:417
-msgid "Analyzing torrent...."
+#: transfer-plugins/contentfetch/dlgscriptediting.cpp:25
+msgid "Add New Script"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:429
-msgid "Cannot initialize port..."
+#: transfer-plugins/contentfetch/dlgscriptediting.cpp:37
+msgid "Edit Script"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransfer.cpp:498
-msgctxt "Transfer status: seeding"
-msgid "Seeding...."
+#: transfer-plugins/contentfetch/dlgscriptediting.cpp:48
+msgid "Set Script File"
+msgstr ""
+
+#: transfer-plugins/mirrorsearch/dlgmirrorsearch.cpp:23
+msgid "Insert Engine"
+msgstr ""
+
+#. i18n: file: transfer-plugins/mirrorsearch/dlgengineediting.ui:16
+#. i18n: ectx: property (text), widget (QLabel, engineNameLabel)
+#: transfer-plugins/mirrorsearch/dlgmirrorsearch.cpp:28 rc.cpp:254
+msgid "Engine name:"
+msgstr ""
+
+#. i18n: file: transfer-plugins/mirrorsearch/dlgengineediting.ui:30
+#. i18n: ectx: property (text), widget (QLabel, urlLabel)
+#. i18n: file: ui/metalinkcreator/commondata.ui:170
+#. i18n: ectx: property (text), widget (QLabel, label_21)
+#. i18n: file: ui/newtransferwidget.ui:24
+#. i18n: ectx: property (text), widget (QLabel, urlLabel)
+#: transfer-plugins/mirrorsearch/dlgmirrorsearch.cpp:29 rc.cpp:257 rc.cpp:649
+#: rc.cpp:688
+msgid "URL:"
+msgstr ""
+
+#: transfer-plugins/mmsthreads/mmstransfer.cpp:50
+msgctxt "transfer state: running"
+msgid "Running...."
+msgstr ""
+
+#: transfer-plugins/mmsthreads/mmstransfer.cpp:113
+msgctxt "Transfer State:Finished"
+msgid "Finished"
+msgstr ""
+
+#: transfer-plugins/mmsthreads/mmstransfer.cpp:156
+msgid "Download failed, could not access this URL."
+msgstr ""
+
+#: transfer-plugins/mmsthreads/mmstransfer.cpp:166
+msgid ""
+"This URL does not allow multiple connections,\n"
+"the download will take longer."
+msgstr ""
+
+#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:42
+msgid "Add item"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:70
+#, kde-format
+msgid "%1 would become %2"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:192
+msgctxt "the string that is used to modify an url"
+msgid "Change string"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:193
+msgctxt "the mode defines how the url should be changed"
+msgid "Change mode"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:194
+msgctxt "the type of the checksum e.g. md5"
+msgid "Checksum type"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/checksumsearch.cpp:30
+msgid "Append"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/checksumsearch.cpp:30
+msgid "Replace file"
+msgstr ""
+
+#: transfer-plugins/checksumsearch/checksumsearch.cpp:30
+msgid "Replace file-ending"
 msgstr ""
 
 #: transfer-plugins/bittorrent/scandlg.cpp:101
@@ -995,24 +1047,26 @@
 msgid "Scanning data of <b>%1</b> :"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransferfactory.cpp:35
-msgid "Cannot initialize libktorrent. Torrent support might not work."
-msgstr ""
-
-#: transfer-plugins/bittorrent/bttransferfactory.cpp:87
-msgid "&Advanced Details"
+#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:32
+#. i18n: ectx: property (text), widget (QTreeWidget, enginesTreeWidget)
+#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:124
+#: ui/linkview/kget_linkview.cpp:94 rc.cpp:266
+msgid "URL"
 msgstr ""
 
-#: transfer-plugins/bittorrent/bttransferfactory.cpp:93
-msgid "&Scan Files"
-msgstr ""
+#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:125
+msgid "Speed"
+msgstr "Cyflymder"
 
-#: transfer-plugins/bittorrent/btsettingswidget.cpp:37
-msgid "Select a default torrent folder"
+#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:126
+#: transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp:318
+msgid "Downloaded"
 msgstr ""
 
-#: transfer-plugins/bittorrent/btsettingswidget.cpp:39
-msgid "Select a default temporary folder"
+#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:127
+#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:148
+#: ui/history/transferhistory.cpp:251
+msgid "Status"
 msgstr ""
 
 #: transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp:152
@@ -1100,11 +1154,6 @@
 msgid "Requests"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp:318
-#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:126
-msgid "Downloaded"
-msgstr ""
-
 #: transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp:319
 msgid "Uploaded"
 msgstr ""
@@ -1180,99 +1229,166 @@
 msgid "Whether we are interested in downloading from this peer"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/webseedstab.cpp:92
+#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:147
+msgid "Url"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:149
+msgid "Seeders"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:150
+msgid "Leechers"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:151
+msgid "Times Downloaded"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:152
+msgid "Next Update"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:51
+#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:55
 #, kde-format
-msgid ""
-"Cannot add the webseed %1, it is already part of the list of webseeds."
+msgid "Advanced Details for %1"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/webseedstab.cpp:109
+#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:63
+#: transfer-plugins/bittorrent/advanceddetails/chunkdownloadmodel.cpp:214
+msgid "Files"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:71
+msgid "Trackers"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:74
+msgid "Webseeds"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/torrentfilelistmodel.cpp:69
+#: transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.cpp:376
+msgid "File"
+msgstr ""
+
+#. i18n: file: ui/history/transferhistory.ui:90
+#. i18n: ectx: property (text), item, widget (KComboBox, rangeType)
+#: transfer-plugins/bittorrent/advanceddetails/torrentfilelistmodel.cpp:70
+#: transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.cpp:377
+#: rc.cpp:820
+msgid "Size"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/peerview.cpp:52
+msgid "Kick Peer"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/peerview.cpp:53
+msgid "Ban Peer"
+msgstr ""
+
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:21
+#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
+#: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:86 rc.cpp:314
+msgid "Add Tracker"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:86
+msgid "Enter the URL of the tracker:"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:101
 #, kde-format
-msgid "Cannot remove webseed %1, it is part of the torrent."
+msgid "There already is a tracker named <b>%1</b>."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:70
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:66
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:70
 msgid "Priority"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:71
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:67
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:71
 msgid "Preview"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:73
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:69
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:73
 #, no-c-format
 msgctxt "Percent of File Downloaded"
 msgid "% Complete"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:82
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:78
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:82
 msgctxt "Download first"
 msgid "First"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:83
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:79
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:83
 msgctxt "Download last"
 msgid "Last"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:88
-msgctxt "Download normally(not as first or last)"
+#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:84
+msgctxt "Download Normal (not as first or last)"
 msgid "Normal"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:140
-msgctxt "preview available"
+#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:135
+#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:158
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:163
+msgctxt "Preview available"
 msgid "Available"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:142
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:165
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:137
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:160
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:142
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:165
 msgctxt "Preview pending"
 msgid "Pending"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:145
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:168
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:140
 #: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:163
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:145
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:168
 msgctxt "No preview available"
 msgid "No"
 msgstr ""
 
+#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:144
+#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:167
 #: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:150
 #: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:170
 #: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:176
-#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:144
-#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:167
 #, kde-format
 msgid "%1 %"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:163
-#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:135
-#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:158
-msgctxt "Preview available"
-msgid "Available"
+#: transfer-plugins/bittorrent/advanceddetails/webseedstab.cpp:92
+#, kde-format
+msgid ""
+"Cannot add the webseed %1, it is already part of the list of webseeds."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.cpp:376
-#: transfer-plugins/bittorrent/advanceddetails/torrentfilelistmodel.cpp:69
-msgid "File"
+#: transfer-plugins/bittorrent/advanceddetails/webseedstab.cpp:109
+#, kde-format
+msgid "Cannot remove webseed %1, it is part of the torrent."
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:120
-#. i18n: ectx: property (text), item, widget (KComboBox, rangeType)
-#: transfer-plugins/bittorrent/advanceddetails/torrentfiletreemodel.cpp:377
-#: transfer-plugins/bittorrent/advanceddetails/torrentfilelistmodel.cpp:70
-#: rc.cpp:582
-msgid "Size"
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:88
+msgctxt "Download normally(not as first or last)"
+msgid "Normal"
+msgstr ""
+
+#: transfer-plugins/bittorrent/advanceddetails/iwfiletreemodel.cpp:140
+msgctxt "preview available"
+msgid "Available"
 msgstr ""
 
 #: transfer-plugins/bittorrent/advanceddetails/chunkdownloadmodel.cpp:210
@@ -1287,11 +1403,6 @@
 msgid "Peer"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/chunkdownloadmodel.cpp:214
-#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:63
-msgid "Files"
-msgstr ""
-
 #: transfer-plugins/bittorrent/advanceddetails/chunkdownloadmodel.cpp:222
 msgid "Number of the chunk"
 msgstr ""
@@ -1312,14 +1423,6 @@
 msgid "Which files the chunk is located in"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/peerview.cpp:52
-msgid "Kick Peer"
-msgstr ""
-
-#: transfer-plugins/bittorrent/advanceddetails/peerview.cpp:53
-msgid "Ban Peer"
-msgstr ""
-
 #: transfer-plugins/bittorrent/advanceddetails/fileview.cpp:66
 msgctxt "Open file"
 msgid "Open"
@@ -1370,491 +1473,459 @@
 msgid "Select a directory to move the data to."
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:32
-#. i18n: ectx: property (text), widget (QTreeWidget, enginesTreeWidget)
-#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:124
-#: rc.cpp:197
-msgid "URL"
+#: transfer-plugins/bittorrent/bttransferfactory.cpp:34
+msgid "Cannot initialize libktorrent. Torrent support might not work."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:125
-msgid "Speed"
-msgstr "Cyflymder"
-
-#: transfer-plugins/bittorrent/advanceddetails/webseedsmodel.cpp:127
-#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:148
-#: ui/history/transferhistory.cpp:245
-msgid "Status"
+#: transfer-plugins/bittorrent/bttransferfactory.cpp:84
+msgid "&Advanced Details"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:51
-#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:55
-#, kde-format
-msgid "Advanced Details for %1"
+#: transfer-plugins/bittorrent/bttransferfactory.cpp:90
+msgid "&Scan Files"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:71
-msgid "Trackers"
+#: transfer-plugins/bittorrent/bttransfer.cpp:138
+msgid "Downloading Torrent File...."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/btadvanceddetailswidget.cpp:74
-msgid "Webseeds"
+#: transfer-plugins/bittorrent/bttransfer.cpp:180
+#: transfer-plugins/bittorrent/bttransfer.cpp:283
+msgctxt "transfer state: downloading"
+msgid "Downloading...."
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:21
-#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
-#: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:86 rc.cpp:370
-msgid "Add Tracker"
+#: transfer-plugins/bittorrent/bttransfer.cpp:257
+msgid "Cannot add a tracker to a private torrent."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:86
-msgid "Enter the URL of the tracker:"
+#: transfer-plugins/bittorrent/bttransfer.cpp:418
+msgid "Torrent file does not exist"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackerview.cpp:101
-#, kde-format
-msgid "There already is a tracker named <b>%1</b>."
+#: transfer-plugins/bittorrent/bttransfer.cpp:423
+msgid "Analyzing torrent...."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/iwfilelistmodel.cpp:84
-msgctxt "Download Normal (not as first or last)"
-msgid "Normal"
+#: transfer-plugins/bittorrent/bttransfer.cpp:435
+msgid "Cannot initialize port..."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:147
-msgid "Url"
+#: transfer-plugins/bittorrent/bttransfer.cpp:504
+msgctxt "Transfer status: seeding"
+msgid "Seeding...."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:149
-msgid "Seeders"
+#: transfer-plugins/bittorrent/btsettingswidget.cpp:37
+msgid "Select a default torrent folder"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:150
-msgid "Leechers"
+#: transfer-plugins/bittorrent/btsettingswidget.cpp:39
+msgid "Select a default temporary folder"
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:151
-msgid "Times Downloaded"
+#: ui/newtransferdialog.cpp:318
+msgid "Select at least one source url."
 msgstr ""
 
-#: transfer-plugins/bittorrent/advanceddetails/trackermodel.cpp:152
-msgid "Next Update"
+#: ui/newtransferdialog.cpp:336
+msgid "Files that exist already in the current folder have been marked."
 msgstr ""
 
-#: transfer-plugins/checksumsearch/checksumsearch.cpp:30
-msgid "Append"
-msgstr ""
+#: ui/tray.cpp:45
+msgid "Download Manager"
+msgstr "Trefnydd Lawrlwytho"
 
-#: transfer-plugins/checksumsearch/checksumsearch.cpp:30
-msgid "Replace file"
+#: ui/transfersettingsdialog.cpp:32
+#, kde-format
+msgid "Transfer Settings for %1"
 msgstr ""
 
-#: transfer-plugins/checksumsearch/checksumsearch.cpp:30
-msgid "Replace file-ending"
+#: ui/transfersettingsdialog.cpp:164
+msgid ""
+"Changing the destination did not work, the destination stays unmodified."
 msgstr ""
 
-#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:42
-msgid "Add item"
+#: ui/transfersettingsdialog.cpp:164
+msgid "Destination unmodified"
 msgstr ""
 
-#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:70
-#, kde-format
-msgid "%1 would become %2"
+#: ui/metalinkcreator/filedlg.cpp:66 ui/metalinkcreator/filedlg.cpp:174
+#: ui/metalinkcreator/dragdlg.cpp:90
+msgctxt "comma, to seperate members of a list"
+msgid ","
 msgstr ""
 
-#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:192
-msgctxt "the string that is used to modify an url"
-msgid "Change string"
+#: ui/metalinkcreator/filedlg.cpp:115
+msgid "File Properties"
 msgstr ""
 
-#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:193
-msgctxt "the mode defines how the url should be changed"
-msgid "Change mode"
+#: ui/metalinkcreator/filedlg.cpp:127
+msgid "Enter a filename."
 msgstr ""
 
-#: transfer-plugins/checksumsearch/dlgchecksumsearch.cpp:194
-msgctxt "the type of the checksum e.g. md5"
-msgid "Checksum type"
+#: ui/metalinkcreator/filedlg.cpp:130
+msgid "The filename exists already, choose a different one."
 msgstr ""
 
-#: transfer-plugins/contentfetch/contentfetch.cpp:52
-msgctxt "Transfer state: processing script"
-msgid "Processing script...."
+#: ui/metalinkcreator/filedlg.cpp:133
+msgid "Enter at least one URL."
 msgstr ""
 
-#: transfer-plugins/contentfetch/contentfetch.cpp:83
-msgctxt "Transfer State: Finished"
-msgid "Finished"
+#: ui/metalinkcreator/dragdlg.cpp:67
+msgid "Import dropped files"
 msgstr ""
 
-#: transfer-plugins/contentfetch/contentfetch.cpp:92
-msgctxt "Transfer State: Aborted"
-msgid "Aborted"
+#: ui/metalinkcreator/metalinkcreator.cpp:90
+msgid "Create a Metalink"
 msgstr ""
 
-#: transfer-plugins/contentfetch/dlgscriptediting.cpp:25
-msgid "Add New Script"
+#: ui/metalinkcreator/metalinkcreator.cpp:117
+msgid "Add at least one file."
 msgstr ""
 
-#: transfer-plugins/contentfetch/dlgscriptediting.cpp:37
-msgid "Edit Script"
+#: ui/metalinkcreator/metalinkcreator.cpp:119
+msgid "You need to set mirrors for the entries with an icon."
 msgstr ""
 
-#: transfer-plugins/contentfetch/dlgscriptediting.cpp:48
-msgid "Set Script File"
+#: ui/metalinkcreator/metalinkcreator.cpp:132
+msgid "General optional information for the metalink."
 msgstr ""
 
-#: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.cpp:116
-msgctxt "Configure script"
-msgid "Configure script"
+#: ui/metalinkcreator/metalinkcreator.cpp:161
+#, kde-format
+msgid "Unable to load: %1"
 msgstr ""
 
-#: ui/signaturedlg.cpp:33
-msgctxt "trust level"
-msgid "Unknown"
+#: ui/metalinkcreator/metalinkcreator.cpp:188
+msgid "Metalink Version 4.0 file (*.meta4)"
 msgstr ""
 
-#: ui/signaturedlg.cpp:33
-msgctxt "trust level"
-msgid "Undefined"
+#: ui/metalinkcreator/metalinkcreator.cpp:188
+msgid "Metalink Version 3.0 file (*.metalink)"
 msgstr ""
 
-#: ui/signaturedlg.cpp:33
-msgctxt "trust level"
-msgid "Never"
+#: ui/metalinkcreator/metalinkcreator.cpp:195
+msgid "Define the saving location."
 msgstr ""
 
-#: ui/signaturedlg.cpp:33
-msgctxt "trust level"
-msgid "Marginal"
+#: ui/metalinkcreator/metalinkcreator.cpp:241
+msgctxt "file as in file on hard drive"
+msgid "Files"
 msgstr ""
 
-#: ui/signaturedlg.cpp:33
-msgctxt "trust level"
-msgid "Full"
+#: ui/transfersview.cpp:126
+msgid "Select columns"
 msgstr ""
 
-#: ui/signaturedlg.cpp:33
-msgctxt "trust level"
-msgid "Ultimate"
+#: ui/transfersview.cpp:314
+msgid "Transfer Details"
 msgstr ""
 
-#: ui/signaturedlg.cpp:40
+#: ui/groupsettingsdialog.cpp:25
 #, kde-format
-msgctxt ""
-"Signature here is meant in cryptographic terms, so the signature of a file."
-msgid "Signature of %1."
+msgid "Group Settings for %1"
 msgstr ""
 
-#: ui/signaturedlg.cpp:59
-msgid "This option is not supported for the current transfer."
+#: ui/renamefile.cpp:32
+msgid "Rename File"
 msgstr ""
 
-#: ui/signaturedlg.cpp:91
-msgid "Detached OpenPGP ASCII signature (*.asc)"
+#: ui/renamefile.cpp:41
+#, kde-format
+msgid "Rename %1 to:"
 msgstr ""
 
-#: ui/signaturedlg.cpp:92
-msgid "Detached OpenPGP binary signature (*.sig)"
+#: ui/renamefile.cpp:44
+msgid "&Rename"
 msgstr ""
 
-#: ui/signaturedlg.cpp:92
-msgid "Load Signature File"
+#: ui/transferdetails.cpp:71
+#, kde-format
+msgid "Average speed: %1/s"
 msgstr ""
 
-#: ui/signaturedlg.cpp:105
-msgid "You need to define a signature."
-msgstr ""
+#: ui/transferdetails.cpp:77
+#, kde-format
+msgid "%1 of %2"
+msgstr "%1 o %2"
 
-#: ui/signaturedlg.cpp:109
-msgid ""
-"No fingerprint could be found, check if the signature is correct or verify "
-"the download."
+#: ui/contextmenu.cpp:77
+msgid "Semantic Desktop"
 msgstr ""
 
-#: ui/signaturedlg.cpp:139
-msgid "The key has been revoked."
-msgstr ""
+#: ui/contextmenu.cpp:142 mainwindow.cpp:198
+msgid "Delete Group"
+msgid_plural "Delete Groups"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ui/signaturedlg.cpp:143
-msgid "The key is disabled."
-msgstr ""
+#: ui/contextmenu.cpp:146 mainwindow.cpp:204
+msgid "Rename Group..."
+msgid_plural "Rename Groups..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ui/signaturedlg.cpp:147
-msgid "The key is invalid."
+#: ui/linkview/kget_linkview.cpp:43
+msgid "Import Links"
 msgstr ""
 
-#: ui/signaturedlg.cpp:152
-msgid "The key is expired."
+#: ui/linkview/kget_linkview.cpp:62
+msgid "Contains"
 msgstr ""
 
-#: ui/signaturedlg.cpp:167
-msgid "The key is not to be trusted."
+#: ui/linkview/kget_linkview.cpp:63
+msgid "Does Not Contain"
 msgstr ""
 
-#: ui/signaturedlg.cpp:173
-msgid "The key is to be trusted marginally."
+#: ui/linkview/kget_linkview.cpp:67
+msgid "All"
 msgstr ""
 
-#: ui/signaturedlg.cpp:189
-msgid "Trust level of the key is unclear."
+#: ui/linkview/kget_linkview.cpp:68
+msgid "Videos"
 msgstr ""
 
-#: ui/signaturedlg.cpp:219
-msgid "Unlimited"
+#: ui/linkview/kget_linkview.cpp:69
+msgid "Images"
 msgstr ""
 
-#: ui/signaturedlg.cpp:233 ui/signaturedlg.cpp:241
-msgctxt "pgp signature is verified"
-msgid "Verified"
+#: ui/linkview/kget_linkview.cpp:70
+msgid "Audio"
 msgstr ""
 
-#: ui/signaturedlg.cpp:245
-msgctxt "pgp signature is not verified"
-msgid "Failed"
+#: ui/linkview/kget_linkview.cpp:71
+msgid "Archives"
 msgstr ""
 
-#: ui/signaturedlg.cpp:248
-msgid ""
-"Caution: Verification failed. Either you entered the wrong signature, or the "
-"data has been modified."
+#: ui/linkview/kget_linkview.cpp:77
+msgctxt "of a filter, e.g. RegExp or Wildcard"
+msgid "Pattern Syntax"
 msgstr ""
 
-#: ui/signaturedlg.cpp:253
-msgid ""
-"Verification not possible. Check the entered data, whether gpg-agent is "
-"running, or whether you have an Internet connection (for retrieving keys.)"
+#: ui/linkview/kget_linkview.cpp:78
+msgid "Escape Sequences"
 msgstr ""
 
-#: ui/signaturedlg.cpp:266
-msgid "Feature is not supported, as KGet is not compiled with QPGME support."
+#: ui/linkview/kget_linkview.cpp:81
+msgid "Regular Expression"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:37
-msgid "Import Links"
+#: ui/linkview/kget_linkview.cpp:91
+msgctxt "name of a file"
+msgid "Name"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:75
-msgctxt "of a filter, e.g. RegExp or Wildcard"
-msgid "Pattern Syntax"
-msgstr ""
-
-#: ui/linkview/kget_linkview.cpp:76
-msgid "Escape Sequences"
-msgstr ""
-
-#: ui/linkview/kget_linkview.cpp:79
-msgid "Regular Expression"
-msgstr ""
-
-#: ui/linkview/kget_linkview.cpp:91
+#: ui/linkview/kget_linkview.cpp:121
 msgctxt "Download the items which have been selected"
-msgid "&Download Checked"
+msgid "&Download"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:128
+#: ui/linkview/kget_linkview.cpp:162
 msgid "Auxiliary header"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:129
+#: ui/linkview/kget_linkview.cpp:163
 msgid "File Name"
 msgstr "Enw Ffeil"
 
 #. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:37
 #. i18n: ectx: property (text), widget (QTreeWidget, scriptTreeWidget)
-#: ui/linkview/kget_linkview.cpp:130 rc.cpp:430
+#: ui/linkview/kget_linkview.cpp:164 rc.cpp:200
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: ui/linkview/kget_linkview.cpp:131
+#: ui/linkview/kget_linkview.cpp:165
 msgctxt "list header: type of file"
 msgid "File Type"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:132
+#: ui/linkview/kget_linkview.cpp:166
 msgid "Location (URL)"
 msgstr "Lleoliad (URL)"
 
-#: ui/linkview/kget_linkview.cpp:221
+#: ui/linkview/kget_linkview.cpp:270
 #, kde-format
 msgid "Links in: %1 - KGet"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:289
+#: ui/linkview/kget_linkview.cpp:342
 msgid "&Select All Filtered"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:227
+#. i18n: file: ui/linkview/importlinkdialog.ui:180
 #. i18n: ectx: property (text), widget (KPushButton, selectAll)
-#: ui/linkview/kget_linkview.cpp:289 rc.cpp:549
+#: ui/linkview/kget_linkview.cpp:342 rc.cpp:769
 msgid "&Select All"
 msgstr ""
 
-#: ui/linkview/kget_linkview.cpp:290
+#: ui/linkview/kget_linkview.cpp:343
 msgid "D&eselect All Filtered"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:217
+#. i18n: file: ui/linkview/importlinkdialog.ui:196
 #. i18n: ectx: property (text), widget (KPushButton, deselectAll)
-#: ui/linkview/kget_linkview.cpp:290 rc.cpp:546
+#: ui/linkview/kget_linkview.cpp:343 rc.cpp:772
 msgid "D&eselect All"
 msgstr ""
 
-#: ui/groupsettingsdialog.cpp:25
-#, kde-format
-msgid "Group Settings for %1"
-msgstr ""
-
-#: ui/newtransferdialog.cpp:320
-msgid "Select at least one source url."
+#: ui/linkview/kget_linkview.cpp:466
+msgid "Filter Column"
 msgstr ""
 
-#: ui/newtransferdialog.cpp:376
-msgid "Files that exist already in the current folder have been marked."
+#: ui/mirror/mirrorsettings.cpp:52
+msgid "Add mirror"
 msgstr ""
 
-#: ui/renamefile.cpp:32
-msgid "Rename File"
+#: ui/mirror/mirrorsettings.cpp:149
+msgid "Modify the used mirrors"
 msgstr ""
 
-#: ui/renamefile.cpp:41
-#, kde-format
-msgid "Rename %1 to:"
+#. i18n: file: ui/mirror/mirroradddlg.ui:72
+#. i18n: ectx: property (specialValueText), widget (KIntNumInput, priority)
+#: ui/mirror/mirrormodel.cpp:214 ui/mirror/mirrormodel.cpp:232 rc.cpp:793
+msgid "not specified"
 msgstr ""
 
-#: ui/renamefile.cpp:44
-msgid "&Rename"
+#: ui/mirror/mirrormodel.cpp:388
+msgctxt "Mirror as in server, in url"
+msgid "Mirror"
 msgstr ""
 
-#: ui/transferdetails.cpp:74
-#, kde-format
-msgid "Average speed: %1/s"
+#: ui/mirror/mirrormodel.cpp:391
+msgctxt "The priority of the mirror"
+msgid "Priority"
 msgstr ""
 
-#: ui/transferdetails.cpp:80
-#, kde-format
-msgid "%1 of %2"
-msgstr "%1 o %2"
-
-#: ui/history/transferhistory.cpp:48
-msgid "Transfer History"
+#: ui/mirror/mirrormodel.cpp:396
+msgctxt "Number of paralell connections to the mirror"
+msgid "Connections"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:81
-msgid "&Open File"
+#: ui/mirror/mirrormodel.cpp:398
+msgctxt "Location = country"
+msgid "Location"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:210
-msgctxt "The transfer is running"
-msgid "Running"
+#: ui/signaturedlg.cpp:37
+msgctxt "trust level"
+msgid "Unknown"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:212
-msgctxt "The transfer is stopped"
-msgid "Stopped"
+#: ui/signaturedlg.cpp:37
+msgctxt "trust level"
+msgid "Undefined"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:214
-msgctxt "The transfer is aborted"
-msgid "Aborted"
+#: ui/signaturedlg.cpp:37
+msgctxt "trust level"
+msgid "Never"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:216
-msgctxt "The transfer is finished"
-msgid "Finished"
+#: ui/signaturedlg.cpp:37
+msgctxt "trust level"
+msgid "Marginal"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:245
-msgid "Source File"
+#: ui/signaturedlg.cpp:37
+msgctxt "trust level"
+msgid "Full"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:245
-msgid "Destination"
+#: ui/signaturedlg.cpp:37
+msgctxt "trust level"
+msgid "Ultimate"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:245
-msgid "Time"
+#: ui/signaturedlg.cpp:44
+#, kde-format
+msgctxt ""
+"Signature here is meant in cryptographic terms, so the signature of a file."
+msgid "Signature of %1."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:245
-msgid "File Size"
+#: ui/signaturedlg.cpp:68
+msgid "This option is not supported for the current transfer."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:255
-msgid "Less than 1MiB"
+#: ui/signaturedlg.cpp:93
+msgid "Detached OpenPGP ASCII signature (*.asc)"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:257
-msgid "Between 1MiB-10MiB"
+#: ui/signaturedlg.cpp:94
+msgid "Detached OpenPGP binary signature (*.sig)"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:259
-msgid "Between 10MiB-100MiB"
+#: ui/signaturedlg.cpp:94
+msgid "Load Signature File"
 msgstr ""
 
-#: ui/history/transferhistory.cpp:261
-msgid "Between 100MiB-1GiB"
+#: ui/signaturedlg.cpp:147
+msgid "You need to define a signature."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:263
-msgid "More than 1GiB"
+#: ui/signaturedlg.cpp:151
+msgid ""
+"No fingerprint could be found, check if the signature is correct or verify "
+"the download."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:266
-#: ui/history/transferhistorycategorizeddelegate.cpp:45
-msgid "Today"
+#: ui/signaturedlg.cpp:185
+msgid "The key has been revoked."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:267
-#: ui/history/transferhistorycategorizeddelegate.cpp:49
-msgid "Last week"
+#: ui/signaturedlg.cpp:189
+msgid "The key is disabled."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:268
-msgid "Last month"
+#: ui/signaturedlg.cpp:193
+msgid "The key is invalid."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:269
-#: ui/history/transferhistorycategorizeddelegate.cpp:57
-msgid "A long time ago"
+#: ui/signaturedlg.cpp:198
+msgid "The key is expired."
 msgstr ""
 
-#: ui/history/transferhistory.cpp:289
-msgctxt "the transfer has been finished"
-msgid "Finished"
+#: ui/signaturedlg.cpp:213
+msgid "The key is not to be trusted."
 msgstr ""
 
-#: ui/history/transferhistorycategorizeddelegate.cpp:53
-msgid "Last Month"
+#: ui/signaturedlg.cpp:218
+msgid "The key is to be trusted marginally."
 msgstr ""
 
-#: ui/history/transferhistorycategorizeddelegate.cpp:77
-msgid "Under 10MiB"
+#: ui/signaturedlg.cpp:231
+msgid "Trust level of the key is unclear."
 msgstr ""
 
-#: ui/history/transferhistorycategorizeddelegate.cpp:80
-msgid "Between 10MiB and 50MiB"
+#: ui/signaturedlg.cpp:260
+msgid "Unlimited"
 msgstr ""
 
-#: ui/history/transferhistorycategorizeddelegate.cpp:84
-msgid "Between 50MiB and 100MiB"
+#: ui/signaturedlg.cpp:278
+msgctxt "pgp signature is verified"
+msgid "Verified"
 msgstr ""
 
-#: ui/history/transferhistorycategorizeddelegate.cpp:89
-msgid "More than 100MiB"
+#: ui/signaturedlg.cpp:281
+msgctxt "pgp signature is not verified"
+msgid "Failed"
 msgstr ""
 
-#: ui/history/transferhistoryitemdelegate.cpp:41
-msgid "Download again"
+#: ui/signaturedlg.cpp:284
+msgid ""
+"Caution: Verification failed. Either you entered the wrong signature, or the "
+"data has been modified."
 msgstr ""
 
-#: ui/history/transferhistoryitemdelegate.cpp:46
-msgctxt "Delete selected history-item"
-msgid "Delete selected"
+#: ui/signaturedlg.cpp:289
+msgid ""
+"Verification not possible. Check the entered data, whether gpg-agent is "
+"running, or whether you have an Internet connection (for retrieving keys.)"
 msgstr ""
 
-#: ui/history/transferhistoryitemdelegate.cpp:51
-msgid "Open file"
+#: ui/signaturedlg.cpp:306
+msgid "Feature is not supported, as KGet is not compiled with QPGME support."
 msgstr ""
 
 #: ui/droptarget.cpp:84
@@ -1862,56 +1933,54 @@
 msgid "Sticky"
 msgstr ""
 
-#. i18n: file: conf/dlgadvanced.ui:41
+#. i18n: file: conf/dlgadvanced.ui:34
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_AfterFinishAction)
-#: ui/droptarget.cpp:91 rc.cpp:14
+#: ui/droptarget.cpp:91 mainwindow.cpp:361 rc.cpp:122
 msgid "Quit KGet"
 msgstr ""
 
-#: ui/droptarget.cpp:219 mainwindow.cpp:1119
+#: ui/droptarget.cpp:224 mainwindow.cpp:1212
 msgid "The dropped file is a KGet Transfer List"
 msgstr ""
 
-#: ui/droptarget.cpp:220 mainwindow.cpp:1120
+#: ui/droptarget.cpp:225 mainwindow.cpp:1213
 msgid "&Download"
 msgstr ""
 
-#: ui/droptarget.cpp:221 mainwindow.cpp:1121
+#: ui/droptarget.cpp:226 mainwindow.cpp:1214
 msgid "&Load transfer list"
 msgstr ""
 
-#: ui/droptarget.cpp:277
+#: ui/droptarget.cpp:282
 msgid "Show Main Window"
 msgstr ""
 
-#: ui/droptarget.cpp:278
+#: ui/droptarget.cpp:283
 msgid "Hide Main Window"
 msgstr ""
 
-#. i18n: file: conf/dlgappearance.ui:33
-#. i18n: ectx: property (title), widget (QGroupBox, dropTargetGroup)
-#: ui/droptarget.cpp:369 rc.cpp:173
+#: ui/droptarget.cpp:374
 msgid "Drop Target"
 msgstr ""
 
-#: ui/droptarget.cpp:370
+#: ui/droptarget.cpp:375
 msgid "You can drag download links into the drop target."
 msgstr ""
 
-#: ui/droptarget.cpp:415
+#: ui/droptarget.cpp:420
 #, kde-format
 msgctxt "%1 filename, %2 total size, %3 status"
 msgid "%1(%2) %3"
 msgstr ""
 
-#: ui/droptarget.cpp:421
+#: ui/droptarget.cpp:426
 #, kde-format
 msgctxt ""
 "%1 filename, %2 percent complete, %3 downloaded out of %4 total size"
 msgid "%1(%2% %3/%4) Speed:%5/s"
 msgstr ""
 
-#: ui/droptarget.cpp:429
+#: ui/droptarget.cpp:434
 #, kde-format
 msgctxt ""
 "%1 filename, %2 percent complete, %3 downloaded out of %4 total size, %5 "
@@ -1919,302 +1988,276 @@
 msgid "%1(%2% %3/%4) %5"
 msgstr ""
 
-#: ui/droptarget.cpp:443
+#: ui/droptarget.cpp:448
 msgid "Ready"
 msgstr ""
 
-#: ui/droptarget.cpp:457
-msgid ""
-"Drop target has been hidden. If you want to show it again, go to Settings-"
-">Configure KGet->Look & Feel."
+#: ui/history/transferhistory.cpp:49
+msgid "Transfer History"
 msgstr ""
 
-#: ui/droptarget.cpp:459
-msgid "Hiding drop target"
+#: ui/history/transferhistory.cpp:82
+msgid "&Open File"
 msgstr ""
 
-#: ui/verificationdialog.cpp:37
-msgid "Add checksum"
+#: ui/history/transferhistory.cpp:216
+msgctxt "The transfer is running"
+msgid "Running"
 msgstr ""
 
-#: ui/verificationdialog.cpp:101
-#, kde-format
-msgid "Transfer Verification for %1"
+#: ui/history/transferhistory.cpp:218
+msgctxt "The transfer is stopped"
+msgid "Stopped"
 msgstr ""
 
-#: ui/verificationdialog.cpp:214
-#, kde-format
-msgid "%1 was successfully verified."
+#: ui/history/transferhistory.cpp:220
+msgctxt "The transfer is aborted"
+msgid "Aborted"
 msgstr ""
 
-#: ui/verificationdialog.cpp:215
-msgid "Verification successful"
+#: ui/history/transferhistory.cpp:222
+msgctxt "The transfer is finished"
+msgid "Finished"
 msgstr ""
 
-#: ui/metalinkcreator/filedlg.cpp:61 ui/metalinkcreator/filedlg.cpp:172
-#: ui/metalinkcreator/dragdlg.cpp:90
-msgctxt "comma, to seperate members of a list"
-msgid ","
+#: ui/history/transferhistory.cpp:251
+msgid "Source File"
 msgstr ""
 
-#: ui/metalinkcreator/filedlg.cpp:110
-msgid "File Properties"
+#: ui/history/transferhistory.cpp:251
+msgid "Destination"
 msgstr ""
 
-#: ui/metalinkcreator/filedlg.cpp:122
-msgid "Enter a filename."
+#: ui/history/transferhistory.cpp:251
+msgid "Time"
 msgstr ""
 
-#: ui/metalinkcreator/filedlg.cpp:125
-msgid "The filename exists already, choose a different one."
+#: ui/history/transferhistory.cpp:251
+msgid "File Size"
 msgstr ""
 
-#: ui/metalinkcreator/filedlg.cpp:128
-msgid "Enter at least one URL."
+#: ui/history/transferhistory.cpp:261
+msgid "Less than 1MiB"
 msgstr ""
 
-#: ui/metalinkcreator/dragdlg.cpp:67
-msgid "Import dropped files"
+#: ui/history/transferhistory.cpp:263
+msgid "Between 1MiB-10MiB"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:90
-msgid "Create a Metalink"
+#: ui/history/transferhistory.cpp:265
+msgid "Between 10MiB-100MiB"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:117
-msgid "Add at least one file."
+#: ui/history/transferhistory.cpp:267
+msgid "Between 100MiB-1GiB"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/files.ui:119
-#. i18n: ectx: property (text), widget (QLabel, needUrl)
-#: rc.cpp:757
-msgid "You need to set mirrors for the entries with an icon."
+#: ui/history/transferhistory.cpp:269
+msgid "More than 1GiB"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:127
-msgid "General optional information for the metalink."
+#: ui/history/transferhistory.cpp:272
+#: ui/history/transferhistorycategorizeddelegate.cpp:45
+msgid "Today"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:156
-#, kde-format
-msgid "Unable to load: %1"
+#: ui/history/transferhistory.cpp:273
+#: ui/history/transferhistorycategorizeddelegate.cpp:49
+msgid "Last week"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:183
-msgid "Metalink Version 4.0 file (*.meta4)"
+#: ui/history/transferhistory.cpp:274
+msgid "Last month"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:183
-msgid "Metalink Version 3.0 file (*.metalink)"
+#: ui/history/transferhistory.cpp:275
+#: ui/history/transferhistorycategorizeddelegate.cpp:57
+msgid "A long time ago"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:189
-msgid "Define the saving location."
+#: ui/history/transferhistory.cpp:295
+msgctxt "the transfer has been finished"
+msgid "Finished"
 msgstr ""
 
-#: ui/metalinkcreator/metalinkcreator.cpp:241
-msgctxt "file as in file on hard drive"
-msgid "Files"
+#: ui/history/transferhistorycategorizeddelegate.cpp:53
+msgid "Last Month"
 msgstr ""
 
-#: ui/transfersettingsdialog.cpp:32
-#, kde-format
-msgid "Transfer Settings for %1"
+#: ui/history/transferhistorycategorizeddelegate.cpp:77
+msgid "Under 10MiB"
 msgstr ""
 
-#: ui/transfersettingsdialog.cpp:161
-msgid ""
-"Changing the destination did not work, the destination stays unmodified."
+#: ui/history/transferhistorycategorizeddelegate.cpp:80
+msgid "Between 10MiB and 50MiB"
 msgstr ""
 
-#: ui/transfersettingsdialog.cpp:161
-msgid "Destination unmodified"
+#: ui/history/transferhistorycategorizeddelegate.cpp:84
+msgid "Between 50MiB and 100MiB"
 msgstr ""
 
-#: ui/contextmenu.cpp:77
-msgid "Semantic Desktop"
+#: ui/history/transferhistorycategorizeddelegate.cpp:89
+msgid "More than 100MiB"
 msgstr ""
 
-#: ui/contextmenu.cpp:150 mainwindow.cpp:207
-msgid "Delete Group"
-msgid_plural "Delete Groups"
-msgstr[0] ""
-msgstr[1] ""
+#: ui/history/transferhistoryitemdelegate.cpp:41
+msgid "Download again"
+msgstr ""
 
-#: ui/contextmenu.cpp:154 mainwindow.cpp:212
-msgid "Rename Group..."
-msgid_plural "Rename Groups..."
-msgstr[0] ""
-msgstr[1] ""
+#: ui/history/transferhistoryitemdelegate.cpp:46
+msgctxt "Delete selected history-item"
+msgid "Delete selected"
+msgstr ""
 
-#: ui/tray.cpp:45
-msgid "Download Manager"
-msgstr "Trefnydd Lawrlwytho"
+#: ui/history/transferhistoryitemdelegate.cpp:51
+msgid "Open file"
+msgstr ""
 
-#: ui/transfersview.cpp:126
-msgid "Select columns"
+#: ui/verificationdialog.cpp:39
+msgid "Add checksum"
 msgstr ""
 
-#: ui/transfersview.cpp:314
-msgid "Transfer Details"
+#: ui/verificationdialog.cpp:96
+#, kde-format
+msgid "Transfer Verification for %1"
 msgstr ""
 
-#. i18n: file: ui/mirror/mirroradddlg.ui:82
-#. i18n: ectx: property (specialValueText), widget (KIntNumInput, priority)
-#: ui/mirror/mirrormodel.cpp:214 ui/mirror/mirrormodel.cpp:232 rc.cpp:926
-msgid "not specified"
+#: ui/verificationdialog.cpp:209
+#, kde-format
+msgid "%1 was successfully verified."
 msgstr ""
 
-#: ui/mirror/mirrormodel.cpp:388
-msgctxt "Mirror as in server, in url"
-msgid "Mirror"
-msgstr ""
-
-#: ui/mirror/mirrormodel.cpp:391
-msgctxt "The priority of the mirror"
-msgid "Priority"
-msgstr ""
-
-#: ui/mirror/mirrormodel.cpp:396
-msgctxt "Number of paralell connections to the mirror"
-msgid "Connections"
-msgstr ""
-
-#: ui/mirror/mirrormodel.cpp:398
-msgctxt "Location = country"
-msgid "Location"
-msgstr ""
-
-#: ui/mirror/mirrorsettings.cpp:44
-msgid "Add mirror"
+#: ui/verificationdialog.cpp:210
+msgid "Verification successful"
 msgstr ""
 
-#: ui/mirror/mirrorsettings.cpp:163
-msgid "Modify the used mirrors."
+#: extensions/webinterface/httpserver.cpp:42
+#: extensions/webinterface/httpserver.cpp:58
+msgid "Unable to start WebInterface: Could not open KWallet"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:36
+#: extensions/webinterface/httpserver.cpp:63
 #, kde-format
 msgctxt "@info"
-msgid "Unable to start the server: %1."
+msgid "Unable to start WebInterface: %1"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:88
+#: extensions/webinterface/httpserver.cpp:122
 #, kde-format
 msgctxt "@item speed of transfer per seconds"
 msgid "%1/s"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:175
+#: extensions/webinterface/httpserver.cpp:209
 msgctxt "@label"
 msgid "KGet Web Interface"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:176
+#: extensions/webinterface/httpserver.cpp:210
 msgctxt "@label number"
 msgid "Nr"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:177
+#: extensions/webinterface/httpserver.cpp:211
 msgctxt "@label"
 msgid "File name"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:178
+#: extensions/webinterface/httpserver.cpp:212
 msgctxt "@label Progress of transfer"
 msgid "Finished"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:179
+#: extensions/webinterface/httpserver.cpp:213
 msgctxt "@label Speed of transfer"
 msgid "Speed"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:180
+#: extensions/webinterface/httpserver.cpp:214
 msgctxt "@label Status of transfer"
 msgid "Status"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:181
+#: extensions/webinterface/httpserver.cpp:215
 msgctxt "@action:button start a transfer"
 msgid "Start"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:182
+#: extensions/webinterface/httpserver.cpp:216
 msgctxt "@action:button"
 msgid "Stop"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:183
+#: extensions/webinterface/httpserver.cpp:217
 msgctxt "@action:button"
 msgid "Remove"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:184
+#: extensions/webinterface/httpserver.cpp:218
 msgctxt "@label Download from"
 msgid "Source:"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:185
+#: extensions/webinterface/httpserver.cpp:219
 msgctxt "@label Save download to"
 msgid "Saving to:"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:186
+#: extensions/webinterface/httpserver.cpp:220
 msgctxt "@label Title in header"
 msgid "Web Interface"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:187
+#: extensions/webinterface/httpserver.cpp:221
 msgctxt "@action"
 msgid "Settings"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:188
+#: extensions/webinterface/httpserver.cpp:222
 msgctxt "@action"
 msgid "Refresh"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:189
+#: extensions/webinterface/httpserver.cpp:223
 msgctxt "@action"
 msgid "Enter URL: "
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:190
+#: extensions/webinterface/httpserver.cpp:224
 msgctxt "@action:button"
 msgid "OK"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:192
+#: extensions/webinterface/httpserver.cpp:226
 msgctxt "@action Refresh download list every x (seconds)"
 msgid "Refresh download list every"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:193
+#: extensions/webinterface/httpserver.cpp:227
 msgctxt "@action (Refresh very x )seconds"
 msgid "seconds"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:194
+#: extensions/webinterface/httpserver.cpp:228
 msgctxt "@action:button"
 msgid "Save Settings"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:195
+#: extensions/webinterface/httpserver.cpp:229
 msgctxt "@title"
 msgid "Downloads"
 msgstr ""
 
-#: extensions/webinterface/httpserver.cpp:197
+#: extensions/webinterface/httpserver.cpp:231
 msgctxt "@label text in footer"
 msgid "KGet Web Interface | Valid XHTML 1.0 Strict &amp; CSS"
 msgstr ""
 
-#: main.cpp:125
+#: main.cpp:106
 msgid "An advanced download manager for KDE"
 msgstr ""
 
-#: main.cpp:127
+#: main.cpp:108
 msgid ""
 "(C) 2005 - 2011, The KGet developers\n"
 "(C) 2001 - 2002, Patrick Charbonnier\n"
@@ -2222,313 +2265,396 @@
 "(C) 1998 - 2000, Matej Koss"
 msgstr ""
 
-#: main.cpp:131
+#: main.cpp:112
 msgid "<a href=\"mailto:kget@kde.org\">kget@kde.org</a>"
 msgstr ""
 
-#: main.cpp:133
+#: main.cpp:114
 msgid "Lukas Appelhans"
 msgstr ""
 
-#: main.cpp:133
+#: main.cpp:114
 msgid "Maintainer, Core Developer, Torrent Plugin Author"
 msgstr ""
 
-#: main.cpp:134
+#: main.cpp:115
 msgid "Dario Massarin"
 msgstr ""
 
-#: main.cpp:134 main.cpp:135 main.cpp:137
+#: main.cpp:115 main.cpp:116 main.cpp:118
 msgid "Core Developer"
 msgstr ""
 
-#: main.cpp:135
+#: main.cpp:116
 msgid "Urs Wolfer"
 msgstr ""
 
-#: main.cpp:136
+#: main.cpp:117
 msgid "Manolo Valdes"
 msgstr ""
 
-#: main.cpp:136
+#: main.cpp:117
 msgid "Core Developer, Multithreaded Plugin Author"
 msgstr ""
 
-#: main.cpp:137
+#: main.cpp:118
 msgid "Matthias Fuchs"
 msgstr ""
 
-#: main.cpp:138
+#: main.cpp:119
 msgid "Javier Goday"
 msgstr ""
 
-#: main.cpp:138
+#: main.cpp:119
 msgid "Developer"
 msgstr ""
 
-#: main.cpp:139
+#: main.cpp:120
 msgid "Ernesto Rodriguez Ortiz"
 msgstr ""
 
-#: main.cpp:139
+#: main.cpp:120
 msgid "Mms Plugin Author"
 msgstr ""
 
-#: main.cpp:139
+#: main.cpp:121
 msgid "Patrick Charbonnier"
 msgstr ""
 
-#: main.cpp:139 main.cpp:140 main.cpp:141
+#: main.cpp:121 main.cpp:122 main.cpp:123
 msgid "Former Developer"
 msgstr ""
 
-#: main.cpp:140
+#: main.cpp:122
 msgid "Carsten Pfeiffer"
 msgstr ""
 
-#: main.cpp:141
+#: main.cpp:123
 msgid "Matej Koss"
 msgstr ""
 
-#: main.cpp:142
+#: main.cpp:124
 msgid "Joris Guisson"
 msgstr ""
 
-#: main.cpp:142
+#: main.cpp:124
 msgid "BTCore (KTorrent) Developer"
 msgstr ""
 
-#: main.cpp:143
+#: main.cpp:125
 msgid "Mensur Zahirovic (Nookie)"
 msgstr ""
 
-#: main.cpp:143
+#: main.cpp:125
 msgid "Design of Web Interface"
 msgstr ""
 
-#: main.cpp:148
+#: main.cpp:130
 msgid "Start KGet with drop target"
 msgstr "Dechrau KGet â tharged ollwng"
 
-#: main.cpp:149
+#: main.cpp:131
 msgid "Start KGet with hidden main window"
 msgstr ""
 
-#: main.cpp:150
+#: main.cpp:132
 msgid "Start KGet without drop target animation"
 msgstr ""
 
-#: main.cpp:152
+#: main.cpp:134
 msgid "Execute Unit Testing"
 msgstr ""
 
-#: main.cpp:154
+#: main.cpp:136
 msgid "URL(s) to download"
 msgstr ""
 
 #: mainwindow.cpp:142
-msgid "KGet Transfer List"
+msgid "&New Download..."
 msgstr ""
 
-#: mainwindow.cpp:149
-msgid "Export Transfers"
+#: mainwindow.cpp:145
+msgid "Opens a dialog to add a transfer to the list"
 msgstr ""
 
-#: mainwindow.cpp:159
-msgid "&New Download..."
+#: mainwindow.cpp:149
+msgid "&Import Transfers..."
 msgstr ""
 
-#: mainwindow.cpp:165
-msgid "&Import Transfers..."
+#: mainwindow.cpp:152
+msgid "Imports a list of transfers"
 msgstr ""
 
-#: mainwindow.cpp:171
+#: mainwindow.cpp:156
 msgid "&Export Transfers List..."
 msgstr ""
 
-#: mainwindow.cpp:177
-msgid "&Export Transfers as Plain Text..."
+#: mainwindow.cpp:159
+msgid "Exports the current transfers into a file"
 msgstr ""
 
-#: mainwindow.cpp:183
-msgid "&Create a Metalink"
+#: mainwindow.cpp:163
+msgid "&Create a Metalink..."
 msgstr ""
 
-#: mainwindow.cpp:187
+#: mainwindow.cpp:165
+msgid "Creates or modifies a metalink and saves it on disk"
+msgstr ""
+
+#: mainwindow.cpp:169
 msgid "Top Priority"
 msgstr ""
 
-#: mainwindow.cpp:192
+#: mainwindow.cpp:172
+msgid "Download selected transfer first"
+msgstr ""
+
+#: mainwindow.cpp:176
 msgid "Least Priority"
 msgstr ""
 
-#. i18n: file: conf/dlgintegration.ui:100
-#. i18n: ectx: property (text), widget (KPushButton, increase)
-#: mainwindow.cpp:197 rc.cpp:152
+#: mainwindow.cpp:179
+msgid "Download selected transfer last"
+msgstr ""
+
+#: mainwindow.cpp:183
 msgid "Increase Priority"
 msgstr ""
 
-#. i18n: file: conf/dlgintegration.ui:107
-#. i18n: ectx: property (text), widget (KPushButton, decrease)
-#: mainwindow.cpp:202 rc.cpp:155
+#: mainwindow.cpp:186
+msgid "Increase priority for selected transfer"
+msgstr ""
+
+#: mainwindow.cpp:190
 msgid "Decrease Priority"
 msgstr ""
 
-#: mainwindow.cpp:217
+#: mainwindow.cpp:193
+msgid "Decrease priority for selected transfer"
+msgstr ""
+
+#: mainwindow.cpp:200
+msgid "Delete selected group"
+msgstr ""
+
+#: mainwindow.cpp:209
 msgid "Set Icon..."
 msgstr ""
 
-#: mainwindow.cpp:222
+#: mainwindow.cpp:211
+msgid "Select a custom icon for the selected group"
+msgstr ""
+
+#: mainwindow.cpp:215
 msgid "Auto-Paste Mode"
 msgstr ""
 
-#: mainwindow.cpp:225
+#: mainwindow.cpp:218
 msgid ""
 "<b>Auto paste</b> button toggles the auto-paste mode on and off.\n"
 "When set, KGet will periodically scan the clipboard for URLs and paste them "
 "automatically."
 msgstr ""
 
-#: mainwindow.cpp:231
+#: mainwindow.cpp:224
 msgid "Use KGet as Konqueror Download Manager"
 msgstr ""
 
-#: mainwindow.cpp:249
+#: mainwindow.cpp:244
 msgctxt "delete selected transfer item"
 msgid "Remove Selected"
 msgstr ""
 
-#: mainwindow.cpp:255
+#: mainwindow.cpp:247
+msgid ""
+"Removes selected transfer and deletes files from disk if it's not finished"
+msgstr ""
+
+#: mainwindow.cpp:251
 msgctxt "delete all finished transfers"
 msgid "Remove All Finished"
 msgstr ""
 
-#: mainwindow.cpp:260
+#: mainwindow.cpp:253
+msgid "Removes all finished transfers and leaves all files on disk"
+msgstr ""
+
+#: mainwindow.cpp:257
+msgctxt "delete selected transfer item and files"
+msgid "Remove Selected and Delete Files"
+msgstr ""
+
+#: mainwindow.cpp:259
+msgid "Removes selected transfer and deletes files from disk in any case"
+msgstr ""
+
+#: mainwindow.cpp:263
 msgctxt "redownload selected transfer item"
 msgid "Redownload Selected"
 msgstr ""
 
-#: mainwindow.cpp:265
-msgid "Start / Resume All"
+#: mainwindow.cpp:268
+msgid "Start All"
 msgstr ""
 
 #: mainwindow.cpp:271
-msgid "Start / Resume Selected"
+msgid "Starts / resumes all transfers"
+msgstr ""
+
+#: mainwindow.cpp:275
+msgid "Start Selected"
+msgstr ""
+
+#: mainwindow.cpp:277
+msgid "Starts / resumes selected transfer"
+msgstr ""
+
+#: mainwindow.cpp:281
+msgid "Pause All"
 msgstr ""
 
-#: mainwindow.cpp:276
-msgid "Stop All"
+#: mainwindow.cpp:284
+msgid "Pauses all transfers"
 msgstr ""
 
-#: mainwindow.cpp:282
+#: mainwindow.cpp:288
 msgid "Stop Selected"
 msgstr ""
 
-#: mainwindow.cpp:286
-msgid "Start / Resume"
+#: mainwindow.cpp:290
+msgid "Pauses selected transfer"
 msgstr ""
 
-#: mainwindow.cpp:294
-msgid "Stop"
+#: mainwindow.cpp:293
+msgid "Start"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:62
-#. i18n: ectx: property (text), widget (QPushButton, removeEngineBt)
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:67
-#. i18n: ectx: property (text), widget (QPushButton, removeScriptButton)
-#: mainwindow.cpp:302 rc.cpp:203 rc.cpp:436
-msgid "Remove"
+#: mainwindow.cpp:301
+msgid "Pause"
 msgstr ""
 
-#: mainwindow.cpp:311
+#: mainwindow.cpp:310
 msgid "Open Destination"
 msgstr ""
 
-#: mainwindow.cpp:316 mainwindow.cpp:452
+#: mainwindow.cpp:315 mainwindow.cpp:503
 msgid "Open File"
 msgstr ""
 
-#: mainwindow.cpp:320
+#: mainwindow.cpp:319
 msgid "Show Details"
 msgstr ""
 
-#: mainwindow.cpp:325
+#: mainwindow.cpp:324
 msgid "Copy URL to Clipboard"
 msgstr ""
 
-#: mainwindow.cpp:330
+#: mainwindow.cpp:329
 msgid "&Transfer History"
 msgstr ""
 
-#: mainwindow.cpp:336
+#: mainwindow.cpp:335
 msgid "&Group Settings"
 msgstr ""
 
-#: mainwindow.cpp:342
+#: mainwindow.cpp:341
 msgid "&Transfer Settings"
 msgstr ""
 
-#: mainwindow.cpp:348
+#: mainwindow.cpp:347
 msgid "Import &Links..."
 msgstr ""
 
-#: mainwindow.cpp:381
+#: mainwindow.cpp:353
+msgid "After downloads finished action"
+msgstr ""
+
+#: mainwindow.cpp:355
+msgid ""
+"Choose an action that is executed after all downloads have been finished."
+msgstr ""
+
+#: mainwindow.cpp:357
+msgid "No Action"
+msgstr ""
+
+#: mainwindow.cpp:432
 msgid ""
 "This is the first time you have run KGet.\n"
 "Would you like to enable KGet as the download manager for Konqueror?"
 msgstr ""
 
-#: mainwindow.cpp:383
+#: mainwindow.cpp:434
 msgid "Konqueror Integration"
 msgstr "Cyfuno â Konqueror"
 
-#: mainwindow.cpp:383
+#: mainwindow.cpp:434
 msgid "Enable"
 msgstr "Galluogi"
 
-#: mainwindow.cpp:384
+#: mainwindow.cpp:435
 msgid "Do Not Enable"
 msgstr ""
 
-#: mainwindow.cpp:451
+#: mainwindow.cpp:502
 msgid "All Openable Files"
 msgstr ""
 
-#: mainwindow.cpp:468
+#: mainwindow.cpp:519
 #, kde-format
 msgctxt "window title including overall download progress in percent"
 msgid "KGet - %1%"
 msgstr ""
 
-#: mainwindow.cpp:518
+#: mainwindow.cpp:569
 msgid ""
 "Some transfers are still running.\n"
 "Are you sure you want to close KGet?"
 msgstr ""
 
-#: mainwindow.cpp:520
+#: mainwindow.cpp:571
 msgid "Confirm Quit"
 msgstr ""
 
-#: mainwindow.cpp:576
+#: mainwindow.cpp:598
+msgid "KGet Transfer List"
+msgstr ""
+
+#: mainwindow.cpp:598
+msgid "Text File"
+msgstr ""
+
+#: mainwindow.cpp:600
+msgid "Export Transfers"
+msgstr ""
+
+#: mainwindow.cpp:632
 msgid "Enter Group Name"
 msgstr ""
 
-#: mainwindow.cpp:577
+#: mainwindow.cpp:633
 msgid "Group name:"
 msgstr ""
 
-#: mainwindow.cpp:656
+#: mainwindow.cpp:720
 msgid "Are you sure you want to delete the selected transfer?"
 msgid_plural "Are you sure you want to delete the selected transfers?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mainwindow.cpp:658
+#: mainwindow.cpp:722 mainwindow.cpp:751
 msgid "Confirm transfer delete"
 msgstr ""
 
-#: mainwindow.cpp:998
+#: mainwindow.cpp:749
+msgid ""
+"Are you sure you want to delete the selected transfer including files?"
+msgid_plural ""
+"Are you sure you want to delete the selected transfers including files?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mainwindow.cpp:1092
 msgid ""
 "KGet has been temporarily disabled as download manager for Konqueror. If you "
 "want to disable it forever, go to Settings->Advanced and disable \"Use as "
@@ -2546,1217 +2672,1126 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
-#. i18n: file: conf/dlgadvanced.ui:17
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ExpertMode)
+#. i18n: file: conf/dlggroups.ui:17
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_DirectoriesAsSuggestion)
 #: rc.cpp:5
-msgid "Disable confirmation dialogs (less verbosity)"
+msgid "Use default folders for groups as suggestion"
 msgstr ""
 
-#. i18n: file: conf/dlgadvanced.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableSystemTray)
+#. i18n: file: conf/dlggroups.ui:24
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AskForDestination)
 #: rc.cpp:8
-msgid "Enable system tray icon"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AfterFinishActionEnabled)
-#: rc.cpp:11
-msgid "Execute action after all downloads have been finished:"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:49
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:17
-msgid "At startup:"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:57
-#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_StartupAction)
-#: rc.cpp:20
-msgid "Restore Download State"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:62
-#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_StartupAction)
-#: rc.cpp:23
-msgid "Start All Downloads"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:67
-#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_StartupAction)
-#: rc.cpp:26
-msgid "Stop All Downloads"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:77
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:29
-msgid "History"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:83
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:32
-msgid "History backend:"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:96
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_EnableKUIServerIntegration)
-#: rc.cpp:35
-msgid "Enable KDE global progress tracking"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:108
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExportSingleTransfer)
-#: rc.cpp:38
-msgid "Show every single download "
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:115
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExportGlobalJob)
-#: rc.cpp:41
-msgid "Show overall progress"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:125
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:44
-msgid "Handle existing files/transfers"
-msgstr ""
-
-#. i18n: file: conf/dlgadvanced.ui:131
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FilesAlwaysAsk)
-#: rc.cpp:47
-msgid "Always ask"
+msgid "Ask for destination if there are no default folders"
 msgstr ""
 
-#. i18n: file: conf/dlgadvanced.ui:138
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FilesAutomaticRename)
-#: rc.cpp:50
-msgid "Automatic rename"
+#. i18n: file: conf/dlggroups.ui:52
+#. i18n: ectx: property (text), widget (KPushButton, rename)
+#. i18n: file: ui/transfersettingsdialog.ui:156
+#. i18n: ectx: property (text), widget (KPushButton, rename)
+#: rc.cpp:11 rc.cpp:508
+msgid "Rename"
 msgstr ""
 
-#. i18n: file: conf/dlgadvanced.ui:145
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FilesOverwrite)
-#: rc.cpp:53
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#. i18n: file: conf/dlgnetwork.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_LimitDownloads)
-#: rc.cpp:44
-msgid "Limit Maximum Downloads Per Group"
+#. i18n: file: conf/dlggroups.ui:62
+#. i18n: ectx: property (text), widget (KIconButton, selectIcon)
+#: rc.cpp:14
+msgid "Select Icon..."
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:29
+#. i18n: file: conf/dlgnetwork.ui:19
 #. i18n: ectx: property (text), widget (QLabel, lbl_maxnum)
-#: rc.cpp:47
-msgid "Number of downloads:"
+#: rc.cpp:17
+msgid "Maximum downloads per group:"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:46
-#. i18n: ectx: property (text), widget (QLabel, lbl_maxnum_2)
-#: rc.cpp:50
-msgid "Downloads from the same server:"
+#. i18n: file: conf/dlgnetwork.ui:26
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_MaxConnections)
+#: rc.cpp:20
+msgctxt "no limit for maximum downloads has been set"
+msgid "No limit"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:63
+#. i18n: file: conf/dlgnetwork.ui:35
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_SpeedLimit)
-#: rc.cpp:53
+#: rc.cpp:23
 msgid "Speed Limit"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:72
+#. i18n: file: conf/dlgnetwork.ui:44
 #. i18n: ectx: property (text), widget (QLabel, dllimitlb)
-#: rc.cpp:56
-msgid "Global download limit:"
+#: rc.cpp:26
+msgid "Global &download limit:"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:79
+#. i18n: file: conf/dlgnetwork.ui:54
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_GlobalDownloadLimit)
-#. i18n: file: conf/dlgnetwork.ui:102
+#. i18n: file: conf/dlgnetwork.ui:80
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_GlobalUploadLimit)
-#. i18n: file: conf/dlgnetwork.ui:125
+#. i18n: file: conf/dlgnetwork.ui:103
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_TransferSpeedLimit)
-#: rc.cpp:59 rc.cpp:65 rc.cpp:71
+#. i18n: file: ui/transfersettingsdialog.ui:58
+#. i18n: ectx: property (suffix), widget (QSpinBox, uploadSpin)
+#. i18n: file: ui/transfersettingsdialog.ui:74
+#. i18n: ectx: property (suffix), widget (QSpinBox, downloadSpin)
+#. i18n: file: ui/groupsettingsdialog.ui:90
+#. i18n: ectx: property (suffix), widget (QSpinBox, downloadBox)
+#. i18n: file: ui/groupsettingsdialog.ui:109
+#. i18n: ectx: property (suffix), widget (QSpinBox, uploadBox)
+#: rc.cpp:29 rc.cpp:35 rc.cpp:41 rc.cpp:481 rc.cpp:487 rc.cpp:724 rc.cpp:730
 msgid " KiB/s"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:95
+#. i18n: file: conf/dlgnetwork.ui:70
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:62
-msgid "Global upload limit:"
+#: rc.cpp:32
+msgid "Global &upload limit:"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:118
+#. i18n: file: conf/dlgnetwork.ui:96
 #. i18n: ectx: property (text), widget (QLabel, lb_per_transfer)
-#: rc.cpp:68
+#: rc.cpp:38
 msgid "Per transfer:"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:141
+#. i18n: file: conf/dlgnetwork.ui:119
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_ReconnectOnBroken)
-#: rc.cpp:74
-msgid "Reconnect on Error or Broken Connection"
+#: rc.cpp:44
+msgid "Reconnect on Broken Connection"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:150
+#. i18n: file: conf/dlgnetwork.ui:128
 #. i18n: ectx: property (text), widget (QLabel, lb_retries_2)
-#: rc.cpp:77
+#: rc.cpp:47
 msgid "Number of retries:"
 msgstr "Nifer ail-geisiau:"
 
-#. i18n: file: conf/dlgnetwork.ui:164
+#. i18n: file: conf/dlgnetwork.ui:142
 #. i18n: ectx: property (text), widget (QLabel, lb_after_2)
-#: rc.cpp:80
+#: rc.cpp:50
 msgid "Retry after:"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:171
+#. i18n: file: conf/dlgnetwork.ui:149
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_ReconnectDelay)
-#: rc.cpp:83
+#: rc.cpp:53
 msgid " sec"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:193
-#. i18n: ectx: property (title), widget (QGroupBox, groupBoxCompleted)
-#: rc.cpp:86
-msgid "After Completing Downloads"
-msgstr ""
-
-#. i18n: file: conf/dlgnetwork.ui:199
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoShutdown)
-#: rc.cpp:89
-msgid "Auto shutdown"
+#. i18n: file: conf/dlgappearance.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_ShowDropTarget)
+#: rc.cpp:56
+msgid "Use Drop Target"
 msgstr ""
 
-#. i18n: file: conf/dlgnetwork.ui:206
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoDisconnect)
-#: rc.cpp:92
-msgid "Auto disconnect"
+#. i18n: file: conf/dlgappearance.ui:29
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AnimateDropTarget)
+#: rc.cpp:59
+msgid "Enable animations"
 msgstr ""
 
 #. i18n: file: conf/verificationpreferences.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:95
-msgid "Checksums"
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_ChecksumAutomaticVerification)
+#: rc.cpp:62
+msgid "Automatic checksums verification"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:98
-msgid "Automatic verification:"
+#. i18n: file: conf/verificationpreferences.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:65
+msgid "Used checksum:"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:42
+#. i18n: file: conf/verificationpreferences.ui:51
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_4)
-#: rc.cpp:101
+#: rc.cpp:68
 msgid "Weak (fastest)"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:49
+#. i18n: file: conf/verificationpreferences.ui:58
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_5)
-#: rc.cpp:104
+#: rc.cpp:71
 msgid "Strong (recommended)"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:56
+#. i18n: file: conf/verificationpreferences.ui:65
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_6)
-#: rc.cpp:107
+#: rc.cpp:74
 msgid "Strongest (slowest)"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:73
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:110
-msgid "Used checksum:"
-msgstr ""
-
-#. i18n: file: conf/verificationpreferences.ui:83
+#. i18n: file: conf/verificationpreferences.ui:78
 #. i18n: ectx: property (title), widget (QGroupBox, signatureGroup)
+#. i18n: file: ui/transfersettingsdialog.ui:176
+#. i18n: ectx: property (text), widget (KPushButton, signature)
 #. i18n: file: ui/signaturedlg.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, sigGroup)
-#. i18n: file: ui/transfersettingsdialog.ui:173
-#. i18n: ectx: property (text), widget (KPushButton, signature)
-#: rc.cpp:113 rc.cpp:829 rc.cpp:907
+#: rc.cpp:77 rc.cpp:514 rc.cpp:835
 msgid "Signature"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:89
+#. i18n: file: conf/verificationpreferences.ui:84
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SignatureAutomaticVerification)
-#: rc.cpp:116
+#: rc.cpp:80
 msgid "Automatic verification"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:96
+#. i18n: file: conf/verificationpreferences.ui:91
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SignatureAutomaticDownloading)
-#: rc.cpp:119
+#: rc.cpp:83
 msgid "Automatic downloading of missing keys"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:119
+#. i18n: file: conf/verificationpreferences.ui:114
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:122
+#: rc.cpp:86
 msgid "Keyservers:"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:146
-#. i18n: ectx: property (text), widget (KPushButton, up)
-#: rc.cpp:125
-msgid "Move &Up"
+#. i18n: file: conf/dlgintegration.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:89
+msgid "Use as download manager for Konqueror:"
 msgstr ""
 
-#. i18n: file: conf/verificationpreferences.ui:153
-#. i18n: ectx: property (text), widget (KPushButton, down)
-#: rc.cpp:128
-msgid "Move &Down"
+#. i18n: file: conf/dlgintegration.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_AutoPaste)
+#: rc.cpp:92
+msgid "Monitor Clipboard for Files to Download"
+msgstr ""
+
+#. i18n: file: conf/dlgintegration.ui:43
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:95
+msgid "Case sensitive:"
 msgstr ""
 
-#. i18n: file: conf/dlgwebinterface.ui:19
+#. i18n: file: conf/dlgwebinterface.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_WebinterfaceEnabled)
-#: rc.cpp:131
+#: rc.cpp:104
 msgid "Enable Web Interface"
 msgstr ""
 
-#. i18n: file: conf/dlgwebinterface.ui:31
+#. i18n: file: conf/dlgwebinterface.ui:32
 #. i18n: ectx: property (text), widget (QLabel, portLabel)
 #. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:32
 #. i18n: ectx: property (text), widget (QLabel, portLabel)
-#: rc.cpp:134 rc.cpp:320
+#: rc.cpp:107 rc.cpp:346
 msgid "Port:"
 msgstr ""
 
-#. i18n: file: conf/dlgwebinterface.ui:45
+#. i18n: file: conf/dlgwebinterface.ui:46
 #. i18n: ectx: property (text), widget (QLabel, userLabel)
-#: rc.cpp:137
+#: rc.cpp:110
 msgid "User:"
 msgstr ""
 
-#. i18n: file: conf/dlgwebinterface.ui:59
+#. i18n: file: conf/dlgwebinterface.ui:60
 #. i18n: ectx: property (text), widget (QLabel, passwordLabel)
 #. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:87
 #. i18n: ectx: property (text), widget (QLabel, passwordLabel)
-#: rc.cpp:140 rc.cpp:481
+#: rc.cpp:113 rc.cpp:242
 msgid "Password:"
 msgstr ""
 
-#. i18n: file: conf/dlgintegration.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:143
-msgid "Use as download manager for Konqueror:"
-msgstr ""
-
-#. i18n: file: conf/dlgintegration.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_AutoPaste)
-#: rc.cpp:146
-msgid "Monitor clipboard for files to download"
+#. i18n: file: conf/dlgadvanced.ui:17
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableSystemTray)
+#: rc.cpp:116
+msgid "Enable system tray icon"
 msgstr ""
 
-#. i18n: file: conf/dlgintegration.ui:43
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:149
-msgid "Case insensitive:"
+#. i18n: file: conf/dlgadvanced.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AfterFinishActionEnabled)
+#: rc.cpp:119
+msgid "Execute action after all downloads have been finished:"
 msgstr ""
 
-#. i18n: file: conf/dlggroups.ui:17
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_DirectoriesAsSuggestion)
-#: rc.cpp:158
-msgid "Use default folders for groups as suggestion"
+#. i18n: file: conf/dlgadvanced.ui:42
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:125
+msgid "At startup:"
 msgstr ""
 
-#. i18n: file: conf/dlggroups.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AskForDestination)
-#: rc.cpp:173
-msgid "Ask for destination if there are no default folders"
+#. i18n: file: conf/dlgadvanced.ui:50
+#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_StartupAction)
+#: rc.cpp:128
+msgid "Restore Download State"
 msgstr ""
 
-#. i18n: file: conf/dlggroups.ui:45
-#. i18n: ectx: property (text), widget (KPushButton, rename)
-#. i18n: file: ui/transfersettingsdialog.ui:153
-#. i18n: ectx: property (text), widget (KPushButton, rename)
-#: rc.cpp:161 rc.cpp:901
-msgid "Rename"
+#. i18n: file: conf/dlgadvanced.ui:55
+#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_StartupAction)
+#: rc.cpp:131
+msgid "Start All Downloads"
 msgstr ""
 
-#. i18n: file: conf/dlggroups.ui:55
-#. i18n: ectx: property (text), widget (KIconButton, selectIcon)
-#: rc.cpp:164
-msgid "Select Icon..."
+#. i18n: file: conf/dlgadvanced.ui:60
+#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_StartupAction)
+#: rc.cpp:134
+msgid "Stop All Downloads"
 msgstr ""
 
-#. i18n: file: conf/dlgappearance.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, startupGroup)
-#: rc.cpp:167
-msgid "Startup"
+#. i18n: file: conf/dlgadvanced.ui:71
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:137
+msgid "History backend:"
 msgstr ""
 
-#. i18n: file: conf/dlgappearance.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowSplashscreen)
-#: rc.cpp:170
-msgid "Show splashscreen"
+#. i18n: file: conf/dlgadvanced.ui:80
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_EnableKUIServerIntegration)
+#: rc.cpp:140
+msgid "Enable KDE Global Progress Tracking"
 msgstr ""
 
-#. i18n: file: conf/dlgappearance.ui:42
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AnimateDropTarget)
-#: rc.cpp:176
-msgid "Enable animations"
+#. i18n: file: conf/dlgadvanced.ui:92
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExportSingleTransfer)
+#: rc.cpp:143
+msgid "Show every single download "
 msgstr ""
 
-#. i18n: file: conf/dlgappearance.ui:52
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnablePopupTooltip)
-#: rc.cpp:179
-msgid "Enable popup tooltip"
+#. i18n: file: conf/dlgadvanced.ui:99
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExportGlobalJob)
+#: rc.cpp:146
+msgid "Show overall progress"
 msgstr ""
 
-#. i18n: file: conf/dlgappearance.ui:59
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowDropTarget)
-#: rc.cpp:182
-msgid "Show drop target"
+#. i18n: file: conf/dlgadvanced.ui:109
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:149
+msgid "Handle existing Files/Transfers"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:16
-#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
-#: rc.cpp:191
-msgid "Search Engines"
+#. i18n: file: conf/dlgadvanced.ui:115
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FilesAlwaysAsk)
+#: rc.cpp:152
+msgid "Always ask"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:27
-#. i18n: ectx: property (text), widget (QTreeWidget, enginesTreeWidget)
-#: rc.cpp:194
-msgid "Engine Name"
+#. i18n: file: conf/dlgadvanced.ui:122
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FilesAutomaticRename)
+#: rc.cpp:155
+msgid "Automatic rename"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:55
-#. i18n: ectx: property (text), widget (QPushButton, newEngineBt)
-#: rc.cpp:200
-msgid "New Engine..."
-msgstr ""
+#. i18n: file: conf/dlgadvanced.ui:129
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FilesOverwrite)
+#: rc.cpp:158
+msgid "Overwrite"
+msgstr "Trosysgrifo"
 
 #. i18n: file: transfer-plugins/multisegmentkio/dlgmultisegkio.ui:22
 #. i18n: ectx: property (text), widget (QLabel, label)
 #. i18n: file: transfer-plugins/metalink/dlgmetalink.ui:56
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:206 rc.cpp:221
+#. i18n: file: transfer-plugins/mmsthreads/dlgmms.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:161 rc.cpp:179 rc.cpp:275
 msgid "Number of connections per URL:"
 msgstr ""
 
 #. i18n: file: transfer-plugins/multisegmentkio/dlgmultisegkio.ui:44
 #. i18n: ectx: property (text), widget (QCheckBox, enginesCheckBox)
-#: rc.cpp:209
+#: rc.cpp:164
 msgid "Use search engines"
 msgstr ""
 
 #. i18n: file: transfer-plugins/multisegmentkio/dlgmultisegkio.ui:51
 #. i18n: ectx: property (text), widget (QCheckBox, verificationCheckBox)
-#: rc.cpp:212
+#: rc.cpp:167
 msgid "Search for verification information"
 msgstr ""
 
+#. i18n: file: transfer-plugins/metalink/fileselection.ui:17
+#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
+#: rc.cpp:170
+msgid "Select the files you want to be downloaded."
+msgstr ""
+
 #. i18n: file: transfer-plugins/metalink/dlgmetalink.ui:22
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:215
+#: rc.cpp:173
 msgid "Number of simultaneous file downloads:"
 msgstr ""
 
 #. i18n: file: transfer-plugins/metalink/dlgmetalink.ui:39
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:218
+#: rc.cpp:176
 msgid "Number of mirrors per file:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/metalink/fileselection.ui:17
-#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
-#: rc.cpp:224
-msgid "Select the files you want to be downloaded."
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:16
-#. i18n: ectx: property (text), widget (QLabel, torrent_label)
-#: rc.cpp:227
-msgid "Scanning data of torrent:"
+#. i18n: file: transfer-plugins/contentfetch/dlgscriptediting.ui:29
+#. i18n: ectx: property (text), widget (QLabel, scriptUrlRegexpLabel)
+#: rc.cpp:182
+msgid "Regexp:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:30
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:230
-msgid "Number of chunks found:"
+#. i18n: file: transfer-plugins/contentfetch/dlgscriptediting.ui:36
+#. i18n: ectx: property (text), widget (QLabel, scriptPathLabel)
+#: rc.cpp:185
+msgid "Path:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:40
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:233
-msgid "Number of chunks failed:"
+#. i18n: file: transfer-plugins/contentfetch/dlgscriptediting.ui:43
+#. i18n: ectx: property (text), widget (QLabel, scriptDescriptionLabel)
+#. i18n: file: ui/metalinkcreator/commondata.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:188 rc.cpp:610
+msgid "Description:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:50
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:236
-msgid "Number of chunks not downloaded:"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:16
+#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
+#: rc.cpp:191
+msgid "User Scripts"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:57
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:239
-msgid "Number of chunks downloaded:"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:27
+#. i18n: ectx: property (text), widget (QTreeWidget, scriptTreeWidget)
+#: rc.cpp:194
+msgid "Path"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:77
-#. i18n: ectx: property (text), widget (QLabel, chunks_found)
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:102
-#. i18n: ectx: property (text), widget (QLabel, chunks_failed)
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:124
-#. i18n: ectx: property (text), widget (QLabel, chunks_not_downloaded)
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:137
-#. i18n: ectx: property (text), widget (QLabel, chunks_downloaded)
-#: rc.cpp:242 rc.cpp:245 rc.cpp:248 rc.cpp:251
-msgid "0"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:32
+#. i18n: ectx: property (text), widget (QTreeWidget, scriptTreeWidget)
+#: rc.cpp:197
+msgid "RegExp"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:183
-#. i18n: ectx: property (text), widget (KPushButton, cancel)
-#: rc.cpp:254
-msgid "Cancel"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:60
+#. i18n: ectx: property (text), widget (QPushButton, newScriptButton)
+#: rc.cpp:203
+msgid "New Script...."
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:29
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:257
-msgid "Stats"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:67
+#. i18n: ectx: property (text), widget (QPushButton, removeScriptButton)
+#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, removeEngineBt)
+#: rc.cpp:206 rc.cpp:272
+msgid "Remove"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:47
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:260
-msgid "Seeders:"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:74
+#. i18n: ectx: property (text), widget (QPushButton, editScriptButton)
+#: rc.cpp:209
+msgid "Edit...."
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:60
-#. i18n: ectx: property (text), widget (QLabel, seederLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:86
-#. i18n: ectx: property (text), widget (QLabel, dlSpeedLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:112
-#. i18n: ectx: property (text), widget (QLabel, leecherLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:138
-#. i18n: ectx: property (text), widget (QLabel, ulSpeedLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:170
-#. i18n: ectx: property (text), widget (QLabel, chunksDownloadedLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:184
-#. i18n: ectx: property (text), widget (QLabel, chunksLeftLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:198
-#. i18n: ectx: property (text), widget (QLabel, chunksAllLabel)
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:212
-#. i18n: ectx: property (text), widget (QLabel, chunksExcludedLabel)
-#: rc.cpp:263 rc.cpp:269 rc.cpp:275 rc.cpp:281 rc.cpp:290 rc.cpp:296
-#: rc.cpp:302 rc.cpp:308
-msgid "<n>"
+#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:81
+#. i18n: ectx: property (text), widget (QPushButton, configureScriptButton)
+#: rc.cpp:212
+msgid "Configure...."
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:73
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:266
-msgid "Download speed:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, fileSettingGroupBox)
+#: rc.cpp:215
+msgid "File Settings"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:99
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:272
-msgid "Leechers:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:25
+#. i18n: ectx: property (text), widget (QLabel, fileNameLabel)
+#. i18n: file: ui/metalinkcreator/filedlg.ui:54
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:218 rc.cpp:571
+msgid "Filename:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:125
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:278
-msgid "Upload speed:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:33
+#. i18n: ectx: property (text), item, widget (KComboBox, fileNameComboBox)
+#: rc.cpp:221
+msgid "Use Normalized Name"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:154
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ChunkDownloadView)
-#: rc.cpp:284 rc.cpp:385
-msgid "Chunks"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:38
+#. i18n: ectx: property (text), item, widget (KComboBox, fileNameComboBox)
+#: rc.cpp:224
+msgid "Use Literal Name"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:163
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:95
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:287 rc.cpp:394
-msgid "Downloaded:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:46
+#. i18n: ectx: property (text), widget (QLabel, qualityLabel)
+#: rc.cpp:227
+msgid "Quality:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:177
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:293
-msgctxt "chunks left"
-msgid "Left:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:54
+#. i18n: ectx: property (text), item, widget (KComboBox, qualityComboBox)
+#: rc.cpp:230
+msgid "Best Quality (.mp4)"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:191
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:299
-msgctxt "all chunks"
-msgid "All:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:59
+#. i18n: ectx: property (text), item, widget (KComboBox, qualityComboBox)
+#: rc.cpp:233
+msgid "Normal Quality (.flv)"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:205
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:131
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:305 rc.cpp:397
-msgid "Excluded:"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:240
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: ui/transferdetailsfrm.ui:51
-#. i18n: ectx: property (text), widget (QLabel, sourceLabel)
-#: rc.cpp:311 rc.cpp:600
-msgctxt "source-file"
-msgid "Source:"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:247
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: ui/transferdetailsfrm.ui:44
-#. i18n: ectx: property (text), widget (QLabel, destLabel)
-#: rc.cpp:314 rc.cpp:597
-msgid "Saving to:"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:49
-#. i18n: ectx: property (text), widget (QLabel, uploadLimitLabel)
-#: rc.cpp:323
-msgid "Upload limit per transfer:"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:56
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, uploadBox)
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:76
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, downloadBox)
-#: rc.cpp:326 rc.cpp:335
-msgid "No Limit"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:59
-#. i18n: ectx: property (suffix), widget (QSpinBox, uploadBox)
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:79
-#. i18n: ectx: property (suffix), widget (QSpinBox, downloadBox)
-#: rc.cpp:329 rc.cpp:338
-msgid "KiB"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:69
-#. i18n: ectx: property (text), widget (QLabel, downloadLabel)
-#: rc.cpp:332
-msgid "Download limit per transfer:"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:89
-#. i18n: ectx: property (text), widget (QCheckBox, utpBox)
-#: rc.cpp:341
-msgid "Enable UTP protocol"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:105
-#. i18n: ectx: property (title), widget (QGroupBox, folderGroupBox)
-#: rc.cpp:344
-msgid "Folders"
-msgstr "Plygyll"
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:117
-#. i18n: ectx: property (text), widget (QLabel, torrentFolderLabel)
-#: rc.cpp:347
-msgid "Default torrent folder:"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:137
-#. i18n: ectx: property (text), widget (QLabel, tempFolderLabel)
-#: rc.cpp:350
-msgid "Default temporary folder"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:154
-#. i18n: ectx: property (text), widget (QCheckBox, preallocBox)
-#: rc.cpp:353
-msgid "Pre-allocate disk space"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/webseedstab.ui:21
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_webseed)
-#: rc.cpp:356
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:70
+#. i18n: ectx: property (toolTip), widget (QGroupBox, loginGroupBox)
+#: rc.cpp:236
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Webseed to add to the "
-"torrent.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Note: </span>Only http webseeds are "
-"supported.</p></body></html>"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/webseedstab.ui:28
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#: rc.cpp:364
-msgid "Add Webseed"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/webseedstab.ui:50
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#: rc.cpp:367
-msgid "Remove Webseed"
-msgstr ""
-
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:28
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
-#: rc.cpp:373
-msgid "Remove Tracker"
+"Provide login info of your YouTube account in order to access restricted "
+"media."
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:35
-#. i18n: ectx: property (text), widget (KPushButton, m_change_tracker)
-#: rc.cpp:376
-msgid "Change Tracker"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:73
+#. i18n: ectx: property (title), widget (QGroupBox, loginGroupBox)
+#: rc.cpp:239
+msgid "Login Info"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:42
-#. i18n: ectx: property (text), widget (QPushButton, m_scrape)
-#: rc.cpp:379
-msgid "Update Trackers"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:101
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: rc.cpp:245
+msgid "Username:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:62
-#. i18n: ectx: property (text), widget (KPushButton, m_restore_defaults)
-#: rc.cpp:382
-msgid "Restore Defaults"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:113
+#. i18n: ectx: property (toolTip), widget (QCheckBox, useNetrcCheck)
+#: rc.cpp:248
+msgid ".netrc must have a hostname called 'youtube'."
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:23
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:388
-msgid "Total:"
+#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:116
+#. i18n: ectx: property (text), widget (QCheckBox, useNetrcCheck)
+#: rc.cpp:251
+msgid "User .netrc file"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:59
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:391
-msgid "Currently downloading:"
+#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:16
+#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
+#: rc.cpp:260
+msgid "Search Engines"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:167
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
-#: rc.cpp:400
-msgid "Left:"
+#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:27
+#. i18n: ectx: property (text), widget (QTreeWidget, enginesTreeWidget)
+#: rc.cpp:263
+msgid "Engine Name"
 msgstr ""
 
-#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:203
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_8)
-#: rc.cpp:403
-msgid "Size:"
+#. i18n: file: transfer-plugins/mirrorsearch/dlgmirrorsearch.ui:55
+#. i18n: ectx: property (text), widget (QPushButton, newEngineBt)
+#: rc.cpp:269
+msgid "New Engine..."
 msgstr ""
 
 #. i18n: file: transfer-plugins/checksumsearch/checksumsearchadddlg.ui:19
 #. i18n: ectx: property (text), widget (QLabel, label_1)
-#: rc.cpp:406
+#: rc.cpp:278
 msgid "Change string:"
 msgstr ""
 
 #. i18n: file: transfer-plugins/checksumsearch/checksumsearchadddlg.ui:33
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:409
+#: rc.cpp:281
 msgid "Mode:"
 msgstr ""
 
 #. i18n: file: transfer-plugins/checksumsearch/checksumsearchadddlg.ui:43
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:412
+#: rc.cpp:284
 msgid "Checksum type:"
 msgstr ""
 
 #. i18n: file: transfer-plugins/checksumsearch/checksumsearchadddlg.ui:77
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:415
+#: rc.cpp:287
 msgid "Result:"
 msgstr ""
 
 #. i18n: file: transfer-plugins/checksumsearch/checksumsearchadddlg.ui:84
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:418
+#: rc.cpp:290
 msgid "label"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:16
-#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
-#: rc.cpp:421
-msgid "User Scripts"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ChunkDownloadView)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:154
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:293 rc.cpp:409
+msgid "Chunks"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:27
-#. i18n: ectx: property (text), widget (QTreeWidget, scriptTreeWidget)
-#: rc.cpp:424
-msgid "Path"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:23
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:296
+msgid "Total:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:32
-#. i18n: ectx: property (text), widget (QTreeWidget, scriptTreeWidget)
-#: rc.cpp:427
-msgid "RegExp"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:59
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:299
+msgid "Currently downloading:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:60
-#. i18n: ectx: property (text), widget (QPushButton, newScriptButton)
-#: rc.cpp:433
-msgid "New Script...."
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:95
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:163
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:302 rc.cpp:412
+msgid "Downloaded:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:74
-#. i18n: ectx: property (text), widget (QPushButton, editScriptButton)
-#: rc.cpp:439
-msgid "Edit...."
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:131
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:205
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:305 rc.cpp:430
+msgid "Excluded:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgcontentfetchsettingwidget.ui:81
-#. i18n: ectx: property (text), widget (QPushButton, configureScriptButton)
-#: rc.cpp:442
-msgid "Configure...."
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:167
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
+#: rc.cpp:308
+msgid "Left:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgscriptediting.ui:29
-#. i18n: ectx: property (text), widget (QLabel, scriptUrlRegexpLabel)
-#: rc.cpp:445
-msgid "Regexp:"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/chunkdownloadview.ui:203
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_8)
+#: rc.cpp:311
+msgid "Size:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgscriptediting.ui:36
-#. i18n: ectx: property (text), widget (QLabel, scriptPathLabel)
-#: rc.cpp:448
-msgid "Path:"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:28
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
+#: rc.cpp:317
+msgid "Remove Tracker"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/dlgscriptediting.ui:43
-#. i18n: ectx: property (text), widget (QLabel, scriptDescriptionLabel)
-#. i18n: file: ui/metalinkcreator/commondata.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:451 rc.cpp:655
-msgid "Description:"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:35
+#. i18n: ectx: property (text), widget (KPushButton, m_change_tracker)
+#: rc.cpp:320
+msgid "Change Tracker"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, fileSettingGroupBox)
-#: rc.cpp:454
-msgid "File Settings"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:42
+#. i18n: ectx: property (text), widget (QPushButton, m_scrape)
+#: rc.cpp:323
+msgid "Update Trackers"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:25
-#. i18n: ectx: property (text), widget (QLabel, fileNameLabel)
-#. i18n: file: ui/metalinkcreator/filedlg.ui:54
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:457 rc.cpp:631
-msgid "Filename:"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/trackerview.ui:62
+#. i18n: ectx: property (text), widget (KPushButton, m_restore_defaults)
+#: rc.cpp:326
+msgid "Restore Defaults"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:33
-#. i18n: ectx: property (text), item, widget (KComboBox, fileNameComboBox)
-#: rc.cpp:460
-msgid "Use Normalized Name"
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/webseedstab.ui:21
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_webseed)
+#: rc.cpp:329
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Webseed to add to the "
+"torrent.</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Note: </span>Only http webseeds are "
+"supported.</p></body></html>"
+msgstr ""
+
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/webseedstab.ui:28
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#: rc.cpp:337
+msgid "Add Webseed"
+msgstr ""
+
+#. i18n: file: transfer-plugins/bittorrent/advanceddetails/webseedstab.ui:50
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#: rc.cpp:340
+msgid "Remove Webseed"
+msgstr ""
+
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:49
+#. i18n: ectx: property (text), widget (QLabel, uploadLimitLabel)
+#: rc.cpp:349
+msgid "Upload limit per transfer:"
+msgstr ""
+
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:56
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, uploadBox)
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:76
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, downloadBox)
+#: rc.cpp:352 rc.cpp:361
+msgid "No Limit"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:38
-#. i18n: ectx: property (text), item, widget (KComboBox, fileNameComboBox)
-#: rc.cpp:463
-msgid "Use Literal Name"
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:59
+#. i18n: ectx: property (suffix), widget (QSpinBox, uploadBox)
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:79
+#. i18n: ectx: property (suffix), widget (QSpinBox, downloadBox)
+#: rc.cpp:355 rc.cpp:364
+msgid "KiB"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:46
-#. i18n: ectx: property (text), widget (QLabel, qualityLabel)
-#: rc.cpp:466
-msgid "Quality:"
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:69
+#. i18n: ectx: property (text), widget (QLabel, downloadLabel)
+#: rc.cpp:358
+msgid "Download limit per transfer:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:54
-#. i18n: ectx: property (text), item, widget (KComboBox, qualityComboBox)
-#: rc.cpp:469
-msgid "Best Quality (.mp4)"
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:89
+#. i18n: ectx: property (text), widget (QCheckBox, utpBox)
+#: rc.cpp:367
+msgid "Enable UTP protocol"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:59
-#. i18n: ectx: property (text), item, widget (KComboBox, qualityComboBox)
-#: rc.cpp:472
-msgid "Normal Quality (.flv)"
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:105
+#. i18n: ectx: property (title), widget (QGroupBox, folderGroupBox)
+#: rc.cpp:370
+msgid "Folders"
+msgstr "Plygyll"
+
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:117
+#. i18n: ectx: property (text), widget (QLabel, torrentFolderLabel)
+#: rc.cpp:373
+msgid "Default torrent folder:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:70
-#. i18n: ectx: property (toolTip), widget (QGroupBox, loginGroupBox)
-#: rc.cpp:475
-msgid ""
-"Provide login info of your YouTube account in order to access restricted "
-"media."
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:137
+#. i18n: ectx: property (text), widget (QLabel, tempFolderLabel)
+#: rc.cpp:376
+msgid "Default temporary folder"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:73
-#. i18n: ectx: property (title), widget (QGroupBox, loginGroupBox)
-#: rc.cpp:478
-msgid "Login Info"
+#. i18n: file: transfer-plugins/bittorrent/btsettingswidget.ui:154
+#. i18n: ectx: property (text), widget (QCheckBox, preallocBox)
+#: rc.cpp:379
+msgid "Pre-allocate disk space"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:101
-#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
-#: rc.cpp:484
-msgid "Username:"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:29
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:382
+msgid "Stats"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:113
-#. i18n: ectx: property (toolTip), widget (QCheckBox, useNetrcCheck)
-#: rc.cpp:487
-msgid ".netrc must have a hostname called 'youtube'."
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:47
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:385
+msgid "Seeders:"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/scripts/youtubedl/youtube_option.ui:116
-#. i18n: ectx: property (text), widget (QCheckBox, useNetrcCheck)
-#: rc.cpp:490
-msgid "User .netrc file"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:60
+#. i18n: ectx: property (text), widget (QLabel, seederLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:86
+#. i18n: ectx: property (text), widget (QLabel, dlSpeedLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:112
+#. i18n: ectx: property (text), widget (QLabel, leecherLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:138
+#. i18n: ectx: property (text), widget (QLabel, ulSpeedLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:170
+#. i18n: ectx: property (text), widget (QLabel, chunksDownloadedLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:184
+#. i18n: ectx: property (text), widget (QLabel, chunksLeftLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:198
+#. i18n: ectx: property (text), widget (QLabel, chunksAllLabel)
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:212
+#. i18n: ectx: property (text), widget (QLabel, chunksExcludedLabel)
+#: rc.cpp:388 rc.cpp:394 rc.cpp:400 rc.cpp:406 rc.cpp:415 rc.cpp:421
+#: rc.cpp:427 rc.cpp:433
+msgid "<n>"
 msgstr ""
 
-#. i18n: file: ui/newtransferwidget.ui:66
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:499
-msgid "Destination:"
-msgstr "Cyrchfan:"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:73
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:391
+msgid "Download speed:"
+msgstr ""
 
-#. i18n: file: ui/newtransferwidget.ui:76
-#. i18n: ectx: property (text), widget (QLabel, groupLabel)
-#: rc.cpp:502
-msgid "Transfer group:"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:99
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:397
+msgid "Leechers:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:505
-msgid "&File with links to import:"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:125
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:403
+msgid "Upload speed:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:35
-#. i18n: ectx: property (text), widget (KPushButton, importLinks)
-#: rc.cpp:508
-msgid "&Import Links"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:177
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:418
+msgctxt "chunks left"
+msgid "Left:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:49
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:511
-msgid "Show:"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:191
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:424
+msgctxt "all chunks"
+msgid "All:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:56
-#. i18n: ectx: property (text), widget (KPushButton, showAll)
-#: rc.cpp:514
-msgctxt "filter: show all file types"
-msgid "&All"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:240
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:436
+msgctxt "source-file"
+msgid "Source:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:75
-#. i18n: ectx: property (text), widget (KPushButton, showVideos)
-#: rc.cpp:518
-msgid "&Videos"
+#. i18n: file: transfer-plugins/bittorrent/btdetailswidgetfrm.ui:247
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ui/transferdetailsfrm.ui:44
+#. i18n: ectx: property (text), widget (QLabel, destLabel)
+#: rc.cpp:439 rc.cpp:739
+msgid "Saving to:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:91
-#. i18n: ectx: property (text), widget (KPushButton, showImages)
-#: rc.cpp:522
-msgid "Ima&ges"
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:16
+#. i18n: ectx: property (text), widget (QLabel, torrent_label)
+#: rc.cpp:442
+msgid "Scanning data of torrent:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:107
-#. i18n: ectx: property (text), widget (KPushButton, showAudio)
-#: rc.cpp:526
-msgid "A&udio"
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:30
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:445
+msgid "Number of chunks found:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:123
-#. i18n: ectx: property (text), widget (KPushButton, showArchives)
-#: rc.cpp:530
-msgid "A&rchives"
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:40
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:448
+msgid "Number of chunks failed:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:145
-#. i18n: ectx: property (toolTip), widget (KLineEdit, textFilter)
-#: rc.cpp:534
-msgid "You can use wildcards for filtering."
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:50
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:451
+msgid "Number of chunks not downloaded:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:148
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, textFilter)
-#: rc.cpp:537
-msgid "Filter files here...."
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:57
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:454
+msgid "Number of chunks downloaded:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:159
-#. i18n: ectx: property (text), item, widget (KComboBox, filterMode)
-#: rc.cpp:540
-msgid "Contains"
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:77
+#. i18n: ectx: property (text), widget (QLabel, chunks_found)
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:102
+#. i18n: ectx: property (text), widget (QLabel, chunks_failed)
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:124
+#. i18n: ectx: property (text), widget (QLabel, chunks_not_downloaded)
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:137
+#. i18n: ectx: property (text), widget (QLabel, chunks_downloaded)
+#: rc.cpp:457 rc.cpp:460 rc.cpp:463 rc.cpp:466
+msgid "0"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:164
-#. i18n: ectx: property (text), item, widget (KComboBox, filterMode)
-#: rc.cpp:543
-msgid "Does Not Contain"
+#. i18n: file: transfer-plugins/bittorrent/scandlg.ui:183
+#. i18n: ectx: property (text), widget (KPushButton, cancel)
+#: rc.cpp:469
+msgid "Cancel"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:237
-#. i18n: ectx: property (text), widget (KPushButton, invertSelection)
-#: rc.cpp:552
-msgid "Inver&t Selection"
+#. i18n: file: ui/transfersettingsdialog.ui:23
+#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
+#: rc.cpp:472
+msgid "Transfer Settings"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:247
-#. i18n: ectx: property (text), widget (KPushButton, checkSelected)
-#: rc.cpp:555
-msgctxt "Check as in mark, not as in verify"
-msgid "Chec&k Selected"
+#. i18n: file: ui/transfersettingsdialog.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:475
+msgid "Download des&tination:"
 msgstr ""
 
-#. i18n: file: ui/linkview/importlinkdialog.ui:254
-#. i18n: ectx: property (text), widget (QCheckBox, showWebContent)
-#: rc.cpp:558
-msgid "Show &web content"
+#. i18n: file: ui/transfersettingsdialog.ui:55
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, uploadSpin)
+#. i18n: file: ui/transfersettingsdialog.ui:71
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, downloadSpin)
+#. i18n: file: ui/transfersettingsdialog.ui:87
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, ratioSpin)
+#. i18n: file: ui/groupsettingsdialog.ui:87
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, downloadBox)
+#. i18n: file: ui/groupsettingsdialog.ui:106
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, uploadBox)
+#: rc.cpp:478 rc.cpp:484 rc.cpp:490 rc.cpp:721 rc.cpp:727
+msgctxt "No value has been set"
+msgid "Not set"
 msgstr ""
 
-#. i18n: file: ui/verificationdialog.ui:42
-#. i18n: ectx: property (toolTip), widget (KPushButton, verify)
-#: rc.cpp:561
-msgid "Verify the finished download with the selected checksum."
+#. i18n: file: ui/transfersettingsdialog.ui:94
+#. i18n: ectx: property (text), widget (QLabel, labelUpload)
+#: rc.cpp:493
+msgid "&Upload limit:"
 msgstr ""
 
-#. i18n: file: ui/verificationdialog.ui:45
-#. i18n: ectx: property (text), widget (KPushButton, verify)
-#: rc.cpp:564
-msgid "&Verify"
+#. i18n: file: ui/transfersettingsdialog.ui:104
+#. i18n: ectx: property (text), widget (QLabel, labelDownload)
+#: rc.cpp:496
+msgid "&Download limit:"
 msgstr ""
 
-#. i18n: file: ui/verificationdialog.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:567
-msgid "Verifying:"
+#. i18n: file: ui/transfersettingsdialog.ui:114
+#. i18n: ectx: property (text), widget (QLabel, labelShareRatio)
+#: rc.cpp:499
+msgid "Maximum &share ratio:"
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:26
-#. i18n: ectx: property (text), widget (QPushButton, clearButton)
-#: rc.cpp:570
-msgid "Clear History"
+#. i18n: file: ui/transfersettingsdialog.ui:143
+#. i18n: ectx: property (toolTip), widget (KPushButton, mirrors)
+#: rc.cpp:502
+msgid "Modify the mirrors used for downloading."
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:46
-#. i18n: ectx: property (title), widget (KButtonGroup, viewmodesgroup)
-#: rc.cpp:573
-msgctxt "View modes"
-msgid "View Modes"
+#. i18n: file: ui/transfersettingsdialog.ui:146
+#. i18n: ectx: property (text), widget (KPushButton, mirrors)
+#: rc.cpp:505
+msgctxt "The available mirrors (servers) for downloading"
+msgid "Mirrors"
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:99
-#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup_2)
-#: rc.cpp:576
-msgid "Select Ranges"
+#. i18n: file: ui/transfersettingsdialog.ui:166
+#. i18n: ectx: property (text), widget (KPushButton, verification)
+#: rc.cpp:511
+msgctxt "verification of the download (e.g. by using MD5)"
+msgid "Verification"
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:115
-#. i18n: ectx: property (text), item, widget (KComboBox, rangeType)
-#: rc.cpp:579
-msgid "Date"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:517
+msgid "General information:"
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:125
-#. i18n: ectx: property (text), item, widget (KComboBox, rangeType)
-#: rc.cpp:585
-msgid "Host"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:30
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:520
+msgid "Here you can enter optional general information on the metalink."
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:136
-#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup_3)
-#: rc.cpp:588
-msgid "Filter History"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:61
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:523
+msgid "Origin:"
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:165
-#. i18n: ectx: property (text), widget (KLineEdit, searchBar)
-#: rc.cpp:591
-msgctxt "delete selected transfer"
-msgid "Delete Selected"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:68
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, origin)
+#: rc.cpp:526
+msgid "Web URL to the metalink"
 msgstr ""
 
-#. i18n: file: ui/history/transferhistory.ui:170
-#. i18n: ectx: property (text), widget (KLineEdit, searchBar)
-#: rc.cpp:594
-msgid "Download"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:75
+#. i18n: ectx: property (toolTip), widget (QLabel, labelDynamic)
+#: rc.cpp:529
+msgid "Dynamic means that updated metalinks can be found at \"Origin\"."
 msgstr ""
 
-#. i18n: file: ui/transferdetailsfrm.ui:51
-#. i18n: ectx: property (text), widget (QLabel, sourceLabel)
-#: rc.cpp:610
-msgctxt "@label transfer source"
-msgid "Source:"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, labelDynamic)
+#: rc.cpp:532
+msgid "Dynamic:"
 msgstr ""
 
-#. i18n: file: ui/transferdetailsfrm.ui:114
-#. i18n: ectx: property (text), widget (QLabel, statusLabel)
-#: rc.cpp:604
-msgid "Status:"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:110
+#. i18n: ectx: property (title), widget (QGroupBox, publishedGroupBox)
+#: rc.cpp:535
+msgid "Metalink published"
 msgstr ""
 
-#. i18n: file: ui/transferdetailsfrm.ui:165
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:610
-msgid "Remaining Time:"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, label_30)
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:223
+#. i18n: ectx: property (text), widget (QLabel, label_29)
+#: rc.cpp:538 rc.cpp:556
+msgid "Date and time:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/introduction.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:613
-msgid ""
-"This assistant allows you to create metalinks from scratch or base them on "
-"existing metalinks. A lot of the fields are optional or recommended, so "
-"enter them if desired. The minimum is a save location, at least one file and "
-"one URL."
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, use_publishedtimeoffset)
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:213
+#. i18n: ectx: property (text), widget (QCheckBox, use_updatedtimeoffset)
+#: rc.cpp:541 rc.cpp:553
+msgid "Timezone offset:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/introduction.ui:48
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:149
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:616
-msgid "Save created Metalink at:"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:206
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:544 rc.cpp:550
+msgid "Negative offset:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/introduction.ui:78
-#. i18n: ectx: property (text), widget (QRadioButton, createButton)
-#: rc.cpp:619
-msgid "Create new Metalink"
+#. i18n: file: ui/metalinkcreator/generalwidget.ui:178
+#. i18n: ectx: property (title), widget (QGroupBox, updatedGroupBox)
+#: rc.cpp:547
+msgid "Metalink updated"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/introduction.ui:88
-#. i18n: ectx: property (text), widget (QRadioButton, loadButton)
-#: rc.cpp:622
-msgid "Load existing Metalink:"
+#. i18n: file: ui/metalinkcreator/files.ui:26
+#. i18n: ectx: property (toolTip), widget (KPushButton, add_local_file)
+#: rc.cpp:559
+msgid "Adds local files adding a lot information automatically."
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/introduction.ui:98
-#. i18n: ectx: property (filter), widget (KUrlRequester, load)
-#: rc.cpp:625
-msgid "*.metalink *.meta4|Metalink file (*.metalink *.meta4)"
+#. i18n: file: ui/metalinkcreator/files.ui:29
+#. i18n: ectx: property (text), widget (KPushButton, add_local_file)
+#: rc.cpp:562
+msgid "Add local files"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/files.ui:66
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:565
+msgid "Adding local files..."
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:24
 #. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#: rc.cpp:628
+#: rc.cpp:568
 msgid "Required"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:95
 #. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:634
+#: rc.cpp:574
 msgid "Used Mirrors:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:103
 #. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: rc.cpp:637
+#: rc.cpp:577
 msgid "Recommended"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:111
 #. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:640
+#: rc.cpp:580
 msgid "File size (in bytes):"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:121
 #. i18n: ectx: property (validChars), widget (KRestrictedLine, size)
-#: rc.cpp:643
+#: rc.cpp:583
 msgid "0123456789"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:152
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: ui/signaturedlg.ui:44
+#. i18n: file: ui/signaturedlg.ui:34
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:646 rc.cpp:835
+#: rc.cpp:586 rc.cpp:838
 msgid "Verification:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/filedlg.ui:199
 #. i18n: ectx: attribute (title), widget (QWidget, Seite)
-#: rc.cpp:649
+#: rc.cpp:589
 msgid "Optional"
 msgstr ""
 
+#. i18n: file: ui/metalinkcreator/introduction.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:592
+msgid ""
+"This assistant allows you to create metalinks from scratch or base them on "
+"existing metalinks. A lot of the fields are optional or recommended, so "
+"enter them if desired. The minimum is a save location, at least one file and "
+"one URL."
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/introduction.ui:48
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:595
+msgid "Save created Metalink at:"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/introduction.ui:78
+#. i18n: ectx: property (text), widget (QRadioButton, createButton)
+#: rc.cpp:598
+msgid "Create new Metalink"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/introduction.ui:88
+#. i18n: ectx: property (text), widget (QRadioButton, loadButton)
+#: rc.cpp:601
+msgid "Load existing Metalink:"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/introduction.ui:98
+#. i18n: ectx: property (filter), widget (KUrlRequester, load)
+#: rc.cpp:604
+msgid "*.metalink *.meta4|Metalink file (*.metalink *.meta4)"
+msgstr ""
+
 #. i18n: file: ui/metalinkcreator/commondata.ui:22
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:652
+#: rc.cpp:607
 msgid "Identity"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:46
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:658
+#: rc.cpp:613
 msgid "Version:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:56
 #. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:661
+#: rc.cpp:616
 msgid "Logo:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:63
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, logo)
-#: rc.cpp:664
+#: rc.cpp:619
 msgid "URL to the logo"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:73
 #. i18n: ectx: property (toolTip), widget (QLabel, label_13)
-#: rc.cpp:667
+#: rc.cpp:622
 msgid "The language of the file"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:76
 #. i18n: ectx: property (text), widget (QLabel, label_13)
-#: rc.cpp:670
+#: rc.cpp:625
 msgid "Language:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:86
 #. i18n: ectx: property (text), widget (QLabel, label_14)
-#: rc.cpp:673
+#: rc.cpp:628
 msgid "Operating systems:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:93
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, os)
-#: rc.cpp:676
+#: rc.cpp:631
 msgid "Supported OSes, separated with commas"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:103
 #. i18n: ectx: property (text), widget (QLabel, label_18)
-#: rc.cpp:679
+#: rc.cpp:634
 msgid "Copyright:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:141
 #. i18n: ectx: property (text), widget (QLabel, label_20)
-#: rc.cpp:682
+#: rc.cpp:637
 msgid "Publisher:"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:150
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:685
+#: rc.cpp:640
 msgid "Name:"
 msgstr ""
 
@@ -3764,498 +3799,469 @@
 #. i18n: ectx: property (toolTip), widget (KLineEdit, pub_name)
 #. i18n: file: ui/metalinkcreator/commondata.ui:177
 #. i18n: ectx: property (toolTip), widget (KLineEdit, pub_url)
-#: rc.cpp:688 rc.cpp:697
+#: rc.cpp:643 rc.cpp:652
 msgid "publisher"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:160
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, pub_name)
-#: rc.cpp:691
+#: rc.cpp:646
 msgid "Name of the publisher"
 msgstr ""
 
 #. i18n: file: ui/metalinkcreator/commondata.ui:180
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, pub_url)
-#: rc.cpp:700
+#: rc.cpp:655
 msgid "URL to the publisher"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:23
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:21
+#. i18n: ectx: attribute (title), widget (QWidget, Seite)
+#: rc.cpp:658
+msgctxt "General options."
+msgid "General"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:27
+#. i18n: ectx: property (text), widget (QCheckBox, partialChecksums)
+#: rc.cpp:661
+msgid "Create partial checksums"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:40
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:664
+msgid "General URL:"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:66
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:667
+msgid ""
+"Automatically create checksums for the selected types. Keep in mind that "
+"this might take a while."
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:92
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:670
+msgid ""
+"Enter URLs here if all the dropped files are on that server and in the same "
+"directory. For each dropped file the URL would consist of the entered part "
+"and the filename."
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:102
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:673
+msgid "Types of the checksums:"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:115
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:676
+msgid "Create checksums:"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:132
+#. i18n: ectx: attribute (title), widget (QWidget, Seite_2)
+#: rc.cpp:679
+msgctxt "These entries are optional."
+msgid "Optional"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:144
 #. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:682
+msgid "Optional data:"
+msgstr ""
+
+#. i18n: file: ui/metalinkcreator/dragdlg.ui:169
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:685
+msgid "Enter information that all chosen files share."
+msgstr ""
+
+#. i18n: file: ui/newtransferwidget.ui:31
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:691
+msgid "Destination:"
+msgstr "Cyrchfan:"
+
+#. i18n: file: ui/newtransferwidget.ui:41
+#. i18n: ectx: property (text), widget (QLabel, groupLabel)
+#: rc.cpp:694
+msgid "Transfer group:"
+msgstr ""
+
+#. i18n: file: ui/verificationadddlg.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:697
+msgctxt "hash type as in md5t, sha1 etc."
+msgid "Hash type:"
+msgstr ""
+
+#. i18n: file: ui/verificationadddlg.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:700
+msgctxt "hash as a hash of type md5, sha1 etc."
+msgid "Hash:"
+msgstr ""
+
+#. i18n: file: ui/verificationadddlg.ui:33
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, newHash)
 #: rc.cpp:703
-msgid "General information:"
+msgid "Enter a hash key"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label_7)
+#. i18n: file: ui/groupsettingsdialog.ui:32
+#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
 #: rc.cpp:706
-msgid "Here you can enter optional general information on the metalink."
+msgid "Group Settings"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:61
-#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ui/groupsettingsdialog.ui:44
+#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:709
-msgid "Origin:"
+msgid "Default &folder:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:68
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, origin)
+#. i18n: file: ui/groupsettingsdialog.ui:61
+#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
 #: rc.cpp:712
-msgid "Web URL to the metalink"
+msgid "Moves all transfers with the regular expression to this group"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:75
-#. i18n: ectx: property (toolTip), widget (QLabel, labelDynamic)
+#. i18n: file: ui/groupsettingsdialog.ui:64
+#. i18n: ectx: property (text), widget (QLabel, label_2)
 #: rc.cpp:715
-msgid "Dynamic means that updated metalinks can be found at \"Origin\"."
+msgid "Regular &expression:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:78
-#. i18n: ectx: property (text), widget (QLabel, labelDynamic)
+#. i18n: file: ui/groupsettingsdialog.ui:74
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, regExpEdit)
 #: rc.cpp:718
-msgid "Dynamic:"
+msgid "*movies*"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:110
-#. i18n: ectx: property (title), widget (QGroupBox, publishedGroupBox)
-#: rc.cpp:721
-msgid "Metalink published"
+#. i18n: file: ui/groupsettingsdialog.ui:119
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:733
+msgid "Maximum &download speed:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, label_30)
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:223
-#. i18n: ectx: property (text), widget (QLabel, label_29)
-#: rc.cpp:724 rc.cpp:742
-msgid "Date and time:"
+#. i18n: file: ui/groupsettingsdialog.ui:129
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:736
+msgid "Maximum &upload speed:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, use_publishedtimeoffset)
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:213
-#. i18n: ectx: property (text), widget (QCheckBox, use_updatedtimeoffset)
-#: rc.cpp:727 rc.cpp:739
-msgid "Timezone offset:"
+#. i18n: file: ui/transferdetailsfrm.ui:51
+#. i18n: ectx: property (text), widget (QLabel, sourceLabel)
+#: rc.cpp:742
+msgctxt "@label transfer source"
+msgid "Source:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:149
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:206
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:730 rc.cpp:736
-msgid "Negative offset:"
+#. i18n: file: ui/transferdetailsfrm.ui:114
+#. i18n: ectx: property (text), widget (QLabel, statusLabel)
+#: rc.cpp:745
+msgid "Status:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/generalwidget.ui:178
-#. i18n: ectx: property (title), widget (QGroupBox, updatedGroupBox)
-#: rc.cpp:733
-msgid "Metalink updated"
+#. i18n: file: ui/transferdetailsfrm.ui:165
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:748
+msgid "Remaining Time:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/files.ui:26
-#. i18n: ectx: property (toolTip), widget (KPushButton, add_local_file)
+#. i18n: file: ui/linkview/importlinkdialog.ui:25
+#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:751
-msgid "Adds local files adding a lot information automatically."
+msgid "&File with links to import:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/files.ui:55
-#. i18n: ectx: property (text), widget (KPushButton, add_local_file)
-#: rc.cpp:748
-msgid "Add local files"
+#. i18n: file: ui/linkview/importlinkdialog.ui:41
+#. i18n: ectx: property (text), widget (KPushButton, importLinks)
+#: rc.cpp:754
+msgid "&Import Links"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/files.ui:102
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:754
-msgid "Adding local files..."
+#. i18n: file: ui/linkview/importlinkdialog.ui:58
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:757
+msgid "Show:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:21
-#. i18n: ectx: attribute (title), widget (QWidget, Seite)
+#. i18n: file: ui/linkview/importlinkdialog.ui:68
+#. i18n: ectx: property (text), widget (QCheckBox, showWebContent)
 #: rc.cpp:760
-msgctxt "General options."
-msgid "General"
+msgid "Show &web content"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:27
-#. i18n: ectx: property (text), widget (QCheckBox, partialChecksums)
+#. i18n: file: ui/linkview/importlinkdialog.ui:106
+#. i18n: ectx: property (toolTip), widget (KLineEdit, textFilter)
 #: rc.cpp:763
-msgid "Create partial checksums"
+msgid "You can use wildcards for filtering."
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:40
-#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ui/linkview/importlinkdialog.ui:109
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, textFilter)
 #: rc.cpp:766
-msgid "General URL:"
-msgstr ""
-
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:66
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:769
-msgid ""
-"Automatically create checksums for the selected types. Keep in mind that "
-"this might take a while."
-msgstr ""
-
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:92
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:772
-msgid ""
-"Enter URLs here if all the dropped files are on that server and in the same "
-"directory. For each dropped file the URL would consist of the entered part "
-"and the filename."
+msgid "Filter files here...."
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:102
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: ui/linkview/importlinkdialog.ui:212
+#. i18n: ectx: property (text), widget (KPushButton, invertSelection)
 #: rc.cpp:775
-msgid "Types of the checksums:"
+msgid "Inver&t Selection"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:115
-#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ui/mirror/mirroradddlg.ui:19
+#. i18n: ectx: property (text), widget (QLabel, labelMirror)
 #: rc.cpp:778
-msgid "Create checksums:"
+msgid "Mirror:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:132
-#. i18n: ectx: attribute (title), widget (QWidget, Seite_2)
+#. i18n: file: ui/mirror/mirroradddlg.ui:26
+#. i18n: ectx: property (text), widget (QLabel, labelConnections)
 #: rc.cpp:781
-msgctxt "These entries are optional."
-msgid "Optional"
+msgid "Number of connections:"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:144
-#. i18n: ectx: property (text), widget (QLabel, label_5)
+#. i18n: file: ui/mirror/mirroradddlg.ui:33
+#. i18n: ectx: property (clickMessage), widget (KLineEdit, url)
 #: rc.cpp:784
-msgid "Optional data:"
+msgid "Enter a URL"
 msgstr ""
 
-#. i18n: file: ui/metalinkcreator/dragdlg.ui:169
-#. i18n: ectx: property (text), widget (QLabel, label_6)
+#. i18n: file: ui/mirror/mirroradddlg.ui:53
+#. i18n: ectx: property (text), widget (QLabel, labelPriority)
 #: rc.cpp:787
-msgid "Enter information that all chosen files share."
+msgid "Priority:"
 msgstr ""
 
-#. i18n: file: ui/verificationadddlg.ui:29
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:793
-msgctxt "hash type as in md5t, sha1 etc."
-msgid "Hash type:"
+#. i18n: file: ui/mirror/mirroradddlg.ui:60
+#. i18n: ectx: property (toolTip), widget (KIntNumInput, priority)
+#: rc.cpp:790
+msgid "Optional: The priority of the mirror, 1 highest 999999 lowest."
 msgstr ""
 
-#. i18n: file: ui/verificationadddlg.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ui/mirror/mirroradddlg.ui:79
+#. i18n: ectx: property (text), widget (QLabel, labelLocation)
 #: rc.cpp:796
-msgctxt "hash as a hash of type md5, sha1 etc."
-msgid "Hash:"
+msgid "Location:"
 msgstr ""
 
-#. i18n: file: ui/verificationadddlg.ui:43
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, newHash)
+#. i18n: file: ui/verificationdialog.ui:42
+#. i18n: ectx: property (toolTip), widget (KPushButton, verify)
 #: rc.cpp:799
-msgid "Enter a hash key"
+msgid "Verify the finished download with the selected checksum."
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:32
-#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
+#. i18n: file: ui/verificationdialog.ui:45
+#. i18n: ectx: property (text), widget (KPushButton, verify)
 #: rc.cpp:802
-msgid "Group Settings"
+msgid "&Verify"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:44
-#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ui/verificationdialog.ui:71
+#. i18n: ectx: property (text), widget (QLabel, label_3)
 #: rc.cpp:805
-msgid "Default folder:"
+msgid "Verifying:"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:58
-#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
+#. i18n: file: ui/history/transferhistory.ui:27
+#. i18n: ectx: property (text), widget (QPushButton, clearButton)
 #: rc.cpp:808
-msgid "Moves all transfers with the regular expression to this group"
+msgid "Clear History"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:61
-#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ui/history/transferhistory.ui:47
+#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:811
-msgid "Regular expression:"
+msgid "View Modes:"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:68
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, regExpEdit)
+#. i18n: file: ui/history/transferhistory.ui:77
+#. i18n: ectx: property (text), widget (QLabel, label_2)
 #: rc.cpp:814
-msgid "*movies*"
+msgid "Select Ranges:"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:75
-#. i18n: ectx: property (text), widget (QCheckBox, downloadCheck)
+#. i18n: file: ui/history/transferhistory.ui:85
+#. i18n: ectx: property (text), item, widget (KComboBox, rangeType)
 #: rc.cpp:817
-msgid "Maximum download speed:"
+msgid "Date"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:91
-#. i18n: ectx: property (suffix), widget (QSpinBox, downloadBox)
-#. i18n: file: ui/groupsettingsdialog.ui:117
-#. i18n: ectx: property (suffix), widget (QSpinBox, uploadBox)
-#. i18n: file: ui/transfersettingsdialog.ui:55
-#. i18n: ectx: property (suffix), widget (QSpinBox, uploadSpin)
-#. i18n: file: ui/transfersettingsdialog.ui:77
-#. i18n: ectx: property (suffix), widget (QSpinBox, downloadSpin)
-#: rc.cpp:820 rc.cpp:826 rc.cpp:874 rc.cpp:880
-msgid " KiB"
+#. i18n: file: ui/history/transferhistory.ui:95
+#. i18n: ectx: property (text), item, widget (KComboBox, rangeType)
+#: rc.cpp:823
+msgid "Host"
 msgstr ""
 
-#. i18n: file: ui/groupsettingsdialog.ui:101
-#. i18n: ectx: property (text), widget (QCheckBox, uploadCheck)
-#: rc.cpp:823
-msgid "Maximum upload speed:"
+#. i18n: file: ui/history/transferhistory.ui:106
+#. i18n: ectx: property (placeholderText), widget (KLineEdit, searchBar)
+#: rc.cpp:826
+msgid "Filter history"
+msgstr ""
+
+#. i18n: file: ui/history/transferhistory.ui:120
+#. i18n: ectx: property (text), widget (KLineEdit, searchBar)
+#: rc.cpp:829
+msgctxt "delete selected transfer"
+msgid "Delete Selected"
+msgstr ""
+
+#. i18n: file: ui/history/transferhistory.ui:125
+#. i18n: ectx: property (text), widget (KLineEdit, searchBar)
+#: rc.cpp:832
+msgid "Download"
 msgstr ""
 
 #. i18n: file: ui/signaturedlg.ui:80
 #. i18n: ectx: property (text), widget (QLabel, binaryLabel)
-#: rc.cpp:832
+#: rc.cpp:841
 msgid "Has binary PGP signature."
 msgstr ""
 
 #. i18n: file: ui/signaturedlg.ui:87
 #. i18n: ectx: property (text), widget (QLabel, asciiLabel)
-#: rc.cpp:835
+#: rc.cpp:844
 msgid "Ascii PGP signature:"
 msgstr ""
 
 #. i18n: file: ui/signaturedlg.ui:112
 #. i18n: ectx: property (text), widget (KPushButton, loadSignature)
-#: rc.cpp:838
+#: rc.cpp:847
 msgid "Load Signature"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:254
+#. i18n: file: ui/signaturedlg.ui:119
 #. i18n: ectx: property (text), widget (KPushButton, verify)
-#: rc.cpp:862
+#: rc.cpp:850
 msgid "Verify"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:80
+#. i18n: file: ui/signaturedlg.ui:131
 #. i18n: ectx: property (title), widget (QGroupBox, keyGroup)
-#: rc.cpp:838
+#: rc.cpp:853
 msgid "Key"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:92
+#. i18n: file: ui/signaturedlg.ui:143
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:841
+#: rc.cpp:856
 msgid "Issuer:"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:115
+#. i18n: file: ui/signaturedlg.ui:166
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:844
+#: rc.cpp:859
 msgid "E-Mail:"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:132
+#. i18n: file: ui/signaturedlg.ui:183
 #. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:847
+#: rc.cpp:862
 msgid "Comment:"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:146
+#. i18n: file: ui/signaturedlg.ui:197
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:850
+#: rc.cpp:865
 msgid "Creation:"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:163
+#. i18n: file: ui/signaturedlg.ui:214
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:853
+#: rc.cpp:868
 msgid "Expiration:"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:191
+#. i18n: file: ui/signaturedlg.ui:255
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:856
+#: rc.cpp:871
 msgid "Trust:"
 msgstr ""
 
-#. i18n: file: ui/signaturedlg.ui:219
+#. i18n: file: ui/signaturedlg.ui:296
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:859
+#: rc.cpp:874
 msgid "Fingerprint:"
 msgstr ""
 
-#. i18n: file: ui/transfersettingsdialog.ui:23
-#. i18n: ectx: property (text), widget (KTitleWidget, ktitlewidget)
-#: rc.cpp:865
-msgid "Transfer Settings"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:35
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:868
-msgid "Download Destination:"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:52
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, uploadSpin)
-#. i18n: file: ui/transfersettingsdialog.ui:74
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, downloadSpin)
-#. i18n: file: ui/transfersettingsdialog.ui:96
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, ratioSpin)
-#: rc.cpp:871 rc.cpp:877 rc.cpp:883
-msgctxt "No value has been set"
-msgid "Not set"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:103
-#. i18n: ectx: property (text), widget (QLabel, labelUpload)
-#: rc.cpp:886
-msgid "Upload Limit:"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:110
-#. i18n: ectx: property (text), widget (QLabel, labelDownload)
-#: rc.cpp:889
-msgid "Download Limit:"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:117
-#. i18n: ectx: property (text), widget (QLabel, labelShareRatio)
-#: rc.cpp:892
-msgid "Maximum Share Ratio:"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:140
-#. i18n: ectx: property (toolTip), widget (KPushButton, mirrors)
-#: rc.cpp:895
-msgid "Modify the mirrors used for downloading."
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:143
-#. i18n: ectx: property (text), widget (KPushButton, mirrors)
-#: rc.cpp:898
-msgctxt "The available mirrors (servers) for downloading"
-msgid "Mirrors"
-msgstr ""
-
-#. i18n: file: ui/transfersettingsdialog.ui:163
-#. i18n: ectx: property (text), widget (KPushButton, verification)
-#: rc.cpp:904
-msgctxt "verification of the download (e.g. by using MD5)"
-msgid "Verification"
-msgstr ""
-
-#. i18n: file: ui/mirror/mirroradddlg.ui:29
-#. i18n: ectx: property (text), widget (QLabel, labelMirror)
-#: rc.cpp:911
-msgid "Mirror:"
-msgstr ""
-
-#. i18n: file: ui/mirror/mirroradddlg.ui:36
-#. i18n: ectx: property (text), widget (QLabel, labelConnections)
-#: rc.cpp:914
-msgid "Number of connections:"
-msgstr ""
-
-#. i18n: file: ui/mirror/mirroradddlg.ui:43
-#. i18n: ectx: property (clickMessage), widget (KLineEdit, url)
-#: rc.cpp:917
-msgid "Enter a URL"
-msgstr ""
-
-#. i18n: file: ui/mirror/mirroradddlg.ui:63
-#. i18n: ectx: property (text), widget (QLabel, labelPriority)
-#: rc.cpp:920
-msgid "Priority:"
-msgstr ""
-
-#. i18n: file: ui/mirror/mirroradddlg.ui:70
-#. i18n: ectx: property (toolTip), widget (KIntNumInput, priority)
-#: rc.cpp:923
-msgid "Optional: The priority of the mirror, 1 highest 999999 lowest."
-msgstr ""
-
-#. i18n: file: ui/mirror/mirroradddlg.ui:89
-#. i18n: ectx: property (text), widget (QLabel, labelLocation)
-#: rc.cpp:929
-msgid "Location:"
-msgstr ""
-
 #. i18n: file: ui/kgetui.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:932
+#: rc.cpp:877
 msgid "&File"
 msgstr ""
 
-#. i18n: file: ui/kgetui.rc:17
+#. i18n: file: ui/kgetui.rc:16
 #. i18n: ectx: Menu (Downloads)
-#: rc.cpp:935
+#: rc.cpp:880
 msgid "&Downloads"
 msgstr ""
 
-#. i18n: file: ui/kgetui.rc:34
+#. i18n: file: ui/kgetui.rc:33
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:938
+#: rc.cpp:883
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: ui/kgetui.rc:38
+#. i18n: file: ui/kgetui.rc:36
 #. i18n: ectx: Menu (help)
-#: rc.cpp:941
+#: rc.cpp:886
 msgid "&Help"
 msgstr ""
 
-#. i18n: file: ui/kgetui.rc:41
+#. i18n: file: ui/kgetui.rc:39
 #. i18n: ectx: ToolBar (kget_toolbar)
-#: rc.cpp:944
+#: rc.cpp:889
 msgid "Main Toolbar"
 msgstr ""
 
-#. i18n: file: conf/kget.kcfg:39
-#. i18n: ectx: label, entry (ShowSplashscreen), group (Appearance)
-#: rc.cpp:947
-msgid "Sets to show the splashscreen while KGet is loading"
-msgstr ""
-
-#. i18n: file: conf/kget.kcfg:186
+#. i18n: file: conf/kget.kcfg:178
 #. i18n: ectx: label, entry (HistoryColumnWidths), group (Geometry)
-#: rc.cpp:950
+#: rc.cpp:892
 msgid "The width of the columns in the history view"
 msgstr ""
 
-#. i18n: file: transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg:12
-#. i18n: ectx: label, entry (SearchEnginesNameList), group (SearchEngines)
-#. i18n: file: transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg:9
-#. i18n: ectx: label, entry (SearchStrings), group (ChecksumSearch)
-#: rc.cpp:953 rc.cpp:959
-msgid "List of the available search engines"
+#. i18n: file: transfer-plugins/contentfetch/kget_contentfetchfactory.kcfg:9
+#. i18n: ectx: label, entry (UrlRegexpList), group (UserScripts)
+#: rc.cpp:899
+msgid "List of the Regexp to match input URL"
 msgstr ""
 
+#. i18n: file: transfer-plugins/contentfetch/kget_contentfetchfactory.kcfg:13
+#. i18n: ectx: label, entry (PathList), group (UserScripts)
 #. i18n: file: transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg:16
 #. i18n: ectx: label, entry (SearchEnginesUrlList), group (SearchEngines)
 #. i18n: file: transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg:13
 #. i18n: ectx: label, entry (UrlChangeModeList), group (ChecksumSearch)
 #. i18n: file: transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg:17
 #. i18n: ectx: label, entry (ChecksumTypeList), group (ChecksumSearch)
-#. i18n: file: transfer-plugins/contentfetch/kget_contentfetchfactory.kcfg:13
-#. i18n: ectx: label, entry (PathList), group (UserScripts)
-#: rc.cpp:956 rc.cpp:962 rc.cpp:965 rc.cpp:971
+#: rc.cpp:902 rc.cpp:919 rc.cpp:925 rc.cpp:928
 msgid "List of the available search engine URLs"
 msgstr ""
 
-#. i18n: file: transfer-plugins/contentfetch/kget_contentfetchfactory.kcfg:9
-#. i18n: ectx: label, entry (UrlRegexpList), group (UserScripts)
-#: rc.cpp:968
-msgid "List of the Regexp to match input URL"
-msgstr ""
-
 #. i18n: file: transfer-plugins/contentfetch/kget_contentfetchfactory.kcfg:21
 #. i18n: ectx: label, entry (DescriptionList), group (UserScripts)
-#: rc.cpp:974
+#: rc.cpp:905
 msgid "List of descriptions for user scripts"
 msgstr ""
 
 #. i18n: file: transfer-plugins/contentfetch/kget_contentfetchfactory.kcfg:25
 #. i18n: ectx: label, entry (EnableList), group (UserScripts)
-#: rc.cpp:977
+#: rc.cpp:908
 msgid "List of whether the script is enabled"
 msgstr ""
+
+#. i18n: file: transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg:12
+#. i18n: ectx: label, entry (SearchEnginesNameList), group (SearchEngines)
+#. i18n: file: transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg:9
+#. i18n: ectx: label, entry (SearchStrings), group (ChecksumSearch)
+#: rc.cpp:916 rc.cpp:922
+msgid "List of the available search engines"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgoldrunner.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgoldrunner.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgoldrunner.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgoldrunner.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kgoldrunner\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:37+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:48+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:06+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -43,7 +43,7 @@
 msgid "&Themes"
 msgstr ""
 
-#. i18n: file: src/kgoldrunnerui.rc:52
+#. i18n: file: src/kgoldrunnerui.rc:53
 #. i18n: ectx: ToolBar (editToolbar)
 #: rc.cpp:11
 msgid "Edit Toolbar"
@@ -462,915 +462,955 @@
 "but it is much harder."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:2
-msgid "Mazes"
+#: gamedata/game_cnt.txt:2
+msgid "Count"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:3
+#: gamedata/game_cnt.txt:3
 msgid ""
-"Mazes, mazes, mazes.  Some with enemies, some without.  While occasionally "
-"you will need to kill an enemy, as a general rule it is best not to kill "
-"them, because they reappear at the top and block your exit.\n"
+"This game is based on counting, from 0 to 16 (or 0 to 10 in hexadecimal).  "
+"The first level has no gold and no enemies: the problem is to find a way out "
+"and up to the next level.  After that, the number of enemies and pieces of "
+"gold increases by 1 at each level.  The name of each level corresponds to "
+"the number of enemies, the pieces of gold and the digits that appear in the "
+"layout.\n"
 "\n"
-"Another great set of Championship levels from Steve Mann <smann at cgl "
-"uwaterloo ca>.  The levels are named after dwarves in myths and stories "
-"(with a few named after elves), beginning with the seven dwarves from "
-"Disney's version of Snow White."
+"These elegant and rather tricky Championship levels were composed by Steve "
+"Mann <smann at cgl uwaterloo ca>."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:8
-msgid "Dopey"
+#: gamedata/game_cnt.txt:8
+msgid "Zero"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:9
+#: gamedata/game_cnt.txt:9
 msgid ""
-"Fairly simple, just avoid falling off the ladders.  There are several ways "
-"to get past the two enemies at the end.  One of the quickest is to wait on a "
-"tall vertical ladder, just below the second highest horizontal ladder, until "
-"the path to the exit is clear."
-msgstr ""
-
-#: gamedata/game_MAZ.txt:12
-msgid "Sleepy"
-msgstr ""
-
-#: gamedata/game_MAZ.txt:13
-msgid "A lot of backtracking, but nothing too difficult here."
+"The only challenge is getting inside the 0, which is the only path to the "
+"exit.\n"
+"\n"
+"Getting inside the 0 requires climbing to the top of the zigzag ladder, "
+"digging away five bricks on the left edge of the 0, racing back to the top "
+"of the zigzag ladder, over the pole, falling through your recently dug "
+"bricks and immediately moving right to get into the 0.  The timing is fairly "
+"tight."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:16
-msgid "Doc"
+#: gamedata/game_cnt.txt:14
+msgid "One"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:17
-msgid "A few tricks to figure out how to get the gold, but nothing too hard."
+#: gamedata/game_cnt.txt:15
+msgid ""
+"Getting the gold requires multiple digs in the right places.  However, see "
+"the next paragraph.\n"
+"\n"
+"To get out, you have to get the enemy to go over the top of the 1 and fill "
+"the pit at the bottom.  There are three ways to do this.  The first and most "
+"sensible is to wait on the pole above the top right edge of the 1 until the "
+"enemy is almost upon you and then move to the right, digging to your right "
+"as you reach the bottom of the 1.\n"
+"\n"
+"The second way involves timing your digging for the gold (or where the gold "
+"was); moving onto the gold at the right time will cause the enemy to fall "
+"into the pit on the right of the 1.  The third way is to destroy the enemy "
+"and hope he reappears over the right side of the 1."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:20
-msgid "Grumpy"
+#: gamedata/game_cnt.txt:22
+msgid "Two"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:21
-msgid "Visually confusing, but otherwise a simple maze."
+#: gamedata/game_cnt.txt:23
+msgid ""
+"To get the leftmost gold drop down on it from above, stepping one square to "
+"either side as you fall.  Immediately dig the square that was just below the "
+"gold and step in.  The false floor will drop you to the bottom."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:24
-msgid "Sneezy"
+#: gamedata/game_cnt.txt:26
+msgid "Three"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:25
+#: gamedata/game_cnt.txt:27
 msgid ""
-"Mostly straightforward, the only trick here is how to draw off the enemies "
-"so as to get past them.  In the beginning, try to lure the top two enemies "
-"into the top-center pit.  This gives you enough time to slip past them.  The "
-"enemy on the bottom is relatively easy to avoid (twice).  To get past the "
-"top two enemies on your way back, lure the first one deep into the maze "
-"until you find a way back past him, then lure the second one to the section "
-"with the pole near the top."
+"After getting all the gold, the only escape is up the highest ladder on the "
+"left, but it is not connected to anything.  To reach it, you will need to "
+"entice an enemy to follow you, then step across the enemy to reach the "
+"ladder."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:28
-msgid "Bashful"
+#: gamedata/game_cnt.txt:30
+msgid "Four"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:29
+#: gamedata/game_cnt.txt:31
 msgid ""
-"To reach the two pieces of gold stacked one above the other, you have to "
-"drop through a trap below one of the ladders above that section.\n"
+"At the start, you need to race to the floor to the right.  You will need to "
+"trap some enemies (with luck, you will get a piece of gold in the process), "
+"but you should easily be able to go up the ladders shaped like a 4, on the "
+"right. \n"
 "\n"
-"Leave the piece of gold at the upper left until the very last."
+"When getting the gold from the 4, wait until the enemies have reached the "
+"top of the ladders shaped like a 4.  This will allow you enough time to "
+"reach the ladders before the enemies cut you off."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:34
-msgid "Happy"
+#: gamedata/game_cnt.txt:36
+msgid "Five"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:35
+#: gamedata/game_cnt.txt:37
 msgid ""
-"There are two tricks to this level.  First, if you want gold that is high, "
-"move low to draw the enemies down, then move up to get the gold - and vice-"
-"versa.  Second, at times you will need to use the ladder trick: if you are "
-"on a vertical ladder with an enemy above you, sometimes the enemy will run "
-"away from you."
+"In the beginning, climb down the first set of ladders and wait on the lowest "
+"section until the enemies have settled in their positions.  Then drop to the "
+"floor and aim for the big ladder at the right with the fork at the bottom.  "
+"The fork is what enables you to get past the enemies above: wait at the "
+"floor level of the left rung (not below the floor level!) until the enemy on "
+"the long ladder drops next to you.  Then climb up and to the right to get up "
+"the big ladder."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:38
-msgid "Glorfindel"
+#: gamedata/game_cnt.txt:40
+msgid "Six"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:39
+#: gamedata/game_cnt.txt:41
 msgid ""
-"To get the piece of gold at mid-left, you will need to lure the enemy across "
-"the pole and run across him as he gets to the end of the pole.  The same "
-"trick will be needed to get back, unless he follows you back across the "
-"pole; then you will need to find another place to dodge past him."
+"The first trick for this level is to time when you go through the bottom of "
+"the 6 with the enemy climbing up the ladder to the left of the 6.  Once you "
+"get on the ladder, the enemies will climb up the ladder away from you, so "
+"you just need to wait until there are no enemies low on the ladder before "
+"digging through the bottom of the 6.\n"
+"\n"
+"The second trick is figuring how to get all the enemies off the ladder on "
+"the left of the screen.  One way is to sit on top of the big 6 in the middle "
+"and wait for them to come over the poles.  Then drop to the floor and cross "
+"to the ladder."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:42
-msgid "Hreidmar"
+#: gamedata/game_cnt.txt:46
+msgid "Seven"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:43
+#: gamedata/game_cnt.txt:47
 msgid ""
-"Be careful not to let the enemies get the gold - it is hard to get it away "
-"from them!  Otherwise, by moving into the middle section, you can get most "
-"of the enemies to move up and to the right.  This allows you to get the gold "
-"on the bottom level.  Some of the bricks on the bottom level are traps.  "
-"When an enemy gets close, you can drop into the trap, step to the side and "
-"move over the enemy.  But it is better to maneuver the enemies so that they "
-"stay away from the bottom section while you are down there getting the gold."
+"The gold on top of the 7 is the main challenge.  In the beginning, climb to "
+"the left most square of the top of the 7 and wait there until enemies fill "
+"the holes on top of the 7."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:46
-msgid "Ori"
+#: gamedata/game_cnt.txt:50
+msgid "Eight"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:47
+#: gamedata/game_cnt.txt:51
 msgid ""
-"A straightforward maze: the false brick underneath the ladder near the "
-"bottom center may prove useful."
+"With careful moves and timing, you can tempt two enemies over to the "
+"leftmost ladder and leave them there while you retrieve the five highest "
+"gold pieces.\n"
+"\n"
+"The three lowest pieces must be collected all in one pass, but you may need "
+"to force enemies towards the right of the 8 first, to avoid trouble when the "
+"ladders appear and you land on the floor.\n"
+"\n"
+"You can clear your final escape ladder by hitting the floor again, on the "
+"far right."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:50
-msgid "Nori"
+#: gamedata/game_cnt.txt:58
+msgid "Nine"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:51
+#: gamedata/game_cnt.txt:59
 msgid ""
-"The hardest part is when two enemies get in the center of the maze and you "
-"need to pass them.  Try to move down and to their left, lure one down, trap "
-"it and then go up to trap the other.  Otherwise, clever digging should deal "
-"with them."
+"In the beginning, drop as fast as you can to get to the floor.  Dig several "
+"pits on the bottom to delay the enemies from coming up the ladder.  Then "
+"grab the two pieces of gold off the left side of the 9 while there are no "
+"enemies around, digging to enter the 9 after grabbing the higher of these "
+"two pieces.\n"
+"\n"
+"To get the gold from the bottom of the 9, stand on the left enemy, dig left "
+"and move right.  The two enemies will start to move left, fall, and climb "
+"the ladder.  When the first one gets stuck where you just dug, jump in the "
+"lowest part of the 9 and dig to the left.  The next enemy will carry the "
+"gold down.  Grab it, dig to the right, drop down to the pole and escape as "
+"quickly as you can."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:54
-msgid "Dori"
+#: gamedata/game_cnt.txt:64
+msgid "Ten"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:55
+#: gamedata/game_cnt.txt:65
 msgid ""
-"The only trick to this level is using the hidden passages and enticing the "
-"enemies to use them."
+"You can trap several enemies in the pits at the bottom left and right, but "
+"they will get loose when the hidden ladders appear.  Dropping to the floor "
+"during your escape can help clear your path to the top right."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:58
-msgid "Bombur"
+#: gamedata/game_cnt.txt:68
+msgid "Eleven"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:59
+#: gamedata/game_cnt.txt:69
 msgid ""
-"There are several ways to get past an enemy who is in the ladder-trap loop.  "
-"One is to wait next to the trap and when the enemy is half-way up the "
-"ladder, step into the trap and move immediately to the left and down.  "
-"However, at the start, you might get three enemies in the ladder-trap loop.  "
-"Avoid this.  One of the three can break out of the loop, but the other two "
-"remain trapped, leaving you no way to get past them."
+"Get the piece of gold below the left side of the poles shaped like an 11 "
+"first, then grab the piece on the base of the left 1 of the central 11.  Now "
+"drop to the floor just to the left of the double high wall.  The enemies "
+"will drop into different sections.  You now want to do three things: get the "
+"gold in the left and center sections, take gold from the enemies to the "
+"right of you when on the floor and lure as many enemies as you can into the "
+"section to the left of the 11.\n"
+"\n"
+"The first two tasks are relatively easy: the last task can be accomplished "
+"in several ways.  If you run up the center ladder and move over the left, "
+"you can wait above the right hand side of the poles (possibly dropping onto "
+"the poles) and lure a few enemies at a time from the center section to the "
+"left section.  You can also pick up a piece of gold or two while doing "
+"this.\n"
+"\n"
+"Once you have all the gold (except the pieces to the right of the 11), run "
+"to the top right of the H of ladders in the middle.  This will cause all the "
+"enemies not in the far right section to move into the left section."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:62
-msgid "Luthien"
+#: gamedata/game_cnt.txt:76
+msgid "Twelve"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:63
+#: gamedata/game_cnt.txt:77
 msgid ""
-"After dodging the first enemy you come to, try not to jump off and grab the "
-"floating piece of gold in the center too soon.  If you do, the enemy you "
-"just dodged will drop to the lower level, grab a piece of gold and head for "
-"the floor where you can not get the gold away from him."
+"This is a slow level with lots of waiting for enemies to move where you want "
+"them.\n"
+"\n"
+"At the start, fall onto the nearest enemy as it falls and move onto the "
+"right hand poles to get the piece of gold just below them.  Be sure to wait "
+"for an opening in the enemies below before dropping onto this gold piece. \n"
+"\n"
+"The grid of 12 boxes on the right is useful.  If you are on this grid but "
+"below the top of it, enemies climbing the ladder just left of the grid will "
+"not drop onto the grid and chase you.  You can wait near the bottom of the "
+"grid until the enemies move above the pits of brick and concrete at the "
+"bottom left, then you can fall to the floor.  This will cause the enemies to "
+"fall into the pits and become trapped.\n"
+"\n"
+"Another useful trick is to wait at the top of the ladder on the far left "
+"(where you start the level).  Any enemies far enough away will run over the "
+"top of the grid of boxes and drop into the trapped area on the right.\n"
+"\n"
+"To get the gold on the leftmost floor area, you need to fill the second "
+"section of floor with enemies and dig out the squares that block the enemies "
+"in the leftmost region.  You may want to lose that gold (i.e. have the enemy "
+"carrying the gold enter a dug square and be destroyed there), although it is "
+"possible to get this piece of gold if you really want it.\n"
+"\n"
+"If you leave the leftmost suspended gold until last, then it is easy to "
+"escape to the top.  Alternatively, if you leave the gold inside the 2 for "
+"last, you should be able to escape without much difficultly.  Otherwise, the "
+"enemies trapped on the far left will cut off your escape route."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:66
-msgid "Bofur"
+#: gamedata/game_cnt.txt:90
+msgid "Thirteen"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:67
+#: gamedata/game_cnt.txt:91
 msgid ""
-"If you have two or more enemies between you and where you want to go, you "
-"may find the diggable columns useful.  Dig two layers, wait one from the top "
-"to trap the first enemy and then move to the top to trap the second enemy."
+"In the beginning, wait on the top of the left (or better, right) branch of "
+"the leftmost ladders until the enemies in the middle climb to the middle of "
+"the center ladder.  Then drop to the horizontal ladder, move all the way to "
+"the right and drop to the floor, thus trapping several enemies.\n"
+"\n"
+"You have to release most of the enemies from where they are trapped, to get "
+"the gold from various places.  In particular, you have to release the "
+"enemies trapped on the left half of the floor to get at least one piece of "
+"gold.  \n"
+"\n"
+"Once you pick up the last piece of gold, the enemies will swarm the center "
+"ladder, so you will have to decide which piece of gold to pick up last.  A "
+"reasonable choice is the one held by the three enemies in the lowest leg of "
+"the 3, as is the one in the center arm of the 3."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:70
-msgid "Bifur"
+#: gamedata/game_cnt.txt:98
+msgid "Fourteen"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:71
+#: gamedata/game_cnt.txt:99
 msgid ""
-"Lots of gold, only one enemy and he is trapped!  It should be a cake walk!\n"
+"Four tricks: first, do not dig out the enemies trapped in the 4s on the left "
+"until towards the end (likewise if one gets trapped in the middle 4) - this "
+"leaves fewer enemies to deal with. \n"
 "\n"
-"The first part just involves digging (at most) to collect the gold.  But "
-"then there is no obvious way to get the gold on the bottom and on the left.  "
-"Look for a trap under the bottom of a ladder to get to it.  The only other "
-"trick is to get all the other gold and leave the enemy and its piece of gold "
-"to the last.  And watch out - since there is only one enemy, it is pretty "
-"fast!"
+"Second, you will need to ride down on top of an enemy to get the trapped "
+"gold in the 4s on the left and the floating piece of gold in the center.\n"
+"\n"
+"Third, when you release the enemies on the 4s along the right (and possibly "
+"the two in the 4s on the left), you may find it easier to double dig and "
+"lose those pieces of gold.\n"
+"\n"
+"Finally, it is easiest to escape at the end if you leave until last a piece "
+"of gold in or near the floating 14 at middle right.  Then you can run up the "
+"ladder that appears there."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:76
-msgid "Gloin"
+#: gamedata/game_cnt.txt:108
+msgid "Fifteen"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:77
+#: gamedata/game_cnt.txt:109
 msgid ""
-"The pit in the upper right is tricky.  To leave the maze, you need an enemy "
-"in the pit.  But you would rather not have him there before you have taken "
-"the gold out.  And if two enemies get in the pit before you get the gold, "
-"forget it."
+"Two hints: if you wait on one of the left two ladders one rung below the "
+"piece of gold suspended between the two ladders, the enemies in the middle "
+"will jump into the base of the 5.  This should allow you to easily get the "
+"gold between the 1 and the 5.\n"
+"\n"
+"Second, if you wait on the base of the 1 to the right of the one, the "
+"enemies on the right of the two ladders to the left of the 1 will jump off "
+"the pole onto the other half of the base of the 1.  If you wait high up "
+"between the 1 and the 5, then jump to the base of the 1, while the enemies "
+"are falling toward the base of the 1 you will be able to rush up the ladder "
+"to the left of the 1 and get the gold to the left of the 1."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:80
-msgid "Oin"
+#: gamedata/game_cnt.txt:114
+msgid "Sixteen"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:81
+#: gamedata/game_cnt.txt:115
 msgid ""
-"Look for false floors to get to places that are otherwise inaccessible.  You "
-"have to dig to find a couple of them."
+"The column to the left of the 1 requires a quick run down and back up, with "
+"careful dodging both ways to avoid the enemies.\n"
+"\n"
+"To get the gold in the middle of the 6, drop down on the top of the 'O' part "
+"of the 6, move right/dig left and immediately move left and dig left to "
+"delay the enemy who otherwise is likely to catch you.  However, you may wish "
+"to leave this piece of gold to the end so as not to free two additional "
+"enemies earlier; it is possible to get two enemies to retrap themselves in "
+"that section, though.\n"
+"\n"
+"To get the gold held by enemies in the bottom right, dig out the blocking "
+"square to their left, run up the ladder, dig off the right side of the 6, "
+"drop in, run left and dig off a square on the left side of the 6 and drop to "
+"the floor.  The timing is tight - only one or two enemies in the bottom "
+"right section will be able to move to the next section to the left.  You "
+"will still need to dig out the bottom of the 6 to get their gold, but that "
+"is straightforward albeit a bit hectic because of the enemies lingering to "
+"the left of the 6.\n"
+"\n"
+"Once you have gotten all the gold, you may find it easiest to exit by "
+"passing through the middle false floor on the 1 and exiting via the ladders "
+"on the left of the 1."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:84
-msgid "Kili"
+#. i18n:
+#. NOTES: Files 'gamedata/game_*.txt' are KGoldrunner DATA files.  They
+#. are installed in $KDEDIR/share/apps/kgoldrunner/system and contain
+#. names and descriptions of games, plus names and hints for levels.  You
+#. may sometimes need to look at the corresponding game or level graphics
+#. to work out a good translation (e.g. Initiation 25, Mongolian Horde).
+#. 
+#. To see any level of any game, run KGoldrunner, click on the New Game button
+#. and select the game and level from the list.  If you start to play a level,
+#. you will probably need to stop the animation by pressing the Pause key
+#. (default Esc or P).
+#. 
+#. The most urgent translations would be names and hints for the Tutorial
+#. games, then the game names and descriptions (as appearing in the main
+#. dialog box) and then the other level names and finally the remaining
+#. hints, which are intended for experienced players and champions.
+#. 
+#. Messages marked as NOTi18n should deliberately be left untranslated. The
+#. one below is never displayed and others, from time to time, would be long
+#. hint texts used by a small number of championship players, left untranslated
+#. to economise on translation effort.
+#. 
+#. The "Das Boot" message in level 97 of the Initiation game is the name of
+#. a German submarine warfare movie, left untranslated as a compliment to the
+#. original author of KGoldrunner, who is German.  The movie is known as
+#. "Das Boot" in many countries, including English-speaking countries.  If it
+#. is known by some other name in your country, please include that in your
+#. translation of the corresponding hint text.  See this Internet page:
+#. http://akas.imdb.com/title/tt0082096/releaseinfo#akas
+#. 
+#: gamedata/game_ende.txt:31
+msgid "TRANSLATORS: Please see the notes in the translation comment."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:85
+#: gamedata/game_GMEP.txt:2
+msgid "Jail Break"
+msgstr ""
+
+#: gamedata/game_GMEP.txt:3
 msgid ""
-"Get the gold in the middle and on the top before getting the gold on the "
-"bottom or lower left.  That way, if you have to kill an enemy (the one at "
-"the left is just asking for it) then they only block your way to the exit "
-"rather than make it impossible to gather the remaining gold."
+"Arrested for stealing and for robbing and trapping your enemies several "
+"times, you are held in prison.\n"
+"\n"
+"But the police are ruthless here and if you try to break out they will not "
+"lose any sleep over killing you...  So be careful and most important of all: "
+"be quick --- or be dead!\n"
+"\n"
+"These Championship levels use the quick and quirky KGoldrunner Rules and are "
+"composed by Gabriel Miltschitzky [gabriel dot miltschitzky at freenet de]"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:88
-msgid "Fili"
+#: gamedata/game_GMEP.txt:10
+msgid "Don't Panic!"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:89
+#: gamedata/game_GMEP.txt:11
 msgid ""
-"Lots of false bricks to trap you, or give you access to different parts of "
-"the maze.  Test below the ladders and other places.\n"
+"As the name of the level says, there is absolutely no need to panic.\n"
 "\n"
-"The four high trap in the middle is a show stopper: you can only get back "
-"past it once you have gathered all the gold.  So stay out of the lower right "
-"until you have cleared the rest of the gold.  Then drop through the trap "
-"below the top right ladder - there is no other way to get the piece of gold "
-"below it.  Once you are down here, there is no getting back to the top right "
-"until you have cleared all the gold.  After getting the piece of gold at "
-"center right, dig down to get the left of the two adjacent pieces.  The "
-"escape from the lower right comes when all the gold is gathered and a small "
-"section of ladder appears in the center."
+"It is very easy to escape from this prison, because the guards themselves "
+"are trapped and cannot touch you..."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:94
-msgid "Dwalin"
+#: gamedata/game_GMEP.txt:16
+msgid "Robbery"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:95
+#: gamedata/game_GMEP.txt:17
 msgid ""
-"A maze, but you can not see the path out.  You have to use the false floors. "
-" Trial and error is your only hope - try mapping it on paper if you are "
-"having trouble."
+"Being free again you need some money from somewhere.\n"
+"\n"
+"The trick is to tie up your enemies. If you can make each one fall onto a "
+"concrete block, that might help. On the other hand, you can just run a lot..."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:98 gamedata/game_MAZ.txt:184
-msgid "Durin"
+#: gamedata/game_GMEP.txt:22
+msgid "Use the Guards"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:99
+#: gamedata/game_GMEP.txt:23
 msgid ""
-"This diagonal maze is not too hard, except there is the occasional pit to "
-"get trapped in and that lone enemy is fast.  Try to lure the enemy down and "
-"into one of the pits.  Then the rest is almost a cake walk."
+"They may be ruthless, but they are predictable.\n"
+"\n"
+"When you reach the ladders on the right, wait for one guard to jump, then "
+"walk over his head to fetch the gold."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:102
-msgid "Dain"
+#: gamedata/game_GMEP.txt:28
+msgid "Falling Enemies (1) - Finding A Way"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:103
+#: gamedata/game_GMEP.txt:29
 msgid ""
-"There are too many enemies to fight up on the top level (there are not many "
-"bricks there for a reason).  Instead, wait on the level below and let them "
-"come to you.  Dig to escape and get the gold at bottom left.\n"
+"Make use of your enemies by walking over their heads.\n"
 "\n"
-"On the way back, stand on the top level and use the same trick to draw the "
-"enemies up there.  Dig a brick leading down and head for the exit.\n"
+"If there is more than one gap to cross, first make the enemies walk right, "
+"then start walking on their heads."
+msgstr ""
+
+#: gamedata/game_GMEP.txt:34
+msgid "Falling Enemies (2) - Digging"
+msgstr ""
+
+#: gamedata/game_GMEP.txt:35
+msgid "Start the level with a click. The rest should be self-explanatory..."
+msgstr ""
+
+#: gamedata/game_GMEP.txt:38
+msgid "Falling Enemies (3) - Hidden Ladders"
+msgstr ""
+
+#: gamedata/game_GMEP.txt:39
+msgid ""
+"This time they are more intelligent and are falling on you from above.\n"
 "\n"
-"The only tricky parts come when two enemies end up in the lower left, in the "
-"center (on your way back) or at the upper right.  Except for the last case, "
-"you should be able to complete the level without intentionally trapping any "
-"enemies, but some may inadvertently fall into your two pits."
+"First, dig all the bricks on the way to the gold.\n"
+"\n"
+"After that, run back to the middle and wait for the reborn enemies to fall. "
+"You will have to trap the leaders while you wait for the others. On the way "
+"up, keep an eye out for more reborn enemies."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:110
-msgid "Duergar "
+#: gamedata/game_GMEP.txt:46
+msgid "Imprisoned Guards"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:111
+#: gamedata/game_GMEP.txt:47
 msgid ""
-"A maze without walls or enemies - how hard can it be?  But the traps act as "
-"walls, and the enemies would just fill the traps, so perhaps this is another "
-"one where you will want to draw a map.  Note that you can probe for traps by "
-"digging, but that can lead to a rather slow game while you wait for the "
-"bricks you dig to refill."
+"It is easy enough to break into the main structure, but to collect all the "
+"gold and get out again, you will need to walk on an enemy's head."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:114
-msgid "Balin"
+#: gamedata/game_GMEP.txt:50
+msgid "Forbidden Gold"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:115
+#: gamedata/game_GMEP.txt:51
 msgid ""
-"To get through the center, you will have to clear it of enemies, but there "
-"is only one diggable brick.  Use it to drop through, race to the right and "
-"go up to the row above the dug brick.  There is just enough time to entice "
-"the enemy into the closing hole.  Repeat as necessary.\n"
+"You escaped them very nicely in the last few levels.\n"
 "\n"
-"To leave the maze, you need to find a way through the long diagonal barrier "
-"of ladders.  Beneath one of them is a false floor to use for your escape "
-"route."
+"Now you are free again and may do whatever you please. Everything except "
+"stealing the gold again, needless to say..."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:120
-msgid "Gimli"
+#: gamedata/game_GMEP.txt:56
+msgid "Dig Your Way Out"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:121
+#: gamedata/game_GMEP.txt:57
 msgid ""
-"The enemies are paper tigers, although you need a trick to get past the "
-"first one.  Stand on top of the ladder to the left of the false brick.  When "
-"the enemy moves over the ladder to the right of the false brick, move down "
-"your ladder, enticing the enemy to move down into the false brick.  Quickly "
-"move up and over the enemy's head.\n"
+"No guards and you are still asking for help?\n"
 "\n"
-"Otherwise, it is just a matter of maneuvering the enemies to a place where "
-"you can trap them or pass by them.  The only real problem occurs if an enemy "
-"grabs a piece of gold and gets stuck somewhere and you can not dig him out.  "
-"Oh, well, sometimes you lose.\n"
+"Well, you can get it.\n"
 "\n"
-"To get out of the center section, search for the double trap on the left."
+"Dig the bricks next to the bar. When you fall, quickly find a way back to "
+"the bar so that you can cross over into the niche. Of course you can only "
+"succeed if you know the way and do not hesitate. There is not much time to "
+"spare..."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:128
-msgid "Brokkr"
+#: gamedata/game_GMEP.txt:64
+msgid "An Unpleasant Cellmate"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:129
+#: gamedata/game_GMEP.txt:65
 msgid ""
-"Leave the piece of gold just down and to your right until last.  To get back "
-"to this section of the maze, you will need to dig through the wall a bit "
-"further down and to the right.  The easiest way to handle most of the "
-"enemies is to lure them along until they fall into a pit.  But beware, the "
-"pits fill with ladders once you have all the gold, allowing the trapped "
-"enemies to escape."
+"Click to start the level and he will be trapped before he can do you any "
+"harm."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:132 gamedata/game_MAZ.txt:168
-msgid "Thrain"
+#: gamedata/game_GMEP.txt:68
+msgid "Awaiting Enemies"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:133
+#: gamedata/game_GMEP.txt:69
 msgid ""
-"Mostly straightforward, but beware of a couple of one-way gates, in "
-"particular in the section at the top, right of center.  Be sure to clear out "
-"all the gold before freeing the trapped enemy at top right, who has a piece "
-"of gold.  You will also need to use the false floor on the far right at the "
-"top."
+"They will not do anything to you if you stay where you are. They just want "
+"to protect their gold."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:136
-msgid "Thorin"
+#: gamedata/game_GMEP.txt:72
+msgid "Too Many Guards"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:137
+#: gamedata/game_GMEP.txt:73
 msgid ""
-"In the beginning, rush to the top of the pyramid-like structure, dig off the "
-"top, go down and get two pieces of gold.  Then lure the enemies into the "
-"area under the pyramid and move down and to the left.  This can cause an "
-"enemy to be trapped and others to move into areas where they are harmless.  "
-"If any enemies follow you, escape to the bottom left, collecting some gold "
-"on the way.\n"
+"This level is difficult, but definitely not impossible.\n"
 "\n"
-"To get the piece of gold in the upper left, you first have to lure the one "
-"enemy out of that section.  After collecting the gold, you may find yourself "
-"threatened by enemies to your right.  If so, go to the lowest level of the "
-"section that you can reach without digging.  The enemies will go into a side "
-"corridor, giving you enough time to run up over the bar and reach the top of "
-"the pyramid just ahead of them.\n"
+"Get rid of the first group of guards by leading them to the bottom. Here is "
+"how. Go to the lowest ladders and stay on the rightmost low ladder for an "
+"instant, then quickly go back left so that only one enemy is following you. "
+"Wait on the leftmost low ladder until he also reaches the lowest ladders, "
+"then quickly climb up and to the left. He will jump to the ground. Repeat "
+"this trick with all the guards at this location.\n"
 "\n"
-"The rest is just hard work."
+"The next guard should be easy to pass, but after that you will have some "
+"work to do... When you climb the ladder next to the concrete, the guard will "
+"start running to the leftmost ladder and back. You must find the right "
+"moment to ride across on his head.\n"
+"\n"
+"The last section involves some digging. First fall through the tunnel of "
+"false bricks on the left, not forgetting to take the gold as you pass by. "
+"Then climb up the long ladder. The third brick over to the right is a trap. "
+"Fall into it, then dig right and five times left as you fall. Continue on "
+"down. Dig the lower of two bricks that have spaces above them, climb up the "
+"rightmost ladders to the first brick you dug (hoping it has not closed by "
+"now), then head right and on up to the exit."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:144
-msgid "Telchar"
+#: gamedata/game_GMEP.txt:82
+msgid "Caught In The Heights"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:145
+#: gamedata/game_GMEP.txt:83
 msgid ""
-"False floors are the key to this level.  The way into a section is often not "
-"the way out.  Many of the enemies will get trapped if you move low enough.  "
-"Save the middle bottom gold for last: you can not get out of this section "
-"until a hidden ladder appears."
+"As soon as you move down they will chase you till you are dead. So you are "
+"advised to plan an exact route before you start your escape attempt."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:148
-msgid "Dvergar"
+#: gamedata/game_GMEP.txt:86
+msgid "Teamwork (1) - The Liberation"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:149
+#: gamedata/game_GMEP.txt:87
 msgid ""
-"When you collect the gold at top left, you may have trouble leaving the "
-"section.  The obvious way out (at the foot of the ladder) does not work "
-"because of a false brick.  Instead, you need to plan ahead when you dig into "
-"this section.  Dig out the piece of wall that blocks your exit to the right, "
-"then quickly go up and grab the gold, then back down and out through the "
-"missing wall before it reappears.  There is a false brick here, so be sure "
-"to dig as you fall into it.\n"
+"You need the first enemy to help you break out.\n"
 "\n"
-"After getting the last piece of gold, you can exit through the center, where "
-"a new piece of ladder allows you to dig and re-enter the left of the maze."
+"The gold on the left just needs a bit of timing.\n"
+"\n"
+"As you go up and over to the right, make sure your team mate does not fall "
+"into the concrete pit. To collect the three gold pieces on the right, try to "
+"keep him on the left hand ladder, so that you can jump over his head to the "
+"gold.\n"
+"\n"
+"When you go up and left, there is a ladder standing on a concrete column. "
+"Walk over your friend's head to reach it and stay above him. The first brick "
+"to the left of you is a trap. Walk on his head so that he falls into the "
+"trap and not you. But then you must liberate him again if you want to reach "
+"the highest ladders.\n"
+"\n"
+"Better be nice to your team mate: you will probably have to get along with "
+"him for the next couple of levels..."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:154
-msgid "Thingol"
+#: gamedata/game_GMEP.txt:98
+msgid "Teamwork (2) - Diving Platforms"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:155
-msgid ""
-"There is one piece of gold that must be grabbed at the start.\n"
-"\n"
-"When you go to the lower part of the maze, the enemies will go down and stay "
-"there.  This makes it easy to get the gold up high, but it becomes hard to "
-"collect the gold in the lower left.  Try to get one or two pieces on your "
-"first trip down.\n"
-"\n"
-"By moving up and down on the bottom right ladder you can persuade the "
-"enemies to group on the left or right.  Grouping them to the left makes it "
-"easy to get the piece of gold just down and to the right of center.  Getting "
-"one enemy on the left and two on the right gives you a chance to get the "
-"remaining gold on the lower left, but consider getting it last after "
-"grouping all three enemies on the right, because you will then have more "
-"choice of ladders when dodging enemies on your way to the top."
+#: gamedata/game_GMEP.txt:99
+msgid "Start running immediately or you are doomed!"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:162
-msgid "Dvalin"
+#: gamedata/game_GMEP.txt:102
+msgid "Teamwork (3) - The Final Escape"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:163
+#: gamedata/game_GMEP.txt:103
 msgid ""
-"There are two problems.  First, in the early part you want to get the enemy "
-"just to the right of middle trapped in the bottom of that section.  This "
-"requires getting the gold on the left and passing through the trap doors at "
-"the right time, as well as racing to get the gold on the bottom left.  The "
-"gold on the bottom right is no big trick: just a small amount of timing and "
-"passing through the traps.\n"
+"This is the last level where you are working with your friend. I think he "
+"has helped you enough to deserve being liberated.\n"
 "\n"
-"The second problem is that at least one enemy will pick up a piece of gold.  "
-"Getting him to let go of that piece of gold is tough.  You need to lure that "
-"enemy into the top right section or the section down and to the left of "
-"that.  Draw the enemy to the ladder with a gap above it, in the middle of "
-"the section.  Wait two over to either side of this vacant square, leaving a "
-"brick between you and the vacant square.  The enemy will move up and down "
-"the ladder, in and out of the vacant square.  Eventually he will drop the "
-"gold on top of the ladder, at which point you have to move down to prevent "
-"him from moving back up the ladder and retaking the gold.  The timing is "
-"tight - good luck!  Alternatively, you can run around and trust to luck - "
-"the enemy will drop the piece of gold eventually!"
-msgstr ""
-
-#: gamedata/game_MAZ.txt:169
-msgid "Lots of false floors to use and avoid."
+"Sorry, I cannot help you further. There is nothing more to the level than "
+"sleight of hand."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:172
-msgid "Rumpelstiltskin"
+#: gamedata/game_GMGR.txt:2
+msgid "Gold Rush"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:173
+#: gamedata/game_GMGR.txt:3
 msgid ""
-"The main trick for this level is luring the enemies so that you can get "
-"around them, or in one case, so that you can walk over an enemy to collect a "
-"piece of gold.  The luring is not so hard, but the distances you have to "
-"lure them are long.  Maneuvering the enemy so that you can walk over him to "
-"get the piece of gold has timing that is a bit tight, but not too bad.\n"
+"Some little levels with Traditional rules which could take a while to "
+"solve.\n"
 "\n"
-"When you reach the section above your starting point, there are two ways "
-"out: one is a false brick under the short ladder.  But if you dig the other "
-"square and drop down, there is a a path through a false floor that avoids "
-"retracing all the early part of the maze."
+"Created by Gabriel Miltschitzky [gabriel dot miltschitzky at freenet de]"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:178
-msgid "Thror"
+#: gamedata/game_GMGR.txt:8
+msgid "Too Easy?"
 msgstr ""
 
-#: gamedata/game_MAZ.txt:179
+#: gamedata/game_GMGR.txt:9
 msgid ""
-"The two gold in the lower left are cut off from the rest of the maze.  On "
-"the right of this section, there is an empty square where you can dig a "
-"brick.  To visit the isolated section, dig out the brick and move left and "
-"down through a false brick.  You have to race to get one piece of gold and "
-"return through another false brick, just in time to cross the dug brick "
-"before it closes.\n"
+"It may seem to be fairly straightforward but unfortunately it is not, "
+"because there are many false bricks on the way to the gold.\n"
 "\n"
-"The enemy is a bit of a pain.  Try luring him to the bottom of the maze, "
-"dropping to the floor where you have a ladder to climb back up, but with the "
-"enemy above a square without a ladder, thus trapping him."
+"Dig the first brick while falling, then fall through it, run up the ladder "
+"and wait until the enemy jumps into the hole. Now you can fall on his head "
+"and go left. Jump into the hole on the left and dig another brick while "
+"falling. This will allow you to continue left on the bar.\n"
+"\n"
+"Of course there are still quite a lot of traps on the way, but they are "
+"easier to avoid, so you will have to find them yourself. You know, you can "
+"always press 'Q' to restart the level."
 msgstr ""
 
-#: gamedata/game_MAZ.txt:185
+#: gamedata/game_GMGR.txt:16
+msgid "Have A Nice Flight..."
+msgstr ""
+
+#: gamedata/game_GMGR.txt:17
 msgid ""
-"The maze is sparser and harder.  The enemies are trickier.  The traps are "
-"more wicked.  The maze changes.  May you walk through interesting mazes.\n"
-"\n"
-"To get the last few gold pieces, you have to enter a section of maze at the "
-"left and lower left that is walled off from the rest.  This section is "
-"shaped like a large letter 'L'.  Dig two bricks on the right edge of the L "
-"(at left of center) and jump in - there is a false brick that lets you "
-"through.\n"
+"It should not be too difficult.\n"
 "\n"
-"After you have gathered all the gold, the maze changes.  You have to drop "
-"down to somewhere near the beginning and make your way back through.  At the "
-"upper right the exit seems to be blocked.  Dig down two bricks and fall for "
-"a while, then you will find the way out."
+"Just put the mouse in the upper left corner and the hero will automatically "
+"finish the level."
 msgstr ""
 
-#: gamedata/game_cnt.txt:2
-msgid "Count"
+#: gamedata/game_GMGR.txt:22
+msgid "Golddigger"
 msgstr ""
 
-#: gamedata/game_cnt.txt:3
+#: gamedata/game_GMGR.txt:23
+msgid "My suggestion: dig!"
+msgstr ""
+
+#: gamedata/game_GMGR.txt:26
+msgid "Golden Town"
+msgstr ""
+
+#: gamedata/game_GMGR.txt:27
 msgid ""
-"This game is based on counting, from 0 to 16 (or 0 to 10 in hexadecimal).  "
-"The first level has no gold and no enemies: the problem is to find a way out "
-"and up to the next level.  After that, the number of enemies and pieces of "
-"gold increases by 1 at each level.  The name of each level corresponds to "
-"the number of enemies, the pieces of gold and the digits that appear in the "
-"layout.\n"
-"\n"
-"These elegant and rather tricky Championship levels were composed by Steve "
-"Mann <smann at cgl uwaterloo ca>."
+"You have to collect the gold to the right of you first. Then try to dig a "
+"way down. It is easier to control the enemies when you are on the lower "
+"levels."
 msgstr ""
 
-#: gamedata/game_cnt.txt:8
-msgid "Zero"
+#: gamedata/game_GMGR.txt:30
+msgid "A Hectic Enemy"
 msgstr ""
 
-#: gamedata/game_cnt.txt:9
+#: gamedata/game_GMGR.txt:31
 msgid ""
-"The only challenge is getting inside the 0, which is the only path to the "
-"exit.\n"
+"You do not have to be quick. You just have to know how to avoid the enemy.\n"
 "\n"
-"Getting inside the 0 requires climbing to the top of the zigzag ladder, "
-"digging away five bricks on the left edge of the 0, racing back to the top "
-"of the zigzag ladder, over the pole, falling through your recently dug "
-"bricks and immediately moving right to get into the 0.  The timing is fairly "
-"tight."
+"By jumping down to the lower level you can make your enemy run up and down "
+"on one ladder as you fall. As soon as you reach the lower level the enemy "
+"will follow, but you will have time to collect some gold or get past him and "
+"move over to another section.\n"
+"\n"
+"Two important notes: do not let the enemy fall onto the middle row of "
+"ladders and leave the gold down there till last."
 msgstr ""
 
-#: gamedata/game_cnt.txt:14
-msgid "One"
+#: gamedata/game_GMGR.txt:38
+msgid "Don't Wake Them Up"
 msgstr ""
 
-#: gamedata/game_cnt.txt:15
+#: gamedata/game_GMGR.txt:39
 msgid ""
-"Getting the gold requires multiple digs in the right places.  However, see "
-"the next paragraph.\n"
+"This is not very easy because there are so many enemies who block the only "
+"way out of the level.\n"
 "\n"
-"To get out, you have to get the enemy to go over the top of the 1 and fill "
-"the pit at the bottom.  There are three ways to do this.  The first and most "
-"sensible is to wait on the pole above the top right edge of the 1 until the "
-"enemy is almost upon you and then move to the right, digging to your right "
-"as you reach the bottom of the 1.\n"
+"The best way to get past them is to go up on the right and wait until most "
+"of the enemies go up the middle ladders. Then, by moving up and down, try to "
+"group them. Finally fall down to the lowest level and wait for them to do "
+"the same. When the first enemies arrive, run up and try to get to the "
+"highest concrete pit ahead of the others. You may have to try several times "
+"before succeeding.\n"
 "\n"
-"The second way involves timing your digging for the gold (or where the gold "
-"was); moving onto the gold at the right time will cause the enemy to fall "
-"into the pit on the right of the 1.  The third way is to destroy the enemy "
-"and hope he reappears over the right side of the 1."
+"When there are only one or two enemies blocking the exit, you can try "
+"getting past them by moving up a ladder just before they reach you. Then "
+"walk over their heads. Good luck!"
 msgstr ""
 
-#: gamedata/game_cnt.txt:22
-msgid "Two"
+#: gamedata/game_GMGR.txt:46
+msgid "On The Brink"
 msgstr ""
 
-#: gamedata/game_cnt.txt:23
+#: gamedata/game_GMGR.txt:47
 msgid ""
-"To get the leftmost gold drop down on it from above, stepping one square to "
-"either side as you fall.  Immediately dig the square that was just below the "
-"gold and step in.  The false floor will drop you to the bottom."
+"To wait or not to wait? Well, just try...\n"
+"\n"
+"Before entering any of the structures on the right, make sure you have an "
+"escape route."
 msgstr ""
 
-#: gamedata/game_cnt.txt:26
-msgid "Three"
+#: gamedata/game_GMGR.txt:52
+msgid "Dropping Enemies"
 msgstr ""
 
-#: gamedata/game_cnt.txt:27
+#: gamedata/game_GMGR.txt:53
 msgid ""
-"After getting all the gold, the only escape is up the highest ladder on the "
-"left, but it is not connected to anything.  To reach it, you will need to "
-"entice an enemy to follow you, then step across the enemy to reach the "
-"ladder."
+"No, there is no special trick for solving this level.\n"
+"Just be faster than your enemies."
 msgstr ""
 
-#: gamedata/game_cnt.txt:30
-msgid "Four"
+#: gamedata/game_GMGR.txt:57
+msgid "The Big Maze"
 msgstr ""
 
-#: gamedata/game_cnt.txt:31
+#: gamedata/game_GMGR.txt:58
 msgid ""
-"At the start, you need to race to the floor to the right.  You will need to "
-"trap some enemies (with luck, you will get a piece of gold in the process), "
-"but you should easily be able to go up the ladders shaped like a 4, on the "
-"right. \n"
+"You can avoid some enemies by finding a false brick to fall through. As for "
+"the others, you must find a place where you can dig or go around them.\n"
 "\n"
-"When getting the gold from the 4, wait until the enemies have reached the "
-"top of the ladders shaped like a 4.  This will allow you enough time to "
-"reach the ladders before the enemies cut you off."
+"You have to reach the single piece of gold above a ladder on the left by "
+"digging through. If you go all the way round, the enemy will chase you and "
+"block your exit."
 msgstr ""
 
-#: gamedata/game_cnt.txt:36
-msgid "Five"
+#: gamedata/game_GMGR.txt:63
+msgid "Hurry Up!"
 msgstr ""
 
-#: gamedata/game_cnt.txt:37
+#: gamedata/game_GMGR.txt:64
 msgid ""
-"In the beginning, climb down the first set of ladders and wait on the lowest "
-"section until the enemies have settled in their positions.  Then drop to the "
-"floor and aim for the big ladder at the right with the fork at the bottom.  "
-"The fork is what enables you to get past the enemies above: wait at the "
-"floor level of the left rung (not below the floor level!) until the enemy on "
-"the long ladder drops next to you.  Then climb up and to the right to get up "
-"the big ladder."
+"As the level name tells you, you should not hang around for too long. Run "
+"immediately, dig the first brick and let the enemy fall into it, then run to "
+"the second brick and dig through.\n"
+"\n"
+"You are not done yet, because you have to reach the gold before the second "
+"enemy arrives. So speed up!"
 msgstr ""
 
-#: gamedata/game_cnt.txt:40
-msgid "Six"
+#: gamedata/game_GMGR.txt:69
+msgid "Two Useful Enemies"
 msgstr ""
 
-#: gamedata/game_cnt.txt:41
+#: gamedata/game_GMGR.txt:70
 msgid ""
-"The first trick for this level is to time when you go through the bottom of "
-"the 6 with the enemy climbing up the ladder to the left of the 6.  Once you "
-"get on the ladder, the enemies will climb up the ladder away from you, so "
-"you just need to wait until there are no enemies low on the ladder before "
-"digging through the bottom of the 6.\n"
+"To get out of the concrete structure below you, go down first, wait for the "
+"enemy, then walk over his head and escape. Use a similar trick with the "
+"second enemy.\n"
 "\n"
-"The second trick is figuring how to get all the enemies off the ladder on "
-"the left of the screen.  One way is to sit on top of the big 6 in the middle "
-"and wait for them to come over the poles.  Then drop to the floor and cross "
-"to the ladder."
+"The line of gold on the bricks near the bottom requires a bit more thinking. "
+"Because one of the bricks is a trap, you need to dig all bricks as far as "
+"the trap, then run over the bricks above, dig through to the remaining gold "
+"and get out fast.\n"
 msgstr ""
 
-#: gamedata/game_cnt.txt:46
-msgid "Seven"
+#: gamedata/game_GMGR.txt:76
+msgid "The Prison"
 msgstr ""
 
-#: gamedata/game_cnt.txt:47
+#: gamedata/game_GMGR.txt:77
 msgid ""
-"The gold on top of the 7 is the main challenge.  In the beginning, climb to "
-"the left most square of the top of the 7 and wait there until enemies fill "
-"the holes on top of the 7."
+"When you reach the enemies, take all the gold. Then dig one of the bricks, "
+"jump into it and dig immediately on both sides. The enemies either side of "
+"you will in 9 out of 10 cases get trapped. Now step onto one of the enemies, "
+"dig the middle brick and jump through.\n"
+"\n"
+"You are free again!"
 msgstr ""
 
-#: gamedata/game_cnt.txt:50
-msgid "Eight"
-msgstr ""
+#: gamedata/game_GMGR.txt:82 gamedata/game_plws.txt:115
+msgid "Free Fall"
+msgstr "Syrthio'n Rhydd"
 
-#: gamedata/game_cnt.txt:51
+#: gamedata/game_GMGR.txt:83
 msgid ""
-"With careful moves and timing, you can tempt two enemies over to the "
-"leftmost ladder and leave them there while you retrieve the five highest "
-"gold pieces.\n"
-"\n"
-"The three lowest pieces must be collected all in one pass, but you may need "
-"to force enemies towards the right of the 8 first, to avoid trouble when the "
-"ladders appear and you land on the floor.\n"
+"This needs a bit of timing.\n"
 "\n"
-"You can clear your final escape ladder by hitting the floor again, on the "
-"far right."
+"When you have entered the niche in the concrete, wait for the right moment "
+"to walk over the enemies: not too early, because you would walk straight "
+"into their arms, and not too late, because then you will not reach the other "
+"side."
 msgstr ""
 
-#: gamedata/game_cnt.txt:58
-msgid "Nine"
+#: gamedata/game_GMGR.txt:88
+msgid "Two Friends"
 msgstr ""
 
-#: gamedata/game_cnt.txt:59
+#: gamedata/game_GMGR.txt:89
 msgid ""
-"In the beginning, drop as fast as you can to get to the floor.  Dig several "
-"pits on the bottom to delay the enemies from coming up the ladder.  Then "
-"grab the two pieces of gold off the left side of the 9 while there are no "
-"enemies around, digging to enter the 9 after grabbing the higher of these "
-"two pieces.\n"
+"Make use of your friend.\n"
 "\n"
-"To get the gold from the bottom of the 9, stand on the left enemy, dig left "
-"and move right.  The two enemies will start to move left, fall, and climb "
-"the ladder.  When the first one gets stuck where you just dug, jump in the "
-"lowest part of the 9 and dig to the left.  The next enemy will carry the "
-"gold down.  Grab it, dig to the right, drop down to the pole and escape as "
-"quickly as you can."
+"Dig him out, then walk over his head to reach the bar to the left and below "
+"you. After taking the gold at the top left, let your friend free again.\n"
+"\n"
+"When he runs towards you and falls into the pit, jump onto his head and then "
+"collect five pieces of gold while walking on his head. You need to adjust "
+"your speed to match his.\n"
+"\n"
+"To reach the piece of gold next to a tube of false bricks, jump through the "
+"tube, run up the ladder and wait for the enemy to fall in. Now you can ride "
+"on his head and step to the right to take the gold."
 msgstr ""
 
-#: gamedata/game_cnt.txt:64
-msgid "Ten"
-msgstr ""
+#: gamedata/game_GMGR.txt:98 gamedata/game_plwv.txt:7
+msgid "Impossible?"
+msgstr "Amhosib?"
 
-#: gamedata/game_cnt.txt:65
+#: gamedata/game_GMGR.txt:99
 msgid ""
-"You can trap several enemies in the pits at the bottom left and right, but "
-"they will get loose when the hidden ladders appear.  Dropping to the floor "
-"during your escape can help clear your path to the top right."
+"No hint this time!\n"
+"\n"
+"But it is not impossible."
 msgstr ""
 
-#: gamedata/game_cnt.txt:68
-msgid "Eleven"
+#: gamedata/game_GMGR.txt:104
+msgid "The Wall"
 msgstr ""
 
-#: gamedata/game_cnt.txt:69
+#: gamedata/game_GMGR.txt:105
 msgid ""
-"Get the piece of gold below the left side of the poles shaped like an 11 "
-"first, then grab the piece on the base of the left 1 of the central 11.  Now "
-"drop to the floor just to the left of the double high wall.  The enemies "
-"will drop into different sections.  You now want to do three things: get the "
-"gold in the left and center sections, take gold from the enemies to the "
-"right of you when on the floor and lure as many enemies as you can into the "
-"section to the left of the 11.\n"
+"There is only one ladder up to the top of the wall and to reach it you need "
+"an enemy. So you have to dig right and left all the way to the floor as you "
+"fall.\n"
 "\n"
-"The first two tasks are relatively easy: the last task can be accomplished "
-"in several ways.  If you run up the center ladder and move over the left, "
-"you can wait above the right hand side of the poles (possibly dropping onto "
-"the poles) and lure a few enemies at a time from the center section to the "
-"left section.  You can also pick up a piece of gold or two while doing "
-"this.\n"
+"On the other side of the wall you have to wait on the ground until the enemy "
+"nearly reaches you, then run up very quickly.\n"
 "\n"
-"Once you have all the gold (except the pieces to the right of the 11), run "
-"to the top right of the H of ladders in the middle.  This will cause all the "
-"enemies not in the far right section to move into the left section."
+"But how do you get to the other side?\n"
+"\n"
+"Trial and error..."
 msgstr ""
 
-#: gamedata/game_cnt.txt:76
-msgid "Twelve"
+#: gamedata/game_GMGR.txt:114
+msgid "Snakepits"
 msgstr ""
 
-#: gamedata/game_cnt.txt:77
+#: gamedata/game_GMGR.txt:115
 msgid ""
-"This is a slow level with lots of waiting for enemies to move where you want "
-"them.\n"
-"\n"
-"At the start, fall onto the nearest enemy as it falls and move onto the "
-"right hand poles to get the piece of gold just below them.  Be sure to wait "
-"for an opening in the enemies below before dropping onto this gold piece. \n"
-"\n"
-"The grid of 12 boxes on the right is useful.  If you are on this grid but "
-"below the top of it, enemies climbing the ladder just left of the grid will "
-"not drop onto the grid and chase you.  You can wait near the bottom of the "
-"grid until the enemies move above the pits of brick and concrete at the "
-"bottom left, then you can fall to the floor.  This will cause the enemies to "
-"fall into the pits and become trapped.\n"
-"\n"
-"Another useful trick is to wait at the top of the ladder on the far left "
-"(where you start the level).  Any enemies far enough away will run over the "
-"top of the grid of boxes and drop into the trapped area on the right.\n"
-"\n"
-"To get the gold on the leftmost floor area, you need to fill the second "
-"section of floor with enemies and dig out the squares that block the enemies "
-"in the leftmost region.  You may want to lose that gold (i.e. have the enemy "
-"carrying the gold enter a dug square and be destroyed there), although it is "
-"possible to get this piece of gold if you really want it.\n"
+"After you reach the ladder and as you work your way down through the middle "
+"section, you will need to release five enemies, no more no less. They will "
+"help form a bridge to the ladders that appear on the left.\n"
 "\n"
-"If you leave the leftmost suspended gold until last, then it is easy to "
-"escape to the top.  Alternatively, if you leave the gold inside the 2 for "
-"last, you should be able to escape without much difficultly.  Otherwise, the "
-"enemies trapped on the far left will cut off your escape route."
+"To make the enemies in the boxes on the left move into position as you make "
+"your escape, just stand at the same height on one side or the other."
 msgstr ""
 
-#: gamedata/game_cnt.txt:90
-msgid "Thirteen"
+#: gamedata/game_GMGR.txt:120
+msgid "Get In And Up"
 msgstr ""
 
-#: gamedata/game_cnt.txt:91
+#: gamedata/game_GMGR.txt:121
 msgid ""
-"In the beginning, wait on the top of the left (or better, right) branch of "
-"the leftmost ladders until the enemies in the middle climb to the middle of "
-"the center ladder.  Then drop to the horizontal ladder, move all the way to "
-"the right and drop to the floor, thus trapping several enemies.\n"
-"\n"
-"You have to release most of the enemies from where they are trapped, to get "
-"the gold from various places.  In particular, you have to release the "
-"enemies trapped on the left half of the floor to get at least one piece of "
-"gold.  \n"
-"\n"
-"Once you pick up the last piece of gold, the enemies will swarm the center "
-"ladder, so you will have to decide which piece of gold to pick up last.  A "
-"reasonable choice is the one held by the three enemies in the lowest leg of "
-"the 3, as is the one in the center arm of the 3."
+"After you reach the first ladder, go down and wait for the enemies to run "
+"towards you. When they are nearly upon you, run up, go left and enter the "
+"building. Take the two pieces of gold and dig yourself through."
 msgstr ""
 
-#: gamedata/game_cnt.txt:98
-msgid "Fourteen"
+#: gamedata/game_GMGR.txt:124
+msgid "No Way Out"
 msgstr ""
 
-#: gamedata/game_cnt.txt:99
+#: gamedata/game_GMGR.txt:125
 msgid ""
-"Four tricks: first, do not dig out the enemies trapped in the 4s on the left "
-"until towards the end (likewise if one gets trapped in the middle 4) - this "
-"leaves fewer enemies to deal with. \n"
+"You have to dig before you take the gold and before the ladders appear."
+msgstr ""
+
+#: gamedata/game_GMGR.txt:128
+msgid "How To Get There"
+msgstr ""
+
+#: gamedata/game_GMGR.txt:129
+msgid ""
+"First you must find a way to the upper-left corner.\n"
 "\n"
-"Second, you will need to ride down on top of an enemy to get the trapped "
-"gold in the 4s on the left and the floating piece of gold in the center.\n"
+"When you arrive, there are two ladders below you, a very short one and a "
+"longer one. Between them there is a column of bricks. The top two are real "
+"bricks: the rest is a tube of traps and you have to go through it.\n"
 "\n"
-"Third, when you release the enemies on the 4s along the right (and possibly "
-"the two in the 4s on the left), you may find it easier to double dig and "
-"lose those pieces of gold.\n"
+"Dig through two columns of bricks over on the right, step left and run up "
+"the ladder. Jump to the left and dig two bricks while falling. Run back to "
+"the right, but dig the last brick, because the one to the left of it is a "
+"trap. Run up the big ladder, go left and dig through the brick above the "
+"little ladder. Fall onto it, then head right and fall through the tube.\n"
 "\n"
-"Finally, it is easiest to escape at the end if you leave until last a piece "
-"of gold in or near the floating 14 at middle right.  Then you can run up the "
-"ladder that appears there."
+"The timing is very tight. The tiniest hesitation will kill you!"
 msgstr ""
 
-#: gamedata/game_cnt.txt:108
-msgid "Fifteen"
+#: gamedata/game_GMGR.txt:138
+msgid "The Bull"
 msgstr ""
 
-#: gamedata/game_cnt.txt:109
+#: gamedata/game_GMGR.txt:139
 msgid ""
-"Two hints: if you wait on one of the left two ladders one rung below the "
-"piece of gold suspended between the two ladders, the enemies in the middle "
-"will jump into the base of the 5.  This should allow you to easily get the "
-"gold between the 1 and the 5.\n"
+"For the gold on the left you need very good timing, similar to 'Free Fall', "
+"only a bit harder. Try to find the right moment to run over an enemy's "
+"head.\n"
 "\n"
-"Second, if you wait on the base of the 1 to the right of the one, the "
-"enemies on the right of the two ladders to the left of the 1 will jump off "
-"the pole onto the other half of the base of the 1.  If you wait high up "
-"between the 1 and the 5, then jump to the base of the 1, while the enemies "
-"are falling toward the base of the 1 you will be able to rush up the ladder "
-"to the left of the 1 and get the gold to the left of the 1."
+"On the right hand side, start by digging two single bricks, to let the enemy "
+"run left and into the hole. Step onto his head, dig on both sides at once "
+"while falling, then run to the left, take the gold, run back and step onto "
+"the last falling enemy. Be quick, because you can only reach the five pieces "
+"of gold on the left by riding on an enemy."
 msgstr ""
 
-#: gamedata/game_cnt.txt:114
-msgid "Sixteen"
+#: gamedata/game_GMGR.txt:144
+msgid "Long Way Up"
 msgstr ""
 
-#: gamedata/game_cnt.txt:115
+#: gamedata/game_GMGR.txt:145
 msgid ""
-"The column to the left of the 1 requires a quick run down and back up, with "
-"careful dodging both ways to avoid the enemies.\n"
-"\n"
-"To get the gold in the middle of the 6, drop down on the top of the 'O' part "
-"of the 6, move right/dig left and immediately move left and dig left to "
-"delay the enemy who otherwise is likely to catch you.  However, you may wish "
-"to leave this piece of gold to the end so as not to free two additional "
-"enemies earlier; it is possible to get two enemies to retrap themselves in "
-"that section, though.\n"
+"You have to climb up on the pyramid of ladders and run over the heads of the "
+"enemies. You need more luck than skill. It is better to wait for an instant "
+"before climbing up.\n"
 "\n"
-"To get the gold held by enemies in the bottom right, dig out the blocking "
-"square to their left, run up the ladder, dig off the right side of the 6, "
-"drop in, run left and dig off a square on the left side of the 6 and drop to "
-"the floor.  The timing is tight - only one or two enemies in the bottom "
-"right section will be able to move to the next section to the left.  You "
-"will still need to dig out the bottom of the 6 to get their gold, but that "
-"is straightforward albeit a bit hectic because of the enemies lingering to "
-"the left of the 6.\n"
+"To get the single gold above the traps near the center, dig the enemies free "
+"then go down and left to the big bar. The enemies will fill the pit under "
+"the traps, so then you can take the gold easily.\n"
 "\n"
-"Once you have gotten all the gold, you may find it easiest to exit by "
-"passing through the middle false floor on the 1 and exiting via the ladders "
-"on the left of the 1."
+"The rest is a bit hard, but it is easy to understand how to do it. In "
+"general, it is best to avoid killing enemies."
 msgstr ""
 
-#. i18n:
-#. NOTES: Files 'gamedata/game_*.txt' are KGoldrunner DATA files.  They
-#. are installed in $KDEDIR/share/apps/kgoldrunner/system and contain
-#. names and descriptions of games, plus names and hints for levels.  You
-#. may sometimes need to look at the corresponding game or level graphics
-#. to work out a good translation (e.g. Initiation 25, Mongolian Horde).
-#. 
-#. To see any level of any game, run KGoldrunner, click on the New Game button
-#. and select the game and level from the list.  If you start to play a level,
-#. you will probably need to stop the animation by pressing the Pause key
-#. (default Esc or P).
-#. 
-#. The most urgent translations would be names and hints for the Tutorial
-#. games, then the game names and descriptions (as appearing in the main
-#. dialog box) and then the other level names and finally the remaining
-#. hints, which are intended for experienced players and champions.
-#. 
-#. Messages marked as NOTi18n should deliberately be left untranslated. The
-#. one below is never displayed and others, from time to time, would be long
-#. hint texts used by a small number of championship players, left untranslated
-#. to economise on translation effort.
-#. 
-#. The "Das Boot" message in level 97 of the Initiation game is the name of
-#. a German submarine warfare movie, left untranslated as a compliment to the
-#. original author of KGoldrunner, who is German.  The movie is known as
-#. "Das Boot" in many countries, including English-speaking countries.  If it
-#. is known by some other name in your country, please include that in your
-#. translation of the corresponding hint text.  See this Internet page:
-#. http://akas.imdb.com/title/tt0082096/releaseinfo#akas
-#. 
-#: gamedata/game_ende.txt:31
-msgid "TRANSLATORS: Please see the notes in the translation comment."
+#: gamedata/game_GMGR.txt:152
+msgid "A Little Present To Say Goodbye"
+msgstr ""
+
+#: gamedata/game_GMGR.txt:153
+msgid ""
+"After some very hard levels, maybe you would like an easy one. Goodbye!"
 msgstr ""
 
-#: gamedata/game_kgr.txt:2 src/main.cpp:43
+#: gamedata/game_kgr.txt:2 src/main.cpp:44
 msgid "KGoldrunner"
 msgstr "KGoldrunner"
 
@@ -1567,6 +1607,539 @@
 msgid "No hint!"
 msgstr ""
 
+#: gamedata/game_MAZ.txt:2
+msgid "Mazes"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:3
+msgid ""
+"Mazes, mazes, mazes.  Some with enemies, some without.  While occasionally "
+"you will need to kill an enemy, as a general rule it is best not to kill "
+"them, because they reappear at the top and block your exit.\n"
+"\n"
+"Another great set of Championship levels from Steve Mann <smann at cgl "
+"uwaterloo ca>.  The levels are named after dwarves in myths and stories "
+"(with a few named after elves), beginning with the seven dwarves from "
+"Disney's version of Snow White."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:8
+msgid "Dopey"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:9
+msgid ""
+"Fairly simple, just avoid falling off the ladders.  There are several ways "
+"to get past the two enemies at the end.  One of the quickest is to wait on a "
+"tall vertical ladder, just below the second highest horizontal ladder, until "
+"the path to the exit is clear."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:12
+msgid "Sleepy"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:13
+msgid "A lot of backtracking, but nothing too difficult here."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:16
+msgid "Doc"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:17
+msgid "A few tricks to figure out how to get the gold, but nothing too hard."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:20
+msgid "Grumpy"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:21
+msgid "Visually confusing, but otherwise a simple maze."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:24
+msgid "Sneezy"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:25
+msgid ""
+"Mostly straightforward, the only trick here is how to draw off the enemies "
+"so as to get past them.  In the beginning, try to lure the top two enemies "
+"into the top-center pit.  This gives you enough time to slip past them.  The "
+"enemy on the bottom is relatively easy to avoid (twice).  To get past the "
+"top two enemies on your way back, lure the first one deep into the maze "
+"until you find a way back past him, then lure the second one to the section "
+"with the pole near the top."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:28
+msgid "Bashful"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:29
+msgid ""
+"To reach the two pieces of gold stacked one above the other, you have to "
+"drop through a trap below one of the ladders above that section.\n"
+"\n"
+"Leave the piece of gold at the upper left until the very last."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:34
+msgid "Happy"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:35
+msgid ""
+"There are two tricks to this level.  First, if you want gold that is high, "
+"move low to draw the enemies down, then move up to get the gold - and vice-"
+"versa.  Second, at times you will need to use the ladder trick: if you are "
+"on a vertical ladder with an enemy above you, sometimes the enemy will run "
+"away from you."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:38
+msgid "Glorfindel"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:39
+msgid ""
+"To get the piece of gold at mid-left, you will need to lure the enemy across "
+"the pole and run across him as he gets to the end of the pole.  The same "
+"trick will be needed to get back, unless he follows you back across the "
+"pole; then you will need to find another place to dodge past him."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:42
+msgid "Hreidmar"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:43
+msgid ""
+"Be careful not to let the enemies get the gold - it is hard to get it away "
+"from them!  Otherwise, by moving into the middle section, you can get most "
+"of the enemies to move up and to the right.  This allows you to get the gold "
+"on the bottom level.  Some of the bricks on the bottom level are traps.  "
+"When an enemy gets close, you can drop into the trap, step to the side and "
+"move over the enemy.  But it is better to maneuver the enemies so that they "
+"stay away from the bottom section while you are down there getting the gold."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:46
+msgid "Ori"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:47
+msgid ""
+"A straightforward maze: the false brick underneath the ladder near the "
+"bottom center may prove useful."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:50
+msgid "Nori"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:51
+msgid ""
+"The hardest part is when two enemies get in the center of the maze and you "
+"need to pass them.  Try to move down and to their left, lure one down, trap "
+"it and then go up to trap the other.  Otherwise, clever digging should deal "
+"with them."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:54
+msgid "Dori"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:55
+msgid ""
+"The only trick to this level is using the hidden passages and enticing the "
+"enemies to use them."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:58
+msgid "Bombur"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:59
+msgid ""
+"There are several ways to get past an enemy who is in the ladder-trap loop.  "
+"One is to wait next to the trap and when the enemy is half-way up the "
+"ladder, step into the trap and move immediately to the left and down.  "
+"However, at the start, you might get three enemies in the ladder-trap loop.  "
+"Avoid this.  One of the three can break out of the loop, but the other two "
+"remain trapped, leaving you no way to get past them."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:62
+msgid "Luthien"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:63
+msgid ""
+"After dodging the first enemy you come to, try not to jump off and grab the "
+"floating piece of gold in the center too soon.  If you do, the enemy you "
+"just dodged will drop to the lower level, grab a piece of gold and head for "
+"the floor where you can not get the gold away from him."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:66
+msgid "Bofur"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:67
+msgid ""
+"If you have two or more enemies between you and where you want to go, you "
+"may find the diggable columns useful.  Dig two layers, wait one from the top "
+"to trap the first enemy and then move to the top to trap the second enemy."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:70
+msgid "Bifur"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:71
+msgid ""
+"Lots of gold, only one enemy and he is trapped!  It should be a cake walk!\n"
+"\n"
+"The first part just involves digging (at most) to collect the gold.  But "
+"then there is no obvious way to get the gold on the bottom and on the left.  "
+"Look for a trap under the bottom of a ladder to get to it.  The only other "
+"trick is to get all the other gold and leave the enemy and its piece of gold "
+"to the last.  And watch out - since there is only one enemy, it is pretty "
+"fast!"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:76
+msgid "Gloin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:77
+msgid ""
+"The pit in the upper right is tricky.  To leave the maze, you need an enemy "
+"in the pit.  But you would rather not have him there before you have taken "
+"the gold out.  And if two enemies get in the pit before you get the gold, "
+"forget it."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:80
+msgid "Oin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:81
+msgid ""
+"Look for false floors to get to places that are otherwise inaccessible.  You "
+"have to dig to find a couple of them."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:84
+msgid "Kili"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:85
+msgid ""
+"Get the gold in the middle and on the top before getting the gold on the "
+"bottom or lower left.  That way, if you have to kill an enemy (the one at "
+"the left is just asking for it) then they only block your way to the exit "
+"rather than make it impossible to gather the remaining gold."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:88
+msgid "Fili"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:89
+msgid ""
+"Lots of false bricks to trap you, or give you access to different parts of "
+"the maze.  Test below the ladders and other places.\n"
+"\n"
+"The four high trap in the middle is a show stopper: you can only get back "
+"past it once you have gathered all the gold.  So stay out of the lower right "
+"until you have cleared the rest of the gold.  Then drop through the trap "
+"below the top right ladder - there is no other way to get the piece of gold "
+"below it.  Once you are down here, there is no getting back to the top right "
+"until you have cleared all the gold.  After getting the piece of gold at "
+"center right, dig down to get the left of the two adjacent pieces.  The "
+"escape from the lower right comes when all the gold is gathered and a small "
+"section of ladder appears in the center."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:94
+msgid "Dwalin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:95
+msgid ""
+"A maze, but you can not see the path out.  You have to use the false floors. "
+" Trial and error is your only hope - try mapping it on paper if you are "
+"having trouble."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:98 gamedata/game_MAZ.txt:184
+msgid "Durin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:99
+msgid ""
+"This diagonal maze is not too hard, except there is the occasional pit to "
+"get trapped in and that lone enemy is fast.  Try to lure the enemy down and "
+"into one of the pits.  Then the rest is almost a cake walk."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:102
+msgid "Dain"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:103
+msgid ""
+"There are too many enemies to fight up on the top level (there are not many "
+"bricks there for a reason).  Instead, wait on the level below and let them "
+"come to you.  Dig to escape and get the gold at bottom left.\n"
+"\n"
+"On the way back, stand on the top level and use the same trick to draw the "
+"enemies up there.  Dig a brick leading down and head for the exit.\n"
+"\n"
+"The only tricky parts come when two enemies end up in the lower left, in the "
+"center (on your way back) or at the upper right.  Except for the last case, "
+"you should be able to complete the level without intentionally trapping any "
+"enemies, but some may inadvertently fall into your two pits."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:110
+msgid "Duergar "
+msgstr ""
+
+#: gamedata/game_MAZ.txt:111
+msgid ""
+"A maze without walls or enemies - how hard can it be?  But the traps act as "
+"walls, and the enemies would just fill the traps, so perhaps this is another "
+"one where you will want to draw a map.  Note that you can probe for traps by "
+"digging, but that can lead to a rather slow game while you wait for the "
+"bricks you dig to refill."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:114
+msgid "Balin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:115
+msgid ""
+"To get through the center, you will have to clear it of enemies, but there "
+"is only one diggable brick.  Use it to drop through, race to the right and "
+"go up to the row above the dug brick.  There is just enough time to entice "
+"the enemy into the closing hole.  Repeat as necessary.\n"
+"\n"
+"To leave the maze, you need to find a way through the long diagonal barrier "
+"of ladders.  Beneath one of them is a false floor to use for your escape "
+"route."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:120
+msgid "Gimli"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:121
+msgid ""
+"The enemies are paper tigers, although you need a trick to get past the "
+"first one.  Stand on top of the ladder to the left of the false brick.  When "
+"the enemy moves over the ladder to the right of the false brick, move down "
+"your ladder, enticing the enemy to move down into the false brick.  Quickly "
+"move up and over the enemy's head.\n"
+"\n"
+"Otherwise, it is just a matter of maneuvering the enemies to a place where "
+"you can trap them or pass by them.  The only real problem occurs if an enemy "
+"grabs a piece of gold and gets stuck somewhere and you can not dig him out.  "
+"Oh, well, sometimes you lose.\n"
+"\n"
+"To get out of the center section, search for the double trap on the left."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:128
+msgid "Brokkr"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:129
+msgid ""
+"Leave the piece of gold just down and to your right until last.  To get back "
+"to this section of the maze, you will need to dig through the wall a bit "
+"further down and to the right.  The easiest way to handle most of the "
+"enemies is to lure them along until they fall into a pit.  But beware, the "
+"pits fill with ladders once you have all the gold, allowing the trapped "
+"enemies to escape."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:132 gamedata/game_MAZ.txt:168
+msgid "Thrain"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:133
+msgid ""
+"Mostly straightforward, but beware of a couple of one-way gates, in "
+"particular in the section at the top, right of center.  Be sure to clear out "
+"all the gold before freeing the trapped enemy at top right, who has a piece "
+"of gold.  You will also need to use the false floor on the far right at the "
+"top."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:136
+msgid "Thorin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:137
+msgid ""
+"In the beginning, rush to the top of the pyramid-like structure, dig off the "
+"top, go down and get two pieces of gold.  Then lure the enemies into the "
+"area under the pyramid and move down and to the left.  This can cause an "
+"enemy to be trapped and others to move into areas where they are harmless.  "
+"If any enemies follow you, escape to the bottom left, collecting some gold "
+"on the way.\n"
+"\n"
+"To get the piece of gold in the upper left, you first have to lure the one "
+"enemy out of that section.  After collecting the gold, you may find yourself "
+"threatened by enemies to your right.  If so, go to the lowest level of the "
+"section that you can reach without digging.  The enemies will go into a side "
+"corridor, giving you enough time to run up over the bar and reach the top of "
+"the pyramid just ahead of them.\n"
+"\n"
+"The rest is just hard work."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:144
+msgid "Telchar"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:145
+msgid ""
+"False floors are the key to this level.  The way into a section is often not "
+"the way out.  Many of the enemies will get trapped if you move low enough.  "
+"Save the middle bottom gold for last: you can not get out of this section "
+"until a hidden ladder appears."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:148
+msgid "Dvergar"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:149
+msgid ""
+"When you collect the gold at top left, you may have trouble leaving the "
+"section.  The obvious way out (at the foot of the ladder) does not work "
+"because of a false brick.  Instead, you need to plan ahead when you dig into "
+"this section.  Dig out the piece of wall that blocks your exit to the right, "
+"then quickly go up and grab the gold, then back down and out through the "
+"missing wall before it reappears.  There is a false brick here, so be sure "
+"to dig as you fall into it.\n"
+"\n"
+"After getting the last piece of gold, you can exit through the center, where "
+"a new piece of ladder allows you to dig and re-enter the left of the maze."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:154
+msgid "Thingol"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:155
+msgid ""
+"There is one piece of gold that must be grabbed at the start.\n"
+"\n"
+"When you go to the lower part of the maze, the enemies will go down and stay "
+"there.  This makes it easy to get the gold up high, but it becomes hard to "
+"collect the gold in the lower left.  Try to get one or two pieces on your "
+"first trip down.\n"
+"\n"
+"By moving up and down on the bottom right ladder you can persuade the "
+"enemies to group on the left or right.  Grouping them to the left makes it "
+"easy to get the piece of gold just down and to the right of center.  Getting "
+"one enemy on the left and two on the right gives you a chance to get the "
+"remaining gold on the lower left, but consider getting it last after "
+"grouping all three enemies on the right, because you will then have more "
+"choice of ladders when dodging enemies on your way to the top."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:162
+msgid "Dvalin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:163
+msgid ""
+"There are two problems.  First, in the early part you want to get the enemy "
+"just to the right of middle trapped in the bottom of that section.  This "
+"requires getting the gold on the left and passing through the trap doors at "
+"the right time, as well as racing to get the gold on the bottom left.  The "
+"gold on the bottom right is no big trick: just a small amount of timing and "
+"passing through the traps.\n"
+"\n"
+"The second problem is that at least one enemy will pick up a piece of gold.  "
+"Getting him to let go of that piece of gold is tough.  You need to lure that "
+"enemy into the top right section or the section down and to the left of "
+"that.  Draw the enemy to the ladder with a gap above it, in the middle of "
+"the section.  Wait two over to either side of this vacant square, leaving a "
+"brick between you and the vacant square.  The enemy will move up and down "
+"the ladder, in and out of the vacant square.  Eventually he will drop the "
+"gold on top of the ladder, at which point you have to move down to prevent "
+"him from moving back up the ladder and retaking the gold.  The timing is "
+"tight - good luck!  Alternatively, you can run around and trust to luck - "
+"the enemy will drop the piece of gold eventually!"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:169
+msgid "Lots of false floors to use and avoid."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:172
+msgid "Rumpelstiltskin"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:173
+msgid ""
+"The main trick for this level is luring the enemies so that you can get "
+"around them, or in one case, so that you can walk over an enemy to collect a "
+"piece of gold.  The luring is not so hard, but the distances you have to "
+"lure them are long.  Maneuvering the enemy so that you can walk over him to "
+"get the piece of gold has timing that is a bit tight, but not too bad.\n"
+"\n"
+"When you reach the section above your starting point, there are two ways "
+"out: one is a false brick under the short ladder.  But if you dig the other "
+"square and drop down, there is a a path through a false floor that avoids "
+"retracing all the early part of the maze."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:178
+msgid "Thror"
+msgstr ""
+
+#: gamedata/game_MAZ.txt:179
+msgid ""
+"The two gold in the lower left are cut off from the rest of the maze.  On "
+"the right of this section, there is an empty square where you can dig a "
+"brick.  To visit the isolated section, dig out the brick and move left and "
+"down through a false brick.  You have to race to get one piece of gold and "
+"return through another false brick, just in time to cross the dug brick "
+"before it closes.\n"
+"\n"
+"The enemy is a bit of a pain.  Try luring him to the bottom of the maze, "
+"dropping to the floor where you have a ladder to climb back up, but with the "
+"enemy above a square without a ladder, thus trapping him."
+msgstr ""
+
+#: gamedata/game_MAZ.txt:185
+msgid ""
+"The maze is sparser and harder.  The enemies are trickier.  The traps are "
+"more wicked.  The maze changes.  May you walk through interesting mazes.\n"
+"\n"
+"To get the last few gold pieces, you have to enter a section of maze at the "
+"left and lower left that is walled off from the rest.  This section is "
+"shaped like a large letter 'L'.  Dig two bricks on the right edge of the L "
+"(at left of center) and jump in - there is a false brick that lets you "
+"through.\n"
+"\n"
+"After you have gathered all the gold, the maze changes.  You have to drop "
+"down to somewhere near the beginning and make your way back through.  At the "
+"upper right the exit seems to be blocked.  Dig down two bricks and fall for "
+"a while, then you will find the way out."
+msgstr ""
+
 #: gamedata/game_plws.txt:2
 msgid "Initiation"
 msgstr "Derbyniad"
@@ -1735,10 +2308,6 @@
 msgid "Zig Zag"
 msgstr "Igam Ogam"
 
-#: gamedata/game_plws.txt:115
-msgid "Free Fall"
-msgstr "Syrthio'n Rhydd"
-
 #: gamedata/game_plws.txt:118
 msgid "Forgotten Gold"
 msgstr "Aur wedi'i Anghofio"
@@ -2011,10 +2580,6 @@
 "Mwarrhh hwwarrrr haarrrr!"
 msgstr ""
 
-#: gamedata/game_plwv.txt:7
-msgid "Impossible?"
-msgstr "Amhosib?"
-
 #: gamedata/game_plwv.txt:8
 msgid ""
 "No, it is not impossible.  There is a trick in how you dig the bricks next "
@@ -2652,6 +3217,91 @@
 "Get out quick!"
 msgstr ""
 
+#: gamedata/game_tutea.txt:2
+msgid "Advanced Tutorial"
+msgstr "Hyfforddiad Uwch"
+
+#: gamedata/game_tutea.txt:3
+msgid ""
+"This tutorial is preparation for some of the things you might find in the "
+"middle levels of the 'Initiation' game.  Enjoy ..."
+msgstr ""
+
+#: gamedata/game_tutea.txt:6
+msgid "Bars and Ladders"
+msgstr "Barau ac Ysgolion"
+
+#: gamedata/game_tutea.txt:7
+msgid ""
+"There is nowhere to dig, so you must dodge the enemies and avoid falling to "
+"the concrete at the wrong time.  Try to keep the enemies together.\n"
+"\n"
+"If an enemy has gold coloring, he is holding a nugget.  He might drop it as "
+"he runs over the concrete or maybe at the top of a ladder ... patience, "
+"patience!"
+msgstr ""
+
+#: gamedata/game_tutea.txt:12
+msgid "To kill ..."
+msgstr ""
+
+#: gamedata/game_tutea.txt:13
+msgid ""
+"You cannot get up to the gold, so you must get the enemies to bring it down "
+"to you.  But how do you get them to keep going back?\n"
+"\n"
+"If you are feeling stressed, you can hit the Pause key (default P or Esc) "
+"and take a break.  Also, you can use the Settings menu to slow down the "
+"action."
+msgstr ""
+
+#: gamedata/game_tutea.txt:18
+msgid "...  Or not to kill?"
+msgstr "... Neu beidio?"
+
+#: gamedata/game_tutea.txt:19
+msgid ""
+"It is best not to kill the enemy.  Try it and you will find out why ... Heh, "
+"heh, heh!\n"
+"\n"
+"If you do kill him unintentionally, before you have collected the gold at "
+"the top left, you can still finish the level by digging away the side of the "
+"pit he is in."
+msgstr ""
+
+#: gamedata/game_tutea.txt:24
+msgid "Traps"
+msgstr "Trapiau"
+
+#: gamedata/game_tutea.txt:25
+msgid ""
+"Some of the bricks here are not what they seem.  They are known as false "
+"bricks, fall-through bricks or traps.  If you try to walk on them, you fall "
+"through.  If the enemies walk on them, they can descend on you without "
+"warning.  Sometimes you have to fall through a brick to get some gold.\n"
+"\n"
+"At the start, jump into the concrete pit, dig and drop through.  That will "
+"get one enemy tied up for a while ..."
+msgstr ""
+
+#: gamedata/game_tutea.txt:30 gamedata/game_tute.txt:48
+msgid "Bye ..."
+msgstr ""
+
+#: gamedata/game_tutea.txt:31 gamedata/game_tute.txt:49
+msgid ""
+"This is just a nice easy level to finish up with.  Have fun with the other "
+"games in KGoldrunner.\n"
+"\n"
+"Note that there is a game Editor in which you and your friends can make up "
+"levels and challenge each other.  And if you like action, the KGoldrunner "
+"rules used in some of the games are fast and furious.  There is also a "
+"KGoldrunner Handbook in the Help Menu, which contains more detail than this "
+"Tutorial.\n"
+"\n"
+"It has been a pleasure showing you around.  Bye!"
+msgstr ""
+
 #: gamedata/game_tute.txt:2
 msgid "Tutorial"
 msgstr "Hyfforddiad"
@@ -2789,91 +3439,6 @@
 "Nid yw rhai ô'r briciau yn y lefel yma yn rhai gwir. Os camwch arnynt, fe "
 "syrthiwch drwyddynt. Mae gelynion yn syrthio drwyddynt yn yr un modd hefyd."
 
-#: gamedata/game_tute.txt:48 gamedata/game_tutea.txt:30
-msgid "Bye ..."
-msgstr ""
-
-#: gamedata/game_tute.txt:49 gamedata/game_tutea.txt:31
-msgid ""
-"This is just a nice easy level to finish up with.  Have fun with the other "
-"games in KGoldrunner.\n"
-"\n"
-"Note that there is a game Editor in which you and your friends can make up "
-"levels and challenge each other.  And if you like action, the KGoldrunner "
-"rules used in some of the games are fast and furious.  There is also a "
-"KGoldrunner Handbook in the Help Menu, which contains more detail than this "
-"Tutorial.\n"
-"\n"
-"It has been a pleasure showing you around.  Bye!"
-msgstr ""
-
-#: gamedata/game_tutea.txt:2
-msgid "Advanced Tutorial"
-msgstr "Hyfforddiad Uwch"
-
-#: gamedata/game_tutea.txt:3
-msgid ""
-"This tutorial is preparation for some of the things you might find in the "
-"middle levels of the 'Initiation' game.  Enjoy ..."
-msgstr ""
-
-#: gamedata/game_tutea.txt:6
-msgid "Bars and Ladders"
-msgstr "Barau ac Ysgolion"
-
-#: gamedata/game_tutea.txt:7
-msgid ""
-"There is nowhere to dig, so you must dodge the enemies and avoid falling to "
-"the concrete at the wrong time.  Try to keep the enemies together.\n"
-"\n"
-"If an enemy has gold coloring, he is holding a nugget.  He might drop it as "
-"he runs over the concrete or maybe at the top of a ladder ... patience, "
-"patience!"
-msgstr ""
-
-#: gamedata/game_tutea.txt:12
-msgid "To kill ..."
-msgstr ""
-
-#: gamedata/game_tutea.txt:13
-msgid ""
-"You cannot get up to the gold, so you must get the enemies to bring it down "
-"to you.  But how do you get them to keep going back?\n"
-"\n"
-"If you are feeling stressed, you can hit the Pause key (default P or Esc) "
-"and take a break.  Also, you can use the Settings menu to slow down the "
-"action."
-msgstr ""
-
-#: gamedata/game_tutea.txt:18
-msgid "...  Or not to kill?"
-msgstr "... Neu beidio?"
-
-#: gamedata/game_tutea.txt:19
-msgid ""
-"It is best not to kill the enemy.  Try it and you will find out why ... Heh, "
-"heh, heh!\n"
-"\n"
-"If you do kill him unintentionally, before you have collected the gold at "
-"the top left, you can still finish the level by digging away the side of the "
-"pit he is in."
-msgstr ""
-
-#: gamedata/game_tutea.txt:24
-msgid "Traps"
-msgstr "Trapiau"
-
-#: gamedata/game_tutea.txt:25
-msgid ""
-"Some of the bricks here are not what they seem.  They are known as false "
-"bricks, fall-through bricks or traps.  If you try to walk on them, you fall "
-"through.  If the enemies walk on them, they can descend on you without "
-"warning.  Sometimes you have to fall through a brick to get some gold.\n"
-"\n"
-"At the start, jump into the concrete pit, dig and drop through.  That will "
-"get one enemy tied up for a while ..."
-msgstr ""
-
 #: gamedata/game_wad.txt:2
 msgid "Challenge"
 msgstr "Her"
@@ -3210,7 +3775,7 @@
 "is a steady hand."
 msgstr ""
 
-#: src/kgoldrunner.cpp:201 src/kgrgame.cpp:655
+#: src/kgoldrunner.cpp:201 src/kgrgame.cpp:678
 msgid "&New Game..."
 msgstr "&Gêm Newydd ..."
 
@@ -3330,7 +3895,7 @@
 msgid "Edit"
 msgstr ""
 
-#: src/kgoldrunner.cpp:326 src/kgrgame.cpp:1327
+#: src/kgoldrunner.cpp:326 src/kgrgame.cpp:1377
 msgid "&Save Edits..."
 msgstr "Ca&dw Golygiadau..."
 
@@ -3414,257 +3979,257 @@
 msgid "Make sounds of player's footsteps."
 msgstr ""
 
-#: src/kgoldrunner.cpp:391
+#: src/kgoldrunner.cpp:396
 msgid "&Demo At Start"
 msgstr ""
 
-#: src/kgoldrunner.cpp:392 src/kgoldrunner.cpp:393
+#: src/kgoldrunner.cpp:397 src/kgoldrunner.cpp:398
 msgid "Run a demo when the game starts."
 msgstr ""
 
-#: src/kgoldrunner.cpp:401
+#: src/kgoldrunner.cpp:406
 msgid "&Mouse Controls Hero"
 msgstr "&Mae'r llygoden yn rheoli'r Arwr"
 
-#: src/kgoldrunner.cpp:402
+#: src/kgoldrunner.cpp:407
 msgid "Mouse controls hero."
 msgstr ""
 
-#: src/kgoldrunner.cpp:403
+#: src/kgoldrunner.cpp:408
 msgid "Use the mouse to control the hero's moves."
 msgstr ""
 
-#: src/kgoldrunner.cpp:407
+#: src/kgoldrunner.cpp:412
 msgid "&Keyboard Controls Hero"
 msgstr "&Mae'r bysellfwrdd yn rheoli'r Arwr"
 
-#: src/kgoldrunner.cpp:408
+#: src/kgoldrunner.cpp:413
 msgid "Keyboard controls hero."
 msgstr ""
 
-#: src/kgoldrunner.cpp:409
+#: src/kgoldrunner.cpp:414
 msgid "Use the keyboard to control the hero's moves."
 msgstr ""
 
-#: src/kgoldrunner.cpp:413
+#: src/kgoldrunner.cpp:418
 msgid "Hybrid Control (&Laptop)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:414
+#: src/kgoldrunner.cpp:419
 msgid "Pointer controls hero; dig using keyboard."
 msgstr ""
 
-#: src/kgoldrunner.cpp:416
+#: src/kgoldrunner.cpp:421
 msgid ""
 "Use the laptop's pointer device to control the hero's moves, and use the "
 "keyboard to dig left and right."
 msgstr ""
 
-#: src/kgoldrunner.cpp:431
+#: src/kgoldrunner.cpp:436
 msgid "&Click Key To Move"
 msgstr ""
 
-#: src/kgoldrunner.cpp:432
+#: src/kgoldrunner.cpp:437
 msgid "Click Key To Move."
 msgstr ""
 
-#: src/kgoldrunner.cpp:433
+#: src/kgoldrunner.cpp:438
 msgid ""
 "In keyboard mode, click a direction-key to start moving and keep on going "
 "until you click another key."
 msgstr ""
 
-#: src/kgoldrunner.cpp:439
+#: src/kgoldrunner.cpp:444
 msgid "&Hold Key To Move"
 msgstr ""
 
-#: src/kgoldrunner.cpp:440
+#: src/kgoldrunner.cpp:445
 msgid "Hold Key To Move."
 msgstr ""
 
-#: src/kgoldrunner.cpp:441
+#: src/kgoldrunner.cpp:446
 msgid ""
 "In keyboard mode, hold down a direction-key to move and release it to stop."
 msgstr ""
 
-#: src/kgoldrunner.cpp:458
+#: src/kgoldrunner.cpp:463
 msgid "Normal Speed"
 msgstr "Cyflymder Arferol"
 
-#: src/kgoldrunner.cpp:459
+#: src/kgoldrunner.cpp:464
 msgid "Set normal speed."
 msgstr ""
 
-#: src/kgoldrunner.cpp:460
+#: src/kgoldrunner.cpp:465
 msgid "Set normal game speed."
 msgstr ""
 
-#: src/kgoldrunner.cpp:464
+#: src/kgoldrunner.cpp:469
 msgid "Beginner Speed"
 msgstr "Cyflymder Dechreuwr"
 
-#: src/kgoldrunner.cpp:465
+#: src/kgoldrunner.cpp:470
 msgid "Set beginners' speed."
 msgstr ""
 
-#: src/kgoldrunner.cpp:466
+#: src/kgoldrunner.cpp:471
 msgid "Set beginners' game speed (0.5 times normal)."
 msgstr ""
 
-#: src/kgoldrunner.cpp:471
+#: src/kgoldrunner.cpp:476
 msgid "Champion Speed"
 msgstr "Cyflymder Pencampwr"
 
-#: src/kgoldrunner.cpp:472
+#: src/kgoldrunner.cpp:477
 msgid "Set champions' speed."
 msgstr ""
 
-#: src/kgoldrunner.cpp:473
+#: src/kgoldrunner.cpp:478
 msgid "Set champions' game speed (1.5 times normal)."
 msgstr ""
 
-#: src/kgoldrunner.cpp:477
+#: src/kgoldrunner.cpp:482
 msgid "Increase Speed"
 msgstr "Cynyddu Cyflymder"
 
-#: src/kgoldrunner.cpp:478
+#: src/kgoldrunner.cpp:483
 msgid "Increase speed."
 msgstr ""
 
-#: src/kgoldrunner.cpp:479
+#: src/kgoldrunner.cpp:484
 msgid "Increase the game speed by 0.1 (maximum is 2.0 times normal)."
 msgstr ""
 
-#: src/kgoldrunner.cpp:484
+#: src/kgoldrunner.cpp:489
 msgid "Decrease Speed"
 msgstr "Gostwng Cyflymder"
 
-#: src/kgoldrunner.cpp:485
+#: src/kgoldrunner.cpp:490
 msgid "Decrease speed."
 msgstr ""
 
-#: src/kgoldrunner.cpp:486
+#: src/kgoldrunner.cpp:491
 msgid "Decrease the game speed by 0.1 (minimum is 0.2 times normal)."
 msgstr ""
 
-#: src/kgoldrunner.cpp:520
+#: src/kgoldrunner.cpp:525
 msgid "Stop"
 msgstr ""
 
-#: src/kgoldrunner.cpp:521
+#: src/kgoldrunner.cpp:526
 msgid "Move Right"
 msgstr "Symud i'r Dde"
 
-#: src/kgoldrunner.cpp:522
+#: src/kgoldrunner.cpp:527
 msgid "Move Left"
 msgstr "Symud i'r Chwith"
 
-#: src/kgoldrunner.cpp:523
+#: src/kgoldrunner.cpp:528
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: src/kgoldrunner.cpp:524
+#: src/kgoldrunner.cpp:529
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#: src/kgoldrunner.cpp:525
+#: src/kgoldrunner.cpp:530
 msgid "Dig Right"
 msgstr "Palu i'r Dde"
 
-#: src/kgoldrunner.cpp:526
+#: src/kgoldrunner.cpp:531
 msgid "Dig Left"
 msgstr "Palu i'r Chwith"
 
-#: src/kgoldrunner.cpp:554
+#: src/kgoldrunner.cpp:559
 msgid "Do a Step"
 msgstr ""
 
-#: src/kgoldrunner.cpp:555
+#: src/kgoldrunner.cpp:560
 msgid "Test Bug Fix"
 msgstr "Profi Cywiriad Nam"
 
-#: src/kgoldrunner.cpp:556
+#: src/kgoldrunner.cpp:561
 msgid "Show Positions"
 msgstr "Dangos Lleoliadau"
 
-#: src/kgoldrunner.cpp:557
+#: src/kgoldrunner.cpp:562
 msgid "Start Logging"
 msgstr "Dechrau Cofnodi"
 
-#: src/kgoldrunner.cpp:558
+#: src/kgoldrunner.cpp:563
 msgid "Show Hero"
 msgstr "Dangos Arwr"
 
-#: src/kgoldrunner.cpp:559
+#: src/kgoldrunner.cpp:564
 msgid "Show Object"
 msgstr "Dangos Gwrthrych"
 
-#: src/kgoldrunner.cpp:561 src/kgoldrunner.cpp:562 src/kgoldrunner.cpp:563
-#: src/kgoldrunner.cpp:564 src/kgoldrunner.cpp:565 src/kgoldrunner.cpp:566
-#: src/kgoldrunner.cpp:567
+#: src/kgoldrunner.cpp:566 src/kgoldrunner.cpp:567 src/kgoldrunner.cpp:568
+#: src/kgoldrunner.cpp:569 src/kgoldrunner.cpp:570 src/kgoldrunner.cpp:571
+#: src/kgoldrunner.cpp:572
 msgid "Show Enemy"
 msgstr "Dangos Gelyn"
 
-#: src/kgoldrunner.cpp:733
+#: src/kgoldrunner.cpp:738
 msgid "Missing Name"
 msgstr ""
 
-#: src/kgoldrunner.cpp:792
+#: src/kgoldrunner.cpp:797
 msgid "   Lives: "
 msgstr "   Bywydau: "
 
-#: src/kgoldrunner.cpp:804
+#: src/kgoldrunner.cpp:809
 msgid "   Score: "
 msgstr "   Sgôr: "
 
-#: src/kgoldrunner.cpp:816
+#: src/kgoldrunner.cpp:821
 msgid "   Level: "
 msgstr "   Lefel: "
 
-#: src/kgoldrunner.cpp:833
+#: src/kgoldrunner.cpp:838
 #, kde-format
 msgid "Press \"%1\" to RESUME"
 msgstr "Gwasgwch \"%1\" i FYND YMLAEN"
 
-#: src/kgoldrunner.cpp:835
+#: src/kgoldrunner.cpp:840
 #, kde-format
 msgid "Press \"%1\" or \"%2\" to RESUME"
 msgstr ""
 
-#: src/kgoldrunner.cpp:841
+#: src/kgoldrunner.cpp:846
 #, kde-format
 msgid "Press \"%1\" to PAUSE"
 msgstr "Gwasgwch \"%1\" i SEIBIO"
 
-#: src/kgoldrunner.cpp:843
+#: src/kgoldrunner.cpp:848
 #, kde-format
 msgid "Press \"%1\" or \"%2\" to PAUSE"
 msgstr ""
 
-#: src/kgoldrunner.cpp:853
+#: src/kgoldrunner.cpp:858
 msgid "   Has hint   "
 msgstr "   Efo cynghoryn   "
 
-#: src/kgoldrunner.cpp:856
+#: src/kgoldrunner.cpp:861
 msgid "   No hint   "
 msgstr "   Heb gynghoryn   "
 
-#: src/kgoldrunner.cpp:924
+#: src/kgoldrunner.cpp:929
 msgid "Theme Not Loaded"
 msgstr ""
 
-#: src/kgoldrunner.cpp:925
+#: src/kgoldrunner.cpp:930
 msgid ""
 "Cannot load the theme you selected.  It is not in the required graphics "
 "format (SVG)."
 msgstr ""
 
-#: src/kgoldrunner.cpp:985 src/kgoldrunner.cpp:997 src/kgoldrunner.cpp:1010
-#: src/kgoldrunner.cpp:1019
+#: src/kgoldrunner.cpp:990 src/kgoldrunner.cpp:1002 src/kgoldrunner.cpp:1015
+#: src/kgoldrunner.cpp:1024
 msgid "Get Folders"
 msgstr "Nôl Plygyll"
 
-#: src/kgoldrunner.cpp:986
+#: src/kgoldrunner.cpp:991
 #, kde-format
 msgid ""
 "Cannot find documentation sub-folder 'en/%1/' in area '%2' of the KDE folder "
@@ -3673,7 +4238,7 @@
 "Methu canfod is-blygell dogfenniaeth 'en/%1/' yn ardal '%2' o'r blygell KDE "
 "($KDEDIRS)."
 
-#: src/kgoldrunner.cpp:998
+#: src/kgoldrunner.cpp:1003
 #, kde-format
 msgid ""
 "Cannot find system games sub-folder '%1/system/' in area '%2' of the KDE "
@@ -3682,7 +4247,7 @@
 "Methu canfod is-blygell gemau cysawd '%1/system/' yn ardal '%2' o'r blygell "
 "KDE ($KDEDIRS)."
 
-#: src/kgoldrunner.cpp:1011
+#: src/kgoldrunner.cpp:1016
 #, kde-format
 msgid ""
 "Cannot find or create user games sub-folder '%1/user/' in area '%2' of the "
@@ -3691,7 +4256,7 @@
 "Methu canfod neu greu is-blygell gemau defnyddiwr '%1/user/' yn ardal '%2' "
 "o'r ardal ddefnyddiwr KDE ($KDEDIRS)."
 
-#: src/kgoldrunner.cpp:1020
+#: src/kgoldrunner.cpp:1025
 #, kde-format
 msgid ""
 "Cannot find or create 'levels/' folder in sub-folder '%1/user/' in the KDE "
@@ -3700,155 +4265,155 @@
 "Methu canfod neu greu is-blygell lefelau '%1/user/' yn yr ardal ddefnyddiwr "
 "KDE ($KDEDIRS)."
 
-#: src/kgoldrunner.cpp:1053
+#: src/kgoldrunner.cpp:1058
 msgid "Edit Name/Hint"
 msgstr "Golygu Enw/Cynghoryn"
 
-#: src/kgoldrunner.cpp:1054
+#: src/kgoldrunner.cpp:1059
 msgid "Edit level name or hint"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1055
+#: src/kgoldrunner.cpp:1060
 msgid "Edit text for the name or hint of a level"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1058
+#: src/kgoldrunner.cpp:1063
 msgid "Name/Hint"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1061
+#: src/kgoldrunner.cpp:1066
 msgid "Erase"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1061
+#: src/kgoldrunner.cpp:1066
 msgid "Space/Erase"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1062
+#: src/kgoldrunner.cpp:1067
 msgid "Paint empty squares or erase"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1063
+#: src/kgoldrunner.cpp:1068
 msgid "Erase objects or paint empty squares"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1066
+#: src/kgoldrunner.cpp:1071
 msgid "Hero"
 msgstr "Arwr"
 
-#: src/kgoldrunner.cpp:1067
+#: src/kgoldrunner.cpp:1072
 msgid "Move hero"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1068
+#: src/kgoldrunner.cpp:1073
 msgid "Change the hero's starting position"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1071
+#: src/kgoldrunner.cpp:1076
 msgid "Enemy"
 msgstr "Gelyn"
 
-#: src/kgoldrunner.cpp:1072
+#: src/kgoldrunner.cpp:1077
 msgid "Paint enemies"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1073
+#: src/kgoldrunner.cpp:1078
 msgid "Paint enemies at their starting positions"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1077
+#: src/kgoldrunner.cpp:1082
 msgid "Brick"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1078
+#: src/kgoldrunner.cpp:1083
 msgid "Paint bricks (can dig)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1079
+#: src/kgoldrunner.cpp:1084
 msgid "Paint bricks (diggable objects)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1082
+#: src/kgoldrunner.cpp:1087
 msgid "Concrete"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1083
+#: src/kgoldrunner.cpp:1088
 msgid "Paint concrete (cannot dig)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1084
+#: src/kgoldrunner.cpp:1089
 msgid "Paint concrete objects (not diggable)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1087
+#: src/kgoldrunner.cpp:1092
 msgid "Trap"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1087
+#: src/kgoldrunner.cpp:1092
 msgid "Trap/False Brick"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1088 src/kgoldrunner.cpp:1090
+#: src/kgoldrunner.cpp:1093 src/kgoldrunner.cpp:1095
 msgid "Paint traps or false bricks (can fall through)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1094
+#: src/kgoldrunner.cpp:1099
 msgid "Ladder"
 msgstr "Ysgol"
 
-#: src/kgoldrunner.cpp:1095
+#: src/kgoldrunner.cpp:1100
 msgid "Paint ladders"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1096
+#: src/kgoldrunner.cpp:1101
 msgid "Paint ladders (ways to go up or down)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1099
+#: src/kgoldrunner.cpp:1104
 msgid "H Ladder"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1099
+#: src/kgoldrunner.cpp:1104
 msgid "Hidden Ladder"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1100
+#: src/kgoldrunner.cpp:1105
 msgid "Paint hidden ladders"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1101
+#: src/kgoldrunner.cpp:1106
 msgid "Paint hidden ladders, which appear when all the gold is gone"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1105
+#: src/kgoldrunner.cpp:1110
 msgid "Bar"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1105
+#: src/kgoldrunner.cpp:1110
 msgid "Bar/Pole"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1106
+#: src/kgoldrunner.cpp:1111
 msgid "Paint bars or poles"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1107
+#: src/kgoldrunner.cpp:1112
 msgid "Paint bars or poles (can fall from these)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1111
+#: src/kgoldrunner.cpp:1116
 msgid "Gold"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1111
+#: src/kgoldrunner.cpp:1116
 msgid "Gold/Treasure"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1112
+#: src/kgoldrunner.cpp:1117
 msgid "Paint gold (or other treasure)"
 msgstr ""
 
-#: src/kgoldrunner.cpp:1113
+#: src/kgoldrunner.cpp:1118
 msgid "Paint gold pieces (or other treasure)"
 msgstr ""
 
@@ -3965,7 +4530,7 @@
 "through bricks, are you? :-)"
 msgstr ""
 
-#: src/kgreditor.cpp:253 src/kgreditor.cpp:271 src/kgrgame.cpp:247
+#: src/kgreditor.cpp:253 src/kgreditor.cpp:271 src/kgrgame.cpp:257
 msgid "Save Level"
 msgstr "Cadw Lefel"
 
@@ -3982,8 +4547,8 @@
 msgid "&Cancel"
 msgstr ""
 
-#: src/kgreditor.cpp:272 src/kgreditor.cpp:802 src/kgrgame.cpp:1351
-#: src/kgrgame.cpp:1559
+#: src/kgreditor.cpp:272 src/kgreditor.cpp:802 src/kgrgame.cpp:1401
+#: src/kgrgame.cpp:1609
 #, kde-format
 msgid "Cannot open file '%1' for output."
 msgstr "Methu agor ffeil '%1' ar gyfer allbwn."
@@ -4100,27 +4665,27 @@
 msgid "New Level"
 msgstr "Lefel Newydd"
 
-#: src/kgreditor.cpp:862 src/kgrgame.cpp:1259
+#: src/kgreditor.cpp:862 src/kgrgame.cpp:1309
 #, kde-format
 msgctxt "Game name - level number."
 msgid "%1 - %2"
 msgstr ""
 
-#: src/kgreditor.cpp:866 src/kgrgame.cpp:1262
+#: src/kgreditor.cpp:866 src/kgrgame.cpp:1312
 #, kde-format
 msgctxt "Game name - level number - level name."
 msgid "%1 - %2 - %3"
 msgstr ""
 
-#: src/kgrgame.cpp:180
+#: src/kgrgame.cpp:190
 msgid "Play Next Level"
 msgstr ""
 
-#: src/kgrgame.cpp:181
+#: src/kgrgame.cpp:191
 msgid "There are no more levels in this game."
 msgstr ""
 
-#: src/kgrgame.cpp:248
+#: src/kgrgame.cpp:258
 msgid "Inappropriate action: you are not editing a level."
 msgstr "Gweithrediad annilys: nid ydych yn golygu lefel."
 
@@ -4136,186 +4701,186 @@
 "were present when it was compiled and built."
 msgstr ""
 
-#: src/kgrgame.cpp:565 src/kgrgame.cpp:711
+#: src/kgrgame.cpp:588 src/kgrgame.cpp:734
 msgid "Game Paused"
 msgstr ""
 
-#: src/kgrgame.cpp:566
+#: src/kgrgame.cpp:589
 msgid ""
 "The replay has stopped and the game is pausing while you prepare to go on "
 "playing. Please press the Pause key (default P or Esc) when you are ready."
 msgstr ""
 
-#: src/kgrgame.cpp:610 src/kgrgame.cpp:616
+#: src/kgrgame.cpp:633 src/kgrgame.cpp:639
 msgid "Replay Last Level"
 msgstr ""
 
-#: src/kgrgame.cpp:611
+#: src/kgrgame.cpp:634
 msgid ""
 "ERROR: Could not find and replay a recording of the last level you played."
 msgstr ""
 
-#: src/kgrgame.cpp:617
+#: src/kgrgame.cpp:640
 msgid ""
 "There is no last level to replay.  You need to play a level to completion, "
 "win or lose, before you can use the Replay Last Level action."
 msgstr ""
 
-#: src/kgrgame.cpp:636
+#: src/kgrgame.cpp:659
 msgid "Quick Start"
 msgstr ""
 
-#: src/kgrgame.cpp:644
+#: src/kgrgame.cpp:667
 msgctxt "Button text: start playing a game"
 msgid "&PLAY"
 msgstr ""
 
-#: src/kgrgame.cpp:645
+#: src/kgrgame.cpp:668
 msgid "Start playing this level"
 msgstr ""
 
-#: src/kgrgame.cpp:647
+#: src/kgrgame.cpp:670
 msgid ""
 "Set up to start playing the game and level being shown, as soon as you "
 "click, move the mouse or press a key"
 msgstr ""
 
-#: src/kgrgame.cpp:651
+#: src/kgrgame.cpp:674
 msgid "&Quit"
 msgstr ""
 
-#: src/kgrgame.cpp:652
+#: src/kgrgame.cpp:675
 msgid "Close KGoldrunner"
 msgstr ""
 
-#: src/kgrgame.cpp:657
+#: src/kgrgame.cpp:680
 msgid "Start a different game or level"
 msgstr ""
 
-#: src/kgrgame.cpp:659
+#: src/kgrgame.cpp:682
 msgid ""
 "Use the Select Game dialog box to choose a different game or level and start "
 "playing it"
 msgstr ""
 
-#: src/kgrgame.cpp:663
+#: src/kgrgame.cpp:686
 msgid "&Use Menu"
 msgstr ""
 
-#: src/kgrgame.cpp:665
+#: src/kgrgame.cpp:688
 msgid "Use the menus to choose other actions"
 msgstr ""
 
-#: src/kgrgame.cpp:667
+#: src/kgrgame.cpp:690
 msgid ""
 "Before playing, use the menus to choose other actions, such as loading a "
 "saved game or changing the theme"
 msgstr ""
 
-#: src/kgrgame.cpp:712
+#: src/kgrgame.cpp:735
 msgid ""
 "The game is halted. You will need to press the Pause key (default P or Esc) "
 "when you are ready to play."
 msgstr ""
 
-#: src/kgrgame.cpp:760
+#: src/kgrgame.cpp:783
 msgid "Show A Solution"
 msgstr ""
 
-#: src/kgrgame.cpp:761
+#: src/kgrgame.cpp:784
 msgid ""
 "Sorry, although all levels of KGoldrunner can be solved, no solution has "
 "been recorded yet for the level you selected."
 msgstr ""
 
-#: src/kgrgame.cpp:771
+#: src/kgrgame.cpp:794
 msgid "Replay Any Level"
 msgstr ""
 
-#: src/kgrgame.cpp:772
+#: src/kgrgame.cpp:795
 msgid ""
 "Sorry, you do not seem to have played and recorded the selected level before."
 msgstr ""
 
-#: src/kgrgame.cpp:965
+#: src/kgrgame.cpp:999
 msgid ""
 "<NOBR><B>GAME OVER !!!</B></NOBR><P>Would you like to try this level "
 "again?</P>"
 msgstr ""
 
-#: src/kgrgame.cpp:967
+#: src/kgrgame.cpp:1001
 msgid "Game Over"
 msgstr ""
 
-#: src/kgrgame.cpp:968
+#: src/kgrgame.cpp:1002
 msgid "&Try Again"
 msgstr ""
 
-#: src/kgrgame.cpp:968
+#: src/kgrgame.cpp:1002
 msgid "&Finish"
 msgstr ""
 
-#: src/kgrgame.cpp:1040
+#: src/kgrgame.cpp:1074
 #, kde-format
 msgid ""
 "<b>CONGRATULATIONS !!!!</b><p>You have conquered the last level in the "
 "<b>\"%1\"</b> game !!</p>"
 msgstr ""
 
-#: src/kgrgame.cpp:1182
+#: src/kgrgame.cpp:1231
 msgid "Hint"
 msgstr "Cynghoryn"
 
-#: src/kgrgame.cpp:1188
+#: src/kgrgame.cpp:1237
 msgid "Sorry, there is no hint for this level."
 msgstr "Sori, nid oes cynghoryn ar gyfer y lefel yma."
 
-#: src/kgrgame.cpp:1249
+#: src/kgrgame.cpp:1299
 msgid "T H E   E N D"
 msgstr ""
 
-#: src/kgrgame.cpp:1286
+#: src/kgrgame.cpp:1336
 msgid ""
 "You have pressed a key that can be used to control the Hero. Do you want to "
 "switch automatically to keyboard control? Pointer control is easier to use "
 "in the long term - like riding a bike rather than walking!"
 msgstr ""
 
-#: src/kgrgame.cpp:1290
+#: src/kgrgame.cpp:1340
 msgid "Switch to Keyboard Mode"
 msgstr "Newid i Fodd Bysellfwrdd"
 
-#: src/kgrgame.cpp:1291
+#: src/kgrgame.cpp:1341
 msgid "Switch to &Keyboard Mode"
 msgstr "Newid i Fodd &Bysellfwrdd"
 
-#: src/kgrgame.cpp:1292
+#: src/kgrgame.cpp:1342
 msgid "Stay in &Mouse Mode"
 msgstr "Aros ym Modd &Llygoden"
 
-#: src/kgrgame.cpp:1293
+#: src/kgrgame.cpp:1343
 msgid "Keyboard Mode"
 msgstr ""
 
-#: src/kgrgame.cpp:1324 src/kgrgame.cpp:1350 src/kgrgame.cpp:1360
-#: src/kgrgame.cpp:1379 src/kgrgame.cpp:1385
+#: src/kgrgame.cpp:1374 src/kgrgame.cpp:1400 src/kgrgame.cpp:1410
+#: src/kgrgame.cpp:1429 src/kgrgame.cpp:1435
 msgid "Save Game"
 msgstr "Cadw Gêm"
 
-#: src/kgrgame.cpp:1325
+#: src/kgrgame.cpp:1375
 #, kde-format
 msgid ""
 "Sorry, you cannot save your game play while you are editing. Please try menu "
 "item \"%1\"."
 msgstr ""
 
-#: src/kgrgame.cpp:1361 src/kgrgame.cpp:1405 src/kgrgame.cpp:1520
-#: src/kgrgame.cpp:1721 src/kgrgame.cpp:1884 src/kgrgameio.cpp:167
+#: src/kgrgame.cpp:1411 src/kgrgame.cpp:1455 src/kgrgame.cpp:1570
+#: src/kgrgame.cpp:1771 src/kgrgame.cpp:1934 src/kgrgameio.cpp:167
 #, kde-format
 msgid "Cannot open file '%1' for read-only."
 msgstr "Methu agor ffeil '%1' ar gyfer darllen-yn-unig."
 
-#: src/kgrgame.cpp:1380
+#: src/kgrgame.cpp:1430
 msgid ""
 "Please note: for reasons of simplicity, your saved game position and score "
 "will be as they were at the start of this level, not as they are now."
@@ -4323,103 +4888,103 @@
 "Noder: am resymau symlrwydd, bydd eich lleoliad a'ch sgôr ar ôl cadw eich "
 "gêm fel yr oeddynt wrth ddechrau'r lefel yma, dim fel y maent rwan."
 
-#: src/kgrgame.cpp:1386
+#: src/kgrgame.cpp:1436
 msgid "Error: Failed to save your game."
 msgstr ""
 
-#: src/kgrgame.cpp:1398 src/kgrgame.cpp:1404 src/kgrgame.cpp:1442
+#: src/kgrgame.cpp:1448 src/kgrgame.cpp:1454 src/kgrgame.cpp:1492
 msgid "Load Game"
 msgstr "Llwytho Gêm"
 
-#: src/kgrgame.cpp:1399
+#: src/kgrgame.cpp:1449
 msgid "Sorry, there are no saved games."
 msgstr "Sori, nid oes yr un gêm wedi'i chadw."
 
-#: src/kgrgame.cpp:1443
+#: src/kgrgame.cpp:1493
 #, kde-format
 msgid "Cannot find the game with prefix '%1'."
 msgstr "Methu canfod y gêm efo'r rhagddodiad '%1'."
 
-#: src/kgrgame.cpp:1501
+#: src/kgrgame.cpp:1551
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: src/kgrgame.cpp:1519 src/kgrgame.cpp:1558
+#: src/kgrgame.cpp:1569 src/kgrgame.cpp:1608
 msgid "Check for High Score"
 msgstr "Gwirio a oes Sgôr Gorau"
 
-#: src/kgrgame.cpp:1576
+#: src/kgrgame.cpp:1626
 msgid ""
 "<html><b>Congratulations !!!</b><br>You have achieved a high score in this "
 "game.<br>Please enter your name so that it may be enshrined<br>in the "
 "KGoldrunner Hall of Fame.</html>"
 msgstr ""
 
-#: src/kgrgame.cpp:1588 src/kgrgame.cpp:1675
+#: src/kgrgame.cpp:1638 src/kgrgame.cpp:1725
 msgid "Save High Score"
 msgstr "Cadw Sĝor Gorau"
 
-#: src/kgrgame.cpp:1676
+#: src/kgrgame.cpp:1726
 msgid "Error: Failed to save your high score."
 msgstr ""
 
-#: src/kgrgame.cpp:1688 src/kgrgame.cpp:1711 src/kgrgame.cpp:1720
+#: src/kgrgame.cpp:1738 src/kgrgame.cpp:1761 src/kgrgame.cpp:1770
 msgid "Show High Scores"
 msgstr "Dangos Sgorau Gorau"
 
-#: src/kgrgame.cpp:1689
+#: src/kgrgame.cpp:1739
 msgid "Sorry, we do not keep high scores for tutorial games."
 msgstr "Sori, nid ydym yn cadw sgorau gorau ar gyfer gemau hyfforddiadol."
 
-#: src/kgrgame.cpp:1712
+#: src/kgrgame.cpp:1762
 #, kde-format
 msgid "Sorry, there are no high scores for the \"%1\" game yet."
 msgstr ""
 
-#: src/kgrgame.cpp:1736
+#: src/kgrgame.cpp:1786
 #, kde-format
 msgid ""
 "<center><h2>KGoldrunner Hall of Fame</h2></center><center><h3>\"%1\" "
 "Game</h3></center>"
 msgstr ""
 
-#: src/kgrgame.cpp:1746
+#: src/kgrgame.cpp:1796
 msgctxt "1, 2, 3 etc."
 msgid "Rank"
 msgstr ""
 
-#: src/kgrgame.cpp:1747
+#: src/kgrgame.cpp:1797
 msgctxt "Person"
 msgid "Name"
 msgstr ""
 
-#: src/kgrgame.cpp:1748
+#: src/kgrgame.cpp:1798
 msgctxt "Game level reached"
 msgid "Level"
 msgstr ""
 
-#: src/kgrgame.cpp:1749
+#: src/kgrgame.cpp:1799
 msgid "Score"
 msgstr ""
 
-#: src/kgrgame.cpp:1750
+#: src/kgrgame.cpp:1800
 msgid "Date"
 msgstr ""
 
-#: src/kgrgame.cpp:1753
+#: src/kgrgame.cpp:1803
 msgid "High Scores"
 msgstr "Sgorau Gorau"
 
-#: src/kgrgame.cpp:1877 src/kgrgame.cpp:1883 src/kgrgame.cpp:1887
+#: src/kgrgame.cpp:1927 src/kgrgame.cpp:1933 src/kgrgame.cpp:1937
 msgid "Load Game Info"
 msgstr "Llwytho Gwybodaeth Gêm"
 
-#: src/kgrgame.cpp:1878
+#: src/kgrgame.cpp:1928
 #, kde-format
 msgid "Cannot find game info file '%1'."
 msgstr "Methu canfod ffeil wybodaeth y gêm '%1'."
 
-#: src/kgrgame.cpp:1888
+#: src/kgrgame.cpp:1938
 #, kde-format
 msgid "Reached end of file '%1' before finding end of game-data."
 msgstr ""
@@ -4706,76 +5271,76 @@
 msgid "Help: Select Game & Level"
 msgstr "Cymorth: Dewis Gêm & Lefel"
 
-#: src/main.cpp:27
+#: src/main.cpp:28
 msgid "KGoldrunner is a game of action and puzzle solving"
 msgstr "Mae KGoldrunner yn gêm gynhyrfus lle mae angen datrys posau"
 
-#: src/main.cpp:46
+#: src/main.cpp:47
 msgid "(C) 2003 Ian Wadham and Marco Krüger"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "Ian Wadham"
 msgstr ""
 
-#: src/main.cpp:71
+#: src/main.cpp:75
 msgid "Current author"
 msgstr "Awdur cyfredol"
 
-#: src/main.cpp:73
+#: src/main.cpp:77
 msgid "Marco Krüger"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:77
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: src/main.cpp:75 src/main.cpp:81
+#: src/main.cpp:79 src/main.cpp:85
 msgid "Mauricio Piacentini"
 msgstr ""
 
-#: src/main.cpp:76
+#: src/main.cpp:80
 msgid "Port to KDE4, Qt4 and KGameCanvas classes"
 msgstr ""
 
-#: src/main.cpp:78
+#: src/main.cpp:82
 msgid "Maurizio Monge"
 msgstr ""
 
-#: src/main.cpp:79
+#: src/main.cpp:83
 msgid "KGameCanvas classes for KDE4"
 msgstr ""
 
-#: src/main.cpp:82
+#: src/main.cpp:86
 msgid "Artwork for runners and default theme"
 msgstr ""
 
-#: src/main.cpp:84
+#: src/main.cpp:88
 msgid "Johann Ollivier Lapeyre"
 msgstr ""
 
-#: src/main.cpp:85
+#: src/main.cpp:89
 msgid "Artwork for bars and ladders"
 msgstr ""
 
-#: src/main.cpp:87 src/main.cpp:95
+#: src/main.cpp:91 src/main.cpp:99
 msgid "Eugene Trounev"
 msgstr ""
 
-#: src/main.cpp:88
+#: src/main.cpp:92
 msgid "Artwork for background of Geek City theme"
 msgstr ""
 
-#: src/main.cpp:90
+#: src/main.cpp:94
 msgid "Luciano Montanaro"
 msgstr ""
 
-#: src/main.cpp:91
+#: src/main.cpp:95
 msgid ""
 "Nostalgia themes, improvements to runners, multiple-backgrounds feature, "
 "fade-in/fade-out feature and several other ideas"
 msgstr ""
 
-#: src/main.cpp:96
+#: src/main.cpp:100
 msgid "Artwork for the Treasure of Egypt theme"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgreet_classic.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgreet_classic.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgreet_classic.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgreet_classic.po	2012-04-18 08:59:38.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: kgreet_classic\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 01:51+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:35+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kgreet_classic.cpp:93
 msgid "&Username:"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgreet_generic.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgreet_generic.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgreet_generic.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgreet_generic.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 01:51+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:36+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kgreet_generic.cpp:350
 msgctxt "@item:inmenu authentication method"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgreet_winbind.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgreet_winbind.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kgreet_winbind.po	2012-03-23 07:39:26.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kgreet_winbind.po	2012-04-18 08:59:38.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 01:51+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:36+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kgreet_winbind.cpp:126
 msgid "&Domain:"
@@ -49,7 +49,7 @@
 msgid "Unrecognized prompt \"%1\""
 msgstr "Anogiad anadnabyddus \"%1\""
 
-#: kgreet_winbind.cpp:629
+#: kgreet_winbind.cpp:631
 msgctxt "@item:inmenu authentication method"
 msgid "Winbind / Samba"
 msgstr "Winbind / Samba"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khangman.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khangman.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khangman.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khangman.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/khangman.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:38+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
 "PO-Revision-Date: 2009-07-18 17:48+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:00+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:33+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: data.i18n:2
 msgctxt "NOTE_TO_THE_TRANSLATORS"
@@ -50,7 +50,7 @@
 msgid "Congratulations! You won!"
 msgstr ""
 
-#: main.cpp:38 khangmanview.cpp:510
+#: khangmanview.cpp:510 main.cpp:38
 msgid "KHangMan"
 msgstr "Krogwr"
 
@@ -74,247 +74,11 @@
 msgid "Wins: %1"
 msgstr ""
 
-#: khangman.cpp:558 khangmanview.cpp:726
+#: khangmanview.cpp:726 khangman.cpp:558
 #, kde-format
 msgid "Losses: %1"
 msgstr ""
 
-#: main.cpp:34
-msgid "Classical hangman game for KDE"
-msgstr ""
-
-#: main.cpp:40
-msgid "(c) 2001-2009, Anne-Marie Mahfouf"
-msgstr ""
-
-#: main.cpp:42
-msgid "Primoz Anzur"
-msgstr ""
-
-#: main.cpp:42
-msgid "Previous maintainer"
-msgstr "Cynhaliwr Cynt"
-
-#: main.cpp:47
-msgid "Anne-Marie Mahfouf"
-msgstr ""
-
-#: main.cpp:47
-msgid "Current maintainer, author"
-msgstr ""
-
-#: main.cpp:49
-msgid "Stefan Böhmann"
-msgstr ""
-
-#: main.cpp:50 main.cpp:95 main.cpp:97 main.cpp:99
-msgid "Coding help"
-msgstr ""
-
-#: main.cpp:51
-msgid "Stefan Asserhäll"
-msgstr ""
-
-#: main.cpp:52
-msgid "Swedish data files, coding help, transparent pictures and i18n fixes"
-msgstr ""
-
-#: main.cpp:54
-msgid "eXParTaKus"
-msgstr ""
-
-#: main.cpp:55
-msgid "Spanish data files"
-msgstr ""
-
-#: main.cpp:56
-msgid "Erik Kjær Pedersenn"
-msgstr ""
-
-#: main.cpp:57
-msgid "Danish data files"
-msgstr ""
-
-#: main.cpp:58
-msgid "Niko Lewman"
-msgstr ""
-
-#: main.cpp:59
-msgid "Finnish data files"
-msgstr ""
-
-#: main.cpp:60
-msgid "João Sebastião de Oliveira Bueno"
-msgstr ""
-
-#: main.cpp:61
-msgid "Brazilian Portuguese data files"
-msgstr ""
-
-#: main.cpp:62
-msgid "Antoni Bella"
-msgstr ""
-
-#: main.cpp:63
-msgid "Catalan data files"
-msgstr ""
-
-#: main.cpp:64
-msgid "Giovanni Venturi"
-msgstr ""
-
-#: main.cpp:65
-msgid "Italian data files"
-msgstr ""
-
-#: main.cpp:66
-msgid "Rinse"
-msgstr ""
-
-#: main.cpp:67
-msgid "Dutch data files"
-msgstr ""
-
-#: main.cpp:68
-msgid "Lukáš Tinkl"
-msgstr ""
-
-#: main.cpp:69
-msgid "Czech data files"
-msgstr ""
-
-#: main.cpp:70
-msgid "Tamas Szanto"
-msgstr ""
-
-#: main.cpp:71
-msgid "Hungarian data files"
-msgstr ""
-
-#: main.cpp:72
-msgid "Torger Åge Sinnes"
-msgstr ""
-
-#: main.cpp:73
-msgid "Norwegian (Bokmål) data files"
-msgstr ""
-
-#: main.cpp:74
-msgid "Roger Kovacs"
-msgstr ""
-
-#: main.cpp:75
-msgid "Tajik data files"
-msgstr ""
-
-#: main.cpp:76
-msgid "Chusslove Illich"
-msgstr ""
-
-#: main.cpp:77
-msgid "Serbian (Cyrillic and Latin) data files"
-msgstr ""
-
-#: main.cpp:78
-msgid "Jure Repinc"
-msgstr ""
-
-#: main.cpp:79
-msgid "Slovenian data files"
-msgstr ""
-
-#: main.cpp:80
-msgid "Pedro Morais"
-msgstr ""
-
-#: main.cpp:81
-msgid "Portuguese data files"
-msgstr ""
-
-#: main.cpp:82
-msgid "Gaute Hvoslef Kvalnes"
-msgstr ""
-
-#: main.cpp:83
-msgid "Norwegian (Nynorsk) data files"
-msgstr ""
-
-#: main.cpp:84
-msgid "Mehmet Özel"
-msgstr ""
-
-#: main.cpp:85
-msgid "Turkish data files"
-msgstr ""
-
-#: main.cpp:86
-msgid "Черепанов Андрей"
-msgstr ""
-
-#: main.cpp:87
-msgid "Russian data files"
-msgstr ""
-
-#: main.cpp:88
-msgid "Radostin Radnev"
-msgstr ""
-
-#: main.cpp:89
-msgid "Bulgarian data files"
-msgstr ""
-
-#: main.cpp:90
-msgid "Kevin Patrick Scannell"
-msgstr ""
-
-#: main.cpp:91
-msgid "Irish (Gaelic) data files"
-msgstr ""
-
-#: main.cpp:92
-msgid "Matt Howe"
-msgstr ""
-
-#: main.cpp:93
-msgid "Softer Hangman Pictures"
-msgstr ""
-
-#: main.cpp:94
-msgid "Benjamin Meyer"
-msgstr ""
-
-#: main.cpp:96
-msgid "Robert Gogolok"
-msgstr ""
-
-#: main.cpp:98
-msgid "Lubos Lunàk"
-msgstr ""
-
-#: main.cpp:100
-msgid "Albert Astals Cid"
-msgstr ""
-
-#: main.cpp:101
-msgid "Coding help, fixed a lot of things"
-msgstr ""
-
-#: main.cpp:102
-msgid "Peter Hedlund"
-msgstr ""
-
-#: main.cpp:103
-msgid "Code for generating icons for the characters toolbar"
-msgstr ""
-
-#: main.cpp:104
-msgid "Inge Wallin"
-msgstr ""
-
-#: main.cpp:105
-msgid "Code cleaning"
-msgstr ""
-
 #: khangman.cpp:97
 msgid "Play with a new word"
 msgstr ""
@@ -382,13 +146,13 @@
 
 #. i18n: file: timerui.ui:19
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:143 rc.cpp:254 khangman.cpp:363 rc.cpp:143 rc.cpp:254
+#: khangman.cpp:363 rc.cpp:111 rc.cpp:111
 msgid "Timers"
 msgstr ""
 
 #. i18n: file: languageui.ui:32
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AccentedLetters)
-#: rc.cpp:137 rc.cpp:248 khangman.cpp:530 rc.cpp:137 rc.cpp:248
+#: khangman.cpp:530 rc.cpp:105 rc.cpp:105
 msgid "Type accented letters"
 msgstr ""
 
@@ -396,56 +160,67 @@
 msgid "Open Vocabulary Document"
 msgstr ""
 
-#: timer.cpp:37 timer.cpp:45
-#, kde-format
-msgid "1 second"
-msgid_plural "%1 seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: rc.cpp:153 rc.cpp:153
+#: rc.cpp:1 rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:154 rc.cpp:154
+#: rc.cpp:2 rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
+#. i18n: tag theme attribute uiname
+#. i18n: file: ../themes/standardthemes.xml:4
+#: rc.cpp:5 rc.cpp:5
+msgid "Sea Theme"
+msgstr ""
+
+#. i18n: tag theme attribute uiname
+#. i18n: file: ../themes/standardthemes.xml:20
+#: rc.cpp:8 rc.cpp:8
+msgid "Bee Theme"
+msgstr ""
+
+#. i18n: tag theme attribute uiname
+#. i18n: file: ../themes/standardthemes.xml:36
+#: rc.cpp:11 rc.cpp:11
+msgid "Desert Theme"
+msgstr ""
+
 #. i18n: file: khangmanui.rc:5
 #. i18n: ectx: Menu (file)
-#: rc.cpp:106 rc.cpp:157 rc.cpp:106 rc.cpp:157
+#: rc.cpp:14 rc.cpp:14
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: khangmanui.rc:19
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:109 rc.cpp:160 rc.cpp:109 rc.cpp:160
+#: rc.cpp:17 rc.cpp:17
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: khangmanui.rc:30
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:112 rc.cpp:163 rc.cpp:112 rc.cpp:163
+#: rc.cpp:20 rc.cpp:20
 msgid "Main"
 msgstr "Prif"
 
 #. i18n: file: khangmanui.rc:38
 #. i18n: ectx: ToolBar (specialCharToolBar)
-#: rc.cpp:115 rc.cpp:166 rc.cpp:115 rc.cpp:166
+#: rc.cpp:23 rc.cpp:23
 msgid "Special Characters"
 msgstr "Nodau Arbennig"
 
 #. i18n: file: khangmanui.rc:41
 #. i18n: ectx: ToolBar (themeToolBar)
-#: rc.cpp:118 rc.cpp:169 rc.cpp:118 rc.cpp:169
+#: rc.cpp:26 rc.cpp:26
 msgid "Look"
 msgstr ""
 
 #. i18n: file: khangmanui.rc:45
 #. i18n: ectx: ToolBar (languageToolBar)
-#: rc.cpp:121 rc.cpp:172 rc.cpp:121 rc.cpp:172
+#: rc.cpp:29 rc.cpp:29
 msgid "Language"
 msgstr ""
 
@@ -457,22 +232,13 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
 #. i18n: file: languageui.ui:19
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: advanced.ui:36
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
-#. i18n: file: languageui.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: advanced.ui:36
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
-#. i18n: file: languageui.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:3 rc.cpp:127 rc.cpp:175 rc.cpp:238 rc.cpp:3 rc.cpp:127 rc.cpp:175
-#: rc.cpp:238
+#: rc.cpp:32 rc.cpp:95 rc.cpp:32 rc.cpp:95
 msgid "Spanish, Portuguese, Catalan"
 msgstr ""
 
 #. i18n: file: advanced.ui:48
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AccentedLetters)
-#: rc.cpp:6 rc.cpp:178 rc.cpp:6 rc.cpp:178
+#: rc.cpp:35 rc.cpp:35
 msgid "Type accented &letters"
 msgstr ""
 
@@ -484,16 +250,7 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AccentedLetters)
 #. i18n: file: languageui.ui:25
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: advanced.ui:51
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: languageui.ui:25
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: advanced.ui:51
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: languageui.ui:25
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AccentedLetters)
-#: rc.cpp:9 rc.cpp:130 rc.cpp:181 rc.cpp:241 rc.cpp:9 rc.cpp:130 rc.cpp:181
-#: rc.cpp:241
+#: rc.cpp:38 rc.cpp:98 rc.cpp:38 rc.cpp:98
 msgid ""
 "If this is checked, you have to type accented letters yourself (i.e. they "
 "are differentiated from the corresponding unaccented letter)."
@@ -507,16 +264,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AccentedLetters)
 #. i18n: file: languageui.ui:29
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: advanced.ui:55
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: languageui.ui:29
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: advanced.ui:55
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AccentedLetters)
-#. i18n: file: languageui.ui:29
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AccentedLetters)
-#: rc.cpp:12 rc.cpp:133 rc.cpp:184 rc.cpp:244 rc.cpp:12 rc.cpp:133 rc.cpp:184
-#: rc.cpp:244
+#: rc.cpp:41 rc.cpp:101 rc.cpp:41 rc.cpp:101
 msgid ""
 "If this is <b>disabled</b>, the selected language does not support it. If "
 "this is <b>enabled</b> and if you check it, then you should type accented "
@@ -530,25 +278,25 @@
 
 #. i18n: file: advanced.ui:73
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
-#: rc.cpp:16 rc.cpp:188 rc.cpp:16 rc.cpp:188
+#: rc.cpp:45 rc.cpp:45
 msgid "German"
 msgstr ""
 
 #. i18n: file: advanced.ui:85
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UpperCase)
-#: rc.cpp:19 rc.cpp:191 rc.cpp:19 rc.cpp:191
+#: rc.cpp:48 rc.cpp:48
 msgid "Play in upper case letters"
 msgstr ""
 
 #. i18n: file: advanced.ui:88
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_UpperCase)
-#: rc.cpp:22 rc.cpp:194 rc.cpp:22 rc.cpp:194
+#: rc.cpp:51 rc.cpp:51
 msgid "If checked, the word will be displayed all in upper case letters"
 msgstr ""
 
 #. i18n: file: advanced.ui:92
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_UpperCase)
-#: rc.cpp:25 rc.cpp:197 rc.cpp:25 rc.cpp:197
+#: rc.cpp:54 rc.cpp:54
 msgid ""
 "If this is checked, the word will be displayed in upper case letters, even "
 "if you enter them in lower case. If this is unchecked (default), the word "
@@ -558,35 +306,26 @@
 
 #. i18n: file: generalui.ui:14
 #. i18n: ectx: property (toolTip), widget (QWidget, generalui)
-#: rc.cpp:29 rc.cpp:201 rc.cpp:29 rc.cpp:201
+#: rc.cpp:58 rc.cpp:58
 msgid "Here you can choose settings for all languages."
 msgstr ""
 
 #. i18n: file: generalui.ui:22
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OneLetter)
-#. i18n: file: khangman.kcfg:48
+#. i18n: file: khangman.kcfg:44
 #. i18n: ectx: label, entry (OneLetter), group (General)
 #. i18n: file: generalui.ui:22
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OneLetter)
-#. i18n: file: khangman.kcfg:48
+#. i18n: file: khangman.kcfg:44
 #. i18n: ectx: label, entry (OneLetter), group (General)
-#. i18n: file: generalui.ui:22
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OneLetter)
-#. i18n: file: khangman.kcfg:48
-#. i18n: ectx: label, entry (OneLetter), group (General)
-#. i18n: file: generalui.ui:22
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_OneLetter)
-#. i18n: file: khangman.kcfg:48
-#. i18n: ectx: label, entry (OneLetter), group (General)
-#: rc.cpp:32 rc.cpp:75 rc.cpp:204 rc.cpp:278 rc.cpp:32 rc.cpp:75 rc.cpp:204
-#: rc.cpp:278
+#: rc.cpp:61 rc.cpp:135 rc.cpp:61 rc.cpp:135
 msgid ""
 "Check this if you do not want to discover each instance of the same letter."
 msgstr ""
 
 #. i18n: file: generalui.ui:28
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_OneLetter)
-#: rc.cpp:35 rc.cpp:207 rc.cpp:35 rc.cpp:207
+#: rc.cpp:64 rc.cpp:64
 msgid ""
 "If you check this box, only the first letter will be written if the letter "
 "is found in several places in the word. Then you have to rechoose the same "
@@ -603,52 +342,43 @@
 
 #. i18n: file: generalui.ui:31
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_OneLetter)
-#: rc.cpp:41 rc.cpp:213 rc.cpp:41 rc.cpp:213
+#: rc.cpp:70 rc.cpp:70
 msgid "Require more guesses for duplicate letters"
 msgstr ""
 
 #. i18n: file: generalui.ui:38
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableAnimations)
-#: rc.cpp:44 rc.cpp:216 rc.cpp:44 rc.cpp:216
+#: rc.cpp:73 rc.cpp:73
 msgid "Enable animations"
 msgstr ""
 
 #. i18n: file: generalui.ui:45
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Hint)
-#: rc.cpp:47 rc.cpp:219 rc.cpp:47 rc.cpp:219
+#: rc.cpp:76 rc.cpp:76
 msgid "Enable hints globally"
 msgstr ""
 
 #. i18n: file: generalui.ui:52
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:50 rc.cpp:222 rc.cpp:50 rc.cpp:222
+#: rc.cpp:79 rc.cpp:79
 msgid "Sounds"
 msgstr "Syniau"
 
 #. i18n: file: generalui.ui:58
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_Sound)
-#. i18n: file: khangman.kcfg:56
-#. i18n: ectx: label, entry (Sound), group (General)
-#. i18n: file: generalui.ui:58
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_Sound)
-#. i18n: file: khangman.kcfg:56
-#. i18n: ectx: label, entry (Sound), group (General)
-#. i18n: file: generalui.ui:58
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_Sound)
-#. i18n: file: khangman.kcfg:56
+#. i18n: file: khangman.kcfg:52
 #. i18n: ectx: label, entry (Sound), group (General)
 #. i18n: file: generalui.ui:58
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_Sound)
-#. i18n: file: khangman.kcfg:56
+#. i18n: file: khangman.kcfg:52
 #. i18n: ectx: label, entry (Sound), group (General)
-#: rc.cpp:53 rc.cpp:81 rc.cpp:225 rc.cpp:284 rc.cpp:53 rc.cpp:81 rc.cpp:225
-#: rc.cpp:284
+#: rc.cpp:82 rc.cpp:141 rc.cpp:82 rc.cpp:141
 msgid "If checked, sounds will be played for New Game and Win Game"
 msgstr ""
 
 #. i18n: file: generalui.ui:62
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_Sound)
-#: rc.cpp:56 rc.cpp:228 rc.cpp:56 rc.cpp:228
+#: rc.cpp:85 rc.cpp:85
 msgid ""
 "If this box is checked, you will have some sounds played for each new game "
 "and when you win a game. If this is not checked, there will be no sound in "
@@ -658,19 +388,19 @@
 
 #. i18n: file: generalui.ui:65
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Sound)
-#: rc.cpp:60 rc.cpp:232 rc.cpp:60 rc.cpp:232
+#: rc.cpp:89 rc.cpp:89
 msgid "Enable sounds"
 msgstr ""
 
 #. i18n: file: languageui.ui:13
 #. i18n: ectx: property (toolTip), widget (QWidget, languageui)
-#: rc.cpp:124 rc.cpp:235 rc.cpp:124 rc.cpp:235
+#: rc.cpp:92 rc.cpp:92
 msgid "Here you can choose special settings for some languages."
 msgstr ""
 
 #. i18n: file: timerui.ui:16
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox)
-#: rc.cpp:140 rc.cpp:251 rc.cpp:140 rc.cpp:251
+#: rc.cpp:108 rc.cpp:108
 msgid ""
 "Here you can set the display times for hints and the \"Already Guessed\" "
 "tooltip."
@@ -678,28 +408,25 @@
 
 #. i18n: file: timerui.ui:34
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:146 rc.cpp:257 rc.cpp:146 rc.cpp:257
+#: rc.cpp:114 rc.cpp:114
 msgid "Time for displaying the <b>Already Guessed Letter</b> tooltip:"
 msgstr ""
 
-#. i18n: file: khangman.kcfg:65
-#. i18n: ectx: label, entry (MissedTimer), group (General)
 #. i18n: file: timerui.ui:41
 #. i18n: ectx: property (toolTip), widget (QSlider, kcfg_MissedTimer)
-#. i18n: file: khangman.kcfg:65
+#. i18n: file: khangman.kcfg:61
 #. i18n: ectx: label, entry (MissedTimer), group (General)
 #. i18n: file: timerui.ui:41
 #. i18n: ectx: property (toolTip), widget (QSlider, kcfg_MissedTimer)
-#. i18n: file: khangman.kcfg:65
+#. i18n: file: khangman.kcfg:61
 #. i18n: ectx: label, entry (MissedTimer), group (General)
-#: rc.cpp:88 rc.cpp:149 rc.cpp:260 rc.cpp:291 rc.cpp:88 rc.cpp:149 rc.cpp:260
-#: rc.cpp:291
+#: rc.cpp:117 rc.cpp:148 rc.cpp:117 rc.cpp:148
 msgid "Time during which the \"Already Guessed\" tooltip is displayed."
 msgstr ""
 
 #. i18n: file: timerui.ui:44
 #. i18n: ectx: property (whatsThis), widget (QSlider, kcfg_MissedTimer)
-#: rc.cpp:152 rc.cpp:263 rc.cpp:152 rc.cpp:263
+#: rc.cpp:120 rc.cpp:120
 msgid ""
 "You can set the time for displaying the \"Already Guessed\" tooltip after "
 "you tried a letter that was already guessed. Default is 1 second but younger "
@@ -709,37 +436,37 @@
 
 #. i18n: file: khangman.kcfg:10
 #. i18n: ectx: label, entry (CurrentLevel), group (Language)
-#: rc.cpp:63 rc.cpp:266 rc.cpp:63 rc.cpp:266
+#: rc.cpp:123 rc.cpp:123
 msgid "Level"
 msgstr ""
 
 #. i18n: file: khangman.kcfg:17
 #. i18n: ectx: label, entry (ShowCharToolbar), group (Language)
-#: rc.cpp:66 rc.cpp:269 rc.cpp:66 rc.cpp:269
+#: rc.cpp:126 rc.cpp:126
 msgid "Show the characters toolbar"
 msgstr ""
 
 #. i18n: file: khangman.kcfg:21
 #. i18n: ectx: label, entry (SelectedLanguage), group (Language)
-#: rc.cpp:69 rc.cpp:272 rc.cpp:69 rc.cpp:272
+#: rc.cpp:129 rc.cpp:129
 msgid "The language selected by the user"
 msgstr ""
 
 #. i18n: file: khangman.kcfg:37
 #. i18n: ectx: label, entry (Mode), group (Look)
-#: rc.cpp:72 rc.cpp:275 rc.cpp:72 rc.cpp:275
+#: rc.cpp:132 rc.cpp:132
 msgid "Background theme"
 msgstr ""
 
-#. i18n: file: khangman.kcfg:52
+#. i18n: file: khangman.kcfg:48
 #. i18n: ectx: label, entry (EnableAnimations), group (General)
-#: rc.cpp:78 rc.cpp:281 rc.cpp:78 rc.cpp:281
+#: rc.cpp:138 rc.cpp:138
 msgid "Enable Animations"
 msgstr ""
 
-#. i18n: file: khangman.kcfg:61
+#. i18n: file: khangman.kcfg:57
 #. i18n: ectx: label, entry (Hint), group (General)
-#: rc.cpp:84 rc.cpp:287 rc.cpp:84 rc.cpp:287
+#: rc.cpp:144 rc.cpp:144
 msgid ""
 "If checked, hints will always been displayed. If this is not checked "
 "(default) \n"
@@ -747,14 +474,257 @@
 "show the hint."
 msgstr ""
 
-#. i18n: file: khangman.kcfg:72
+#. i18n: file: khangman.kcfg:68
 #. i18n: ectx: label, entry (AccentedLetters), group (Advanced)
-#: rc.cpp:91 rc.cpp:294 rc.cpp:91 rc.cpp:294
+#: rc.cpp:151 rc.cpp:151
 msgid "Type accented letters separately from normal letters"
 msgstr ""
 
-#. i18n: file: khangman.kcfg:79
+#. i18n: file: khangman.kcfg:75
 #. i18n: ectx: label, entry (ProvidersUrl), group (KNewStuff)
-#: rc.cpp:94 rc.cpp:297 rc.cpp:94 rc.cpp:297
+#: rc.cpp:154 rc.cpp:154
 msgid "The Providers path for KHangMan"
 msgstr ""
+
+#: timer.cpp:37 timer.cpp:45
+#, kde-format
+msgid "1 second"
+msgid_plural "%1 seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: main.cpp:34
+msgid "Classical hangman game for KDE"
+msgstr ""
+
+#: main.cpp:40
+msgid "(c) 2001-2011, Anne-Marie Mahfouf"
+msgstr ""
+
+#: main.cpp:42
+msgid "Primoz Anzur"
+msgstr ""
+
+#: main.cpp:42
+msgid "Previous maintainer"
+msgstr "Cynhaliwr Cynt"
+
+#: main.cpp:47
+msgid "Anne-Marie Mahfouf"
+msgstr ""
+
+#: main.cpp:47
+msgid "Current maintainer, author"
+msgstr ""
+
+#: main.cpp:49
+msgid "Stefan Böhmann"
+msgstr ""
+
+#: main.cpp:50 main.cpp:95 main.cpp:97 main.cpp:99
+msgid "Coding help"
+msgstr ""
+
+#: main.cpp:51
+msgid "Stefan Asserhäll"
+msgstr ""
+
+#: main.cpp:52
+msgid "Swedish data files, coding help, transparent pictures and i18n fixes"
+msgstr ""
+
+#: main.cpp:54
+msgid "eXParTaKus"
+msgstr ""
+
+#: main.cpp:55
+msgid "Spanish data files"
+msgstr ""
+
+#: main.cpp:56
+msgid "Erik Kjær Pedersenn"
+msgstr ""
+
+#: main.cpp:57
+msgid "Danish data files"
+msgstr ""
+
+#: main.cpp:58
+msgid "Niko Lewman"
+msgstr ""
+
+#: main.cpp:59
+msgid "Finnish data files"
+msgstr ""
+
+#: main.cpp:60
+msgid "João Sebastião de Oliveira Bueno"
+msgstr ""
+
+#: main.cpp:61
+msgid "Brazilian Portuguese data files"
+msgstr ""
+
+#: main.cpp:62
+msgid "Antoni Bella"
+msgstr ""
+
+#: main.cpp:63
+msgid "Catalan data files"
+msgstr ""
+
+#: main.cpp:64
+msgid "Giovanni Venturi"
+msgstr ""
+
+#: main.cpp:65
+msgid "Italian data files"
+msgstr ""
+
+#: main.cpp:66
+msgid "Rinse"
+msgstr ""
+
+#: main.cpp:67
+msgid "Dutch data files"
+msgstr ""
+
+#: main.cpp:68
+msgid "Lukáš Tinkl"
+msgstr ""
+
+#: main.cpp:69
+msgid "Czech data files"
+msgstr ""
+
+#: main.cpp:70
+msgid "Tamas Szanto"
+msgstr ""
+
+#: main.cpp:71
+msgid "Hungarian data files"
+msgstr ""
+
+#: main.cpp:72
+msgid "Torger Åge Sinnes"
+msgstr ""
+
+#: main.cpp:73
+msgid "Norwegian (Bokmål) data files"
+msgstr ""
+
+#: main.cpp:74
+msgid "Roger Kovacs"
+msgstr ""
+
+#: main.cpp:75
+msgid "Tajik data files"
+msgstr ""
+
+#: main.cpp:76
+msgid "Chusslove Illich"
+msgstr ""
+
+#: main.cpp:77
+msgid "Serbian (Cyrillic and Latin) data files"
+msgstr ""
+
+#: main.cpp:78
+msgid "Jure Repinc"
+msgstr ""
+
+#: main.cpp:79
+msgid "Slovenian data files"
+msgstr ""
+
+#: main.cpp:80
+msgid "Pedro Morais"
+msgstr ""
+
+#: main.cpp:81
+msgid "Portuguese data files"
+msgstr ""
+
+#: main.cpp:82
+msgid "Gaute Hvoslef Kvalnes"
+msgstr ""
+
+#: main.cpp:83
+msgid "Norwegian (Nynorsk) data files"
+msgstr ""
+
+#: main.cpp:84
+msgid "Mehmet Özel"
+msgstr ""
+
+#: main.cpp:85
+msgid "Turkish data files"
+msgstr ""
+
+#: main.cpp:86
+msgid "Черепанов Андрей"
+msgstr ""
+
+#: main.cpp:87
+msgid "Russian data files"
+msgstr ""
+
+#: main.cpp:88
+msgid "Radostin Radnev"
+msgstr ""
+
+#: main.cpp:89
+msgid "Bulgarian data files"
+msgstr ""
+
+#: main.cpp:90
+msgid "Kevin Patrick Scannell"
+msgstr ""
+
+#: main.cpp:91
+msgid "Irish (Gaelic) data files"
+msgstr ""
+
+#: main.cpp:92
+msgid "Matt Howe"
+msgstr ""
+
+#: main.cpp:93
+msgid "Softer Hangman Pictures"
+msgstr ""
+
+#: main.cpp:94
+msgid "Benjamin Meyer"
+msgstr ""
+
+#: main.cpp:96
+msgid "Robert Gogolok"
+msgstr ""
+
+#: main.cpp:98
+msgid "Lubos Lunàk"
+msgstr ""
+
+#: main.cpp:100
+msgid "Albert Astals Cid"
+msgstr ""
+
+#: main.cpp:101
+msgid "Coding help, fixed a lot of things"
+msgstr ""
+
+#: main.cpp:102
+msgid "Peter Hedlund"
+msgstr ""
+
+#: main.cpp:103
+msgid "Code for generating icons for the characters toolbar"
+msgstr ""
+
+#: main.cpp:104
+msgid "Inge Wallin"
+msgstr ""
+
+#: main.cpp:105
+msgid "Code cleaning"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khelpcenter.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khelpcenter.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khelpcenter.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khelpcenter.po	2012-04-18 08:59:35.000000000 +0000
@@ -11,154 +11,154 @@
 msgstr ""
 "Project-Id-Version: khelpcenter\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:12+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: application.cpp:57 navigator.cpp:447
+#: application.cpp:59 navigator.cpp:439
 msgid "KDE Help Center"
 msgstr "Canolfan Gymorth KDE"
 
-#: application.cpp:59 khc_indexbuilder.cpp:156
+#: application.cpp:61 khc_indexbuilder.cpp:156
 msgid "The KDE Help Center"
 msgstr "Canolfan Gymorth KDE"
 
-#: application.cpp:61
-msgid "(c) 1999-2003, The KHelpCenter developers"
-msgstr "(h) 1999-2003, Datblygwyr KHelpCenter"
+#: application.cpp:63
+msgid "(c) 1999-2011, The KHelpCenter developers"
+msgstr ""
 
-#: application.cpp:63 khc_indexbuilder.cpp:160
+#: application.cpp:65 khc_indexbuilder.cpp:160
 msgid "Cornelius Schumacher"
 msgstr ""
 
-#: application.cpp:64
+#: application.cpp:66
 msgid "Frerich Raabe"
 msgstr ""
 
-#: application.cpp:65
+#: application.cpp:67
 msgid "Matthias Elter"
 msgstr ""
 
-#: application.cpp:65
+#: application.cpp:67
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: application.cpp:67
+#: application.cpp:69
 msgid "Wojciech Smigaj"
 msgstr ""
 
-#: application.cpp:67
+#: application.cpp:69
 msgid "Info page support"
 msgstr "Cynhaliaeth tudalennau gwybodaeth"
 
-#: application.cpp:74
+#: application.cpp:76
 msgid "URL to display"
 msgstr ""
 
-#: docmetainfo.cpp:34
+#: docmetainfo.cpp:52
 msgid "Top-Level Documentation"
 msgstr ""
 
-#: docmetainfo.cpp:74
+#: docmetainfo.cpp:97
 #, kde-format
 msgctxt "doctitle (language)"
 msgid "%1 (%2)"
 msgstr "%1(%2)"
 
-#: docmetainfo.cpp:110
+#: docmetainfo.cpp:136
 msgctxt "Describes documentation entries that are in English"
 msgid "English"
 msgstr ""
 
-#: fontdialog.cpp:44
+#: fontdialog.cpp:47
 msgid "Font Configuration"
 msgstr "Ffurfweddu Wynebfathau"
 
-#: fontdialog.cpp:67
+#: fontdialog.cpp:70
 msgid "Sizes"
 msgstr "Meintiau"
 
-#: fontdialog.cpp:73
+#: fontdialog.cpp:76
 msgctxt "The smallest size a will have"
 msgid "M&inimum font size:"
 msgstr ""
 
-#: fontdialog.cpp:80
+#: fontdialog.cpp:83
 msgctxt "The normal size a font will have"
 msgid "M&edium font size:"
 msgstr ""
 
-#: fontdialog.cpp:90
+#: fontdialog.cpp:93
 msgid "Fonts"
 msgstr ""
 
-#: fontdialog.cpp:96
+#: fontdialog.cpp:99
 msgid "S&tandard font:"
 msgstr "Wynebfath &safonol:"
 
-#: fontdialog.cpp:102
+#: fontdialog.cpp:105
 msgid "F&ixed font:"
 msgstr "Wynebfath &sefydlog"
 
-#: fontdialog.cpp:108
+#: fontdialog.cpp:111
 msgid "S&erif font:"
 msgstr "Wynebfath s&eriff:"
 
-#: fontdialog.cpp:114
+#: fontdialog.cpp:117
 msgid "S&ans serif font:"
 msgstr "Wynebfath s&ans seriff:"
 
-#: fontdialog.cpp:120
+#: fontdialog.cpp:123
 msgid "&Italic font:"
 msgstr "Wynebfath &italig:"
 
-#: fontdialog.cpp:126
+#: fontdialog.cpp:129
 msgid "&Fantasy font:"
 msgstr "Wynebfath &ffantasi:"
 
-#: fontdialog.cpp:135
+#: fontdialog.cpp:138
 msgid "Encoding"
 msgstr "Amgodiad"
 
-#: fontdialog.cpp:141
+#: fontdialog.cpp:144
 msgid "&Default encoding:"
 msgstr "Amgodiad &rhagosodedig:"
 
-#: fontdialog.cpp:146 fontdialog.cpp:216
+#: fontdialog.cpp:149 fontdialog.cpp:219
 msgid "Use Language Encoding"
 msgstr "Defnyddio Amgodiad Iaith"
 
-#: fontdialog.cpp:150
+#: fontdialog.cpp:153
 msgid "&Font size adjustment:"
 msgstr "Addasu maint &wynebfath:"
 
-#: glossary.cpp:95
+#: glossary.cpp:88
 msgid "By Topic"
 msgstr "Gan Bwnc"
 
-#: glossary.cpp:98 infotree.cpp:94
+#: glossary.cpp:92 infotree.cpp:95
 msgid "Alphabetically"
 msgstr "Yn ôl yr wyddor"
 
-#: glossary.cpp:154
+#: glossary.cpp:147
 msgid "Rebuilding glossary cache..."
 msgstr ""
 
-#: glossary.cpp:207
+#: glossary.cpp:204
 msgid "Rebuilding cache... done."
 msgstr ""
 
-#: glossary.cpp:301
+#: glossary.cpp:307
 msgid "Error"
 msgstr ""
 
-#: glossary.cpp:302
+#: glossary.cpp:308
 msgid ""
 "Unable to show selected glossary entry: unable to open file "
 "'glossary.html.in'!"
@@ -166,112 +166,112 @@
 "Nid oes modd dangos y cofnod geirfa dewisiedig: methwyd agor y ffeil "
 "'glossary.html.in'!"
 
-#: glossary.cpp:307
+#: glossary.cpp:314
 msgid "See also: "
 msgstr "Gweler hefyd: "
 
-#: glossary.cpp:322
+#: glossary.cpp:330
 msgid "KDE Glossary"
 msgstr "Geirfa KDE"
 
-#: htmlsearchconfig.cpp:50
+#: htmlsearchconfig.cpp:51
 msgid "ht://dig"
 msgstr "ht://dig"
 
-#: htmlsearchconfig.cpp:59
+#: htmlsearchconfig.cpp:60
 msgid ""
 "The fulltext search feature makes use of the ht://dig HTML search engine."
 msgstr ""
 
-#: htmlsearchconfig.cpp:63
+#: htmlsearchconfig.cpp:64
 msgid "Information about where to get the ht://dig package."
 msgstr "Gwybodaeth am ble i gael y pecyn ht://dig."
 
-#: htmlsearchconfig.cpp:67
+#: htmlsearchconfig.cpp:68
 msgid "You can get ht://dig at the ht://dig home page"
 msgstr ""
 
-#: htmlsearchconfig.cpp:73
+#: htmlsearchconfig.cpp:74
 msgid "Program Locations"
 msgstr "Lleoliadau Rhaglenni"
 
-#: htmlsearchconfig.cpp:82
+#: htmlsearchconfig.cpp:83
 msgid "htsearch:"
 msgstr "htsearch:"
 
-#: htmlsearchconfig.cpp:88
+#: htmlsearchconfig.cpp:89
 msgid "Enter the URL of the htsearch CGI program."
 msgstr "Rhowch URL y rhaglen CGI htsearch."
 
-#: htmlsearchconfig.cpp:93
+#: htmlsearchconfig.cpp:94
 msgid "Indexer:"
 msgstr "Mynegeiydd:"
 
-#: htmlsearchconfig.cpp:99
+#: htmlsearchconfig.cpp:100
 msgid "Enter the path to your htdig indexer program here."
 msgstr "Rhowch y llwybr i'ch rhaglen mynegeio htdig yma."
 
-#: htmlsearchconfig.cpp:105
+#: htmlsearchconfig.cpp:106
 msgid "htdig database:"
 msgstr "cronfa ddata htdig:"
 
-#: htmlsearchconfig.cpp:111
+#: htmlsearchconfig.cpp:112
 msgid "Enter the path to the htdig database folder."
 msgstr "Rhowch y llwybr i'r blygell cronfa ddata htdig yma."
 
-#: infotree.cpp:97
+#: infotree.cpp:98
 msgid "By Category"
 msgstr "Gan Gategori"
 
-#: kcmhelpcenter.cpp:64
+#: kcmhelpcenter.cpp:63
 msgid "Change Index Folder"
 msgstr ""
 
-#: kcmhelpcenter.cpp:72 kcmhelpcenter.cpp:294
+#: kcmhelpcenter.cpp:71 kcmhelpcenter.cpp:292
 msgid "Index folder:"
 msgstr "Plygell Fynegai:"
 
-#: kcmhelpcenter.cpp:104
+#: kcmhelpcenter.cpp:103
 msgid "Build Search Indices"
 msgstr "Adeiladu Mynegeion Chwilio"
 
-#: kcmhelpcenter.cpp:117
+#: kcmhelpcenter.cpp:116
 msgid "Index creation log:"
 msgstr "Cofnod creu mynegai:"
 
-#: kcmhelpcenter.cpp:173
+#: kcmhelpcenter.cpp:172
 msgctxt ""
 "Label for button to close search index progress dialog after successful "
 "completion"
 msgid "Close"
 msgstr ""
 
-#: kcmhelpcenter.cpp:174
+#: kcmhelpcenter.cpp:173
 msgid "Index creation finished."
 msgstr "Gorffenwyd creu'r mynegai(eion)."
 
-#: kcmhelpcenter.cpp:177
+#: kcmhelpcenter.cpp:176
 msgctxt "Label for stopping search index generation before completion"
 msgid "Stop"
 msgstr ""
 
-#: kcmhelpcenter.cpp:203
+#: kcmhelpcenter.cpp:202
 msgid "Details &lt;&lt;"
 msgstr ""
 
-#: kcmhelpcenter.cpp:216
+#: kcmhelpcenter.cpp:215
 msgid "Details &gt;&gt;"
 msgstr ""
 
-#: kcmhelpcenter.cpp:233
+#: kcmhelpcenter.cpp:232
 msgid "Build Search Index"
 msgstr "Adeiladu Mynegai Chwilio"
 
-#: kcmhelpcenter.cpp:242
+#: kcmhelpcenter.cpp:240
 msgid "Build Index"
 msgstr ""
 
-#: kcmhelpcenter.cpp:273
+#: kcmhelpcenter.cpp:271
 msgid ""
 "To be able to search a document, a search\n"
 "index needs to exist. The status column of the list below shows whether an "
@@ -279,40 +279,40 @@
 "for a document exists.\n"
 msgstr ""
 
-#: kcmhelpcenter.cpp:276
+#: kcmhelpcenter.cpp:274
 msgid ""
 "To create an index, check the box in the list and press the\n"
 "\"Build Index\" button.\n"
 msgstr ""
 
-#: kcmhelpcenter.cpp:285
+#: kcmhelpcenter.cpp:283
 msgid "Search Scope"
 msgstr "Amrediad Chwiliad"
 
-#: kcmhelpcenter.cpp:285
+#: kcmhelpcenter.cpp:283
 msgid "Status"
 msgstr "Cyflwr"
 
-#: kcmhelpcenter.cpp:300
+#: kcmhelpcenter.cpp:298
 msgid "Change..."
 msgstr "Newid..."
 
-#: kcmhelpcenter.cpp:322
+#: kcmhelpcenter.cpp:320
 #, kde-format
 msgid "<qt>The folder <b>%1</b> does not exist; unable to create index.</qt>"
 msgstr ""
 
-#: kcmhelpcenter.cpp:361
+#: kcmhelpcenter.cpp:359
 msgctxt "Describes the status of a documentation index that is present"
 msgid "OK"
 msgstr ""
 
-#: kcmhelpcenter.cpp:364
+#: kcmhelpcenter.cpp:362
 msgctxt "Describes the status of a documentation index that is missing"
 msgid "Missing"
 msgstr ""
 
-#: kcmhelpcenter.cpp:408
+#: kcmhelpcenter.cpp:406
 #, kde-format
 msgctxt ""
 " Generic prefix label for error messages when creating documentation index, "
@@ -320,25 +320,25 @@
 msgid "Document '%1' (%2):\n"
 msgstr ""
 
-#: kcmhelpcenter.cpp:413
+#: kcmhelpcenter.cpp:411
 msgid "No document type."
 msgstr ""
 
-#: kcmhelpcenter.cpp:420
+#: kcmhelpcenter.cpp:418
 #, kde-format
 msgid "No search handler available for document type '%1'."
 msgstr ""
 
-#: kcmhelpcenter.cpp:430
+#: kcmhelpcenter.cpp:428
 #, kde-format
 msgid "No indexing command specified for document type '%1'."
 msgstr ""
 
-#: kcmhelpcenter.cpp:548
+#: kcmhelpcenter.cpp:546
 msgid "Failed to build index."
 msgstr "Methu adeiladu mynegai."
 
-#: kcmhelpcenter.cpp:603
+#: kcmhelpcenter.cpp:601
 #, kde-format
 msgid ""
 "Error executing indexing build command:\n"
@@ -370,101 +370,101 @@
 msgid "Search Error Log"
 msgstr "Cofnod Gwallau Chwilio"
 
-#: mainwindow.cpp:130
+#: mainwindow.cpp:131
 msgid "Preparing Index"
 msgstr "Yn Paratoi'r Mynegai"
 
-#: mainwindow.cpp:179
+#: mainwindow.cpp:180
 msgid "Ready"
 msgstr "Yn barod"
 
-#: mainwindow.cpp:234
+#: mainwindow.cpp:235
 msgid "Previous Page"
 msgstr "Tudalen Flaenorol"
 
-#: mainwindow.cpp:236
+#: mainwindow.cpp:237
 msgid "Moves to the previous page of the document"
 msgstr ""
 
-#: mainwindow.cpp:240
+#: mainwindow.cpp:241
 msgid "Next Page"
 msgstr "Tudalen Nesaf"
 
-#: mainwindow.cpp:242
+#: mainwindow.cpp:243
 msgid "Moves to the next page of the document"
 msgstr ""
 
-#: mainwindow.cpp:247
+#: mainwindow.cpp:248
 msgid "Table of &Contents"
 msgstr "Tabl &Cynnwys"
 
-#: mainwindow.cpp:248
+#: mainwindow.cpp:249
 msgid "Table of contents"
 msgstr "Tabl cynnwys"
 
-#: mainwindow.cpp:249
+#: mainwindow.cpp:250
 msgid "Go back to the table of contents"
 msgstr ""
 
-#: mainwindow.cpp:255
+#: mainwindow.cpp:256
 msgid "&Last Search Result"
 msgstr "&Canlyniad Chwiliad Diwethaf:"
 
-#: mainwindow.cpp:275
+#: mainwindow.cpp:274
 msgid "Configure Fonts..."
 msgstr "Ffurfweddu Wynebfathau..."
 
-#: mainwindow.cpp:279
+#: mainwindow.cpp:278
 msgid "Increase Font Sizes"
 msgstr "Cynyddu Meintiau Wynebfath"
 
-#: mainwindow.cpp:284
+#: mainwindow.cpp:283
 msgid "Decrease Font Sizes"
 msgstr "Lleihau Meintiau Wynebfath"
 
-#: navigator.cpp:116
+#: navigator.cpp:114
 msgid "&Search"
 msgstr "&Chwilio"
 
-#: navigator.cpp:173
+#: navigator.cpp:170
 msgid "&Contents"
 msgstr ""
 
-#: navigator.cpp:186
+#: navigator.cpp:184
 msgid "Search Options"
 msgstr "Dewisiadau Chwilio"
 
-#: navigator.cpp:194
+#: navigator.cpp:193
 msgid "G&lossary"
 msgstr "&Geirfa"
 
-#: navigator.cpp:446
+#: navigator.cpp:438
 msgid "Start Page"
 msgstr "Tudalen Gychwyn"
 
-#: navigator.cpp:534
+#: navigator.cpp:528
 msgid "Unable to run search program."
 msgstr "Methu rhedeg rhaglen chwilio."
 
-#: navigator.cpp:574
+#: navigator.cpp:570
 msgid ""
 "A search index does not yet exist. Do you want to create the index now?"
 msgstr "Nid oes mynegai chwilio eto. A ydych am greu'r mynagai nawr?"
 
-#: navigator.cpp:578
+#: navigator.cpp:574
 msgid "Create"
 msgstr "Creu"
 
-#: navigator.cpp:579
+#: navigator.cpp:575
 msgid "Do Not Create"
 msgstr ""
 
-#: rc.cpp:25
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:26
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ""
@@ -473,100 +473,94 @@
 
 #. i18n: file: khelpcenter.kcfg:11
 #. i18n: ectx: label, entry, group (Search)
-#: rc.cpp:3 rc.cpp:29
+#: rc.cpp:5
 msgid "Path to index directory."
 msgstr ""
 
 #. i18n: file: khelpcenter.kcfg:12
 #. i18n: ectx: whatsthis, entry, group (Search)
-#: rc.cpp:6 rc.cpp:32
+#: rc.cpp:8
 msgid "Path to directory containing search indices."
 msgstr ""
 
 #. i18n: file: khelpcenter.kcfg:26
 #. i18n: ectx: label, entry, group (Layout)
-#: rc.cpp:9 rc.cpp:35
+#: rc.cpp:11
 msgid "Currently visible navigator tab"
 msgstr ""
 
 #. i18n: file: khelpcenterui.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:12
-msgid "&File"
-msgstr ""
-
-#. i18n: file: khelpcenterui.rc:12
 #. i18n: ectx: Menu (edit)
 #: rc.cpp:15
 msgid "&Edit"
 msgstr ""
 
-#. i18n: file: khelpcenterui.rc:20
+#. i18n: file: khelpcenterui.rc:13
 #. i18n: ectx: Menu (view)
 #: rc.cpp:18
 msgid "&View"
 msgstr ""
 
-#. i18n: file: khelpcenterui.rc:25
+#. i18n: file: khelpcenterui.rc:18
 #. i18n: ectx: Menu (go)
 #: rc.cpp:21
 msgid "&Go"
 msgstr "&Ewch"
 
-#. i18n: file: khelpcenterui.rc:40
+#. i18n: file: khelpcenterui.rc:34
 #. i18n: ectx: ToolBar (mainToolBar)
 #: rc.cpp:24
 msgid "Main Toolbar"
 msgstr ""
 
-#: searchengine.cpp:77
+#: searchengine.cpp:78
 msgid "Error: No document type specified."
 msgstr ""
 
-#: searchengine.cpp:79
+#: searchengine.cpp:80
 #, kde-format
 msgid "Error: No search handler for document type '%1'."
 msgstr ""
 
-#: searchengine.cpp:227
+#: searchengine.cpp:228
 #, kde-format
 msgid "Unable to initialize SearchHandler from file '%1'."
 msgstr ""
 
-#: searchengine.cpp:241
+#: searchengine.cpp:242
 msgid "No valid search handler found."
 msgstr ""
 
-#: searchengine.cpp:284
+#: searchengine.cpp:285
 #, kde-format
 msgid "Search Results for '%1':"
 msgstr ""
 
-#: searchengine.cpp:289
+#: searchengine.cpp:290
 msgid "Search Results"
 msgstr "Canlyniadau Chwilio"
 
-#: searchhandler.cpp:54
+#: searchhandler.cpp:55
 #, kde-format
 msgid "Error executing search command '%1'."
 msgstr ""
 
-#: searchhandler.cpp:97
+#: searchhandler.cpp:98
 #, kde-format
 msgid "Error: %1"
 msgstr "Gwall: %1"
 
-#: searchhandler.cpp:166 searchhandler.cpp:171
+#: searchhandler.cpp:167 searchhandler.cpp:172
 #, kde-format
 msgid "'%1' not found, check your installation"
 msgstr ""
 
-#: searchhandler.cpp:176
+#: searchhandler.cpp:177
 #, kde-format
 msgid "'%1' not found, install the package containing it"
 msgstr ""
 
-#: searchhandler.cpp:227
+#: searchhandler.cpp:228
 msgid "No search command or URL specified."
 msgstr ""
 
@@ -590,39 +584,39 @@
 msgid "&Scope selection:"
 msgstr "Dewis &amrediad:"
 
-#: searchwidget.cpp:110
+#: searchwidget.cpp:109
 msgid "Scope"
 msgstr "Amrediad"
 
-#: searchwidget.cpp:113
+#: searchwidget.cpp:112
 msgid "Build Search &Index..."
 msgstr "Adeiladu Myne&gai Chwilio ..."
 
-#: searchwidget.cpp:368
+#: searchwidget.cpp:367
 msgctxt "Label for searching documentation using custom (user defined) scope"
 msgid "Custom"
 msgstr ""
 
-#: searchwidget.cpp:370
+#: searchwidget.cpp:369
 msgctxt "Label for searching documentation using default search scope"
 msgid "Default"
 msgstr ""
 
-#: searchwidget.cpp:372
+#: searchwidget.cpp:371
 msgctxt "Label for searching documentation in all subsections"
 msgid "All"
 msgstr ""
 
-#: searchwidget.cpp:374
+#: searchwidget.cpp:373
 msgctxt "Label for scope that deselects all search subsections"
 msgid "None"
 msgstr ""
 
-#: searchwidget.cpp:376
+#: searchwidget.cpp:375
 msgctxt "Label for Unknown search scope, that should never appear"
 msgid "unknown"
 msgstr ""
 
-#: view.cpp:210
+#: view.cpp:212
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad Cyswllt"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khotkeys.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khotkeys.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khotkeys.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khotkeys.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: khotkeys\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:04+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:39+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1 rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -27,21 +27,75 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
+#. i18n: file: kcm_hotkeys/global_settings_widget.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, global_group)
+#: rc.cpp:5 rc.cpp:5
+msgid "Input Actions Daemon"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/global_settings_widget.ui:38
+#. i18n: ectx: property (text), widget (QCheckBox, enabled)
+#: rc.cpp:8 rc.cpp:8
+msgid "Start the Input Actions daemon on login"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/global_settings_widget.ui:48
+#. i18n: ectx: property (title), widget (QGroupBox, gestures_group)
+#: rc.cpp:11 rc.cpp:11
+msgid "Gestures"
+msgstr "Ystumiau"
+
+#. i18n: file: kcm_hotkeys/global_settings_widget.ui:57
+#. i18n: ectx: property (text), widget (QLabel, gestures_timeout_label)
+#: rc.cpp:14 rc.cpp:14
+msgid "Timeout:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/global_settings_widget.ui:70
+#. i18n: ectx: property (suffix), widget (KIntSpinBox, gestures_timeout)
+#: rc.cpp:17 rc.cpp:17
+msgid "ms"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/global_settings_widget.ui:99
+#. i18n: ectx: property (text), widget (QLabel, gestures_button_label)
+#: rc.cpp:20 rc.cpp:20
+msgid "Mouse button:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/kcm_hotkeys.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, menu_button)
+#. i18n: file: kcm_hotkeys/helper_widgets/gesture_widget.ui:19
+#. i18n: ectx: property (text), widget (QPushButton, edit_button)
+#. i18n: file: kcm_hotkeys/kcm_hotkeys.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, menu_button)
+#. i18n: file: kcm_hotkeys/helper_widgets/gesture_widget.ui:19
+#. i18n: ectx: property (text), widget (QPushButton, edit_button)
+#: rc.cpp:23 rc.cpp:96 rc.cpp:23 rc.cpp:96
+msgid "Edit"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/kcm_hotkeys.ui:36
+#. i18n: ectx: property (text), widget (QPushButton, settings_button)
+#: rc.cpp:26 rc.cpp:26
+msgid "Settings"
+msgstr ""
+
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:17
 #. i18n: ectx: property (toolTip), widget (QLabel, stateLabel)
-#: rc.cpp:218 rc.cpp:218
+#: rc.cpp:29 rc.cpp:29
 msgid "Change the exported state for the actions."
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:20
 #. i18n: ectx: property (text), widget (QLabel, stateLabel)
-#: rc.cpp:221 rc.cpp:221
+#: rc.cpp:32 rc.cpp:32
 msgid "Export Actions"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:40
 #. i18n: ectx: property (whatsThis), widget (QComboBox, state)
-#: rc.cpp:224 rc.cpp:224
+#: rc.cpp:35 rc.cpp:35
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -72,34 +126,34 @@
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:44
 #. i18n: ectx: property (text), item, widget (QComboBox, state)
-#: rc.cpp:237 rc.cpp:237
+#: rc.cpp:48 rc.cpp:48
 msgctxt "Don't change the state of exported hotkey actions."
 msgid "Actual State"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:49
 #. i18n: ectx: property (text), item, widget (QComboBox, state)
-#: rc.cpp:240 rc.cpp:240
+#: rc.cpp:51 rc.cpp:51
 msgctxt "Export hotkey actions in enabled state."
 msgid "Enabled"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:54
 #. i18n: ectx: property (text), item, widget (QComboBox, state)
-#: rc.cpp:243 rc.cpp:243
+#: rc.cpp:54 rc.cpp:54
 msgctxt "Export hotkey actions into disabled  state"
 msgid "Disabled"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:62
 #. i18n: ectx: property (statusTip), widget (QLabel, idLabel)
-#: rc.cpp:246 rc.cpp:246
+#: rc.cpp:57 rc.cpp:57
 msgid "KHotkeys file id."
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:65
 #. i18n: ectx: property (whatsThis), widget (QLabel, idLabel)
-#: rc.cpp:249 rc.cpp:249
+#: rc.cpp:60 rc.cpp:60
 msgid ""
 "A khotkeys file id is used to ensure files are not imported more than once. "
 "They are mostly used for automatic updates from the KDE developers."
@@ -107,286 +161,97 @@
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:68
 #. i18n: ectx: property (text), widget (QLabel, idLabel)
-#: rc.cpp:252 rc.cpp:252
+#: rc.cpp:63 rc.cpp:63
 msgid "Id"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:78
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, id)
-#: rc.cpp:255 rc.cpp:255
+#: rc.cpp:66 rc.cpp:66
 msgid "Set import id for file, or leave empty"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:85
 #. i18n: ectx: property (text), widget (QLabel, filenameLabel)
-#: rc.cpp:258 rc.cpp:258
+#: rc.cpp:69 rc.cpp:69
 msgid "Filename"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:124
 #. i18n: ectx: property (text), widget (QLabel, allowMergingLabel)
-#: rc.cpp:262 rc.cpp:262
+#: rc.cpp:72 rc.cpp:72
 msgid "Allow Merging"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:134
 #. i18n: ectx: property (toolTip), widget (QCheckBox, allowMerging)
-#: rc.cpp:265 rc.cpp:265
+#: rc.cpp:75 rc.cpp:75
 msgid "Merge into existing directories on import?"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/hotkeys_export_widget.ui:137
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, allowMerging)
-#: rc.cpp:268 rc.cpp:268
+#: rc.cpp:78 rc.cpp:78
 msgid ""
 "Allow merging of content if a directory with the same name exists on "
 "importing. If merging is not allowed, there will be two directories with the "
 "same name."
 msgstr ""
 
+#. i18n: file: kcm_hotkeys/hotkeys_widget_base.ui:23
+#. i18n: ectx: attribute (title), widget (QWidget, comment_tab)
+#: rc.cpp:81 kcm_hotkeys/hotkeys_model.cpp:92
+#: kcm_hotkeys/hotkeys_context_menu.cpp:312
+#: kcm_hotkeys/hotkeys_context_menu.cpp:341
+#: kcm_hotkeys/hotkeys_context_menu.cpp:370 rc.cpp:81
+msgid "Comment"
+msgstr ""
+
 #. i18n: file: kcm_hotkeys/conditions/conditions_widget.ui:20
 #. i18n: ectx: property (text), widget (QTreeWidget, tree)
-#: rc.cpp:185 rc.cpp:185
+#: rc.cpp:84 rc.cpp:84
 msgid "1"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/conditions/conditions_widget.ui:30
 #. i18n: ectx: property (text), widget (QPushButton, new_button)
-#: rc.cpp:188 kcm_hotkeys/hotkeys_context_menu.cpp:156 rc.cpp:188
+#: rc.cpp:87 kcm_hotkeys/hotkeys_context_menu.cpp:156 rc.cpp:87
 msgid "New"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/conditions/conditions_widget.ui:37
 #. i18n: ectx: property (text), widget (QPushButton, edit_button)
-#: rc.cpp:191 rc.cpp:191
+#: rc.cpp:90 rc.cpp:90
 msgid "Edit..."
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/conditions/conditions_widget.ui:44
 #. i18n: ectx: property (text), widget (QPushButton, delete_button)
-#: rc.cpp:194 kcm_hotkeys/hotkeys_context_menu.cpp:137 rc.cpp:194
+#: rc.cpp:93 kcm_hotkeys/hotkeys_context_menu.cpp:137 rc.cpp:93
 msgid "Delete"
 msgstr ""
 
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, when_group)
-#: rc.cpp:200 rc.cpp:200
-msgid "Trigger When"
-msgstr "Pryd i Danio:"
-
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:22
-#. i18n: ectx: property (text), widget (QRadioButton, window_appears)
-#: rc.cpp:203 rc.cpp:203
-msgid "Window appears"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:29
-#. i18n: ectx: property (text), widget (QRadioButton, window_disappears)
-#: rc.cpp:206 rc.cpp:206
-msgid "Window disappears"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:36
-#. i18n: ectx: property (text), widget (QRadioButton, window_gets_focus)
-#: rc.cpp:209 rc.cpp:209
-msgid "Window gets focus"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:43
-#. i18n: ectx: property (text), widget (QRadioButton, window_lost_focus)
-#: rc.cpp:212 rc.cpp:212
-msgid "Window loses focus"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:53
-#. i18n: ectx: property (title), widget (QGroupBox, window_group)
-#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:53
-#. i18n: ectx: property (title), widget (QGroupBox, window_group)
-#: rc.cpp:29 rc.cpp:215 rc.cpp:29 rc.cpp:215
-msgid "Window"
-msgstr "Ffenestr"
-
-#. i18n: file: kcm_hotkeys/triggers/shortcut_trigger_widget.ui:17
-#. i18n: ectx: property (text), widget (QLabel, shortcut_label)
-#: rc.cpp:197 rc.cpp:197
-msgid "&Shortcut:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/kcm_hotkeys.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, menu_button)
-#. i18n: file: kcm_hotkeys/helper_widgets/gesture_widget.ui:19
-#. i18n: ectx: property (text), widget (QPushButton, edit_button)
-#. i18n: file: kcm_hotkeys/kcm_hotkeys.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, menu_button)
-#. i18n: file: kcm_hotkeys/helper_widgets/gesture_widget.ui:19
-#. i18n: ectx: property (text), widget (QPushButton, edit_button)
-#: rc.cpp:23 rc.cpp:83 rc.cpp:23 rc.cpp:83
-msgid "Edit"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/kcm_hotkeys.ui:36
-#. i18n: ectx: property (text), widget (QPushButton, settings_button)
-#: rc.cpp:26 rc.cpp:26
-msgid "Settings"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/global_settings_widget.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, global_group)
-#: rc.cpp:5 rc.cpp:5
-msgid "Input Actions Daemon"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/global_settings_widget.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, enabled)
-#: rc.cpp:8 rc.cpp:8
-msgid "Start the Input Actions daemon on login"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/global_settings_widget.ui:48
-#. i18n: ectx: property (title), widget (QGroupBox, gestures_group)
-#: rc.cpp:11 rc.cpp:11
-msgid "Gestures"
-msgstr "Ystumiau"
-
-#. i18n: file: kcm_hotkeys/global_settings_widget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, gestures_timeout_label)
-#: rc.cpp:14 rc.cpp:14
-msgid "Timeout:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/global_settings_widget.ui:70
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, gestures_timeout)
-#: rc.cpp:17 rc.cpp:17
-msgid "ms"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/global_settings_widget.ui:99
-#. i18n: ectx: property (text), widget (QLabel, gestures_button_label)
-#: rc.cpp:20 rc.cpp:20
-msgid "Mouse button:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:27
-#. i18n: ectx: property (text), widget (QRadioButton, active_radio)
-#: rc.cpp:32 rc.cpp:32
-msgid "Active window"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:34
-#. i18n: ectx: property (text), widget (QRadioButton, specific_radio)
-#: rc.cpp:35 rc.cpp:35
-msgid "Specific window"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:41
-#. i18n: ectx: property (text), widget (QRadioButton, action_radio)
-#: rc.cpp:38 rc.cpp:38
-msgid "Action window"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/command_url_action_widget.ui:16
-#. i18n: ectx: property (text), widget (QLabel, commandLabel)
-#: rc.cpp:41 rc.cpp:41
-msgid "Command/URL:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/menuentry_action_widget.ui:16
-#. i18n: ectx: property (text), widget (QLabel, applicationLabel)
-#: rc.cpp:62 rc.cpp:62
-msgid "Application:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/menuentry_action_widget.ui:30
-#. i18n: ectx: property (text), widget (KPushButton, applicationButton)
-#: rc.cpp:65 rc.cpp:65
-msgid "Select Application ..."
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:18
-#. i18n: ectx: property (text), widget (QLabel, applicationLabel)
-#: rc.cpp:44 rc.cpp:44
-msgid "Remote application:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:31
-#. i18n: ectx: property (text), widget (QLabel, objectLabel)
-#: rc.cpp:47 rc.cpp:47
-msgid "Remote object:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:44
-#. i18n: ectx: property (text), widget (QLabel, functionLabel)
-#: rc.cpp:50 rc.cpp:50
-msgid "Function:"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, argumentsLabel)
-#: rc.cpp:53 rc.cpp:53
-msgid "Arguments:"
-msgstr "Ymresymiadau:"
-
-#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:84
-#. i18n: ectx: property (text), widget (QPushButton, execButton)
-#: rc.cpp:56 rc.cpp:56
-msgid "Call"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:91
-#. i18n: ectx: property (text), widget (QPushButton, launchButton)
-#: rc.cpp:59 rc.cpp:59
-msgid "Launch  D-Bus Browser"
+#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:99 rc.cpp:99
+msgid "Window Data"
 msgstr ""
 
-#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:19
-#. i18n: ectx: property (text), widget (QLabel, comment_label)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:24
 #. i18n: ectx: property (text), widget (QLabel, comment_label)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:19
 #. i18n: ectx: property (text), widget (QLabel, comment_label)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:24
 #. i18n: ectx: property (text), widget (QLabel, comment_label)
-#: rc.cpp:68 rc.cpp:89 rc.cpp:68 rc.cpp:89
+#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:19
+#. i18n: ectx: property (text), widget (QLabel, comment_label)
+#: rc.cpp:102 rc.cpp:195 rc.cpp:102 rc.cpp:195
 msgid "Comment:"
 msgstr ""
 
-#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:38
-#. i18n: ectx: property (text), widget (QPushButton, edit_button)
-#: rc.cpp:71 rc.cpp:71
-msgid "&Edit..."
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:45
-#. i18n: ectx: property (text), widget (QPushButton, new_button)
-#: rc.cpp:74 rc.cpp:74
-msgid "&New..."
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, duplicate_button)
-#: rc.cpp:77 rc.cpp:77
-msgid "&Duplicate..."
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:59
-#. i18n: ectx: property (text), widget (QPushButton, delete_button)
-#: rc.cpp:80 rc.cpp:80
-msgid "&Delete"
-msgstr ""
-
-#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:86 rc.cpp:86
-msgid "Window Data"
-msgstr ""
-
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:31
 #. i18n: ectx: property (text), widget (QLabel, window_title_label)
-#: rc.cpp:92 rc.cpp:92
+#: rc.cpp:105 rc.cpp:105
 msgid "Window title:"
 msgstr ""
 
@@ -402,7 +267,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:131
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:95 rc.cpp:119 rc.cpp:143 rc.cpp:95 rc.cpp:119 rc.cpp:143
+#: rc.cpp:108 rc.cpp:132 rc.cpp:156 rc.cpp:108 rc.cpp:132 rc.cpp:156
 msgid "Is Not Important"
 msgstr "Dim o Bwys"
 
@@ -418,7 +283,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:136
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:98 rc.cpp:122 rc.cpp:146 rc.cpp:98 rc.cpp:122 rc.cpp:146
+#: rc.cpp:111 rc.cpp:135 rc.cpp:159 rc.cpp:111 rc.cpp:135 rc.cpp:159
 msgid "Contains"
 msgstr "Cynhwysa"
 
@@ -434,7 +299,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:141
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:101 rc.cpp:125 rc.cpp:149 rc.cpp:101 rc.cpp:125 rc.cpp:149
+#: rc.cpp:114 rc.cpp:138 rc.cpp:162 rc.cpp:114 rc.cpp:138 rc.cpp:162
 msgid "Is"
 msgstr "Yw"
 
@@ -450,7 +315,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:146
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:104 rc.cpp:128 rc.cpp:152 rc.cpp:104 rc.cpp:128 rc.cpp:152
+#: rc.cpp:117 rc.cpp:141 rc.cpp:165 rc.cpp:117 rc.cpp:141 rc.cpp:165
 msgid "Matches Regular Expression"
 msgstr "Yn Cydweddu â Mynegiad Rheolaidd"
 
@@ -466,7 +331,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:151
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:107 rc.cpp:131 rc.cpp:155 rc.cpp:107 rc.cpp:131 rc.cpp:155
+#: rc.cpp:120 rc.cpp:144 rc.cpp:168 rc.cpp:120 rc.cpp:144 rc.cpp:168
 msgid "Does Not Contain"
 msgstr "Ni Chynhwysa"
 
@@ -482,7 +347,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:156
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:110 rc.cpp:134 rc.cpp:158 rc.cpp:110 rc.cpp:134 rc.cpp:158
+#: rc.cpp:123 rc.cpp:147 rc.cpp:171 rc.cpp:123 rc.cpp:147 rc.cpp:171
 msgid "Is Not"
 msgstr "Nid Yw"
 
@@ -498,65 +363,295 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, window_class_combo)
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:161
 #. i18n: ectx: property (text), item, widget (QComboBox, window_role_combo)
-#: rc.cpp:113 rc.cpp:137 rc.cpp:161 rc.cpp:113 rc.cpp:137 rc.cpp:161
+#: rc.cpp:126 rc.cpp:150 rc.cpp:174 rc.cpp:126 rc.cpp:150 rc.cpp:174
 msgid "Does Not Match Regular Expression"
 msgstr "Nid Yw'n Cydweddu â Mynegiad Rheolaidd"
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:77
 #. i18n: ectx: property (text), widget (QLabel, window_class_label)
-#: rc.cpp:116 rc.cpp:116
+#: rc.cpp:129 rc.cpp:129
 msgid "Window class:"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:123
 #. i18n: ectx: property (text), widget (QLabel, window_role_label)
-#: rc.cpp:140 rc.cpp:140
+#: rc.cpp:153 rc.cpp:153
 msgid "Window role:"
 msgstr ""
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:195
 #. i18n: ectx: property (text), widget (QPushButton, autodetect)
-#: rc.cpp:164 rc.cpp:164
+#: rc.cpp:177 rc.cpp:177
 msgid "&Autodetect"
 msgstr "&Hunan-ganfod"
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:205
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:167 rc.cpp:167
+#: rc.cpp:180 rc.cpp:180
 msgid "Window Types"
 msgstr "Mathau Ffenestri"
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:211
 #. i18n: ectx: property (text), widget (QRadioButton, type_normal)
-#: rc.cpp:170 rc.cpp:170
+#: rc.cpp:183 rc.cpp:183
 msgid "Normal"
 msgstr "Arferol"
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:218
 #. i18n: ectx: property (text), widget (QRadioButton, type_desktop)
-#: rc.cpp:173 rc.cpp:173
+#: rc.cpp:186 rc.cpp:186
 msgid "Desktop"
 msgstr "Penbwrdd"
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:225
 #. i18n: ectx: property (text), widget (QRadioButton, type_dialog)
-#: rc.cpp:176 rc.cpp:176
+#: rc.cpp:189 rc.cpp:189
 msgid "Dialog"
 msgstr "Ymgom"
 
 #. i18n: file: kcm_hotkeys/helper_widgets/window_definition_widget.ui:232
 #. i18n: ectx: property (text), widget (QRadioButton, type_dock)
-#: rc.cpp:179 rc.cpp:179
+#: rc.cpp:192 rc.cpp:192
 msgid "Dock"
 msgstr "Doc"
 
-#. i18n: file: kcm_hotkeys/hotkeys_widget_base.ui:23
-#. i18n: ectx: attribute (title), widget (QWidget, comment_tab)
-#: rc.cpp:182 kcm_hotkeys/hotkeys_context_menu.cpp:312
-#: kcm_hotkeys/hotkeys_context_menu.cpp:341
-#: kcm_hotkeys/hotkeys_context_menu.cpp:370 kcm_hotkeys/hotkeys_model.cpp:92
-#: rc.cpp:182
-msgid "Comment"
+#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:38
+#. i18n: ectx: property (text), widget (QPushButton, edit_button)
+#: rc.cpp:198 rc.cpp:198
+msgid "&Edit..."
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:45
+#. i18n: ectx: property (text), widget (QPushButton, new_button)
+#: rc.cpp:201 rc.cpp:201
+msgid "&New..."
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, duplicate_button)
+#: rc.cpp:204 rc.cpp:204
+msgid "&Duplicate..."
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/helper_widgets/window_definition_list_widget.ui:59
+#. i18n: ectx: property (text), widget (QPushButton, delete_button)
+#: rc.cpp:207 rc.cpp:207
+msgid "&Delete"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:18
+#. i18n: ectx: property (text), widget (QLabel, applicationLabel)
+#: rc.cpp:210 rc.cpp:210
+msgid "Remote application:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:31
+#. i18n: ectx: property (text), widget (QLabel, objectLabel)
+#: rc.cpp:213 rc.cpp:213
+msgid "Remote object:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:44
+#. i18n: ectx: property (text), widget (QLabel, functionLabel)
+#: rc.cpp:216 rc.cpp:216
+msgid "Function:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:57
+#. i18n: ectx: property (text), widget (QLabel, argumentsLabel)
+#: rc.cpp:219 rc.cpp:219
+msgid "Arguments:"
+msgstr "Ymresymiadau:"
+
+#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:84
+#. i18n: ectx: property (text), widget (QPushButton, execButton)
+#: rc.cpp:222 rc.cpp:222
+msgid "Call"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/dbus_action_widget.ui:91
+#. i18n: ectx: property (text), widget (QPushButton, launchButton)
+#: rc.cpp:225 rc.cpp:225
+msgid "Launch  D-Bus Browser"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/command_url_action_widget.ui:16
+#. i18n: ectx: property (text), widget (QLabel, commandLabel)
+#: rc.cpp:228 rc.cpp:228
+msgid "Command/URL:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/menuentry_action_widget.ui:16
+#. i18n: ectx: property (text), widget (QLabel, applicationLabel)
+#: rc.cpp:231 rc.cpp:231
+msgid "Application:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/menuentry_action_widget.ui:30
+#. i18n: ectx: property (text), widget (KPushButton, applicationButton)
+#: rc.cpp:234 rc.cpp:234
+msgid "Select Application ..."
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:53
+#. i18n: ectx: property (title), widget (QGroupBox, window_group)
+#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:53
+#. i18n: ectx: property (title), widget (QGroupBox, window_group)
+#: rc.cpp:237 rc.cpp:267 rc.cpp:237 rc.cpp:267
+msgid "Window"
+msgstr "Ffenestr"
+
+#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:27
+#. i18n: ectx: property (text), widget (QRadioButton, active_radio)
+#: rc.cpp:240 rc.cpp:240
+msgid "Active window"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:34
+#. i18n: ectx: property (text), widget (QRadioButton, specific_radio)
+#: rc.cpp:243 rc.cpp:243
+msgid "Specific window"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/actions/keyboard_input_action_widget.ui:41
+#. i18n: ectx: property (text), widget (QRadioButton, action_radio)
+#: rc.cpp:246 rc.cpp:246
+msgid "Action window"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/triggers/shortcut_trigger_widget.ui:17
+#. i18n: ectx: property (text), widget (QLabel, shortcut_label)
+#: rc.cpp:249 rc.cpp:249
+msgid "&Shortcut:"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, when_group)
+#: rc.cpp:252 rc.cpp:252
+msgid "Trigger When"
+msgstr "Pryd i Danio:"
+
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:22
+#. i18n: ectx: property (text), widget (QRadioButton, window_appears)
+#: rc.cpp:255 rc.cpp:255
+msgid "Window appears"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:29
+#. i18n: ectx: property (text), widget (QRadioButton, window_disappears)
+#: rc.cpp:258 rc.cpp:258
+msgid "Window disappears"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:36
+#. i18n: ectx: property (text), widget (QRadioButton, window_gets_focus)
+#: rc.cpp:261 rc.cpp:261
+msgid "Window gets focus"
+msgstr ""
+
+#. i18n: file: kcm_hotkeys/triggers/window_trigger_widget.ui:43
+#. i18n: ectx: property (text), widget (QRadioButton, window_lost_focus)
+#: rc.cpp:264 rc.cpp:264
+msgid "Window loses focus"
+msgstr ""
+
+#: libkhotkeysprivate/khotkeysglobal.h:40
+msgid "Menu Editor entries"
+msgstr "Cofnodion Golygydd Dewislenni"
+
+#: libkhotkeysprivate/windows_helper/window_selection_rules.cpp:82
+msgid "Window simple: "
+msgstr ""
+
+#: libkhotkeysprivate/settings.cpp:318
+msgid ""
+"This \"actions\" file has already been imported before. Are you sure you "
+"want to import it again?"
+msgstr ""
+
+#: libkhotkeysprivate/settings.cpp:346
+msgid ""
+"This \"actions\" file has no ImportId field and therefore it cannot be "
+"determined whether or not it has been imported already. Are you sure you "
+"want to import it?"
+msgstr ""
+
+#: libkhotkeysprivate/conditions/not_condition.cpp:63
+msgctxt "Not_condition"
+msgid "Not"
+msgstr "Dim"
+
+#: libkhotkeysprivate/conditions/active_window_condition.cpp:82
+msgid "Active window: "
+msgstr "Ffenestr weithredol : "
+
+#: libkhotkeysprivate/conditions/or_condition.cpp:69
+msgctxt "Or_condition"
+msgid "Or"
+msgstr "Neu"
+
+#: libkhotkeysprivate/conditions/and_condition.cpp:61
+msgctxt "And_condition"
+msgid "And"
+msgstr "A"
+
+#: libkhotkeysprivate/conditions/existing_window_condition.cpp:72
+msgid "Existing window: "
+msgstr ""
+
+#: libkhotkeysprivate/actions/menuentry_action.cpp:91
+msgid "No service configured."
+msgstr ""
+
+#: libkhotkeysprivate/actions/menuentry_action.cpp:92
+#: libkhotkeysprivate/actions/menuentry_action.cpp:101
+#, kde-format
+msgid "Input Action: %1"
+msgstr ""
+
+#: libkhotkeysprivate/actions/menuentry_action.cpp:100
+#, kde-format
+msgid "Failed to start service '%1'."
+msgstr ""
+
+#: libkhotkeysprivate/actions/menuentry_action.cpp:115
+msgid "Menu entry: "
+msgstr ""
+
+#: libkhotkeysprivate/actions/dbus_action.cpp:143
+msgid "D-Bus: "
+msgstr ""
+
+#: libkhotkeysprivate/actions/keyboard_input_action.cpp:191
+msgid "Keyboard input: "
+msgstr ""
+
+#: libkhotkeysprivate/actions/activate_window_action.cpp:91
+msgid "Activate window: "
+msgstr ""
+
+#: libkhotkeysprivate/actions/command_url_action.cpp:79
+msgid "Command/URL : "
+msgstr ""
+
+#: libkhotkeysprivate/triggers/shortcut_trigger.cpp:137
+msgid "Shortcut trigger: "
+msgstr ""
+
+#: libkhotkeysprivate/triggers/gesture_trigger.cpp:126
+msgid "Gesture trigger"
+msgstr ""
+
+#: libkhotkeysprivate/triggers/window_trigger.cpp:150
+msgid "Window trigger: "
+msgstr ""
+
+#: libkhotkeysprivate/triggers/voice_trigger.cpp:67
+msgid "Voice trigger: "
 msgstr ""
 
 #: kcm_hotkeys/kcm_hotkeys.cpp:109
@@ -591,13 +686,29 @@
 "activated."
 msgstr ""
 
-#: kcm_hotkeys/hotkeys_export_widget.cpp:37
-msgid "Export Group"
+#: kcm_hotkeys/hotkeys_model.cpp:92 kcm_hotkeys/hotkeys_context_menu.cpp:130
+#: kcm_hotkeys/hotkeys_context_menu.cpp:143
+msgid "New Group"
 msgstr ""
 
-#: kcm_hotkeys/action_group_widget.cpp:30
-msgid "Conditions"
-msgstr "Amodau"
+#: kcm_hotkeys/hotkeys_model.cpp:403
+msgctxt "action name"
+msgid "Name"
+msgstr ""
+
+#: kcm_hotkeys/hotkeys_model.cpp:407
+msgctxt "action enabled"
+msgid "Enabled"
+msgstr ""
+
+#: kcm_hotkeys/hotkeys_model.cpp:410
+msgid "Type"
+msgstr ""
+
+#: kcm_hotkeys/conditions/conditions_widget.cpp:80
+msgctxt "Add a new condition"
+msgid "And"
+msgstr ""
 
 #: kcm_hotkeys/conditions/condition_type_menu.cpp:27
 msgctxt "Condition type"
@@ -624,34 +735,6 @@
 msgid "Not"
 msgstr ""
 
-#: kcm_hotkeys/conditions/conditions_widget.cpp:80
-msgctxt "Add a new condition"
-msgid "And"
-msgstr ""
-
-#: kcm_hotkeys/hotkeys_context_menu.cpp:130
-#: kcm_hotkeys/hotkeys_context_menu.cpp:143 kcm_hotkeys/hotkeys_model.cpp:92
-msgid "New Group"
-msgstr ""
-
-#: kcm_hotkeys/hotkeys_model.cpp:403
-msgctxt "action name"
-msgid "Name"
-msgstr ""
-
-#: kcm_hotkeys/hotkeys_model.cpp:407
-msgctxt "action enabled"
-msgid "Enabled"
-msgstr ""
-
-#: kcm_hotkeys/hotkeys_model.cpp:410
-msgid "Type"
-msgstr ""
-
-#: kcm_hotkeys/actions/dbus_action_widget.cpp:122
-msgid "Failed to run qdbusviewer"
-msgstr ""
-
 #: kcm_hotkeys/helper_widgets/edit_gesture_dialog.cpp:32
 msgid "Edit Gesture"
 msgstr ""
@@ -662,6 +745,14 @@
 "mouse button while drawing, and release when you have finished."
 msgstr ""
 
+#: kcm_hotkeys/hotkeys_export_widget.cpp:37
+msgid "Export Group"
+msgstr ""
+
+#: kcm_hotkeys/actions/dbus_action_widget.cpp:122
+msgid "Failed to run qdbusviewer"
+msgstr ""
+
 #: kcm_hotkeys/hotkeys_context_menu.cpp:44
 #: kcm_hotkeys/hotkeys_context_menu.cpp:56
 msgid "Test"
@@ -709,6 +800,10 @@
 msgid "New Action"
 msgstr "Gweithred Newydd"
 
+#: kcm_hotkeys/action_group_widget.cpp:30
+msgid "Conditions"
+msgstr "Amodau"
+
 #: kcm_hotkeys/simple_action_data_widget.cpp:124
 msgid "Trigger"
 msgstr ""
@@ -716,98 +811,3 @@
 #: kcm_hotkeys/simple_action_data_widget.cpp:160
 msgid "Action"
 msgstr ""
-
-#: libkhotkeysprivate/khotkeysglobal.h:40
-msgid "Menu Editor entries"
-msgstr "Cofnodion Golygydd Dewislenni"
-
-#: libkhotkeysprivate/conditions/and_condition.cpp:61
-msgctxt "And_condition"
-msgid "And"
-msgstr "A"
-
-#: libkhotkeysprivate/conditions/existing_window_condition.cpp:72
-msgid "Existing window: "
-msgstr ""
-
-#: libkhotkeysprivate/conditions/active_window_condition.cpp:82
-msgid "Active window: "
-msgstr "Ffenestr weithredol : "
-
-#: libkhotkeysprivate/conditions/not_condition.cpp:63
-msgctxt "Not_condition"
-msgid "Not"
-msgstr "Dim"
-
-#: libkhotkeysprivate/conditions/or_condition.cpp:69
-msgctxt "Or_condition"
-msgid "Or"
-msgstr "Neu"
-
-#: libkhotkeysprivate/windows_helper/window_selection_rules.cpp:82
-msgid "Window simple: "
-msgstr ""
-
-#: libkhotkeysprivate/triggers/gesture_trigger.cpp:126
-msgid "Gesture trigger"
-msgstr ""
-
-#: libkhotkeysprivate/triggers/window_trigger.cpp:150
-msgid "Window trigger: "
-msgstr ""
-
-#: libkhotkeysprivate/triggers/voice_trigger.cpp:67
-msgid "Voice trigger: "
-msgstr ""
-
-#: libkhotkeysprivate/triggers/shortcut_trigger.cpp:137
-msgid "Shortcut trigger: "
-msgstr ""
-
-#: libkhotkeysprivate/actions/command_url_action.cpp:79
-msgid "Command/URL : "
-msgstr ""
-
-#: libkhotkeysprivate/actions/menuentry_action.cpp:91
-msgid "No service configured."
-msgstr ""
-
-#: libkhotkeysprivate/actions/menuentry_action.cpp:92
-#: libkhotkeysprivate/actions/menuentry_action.cpp:101
-#, kde-format
-msgid "Input Action: %1"
-msgstr ""
-
-#: libkhotkeysprivate/actions/menuentry_action.cpp:100
-#, kde-format
-msgid "Failed to start service '%1'."
-msgstr ""
-
-#: libkhotkeysprivate/actions/menuentry_action.cpp:115
-msgid "Menu entry: "
-msgstr ""
-
-#: libkhotkeysprivate/actions/dbus_action.cpp:143
-msgid "D-Bus: "
-msgstr ""
-
-#: libkhotkeysprivate/actions/activate_window_action.cpp:91
-msgid "Activate window: "
-msgstr ""
-
-#: libkhotkeysprivate/actions/keyboard_input_action.cpp:191
-msgid "Keyboard input: "
-msgstr ""
-
-#: libkhotkeysprivate/settings.cpp:318
-msgid ""
-"This \"actions\" file has already been imported before. Are you sure you "
-"want to import it again?"
-msgstr ""
-
-#: libkhotkeysprivate/settings.cpp:346
-msgid ""
-"This \"actions\" file has no ImportId field and therefore it cannot be "
-"determined whether or not it has been imported already. Are you sure you "
-"want to import it?"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khotnewstuff.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khotnewstuff.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khotnewstuff.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khotnewstuff.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-11-11 13:56+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:17+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: khotnewstuff.cpp:33 khotnewstuff_upload.cpp:33
 msgid "KHotNewStuff"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khtmlsettingsplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khtmlsettingsplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/khtmlsettingsplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/khtmlsettingsplugin.po	2012-04-18 08:59:36.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: khtmlsettingsplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-10 17:28+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:24+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:49+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -43,60 +43,60 @@
 msgid "Extra Toolbar"
 msgstr "Bar Offer Ychwanegol"
 
-#: settingsplugin.cpp:40 settingsplugin.cpp:52
+#: settingsplugin.cpp:43 settingsplugin.cpp:54
 msgid "HTML Settings"
 msgstr "Gosodiadau HTML"
 
-#: settingsplugin.cpp:61
+#: settingsplugin.cpp:59
 msgid "Java&Script"
 msgstr "Java&Script"
 
-#: settingsplugin.cpp:66
+#: settingsplugin.cpp:64
 msgid "&Java"
 msgstr "&Java"
 
-#: settingsplugin.cpp:71
+#: settingsplugin.cpp:69
 msgid "&Cookies"
 msgstr "&Bisgedi"
 
-#: settingsplugin.cpp:76
+#: settingsplugin.cpp:74
 msgid "&Plugins"
 msgstr "&Ategion"
 
-#: settingsplugin.cpp:81
+#: settingsplugin.cpp:79
 msgid "Autoload &Images"
 msgstr "Hunan-lwytho &Delweddau"
 
-#: settingsplugin.cpp:88
+#: settingsplugin.cpp:86
 msgid "Enable Pro&xy"
 msgstr "Galluogi D&irprwy"
 
-#: settingsplugin.cpp:93
+#: settingsplugin.cpp:91
 msgid "Enable Cac&he"
 msgstr "Galluogi &Celc"
 
-#: settingsplugin.cpp:99
+#: settingsplugin.cpp:97
 msgid "Cache Po&licy"
 msgstr "&Polisi'r Celc"
 
-#: settingsplugin.cpp:101
+#: settingsplugin.cpp:99
 msgid "&Keep Cache in Sync"
 msgstr "Cadw'r Celc yn &Gyfoes"
 
-#: settingsplugin.cpp:102
+#: settingsplugin.cpp:100
 msgid "&Use Cache if Possible"
 msgstr "Defnyddio'r Celc os &Bosibl"
 
-#: settingsplugin.cpp:103
+#: settingsplugin.cpp:101
 msgid "&Offline Browsing Mode"
 msgstr "Modd &Pori All-lein"
 
-#: settingsplugin.cpp:187
+#: settingsplugin.cpp:196
 msgid ""
 "Cookies could not be enabled, because the cookie daemon could not be started."
 msgstr ""
 
-#: settingsplugin.cpp:189
+#: settingsplugin.cpp:198
 msgctxt "@title:window"
 msgid "Cookies Disabled"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kig.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kig.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kig.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kig.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kig.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:45+0000\n"
-"PO-Revision-Date: 2012-03-12 22:07+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 23:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:02+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:35+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: tips:2
 #. i18n: ectx: @info:tipoftheday
@@ -266,7 +266,7 @@
 msgid "&Tools"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:203
+#. i18n: file: kig/kigpartui.rc:204
 #. i18n: ectx: ToolBar (mainToolBar)
 #. i18n: file: kig/kigui.rc:23
 #. i18n: ectx: ToolBar (mainToolBar)
@@ -274,67 +274,67 @@
 msgid "Main Toolbar"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:217
+#. i18n: file: kig/kigpartui.rc:218
 #. i18n: ectx: ToolBar (points_toolbar)
 #: rc.cpp:68
 msgid "Points"
 msgstr "Pwyntiau:"
 
-#. i18n: file: kig/kigpartui.rc:228
+#. i18n: file: kig/kigpartui.rc:229
 #. i18n: ectx: ToolBar (line_toolbar)
 #: rc.cpp:71
 msgid "Lines"
 msgstr "Llinellau"
 
-#. i18n: file: kig/kigpartui.rc:238
+#. i18n: file: kig/kigpartui.rc:239
 #. i18n: ectx: ToolBar (vectseg_toolbar)
 #: rc.cpp:74
 msgid "Vectors && Segments"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:246
+#. i18n: file: kig/kigpartui.rc:247
 #. i18n: ectx: ToolBar (circle_toolbar)
 #: rc.cpp:77
 msgid "Circles && Arcs"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:254
+#. i18n: file: kig/kigpartui.rc:255
 #. i18n: ectx: ToolBar (conic_toolbar)
 #: rc.cpp:80
 msgid "Conics"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:263
+#. i18n: file: kig/kigpartui.rc:264
 #. i18n: ectx: ToolBar (bezier_toolbar)
 #: rc.cpp:83
 msgid "Bézier Curves"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:273
+#. i18n: file: kig/kigpartui.rc:274
 #. i18n: ectx: ToolBar (angles_toolbar)
 #: rc.cpp:86
 msgid "Angles"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:278
+#. i18n: file: kig/kigpartui.rc:279
 #. i18n: ectx: ToolBar (transformation_toolbar)
 #: rc.cpp:89
 msgid "Transformations"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:292
+#. i18n: file: kig/kigpartui.rc:293
 #. i18n: ectx: ToolBar (tests_toolbar)
 #: rc.cpp:92
 msgid "Tests"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:304
+#. i18n: file: kig/kigpartui.rc:305
 #. i18n: ectx: ToolBar (rest_toolbar)
 #: rc.cpp:95
 msgid "Other Objects"
 msgstr ""
 
-#. i18n: file: kig/kigpartui.rc:312
+#. i18n: file: kig/kigpartui.rc:313
 #. i18n: ectx: ToolBar (view_toolbar)
 #: rc.cpp:98
 msgid "View"
@@ -346,81 +346,89 @@
 msgid "&Settings"
 msgstr ""
 
+#. i18n: file: filters/asyexporteroptionswidget.ui:22
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: filters/imageexporteroptionswidget.ui:120
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: filters/latexexporteroptionswidget.ui:75
+#. i18n: file: filters/latexexporteroptionswidget.ui:82
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: filters/svgexporteroptionswidget.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:122 rc.cpp:149 rc.cpp:161 misc/kigfiledialog.cc:34
+#: rc.cpp:110 rc.cpp:134 rc.cpp:164 rc.cpp:176 misc/kigfiledialog.cc:34
 msgid "Options"
 msgstr ""
 
-#. i18n: file: filters/latexexporteroptionswidget.ui:88
+#. i18n: file: filters/asyexporteroptionswidget.ui:42
 #. i18n: ectx: property (text), widget (QCheckBox, showFrameCheckBox)
-#: rc.cpp:155
+#. i18n: file: filters/latexexporteroptionswidget.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, showFrameCheckBox)
+#: rc.cpp:113 rc.cpp:170
 msgid "Show Extra Frame"
 msgstr ""
 
+#. i18n: file: filters/asyexporteroptionswidget.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox, showAxesCheckBox)
 #. i18n: file: filters/imageexporteroptionswidget.ui:140
 #. i18n: ectx: property (text), widget (QCheckBox, showAxesCheckBox)
-#. i18n: file: filters/latexexporteroptionswidget.ui:95
+#. i18n: file: filters/latexexporteroptionswidget.ui:102
 #. i18n: ectx: property (text), widget (QCheckBox, showAxesCheckBox)
 #. i18n: file: filters/svgexporteroptionswidget.ui:42
 #. i18n: ectx: property (text), widget (QCheckBox, showAxesCheckBox)
-#: rc.cpp:125 rc.cpp:158 rc.cpp:164
+#: rc.cpp:116 rc.cpp:137 rc.cpp:173 rc.cpp:179
 msgid "Show Axes"
 msgstr ""
 
+#. i18n: file: filters/asyexporteroptionswidget.ui:56
+#. i18n: ectx: property (text), widget (QCheckBox, showGridCheckBox)
 #. i18n: file: filters/imageexporteroptionswidget.ui:147
 #. i18n: ectx: property (text), widget (QCheckBox, showGridCheckBox)
-#. i18n: file: filters/latexexporteroptionswidget.ui:81
+#. i18n: file: filters/latexexporteroptionswidget.ui:88
 #. i18n: ectx: property (text), widget (QCheckBox, showGridCheckBox)
 #. i18n: file: filters/svgexporteroptionswidget.ui:49
 #. i18n: ectx: property (text), widget (QCheckBox, showGridCheckBox)
-#: rc.cpp:128 rc.cpp:152 rc.cpp:167
+#: rc.cpp:119 rc.cpp:140 rc.cpp:167 rc.cpp:182
 msgid "Show Grid"
 msgstr ""
 
 #. i18n: file: filters/imageexporteroptionswidget.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:110
+#: rc.cpp:122
 msgid "Resolution"
 msgstr "Cydraniad"
 
 #. i18n: file: filters/imageexporteroptionswidget.ui:37
 #. i18n: ectx: property (text), widget (QCheckBox, keepAspectRatio)
-#: rc.cpp:113
+#: rc.cpp:125
 msgid "&Keep Aspect Ratio"
 msgstr ""
 
 #. i18n: file: filters/imageexporteroptionswidget.ui:54
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:116
+#: rc.cpp:128
 msgid "Height:"
 msgstr "Taldra:"
 
 #. i18n: file: filters/imageexporteroptionswidget.ui:110
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:119
+#: rc.cpp:131
 msgid "Width:"
 msgstr "Lled:"
 
 #. i18n: file: filters/latexexporteroptionswidget.ui:23
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:131
+#: rc.cpp:143
 msgid "Output format"
 msgstr ""
 
 #. i18n: file: filters/latexexporteroptionswidget.ui:29
 #. i18n: ectx: property (text), widget (QRadioButton, psTricksRadioButton)
-#: rc.cpp:134
+#: rc.cpp:146
 msgid "PSTricks"
 msgstr ""
 
 #. i18n: file: filters/latexexporteroptionswidget.ui:36
 #. i18n: ectx: property (text), widget (QRadioButton, tikzRadioButton)
-#: rc.cpp:137
+#: rc.cpp:149
 msgid "Tikz/PGF"
 msgstr ""
 
@@ -430,27 +438,39 @@
 msgid "Asymptote"
 msgstr ""
 
-#. i18n: file: filters/latexexporteroptionswidget.ui:49
+#. i18n: file: filters/latexexporteroptionswidget.ui:56
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:140
+#: rc.cpp:155
 msgid "Document options"
 msgstr ""
 
-#. i18n: file: filters/latexexporteroptionswidget.ui:55
+#. i18n: file: filters/latexexporteroptionswidget.ui:62
 #. i18n: ectx: property (text), widget (QRadioButton, pictureRadioButton)
-#: rc.cpp:143
+#: rc.cpp:158
 msgid "Picture only"
 msgstr ""
 
-#. i18n: file: filters/latexexporteroptionswidget.ui:65
+#. i18n: file: filters/latexexporteroptionswidget.ui:72
 #. i18n: ectx: property (text), widget (QRadioButton, documentRadioButton)
-#: rc.cpp:146
+#: rc.cpp:161
 msgid "Standalone document"
 msgstr ""
 
+#. i18n: file: misc/kigcoordinateprecisiondialog.ui:9
+#. i18n: ectx: property (text), widget (QCheckBox, m_defaultCheckBox)
+#: rc.cpp:185
+msgid "&Use default coordinate precision"
+msgstr ""
+
+#. i18n: file: misc/kigcoordinateprecisiondialog.ui:16
+#. i18n: ectx: property (text), widget (QLabel, m_precisionLabel)
+#: rc.cpp:188
+msgid "&Specify coordinate precision:"
+msgstr ""
+
 #. i18n: file: modes/edittypewidget.ui:36
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:170
+#: rc.cpp:191
 msgid ""
 "Here you can modify the name, the description and the icon of this macro "
 "type."
@@ -458,61 +478,61 @@
 
 #. i18n: file: modes/edittypewidget.ui:73
 #. i18n: ectx: property (text), widget (QLabel, label_2_3)
-#: rc.cpp:173
+#: rc.cpp:194
 msgid "Name:"
 msgstr "Enw:"
 
 #. i18n: file: modes/edittypewidget.ui:93
 #. i18n: ectx: property (text), widget (QLabel, label_2_2_2)
-#: rc.cpp:176
+#: rc.cpp:197
 msgid "Description:"
 msgstr "Disgrifiad:"
 
 #. i18n: file: modes/historywidget.ui:22
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:179
+#: rc.cpp:200
 msgid "Description of the current step:"
 msgstr ""
 
 #. i18n: file: modes/historywidget.ui:53
 #. i18n: ectx: property (toolTip), widget (QPushButton, buttonFirst)
-#: rc.cpp:182
+#: rc.cpp:203
 msgid "First step"
 msgstr ""
 
 #. i18n: file: modes/historywidget.ui:66
 #. i18n: ectx: property (toolTip), widget (QPushButton, buttonBack)
-#: rc.cpp:185
+#: rc.cpp:206
 msgid "One step back"
 msgstr ""
 
 #. i18n: file: modes/historywidget.ui:82
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:188
+#: rc.cpp:209
 msgid "/"
 msgstr ""
 
 #. i18n: file: modes/historywidget.ui:96
 #. i18n: ectx: property (toolTip), widget (QPushButton, buttonNext)
-#: rc.cpp:191
+#: rc.cpp:212
 msgid "One step forward"
 msgstr ""
 
 #. i18n: file: modes/historywidget.ui:109
 #. i18n: ectx: property (toolTip), widget (QPushButton, buttonLast)
-#: rc.cpp:194
+#: rc.cpp:215
 msgid "Last step"
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:37
 #. i18n: ectx: property (toolTip), widget (QTreeView, typeList)
-#: rc.cpp:197
+#: rc.cpp:218
 msgid "Select types here..."
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:40
 #. i18n: ectx: property (whatsThis), widget (QTreeView, typeList)
-#: rc.cpp:200
+#: rc.cpp:221
 msgid ""
 "This is a list of the current macro types... You can select, edit, delete, "
 "export and import them..."
@@ -520,197 +540,197 @@
 
 #. i18n: file: modes/typeswidget.ui:99
 #. i18n: ectx: property (whatsThis), widget (KPushButton, buttonEdit)
-#: rc.cpp:203
+#: rc.cpp:224
 msgid "Edit the selected type."
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:102
 #. i18n: ectx: property (text), widget (KPushButton, buttonEdit)
-#: rc.cpp:206 modes/typesdialog.cpp:368
+#: rc.cpp:227 modes/typesdialog.cpp:368
 msgid "&Edit..."
 msgstr "&Golygu..."
 
 #. i18n: file: modes/typeswidget.ui:109
 #. i18n: ectx: property (whatsThis), widget (KPushButton, buttonRemove)
-#: rc.cpp:209
+#: rc.cpp:230
 msgid "Delete all the selected types in the list."
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:112
 #. i18n: ectx: property (text), widget (KPushButton, buttonRemove)
-#: rc.cpp:212 modes/popup.cc:390 modes/typesdialog.cpp:369
+#: rc.cpp:233 modes/popup.cc:390 modes/typesdialog.cpp:369
 msgid "&Delete"
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:151
 #. i18n: ectx: property (whatsThis), widget (KPushButton, buttonExport)
-#: rc.cpp:215
+#: rc.cpp:236
 msgid "Export all the selected types to a file."
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:154
 #. i18n: ectx: property (text), widget (KPushButton, buttonExport)
-#: rc.cpp:218 modes/typesdialog.cpp:371
+#: rc.cpp:239 modes/typesdialog.cpp:371
 msgid "E&xport..."
 msgstr "&Allforio..."
 
 #. i18n: file: modes/typeswidget.ui:161
 #. i18n: ectx: property (whatsThis), widget (KPushButton, buttonImport)
-#: rc.cpp:221
+#: rc.cpp:242
 msgid "Import macros that are contained in one or more files."
 msgstr ""
 
 #. i18n: file: modes/typeswidget.ui:164
 #. i18n: ectx: property (text), widget (KPushButton, buttonImport)
-#: rc.cpp:224
+#: rc.cpp:245
 msgid "&Import..."
 msgstr ""
 
-#: rc.cpp:225
+#: rc.cpp:246
 msgid "Circle by Center && Line"
 msgstr ""
 
-#: rc.cpp:226
+#: rc.cpp:247
 msgid "A circle constructed by its center and tangent to a given line"
 msgstr ""
 
-#: rc.cpp:227
+#: rc.cpp:248
 msgid "Construct a circle tangent to this line"
 msgstr ""
 
-#: rc.cpp:228 rc.cpp:233 objects/circle_type.cc:34
+#: rc.cpp:249 rc.cpp:254 objects/circle_type.cc:34
 msgid "Construct a circle with this center"
 msgstr ""
 
-#: rc.cpp:229
+#: rc.cpp:250
 msgid "Select the line that the new circle should be tangent to..."
 msgstr ""
 
-#: rc.cpp:230 rc.cpp:235 objects/circle_type.cc:39 objects/circle_type.cc:194
+#: rc.cpp:251 rc.cpp:256 objects/circle_type.cc:39 objects/circle_type.cc:194
 msgid "Select the center of the new circle..."
 msgstr ""
 
-#: rc.cpp:231
+#: rc.cpp:252
 msgid "Circle by Point && Segment (as the Diameter)"
 msgstr ""
 
-#: rc.cpp:232
+#: rc.cpp:253
 msgid ""
 "A circle defined by its center and the length of a segment as the diameter"
 msgstr ""
 
-#: rc.cpp:234
+#: rc.cpp:255
 msgid ""
 "Construct a circle with the diameter given by the length of this segment"
 msgstr ""
 
-#: rc.cpp:236
+#: rc.cpp:257
 msgid ""
 "Select the segment whose length gives the diameter of the new circle..."
 msgstr ""
 
-#: rc.cpp:237
+#: rc.cpp:258
 msgid "Equilateral Triangle"
 msgstr ""
 
-#: rc.cpp:238
+#: rc.cpp:259
 msgid "Equilateral triangle with given two vertices"
 msgstr ""
 
-#: rc.cpp:239
+#: rc.cpp:260
 msgid "Evolute"
 msgstr ""
 
-#: rc.cpp:240
+#: rc.cpp:261
 msgid "Evolute of a curve"
 msgstr ""
 
-#: rc.cpp:241
+#: rc.cpp:262
 msgid "Evolute of this curve"
 msgstr ""
 
-#: rc.cpp:242 rc.cpp:247 objects/centerofcurvature_type.cc:35
+#: rc.cpp:263 rc.cpp:268 objects/centerofcurvature_type.cc:35
 #: objects/tangent_type.cc:36
 msgid "Select the curve..."
 msgstr ""
 
-#: rc.cpp:243
+#: rc.cpp:264
 msgid "Osculating Circle"
 msgstr ""
 
-#: rc.cpp:244
+#: rc.cpp:265
 msgid "Osculating circle of a curve at a point"
 msgstr ""
 
-#: rc.cpp:245
+#: rc.cpp:266
 msgid "Osculating circle of this curve"
 msgstr ""
 
-#: rc.cpp:246
+#: rc.cpp:267
 msgid "Osculating circle at this point"
 msgstr ""
 
-#: rc.cpp:248
+#: rc.cpp:269
 msgid "Select the point..."
 msgstr ""
 
-#: rc.cpp:249
+#: rc.cpp:270
 msgid "Segment Axis"
 msgstr ""
 
-#: rc.cpp:250
+#: rc.cpp:271
 msgid "The perpendicular line through a given segment's mid point."
 msgstr ""
 
-#: rc.cpp:251
+#: rc.cpp:272
 msgid "Construct the axis of this segment"
 msgstr ""
 
-#: rc.cpp:252
+#: rc.cpp:273
 msgid "Select the segment of which you want to draw the axis..."
 msgstr ""
 
-#: rc.cpp:253
+#: rc.cpp:274
 msgid "Square"
 msgstr "Sgwâr"
 
-#: rc.cpp:254
+#: rc.cpp:275
 msgid "Square with two given adjacent vertices"
 msgstr ""
 
-#: rc.cpp:255
+#: rc.cpp:276
 msgid "Vector Difference"
 msgstr ""
 
-#: rc.cpp:256
+#: rc.cpp:277
 msgid "Construct the vector difference of two vectors."
 msgstr ""
 
-#: rc.cpp:257
+#: rc.cpp:278
 msgid "Construct the vector difference of this vector and another one."
 msgstr ""
 
-#: rc.cpp:258
+#: rc.cpp:279
 msgid "Construct the vector difference of the other vector and this one."
 msgstr ""
 
-#: rc.cpp:259
+#: rc.cpp:280
 msgid "Construct the vector difference starting at this point."
 msgstr ""
 
-#: rc.cpp:260
+#: rc.cpp:281
 msgid ""
 "Select the first of the two vectors of which you want to construct the "
 "difference..."
 msgstr ""
 
-#: rc.cpp:261
+#: rc.cpp:282
 msgid ""
 "Select the other of the two vectors of which you want to construct the "
 "difference..."
 msgstr ""
 
-#: rc.cpp:262
+#: rc.cpp:283
 msgid "Select the point to construct the difference vector in..."
 msgstr ""
 
@@ -790,67 +810,67 @@
 msgid "Contributed the 'asymptote' export filter."
 msgstr ""
 
-#: kig/aboutdata.h:66
+#: kig/aboutdata.h:70
 msgid "Eric Depagne"
 msgstr ""
 
-#: kig/aboutdata.h:67
+#: kig/aboutdata.h:71
 msgid ""
 "The French translator, who also sent me some useful feedback, like feature "
 "requests and bug reports."
 msgstr ""
 
-#: kig/aboutdata.h:71
+#: kig/aboutdata.h:75
 msgid "Marc Bartsch"
 msgstr ""
 
-#: kig/aboutdata.h:72
+#: kig/aboutdata.h:76
 msgid ""
 "Author of KGeo, where I got inspiration, some source, and most of the "
 "artwork from."
 msgstr ""
 
-#: kig/aboutdata.h:76
+#: kig/aboutdata.h:80
 msgid "Christophe Devriese"
 msgstr ""
 
-#: kig/aboutdata.h:77
+#: kig/aboutdata.h:81
 msgid ""
 "Domi's brother, who he got to write the algorithm for calculating the center "
 "of the circle with three points given."
 msgstr ""
 
-#: kig/aboutdata.h:82
+#: kig/aboutdata.h:86
 msgid "Christophe Prud'homme"
 msgstr ""
 
-#: kig/aboutdata.h:83
+#: kig/aboutdata.h:87
 msgid "Sent me a patch for some bugs."
 msgstr ""
 
-#: kig/aboutdata.h:86
+#: kig/aboutdata.h:90
 msgid "Robert Gogolok"
 msgstr ""
 
-#: kig/aboutdata.h:87
+#: kig/aboutdata.h:91
 msgid ""
 "Gave me some good feedback on Kig, some feature requests, cleanups and style "
 "fixes, and someone to chat with on irc :)"
 msgstr ""
 
-#: kig/aboutdata.h:92
+#: kig/aboutdata.h:96
 msgid "David Vignoni"
 msgstr ""
 
-#: kig/aboutdata.h:93
+#: kig/aboutdata.h:97
 msgid "Responsible for the nice application SVG Icon."
 msgstr ""
 
-#: kig/aboutdata.h:96
+#: kig/aboutdata.h:100
 msgid "Danny Allen"
 msgstr ""
 
-#: kig/aboutdata.h:97
+#: kig/aboutdata.h:101
 msgid "Responsible for the new object action icons."
 msgstr ""
 
@@ -874,8 +894,9 @@
 msgid "Asymptote Options"
 msgstr ""
 
-#: filters/exporter.cc:118 filters/latexexporter.cc:984
-#: filters/svgexporter.cc:81 filters/xfigexporter.cc:592
+#: filters/asyexporter.cc:78 filters/exporter.cc:119
+#: filters/latexexporter.cc:1030 filters/svgexporter.cc:81
+#: filters/xfigexporter.cc:592
 #, kde-format
 msgid ""
 "The file \"%1\" could not be opened. Please check if the file permissions "
@@ -938,32 +959,32 @@
 "currently support."
 msgstr ""
 
-#: filters/exporter.cc:71
+#: filters/exporter.cc:72
 msgid "&Export to image"
 msgstr ""
 
-#: filters/exporter.cc:76
+#: filters/exporter.cc:77
 msgid "&Image..."
 msgstr "&Delwedd ..."
 
-#: filters/exporter.cc:88
+#: filters/exporter.cc:89
 msgid "Export as Image"
 msgstr ""
 
-#: filters/exporter.cc:89
+#: filters/exporter.cc:90
 msgid "Image Options"
 msgstr ""
 
-#: filters/exporter.cc:110
+#: filters/exporter.cc:111
 msgid "Sorry, this file format is not supported."
 msgstr ""
 
-#: filters/exporter.cc:134
+#: filters/exporter.cc:135
 #, kde-format
 msgid "Sorry, something went wrong while saving to image \"%1\""
 msgstr ""
 
-#: filters/exporter.cc:157
+#: filters/exporter.cc:158
 msgid "&Export To"
 msgstr ""
 
@@ -1015,23 +1036,23 @@
 "This KSeg file contains an arc segment, which Kig does not currently support."
 msgstr ""
 
-#: filters/latexexporter.cc:73
+#: filters/latexexporter.cc:74
 msgid "Export to &Latex..."
 msgstr ""
 
-#: filters/latexexporter.cc:78
+#: filters/latexexporter.cc:79
 msgid "&Latex..."
 msgstr ""
 
-#: filters/latexexporter.cc:946
+#: filters/latexexporter.cc:992
 msgid "*.tex|Latex Documents (*.tex)"
 msgstr ""
 
-#: filters/latexexporter.cc:947
+#: filters/latexexporter.cc:993
 msgid "Export as Latex"
 msgstr ""
 
-#: filters/latexexporter.cc:948
+#: filters/latexexporter.cc:994
 msgid "Latex Options"
 msgstr ""
 
@@ -1707,12 +1728,12 @@
 msgid "Numeric Value"
 msgstr ""
 
-#: misc/kigfiledialog.cc:54 kig/kig_part.cpp:657 modes/typesdialog.cpp:456
+#: misc/kigfiledialog.cc:54 kig/kig_part.cpp:675 modes/typesdialog.cpp:456
 #, kde-format
 msgid "The file \"%1\" already exists. Do you wish to overwrite it?"
 msgstr ""
 
-#: misc/kigfiledialog.cc:55 kig/kig_part.cpp:658 modes/typesdialog.cpp:458
+#: misc/kigfiledialog.cc:55 kig/kig_part.cpp:676 modes/typesdialog.cpp:458
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
@@ -1826,7 +1847,7 @@
 msgid "Construct a polygon with this vertex"
 msgstr ""
 
-#: misc/special_constructors.cc:644 misc/special_constructors.cc:1828
+#: misc/special_constructors.cc:644
 msgid "Select a point to be a vertex of the new polygon..."
 msgstr ""
 
@@ -2048,183 +2069,195 @@
 msgid "Start transport from this point of the curve"
 msgstr ""
 
-#: misc/special_constructors.cc:1865 objects/intersection_types.cc:36
+#: misc/special_constructors.cc:1830
+msgid "Select a segment, arc or numeric label to be transported..."
+msgstr ""
+
+#: misc/special_constructors.cc:1834
+msgid "Select a destination line or circle..."
+msgstr ""
+
+#: misc/special_constructors.cc:1838
+msgid "Choose a starting point on the line/circle..."
+msgstr ""
+
+#: misc/special_constructors.cc:1879 objects/intersection_types.cc:36
 msgid "Intersect with this conic"
 msgstr ""
 
-#: misc/special_constructors.cc:1867 misc/special_constructors.cc:1876
+#: misc/special_constructors.cc:1881 misc/special_constructors.cc:1890
 #: objects/intersection_types.cc:32
 msgid "Intersect with this line"
 msgstr ""
 
-#: misc/special_constructors.cc:1874 objects/intersection_types.cc:155
+#: misc/special_constructors.cc:1888 objects/intersection_types.cc:155
 #: objects/intersection_types.cc:223
 msgid "Intersect with this cubic"
 msgstr ""
 
-#: misc/special_constructors.cc:1883 misc/special_constructors.cc:1885
+#: misc/special_constructors.cc:1897 misc/special_constructors.cc:1899
 #: objects/intersection_types.cc:471 objects/intersection_types.cc:473
 msgid "Intersect with this circle"
 msgstr ""
 
-#: misc/special_constructors.cc:1891
+#: misc/special_constructors.cc:1905
 msgid "Intersect"
 msgstr ""
 
-#: misc/special_constructors.cc:1892
+#: misc/special_constructors.cc:1906
 msgid "The intersection of two objects"
 msgstr ""
 
-#: misc/special_constructors.cc:1993
+#: misc/special_constructors.cc:2007
 msgid "Intersect this Circle"
 msgstr ""
 
-#: misc/special_constructors.cc:1995
+#: misc/special_constructors.cc:2009
 msgid "Intersect this Conic"
 msgstr ""
 
-#: misc/special_constructors.cc:1997
+#: misc/special_constructors.cc:2011
 msgid "Intersect this Segment"
 msgstr ""
 
-#: misc/special_constructors.cc:1999
+#: misc/special_constructors.cc:2013
 msgid "Intersect this Half-line"
 msgstr ""
 
-#: misc/special_constructors.cc:2001
+#: misc/special_constructors.cc:2015
 msgid "Intersect this Line"
 msgstr ""
 
-#: misc/special_constructors.cc:2003
+#: misc/special_constructors.cc:2017
 msgid "Intersect this Cubic Curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2005
+#: misc/special_constructors.cc:2019
 msgid "Intersect this Arc"
 msgstr ""
 
-#: misc/special_constructors.cc:2007
+#: misc/special_constructors.cc:2021
 msgid "Intersect this Polygon"
 msgstr ""
 
-#: misc/special_constructors.cc:2009
+#: misc/special_constructors.cc:2023
 msgid "Intersect this Polygonal"
 msgstr ""
 
-#: misc/special_constructors.cc:2014
+#: misc/special_constructors.cc:2028
 msgid "with this Circle"
 msgstr ""
 
-#: misc/special_constructors.cc:2016
+#: misc/special_constructors.cc:2030
 msgid "with this Conic"
 msgstr ""
 
-#: misc/special_constructors.cc:2018
+#: misc/special_constructors.cc:2032
 msgid "with this Segment"
 msgstr ""
 
-#: misc/special_constructors.cc:2020
+#: misc/special_constructors.cc:2034
 msgid "with this Half-line"
 msgstr ""
 
-#: misc/special_constructors.cc:2022
+#: misc/special_constructors.cc:2036
 msgid "with this Line"
 msgstr ""
 
-#: misc/special_constructors.cc:2024
+#: misc/special_constructors.cc:2038
 msgid "with this Cubic Curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2026
+#: misc/special_constructors.cc:2040
 msgid "with this Arc"
 msgstr ""
 
-#: misc/special_constructors.cc:2028
+#: misc/special_constructors.cc:2042
 msgid "with this Polygon"
 msgstr ""
 
-#: misc/special_constructors.cc:2030
+#: misc/special_constructors.cc:2044
 msgid "with this Polygonal"
 msgstr ""
 
-#: misc/special_constructors.cc:2040
+#: misc/special_constructors.cc:2054
 msgid "Construct Midpoint of This Point and Another One"
 msgstr ""
 
-#: misc/special_constructors.cc:2041
+#: misc/special_constructors.cc:2055
 msgid ""
 "Select the first of the points of which you want to construct the midpoint..."
 msgstr ""
 
-#: misc/special_constructors.cc:2042
+#: misc/special_constructors.cc:2056
 msgid "Construct the midpoint of this point and another one"
 msgstr ""
 
-#: misc/special_constructors.cc:2043
+#: misc/special_constructors.cc:2057
 msgid "Select the other of the points of which to construct the midpoint..."
 msgstr ""
 
-#: misc/special_constructors.cc:2153
+#: misc/special_constructors.cc:2167
 msgid "Select the first object to intersect..."
 msgstr ""
 
-#: misc/special_constructors.cc:2155
+#: misc/special_constructors.cc:2169
 msgid "Select the second object to intersect..."
 msgstr ""
 
-#: misc/special_constructors.cc:2160
+#: misc/special_constructors.cc:2174
 msgid "Tangent"
 msgstr ""
 
-#: misc/special_constructors.cc:2161
+#: misc/special_constructors.cc:2175
 msgid "The line tangent to a curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2203
+#: misc/special_constructors.cc:2217
 msgid "Tangent to This Circle"
 msgstr ""
 
-#: misc/special_constructors.cc:2205
+#: misc/special_constructors.cc:2219
 msgid "Tangent to This Conic"
 msgstr ""
 
-#: misc/special_constructors.cc:2207
+#: misc/special_constructors.cc:2221
 msgid "Tangent to This Arc"
 msgstr ""
 
-#: misc/special_constructors.cc:2209
+#: misc/special_constructors.cc:2223
 msgid "Tangent to This Cubic Curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2211
+#: misc/special_constructors.cc:2225
 msgid "Tangent to This Curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2213
+#: misc/special_constructors.cc:2227
 msgid "Tangent at This Point"
 msgstr ""
 
-#: misc/special_constructors.cc:2234
+#: misc/special_constructors.cc:2248
 msgid "Center Of Curvature"
 msgstr ""
 
-#: misc/special_constructors.cc:2235
+#: misc/special_constructors.cc:2249
 msgid "The center of the osculating circle to a curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2270
+#: misc/special_constructors.cc:2284
 msgid "Center of Curvature of This Conic"
 msgstr ""
 
-#: misc/special_constructors.cc:2272
+#: misc/special_constructors.cc:2286
 msgid "Center of Curvature of This Cubic Curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2274
+#: misc/special_constructors.cc:2288
 msgid "Center of Curvature of This Curve"
 msgstr ""
 
-#: misc/special_constructors.cc:2276
+#: misc/special_constructors.cc:2290
 msgid "Center of Curvature at This Point"
 msgstr ""
 
@@ -2296,36 +2329,36 @@
 msgid "<unnamed object>"
 msgstr ""
 
-#: modes/label.cc:330
+#: modes/label.cc:329
 #, c-format
 msgid ""
 "There are '%n' parts in the text that you have not selected a value for. "
 "Please remove them or select enough arguments."
 msgstr ""
 
-#: modes/label.cc:411
+#: modes/label.cc:406
 #, kde-format
 msgid "argument %1"
 msgstr ""
 
-#: modes/label.cc:440
+#: modes/label.cc:435
 #, kde-format
 msgid "Selecting argument %1"
 msgstr ""
 
-#: modes/label.cc:551
+#: modes/label.cc:546
 msgid "Change Label"
 msgstr "Newid Label"
 
-#: modes/label.cc:650 objects/text_type.cc:325
+#: modes/label.cc:645 objects/text_type.cc:325
 msgid "Set Value"
 msgstr ""
 
-#: modes/label.cc:650
+#: modes/label.cc:645
 msgid "Enter value:"
 msgstr ""
 
-#: modes/label.cc:681
+#: modes/label.cc:676
 msgid "Select the position for the new numeric value..."
 msgstr ""
 
@@ -2518,7 +2551,7 @@
 msgid "More..."
 msgstr ""
 
-#: modes/popup.cc:940 kig/kig_part.cpp:255
+#: modes/popup.cc:940 kig/kig_part.cpp:256
 msgid "U&nhide All"
 msgstr ""
 
@@ -3751,40 +3784,40 @@
 msgid "Object Type"
 msgstr "Math Gwrthrych"
 
-#: objects/object_imp.cc:284
+#: objects/object_imp.cc:288
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: objects/object_imp.cc:285
+#: objects/object_imp.cc:289
 msgid "Select this object"
 msgstr ""
 
-#: objects/object_imp.cc:286
+#: objects/object_imp.cc:290
 #, kde-format
 msgid "Select object %1"
 msgstr ""
 
-#: objects/object_imp.cc:287
+#: objects/object_imp.cc:291
 msgid "Remove an object"
 msgstr ""
 
-#: objects/object_imp.cc:288
+#: objects/object_imp.cc:292
 msgid "Add an object"
 msgstr ""
 
-#: objects/object_imp.cc:289
+#: objects/object_imp.cc:293
 msgid "Move an object"
 msgstr ""
 
-#: objects/object_imp.cc:290
+#: objects/object_imp.cc:294
 msgid "Attach to this object"
 msgstr ""
 
-#: objects/object_imp.cc:291
+#: objects/object_imp.cc:295
 msgid "Show an object"
 msgstr ""
 
-#: objects/object_imp.cc:292
+#: objects/object_imp.cc:296
 msgid "Hide an object"
 msgstr ""
 
@@ -5250,6 +5283,20 @@
 "script."
 msgstr ""
 
+#: kig/kig_commands.cpp:100
+#, kde-format
+msgid "Remove %1 Object"
+msgid_plural "Remove %1 Objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kig/kig_commands.cpp:112
+#, kde-format
+msgid "Add %1 Object"
+msgid_plural "Add %1 Objects"
+msgstr[0] ""
+msgstr[1] ""
+
 #: kig/kig.cpp:90
 msgid "Could not find the necessary Kig library, check your installation."
 msgstr ""
@@ -5275,170 +5322,164 @@
 "*.fig *.FIG|Cabri Documents (*.fig *.FIG)"
 msgstr ""
 
-#: kig/kig_commands.cpp:100
-#, kde-format
-msgid "Remove %1 Object"
-msgid_plural "Remove %1 Objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kig/kig_commands.cpp:112
-#, kde-format
-msgid "Add %1 Object"
-msgid_plural "Add %1 Objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kig/kig_part.cpp:85
+#: kig/kig_part.cpp:86
 msgid "KigPart"
 msgstr "KigPart"
 
-#: kig/kig_part.cpp:89
+#: kig/kig_part.cpp:90
 msgid "&Set Coordinate System"
 msgstr ""
 
-#: kig/kig_part.cpp:130
+#: kig/kig_part.cpp:131
 msgid "Kig Options"
 msgstr ""
 
-#: kig/kig_part.cpp:134
+#: kig/kig_part.cpp:135
 msgid "Show grid"
 msgstr "Dangos Grid"
 
-#: kig/kig_part.cpp:137
+#: kig/kig_part.cpp:138
 msgid "Show axes"
 msgstr ""
 
-#: kig/kig_part.cpp:226
+#: kig/kig_part.cpp:227
 msgid "Invert Selection"
 msgstr "Gwrthdroi Dewisiad"
 
-#: kig/kig_part.cpp:233
+#: kig/kig_part.cpp:234
 msgid "&Delete Objects"
 msgstr "&Dileu Gwrthrychau"
 
-#: kig/kig_part.cpp:237
+#: kig/kig_part.cpp:238
 msgid "Delete the selected objects"
 msgstr ""
 
-#: kig/kig_part.cpp:239
+#: kig/kig_part.cpp:240
 msgid "Cancel Construction"
 msgstr ""
 
-#: kig/kig_part.cpp:244
+#: kig/kig_part.cpp:245
 msgid "Cancel the construction of the object being constructed"
 msgstr ""
 
-#: kig/kig_part.cpp:247
+#: kig/kig_part.cpp:248
 msgid "Repeat Construction"
 msgstr ""
 
-#: kig/kig_part.cpp:252
+#: kig/kig_part.cpp:253
 msgid "Repeat the last construction (with new data)"
 msgstr ""
 
-#: kig/kig_part.cpp:258
+#: kig/kig_part.cpp:259
 msgid "Show all hidden objects"
 msgstr ""
 
-#: kig/kig_part.cpp:261
+#: kig/kig_part.cpp:262
 msgid "&New Macro..."
 msgstr ""
 
-#: kig/kig_part.cpp:264
+#: kig/kig_part.cpp:265
 msgid "Define a new macro"
 msgstr ""
 
-#: kig/kig_part.cpp:266
+#: kig/kig_part.cpp:267
 msgid "Manage &Types..."
 msgstr ""
 
-#: kig/kig_part.cpp:269
+#: kig/kig_part.cpp:270
 msgid "Manage macro types."
 msgstr ""
 
-#: kig/kig_part.cpp:271
+#: kig/kig_part.cpp:272
 msgid "&Browse History..."
 msgstr ""
 
-#: kig/kig_part.cpp:274
+#: kig/kig_part.cpp:275
 msgid "Browse the history of the current construction."
 msgstr ""
 
-#: kig/kig_part.cpp:281 kig/kig_part.cpp:282
+#: kig/kig_part.cpp:282 kig/kig_part.cpp:283
 msgid "Zoom in on the document"
 msgstr ""
 
-#: kig/kig_part.cpp:286 kig/kig_part.cpp:287
+#: kig/kig_part.cpp:287 kig/kig_part.cpp:288
 msgid "Zoom out of the document"
 msgstr ""
 
-#: kig/kig_part.cpp:293 kig/kig_part.cpp:294
+#: kig/kig_part.cpp:294 kig/kig_part.cpp:295
 msgid "Recenter the screen on the document"
 msgstr ""
 
-#: kig/kig_part.cpp:297 kig/kig_part.cpp:298
+#: kig/kig_part.cpp:298 kig/kig_part.cpp:299
 msgid "View this document full-screen."
 msgstr ""
 
-#: kig/kig_part.cpp:301
+#: kig/kig_part.cpp:302
 msgid "&Select Shown Area"
 msgstr ""
 
-#: kig/kig_part.cpp:304 kig/kig_part.cpp:305
+#: kig/kig_part.cpp:305 kig/kig_part.cpp:306
 msgid "Select the area that you want to be shown in the window."
 msgstr ""
 
-#: kig/kig_part.cpp:307
+#: kig/kig_part.cpp:308
 msgid "S&elect Zoom Area"
 msgstr ""
 
-#: kig/kig_part.cpp:313
+#: kig/kig_part.cpp:314
+msgid "Set Coordinate &Precision..."
+msgstr ""
+
+#: kig/kig_part.cpp:316
+msgid "Set the floating point precision of coordinates in the document. "
+msgstr ""
+
+#: kig/kig_part.cpp:319
 msgid "Show &Grid"
 msgstr "Dango&s Grid"
 
-#: kig/kig_part.cpp:315
+#: kig/kig_part.cpp:321
 msgid "Show or hide the grid."
 msgstr ""
 
-#: kig/kig_part.cpp:319
+#: kig/kig_part.cpp:325
 msgid "Show &Axes"
 msgstr ""
 
-#: kig/kig_part.cpp:321
+#: kig/kig_part.cpp:327
 msgid "Show or hide the axes."
 msgstr ""
 
-#: kig/kig_part.cpp:325
+#: kig/kig_part.cpp:331
 msgid "Wear Infrared Glasses"
 msgstr ""
 
-#: kig/kig_part.cpp:327
+#: kig/kig_part.cpp:333
 msgid "Enable/disable hidden objects' visibility."
 msgstr ""
 
-#: kig/kig_part.cpp:359
+#: kig/kig_part.cpp:365
 #, kde-format
 msgid "Repeat Construction (%1)"
 msgstr ""
 
-#: kig/kig_part.cpp:361
+#: kig/kig_part.cpp:367
 #, kde-format
 msgid "Repeat %1 (with new data)"
 msgstr ""
 
-#: kig/kig_part.cpp:390
+#: kig/kig_part.cpp:396
 #, kde-format
 msgid ""
 "The file \"%1\" you tried to open does not exist. Please verify that you "
 "entered the correct path."
 msgstr ""
 
-#: kig/kig_part.cpp:392
+#: kig/kig_part.cpp:398
 msgid "File Not Found"
 msgstr "Ni chanfuwyd y ffeil"
 
-#: kig/kig_part.cpp:410
+#: kig/kig_part.cpp:416
 #, kde-format
 msgid ""
 "You tried to open a document of type \"%1\"; unfortunately, Kig does not "
@@ -5447,38 +5488,38 @@
 "mailto:pino@kde.org or do the work yourself and send me a patch."
 msgstr ""
 
-#: kig/kig_part.cpp:416 kig/kig_part.cpp:459
+#: kig/kig_part.cpp:422 kig/kig_part.cpp:465
 msgid "Format Not Supported"
 msgstr ""
 
-#: kig/kig_part.cpp:457
+#: kig/kig_part.cpp:463
 msgid ""
 "Kig does not support saving to any other file format than its own. Save to "
 "Kig's format instead?"
 msgstr ""
 
-#: kig/kig_part.cpp:459
+#: kig/kig_part.cpp:465
 msgid "Save Kig Format"
 msgstr ""
 
-#: kig/kig_part.cpp:646
+#: kig/kig_part.cpp:664
 msgid ""
 "*.kig|Kig Documents (*.kig)\n"
 "*.kigz|Compressed Kig Documents (*.kigz)"
 msgstr ""
 
-#: kig/kig_part.cpp:815
+#: kig/kig_part.cpp:833
 msgid "Print Geometry"
 msgstr ""
 
-#: kig/kig_part.cpp:882
+#: kig/kig_part.cpp:900
 #, kde-format
 msgid "Hide %1 Object"
 msgid_plural "Hide %1 Objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kig/kig_part.cpp:901
+#: kig/kig_part.cpp:919
 #, kde-format
 msgid "Show %1 Object"
 msgid_plural "Show %1 Objects"
@@ -5535,43 +5576,43 @@
 msgid "Document to open"
 msgstr "Dogfen i'w hagor"
 
-#: misc/coordinate_system.cpp:327
+#: misc/coordinate_system.cpp:325
 msgid ""
 "Enter coordinates in the following format: \"x;y\",\n"
 "where x is the x coordinate, and y is the y coordinate."
 msgstr ""
 
-#: misc/coordinate_system.cpp:333
+#: misc/coordinate_system.cpp:331
 msgid ""
 "Enter coordinates in the following format: <b>\"x;y\"</b>,<br />where x is "
 "the x coordinate, and y is the y coordinate."
 msgstr ""
 
-#: misc/coordinate_system.cpp:375
+#: misc/coordinate_system.cpp:371
 msgid ""
 "Enter coordinates in the following format: \"r; θ°\",\n"
 "where r and θ are the polar coordinates."
 msgstr ""
 
-#: misc/coordinate_system.cpp:382
+#: misc/coordinate_system.cpp:378
 msgid ""
 "Enter coordinates in the following format: <b>\"r; θ°\"</b>,<br />where r "
 "and θ are the polar coordinates."
 msgstr ""
 
-#: misc/coordinate_system.cpp:534
+#: misc/coordinate_system.cpp:530
 msgid "&Euclidean"
 msgstr ""
 
-#: misc/coordinate_system.cpp:535
+#: misc/coordinate_system.cpp:531
 msgid "&Polar"
 msgstr "&Pegynnol"
 
-#: misc/coordinate_system.cpp:585
+#: misc/coordinate_system.cpp:581
 msgid "Set Euclidean Coordinate System"
 msgstr ""
 
-#: misc/coordinate_system.cpp:587
+#: misc/coordinate_system.cpp:583
 msgid "Set Polar Coordinate System"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kimagemapeditor.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kimagemapeditor.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kimagemapeditor.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kimagemapeditor.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,25 +7,61 @@
 msgstr ""
 "Project-Id-Version: kdewebdev\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 15:07+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-12-23 03:34+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:36+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kimeshell.cpp:179
-msgid "Web Files"
-msgstr ""
+#: arealistview.cpp:41 kimagemapeditor.cpp:101 kimagemapeditor.cpp:134
+msgid "Areas"
+msgstr "Ardaloedd"
 
-#: kimeshell.cpp:180 kimagemapeditor.cpp:103 kimagemapeditor.cpp:136
-#: imageslistview.cpp:60
+#: arealistview.cpp:42 kimedialogs.cpp:660
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#: imageslistview.cpp:60 kimeshell.cpp:180 kimagemapeditor.cpp:103
+#: kimagemapeditor.cpp:136
 msgid "Images"
 msgstr "Delweddau"
 
+#: imageslistview.cpp:61
+msgid "Usemap"
+msgstr ""
+
+#: kimearea.cpp:147
+msgid "noname"
+msgstr "dimEnw"
+
+#: kimearea.cpp:1406
+msgid "Number of Areas"
+msgstr ""
+
+#: kimearea.h:231 kimedialogs.cpp:417
+msgid "Rectangle"
+msgstr "Hirsgwâr"
+
+#: kimearea.h:254 kimedialogs.cpp:418
+msgid "Circle"
+msgstr "Cylch"
+
+#: kimearea.h:280 kimedialogs.cpp:419
+msgid "Polygon"
+msgstr "Amlochryn"
+
+#: kimearea.h:304 kimedialogs.cpp:450
+msgid "Default"
+msgstr ""
+
+#: kimeshell.cpp:179
+msgid "Web Files"
+msgstr ""
+
 #: kimeshell.cpp:181
 msgid "HTML Files"
 msgstr "Ffeiliau HTML"
@@ -50,158 +86,120 @@
 msgid "Choose Picture to Open"
 msgstr ""
 
-#: arealistview.cpp:41 kimagemapeditor.cpp:101 kimagemapeditor.cpp:134
-msgid "Areas"
-msgstr "Ardaloedd"
-
-#: arealistview.cpp:42 kimedialogs.cpp:660
-msgid "Preview"
-msgstr "Rhagolwg"
-
-#: mapslistview.cpp:33 kimagemapeditor.cpp:102 kimagemapeditor.cpp:135
-msgid "Maps"
+#: imagemapchoosedialog.cpp:39
+msgid "Choose Map & Image to Edit"
 msgstr ""
 
-#: mapslistview.cpp:162 kimagemapeditor.cpp:243
-msgid "unnamed"
-msgstr "di-enw"
-
-#: kimecommands.cpp:26
-#, kde-format
-msgid "Cut %1"
-msgstr "Torri %1"
-
-#: kimecommands.cpp:70
-#, kde-format
-msgid "Delete %1"
-msgstr "Dileu %1"
-
-#: kimecommands.cpp:74
-#, kde-format
-msgid "Paste %1"
-msgstr "Gludo %1"
-
-#: kimecommands.cpp:113
-#, kde-format
-msgid "Move %1"
-msgstr "Symud %1"
-
-#: kimecommands.cpp:169
-#, kde-format
-msgid "Resize %1"
-msgstr "Newid maint %1"
-
-#: kimecommands.cpp:210
-#, kde-format
-msgid "Add point to %1"
+#: imagemapchoosedialog.cpp:53
+msgid "Select an image and/or a map that you want to edit"
 msgstr ""
 
-#: kimecommands.cpp:254
-#, kde-format
-msgid "Remove point from %1"
+#: imagemapchoosedialog.cpp:65
+msgid "&Maps"
 msgstr ""
 
-#: kimecommands.cpp:301
-#, kde-format
-msgid "Create %1"
-msgstr "Creu %1"
-
-#: main.cpp:27 kimagemapeditor.cpp:257
-msgid "An HTML imagemap editor"
+#: imagemapchoosedialog.cpp:77
+msgid "Image Preview"
 msgstr ""
 
-#: main.cpp:34 kimagemapeditor.cpp:256
-msgid "KImageMapEditor"
-msgstr "KImageMapEditor"
-
-#: main.cpp:36
-msgid "(c) 2001-2007 Jan Schaefer"
+#: imagemapchoosedialog.cpp:100
+msgid "No maps found"
 msgstr ""
 
-#: main.cpp:37
-msgid "Jan Schaefer"
+#: imagemapchoosedialog.cpp:127
+msgid "No images found"
 msgstr ""
 
-#: main.cpp:38
-msgid "Joerg Jaspert"
-msgstr ""
+#: imagemapchoosedialog.cpp:140
+msgid "&Images"
+msgstr "&Delweddau"
 
-#: main.cpp:38
-msgid "For helping me with the Makefiles, and creating the Debian package"
-msgstr ""
+#: imagemapchoosedialog.cpp:149
+msgid "Path"
+msgstr "Llwybr"
 
-#: main.cpp:39
-msgid "Aaron Seigo and Michael"
-msgstr ""
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: main.cpp:39
-msgid "For helping me fixing --enable-final mode"
-msgstr ""
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,"
 
-#: main.cpp:40
-msgid "Antonio Crevillen"
+#. i18n: file: kimagemapeditorpartui.rc:14
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:5
+msgid "&Edit"
 msgstr ""
 
-#: main.cpp:40
-msgid "For the Spanish translation"
+#. i18n: file: kimagemapeditorpartui.rc:31
+#. i18n: ectx: Menu (view)
+#: rc.cpp:8
+msgid "&View"
 msgstr ""
 
-#: main.cpp:41
-msgid "Fabrice Mous"
+#. i18n: file: kimagemapeditorpartui.rc:40
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:11
+msgid "&Tools"
 msgstr ""
 
-#: main.cpp:41
-msgid "For the Dutch translation"
+#. i18n: file: kimagemapeditorpartui.rc:50
+#. i18n: ectx: Menu (map)
+#: rc.cpp:14
+msgid "&Map"
 msgstr ""
 
-#: main.cpp:42
-msgid "Germain Chazot"
-msgstr ""
+#. i18n: file: kimagemapeditorpartui.rc:61
+#. i18n: ectx: Menu (images)
+#: rc.cpp:17 kimagemapeditor.cpp:573
+msgid "&Image"
+msgstr "&Delwedd"
 
-#: main.cpp:42
-msgid "For the French translation"
+#. i18n: file: kimagemapeditorpartui.rc:66
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:20
+msgid "&Settings"
 msgstr ""
 
-#: main.cpp:47
-msgid "Write HTML-Code to stdout on exit"
+#. i18n: file: kimagemapeditorpartui.rc:77
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kimagemapeditorui.rc:15
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:23 rc.cpp:32
+msgid "KImageMapEditor Main Toolbar"
 msgstr ""
 
-#: main.cpp:48
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: imagemapchoosedialog.cpp:39
-msgid "Choose Map & Image to Edit"
+#. i18n: file: kimagemapeditorpartui.rc:96
+#. i18n: ectx: ToolBar (kImageMapEditorPartDrawToolBar)
+#: rc.cpp:26
+msgid "KImageMapEditor Draw Toolbar"
 msgstr ""
 
-#: imagemapchoosedialog.cpp:53
-msgid "Select an image and/or a map that you want to edit"
+#. i18n: file: kimagemapeditorui.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:29
+msgid "&File"
 msgstr ""
 
-#: imagemapchoosedialog.cpp:65
-msgid "&Maps"
+#: kimagemapeditor.cpp:102 kimagemapeditor.cpp:135 mapslistview.cpp:33
+msgid "Maps"
 msgstr ""
 
-#: imagemapchoosedialog.cpp:77
-msgid "Image Preview"
-msgstr ""
+#: kimagemapeditor.cpp:243 mapslistview.cpp:162
+msgid "unnamed"
+msgstr "di-enw"
 
-#: imagemapchoosedialog.cpp:100
-msgid "No maps found"
-msgstr ""
+#: kimagemapeditor.cpp:256 main.cpp:34
+msgid "KImageMapEditor"
+msgstr "KImageMapEditor"
 
-#: imagemapchoosedialog.cpp:127
-msgid "No images found"
+#: kimagemapeditor.cpp:257 main.cpp:27
+msgid "An HTML imagemap editor"
 msgstr ""
 
-#: imagemapchoosedialog.cpp:140
-msgid "&Images"
-msgstr "&Delweddau"
-
-#: imagemapchoosedialog.cpp:149
-msgid "Path"
-msgstr "Llwybr"
-
 #: kimagemapeditor.cpp:259
 msgid ""
 "(c) 2001-2003 Jan Sch&auml;fer "
@@ -247,7 +245,7 @@
 msgid "<h3>Paste</h3>Click this to <em>paste</em> the copied area."
 msgstr ""
 
-#: kimagemapeditor.cpp:495 kimagemapeditor.cpp:2717
+#: kimagemapeditor.cpp:495 kimagemapeditor.cpp:2719
 msgid "&Delete"
 msgstr ""
 
@@ -351,12 +349,6 @@
 msgid "Show a preview"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:61
-#. i18n: ectx: Menu (images)
-#: kimagemapeditor.cpp:573 rc.cpp:15 rc.cpp:47
-msgid "&Image"
-msgstr "&Delwedd"
-
 #: kimagemapeditor.cpp:575
 msgid "Add Image..."
 msgstr "Ychwanegu Delwedd ..."
@@ -601,42 +593,38 @@
 msgid "File Does Not Exist"
 msgstr "Nid yw'r ffeil yn bodoli"
 
-#: kimagemapeditor.cpp:2400
+#: kimagemapeditor.cpp:2402
 #, kde-format
 msgid ""
 "<qt>The file <i>%1</i> could not be saved, because you do not have the "
 "required write permissions.</qt>"
 msgstr ""
 
-#: kimagemapeditor.cpp:2715
+#: kimagemapeditor.cpp:2717
 #, kde-format
 msgid ""
 "<qt>Are you sure you want to delete the map <i>%1</i>? <br /><b>There is no "
 "way to undo this.</b></qt>"
 msgstr ""
 
-#: kimagemapeditor.cpp:2717
+#: kimagemapeditor.cpp:2719
 msgid "Delete Map?"
 msgstr ""
 
-#: kimagemapeditor.cpp:2765
+#: kimagemapeditor.cpp:2767
 #, kde-format
 msgid ""
 "<qt>The file <i>%1</i> has been modified.<br />Do you want to save it?</qt>"
 msgstr ""
 
-#: kimagemapeditor.cpp:2895
+#: kimagemapeditor.cpp:2897
 msgid "Enter Usemap"
 msgstr ""
 
-#: kimagemapeditor.cpp:2896
+#: kimagemapeditor.cpp:2898
 msgid "Enter the usemap value:"
 msgstr ""
 
-#: imageslistview.cpp:61
-msgid "Usemap"
-msgstr ""
-
 #: kimedialogs.cpp:85
 msgid "Top &X:"
 msgstr ""
@@ -733,18 +721,6 @@
 msgid "Area Tag Editor"
 msgstr ""
 
-#: kimedialogs.cpp:417 kimearea.h:231
-msgid "Rectangle"
-msgstr "Hirsgwâr"
-
-#: kimedialogs.cpp:418 kimearea.h:254
-msgid "Circle"
-msgstr "Cylch"
-
-#: kimedialogs.cpp:419 kimearea.h:280
-msgid "Polygon"
-msgstr "Amlochryn"
-
 #: kimedialogs.cpp:420
 msgid "Selection"
 msgstr "Dewisiad"
@@ -753,10 +729,6 @@
 msgid "&General"
 msgstr "&Cyffredinol"
 
-#: kimedialogs.cpp:450 kimearea.h:304
-msgid "Default"
-msgstr ""
-
 #: kimedialogs.cpp:453
 msgid "Coor&dinates"
 msgstr ""
@@ -789,74 +761,98 @@
 msgid "&Start with last used document"
 msgstr ""
 
-#: kimearea.cpp:147
-msgid "noname"
-msgstr "dimEnw"
+#: kimecommands.cpp:26
+#, kde-format
+msgid "Cut %1"
+msgstr "Torri %1"
 
-#: kimearea.cpp:1406
-msgid "Number of Areas"
+#: kimecommands.cpp:70
+#, kde-format
+msgid "Delete %1"
+msgstr "Dileu %1"
+
+#: kimecommands.cpp:74
+#, kde-format
+msgid "Paste %1"
+msgstr "Gludo %1"
+
+#: kimecommands.cpp:113
+#, kde-format
+msgid "Move %1"
+msgstr "Symud %1"
+
+#: kimecommands.cpp:169
+#, kde-format
+msgid "Resize %1"
+msgstr "Newid maint %1"
+
+#: kimecommands.cpp:210
+#, kde-format
+msgid "Add point to %1"
 msgstr ""
 
-#: rc.cpp:31
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
+#: kimecommands.cpp:254
+#, kde-format
+msgid "Remove point from %1"
+msgstr ""
 
-#: rc.cpp:32
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,"
+#: kimecommands.cpp:301
+#, kde-format
+msgid "Create %1"
+msgstr "Creu %1"
 
-#. i18n: file: kimagemapeditorpartui.rc:14
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:3 rc.cpp:35
-msgid "&Edit"
+#: main.cpp:36
+msgid "(c) 2001-2007 Jan Schaefer"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:31
-#. i18n: ectx: Menu (view)
-#: rc.cpp:6 rc.cpp:38
-msgid "&View"
+#: main.cpp:37
+msgid "Jan Schaefer"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:40
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:9 rc.cpp:41
-msgid "&Tools"
+#: main.cpp:38
+msgid "Joerg Jaspert"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:50
-#. i18n: ectx: Menu (map)
-#: rc.cpp:12 rc.cpp:44
-msgid "&Map"
+#: main.cpp:38
+msgid "For helping me with the Makefiles, and creating the Debian package"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:66
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:18 rc.cpp:50
-msgid "&Settings"
+#: main.cpp:39
+msgid "Aaron Seigo and Michael"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:77
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kimagemapeditorui.rc:15
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kimagemapeditorpartui.rc:77
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kimagemapeditorui.rc:15
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:21 rc.cpp:30 rc.cpp:53 rc.cpp:62
-msgid "KImageMapEditor Main Toolbar"
+#: main.cpp:39
+msgid "For helping me fixing --enable-final mode"
 msgstr ""
 
-#. i18n: file: kimagemapeditorpartui.rc:96
-#. i18n: ectx: ToolBar (kImageMapEditorPartDrawToolBar)
-#: rc.cpp:24 rc.cpp:56
-msgid "KImageMapEditor Draw Toolbar"
+#: main.cpp:40
+msgid "Antonio Crevillen"
 msgstr ""
 
-#. i18n: file: kimagemapeditorui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:27 rc.cpp:59
-msgid "&File"
+#: main.cpp:40
+msgid "For the Spanish translation"
 msgstr ""
+
+#: main.cpp:41
+msgid "Fabrice Mous"
+msgstr ""
+
+#: main.cpp:41
+msgid "For the Dutch translation"
+msgstr ""
+
+#: main.cpp:42
+msgid "Germain Chazot"
+msgstr ""
+
+#: main.cpp:42
+msgid "For the French translation"
+msgstr ""
+
+#: main.cpp:47
+msgid "Write HTML-Code to stdout on exit"
+msgstr ""
+
+#: main.cpp:48
+msgid "File to open"
+msgstr "Ffeil i agor"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kinetd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kinetd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kinetd.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kinetd.po	2012-04-18 08:59:25.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kinetd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2006-04-19 10:23+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kinetd.cpp:253
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kinfocenter.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kinfocenter.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kinfocenter.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kinfocenter.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,15 +11,17 @@
 msgstr ""
 "Project-Id-Version: kcontrol\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2011-12-11 05:33+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: infocenter.cpp:57
 msgctxt "Main window title"
@@ -82,11 +84,11 @@
 msgid "%1  ( %2 )"
 msgstr ""
 
-#: aboutwidget.cpp:38 main.cpp:91
+#: main.cpp:40
 msgid "KDE Info Center"
 msgstr "Canolfan Wybodaeth KDE"
 
-#: main.cpp:92
+#: main.cpp:41
 msgid "The KDE Info Center"
 msgstr "Canolfan Wybodaeth KDE"
 
@@ -98,35 +100,35 @@
 msgid "David Hubner"
 msgstr ""
 
-#: main.cpp:98
+#: main.cpp:47
 msgid "Current Maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
-#: main.cpp:99
+#: main.cpp:48
 msgid "Helge Deller"
 msgstr ""
 
-#: main.cpp:99
+#: main.cpp:48
 msgid "Previous Maintainer"
 msgstr ""
 
-#: main.cpp:100
+#: main.cpp:49
 msgid "Matthias Hoelzer-Kluepfel"
 msgstr ""
 
-#: main.cpp:101
+#: main.cpp:50
 msgid "Matthias Elter"
 msgstr ""
 
-#: main.cpp:102
+#: main.cpp:51
 msgid "Matthias Ettrich"
 msgstr ""
 
-#: main.cpp:103
+#: main.cpp:52
 msgid "Waldo Bastian"
 msgstr ""
 
-#: main.cpp:98
+#: main.cpp:53
 msgid "Nicolas Ternisien"
 msgstr ""
 
@@ -142,7 +144,7 @@
 
 #. i18n: file: kinfocenterui.rc:16
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:3 rc.cpp:8
+#: rc.cpp:5
 msgctxt "@title:menu"
 msgid "Main Toolbar"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio4.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio4.po	2012-04-18 08:59:29.000000000 +0000
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: kio4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:23+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -24,505 +24,709 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:13+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:50+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kssl/ksslcertificate.cpp:204
-msgid "Signature Algorithm: "
-msgstr "Algorithm Llofnod: "
+#: kio/kfileitemactions.cpp:405
+msgctxt "@title:menu"
+msgid "&Actions"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:205
-msgid "Unknown"
-msgstr "Anhysbys"
+#: kio/kfileitemactions.cpp:535
+#, kde-format
+msgid "&Open with %1"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:208
-msgid "Signature Contents:"
-msgstr "Cynnwys y Llofnod:"
+#: kio/kfileitemactions.cpp:546 ../kfile/kfilewidget.cpp:1966
+msgid "&Open"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:348
-msgctxt "Unknown"
-msgid "Unknown key algorithm"
-msgstr "Algorithm allwedd anhysbys"
+#: kio/kfileitemactions.cpp:561
+msgctxt "@title:menu"
+msgid "&Open With"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:352
-#, kde-format
-msgid "Key type: RSA (%1 bit)"
-msgstr "Math allwedd: RSA (%1 did)"
+#: kio/kfileitemactions.cpp:578
+msgctxt "@action:inmenu Open With"
+msgid "&Other..."
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:354
-msgid "Modulus: "
-msgstr "Modwlws: "
+#: kio/kfileitemactions.cpp:580 kio/kfileitemactions.cpp:592
+msgctxt "@title:menu"
+msgid "&Open With..."
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:368
-msgid "Exponent: 0x"
-msgstr "Esbonnydd: 0x"
+#: kio/kfileitemactions.cpp:695
+#, kde-format
+msgid "Open &with %1"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:377
+#: kio/kfileitemactions.cpp:697
 #, kde-format
-msgid "Key type: DSA (%1 bit)"
-msgstr "Math allwedd: DSA (%1 did)"
+msgctxt "@item:inmenu Open With, %1 is application name"
+msgid "%1"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:379
-msgid "Prime: "
-msgstr "Rhif Cysefin: "
+#: kio/netaccess.cpp:104
+#, kde-format
+msgid "File '%1' is not readable"
+msgstr "Nid yw'r ffeil '%1' yn ddarllenadwy"
 
-#: kssl/ksslcertificate.cpp:393
-msgid "160 bit prime factor: "
+#: kio/netaccess.cpp:453
+#, kde-format
+msgid "ERROR: Unknown protocol '%1'"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:421
-msgid "Public key: "
-msgstr "Allwedd cyhoeddus: "
+#: kio/kimageio.cpp:43
+msgid "All Pictures"
+msgstr "Pob Delwedd"
 
-#: kssl/ksslcertificate.cpp:1051
-msgid "The certificate is valid."
-msgstr "Mae'r dystysgrif yn ddilys."
+#: kio/connection.cpp:213
+#, kde-format
+msgid "Unable to create io-slave: %1"
+msgstr "Methu creu gwas-io: %1"
 
-#: kssl/ksslcertificate.cpp:1053
-msgid ""
-"Retrieval of the issuer certificate failed. This means the CA's (Certificate "
-"Authority) certificate can not be found."
-msgstr ""
+#: kio/kfileitemdelegate.cpp:236
+#, kde-format
+msgctxt "Items in a folder"
+msgid "1 item"
+msgid_plural "%1 items"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kssl/ksslcertificate.cpp:1055
-msgid ""
-"Retrieval of the CRL (Certificate Revocation List) failed. This means the "
-"CA's (Certificate Authority) CRL can not be found."
+#: kio/kfileitemdelegate.cpp:292 kio/kfileitemdelegate.cpp:296
+msgctxt "@info mimetype"
+msgid "Unknown"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1057
-msgid ""
-"The decryption of the certificate's signature failed. This means it could "
-"not even be calculated as opposed to just not matching the expected result."
+#: kio/skipdialog.cpp:37
+msgid "Information"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1059
-msgid ""
-"The decryption of the CRL's (Certificate Revocation List) signature failed. "
-"This means it could not even be calculated as opposed to just not matching "
-"the expected result."
+#: kio/skipdialog.cpp:44
+msgid "Skip"
+msgstr "Hepgor"
+
+#: kio/skipdialog.cpp:47
+msgid "AutoSkip"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1061
-msgid ""
-"The decoding of the public key of the issuer failed. This means that the "
-"CA's (Certificate Authority) certificate can not be used to verify the "
-"certificate you wanted to use."
+#: kio/passworddialog.cpp:57
+msgid "Authorization Dialog"
+msgstr "Ymgom Awdurdodi"
+
+#: kio/renamedialog.cpp:131
+msgid "Appl&y to All"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1063
+#: kio/renamedialog.cpp:132
 msgid ""
-"The certificate's signature is invalid. This means that the certificate can "
-"not be verified."
+"When this is checked the button pressed will be applied to all subsequent "
+"folder conflicts for the remainder of the current job.\n"
+"Unless you press Skip you will still be prompted in case of a conflict with "
+"an existing file in the directory."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1065
+#: kio/renamedialog.cpp:133
 msgid ""
-"The CRL's (Certificate Revocation List) signature is invalid. This means "
-"that the CRL can not be verified."
+"When this is checked the button pressed will be applied to all subsequent "
+"conflicts for the remainder of the current job."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1067
-msgid "The certificate is not valid, yet."
-msgstr ""
+#: kio/renamedialog.cpp:138
+msgid "&Rename"
+msgstr "&Ail-enwi"
 
-#: kssl/ksslcertificate.cpp:1069
-msgid "The certificate is not valid, any more."
-msgstr ""
+#: kio/renamedialog.cpp:140
+msgid "Suggest New &Name"
+msgstr "Awgrymu Enw &Newydd"
 
-#: kssl/ksslcertificate.cpp:1071 kssl/ksslcertificate.cpp:1073
-msgid "The CRL (Certificate Revocation List) is not valid, yet."
-msgstr ""
+#: kio/renamedialog.cpp:146
+msgid "&Skip"
+msgstr "&Hepgor"
 
-#: kssl/ksslcertificate.cpp:1075
-msgid "The time format of the certificate's 'notBefore' field is invalid."
+#: kio/renamedialog.cpp:147
+msgid "Do not copy or move this folder, skip to the next item instead"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1077
-msgid "The time format of the certificate's 'notAfter' field is invalid."
+#: kio/renamedialog.cpp:148
+msgid "Do not copy or move this file, skip to the next item instead"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1079
-msgid ""
-"The time format of the CRL's (Certificate Revocation List) 'lastUpdate' "
-"field is invalid."
+#: kio/renamedialog.cpp:153
+msgctxt "Write files into an existing folder"
+msgid "&Write Into"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1081
+#: kio/renamedialog.cpp:153
+msgid "&Overwrite"
+msgstr "&Dros-ysgrifennu"
+
+#: kio/renamedialog.cpp:155
 msgid ""
-"The time format of the CRL's (Certificate Revocation List) 'nextUpdate' "
-"field is invalid."
+"Files and folders will be copied into the existing directory, alongside its "
+"existing contents.\n"
+"You will be prompted again in case of a conflict with an existing file in "
+"the directory."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1083
-msgid "The OpenSSL process ran out of memory."
-msgstr ""
+#: kio/renamedialog.cpp:160
+msgid "&Resume"
+msgstr "Ai&l-ddechrau"
 
-#: kssl/ksslcertificate.cpp:1085
+#: kio/renamedialog.cpp:169
+#, kde-format
 msgid ""
-"The certificate is self-signed and not in the list of trusted certificates. "
-"If you want to accept this certificate, import it into the list of trusted "
-"certificates."
+"This action would overwrite '%1' with itself.\n"
+"Please enter a new file name:"
 msgstr ""
+"Buasai'r gweithrediad yma yn ysgrifennu '%1' dros ei hun.\n"
+"Mewnosodwch enw ffeil newydd:"
 
-#: kssl/ksslcertificate.cpp:1088
-msgid ""
-"The certificate is self-signed. While the trust chain could be built up, the "
-"root CA's (Certificate Authority) certificate can not be found."
-msgstr ""
+#: kio/renamedialog.cpp:173
+msgid "C&ontinue"
+msgstr "&Mynd ymlaen"
 
-#: kssl/ksslcertificate.cpp:1090
-msgid ""
-"The CA's (Certificate Authority) certificate can not be found. Most likely, "
-"your trust chain is broken."
+#: kio/renamedialog.cpp:227
+msgid "This action will overwrite the destination."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1092
-msgid ""
-"The certificate can not be verified as it is the only certificate in the "
-"trust chain and not self-signed. If you self-sign the certificate, make sure "
-"to import it into the list of trusted certificates."
+#: kio/renamedialog.cpp:229
+msgid "Source"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1094
-msgid "The certificate chain is longer than the maximum depth specified."
+#: kio/renamedialog.cpp:230
+msgid "Destination"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1097
-msgid "The certificate has been revoked."
+#: kio/renamedialog.cpp:236
+msgid "Warning, the destination is more recent."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1099
-msgid "The certificate's CA (Certificate Authority) is invalid."
-msgstr ""
+#: kio/renamedialog.cpp:267
+#, kde-format
+msgid "An older item named '%1' already exists."
+msgstr "Mae eitem hyn o'r enw '%1' mewn bod yn barod."
 
-#: kssl/ksslcertificate.cpp:1101
-msgid ""
-"The length of the trust chain exceeded one of the CA's (Certificate "
-"Authority) 'pathlength' parameters, making all subsequent signatures invalid."
-msgstr ""
+#: kio/renamedialog.cpp:269
+#, kde-format
+msgid "A similar file named '%1' already exists."
+msgstr "Mae ffeil tebyg o'r enw '%1' mewn bod yn barod."
 
-#: kssl/ksslcertificate.cpp:1103
-msgid ""
-"The certificate has not been signed for the purpose you tried to use it for. "
-"This means the CA (Certificate Authority) does not allow this usage."
+#: kio/renamedialog.cpp:271
+#, kde-format
+msgid "A more recent item named '%1' already exists."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1106
-msgid ""
-"The root CA (Certificate Authority) is not trusted for the purpose you tried "
-"to use this certificate for."
+#: kio/renamedialog.cpp:282
+msgid "Rename:"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1109
+#: kio/renamedialog.cpp:411 kio/paste.cpp:335 kio/kdirlister.cpp:389
+#: kio/krun.cpp:1133
+#, kde-format
 msgid ""
-"The root CA (Certificate Authority) has been marked to be rejected for the "
-"purpose you tried to use it for."
+"Malformed URL\n"
+"%1"
 msgstr ""
+"URL Annilys \n"
+" %1"
 
-#: kssl/ksslcertificate.cpp:1111
-msgid ""
-"The certificate's CA (Certificate Authority) does not match the CA name of "
-"the certificate."
-msgstr ""
+#: kio/slavebase.cpp:1331 kio/global.cpp:1094
+msgid "Unknown Error"
+msgstr "Gwall Anhysbys"
 
-#: kssl/ksslcertificate.cpp:1113
-msgid ""
-"The CA (Certificate Authority) certificate's key ID does not match the key "
-"ID in the 'Issuer' section of the certificate you are trying to use."
+#: kio/paste.cpp:98 kio/paste.cpp:191
+msgid "Filename for clipboard content:"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1115
-msgid ""
-"The CA (Certificate Authority) certificate's key ID and name do not match "
-"the key ID and name in the 'Issuer' section of the certificate you are "
-"trying to use."
-msgstr ""
+#: kio/paste.cpp:116 kio/job.cpp:2218 kio/global.cpp:669 kio/copyjob.cpp:1375
+#: kio/copyjob.cpp:1957
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
 
-#: kssl/ksslcertificate.cpp:1117
+#: kio/paste.cpp:184
+#, kde-format
+msgid "%1 (%2)"
+msgstr "%1(%2)"
+
+#: kio/paste.cpp:200
 msgid ""
-"The certificate's CA (Certificate Authority) is not allowed to sign "
-"certificates."
+"The clipboard has changed since you used 'paste': the chosen data format is "
+"no longer applicable. Please copy again what you wanted to paste."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1119
-msgid "OpenSSL could not be verified."
+#: kio/paste.cpp:275
+msgid "The clipboard is empty"
+msgstr "Mae'r gludfwrdd yn wag"
+
+#: kio/paste.cpp:387
+#, kde-format
+msgid "&Paste File"
+msgid_plural "&Paste %1 Files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kio/paste.cpp:389
+#, kde-format
+msgid "&Paste URL"
+msgid_plural "&Paste %1 URLs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kio/paste.cpp:391
+msgid "&Paste Clipboard Contents"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1124
+#: kio/kdirlister.cpp:399
+#, kde-format
 msgid ""
-"The signature test for this certificate failed. This could mean that the "
-"signature of this certificate or any in its trust path are invalid, could "
-"not be decoded or that the CRL (Certificate Revocation List) could not be "
-"verified. If you see this message, please let the author of the software you "
-"are using know that he or she should use the new, more specific error "
-"messages."
+"URL cannot be listed\n"
+"%1"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1126
-msgid ""
-"This certificate, any in its trust path or its CA's (Certificate Authority) "
-"CRL (Certificate Revocation List) is not valid. Any of them could not be "
-"valid yet or not valid any more. If you see this message, please let the "
-"author of the software you are using know that he or she should use the new, "
-"more specific error messages."
+#: kio/accessmanager.cpp:234
+msgid "Blocked request."
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1132
-msgid ""
-"Certificate signing authority root files could not be found so the "
-"certificate is not verified."
+#: kio/accessmanager.cpp:296
+msgid "Unknown HTTP verb."
 msgstr ""
-"Ni ellid canfod ffeiliau gwraidd i'r awdurdod llofnodi tystysgrifau, felly "
-"ni wirir y tystysgrif."
 
-#: kssl/ksslcertificate.cpp:1134
-msgid "SSL support was not found."
-msgstr "Ni chanfuwyd cynnal SSL."
+#: kio/kemailsettings.cpp:251 kio/kemailsettings.cpp:254
+#: kio/kemailsettings.cpp:261
+msgid "Default"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:1136
-msgid "Private key test failed."
-msgstr "Methodd arbrawf yr allwedd breifat."
+#: kio/kfileitem.cpp:1094
+#, kde-format
+msgid "(Symbolic Link to %1)"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:1138
-msgid "The certificate has not been issued for this host."
-msgstr "Ni chyhoeddwyd y tystysgrif am y gwesteiwr yma."
+#: kio/kfileitem.cpp:1096
+#, kde-format
+msgid "(%1, Link to %2)"
+msgstr ""
 
-#: kssl/ksslcertificate.cpp:1140
-msgid "This certificate is not relevant."
+#: kio/kfileitem.cpp:1100
+#, kde-format
+msgid " (Points to %1)"
 msgstr ""
 
-#: kssl/ksslcertificate.cpp:1145
-msgid "The certificate is invalid."
-msgstr "Mae'r dystysgrif yn annilys."
+#: kio/kfileitem.cpp:1129 ../kioslave/http/kcookiejar/kcookiewin.cpp:205
+msgid "Name:"
+msgstr "Enw:"
 
-#: kssl/ksslinfodialog.cpp:73 kssl/ksslkeygen.cpp:125
-msgid "KDE SSL Information"
-msgstr "Gwybodaeth SSL KDE"
+#: kio/kfileitem.cpp:1130 kfile/kpropertiesdialog.cpp:947
+msgid "Type:"
+msgstr "Math:"
 
-#: kssl/ksslinfodialog.cpp:81
-msgctxt "The receiver of the SSL certificate"
-msgid "Subject"
+#: kio/kfileitem.cpp:1134
+#, kde-format
+msgid "Link to %1 (%2)"
 msgstr ""
 
-#: kssl/ksslinfodialog.cpp:82
-msgctxt "The authority that issued the SSL certificate"
-msgid "Issuer"
-msgstr ""
+#: kio/kfileitem.cpp:1139 kfile/kpropertiesdialog.cpp:998
+msgid "Size:"
+msgstr "Maint:"
 
-#: kssl/ksslinfodialog.cpp:92 kssl/ksslinfodialog.cpp:137
-msgid "Current connection is secured with SSL."
-msgstr "Diogelir y cysylltiad cyfredol gan SSL."
+#: kio/kfileitem.cpp:1143 kfile/kpropertiesdialog.cpp:1059
+msgid "Modified:"
+msgstr "Newidwyd:"
 
-#: kssl/ksslinfodialog.cpp:95 kssl/ksslinfodialog.cpp:150
-msgid "Current connection is not secured with SSL."
-msgstr "Ni ddiogelir y cysylltiad cyfredol gan SSL."
+#: kio/kfileitem.cpp:1146
+msgid "Owner:"
+msgstr "Perchennog:"
 
-#: kssl/ksslinfodialog.cpp:99
-msgid "SSL support is not available in this build of KDE."
-msgstr "Nid yw cynnal SSL ar gael yn yr adeiladaeth yma o KDE."
+#: kio/kfileitem.cpp:1147
+msgid "Permissions:"
+msgstr "Caniatadau"
 
-#: kssl/ksslinfodialog.cpp:140
-msgid ""
-"The main part of this document is secured with SSL, but some parts are not."
+#: kio/slavebase.h:266 kio/slavebase.h:286
+msgid "&Yes"
 msgstr ""
-"Mae prif ddarn y ddogfen yma yn cael ei diogelu gan SSL, ond mae rhai "
-"ddarnau heb."
 
-#: kssl/ksslinfodialog.cpp:146
-msgid "Some of this document is secured with SSL, but the main part is not."
+#: kio/slavebase.h:267 kio/slavebase.h:287
+msgid "&No"
 msgstr ""
 
-#: kssl/ksslinfodialog.cpp:195
+#: kio/pastedialog.cpp:55
+msgid "Data format:"
+msgstr "Fformat data :"
+
+#: kio/slave.cpp:438
 #, kde-format
-msgctxt "Part of: %1, using %2 bits of a %3 bit key"
-msgid "using %1 bit"
-msgid_plural "using %1 bits"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unknown protocol '%1'."
+msgstr ""
 
-#: kssl/ksslinfodialog.cpp:197
+#: kio/slave.cpp:447
 #, kde-format
-msgctxt "Part of: %1, using %2 bits of a %3 bit key"
-msgid "of a %1 bit key"
-msgid_plural "of a %1 bit key"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Can not find io-slave for protocol '%1'."
+msgstr "Methu canfod gwas-io i brotocol '%1'."
 
-#: kssl/ksslinfodialog.cpp:193
+#: kio/slave.cpp:466
 #, kde-format
-msgctxt "%1, using %2 bits of a %3 bit key"
-msgid "%1, %2 %3"
+msgid "Cannot talk to klauncher: %1"
 msgstr ""
 
-#: kssl/ksslinfodialog.cpp:214
-msgctxt "The certificate is not trusted"
-msgid "NO, there were errors:"
+#: kio/slave.cpp:474
+#, kde-format
+msgid ""
+"Unable to create io-slave:\n"
+"klauncher said: %1"
 msgstr ""
+"Methu creu gwas-io:\n"
+" dywedodd klauncher: %1"
 
-#: kssl/ksslinfodialog.cpp:221
-msgctxt "The certificate is trusted"
-msgid "Yes"
+#: kio/fileundomanager.cpp:116
+msgid "Creating directory"
 msgstr ""
 
-#: kssl/ksslinfodialog.cpp:225 kssl/kcm/displaycertdialog.cpp:54
-#, kde-format
-msgctxt "%1 is the effective date of the certificate, %2 is the expiry date"
-msgid "%1 to %2"
+#: kio/fileundomanager.cpp:117 kio/job.cpp:140
+msgid "Directory"
 msgstr ""
 
-#: kssl/ksslutils.cpp:78
-msgid "GMT"
-msgstr "GMT"
-
-#: kssl/ksslpemcallback.cpp:37
-msgid "Certificate password"
-msgstr "Cyfrinair tystysgrif"
+#: kio/fileundomanager.cpp:119
+msgid "Moving"
+msgstr ""
 
-#: kssl/kcm/kcmssl.cpp:40
-msgid "SSL Configuration Module"
+#: kio/fileundomanager.cpp:120 kio/job.cpp:126 kio/job.cpp:133 kio/job.cpp:158
+msgctxt "The source of a file operation"
+msgid "Source"
 msgstr ""
 
-#: kssl/kcm/kcmssl.cpp:42
-msgid "Copyright 2010 Andreas Hartmetz"
+#: kio/fileundomanager.cpp:121 kio/job.cpp:127 kio/job.cpp:134
+msgctxt "The destination of a file operation"
+msgid "Destination"
 msgstr ""
 
-#: kssl/kcm/kcmssl.cpp:43
-msgid "Andreas Hartmetz"
+#: kio/fileundomanager.cpp:123
+msgid "Deleting"
 msgstr ""
 
-#: kssl/kcm/kcmssl.cpp:55
-msgid "SSL Signers"
+#: kio/fileundomanager.cpp:124 kio/job.cpp:146 kio/job.cpp:152
+msgid "File"
 msgstr ""
 
-#: kssl/kcm/cacertificatespage.cpp:130
-msgid "System certificates"
+#: kio/fileundomanager.cpp:285
+msgid "Und&o"
 msgstr ""
 
-#: kssl/kcm/cacertificatespage.cpp:137
-msgid "User-added certificates"
+#: kio/fileundomanager.cpp:290
+msgid "Und&o: Copy"
 msgstr ""
 
-#: kssl/kcm/cacertificatespage.cpp:294
-msgid "Pick Certificates"
+#: kio/fileundomanager.cpp:292
+msgid "Und&o: Link"
 msgstr ""
 
-#: kssl/sslui.cpp:52
-msgid ""
-"The remote host did not send any SSL certificates.\n"
-"Aborting because the identity of the host cannot be established."
+#: kio/fileundomanager.cpp:294
+msgid "Und&o: Move"
 msgstr ""
 
-#: kio/tcpslavebase.cpp:827 kssl/sslui.cpp:71
-#, kde-format
-msgid ""
-"The server failed the authenticity check (%1).\n"
-"\n"
+#: kio/fileundomanager.cpp:296
+msgid "Und&o: Rename"
 msgstr ""
 
-#: kio/tcpslavebase.cpp:837 kio/tcpslavebase.cpp:854 kio/tcpslavebase.cpp:956
-#: kio/tcpslavebase.cpp:968 kssl/sslui.cpp:80 kssl/sslui.cpp:119
-msgid "Server Authentication"
-msgstr "Dilysiant Gweinydd"
+#: kio/fileundomanager.cpp:298
+msgid "Und&o: Trash"
+msgstr ""
 
-#: kio/slaveinterface.cpp:416 kio/tcpslavebase.cpp:838 kssl/sslui.cpp:81
-msgid "&Details"
-msgstr "&Manylion"
+#: kio/fileundomanager.cpp:300
+msgid "Und&o: Create Folder"
+msgstr ""
 
-#: kio/slaveinterface.cpp:423 kio/tcpslavebase.cpp:838 kssl/sslui.cpp:82
-msgid "Co&ntinue"
-msgstr "Par&hau"
+#: kio/fileundomanager.cpp:302
+msgid "Und&o: Create File"
+msgstr ""
 
-#: kio/tcpslavebase.cpp:851 kssl/sslui.cpp:116
+#: kio/fileundomanager.cpp:771
+#, kde-format
 msgid ""
-"Would you like to accept this certificate forever without being prompted?"
-msgstr "Liciwch chi dderbyn y tystysgrif yma am byth heb gofweini arnoch?"
-
-#: kio/slaveinterface.cpp:418 kio/tcpslavebase.cpp:855 kssl/sslui.cpp:120
-msgid "&Forever"
-msgstr "&Am Byth"
-
-#: kio/slaveinterface.cpp:425 kio/tcpslavebase.cpp:856 kssl/sslui.cpp:121
-msgid "&Current Session only"
+"The file %1 was copied from %2, but since then it has apparently been "
+"modified at %3.\n"
+"Undoing the copy will delete the file, and all modifications will be lost.\n"
+"Are you sure you want to delete %4?"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:83
-msgid "KDE Certificate Request"
-msgstr "Cais Tystysgrif KDE"
-
-#: kssl/ksslkeygen.cpp:90
-msgid "KDE Certificate Request - Password"
-msgstr "Cais Tystysgrif KDE - Cyfrinair"
-
-#: kssl/ksslkeygen.cpp:125
-msgid "Unsupported key size."
+#: kio/fileundomanager.cpp:774
+msgid "Undo File Copy Confirmation"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:131
-msgid "KDE"
-msgstr "KDE"
-
-#: kssl/ksslkeygen.cpp:132
-msgid "Please wait while the encryption keys are generated..."
+#: kio/kdirmodel.cpp:998
+msgctxt "@title:column"
+msgid "Name"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:145
-msgid "Do you wish to store the passphrase in your wallet file?"
+#: kio/kdirmodel.cpp:1000
+msgctxt "@title:column"
+msgid "Size"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:145
-msgid "Store"
+#: kio/kdirmodel.cpp:1002
+msgctxt "@title:column"
+msgid "Date"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:145
-msgid "Do Not Store"
+#: kio/kdirmodel.cpp:1004
+msgctxt "@title:column"
+msgid "Permissions"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:261
-msgid "2048 (High Grade)"
+#: kio/kdirmodel.cpp:1006
+msgctxt "@title:column"
+msgid "Owner"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:262
-msgid "1024 (Medium Grade)"
+#: kio/kdirmodel.cpp:1008
+msgctxt "@title:column"
+msgid "Group"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:263
-msgid "768  (Low Grade)"
+#: kio/kdirmodel.cpp:1010
+msgctxt "@title:column"
+msgid "Type"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:264
-msgid "512  (Low Grade)"
+#: kio/chmodjob.cpp:212
+#, kde-format
+msgid ""
+"<qt>Could not modify the ownership of file <b>%1</b>. You have insufficient "
+"access to the file to perform the change.</qt>"
 msgstr ""
 
-#: kssl/ksslkeygen.cpp:266
-msgid "No SSL support."
-msgstr "Ni chynhelir SSL."
+#: kio/chmodjob.cpp:212
+msgid "&Skip File"
+msgstr ""
 
-#: kssl/ksslcertdialog.cpp:61
-msgid "Certificate"
-msgstr "Tystysgrif"
+#: kio/job.cpp:125
+msgctxt "@title job"
+msgid "Moving"
+msgstr ""
 
-#: kssl/ksslcertdialog.cpp:69
-msgid "Save selection for this host."
-msgstr "Cadw dewisiad am y gwesteiwr yma."
+#: kio/job.cpp:132
+msgctxt "@title job"
+msgid "Copying"
+msgstr ""
 
-#: kssl/ksslcertdialog.cpp:78
-msgid "Send certificate"
-msgstr "Anfon tystysgrif..."
+#: kio/job.cpp:139
+msgctxt "@title job"
+msgid "Creating directory"
+msgstr ""
 
-#: kssl/ksslcertdialog.cpp:82
-msgid "Do not send a certificate"
-msgstr "Peidio ag anfon tystysgrif"
+#: kio/job.cpp:145
+msgctxt "@title job"
+msgid "Deleting"
+msgstr ""
 
-#: kssl/ksslcertdialog.cpp:87
-msgid "KDE SSL Certificate Dialog"
-msgstr "Ymgom Tystysgrif SSL KDE"
+#: kio/job.cpp:151
+msgctxt "@title job"
+msgid "Examining"
+msgstr ""
+
+#: kio/job.cpp:157
+msgctxt "@title job"
+msgid "Transferring"
+msgstr ""
+
+#: kio/job.cpp:163
+msgctxt "@title job"
+msgid "Mounting"
+msgstr ""
+
+#: kio/job.cpp:164
+msgid "Device"
+msgstr ""
+
+#: kio/job.cpp:165 kio/job.cpp:171
+msgid "Mountpoint"
+msgstr ""
+
+#: kio/job.cpp:170
+msgctxt "@title job"
+msgid "Unmounting"
+msgstr ""
+
+#: kio/job.cpp:2322
+msgid "'Put' job did not send canResume or 'Get' job did not send data!"
+msgstr ""
 
-#: kssl/ksslcertdialog.cpp:144
+#: kio/kdbusservicestarter.cpp:75
 #, kde-format
+msgid "No service implementing %1"
+msgstr "Nid oes gwasanaeth sy'n gweithredu %1"
+
+#: kio/jobuidelegate.cpp:149 ../kfile/kdiroperator.cpp:812
+#, kde-format
+msgid "Do you really want to delete this item?"
+msgid_plural "Do you really want to delete these %1 items?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kio/jobuidelegate.cpp:151 ../kfile/kdiroperator.cpp:814
+msgid "Delete Files"
+msgstr "Dileu Ffeiliau"
+
+#: kio/jobuidelegate.cpp:159
+msgctxt "@info"
 msgid ""
-"The server <b>%1</b> requests a certificate.<br /><br />Select a certificate "
-"to use from the list below:"
+"Do you want to permanently delete all items from Trash? This action cannot "
+"be undone."
+msgstr ""
+
+#: kio/jobuidelegate.cpp:161 ../kfile/kfileplacesview.cpp:640
+msgctxt "@action:button"
+msgid "Empty Trash"
+msgstr ""
+
+#: kio/jobuidelegate.cpp:170
+#, kde-format
+msgid "Do you really want to move this item to the trash?"
+msgid_plural "Do you really want to move these %1 items to the trash?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kio/jobuidelegate.cpp:172 ../kfile/kdiroperator.cpp:1874
+msgid "Move to Trash"
+msgstr "Symud i'r Sbwriel"
+
+#: kio/jobuidelegate.cpp:173
+msgctxt "Verb"
+msgid "&Trash"
+msgstr ""
+
+#: kio/kmimetypechooser.cpp:82
+msgid "Mime Type"
+msgstr "Math MIME"
+
+#: kio/kmimetypechooser.cpp:86
+msgid "Comment"
+msgstr "Esboniad"
+
+#: kio/kmimetypechooser.cpp:90
+msgid "Patterns"
+msgstr "Patrymau"
+
+#: kio/kmimetypechooser.cpp:103
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#: kio/kmimetypechooser.cpp:113
+msgid "Click this button to display the familiar KDE mime type editor."
+msgstr ""
+
+#: kio/tcpslavebase.cpp:328
+msgid ""
+"You are about to leave secure mode. Transmissions will no longer be "
+"encrypted.\n"
+"This means that a third party could observe your data in transit."
+msgstr ""
+"Rydych ar fin gadael modd diogel. Ni fydd trosglwyddiadau yn cael eu "
+"amgryptio. \n"
+"Golygir hwn y gallai trydydd blaid wylio eich data ar y daith."
+
+#: kio/tcpslavebase.cpp:334 kio/tcpslavebase.cpp:609
+msgid "Security Information"
+msgstr "Gwybodaeth Ddiogelwch"
+
+#: kio/tcpslavebase.cpp:335
+msgid "C&ontinue Loading"
+msgstr ""
+
+#: kio/tcpslavebase.cpp:391
+#, kde-format
+msgctxt "%1 is a host name"
+msgid "%1: SSL negotiation failed"
+msgstr ""
+
+#: kio/tcpslavebase.cpp:603
+msgid ""
+"You are about to enter secure mode. All transmissions will be encrypted "
+"unless otherwise noted.\n"
+"This means that no third party will be able to easily observe your data in "
+"transit."
+msgstr ""
+"Rydych ar fin mynd i mewn i modd diogel. Bydd pob trosglwyddiad yn cael ei "
+"amgriptio onibai i chi glywed yn wahanol. \n"
+"Golygir hyn na allai trydydd blaid wylio eich data yn hawdd ar y daith."
+
+#: kio/tcpslavebase.cpp:610
+msgid "Display SSL &Information"
+msgstr ""
+
+#: kio/tcpslavebase.cpp:611
+msgid "C&onnect"
+msgstr "C&ysylltu"
+
+#: kio/tcpslavebase.cpp:747
+msgid "Enter the certificate password:"
+msgstr "Mewnosodwch cyfrinair y tystysgrif:"
+
+#: kio/tcpslavebase.cpp:748
+msgid "SSL Certificate Password"
+msgstr "Cyfrinair Tystysgrif SSL"
+
+#: kio/tcpslavebase.cpp:761
+msgid "Unable to open the certificate. Try a new password?"
+msgstr "Methu agor y tystysgrif.  Ceisio cyfrinair newydd?"
+
+#: kio/tcpslavebase.cpp:774
+msgid "The procedure to set the client certificate for the session failed."
+msgstr "Methodd y weithdrefn i osod y tystysgrif cleient i'r sesiwn."
+
+#: kio/tcpslavebase.cpp:776 kio/slaveinterface.cpp:485
+msgid "SSL"
+msgstr "SSL"
+
+#: kio/tcpslavebase.cpp:820 kssl/sslui.cpp:71
+#, kde-format
+msgid ""
+"The server failed the authenticity check (%1).\n"
+"\n"
+msgstr ""
+
+#: kio/tcpslavebase.cpp:830 kio/tcpslavebase.cpp:847 kio/tcpslavebase.cpp:949
+#: kio/tcpslavebase.cpp:961 kssl/sslui.cpp:80 kssl/sslui.cpp:119
+msgid "Server Authentication"
+msgstr "Dilysiant Gweinydd"
+
+#: kio/tcpslavebase.cpp:831 kio/slaveinterface.cpp:415 kssl/sslui.cpp:81
+msgid "&Details"
+msgstr "&Manylion"
+
+#: kio/tcpslavebase.cpp:831 kio/slaveinterface.cpp:422 kssl/sslui.cpp:82
+msgid "Co&ntinue"
+msgstr "Par&hau"
+
+#: kio/tcpslavebase.cpp:844 kssl/sslui.cpp:116
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr "Liciwch chi dderbyn y tystysgrif yma am byth heb gofweini arnoch?"
+
+#: kio/tcpslavebase.cpp:848 kio/slaveinterface.cpp:417 kssl/sslui.cpp:120
+msgid "&Forever"
+msgstr "&Am Byth"
+
+#: kio/tcpslavebase.cpp:849 kio/slaveinterface.cpp:424 kssl/sslui.cpp:121
+msgid "&Current Session only"
+msgstr ""
+
+#: kio/tcpslavebase.cpp:948
+msgid ""
+"You have indicated that you wish to accept this certificate, but it is not "
+"issued to the server who is presenting it. Do you wish to continue loading?"
+msgstr ""
+"Rydych wedi mynegi yr ydych eisiau derbyn y tystysgrif yma, ond nid yw wedi "
+"ei gyhoeddi i'r gweinydd sy'n ei gyflwyno.  Ydych eisiau dal i lwytho?"
+
+#: kio/tcpslavebase.cpp:960
+msgid ""
+"SSL certificate is being rejected as requested. You can disable this in the "
+"KDE System Settings."
+msgstr ""
+
+#: kio/kstatusbarofflineindicator.cpp:52
+msgid "The desktop is offline"
 msgstr ""
 
 #: kio/global.cpp:89
@@ -944,7 +1148,7 @@
 "The required content size information was not provided for a POST operation."
 msgstr ""
 
-#: kio/global.cpp:366
+#: kio/global.cpp:369
 #, kde-format
 msgid ""
 "Unknown error code %1\n"
@@ -955,154 +1159,154 @@
 " %2\n"
 " Anfonwch adroddiad nam llawn i http://bugs.kde.org."
 
-#: kio/global.cpp:376
+#: kio/global.cpp:379
 #, kde-format
 msgid "Opening connections is not supported with the protocol %1."
 msgstr ""
 
-#: kio/global.cpp:378
+#: kio/global.cpp:381
 #, kde-format
 msgid "Closing connections is not supported with the protocol %1."
 msgstr ""
 
-#: kio/global.cpp:380
+#: kio/global.cpp:383
 #, kde-format
 msgid "Accessing files is not supported with the protocol %1."
 msgstr ""
 
-#: kio/global.cpp:382
+#: kio/global.cpp:385
 #, kde-format
 msgid "Writing to %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:384
+#: kio/global.cpp:387
 #, kde-format
 msgid "There are no special actions available for protocol %1."
 msgstr ""
 
-#: kio/global.cpp:386
+#: kio/global.cpp:389
 #, kde-format
 msgid "Listing folders is not supported for protocol %1."
 msgstr ""
 
-#: kio/global.cpp:388
+#: kio/global.cpp:391
 #, kde-format
 msgid "Retrieving data from %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:390
+#: kio/global.cpp:393
 #, kde-format
 msgid "Retrieving mime type information from %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:392
+#: kio/global.cpp:395
 #, kde-format
 msgid "Renaming or moving files within %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:394
+#: kio/global.cpp:397
 #, kde-format
 msgid "Creating symlinks is not supported with protocol %1."
 msgstr ""
 
-#: kio/global.cpp:396
+#: kio/global.cpp:399
 #, kde-format
 msgid "Copying files within %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:398
+#: kio/global.cpp:401
 #, kde-format
 msgid "Deleting files from %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:400
+#: kio/global.cpp:403
 #, kde-format
 msgid "Creating folders is not supported with protocol %1."
 msgstr ""
 
-#: kio/global.cpp:402
+#: kio/global.cpp:405
 #, kde-format
 msgid "Changing the attributes of files is not supported with protocol %1."
 msgstr ""
 
-#: kio/global.cpp:404
+#: kio/global.cpp:407
 #, kde-format
 msgid "Changing the ownership of files is not supported with protocol %1."
 msgstr ""
 
-#: kio/global.cpp:406
+#: kio/global.cpp:409
 #, kde-format
 msgid "Using sub-URLs with %1 is not supported."
 msgstr ""
 
-#: kio/global.cpp:408
+#: kio/global.cpp:411
 #, kde-format
 msgid "Multiple get is not supported with protocol %1."
 msgstr ""
 
-#: kio/global.cpp:410
+#: kio/global.cpp:413
 #, kde-format
 msgid "Opening files is not supported with protocol %1."
 msgstr ""
 
-#: kio/global.cpp:412
+#: kio/global.cpp:415
 #, kde-format
 msgid "Protocol %1 does not support action %2."
 msgstr ""
 
-#: kio/global.cpp:432
+#: kio/global.cpp:435
 msgctxt "@info url"
 msgid "(unknown)"
 msgstr ""
 
-#: kio/global.cpp:440
+#: kio/global.cpp:443
 #, kde-format
 msgctxt "@info %1 error name, %2 description"
 msgid "<qt><p><b>%1</b></p><p>%2</p></qt>"
 msgstr ""
 
-#: kio/global.cpp:444
+#: kio/global.cpp:447
 msgid "<b>Technical reason</b>: "
 msgstr "<b>Rheswm technegol</b>: "
 
-#: kio/global.cpp:446
+#: kio/global.cpp:449
 msgid "<b>Details of the request</b>:"
 msgstr ""
 
-#: kio/global.cpp:447
+#: kio/global.cpp:450
 #, kde-format
 msgid "<li>URL: %1</li>"
 msgstr ""
 
-#: kio/global.cpp:449
+#: kio/global.cpp:452
 #, kde-format
 msgid "<li>Protocol: %1</li>"
 msgstr "<li>Protocol: %1</li>"
 
-#: kio/global.cpp:451
+#: kio/global.cpp:454
 #, kde-format
 msgid "<li>Date and time: %1</li>"
 msgstr "<li>Dyddiad ac Amser: %1</li>"
 
-#: kio/global.cpp:452
+#: kio/global.cpp:455
 #, kde-format
 msgid "<li>Additional information: %1</li>"
 msgstr ""
 
-#: kio/global.cpp:455
+#: kio/global.cpp:458
 msgid "<b>Possible causes</b>:"
 msgstr ""
 
-#: kio/global.cpp:460
+#: kio/global.cpp:463
 msgid "<b>Possible solutions</b>:"
 msgstr ""
 
-#: kio/global.cpp:493
+#: kio/global.cpp:496
 msgctxt "@info protocol"
 msgid "(unknown)"
 msgstr ""
 
-#: kio/global.cpp:503
+#: kio/global.cpp:506
 msgid ""
 "Contact your appropriate computer support system, whether the system "
 "administrator, or technical support group for further assistance."
@@ -1110,15 +1314,15 @@
 "Cysylltwch â'ch cysawd cynnal cyfrifiadur addas (ai'r gwasanaethwr cysawd, "
 "neu'r grw^p cynnal technegol) am fwy o gymorth."
 
-#: kio/global.cpp:506
+#: kio/global.cpp:509
 msgid "Contact the administrator of the server for further assistance."
 msgstr "Cysylltwch â gwasanaethwr y gweinydd am fwy o gymorth."
 
-#: kio/global.cpp:509
+#: kio/global.cpp:512
 msgid "Check your access permissions on this resource."
 msgstr "Cywirwch eich caniatadau cyrch ar yr adnodd yma."
 
-#: kio/global.cpp:510
+#: kio/global.cpp:513
 msgid ""
 "Your access permissions may be inadequate to perform the requested operation "
 "on this resource."
@@ -1126,14 +1330,14 @@
 "Efallai bod eich caniatadau cyrch yn annigonol i gyflawni'r gweithrediad a "
 "gofynwyd ar yr adnodd yma."
 
-#: kio/global.cpp:512
+#: kio/global.cpp:515
 msgid ""
 "The file may be in use (and thus locked) by another user or application."
 msgstr ""
 "Efallai y defnyddir y ffeil gan ddefnyddiwr neu cymhwysiad arall - felly mae "
 "o ar glo."
 
-#: kio/global.cpp:514
+#: kio/global.cpp:517
 msgid ""
 "Check to make sure that no other application or user is using the file or "
 "has locked the file."
@@ -1141,15 +1345,15 @@
 "Cywirwch i sicrhau nad yw cymhwysiad neu ddefnyddiwr arall yn defnyddio'r "
 "ffeil, neu wedi cloi'r ffeil."
 
-#: kio/global.cpp:516
+#: kio/global.cpp:519
 msgid "Although unlikely, a hardware error may have occurred."
 msgstr "Er annhebygol, efallai bod gwall caletwedd wedi digwydd."
 
-#: kio/global.cpp:518
+#: kio/global.cpp:521
 msgid "You may have encountered a bug in the program."
 msgstr "Efallai eich bod wedi cyfarfod nam yn y rhaglen."
 
-#: kio/global.cpp:519
+#: kio/global.cpp:522
 msgid ""
 "This is most likely to be caused by a bug in the program. Please consider "
 "submitting a full bug report as detailed below."
@@ -1157,7 +1361,7 @@
 "Mae'n eitha debyg yr achosir hynny gan nam yn y rhaglen.  Ystyriedwch "
 "gyflwyno adroddiad nam llawn fel yn y manylion isod."
 
-#: kio/global.cpp:521
+#: kio/global.cpp:524
 msgid ""
 "Update your software to the latest version. Your distribution should provide "
 "tools to update your software."
@@ -1165,7 +1369,7 @@
 "Diweddarwch eich meddalwedd i'r fersiwn diweddaraf.  Mae'n debyg y mae eich "
 "dosbarthiad yn darparu offer i ddiweddaru eich meddalwedd."
 
-#: kio/global.cpp:523
+#: kio/global.cpp:526
 msgid ""
 "When all else fails, please consider helping the KDE team or the third party "
 "maintainer of this software by submitting a high quality bug report. If the "
@@ -1184,11 +1388,11 @@
 "y manylion uchod, a'u cynnwys yn eich adroddiad nam, efo cymaint o fanylion "
 "eraill ac y meddyliwch bydd o gymorth."
 
-#: kio/global.cpp:531
+#: kio/global.cpp:534
 msgid "There may have been a problem with your network connection."
 msgstr "Efallai yr oedd problem efo'ch cysylltiad rhwydwaith."
 
-#: kio/global.cpp:534
+#: kio/global.cpp:537
 msgid ""
 "There may have been a problem with your network configuration. If you have "
 "been accessing the Internet with no problems recently, this is unlikely."
@@ -1196,7 +1400,7 @@
 "Efallai yr oedd problem efo'ch ffurfweddiad rhwydwaith.  Os ydych wedi bod "
 "yn cyrchu'r Rhyngrwyd yn ddiweddar heb broblemau, mae hynny'n annhebyg."
 
-#: kio/global.cpp:537
+#: kio/global.cpp:540
 msgid ""
 "There may have been a problem at some point along the network path between "
 "the server and this computer."
@@ -1204,41 +1408,41 @@
 "Efallai yr oedd problem rhywle ar y llwybr rhwydwaith rhwng y gweinydd a'r "
 "cyfrifiadur yma."
 
-#: kio/global.cpp:539
+#: kio/global.cpp:542
 msgid "Try again, either now or at a later time."
 msgstr "Ceisiwch eto, un ai rwan neu yn hwyrach."
 
-#: kio/global.cpp:540
+#: kio/global.cpp:543
 msgid "A protocol error or incompatibility may have occurred."
 msgstr "Effallai y ddigwyddodd gwall protocol neu anghydnawsedd."
 
-#: kio/global.cpp:541
+#: kio/global.cpp:544
 msgid "Ensure that the resource exists, and try again."
 msgstr "Sicrhewch fod yr adnodd mewn bod, a ceisiwch eto."
 
-#: kio/global.cpp:542
+#: kio/global.cpp:545
 msgid "The specified resource may not exist."
 msgstr "Efallai nad yw'r adnodd penodol mewn bod."
 
-#: kio/global.cpp:543
+#: kio/global.cpp:546
 msgid "You may have incorrectly typed the location."
 msgstr "Efallai yr ydych wedi cam-deipio'r lleoliad."
 
-#: kio/global.cpp:544
+#: kio/global.cpp:547
 msgid ""
 "Double-check that you have entered the correct location and try again."
 msgstr ""
 "Sicrhewch yn ofalus yr ydych wedi mewnosod y lleoliad cywir a ceisiwch eto."
 
-#: kio/global.cpp:546
+#: kio/global.cpp:549
 msgid "Check your network connection status."
 msgstr "Cywirwch statws eich cysylltiad rhwydwaith."
 
-#: kio/global.cpp:550
+#: kio/global.cpp:553
 msgid "Cannot Open Resource For Reading"
 msgstr "Methu Agor Adnodd i'w Ddarllen"
 
-#: kio/global.cpp:551
+#: kio/global.cpp:554
 #, kde-format
 msgid ""
 "This means that the contents of the requested file or folder "
@@ -1249,16 +1453,16 @@
 "blygell<strong>%1</strong> a ofynwyd amdano, gan ni ellid cael cyrchiad "
 "darllen."
 
-#: kio/global.cpp:554
+#: kio/global.cpp:557
 msgid "You may not have permissions to read the file or open the folder."
 msgstr ""
 "Efallai nid oes ganddoch ganiatadau i ddarllen y ffeil neu agor y plygell."
 
-#: kio/global.cpp:560
+#: kio/global.cpp:563
 msgid "Cannot Open Resource For Writing"
 msgstr "Methu Agor Adnodd i Ysgrifennu."
 
-#: kio/global.cpp:561
+#: kio/global.cpp:564
 #, kde-format
 msgid ""
 "This means that the file, <strong>%1</strong>, could not be written to as "
@@ -1267,16 +1471,16 @@
 "Golygir hwn nad oedd yn bosib ysgrifennu at y ffeil, <strong>%1</strong>, a "
 "ofynwyd amdano, gan ni ellid cael cyrchiad ysgrifennu."
 
-#: kio/global.cpp:569
+#: kio/global.cpp:572
 #, kde-format
 msgid "Cannot Initiate the %1 Protocol"
 msgstr "Methu Cychwyn y protocol %1"
 
-#: kio/global.cpp:570
+#: kio/global.cpp:573
 msgid "Unable to Launch Process"
 msgstr "Methu Lansio Proses"
 
-#: kio/global.cpp:571
+#: kio/global.cpp:574
 #, kde-format
 msgid ""
 "The program on your computer which provides access to the "
@@ -1287,7 +1491,7 @@
 "protocol <strong>%1</strong>.  Fel arfer, mae hynny o achos rhesymau "
 "technegol."
 
-#: kio/global.cpp:574
+#: kio/global.cpp:577
 msgid ""
 "The program which provides compatibility with this protocol may not have "
 "been updated with your last update of KDE. This can cause the program to be "
@@ -1297,11 +1501,11 @@
 "diweddaru efo'ch diweddariad diwetha o KDE.  Gall hynny achosi'r rhaglen i "
 "fod yn anghytu^n efo'r fersiwn cyfredol, ac felly ni fydd hi'n cychwyn."
 
-#: kio/global.cpp:582
+#: kio/global.cpp:585
 msgid "Internal Error"
 msgstr "Gwall Mewnol"
 
-#: kio/global.cpp:583
+#: kio/global.cpp:586
 #, kde-format
 msgid ""
 "The program on your computer which provides access to the "
@@ -1310,11 +1514,11 @@
 "Mae'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> wedi adrodd gwall mewnol."
 
-#: kio/global.cpp:591
+#: kio/global.cpp:594
 msgid "Improperly Formatted URL"
 msgstr "URL heb ei Fformatio yn Ddilys"
 
-#: kio/global.cpp:592
+#: kio/global.cpp:595
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource "
 "<strong>L</strong>ocator (URL) that you entered was not properly formatted. "
@@ -1328,12 +1532,12 @@
 "<blockquote><strong>protocol://user@password:www.example.org:port/directory/f"
 "ilename.extension?query =value</strong></blockquote>"
 
-#: kio/global.cpp:601
+#: kio/global.cpp:604
 #, kde-format
 msgid "Unsupported Protocol %1"
 msgstr "Ni chyhelir y Protocol %1"
 
-#: kio/global.cpp:602
+#: kio/global.cpp:605
 #, kde-format
 msgid ""
 "The protocol <strong>%1</strong> is not supported by the KDE programs "
@@ -1342,11 +1546,11 @@
 "Ni chynhelir y protocol <strong>%1</strong> gan y rhaglenni KDE sydd wedi eu "
 "gosod ar hyn o bryd ar y cyfrifiadur yma."
 
-#: kio/global.cpp:605
+#: kio/global.cpp:608
 msgid "The requested protocol may not be supported."
 msgstr "Efallai na chynhelir y protocol a ofynwyd amdano."
 
-#: kio/global.cpp:606
+#: kio/global.cpp:609
 #, kde-format
 msgid ""
 "The versions of the %1 protocol supported by this computer and the server "
@@ -1355,7 +1559,7 @@
 "Efallai mae fersiynau'r protocol %1 a gynhelir gan y cyfrifiadur yma a'r "
 "gweinydd yn anghytûn."
 
-#: kio/global.cpp:608
+#: kio/global.cpp:611
 msgid ""
 "You may perform a search on the Internet for a KDE program (called a "
 "kioslave or ioslave) which supports this protocol. Places to search include "
@@ -1363,15 +1567,15 @@
 "href=\"http://freshmeat.net/\">http://freshmeat.net/</a>."
 msgstr ""
 
-#: kio/global.cpp:617
+#: kio/global.cpp:620
 msgid "URL Does Not Refer to a Resource."
 msgstr "Nid yw'r URL yn cyfeirio at adnodd."
 
-#: kio/global.cpp:618
+#: kio/global.cpp:621
 msgid "Protocol is a Filter Protocol"
 msgstr "Protocol Hidl yw'r Protocol"
 
-#: kio/global.cpp:619
+#: kio/global.cpp:622
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource "
 "<strong>L</strong>ocator (URL) that you entered did not refer to a specific "
@@ -1381,7 +1585,7 @@
 "<strong>U</strong>nffurf (URL) yr ydych wedi cyflwyno yn cyfeirio at adnodd "
 "penodol."
 
-#: kio/global.cpp:622
+#: kio/global.cpp:625
 msgid ""
 "KDE is able to communicate through a protocol within a protocol; the "
 "protocol specified is only for use in such situations, however this is not "
@@ -1393,12 +1597,12 @@
 "o'r sefyllfaoedd yma. Mae hwn yn ddigwyddiad eithriadol, a mae'n debyg o "
 "ddynodi gwall rhaglennu."
 
-#: kio/global.cpp:630
+#: kio/global.cpp:633
 #, kde-format
 msgid "Unsupported Action: %1"
 msgstr "Ni Chynhelir y Gweithrediad: %1"
 
-#: kio/global.cpp:631
+#: kio/global.cpp:634
 #, kde-format
 msgid ""
 "The requested action is not supported by the KDE program which is "
@@ -1407,7 +1611,7 @@
 "Ni chynhelir y gwethrediad a gofynwyd amdano gan y rhaglen KDE sydd yn "
 "gweithredu y protocol <strong>%1</strong>."
 
-#: kio/global.cpp:634
+#: kio/global.cpp:637
 msgid ""
 "This error is very much dependent on the KDE program. The additional "
 "information should give you more information than is available to the KDE "
@@ -1417,15 +1621,15 @@
 "ychwanegol rhoi fwy o wybodaeth i chi nag sydd ar gael i'r pensaernïaeth "
 "mewnbwn/allbwn KDE."
 
-#: kio/global.cpp:637
+#: kio/global.cpp:640
 msgid "Attempt to find another way to accomplish the same outcome."
 msgstr "Ceisio canfod ffordd arall i gyflawni'r un canlyniad."
 
-#: kio/global.cpp:642
+#: kio/global.cpp:645
 msgid "File Expected"
 msgstr "Ffeil a Ddisgwylir."
 
-#: kio/global.cpp:643
+#: kio/global.cpp:646
 #, kde-format
 msgid ""
 "The request expected a file, however the folder <strong>%1</strong> was "
@@ -1434,15 +1638,15 @@
 "Disgwylodd y cais ffeil, ond wnaeth ganfod y plygell <strong>%1</strong> yn "
 "lle."
 
-#: kio/global.cpp:645
+#: kio/global.cpp:648
 msgid "This may be an error on the server side."
 msgstr "Efallai mae gwall ar ochr y gweinydd."
 
-#: kio/global.cpp:650
+#: kio/global.cpp:653
 msgid "Folder Expected"
 msgstr "Plygell a Ddisgwylir."
 
-#: kio/global.cpp:651
+#: kio/global.cpp:654
 #, kde-format
 msgid ""
 "The request expected a folder, however the file <strong>%1</strong> was "
@@ -1451,21 +1655,16 @@
 "Disgwylodd y cais blygell, ond wnaeth ganfod y ffeil <strong>%1</strong> yn "
 "lle."
 
-#: kio/global.cpp:658
+#: kio/global.cpp:661
 msgid "File or Folder Does Not Exist"
 msgstr "Nid yw'r Ffeil neu'r Plygell mewn Bod."
 
-#: kio/global.cpp:659
+#: kio/global.cpp:662
 #, kde-format
 msgid "The specified file or folder <strong>%1</strong> does not exist."
 msgstr "Nid yw'r ffeil neu'r plygell penodol <strong>%1</strong> mewn bod."
 
-#: kio/job.cpp:2112 kio/global.cpp:666 kio/copyjob.cpp:1349
-#: kio/copyjob.cpp:1921 kio/paste.cpp:64
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
-
-#: kio/global.cpp:667
+#: kio/global.cpp:670
 msgid ""
 "The requested file could not be created because a file with the same name "
 "already exists."
@@ -1473,25 +1672,25 @@
 "Ni ellir creu'r ffeil a ofynwyd amdano gan fod ffeil efo'r un enw mewn bod "
 "yn barod."
 
-#: kio/global.cpp:669
+#: kio/global.cpp:672
 msgid "Try moving the current file out of the way first, and then try again."
 msgstr ""
 "Ceisiwch symud y ffeil cyfredol allan o'r ffordd yn gyntaf, ac wedyn "
 "ceisiwch eto."
 
-#: kio/global.cpp:671
+#: kio/global.cpp:674
 msgid "Delete the current file and try again."
 msgstr "Dileuwch y ffeil cyfredol a ceisiwch eto."
 
-#: kio/global.cpp:672
+#: kio/global.cpp:675
 msgid "Choose an alternate filename for the new file."
 msgstr "Dewiswch enw ffeil amgen i'r ffeil newydd."
 
-#: kio/global.cpp:676 kio/copyjob.cpp:1030
+#: kio/global.cpp:679 kio/copyjob.cpp:1050
 msgid "Folder Already Exists"
 msgstr "Plygell yn Bodoli'n Barod"
 
-#: kio/global.cpp:677
+#: kio/global.cpp:680
 msgid ""
 "The requested folder could not be created because a folder with the same "
 "name already exists."
@@ -1499,26 +1698,26 @@
 "Ni ellir creu'r plygell a ofynwyd amdano gan fod plygell efo'r un enw mewn "
 "bod yn barod."
 
-#: kio/global.cpp:679
+#: kio/global.cpp:682
 msgid ""
 "Try moving the current folder out of the way first, and then try again."
 msgstr ""
 "Ceisiwch symud y plygell cyfredol allan o'r ffordd yn gyntaf, ac wedyn "
 "ceisiwch eto."
 
-#: kio/global.cpp:681
+#: kio/global.cpp:684
 msgid "Delete the current folder and try again."
 msgstr "Dileuwch y plygell cyfredol a ceisiwch eto."
 
-#: kio/global.cpp:682
+#: kio/global.cpp:685
 msgid "Choose an alternate name for the new folder."
 msgstr "Dewiswch enw amgen i'r plygell newydd."
 
-#: kio/global.cpp:686
+#: kio/global.cpp:689
 msgid "Unknown Host"
 msgstr "Gwesteiwr anhysbys"
 
-#: kio/global.cpp:687
+#: kio/global.cpp:690
 #, kde-format
 msgid ""
 "An unknown host error indicates that the server with the requested name, "
@@ -1527,7 +1726,7 @@
 "Mae gwall gweinydd anhysbys yn dynodi na allir darganfod y gwesteiwr efo'r "
 "enw a ofynwyd amdano, <strong>%1</strong>, ar y Rhyngrwyd."
 
-#: kio/global.cpp:690
+#: kio/global.cpp:693
 #, kde-format
 msgid ""
 "The name that you typed, %1, may not exist: it may be incorrectly typed."
@@ -1535,38 +1734,38 @@
 "Efallai nad yw'r enw yr ydych wedi ei deipio, %1, mewn bod: efallai mae o "
 "wedi ei deipio yn anghywir."
 
-#: kio/global.cpp:697
+#: kio/global.cpp:700
 msgid "Access Denied"
 msgstr "Gwaharddwyd Cyrchiad."
 
-#: kio/global.cpp:698
+#: kio/global.cpp:701
 #, kde-format
 msgid "Access was denied to the specified resource, <strong>%1</strong>."
 msgstr "Gwaharddwyd cyrchiad i'r adnodd penodol, <strong>%1</strong>."
 
-#: kio/global.cpp:700 kio/global.cpp:916
+#: kio/global.cpp:703 kio/global.cpp:919
 msgid ""
 "You may have supplied incorrect authentication details or none at all."
 msgstr ""
 "Efallai yr ydych wedi darparu manylion dilysu anghywir, neu dim byd o gwbl."
 
-#: kio/global.cpp:702 kio/global.cpp:918
+#: kio/global.cpp:705 kio/global.cpp:921
 msgid ""
 "Your account may not have permission to access the specified resource."
 msgstr "Efallai nad oes caniatàd gan eich cyfrif i gyrchu'r adnodd penodol."
 
-#: kio/global.cpp:704 kio/global.cpp:920 kio/global.cpp:932
+#: kio/global.cpp:707 kio/global.cpp:923 kio/global.cpp:935
 msgid ""
 "Retry the request and ensure your authentication details are entered "
 "correctly."
 msgstr ""
 "Ail-geisiwch, a sicrhewch bod eich manylion dilysu wedi eu mewnosod yn gywir."
 
-#: kio/global.cpp:710
+#: kio/global.cpp:713
 msgid "Write Access Denied"
 msgstr "Gwaharddwyd Cyrchiad Ysgrifennu"
 
-#: kio/global.cpp:711
+#: kio/global.cpp:714
 #, kde-format
 msgid ""
 "This means that an attempt to write to the file <strong>%1</strong> was "
@@ -1575,11 +1774,11 @@
 "Golygir hwn y gafodd cais i ysgrifennu i'r ffeil <strong>%1</strong> ei "
 "wrthod."
 
-#: kio/global.cpp:718
+#: kio/global.cpp:721
 msgid "Unable to Enter Folder"
 msgstr "Methu Mynd i mewn i'r Plygell."
 
-#: kio/global.cpp:719
+#: kio/global.cpp:722
 #, kde-format
 msgid ""
 "This means that an attempt to enter (in other words, to open) the requested "
@@ -1588,16 +1787,16 @@
 "Golygir hwn y gafodd cais i fynd i mewn i'r plygell <strong>%1</strong> "
 "(hynny yw, i'w agor) ei wrthod."
 
-#: kio/global.cpp:727
+#: kio/global.cpp:730
 msgid "Folder Listing Unavailable"
 msgstr "Nid oes Rhestriad Plygell ar Gael."
 
-#: kio/global.cpp:728
+#: kio/global.cpp:731
 #, kde-format
 msgid "Protocol %1 is not a Filesystem"
 msgstr "Dim cysawd ffeil yw Protocol %1"
 
-#: kio/global.cpp:729
+#: kio/global.cpp:732
 msgid ""
 "This means that a request was made which requires determining the contents "
 "of the folder, and the KDE program supporting this protocol is unable to do "
@@ -1606,11 +1805,11 @@
 "Golygir hwn y gwnaed cais lle mae angen pederfynu cynnwys y plygell, ac "
 "mae'r rhaglen KDE sy'n cynnal y protocol yma yn methu gwneud."
 
-#: kio/global.cpp:737
+#: kio/global.cpp:740
 msgid "Cyclic Link Detected"
 msgstr "Datgelwyd Cyswllt Cylchol"
 
-#: kio/global.cpp:738
+#: kio/global.cpp:741
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate "
 "name and/or location. KDE detected a link or series of links that results in "
@@ -1622,7 +1821,7 @@
 "gysylltiadau sy'n creu dolen ddiddiwedd - h.y., roedd y ffeil wedi ei "
 "gysylltu (efallai mewn ffordd cylchfannol) i'w hun."
 
-#: kio/global.cpp:742 kio/global.cpp:764
+#: kio/global.cpp:745 kio/global.cpp:767
 msgid ""
 "Delete one part of the loop in order that it does not cause an infinite "
 "loop, and try again."
@@ -1630,23 +1829,23 @@
 "Dileuwch un rhan o'r ddolen fel nad yw'n achosi dolen ddiddiwedd, a ceisiwch "
 "eto."
 
-#: kio/global.cpp:751
+#: kio/global.cpp:754
 msgid "Request Aborted By User"
 msgstr "Terfynwyd y Cais gan y Defnyddiwr"
 
-#: kio/global.cpp:752 kio/global.cpp:1053
+#: kio/global.cpp:755 kio/global.cpp:1056
 msgid "The request was not completed because it was aborted."
 msgstr "Ni chyflawnwyd y cais achos terfynwyd."
 
-#: kio/global.cpp:754 kio/global.cpp:948 kio/global.cpp:1055
+#: kio/global.cpp:757 kio/global.cpp:951 kio/global.cpp:1058
 msgid "Retry the request."
 msgstr "Ail-geisio'r cais."
 
-#: kio/global.cpp:758
+#: kio/global.cpp:761
 msgid "Cyclic Link Detected During Copy"
 msgstr "Datgelwyd Cyswllt Cylchol wrth Gopïo"
 
-#: kio/global.cpp:759
+#: kio/global.cpp:762
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate "
 "name and/or location. During the requested copy operation, KDE detected a "
@@ -1659,15 +1858,15 @@
 "- h.y., roedd y ffeil wedi ei gysylltu (efallai mewn ffordd cylchfannol) i'w "
 "hun."
 
-#: kio/global.cpp:769
+#: kio/global.cpp:772
 msgid "Could Not Create Network Connection"
 msgstr "Methu Creu Cysylltiad Rhwydwaith"
 
-#: kio/global.cpp:770
+#: kio/global.cpp:773
 msgid "Could Not Create Socket"
 msgstr "Methu Creu Soced"
 
-#: kio/global.cpp:771
+#: kio/global.cpp:774
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be created."
@@ -1675,7 +1874,7 @@
 "Mae hwn yn wall go dechnegol, lle ni ellir creu dyfais gofynnol (soced) i "
 "gyfathrebion rhwydwaith."
 
-#: kio/global.cpp:773 kio/global.cpp:886 kio/global.cpp:897 kio/global.cpp:906
+#: kio/global.cpp:776 kio/global.cpp:889 kio/global.cpp:900 kio/global.cpp:909
 msgid ""
 "The network connection may be incorrectly configured, or the network "
 "interface may not be enabled."
@@ -1683,11 +1882,11 @@
 "Efallai mae'r cysylltiad rhwydwaith wedi ei ffurfweddu yn anghywir, neu "
 "analluogir y rhyngwyneb rhwydwaith."
 
-#: kio/global.cpp:779
+#: kio/global.cpp:782
 msgid "Connection to Server Refused"
 msgstr "Gwrthodwyd y Cysylltiad i'r Gweinydd"
 
-#: kio/global.cpp:780
+#: kio/global.cpp:783
 #, kde-format
 msgid ""
 "The server <strong>%1</strong> refused to allow this computer to make a "
@@ -1696,7 +1895,7 @@
 "Gwrthododd y gweinydd <strong>%1</strong> adael i'r cyfrifiadur yma wneud "
 "cyswlltiad."
 
-#: kio/global.cpp:782
+#: kio/global.cpp:785
 msgid ""
 "The server, while currently connected to the Internet, may not be configured "
 "to allow requests."
@@ -1704,7 +1903,7 @@
 "Efallai nad yw'r gweinydd, er ei fod yn gysylltiedig i'r Rhyngrwyd ar hyn o "
 "bryd, wedi ei ffurfweddu i ganiatàu ceisiadau."
 
-#: kio/global.cpp:784
+#: kio/global.cpp:787
 #, kde-format
 msgid ""
 "The server, while currently connected to the Internet, may not be running "
@@ -1713,7 +1912,7 @@
 "Efallai nad yw'r gweinydd, er ei fod yn gysylltiedig i'r Rhyngrwyd ar hyn o "
 "bryd, yn rhedeg y wasanaeth a ofynwyd amdani (%1)."
 
-#: kio/global.cpp:786
+#: kio/global.cpp:789
 msgid ""
 "A network firewall (a device which restricts Internet requests), either "
 "protecting your network or the network of the server, may have intervened, "
@@ -1723,11 +1922,11 @@
 "Rhyngrwyd), sy'n amddiffyn un ai eich rhwydwaith neu rhwydwaith y gweinydd, "
 "wedi ymyrryd, a gwrthod y cais yma."
 
-#: kio/global.cpp:793
+#: kio/global.cpp:796
 msgid "Connection to Server Closed Unexpectedly"
 msgstr "Cauwyd y Cysylltiad i'r Gweinydd yn Annisgwyl"
 
-#: kio/global.cpp:794
+#: kio/global.cpp:797
 #, kde-format
 msgid ""
 "Although a connection was established to <strong>%1</strong>, the connection "
@@ -1736,7 +1935,7 @@
 "Er bod cysylltiad wedi eu greu i <strong>%1</strong>, cauwyd y cysylltiad "
 "wrth fan annisgwyl yn y cyfathrebu."
 
-#: kio/global.cpp:797
+#: kio/global.cpp:800
 msgid ""
 "A protocol error may have occurred, causing the server to close the "
 "connection as a response to the error."
@@ -1744,16 +1943,16 @@
 "Efallai mae gwall protocol wedi digwydd, yn achosi i'r gweinydd gau'r "
 "cysylltiad fel ymateb i'r gwall."
 
-#: kio/global.cpp:803
+#: kio/global.cpp:806
 msgid "URL Resource Invalid"
 msgstr "Adnodd URL Annilys"
 
-#: kio/global.cpp:804
+#: kio/global.cpp:807
 #, kde-format
 msgid "Protocol %1 is not a Filter Protocol"
 msgstr "Nid yw protocol %1 yn Brotocol Hidl"
 
-#: kio/global.cpp:805
+#: kio/global.cpp:808
 #, kde-format
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource "
@@ -1764,7 +1963,7 @@
 "<strong>U</strong>nffurf (URL) yr ydych wedi cyflwyno yn cyfeirio at ffordd "
 "dilys o gyrchu'r adnodd penodol, <strong>%1%2</strong>."
 
-#: kio/global.cpp:810
+#: kio/global.cpp:813
 msgid ""
 "KDE is able to communicate through a protocol within a protocol. This "
 "request specified a protocol be used as such, however this protocol is not "
@@ -1776,15 +1975,15 @@
 "gweithrediad o'r fath.  Mae hwn yn ddigwyddiad eithriadol, a mae'n debyg o "
 "ddynodi gwall rhaglennu."
 
-#: kio/global.cpp:818
+#: kio/global.cpp:821
 msgid "Unable to Initialize Input/Output Device"
 msgstr "Methu Cychwyn Dyfais Mewnbwn/Allbwn"
 
-#: kio/global.cpp:819
+#: kio/global.cpp:822
 msgid "Could Not Mount Device"
 msgstr "Methu Gosod Dyfais"
 
-#: kio/global.cpp:820
+#: kio/global.cpp:823
 #, kde-format
 msgid ""
 "The requested device could not be initialized (\"mounted\"). The reported "
@@ -1793,7 +1992,7 @@
 "Ni ellid ymgychwyn (\"mount\") y dyfais a ofynwyd amdano.  Y gwall a "
 "adroddwyd oedd: <strong>%1</strong>"
 
-#: kio/global.cpp:823
+#: kio/global.cpp:826
 msgid ""
 "The device may not be ready, for example there may be no media in a "
 "removable media device (i.e. no CD-ROM in a CD drive), or in the case of a "
@@ -1804,7 +2003,7 @@
 "achos dyfais perifferol/cludadwy efallai nad yw'r dyfais wedi ei gysylltu yn "
 "gywir."
 
-#: kio/global.cpp:827
+#: kio/global.cpp:830
 msgid ""
 "You may not have permissions to initialize (\"mount\") the device. On UNIX "
 "systems, often system administrator privileges are required to initialize a "
@@ -1814,7 +2013,7 @@
 "gysodau Unix, y rhan fwyaf o'r amser mae angen hawliau gwasanaethydd cysawd "
 "i ymgychwyn dyfais."
 
-#: kio/global.cpp:831
+#: kio/global.cpp:834
 msgid ""
 "Check that the device is ready; removable drives must contain media, and "
 "portable devices must be connected and powered on.; and try again."
@@ -1823,15 +2022,15 @@
 "cyfryngau, a rhaid i dyfeisiau cludadwy fod wedi eu cysylltu a bod arnodd; "
 "ceisiwch eto."
 
-#: kio/global.cpp:837
+#: kio/global.cpp:840
 msgid "Unable to Uninitialize Input/Output Device"
 msgstr "Methu Ddi-ymgychwyn Dyfais Mewnbwn/Allbwn"
 
-#: kio/global.cpp:838
+#: kio/global.cpp:841
 msgid "Could Not Unmount Device"
 msgstr "Methu Datosod Dyfais"
 
-#: kio/global.cpp:839
+#: kio/global.cpp:842
 #, kde-format
 msgid ""
 "The requested device could not be uninitialized (\"unmounted\"). The "
@@ -1840,7 +2039,7 @@
 "Ni ellid ddi-ymgychwyn (\"unmount\") y dyfais a ofynwyd amdano.  Y gwall a "
 "adroddwyd oedd: <strong>%1</strong>"
 
-#: kio/global.cpp:842
+#: kio/global.cpp:845
 msgid ""
 "The device may be busy, that is, still in use by another application or "
 "user. Even such things as having an open browser window on a location on "
@@ -1851,7 +2050,7 @@
 "ar agor ar leoliad ar y dyfais yma yn gallu achosi i'r dyfais barhau  mewn "
 "defnydd."
 
-#: kio/global.cpp:846
+#: kio/global.cpp:849
 msgid ""
 "You may not have permissions to uninitialize (\"unmount\") the device. On "
 "UNIX systems, system administrator privileges are often required to "
@@ -1861,15 +2060,15 @@
 "Ar gysodau Unix, y rhan fwyaf o'r amser mae angen hawliau gwasanaethydd "
 "cysawd i ddi-ymgychwyn dyfais."
 
-#: kio/global.cpp:850
+#: kio/global.cpp:853
 msgid "Check that no applications are accessing the device, and try again."
 msgstr "Cywirwch nad oes cymhwysiadau yn cyrchu'r dyfais, a ceisiwch eto."
 
-#: kio/global.cpp:855
+#: kio/global.cpp:858
 msgid "Cannot Read From Resource"
 msgstr "Methu Darllen oddiwrth yr Adnodd"
 
-#: kio/global.cpp:856
+#: kio/global.cpp:859
 #, kde-format
 msgid ""
 "This means that although the resource, <strong>%1</strong>, was able to be "
@@ -1878,15 +2077,15 @@
 "Golygir hwn bod, er roedd yn bosib agor yr adnodd <strong>%1</strong>, "
 "digwyddodd gwall wrth ddarllen cynnwys yr adnodd."
 
-#: kio/global.cpp:859
+#: kio/global.cpp:862
 msgid "You may not have permissions to read from the resource."
 msgstr "Efallai nad oes ganddoch caniatadau i ddarllen oddiwrth yr adnodd."
 
-#: kio/global.cpp:868
+#: kio/global.cpp:871
 msgid "Cannot Write to Resource"
 msgstr "Methu ysgrifennu at yr adnodd."
 
-#: kio/global.cpp:869
+#: kio/global.cpp:872
 #, kde-format
 msgid ""
 "This means that although the resource, <strong>%1</strong>, was able to be "
@@ -1895,19 +2094,19 @@
 "Golygir hwn bod, er roedd yn bosib agor yr adnodd <strong>%1</strong>, "
 "digwyddodd gwall wrth ysgrifennu at yr adnodd."
 
-#: kio/global.cpp:872
+#: kio/global.cpp:875
 msgid "You may not have permissions to write to the resource."
 msgstr "Efallai nad oes ganddoch caniatadau i ysgrifennu at yr adnodd."
 
-#: kio/global.cpp:881 kio/global.cpp:892
+#: kio/global.cpp:884 kio/global.cpp:895
 msgid "Could Not Listen for Network Connections"
 msgstr "Methu Gwrando am Gysylltiadau Rhwydwaith"
 
-#: kio/global.cpp:882
+#: kio/global.cpp:885
 msgid "Could Not Bind"
 msgstr "Methu Ymrwymo"
 
-#: kio/global.cpp:883 kio/global.cpp:894
+#: kio/global.cpp:886 kio/global.cpp:897
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be established to listen for incoming "
@@ -1916,15 +2115,15 @@
 "Mae hwn yn wall go dechnegol, lle ni ellir creu dyfais gofynnol (soced) i "
 "gyfathrebion rhwydwaith i wrando am gysylltiadau rhwydwaith cyrhaeddol."
 
-#: kio/global.cpp:893
+#: kio/global.cpp:896
 msgid "Could Not Listen"
 msgstr "Methu Gwrando"
 
-#: kio/global.cpp:903
+#: kio/global.cpp:906
 msgid "Could Not Accept Network Connection"
 msgstr "Methu Derbyn Cysylltiad Rhwydwaith"
 
-#: kio/global.cpp:904
+#: kio/global.cpp:907
 msgid ""
 "This is a fairly technical error in which an error occurred while attempting "
 "to accept an incoming network connection."
@@ -1932,31 +2131,31 @@
 "Mae hwn yn wall go dechnegol, lle ddigwyddodd gwall wrth ceisio derbyn "
 "cysylltiad rhwydwaith cyrhaeddol."
 
-#: kio/global.cpp:908
+#: kio/global.cpp:911
 msgid "You may not have permissions to accept the connection."
 msgstr "Efallai nad oes ganddoch caniatadau i dderbyn y cysylltiad."
 
-#: kio/global.cpp:913
+#: kio/global.cpp:916
 #, kde-format
 msgid "Could Not Login: %1"
 msgstr "Methu Mewngofnodi: %1"
 
-#: kio/global.cpp:914
+#: kio/global.cpp:917
 msgid ""
 "An attempt to login to perform the requested operation was unsuccessful."
 msgstr ""
 "Roedd cais i fewngofnodi i gyflawni'r gweithrediad ceisiedig yn "
 "aflwyddiannus."
 
-#: kio/global.cpp:925
+#: kio/global.cpp:928
 msgid "Could Not Determine Resource Status"
 msgstr "Methu Pennu Statws yr Adnodd"
 
-#: kio/global.cpp:926
+#: kio/global.cpp:929
 msgid "Could Not Stat Resource"
 msgstr "Methu Canfod Statws yr Adnodd"
 
-#: kio/global.cpp:927
+#: kio/global.cpp:930
 #, kde-format
 msgid ""
 "An attempt to determine information about the status of the resource "
@@ -1966,58 +2165,58 @@
 "Roedd cais i bennu gwybodaeth am statws yr adnodd <strong>%1</strong>, er "
 "enghraifft enw yr adnodd, ei fath, ei faint ac yn y blaen, yn aflwyddiannus."
 
-#: kio/global.cpp:930
+#: kio/global.cpp:933
 msgid "The specified resource may not have existed or may not be accessible."
 msgstr "Efallai nad oedd yr adnodd penodol mewn bod, neu ar gael."
 
-#: kio/global.cpp:938
+#: kio/global.cpp:941
 msgid "Could Not Cancel Listing"
 msgstr "Methu Diddymu'r Rhestriad"
 
-#: kio/global.cpp:939
+#: kio/global.cpp:942
 msgid "FIXME: Document this"
 msgstr "FIXME: Mae angen dogfennu hyn"
 
-#: kio/global.cpp:943
+#: kio/global.cpp:946
 msgid "Could Not Create Folder"
 msgstr "Methu Creu Plygell"
 
-#: kio/global.cpp:944
+#: kio/global.cpp:947
 msgid "An attempt to create the requested folder failed."
 msgstr "Methwyd cais i greu'r plygell a ofynwyd amdano."
 
-#: kio/global.cpp:945
+#: kio/global.cpp:948
 msgid "The location where the folder was to be created may not exist."
 msgstr ""
 "Efallai nad oedd y lleoliad lle roedd eisiau creu'r plygell mewn bod."
 
-#: kio/global.cpp:952
+#: kio/global.cpp:955
 msgid "Could Not Remove Folder"
 msgstr "Methu Gwaredu Plygell"
 
-#: kio/global.cpp:953
+#: kio/global.cpp:956
 #, kde-format
 msgid ""
 "An attempt to remove the specified folder, <strong>%1</strong>, failed."
 msgstr "Methwyd cais i ddileu'r plygell penodol, <strong>%1</strong>."
 
-#: kio/global.cpp:955
+#: kio/global.cpp:958
 msgid "The specified folder may not exist."
 msgstr "Efallai nad yw'r plygell penodol mewn bod."
 
-#: kio/global.cpp:956
+#: kio/global.cpp:959
 msgid "The specified folder may not be empty."
 msgstr "Efallai nad yw'r plygell penodol yn wag."
 
-#: kio/global.cpp:959
+#: kio/global.cpp:962
 msgid "Ensure that the folder exists and is empty, and try again."
 msgstr "Sicrhewch fod y plygell mewn bod ac yn wag, a ceisiwch eto."
 
-#: kio/global.cpp:964
+#: kio/global.cpp:967
 msgid "Could Not Resume File Transfer"
 msgstr "Methu Ail-gychwyn Trosglwyddo'r Ffeil"
 
-#: kio/global.cpp:965
+#: kio/global.cpp:968
 #, kde-format
 msgid ""
 "The specified request asked that the transfer of file <strong>%1</strong> be "
@@ -2026,30 +2225,30 @@
 "Gofynnodd y cais penodol i trosglwyddiad y ffeil <strong>%1</strong> gael ei "
 "ail-gychwyn mewn man arbennig o'r trosglwyddiad.  Nid oedd hyn yn bosib."
 
-#: kio/global.cpp:968
+#: kio/global.cpp:971
 msgid "The protocol, or the server, may not support file resuming."
 msgstr ""
 "Efallai nid yw'r protocol neu'r gweinydd yn cynnal ail-gychwyn y ffeil."
 
-#: kio/global.cpp:970
+#: kio/global.cpp:973
 msgid "Retry the request without attempting to resume transfer."
 msgstr "Ail-geisiwch, heb geisio ail-gychwyn y trosgwyddiad."
 
-#: kio/global.cpp:975
+#: kio/global.cpp:978
 msgid "Could Not Rename Resource"
 msgstr "Methu Ail-enwi yr Adnodd"
 
-#: kio/global.cpp:976
+#: kio/global.cpp:979
 #, kde-format
 msgid ""
 "An attempt to rename the specified resource <strong>%1</strong> failed."
 msgstr "Methwyd cais i ail-enwi'r adnodd penodol <strong>%1</strong>."
 
-#: kio/global.cpp:984
+#: kio/global.cpp:987
 msgid "Could Not Alter Permissions of Resource"
 msgstr "Methu Newid Caniatadau'r Adnodd"
 
-#: kio/global.cpp:985
+#: kio/global.cpp:988
 #, kde-format
 msgid ""
 "An attempt to alter the permissions on the specified resource "
@@ -2057,32 +2256,32 @@
 msgstr ""
 "Methwyd cais i newid caniatadau ar yr adnodd penodol <strong>%1</strong>."
 
-#: kio/global.cpp:992
+#: kio/global.cpp:995
 msgid "Could Not Change Ownership of Resource"
 msgstr ""
 
-#: kio/global.cpp:993
+#: kio/global.cpp:996
 #, kde-format
 msgid ""
 "An attempt to change the ownership of the specified resource "
 "<strong>%1</strong> failed."
 msgstr ""
 
-#: kio/global.cpp:1000
+#: kio/global.cpp:1003
 msgid "Could Not Delete Resource"
 msgstr "Methu Dileu'r Adnodd"
 
-#: kio/global.cpp:1001
+#: kio/global.cpp:1004
 #, kde-format
 msgid ""
 "An attempt to delete the specified resource <strong>%1</strong> failed."
 msgstr "Methwyd cais i ddileu'r adnodd penodol <strong>%1</strong>."
 
-#: kio/global.cpp:1008
+#: kio/global.cpp:1011
 msgid "Unexpected Program Termination"
 msgstr "Terfynwyd y Rhaglen yn Annisgwyl"
 
-#: kio/global.cpp:1009
+#: kio/global.cpp:1012
 #, kde-format
 msgid ""
 "The program on your computer which provides access to the "
@@ -2091,11 +2290,11 @@
 "Mae'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> wedi terfynu yn annisgwyl."
 
-#: kio/global.cpp:1017
+#: kio/global.cpp:1020
 msgid "Out of Memory"
 msgstr "Allan o Gof."
 
-#: kio/global.cpp:1018
+#: kio/global.cpp:1021
 #, kde-format
 msgid ""
 "The program on your computer which provides access to the "
@@ -2105,11 +2304,11 @@
 "Ni allai'r rhaglen ar eich cyfrifiadur sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> gael digon o gof i barhau."
 
-#: kio/global.cpp:1026
+#: kio/global.cpp:1029
 msgid "Unknown Proxy Host"
 msgstr "Gwesteiwr Dirpwry Anhysbys"
 
-#: kio/global.cpp:1027
+#: kio/global.cpp:1030
 #, kde-format
 msgid ""
 "While retrieving information about the specified proxy host, "
@@ -2120,23 +2319,23 @@
 "canfodwyd gwall Gwesteiwr Anhysbys.  Mae gwall gwesteiwr anhysbys yn dynodi "
 "na ellid lleoli'r enw ceisiedig ar y Rhyngrwyd."
 
-#: kio/global.cpp:1031
+#: kio/global.cpp:1034
 msgid ""
 "There may have been a problem with your network configuration, specifically "
 "your proxy's hostname. If you have been accessing the Internet with no "
 "problems recently, this is unlikely."
 msgstr ""
 
-#: kio/global.cpp:1035
+#: kio/global.cpp:1038
 msgid "Double-check your proxy settings and try again."
 msgstr "Cywirwch eich gosodiadau dirprwy a ceisiwch eto."
 
-#: kio/global.cpp:1040
+#: kio/global.cpp:1043
 #, kde-format
 msgid "Authentication Failed: Method %1 Not Supported"
 msgstr "Methodd Dilysiant: Ni Chynhelir Dull %1"
 
-#: kio/global.cpp:1042
+#: kio/global.cpp:1045
 #, kde-format
 msgid ""
 "Although you may have supplied the correct authentication details, the "
@@ -2147,7 +2346,7 @@
 "achos ni chynhelir y dull a ddefnyddir gan y gweinydd gan y rhaglen KDE sy'n "
 "cyflawni'r protocol %1."
 
-#: kio/global.cpp:1046
+#: kio/global.cpp:1049
 msgid ""
 "Please file a bug at <a "
 "href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> to inform the KDE "
@@ -2157,22 +2356,22 @@
 "href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> i hysbysu'r tîm KDE "
 "am y dull dilysiant na chynhelir."
 
-#: kio/global.cpp:1052
+#: kio/global.cpp:1055
 msgid "Request Aborted"
 msgstr "Ataliwyd y Cais"
 
-#: kio/global.cpp:1059
+#: kio/global.cpp:1062
 msgid "Internal Error in Server"
 msgstr "Camgymeriad Mewnol yn y Gweinydd"
 
-#: kio/global.cpp:1060
+#: kio/global.cpp:1063
 #, kde-format
 msgid ""
 "The program on the server which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error: %2."
 msgstr ""
 
-#: kio/global.cpp:1063
+#: kio/global.cpp:1066
 msgid ""
 "This is most likely to be caused by a bug in the server program. Please "
 "consider submitting a full bug report as detailed below."
@@ -2180,12 +2379,12 @@
 "Achosir hyn gan nam, mwy na thebyg.  Ystyriedwch cyflwyno adrodd nam llawn, "
 "yn ôl y manylion isod."
 
-#: kio/global.cpp:1066
+#: kio/global.cpp:1069
 msgid ""
 "Contact the administrator of the server to advise them of the problem."
 msgstr "Cysylltwch â gwasanaethwr y gweinuydd i'w gynghori am y problem."
 
-#: kio/global.cpp:1068
+#: kio/global.cpp:1071
 msgid ""
 "If you know who the authors of the server software are, submit the bug "
 "report directly to them."
@@ -2193,11 +2392,11 @@
 "Os wyddoch pwy yw awduron y feddalwedd weinydd, cyflwynwch yr adrodd nam yn "
 "uniongyrchol iddynt."
 
-#: kio/global.cpp:1073
+#: kio/global.cpp:1076
 msgid "Timeout Error"
 msgstr "Gwall goramser"
 
-#: kio/global.cpp:1074
+#: kio/global.cpp:1077
 #, kde-format
 msgid ""
 "Although contact was made with the server, a response was not received "
@@ -2209,16 +2408,12 @@
 "Network Settings -> Connection Preferences."
 msgstr ""
 
-#: kio/global.cpp:1085
+#: kio/global.cpp:1088
 msgid "The server was too busy responding to other requests to respond."
 msgstr ""
 "Roedd y gweinydd yn rhy brysur yn ymateb i geisiadau eraill i ymateb."
 
-#: kio/global.cpp:1091 kio/slavebase.cpp:1293
-msgid "Unknown Error"
-msgstr "Gwall Anhysbys"
-
-#: kio/global.cpp:1092
+#: kio/global.cpp:1095
 #, kde-format
 msgid ""
 "The program on your computer which provides access to the "
@@ -2227,11 +2422,11 @@
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> wedi adrodd gwall mewnol: %2."
 
-#: kio/global.cpp:1100
+#: kio/global.cpp:1103
 msgid "Unknown Interruption"
 msgstr "Ymyriad Anhysbys"
 
-#: kio/global.cpp:1101
+#: kio/global.cpp:1104
 #, kde-format
 msgid ""
 "The program on your computer which provides access to the "
@@ -2241,11 +2436,11 @@
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol "
 "<strong>%1</strong> wedi adrodd ymyriad o fath anhysbys: %2."
 
-#: kio/global.cpp:1109
+#: kio/global.cpp:1112
 msgid "Could Not Delete Original File"
 msgstr "Methu Dileu Ffeil Gwreiddiol"
 
-#: kio/global.cpp:1110
+#: kio/global.cpp:1113
 #, kde-format
 msgid ""
 "The requested operation required the deleting of the original file, most "
@@ -2256,11 +2451,11 @@
 "ddiwedd gweithrediad symud ffeil, mwy na thebyg.  Ni ellid dileu'r ffeil "
 "gwreiddiol <strong>%1</strong>."
 
-#: kio/global.cpp:1119
+#: kio/global.cpp:1122
 msgid "Could Not Delete Temporary File"
 msgstr "Methu Dileu Ffeil Dros Dro"
 
-#: kio/global.cpp:1120
+#: kio/global.cpp:1123
 #, kde-format
 msgid ""
 "The requested operation required the creation of a temporary file in which "
@@ -2271,11 +2466,11 @@
 "newydd  wrth iddo gael ei lawrlwytho.  Ni ellid dileu'r ffeil dros dro "
 "<strong>%1</strong>."
 
-#: kio/global.cpp:1129
+#: kio/global.cpp:1132
 msgid "Could Not Rename Original File"
 msgstr "Methu Ail-enwi Ffeil Gwreiddiol"
 
-#: kio/global.cpp:1130
+#: kio/global.cpp:1133
 #, kde-format
 msgid ""
 "The requested operation required the renaming of the original file "
@@ -2284,11 +2479,11 @@
 "Roedd gan y weithrediad ceisiedig angen ail-enwi'r ffeil gwreiddiol "
 "<strong>%1</strong>.  Ond ni ellid ail-enwi'r ffeil."
 
-#: kio/global.cpp:1138
+#: kio/global.cpp:1141
 msgid "Could Not Rename Temporary File"
 msgstr "Methu Ail-enwi Ffeil Dro Dro"
 
-#: kio/global.cpp:1139
+#: kio/global.cpp:1142
 #, kde-format
 msgid ""
 "The requested operation required the creation of a temporary file "
@@ -2297,28 +2492,28 @@
 "Roedd gan y weithrediad ceisiedig angen greu ffeil dros dro "
 "<strong>%1</strong>.  Ond ni ellid creu'r ffeil."
 
-#: kio/global.cpp:1147
+#: kio/global.cpp:1150
 msgid "Could Not Create Link"
 msgstr "Methu Creu Cyswllt"
 
-#: kio/global.cpp:1148
+#: kio/global.cpp:1151
 msgid "Could Not Create Symbolic Link"
 msgstr "Methu Creu Cyswllt Symbolaidd"
 
-#: kio/global.cpp:1149
+#: kio/global.cpp:1152
 #, kde-format
 msgid "The requested symbolic link %1 could not be created."
 msgstr "Methu creu y cyswllt symbolaidd %1 a ofynwyd amdano."
 
-#: kio/global.cpp:1156
+#: kio/global.cpp:1159
 msgid "No Content"
 msgstr "Dim Cynnwys"
 
-#: kio/global.cpp:1161
+#: kio/global.cpp:1164
 msgid "Disk Full"
 msgstr "Disg Llawn"
 
-#: kio/global.cpp:1162
+#: kio/global.cpp:1165
 #, kde-format
 msgid ""
 "The requested file <strong>%1</strong> could not be written to as there is "
@@ -2327,7 +2522,7 @@
 "Ni ellid ysgrifennu at y ffeil ceisiedig <strong>%1</strong> gan fod diffyg "
 "lle ar y ddisg."
 
-#: kio/global.cpp:1164
+#: kio/global.cpp:1167
 msgid ""
 "Free up enough disk space by 1) deleting unwanted and temporary files; 2) "
 "archiving files to removable media storage such as CD-Recordable discs; or "
@@ -2337,11 +2532,11 @@
 "2) archifo ffeiliau i gronfa cyfryngau symudadwy fel disgiau CD-Cofnodi; neu "
 "3) darganfod mwy o le cronfa."
 
-#: kio/global.cpp:1171
+#: kio/global.cpp:1174
 msgid "Source and Destination Files Identical"
 msgstr "Ffeiliau Tarddiad a Cyrchfan yn Unwy"
 
-#: kio/global.cpp:1172
+#: kio/global.cpp:1175
 msgid ""
 "The operation could not be completed because the source and destination "
 "files are the same file."
@@ -2349,166 +2544,126 @@
 "Methu cwblhau'r gweithrediad gan fod ffeil tarddiad a ffeil cyrchfan yr un "
 "un ffeil."
 
-#: kio/global.cpp:1174
+#: kio/global.cpp:1177
 msgid "Choose a different filename for the destination file."
 msgstr ""
 
-#: kio/global.cpp:1185
+#: kio/global.cpp:1188
 msgid "Undocumented Error"
 msgstr "Gwall Heb ei Ddogfennu"
 
-#: kio/slaveinterface.cpp:484
-msgid "The peer SSL certificate chain appears to be corrupt."
-msgstr ""
+#: kio/kscan.cpp:50
+msgid "Acquire Image"
+msgstr "Cipio Delwedd"
 
-#: kio/slaveinterface.cpp:486 kio/tcpslavebase.cpp:783
-msgid "SSL"
-msgstr "SSL"
+#: kio/kscan.cpp:99
+msgid "OCR Image"
+msgstr "Delwedd OCR"
 
-#: kio/copyjob.cpp:1349 kio/copyjob.cpp:1921
+#: kio/copyjob.cpp:1375 kio/copyjob.cpp:1957
 msgid "Already Exists as Folder"
 msgstr "Yn Bodoli'n Barod fel Plygell"
 
-#: kio/job.cpp:156
-msgctxt "@title job"
-msgid "Moving"
-msgstr ""
+#: kio/kbuildsycocaprogressdialog.cpp:44
+msgid "Updating System Configuration"
+msgstr "Diweddaru Ffurfweddiad Cysawd"
 
-#: kio/job.cpp:157 kio/job.cpp:164 kio/job.cpp:189 kio/fileundomanager.cpp:120
-msgctxt "The source of a file operation"
-msgid "Source"
-msgstr ""
+#: kio/kbuildsycocaprogressdialog.cpp:45
+msgid "Updating system configuration."
+msgstr "Diweddaru ffurfweddiad y cysawd."
 
-#: kio/job.cpp:158 kio/job.cpp:165 kio/fileundomanager.cpp:121
-msgctxt "The destination of a file operation"
-msgid "Destination"
+#: kio/krun.cpp:127
+#, kde-format
+msgid ""
+"<qt>Unable to enter <b>%1</b>.\n"
+"You do not have access rights to this location.</qt>"
 msgstr ""
+"<qt> Methu mynd i mewn i  <b>%1</b>.\n"
+" Nid oes ganddoch  hawliau cyrchu'r lleoliad yma.</qt>"
 
-#: kio/job.cpp:163
-msgctxt "@title job"
-msgid "Copying"
+#: kio/krun.cpp:161
+#, kde-format
+msgid ""
+"<qt>The file <b>%1</b> is an executable program. For safety it will not be "
+"started.</qt>"
 msgstr ""
+"<qt>Mae'r ffeil <b>%1</b> yn raglen weithredadwy. Er mwyn diogelwch, ni fydd "
+"hi'n cael ei chychwyn.</qt>"
 
-#: kio/job.cpp:170
-msgctxt "@title job"
-msgid "Creating directory"
-msgstr ""
+#: kio/krun.cpp:167
+#, kde-format
+msgid "<qt>You do not have permission to run <b>%1</b>.</qt>"
+msgstr "<qt>nid oes ganddoch ganiatàd i redeg <b>%1</b>.</qt>"
 
-#: kio/job.cpp:171 kio/fileundomanager.cpp:117
-msgid "Directory"
+#: kio/krun.cpp:191
+msgid "You are not authorized to select an application to open this file."
 msgstr ""
 
-#: kio/job.cpp:176
-msgctxt "@title job"
-msgid "Deleting"
-msgstr ""
+#: kio/krun.cpp:202
+msgid "Open with:"
+msgstr "Agor Efo:"
 
-#: kio/job.cpp:177 kio/job.cpp:183 kio/fileundomanager.cpp:124
-msgid "File"
-msgstr ""
+#: kio/krun.cpp:581
+msgid "You are not authorized to execute this file."
+msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
 
-#: kio/job.cpp:182
-msgctxt "@title job"
-msgid "Examining"
-msgstr ""
+#: kio/krun.cpp:604
+#, kde-format
+msgid "Launching %1"
+msgstr "Ymgychwyn %1"
 
-#: kio/job.cpp:188
-msgctxt "@title job"
-msgid "Transferring"
+#: kio/krun.cpp:712
+#, kde-format
+msgid "Error processing Exec field in %1"
 msgstr ""
 
-#: kio/job.cpp:194
-msgctxt "@title job"
-msgid "Mounting"
-msgstr ""
+#: kio/krun.cpp:886
+msgid "You are not authorized to execute this service."
+msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r gwasanaeth yma."
 
-#: kio/job.cpp:195
-msgid "Device"
+#: kio/krun.cpp:898
+msgctxt "Warning about executing unknown .desktop file"
+msgid "Warning"
 msgstr ""
 
-#: kio/job.cpp:196 kio/job.cpp:202
-msgid "Mountpoint"
+#: kio/krun.cpp:912
+msgctxt "program name follows in a line edit below"
+msgid "This will start the program:"
 msgstr ""
 
-#: kio/job.cpp:201
-msgctxt "@title job"
-msgid "Unmounting"
+#: kio/krun.cpp:926
+msgid "If you do not trust this program, click Cancel"
 msgstr ""
 
-#: kio/renamedialog.cpp:422 kio/krun.cpp:1133 kio/kdirlister.cpp:393
-#: kio/paste.cpp:242
+#: kio/krun.cpp:959
 #, kde-format
-msgid ""
-"Malformed URL\n"
-"%1"
+msgid "Unable to make the service %1 executable, aborting execution"
 msgstr ""
-"URL Annilys \n"
-" %1"
 
-#: kio/kdirlister.cpp:403
+#: kio/krun.cpp:1165
 #, kde-format
 msgid ""
-"URL cannot be listed\n"
-"%1"
-msgstr ""
-
-#: kio/skipdialog.cpp:40
-msgid "Information"
-msgstr ""
-
-#: kio/skipdialog.cpp:47
-msgid "Skip"
-msgstr "Hepgor"
-
-#: kio/skipdialog.cpp:50
-msgid "AutoSkip"
+"<qt>Unable to run the command specified. The file or folder <b>%1</b> does "
+"not exist.</qt>"
 msgstr ""
+"<qt>Methu rhedeg y gorchymyn penodol. Nid yw'r ffeil neu plygell "
+"<b>%1</b>mewn bod.</qt>"
 
-#: kio/jobuidelegate.cpp:149 ../kfile/kdiroperator.cpp:812
+#: kio/krun.cpp:1777
 #, kde-format
-msgid "Do you really want to delete this item?"
-msgid_plural "Do you really want to delete these %1 items?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kio/jobuidelegate.cpp:151 ../kfile/kdiroperator.cpp:814
-msgid "Delete Files"
-msgstr "Dileu Ffeiliau"
-
-#: kio/jobuidelegate.cpp:159
-msgctxt "@info"
-msgid ""
-"Do you want to permanently delete all items from Trash? This action cannot "
-"be undone."
-msgstr ""
-
-#: kio/jobuidelegate.cpp:161 ../kfile/kfileplacesview.cpp:638
-msgctxt "@action:button"
-msgid "Empty Trash"
+msgid "Could not find the program '%1'"
 msgstr ""
 
-#: kio/jobuidelegate.cpp:170
-#, kde-format
-msgid "Do you really want to move this item to the trash?"
-msgid_plural "Do you really want to move these %1 items to the trash?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kio/jobuidelegate.cpp:172 ../kfile/kdiroperator.cpp:1874
-msgid "Move to Trash"
-msgstr "Symud i'r Sbwriel"
-
-#: kio/jobuidelegate.cpp:173
-msgctxt "Verb"
-msgid "&Trash"
+#: kio/slaveinterface.cpp:483
+msgid "The peer SSL certificate chain appears to be corrupt."
 msgstr ""
 
-#: kio/kdesktopfileactions.cpp:65
+#: kio/kdesktopfileactions.cpp:64
 #, kde-format
 msgid "The desktop entry file %1 has no Type=... entry."
 msgstr "Mae'r ffeil cofnod penbwrdd  %1 heb gofnod Type= ..."
 
-#: kio/kdesktopfileactions.cpp:81
+#: kio/kdesktopfileactions.cpp:80
 #, kde-format
 msgid ""
 "The desktop entry of type\n"
@@ -2519,8 +2674,8 @@
 " %1\n"
 " yn anhysbys."
 
-#: kio/kdesktopfileactions.cpp:95 kio/kdesktopfileactions.cpp:171
-#: kio/kdesktopfileactions.cpp:303
+#: kio/kdesktopfileactions.cpp:94 kio/kdesktopfileactions.cpp:170
+#: kio/kdesktopfileactions.cpp:302
 #, kde-format
 msgid ""
 "The desktop entry file\n"
@@ -2531,7 +2686,7 @@
 " %1\n"
 " o fath FSDevice ond nid oes cofnod Dev= ... ganddo."
 
-#: kio/kdesktopfileactions.cpp:139
+#: kio/kdesktopfileactions.cpp:138
 #, kde-format
 msgid ""
 "The desktop entry file\n"
@@ -2542,1025 +2697,1064 @@
 " %1\n"
 " o fath Link ond nid oes  cofnod URL= ... ganddo."
 
-#: kio/kdesktopfileactions.cpp:208
+#: kio/kdesktopfileactions.cpp:207
 msgid "Mount"
 msgstr "Gosod"
 
-#: kio/kdesktopfileactions.cpp:219
+#: kio/kdesktopfileactions.cpp:218
 msgid "Eject"
 msgstr "Allfwrw"
 
-#: kio/kdesktopfileactions.cpp:221
+#: kio/kdesktopfileactions.cpp:220
 msgid "Unmount"
 msgstr "Datosod"
 
-#: kio/kfileitemactions.cpp:404
-msgctxt "@title:menu"
-msgid "&Actions"
+#: misc/kmailservice.cpp:30
+msgid "KMailService"
 msgstr ""
 
-#: kio/kfileitemactions.cpp:534
-#, kde-format
-msgid "&Open with %1"
-msgstr ""
+#: misc/kmailservice.cpp:30
+msgid "Mail service"
+msgstr "Gwasanaeth ebost"
 
-#: kio/kfileitemactions.cpp:545 ../kfile/kfilewidget.cpp:1954
-msgid "&Open"
-msgstr ""
+#: misc/ksendbugmail/main.cpp:43
+msgid "Error connecting to server."
+msgstr "Gwall wrth gysylltu i'r gweinydd"
 
-#: kio/kfileitemactions.cpp:560
-msgctxt "@title:menu"
-msgid "&Open With"
-msgstr ""
+#: misc/ksendbugmail/main.cpp:46
+msgid "Not connected."
+msgstr "Dim cyswllt."
 
-#: kio/kfileitemactions.cpp:577
-msgctxt "@action:inmenu Open With"
-msgid "&Other..."
-msgstr ""
+#: misc/ksendbugmail/main.cpp:49
+msgid "Connection timed out."
+msgstr "Cysylltiad wedi goramseru."
 
-#: kio/kfileitemactions.cpp:579 kio/kfileitemactions.cpp:591
-msgctxt "@title:menu"
-msgid "&Open With..."
-msgstr ""
+#: misc/ksendbugmail/main.cpp:52
+msgid "Time out waiting for server interaction."
+msgstr "Goramser wrth aros am ryngweithiad gweinydd."
 
-#: kio/kfileitemactions.cpp:693
+#: misc/ksendbugmail/main.cpp:56
 #, kde-format
-msgid "Open &with %1"
-msgstr ""
+msgid "Server said: \"%1\""
+msgstr "Dywedodd y gweinydd: \"%1\""
 
-#: kio/kfileitemactions.cpp:695
-#, kde-format
-msgctxt "@item:inmenu Open With, %1 is application name"
-msgid "%1"
+#: misc/ksendbugmail/main.cpp:73
+msgid "KSendBugMail"
+msgstr "KSendBugMail"
+
+#: misc/ksendbugmail/main.cpp:74
+msgid "Sends a bug report by email"
 msgstr ""
 
-#: kio/kmimetypechooser.cpp:84
-msgid "Mime Type"
-msgstr "Math MIME"
+#: misc/ksendbugmail/main.cpp:75
+msgid "(c) 2000 Stephan Kulow"
+msgstr ""
 
-#: kio/kmimetypechooser.cpp:88
-msgid "Comment"
-msgstr "Esboniad"
+#: misc/ksendbugmail/main.cpp:76
+msgid "Stephan Kulow"
+msgstr ""
 
-#: kio/kmimetypechooser.cpp:92
-msgid "Patterns"
-msgstr "Patrymau"
+#: misc/ksendbugmail/main.cpp:76
+msgid "Author"
+msgstr "Awdur"
 
-#: kio/kmimetypechooser.cpp:105
-msgid "&Edit..."
-msgstr "&Golygu..."
+#: misc/ksendbugmail/main.cpp:79
+msgid "Subject line"
+msgstr "Llinell pwnc"
 
-#: kio/kmimetypechooser.cpp:115
-msgid "Click this button to display the familiar KDE mime type editor."
-msgstr ""
+#: misc/ksendbugmail/main.cpp:80
+msgid "Recipient"
+msgstr "Derbynnwr"
 
-#: kio/kstatusbarofflineindicator.cpp:52
-msgid "The desktop is offline"
+#: misc/kpac/script.cpp:752
+msgid "Could not find 'FindProxyForURL' or 'FindProxyForURLEx'"
 msgstr ""
 
-#: kio/chmodjob.cpp:214
+#: misc/kpac/script.cpp:763
 #, kde-format
-msgid ""
-"<qt>Could not modify the ownership of file <b>%1</b>. You have insufficient "
-"access to the file to perform the change.</qt>"
-msgstr ""
-
-#: kio/chmodjob.cpp:214
-msgid "&Skip File"
+msgid "Got an invalid reply when calling %1"
 msgstr ""
 
-#: kio/pastedialog.cpp:55
-msgid "Data format:"
-msgstr "Fformat data :"
-
-#: kio/kbuildsycocaprogressdialog.cpp:45
-msgid "Updating System Configuration"
-msgstr "Diweddaru Ffurfweddiad Cysawd"
-
-#: kio/kbuildsycocaprogressdialog.cpp:46
-msgid "Updating system configuration."
-msgstr "Diweddaru ffurfweddiad y cysawd."
+#: misc/kpac/discovery.cpp:111
+msgid "Could not find a usable proxy configuration script"
+msgstr "Methu canfod ysgrifen ffurfweddu'r dirpwry a gall ei defnyddio"
 
-#: kio/krun.cpp:127
+#: misc/kpac/downloader.cpp:93
 #, kde-format
 msgid ""
-"<qt>Unable to enter <b>%1</b>.\n"
-"You do not have access rights to this location.</qt>"
+"Could not download the proxy configuration script:\n"
+"%1"
 msgstr ""
-"<qt> Methu mynd i mewn i  <b>%1</b>.\n"
-" Nid oes ganddoch  hawliau cyrchu'r lleoliad yma.</qt>"
+"Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy:\n"
+"%1"
 
-#: kio/krun.cpp:161
+#: misc/kpac/downloader.cpp:95
+msgid "Could not download the proxy configuration script"
+msgstr "Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy."
+
+#: misc/kpac/proxyscout.cpp:239
 #, kde-format
 msgid ""
-"<qt>The file <b>%1</b> is an executable program. For safety it will not be "
-"started.</qt>"
+"The proxy configuration script is invalid:\n"
+"%1"
 msgstr ""
-"<qt>Mae'r ffeil <b>%1</b> yn raglen weithredadwy. Er mwyn diogelwch, ni fydd "
-"hi'n cael ei chychwyn.</qt>"
+"Mae'r ysgrifen ffurfweddu'r dirprwy yn annilys:\n"
+"%1"
 
-#: kio/krun.cpp:167
+#: misc/kpac/proxyscout.cpp:351
 #, kde-format
-msgid "<qt>You do not have permission to run <b>%1</b>.</qt>"
-msgstr "<qt>nid oes ganddoch ganiatàd i redeg <b>%1</b>.</qt>"
-
-#: kio/krun.cpp:191
-msgid "You are not authorized to select an application to open this file."
+msgid ""
+"The proxy configuration script returned an error:\n"
+"%1"
 msgstr ""
+"Mae gwall wedi'i ddychwelyd gan yr ysgrifen ffurfweddu'r dirprwy:\n"
+"%1"
 
-#: kio/krun.cpp:202
-msgid "Open with:"
-msgstr "Agor Efo:"
+#: misc/ktelnetservice.cpp:39
+msgid "telnet service"
+msgstr "gwasanaeth telnet"
 
-#: kio/krun.cpp:581
-msgid "You are not authorized to execute this file."
-msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r ffeil yma."
+#: misc/ktelnetservice.cpp:40
+msgid "telnet protocol handler"
+msgstr "trinydd protocol telnet"
 
-#: kio/krun.cpp:604
+#: misc/ktelnetservice.cpp:74
 #, kde-format
-msgid "Launching %1"
-msgstr "Ymgychwyn %1"
+msgid "You do not have permission to access the %1 protocol."
+msgstr "Nid oes ganddoch caniatad i gyrchu'r protocol %1."
 
-#: kio/krun.cpp:712
-#, kde-format
-msgid "Error processing Exec field in %1"
-msgstr ""
+#: bookmarks/kbookmarkmenu.cc:267
+msgid "Add Bookmark Here"
+msgstr "Ychwanegu Tudnod Yma"
 
-#: kio/krun.cpp:886
-msgid "You are not authorized to execute this service."
-msgstr "Nid ydych wedi cael eich awdurdodi i weithredu'r gwasanaeth yma."
+#: bookmarks/kbookmarkmenu.cc:272
+msgid "Open Folder in Bookmark Editor"
+msgstr "Agor y Blygell yn y Golygydd Tudnodau"
 
-#: kio/krun.cpp:898
-msgctxt "Warning about executing unknown .desktop file"
-msgid "Warning"
-msgstr ""
+#: bookmarks/kbookmarkmenu.cc:275
+msgid "Delete Folder"
+msgstr "Dileu Plygell"
 
-#: kio/krun.cpp:912
-msgctxt "program name follows in a line edit below"
-msgid "This will start the program:"
+#: bookmarks/kbookmarkmenu.cc:281 ../kfile/kdiroperator.cpp:1983
+msgid "Properties"
 msgstr ""
 
-#: kio/krun.cpp:926
-msgid "If you do not trust this program, click Cancel"
+#: bookmarks/kbookmarkmenu.cc:286
+msgid "Copy Link Address"
+msgstr "Copïo Cyfeiriad Cyswllt"
+
+#: bookmarks/kbookmarkmenu.cc:289
+msgid "Delete Bookmark"
+msgstr "Dileu y Tudnod"
+
+#: bookmarks/kbookmarkmenu.cc:295 bookmarks/kbookmarkmenu.cc:454
+msgid "Open Folder in Tabs"
 msgstr ""
 
-#: kio/krun.cpp:959
-#, kde-format
-msgid "Unable to make the service %1 executable, aborting execution"
+#: bookmarks/kbookmarkmenu.cc:320
+msgid "Cannot add bookmark with empty URL."
 msgstr ""
 
-#: kio/krun.cpp:1166
+#: bookmarks/kbookmarkmenu.cc:352
 #, kde-format
 msgid ""
-"<qt>Unable to run the command specified. The file or folder <b>%1</b> does "
-"not exist.</qt>"
+"Are you sure you wish to remove the bookmark folder\n"
+"\"%1\"?"
 msgstr ""
-"<qt>Methu rhedeg y gorchymyn penodol. Nid yw'r ffeil neu plygell "
-"<b>%1</b>mewn bod.</qt>"
 
-#: kio/krun.cpp:1764
+#: bookmarks/kbookmarkmenu.cc:353
 #, kde-format
-msgid "Could not find the program '%1'"
+msgid ""
+"Are you sure you wish to remove the bookmark\n"
+"\"%1\"?"
 msgstr ""
 
-#: kio/kfileitem.cpp:1053
-#, kde-format
-msgid "(Symbolic Link to %1)"
+#: bookmarks/kbookmarkmenu.cc:354
+msgid "Bookmark Folder Deletion"
 msgstr ""
 
-#: kio/kfileitem.cpp:1055
-#, kde-format
-msgid "(%1, Link to %2)"
+#: bookmarks/kbookmarkmenu.cc:355
+msgid "Bookmark Deletion"
 msgstr ""
 
-#: kio/kfileitem.cpp:1059
-#, kde-format
-msgid " (Points to %1)"
+#: bookmarks/kbookmarkmenu.cc:458
+msgid "Open all bookmarks in this folder as a new tab."
 msgstr ""
 
-#: kio/kfileitem.cpp:1087 ../kioslave/http/kcookiejar/kcookiewin.cpp:205
-msgid "Name:"
-msgstr "Enw:"
-
-#: kio/kfileitem.cpp:1088 kfile/kpropertiesdialog.cpp:948
-msgid "Type:"
-msgstr "Math:"
-
-#: kio/kfileitem.cpp:1092
-#, kde-format
-msgid "Link to %1 (%2)"
-msgstr ""
+#: bookmarks/kbookmarkmenu.cc:471
+msgid "Bookmark Tabs as Folder..."
+msgstr "Creu Plygell allan o'r Tabiau Tudnodau..."
 
-#: kio/kfileitem.cpp:1097 kfile/kpropertiesdialog.cpp:999
-msgid "Size:"
-msgstr "Maint:"
+#: bookmarks/kbookmarkmenu.cc:475
+msgid "Add a folder of bookmarks for all open tabs."
+msgstr "Ychwanegu plygell o dudnodau am bob tab sy'n agored."
 
-#: kio/kfileitem.cpp:1101 kfile/kpropertiesdialog.cpp:1060
-msgid "Modified:"
-msgstr "Newidwyd:"
+#: bookmarks/kbookmarkmenu.cc:508
+msgid "Edit your bookmark collection in a separate window"
+msgstr "Golygu eich casgliad tudnodau mewn ffenest gwahanol"
 
-#: kio/kfileitem.cpp:1104
-msgid "Owner:"
-msgstr "Perchennog:"
+#: bookmarks/kbookmarkmenu.cc:517
+msgid "New Bookmark Folder..."
+msgstr ""
 
-#: kio/kfileitem.cpp:1105
-msgid "Permissions:"
-msgstr "Caniatadau"
+#: bookmarks/kbookmarkmenu.cc:519
+msgid "Create a new bookmark folder in this menu"
+msgstr "Creu plygell newydd i dudnodau yn y ddewislen yma"
 
-#: kio/netaccess.cpp:105
-#, kde-format
-msgid "File '%1' is not readable"
-msgstr "Nid yw'r ffeil '%1' yn ddarllenadwy"
+#: bookmarks/kbookmarkdialog.cc:41
+msgctxt "@action:button"
+msgid "Update"
+msgstr ""
 
-#: kio/netaccess.cpp:454
-#, kde-format
-msgid "ERROR: Unknown protocol '%1'"
+#: bookmarks/kbookmarkdialog.cc:42
+msgctxt "@title:window"
+msgid "Bookmark Properties"
 msgstr ""
 
-#: kio/connection.cpp:211
-#, kde-format
-msgid "Unable to create io-slave: %1"
-msgstr "Methu creu gwas-io: %1"
+#: bookmarks/kbookmarkdialog.cc:70 bookmarks/kbookmarkdialog.cc:102
+msgctxt "@action:button"
+msgid "Add"
+msgstr ""
 
-#: kio/kdbusservicestarter.cpp:76
-#, kde-format
-msgid "No service implementing %1"
-msgstr "Nid oes gwasanaeth sy'n gweithredu %1"
+#: bookmarks/kbookmarkdialog.cc:71
+msgctxt "@title:window"
+msgid "Add Bookmark"
+msgstr ""
 
-#: kio/tcpslavebase.cpp:326
-msgid ""
-"You are about to leave secure mode. Transmissions will no longer be "
-"encrypted.\n"
-"This means that a third party could observe your data in transit."
+#: bookmarks/kbookmarkdialog.cc:72 bookmarks/kbookmarkdialog.cc:104
+#: bookmarks/kbookmarkdialog.cc:131
+msgctxt "@action:button"
+msgid "&New Folder..."
 msgstr ""
-"Rydych ar fin gadael modd diogel. Ni fydd trosglwyddiadau yn cael eu "
-"amgryptio. \n"
-"Golygir hwn y gallai trydydd blaid wylio eich data ar y daith."
 
-#: kio/tcpslavebase.cpp:332 kio/tcpslavebase.cpp:616
-msgid "Security Information"
-msgstr "Gwybodaeth Ddiogelwch"
+#: bookmarks/kbookmarkdialog.cc:103
+msgctxt "@title:window"
+msgid "Add Bookmarks"
+msgstr ""
 
-#: kio/tcpslavebase.cpp:333
-msgid "C&ontinue Loading"
+#: bookmarks/kbookmarkdialog.cc:132 ../kfile/kdirselectdialog.cpp:281
+msgctxt "@title:window"
+msgid "Select Folder"
 msgstr ""
 
-#: kio/tcpslavebase.cpp:398
-#, kde-format
-msgctxt "%1 is a host name"
-msgid "%1: SSL negotiation failed"
+#: bookmarks/kbookmarkdialog.cc:159 ../kfile/kdirselectdialog.cpp:135
+#: ../kfile/knewfilemenu.cpp:1034
+msgctxt "@title:window"
+msgid "New Folder"
 msgstr ""
 
-#: kio/tcpslavebase.cpp:610
-msgid ""
-"You are about to enter secure mode. All transmissions will be encrypted "
-"unless otherwise noted.\n"
-"This means that no third party will be able to easily observe your data in "
-"transit."
+#: bookmarks/kbookmarkdialog.cc:292
+msgctxt "@label:textbox"
+msgid "Name:"
 msgstr ""
-"Rydych ar fin mynd i mewn i modd diogel. Bydd pob trosglwyddiad yn cael ei "
-"amgriptio onibai i chi glywed yn wahanol. \n"
-"Golygir hyn na allai trydydd blaid wylio eich data yn hawdd ar y daith."
 
-#: kio/tcpslavebase.cpp:617
-msgid "Display SSL &Information"
+#: bookmarks/kbookmarkdialog.cc:297
+msgctxt "@label:textbox"
+msgid "Location:"
 msgstr ""
 
-#: kio/tcpslavebase.cpp:618
-msgid "C&onnect"
-msgstr "C&ysylltu"
-
-#: kio/tcpslavebase.cpp:754
-msgid "Enter the certificate password:"
-msgstr "Mewnosodwch cyfrinair y tystysgrif:"
-
-#: kio/tcpslavebase.cpp:755
-msgid "SSL Certificate Password"
-msgstr "Cyfrinair Tystysgrif SSL"
-
-#: kio/tcpslavebase.cpp:768
-msgid "Unable to open the certificate. Try a new password?"
-msgstr "Methu agor y tystysgrif.  Ceisio cyfrinair newydd?"
-
-#: kio/tcpslavebase.cpp:781
-msgid "The procedure to set the client certificate for the session failed."
-msgstr "Methodd y weithdrefn i osod y tystysgrif cleient i'r sesiwn."
-
-#: kio/tcpslavebase.cpp:955
-msgid ""
-"You have indicated that you wish to accept this certificate, but it is not "
-"issued to the server who is presenting it. Do you wish to continue loading?"
+#: bookmarks/kbookmarkdialog.cc:302
+msgctxt "@label:textbox"
+msgid "Comment:"
 msgstr ""
-"Rydych wedi mynegi yr ydych eisiau derbyn y tystysgrif yma, ond nid yw wedi "
-"ei gyhoeddi i'r gweinydd sy'n ei gyflwyno.  Ydych eisiau dal i lwytho?"
 
-#: kio/tcpslavebase.cpp:967
-msgid ""
-"SSL certificate is being rejected as requested. You can disable this in the "
-"KDE System Settings."
+#: bookmarks/kbookmarkdialog.cc:331
+msgctxt "@title:window"
+msgid "Create New Bookmark Folder"
 msgstr ""
 
-#: kio/kemailsettings.cpp:251 kio/kemailsettings.cpp:254
-#: kio/kemailsettings.cpp:261
-msgid "Default"
+#: bookmarks/kbookmarkdialog.cc:332
+#, kde-format
+msgctxt "@title:window"
+msgid "Create New Bookmark Folder in %1"
 msgstr ""
 
-#: kio/renamedialog.cpp:124
-msgid "Appl&y to All"
+#: bookmarks/kbookmarkdialog.cc:335
+msgctxt "@label:textbox"
+msgid "New folder:"
 msgstr ""
 
-#: kio/renamedialog.cpp:125
-msgid ""
-"When this is checked the button pressed will be applied to all subsequent "
-"folder conflicts for the remainder of the current job.\n"
-"Unless you press Skip you will still be prompted in case of a conflict with "
-"an existing file in the directory."
+#: bookmarks/kbookmarkdialog.cc:367
+msgctxt "name of the container of all browser bookmarks"
+msgid "Bookmarks"
 msgstr ""
 
-#: kio/renamedialog.cpp:126
-msgid ""
-"When this is checked the button pressed will be applied to all subsequent "
-"conflicts for the remainder of the current job."
-msgstr ""
+#: bookmarks/kbookmarkimporter_ns.cc:115 bookmarks/kbookmarkimporter_ns.cc:119
+msgid "*.html|HTML Files (*.html)"
+msgstr "Ffeiliau *.html|HTML (*.html)"
 
-#: kio/renamedialog.cpp:131
-msgid "&Rename"
-msgstr "&Ail-enwi"
+#: bookmarks/kbookmarkimporter_ns.cc:162
+msgid "<!-- This file was generated by Konqueror -->"
+msgstr "<!-- Creuwyd y ffeil yma gan Konqueror -->"
 
-#: kio/renamedialog.cpp:133
-msgid "Suggest New &Name"
-msgstr "Awgrymu Enw &Newydd"
+#: bookmarks/kbookmarkimporter_ns.cc:165 bookmarks/kbookmarkimporter_ns.cc:166
+#: ../kfile/kfilewidget.cpp:2514
+msgid "Bookmarks"
+msgstr ""
 
-#: kio/renamedialog.cpp:139
-msgid "&Skip"
-msgstr "&Hepgor"
+#: bookmarks/kbookmark.cc:323
+msgid "--- separator ---"
+msgstr "--- gwahanydd ---"
 
-#: kio/renamedialog.cpp:140
-msgid "Do not copy or move this folder, skip to the next item instead"
+#: bookmarks/konqbookmarkmenu.cc:61 bookmarks/konqbookmarkmenu.cc:78
+msgid "Hide in toolbar"
 msgstr ""
 
-#: kio/renamedialog.cpp:141
-msgid "Do not copy or move this file, skip to the next item instead"
+#: bookmarks/konqbookmarkmenu.cc:61 bookmarks/konqbookmarkmenu.cc:78
+msgid "Show in toolbar"
 msgstr ""
 
-#: kio/renamedialog.cpp:146
-msgctxt "Write files into an existing folder"
-msgid "&Write Into"
+#: bookmarks/konqbookmarkmenu.cc:71
+msgid "Open in New Window"
 msgstr ""
 
-#: kio/renamedialog.cpp:146
-msgid "&Overwrite"
-msgstr "&Dros-ysgrifennu"
-
-#: kio/renamedialog.cpp:148
-msgid ""
-"Files and folders will be copied into the existing directory, alongside its "
-"existing contents.\n"
-"You will be prompted again in case of a conflict with an existing file in "
-"the directory."
+#: bookmarks/konqbookmarkmenu.cc:72
+msgid "Open in New Tab"
 msgstr ""
 
-#: kio/renamedialog.cpp:153
-msgid "&Resume"
-msgstr "Ai&l-ddechrau"
-
-#: kio/renamedialog.cpp:162
+#: bookmarks/kbookmarkmanager.cc:443
 #, kde-format
 msgid ""
-"This action would overwrite '%1' with itself.\n"
-"Please enter a new file name:"
+"Unable to save bookmarks in %1. Reported error was: %2. This error message "
+"will only be shown once. The cause of the error needs to be fixed as quickly "
+"as possible, which is most likely a full hard drive."
 msgstr ""
-"Buasai'r gweithrediad yma yn ysgrifennu '%1' dros ei hun.\n"
-"Mewnosodwch enw ffeil newydd:"
+"Methwyd cadw'r tudnodau yn %1.  Y gwall a hysbyswyd oedd: %2.  Bydd y neges "
+"gwall yma yn cael ei ddangos dim ond unwaith.  Trwsiwch yr achos posibl o'r "
+"gwall mor gyflym ac syn'n bosibl.  Yr achos mwyaf debygol yw disg caled "
+"llawn."
 
-#: kio/renamedialog.cpp:166
-msgid "C&ontinue"
-msgstr "&Mynd ymlaen"
+#: bookmarks/kbookmarkimporter_opera.cc:121
+#: bookmarks/kbookmarkimporter_opera.cc:125
+msgid "*.adr|Opera Bookmark Files (*.adr)"
+msgstr "*.adr|Ffeiliau Tudnodau Opera (*.adr)"
 
-#: kio/renamedialog.cpp:238
-msgid "This action will overwrite the destination."
-msgstr ""
+#: httpfilter/httpfilter.cc:179
+msgid "Receiving corrupt data."
+msgstr "Derbyn data llygredig."
 
-#: kio/renamedialog.cpp:240
-msgid "Source"
-msgstr ""
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: kio/renamedialog.cpp:241
-msgid "Destination"
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
+
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:11
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2)
+#: rc.cpp:5
+msgctxt ""
+"@title:group Title of a group that lets the user choose options about the "
+"terminal when launching a program"
+msgid "Terminal"
 msgstr ""
 
-#: kio/renamedialog.cpp:241
-msgid "Warning, the destination is more recent."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:33
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, terminalCheck)
+#: rc.cpp:8
+msgid ""
+"Check this option if the application you want to run is a text mode "
+"application or if you want the information that is provided by the terminal "
+"emulator window."
 msgstr ""
 
-#: kio/renamedialog.cpp:278
-#, kde-format
-msgid "An older item named '%1' already exists."
-msgstr "Mae eitem hyn o'r enw '%1' mewn bod yn barod."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:36
+#. i18n: ectx: property (text), widget (QCheckBox, terminalCheck)
+#: rc.cpp:11
+msgid "&Run in terminal"
+msgstr "&Rhedeg mewn terfynell"
 
-#: kio/renamedialog.cpp:280
-#, kde-format
-msgid "A similar file named '%1' already exists."
-msgstr "Mae ffeil tebyg o'r enw '%1' mewn bod yn barod."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:43
+#. i18n: ectx: property (text), widget (QLabel, terminalEditLabel)
+#: rc.cpp:14
+msgid "&Terminal options:"
+msgstr "&Dewisiadau Terfynell"
 
-#: kio/renamedialog.cpp:276
-#, kde-format
-msgid "A more recent item named '%1' already exists."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:53
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, terminalCloseCheck)
+#: rc.cpp:17
+msgid ""
+"Check this option if the text mode application offers relevant information "
+"on exit. Keeping the terminal emulator open allows you to retrieve this "
+"information."
 msgstr ""
 
-#: kio/renamedialog.cpp:293
-msgid "Rename:"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:56
+#. i18n: ectx: property (text), widget (QCheckBox, terminalCloseCheck)
+#: rc.cpp:20
+msgid "Do not &close when command exits"
+msgstr "Peidiwch a c&hau pan bydd y gorchymyn yn terfynu."
 
-#: kio/accessmanager.cpp:162
-msgid "Blocked request."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:69
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2_2)
+#: rc.cpp:23
+msgctxt ""
+"@title:group Title of a group that lets the user choose which user to use "
+"when launching a program"
+msgid "User"
 msgstr ""
 
-#: kio/accessmanager.cpp:203
-msgid "Unknown HTTP verb."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:75
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, suidCheck)
+#: rc.cpp:26
+msgid ""
+"Check this option if you want to run this application with a different user "
+"id. Every process has a different user id associated with it. This id code "
+"determines file access and other permissions. The password of the user is "
+"required to use this option."
 msgstr ""
 
-#: kio/kimageio.cpp:43
-msgid "All Pictures"
-msgstr "Pob Delwedd"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:78
+#. i18n: ectx: property (text), widget (QCheckBox, suidCheck)
+#: rc.cpp:29
+msgid "Ru&n as a different user"
+msgstr "Rhede&g fel defnyddiwr gwahanol"
 
-#: kio/slave.cpp:442
-#, kde-format
-msgid "Unknown protocol '%1'."
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:101
+#. i18n: ectx: property (whatsThis), widget (QLabel, suidEditLabel)
+#: rc.cpp:32
+msgid "Enter the user name you want to run the application as."
 msgstr ""
+"Mewnosodwch enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
 
-#: kio/slave.cpp:451
-#, kde-format
-msgid "Can not find io-slave for protocol '%1'."
-msgstr "Methu canfod gwas-io i brotocol '%1'."
-
-#: kio/slave.cpp:470
-#, kde-format
-msgid "Cannot talk to klauncher: %1"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:104
+#. i18n: ectx: property (text), widget (QLabel, suidEditLabel)
+#: rc.cpp:35
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
 
-#: kio/slave.cpp:478
-#, kde-format
-msgid ""
-"Unable to create io-slave:\n"
-"klauncher said: %1"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:114
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, suidEdit)
+#: rc.cpp:38
+msgid "Enter the user name you want to run the application as here."
 msgstr ""
-"Methu creu gwas-io:\n"
-" dywedodd klauncher: %1"
+"Mewnosodwch yma enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
 
-#: kio/slavebase.h:266 kio/slavebase.h:286
-msgid "&Yes"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:124
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup4)
+#: rc.cpp:41
+msgctxt ""
+"@title:group Title of a group that lets the user choose options regargin "
+"program startup"
+msgid "Startup"
 msgstr ""
 
-#: kio/slavebase.h:267 kio/slavebase.h:287
-msgid "&No"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:130
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, startupInfoCheck)
+#: rc.cpp:44
+msgid ""
+"Check this option if you want to make clear that your application has "
+"started. This visual feedback may appear as a busy cursor or in the taskbar."
 msgstr ""
+"Cadarnhewch y dewisiad yma os hoffech egluro bod eich cymhwysiad wedi "
+"ymcychwyn.  Gall yr adborth gweledol ymddangos fel cyrchydd prysur neu yn y "
+"bar tasgiau."
 
-#: kio/kscan.cpp:50
-msgid "Acquire Image"
-msgstr "Cipio Delwedd"
-
-#: kio/kscan.cpp:99
-msgid "OCR Image"
-msgstr "Delwedd OCR"
-
-#: kio/fileundomanager.cpp:116
-msgid "Creating directory"
-msgstr ""
-
-#: kio/fileundomanager.cpp:119
-msgid "Moving"
-msgstr ""
-
-#: kio/fileundomanager.cpp:123
-msgid "Deleting"
-msgstr ""
-
-#: kio/fileundomanager.cpp:284
-msgid "Und&o"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:133
+#. i18n: ectx: property (text), widget (QCheckBox, startupInfoCheck)
+#: rc.cpp:47
+msgid "Enable &launch feedback"
+msgstr "Galluogi adbor&th ymgychwyn"
 
-#: kio/fileundomanager.cpp:288
-msgid "Und&o: Copy"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:140
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, systrayCheck)
+#: rc.cpp:50
+msgid ""
+"Check this option if you want to have a system tray handle for your "
+"application."
 msgstr ""
 
-#: kio/fileundomanager.cpp:290
-msgid "Und&o: Link"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:143
+#. i18n: ectx: property (text), widget (QCheckBox, systrayCheck)
+#: rc.cpp:53
+msgid "&Place in system tray"
 msgstr ""
 
-#: kio/fileundomanager.cpp:292
-msgid "Und&o: Move"
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:150
+#. i18n: ectx: property (text), widget (QLabel, textLabel12)
+#: rc.cpp:56
+msgid "&D-Bus registration:"
 msgstr ""
 
-#: kio/fileundomanager.cpp:294
-msgid "Und&o: Rename"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:161
+#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
+#: rc.cpp:59
+msgid "None"
+msgstr "Dim"
 
-#: kio/fileundomanager.cpp:296
-msgid "Und&o: Trash"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:166
+#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
+#: rc.cpp:62
+msgid "Multiple Instances"
+msgstr "Enghreifftiau Lluosol"
 
-#: kio/fileundomanager.cpp:298
-msgid "Und&o: Create Folder"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:171
+#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
+#: rc.cpp:65
+msgid "Single Instance"
+msgstr "Enghraifft Sengl"
 
-#: kio/fileundomanager.cpp:302
-msgid "Und&o: Create File"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:176
+#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
+#: rc.cpp:68
+msgid "Run Until Finished"
+msgstr "Rhedeg tan i'w Orffen"
 
-#: kio/fileundomanager.cpp:764
-#, kde-format
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:14
+#. i18n: ectx: property (whatsThis), widget (QLabel, nameLabel)
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:27
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, nameEdit)
+#: rc.cpp:71 rc.cpp:77
 msgid ""
-"The file %1 was copied from %2, but since then it has apparently been "
-"modified at %3.\n"
-"Undoing the copy will delete the file, and all modifications will be lost.\n"
-"Are you sure you want to delete %4?"
-msgstr ""
-
-#: kio/fileundomanager.cpp:767
-msgid "Undo File Copy Confirmation"
-msgstr ""
-
-#: kio/paste.cpp:48 kio/paste.cpp:131
-msgid "Filename for clipboard content:"
+"Type the name you want to give to this application here. This application "
+"will appear under this name in the applications menu and in the panel."
 msgstr ""
+"Teipiwch yma yr enw yr ydych eisiau roi i'r cymhwysiad yma.  Bydd y "
+"cymhwysiad yma yn ymddangos dan yr enw yma yn y ddewislen gymhwysiadau ac yn "
+"y panel."
 
-#: kio/paste.cpp:124
-#, kde-format
-msgid "%1 (%2)"
-msgstr "%1(%2)"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:17
+#. i18n: ectx: property (text), widget (QLabel, nameLabel)
+#: rc.cpp:74 ../kfile/kfilewidget.cpp:534
+msgid "&Name:"
+msgstr "&Enw:"
 
-#: kio/paste.cpp:140
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:34
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:47
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, genNameEdit)
+#: rc.cpp:80 rc.cpp:86
 msgid ""
-"The clipboard has changed since you used 'paste': the chosen data format is "
-"no longer applicable. Please copy again what you wanted to paste."
-msgstr ""
-
-#: kio/paste.cpp:218 kio/paste.cpp:291
-msgid "The clipboard is empty"
-msgstr "Mae'r gludfwrdd yn wag"
-
-#: kio/paste.cpp:339
-#, kde-format
-msgid "&Paste File"
-msgid_plural "&Paste %1 Files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kio/paste.cpp:341
-#, kde-format
-msgid "&Paste URL"
-msgid_plural "&Paste %1 URLs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kio/paste.cpp:343
-msgid "&Paste Clipboard Contents"
-msgstr ""
-
-#: kio/kdirmodel.cpp:997
-msgctxt "@title:column"
-msgid "Name"
-msgstr ""
-
-#: kio/kdirmodel.cpp:999
-msgctxt "@title:column"
-msgid "Size"
-msgstr ""
-
-#: kio/kdirmodel.cpp:1001
-msgctxt "@title:column"
-msgid "Date"
-msgstr ""
-
-#: kio/kdirmodel.cpp:1003
-msgctxt "@title:column"
-msgid "Permissions"
-msgstr ""
-
-#: kio/kdirmodel.cpp:1005
-msgctxt "@title:column"
-msgid "Owner"
-msgstr ""
-
-#: kio/kdirmodel.cpp:1007
-msgctxt "@title:column"
-msgid "Group"
-msgstr ""
-
-#: kio/kdirmodel.cpp:1009
-msgctxt "@title:column"
-msgid "Type"
-msgstr ""
-
-#: kio/kfileitemdelegate.cpp:236
-#, kde-format
-msgctxt "Items in a folder"
-msgid "1 item"
-msgid_plural "%1 items"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kio/kfileitemdelegate.cpp:292 kio/kfileitemdelegate.cpp:296
-msgctxt "@info mimetype"
-msgid "Unknown"
+"Type the description of this application, based on its use, here. Examples: "
+"a dial up application (KPPP) would be \"Dial up tool\"."
 msgstr ""
+"Teipiwch yma ddisgrifiad o'r cymhwysiad yma, wedi'i seilio ar ei ddefnydd.  "
+"Enghreifftiau: buasai cymhwysiad deialu (KPPP) yn \"Erfyn deilau\"."
 
-#: kio/passworddialog.cpp:62
-msgid "Authorization Dialog"
-msgstr "Ymgom Awdurdodi"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:37
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:83
+msgid "&Description:"
+msgstr "&Disgrifiad:"
 
-#: kfile/kfilemetainfowidget.cpp:163
-msgid "<Error>"
-msgstr "<Gwall>"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:54
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:67
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, commentEdit)
+#: rc.cpp:89 rc.cpp:95
+msgid "Type any comment you think is useful here."
+msgstr "Teipiwch yma unrhyw sylwad o ddefnydd."
 
-#: kfile/kmetaprops.cpp:57
-msgctxt "@title:window"
-msgid "Configure Shown Data"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:57
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:92
+msgid "Comm&ent:"
+msgstr "Syl&wad:"
 
-#: kfile/kmetaprops.cpp:62
-msgctxt "@label::textbox"
-msgid "Select which data should be shown:"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:85
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:111
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, commandEdit)
+#: rc.cpp:99 rc.cpp:117
+#, no-c-format
+msgid ""
+"Type the command to start this application here.\n"
+"\n"
+"Following the command, you can have several place holders which will be "
+"replaced with the actual values when the actual program is run:\n"
+"%f - a single file name\n"
+"%F - a list of files; use for applications that can open several local files "
+"at once\n"
+"%u - a single URL\n"
+"%U - a list of URLs\n"
+"%d - the directory of the file to open\n"
+"%D - a list of directories\n"
+"%i - the icon\n"
+"%m - the mini-icon\n"
+"%c - the caption"
 msgstr ""
+"Teipiwch y gorchymyn i gychwyn y cyhwysiad yma.\n"
+"\n"
+"Wedi'r gorchymyn, gallwch gael mwy nag un cadwrydd lle a fydd yn cael ei "
+"ailosod gan y gwerthoedd gwirioneddol pan rhedir y rhaglen wirioneddol:\n"
+"%f - enw ffeil sengl\n"
+"%F - rhestr ffeiliau; i'w ddefnyddio i gymhwysiadau sy'n gallu agor mwy nag "
+"un ffeil lleol ar yr un pryd\n"
+"%u - URL sengl\n"
+"%U - rhestr o URLau\n"
+"%d - plygell y ffeil i agor\n"
+"%D - rhestr o blygyll\n"
+"%i - yr eicon\n"
+"%m - yr eicon bach\n"
+"%c - y sylwad"
 
-#: kfile/kmetaprops.cpp:120
-msgctxt "@action:button"
-msgid "Configure..."
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:88
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:113
+msgid "Co&mmand:"
+msgstr "G&orchymyn:"
 
-#: kfile/kmetaprops.cpp:130
-msgctxt "@title:tab"
-msgid "Information"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:118
+#. i18n: ectx: property (whatsThis), widget (QPushButton, browseButton)
+#: rc.cpp:131
+msgid ""
+"Click here to browse your file system in order to find the desired "
+"executable."
 msgstr ""
-
-#: kfile/kicondialog.cpp:336 kfile/kicondialog.cpp:348
-msgid "Select Icon"
-msgstr "Dewis Eicon"
-
-#: kfile/kicondialog.cpp:369
-msgid "Icon Source"
-msgstr "Ffynhonell Eicon"
-
-#: kfile/kicondialog.cpp:378
-msgid "S&ystem icons:"
-msgstr "E&iconau cysawd:"
-
-#: kfile/kicondialog.cpp:385
-msgid "O&ther icons:"
-msgstr "Ei&conau eraill:"
+"Cliciwch yma i bori'ch cysawd ffeil er mwyn canfod y gweithredadwyn penodol."
 
 #. i18n: file: kfile/kpropertiesdesktopbase.ui:121
 #. i18n: ectx: property (text), widget (QPushButton, browseButton)
-#: rc.cpp:281 kfile/kicondialog.cpp:388
+#: rc.cpp:134 kfile/kicondialog.cpp:388
 msgid "&Browse..."
 msgstr "&Pori..."
 
-#: kfile/kicondialog.cpp:399
-msgid "&Search:"
-msgstr "&Chwilio:"
-
-#: kfile/kicondialog.cpp:406
-msgid "Search interactively for icon names (e.g. folder)."
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:130
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:143
+#. i18n: ectx: property (whatsThis), widget (KUrlRequester, pathEdit)
+#: rc.cpp:137 rc.cpp:143
+msgid "Sets the working directory for your application."
 msgstr ""
 
-#: kfile/kicondialog.cpp:437
-msgid "Actions"
-msgstr "Gweithrediadau"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:133
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:140
+msgid "&Work path:"
+msgstr "Llwybr g&waith:"
 
-#: kfile/kicondialog.cpp:438
-msgid "Animations"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:157
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel7)
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:178
+#. i18n: ectx: property (whatsThis), widget (QTreeWidget, filetypeList)
+#: rc.cpp:146 rc.cpp:154
+msgid ""
+"<qt><p>This list should show the types of file that your application can "
+"handle. This list is organized by <u>mimetypes</u>.</p>\n"
+"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
+"identifying the type of data based on filename extensions and correspondent "
+"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
+"flower.bmp indicates that it is a specific kind of image, <u>image/x-"
+"bmp</u>. To know which application should open each type of file, the system "
+"should be informed about the abilities of each application to handle these "
+"extensions and mimetypes.</p>\n"
+"<p>If you want to associate this application with one or more mimetypes that "
+"are not in this list, click on the button <b>Add</b> below. If there are one "
+"or more filetypes that this application cannot handle, you may want to "
+"remove them from the list clicking on the button <b>Remove</b> "
+"below.</p></qt>"
 msgstr ""
 
-#: kfile/kicondialog.cpp:439
-msgid "Applications"
-msgstr "Cymhwysiannau"
-
-#: kfile/kicondialog.cpp:440
-msgid "Categories"
-msgstr "Categoriau"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:160
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:151
+msgid "&Supported file types:"
+msgstr "Mat&hau ffeil a gynhelir:"
 
-#: kfile/kicondialog.cpp:441
-msgid "Devices"
-msgstr "Dyfeisiau"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:191
+#. i18n: ectx: property (text), widget (QTreeWidget, filetypeList)
+#: rc.cpp:159
+msgid "Mimetype"
+msgstr "Math MIME"
 
-#: kfile/kicondialog.cpp:442
-msgid "Emblems"
-msgstr ""
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:196
+#. i18n: ectx: property (text), widget (QTreeWidget, filetypeList)
+#: rc.cpp:162
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: kfile/kicondialog.cpp:443
-msgid "Emotes"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:206
+#. i18n: ectx: property (whatsThis), widget (QPushButton, addFiletypeButton)
+#: rc.cpp:165
+msgid ""
+"Click on this button if you want to add a type of file (mimetype) that your "
+"application can handle."
 msgstr ""
+"Cliciwch ar y botwm yma os ydych eisiau ychwanegu math o ffeil (math mime) y "
+"gall eich cymhwysiad ei drin."
 
-#: kfile/kicondialog.cpp:444
-msgid "Filesystems"
-msgstr "Cysodau ffeil"
-
-#: kfile/kicondialog.cpp:445
-msgid "International"
-msgstr "Rhyngwladol"
-
-#: kfile/kicondialog.cpp:446
-msgid "Mimetypes"
-msgstr "Mathau MIME"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:209
+#. i18n: ectx: property (text), widget (QPushButton, addFiletypeButton)
+#. i18n: file: kssl/kcm/cacertificates.ui:111
+#. i18n: ectx: property (text), widget (KPushButton, add)
+#: rc.cpp:168 rc.cpp:234
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: kfile/kicondialog.cpp:447
-msgid "Places"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:216
+#. i18n: ectx: property (whatsThis), widget (QPushButton, delFiletypeButton)
+#: rc.cpp:171
+msgid ""
+"If you want to remove a type of file (mimetype) that your application cannot "
+"handle, select the mimetype in the list above and click on this button."
 msgstr ""
+"Os ydych eisiau gwaredu math ffeil (math mime) na all eich cymhwysiad ei "
+"drin, dewiswch y math mime yn y rhestr uchod a cliciwch ar y botwm yma."
 
-#: kfile/kicondialog.cpp:448
-msgid "Status"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:219
+#. i18n: ectx: property (text), widget (QPushButton, delFiletypeButton)
+#. i18n: file: kssl/kcm/cacertificates.ui:104
+#. i18n: ectx: property (text), widget (KPushButton, removeSelection)
+#: rc.cpp:174 rc.cpp:231
+msgid "Remove"
 msgstr ""
 
-#: kfile/kicondialog.cpp:691
-msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
-msgstr "*.png *.xpm *.svg *.svgz|Ffeiliau eicon  (*.png *.xpm *.svg *.svgz)"
-
-#: kfile/kfiledialog.cpp:483 kfile/kfiledialog.cpp:493
-#: kfile/kfiledialog.cpp:514 kfile/kfiledialog.cpp:538
-#: kfile/kfiledialog.cpp:548 kfile/kfiledialog.cpp:574
-#: kfile/kfiledialog.cpp:606 kfile/kfiledialog.cpp:661
-#: kfile/kurlrequesterdialog.cpp:129 kfile/kicondialog.cpp:693
-#: kfile/kencodingfiledialog.cpp:107 kfile/kencodingfiledialog.cpp:125
-#: kfile/kencodingfiledialog.cpp:140 kfile/kencodingfiledialog.cpp:158
-msgid "Open"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:242
+#. i18n: ectx: property (whatsThis), widget (QPushButton, advancedButton)
+#: rc.cpp:177
+msgid ""
+"Click here to modify the way this application will run, launch feedback, D-"
+"Bus options or to run it as a different user."
 msgstr ""
 
-#: kfile/kurlrequester.cpp:246
-msgid "Open file dialog"
-msgstr "Agor Ymgom Ffeil"
+#. i18n: file: kfile/kpropertiesdesktopbase.ui:245
+#. i18n: ectx: property (text), widget (QPushButton, advancedButton)
+#: rc.cpp:180
+msgid "Ad&vanced Options"
+msgstr "De&wisiadau Uwch"
 
-#: kfile/kacleditwidget.cpp:61 kfile/kacleditwidget.cpp:454
-msgid "Owner"
-msgstr "Perchennog"
+#. i18n: file: kssl/keygenwizard.ui:35
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:183
+msgid ""
+"You have indicated that you wish to obtain or purchase a secure certificate. "
+"This wizard is intended to guide you through the procedure. You may cancel "
+"at any time, and this will abort the transaction."
+msgstr ""
+"Rydych wedi dweud yr ydych eisiau cael neu prynu tystysgrif ddiogel.  Bwriad "
+"y dewin yma yw eich arwain drwy'r weithdrefn yma.  Cewch ddiddymu unrhyw "
+"amser, a bydd hyn yn terfynu'r trafod."
 
-#: kfile/kacleditwidget.cpp:62 kfile/kacleditwidget.cpp:459
-msgid "Owning Group"
+#. i18n: file: kssl/keygenwizard2.ui:35
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
+#: rc.cpp:186
+msgid ""
+"You must now provide a password for the certificate request. Please choose a "
+"very secure password as this will be used to encrypt your private key."
 msgstr ""
+"Rhaid i chi ddarparu rwan cyfrinair i'r cais tystysgrif.  Dewiswch cyfrinair "
+"diogel iawn, gan fod hwn yn cael ei ddefnyddio i amgryptio eich allwedd "
+"preifat."
 
-#: kfile/kpropertiesdialog.cpp:2010 kfile/kacleditwidget.cpp:63
-#: kfile/kacleditwidget.cpp:464
-msgid "Others"
-msgstr "Eraill"
+#. i18n: file: kssl/keygenwizard2.ui:48
+#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
+#: rc.cpp:189
+msgid "&Repeat password:"
+msgstr "&Ailadrodd cyfrinair:"
+
+#. i18n: file: kssl/keygenwizard2.ui:58
+#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
+#: rc.cpp:192
+msgid "&Choose password:"
+msgstr "&Dewis cyfrinair:"
 
-#: kfile/kacleditwidget.cpp:64 kfile/kacleditwidget.cpp:469
-msgid "Mask"
+#. i18n: file: kssl/kcm/displaycert.ui:23
+#. i18n: ectx: property (text), widget (QLabel, subjectHeading)
+#: rc.cpp:195
+msgid "<b>Subject Information</b>"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:65
-msgid "Named User"
+#. i18n: file: kssl/kcm/displaycert.ui:39
+#. i18n: ectx: property (text), widget (QLabel, issuerHeading)
+#: rc.cpp:198
+msgid "<b>Issuer Information</b>"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:66
-msgid "Named Group"
+#. i18n: file: kssl/kcm/displaycert.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:201
+msgid "<b>Other</b>"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:98 ../kfile/kfileplacesview.cpp:580
-#: ../kfile/kfileplacesview.cpp:601 ../kfile/kfileplacesview.cpp:608
-msgid "Add Entry..."
-msgstr "Ychwanegu cofnod ..."
+#. i18n: file: kssl/kcm/displaycert.ui:64
+#. i18n: ectx: property (text), widget (QLabel, validityPeriodLabel)
+#: rc.cpp:204
+msgid "Validity period"
+msgstr ""
 
-#: kfile/kacleditwidget.cpp:102
-msgid "Edit Entry..."
-msgstr "Golygu cofnod ..."
+#. i18n: file: kssl/kcm/displaycert.ui:78
+#. i18n: ectx: property (text), widget (QLabel, serialNumberLabel)
+#: rc.cpp:207
+msgid "Serial number"
+msgstr ""
 
-#: kfile/kacleditwidget.cpp:106
-msgid "Delete Entry"
+#. i18n: file: kssl/kcm/displaycert.ui:92
+#. i18n: ectx: property (text), widget (QLabel, md5DigestLabel)
+#: rc.cpp:210
+msgid "MD5 digest"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:307
-msgid " (Default)"
-msgstr " (Rhagosodedig)"
+#. i18n: file: kssl/kcm/displaycert.ui:106
+#. i18n: ectx: property (text), widget (QLabel, sha1DigestLabel)
+#: rc.cpp:213
+msgid "SHA1 digest"
+msgstr ""
 
-#: kfile/kacleditwidget.cpp:431
-msgid "Edit ACL Entry"
+#. i18n: file: kssl/kcm/cacertificates.ui:24
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
+#: rc.cpp:216
+msgid "Organization / Common Name"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:439
-msgid "Entry Type"
+#. i18n: file: kssl/kcm/cacertificates.ui:29
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
+#: rc.cpp:219
+msgid "Organizational Unit"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:445
-msgid "Default for new files in this folder"
+#. i18n: file: kssl/kcm/cacertificates.ui:42
+#. i18n: ectx: property (text), widget (QPushButton, displaySelection)
+#: rc.cpp:222
+msgid "Display..."
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:474
-msgid "Named user"
+#. i18n: file: kssl/kcm/cacertificates.ui:68
+#. i18n: ectx: property (text), widget (KPushButton, disableSelection)
+#: rc.cpp:225
+msgid "Disable"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:479
-msgid "Named group"
+#. i18n: file: kssl/kcm/cacertificates.ui:78
+#. i18n: ectx: property (text), widget (QPushButton, enableSelection)
+#: rc.cpp:228
+msgid "Enable"
 msgstr ""
 
-#: kfile/kacleditwidget.cpp:499
-msgid "User: "
-msgstr "Defnyddiwr: "
+#. i18n: file: kssl/certificateparty.ui:28
+#. i18n: ectx: property (text), widget (QLabel, commonNameTag)
+#: rc.cpp:237
+msgid "Common name:"
+msgstr "Enw Cyffredin:"
 
-#: kfile/kacleditwidget.cpp:505
-msgid "Group: "
-msgstr "Gr?p: "
+#. i18n: file: kssl/certificateparty.ui:38
+#. i18n: ectx: property (text), widget (QLabel, commonName)
+#: rc.cpp:240
+msgid "Acme Co."
+msgstr ""
 
-#: kfile/kacleditwidget.cpp:625
-msgid "Type"
-msgstr "Math"
+#. i18n: file: kssl/certificateparty.ui:48
+#. i18n: ectx: property (text), widget (QLabel, organizationTag)
+#: rc.cpp:243
+msgid "Organization:"
+msgstr "Sefydliad:"
 
-#: kfile/kacleditwidget.cpp:626
-msgid "Name"
-msgstr "Enw"
+#. i18n: file: kssl/certificateparty.ui:58
+#. i18n: ectx: property (text), widget (QLabel, organization)
+#: rc.cpp:246
+msgid "Acme Sundry Products Company"
+msgstr ""
 
-#: kfile/kacleditwidget.cpp:627
-msgctxt "read permission"
-msgid "r"
-msgstr "r"
+#. i18n: file: kssl/certificateparty.ui:68
+#. i18n: ectx: property (text), widget (QLabel, organizationalUnitTag)
+#: rc.cpp:249
+msgid "Organizational unit:"
+msgstr "Uned trefniadaeth:"
 
-#: kfile/kacleditwidget.cpp:628
-msgctxt "write permission"
-msgid "w"
-msgstr "gorllewin"
+#. i18n: file: kssl/certificateparty.ui:78
+#. i18n: ectx: property (text), widget (QLabel, organizationalUnit)
+#: rc.cpp:252
+msgid "Fraud Department"
+msgstr ""
 
-#: kfile/kacleditwidget.cpp:629
-msgctxt "execute permission"
-msgid "x"
-msgstr "x"
+#. i18n: file: kssl/certificateparty.ui:88
+#. i18n: ectx: property (text), widget (QLabel, countryTag)
+#: rc.cpp:255
+msgid "Country:"
+msgstr "Gwlad:"
 
-#: kfile/kacleditwidget.cpp:630
-msgid "Effective"
+#. i18n: file: kssl/certificateparty.ui:98
+#. i18n: ectx: property (text), widget (QLabel, country)
+#: rc.cpp:258
+msgid "Canada"
 msgstr ""
 
-#: kfile/kopenwithdialog.cpp:269
-msgid "Known Applications"
-msgstr "Cymhwysiannau Hysbys"
+#. i18n: file: kssl/certificateparty.ui:108
+#. i18n: ectx: property (text), widget (QLabel, stateTag)
+#: rc.cpp:261
+msgid "State:"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:482
-msgid "Open With"
-msgstr "Agor Efo"
+#. i18n: file: kssl/certificateparty.ui:118
+#. i18n: ectx: property (text), widget (QLabel, state)
+#: rc.cpp:264
+msgid "Quebec"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:487
-#, kde-format
-msgid ""
-"<qt>Select the program that should be used to open <b>%1</b>. If the program "
-"is not listed, enter the name or click the browse button.</qt>"
+#. i18n: file: kssl/certificateparty.ui:128
+#. i18n: ectx: property (text), widget (QLabel, cityTag)
+#: rc.cpp:267
+msgid "City:"
 msgstr ""
-"<qt>Dewis y rhaglen a ddylai gael ei defnyddio i agor <b>%1</b>. Os nad yw'r "
-"rhaglen wedi ei rhestru, mewnbynnwch yr enw neu clicio ar y botwm pori.</qt>"
 
-#: kfile/kopenwithdialog.cpp:493
-msgid "Choose the name of the program with which to open the selected files."
-msgstr "Dewis enw'r rhaglen i agor y ffeiliau penodol."
+#. i18n: file: kssl/certificateparty.ui:138
+#. i18n: ectx: property (text), widget (QLabel, city)
+#: rc.cpp:270
+msgid "Lakeridge Meadows"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:520
-#, kde-format
-msgid "Choose Application for %1"
-msgstr "Dewis Cymhwysiad i %1"
+#. i18n: file: kssl/sslinfo.ui:17
+#. i18n: ectx: property (text), widget (QLabel, encryptionIndicator)
+#: rc.cpp:273
+msgid "[padlock]"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:521
-#, kde-format
-msgid ""
-"<qt>Select the program for the file type: <b>%1</b>. If the program is not "
-"listed, enter the name or click the browse button.</qt>"
+#. i18n: file: kssl/sslinfo.ui:34
+#. i18n: ectx: property (text), widget (QLabel, addressTag)
+#: rc.cpp:276
+msgctxt "Web page address"
+msgid "Address:"
 msgstr ""
-"<qt>Dewis y rhaglen i'r math o ffeil: <b>%1</b>. Os nad yw'r rhaglen wedi ei "
-"rhestru, mewnbynnwch yr enw neu clicio ar y botwm pori</qt>"
 
-#: kfile/kopenwithdialog.cpp:536
-msgid "Choose Application"
-msgstr "Dewis Cymhwysiad"
+#. i18n: file: kssl/sslinfo.ui:54
+#. i18n: ectx: property (text), widget (QLabel, ipTag)
+#: rc.cpp:279
+msgid "IP address:"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:537
-msgid ""
-"<qt>Select a program. If the program is not listed, enter the name or click "
-"the browse button.</qt>"
+#. i18n: file: kssl/sslinfo.ui:74
+#. i18n: ectx: property (text), widget (QLabel, encryptionTag)
+#: rc.cpp:282
+msgid "Encryption:"
 msgstr ""
-"<qt>Dewisi rhaglen. Os nad yw'r rhaglen wedi ei rhestru, mewnbynnwch yr enw "
-"neu clicio ar y botwm pori</qt>"
 
-#: kfile/kopenwithdialog.cpp:600
-msgid ""
-"Following the command, you can have several place holders which will be "
-"replaced with the actual values when the actual program is run:\n"
-"%f - a single file name\n"
-"%F - a list of files; use for applications that can open several local files "
-"at once\n"
-"%u - a single URL\n"
-"%U - a list of URLs\n"
-"%d - the directory of the file to open\n"
-"%D - a list of directories\n"
-"%i - the icon\n"
-"%m - the mini-icon\n"
-"%c - the comment"
+#. i18n: file: kssl/sslinfo.ui:94
+#. i18n: ectx: property (text), widget (QLabel, detailsTag)
+#: rc.cpp:285
+msgid "Details:"
+msgstr "Manylion:"
+
+#. i18n: file: kssl/sslinfo.ui:114
+#. i18n: ectx: property (text), widget (QLabel, sslVersionTag)
+#: rc.cpp:288
+msgid "SSL version:"
 msgstr ""
-"Wedi'r gorchymyn, gallwch gael mwy nag un cadwryddion lle a fydd yn cael ei "
-"ailosod gan y gwerthoedd gwirioneddol pan rhedir y rhaglen wirioneddol:\n"
-"%f - enw ffeil sengl\n"
-"%F - rhestr ffeiliau; i'w ddefnyddio i gymhwysiadau sy'n gallu agor mwy nag "
-"un ffeil lleol ar yr un pryd\n"
-"%u - URL sengl\n"
-"%U - rhestr o URLau\n"
-"%d - cyfeiriadur y ffeil i agor\n"
-"%D - rhestr o gyfeiriaduron\n"
-"%i - yr eicon\n"
-"%m - yr eicon bach\n"
-"%c - y sylwad"
 
-#: kfile/kopenwithdialog.cpp:634
-msgid "Run in &terminal"
-msgstr "Rhedeg mewn &terfynell"
+#. i18n: file: kssl/sslinfo.ui:134
+#. i18n: ectx: property (text), widget (QLabel, certSelectorTag)
+#: rc.cpp:291
+msgid "Certificate chain:"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:651
-msgid "&Do not close when command exits"
-msgstr "&Peidiwch a chau pan terfynir y gorchymyn"
+#. i18n: file: kssl/sslinfo.ui:163
+#. i18n: ectx: property (text), widget (QLabel, trustedTag)
+#: rc.cpp:294
+msgid "Trusted:"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:668
-msgid "&Remember application association for this type of file"
-msgstr "&Cofio cyd-gymhwysiad i'r math yma o ffeil"
+#. i18n: file: kssl/sslinfo.ui:183
+#. i18n: ectx: property (text), widget (QLabel, validityPeriodTag)
+#: rc.cpp:297
+msgid "Validity period:"
+msgstr ""
 
-#: kfile/kopenwithdialog.cpp:806
-#, kde-format
-msgid ""
-"Could not extract executable name from '%1', please type a valid program "
-"name."
+#. i18n: file: kssl/sslinfo.ui:203
+#. i18n: ectx: property (text), widget (QLabel, serialTag)
+#: rc.cpp:300
+msgid "Serial number:"
 msgstr ""
 
-#: kfile/kopenwithdialog.cpp:852
-#, kde-format
-msgid "'%1' not found, please type a valid program name."
+#. i18n: file: kssl/sslinfo.ui:223
+#. i18n: ectx: property (text), widget (QLabel, digestTag)
+#: rc.cpp:303
+msgid "MD5 digest:"
 msgstr ""
 
-#: kfile/kfiledialog.cpp:129
-msgid "*|All files"
+#. i18n: file: kssl/sslinfo.ui:243
+#. i18n: ectx: property (text), widget (QLabel, sha1DigestTag)
+#: rc.cpp:306
+msgid "SHA1 digest:"
 msgstr ""
 
-#: kfile/kfiledialog.cpp:360 ../kfile/kfilefiltercombo.cpp:180
-msgid "All Supported Files"
-msgstr "Pob Ffeil a Cynhelir"
+#: kfile/kicondialog.cpp:336 kfile/kicondialog.cpp:348
+msgid "Select Icon"
+msgstr "Dewis Eicon"
 
-#: kfile/kfiledialog.cpp:741 kfile/kfiledialog.cpp:760
-#: kfile/kfiledialog.cpp:797 kfile/kfiledialog.cpp:839
-#: kfile/kencodingfiledialog.cpp:178 kfile/kencodingfiledialog.cpp:199
-msgid "Save As"
+#: kfile/kicondialog.cpp:369
+msgid "Icon Source"
+msgstr "Ffynhonell Eicon"
+
+#: kfile/kicondialog.cpp:378
+msgid "S&ystem icons:"
+msgstr "E&iconau cysawd:"
+
+#: kfile/kicondialog.cpp:385
+msgid "O&ther icons:"
+msgstr "Ei&conau eraill:"
+
+#: kfile/kicondialog.cpp:399
+msgid "&Search:"
+msgstr "&Chwilio:"
+
+#: kfile/kicondialog.cpp:406
+msgid "Search interactively for icon names (e.g. folder)."
 msgstr ""
 
-#: kfile/kfilemetadatareaderprocess.cpp:169
-msgid "KFileMetaDataReader"
-msgstr ""
+#: kfile/kicondialog.cpp:437
+msgid "Actions"
+msgstr "Gweithrediadau"
 
-#: kfile/kfilemetadatareaderprocess.cpp:171
-msgid "KFileMetaDataReader can be used to read metadata from a file"
+#: kfile/kicondialog.cpp:438
+msgid "Animations"
 msgstr ""
 
-#: kfile/kfilemetadatareaderprocess.cpp:173
-msgid "(C) 2011, Peter Penz"
-msgstr ""
+#: kfile/kicondialog.cpp:439
+msgid "Applications"
+msgstr "Cymhwysiannau"
 
-#: kfile/kfilemetadatareaderprocess.cpp:174
-msgid "Peter Penz"
-msgstr ""
+#: kfile/kicondialog.cpp:440
+msgid "Categories"
+msgstr "Categoriau"
 
-#: kfile/kfilemetadatareaderprocess.cpp:174
-msgid "Current maintainer"
-msgstr ""
+#: kfile/kicondialog.cpp:441
+msgid "Devices"
+msgstr "Dyfeisiau"
 
-#: kfile/kfilemetadatareaderprocess.cpp:179
-msgid "Only the meta data that is part of the file is read"
+#: kfile/kicondialog.cpp:442
+msgid "Emblems"
 msgstr ""
 
-#: kfile/kfilemetadatareaderprocess.cpp:180
-msgid "List of URLs where the meta-data should be read from"
+#: kfile/kicondialog.cpp:443
+msgid "Emotes"
 msgstr ""
 
-#: kfile/kencodingfiledialog.cpp:50
-msgid "Encoding:"
-msgstr ""
+#: kfile/kicondialog.cpp:444
+msgid "Filesystems"
+msgstr "Cysodau ffeil"
 
-#: kfile/kcommentwidget.cpp:65
-msgctxt "@label"
-msgid "Add Comment..."
-msgstr ""
+#: kfile/kicondialog.cpp:445
+msgid "International"
+msgstr "Rhyngwladol"
 
-#: kfile/kcommentwidget.cpp:71
-msgctxt "@label"
-msgid "Change..."
-msgstr ""
+#: kfile/kicondialog.cpp:446
+msgid "Mimetypes"
+msgstr "Mathau MIME"
 
-#: kfile/kcommentwidget.cpp:124
-msgctxt "@title:window"
-msgid "Change Comment"
+#: kfile/kicondialog.cpp:447
+msgid "Places"
 msgstr ""
 
-#: kfile/kcommentwidget.cpp:125
-msgctxt "@title:window"
-msgid "Add Comment"
+#: kfile/kicondialog.cpp:448
+msgid "Status"
 msgstr ""
 
-#: kfile/kdevicelistmodel.cpp:116
-msgid "Device name"
-msgstr ""
+#: kfile/kicondialog.cpp:691
+msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
+msgstr "*.png *.xpm *.svg *.svgz|Ffeiliau eicon  (*.png *.xpm *.svg *.svgz)"
 
-#: kfile/kpreviewprops.cpp:50
-msgid "P&review"
-msgstr "R&hagolwg"
+#: kfile/kicondialog.cpp:693 kfile/kurlrequesterdialog.cpp:128
+#: kfile/kfiledialog.cpp:480 kfile/kfiledialog.cpp:490
+#: kfile/kfiledialog.cpp:511 kfile/kfiledialog.cpp:535
+#: kfile/kfiledialog.cpp:545 kfile/kfiledialog.cpp:571
+#: kfile/kfiledialog.cpp:603 kfile/kfiledialog.cpp:658
+#: kfile/kencodingfiledialog.cpp:106 kfile/kencodingfiledialog.cpp:124
+#: kfile/kencodingfiledialog.cpp:139 kfile/kencodingfiledialog.cpp:157
+msgid "Open"
+msgstr ""
 
-#: kfile/kfilemetadataprovider.cpp:413 kfile/knfotranslator.cpp:40
+#: kfile/knfotranslator.cpp:40 kfile/kfilemetadataprovider.cpp:422
 msgctxt "@label"
 msgid "Comment"
 msgstr ""
@@ -3581,405 +3775,574 @@
 msgstr ""
 
 #: kfile/knfotranslator.cpp:44
+msgctxt "@label"
+msgid "Description"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:45
 msgctxt "@label Software used to generate content"
 msgid "Generator"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:45
+#: kfile/knfotranslator.cpp:46
+msgctxt ""
+"@label see http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasPart"
+msgid "Has Part"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:47
 msgctxt ""
 "@label see "
 "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#hasLogicalPart"
 msgid "Has Logical Part"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:46
+#: kfile/knfotranslator.cpp:48
 msgctxt "@label parent directory"
 msgid "Part of"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:47
+#: kfile/knfotranslator.cpp:49
 msgctxt "@label"
 msgid "Keyword"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:48
+#: kfile/knfotranslator.cpp:50
 msgctxt "@label modified date of file"
 msgid "Modified"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:49
+#: kfile/knfotranslator.cpp:51
 msgctxt "@label"
 msgid "MIME Type"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:50
+#: kfile/knfotranslator.cpp:52
 msgctxt "@label"
 msgid "Content"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:51
+#: kfile/knfotranslator.cpp:53
+msgctxt "@label"
+msgid "Related To"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:54
 msgctxt "@label"
 msgid "Subject"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:52
+#: kfile/knfotranslator.cpp:55
 msgctxt "@label music title"
 msgid "Title"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:53
+#: kfile/knfotranslator.cpp:56
 msgctxt "@label file URL"
 msgid "Location"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:54
+#: kfile/knfotranslator.cpp:57
 msgctxt "@label"
 msgid "Creator"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:55
+#: kfile/knfotranslator.cpp:58
 msgctxt "@label"
 msgid "Average Bitrate"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:56
+#: kfile/knfotranslator.cpp:59
 msgctxt "@label"
 msgid "Channels"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:57
+#: kfile/knfotranslator.cpp:60
 msgctxt "@label number of characters"
 msgid "Characters"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:58
+#: kfile/knfotranslator.cpp:61
 msgctxt "@label"
 msgid "Codec"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:59
+#: kfile/knfotranslator.cpp:62
 msgctxt "@label"
 msgid "Color Depth"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:60
+#: kfile/knfotranslator.cpp:63
 msgctxt "@label"
 msgid "Duration"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:61
+#: kfile/knfotranslator.cpp:64
 msgctxt "@label"
 msgid "Filename"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:62
+#: kfile/knfotranslator.cpp:65
+msgctxt "@label"
+msgid "Hash"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:66
 msgctxt "@label"
 msgid "Height"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:63
+#: kfile/knfotranslator.cpp:67
 msgctxt "@label"
 msgid "Interlace Mode"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:64
+#: kfile/knfotranslator.cpp:68
 msgctxt "@label number of lines"
 msgid "Lines"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:65
+#: kfile/knfotranslator.cpp:69
 msgctxt "@label"
 msgid "Programming Language"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:66
+#: kfile/knfotranslator.cpp:70
 msgctxt "@label"
 msgid "Sample Rate"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:67
+#: kfile/knfotranslator.cpp:71
 msgctxt "@label"
 msgid "Width"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:68
+#: kfile/knfotranslator.cpp:72
 msgctxt "@label number of words"
 msgid "Words"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:69
+#: kfile/knfotranslator.cpp:73
 msgctxt "@label EXIF aperture value"
 msgid "Aperture"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:70
+#: kfile/knfotranslator.cpp:74
 msgctxt "@label EXIF"
 msgid "Exposure Bias Value"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:71
+#: kfile/knfotranslator.cpp:75
 msgctxt "@label EXIF"
 msgid "Exposure Time"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:72
+#: kfile/knfotranslator.cpp:76
 msgctxt "@label EXIF"
 msgid "Flash"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:73
+#: kfile/knfotranslator.cpp:77
 msgctxt "@label EXIF"
 msgid "Focal Length"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:74
+#: kfile/knfotranslator.cpp:78
 msgctxt "@label EXIF"
 msgid "Focal Length 35 mm"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:75
+#: kfile/knfotranslator.cpp:79
 msgctxt "@label EXIF"
 msgid "ISO Speed Ratings"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:76
+#: kfile/knfotranslator.cpp:80
 msgctxt "@label EXIF"
 msgid "Make"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:77
+#: kfile/knfotranslator.cpp:81
 msgctxt "@label EXIF"
 msgid "Metering Mode"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:78
+#: kfile/knfotranslator.cpp:82
 msgctxt "@label EXIF"
 msgid "Model"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:79
+#: kfile/knfotranslator.cpp:83
 msgctxt "@label EXIF"
 msgid "Orientation"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:80
+#: kfile/knfotranslator.cpp:84
 msgctxt "@label EXIF"
 msgid "White Balance"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:81
+#: kfile/knfotranslator.cpp:85
+msgctxt "@label video director"
+msgid "Director"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:86
 msgctxt "@label music genre"
 msgid "Genre"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:82
+#: kfile/knfotranslator.cpp:87
 msgctxt "@label music album"
 msgid "Album"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:83
+#: kfile/knfotranslator.cpp:88
 msgctxt "@label"
 msgid "Performer"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:84
+#: kfile/knfotranslator.cpp:89
+msgctxt "@label"
+msgid "Release Date"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:90
 msgctxt "@label music track number"
 msgid "Track"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:85
+#: kfile/knfotranslator.cpp:91
+msgctxt "@label resource created time"
+msgid "Resource Created"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:92
+msgctxt "@label"
+msgid "Sub Resource"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:93
+msgctxt "@label resource last modified"
+msgid "Resource Modified"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:94
+msgctxt "@label"
+msgid "Numeric Rating"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:95
+msgctxt "@label"
+msgid "Copied From"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:96
+msgctxt "@label"
+msgid "First Usage"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:97
+msgctxt "@label"
+msgid "Last Usage"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:98
+msgctxt "@label"
+msgid "Usage Count"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:99
+msgctxt "@label"
+msgid "Unix File Group"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:100
+msgctxt "@label"
+msgid "Unix File Mode"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:101
+msgctxt "@label"
+msgid "Unix File Owner"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:102
 msgctxt "@label file type"
 msgid "Type"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:86
+#: kfile/knfotranslator.cpp:103
 msgctxt "@label Number of fuzzy translations"
 msgid "Fuzzy Translations"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:87
+#: kfile/knfotranslator.cpp:104
 msgctxt "@label Name of last translator"
 msgid "Last Translator"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:88
+#: kfile/knfotranslator.cpp:105
 msgctxt "@label Number of obsolete translations"
 msgid "Obsolete Translations"
 msgstr ""
 
-#: kfile/knfotranslator.cpp:89
-msgctxt "@label"
-msgid "Translation Source Date"
-msgstr ""
+#: kfile/knfotranslator.cpp:106
+msgctxt "@label"
+msgid "Translation Source Date"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:107
+msgctxt "@label Number of total translations"
+msgid "Total Translations"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:108
+msgctxt "@label Number of translated strings"
+msgid "Translated"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:109
+msgctxt "@label"
+msgid "Translation Date"
+msgstr ""
+
+#: kfile/knfotranslator.cpp:110
+msgctxt "@label Number of untranslated strings"
+msgid "Untranslated"
+msgstr ""
+
+#: kfile/kcommentwidget.cpp:65
+msgctxt "@label"
+msgid "Add Comment..."
+msgstr ""
+
+#: kfile/kcommentwidget.cpp:71
+msgctxt "@label"
+msgid "Change..."
+msgstr ""
+
+#: kfile/kcommentwidget.cpp:124
+msgctxt "@title:window"
+msgid "Change Comment"
+msgstr ""
+
+#: kfile/kcommentwidget.cpp:125
+msgctxt "@title:window"
+msgid "Add Comment"
+msgstr ""
+
+#: kfile/kpreviewprops.cpp:50
+msgid "P&review"
+msgstr "R&hagolwg"
+
+#: kfile/kopenwithdialog.cpp:269
+msgid "Known Applications"
+msgstr "Cymhwysiannau Hysbys"
+
+#: kfile/kopenwithdialog.cpp:483
+msgid "Open With"
+msgstr "Agor Efo"
 
-#: kfile/knfotranslator.cpp:90
-msgctxt "@label Number of total translations"
-msgid "Total Translations"
+#: kfile/kopenwithdialog.cpp:488
+#, kde-format
+msgid ""
+"<qt>Select the program that should be used to open <b>%1</b>. If the program "
+"is not listed, enter the name or click the browse button.</qt>"
 msgstr ""
+"<qt>Dewis y rhaglen a ddylai gael ei defnyddio i agor <b>%1</b>. Os nad yw'r "
+"rhaglen wedi ei rhestru, mewnbynnwch yr enw neu clicio ar y botwm pori.</qt>"
 
-#: kfile/knfotranslator.cpp:91
-msgctxt "@label Number of translated strings"
-msgid "Translated"
-msgstr ""
+#: kfile/kopenwithdialog.cpp:494
+msgid "Choose the name of the program with which to open the selected files."
+msgstr "Dewis enw'r rhaglen i agor y ffeiliau penodol."
 
-#: kfile/knfotranslator.cpp:92
-msgctxt "@label"
-msgid "Translation Date"
-msgstr ""
+#: kfile/kopenwithdialog.cpp:521
+#, kde-format
+msgid "Choose Application for %1"
+msgstr "Dewis Cymhwysiad i %1"
 
-#: kfile/knfotranslator.cpp:93
-msgctxt "@label Number of untranslated strings"
-msgid "Untranslated"
+#: kfile/kopenwithdialog.cpp:522
+#, kde-format
+msgid ""
+"<qt>Select the program for the file type: <b>%1</b>. If the program is not "
+"listed, enter the name or click the browse button.</qt>"
 msgstr ""
+"<qt>Dewis y rhaglen i'r math o ffeil: <b>%1</b>. Os nad yw'r rhaglen wedi ei "
+"rhestru, mewnbynnwch yr enw neu clicio ar y botwm pori</qt>"
 
-#: kfile/kfilemetadataprovider.cpp:414
-msgctxt "@label"
-msgid "Modified"
-msgstr ""
+#: kfile/kopenwithdialog.cpp:537
+msgid "Choose Application"
+msgstr "Dewis Cymhwysiad"
 
-#: kfile/kfilemetadataprovider.cpp:415
-msgctxt "@label"
-msgid "Owner"
+#: kfile/kopenwithdialog.cpp:538
+msgid ""
+"<qt>Select a program. If the program is not listed, enter the name or click "
+"the browse button.</qt>"
 msgstr ""
+"<qt>Dewisi rhaglen. Os nad yw'r rhaglen wedi ei rhestru, mewnbynnwch yr enw "
+"neu clicio ar y botwm pori</qt>"
 
-#: kfile/kfilemetadataprovider.cpp:416
-msgctxt "@label"
-msgid "Permissions"
+#: kfile/kopenwithdialog.cpp:601
+msgid ""
+"Following the command, you can have several place holders which will be "
+"replaced with the actual values when the actual program is run:\n"
+"%f - a single file name\n"
+"%F - a list of files; use for applications that can open several local files "
+"at once\n"
+"%u - a single URL\n"
+"%U - a list of URLs\n"
+"%d - the directory of the file to open\n"
+"%D - a list of directories\n"
+"%i - the icon\n"
+"%m - the mini-icon\n"
+"%c - the comment"
 msgstr ""
+"Wedi'r gorchymyn, gallwch gael mwy nag un cadwryddion lle a fydd yn cael ei "
+"ailosod gan y gwerthoedd gwirioneddol pan rhedir y rhaglen wirioneddol:\n"
+"%f - enw ffeil sengl\n"
+"%F - rhestr ffeiliau; i'w ddefnyddio i gymhwysiadau sy'n gallu agor mwy nag "
+"un ffeil lleol ar yr un pryd\n"
+"%u - URL sengl\n"
+"%U - rhestr o URLau\n"
+"%d - cyfeiriadur y ffeil i agor\n"
+"%D - rhestr o gyfeiriaduron\n"
+"%i - yr eicon\n"
+"%m - yr eicon bach\n"
+"%c - y sylwad"
 
-#: kfile/kfilemetadataprovider.cpp:417
-msgctxt "@label"
-msgid "Rating"
-msgstr ""
+#: kfile/kopenwithdialog.cpp:636
+msgid "Run in &terminal"
+msgstr "Rhedeg mewn &terfynell"
 
-#: kfile/kfilemetadataprovider.cpp:418
-msgctxt "@label"
-msgid "Size"
-msgstr ""
+#: kfile/kopenwithdialog.cpp:653
+msgid "&Do not close when command exits"
+msgstr "&Peidiwch a chau pan terfynir y gorchymyn"
 
-#: kfile/kfilemetadataprovider.cpp:419
-msgctxt "@label"
-msgid "Tags"
-msgstr ""
+#: kfile/kopenwithdialog.cpp:670
+msgid "&Remember application association for this type of file"
+msgstr "&Cofio cyd-gymhwysiad i'r math yma o ffeil"
 
-#: kfile/kfilemetadataprovider.cpp:420
-msgctxt "@label"
-msgid "Total Size"
+#: kfile/kopenwithdialog.cpp:814
+#, kde-format
+msgid ""
+"Could not extract executable name from '%1', please type a valid program "
+"name."
 msgstr ""
 
-#: kfile/kfilemetadataprovider.cpp:421
-msgctxt "@label"
-msgid "Type"
+#: kfile/kopenwithdialog.cpp:860
+#, kde-format
+msgid "'%1' not found, please type a valid program name."
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:214 kfile/kpropertiesdialog.cpp:229
-#: kfile/kpropertiesdialog.cpp:241 kfile/kpropertiesdialog.cpp:256
-#: kfile/kpropertiesdialog.cpp:272
+#: kfile/kpropertiesdialog.cpp:212 kfile/kpropertiesdialog.cpp:227
+#: kfile/kpropertiesdialog.cpp:239 kfile/kpropertiesdialog.cpp:254
+#: kfile/kpropertiesdialog.cpp:270
 #, kde-format
 msgid "Properties for %1"
 msgstr "Priodweddau i %1"
 
-#: kfile/kpropertiesdialog.cpp:239
+#: kfile/kpropertiesdialog.cpp:237
 #, kde-format
 msgid "Properties for 1 item"
 msgid_plural "Properties for %1 Selected Items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kfile/kpropertiesdialog.cpp:763
+#: kfile/kpropertiesdialog.cpp:761
 msgctxt "@title:tab File properties"
 msgid "&General"
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:962
+#: kfile/kpropertiesdialog.cpp:961
 msgid "Create new file type"
 msgstr "Creu math ffeil newydd"
 
-#: kfile/kpropertiesdialog.cpp:964
+#: kfile/kpropertiesdialog.cpp:963
 msgid "Edit file type"
 msgstr "Golygu math y ffeil"
 
-#: kfile/kpropertiesdialog.cpp:976
+#: kfile/kpropertiesdialog.cpp:975
 msgid "Contents:"
 msgstr "Cynnwys:"
 
-#: kfile/kpropertiesdialog.cpp:985 kfile/kurlrequesterdialog.cpp:59
+#: kfile/kpropertiesdialog.cpp:984 kfile/kurlrequesterdialog.cpp:58
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: kfile/kpropertiesdialog.cpp:1018
+#: kfile/kpropertiesdialog.cpp:1017
 msgid "Calculate"
 msgstr "Cyfrifo"
 
-#: kfile/kpropertiesdialog.cpp:1019
+#: kfile/kpropertiesdialog.cpp:1018
 msgid "Stop"
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:1029 kfile/kpropertiesdialog.cpp:1235
+#: kfile/kpropertiesdialog.cpp:1028 kfile/kpropertiesdialog.cpp:1234
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: kfile/kpropertiesdialog.cpp:1037
+#: kfile/kpropertiesdialog.cpp:1036
 msgid "Points to:"
 msgstr "Cyfeirio at:"
 
-#: kfile/kpropertiesdialog.cpp:1050
+#: kfile/kpropertiesdialog.cpp:1049
 msgid "Created:"
 msgstr "Creuwyd:"
 
-#: kfile/kpropertiesdialog.cpp:1070
+#: kfile/kpropertiesdialog.cpp:1069
 msgid "Accessed:"
 msgstr "Agorwyd:"
 
-#: kfile/kpropertiesdialog.cpp:1091
+#: kfile/kpropertiesdialog.cpp:1090
 msgid "Mounted on:"
 msgstr "Wedi'i arosod ar:"
 
-#: kfile/kpropertiesdialog.cpp:1099 kfile/kpropertiesdialog.cpp:2798
+#: kfile/kpropertiesdialog.cpp:1098 kfile/kpropertiesdialog.cpp:2798
 msgid "Device usage:"
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:1197 kfile/kpropertiesdialog.cpp:2926
+#: kfile/kpropertiesdialog.cpp:1196 kfile/kpropertiesdialog.cpp:2926
 #, kde-format
 msgctxt "Available space out of total partition size (percent used)"
 msgid "%1 free of %2 (%3% used)"
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:1214 kfile/kpropertiesdialog.cpp:1230
+#: kfile/kpropertiesdialog.cpp:1213 kfile/kpropertiesdialog.cpp:1229
 #, kde-format
 msgid "1 file"
 msgid_plural "%1 files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kfile/kpropertiesdialog.cpp:1215 kfile/kpropertiesdialog.cpp:1231
+#: kfile/kpropertiesdialog.cpp:1214 kfile/kpropertiesdialog.cpp:1230
 #, kde-format
 msgid "1 sub-folder"
 msgid_plural "%1 sub-folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kfile/kpropertiesdialog.cpp:1211
+#: kfile/kpropertiesdialog.cpp:1210
 #, kde-format
 msgid ""
 "Calculating... %1 (%2)\n"
 "%3, %4"
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:1244
+#: kfile/kpropertiesdialog.cpp:1243
 msgid "Calculating..."
 msgstr "Cyfrifo ..."
 
-#: kfile/kpropertiesdialog.cpp:1277
+#: kfile/kpropertiesdialog.cpp:1278
 #, kde-format
 msgid "At least %1"
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:1314
+#: kfile/kpropertiesdialog.cpp:1315
 msgid "The new file name is empty."
 msgstr ""
 
-#: kfile/kpropertiesdialog.cpp:1491 kfile/kpropertiesdialog.cpp:2672
+#: kfile/kpropertiesdialog.cpp:1492 kfile/kpropertiesdialog.cpp:2672
 #: kfile/kpropertiesdialog.cpp:2966 kfile/kpropertiesdialog.cpp:3215
 #, kde-format
 msgid ""
@@ -3989,76 +4352,76 @@
 "<qt>Methu cadw priodweddau. Does ganddych ganiatadau digonol i  ysgrifennu i "
 "<b>%1</b>.</qt>"
 
-#: kfile/kpropertiesdialog.cpp:1566 kfile/kpropertiesdialog.cpp:1570
-#: kfile/kpropertiesdialog.cpp:1575
+#: kfile/kpropertiesdialog.cpp:1567 kfile/kpropertiesdialog.cpp:1571
+#: kfile/kpropertiesdialog.cpp:1576
 msgid "Forbidden"
 msgstr "Gwaharddir"
 
-#: kfile/kpropertiesdialog.cpp:1567
+#: kfile/kpropertiesdialog.cpp:1568
 msgid "Can Read"
 msgstr "Gallu Darllen"
 
-#: kfile/kpropertiesdialog.cpp:1568
+#: kfile/kpropertiesdialog.cpp:1569
 msgid "Can Read & Write"
 msgstr "Gallu Darllen ac Ysgrifennu"
 
-#: kfile/kpropertiesdialog.cpp:1571
+#: kfile/kpropertiesdialog.cpp:1572
 msgid "Can View Content"
 msgstr "Gallu Edrych ar Gynnwys"
 
-#: kfile/kpropertiesdialog.cpp:1572
+#: kfile/kpropertiesdialog.cpp:1573
 msgid "Can View & Modify Content"
 msgstr "Gallu Edrych ar a Newid Cynnwys"
 
-#: kfile/kpropertiesdialog.cpp:1576
+#: kfile/kpropertiesdialog.cpp:1577
 msgid "Can View Content & Read"
 msgstr "Gallu Edrych ar Gynnwys a Darllen"
 
-#: kfile/kpropertiesdialog.cpp:1577
+#: kfile/kpropertiesdialog.cpp:1578
 msgid "Can View/Read & Modify/Write"
 msgstr "Gallu Edrych/Darllen a Newid/Ysgrifennu"
 
-#: kfile/kpropertiesdialog.cpp:1673
+#: kfile/kpropertiesdialog.cpp:1674
 msgid "&Permissions"
 msgstr "&Caniatadau"
 
-#: kfile/kpropertiesdialog.cpp:1685 kfile/kpropertiesdialog.cpp:1935
+#: kfile/kpropertiesdialog.cpp:1686 kfile/kpropertiesdialog.cpp:1936
 msgid "Access Permissions"
 msgstr "Caniatadau Cyrchu"
 
-#: kfile/kpropertiesdialog.cpp:1693
+#: kfile/kpropertiesdialog.cpp:1694
 msgid "This file is a link and does not have permissions."
 msgid_plural "All files are links and do not have permissions."
 msgstr[0] "Mae'r %1 ffeil yma yn gyswllt ac nid oes ganddo ganiatadau."
 msgstr[1] ""
 "Mae'r %1 ffeiliau i gyd yn gysylltau ac nid oes ganddynt ganiatadau."
 
-#: kfile/kpropertiesdialog.cpp:1697
+#: kfile/kpropertiesdialog.cpp:1698
 msgid "Only the owner can change permissions."
 msgstr "Neb ond y perchennog sy'n gallu newid caniatadau."
 
-#: kfile/kpropertiesdialog.cpp:1700
+#: kfile/kpropertiesdialog.cpp:1701
 msgid "O&wner:"
 msgstr "Perc&hennog:"
 
-#: kfile/kpropertiesdialog.cpp:1706
+#: kfile/kpropertiesdialog.cpp:1707
 msgid "Specifies the actions that the owner is allowed to do."
 msgstr "Penodi'r gweithrediadau y mae'r perchennog yn cael gwneud."
 
-#: kfile/kpropertiesdialog.cpp:1708
+#: kfile/kpropertiesdialog.cpp:1709
 msgid "Gro&up:"
 msgstr "Gr&w^p:"
 
-#: kfile/kpropertiesdialog.cpp:1714
+#: kfile/kpropertiesdialog.cpp:1715
 msgid ""
 "Specifies the actions that the members of the group are allowed to do."
 msgstr "Penodi'r gweithrediadau y mae aelodau'r grw^p yn cael gwneud."
 
-#: kfile/kpropertiesdialog.cpp:1716
+#: kfile/kpropertiesdialog.cpp:1717
 msgid "O&thers:"
 msgstr "E&raill:"
 
-#: kfile/kpropertiesdialog.cpp:1722
+#: kfile/kpropertiesdialog.cpp:1723
 msgid ""
 "Specifies the actions that all users, who are neither owner nor in the "
 "group, are allowed to do."
@@ -4066,15 +4429,15 @@
 "Penodi'r gweithrediadau y mae pob defnyddiwr, sy ddim yn berchennog neu "
 "aelod y grw^p, yn cael gwneud."
 
-#: kfile/kpropertiesdialog.cpp:1727
+#: kfile/kpropertiesdialog.cpp:1728
 msgid "Only own&er can rename and delete folder content"
 msgstr "Neb ond y per&chennog sy'n cael ail-enwi a dileu cynnwys plygell"
 
-#: kfile/kpropertiesdialog.cpp:1728
+#: kfile/kpropertiesdialog.cpp:1729
 msgid "Is &executable"
 msgstr "Gallu ei &Weithredu"
 
-#: kfile/kpropertiesdialog.cpp:1732
+#: kfile/kpropertiesdialog.cpp:1733
 msgid ""
 "Enable this option to allow only the folder's owner to delete or rename the "
 "contained files and folders. Other users can only add new files, which "
@@ -4084,7 +4447,7 @@
 "ail-enwi'r ffeiliau neu plygyll sydd ynddo.  Mae defnyddwyr eraill yn gallu "
 "ychwanegu dim ond ffeiliau newydd, sy'n galw am y caniatad 'Addasu Cynnwys'."
 
-#: kfile/kpropertiesdialog.cpp:1736
+#: kfile/kpropertiesdialog.cpp:1737
 msgid ""
 "Enable this option to mark the file as executable. This only makes sense for "
 "programs and scripts. It is required when you want to execute them."
@@ -4093,35 +4456,35 @@
 "gwneud synnwyr i ddim ond rhaglenni a sgriptiau.  Mae'n angenrheidiol os "
 "byddwch eisiau eu gweithredu."
 
-#: kfile/kpropertiesdialog.cpp:1743
+#: kfile/kpropertiesdialog.cpp:1744
 msgid "A&dvanced Permissions"
 msgstr "C&aniatadau Uwch"
 
-#: kfile/kpropertiesdialog.cpp:1752
+#: kfile/kpropertiesdialog.cpp:1753
 msgid "Ownership"
 msgstr "Perchenogaeth"
 
-#: kfile/kpropertiesdialog.cpp:1759
+#: kfile/kpropertiesdialog.cpp:1760
 msgid "User:"
 msgstr "Defnyddiwr:"
 
-#: kfile/kpropertiesdialog.cpp:1834
+#: kfile/kpropertiesdialog.cpp:1835
 msgid "Group:"
 msgstr "Grw^p:"
 
-#: kfile/kpropertiesdialog.cpp:1877
+#: kfile/kpropertiesdialog.cpp:1878
 msgid "Apply changes to all subfolders and their contents"
 msgstr "Gosod newidiadau i bob is-blygell a'i gynnwys."
 
-#: kfile/kpropertiesdialog.cpp:1925
+#: kfile/kpropertiesdialog.cpp:1926
 msgid "Advanced Permissions"
 msgstr "Caniatadau Uwch"
 
-#: kfile/kpropertiesdialog.cpp:1943
+#: kfile/kpropertiesdialog.cpp:1944
 msgid "Class"
 msgstr "Dosbarth"
 
-#: kfile/kpropertiesdialog.cpp:1948
+#: kfile/kpropertiesdialog.cpp:1949
 msgid ""
 "Show\n"
 "Entries"
@@ -4129,19 +4492,19 @@
 "Dangos\n"
 " Cofnodion"
 
-#: kfile/kpropertiesdialog.cpp:1950
+#: kfile/kpropertiesdialog.cpp:1951
 msgid "Read"
 msgstr "Darllen"
 
-#: kfile/kpropertiesdialog.cpp:1955
+#: kfile/kpropertiesdialog.cpp:1956
 msgid "This flag allows viewing the content of the folder."
 msgstr "Mae'r faner yma yn gadael gweld cynnwys y plygell."
 
-#: kfile/kpropertiesdialog.cpp:1957
+#: kfile/kpropertiesdialog.cpp:1958
 msgid "The Read flag allows viewing the content of the file."
 msgstr "Mae'r faner Ddarllen yn gadael gweld cynnwys y ffeil."
 
-#: kfile/kpropertiesdialog.cpp:1961
+#: kfile/kpropertiesdialog.cpp:1962
 msgid ""
 "Write\n"
 "Entries"
@@ -4149,11 +4512,11 @@
 "Ysgrifennu\n"
 " Cofnodion"
 
-#: kfile/kpropertiesdialog.cpp:1963
+#: kfile/kpropertiesdialog.cpp:1964
 msgid "Write"
 msgstr "Ysgrifennu"
 
-#: kfile/kpropertiesdialog.cpp:1968
+#: kfile/kpropertiesdialog.cpp:1969
 msgid ""
 "This flag allows adding, renaming and deleting of files. Note that deleting "
 "and renaming can be limited using the Sticky flag."
@@ -4161,32 +4524,32 @@
 "Mae'r faner yma yn gadael ychwanegu, ail-enwi a dileu ffeiliau.  Noder: "
 "gellir cyfyngu dileu ac ail-enwi gan ddefnyddio'r faner Gludiog."
 
-#: kfile/kpropertiesdialog.cpp:1971
+#: kfile/kpropertiesdialog.cpp:1972
 msgid "The Write flag allows modifying the content of the file."
 msgstr "Mae'r faner Ysgrifennu yn gadael addasu cynnwys y ffeil."
 
-#: kfile/kpropertiesdialog.cpp:1976
+#: kfile/kpropertiesdialog.cpp:1977
 msgctxt "Enter folder"
 msgid "Enter"
 msgstr "Mynd i mewn"
 
-#: kfile/kpropertiesdialog.cpp:1977
+#: kfile/kpropertiesdialog.cpp:1978
 msgid "Enable this flag to allow entering the folder."
 msgstr "Galluogi'r faner yma i adael mynd i mewn i'r plygell."
 
-#: kfile/kpropertiesdialog.cpp:1980
+#: kfile/kpropertiesdialog.cpp:1981
 msgid "Exec"
 msgstr "Gweithredu"
 
-#: kfile/kpropertiesdialog.cpp:1981
+#: kfile/kpropertiesdialog.cpp:1982
 msgid "Enable this flag to allow executing the file as a program."
 msgstr "Galluogi'r faner yma i adael gweithredu'r ffeil fel rhaglen."
 
-#: kfile/kpropertiesdialog.cpp:1991
+#: kfile/kpropertiesdialog.cpp:1992
 msgid "Special"
 msgstr "Arbennig"
 
-#: kfile/kpropertiesdialog.cpp:1995
+#: kfile/kpropertiesdialog.cpp:1996
 msgid ""
 "Special flag. Valid for the whole folder, the exact meaning of the flag can "
 "be seen in the right hand column."
@@ -4194,26 +4557,31 @@
 "Baner arbennig.  Dilys i'r plygell cyfan.  Gall ystyr cywir y faner gael ei "
 "weld yn y golofn dde."
 
-#: kfile/kpropertiesdialog.cpp:1998
+#: kfile/kpropertiesdialog.cpp:1999
 msgid ""
 "Special flag. The exact meaning of the flag can be seen in the right hand "
 "column."
 msgstr ""
 "Baner arbennig.  Gall ystyr cywir y faner gael ei weld yn y golofn dde."
 
-#: kfile/kpropertiesdialog.cpp:2002
+#: kfile/kpropertiesdialog.cpp:2003
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: kfile/kpropertiesdialog.cpp:2006
+#: kfile/kpropertiesdialog.cpp:2007
 msgid "Group"
 msgstr "Grw^p"
 
-#: kfile/kpropertiesdialog.cpp:2014
+#: kfile/kpropertiesdialog.cpp:2011 kfile/kacleditwidget.cpp:63
+#: kfile/kacleditwidget.cpp:464
+msgid "Others"
+msgstr "Eraill"
+
+#: kfile/kpropertiesdialog.cpp:2015
 msgid "Set UID"
 msgstr "Gosod UID"
 
-#: kfile/kpropertiesdialog.cpp:2018
+#: kfile/kpropertiesdialog.cpp:2019
 msgid ""
 "If this flag is set, the owner of this folder will be the owner of all new "
 "files."
@@ -4221,7 +4589,7 @@
 "Os osodir y faner yma, bydd perchennog y plygell yma yn biau pob ffeil "
 "newydd."
 
-#: kfile/kpropertiesdialog.cpp:2021
+#: kfile/kpropertiesdialog.cpp:2022
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with "
 "the permissions of the owner."
@@ -4229,18 +4597,18 @@
 "Os mae'r ffeil yma yn weithredadwy ac mae'r faner wedi ei gosod, bydd o'n "
 "cael ei weithredu efo caniatadau'r perchennog."
 
-#: kfile/kpropertiesdialog.cpp:2025
+#: kfile/kpropertiesdialog.cpp:2026
 msgid "Set GID"
 msgstr "Gosod GID"
 
-#: kfile/kpropertiesdialog.cpp:2029
+#: kfile/kpropertiesdialog.cpp:2030
 msgid ""
 "If this flag is set, the group of this folder will be set for all new files."
 msgstr ""
 "Os osodir y faner yma, bydd cylch y plygell yma yn cael ei osod am bob ffeil "
 "newydd."
 
-#: kfile/kpropertiesdialog.cpp:2032
+#: kfile/kpropertiesdialog.cpp:2033
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with "
 "the permissions of the group."
@@ -4248,12 +4616,12 @@
 "Os mae'r ffeil yma yn weithredadwy ac mae'r faner wedi ei gosod, bydd o'n "
 "cael ei weithredu efo caniatadau'r grw^p."
 
-#: kfile/kpropertiesdialog.cpp:2036
+#: kfile/kpropertiesdialog.cpp:2037
 msgctxt "File permission"
 msgid "Sticky"
 msgstr "Gludiog"
 
-#: kfile/kpropertiesdialog.cpp:2040
+#: kfile/kpropertiesdialog.cpp:2041
 msgid ""
 "If the Sticky flag is set on a folder, only the owner and root can delete or "
 "rename files. Otherwise everybody with write permissions can do this."
@@ -4262,7 +4630,7 @@
 "gallu dileu neu ail-enwi ffeiliau.  Fel arall, mae pawb sydd efo caniatadau "
 "ysgrifennu yn gallu gwneud hyn."
 
-#: kfile/kpropertiesdialog.cpp:2044
+#: kfile/kpropertiesdialog.cpp:2045
 msgid ""
 "The Sticky flag on a file is ignored on Linux, but may be used on some "
 "systems"
@@ -4270,35 +4638,35 @@
 "Mae'r faner Gludiog ar ffeil yn cael ei anywbyddu ar Linux, ond gall ei "
 "defnyddio ar rhai cysodau"
 
-#: kfile/kpropertiesdialog.cpp:2221
+#: kfile/kpropertiesdialog.cpp:2222
 msgid "Link"
 msgstr "Cyswllt"
 
-#: kfile/kpropertiesdialog.cpp:2238
+#: kfile/kpropertiesdialog.cpp:2239
 msgid "Varying (No Change)"
 msgstr "Amrywio (Dim Newid)"
 
-#: kfile/kpropertiesdialog.cpp:2337
+#: kfile/kpropertiesdialog.cpp:2338
 msgid "This file uses advanced permissions"
 msgid_plural "These files use advanced permissions."
 msgstr[0] "Mae'r %1 ffeil yma yn defnyddio caniatadau uwch."
 msgstr[1] "Mae'r %1 ffeiliau yma yn defnyddio caniatadau uwch."
 
-#: kfile/kpropertiesdialog.cpp:2358
+#: kfile/kpropertiesdialog.cpp:2359
 msgid "This folder uses advanced permissions."
 msgid_plural "These folders use advanced permissions."
 msgstr[0] "Mae'r %1 plygell yma yn defnyddio caniatadau uwch."
 msgstr[1] "Mae'r %1 plygyll yma yn defnyddio caniatadau uwch."
 
-#: kfile/kpropertiesdialog.cpp:2374
+#: kfile/kpropertiesdialog.cpp:2375
 msgid "These files use advanced permissions."
 msgstr "Mae'r ffeiliau yma yn defnyddio caniatadau uwch."
 
-#: kfile/kpropertiesdialog.cpp:2592
+#: kfile/kpropertiesdialog.cpp:2593
 msgid "U&RL"
 msgstr "U&RL"
 
-#: kfile/kpropertiesdialog.cpp:2599
+#: kfile/kpropertiesdialog.cpp:2600
 msgid "URL:"
 msgstr "URL:"
 
@@ -4352,1027 +4720,916 @@
 msgid "Advanced Options for %1"
 msgstr "Dewisiadau Uwch am %1"
 
-#: kfile/kfilesharedialog.cpp:59
-msgid "&Share"
-msgstr "&Rhaniad"
+#: kfile/kfilemetainfowidget.cpp:163
+msgid "<Error>"
+msgstr "<Gwall>"
 
-#: kfile/kfilesharedialog.cpp:133
-msgid "Only folders in your home folder can be shared."
+#: kfile/kmetaprops.cpp:57
+msgctxt "@title:window"
+msgid "Configure Shown Data"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:140
-msgid "Not shared"
-msgstr "Dim wedi'i rhannu."
+#: kfile/kmetaprops.cpp:62
+msgctxt "@label::textbox"
+msgid "Select which data should be shown:"
+msgstr ""
 
-#: kfile/kfilesharedialog.cpp:145
-msgid "Shared"
-msgstr "Wedi ei rhannu."
+#: kfile/kmetaprops.cpp:120
+msgctxt "@action:button"
+msgid "Configure..."
+msgstr ""
 
-#: kfile/kfilesharedialog.cpp:157
-msgid ""
-"Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
-"(Samba)."
+#: kfile/kmetaprops.cpp:130
+msgctxt "@title:tab"
+msgid "Information"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:164
-msgid "You can also reconfigure file sharing authorization."
-msgstr "Gallwch hefyd ailffurfweddu awdurdodi rhannu ffeiliau."
+#: kfile/kfilemetadatareaderprocess.cpp:217
+msgid "KFileMetaDataReader"
+msgstr ""
 
-#: kfile/kfilesharedialog.cpp:168 kfile/kfilesharedialog.cpp:192
-msgid "Configure File Sharing..."
-msgstr "Ffurfweddu Cyfrannu Ffeiliau..."
+#: kfile/kfilemetadatareaderprocess.cpp:219
+msgid "KFileMetaDataReader can be used to read metadata from a file"
+msgstr ""
 
-#: kfile/kfilesharedialog.cpp:177
-msgid ""
-"Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
+#: kfile/kfilemetadatareaderprocess.cpp:221
+msgid "(C) 2011, Peter Penz"
 msgstr ""
-"Gwall wrth redeg 'filesharelist'. Cywiro os wedi'i osod ac yn $PATH neu "
-"/usr/sbin."
 
-#: kfile/kfilesharedialog.cpp:184
-msgid "You need to be authorized to share folders."
+#: kfile/kfilemetadatareaderprocess.cpp:222
+msgid "Peter Penz"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:187
-msgid "File sharing is disabled."
+#: kfile/kfilemetadatareaderprocess.cpp:222
+msgid "Current maintainer"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:254
-#, kde-format
-msgid "Sharing folder '%1' failed."
+#: kfile/kfilemetadatareaderprocess.cpp:228
+msgid "Only the meta data that is part of the file is read"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:255
-#, kde-format
-msgid ""
-"An error occurred while trying to share folder '%1'. Make sure that the Perl "
-"script 'fileshareset' is set suid root."
+#: kfile/kfilemetadatareaderprocess.cpp:229
+msgid "List of URLs where the meta-data should be read from"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:260
+#: kfile/kfilemetadataprovider.cpp:223
 #, kde-format
-msgid "Unsharing folder '%1' failed."
+msgctxt "@item:intable"
+msgid "%1 item"
+msgid_plural "%1 items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kfile/kfilemetadataprovider.cpp:423
+msgctxt "@label"
+msgid "Modified"
 msgstr ""
 
-#: kfile/kfilesharedialog.cpp:261
-#, kde-format
-msgid ""
-"An error occurred while trying to unshare folder '%1'. Make sure that the "
-"Perl script 'fileshareset' is set suid root."
+#: kfile/kfilemetadataprovider.cpp:424
+msgctxt "@label"
+msgid "Owner"
 msgstr ""
 
-#: httpfilter/httpfilter.cc:179
-msgid "Receiving corrupt data."
-msgstr "Derbyn data llygredig."
+#: kfile/kfilemetadataprovider.cpp:425
+msgctxt "@label"
+msgid "Permissions"
+msgstr ""
 
-#: misc/kmailservice.cpp:30
-msgid "KMailService"
+#: kfile/kfilemetadataprovider.cpp:426
+msgctxt "@label"
+msgid "Rating"
 msgstr ""
 
-#: misc/kmailservice.cpp:30
-msgid "Mail service"
-msgstr "Gwasanaeth ebost"
+#: kfile/kfilemetadataprovider.cpp:427
+msgctxt "@label"
+msgid "Size"
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:43
-msgid "Error connecting to server."
-msgstr "Gwall wrth gysylltu i'r gweinydd"
+#: kfile/kfilemetadataprovider.cpp:428
+msgctxt "@label"
+msgid "Tags"
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:46
-msgid "Not connected."
-msgstr "Dim cyswllt."
+#: kfile/kfilemetadataprovider.cpp:429
+msgctxt "@label"
+msgid "Total Size"
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:49
-msgid "Connection timed out."
-msgstr "Cysylltiad wedi goramseru."
+#: kfile/kfilemetadataprovider.cpp:430
+msgctxt "@label"
+msgid "Type"
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:52
-msgid "Time out waiting for server interaction."
-msgstr "Goramser wrth aros am ryngweithiad gweinydd."
+#: kfile/kdevicelistmodel.cpp:116
+msgid "Device name"
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:56
-#, kde-format
-msgid "Server said: \"%1\""
-msgstr "Dywedodd y gweinydd: \"%1\""
+#: kfile/kfiledialog.cpp:126
+msgid "*|All files"
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:73
-msgid "KSendBugMail"
-msgstr "KSendBugMail"
+#: kfile/kfiledialog.cpp:357 ../kfile/kfilefiltercombo.cpp:185
+msgid "All Supported Files"
+msgstr "Pob Ffeil a Cynhelir"
 
-#: misc/ksendbugmail/main.cpp:74
-msgid "Sends a bug report by email"
+#: kfile/kfiledialog.cpp:738 kfile/kfiledialog.cpp:757
+#: kfile/kfiledialog.cpp:794 kfile/kfiledialog.cpp:836
+#: kfile/kencodingfiledialog.cpp:177 kfile/kencodingfiledialog.cpp:198
+msgid "Save As"
 msgstr ""
 
-#: misc/ksendbugmail/main.cpp:75
-msgid "(c) 2000 Stephan Kulow"
+#: kfile/kencodingfiledialog.cpp:49
+msgid "Encoding:"
 msgstr ""
 
-#: misc/ksendbugmail/main.cpp:76
-msgid "Stephan Kulow"
-msgstr ""
+#: kfile/kfilesharedialog.cpp:53
+msgid "&Share"
+msgstr "&Rhaniad"
 
-#: misc/ksendbugmail/main.cpp:76
-msgid "Author"
-msgstr "Awdur"
+#: kfile/kfilesharedialog.cpp:127
+msgid "Only folders in your home folder can be shared."
+msgstr ""
 
-#: misc/ksendbugmail/main.cpp:79
-msgid "Subject line"
-msgstr "Llinell pwnc"
+#: kfile/kfilesharedialog.cpp:134
+msgid "Not shared"
+msgstr "Dim wedi'i rhannu."
 
-#: misc/ksendbugmail/main.cpp:80
-msgid "Recipient"
-msgstr "Derbynnwr"
+#: kfile/kfilesharedialog.cpp:139
+msgid "Shared"
+msgstr "Wedi ei rhannu."
 
-#: misc/ktelnetservice.cpp:39
-msgid "telnet service"
-msgstr "gwasanaeth telnet"
+#: kfile/kfilesharedialog.cpp:151
+msgid ""
+"Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
+"(Samba)."
+msgstr ""
 
-#: misc/ktelnetservice.cpp:40
-msgid "telnet protocol handler"
-msgstr "trinydd protocol telnet"
+#: kfile/kfilesharedialog.cpp:158
+msgid "You can also reconfigure file sharing authorization."
+msgstr "Gallwch hefyd ailffurfweddu awdurdodi rhannu ffeiliau."
 
-#: misc/ktelnetservice.cpp:74
-#, kde-format
-msgid "You do not have permission to access the %1 protocol."
-msgstr "Nid oes ganddoch caniatad i gyrchu'r protocol %1."
+#: kfile/kfilesharedialog.cpp:162 kfile/kfilesharedialog.cpp:186
+msgid "Configure File Sharing..."
+msgstr "Ffurfweddu Cyfrannu Ffeiliau..."
 
-#: misc/kpac/downloader.cpp:87
-#, kde-format
+#: kfile/kfilesharedialog.cpp:171
 msgid ""
-"Could not download the proxy configuration script:\n"
-"%1"
+"Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
 msgstr ""
-"Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy:\n"
-"%1"
+"Gwall wrth redeg 'filesharelist'. Cywiro os wedi'i osod ac yn $PATH neu "
+"/usr/sbin."
 
-#: misc/kpac/downloader.cpp:89
-msgid "Could not download the proxy configuration script"
-msgstr "Methu lawrlwytho'r ysgrifen ffurfweddu'r dirprwy."
+#: kfile/kfilesharedialog.cpp:178
+msgid "You need to be authorized to share folders."
+msgstr ""
 
-#: misc/kpac/discovery.cpp:121
-msgid "Could not find a usable proxy configuration script"
-msgstr "Methu canfod ysgrifen ffurfweddu'r dirpwry a gall ei defnyddio"
+#: kfile/kfilesharedialog.cpp:181
+msgid "File sharing is disabled."
+msgstr ""
 
-#: misc/kpac/proxyscout.cpp:131
+#: kfile/kfilesharedialog.cpp:248
 #, kde-format
-msgid ""
-"The proxy configuration script is invalid:\n"
-"%1"
+msgid "Sharing folder '%1' failed."
 msgstr ""
-"Mae'r ysgrifen ffurfweddu'r dirprwy yn annilys:\n"
-"%1"
 
-#: misc/kpac/proxyscout.cpp:195
+#: kfile/kfilesharedialog.cpp:249
 #, kde-format
 msgid ""
-"The proxy configuration script returned an error:\n"
-"%1"
+"An error occurred while trying to share folder '%1'. Make sure that the Perl "
+"script 'fileshareset' is set suid root."
 msgstr ""
-"Mae gwall wedi'i ddychwelyd gan yr ysgrifen ffurfweddu'r dirprwy:\n"
-"%1"
 
-#: misc/kpac/script.cpp:752
-msgid "Could not find 'FindProxyForURL' or 'FindProxyForURLEx'"
+#: kfile/kfilesharedialog.cpp:254
+#, kde-format
+msgid "Unsharing folder '%1' failed."
 msgstr ""
 
-#: misc/kpac/script.cpp:763
+#: kfile/kfilesharedialog.cpp:255
 #, kde-format
-msgid "Got an invalid reply when calling %1"
+msgid ""
+"An error occurred while trying to unshare folder '%1'. Make sure that the "
+"Perl script 'fileshareset' is set suid root."
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:267
-msgid "Add Bookmark Here"
-msgstr "Ychwanegu Tudnod Yma"
-
-#: bookmarks/kbookmarkmenu.cc:272
-msgid "Open Folder in Bookmark Editor"
-msgstr "Agor y Blygell yn y Golygydd Tudnodau"
+#: kfile/kurlrequester.cpp:246
+msgid "Open file dialog"
+msgstr "Agor Ymgom Ffeil"
 
-#: bookmarks/kbookmarkmenu.cc:275
-msgid "Delete Folder"
-msgstr "Dileu Plygell"
+#: kfile/kacleditwidget.cpp:61 kfile/kacleditwidget.cpp:454
+msgid "Owner"
+msgstr "Perchennog"
 
-#: bookmarks/kbookmarkmenu.cc:281 ../kfile/kdiroperator.cpp:1983
-msgid "Properties"
+#: kfile/kacleditwidget.cpp:62 kfile/kacleditwidget.cpp:459
+msgid "Owning Group"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:286
-msgid "Copy Link Address"
-msgstr "Copïo Cyfeiriad Cyswllt"
+#: kfile/kacleditwidget.cpp:64 kfile/kacleditwidget.cpp:469
+msgid "Mask"
+msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:289
-msgid "Delete Bookmark"
-msgstr "Dileu y Tudnod"
+#: kfile/kacleditwidget.cpp:65
+msgid "Named User"
+msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:295 bookmarks/kbookmarkmenu.cc:454
-msgid "Open Folder in Tabs"
+#: kfile/kacleditwidget.cpp:66
+msgid "Named Group"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:320
-msgid "Cannot add bookmark with empty URL."
+#: kfile/kacleditwidget.cpp:98 ../kfile/kfileplacesview.cpp:580
+#: ../kfile/kfileplacesview.cpp:601 ../kfile/kfileplacesview.cpp:608
+msgid "Add Entry..."
+msgstr "Ychwanegu cofnod ..."
+
+#: kfile/kacleditwidget.cpp:102
+msgid "Edit Entry..."
+msgstr "Golygu cofnod ..."
+
+#: kfile/kacleditwidget.cpp:106
+msgid "Delete Entry"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:352
-#, kde-format
-msgid ""
-"Are you sure you wish to remove the bookmark folder\n"
-"\"%1\"?"
+#: kfile/kacleditwidget.cpp:307
+msgid " (Default)"
+msgstr " (Rhagosodedig)"
+
+#: kfile/kacleditwidget.cpp:431
+msgid "Edit ACL Entry"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:353
-#, kde-format
-msgid ""
-"Are you sure you wish to remove the bookmark\n"
-"\"%1\"?"
+#: kfile/kacleditwidget.cpp:439
+msgid "Entry Type"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:354
-msgid "Bookmark Folder Deletion"
+#: kfile/kacleditwidget.cpp:445
+msgid "Default for new files in this folder"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:355
-msgid "Bookmark Deletion"
+#: kfile/kacleditwidget.cpp:474
+msgid "Named user"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:458
-msgid "Open all bookmarks in this folder as a new tab."
+#: kfile/kacleditwidget.cpp:479
+msgid "Named group"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:471
-msgid "Bookmark Tabs as Folder..."
-msgstr "Creu Plygell allan o'r Tabiau Tudnodau..."
+#: kfile/kacleditwidget.cpp:499
+msgid "User: "
+msgstr "Defnyddiwr: "
 
-#: bookmarks/kbookmarkmenu.cc:475
-msgid "Add a folder of bookmarks for all open tabs."
-msgstr "Ychwanegu plygell o dudnodau am bob tab sy'n agored."
+#: kfile/kacleditwidget.cpp:505
+msgid "Group: "
+msgstr "Gr?p: "
 
-#: bookmarks/kbookmarkmenu.cc:508
-msgid "Edit your bookmark collection in a separate window"
-msgstr "Golygu eich casgliad tudnodau mewn ffenest gwahanol"
+#: kfile/kacleditwidget.cpp:625
+msgid "Type"
+msgstr "Math"
 
-#: bookmarks/kbookmarkmenu.cc:517
-msgid "New Bookmark Folder..."
+#: kfile/kacleditwidget.cpp:626
+msgid "Name"
+msgstr "Enw"
+
+#: kfile/kacleditwidget.cpp:627
+msgctxt "read permission"
+msgid "r"
+msgstr "r"
+
+#: kfile/kacleditwidget.cpp:628
+msgctxt "write permission"
+msgid "w"
+msgstr "gorllewin"
+
+#: kfile/kacleditwidget.cpp:629
+msgctxt "execute permission"
+msgid "x"
+msgstr "x"
+
+#: kfile/kacleditwidget.cpp:630
+msgid "Effective"
 msgstr ""
 
-#: bookmarks/kbookmarkmenu.cc:519
-msgid "Create a new bookmark folder in this menu"
-msgstr "Creu plygell newydd i dudnodau yn y ddewislen yma"
+#: kssl/ksslcertdialog.cpp:58
+msgid "Certificate"
+msgstr "Tystysgrif"
 
-#: bookmarks/kbookmarkimporter_ns.cc:115 bookmarks/kbookmarkimporter_ns.cc:119
-msgid "*.html|HTML Files (*.html)"
-msgstr "Ffeiliau *.html|HTML (*.html)"
+#: kssl/ksslcertdialog.cpp:66
+msgid "Save selection for this host."
+msgstr "Cadw dewisiad am y gwesteiwr yma."
 
-#: bookmarks/kbookmarkimporter_ns.cc:162
-msgid "<!-- This file was generated by Konqueror -->"
-msgstr "<!-- Creuwyd y ffeil yma gan Konqueror -->"
+#: kssl/ksslcertdialog.cpp:75
+msgid "Send certificate"
+msgstr "Anfon tystysgrif..."
 
-#: bookmarks/kbookmarkimporter_ns.cc:165 bookmarks/kbookmarkimporter_ns.cc:166
-#: ../kfile/kfilewidget.cpp:2481
-msgid "Bookmarks"
+#: kssl/ksslcertdialog.cpp:79
+msgid "Do not send a certificate"
+msgstr "Peidio ag anfon tystysgrif"
+
+#: kssl/ksslcertdialog.cpp:84
+msgid "KDE SSL Certificate Dialog"
+msgstr "Ymgom Tystysgrif SSL KDE"
+
+#: kssl/ksslcertdialog.cpp:141
+#, kde-format
+msgid ""
+"The server <b>%1</b> requests a certificate.<br /><br />Select a certificate "
+"to use from the list below:"
 msgstr ""
 
-#: bookmarks/kbookmarkimporter_opera.cc:121
-#: bookmarks/kbookmarkimporter_opera.cc:125
-msgid "*.adr|Opera Bookmark Files (*.adr)"
-msgstr "*.adr|Ffeiliau Tudnodau Opera (*.adr)"
+#: kssl/ksslpemcallback.cpp:37
+msgid "Certificate password"
+msgstr "Cyfrinair tystysgrif"
+
+#: kssl/ksslcertificate.cpp:204
+msgid "Signature Algorithm: "
+msgstr "Algorithm Llofnod: "
+
+#: kssl/ksslcertificate.cpp:205
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: kssl/ksslcertificate.cpp:208
+msgid "Signature Contents:"
+msgstr "Cynnwys y Llofnod:"
+
+#: kssl/ksslcertificate.cpp:348
+msgctxt "Unknown"
+msgid "Unknown key algorithm"
+msgstr "Algorithm allwedd anhysbys"
+
+#: kssl/ksslcertificate.cpp:352
+#, kde-format
+msgid "Key type: RSA (%1 bit)"
+msgstr "Math allwedd: RSA (%1 did)"
+
+#: kssl/ksslcertificate.cpp:354
+msgid "Modulus: "
+msgstr "Modwlws: "
+
+#: kssl/ksslcertificate.cpp:368
+msgid "Exponent: 0x"
+msgstr "Esbonnydd: 0x"
 
-#: bookmarks/konqbookmarkmenu.cc:61 bookmarks/konqbookmarkmenu.cc:78
-msgid "Hide in toolbar"
-msgstr ""
+#: kssl/ksslcertificate.cpp:377
+#, kde-format
+msgid "Key type: DSA (%1 bit)"
+msgstr "Math allwedd: DSA (%1 did)"
 
-#: bookmarks/konqbookmarkmenu.cc:61 bookmarks/konqbookmarkmenu.cc:78
-msgid "Show in toolbar"
-msgstr ""
+#: kssl/ksslcertificate.cpp:379
+msgid "Prime: "
+msgstr "Rhif Cysefin: "
 
-#: bookmarks/konqbookmarkmenu.cc:71
-msgid "Open in New Window"
+#: kssl/ksslcertificate.cpp:393
+msgid "160 bit prime factor: "
 msgstr ""
 
-#: bookmarks/konqbookmarkmenu.cc:72
-msgid "Open in New Tab"
-msgstr ""
+#: kssl/ksslcertificate.cpp:421
+msgid "Public key: "
+msgstr "Allwedd cyhoeddus: "
 
-#: bookmarks/kbookmark.cc:323
-msgid "--- separator ---"
-msgstr "--- gwahanydd ---"
+#: kssl/ksslcertificate.cpp:1051
+msgid "The certificate is valid."
+msgstr "Mae'r dystysgrif yn ddilys."
 
-#: bookmarks/kbookmarkdialog.cc:41
-msgctxt "@action:button"
-msgid "Update"
+#: kssl/ksslcertificate.cpp:1053
+msgid ""
+"Retrieval of the issuer certificate failed. This means the CA's (Certificate "
+"Authority) certificate can not be found."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:42
-msgctxt "@title:window"
-msgid "Bookmark Properties"
+#: kssl/ksslcertificate.cpp:1055
+msgid ""
+"Retrieval of the CRL (Certificate Revocation List) failed. This means the "
+"CA's (Certificate Authority) CRL can not be found."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:70 bookmarks/kbookmarkdialog.cc:102
-msgctxt "@action:button"
-msgid "Add"
+#: kssl/ksslcertificate.cpp:1057
+msgid ""
+"The decryption of the certificate's signature failed. This means it could "
+"not even be calculated as opposed to just not matching the expected result."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:71
-msgctxt "@title:window"
-msgid "Add Bookmark"
+#: kssl/ksslcertificate.cpp:1059
+msgid ""
+"The decryption of the CRL's (Certificate Revocation List) signature failed. "
+"This means it could not even be calculated as opposed to just not matching "
+"the expected result."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:72 bookmarks/kbookmarkdialog.cc:104
-#: bookmarks/kbookmarkdialog.cc:131
-msgctxt "@action:button"
-msgid "&New Folder..."
+#: kssl/ksslcertificate.cpp:1061
+msgid ""
+"The decoding of the public key of the issuer failed. This means that the "
+"CA's (Certificate Authority) certificate can not be used to verify the "
+"certificate you wanted to use."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:103
-msgctxt "@title:window"
-msgid "Add Bookmarks"
+#: kssl/ksslcertificate.cpp:1063
+msgid ""
+"The certificate's signature is invalid. This means that the certificate can "
+"not be verified."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:132 ../kfile/kdirselectdialog.cpp:281
-msgctxt "@title:window"
-msgid "Select Folder"
+#: kssl/ksslcertificate.cpp:1065
+msgid ""
+"The CRL's (Certificate Revocation List) signature is invalid. This means "
+"that the CRL can not be verified."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:159 ../kfile/knewfilemenu.cpp:1013
-#: ../kfile/kdirselectdialog.cpp:135
-msgctxt "@title:window"
-msgid "New Folder"
+#: kssl/ksslcertificate.cpp:1067
+msgid "The certificate is not valid, yet."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:292
-msgctxt "@label:textbox"
-msgid "Name:"
+#: kssl/ksslcertificate.cpp:1069
+msgid "The certificate is not valid, any more."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:297
-msgctxt "@label:textbox"
-msgid "Location:"
+#: kssl/ksslcertificate.cpp:1071 kssl/ksslcertificate.cpp:1073
+msgid "The CRL (Certificate Revocation List) is not valid, yet."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:302
-msgctxt "@label:textbox"
-msgid "Comment:"
+#: kssl/ksslcertificate.cpp:1075
+msgid "The time format of the certificate's 'notBefore' field is invalid."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:331
-msgctxt "@title:window"
-msgid "Create New Bookmark Folder"
+#: kssl/ksslcertificate.cpp:1077
+msgid "The time format of the certificate's 'notAfter' field is invalid."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:332
-#, kde-format
-msgctxt "@title:window"
-msgid "Create New Bookmark Folder in %1"
+#: kssl/ksslcertificate.cpp:1079
+msgid ""
+"The time format of the CRL's (Certificate Revocation List) 'lastUpdate' "
+"field is invalid."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:335
-msgctxt "@label:textbox"
-msgid "New folder:"
+#: kssl/ksslcertificate.cpp:1081
+msgid ""
+"The time format of the CRL's (Certificate Revocation List) 'nextUpdate' "
+"field is invalid."
 msgstr ""
 
-#: bookmarks/kbookmarkdialog.cc:367
-msgctxt "name of the container of all browser bookmarks"
-msgid "Bookmarks"
+#: kssl/ksslcertificate.cpp:1083
+msgid "The OpenSSL process ran out of memory."
 msgstr ""
 
-#: bookmarks/kbookmarkmanager.cc:443
-#, kde-format
+#: kssl/ksslcertificate.cpp:1085
 msgid ""
-"Unable to save bookmarks in %1. Reported error was: %2. This error message "
-"will only be shown once. The cause of the error needs to be fixed as quickly "
-"as possible, which is most likely a full hard drive."
+"The certificate is self-signed and not in the list of trusted certificates. "
+"If you want to accept this certificate, import it into the list of trusted "
+"certificates."
 msgstr ""
-"Methwyd cadw'r tudnodau yn %1.  Y gwall a hysbyswyd oedd: %2.  Bydd y neges "
-"gwall yma yn cael ei ddangos dim ond unwaith.  Trwsiwch yr achos posibl o'r "
-"gwall mor gyflym ac syn'n bosibl.  Yr achos mwyaf debygol yw disg caled "
-"llawn."
-
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
-
-#. i18n: file: kssl/keygenwizard.ui:35
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:5
+#: kssl/ksslcertificate.cpp:1088
 msgid ""
-"You have indicated that you wish to obtain or purchase a secure certificate. "
-"This wizard is intended to guide you through the procedure. You may cancel "
-"at any time, and this will abort the transaction."
+"The certificate is self-signed. While the trust chain could be built up, the "
+"root CA's (Certificate Authority) certificate can not be found."
 msgstr ""
-"Rydych wedi dweud yr ydych eisiau cael neu prynu tystysgrif ddiogel.  Bwriad "
-"y dewin yma yw eich arwain drwy'r weithdrefn yma.  Cewch ddiddymu unrhyw "
-"amser, a bydd hyn yn terfynu'r trafod."
 
-#. i18n: file: kssl/keygenwizard2.ui:35
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#: rc.cpp:89
+#: kssl/ksslcertificate.cpp:1090
 msgid ""
-"You must now provide a password for the certificate request. Please choose a "
-"very secure password as this will be used to encrypt your private key."
-msgstr ""
-"Rhaid i chi ddarparu rwan cyfrinair i'r cais tystysgrif.  Dewiswch cyfrinair "
-"diogel iawn, gan fod hwn yn cael ei ddefnyddio i amgryptio eich allwedd "
-"preifat."
-
-#. i18n: file: kssl/keygenwizard2.ui:48
-#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#: rc.cpp:92
-msgid "&Repeat password:"
-msgstr "&Ailadrodd cyfrinair:"
-
-#. i18n: file: kssl/keygenwizard2.ui:58
-#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:95
-msgid "&Choose password:"
-msgstr "&Dewis cyfrinair:"
-
-#. i18n: file: kssl/sslinfo.ui:16
-#. i18n: ectx: property (text), widget (QLabel, encryptionIndicator)
-#: rc.cpp:44
-msgid "[padlock]"
+"The CA's (Certificate Authority) certificate can not be found. Most likely, "
+"your trust chain is broken."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:30
-#. i18n: ectx: property (text), widget (QLabel, addressTag)
-#: rc.cpp:48
-msgctxt "Web page address"
-msgid "Address:"
+#: kssl/ksslcertificate.cpp:1092
+msgid ""
+"The certificate can not be verified as it is the only certificate in the "
+"trust chain and not self-signed. If you self-sign the certificate, make sure "
+"to import it into the list of trusted certificates."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:47
-#. i18n: ectx: property (text), widget (QLabel, ipTag)
-#: rc.cpp:52
-msgid "IP address:"
+#: kssl/ksslcertificate.cpp:1094
+msgid "The certificate chain is longer than the maximum depth specified."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:64
-#. i18n: ectx: property (text), widget (QLabel, encryptionTag)
-#: rc.cpp:56
-msgid "Encryption:"
+#: kssl/ksslcertificate.cpp:1097
+msgid "The certificate has been revoked."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:81
-#. i18n: ectx: property (text), widget (QLabel, detailsTag)
-#: rc.cpp:60
-msgid "Details:"
-msgstr "Manylion:"
-
-#. i18n: file: kssl/sslinfo.ui:98
-#. i18n: ectx: property (text), widget (QLabel, sslVersionTag)
-#: rc.cpp:64
-msgid "SSL version:"
+#: kssl/ksslcertificate.cpp:1099
+msgid "The certificate's CA (Certificate Authority) is invalid."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:115
-#. i18n: ectx: property (text), widget (QLabel, certSelectorTag)
-#: rc.cpp:68
-msgid "Certificate chain:"
+#: kssl/ksslcertificate.cpp:1101
+msgid ""
+"The length of the trust chain exceeded one of the CA's (Certificate "
+"Authority) 'pathlength' parameters, making all subsequent signatures invalid."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:144
-#. i18n: ectx: property (text), widget (QLabel, trustedTag)
-#: rc.cpp:71
-msgid "Trusted:"
+#: kssl/ksslcertificate.cpp:1103
+msgid ""
+"The certificate has not been signed for the purpose you tried to use it for. "
+"This means the CA (Certificate Authority) does not allow this usage."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:161
-#. i18n: ectx: property (text), widget (QLabel, validityPeriodTag)
-#: rc.cpp:75
-msgid "Validity period:"
+#: kssl/ksslcertificate.cpp:1106
+msgid ""
+"The root CA (Certificate Authority) is not trusted for the purpose you tried "
+"to use this certificate for."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:178
-#. i18n: ectx: property (text), widget (QLabel, serialTag)
-#: rc.cpp:79
-msgid "Serial number:"
+#: kssl/ksslcertificate.cpp:1109
+msgid ""
+"The root CA (Certificate Authority) has been marked to be rejected for the "
+"purpose you tried to use it for."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:195
-#. i18n: ectx: property (text), widget (QLabel, digestTag)
-#: rc.cpp:83
-msgid "MD5 digest:"
+#: kssl/ksslcertificate.cpp:1111
+msgid ""
+"The certificate's CA (Certificate Authority) does not match the CA name of "
+"the certificate."
 msgstr ""
 
-#. i18n: file: kssl/sslinfo.ui:211
-#. i18n: ectx: property (text), widget (QLabel, sha1DigestTag)
-#: rc.cpp:86
-msgid "SHA1 digest:"
+#: kssl/ksslcertificate.cpp:1113
+msgid ""
+"The CA (Certificate Authority) certificate's key ID does not match the key "
+"ID in the 'Issuer' section of the certificate you are trying to use."
 msgstr ""
 
-#. i18n: file: kssl/kcm/cacertificates.ui:24
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#: rc.cpp:131
-msgid "Organization / Common Name"
+#: kssl/ksslcertificate.cpp:1115
+msgid ""
+"The CA (Certificate Authority) certificate's key ID and name do not match "
+"the key ID and name in the 'Issuer' section of the certificate you are "
+"trying to use."
 msgstr ""
 
-#. i18n: file: kssl/kcm/cacertificates.ui:29
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#: rc.cpp:134
-msgid "Organizational Unit"
+#: kssl/ksslcertificate.cpp:1117
+msgid ""
+"The certificate's CA (Certificate Authority) is not allowed to sign "
+"certificates."
 msgstr ""
 
-#. i18n: file: kssl/kcm/cacertificates.ui:42
-#. i18n: ectx: property (text), widget (QPushButton, displaySelection)
-#: rc.cpp:137
-msgid "Display..."
+#: kssl/ksslcertificate.cpp:1119
+msgid "OpenSSL could not be verified."
 msgstr ""
 
-#. i18n: file: kssl/kcm/cacertificates.ui:68
-#. i18n: ectx: property (text), widget (KPushButton, disableSelection)
-#: rc.cpp:140
-msgid "Disable"
+#: kssl/ksslcertificate.cpp:1124
+msgid ""
+"The signature test for this certificate failed. This could mean that the "
+"signature of this certificate or any in its trust path are invalid, could "
+"not be decoded or that the CRL (Certificate Revocation List) could not be "
+"verified. If you see this message, please let the author of the software you "
+"are using know that he or she should use the new, more specific error "
+"messages."
 msgstr ""
 
-#. i18n: file: kssl/kcm/cacertificates.ui:78
-#. i18n: ectx: property (text), widget (QPushButton, enableSelection)
-#: rc.cpp:143
-msgid "Enable"
+#: kssl/ksslcertificate.cpp:1126
+msgid ""
+"This certificate, any in its trust path or its CA's (Certificate Authority) "
+"CRL (Certificate Revocation List) is not valid. Any of them could not be "
+"valid yet or not valid any more. If you see this message, please let the "
+"author of the software you are using know that he or she should use the new, "
+"more specific error messages."
 msgstr ""
 
-#. i18n: file: kssl/kcm/cacertificates.ui:104
-#. i18n: ectx: property (text), widget (KPushButton, removeSelection)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:219
-#. i18n: ectx: property (text), widget (QPushButton, delFiletypeButton)
-#: rc.cpp:146 rc.cpp:321
-msgid "Remove"
+#: kssl/ksslcertificate.cpp:1132
+msgid ""
+"Certificate signing authority root files could not be found so the "
+"certificate is not verified."
 msgstr ""
+"Ni ellid canfod ffeiliau gwraidd i'r awdurdod llofnodi tystysgrifau, felly "
+"ni wirir y tystysgrif."
 
-#. i18n: file: kssl/kcm/cacertificates.ui:111
-#. i18n: ectx: property (text), widget (KPushButton, add)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:209
-#. i18n: ectx: property (text), widget (QPushButton, addFiletypeButton)
-#: rc.cpp:149 rc.cpp:315
-msgid "Add..."
-msgstr "Ychwanegu..."
+#: kssl/ksslcertificate.cpp:1134
+msgid "SSL support was not found."
+msgstr "Ni chanfuwyd cynnal SSL."
 
-#. i18n: file: kssl/kcm/displaycert.ui:23
-#. i18n: ectx: property (text), widget (QLabel, subjectHeading)
-#: rc.cpp:98
-msgid "<b>Subject Information</b>"
-msgstr ""
+#: kssl/ksslcertificate.cpp:1136
+msgid "Private key test failed."
+msgstr "Methodd arbrawf yr allwedd breifat."
 
-#. i18n: file: kssl/kcm/displaycert.ui:39
-#. i18n: ectx: property (text), widget (QLabel, issuerHeading)
-#: rc.cpp:101
-msgid "<b>Issuer Information</b>"
-msgstr ""
+#: kssl/ksslcertificate.cpp:1138
+msgid "The certificate has not been issued for this host."
+msgstr "Ni chyhoeddwyd y tystysgrif am y gwesteiwr yma."
 
-#. i18n: file: kssl/kcm/displaycert.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:104
-msgid "<b>Other</b>"
+#: kssl/ksslcertificate.cpp:1140
+msgid "This certificate is not relevant."
 msgstr ""
 
-#. i18n: file: kssl/kcm/displaycert.ui:64
-#. i18n: ectx: property (text), widget (QLabel, validityPeriodLabel)
-#: rc.cpp:107
-msgid "Validity period"
-msgstr ""
+#: kssl/ksslcertificate.cpp:1145
+msgid "The certificate is invalid."
+msgstr "Mae'r dystysgrif yn annilys."
 
-#. i18n: file: kssl/kcm/displaycert.ui:78
-#. i18n: ectx: property (text), widget (QLabel, serialNumberLabel)
-#: rc.cpp:113
-msgid "Serial number"
+#: kssl/ksslutils.cpp:78
+msgid "GMT"
+msgstr "GMT"
+
+#: kssl/sslui.cpp:52
+msgid ""
+"The remote host did not send any SSL certificates.\n"
+"Aborting because the identity of the host cannot be established."
 msgstr ""
 
-#. i18n: file: kssl/kcm/displaycert.ui:92
-#. i18n: ectx: property (text), widget (QLabel, md5DigestLabel)
-#: rc.cpp:119
-msgid "MD5 digest"
+#: kssl/ksslinfodialog.cpp:65 kssl/ksslkeygen.cpp:124
+msgid "KDE SSL Information"
+msgstr "Gwybodaeth SSL KDE"
+
+#: kssl/ksslinfodialog.cpp:73
+msgctxt "The receiver of the SSL certificate"
+msgid "Subject"
 msgstr ""
 
-#. i18n: file: kssl/kcm/displaycert.ui:106
-#. i18n: ectx: property (text), widget (QLabel, sha1DigestLabel)
-#: rc.cpp:125
-msgid "SHA1 digest"
+#: kssl/ksslinfodialog.cpp:74
+msgctxt "The authority that issued the SSL certificate"
+msgid "Issuer"
 msgstr ""
 
-#. i18n: file: kssl/certificateparty.ui:27
-#. i18n: ectx: property (text), widget (QLabel, commonNameTag)
-#: rc.cpp:8
-msgid "Common name:"
-msgstr "Enw Cyffredin:"
+#: kssl/ksslinfodialog.cpp:84 kssl/ksslinfodialog.cpp:129
+msgid "Current connection is secured with SSL."
+msgstr "Diogelir y cysylltiad cyfredol gan SSL."
 
-#. i18n: file: kssl/certificateparty.ui:37
-#. i18n: ectx: property (text), widget (QLabel, commonName)
-#: rc.cpp:11
-msgid "Acme Co."
-msgstr ""
+#: kssl/ksslinfodialog.cpp:87 kssl/ksslinfodialog.cpp:142
+msgid "Current connection is not secured with SSL."
+msgstr "Ni ddiogelir y cysylltiad cyfredol gan SSL."
 
-#. i18n: file: kssl/certificateparty.ui:44
-#. i18n: ectx: property (text), widget (QLabel, organizationTag)
-#: rc.cpp:14
-msgid "Organization:"
-msgstr "Sefydliad:"
+#: kssl/ksslinfodialog.cpp:91
+msgid "SSL support is not available in this build of KDE."
+msgstr "Nid yw cynnal SSL ar gael yn yr adeiladaeth yma o KDE."
 
-#. i18n: file: kssl/certificateparty.ui:54
-#. i18n: ectx: property (text), widget (QLabel, organization)
-#: rc.cpp:17
-msgid "Acme Sundry Products Company"
+#: kssl/ksslinfodialog.cpp:132
+msgid ""
+"The main part of this document is secured with SSL, but some parts are not."
 msgstr ""
+"Mae prif ddarn y ddogfen yma yn cael ei diogelu gan SSL, ond mae rhai "
+"ddarnau heb."
 
-#. i18n: file: kssl/certificateparty.ui:61
-#. i18n: ectx: property (text), widget (QLabel, organizationalUnitTag)
-#: rc.cpp:20
-msgid "Organizational unit:"
-msgstr "Uned trefniadaeth:"
-
-#. i18n: file: kssl/certificateparty.ui:71
-#. i18n: ectx: property (text), widget (QLabel, organizationalUnit)
-#: rc.cpp:23
-msgid "Fraud Department"
+#: kssl/ksslinfodialog.cpp:138
+msgid "Some of this document is secured with SSL, but the main part is not."
 msgstr ""
 
-#. i18n: file: kssl/certificateparty.ui:78
-#. i18n: ectx: property (text), widget (QLabel, countryTag)
-#: rc.cpp:26
-msgid "Country:"
-msgstr "Gwlad:"
+#: kssl/ksslinfodialog.cpp:187
+#, kde-format
+msgctxt "Part of: %1, using %2 bits of a %3 bit key"
+msgid "using %1 bit"
+msgid_plural "using %1 bits"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: kssl/certificateparty.ui:88
-#. i18n: ectx: property (text), widget (QLabel, country)
-#: rc.cpp:29
-msgid "Canada"
-msgstr ""
+#: kssl/ksslinfodialog.cpp:189
+#, kde-format
+msgctxt "Part of: %1, using %2 bits of a %3 bit key"
+msgid "of a %1 bit key"
+msgid_plural "of a %1 bit key"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: kssl/certificateparty.ui:95
-#. i18n: ectx: property (text), widget (QLabel, stateTag)
-#: rc.cpp:32
-msgid "State:"
+#: kssl/ksslinfodialog.cpp:185
+#, kde-format
+msgctxt "%1, using %2 bits of a %3 bit key"
+msgid "%1, %2 %3"
 msgstr ""
 
-#. i18n: file: kssl/certificateparty.ui:105
-#. i18n: ectx: property (text), widget (QLabel, state)
-#: rc.cpp:35
-msgid "Quebec"
+#: kssl/ksslinfodialog.cpp:206
+msgctxt "The certificate is not trusted"
+msgid "NO, there were errors:"
 msgstr ""
 
-#. i18n: file: kssl/certificateparty.ui:112
-#. i18n: ectx: property (text), widget (QLabel, cityTag)
-#: rc.cpp:38
-msgid "City:"
+#: kssl/ksslinfodialog.cpp:213
+msgctxt "The certificate is trusted"
+msgid "Yes"
 msgstr ""
 
-#. i18n: file: kssl/certificateparty.ui:122
-#. i18n: ectx: property (text), widget (QLabel, city)
-#: rc.cpp:41
-msgid "Lakeridge Meadows"
+#: kssl/ksslinfodialog.cpp:217 kssl/kcm/displaycertdialog.cpp:54
+#, kde-format
+msgctxt "%1 is the effective date of the certificate, %2 is the expiry date"
+msgid "%1 to %2"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:11
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2)
-#: rc.cpp:152
-msgctxt ""
-"@title:group Title of a group that lets the user choose options about the "
-"terminal when launching a program"
-msgid "Terminal"
-msgstr ""
+#: kssl/ksslkeygen.cpp:82
+msgid "KDE Certificate Request"
+msgstr "Cais Tystysgrif KDE"
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:33
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, terminalCheck)
-#: rc.cpp:155
-msgid ""
-"Check this option if the application you want to run is a text mode "
-"application or if you want the information that is provided by the terminal "
-"emulator window."
+#: kssl/ksslkeygen.cpp:89
+msgid "KDE Certificate Request - Password"
+msgstr "Cais Tystysgrif KDE - Cyfrinair"
+
+#: kssl/ksslkeygen.cpp:124
+msgid "Unsupported key size."
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:36
-#. i18n: ectx: property (text), widget (QCheckBox, terminalCheck)
-#: rc.cpp:158
-msgid "&Run in terminal"
-msgstr "&Rhedeg mewn terfynell"
+#: kssl/ksslkeygen.cpp:130
+msgid "KDE"
+msgstr "KDE"
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:43
-#. i18n: ectx: property (text), widget (QLabel, terminalEditLabel)
-#: rc.cpp:161
-msgid "&Terminal options:"
-msgstr "&Dewisiadau Terfynell"
+#: kssl/ksslkeygen.cpp:131
+msgid "Please wait while the encryption keys are generated..."
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:53
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, terminalCloseCheck)
-#: rc.cpp:164
-msgid ""
-"Check this option if the text mode application offers relevant information "
-"on exit. Keeping the terminal emulator open allows you to retrieve this "
-"information."
+#: kssl/ksslkeygen.cpp:144
+msgid "Do you wish to store the passphrase in your wallet file?"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:56
-#. i18n: ectx: property (text), widget (QCheckBox, terminalCloseCheck)
-#: rc.cpp:167
-msgid "Do not &close when command exits"
-msgstr "Peidiwch a c&hau pan bydd y gorchymyn yn terfynu."
+#: kssl/ksslkeygen.cpp:144
+msgid "Store"
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:69
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2_2)
-#: rc.cpp:170
-msgctxt ""
-"@title:group Title of a group that lets the user choose which user to use "
-"when launching a program"
-msgid "User"
+#: kssl/ksslkeygen.cpp:144
+msgid "Do Not Store"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:75
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, suidCheck)
-#: rc.cpp:173
-msgid ""
-"Check this option if you want to run this application with a different user "
-"id. Every process has a different user id associated with it. This id code "
-"determines file access and other permissions. The password of the user is "
-"required to use this option."
+#: kssl/ksslkeygen.cpp:260
+msgid "2048 (High Grade)"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:78
-#. i18n: ectx: property (text), widget (QCheckBox, suidCheck)
-#: rc.cpp:176
-msgid "Ru&n as a different user"
-msgstr "Rhede&g fel defnyddiwr gwahanol"
+#: kssl/ksslkeygen.cpp:261
+msgid "1024 (Medium Grade)"
+msgstr ""
+
+#: kssl/ksslkeygen.cpp:262
+msgid "768  (Low Grade)"
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:101
-#. i18n: ectx: property (whatsThis), widget (QLabel, suidEditLabel)
-#: rc.cpp:179
-msgid "Enter the user name you want to run the application as."
+#: kssl/ksslkeygen.cpp:263
+msgid "512  (Low Grade)"
 msgstr ""
-"Mewnosodwch enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:104
-#. i18n: ectx: property (text), widget (QLabel, suidEditLabel)
-#: rc.cpp:182
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
+#: kssl/ksslkeygen.cpp:265
+msgid "No SSL support."
+msgstr "Ni chynhelir SSL."
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:114
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, suidEdit)
-#: rc.cpp:185
-msgid "Enter the user name you want to run the application as here."
+#: kssl/kcm/cacertificatespage.cpp:131
+msgid "System certificates"
 msgstr ""
-"Mewnosodwch yma enw'r defnyddiwr yr ydych eisiau rhedeg y cymhwysiad fel."
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:124
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup4)
-#: rc.cpp:188
-msgctxt ""
-"@title:group Title of a group that lets the user choose options regargin "
-"program startup"
-msgid "Startup"
+#: kssl/kcm/cacertificatespage.cpp:138
+msgid "User-added certificates"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:130
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, startupInfoCheck)
-#: rc.cpp:191
-msgid ""
-"Check this option if you want to make clear that your application has "
-"started. This visual feedback may appear as a busy cursor or in the taskbar."
+#: kssl/kcm/cacertificatespage.cpp:295
+msgid "Pick Certificates"
 msgstr ""
-"Cadarnhewch y dewisiad yma os hoffech egluro bod eich cymhwysiad wedi "
-"ymcychwyn.  Gall yr adborth gweledol ymddangos fel cyrchydd prysur neu yn y "
-"bar tasgiau."
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:133
-#. i18n: ectx: property (text), widget (QCheckBox, startupInfoCheck)
-#: rc.cpp:194
-msgid "Enable &launch feedback"
-msgstr "Galluogi adbor&th ymgychwyn"
+#: kssl/kcm/kcmssl.cpp:40
+msgid "SSL Configuration Module"
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:140
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, systrayCheck)
-#: rc.cpp:197
-msgid ""
-"Check this option if you want to have a system tray handle for your "
-"application."
+#: kssl/kcm/kcmssl.cpp:42
+msgid "Copyright 2010 Andreas Hartmetz"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:143
-#. i18n: ectx: property (text), widget (QCheckBox, systrayCheck)
-#: rc.cpp:200
-msgid "&Place in system tray"
+#: kssl/kcm/kcmssl.cpp:43
+msgid "Andreas Hartmetz"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:150
-#. i18n: ectx: property (text), widget (QLabel, textLabel12)
-#: rc.cpp:203
-msgid "&D-Bus registration:"
+#: kssl/kcm/kcmssl.cpp:55
+msgid "SSL Signers"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:161
-#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
-#: rc.cpp:206
-msgid "None"
-msgstr "Dim"
+#: ../kioslave/metainfo/metainfo.cpp:39
+msgid "kio_metainfo"
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:166
-#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
-#: rc.cpp:209
-msgid "Multiple Instances"
-msgstr "Enghreifftiau Lluosol"
+#: ../kioslave/metainfo/metainfo.cpp:98
+#, kde-format
+msgid "No metainfo for %1"
+msgstr "Dim meta-wybodaeth am %1"
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:171
-#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
-#: rc.cpp:212
-msgid "Single Instance"
-msgstr "Enghraifft Sengl"
+#: ../kioslave/ftp/ftp.cpp:356
+#, kde-format
+msgid "Opening connection to host %1"
+msgstr "Agor cysylltiad i westeiwr %1"
 
-#. i18n: file: kfile/kpropertiesdesktopadvbase.ui:176
-#. i18n: ectx: property (text), item, widget (KComboBox, dbusCombo)
-#: rc.cpp:215
-msgid "Run Until Finished"
-msgstr "Rhedeg tan i'w Orffen"
+#: ../kioslave/ftp/ftp.cpp:371
+#, kde-format
+msgid "Connected to host %1"
+msgstr "Wedi cysylltu i westeiwr %1"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:14
-#. i18n: ectx: property (whatsThis), widget (QLabel, nameLabel)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:27
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, nameEdit)
-#: rc.cpp:218 rc.cpp:224
+#: ../kioslave/ftp/ftp.cpp:478
+#, kde-format
 msgid ""
-"Type the name you want to give to this application here. This application "
-"will appear under this name in the applications menu and in the panel."
+"%1.\n"
+"\n"
+"Reason: %2"
 msgstr ""
-"Teipiwch yma yr enw yr ydych eisiau roi i'r cymhwysiad yma.  Bydd y "
-"cymhwysiad yma yn ymddangos dan yr enw yma yn y ddewislen gymhwysiadau ac yn "
-"y panel."
+"%1.\n"
+"\n"
+"Rheswm: %2"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:17
-#. i18n: ectx: property (text), widget (QLabel, nameLabel)
-#: rc.cpp:221 ../kfile/kfilewidget.cpp:533
-msgid "&Name:"
-msgstr "&Enw:"
+#: ../kioslave/ftp/ftp.cpp:507
+msgid "Sending login information"
+msgstr "Anfon gwybodaeth fewngofnodi"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:34
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:47
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, genNameEdit)
-#: rc.cpp:227 rc.cpp:233
+#: ../kioslave/ftp/ftp.cpp:570
+#, kde-format
 msgid ""
-"Type the description of this application, based on its use, here. Examples: "
-"a dial up application (KPPP) would be \"Dial up tool\"."
+"Message sent:\n"
+"Login using username=%1 and password=[hidden]\n"
+"\n"
+"Server replied:\n"
+"%2\n"
+"\n"
 msgstr ""
-"Teipiwch yma ddisgrifiad o'r cymhwysiad yma, wedi'i seilio ar ei ddefnydd.  "
-"Enghreifftiau: buasai cymhwysiad deialu (KPPP) yn \"Erfyn deilau\"."
+"Anfonwyd neges: \n"
+" Mewngofnod  gan ddefnyddio defnydd-enw: %1 a cyfrinair [cudd] \n"
+"\n"
+" Atebodd y gweinydd: \n"
+" %2\n"
+"\n"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:37
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:230
-msgid "&Description:"
-msgstr "&Disgrifiad:"
+#: ../kioslave/ftp/ftp.cpp:578 ../kioslave/http/http.cpp:3493
+msgid "You need to supply a username and a password to access this site."
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:54
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:67
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, commentEdit)
-#: rc.cpp:236 rc.cpp:242
-msgid "Type any comment you think is useful here."
-msgstr "Teipiwch yma unrhyw sylwad o ddefnydd."
+#: ../kioslave/ftp/ftp.cpp:580 ../kioslave/http/http.cpp:3495
+msgid "Site:"
+msgstr "Gwefan:"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:57
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:239
-msgid "Comm&ent:"
-msgstr "Syl&wad:"
+#: ../kioslave/ftp/ftp.cpp:581
+#, kde-format
+msgid "<b>%1</b>"
+msgstr "<b>%1</b>"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:85
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:111
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, commandEdit)
-#: rc.cpp:246 rc.cpp:264
-#, no-c-format
+#: ../kioslave/ftp/ftp.cpp:679
+msgid "Login OK"
+msgstr "Mewngofnod iawn"
+
+#: ../kioslave/ftp/ftp.cpp:708
+#, kde-format
+msgid "Could not login to %1."
+msgstr "Methu mewngofnodi i %1"
+
+#: ../kioslave/ftp/ftp.cpp:2564 ../kioslave/http/http.cpp:3505
+#: ../kioslave/http/http.cpp:5410
 msgid ""
-"Type the command to start this application here.\n"
-"\n"
-"Following the command, you can have several place holders which will be "
-"replaced with the actual values when the actual program is run:\n"
-"%f - a single file name\n"
-"%F - a list of files; use for applications that can open several local files "
-"at once\n"
-"%u - a single URL\n"
-"%U - a list of URLs\n"
-"%d - the directory of the file to open\n"
-"%D - a list of directories\n"
-"%i - the icon\n"
-"%m - the mini-icon\n"
-"%c - the caption"
+"You need to supply a username and a password for the proxy server listed "
+"below before you are allowed to access any sites."
 msgstr ""
-"Teipiwch y gorchymyn i gychwyn y cyhwysiad yma.\n"
-"\n"
-"Wedi'r gorchymyn, gallwch gael mwy nag un cadwrydd lle a fydd yn cael ei "
-"ailosod gan y gwerthoedd gwirioneddol pan rhedir y rhaglen wirioneddol:\n"
-"%f - enw ffeil sengl\n"
-"%F - rhestr ffeiliau; i'w ddefnyddio i gymhwysiadau sy'n gallu agor mwy nag "
-"un ffeil lleol ar yr un pryd\n"
-"%u - URL sengl\n"
-"%U - rhestr o URLau\n"
-"%d - plygell y ffeil i agor\n"
-"%D - rhestr o blygyll\n"
-"%i - yr eicon\n"
-"%m - yr eicon bach\n"
-"%c - y sylwad"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:88
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:260
-msgid "Co&mmand:"
-msgstr "G&orchymyn:"
+#: ../kioslave/ftp/ftp.cpp:2568 ../kioslave/http/http.cpp:3508
+#: ../kioslave/http/http.cpp:5414
+msgid "Proxy:"
+msgstr "Dirprwy:"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:118
-#. i18n: ectx: property (whatsThis), widget (QPushButton, browseButton)
-#: rc.cpp:278
+#: ../kioslave/ftp/ftp.cpp:2569 ../kioslave/http/http.cpp:3582
+#: ../kioslave/http/http.cpp:5415
+#, kde-format
+msgid "<b>%1</b> at <b>%2</b>"
+msgstr "<b>%1</b> wrth <b>%2</b>"
+
+#: ../kioslave/ftp/ftp.cpp:2570 ../kioslave/http/http.cpp:3572
+#: ../kioslave/http/http.cpp:5416
+msgid "Proxy Authentication Failed."
+msgstr ""
+
+#: ../kioslave/file/file.cpp:211
+#, kde-format
+msgid "Setting ACL for %1"
+msgstr ""
+
+#: ../kioslave/file/file.cpp:730 ../kioslave/file/file_unix.cpp:304
+#, kde-format
 msgid ""
-"Click here to browse your file system in order to find the desired "
-"executable."
+"Could not change permissions for\n"
+"%1"
 msgstr ""
-"Cliciwch yma i bori'ch cysawd ffeil er mwyn canfod y gweithredadwyn penodol."
+"Methu newid caniatadau i \n"
+" %1"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:130
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:143
-#. i18n: ectx: property (whatsThis), widget (KUrlRequester, pathEdit)
-#: rc.cpp:284 rc.cpp:290
-msgid "Sets the working directory for your application."
+#: ../kioslave/file/file.cpp:925
+msgid "No Media inserted or Media not recognized."
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:133
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:287
-msgid "&Work path:"
-msgstr "Llwybr g&waith:"
+#: ../kioslave/file/file.cpp:935 ../kioslave/file/file.cpp:1144
+msgid "\"vold\" is not running."
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:157
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel7)
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:178
-#. i18n: ectx: property (whatsThis), widget (QTreeWidget, filetypeList)
-#: rc.cpp:293 rc.cpp:301
-msgid ""
-"<qt><p>This list should show the types of file that your application can "
-"handle. This list is organized by <u>mimetypes</u>.</p>\n"
-"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
-"identifying the type of data based on filename extensions and correspondent "
-"<u>mimetypes</u>. Example: the \"bmp\" part that comes after the dot in "
-"flower.bmp indicates that it is a specific kind of image, <u>image/x-"
-"bmp</u>. To know which application should open each type of file, the system "
-"should be informed about the abilities of each application to handle these "
-"extensions and mimetypes.</p>\n"
-"<p>If you want to associate this application with one or more mimetypes that "
-"are not in this list, click on the button <b>Add</b> below. If there are one "
-"or more filetypes that this application cannot handle, you may want to "
-"remove them from the list clicking on the button <b>Remove</b> "
-"below.</p></qt>"
+#: ../kioslave/file/file.cpp:970
+msgid "Could not find program \"mount\""
+msgstr ""
+
+#: ../kioslave/file/file.cpp:1049
+msgid "mounting is not supported by wince."
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:160
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:298
-msgid "&Supported file types:"
-msgstr "Mat&hau ffeil a gynhelir:"
+#: ../kioslave/file/file.cpp:1157
+msgid "Could not find program \"umount\""
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:191
-#. i18n: ectx: property (text), widget (QTreeWidget, filetypeList)
-#: rc.cpp:306
-msgid "Mimetype"
-msgstr "Math MIME"
+#: ../kioslave/file/file.cpp:1171
+msgid "unmounting is not supported by wince."
+msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:196
-#. i18n: ectx: property (text), widget (QTreeWidget, filetypeList)
-#: rc.cpp:309
-msgid "Description"
-msgstr "Disgrifiad"
+#: ../kioslave/file/file.cpp:1258
+#, kde-format
+msgid "Could not read %1"
+msgstr "Methu darllen %1"
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:206
-#. i18n: ectx: property (whatsThis), widget (QPushButton, addFiletypeButton)
-#: rc.cpp:312
-msgid ""
-"Click on this button if you want to add a type of file (mimetype) that your "
-"application can handle."
+#: ../kioslave/file/file_unix.cpp:235
+#, kde-format
+msgid "Cannot copy file from %1 to %2. (Errno: %3)"
 msgstr ""
-"Cliciwch ar y botwm yma os ydych eisiau ychwanegu math o ffeil (math mime) y "
-"gall eich cymhwysiad ei drin."
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:216
-#. i18n: ectx: property (whatsThis), widget (QPushButton, delFiletypeButton)
-#: rc.cpp:318
-msgid ""
-"If you want to remove a type of file (mimetype) that your application cannot "
-"handle, select the mimetype in the list above and click on this button."
+#: ../kioslave/file/file_unix.cpp:348
+#, kde-format
+msgid "No media in device for %1"
 msgstr ""
-"Os ydych eisiau gwaredu math ffeil (math mime) na all eich cymhwysiad ei "
-"drin, dewiswch y math mime yn y rhestr uchod a cliciwch ar y botwm yma."
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:242
-#. i18n: ectx: property (whatsThis), widget (QPushButton, advancedButton)
-#: rc.cpp:324
-msgid ""
-"Click here to modify the way this application will run, launch feedback, D-"
-"Bus options or to run it as a different user."
+#: ../kioslave/file/file_unix.cpp:617
+#, kde-format
+msgid "Could not get user id for given user name %1"
 msgstr ""
 
-#. i18n: file: kfile/kpropertiesdesktopbase.ui:245
-#. i18n: ectx: property (text), widget (QPushButton, advancedButton)
-#: rc.cpp:327
-msgid "Ad&vanced Options"
-msgstr "De&wisiadau Uwch"
+#: ../kioslave/file/file_unix.cpp:630
+#, kde-format
+msgid "Could not get group id for given group name %1"
+msgstr ""
 
 #: ../kioslave/http/kcookiejar/kcookiewin.cpp:64
 msgid "Cookie Alert"
@@ -5528,89 +5785,98 @@
 msgid "Reload configuration file"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:620
-msgid "No host specified."
+#: ../kioslave/http/http_cache_cleaner.cpp:728
+#: ../kioslave/http/http_cache_cleaner.cpp:729
+msgid "KDE HTTP cache maintenance tool"
+msgstr "Erfyn KDE am gynnal a chadw y storfa HTTP"
+
+#: ../kioslave/http/http_cache_cleaner.cpp:732
+msgid "Empty the cache"
+msgstr "Gwagu'r celc"
+
+#: ../kioslave/http/http_cache_cleaner.cpp:733
+msgid "Display information about cache file"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1500
-msgid "The resource cannot be deleted."
+#: ../kioslave/http/http.cpp:601
+msgid "No host specified."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1621
+#: ../kioslave/http/http.cpp:1594
 msgid "Otherwise, the request would have succeeded."
 msgstr "Fel arall, buasai'r cais wedi llwyddo."
 
-#: ../kioslave/http/http.cpp:1625
+#: ../kioslave/http/http.cpp:1598
 msgctxt "request type"
 msgid "retrieve property values"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1628
+#: ../kioslave/http/http.cpp:1601
 msgctxt "request type"
 msgid "set property values"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1631
+#: ../kioslave/http/http.cpp:1604
 msgctxt "request type"
 msgid "create the requested folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1634
+#: ../kioslave/http/http.cpp:1607
 msgctxt "request type"
 msgid "copy the specified file or folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1637
+#: ../kioslave/http/http.cpp:1610
 msgctxt "request type"
 msgid "move the specified file or folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1640
+#: ../kioslave/http/http.cpp:1613
 msgctxt "request type"
 msgid "search in the specified folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1643
+#: ../kioslave/http/http.cpp:1616
 msgctxt "request type"
 msgid "lock the specified file or folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1646
+#: ../kioslave/http/http.cpp:1619
 msgctxt "request type"
 msgid "unlock the specified file or folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1649
+#: ../kioslave/http/http.cpp:1622
 msgctxt "request type"
 msgid "delete the specified file or folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1652
+#: ../kioslave/http/http.cpp:1625
 msgctxt "request type"
 msgid "query the server's capabilities"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1655
+#: ../kioslave/http/http.cpp:1628
 msgctxt "request type"
 msgid "retrieve the contents of the specified file or folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1658
+#: ../kioslave/http/http.cpp:1631
 msgctxt "request type"
 msgid "run a report in the specified folder"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1670
+#: ../kioslave/http/http.cpp:1642
 #, kde-format
 msgctxt "%1: code, %2: request type"
 msgid "An unexpected error (%1) occurred while attempting to %2."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1678
+#: ../kioslave/http/http.cpp:1650
 msgid "The server does not support the WebDAV protocol."
 msgstr "Nid yw'r gweinydd yn cynnal y protocol WebDAV."
 
-#: ../kioslave/http/http.cpp:1720
+#: ../kioslave/http/http.cpp:1692
 #, kde-format
 msgctxt "%1: request type, %2: url"
 msgid ""
@@ -5618,17 +5884,13 @@
 "below."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1734 ../kioslave/http/http.cpp:1839
+#: ../kioslave/http/http.cpp:1706 ../kioslave/http/http.cpp:1838
 #, kde-format
 msgctxt "%1: request type"
 msgid "Access was denied while attempting to %1."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1741
-msgid "The specified folder already exists."
-msgstr "Mae'r plygell penodol mewn bod yn barod."
-
-#: ../kioslave/http/http.cpp:1747 ../kioslave/http/http.cpp:1844
+#: ../kioslave/http/http.cpp:1719 ../kioslave/http/http.cpp:1844
 msgid ""
 "A resource cannot be created at the destination until one or more "
 "intermediate collections (folders) have been created."
@@ -5636,7 +5898,7 @@
 "Ni ellir creu adnodd yn y cyrchfan nes bydd un neu mwy o'r gasgliadau "
 "(plygyll) canolraddol wedi'u creu."
 
-#: ../kioslave/http/http.cpp:1756
+#: ../kioslave/http/http.cpp:1727
 #, kde-format
 msgid ""
 "The server was unable to maintain the liveness of the properties listed in "
@@ -5647,26 +5909,26 @@
 "propertybehaviour XML, neu rydych wedi ceisio ysgrifennu dros ffeil wrth "
 "ofyn peidio ag ysgrifennu dros ffeiliau. %1"
 
-#: ../kioslave/http/http.cpp:1766
+#: ../kioslave/http/http.cpp:1735
 #, kde-format
 msgid "The requested lock could not be granted. %1"
 msgstr "Methu rhoi'r clo penodol. %1"
 
-#: ../kioslave/http/http.cpp:1772
+#: ../kioslave/http/http.cpp:1741
 msgid "The server does not support the request type of the body."
 msgstr "Nid yw'r gweinydd yn cynnal math cais y corff."
 
-#: ../kioslave/http/http.cpp:1777 ../kioslave/http/http.cpp:1851
+#: ../kioslave/http/http.cpp:1746 ../kioslave/http/http.cpp:1852
 #, kde-format
 msgctxt "%1: request type"
 msgid "Unable to %1 because the resource is locked."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1781
+#: ../kioslave/http/http.cpp:1750
 msgid "This action was prevented by another error."
 msgstr "Rhwystrwyd y gweithrediad gan wall arall."
 
-#: ../kioslave/http/http.cpp:1788 ../kioslave/http/http.cpp:1856
+#: ../kioslave/http/http.cpp:1756 ../kioslave/http/http.cpp:1858
 #, kde-format
 msgctxt "%1: request type"
 msgid ""
@@ -5674,7 +5936,7 @@
 "folder."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1795 ../kioslave/http/http.cpp:1862
+#: ../kioslave/http/http.cpp:1763 ../kioslave/http/http.cpp:1865
 msgid ""
 "The destination resource does not have sufficient space to record the state "
 "of the resource after the execution of this method."
@@ -5682,24 +5944,28 @@
 "Nid oes gan yr adnodd cyrchfan ddigon o le i gofnodi cyflwr yr adnodd ar ôl "
 "gweithrediad y dull yma."
 
-#: ../kioslave/http/http.cpp:1817
+#: ../kioslave/http/http.cpp:1816
+msgid "The resource cannot be deleted."
+msgstr ""
+
+#: ../kioslave/http/http.cpp:1829
 #, kde-format
 msgctxt "request type"
 msgid "upload %1"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:1828
+#: ../kioslave/http/http.cpp:1879
 #, kde-format
 msgctxt "%1: response code, %2: request type"
 msgid "An unexpected error (%1) occurred while attempting to %2."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:2588
+#: ../kioslave/http/http.cpp:2705
 #, kde-format
 msgid "%1 contacted. Waiting for reply..."
 msgstr "%1 wedi'i cysylltu. Yn disgwyl am ateb..."
 
-#: ../kioslave/http/http.cpp:2905
+#: ../kioslave/http/http.cpp:3037
 #, kde-format
 msgctxt "@warning: Security check on url being accessed"
 msgid ""
@@ -5708,216 +5974,211 @@
 "you.<p>Is \"%1\" the site you want to visit?"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:2912
+#: ../kioslave/http/http.cpp:3044
 msgctxt "@title:window"
 msgid "Confirm Website Access"
 msgstr ""
 
-#: ../kioslave/http/http.cpp:2989
+#: ../kioslave/http/http.cpp:3121
 msgid "Server processing request, please wait..."
 msgstr "Mae'r gweinydd yn prosesu'r cais, arhoswch..."
 
-#: ../kioslave/ftp/ftp.cpp:504 ../kioslave/http/http.cpp:3344
-msgid "You need to supply a username and a password to access this site."
-msgstr ""
-
-#: ../kioslave/ftp/ftp.cpp:506 ../kioslave/http/http.cpp:3346
-msgid "Site:"
-msgstr "Gwefan:"
-
-#: ../kioslave/http/http.cpp:3356 ../kioslave/http/http.cpp:5141
-msgid ""
-"You need to supply a username and a password for the proxy server listed "
-"below before you are allowed to access any sites."
-msgstr ""
-
-#: ../kioslave/http/http.cpp:3359 ../kioslave/http/http.cpp:5145
-msgid "Proxy:"
-msgstr "Dirprwy:"
-
-#: ../kioslave/http/http.cpp:3420
+#: ../kioslave/http/http.cpp:3569
 msgid "Authentication Failed."
 msgstr "Methodd dilysiant."
 
-#: ../kioslave/http/http.cpp:3423 ../kioslave/http/http.cpp:5147
-msgid "Proxy Authentication Failed."
-msgstr ""
-
-#: ../kioslave/http/http.cpp:3433 ../kioslave/http/http.cpp:5146
-#, kde-format
-msgid "<b>%1</b> at <b>%2</b>"
-msgstr "<b>%1</b> wrth <b>%2</b>"
-
-#: ../kioslave/http/http.cpp:3465
+#: ../kioslave/http/http.cpp:3615
 msgid "Authorization failed."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:3482
+#: ../kioslave/http/http.cpp:3632
 msgid "Unknown Authorization method."
 msgstr ""
 
-#: ../kioslave/http/http.cpp:3906
+#: ../kioslave/http/http.cpp:4014 ../kioslave/http/http.cpp:4068
 #, kde-format
 msgid "Sending data to %1"
 msgstr "Anfon data i %1"
 
-#: ../kioslave/http/http.cpp:4330
+#: ../kioslave/http/http.cpp:4534
 #, kde-format
 msgid "Retrieving %1 from %2..."
 msgstr "Nôl %1 oddiwrth %2..."
 
-#: ../kioslave/http/http.cpp:4336
-#, kde-format
-msgid "Retrieving from %1..."
-msgstr "Nôl oddiwrth %1..."
+#: ../kfile/kfiletreeview.cpp:187
+msgid "Show Hidden Folders"
+msgstr ""
 
-#: ../kioslave/http/http_cache_cleaner.cpp:728
-#: ../kioslave/http/http_cache_cleaner.cpp:729
-msgid "KDE HTTP cache maintenance tool"
-msgstr "Erfyn KDE am gynnal a chadw y storfa HTTP"
+#: ../kfile/kfileplaceeditdialog.cpp:90
+msgid "Add Places Entry"
+msgstr ""
 
-#: ../kioslave/http/http_cache_cleaner.cpp:732
-msgid "Empty the cache"
-msgstr "Gwagu'r celc"
+#: ../kfile/kfileplaceeditdialog.cpp:92
+msgid "Edit Places Entry"
+msgstr ""
 
-#: ../kioslave/http/http_cache_cleaner.cpp:733
-msgid "Display information about cache file"
+#: ../kfile/kfileplaceeditdialog.cpp:103
+msgid ""
+"<qt>This is the text that will appear in the Places panel.<br /><br />The "
+"label should consist of one or two words that will help you remember what "
+"this entry refers to. If you do not enter a label, it will be derived from "
+"the location's URL.</qt>"
 msgstr ""
 
-#: ../kioslave/ftp/ftp.cpp:353
-#, kde-format
-msgid "Opening connection to host %1"
-msgstr "Agor cysylltiad i westeiwr %1"
+#: ../kfile/kfileplaceeditdialog.cpp:109
+msgid "L&abel:"
+msgstr ""
 
-#: ../kioslave/ftp/ftp.cpp:368
-#, kde-format
-msgid "Connected to host %1"
-msgstr "Wedi cysylltu i westeiwr %1"
+#: ../kfile/kfileplaceeditdialog.cpp:111
+msgid "Enter descriptive label here"
+msgstr ""
 
-#: ../kioslave/ftp/ftp.cpp:414
+#: ../kfile/kfileplaceeditdialog.cpp:115
 #, kde-format
 msgid ""
-"%1.\n"
-"\n"
-"Reason: %2"
+"<qt>This is the location associated with the entry. Any valid URL may be "
+"used. For example:<br /><br />%1<br />http://www.kde.org<br "
+"/>ftp://ftp.kde.org/pub/kde/stable<br /><br />By clicking on the button next "
+"to the text edit box you can browse to an appropriate URL.</qt>"
 msgstr ""
-"%1.\n"
-"\n"
-"Rheswm: %2"
 
-#: ../kioslave/ftp/ftp.cpp:443
-msgid "Sending login information"
-msgstr "Anfon gwybodaeth fewngofnodi"
+#: ../kfile/kfileplaceeditdialog.cpp:121
+msgid "&Location:"
+msgstr "&Lleoliad:"
 
-#: ../kioslave/ftp/ftp.cpp:496
-#, kde-format
+#: ../kfile/kfileplaceeditdialog.cpp:127
 msgid ""
-"Message sent:\n"
-"Login using username=%1 and password=[hidden]\n"
-"\n"
-"Server replied:\n"
-"%2\n"
-"\n"
+"<qt>This is the icon that will appear in the Places panel.<br /><br />Click "
+"on the button to select a different icon.</qt>"
 msgstr ""
-"Anfonwyd neges: \n"
-" Mewngofnod  gan ddefnyddio defnydd-enw: %1 a cyfrinair [cudd] \n"
-"\n"
-" Atebodd y gweinydd: \n"
-" %2\n"
-"\n"
 
-#: ../kioslave/ftp/ftp.cpp:507
-#, kde-format
-msgid "<b>%1</b>"
-msgstr "<b>%1</b>"
+#: ../kfile/kfileplaceeditdialog.cpp:130
+msgid "Choose an &icon:"
+msgstr "Dewis &eicon:"
 
-#: ../kioslave/ftp/ftp.cpp:590
-msgid "Login OK"
-msgstr "Mewngofnod iawn"
+#: ../kfile/kfileplaceeditdialog.cpp:147
+#, kde-format
+msgid "&Only show when using this application (%1)"
+msgstr "Dangos 'mond &pan ddefnyddir y cymhwysiad yma (%1)"
 
-#: ../kioslave/ftp/ftp.cpp:619
+#: ../kfile/kfileplaceeditdialog.cpp:149
 #, kde-format
-msgid "Could not login to %1."
-msgstr "Methu mewngofnodi i %1"
+msgid ""
+"<qt>Select this setting if you want this entry to show only when using the "
+"current application (%1).<br /><br />If this setting is not selected, the "
+"entry will be available in all applications.</qt>"
+msgstr ""
+
+#: ../kfile/kurlnavigatorbutton.cpp:675
+msgctxt "@action:inmenu"
+msgid "More"
+msgstr ""
+
+#: ../kfile/kfileplacesmodel.cpp:117
+msgctxt "KFile System Bookmarks"
+msgid "Home"
+msgstr ""
+
+#: ../kfile/kfileplacesmodel.cpp:120
+msgctxt "KFile System Bookmarks"
+msgid "Network"
+msgstr ""
+
+#: ../kfile/kfileplacesmodel.cpp:159
+msgctxt "KFile System Bookmarks"
+msgid "Root"
+msgstr ""
+
+#: ../kfile/kfileplacesmodel.cpp:163
+msgctxt "KFile System Bookmarks"
+msgid "Trash"
+msgstr ""
 
-#: ../kioslave/file/file.cpp:209
+#: ../kfile/kfileplacesmodel.cpp:761
 #, kde-format
-msgid "Setting ACL for %1"
+msgid "&Release '%1'"
 msgstr ""
 
-#: ../kioslave/file/file_unix.cpp:303 ../kioslave/file/file.cpp:728
+#: ../kfile/kfileplacesmodel.cpp:763
 #, kde-format
-msgid ""
-"Could not change permissions for\n"
-"%1"
+msgid "&Safely Remove '%1'"
 msgstr ""
-"Methu newid caniatadau i \n"
-" %1"
 
-#: ../kioslave/file/file.cpp:918
-msgid "No Media inserted or Media not recognized."
+#: ../kfile/kfileplacesmodel.cpp:766
+#, kde-format
+msgid "&Unmount '%1'"
 msgstr ""
 
-#: ../kioslave/file/file.cpp:928 ../kioslave/file/file.cpp:1137
-msgid "\"vold\" is not running."
+#: ../kfile/kfileplacesmodel.cpp:787
+#, kde-format
+msgid "&Eject '%1'"
 msgstr ""
 
-#: ../kioslave/file/file.cpp:963
-msgid "Could not find program \"mount\""
+#: ../kfile/kfileplacesmodel.cpp:821
+#, kde-format
+msgid "The device '%1' is not a disk and cannot be ejected."
 msgstr ""
 
-#: ../kioslave/file/file.cpp:1042
-msgid "mounting is not supported by wince."
+#: ../kfile/kfileplacesmodel.cpp:857
+#, kde-format
+msgid "An error occurred while accessing '%1', the system responded: %2"
 msgstr ""
 
-#: ../kioslave/file/file.cpp:1150
-msgid "Could not find program \"umount\""
+#: ../kfile/kfileplacesmodel.cpp:861
+#, kde-format
+msgid "An error occurred while accessing '%1'"
 msgstr ""
 
-#: ../kioslave/file/file.cpp:1164
-msgid "unmounting is not supported by wince."
+#: ../kfile/kfileplacesview.cpp:575
+msgctxt "@action:inmenu"
+msgid "Empty Trash"
 msgstr ""
 
-#: ../kioslave/file/file.cpp:1251
+#: ../kfile/kfileplacesview.cpp:582
 #, kde-format
-msgid "Could not read %1"
-msgstr "Methu darllen %1"
+msgid "&Edit Entry '%1'..."
+msgstr ""
 
-#: ../kioslave/file/file_unix.cpp:234
+#: ../kfile/kfileplacesview.cpp:604
 #, kde-format
-msgid "Cannot copy file from %1 to %2. (Errno: %3)"
+msgid "&Hide Entry '%1'"
+msgstr ""
+
+#: ../kfile/kfileplacesview.cpp:613
+msgid "&Show All Entries"
 msgstr ""
 
-#: ../kioslave/file/file_unix.cpp:347
+#: ../kfile/kfileplacesview.cpp:624
 #, kde-format
-msgid "No media in device for %1"
+msgid "&Remove Entry '%1'"
+msgstr ""
+
+#: ../kfile/kfileplacesview.cpp:636
+msgctxt "@info"
+msgid "Do you really want to empty the Trash? All items will be deleted."
 msgstr ""
 
-#: ../kioslave/file/file_unix.cpp:616
-#, kde-format
-msgid "Could not get user id for given user name %1"
+#: ../kfile/kurlnavigatorprotocolcombo.cpp:173
+msgctxt "@item:inmenu"
+msgid "Devices"
 msgstr ""
 
-#: ../kioslave/file/file_unix.cpp:629
-#, kde-format
-msgid "Could not get group id for given group name %1"
+#: ../kfile/kurlnavigatorprotocolcombo.cpp:177
+msgctxt "@item:inmenu"
+msgid "Subversion"
 msgstr ""
 
-#: ../kioslave/metainfo/metainfo.cpp:39
-msgid "kio_metainfo"
+#: ../kfile/kurlnavigatorprotocolcombo.cpp:181
+msgctxt "@item:inmenu"
+msgid "Other"
 msgstr ""
 
-#: ../kioslave/metainfo/metainfo.cpp:98
-#, kde-format
-msgid "No metainfo for %1"
-msgstr "Dim meta-wybodaeth am %1"
-
-#: ../kfile/kfilefiltercombo.cpp:36 ../kfile/kfilewidget.cpp:1790
-msgid "*|All Files"
-msgstr "*|Pob Ffeil"
+#: ../kfile/kurlnavigatortogglebutton.cpp:93
+msgid "Click for Location Navigation"
+msgstr ""
 
-#: ../kfile/kfilefiltercombo.cpp:194
-msgid "All Files"
+#: ../kfile/kurlnavigatortogglebutton.cpp:95
+msgid "Click to Edit Location"
 msgstr ""
 
 #: ../kfile/kdirselectdialog.cpp:131
@@ -5933,12 +6194,12 @@
 "%1"
 msgstr ""
 
-#: ../kfile/kdiroperator.cpp:766 ../kfile/kdirselectdialog.cpp:159
+#: ../kfile/kdirselectdialog.cpp:159 ../kfile/kdiroperator.cpp:766
 #, kde-format
 msgid "A file or folder named %1 already exists."
 msgstr "Mae ffeil neu blygell o'r enw %1 mewn bod yn barod."
 
-#: ../kfile/kdiroperator.cpp:768 ../kfile/kdirselectdialog.cpp:163
+#: ../kfile/kdirselectdialog.cpp:163 ../kfile/kdiroperator.cpp:768
 msgid "You do not have permission to create that folder."
 msgstr ""
 
@@ -5972,91 +6233,15 @@
 msgid "Properties"
 msgstr ""
 
-#: ../kfile/knewfilemenu.cpp:368 ../kfile/knewfilemenu.cpp:870
-msgid "Sorry"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:377
-#, kde-format
-msgid "<qt>The template file <b>%1</b> does not exist.</qt>"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:396
-msgctxt "@action:button"
-msgid "Create directory"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:398
-msgctxt "@action:button"
-msgid "Enter a different name"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:401
-msgid "Create hidden directory?"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:405
-#, kde-format
-msgid ""
-"The name \"%1\" starts with a dot, so the directory will be hidden by "
-"default."
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:407
-msgid "Do not ask again"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:498 ../kfile/knewfilemenu.cpp:556
-msgid "File name:"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:501
-msgid "Create Symlink"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:560
-msgid "Create link to URL"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:608 ../kfile/knewfilemenu.cpp:656
-#, kde-format
-msgctxt "@item:inmenu Create New"
-msgid "%1"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:880
-msgid ""
-"Basic links can only point to local files or directories.\n"
-"Please use \"Link to Location\" for remote URLs."
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:945
-msgid "Create New"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:958
-msgid "Link to Device"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:1003
-msgctxt "Default name for a new folder"
-msgid "New Folder"
-msgstr ""
-
-#: ../kfile/knewfilemenu.cpp:1017
-#, kde-format
-msgid ""
-"Create new folder in:\n"
-"%1"
-msgstr ""
-"Creu plygell newydd yn: \n"
-"%1"
+#: ../kfile/kfilefiltercombo.cpp:36 ../kfile/kfilewidget.cpp:1802
+msgid "*|All Files"
+msgstr "*|Pob Ffeil"
 
-#: ../kfile/kfiletreeview.cpp:187
-msgid "Show Hidden Folders"
+#: ../kfile/kfilefiltercombo.cpp:194
+msgid "All Files"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:285
+#: ../kfile/kfilewidget.cpp:286
 msgid ""
 "<qt>While typing in the text area, you may be presented with possible "
 "matches. This feature can be controlled by clicking with the right mouse "
@@ -6064,12 +6249,12 @@
 "menu.</qt>"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:363
+#: ../kfile/kfilewidget.cpp:364
 #, kde-format
 msgid "Drive: %1"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:418
+#: ../kfile/kfilewidget.cpp:419
 #, kde-format
 msgid ""
 "<qt>Click this button to enter the parent folder.<br /><br />For instance, "
@@ -6077,35 +6262,35 @@
 "to file:/home.</qt>"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:422
+#: ../kfile/kfilewidget.cpp:423
 msgid "Click this button to move backwards one step in the browsing history."
 msgstr "Cliciwch y botwm yma i symud un cam yn ôl yn yr hanes pori."
 
-#: ../kfile/kfilewidget.cpp:423
+#: ../kfile/kfilewidget.cpp:424
 msgid "Click this button to move forward one step in the browsing history."
 msgstr "Cliciwch y botwm yma i symud un cam ymlaen yn yr hanes pori."
 
-#: ../kfile/kfilewidget.cpp:425
+#: ../kfile/kfilewidget.cpp:426
 msgid "Click this button to reload the contents of the current location."
 msgstr "Cliciwch y botwm yma i ail-lwytho cynnwys y lleoliad cyfredol."
 
-#: ../kfile/kfilewidget.cpp:427
+#: ../kfile/kfilewidget.cpp:428
 msgid "Click this button to create a new folder."
 msgstr "Cliciwch y botwm yma i greu plygell newydd."
 
-#: ../kfile/kfilewidget.cpp:433
+#: ../kfile/kfilewidget.cpp:434
 msgid "Show Places Navigation Panel"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:440
+#: ../kfile/kfilewidget.cpp:441
 msgid "Show Bookmarks"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:445
+#: ../kfile/kfilewidget.cpp:446
 msgid "Options"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:447
+#: ../kfile/kfilewidget.cpp:448
 msgid ""
 "<qt>This is the preferences menu for the file dialog. Various options can be "
 "accessed from this menu including: <ul><li>how files are sorted in the "
@@ -6114,15 +6299,15 @@
 "previews</li><li>separating folders from files</li></ul></qt>"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:490
+#: ../kfile/kfilewidget.cpp:491
 msgid "Zoom out"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:492
+#: ../kfile/kfilewidget.cpp:493
 msgid "Zoom in"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:556
+#: ../kfile/kfilewidget.cpp:557
 msgid ""
 "<qt>This is the filter to apply to the file list. File names that do not "
 "match the filter will not be shown.<p>You may select from one of the preset "
@@ -6130,61 +6315,61 @@
 "into the text area.</p><p>Wildcards such as * and ? are allowed.</p></qt>"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:562
+#: ../kfile/kfilewidget.cpp:563
 msgid "&Filter:"
 msgstr "&Hidl:"
 
-#: ../kfile/kfilewidget.cpp:782
+#: ../kfile/kfilewidget.cpp:788
 msgid "You can only select one file"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:783
+#: ../kfile/kfilewidget.cpp:789
 msgid "More than one file provided"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:947
+#: ../kfile/kfilewidget.cpp:953
 msgid "You can only select local files"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:948
+#: ../kfile/kfilewidget.cpp:954
 msgid "Remote files not accepted"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:966
+#: ../kfile/kfilewidget.cpp:972
 msgid ""
 "More than one folder has been selected and this dialog does not accept "
 "folders, so it is not possible to decide which one to enter. Please select "
 "only one folder to list it."
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:966
+#: ../kfile/kfilewidget.cpp:972
 msgid "More than one folder provided"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:974
+#: ../kfile/kfilewidget.cpp:980
 msgid ""
 "At least one folder and one file has been selected. Selected files will be "
 "ignored and the selected folder will be listed"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:974
+#: ../kfile/kfilewidget.cpp:980
 msgid "Files and folders selected"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:989
+#: ../kfile/kfilewidget.cpp:995
 #, kde-format
 msgid "The file \"%1\" could not be found"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:989
+#: ../kfile/kfilewidget.cpp:995
 msgid "Cannot open file"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:1260
+#: ../kfile/kfilewidget.cpp:1266
 msgid "This is the name to save the file as."
 msgstr "Yr enw i ddefnyddio wrth gadw'r ffeil."
 
-#: ../kfile/kfilewidget.cpp:1265
+#: ../kfile/kfilewidget.cpp:1271
 msgid ""
 "This is the list of files to open. More than one file can be specified by "
 "listing several files, separated by spaces."
@@ -6192,75 +6377,75 @@
 "Y rhestr o ffeiliau i agor.  Gellir benodi mwy nac un ffeil drwy restru "
 "amryw ffeil, wedi eu gwahanu gan fylchau."
 
-#: ../kfile/kfilewidget.cpp:1272
+#: ../kfile/kfilewidget.cpp:1278
 msgid "This is the name of the file to open."
 msgstr "Enw'r ffeil i agor."
 
-#: ../kfile/kfilewidget.cpp:1286
+#: ../kfile/kfilewidget.cpp:1292
 msgctxt "@title:window"
 msgid "Places"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:1469
+#: ../kfile/kfilewidget.cpp:1481
 #, kde-format
 msgid "The file \"%1\" already exists. Do you wish to overwrite it?"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:1470
+#: ../kfile/kfilewidget.cpp:1482
 msgid "Overwrite File?"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:1601
+#: ../kfile/kfilewidget.cpp:1613
 msgid ""
 "The chosen filenames do not\n"
 "appear to be valid."
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:1603
+#: ../kfile/kfilewidget.cpp:1615
 msgid "Invalid Filenames"
 msgstr "Enwau Ffeil Annilys"
 
-#: ../kfile/kfilewidget.cpp:1683
+#: ../kfile/kfilewidget.cpp:1695
 msgid "You can only select local files."
 msgstr "Gallwch ddewis 'mond ffeiliau lleol."
 
-#: ../kfile/kfilewidget.cpp:1684
+#: ../kfile/kfilewidget.cpp:1696
 msgid "Remote Files Not Accepted"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:1787
+#: ../kfile/kfilewidget.cpp:1799
 msgid "*|All Folders"
 msgstr "*|Pob Plygell"
 
-#: ../kfile/kfilewidget.cpp:2039
+#: ../kfile/kfilewidget.cpp:2051
 #, kde-format
 msgid "Icon size: %1 pixels (standard size)"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:2042
+#: ../kfile/kfilewidget.cpp:2054
 #, kde-format
 msgid "Icon size: %1 pixels"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:2162
+#: ../kfile/kfilewidget.cpp:2191
 #, kde-format
 msgid "Automatically select filename e&xtension (%1)"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:2163
+#: ../kfile/kfilewidget.cpp:2192
 #, kde-format
 msgid "the extension <b>%1</b>"
 msgstr "yr estyniad<b>%1</b>"
 
-#: ../kfile/kfilewidget.cpp:2171
+#: ../kfile/kfilewidget.cpp:2200
 msgid "Automatically select filename e&xtension"
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:2172
+#: ../kfile/kfilewidget.cpp:2201
 msgid "a suitable extension"
 msgstr "estyniad addas"
 
-#: ../kfile/kfilewidget.cpp:2182
+#: ../kfile/kfilewidget.cpp:2211
 #, kde-format
 msgid ""
 "This option enables some convenient features for saving files with "
@@ -6276,7 +6461,7 @@
 "enabled as it makes your files more manageable."
 msgstr ""
 
-#: ../kfile/kfilewidget.cpp:2485
+#: ../kfile/kfilewidget.cpp:2518
 msgid ""
 "<qt>This button allows you to bookmark specific locations. Click on this "
 "button to open the bookmark menu where you may add, edit or select a "
@@ -6284,185 +6469,108 @@
 "otherwise operate like bookmarks elsewhere in KDE.</qt>"
 msgstr ""
 
-#: ../kfile/kurlnavigator.cpp:427
-msgid "Copy"
-msgstr ""
-
-#: ../kfile/kurlnavigator.cpp:431
-msgid "Paste"
-msgstr ""
-
-#: ../kfile/kurlnavigator.cpp:438
-msgid "Edit"
-msgstr ""
-
-#: ../kfile/kurlnavigator.cpp:441
-msgid "Navigate"
-msgstr ""
-
-#: ../kfile/kurlnavigator.cpp:456
-msgid "Show Full Path"
-msgstr ""
-
-#: ../kfile/kurlnavigator.cpp:688
-msgid "Custom Path"
-msgstr ""
-
-#: ../kfile/kfileplacesmodel.cpp:117
-msgctxt "KFile System Bookmarks"
-msgid "Home"
-msgstr ""
-
-#: ../kfile/kfileplacesmodel.cpp:120
-msgctxt "KFile System Bookmarks"
-msgid "Network"
-msgstr ""
-
-#: ../kfile/kfileplacesmodel.cpp:159
-msgctxt "KFile System Bookmarks"
-msgid "Root"
-msgstr ""
-
-#: ../kfile/kfileplacesmodel.cpp:163
-msgctxt "KFile System Bookmarks"
-msgid "Trash"
-msgstr ""
-
-#: ../kfile/kfileplacesmodel.cpp:760
-#, kde-format
-msgid "&Release '%1'"
+#: ../kfile/knewfilemenu.cpp:365 ../kfile/knewfilemenu.cpp:880
+msgid "Sorry"
 msgstr ""
 
-#: ../kfile/kfileplacesmodel.cpp:762
+#: ../kfile/knewfilemenu.cpp:374
 #, kde-format
-msgid "&Safely Remove '%1'"
+msgid "<qt>The template file <b>%1</b> does not exist.</qt>"
 msgstr ""
 
-#: ../kfile/kfileplacesmodel.cpp:765
-#, kde-format
-msgid "&Unmount '%1'"
+#: ../kfile/knewfilemenu.cpp:393
+msgctxt "@action:button"
+msgid "Create directory"
 msgstr ""
 
-#: ../kfile/kfileplacesmodel.cpp:786
-#, kde-format
-msgid "&Eject '%1'"
+#: ../kfile/knewfilemenu.cpp:395
+msgctxt "@action:button"
+msgid "Enter a different name"
 msgstr ""
 
-#: ../kfile/kfileplacesmodel.cpp:820
-#, kde-format
-msgid "The device '%1' is not a disk and cannot be ejected."
+#: ../kfile/knewfilemenu.cpp:398
+msgid "Create hidden directory?"
 msgstr ""
 
-#: ../kfile/kfileplacesmodel.cpp:856
+#: ../kfile/knewfilemenu.cpp:402
 #, kde-format
-msgid "An error occurred while accessing '%1', the system responded: %2"
+msgid ""
+"The name \"%1\" starts with a dot, so the directory will be hidden by "
+"default."
 msgstr ""
 
-#: ../kfile/kfileplacesmodel.cpp:860
-#, kde-format
-msgid "An error occurred while accessing '%1'"
+#: ../kfile/knewfilemenu.cpp:404
+msgid "Do not ask again"
 msgstr ""
 
-#: ../kfile/kurlnavigatortogglebutton.cpp:90
-msgid "Click for Location Navigation"
+#: ../kfile/knewfilemenu.cpp:497 ../kfile/knewfilemenu.cpp:566
+msgid "File name:"
 msgstr ""
 
-#: ../kfile/kurlnavigatortogglebutton.cpp:92
-msgid "Click to Edit Location"
+#: ../kfile/knewfilemenu.cpp:500
+msgid "Create Symlink"
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:90
-msgid "Add Places Entry"
+#: ../kfile/knewfilemenu.cpp:570
+msgid "Create link to URL"
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:92
-msgid "Edit Places Entry"
+#: ../kfile/knewfilemenu.cpp:616 ../kfile/knewfilemenu.cpp:664
+#, kde-format
+msgctxt "@item:inmenu Create New"
+msgid "%1"
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:103
+#: ../kfile/knewfilemenu.cpp:890
 msgid ""
-"<qt>This is the text that will appear in the Places panel.<br /><br />The "
-"label should consist of one or two words that will help you remember what "
-"this entry refers to. If you do not enter a label, it will be derived from "
-"the location's URL.</qt>"
-msgstr ""
-
-#: ../kfile/kfileplaceeditdialog.cpp:109
-msgid "L&abel:"
+"Basic links can only point to local files or directories.\n"
+"Please use \"Link to Location\" for remote URLs."
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:111
-msgid "Enter descriptive label here"
+#: ../kfile/knewfilemenu.cpp:966
+msgid "Create New"
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:115
-#, kde-format
-msgid ""
-"<qt>This is the location associated with the entry. Any valid URL may be "
-"used. For example:<br /><br />%1<br />http://www.kde.org<br "
-"/>ftp://ftp.kde.org/pub/kde/stable<br /><br />By clicking on the button next "
-"to the text edit box you can browse to an appropriate URL.</qt>"
+#: ../kfile/knewfilemenu.cpp:979
+msgid "Link to Device"
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:121
-msgid "&Location:"
-msgstr "&Lleoliad:"
-
-#: ../kfile/kfileplaceeditdialog.cpp:125
-msgid ""
-"<qt>This is the icon that will appear in the Places panel.<br /><br />Click "
-"on the button to select a different icon.</qt>"
+#: ../kfile/knewfilemenu.cpp:1024
+msgctxt "Default name for a new folder"
+msgid "New Folder"
 msgstr ""
 
-#: ../kfile/kfileplaceeditdialog.cpp:128
-msgid "Choose an &icon:"
-msgstr "Dewis &eicon:"
-
-#: ../kfile/kfileplaceeditdialog.cpp:145
-#, kde-format
-msgid "&Only show when using this application (%1)"
-msgstr "Dangos 'mond &pan ddefnyddir y cymhwysiad yma (%1)"
-
-#: ../kfile/kfileplaceeditdialog.cpp:147
+#: ../kfile/knewfilemenu.cpp:1038
 #, kde-format
 msgid ""
-"<qt>Select this setting if you want this entry to show only when using the "
-"current application (%1).<br /><br />If this setting is not selected, the "
-"entry will be available in all applications.</qt>"
-msgstr ""
-
-#: ../kfile/kfileplacesview.cpp:575
-msgctxt "@action:inmenu"
-msgid "Empty Trash"
+"Create new folder in:\n"
+"%1"
 msgstr ""
+"Creu plygell newydd yn: \n"
+"%1"
 
-#: ../kfile/kfileplacesview.cpp:582
-#, kde-format
-msgid "&Edit Entry '%1'..."
+#: ../kfile/kurlnavigator.cpp:431
+msgid "Copy"
 msgstr ""
 
-#: ../kfile/kfileplacesview.cpp:604
-#, kde-format
-msgid "&Hide Entry '%1'"
+#: ../kfile/kurlnavigator.cpp:435
+msgid "Paste"
 msgstr ""
 
-#: ../kfile/kfileplacesview.cpp:613
-msgid "&Show All Entries"
+#: ../kfile/kurlnavigator.cpp:442
+msgid "Edit"
 msgstr ""
 
-#: ../kfile/kfileplacesview.cpp:624
-#, kde-format
-msgid "&Remove Entry '%1'"
+#: ../kfile/kurlnavigator.cpp:445
+msgid "Navigate"
 msgstr ""
 
-#: ../kfile/kfileplacesview.cpp:634
-msgctxt "@info"
-msgid "Do you really want to empty the Trash? All items will be deleted."
+#: ../kfile/kurlnavigator.cpp:460
+msgid "Show Full Path"
 msgstr ""
 
-#: ../kfile/kurlnavigatorbutton.cpp:596
-msgctxt "@action:inmenu"
-msgid "More"
+#: ../kfile/kurlnavigator.cpp:698
+msgid "Custom Path"
 msgstr ""
 
 #: ../kfile/kdiroperator.cpp:783
@@ -6625,18 +6733,3 @@
 #: ../kfile/kdiroperator.cpp:1990
 msgid "&View"
 msgstr ""
-
-#: ../kfile/kurlnavigatorprotocolcombo.cpp:164
-msgctxt "@item:inmenu"
-msgid "Devices"
-msgstr ""
-
-#: ../kfile/kurlnavigatorprotocolcombo.cpp:168
-msgctxt "@item:inmenu"
-msgid "Subversion"
-msgstr ""
-
-#: ../kfile/kurlnavigatorprotocolcombo.cpp:172
-msgctxt "@item:inmenu"
-msgid "Other"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_applications.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_applications.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_applications.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_applications.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kio_settings\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:12+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kio_applications.cpp:119
 msgid "Applications"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_audiocd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_audiocd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_audiocd.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_audiocd.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kio_audiocd.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:38+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: audiocd.cpp:65
 msgid "CDDB Information"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_bookmarks.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_bookmarks.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_bookmarks.po	2012-03-23 07:39:23.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_bookmarks.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-23 08:40+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:18+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kio_bookmarks.cpp:89
 msgid "Root"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kioclient.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kioclient.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kioclient.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kioclient.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,25 +7,25 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 02:30+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kioclient.cpp:43
+#: kioclient.cpp:42
 msgid "KIO Client"
 msgstr ""
 
-#: kioclient.cpp:44
+#: kioclient.cpp:43
 msgid "Command-line tool for network-transparent operations"
 msgstr ""
 
-#: kioclient.cpp:55
+#: kioclient.cpp:54
 msgid ""
 "\n"
 "Syntax:\n"
@@ -33,14 +33,14 @@
 "\n"
 "Cystrawen:\n"
 
-#: kioclient.cpp:56
+#: kioclient.cpp:55
 msgid ""
 "  kioclient openProperties 'url'\n"
 "            # Opens a properties menu\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:58
+#: kioclient.cpp:57
 msgid ""
 "  kioclient exec 'url' ['mimetype']\n"
 "            # Tries to open the document pointed to by 'url', in the "
@@ -52,27 +52,27 @@
 "            #   'url' can be an executable, too.\n"
 msgstr ""
 
-#: kioclient.cpp:65
+#: kioclient.cpp:64
 msgid ""
 "  kioclient move 'src' 'dest'\n"
 "            # Moves the URL 'src' to 'dest'.\n"
 "            #   'src' may be a list of URLs.\n"
 msgstr ""
 
-#: kioclient.cpp:68
+#: kioclient.cpp:67
 msgid ""
 "            #   'dest' may be \"trash:/\" to move the files\n"
 "            #   to the trash.\n"
 msgstr ""
 
-#: kioclient.cpp:70 kioclient.cpp:79
+#: kioclient.cpp:69
 msgid ""
 "            #   the short version kioclient mv\n"
 "            #   is also available.\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:72
+#: kioclient.cpp:71
 msgid ""
 "  kioclient download ['src']\n"
 "            # Copies the URL 'src' to a user-specified location'.\n"
@@ -81,7 +81,7 @@
 "\n"
 msgstr ""
 
-#: kioclient.cpp:76
+#: kioclient.cpp:75
 msgid ""
 "  kioclient copy 'src' 'dest'\n"
 "            # Copies the URL 'src' to 'dest'.\n"
@@ -95,28 +95,28 @@
 "\n"
 msgstr ""
 
-#: kioclient.cpp:81
+#: kioclient.cpp:80
 msgid ""
 "  kioclient cat 'url'\n"
 "            # Writes out the contents of 'url' to stdout\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:83
+#: kioclient.cpp:82
 msgid ""
 "  kioclient remove 'url'\n"
 "            # Removes the URL\n"
 "            #   'url' may be a list of URLs.\n"
 msgstr ""
 
-#: kioclient.cpp:86
+#: kioclient.cpp:85
 msgid ""
 "            #   the short version kioclient rm\n"
 "            #   is also available.\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:89
+#: kioclient.cpp:88
 msgid ""
 "*** Examples:\n"
 "  kioclient exec file:/root/Desktop/cdrom.desktop \"Mount default\"\n"
@@ -124,49 +124,49 @@
 "\n"
 msgstr ""
 
-#: kioclient.cpp:92
+#: kioclient.cpp:91
 msgid ""
 "  kioclient exec file:/home/weis/data/test.html\n"
 "             // Opens the file with default binding\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:94
+#: kioclient.cpp:93
 msgid ""
 "  kioclient exec file:/home/weis/data/test.html Netscape\n"
 "             // Opens the file with netscape\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:96
+#: kioclient.cpp:95
 msgid ""
 "  kioclient exec ftp://localhost/\n"
 "             // Opens new window with URL\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:98
+#: kioclient.cpp:97
 msgid ""
 "  kioclient exec file:/root/Desktop/emacs.desktop\n"
 "             // Starts emacs\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:100
+#: kioclient.cpp:99
 msgid ""
 "  kioclient exec file:/root/Desktop/cdrom.desktop\n"
 "             // Opens the CDROM's mount directory\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:102
+#: kioclient.cpp:101
 msgid ""
 "  kioclient exec .\n"
 "             // Opens the current directory. Very convenient.\n"
 "\n"
 msgstr ""
 
-#: kioclient.cpp:113
+#: kioclient.cpp:112
 msgid "Non-interactive use: no message boxes"
 msgstr ""
 
@@ -174,43 +174,43 @@
 msgid "Overwrite destination if it exists (for copy and move)"
 msgstr ""
 
-#: kioclient.cpp:115
+#: kioclient.cpp:117
 msgid "URL or URLs"
 msgstr ""
 
-#: kioclient.cpp:117 kioclient.cpp:120
+#: kioclient.cpp:119 kioclient.cpp:122
 msgid "Source URL or URLs"
 msgstr ""
 
-#: kioclient.cpp:118 kioclient.cpp:121
+#: kioclient.cpp:120 kioclient.cpp:123
 msgid "Destination URL"
 msgstr ""
 
-#: kioclient.cpp:123
+#: kioclient.cpp:125
 msgid "Show available commands"
 msgstr ""
 
-#: kioclient.cpp:124
+#: kioclient.cpp:126
 msgid "Command (see --commands)"
 msgstr ""
 
-#: kioclient.cpp:125
+#: kioclient.cpp:127
 msgid "Arguments for command"
 msgstr ""
 
-#: kioclient.cpp:160
+#: kioclient.cpp:162
 msgid "Syntax Error: Not enough arguments\n"
 msgstr "Gwall Cystrawen: Dim digon o ymresymiadau\n"
 
-#: kioclient.cpp:165
+#: kioclient.cpp:167
 msgid "Syntax Error: Too many arguments\n"
 msgstr "Gwall Cystrawen: Gormod o ymresymiadau\n"
 
-#: kioclient.cpp:312
+#: kioclient.cpp:318
 msgid "Unable to download from an invalid URL."
 msgstr "Methu lawrlwytho o URL annilys."
 
-#: kioclient.cpp:355
+#: kioclient.cpp:361
 #, kde-format
 msgid "Syntax Error: Unknown command '%1'\n"
 msgstr "Gwall Cystrawen: Gorchymyn anhysbys '%1'\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kioexec.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kioexec.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kioexec.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kioexec.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 10:48+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-16 19:50+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:44
 msgid "KIO Exec - Opens remote files, watches modifications, asks for upload"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_finger.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_finger.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_finger.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_finger.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kio_finger\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:18+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:55+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kio_finger.cpp:153
 msgid "Could not find the Perl program on your system, please install."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_fish.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_fish.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_fish.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_fish.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kio_fish\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:13+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: fish.cpp:299
 msgid "Connecting..."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_floppy.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_floppy.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_floppy.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_floppy.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kio_floppy\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:11+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kio_floppy.cpp:198
 #, kde-format
@@ -28,7 +28,7 @@
 "Mae'r gyrriant dal yn brysur.\n"
 "Arhoswch nes ei fod yn anweithredol a ceisiwch eto."
 
-#: kio_floppy.cpp:202 kio_floppy.cpp:1114
+#: kio_floppy.cpp:202 kio_floppy.cpp:1116
 #, kde-format
 msgid ""
 "Could not write to file %1.\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_help4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_help4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_help4.po	2012-03-23 07:39:18.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_help4.po	2012-04-18 08:59:29.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kio_help4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 13:46+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2012-02-03 01:40+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:49+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: genshortcutents.cpp:339
 msgid "Output file"
@@ -28,86 +28,86 @@
 msgid "Generates DocBook entities for key shortcuts of standard actions"
 msgstr ""
 
-#: kio_help.cpp:137
+#: kio_help.cpp:150
 #, kde-format
 msgid "There is no documentation available for %1."
 msgstr ""
 
-#: kio_help.cpp:188
+#: kio_help.cpp:202
 msgid "Looking up correct file"
 msgstr "Chwilio am y ffeil iawn"
 
-#: kio_help.cpp:239
+#: kio_help.cpp:253
 msgid "Preparing document"
 msgstr "Paratoi'r ddogfen"
 
-#: kio_help.cpp:248 kio_help.cpp:290
+#: kio_help.cpp:262 kio_help.cpp:304
 #, kde-format
 msgid "The requested help file could not be parsed:<br />%1"
 msgstr ""
 
-#: kio_help.cpp:270
+#: kio_help.cpp:284
 msgid "Saving to cache"
 msgstr "Cadw i'r celc"
 
-#: kio_help.cpp:285
+#: kio_help.cpp:299
 msgid "Using cached version"
 msgstr "Defnyddio'r fersiwn sydd yn y celc"
 
-#: kio_help.cpp:347
+#: kio_help.cpp:361
 msgid "Looking up section"
 msgstr "Cwhilio am yr adran"
 
-#: kio_help.cpp:358
+#: kio_help.cpp:372
 #, kde-format
 msgid "Could not find filename %1 in %2."
 msgstr ""
 
-#: meinproc.cpp:87
+#: meinproc.cpp:89
 msgid "Stylesheet to use"
 msgstr "Llen arddull i ddefnyddio"
 
-#: meinproc.cpp:88
+#: meinproc.cpp:90
 msgid "Output whole document to stdout"
 msgstr ""
 
-#: meinproc.cpp:90
+#: meinproc.cpp:92
 msgid "Output whole document to file"
 msgstr ""
 
-#: meinproc.cpp:91
+#: meinproc.cpp:93
 msgid "Create a ht://dig compatible index"
 msgstr ""
 
-#: meinproc.cpp:92
+#: meinproc.cpp:94
 msgid "Check the document for validity"
 msgstr ""
 
-#: meinproc.cpp:93
+#: meinproc.cpp:95
 msgid "Create a cache file for the document"
 msgstr ""
 
-#: meinproc.cpp:94
+#: meinproc.cpp:96
 msgid "Set the srcdir, for kdelibs"
 msgstr ""
 
-#: meinproc.cpp:95
+#: meinproc.cpp:97
 msgid "Parameters to pass to the stylesheet"
 msgstr ""
 
-#: meinproc.cpp:96
+#: meinproc.cpp:98
 msgid "The file to transform"
 msgstr "Y ffeil i trawsnewid"
 
-#: meinproc.cpp:98
+#: meinproc.cpp:100
 msgid "XML-Translator"
 msgstr "XML-Cyfieithydd"
 
-#: meinproc.cpp:100
+#: meinproc.cpp:102
 msgid "KDE Translator for XML"
 msgstr "Cyfieithydd KDE am XML"
 
-#: meinproc.cpp:273
+#: meinproc.cpp:248
 #, kde-format
 msgid "Could not write to cache file %1."
 msgstr ""
@@ -122,18 +122,18 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
-#: xslt.cpp:165
+#: xslt.cpp:135
 msgid "Parsing stylesheet"
 msgstr "Dosrannu'r len arddull"
 
-#: xslt.cpp:188
+#: xslt.cpp:158
 msgid "Parsing document"
 msgstr "Dosrannu'r ddogfen"
 
-#: xslt.cpp:197
+#: xslt.cpp:167
 msgid "Applying stylesheet"
 msgstr "Gweithredu'r len arddull"
 
-#: xslt.cpp:205
+#: xslt.cpp:175
 msgid "Writing document"
 msgstr "Ysgrifennu'r ddogfen"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_imap4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_imap4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_imap4.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_imap4.po	2012-04-18 08:59:29.000000000 +0000
@@ -2,130 +2,130 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdepim/kio_imap4.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: imap4.cpp:615
+#: imap4.cpp:614
 #, kde-format
 msgid "Message from %1 while processing '%2': %3"
 msgstr ""
 
-#: imap4.cpp:617
+#: imap4.cpp:616
 #, kde-format
 msgid "Message from %1: %2"
 msgstr ""
 
-#: imap4.cpp:941
+#: imap4.cpp:940
 #, kde-format
 msgid ""
 "The following folder will be created on the server: %1 What do you want to "
 "store in this folder?"
 msgstr ""
 
-#: imap4.cpp:943
+#: imap4.cpp:942
 msgid "Create Folder"
 msgstr "Creu Plygell"
 
-#: imap4.cpp:944
+#: imap4.cpp:943
 msgid "&Messages"
 msgstr "&Negeseuon"
 
-#: imap4.cpp:944
+#: imap4.cpp:943
 msgid "&Subfolders"
 msgstr "I&sblygelli"
 
-#: imap4.cpp:1278
+#: imap4.cpp:1277
 #, kde-format
 msgid "Unsubscribe of folder %1 failed. The server returned: %2"
 msgstr ""
 
-#: imap4.cpp:1299
+#: imap4.cpp:1298
 #, kde-format
 msgid "Subscribe of folder %1 failed. The server returned: %2"
 msgstr ""
 
-#: imap4.cpp:1368
+#: imap4.cpp:1367
 #, kde-format
 msgid "Changing the flags of message %1 failed with %2."
 msgstr ""
 
-#: imap4.cpp:1380
+#: imap4.cpp:1379
 #, kde-format
 msgid "Silent Changing the flags of message %1 failed with %2."
 msgstr ""
 
-#: imap4.cpp:1412
+#: imap4.cpp:1411
 #, kde-format
 msgid "Changing the flags of message %1 failed."
 msgstr ""
 
-#: imap4.cpp:1457
+#: imap4.cpp:1456
 #, kde-format
 msgid ""
 "Setting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 msgstr ""
 
-#: imap4.cpp:1476
+#: imap4.cpp:1475
 #, kde-format
 msgid ""
 "Deleting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 msgstr ""
 
-#: imap4.cpp:1493 imap4.cpp:1520
+#: imap4.cpp:1492 imap4.cpp:1519
 #, kde-format
 msgid ""
 "Retrieving the Access Control List on folder %1 failed. The server returned: "
 "%2"
 msgstr ""
 
-#: imap4.cpp:1554
+#: imap4.cpp:1553
 #, kde-format
 msgid "Searching of folder %1 failed. The server returned: %2"
 msgstr ""
 
-#: imap4.cpp:1589
+#: imap4.cpp:1588
 #, kde-format
 msgid "Custom command %1:%2 failed. The server returned: %3"
 msgstr ""
 
-#: imap4.cpp:1669
+#: imap4.cpp:1668
 #, kde-format
 msgid ""
 "Setting the annotation %1 on folder %2  failed. The server returned: %3"
 msgstr ""
 
-#: imap4.cpp:1693
+#: imap4.cpp:1692
 #, kde-format
 msgid ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 msgstr ""
 
-#: imap4.cpp:1730
+#: imap4.cpp:1729
 #, kde-format
 msgid ""
 "Retrieving the quota root information on folder %1 failed. The server "
 "returned: %2"
 msgstr ""
 
-#: imap4.cpp:1786 imap4.cpp:1854
+#: imap4.cpp:1785 imap4.cpp:1853
 msgid "Unable to close mailbox."
 msgstr "Methu cau'r blwch post."
 
-#: imap4.cpp:1884
+#: imap4.cpp:1883
 #, kde-format
 msgid "Unable to get information about folder %1. The server replied: %2"
 msgstr ""
 
-#: imap4.cpp:2041
+#: imap4.cpp:2040
 #, kde-format
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
@@ -134,7 +134,7 @@
 "Nid yw'r gweinydd %1 yn cynnal na IMAP4 na IMAP4rev1.\n"
 "Dynododd ei hun â %2"
 
-#: imap4.cpp:2052
+#: imap4.cpp:2051
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -142,20 +142,20 @@
 "Nid yw'r gweinydd yn cynnal TLS.\n"
 "Analluogwch y nodwedd diogelwch yma i gysylltu heb gêl-ysgrifaeth."
 
-#: imap4.cpp:2076
+#: imap4.cpp:2075
 msgid "Starting TLS failed."
 msgstr "Methodd cychwyn TLS."
 
-#: imap4.cpp:2086
+#: imap4.cpp:2085
 #, kde-format
 msgid "The authentication method %1 is not supported by the server."
 msgstr "Ni chynhelir y dull awdurdodi %1 gan y gweinydd."
 
-#: imap4.cpp:2113
+#: imap4.cpp:2112
 msgid "Username and password for your IMAP account:"
 msgstr ""
 
-#: imap4.cpp:2127
+#: imap4.cpp:2126
 #, kde-format
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
@@ -163,7 +163,7 @@
 "%2"
 msgstr ""
 
-#: imap4.cpp:2133
+#: imap4.cpp:2132
 #, kde-format
 msgid ""
 "Unable to authenticate via %1.\n"
@@ -171,7 +171,7 @@
 "%3"
 msgstr ""
 
-#: imap4.cpp:2623
+#: imap4.cpp:2622
 #, kde-format
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "Methu agor y blygell %1. Atebodd y gweinydd: %2"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_jabberdisco.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_jabberdisco.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_jabberdisco.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_jabberdisco.po	2012-04-18 08:59:25.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: kio_jabberdisco\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 21:47+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: KDE <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: jabberdisco.cpp:107 jabberdisco.cpp:208
 msgid "TLS"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_ldap.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_ldap.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_ldap.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_ldap.po	2012-04-18 08:59:29.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: kio_ldap\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kio_ldap.cpp:85
 msgid ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_man.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_man.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_man.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_man.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,17 +6,17 @@
 msgstr ""
 "Project-Id-Version: kio_man\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:31+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:21+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kio_man.cpp:493
+#: kio_man.cpp:482
 #, kde-format
 msgid ""
 "No man page matching to %1 found.<br /><br />Check that you have not "
@@ -27,101 +27,101 @@
 "file in the /etc directory."
 msgstr ""
 
-#: kio_man.cpp:525
+#: kio_man.cpp:514
 #, kde-format
 msgid "Open of %1 failed."
 msgstr "Methodd agor %1."
 
-#: kio_man.cpp:619 kio_man.cpp:637
+#: kio_man.cpp:613 kio_man.cpp:631
 msgid "Man output"
 msgstr "Allbwn llawlyfr"
 
-#: kio_man.cpp:623
+#: kio_man.cpp:617
 msgid "<h1>KDE Man Viewer Error</h1>"
 msgstr ""
 
-#: kio_man.cpp:641
+#: kio_man.cpp:635
 msgid "There is more than one matching man page."
 msgstr "Mae mwy nag un dudalen llawlyfr yn cydweddu."
 
-#: kio_man.cpp:652
+#: kio_man.cpp:646
 msgid ""
 "Note: if you read a man page in your language, be aware it can contain some "
 "mistakes or be obsolete. In case of doubt, you should have a look at the "
 "English version."
 msgstr ""
 
-#: kio_man.cpp:729
+#: kio_man.cpp:723
 msgid "User Commands"
 msgstr "Gorchmynion Defnyddiwr"
 
-#: kio_man.cpp:731
+#: kio_man.cpp:725
 msgid "System Calls"
 msgstr "Galwadau Cysawd"
 
-#: kio_man.cpp:733
+#: kio_man.cpp:727
 msgid "Subroutines"
 msgstr "Is-reolweithiau"
 
-#: kio_man.cpp:735
+#: kio_man.cpp:729
 msgid "Perl Modules"
 msgstr "Modylau Perl"
 
-#: kio_man.cpp:737
+#: kio_man.cpp:731
 msgid "Network Functions"
 msgstr "Ffwythiannau Rhwydwaith"
 
-#: kio_man.cpp:739
+#: kio_man.cpp:733
 msgid "Devices"
 msgstr "Dyfeisiau"
 
-#: kio_man.cpp:741
+#: kio_man.cpp:735
 msgid "File Formats"
 msgstr "Fformadau Ffeil"
 
-#: kio_man.cpp:743
+#: kio_man.cpp:737
 msgid "Games"
 msgstr "Gêmau"
 
-#: kio_man.cpp:745
+#: kio_man.cpp:739
 msgid "Miscellaneous"
 msgstr "Amrywiol"
 
-#: kio_man.cpp:747
+#: kio_man.cpp:741
 msgid "System Administration"
 msgstr "Gweinyddiaeth Cysawd"
 
-#: kio_man.cpp:749
+#: kio_man.cpp:743
 msgid "Kernel"
 msgstr "Cnewyllyn"
 
-#: kio_man.cpp:751
+#: kio_man.cpp:745
 msgid "Local Documentation"
 msgstr "Dogfennaeth Lleol"
 
-#: kio_man.cpp:753
+#: kio_man.cpp:747
 msgid "New"
 msgstr "Newydd"
 
-#: kio_man.cpp:788 kio_man.cpp:792 kio_man.cpp:1218
+#: kio_man.cpp:782 kio_man.cpp:786 kio_man.cpp:1212
 msgid "UNIX Manual Index"
 msgstr "Mynegai Llawlyfr UNIX"
 
-#: kio_man.cpp:807
+#: kio_man.cpp:801
 #, kde-format
 msgid "Section %1"
 msgstr "Adran %1"
 
-#: kio_man.cpp:1223
+#: kio_man.cpp:1217
 #, kde-format
 msgid "Index for Section %1: %2"
 msgstr ""
 
-#: kio_man.cpp:1228
+#: kio_man.cpp:1222
 msgid "Generating Index"
 msgstr "Yn Creu Mynegai"
 
-#: kio_man.cpp:1563
+#: kio_man.cpp:1567
 msgid ""
 "Could not find the sgml2roff program on your system. Please install it, if "
 "necessary, and extend the search path by adjusting the environment variable "
@@ -131,7 +131,7 @@
 "angen, ac estyn y llwybr chwilio drwy addasu'r newidyn amgylchedd PATH cyn "
 "cychwyn KDE."
 
-#: kmanpart.cpp:65
+#: kmanpart.cpp:33
 msgid "KMan"
 msgstr "KMan"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_nfs.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_nfs.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_nfs.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_nfs.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,32 +6,32 @@
 msgstr ""
 "Project-Id-Version: kio_nfs\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:16+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kio_nfs.cpp:941
+#: kio_nfs.cpp:949
 msgid "An RPC error occurred."
 msgstr "Digwyddodd gwall RPC."
 
-#: kio_nfs.cpp:985
+#: kio_nfs.cpp:993
 msgid "No space left on device"
 msgstr "Dim lle ar ôl ar y ddyfais"
 
-#: kio_nfs.cpp:988
+#: kio_nfs.cpp:996
 msgid "Read only file system"
 msgstr "Cysawd ffeil darllen-yn-unig"
 
-#: kio_nfs.cpp:991
+#: kio_nfs.cpp:999
 msgid "Filename too long"
 msgstr ""
 
-#: kio_nfs.cpp:998
+#: kio_nfs.cpp:1006
 msgid "Disk quota exceeded"
 msgstr "Aethpwyd dros y ddogn ddisg"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_nntp.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_nntp.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_nntp.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_nntp.po	2012-04-18 08:59:29.000000000 +0000
@@ -6,58 +6,58 @@
 msgstr ""
 "Project-Id-Version: kio_nntp\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: nntp.cpp:124 nntp.cpp:490
+#: nntp.cpp:126 nntp.cpp:492
 #, kde-format
 msgid "Selecting group %1..."
 msgstr ""
 
-#: nntp.cpp:139
+#: nntp.cpp:141
 msgid "Downloading article..."
 msgstr ""
 
-#: nntp.cpp:197
+#: nntp.cpp:199
 #, kde-format
 msgid "Invalid special command %1"
 msgstr "Gorchymyn arbennig annilys %1"
 
-#: nntp.cpp:205
+#: nntp.cpp:207
 msgid "Sending article..."
 msgstr ""
 
-#: nntp.cpp:355
+#: nntp.cpp:357
 msgid "Downloading group list..."
 msgstr ""
 
-#: nntp.cpp:360
+#: nntp.cpp:362
 msgid "Looking for new groups..."
 msgstr ""
 
-#: nntp.cpp:426
+#: nntp.cpp:428
 msgid "Downloading group descriptions..."
 msgstr ""
 
-#: nntp.cpp:512
+#: nntp.cpp:514
 #, kde-format
 msgid ""
 "Could not extract message serial numbers from server response:\n"
 "%1"
 msgstr ""
 
-#: nntp.cpp:532
+#: nntp.cpp:534
 msgid "Downloading new headers..."
 msgstr ""
 
-#: nntp.cpp:563
+#: nntp.cpp:565
 #, kde-format
 msgid ""
 "Could not extract first message id from server response:\n"
@@ -66,7 +66,7 @@
 "Methwyd echdynnu dynodiad y neges gyntaf o ymateb y gweinydd:\n"
 "%1"
 
-#: nntp.cpp:589
+#: nntp.cpp:591
 #, kde-format
 msgid ""
 "Could not extract message id from server response:\n"
@@ -75,34 +75,34 @@
 "Methwyd echdynnu dynodiad y neges o ymateb y gweinydd:\n"
 "%1"
 
-#: nntp.cpp:740
+#: nntp.cpp:742
 msgid "Connecting to server..."
 msgstr ""
 
-#: nntp.cpp:774
+#: nntp.cpp:776
 msgid "This server does not support TLS"
 msgstr ""
 
-#: nntp.cpp:778
+#: nntp.cpp:780
 msgid "TLS negotiation failed"
 msgstr ""
 
-#: nntp.cpp:893
+#: nntp.cpp:895
 #, kde-format
 msgid ""
 "The server %1 could not handle your request.\n"
 "Please try again now, or later if the problem persists."
 msgstr ""
 
-#: nntp.cpp:898
+#: nntp.cpp:900
 msgid "You need to authenticate to access the requested resource."
 msgstr ""
 
-#: nntp.cpp:901
+#: nntp.cpp:903
 msgid "The supplied login and/or password are incorrect."
 msgstr ""
 
-#: nntp.cpp:907
+#: nntp.cpp:909
 #, kde-format
 msgid ""
 "Unexpected server response to %1 command:\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_pop3.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_pop3.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_pop3.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_pop3.po	2012-04-18 08:59:29.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kio_pop3\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: pop3.cpp:228
 #, kde-format
@@ -122,18 +122,18 @@
 "You can disable TLS in the POP account settings dialog."
 msgstr ""
 
-#: pop3.cpp:703
+#: pop3.cpp:702
 #, kde-format
 msgid ""
 "Your POP3 server (%1) does not support TLS. Disable TLS, if you want to "
 "connect without encryption."
 msgstr ""
 
-#: pop3.cpp:712
+#: pop3.cpp:711
 msgid "Username and password for your POP3 account:"
 msgstr ""
 
-#: pop3.cpp:879 pop3.cpp:888 pop3.cpp:1027
+#: pop3.cpp:878 pop3.cpp:887 pop3.cpp:1028
 msgid "Unexpected response from POP3 server."
 msgstr "Ymateb annisgwyl o'r gweinydd POP3."
 
@@ -150,14 +150,14 @@
 "mail: %1"
 msgstr ""
 
-#: pop3.cpp:1054
+#: pop3.cpp:1055
 msgid "The POP3 command 'STAT' failed"
 msgstr ""
 
-#: pop3.cpp:1060
+#: pop3.cpp:1061
 msgid "Invalid POP3 response, should have at least one space."
 msgstr ""
 
-#: pop3.cpp:1068
+#: pop3.cpp:1069
 msgid "Invalid POP3 STAT response."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_remote.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_remote.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_remote.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_remote.po	2012-04-18 08:59:35.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:17+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: remoteimpl.cpp:189
 msgid "Add Network Folder"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_sftp.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_sftp.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_sftp.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_sftp.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,70 +6,70 @@
 msgstr ""
 "Project-Id-Version: kio_sftp\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 01:48+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:22+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kio_sftp.cpp:198 kio_sftp.cpp:202 kio_sftp.cpp:478 kio_sftp.cpp:685
+#: kio_sftp.cpp:261 kio_sftp.cpp:265 kio_sftp.cpp:705
 msgid "SFTP Login"
 msgstr "Mewngofnod SFTP"
 
-#: kio_sftp.cpp:213
+#: kio_sftp.cpp:277
 msgid "Use the username input field to answer this question."
 msgstr ""
 
-#: kio_sftp.cpp:403
+#: kio_sftp.cpp:443
 msgid "Could not allocate callbacks"
 msgstr ""
 
-#: kio_sftp.cpp:462
+#: kio_sftp.cpp:503
 #, kde-format
 msgid "Opening SFTP connection to host %1:%2"
 msgstr ""
 
-#: kio_sftp.cpp:467
+#: kio_sftp.cpp:507
 msgid "No hostname specified."
 msgstr "Nid yw enw'r gwesteiwr wedi'i benodi."
 
-#: kio_sftp.cpp:507
+#: kio_sftp.cpp:539
 msgid "Could not create a new SSH session."
 msgstr ""
 
-#: kio_sftp.cpp:516 kio_sftp.cpp:521
+#: kio_sftp.cpp:548 kio_sftp.cpp:553
 msgid "Could not set a timeout."
 msgstr ""
 
-#: kio_sftp.cpp:528 kio_sftp.cpp:534
+#: kio_sftp.cpp:560 kio_sftp.cpp:566
 msgid "Could not set compression."
 msgstr ""
 
-#: kio_sftp.cpp:541
+#: kio_sftp.cpp:573
 msgid "Could not set host."
 msgstr ""
 
-#: kio_sftp.cpp:548
+#: kio_sftp.cpp:580
 msgid "Could not set port."
 msgstr ""
 
-#: kio_sftp.cpp:557
+#: kio_sftp.cpp:589
 msgid "Could not set username."
 msgstr ""
 
-#: kio_sftp.cpp:566
+#: kio_sftp.cpp:598
 msgid "Could not set log verbosity."
 msgstr ""
 
-#: kio_sftp.cpp:574
+#: kio_sftp.cpp:606
 msgid "Could not parse the config file."
 msgstr ""
 
-#: kio_sftp.cpp:608
+#: kio_sftp.cpp:641
 #, kde-format
 msgid ""
 "The host key for this server was not found, but another type of key exists.\n"
@@ -79,7 +79,7 @@
 "%1"
 msgstr ""
 
-#: kio_sftp.cpp:619
+#: kio_sftp.cpp:652
 #, kde-format
 msgid ""
 "The host key for the server %1 has changed.\n"
@@ -91,11 +91,11 @@
 "%3"
 msgstr ""
 
-#: kio_sftp.cpp:631
+#: kio_sftp.cpp:665
 msgid "Warning: Cannot verify host's identity."
 msgstr ""
 
-#: kio_sftp.cpp:632
+#: kio_sftp.cpp:666
 #, kde-format
 msgid ""
 "The authenticity of host %1 cannot be established.\n"
@@ -103,38 +103,43 @@
 "Are you sure you want to continue connecting?"
 msgstr ""
 
-#: kio_sftp.cpp:663 kio_sftp.cpp:678 kio_sftp.cpp:717 kio_sftp.cpp:731
+#: kio_sftp.cpp:697 kio_sftp.cpp:719 kio_sftp.cpp:770 kio_sftp.cpp:786
 msgid "Authentication failed."
 msgstr "Methodd dilysiant."
 
-#: kio_sftp.cpp:686
+#: kio_sftp.cpp:706
 msgid "Please enter your username and password."
 msgstr ""
 
-#: kio_sftp.cpp:480
+#: kio_sftp.cpp:708
 msgid "site:"
 msgstr "safle:"
 
-#: kio_sftp.cpp:691
+#: kio_sftp.cpp:735
 msgid "Incorrect username or password"
 msgstr ""
 
-#: kio_sftp.cpp:744
+#: kio_sftp.cpp:799
 msgid ""
 "Unable to request the SFTP subsystem. Make sure SFTP is enabled on the "
 "server."
 msgstr ""
 
-#: kio_sftp.cpp:752
+#: kio_sftp.cpp:807
 msgid "Could not initialize the SFTP session."
 msgstr ""
 
-#: kio_sftp.cpp:757
+#: kio_sftp.cpp:812
 #, kde-format
 msgid "Successfully connected to %1"
 msgstr "Cysylltwyd â %1 yn llwyddiannus"
 
-#: kio_sftp.cpp:1248
+#: kio_sftp.cpp:1744
+#, kde-format
+msgid "Could not read link: %1"
+msgstr ""
+
+#: kio_sftp.cpp:2149
 #, kde-format
 msgid ""
 "Could not change permissions for\n"
@@ -142,8 +147,3 @@
 msgstr ""
 "Methu newid caniatadau i \n"
 " %1"
-
-#: kio_sftp.cpp:1462
-#, kde-format
-msgid "Could not read link: %1"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_sieve.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_sieve.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_sieve.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_sieve.po	2012-04-18 08:59:29.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kio_sieve\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: sieve.cpp:328
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_smb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_smb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_smb.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_smb.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kio_smb\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:12+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:59+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kio_smb_auth.cpp:141
 #, kde-format
@@ -107,7 +107,7 @@
 msgid "Unknown error condition in stat: %1"
 msgstr "Cyflwr gwall anhysbys yn stat: %1"
 
-#: kio_smb_mount.cpp:125 kio_smb_mount.cpp:166
+#: kio_smb_mount.cpp:109 kio_smb_mount.cpp:145
 msgid ""
 "\n"
 "Make sure that the samba package is installed properly on your system."
@@ -115,14 +115,14 @@
 "\n"
 "Gwiriwch fod y pecyn samba wedi'i osod yn gywir ar eich cysawd."
 
-#: kio_smb_mount.cpp:135
+#: kio_smb_mount.cpp:122
 #, kde-format
 msgid ""
 "Mounting of share \"%1\" from host \"%2\" by user \"%3\" failed.\n"
 "%4"
 msgstr ""
 
-#: kio_smb_mount.cpp:176
+#: kio_smb_mount.cpp:158
 #, kde-format
 msgid ""
 "Unmounting of mountpoint \"%1\" failed.\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_smtp.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_smtp.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_smtp.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_smtp.po	2012-04-18 08:59:29.000000000 +0000
@@ -6,17 +6,17 @@
 msgstr ""
 "Project-Id-Version: kio_smtp\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-07-18 17:56+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: command.cpp:135
+#: command.cpp:127
 msgid ""
 "The server rejected both EHLO and HELO commands as unknown or "
 "unimplemented.\n"
@@ -26,7 +26,7 @@
 "gweithredoli.\n"
 "Cysylltwch â rheolwr y gweinydd os gwelwch yn dda."
 
-#: command.cpp:149
+#: command.cpp:141
 #, kde-format
 msgid ""
 "Unexpected server response to %1 command.\n"
@@ -35,7 +35,7 @@
 "Ymateb gweinydd annisgwyl i'r gorchymyn %1.\n"
 "%2"
 
-#: command.cpp:169
+#: command.cpp:161
 msgid ""
 "Your SMTP server does not support TLS. Disable TLS, if you want to connect "
 "without encryption."
@@ -43,46 +43,46 @@
 "Nid yw'ch gweinydd SMTP yn cynnal TLS. Analluogwch TLS, os ydych am gysylltu "
 "heb gêl-ysgrifaeth."
 
-#: command.cpp:180
+#: command.cpp:172
 msgid ""
 "Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
 "You can disable TLS in the SMTP account settings dialog."
 msgstr ""
 
-#: command.cpp:185
+#: command.cpp:176
 msgid "Connection Failed"
 msgstr "Methodd y Cysylltiad"
 
-#: command.cpp:192
+#: command.cpp:183
 #, kde-format
 msgid "An error occurred during authentication: %1"
 msgstr ""
 
-#: command.cpp:258
+#: command.cpp:249
 msgid "No authentication details supplied."
 msgstr "Ni ddarperwyd manylion dilysu."
 
-#: command.cpp:350
+#: command.cpp:341
 msgid "Choose a different authentication method."
 msgstr ""
 
-#: command.cpp:352
+#: command.cpp:343
 #, kde-format
 msgid "Your SMTP server does not support %1."
 msgstr ""
 
-#: command.cpp:353
+#: command.cpp:344
 msgid "Your SMTP server does not support (unspecified method)."
 msgstr ""
 
-#: command.cpp:358
+#: command.cpp:349
 #, kde-format
 msgid ""
 "Your SMTP server does not support authentication.\n"
 "%1"
 msgstr ""
 
-#: command.cpp:362
+#: command.cpp:353
 #, kde-format
 msgid ""
 "Authentication failed.\n"
@@ -93,11 +93,11 @@
 "Mae'n debyg fod y cyfrinair yn anghywir.\n"
 "%1"
 
-#: command.cpp:500
+#: command.cpp:491
 msgid "Could not read data from application."
 msgstr "Methwyd darllen data o'r cymhwysiad."
 
-#: command.cpp:517
+#: command.cpp:508
 #, kde-format
 msgid ""
 "The message content was not accepted.\n"
@@ -124,43 +124,43 @@
 msgid "This is a temporary failure. You may try again later."
 msgstr "Mae hyn yn fethiant dros dro. Gallwch geisio eto nes ymlaen."
 
-#: smtp.cpp:133
+#: smtp.cpp:140
 msgid "The application sent an invalid request."
 msgstr "Anfonodd y cymhwysiad gais annilys."
 
-#: smtp.cpp:195
+#: smtp.cpp:202
 msgid "The sender address is missing."
 msgstr "Mae cyfeiriad yr anfonwr ar goll."
 
-#: smtp.cpp:203
+#: smtp.cpp:210
 #, kde-format
 msgid "SMTPProtocol::smtp_open failed (%1)"
 msgstr "Methodd SMTPProtocol::smtp_open (%1)"
 
-#: smtp.cpp:211
+#: smtp.cpp:218
 #, kde-format
 msgid ""
 "Your server (%1) does not support sending of 8-bit messages.\n"
 "Please use base64 or quoted-printable encoding."
 msgstr ""
 
-#: smtp.cpp:257
+#: smtp.cpp:264
 msgid "Writing to socket failed."
 msgstr ""
 
-#: smtp.cpp:295
+#: smtp.cpp:302
 #, kde-format
 msgid "Invalid SMTP response (%1) received."
 msgstr "Derbynnwyd ymateb SMTP annilys (%1)."
 
-#: smtp.cpp:497
+#: smtp.cpp:504
 #, kde-format
 msgid ""
 "The server (%1) did not accept the connection.\n"
 "%2"
 msgstr ""
 
-#: smtp.cpp:562
+#: smtp.cpp:569
 msgid "Username and password for your SMTP account:"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_svn.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_svn.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_svn.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_svn.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2008-02-15 21:57+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:24+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -22,46 +22,46 @@
 msgid "Your emails"
 msgstr ","
 
-#. i18n: file: svnhelper/subversioncheckout.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: svnhelper/subversionswitch.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:5 rc.cpp:8
-msgid "Revision (0 for HEAD):"
-msgstr ""
-
-#. i18n: file: svnhelper/subversiondiff.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, Subversion_Diff)
-#: rc.cpp:11
-msgid "Subversion Diff"
+#. i18n: file: ksvnd/commitdlg.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, CommitDlg)
+#: rc.cpp:5
+msgid "Log Message"
 msgstr ""
 
-#. i18n: file: svnhelper/subversiondiff.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: svnhelper/subversionlog.ui:59
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
 #. i18n: file: ksvnd/commitdlg.ui:49
 #. i18n: ectx: property (text), widget (QPushButton, pushButton1)
-#: rc.cpp:14 rc.cpp:20 rc.cpp:26
+#. i18n: file: svnhelper/subversionlog.ui:59
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: svnhelper/subversiondiff.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#: rc.cpp:8 rc.cpp:23 rc.cpp:29
 msgid "&OK"
 msgstr ""
 
+#. i18n: file: ksvnd/commitdlg.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, pushButton2)
+#: rc.cpp:11
+msgid "&Cancel"
+msgstr ""
+
+#. i18n: file: svnhelper/subversioncheckout.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: svnhelper/subversionswitch.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:14 rc.cpp:17
+msgid "Revision (0 for HEAD):"
+msgstr ""
+
 #. i18n: file: svnhelper/subversionlog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, Subversion_Log)
-#: rc.cpp:17
+#: rc.cpp:20
 msgid "Subversion Log"
 msgstr ""
 
-#. i18n: file: ksvnd/commitdlg.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, CommitDlg)
-#: rc.cpp:23
-msgid "Log Message"
-msgstr ""
-
-#. i18n: file: ksvnd/commitdlg.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, pushButton2)
-#: rc.cpp:29
-msgid "&Cancel"
+#. i18n: file: svnhelper/subversiondiff.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, Subversion_Diff)
+#: rc.cpp:26
+msgid "Subversion Diff"
 msgstr ""
 
 #: svn.cpp:233
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_timeline.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_timeline.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_timeline.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_timeline.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,17 +7,19 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-13 02:04+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-16 15:41+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:00+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:23+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kio_timeline.cpp:107
+#: kio_timeline.cpp:84
 msgctxt ""
 "Month and year used in a tree above the actual days. Have a look at "
 "http://api.kde.org/4.x-api/kdelibs-"
@@ -29,14 +31,14 @@
 
 #: kio_timeline.cpp:129
 msgid ""
-"The Nepomuk Strigi file indexing service is not running. Without it timeline "
-"results are not available."
+"The file indexing service is not running. Without it timeline results are "
+"not available."
 msgstr ""
 
-#: kio_timeline.cpp:179
+#: kio_timeline.cpp:135
 msgid "Today"
 msgstr "Heddiw"
 
-#: kio_timeline.cpp:180 kio_timeline.cpp:297
+#: kio_timeline.cpp:136 kio_timeline.cpp:248
 msgid "Calendar"
 msgstr "Calendr"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_trash.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_trash.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kio_trash.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kio_trash.po	2012-04-18 08:59:35.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdebase/kio_trash.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:18+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,49 +11,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:00+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:24+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kio_trash_win.cpp:228 kio_trash.cpp:140
-msgid "This file is already in the trash bin."
-msgstr ""
-
-#: kio_trash_win.cpp:241
-msgid "not supported"
-msgstr ""
-
-#: kio_trash_win.cpp:252 kio_trash.cpp:228
-msgid "Internal error in copyOrMove, should never happen"
-msgstr ""
-
-#: kcmtrash.cpp:120
-msgid "Byte"
-msgstr "Beit"
-
-#: kcmtrash.cpp:122
-msgid "KByte"
-msgstr "CBeit"
-
-#: kcmtrash.cpp:126
-msgid "MByte"
-msgstr "MBeit"
-
-#: kcmtrash.cpp:130
-msgid "GByte"
-msgstr "GBeit"
-
-#: kcmtrash.cpp:134
-msgid "TByte"
-msgstr "TBeit"
-
-#: kcmtrash.cpp:139
-#, kde-format
-msgctxt ""
-"%1 is amount of disk space, %2 the unit, KBytes, MBytes, GBytes, TBytes, etc."
-msgid "(%1 %2)"
-msgstr "(%1 %2)"
-
-#: kcmtrash.cpp:178 kcmtrash.cpp:278
+#: kcmtrash.cpp:170 kcmtrash.cpp:270
 msgid " day"
 msgid_plural " days"
 msgstr[0] " diwrnod"
@@ -61,11 +22,11 @@
 msgstr[2] " diwrnod"
 msgstr[3] " diwrnod"
 
-#: kcmtrash.cpp:269
+#: kcmtrash.cpp:261
 msgid "Delete files older than:"
 msgstr ""
 
-#: kcmtrash.cpp:271
+#: kcmtrash.cpp:263
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Check this box to allow <b>automatic deletion</b> of files that are "
@@ -73,59 +34,59 @@
 "automatically delete any items after a certain timespan</para>"
 msgstr ""
 
-#: kcmtrash.cpp:280
+#: kcmtrash.cpp:272
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Set the number of days that files can remain in the trash. Any files "
 "older than this will be automatically deleted.</para>"
 msgstr ""
 
-#: kcmtrash.cpp:287
+#: kcmtrash.cpp:279
 msgid "Limit to maximum size"
 msgstr ""
 
-#: kcmtrash.cpp:289
+#: kcmtrash.cpp:281
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>Check this box to limit the trash to the maximum amount of disk space "
 "that you specify below. Otherwise, it will be unlimited.</para>"
 msgstr ""
 
-#: kcmtrash.cpp:300
+#: kcmtrash.cpp:292
 msgid "Maximum size:"
 msgstr ""
 
-#: kcmtrash.cpp:309
+#: kcmtrash.cpp:301
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>This is the maximum percent of disk space that will be used for the "
 "trash.</para>"
 msgstr ""
 
-#: kcmtrash.cpp:314
+#: kcmtrash.cpp:306
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>This is the calculated amount of disk space that will be allowed for "
 "the trash, the maximum.</para>"
 msgstr ""
 
-#: kcmtrash.cpp:317
+#: kcmtrash.cpp:309
 msgid "When limit reached:"
 msgstr ""
 
-#: kcmtrash.cpp:321
+#: kcmtrash.cpp:313
 msgid "Warn Me"
 msgstr ""
 
-#: kcmtrash.cpp:322
+#: kcmtrash.cpp:314
 msgid "Delete Oldest Files From Trash"
 msgstr ""
 
-#: kcmtrash.cpp:323
+#: kcmtrash.cpp:315
 msgid "Delete Biggest Files From Trash"
 msgstr ""
 
-#: kcmtrash.cpp:325
+#: kcmtrash.cpp:317
 msgctxt "@info:whatsthis"
 msgid ""
 "<para>When the size limit is reached, it will prefer to delete the type of "
@@ -133,16 +94,6 @@
 "instead of automatically deleting files.</para>"
 msgstr ""
 
-#: trashimpl.cpp:1114
-msgid ""
-"The trash has reached its maximum size!\n"
-"Cleanup the trash manually."
-msgstr ""
-
-#: trashimpl.cpp:1125
-msgid "The file is too large to be trashed."
-msgstr ""
-
 #: ktrash.cpp:32
 msgid "ktrash"
 msgstr "ktrash"
@@ -180,3 +131,25 @@
 "and use the restore operation again, or drag the item anywhere else to "
 "restore it."
 msgstr ""
+
+#: kio_trash.cpp:140 kio_trash_win.cpp:228
+msgid "This file is already in the trash bin."
+msgstr ""
+
+#: kio_trash.cpp:228 kio_trash_win.cpp:252
+msgid "Internal error in copyOrMove, should never happen"
+msgstr ""
+
+#: kio_trash_win.cpp:241
+msgid "not supported"
+msgstr ""
+
+#: trashimpl.cpp:1125
+msgid ""
+"The trash has reached its maximum size!\n"
+"Cleanup the trash manually."
+msgstr ""
+
+#: trashimpl.cpp:1136
+msgid "The file is too large to be trashed."
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kjots.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kjots.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kjots.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kjots.po	2012-04-18 08:59:26.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeutils/kjots.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-12 21:43+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-16 22:52+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:10+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:36+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: aboutdata.cpp:32
 msgid "KJots"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kjumpingcube.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kjumpingcube.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kjumpingcube.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kjumpingcube.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kjumpingcube\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:57+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:07+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kjumpingcube.cpp:78
 msgid "Current player:"
@@ -152,31 +152,31 @@
 msgid "Graphics for KDE 4.0 version."
 msgstr ""
 
-#: rc.cpp:79
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: dylunio, KD, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:80
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kjumpingcubeui.rc:10
 #. i18n: ectx: Menu (game)
-#: rc.cpp:24 rc.cpp:83
+#: rc.cpp:5
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: kjumpingcubeui.rc:15
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:27 rc.cpp:86
+#: rc.cpp:8
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: settings.ui:58
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:30 rc.cpp:89
+#: rc.cpp:11
 msgid "Players' Colors"
 msgstr ""
 
@@ -186,132 +186,126 @@
 #. i18n: ectx: property (text), widget (KColorButton, kcfg_Color1)
 #. i18n: file: settings.ui:110
 #. i18n: ectx: property (text), widget (KColorButton, kcfg_Color0)
-#. i18n: file: settings.ui:82
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_Color2)
-#. i18n: file: settings.ui:89
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_Color1)
-#. i18n: file: settings.ui:110
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_Color0)
-#: rc.cpp:33 rc.cpp:36 rc.cpp:45 rc.cpp:92 rc.cpp:95 rc.cpp:104
+#: rc.cpp:14 rc.cpp:17 rc.cpp:26
 msgid "PushButton"
 msgstr ""
 
 #. i18n: file: settings.ui:96
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:39 rc.cpp:98
+#: rc.cpp:20
 msgid "Player 2:"
 msgstr "Chwaraewr 2:"
 
 #. i18n: file: settings.ui:103
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:42 rc.cpp:101
+#: rc.cpp:23
 msgid "Player 1:"
 msgstr "Chwaraewr 1:"
 
 #. i18n: file: settings.ui:117
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:48 rc.cpp:107
+#: rc.cpp:29
 msgid "Neutral:"
 msgstr ""
 
 #. i18n: file: settings.ui:127
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:51 rc.cpp:110
+#: rc.cpp:32
 msgid "Computer Skill"
 msgstr "Medr Cyfrifiadurol"
 
 #. i18n: file: settings.ui:151
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:54 rc.cpp:113
+#: rc.cpp:35
 msgid "Average"
 msgstr "Cyfartaledd"
 
 #. i18n: file: settings.ui:161
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:57 rc.cpp:116
+#: rc.cpp:38
 msgid "Expert"
 msgstr "Arbenigwr"
 
 #. i18n: file: settings.ui:171
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:60 rc.cpp:119
+#: rc.cpp:41
 msgid "Beginner"
 msgstr "Dechreuwr"
 
 #. i18n: file: settings.ui:200
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:63 rc.cpp:122
+#: rc.cpp:44
 msgid "Board Size"
 msgstr "Maint Bwrdd"
 
 #. i18n: file: settings.ui:224
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:66 rc.cpp:125
+#: rc.cpp:47
 msgid "10x10"
 msgstr "10x10"
 
 #. i18n: file: settings.ui:234
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:69 rc.cpp:128
+#: rc.cpp:50
 msgid "5x5"
 msgstr "5x5"
 
 #. i18n: file: settings.ui:269
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:72 rc.cpp:131
+#: rc.cpp:53
 msgid "Computer Plays"
 msgstr ""
 
 #. i18n: file: settings.ui:290
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ComputerPlayer1)
-#: rc.cpp:75 rc.cpp:134
+#: rc.cpp:56
 msgid "Player 1"
 msgstr "Chwaraewr 1"
 
 #. i18n: file: settings.ui:297
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ComputerPlayer2)
-#: rc.cpp:78 rc.cpp:137
+#: rc.cpp:59
 msgid "Player 2"
 msgstr "Chwaraewr 2"
 
 #. i18n: file: kjumpingcube.kcfg:9
 #. i18n: ectx: label, entry (Color0), group (Game)
-#: rc.cpp:3 rc.cpp:140
+#: rc.cpp:62
 msgid "Color of neutral cubes."
 msgstr ""
 
 #. i18n: file: kjumpingcube.kcfg:13
 #. i18n: ectx: label, entry (Color1), group (Game)
-#: rc.cpp:6 rc.cpp:143
+#: rc.cpp:65
 msgid "Color of player 1."
 msgstr "Lliw chwaraewr 1."
 
 #. i18n: file: kjumpingcube.kcfg:17
 #. i18n: ectx: label, entry (Color2), group (Game)
-#: rc.cpp:9 rc.cpp:146
+#: rc.cpp:68
 msgid "Color of player 2."
 msgstr "Lliw chwaraewr 2."
 
 #. i18n: file: kjumpingcube.kcfg:21
 #. i18n: ectx: label, entry (CubeDim), group (Game)
-#: rc.cpp:12 rc.cpp:149
+#: rc.cpp:71
 msgid "Size of the playing field."
 msgstr "Maint y cae chwarae."
 
 #. i18n: file: kjumpingcube.kcfg:30
 #. i18n: ectx: label, entry (Skill), group (Game)
-#: rc.cpp:15 rc.cpp:152
+#: rc.cpp:74
 msgid "Skill of the computer player."
 msgstr "Medr y chwaraewr cyfrifiadurol."
 
 #. i18n: file: kjumpingcube.kcfg:34
 #. i18n: ectx: label, entry (ComputerPlayer1), group (Game)
-#: rc.cpp:18 rc.cpp:155
+#: rc.cpp:77
 msgid "Whether player 1 is played by the computer."
 msgstr "A ddylai'r cyfrifiadur chwarae fel chwaraewr 1."
 
 #. i18n: file: kjumpingcube.kcfg:38
 #. i18n: ectx: label, entry (ComputerPlayer2), group (Game)
-#: rc.cpp:21 rc.cpp:158
+#: rc.cpp:80
 msgid "Whether player 2 is played by the computer."
 msgstr "A ddylai'r cyfrifiadur chwarae fel chwaraewr 2."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kleopatra.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kleopatra.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kleopatra.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kleopatra.po	2012-04-18 08:59:26.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdepim/kleopatra.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:42+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-11 17:16+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,5143 +11,5144 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:11+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: models/keylistmodel.cpp:250 models/useridlistmodel.cpp:249
-#: newcertificatewizard/newcertificatewizard.cpp:918
-#: dialogs/adduseriddialog.cpp:69
-msgid "Name"
+#. i18n: file: kleopatra.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kwatchgnupg/kwatchgnupgui.rc:4
+#. i18n: ectx: Menu (file)
+#: kgpgconf/mainwindow.cpp:67 rc.cpp:32 rc.cpp:104
+msgid "&File"
 msgstr ""
 
-#: models/keylistmodel.cpp:252
-msgid "E-Mail"
+#. i18n: file: dialogs/lookupcertificatesdialog.ui:57
+#. i18n: ectx: property (text), widget (QPushButton, saveAsPB)
+#: kgpgconf/mainwindow.cpp:68 rc.cpp:621
+msgid "Save As..."
 msgstr ""
 
-#: models/keylistmodel.cpp:253 models/useridlistmodel.cpp:251
-#: models/subkeylistmodel.cpp:158
-msgid "Valid From"
+#: kgpgconf/mainwindow.cpp:70
+msgid "Quit"
 msgstr ""
 
-#: models/keylistmodel.cpp:254 models/useridlistmodel.cpp:252
-#: models/subkeylistmodel.cpp:159
-msgid "Valid Until"
+#: kgpgconf/mainwindow.cpp:86
+msgid "Setup Error"
 msgstr ""
 
-#. i18n: file: dialogs/selftestdialog.ui:69
-#. i18n: ectx: property (title), widget (QGroupBox, detailsGB)
-#: models/keylistmodel.cpp:255 rc.cpp:580
-msgid "Details"
+#: kgpgconf/mainwindow.cpp:86
+#, kde-format
+msgid ""
+"KGpgConf could not execute gpgconf.exe.\n"
+"\n"
+"Error: %1\n"
+"Error Code: %2"
 msgstr ""
 
-#: models/keylistmodel.cpp:256 utils/formatting.cpp:301
-msgid "Key-ID"
+#: kgpgconf/mainwindow.cpp:91
+msgid "Parsing Error"
 msgstr ""
 
-#: models/useridlistmodel.cpp:248 models/subkeylistmodel.cpp:156
-msgid "ID"
+#: kgpgconf/mainwindow.cpp:91 kgpgconf/mainwindow.cpp:96
+#, kde-format
+msgid ""
+"An error occurred while reading the current configuration.\n"
+"\n"
+"Error: %1"
 msgstr ""
 
-#: models/useridlistmodel.cpp:250
-#: newcertificatewizard/newcertificatewizard.cpp:922
-#: dialogs/adduseriddialog.cpp:73
-msgid "EMail"
+#: kgpgconf/mainwindow.cpp:96
+msgid "Error"
 msgstr ""
 
-#: models/useridlistmodel.cpp:253 models/subkeylistmodel.cpp:160
-#: utils/kleo_kicondialog.cpp:378
-msgid "Status"
+#: kgpgconf/mainwindow.cpp:213 kgpgconf/mainwindow.cpp:232
+msgid "Write Error"
 msgstr ""
 
-#: models/useridlistmodel.cpp:304 utils/formatting.cpp:445
-#: utils/formatting.cpp:457
-msgid "revoked"
+#: kgpgconf/mainwindow.cpp:213
+#, kde-format
+msgid ""
+"Could not open file %1 for writing. You might not have the permission to "
+"write to that file."
 msgstr ""
 
-#: models/useridlistmodel.cpp:306 utils/formatting.cpp:447
-#: utils/formatting.cpp:483
-msgid "expired"
+#: kgpgconf/mainwindow.cpp:232
+#, kde-format
+msgid "Error while writing to file %1."
 msgstr ""
 
-#: models/useridlistmodel.cpp:308 utils/formatting.cpp:449
-msgid "disabled"
+#: kgpgconf/mainwindow.cpp:238
+msgid "Save As"
 msgstr ""
 
-#: models/useridlistmodel.cpp:310 utils/formatting.cpp:451
-#: utils/formatting.cpp:459 utils/formatting.cpp:482
-msgid "invalid"
+#: kgpgconf/configuration.cpp:345
+msgctxt "as in \"verbosity level\""
+msgid "Level"
 msgstr ""
 
-#: models/useridlistmodel.cpp:311
-msgid "good"
+#: kgpgconf/configuration.cpp:345
+msgid "Set/Unset"
 msgstr ""
 
-#: models/keycache.cpp:956
-msgid "Listing X.509 certificates"
+#: kgpgconf/configuration.cpp:347
+msgid "String List"
 msgstr ""
 
-#: models/keycache.cpp:957
-msgid "Listing OpenPGP certificates"
+#: kgpgconf/configuration.cpp:347
+msgid "String"
 msgstr ""
 
-#: models/subkeylistmodel.cpp:157
-msgid "Type"
+#: kgpgconf/configuration.cpp:349
+msgid "List of Integers"
 msgstr ""
 
-#: models/subkeylistmodel.cpp:161
-msgid "Strength"
+#: kgpgconf/configuration.cpp:349
+msgid "Integer"
 msgstr ""
 
-#: uiserver/selectcertificatecommand.cpp:177
-#, kde-format
-msgid ""
-"Caught unexpected exception in "
-"SelectCertificateCommand::Private::slotDialogAccepted: %1"
+#: kgpgconf/configuration.cpp:351
+msgid "List of Unsigned Integers"
 msgstr ""
 
-#: uiserver/selectcertificatecommand.cpp:181
-msgid ""
-"Caught unknown exception in "
-"SelectCertificateCommand::Private::slotDialogAccepted"
+#: kgpgconf/configuration.cpp:351
+msgid "Unsigned Integer "
 msgstr ""
 
-#: uiserver/createchecksumscommand.cpp:78
-#: uiserver/verifychecksumscommand.cpp:80
-#: uiserver/signencryptfilescommand.cpp:83
-#: uiserver/decryptverifycommandfilesbase.cpp:165
-msgid "At least one FILE must be present"
+#: kgpgconf/configuration.cpp:353
+msgid "Path List"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:145
-msgid "Can not use non-info SENDER"
-msgstr ""
+#: kgpgconf/configuration.cpp:353
+msgid "Path"
+msgstr "Llwybr"
 
-#: uiserver/decryptverifycommandemailbase.cpp:149
-msgid "Can not use non-info RECIPIENT"
+#: kgpgconf/configuration.cpp:355
+msgid "List of URLs"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:164
-msgid "FILES present"
+#: kgpgconf/configuration.cpp:355
+msgid "URL"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:168
-msgid "At least one INPUT needs to be provided"
+#: kgpgconf/configuration.cpp:357
+msgid "List of LDAP URLs"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:173
-msgid "INPUT/SENDER --info count mismatch"
+#: kgpgconf/configuration.cpp:357
+msgid "LDAP URL"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:178
-msgid "INPUT/MESSAGE count mismatch"
+#: kgpgconf/configuration.cpp:359
+msgid "Directory Path List"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:181
-msgid "MESSAGE can only be given for detached signature verification"
+#: kgpgconf/configuration.cpp:359
+msgid "Directory Path"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:187 uiserver/signcommand.cpp:102
-#: uiserver/encryptcommand.cpp:106
-msgid "INPUT/OUTPUT count mismatch"
+#: kgpgconf/configreader.cpp:234
+#, kde-format
+msgid "Parse error on gpgconf --list-config output: %1"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:190
-msgid "Can not use OUTPUT and MESSAGE simultaneously"
+#: kgpgconf/configreader.cpp:239
+#, kde-format
+msgid "gpgconf --list-config: Unknown component: %1"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:198
-msgid "No backend support for OpenPGP"
+#: kgpgconf/configreader.cpp:244
+#, kde-format
+msgid "gpgconf --list-config: Unknown entry: %1:%2"
 msgstr ""
 
-#: uiserver/decryptverifycommandemailbase.cpp:199
-msgid "No backend support for S/MIME"
+#: kgpgconf/configreader.cpp:250
+#, kde-format
+msgid "gpgconf --list-config: Invalid entry: value must start with '\"': %1"
 msgstr ""
 
-#: uiserver/uiserver_win.cpp:72 uiserver/uiserver_unix.cpp:70
+#: kgpgconf/configreader.cpp:283
 #, kde-format
-msgid "Could not create socket: %1"
+msgid "Parse error on gpgconf --list-components. output: %1"
 msgstr ""
 
-#: uiserver/uiserver_win.cpp:81 uiserver/uiserver_unix.cpp:83
-#, kde-format
-msgid "Could not bind to socket: %1"
+#: kgpgconf/configreader.cpp:311
+msgid "gpgconf not found or cannot be started"
 msgstr ""
 
-#: uiserver/uiserver_win.cpp:84 uiserver/uiserver_unix.cpp:89
-#, kde-format
-msgid "Could not get socket nonce: %1"
+#: kgpgconf/configreader.cpp:313
+msgid "gpgconf terminated unexpectedly"
 msgstr ""
 
-#: uiserver/uiserver_win.cpp:88 uiserver/uiserver_unix.cpp:94
-#, kde-format
-msgid "Could not listen to socket: %1"
+#: kgpgconf/configreader.cpp:315
+msgid "timeout while executing gpgconf"
 msgstr ""
 
-#: uiserver/uiserver_win.cpp:91 uiserver/uiserver_unix.cpp:97
-#, kde-format
-msgid ""
-"Could not pass socket to Qt: %1. This should not happen, please report this "
-"bug."
+#: kgpgconf/configreader.cpp:317
+msgid "error while writing to gpgconf"
 msgstr ""
 
-#: uiserver/echocommand.cpp:160 uiserver/signcommand.cpp:217
-#, kde-format
-msgid ""
-"Caught unexpected exception in SignCommand::Private::slotMicAlgDetermined: %1"
+#: kgpgconf/configreader.cpp:319
+msgid "error while reading from gpgconf"
 msgstr ""
 
-#: uiserver/echocommand.cpp:164 uiserver/signcommand.cpp:221
-msgid ""
-"Caught unknown exception in SignCommand::Private::slotMicAlgDetermined"
+#: kgpgconf/configreader.cpp:322
+msgid "Unknown error while executing gpgconf"
 msgstr ""
 
-#: uiserver/signcommand.cpp:90
-msgid ""
-"SIGN is an email mode command, connection seems to be in filemanager mode"
+#: crlview.cpp:61
+msgid "CRL cache dump:"
+msgstr "Tomen celc CRL:"
+
+#: crlview.cpp:71
+msgid "&Update"
 msgstr ""
 
-#: uiserver/signcommand.cpp:94
-msgid "RECIPIENT may not be given prior to SIGN, except with --info"
+#: crlview.cpp:117
+msgid "Unable to start gpgsm process. Please check your installation."
 msgstr ""
 
-#: uiserver/signcommand.cpp:98 uiserver/encryptcommand.cpp:98
-msgid "At least one INPUT must be present"
+#: crlview.cpp:117 crlview.cpp:145
+msgid "Certificate Manager Error"
+msgstr "Gwall Rheolwr Tystysgrifau"
+
+#: crlview.cpp:145
+msgid "The GpgSM process ended prematurely because of an unexpected error."
 msgstr ""
 
-#: uiserver/signcommand.cpp:106
-msgid "MESSAGE command is not allowed before SIGN"
+#: aboutdata.cpp:53
+msgid "Certificate Manager and Unified Crypto GUI"
 msgstr ""
 
-#: uiserver/signcommand.cpp:114 uiserver/prepsigncommand.cpp:101
-msgid ""
-"Protocol given conflicts with protocol determined by PREP_ENCRYPT in this "
-"session"
+#: aboutdata.cpp:63
+msgid "Current Maintainer"
+msgstr "Cynhaliwr Cyfredol"
+
+#: aboutdata.cpp:64
+msgid "Former Maintainer"
+msgstr "Cyn-gynhaliwr"
+
+#: aboutdata.cpp:65 kwatchgnupg/aboutdata.cpp:50
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
+
+#: aboutdata.cpp:70
+msgid "David Faure"
 msgstr ""
 
-#: uiserver/signcommand.cpp:127
-msgid "No senders given, or only with --info"
+#: aboutdata.cpp:71
+msgid "Backend configuration framework, KIO integration"
 msgstr ""
 
-#: uiserver/signcommand.cpp:195
-#, kde-format
-msgid ""
-"Caught unexpected exception in SignCommand::Private::slotRecipientsResolved: "
-"%1"
+#: aboutdata.cpp:73
+msgid "Michel Boyer de la Giroday"
 msgstr ""
 
-#: uiserver/signcommand.cpp:199
-msgid ""
-"Caught unknown exception in SignCommand::Private::slotRecipientsResolved"
+#: aboutdata.cpp:74
+msgid "Key-state dependent colors and fonts in the certificates list"
 msgstr ""
 
-#: uiserver/signencryptfilescommand.cpp:88
-#: uiserver/signencryptfilescommand.cpp:93
-#: uiserver/signencryptfilescommand.cpp:99
-#: uiserver/signencryptfilescommand.cpp:104
-#: uiserver/signencryptfilescommand.cpp:109
-#, kde-format
-msgid ""
-"%1 is a filemanager mode command, connection seems to be in email mode (%2 "
-"present)"
+#: aboutdata.cpp:76
+msgid "Thomas Moenicke"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:90
-msgid ""
-"ENCRYPT is an email mode command, connection seems to be in filmanager mode"
+#: aboutdata.cpp:77
+msgid "Artwork"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:94
-msgid "SENDER may not be given prior to ENCRYPT, except with --info"
+#: aboutdata.cpp:79
+msgid "Frank Osterfeld"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:102
-msgid "At least one OUTPUT must be present"
+#: aboutdata.cpp:80
+msgid "Resident gpgme/win wrangler, UI Server commands and dialogs"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:110
-msgid "MESSAGE command is not allowed before ENCRYPT"
+#: aboutdata.cpp:82
+msgid "Karl-Heinz Zimmer"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:119
-msgid "Protocol given conflicts with protocol determined by PREP_ENCRYPT"
+#: aboutdata.cpp:83
+msgid "DN display ordering support, infrastructure"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:123
-msgid "New recipients added after PREP_ENCRYPT command"
-msgstr ""
+#: aboutdata.cpp:89
+msgid "Kleopatra"
+msgstr "Kleopatra"
 
-#: uiserver/encryptcommand.cpp:126
-msgid "New senders added after PREP_ENCRYPT command"
+#: aboutdata.cpp:91
+msgid ""
+"(c) 2002 Steffen Hansen, Matthias Kalle Dalheimer, "
+"Klarälvdalens Datakonsult AB\n"
+"(c) 2004, 2007, 2008, 2009 Marc Mutz, Klarälvdalens Datakonsult AB"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:132 uiserver/prepencryptcommand.cpp:93
-msgid "No recipients given, or only with --info"
+#: aboutdata.cpp:105
+msgid ""
+"Gpg4win is an installer package for Windows for EMail and file encryption "
+"using the core component GnuPG for Windows. Both relevant cryptography "
+"standards are supported, OpenPGP and S/MIME. Gpg4win and the software "
+"included with Gpg4win are Free Software."
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:199
-#, kde-format
+#: aboutdata.cpp:112
 msgid ""
-"Caught unexpected exception in "
-"EncryptCommand::Private::slotRecipientsResolved: %1"
+"This Free Software product was developed mostly as part of commercial "
+"contracts by the following companies:<ul><li><a "
+"href='http://intevation.net'>Intevation GmbH</a> (Projekt coordination, QA, "
+"Compendium)</li><li><a href='http://www.g10code.com'>g10 Code GmbH</a> "
+"(Crypto Funktionality, GpgOL, GpgEX, GPA)</li> <li><a "
+"href='http://www.kdab.com'>KDAB</a> (Kleopatra)</li></ul>The following "
+"persons have contributed (as of 20100706):"
 msgstr ""
 
-#: uiserver/encryptcommand.cpp:203
+#: aboutdata.cpp:121
 msgid ""
-"Caught unknown exception in EncryptCommand::Private::slotRecipientsResolved"
+"Till Adam<br>Marcus Brinkmann<br>Brigitte Hamilton<br>Bernhard "
+"Herzog<br>Werner Koch<br>Colin Leroy<br>Marc Mutz<br>Marcel Newmann<br>Frank "
+"Osterfeld<br>Bernhard Reiter<br>Florian v. Samson<br>Emanuel Schütze<br>Dr. "
+"Jan-Oliver Wagner"
 msgstr ""
 
-#: uiserver/prepsigncommand.cpp:84
-msgid "INPUT/OUTPUT/MESSAGE may only be given after PREP_SIGN"
+#: aboutdata.cpp:145 aboutdata.cpp:152
+msgctxt "Version string is a guess"
+msgid "guessed"
 msgstr ""
 
-#: uiserver/prepsigncommand.cpp:88
-msgid ""
-"PREP_SIGN is an email mode command, connection seems to be in filemanager "
-"mode"
+#: aboutdata.cpp:168
+msgid "Gpg4win"
 msgstr ""
 
-#: uiserver/prepsigncommand.cpp:92
-msgid "No SENDER given"
+#: mainwindow_mobile.cpp:151 mainwindow_desktop.cpp:121
+#, kde-format
+msgctxt "Quit [ApplicationName]"
+msgid "&Quit %1"
 msgstr ""
 
-#: uiserver/prepsigncommand.cpp:169
-#, kde-format
-msgid ""
-"Caught unexpected exception in "
-"PrepSignCommand::Private::slotRecipientsResolved: %1"
+#: mainwindow_mobile.cpp:157 mainwindow_desktop.cpp:127
+msgid "Only &Close Window"
 msgstr ""
 
-#: uiserver/prepsigncommand.cpp:173
+#: mainwindow_mobile.cpp:203 mainwindow_desktop.cpp:188
 msgid ""
-"Caught unknown exception in PrepSignCommand::Private::slotRecipientsResolved"
+"Could not start the GnuPG Log Viewer (kwatchgnupg). Please check your "
+"installation."
 msgstr ""
 
-#: uiserver/prepencryptcommand.cpp:81
-msgid "INPUT/OUTPUT/MESSAGE may only be given after PREP_ENCRYPT"
+#: mainwindow_mobile.cpp:205 mainwindow_desktop.cpp:190
+msgid "Error Starting KWatchGnuPG"
 msgstr ""
 
-#: uiserver/prepencryptcommand.cpp:85
+#: mainwindow_mobile.cpp:210 mainwindow_desktop.cpp:195
 msgid ""
-"PREP_ENCRYPT is an email mode command, connection seems to be in filemanager "
-"mode"
+"Could not start the GnuPG Administrative Console (kgpgconf). Please check "
+"your installation."
 msgstr ""
 
-#: uiserver/prepencryptcommand.cpp:89
-msgid "SENDER may not be given prior to PREP_ENCRYPT, except with --info"
+#: mainwindow_mobile.cpp:212 mainwindow_desktop.cpp:197
+msgid "Error Starting KGpgConf"
 msgstr ""
 
-#: uiserver/prepencryptcommand.cpp:141
-#, kde-format
-msgid ""
-"Caught unexpected exception in "
-"PrepEncryptCommand::Private::slotRecipientsResolved: %1"
+#: mainwindow_mobile.cpp:278 mainwindow_desktop.cpp:319
+msgid "Perform Self-Test"
 msgstr ""
 
-#: uiserver/prepencryptcommand.cpp:145
+#: mainwindow_mobile.cpp:345 mainwindow_desktop.cpp:383
 msgid ""
-"Caught unknown exception in "
-"PrepEncryptCommand::Private::slotRecipientsResolved"
+"There are still some background operations ongoing. These will be terminated "
+"when closing the window. Proceed?"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:194
-msgid "No option name given"
+#: mainwindow_mobile.cpp:348 mainwindow_desktop.cpp:386
+msgid "Ongoing Background Tasks"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:368
-msgid "Parse error"
+#: uiserver/uiserver_unix.cpp:70 uiserver/uiserver_win.cpp:72
+#, kde-format
+msgid "Could not create socket: %1"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:377
-msgid "Parse error: numeric session id too large"
+#: uiserver/uiserver_unix.cpp:83 uiserver/uiserver_win.cpp:81
+#, kde-format
+msgid "Could not bind to socket: %1"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:394
-msgid "CAPABILITIES does not take arguments"
+#: uiserver/uiserver_unix.cpp:89 uiserver/uiserver_win.cpp:84
+#, kde-format
+msgid "Could not get socket nonce: %1"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:432
-msgid "Unknown value for WHAT"
+#: uiserver/uiserver_unix.cpp:94 uiserver/uiserver_win.cpp:88
+#, kde-format
+msgid "Could not listen to socket: %1"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:447
-msgid "START_KEYMANAGER does not take arguments"
+#: uiserver/uiserver_unix.cpp:97 uiserver/uiserver_win.cpp:91
+#, kde-format
+msgid ""
+"Could not pass socket to Qt: %1. This should not happen, please report this "
+"bug."
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:465
-msgid "START_CONFDIALOG does not take arguments"
+#: uiserver/encryptcommand.cpp:90
+msgid ""
+"ENCRYPT is an email mode command, connection seems to be in filmanager mode"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:516
-#, kde-format
-msgid "Message #%1"
+#: uiserver/encryptcommand.cpp:94
+msgid "SENDER may not be given prior to ENCRYPT, except with --info"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:527
-msgid "Empty file path"
+#: uiserver/encryptcommand.cpp:98 uiserver/signcommand.cpp:98
+msgid "At least one INPUT must be present"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:530
-#: uiserver/assuanserverconnection.cpp:599
-msgid "Only absolute file paths are allowed"
+#: uiserver/encryptcommand.cpp:102
+msgid "At least one OUTPUT must be present"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:532
-msgid "Only files are allowed in INPUT/OUTPUT FILE"
+#: uiserver/encryptcommand.cpp:106 uiserver/signcommand.cpp:102
+#: uiserver/decryptverifycommandemailbase.cpp:187
+msgid "INPUT/OUTPUT count mismatch"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:613
-msgid "unknown exception caught"
+#: uiserver/encryptcommand.cpp:110
+msgid "MESSAGE command is not allowed before ENCRYPT"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:670
-msgid "Cannot mix --info with non-info SENDER or RECIPIENT"
+#: uiserver/encryptcommand.cpp:119
+msgid "Protocol given conflicts with protocol determined by PREP_ENCRYPT"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:674
-msgid "Argument is not a valid RFC-2822 mailbox"
+#: uiserver/encryptcommand.cpp:123
+msgid "New recipients added after PREP_ENCRYPT command"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:677
-msgid "Garbage after valid RFC-2822 mailbox detected"
+#: uiserver/encryptcommand.cpp:126
+msgid "New senders added after PREP_ENCRYPT command"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1111
-#, kde-format
-msgid "Caught unexpected exception: %1"
+#: uiserver/encryptcommand.cpp:132 uiserver/prepencryptcommand.cpp:93
+msgid "No recipients given, or only with --info"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1115
+#: uiserver/encryptcommand.cpp:199
+#, kde-format
 msgid ""
-"Caught unknown exception - please report this error to the developers."
+"Caught unexpected exception in "
+"EncryptCommand::Private::slotRecipientsResolved: %1"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1241
-#, kde-format
-msgid "Can not send \"%1\" status"
+#: uiserver/encryptcommand.cpp:203
+msgid ""
+"Caught unknown exception in EncryptCommand::Private::slotRecipientsResolved"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1248
-msgid "Can not send data"
+#: uiserver/signcommand.cpp:90
+msgid ""
+"SIGN is an email mode command, connection seems to be in filemanager mode"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1251
-msgid "Can not flush data"
+#: uiserver/signcommand.cpp:94
+msgid "RECIPIENT may not be given prior to SIGN, except with --info"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1424
-#: uiserver/assuanserverconnection.cpp:1470 crypto/decryptverifytask.cpp:814
-#: crypto/decryptverifytask.cpp:910 crypto/decryptverifytask.cpp:965
-#: crypto/decryptverifytask.cpp:1063 crypto/decryptverifytask.cpp:1117
-#: crypto/decryptverifytask.cpp:1214 crypto/decryptverifytask.cpp:1262
-#: crypto/decryptverifytask.cpp:1348
-msgid "Caught unknown exception"
+#: uiserver/signcommand.cpp:106
+msgid "MESSAGE command is not allowed before SIGN"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1491
-msgid "Required --mode option missing"
+#: uiserver/signcommand.cpp:114 uiserver/prepsigncommand.cpp:101
+msgid ""
+"Protocol given conflicts with protocol determined by PREP_ENCRYPT in this "
+"session"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1498
-#, kde-format
-msgid "invalid mode: \"%1\""
+#: uiserver/signcommand.cpp:127
+msgid "No senders given, or only with --info"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1519
-msgid "Required --protocol option missing"
+#: uiserver/signcommand.cpp:195
+#, kde-format
+msgid ""
+"Caught unexpected exception in SignCommand::Private::slotRecipientsResolved: "
+"%1"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1524
-msgid "--protocol is not allowed here"
+#: uiserver/signcommand.cpp:199
+msgid ""
+"Caught unknown exception in SignCommand::Private::slotRecipientsResolved"
 msgstr ""
 
-#: uiserver/assuanserverconnection.cpp:1531
+#: uiserver/signcommand.cpp:217 uiserver/echocommand.cpp:160
 #, kde-format
-msgid "invalid protocol \"%1\""
+msgid ""
+"Caught unexpected exception in SignCommand::Private::slotMicAlgDetermined: %1"
 msgstr ""
 
-#: uiserver/uiserver.cpp:232
+#: uiserver/signcommand.cpp:221 uiserver/echocommand.cpp:164
 msgid ""
-"Could not determine the GnuPG home directory. Consider setting the GNUPGHOME "
-"environment variable."
+"Caught unknown exception in SignCommand::Private::slotMicAlgDetermined"
 msgstr ""
 
-#: uiserver/uiserver.cpp:242
-#, kde-format
-msgid ""
-"Cannot determine the GnuPG home directory: %1 exists but is not a directory."
+#: uiserver/signencryptfilescommand.cpp:83
+#: uiserver/verifychecksumscommand.cpp:80
+#: uiserver/decryptverifycommandfilesbase.cpp:165
+#: uiserver/createchecksumscommand.cpp:78
+msgid "At least one FILE must be present"
 msgstr ""
 
-#: uiserver/uiserver.cpp:248
+#: uiserver/signencryptfilescommand.cpp:88
+#: uiserver/signencryptfilescommand.cpp:93
+#: uiserver/signencryptfilescommand.cpp:99
+#: uiserver/signencryptfilescommand.cpp:104
+#: uiserver/signencryptfilescommand.cpp:109
 #, kde-format
-msgid "Could not create GnuPG home directory %1: %2"
+msgid ""
+"%1 is a filemanager mode command, connection seems to be in email mode (%2 "
+"present)"
 msgstr ""
 
-#: uiserver/uiserver.cpp:260
+#: uiserver/selectcertificatecommand.cpp:177
 #, kde-format
-msgid "Detected another running gnupg UI server listening at %1."
-msgstr ""
-
-#: uiserver/decryptverifycommandfilesbase.cpp:146
-msgid "Can not use SENDER"
+msgid ""
+"Caught unexpected exception in "
+"SelectCertificateCommand::Private::slotDialogAccepted: %1"
 msgstr ""
 
-#: uiserver/decryptverifycommandfilesbase.cpp:150
-msgid "Can not use RECIPIENT"
+#: uiserver/selectcertificatecommand.cpp:181
+msgid ""
+"Caught unknown exception in "
+"SelectCertificateCommand::Private::slotDialogAccepted"
 msgstr ""
 
-#: uiserver/decryptverifycommandfilesbase.cpp:157
-msgid "INPUT present"
+#: uiserver/decryptverifycommandemailbase.cpp:145
+msgid "Can not use non-info SENDER"
 msgstr ""
 
-#: uiserver/decryptverifycommandfilesbase.cpp:159
-msgid "MESSAGE present"
+#: uiserver/decryptverifycommandemailbase.cpp:149
+msgid "Can not use non-info RECIPIENT"
 msgstr ""
 
-#: uiserver/decryptverifycommandfilesbase.cpp:161
-msgid "OUTPUT present"
+#: uiserver/decryptverifycommandemailbase.cpp:164
+msgid "FILES present"
 msgstr ""
 
-#: uiserver/decryptverifycommandfilesbase.cpp:168
-msgid "DECRYPT/VERIFY_FILES cannot use directories as input"
+#: uiserver/decryptverifycommandemailbase.cpp:168
+msgid "At least one INPUT needs to be provided"
 msgstr ""
 
-#: systrayicon.cpp:182
-msgid "&Open Certificate Manager..."
+#: uiserver/decryptverifycommandemailbase.cpp:173
+msgid "INPUT/SENDER --info count mismatch"
 msgstr ""
 
-#: systrayicon.cpp:183
-#, kde-format
-msgid "&Configure %1..."
+#: uiserver/decryptverifycommandemailbase.cpp:178
+msgid "INPUT/MESSAGE count mismatch"
 msgstr ""
 
-#: systrayicon.cpp:184
-#, kde-format
-msgid "&About %1..."
+#: uiserver/decryptverifycommandemailbase.cpp:181
+msgid "MESSAGE can only be given for detached signature verification"
 msgstr ""
 
-#: systrayicon.cpp:185
-msgid "&Shutdown Kleopatra"
+#: uiserver/decryptverifycommandemailbase.cpp:190
+msgid "Can not use OUTPUT and MESSAGE simultaneously"
 msgstr ""
 
-#: systrayicon.cpp:186 utils/output.cpp:488
-#: commands/importcertificatefromclipboardcommand.cpp:125
-msgid "Clipboard"
+#: uiserver/decryptverifycommandemailbase.cpp:198
+msgid "No backend support for OpenPGP"
 msgstr ""
 
-#: systrayicon.cpp:187
-msgid "Certificate Import"
+#: uiserver/decryptverifycommandemailbase.cpp:199
+msgid "No backend support for S/MIME"
 msgstr ""
 
-#: systrayicon.cpp:188
-msgid "Encrypt..."
+#: uiserver/prepencryptcommand.cpp:81
+msgid "INPUT/OUTPUT/MESSAGE may only be given after PREP_ENCRYPT"
 msgstr ""
 
-#: systrayicon.cpp:189
-msgid "S/MIME-Sign..."
+#: uiserver/prepencryptcommand.cpp:85
+msgid ""
+"PREP_ENCRYPT is an email mode command, connection seems to be in filemanager "
+"mode"
 msgstr ""
 
-#: systrayicon.cpp:190
-msgid "OpenPGP-Sign..."
+#: uiserver/prepencryptcommand.cpp:89
+msgid "SENDER may not be given prior to PREP_ENCRYPT, except with --info"
 msgstr ""
 
-#: systrayicon.cpp:191 mainwindow_desktop.cpp:468
-msgid "Decrypt/Verify..."
+#: uiserver/prepencryptcommand.cpp:141
+#, kde-format
+msgid ""
+"Caught unexpected exception in "
+"PrepEncryptCommand::Private::slotRecipientsResolved: %1"
 msgstr ""
 
-#: systrayicon.cpp:192
-msgid "SmartCard"
+#: uiserver/prepencryptcommand.cpp:145
+msgid ""
+"Caught unknown exception in "
+"PrepEncryptCommand::Private::slotRecipientsResolved"
 msgstr ""
 
-#: systrayicon.cpp:193
-msgid "Update Card Status"
+#: uiserver/prepsigncommand.cpp:84
+msgid "INPUT/OUTPUT/MESSAGE may only be given after PREP_SIGN"
 msgstr ""
 
-#: systrayicon.cpp:194
-msgid "Set NetKey v3 Initial PIN..."
+#: uiserver/prepsigncommand.cpp:88
+msgid ""
+"PREP_SIGN is an email mode command, connection seems to be in filemanager "
+"mode"
 msgstr ""
 
-#: systrayicon.cpp:195
-msgid "Learn NetKey v3 Card Certificates"
+#: uiserver/prepsigncommand.cpp:92
+msgid "No SENDER given"
 msgstr ""
 
-#: conf/smimevalidationconfigurationwidget.cpp:132
-msgid "This option requires dirmngr >= 0.9.0"
+#: uiserver/prepsigncommand.cpp:169
+#, kde-format
+msgid ""
+"Caught unexpected exception in "
+"PrepSignCommand::Private::slotRecipientsResolved: %1"
 msgstr ""
 
-#. i18n: file: conf/smimevalidationconfigurationwidget.ui:221
-#. i18n: ectx: property (text), widget (QLabel, systemHTTPProxy)
-#: conf/smimevalidationconfigurationwidget.cpp:269 rc.cpp:140
-msgid "no proxy"
+#: uiserver/prepsigncommand.cpp:173
+msgid ""
+"Caught unknown exception in PrepSignCommand::Private::slotRecipientsResolved"
 msgstr ""
 
-#: conf/smimevalidationconfigurationwidget.cpp:270
-#, kde-format
-msgid "(Current system setting: %1)"
+#: uiserver/decryptverifycommandfilesbase.cpp:146
+msgid "Can not use SENDER"
 msgstr ""
 
-#: conf/appearanceconfigwidget.cpp:147
-msgctxt "Key filter without user-assigned name"
-msgid "<unnamed>"
+#: uiserver/decryptverifycommandfilesbase.cpp:150
+msgid "Can not use RECIPIENT"
 msgstr ""
 
-#: conf/appearanceconfigwidget.cpp:279
-msgid "This parameter has been locked down by the system administrator."
+#: uiserver/decryptverifycommandfilesbase.cpp:157
+msgid "INPUT present"
 msgstr ""
 
-#: conf/appearanceconfigwidget.cpp:311
-msgid "DN-Attribute Order"
+#: uiserver/decryptverifycommandfilesbase.cpp:159
+msgid "MESSAGE present"
 msgstr ""
 
-#: conf/dirservconfigpage.cpp:171
-msgid "LDAP &timeout (minutes:seconds):"
+#: uiserver/decryptverifycommandfilesbase.cpp:161
+msgid "OUTPUT present"
 msgstr ""
 
-#: conf/dirservconfigpage.cpp:181
-msgid "&Maximum number of items returned by query:"
+#: uiserver/decryptverifycommandfilesbase.cpp:168
+msgid "DECRYPT/VERIFY_FILES cannot use directories as input"
 msgstr ""
 
-#: conf/dirservconfigpage.cpp:191
-msgid "Automatically add &new servers discovered in CRL distribution points"
+#: uiserver/uiserver.cpp:232
+msgid ""
+"Could not determine the GnuPG home directory. Consider setting the GNUPGHOME "
+"environment variable."
 msgstr ""
 
-#: conf/dirservconfigpage.cpp:385
+#: uiserver/uiserver.cpp:242
 #, kde-format
-msgid "Backend error: gpgconf does not seem to know the entry for %1/%2/%3"
+msgid ""
+"Cannot determine the GnuPG home directory: %1 exists but is not a directory."
 msgstr ""
 
-#: conf/dirservconfigpage.cpp:390
+#: uiserver/uiserver.cpp:248
 #, kde-format
-msgid "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5"
+msgid "Could not create GnuPG home directory %1: %2"
 msgstr ""
 
-#: conf/configuredialog.cpp:73
-msgid "Configure"
+#: uiserver/uiserver.cpp:260
+#, kde-format
+msgid "Detected another running gnupg UI server listening at %1."
 msgstr ""
 
-#: utils/input.cpp:94
-msgid "No input device"
+#: uiserver/assuanserverconnection.cpp:194
+msgid "No option name given"
 msgstr ""
 
-#: utils/input.cpp:187
-#, kde-format
-msgid "Could not open FD %1 for reading"
+#: uiserver/assuanserverconnection.cpp:368
+msgid "Parse error"
 msgstr ""
 
-#: utils/input.cpp:216 utils/input.cpp:232
-#, kde-format
-msgid "Could not open file \"%1\" for reading"
+#: uiserver/assuanserverconnection.cpp:377
+msgid "Parse error: numeric session id too large"
 msgstr ""
 
-#: utils/input.cpp:229
-#, kde-format
-msgid "File \"%1\" is already open, but not for reading"
+#: uiserver/assuanserverconnection.cpp:394
+msgid "CAPABILITIES does not take arguments"
 msgstr ""
 
-#: utils/input.cpp:290 utils/output.cpp:438
-msgid "Command not specified"
+#: uiserver/assuanserverconnection.cpp:432
+msgid "Unknown value for WHAT"
 msgstr ""
 
-#: utils/input.cpp:295 utils/output.cpp:444
-#, kde-format
-msgid "Could not start %1 process: %2"
+#: uiserver/assuanserverconnection.cpp:447
+msgid "START_KEYMANAGER does not take arguments"
 msgstr ""
 
-#: utils/input.cpp:300
-#, kde-format
-msgid "Failed to write input to %1 process: %2"
+#: uiserver/assuanserverconnection.cpp:465
+msgid "START_CONFDIALOG does not take arguments"
 msgstr ""
 
-#: utils/input.cpp:311
+#: uiserver/assuanserverconnection.cpp:516
 #, kde-format
-msgctxt "e.g. \"Output of tar xf - file1 ...\""
-msgid "Output of %1 ..."
+msgid "Message #%1"
 msgstr ""
 
-#: utils/input.cpp:313
-#, kde-format
-msgctxt "e.g. \"Output of tar xf - file\""
-msgid "Output of %1"
+#: uiserver/assuanserverconnection.cpp:527
+msgid "Empty file path"
 msgstr ""
 
-#: utils/input.cpp:321
-#, kde-format
-msgid ""
-"Error while running %1:\n"
-"%2"
+#: uiserver/assuanserverconnection.cpp:530
+#: uiserver/assuanserverconnection.cpp:599
+msgid "Only absolute file paths are allowed"
 msgstr ""
 
-#: utils/input.cpp:324 utils/output.cpp:466
-#: crypto/createchecksumscontroller.cpp:554
-#: crypto/verifychecksumscontroller.cpp:557
-#, kde-format
-msgid "Failed to execute %1: %2"
+#: uiserver/assuanserverconnection.cpp:532
+msgid "Only files are allowed in INPUT/OUTPUT FILE"
 msgstr ""
 
-#: utils/input.cpp:347
-msgid "Could not open clipboard for reading"
+#: uiserver/assuanserverconnection.cpp:613
+msgid "unknown exception caught"
 msgstr ""
 
-#: utils/input.cpp:357
-msgid "Clipboard contents"
+#: uiserver/assuanserverconnection.cpp:670
+msgid "Cannot mix --info with non-info SENDER or RECIPIENT"
 msgstr ""
 
-#: utils/input.cpp:359
-msgid "FindBuffer contents"
+#: uiserver/assuanserverconnection.cpp:674
+msgid "Argument is not a valid RFC-2822 mailbox"
 msgstr ""
 
-#: utils/input.cpp:361
-msgid "Current selection"
+#: uiserver/assuanserverconnection.cpp:677
+msgid "Garbage after valid RFC-2822 mailbox detected"
 msgstr ""
 
-#: utils/output.cpp:214
-msgid "No output device"
+#: uiserver/assuanserverconnection.cpp:1111
+#, kde-format
+msgid "Caught unexpected exception: %1"
 msgstr ""
 
-#: utils/output.cpp:319
-#, kde-format
-msgid "Could not open FD %1 for writing"
+#: uiserver/assuanserverconnection.cpp:1115
+msgid ""
+"Caught unknown exception - please report this error to the developers."
 msgstr ""
 
-#: utils/output.cpp:344
+#: uiserver/assuanserverconnection.cpp:1241
 #, kde-format
-msgid "Could not create temporary file for output \"%1\""
+msgid "Can not send \"%1\" status"
 msgstr ""
 
-#: utils/output.cpp:350
-#, kde-format
-msgid ""
-"The file <b>%1</b> already exists.\n"
-"Overwrite?"
+#: uiserver/assuanserverconnection.cpp:1248
+msgid "Can not send data"
 msgstr ""
 
-#: utils/output.cpp:352
-msgid "Overwrite Existing File?"
+#: uiserver/assuanserverconnection.cpp:1251
+msgid "Can not flush data"
 msgstr ""
 
-#: utils/output.cpp:354
-msgid "Overwrite All"
+#: uiserver/assuanserverconnection.cpp:1424
+#: uiserver/assuanserverconnection.cpp:1470 crypto/decryptverifytask.cpp:814
+#: crypto/decryptverifytask.cpp:910 crypto/decryptverifytask.cpp:965
+#: crypto/decryptverifytask.cpp:1063 crypto/decryptverifytask.cpp:1117
+#: crypto/decryptverifytask.cpp:1214 crypto/decryptverifytask.cpp:1262
+#: crypto/decryptverifytask.cpp:1348
+msgid "Caught unknown exception"
 msgstr ""
 
-#: utils/output.cpp:392
-msgid "Overwriting declined"
+#: uiserver/assuanserverconnection.cpp:1491
+msgid "Required --mode option missing"
 msgstr ""
 
-#: utils/output.cpp:398
+#: uiserver/assuanserverconnection.cpp:1498
 #, kde-format
-msgid "Could not remove file \"%1\" for overwriting."
+msgid "invalid mode: \"%1\""
 msgstr ""
 
-#: utils/output.cpp:410
-#, kde-format
-msgid "Could not rename file \"%1\" to \"%2\""
+#: uiserver/assuanserverconnection.cpp:1519
+msgid "Required --protocol option missing"
 msgstr ""
 
-#: utils/output.cpp:453
-#, kde-format
-msgctxt "e.g. \"Input to tar xf - file1 ...\""
-msgid "Input to %1 ..."
+#: uiserver/assuanserverconnection.cpp:1524
+msgid "--protocol is not allowed here"
 msgstr ""
 
-#: utils/output.cpp:455
+#: uiserver/assuanserverconnection.cpp:1531
 #, kde-format
-msgctxt "e.g. \"Input to tar xf - file\""
-msgid "Input to %1"
+msgid "invalid protocol \"%1\""
 msgstr ""
 
-#: utils/output.cpp:463 crypto/createchecksumscontroller.cpp:551
-#: crypto/verifychecksumscontroller.cpp:554
-#, kde-format
-msgid "Error while running %1: %2"
+#: view/tabwidget.cpp:389
+msgid "New Tab"
 msgstr ""
 
-#: utils/output.cpp:482
-msgid "Could not write to clipboard"
+#: view/tabwidget.cpp:389
+msgid "Open a new tab"
 msgstr ""
 
-#: utils/output.cpp:490
-msgid "Find buffer"
+#: view/tabwidget.cpp:390
+msgid "CTRL+SHIFT+N"
 msgstr ""
 
-#: utils/output.cpp:492
-msgid "Selection"
+#: view/tabwidget.cpp:396
+msgid "Rename Tab..."
 msgstr ""
 
-#: utils/output.cpp:504
-msgid "Could not find clipboard"
+#: view/tabwidget.cpp:396
+msgid "Rename this tab"
 msgstr ""
 
-#: utils/hex.cpp:55
-#, kde-format
-msgid "Invalid hex char '%1' in input stream."
+#: view/tabwidget.cpp:397
+msgid "CTRL+SHIFT+R"
 msgstr ""
 
-#: utils/hex.cpp:68 utils/hex.cpp:73
-msgid "Premature end of hex-encoded char in input stream"
+#: view/tabwidget.cpp:398
+msgid "Duplicate Tab"
 msgstr ""
 
-#: utils/log.cpp:161
-#, kde-format
-msgid "Log Error: Could not open log file \"%1\" for writing."
+#: view/tabwidget.cpp:398
+msgid "Duplicate this tab"
 msgstr ""
 
-#: utils/archivedefinition.cpp:107
-#, kde-format
-msgid "Error in archive definition %1: %2"
+#: view/tabwidget.cpp:399
+msgid "CTRL+SHIFT+D"
 msgstr ""
 
-#: utils/archivedefinition.cpp:152
-#, kde-format
-msgid "Cannot use both %f and | in '%1'"
+#: view/tabwidget.cpp:400
+msgid "Close Tab"
 msgstr ""
 
-#: utils/archivedefinition.cpp:160
-#, kde-format
-msgid "Quoting error in '%1' entry"
+#: view/tabwidget.cpp:400
+msgid "Close this tab"
 msgstr ""
 
-#: utils/archivedefinition.cpp:162
-#, kde-format
-msgid "'%1' too complex (would need shell)"
+#: view/tabwidget.cpp:401
+msgid "CTRL+SHIFT+W"
 msgstr ""
 
-#: utils/archivedefinition.cpp:165 utils/archivedefinition.cpp:210
-#: utils/archivedefinition.cpp:222 utils/archivedefinition.cpp:232
-#, kde-format
-msgid "'%1' entry is empty/missing"
+#: view/tabwidget.cpp:402
+msgid "Move Tab Left"
 msgstr ""
 
-#: utils/archivedefinition.cpp:172
-#, kde-format
-msgid "'%1' empty or not found"
+#: view/tabwidget.cpp:403
+msgid "CTRL+SHIFT+LEFT"
 msgstr ""
 
-#: utils/archivedefinition.cpp:265 utils/archivedefinition.cpp:275
-msgid "cannot use argument passing on standard input for unpack-command"
+#: view/tabwidget.cpp:404
+msgid "Move Tab Right"
 msgstr ""
 
-#: utils/archivedefinition.cpp:320
-#, kde-format
-msgid ""
-"Cannot find common base directory for these files:\n"
-"%1"
+#: view/tabwidget.cpp:405
+msgid "CTRL+SHIFT+RIGHT"
 msgstr ""
 
-#: utils/archivedefinition.cpp:373
-#, kde-format
-msgid "Caught unknown exception in group %1"
+#: view/tabwidget.cpp:406
+msgid "Hierarchical Certificate List"
 msgstr ""
 
-#: utils/auditlog.cpp:62
-msgid "No Audit Log available"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:229
+#. i18n: ectx: property (text), widget (QPushButton, expandAllCertificationsPB)
+#: view/tabwidget.cpp:408 rc.cpp:518
+msgid "Expand All"
 msgstr ""
 
-#: utils/auditlog.cpp:64
-#, kde-format
-msgid "Error Retrieving Audit Log: %1"
+#: view/tabwidget.cpp:409
+msgid "CTRL+."
 msgstr ""
 
-#: utils/auditlog.cpp:71
-msgctxt "The Audit Log is a detailed error log from the gnupg backend"
-msgid "Show Audit Log"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:239
+#. i18n: ectx: property (text), widget (QPushButton, collapseAllCertificationsPB)
+#: view/tabwidget.cpp:410 rc.cpp:521
+msgid "Collapse All"
 msgstr ""
 
-#: utils/formatting.cpp:205 utils/formatting.cpp:208
-#, kde-format
-msgid "<tr><th>%1:</th><td>%2</td></tr>"
+#: view/tabwidget.cpp:411
+msgid "CTRL+,"
 msgstr ""
 
-#: utils/formatting.cpp:217
-#, kde-format
-msgid "%1-bit %2 (secret key available)"
+#: view/tabwidget.cpp:536
+msgid "Rename Tab"
 msgstr ""
 
-#: utils/formatting.cpp:219
-#, kde-format
-msgid "%1-bit %2"
+#: view/tabwidget.cpp:536
+msgid "New tab title:"
 msgstr ""
 
-#: utils/formatting.cpp:226
-msgid "Signing EMails and Files (Qualified)"
+#: view/keylistcontroller.cpp:336
+msgid "New Certificate..."
 msgstr ""
 
-#: utils/formatting.cpp:228
-msgid "Signing EMails and Files"
+#: view/keylistcontroller.cpp:338
+msgid "Export Certificates..."
 msgstr ""
 
-#: utils/formatting.cpp:231
-msgid "Encrypting EMails and Files"
+#: view/keylistcontroller.cpp:340
+msgid "Export Certificates to Server..."
 msgstr ""
 
-#: utils/formatting.cpp:233
-msgid "Certifying other Certificates"
+#: view/keylistcontroller.cpp:342
+msgid "Export Secret Keys..."
 msgstr ""
 
-#: utils/formatting.cpp:235
-msgid "Authenticate against Servers"
+#: view/keylistcontroller.cpp:344
+msgid "Lookup Certificates on Server..."
 msgstr ""
 
-#: utils/formatting.cpp:236
-msgid ", "
+#: view/keylistcontroller.cpp:346
+msgid "Import Certificates..."
 msgstr ""
 
-#: utils/formatting.cpp:261
-msgid "This certificate has been revoked."
+#: view/keylistcontroller.cpp:348
+msgid "Decrypt/Verify Files..."
 msgstr ""
 
-#: utils/formatting.cpp:263
-msgid "This certificate has expired."
+#: view/keylistcontroller.cpp:350
+msgid "Sign/Encrypt Files..."
 msgstr ""
 
-#: utils/formatting.cpp:265
-msgid "This certificate has been disabled locally."
+#: view/keylistcontroller.cpp:352
+msgid "Create Checksum Files..."
 msgstr ""
 
-#: utils/formatting.cpp:267
-msgid "This certificate is currently valid."
+#: view/keylistcontroller.cpp:354
+msgid "Verify Checksum Files..."
 msgstr ""
 
-#: utils/formatting.cpp:269
-msgid "The validity of this certificate cannot be checked at the moment."
+#: view/keylistcontroller.cpp:357
+msgid "Redisplay"
 msgstr ""
 
-#: utils/formatting.cpp:276
-msgid "Serial number"
+#: view/keylistcontroller.cpp:359
+msgid "Stop Operation"
 msgstr ""
 
-#: utils/formatting.cpp:278
-msgid "Issuer"
-msgstr "Cyhoeddwr"
-
-#: utils/formatting.cpp:284
-msgid "Subject"
-msgstr "Pwnc"
-
-#: utils/formatting.cpp:285
-msgid "User-ID"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, CertificateDetailsDialog)
+#: view/keylistcontroller.cpp:361 rc.cpp:466
+msgid "Certificate Details"
 msgstr ""
 
-#: utils/formatting.cpp:289
-msgid "a.k.a."
+#: view/keylistcontroller.cpp:364
+msgid "Delete"
 msgstr ""
 
-#: utils/formatting.cpp:292
-msgid "Validity"
+#: view/keylistcontroller.cpp:366
+msgid "Certify Certificate..."
 msgstr ""
 
-#: utils/formatting.cpp:294
-#, kde-format
-msgid "from %1 until forever"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:53
+#. i18n: ectx: property (text), widget (QPushButton, changeExpiryDatePB)
+#: view/keylistcontroller.cpp:368 rc.cpp:481
+msgid "Change Expiry Date..."
 msgstr ""
 
-#: utils/formatting.cpp:295
-#, kde-format
-msgid "from %1 through %2"
+#: view/keylistcontroller.cpp:370
+msgid "Change Owner Trust..."
 msgstr ""
 
-#: utils/formatting.cpp:297
-msgid "Certificate type"
+#: view/keylistcontroller.cpp:372
+msgid "Trust Root Certificate"
 msgstr ""
 
-#: utils/formatting.cpp:299
-msgid "Certificate usage"
+#: view/keylistcontroller.cpp:374
+msgid "Distrust Root Certificate"
 msgstr ""
 
-#: utils/formatting.cpp:303
-msgid "Fingerprint"
-msgstr "Olion Bys"
-
-#: utils/formatting.cpp:306
-msgid "Ownertrust"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:33
+#. i18n: ectx: property (text), widget (QPushButton, changePassphrasePB)
+#: view/keylistcontroller.cpp:376 rc.cpp:475
+msgid "Change Passphrase..."
 msgstr ""
 
-#: utils/formatting.cpp:308
-msgid "Trusted issuer?"
+#: view/keylistcontroller.cpp:378
+msgid "Add User-ID..."
 msgstr ""
 
-#: utils/formatting.cpp:309
-msgid "Yes"
+#: view/keylistcontroller.cpp:380
+msgid "Dump Certificate"
 msgstr ""
 
-#: utils/formatting.cpp:310
-msgid "No"
+#: view/keylistcontroller.cpp:383
+msgid "Refresh X.509 Certificates"
 msgstr ""
 
-#: utils/formatting.cpp:313 utils/formatting.cpp:315
-msgid "Stored"
+#: view/keylistcontroller.cpp:385
+msgid "Refresh OpenPGP Certificates"
 msgstr ""
 
-#: utils/formatting.cpp:313
-#, kde-format
-msgctxt "stored..."
-msgid "on SmartCard with serial no. %1"
+#: view/keylistcontroller.cpp:388
+msgid "Clear CRL Cache"
 msgstr ""
 
-#: utils/formatting.cpp:315
-msgctxt "stored..."
-msgid "on this computer"
+#: view/keylistcontroller.cpp:390
+msgid "Dump CRL Cache"
 msgstr ""
 
-#: utils/formatting.cpp:406
-msgctxt "X.509/CMS encryption standard"
-msgid "X.509"
+#: view/keylistcontroller.cpp:393
+msgid "Import CRL From File..."
 msgstr ""
 
-#: utils/formatting.cpp:408 crypto/gui/resolverecipientspage.cpp:446
-#: crypto/gui/signencryptemailconflictdialog.cpp:580
-msgid "OpenPGP"
+#: view/searchbar.cpp:90
+msgid "&Find:"
 msgstr ""
 
-#: utils/formatting.cpp:409
-msgctxt "Unknown encryption protocol"
-msgid "Unknown"
+#: models/keycache.cpp:956
+msgid "Listing X.509 certificates"
 msgstr ""
 
-#: utils/formatting.cpp:430 utils/formatting.cpp:461
-msgctxt "unknown trust level"
-msgid "unknown"
+#: models/keycache.cpp:957
+msgid "Listing OpenPGP certificates"
 msgstr ""
 
-#: utils/formatting.cpp:431 utils/formatting.cpp:463
-msgid "untrusted"
+#: models/keylistmodel.cpp:250 models/useridlistmodel.cpp:249
+#: newcertificatewizard/newcertificatewizard.cpp:918
+#: dialogs/adduseriddialog.cpp:69
+msgid "Name"
 msgstr ""
 
-#: utils/formatting.cpp:432 utils/formatting.cpp:464
-msgctxt "marginal trust"
-msgid "marginal"
+#: models/keylistmodel.cpp:252
+msgid "E-Mail"
 msgstr ""
 
-#: utils/formatting.cpp:433 utils/formatting.cpp:465
-msgctxt "full trust"
-msgid "full"
+#: models/keylistmodel.cpp:253 models/useridlistmodel.cpp:251
+#: models/subkeylistmodel.cpp:158
+msgid "Valid From"
 msgstr ""
 
-#: utils/formatting.cpp:434 utils/formatting.cpp:466
-msgctxt "ultimate trust"
-msgid "ultimate"
+#: models/keylistmodel.cpp:254 models/useridlistmodel.cpp:252
+#: models/subkeylistmodel.cpp:159
+msgid "Valid Until"
 msgstr ""
 
-#: utils/formatting.cpp:435 utils/formatting.cpp:462
-msgctxt "undefined trust"
-msgid "undefined"
+#. i18n: file: dialogs/selftestdialog.ui:69
+#. i18n: ectx: property (title), widget (QGroupBox, detailsGB)
+#: models/keylistmodel.cpp:255 rc.cpp:548
+msgid "Details"
 msgstr ""
 
-#: utils/formatting.cpp:452
-msgctxt "as in good/valid signature"
-msgid "good"
+#: models/keylistmodel.cpp:256 utils/formatting.cpp:301
+msgid "Key-ID"
 msgstr ""
 
-#: utils/formatting.cpp:476
-#, kde-format
-msgid "class %1"
+#: models/useridlistmodel.cpp:248 models/subkeylistmodel.cpp:156
+msgid "ID"
 msgstr ""
 
-#: utils/formatting.cpp:478
-msgctxt "good/valid signature"
-msgid "good"
+#: models/useridlistmodel.cpp:250
+#: newcertificatewizard/newcertificatewizard.cpp:922
+#: dialogs/adduseriddialog.cpp:73
+msgid "EMail"
 msgstr ""
 
-#: utils/formatting.cpp:484
-msgid "certificate expired"
+#: models/useridlistmodel.cpp:253 models/subkeylistmodel.cpp:160
+#: utils/kleo_kicondialog.cpp:378
+msgid "Status"
 msgstr ""
 
-#: utils/formatting.cpp:485
-msgctxt "fake/invalid signature"
-msgid "bad"
+#: models/useridlistmodel.cpp:304 utils/formatting.cpp:445
+#: utils/formatting.cpp:457
+msgid "revoked"
 msgstr ""
 
-#: utils/formatting.cpp:502
-#, kde-format
-msgctxt "name, email, key id"
-msgid "%1 %2 (%3)"
+#: models/useridlistmodel.cpp:306 utils/formatting.cpp:447
+#: utils/formatting.cpp:483
+msgid "expired"
 msgstr ""
 
-#: utils/formatting.cpp:544
-#, kde-format
-msgid "Bad signature by unknown certificate %1: %2"
+#: models/useridlistmodel.cpp:308 utils/formatting.cpp:449
+msgid "disabled"
 msgstr ""
 
-#: utils/formatting.cpp:546
-#, kde-format
-msgid "Bad signature by an unknown certificate: %1"
+#: models/useridlistmodel.cpp:310 utils/formatting.cpp:451
+#: utils/formatting.cpp:459 utils/formatting.cpp:482
+msgid "invalid"
 msgstr ""
 
-#: utils/formatting.cpp:548
-#, kde-format
-msgid "Bad signature by %1: %2"
+#: models/useridlistmodel.cpp:311
+msgid "good"
 msgstr ""
 
-#: utils/formatting.cpp:553
-#, kde-format
-msgid "Good signature by unknown certificate %1."
+#: models/subkeylistmodel.cpp:157
+msgid "Type"
 msgstr ""
 
-#: utils/formatting.cpp:555
-msgid "Good signature by an unknown certificate."
+#: models/subkeylistmodel.cpp:161
+msgid "Strength"
 msgstr ""
 
-#: utils/formatting.cpp:557
-#, kde-format
-msgid "Good signature by %1."
+#: kwatchgnupg/aboutdata.cpp:40
+msgid "GnuPG log viewer"
 msgstr ""
 
-#: utils/formatting.cpp:562
-#, kde-format
-msgid "Invalid signature by unknown certificate %1: %2"
+#: kwatchgnupg/aboutdata.cpp:50
+msgid "Steffen Hansen"
 msgstr ""
 
-#: utils/formatting.cpp:564
-#, kde-format
-msgid "Invalid signature by an unknown certificate: %1"
+#: kwatchgnupg/aboutdata.cpp:61
+msgid "KWatchGnuPG"
 msgstr ""
 
-#: utils/formatting.cpp:566
-#, kde-format
-msgid "Invalid signature by %1: %2"
+#: kwatchgnupg/aboutdata.cpp:63
+msgid "(c) 2004 Klarälvdalens Datakonsult AB\n"
 msgstr ""
 
-#: utils/formatting.cpp:579
-msgid "This certificate was imported from the following sources:"
+#: kwatchgnupg/kwatchgnupgconfig.cpp:75
+msgid "Configure KWatchGnuPG"
 msgstr ""
 
-#: utils/formatting.cpp:589
-msgid "The import of this certificate was canceled."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:90
+msgid "WatchGnuPG"
 msgstr ""
 
-#: utils/formatting.cpp:591
-#, kde-format
-msgid "An error occurred importing this certificate: %1"
+#: kwatchgnupg/kwatchgnupgconfig.cpp:102
+msgid "&Executable:"
 msgstr ""
 
-#: utils/formatting.cpp:597
-msgid ""
-"This certificate was new to your keystore. The secret key is available."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:111
+msgid "&Socket:"
 msgstr ""
 
-#: utils/formatting.cpp:598
-msgid "This certificate is new to your keystore."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:120
+msgid "None"
 msgstr ""
 
-#: utils/formatting.cpp:602
-msgid "New user-ids were added to this certificate by the import."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:121
+msgid "Basic"
 msgstr ""
 
-#: utils/formatting.cpp:604
-msgid "New signatures were added to this certificate by the import."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:122
+msgid "Advanced"
 msgstr ""
 
-#: utils/formatting.cpp:606
-msgid "New subkeys were added to this certificate by the import."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:123
+msgid "Expert"
 msgstr ""
 
-#: utils/formatting.cpp:609
-msgid ""
-"The import contained no new data for this certificate. It is unchanged."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:124
+msgid "Guru"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:273 utils/kleo_kicondialog.cpp:285
-msgid "Select Icon"
+#: kwatchgnupg/kwatchgnupgconfig.cpp:125
+msgid "Default &log level:"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:306
-msgid "Icon Source"
+#: kwatchgnupg/kwatchgnupgconfig.cpp:133
+msgid "Log Window"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:316
-msgid "S&ystem icons:"
-msgstr ""
+#: kwatchgnupg/kwatchgnupgconfig.cpp:146
+msgctxt "history size spinbox suffix"
+msgid " line"
+msgid_plural " lines"
+msgstr[0] ""
+msgstr[1] ""
 
-#: utils/kleo_kicondialog.cpp:322
-msgid "O&ther icons:"
+#: kwatchgnupg/kwatchgnupgconfig.cpp:147
+msgid "unlimited"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:326
-msgid "&Browse..."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:148
+msgid "&History size:"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:339
-msgid "&Search:"
+#: kwatchgnupg/kwatchgnupgconfig.cpp:152
+msgid "Set &Unlimited"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:346
-msgid "Search interactively for icon names (e.g. folder)."
+#: kwatchgnupg/kwatchgnupgconfig.cpp:159
+msgid "Enable &word wrapping"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:27
-#. i18n: ectx: property (title), widget (QGroupBox, overviewActionsGB)
-#: utils/kleo_kicondialog.cpp:367 rc.cpp:598 qml/kleopatra-mobile.qml:84
-msgid "Actions"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:103
+#, kde-format
+msgid "[%1] Log cleared"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:368
-msgid "Animations"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:110
+msgid "C&lear History"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:369
-msgid "Applications"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:141
+#, kde-format
+msgid "[%1] Log stopped"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:370
-msgid "Categories"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:156
+msgid ""
+"The watchgnupg logging process could not be started.\n"
+"Please install watchgnupg somewhere in your $PATH.\n"
+"This log window is unable to display any useful information."
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:371
-msgid "Devices"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:158
+#, kde-format
+msgid "[%1] Log started"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:372
-msgid "Emblems"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:193
+msgid "There are no components available that support logging."
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:373
-msgid "Emotes"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:199
+msgid ""
+"The watchgnupg logging process died.\n"
+"Do you want to try to restart it?"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:374
-msgid "Filesystems"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:199
+msgid "Try Restart"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:375
-msgid "International"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:199
+msgid "Do Not Try"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:376
-msgid "Mimetypes"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:200
+msgid "====== Restarting logging process ====="
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:377
-msgid "Places"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:203
+msgid ""
+"The watchgnupg logging process is not running.\n"
+"This log window is unable to display any useful information."
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:585
-msgid "Open"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:234
+msgid "Save Log to File"
 msgstr ""
 
-#: utils/kleo_kicondialog.cpp:585
-msgid "Icon Files (*.png *.xpm *.svg *.svgz)"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:239
+#, kde-format
+msgid ""
+"The file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr ""
 
-#: utils/path-helper.cpp:103
-#, kde-format
-msgid "Cannot remove directory %1"
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:242
+msgid "Overwrite File"
 msgstr ""
 
-#: utils/path-helper.cpp:107
+#: kwatchgnupg/kwatchgnupgmainwin.cpp:249
 #, kde-format
-msgid "Cannot remove file %1: %2"
+msgid "Could not save file %1: %2"
 msgstr ""
 
-#: aboutdata.cpp:53
-msgid "Certificate Manager and Unified Crypto GUI"
+#: kwatchgnupg/tray.cpp:57
+msgid "KWatchGnuPG Log Viewer"
 msgstr ""
 
-#: aboutdata.cpp:63
-msgid "Current Maintainer"
-msgstr "Cynhaliwr Cyfredol"
-
-#: aboutdata.cpp:64
-msgid "Former Maintainer"
-msgstr "Cyn-gynhaliwr"
-
-#: aboutdata.cpp:65 kwatchgnupg/aboutdata.cpp:50
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
-
-#: aboutdata.cpp:70
-msgid "David Faure"
+#: conf/appearanceconfigwidget.cpp:147
+msgctxt "Key filter without user-assigned name"
+msgid "<unnamed>"
 msgstr ""
 
-#: aboutdata.cpp:71
-msgid "Backend configuration framework, KIO integration"
+#: conf/appearanceconfigwidget.cpp:279
+msgid "This parameter has been locked down by the system administrator."
 msgstr ""
 
-#: aboutdata.cpp:73
-msgid "Michel Boyer de la Giroday"
+#: conf/appearanceconfigwidget.cpp:311
+msgid "DN-Attribute Order"
 msgstr ""
 
-#: aboutdata.cpp:74
-msgid "Key-state dependent colors and fonts in the certificates list"
+#: conf/dirservconfigpage.cpp:171
+msgid "LDAP &timeout (minutes:seconds):"
 msgstr ""
 
-#: aboutdata.cpp:76
-msgid "Thomas Moenicke"
+#: conf/dirservconfigpage.cpp:181
+msgid "&Maximum number of items returned by query:"
 msgstr ""
 
-#: aboutdata.cpp:77
-msgid "Artwork"
+#: conf/dirservconfigpage.cpp:191
+msgid "Automatically add &new servers discovered in CRL distribution points"
 msgstr ""
 
-#: aboutdata.cpp:79
-msgid "Frank Osterfeld"
+#: conf/dirservconfigpage.cpp:385
+#, kde-format
+msgid "Backend error: gpgconf does not seem to know the entry for %1/%2/%3"
 msgstr ""
 
-#: aboutdata.cpp:80
-msgid "Resident gpgme/win wrangler, UI Server commands and dialogs"
+#: conf/dirservconfigpage.cpp:390
+#, kde-format
+msgid "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5"
 msgstr ""
 
-#: aboutdata.cpp:82
-msgid "Karl-Heinz Zimmer"
+#: conf/smimevalidationconfigurationwidget.cpp:132
+msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#: aboutdata.cpp:83
-msgid "DN display ordering support, infrastructure"
+#. i18n: file: conf/smimevalidationconfigurationwidget.ui:221
+#. i18n: ectx: property (text), widget (QLabel, systemHTTPProxy)
+#: conf/smimevalidationconfigurationwidget.cpp:269 rc.cpp:200
+msgid "no proxy"
 msgstr ""
 
-#: aboutdata.cpp:89
-msgid "Kleopatra"
-msgstr "Kleopatra"
-
-#: aboutdata.cpp:91
-msgid ""
-"(c) 2002 Steffen Hansen, Matthias Kalle Dalheimer, "
-"Klarälvdalens Datakonsult AB\n"
-"(c) 2004, 2007, 2008, 2009 Marc Mutz, Klarälvdalens Datakonsult AB"
+#: conf/smimevalidationconfigurationwidget.cpp:270
+#, kde-format
+msgid "(Current system setting: %1)"
 msgstr ""
 
-#: aboutdata.cpp:105
-msgid ""
-"Gpg4win is an installer package for Windows for EMail and file encryption "
-"using the core component GnuPG for Windows. Both relevant cryptography "
-"standards are supported, OpenPGP and S/MIME. Gpg4win and the software "
-"included with Gpg4win are Free Software."
+#: conf/configuredialog.cpp:73
+msgid "Configure"
 msgstr ""
 
-#: aboutdata.cpp:112
-msgid ""
-"This Free Software product was developed mostly as part of commercial "
-"contracts by the following companies:<ul><li><a "
-"href='http://intevation.net'>Intevation GmbH</a> (Projekt coordination, QA, "
-"Compendium)</li><li><a href='http://www.g10code.com'>g10 Code GmbH</a> "
-"(Crypto Funktionality, GpgOL, GpgEX, GPA)</li> <li><a "
-"href='http://www.kdab.com'>KDAB</a> (Kleopatra)</li></ul>The following "
-"persons have contributed (as of 20100706):"
+#: main.cpp:146
+msgid "Performing Self-Check..."
 msgstr ""
 
-#: aboutdata.cpp:121
-msgid ""
-"Till Adam<br>Marcus Brinkmann<br>Brigitte Hamilton<br>Bernhard "
-"Herzog<br>Werner Koch<br>Colin Leroy<br>Marc Mutz<br>Marcel Newmann<br>Frank "
-"Osterfeld<br>Bernhard Reiter<br>Florian v. Samson<br>Emanuel Schütze<br>Dr. "
-"Jan-Oliver Wagner"
+#: main.cpp:163
+msgctxt "did not pass"
+msgid "Self-Check Failed"
 msgstr ""
 
-#: aboutdata.cpp:145 aboutdata.cpp:152
-msgctxt "Version string is a guess"
-msgid "guessed"
+#: main.cpp:168
+msgid "Self-Check Passed"
 msgstr ""
 
-#: aboutdata.cpp:168
-msgid "Gpg4win"
+#: main.cpp:185
+msgid "Loading certificate cache..."
 msgstr ""
 
-#: crypto/signemailtask.cpp:85 crypto/signencryptfilestask.cpp:173
-msgid "Signing canceled."
+#: main.cpp:192
+msgid "Certificate cache loaded."
 msgstr ""
 
-#: crypto/signemailtask.cpp:88
-#, kde-format
-msgid "Signing failed: %1"
+#: main.cpp:231
+msgctxt "@info"
+msgid ""
+"<para>The version of the <application>GpgME</application> library you are "
+"running against is older than the one that the "
+"<application>GpgME++</application> library was built "
+"against.</para><para><application>Kleopatra</application> will not function "
+"in this setting.</para><para>Please ask your administrator for help in "
+"resolving this issue.</para>"
 msgstr ""
 
-#: crypto/signemailtask.cpp:90 crypto/signencryptfilestask.cpp:177
-msgid "Signing succeeded."
+#: main.cpp:235
+msgctxt "@title"
+msgid "GpgME Too Old"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:84
-msgid "Status and progress of the crypto operations is shown here."
+#: main.cpp:328
+msgid "GPG UI Server Error"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:164
-#: crypto/decryptverifyfilescontroller.cpp:208
-msgid "User canceled"
+#: main.cpp:329
+#, kde-format
+msgid ""
+"<qt>The Kleopatra GPG UI Server Module could not be initialized.<br/>The "
+"error given was: <b>%1</b><br/>You can use Kleopatra as a certificate "
+"manager, but cryptographic plugins that rely on a GPG UI Server being "
+"present might not work correctly, or at all.</qt>"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:252
-msgid "Decrypt/Verify E-Mail"
+#: selftest/gpgconfcheck.cpp:61
+#, kde-format
+msgctxt "@title"
+msgid "%1 Configuration Check"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:274
-msgid "At least one input needs to be provided"
+#: selftest/gpgconfcheck.cpp:115
+msgid "The process terminated prematurely"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:278
-msgid "Informative sender/signed data count mismatch"
+#: selftest/gpgconfcheck.cpp:120
+msgctxt "self-test did not pass"
+msgid "Failed"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:283
-msgid "Signature/signed data count mismatch"
+#: selftest/gpgconfcheck.cpp:122
+#, kde-format
+msgid ""
+"There was an error executing the GnuPG configuration self-check for %2:\n"
+"  %1\n"
+"You might want to execute \"gpgconf %3\" on the command line.\n"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:286
-msgid "Signed data can only be given for detached signature verification"
+#: selftest/gpgconfcheck.cpp:127
+msgid "Diagnostics:"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:292
-msgid "Input/Output count mismatch"
+#: selftest/gpgconfcheck.cpp:132
+msgctxt "self-check did not pass"
+msgid "Failed"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:295
-msgid "Cannot use output and signed data simultaneously"
+#: selftest/gpgconfcheck.cpp:135
+#, kde-format
+msgctxt "Self-test did not pass"
+msgid ""
+"The GnuPG configuration self-check failed.\n"
+"\n"
+"Error code: %1\n"
+"Diagnostics:"
 msgstr ""
 
-#: crypto/decryptverifyemailcontroller.cpp:302
+#: selftest/gpgconfcheck.cpp:140
 #, kde-format
-msgid "No backend support for %1"
+msgctxt "self-check did not pass"
+msgid ""
+"The GnuPG configuration self-check failed with error code %1.\n"
+"No output was received."
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:180
-msgid "Error: Signature not verified"
+#: selftest/registrycheck.cpp:60
+msgctxt "@title"
+msgid "Windows Registry"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:182
-msgid "Good signature"
+#: selftest/registrycheck.cpp:72
+msgid "Obsolete registry entries found"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:184
-msgid "Bad signature"
-msgstr ""
-
-#: crypto/decryptverifytask.cpp:186
-msgid "Signing certificate revoked"
+#: selftest/registrycheck.cpp:76
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>Kleopatra detected an obsolete registry key (<resource>%1\\"
+"%2</resource>), added by either a previous "
+"<application>Gpg4win</application> version or applications such as "
+"<application>WinPT</application> or "
+"<application>EnigMail</application>.</para><para>Keeping the entry might "
+"lead to an old GnuPG backend being used.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:188
-msgid "Signing certificate expired"
+#: selftest/registrycheck.cpp:82
+#, kde-format
+msgctxt "@info"
+msgid "<para>Delete registry key <resource>%1\\%2</resource>.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:190
-msgid "No public certificate to verify the signature"
+#: selftest/registrycheck.cpp:102
+#, kde-format
+msgctxt "@info"
+msgid "Could not delete the registry key <resource>%1\\%2</resource>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:192
-msgid "Signature expired"
+#: selftest/registrycheck.cpp:104
+msgctxt "@title"
+msgid "Error Deleting Registry Key"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:194
-msgid "Certificate missing"
+#: selftest/gpgagentcheck.cpp:64
+msgctxt "@title"
+msgid "Gpg-Agent Connectivity"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:196
-msgid "CRL missing"
+#: selftest/gpgagentcheck.cpp:74
+msgid "GpgME library too old"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:198
-msgid "CRL too old"
+#: selftest/gpgagentcheck.cpp:76
+msgctxt "@info"
+msgid ""
+"Either the GpgME library itself is too old, or the GpgME++ library was "
+"compiled against an older GpgME that did not support connecting to gpg-agent."
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:200
-msgid "Bad policy"
+#: selftest/gpgagentcheck.cpp:80
+msgctxt "@info"
+msgid ""
+"Upgrade to <application>gpgme</application> 1.2.0 or higher, and ensure that "
+"gpgme++ was compiled against it."
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:202
-msgid "System error"
+#: selftest/gpgagentcheck.cpp:87
+msgid "GpgME does not support gpg-agent"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:211
+#: selftest/gpgagentcheck.cpp:89
+#, kde-format
+msgctxt "@info"
 msgid ""
-"The signature is valid but the trust in the certificate's validity is only "
-"marginal."
+"<para>The <application>GpgME</application> library is new enough to support "
+"<application>gpg-agent</application>, but does not seem to do so in this "
+"installation.</para><para>The error returned was: "
+"<message>%1</message>.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:213
-msgid ""
-"The signature is valid and the certificate's validity is fully trusted."
+#: selftest/gpgagentcheck.cpp:102 selftest/uiservercheck.cpp:79
+msgid "not reachable"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:215
-msgid ""
-"The signature is valid and the certificate's validity is ultimately trusted."
+#: selftest/gpgagentcheck.cpp:104
+#, kde-format
+msgctxt "@info"
+msgid "Could not connect to GpgAgent: <message>%1</message>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:217
+#: selftest/gpgagentcheck.cpp:107
+msgctxt "@info"
 msgid ""
-"The signature is valid but the certificate's validity is <em>not "
-"trusted</em>."
+"<para>Check that gpg-agent is running and that the "
+"<environment>GPG_AGENT_INFO</environment> variable is set and up-to-"
+"date.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:219
-msgid "The signature is valid but the certificate's validity is unknown."
+#: selftest/gpgagentcheck.cpp:111
+msgid "unexpected error"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:222
-msgid "The signature is valid but the certificate's validity is undefined."
+#: selftest/gpgagentcheck.cpp:113
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>Unexpected error while asking <application>gpg-agent</application> for "
+"its version.</para><para>The error returned was: "
+"<message>%1</message>.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:238 crypto/decryptverifytask.cpp:244
-msgid "Unknown certificate"
+#: selftest/enginecheck.cpp:71
+msgctxt "@title"
+msgid "GPG (OpenPGP Backend) installation"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:263
-#, kde-format
-msgid "Signed on %1 with unknown certificate %2."
+#: selftest/enginecheck.cpp:72
+msgctxt "@title"
+msgid "GpgSM (S/MIME Backend) installation"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:265
-#, kde-format
-msgid "Signed with unknown certificate %1."
+#: selftest/enginecheck.cpp:73
+msgctxt "@title"
+msgid "GpgConf (Configuration) installation"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:270
+#: selftest/enginecheck.cpp:98
 #, kde-format
-msgctxt "date, key owner, key ID"
-msgid "Signed on %1 by %2 (Key ID: %3)."
+msgctxt "@info"
+msgid ""
+"<para>A problem was detected with the <application>%1</application> "
+"backend.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:275
-#, kde-format
-msgid "Signed by %1 with certificate %2."
+#: selftest/enginecheck.cpp:103
+msgid "not supported"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:278
-#, kde-format
-msgid "Signed on %1 with certificate %2."
+#: selftest/enginecheck.cpp:105
+msgctxt "@info"
+msgid ""
+"<para>It seems that the <icode>gpgme</icode> library was compiled without "
+"support for this backend.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:279
+#: selftest/enginecheck.cpp:108
 #, kde-format
-msgid "Signed with certificate %1."
+msgctxt "@info"
+msgid ""
+"<para>Replace the <icode>gpgme</icode> library with a version compiled with "
+"<application>%1</application> support.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:290 crypto/signencryptfilestask.cpp:74
-#, kde-format
-msgctxt "Input file --> Output file (rarr is arrow"
-msgid "%1 &rarr; %2"
+#: selftest/enginecheck.cpp:112
+msgid "not properly installed"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:360
-msgid "<b>Verification canceled.</b>"
+#: selftest/enginecheck.cpp:114
+#, kde-format
+msgctxt "@info"
+msgid "<para>Backend <command>%1</command> is not installed properly.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:362
+#: selftest/enginecheck.cpp:116
 #, kde-format
-msgid "<b>Verification failed: %1.</b>"
+msgctxt "@info"
+msgid ""
+"<para>Please check the output of <command>%1 --version</command> "
+"manually.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:368
-msgid "<b>No signatures found.</b>"
+#: selftest/enginecheck.cpp:119
+msgid "too old"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:372
-#, kde-format
-msgid "<b>Invalid signature.</b>"
-msgid_plural "<b>%1 invalid signatures.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: crypto/decryptverifytask.cpp:376
+#: selftest/enginecheck.cpp:121
 #, kde-format
-msgid "<b>Not enough information to check signature validity.</b>"
-msgid_plural "<b>%1 signatures could not be verified.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: crypto/decryptverifytask.cpp:383
-msgid "<b>Signature is valid.</b>"
+msgctxt "@info"
+msgid ""
+"<para>Backend <command>%1</command> is installed in version %2, but at least "
+"version %3 is required.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:384
+#: selftest/enginecheck.cpp:127 selftest/enginecheck.cpp:203
 #, kde-format
-msgid "<b>Signed by %1</b>"
+msgctxt "@info"
+msgid ""
+"<para>Install <application>%1</application> version %2 or higher.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:387
-msgid "certificate"
+#: selftest/enginecheck.cpp:130
+msgid "unknown problem"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:386
+#: selftest/enginecheck.cpp:132
 #, kde-format
+msgctxt "@info"
 msgid ""
-"<br/><b>Warning:</b> The sender's mail address is not stored in the %1 used "
-"for signing."
+"<para>Make sure <application>%1</application> is installed and in "
+"<envar>PATH</envar>.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:390
+#: selftest/enginecheck.cpp:200
 #, kde-format
-msgid "<b>Valid signature.</b>"
-msgid_plural "<b>%1 valid signatures.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: crypto/decryptverifytask.cpp:392
+msgctxt "@info"
 msgid ""
-"<br/><b>Warning:</b> The sender's mail address is not stored in the "
-"certificates used for signing."
-msgstr ""
-
-#: crypto/decryptverifytask.cpp:403
-msgid "<b>Decryption canceled.</b>"
+"<para><application>%1</application> v%2.%3.%4 is required for this test, but "
+"only %5 is installed.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:405 crypto/decryptverifytask.cpp:407
+#: selftest/enginecheck.cpp:208
 #, kde-format
-msgid "<b>Decryption failed: %1.</b>"
+msgctxt "@info"
+msgid ""
+"<para><application>%1</application> is required for this test, but does not "
+"seem available.</para><para>See tests further up for more information.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:408
-msgid "<b>Decryption succeeded.</b>"
+#: selftest/enginecheck.cpp:212
+#, kde-format
+msgctxt "@info %1: test name"
+msgid "<para>See \"%1\" above.</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:423
-msgid "The signature is bad."
+#: selftest/libkleopatrarccheck.cpp:61
+msgctxt "@title"
+msgid "Config File 'libkleopatrarc'"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:425
-msgid "The validity of the signature cannot be verified."
+#: selftest/libkleopatrarccheck.cpp:75
+msgid "Errors found"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:426
+#: selftest/libkleopatrarccheck.cpp:79
 #, kde-format
-msgid "The signature is invalid: %1"
+msgctxt "@info"
+msgid ""
+"<para>Kleopatra detected the following errors in the libkleopatrarc "
+"configuration:</para>%1"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:438 crypto/decryptverifytask.cpp:455
-#: crypto/signencryptfilestask.cpp:223 crypto/signencryptfilestask.cpp:235
-#, kde-format
-msgid "Input error: %1"
+#: selftest/uiservercheck.cpp:61
+msgctxt "@title"
+msgid "UiServer Connectivity"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:448
-msgctxt "separator for a list of e-mail addresses"
-msgid ", "
+#: selftest/uiservercheck.cpp:81
+#, kde-format
+msgctxt "@info"
+msgid "Could not connect to UiServer: <message>%1</message>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:448
-#, kde-format
+#: selftest/uiservercheck.cpp:84
+msgctxt "@info"
 msgid ""
-"<p>The sender's address %1 is not stored in the certificate. Stored: %2</p>"
+"<para>Check that your firewall is not set to block local connections (allow "
+"connections to <resource>localhost</resource> or "
+"<resource>127.0.0.1</resource>).</para>"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:461
-#, kde-format
-msgid "One unknown recipient."
-msgid_plural "%1 unknown recipients."
-msgstr[0] ""
-msgstr[1] ""
-
-#: crypto/decryptverifytask.cpp:465
-msgid "Recipient:"
-msgid_plural "Recipients:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: crypto/decryptverifytask.cpp:473
-#, kde-format
-msgid "One unknown recipient"
-msgid_plural "%1 unknown recipients"
-msgstr[0] ""
-msgstr[1] ""
-
-#: crypto/decryptverifytask.cpp:689
-#, kde-format
-msgctxt "label: result example: foo.sig: Verification failed. "
-msgid "%1: %2"
+#: selftest/uiservercheck.cpp:88
+msgid "multiple instances"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:811 crypto/decryptverifytask.cpp:908
-#: crypto/decryptverifytask.cpp:962 crypto/decryptverifytask.cpp:1061
-#: crypto/decryptverifytask.cpp:1114 crypto/decryptverifytask.cpp:1212
-#: crypto/decryptverifytask.cpp:1260 crypto/decryptverifytask.cpp:1346
+#: selftest/uiservercheck.cpp:90
 #, kde-format
-msgid "Caught exception: %1"
+msgctxt "@info"
+msgid ""
+"It seems another <application>Kleopatra</application> is running (with "
+"process-id %1)"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:863
+#: selftest/uiservercheck.cpp:93
+msgctxt "@info"
 msgid ""
-"Could not determine whether this is an S/MIME or an OpenPGP "
-"signature/ciphertext - maybe it is neither ciphertext nor a signature?"
+"Quit any other running instances of <application>Kleopatra</application>."
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:869 crypto/decryptverifytask.cpp:1020
-#, kde-format
-msgid "Decrypting: %1..."
+#: newcertificatewizard/newcertificatewizard.cpp:260
+msgid "new email"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:1014
-msgid ""
-"Could not determine whether this was S/MIME- or OpenPGP-encrypted - maybe it "
-"is not ciphertext at all?"
+#: newcertificatewizard/newcertificatewizard.cpp:261
+msgid "new dns name"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:1166 crypto/decryptverifytask.cpp:1300
-msgid ""
-"Could not determine whether this is an S/MIME or an OpenPGP signature - "
-"maybe it is not a signature at all?"
+#: newcertificatewizard/newcertificatewizard.cpp:262
+msgid "new uri"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:1172
-#, kde-format
-msgid "Verifying: %1..."
+#: newcertificatewizard/newcertificatewizard.cpp:511
+msgctxt "@action"
+msgid "Create Key"
 msgstr ""
 
-#: crypto/decryptverifytask.cpp:1311
+#: newcertificatewizard/newcertificatewizard.cpp:562
 #, kde-format
-msgid "Verifying signature: %1..."
+msgid "Could not start certificate creation: %1"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:84
-msgctxt "@info"
-msgid "No checksum files have been created."
+#: newcertificatewizard/newcertificatewizard.cpp:575
+msgid "Operation canceled."
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:85
-msgctxt "@info"
-msgid "These checksum files have been successfully created:"
+#: newcertificatewizard/newcertificatewizard.cpp:576
+#, kde-format
+msgid "Could not create certificate: %1"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:88
-msgctxt "@info"
-msgid "There were no errors."
+#: newcertificatewizard/newcertificatewizard.cpp:583
+#, kde-format
+msgid ""
+"Certificate created successfully.\n"
+"Fingerprint: %1"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:89
-msgctxt "@info"
-msgid "The following errors were encountered:"
+#: newcertificatewizard/newcertificatewizard.cpp:589
+#, kde-format
+msgid "Could not write output file %1: %2"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:280
-msgid ""
-"Create Checksums: input files must be either all checksum files or all files "
-"to be checksummed, not a mixture of both."
+#: newcertificatewizard/newcertificatewizard.cpp:597
+msgid "Certificate created successfully."
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:302
-msgid "Initializing..."
+#: newcertificatewizard/newcertificatewizard.cpp:636
+msgctxt "@title"
+msgid "Key Creation Failed"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:302 mainwindow_desktop.cpp:480
-msgid "Cancel"
+#: newcertificatewizard/newcertificatewizard.cpp:637
+msgid ""
+"Key pair creation failed. Please find details about the failure below."
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:306
-msgctxt "@title:window"
-msgid "Create Checksum Progress"
+#: newcertificatewizard/newcertificatewizard.cpp:639
+msgctxt "@title"
+msgid "Key Pair Successfully Created"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:535
-#, kde-format
-msgid "Failed to open file \"%1\" for reading and writing: %2"
+#: newcertificatewizard/newcertificatewizard.cpp:640
+msgid ""
+"Your new key pair was created successfully. Please find details on the "
+"result and some suggested next steps below."
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:558
-#: commands/changeroottrustcommand.cpp:318
-#, kde-format
-msgid "Failed to move file %1 to its final destination, %2: %3"
+#: newcertificatewizard/newcertificatewizard.cpp:701
+msgctxt "@title"
+msgid "Save Request"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:585
-msgid "No checksum programs defined."
+#: newcertificatewizard/newcertificatewizard.cpp:702
+msgid "PKCS#10 Requests (*.p10)"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:597
-#: crypto/verifychecksumscontroller.cpp:590
-msgid "Scanning directories..."
+#: newcertificatewizard/newcertificatewizard.cpp:711
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Could not copy temporary file <filename>%1</filename> to file "
+"<filename>%2</filename>: <message>%3</message>"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:612
-#: crypto/verifychecksumscontroller.cpp:603
-msgid "Calculating total size..."
+#: newcertificatewizard/newcertificatewizard.cpp:714
+msgctxt "@title"
+msgid "Error Saving Request"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:629
+#: newcertificatewizard/newcertificatewizard.cpp:718
 #, kde-format
-msgid "Checksumming (%2) in %1"
+msgctxt "@info"
+msgid ""
+"<para>Successfully wrote request to <filename>%1</filename>.</para><para>You "
+"should now send the request to the Certification Authority (CA).</para>"
 msgstr ""
 
-#: crypto/createchecksumscontroller.cpp:640
-#: crypto/verifychecksumscontroller.cpp:631
-msgid "Done."
-msgstr "Wedi'i wneud."
-
-#: crypto/signemailcontroller.cpp:180
-#: crypto/signencryptfilescontroller.cpp:278
-#: crypto/encryptemailcontroller.cpp:169
-#: crypto/newsignencryptemailcontroller.cpp:382
-msgid "User cancel"
+#: newcertificatewizard/newcertificatewizard.cpp:721
+msgctxt "@title"
+msgid "Request Saved"
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:144
-msgid "Archive and Sign Files"
+#: newcertificatewizard/newcertificatewizard.cpp:729
+msgid "Please process this certificate."
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:146
-#: crypto/gui/signencryptfileswizard.cpp:132
-msgid "Sign Files"
+#: newcertificatewizard/newcertificatewizard.cpp:730
+msgid ""
+"Please process this certificate and inform the sender about the location to "
+"fetch the resulting certificate.\n"
+"\n"
+"Thanks,\n"
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:151
-msgid "Archive and Encrypt Files"
+#: newcertificatewizard/newcertificatewizard.cpp:754
+msgid "My new OpenPGP certificate"
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:153
-#: crypto/gui/signencryptfileswizard.cpp:133
-msgid "Encrypt Files"
+#: newcertificatewizard/newcertificatewizard.cpp:755
+msgid "Please find attached my new OpenPGP certificate."
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:157
-msgid "Archive and Sign/Encrypt Files"
+#: newcertificatewizard/newcertificatewizard.cpp:786
+msgctxt "@info"
+msgid ""
+"<para><application>Kleopatra</application> tried to send a mail via your "
+"default mail client.</para><para>Some mail clients are known not to support "
+"attachments when invoked this way.</para><para>If your mail client does not "
+"have an attachment, then drag the <application>Kleopatra</application> icon "
+"and drop it on the message compose window of your mail "
+"client.</para><para>If that does not work, either, save the request to a "
+"file, and then attach that.</para>"
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:159
-#: crypto/gui/signencryptfileswizard.cpp:131
-msgid "Sign/Encrypt Files"
+#: newcertificatewizard/newcertificatewizard.cpp:790
+msgctxt "@title"
+msgid "Sending Mail"
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:477
-#, kde-format
+#: newcertificatewizard/newcertificatewizard.cpp:826
+msgctxt "@info"
 msgid ""
-"Caught unexpected exception in "
-"SignEncryptFilesController::Private::slotWizardOperationPrepared: %1"
+"This operation will delete the certification request. Please make sure that "
+"you have sent or saved it before proceeding."
 msgstr ""
 
-#: crypto/signencryptfilescontroller.cpp:481
-msgid ""
-"Caught unknown exception in "
-"SignEncryptFilesController::Private::slotWizardOperationPrepared"
+#: newcertificatewizard/newcertificatewizard.cpp:828
+msgctxt "@title"
+msgid "Certification Request About To Be Deleted"
 msgstr ""
 
-#: crypto/encryptemailtask.cpp:85 crypto/signencryptfilestask.cpp:186
-msgid "Encryption canceled."
+#: newcertificatewizard/newcertificatewizard.cpp:859
+msgctxt "@title"
+msgid "Certificate Creation Wizard"
 msgstr ""
 
-#: crypto/encryptemailtask.cpp:88
-#, kde-format
-msgid "Encryption failed: %1"
+#: newcertificatewizard/newcertificatewizard.cpp:920
+#: dialogs/adduseriddialog.cpp:71
+msgid "Comment"
 msgstr ""
 
-#: crypto/encryptemailtask.cpp:90 crypto/signencryptfilestask.cpp:191
-msgid "Encryption succeeded."
+#: newcertificatewizard/newcertificatewizard.cpp:935
+#: dialogs/adduseriddialog.cpp:86
+#, kde-format
+msgctxt "Format string for the labels in the \"Your Personal Data\" page"
+msgid "%1 (%2)"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:134
-msgctxt "@title:window"
-msgid "Selected Files"
+#: newcertificatewizard/newcertificatewizard.cpp:1022
+#: dialogs/adduseriddialog.cpp:114
+#, kde-format
+msgctxt "interpunctation for labels"
+msgid "%1:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:213
-msgid "No files selected."
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:26
+#. i18n: ectx: property (text), widget (QLabel, nameRequiredLB)
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:43
+#. i18n: ectx: property (text), widget (QLabel, emailRequiredLB)
+#: newcertificatewizard/newcertificatewizard.cpp:1024
+#: dialogs/adduseriddialog.cpp:116 rc.cpp:430 rc.cpp:436
+msgid "(required)"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:214
-msgid "Selected file:"
-msgid_plural "Selected files:"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:60
+#. i18n: ectx: property (text), widget (QLabel, commentRequiredLB)
+#: newcertificatewizard/newcertificatewizard.cpp:1024
+#: dialogs/adduseriddialog.cpp:116 rc.cpp:442
+msgid "(optional)"
+msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:217
-msgctxt "@action"
-msgid "More..."
+#: newcertificatewizard/newcertificatewizard.cpp:1180
+#: dialogs/adduseriddialog.cpp:280
+#, kde-format
+msgctxt "@info"
+msgid "<interface>%1</interface> is required, but empty."
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:347
-msgid "Archive files with:"
+#: newcertificatewizard/newcertificatewizard.cpp:1182
+#: dialogs/adduseriddialog.cpp:282
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<interface>%1</interface> is required, but empty.<nl/>Local Admin rule: "
+"<icode>%2</icode>"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:349
-msgid "Archive name (OpenPGP):"
+#: newcertificatewizard/newcertificatewizard.cpp:1188
+#: dialogs/adduseriddialog.cpp:288
+#, kde-format
+msgctxt "@info"
+msgid "<interface>%1</interface> is incomplete."
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:351
-msgid "Archive name (S/MIME):"
+#: newcertificatewizard/newcertificatewizard.cpp:1190
+#: dialogs/adduseriddialog.cpp:290
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<interface>%1</interface> is incomplete.<nl/>Local Admin rule: "
+"<icode>%2</icode>"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:353
-msgid "Sign and Encrypt (OpenPGP only)"
+#: newcertificatewizard/newcertificatewizard.cpp:1195
+#: dialogs/adduseriddialog.cpp:295
+#, kde-format
+msgctxt "@info"
+msgid "<interface>%1</interface> is invalid."
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:354
-#: newcertificatewizard/newcertificatewizard.cpp:1236
-#: newcertificatewizard/newcertificatewizard.cpp:1260
-msgid "Encrypt"
+#: newcertificatewizard/newcertificatewizard.cpp:1197
+#: dialogs/adduseriddialog.cpp:297
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<interface>%1</interface> is invalid.<nl/>Local Admin rule: <icode>%2</icode>"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:355
 #: newcertificatewizard/newcertificatewizard.cpp:1234
+#: crypto/gui/newsignencryptfileswizard.cpp:355
 msgid "Sign"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:356
-#: crypto/gui/signerresolvepage.cpp:303
-msgid "Text output (ASCII armor)"
+#: newcertificatewizard/newcertificatewizard.cpp:1236
+#: newcertificatewizard/newcertificatewizard.cpp:1260
+#: crypto/gui/newsignencryptfileswizard.cpp:354
+msgid "Encrypt"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:357
-#: crypto/gui/signerresolvepage.cpp:306
-msgid "Remove unencrypted original file when done"
+#: newcertificatewizard/newcertificatewizard.cpp:1239
+#: dialogs/certifycertificatedialog.cpp:186
+msgid "Certify"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:365
-msgctxt "@title"
-msgid "What do you want to do?"
+#: newcertificatewizard/newcertificatewizard.cpp:1241
+msgid "Authenticate"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:367
-msgctxt "@title"
-msgid "Please select here whether you want to sign or encrypt files."
+#: newcertificatewizard/newcertificatewizard.cpp:1291
+msgid "Name:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:469
-msgctxt "base name of an archive file, e.g. archive.zip or archive.tar.gz"
-msgid "archive"
+#: newcertificatewizard/newcertificatewizard.cpp:1292
+msgid "Email Address:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:523
-msgctxt "@info"
-msgid ""
-"<para>Archiving in combination with sign-only currently requires what are "
-"known as opaque signatures - unlike detached ones, these embed the content "
-"in the signature.</para><para>This format is rather unusual. You might want "
-"to archive the files separately, and then sign the archive as one file with "
-"Kleopatra.</para><para>Future versions of Kleopatra are expected to also "
-"support detached signatures in this case.</para>"
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:50
+#. i18n: ectx: property (text), widget (QLabel, commentLB)
+#: newcertificatewizard/newcertificatewizard.cpp:1295 rc.cpp:439
+msgid "Comment:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:528
-msgctxt "@title:window"
-msgid "Unusual Signature Warning"
+#: newcertificatewizard/newcertificatewizard.cpp:1297
+msgid "Subject-DN:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:588
-msgid "This operation is not available for S/MIME"
+#: newcertificatewizard/newcertificatewizard.cpp:1300
+msgid "Key Type:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:615
-msgid "Add"
+#: newcertificatewizard/newcertificatewizard.cpp:1302
+#: newcertificatewizard/newcertificatewizard.cpp:1304
+msgid "Key Strength:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:616
-msgid "Remove"
-msgstr ""
+#: newcertificatewizard/newcertificatewizard.cpp:1302
+#: newcertificatewizard/newcertificatewizard.cpp:1309
+#, kde-format
+msgid "1 bit"
+msgid_plural "%1 bits"
+msgstr[0] ""
+msgstr[1] ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:619
-msgctxt "@title"
-msgid "For whom do you want to encrypt?"
+#: newcertificatewizard/newcertificatewizard.cpp:1304
+#: newcertificatewizard/newcertificatewizard.cpp:1311
+msgid "default"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:621
-msgctxt "@title"
-msgid ""
-"Please select for whom you want the files to be encrypted. Do not forget to "
-"pick one of your own certificates."
+#: newcertificatewizard/newcertificatewizard.cpp:1305
+msgid "Certificate Usage:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:624
-msgctxt "@action"
-msgid "Encrypt"
+#: newcertificatewizard/newcertificatewizard.cpp:1305
+#: newcertificatewizard/newcertificatewizard.cpp:1312
+msgctxt "separator for key usages"
+msgid ",&nbsp;"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:718
-msgctxt "@info"
-msgid ""
-"<para>None of the recipients you are encrypting to seems to be your "
-"own.</para><para>This means that you will not be able to decrypt the data "
-"anymore, once encrypted.</para><para>Do you want to continue, or cancel to "
-"change the recipient selection?</para>"
+#: newcertificatewizard/newcertificatewizard.cpp:1307
+msgid "Subkey Type:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:721
-#: crypto/gui/newsignencryptfileswizard.cpp:732
-msgctxt "@title:window"
-msgid "Encrypt-To-Self Warning"
+#: newcertificatewizard/newcertificatewizard.cpp:1309
+#: newcertificatewizard/newcertificatewizard.cpp:1311
+msgid "Subkey Strength:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:730
-msgctxt "@info"
-msgid ""
-"<para>You have requested the unencrypted data to be removed after "
-"encryption.</para><para>Are you really sure you do not need to access the "
-"data anymore in decrypted form?</para>"
+#: newcertificatewizard/newcertificatewizard.cpp:1312
+msgid "Subkey Usage:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:781
-msgid "Sign with OpenPGP"
+#: newcertificatewizard/newcertificatewizard.cpp:1316
+msgid "Valid Until:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:782
-msgid "Sign with S/MIME"
+#: newcertificatewizard/newcertificatewizard.cpp:1319
+msgid "Add. Email Address:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:785
-msgctxt "@title"
-msgid "Who do you want to sign as?"
+#: newcertificatewizard/newcertificatewizard.cpp:1321
+msgid "DNS Name:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:787
-msgctxt "@title"
-msgid "Please choose an identity with which to sign the data."
+#: newcertificatewizard/newcertificatewizard.cpp:1323
+msgid "URI:"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:863
-msgctxt "@action"
-msgid "Sign"
-msgstr ""
+#: newcertificatewizard/newcertificatewizard.cpp:1381
+#, kde-format
+msgctxt "%2: some admin-supplied text, %1: key size in bits"
+msgid "%2 (1 bit; default)"
+msgid_plural "%2 (%1 bits; default)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:879
-msgctxt "@action"
-msgid "Sign && Encrypt"
-msgstr ""
+#: newcertificatewizard/newcertificatewizard.cpp:1382
+#, kde-format
+msgctxt "%2: some admin-supplied text, %1: key size in bits"
+msgid "%2 (1 bit)"
+msgid_plural "%2 (%1 bits)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:922
-msgctxt "@title"
-msgid "Results"
+#: newcertificatewizard/newcertificatewizard.cpp:1384
+#, kde-format
+msgctxt "%1: key size in bits"
+msgid "1 bit (default)"
+msgid_plural "%1 bits (default)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: newcertificatewizard/newcertificatewizard.cpp:1385
+#, kde-format
+msgctxt "%1: key size in bits"
+msgid "1 bit"
+msgid_plural "%1 bits"
+msgstr[0] ""
+msgstr[1] ""
+
+#. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:192
+#. i18n: ectx: attribute (title), widget (QWidget, personalTab)
+#: newcertificatewizard/newcertificatewizard.cpp:1445 rc.cpp:406
+msgid "Personal Details"
 msgstr ""
 
-#: crypto/gui/newsignencryptfileswizard.cpp:924
-msgctxt "@title"
-msgid "Status and progress of the crypto operations is shown here."
+#: newcertificatewizard/newcertificatewizard.cpp:1449
+msgctxt "@info:tooltip"
+msgid "Adding more than one User ID is not yet implemented."
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:84
-msgid ""
-"You need to select an OpenPGP signing certificate to perform this operation."
+#: kleopatraapplication.cpp:93
+msgid "Run UI server only, hide main window"
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:87
-msgid "You need to select at least one signing certificate to proceed."
+#: kleopatraapplication.cpp:94
+msgid "Use OpenPGP for the following operation"
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:90
-msgid ""
-"Only OpenPGP certificates will be offered for selection because you "
-"specified a combined sign/encrypt operation that is only available for "
-"OpenPGP."
+#: kleopatraapplication.cpp:95
+msgid "Use CMS (X.509, S/MIME) for the following operation"
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:93
-msgid ""
-"Only OpenPGP certificates will be offered for selection because you only "
-"specified an OpenPGP signing certificate."
+#: kleopatraapplication.cpp:96
+msgid "Import certificate file(s)"
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:96
-msgid ""
-"Only S/MIME certificates will be offered for selection because you only "
-"specified an S/MIME signing certificate."
+#: kleopatraapplication.cpp:97
+msgid "Encrypt file(s)"
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:102
-msgid ""
-"You have selected both OpenPGP and S/MIME signing certificate types, thus "
-"two signatures will be created."
+#: kleopatraapplication.cpp:98
+msgid "Sign file(s)"
 msgstr ""
 
-#: crypto/gui/signencryptfileswizard.cpp:106
-msgid ""
-"If you select both OpenPGP and S/MIME receipient certificates, two encrypted "
-"files will be created: one for OpenPGP recipients, one for S/MIME recipients."
+#: kleopatraapplication.cpp:99
+msgid "Sign and/or encrypt file(s)"
 msgstr ""
 
-#: crypto/gui/newresultpage.cpp:103 crypto/gui/resultpage.cpp:104
-msgid "Keep open after operation completed"
+#: kleopatraapplication.cpp:100
+msgid "Same as --sign-encrypt, do not use"
 msgstr ""
 
-#: crypto/gui/newresultpage.cpp:135 crypto/gui/resultpage.cpp:131
-#, kde-format
-msgid "%1: All operations completed."
+#: kleopatraapplication.cpp:101
+msgid "Decrypt file(s)"
 msgstr ""
 
-#: crypto/gui/newresultpage.cpp:137 crypto/gui/resultpage.cpp:133
-msgid "All operations completed."
+#: kleopatraapplication.cpp:102
+msgid "Verify file/signature"
 msgstr ""
 
-#: crypto/gui/newresultpage.cpp:160 crypto/gui/resultlistwidget.cpp:224
-#: crypto/gui/resultpage.cpp:149
-#, kde-format
-msgctxt "number, operation description"
-msgid "Operation %1: %2"
+#: kleopatraapplication.cpp:103
+msgid "Decrypt and/or verify file(s)"
 msgstr ""
 
-#: crypto/gui/newresultpage.cpp:162 crypto/gui/resultpage.cpp:151
-#, kde-format
-msgctxt "tag( \"OpenPGP\" or \"CMS\"),  operation description"
-msgid "%1: %2"
+#: kleopatraapplication.cpp:111
+msgid "Location of the socket the ui server is listening on"
 msgstr ""
 
-#: crypto/gui/newresultpage.cpp:167 crypto/gui/resultpage.cpp:156
-msgid "<b>Results</b>"
+#: kleopatraapplication.cpp:118
+msgid "File(s) to process"
 msgstr ""
 
-#: crypto/gui/signemailwizard.cpp:82
-msgid "You need to select a signing certificate to proceed."
+#: systrayicon.cpp:182
+msgid "&Open Certificate Manager..."
 msgstr ""
 
-#: crypto/gui/signemailwizard.cpp:88
+#: systrayicon.cpp:183
 #, kde-format
-msgid "You need to select an %1 signing certificate to proceed."
+msgid "&Configure %1..."
 msgstr ""
 
-#: crypto/gui/signemailwizard.cpp:90
+#: systrayicon.cpp:184
 #, kde-format
-msgid "You need to select %1 and %2 signing certificates to proceed."
+msgid "&About %1..."
 msgstr ""
 
-#: crypto/gui/signemailwizard.cpp:118
-msgid "Sign Mail Message"
+#: systrayicon.cpp:185
+msgid "&Shutdown Kleopatra"
 msgstr ""
 
-#: crypto/gui/objectspage.cpp:77
-msgid "<b>Objects</b>"
+#: systrayicon.cpp:186 utils/output.cpp:488
+#: commands/importcertificatefromclipboardcommand.cpp:125
+msgid "Clipboard"
 msgstr ""
 
-#: crypto/gui/objectspage.cpp:87 crypto/gui/resolverecipientspage.cpp:435
-msgid "Remove Selected"
+#: systrayicon.cpp:187
+msgid "Certificate Import"
 msgstr ""
 
-#: crypto/gui/objectspage.cpp:99
-msgid "Select File"
+#: systrayicon.cpp:188
+msgid "Encrypt..."
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:203
-msgid "<i>No certificate selected</i>"
+#: systrayicon.cpp:189
+msgid "S/MIME-Sign..."
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:210
-#: crypto/gui/signencryptemailconflictdialog.cpp:238
-msgid "..."
+#: systrayicon.cpp:190
+msgid "OpenPGP-Sign..."
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:416
-msgid "<b>Recipients</b>"
+#: systrayicon.cpp:191 mainwindow_desktop.cpp:468
+msgid "Decrypt/Verify..."
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:431
-msgid "Add Recipient..."
+#: systrayicon.cpp:192
+msgid "SmartCard"
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:450
-#: crypto/gui/signencryptemailconflictdialog.cpp:581
-msgid "S/MIME"
+#: systrayicon.cpp:193
+msgid "Update Card Status"
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:465
-msgid ""
-"<b>Warning:</b> None of the selected certificates seem to be your own. You "
-"will not be able to decrypt the encrypted data again."
+#: systrayicon.cpp:194
+msgid "Set NetKey v3 Initial PIN..."
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:582
-msgid "Recipient"
+#: systrayicon.cpp:195
+msgid "Learn NetKey v3 Card Certificates"
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:584
+#: utils/log.cpp:161
 #, kde-format
-msgctxt "%1 == number"
-msgid "Recipient (%1)"
+msgid "Log Error: Could not open log file \"%1\" for writing."
 msgstr ""
 
-#: crypto/gui/resolverecipientspage.cpp:617
+#: utils/hex.cpp:55
 #, kde-format
-msgid "<qt><p>Recipients predefined via GnuPG settings:</p>%1"
-msgstr ""
-
-#: crypto/gui/resolverecipientspage.cpp:627
-msgid "Sender"
+msgid "Invalid hex char '%1' in input stream."
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:87
-msgid "No certificate selected"
+#: utils/hex.cpp:68 utils/hex.cpp:73
+msgid "Premature end of hex-encoded char in input stream"
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:86
+#: utils/formatting.cpp:205 utils/formatting.cpp:208
 #, kde-format
-msgctxt "%1=protocol (S/Mime, OpenPGP), %2=certificate"
-msgid "Sign using %1: %2"
-msgstr ""
-
-#: crypto/gui/signerresolvepage.cpp:284
-msgid "Sign and encrypt (OpenPGP only)"
-msgstr ""
-
-#: crypto/gui/signerresolvepage.cpp:290
-msgid "Encrypt only"
-msgstr ""
-
-#: crypto/gui/signerresolvepage.cpp:295
-msgid "Sign only"
+msgid "<tr><th>%1:</th><td>%2</td></tr>"
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:300
-msgid "Encryption Options"
+#: utils/formatting.cpp:217
+#, kde-format
+msgid "%1-bit %2 (secret key available)"
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:312
-msgid "Signing Options"
+#: utils/formatting.cpp:219
+#, kde-format
+msgid "%1-bit %2"
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:317
-msgid "Signer:"
+#: utils/formatting.cpp:226
+msgid "Signing EMails and Files (Qualified)"
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:332
-msgid "Change Signing Certificates..."
+#: utils/formatting.cpp:228
+msgid "Signing EMails and Files"
 msgstr ""
 
-#: crypto/gui/signerresolvepage.cpp:491
-msgid "<b>Choose Operation to be Performed</b>"
+#: utils/formatting.cpp:231
+msgid "Encrypting EMails and Files"
 msgstr ""
 
-#: crypto/gui/decryptverifyoperationwidget.cpp:95
-msgid "Input file:"
+#: utils/formatting.cpp:233
+msgid "Certifying other Certificates"
 msgstr ""
 
-#: crypto/gui/decryptverifyoperationwidget.cpp:99
-msgid "&Input file is a detached signature"
+#: utils/formatting.cpp:235
+msgid "Authenticate against Servers"
 msgstr ""
 
-#: crypto/gui/decryptverifyoperationwidget.cpp:100
-msgid "&Signed data:"
+#: utils/formatting.cpp:236
+msgid ", "
 msgstr ""
 
-#: crypto/gui/decryptverifyoperationwidget.cpp:105
-msgid "&Input file is an archive; unpack with:"
+#: utils/formatting.cpp:261
+msgid "This certificate has been revoked."
 msgstr ""
 
-#: crypto/gui/wizard.cpp:103
-msgid "&Next"
+#: utils/formatting.cpp:263
+msgid "This certificate has expired."
 msgstr ""
 
-#: crypto/gui/wizard.cpp:141
-msgid "Back"
+#: utils/formatting.cpp:265
+msgid "This certificate has been disabled locally."
 msgstr ""
 
-#: crypto/gui/decryptverifyfileswizard.cpp:207
-msgid "<b>Choose operations to be performed</b>"
+#: utils/formatting.cpp:267
+msgid "This certificate is currently valid."
 msgstr ""
 
-#: crypto/gui/decryptverifyfileswizard.cpp:208
-msgid ""
-"Here you can check and, if needed, override the operations Kleopatra "
-"detected for the input given."
+#: utils/formatting.cpp:269
+msgid "The validity of this certificate cannot be checked at the moment."
 msgstr ""
 
-#: crypto/gui/decryptverifyfileswizard.cpp:211
-msgid "&Decrypt/Verify"
+#: utils/formatting.cpp:276
+msgid "Serial number"
 msgstr ""
 
-#: crypto/gui/decryptverifyfileswizard.cpp:217
-msgid "Create all output files in a single folder"
-msgstr ""
+#: utils/formatting.cpp:278
+msgid "Issuer"
+msgstr "Cyhoeddwr"
 
-#: crypto/gui/decryptverifyfileswizard.cpp:218
-msgid "&Output folder:"
-msgstr ""
+#: utils/formatting.cpp:284
+msgid "Subject"
+msgstr "Pwnc"
 
-#: crypto/gui/verifychecksumsdialog.cpp:223
-msgid "The following errors and warnings were recorded:"
+#: utils/formatting.cpp:285
+msgid "User-ID"
 msgstr ""
 
-#: crypto/gui/verifychecksumsdialog.cpp:224
-msgid "Checksum Verification Errors"
+#: utils/formatting.cpp:289
+msgid "a.k.a."
 msgstr ""
 
-#: crypto/gui/verifychecksumsdialog.cpp:235
-#: crypto/gui/verifychecksumsdialog.cpp:259
-msgid "No errors occurred"
+#: utils/formatting.cpp:292
+msgid "Validity"
 msgstr ""
 
-#: crypto/gui/verifychecksumsdialog.cpp:237
+#: utils/formatting.cpp:294
 #, kde-format
-msgid "One error occurred"
-msgid_plural "%1 errors occurred"
-msgstr[0] ""
-msgstr[1] ""
+msgid "from %1 until forever"
+msgstr ""
 
-#: crypto/gui/verifychecksumsdialog.cpp:257
-msgid "Progress:"
+#: utils/formatting.cpp:295
+#, kde-format
+msgid "from %1 through %2"
 msgstr ""
 
-#: crypto/gui/verifychecksumsdialog.cpp:260
-msgctxt "Show Errors"
-msgid "Show"
+#: utils/formatting.cpp:297
+msgid "Certificate type"
 msgstr ""
 
-#: crypto/gui/encryptemailwizard.cpp:52
-msgid "Encrypt Mail Message"
+#: utils/formatting.cpp:299
+msgid "Certificate usage"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:163
-msgid "(no matching certificates found)"
+#: utils/formatting.cpp:303
+msgid "Fingerprint"
+msgstr "Olion Bys"
+
+#: utils/formatting.cpp:306
+msgid "Ownertrust"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:165
-msgid "Please select a certificate"
+#: utils/formatting.cpp:308
+msgid "Trusted issuer?"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:222
-msgid "(please choose between OpenPGP and S/MIME first)"
+#: utils/formatting.cpp:309
+msgid "Yes"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:366
-#, kde-format
-msgid "Please select an encryption certificate for recipient \"%1\""
+#: utils/formatting.cpp:310
+msgid "No"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:376
-#, kde-format
-msgid "Please select a signing certificate for sender \"%1\""
+#: utils/formatting.cpp:313 utils/formatting.cpp:315
+msgid "Stored"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:386
-msgid ""
-"Kleopatra cannot unambiguously determine matching certificates for all "
-"recipients/senders of the message.\n"
-"Please select the correct certificates for each recipient:"
+#: utils/formatting.cpp:313
+#, kde-format
+msgctxt "stored..."
+msgid "on SmartCard with serial no. %1"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:389
-msgid ""
-"Kleopatra cannot unambiguously determine matching certificates for the "
-"sender of the message.\n"
-"Please select the correct certificates for the sender:"
+#: utils/formatting.cpp:315
+msgctxt "stored..."
+msgid "on this computer"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:392
-msgid ""
-"Kleopatra cannot unambiguously determine matching certificates for all "
-"recipients of the message.\n"
-"Please select the correct certificates for each recipient:"
+#: utils/formatting.cpp:406
+msgctxt "X.509/CMS encryption standard"
+msgid "X.509"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:400
-msgid ""
-"Please verify that correct certificates have been selected for each "
-"recipient:"
+#: utils/formatting.cpp:408 crypto/gui/signencryptemailconflictdialog.cpp:580
+#: crypto/gui/resolverecipientspage.cpp:446
+msgid "OpenPGP"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:401
-msgid ""
-"Please verify that the correct certificate has been selected for the sender:"
+#: utils/formatting.cpp:409
+msgctxt "Unknown encryption protocol"
+msgid "Unknown"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:579
-msgid "Show all recipients"
+#: utils/formatting.cpp:430 utils/formatting.cpp:461
+msgctxt "unknown trust level"
+msgid "unknown"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:582
-msgid "Select Signing Certificate"
+#: utils/formatting.cpp:431 utils/formatting.cpp:463
+msgid "untrusted"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:583
-msgid "Select Encryption Certificate"
+#: utils/formatting.cpp:432 utils/formatting.cpp:464
+msgctxt "marginal trust"
+msgid "marginal"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:584
-msgid "Only show this dialog in case of conflicts (experimental)"
+#: utils/formatting.cpp:433 utils/formatting.cpp:465
+msgctxt "full trust"
+msgid "full"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:605
-msgid "Select Certificates For Message"
+#: utils/formatting.cpp:434 utils/formatting.cpp:466
+msgctxt "ultimate trust"
+msgid "ultimate"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:669
-msgid "From:"
+#: utils/formatting.cpp:435 utils/formatting.cpp:462
+msgctxt "undefined trust"
+msgid "undefined"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:677
-msgid "To:"
+#: utils/formatting.cpp:452
+msgctxt "as in good/valid signature"
+msgid "good"
 msgstr ""
 
-#: crypto/gui/signencryptemailconflictdialog.cpp:715
+#: utils/formatting.cpp:476
 #, kde-format
-msgid "Select Certificates For Message \"%1\""
+msgid "class %1"
 msgstr ""
 
-#: crypto/gui/signingcertificateselectiondialog.cpp:49
-msgid "Select Signing Certificates"
+#: utils/formatting.cpp:478
+msgctxt "good/valid signature"
+msgid "good"
 msgstr ""
 
-#: crypto/gui/resultitemwidget.cpp:104
-msgid "Hide Details"
+#: utils/formatting.cpp:484
+msgid "certificate expired"
 msgstr ""
 
-#: crypto/gui/resultitemwidget.cpp:104
-msgid "Show Details"
+#: utils/formatting.cpp:485
+msgctxt "fake/invalid signature"
+msgid "bad"
 msgstr ""
 
-#: crypto/task.cpp:169
-msgid "Unknown exception in Task::start()"
+#: utils/formatting.cpp:502
+#, kde-format
+msgctxt "name, email, key id"
+msgid "%1 %2 (%3)"
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:176
-msgid "Signing failed."
+#: utils/formatting.cpp:544
+#, kde-format
+msgid "Bad signature by unknown certificate %1: %2"
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:189
-msgid "Encryption failed."
+#: utils/formatting.cpp:546
+#, kde-format
+msgid "Bad signature by an unknown certificate: %1"
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:210
-msgid "Signing and encryption succeeded."
+#: utils/formatting.cpp:548
+#, kde-format
+msgid "Bad signature by %1: %2"
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:225 crypto/signencryptfilestask.cpp:237
+#: utils/formatting.cpp:553
 #, kde-format
-msgid "Output error: %1"
+msgid "Good signature by unknown certificate %1."
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:240
-msgid " Encryption succeeded."
+#: utils/formatting.cpp:555
+msgid "Good signature by an unknown certificate."
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:252
+#: utils/formatting.cpp:557
 #, kde-format
-msgid "%1: <b>Sign/encrypt canceled.</b>"
+msgid "Good signature by %1."
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:252
+#: utils/formatting.cpp:562
 #, kde-format
-msgid " %1: Sign/encrypt failed."
+msgid "Invalid signature by unknown certificate %1: %2"
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:253
+#: utils/formatting.cpp:564
 #, kde-format
-msgctxt "label: result. Example: foo -> foo.gpg: Encryption failed."
-msgid "%1: <b>%2</b>"
+msgid "Invalid signature by an unknown certificate: %1"
 msgstr ""
 
-#: crypto/signencryptfilestask.cpp:397
-msgid "Cannot determine protocol for task"
+#: utils/formatting.cpp:566
+#, kde-format
+msgid "Invalid signature by %1: %2"
 msgstr ""
 
-#: crypto/encryptemailcontroller.cpp:150
-msgid "Call to EncryptEMailController::protocolAsString() is ambiguous."
+#: utils/formatting.cpp:579
+msgid "This certificate was imported from the following sources:"
 msgstr ""
 
-#: crypto/verifychecksumscontroller.cpp:220
-msgctxt "@title:window"
-msgid "Verify Checksum Results"
+#: utils/formatting.cpp:589
+msgid "The import of this certificate was canceled."
 msgstr ""
 
-#: crypto/verifychecksumscontroller.cpp:452
+#: utils/formatting.cpp:591
 #, kde-format
-msgid "Cannot find checksums file for file %1"
+msgid "An error occurred importing this certificate: %1"
 msgstr ""
 
-#: crypto/verifychecksumscontroller.cpp:622
-#, kde-format
-msgid "Verifying checksums (%2) in %1"
+#: utils/formatting.cpp:597
+msgid ""
+"This certificate was new to your keystore. The secret key is available."
 msgstr ""
 
-#: crypto/newsignencryptemailcontroller.cpp:297
-msgid ""
-"Call to NewSignEncryptEMailController::protocolAsString() is ambiguous."
+#: utils/formatting.cpp:598
+msgid "This certificate is new to your keystore."
 msgstr ""
 
-#: crypto/newsignencryptemailcontroller.cpp:517
-#: crypto/newsignencryptemailcontroller.cpp:522
-msgctxt "@title:window"
-msgid "Error"
+#: utils/formatting.cpp:602
+msgid "New user-ids were added to this certificate by the import."
 msgstr ""
 
-#: crypto/decryptverifyfilescontroller.cpp:141
-msgid "Cannot determine whether input data is OpenPGP or CMS"
+#: utils/formatting.cpp:604
+msgid "New signatures were added to this certificate by the import."
 msgstr ""
 
-#: crypto/decryptverifyfilescontroller.cpp:197
-#, kde-format
-msgid ""
-"Caught unexpected exception in "
-"DecryptVerifyFilesController::Private::slotWizardOperationPrepared: %1"
+#: utils/formatting.cpp:606
+msgid "New subkeys were added to this certificate by the import."
 msgstr ""
 
-#: crypto/decryptverifyfilescontroller.cpp:201
+#: utils/formatting.cpp:609
 msgid ""
-"Caught unknown exception in "
-"DecryptVerifyFilesController::Private::slotWizardOperationPrepared"
+"The import contained no new data for this certificate. It is unchanged."
+msgstr ""
+
+#: utils/kleo_kicondialog.cpp:273 utils/kleo_kicondialog.cpp:285
+msgid "Select Icon"
+msgstr ""
+
+#: utils/kleo_kicondialog.cpp:306
+msgid "Icon Source"
 msgstr ""
 
-#: crypto/decryptverifyfilescontroller.cpp:252
-msgid "Decrypt/Verify Files"
+#: utils/kleo_kicondialog.cpp:316
+msgid "S&ystem icons:"
 msgstr ""
 
-#: crypto/decryptverifyfilescontroller.cpp:380
-msgid "No usable inputs found"
+#: utils/kleo_kicondialog.cpp:322
+msgid "O&ther icons:"
 msgstr ""
 
-#: kwatchgnupg/aboutdata.cpp:40
-msgid "GnuPG log viewer"
+#: utils/kleo_kicondialog.cpp:326
+msgid "&Browse..."
 msgstr ""
 
-#: kwatchgnupg/aboutdata.cpp:50
-msgid "Steffen Hansen"
+#: utils/kleo_kicondialog.cpp:339
+msgid "&Search:"
 msgstr ""
 
-#: kwatchgnupg/aboutdata.cpp:61
-msgid "KWatchGnuPG"
+#: utils/kleo_kicondialog.cpp:346
+msgid "Search interactively for icon names (e.g. folder)."
 msgstr ""
 
-#: kwatchgnupg/aboutdata.cpp:63
-msgid "(c) 2004 Klarälvdalens Datakonsult AB\n"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:27
+#. i18n: ectx: property (title), widget (QGroupBox, overviewActionsGB)
+#: utils/kleo_kicondialog.cpp:367 rc.cpp:472 qml/kleopatra-mobile.qml:84
+msgid "Actions"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:75
-msgid "Configure KWatchGnuPG"
+#: utils/kleo_kicondialog.cpp:368
+msgid "Animations"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:90
-msgid "WatchGnuPG"
+#: utils/kleo_kicondialog.cpp:369
+msgid "Applications"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:102
-msgid "&Executable:"
+#: utils/kleo_kicondialog.cpp:370
+msgid "Categories"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:111
-msgid "&Socket:"
+#: utils/kleo_kicondialog.cpp:371
+msgid "Devices"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:120
-msgid "None"
+#: utils/kleo_kicondialog.cpp:372
+msgid "Emblems"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:121
-msgid "Basic"
+#: utils/kleo_kicondialog.cpp:373
+msgid "Emotes"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:122
-msgid "Advanced"
+#: utils/kleo_kicondialog.cpp:374
+msgid "Filesystems"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:123
-msgid "Expert"
+#: utils/kleo_kicondialog.cpp:375
+msgid "International"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:124
-msgid "Guru"
+#: utils/kleo_kicondialog.cpp:376
+msgid "Mimetypes"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:125
-msgid "Default &log level:"
+#: utils/kleo_kicondialog.cpp:377
+msgid "Places"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:133
-msgid "Log Window"
+#: utils/kleo_kicondialog.cpp:585
+msgid "Open"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:146
-msgctxt "history size spinbox suffix"
-msgid " line"
-msgid_plural " lines"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kwatchgnupg/kwatchgnupgconfig.cpp:147
-msgid "unlimited"
+#: utils/kleo_kicondialog.cpp:585
+msgid "Icon Files (*.png *.xpm *.svg *.svgz)"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:148
-msgid "&History size:"
+#: utils/path-helper.cpp:103
+#, kde-format
+msgid "Cannot remove directory %1"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:152
-msgid "Set &Unlimited"
+#: utils/path-helper.cpp:107
+#, kde-format
+msgid "Cannot remove file %1: %2"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgconfig.cpp:159
-msgid "Enable &word wrapping"
+#: utils/archivedefinition.cpp:107
+#, kde-format
+msgid "Error in archive definition %1: %2"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:103
+#: utils/archivedefinition.cpp:152
 #, kde-format
-msgid "[%1] Log cleared"
+msgid "Cannot use both %f and | in '%1'"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:110
-msgid "C&lear History"
+#: utils/archivedefinition.cpp:160
+#, kde-format
+msgid "Quoting error in '%1' entry"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:141
+#: utils/archivedefinition.cpp:162
 #, kde-format
-msgid "[%1] Log stopped"
+msgid "'%1' too complex (would need shell)"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:156
-msgid ""
-"The watchgnupg logging process could not be started.\n"
-"Please install watchgnupg somewhere in your $PATH.\n"
-"This log window is unable to display any useful information."
+#: utils/archivedefinition.cpp:165 utils/archivedefinition.cpp:210
+#: utils/archivedefinition.cpp:222 utils/archivedefinition.cpp:232
+#, kde-format
+msgid "'%1' entry is empty/missing"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:158
+#: utils/archivedefinition.cpp:172
 #, kde-format
-msgid "[%1] Log started"
+msgid "'%1' empty or not found"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:193
-msgid "There are no components available that support logging."
+#: utils/archivedefinition.cpp:265 utils/archivedefinition.cpp:275
+msgid "cannot use argument passing on standard input for unpack-command"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:199
+#: utils/archivedefinition.cpp:320
+#, kde-format
 msgid ""
-"The watchgnupg logging process died.\n"
-"Do you want to try to restart it?"
+"Cannot find common base directory for these files:\n"
+"%1"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:199
-msgid "Try Restart"
+#: utils/archivedefinition.cpp:373
+#, kde-format
+msgid "Caught unknown exception in group %1"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:199
-msgid "Do Not Try"
+#: utils/auditlog.cpp:62
+msgid "No Audit Log available"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:200
-msgid "====== Restarting logging process ====="
+#: utils/auditlog.cpp:64
+#, kde-format
+msgid "Error Retrieving Audit Log: %1"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:203
-msgid ""
-"The watchgnupg logging process is not running.\n"
-"This log window is unable to display any useful information."
+#: utils/auditlog.cpp:71
+msgctxt "The Audit Log is a detailed error log from the gnupg backend"
+msgid "Show Audit Log"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:234
-msgid "Save Log to File"
+#: utils/output.cpp:214
+msgid "No output device"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:239
+#: utils/output.cpp:319
 #, kde-format
-msgid ""
-"The file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgid "Could not open FD %1 for writing"
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:242
-msgid "Overwrite File"
+#: utils/output.cpp:344
+#, kde-format
+msgid "Could not create temporary file for output \"%1\""
 msgstr ""
 
-#: kwatchgnupg/kwatchgnupgmainwin.cpp:249
+#: utils/output.cpp:350
 #, kde-format
-msgid "Could not save file %1: %2"
+msgid ""
+"The file <b>%1</b> already exists.\n"
+"Overwrite?"
 msgstr ""
 
-#: kwatchgnupg/tray.cpp:57
-msgid "KWatchGnuPG Log Viewer"
+#: utils/output.cpp:352
+msgid "Overwrite Existing File?"
 msgstr ""
 
-#: crlview.cpp:61
-msgid "CRL cache dump:"
-msgstr "Tomen celc CRL:"
-
-#: crlview.cpp:71
-msgid "&Update"
+#: utils/output.cpp:354
+msgid "Overwrite All"
 msgstr ""
 
-#: crlview.cpp:117
-msgid "Unable to start gpgsm process. Please check your installation."
+#: utils/output.cpp:392
+msgid "Overwriting declined"
 msgstr ""
 
-#: crlview.cpp:117 crlview.cpp:145
-msgid "Certificate Manager Error"
-msgstr "Gwall Rheolwr Tystysgrifau"
+#: utils/output.cpp:398
+#, kde-format
+msgid "Could not remove file \"%1\" for overwriting."
+msgstr ""
 
-#: crlview.cpp:145
-msgid "The GpgSM process ended prematurely because of an unexpected error."
+#: utils/output.cpp:410
+#, kde-format
+msgid "Could not rename file \"%1\" to \"%2\""
 msgstr ""
 
-#: main.cpp:146
-msgid "Performing Self-Check..."
+#: utils/output.cpp:438 utils/input.cpp:290
+msgid "Command not specified"
 msgstr ""
 
-#: main.cpp:163
-msgctxt "did not pass"
-msgid "Self-Check Failed"
+#: utils/output.cpp:444 utils/input.cpp:295
+#, kde-format
+msgid "Could not start %1 process: %2"
 msgstr ""
 
-#: main.cpp:168
-msgid "Self-Check Passed"
+#: utils/output.cpp:453
+#, kde-format
+msgctxt "e.g. \"Input to tar xf - file1 ...\""
+msgid "Input to %1 ..."
 msgstr ""
 
-#: main.cpp:185
-msgid "Loading certificate cache..."
+#: utils/output.cpp:455
+#, kde-format
+msgctxt "e.g. \"Input to tar xf - file\""
+msgid "Input to %1"
 msgstr ""
 
-#: main.cpp:192
-msgid "Certificate cache loaded."
+#: utils/output.cpp:463 crypto/verifychecksumscontroller.cpp:554
+#: crypto/createchecksumscontroller.cpp:551
+#, kde-format
+msgid "Error while running %1: %2"
 msgstr ""
 
-#: main.cpp:231
-msgctxt "@info"
-msgid ""
-"<para>The version of the <application>GpgME</application> library you are "
-"running against is older than the one that the "
-"<application>GpgME++</application> library was built "
-"against.</para><para><application>Kleopatra</application> will not function "
-"in this setting.</para><para>Please ask your administrator for help in "
-"resolving this issue.</para>"
+#: utils/output.cpp:466 utils/input.cpp:324
+#: crypto/verifychecksumscontroller.cpp:557
+#: crypto/createchecksumscontroller.cpp:554
+#, kde-format
+msgid "Failed to execute %1: %2"
 msgstr ""
 
-#: main.cpp:235
-msgctxt "@title"
-msgid "GpgME Too Old"
+#: utils/output.cpp:482
+msgid "Could not write to clipboard"
 msgstr ""
 
-#: main.cpp:328
-msgid "GPG UI Server Error"
+#: utils/output.cpp:490
+msgid "Find buffer"
 msgstr ""
 
-#: main.cpp:329
-#, kde-format
-msgid ""
-"<qt>The Kleopatra GPG UI Server Module could not be initialized.<br/>The "
-"error given was: <b>%1</b><br/>You can use Kleopatra as a certificate "
-"manager, but cryptographic plugins that rely on a GPG UI Server being "
-"present might not work correctly, or at all.</qt>"
+#: utils/output.cpp:492
+msgid "Selection"
 msgstr ""
 
-#: commands/dumpcrlcachecommand.cpp:87 commands/dumpcertificatecommand.cpp:90
-msgctxt "@action:button Update the log text widget"
-msgid "&Update"
+#: utils/output.cpp:504
+msgid "Could not find clipboard"
 msgstr ""
 
-#: commands/dumpcrlcachecommand.cpp:226
-msgid "CRL Cache Dump"
+#: utils/input.cpp:94
+msgid "No input device"
 msgstr ""
 
-#: commands/dumpcrlcachecommand.cpp:246
-#: commands/dumpcertificatecommand.cpp:285
-msgid "Unable to start process gpgsm. Please check your installation."
+#: utils/input.cpp:187
+#, kde-format
+msgid "Could not open FD %1 for reading"
 msgstr ""
 
-#: commands/dumpcrlcachecommand.cpp:248 commands/dumpcrlcachecommand.cpp:271
-#: commands/dumpcrlcachecommand.cpp:276
-msgid "Dump CRL Cache Error"
+#: utils/input.cpp:216 utils/input.cpp:232
+#, kde-format
+msgid "Could not open file \"%1\" for reading"
 msgstr ""
 
-#: commands/dumpcrlcachecommand.cpp:268
-msgid ""
-"The GpgSM process that tried to dump the CRL cache ended prematurely because "
-"of an unexpected error. Please check the output of gpgsm --call-dirmngr "
-"listcrls for details."
+#: utils/input.cpp:229
+#, kde-format
+msgid "File \"%1\" is already open, but not for reading"
 msgstr ""
 
-#: commands/dumpcrlcachecommand.cpp:274
+#: utils/input.cpp:300
 #, kde-format
-msgid ""
-"An error occurred while trying to dump the CRL cache. The output from GpgSM "
-"was:\n"
-"%1"
+msgid "Failed to write input to %1 process: %2"
 msgstr ""
 
-#: commands/certifycertificatecommand.cpp:182
-msgctxt "@info"
-msgid ""
-"To certify other certificates, you first need to create an OpenPGP "
-"certificate for yourself. Choose <interface>File->New "
-"Certificate...</interface> to create one."
+#: utils/input.cpp:311
+#, kde-format
+msgctxt "e.g. \"Output of tar xf - file1 ...\""
+msgid "Output of %1 ..."
 msgstr ""
 
-#: commands/certifycertificatecommand.cpp:183
-msgid "Certification Not Possible"
+#: utils/input.cpp:313
+#, kde-format
+msgctxt "e.g. \"Output of tar xf - file\""
+msgid "Output of %1"
 msgstr ""
 
-#: commands/checksumverifyfilescommand.cpp:154
-#: commands/encryptclipboardcommand.cpp:146
-#: commands/encryptclipboardcommand.cpp:159
-#: commands/checksumcreatefilescommand.cpp:154
-#: commands/signencryptfilescommand.cpp:232
-#: commands/decryptverifyclipboardcommand.cpp:160
-#: commands/signclipboardcommand.cpp:149 commands/signclipboardcommand.cpp:162
-#: commands/decryptverifyfilescommand.cpp:162
+#: utils/input.cpp:321
 #, kde-format
-msgid "An error occurred: %1"
+msgid ""
+"Error while running %1:\n"
+"%2"
 msgstr ""
 
-#: commands/checksumverifyfilescommand.cpp:156
-msgid "Verify Checksum Files Error"
+#: utils/input.cpp:347
+msgid "Could not open clipboard for reading"
 msgstr ""
 
-#: commands/checksumverifyfilescommand.cpp:167
-msgid "Select One or More Checksum Files"
+#: utils/input.cpp:357
+msgid "Clipboard contents"
 msgstr ""
 
-#: commands/learncardkeyscommand.cpp:75
-msgid "Error Learning SmartCard"
+#: utils/input.cpp:359
+msgid "FindBuffer contents"
 msgstr ""
 
-#: commands/learncardkeyscommand.cpp:79
-msgid "Finished Learning SmartCard"
+#: utils/input.cpp:361
+msgid "Current selection"
 msgstr ""
 
-#: commands/learncardkeyscommand.cpp:84
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>The GPG or GpgSM process that tried to learn the smart card ended "
-"prematurely because of an unexpected error.</para><para>Please check the "
-"output of <icode>%1</icode> for details.</para>"
+#: dialogs/lookupcertificatesdialog.cpp:121
+msgid "Import"
 msgstr ""
 
-#: commands/clearcrlcachecommand.cpp:62 commands/importcrlcommand.cpp:163
-msgid "Clear CRL Cache Error"
+#: dialogs/certifycertificatedialog.cpp:131
+msgid "<b>Step 1:</b> Please select the user IDs you wish to certify."
 msgstr ""
 
-#: commands/clearcrlcachecommand.cpp:66
-msgid "Clear CRL Cache Finished"
+#: dialogs/certifycertificatedialog.cpp:140
+msgid "I have verified the fingerprint"
 msgstr ""
 
-#: commands/clearcrlcachecommand.cpp:70
+#: dialogs/certifycertificatedialog.cpp:159
 #, kde-format
 msgid ""
-"The DirMngr process that tried to clear the CRL cache ended prematurely "
-"because of an unexpected error. Please check the output of %1 for details."
+"Certificate: %1\n"
+"Fingerprint: %2"
 msgstr ""
 
-#: commands/clearcrlcachecommand.cpp:76
-#, kde-format
-msgid ""
-"An error occurred while trying to clear the CRL cache. The output from %1 "
-"was:\n"
-"%2"
+#. i18n: file: dialogs/certificationoptionswidget.ui:44
+#. i18n: ectx: property (text), widget (QLabel, singleKeyLabel)
+#: dialogs/certifycertificatedialog.cpp:199 rc.cpp:600
+#, kde-format, no-c-format
+msgid "Certification will be performed using certificate %1."
 msgstr ""
 
-#: commands/clearcrlcachecommand.cpp:81
-msgid "CRL cache cleared successfully."
+#: dialogs/certifycertificatedialog.cpp:229
+msgid "Signed user IDs:"
 msgstr ""
 
-#: commands/encryptclipboardcommand.cpp:148
-#: commands/encryptclipboardcommand.cpp:161
-msgid "Encrypt Clipboard Error"
+#: dialogs/certifycertificatedialog.cpp:232
+msgid "<b>Summary:</b>"
 msgstr ""
 
-#: commands/checksumcreatefilescommand.cpp:156
-msgid "Create Checksum Files Error"
+#: dialogs/certifycertificatedialog.cpp:236
+msgid "Check level:"
 msgstr ""
 
-#: commands/checksumcreatefilescommand.cpp:167
-msgid "Select One or More Files to Create Checksums For"
+#: dialogs/certifycertificatedialog.cpp:239
+msgid "Selected secret key:"
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:86
-msgctxt "@info"
-msgid ""
-"<para>No OpenPGP directory services have been configured.</para><para>Since "
-"none is configured, <application>Kleopatra</application> will use "
-"<resource>keys.gnupg.net</resource> as the server to export "
-"to.</para><para>You can configure OpenPGP directory servers in "
-"<application>Kleopatra</application>'s configuration dialog.</para><para>Do "
-"you want to continue with <resource>keys.gnupg.net</resource> as the server "
-"to export to?</para>"
+#: dialogs/certifycertificatedialog.cpp:258
+msgid "Default certificate"
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:93
-#: commands/exportopenpgpcertstoservercommand.cpp:105
-msgctxt "@title:window"
-msgid "OpenPGP Certificate Export"
+#: dialogs/certifycertificatedialog.cpp:262
+msgid "No statement made"
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:100
-msgctxt "@info"
-msgid ""
-"<para>When OpenPGP certificates have been exported to a public directory "
-"server, it is nearly impossible to remove them again.</para><para>Before "
-"exporting your certificate to a public directory server, make sure that you "
-"have created a revocation certificate so you can revoke the certificate if "
-"needed later.</para><para>Are you sure you want to continue?</para>"
+#: dialogs/certifycertificatedialog.cpp:265
+msgid "Not checked"
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:123
-msgctxt "@title:window"
-msgid "OpenPGP Certificate Export Error"
+#: dialogs/certifycertificatedialog.cpp:268
+msgid "Casually checked"
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:127
-msgctxt "@title:window"
-msgid "OpenPGP Certificate Export Finished"
+#: dialogs/certifycertificatedialog.cpp:271
+msgid "Thoroughly checked"
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:132
-#, kde-format
-msgctxt "@info"
+#: dialogs/certifycertificatedialog.cpp:286
 msgid ""
-"<para>The GPG process that tried to export OpenPGP certificates ended "
-"prematurely because of an unexpected error.</para><para>Please check the "
-"output of <icode>%1</icode> for details.</para>"
+"The certificate was not certified because it was already certified by the "
+"same certificate."
 msgstr ""
 
-#: commands/exportopenpgpcertstoservercommand.cpp:139
+#: dialogs/certifycertificatedialog.cpp:288
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>An error occurred while trying to export OpenPGP certificates.</para> "
-"<para>The output from <command>%1</command> was: <message>%2</message></para>"
-msgstr ""
-
-#: commands/exportopenpgpcertstoservercommand.cpp:145
-msgctxt "@info"
-msgid "OpenPGP certificates exported successfully."
-msgstr ""
-
-#: commands/lookupcertificatescommand.cpp:210
-msgid ""
-"<p>You seem to be searching for a fingerprint or a key-id.</p><p>Different "
-"keyservers expect different ways to search for these. Some require a \"0x\" "
-"prefix, while others require there be no such prefix.</p><p>If your search "
-"does not yield any results, try removing the 0x prefix from your search.</p>"
+msgid "The certificate could not be certified. <b>Error</b>: %1"
 msgstr ""
 
-#: commands/lookupcertificatescommand.cpp:214
-msgid ""
-"<p>You seem to be searching for a fingerprint or a key-id.</p><p>Different "
-"keyservers expect different ways to search for these. Some require a \"0x\" "
-"prefix, while others require there be no such prefix.</p><p>If your search "
-"does not yield any results, try adding the 0x prefix to your search.</p>"
+#: dialogs/certifycertificatedialog.cpp:290
+msgid "Certification canceled."
 msgstr ""
 
-#: commands/lookupcertificatescommand.cpp:218
-msgid "Hex-String Search"
+#: dialogs/certifycertificatedialog.cpp:292
+msgid "Certification successful."
 msgstr ""
 
-#: commands/lookupcertificatescommand.cpp:291
-#: commands/lookupcertificatescommand.cpp:296
+#: dialogs/certifycertificatedialog.cpp:365
 #, kde-format
-msgctxt "@title %1:\"OpenPGP\" or \"CMS\""
-msgid "%1 Certificate Server"
+msgctxt "arg is name, email of certificate holder"
+msgid "Certify Certificate: %1"
 msgstr ""
 
-#: commands/lookupcertificatescommand.cpp:324
+#: dialogs/certificatedetailsdialog.cpp:230
 #, kde-format
 msgctxt "@info"
 msgid ""
-"Failed to search on certificate server. The error returned was:\n"
-"%1"
-msgstr ""
-
-#: commands/lookupcertificatescommand.cpp:332
-msgctxt "@info"
-msgid ""
-"<para>The query result has been truncated.</para><para>Either the local or a "
-"remote limit on the maximum number of returned hits has been "
-"exceeded.</para><para>You can try to increase the local limit in the "
-"configuration dialog, but if one of the configured servers is the limiting "
-"factor, you have to refine your search.</para>"
+"<para>An error occurred while loading the certifications: "
+"<message>%1</message></para>"
 msgstr ""
 
-#: commands/lookupcertificatescommand.cpp:340
+#: dialogs/certificatedetailsdialog.cpp:233
 msgctxt "@title"
-msgid "Result Truncated"
-msgstr ""
-
-#: commands/lookupcertificatescommand.cpp:369
-msgctxt "@info"
-msgid ""
-"<para>You do not have any directory servers configured.</para><para>You need "
-"to configure at least one directory server to search on one.</para><para>You "
-"can configure directory servers here: <interface>Settings->Configure "
-"Kleopatra</interface>.</para>"
+msgid "Certifications Loading Failed"
 msgstr ""
 
-#: commands/lookupcertificatescommand.cpp:374
-msgctxt "@title"
-msgid "No Directory Servers Configured"
+#: dialogs/certificatedetailsdialog.cpp:256
+msgid "Please wait while generating the dump..."
 msgstr ""
-
-#: commands/changepassphrasecommand.cpp:185
-#, kde-format
-msgid ""
-"<p>An error occurred while trying to change the passphrase for "
-"<b>%1</b>:</p><p>%2</p>"
+
+#: dialogs/certificatedetailsdialog.cpp:334
+msgid "(please wait while certifications are being loaded)"
 msgstr ""
 
-#: commands/changepassphrasecommand.cpp:189
-msgid "Passphrase Change Error"
+#: dialogs/certificatedetailsdialog.cpp:335
+msgid "Load Certifications (may take a while)"
 msgstr ""
 
-#: commands/changepassphrasecommand.cpp:193
-msgid "Passphrase changed successfully."
+#: dialogs/certificatedetailsdialog.cpp:361
+#, kde-format
+msgid "Issuer Certificate Not Found (%1)"
 msgstr ""
 
-#: commands/changepassphrasecommand.cpp:194
-msgid "Passphrase Change Succeeded"
+#: dialogs/certificatedetailsdialog.cpp:418
+msgctxt "@title"
+msgid "Subkeys"
 msgstr ""
 
-#: commands/changeownertrustcommand.cpp:221
-#, kde-format
+#: dialogs/setinitialpindialog.cpp:89
+msgctxt "@info"
 msgid ""
-"<p>An error occurred while trying to change the owner trust for "
-"<b>%1</b>:</p><p>%2</p>"
+"No NullPin found. <warning>If this PIN was not set by you personally, the "
+"card might have been tampered with.</warning>"
 msgstr ""
 
-#: commands/changeownertrustcommand.cpp:225
-msgid "Owner Trust Change Error"
+#: dialogs/setinitialpindialog.cpp:94
+msgctxt "@info"
+msgid "Canceled setting PIN."
 msgstr ""
 
-#: commands/changeownertrustcommand.cpp:229
-msgid "Owner trust changed successfully."
+#: dialogs/setinitialpindialog.cpp:97
+#, kde-format
+msgctxt "@info"
+msgid "There was an error setting the PIN: <message>%1</message>."
 msgstr ""
 
-#: commands/changeownertrustcommand.cpp:230
-msgid "Owner Trust Change Succeeded"
+#: dialogs/setinitialpindialog.cpp:100
+msgctxt "@info"
+msgid "PIN set successfully."
 msgstr ""
 
-#: commands/gnupgprocesscommand.cpp:133
-msgid "Subprocess Diagnostics"
+#: dialogs/ownertrustdialog.cpp:55
+msgid "(unknown certificate)"
 msgstr ""
 
-#: commands/gnupgprocesscommand.cpp:243
+#: dialogs/ownertrustdialog.cpp:105
 #, kde-format
-msgid "Unable to start process %1. Please check your installation."
+msgctxt "@title"
+msgid "Change Trust Level of %1"
 msgstr ""
 
-#: commands/gnupgprocesscommand.cpp:249
+#: dialogs/ownertrustdialog.cpp:106
 #, kde-format
-msgid "Starting %1..."
+msgctxt "@info"
+msgid ""
+"How much do you trust certifications made by <b>%1</b> to correctly verify "
+"authenticity of certificates?"
 msgstr ""
 
-#: commands/gnupgprocesscommand.cpp:267
-msgid "Process finished"
+#: dialogs/deletecertificatesdialog.cpp:94
+msgid "These are the certificates you have selected for deletion:"
 msgstr ""
 
-#: commands/changeroottrustcommand.cpp:94
-#, kde-format
+#: dialogs/deletecertificatesdialog.cpp:96
 msgid ""
-"Failed to update the trust database:\n"
-"%1"
+"These certificates will be deleted even though you did "
+"<emphasis>not</emphasis><nl/> explicitly select them (<a "
+"href=\"whatsthis://\">Why?</a>):"
 msgstr ""
 
-#: commands/changeroottrustcommand.cpp:96
-msgid "Root Trust Update Failed"
+#: dialogs/deletecertificatesdialog.cpp:117
+msgctxt "@info:whatsthis"
+msgid ""
+"<title>Why do you want to delete more certificates than I "
+"selected?</title><para>When you delete CA certificates (both root CAs and "
+"intermediate CAs), the certificates issued by them will also be "
+"deleted.</para><para>This can be nicely seen in "
+"<application>Kleopatra</application>'s hierarchical view mode: In this mode, "
+"if you delete a certificate that has children, those children will also be "
+"deleted. Think of CA certificates as folders containing other certificates: "
+"When you delete the folder, you delete its contents, too.</para>"
 msgstr ""
 
-#: commands/changeroottrustcommand.cpp:256
-#, kde-format
-msgid "Cannot open existing file \"%1\" for reading: %2"
+#: dialogs/deletecertificatesdialog.cpp:129
+msgctxt "@action:button"
+msgid "Delete"
 msgstr ""
 
-#: commands/changeroottrustcommand.cpp:264
-#, kde-format
-msgid "Cannot open file \"%1\" for reading and writing: %2"
-msgstr ""
+#: dialogs/deletecertificatesdialog.cpp:189
+msgid ""
+"The certificate to be deleted is your own. It contains private key material, "
+"which is needed to decrypt past communication encrypted to the certificate, "
+"and should therefore not be deleted."
+msgid_plural ""
+"All of the certificates to be deleted are your own. They contain private key "
+"material, which is needed to decrypt past communication encrypted to the "
+"certificate, and should therefore not be deleted."
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/changeroottrustcommand.cpp:268
-#, kde-format
-msgid "Cannot set restrictive permissions on file %1: %2"
-msgstr ""
+#: dialogs/deletecertificatesdialog.cpp:203
+msgid ""
+"One of the certificates to be deleted is your own. It contains private key "
+"material, which is needed to decrypt past communication encrypted to the "
+"certificate, and should therefore not be deleted."
+msgid_plural ""
+"Some of the certificates to be deleted are your own. They contain private "
+"key material, which is needed to decrypt past communication encrypted to the "
+"certificate, and should therefore not be deleted."
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/changeroottrustcommand.cpp:329
-msgid "Could not find gpgconf executable"
+#: dialogs/deletecertificatesdialog.cpp:218
+msgid "Secret Key Deletion"
 msgstr ""
 
-#: commands/changeroottrustcommand.cpp:339
-#, kde-format
-msgid "\"gpgconf --reload gpg-agent\" failed: %1"
+#: dialogs/selftestdialog.cpp:95
+msgid "Skipped"
 msgstr ""
 
-#: commands/importcertificatefromfilecommand.cpp:138
-#, kde-format
-msgid "Could not open file %1 for reading: %2"
+#: dialogs/selftestdialog.cpp:96
+msgid "Passed"
 msgstr ""
 
-#: commands/importcertificatefromfilecommand.cpp:138
-#: commands/importcertificatefromfilecommand.cpp:144
-#: commands/importcertificatescommand.cpp:332
-#: commands/importcertificatescommand.cpp:338
-#: commands/importcertificatescommand.cpp:401
-#: commands/importcertificatescommand.cpp:438
-#: commands/importcertificatefromclipboardcommand.cpp:119
-#: commands/importcertificatefromclipboardcommand.cpp:123
-msgid "Certificate Import Failed"
+#: dialogs/selftestdialog.cpp:113
+msgid "Test Name"
 msgstr ""
 
-#: commands/importcertificatefromfilecommand.cpp:144
-#, kde-format
-msgid "Could not determine certificate type of %1."
+#. i18n: file: newcertificatewizard/resultpage.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, resultGB)
+#: dialogs/selftestdialog.cpp:114 rc.cpp:316
+msgid "Result"
 msgstr ""
 
-#: commands/importcertificatefromfilecommand.cpp:154
-#: qml/KleopatraActions.qml:70
-msgid "Certificates"
+#: dialogs/selftestdialog.cpp:224
+msgid "(select test first)"
 msgstr ""
 
-#: commands/importcertificatefromfilecommand.cpp:155
-msgid "Any files"
+#: dialogs/selftestdialog.cpp:270
+msgid "Rerun Tests"
 msgstr ""
 
-#: commands/importcertificatefromfilecommand.cpp:163
-#: commands/importcertificatefromfilecommand.cpp:166
-msgid "Select Certificate File"
-msgstr "Dewiswch Ffeil Dysysgrif"
-
-#: commands/signencryptfilescommand.cpp:234
-msgid "Sign/Encrypt Files Error"
+#: dialogs/selftestdialog.cpp:275
+msgid "Continue"
 msgstr ""
 
-#: commands/signencryptfilescommand.cpp:245
-msgid "Select One or More Files to Sign and/or Encrypt"
+#: dialogs/certificateselectiondialog.cpp:110
+msgid "Please select one or more of the following certificates:"
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:74
-msgctxt "@info"
-msgid ""
-"<para>No OpenPGP directory services have been configured.</para><para>If not "
-"all of the certificates carry the name of their preferred certificate server "
-"(few do), a fallback server is needed to fetch from.</para><para>Since none "
-"is configured, <application>Kleopatra</application> will use "
-"<resource>keys.gnupg.net</resource> as the fallback.</para><para>You can "
-"configure OpenPGP directory servers in Kleopatra's configuration "
-"dialog.</para><para>Do you want to continue with "
-"<resource>keys.gnupg.net</resource> as fallback server?</para>"
+#: dialogs/certificateselectiondialog.cpp:111
+msgid "Please select one of the following certificates:"
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:83
-#: commands/refreshopenpgpcertscommand.cpp:96
-msgctxt "@title:window"
-msgid "OpenPGP Certificate Refresh"
+#: dialogs/certificateselectiondialog.cpp:148
+msgid "Reload"
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:90
-msgctxt "@info"
-msgid ""
-"<para>Refreshing OpenPGP certificates implies downloading all certificates "
-"anew, to check if any of them have been revoked in the "
-"meantime.</para><para>This can put a severe strain on your own as well as "
-"other people's network connections, and can take up to an hour or more to "
-"complete, depending on your network connection, and the number of "
-"certificates to check.</para> <para>Are you sure you want to continue?</para>"
+#: dialogs/certificateselectiondialog.cpp:149
+msgid "Lookup..."
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:112
-msgctxt "@title:window"
-msgid "OpenPGP Certificate Refresh Error"
+#: dialogs/certificateselectiondialog.cpp:150
+msgid "New..."
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:116
-msgctxt "@title:window"
-msgid "OpenPGP Certificate Refresh Finished"
+#: dialogs/certificateselectiondialog.cpp:152
+msgctxt "@info:tooltip"
+msgid "Lookup certificates on server"
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:121
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>The GPG process that tried to refresh OpenPGP certificates ended "
-"prematurely because of an unexpected error.</para><para>Please check the "
-"output of <icode>%1</icode> for details.</para>"
+#: dialogs/certificateselectiondialog.cpp:153
+msgctxt "@info:tooltip"
+msgid "Refresh certificate list"
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:128
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>An error occurred while trying to refresh OpenPGP certificates.</para> "
-"<para>The output from <command>%1</command> was: <message>%2</message></para>"
+#: dialogs/certificateselectiondialog.cpp:154
+msgctxt "@info:tooltip"
+msgid "Create a new certificate"
 msgstr ""
 
-#: commands/refreshopenpgpcertscommand.cpp:134
-msgctxt "@info"
-msgid "OpenPGP certificates refreshed successfully."
+#: dialogs/certificateselectiondialog.cpp:180
+msgid "Certificate Selection"
 msgstr ""
 
-#: commands/setinitialpincommand.cpp:71
-msgctxt "@title"
-msgid "Set Initial Pin"
+#: dialogs/exportcertificatesdialog.cpp:67
+msgid "Export"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:207
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "Imported Certificates from %1"
+#: dialogs/exportcertificatesdialog.cpp:71
+msgid " OpenPGP export file:"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:211
-#, kde-format
-msgctxt "@info:tooltip"
-msgid "Imported certificates from these sources:<br/>%1"
+#: dialogs/exportcertificatesdialog.cpp:77
+msgid "S/MIME export file:"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:218
-msgctxt "@title:tab"
-msgid "Imported Certificates"
+#: dialogs/exportsecretkeydialog.cpp:103
+msgid "Secret Key Files"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:231
+#: dialogs/exportsecretkeydialog.cpp:124
 #, kde-format
-msgid "<tr><td align=\"right\">%1</td><td>%2</td></tr>"
+msgctxt "@info"
+msgid "Please select export options for %1:"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:232
-#, kde-format
-msgid "<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"
+#: dialogs/exportsecretkeydialog.cpp:138
+msgid "Secret Key Files (*.pem *.p12 *.gpg *.asc *.pgp)"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:233
-#, kde-format
-msgid "<tr><th colspan=\"2\" align=\"center\">%1</th></tr>"
+#: dialogs/exportsecretkeydialog.cpp:206
+msgctxt "@info"
+msgid "You have to enter an output filename."
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:240
-msgid "Total number processed:"
+#: dialogs/exportsecretkeydialog.cpp:207 dialogs/exportsecretkeydialog.cpp:216
+msgctxt "@title"
+msgid "Incomplete data"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:242
-msgid "Imported:"
+#: dialogs/exportsecretkeydialog.cpp:215
+msgctxt "@info"
+msgid "You have to choose a passphrase character set."
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:245
-msgid "New signatures:"
+#: mainwindow_desktop.cpp:159
+#, kde-format
+msgid ""
+"%1 may be used by other applications as a service.\n"
+"You may instead want to close this window without exiting %1."
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:248
-msgid "New user IDs:"
+#: mainwindow_desktop.cpp:161
+msgid "Really Quit?"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:251
-msgid "Certificates without user IDs:"
+#: mainwindow_desktop.cpp:306
+msgid "GnuPG Log Viewer"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:254
-msgid "New subkeys:"
+#: mainwindow_desktop.cpp:310
+msgid "GnuPG Administrative Console"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:257
-msgid "Newly revoked:"
+#: mainwindow_desktop.cpp:315
+msgid "Configure GnuPG Backend..."
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:260
-msgid "Not imported:"
+#: mainwindow_desktop.cpp:323
+msgid "About Gpg4win"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:263
-msgid "Unchanged:"
+#: mainwindow_desktop.cpp:351
+msgid "Could not configure the cryptography backend (gpgconf tool not found)"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:266
-msgid "Secret keys processed:"
+#: mainwindow_desktop.cpp:351
+msgid "Configuration Error"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:269
-msgid "Secret keys imported:"
+#: mainwindow_desktop.cpp:467
+msgid "Sign/Encrypt..."
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:273
-msgid "Secret keys <em>not</em> imported:"
+#: mainwindow_desktop.cpp:472
+msgid "Import Certificates"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:276
-msgid "Secret keys unchanged:"
+#: mainwindow_desktop.cpp:473
+msgid "Import CRLs"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:289
-msgid "No imports (should not happen, please report a bug)."
+#: mainwindow_desktop.cpp:480 crypto/createchecksumscontroller.cpp:302
+msgid "Cancel"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:293
-#: commands/importcertificatescommand.cpp:298
-#, kde-format
-msgid ""
-"<qt><p>Detailed results of certificate import:</p><table "
-"width=\"100%\">%1</table></qt>"
+#: crypto/decryptverifytask.cpp:180
+msgid "Error: Signature not verified"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:295
-#, kde-format
-msgid ""
-"<qt><p>Detailed results of importing %1:</p><table "
-"width=\"100%\">%2</table></qt>"
+#: crypto/decryptverifytask.cpp:182
+msgid "Good signature"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:299
-msgid "Totals"
+#: crypto/decryptverifytask.cpp:184
+msgid "Bad signature"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:305
-#: commands/importcertificatescommand.cpp:313
-msgid "Certificate Import Result"
+#: crypto/decryptverifytask.cpp:186
+msgid "Signing certificate revoked"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:320
-#, kde-format
-msgid ""
-"<qt><p>An error occurred while trying to import the "
-"certificate:</p><p><b>%1</b></p></qt>"
+#: crypto/decryptverifytask.cpp:188
+msgid "Signing certificate expired"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:324
-#, kde-format
-msgid ""
-"<qt><p>An error occurred while trying to import the certificate "
-"%1:</p><p><b>%2</b></p></qt>"
+#: crypto/decryptverifytask.cpp:190
+msgid "No public certificate to verify the signature"
 msgstr ""
 
-#: commands/importcertificatescommand.cpp:399
-#: commands/importcertificatescommand.cpp:436
-#, kde-format
-msgid ""
-"The type of this certificate (%1) is not supported by this Kleopatra "
-"installation."
+#: crypto/decryptverifytask.cpp:192
+msgid "Signature expired"
 msgstr ""
 
-#: commands/changeexpirycommand.cpp:222
-#, kde-format
-msgid ""
-"<p>An error occurred while trying to change the expiry date for "
-"<b>%1</b>:</p><p>%2</p>"
+#: crypto/decryptverifytask.cpp:194
+msgid "Certificate missing"
 msgstr ""
 
-#: commands/changeexpirycommand.cpp:226
-msgid "Expiry Date Change Error"
+#: crypto/decryptverifytask.cpp:196
+msgid "CRL missing"
 msgstr ""
 
-#: commands/changeexpirycommand.cpp:230
-msgid "Expiry date changed successfully."
+#: crypto/decryptverifytask.cpp:198
+msgid "CRL too old"
 msgstr ""
 
-#: commands/changeexpirycommand.cpp:231
-msgid "Expiry Date Change Succeeded"
+#: crypto/decryptverifytask.cpp:200
+msgid "Bad policy"
 msgstr ""
 
-#: commands/decryptverifyclipboardcommand.cpp:146
-msgid ""
-"The clipboard does not appear to contain a signature or encrypted text."
+#: crypto/decryptverifytask.cpp:202
+msgid "System error"
 msgstr ""
 
-#: commands/decryptverifyclipboardcommand.cpp:148
-#: commands/decryptverifyclipboardcommand.cpp:162
-msgid "Decrypt/Verify Clipboard Error"
+#: crypto/decryptverifytask.cpp:211
+msgid ""
+"The signature is valid but the trust in the certificate's validity is only "
+"marginal."
 msgstr ""
 
-#: commands/importcertificatefromclipboardcommand.cpp:118
-msgid "Clipboard contents do not look like a certificate."
+#: crypto/decryptverifytask.cpp:213
+msgid ""
+"The signature is valid and the certificate's validity is fully trusted."
 msgstr ""
 
-#: commands/importcertificatefromclipboardcommand.cpp:123
-msgid "Could not determine certificate type of clipboard contents."
+#: crypto/decryptverifytask.cpp:215
+msgid ""
+"The signature is valid and the certificate's validity is ultimately trusted."
 msgstr ""
 
-#: commands/adduseridcommand.cpp:219
-#, kde-format
-msgctxt "@info"
+#: crypto/decryptverifytask.cpp:217
 msgid ""
-"<para>An error occurred while trying to add the user-id: "
-"<message>%1</message></para>"
+"The signature is valid but the certificate's validity is <em>not "
+"trusted</em>."
 msgstr ""
 
-#: commands/adduseridcommand.cpp:222
-msgctxt "@title:window"
-msgid "Add User-ID Error"
+#: crypto/decryptverifytask.cpp:219
+msgid "The signature is valid but the certificate's validity is unknown."
 msgstr ""
 
-#: commands/adduseridcommand.cpp:226
-msgctxt "@info"
-msgid "User-ID successfully added."
+#: crypto/decryptverifytask.cpp:222
+msgid "The signature is valid but the certificate's validity is undefined."
 msgstr ""
 
-#: commands/adduseridcommand.cpp:227
-msgctxt "@title:window"
-msgid "Add User-ID Succeeded"
+#: crypto/decryptverifytask.cpp:238 crypto/decryptverifytask.cpp:244
+msgid "Unknown certificate"
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:62
-msgctxt "@info"
-msgid ""
-"<para>Refreshing X.509 certificates implies downloading CRLs for all "
-"certificates, even if they might otherwise still be valid.</para><para>This "
-"can put a severe strain on your own as well as other people's network "
-"connections, and can take up to an hour or more to complete, depending on "
-"your network connection, and the number of certificates to check.</para> "
-"<para>Are you sure you want to continue?</para>"
+#: crypto/decryptverifytask.cpp:263
+#, kde-format
+msgid "Signed on %1 with unknown certificate %2."
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:68
-msgctxt "@title:window"
-msgid "X.509 Certificate Refresh"
+#: crypto/decryptverifytask.cpp:265
+#, kde-format
+msgid "Signed with unknown certificate %1."
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:79
-msgctxt "@title:window"
-msgid "X.509 Certificate Refresh Error"
+#: crypto/decryptverifytask.cpp:270
+#, kde-format
+msgctxt "date, key owner, key ID"
+msgid "Signed on %1 by %2 (Key ID: %3)."
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:83
-msgctxt "@title:window"
-msgid "X.509 Certificate Refresh Finished"
+#: crypto/decryptverifytask.cpp:275
+#, kde-format
+msgid "Signed by %1 with certificate %2."
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:88
+#: crypto/decryptverifytask.cpp:278
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>The GpgSM process that tried to refresh X.509 certificates ended "
-"prematurely because of an unexpected error.</para><para>Please check the "
-"output of <icode>%1</icode> for details.</para>"
+msgid "Signed on %1 with certificate %2."
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:95
+#: crypto/decryptverifytask.cpp:279
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>An error occurred while trying to refresh X.509 "
-"certificates.</para><para>The output from <command>%1</command> was: "
-"<message>%2</message></para>"
+msgid "Signed with certificate %1."
 msgstr ""
 
-#: commands/refreshx509certscommand.cpp:101
-msgctxt "@info"
-msgid "X.509 certificates refreshed successfully."
+#: crypto/decryptverifytask.cpp:290 crypto/signencryptfilestask.cpp:74
+#, kde-format
+msgctxt "Input file --> Output file (rarr is arrow"
+msgid "%1 &rarr; %2"
 msgstr ""
 
-#: commands/signclipboardcommand.cpp:151 commands/signclipboardcommand.cpp:164
-msgid "Sign Clipboard Error"
+#: crypto/decryptverifytask.cpp:360
+msgid "<b>Verification canceled.</b>"
 msgstr ""
 
-#: commands/dumpcertificatecommand.cpp:260
-msgid "Certificate Dump"
+#: crypto/decryptverifytask.cpp:362
+#, kde-format
+msgid "<b>Verification failed: %1.</b>"
 msgstr ""
 
-#: commands/dumpcertificatecommand.cpp:287
-#: commands/dumpcertificatecommand.cpp:311
-#: commands/dumpcertificatecommand.cpp:316
-msgid "Dump Certificate Error"
+#: crypto/decryptverifytask.cpp:368
+msgid "<b>No signatures found.</b>"
 msgstr ""
 
-#: commands/dumpcertificatecommand.cpp:307
+#: crypto/decryptverifytask.cpp:372
 #, kde-format
-msgid ""
-"The GpgSM process that tried to dump the certificate ended prematurely "
-"because of an unexpected error. Please check the output of gpgsm --dump-cert "
-"%1 for details."
-msgstr ""
+msgid "<b>Invalid signature.</b>"
+msgid_plural "<b>%1 invalid signatures.</b>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/dumpcertificatecommand.cpp:314
+#: crypto/decryptverifytask.cpp:376
 #, kde-format
-msgid ""
-"An error occurred while trying to dump the certificate. The output from "
-"GpgSM was:\n"
-"%1"
-msgstr ""
+msgid "<b>Not enough information to check signature validity.</b>"
+msgid_plural "<b>%1 signatures could not be verified.</b>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/decryptverifyfilescommand.cpp:164
-msgid "Decrypt/Verify Files Error"
+#: crypto/decryptverifytask.cpp:383
+msgid "<b>Signature is valid.</b>"
 msgstr ""
 
-#: commands/decryptverifyfilescommand.cpp:175
-msgid "Select One or More Files to Decrypt and/or Verify"
+#: crypto/decryptverifytask.cpp:384
+#, kde-format
+msgid "<b>Signed by %1</b>"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:98
-msgctxt "@title:window"
-msgid "Delete Certificates"
+#: crypto/decryptverifytask.cpp:387
+msgid "certificate"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:163
+#: crypto/decryptverifytask.cpp:386
+#, kde-format
 msgid ""
-"Neither the OpenPGP nor the CMS backends support certificate deletion.\n"
-"Check your installation."
+"<br/><b>Warning:</b> The sender's mail address is not stored in the %1 used "
+"for signing."
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:167
+#: crypto/decryptverifytask.cpp:390
+#, kde-format
+msgid "<b>Valid signature.</b>"
+msgid_plural "<b>%1 valid signatures.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: crypto/decryptverifytask.cpp:392
 msgid ""
-"The OpenPGP backend does not support certificate deletion.\n"
-"Check your installation.\n"
-"Only the selected CMS certificates will be deleted."
+"<br/><b>Warning:</b> The sender's mail address is not stored in the "
+"certificates used for signing."
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:174
-#: commands/deletecertificatescommand.cpp:178
-msgid ""
-"The OpenPGP backend does not support certificate deletion.\n"
-"Check your installation."
+#: crypto/decryptverifytask.cpp:403
+msgid "<b>Decryption canceled.</b>"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:184
-msgid ""
-"The CMS backend does not support certificate deletion.\n"
-"Check your installation.\n"
-"Only the selected OpenPGP certificates will be deleted."
+#: crypto/decryptverifytask.cpp:405 crypto/decryptverifytask.cpp:407
+#, kde-format
+msgid "<b>Decryption failed: %1.</b>"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:200
-#: commands/deletecertificatescommand.cpp:213
-msgid ""
-"The CMS backend does not support certificate deletion.\n"
-"Check your installation."
+#: crypto/decryptverifytask.cpp:408
+msgid "<b>Decryption succeeded.</b>"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:280
-#: commands/deletecertificatescommand.cpp:349
-msgid "Certificate Deletion Failed"
+#: crypto/decryptverifytask.cpp:423
+msgid "The signature is bad."
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:281
-msgid "Certificate Deletion Problem"
+#: crypto/decryptverifytask.cpp:425
+msgid "The validity of the signature cannot be verified."
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:340
+#: crypto/decryptverifytask.cpp:426
 #, kde-format
-msgid "OpenPGP backend: %1"
+msgid "The signature is invalid: %1"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:343
+#: crypto/decryptverifytask.cpp:438 crypto/decryptverifytask.cpp:455
+#: crypto/signencryptfilestask.cpp:223 crypto/signencryptfilestask.cpp:235
 #, kde-format
-msgid "CMS backend: %1"
+msgid "Input error: %1"
 msgstr ""
 
-#: commands/deletecertificatescommand.cpp:345
+#: crypto/decryptverifytask.cpp:448
+msgctxt "separator for a list of e-mail addresses"
+msgid ", "
+msgstr ""
+
+#: crypto/decryptverifytask.cpp:448
 #, kde-format
 msgid ""
-"<qt><p>An error occurred while trying to delete the "
-"certificate:</p><p><b>%1</b></p></qt>"
+"<p>The sender's address %1 is not stored in the certificate. Stored: %2</p>"
 msgstr ""
 
-#: commands/exportsecretkeycommand.cpp:126
-msgctxt "@title:window"
-msgid "Secret Key Export Error"
-msgstr ""
+#: crypto/decryptverifytask.cpp:461
+#, kde-format
+msgid "One unknown recipient."
+msgid_plural "%1 unknown recipients."
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/exportsecretkeycommand.cpp:130
-msgctxt "@title:window"
-msgid "Secret Key Export Finished"
-msgstr ""
+#: crypto/decryptverifytask.cpp:465
+msgid "Recipient:"
+msgid_plural "Recipients:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/exportsecretkeycommand.cpp:135
+#: crypto/decryptverifytask.cpp:473
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>The GPG or GpgSM process that tried to export the secret key ended "
-"prematurely because of an unexpected error.</para><para>Please check the "
-"output of <icode>%1</icode> for details.</para>"
-msgstr ""
+msgid "One unknown recipient"
+msgid_plural "%1 unknown recipients"
+msgstr[0] ""
+msgstr[1] ""
 
-#: commands/exportsecretkeycommand.cpp:142
+#: crypto/decryptverifytask.cpp:689
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>An error occurred while trying to export the secret key.</para> "
-"<para>The output from <command>%1</command> was: <message>%2</message></para>"
+msgctxt "label: result example: foo.sig: Verification failed. "
+msgid "%1: %2"
 msgstr ""
 
-#: commands/exportsecretkeycommand.cpp:148
-msgctxt "@info"
-msgid "Secret key successfully exported."
+#: crypto/decryptverifytask.cpp:811 crypto/decryptverifytask.cpp:908
+#: crypto/decryptverifytask.cpp:962 crypto/decryptverifytask.cpp:1061
+#: crypto/decryptverifytask.cpp:1114 crypto/decryptverifytask.cpp:1212
+#: crypto/decryptverifytask.cpp:1260 crypto/decryptverifytask.cpp:1346
+#, kde-format
+msgid "Caught exception: %1"
 msgstr ""
 
-#: commands/importcrlcommand.cpp:70
+#: crypto/decryptverifytask.cpp:863
 msgid ""
-"Certificate Revocation Lists, DER encoded (*.crl *.arl *-crl.der *-arl.der)"
+"Could not determine whether this is an S/MIME or an OpenPGP "
+"signature/ciphertext - maybe it is neither ciphertext nor a signature?"
 msgstr ""
 
-#: commands/importcrlcommand.cpp:71
-msgid "Select CRL File to Import"
+#: crypto/decryptverifytask.cpp:869 crypto/decryptverifytask.cpp:1020
+#, kde-format
+msgid "Decrypting: %1..."
 msgstr ""
 
-#: commands/importcrlcommand.cpp:161
-msgid "Unable to start process dirmngr. Please check your installation."
+#: crypto/decryptverifytask.cpp:1014
+msgid ""
+"Could not determine whether this was S/MIME- or OpenPGP-encrypted - maybe it "
+"is not ciphertext at all?"
 msgstr ""
 
-#: commands/importcrlcommand.cpp:179
+#: crypto/decryptverifytask.cpp:1166 crypto/decryptverifytask.cpp:1300
 msgid ""
-"The GpgSM process that tried to import the CRL file ended prematurely "
-"because of an unexpected error. Please check the output of gpgsm --call-"
-"dirmngr loadcrl &lt;filename&gt; for details."
+"Could not determine whether this is an S/MIME or an OpenPGP signature - "
+"maybe it is not a signature at all?"
 msgstr ""
 
-#: commands/importcrlcommand.cpp:182 commands/importcrlcommand.cpp:186
-msgid "Import CRL Error"
+#: crypto/decryptverifytask.cpp:1172
+#, kde-format
+msgid "Verifying: %1..."
 msgstr ""
 
-#: commands/importcrlcommand.cpp:184
+#: crypto/decryptverifytask.cpp:1311
 #, kde-format
-msgid ""
-"An error occurred while trying to import the CRL file. The output from gpgsm "
-"was:\n"
-"%1"
+msgid "Verifying signature: %1..."
 msgstr ""
 
-#: commands/importcrlcommand.cpp:188
-msgid "CRL file imported successfully."
-msgstr "Mewnforiwyd y ffeil CRL yn llwyddiannus."
+#: crypto/verifychecksumscontroller.cpp:220
+msgctxt "@title:window"
+msgid "Verify Checksum Results"
+msgstr ""
 
-#: commands/importcrlcommand.cpp:189
-msgid "Import CRL Finished"
+#: crypto/verifychecksumscontroller.cpp:452
+#, kde-format
+msgid "Cannot find checksums file for file %1"
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:212
-msgid "Export Certificates"
+#: crypto/verifychecksumscontroller.cpp:590
+#: crypto/createchecksumscontroller.cpp:597
+msgid "Scanning directories..."
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:216
-msgid "OpenPGP Certificates"
+#: crypto/verifychecksumscontroller.cpp:603
+#: crypto/createchecksumscontroller.cpp:612
+msgid "Calculating total size..."
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:217
-msgid "S/MIME Certificates"
+#: crypto/verifychecksumscontroller.cpp:622
+#, kde-format
+msgid "Verifying checksums (%2) in %1"
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:251
-msgid "Exporting certificates..."
+#: crypto/verifychecksumscontroller.cpp:631
+#: crypto/createchecksumscontroller.cpp:640
+msgid "Done."
+msgstr "Wedi'i wneud."
+
+#: crypto/encryptemailcontroller.cpp:150
+msgid "Call to EncryptEMailController::protocolAsString() is ambiguous."
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:262
-#, kde-format
-msgid ""
-"<qt><p>An error occurred while trying to export the "
-"certificate:</p><p><b>%1</b></p></qt>"
+#: crypto/encryptemailcontroller.cpp:169 crypto/signemailcontroller.cpp:180
+#: crypto/newsignencryptemailcontroller.cpp:382
+#: crypto/signencryptfilescontroller.cpp:278
+msgid "User cancel"
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:266
-#: commands/exportcertificatecommand.cpp:309
-msgid "Certificate Export Failed"
+#: crypto/encryptemailtask.cpp:85 crypto/signencryptfilestask.cpp:186
+msgid "Encryption canceled."
 msgstr ""
 
-#: commands/exportcertificatecommand.cpp:308
+#: crypto/encryptemailtask.cpp:88
 #, kde-format
-msgid "Could not write to file %1."
+msgid "Encryption failed: %1"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:260
-msgid "new email"
+#: crypto/encryptemailtask.cpp:90 crypto/signencryptfilestask.cpp:191
+msgid "Encryption succeeded."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:261
-msgid "new dns name"
+#: crypto/task.cpp:169
+msgid "Unknown exception in Task::start()"
+msgstr ""
+
+#: crypto/decryptverifyemailcontroller.cpp:84
+msgid "Status and progress of the crypto operations is shown here."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:262
-msgid "new uri"
+#: crypto/decryptverifyemailcontroller.cpp:164
+#: crypto/decryptverifyfilescontroller.cpp:208
+msgid "User canceled"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:511
-msgctxt "@action"
-msgid "Create Key"
+#: crypto/decryptverifyemailcontroller.cpp:252
+msgid "Decrypt/Verify E-Mail"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:562
-#, kde-format
-msgid "Could not start certificate creation: %1"
+#: crypto/decryptverifyemailcontroller.cpp:274
+msgid "At least one input needs to be provided"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:575
-msgid "Operation canceled."
+#: crypto/decryptverifyemailcontroller.cpp:278
+msgid "Informative sender/signed data count mismatch"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:576
-#, kde-format
-msgid "Could not create certificate: %1"
+#: crypto/decryptverifyemailcontroller.cpp:283
+msgid "Signature/signed data count mismatch"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:583
-#, kde-format
-msgid ""
-"Certificate created successfully.\n"
-"Fingerprint: %1"
+#: crypto/decryptverifyemailcontroller.cpp:286
+msgid "Signed data can only be given for detached signature verification"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:589
-#, kde-format
-msgid "Could not write output file %1: %2"
+#: crypto/decryptverifyemailcontroller.cpp:292
+msgid "Input/Output count mismatch"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:597
-msgid "Certificate created successfully."
+#: crypto/decryptverifyemailcontroller.cpp:295
+msgid "Cannot use output and signed data simultaneously"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:636
-msgctxt "@title"
-msgid "Key Creation Failed"
+#: crypto/decryptverifyemailcontroller.cpp:302
+#, kde-format
+msgid "No backend support for %1"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:637
-msgid ""
-"Key pair creation failed. Please find details about the failure below."
+#: crypto/signemailtask.cpp:85 crypto/signencryptfilestask.cpp:173
+msgid "Signing canceled."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:639
-msgctxt "@title"
-msgid "Key Pair Successfully Created"
+#: crypto/signemailtask.cpp:88
+#, kde-format
+msgid "Signing failed: %1"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:640
-msgid ""
-"Your new key pair was created successfully. Please find details on the "
-"result and some suggested next steps below."
+#: crypto/signemailtask.cpp:90 crypto/signencryptfilestask.cpp:177
+msgid "Signing succeeded."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:701
-msgctxt "@title"
-msgid "Save Request"
+#: crypto/gui/wizard.cpp:103
+msgid "&Next"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:702
-msgid "PKCS#10 Requests (*.p10)"
+#: crypto/gui/wizard.cpp:141
+msgid "Back"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:711
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Could not copy temporary file <filename>%1</filename> to file "
-"<filename>%2</filename>: <message>%3</message>"
+#: crypto/gui/signemailwizard.cpp:82
+msgid "You need to select a signing certificate to proceed."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:714
-msgctxt "@title"
-msgid "Error Saving Request"
+#: crypto/gui/signemailwizard.cpp:88
+#, kde-format
+msgid "You need to select an %1 signing certificate to proceed."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:718
+#: crypto/gui/signemailwizard.cpp:90
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>Successfully wrote request to <filename>%1</filename>.</para><para>You "
-"should now send the request to the Certification Authority (CA).</para>"
+msgid "You need to select %1 and %2 signing certificates to proceed."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:721
-msgctxt "@title"
-msgid "Request Saved"
+#: crypto/gui/signemailwizard.cpp:118
+msgid "Sign Mail Message"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:729
-msgid "Please process this certificate."
+#: crypto/gui/signerresolvepage.cpp:87
+msgid "No certificate selected"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:730
-msgid ""
-"Please process this certificate and inform the sender about the location to "
-"fetch the resulting certificate.\n"
-"\n"
-"Thanks,\n"
+#: crypto/gui/signerresolvepage.cpp:86
+#, kde-format
+msgctxt "%1=protocol (S/Mime, OpenPGP), %2=certificate"
+msgid "Sign using %1: %2"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:754
-msgid "My new OpenPGP certificate"
+#: crypto/gui/signerresolvepage.cpp:284
+msgid "Sign and encrypt (OpenPGP only)"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:755
-msgid "Please find attached my new OpenPGP certificate."
+#: crypto/gui/signerresolvepage.cpp:290
+msgid "Encrypt only"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:786
-msgctxt "@info"
-msgid ""
-"<para><application>Kleopatra</application> tried to send a mail via your "
-"default mail client.</para><para>Some mail clients are known not to support "
-"attachments when invoked this way.</para><para>If your mail client does not "
-"have an attachment, then drag the <application>Kleopatra</application> icon "
-"and drop it on the message compose window of your mail "
-"client.</para><para>If that does not work, either, save the request to a "
-"file, and then attach that.</para>"
+#: crypto/gui/signerresolvepage.cpp:295
+msgid "Sign only"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:790
-msgctxt "@title"
-msgid "Sending Mail"
+#: crypto/gui/signerresolvepage.cpp:300
+msgid "Encryption Options"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:826
-msgctxt "@info"
-msgid ""
-"This operation will delete the certification request. Please make sure that "
-"you have sent or saved it before proceeding."
+#: crypto/gui/signerresolvepage.cpp:303
+#: crypto/gui/newsignencryptfileswizard.cpp:356
+msgid "Text output (ASCII armor)"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:828
-msgctxt "@title"
-msgid "Certification Request About To Be Deleted"
+#: crypto/gui/signerresolvepage.cpp:306
+#: crypto/gui/newsignencryptfileswizard.cpp:357
+msgid "Remove unencrypted original file when done"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:859
-msgctxt "@title"
-msgid "Certificate Creation Wizard"
+#: crypto/gui/signerresolvepage.cpp:312
+msgid "Signing Options"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:920
-#: dialogs/adduseriddialog.cpp:71
-msgid "Comment"
+#: crypto/gui/signerresolvepage.cpp:317
+msgid "Signer:"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:935
-#: dialogs/adduseriddialog.cpp:86
-#, kde-format
-msgctxt "Format string for the labels in the \"Your Personal Data\" page"
-msgid "%1 (%2)"
+#: crypto/gui/signerresolvepage.cpp:332
+msgid "Change Signing Certificates..."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1022
-#: dialogs/adduseriddialog.cpp:114
-#, kde-format
-msgctxt "interpunctation for labels"
-msgid "%1:"
+#: crypto/gui/signerresolvepage.cpp:491
+msgid "<b>Choose Operation to be Performed</b>"
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:26
-#. i18n: ectx: property (text), widget (QLabel, nameRequiredLB)
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:43
-#. i18n: ectx: property (text), widget (QLabel, emailRequiredLB)
-#: newcertificatewizard/newcertificatewizard.cpp:1024
-#: dialogs/adduseriddialog.cpp:116 rc.cpp:265 rc.cpp:271
-msgid "(required)"
+#: crypto/gui/newsignencryptfileswizard.cpp:134
+msgctxt "@title:window"
+msgid "Selected Files"
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:60
-#. i18n: ectx: property (text), widget (QLabel, commentRequiredLB)
-#: newcertificatewizard/newcertificatewizard.cpp:1024
-#: dialogs/adduseriddialog.cpp:116 rc.cpp:277
-msgid "(optional)"
+#: crypto/gui/newsignencryptfileswizard.cpp:213
+msgid "No files selected."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1180
-#: dialogs/adduseriddialog.cpp:280
-#, kde-format
-msgctxt "@info"
-msgid "<interface>%1</interface> is required, but empty."
+#: crypto/gui/newsignencryptfileswizard.cpp:214
+msgid "Selected file:"
+msgid_plural "Selected files:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: crypto/gui/newsignencryptfileswizard.cpp:217
+msgctxt "@action"
+msgid "More..."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1182
-#: dialogs/adduseriddialog.cpp:282
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<interface>%1</interface> is required, but empty.<nl/>Local Admin rule: "
-"<icode>%2</icode>"
+#: crypto/gui/newsignencryptfileswizard.cpp:347
+msgid "Archive files with:"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1188
-#: dialogs/adduseriddialog.cpp:288
-#, kde-format
-msgctxt "@info"
-msgid "<interface>%1</interface> is incomplete."
+#: crypto/gui/newsignencryptfileswizard.cpp:349
+msgid "Archive name (OpenPGP):"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1190
-#: dialogs/adduseriddialog.cpp:290
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<interface>%1</interface> is incomplete.<nl/>Local Admin rule: "
-"<icode>%2</icode>"
+#: crypto/gui/newsignencryptfileswizard.cpp:351
+msgid "Archive name (S/MIME):"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1195
-#: dialogs/adduseriddialog.cpp:295
-#, kde-format
-msgctxt "@info"
-msgid "<interface>%1</interface> is invalid."
+#: crypto/gui/newsignencryptfileswizard.cpp:353
+msgid "Sign and Encrypt (OpenPGP only)"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1197
-#: dialogs/adduseriddialog.cpp:297
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<interface>%1</interface> is invalid.<nl/>Local Admin rule: <icode>%2</icode>"
+#: crypto/gui/newsignencryptfileswizard.cpp:365
+msgctxt "@title"
+msgid "What do you want to do?"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1239
-#: dialogs/certifycertificatedialog.cpp:186
-msgid "Certify"
+#: crypto/gui/newsignencryptfileswizard.cpp:367
+msgctxt "@title"
+msgid "Please select here whether you want to sign or encrypt files."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1241
-msgid "Authenticate"
+#: crypto/gui/newsignencryptfileswizard.cpp:469
+msgctxt "base name of an archive file, e.g. archive.zip or archive.tar.gz"
+msgid "archive"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1291
-msgid "Name:"
+#: crypto/gui/newsignencryptfileswizard.cpp:523
+msgctxt "@info"
+msgid ""
+"<para>Archiving in combination with sign-only currently requires what are "
+"known as opaque signatures - unlike detached ones, these embed the content "
+"in the signature.</para><para>This format is rather unusual. You might want "
+"to archive the files separately, and then sign the archive as one file with "
+"Kleopatra.</para><para>Future versions of Kleopatra are expected to also "
+"support detached signatures in this case.</para>"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1292
-msgid "Email Address:"
+#: crypto/gui/newsignencryptfileswizard.cpp:528
+msgctxt "@title:window"
+msgid "Unusual Signature Warning"
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:50
-#. i18n: ectx: property (text), widget (QLabel, commentLB)
-#: newcertificatewizard/newcertificatewizard.cpp:1295 rc.cpp:274
-msgid "Comment:"
+#: crypto/gui/newsignencryptfileswizard.cpp:588
+msgid "This operation is not available for S/MIME"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1297
-msgid "Subject-DN:"
+#: crypto/gui/newsignencryptfileswizard.cpp:615
+msgid "Add"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1300
-msgid "Key Type:"
+#: crypto/gui/newsignencryptfileswizard.cpp:616
+msgid "Remove"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1302
-#: newcertificatewizard/newcertificatewizard.cpp:1304
-msgid "Key Strength:"
+#: crypto/gui/newsignencryptfileswizard.cpp:619
+msgctxt "@title"
+msgid "For whom do you want to encrypt?"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1302
-#: newcertificatewizard/newcertificatewizard.cpp:1309
-#, kde-format
-msgid "1 bit"
-msgid_plural "%1 bits"
-msgstr[0] ""
-msgstr[1] ""
-
-#: newcertificatewizard/newcertificatewizard.cpp:1304
-#: newcertificatewizard/newcertificatewizard.cpp:1311
-msgid "default"
+#: crypto/gui/newsignencryptfileswizard.cpp:621
+msgctxt "@title"
+msgid ""
+"Please select for whom you want the files to be encrypted. Do not forget to "
+"pick one of your own certificates."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1305
-msgid "Certificate Usage:"
+#: crypto/gui/newsignencryptfileswizard.cpp:624
+msgctxt "@action"
+msgid "Encrypt"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1305
-#: newcertificatewizard/newcertificatewizard.cpp:1312
-msgctxt "separator for key usages"
-msgid ",&nbsp;"
+#: crypto/gui/newsignencryptfileswizard.cpp:718
+msgctxt "@info"
+msgid ""
+"<para>None of the recipients you are encrypting to seems to be your "
+"own.</para><para>This means that you will not be able to decrypt the data "
+"anymore, once encrypted.</para><para>Do you want to continue, or cancel to "
+"change the recipient selection?</para>"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1307
-msgid "Subkey Type:"
+#: crypto/gui/newsignencryptfileswizard.cpp:721
+#: crypto/gui/newsignencryptfileswizard.cpp:732
+msgctxt "@title:window"
+msgid "Encrypt-To-Self Warning"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1309
-#: newcertificatewizard/newcertificatewizard.cpp:1311
-msgid "Subkey Strength:"
+#: crypto/gui/newsignencryptfileswizard.cpp:730
+msgctxt "@info"
+msgid ""
+"<para>You have requested the unencrypted data to be removed after "
+"encryption.</para><para>Are you really sure you do not need to access the "
+"data anymore in decrypted form?</para>"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1312
-msgid "Subkey Usage:"
+#: crypto/gui/newsignencryptfileswizard.cpp:781
+msgid "Sign with OpenPGP"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1316
-msgid "Valid Until:"
+#: crypto/gui/newsignencryptfileswizard.cpp:782
+msgid "Sign with S/MIME"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1319
-msgid "Add. Email Address:"
+#: crypto/gui/newsignencryptfileswizard.cpp:785
+msgctxt "@title"
+msgid "Who do you want to sign as?"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1321
-msgid "DNS Name:"
+#: crypto/gui/newsignencryptfileswizard.cpp:787
+msgctxt "@title"
+msgid "Please choose an identity with which to sign the data."
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1323
-msgid "URI:"
+#: crypto/gui/newsignencryptfileswizard.cpp:863
+msgctxt "@action"
+msgid "Sign"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1381
-#, kde-format
-msgctxt "%2: some admin-supplied text, %1: key size in bits"
-msgid "%2 (1 bit; default)"
-msgid_plural "%2 (%1 bits; default)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: newcertificatewizard/newcertificatewizard.cpp:1382
-#, kde-format
-msgctxt "%2: some admin-supplied text, %1: key size in bits"
-msgid "%2 (1 bit)"
-msgid_plural "%2 (%1 bits)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: newcertificatewizard/newcertificatewizard.cpp:1384
-#, kde-format
-msgctxt "%1: key size in bits"
-msgid "1 bit (default)"
-msgid_plural "%1 bits (default)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: newcertificatewizard/newcertificatewizard.cpp:1385
-#, kde-format
-msgctxt "%1: key size in bits"
-msgid "1 bit"
-msgid_plural "%1 bits"
-msgstr[0] ""
-msgstr[1] ""
-
-#. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:192
-#. i18n: ectx: attribute (title), widget (QWidget, personalTab)
-#: newcertificatewizard/newcertificatewizard.cpp:1445 rc.cpp:385
-msgid "Personal Details"
+#: crypto/gui/newsignencryptfileswizard.cpp:879
+msgctxt "@action"
+msgid "Sign && Encrypt"
 msgstr ""
 
-#: newcertificatewizard/newcertificatewizard.cpp:1449
-msgctxt "@info:tooltip"
-msgid "Adding more than one User ID is not yet implemented."
+#: crypto/gui/newsignencryptfileswizard.cpp:922
+msgctxt "@title"
+msgid "Results"
 msgstr ""
 
-#: view/searchbar.cpp:90
-msgid "&Find:"
+#: crypto/gui/newsignencryptfileswizard.cpp:924
+msgctxt "@title"
+msgid "Status and progress of the crypto operations is shown here."
 msgstr ""
 
-#: view/keylistcontroller.cpp:336
-msgid "New Certificate..."
+#: crypto/gui/newresultpage.cpp:103 crypto/gui/resultpage.cpp:104
+msgid "Keep open after operation completed"
 msgstr ""
 
-#: view/keylistcontroller.cpp:338
-msgid "Export Certificates..."
+#: crypto/gui/newresultpage.cpp:135 crypto/gui/resultpage.cpp:131
+#, kde-format
+msgid "%1: All operations completed."
 msgstr ""
 
-#: view/keylistcontroller.cpp:340
-msgid "Export Certificates to Server..."
+#: crypto/gui/newresultpage.cpp:137 crypto/gui/resultpage.cpp:133
+msgid "All operations completed."
 msgstr ""
 
-#: view/keylistcontroller.cpp:342
-msgid "Export Secret Keys..."
+#: crypto/gui/newresultpage.cpp:160 crypto/gui/resultpage.cpp:149
+#: crypto/gui/resultlistwidget.cpp:224
+#, kde-format
+msgctxt "number, operation description"
+msgid "Operation %1: %2"
 msgstr ""
 
-#: view/keylistcontroller.cpp:344
-msgid "Lookup Certificates on Server..."
+#: crypto/gui/newresultpage.cpp:162 crypto/gui/resultpage.cpp:151
+#, kde-format
+msgctxt "tag( \"OpenPGP\" or \"CMS\"),  operation description"
+msgid "%1: %2"
 msgstr ""
 
-#: view/keylistcontroller.cpp:346
-msgid "Import Certificates..."
+#: crypto/gui/newresultpage.cpp:167 crypto/gui/resultpage.cpp:156
+msgid "<b>Results</b>"
 msgstr ""
 
-#: view/keylistcontroller.cpp:348
-msgid "Decrypt/Verify Files..."
+#: crypto/gui/decryptverifyoperationwidget.cpp:95
+msgid "Input file:"
 msgstr ""
 
-#: view/keylistcontroller.cpp:350
-msgid "Sign/Encrypt Files..."
+#: crypto/gui/decryptverifyoperationwidget.cpp:99
+msgid "&Input file is a detached signature"
 msgstr ""
 
-#: view/keylistcontroller.cpp:352
-msgid "Create Checksum Files..."
+#: crypto/gui/decryptverifyoperationwidget.cpp:100
+msgid "&Signed data:"
 msgstr ""
 
-#: view/keylistcontroller.cpp:354
-msgid "Verify Checksum Files..."
+#: crypto/gui/decryptverifyoperationwidget.cpp:105
+msgid "&Input file is an archive; unpack with:"
 msgstr ""
 
-#: view/keylistcontroller.cpp:357
-msgid "Redisplay"
+#: crypto/gui/verifychecksumsdialog.cpp:223
+msgid "The following errors and warnings were recorded:"
 msgstr ""
 
-#: view/keylistcontroller.cpp:359
-msgid "Stop Operation"
+#: crypto/gui/verifychecksumsdialog.cpp:224
+msgid "Checksum Verification Errors"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, CertificateDetailsDialog)
-#: view/keylistcontroller.cpp:361 rc.cpp:592
-msgid "Certificate Details"
+#: crypto/gui/verifychecksumsdialog.cpp:235
+#: crypto/gui/verifychecksumsdialog.cpp:259
+msgid "No errors occurred"
 msgstr ""
 
-#: view/keylistcontroller.cpp:364
-msgid "Delete"
+#: crypto/gui/verifychecksumsdialog.cpp:237
+#, kde-format
+msgid "One error occurred"
+msgid_plural "%1 errors occurred"
+msgstr[0] ""
+msgstr[1] ""
+
+#: crypto/gui/verifychecksumsdialog.cpp:257
+msgid "Progress:"
 msgstr ""
 
-#: view/keylistcontroller.cpp:366
-msgid "Certify Certificate..."
+#: crypto/gui/verifychecksumsdialog.cpp:260
+msgctxt "Show Errors"
+msgid "Show"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:53
-#. i18n: ectx: property (text), widget (QPushButton, changeExpiryDatePB)
-#: view/keylistcontroller.cpp:368 rc.cpp:607
-msgid "Change Expiry Date..."
+#: crypto/gui/signencryptfileswizard.cpp:84
+msgid ""
+"You need to select an OpenPGP signing certificate to perform this operation."
 msgstr ""
 
-#: view/keylistcontroller.cpp:370
-msgid "Change Owner Trust..."
+#: crypto/gui/signencryptfileswizard.cpp:87
+msgid "You need to select at least one signing certificate to proceed."
 msgstr ""
 
-#: view/keylistcontroller.cpp:372
-msgid "Trust Root Certificate"
+#: crypto/gui/signencryptfileswizard.cpp:90
+msgid ""
+"Only OpenPGP certificates will be offered for selection because you "
+"specified a combined sign/encrypt operation that is only available for "
+"OpenPGP."
 msgstr ""
 
-#: view/keylistcontroller.cpp:374
-msgid "Distrust Root Certificate"
+#: crypto/gui/signencryptfileswizard.cpp:93
+msgid ""
+"Only OpenPGP certificates will be offered for selection because you only "
+"specified an OpenPGP signing certificate."
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:33
-#. i18n: ectx: property (text), widget (QPushButton, changePassphrasePB)
-#: view/keylistcontroller.cpp:376 rc.cpp:601
-msgid "Change Passphrase..."
+#: crypto/gui/signencryptfileswizard.cpp:96
+msgid ""
+"Only S/MIME certificates will be offered for selection because you only "
+"specified an S/MIME signing certificate."
 msgstr ""
 
-#: view/keylistcontroller.cpp:378
-msgid "Add User-ID..."
+#: crypto/gui/signencryptfileswizard.cpp:102
+msgid ""
+"You have selected both OpenPGP and S/MIME signing certificate types, thus "
+"two signatures will be created."
 msgstr ""
 
-#: view/keylistcontroller.cpp:380
-msgid "Dump Certificate"
+#: crypto/gui/signencryptfileswizard.cpp:106
+msgid ""
+"If you select both OpenPGP and S/MIME receipient certificates, two encrypted "
+"files will be created: one for OpenPGP recipients, one for S/MIME recipients."
 msgstr ""
 
-#: view/keylistcontroller.cpp:383
-msgid "Refresh X.509 Certificates"
+#: crypto/gui/signencryptfileswizard.cpp:131
+#: crypto/signencryptfilescontroller.cpp:159
+msgid "Sign/Encrypt Files"
 msgstr ""
 
-#: view/keylistcontroller.cpp:385
-msgid "Refresh OpenPGP Certificates"
+#: crypto/gui/signencryptfileswizard.cpp:132
+#: crypto/signencryptfilescontroller.cpp:146
+msgid "Sign Files"
 msgstr ""
 
-#: view/keylistcontroller.cpp:388
-msgid "Clear CRL Cache"
+#: crypto/gui/signencryptfileswizard.cpp:133
+#: crypto/signencryptfilescontroller.cpp:153
+msgid "Encrypt Files"
 msgstr ""
 
-#: view/keylistcontroller.cpp:390
-msgid "Dump CRL Cache"
+#: crypto/gui/objectspage.cpp:77
+msgid "<b>Objects</b>"
 msgstr ""
 
-#: view/keylistcontroller.cpp:393
-msgid "Import CRL From File..."
+#: crypto/gui/objectspage.cpp:87 crypto/gui/resolverecipientspage.cpp:435
+msgid "Remove Selected"
 msgstr ""
 
-#: view/tabwidget.cpp:389
-msgid "New Tab"
+#: crypto/gui/objectspage.cpp:99
+msgid "Select File"
 msgstr ""
 
-#: view/tabwidget.cpp:389
-msgid "Open a new tab"
+#: crypto/gui/resultitemwidget.cpp:104
+msgid "Hide Details"
 msgstr ""
 
-#: view/tabwidget.cpp:390
-msgid "CTRL+SHIFT+N"
+#: crypto/gui/resultitemwidget.cpp:104
+msgid "Show Details"
 msgstr ""
 
-#: view/tabwidget.cpp:396
-msgid "Rename Tab..."
+#: crypto/gui/signencryptemailconflictdialog.cpp:163
+msgid "(no matching certificates found)"
 msgstr ""
 
-#: view/tabwidget.cpp:396
-msgid "Rename this tab"
+#: crypto/gui/signencryptemailconflictdialog.cpp:165
+msgid "Please select a certificate"
 msgstr ""
 
-#: view/tabwidget.cpp:397
-msgid "CTRL+SHIFT+R"
+#: crypto/gui/signencryptemailconflictdialog.cpp:222
+msgid "(please choose between OpenPGP and S/MIME first)"
 msgstr ""
 
-#: view/tabwidget.cpp:398
-msgid "Duplicate Tab"
+#: crypto/gui/signencryptemailconflictdialog.cpp:238
+#: crypto/gui/resolverecipientspage.cpp:210
+msgid "..."
 msgstr ""
 
-#: view/tabwidget.cpp:398
-msgid "Duplicate this tab"
+#: crypto/gui/signencryptemailconflictdialog.cpp:366
+#, kde-format
+msgid "Please select an encryption certificate for recipient \"%1\""
 msgstr ""
 
-#: view/tabwidget.cpp:399
-msgid "CTRL+SHIFT+D"
+#: crypto/gui/signencryptemailconflictdialog.cpp:376
+#, kde-format
+msgid "Please select a signing certificate for sender \"%1\""
 msgstr ""
 
-#: view/tabwidget.cpp:400
-msgid "Close Tab"
+#: crypto/gui/signencryptemailconflictdialog.cpp:386
+msgid ""
+"Kleopatra cannot unambiguously determine matching certificates for all "
+"recipients/senders of the message.\n"
+"Please select the correct certificates for each recipient:"
 msgstr ""
 
-#: view/tabwidget.cpp:400
-msgid "Close this tab"
+#: crypto/gui/signencryptemailconflictdialog.cpp:389
+msgid ""
+"Kleopatra cannot unambiguously determine matching certificates for the "
+"sender of the message.\n"
+"Please select the correct certificates for the sender:"
 msgstr ""
 
-#: view/tabwidget.cpp:401
-msgid "CTRL+SHIFT+W"
+#: crypto/gui/signencryptemailconflictdialog.cpp:392
+msgid ""
+"Kleopatra cannot unambiguously determine matching certificates for all "
+"recipients of the message.\n"
+"Please select the correct certificates for each recipient:"
 msgstr ""
 
-#: view/tabwidget.cpp:402
-msgid "Move Tab Left"
+#: crypto/gui/signencryptemailconflictdialog.cpp:400
+msgid ""
+"Please verify that correct certificates have been selected for each "
+"recipient:"
 msgstr ""
 
-#: view/tabwidget.cpp:403
-msgid "CTRL+SHIFT+LEFT"
+#: crypto/gui/signencryptemailconflictdialog.cpp:401
+msgid ""
+"Please verify that the correct certificate has been selected for the sender:"
 msgstr ""
 
-#: view/tabwidget.cpp:404
-msgid "Move Tab Right"
+#: crypto/gui/signencryptemailconflictdialog.cpp:579
+msgid "Show all recipients"
 msgstr ""
 
-#: view/tabwidget.cpp:405
-msgid "CTRL+SHIFT+RIGHT"
+#: crypto/gui/signencryptemailconflictdialog.cpp:581
+#: crypto/gui/resolverecipientspage.cpp:450
+msgid "S/MIME"
 msgstr ""
 
-#: view/tabwidget.cpp:406
-msgid "Hierarchical Certificate List"
+#: crypto/gui/signencryptemailconflictdialog.cpp:582
+msgid "Select Signing Certificate"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:229
-#. i18n: ectx: property (text), widget (QPushButton, expandAllCertificationsPB)
-#: view/tabwidget.cpp:408 rc.cpp:644
-msgid "Expand All"
+#: crypto/gui/signencryptemailconflictdialog.cpp:583
+msgid "Select Encryption Certificate"
 msgstr ""
 
-#: view/tabwidget.cpp:409
-msgid "CTRL+."
+#: crypto/gui/signencryptemailconflictdialog.cpp:584
+msgid "Only show this dialog in case of conflicts (experimental)"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:239
-#. i18n: ectx: property (text), widget (QPushButton, collapseAllCertificationsPB)
-#: view/tabwidget.cpp:410 rc.cpp:647
-msgid "Collapse All"
+#: crypto/gui/signencryptemailconflictdialog.cpp:605
+msgid "Select Certificates For Message"
 msgstr ""
 
-#: view/tabwidget.cpp:411
-msgid "CTRL+,"
+#: crypto/gui/signencryptemailconflictdialog.cpp:669
+msgid "From:"
 msgstr ""
 
-#: view/tabwidget.cpp:536
-msgid "Rename Tab"
+#: crypto/gui/signencryptemailconflictdialog.cpp:677
+msgid "To:"
 msgstr ""
 
-#: view/tabwidget.cpp:536
-msgid "New tab title:"
+#: crypto/gui/signencryptemailconflictdialog.cpp:715
+#, kde-format
+msgid "Select Certificates For Message \"%1\""
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:110
-msgid "Please select one or more of the following certificates:"
+#: crypto/gui/decryptverifyfileswizard.cpp:207
+msgid "<b>Choose operations to be performed</b>"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:111
-msgid "Please select one of the following certificates:"
+#: crypto/gui/decryptverifyfileswizard.cpp:208
+msgid ""
+"Here you can check and, if needed, override the operations Kleopatra "
+"detected for the input given."
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:148
-msgid "Reload"
+#: crypto/gui/decryptverifyfileswizard.cpp:211
+msgid "&Decrypt/Verify"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:149
-msgid "Lookup..."
+#: crypto/gui/decryptverifyfileswizard.cpp:217
+msgid "Create all output files in a single folder"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:150
-msgid "New..."
+#: crypto/gui/decryptverifyfileswizard.cpp:218
+msgid "&Output folder:"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:152
-msgctxt "@info:tooltip"
-msgid "Lookup certificates on server"
+#: crypto/gui/encryptemailwizard.cpp:52
+msgid "Encrypt Mail Message"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:153
-msgctxt "@info:tooltip"
-msgid "Refresh certificate list"
+#: crypto/gui/signingcertificateselectiondialog.cpp:49
+msgid "Select Signing Certificates"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:154
-msgctxt "@info:tooltip"
-msgid "Create a new certificate"
+#: crypto/gui/resolverecipientspage.cpp:203
+msgid "<i>No certificate selected</i>"
 msgstr ""
 
-#: dialogs/certificateselectiondialog.cpp:180
-msgid "Certificate Selection"
+#: crypto/gui/resolverecipientspage.cpp:416
+msgid "<b>Recipients</b>"
 msgstr ""
 
-#: dialogs/deletecertificatesdialog.cpp:94
-msgid "These are the certificates you have selected for deletion:"
+#: crypto/gui/resolverecipientspage.cpp:431
+msgid "Add Recipient..."
 msgstr ""
 
-#: dialogs/deletecertificatesdialog.cpp:96
+#: crypto/gui/resolverecipientspage.cpp:465
 msgid ""
-"These certificates will be deleted even though you did "
-"<emphasis>not</emphasis><nl/> explicitly select them (<a "
-"href=\"whatsthis://\">Why?</a>):"
+"<b>Warning:</b> None of the selected certificates seem to be your own. You "
+"will not be able to decrypt the encrypted data again."
 msgstr ""
 
-#: dialogs/deletecertificatesdialog.cpp:117
-msgctxt "@info:whatsthis"
-msgid ""
-"<title>Why do you want to delete more certificates than I "
-"selected?</title><para>When you delete CA certificates (both root CAs and "
-"intermediate CAs), the certificates issued by them will also be "
-"deleted.</para><para>This can be nicely seen in "
-"<application>Kleopatra</application>'s hierarchical view mode: In this mode, "
-"if you delete a certificate that has children, those children will also be "
-"deleted. Think of CA certificates as folders containing other certificates: "
-"When you delete the folder, you delete its contents, too.</para>"
+#: crypto/gui/resolverecipientspage.cpp:582
+msgid "Recipient"
 msgstr ""
 
-#: dialogs/deletecertificatesdialog.cpp:129
-msgctxt "@action:button"
-msgid "Delete"
+#: crypto/gui/resolverecipientspage.cpp:584
+#, kde-format
+msgctxt "%1 == number"
+msgid "Recipient (%1)"
 msgstr ""
 
-#: dialogs/deletecertificatesdialog.cpp:189
-msgid ""
-"The certificate to be deleted is your own. It contains private key material, "
-"which is needed to decrypt past communication encrypted to the certificate, "
-"and should therefore not be deleted."
-msgid_plural ""
-"All of the certificates to be deleted are your own. They contain private key "
-"material, which is needed to decrypt past communication encrypted to the "
-"certificate, and should therefore not be deleted."
-msgstr[0] ""
-msgstr[1] ""
-
-#: dialogs/deletecertificatesdialog.cpp:203
-msgid ""
-"One of the certificates to be deleted is your own. It contains private key "
-"material, which is needed to decrypt past communication encrypted to the "
-"certificate, and should therefore not be deleted."
-msgid_plural ""
-"Some of the certificates to be deleted are your own. They contain private "
-"key material, which is needed to decrypt past communication encrypted to the "
-"certificate, and should therefore not be deleted."
-msgstr[0] ""
-msgstr[1] ""
+#: crypto/gui/resolverecipientspage.cpp:617
+#, kde-format
+msgid "<qt><p>Recipients predefined via GnuPG settings:</p>%1"
+msgstr ""
 
-#: dialogs/deletecertificatesdialog.cpp:218
-msgid "Secret Key Deletion"
+#: crypto/gui/resolverecipientspage.cpp:627
+msgid "Sender"
 msgstr ""
 
-#: dialogs/exportcertificatesdialog.cpp:67
-msgid "Export"
+#: crypto/createchecksumscontroller.cpp:84
+msgctxt "@info"
+msgid "No checksum files have been created."
 msgstr ""
 
-#: dialogs/exportcertificatesdialog.cpp:71
-msgid " OpenPGP export file:"
+#: crypto/createchecksumscontroller.cpp:85
+msgctxt "@info"
+msgid "These checksum files have been successfully created:"
 msgstr ""
 
-#: dialogs/exportcertificatesdialog.cpp:77
-msgid "S/MIME export file:"
+#: crypto/createchecksumscontroller.cpp:88
+msgctxt "@info"
+msgid "There were no errors."
 msgstr ""
 
-#: dialogs/setinitialpindialog.cpp:89
+#: crypto/createchecksumscontroller.cpp:89
 msgctxt "@info"
+msgid "The following errors were encountered:"
+msgstr ""
+
+#: crypto/createchecksumscontroller.cpp:280
 msgid ""
-"No NullPin found. <warning>If this PIN was not set by you personally, the "
-"card might have been tampered with.</warning>"
+"Create Checksums: input files must be either all checksum files or all files "
+"to be checksummed, not a mixture of both."
 msgstr ""
 
-#: dialogs/setinitialpindialog.cpp:94
-msgctxt "@info"
-msgid "Canceled setting PIN."
+#: crypto/createchecksumscontroller.cpp:302
+msgid "Initializing..."
 msgstr ""
 
-#: dialogs/setinitialpindialog.cpp:97
+#: crypto/createchecksumscontroller.cpp:306
+msgctxt "@title:window"
+msgid "Create Checksum Progress"
+msgstr ""
+
+#: crypto/createchecksumscontroller.cpp:535
 #, kde-format
-msgctxt "@info"
-msgid "There was an error setting the PIN: <message>%1</message>."
+msgid "Failed to open file \"%1\" for reading and writing: %2"
 msgstr ""
 
-#: dialogs/setinitialpindialog.cpp:100
-msgctxt "@info"
-msgid "PIN set successfully."
+#: crypto/createchecksumscontroller.cpp:558
+#: commands/changeroottrustcommand.cpp:318
+#, kde-format
+msgid "Failed to move file %1 to its final destination, %2: %3"
 msgstr ""
 
-#: dialogs/lookupcertificatesdialog.cpp:121
-msgid "Import"
+#: crypto/createchecksumscontroller.cpp:585
+msgid "No checksum programs defined."
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:230
+#: crypto/createchecksumscontroller.cpp:629
 #, kde-format
-msgctxt "@info"
+msgid "Checksumming (%2) in %1"
+msgstr ""
+
+#: crypto/newsignencryptemailcontroller.cpp:297
 msgid ""
-"<para>An error occurred while loading the certifications: "
-"<message>%1</message></para>"
+"Call to NewSignEncryptEMailController::protocolAsString() is ambiguous."
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:233
-msgctxt "@title"
-msgid "Certifications Loading Failed"
+#: crypto/newsignencryptemailcontroller.cpp:517
+#: crypto/newsignencryptemailcontroller.cpp:522
+msgctxt "@title:window"
+msgid "Error"
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:256
-msgid "Please wait while generating the dump..."
+#: crypto/signencryptfilestask.cpp:176
+msgid "Signing failed."
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:334
-msgid "(please wait while certifications are being loaded)"
+#: crypto/signencryptfilestask.cpp:189
+msgid "Encryption failed."
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:335
-msgid "Load Certifications (may take a while)"
+#: crypto/signencryptfilestask.cpp:210
+msgid "Signing and encryption succeeded."
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:361
+#: crypto/signencryptfilestask.cpp:225 crypto/signencryptfilestask.cpp:237
 #, kde-format
-msgid "Issuer Certificate Not Found (%1)"
+msgid "Output error: %1"
 msgstr ""
 
-#: dialogs/certificatedetailsdialog.cpp:418
-msgctxt "@title"
-msgid "Subkeys"
+#: crypto/signencryptfilestask.cpp:240
+msgid " Encryption succeeded."
 msgstr ""
 
-#: dialogs/ownertrustdialog.cpp:55
-msgid "(unknown certificate)"
+#: crypto/signencryptfilestask.cpp:252
+#, kde-format
+msgid "%1: <b>Sign/encrypt canceled.</b>"
 msgstr ""
 
-#: dialogs/ownertrustdialog.cpp:105
+#: crypto/signencryptfilestask.cpp:252
 #, kde-format
-msgctxt "@title"
-msgid "Change Trust Level of %1"
+msgid " %1: Sign/encrypt failed."
 msgstr ""
 
-#: dialogs/ownertrustdialog.cpp:106
+#: crypto/signencryptfilestask.cpp:253
 #, kde-format
-msgctxt "@info"
-msgid ""
-"How much do you trust certifications made by <b>%1</b> to correctly verify "
-"authenticity of certificates?"
+msgctxt "label: result. Example: foo -> foo.gpg: Encryption failed."
+msgid "%1: <b>%2</b>"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:131
-msgid "<b>Step 1:</b> Please select the user IDs you wish to certify."
+#: crypto/signencryptfilestask.cpp:397
+msgid "Cannot determine protocol for task"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:140
-msgid "I have verified the fingerprint"
+#: crypto/signencryptfilescontroller.cpp:144
+msgid "Archive and Sign Files"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:159
+#: crypto/signencryptfilescontroller.cpp:151
+msgid "Archive and Encrypt Files"
+msgstr ""
+
+#: crypto/signencryptfilescontroller.cpp:157
+msgid "Archive and Sign/Encrypt Files"
+msgstr ""
+
+#: crypto/signencryptfilescontroller.cpp:477
 #, kde-format
 msgid ""
-"Certificate: %1\n"
-"Fingerprint: %2"
+"Caught unexpected exception in "
+"SignEncryptFilesController::Private::slotWizardOperationPrepared: %1"
 msgstr ""
 
-#. i18n: file: dialogs/certificationoptionswidget.ui:44
-#. i18n: ectx: property (text), widget (QLabel, singleKeyLabel)
-#: dialogs/certifycertificatedialog.cpp:199 rc.cpp:454
-#, kde-format, no-c-format
-msgid "Certification will be performed using certificate %1."
+#: crypto/signencryptfilescontroller.cpp:481
+msgid ""
+"Caught unknown exception in "
+"SignEncryptFilesController::Private::slotWizardOperationPrepared"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:229
-msgid "Signed user IDs:"
+#: crypto/decryptverifyfilescontroller.cpp:141
+msgid "Cannot determine whether input data is OpenPGP or CMS"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:232
-msgid "<b>Summary:</b>"
+#: crypto/decryptverifyfilescontroller.cpp:197
+#, kde-format
+msgid ""
+"Caught unexpected exception in "
+"DecryptVerifyFilesController::Private::slotWizardOperationPrepared: %1"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:236
-msgid "Check level:"
+#: crypto/decryptverifyfilescontroller.cpp:201
+msgid ""
+"Caught unknown exception in "
+"DecryptVerifyFilesController::Private::slotWizardOperationPrepared"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:239
-msgid "Selected secret key:"
+#: crypto/decryptverifyfilescontroller.cpp:252
+msgid "Decrypt/Verify Files"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:258
-msgid "Default certificate"
+#: crypto/decryptverifyfilescontroller.cpp:380
+msgid "No usable inputs found"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:262
-msgid "No statement made"
+#: commands/setinitialpincommand.cpp:71
+msgctxt "@title"
+msgid "Set Initial Pin"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:265
-msgid "Not checked"
+#: commands/learncardkeyscommand.cpp:75
+msgid "Error Learning SmartCard"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:268
-msgid "Casually checked"
+#: commands/learncardkeyscommand.cpp:79
+msgid "Finished Learning SmartCard"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:271
-msgid "Thoroughly checked"
+#: commands/learncardkeyscommand.cpp:84
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>The GPG or GpgSM process that tried to learn the smart card ended "
+"prematurely because of an unexpected error.</para><para>Please check the "
+"output of <icode>%1</icode> for details.</para>"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:286
+#: commands/decryptverifyclipboardcommand.cpp:146
 msgid ""
-"The certificate was not certified because it was already certified by the "
-"same certificate."
+"The clipboard does not appear to contain a signature or encrypted text."
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:288
+#: commands/decryptverifyclipboardcommand.cpp:148
+#: commands/decryptverifyclipboardcommand.cpp:162
+msgid "Decrypt/Verify Clipboard Error"
+msgstr ""
+
+#: commands/decryptverifyclipboardcommand.cpp:160
+#: commands/signencryptfilescommand.cpp:232
+#: commands/signclipboardcommand.cpp:149 commands/signclipboardcommand.cpp:162
+#: commands/decryptverifyfilescommand.cpp:162
+#: commands/checksumverifyfilescommand.cpp:154
+#: commands/encryptclipboardcommand.cpp:146
+#: commands/encryptclipboardcommand.cpp:159
+#: commands/checksumcreatefilescommand.cpp:154
 #, kde-format
-msgid "The certificate could not be certified. <b>Error</b>: %1"
+msgid "An error occurred: %1"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:290
-msgid "Certification canceled."
+#: commands/exportsecretkeycommand.cpp:126
+msgctxt "@title:window"
+msgid "Secret Key Export Error"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:292
-msgid "Certification successful."
+#: commands/exportsecretkeycommand.cpp:130
+msgctxt "@title:window"
+msgid "Secret Key Export Finished"
 msgstr ""
 
-#: dialogs/certifycertificatedialog.cpp:365
+#: commands/exportsecretkeycommand.cpp:135
 #, kde-format
-msgctxt "arg is name, email of certificate holder"
-msgid "Certify Certificate: %1"
+msgctxt "@info"
+msgid ""
+"<para>The GPG or GpgSM process that tried to export the secret key ended "
+"prematurely because of an unexpected error.</para><para>Please check the "
+"output of <icode>%1</icode> for details.</para>"
 msgstr ""
 
-#: dialogs/exportsecretkeydialog.cpp:103
-msgid "Secret Key Files"
+#: commands/exportsecretkeycommand.cpp:142
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>An error occurred while trying to export the secret key.</para> "
+"<para>The output from <command>%1</command> was: <message>%2</message></para>"
 msgstr ""
 
-#: dialogs/exportsecretkeydialog.cpp:124
-#, kde-format
+#: commands/exportsecretkeycommand.cpp:148
 msgctxt "@info"
-msgid "Please select export options for %1:"
+msgid "Secret key successfully exported."
+msgstr ""
+
+#: commands/changeexpirycommand.cpp:222
+#, kde-format
+msgid ""
+"<p>An error occurred while trying to change the expiry date for "
+"<b>%1</b>:</p><p>%2</p>"
+msgstr ""
+
+#: commands/changeexpirycommand.cpp:226
+msgid "Expiry Date Change Error"
+msgstr ""
+
+#: commands/changeexpirycommand.cpp:230
+msgid "Expiry date changed successfully."
+msgstr ""
+
+#: commands/changeexpirycommand.cpp:231
+msgid "Expiry Date Change Succeeded"
+msgstr ""
+
+#: commands/importcertificatescommand.cpp:207
+#, kde-format
+msgctxt "@info:tooltip"
+msgid "Imported Certificates from %1"
 msgstr ""
 
-#: dialogs/exportsecretkeydialog.cpp:138
-msgid "Secret Key Files (*.pem *.p12 *.gpg *.asc *.pgp)"
+#: commands/importcertificatescommand.cpp:211
+#, kde-format
+msgctxt "@info:tooltip"
+msgid "Imported certificates from these sources:<br/>%1"
 msgstr ""
 
-#: dialogs/exportsecretkeydialog.cpp:206
-msgctxt "@info"
-msgid "You have to enter an output filename."
+#: commands/importcertificatescommand.cpp:218
+msgctxt "@title:tab"
+msgid "Imported Certificates"
 msgstr ""
 
-#: dialogs/exportsecretkeydialog.cpp:207 dialogs/exportsecretkeydialog.cpp:216
-msgctxt "@title"
-msgid "Incomplete data"
+#: commands/importcertificatescommand.cpp:231
+#, kde-format
+msgid "<tr><td align=\"right\">%1</td><td>%2</td></tr>"
 msgstr ""
 
-#: dialogs/exportsecretkeydialog.cpp:215
-msgctxt "@info"
-msgid "You have to choose a passphrase character set."
+#: commands/importcertificatescommand.cpp:232
+#, kde-format
+msgid "<tr><td align=\"right\"><b>%1</b></td><td>%2</td></tr>"
 msgstr ""
 
-#: dialogs/selftestdialog.cpp:95
-msgid "Skipped"
+#: commands/importcertificatescommand.cpp:233
+#, kde-format
+msgid "<tr><th colspan=\"2\" align=\"center\">%1</th></tr>"
 msgstr ""
 
-#: dialogs/selftestdialog.cpp:96
-msgid "Passed"
+#: commands/importcertificatescommand.cpp:240
+msgid "Total number processed:"
 msgstr ""
 
-#: dialogs/selftestdialog.cpp:113
-msgid "Test Name"
+#: commands/importcertificatescommand.cpp:242
+msgid "Imported:"
 msgstr ""
 
-#. i18n: file: newcertificatewizard/resultpage.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, resultGB)
-#: dialogs/selftestdialog.cpp:114 rc.cpp:286
-msgid "Result"
+#: commands/importcertificatescommand.cpp:245
+msgid "New signatures:"
 msgstr ""
 
-#: dialogs/selftestdialog.cpp:224
-msgid "(select test first)"
+#: commands/importcertificatescommand.cpp:248
+msgid "New user IDs:"
 msgstr ""
 
-#: dialogs/selftestdialog.cpp:270
-msgid "Rerun Tests"
+#: commands/importcertificatescommand.cpp:251
+msgid "Certificates without user IDs:"
 msgstr ""
 
-#: dialogs/selftestdialog.cpp:275
-msgid "Continue"
+#: commands/importcertificatescommand.cpp:254
+msgid "New subkeys:"
 msgstr ""
 
-#: kleopatraapplication.cpp:93
-msgid "Run UI server only, hide main window"
+#: commands/importcertificatescommand.cpp:257
+msgid "Newly revoked:"
 msgstr ""
 
-#: kleopatraapplication.cpp:94
-msgid "Use OpenPGP for the following operation"
+#: commands/importcertificatescommand.cpp:260
+msgid "Not imported:"
 msgstr ""
 
-#: kleopatraapplication.cpp:95
-msgid "Use CMS (X.509, S/MIME) for the following operation"
+#: commands/importcertificatescommand.cpp:263
+msgid "Unchanged:"
 msgstr ""
 
-#: kleopatraapplication.cpp:96
-msgid "Import certificate file(s)"
+#: commands/importcertificatescommand.cpp:266
+msgid "Secret keys processed:"
 msgstr ""
 
-#: kleopatraapplication.cpp:97
-msgid "Encrypt file(s)"
+#: commands/importcertificatescommand.cpp:269
+msgid "Secret keys imported:"
 msgstr ""
 
-#: kleopatraapplication.cpp:98
-msgid "Sign file(s)"
+#: commands/importcertificatescommand.cpp:273
+msgid "Secret keys <em>not</em> imported:"
 msgstr ""
 
-#: kleopatraapplication.cpp:99
-msgid "Sign and/or encrypt file(s)"
+#: commands/importcertificatescommand.cpp:276
+msgid "Secret keys unchanged:"
 msgstr ""
 
-#: kleopatraapplication.cpp:100
-msgid "Same as --sign-encrypt, do not use"
+#: commands/importcertificatescommand.cpp:289
+msgid "No imports (should not happen, please report a bug)."
 msgstr ""
 
-#: kleopatraapplication.cpp:101
-msgid "Decrypt file(s)"
+#: commands/importcertificatescommand.cpp:293
+#: commands/importcertificatescommand.cpp:298
+#, kde-format
+msgid ""
+"<qt><p>Detailed results of certificate import:</p><table "
+"width=\"100%\">%1</table></qt>"
 msgstr ""
 
-#: kleopatraapplication.cpp:102
-msgid "Verify file/signature"
+#: commands/importcertificatescommand.cpp:295
+#, kde-format
+msgid ""
+"<qt><p>Detailed results of importing %1:</p><table "
+"width=\"100%\">%2</table></qt>"
 msgstr ""
 
-#: kleopatraapplication.cpp:103
-msgid "Decrypt and/or verify file(s)"
+#: commands/importcertificatescommand.cpp:299
+msgid "Totals"
 msgstr ""
 
-#: kleopatraapplication.cpp:111
-msgid "Location of the socket the ui server is listening on"
+#: commands/importcertificatescommand.cpp:305
+#: commands/importcertificatescommand.cpp:313
+msgid "Certificate Import Result"
 msgstr ""
 
-#: kleopatraapplication.cpp:118
-msgid "File(s) to process"
+#: commands/importcertificatescommand.cpp:320
+#, kde-format
+msgid ""
+"<qt><p>An error occurred while trying to import the "
+"certificate:</p><p><b>%1</b></p></qt>"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:234
-msgid "Parse error on gpgconf --list-config output:"
+#: commands/importcertificatescommand.cpp:324
+#, kde-format
+msgid ""
+"<qt><p>An error occurred while trying to import the certificate "
+"%1:</p><p><b>%2</b></p></qt>"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:239
-#, kde-format
-msgid "gpgconf --list-config: Unknown component: %1"
+#: commands/importcertificatescommand.cpp:332
+#: commands/importcertificatescommand.cpp:338
+#: commands/importcertificatescommand.cpp:401
+#: commands/importcertificatescommand.cpp:438
+#: commands/importcertificatefromclipboardcommand.cpp:119
+#: commands/importcertificatefromclipboardcommand.cpp:123
+#: commands/importcertificatefromfilecommand.cpp:138
+#: commands/importcertificatefromfilecommand.cpp:144
+msgid "Certificate Import Failed"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:244
+#: commands/importcertificatescommand.cpp:399
+#: commands/importcertificatescommand.cpp:436
 #, kde-format
-msgid "gpgconf --list-config: Unknown entry: %1:%2"
+msgid ""
+"The type of this certificate (%1) is not supported by this Kleopatra "
+"installation."
 msgstr ""
 
-#: kgpgconf/configreader.cpp:250
-#, kde-format
-msgid "gpgconf --list-config: Invalid entry: value must start with '\"': %1"
+#: commands/importcertificatefromclipboardcommand.cpp:118
+msgid "Clipboard contents do not look like a certificate."
 msgstr ""
 
-#: kgpgconf/configreader.cpp:283
-msgid "Parse error on gpgconf --list-components. output:"
+#: commands/importcertificatefromclipboardcommand.cpp:123
+msgid "Could not determine certificate type of clipboard contents."
 msgstr ""
 
-#: kgpgconf/configreader.cpp:311
-msgid "gpgconf not found or cannot be started"
+#: commands/signencryptfilescommand.cpp:234
+msgid "Sign/Encrypt Files Error"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:313
-msgid "gpgconf terminated unexpectedly"
+#: commands/signencryptfilescommand.cpp:245
+msgid "Select One or More Files to Sign and/or Encrypt"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:315
-msgid "timeout while executing gpgconf"
+#: commands/dumpcertificatecommand.cpp:90 commands/dumpcrlcachecommand.cpp:87
+msgctxt "@action:button Update the log text widget"
+msgid "&Update"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:317
-msgid "error while writing to gpgconf"
+#: commands/dumpcertificatecommand.cpp:260
+msgid "Certificate Dump"
 msgstr ""
 
-#: kgpgconf/configreader.cpp:319
-msgid "error while reading from gpgconf"
+#: commands/dumpcertificatecommand.cpp:285
+#: commands/dumpcrlcachecommand.cpp:246
+msgid "Unable to start process gpgsm. Please check your installation."
 msgstr ""
 
-#: kgpgconf/configreader.cpp:322
-msgid "Unknown error while executing gpgconf"
+#: commands/dumpcertificatecommand.cpp:287
+#: commands/dumpcertificatecommand.cpp:311
+#: commands/dumpcertificatecommand.cpp:316
+msgid "Dump Certificate Error"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:345
-msgctxt "as in \"verbosity level\""
-msgid "Level"
+#: commands/dumpcertificatecommand.cpp:307
+#, kde-format
+msgid ""
+"The GpgSM process that tried to dump the certificate ended prematurely "
+"because of an unexpected error. Please check the output of gpgsm --dump-cert "
+"%1 for details."
 msgstr ""
 
-#: kgpgconf/configuration.cpp:345
-msgid "Set/Unset"
+#: commands/dumpcertificatecommand.cpp:314
+#, kde-format
+msgid ""
+"An error occurred while trying to dump the certificate. The output from "
+"GpgSM was:\n"
+"%1"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:347
-msgid "String List"
+#: commands/clearcrlcachecommand.cpp:62 commands/importcrlcommand.cpp:163
+msgid "Clear CRL Cache Error"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:347
-msgid "String"
+#: commands/clearcrlcachecommand.cpp:66
+msgid "Clear CRL Cache Finished"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:349
-msgid "List of Integers"
+#: commands/clearcrlcachecommand.cpp:70
+#, kde-format
+msgid ""
+"The DirMngr process that tried to clear the CRL cache ended prematurely "
+"because of an unexpected error. Please check the output of %1 for details."
 msgstr ""
 
-#: kgpgconf/configuration.cpp:349
-msgid "Integer"
+#: commands/clearcrlcachecommand.cpp:76
+#, kde-format
+msgid ""
+"An error occurred while trying to clear the CRL cache. The output from %1 "
+"was:\n"
+"%2"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:351
-msgid "List of Unsigned Integers"
+#: commands/clearcrlcachecommand.cpp:81
+msgid "CRL cache cleared successfully."
 msgstr ""
 
-#: kgpgconf/configuration.cpp:351
-msgid "Unsigned Integer "
+#: commands/refreshopenpgpcertscommand.cpp:74
+msgctxt "@info"
+msgid ""
+"<para>No OpenPGP directory services have been configured.</para><para>If not "
+"all of the certificates carry the name of their preferred certificate server "
+"(few do), a fallback server is needed to fetch from.</para><para>Since none "
+"is configured, <application>Kleopatra</application> will use "
+"<resource>keys.gnupg.net</resource> as the fallback.</para><para>You can "
+"configure OpenPGP directory servers in Kleopatra's configuration "
+"dialog.</para><para>Do you want to continue with "
+"<resource>keys.gnupg.net</resource> as fallback server?</para>"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:353
-msgid "Path List"
+#: commands/refreshopenpgpcertscommand.cpp:83
+#: commands/refreshopenpgpcertscommand.cpp:96
+msgctxt "@title:window"
+msgid "OpenPGP Certificate Refresh"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:353
-msgid "Path"
-msgstr "Llwybr"
+#: commands/refreshopenpgpcertscommand.cpp:90
+msgctxt "@info"
+msgid ""
+"<para>Refreshing OpenPGP certificates implies downloading all certificates "
+"anew, to check if any of them have been revoked in the "
+"meantime.</para><para>This can put a severe strain on your own as well as "
+"other people's network connections, and can take up to an hour or more to "
+"complete, depending on your network connection, and the number of "
+"certificates to check.</para> <para>Are you sure you want to continue?</para>"
+msgstr ""
 
-#: kgpgconf/configuration.cpp:355
-msgid "List of URLs"
+#: commands/refreshopenpgpcertscommand.cpp:112
+msgctxt "@title:window"
+msgid "OpenPGP Certificate Refresh Error"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:355
-msgid "URL"
+#: commands/refreshopenpgpcertscommand.cpp:116
+msgctxt "@title:window"
+msgid "OpenPGP Certificate Refresh Finished"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:357
-msgid "List of LDAP URLs"
+#: commands/refreshopenpgpcertscommand.cpp:121
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>The GPG process that tried to refresh OpenPGP certificates ended "
+"prematurely because of an unexpected error.</para><para>Please check the "
+"output of <icode>%1</icode> for details.</para>"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:357
-msgid "LDAP URL"
+#: commands/refreshopenpgpcertscommand.cpp:128
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>An error occurred while trying to refresh OpenPGP certificates.</para> "
+"<para>The output from <command>%1</command> was: <message>%2</message></para>"
 msgstr ""
 
-#: kgpgconf/configuration.cpp:359
-msgid "Directory Path List"
+#: commands/refreshopenpgpcertscommand.cpp:134
+msgctxt "@info"
+msgid "OpenPGP certificates refreshed successfully."
 msgstr ""
 
-#: kgpgconf/configuration.cpp:359
-msgid "Directory Path"
+#: commands/importcrlcommand.cpp:70
+msgid ""
+"Certificate Revocation Lists, DER encoded (*.crl *.arl *-crl.der *-arl.der)"
 msgstr ""
 
-#. i18n: file: kwatchgnupg/kwatchgnupgui.rc:4
-#. i18n: ectx: Menu (file)
-#. i18n: file: kleopatra.rc:5
-#. i18n: ectx: Menu (file)
-#: kgpgconf/mainwindow.cpp:67 rc.cpp:211 rc.cpp:217
-msgid "&File"
+#: commands/importcrlcommand.cpp:71
+msgid "Select CRL File to Import"
 msgstr ""
 
-#. i18n: file: dialogs/lookupcertificatesdialog.ui:57
-#. i18n: ectx: property (text), widget (QPushButton, saveAsPB)
-#: kgpgconf/mainwindow.cpp:68 rc.cpp:553
-msgid "Save As..."
+#: commands/importcrlcommand.cpp:161
+msgid "Unable to start process dirmngr. Please check your installation."
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:70
-msgid "Quit"
+#: commands/importcrlcommand.cpp:179
+msgid ""
+"The GpgSM process that tried to import the CRL file ended prematurely "
+"because of an unexpected error. Please check the output of gpgsm --call-"
+"dirmngr loadcrl &lt;filename&gt; for details."
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:86
-msgid "Setup Error"
+#: commands/importcrlcommand.cpp:182 commands/importcrlcommand.cpp:186
+msgid "Import CRL Error"
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:86
+#: commands/importcrlcommand.cpp:184
 #, kde-format
 msgid ""
-"KGpgConf could not execute gpgconf.exe.\n"
-"\n"
-"Error: %1\n"
-"Error Code: %2"
+"An error occurred while trying to import the CRL file. The output from gpgsm "
+"was:\n"
+"%1"
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:91
-msgid "Parsing Error"
+#: commands/importcrlcommand.cpp:188
+msgid "CRL file imported successfully."
+msgstr "Mewnforiwyd y ffeil CRL yn llwyddiannus."
+
+#: commands/importcrlcommand.cpp:189
+msgid "Import CRL Finished"
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:91 kgpgconf/mainwindow.cpp:96
+#: commands/changepassphrasecommand.cpp:185
 #, kde-format
 msgid ""
-"An error occurred while reading the current configuration.\n"
-"\n"
-"Error: %1"
+"<p>An error occurred while trying to change the passphrase for "
+"<b>%1</b>:</p><p>%2</p>"
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:96
-msgid "Error"
+#: commands/changepassphrasecommand.cpp:189
+msgid "Passphrase Change Error"
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:213 kgpgconf/mainwindow.cpp:232
-msgid "Write Error"
+#: commands/changepassphrasecommand.cpp:193
+msgid "Passphrase changed successfully."
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:213
+#: commands/changepassphrasecommand.cpp:194
+msgid "Passphrase Change Succeeded"
+msgstr ""
+
+#: commands/importcertificatefromfilecommand.cpp:138
 #, kde-format
-msgid ""
-"Could not open file %1 for writing. You might not have the permission to "
-"write to that file."
+msgid "Could not open file %1 for reading: %2"
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:232
+#: commands/importcertificatefromfilecommand.cpp:144
 #, kde-format
-msgid "Error while writing to file %1."
+msgid "Could not determine certificate type of %1."
 msgstr ""
 
-#: kgpgconf/mainwindow.cpp:238
-msgid "Save As"
+#: commands/importcertificatefromfilecommand.cpp:154
+#: qml/KleopatraActions.qml:70
+msgid "Certificates"
 msgstr ""
 
-#: mainwindow_mobile.cpp:151 mainwindow_desktop.cpp:121
+#: commands/importcertificatefromfilecommand.cpp:155
+msgid "Any files"
+msgstr ""
+
+#: commands/importcertificatefromfilecommand.cpp:163
+#: commands/importcertificatefromfilecommand.cpp:166
+msgid "Select Certificate File"
+msgstr "Dewiswch Ffeil Dysysgrif"
+
+#: commands/adduseridcommand.cpp:219
 #, kde-format
-msgctxt "Quit [ApplicationName]"
-msgid "&Quit %1"
+msgctxt "@info"
+msgid ""
+"<para>An error occurred while trying to add the user-id: "
+"<message>%1</message></para>"
 msgstr ""
 
-#: mainwindow_mobile.cpp:157 mainwindow_desktop.cpp:127
-msgid "Only &Close Window"
+#: commands/adduseridcommand.cpp:222
+msgctxt "@title:window"
+msgid "Add User-ID Error"
 msgstr ""
 
-#: mainwindow_mobile.cpp:203 mainwindow_desktop.cpp:188
-msgid ""
-"Could not start the GnuPG Log Viewer (kwatchgnupg). Please check your "
-"installation."
+#: commands/adduseridcommand.cpp:226
+msgctxt "@info"
+msgid "User-ID successfully added."
 msgstr ""
 
-#: mainwindow_mobile.cpp:205 mainwindow_desktop.cpp:190
-msgid "Error Starting KWatchGnuPG"
+#: commands/adduseridcommand.cpp:227
+msgctxt "@title:window"
+msgid "Add User-ID Succeeded"
 msgstr ""
 
-#: mainwindow_mobile.cpp:210 mainwindow_desktop.cpp:195
+#: commands/signclipboardcommand.cpp:151 commands/signclipboardcommand.cpp:164
+msgid "Sign Clipboard Error"
+msgstr ""
+
+#: commands/refreshx509certscommand.cpp:62
+msgctxt "@info"
 msgid ""
-"Could not start the GnuPG Administrative Console (kgpgconf). Please check "
-"your installation."
+"<para>Refreshing X.509 certificates implies downloading CRLs for all "
+"certificates, even if they might otherwise still be valid.</para><para>This "
+"can put a severe strain on your own as well as other people's network "
+"connections, and can take up to an hour or more to complete, depending on "
+"your network connection, and the number of certificates to check.</para> "
+"<para>Are you sure you want to continue?</para>"
 msgstr ""
 
-#: mainwindow_mobile.cpp:212 mainwindow_desktop.cpp:197
-msgid "Error Starting KGpgConf"
+#: commands/refreshx509certscommand.cpp:68
+msgctxt "@title:window"
+msgid "X.509 Certificate Refresh"
 msgstr ""
 
-#: mainwindow_mobile.cpp:278 mainwindow_desktop.cpp:319
-msgid "Perform Self-Test"
+#: commands/refreshx509certscommand.cpp:79
+msgctxt "@title:window"
+msgid "X.509 Certificate Refresh Error"
 msgstr ""
 
-#: mainwindow_mobile.cpp:345 mainwindow_desktop.cpp:383
-msgid ""
-"There are still some background operations ongoing. These will be terminated "
-"when closing the window. Proceed?"
+#: commands/refreshx509certscommand.cpp:83
+msgctxt "@title:window"
+msgid "X.509 Certificate Refresh Finished"
 msgstr ""
 
-#: mainwindow_mobile.cpp:348 mainwindow_desktop.cpp:386
-msgid "Ongoing Background Tasks"
+#: commands/refreshx509certscommand.cpp:88
+#, kde-format
+msgctxt "@info"
+msgid ""
+"<para>The GpgSM process that tried to refresh X.509 certificates ended "
+"prematurely because of an unexpected error.</para><para>Please check the "
+"output of <icode>%1</icode> for details.</para>"
 msgstr ""
 
-#: mainwindow_desktop.cpp:159
+#: commands/refreshx509certscommand.cpp:95
 #, kde-format
+msgctxt "@info"
 msgid ""
-"%1 may be used by other applications as a service.\n"
-"You may instead want to close this window without exiting %1."
+"<para>An error occurred while trying to refresh X.509 "
+"certificates.</para><para>The output from <command>%1</command> was: "
+"<message>%2</message></para>"
 msgstr ""
 
-#: mainwindow_desktop.cpp:161
-msgid "Really Quit?"
+#: commands/refreshx509certscommand.cpp:101
+msgctxt "@info"
+msgid "X.509 certificates refreshed successfully."
 msgstr ""
 
-#: mainwindow_desktop.cpp:306
-msgid "GnuPG Log Viewer"
+#: commands/decryptverifyfilescommand.cpp:164
+msgid "Decrypt/Verify Files Error"
 msgstr ""
 
-#: mainwindow_desktop.cpp:310
-msgid "GnuPG Administrative Console"
+#: commands/decryptverifyfilescommand.cpp:175
+msgid "Select One or More Files to Decrypt and/or Verify"
 msgstr ""
 
-#: mainwindow_desktop.cpp:315
-msgid "Configure GnuPG Backend..."
+#: commands/changeroottrustcommand.cpp:94
+#, kde-format
+msgid ""
+"Failed to update the trust database:\n"
+"%1"
 msgstr ""
 
-#: mainwindow_desktop.cpp:323
-msgid "About Gpg4win"
+#: commands/changeroottrustcommand.cpp:96
+msgid "Root Trust Update Failed"
 msgstr ""
 
-#: mainwindow_desktop.cpp:351
-msgid "Could not configure the cryptography backend (gpgconf tool not found)"
+#: commands/changeroottrustcommand.cpp:256
+#, kde-format
+msgid "Cannot open existing file \"%1\" for reading: %2"
 msgstr ""
 
-#: mainwindow_desktop.cpp:351
-msgid "Configuration Error"
+#: commands/changeroottrustcommand.cpp:264
+#, kde-format
+msgid "Cannot open file \"%1\" for reading and writing: %2"
 msgstr ""
 
-#: mainwindow_desktop.cpp:467
-msgid "Sign/Encrypt..."
+#: commands/changeroottrustcommand.cpp:268
+#, kde-format
+msgid "Cannot set restrictive permissions on file %1: %2"
 msgstr ""
 
-#: mainwindow_desktop.cpp:472
-msgid "Import Certificates"
+#: commands/changeroottrustcommand.cpp:329
+msgid "Could not find gpgconf executable"
 msgstr ""
 
-#: mainwindow_desktop.cpp:473
-msgid "Import CRLs"
+#: commands/changeroottrustcommand.cpp:339
+#, kde-format
+msgid "\"gpgconf --reload gpg-agent\" failed: %1"
 msgstr ""
 
-#: selftest/uiservercheck.cpp:61
-msgctxt "@title"
-msgid "UiServer Connectivity"
+#: commands/dumpcrlcachecommand.cpp:226
+msgid "CRL Cache Dump"
 msgstr ""
 
-#: selftest/uiservercheck.cpp:79 selftest/gpgagentcheck.cpp:102
-msgid "not reachable"
+#: commands/dumpcrlcachecommand.cpp:248 commands/dumpcrlcachecommand.cpp:271
+#: commands/dumpcrlcachecommand.cpp:276
+msgid "Dump CRL Cache Error"
+msgstr ""
+
+#: commands/dumpcrlcachecommand.cpp:268
+msgid ""
+"The GpgSM process that tried to dump the CRL cache ended prematurely because "
+"of an unexpected error. Please check the output of gpgsm --call-dirmngr "
+"listcrls for details."
 msgstr ""
 
-#: selftest/uiservercheck.cpp:81
+#: commands/dumpcrlcachecommand.cpp:274
 #, kde-format
-msgctxt "@info"
-msgid "Could not connect to UiServer: <message>%1</message>"
+msgid ""
+"An error occurred while trying to dump the CRL cache. The output from GpgSM "
+"was:\n"
+"%1"
 msgstr ""
 
-#: selftest/uiservercheck.cpp:84
+#: commands/certifycertificatecommand.cpp:182
 msgctxt "@info"
 msgid ""
-"<para>Check that your firewall is not set to block local connections (allow "
-"connections to <resource>localhost</resource> or "
-"<resource>127.0.0.1</resource>).</para>"
+"To certify other certificates, you first need to create an OpenPGP "
+"certificate for yourself. Choose <interface>File->New "
+"Certificate...</interface> to create one."
 msgstr ""
 
-#: selftest/uiservercheck.cpp:88
-msgid "multiple instances"
+#: commands/certifycertificatecommand.cpp:183
+msgid "Certification Not Possible"
 msgstr ""
 
-#: selftest/uiservercheck.cpp:90
-#, kde-format
-msgctxt "@info"
-msgid ""
-"It seems another <application>Kleopatra</application> is running (with "
-"process-id %1)"
+#: commands/checksumverifyfilescommand.cpp:156
+msgid "Verify Checksum Files Error"
 msgstr ""
 
-#: selftest/uiservercheck.cpp:93
-msgctxt "@info"
-msgid ""
-"Quit any other running instances of <application>Kleopatra</application>."
+#: commands/checksumverifyfilescommand.cpp:167
+msgid "Select One or More Checksum Files"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:64
-msgctxt "@title"
-msgid "Gpg-Agent Connectivity"
+#: commands/changeownertrustcommand.cpp:221
+#, kde-format
+msgid ""
+"<p>An error occurred while trying to change the owner trust for "
+"<b>%1</b>:</p><p>%2</p>"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:74
-msgid "GpgME library too old"
+#: commands/changeownertrustcommand.cpp:225
+msgid "Owner Trust Change Error"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:76
-msgctxt "@info"
-msgid ""
-"Either the GpgME library itself is too old, or the GpgME++ library was "
-"compiled against an older GpgME that did not support connecting to gpg-agent."
+#: commands/changeownertrustcommand.cpp:229
+msgid "Owner trust changed successfully."
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:80
-msgctxt "@info"
-msgid ""
-"Upgrade to <application>gpgme</application> 1.2.0 or higher, and ensure that "
-"gpgme++ was compiled against it."
+#: commands/changeownertrustcommand.cpp:230
+msgid "Owner Trust Change Succeeded"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:87
-msgid "GpgME does not support gpg-agent"
+#: commands/gnupgprocesscommand.cpp:133
+msgid "Subprocess Diagnostics"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:89
+#: commands/gnupgprocesscommand.cpp:243
 #, kde-format
-msgctxt "@info"
-msgid ""
-"<para>The <application>GpgME</application> library is new enough to support "
-"<application>gpg-agent</application>, but does not seem to do so in this "
-"installation.</para><para>The error returned was: "
-"<message>%1</message>.</para>"
+msgid "Unable to start process %1. Please check your installation."
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:104
+#: commands/gnupgprocesscommand.cpp:249
 #, kde-format
-msgctxt "@info"
-msgid "Could not connect to GpgAgent: <message>%1</message>"
+msgid "Starting %1..."
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:107
-msgctxt "@info"
-msgid ""
-"<para>Check that gpg-agent is running and that the "
-"<environment>GPG_AGENT_INFO</environment> variable is set and up-to-"
-"date.</para>"
+#: commands/gnupgprocesscommand.cpp:267
+msgid "Process finished"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:111
-msgid "unexpected error"
+#: commands/deletecertificatescommand.cpp:98
+msgctxt "@title:window"
+msgid "Delete Certificates"
 msgstr ""
 
-#: selftest/gpgagentcheck.cpp:113
-#, kde-format
-msgctxt "@info"
+#: commands/deletecertificatescommand.cpp:163
 msgid ""
-"<para>Unexpected error while asking <application>gpg-agent</application> for "
-"its version.</para><para>The error returned was: "
-"<message>%1</message>.</para>"
+"Neither the OpenPGP nor the CMS backends support certificate deletion.\n"
+"Check your installation."
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:61
-#, kde-format
-msgctxt "@title"
-msgid "%1 Configuration Check"
+#: commands/deletecertificatescommand.cpp:167
+msgid ""
+"The OpenPGP backend does not support certificate deletion.\n"
+"Check your installation.\n"
+"Only the selected CMS certificates will be deleted."
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:115
-msgid "The process terminated prematurely"
+#: commands/deletecertificatescommand.cpp:174
+#: commands/deletecertificatescommand.cpp:178
+msgid ""
+"The OpenPGP backend does not support certificate deletion.\n"
+"Check your installation."
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:120
-msgctxt "self-test did not pass"
-msgid "Failed"
+#: commands/deletecertificatescommand.cpp:184
+msgid ""
+"The CMS backend does not support certificate deletion.\n"
+"Check your installation.\n"
+"Only the selected OpenPGP certificates will be deleted."
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:122
-#, kde-format
+#: commands/deletecertificatescommand.cpp:200
+#: commands/deletecertificatescommand.cpp:213
 msgid ""
-"There was an error executing the GnuPG configuration self-check for %2:\n"
-"  %1\n"
-"You might want to execute \"gpgconf %3\" on the command line.\n"
+"The CMS backend does not support certificate deletion.\n"
+"Check your installation."
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:127
-msgid "Diagnostics:"
+#: commands/deletecertificatescommand.cpp:280
+#: commands/deletecertificatescommand.cpp:349
+msgid "Certificate Deletion Failed"
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:132
-msgctxt "self-check did not pass"
-msgid "Failed"
+#: commands/deletecertificatescommand.cpp:281
+msgid "Certificate Deletion Problem"
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:135
+#: commands/deletecertificatescommand.cpp:340
 #, kde-format
-msgctxt "Self-test did not pass"
-msgid ""
-"The GnuPG configuration self-check failed.\n"
-"\n"
-"Error code: %1\n"
-"Diagnostics:"
+msgid "OpenPGP backend: %1"
 msgstr ""
 
-#: selftest/gpgconfcheck.cpp:140
+#: commands/deletecertificatescommand.cpp:343
 #, kde-format
-msgctxt "self-check did not pass"
-msgid ""
-"The GnuPG configuration self-check failed with error code %1.\n"
-"No output was received."
-msgstr ""
-
-#: selftest/libkleopatrarccheck.cpp:61
-msgctxt "@title"
-msgid "Config File 'libkleopatrarc'"
-msgstr ""
-
-#: selftest/libkleopatrarccheck.cpp:75
-msgid "Errors found"
+msgid "CMS backend: %1"
 msgstr ""
 
-#: selftest/libkleopatrarccheck.cpp:79
+#: commands/deletecertificatescommand.cpp:345
 #, kde-format
-msgctxt "@info"
 msgid ""
-"<para>Kleopatra detected the following errors in the libkleopatrarc "
-"configuration:</para>%1"
+"<qt><p>An error occurred while trying to delete the "
+"certificate:</p><p><b>%1</b></p></qt>"
 msgstr ""
 
-#: selftest/enginecheck.cpp:71
-msgctxt "@title"
-msgid "GPG (OpenPGP Backend) installation"
+#: commands/encryptclipboardcommand.cpp:148
+#: commands/encryptclipboardcommand.cpp:161
+msgid "Encrypt Clipboard Error"
 msgstr ""
 
-#: selftest/enginecheck.cpp:72
-msgctxt "@title"
-msgid "GpgSM (S/MIME Backend) installation"
+#: commands/checksumcreatefilescommand.cpp:156
+msgid "Create Checksum Files Error"
 msgstr ""
 
-#: selftest/enginecheck.cpp:73
-msgctxt "@title"
-msgid "GpgConf (Configuration) installation"
+#: commands/checksumcreatefilescommand.cpp:167
+msgid "Select One or More Files to Create Checksums For"
 msgstr ""
 
-#: selftest/enginecheck.cpp:98
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>A problem was detected with the <application>%1</application> "
-"backend.</para>"
+#: commands/exportcertificatecommand.cpp:212
+msgid "Export Certificates"
 msgstr ""
 
-#: selftest/enginecheck.cpp:103
-msgid "not supported"
+#: commands/exportcertificatecommand.cpp:216
+msgid "OpenPGP Certificates"
 msgstr ""
 
-#: selftest/enginecheck.cpp:105
-msgctxt "@info"
-msgid ""
-"<para>It seems that the <icode>gpgme</icode> library was compiled without "
-"support for this backend.</para>"
+#: commands/exportcertificatecommand.cpp:217
+msgid "S/MIME Certificates"
 msgstr ""
 
-#: selftest/enginecheck.cpp:108
+#: commands/exportcertificatecommand.cpp:251
+msgid "Exporting certificates..."
+msgstr ""
+
+#: commands/exportcertificatecommand.cpp:262
 #, kde-format
-msgctxt "@info"
 msgid ""
-"<para>Replace the <icode>gpgme</icode> library with a version compiled with "
-"<application>%1</application> support.</para>"
+"<qt><p>An error occurred while trying to export the "
+"certificate:</p><p><b>%1</b></p></qt>"
 msgstr ""
 
-#: selftest/enginecheck.cpp:112
-msgid "not properly installed"
+#: commands/exportcertificatecommand.cpp:266
+#: commands/exportcertificatecommand.cpp:309
+msgid "Certificate Export Failed"
 msgstr ""
 
-#: selftest/enginecheck.cpp:114
+#: commands/exportcertificatecommand.cpp:308
 #, kde-format
-msgctxt "@info"
-msgid "<para>Backend <command>%1</command> is not installed properly.</para>"
+msgid "Could not write to file %1."
 msgstr ""
 
-#: selftest/enginecheck.cpp:116
-#, kde-format
-msgctxt "@info"
+#: commands/lookupcertificatescommand.cpp:210
 msgid ""
-"<para>Please check the output of <command>%1 --version</command> "
-"manually.</para>"
+"<p>You seem to be searching for a fingerprint or a key-id.</p><p>Different "
+"keyservers expect different ways to search for these. Some require a \"0x\" "
+"prefix, while others require there be no such prefix.</p><p>If your search "
+"does not yield any results, try removing the 0x prefix from your search.</p>"
 msgstr ""
 
-#: selftest/enginecheck.cpp:119
-msgid "too old"
+#: commands/lookupcertificatescommand.cpp:214
+msgid ""
+"<p>You seem to be searching for a fingerprint or a key-id.</p><p>Different "
+"keyservers expect different ways to search for these. Some require a \"0x\" "
+"prefix, while others require there be no such prefix.</p><p>If your search "
+"does not yield any results, try adding the 0x prefix to your search.</p>"
+msgstr ""
+
+#: commands/lookupcertificatescommand.cpp:218
+msgid "Hex-String Search"
+msgstr ""
+
+#: commands/lookupcertificatescommand.cpp:291
+#: commands/lookupcertificatescommand.cpp:296
+#, kde-format
+msgctxt "@title %1:\"OpenPGP\" or \"CMS\""
+msgid "%1 Certificate Server"
 msgstr ""
 
-#: selftest/enginecheck.cpp:121
+#: commands/lookupcertificatescommand.cpp:324
 #, kde-format
 msgctxt "@info"
 msgid ""
-"<para>Backend <command>%1</command> is installed in version %2, but at least "
-"version %3 is required.</para>"
+"Failed to search on certificate server. The error returned was:\n"
+"%1"
 msgstr ""
 
-#: selftest/enginecheck.cpp:127 selftest/enginecheck.cpp:203
-#, kde-format
+#: commands/lookupcertificatescommand.cpp:332
 msgctxt "@info"
 msgid ""
-"<para>Install <application>%1</application> version %2 or higher.</para>"
+"<para>The query result has been truncated.</para><para>Either the local or a "
+"remote limit on the maximum number of returned hits has been "
+"exceeded.</para><para>You can try to increase the local limit in the "
+"configuration dialog, but if one of the configured servers is the limiting "
+"factor, you have to refine your search.</para>"
 msgstr ""
 
-#: selftest/enginecheck.cpp:130
-msgid "unknown problem"
+#: commands/lookupcertificatescommand.cpp:340
+msgctxt "@title"
+msgid "Result Truncated"
 msgstr ""
 
-#: selftest/enginecheck.cpp:132
-#, kde-format
+#: commands/lookupcertificatescommand.cpp:369
 msgctxt "@info"
 msgid ""
-"<para>Make sure <application>%1</application> is installed and in "
-"<envar>PATH</envar>.</para>"
+"<para>You do not have any directory servers configured.</para><para>You need "
+"to configure at least one directory server to search on one.</para><para>You "
+"can configure directory servers here: <interface>Settings->Configure "
+"Kleopatra</interface>.</para>"
 msgstr ""
 
-#: selftest/enginecheck.cpp:200
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para><application>%1</application> v%2.%3.%4 is required for this test, but "
-"only %5 is installed.</para>"
+#: commands/lookupcertificatescommand.cpp:374
+msgctxt "@title"
+msgid "No Directory Servers Configured"
 msgstr ""
 
-#: selftest/enginecheck.cpp:208
-#, kde-format
+#: commands/exportopenpgpcertstoservercommand.cpp:86
 msgctxt "@info"
 msgid ""
-"<para><application>%1</application> is required for this test, but does not "
-"seem available.</para><para>See tests further up for more information.</para>"
+"<para>No OpenPGP directory services have been configured.</para><para>Since "
+"none is configured, <application>Kleopatra</application> will use "
+"<resource>keys.gnupg.net</resource> as the server to export "
+"to.</para><para>You can configure OpenPGP directory servers in "
+"<application>Kleopatra</application>'s configuration dialog.</para><para>Do "
+"you want to continue with <resource>keys.gnupg.net</resource> as the server "
+"to export to?</para>"
 msgstr ""
 
-#: selftest/enginecheck.cpp:212
-#, kde-format
-msgctxt "@info %1: test name"
-msgid "<para>See \"%1\" above.</para>"
+#: commands/exportopenpgpcertstoservercommand.cpp:93
+#: commands/exportopenpgpcertstoservercommand.cpp:105
+msgctxt "@title:window"
+msgid "OpenPGP Certificate Export"
 msgstr ""
 
-#: selftest/registrycheck.cpp:60
-msgctxt "@title"
-msgid "Windows Registry"
+#: commands/exportopenpgpcertstoservercommand.cpp:100
+msgctxt "@info"
+msgid ""
+"<para>When OpenPGP certificates have been exported to a public directory "
+"server, it is nearly impossible to remove them again.</para><para>Before "
+"exporting your certificate to a public directory server, make sure that you "
+"have created a revocation certificate so you can revoke the certificate if "
+"needed later.</para><para>Are you sure you want to continue?</para>"
 msgstr ""
 
-#: selftest/registrycheck.cpp:72
-msgid "Obsolete registry entries found"
+#: commands/exportopenpgpcertstoservercommand.cpp:123
+msgctxt "@title:window"
+msgid "OpenPGP Certificate Export Error"
 msgstr ""
 
-#: selftest/registrycheck.cpp:76
-#, kde-format
-msgctxt "@info"
-msgid ""
-"<para>Kleopatra detected an obsolete registry key (<resource>%1\\"
-"%2</resource>), added by either a previous "
-"<application>Gpg4win</application> version or applications such as "
-"<application>WinPT</application> or "
-"<application>EnigMail</application>.</para><para>Keeping the entry might "
-"lead to an old GnuPG backend being used.</para>"
+#: commands/exportopenpgpcertstoservercommand.cpp:127
+msgctxt "@title:window"
+msgid "OpenPGP Certificate Export Finished"
 msgstr ""
 
-#: selftest/registrycheck.cpp:82
+#: commands/exportopenpgpcertstoservercommand.cpp:132
 #, kde-format
 msgctxt "@info"
-msgid "<para>Delete registry key <resource>%1\\%2</resource>.</para>"
+msgid ""
+"<para>The GPG process that tried to export OpenPGP certificates ended "
+"prematurely because of an unexpected error.</para><para>Please check the "
+"output of <icode>%1</icode> for details.</para>"
 msgstr ""
 
-#: selftest/registrycheck.cpp:99
+#: commands/exportopenpgpcertstoservercommand.cpp:139
 #, kde-format
 msgctxt "@info"
-msgid "Could not delete the registry key <resource>%1\\%2</resource>"
+msgid ""
+"<para>An error occurred while trying to export OpenPGP certificates.</para> "
+"<para>The output from <command>%1</command> was: <message>%2</message></para>"
 msgstr ""
 
-#: selftest/registrycheck.cpp:100
-msgctxt "@title"
-msgid "Error Deleting Registry Key"
+#: commands/exportopenpgpcertstoservercommand.cpp:145
+msgctxt "@info"
+msgid "OpenPGP certificates exported successfully."
 msgstr ""
 
 #: rc.cpp:1
@@ -5160,103 +5161,210 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: conf/appearanceconfigwidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AppearanceConfigWidget)
+#. i18n: file: kgpgconf/mainwidget.ui:17
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
 #: rc.cpp:5
-msgid "Color && Font Configuration"
+msgid "Option"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:20
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kgpgconf/mainwidget.ui:22
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
 #: rc.cpp:8
-msgid "Tooltips"
+msgid "Impose"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:26
-#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: kgpgconf/mainwidget.ui:38
+#. i18n: ectx: property (text), widget (QLabel, componentLabelLabel)
 #: rc.cpp:11
-msgid "Show the following information in certificate list tooltips:"
+msgid "Component:"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, tooltipValidityCheckBox)
+#. i18n: file: kgpgconf/mainwidget.ui:62
+#. i18n: ectx: property (text), widget (QLabel, optionLabelLabel)
 #: rc.cpp:14
-msgid "Show validity"
+msgid "Option:"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:40
-#. i18n: ectx: property (text), widget (QCheckBox, tooltipOwnerCheckBox)
+#. i18n: file: kgpgconf/mainwidget.ui:89
+#. i18n: ectx: property (text), widget (QLabel, descriptionLabelLabel)
 #: rc.cpp:17
-msgid "Show owner information"
+msgid "Description:"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:47
-#. i18n: ectx: property (text), widget (QCheckBox, tooltipDetailsCheckBox)
+#. i18n: file: kgpgconf/mainwidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, typeLabelLabel)
 #: rc.cpp:20
-msgid "Show technical details"
+msgid "Type:"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:68
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#. i18n: file: kgpgconf/mainwidget.ui:147
+#. i18n: ectx: property (text), widget (QRadioButton, useDefaultRB)
 #: rc.cpp:23
-msgid "Certificate Categories"
+msgid "Reset user settings to built-in default"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:82
-#. i18n: ectx: property (text), widget (QPushButton, iconButton)
+#. i18n: file: kgpgconf/mainwidget.ui:157
+#. i18n: ectx: property (text), widget (QRadioButton, useCustomRB)
 #: rc.cpp:26
-msgid "Set &Icon..."
+msgid "Custom value:"
+msgstr ""
+
+#. i18n: file: kgpgconf/mainwidget.ui:177
+#. i18n: ectx: property (text), widget (QCheckBox, readOnlyBox)
+#: rc.cpp:29
+msgid "Impose setting on all users"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:24
+#. i18n: ectx: Menu (view)
+#: rc.cpp:35
+msgid "&View"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:36
+#. i18n: ectx: Menu (certMenu)
+#. i18n: file: kleopatra.rc:102
+#. i18n: ectx: Menu (listview_popup)
+#: rc.cpp:38 rc.cpp:59
+msgid "&Certificates"
+msgstr "&Tystysgrifau"
+
+#. i18n: file: kleopatra.rc:51
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:41
+msgid "&Tools"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:65
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:44
+msgid "&Settings"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:69
+#. i18n: ectx: Menu (window)
+#: rc.cpp:47
+msgid "&Window"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:80
+#. i18n: ectx: Menu (help)
+#: rc.cpp:50
+msgid "&Help"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:86
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kwatchgnupg/kwatchgnupgui.rc:13
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:53 rc.cpp:107
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: file: kleopatra.rc:97
+#. i18n: ectx: ToolBar (searchToolBar)
+#: rc.cpp:56
+msgid "Search Toolbar"
+msgstr "Bar Offer Chwilio"
+
+#. i18n: file: kcfg/emailoperationspreferences.kcfg:10
+#. i18n: ectx: label, entry (QuickSignEMail), group (EMailOperations)
+#: rc.cpp:62
+msgid "Quick Sign EMail"
+msgstr ""
+
+#. i18n: file: kcfg/emailoperationspreferences.kcfg:11
+#. i18n: ectx: whatsthis, entry (QuickSignEMail), group (EMailOperations)
+#: rc.cpp:65
+msgid ""
+"Minimize the number of steps when signing emails, use preset defaults unless "
+"problems occur."
+msgstr ""
+
+#. i18n: file: kcfg/emailoperationspreferences.kcfg:15
+#. i18n: ectx: label, entry (QuickEncryptEMail), group (EMailOperations)
+#: rc.cpp:68
+msgid "Quick Encrypt EMail"
+msgstr ""
+
+#. i18n: file: kcfg/emailoperationspreferences.kcfg:16
+#. i18n: ectx: whatsthis, entry (QuickEncryptEMail), group (EMailOperations)
+#: rc.cpp:71
+msgid ""
+"Minimize the number of steps when encrypting emails, use preset defaults "
+"unless problems occur."
+msgstr ""
+
+#. i18n: file: kcfg/emailoperationspreferences.kcfg:20
+#. i18n: ectx: label, entry (DecryptVerifyPopupGeometry), group (EMailOperations)
+#: rc.cpp:74
+msgid "Decrypt/Verify Popup Geometry"
+msgstr ""
+
+#. i18n: file: kcfg/emailoperationspreferences.kcfg:21
+#. i18n: ectx: whatsthis, entry (DecryptVerifyPopupGeometry), group (EMailOperations)
+#: rc.cpp:77
+msgid ""
+"The remembered size and position of the Decrypt/Verify Result Popup used by "
+"clients which do not support inline display of D/V results, such as MS "
+"Outlook."
+msgstr ""
+
+#. i18n: file: kcfg/tooltippreferences.kcfg:9
+#. i18n: ectx: label, entry (ShowValidity), group (Tooltip)
+#: rc.cpp:80
+msgid "Show certificate validity"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:92
-#. i18n: ectx: property (text), widget (QPushButton, foregroundButton)
-#: rc.cpp:29
-msgid "Set &Text Color..."
+#. i18n: file: kcfg/tooltippreferences.kcfg:10
+#. i18n: ectx: whatsthis, entry (ShowValidity), group (Tooltip)
+#: rc.cpp:83
+msgid ""
+"Show validity information for certificates in tooltip, such as whether the "
+"certificate is expired or revoked."
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:102
-#. i18n: ectx: property (text), widget (QPushButton, backgroundButton)
-#: rc.cpp:32
-msgid "Set &Background Color..."
+#. i18n: file: kcfg/tooltippreferences.kcfg:14
+#. i18n: ectx: label, entry (ShowOwnerInformation), group (Tooltip)
+#: rc.cpp:86
+msgid "Show certificate owner information"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:112
-#. i18n: ectx: property (text), widget (QPushButton, fontButton)
-#: rc.cpp:35
-msgid "Set F&ont..."
+#. i18n: file: kcfg/tooltippreferences.kcfg:15
+#. i18n: ectx: whatsthis, entry (ShowOwnerInformation), group (Tooltip)
+#: rc.cpp:89
+msgid ""
+"Show owner information for certificates in tooltip, such as User IDs, "
+"subject and issuers."
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:122
-#. i18n: ectx: property (text), widget (QCheckBox, italicCB)
-#: rc.cpp:38
-msgid "Italic"
+#. i18n: file: kcfg/tooltippreferences.kcfg:19
+#. i18n: ectx: label, entry (ShowCertificateDetails), group (Tooltip)
+#: rc.cpp:92
+msgid "Show certificate details"
 msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, boldCB)
-#: rc.cpp:41
-msgid "Bold"
-msgstr "Trwm"
-
-#. i18n: file: conf/appearanceconfigwidget.ui:142
-#. i18n: ectx: property (text), widget (QCheckBox, strikeoutCB)
-#: rc.cpp:44
-msgid "Strikeout"
-msgstr "Trwylinellu"
+#. i18n: file: kcfg/tooltippreferences.kcfg:20
+#. i18n: ectx: whatsthis, entry (ShowCertificateDetails), group (Tooltip)
+#: rc.cpp:95
+msgid ""
+"Show more certificate details, such as fingerprint, key length and "
+"expiration dates"
+msgstr ""
 
-#. i18n: file: conf/appearanceconfigwidget.ui:168
-#. i18n: ectx: property (text), widget (QPushButton, defaultLookPB)
-#: rc.cpp:47
-msgid "Default Appearance"
+#. i18n: file: kcfg/smimevalidationpreferences.kcfg:6
+#. i18n: ectx: label, entry (RefreshInterval), group (SMime Validation)
+#: rc.cpp:98
+msgid "Certificate refresh interval (in hours). Zero (0) disables."
 msgstr ""
 
+#. i18n: file: kcfg/smimevalidationpreferences.kcfg:7
+#. i18n: ectx: whatsthis, entry (RefreshInterval), group (SMime Validation)
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:18
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, intervalRefreshCB)
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:31
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, intervalRefreshSB)
-#. i18n: file: kcfg/smimevalidationpreferences.kcfg:7
-#. i18n: ectx: whatsthis, entry (RefreshInterval), group (SMime Validation)
-#: rc.cpp:50 rc.cpp:56 rc.cpp:668
+#: rc.cpp:101 rc.cpp:110 rc.cpp:116
 msgid ""
 "This option enables interval checking of certificate validity. You can also "
 "choose the checking interval (in hours). Note that validation is perfomed "
@@ -5266,25 +5374,25 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:21
 #. i18n: ectx: property (text), widget (QCheckBox, intervalRefreshCB)
-#: rc.cpp:53
+#: rc.cpp:113
 msgid "Check certificate validity every"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:37
 #. i18n: ectx: property (specialValueText), widget (QSpinBox, intervalRefreshSB)
-#: rc.cpp:59
+#: rc.cpp:119
 msgid "hour"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:40
 #. i18n: ectx: property (suffix), widget (QSpinBox, intervalRefreshSB)
-#: rc.cpp:62
+#: rc.cpp:122
 msgid " hours"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:68
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, CRLRB)
-#: rc.cpp:65
+#: rc.cpp:125
 msgid ""
 "If this option is selected, S/MIME certificates are validated using "
 "Certificate Revocation Lists (CRLs)."
@@ -5292,13 +5400,13 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:71
 #. i18n: ectx: property (text), widget (QRadioButton, CRLRB)
-#: rc.cpp:68
+#: rc.cpp:128
 msgid "Validate certificates using CRLs"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:81
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, OCSPRB)
-#: rc.cpp:71
+#: rc.cpp:131
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using "
 "the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
@@ -5307,25 +5415,25 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:84
 #. i18n: ectx: property (text), widget (QRadioButton, OCSPRB)
-#: rc.cpp:74
+#: rc.cpp:134
 msgid "Validate certificates online (OCSP)"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:94
 #. i18n: ectx: property (title), widget (QGroupBox, OCSPGroupBox)
-#: rc.cpp:77
+#: rc.cpp:137
 msgid "Online Certificate Validation"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:100
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:80
+#: rc.cpp:140
 msgid "OCSP responder URL:"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:110
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, OCSPResponderURL)
-#: rc.cpp:83
+#: rc.cpp:143
 msgid ""
 "Enter here the address of the server for online validation of certificates "
 "(OCSP responder). The URL is usually starting with http://."
@@ -5333,26 +5441,26 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:117
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:86
+#: rc.cpp:146
 msgid "OCSP responder signature:"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:127
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreServiceURLCB)
-#: rc.cpp:89
+#: rc.cpp:149
 msgid "Ignore service URL of certificates"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:134
 #. i18n: ectx: property (whatsThis), widget (KleopatraClient::Gui::CertificateRequester, OCSPResponderSignature)
-#: rc.cpp:92
+#: rc.cpp:152
 msgid ""
 "Choose here the certificate with which the OCSP server signs its replies."
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:144
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, doNotCheckCertPolicyCB)
-#: rc.cpp:95
+#: rc.cpp:155
 msgid ""
 "By default, GnuPG uses the file ~/.gnupg/policies.txt to check if a "
 "certificate policy is allowed. If this option is selected, policies are not "
@@ -5361,13 +5469,13 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:147
 #. i18n: ectx: property (text), widget (QCheckBox, doNotCheckCertPolicyCB)
-#: rc.cpp:98
+#: rc.cpp:158
 msgid "Do not check certificate policies"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:154
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, neverConsultCB)
-#: rc.cpp:101
+#: rc.cpp:161
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
 "validate S/MIME certificates."
@@ -5375,13 +5483,13 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:157
 #. i18n: ectx: property (text), widget (QCheckBox, neverConsultCB)
-#: rc.cpp:104
+#: rc.cpp:164
 msgid "Never consult a CRL"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:164
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, allowMarkTrustedCB)
-#: rc.cpp:107
+#: rc.cpp:167
 msgid ""
 "If this option is checked while a root CA certificate is being imported, you "
 "will be asked to confirm its fingerprint and to state whether or not you "
@@ -5393,13 +5501,13 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:167
 #. i18n: ectx: property (text), widget (QCheckBox, allowMarkTrustedCB)
-#: rc.cpp:110
+#: rc.cpp:170
 msgid "Allow to mark root certificates as trusted"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:174
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, fetchMissingCB)
-#: rc.cpp:113
+#: rc.cpp:173
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
 "necessary (this applies to both validation methods, CRLs and OCSP)."
@@ -5407,31 +5515,31 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:177
 #. i18n: ectx: property (text), widget (QCheckBox, fetchMissingCB)
-#: rc.cpp:116
+#: rc.cpp:176
 msgid "Fetch missing issuer certificates"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:185
 #. i18n: ectx: attribute (title), widget (QWidget, tabHTTP)
-#: rc.cpp:119
+#: rc.cpp:179
 msgid "&HTTP Requests"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:191
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, disableHTTPCB)
-#: rc.cpp:122
+#: rc.cpp:182
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:194
 #. i18n: ectx: property (text), widget (QCheckBox, disableHTTPCB)
-#: rc.cpp:125
+#: rc.cpp:185
 msgid "Do not perform any HTTP requests"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:201
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreHTTPDPCB)
-#: rc.cpp:128
+#: rc.cpp:188
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
 "contains what are known as \"CRL Distribution Point\" (DP) entries, which "
@@ -5442,13 +5550,13 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:204
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreHTTPDPCB)
-#: rc.cpp:131
+#: rc.cpp:191
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:211
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, honorHTTPProxyRB)
-#: rc.cpp:134
+#: rc.cpp:194
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
 "(which comes from the environment variable http_proxy) will be used for any "
@@ -5457,19 +5565,19 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:214
 #. i18n: ectx: property (text), widget (QRadioButton, honorHTTPProxyRB)
-#: rc.cpp:137
+#: rc.cpp:197
 msgid "Use system HTTP proxy:"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:231
 #. i18n: ectx: property (text), widget (QRadioButton, useCustomHTTPProxyRB)
-#: rc.cpp:143
+#: rc.cpp:203
 msgid "Use this proxy for HTTP requests: "
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:238
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, customHTTPProxy)
-#: rc.cpp:146
+#: rc.cpp:206
 msgid ""
 "<p>If no system proxy is set, or you need to use a different proxy for "
 "GpgSM, you can enter its location here.</p><p>It will be used for all HTTP "
@@ -5479,25 +5587,25 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:259
 #. i18n: ectx: attribute (title), widget (QWidget, tabLDAP)
-#: rc.cpp:149
+#: rc.cpp:209
 msgid "&LDAP Requests"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:265
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, disableLDAPCB)
-#: rc.cpp:152
+#: rc.cpp:212
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:268
 #. i18n: ectx: property (text), widget (QCheckBox, disableLDAPCB)
-#: rc.cpp:155
+#: rc.cpp:215
 msgid "Do not perform any LDAP requests"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:275
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreLDAPDPCB)
-#: rc.cpp:158
+#: rc.cpp:218
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
 "contains what are known as \"CRL Distribution Point\" (DP) entries, which "
@@ -5508,19 +5616,19 @@
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:278
 #. i18n: ectx: property (text), widget (QCheckBox, ignoreLDAPDPCB)
-#: rc.cpp:161
+#: rc.cpp:221
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:285
 #. i18n: ectx: property (text), widget (QLabel, customLDAPLabel)
-#: rc.cpp:164
+#: rc.cpp:224
 msgid "Primary host for LDAP requests:"
 msgstr ""
 
 #. i18n: file: conf/smimevalidationconfigurationwidget.ui:296
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, customLDAPProxy)
-#: rc.cpp:167
+#: rc.cpp:227
 msgid ""
 "Entering an LDAP server here will make all LDAP requests go to that server "
 "first. More precisely, this setting overrides any specified host and port "
@@ -5533,7 +5641,7 @@
 
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:18
 #. i18n: ectx: attribute (title), widget (QWidget, emailOperationsTab)
-#: rc.cpp:171
+#: rc.cpp:231
 msgid "EMail Operations"
 msgstr ""
 
@@ -5541,7 +5649,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, quickSignCB)
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:34
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, quickEncryptCB)
-#: rc.cpp:174 rc.cpp:180
+#: rc.cpp:234 rc.cpp:240
 msgctxt "@info:whatsthis"
 msgid ""
 "When 'Quick Mode' is enabled, no dialog is shown when signing (encrypting) "
@@ -5551,19 +5659,19 @@
 
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:27
 #. i18n: ectx: property (text), widget (QCheckBox, quickSignCB)
-#: rc.cpp:177
+#: rc.cpp:237
 msgid "Use 'Quick Mode' when signing"
 msgstr ""
 
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:37
 #. i18n: ectx: property (text), widget (QCheckBox, quickEncryptCB)
-#: rc.cpp:183
+#: rc.cpp:243
 msgid "Use 'Quick Mode' when encrypting"
 msgstr ""
 
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:58
 #. i18n: ectx: attribute (title), widget (QWidget, fileOperationsTab)
-#: rc.cpp:186
+#: rc.cpp:246
 msgid "File Operations"
 msgstr ""
 
@@ -5571,7 +5679,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, label)
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:78
 #. i18n: ectx: property (whatsThis), widget (QComboBox, checksumDefinitionCB)
-#: rc.cpp:189 rc.cpp:197
+#: rc.cpp:249 rc.cpp:257
 msgctxt "@info:whatsthis"
 msgid ""
 "<p>Choose here which of the configured checksum programs should be used when "
@@ -5582,143 +5690,127 @@
 
 #. i18n: file: conf/cryptooperationsconfigwidget.ui:69
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:194
+#: rc.cpp:254
 msgid "Checksum program to use:"
 msgstr ""
 
-#. i18n: file: crypto/gui/signingcertificateselectionwidget.ui:37
-#. i18n: ectx: property (text), widget (QCheckBox, rememberCO)
-#: rc.cpp:202
-msgid "Remember these as default for future operations"
-msgstr ""
-
-#. i18n: file: crypto/gui/signingcertificateselectionwidget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, pgpLabel)
-#: rc.cpp:205
-msgid "OpenPGP Signing Certificate:"
+#. i18n: file: conf/appearanceconfigwidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AppearanceConfigWidget)
+#: rc.cpp:262
+msgid "Color && Font Configuration"
 msgstr ""
 
-#. i18n: file: crypto/gui/signingcertificateselectionwidget.ui:67
-#. i18n: ectx: property (text), widget (QLabel, cmsLabel)
-#: rc.cpp:208
-msgid "S/MIME Signing Certificate:"
+#. i18n: file: conf/appearanceconfigwidget.ui:20
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:265
+msgid "Tooltips"
 msgstr ""
 
-#. i18n: file: kwatchgnupg/kwatchgnupgui.rc:13
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kleopatra.rc:86
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:214 rc.cpp:238
-msgid "Main Toolbar"
+#. i18n: file: conf/appearanceconfigwidget.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:268
+msgid "Show the following information in certificate list tooltips:"
 msgstr ""
 
-#. i18n: file: kleopatra.rc:24
-#. i18n: ectx: Menu (view)
-#: rc.cpp:220
-msgid "&View"
+#. i18n: file: conf/appearanceconfigwidget.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, tooltipValidityCheckBox)
+#: rc.cpp:271
+msgid "Show validity"
 msgstr ""
 
-#. i18n: file: kleopatra.rc:36
-#. i18n: ectx: Menu (certMenu)
-#. i18n: file: kleopatra.rc:102
-#. i18n: ectx: Menu (listview_popup)
-#: rc.cpp:223 rc.cpp:244
-msgid "&Certificates"
-msgstr "&Tystysgrifau"
-
-#. i18n: file: kleopatra.rc:51
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:226
-msgid "&Tools"
+#. i18n: file: conf/appearanceconfigwidget.ui:40
+#. i18n: ectx: property (text), widget (QCheckBox, tooltipOwnerCheckBox)
+#: rc.cpp:274
+msgid "Show owner information"
 msgstr ""
 
-#. i18n: file: kleopatra.rc:65
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:229
-msgid "&Settings"
+#. i18n: file: conf/appearanceconfigwidget.ui:47
+#. i18n: ectx: property (text), widget (QCheckBox, tooltipDetailsCheckBox)
+#: rc.cpp:277
+msgid "Show technical details"
 msgstr ""
 
-#. i18n: file: kleopatra.rc:69
-#. i18n: ectx: Menu (window)
-#: rc.cpp:232
-msgid "&Window"
+#. i18n: file: conf/appearanceconfigwidget.ui:68
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:280
+msgid "Certificate Categories"
 msgstr ""
 
-#. i18n: file: kleopatra.rc:80
-#. i18n: ectx: Menu (help)
-#: rc.cpp:235
-msgid "&Help"
+#. i18n: file: conf/appearanceconfigwidget.ui:82
+#. i18n: ectx: property (text), widget (QPushButton, iconButton)
+#: rc.cpp:283
+msgid "Set &Icon..."
 msgstr ""
 
-#. i18n: file: kleopatra.rc:97
-#. i18n: ectx: ToolBar (searchToolBar)
-#: rc.cpp:241
-msgid "Search Toolbar"
-msgstr "Bar Offer Chwilio"
-
-#. i18n: file: newcertificatewizard/overviewpage.ui:5
-#. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::OverviewPage)
-#: rc.cpp:247
-msgctxt "@title"
-msgid "Review Certificate Parameters"
+#. i18n: file: conf/appearanceconfigwidget.ui:92
+#. i18n: ectx: property (text), widget (QPushButton, foregroundButton)
+#: rc.cpp:286
+msgid "Set &Text Color..."
 msgstr ""
 
-#. i18n: file: newcertificatewizard/overviewpage.ui:8
-#. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::OverviewPage)
-#: rc.cpp:250
-msgid ""
-"Please review the certificate parameters before proceeding to create the "
-"certificate."
+#. i18n: file: conf/appearanceconfigwidget.ui:102
+#. i18n: ectx: property (text), widget (QPushButton, backgroundButton)
+#: rc.cpp:289
+msgid "Set &Background Color..."
 msgstr ""
 
-#. i18n: file: newcertificatewizard/overviewpage.ui:21
-#. i18n: ectx: property (text), widget (QCheckBox, showAllDetailsCB)
-#: rc.cpp:253
-msgid "Show all details"
+#. i18n: file: conf/appearanceconfigwidget.ui:112
+#. i18n: ectx: property (text), widget (QPushButton, fontButton)
+#: rc.cpp:292
+msgid "Set F&ont..."
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:5
-#. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::EnterDetailsPage)
-#: rc.cpp:256
-msgctxt "@title"
-msgid "Enter Details"
+#. i18n: file: conf/appearanceconfigwidget.ui:122
+#. i18n: ectx: property (text), widget (QCheckBox, italicCB)
+#: rc.cpp:295
+msgid "Italic"
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:8
-#. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::EnterDetailsPage)
-#: rc.cpp:259
-msgid ""
-"Please enter your personal details below. If you want more control over the "
-"certificate parameters, click on the Advanced Settings button."
-msgstr ""
+#. i18n: file: conf/appearanceconfigwidget.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, boldCB)
+#: rc.cpp:298
+msgid "Bold"
+msgstr "Trwm"
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:16
-#. i18n: ectx: property (text), widget (QLabel, nameLB)
-#: rc.cpp:262
-msgid "Real name:"
-msgstr ""
+#. i18n: file: conf/appearanceconfigwidget.ui:142
+#. i18n: ectx: property (text), widget (QCheckBox, strikeoutCB)
+#: rc.cpp:301
+msgid "Strikeout"
+msgstr "Trwylinellu"
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:33
-#. i18n: ectx: property (text), widget (QLabel, emailLB)
-#: rc.cpp:268
-msgid "EMail address:"
+#. i18n: file: conf/appearanceconfigwidget.ui:168
+#. i18n: ectx: property (text), widget (QPushButton, defaultLookPB)
+#: rc.cpp:304
+msgid "Default Appearance"
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:95
-#. i18n: ectx: property (text), widget (QCheckBox, addEmailToDnCB)
-#: rc.cpp:280
-msgid "Add email address to DN (only needed for broken CAs)"
+#. i18n: file: newcertificatewizard/keycreationpage.ui:5
+#. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::KeyCreationPage)
+#: rc.cpp:307
+msgctxt "@title"
+msgid "Creating Key..."
 msgstr ""
 
-#. i18n: file: newcertificatewizard/enterdetailspage.ui:154
-#. i18n: ectx: property (text), widget (QPushButton, advancedPB)
-#: rc.cpp:283
-msgid "Advanced Settings..."
+#. i18n: file: newcertificatewizard/keycreationpage.ui:8
+#. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::KeyCreationPage)
+#: rc.cpp:310
+msgid "Your key is being created."
+msgstr ""
+
+#. i18n: file: newcertificatewizard/keycreationpage.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:313
+msgid ""
+"The process of creating a key requires large amounts of random numbers. To "
+"foster this process, you can use the entry field below to enter some "
+"gibberish. The text itself does not matter - only the inter-character "
+"timing. You can also move this window around with your mouse, or start some "
+"disk-intensive application."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:28
 #. i18n: ectx: property (toolTip), widget (Kleo::DragQueen, dragQueen)
-#: rc.cpp:289
+#: rc.cpp:319
 msgid ""
 "Drag this icon to your mail application's composer to attach the request to "
 "a mail."
@@ -5726,86 +5818,86 @@
 
 #. i18n: file: newcertificatewizard/resultpage.ui:41
 #. i18n: ectx: property (text), widget (QPushButton, restartWizardPB)
-#: rc.cpp:292
+#: rc.cpp:322
 msgid "Restart This Wizard (Keeps Your Parameters)"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:48
 #. i18n: ectx: property (title), widget (QGroupBox, nextStepsGB)
-#: rc.cpp:295
+#: rc.cpp:325
 msgid "Next Steps"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:54
 #. i18n: ectx: property (text), widget (QPushButton, saveRequestToFilePB)
-#: rc.cpp:298
+#: rc.cpp:328
 msgid "Save Certificate Request To File..."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:61
 #. i18n: ectx: property (text), widget (QPushButton, sendRequestByEMailPB)
-#: rc.cpp:301
+#: rc.cpp:331
 msgid "Send Certificate Request By EMail..."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:68
 #. i18n: ectx: property (text), widget (QPushButton, makeBackupPB)
-#: rc.cpp:304
+#: rc.cpp:334
 msgid "Make a Backup Of Your Key Pair..."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:75
 #. i18n: ectx: property (text), widget (QPushButton, sendCertificateByEMailPB)
-#: rc.cpp:307
+#: rc.cpp:337
 msgid "Send Certificate By EMail..."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:82
 #. i18n: ectx: property (text), widget (QPushButton, uploadToKeyserverPB)
-#: rc.cpp:310
+#: rc.cpp:340
 msgid "Upload Certificate To Directory Service..."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:89
 #. i18n: ectx: property (text), widget (QPushButton, createRevocationRequestPB)
-#: rc.cpp:313
+#: rc.cpp:343
 msgid "Create Revocation Request..."
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:96
 #. i18n: ectx: property (text), widget (QPushButton, createSigningCertificatePB)
-#: rc.cpp:316
+#: rc.cpp:346
 msgid "Create Signing Certificate With Same Parameters"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/resultpage.ui:103
 #. i18n: ectx: property (text), widget (QPushButton, createEncryptionCertificatePB)
-#: rc.cpp:319
+#: rc.cpp:349
 msgid "Create Encryption Certificate With Same Parameters"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/chooseprotocolpage.ui:13
 #. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::ChooseProtocolPage)
-#: rc.cpp:322
+#: rc.cpp:352
 msgctxt "@title"
 msgid "Choose Certificate Format"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/chooseprotocolpage.ui:16
 #. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::ChooseProtocolPage)
-#: rc.cpp:325
+#: rc.cpp:355
 msgid "Please choose which type of certificate you want to create. "
 msgstr ""
 
 #. i18n: file: newcertificatewizard/chooseprotocolpage.ui:25
 #. i18n: ectx: property (text), widget (QCommandLinkButton, pgpCLB)
-#: rc.cpp:328
+#: rc.cpp:358
 msgid "Create a personal OpenPGP key pair"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/chooseprotocolpage.ui:34
 #. i18n: ectx: property (description), widget (QCommandLinkButton, pgpCLB)
-#: rc.cpp:331
+#: rc.cpp:361
 msgid ""
 "OpenPGP key pairs are created locally, and certified by your friends and "
 "acquaintances. There is no central certification authority; instead, every "
@@ -5815,46 +5907,22 @@
 
 #. i18n: file: newcertificatewizard/chooseprotocolpage.ui:41
 #. i18n: ectx: property (text), widget (QCommandLinkButton, x509CLB)
-#: rc.cpp:334
+#: rc.cpp:364
 msgid "Create a personal X.509 key pair and certification request "
 msgstr ""
 
 #. i18n: file: newcertificatewizard/chooseprotocolpage.ui:50
 #. i18n: ectx: property (description), widget (QCommandLinkButton, x509CLB)
-#: rc.cpp:337
+#: rc.cpp:367
 msgid ""
 "X.509 key pairs are created locally, but certified centrally by a "
 "certification authority (CA). CAs can certify other CAs, creating a central, "
 "hierarchical chain of trust."
 msgstr ""
 
-#. i18n: file: newcertificatewizard/keycreationpage.ui:5
-#. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::KeyCreationPage)
-#: rc.cpp:340
-msgctxt "@title"
-msgid "Creating Key..."
-msgstr ""
-
-#. i18n: file: newcertificatewizard/keycreationpage.ui:8
-#. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::KeyCreationPage)
-#: rc.cpp:343
-msgid "Your key is being created."
-msgstr ""
-
-#. i18n: file: newcertificatewizard/keycreationpage.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:346
-msgid ""
-"The process of creating a key requires large amounts of random numbers. To "
-"foster this process, you can use the entry field below to enter some "
-"gibberish. The text itself does not matter - only the inter-character "
-"timing. You can also move this window around with your mouse, or start some "
-"disk-intensive application."
-msgstr ""
-
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, Kleo::NewCertificateUi::AdvancedSettingsDialog)
-#: rc.cpp:349
+#: rc.cpp:370
 msgid "Advanced Settings"
 msgstr ""
 
@@ -5862,220 +5930,309 @@
 #. i18n: ectx: attribute (title), widget (QWidget, technicalTab)
 #. i18n: file: dialogs/certificatedetailsdialog.ui:264
 #. i18n: ectx: attribute (title), widget (QWidget, detailsTab)
-#: rc.cpp:352 rc.cpp:650
+#: rc.cpp:373 rc.cpp:524
 msgid "Technical Details"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:26
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:355
+#: rc.cpp:376
 msgid "Key Material"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:32
 #. i18n: ectx: property (text), widget (QRadioButton, rsaRB)
-#: rc.cpp:358
+#: rc.cpp:379
 msgid "RSA"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:55
 #. i18n: ectx: property (text), widget (QRadioButton, dsaRB)
-#: rc.cpp:361
+#: rc.cpp:382
 msgid "DSA"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:65
 #. i18n: ectx: property (text), widget (QCheckBox, elgCB)
-#: rc.cpp:364
+#: rc.cpp:385
 msgid "+ Elgamal"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:108
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:367
+#: rc.cpp:388
 msgid "Certificate Usage"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:116
 #. i18n: ectx: property (text), widget (QCheckBox, expiryCB)
-#: rc.cpp:370
+#: rc.cpp:391
 msgid "Valid until:"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:141
 #. i18n: ectx: property (text), widget (QCheckBox, certificationCB)
-#: rc.cpp:373
+#: rc.cpp:394
 msgid "Certification"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:148
 #. i18n: ectx: property (text), widget (QCheckBox, signingCB)
-#: rc.cpp:376
+#: rc.cpp:397
 msgid "Signing"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:158
 #. i18n: ectx: property (text), widget (QCheckBox, encryptionCB)
-#: rc.cpp:379
+#: rc.cpp:400
 msgid "Encryption"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:168
 #. i18n: ectx: property (text), widget (QCheckBox, authenticationCB)
-#: rc.cpp:382
+#: rc.cpp:403
 msgid "Authentication"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:198
 #. i18n: ectx: property (title), widget (QGroupBox, uidGB)
-#: rc.cpp:388
+#: rc.cpp:409
 msgid "Additional User-IDs"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:210
 #. i18n: ectx: property (title), widget (QGroupBox, emailGB)
-#: rc.cpp:391
+#: rc.cpp:412
 msgid "EMail Addresses"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:222
 #. i18n: ectx: property (title), widget (QGroupBox, dnsGB)
-#: rc.cpp:394
+#: rc.cpp:415
 msgid "DNS Names"
 msgstr ""
 
 #. i18n: file: newcertificatewizard/advancedsettingsdialog.ui:234
 #. i18n: ectx: property (title), widget (QGroupBox, uriGB)
-#: rc.cpp:397
+#: rc.cpp:418
 msgid "URIs"
 msgstr ""
 
-#. i18n: file: dialogs/setinitialpindialog.ui:13
-#. i18n: ectx: property (text), widget (QLabel, mainLB)
-#: rc.cpp:400
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:5
+#. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::EnterDetailsPage)
+#: rc.cpp:421
+msgctxt "@title"
+msgid "Enter Details"
+msgstr ""
+
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:8
+#. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::EnterDetailsPage)
+#: rc.cpp:424
 msgid ""
-"<p>On this SmartCard, there is space for two certificates:\n"
-"<ol>\n"
-"<li>A normal certificate</li>\n"
-"<li>A special certificate for making <em>qualified signatures</em> according "
-"to the German Signaturgesetz</li>\n"
-"</ol>\n"
-"You need to set initial PINs for both of them.</p>"
+"Please enter your personal details below. If you want more control over the "
+"certificate parameters, click on the Advanced Settings button."
 msgstr ""
 
-#. i18n: file: dialogs/setinitialpindialog.ui:27
-#. i18n: ectx: property (text), widget (QLabel, nksLB)
-#: rc.cpp:408
-msgid "Step 1: Set the initial PIN for the first certificate (\"NKS\"):"
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:16
+#. i18n: ectx: property (text), widget (QLabel, nameLB)
+#: rc.cpp:427
+msgid "Real name:"
 msgstr ""
 
-#. i18n: file: dialogs/setinitialpindialog.ui:34
-#. i18n: ectx: property (text), widget (QPushButton, nksPB)
-#: rc.cpp:411
-msgid "Set Initial PIN (NKS)"
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:33
+#. i18n: ectx: property (text), widget (QLabel, emailLB)
+#: rc.cpp:433
+msgid "EMail address:"
 msgstr ""
 
-#. i18n: file: dialogs/setinitialpindialog.ui:71
-#. i18n: ectx: property (text), widget (QLabel, sigGLB)
-#: rc.cpp:414
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, addEmailToDnCB)
+#: rc.cpp:445
+msgid "Add email address to DN (only needed for broken CAs)"
+msgstr ""
+
+#. i18n: file: newcertificatewizard/enterdetailspage.ui:154
+#. i18n: ectx: property (text), widget (QPushButton, advancedPB)
+#: rc.cpp:448
+msgid "Advanced Settings..."
+msgstr ""
+
+#. i18n: file: newcertificatewizard/overviewpage.ui:5
+#. i18n: ectx: property (title), widget (QWizardPage, Kleo::NewCertificateUi::OverviewPage)
+#: rc.cpp:451
+msgctxt "@title"
+msgid "Review Certificate Parameters"
+msgstr ""
+
+#. i18n: file: newcertificatewizard/overviewpage.ui:8
+#. i18n: ectx: property (subTitle), widget (QWizardPage, Kleo::NewCertificateUi::OverviewPage)
+#: rc.cpp:454
 msgid ""
-"Step 2: Set the initial PIN for the qualified signature certificate "
-"(\"SigG\"):"
+"Please review the certificate parameters before proceeding to create the "
+"certificate."
 msgstr ""
 
-#. i18n: file: dialogs/setinitialpindialog.ui:81
-#. i18n: ectx: property (text), widget (QPushButton, sigGPB)
-#: rc.cpp:417
-msgid "Set Initial PIN (SigG)"
+#. i18n: file: newcertificatewizard/overviewpage.ui:21
+#. i18n: ectx: property (text), widget (QCheckBox, showAllDetailsCB)
+#: rc.cpp:457
+msgid "Show all details"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, Kleo::Dialogs::ExpiryDialog)
-#: rc.cpp:420
-msgid "Change Certificate Date of Expiry"
+#. i18n: file: dialogs/adduseriddialog.ui:5
+#. i18n: ectx: property (windowTitle), widget (QDialog, AddUserIDDialog)
+#: rc.cpp:460
+msgid "Add New User-ID"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:20
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:423
-msgid "Please select when to expire this certificate:"
+#. i18n: file: dialogs/adduseriddialog.ui:48
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:463
+msgid "This is how the new User-ID will be stored in the certificate:"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:27
-#. i18n: ectx: property (text), widget (QRadioButton, neverRB)
-#: rc.cpp:426
-msgid "Never"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:21
+#. i18n: ectx: attribute (title), widget (QWidget, overviewTab)
+#: rc.cpp:469
+msgid "Overview"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:39
-#. i18n: ectx: property (text), widget (QRadioButton, inRB)
-#: rc.cpp:429
-msgid "In"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:43
+#. i18n: ectx: property (text), widget (QPushButton, changeTrustLevelPB)
+#: rc.cpp:478
+msgid "Trust Certifications Made by This Certificate..."
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:63
-#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
-#: rc.cpp:432
-msgid "Days"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, revokeCertificatePB)
+#: rc.cpp:484
+msgid "Revoke This Certificate..."
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:68
-#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
-#: rc.cpp:435
-msgid "Weeks"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:111
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:487
+msgid "Photo"
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:121
+#. i18n: ectx: property (text), widget (QLabel, photoLB)
+#: rc.cpp:490
+msgid ""
+"<p>At the moment, Kleopatra does not support photos in certificates. It has "
+"no support for adding, nor for displaying them. This is for the following "
+"reasons:</p>\n"
+"<ul>\n"
+"<li>Photos give a false sense of security.</li>\n"
+"<li>Photos increase the size of certificates.</li>\n"
+"</ul>"
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:138
+#. i18n: ectx: attribute (title), widget (QWidget, certificationsTab)
+#: rc.cpp:497
+msgid "User-IDs && Certifications"
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:158
+#. i18n: ectx: property (title), widget (QGroupBox, userIDsActionsGB)
+#: rc.cpp:500
+msgid "User-IDs"
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:164
+#. i18n: ectx: property (text), widget (QPushButton, addUserIDPB)
+#: rc.cpp:503
+msgid "Add..."
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:174
+#. i18n: ectx: property (text), widget (QPushButton, revokeUserIDPB)
+#. i18n: file: dialogs/certificatedetailsdialog.ui:203
+#. i18n: ectx: property (text), widget (QPushButton, revokeCertificationPB)
+#: rc.cpp:506 rc.cpp:515
+msgid "Revoke..."
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:184
+#. i18n: ectx: property (text), widget (QPushButton, certifyUserIDPB)
+#: rc.cpp:509
+msgid "Certify..."
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:197
+#. i18n: ectx: property (title), widget (QGroupBox, certificationsActionGB)
+#: rc.cpp:512
+msgid "Certifications"
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:297
+#. i18n: ectx: attribute (title), widget (QWidget, chainTab)
+#: rc.cpp:527
+msgid "Chain"
+msgstr ""
+
+#. i18n: file: dialogs/certificatedetailsdialog.ui:310
+#. i18n: ectx: property (text), widget (QTreeWidget, chainTW)
+#: rc.cpp:530
+msgid "1"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:73
-#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
-#: rc.cpp:438
-msgid "Months"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:319
+#. i18n: ectx: attribute (title), widget (QWidget, dumpTab)
+#: rc.cpp:533
+msgid "Dump"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:78
-#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
-#: rc.cpp:441
-msgid "Years"
+#. i18n: file: dialogs/certificatedetailsdialog.ui:325
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:536
+msgid ""
+"This is a dump of all information the backend has about this certificate:"
 msgstr ""
 
-#. i18n: file: dialogs/expirydialog.ui:101
-#. i18n: ectx: property (text), widget (QRadioButton, onRB)
-#: rc.cpp:444
-msgid "On this day:"
+#. i18n: file: dialogs/selftestdialog.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, SelfTestDialog)
+#: rc.cpp:539
+msgid "Kleopatra Self-Test Results"
 msgstr ""
 
-#. i18n: file: dialogs/certificationoptionswidget.ui:16
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:447
-msgid "<b>Step 2:</b> Choose how to certify."
+#. i18n: file: dialogs/selftestdialog.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:542
+msgctxt "@info"
+msgid ""
+"<para>These are the results of the Kleopatra self-test suite. Click on a "
+"test for details.</para><para>Note that all but the first failure might be "
+"due to prior tests failing.</para>"
 msgstr ""
 
-#. i18n: file: dialogs/certificationoptionswidget.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:450
-msgid "Choose which of your certificates to sign with:"
+#. i18n: file: dialogs/selftestdialog.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, showAllCB)
+#: rc.cpp:545
+msgid "Show all test results"
 msgstr ""
 
-#. i18n: file: dialogs/certificationoptionswidget.ui:60
-#. i18n: ectx: property (text), widget (QRadioButton, localSignatureRB)
-#: rc.cpp:457
-msgid "Certify only for myself"
+#. i18n: file: dialogs/selftestdialog.ui:117
+#. i18n: ectx: property (title), widget (QGroupBox, proposedCorrectiveActionGB)
+#: rc.cpp:551
+msgid "Proposed Corrective Action"
 msgstr ""
 
-#. i18n: file: dialogs/certificationoptionswidget.ui:70
-#. i18n: ectx: property (text), widget (QRadioButton, exportableSignatureRB)
-#: rc.cpp:460
-msgid "Certify for everyone to see"
+#. i18n: file: dialogs/selftestdialog.ui:182
+#. i18n: ectx: property (text), widget (QPushButton, doItPB)
+#: rc.cpp:554
+msgid "Do It"
 msgstr ""
 
-#. i18n: file: dialogs/certificationoptionswidget.ui:98
-#. i18n: ectx: property (text), widget (QCheckBox, sendToServerCB)
-#: rc.cpp:463
-msgid "Send certified certificate to server afterwards"
+#. i18n: file: dialogs/selftestdialog.ui:195
+#. i18n: ectx: property (text), widget (QCheckBox, runAtStartUpCB)
+#: rc.cpp:557
+msgid "Run these tests at startup"
 msgstr ""
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:16
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:466
+#: rc.cpp:560
 msgid ""
 "<b>Step 2:</b> How thoroughly have you checked that this certificate "
 "actually belongs to the person it claims it is from?"
@@ -6083,25 +6240,25 @@
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:26
 #. i18n: ectx: property (text), widget (QRadioButton, checkLevelNotCheckedRB)
-#: rc.cpp:469
+#: rc.cpp:563
 msgid "I have not checked at all"
 msgstr ""
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:52
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:472
+#: rc.cpp:566
 msgid "Describe semantics here..."
 msgstr ""
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:62
 #. i18n: ectx: property (text), widget (QRadioButton, checkLevelCasualRB)
-#: rc.cpp:475
+#: rc.cpp:569
 msgid "I have checked casually"
 msgstr ""
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:88
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:478
+#: rc.cpp:572
 msgid ""
 "Choose this if you know the person, and have asked them whether this was "
 "their certificate, but you have not verified they are actually in possession "
@@ -6110,13 +6267,13 @@
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:98
 #. i18n: ectx: property (text), widget (QRadioButton, checkLevelThoroughlyRB)
-#: rc.cpp:481
+#: rc.cpp:575
 msgid "I have checked very thoroughly"
 msgstr ""
 
 #. i18n: file: dialogs/selectchecklevelwidget.ui:124
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:484
+#: rc.cpp:578
 msgid ""
 "Choose this if you have, for instance, checked the ID card of the person, "
 "and have verified that they are in possession of the secret key (e.g. by "
@@ -6125,474 +6282,314 @@
 
 #. i18n: file: dialogs/exportsecretkeydialog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, ExportSecretKeyDialog)
-#: rc.cpp:487
+#: rc.cpp:581
 msgid "Export Secret Certificate"
 msgstr ""
 
 #. i18n: file: dialogs/exportsecretkeydialog.ui:26
 #. i18n: ectx: property (text), widget (QLabel, outputFileLB)
-#: rc.cpp:490
+#: rc.cpp:584
 msgid "Output file:"
 msgstr ""
 
 #. i18n: file: dialogs/exportsecretkeydialog.ui:36
 #. i18n: ectx: property (text), widget (QLabel, charsetLB)
-#: rc.cpp:493
+#: rc.cpp:587
 msgid "Passphrase charset:"
 msgstr ""
 
 #. i18n: file: dialogs/exportsecretkeydialog.ui:66
 #. i18n: ectx: property (text), widget (QCheckBox, armorCB)
-#: rc.cpp:496
+#: rc.cpp:590
 msgid "ASCII armor"
 msgstr ""
 
-#. i18n: file: dialogs/ownertrustdialog.ui:29
-#. i18n: ectx: property (text), widget (QRadioButton, unknownRB)
-#: rc.cpp:499
-msgid "I do not know"
+#. i18n: file: dialogs/certificationoptionswidget.ui:16
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:593
+msgid "<b>Step 2:</b> Choose how to certify."
 msgstr ""
 
-#. i18n: file: dialogs/ownertrustdialog.ui:42
+#. i18n: file: dialogs/certificationoptionswidget.ui:30
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:502
-msgid "<i>(unknown trust)</i>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:75
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:505
-msgid ""
-"<font size=\"-1\">Choose this if you have no opinion about the "
-"trustworthyness of the certificate's owner.<br>Certifications at this trust "
-"level are ignored when checking the validity of OpenPGP certificates.</font>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:89
-#. i18n: ectx: property (text), widget (QRadioButton, neverRB)
-#: rc.cpp:508
-msgid "I do NOT trust them"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:99
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:511
-msgid "<i>(never trust)</i>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:132
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:514
-msgid ""
-"<font size=\"-1\">Choose this if you explicitly do <em>not</em> trust the "
-"certificate owner, e.g. because you have knowledge of him certifying without "
-"checking or without the certificate owner's consent.<br>Certifications at "
-"this trust level are ignored when checking the validity of OpenPGP "
-"certificates.</font>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:146
-#. i18n: ectx: property (text), widget (QRadioButton, marginalRB)
-#: rc.cpp:517
-msgid "I believe checks are casual"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:156
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:520
-msgid "<i>(marginal trust)</i>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:189
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:523
-msgid ""
-"<font size=\"-1\">Choose this if you trust certifications are not done "
-"blindly, but not very accuratly, either.<br>Certificates will only become "
-"valid with multiple certifications (typically three) at this trust level. "
-"This is usually a good choice.</font>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:203
-#. i18n: ectx: property (text), widget (QRadioButton, fullRB)
-#: rc.cpp:526
-msgid "I believe checks are very accurate"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:213
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:529
-msgid "<i>(full trust)</i>"
-msgstr ""
-
-#. i18n: file: dialogs/ownertrustdialog.ui:246
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:532
-msgid ""
-"<font size=\"-1\">Choose this if you trust certifications are done very "
-"accurately.<br>Certificates will become valid with just a single "
-"certification at this trust level, so assign this much trust with "
-"care.</font>"
+#: rc.cpp:596
+msgid "Choose which of your certificates to sign with:"
 msgstr ""
 
-#. i18n: file: dialogs/ownertrustdialog.ui:263
-#. i18n: ectx: property (text), widget (QRadioButton, ultimateRB)
-#: rc.cpp:535
-msgid "This is my certificate"
+#. i18n: file: dialogs/certificationoptionswidget.ui:60
+#. i18n: ectx: property (text), widget (QRadioButton, localSignatureRB)
+#: rc.cpp:603
+msgid "Certify only for myself"
 msgstr ""
 
-#. i18n: file: dialogs/ownertrustdialog.ui:273
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:538
-msgid "<i>(ultimate trust)</i>"
+#. i18n: file: dialogs/certificationoptionswidget.ui:70
+#. i18n: ectx: property (text), widget (QRadioButton, exportableSignatureRB)
+#: rc.cpp:606
+msgid "Certify for everyone to see"
 msgstr ""
 
-#. i18n: file: dialogs/ownertrustdialog.ui:306
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:541
-msgid ""
-"<font size=\"-1\">Choose this if and only if this is your certificate. This "
-"is the default if the secret key is available, but if you imported this "
-"certificate, you might need to adjust the trust level "
-"yourself.<br>Certificates will become valid with just a single certification "
-"at this trust level.</font>"
+#. i18n: file: dialogs/certificationoptionswidget.ui:98
+#. i18n: ectx: property (text), widget (QCheckBox, sendToServerCB)
+#: rc.cpp:609
+msgid "Send certified certificate to server afterwards"
 msgstr ""
 
 #. i18n: file: dialogs/lookupcertificatesdialog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, LookupCertificatesDialog)
-#: rc.cpp:544
+#: rc.cpp:612
 msgid "Certificate Server Certificate Lookup"
 msgstr ""
 
 #. i18n: file: dialogs/lookupcertificatesdialog.ui:24
 #. i18n: ectx: property (text), widget (QPushButton, findPB)
-#: rc.cpp:547
+#: rc.cpp:615
 msgid "Search"
 msgstr ""
 
-#. i18n: file: dialogs/lookupcertificatesdialog.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, detailsPB)
-#: rc.cpp:550
-msgid "Details..."
-msgstr ""
-
-#. i18n: file: dialogs/lookupcertificatesdialog.ui:70
-#. i18n: ectx: property (text), widget (QPushButton, selectAllPB)
-#: rc.cpp:556
-msgid "Select All"
-msgstr ""
-
-#. i18n: file: dialogs/lookupcertificatesdialog.ui:96
-#. i18n: ectx: property (text), widget (QPushButton, deselectAllPB)
-#: rc.cpp:559
-msgid "Deselect All"
-msgstr ""
-
-#. i18n: file: dialogs/lookupcertificatesdialog.ui:106
-#. i18n: ectx: property (text), widget (QLabel, findLB)
-#: rc.cpp:562
-msgid "Find:"
-msgstr ""
-
-#. i18n: file: dialogs/adduseriddialog.ui:5
-#. i18n: ectx: property (windowTitle), widget (QDialog, AddUserIDDialog)
-#: rc.cpp:565
-msgid "Add New User-ID"
-msgstr ""
-
-#. i18n: file: dialogs/adduseriddialog.ui:48
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:568
-msgid "This is how the new User-ID will be stored in the certificate:"
-msgstr ""
-
-#. i18n: file: dialogs/selftestdialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, SelfTestDialog)
-#: rc.cpp:571
-msgid "Kleopatra Self-Test Results"
-msgstr ""
-
-#. i18n: file: dialogs/selftestdialog.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:574
-msgctxt "@info"
-msgid ""
-"<para>These are the results of the Kleopatra self-test suite. Click on a "
-"test for details.</para><para>Note that all but the first failure might be "
-"due to prior tests failing.</para>"
-msgstr ""
-
-#. i18n: file: dialogs/selftestdialog.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, showAllCB)
-#: rc.cpp:577
-msgid "Show all test results"
-msgstr ""
-
-#. i18n: file: dialogs/selftestdialog.ui:117
-#. i18n: ectx: property (title), widget (QGroupBox, proposedCorrectiveActionGB)
-#: rc.cpp:583
-msgid "Proposed Corrective Action"
-msgstr ""
-
-#. i18n: file: dialogs/selftestdialog.ui:182
-#. i18n: ectx: property (text), widget (QPushButton, doItPB)
-#: rc.cpp:586
-msgid "Do It"
-msgstr ""
-
-#. i18n: file: dialogs/selftestdialog.ui:195
-#. i18n: ectx: property (text), widget (QCheckBox, runAtStartUpCB)
-#: rc.cpp:589
-msgid "Run these tests at startup"
-msgstr ""
-
-#. i18n: file: dialogs/certificatedetailsdialog.ui:21
-#. i18n: ectx: attribute (title), widget (QWidget, overviewTab)
-#: rc.cpp:595
-msgid "Overview"
-msgstr ""
-
-#. i18n: file: dialogs/certificatedetailsdialog.ui:43
-#. i18n: ectx: property (text), widget (QPushButton, changeTrustLevelPB)
-#: rc.cpp:604
-msgid "Trust Certifications Made by This Certificate..."
-msgstr ""
-
-#. i18n: file: dialogs/certificatedetailsdialog.ui:63
-#. i18n: ectx: property (text), widget (QPushButton, revokeCertificatePB)
-#: rc.cpp:610
-msgid "Revoke This Certificate..."
-msgstr ""
-
-#. i18n: file: dialogs/certificatedetailsdialog.ui:111
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:613
-msgid "Photo"
-msgstr ""
-
-#. i18n: file: dialogs/certificatedetailsdialog.ui:121
-#. i18n: ectx: property (text), widget (QLabel, photoLB)
-#: rc.cpp:616
-msgid ""
-"<p>At the moment, Kleopatra does not support photos in certificates. It has "
-"no support for adding, nor for displaying them. This is for the following "
-"reasons:</p>\n"
-"<ul>\n"
-"<li>Photos give a false sense of security.</li>\n"
-"<li>Photos increase the size of certificates.</li>\n"
-"</ul>"
+#. i18n: file: dialogs/lookupcertificatesdialog.ui:44
+#. i18n: ectx: property (text), widget (QPushButton, detailsPB)
+#: rc.cpp:618
+msgid "Details..."
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:138
-#. i18n: ectx: attribute (title), widget (QWidget, certificationsTab)
-#: rc.cpp:623
-msgid "User-IDs && Certifications"
+#. i18n: file: dialogs/lookupcertificatesdialog.ui:70
+#. i18n: ectx: property (text), widget (QPushButton, selectAllPB)
+#: rc.cpp:624
+msgid "Select All"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:158
-#. i18n: ectx: property (title), widget (QGroupBox, userIDsActionsGB)
-#: rc.cpp:626
-msgid "User-IDs"
+#. i18n: file: dialogs/lookupcertificatesdialog.ui:96
+#. i18n: ectx: property (text), widget (QPushButton, deselectAllPB)
+#: rc.cpp:627
+msgid "Deselect All"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:164
-#. i18n: ectx: property (text), widget (QPushButton, addUserIDPB)
-#: rc.cpp:629
-msgid "Add..."
+#. i18n: file: dialogs/lookupcertificatesdialog.ui:106
+#. i18n: ectx: property (text), widget (QLabel, findLB)
+#: rc.cpp:630
+msgid "Find:"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:174
-#. i18n: ectx: property (text), widget (QPushButton, revokeUserIDPB)
-#. i18n: file: dialogs/certificatedetailsdialog.ui:203
-#. i18n: ectx: property (text), widget (QPushButton, revokeCertificationPB)
-#: rc.cpp:632 rc.cpp:641
-msgid "Revoke..."
+#. i18n: file: dialogs/expirydialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, Kleo::Dialogs::ExpiryDialog)
+#: rc.cpp:633
+msgid "Change Certificate Date of Expiry"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:184
-#. i18n: ectx: property (text), widget (QPushButton, certifyUserIDPB)
-#: rc.cpp:635
-msgid "Certify..."
+#. i18n: file: dialogs/expirydialog.ui:20
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:636
+msgid "Please select when to expire this certificate:"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:197
-#. i18n: ectx: property (title), widget (QGroupBox, certificationsActionGB)
-#: rc.cpp:638
-msgid "Certifications"
+#. i18n: file: dialogs/expirydialog.ui:27
+#. i18n: ectx: property (text), widget (QRadioButton, neverRB)
+#: rc.cpp:639
+msgid "Never"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:297
-#. i18n: ectx: attribute (title), widget (QWidget, chainTab)
-#: rc.cpp:653
-msgid "Chain"
+#. i18n: file: dialogs/expirydialog.ui:39
+#. i18n: ectx: property (text), widget (QRadioButton, inRB)
+#: rc.cpp:642
+msgid "In"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:310
-#. i18n: ectx: property (text), widget (QTreeWidget, chainTW)
-#: rc.cpp:656
-msgid "1"
+#. i18n: file: dialogs/expirydialog.ui:63
+#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
+#: rc.cpp:645
+msgid "Days"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:319
-#. i18n: ectx: attribute (title), widget (QWidget, dumpTab)
-#: rc.cpp:659
-msgid "Dump"
+#. i18n: file: dialogs/expirydialog.ui:68
+#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
+#: rc.cpp:648
+msgid "Weeks"
 msgstr ""
 
-#. i18n: file: dialogs/certificatedetailsdialog.ui:325
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:662
-msgid ""
-"This is a dump of all information the backend has about this certificate:"
+#. i18n: file: dialogs/expirydialog.ui:73
+#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
+#: rc.cpp:651
+msgid "Months"
 msgstr ""
 
-#. i18n: file: kcfg/smimevalidationpreferences.kcfg:6
-#. i18n: ectx: label, entry (RefreshInterval), group (SMime Validation)
-#: rc.cpp:665
-msgid "Certificate refresh interval (in hours). Zero (0) disables."
+#. i18n: file: dialogs/expirydialog.ui:78
+#. i18n: ectx: property (text), item, widget (QComboBox, inCB)
+#: rc.cpp:654
+msgid "Years"
 msgstr ""
 
-#. i18n: file: kcfg/emailoperationspreferences.kcfg:10
-#. i18n: ectx: label, entry (QuickSignEMail), group (EMailOperations)
-#: rc.cpp:671
-msgid "Quick Sign EMail"
+#. i18n: file: dialogs/expirydialog.ui:101
+#. i18n: ectx: property (text), widget (QRadioButton, onRB)
+#: rc.cpp:657
+msgid "On this day:"
 msgstr ""
 
-#. i18n: file: kcfg/emailoperationspreferences.kcfg:11
-#. i18n: ectx: whatsthis, entry (QuickSignEMail), group (EMailOperations)
-#: rc.cpp:674
-msgid ""
-"Minimize the number of steps when signing emails, use preset defaults unless "
-"problems occur."
+#. i18n: file: dialogs/ownertrustdialog.ui:29
+#. i18n: ectx: property (text), widget (QRadioButton, unknownRB)
+#: rc.cpp:660
+msgid "I do not know"
 msgstr ""
 
-#. i18n: file: kcfg/emailoperationspreferences.kcfg:15
-#. i18n: ectx: label, entry (QuickEncryptEMail), group (EMailOperations)
-#: rc.cpp:677
-msgid "Quick Encrypt EMail"
+#. i18n: file: dialogs/ownertrustdialog.ui:42
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:663
+msgid "<i>(unknown trust)</i>"
 msgstr ""
 
-#. i18n: file: kcfg/emailoperationspreferences.kcfg:16
-#. i18n: ectx: whatsthis, entry (QuickEncryptEMail), group (EMailOperations)
-#: rc.cpp:680
+#. i18n: file: dialogs/ownertrustdialog.ui:75
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:666
 msgid ""
-"Minimize the number of steps when encrypting emails, use preset defaults "
-"unless problems occur."
+"<font size=\"-1\">Choose this if you have no opinion about the "
+"trustworthyness of the certificate's owner.<br>Certifications at this trust "
+"level are ignored when checking the validity of OpenPGP certificates.</font>"
 msgstr ""
 
-#. i18n: file: kcfg/emailoperationspreferences.kcfg:20
-#. i18n: ectx: label, entry (DecryptVerifyPopupGeometry), group (EMailOperations)
-#: rc.cpp:683
-msgid "Decrypt/Verify Popup Geometry"
+#. i18n: file: dialogs/ownertrustdialog.ui:89
+#. i18n: ectx: property (text), widget (QRadioButton, neverRB)
+#: rc.cpp:669
+msgid "I do NOT trust them"
 msgstr ""
 
-#. i18n: file: kcfg/emailoperationspreferences.kcfg:21
-#. i18n: ectx: whatsthis, entry (DecryptVerifyPopupGeometry), group (EMailOperations)
-#: rc.cpp:686
+#. i18n: file: dialogs/ownertrustdialog.ui:99
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:672
+msgid "<i>(never trust)</i>"
+msgstr ""
+
+#. i18n: file: dialogs/ownertrustdialog.ui:132
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:675
 msgid ""
-"The remembered size and position of the Decrypt/Verify Result Popup used by "
-"clients which do not support inline display of D/V results, such as MS "
-"Outlook."
+"<font size=\"-1\">Choose this if you explicitly do <em>not</em> trust the "
+"certificate owner, e.g. because you have knowledge of him certifying without "
+"checking or without the certificate owner's consent.<br>Certifications at "
+"this trust level are ignored when checking the validity of OpenPGP "
+"certificates.</font>"
 msgstr ""
 
-#. i18n: file: kcfg/tooltippreferences.kcfg:9
-#. i18n: ectx: label, entry (ShowValidity), group (Tooltip)
-#: rc.cpp:689
-msgid "Show certificate validity"
+#. i18n: file: dialogs/ownertrustdialog.ui:146
+#. i18n: ectx: property (text), widget (QRadioButton, marginalRB)
+#: rc.cpp:678
+msgid "I believe checks are casual"
 msgstr ""
 
-#. i18n: file: kcfg/tooltippreferences.kcfg:10
-#. i18n: ectx: whatsthis, entry (ShowValidity), group (Tooltip)
-#: rc.cpp:692
+#. i18n: file: dialogs/ownertrustdialog.ui:156
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:681
+msgid "<i>(marginal trust)</i>"
+msgstr ""
+
+#. i18n: file: dialogs/ownertrustdialog.ui:189
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:684
 msgid ""
-"Show validity information for certificates in tooltip, such as whether the "
-"certificate is expired or revoked."
+"<font size=\"-1\">Choose this if you trust certifications are not done "
+"blindly, but not very accuratly, either.<br>Certificates will only become "
+"valid with multiple certifications (typically three) at this trust level. "
+"This is usually a good choice.</font>"
 msgstr ""
 
-#. i18n: file: kcfg/tooltippreferences.kcfg:14
-#. i18n: ectx: label, entry (ShowOwnerInformation), group (Tooltip)
-#: rc.cpp:695
-msgid "Show certificate owner information"
+#. i18n: file: dialogs/ownertrustdialog.ui:203
+#. i18n: ectx: property (text), widget (QRadioButton, fullRB)
+#: rc.cpp:687
+msgid "I believe checks are very accurate"
 msgstr ""
 
-#. i18n: file: kcfg/tooltippreferences.kcfg:15
-#. i18n: ectx: whatsthis, entry (ShowOwnerInformation), group (Tooltip)
-#: rc.cpp:698
+#. i18n: file: dialogs/ownertrustdialog.ui:213
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:690
+msgid "<i>(full trust)</i>"
+msgstr ""
+
+#. i18n: file: dialogs/ownertrustdialog.ui:246
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:693
 msgid ""
-"Show owner information for certificates in tooltip, such as User IDs, "
-"subject and issuers."
+"<font size=\"-1\">Choose this if you trust certifications are done very "
+"accurately.<br>Certificates will become valid with just a single "
+"certification at this trust level, so assign this much trust with "
+"care.</font>"
 msgstr ""
 
-#. i18n: file: kcfg/tooltippreferences.kcfg:19
-#. i18n: ectx: label, entry (ShowCertificateDetails), group (Tooltip)
-#: rc.cpp:701
-msgid "Show certificate details"
+#. i18n: file: dialogs/ownertrustdialog.ui:263
+#. i18n: ectx: property (text), widget (QRadioButton, ultimateRB)
+#: rc.cpp:696
+msgid "This is my certificate"
 msgstr ""
 
-#. i18n: file: kcfg/tooltippreferences.kcfg:20
-#. i18n: ectx: whatsthis, entry (ShowCertificateDetails), group (Tooltip)
-#: rc.cpp:704
-msgid ""
-"Show more certificate details, such as fingerprint, key length and "
-"expiration dates"
+#. i18n: file: dialogs/ownertrustdialog.ui:273
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:699
+msgid "<i>(ultimate trust)</i>"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:17
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#: rc.cpp:707
-msgid "Option"
+#. i18n: file: dialogs/ownertrustdialog.ui:306
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:702
+msgid ""
+"<font size=\"-1\">Choose this if and only if this is your certificate. This "
+"is the default if the secret key is available, but if you imported this "
+"certificate, you might need to adjust the trust level "
+"yourself.<br>Certificates will become valid with just a single certification "
+"at this trust level.</font>"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:22
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#: rc.cpp:710
-msgid "Impose"
+#. i18n: file: dialogs/setinitialpindialog.ui:13
+#. i18n: ectx: property (text), widget (QLabel, mainLB)
+#: rc.cpp:705
+msgid ""
+"<p>On this SmartCard, there is space for two certificates:\n"
+"<ol>\n"
+"<li>A normal certificate</li>\n"
+"<li>A special certificate for making <em>qualified signatures</em> according "
+"to the German Signaturgesetz</li>\n"
+"</ol>\n"
+"You need to set initial PINs for both of them.</p>"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:38
-#. i18n: ectx: property (text), widget (QLabel, componentLabelLabel)
+#. i18n: file: dialogs/setinitialpindialog.ui:27
+#. i18n: ectx: property (text), widget (QLabel, nksLB)
 #: rc.cpp:713
-msgid "Component:"
+msgid "Step 1: Set the initial PIN for the first certificate (\"NKS\"):"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:62
-#. i18n: ectx: property (text), widget (QLabel, optionLabelLabel)
+#. i18n: file: dialogs/setinitialpindialog.ui:34
+#. i18n: ectx: property (text), widget (QPushButton, nksPB)
 #: rc.cpp:716
-msgid "Option:"
+msgid "Set Initial PIN (NKS)"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:89
-#. i18n: ectx: property (text), widget (QLabel, descriptionLabelLabel)
+#. i18n: file: dialogs/setinitialpindialog.ui:71
+#. i18n: ectx: property (text), widget (QLabel, sigGLB)
 #: rc.cpp:719
-msgid "Description:"
+msgid ""
+"Step 2: Set the initial PIN for the qualified signature certificate "
+"(\"SigG\"):"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, typeLabelLabel)
+#. i18n: file: dialogs/setinitialpindialog.ui:81
+#. i18n: ectx: property (text), widget (QPushButton, sigGPB)
 #: rc.cpp:722
-msgid "Type:"
+msgid "Set Initial PIN (SigG)"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:147
-#. i18n: ectx: property (text), widget (QRadioButton, useDefaultRB)
+#. i18n: file: crypto/gui/signingcertificateselectionwidget.ui:37
+#. i18n: ectx: property (text), widget (QCheckBox, rememberCO)
 #: rc.cpp:725
-msgid "Reset user settings to built-in default"
+msgid "Remember these as default for future operations"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:157
-#. i18n: ectx: property (text), widget (QRadioButton, useCustomRB)
+#. i18n: file: crypto/gui/signingcertificateselectionwidget.ui:57
+#. i18n: ectx: property (text), widget (QLabel, pgpLabel)
 #: rc.cpp:728
-msgid "Custom value:"
+msgid "OpenPGP Signing Certificate:"
 msgstr ""
 
-#. i18n: file: kgpgconf/mainwidget.ui:177
-#. i18n: ectx: property (text), widget (QCheckBox, readOnlyBox)
+#. i18n: file: crypto/gui/signingcertificateselectionwidget.ui:67
+#. i18n: ectx: property (text), widget (QLabel, cmsLabel)
 #: rc.cpp:731
-msgid "Impose setting on all users"
-msgstr ""
-
-#: qml/kleopatra-mobile.qml:73
-msgid "No certificates loaded yet."
+msgid "S/MIME Signing Certificate:"
 msgstr ""
 
 #: qml/KleopatraActions.qml:48
@@ -6606,3 +6603,7 @@
 #: qml/KleopatraActions.qml:95
 msgid "Settings"
 msgstr ""
+
+#: qml/kleopatra-mobile.qml:73
+msgid "No certificates loaded yet."
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klettres.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klettres.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klettres.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klettres.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/klettres.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 13:38+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
 "PO-Revision-Date: 2009-07-18 17:38+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,10 +11,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: klettres.cpp:108
+#: klettres.cpp:107
 msgid ""
 "The file sounds.xml was not found in\n"
 "$KDEDIR/share/apps/klettres/\n"
@@ -23,64 +23,64 @@
 "\n"
 msgstr ""
 
-#: klettres.cpp:111
+#: klettres.cpp:110
 msgid "KLettres - Error"
 msgstr ""
 
-#: klettres.cpp:130
+#: klettres.cpp:132
 msgid "New Sound"
 msgstr ""
 
-#: klettres.cpp:134
+#: klettres.cpp:136
 msgid "Play a new sound"
 msgstr ""
 
-#: klettres.cpp:135
+#: klettres.cpp:137
 msgid ""
 "You can play a new sound by clicking this button or using the File menu, New "
 "Sound."
 msgstr ""
 
-#: klettres.cpp:138
+#: klettres.cpp:140
 msgid "Get Alphabet in New Language..."
 msgstr ""
 
-#: klettres.cpp:143
+#: klettres.cpp:145
 msgid "Replay Sound"
 msgstr ""
 
-#: klettres.cpp:146
+#: klettres.cpp:148
 msgid "Play the same sound again"
 msgstr ""
 
-#: klettres.cpp:148
+#: klettres.cpp:150
 msgid ""
 "You can replay the same sound again by clicking this button or using the "
 "File menu, Replay Sound."
 msgstr ""
 
-#: klettres.cpp:154
+#: klettres.cpp:156
 msgctxt "@label:listbox which difficulty level to use"
 msgid "L&evel"
 msgstr ""
 
-#: klettres.cpp:155
+#: klettres.cpp:157
 msgid "Select the level"
 msgstr ""
 
-#: klettres.cpp:156
+#: klettres.cpp:158
 msgid ""
 "You can select the level: level 1 displays a letter and you hear it; level 2 "
 "does not display the letter, you only hear it; level 3 displays a syllable "
 "and you hear it; level 4 does not display the syllable, you only hear it."
 msgstr ""
 
-#: klettres.cpp:159
+#: klettres.cpp:161
 msgctxt "@label:listbox"
 msgid "&Language"
 msgstr ""
 
-#: klettres.cpp:162 klettres.cpp:163 klettres.cpp:164 klettres.cpp:165
+#: klettres.cpp:164 klettres.cpp:165 klettres.cpp:166 klettres.cpp:167
 #, kde-format
 msgctxt "@item:inlistbox choose level"
 msgid "Level %1"
@@ -88,76 +88,76 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: klettres.cpp:170
+#: klettres.cpp:172
 msgid "Themes"
 msgstr "Themâu"
 
-#: klettres.cpp:173
+#: klettres.cpp:175
 msgid "Select the theme"
 msgstr ""
 
-#: klettres.cpp:174
+#: klettres.cpp:176
 msgid ""
 "Here you can change the theme for KLettres. A theme consists in the "
 "background picture and the font color for the letter displayed."
 msgstr ""
 
-#: klettres.cpp:177
+#: klettres.cpp:179
 msgid "Mode Kid"
 msgstr ""
 
-#: klettres.cpp:181
+#: klettres.cpp:183
 msgid ""
 "If you are in the Grown-up mode, clicking on this button will set up the Kid "
 "mode. The Kid mode has no menubar and the font is bigger in the statusbar."
 msgstr ""
 
-#: klettres.cpp:184
+#: klettres.cpp:186
 msgid "Mode Grown-up"
 msgstr ""
 
-#: klettres.cpp:188
+#: klettres.cpp:190
 msgid "The Grownup mode is the normal mode where you can see the menubar."
 msgstr ""
 
-#: klettres.cpp:223
+#: klettres.cpp:226
 msgid "Font Settings"
 msgstr "Gosodiadau Ffont"
 
-#: klettres.cpp:227
+#: klettres.cpp:230
 msgid "Timer"
 msgstr "Amserydd"
 
-#: klettres.cpp:247 klettres.cpp:308
+#: klettres.cpp:248 klettres.cpp:310
 #, kde-format
 msgctxt "@info:status the current level chosen"
 msgid "(Level %1)"
 msgstr ""
 
-#: klettres.cpp:348
+#: klettres.cpp:353
 msgid "Grown-up mode is currently active"
 msgstr ""
 
-#: klettres.cpp:349
+#: klettres.cpp:354
 msgid "Switch to Kid mode"
 msgstr ""
 
-#: klettres.cpp:367
+#: klettres.cpp:372
 msgid "Kid mode is currently active"
 msgstr ""
 
-#: klettres.cpp:368
+#: klettres.cpp:373
 msgid "Switch to Grown-up mode"
 msgstr ""
 
-#: klettres.cpp:391
+#: klettres.cpp:394
 #, c-format, kde-format
 msgid ""
 "File $KDEDIR/share/apps/klettres/%1.txt not found;\n"
 "please check your installation."
 msgstr ""
 
-#: klettres.cpp:394
+#: klettres.cpp:397
 msgid "Error"
 msgstr ""
 
@@ -192,7 +192,7 @@
 msgid "English Phonics"
 msgstr ""
 
-#: langutils.cpp:109
+#: langutils.cpp:110
 msgctxt "@item:inlistbox no language for that locale"
 msgid "None"
 msgstr ""
@@ -226,97 +226,97 @@
 msgid "Kids and grown-up oxygen icons"
 msgstr ""
 
-#: main.cpp:75
+#: main.cpp:47
 msgid "Danny Allen"
 msgstr ""
 
-#: main.cpp:76
+#: main.cpp:48
 msgid "SVG background pictures"
 msgstr ""
 
-#: main.cpp:77
+#: main.cpp:49
 msgid "Robert Gogolok"
 msgstr ""
 
-#: main.cpp:78
+#: main.cpp:50
 msgid "Support and coding guidance"
 msgstr ""
 
-#: main.cpp:79
+#: main.cpp:51
 msgid "Peter Hedlund"
 msgstr ""
 
-#: main.cpp:80
+#: main.cpp:52
 msgid "Code for generating special characters' icons"
 msgstr ""
 
-#: main.cpp:81
+#: main.cpp:53
 msgid "Waldo Bastian"
 msgstr ""
 
-#: main.cpp:82
+#: main.cpp:54
 msgid "Port to KConfig XT, coding help"
 msgstr ""
 
-#: main.cpp:83
+#: main.cpp:55
 msgid "Pino Toscano"
 msgstr ""
 
-#: main.cpp:84
+#: main.cpp:56
 msgid "Code cleaning, Theme class"
 msgstr ""
 
-#: main.cpp:85
+#: main.cpp:57
 msgid "Michael Goettsche"
 msgstr ""
 
-#: main.cpp:86
+#: main.cpp:58
 msgid "Timer setting widgets"
 msgstr ""
 
-#: rc.cpp:65
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:66
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: klettresui.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:31 rc.cpp:69
+#: rc.cpp:5
 msgid "&File"
 msgstr ""
 
 #. i18n: file: klettresui.rc:15
 #. i18n: ectx: Menu (look_mode)
-#: rc.cpp:34 rc.cpp:72
+#: rc.cpp:8
 msgid "L&ook"
 msgstr "G&wedd"
 
 #. i18n: file: klettresui.rc:23
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:37 rc.cpp:75
+#: rc.cpp:11
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: klettresui.rc:33
 #. i18n: ectx: ToolBar (mainToolbar)
-#: rc.cpp:40 rc.cpp:78
+#: rc.cpp:14
 msgid "Main"
 msgstr "Prif"
 
 #. i18n: file: klettresui.rc:47
 #. i18n: ectx: ToolBar (specialCharToolbar)
-#: rc.cpp:43 rc.cpp:81
+#: rc.cpp:17
 msgid "Special Characters"
 msgstr ""
 
 #. i18n: file: timerui.ui:51
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:46 rc.cpp:84
+#: rc.cpp:20
 msgid "Set the time between 2 letters."
 msgstr ""
 
@@ -324,17 +324,13 @@
 #. i18n: ectx: property (toolTip), widget (QSlider, kcfg_KidTimer)
 #. i18n: file: timerui.ui:184
 #. i18n: ectx: property (toolTip), widget (QSlider, kcfg_GrownTimer)
-#. i18n: file: timerui.ui:91
-#. i18n: ectx: property (toolTip), widget (QSlider, kcfg_KidTimer)
-#. i18n: file: timerui.ui:184
-#. i18n: ectx: property (toolTip), widget (QSlider, kcfg_GrownTimer)
-#: rc.cpp:49 rc.cpp:58 rc.cpp:87 rc.cpp:96
+#: rc.cpp:23 rc.cpp:32
 msgid "Set the timer (in tenths of seconds)"
 msgstr ""
 
 #. i18n: file: timerui.ui:94
 #. i18n: ectx: property (whatsThis), widget (QSlider, kcfg_KidTimer)
-#: rc.cpp:52 rc.cpp:90
+#: rc.cpp:26
 msgid ""
 "You can set the time between two letters in Kid mode. Default is 4 tenths of "
 "seconds but younger children might need longer time."
@@ -342,7 +338,7 @@
 
 #. i18n: file: timerui.ui:122
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:55 rc.cpp:93
+#: rc.cpp:29
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\" "
 "white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-"
@@ -353,7 +349,7 @@
 
 #. i18n: file: timerui.ui:187
 #. i18n: ectx: property (whatsThis), widget (QSlider, kcfg_GrownTimer)
-#: rc.cpp:61 rc.cpp:99
+#: rc.cpp:35
 msgid ""
 "You can set the time between two letters in Grown-up mode. Default is 2 "
 "tenths of seconds."
@@ -361,7 +357,7 @@
 
 #. i18n: file: timerui.ui:215
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:64 rc.cpp:102
+#: rc.cpp:38
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body style=\" "
 "white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-"
@@ -372,49 +368,49 @@
 
 #. i18n: file: klettres.kcfg:10
 #. i18n: ectx: label, entry (Language), group (General)
-#: rc.cpp:3 rc.cpp:105
+#: rc.cpp:41
 msgid "Language"
 msgstr "Iaith"
 
 #. i18n: file: klettres.kcfg:14
 #. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:6 rc.cpp:108
+#: rc.cpp:44
 msgid "Theme"
 msgstr "Thema"
 
 #. i18n: file: klettres.kcfg:23
 #. i18n: ectx: label, entry (MenuBarBool), group (General)
-#: rc.cpp:9 rc.cpp:111
+#: rc.cpp:47
 msgid "Whether the menubar is shown or hidden"
 msgstr ""
 
 #. i18n: file: klettres.kcfg:27
 #. i18n: ectx: label, entry (Mode), group (General)
-#: rc.cpp:12 rc.cpp:114
+#: rc.cpp:50
 msgid "Mode"
 msgstr "Modd"
 
 #. i18n: file: klettres.kcfg:35
 #. i18n: ectx: label, entry (Level), group (General)
-#: rc.cpp:15 rc.cpp:117
+#: rc.cpp:53
 msgid "Difficulty level."
 msgstr "Lefel anhawster."
 
 #. i18n: file: klettres.kcfg:41
 #. i18n: ectx: label, entry (KidTimer), group (General)
-#: rc.cpp:18 rc.cpp:120
+#: rc.cpp:56
 msgid "Kid Timer"
 msgstr ""
 
 #. i18n: file: klettres.kcfg:45
 #. i18n: ectx: label, entry (GrownTimer), group (General)
-#: rc.cpp:21 rc.cpp:123
+#: rc.cpp:59
 msgid "Grown-up Timer"
 msgstr ""
 
 #. i18n: file: klettres.kcfg:51
 #. i18n: ectx: label, entry (Font), group (mFont)
-#: rc.cpp:24 rc.cpp:126
+#: rc.cpp:62
 msgid "Font"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klickety.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klickety.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klickety.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klickety.po	2012-04-18 08:59:23.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kdegames\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2011-04-15 12:47+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:07+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: gamescene.cpp:235
 msgid "paused"
@@ -139,7 +139,7 @@
 
 #. i18n: file: bgselector.ui:20
 #. i18n: ectx: property (text), widget (QRadioButton, theme)
-#: mainwindow.cpp:104 rc.cpp:3 rc.cpp:78
+#: mainwindow.cpp:104 rc.cpp:5
 msgid "Theme"
 msgstr ""
 
@@ -221,109 +221,81 @@
 msgid "Redo All"
 msgstr ""
 
-#: rc.cpp:74
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:"
 
-#: rc.cpp:75
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ","
 
 #. i18n: file: bgselector.ui:27
 #. i18n: ectx: property (text), widget (QRadioButton, color)
-#: rc.cpp:6 rc.cpp:81
+#: rc.cpp:8
 msgid "Color"
 msgstr ""
 
 #. i18n: file: bgselector.ui:37
 #. i18n: ectx: property (text), widget (QRadioButton, image)
-#: rc.cpp:9 rc.cpp:84
+#: rc.cpp:11
 msgid "Image"
 msgstr ""
 
-#. i18n: file: klicketyui.rc:19
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:73 rc.cpp:87
-msgid "Main Toolbar"
-msgstr ""
-
 #. i18n: file: klickety.kcfg:27
 #. i18n: ectx: label, entry (Theme), group (Themes)
-#: rc.cpp:39 rc.cpp:90
+#: rc.cpp:14
 msgid "The graphical theme to be used."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:39
 #. i18n: ectx: label, entry (BgType), group (Background)
-#: rc.cpp:42 rc.cpp:93
+#: rc.cpp:17
 msgid "The background type to be used."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:48
 #. i18n: ectx: label, entry (BgColor), group (Background)
-#: rc.cpp:45 rc.cpp:96
+#: rc.cpp:20
 msgid "The background color to be used."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:52
 #. i18n: ectx: label, entry (BgImage), group (Background)
-#: rc.cpp:48 rc.cpp:99
+#: rc.cpp:23
 msgid "The background image to be used."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:57
 #. i18n: ectx: label, entry (CustomWidth), group (CustomGame)
-#: rc.cpp:51 rc.cpp:102
+#: rc.cpp:26
 msgid "The width of the playing field."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:63
 #. i18n: ectx: label, entry (CustomHeight), group (CustomGame)
-#: rc.cpp:54 rc.cpp:105
+#: rc.cpp:29
 msgid "The height of the playing field."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:69
 #. i18n: ectx: label, entry (CustomColorCount), group (CustomGame)
-#: rc.cpp:57 rc.cpp:108
+#: rc.cpp:32
 msgid "The number of colors in the playing field."
 msgstr ""
 
 #. i18n: file: klickety.kcfg:74
 #. i18n: ectx: label, entry (level), group (CustomGame)
-#: rc.cpp:60 rc.cpp:111
+#: rc.cpp:35
 msgid "The difficulty level."
 msgstr ""
 
-#. i18n: file: customgame.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:12 rc.cpp:124
-msgid "Width:"
-msgstr ""
-
-#. i18n: file: customgame.ui:34
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:15 rc.cpp:127
-msgid "Height:"
-msgstr ""
-
-#. i18n: file: customgame.ui:51
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:18 rc.cpp:130
-msgid "Color count:"
-msgstr ""
-
 #. i18n: file: gameconfig.ui:16
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowBoundLines)
 #. i18n: file: gameconfig.ui:19
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowBoundLines)
-#. i18n: file: gameconfig.ui:16
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowBoundLines)
-#. i18n: file: gameconfig.ui:19
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowBoundLines)
-#: rc.cpp:21 rc.cpp:24 rc.cpp:133 rc.cpp:136
+#: rc.cpp:49 rc.cpp:52
 msgid "Show bound lines"
 msgstr ""
 
@@ -331,11 +303,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_EnableAnimation)
 #. i18n: file: gameconfig.ui:29
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableAnimation)
-#. i18n: file: gameconfig.ui:26
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_EnableAnimation)
-#. i18n: file: gameconfig.ui:29
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableAnimation)
-#: rc.cpp:27 rc.cpp:30 rc.cpp:139 rc.cpp:142
+#: rc.cpp:55 rc.cpp:58
 msgid "Enable animation"
 msgstr ""
 
@@ -343,10 +311,30 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_EnableHighlight)
 #. i18n: file: gameconfig.ui:39
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableHighlight)
-#. i18n: file: gameconfig.ui:36
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_EnableHighlight)
-#. i18n: file: gameconfig.ui:39
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableHighlight)
-#: rc.cpp:33 rc.cpp:36 rc.cpp:145 rc.cpp:148
+#: rc.cpp:61 rc.cpp:64
 msgid "Enable highlight"
 msgstr ""
+
+#. i18n: file: klicketyui.rc:19
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:67
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: file: customgame.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:70
+msgid "Width:"
+msgstr ""
+
+#. i18n: file: customgame.ui:34
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:73
+msgid "Height:"
+msgstr ""
+
+#. i18n: file: customgame.ui:51
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:76
+msgid "Color count:"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klines.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klines.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klines.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klines.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,54 +9,54 @@
 msgstr ""
 "Project-Id-Version: klines\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:36+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:07+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: klines.cpp:51
+#: klines.cpp:53
 msgid "Score:"
 msgstr ""
 
-#: klines.cpp:76
+#: klines.cpp:79
 msgid "Show Next"
 msgstr ""
 
-#: klines.cpp:83
+#: klines.cpp:86
 msgid "Move Left"
 msgstr "Symud i'r Chwith"
 
-#: klines.cpp:87
+#: klines.cpp:90
 msgid "Move Right"
 msgstr "Symud i'r Dde"
 
-#: klines.cpp:91
+#: klines.cpp:94
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: klines.cpp:95
+#: klines.cpp:98
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#: klines.cpp:99
+#: klines.cpp:102
 msgid "Select"
 msgstr ""
 
-#: klines.cpp:115
+#: klines.cpp:118
 #, kde-format
 msgid "Score: %1"
 msgstr ""
 
-#: klines.cpp:178
+#: klines.cpp:181
 msgid "Theme"
 msgstr ""
 
-#: klines.cpp:188
+#: klines.cpp:192
 #, kde-format
 msgid "Failed to load \"%1\" theme. Please check your installation."
 msgstr ""
@@ -105,50 +105,50 @@
 msgid "New SVG artwork for KDE4 version of the game"
 msgstr ""
 
-#: rc.cpp:16
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: jr, dylunio, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:17
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: klinesui.rc:14
 #. i18n: ectx: Menu (navigation)
-#: rc.cpp:15 rc.cpp:20
+#: rc.cpp:5
 msgid "Navigation"
 msgstr ""
 
 #. i18n: file: klines.kcfg:9
 #. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:3 rc.cpp:23
+#: rc.cpp:8
 msgid "The graphical theme to be used."
 msgstr ""
 
 #. i18n: file: klines.kcfg:15
 #. i18n: ectx: label, entry (ShowNext), group (Game)
-#: rc.cpp:6 rc.cpp:26
+#: rc.cpp:11
 msgid "Whether to show the next set of balls."
 msgstr "A ddylid dangos y set nesaf o bêli."
 
 #. i18n: file: klines.kcfg:19
 #. i18n: ectx: label, entry (SavedBackgroundWidth), group (Game)
-#: rc.cpp:9 rc.cpp:29
+#: rc.cpp:14
 msgid "Width of saved background"
 msgstr ""
 
 #. i18n: file: klines.kcfg:23
 #. i18n: ectx: label, entry (SavedBackgroundHeight), group (Game)
-#: rc.cpp:12 rc.cpp:32
+#: rc.cpp:17
 msgid "Height of saved background"
 msgstr ""
 
-#: scene.cpp:298
+#: scene.cpp:300
 msgid "There is no path from the selected piece to this cell"
 msgstr ""
 
-#: scene.cpp:687
+#: scene.cpp:690
 msgid "<h1>Game over</h1>"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klinkstatus.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klinkstatus.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klinkstatus.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klinkstatus.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,848 +7,931 @@
 msgstr ""
 "Project-Id-Version: kdewebdev\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 15:07+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-12-23 03:45+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:36+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:06+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: klinkstatus_part.cpp:52
-msgid "A Link Checker"
+#: actionmanager.cpp:99
+msgid "New Session"
 msgstr ""
 
-#: klinkstatus_part.cpp:134
-msgid "Check"
-msgstr ""
+#: actionmanager.cpp:105
+msgid "Open URL..."
+msgstr "URL Agored ..."
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:74
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: klinkstatus_part.cpp:135 rc.cpp:366
-msgid "Results"
-msgstr "Canlyniadau"
+#: actionmanager.cpp:112
+msgid "Close Session"
+msgstr ""
 
-#: klinkstatus_part.cpp:136
-msgid "Identification"
+#: actionmanager.cpp:118
+msgid "Download New Stylesheets..."
 msgstr ""
 
-#: klinkstatus_part.cpp:138
-msgid "Configure the way KLinkstatus reports itself"
+#: actionmanager.cpp:125
+msgid "Configure KLinkStatus..."
 msgstr ""
 
-#: klinkstatus_part.cpp:139 pim/pimconfigdialog.cpp:50
-#: pim/pimconfigdialog.cpp:51
-msgid "Mail Transport"
+#: actionmanager.cpp:132
+msgid "About KLinkStatus"
 msgstr ""
 
-#: klinkstatus_part.cpp:168 main.cpp:37
-msgid "KLinkStatus"
-msgstr "KLinkStatus"
+#: actionmanager.cpp:137 actionmanager.cpp:139
+msgid "&Report Bug..."
+msgstr "&Anfon adroddiad nam..."
 
-#: klinkstatus_part.cpp:175
-msgid "KLinkStatus Part"
+#: actionmanager.cpp:157
+msgid "All..."
 msgstr ""
 
-#: klinkstatus_part.cpp:177
-msgid "(C) 2004 Paulo Moura Guedes"
+#: actionmanager.cpp:162
+msgid "Broken..."
 msgstr ""
 
-#: klinkstatus_part.cpp:179 main.cpp:41
-msgid "Paulo Moura Guedes"
+#: actionmanager.cpp:167
+msgid "Create Site Map..."
 msgstr ""
 
-#: klinkstatus_part.cpp:181 main.cpp:43
-msgid "Manuel Menezes de Sequeira"
+#: actionmanager.cpp:176
+msgid "&Follow Last Link"
 msgstr ""
 
-#: klinkstatus_part.cpp:182 main.cpp:44
-msgid "Gonçalo Silva"
+#: actionmanager.cpp:177
+msgid "Follow last Link checked (slower)"
 msgstr ""
 
-#: klinkstatus_part.cpp:183 main.cpp:45
-msgid "Nuno Monteiro"
+#: actionmanager.cpp:186
+msgid "&Hide Search Panel"
 msgstr ""
 
-#: klinkstatus_part.cpp:184 main.cpp:46
-msgid "Eric Laffoon"
+#: actionmanager.cpp:193
+msgid "&Reset Search Options"
 msgstr ""
 
-#: klinkstatus_part.cpp:185 main.cpp:47
-msgid "Andras Mantia"
+#: actionmanager.cpp:198
+msgid "&Disable Updates on Results Table"
 msgstr ""
 
-#: klinkstatus_part.cpp:186 main.cpp:48
-msgid "Michal Rudolf"
+#: actionmanager.cpp:199
+msgid "Disable Updates on Results Table (faster)"
 msgstr ""
 
-#: klinkstatus_part.cpp:187 main.cpp:49
-msgid "Mathieu Kooiman"
+#: actionmanager.cpp:209
+msgid "&Start Search"
 msgstr ""
 
-#: klinkstatus_part.cpp:188 main.cpp:50
-msgid "Jens Herden"
+#: actionmanager.cpp:215
+msgid "&Pause Search"
 msgstr ""
 
-#: klinkstatus.cpp:79
-msgid ""
-"Could not find the KLinkStatus part; did you configure with '--"
-"prefix=/$KDEDIR' and perform 'make install'?"
-msgstr ""
+#: actionmanager.cpp:221
+msgid "St&op Search"
+msgstr "S&topio Chwiliad"
 
-#: ui/documentrootdialog.cpp:36
-msgid "Choose a Document Root"
+#: actionmanager.cpp:227
+msgid "Search in Background"
 msgstr ""
 
-#: ui/documentrootdialog.cpp:46
-msgid ""
-"As you are using a protocol other than HTTP, \n"
-"there is no way to guess where the document root is, \n"
-"in order to resolve relative URLs like the ones started with \"/\".\n"
-"\n"
-"Please specify one:"
+#: actionmanager.cpp:231
+msgid "Check Links in background and update results when finished (faster)"
 msgstr ""
 
-#: ui/unreferreddocumentswidget.cpp:75
-msgid "Delete checked Documents"
+#: actionmanager.cpp:234
+msgid "&Broken Links"
 msgstr ""
 
-#: ui/unreferreddocumentswidget.cpp:77
-msgid "Delete All Documents"
+#: actionmanager.cpp:240
+msgid "&Displayed Links"
 msgstr ""
 
-#: ui/unreferreddocumentswidget.cpp:134
-msgid ""
-"Cannot crawl through directories using HTTP.\n"
-"\n"
-"Try using file, ftp, sftp or fish, for example."
+#: actionmanager.cpp:246
+msgid "&Unreferred Documents..."
 msgstr ""
 
-#: ui/unreferreddocumentswidget.cpp:145
-msgid "Crawling folders..."
+#: actionmanager.cpp:254
+msgid "&Fix All..."
 msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:153
-#. i18n: ectx: property (text), widget (QLabel, progressLabel)
-#. i18n: file: ui/sessionwidgetbase.ui:420
-#. i18n: ectx: property (text), widget (QLabel, textlabel_progressbar)
-#: ui/unreferreddocumentswidget.cpp:185 ui/unreferreddocumentswidget.cpp:202
-#: ui/sessionwidget.cpp:500 rc.cpp:74 rc.cpp:168
-msgid "Ready"
-msgstr "Parod"
-
-#: ui/unreferreddocumentswidget.cpp:191
-msgid "Matching results..."
+#: actionmanager.cpp:262
+msgid "Check Links"
 msgstr ""
 
-#: ui/treeview.cpp:347 ui/treeview.cpp:368
-msgid "Invalid URL."
-msgstr "URL annilys."
-
-#: ui/treeview.cpp:356
-msgid "ROOT URL."
+#. i18n: file: ui/unreferreddocumentswidget.ui:120
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: actionmanager.cpp:268 rc.cpp:276
+msgid "Unreferred Documents"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:39
-#. i18n: ectx: Menu (recheck)
-#: ui/treeview.cpp:376 rc.cpp:18 rc.cpp:312
-msgid "Recheck"
+#: actionmanager.cpp:274
+msgid "Previous View"
 msgstr ""
 
-#: ui/treeview.cpp:382 ui/treeview.cpp:397
-msgid "Edit Referrer"
+#: actionmanager.cpp:280
+msgid "Next View"
 msgstr ""
 
-#: ui/treeview.cpp:386
-msgid "All"
-msgstr "Popeth"
-
-#: ui/treeview.cpp:402
-msgid "Open URL"
-msgstr "URL Agored"
-
-#: ui/treeview.cpp:404
-msgid "Open Referrer URL"
+#: actionmanager.cpp:286
+msgid "Previous Session"
 msgstr ""
 
-#: ui/treeview.cpp:409
-msgid "Copy URL"
+#: actionmanager.cpp:292
+msgid "Next Session"
 msgstr ""
 
-#: ui/treeview.cpp:411
-msgid "Copy Referrer URL"
+#: actionmanager.cpp:300 actionmanager.cpp:303
+msgid "Change View"
 msgstr ""
 
-#: ui/treeview.cpp:413
-msgid "Copy Cell Text"
+#: plugins/scripting/scriptingpart.cpp:69
+msgid "Edit Script Actions..."
 msgstr ""
 
-#: ui/resultview.cpp:146
-msgid "Javascript not supported"
+#: plugins/scripting/scriptingpart.cpp:73
+msgid "Reset Script Actions..."
 msgstr ""
 
-#: ui/sessionwidget.cpp:262 ui/sessionwidget.cpp:427 ui/sessionwidget.cpp:652
-#: ui/sessionwidget.cpp:657 ui/sessionwidget.cpp:663 ui/sessionwidget.cpp:814
-#: ui/sessionwidget.cpp:951
-msgid "Checking..."
-msgstr "Gwirio..."
-
-#: ui/sessionwidget.cpp:387
-msgid "Cowardly refusing to check an empty URL."
+#: plugins/automation/automationpart.cpp:82
+msgid "Schedule Link Checks..."
 msgstr ""
 
-#: ui/sessionwidget.cpp:428 ui/sessionwidget.cpp:533 ui/sessionwidget.cpp:952
-msgid "Stopped"
-msgstr "Wedi aros"
+#: plugins/automation/automationconfigpage.cpp:43
+msgid "Hourly"
+msgstr ""
 
-#: ui/sessionwidget.cpp:520
-msgid "Finished checking"
+#: plugins/automation/automationconfigpage.cpp:44
+msgid "Daily"
 msgstr ""
 
-#: ui/sessionwidget.cpp:560
-msgid "Paused"
+#: plugins/automation/automationconfigpage.cpp:45
+msgid "Weekly"
 msgstr ""
 
-#: ui/sessionwidget.cpp:653 ui/sessionwidget.cpp:656
-msgid "Adding level..."
+#: plugins/automation/automationdialog.cpp:61
+msgid "Configure Site check Automation"
 msgstr ""
 
-#: ui/sessionwidget.cpp:824
-msgid "Resuming"
+#: plugins/automation/automationdialog.cpp:65
+msgid "New..."
 msgstr ""
 
-#: ui/sessionwidget.cpp:885
-msgid "Export Results as HTML"
+#: plugins/automation/automationdialog.cpp:67
+msgid "Remove"
 msgstr ""
 
-#: ui/sessionwidget.cpp:910
-msgid "Create XML Site Map"
+#: plugins/automation/automationdialog.cpp:98
+msgid "empty"
 msgstr ""
 
-#: ui/sessionwidget.cpp:927
-msgid ""
-"Use a protocol other than HTTP, e.g. file, ftp, sftp, fish, etc., so the "
-"files can be saved."
+#: plugins/automation/automationdialog.cpp:133
+#, kde-format
+msgid "Could not delete configuration file %1"
 msgstr ""
 
-#: ui/sessionwidget.cpp:940
-msgid "Checking"
+#: plugins/automation/automationdialog.cpp:153
+msgid "Recurring Check Name"
 msgstr ""
 
-#: ui/sessionwidget.cpp:968
-msgid "Done rechecking "
+#: engine/linkchecker.cpp:216 engine/linkchecker.cpp:235
+#: engine/linkchecker.cpp:439 engine/linkchecker.cpp:462
+#: engine/linkchecker.cpp:622 engine/linkchecker.cpp:696
+#: engine/linkchecker.cpp:729
+msgid "OK"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:79
-msgid "S&earch:"
-msgstr "C&hwilio"
+#: engine/linkchecker.cpp:455
+msgid "No Content"
+msgstr "Dim Cynnwys"
 
-#: ui/resultssearchbar.cpp:93
-msgid "Status:"
-msgstr "Cyflwr:"
+#: engine/linkchecker.cpp:523
+msgid "redirection"
+msgstr ""
 
-#: ui/resultssearchbar.cpp:106
-msgid "All Links"
+#: klinkstatus_part.cpp:52
+msgid "A Link Checker"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:107
-msgid "Good Links"
+#: klinkstatus_part.cpp:134
+msgid "Check"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:108
-msgid "Broken Links"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:74
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: klinkstatus_part.cpp:135 rc.cpp:41
+msgid "Results"
+msgstr "Canlyniadau"
+
+#: klinkstatus_part.cpp:136
+msgid "Identification"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:109
-msgid "Malformed Links"
+#: klinkstatus_part.cpp:138
+msgid "Configure the way KLinkstatus reports itself"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:110
-msgid "Undetermined Links"
+#: klinkstatus_part.cpp:139 pim/pimconfigdialog.cpp:50
+#: pim/pimconfigdialog.cpp:51
+msgid "Mail Transport"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:115
-msgid "Clear filter"
-msgstr "Gwagio hidlen"
+#: klinkstatus_part.cpp:168 main.cpp:37
+msgid "KLinkStatus"
+msgstr "KLinkStatus"
 
-#: ui/resultssearchbar.cpp:116
-msgid "Enter the terms to filter the result link list"
+#: klinkstatus_part.cpp:175
+msgid "KLinkStatus Part"
 msgstr ""
 
-#: ui/resultssearchbar.cpp:117
-msgid "Choose what kind of link status to show in result list"
+#: klinkstatus_part.cpp:177
+msgid "(C) 2004 Paulo Moura Guedes"
 msgstr ""
 
-#: ui/trayicon.cpp:47
-msgid "KLinkStatus - Link Checker"
+#: klinkstatus_part.cpp:179 main.cpp:41
+msgid "Paulo Moura Guedes"
 msgstr ""
 
-#: ui/tabwidgetsession.cpp:58
-msgid "Open new tab"
+#: klinkstatus_part.cpp:181 main.cpp:43
+msgid "Manuel Menezes de Sequeira"
 msgstr ""
 
-#: ui/tabwidgetsession.cpp:66
-msgid "Close the current tab"
-msgstr "Cau'r tab cyfredol"
+#: klinkstatus_part.cpp:182 main.cpp:44
+msgid "Gonçalo Silva"
+msgstr ""
 
-#: ui/tabwidgetsession.cpp:126
-msgid "Session"
-msgstr "Sesiwn"
+#: klinkstatus_part.cpp:183 main.cpp:45
+msgid "Nuno Monteiro"
+msgstr ""
 
-#: ui/httppostdialog.cpp:36
-msgid "Login Input"
+#: klinkstatus_part.cpp:184 main.cpp:46
+msgid "Eric Laffoon"
 msgstr ""
 
-#: engine/linkchecker.cpp:216 engine/linkchecker.cpp:235
-#: engine/linkchecker.cpp:439 engine/linkchecker.cpp:462
-#: engine/linkchecker.cpp:622 engine/linkchecker.cpp:696
-#: engine/linkchecker.cpp:729
-msgid "OK"
+#: klinkstatus_part.cpp:185 main.cpp:47
+msgid "Andras Mantia"
 msgstr ""
 
-#: engine/linkchecker.cpp:455
-msgid "No Content"
-msgstr "Dim Cynnwys"
+#: klinkstatus_part.cpp:186 main.cpp:48
+msgid "Michal Rudolf"
+msgstr ""
 
-#: engine/linkchecker.cpp:523
-msgid "redirection"
+#: klinkstatus_part.cpp:187 main.cpp:49
+msgid "Mathieu Kooiman"
 msgstr ""
 
-#: actionmanager.cpp:99
-msgid "New Session"
+#: klinkstatus_part.cpp:188 main.cpp:50
+msgid "Jens Herden"
 msgstr ""
 
-#: actionmanager.cpp:105
-msgid "Open URL..."
-msgstr "URL Agored ..."
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: actionmanager.cpp:112
-msgid "Close Session"
-msgstr ""
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
 
-#: actionmanager.cpp:118
-msgid "Download New Stylesheets..."
+#. i18n: file: plugins/scripting/scripting.rc:4
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/automation/klinkstatus_automation.rc:4
+#. i18n: ectx: Menu (tools)
+#. i18n: file: klinkstatus_shell.rc:23
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:5 rc.cpp:23 rc.cpp:252
+msgid "&Tools"
 msgstr ""
 
-#: actionmanager.cpp:125
-msgid "Configure KLinkStatus..."
+#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:18
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:8
+msgid "Links Checked"
 msgstr ""
 
-#: actionmanager.cpp:132
-msgid "About KLinkStatus"
-msgstr ""
+#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:47
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:11 ui/resultview.cpp:32
+msgid "Status"
+msgstr "Cyflwr"
 
-#: actionmanager.cpp:137 actionmanager.cpp:139
-msgid "&Report Bug..."
-msgstr "&Anfon adroddiad nam..."
+#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:53
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:14
+msgid "Good"
+msgstr ""
 
-#: actionmanager.cpp:157
-msgid "All..."
+#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:78
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:17
+msgid "Broken"
 msgstr ""
 
-#: actionmanager.cpp:162
-msgid "Broken..."
+#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:20
+msgid "Undetermined"
 msgstr ""
 
-#: actionmanager.cpp:167
-msgid "Create Site Map..."
+#. i18n: file: plugins/automation/automationconfigpageui.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:26
+msgid "Scheduling"
 msgstr ""
 
-#: actionmanager.cpp:176
-msgid "&Follow Last Link"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:37
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:29
+msgid "Name"
 msgstr ""
 
-#: actionmanager.cpp:177
-msgid "Follow last Link checked (slower)"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:47
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:32
+msgid "Periodicity"
 msgstr ""
 
-#: actionmanager.cpp:186
-msgid "&Hide Search Panel"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:57
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:35
+msgid "Hour"
 msgstr ""
 
-#: actionmanager.cpp:193
-msgid "&Reset Search Options"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:64
+#. i18n: ectx: property (inputMask), widget (KLineEdit, kcfg_Hour)
+#: rc.cpp:38
+msgid "00:00; "
 msgstr ""
 
-#: actionmanager.cpp:198
-msgid "&Disable Updates on Results Table"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:80
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_BrokenLinksOnly)
+#: rc.cpp:44
+msgid "Show Broken Links Only"
 msgstr ""
 
-#: actionmanager.cpp:199
-msgid "Disable Updates on Results Table (faster)"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:87
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:47
+msgid "Results Folder"
 msgstr ""
 
-#: actionmanager.cpp:209
-msgid "&Start Search"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:97
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#: rc.cpp:50
+msgid "E-Mail Recipient"
 msgstr ""
 
-#: actionmanager.cpp:215
-msgid "&Pause Search"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:110
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:53
+msgid "Search Options"
 msgstr ""
 
-#: actionmanager.cpp:221
-msgid "St&op Search"
-msgstr "S&topio Chwiliad"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:116
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:56 ui/resultview.cpp:31
+msgid "URL"
+msgstr "URL"
 
-#: actionmanager.cpp:227
-msgid "Search in Background"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:126
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:59
+msgid "Document Root"
 msgstr ""
 
-#: actionmanager.cpp:231
-msgid "Check Links in background and update results when finished (faster)"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:136
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:62
+msgid "Depth"
 msgstr ""
 
-#: actionmanager.cpp:234
-msgid "&Broken Links"
-msgstr ""
+#. i18n: file: plugins/automation/automationconfigpageui.ui:155
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_Depth)
+#. i18n: file: ui/settings/configsearchdialog.ui:289
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_Depth)
+#. i18n: file: ui/sessionwidgetbase.ui:199
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, spinbox_depth)
+#: rc.cpp:65 rc.cpp:318 rc.cpp:436
+msgid "Unlimited"
+msgstr "Heb derfyn"
 
-#: actionmanager.cpp:240
-msgid "&Displayed Links"
+#. i18n: file: plugins/automation/automationconfigpageui.ui:168
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_CheckParentFolders)
+#: rc.cpp:68
+msgid "Check Parent Folders"
 msgstr ""
 
-#: actionmanager.cpp:246
-msgid "&Unreferred Documents..."
+#. i18n: file: plugins/automation/automationconfigpageui.ui:175
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_CheckExternalLinks)
+#: rc.cpp:71
+msgid "Check External Links"
 msgstr ""
 
-#: actionmanager.cpp:254
-msgid "&Fix All..."
+#. i18n: file: plugins/automation/automationconfigpageui.ui:182
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_RegularExpression)
+#: rc.cpp:74
+msgid "Do not check Regular Expression"
 msgstr ""
 
-#: actionmanager.cpp:262
-msgid "Check Links"
+#. i18n: file: engine/automationconfig.kcfg:8
+#. i18n: ectx: label, entry, group (Scheduling)
+#: rc.cpp:77
+msgid "Name of the configuration, e.g. kdewebdev"
 msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:120
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: actionmanager.cpp:268 rc.cpp:68
-msgid "Unreferred Documents"
+#. i18n: file: engine/automationconfig.kcfg:13
+#. i18n: ectx: label, entry, group (Scheduling)
+#: rc.cpp:80
+msgid "Periodicity of the check"
 msgstr ""
 
-#: actionmanager.cpp:274
-msgid "Previous View"
+#. i18n: file: engine/automationconfig.kcfg:18
+#. i18n: ectx: label, entry, group (Scheduling)
+#: rc.cpp:83
+msgid "Hour in which the task will be executed"
 msgstr ""
 
-#: actionmanager.cpp:280
-msgid "Next View"
+#. i18n: file: engine/automationconfig.kcfg:28
+#. i18n: ectx: label, entry, group (SearchOptions)
+#: rc.cpp:86
+msgid "URL of the site to check"
 msgstr ""
 
-#: actionmanager.cpp:286
-msgid "Previous Session"
+#. i18n: file: engine/automationconfig.kcfg:33
+#. i18n: ectx: label, entry, group (SearchOptions)
+#: rc.cpp:89
+msgid ""
+"For protocols different than HTTP, specify the root of your files, e.g. "
+"'/var/www'"
 msgstr ""
 
-#: actionmanager.cpp:292
-msgid "Next Session"
+#. i18n: file: engine/automationconfig.kcfg:38
+#. i18n: ectx: label, entry, group (SearchOptions)
+#: rc.cpp:92
+msgid "Depth of recursive search, -1 is unlimited"
 msgstr ""
 
-#: actionmanager.cpp:300 actionmanager.cpp:303
-msgid "Change View"
+#. i18n: file: engine/automationconfig.kcfg:43
+#. i18n: ectx: label, entry, group (SearchOptions)
+#: rc.cpp:95
+msgid "Whether to check links in parent folders"
 msgstr ""
 
-#: plugins/automation/automationpart.cpp:82
-msgid "Schedule Link Checks..."
+#. i18n: file: engine/automationconfig.kcfg:48
+#. i18n: ectx: label, entry, group (SearchOptions)
+#: rc.cpp:98
+msgid "Whether to check external links"
 msgstr ""
 
-#: plugins/automation/automationconfigpage.cpp:43
-msgid "Hourly"
+#. i18n: file: engine/automationconfig.kcfg:53
+#. i18n: ectx: label, entry, group (SearchOptions)
+#: rc.cpp:101
+msgid "The URLs that match the regexp will not be checked"
 msgstr ""
 
-#: plugins/automation/automationconfigpage.cpp:44
-msgid "Daily"
+#. i18n: file: engine/automationconfig.kcfg:62
+#. i18n: ectx: label, entry, group (Results)
+#: rc.cpp:104
+msgid "Whether to include only broken links in the result"
 msgstr ""
 
-#: plugins/automation/automationconfigpage.cpp:45
-msgid "Weekly"
+#. i18n: file: engine/automationconfig.kcfg:67
+#. i18n: ectx: label, entry, group (Results)
+#: rc.cpp:107
+msgid "The directory where the results will be saved"
 msgstr ""
 
-#: plugins/automation/automationdialog.cpp:61
-msgid "Configure Site check Automation"
+#. i18n: file: engine/automationconfig.kcfg:72
+#. i18n: ectx: label, entry, group (Results)
+#: rc.cpp:110
+msgid "The e-mail address to where results will be emailed"
 msgstr ""
 
-#: plugins/automation/automationdialog.cpp:65
-msgid "New..."
+#. i18n: file: klinkstatus_part.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: klinkstatus_shell.rc:5
+#. i18n: ectx: Menu (file)
+#: rc.cpp:113 rc.cpp:240
+msgid "&File"
 msgstr ""
 
-#: plugins/automation/automationdialog.cpp:67
-msgid "Remove"
+#. i18n: file: klinkstatus_part.rc:10
+#. i18n: ectx: Menu (file_export_html)
+#: rc.cpp:116
+msgid "Export to HTML"
 msgstr ""
 
-#: plugins/automation/automationdialog.cpp:98
-msgid "empty"
+#. i18n: file: klinkstatus_part.rc:20
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:119
+msgid "&Settings"
 msgstr ""
 
-#: plugins/automation/automationdialog.cpp:133
-#, kde-format
-msgid "Could not delete configuration file %1"
+#. i18n: file: klinkstatus_part.rc:24
+#. i18n: ectx: Menu (view)
+#. i18n: file: klinkstatus_shell.rc:11
+#. i18n: ectx: Menu (view)
+#: rc.cpp:122 rc.cpp:243
+msgid "&View"
 msgstr ""
 
-#: plugins/automation/automationdialog.cpp:153
-msgid "Recurring Check Name"
+#. i18n: file: klinkstatus_part.rc:32
+#. i18n: ectx: Menu (search)
+#. i18n: file: klinkstatus_shell.rc:15
+#. i18n: ectx: Menu (search)
+#: rc.cpp:125 rc.cpp:246
+msgid "S&earch"
+msgstr "C&hwilio"
+
+#. i18n: file: klinkstatus_part.rc:39
+#. i18n: ectx: Menu (recheck)
+#: rc.cpp:128 ui/treeview.cpp:376
+msgid "Recheck"
 msgstr ""
 
-#: plugins/scripting/scriptingpart.cpp:69
-msgid "Edit Script Actions..."
+#. i18n: file: klinkstatus_part.rc:47
+#. i18n: ectx: Menu (validate)
+#. i18n: file: klinkstatus_shell.rc:19
+#. i18n: ectx: Menu (validate)
+#: rc.cpp:131 rc.cpp:249
+msgid "&Validate"
 msgstr ""
 
-#: plugins/scripting/scriptingpart.cpp:73
-msgid "Reset Script Actions..."
+#. i18n: file: klinkstatus_part.rc:52
+#. i18n: ectx: Menu (manual_validation)
+#: rc.cpp:134
+msgid "Manual Fix"
 msgstr ""
 
-#: main.cpp:31
-msgid ""
-"A Link Checker.\n"
-"\n"
-"KLinkStatus belongs to the kdewebdev module from KDE."
+#. i18n: file: klinkstatus_part.rc:59
+#. i18n: ectx: Menu (window)
+#. i18n: file: klinkstatus_shell.rc:27
+#. i18n: ectx: Menu (window)
+#: rc.cpp:137 rc.cpp:255
+msgid "&Window"
 msgstr ""
 
-#: main.cpp:38
-msgid "(C) 2004-2008 Paulo Moura Guedes"
+#. i18n: file: klinkstatus_part.rc:63
+#. i18n: ectx: Menu (navigation)
+#: rc.cpp:140
+msgid "Navigation"
 msgstr ""
 
-#: main.cpp:51
-msgid "Helge Hielscher"
+#. i18n: file: klinkstatus_part.rc:75
+#. i18n: ectx: Menu (help)
+#: rc.cpp:143
+msgid "&Help"
 msgstr ""
 
-#: main.cpp:56
-msgid "Document to open"
-msgstr "Dogfen i'w hagor"
+#. i18n: file: klinkstatus_part.rc:83
+#. i18n: ectx: ToolBar (linksToolBar)
+#: rc.cpp:146
+msgctxt "@title:menu"
+msgid "Main Toolbar"
+msgstr ""
 
-#: pim/pimconfigdialog.cpp:45
-msgid "Configure PIM information"
+#. i18n: file: cfg/klinkstatus.kcfg:8
+#. i18n: ectx: label, entry, group (pim)
+#: rc.cpp:149
+msgid "Whether to use the system real name and e-mail"
 msgstr ""
 
-#: pim/pimconfigdialog.cpp:57 pim/pimconfigdialog.cpp:58
-msgid "User Information"
+#. i18n: file: cfg/klinkstatus.kcfg:13
+#. i18n: ectx: label, entry, group (pim)
+#: rc.cpp:152
+msgid "The name associated to the user"
 msgstr ""
 
-#: rc.cpp:55
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
+#. i18n: file: cfg/klinkstatus.kcfg:18
+#. i18n: ectx: label, entry, group (pim)
+#: rc.cpp:155
+msgid "The email associated to the user"
+msgstr ""
 
-#: rc.cpp:56
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
+#. i18n: file: cfg/klinkstatus.kcfg:27
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:158
+msgid "Maximum number of entries in the combo url."
+msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, UnreferredDocumentsWidget)
-#: rc.cpp:59
-msgid "Unreferred DocumentsWidget"
+#. i18n: file: cfg/klinkstatus.kcfg:32
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:161
+msgid "Maximum number of simultaneous connections."
 msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: ui/sessionwidgetbase.ui:22
-#. i18n: ectx: property (title), widget (QGroupBox, searchGroupBox)
-#: rc.cpp:62 rc.cpp:138
-msgid "Search"
-msgstr "Chwilio"
+#. i18n: file: cfg/klinkstatus.kcfg:37
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:164
+msgid "Timeout on getting an URL."
+msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:48
-#. i18n: ectx: property (text), widget (QLabel, textlabel_url)
-#: rc.cpp:65
-msgid "Base Folder:"
+#. i18n: file: cfg/klinkstatus.kcfg:42
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:167
+msgid "History of combo url."
 msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:132
-#. i18n: ectx: property (clickMessage), widget (KListWidgetSearchLine, documentSearchLine)
-#: rc.cpp:71
-msgid "Filter Documents..."
+#. i18n: file: cfg/klinkstatus.kcfg:46
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:170
+msgid "Maximum depth to check."
 msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:208
-#. i18n: ectx: property (toolTip), widget (QLabel, elapsedTimeLabel)
-#. i18n: file: ui/unreferreddocumentswidget.ui:239
-#. i18n: ectx: property (toolTip), widget (QLabel, elapsedTimeValueLabel)
-#. i18n: file: ui/sessionwidgetbase.ui:505
-#. i18n: ectx: property (toolTip), widget (QLabel, textlabel_elapsed_time)
-#: rc.cpp:77 rc.cpp:83 rc.cpp:177
-msgid "hh:mm:ss"
+#. i18n: file: cfg/klinkstatus.kcfg:51
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:173
+msgid "Whether to check parent folders."
 msgstr ""
 
-#. i18n: file: ui/unreferreddocumentswidget.ui:211
-#. i18n: ectx: property (text), widget (QLabel, elapsedTimeLabel)
-#. i18n: file: ui/sessionwidgetbase.ui:508
-#. i18n: ectx: property (text), widget (QLabel, textlabel_elapsed_time)
-#: rc.cpp:80 rc.cpp:180
-msgid "Elapsed time: "
+#. i18n: file: cfg/klinkstatus.kcfg:56
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:176
+msgid "Whether to check external links."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:20
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:86
-msgid "Domain"
+#. i18n: file: cfg/klinkstatus.kcfg:61
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:179
+msgid ""
+"Whether to remember the check settings like depth, and so on, on exit."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:89
+#. i18n: file: cfg/klinkstatus.kcfg:66
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:182
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">URL to send to the HTTP "
-"POST request, e.g. '<span style=\" font-family:'Courier New,courier';\">POST "
-"</span><span style=\" font-family:'Courier New,courier'; font-"
-"weight:600;\">/login/login</span><span style=\" font-family:'Courier "
-"New,courier';\"> HTTP/1.1</span>'. Should be the same as the action "
-"attribute in the form element, e.g.: '<a name=\"line163\"></a><span style=\" "
-"font-family:'Courier New,courier';\">&lt;</span><span style=\" font-"
-"family:'Courier New,courier';\">form "
-"action=\"/login/login\"&gt;</span></p></body></html>"
+"Whether preview prefix in Quanta project is used to set the URL to check."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:89
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:96
-msgid "POST URL"
+#. i18n: file: cfg/klinkstatus.kcfg:71
+#. i18n: ectx: label, entry, group (klinkstatus)
+#. i18n: file: cfg/klinkstatus.kcfg:76
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:185 rc.cpp:188
+msgid "Whether to display a tree view or a flat view in the results view."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:106
-#. i18n: ectx: property (toolTip), widget (KLineEdit, lineeditPostUrl)
-#. i18n: file: ui/httppostwidgetui.ui:113
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, lineeditPostUrl)
-#: rc.cpp:99 rc.cpp:106
+#. i18n: file: cfg/klinkstatus.kcfg:81
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:191
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">URL to send to the HTTP "
-"POST request, e.g. 'POST <span style=\" font-"
-"weight:600;\">/login/login</span></p></body></html>"
+"Whether to automatically adjust the width of the result columns (Not used)."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:143
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:113
-msgid "POST Data"
+#. i18n: file: cfg/klinkstatus.kcfg:86
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:194
+msgid ""
+"Whether the viewport of the result view should follow the last link checked."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:153
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:116
+#. i18n: file: cfg/klinkstatus.kcfg:91
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:197
+msgid "Whether to send an User-Agent in HTTP requests."
+msgstr ""
+
+#. i18n: file: cfg/klinkstatus.kcfg:96
+#. i18n: ectx: label, entry (UserAgent), group (klinkstatus)
+#: rc.cpp:200
+msgid "Defines the HTTP User-Agent to send."
+msgstr ""
+
+#. i18n: file: cfg/klinkstatus.kcfg:100
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:203
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Insert the fields to send "
-"to the POST request. Typically, the keys are <span style=\" font-"
-"weight:600;\">user</span>, <span style=\" font-weight:600;\">password</span> "
-"and <span style=\" font-weight:600;\">button</span> 'name' attributes in the "
-"<span style=\" font-weight:600;\">input</span> elements inside the form "
-"definition</p></body></html>"
+"Whether the user can see if the markup is valid by showing a column with an "
+"icon indicator."
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:179
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: ui/httppostwidgetui.ui:260
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidgetPostData)
-#: rc.cpp:123 rc.cpp:132
-msgid "Key"
+#. i18n: file: cfg/klinkstatus.kcfg:105
+#. i18n: ectx: label, entry, group (klinkstatus)
+#: rc.cpp:206
+msgid "Available Stylesheets for exporting the results in HTML"
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:206
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: ui/httppostwidgetui.ui:265
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidgetPostData)
-#: rc.cpp:126 rc.cpp:135
-msgid "Value"
+#. i18n: file: cfg/klinkstatus.kcfg:110
+#. i18n: ectx: label, entry (PreferedStylesheet), group (klinkstatus)
+#: rc.cpp:209
+msgid "Defines the stylesheet to use when exporting results to HTML"
 msgstr ""
 
-#. i18n: file: ui/httppostwidgetui.ui:229
-#. i18n: ectx: property (text), widget (KPushButton, buttonAdd)
-#: rc.cpp:129
-msgid "Add"
+#. i18n: file: cfg/klinkstatus.kcfg:119
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:212
+msgid ""
+"This option specifies the number of spaces Tidy uses to indent content, when "
+"indentation is enabled."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:65
-#. i18n: ectx: property (text), widget (QLabel, textlabel_url)
-#: rc.cpp:141
-msgid "URL:"
+#. i18n: file: cfg/klinkstatus.kcfg:124
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:215
+msgid "Whether to do line wrapping."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:129
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxLogin)
-#: rc.cpp:144
-msgid "Cookie based authentication, only possible with HTTP based protocol."
+#. i18n: file: cfg/klinkstatus.kcfg:129
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:218
+msgid ""
+"This option specifies the right margin Tidy uses for line wrapping. Tidy "
+"tries to wrap lines so that they do not exceed this length."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxLogin)
-#: rc.cpp:147
-msgid "Login"
+#. i18n: file: cfg/klinkstatus.kcfg:134
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:221
+msgid ""
+"This option specifies if Tidy should output tag names in upper case. The "
+"default is no, which results in lower case tag names, except for XML input, "
+"where the original case is preserved."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:174
-#. i18n: ectx: property (text), widget (QLabel, Depth)
-#. i18n: file: ui/settings/configsearchdialog.ui:267
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2_2)
-#: rc.cpp:150 rc.cpp:228
-msgid "Depth:"
-msgstr "Dyfnder:"
-
-#. i18n: file: ui/sessionwidgetbase.ui:199
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, spinbox_depth)
-#. i18n: file: ui/settings/configsearchdialog.ui:289
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_Depth)
-#. i18n: file: plugins/automation/automationconfigpageui.ui:155
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_Depth)
-#: rc.cpp:153 rc.cpp:231 rc.cpp:390
-msgid "Unlimited"
-msgstr "Heb derfyn"
+#. i18n: file: cfg/klinkstatus.kcfg:139
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:224
+msgid ""
+"This option specifies if Tidy should output attribute names in upper case. "
+"The default is no, which results in lower case attribute names, except for "
+"XML input, where the original case is preserved."
+msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:224
-#. i18n: ectx: property (text), widget (QCheckBox, checkbox_subdirs_only)
-#: rc.cpp:156
-msgid "Do &not check parent folders"
+#. i18n: file: cfg/klinkstatus.kcfg:146
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:227
+msgid ""
+"This option specifies the DOCTYPE declaration generated by Tidy. If set to "
+"\"omit\" the output won't contain a DOCTYPE declaration. If set to \"auto\" "
+"(the default) Tidy will use an educated guess based upon the contents of the "
+"document. If set to \"strict\", Tidy will set the DOCTYPE to the strict DTD. "
+"If set to \"loose\", the DOCTYPE is set to the loose (transitional) DTD. "
+"Alternatively, you can supply a string for the formal public identifier "
+"(FPI).\n"
+"            "
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:275
-#. i18n: ectx: property (text), widget (QCheckBox, checkbox_external_links)
-#: rc.cpp:159
-msgid "Chec&k external links"
+#. i18n: file: cfg/klinkstatus.kcfg:151
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:231
+msgid ""
+"This option specifies if Tidy should pretty print output, writing it as well-"
+"formed XML. Any entities not defined in XML 1.0 will be written as numeric "
+"entities to allow them to be parsed by a XML parser. The original case of "
+"tags and attributes will be preserved, regardless of other options."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:317
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:162
-msgid "Do not check regular expression:"
+#. i18n: file: cfg/klinkstatus.kcfg:156
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:234
+msgid ""
+"This option specifies if Tidy should strip out surplus presentational tags "
+"and attributes replacing them by style rules and structural markup as "
+"appropriate. It works well on the HTML saved by Microsoft Office products."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:404
-#. i18n: ectx: property (text), widget (TreeView, tree_view)
-#: rc.cpp:165
-msgid "1"
+#. i18n: file: cfg/klinkstatus.kcfg:161
+#. i18n: ectx: label, entry, group (tidy)
+#: rc.cpp:237
+msgid ""
+"This option specifies the character encoding Tidy uses for both the input "
+"and output."
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:449
-#. i18n: ectx: property (text), widget (QLabel, label_checked_links)
-#: rc.cpp:171
-msgid "Checked Links:"
+#. i18n: file: pim/identitywidgetui.ui:19
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseSystemIdentity)
+#: rc.cpp:258
+msgid "Use System Identity"
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:483
-#. i18n: ectx: property (text), widget (KLineEdit, textedit_checked_links)
-#: rc.cpp:174
-msgid "0"
+#. i18n: file: pim/identitywidgetui.ui:34
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:261
+msgid "Real name"
 msgstr ""
 
-#. i18n: file: ui/sessionwidgetbase.ui:542
-#. i18n: ectx: property (text), widget (KLineEdit, textedit_elapsed_time_value)
-#: rc.cpp:183
-msgid "00:00:00"
+#. i18n: file: pim/identitywidgetui.ui:44
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:264
+msgid "E-Mail address"
 msgstr ""
 
-#. i18n: file: ui/settings/configresultsdialog.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:186
-msgid "View"
+#. i18n: file: ui/unreferreddocumentswidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, UnreferredDocumentsWidget)
+#: rc.cpp:267
+msgid "Unreferred DocumentsWidget"
 msgstr ""
 
-#. i18n: file: ui/settings/configresultsdialog.ui:36
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_DisplayTreeView)
-#: rc.cpp:189
-msgid "Tree"
-msgstr "Coeden"
+#. i18n: file: ui/unreferreddocumentswidget.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: ui/sessionwidgetbase.ui:22
+#. i18n: ectx: property (title), widget (QGroupBox, searchGroupBox)
+#: rc.cpp:270 rc.cpp:421
+msgid "Search"
+msgstr "Chwilio"
 
-#. i18n: file: ui/settings/configresultsdialog.ui:43
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_DisplayFlatView)
-#: rc.cpp:192
-msgid "Flat (faster)"
+#. i18n: file: ui/unreferreddocumentswidget.ui:48
+#. i18n: ectx: property (text), widget (QLabel, textlabel_url)
+#: rc.cpp:273
+msgid "Base Folder:"
 msgstr ""
 
-#. i18n: file: ui/settings/configresultsdialog.ui:68
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup13_2)
-#: rc.cpp:195
-msgid "Misc"
-msgstr "Amrywiol"
-
-#. i18n: file: ui/settings/configresultsdialog.ui:80
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FollowLastLinkChecked)
-#: rc.cpp:198
-msgid "Follow Last Link Checked"
+#. i18n: file: ui/unreferreddocumentswidget.ui:132
+#. i18n: ectx: property (clickMessage), widget (KListWidgetSearchLine, documentSearchLine)
+#: rc.cpp:279
+msgid "Filter Documents..."
 msgstr ""
 
-#. i18n: file: ui/settings/configresultsdialog.ui:103
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:201
-msgid "Export Results"
+#. i18n: file: ui/unreferreddocumentswidget.ui:153
+#. i18n: ectx: property (text), widget (QLabel, progressLabel)
+#. i18n: file: ui/sessionwidgetbase.ui:420
+#. i18n: ectx: property (text), widget (QLabel, textlabel_progressbar)
+#: rc.cpp:282 rc.cpp:451 ui/unreferreddocumentswidget.cpp:185
+#: ui/unreferreddocumentswidget.cpp:202 ui/sessionwidget.cpp:500
+msgid "Ready"
+msgstr "Parod"
+
+#. i18n: file: ui/unreferreddocumentswidget.ui:208
+#. i18n: ectx: property (toolTip), widget (QLabel, elapsedTimeLabel)
+#. i18n: file: ui/unreferreddocumentswidget.ui:239
+#. i18n: ectx: property (toolTip), widget (QLabel, elapsedTimeValueLabel)
+#. i18n: file: ui/sessionwidgetbase.ui:505
+#. i18n: ectx: property (toolTip), widget (QLabel, textlabel_elapsed_time)
+#: rc.cpp:285 rc.cpp:291 rc.cpp:460
+msgid "hh:mm:ss"
 msgstr ""
 
-#. i18n: file: ui/settings/configresultsdialog.ui:109
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:204
-msgid "Preferred Style Sheet:"
+#. i18n: file: ui/unreferreddocumentswidget.ui:211
+#. i18n: ectx: property (text), widget (QLabel, elapsedTimeLabel)
+#. i18n: file: ui/sessionwidgetbase.ui:508
+#. i18n: ectx: property (text), widget (QLabel, textlabel_elapsed_time)
+#: rc.cpp:288 rc.cpp:463
+msgid "Elapsed time: "
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:31
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:207
+#: rc.cpp:294
 msgid "Network"
 msgstr "Rhwydwaith"
 
 #. i18n: file: ui/settings/configsearchdialog.ui:119
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:210
+#: rc.cpp:297
 msgid "Number of simultaneous connections:"
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:135
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
-#: rc.cpp:213
+#: rc.cpp:300
 msgid "Timeout in seconds:"
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:148
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:216
+#: rc.cpp:303
 msgid "Input"
 msgstr "Mewnbwn"
 
 #. i18n: file: ui/settings/configsearchdialog.ui:198
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_CheckExternalLinks)
-#: rc.cpp:219
+#: rc.cpp:306
 msgid "Check external links"
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:214
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:222
+#: rc.cpp:309
 msgid "Number of items in URL history:"
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:224
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_CheckParentFolders)
-#: rc.cpp:225
+#: rc.cpp:312
 msgid "Check parent folders"
 msgstr ""
 
+#. i18n: file: ui/settings/configsearchdialog.ui:267
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2_2)
+#. i18n: file: ui/sessionwidgetbase.ui:174
+#. i18n: ectx: property (text), widget (QLabel, Depth)
+#: rc.cpp:315 rc.cpp:433
+msgid "Depth:"
+msgstr "Dyfnder:"
+
 #. i18n: file: ui/settings/configsearchdialog.ui:301
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:234
+#: rc.cpp:321
 msgid "Quanta"
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:322
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_UseQuantaUrlPreviewPrefix)
-#: rc.cpp:237
+#: rc.cpp:324
 msgid ""
 "Check this one if you want to use Quanta's project preview prefix in the URL "
 "to check"
@@ -856,570 +939,487 @@
 
 #. i18n: file: ui/settings/configsearchdialog.ui:325
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseQuantaUrlPreviewPrefix)
-#: rc.cpp:240
+#: rc.cpp:327
 msgid "Use preview prefix"
 msgstr ""
 
 #. i18n: file: ui/settings/configsearchdialog.ui:338
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_RememberCheckSettings)
-#: rc.cpp:243
+#: rc.cpp:330
 msgid "Remember settings when exit"
 msgstr ""
 
+#. i18n: file: ui/settings/configresultsdialog.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:333
+msgid "View"
+msgstr ""
+
+#. i18n: file: ui/settings/configresultsdialog.ui:36
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_DisplayTreeView)
+#: rc.cpp:336
+msgid "Tree"
+msgstr "Coeden"
+
+#. i18n: file: ui/settings/configresultsdialog.ui:43
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_DisplayFlatView)
+#: rc.cpp:339
+msgid "Flat (faster)"
+msgstr ""
+
+#. i18n: file: ui/settings/configresultsdialog.ui:68
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup13_2)
+#: rc.cpp:342
+msgid "Misc"
+msgstr "Amrywiol"
+
+#. i18n: file: ui/settings/configresultsdialog.ui:80
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_FollowLastLinkChecked)
+#: rc.cpp:345
+msgid "Follow Last Link Checked"
+msgstr ""
+
+#. i18n: file: ui/settings/configresultsdialog.ui:103
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:348
+msgid "Export Results"
+msgstr ""
+
+#. i18n: file: ui/settings/configresultsdialog.ui:109
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:351
+msgid "Preferred Style Sheet:"
+msgstr ""
+
 #. i18n: file: ui/settings/configidentificationdialogui.ui:28
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:246
+#: rc.cpp:354
 msgid "HTTP Identification"
 msgstr ""
 
 #. i18n: file: ui/settings/configidentificationdialogui.ui:34
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SendIdentification)
-#: rc.cpp:249
+#: rc.cpp:357
 msgid "Send Identification"
 msgstr ""
 
 #. i18n: file: ui/settings/configidentificationdialogui.ui:67
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:252
+#: rc.cpp:360
 msgid "User-Agent"
 msgstr ""
 
 #. i18n: file: ui/settings/configidentificationdialogui.ui:93
 #. i18n: ectx: property (text), widget (QPushButton, buttonDefault)
-#: rc.cpp:255
+#: rc.cpp:363
 msgid "Default"
 msgstr ""
 
 #. i18n: file: ui/settings/configidentificationdialogui.ui:124
 #. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
-#: rc.cpp:258
+#: rc.cpp:366
 msgid "Identity"
 msgstr ""
 
-#. i18n: file: engine/automationconfig.kcfg:8
-#. i18n: ectx: label, entry, group (Scheduling)
-#: rc.cpp:261
-msgid "Name of the configuration, e.g. kdewebdev"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:13
-#. i18n: ectx: label, entry, group (Scheduling)
-#: rc.cpp:264
-msgid "Periodicity of the check"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:18
-#. i18n: ectx: label, entry, group (Scheduling)
-#: rc.cpp:267
-msgid "Hour in which the task will be executed"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:28
-#. i18n: ectx: label, entry, group (SearchOptions)
-#: rc.cpp:270
-msgid "URL of the site to check"
+#. i18n: file: ui/httppostwidgetui.ui:20
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:369
+msgid "Domain"
 msgstr ""
 
-#. i18n: file: engine/automationconfig.kcfg:33
-#. i18n: ectx: label, entry, group (SearchOptions)
-#: rc.cpp:273
+#. i18n: file: ui/httppostwidgetui.ui:71
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:372
 msgid ""
-"For protocols different than HTTP, specify the root of your files, e.g. "
-"'/var/www'"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:38
-#. i18n: ectx: label, entry, group (SearchOptions)
-#: rc.cpp:276
-msgid "Depth of recursive search, -1 is unlimited"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:43
-#. i18n: ectx: label, entry, group (SearchOptions)
-#: rc.cpp:279
-msgid "Whether to check links in parent folders"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:48
-#. i18n: ectx: label, entry, group (SearchOptions)
-#: rc.cpp:282
-msgid "Whether to check external links"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:53
-#. i18n: ectx: label, entry, group (SearchOptions)
-#: rc.cpp:285
-msgid "The URLs that match the regexp will not be checked"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:62
-#. i18n: ectx: label, entry, group (Results)
-#: rc.cpp:288
-msgid "Whether to include only broken links in the result"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:67
-#. i18n: ectx: label, entry, group (Results)
-#: rc.cpp:291
-msgid "The directory where the results will be saved"
-msgstr ""
-
-#. i18n: file: engine/automationconfig.kcfg:72
-#. i18n: ectx: label, entry, group (Results)
-#: rc.cpp:294
-msgid "The e-mail address to where results will be emailed"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">URL to send to the HTTP "
+"POST request, e.g. '<span style=\" font-family:'Courier New,courier';\">POST "
+"</span><span style=\" font-family:'Courier New,courier'; font-"
+"weight:600;\">/login/login</span><span style=\" font-family:'Courier "
+"New,courier';\"> HTTP/1.1</span>'. Should be the same as the action "
+"attribute in the form element, e.g.: '<a name=\"line163\"></a><span style=\" "
+"font-family:'Courier New,courier';\">&lt;</span><span style=\" font-"
+"family:'Courier New,courier';\">form "
+"action=\"/login/login\"&gt;</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: klinkstatus_shell.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: klinkstatus_part.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: klinkstatus_shell.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:39 rc.cpp:297 rc.cpp:333
-msgid "&File"
+#. i18n: file: ui/httppostwidgetui.ui:89
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:379
+msgid "POST URL"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:10
-#. i18n: ectx: Menu (file_export_html)
-#: rc.cpp:6 rc.cpp:300
-msgid "Export to HTML"
+#. i18n: file: ui/httppostwidgetui.ui:106
+#. i18n: ectx: property (toolTip), widget (KLineEdit, lineeditPostUrl)
+#. i18n: file: ui/httppostwidgetui.ui:113
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, lineeditPostUrl)
+#: rc.cpp:382 rc.cpp:389
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">URL to send to the HTTP "
+"POST request, e.g. 'POST <span style=\" font-"
+"weight:600;\">/login/login</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:20
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:9 rc.cpp:303
-msgid "&Settings"
+#. i18n: file: ui/httppostwidgetui.ui:143
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:396
+msgid "POST Data"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:24
-#. i18n: ectx: Menu (view)
-#. i18n: file: klinkstatus_shell.rc:11
-#. i18n: ectx: Menu (view)
-#. i18n: file: klinkstatus_part.rc:24
-#. i18n: ectx: Menu (view)
-#. i18n: file: klinkstatus_shell.rc:11
-#. i18n: ectx: Menu (view)
-#: rc.cpp:12 rc.cpp:42 rc.cpp:306 rc.cpp:336
-msgid "&View"
+#. i18n: file: ui/httppostwidgetui.ui:153
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:399
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Insert the fields to send "
+"to the POST request. Typically, the keys are <span style=\" font-"
+"weight:600;\">user</span>, <span style=\" font-weight:600;\">password</span> "
+"and <span style=\" font-weight:600;\">button</span> 'name' attributes in the "
+"<span style=\" font-weight:600;\">input</span> elements inside the form "
+"definition</p></body></html>"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:32
-#. i18n: ectx: Menu (search)
-#. i18n: file: klinkstatus_shell.rc:15
-#. i18n: ectx: Menu (search)
-#. i18n: file: klinkstatus_part.rc:32
-#. i18n: ectx: Menu (search)
-#. i18n: file: klinkstatus_shell.rc:15
-#. i18n: ectx: Menu (search)
-#: rc.cpp:15 rc.cpp:45 rc.cpp:309 rc.cpp:339
-msgid "S&earch"
-msgstr "C&hwilio"
-
-#. i18n: file: klinkstatus_part.rc:47
-#. i18n: ectx: Menu (validate)
-#. i18n: file: klinkstatus_shell.rc:19
-#. i18n: ectx: Menu (validate)
-#. i18n: file: klinkstatus_part.rc:47
-#. i18n: ectx: Menu (validate)
-#. i18n: file: klinkstatus_shell.rc:19
-#. i18n: ectx: Menu (validate)
-#: rc.cpp:21 rc.cpp:48 rc.cpp:315 rc.cpp:342
-msgid "&Validate"
+#. i18n: file: ui/httppostwidgetui.ui:179
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: ui/httppostwidgetui.ui:260
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidgetPostData)
+#: rc.cpp:406 rc.cpp:415
+msgid "Key"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:52
-#. i18n: ectx: Menu (manual_validation)
-#: rc.cpp:24 rc.cpp:318
-msgid "Manual Fix"
+#. i18n: file: ui/httppostwidgetui.ui:206
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: ui/httppostwidgetui.ui:265
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidgetPostData)
+#: rc.cpp:409 rc.cpp:418
+msgid "Value"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:59
-#. i18n: ectx: Menu (window)
-#. i18n: file: klinkstatus_shell.rc:27
-#. i18n: ectx: Menu (window)
-#. i18n: file: klinkstatus_part.rc:59
-#. i18n: ectx: Menu (window)
-#. i18n: file: klinkstatus_shell.rc:27
-#. i18n: ectx: Menu (window)
-#: rc.cpp:27 rc.cpp:54 rc.cpp:321 rc.cpp:348
-msgid "&Window"
+#. i18n: file: ui/httppostwidgetui.ui:229
+#. i18n: ectx: property (text), widget (KPushButton, buttonAdd)
+#: rc.cpp:412
+msgid "Add"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:63
-#. i18n: ectx: Menu (navigation)
-#: rc.cpp:30 rc.cpp:324
-msgid "Navigation"
+#. i18n: file: ui/sessionwidgetbase.ui:65
+#. i18n: ectx: property (text), widget (QLabel, textlabel_url)
+#: rc.cpp:424
+msgid "URL:"
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:75
-#. i18n: ectx: Menu (help)
-#: rc.cpp:33 rc.cpp:327
-msgid "&Help"
+#. i18n: file: ui/sessionwidgetbase.ui:129
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxLogin)
+#: rc.cpp:427
+msgid "Cookie based authentication, only possible with HTTP based protocol."
 msgstr ""
 
-#. i18n: file: klinkstatus_part.rc:83
-#. i18n: ectx: ToolBar (linksToolBar)
-#: rc.cpp:36 rc.cpp:330
-msgctxt "@title:menu"
-msgid "Main Toolbar"
+#. i18n: file: ui/sessionwidgetbase.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxLogin)
+#: rc.cpp:430
+msgid "Login"
 msgstr ""
 
-#. i18n: file: klinkstatus_shell.rc:23
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/automation/klinkstatus_automation.rc:4
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/scripting/scripting.rc:4
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:51 rc.cpp:345 rc.cpp:402 rc.cpp:405
-msgid "&Tools"
+#. i18n: file: ui/sessionwidgetbase.ui:224
+#. i18n: ectx: property (text), widget (QCheckBox, checkbox_subdirs_only)
+#: rc.cpp:439
+msgid "Do &not check parent folders"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:351
-msgid "Scheduling"
+#. i18n: file: ui/sessionwidgetbase.ui:275
+#. i18n: ectx: property (text), widget (QCheckBox, checkbox_external_links)
+#: rc.cpp:442
+msgid "Chec&k external links"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:37
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:354
-msgid "Name"
+#. i18n: file: ui/sessionwidgetbase.ui:317
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:445
+msgid "Do not check regular expression:"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:47
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:357
-msgid "Periodicity"
+#. i18n: file: ui/sessionwidgetbase.ui:404
+#. i18n: ectx: property (text), widget (TreeView, tree_view)
+#: rc.cpp:448
+msgid "1"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:57
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:360
-msgid "Hour"
+#. i18n: file: ui/sessionwidgetbase.ui:449
+#. i18n: ectx: property (text), widget (QLabel, label_checked_links)
+#: rc.cpp:454
+msgid "Checked Links:"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:64
-#. i18n: ectx: property (inputMask), widget (KLineEdit, kcfg_Hour)
-#: rc.cpp:363
-msgid "00:00; "
+#. i18n: file: ui/sessionwidgetbase.ui:483
+#. i18n: ectx: property (text), widget (KLineEdit, textedit_checked_links)
+#: rc.cpp:457
+msgid "0"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:80
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_BrokenLinksOnly)
-#: rc.cpp:369
-msgid "Show Broken Links Only"
+#. i18n: file: ui/sessionwidgetbase.ui:542
+#. i18n: ectx: property (text), widget (KLineEdit, textedit_elapsed_time_value)
+#: rc.cpp:466
+msgid "00:00:00"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:87
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:372
-msgid "Results Folder"
+#. i18n: tag script attribute text
+#. i18n: file: plugins/scripting/scripts/scripts.rc:6
+#: rc.cpp:469
+msgid "Statistics"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:97
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#: rc.cpp:375
-msgid "E-Mail Recipient"
+#. i18n: tag script attribute comment
+#. i18n: file: plugins/scripting/scripts/scripts.rc:6
+#: rc.cpp:472
+msgid "Statistics Script"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:110
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:378
-msgid "Search Options"
+#: klinkstatus.cpp:79
+msgid ""
+"Could not find the KLinkStatus part; did you configure with '--"
+"prefix=/$KDEDIR' and perform 'make install'?"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:116
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:381
-msgid "URL"
-msgstr "URL"
-
-#. i18n: file: plugins/automation/automationconfigpageui.ui:126
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:384
-msgid "Document Root"
+#: pim/pimconfigdialog.cpp:45
+msgid "Configure PIM information"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:136
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:387
-msgid "Depth"
+#: pim/pimconfigdialog.cpp:57 pim/pimconfigdialog.cpp:58
+msgid "User Information"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:168
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_CheckParentFolders)
-#: rc.cpp:393
-msgid "Check Parent Folders"
+#: ui/unreferreddocumentswidget.cpp:75
+msgid "Delete checked Documents"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:175
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_CheckExternalLinks)
-#: rc.cpp:396
-msgid "Check External Links"
+#: ui/unreferreddocumentswidget.cpp:77
+msgid "Delete All Documents"
 msgstr ""
 
-#. i18n: file: plugins/automation/automationconfigpageui.ui:182
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_RegularExpression)
-#: rc.cpp:399
-msgid "Do not check Regular Expression"
+#: ui/unreferreddocumentswidget.cpp:134
+msgid ""
+"Cannot crawl through directories using HTTP.\n"
+"\n"
+"Try using file, ftp, sftp or fish, for example."
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:18
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:408
-msgid "Links Checked"
+#: ui/unreferreddocumentswidget.cpp:145
+msgid "Crawling folders..."
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:47
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:411
-msgid "Status"
-msgstr "Cyflwr"
-
-#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:53
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:414
-msgid "Good"
+#: ui/unreferreddocumentswidget.cpp:191
+msgid "Matching results..."
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:78
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:417
-msgid "Broken"
+#: ui/trayicon.cpp:47
+msgid "KLinkStatus - Link Checker"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/examples/statistics/statisticsui.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:420
-msgid "Undetermined"
+#: ui/documentrootdialog.cpp:36
+msgid "Choose a Document Root"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:8
-#. i18n: ectx: label, entry, group (pim)
-#: rc.cpp:423
-msgid "Whether to use the system real name and e-mail"
+#: ui/documentrootdialog.cpp:46
+msgid ""
+"As you are using a protocol other than HTTP, \n"
+"there is no way to guess where the document root is, \n"
+"in order to resolve relative URLs like the ones started with \"/\".\n"
+"\n"
+"Please specify one:"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:13
-#. i18n: ectx: label, entry, group (pim)
-#: rc.cpp:426
-msgid "The name associated to the user"
+#: ui/resultview.cpp:33
+msgid "Markup"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:18
-#. i18n: ectx: label, entry, group (pim)
-#: rc.cpp:429
-msgid "The email associated to the user"
+#: ui/resultview.cpp:34
+msgid "Label"
+msgstr "Label"
+
+#: ui/resultview.cpp:146
+msgid "Javascript not supported"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:27
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:432
-msgid "Maximum number of entries in the combo url."
+#: ui/sessionwidget.cpp:262 ui/sessionwidget.cpp:427 ui/sessionwidget.cpp:652
+#: ui/sessionwidget.cpp:657 ui/sessionwidget.cpp:663 ui/sessionwidget.cpp:814
+#: ui/sessionwidget.cpp:951
+msgid "Checking..."
+msgstr "Gwirio..."
+
+#: ui/sessionwidget.cpp:387
+msgid "Cowardly refusing to check an empty URL."
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:32
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:435
-msgid "Maximum number of simultaneous connections."
+#: ui/sessionwidget.cpp:428 ui/sessionwidget.cpp:533 ui/sessionwidget.cpp:952
+msgid "Stopped"
+msgstr "Wedi aros"
+
+#: ui/sessionwidget.cpp:520
+msgid "Finished checking"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:37
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:438
-msgid "Timeout on getting an URL."
+#: ui/sessionwidget.cpp:560
+msgid "Paused"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:42
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:441
-msgid "History of combo url."
+#: ui/sessionwidget.cpp:653 ui/sessionwidget.cpp:656
+msgid "Adding level..."
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:46
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:444
-msgid "Maximum depth to check."
+#: ui/sessionwidget.cpp:824
+msgid "Resuming"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:51
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:447
-msgid "Whether to check parent folders."
+#: ui/sessionwidget.cpp:885
+msgid "Export Results as HTML"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:56
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:450
-msgid "Whether to check external links."
+#: ui/sessionwidget.cpp:910
+msgid "Create XML Site Map"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:61
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:453
+#: ui/sessionwidget.cpp:927
 msgid ""
-"Whether to remember the check settings like depth, and so on, on exit."
+"Use a protocol other than HTTP, e.g. file, ftp, sftp, fish, etc., so the "
+"files can be saved."
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:66
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:456
-msgid ""
-"Whether preview prefix in Quanta project is used to set the URL to check."
+#: ui/sessionwidget.cpp:940
+msgid "Checking"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:71
-#. i18n: ectx: label, entry, group (klinkstatus)
-#. i18n: file: cfg/klinkstatus.kcfg:76
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:459 rc.cpp:462
-msgid "Whether to display a tree view or a flat view in the results view."
+#: ui/sessionwidget.cpp:968
+msgid "Done rechecking "
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:81
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:465
-msgid ""
-"Whether to automatically adjust the width of the result columns (Not used)."
+#: ui/tabwidgetsession.cpp:58
+msgid "Open new tab"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:86
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:468
-msgid ""
-"Whether the viewport of the result view should follow the last link checked."
+#: ui/tabwidgetsession.cpp:66
+msgid "Close the current tab"
+msgstr "Cau'r tab cyfredol"
+
+#: ui/tabwidgetsession.cpp:126
+msgid "Session"
+msgstr "Sesiwn"
+
+#: ui/resultssearchbar.cpp:79
+msgid "S&earch:"
+msgstr "C&hwilio"
+
+#: ui/resultssearchbar.cpp:93
+msgid "Status:"
+msgstr "Cyflwr:"
+
+#: ui/resultssearchbar.cpp:106
+msgid "All Links"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:91
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:471
-msgid "Whether to send an User-Agent in HTTP requests."
+#: ui/resultssearchbar.cpp:107
+msgid "Good Links"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:96
-#. i18n: ectx: label, entry (UserAgent), group (klinkstatus)
-#: rc.cpp:474
-msgid "Defines the HTTP User-Agent to send."
+#: ui/resultssearchbar.cpp:108
+msgid "Broken Links"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:100
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:477
-msgid ""
-"Whether the user can see if the markup is valid by showing a column with an "
-"icon indicator."
+#: ui/resultssearchbar.cpp:109
+msgid "Malformed Links"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:105
-#. i18n: ectx: label, entry, group (klinkstatus)
-#: rc.cpp:480
-msgid "Available Stylesheets for exporting the results in HTML"
+#: ui/resultssearchbar.cpp:110
+msgid "Undetermined Links"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:110
-#. i18n: ectx: label, entry (PreferedStylesheet), group (klinkstatus)
-#: rc.cpp:483
-msgid "Defines the stylesheet to use when exporting results to HTML"
+#: ui/resultssearchbar.cpp:115
+msgid "Clear filter"
+msgstr "Gwagio hidlen"
+
+#: ui/resultssearchbar.cpp:116
+msgid "Enter the terms to filter the result link list"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:119
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:486
-msgid ""
-"This option specifies the number of spaces Tidy uses to indent content, when "
-"indentation is enabled."
+#: ui/resultssearchbar.cpp:117
+msgid "Choose what kind of link status to show in result list"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:124
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:489
-msgid "Whether to do line wrapping."
+#: ui/treeview.cpp:347 ui/treeview.cpp:368
+msgid "Invalid URL."
+msgstr "URL annilys."
+
+#: ui/treeview.cpp:356
+msgid "ROOT URL."
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:129
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:492
-msgid ""
-"This option specifies the right margin Tidy uses for line wrapping. Tidy "
-"tries to wrap lines so that they do not exceed this length."
+#: ui/treeview.cpp:382 ui/treeview.cpp:397
+msgid "Edit Referrer"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:134
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:495
-msgid ""
-"This option specifies if Tidy should output tag names in upper case. The "
-"default is no, which results in lower case tag names, except for XML input, "
-"where the original case is preserved."
+#: ui/treeview.cpp:386
+msgid "All"
+msgstr "Popeth"
+
+#: ui/treeview.cpp:402
+msgid "Open URL"
+msgstr "URL Agored"
+
+#: ui/treeview.cpp:404
+msgid "Open Referrer URL"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:139
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:498
-msgid ""
-"This option specifies if Tidy should output attribute names in upper case. "
-"The default is no, which results in lower case attribute names, except for "
-"XML input, where the original case is preserved."
+#: ui/treeview.cpp:409
+msgid "Copy URL"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:146
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:501
-msgid ""
-"This option specifies the DOCTYPE declaration generated by Tidy. If set to "
-"\"omit\" the output won't contain a DOCTYPE declaration. If set to \"auto\" "
-"(the default) Tidy will use an educated guess based upon the contents of the "
-"document. If set to \"strict\", Tidy will set the DOCTYPE to the strict DTD. "
-"If set to \"loose\", the DOCTYPE is set to the loose (transitional) DTD. "
-"Alternatively, you can supply a string for the formal public identifier "
-"(FPI).\n"
-"            "
+#: ui/treeview.cpp:411
+msgid "Copy Referrer URL"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:151
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:505
-msgid ""
-"This option specifies if Tidy should pretty print output, writing it as well-"
-"formed XML. Any entities not defined in XML 1.0 will be written as numeric "
-"entities to allow them to be parsed by a XML parser. The original case of "
-"tags and attributes will be preserved, regardless of other options."
+#: ui/treeview.cpp:413
+msgid "Copy Cell Text"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:156
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:508
-msgid ""
-"This option specifies if Tidy should strip out surplus presentational tags "
-"and attributes replacing them by style rules and structural markup as "
-"appropriate. It works well on the HTML saved by Microsoft Office products."
+#: ui/httppostdialog.cpp:36
+msgid "Login Input"
 msgstr ""
 
-#. i18n: file: cfg/klinkstatus.kcfg:161
-#. i18n: ectx: label, entry, group (tidy)
-#: rc.cpp:511
+#: main.cpp:31
 msgid ""
-"This option specifies the character encoding Tidy uses for both the input "
-"and output."
+"A Link Checker.\n"
+"\n"
+"KLinkStatus belongs to the kdewebdev module from KDE."
 msgstr ""
 
-#. i18n: file: pim/identitywidgetui.ui:19
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseSystemIdentity)
-#: rc.cpp:514
-msgid "Use System Identity"
+#: main.cpp:38
+msgid "(C) 2004-2008 Paulo Moura Guedes"
 msgstr ""
 
-#. i18n: file: pim/identitywidgetui.ui:34
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:517
-msgid "Real name"
+#: main.cpp:51
+msgid "Helge Hielscher"
 msgstr ""
 
-#. i18n: file: pim/identitywidgetui.ui:44
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:520
-msgid "E-Mail address"
-msgstr ""
+#: main.cpp:56
+msgid "Document to open"
+msgstr "Dogfen i'w hagor"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klipper.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klipper.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klipper.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klipper.po	2012-04-18 08:59:38.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: klipper\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:06+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:39+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:38+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: configdialog.cpp:39
 msgid " second"
@@ -45,7 +45,7 @@
 msgstr ""
 
 #: configdialog.cpp:275
-msgid "General Config"
+msgid "General Configuration"
 msgstr ""
 
 #: configdialog.cpp:276
@@ -54,7 +54,7 @@
 msgstr ""
 
 #: configdialog.cpp:276
-msgid "Actions Config"
+msgid "Actions Configuration"
 msgstr ""
 
 #: configdialog.cpp:280
@@ -63,14 +63,14 @@
 msgstr ""
 
 #: configdialog.cpp:280
-msgid "Shortcuts Config"
+msgid "Shortcuts Configuration"
 msgstr ""
 
 #: configdialog.cpp:364
 msgid "D&isable Actions for Windows of Type WM_CLASS"
 msgstr "A&nalluogi Gweithredoedd ar gyfer Ffenestri o Fath ***"
 
-#: configdialog.cpp:369
+#: configdialog.cpp:372
 msgid ""
 "<qt>This lets you specify windows in which Klipper should not invoke "
 "\"actions\". Use<br /><br /><center><b>xprop | grep WM_CLASS</b></center><br "
@@ -101,7 +101,7 @@
 
 #. i18n: file: actionsconfig.ui:54
 #. i18n: ectx: property (text), widget (ActionsTreeWidget, kcfg_ActionList)
-#: editactiondialog.cpp:223 rc.cpp:18 rc.cpp:178
+#: editactiondialog.cpp:223 rc.cpp:20
 msgid "Description"
 msgstr "Disgrifiad"
 
@@ -109,55 +109,59 @@
 msgid "Action Properties"
 msgstr ""
 
-#: editactiondialog.cpp:347
+#: editactiondialog.cpp:350
 msgid "new command"
 msgstr ""
 
-#: editactiondialog.cpp:348
+#: editactiondialog.cpp:351
 msgid "Command Description"
 msgstr ""
 
-#: klipper.cpp:155
+#: klipper.cpp:153
 msgid "Enable Clipboard &Actions"
 msgstr ""
 
-#: klipper.cpp:159
+#: klipper.cpp:157
 msgid "C&lear Clipboard History"
 msgstr "G&wagio Hanes y Clipfwrdd"
 
-#: klipper.cpp:164
+#: klipper.cpp:162
 msgid "&Configure Klipper..."
 msgstr "&Ffurfweddu Klipper..."
 
-#: klipper.cpp:169
+#: klipper.cpp:167
 msgid "&Quit"
 msgstr ""
 
-#: klipper.cpp:196
+#: klipper.cpp:194
 msgid "Manually Invoke Action on Current Clipboard"
 msgstr "Achosi Gweithred â Llaw ar y Clipfwrdd Cyfredol"
 
-#: klipper.cpp:203
+#: klipper.cpp:201
 msgid "&Edit Contents..."
 msgstr "&Golygu'r Cynnwys..."
 
-#: klipper.cpp:215
+#: klipper.cpp:208
 msgid "&Show Barcode..."
 msgstr ""
 
-#: klipper.cpp:209
+#: klipper.cpp:214
 msgid "Next History Item"
 msgstr ""
 
-#: klipper.cpp:213
+#: klipper.cpp:218
 msgid "Previous History Item"
 msgstr ""
 
-#: klipper.cpp:218
+#: klipper.cpp:224
+msgid "Open Klipper at Mouse Position"
+msgstr ""
+
+#: klipper.cpp:229
 msgid "Enable Clipboard Actions"
 msgstr ""
 
-#: klipper.cpp:514
+#: klipper.cpp:530
 msgid ""
 "You can enable URL actions later by right-clicking on the Klipper icon and "
 "selecting 'Enable Actions'"
@@ -165,106 +169,106 @@
 "Gallwch alluogi gweithredoedd URL nes ymlaen drwy glic-dde ar eicon Klipper "
 "a dewis 'Galluogi Gweithredoedd'"
 
-#: klipper.cpp:542
+#: klipper.cpp:558
 msgid "Should Klipper start automatically when you login?"
 msgstr ""
 
-#: klipper.cpp:543
+#: klipper.cpp:559
 msgid "Automatically Start Klipper?"
 msgstr "Dechrau Klipper yn Ymysgogol?"
 
-#: klipper.cpp:543
+#: klipper.cpp:559
 msgid "Start"
 msgstr "Dechrau"
 
-#: klipper.cpp:544
+#: klipper.cpp:560
 msgid "Do Not Start"
 msgstr ""
 
-#: klipper.cpp:1025
+#: klipper.cpp:1029
 msgid "KDE cut & paste history utility"
 msgstr ""
 
-#: klipper.cpp:1029 tray.cpp:39
+#: klipper.cpp:1033 tray.cpp:39
 msgid "Klipper"
 msgstr "Klipper"
 
-#: klipper.cpp:1031
+#: klipper.cpp:1035
 msgid ""
 "(c) 1998, Andrew Stanley-Jones\n"
 "1998-2002, Carsten Pfeiffer\n"
 "2001, Patrick Dubroy"
 msgstr ""
 
-#: klipper.cpp:1035
+#: klipper.cpp:1039
 msgid "Carsten Pfeiffer"
 msgstr ""
 
-#: klipper.cpp:1036
+#: klipper.cpp:1040
 msgid "Author"
 msgstr "Awdur"
 
-#: klipper.cpp:1039
+#: klipper.cpp:1043
 msgid "Andrew Stanley-Jones"
 msgstr ""
 
-#: klipper.cpp:1040
+#: klipper.cpp:1044
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: klipper.cpp:1043
+#: klipper.cpp:1047
 msgid "Patrick Dubroy"
 msgstr ""
 
-#: klipper.cpp:1044
+#: klipper.cpp:1048
 msgid "Contributor"
 msgstr "Cyfrannwr"
 
-#: klipper.cpp:1047
+#: klipper.cpp:1051
 msgid "Luboš Luňák"
 msgstr ""
 
-#: klipper.cpp:1048
+#: klipper.cpp:1052
 msgid "Bugfixes and optimizations"
 msgstr "Nam-drwsiadau a gwelliannau"
 
-#: klipper.cpp:1051
+#: klipper.cpp:1055
 msgid "Esben Mose Hansen"
 msgstr ""
 
-#: klipper.cpp:1052
+#: klipper.cpp:1056
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: klipper.cpp:1087
+#: klipper.cpp:1091
 msgid "Edit Contents"
 msgstr "Golygu'r Cynnwys"
 
-#: klipper.cpp:1134
+#: klipper.cpp:1124
 msgid "Mobile Barcode"
 msgstr ""
 
-#: klipper.cpp:1115
+#: klipper.cpp:1152
 msgid "Really delete entire clipboard history?"
 msgstr ""
 
-#: klipper.cpp:1116
+#: klipper.cpp:1153
 msgid "Delete clipboard history?"
 msgstr ""
 
-#: klipper.cpp:1132 klipper.cpp:1138
+#: klipper.cpp:1171 klipper.cpp:1180
 msgid "Clipboard history"
 msgstr ""
 
-#: klipper.cpp:1150
+#: klipper.cpp:1193
 msgid "up"
 msgstr ""
 
-#: klipper.cpp:1156
+#: klipper.cpp:1199
 msgid "current"
 msgstr ""
 
-#: klipper.cpp:1162
+#: klipper.cpp:1205
 msgid "down"
 msgstr ""
 
@@ -276,45 +280,33 @@
 msgid "<no matches>"
 msgstr ""
 
-#: klipperpopup.cpp:134
+#: klipperpopup.cpp:135
 msgid "Klipper - Clipboard Tool"
 msgstr "Klipper - Erfyn Clipfwrdd"
 
-#: popupproxy.cpp:171
+#: popupproxy.cpp:172
 msgid "&More"
 msgstr "&Mwy"
 
-#: rc.cpp:159
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:160
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: actionsconfig.ui:17
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReplayActionInHistory)
-#. i18n: file: generalconfig.ui:31
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReplayActionInHistory)
-#. i18n: file: actionsconfig.ui:17
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReplayActionInHistory)
-#. i18n: file: generalconfig.ui:31
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ReplayActionInHistory)
-#: rc.cpp:3 rc.cpp:67 rc.cpp:163 rc.cpp:227
+#: rc.cpp:5
 msgid "Replay actions on an item selected from history"
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:24
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_StripWhiteSpace)
-#. i18n: file: generalconfig.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_StripWhiteSpace)
-#. i18n: file: actionsconfig.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_StripWhiteSpace)
-#. i18n: file: generalconfig.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_StripWhiteSpace)
-#: rc.cpp:6 rc.cpp:70 rc.cpp:166 rc.cpp:230
+#: rc.cpp:8
 msgid "Remove whitespace when executing actions"
 msgstr "Gwaredu gofod gwyn pan yn gweithredu gweithredoedd"
 
@@ -322,51 +314,49 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableMagicMimeActions)
 #. i18n: file: klipper.kcfg:84
 #. i18n: ectx: label, entry (EnableMagicMimeActions), group (Actions)
-#. i18n: file: actionsconfig.ui:31
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableMagicMimeActions)
-#: rc.cpp:9 rc.cpp:158 rc.cpp:169
+#: rc.cpp:11 rc.cpp:153
 msgid "Enable MIME-based actions"
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:38
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:12 rc.cpp:172
+#: rc.cpp:14
 msgid "Action list:"
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:49
 #. i18n: ectx: property (text), widget (ActionsTreeWidget, kcfg_ActionList)
-#: rc.cpp:15 rc.cpp:175
+#: rc.cpp:17
 msgid "Regular Expression"
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:64
 #. i18n: ectx: property (text), widget (QPushButton, pbAddAction)
-#: rc.cpp:21 rc.cpp:181
+#: rc.cpp:23
 msgid "Add Action..."
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:71
 #. i18n: ectx: property (text), widget (QPushButton, pbEditAction)
-#: rc.cpp:24 rc.cpp:184
+#: rc.cpp:26
 msgid "Edit Action..."
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:78
 #. i18n: ectx: property (text), widget (QPushButton, pbDelAction)
-#: rc.cpp:27 rc.cpp:187
+#: rc.cpp:29
 msgid "Delete Action"
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:85
 #. i18n: ectx: property (text), widget (QPushButton, pbAdvanced)
-#: rc.cpp:30 rc.cpp:190
-msgid "Advanced"
+#: rc.cpp:32
+msgid "Advanced..."
 msgstr ""
 
 #. i18n: file: actionsconfig.ui:94
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:34 rc.cpp:194
+#: rc.cpp:36
 #, no-c-format
 msgid ""
 "Click on a highlighted item's column to change it. \"%s\" in a command will "
@@ -378,55 +368,55 @@
 
 #. i18n: file: editactiondialog.ui:20
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:37 rc.cpp:197
+#: rc.cpp:39
 msgid "Action properties:"
 msgstr ""
 
 #. i18n: file: editactiondialog.ui:42
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:40 rc.cpp:200
+#: rc.cpp:42
 msgid "Regular expression:"
 msgstr ""
 
 #. i18n: file: editactiondialog.ui:52
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:43 rc.cpp:203
+#: rc.cpp:45
 msgid "Description:"
 msgstr ""
 
 #. i18n: file: editactiondialog.ui:62
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:46 rc.cpp:206
+#: rc.cpp:48
 msgid "Automatic:"
 msgstr ""
 
 #. i18n: file: editactiondialog.ui:87
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:49 rc.cpp:209
+#: rc.cpp:51
 msgid "List of commands for this action:"
 msgstr ""
 
 #. i18n: file: editactiondialog.ui:144
 #. i18n: ectx: property (text), widget (QPushButton, pbAddCommand)
-#: rc.cpp:52 rc.cpp:212
+#: rc.cpp:54
 msgid "Add Command"
 msgstr "Ychwanegu Gorchymyn"
 
 #. i18n: file: editactiondialog.ui:151
 #. i18n: ectx: property (text), widget (QPushButton, pbRemoveCommand)
-#: rc.cpp:55 rc.cpp:215
+#: rc.cpp:57
 msgid "Remove Command"
 msgstr "Gwaredu Gorchymyn"
 
 #. i18n: file: editactiondialog.ui:176
 #. i18n: ectx: property (toolTip), widget (QTableView, twCommandList)
-#: rc.cpp:58 rc.cpp:218
+#: rc.cpp:60
 msgid "Double-click an item to edit"
 msgstr ""
 
 #. i18n: file: generalconfig.ui:17
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_KeepClipboardContents)
-#: rc.cpp:61 rc.cpp:221
+#: rc.cpp:63
 msgid "Save clipboard contents on exit"
 msgstr ""
 
@@ -434,73 +424,69 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_PreventEmptyClipboard)
 #. i18n: file: klipper.kcfg:16
 #. i18n: ectx: label, entry (PreventEmptyClipboard), group (General)
-#. i18n: file: generalconfig.ui:24
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_PreventEmptyClipboard)
-#: rc.cpp:64 rc.cpp:100 rc.cpp:224
+#: rc.cpp:66 rc.cpp:96
 msgid "Prevent empty clipboard"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:45
+#. i18n: file: generalconfig.ui:31
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreImages)
 #. i18n: file: klipper.kcfg:21
 #. i18n: ectx: label, entry (IgnoreImages), group (General)
-#. i18n: file: generalconfig.ui:45
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreImages)
-#: rc.cpp:73 rc.cpp:106 rc.cpp:233
+#: rc.cpp:69 rc.cpp:102
 msgid "Ignore images"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:52
+#. i18n: file: generalconfig.ui:38
 #. i18n: ectx: property (title), widget (QGroupBox, selection_group)
-#: rc.cpp:76 rc.cpp:236
+#: rc.cpp:72
 msgid "Selection and Clipboard"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:58
+#. i18n: file: generalconfig.ui:44
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreSelection)
-#: rc.cpp:79 rc.cpp:239
+#: rc.cpp:75
 msgid "Ignore selection"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:65
+#. i18n: file: generalconfig.ui:51
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SelectionTextOnly)
-#: rc.cpp:82 rc.cpp:242
+#: rc.cpp:78
 msgid "Text selection only"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:72
+#. i18n: file: generalconfig.ui:58
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SyncClipboards)
-#: rc.cpp:85 rc.cpp:245
+#: rc.cpp:81
 msgid "Synchronize contents of the clipboard and the selection"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:82
+#. i18n: file: generalconfig.ui:68
 #. i18n: ectx: property (text), widget (QLabel, timeout_label)
-#: rc.cpp:88 rc.cpp:248
+#: rc.cpp:84
 msgid "Timeout for action popups:"
 msgstr ""
 
-#. i18n: file: generalconfig.ui:96
+#. i18n: file: generalconfig.ui:82
 #. i18n: ectx: property (text), widget (QLabel, history_size_label)
-#: rc.cpp:91 rc.cpp:251
+#: rc.cpp:87
 msgid "Clipboard history size:"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:9
 #. i18n: ectx: label, entry (Version), group (General)
-#: rc.cpp:94
+#: rc.cpp:90
 msgid "Klipper version"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:12
 #. i18n: ectx: label, entry (KeepClipboardContents), group (General)
-#: rc.cpp:97
+#: rc.cpp:93
 msgid "Keep clipboard contents"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:18
 #. i18n: ectx: whatsthis, entry (PreventEmptyClipboard), group (General)
-#: rc.cpp:103
+#: rc.cpp:99
 msgid ""
 "Selecting this option has the effect, that the clipboard can never be "
 "emptied. E.g. when an application exits, the clipboard would usually be "
@@ -511,105 +497,106 @@
 
 #. i18n: file: klipper.kcfg:25
 #. i18n: ectx: label, entry (IgnoreSelection), group (General)
-#: rc.cpp:109
+#: rc.cpp:105
 msgid "Ignore Selection"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:27
 #. i18n: ectx: whatsthis, entry (IgnoreSelection), group (General)
-#: rc.cpp:112
+#: rc.cpp:108
 msgid ""
 "<qt>When an area of the screen is selected with mouse or keyboard, this is "
-"called \"the selection\". If this option is set, the selection is not "
+"called \"the selection\".<br/>If this option is set, the selection is not "
 "entered into the clipboard history, though it is still available for pasting "
 "using the middle mouse button.</qt>"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:34
 #. i18n: ectx: label, entry (SyncClipboards), group (General)
-#: rc.cpp:116
+#: rc.cpp:111
 msgid "Synchronize clipboard and selection"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:36
 #. i18n: ectx: whatsthis, entry (SyncClipboards), group (General)
-#: rc.cpp:119
+#: rc.cpp:114
 msgid ""
 "<qt>When an area of the screen is selected with mouse or keyboard, this is "
-"called \"the selection\". If this option is selected, the selection and the "
-"clipboard is kept the same, so that anything in the selection is immediately "
-"available for pasting elsewhere using any method, including the traditional "
-"middle mouse button. Otherwise, the selection is recorded in the clipboard "
-"history, but the selection can only be pasted using the middle mouse button. "
-"Also see the 'Ignore Selection' option.</qt>"
+"called \"the selection\".<br/>If this option is selected, the selection and "
+"the clipboard is kept the same, so that anything in the selection is "
+"immediately available for pasting elsewhere using any method, including the "
+"traditional middle mouse button. Otherwise, the selection is recorded in the "
+"clipboard history, but the selection can only be pasted using the middle "
+"mouse button. Also see the 'Ignore Selection' option.</qt>"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:39
 #. i18n: ectx: label, entry (SelectionTextOnly), group (General)
-#: rc.cpp:122
+#: rc.cpp:117
 msgid "Selection text only"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:41
 #. i18n: ectx: whatsthis, entry (SelectionTextOnly), group (General)
-#: rc.cpp:125
+#: rc.cpp:120
 msgid ""
 "<qt>When an area of the screen is selected with mouse or keyboard, this is "
-"called \"the selection\". If this option is selected, only text selections "
-"are stored in the history, while images and other selections are not.</qt>"
+"called \"the selection\".<br/>If this option is selected, only text "
+"selections are stored in the history, while images and other selections are "
+"not.</qt>"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:44
 #. i18n: ectx: label, entry (UseGUIRegExpEditor), group (General)
-#: rc.cpp:128
+#: rc.cpp:123
 msgid "Use graphical regexp editor"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:48
 #. i18n: ectx: label, entry (URLGrabberEnabled), group (General)
-#: rc.cpp:131
+#: rc.cpp:126
 msgid "URL grabber enabled"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:53
 #. i18n: ectx: label, entry (NoActionsForWM_CLASS), group (General)
-#: rc.cpp:134
+#: rc.cpp:129
 msgid "No actions for WM_CLASS"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:56
 #. i18n: ectx: label, entry (TimeoutForActionPopups), group (General)
-#: rc.cpp:137
+#: rc.cpp:132
 msgid "Timeout for action popups (seconds)"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:60
 #. i18n: ectx: tooltip, entry (TimeoutForActionPopups), group (General)
-#: rc.cpp:140
+#: rc.cpp:135
 msgid "A value of 0 disables the timeout"
 msgstr "Bydd 0 yn werth yn analluogi'r goramser"
 
 #. i18n: file: klipper.kcfg:63
 #. i18n: ectx: label, entry (MaxClipItems), group (General)
-#: rc.cpp:143
+#: rc.cpp:138
 msgid "Clipboard history size"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:69
 #. i18n: ectx: label, entry (ActionList), group (General)
-#: rc.cpp:146
+#: rc.cpp:141
 msgid "Dummy entry for indicating changes in an action's tree widget"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:75
 #. i18n: ectx: label, entry (StripWhiteSpace), group (Actions)
-#: rc.cpp:149
+#: rc.cpp:144
 msgid "Strip whitespace when executing an action"
 msgstr ""
 
 #. i18n: file: klipper.kcfg:77
 #. i18n: ectx: whatsthis, entry (StripWhiteSpace), group (Actions)
-#: rc.cpp:152
+#: rc.cpp:147
 msgid ""
 "Sometimes, the selected text has some whitespace at the end, which, if "
 "loaded as URL in a browser would cause an error. Enabling this option "
@@ -623,7 +610,7 @@
 
 #. i18n: file: klipper.kcfg:80
 #. i18n: ectx: label, entry (ReplayActionInHistory), group (Actions)
-#: rc.cpp:155
+#: rc.cpp:150
 msgid "Replay action in history"
 msgstr ""
 
@@ -635,15 +622,15 @@
 msgid "Clipboard is empty"
 msgstr ""
 
-#: urlgrabber.cpp:213
+#: urlgrabber.cpp:226
 #, kde-format
 msgid "%1 - Actions For: %2"
 msgstr ""
 
-#: urlgrabber.cpp:241
+#: urlgrabber.cpp:254
 msgid "Disable This Popup"
 msgstr "Analluogi'r Naidlen Hon"
 
-#: urlgrabber.cpp:247
+#: urlgrabber.cpp:260
 msgid "&Cancel"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klock.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klock.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/klock.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/klock.po	2012-04-18 08:59:23.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeartwork/klock.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 15:58+0000\n"
-"PO-Revision-Date: 2012-03-14 18:00+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 17:32+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,163 +11,29 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kdesavers/Euphoria.cpp:901
-msgid "Euphoria"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:984 kdesavers/Flux.cpp:874
-#: kdesavers/SolarWinds.cpp:680
-msgid "Regular"
-msgstr "Arferol"
-
-#: kdesavers/Euphoria.cpp:985
-msgid "Grid"
-msgstr "Grid"
-
-#: kdesavers/Euphoria.cpp:986
-msgid "Cubism"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:987
-msgid "Bad Math"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:988
-msgid "M-Theory"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:989
-msgid "UHFTEM"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:990
-msgid "Nowhere"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:991
-msgid "Echo"
-msgstr ""
-
-#: kdesavers/Euphoria.cpp:992
-msgid "Kaleidoscope"
+#: kdesavers/banner.cpp:47
+msgid "KBanner"
 msgstr ""
 
-#: kdesavers/Euphoria.cpp:993 kdesavers/Flux.cpp:880
-#: kdesavers/SolarWinds.cpp:686
-msgid "(Random)"
-msgstr "(Hap)"
-
-#: kdesavers/Euphoria.cpp:1001
-msgid "Setup Euphoria Screen Saver"
+#: kdesavers/banner.cpp:76
+msgid "Setup Banner Screen Saver"
 msgstr ""
 
-#: kdesavers/Euphoria.cpp:1006 kdesavers/Flux.cpp:888 kdesavers/Flux.cpp:900
-#: kdesavers/SolarWinds.cpp:694 kdesavers/SolarWinds.cpp:700
-#: kdesavers/banner.cpp:78 kdesavers/blob.cpp:444 kdesavers/firesaver.cpp:77
+#: kdesavers/banner.cpp:78 kdesavers/blob.cpp:444 kdesavers/Euphoria.cpp:1006
+#: kdesavers/firesaver.cpp:77 kdesavers/Flux.cpp:888 kdesavers/Flux.cpp:900
 #: kdesavers/fountain.cpp:76 kdesavers/gravity.cpp:75 kdesavers/kclock.cpp:85
 #: kdesavers/kvm.cpp:288 kdesavers/lines.cpp:137 kdesavers/lorenz.cpp:90
 #: kdesavers/pendulum.cpp:736 kdesavers/polygon.cpp:77
 #: kdesavers/rotation.cpp:731 kdesavers/science.cpp:872
-#: kdesavers/slideshow.cpp:947 kdesavers/wave.cpp:75 xsavers/space.cpp:579
+#: kdesavers/slideshow.cpp:962 kdesavers/SolarWinds.cpp:695
+#: kdesavers/SolarWinds.cpp:701 kdesavers/wave.cpp:75 xsavers/space.cpp:579
 #: xsavers/swarm.cpp:324
 msgid "A&bout"
 msgstr ""
 
-#: kdesavers/Euphoria.cpp:1016 kdesavers/Flux.cpp:903
-#: kdesavers/SolarWinds.cpp:710 kdesavers/science.cpp:884
-msgid "Mode:"
-msgstr "Modd:"
-
-#: kdesavers/Euphoria.cpp:1060
-msgid ""
-"<h3>Euphoria 1.0</h3>\n"
-"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
-"<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
-"\n"
-"<p>Ported to KDE by Karl Robillard</p>"
-msgstr ""
-
-#: kdesavers/Flux.cpp:789
-msgid "Flux"
-msgstr ""
-
-#: kdesavers/Flux.cpp:875
-msgid "Hypnotic"
-msgstr ""
-
-#: kdesavers/Flux.cpp:876
-msgid "Insane"
-msgstr "Gwallgof"
-
-#: kdesavers/Flux.cpp:877
-msgid "Sparklers"
-msgstr ""
-
-#: kdesavers/Flux.cpp:878
-msgid "Paradigm"
-msgstr ""
-
-#: kdesavers/Flux.cpp:879
-msgid "Galactic"
-msgstr ""
-
-#: kdesavers/Flux.cpp:945
-msgid ""
-"<h3>Flux 1.0</h3>\n"
-"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
-"<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
-"\n"
-"<p>Ported to KDE by Karl Robillard</p>"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:597
-msgid "Solar Winds"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:681
-msgid "Cosmic Strings"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:682
-msgid "Cold Pricklies"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:683
-msgid "Space Fur"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:684
-msgid "Jiggly"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:685
-msgid "Undertow"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:697
-msgid "Setup Solar Wind"
-msgstr ""
-
-#: kdesavers/SolarWinds.cpp:752
-msgid ""
-"<h3>Solar Winds 1.0</h3>\n"
-"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
-"<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
-"\n"
-"<p>Ported to KDE by Karl Robillard</p>"
-msgstr ""
-
-#: kdesavers/banner.cpp:47
-msgid "KBanner"
-msgstr ""
-
-#: kdesavers/banner.cpp:76
-msgid "Setup Banner Screen Saver"
-msgstr ""
-
 #: kdesavers/banner.cpp:92
 msgid "Font"
 msgstr ""
@@ -244,7 +110,7 @@
 
 #. i18n: file: kdesavers/rotationcfg.ui:69
 #. i18n: ectx: property (text), widget (QCheckBox, m_randTraces)
-#: kdesavers/blob.cpp:85 rc.cpp:414
+#: kdesavers/blob.cpp:85 rc.cpp:413
 msgid "Random"
 msgstr "Hap"
 
@@ -272,6 +138,70 @@
 "tiaan@netsys.co.za"
 msgstr ""
 
+#: kdesavers/Euphoria.cpp:901
+msgid "Euphoria"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:984 kdesavers/Flux.cpp:874
+#: kdesavers/SolarWinds.cpp:681
+msgid "Regular"
+msgstr "Arferol"
+
+#: kdesavers/Euphoria.cpp:985
+msgid "Grid"
+msgstr "Grid"
+
+#: kdesavers/Euphoria.cpp:986
+msgid "Cubism"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:987
+msgid "Bad Math"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:988
+msgid "M-Theory"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:989
+msgid "UHFTEM"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:990
+msgid "Nowhere"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:991
+msgid "Echo"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:992
+msgid "Kaleidoscope"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:993 kdesavers/Flux.cpp:880
+#: kdesavers/SolarWinds.cpp:687
+msgid "(Random)"
+msgstr "(Hap)"
+
+#: kdesavers/Euphoria.cpp:1001
+msgid "Setup Euphoria Screen Saver"
+msgstr ""
+
+#: kdesavers/Euphoria.cpp:1016 kdesavers/Flux.cpp:903
+#: kdesavers/science.cpp:884 kdesavers/SolarWinds.cpp:711
+msgid "Mode:"
+msgstr "Modd:"
+
+#: kdesavers/Euphoria.cpp:1060
+msgid ""
+"<h3>Euphoria 1.0</h3>\n"
+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
+"<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
+"\n"
+"<p>Ported to KDE by Karl Robillard</p>"
+msgstr ""
+
 #: kdesavers/firesaver.cpp:72
 msgid "Setup Screen Saver"
 msgstr ""
@@ -307,6 +237,39 @@
 msgid "Welcome to KDE %1.%2.%3"
 msgstr ""
 
+#: kdesavers/Flux.cpp:789
+msgid "Flux"
+msgstr ""
+
+#: kdesavers/Flux.cpp:875
+msgid "Hypnotic"
+msgstr ""
+
+#: kdesavers/Flux.cpp:876
+msgid "Insane"
+msgstr "Gwallgof"
+
+#: kdesavers/Flux.cpp:877
+msgid "Sparklers"
+msgstr ""
+
+#: kdesavers/Flux.cpp:878
+msgid "Paradigm"
+msgstr ""
+
+#: kdesavers/Flux.cpp:879
+msgid "Galactic"
+msgstr ""
+
+#: kdesavers/Flux.cpp:945
+msgid ""
+"<h3>Flux 1.0</h3>\n"
+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
+"<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
+"\n"
+"<p>Ported to KDE by Karl Robillard</p>"
+msgstr ""
+
 #: kdesavers/fountain.cpp:44
 msgid "Particle Fountain Screen Saver"
 msgstr ""
@@ -353,7 +316,7 @@
 
 #. i18n: file: kdesavers/firesaversetup.ui:747
 #. i18n: ectx: property (text), widget (QLabel)
-#: kdesavers/kclock.cpp:95 rc.cpp:135
+#: kdesavers/kclock.cpp:95 rc.cpp:134
 msgid "Colors"
 msgstr "Lliwiau"
 
@@ -440,7 +403,7 @@
 
 #. i18n: file: kdesavers/rotationcfg.ui:92
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: kdesavers/lines.cpp:146 kdesavers/polygon.cpp:84 rc.cpp:423
+#: kdesavers/lines.cpp:146 kdesavers/polygon.cpp:84 rc.cpp:422
 msgid "Length:"
 msgstr "Hyd:"
 
@@ -644,7 +607,7 @@
 
 #. i18n: file: kdesavers/firesaversetup.ui:1349
 #. i18n: ectx: property (text), widget (QLabel)
-#: kdesavers/science.cpp:937 rc.cpp:297
+#: kdesavers/science.cpp:937 rc.cpp:296
 msgid "Intensity:"
 msgstr "Dwyster:"
 
@@ -684,20 +647,57 @@
 msgid "Sven Leiber"
 msgstr ""
 
-#: kdesavers/slideshow.cpp:776
+#: kdesavers/slideshow.cpp:791
 msgid "No images found"
 msgstr ""
 
-#: kdesavers/slideshow.cpp:943
+#: kdesavers/slideshow.cpp:958
 msgid "Setup Slide Show Screen Saver"
 msgstr ""
 
-#: kdesavers/slideshow.cpp:981
+#: kdesavers/slideshow.cpp:997
 msgid " second"
 msgid_plural " seconds"
 msgstr[0] ""
 msgstr[1] ""
 
+#: kdesavers/SolarWinds.cpp:598
+msgid "Solar Winds"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:682
+msgid "Cosmic Strings"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:683
+msgid "Cold Pricklies"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:684
+msgid "Space Fur"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:685
+msgid "Jiggly"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:686
+msgid "Undertow"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:698
+msgid "Setup Solar Wind"
+msgstr ""
+
+#: kdesavers/SolarWinds.cpp:753
+msgid ""
+"<h3>Solar Winds 1.0</h3>\n"
+"<p>Copyright (c) 2002 Terence M. Welsh<br>\n"
+"<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
+"\n"
+"<p>Ported to KDE by Karl Robillard</p>"
+msgstr ""
+
 #: kdesavers/wave.cpp:44
 msgid "Bitmap Wave Screen Saver"
 msgstr ""
@@ -923,7 +923,7 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. i18n: file: kdesavers/firesaversetup.ui:1237
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:71 rc.cpp:270
+#: rc.cpp:71 rc.cpp:269
 msgid "more"
 msgstr "mwy"
 
@@ -939,7 +939,7 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. i18n: file: kdesavers/firesaversetup.ui:1461
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:77 rc.cpp:300 rc.cpp:312
+#: rc.cpp:77 rc.cpp:299 rc.cpp:311
 msgid "small"
 msgstr "bach"
 
@@ -947,7 +947,7 @@
 #. i18n: ectx: property (text), widget (QLabel)
 #. i18n: file: kdesavers/firesaversetup.ui:1494
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:80 rc.cpp:315
+#: rc.cpp:80 rc.cpp:314
 msgid "big"
 msgstr ""
 
@@ -959,25 +959,25 @@
 
 #. i18n: file: kdesavers/firesaversetup.ui:552
 #. i18n: ectx: property (toolTip), widget (KColorButton)
-#: rc.cpp:90
+#: rc.cpp:89
 msgid "Select the color"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:579
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:93
+#: rc.cpp:92
 msgid "Enable sounds"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:587
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:96
+#: rc.cpp:95
 msgid "Limit overload (recommended)"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:595
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:99
+#: rc.cpp:98
 msgid "Realtime fps adjust (recommended)"
 msgstr ""
 
@@ -985,73 +985,73 @@
 #. i18n: ectx: attribute (title), widget (QWidget)
 #. i18n: file: kdesavers/firesaversetup.ui:755
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:102 rc.cpp:138
+#: rc.cpp:101 rc.cpp:137
 msgid "Fireworks"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:658
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:105
+#: rc.cpp:104
 msgid "Blinding white"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:666
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:108
+#: rc.cpp:107
 msgid "Velvet purple"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:674
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:111
+#: rc.cpp:110
 msgid "Deep-sea green"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:682
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:114
+#: rc.cpp:113
 msgid "Deep red"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:690
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:117
+#: rc.cpp:116
 msgid "Multicolor"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:693
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:120
+#: rc.cpp:119
 msgid "try bi-color fireworks"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:696
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:123
+#: rc.cpp:122
 msgid "This allow a random creation of fireworks that explodes in 2 colors"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:704
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:126
+#: rc.cpp:125
 msgid "Boring blue"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:729
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:129
+#: rc.cpp:128
 msgid "Hot orange"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:737
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:132
+#: rc.cpp:131
 msgid "Purest green"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:771
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:141
+#: rc.cpp:140
 msgid "Flames ring"
 msgstr ""
 
@@ -1071,213 +1071,213 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
 #. i18n: file: kdesavers/firesaversetup.ui:878
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:144 rc.cpp:150 rc.cpp:156 rc.cpp:162 rc.cpp:168 rc.cpp:174
-#: rc.cpp:180 rc.cpp:186
+#: rc.cpp:143 rc.cpp:149 rc.cpp:155 rc.cpp:161 rc.cpp:167 rc.cpp:173
+#: rc.cpp:179 rc.cpp:185
 msgid "try me"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:782
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:147
+#: rc.cpp:146
 msgid "Atomic splitter"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:793
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:153
+#: rc.cpp:152
 msgid "Sparkling fall"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:804
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:159
+#: rc.cpp:158
 msgid "Classic"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:815
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:165
+#: rc.cpp:164
 msgid "Only explosion"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:853
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:171
+#: rc.cpp:170
 msgid "SuperNova"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:864
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:177
+#: rc.cpp:176
 msgid "Toxic spirals"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:875
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:183
+#: rc.cpp:182
 msgid "Flames world"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:890
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:189
+#: rc.cpp:188
 msgid "Specials"
 msgstr "Arbenigion"
 
 #. i18n: file: kdesavers/firesaversetup.ui:918
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:192
+#: rc.cpp:191
 msgid "Logos"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:924
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:195
+#: rc.cpp:194
 msgid "Watch exploding images"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:927
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:198
+#: rc.cpp:197
 msgid "Enable images explosion."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:977
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:201
+#: rc.cpp:200
 msgid "KDE icons"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:980
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:204
+#: rc.cpp:203
 msgid "Enables KDE Icons"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:983
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:207
+#: rc.cpp:206
 msgid "Enables random KDE Icons explosions."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:991
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:210
+#: rc.cpp:209
 msgid "Tux"
 msgstr "Tux"
 
 #. i18n: file: kdesavers/firesaversetup.ui:997
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:213
+#: rc.cpp:212
 msgid "Enables Tux"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1000
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:216
+#: rc.cpp:215
 msgid "Enables random Tux explosions."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1008
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:219
+#: rc.cpp:218
 msgid "Reduce detail"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1011
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:222
+#: rc.cpp:221
 msgid "useful for increasing speed"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1014
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:225
+#: rc.cpp:224
 msgid "When enabled speeds up logo explosion but reduces quality."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1022
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:228
+#: rc.cpp:227
 msgid "Konqui"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1025
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:231
+#: rc.cpp:230
 msgid "Enables Konqui"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1028
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:234
+#: rc.cpp:233
 msgid "Enables random Konqui explosions."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1046
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:237
+#: rc.cpp:236
 msgid "Frequency:"
 msgstr "Amlder :"
 
 #. i18n: file: kdesavers/firesaversetup.ui:1054
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:240
+#: rc.cpp:239
 msgid "sometimes"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1087
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:243
+#: rc.cpp:242
 msgid "often"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1158
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:246
+#: rc.cpp:245
 msgid "Flickering"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1161
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:249
+#: rc.cpp:248
 msgid "enables a natural 'flicker' effect"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1164
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:252
+#: rc.cpp:251
 msgid ""
 "This option produces a sort of vibration in the lightness of the star."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1172
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:255
+#: rc.cpp:254
 msgid "Red-blue gradient"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1175
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:258
+#: rc.cpp:257
 msgid "emulate horizon coloring"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1178
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:261
+#: rc.cpp:260
 msgid "Gives lower stars a reddish tint."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1196
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:264
+#: rc.cpp:263
 msgid "Number:"
 msgstr "Rhif:"
 
 #. i18n: file: kdesavers/firesaversetup.ui:1204
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:267
+#: rc.cpp:266
 msgid "less"
 msgstr ""
 
@@ -1289,7 +1289,7 @@
 #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1)
 #. i18n: file: kdesavers/wavecfg.ui:84
 #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1)
-#: rc.cpp:273 rc.cpp:351 rc.cpp:363 rc.cpp:459
+#: rc.cpp:272 rc.cpp:350 rc.cpp:362 rc.cpp:461
 msgid "Stars"
 msgstr ""
 
@@ -1297,7 +1297,7 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
 #. i18n: file: kdesavers/firesaversetup.ui:1289
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:276 rc.cpp:285
+#: rc.cpp:275 rc.cpp:284
 msgid "Watch the stars"
 msgstr ""
 
@@ -1305,49 +1305,49 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
 #. i18n: file: kdesavers/firesaversetup.ui:1292
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:279 rc.cpp:288
+#: rc.cpp:278 rc.cpp:287
 msgid "Enable stars in the sky."
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1283
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:282
+#: rc.cpp:281
 msgid "Writings"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1302
 #. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:291
+#: rc.cpp:290
 msgid "Effects"
 msgstr "Effeithiau"
 
 #. i18n: file: kdesavers/firesaversetup.ui:1313
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:294
+#: rc.cpp:293
 msgid "Flash screen on explosions"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1390
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:303
+#: rc.cpp:302
 msgid "hypnotic"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1417
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:306
+#: rc.cpp:305
 msgid "Mega flares"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1453
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:309
+#: rc.cpp:308
 msgid "Dimension:"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1521
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:318
+#: rc.cpp:317
 msgid "Fireworks leave a particle trail"
 msgstr ""
 
@@ -1355,49 +1355,49 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
 #. i18n: file: kdesavers/firesaversetup.ui:1527
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:321 rc.cpp:324
+#: rc.cpp:320 rc.cpp:323
 msgid "not yet ported"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1560
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:327
+#: rc.cpp:326
 msgid "Flash opacity:"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1568
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:330
+#: rc.cpp:329
 msgid "min"
 msgstr "mun"
 
 #. i18n: file: kdesavers/firesaversetup.ui:1601
 #. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:333
+#: rc.cpp:332
 msgid "max"
 msgstr "uchaf"
 
 #. i18n: file: kdesavers/firesaversetup.ui:1628
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:336
+#: rc.cpp:335
 msgid "Fade effect"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1639
 #. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:339
+#: rc.cpp:338
 msgid "Spherical light after explosion"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1642
 #. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:342
+#: rc.cpp:341
 msgid "warning, this can shock your mind :-)"
 msgstr ""
 
 #. i18n: file: kdesavers/firesaversetup.ui:1645
 #. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:345
+#: rc.cpp:344
 msgid ""
 "Multiplies the scale factor for particles near you, resulting in a colorful "
 "experience."
@@ -1409,7 +1409,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
 #. i18n: file: kdesavers/wavecfg.ui:63
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:348 rc.cpp:360 rc.cpp:456
+#: rc.cpp:347 rc.cpp:359 rc.cpp:458
 msgid "Shapes"
 msgstr ""
 
@@ -1419,7 +1419,7 @@
 #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1_2)
 #. i18n: file: kdesavers/wavecfg.ui:94
 #. i18n: ectx: property (text), widget (QRadioButton, RadioButton1_2)
-#: rc.cpp:354 rc.cpp:366 rc.cpp:462
+#: rc.cpp:353 rc.cpp:365 rc.cpp:464
 msgid "Flares"
 msgstr ""
 
@@ -1429,13 +1429,13 @@
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
 #. i18n: file: kdesavers/wavecfg.ui:108
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:357 rc.cpp:369 rc.cpp:465
+#: rc.cpp:356 rc.cpp:368 rc.cpp:467
 msgid "Particle size:"
 msgstr ""
 
 #. i18n: file: kdesavers/pendulumcfg.ui:60
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:372
+#: rc.cpp:371
 msgid ""
 "<p align=\"center\">\n"
 "m<sub>2</sub><br>\n"
@@ -1446,7 +1446,7 @@
 
 #. i18n: file: kdesavers/pendulumcfg.ui:97
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:379
+#: rc.cpp:378
 msgid ""
 "<p align=\"center\">\n"
 "l<sub>2</sub><br>\n"
@@ -1457,26 +1457,26 @@
 
 #. i18n: file: kdesavers/pendulumcfg.ui:130
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:386
+#: rc.cpp:385
 msgid "g"
 msgstr "g"
 
 #. i18n: file: kdesavers/pendulumcfg.ui:166
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:389
+#: rc.cpp:388
 msgid "E"
 msgstr "Dwyrain"
 
 #. i18n: file: kdesavers/pendulumcfg.ui:202
 #. i18n: ectx: property (toolTip), widget (QLabel, textLabel2_2)
-#: rc.cpp:392
+#: rc.cpp:391
 msgid ""
 "specify the time in seconds after which a random perspective change occurs"
 msgstr ""
 
 #. i18n: file: kdesavers/pendulumcfg.ui:206
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:395
+#: rc.cpp:394
 msgid ""
 "Perspective<br>\n"
 "Change [s]"
@@ -1484,73 +1484,73 @@
 
 #. i18n: file: kdesavers/pendulumcfg.ui:248
 #. i18n: ectx: property (text), widget (QPushButton, m_barColorButton)
-#: rc.cpp:399
+#: rc.cpp:398
 msgid "Bars"
 msgstr "Bariau"
 
 #. i18n: file: kdesavers/pendulumcfg.ui:261
 #. i18n: ectx: property (text), widget (QPushButton, m_m1ColorButton)
-#: rc.cpp:402
+#: rc.cpp:401
 msgid "M1"
 msgstr ""
 
 #. i18n: file: kdesavers/pendulumcfg.ui:274
 #. i18n: ectx: property (text), widget (QPushButton, m_m2ColorButton)
-#: rc.cpp:405
+#: rc.cpp:404
 msgid "M2"
 msgstr ""
 
 #. i18n: file: kdesavers/rotationcfg.ui:51
 #. i18n: ectx: property (title), widget (QGroupBox, buttonGroup1)
-#: rc.cpp:408
+#: rc.cpp:407
 msgid "Traces"
 msgstr ""
 
 #. i18n: file: kdesavers/rotationcfg.ui:62
 #. i18n: ectx: property (text), widget (QCheckBox, m_xTrace)
-#: rc.cpp:411
+#: rc.cpp:410
 msgid "x"
 msgstr "x"
 
 #. i18n: file: kdesavers/rotationcfg.ui:76
 #. i18n: ectx: property (text), widget (QCheckBox, m_yTrace)
-#: rc.cpp:417
+#: rc.cpp:416
 msgid "y"
 msgstr "y"
 
 #. i18n: file: kdesavers/rotationcfg.ui:83
 #. i18n: ectx: property (text), widget (QCheckBox, m_zTrace)
-#: rc.cpp:420
+#: rc.cpp:419
 msgid "z"
 msgstr ""
 
 #. i18n: file: kdesavers/rotationcfg.ui:157
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:426
+#: rc.cpp:425
 msgid "Theta:"
 msgstr ""
 
 #. i18n: file: kdesavers/rotationcfg.ui:173
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:429
+#: rc.cpp:428
 msgid "Lz:"
 msgstr ""
 
-#. i18n: file: kdesavers/slideshowcfg.ui:36
+#. i18n: file: kdesavers/slideshowcfg.ui:17
 #. i18n: ectx: property (text), widget (QCheckBox, mCbxZoom)
-#: rc.cpp:438
+#: rc.cpp:431
 msgid "Resi&ze images"
 msgstr ""
 
-#. i18n: file: kdesavers/slideshowcfg.ui:26
+#. i18n: file: kdesavers/slideshowcfg.ui:40
 #. i18n: ectx: property (text), widget (QCheckBox, mCbxRandom)
-#: rc.cpp:435
+#: rc.cpp:434
 msgid "&Random order"
 msgstr ""
 
-#. i18n: file: kdesavers/slideshowcfg.ui:72
+#. i18n: file: kdesavers/slideshowcfg.ui:47
 #. i18n: ectx: property (text), widget (QCheckBox, mCbxShowName)
-#: rc.cpp:444
+#: rc.cpp:437
 msgid "Show &names"
 msgstr ""
 
@@ -1560,32 +1560,32 @@
 msgid "Show &full path"
 msgstr ""
 
-#. i18n: file: kdesavers/slideshowcfg.ui:121
+#. i18n: file: kdesavers/slideshowcfg.ui:81
 #. i18n: ectx: property (text), widget (QCheckBox, mCbxRandomPosition)
-#: rc.cpp:450
+#: rc.cpp:443
 msgid "Random &position"
 msgstr ""
 
-#. i18n: file: kdesavers/slideshowcfg.ui:108
+#. i18n: file: kdesavers/slideshowcfg.ui:90
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:447
+#: rc.cpp:446
 msgid "&Delay:"
 msgstr "&Oedi:"
 
-#. i18n: file: kdesavers/slideshowcfg.ui:59
+#. i18n: file: kdesavers/slideshowcfg.ui:120
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:441
+#: rc.cpp:449
 msgid "I&mage folder:"
 msgstr ""
 
-#. i18n: file: kdesavers/slideshowcfg.ui:19
+#. i18n: file: kdesavers/slideshowcfg.ui:138
 #. i18n: ectx: property (text), widget (QCheckBox, mCbxSubdirectory)
-#: rc.cpp:432
+#: rc.cpp:452
 msgid "&Include images from sub-folders"
 msgstr ""
 
 #. i18n: file: kdesavers/wavecfg.ui:43
 #. i18n: ectx: property (text), widget (QCheckBox, CheckBox1)
-#: rc.cpp:453
+#: rc.cpp:455
 msgid "Use textures"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmahjongg.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmahjongg.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmahjongg.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmahjongg.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,15 +9,63 @@
 msgstr ""
 "Project-Id-Version: kmahjongg\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:36+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:49+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#: boardwidget.cpp:411
+msgid "Undo operation done successfully."
+msgstr "Llwyddodd y gweithrediad dadwneud."
+
+#: boardwidget.cpp:415
+msgid "What do you want to undo? You have done nothing!"
+msgstr "Beth ydych eisiau ei dadwneud?  Nid ydych wedi gwneud rhywbeth eto!"
+
+#: boardwidget.cpp:434
+msgid "Sorry, you have lost the game."
+msgstr "Sori, rydych wedi colli'r gêm."
+
+#: boardwidget.cpp:479
+msgid "Demo mode. Click mousebutton to stop."
+msgstr "Modd arddangos.  Cliciwch fotwm y llygoden i atal."
+
+#: boardwidget.cpp:488
+msgid "Now it is you again."
+msgstr ""
+
+#: boardwidget.cpp:511
+msgid "Your computer has lost the game."
+msgstr "Mae eich cyfrifiadur wedi colli'r gêm."
+
+#: boardwidget.cpp:606
+msgid "Congratulations. You have won!"
+msgstr "Llongyfarchiadau.  Rydych wedi ennill!"
+
+#: boardwidget.cpp:653
+msgid "Calculating new game..."
+msgstr "Cyfrif gêm newydd..."
+
+#: boardwidget.cpp:658
+msgid "Error converting board information!"
+msgstr "Gwall wrth drosi gwybodaeth y bwrdd!"
+
+#: boardwidget.cpp:684
+msgid "Ready. Now it is your turn."
+msgstr "Parod.  Eich tro chi rwan."
+
+#: boardwidget.cpp:692
+msgid "Error generating new game!"
+msgstr "Gwall wrth greu gêm newydd!"
+
+#: boardwidget.cpp:1166
+msgid "Game over: You have no moves left."
+msgstr "Gêm drosodd: nid oes gennych symudiadau yn weddill."
 
 #: Editor.cpp:81
 msgid "Edit Board Layout"
@@ -117,54 +165,6 @@
 msgid "Save failed. Aborting operation."
 msgstr "Methwyd cadw.  Erthylu'r gweithrediad."
 
-#: boardwidget.cpp:411
-msgid "Undo operation done successfully."
-msgstr "Llwyddodd y gweithrediad dadwneud."
-
-#: boardwidget.cpp:415
-msgid "What do you want to undo? You have done nothing!"
-msgstr "Beth ydych eisiau ei dadwneud?  Nid ydych wedi gwneud rhywbeth eto!"
-
-#: boardwidget.cpp:434
-msgid "Sorry, you have lost the game."
-msgstr "Sori, rydych wedi colli'r gêm."
-
-#: boardwidget.cpp:479
-msgid "Demo mode. Click mousebutton to stop."
-msgstr "Modd arddangos.  Cliciwch fotwm y llygoden i atal."
-
-#: boardwidget.cpp:488
-msgid "Now it is you again."
-msgstr ""
-
-#: boardwidget.cpp:511
-msgid "Your computer has lost the game."
-msgstr "Mae eich cyfrifiadur wedi colli'r gêm."
-
-#: boardwidget.cpp:606
-msgid "Congratulations. You have won!"
-msgstr "Llongyfarchiadau.  Rydych wedi ennill!"
-
-#: boardwidget.cpp:653
-msgid "Calculating new game..."
-msgstr "Cyfrif gêm newydd..."
-
-#: boardwidget.cpp:658
-msgid "Error converting board information!"
-msgstr "Gwall wrth drosi gwybodaeth y bwrdd!"
-
-#: boardwidget.cpp:684
-msgid "Ready. Now it is your turn."
-msgstr "Parod.  Eich tro chi rwan."
-
-#: boardwidget.cpp:692
-msgid "Error generating new game!"
-msgstr "Gwall wrth greu gêm newydd!"
-
-#: boardwidget.cpp:853
-msgid "Game over: You have no moves left."
-msgstr "Gêm drosodd: nid oes gennych symudiadau yn weddill."
-
 #: kmahjongg.cpp:148
 msgid "New Numbered Game..."
 msgstr "Gêm Rhif Newydd..."
@@ -341,114 +341,114 @@
 msgid "Code cleanup"
 msgstr "Glanhau'r côd"
 
-#: rc.cpp:52
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, jawz, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:53
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kmahjonggui.rc:10
 #. i18n: ectx: Menu (game)
-#: rc.cpp:36 rc.cpp:56
+#: rc.cpp:5
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: kmahjonggui.rc:13
 #. i18n: ectx: Menu (move)
-#: rc.cpp:39 rc.cpp:59
+#: rc.cpp:8
 msgid "&Move"
 msgstr "Sy&mud"
 
 #. i18n: file: kmahjonggui.rc:16
 #. i18n: ectx: Menu (view)
-#: rc.cpp:42 rc.cpp:62
+#: rc.cpp:11
 msgid "&View"
 msgstr ""
 
 #. i18n: file: kmahjonggui.rc:22
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:45 rc.cpp:65
+#: rc.cpp:14
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: gametype.ui:48
 #. i18n: ectx: property (text), widget (QPushButton, getNewButton)
-#: rc.cpp:3 rc.cpp:68
+#: rc.cpp:17
 msgid "&Get New Layouts"
 msgstr ""
 
 #. i18n: file: gametype.ui:57
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:6 rc.cpp:71
+#: rc.cpp:20
 msgid "Preview"
 msgstr ""
 
 #. i18n: file: gametype.ui:99
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:9 rc.cpp:74
+#: rc.cpp:23
 msgid "Layout Details"
 msgstr ""
 
 #. i18n: file: gametype.ui:137
 #. i18n: ectx: property (text), widget (QLabel, labelAuthor)
-#: rc.cpp:12 rc.cpp:77
+#: rc.cpp:26
 msgid "Author:"
 msgstr ""
 
 #. i18n: file: gametype.ui:147
 #. i18n: ectx: property (text), widget (QLabel, labelContact)
-#: rc.cpp:15 rc.cpp:80
+#: rc.cpp:29
 msgid "Contact:"
 msgstr ""
 
 #. i18n: file: gametype.ui:157
 #. i18n: ectx: property (text), widget (QLabel, labelDescription)
-#: rc.cpp:18 rc.cpp:83
+#: rc.cpp:32
 msgid "Description:"
 msgstr ""
 
 #. i18n: file: settings.ui:22
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowMatchingTiles)
-#: rc.cpp:48 rc.cpp:86
+#: rc.cpp:35
 msgid "Blink matching tiles when first one is selected"
 msgstr ""
 
 #. i18n: file: settings.ui:29
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SolvableGames)
-#: rc.cpp:51 rc.cpp:89
+#: rc.cpp:38
 msgid "Generate solvable games"
 msgstr "Creu gemau a ellir eu datrys"
 
 #. i18n: file: kmahjongg.kcfg:9
 #. i18n: ectx: label, entry (TileSet), group (General)
-#: rc.cpp:21 rc.cpp:92
+#: rc.cpp:41
 msgid "The tile-set to use."
 msgstr "Y set teiliau i'w ddefnyddio."
 
 #. i18n: file: kmahjongg.kcfg:12
 #. i18n: ectx: label, entry (Background), group (General)
-#: rc.cpp:24 rc.cpp:95
+#: rc.cpp:44
 msgid "The background to use."
 msgstr "Y cefndir i'w ddefnyddio."
 
 #. i18n: file: kmahjongg.kcfg:15
 #. i18n: ectx: label, entry (Layout), group (General)
-#: rc.cpp:27 rc.cpp:98
+#: rc.cpp:47
 msgid "The layout of the tiles."
 msgstr "Haenlun y teiliau."
 
 #. i18n: file: kmahjongg.kcfg:21
 #. i18n: ectx: label, entry (SolvableGames), group (General)
-#: rc.cpp:30 rc.cpp:101
+#: rc.cpp:50
 msgid "Whether all games should be solvable."
 msgstr "A ddylid gallu datrys pob gêm."
 
 #. i18n: file: kmahjongg.kcfg:25
 #. i18n: ectx: label, entry (ShowMatchingTiles), group (General)
-#: rc.cpp:33 rc.cpp:104
+#: rc.cpp:53
 msgid "Whether matching tiles are shown."
 msgstr "A ddylid dangos teiliau cydweddol."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmailcvt.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmailcvt.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmailcvt.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmailcvt.po	2012-04-18 08:59:26.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2008-02-15 21:51+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,28 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:13+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: kmailcvt.cpp:39
-msgid "KMailCVT Import Tool"
-msgstr "Erfyn Mewnforio KMailCVT"
-
-#: kmailcvt.cpp:43
-msgid "Step 1: Select Filter"
-msgstr "Cam 1: Dewis Hidlen"
-
-#: kmailcvt.cpp:48
-msgid "Step 2: Importing..."
-msgstr "Cam 2: Mewnforio..."
-
-#: kmailcvt.cpp:90
-msgid "Import in progress"
-msgstr "Mewnforio ar waith"
-
-#: kmailcvt.cpp:94
-msgid "Import finished"
-msgstr "Mewnforio wedi gorffen"
+"X-Launchpad-Export-Date: 2012-04-18 00:39+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: filter_outlook.cxx:26
 msgid "Import Outlook Emails"
@@ -55,15 +35,15 @@
 "OUTLOOK-</p>"
 msgstr ""
 
-#: filter_outlook.cxx:42 filter_kmail_maildir.cxx:55
-#: filter_evolution_v2.cxx:63 filter_thebat.cxx:59 filter_plain.cxx:42
-#: filter_oe.cxx:57 filter_pmail.cxx:52 filter_thunderbird.cxx:63
-#: filter_sylpheed.cxx:54 filter_evolution.cxx:56 filter_opera.cxx:159
+#: filter_outlook.cxx:42 filter_oe.cxx:57 filter_thebat.cxx:59
+#: filter_opera.cxx:159 filter_evolution.cxx:56 filter_evolution_v2.cxx:64
+#: filter_thunderbird.cxx:62 filter_kmail_maildir.cxx:54
+#: filter_sylpheed.cxx:53 filter_pmail.cxx:52 filter_plain.cxx:42
 msgid "No directory selected."
 msgstr "Dim cyfeiriadur wedi'i ddewis."
 
-#: filter_outlook.cxx:43 filter_plain.cxx:49 filter_pmail.cxx:57
-#: filter_opera.cxx:174
+#: filter_outlook.cxx:43 filter_opera.cxx:174 filter_pmail.cxx:57
+#: filter_plain.cxx:49
 msgid "Counting files..."
 msgstr "Yn cyfri ffeiliau..."
 
@@ -81,123 +61,95 @@
 msgid "Counting folders..."
 msgstr ""
 
-#: filter_outlook.cxx:47 filter_plain.cxx:53 filter_opera.cxx:65
+#: filter_outlook.cxx:47 filter_opera.cxx:65 filter_plain.cxx:53
 msgid "Importing new mail files..."
 msgstr "Yn mewnforio ffeiliau ebost newydd..."
 
-#: filter_outlook.cxx:48 filter_kmail_maildir.cxx:62
-#: filter_evolution_v2.cxx:70 filter_thebat.cxx:66 filter_thunderbird.cxx:70
-#: filter_sylpheed.cxx:61 filter_evolution.cxx:63 filter_opera.cxx:166
+#: filter_outlook.cxx:48 filter_thebat.cxx:66 filter_opera.cxx:166
+#: filter_evolution.cxx:63 filter_evolution_v2.cxx:71
+#: filter_thunderbird.cxx:69 filter_kmail_maildir.cxx:61
+#: filter_sylpheed.cxx:60
 msgid "No files found for import."
 msgstr ""
 
-#: filter_outlook.cxx:55 filter_mailapp.cxx:65 filter_evolution.cxx:144
-#: filter_opera.cxx:72 filter_mbox.cxx:59
+#: filter_outlook.cxx:55 filter_opera.cxx:72 filter_evolution.cxx:146
+#: filter_mailapp.cxx:65 filter_mbox.cxx:59
 #, kde-format
 msgid "Importing emails from %1..."
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_outlook.cxx:56 filter_kmail_maildir.cxx:83
-#: filter_evolution_v2.cxx:100 filter_thebat.cxx:83 filter_plain.cxx:80
-#: filter_thunderbird.cxx:99 filter_sylpheed.cxx:78 filter_evolution.cxx:194
-#: filter_opera.cxx:130
+#: filter_outlook.cxx:56 filter_thebat.cxx:83 filter_opera.cxx:130
+#: filter_evolution.cxx:196 filter_evolution_v2.cxx:101
+#: filter_thunderbird.cxx:100 filter_kmail_maildir.cxx:83
+#: filter_sylpheed.cxx:78 filter_plain.cxx:81
 #, kde-format
 msgid "1 duplicate message not imported"
 msgid_plural "%1 duplicate messages not imported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: filter_outlook.cxx:57 filter_mailapp.cxx:57 filter_evolution_v2.cxx:161
-#: filter_lnotes.cxx:87 filter_thebat.cxx:149 filter_pmail.cxx:162
-#: filter_pmail.cxx:230 filter_pmail.cxx:248 filter_pmail.cxx:287
-#: filter_thunderbird.cxx:160 filter_evolution.cxx:123 filter_opera.cxx:70
+#: filter_outlook.cxx:57 filter_thebat.cxx:150 filter_lnotes.cxx:88
+#: filter_opera.cxx:70 filter_evolution.cxx:125 filter_evolution_v2.cxx:162
+#: filter_thunderbird.cxx:163 filter_mailapp.cxx:57 filter_pmail.cxx:161
+#: filter_pmail.cxx:229 filter_pmail.cxx:247 filter_pmail.cxx:286
 #: filter_mbox.cxx:53
 #, kde-format
 msgid "Unable to open %1, skipping"
 msgstr "Methwyd agor %1, yn hepgor"
 
-#: kselfilterpage.cpp:99
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
-
-#: filter_kmail_maildir.cxx:25
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
+#: filter_oe.cxx:37
+msgid "Import Outlook Express Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_kmail_maildir.cxx:27
+#: filter_oe.cxx:39
 msgid ""
-"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
-"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
-"local KMail maildir (usually ~/Mail or ~/.kde/share/apps/kmail/mail ): in "
-"this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
-"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
-"possible to recreate the folder structure, the folders will be stored under: "
-"\"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:81 filter_mailapp.cxx:114
-#: filter_evolution_v2.cxx:98 filter_thebat.cxx:81 filter_plain.cxx:78
-#: filter_pmail.cxx:75 filter_thunderbird.cxx:97 filter_sylpheed.cxx:76
-#: filter_evolution.cxx:75 filter_opera.cxx:128 filter_mbox.cxx:135
-#, kde-format
-msgid "Finished importing emails from %1"
-msgstr "Gorffennwyd mewnforio ebostau o %1"
-
-#: filter_kmail_maildir.cxx:85 filter_mailapp.cxx:123
-#: filter_evolution_v2.cxx:102 filter_thebat.cxx:85 filter_plain.cxx:82
-#: filter_oe.cxx:99 filter_thunderbird.cxx:102 filter_sylpheed.cxx:80
-#: filter_opera.cxx:183 filter_mbox.cxx:141
-msgid "Finished import, canceled by user."
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x</li><li><i>Documents and Settings</i> in Windows 2000 or "
+"later</li></ul></p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders from Outlook Express 5 and 6 will be stored "
+"under: \"OE-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:155 filter_thebat.cxx:197 filter_sylpheed.cxx:139
+#: filter_oe.cxx:64
 #, kde-format
-msgid "Import folder %1..."
-msgstr ""
+msgid "No Outlook Express mailboxes found in directory %1."
+msgstr "Ni ganfuwyd blychau ebost Outlook Express yn y cyfeiriadur %1"
 
-#: filter_kmail_maildir.cxx:163 filter_kmail_maildir.cxx:168
-#: filter_plain.cxx:65 filter_plain.cxx:69 filter_sylpheed.cxx:152
-#: filter_sylpheed.cxx:157
-#, kde-format
-msgid "Could not import %1"
+#: filter_oe.cxx:79
+msgid "Import folder structure..."
 msgstr ""
 
-#: filter_mailapp.cxx:31
-msgid "Import From OS X Mail"
-msgstr ""
+#: filter_oe.cxx:98
+msgid "Finished importing Outlook Express emails"
+msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
 
-#: filter_mailapp.cxx:33
-msgid ""
-"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
-"Mail client in Apple Mac OS X.</p>"
+#: filter_oe.cxx:99 filter_thebat.cxx:85 filter_opera.cxx:183
+#: filter_evolution_v2.cxx:103 filter_thunderbird.cxx:103
+#: filter_kmail_maildir.cxx:85 filter_mailapp.cxx:123 filter_sylpheed.cxx:80
+#: filter_mbox.cxx:133 filter_plain.cxx:83
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_mailapp.cxx:116 filter_mbox.cxx:137
+#: filter_oe.cxx:116
 #, kde-format
-msgid "1 duplicate message not imported to folder %2 in KMail"
-msgid_plural "%1 duplicate messages not imported to folder %2 in KMail"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Unable to open mailbox %1"
+msgstr "Methwyd agor y blwch ebost %1"
 
-#: filter_evolution_v2.cxx:27
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
+#: filter_oe.cxx:127
+#, kde-format
+msgid "Importing OE4 Mailbox %1"
+msgstr "Yn mewnforio blwch ebost OE4 %1"
 
-#: filter_evolution_v2.cxx:29
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
-"your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p><p><b>Note:</b> Never choose a Folder which "
-"<u>does not</u> contain mbox-files (for example a maildir): if you do, you "
-"will get many new folders.</p><p>Since it is possible to recreate the folder "
-"structure, the folders will be stored under: \"Evolution-Import\".</p>"
-msgstr ""
+#: filter_oe.cxx:141
+#, kde-format
+msgid "Importing OE5+ Mailbox %1"
+msgstr "Yn mewnforio blwch ebost OE5+ %1"
 
-#: filter_evolution_v2.cxx:93 filter_evolution_v2.cxx:130
-#: filter_thunderbird.cxx:92 filter_thunderbird.cxx:128
+#: filter_oe.cxx:147
 #, kde-format
-msgid "Start import file %1..."
+msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
 #: filter_kmail_archive.cxx:32
@@ -278,6 +230,33 @@
 msgid "Importing the archive failed."
 msgstr ""
 
+#: filter_thebat.cxx:31
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thebat.cxx:81 filter_opera.cxx:128 filter_evolution.cxx:75
+#: filter_evolution_v2.cxx:99 filter_thunderbird.cxx:98
+#: filter_kmail_maildir.cxx:81 filter_mailapp.cxx:114 filter_sylpheed.cxx:76
+#: filter_pmail.cxx:75 filter_mbox.cxx:127 filter_plain.cxx:79
+#, kde-format
+msgid "Finished importing emails from %1"
+msgstr "Gorffennwyd mewnforio ebostau o %1"
+
+#: filter_thebat.cxx:198 filter_kmail_maildir.cxx:159 filter_sylpheed.cxx:139
+#, kde-format
+msgid "Import folder %1..."
+msgstr ""
+
 #: filter_lnotes.cxx:29
 msgid "Import Lotus Notes Emails"
 msgstr ""
@@ -297,30 +276,50 @@
 msgid "All Files (*)"
 msgstr ""
 
-#: filter_lnotes.cxx:63
+#: filter_lnotes.cxx:64
 #, kde-format
 msgid "Importing emails from %1"
 msgstr "Yn mewnforio ebostau o %1"
 
-#: filter_lnotes.cxx:107 filter_pmail.cxx:272
+#: filter_lnotes.cxx:108 filter_pmail.cxx:271
 #, kde-format
 msgid "Message %1"
 msgstr "Neges %1"
 
-#: filter_thebat.cxx:31
-msgid "Import The Bat! Mails and Folder Structure"
+#: filter_opera.cxx:27
+msgid "Import Opera Emails"
 msgstr ""
 
-#: filter_thebat.cxx:33
+#: filter_opera.cxx:29
 msgid ""
-"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
-"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
-"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
-"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
-"recreate the folder structure, the folders will be stored under: \"TheBat-"
-"Import\" in your local account.</p>"
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
 
+#: kmailcvt.cpp:38
+msgid "KMailCVT Import Tool"
+msgstr "Erfyn Mewnforio KMailCVT"
+
+#: kmailcvt.cpp:42
+msgid "Step 1: Select Filter"
+msgstr "Cam 1: Dewis Hidlen"
+
+#: kmailcvt.cpp:47
+msgid "Step 2: Importing..."
+msgstr "Cam 2: Mewnforio..."
+
+#: kmailcvt.cpp:91
+msgid "Import in progress"
+msgstr "Mewnforio ar waith"
+
+#: kmailcvt.cpp:95
+msgid "Import finished"
+msgstr "Mewnforio wedi gorffen"
+
 #: main.cpp:29
 msgid "KMailCVT"
 msgstr "KMailCVT"
@@ -369,68 +368,144 @@
 msgid "Port to Akonadi"
 msgstr ""
 
-#: filter_plain.cxx:25
-msgid "Import Plain Text Emails"
-msgstr "Mewnforio Ebostau Testun Plaen"
+#: filter_evolution.cxx:30
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
 
-#: filter_plain.cxx:27
+#: filter_evolution.cxx:32
 msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, "
-"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
-"emails.</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p>Dewiswch y cyfeiriadur sy'n cynnwys yr ebostau ar eich cysawd. Rhoddir yr "
-"ebostau mewn plygell â'r un enw a'r cyfeiriadur roeddent ynddi, â'r "
-"rhagddodiad PLAIN-</p><p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, "
-".eml, a .txt.</p>"
 
-#: filter_oe.cxx:37
-msgid "Import Outlook Express Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
+#: filter_evolution_v2.cxx:27
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr ""
 
-#: filter_oe.cxx:39
+#: filter_evolution_v2.cxx:29
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
-"the folder where the mailbox has been stored by searching for .dbx or .mbx "
-"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
-"9x</li><li><i>Documents and Settings</i> in Windows 2000 or "
-"later</li></ul></p><p><b>Note:</b> Since it is possible to recreate the "
-"folder structure, the folders from Outlook Express 5 and 6 will be stored "
-"under: \"OE-Import\" in your local folder.</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually "
+"~/.evolution/mail/local/).</p><p><b>Note:</b> Never choose a Folder which "
+"<u>does not</u> contain mbox-files (for example a maildir): if you do, you "
+"will get many new folders.</p><p>Since it is possible to recreate the folder "
+"structure, the folders will be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_oe.cxx:64
+#: filter_evolution_v2.cxx:94 filter_evolution_v2.cxx:131
+#: filter_thunderbird.cxx:93 filter_thunderbird.cxx:130
 #, kde-format
-msgid "No Outlook Express mailboxes found in directory %1."
-msgstr "Ni ganfuwyd blychau ebost Outlook Express yn y cyfeiriadur %1"
+msgid "Start import file %1..."
+msgstr ""
 
-#: filter_oe.cxx:79
-msgid "Import folder structure..."
+#: filter_thunderbird.cxx:27
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_oe.cxx:98
-msgid "Finished importing Outlook Express emails"
-msgstr "Gorffennwyd mewnforio ebostau Outlook Express"
+#: filter_thunderbird.cxx:29
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
 
-#: filter_oe.cxx:116
+#: filter_kmail_maildir.cxx:25
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr ""
+
+#: filter_kmail_maildir.cxx:27
+msgid ""
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.kde/share/apps/kmail/mail ): in "
+"this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
+msgstr ""
+
+#: filter_kmail_maildir.cxx:167 filter_kmail_maildir.cxx:172
+#: filter_sylpheed.cxx:152 filter_sylpheed.cxx:157 filter_plain.cxx:66
+#: filter_plain.cxx:70
 #, kde-format
-msgid "Unable to open mailbox %1"
-msgstr "Methwyd agor y blwch ebost %1"
+msgid "Could not import %1"
+msgstr ""
 
-#: filter_oe.cxx:127
+#: filters.cxx:174
 #, kde-format
-msgid "Importing OE4 Mailbox %1"
-msgstr "Yn mewnforio blwch ebost OE4 %1"
+msgid "<b>Error:</b> Could not add message to folder %1. Reason: %2"
+msgstr ""
 
-#: filter_oe.cxx:141
+#: filters.cxx:223
 #, kde-format
-msgid "Importing OE5+ Mailbox %1"
-msgstr "Yn mewnforio blwch ebost OE5+ %1"
+msgid ""
+"<b>Warning:</b> Could not check that the folder already exists. Reason: %1"
+msgstr ""
 
-#: filter_oe.cxx:147
+#: filters.cxx:242
 #, kde-format
-msgid "Importing OE5+ Folder file %1"
+msgid "<b>Error:</b> Could not create folder. Reason: %1"
+msgstr ""
+
+#: filters.cxx:274
+#, kde-format
+msgid ""
+"<b>Warning:</b> Could not fetch mail in folder %1. Reason: %2 You may have "
+"duplicate messages."
+msgstr ""
+
+#: filters.cxx:279
+#, kde-format
+msgid "<b>Warning:</b> Got an invalid message in folder %1."
+msgstr ""
+
+#: filters.cxx:347
+#, kde-format
+msgid "Error: failed to read temporary file at %1"
+msgstr ""
+
+#: filters.cxx:375
+msgid "<b>Warning:</b> Got a bad message folder, adding to root folder."
+msgstr ""
+
+#: filter_mailapp.cxx:31
+msgid "Import From OS X Mail"
+msgstr ""
+
+#: filter_mailapp.cxx:33
+msgid ""
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
+msgstr ""
+
+#: filter_mailapp.cxx:116 filter_mbox.cxx:129
+#, kde-format
+msgid "1 duplicate message not imported to folder %2 in KMail"
+msgid_plural "%1 duplicate messages not imported to folder %2 in KMail"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kselfilterpage.cpp:99
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
+
+#: filter_sylpheed.cxx:26
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr ""
+
+#: filter_sylpheed.cxx:28
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded.</p>"
 msgstr ""
 
 #: filter_pmail.cxx:28
@@ -464,68 +539,15 @@
 msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
 
-#: filter_pmail.cxx:172 filter_pmail.cxx:250
+#: filter_pmail.cxx:171 filter_pmail.cxx:249
 #, kde-format
 msgid "Importing %1"
 msgstr "Yn mewnforio %1"
 
-#: filter_pmail.cxx:283
+#: filter_pmail.cxx:282
 msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_thunderbird.cxx:27
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:29
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
-"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
-"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many "
-"new folders.</p><p>Since it is possible to recreate the folder structure, "
-"the folders will be stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_sylpheed.cxx:26
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_sylpheed.cxx:28
-msgid ""
-"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
-"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
-"possible to recreate the folder structure, the folders will be stored under: "
-"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
-"the status of message, e.g. new or forwarded.</p>"
-msgstr ""
-
-#: filter_evolution.cxx:30
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution.cxx:32
-msgid ""
-"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
-"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
-"recreate the folder structure, the folders will be stored under: \"Evolution-"
-"Import\".</p>"
-msgstr ""
-
-#: filter_opera.cxx:27
-msgid "Import Opera Emails"
-msgstr ""
-
-#: filter_opera.cxx:29
-msgid ""
-"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
-"Opera mail folder. Use this filter if you want to import all mails within a "
-"account in the Opera maildir.</p><p>Select the directory of the account "
-"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
-"imported into a folder named after the account they came from, prefixed with "
-"OPERA-</p>"
-msgstr ""
-
 #: filter_mbox.cxx:27
 msgid "Import mbox Files (UNIX, Evolution)"
 msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
@@ -548,42 +570,21 @@
 msgid "mbox Files (*)"
 msgstr ""
 
-#: filters.cxx:173
-#, kde-format
-msgid "<b>Error:</b> Could not add message to folder %1. Reason: %2"
-msgstr ""
-
-#: filters.cxx:220
-#, kde-format
-msgid ""
-"<b>Warning:</b> Could not check that the folder already exists. Reason: %1"
-msgstr ""
-
-#: filters.cxx:238
-#, kde-format
-msgid "<b>Error:</b> Could not create folder. Reason: %1"
-msgstr ""
+#: filter_plain.cxx:25
+msgid "Import Plain Text Emails"
+msgstr "Mewnforio Ebostau Testun Plaen"
 
-#: filters.cxx:267
-#, kde-format
+#: filter_plain.cxx:27
 msgid ""
-"<b>Warning:</b> Could not fetch mail in folder %1. Reason: %2 You may have "
-"duplicate messages."
-msgstr ""
-
-#: filters.cxx:272
-#, kde-format
-msgid "<b>Warning:</b> Got an invalid message in folder %1."
-msgstr ""
-
-#: filters.cxx:340
-#, kde-format
-msgid "Error: failed to read temporary file at %1"
-msgstr ""
-
-#: filters.cxx:368
-msgid "<b>Warning:</b> Got a bad message folder, adding to root folder."
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
+"<p>Dewiswch y cyfeiriadur sy'n cynnwys yr ebostau ar eich cysawd. Rhoddir yr "
+"ebostau mewn plygell â'r un enw a'r cyfeiriadur roeddent ynddi, â'r "
+"rhagddodiad PLAIN-</p><p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, "
+".eml, a .txt.</p>"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmail.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmail.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmail.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmail.po	2012-04-18 08:59:26.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kmail\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2009-07-18 17:52+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,3280 +18,3496 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:38+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: configagentdelegate.cpp:232
-msgid "Retrieval Options"
+#: kmail_options.h:12
+msgid "Set subject of message"
 msgstr ""
 
-#: archivefolderdialog.cpp:48
-msgctxt "Start of the filename for a mail archive file"
-msgid "Archive"
+#: kmail_options.h:14
+msgid "Send CC: to 'address'"
 msgstr ""
 
-#: archivefolderdialog.cpp:55
-msgid "Archive Folder"
+#: kmail_options.h:16
+msgid "Send BCC: to 'address'"
 msgstr ""
 
-#: archivefolderdialog.cpp:71
-msgid "&Folder:"
+#: kmail_options.h:18
+msgid "Add 'header' to message"
 msgstr ""
 
-#: archivefolderdialog.cpp:81
-msgid "F&ormat:"
+#: kmail_options.h:19
+msgid "Read message body from 'file'"
 msgstr ""
 
-#: archivefolderdialog.cpp:87
-msgid "Compressed Zip Archive (.zip)"
+#: kmail_options.h:20
+msgid "Set body of message"
 msgstr ""
 
-#: archivefolderdialog.cpp:88
-msgid "Uncompressed Archive (.tar)"
+#: kmail_options.h:21
+msgid "Add an attachment to the mail. This can be repeated"
 msgstr ""
 
-#: archivefolderdialog.cpp:89
-msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+#: kmail_options.h:22
+msgid "Only check for new mail"
 msgstr ""
 
-#: archivefolderdialog.cpp:90
-msgid "GZ-Compressed Tar Archive (.tar.gz)"
+#: kmail_options.h:23
+msgid "Only open composer window"
 msgstr ""
 
-#: archivefolderdialog.cpp:97
-msgid "&Archive File:"
+#: kmail_options.h:24
+msgid "View the given message file"
 msgstr ""
 
-#: archivefolderdialog.cpp:109
-msgid "&Delete folders after completion"
+#: kmail_options.h:25
+msgid "Send message to 'address' or attach the file the 'URL' points to"
 msgstr ""
 
-#: archivefolderdialog.cpp:158
-msgid "Please select the folder that should be archived."
+#: kmcomposewin.cpp:246
+msgid "Recipient auto-completion"
 msgstr ""
 
-#: archivefolderdialog.cpp:159
-msgid "No folder selected"
+#: kmcomposewin.cpp:246
+msgid "Distribution lists"
 msgstr ""
 
-#: kmmainwin.cpp:57
-msgid "New &Window"
-msgstr "&Ffenestr Newydd"
-
-#: kmmainwin.cpp:183
-msgid "Starting..."
+#: kmcomposewin.cpp:246
+msgid "Per-contact crypto preferences"
 msgstr ""
 
-#: identitydialog.cpp:108
-msgid "Edit Identity"
-msgstr "Golygu Dynodiad"
-
-#: identitydialog.cpp:141
-msgctxt "@title:tab General identity settings."
-msgid "General"
+#: kmcomposewin.cpp:253
+msgid "Select an identity for this message"
 msgstr ""
 
-#: identitydialog.cpp:152
-msgid "&Your name:"
-msgstr "&Eich enw:"
-
-#: identitydialog.cpp:155
-msgid ""
-"<qt><h3>Your name</h3><p>This field should contain your name as you would "
-"like it to appear in the email header that is sent out;</p><p>if you leave "
-"this blank your real name will not appear, only the email address.</p></qt>"
+#: kmcomposewin.cpp:260
+msgid "Select the dictionary to use when spell-checking this message"
 msgstr ""
 
-#: identitydialog.cpp:167
-msgid "Organi&zation:"
-msgstr "Mu&diad:"
-
-#: identitydialog.cpp:170
+#: kmcomposewin.cpp:267
 msgid ""
-"<qt><h3>Organization</h3><p>This field should have the name of your "
-"organization if you would like it to be shown in the email header that is "
-"sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
+"Select the sent-mail folder where a copy of this message will be saved"
 msgstr ""
 
-#: identitydialog.cpp:183
-msgid "&Email address:"
-msgstr "C&yfeiriad ebost:"
-
-#: identitydialog.cpp:186
-msgid ""
-"<qt><h3>Email address</h3><p>This field should have your full email "
-"address.</p><p>This address is the primary one, used for all outgoing mail. "
-"If you have more than one address, either create a new identity, or add "
-"additional alias addresses in the field below.</p><p>If you leave this "
-"blank, or get it wrong, people will have trouble replying to you.</p></qt>"
+#: kmcomposewin.cpp:272
+msgid "Select the outgoing account to use for sending this message"
 msgstr ""
 
-#: identitydialog.cpp:203
-msgid "Email a&liases:"
+#: kmcomposewin.cpp:278
+msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: identitydialog.cpp:206
-msgid ""
-"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
-"also be considered as belonging to this identity (as opposed to representing "
-"a different identity).</p><p>Example:</p><table><tr><th>Primary "
-"address:</th><td>first.last@example.org</td></tr><tr><th>Aliases:</th><td>fir"
-"st@example.org<br>last@example.org</td></tr></table><p>Type one alias "
-"address per line.</p></qt>"
+#: kmcomposewin.cpp:282
+msgid "Set the \"Reply-To:\" email address for this message"
 msgstr ""
 
-#: identitydialog.cpp:224
-msgid "Cryptography"
+#: kmcomposewin.cpp:295
+msgid "Set a subject for this message"
 msgstr ""
 
-#: identitydialog.cpp:233 identitydialog.cpp:258 identitydialog.cpp:284
-#: identitydialog.cpp:311
-msgid "Chang&e..."
-msgstr "Ne&wid..."
+#: kmcomposewin.cpp:296
+msgid "&Identity:"
+msgstr "&Dynodiad:"
 
-#: identitydialog.cpp:234
-msgid "Your OpenPGP Signature Key"
-msgstr ""
+#: kmcomposewin.cpp:297
+msgid "&Dictionary:"
+msgstr "&Geiriadur:"
 
-#: identitydialog.cpp:235
-msgid ""
-"Select the OpenPGP key which should be used to digitally sign your messages."
-msgstr ""
+#: kmcomposewin.cpp:298
+msgid "&Sent-Mail folder:"
+msgstr "Plygell Ebost Anfonedig:"
 
-#: identitydialog.cpp:239
-msgid ""
-"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
-"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
-"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
-"functions will not be affected.</p><p>You can find out more about keys at "
-"<a>http://www.gnupg.org</a></p></qt>"
-msgstr ""
+#: kmcomposewin.cpp:299
+msgid "&Mail transport:"
+msgstr "&Cludiant ebost:"
 
-#: identitydialog.cpp:246
-msgid "OpenPGP signing key:"
-msgstr ""
+#: kmcomposewin.cpp:300
+msgctxt "sender address field"
+msgid "&From:"
+msgstr "&Oddi wrth:"
 
-#: identitydialog.cpp:259
-msgid "Your OpenPGP Encryption Key"
-msgstr ""
+#: kmcomposewin.cpp:301
+msgid "&Reply to:"
+msgstr "&Ateb i:"
 
-#: identitydialog.cpp:260
-msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and "
-"for the \"Attach My Public Key\" feature in the composer."
+#: kmcomposewin.cpp:302
+msgctxt "@label:textbox Subject of email."
+msgid "S&ubject:"
 msgstr ""
 
-#: identitydialog.cpp:265
-msgid ""
-"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Public Key\" feature in the composer. You "
-"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
-"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
-"mail functions will not be affected.</p><p>You can find out more about keys "
-"at <a>http://www.gnupg.org</a></p></qt>"
+#: kmcomposewin.cpp:303
+msgctxt "@option:check Sticky identity."
+msgid "Sticky"
 msgstr ""
 
-#: identitydialog.cpp:272
-msgid "OpenPGP encryption key:"
+#: kmcomposewin.cpp:305
+msgid "Use the selected value as your identity for future messages"
 msgstr ""
 
-#: identitydialog.cpp:285
-msgid "Your S/MIME Signature Certificate"
+#: kmcomposewin.cpp:307
+msgid "Use the selected value as your sent-mail folder for future messages"
 msgstr ""
 
-#: identitydialog.cpp:286
-msgid ""
-"Select the S/MIME certificate which should be used to digitally sign your "
-"messages."
+#: kmcomposewin.cpp:309
+msgid "Use the selected value as your outgoing account for future messages"
 msgstr ""
 
-#: identitydialog.cpp:290
-msgid ""
-"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
-"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
-"be able to digitally sign emails using S/MIME; normal mail functions will "
-"not be affected.</p></qt>"
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your dictionary for future messages"
 msgstr ""
 
-#: identitydialog.cpp:295
-msgid "S/MIME signing certificate:"
-msgstr ""
+#: kmcomposewin.cpp:398 configuredialog.cpp:750
+msgid "Composer"
+msgstr "Cyfansoddydd"
 
-#: identitydialog.cpp:312
-msgid "Your S/MIME Encryption Certificate"
-msgstr ""
+#: kmcomposewin.cpp:1072 kmcomposewin.cpp:1098
+msgid "&Send Mail"
+msgstr "&Anfon Ebost"
 
-#: identitydialog.cpp:313
-msgid ""
-"Select the S/MIME certificate which should be used when encrypting to "
-"yourself and for the \"Attach My Certificate\" feature in the composer."
+#: kmcomposewin.cpp:1078 kmcomposewin.cpp:1103
+msgid "&Send Mail Via"
 msgstr ""
 
-#: identitydialog.cpp:318
-msgid ""
-"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
-"messages to yourself and for the \"Attach My Certificate\" feature in the "
-"composer.</p><p>You can leave this blank, but KMail will not be able to "
-"encrypt copies of outgoing messages to you using S/MIME; normal mail "
-"functions will not be affected.</p></qt>"
-msgstr ""
+#: kmcomposewin.cpp:1079
+msgid "Send"
+msgstr "Anfon"
 
-#: identitydialog.cpp:324
-msgid "S/MIME encryption certificate:"
-msgstr ""
+#: kmcomposewin.cpp:1082 kmcomposewin.cpp:1091 kmcomposewin.cpp:2780
+msgid "Send &Later"
+msgstr "Anfon yn &Nes Ymlaen"
 
-#: identitydialog.cpp:346
-msgctxt "preferred format of encrypted messages"
-msgid "Preferred format:"
+#: kmcomposewin.cpp:1085 kmcomposewin.cpp:1095
+msgid "Send &Later Via"
 msgstr ""
 
-#: identitydialog.cpp:360
-msgctxt "@title:tab Advanced identity settings."
-msgid "Advanced"
+#: kmcomposewin.cpp:1086
+msgctxt "Queue the message for sending at a later date"
+msgid "Queue"
 msgstr ""
 
-#: identitydialog.cpp:373
-msgid "&Reply-To address:"
-msgstr "&Cyfeiriad Ateb-I:"
+#: kmcomposewin.cpp:1130
+msgid "Save as &Draft"
+msgstr ""
 
-#: identitydialog.cpp:376
-msgid ""
-"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
-"contain a different email address to the normal <tt>From:</tt> "
-"address.</p><p>This can be useful when you have a group of people working "
-"together in similar roles. For example, you might want any emails sent to "
-"have your email in the <tt>From:</tt> field, but any responses to go to a "
-"group address.</p><p>If in doubt, leave this field blank.</p></qt>"
+#: kmcomposewin.cpp:1134
+msgid "Save as &Template"
 msgstr ""
-"<qt><h3>Cyfeiriadau Ateb-I</h3><p>Mae hwn yn gosod y penawd <tt>Ateb-i:</tt> "
-"i gynnwys cyfeiriad ebost gwahanol i'r cyfeiriad <tt>Oddiwrth:</tt> "
-"rferol.</p><p>Gall hyn fod yn ddefnyddiol pan mae gennych cylch o bobl sy'n "
-"gweithio efo'u gilydd mewn ffyrdd tebyg.  Er enghraifft, efallai hoffech i "
-"ebostau a anfonir gael eich cyfeiriad yn y maes <tt>Oddiwrth:</tt>, ond i "
-"ymatebion fynd i gyfeiriad cylch.</p><p>Os mewn amheuaeth, gadewch y maes "
-"yma'n wag.</p></qt>"
 
-#: identitydialog.cpp:394
-msgid "&BCC addresses:"
-msgstr "Cyfeiriadau &BCC:"
+#: kmcomposewin.cpp:1138
+msgid "&Insert Text File..."
+msgstr ""
 
-#: identitydialog.cpp:397
-msgid ""
-"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
-"enter here will be added to each outgoing mail that is sent with this "
-"identity. They will not be visible to other recipients.</p><p>This is "
-"commonly used to send a copy of each sent message to another account of "
-"yours.</p><p>To specify more than one address, use commas to separate the "
-"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
+#: kmcomposewin.cpp:1143
+msgid "&Insert Recent Text File"
 msgstr ""
 
-#: identitydialog.cpp:413
-msgid "D&ictionary:"
-msgstr "&Geiriadur:"
+#: kmcomposewin.cpp:1151 kmmainwidget.cpp:3173
+msgid "&Address Book"
+msgstr "&Llyfr Cyfeiriadau"
 
-#: identitydialog.cpp:422
-msgid "Sent-mail &folder:"
-msgstr "&Plygell ebost a anfonwyd:"
+#: kmcomposewin.cpp:1156
+msgid "&New Composer"
+msgstr "Cyfan&soddydd Newydd"
 
-#: identitydialog.cpp:431
-msgid "&Drafts folder:"
-msgstr "Plygell &brasluniau:"
+#: kmcomposewin.cpp:1160
+msgid "New Main &Window"
+msgstr "Prif Ffenest&r Newydd"
 
-#: identitydialog.cpp:440
-msgid "&Templates folder:"
+#: kmcomposewin.cpp:1164
+msgid "Select &Recipients..."
 msgstr ""
 
-#: identitydialog.cpp:446
-msgid "Special &transport:"
-msgstr "Cludiant &arbennig:"
-
-#: identitydialog.cpp:467
-msgid "&Use custom message templates for this identity"
+#: kmcomposewin.cpp:1168
+msgid "Save &Distribution List..."
 msgstr ""
 
-#: identitydialog.cpp:484 collectiontemplatespage.cpp:78
-msgid "&Copy Global Templates"
+#: kmcomposewin.cpp:1190
+msgid "Paste as Attac&hment"
 msgstr ""
 
-#: identitydialog.cpp:499 collectiontemplatespage.cpp:40
-msgid "Templates"
-msgstr ""
+#: kmcomposewin.cpp:1194
+msgid "Cl&ean Spaces"
+msgstr "Glan&hau Gofodnodau"
 
-#: identitydialog.cpp:507
-msgid "Signature"
-msgstr "Llofnod"
+#: kmcomposewin.cpp:1198
+msgid "Use Fi&xed Font"
+msgstr "Def&nyddio Wynebfath Penodol"
 
-#: identitydialog.cpp:516
-msgid "Picture"
+#: kmcomposewin.cpp:1205
+msgctxt "@action:inmenu Mark the email as urgent."
+msgid "&Urgent"
 msgstr ""
 
-#: identitydialog.cpp:600
-#, kde-format
-msgid "Invalid Email Alias \"%1\""
-msgstr ""
+#: kmcomposewin.cpp:1207
+msgid "&Request Disposition Notification"
+msgstr "&Gofyn am Hysbysiad Lleoliad"
 
-#: identitydialog.cpp:609 addressvalidationjob.cpp:71
-#: addressvalidationjob.cpp:80
-msgid "Invalid Email Address"
-msgstr "Cyfeiriad Ebost Annilys"
+#: kmcomposewin.cpp:1213
+msgid "&Wordwrap"
+msgstr "&Amlapio testun"
 
-#: identitydialog.cpp:644
-#, kde-format
-msgid ""
-"One of the configured OpenPGP signing keys does not contain any user ID with "
-"the configured email address for this identity (%1).\n"
-"This might result in warning messages on the receiving side when trying to "
-"verify signatures made with this configuration."
+#: kmcomposewin.cpp:1218
+msgid "&Snippets"
 msgstr ""
 
-#: identitydialog.cpp:652
-#, kde-format
-msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID "
-"with the configured email address for this identity (%1)."
-msgstr ""
+#: kmcomposewin.cpp:1225
+msgid "&Automatic Spellchecking"
+msgstr "G&wirio Sillafu Ymysgogol"
 
-#: identitydialog.cpp:658
-#, kde-format
-msgid ""
-"One of the configured S/MIME signing certificates does not contain the "
-"configured email address for this identity (%1).\n"
-"This might result in warning messages on the receiving side when trying to "
-"verify signatures made with this configuration."
+#: kmcomposewin.cpp:1244
+msgid "Formatting (HTML)"
 msgstr ""
 
-#: identitydialog.cpp:666
-#, kde-format
-msgid ""
-"One of the configured S/MIME encryption certificates does not contain the "
-"configured email address for this identity (%1)."
+#: kmcomposewin.cpp:1245
+msgid "HTML"
 msgstr ""
 
-#: identitydialog.cpp:674
-msgid "Email Address Not Found in Key/Certificates"
-msgstr ""
+#: kmcomposewin.cpp:1249
+msgid "&All Fields"
+msgstr "&Pob Maes"
 
-#: identitydialog.cpp:689
-msgid "The signature file is not valid"
-msgstr ""
+#: kmcomposewin.cpp:1252
+msgid "&Identity"
+msgstr "&dynodiad"
 
-#: identitydialog.cpp:711
-#, kde-format
-msgid "Edit Identity \"%1\""
-msgstr "Golygu Dynodiad \"%1\""
+#: kmcomposewin.cpp:1255
+msgid "&Dictionary"
+msgstr "&Geiriadur"
 
-#: identitydialog.cpp:741
-#, kde-format
-msgid ""
-"The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
-"therefore, the default sent-mail folder will be used."
-msgstr ""
+#: kmcomposewin.cpp:1258
+msgid "&Sent-Mail Folder"
+msgstr "&Plygell Ebostau Anfonedig"
 
-#: identitydialog.cpp:753
-#, kde-format
-msgid ""
-"The custom drafts folder for identity \"%1\" does not exist (anymore); "
-"therefore, the default drafts folder will be used."
+#: kmcomposewin.cpp:1261
+msgid "&Mail Transport"
+msgstr "&Cludiant Ebost"
+
+#: kmcomposewin.cpp:1264
+msgid "&From"
+msgstr "&Oddiwrth"
+
+#: kmcomposewin.cpp:1267
+msgid "&Reply To"
+msgstr "&Ateb I"
+
+#: kmcomposewin.cpp:1271
+msgctxt "@action:inmenu Show the subject in the composer window."
+msgid "S&ubject"
 msgstr ""
 
-#: identitydialog.cpp:765
-#, kde-format
-msgid ""
-"The custom templates folder for identity \"%1\" does not exist (anymore); "
-"therefore, the default templates folder will be used."
+#: kmcomposewin.cpp:1276
+msgid "Append S&ignature"
+msgstr "Atodi &Llofnod"
+
+#: kmcomposewin.cpp:1279
+msgid "Pr&epend Signature"
 msgstr ""
 
-#: codecaction.cpp:58
-msgctxt "Encodings menu"
-msgid "us-ascii"
+#: kmcomposewin.cpp:1282
+msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: codecaction.cpp:68
-msgctxt "Menu item"
-msgid "Encoding"
+#: kmcomposewin.cpp:1294
+msgid "&Spellchecker..."
+msgstr "Gwirydd &Sillafu..."
+
+#: kmcomposewin.cpp:1295
+msgid "Spellchecker"
+msgstr "Gwirydd Sillafu"
+
+#: kmcomposewin.cpp:1300 kmcomposewin.cpp:1302
+msgid "Encrypt Message with Chiasmus..."
 msgstr ""
 
-#: messageactions.cpp:65
-msgctxt "Message->"
-msgid "&Reply"
-msgstr "&Ateb"
+#: kmcomposewin.cpp:1310
+msgid "&Encrypt Message"
+msgstr "C&êl-ysgrifo Neges"
 
-#: messageactions.cpp:70 searchwindow.cpp:302
-msgid "&Reply..."
-msgstr "A&teb..."
+#: kmcomposewin.cpp:1311
+msgid "Encrypt"
+msgstr "Cêl-ysgrifo"
 
-#: messageactions.cpp:77
-msgid "Reply to A&uthor..."
-msgstr "Ateb i'r A&wdur"
+#: kmcomposewin.cpp:1313
+msgid "&Sign Message"
+msgstr "Llof&odi Neges"
 
-#: messageactions.cpp:84 searchwindow.cpp:306
-msgid "Reply to &All..."
-msgstr "Ateb i &Bawb..."
+#: kmcomposewin.cpp:1314
+msgid "Sign"
+msgstr "Llofnodi"
 
-#: messageactions.cpp:91 searchwindow.cpp:310
-msgid "Reply to Mailing-&List..."
-msgstr "Ateb i &Rhestr Ebost..."
+#: kmcomposewin.cpp:1338
+msgid "&Cryptographic Message Format"
+msgstr ""
 
-#: messageactions.cpp:98
-msgid "Reply Without &Quote..."
-msgstr "Ateb heb &Dyfynnu..."
+#: kmcomposewin.cpp:1342
+msgid "Select a cryptographic format for this message"
+msgstr ""
 
-#: messageactions.cpp:105
-msgid "Create To-do/Reminder..."
+#: kmcomposewin.cpp:1344
+msgid "Reset Font Settings"
 msgstr ""
 
-#: messageactions.cpp:106
-msgid "Create To-do"
+#: kmcomposewin.cpp:1345
+msgid "Reset Font"
 msgstr ""
 
-#: messageactions.cpp:107
-msgid "Allows you to create a calendar to-do or reminder from this message"
+#: kmcomposewin.cpp:1361
+msgid "Configure KMail..."
 msgstr ""
 
-#: messageactions.cpp:108
-msgid ""
-"This option starts the KOrganizer to-do editor with initial values taken "
-"from the currently selected message. Then you can edit the to-do to your "
-"liking before saving it to your calendar."
+#: kmcomposewin.cpp:1394
+#, kde-format
+msgid " Spellcheck: %1 "
 msgstr ""
 
-#: messageactions.cpp:115
-msgid "Mar&k Message"
-msgstr "No&di Neges"
+#: kmcomposewin.cpp:1395 kmcomposewin.cpp:3141
+#, kde-format
+msgid " Column: %1 "
+msgstr " Colofn: %1 "
 
-#: messageactions.cpp:133
-msgid "&Edit Message"
-msgstr "G&olygu Neges"
+#: kmcomposewin.cpp:1397 kmcomposewin.cpp:3139
+#, kde-format
+msgctxt "Shows the linenumber of the cursor position."
+msgid " Line: %1 "
+msgstr ""
 
-#: messageactions.cpp:139 messageactions.cpp:549
-msgid "Add Note..."
+#: kmcomposewin.cpp:1753
+msgid "Re&save as Template"
 msgstr ""
 
-#: messageactions.cpp:146 searchwindow.cpp:314
-msgctxt "Message->"
-msgid "&Forward"
-msgstr "&Blaenyrru"
+#: kmcomposewin.cpp:1754
+msgid "&Save as Draft"
+msgstr "&Cadw fel Drafft"
 
-#: messageactions.cpp:151
-msgctxt "@action:inmenu Message->Forward->"
-msgid "As &Attachment..."
+#: kmcomposewin.cpp:1756
+msgid ""
+"Resave this message in the Templates folder. It can then be used at a later "
+"time."
 msgstr ""
 
-#: messageactions.cpp:159
-msgctxt "@action:inmenu Message->Forward->"
-msgid "&Inline..."
+#: kmcomposewin.cpp:1758
+msgid ""
+"Save this message in the Drafts folder. It can then be edited and sent at a "
+"later time."
 msgstr ""
 
-#: messageactions.cpp:167
-msgctxt "Message->Forward->"
-msgid "&Redirect..."
-msgstr "Ail-&gyfeirio..."
+#: kmcomposewin.cpp:1762
+msgid "Do you want to save the message for later or discard it?"
+msgstr ""
 
-#: messageactions.cpp:176
-msgctxt "Message->"
-msgid "Mailing-&List"
+#: kmcomposewin.cpp:1763
+msgid "Close Composer"
 msgstr ""
 
-#: messageactions.cpp:332
-msgid "Open Message in List Archive"
+#: kmcomposewin.cpp:1896
+msgid "Sending Message Failed"
 msgstr ""
 
-#: messageactions.cpp:334
-msgid "Post New Message"
+#: kmcomposewin.cpp:2107
+msgid "Add as &Inline Image"
 msgstr ""
 
-#: messageactions.cpp:336
-msgid "Go to Archive"
+#: kmcomposewin.cpp:2108
+msgid "Add as &Attachment"
 msgstr ""
 
-#: messageactions.cpp:338
-msgid "Request Help"
+#: kmcomposewin.cpp:2124 kmcomposewin.cpp:2201
+msgid "Name of the attachment:"
 msgstr ""
 
-#: messageactions.cpp:340
-msgctxt "Contact the owner of the mailing list"
-msgid "Contact Owner"
+#: kmcomposewin.cpp:2161
+msgid "Add URL into Message &Text"
+msgid_plural "Add URLs into Message &Text"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kmcomposewin.cpp:2162
+msgid "Add File as &Attachment"
+msgid_plural "Add Files as &Attachment"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kmcomposewin.cpp:2200
+msgid "Insert clipboard text as attachment"
 msgstr ""
 
-#: messageactions.cpp:342 mailinglistpropertiesdialog.cpp:152
-msgid "Subscribe to List"
+#: kmcomposewin.cpp:2387
+msgid "unnamed"
+msgstr "di-enw"
+
+#: kmcomposewin.cpp:2415
+msgid ""
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: messageactions.cpp:344
-msgid "Unsubscribe from List"
+#: kmcomposewin.cpp:2422
+msgid "Undefined Encryption Key"
+msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
+
+#: kmcomposewin.cpp:2466
+msgid ""
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: messageactions.cpp:502
-msgid "email"
+#: kmcomposewin.cpp:2473
+msgid "Undefined Signing Key"
+msgstr "Allwedd Lofnodi heb ei Diffinio"
+
+#: kmcomposewin.cpp:2566
+msgid ""
+"KMail is currently in offline mode. Your messages will be kept in the outbox "
+"until you go online."
 msgstr ""
 
-#: messageactions.cpp:505
-msgid "web"
+#: kmcomposewin.cpp:2568 kmkernel.cpp:1011
+msgid "Online/Offline"
 msgstr ""
 
-#: messageactions.cpp:508
-#, kde-format
-msgctxt ""
-"%1 is a 'Contact Owner' or similar action. %2 is a protocol normally web or "
-"email though could be irc/ftp or other url variant"
-msgid "%1 (%2)"
+#: kmcomposewin.cpp:2580
+msgid ""
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: messageactions.cpp:551
-msgid "Edit Note..."
+#: kmcomposewin.cpp:2589
+msgid ""
+"You must specify at least one receiver, either in the To: field or as CC or "
+"as BCC."
 msgstr ""
 
-#: kmknotify.cpp:42
-msgid "Notification"
+#: kmcomposewin.cpp:2595
+msgid "To: field is empty. Send message anyway?"
 msgstr ""
 
-#: collectiontemplatespage.cpp:63
-msgid "&Use custom message templates in this folder"
+#: kmcomposewin.cpp:2597
+msgid "No To: specified"
 msgstr ""
 
-#: kmreaderwin.cpp:149
-msgid "New Message To..."
-msgstr "Neges Newydd I..."
+#: kmcomposewin.cpp:2611
+msgid "You did not specify a subject. Send message anyway?"
+msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
 
-#: kmreaderwin.cpp:156
-msgid "Reply To..."
-msgstr "Ateb I..."
+#: kmcomposewin.cpp:2613
+msgid "No Subject Specified"
+msgstr "Ni Phenodwyd Pwnc"
 
-#: kmreaderwin.cpp:163
-msgid "Forward To..."
-msgstr "Blaenyrru I..."
+#: kmcomposewin.cpp:2614
+msgid "S&end as Is"
+msgstr "A&nfon e"
 
-#: kmreaderwin.cpp:170
-msgid "Add to Address Book"
-msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
+#: kmcomposewin.cpp:2615
+msgid "&Specify the Subject"
+msgstr ""
 
-#: kmreaderwin.cpp:177
-msgid "Open in Address Book"
-msgstr "Agor yn y Lyfr Cyfeiriadau"
+#: kmcomposewin.cpp:2643
+msgid ""
+"You must specify at least one receiver in order to be able to encrypt a "
+"draft."
+msgstr ""
 
-#: kmreaderwin.cpp:182
-msgid "Bookmark This Link"
-msgstr "Tudnodi'r Cyswllt Yma"
+#: kmcomposewin.cpp:2777
+msgid "About to send email..."
+msgstr "Ar fin anfon ebost..."
 
-#: kmreaderwin.cpp:188
-msgid "Save Link As..."
-msgstr "Cadw'r Cyswllt Fel..."
+#: kmcomposewin.cpp:2778
+msgid "Send Confirmation"
+msgstr "Anfon Cadarnhad"
 
-#: kmreaderwin.cpp:193 kmmainwidget.cpp:3049
-msgid "&Find in Message..."
-msgstr "&Canfod mewn Neges..."
+#: kmcomposewin.cpp:2779
+msgid "&Send Now"
+msgstr "Anfo&n Rwan"
 
-#: kmreaderwin.cpp:244
+#: kmcomposewin.cpp:2798
+#, kde-format
 msgid ""
-"KMail is now based on the Akonadi Personal Information Management framework, "
-"which brings many changes all around."
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
 msgstr ""
 
-#: kmreaderwin.cpp:255
-msgid "Push email (IMAP IDLE)"
+#: kmcomposewin.cpp:2799
+msgid "Too many recipients"
 msgstr ""
 
-#: kmreaderwin.cpp:256
-msgid "Improved virtual folders"
-msgstr ""
+#: kmcomposewin.cpp:2800
+msgid "&Send as Is"
+msgstr "&Anfon e"
 
-#: kmreaderwin.cpp:257
-msgid "Improved searches"
+#: kmcomposewin.cpp:2801
+msgid "&Edit Recipients"
 msgstr ""
 
-#: kmreaderwin.cpp:258
-msgid "Support for adding notes (annotations) to mails"
+#: kmcomposewin.cpp:2844
+msgid ""
+"Turning HTML mode off will cause the text to lose the formatting. Are you "
+"sure?"
 msgstr ""
 
-#: kmreaderwin.cpp:259
-msgid "Tag folders"
+#: kmcomposewin.cpp:2846
+msgid "Lose the formatting?"
 msgstr ""
 
-#: kmreaderwin.cpp:260
-msgid "Less GUI freezes, mail checks happen in the background"
+#: kmcomposewin.cpp:2846
+msgid "Lose Formatting"
 msgstr ""
 
-#: kmreaderwin.cpp:288
-msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please wait . "
-". .</p>&nbsp;"
+#: kmcomposewin.cpp:2901
+msgid "Spellcheck: on"
 msgstr ""
 
-#: kmreaderwin.cpp:296
-msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
-"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
+#: kmcomposewin.cpp:2903
+msgid "Spellcheck: off"
 msgstr ""
 
-#: kmreaderwin.cpp:312
-#, kde-format
-msgctxt ""
-"%1: KMail version; %2: help:// URL; %3: generated list of new features; %4: "
-"First-time user text (only shown on first start); %5: generated list of "
-"important changes; --- end of comment ---"
-msgid ""
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
-"client by KDE.It is designed to be fully compatible with Internet mailing "
-"standards including MIME, SMTP, POP3, and IMAP.</p>\n"
-"<ul><li>KMail has many powerful features which are described in the <a "
-"href=\"%2\">documentation</a></li>\n"
-"%5\n"
-"%3\n"
-"%4\n"
-"<p>We hope that you will enjoy KMail.</p>\n"
-"<p>Thank you,</p>\n"
-"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
+#: kmcomposewin.cpp:3129
+msgid "OVR"
 msgstr ""
 
-#: kmreaderwin.cpp:329
-#, kde-format
-msgid ""
-"<p>Some of the new features in this release of KMail include (compared to "
-"KMail %1, which is part of KDE Software Compilation %2):</p>\n"
+#: kmcomposewin.cpp:3129
+msgid "INS"
 msgstr ""
 
-#: kmreaderwin.cpp:342
+#: kmcomposewin.cpp:3185
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
-"&gt;Configure KMail.\n"
-"You need to create at least a default identity and an incoming as well as "
-"outgoing mail account.</p>\n"
+"Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
-"<p>Arhoswch am eiliad i lenwi'r panel ffurfweddiad KMail wrth Gosodiadau-"
-"&gt;Ffurfweddu KMail.\n"
-"Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a "
-"chyfrif ebost anfon.</p>\n"
 
-#: kmreaderwin.cpp:354
-#, kde-format
+#: kmcomposewin.cpp:3189
 msgid ""
-"<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
-"(compared to KMail %1):</p>\n"
+"It looks as though libkleopatra was compiled without Chiasmus support. You "
+"might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmreaderwin.cpp:359
-#, kde-format
-msgid "<li>%1</li>\n"
-msgstr "<li>%1</li>\n"
-
-#: kmsystemtray.cpp:74 kmsystemtray.cpp:123
-#: mailinglistpropertiesdialog.cpp:111 aboutdata.cpp:240 kmstartup.cpp:103
-msgid "KMail"
-msgstr "KMail"
-
-#: kmsystemtray.cpp:281
-msgid "New Messages In"
+#: kmcomposewin.cpp:3192
+msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmsystemtray.cpp:381
-msgid "There are no unread messages"
+#: kmcomposewin.cpp:3198
+msgid ""
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmsystemtray.cpp:382
-#, kde-format
-msgid "1 unread message"
-msgid_plural "%1 unread messages"
-msgstr[0] ""
-msgstr[1] ""
-
-#: collectionquotapage.cpp:52
-msgid "Quota"
+#: kmcomposewin.cpp:3200 kmcomposewin.cpp:3205 kmcomposewin.cpp:3214
+msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:56
-msgid "Mailinglist Folder Properties"
+#: kmcomposewin.cpp:3211
+msgid ""
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:70
-msgid "Associated Mailing List"
-msgstr "Rhestr Ebost Gysylltiedig"
-
-#: mailinglistpropertiesdialog.cpp:79
-msgid "&Folder holds a mailing list"
-msgstr "Cynhwysa'r &blygell restr ebost"
-
-#: mailinglistpropertiesdialog.cpp:86
-msgid "Detect Automatically"
+#: kmcomposewin.cpp:3220
+msgid ""
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:94
-msgid "Mailing list description:"
+#: kmcomposewin.cpp:3223
+msgid "No Chiasmus Keys Found"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:105
-msgid "Preferred handler:"
+#: kmcomposewin.cpp:3227
+msgid "Chiasmus Encryption Key Selection"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:112
-msgid "Browser"
-msgstr "Porydd"
-
-#: mailinglistpropertiesdialog.cpp:119
-msgid "&Address type:"
+#: kmcomposewin.cpp:3255
+msgid "Message will be signed"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:132
-msgid "Invoke Handler"
+#: kmcomposewin.cpp:3256
+msgid "Message will not be signed"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:151
-msgid "Post to List"
+#: kmcomposewin.cpp:3258
+msgid "Message will be encrypted"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:153
-msgid "Unsubscribe From List"
+#: kmcomposewin.cpp:3259
+msgid "Message will not be encrypted"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:154
-msgid "List Archives"
+#: snippetwidget.cpp:74
+msgid "Text Snippets"
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:155
-msgid "List Help"
+#: secondarywindow.cpp:88
+msgctxt "Document/application separator in titlebar"
+msgid " – "
 msgstr ""
 
-#: mailinglistpropertiesdialog.cpp:174
-msgid "Not available"
-msgstr "Dim ar gael"
+#: aboutdata.cpp:52
+msgid "Maintainer"
+msgstr "Cynhaliwr"
 
-#: mailinglistpropertiesdialog.cpp:232 mailinglistpropertiesdialog.cpp:265
-msgid "Not available."
-msgstr "Nid yw ar gael."
+#: aboutdata.cpp:54 aboutdata.cpp:58 aboutdata.cpp:60
+msgid "Former maintainer"
+msgstr "Cyn-gynhaliwr"
 
-#: mailinglistpropertiesdialog.cpp:262
-msgid ""
-"KMail was unable to detect a mailing list in this folder. Please fill the "
-"addresses by hand."
-msgstr ""
+#: aboutdata.cpp:56
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
 
-#: undostack.cpp:100
-msgid "There is nothing to undo."
+#: aboutdata.cpp:62
+msgid "Former co-maintainer"
 msgstr ""
 
-#: undostack.cpp:107
-#, kde-format
-msgid "Can not move message. %1"
+#: aboutdata.cpp:65 aboutdata.cpp:67
+msgid "Core developer"
+msgstr "Datblygwr craidd"
+
+#: aboutdata.cpp:69 aboutdata.cpp:71 aboutdata.cpp:73
+msgid "Former core developer"
 msgstr ""
 
-#: simplestringlisteditor.cpp:58
-msgid "New entry:"
-msgstr "Cofnod newydd:"
+#: aboutdata.cpp:75
+msgid "Documentation"
+msgstr "Dogfennaeth"
 
-#. i18n: file: ui/identitypage.ui:27
-#. i18n: ectx: property (text), widget (QPushButton, mButtonAdd)
-#: simplestringlisteditor.cpp:77 rc.cpp:327
-msgid "&Add..."
-msgstr "&Ychwanegu..."
+#: aboutdata.cpp:82
+msgid "system tray notification"
+msgstr "hysbysiad cafn cysawd"
 
-#: simplestringlisteditor.cpp:88 identitypage.cpp:225
-msgid "&Remove"
+#: aboutdata.cpp:98
+msgid "PGP 6 support and further enhancements of the encryption support"
+msgstr "Cynhaliaeth PGP 6 ac ychwanegion pellach i gynnal cêl-ysgrifennaeth"
+
+#: aboutdata.cpp:108
+msgid "Original encryption support<br/>PGP 2 and PGP 5 support"
 msgstr ""
 
-#. i18n: file: ui/identitypage.ui:40
-#. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
-#. i18n: file: ui/accountspagereceivingtab.ui:46
-#. i18n: ectx: property (text), widget (KPushButton, mModifyAccountButton)
-#: simplestringlisteditor.cpp:100 configuredialog.cpp:2644 rc.cpp:333
-#: rc.cpp:476
-msgid "&Modify..."
-msgstr "&Addasu..."
+#: aboutdata.cpp:111
+msgid "GnuPG support"
+msgstr "Cynhaliaeth GnuPG"
 
-#: simplestringlisteditor.cpp:205
-msgid "New Value"
-msgstr "Gwerth Newydd"
+#: aboutdata.cpp:139
+msgid "New message list and new folder tree"
+msgstr ""
 
-#: simplestringlisteditor.cpp:228
-msgid "Change Value"
-msgstr "Newid Gwerth"
+#: aboutdata.cpp:178
+msgid "Anti-virus support"
+msgstr ""
 
-#: searchwindow.cpp:93
-msgid "Find Messages"
+#: aboutdata.cpp:187 aboutdata.cpp:234
+msgid "POP filters"
+msgstr "Hidlenni POP"
+
+#: aboutdata.cpp:208
+msgid "Usability tests and improvements"
 msgstr ""
 
-#: searchwindow.cpp:96
-msgctxt "@action:button Search for messages"
-msgid "&Search"
+#: aboutdata.cpp:214 aboutdata.cpp:228
+msgid "Ägypten and Kroupware project management"
+msgstr "Rheoli cyweithiau Ägypten a Kroupware"
+
+#: aboutdata.cpp:217
+msgid "Improved HTML support"
 msgstr ""
 
-#: searchwindow.cpp:112
-msgid "Search in &all local folders"
-msgstr "Chwilio mewn &pob un blyfell leol"
+#: aboutdata.cpp:219
+msgid "beta testing of PGP 6 support"
+msgstr "profi beta cynhaliaeth PGP 6"
 
-#: searchwindow.cpp:116
-msgid "Search &only in:"
-msgstr "Chwilio yn &unig yn:"
+#: aboutdata.cpp:226
+msgid "timestamp for 'Transmission completed' status messages"
+msgstr "cofnod amser am negeseuon cyflwr 'Trosglwyddiad wedi'i gwblhau'"
 
-#: searchwindow.cpp:125
-msgid "I&nclude sub-folders"
-msgstr "C&ynnwys is-blygyll"
+#: aboutdata.cpp:230
+msgid "multiple encryption keys per address"
+msgstr "allweddau cêl-ysgrifennaeth lluosol am bob cyfeiriad"
 
-#: searchwindow.cpp:223
-msgid "Search folder &name:"
-msgstr "&Enw'r blygell chwilio:"
+#: aboutdata.cpp:240 mailinglistpropertiesdialog.cpp:113 kmsystemtray.cpp:65
+#: kmsystemtray.cpp:113 kmstartup.cpp:103
+msgid "KMail"
+msgstr "KMail"
 
-#: searchwindow.cpp:233 searchwindow.cpp:491
-msgid "Last Search"
-msgstr "Chwiliad Diwethaf"
+#: aboutdata.cpp:241
+msgid "KDE Email Client"
+msgstr "Dibynnydd Ebost KDE"
 
-#: searchwindow.cpp:243
-msgid "Op&en Search Folder"
+#: aboutdata.cpp:242
+msgid "Copyright © 1997–2011, KMail authors"
 msgstr ""
 
-#: searchwindow.cpp:252
-msgid "Open &Message"
+#: foldershortcutactionmanager.cpp:135 foldershortcutactionmanager.cpp:136
+#, kde-format
+msgid "Folder Shortcut %1"
 msgstr ""
 
-#: searchwindow.cpp:263
-msgid "AMiddleLengthText..."
-msgstr "TestunOHydCanolig..."
-
-#: searchwindow.cpp:264
-msgctxt "@info:status finished searching."
-msgid "Ready."
+#: antispamwizard.cpp:114
+msgid "Anti-Spam Wizard"
 msgstr ""
 
-#: searchwindow.cpp:319
-msgctxt "@action:inmenu Forward message inline."
-msgid "&Inline..."
+#: antispamwizard.cpp:115
+msgid "Anti-Virus Wizard"
 msgstr ""
 
-#: searchwindow.cpp:324
-msgctxt "Message->Forward->"
-msgid "As &Attachment..."
-msgstr "&Fel Atodiad..."
-
-#: searchwindow.cpp:338
-msgid "Save Attachments..."
-msgstr "Cadw Atodiadau...."
-
-#: searchwindow.cpp:344
-msgid "Clear Selection"
-msgstr "Gwagu Dewisiad"
-
-#: searchwindow.cpp:444
-msgctxt "Search finished."
-msgid "Done"
+#: antispamwizard.cpp:119
+msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr ""
 
-#: searchwindow.cpp:445 searchwindow.cpp:452
-#, kde-format
-msgid "%1 match"
-msgid_plural "%1 matches"
-msgstr[0] "%1 cydweddiad"
-msgstr[1] "%1 o gydweddiadau"
-
-#: searchwindow.cpp:447
-msgid "Search canceled"
-msgstr "Diddymwyd y chwiliad"
-
-#: searchwindow.cpp:448
-#, kde-format
-msgid "%1 match so far"
-msgid_plural "%1 matches so far"
-msgstr[0] ""
-msgstr[1] ""
-
-#: searchwindow.cpp:453
-#, kde-format
-msgid "Searching in %1"
+#: antispamwizard.cpp:120
+msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr ""
 
-#: searchwindow.cpp:557
-#, kde-format
-msgid "Can not get search result. %1"
+#: antispamwizard.cpp:126
+msgid "Options to fine-tune the handling of spam messages"
 msgstr ""
 
-#: searchwindow.cpp:682
-msgid ""
-"There was a problem renaming your search folder. A common reason for this is "
-"that another search folder with the same name already exists."
+#: antispamwizard.cpp:131
+msgid "Summary of changes to be made by this wizard"
 msgstr ""
 
-#: searchwindow.cpp:789
-#, kde-format
-msgid "Copy Message"
-msgid_plural "Copy %1 Messages"
-msgstr[0] ""
-msgstr[1] ""
+#: antispamwizard.cpp:135
+msgid "Options to fine-tune the handling of virus messages"
+msgstr ""
 
-#: searchwindow.cpp:792
-#, kde-format
-msgid "Cut Message"
-msgid_plural "Cut %1 Messages"
-msgstr[0] ""
-msgstr[1] ""
+#: antispamwizard.cpp:213
+msgid "Virus handling"
+msgstr ""
 
-#: collectionaclpage.cpp:101
-msgid "Access Control"
+#: antispamwizard.cpp:303 antispamwizard.cpp:305 antispamwizard.cpp:638
+msgid "Spam Handling"
 msgstr ""
 
-#: foldershortcutactionmanager.cpp:132 foldershortcutactionmanager.cpp:133
-#, kde-format
-msgid "Folder Shortcut %1"
+#: antispamwizard.cpp:345 antispamwizard.cpp:347 antispamwizard.cpp:654
+msgid "Semi spam (unsure) handling"
 msgstr ""
 
-#: kmcommands.cpp:293
-msgid "Please wait"
-msgstr "Disgwyliwch"
+#: antispamwizard.cpp:409 antispamwizard.cpp:411 antispamwizard.cpp:662
+msgid "Classify as Spam"
+msgstr ""
 
-#: kmcommands.cpp:294 kmcommands.cpp:366
-#, kde-format
-msgid "Please wait while the message is transferred"
-msgid_plural "Please wait while the %1 messages are transferred"
-msgstr[0] ""
-msgstr[1] ""
+#: antispamwizard.cpp:420
+msgid "Spam"
+msgstr "Ebostach"
 
-#: kmcommands.cpp:523
-#, kde-format
-msgctxt "@info"
-msgid "File <filename>%1</filename> exists.<nl/>Do you want to replace it?"
+#: antispamwizard.cpp:454 antispamwizard.cpp:456 antispamwizard.cpp:664
+msgid "Classify as NOT Spam"
 msgstr ""
 
-#: kmcommands.cpp:524
-msgid "Save to File"
-msgstr "Cadw i Ffeil"
-
-#: kmcommands.cpp:524
-msgid "&Replace"
-msgstr "&Amnewid"
+#: antispamwizard.cpp:465
+msgid "Ham"
+msgstr "Ebost iawn"
 
-#: kmcommands.cpp:666
-msgid "Open Message"
+#: antispamwizard.cpp:535
+#, kde-format
+msgid "Scanning for %1..."
 msgstr ""
 
-#: kmcommands.cpp:703 kmcommands.cpp:729
-msgid "The file does not contain a message."
+#: antispamwizard.cpp:580
+msgid "Scanning for anti-spam tools finished."
 msgstr ""
 
-#: kmcommands.cpp:746
-msgid "The file contains multiple messages. Only the first message is shown."
+#: antispamwizard.cpp:581
+msgid "Scanning for anti-virus tools finished."
 msgstr ""
 
-#: kmcommands.cpp:941
+#: antispamwizard.cpp:584
 msgid ""
-"Do you want to forward the selected messages as attachments in one message "
-"(as a MIME digest) or as individual messages?"
+"<p>Sorry, no spam detection tools have been found. Install your spam "
+"detection software and re-run this wizard.</p>"
 msgstr ""
 
-#: kmcommands.cpp:944
-msgid "Send As Digest"
+#: antispamwizard.cpp:587
+msgid "Scanning complete. No anti-virus tools found."
 msgstr ""
 
-#: kmcommands.cpp:945
-msgid "Send Individually"
+#: antispamwizard.cpp:614
+#, kde-format
+msgid ""
+"<p>Messages classified as spam are marked as read.<br />Spam messages are "
+"moved into the folder named <i>%1</i>.</p>"
 msgstr ""
 
-#: kmcommands.cpp:1442
-msgid "Filtering messages"
+#: antispamwizard.cpp:618
+msgid ""
+"<p>Messages classified as spam are marked as read.<br />Spam messages are "
+"not moved into a certain folder.</p>"
 msgstr ""
 
-#: kmcommands.cpp:1449
+#: antispamwizard.cpp:623
 #, kde-format
-msgid "Filtering message %1 of %2"
+msgid ""
+"<p>Messages classified as spam are not marked as read.<br />Spam messages "
+"are moved into the folder named <i>%1</i>.</p>"
 msgstr ""
 
-#: kmcommands.cpp:1459
-msgid "Not enough free disk space?"
-msgstr "Dim digon o le gwag ar y ddisg?"
+#: antispamwizard.cpp:627
+msgid ""
+"<p>Messages classified as spam are not marked as read.<br />Spam messages "
+"are not moved into a certain folder.</p>"
+msgstr ""
 
-#: kmcommands.cpp:1602
-msgid "Moving messages"
+#: antispamwizard.cpp:656
+#, kde-format
+msgid ""
+"<p>The folder for messages classified as unsure (probably spam) is "
+"<i>%1</i>.</p>"
 msgstr ""
 
-#: kmcommands.cpp:1602
-msgid "Deleting messages"
+#: antispamwizard.cpp:669
+#, kde-format
+msgid "<p>The wizard will create the following filters:<ul>%1</ul></p>"
 msgstr ""
 
-#: xfaceconfigurator.cpp:88
-msgid "&Send picture with every message"
+#: antispamwizard.cpp:672
+#, kde-format
+msgid "<p>The wizard will replace the following filters:<ul>%1</ul></p>"
 msgstr ""
 
-#: xfaceconfigurator.cpp:90
+#: antispamwizard.cpp:940
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to "
-"messages written with this identity. An X-Face is a small (48x48 pixels) "
-"black and white image that some mail clients are able to display."
+"The wizard will search for any tools to do spam detection\n"
+"and setup KMail to work with them."
 msgstr ""
 
-#: xfaceconfigurator.cpp:97
-msgid "This is a preview of the picture selected/entered below."
+#: antispamwizard.cpp:944
+msgid ""
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior.</p>"
 msgstr ""
 
-#: xfaceconfigurator.cpp:111
-msgid "Click on the widgets below to obtain help on the input methods."
+#: antispamwizard.cpp:998
+msgid ""
+"<p>Please select the tools to be used for the detection and go to the next "
+"page.</p>"
 msgstr ""
 
-#: xfaceconfigurator.cpp:115
-msgctxt "continuation of \"obtain picture from\""
-msgid "External Source"
+#: antispamwizard.cpp:1024
+msgid "&Mark detected spam messages as read"
 msgstr ""
 
-#: xfaceconfigurator.cpp:117
-msgctxt "continuation of \"obtain picture from\""
-msgid "Input Field Below"
+#: antispamwizard.cpp:1026
+msgid "Mark messages which have been classified as spam as read."
 msgstr ""
 
-#: xfaceconfigurator.cpp:118
-msgid "Obtain pic&ture from:"
+#: antispamwizard.cpp:1029
+msgid "Move &known spam to:"
 msgstr ""
 
-#: xfaceconfigurator.cpp:151
-msgid "Select File..."
-msgstr "Dewis Ffeil..."
-
-#: xfaceconfigurator.cpp:153
+#: antispamwizard.cpp:1031
 msgid ""
-"Use this to select an image file to create the picture from. The image "
-"should be of high contrast and nearly quadratic shape. A light background "
-"helps improve the result."
+"The default folder for spam messages is the trash folder, but you may change "
+"that in the folder view below."
 msgstr ""
 
-#: xfaceconfigurator.cpp:160
-msgid "Set From Address Book"
+#: antispamwizard.cpp:1045
+msgid "Move &probable spam to:"
 msgstr ""
 
-#: xfaceconfigurator.cpp:162
+#: antispamwizard.cpp:1047
 msgid ""
-"You can use a scaled-down version of the picture you have set in your "
-"address book entry."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you have not selected a capable tool, you cannot select a folder as well.</p>"
+msgstr ""
+
+#: antispamwizard.cpp:1175
+msgid "Check messages using the anti-virus tools"
 msgstr ""
 
-#: xfaceconfigurator.cpp:168
+#: antispamwizard.cpp:1177
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
-"with every message. For example, this could be a picture of you or a glyph. "
-"It is shown in the recipient's mail client (if supported).</qt>"
+"Let the anti-virus tools check your messages. The wizard will create "
+"appropriate filters. The messages are usually marked by the tools so that "
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
-#: xfaceconfigurator.cpp:187
-msgid "Use this field to enter an arbitrary X-Face string."
+#: antispamwizard.cpp:1183
+msgid "Move detected viral messages to the selected folder"
 msgstr ""
 
-#: xfaceconfigurator.cpp:191
+#: antispamwizard.cpp:1185
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-"
-"Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."
+"A filter to detect messages classified as virus-infected and to move those "
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
-#: xfaceconfigurator.cpp:264
-msgid "You do not have your own contact defined in the address book."
+#: antispamwizard.cpp:1191
+msgid "Additionally, mark detected viral messages as read"
 msgstr ""
 
-#: xfaceconfigurator.cpp:264 xfaceconfigurator.cpp:278
-#: xfaceconfigurator.cpp:287
-msgid "No Picture"
-msgstr "Dim Llun"
+#: antispamwizard.cpp:1194
+msgid ""
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
+msgstr ""
 
-#: xfaceconfigurator.cpp:278 xfaceconfigurator.cpp:287
-msgid "No picture set for your address book entry."
+#: mailinglistpropertiesdialog.cpp:58
+msgid "Mailinglist Folder Properties"
 msgstr ""
 
-#: aboutdata.cpp:52 aboutdata.cpp:56 aboutdata.cpp:58
-msgid "Former maintainer"
-msgstr "Cyn-gynhaliwr"
+#: mailinglistpropertiesdialog.cpp:72
+msgid "Associated Mailing List"
+msgstr "Rhestr Ebost Gysylltiedig"
 
-#: aboutdata.cpp:54
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
+#: mailinglistpropertiesdialog.cpp:81
+msgid "&Folder holds a mailing list"
+msgstr "Cynhwysa'r &blygell restr ebost"
 
-#: aboutdata.cpp:60
-msgid "Former co-maintainer"
+#: mailinglistpropertiesdialog.cpp:88
+msgid "Detect Automatically"
 msgstr ""
 
-#: aboutdata.cpp:63 aboutdata.cpp:65
-msgid "Core developer"
-msgstr "Datblygwr craidd"
-
-#: aboutdata.cpp:67 aboutdata.cpp:69 aboutdata.cpp:71
-msgid "Former core developer"
+#: mailinglistpropertiesdialog.cpp:96
+msgid "Mailing list description:"
 msgstr ""
 
-#: aboutdata.cpp:73
-msgid "Documentation"
-msgstr "Dogfennaeth"
-
-#: aboutdata.cpp:80
-msgid "system tray notification"
-msgstr "hysbysiad cafn cysawd"
+#: mailinglistpropertiesdialog.cpp:107
+msgid "Preferred handler:"
+msgstr ""
 
-#: aboutdata.cpp:96
-msgid "PGP 6 support and further enhancements of the encryption support"
-msgstr "Cynhaliaeth PGP 6 ac ychwanegion pellach i gynnal cêl-ysgrifennaeth"
+#: mailinglistpropertiesdialog.cpp:114
+msgid "Browser"
+msgstr "Porydd"
 
-#: aboutdata.cpp:106
-msgid "Original encryption support<br/>PGP 2 and PGP 5 support"
+#: mailinglistpropertiesdialog.cpp:121
+msgid "&Address type:"
 msgstr ""
 
-#: aboutdata.cpp:109
-msgid "GnuPG support"
-msgstr "Cynhaliaeth GnuPG"
+#: mailinglistpropertiesdialog.cpp:134
+msgid "Invoke Handler"
+msgstr ""
 
-#: aboutdata.cpp:117
-msgid "Akonadi porting"
+#: mailinglistpropertiesdialog.cpp:153
+msgid "Post to List"
 msgstr ""
 
-#: aboutdata.cpp:139
-msgid "New message list and new folder tree"
+#: mailinglistpropertiesdialog.cpp:154 messageactions.cpp:392
+msgid "Subscribe to List"
 msgstr ""
 
-#: aboutdata.cpp:178
-msgid "Anti-virus support"
+#: mailinglistpropertiesdialog.cpp:155
+msgid "Unsubscribe From List"
 msgstr ""
 
-#: aboutdata.cpp:187 aboutdata.cpp:234
-msgid "POP filters"
-msgstr "Hidlenni POP"
+#: mailinglistpropertiesdialog.cpp:156
+msgid "List Archives"
+msgstr ""
 
-#: aboutdata.cpp:208
-msgid "Usability tests and improvements"
+#: mailinglistpropertiesdialog.cpp:157
+msgid "List Help"
 msgstr ""
 
-#: aboutdata.cpp:214 aboutdata.cpp:228
-msgid "Ägypten and Kroupware project management"
-msgstr "Rheoli cyweithiau Ägypten a Kroupware"
+#: mailinglistpropertiesdialog.cpp:180
+msgid "Not available"
+msgstr "Dim ar gael"
 
-#: aboutdata.cpp:217
-msgid "Improved HTML support"
-msgstr ""
+#: mailinglistpropertiesdialog.cpp:228 mailinglistpropertiesdialog.cpp:260
+msgid "Not available."
+msgstr "Nid yw ar gael."
 
-#: aboutdata.cpp:219
-msgid "beta testing of PGP 6 support"
-msgstr "profi beta cynhaliaeth PGP 6"
+#: mailinglistpropertiesdialog.cpp:257
+msgid ""
+"KMail was unable to detect a mailing list in this folder. Please fill the "
+"addresses by hand."
+msgstr ""
 
-#: aboutdata.cpp:226
-msgid "timestamp for 'Transmission completed' status messages"
-msgstr "cofnod amser am negeseuon cyflwr 'Trosglwyddiad wedi'i gwblhau'"
+#: messageactions.cpp:71
+msgctxt "Message->"
+msgid "&Reply"
+msgstr "&Ateb"
 
-#: aboutdata.cpp:230
-msgid "multiple encryption keys per address"
-msgstr "allweddau cêl-ysgrifennaeth lluosol am bob cyfeiriad"
+#: messageactions.cpp:76 searchwindow.cpp:299
+msgid "&Reply..."
+msgstr "A&teb..."
 
-#: aboutdata.cpp:241
-msgid "KDE Email Client"
-msgstr "Dibynnydd Ebost KDE"
+#: messageactions.cpp:83
+msgid "Reply to A&uthor..."
+msgstr "Ateb i'r A&wdur"
 
-#: aboutdata.cpp:242
-msgid "Copyright © 1997–2011, KMail authors"
+#: messageactions.cpp:90 searchwindow.cpp:303
+msgid "Reply to &All..."
+msgstr "Ateb i &Bawb..."
+
+#: messageactions.cpp:97 searchwindow.cpp:307
+msgid "Reply to Mailing-&List..."
+msgstr "Ateb i &Rhestr Ebost..."
+
+#: messageactions.cpp:104
+msgid "Reply Without &Quote..."
+msgstr "Ateb heb &Dyfynnu..."
+
+#: messageactions.cpp:111
+msgid "Filter on Mailing-&List..."
+msgstr "Hidlo ar &Restr Ebost..."
+
+#: messageactions.cpp:115
+msgid "Create To-do/Reminder..."
 msgstr ""
 
-#: kmcomposewin.cpp:245
-msgid "Select an identity for this message"
+#: messageactions.cpp:116
+msgid "Create To-do"
 msgstr ""
 
-#: kmcomposewin.cpp:252
-msgid "Select the dictionary to use when spell-checking this message"
+#: messageactions.cpp:117
+msgid "Allows you to create a calendar to-do or reminder from this message"
 msgstr ""
 
-#: kmcomposewin.cpp:257
+#: messageactions.cpp:118
 msgid ""
-"Select the sent-mail folder where a copy of this message will be saved"
+"This option starts the KOrganizer to-do editor with initial values taken "
+"from the currently selected message. Then you can edit the to-do to your "
+"liking before saving it to your calendar."
 msgstr ""
 
-#: kmcomposewin.cpp:260
-msgid "Select the outgoing account to use for sending this message"
-msgstr ""
+#: messageactions.cpp:125
+msgid "Mar&k Message"
+msgstr "No&di Neges"
 
-#: kmcomposewin.cpp:266
-msgid "Set the \"From:\" email address for this message"
+#: messageactions.cpp:146
+msgid "&Edit Message"
+msgstr "G&olygu Neges"
+
+#: messageactions.cpp:152 messageactions.cpp:618
+msgid "Add Note..."
 msgstr ""
 
-#: kmcomposewin.cpp:270
-msgid "Set the \"Reply-To:\" email address for this message"
+#: messageactions.cpp:159 searchwindow.cpp:311
+msgctxt "Message->"
+msgid "&Forward"
+msgstr "&Blaenyrru"
+
+#: messageactions.cpp:164
+msgctxt "@action:inmenu Message->Forward->"
+msgid "As &Attachment..."
 msgstr ""
 
-#: kmcomposewin.cpp:285
-msgid "Set a subject for this message"
+#: messageactions.cpp:172
+msgctxt "@action:inmenu Message->Forward->"
+msgid "&Inline..."
 msgstr ""
 
-#: kmcomposewin.cpp:286
-msgid "&Identity:"
-msgstr "&Dynodiad:"
+#: messageactions.cpp:180
+msgctxt "Message->Forward->"
+msgid "&Redirect..."
+msgstr "Ail-&gyfeirio..."
 
-#: kmcomposewin.cpp:287
-msgid "&Dictionary:"
-msgstr "&Geiriadur:"
+#: messageactions.cpp:189
+msgctxt "Message->"
+msgid "Mailing-&List"
+msgstr ""
 
-#: kmcomposewin.cpp:288
-msgid "&Sent-Mail folder:"
-msgstr "Plygell Ebost Anfonedig:"
+#: messageactions.cpp:355
+msgid "Filter on Mailing-List..."
+msgstr "Hidlo ar Restr Ebost..."
 
-#: kmcomposewin.cpp:289
-msgid "&Mail transport:"
-msgstr "&Cludiant ebost:"
+#: messageactions.cpp:382
+msgid "Open Message in List Archive"
+msgstr ""
 
-#: kmcomposewin.cpp:290
-msgctxt "sender address field"
-msgid "&From:"
-msgstr "&Oddi wrth:"
+#: messageactions.cpp:384
+msgid "Post New Message"
+msgstr ""
 
-#: kmcomposewin.cpp:291
-msgid "&Reply to:"
-msgstr "&Ateb i:"
+#: messageactions.cpp:386
+msgid "Go to Archive"
+msgstr ""
 
-#: kmcomposewin.cpp:292
-msgctxt "@label:textbox Subject of email."
-msgid "S&ubject:"
+#: messageactions.cpp:388
+msgid "Request Help"
 msgstr ""
 
-#: kmcomposewin.cpp:293
-msgctxt "@option:check Sticky identity."
-msgid "Sticky"
+#: messageactions.cpp:390
+msgctxt "Contact the owner of the mailing list"
+msgid "Contact Owner"
 msgstr ""
 
-#: kmcomposewin.cpp:295
-msgid "Use the selected value as your identity for future messages"
+#: messageactions.cpp:394
+msgid "Unsubscribe from List"
 msgstr ""
 
-#: kmcomposewin.cpp:297
-msgid "Use the selected value as your sent-mail folder for future messages"
+#: messageactions.cpp:403
+#, kde-format
+msgid "Filter on Mailing-List %1..."
+msgstr "Hidlo ar Restr Ebost %1 ..."
+
+#: messageactions.cpp:567
+msgid "email"
 msgstr ""
 
-#: kmcomposewin.cpp:299
-msgid "Use the selected value as your outgoing account for future messages"
+#: messageactions.cpp:570
+msgid "web"
 msgstr ""
 
-#: kmcomposewin.cpp:301
-msgid "Use the selected value as your dictionary for future messages"
+#: messageactions.cpp:573
+#, kde-format
+msgctxt ""
+"%1 is a 'Contact Owner' or similar action. %2 is a protocol normally web or "
+"email though could be irc/ftp or other url variant"
+msgid "%1 (%2)"
 msgstr ""
 
-#: kmcomposewin.cpp:387 configuredialog.cpp:740
-msgid "Composer"
-msgstr "Cyfansoddydd"
+#: messageactions.cpp:620
+msgid "Edit Note..."
+msgstr ""
 
-#: kmcomposewin.cpp:1091 kmcomposewin.cpp:1117
-msgid "&Send Mail"
-msgstr "&Anfon Ebost"
+#: simplestringlisteditor.cpp:58
+msgid "New entry:"
+msgstr "Cofnod newydd:"
 
-#: kmcomposewin.cpp:1097 kmcomposewin.cpp:1122
-msgid "&Send Mail Via"
+#. i18n: file: ui/identitypage.ui:27
+#. i18n: ectx: property (text), widget (QPushButton, mButtonAdd)
+#: simplestringlisteditor.cpp:77 rc.cpp:421
+msgid "&Add..."
+msgstr "&Ychwanegu..."
+
+#: simplestringlisteditor.cpp:88 identitypage.cpp:231
+msgid "&Remove"
 msgstr ""
 
-#: kmcomposewin.cpp:1098
-msgid "Send"
-msgstr "Anfon"
+#. i18n: file: ui/identitypage.ui:40
+#. i18n: ectx: property (text), widget (QPushButton, mModifyButton)
+#. i18n: file: ui/accountspagereceivingtab.ui:46
+#. i18n: ectx: property (text), widget (KPushButton, mModifyAccountButton)
+#: simplestringlisteditor.cpp:100 configuredialog.cpp:2780 rc.cpp:427
+#: rc.cpp:836
+msgid "&Modify..."
+msgstr "&Addasu..."
 
-#: kmcomposewin.cpp:1101 kmcomposewin.cpp:1110 kmcomposewin.cpp:2642
-msgid "Send &Later"
-msgstr "Anfon yn &Nes Ymlaen"
+#: simplestringlisteditor.cpp:207
+msgid "New Value"
+msgstr "Gwerth Newydd"
 
-#: kmcomposewin.cpp:1104 kmcomposewin.cpp:1114
-msgid "Send &Later Via"
+#: simplestringlisteditor.cpp:230
+msgid "Change Value"
+msgstr "Newid Gwerth"
+
+#: kmcomposereditor.cpp:64
+msgid "Pa&ste as Quotation"
+msgstr "Gl&udo fel Dyfyniad"
+
+#: kmcomposereditor.cpp:68
+msgid "Add &Quote Characters"
+msgstr "&Ychwanegu Nodau Dyfynnu"
+
+#: kmcomposereditor.cpp:72
+msgid "Re&move Quote Characters"
+msgstr "G&waredu Nodau Dyfynnu"
+
+#: archivefolderdialog.cpp:48
+msgctxt "Start of the filename for a mail archive file"
+msgid "Archive"
 msgstr ""
 
-#: kmcomposewin.cpp:1105
-msgctxt "Queue the message for sending at a later date"
-msgid "Queue"
+#: archivefolderdialog.cpp:55
+msgid "Archive Folder"
 msgstr ""
 
-#: kmcomposewin.cpp:1149
-msgid "Save as &Draft"
+#: archivefolderdialog.cpp:71
+msgid "&Folder:"
 msgstr ""
 
-#: kmcomposewin.cpp:1153
-msgid "Save as &Template"
+#: archivefolderdialog.cpp:81
+msgid "F&ormat:"
 msgstr ""
 
-#: kmcomposewin.cpp:1157
-msgid "&Insert Text File..."
+#: archivefolderdialog.cpp:87
+msgid "Compressed Zip Archive (.zip)"
 msgstr ""
 
-#: kmcomposewin.cpp:1162
-msgid "&Insert Recent Text File"
+#: archivefolderdialog.cpp:88
+msgid "Uncompressed Archive (.tar)"
 msgstr ""
 
-#: kmcomposewin.cpp:1170 kmmainwidget.cpp:2947
-msgid "&Address Book"
-msgstr "&Llyfr Cyfeiriadau"
+#: archivefolderdialog.cpp:89
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
 
-#: kmcomposewin.cpp:1173
-msgid "&New Composer"
-msgstr "Cyfan&soddydd Newydd"
+#: archivefolderdialog.cpp:90
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
 
-#: kmcomposewin.cpp:1177
-msgid "New Main &Window"
-msgstr "Prif Ffenest&r Newydd"
+#: archivefolderdialog.cpp:97
+msgid "&Archive File:"
+msgstr ""
 
-#: kmcomposewin.cpp:1181
-msgid "Select &Recipients..."
+#: archivefolderdialog.cpp:109
+msgid "&Delete folders after completion"
 msgstr ""
 
-#: kmcomposewin.cpp:1185
-msgid "Save &Distribution List..."
+#: archivefolderdialog.cpp:113
+msgid "Archive all subfolders"
 msgstr ""
 
-#: kmcomposewin.cpp:1207
-msgid "Paste as Attac&hment"
+#: archivefolderdialog.cpp:180
+msgid "Please select the folder that should be archived."
 msgstr ""
 
-#: kmcomposewin.cpp:1211
-msgid "Cl&ean Spaces"
-msgstr "Glan&hau Gofodnodau"
+#: archivefolderdialog.cpp:181
+msgid "No folder selected"
+msgstr ""
 
-#: kmcomposewin.cpp:1215
-msgid "Use Fi&xed Font"
-msgstr "Def&nyddio Wynebfath Penodol"
+#: kmsystemtray.cpp:270
+msgid "New Messages In"
+msgstr ""
 
-#: kmcomposewin.cpp:1222
-msgctxt "@action:inmenu Mark the email as urgent."
-msgid "&Urgent"
+#: kmsystemtray.cpp:361
+msgid "There are no unread messages"
 msgstr ""
 
-#: kmcomposewin.cpp:1224
-msgid "&Request Disposition Notification"
-msgstr "&Gofyn am Hysbysiad Lleoliad"
+#: kmsystemtray.cpp:362
+#, kde-format
+msgid "1 unread message"
+msgid_plural "%1 unread messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kmcomposewin.cpp:1230
-msgid "&Wordwrap"
-msgstr "&Amlapio testun"
+#: kmkernel.cpp:264
+msgid ""
+"<b>Thanks for using KMail2!</b><p>KMail2 uses a new storage technology that "
+"requires migration of your current KMail data and configuration.</p>\n"
+"<p>The conversion process can take a lot of time (depending on the amount of "
+"email you have) and it <em>must not be interrupted</em>.</p>\n"
+"<p>You can:</p><ul><li>Migrate now (be prepared to wait)</li><li>Skip the "
+"migration and start with fresh data and configuration</li><li>Cancel and "
+"exit KMail2.</li></ul><p><a href=\"http://userbase.kde.org/Akonadi\">More "
+"Information...</a></p>"
+msgstr ""
 
-#: kmcomposewin.cpp:1235
-msgid "&Snippets"
+#: kmkernel.cpp:273
+msgid "KMail Migration"
 msgstr ""
 
-#: kmcomposewin.cpp:1242
-msgid "&Automatic Spellchecking"
-msgstr "G&wirio Sillafu Ymysgogol"
+#: kmkernel.cpp:273
+msgid "Migrate Now"
+msgstr ""
 
-#: kmcomposewin.cpp:1259
-msgid "Formatting (HTML)"
+#: kmkernel.cpp:273
+msgid "Skip Migration"
 msgstr ""
 
-#: kmcomposewin.cpp:1260
-msgid "HTML"
+#: kmkernel.cpp:306
+msgid ""
+"Migration to KMail 2 failed. In case you want to try again, run 'kmail-"
+"migrator --interactive' manually."
 msgstr ""
 
-#: kmcomposewin.cpp:1264
-msgid "&All Fields"
-msgstr "&Pob Maes"
+#: kmkernel.cpp:307
+msgid "Migration Failed"
+msgstr ""
 
-#: kmcomposewin.cpp:1267
-msgid "&Identity"
-msgstr "&dynodiad"
-
-#: kmcomposewin.cpp:1270
-msgid "&Dictionary"
-msgstr "&Geiriadur"
-
-#: kmcomposewin.cpp:1273
-msgid "&Sent-Mail Folder"
-msgstr "&Plygell Ebostau Anfonedig"
-
-#: kmcomposewin.cpp:1276
-msgid "&Mail Transport"
-msgstr "&Cludiant Ebost"
-
-#: kmcomposewin.cpp:1279
-msgid "&From"
-msgstr "&Oddiwrth"
-
-#: kmcomposewin.cpp:1282
-msgid "&Reply To"
-msgstr "&Ateb I"
-
-#: kmcomposewin.cpp:1286
-msgctxt "@action:inmenu Show the subject in the composer window."
-msgid "S&ubject"
-msgstr ""
-
-#: kmcomposewin.cpp:1291
-msgid "Append S&ignature"
-msgstr "Atodi &Llofnod"
-
-#: kmcomposewin.cpp:1294
-msgid "Pr&epend Signature"
+#: kmkernel.cpp:928
+msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmcomposewin.cpp:1297
-msgid "Insert Signature At C&ursor Position"
+#: kmkernel.cpp:956
+msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmcomposewin.cpp:1309
-msgid "&Spellchecker..."
-msgstr "Gwirydd &Sillafu..."
-
-#: kmcomposewin.cpp:1310
-msgid "Spellchecker"
-msgstr "Gwirydd Sillafu"
-
-#: kmcomposewin.cpp:1315 kmcomposewin.cpp:1317
-msgid "Encrypt Message with Chiasmus..."
+#: kmkernel.cpp:959
+msgid ""
+"KMail is set to be online; all network jobs will resume when a network "
+"connection is detected"
 msgstr ""
 
-#: kmcomposewin.cpp:1325
-msgid "&Encrypt Message"
-msgstr "C&êl-ysgrifo Neges"
-
-#: kmcomposewin.cpp:1326
-msgid "Encrypt"
-msgstr "Cêl-ysgrifo"
-
-#: kmcomposewin.cpp:1328
-msgid "&Sign Message"
-msgstr "Llof&odi Neges"
-
-#: kmcomposewin.cpp:1329
-msgid "Sign"
-msgstr "Llofnodi"
-
-#: kmcomposewin.cpp:1353
-msgid "&Cryptographic Message Format"
+#: kmkernel.cpp:1009
+msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmcomposewin.cpp:1357
-msgid "Select a cryptographic format for this message"
+#: kmkernel.cpp:1012 kmmainwidget.cpp:2646
+msgid "Work Online"
 msgstr ""
 
-#: kmcomposewin.cpp:1359
-msgid "Reset Font Settings"
+#: kmkernel.cpp:1013 kmmainwidget.cpp:2643
+msgid "Work Offline"
 msgstr ""
 
-#: kmcomposewin.cpp:1360
-msgid "Reset Font"
+#: kmkernel.cpp:1114
+#, kde-format
+msgid ""
+"Failed to open autosave file at %1.\n"
+"Reason: %2"
 msgstr ""
 
-#: kmcomposewin.cpp:1375
-msgid "Configure KMail..."
+#: kmkernel.cpp:1116
+msgid "Opening Autosave File Failed"
 msgstr ""
 
-#: kmcomposewin.cpp:1407
+#: kmkernel.cpp:1626
 #, kde-format
-msgid " Spellcheck: %1 "
-msgstr ""
+msgid "This identity has been changed to use the default transport:"
+msgid_plural ""
+"These %1 identities have been changed to use the default transport:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kmcomposewin.cpp:1408 kmcomposewin.cpp:3001
+#: kmkernel.cpp:1650
 #, kde-format
-msgid " Column: %1 "
-msgstr " Colofn: %1 "
+msgid "This identity has been changed to use the modified transport:"
+msgid_plural ""
+"These %1 identities have been changed to use the modified transport:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kmcomposewin.cpp:1410 kmcomposewin.cpp:2999
-#, kde-format
-msgctxt "Shows the linenumber of the cursor position."
-msgid " Line: %1 "
+#: kmkernel.cpp:1664
+msgid "Sending messages"
 msgstr ""
 
-#: kmcomposewin.cpp:1754
-msgid "Re&save as Template"
+#: kmkernel.cpp:1665
+msgid "Initiating sending process..."
 msgstr ""
 
-#: kmcomposewin.cpp:1755
-msgid "&Save as Draft"
-msgstr "&Cadw fel Drafft"
-
-#: kmcomposewin.cpp:1757
-msgid ""
-"Resave this message in the Templates folder. It can then be used at a later "
-"time."
+#: kmkernel.cpp:1716
+msgid "online"
 msgstr ""
 
-#: kmcomposewin.cpp:1759
-msgid ""
-"Save this message in the Drafts folder. It can then be edited and sent at a "
-"later time."
+#: kmkernel.cpp:1716
+msgid "offline"
 msgstr ""
 
-#: kmcomposewin.cpp:1763
-msgid "Do you want to save the message for later or discard it?"
+#: kmkernel.cpp:1716
+#, kde-format
+msgid "Resource %1 is broken. This resource is now %2"
 msgstr ""
 
-#: kmcomposewin.cpp:1764
-msgid "Close Composer"
+#: kmsearchmessagemodel.cpp:77
+#, kde-format
+msgctxt "@label"
+msgid ""
+"This model can only handle email folders. The current collection holds "
+"mimetypes: %1"
 msgstr ""
 
-#: kmcomposewin.cpp:1882
-msgid "Sending Message Failed"
+#: kmsearchmessagemodel.cpp:104
+msgctxt "@label No size available"
+msgid "-"
 msgstr ""
 
-#: kmcomposewin.cpp:2088
-msgid "Insert clipboard text as attachment"
+#: kmsearchmessagemodel.cpp:149
+msgctxt "@title:column, folder (e.g. email)"
+msgid "Folder"
 msgstr ""
 
-#: kmcomposewin.cpp:2089 kmcomposereditor.cpp:160
-msgid "Name of the attachment:"
+#: foldershortcutdialog.cpp:63
+#, kde-format
+msgid "Shortcut for Folder %1"
 msgstr ""
 
-#: kmcomposewin.cpp:2243 kmfilterdlg.cpp:754
-msgid "unnamed"
-msgstr "di-enw"
-
-#: kmcomposewin.cpp:2271
-msgid ""
-"<qt><p>You have requested that messages be encrypted to yourself, but the "
-"currently selected identity does not define an (OpenPGP or S/MIME) "
-"encryption key to use for this.</p><p>Please select the key(s) to use in the "
-"identity configuration.</p></qt>"
+#: foldershortcutdialog.cpp:67
+msgid "Select Shortcut for Folder"
 msgstr ""
 
-#: kmcomposewin.cpp:2278
-msgid "Undefined Encryption Key"
-msgstr "Allwedd Gêl-ysgrifo Anniffiniedig"
-
-#: kmcomposewin.cpp:2322
+#: foldershortcutdialog.cpp:69
 msgid ""
-"<qt><p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
-"in the identity configuration.</p></qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:2329
-msgid "Undefined Signing Key"
-msgstr "Allwedd Lofnodi heb ei Diffinio"
+#: tagselectdialog.cpp:43
+msgid "Select Tags"
+msgstr ""
 
-#: kmcomposewin.cpp:2426
-msgid ""
-"KMail is currently in offline mode. Your messages will be kept in the outbox "
-"until you go online."
+#: collectionquotapage.cpp:47
+msgid "Quota"
 msgstr ""
 
-#: kmcomposewin.cpp:2428 kmkernel.cpp:993
-msgid "Online/Offline"
+#: undostack.cpp:101
+msgid "There is nothing to undo."
 msgstr ""
 
-#: kmcomposewin.cpp:2443
-msgid ""
-"You must enter your email address in the From: field. You should also set "
-"your email address for all identities, so that you do not have to enter it "
-"for each message."
+#: undostack.cpp:108
+#, kde-format
+msgid "Can not move message. %1"
 msgstr ""
 
-#: kmcomposewin.cpp:2452
-msgid ""
-"You must specify at least one receiver, either in the To: field or as CC or "
-"as BCC."
+#: addressvalidationjob.cpp:79
+#, kde-format
+msgid "Distribution list %2 is empty, it cannot be used."
+msgid_plural "Distribution lists %2 are empty, they cannot be used."
+msgstr[0] ""
+msgstr[1] ""
+
+#: addressvalidationjob.cpp:82 addressvalidationjob.cpp:91
+#: identitydialog.cpp:607
+msgid "Invalid Email Address"
+msgstr "Cyfeiriad Ebost Annilys"
+
+#: tagactionmanager.cpp:95
+#, kde-format
+msgid "Message Tag %1"
 msgstr ""
 
-#: kmcomposewin.cpp:2458
-msgid "To: field is empty. Send message anyway?"
+#: tagactionmanager.cpp:156
+msgid "More..."
 msgstr ""
 
-#: kmcomposewin.cpp:2460
-msgid "No To: specified"
+#: tagactionmanager.cpp:190
+#, kde-format
+msgid "Toggle Message Tag %1"
 msgstr ""
 
-#: kmcomposewin.cpp:2474
-msgid "You did not specify a subject. Send message anyway?"
-msgstr "Nid ydych wedi penodi pwnc.  Anfon y neges beth bynnag?"
+#: kmreaderwin.cpp:140
+msgid "New Message To..."
+msgstr "Neges Newydd I..."
 
-#: kmcomposewin.cpp:2476
-msgid "No Subject Specified"
-msgstr "Ni Phenodwyd Pwnc"
+#: kmreaderwin.cpp:148
+msgid "Reply To..."
+msgstr "Ateb I..."
 
-#: kmcomposewin.cpp:2477
-msgid "S&end as Is"
-msgstr "A&nfon e"
+#: kmreaderwin.cpp:156
+msgid "Forward To..."
+msgstr "Blaenyrru I..."
 
-#: kmcomposewin.cpp:2478
-msgid "&Specify the Subject"
-msgstr ""
+#: kmreaderwin.cpp:165
+msgid "Add to Address Book"
+msgstr "Ychwanegu i'r Llyfr Cyfeiriadau"
 
-#: kmcomposewin.cpp:2506
-msgid ""
-"You must specify at least one receiver in order to be able to encrypt a "
-"draft."
-msgstr ""
+#: kmreaderwin.cpp:173
+msgid "Open in Address Book"
+msgstr "Agor yn y Lyfr Cyfeiriadau"
 
-#: kmcomposewin.cpp:2639
-msgid "About to send email..."
-msgstr "Ar fin anfon ebost..."
+#: kmreaderwin.cpp:179
+msgid "Bookmark This Link"
+msgstr "Tudnodi'r Cyswllt Yma"
 
-#: kmcomposewin.cpp:2640
-msgid "Send Confirmation"
-msgstr "Anfon Cadarnhad"
+#: kmreaderwin.cpp:186
+msgid "Save Link As..."
+msgstr "Cadw'r Cyswllt Fel..."
 
-#: kmcomposewin.cpp:2641
-msgid "&Send Now"
-msgstr "Anfo&n Rwan"
+#: kmreaderwin.cpp:192 kmmainwidget.cpp:3275
+msgid "&Find in Message..."
+msgstr "&Canfod mewn Neges..."
 
-#: kmcomposewin.cpp:2660
-#, kde-format
+#: kmreaderwin.cpp:243
 msgid ""
-"You are trying to send the mail to more than %1 recipients. Send message "
-"anyway?"
+"KMail is now based on the Akonadi Personal Information Management framework, "
+"which brings many changes all around."
 msgstr ""
 
-#: kmcomposewin.cpp:2661
-msgid "Too many recipients"
+#: kmreaderwin.cpp:254
+msgid "Push email (IMAP IDLE)"
 msgstr ""
 
-#: kmcomposewin.cpp:2662
-msgid "&Send as Is"
-msgstr "&Anfon e"
-
-#: kmcomposewin.cpp:2663
-msgid "&Edit Recipients"
+#: kmreaderwin.cpp:255
+msgid "Improved virtual folders"
 msgstr ""
 
-#: kmcomposewin.cpp:2706
-msgid ""
-"Turning HTML mode off will cause the text to lose the formatting. Are you "
-"sure?"
+#: kmreaderwin.cpp:256
+msgid "Improved searches"
 msgstr ""
 
-#: kmcomposewin.cpp:2708
-msgid "Lose the formatting?"
+#: kmreaderwin.cpp:257
+msgid "Support for adding notes (annotations) to mails"
 msgstr ""
 
-#: kmcomposewin.cpp:2708
-msgid "Lose Formatting"
+#: kmreaderwin.cpp:258
+msgid "Tag folders"
 msgstr ""
 
-#: kmcomposewin.cpp:2766
-msgid "Spellcheck: on"
+#: kmreaderwin.cpp:259
+msgid "Less GUI freezes, mail checks happen in the background"
 msgstr ""
 
-#: kmcomposewin.cpp:2768
-msgid "Spellcheck: off"
+#: kmreaderwin.cpp:287
+msgid ""
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please wait . "
+". .</p>&nbsp;"
 msgstr ""
 
-#: kmcomposewin.cpp:3047
+#: kmreaderwin.cpp:295
 msgid ""
-"Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's "
-"Security page."
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
 
-#: kmcomposewin.cpp:3051
+#: kmreaderwin.cpp:311
+#, kde-format
+msgctxt ""
+"%1: KMail version; %2: help:// URL; %3: generated list of new features; %4: "
+"First-time user text (only shown on first start); %5: generated list of "
+"important changes; --- end of comment ---"
 msgid ""
-"It looks as though libkleopatra was compiled without Chiasmus support. You "
-"might want to recompile libkleopatra with --enable-chiasmus."
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client by KDE.It is designed to be fully compatible with Internet mailing "
+"standards including MIME, SMTP, POP3, and IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a "
+"href=\"%2\">documentation</a></li>\n"
+"%5\n"
+"%3\n"
+"%4\n"
+"<p>We hope that you will enjoy KMail.</p>\n"
+"<p>Thank you,</p>\n"
+"<p style='margin-bottom: 0px'>&nbsp; &nbsp; The KMail Team</p>"
 msgstr ""
 
-#: kmcomposewin.cpp:3054
-msgid "No Chiasmus Backend Configured"
-msgstr ""
-
-#: kmcomposewin.cpp:3060
+#: kmreaderwin.cpp:328
+#, kde-format
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
-"report this bug."
-msgstr ""
-
-#: kmcomposewin.cpp:3062 kmcomposewin.cpp:3067 kmcomposewin.cpp:3076
-msgid "Chiasmus Backend Error"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %1, which is part of KDE Software Compilation %2):</p>\n"
 msgstr ""
 
-#: kmcomposewin.cpp:3073
+#: kmreaderwin.cpp:341
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
-"function did not return a string list. Please report this bug."
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
+"You need to create at least a default identity and an incoming as well as "
+"outgoing mail account.</p>\n"
 msgstr ""
+"<p>Arhoswch am eiliad i lenwi'r panel ffurfweddiad KMail wrth Gosodiadau-"
+"&gt;Ffurfweddu KMail.\n"
+"Mae angen i chi greu o leiaf dynodiad rhagosod, cyfrif ebost derbyn, a "
+"chyfrif ebost anfon.</p>\n"
 
-#: kmcomposewin.cpp:3082
+#: kmreaderwin.cpp:353
+#, kde-format
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in "
-"the Chiasmus configuration."
+"<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
+"(compared to KMail %1):</p>\n"
 msgstr ""
 
-#: kmcomposewin.cpp:3085
-msgid "No Chiasmus Keys Found"
+#: kmreaderwin.cpp:358
+#, kde-format
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
+
+#: collectionviewpage.cpp:51
+msgctxt "@title:tab View settings for a folder."
+msgid "View"
 msgstr ""
 
-#: kmcomposewin.cpp:3089
-msgid "Chiasmus Encryption Key Selection"
+#: collectionviewpage.cpp:71
+msgid "Use custom &icons"
+msgstr "Defnyddio &eiconau addasiedig"
+
+#: collectionviewpage.cpp:74
+msgctxt "Icon used for folders with no unread messages."
+msgid "&Normal:"
 msgstr ""
 
-#: kmcomposewin.cpp:3118
-msgid "Message will be signed"
+#: collectionviewpage.cpp:87
+msgctxt "Icon used for folders which do have unread messages."
+msgid "&Unread:"
 msgstr ""
 
-#: kmcomposewin.cpp:3119
-msgid "Message will not be signed"
+#: collectionviewpage.cpp:124
+msgid "Show Sender/Receiver Column in List of Messages"
 msgstr ""
 
-#: kmcomposewin.cpp:3121
-msgid "Message will be encrypted"
+#: collectionviewpage.cpp:126
+msgid "Sho&w column:"
 msgstr ""
 
-#: kmcomposewin.cpp:3122
-msgid "Message will not be encrypted"
+#: collectionviewpage.cpp:130
+msgctxt "@item:inlistbox Show default value."
+msgid "Default"
 msgstr ""
 
-#: kmstartup.cpp:157
-#, kde-format
-msgid ""
-"%1 already seems to be running on another display on this machine. Running "
-"%2 more than once can cause the loss of mail. You should not start %1 unless "
-"you are sure that it is not already running."
+#: collectionviewpage.cpp:131
+msgctxt "@item:inlistbox Show sender."
+msgid "Sender"
 msgstr ""
 
-#: kmstartup.cpp:167
-#, kde-format
-msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 "
-"at the same time can cause the loss of mail. You should not start %2 unless "
-"you are sure that %1 is not running."
+#: collectionviewpage.cpp:132
+msgctxt "@item:inlistbox Show receiver."
+msgid "Receiver"
 msgstr ""
 
-#: kmstartup.cpp:175
-#, kde-format
-msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause "
-"the loss of mail. You should not start %1 on this computer unless you are "
-"sure that it is not already running on %2."
+#: collectionviewpage.cpp:140 configuredialog.cpp:706 configuredialog.cpp:741
+msgid "Message List"
+msgstr "Rhestr Negeseuon"
+
+#: collectionviewpage.cpp:147
+msgid "Use default aggregation"
 msgstr ""
 
-#: kmstartup.cpp:181
-#, kde-format
-msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
-"the loss of mail. You should not start %2 on this computer unless you are "
-"sure that %1 is not running on %3."
+#: collectionviewpage.cpp:154
+msgid "Aggregation"
 msgstr ""
 
-#: kmstartup.cpp:191
-#, kde-format
-msgctxt "Start kmail even when another instance is running."
-msgid "Start %1"
+#: collectionviewpage.cpp:170
+msgid "Use default theme"
 msgstr ""
 
-#: kmstartup.cpp:192
-msgctxt "Do not start another kmail instance."
-msgid "Exit"
+#: collectionviewpage.cpp:177
+msgid "Theme"
 msgstr ""
 
-#: kmmainwidget.cpp:414
-#, kde-format
-msgid "1 new message in %2"
-msgid_plural "%1 new messages in %2"
-msgstr[0] ""
-msgstr[1] ""
+#: identitydialog.cpp:105
+msgid "Edit Identity"
+msgstr "Golygu Dynodiad"
 
-#: kmmainwidget.cpp:431
-#, kde-format
-msgctxt "%1 is a list of the number of new messages per folder"
-msgid "<b>New mail arrived</b><br />%1"
+#: identitydialog.cpp:138
+msgctxt "@title:tab General identity settings."
+msgid "General"
 msgstr ""
 
-#: kmmainwidget.cpp:434
-msgid "New mail arrived"
-msgstr "Cyrhaeddodd ebost newydd"
+#: identitydialog.cpp:149
+msgid "&Your name:"
+msgstr "&Eich enw:"
 
-#: kmmainwidget.cpp:980
-msgid "Set Focus to Quick Search"
+#: identitydialog.cpp:152
+msgid ""
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:987
-msgid "Extend Selection to Previous Message"
-msgstr ""
+#: identitydialog.cpp:164
+msgid "Organi&zation:"
+msgstr "Mu&diad:"
 
-#: kmmainwidget.cpp:993
-msgid "Extend Selection to Next Message"
+#: identitydialog.cpp:167
+msgid ""
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you would like it to be shown in the email header that is "
+"sent out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1079
-msgid "Move Message to Folder"
-msgstr "Symud Neges i Blygell"
-
-#: kmmainwidget.cpp:1086
-msgid "Copy Message to Folder"
-msgstr "Copïo Neges i Blygell"
+#: identitydialog.cpp:180
+msgid "&Email address:"
+msgstr "C&yfeiriad ebost:"
 
-#: kmmainwidget.cpp:1093
-msgid "Jump to Folder..."
+#: identitydialog.cpp:183
+msgid ""
+"<qt><h3>Email address</h3><p>This field should have your full email "
+"address.</p><p>This address is the primary one, used for all outgoing mail. "
+"If you have more than one address, either create a new identity, or add "
+"additional alias addresses in the field below.</p><p>If you leave this "
+"blank, or get it wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1100
-msgid "Abort Current Operation"
+#: identitydialog.cpp:200
+msgid "Email a&liases:"
 msgstr ""
 
-#: kmmainwidget.cpp:1107
-msgid "Focus on Next Folder"
-msgstr "Canolbwyntio ar y Blygell Nesaf"
+#: identitydialog.cpp:203
+msgid ""
+"<qt><h3>Email aliases</h3><p>This field contains alias addresses that should "
+"also be considered as belonging to this identity (as opposed to representing "
+"a different identity).</p><p>Example:</p><table><tr><th>Primary "
+"address:</th><td>first.last@example.org</td></tr><tr><th>Aliases:</th><td>fir"
+"st@example.org<br>last@example.org</td></tr></table><p>Type one alias "
+"address per line.</p></qt>"
+msgstr ""
 
-#: kmmainwidget.cpp:1114
-msgid "Focus on Previous Folder"
-msgstr "Canolbwyntio ar y Blygell Flaenorol"
+#: identitydialog.cpp:221
+msgid "Cryptography"
+msgstr ""
 
-#: kmmainwidget.cpp:1121
-msgid "Select Folder with Focus"
-msgstr "Deiws y Blygell efo'r Canolbwynt"
+#: identitydialog.cpp:230 identitydialog.cpp:255 identitydialog.cpp:281
+#: identitydialog.cpp:308
+msgid "Chang&e..."
+msgstr "Ne&wid..."
 
-#: kmmainwidget.cpp:1129
-msgid "Focus on Next Message"
+#: identitydialog.cpp:231
+msgid "Your OpenPGP Signature Key"
 msgstr ""
 
-#: kmmainwidget.cpp:1136
-msgid "Focus on Previous Message"
+#: identitydialog.cpp:232
+msgid ""
+"Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr ""
 
-#: kmmainwidget.cpp:1143
-msgid "Select Message with Focus"
+#: identitydialog.cpp:236
+msgid ""
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1398
-msgid "No Subject"
-msgstr "Dim Pwnc"
-
-#: kmmainwidget.cpp:1411
-msgid "(no templates)"
+#: identitydialog.cpp:243
+msgid "OpenPGP signing key:"
 msgstr ""
 
-#: kmmainwidget.cpp:1485
-msgid "This folder does not have any expiry options set"
-msgstr "Ni osodir dewisiadau darfod ar gyfer y blygell yma"
-
-#: kmmainwidget.cpp:1491
-#, kde-format
-msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
-msgstr "<qt>Ydych wir eisiau darfod y blygell <b>%1</b>?</qt>"
+#: identitydialog.cpp:256
+msgid "Your OpenPGP Encryption Key"
+msgstr ""
 
-#: kmmainwidget.cpp:1493
-msgid "Expire Folder"
-msgstr "Darfod Plygell"
+#: identitydialog.cpp:257
+msgid ""
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
+msgstr ""
 
-#: kmmainwidget.cpp:1494
-msgid "&Expire"
-msgstr "Darf&od"
+#: identitydialog.cpp:262
+msgid ""
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></p></qt>"
+msgstr ""
 
-#: kmmainwidget.cpp:1510
-msgid "Empty Trash"
-msgstr "Gwagu'r Sbwriel"
+#: identitydialog.cpp:269
+msgid "OpenPGP encryption key:"
+msgstr ""
 
-#: kmmainwidget.cpp:1510
-msgid "Move to Trash"
-msgstr "Symud i Sbwriel"
+#: identitydialog.cpp:282
+msgid "Your S/MIME Signature Certificate"
+msgstr ""
 
-#: kmmainwidget.cpp:1512
-msgid "Are you sure you want to empty the trash folder?"
-msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
+#: identitydialog.cpp:283
+msgid ""
+"Select the S/MIME certificate which should be used to digitally sign your "
+"messages."
+msgstr ""
 
-#: kmmainwidget.cpp:1513
-#, kde-format
+#: identitydialog.cpp:287
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
-"trash?</qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
-"<qt>Ydych wir eisiau symud pob neges o blygell <b>%1</b> i'r sbwriel?</qt>"
 
-#: kmmainwidget.cpp:1533
-msgid "Moved all messages to the trash"
-msgstr "Symudwyd pob neges i'r sbwriel"
+#: identitydialog.cpp:292
+msgid "S/MIME signing certificate:"
+msgstr ""
 
-#: kmmainwidget.cpp:1575
-msgid "Delete Search"
+#: identitydialog.cpp:309
+msgid "Your S/MIME Encryption Certificate"
 msgstr ""
 
-#: kmmainwidget.cpp:1576
-#, kde-format
+#: identitydialog.cpp:310
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?<br />Any messages "
-"it shows will still be available in their original folder.</qt>"
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
-#: kmmainwidget.cpp:1579
-msgctxt "@action:button Delete search"
-msgid "&Delete"
+#: identitydialog.cpp:315
+msgid ""
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1581
-msgid "Delete Folder"
-msgstr "Dileu Plygell"
-
-#: kmmainwidget.cpp:1586
-#, kde-format
-msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
-msgstr "<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b>?</qt>"
+#: identitydialog.cpp:321
+msgid "S/MIME encryption certificate:"
+msgstr ""
 
-#: kmmainwidget.cpp:1590
-#, kde-format
-msgid ""
-"<qt>Are you sure you want to delete the empty folder <resource>%1</resource> "
-"and all its subfolders? Those subfolders might not be empty and their "
-"contents will be discarded as well. <p><b>Beware</b> that discarded messages "
-"are not saved into your Trash folder and are permanently deleted.</p></qt>"
+#: identitydialog.cpp:343
+msgctxt "preferred format of encrypted messages"
+msgid "Preferred format:"
 msgstr ""
 
-#: kmmainwidget.cpp:1599
-#, kde-format
-msgid ""
-"<qt>Are you sure you want to delete the folder <resource>%1</resource>, "
-"discarding its contents? <p><b>Beware</b> that discarded messages are not "
-"saved into your Trash folder and are permanently deleted.</p></qt>"
+#: identitydialog.cpp:357
+msgctxt "@title:tab Advanced identity settings."
+msgid "Advanced"
 msgstr ""
 
-#: kmmainwidget.cpp:1605
-#, kde-format
+#: identitydialog.cpp:370
+msgid "&Reply-To address:"
+msgstr "&Cyfeiriad Ateb-I:"
+
+#: identitydialog.cpp:373
 msgid ""
-"<qt>Are you sure you want to delete the folder <resource>%1</resource> and "
-"all its subfolders, discarding their contents? <p><b>Beware</b> that "
-"discarded messages are not saved into your Trash folder and are permanently "
-"deleted.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> "
+"address.</p><p>This can be useful when you have a group of people working "
+"together in similar roles. For example, you might want any emails sent to "
+"have your email in the <tt>From:</tt> field, but any responses to go to a "
+"group address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
+"<qt><h3>Cyfeiriadau Ateb-I</h3><p>Mae hwn yn gosod y penawd <tt>Ateb-i:</tt> "
+"i gynnwys cyfeiriad ebost gwahanol i'r cyfeiriad <tt>Oddiwrth:</tt> "
+"rferol.</p><p>Gall hyn fod yn ddefnyddiol pan mae gennych cylch o bobl sy'n "
+"gweithio efo'u gilydd mewn ffyrdd tebyg.  Er enghraifft, efallai hoffech i "
+"ebostau a anfonir gael eich cyfeiriad yn y maes <tt>Oddiwrth:</tt>, ond i "
+"ymatebion fynd i gyfeiriad cylch.</p><p>Os mewn amheuaeth, gadewch y maes "
+"yma'n wag.</p></qt>"
 
-#: kmmainwidget.cpp:1612
-msgctxt "@action:button Delete folder"
-msgid "&Delete"
+#: identitydialog.cpp:391
+msgid "&BCC addresses:"
+msgstr "Cyfeiriadau &BCC:"
+
+#: identitydialog.cpp:394
+msgid ""
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:1636
-msgid "Are you sure you want to expire all old messages?"
-msgstr "Ydych wir eisiau darfod pob hen neges?"
+#: identitydialog.cpp:410
+msgid "D&ictionary:"
+msgstr "&Geiriadur:"
 
-#: kmmainwidget.cpp:1637
-msgid "Expire Old Messages?"
-msgstr "Darfod Hen Negeseuon?"
+#: identitydialog.cpp:419
+msgid "Sent-mail &folder:"
+msgstr "&Plygell ebost a anfonwyd:"
 
-#: kmmainwidget.cpp:1637
-msgid "Expire"
-msgstr "Darfod"
+#: identitydialog.cpp:428
+msgid "&Drafts folder:"
+msgstr "Plygell &brasluniau:"
 
-#: kmmainwidget.cpp:1653
-msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
-"increase the likelihood that your system will be compromised by other "
-"present and anticipated security exploits."
+#: identitydialog.cpp:437
+msgid "&Templates folder:"
 msgstr ""
-"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan "
-"\"ebostach\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan "
-"ymelwadau cyfredol a disgwyliedig eraill."
 
-#: kmmainwidget.cpp:1656 kmmainwidget.cpp:1685
-msgid "Security Warning"
-msgstr "Rhybudd Diogelwch"
+#: identitydialog.cpp:443
+msgid "Special &transport:"
+msgstr "Cludiant &arbennig:"
 
-#: kmmainwidget.cpp:1657
-msgid "Use HTML"
+#: identitydialog.cpp:464
+msgid "&Use custom message templates for this identity"
 msgstr ""
 
-#: kmmainwidget.cpp:1682
-msgid ""
-"Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be "
-"compromised by other present and anticipated security exploits."
+#: identitydialog.cpp:481 collectiontemplatespage.cpp:78
+msgid "&Copy Global Templates"
 msgstr ""
 
-#: kmmainwidget.cpp:1686
-msgid "Load External References"
+#: identitydialog.cpp:496 collectiontemplatespage.cpp:40
+msgid "Templates"
 msgstr ""
 
-#: kmmainwidget.cpp:1771
-#, kde-format
-msgid ""
-"<qt>Do you really want to delete the selected message?<br />Once deleted, it "
-"cannot be restored.</qt>"
-msgid_plural ""
-"<qt>Do you really want to delete the %1 selected messages?<br />Once "
-"deleted, they cannot be restored.</qt>"
-msgstr[0] ""
-msgstr[1] ""
+#: identitydialog.cpp:504
+msgid "Signature"
+msgstr "Llofnod"
 
-#: kmmainwidget.cpp:1777
-msgid "Delete Messages"
-msgstr "Dileu Negeseuon"
+#: identitydialog.cpp:513
+msgid "Picture"
+msgstr ""
 
-#: kmmainwidget.cpp:1777
-msgid "Delete Message"
+#: identitydialog.cpp:598
+#, kde-format
+msgid "Invalid Email Alias \"%1\""
 msgstr ""
 
-#: kmmainwidget.cpp:1798
-msgid "Moving messages..."
+#: identitydialog.cpp:642
+#, kde-format
+msgid ""
+"One of the configured OpenPGP signing keys does not contain any user ID with "
+"the configured email address for this identity (%1).\n"
+"This might result in warning messages on the receiving side when trying to "
+"verify signatures made with this configuration."
 msgstr ""
 
-#: kmmainwidget.cpp:1800
-msgid "Deleting messages..."
+#: identitydialog.cpp:650
+#, kde-format
+msgid ""
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
-#: kmmainwidget.cpp:1814
-msgid "Messages deleted successfully."
+#: identitydialog.cpp:656
+#, kde-format
+msgid ""
+"One of the configured S/MIME signing certificates does not contain the "
+"configured email address for this identity (%1).\n"
+"This might result in warning messages on the receiving side when trying to "
+"verify signatures made with this configuration."
 msgstr ""
 
-#: kmmainwidget.cpp:1816
-msgid "Messages moved successfully."
+#: identitydialog.cpp:664
+#, kde-format
+msgid ""
+"One of the configured S/MIME encryption certificates does not contain the "
+"configured email address for this identity (%1)."
 msgstr ""
 
-#: kmmainwidget.cpp:1821
-msgid "Deleting messages failed."
+#: identitydialog.cpp:672
+msgid "Email Address Not Found in Key/Certificates"
 msgstr ""
 
-#: kmmainwidget.cpp:1823
-msgid "Deleting messages canceled."
+#: identitydialog.cpp:687
+msgid "The signature file is not valid"
 msgstr ""
 
-#: kmmainwidget.cpp:1826
-msgid "Moving messages failed."
-msgstr "Methwyd symud y negeseuon."
+#: identitydialog.cpp:709
+#, kde-format
+msgid "Edit Identity \"%1\""
+msgstr "Golygu Dynodiad \"%1\""
 
-#: kmmainwidget.cpp:1828
-msgid "Moving messages canceled."
+#: identitydialog.cpp:739
+#, kde-format
+msgid ""
+"The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
+"therefore, the default sent-mail folder will be used."
 msgstr ""
 
-#: kmmainwidget.cpp:1874
-msgid "Move Messages to Folder"
+#: identitydialog.cpp:751
+#, kde-format
+msgid ""
+"The custom drafts folder for identity \"%1\" does not exist (anymore); "
+"therefore, the default drafts folder will be used."
 msgstr ""
 
-#: kmmainwidget.cpp:1904
-msgid "Copying messages..."
+#: identitydialog.cpp:763
+#, kde-format
+msgid ""
+"The custom templates folder for identity \"%1\" does not exist (anymore); "
+"therefore, the default templates folder will be used."
 msgstr ""
 
-#: kmmainwidget.cpp:1913
-msgid "Messages copied successfully."
+#: collectionmaintenancepage.cpp:44
+msgid "Maintenance"
 msgstr ""
 
-#: kmmainwidget.cpp:1916
-msgid "Copying messages failed."
+#: collectionmaintenancepage.cpp:54
+msgid "Files"
 msgstr ""
 
-#: kmmainwidget.cpp:1918
-msgid "Copying messages canceled."
+#: collectionmaintenancepage.cpp:65
+msgid "Folder type:"
 msgstr ""
 
-#: kmmainwidget.cpp:1925
-msgid "Copy Messages to Folder"
+#: collectionmaintenancepage.cpp:68
+msgctxt "folder size"
+msgid "Not available"
 msgstr ""
 
-#: kmmainwidget.cpp:1960
-msgid "Moving messages to trash..."
+#: collectionmaintenancepage.cpp:69
+msgid "Size:"
 msgstr ""
 
-#: kmmainwidget.cpp:1970
-msgid "Messages moved to trash successfully."
+#: collectionmaintenancepage.cpp:73
+msgid "Messages"
 msgstr ""
 
-#: kmmainwidget.cpp:1973
-msgid "Moving messages to trash failed."
+#: collectionmaintenancepage.cpp:78
+msgid "Total messages:"
 msgstr ""
 
-#: kmmainwidget.cpp:1975
-msgid "Moving messages to trash canceled."
+#: collectionmaintenancepage.cpp:81
+msgid "Unread messages:"
 msgstr ""
 
-#: kmmainwidget.cpp:2207
-msgid "Filter on Mailing-List..."
-msgstr "Hidlo ar Restr Ebost..."
-
-#: kmmainwidget.cpp:2221
-#, kde-format
-msgid "Filter on Mailing-List %1..."
-msgstr "Hidlo ar Restr Ebost %1 ..."
+#: collectionmaintenancepage.cpp:85
+msgid "Indexing"
+msgstr ""
 
-#: kmmainwidget.cpp:2238
-msgid "Jump to Folder"
+#: collectionmaintenancepage.cpp:87
+msgid "Enable Full Text Indexing"
 msgstr ""
 
-#: kmmainwidget.cpp:2277
-msgid "Unable to process messages: "
-msgstr "Methu prosesu'r negeseuon: "
+#: kmreadermainwin.cpp:320 kmmainwidget.cpp:3469
+msgid "Save A&ttachments..."
+msgstr "Cadw A&todiadau..."
 
-#: kmmainwidget.cpp:2310
-msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. "
-"You have not yet configured an IMAP server for this.\n"
-"You can do this on the \"Filtering\" tab of the IMAP account configuration."
+#: kmreadermainwin.cpp:323 kmmainwidget.cpp:4101
+msgid "&Move to Trash"
+msgstr "&Symud i Sbwriel"
+
+#: kmreadermainwin.cpp:324
+msgctxt "@action:intoolbar Move to Trash"
+msgid "Trash"
 msgstr ""
-"Mae swyddogaeth Ateb pan Allan o'r Swyddfa KMail yn dibynnu ar hidlo ar ochr "
-"y gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
-"Gallwch wneud hyn ar dab \"Hidlo\" y ffurfweddiad cyfrif IMAP."
 
-#: kmmainwidget.cpp:2315
-msgid "No Server-Side Filtering Configured"
-msgstr "Ni Ffurfweddir Hidlo ar Ochr y Gweinydd"
+#: kmreadermainwin.cpp:325
+msgid "Move message to trashcan"
+msgstr "Symud y neges i'r sbwriel"
 
-#: kmmainwidget.cpp:2338
-msgid "Could not start certificate manager; please check your installation."
+#: kmreadermainwin.cpp:336 kmmainwidget.cpp:3517
+msgid "&View Source"
+msgstr "&Gweld Tarddiad"
+
+#: kmreadermainwin.cpp:343
+msgid "Select Font"
 msgstr ""
 
-#: kmmainwidget.cpp:2340 kmmainwidget.cpp:2351 filterlogdlg.cpp:269
-msgid "KMail Error"
-msgstr "Gwall KMail"
+#: kmreadermainwin.cpp:348
+msgid "Select Size"
+msgstr ""
 
-#: kmmainwidget.cpp:2349
-msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
-"installation."
+#: kmreadermainwin.cpp:370
+msgid "Copy Item To..."
 msgstr ""
 
-#: kmmainwidget.cpp:2421 kmkernel.cpp:995
-msgid "Work Offline"
+#: kmreadermainwin.cpp:403
+#, kde-format
+msgid "Can not copy item. %1"
 msgstr ""
 
-#: kmmainwidget.cpp:2425 kmkernel.cpp:994
-msgid "Work Online"
+#: searchwindow.cpp:93
+msgid "Find Messages"
 msgstr ""
 
-#: kmmainwidget.cpp:2895
-msgid "Save &As..."
-msgstr "Cad&w Fel..."
+#: searchwindow.cpp:96
+msgctxt "@action:button Search for messages"
+msgid "&Search"
+msgstr ""
 
-#: kmmainwidget.cpp:2904
-msgid "&Expire All Folders"
-msgstr "&Darfod Pob Plygell"
+#: searchwindow.cpp:112
+msgid "Search in &all local folders"
+msgstr "Chwilio mewn &pob un blyfell leol"
 
-#: kmmainwidget.cpp:2909
-msgid "Check &Mail"
-msgstr "Ymofyn am E&bost"
+#: searchwindow.cpp:116
+msgid "Search &only in:"
+msgstr "Chwilio yn &unig yn:"
 
-#: kmmainwidget.cpp:2915
-msgid "Check Mail In"
-msgstr ""
+#: searchwindow.cpp:125
+msgid "I&nclude sub-folders"
+msgstr "C&ynnwys is-blygyll"
 
-#: kmmainwidget.cpp:2916 kmmainwidget.cpp:2917
-msgid "Check Mail"
-msgstr ""
+#: searchwindow.cpp:220
+msgid "Search folder &name:"
+msgstr "&Enw'r blygell chwilio:"
 
-#: kmmainwidget.cpp:2927
-msgid "&Send Queued Messages"
-msgstr "An&fon Negeseuon yn y Rhes"
+#: searchwindow.cpp:230 searchwindow.cpp:458
+msgid "Last Search"
+msgstr "Chwiliad Diwethaf"
 
-#: kmmainwidget.cpp:2932
-msgid "Online status (unknown)"
+#: searchwindow.cpp:240
+msgid "Op&en Search Folder"
 msgstr ""
 
-#: kmmainwidget.cpp:2937
-msgid "Send Queued Messages Via"
+#: searchwindow.cpp:249
+msgid "Open &Message"
 msgstr ""
 
-#: kmmainwidget.cpp:2955
-msgid "Certificate Manager"
-msgstr ""
+#: searchwindow.cpp:260
+msgid "AMiddleLengthText..."
+msgstr "TestunOHydCanolig..."
 
-#: kmmainwidget.cpp:2962
-msgid "GnuPG Log Viewer"
+#: searchwindow.cpp:261
+msgctxt "@info:status finished searching."
+msgid "Ready."
 msgstr ""
 
-#: kmmainwidget.cpp:2974
-msgid "&Import Messages"
+#: searchwindow.cpp:316
+msgctxt "@action:inmenu Forward message inline."
+msgid "&Inline..."
 msgstr ""
 
-#: kmmainwidget.cpp:2982
-msgid "&Debug Sieve..."
-msgstr ""
+#: searchwindow.cpp:321
+msgctxt "Message->Forward->"
+msgid "As &Attachment..."
+msgstr "&Fel Atodiad..."
 
-#: kmmainwidget.cpp:2989
-msgid "Filter &Log Viewer..."
-msgstr ""
+#: searchwindow.cpp:335
+msgid "Save Attachments..."
+msgstr "Cadw Atodiadau...."
 
-#: kmmainwidget.cpp:2994
-msgid "&Anti-Spam Wizard..."
+#: searchwindow.cpp:341
+msgid "Clear Selection"
+msgstr "Gwagu Dewisiad"
+
+#: searchwindow.cpp:422
+#, kde-format
+msgid "%1 match"
+msgid_plural "%1 matches"
+msgstr[0] "%1 cydweddiad"
+msgstr[1] "%1 o gydweddiadau"
+
+#: searchwindow.cpp:423
+#, kde-format
+msgid "Searching in %1"
 msgstr ""
 
-#: kmmainwidget.cpp:2999
-msgid "&Anti-Virus Wizard..."
+#: searchwindow.cpp:530
+#, kde-format
+msgid "Can not get search result. %1"
 msgstr ""
 
-#: kmmainwidget.cpp:3004
-msgid "&Account Wizard..."
+#: searchwindow.cpp:644
+msgid ""
+"There was a problem renaming your search folder. A common reason for this is "
+"that another search folder with the same name already exists."
 msgstr ""
 
-#: kmmainwidget.cpp:3010
-msgid "Edit \"Out of Office\" Replies..."
-msgstr "Golygu Ymatebion \"Allan o'r Swyddfa\"..."
+#: searchwindow.cpp:751
+#, kde-format
+msgid "Copy Message"
+msgid_plural "Copy %1 Messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kmmainwidget.cpp:3025 kmmainwidget.cpp:3846
-msgctxt "@action Hard delete, bypassing trash"
-msgid "&Delete"
+#: searchwindow.cpp:754
+#, kde-format
+msgid "Cut Message"
+msgid_plural "Cut %1 Messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: collectiontemplatespage.cpp:63
+msgid "&Use custom message templates in this folder"
 msgstr ""
 
-#: kmmainwidget.cpp:3030 kmmainwidget.cpp:3848
-msgid "M&ove Thread to Trash"
+#: kmknotify.cpp:42
+msgid "Notification"
 msgstr ""
 
-#: kmmainwidget.cpp:3034
-msgid "Move thread to trashcan"
+#: configagentdelegate.cpp:232
+msgid "Retrieval Options"
 msgstr ""
 
-#: kmmainwidget.cpp:3037 kmmainwidget.cpp:3848
-msgid "Delete T&hread"
+#: codecaction.cpp:58
+msgctxt "Encodings menu"
+msgid "us-ascii"
 msgstr ""
 
-#: kmmainwidget.cpp:3043
-msgid "&Find Messages..."
-msgstr "&Canfod Negeseuon..."
+#: codecaction.cpp:68
+msgctxt "Menu item"
+msgid "Encoding"
+msgstr ""
 
-#: kmmainwidget.cpp:3055
-msgid "Select &All Messages"
-msgstr "Dewis &Pob Neges"
+#: kmmainwidget.cpp:442
+#, kde-format
+msgid "1 new message in %2"
+msgid_plural "%1 new messages in %2"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kmmainwidget.cpp:3063
-msgid "&Mailing List Management..."
+#: kmmainwidget.cpp:463
+#, kde-format
+msgctxt "%1 is a list of the number of new messages per folder"
+msgid "<b>New mail arrived</b><br />%1"
 msgstr ""
 
-#: kmmainwidget.cpp:3068
-msgid "&Assign Shortcut..."
+#: kmmainwidget.cpp:466
+msgid "New mail arrived"
+msgstr "Cyrhaeddodd ebost newydd"
+
+#: kmmainwidget.cpp:1044
+msgid "Set Focus to Quick Search"
 msgstr ""
 
-#: kmmainwidget.cpp:3085
-msgid "&Expiration Settings"
+#: kmmainwidget.cpp:1051
+msgid "Extend Selection to Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3103
-msgid "&Archive Folder..."
+#: kmmainwidget.cpp:1057
+msgid "Extend Selection to Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3107
-msgid "Prefer &HTML to Plain Text"
-msgstr "Gwell &HTML na Testun Plaen"
+#: kmmainwidget.cpp:1192
+msgid "Move Message to Folder"
+msgstr "Symud Neges i Blygell"
 
-#: kmmainwidget.cpp:3111
-msgid "Load E&xternal References"
-msgstr ""
+#: kmmainwidget.cpp:1199
+msgid "Copy Message to Folder"
+msgstr "Copïo Neges i Blygell"
 
-#: kmmainwidget.cpp:3134
-msgid "Copy Message To..."
+#: kmmainwidget.cpp:1206
+msgid "Jump to Folder..."
 msgstr ""
 
-#: kmmainwidget.cpp:3136
-msgid "Move Message To..."
+#: kmmainwidget.cpp:1213
+msgid "Abort Current Operation"
 msgstr ""
 
-#: kmmainwidget.cpp:3141
-msgid "&New Message..."
-msgstr "&Neges Newydd..."
+#: kmmainwidget.cpp:1220
+msgid "Focus on Next Folder"
+msgstr "Canolbwyntio ar y Blygell Nesaf"
 
-#: kmmainwidget.cpp:3143
-msgctxt "@action:intoolbar New Empty Message"
-msgid "New"
+#: kmmainwidget.cpp:1227
+msgid "Focus on Previous Folder"
+msgstr "Canolbwyntio ar y Blygell Flaenorol"
+
+#: kmmainwidget.cpp:1234
+msgid "Select Folder with Focus"
+msgstr "Deiws y Blygell efo'r Canolbwynt"
+
+#: kmmainwidget.cpp:1242
+msgid "Focus on Next Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3151
-msgid "Message From &Template"
+#: kmmainwidget.cpp:1249
+msgid "Focus on Previous Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3161
-msgid "New Message t&o Mailing-List..."
-msgstr "Neges Newydd i &Restr Ebost"
+#: kmmainwidget.cpp:1256
+msgid "Select Message with Focus"
+msgstr ""
 
-#: kmmainwidget.cpp:3168
-msgid "Send A&gain..."
-msgstr "Anfon E&to..."
+#: kmmainwidget.cpp:1423
+msgid ""
+"The Nepomuk semantic search service is not available. Searching is not "
+"possible without it. You can enable it in \"System Settings\"."
+msgstr ""
 
-#: kmmainwidget.cpp:3173
-msgid "&Create Filter"
-msgstr "&Creu Hidlen"
+#: kmmainwidget.cpp:1424
+msgid "Search Not Available"
+msgstr ""
 
-#: kmmainwidget.cpp:3177
-msgid "Filter on &Subject..."
-msgstr "Hidlo ar &Pwnc..."
+#: kmmainwidget.cpp:1432
+msgid ""
+"You have disabled full text indexing of emails. Searching is not possible "
+"without that. You can enable it in \"System Settings\". Note that searching "
+"will only be possible after your emails have been fully indexed, which can "
+"take some time."
+msgstr ""
 
-#: kmmainwidget.cpp:3182
-msgid "Filter on &From..."
-msgstr "Hidlo ar &Oddiwrth..."
+#: kmmainwidget.cpp:1602
+msgid "No Subject"
+msgstr "Dim Pwnc"
 
-#: kmmainwidget.cpp:3187
-msgid "Filter on &To..."
-msgstr "Hidlo ar &I..."
+#: kmmainwidget.cpp:1615
+msgid "(no templates)"
+msgstr ""
 
-#: kmmainwidget.cpp:3192
-msgid "Filter on Mailing-&List..."
-msgstr "Hidlo ar &Restr Ebost..."
+#: kmmainwidget.cpp:1689
+msgid "This folder does not have any expiry options set"
+msgstr "Ni osodir dewisiadau darfod ar gyfer y blygell yma"
 
-#: kmmainwidget.cpp:3197
-msgid "New Message From &Template"
-msgstr ""
+#: kmmainwidget.cpp:1697
+#, kde-format
+msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
+msgstr "<qt>Ydych wir eisiau darfod y blygell <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:3203
-msgid "Mark &Thread"
-msgstr "Nodi &Edefyn"
+#: kmmainwidget.cpp:1699
+msgid "Expire Folder"
+msgstr "Darfod Plygell"
 
-#: kmmainwidget.cpp:3206
-msgid "Mark Thread as &Read"
-msgstr "Nodi Edefyn fel Wedi'i Ddar&llen"
+#: kmmainwidget.cpp:1700
+msgid "&Expire"
+msgstr "Darf&od"
 
-#: kmmainwidget.cpp:3209
-msgid "Mark all messages in the selected thread as read"
-msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
+#: kmmainwidget.cpp:1722
+msgid "Empty Trash"
+msgstr "Gwagu'r Sbwriel"
 
-#: kmmainwidget.cpp:3212
-msgid "Mark Thread as &Unread"
-msgstr "Nodi Edefyn fel &Heb ei Ddarllen"
+#: kmmainwidget.cpp:1722
+msgid "Move to Trash"
+msgstr "Symud i Sbwriel"
 
-#: kmmainwidget.cpp:3215
-msgid "Mark all messages in the selected thread as unread"
-msgstr "Nodi pob neges yn yr edefyn dewisiedig fel heb ei darllen"
+#: kmmainwidget.cpp:1724
+msgid "Are you sure you want to empty the trash folder?"
+msgstr "Ydych wir eisiau gwagu'r blygell sbwriel?"
 
-#: kmmainwidget.cpp:3221
-msgid "Mark Thread as &Important"
-msgstr "Nodi Edefyn fel &Pwysig"
+#: kmmainwidget.cpp:1725
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
+msgstr ""
+"<qt>Ydych wir eisiau symud pob neges o blygell <b>%1</b> i'r sbwriel?</qt>"
 
-#: kmmainwidget.cpp:3224
-msgid "Remove &Important Thread Mark"
+#: kmmainwidget.cpp:1747
+msgid "Moved all messages to the trash"
+msgstr "Symudwyd pob neges i'r sbwriel"
+
+#: kmmainwidget.cpp:1790
+msgid "Delete Search"
 msgstr ""
 
-#: kmmainwidget.cpp:3227
-msgid "Mark Thread as &Action Item"
+#: kmmainwidget.cpp:1791
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br />Any messages "
+"it shows will still be available in their original folder.</qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:3230
-msgid "Remove &Action Item Thread Mark"
+#: kmmainwidget.cpp:1794
+msgctxt "@action:button Delete search"
+msgid "&Delete"
 msgstr ""
 
-#: kmmainwidget.cpp:3234
-msgid "&Watch Thread"
-msgstr "&Gwylio ar yr Edefyn"
+#: kmmainwidget.cpp:1796
+msgid "Delete Folder"
+msgstr "Dileu Plygell"
 
-#: kmmainwidget.cpp:3238
-msgid "&Ignore Thread"
-msgstr "&Anwybyddu'r Edefyn"
+#: kmmainwidget.cpp:1801
+#, kde-format
+msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
+msgstr "<qt>Ydych wir eisiau gwaredu'r blygell wag <b>%1</b>?</qt>"
 
-#: kmmainwidget.cpp:3246 kmreadermainwin.cpp:282
-msgid "Save A&ttachments..."
-msgstr "Cadw A&todiadau..."
+#: kmmainwidget.cpp:1805
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to delete the empty folder <resource>%1</resource> "
+"and all its subfolders? Those subfolders might not be empty and their "
+"contents will be discarded as well. <p><b>Beware</b> that discarded messages "
+"are not saved into your Trash folder and are permanently deleted.</p></qt>"
+msgstr ""
 
-#: kmmainwidget.cpp:3255
-msgid "Appl&y All Filters"
+#: kmmainwidget.cpp:1814
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to delete the folder <resource>%1</resource>, "
+"discarding its contents? <p><b>Beware</b> that discarded messages are not "
+"saved into your Trash folder and are permanently deleted.</p></qt>"
 msgstr ""
 
-#. i18n: file: kmail_part.rc:153
-#. i18n: ectx: Menu (apply_filter_actions)
-#. i18n: file: kmmainwin.rc:153
-#. i18n: ectx: Menu (apply_filter_actions)
-#: kmmainwidget.cpp:3261 rc.cpp:524 rc.cpp:847
-msgid "A&pply Filter"
+#: kmmainwidget.cpp:1820
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to delete the folder <resource>%1</resource> and "
+"all its subfolders, discarding their contents? <p><b>Beware</b> that "
+"discarded messages are not saved into your Trash folder and are permanently "
+"deleted.</p></qt>"
 msgstr ""
 
-#: kmmainwidget.cpp:3265
-msgctxt "View->"
-msgid "&Expand Thread"
-msgstr "&Ehangu Edefyn"
+#: kmmainwidget.cpp:1827
+msgctxt "@action:button Delete folder"
+msgid "&Delete"
+msgstr ""
 
-#: kmmainwidget.cpp:3268
-msgid "Expand the current thread"
-msgstr "Ehangu'r edefyn cyfredol"
+#: kmmainwidget.cpp:1860
+msgid "Are you sure you want to expire all old messages?"
+msgstr "Ydych wir eisiau darfod pob hen neges?"
 
-#: kmmainwidget.cpp:3272
-msgctxt "View->"
-msgid "&Collapse Thread"
-msgstr "&Dad-ehangu'r Edefyn"
+#: kmmainwidget.cpp:1861
+msgid "Expire Old Messages?"
+msgstr "Darfod Hen Negeseuon?"
 
-#: kmmainwidget.cpp:3275
-msgid "Collapse the current thread"
-msgstr "Dad-ehangu'r edefyn cyfredol"
+#: kmmainwidget.cpp:1861
+msgid "Expire"
+msgstr "Darfod"
 
-#: kmmainwidget.cpp:3279
-msgctxt "View->"
-msgid "Ex&pand All Threads"
-msgstr "Ehangu &Pob Edefyn"
+#: kmmainwidget.cpp:1877
+msgid ""
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
+msgstr ""
+"Bydd defnyddio HTML yn ebost yn eich gwneud yn fwy archolladwy gan "
+"\"ebostach\" a gall cynyddu'r debygrwydd y peryglir eich cysawd gan "
+"ymelwadau cyfredol a disgwyliedig eraill."
 
-#: kmmainwidget.cpp:3282
-msgid "Expand all threads in the current folder"
-msgstr "Ehangu pob edefyn yn y blygell gyfredol"
+#: kmmainwidget.cpp:1880 kmmainwidget.cpp:1909
+msgid "Security Warning"
+msgstr "Rhybudd Diogelwch"
 
-#: kmmainwidget.cpp:3286
-msgctxt "View->"
-msgid "C&ollapse All Threads"
-msgstr "Dad-ehangu Po&b Edefyn"
+#: kmmainwidget.cpp:1881
+msgid "Use HTML"
+msgstr ""
 
-#: kmmainwidget.cpp:3289
-msgid "Collapse all threads in the current folder"
-msgstr "Dad-ehangu pob edefyn yn y blygell gyfredol"
-
-#: kmmainwidget.cpp:3293 kmreadermainwin.cpp:298
-msgid "&View Source"
-msgstr "&Gweld Tarddiad"
-
-#: kmmainwidget.cpp:3298
-msgid "&Display Message"
-msgstr "&Dangos Neges"
-
-#: kmmainwidget.cpp:3305
-msgid "&Next Message"
-msgstr "&Neges Nesaf"
-
-#: kmmainwidget.cpp:3308
-msgid "Go to the next message"
-msgstr "Mynd i'r neges nesaf"
-
-#: kmmainwidget.cpp:3312
-msgid "Next &Unread Message"
-msgstr "Neges Nesaf &Heb ei Darllen"
-
-#: kmmainwidget.cpp:3320
-msgctxt "@action:inmenu Goto next unread message"
-msgid "Next"
+#: kmmainwidget.cpp:1906
+msgid ""
+"Loading external references in html mail will make you more vulnerable to "
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 
-#: kmmainwidget.cpp:3321
-msgid "Go to the next unread message"
-msgstr "Mynd i'r neges nesaf heb ei darllen"
-
-#: kmmainwidget.cpp:3325
-msgid "&Previous Message"
-msgstr "Neges &Blaenorol"
-
-#: kmmainwidget.cpp:3327
-msgid "Go to the previous message"
-msgstr "Mynd i'r neges blaenorol"
-
-#: kmmainwidget.cpp:3332
-msgid "Previous Unread &Message"
-msgstr "Neges Bl&aenorol Heb ei Darllen"
-
-#: kmmainwidget.cpp:3340
-msgctxt "@action:inmenu Goto previous unread message."
-msgid "Previous"
+#: kmmainwidget.cpp:1910
+msgid "Load External References"
 msgstr ""
 
-#: kmmainwidget.cpp:3341
-msgid "Go to the previous unread message"
-msgstr "Mynd i'r neges blaenorol heb ei darllen"
-
-#: kmmainwidget.cpp:3345
-msgid "Next Unread &Folder"
-msgstr "&Plygell Nesaf Heb ei Darllen"
-
-#: kmmainwidget.cpp:3349
-msgid "Go to the next folder with unread messages"
-msgstr "Mynd i'r blygell nesaf efo negeseuon heb eu darllen"
-
-#: kmmainwidget.cpp:3355
-msgid "Previous Unread F&older"
-msgstr "Plyg&ell Flaenorol Heb ei Ddarllen"
-
-#: kmmainwidget.cpp:3358
-msgid "Go to the previous folder with unread messages"
-msgstr "Mynd i'r blygell flaenorol efo negeseuon heb eu darllen"
-
-#: kmmainwidget.cpp:3365
-msgctxt "Go->"
-msgid "Next Unread &Text"
-msgstr "&Testun Nesaf heb ei Ddarllen"
-
-#: kmmainwidget.cpp:3368
-msgid "Go to the next unread text"
-msgstr "Mynd i'r testun nesaf heb ei ddarllen"
-
-#: kmmainwidget.cpp:3369
+#: kmmainwidget.cpp:2003
+#, kde-format
 msgid ""
-"Scroll down current message. If at end of current message, go to next unread "
-"message."
-msgstr ""
-"Sgrolio i lawr y neges gyfredol.  Os wrth waelod y neges gyfredol, mynd i'r "
-"neges nesaf heb ei darllen."
+"<qt>Do you really want to delete the selected message?<br />Once deleted, it "
+"cannot be restored.</qt>"
+msgid_plural ""
+"<qt>Do you really want to delete the %1 selected messages?<br />Once "
+"deleted, they cannot be restored.</qt>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kmmainwidget.cpp:3377
-msgid "Configure &Filters..."
-msgstr "Ffurfweddu &Hidlau..."
+#: kmmainwidget.cpp:2009
+msgid "Delete Messages"
+msgstr "Dileu Negeseuon"
 
-#: kmmainwidget.cpp:3383
-msgid "Manage &Sieve Scripts..."
+#: kmmainwidget.cpp:2009
+msgid "Delete Message"
 msgstr ""
 
-#: kmmainwidget.cpp:3388
-msgid "KMail &Introduction"
-msgstr "&Cyflwyniad KMail"
-
-#: kmmainwidget.cpp:3390
-msgid "Display KMail's Welcome Page"
-msgstr "Dangos Tudalen Groeso KMail"
-
-#: kmmainwidget.cpp:3399
-msgid "Configure &Notifications..."
-msgstr "Ffurfweddu &Hysbysiadau..."
+#: kmmainwidget.cpp:2030
+msgid "Moving messages..."
+msgstr ""
 
-#: kmmainwidget.cpp:3406
-msgid "&Configure KMail..."
-msgstr "&Furffweddu KMail..."
+#: kmmainwidget.cpp:2032
+msgid "Deleting messages..."
+msgstr ""
 
-#: kmmainwidget.cpp:3412
-msgid "Expire..."
-msgstr "Darfod ..."
+#: kmmainwidget.cpp:2046
+msgid "Messages deleted successfully."
+msgstr ""
 
-#: kmmainwidget.cpp:3418
-msgid "Add Favorite Folder..."
+#: kmmainwidget.cpp:2048
+msgid "Messages moved successfully."
 msgstr ""
 
-#: kmmainwidget.cpp:3447
-msgid "Add Favorite Folder"
+#: kmmainwidget.cpp:2053
+msgid "Deleting messages failed."
 msgstr ""
 
-#: kmmainwidget.cpp:3768
-msgid "E&mpty Trash"
-msgstr "Gwagu'r &Sbwriel"
+#: kmmainwidget.cpp:2055
+msgid "Deleting messages canceled."
+msgstr ""
 
-#: kmmainwidget.cpp:3768
-msgid "&Move All Messages to Trash"
-msgstr "&Symud Pob Neges i'r Sbwriel"
+#: kmmainwidget.cpp:2058
+msgid "Moving messages failed."
+msgstr "Methwyd symud y negeseuon."
 
-#: kmmainwidget.cpp:3841
-msgid "&Delete Search"
+#: kmmainwidget.cpp:2060
+msgid "Moving messages canceled."
 msgstr ""
 
-#: kmmainwidget.cpp:3841
-msgid "&Delete Folder"
-msgstr "Dile&u Plygell"
-
-#: kmmainwidget.cpp:3846 kmreadermainwin.cpp:285
-msgid "&Move to Trash"
-msgstr "&Symud i Sbwriel"
+#: kmmainwidget.cpp:2106
+msgid "Move Messages to Folder"
+msgstr ""
 
-#: kmmainwidget.cpp:3967
-#, kde-format
-msgid "Filter %1"
-msgstr "Hidlo %1"
+#: kmmainwidget.cpp:2136
+msgid "Copying messages..."
+msgstr ""
 
-#: kmmainwidget.cpp:4147
-msgid "Out of office reply active"
+#: kmmainwidget.cpp:2145
+msgid "Messages copied successfully."
 msgstr ""
 
-#: kmmainwidget.cpp:4267
-#, kde-format
-msgctxt "@title:window"
-msgid "Properties of Folder %1"
+#: kmmainwidget.cpp:2148
+msgid "Copying messages failed."
 msgstr ""
 
-#: foldershortcutdialog.cpp:63
-#, kde-format
-msgid "Shortcut for Folder %1"
+#: kmmainwidget.cpp:2150
+msgid "Copying messages canceled."
 msgstr ""
 
-#: foldershortcutdialog.cpp:67
-msgid "Select Shortcut for Folder"
+#: kmmainwidget.cpp:2157
+msgid "Copy Messages to Folder"
 msgstr ""
 
-#: foldershortcutdialog.cpp:69
-msgid ""
-"<qt>To choose a key or a combination of keys which select the current "
-"folder, click the button below and then press the key(s) you wish to "
-"associate with this folder.</qt>"
+#: kmmainwidget.cpp:2192
+msgid "Moving messages to trash..."
 msgstr ""
 
-#: kmkernel.cpp:261
-msgid ""
-"<b>Thanks for using KMail2!</b><p>KMail2 uses a new storage technology that "
-"requires migration of your current KMail data and configuration.</p>\n"
-"<p>The conversion process can take a lot of time (depending on the amount of "
-"email you have) and it <em>must not be interrupted</em>.</p>\n"
-"<p>You can:</p><ul><li>Migrate now (be prepared to wait)</li><li>Skip the "
-"migration and start with fresh data and configuration</li><li>Cancel and "
-"exit KMail2.</li></ul><p><a href=\"http://userbase.kde.org/Akonadi\">More "
-"Information...</a></p>"
+#: kmmainwidget.cpp:2202
+msgid "Messages moved to trash successfully."
 msgstr ""
 
-#: kmkernel.cpp:270
-msgid "KMail Migration"
+#: kmmainwidget.cpp:2205
+msgid "Moving messages to trash failed."
 msgstr ""
 
-#: kmkernel.cpp:270
-msgid "Migrate Now"
+#: kmmainwidget.cpp:2207
+msgid "Moving messages to trash canceled."
 msgstr ""
 
-#: kmkernel.cpp:270
-msgid "Skip Migration"
+#: kmmainwidget.cpp:2461
+msgid "Jump to Folder"
 msgstr ""
 
-#: kmkernel.cpp:303
+#: kmmainwidget.cpp:2532
 msgid ""
-"Migration to KMail 2 failed. In case you want to try again, run 'kmail-"
-"migrator --interactive' manually."
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
+"You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
+"Mae swyddogaeth Ateb pan Allan o'r Swyddfa KMail yn dibynnu ar hidlo ar ochr "
+"y gweinydd.  Nid ydych wedi ffurfweddu gweinydd IMAP eto ar gyfer hyn.\n"
+"Gallwch wneud hyn ar dab \"Hidlo\" y ffurfweddiad cyfrif IMAP."
 
-#: kmkernel.cpp:304
-msgid "Migration Failed"
-msgstr ""
+#: kmmainwidget.cpp:2537
+msgid "No Server-Side Filtering Configured"
+msgstr "Ni Ffurfweddir Hidlo ar Ochr y Gweinydd"
 
-#: kmkernel.cpp:921
-msgid "KMail is set to be offline; all network jobs are suspended"
+#: kmmainwidget.cpp:2560
+msgid "Could not start certificate manager; please check your installation."
 msgstr ""
 
-#: kmkernel.cpp:940
-msgid "KMail is set to be online; all network jobs resumed"
-msgstr ""
+#: kmmainwidget.cpp:2562 kmmainwidget.cpp:2573
+msgid "KMail Error"
+msgstr "Gwall KMail"
 
-#: kmkernel.cpp:991
-msgid "KMail is currently in offline mode. How do you want to proceed?"
+#: kmmainwidget.cpp:2571
+msgid ""
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr ""
 
-#: kmkernel.cpp:1093
-#, kde-format
-msgid ""
-"Failed to open autosave file at %1.\n"
-"Reason: %2"
+#: kmmainwidget.cpp:2659
+msgid "Network connection detected, all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1095
-msgid "Opening Autosave File Failed"
+#: kmmainwidget.cpp:2663
+msgid "No network connection detected, all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1600
-#, kde-format
-msgid "This identity has been changed to use the default transport:"
-msgid_plural ""
-"These %1 identities have been changed to use the default transport:"
-msgstr[0] ""
-msgstr[1] ""
+#: kmmainwidget.cpp:3118
+msgid "Save &As..."
+msgstr "Cad&w Fel..."
 
-#: kmkernel.cpp:1623
-#, kde-format
-msgid "This identity has been changed to use the modified transport:"
-msgid_plural ""
-"These %1 identities have been changed to use the modified transport:"
-msgstr[0] ""
-msgstr[1] ""
+#: kmmainwidget.cpp:3127
+msgid "&Expire All Folders"
+msgstr "&Darfod Pob Plygell"
 
-#: kmkernel.cpp:1637
-msgid "Sending messages"
-msgstr ""
+#: kmmainwidget.cpp:3132
+msgid "Check &Mail"
+msgstr "Ymofyn am E&bost"
 
-#: kmkernel.cpp:1638
-msgid "Initiating sending process..."
+#: kmmainwidget.cpp:3138
+msgid "Check Mail In"
 msgstr ""
 
-#: filterlogdlg.cpp:58
-msgid "Filter Log Viewer"
+#: kmmainwidget.cpp:3139 kmmainwidget.cpp:3140
+msgid "Check Mail"
 msgstr ""
 
-#: filterlogdlg.cpp:81
-msgid "&Log filter activities"
-msgstr ""
+#: kmmainwidget.cpp:3150
+msgid "&Send Queued Messages"
+msgstr "An&fon Negeseuon yn y Rhes"
 
-#: filterlogdlg.cpp:86
-msgid ""
-"You can turn logging of filter activities on and off here. Of course, log "
-"data is collected and shown only when logging is turned on. "
+#: kmmainwidget.cpp:3160
+msgid "Online status (unknown)"
 msgstr ""
 
-#: filterlogdlg.cpp:90
-msgid "Logging Details"
+#: kmmainwidget.cpp:3163
+msgid "Send Queued Messages Via"
 msgstr ""
 
-#: filterlogdlg.cpp:97
-msgid "Log pattern description"
+#: kmmainwidget.cpp:3181
+msgid "Certificate Manager"
 msgstr ""
 
-#. i18n( "" ) );
-#: filterlogdlg.cpp:107
-msgid "Log filter &rule evaluation"
+#: kmmainwidget.cpp:3188
+msgid "GnuPG Log Viewer"
 msgstr ""
 
-#: filterlogdlg.cpp:114
-msgid ""
-"You can control the feedback in the log concerning the evaluation of the "
-"filter rules of applied filters: having this option checked will give "
-"detailed feedback for each single filter rule; alternatively, only feedback "
-"about the result of the evaluation of all rules of a single filter will be "
-"given."
+#: kmmainwidget.cpp:3200
+msgid "&Import Messages"
 msgstr ""
 
-#: filterlogdlg.cpp:121
-msgid "Log filter pattern evaluation"
+#: kmmainwidget.cpp:3208
+msgid "&Debug Sieve..."
 msgstr ""
 
-#. i18n( "" ) );
-#: filterlogdlg.cpp:131
-msgid "Log filter actions"
+#: kmmainwidget.cpp:3215
+msgid "Filter &Log Viewer..."
 msgstr ""
 
-#: filterlogdlg.cpp:142
-msgid "Log size limit:"
+#: kmmainwidget.cpp:3220
+msgid "&Anti-Spam Wizard..."
 msgstr ""
 
-#: filterlogdlg.cpp:150
-msgctxt "@label:spinbox Set the size of the logfile to unlimited."
-msgid "unlimited"
+#: kmmainwidget.cpp:3225
+msgid "&Anti-Virus Wizard..."
 msgstr ""
 
-#: filterlogdlg.cpp:154
-msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you "
-"can limit the maximum amount of memory to be used: if the size of the "
-"collected log data exceeds this limit then the oldest data will be discarded "
-"until the limit is no longer exceeded. "
+#: kmmainwidget.cpp:3230
+msgid "&Account Wizard..."
 msgstr ""
 
-#: filterlogdlg.cpp:265
-#, kde-format
-msgid ""
-"Could not write the file %1:\n"
-"\"%2\" is the detailed error description."
+#: kmmainwidget.cpp:3236
+msgid "Edit \"Out of Office\" Replies..."
+msgstr "Golygu Ymatebion \"Allan o'r Swyddfa\"..."
+
+#: kmmainwidget.cpp:3251 kmmainwidget.cpp:4101
+msgctxt "@action Hard delete, bypassing trash"
+msgid "&Delete"
 msgstr ""
 
-#: backupjob.cpp:98
-msgid "Unable to retrieve folder list."
+#: kmmainwidget.cpp:3256 kmmainwidget.cpp:4103
+msgid "M&ove Thread to Trash"
 msgstr ""
 
-#: backupjob.cpp:122
-msgid "The operation was canceled by the user."
+#: kmmainwidget.cpp:3260
+msgid "Move thread to trashcan"
 msgstr ""
 
-#: backupjob.cpp:149
-#, kde-format
-msgid "Failed to archive the folder '%1'."
+#: kmmainwidget.cpp:3263 kmmainwidget.cpp:4103
+msgid "Delete T&hread"
 msgstr ""
 
-#: backupjob.cpp:151
-msgid "Archiving failed"
+#: kmmainwidget.cpp:3269
+msgid "&Find Messages..."
+msgstr "&Canfod Negeseuon..."
+
+#: kmmainwidget.cpp:3281
+msgid "Select &All Messages"
+msgstr "Dewis &Pob Neges"
+
+#: kmmainwidget.cpp:3289
+msgid "&Mailing List Management..."
 msgstr ""
 
-#: backupjob.cpp:160
-msgid "Unable to finalize the archive file."
+#: kmmainwidget.cpp:3294
+msgid "&Assign Shortcut..."
 msgstr ""
 
-#: backupjob.cpp:165 backupjob.cpp:178
-msgid "Archiving finished"
+#: kmmainwidget.cpp:3311
+msgid "&Expiration Settings"
 msgstr ""
 
-#: backupjob.cpp:170
-#, kde-format
-msgid ""
-"Archiving folder '%1' successfully completed. The archive was written to the "
-"file '%2'."
+#: kmmainwidget.cpp:3329
+msgid "&Archive Folder..."
 msgstr ""
 
-#: backupjob.cpp:173
-#, kde-format
-msgid "1 message of size %2 was archived."
-msgid_plural "%1 messages with the total size of %2 were archived."
-msgstr[0] ""
-msgstr[1] ""
-
-#: backupjob.cpp:176
-#, kde-format
-msgid "The archive file has a size of %1."
-msgstr ""
-
-#: backupjob.cpp:227
-#, kde-format
-msgid "Failed to write a message into the archive folder '%1'."
-msgstr ""
+#: kmmainwidget.cpp:3333
+msgid "Prefer &HTML to Plain Text"
+msgstr "Gwell &HTML na Testun Plaen"
 
-#: backupjob.cpp:250
-#, kde-format
-msgid "Downloading a message in folder '%1' failed."
+#: kmmainwidget.cpp:3337
+msgid "Load E&xternal References"
 msgstr ""
 
-#: backupjob.cpp:315
-#, kde-format
-msgid "Archiving folder %1"
+#: kmmainwidget.cpp:3360
+msgid "Copy Message To..."
 msgstr ""
 
-#: backupjob.cpp:332
-#, kde-format
-msgid ""
-"Unable to create folder structure for folder '%1' within archive file."
+#: kmmainwidget.cpp:3362
+msgid "Move Message To..."
 msgstr ""
 
-#: backupjob.cpp:346
-#, kde-format
-msgid "Unable to get message list for folder %1."
-msgstr ""
+#: kmmainwidget.cpp:3367
+msgid "&New Message..."
+msgstr "&Neges Newydd..."
 
-#: backupjob.cpp:386
-msgid "Unable to open archive for writing."
+#: kmmainwidget.cpp:3369
+msgctxt "@action:intoolbar New Empty Message"
+msgid "New"
 msgstr ""
 
-#: backupjob.cpp:392
-msgid "Archiving"
+#: kmmainwidget.cpp:3377
+msgid "Message From &Template"
 msgstr ""
 
-#: newidentitydialog.cpp:46
-msgid "New Identity"
-msgstr "Dynodiad Newydd"
-
-#: newidentitydialog.cpp:61
-msgid "&New identity:"
-msgstr "D&ynodiad newydd:"
+#: kmmainwidget.cpp:3387
+msgid "New Message t&o Mailing-List..."
+msgstr "Neges Newydd i &Restr Ebost"
 
-#: newidentitydialog.cpp:71
-msgid "&With empty fields"
-msgstr "&Efo meyseydd gwag"
+#: kmmainwidget.cpp:3394
+msgid "Send A&gain..."
+msgstr "Anfon E&to..."
 
-#: newidentitydialog.cpp:77
-msgid "&Use System Settings values"
-msgstr ""
+#: kmmainwidget.cpp:3399
+msgid "&Create Filter"
+msgstr "&Creu Hidlen"
 
-#: newidentitydialog.cpp:82
-msgid "&Duplicate existing identity"
-msgstr "D&yblygu dynodiad sy'n bodoli"
+#: kmmainwidget.cpp:3403
+msgid "Filter on &Subject..."
+msgstr "Hidlo ar &Pwnc..."
 
-#: newidentitydialog.cpp:93
-msgid "&Existing identities:"
-msgstr "Dynodiadau &sy'n bodoli:"
+#: kmmainwidget.cpp:3408
+msgid "Filter on &From..."
+msgstr "Hidlo ar &Oddiwrth..."
 
-#: identitypage.cpp:222
-#, kde-format
-msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
-msgstr "<qt>Ydych wir eisiau gwaredu'r dynodiad o'r enw <b>%1</b>?</qt>"
+#: kmmainwidget.cpp:3413
+msgid "Filter on &To..."
+msgstr "Hidlo ar &I..."
 
-#: identitypage.cpp:224
-msgid "Remove Identity"
+#: kmmainwidget.cpp:3420
+msgid "New Message From &Template"
 msgstr ""
 
-#: identitypage.cpp:269 configuredialog.cpp:2569
-msgid "Add..."
-msgstr "Ychwanegu..."
-
-#: identitypage.cpp:271 configuredialog.cpp:2571
-msgid "Modify..."
-msgstr "Addasu..."
+#: kmmainwidget.cpp:3426
+msgid "Mark &Thread"
+msgstr "Nodi &Edefyn"
 
-#: identitypage.cpp:273
-msgid "Remove"
-msgstr ""
+#: kmmainwidget.cpp:3429
+msgid "Mark Thread as &Read"
+msgstr "Nodi Edefyn fel Wedi'i Ddar&llen"
 
-#: identitypage.cpp:276
-msgid "Set as Default"
-msgstr "Gosod fel Rhagosod"
+#: kmmainwidget.cpp:3432
+msgid "Mark all messages in the selected thread as read"
+msgstr "Nodi pob neges yn yr edefyn dewisiedig fel wedi'i darllen"
 
-#: kmreadermainwin.cpp:286
-msgctxt "@action:intoolbar Move to Trash"
-msgid "Trash"
-msgstr ""
+#: kmmainwidget.cpp:3435
+msgid "Mark Thread as &Unread"
+msgstr "Nodi Edefyn fel &Heb ei Ddarllen"
 
-#: kmreadermainwin.cpp:287
-msgid "Move message to trashcan"
-msgstr "Symud y neges i'r sbwriel"
+#: kmmainwidget.cpp:3438
+msgid "Mark all messages in the selected thread as unread"
+msgstr "Nodi pob neges yn yr edefyn dewisiedig fel heb ei darllen"
 
-#: kmreadermainwin.cpp:305
-msgid "Select Font"
-msgstr ""
+#: kmmainwidget.cpp:3444
+msgid "Mark Thread as &Important"
+msgstr "Nodi Edefyn fel &Pwysig"
 
-#: kmreadermainwin.cpp:310
-msgid "Select Size"
+#: kmmainwidget.cpp:3447
+msgid "Remove &Important Thread Mark"
 msgstr ""
 
-#: util.cpp:108
-msgid "Could not start the account wizard. Please check your installation."
+#: kmmainwidget.cpp:3450
+msgid "Mark Thread as &Action Item"
 msgstr ""
 
-#: util.cpp:110
-msgid "Unable to start account wizard"
+#: kmmainwidget.cpp:3453
+msgid "Remove &Action Item Thread Mark"
 msgstr ""
 
-#: collectionviewpage.cpp:51
-msgctxt "@title:tab View settings for a folder."
-msgid "View"
-msgstr ""
+#: kmmainwidget.cpp:3457
+msgid "&Watch Thread"
+msgstr "&Gwylio ar yr Edefyn"
 
-#: collectionviewpage.cpp:71
-msgid "Use custom &icons"
-msgstr "Defnyddio &eiconau addasiedig"
+#: kmmainwidget.cpp:3461
+msgid "&Ignore Thread"
+msgstr "&Anwybyddu'r Edefyn"
 
-#: collectionviewpage.cpp:74
-msgctxt "Icon used for folders with no unread messages."
-msgid "&Normal:"
+#: kmmainwidget.cpp:3478
+msgid "Appl&y All Filters"
 msgstr ""
 
-#: collectionviewpage.cpp:87
-msgctxt "Icon used for folders which do have unread messages."
-msgid "&Unread:"
+#. i18n: file: kmmainwin.rc:163
+#. i18n: ectx: Menu (apply_filter_actions)
+#. i18n: file: kmail_part.rc:163
+#. i18n: ectx: Menu (apply_filter_actions)
+#: kmmainwidget.cpp:3484 rc.cpp:35 rc.cpp:80
+msgid "A&pply Filter"
 msgstr ""
 
-#: collectionviewpage.cpp:124
-msgid "Show Sender/Receiver Column in List of Messages"
+#: kmmainwidget.cpp:3488
+msgctxt "View->"
+msgid "&Expand Thread / Group"
 msgstr ""
 
-#: collectionviewpage.cpp:126
-msgid "Sho&w column:"
+#: kmmainwidget.cpp:3491
+msgid "Expand the current thread or group"
 msgstr ""
 
-#: collectionviewpage.cpp:130
-msgctxt "@item:inlistbox Show default value."
-msgid "Default"
+#: kmmainwidget.cpp:3495
+msgctxt "View->"
+msgid "&Collapse Thread / Group"
 msgstr ""
 
-#: collectionviewpage.cpp:131
-msgctxt "@item:inlistbox Show sender."
-msgid "Sender"
+#: kmmainwidget.cpp:3498
+msgid "Collapse the current thread or group"
 msgstr ""
 
-#: collectionviewpage.cpp:132
-msgctxt "@item:inlistbox Show receiver."
-msgid "Receiver"
-msgstr ""
+#: kmmainwidget.cpp:3502
+msgctxt "View->"
+msgid "Ex&pand All Threads"
+msgstr "Ehangu &Pob Edefyn"
 
-#: collectionviewpage.cpp:140 configuredialog.cpp:695 configuredialog.cpp:730
-msgid "Message List"
-msgstr "Rhestr Negeseuon"
+#: kmmainwidget.cpp:3505
+msgid "Expand all threads in the current folder"
+msgstr "Ehangu pob edefyn yn y blygell gyfredol"
 
-#: collectionviewpage.cpp:147
-msgid "Use default aggregation"
-msgstr ""
+#: kmmainwidget.cpp:3509
+msgctxt "View->"
+msgid "C&ollapse All Threads"
+msgstr "Dad-ehangu Po&b Edefyn"
 
-#: collectionviewpage.cpp:154
-msgid "Aggregation"
-msgstr ""
+#: kmmainwidget.cpp:3512
+msgid "Collapse all threads in the current folder"
+msgstr "Dad-ehangu pob edefyn yn y blygell gyfredol"
 
-#: collectionviewpage.cpp:170
-msgid "Use default theme"
-msgstr ""
+#: kmmainwidget.cpp:3522
+msgid "&Display Message"
+msgstr "&Dangos Neges"
 
-#: collectionviewpage.cpp:177
-msgid "Theme"
-msgstr ""
+#: kmmainwidget.cpp:3531
+msgid "&Next Message"
+msgstr "&Neges Nesaf"
 
-#: tagactionmanager.cpp:117
-#, kde-format
-msgid "Message Tag %1"
-msgstr ""
+#: kmmainwidget.cpp:3534
+msgid "Go to the next message"
+msgstr "Mynd i'r neges nesaf"
 
-#: tagactionmanager.cpp:163
-#, kde-format
-msgid "Toggle Message Tag %1"
-msgstr ""
+#: kmmainwidget.cpp:3538
+msgid "Next &Unread Message"
+msgstr "Neges Nesaf &Heb ei Darllen"
 
-#: snippetwidget.cpp:77
-msgid "Text Snippets"
+#: kmmainwidget.cpp:3546
+msgctxt "@action:inmenu Goto next unread message"
+msgid "Next"
 msgstr ""
 
-#: kmail_options.h:12
-msgid "Set subject of message"
-msgstr ""
+#: kmmainwidget.cpp:3547
+msgid "Go to the next unread message"
+msgstr "Mynd i'r neges nesaf heb ei darllen"
 
-#: kmail_options.h:14
-msgid "Send CC: to 'address'"
-msgstr ""
+#: kmmainwidget.cpp:3551
+msgid "&Previous Message"
+msgstr "Neges &Blaenorol"
 
-#: kmail_options.h:16
-msgid "Send BCC: to 'address'"
-msgstr ""
+#: kmmainwidget.cpp:3553
+msgid "Go to the previous message"
+msgstr "Mynd i'r neges blaenorol"
 
-#: kmail_options.h:18
-msgid "Add 'header' to message"
-msgstr ""
+#: kmmainwidget.cpp:3558
+msgid "Previous Unread &Message"
+msgstr "Neges Bl&aenorol Heb ei Darllen"
 
-#: kmail_options.h:19
-msgid "Read message body from 'file'"
+#: kmmainwidget.cpp:3566
+msgctxt "@action:inmenu Goto previous unread message."
+msgid "Previous"
 msgstr ""
 
-#: kmail_options.h:20
-msgid "Set body of message"
-msgstr ""
+#: kmmainwidget.cpp:3567
+msgid "Go to the previous unread message"
+msgstr "Mynd i'r neges blaenorol heb ei darllen"
 
-#: kmail_options.h:21
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr ""
+#: kmmainwidget.cpp:3571
+msgid "Next Unread &Folder"
+msgstr "&Plygell Nesaf Heb ei Darllen"
 
-#: kmail_options.h:22
-msgid "Only check for new mail"
-msgstr ""
+#: kmmainwidget.cpp:3575
+msgid "Go to the next folder with unread messages"
+msgstr "Mynd i'r blygell nesaf efo negeseuon heb eu darllen"
 
-#: kmail_options.h:23
-msgid "Only open composer window"
-msgstr ""
+#: kmmainwidget.cpp:3581
+msgid "Previous Unread F&older"
+msgstr "Plyg&ell Flaenorol Heb ei Ddarllen"
 
-#: kmail_options.h:24
-msgid "View the given message file"
-msgstr ""
+#: kmmainwidget.cpp:3584
+msgid "Go to the previous folder with unread messages"
+msgstr "Mynd i'r blygell flaenorol efo negeseuon heb eu darllen"
 
-#: kmail_options.h:25
-msgid "Send message to 'address' or attach the file the 'URL' points to"
-msgstr ""
+#: kmmainwidget.cpp:3591
+msgctxt "Go->"
+msgid "Next Unread &Text"
+msgstr "&Testun Nesaf heb ei Ddarllen"
+
+#: kmmainwidget.cpp:3594
+msgid "Go to the next unread text"
+msgstr "Mynd i'r testun nesaf heb ei ddarllen"
 
-#: configuredialog.cpp:150
+#: kmmainwidget.cpp:3595
 msgid ""
-"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
-"this is an error, please contact him.</p></qt>"
+"Scroll down current message. If at end of current message, go to next unread "
+"message."
 msgstr ""
-"<qt><p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p><p>Os "
-"meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
+"Sgrolio i lawr y neges gyfredol.  Os wrth waelod y neges gyfredol, mynd i'r "
+"neges nesaf heb ei darllen."
 
-#: configuredialog.cpp:278
-msgctxt ""
-"@title:tab Tab page where the user configures accounts to receive mail"
-msgid "Receiving"
-msgstr ""
+#: kmmainwidget.cpp:3603
+msgid "Configure &Filters..."
+msgstr "Ffurfweddu &Hidlau..."
 
-#: configuredialog.cpp:286
-msgctxt "@title:tab Tab page where the user configures accounts to send mail"
-msgid "Sending"
+#: kmmainwidget.cpp:3609
+msgid "Manage &Sieve Scripts..."
 msgstr ""
 
-#: configuredialog.cpp:310
-msgid "Outgoing accounts (add at least one):"
-msgstr "Cyfrifon allfynd (ychwanegwch o leiaf un):"
+#: kmmainwidget.cpp:3614
+msgid "KMail &Introduction"
+msgstr "&Cyflwyniad KMail"
 
-#: configuredialog.cpp:317
-msgid "Common Options"
-msgstr "Dewisiadau Cyffredin"
+#: kmmainwidget.cpp:3616
+msgid "Display KMail's Welcome Page"
+msgstr "Dangos Tudalen Groeso KMail"
 
-#. i18n: file: kmail.kcfg.cmake:244
-#. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
-#: configuredialog.cpp:327 rc.cpp:650
-msgid "Confirm &before send"
-msgstr "Cadarnha&u cyn anfon"
+#: kmmainwidget.cpp:3625
+msgid "Configure &Notifications..."
+msgstr "Ffurfweddu &Hysbysiadau..."
 
-#: configuredialog.cpp:336
-msgid "Never Automatically"
-msgstr ""
+#: kmmainwidget.cpp:3632
+msgid "&Configure KMail..."
+msgstr "&Furffweddu KMail..."
 
-#: configuredialog.cpp:337
-msgid "On Manual Mail Checks"
+#: kmmainwidget.cpp:3638
+msgid "Expire..."
+msgstr "Darfod ..."
+
+#: kmmainwidget.cpp:3644
+msgid "Add Favorite Folder..."
 msgstr ""
 
-#: configuredialog.cpp:338
-msgid "On All Mail Checks"
+#: kmmainwidget.cpp:3672
+msgid "Add Favorite Folder"
 msgstr ""
 
-#: configuredialog.cpp:347
-msgid "Send Now"
-msgstr "Anfon Rwan"
+#: kmmainwidget.cpp:4000
+msgid "E&mpty Trash"
+msgstr "Gwagu'r &Sbwriel"
 
-#: configuredialog.cpp:348
-msgid "Send Later"
-msgstr "Anfon yn Hwyrach"
+#: kmmainwidget.cpp:4000
+msgid "&Move All Messages to Trash"
+msgstr "&Symud Pob Neges i'r Sbwriel"
 
-#: configuredialog.cpp:360
-msgid "Send &messages in outbox folder:"
+#: kmmainwidget.cpp:4096
+msgid "&Delete Search"
 msgstr ""
 
-#: configuredialog.cpp:368
-msgid "Defa&ult send method:"
-msgstr "Dull anfon r&hagosod"
+#: kmmainwidget.cpp:4096
+msgid "&Delete Folder"
+msgstr "Dile&u Plygell"
 
-#: configuredialog.cpp:371
-msgid "Defaul&t domain:"
-msgstr "Parth &rhagosod:"
+#: kmmainwidget.cpp:4218
+#, kde-format
+msgid "Filter %1"
+msgstr "Hidlo %1"
 
-#: configuredialog.cpp:376
-msgid ""
-"<qt><p>The default domain is used to complete email addresses that only "
-"consist of the user's name.</p></qt>"
+#: kmmainwidget.cpp:4397
+msgid "Out of office reply active"
 msgstr ""
-"<qt><p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys "
-"enw'r defnyddiwr yn unig.</p></qt>"
 
-#: configuredialog.cpp:498
-msgctxt "Label to a checkbox, so is either checked/unchecked"
-msgid "Include in Manual Mail Check"
+#: kmmainwidget.cpp:4494
+msgid "Network is unconnected, some infos from folder could not be updated."
 msgstr ""
 
-#: configuredialog.cpp:506
-msgctxt "Label to a checkbox, so is either checked/unchecked"
-msgid "Switch offline on KMail Shutdown"
+#: kmmainwidget.cpp:4530
+#, kde-format
+msgctxt "@title:window"
+msgid "Properties of Folder %1"
 msgstr ""
 
-#: configuredialog.cpp:512
-msgid "Check mail on startup"
+#: util.cpp:94
+msgid "Could not start the account wizard. Please check your installation."
 msgstr ""
 
-#: configuredialog.cpp:608
-#, kde-format
-msgid "Do you want to remove account: %1"
+#: util.cpp:96
+msgid "Unable to start account wizard"
 msgstr ""
 
-#: configuredialog.cpp:609
-msgid "Remove account"
-msgstr ""
+#: identitypage.cpp:228
+#, kde-format
+msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
+msgstr "<qt>Ydych wir eisiau gwaredu'r dynodiad o'r enw <b>%1</b>?</qt>"
 
-#: configuredialog.cpp:677
-msgid "Fonts"
+#: identitypage.cpp:230
+msgid "Remove Identity"
 msgstr ""
 
-#: configuredialog.cpp:683
-msgid "Colors"
-msgstr ""
+#: identitypage.cpp:275 configuredialog.cpp:2705
+msgid "Add..."
+msgstr "Ychwanegu..."
 
-#: configuredialog.cpp:689
-msgid "Layout"
-msgstr ""
+#: identitypage.cpp:277 configuredialog.cpp:2707
+msgid "Modify..."
+msgstr "Addasu..."
 
-#: configuredialog.cpp:701
-msgid "Message Window"
+#: identitypage.cpp:279
+msgid "Remove"
 msgstr ""
 
-#: configuredialog.cpp:708
-msgid "System Tray"
-msgstr ""
+#: identitypage.cpp:282
+msgid "Set as Default"
+msgstr "Gosod fel Rhagosod"
 
-#: configuredialog.cpp:714
-msgid "Message Tags"
+#: collectionaclpage.cpp:101
+msgid "Access Control"
 msgstr ""
 
-#: configuredialog.cpp:729
-msgid "Message Body"
-msgstr "Corff y Neges"
+#: identitylistview.cpp:98
+#, kde-format
+msgctxt ""
+"%1: identity name. Used in the config dialog, section Identity, to indicate "
+"the default identity"
+msgid "%1 (Default)"
+msgstr "%1 (Rhagosod)"
 
-#: configuredialog.cpp:731
-msgid "Message List - New Messages"
-msgstr ""
+#: identitylistview.cpp:120
+msgid "Identity Name"
+msgstr "Enw Dynodiad"
 
-#: configuredialog.cpp:732
-msgid "Message List - Unread Messages"
-msgstr ""
+#: identitylistview.cpp:120
+msgid "Email Address"
+msgstr "Cyfeiriad Ebost"
 
-#: configuredialog.cpp:733
-msgid "Message List - Important Messages"
+#: kmstartup.cpp:157
+#, kde-format
+msgid ""
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
-#: configuredialog.cpp:734
-msgid "Message List - Action Item Messages"
+#: kmstartup.cpp:167
+#, kde-format
+msgid ""
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:396
-#. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: configuredialog.cpp:735 rc.cpp:722
-msgid "Folder List"
-msgstr "Rhestr Plygyll"
-
-#: configuredialog.cpp:736 configuredialog.cpp:918
-msgid "Quoted Text - First Level"
-msgstr "Testun Dyfynedig - Lefel Cyntaf"
+#: kmstartup.cpp:175
+#, kde-format
+msgid ""
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
+msgstr ""
 
-#: configuredialog.cpp:737 configuredialog.cpp:919
-msgid "Quoted Text - Second Level"
-msgstr "Testun Dyfynedig - Ail Lefel"
+#: kmstartup.cpp:181
+#, kde-format
+msgid ""
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
+msgstr ""
 
-#: configuredialog.cpp:738 configuredialog.cpp:920
-msgid "Quoted Text - Third Level"
-msgstr "Testun Dyfynedig - Trydydd Lefel"
+#: kmstartup.cpp:191
+#, kde-format
+msgctxt "Start kmail even when another instance is running."
+msgid "Start %1"
+msgstr ""
 
-#: configuredialog.cpp:739
-msgid "Fixed Width Font"
-msgstr "Wynebfath o Led Gosodedig"
+#: kmstartup.cpp:192
+msgctxt "Do not start another kmail instance."
+msgid "Exit"
+msgstr ""
 
-#: configuredialog.cpp:741
-msgid "Printing Output"
-msgstr "Allbwn Argraffu"
+#: kmcommands.cpp:297
+msgid "Please wait"
+msgstr "Disgwyliwch"
 
-#: configuredialog.cpp:758
-msgid "&Use custom fonts"
-msgstr "&Defnyddio wynebfathau addasiedig"
+#: kmcommands.cpp:298 kmcommands.cpp:370
+#, kde-format
+msgid "Please wait while the message is transferred"
+msgid_plural "Please wait while the %1 messages are transferred"
+msgstr[0] ""
+msgstr[1] ""
 
-#: configuredialog.cpp:776
-msgid "Apply &to:"
-msgstr "Gwethr&edu ar:"
+#: kmcommands.cpp:527
+#, kde-format
+msgctxt "@info"
+msgid "File <filename>%1</filename> exists.<nl/>Do you want to replace it?"
+msgstr ""
 
-#: configuredialog.cpp:921
-msgid "Link"
-msgstr "Cyswllt"
+#: kmcommands.cpp:528
+msgid "Save to File"
+msgstr "Cadw i Ffeil"
 
-#: configuredialog.cpp:922
-msgid "Followed Link"
-msgstr "Cyswllt dilynedig"
+#: kmcommands.cpp:528
+msgid "&Replace"
+msgstr "&Amnewid"
 
-#: configuredialog.cpp:923
-msgid "Misspelled Words"
+#: kmcommands.cpp:696
+msgid "Open Message"
 msgstr ""
 
-#: configuredialog.cpp:924
-msgid "New Message"
-msgstr "Neges Newydd"
+#: kmcommands.cpp:733 kmcommands.cpp:759
+msgid "The file does not contain a message."
+msgstr ""
 
-#: configuredialog.cpp:925
-msgid "Unread Message"
+#: kmcommands.cpp:776
+msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: configuredialog.cpp:926
-msgid "Important Message"
+#: kmcommands.cpp:881
+msgid ""
+"Do you want to forward the selected messages as attachments in one message "
+"(as a MIME digest) or as individual messages?"
 msgstr ""
 
-#: configuredialog.cpp:927
-msgid "Action Item Message"
+#: kmcommands.cpp:884
+msgid "Send As Digest"
 msgstr ""
 
-#: configuredialog.cpp:928
-msgid "OpenPGP Message - Encrypted"
+#: kmcommands.cpp:885
+msgid "Send Individually"
 msgstr ""
 
-#: configuredialog.cpp:929
-msgid "OpenPGP Message - Valid Signature with Trusted Key"
+#: kmcommands.cpp:1235
+msgid "Filtering messages"
 msgstr ""
 
-#: configuredialog.cpp:930
-msgid "OpenPGP Message - Valid Signature with Untrusted Key"
+#: kmcommands.cpp:1242
+#, kde-format
+msgid "Filtering message %1 of %2"
 msgstr ""
 
-#: configuredialog.cpp:931
-msgid "OpenPGP Message - Unchecked Signature"
+#: kmcommands.cpp:1394
+msgid "Moving messages"
 msgstr ""
 
-#: configuredialog.cpp:932
-msgid "OpenPGP Message - Bad Signature"
+#: kmcommands.cpp:1394
+msgid "Deleting messages"
 msgstr ""
 
-#: configuredialog.cpp:933
-msgid "Border Around Warning Prepending HTML Messages"
+#: xfaceconfigurator.cpp:87
+msgid "&Send picture with every message"
 msgstr ""
 
-#: configuredialog.cpp:934
-msgid "Folder Name and Size When Close to Quota"
+#: xfaceconfigurator.cpp:89
+msgid ""
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
-#: configuredialog.cpp:935
-msgid "HTML Status Bar Background - No HTML Message"
+#: xfaceconfigurator.cpp:96
+msgid "This is a preview of the picture selected/entered below."
 msgstr ""
 
-#: configuredialog.cpp:936
-msgid "HTML Status Bar Foreground - No HTML Message"
+#: xfaceconfigurator.cpp:110
+msgid "Click on the widgets below to obtain help on the input methods."
 msgstr ""
 
-#: configuredialog.cpp:937
-msgid "HTML Status Bar Background - HTML Message"
+#: xfaceconfigurator.cpp:114
+msgctxt "continuation of \"obtain picture from\""
+msgid "External Source"
 msgstr ""
 
-#: configuredialog.cpp:938
-msgid "HTML Status Bar Foreground - HTML Message"
+#: xfaceconfigurator.cpp:116
+msgctxt "continuation of \"obtain picture from\""
+msgid "Input Field Below"
 msgstr ""
 
-#: configuredialog.cpp:952
-msgid "&Use custom colors"
-msgstr "&Defnyddio lliwiau addasiedig"
+#: xfaceconfigurator.cpp:117
+msgid "Obtain pic&ture from:"
+msgstr ""
 
-#: configuredialog.cpp:966
-msgid "Recycle colors on deep &quoting"
-msgstr "Ailgylchu'r lliwiau wrth dd&yfynnu'n ddwfn"
+#: xfaceconfigurator.cpp:150
+msgid "Select File..."
+msgstr "Dewis Ffeil..."
 
-#: configuredialog.cpp:975
-msgid "Close to quota threshold:"
+#: xfaceconfigurator.cpp:152
+msgid ""
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
-#: configuredialog.cpp:984
-msgid "%"
+#: xfaceconfigurator.cpp:159
+msgid "Set From Address Book"
 msgstr ""
 
-#: configuredialog.cpp:1120
-msgid "Show favorite folder view"
+#: xfaceconfigurator.cpp:161
+msgid ""
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
-#: configuredialog.cpp:1123
-msgid "Show folder quick search field"
+#: xfaceconfigurator.cpp:167
+msgid ""
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported).</qt>"
 msgstr ""
 
-#: configuredialog.cpp:1131
-msgid "Folder Tooltips"
+#: xfaceconfigurator.cpp:186
+msgid "Use this field to enter an arbitrary X-Face string."
 msgstr ""
 
-#: configuredialog.cpp:1138
-msgid "Always"
-msgstr "O hyd"
+#: xfaceconfigurator.cpp:190
+msgid ""
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-"
+"Faces/\">http://www.xs4all.nl/~ace/X-Faces/</a>."
+msgstr ""
 
-#: configuredialog.cpp:1142
-msgid "When Text Obscured"
+#: xfaceconfigurator.cpp:263
+msgid "You do not have your own contact defined in the address book."
 msgstr ""
 
-#: configuredialog.cpp:1147
+#: xfaceconfigurator.cpp:263 xfaceconfigurator.cpp:277
+#: xfaceconfigurator.cpp:286
+msgid "No Picture"
+msgstr "Dim Llun"
+
+#: xfaceconfigurator.cpp:277 xfaceconfigurator.cpp:286
+msgid "No picture set for your address book entry."
+msgstr ""
+
+#: configuredialog.cpp:153
+msgid ""
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
+msgstr ""
+"<qt><p>Mae eich gweinyddwr wedi penderfynu ar y gosodiad yma.</p><p>Os "
+"meddyliwch mai gwall yw hwn, cysylltwch â fo.</p></qt>"
+
+#: configuredialog.cpp:282
+msgctxt ""
+"@title:tab Tab page where the user configures accounts to receive mail"
+msgid "Receiving"
+msgstr ""
+
+#: configuredialog.cpp:290
+msgctxt "@title:tab Tab page where the user configures accounts to send mail"
+msgid "Sending"
+msgstr ""
+
+#: configuredialog.cpp:314
+msgid "Outgoing accounts (add at least one):"
+msgstr "Cyfrifon allfynd (ychwanegwch o leiaf un):"
+
+#: configuredialog.cpp:321
+msgid "Common Options"
+msgstr "Dewisiadau Cyffredin"
+
+#. i18n: file: kmail.kcfg.cmake:244
+#. i18n: ectx: label, entry (ConfirmBeforeSend), group (Composer)
+#: configuredialog.cpp:331 rc.cpp:206
+msgid "Confirm &before send"
+msgstr "Cadarnha&u cyn anfon"
+
+#: configuredialog.cpp:340
+msgid "Never Automatically"
+msgstr ""
+
+#: configuredialog.cpp:341
+msgid "On Manual Mail Checks"
+msgstr ""
+
+#: configuredialog.cpp:342
+msgid "On All Mail Checks"
+msgstr ""
+
+#: configuredialog.cpp:351
+msgid "Send Now"
+msgstr "Anfon Rwan"
+
+#: configuredialog.cpp:352
+msgid "Send Later"
+msgstr "Anfon yn Hwyrach"
+
+#: configuredialog.cpp:364
+msgid "Send &messages in outbox folder:"
+msgstr ""
+
+#: configuredialog.cpp:372
+msgid "Defa&ult send method:"
+msgstr "Dull anfon r&hagosod"
+
+#: configuredialog.cpp:375
+msgid "Defaul&t domain:"
+msgstr "Parth &rhagosod:"
+
+#: configuredialog.cpp:380
+msgid ""
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
+msgstr ""
+"<qt><p>Defnyddir y parth rhagosod i gwblhau cyfeiriadau ebost sy'n cynnwys "
+"enw'r defnyddiwr yn unig.</p></qt>"
+
+#: configuredialog.cpp:505
+msgctxt "Label to a checkbox, so is either checked/unchecked"
+msgid "Include in Manual Mail Check"
+msgstr ""
+
+#: configuredialog.cpp:513
+msgctxt "Label to a checkbox, so is either checked/unchecked"
+msgid "Switch offline on KMail Shutdown"
+msgstr ""
+
+#: configuredialog.cpp:519
+msgid "Check mail on startup"
+msgstr ""
+
+#: configuredialog.cpp:621
+#, kde-format
+msgid "Do you want to remove account '%1'?"
+msgstr ""
+
+#: configuredialog.cpp:622
+msgid "Remove account?"
+msgstr ""
+
+#: configuredialog.cpp:688
+msgid "Fonts"
+msgstr ""
+
+#: configuredialog.cpp:694
+msgid "Colors"
+msgstr ""
+
+#: configuredialog.cpp:700
+msgid "Layout"
+msgstr ""
+
+#: configuredialog.cpp:712
+msgid "Message Window"
+msgstr ""
+
+#: configuredialog.cpp:719
+msgid "System Tray"
+msgstr ""
+
+#: configuredialog.cpp:725
+msgid "Message Tags"
+msgstr ""
+
+#: configuredialog.cpp:740
+msgid "Message Body"
+msgstr "Corff y Neges"
+
+#: configuredialog.cpp:742
+msgid "Message List - Unread Messages"
+msgstr ""
+
+#: configuredialog.cpp:743
+msgid "Message List - Important Messages"
+msgstr ""
+
+#: configuredialog.cpp:744
+msgid "Message List - Action Item Messages"
+msgstr ""
+
+#. i18n: file: kmail.kcfg.cmake:396
+#. i18n: ectx: label, entry (FolderList), group (Geometry)
+#: configuredialog.cpp:745 rc.cpp:278
+msgid "Folder List"
+msgstr "Rhestr Plygyll"
+
+#: configuredialog.cpp:746 configuredialog.cpp:926
+msgid "Quoted Text - First Level"
+msgstr "Testun Dyfynedig - Lefel Cyntaf"
+
+#: configuredialog.cpp:747 configuredialog.cpp:927
+msgid "Quoted Text - Second Level"
+msgstr "Testun Dyfynedig - Ail Lefel"
+
+#: configuredialog.cpp:748 configuredialog.cpp:928
+msgid "Quoted Text - Third Level"
+msgstr "Testun Dyfynedig - Trydydd Lefel"
+
+#: configuredialog.cpp:749
+msgid "Fixed Width Font"
+msgstr "Wynebfath o Led Gosodedig"
+
+#: configuredialog.cpp:751
+msgid "Printing Output"
+msgstr "Allbwn Argraffu"
+
+#: configuredialog.cpp:768
+msgid "&Use custom fonts"
+msgstr "&Defnyddio wynebfathau addasiedig"
+
+#: configuredialog.cpp:786
+msgid "Apply &to:"
+msgstr "Gwethr&edu ar:"
+
+#: configuredialog.cpp:929
+msgid "Link"
+msgstr "Cyswllt"
+
+#: configuredialog.cpp:930
+msgid "Followed Link"
+msgstr "Cyswllt dilynedig"
+
+#: configuredialog.cpp:931
+msgid "Misspelled Words"
+msgstr ""
+
+#: configuredialog.cpp:932
+msgid "Unread Message"
+msgstr ""
+
+#: configuredialog.cpp:933
+msgid "Important Message"
+msgstr ""
+
+#: configuredialog.cpp:934
+msgid "Action Item Message"
+msgstr ""
+
+#: configuredialog.cpp:935
+msgid "OpenPGP Message - Encrypted"
+msgstr ""
+
+#: configuredialog.cpp:936
+msgid "OpenPGP Message - Valid Signature with Trusted Key"
+msgstr ""
+
+#: configuredialog.cpp:937
+msgid "OpenPGP Message - Valid Signature with Untrusted Key"
+msgstr ""
+
+#: configuredialog.cpp:938
+msgid "OpenPGP Message - Unchecked Signature"
+msgstr ""
+
+#: configuredialog.cpp:939
+msgid "OpenPGP Message - Bad Signature"
+msgstr ""
+
+#: configuredialog.cpp:940
+msgid "Border Around Warning Prepending HTML Messages"
+msgstr ""
+
+#: configuredialog.cpp:941
+msgid "Folder Name and Size When Close to Quota"
+msgstr ""
+
+#: configuredialog.cpp:942
+msgid "HTML Status Bar Background - No HTML Message"
+msgstr ""
+
+#: configuredialog.cpp:943
+msgid "HTML Status Bar Foreground - No HTML Message"
+msgstr ""
+
+#: configuredialog.cpp:944
+msgid "HTML Status Bar Background - HTML Message"
+msgstr ""
+
+#: configuredialog.cpp:945
+msgid "HTML Status Bar Foreground - HTML Message"
+msgstr ""
+
+#: configuredialog.cpp:959
+msgid "&Use custom colors"
+msgstr "&Defnyddio lliwiau addasiedig"
+
+#: configuredialog.cpp:973
+msgid "Recycle colors on deep &quoting"
+msgstr "Ailgylchu'r lliwiau wrth dd&yfynnu'n ddwfn"
+
+#: configuredialog.cpp:982
+msgid "Close to quota threshold:"
+msgstr ""
+
+#: configuredialog.cpp:989
+msgid "%"
+msgstr ""
+
+#: configuredialog.cpp:1118
+msgid "Show folder quick search field"
+msgstr ""
+
+#: configuredialog.cpp:1126
+msgid "Show Favorite Folders View"
+msgstr ""
+
+#: configuredialog.cpp:1133 configuredialog.cpp:1166
 msgid "Never"
 msgstr ""
 
-#: configuredialog.cpp:1197
+#: configuredialog.cpp:1137
+msgid "As Icons"
+msgstr ""
+
+#: configuredialog.cpp:1141
+msgid "As List"
+msgstr ""
+
+#: configuredialog.cpp:1150
+msgid "Folder Tooltips"
+msgstr ""
+
+#: configuredialog.cpp:1157
+msgid "Always"
+msgstr "O hyd"
+
+#: configuredialog.cpp:1161
+msgid "When Text Obscured"
+msgstr ""
+
+#: configuredialog.cpp:1216
 #, kde-format
 msgid "Sta&ndard format (%1)"
 msgstr "&Fformat safonol (%1)"
 
-#: configuredialog.cpp:1198
+#: configuredialog.cpp:1217
 #, kde-format
 msgid "Locali&zed format (%1)"
 msgstr "Fformat &lleol (%1)"
 
-#: configuredialog.cpp:1199
+#: configuredialog.cpp:1218
 #, kde-format
 msgid "Fancy for&mat (%1)"
 msgstr "Fformat &pert (%1)"
 
-#: configuredialog.cpp:1200
+#: configuredialog.cpp:1219
 msgid "C&ustom format:"
 msgstr ""
 
-#: configuredialog.cpp:1218
+#: configuredialog.cpp:1237
 msgctxt "General options for the message list."
 msgid "General"
 msgstr ""
 
-#: configuredialog.cpp:1241
+#: configuredialog.cpp:1260
 msgid "Default Aggregation:"
 msgstr ""
 
-#: configuredialog.cpp:1262
+#: configuredialog.cpp:1281
 msgid "Default Theme:"
 msgstr ""
 
-#: configuredialog.cpp:1283
+#: configuredialog.cpp:1302
 msgid "Date Display"
 msgstr "Ymddangosiad y Dyddiad"
 
-#: configuredialog.cpp:1311
+#: configuredialog.cpp:1330
 msgid "<qt><a href=\"whatsthis1\">Custom format information...</a></qt>"
 msgstr ""
 
-#: configuredialog.cpp:1316
+#: configuredialog.cpp:1335
 msgid ""
 "<qt><p><strong>These expressions may be used for the "
 "date:</strong></p><ul><li>d - the day as a number without a leading zero (1-"
@@ -3317,177 +3533,189 @@
 "ignored.</strong></p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:1470
+#: configuredialog.cpp:1489
 msgid ""
 "Close the standalone message window after replying or forwarding the message"
 msgstr ""
 
 #. i18n: file: kmail.kcfg.cmake:89
 #. i18n: ectx: label, entry (SystemTrayEnabled), group (General)
-#: configuredialog.cpp:1509 rc.cpp:561
+#: configuredialog.cpp:1528 rc.cpp:117
 msgid "Enable system tray icon"
 msgstr ""
 
-#: configuredialog.cpp:1516
+#: configuredialog.cpp:1535
 msgid "System Tray Mode"
 msgstr ""
 
-#: configuredialog.cpp:1525
+#: configuredialog.cpp:1544
 msgid "Always show KMail in system tray"
 msgstr ""
 
-#: configuredialog.cpp:1526
+#: configuredialog.cpp:1545
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr ""
 
-#: configuredialog.cpp:1564
+#: configuredialog.cpp:1612
 msgid "A&vailable Tags"
 msgstr ""
 
-#: configuredialog.cpp:1579
+#: configuredialog.cpp:1628
 msgid "Add new tag"
 msgstr ""
 
-#: configuredialog.cpp:1584
+#: configuredialog.cpp:1633
 msgid "Remove selected tag"
 msgstr ""
 
-#: configuredialog.cpp:1593
+#: configuredialog.cpp:1642
 msgid "Increase tag priority"
 msgstr ""
 
-#: configuredialog.cpp:1599
+#: configuredialog.cpp:1648
 msgid "Decrease tag priority"
 msgstr ""
 
-#: configuredialog.cpp:1619
+#: configuredialog.cpp:1671
 msgid "Ta&g Settings"
 msgstr ""
 
-#: configuredialog.cpp:1635
+#: configuredialog.cpp:1688
 msgctxt "@label:listbox Name of the tag"
 msgid "Name:"
 msgstr ""
 
-#: configuredialog.cpp:1644
+#: configuredialog.cpp:1697
 msgid "Change te&xt color:"
 msgstr ""
 
-#: configuredialog.cpp:1659
+#: configuredialog.cpp:1712
 msgid "Change &background color:"
 msgstr ""
 
-#: configuredialog.cpp:1674
+#: configuredialog.cpp:1727
 msgid "Change fo&nt:"
 msgstr ""
 
-#: configuredialog.cpp:1695
+#: configuredialog.cpp:1748
 msgid "Message tag &icon:"
 msgstr ""
 
-#: configuredialog.cpp:1708
+#: configuredialog.cpp:1761
 msgid "Shortc&ut:"
 msgstr ""
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1774
 msgid "Enable &toolbar button"
 msgstr ""
 
-#: configuredialog.cpp:2082
+#: configuredialog.cpp:1816
+msgid ""
+"The Nepomuk semantic search service is not available. We can not configurate "
+"tags. You can enable it in \"System Settings\""
+msgstr ""
+
+#: configuredialog.cpp:2165
 msgctxt "General settings for the composer."
 msgid "General"
 msgstr ""
 
-#: configuredialog.cpp:2089
+#: configuredialog.cpp:2172
 msgid "Standard Templates"
 msgstr ""
 
-#: configuredialog.cpp:2095
+#: configuredialog.cpp:2178
 msgid "Custom Templates"
 msgstr ""
 
-#: configuredialog.cpp:2101
+#: configuredialog.cpp:2184
 msgctxt "Settings regarding the subject when composing a message."
 msgid "Subject"
 msgstr ""
 
-#: configuredialog.cpp:2108
+#: configuredialog.cpp:2191
 msgid "Charset"
 msgstr ""
 
-#: configuredialog.cpp:2114
+#: configuredialog.cpp:2197
 msgid "Headers"
 msgstr ""
 
-#: configuredialog.cpp:2120
+#: configuredialog.cpp:2203
 msgctxt "Config->Composer->Attachments"
 msgid "Attachments"
 msgstr ""
 
-#: configuredialog.cpp:2171
+#: configuredialog.cpp:2254
 msgid ""
 "When replying, add quote signs in front of all lines of the quoted text,\n"
 "even when the line was created by adding an additional linebreak while\n"
 "word-wrapping the text."
 msgstr ""
 
-#: configuredialog.cpp:2181
+#: configuredialog.cpp:2263
+msgid ""
+"When replying, only quote the message in the original format it was received "
+"or else, if unchecked, it will reply as plain text by default"
+msgstr ""
+
+#: configuredialog.cpp:2272
 msgid ""
 "When replying, only quote the selected text instead of the complete message "
 "when there is text selected in the message window."
 msgstr ""
 
-#: configuredialog.cpp:2244
+#: configuredialog.cpp:2347
 msgid "Warn if too many recipients are specified"
 msgstr ""
 
-#: configuredialog.cpp:2256
+#: configuredialog.cpp:2359
 msgid "Warn if more than this many recipients are specified"
 msgstr ""
 
-#: configuredialog.cpp:2274
+#: configuredialog.cpp:2377
 msgid "No autosave"
 msgstr "Dim hunan-gadw"
 
-#: configuredialog.cpp:2275
+#: configuredialog.cpp:2378
 msgid " min"
 msgstr " mun"
 
-#: configuredialog.cpp:2284
+#: configuredialog.cpp:2387
 msgid "Default Forwarding Type:"
 msgstr ""
 
-#: configuredialog.cpp:2288
+#: configuredialog.cpp:2391
 msgctxt "@item:inlistbox Inline mail forwarding"
 msgid "Inline"
 msgstr ""
 
-#: configuredialog.cpp:2289
+#: configuredialog.cpp:2392
 msgid "As Attachment"
 msgstr ""
 
-#: configuredialog.cpp:2299
+#: configuredialog.cpp:2402
 msgid "Configure Completion Order..."
 msgstr ""
 
-#: configuredialog.cpp:2308
+#: configuredialog.cpp:2411
 msgid "Edit Recent Addresses..."
 msgstr ""
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2418
 msgid "External Editor"
 msgstr "Golygydd Allanol"
 
-#: configuredialog.cpp:2349
+#: configuredialog.cpp:2453
 #, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr ""
 
-#: configuredialog.cpp:2522
+#: configuredialog.cpp:2658
 msgid "Repl&y Subject Prefixes"
 msgstr "Rhagddodiadau ar gyfer P&wnc yr Ateb"
 
-#: configuredialog.cpp:2527 configuredialog.cpp:2561
+#: configuredialog.cpp:2663 configuredialog.cpp:2697
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
@@ -3498,38 +3726,38 @@
 
 #. i18n: file: ui/accountspagereceivingtab.ui:36
 #. i18n: ectx: property (text), widget (QPushButton, mAddAccountButton)
-#: configuredialog.cpp:2537 configuredialog.cpp:2643 configuredialog.cpp:3029
-#: rc.cpp:473
+#: configuredialog.cpp:2673 configuredialog.cpp:2779 configuredialog.cpp:3181
+#: rc.cpp:833
 msgid "A&dd..."
 msgstr "Yc&hwanegu..."
 
-#: configuredialog.cpp:2537 configuredialog.cpp:2802 configuredialog.cpp:3029
+#: configuredialog.cpp:2673 configuredialog.cpp:2941 configuredialog.cpp:3181
 msgid "Re&move"
 msgstr "G&waredu"
 
-#: configuredialog.cpp:2538 configuredialog.cpp:3030
+#: configuredialog.cpp:2674 configuredialog.cpp:3182
 msgid "Mod&ify..."
 msgstr "A&ddasu..."
 
-#: configuredialog.cpp:2539
+#: configuredialog.cpp:2675
 msgid "Enter new reply prefix:"
 msgstr "Mewnodosd rhagddodiad ateb newydd:"
 
-#: configuredialog.cpp:2556
+#: configuredialog.cpp:2692
 msgid "For&ward Subject Prefixes"
 msgstr "Rha&gddodiadau ar gyfer Pwnc y Blaenyrriad"
 
 #. i18n: file: ui/identitypage.ui:66
 #. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
-#: configuredialog.cpp:2570 configuredialog.cpp:2643 rc.cpp:345
+#: configuredialog.cpp:2706 configuredialog.cpp:2779 rc.cpp:439
 msgid "Remo&ve"
 msgstr "Gware&du"
 
-#: configuredialog.cpp:2572
+#: configuredialog.cpp:2708
 msgid "Enter new forward prefix:"
 msgstr "Mewnodosd rhagddodiad blaenyrriad newydd:"
 
-#: configuredialog.cpp:2635
+#: configuredialog.cpp:2771
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom "
 "for a charset that contains all required characters."
@@ -3537,79 +3765,79 @@
 "Gwirir y rhestr yma am bob un neges allfynd o'r pen i'r gwaelod ar gyfer set "
 "nodau sy'n cynnwys y nodau gorfodol i gyd."
 
-#: configuredialog.cpp:2644
+#: configuredialog.cpp:2780
 msgid "Enter charset:"
 msgstr "Mewnosod set nodau:"
 
-#: configuredialog.cpp:2650
+#: configuredialog.cpp:2786
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr ""
 
-#: configuredialog.cpp:2685
+#: configuredialog.cpp:2821
 msgid "This charset is not supported."
 msgstr "Ni chynhelir y set nodau yma."
 
-#: configuredialog.cpp:2752
+#: configuredialog.cpp:2891
 msgid "&Use custom message-id suffix"
 msgstr "&Defnyddio ôlddodiad dynodiad neges addasiedig."
 
-#: configuredialog.cpp:2766
+#: configuredialog.cpp:2905
 msgid "Custom message-&id suffix:"
 msgstr "Ôlddodiad dynodiad n&eges addasiedig:"
 
-#: configuredialog.cpp:2781
+#: configuredialog.cpp:2920
 msgid "Define custom mime header fields:"
 msgstr "Diffinio meyseydd pennawd mime addasiedig"
 
-#: configuredialog.cpp:2790
+#: configuredialog.cpp:2929
 msgctxt "@title:column Name of the mime header."
 msgid "Name"
 msgstr ""
 
-#: configuredialog.cpp:2791
+#: configuredialog.cpp:2930
 msgctxt "@title:column Value of the mimeheader."
 msgid "Value"
 msgstr ""
 
-#: configuredialog.cpp:2798
+#: configuredialog.cpp:2937
 msgctxt "@action:button Add new mime header field."
 msgid "Ne&w"
 msgstr ""
 
-#: configuredialog.cpp:2811
+#: configuredialog.cpp:2951
 msgctxt "@label:textbox Name of the mime header."
 msgid "&Name:"
 msgstr ""
 
-#: configuredialog.cpp:2821
+#: configuredialog.cpp:2962
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#: configuredialog.cpp:2997
+#: configuredialog.cpp:3149
 msgid "Outlook-compatible attachment naming"
 msgstr ""
 
-#: configuredialog.cpp:3000
+#: configuredialog.cpp:3152
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names "
 "containing non-English characters"
 msgstr ""
 
-#: configuredialog.cpp:3011
+#: configuredialog.cpp:3163
 msgid "E&nable detection of missing attachments"
 msgstr "G&alluogi darganfod atodiadau colledig"
 
-#: configuredialog.cpp:3018
+#: configuredialog.cpp:3170
 msgid ""
 "Recognize any of the following key words as intention to attach a file:"
 msgstr ""
 "Adnabod unrhyw un o'r allweddeiriau dilynnol fel bwriad o atodi ffeil:"
 
-#: configuredialog.cpp:3031
+#: configuredialog.cpp:3183
 msgid "Enter new key word:"
 msgstr "Rhowch allweddair newydd:"
 
-#: configuredialog.cpp:3069
+#: configuredialog.cpp:3221
 msgid ""
 "You have chosen to encode attachment names containing non-English characters "
 "in a way that is understood by Outlook(tm) and other mail clients that do "
@@ -3620,1118 +3848,852 @@
 "enable this option."
 msgstr ""
 
-#: configuredialog.cpp:3097
+#: configuredialog.cpp:3249
 msgid "Reading"
 msgstr ""
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3255
 msgid "Composing"
 msgstr ""
 
-#: configuredialog.cpp:3109
+#: configuredialog.cpp:3261
 msgid "Miscellaneous"
 msgstr ""
 
-#: configuredialog.cpp:3115
+#: configuredialog.cpp:3267
 msgid "S/MIME Validation"
 msgstr ""
 
-#: configuredialog.cpp:3197
+#: configuredialog.cpp:3349
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr ""
 "Bydd newid y gosodiad HTML eang yn anwybyddu pob gwerth sy'n benodol i "
 "blygell."
 
-#: configuredialog.cpp:3363 configuredialog.cpp:3366 configuredialog.cpp:3369
-#: configuredialog.cpp:3373 configuredialog.cpp:3376 configuredialog.cpp:3379
+#: configuredialog.cpp:3512 configuredialog.cpp:3515 configuredialog.cpp:3518
+#: configuredialog.cpp:3522 configuredialog.cpp:3525 configuredialog.cpp:3528
 msgid " day"
 msgid_plural " days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: configuredialog.cpp:3517
+#: configuredialog.cpp:3671
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
 #. i18n: file: ui/smimeconfiguration.ui:182
 #. i18n: ectx: property (text), widget (QLabel, systemHTTPProxy)
-#: configuredialog.cpp:3628 rc.cpp:158
+#: configuredialog.cpp:3782 rc.cpp:736
 msgid "no proxy"
 msgstr ""
 
-#: configuredialog.cpp:3629
+#: configuredialog.cpp:3783
 #, kde-format
 msgid "(Current system setting: %1)"
 msgstr ""
 
-#: configuredialog.cpp:3757
+#: configuredialog.cpp:3911
 msgid "Folders"
 msgstr ""
 
-#: configuredialog.cpp:3760
+#: configuredialog.cpp:3914
 msgid "Invitations"
 msgstr ""
 
-#: kmfilterdlg.cpp:69
-msgid ""
-"<qt><p>This is the list of defined filters. They are processed top-to-"
-"bottom.</p><p>Click on any filter to edit it using the controls in the right-"
-"hand half of the dialog.</p></qt>"
-msgstr ""
-"<qt><p>Dyma'r rhestr o hidlau wedi'u rhagddiffinio.  Prosesir o ben i "
-"waelod.</p><p>Cliciwch ar unrhyw hidlen i'w golygu gan ddefnyddio'r "
-"rheolyddion yn hanner dde yr ymgom.</p></qt>"
-
-#: kmfilterdlg.cpp:75
-msgid ""
-"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
-"inserted just before the currently-selected one, but you can always change "
-"that later on.</p><p>If you have clicked this button accidentally, you can "
-"undo this by clicking on the <em>Delete</em> button.</p></qt>"
-msgstr ""
-
-#: kmfilterdlg.cpp:82
-msgid ""
-"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
-"button accidentally, you can undo this by clicking on the <em>Delete</em> "
-"button.</p></qt>"
-msgstr ""
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Kyfieithu: KD, ,Launchpad Contributions:"
 
-#: kmfilterdlg.cpp:86
-msgid ""
-"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
-"from the list above.</p><p>There is no way to get the filter back once it is "
-"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
-"discard the changes made.</p></qt>"
-msgstr ""
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
 
-#: kmfilterdlg.cpp:93
-msgid ""
-"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p><p>This is useful since the order of the filters "
-"in the list determines the order in which they are tried on messages: The "
-"topmost filter gets tried first.</p><p>If you have clicked this button "
-"accidentally, you can undo this by clicking on the <em>Down</em> "
-"button.</p></qt>"
+#. i18n: file: kmmainwin.rc:8
+#. i18n: ectx: Menu (file)
+#. i18n: file: kmail_part.rc:8
+#. i18n: ectx: Menu (file)
+#. i18n: file: kmreadermainwin.rc:5
+#. i18n: ectx: Menu (file)
+#: rc.cpp:5 rc.cpp:50 rc.cpp:391
+msgid "&File"
 msgstr ""
 
-#: kmfilterdlg.cpp:101
-msgid ""
-"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p><p>This is useful since the order of the filters "
-"in the list determines the order in which they are tried on messages: The "
-"topmost filter gets tried first.</p><p>If you have clicked this button "
-"accidentally, you can undo this by clicking on the <em>Up</em> "
-"button.</p></qt>"
+#. i18n: file: kmmainwin.rc:10
+#. i18n: ectx: Menu (file_new)
+#. i18n: file: kmail_part.rc:10
+#. i18n: ectx: Menu (file_new)
+#: rc.cpp:8 rc.cpp:53
+msgctxt "@title:menu New message, folder or new window."
+msgid "New"
 msgstr ""
 
-#: kmfilterdlg.cpp:109
-msgid ""
-"<qt><p>Click this button to rename the currently-selected "
-"filter.</p><p>Filters are named automatically, as long as they start with "
-"\"&lt;\".</p><p>If you have renamed a filter accidentally and want automatic "
-"naming back, click this button and select <em>Clear</em> followed by "
-"<em>OK</em> in the appearing dialog.</p></qt>"
+#. i18n: file: kmmainwin.rc:38
+#. i18n: ectx: Menu (edit)
+#. i18n: file: kmail_part.rc:38
+#. i18n: ectx: Menu (edit)
+#. i18n: file: kmcomposerui.rc:23
+#. i18n: ectx: Menu (edit)
+#. i18n: file: kmreadermainwin.rc:15
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:11 rc.cpp:56 rc.cpp:367 rc.cpp:394
+msgid "&Edit"
 msgstr ""
 
-#: kmfilterdlg.cpp:116
-msgid ""
-"<qt><p>Check this button to force the confirmation dialog to be "
-"displayed.</p><p>This is useful if you have defined a ruleset that tags "
-"messages to be downloaded later. Without the possibility to force the dialog "
-"popup, these messages could never be downloaded if no other large messages "
-"were waiting on the server, or if you wanted to change the ruleset to tag "
-"the messages differently.</p></qt>"
+#. i18n: file: kmmainwin.rc:62
+#. i18n: ectx: Menu (view)
+#. i18n: file: kmail_part.rc:62
+#. i18n: ectx: Menu (view)
+#. i18n: file: kmcomposerui.rc:47
+#. i18n: ectx: Menu (view)
+#. i18n: file: kmreadermainwin.rc:20
+#. i18n: ectx: Menu (view)
+#: rc.cpp:14 rc.cpp:59 rc.cpp:373 rc.cpp:397
+msgid "&View"
 msgstr ""
 
-#: kmfilterdlg.cpp:137
-msgid "Filter Rules"
-msgstr "Rheolau Hidlo"
-
-#: kmfilterdlg.cpp:143
-msgid "Import..."
+#. i18n: file: kmmainwin.rc:83
+#. i18n: ectx: Menu (zoom)
+#. i18n: file: kmail_part.rc:83
+#. i18n: ectx: Menu (zoom)
+#. i18n: file: kmreadermainwin.rc:31
+#. i18n: ectx: Menu (zoom)
+#: rc.cpp:17 rc.cpp:62 rc.cpp:400
+msgid "Zoom"
 msgstr ""
 
-#: kmfilterdlg.cpp:144
-msgid "Export..."
-msgstr ""
+#. i18n: file: kmmainwin.rc:93
+#. i18n: ectx: Menu (go)
+#. i18n: file: kmail_part.rc:93
+#. i18n: ectx: Menu (go)
+#: rc.cpp:20 rc.cpp:65
+msgid "&Go"
+msgstr "&Mynd"
 
-#: kmfilterdlg.cpp:162
-msgid "Available Filters"
-msgstr "Hidlau ar Gael"
+#. i18n: file: kmmainwin.rc:107
+#. i18n: ectx: Menu (folder)
+#. i18n: file: kmail_part.rc:107
+#. i18n: ectx: Menu (folder)
+#: rc.cpp:23 rc.cpp:68
+msgid "F&older"
+msgstr "P&lygell"
 
-#: kmfilterdlg.cpp:170
-msgctxt "General mail filter settings."
-msgid "General"
-msgstr ""
+#. i18n: file: kmmainwin.rc:130
+#. i18n: ectx: Menu (message)
+#. i18n: file: kmail_part.rc:130
+#. i18n: ectx: Menu (message)
+#. i18n: file: kmcomposerui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kmreadermainwin.rc:41
+#. i18n: ectx: Menu (message)
+#: rc.cpp:26 rc.cpp:71 rc.cpp:364 rc.cpp:403
+msgid "&Message"
+msgstr "&Neges"
 
-#: kmfilterdlg.cpp:177
-msgctxt "Advanced mail filter settings."
-msgid "Advanced"
+#. i18n: file: kmmainwin.rc:137
+#. i18n: ectx: Menu (reply_special)
+#. i18n: file: kmail_part.rc:137
+#. i18n: ectx: Menu (reply_special)
+#. i18n: file: kmreadermainwin.rc:48
+#. i18n: ectx: Menu (reply_special)
+#: rc.cpp:29 rc.cpp:74 rc.cpp:406
+msgid "Reply Special"
 msgstr ""
 
-#: kmfilterdlg.cpp:189
-msgid "Filter Criteria"
-msgstr "Meini Prawf Hidlo"
-
-#: kmfilterdlg.cpp:197
-msgid "Filter Actions"
-msgstr "Gweithredoedd Hidlo"
-
-#: kmfilterdlg.cpp:204
-msgid "Advanced Options"
-msgstr "Dewisiadau Uwch"
+#. i18n: file: kmmainwin.rc:146
+#. i18n: ectx: Menu (menubar_message_forward)
+#. i18n: file: kmail_part.rc:146
+#. i18n: ectx: Menu (menubar_message_forward)
+#. i18n: file: kmreadermainwin.rc:57
+#. i18n: ectx: Menu (menubar_message_forward)
+#: rc.cpp:32 rc.cpp:77 rc.cpp:409
+msgid "&Forward"
+msgstr "B&laenyrru"
 
-#: kmfilterdlg.cpp:212
-msgid "Apply this filter to incoming messages:"
+#. i18n: file: kmmainwin.rc:172
+#. i18n: ectx: Menu (tools)
+#. i18n: file: kmail_part.rc:172
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:38 rc.cpp:83
+msgid "&Tools"
 msgstr ""
 
-#: kmfilterdlg.cpp:216
-msgid "from all accounts"
+#. i18n: file: kmmainwin.rc:189
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kmail_part.rc:189
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kmcomposerui.rc:86
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kmreadermainwin.rc:73
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:41 rc.cpp:86 rc.cpp:379 rc.cpp:412
+msgid "&Settings"
 msgstr ""
 
-#: kmfilterdlg.cpp:219
-msgid "from all but online IMAP accounts"
+#. i18n: file: kmmainwin.rc:201
+#. i18n: ectx: Menu (help)
+#. i18n: file: kmail_part.rc:201
+#. i18n: ectx: Menu (help)
+#: rc.cpp:44 rc.cpp:89
+msgid "&Help"
 msgstr ""
 
-#: kmfilterdlg.cpp:222
-msgid "from checked accounts only"
+#. i18n: file: kmmainwin.rc:270
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kmail_part.rc:270
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kmcomposerui.rc:90
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kmreadermainwin.rc:82
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:47 rc.cpp:92 rc.cpp:382 rc.cpp:415
+msgid "Main Toolbar"
 msgstr ""
 
-#: kmfilterdlg.cpp:231
-msgid "Account Name"
+#. i18n: file: kmail.kcfg.cmake:49
+#. i18n: ectx: whatsthis, entry (ExcludeImportantMailFromExpiry), group (Behaviour)
+#: rc.cpp:96
+msgid ""
+"This prevents the automatic expiry of old messages in a folder from deleting "
+"(or moving to an archive folder) the messages that are marked 'Important' or "
+"'Action Item'"
 msgstr ""
 
-#: kmfilterdlg.cpp:231
-msgid "Type"
-msgstr "Math"
-
-#: kmfilterdlg.cpp:239
-msgid "Apply this filter &before sending messages"
+#. i18n: file: kmail.kcfg.cmake:54
+#. i18n: ectx: label, entry (SendOnCheck), group (Behaviour)
+#: rc.cpp:99
+msgid "Send queued mail on mail check"
 msgstr ""
 
-#: kmfilterdlg.cpp:240
+#. i18n: file: kmail.kcfg.cmake:55
+#. i18n: ectx: whatsthis, entry (SendOnCheck), group (Behaviour)
+#: rc.cpp:102
 msgid ""
-"<p>The filter will be triggered <b>before</b> the message is sent and it "
-"will affect both the local copy and the sent copy of the message.</p><p>This "
-"is required if the recipient's copy also needs to be modified.</p>"
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:244
-msgid "Apply this filter to &sent messages"
+#. i18n: file: kmail.kcfg.cmake:65
+#. i18n: ectx: label, entry (AutoLostFoundMove), group (Behaviour)
+#: rc.cpp:105
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: kmfilterdlg.cpp:245
+#. i18n: file: kmail.kcfg.cmake:66
+#. i18n: ectx: whatsthis, entry (AutoLostFoundMove), group (Behaviour)
+#: rc.cpp:108
 msgid ""
-"<p>The filter will be triggered <b>after</b> the message is sent and it will "
-"only affect the local copy of the message.</p><p>If the recipient's copy "
-"also needs to be modified, please use \"Apply this filter <b>before</b> "
-"sending messages\".</p>"
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
 msgstr ""
 
-#: kmfilterdlg.cpp:249
-msgid "Apply this filter on manual &filtering"
+#. i18n: file: kmail.kcfg.cmake:71
+#. i18n: ectx: label, entry (AllowLocalFlags), group (Behaviour)
+#: rc.cpp:111
+msgid "Allow local flags in read-only folders"
 msgstr ""
 
-#: kmfilterdlg.cpp:252
-msgid "If this filter &matches, stop processing here"
-msgstr "Os &cydwedda'r hidlen, atal prosesu yma/"
-
-#: kmfilterdlg.cpp:254
-msgid "Add this filter to the Apply Filter menu"
+#. i18n: file: kmail.kcfg.cmake:78
+#. i18n: ectx: whatsthis, entry (LastSelectedFolder), group (FolderSelectionDialog)
+#: rc.cpp:114
+msgid "The most recently selected folder in the folder selection dialog."
 msgstr ""
 
-#: kmfilterdlg.cpp:256
-msgid "Shortcut:"
-msgstr "Byrlwybr:"
-
-#: kmfilterdlg.cpp:266
-msgid "Additionally add this filter to the toolbar"
+#. i18n: file: kmail.kcfg.cmake:93
+#. i18n: ectx: label, entry (SystemTrayPolicy), group (General)
+#: rc.cpp:120
+msgid "Policy for showing the system tray icon"
 msgstr ""
 
-#: kmfilterdlg.cpp:271
-msgid "Icon for this filter:"
-msgstr "eicon ar gyfer yr hidlen yma:"
-
-#: kmfilterdlg.cpp:633
-msgctxt "@info/plain Displayed grayed-out inside the textbox, verb to search"
-msgid "Search"
+#. i18n: file: kmail.kcfg.cmake:101
+#. i18n: ectx: label, entry (CloseDespiteSystemTray), group (General)
+#: rc.cpp:123
+msgid ""
+"Close the application when the main window is closed, even if there is a "
+"system tray icon active."
 msgstr ""
 
-#: kmfilterdlg.cpp:651
-msgctxt "Move selected filter up."
-msgid "Up"
+#. i18n: file: kmail.kcfg.cmake:105
+#. i18n: ectx: label, entry (VerboseNewMailNotification), group (General)
+#: rc.cpp:126
+msgid "Verbose new mail notification"
 msgstr ""
 
-#: kmfilterdlg.cpp:652
-msgctxt "Move selected filter down."
-msgid "Down"
+#. i18n: file: kmail.kcfg.cmake:106
+#. i18n: ectx: whatsthis, entry (VerboseNewMailNotification), group (General)
+#: rc.cpp:129
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
 msgstr ""
 
-#: kmfilterdlg.cpp:673
-msgid "Rename..."
-msgstr "Ailenwi..."
+#. i18n: file: kmail.kcfg.cmake:110
+#. i18n: ectx: label, entry (ExternalEditor), group (General)
+#: rc.cpp:132
+msgid "Specify e&ditor:"
+msgstr "Penodi golyg&ydd"
 
-#: kmfilterdlg.cpp:674
-msgctxt "@action:button in filter list manipulator"
-msgid "New"
-msgstr ""
+#. i18n: file: kmail.kcfg.cmake:114
+#. i18n: ectx: label, entry (UseExternalEditor), group (General)
+#: rc.cpp:135
+msgid "Use e&xternal editor instead of composer"
+msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
 
-#: kmfilterdlg.cpp:675
-msgid "Copy"
+#. i18n: file: kmail.kcfg.cmake:118
+#. i18n: ectx: label, entry (CustomMessageHeadersCount), group (General)
+#: rc.cpp:138
+msgid ""
+"Specifies the number of custom MIME header fields to be inserted in messages "
+"(for internal use only)"
 msgstr ""
 
-#: kmfilterdlg.cpp:676
-msgid "Delete"
+#. i18n: file: kmail.kcfg.cmake:124
+#. i18n: ectx: label, entry (CloseToQuotaThreshold), group (General)
+#: rc.cpp:141
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
 msgstr ""
 
-#: kmfilterdlg.cpp:814
-msgid ""
-"The following filters are invalid (e.g. containing no actions or no search "
-"rules). Discard or edit invalid filters?"
+#. i18n: file: kmail.kcfg.cmake:128
+#. i18n: ectx: label, entry (BeepOnMail), group (General)
+#: rc.cpp:144
+msgid "Beep upon receiving new mail"
 msgstr ""
 
-#: kmfilterdlg.cpp:818
-msgid "Discard"
+#. i18n: file: kmail.kcfg.cmake:132
+#. i18n: ectx: label, entry (EmptyTrashOnExit), group (General)
+#: rc.cpp:147
+msgid "Empty the local trash folder on program exit"
 msgstr ""
 
-#: kmfilterdlg.cpp:827
-msgid ""
-"The following filters have not been saved because they were invalid (e.g. "
-"containing no actions or no search rules)."
+#. i18n: file: kmail.kcfg.cmake:136
+#. i18n: ectx: label, entry (StartupFolder), group (General)
+#: rc.cpp:150
+msgid "Specify the folder to open when the program is started"
 msgstr ""
-"Ni chedwyd yr hidlau dilynnol gan eu bod yn annilys (e.e. heb gynnwys "
-"gweithredoedd neu reolau chwilio)."
 
-#: kmfilterdlg.cpp:979
-msgid "Rename Filter"
-msgstr "Ailenwi Hidlen"
+#. i18n: file: kmail.kcfg.cmake:140
+#. i18n: ectx: label, entry (ConfirmBeforeEmpty), group (General)
+#: rc.cpp:153
+msgid "Ask for confirmation before moving all messages to trash"
+msgstr ""
 
-#: kmfilterdlg.cpp:980
-#, kde-format
+#. i18n: file: kmail.kcfg.cmake:144
+#. i18n: ectx: label, entry (AutoExpiring), group (General)
+#: rc.cpp:156
 msgid ""
-"Rename filter \"%1\" to:\n"
-"(leave the field empty for automatic naming)"
+"Specifies whether the folders will expire in the background (for internal "
+"use only)"
 msgstr ""
 
-#: antispamwizard.cpp:112
-msgid "Anti-Spam Wizard"
+#. i18n: file: kmail.kcfg.cmake:148
+#. i18n: ectx: label, entry (FirstStart), group (General)
+#: rc.cpp:159
+msgid ""
+"Specifies whether this is the very first time that the application is run "
+"(for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:113
-msgid "Anti-Virus Wizard"
+#. i18n: file: kmail.kcfg.cmake:152
+#. i18n: ectx: label, entry (PreviousVersion), group (General)
+#: rc.cpp:162
+msgid ""
+"Specifies the version of the application that was last used (for internal "
+"use only)"
 msgstr ""
 
-#: antispamwizard.cpp:117
-msgid "Welcome to the KMail Anti-Spam Wizard"
+#. i18n: file: kmail.kcfg.cmake:161
+#. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
+#: rc.cpp:165
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
 msgstr ""
 
-#: antispamwizard.cpp:118
-msgid "Welcome to the KMail Anti-Virus Wizard"
+#. i18n: file: kmail.kcfg.cmake:168
+#. i18n: ectx: label, entry (MaxConnectionsPerHost), group (Network)
+#: rc.cpp:168
+msgid "Maximal number of connections per host"
 msgstr ""
 
-#: antispamwizard.cpp:124
-msgid "Options to fine-tune the handling of spam messages"
+#. i18n: file: kmail.kcfg.cmake:169
+#. i18n: ectx: whatsthis, entry (MaxConnectionsPerHost), group (Network)
+#: rc.cpp:171
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
 msgstr ""
 
-#: antispamwizard.cpp:130
-msgid "Options to fine-tune the handling of virus messages"
+#. i18n: file: kmail.kcfg.cmake:177
+#. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
+#: rc.cpp:174
+msgid "Show folder quick search line edit"
 msgstr ""
 
-#: antispamwizard.cpp:140
-msgid "Summary of changes to be made by this wizard"
+#. i18n: file: kmail.kcfg.cmake:181
+#. i18n: ectx: label, entry (HideLocalInbox), group (UserInterface)
+#: rc.cpp:177
+msgid "Hide local inbox if unused"
 msgstr ""
 
-#: antispamwizard.cpp:212
-msgid "Virus handling"
+#. i18n: file: kmail.kcfg.cmake:189
+#. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
+#: rc.cpp:180
+msgid "Forward Inline As Default."
 msgstr ""
 
-#: antispamwizard.cpp:300 antispamwizard.cpp:302 antispamwizard.cpp:628
-msgid "Spam Handling"
+#. i18n: file: kmail.kcfg.cmake:193
+#. i18n: ectx: whatsthis, entry (StickyIdentity), group (Composer)
+#: rc.cpp:183
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
 msgstr ""
 
-#: antispamwizard.cpp:341 antispamwizard.cpp:343 antispamwizard.cpp:641
-msgid "Semi spam (unsure) handling"
+#. i18n: file: kmail.kcfg.cmake:197
+#. i18n: ectx: whatsthis, entry (StickyFcc), group (Composer)
+#: rc.cpp:187
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
 msgstr ""
 
-#: antispamwizard.cpp:403 antispamwizard.cpp:405 antispamwizard.cpp:649
-msgid "Classify as Spam"
+#. i18n: file: kmail.kcfg.cmake:201
+#. i18n: ectx: whatsthis, entry (StickyTransport), group (Composer)
+#: rc.cpp:190
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
 msgstr ""
 
-#: antispamwizard.cpp:414
-msgid "Spam"
-msgstr "Ebostach"
-
-#: antispamwizard.cpp:446 antispamwizard.cpp:448 antispamwizard.cpp:651
-msgid "Classify as NOT Spam"
+#. i18n: file: kmail.kcfg.cmake:206
+#. i18n: ectx: whatsthis, entry (StickyDictionary), group (Composer)
+#: rc.cpp:193
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
 msgstr ""
 
-#: antispamwizard.cpp:457
-msgid "Ham"
-msgstr "Ebost iawn"
-
-#: antispamwizard.cpp:525
-#, kde-format
-msgid "Scanning for %1..."
+#. i18n: file: kmail.kcfg.cmake:210
+#. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
+#: rc.cpp:197
+msgid "Warn if the number of recipients is larger than"
 msgstr ""
 
-#: antispamwizard.cpp:570
-msgid "Scanning for anti-spam tools finished."
+#. i18n: file: kmail.kcfg.cmake:212
+#. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
+#. i18n: file: kmail.kcfg.cmake:219
+#. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
+#: rc.cpp:200 rc.cpp:203
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
 msgstr ""
 
-#: antispamwizard.cpp:571
-msgid "Scanning for anti-virus tools finished."
-msgstr ""
+#. i18n: file: kmail.kcfg.cmake:248
+#. i18n: ectx: label, entry (RequestMDN), group (Composer)
+#: rc.cpp:209
+msgid "Automatically request &message disposition notifications"
+msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
 
-#: antispamwizard.cpp:574
+#. i18n: file: kmail.kcfg.cmake:249
+#. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
+#: rc.cpp:212
 msgid ""
-"<p>Sorry, no spam detection tools have been found. Install your spam "
-"detection software and re-run this wizard.</p>"
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
 msgstr ""
 
-#: antispamwizard.cpp:577
-msgid "Scanning complete. No anti-virus tools found."
+#. i18n: file: kmail.kcfg.cmake:270
+#. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
+#: rc.cpp:215
+msgid "Autosave interval:"
 msgstr ""
 
-#: antispamwizard.cpp:604
-#, kde-format
+#. i18n: file: kmail.kcfg.cmake:271
+#. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
+#: rc.cpp:218
 msgid ""
-"<p>Messages classified as spam are marked as read.<br />Spam messages are "
-"moved into the folder named <i>%1</i>.</p>"
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
 msgstr ""
 
-#: antispamwizard.cpp:608
-msgid ""
-"<p>Messages classified as spam are marked as read.<br />Spam messages are "
-"not moved into a certain folder.</p>"
+#. i18n: file: kmail.kcfg.cmake:275
+#. i18n: ectx: label, entry (QuoteSelectionOnly), group (Composer)
+#: rc.cpp:221
+msgid "Only quote selected text when replying"
 msgstr ""
 
-#: antispamwizard.cpp:613
-#, kde-format
-msgid ""
-"<p>Messages classified as spam are not marked as read.<br />Spam messages "
-"are moved into the folder named <i>%1</i>.</p>"
+#. i18n: file: kmail.kcfg.cmake:282
+#. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
+#: rc.cpp:224
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr ""
 
-#: antispamwizard.cpp:617
+#. i18n: file: kmail.kcfg.cmake:288
+#. i18n: ectx: label, entry (ShowGnuPGAuditLogAfterSuccessfulSignEncrypt), group (Composer)
+#: rc.cpp:227
 msgid ""
-"<p>Messages classified as spam are not marked as read.<br />Spam messages "
-"are not moved into a certain folder.</p>"
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
 msgstr ""
 
-#: antispamwizard.cpp:643
-#, kde-format
+#. i18n: file: kmail.kcfg.cmake:293
+#. i18n: ectx: label, entry (CryptoEncryptToSelf), group (Composer)
+#: rc.cpp:230
 msgid ""
-"<p>The folder for messages classified as unsure (probably spam) is "
-"<i>%1</i>.</p>"
-msgstr ""
-
-#: antispamwizard.cpp:656
-#, kde-format
-msgid "<p>The wizard will create the following filters:<ul>%1</ul></p>"
+"When encrypting emails, always also encrypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: antispamwizard.cpp:659
-#, kde-format
-msgid "<p>The wizard will replace the following filters:<ul>%1</ul></p>"
+#. i18n: file: kmail.kcfg.cmake:297
+#. i18n: ectx: label, entry (CryptoShowEncryptionResult), group (Composer)
+#: rc.cpp:233
+msgid "Show signed/encrypted text after composing"
 msgstr ""
 
-#: antispamwizard.cpp:924
+#. i18n: file: kmail.kcfg.cmake:301
+#. i18n: ectx: label, entry (CryptoShowKeysForApproval), group (Composer)
+#: rc.cpp:236
 msgid ""
-"The wizard will search for any tools to do spam detection\n"
-"and setup KMail to work with them."
+"Always show the list of encryption keys to select the one which will be used"
 msgstr ""
 
-#: antispamwizard.cpp:928
-msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to "
-"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
-"tools on your computer as well as create filter rules to classify messages "
-"using these tools and to separate messages containing viruses. The wizard "
-"will not take any existing filter rules into consideration: it will always "
-"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
-"during the scan of the messages for viruses, you may encounter problems with "
-"the responsiveness of KMail because anti-virus tool operations are usually "
-"time consuming; please consider deleting the filter rules created by the "
-"wizard to get back to the former behavior.</p>"
+#. i18n: file: kmail.kcfg.cmake:305
+#. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
+#: rc.cpp:239
+msgid "When check, sent messages will be stored in the encrypted form"
 msgstr ""
 
-#: antispamwizard.cpp:981
-msgid ""
-"<p>Please select the tools to be used for the detection and go to the next "
-"page.</p>"
+#. i18n: file: kmail.kcfg.cmake:309
+#. i18n: ectx: label, entry (RecentUrls), group (Composer)
+#: rc.cpp:242
+msgid "A list of all the recently used URLs"
 msgstr ""
 
-#: antispamwizard.cpp:1009
-msgid "&Mark detected spam messages as read"
+#. i18n: file: kmail.kcfg.cmake:315
+#. i18n: ectx: label, entry (RecentEncodings), group (Composer)
+#: rc.cpp:245
+msgid "A list of all the recently used encodings"
 msgstr ""
 
-#: antispamwizard.cpp:1011
-msgid "Mark messages which have been classified as spam as read."
+#. i18n: file: kmail.kcfg.cmake:334
+#. i18n: ectx: label, entry (FilterDialogSize), group (Geometry)
+#: rc.cpp:248
+msgid "The size of the filter dialog (for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:1014
-msgid "Move &known spam to:"
+#. i18n: file: kmail.kcfg.cmake:338
+#. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
+#: rc.cpp:251
+msgid "The size of the identity dialog (for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:1016
-msgid ""
-"The default folder for spam messages is the trash folder, but you may change "
-"that in the folder view below."
+#. i18n: file: kmail.kcfg.cmake:342
+#. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
+#: rc.cpp:254
+msgid "The width of the search window (for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:1031
-msgid "Move &probable spam to:"
+#. i18n: file: kmail.kcfg.cmake:346
+#. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
+#: rc.cpp:257
+msgid "The height of the search window (for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:1033
-msgid ""
-"The default folder is the inbox folder, but you may change that in the "
-"folder view below.<p>Not all tools support a classification as unsure. If "
-"you have not selected a capable tool, you cannot select a folder as well.</p>"
+#. i18n: file: kmail.kcfg.cmake:350
+#. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
+#: rc.cpp:260
+msgid "The width of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:1162
-msgid "Check messages using the anti-virus tools"
+#. i18n: file: kmail.kcfg.cmake:354
+#. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
+#: rc.cpp:263
+msgid "The height of the Configure KMail dialog (for internal use only)"
 msgstr ""
 
-#: antispamwizard.cpp:1164
-msgid ""
-"Let the anti-virus tools check your messages. The wizard will create "
-"appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to "
-"a special folder."
-msgstr ""
+#. i18n: file: kmail.kcfg.cmake:380
+#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
+#: rc.cpp:266
+msgid "Message Preview Pane"
+msgstr "Cwarel Rhagolwg y Neges"
 
-#: antispamwizard.cpp:1170
-msgid "Move detected viral messages to the selected folder"
+#. i18n: file: kmail.kcfg.cmake:383
+#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
+#: rc.cpp:269
+msgid "Do not show a message preview pane"
 msgstr ""
 
-#: antispamwizard.cpp:1172
-msgid ""
-"A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the "
-"trash folder, but you may change that in the folder view."
+#. i18n: file: kmail.kcfg.cmake:386
+#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
+#: rc.cpp:272
+msgid "Show the message preview pane below the message list"
 msgstr ""
 
-#: antispamwizard.cpp:1178
-msgid "Additionally, mark detected viral messages as read"
+#. i18n: file: kmail.kcfg.cmake:389
+#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
+#: rc.cpp:275
+msgid "Show the message preview pane next to the message list"
 msgstr ""
 
-#: antispamwizard.cpp:1181
-msgid ""
-"Mark messages which have been classified as virus-infected as read, as well "
-"as moving them to the selected folder."
+#. i18n: file: kmail.kcfg.cmake:399
+#. i18n: ectx: label, entry (FolderList), group (Geometry)
+#: rc.cpp:281
+msgid "Long folder list"
 msgstr ""
 
-#: identitylistview.cpp:98
-#, kde-format
-msgctxt ""
-"%1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity"
-msgid "%1 (Default)"
-msgstr "%1 (Rhagosod)"
-
-#: identitylistview.cpp:120
-msgid "Identity Name"
-msgstr "Enw Dynodiad"
-
-#: identitylistview.cpp:120
-msgid "Email Address"
-msgstr "Cyfeiriad Ebost"
-
-#: addressvalidationjob.cpp:69
-#, kde-format
-msgid "Distribution list \"%1\" is empty, it cannot be used."
+#. i18n: file: kmail.kcfg.cmake:402
+#. i18n: ectx: label, entry (FolderList), group (Geometry)
+#: rc.cpp:284
+msgid "Short folder list"
 msgstr ""
 
-#: kmcomposereditor.cpp:64
-msgid "Pa&ste as Quotation"
-msgstr "Gl&udo fel Dyfyniad"
-
-#: kmcomposereditor.cpp:68
-msgid "Add &Quote Characters"
-msgstr "&Ychwanegu Nodau Dyfynnu"
-
-#: kmcomposereditor.cpp:72
-msgid "Re&move Quote Characters"
-msgstr "G&waredu Nodau Dyfynnu"
-
-#: kmcomposereditor.cpp:143
-msgid "Add as &Inline Image"
+#. i18n: file: kmail.kcfg.cmake:411
+#. i18n: ectx: label, entry (CloseAfterReplyOrForward), group (Reader)
+#: rc.cpp:287
+msgid "Close message window after replying or forwarding"
 msgstr ""
 
-#: kmcomposereditor.cpp:144
-msgid "Add as &Attachment"
+#. i18n: file: kmail.kcfg.cmake:419
+#. i18n: ectx: label, entry (SendMDNsWithEmptySender), group (MDN)
+#: rc.cpp:290
+msgid "Send Message Disposition Notifications with an empty sender."
 msgstr ""
 
-#: kmcomposereditor.cpp:199
-msgid "Add URL into Message &Text"
-msgid_plural "Add URLs into Message &Text"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kmcomposereditor.cpp:200
-msgid "Add File as &Attachment"
-msgid_plural "Add Files as &Attachment"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kmsearchmessagemodel.cpp:77
-#, kde-format
-msgctxt "@label"
+#. i18n: file: kmail.kcfg.cmake:420
+#. i18n: ectx: whatsthis, entry (SendMDNsWithEmptySender), group (MDN)
+#: rc.cpp:293
 msgid ""
-"This model can only handle email folders. The current collection holds "
-"mimetypes: %1"
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
 msgstr ""
 
-#: kmsearchmessagemodel.cpp:101
-msgctxt "@label No size available"
-msgid "-"
+#. i18n: file: kmail.kcfg.cmake:426
+#. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
+#: rc.cpp:296
+msgid "Message template for new message"
 msgstr ""
 
-#: kmsearchmessagemodel.cpp:139
-msgctxt "@title:column, folder (e.g. email)"
-msgid "Folder"
+#. i18n: file: kmail.kcfg.cmake:431
+#. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
+#: rc.cpp:299
+msgid "Message template for reply"
 msgstr ""
 
-#: collectionmaintenancepage.cpp:46
-msgid "Maintenance"
+#. i18n: file: kmail.kcfg.cmake:436
+#. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
+#: rc.cpp:302
+msgid "Message template for reply to all"
 msgstr ""
 
-#: collectionmaintenancepage.cpp:56
-msgid "Files"
+#. i18n: file: kmail.kcfg.cmake:441
+#. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
+#: rc.cpp:305
+msgid "Message template for forward"
 msgstr ""
 
-#: collectionmaintenancepage.cpp:67
-msgid "Folder type:"
+#. i18n: file: kmail.kcfg.cmake:446
+#. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
+#: rc.cpp:308
+msgid "Quote characters"
 msgstr ""
 
-#: collectionmaintenancepage.cpp:70
-msgctxt "folder size"
-msgid "Not available"
+#. i18n: file: kmail.kcfg.cmake:457
+#. i18n: ectx: label, entry (FavoriteCollectionViewMode), group (FavoriteCollectionView)
+#: rc.cpp:311
+msgid "Display Mode of the Favorite Collections View"
 msgstr ""
 
-#: collectionmaintenancepage.cpp:71
-msgid "Size:"
+#. i18n: file: kmail.kcfg.cmake:460
+#. i18n: ectx: label, entry (FavoriteCollectionViewMode), group (FavoriteCollectionView)
+#: rc.cpp:314
+msgid "Do not show the favorite folders view."
 msgstr ""
 
-#: collectionmaintenancepage.cpp:75
-msgid "Messages"
+#. i18n: file: kmail.kcfg.cmake:463
+#. i18n: ectx: label, entry (FavoriteCollectionViewMode), group (FavoriteCollectionView)
+#: rc.cpp:317
+msgid "Show favorite folders in icon mode."
 msgstr ""
 
-#: collectionmaintenancepage.cpp:80
-msgid "Total messages:"
+#. i18n: file: kmail.kcfg.cmake:466
+#. i18n: ectx: label, entry (FavoriteCollectionViewMode), group (FavoriteCollectionView)
+#: rc.cpp:320
+msgid "Show favorite folders in list mode."
 msgstr ""
 
-#: collectionmaintenancepage.cpp:83
-msgid "Unread messages:"
+#. i18n: file: kmail.kcfg.cmake:482
+#. i18n: ectx: label, entry (UpdateLevel), group (Startup)
+#: rc.cpp:323
+msgid "Specifies the number of updates to perform (for internal use only)"
 msgstr ""
 
-#: collectionmaintenancepage.cpp:87
-msgid "Indexing"
-msgstr ""
-
-#: collectionmaintenancepage.cpp:89
-msgid "Enable Full Text Indexing"
+#. i18n: file: kmail.kcfg.cmake:489
+#. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
+#: rc.cpp:326
+msgid "Specifies the policy used when displaying policy"
 msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "Kyfieithu: KD, ,Launchpad Contributions:"
-
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
-
-#. i18n: file: ui/securitypagegeneraltab.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:5
-msgid "HTML Messages"
-msgstr "Negeseuon HTML"
-
-#. i18n: file: ui/securitypagegeneraltab.ui:23
-#. i18n: ectx: property (text), widget (QLabel, labelWarnHTML)
-#: rc.cpp:8
+#. i18n: file: kmail.kcfg.cmake:497
+#. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
+#: rc.cpp:329
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
-"system will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis1\">More about HTML mails...</a> <a href=\"whatsthis2\">More "
-"about external references...</a>"
+"Specifies the width of the collection field in the Search Window dialog (for "
+"internal use only)"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:36
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mHtmlMailCheck)
-#: rc.cpp:11
+#. i18n: file: kmail.kcfg.cmake:501
+#. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
+#: rc.cpp:332
 msgid ""
-"<qt><p>Messages sometimes come in both formats. This option controls whether "
-"you want the HTML part or the plain text part to be "
-"displayed.</p><p>Displaying the HTML part makes the message look better, but "
-"at the same time increases the risk of security holes being "
-"exploited.</p><p>Displaying the plain text part loses much of the message's "
-"formatting, but makes it almost <em>impossible</em> to exploit security "
-"holes in the HTML renderer (Konqueror).</p><p>The option below guards "
-"against one common misuse of HTML messages, but it cannot guard against "
-"security issues that were not known at the time this version of KMail was "
-"written.</p><p>It is therefore advisable to <em>not</em> prefer HTML to "
-"plain text.</p><p><b>Note:</b> You can set this option on a per-folder basis "
-"from the <i>Folder</i> menu of KMail's main window.</p></qt>"
+"Specifies the width of the subject field in the Search Window dialog (for "
+"internal use only)"
 msgstr ""
-"<qt><p>Mae negeseuon weithiau yn dod yn y dau fformat.  Mae'r dewisiad yma "
-"yn rheoli a hoffech un ai'r rhan HTML neu'r rhan destun i'w "
-"dangos.</p><p>Mae dangos y rhan HTML yn gwneud i'r neges edrych yn well, ond "
-"wrth yr un adeg mae'n cynyddu'r perygl y bydd tyllau diogelwch yn cael eu "
-"ymelwa.</p><p>Mae dangos y rhan destun plaen yn colli y mwyafrif o "
-"fformatio'r neges, ond mae'n ei gwneud hi bron yn <em>amhosibl</em> i ymelwa "
-"tyllau diogelwch yn y llunydd HTML (Konqueror).</p><p>Mae'r dewisiad isod yn "
-"amddiffyn yn erbyn un cam-ddefnydd cyffredin negeseuon HTML, ond mae'n methu "
-"amddiffyn yn erbyn problemau diogelwch nad adnabuwyd wrth yr adeg a "
-"ysgrifennwyd y fersiwn yma o KMail.</p><p>Y peth callaf, felly, yw "
-"<em>peidio</em> â dewis HTML yn lle testun plaen.</p><p><b>Noder:</b> "
-"Gallwch osod y dewisiad yma ar sail pob-plygell o'r ddewislen <i>Plygell</i> "
-"ym mhrif ffenestr KMail.</p></qt>"
 
-#. i18n: file: ui/securitypagegeneraltab.ui:39
-#. i18n: ectx: property (text), widget (QCheckBox, mHtmlMailCheck)
-#: rc.cpp:14
-msgid "Prefer HTML to plain text"
+#. i18n: file: kmail.kcfg.cmake:505
+#. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
+#: rc.cpp:335
+msgid ""
+"Specifies the width of the sender field in the Search Window dialog (for "
+"internal use only)"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:46
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExternalReferences)
-#: rc.cpp:17
+#. i18n: file: kmail.kcfg.cmake:509
+#. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
+#: rc.cpp:338
 msgid ""
-"<qt><p>Some mail advertisements are in HTML and contain references to, for "
-"example, images that the advertisers employ to find out that you have read "
-"their message (\"web bugs\").</p><p>There is no valid reason to load images "
-"off the Internet like this, since the sender can always attach the required "
-"images directly to the message.</p><p>To guard from such a misuse of the "
-"HTML displaying feature of KMail, this option is <em>disabled</em> by "
-"default.</p><p>However, if you wish to, for example, view images in HTML "
-"messages that were not attached to it, you can enable this option, but you "
-"should be aware of the possible problem.</p></qt>"
+"Specifies the width of the receiver field in the Search Window dialog (for "
+"internal use only)"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:49
-#. i18n: ectx: property (text), widget (QCheckBox, mExternalReferences)
-#: rc.cpp:20
-msgid "Allow messages to load external references from the Internet"
+#. i18n: file: kmail.kcfg.cmake:513
+#. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
+#: rc.cpp:341
+msgid ""
+"Specifies the width of the date field in the Search Window dialog (for "
+"internal use only)"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:59
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:23
-msgid "Encrypted Messages"
+#. i18n: file: kmail.kcfg.cmake:517
+#. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
+#: rc.cpp:344
+msgid ""
+"Specifies the width of the folder field in the Search Window dialog (for "
+"internal use only)"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:65
-#. i18n: ectx: property (text), widget (QCheckBox, mAlwaysDecrypt)
-#: rc.cpp:26
-msgid "Attempt decryption of encrypted messages when viewing"
+#. i18n: file: kmcomposerui.rc:32
+#. i18n: ectx: Menu (options)
+#: rc.cpp:370
+msgid "&Options"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:75
-#. i18n: ectx: property (title), widget (QGroupBox, groupMessageDisp)
-#: rc.cpp:29
-msgid "Message Disposition Notifications"
-msgstr "Hysbysiadau Lleoliad Neges"
-
-#. i18n: file: ui/securitypagegeneraltab.ui:81
-#. i18n: ectx: property (text), widget (QLabel, labelSend)
-#: rc.cpp:32
-msgid "Send policy:"
-msgstr "Polisi anfon:"
+#. i18n: file: kmcomposerui.rc:66
+#. i18n: ectx: Menu (attach)
+#: rc.cpp:376
+msgid "&Attach"
+msgstr "&Atodi"
 
-#. i18n: file: ui/securitypagegeneraltab.ui:88
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioIgnore)
-#. i18n: file: ui/securitypagegeneraltab.ui:98
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioAsk)
-#. i18n: file: ui/securitypagegeneraltab.ui:108
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioDeny)
-#. i18n: file: ui/securitypagegeneraltab.ui:118
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioAlways)
-#. i18n: file: ui/securitypagegeneraltab.ui:135
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioNothing)
-#. i18n: file: ui/securitypagegeneraltab.ui:145
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioFull)
-#. i18n: file: ui/securitypagegeneraltab.ui:155
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioHeaders)
-#: rc.cpp:35 rc.cpp:41 rc.cpp:47 rc.cpp:53 rc.cpp:62 rc.cpp:68 rc.cpp:74
-msgid ""
-"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
-"generalization of what is commonly called <b>read receipt</b>. The message "
-"author requests a disposition notification to be sent and the receiver's "
-"mail program generates a reply from which the author can learn what happened "
-"to his message. Common disposition types include <b>displayed</b> (i.e. "
-"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
-"following options are available to control KMail's sending of "
-"MDNs:</p><ul><li><em>Ignore</em>: Ignores any request for disposition "
-"notifications. No MDN will ever be sent automatically "
-"(recommended).</li><li><em>Ask</em>: Answers requests only after asking the "
-"user for permission. This way, you can send MDNs for selected messages while "
-"denying or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
-"<b>denied</b> notification. This is only <em>slightly</em> better than "
-"always sending MDNs. The author will still know that the messages has been "
-"acted upon, he just cannot tell whether it was deleted or read "
-"etc.</li><li><em>Always send</em>: Always sends the requested disposition "
-"notification. That means that the author of the message gets to know when "
-"the message was acted upon and, in addition, what happened to it (displayed, "
-"deleted, etc.). This option is strongly discouraged, but since it makes much "
-"sense e.g. for customer relationship management, it has been made "
-"available.</li></ul></qt>"
+#. i18n: file: kmcomposerui.rc:104
+#. i18n: ectx: ToolBar (htmlToolBar)
+#: rc.cpp:385
+msgid "HTML Toolbar"
 msgstr ""
-"<qt><h3>Polisi Hysbysiad Lleoliad Neges</h3><p>Mae MDNau (Message "
-"Disposition Notifications) yn cyffredinoliad o beth a gelwir yn arferol "
-"<b>derbynneb ddarllen</b>.  Mae awdur y neges yn gofyn am hysbysiad lleoliad "
-"i'w anfon, ac mae rhaglen ebost y derbyniwr yn creu ateb y gall yr awdur yn "
-"dysgu ohono be wnaeth ddigwydd i'w neges.  Mae mathau lleoliad cyffredin yn "
-"cynnwys <b>wedi'i dangos</b> (h.y. wedi'i darllen), <b>wedi'i dileu</b> a "
-"<b>wedi''i danfon</b> (h.y. wedi'i blaenyrru).</p><p>Mae'r dewisiadau "
-"dilynnol ar gael i reoli y ffordd y mae KMail yn anfon "
-"MDNau:</p><ul><li><em>Anwybyddu</em>: Anwybyddu unrhyw cais ar gyfer "
-"hysbysiadau lleoliad neges.  Ni anfonir MDN byth yn ymysgogol "
-"(argymhellir).</li><li><em>Gofyn</em>: Ateb ceisiadau ar ôl gofyn i'r "
-"defnyddiwr ar gyfer caniatâd yn unig.  Felly, gallwch anfon MDNau ar gyfer "
-"negeseuon penodol tra'n ei gwrthod neu eu anwybyddu ar gyfer "
-"eraill.</li><li><em>Gwrthod</em>: Anfon hysbysiad <b>wedi'i gwrthod</b> o "
-"hyd.  Mae hyn yn unig <em>ychydig bach</em> yn well nag anfon MDNau o hyd.  "
-"Bydd yr awdur yn dal i wybod bod rhywun wedi gweithredu ar sail y neges, yr "
-"unig beth yw na all wybod a's darllenwyd neu ddileuwyd "
-"ayyb.</li><li><em>Anfon o hyd</em>: Anfon yr hysbysiad lleoliad ceisiedig o "
-"hyd.  Golyga hyn bod awdur y neges yn cael gwybod pryd oedd rhywun yn "
-"gweithredu ar sail y neges ac, yn ychwanegol, beth a wnaeth ddigwydd iddi "
-"(wedi'i darllen, wedi'i dileu, ayyb).  Annogir i chi beidio â defnyddio'r "
-"dewisiad yma, ond darperir gan ei fod yn gwneud llawer o synnwyr ar gyfer "
-"e.e. rheoli'r berthynas efo cwsmeriaid.</li></ul></qt>"
 
-#. i18n: file: ui/securitypagegeneraltab.ui:91
-#. i18n: ectx: property (text), widget (QRadioButton, radioIgnore)
-#: rc.cpp:38
-msgid "Ignore"
+#. i18n: file: kmcomposerui.rc:123
+#. i18n: ectx: ToolBar (directionToolBar)
+#: rc.cpp:388
+msgid "Text Direction Toolbar"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:101
-#. i18n: ectx: property (text), widget (QRadioButton, radioAsk)
-#: rc.cpp:44
-msgid "Ask"
+#. i18n: file: ui/identitypage.ui:24
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAdd)
+#: rc.cpp:418
+msgid "Add a new identity"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:111
-#. i18n: ectx: property (text), widget (QRadioButton, radioDeny)
-#: rc.cpp:50
-msgid "Deny"
+#. i18n: file: ui/identitypage.ui:37
+#. i18n: ectx: property (toolTip), widget (QPushButton, mModifyButton)
+#: rc.cpp:424
+msgid "Modify the selected identity"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:121
-#. i18n: ectx: property (text), widget (QRadioButton, radioAlways)
-#: rc.cpp:56
-msgid "Always send"
+#. i18n: file: ui/identitypage.ui:50
+#. i18n: ectx: property (toolTip), widget (QPushButton, mRenameButton)
+#: rc.cpp:430
+msgid "Rename the selected identity"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:128
-#. i18n: ectx: property (text), widget (QLabel, labelQuote)
-#: rc.cpp:59
-msgid "Quote original message:"
-msgstr "Dyfynnu'r neges wreiddiol"
+#. i18n: file: ui/identitypage.ui:53
+#. i18n: ectx: property (text), widget (QPushButton, mRenameButton)
+#: rc.cpp:433
+msgid "&Rename"
+msgstr "&Ailenwi"
 
-#. i18n: file: ui/securitypagegeneraltab.ui:138
-#. i18n: ectx: property (text), widget (QRadioButton, radioNothing)
-#: rc.cpp:65
-msgid "Nothing"
+#. i18n: file: ui/identitypage.ui:63
+#. i18n: ectx: property (toolTip), widget (QPushButton, mRemoveButton)
+#: rc.cpp:436
+msgid "Remove the selected identity"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:148
-#. i18n: ectx: property (text), widget (QRadioButton, radioFull)
-#: rc.cpp:71
-msgid "Full message"
+#. i18n: file: ui/identitypage.ui:76
+#. i18n: ectx: property (toolTip), widget (QPushButton, mSetAsDefaultButton)
+#: rc.cpp:442
+msgid "Use the selected identity by default"
 msgstr ""
 
-#. i18n: file: ui/securitypagegeneraltab.ui:158
-#. i18n: ectx: property (text), widget (QRadioButton, radioHeaders)
-#: rc.cpp:77
-msgid "Only headers"
-msgstr ""
+#. i18n: file: ui/identitypage.ui:79
+#. i18n: ectx: property (text), widget (QPushButton, mSetAsDefaultButton)
+#: rc.cpp:445
+msgid "Set as &Default"
+msgstr "&Gosod fel Rhagosod"
 
-#. i18n: file: ui/securitypagegeneraltab.ui:165
-#. i18n: ectx: property (text), widget (QCheckBox, mNoMDNsWhenEncryptedCheck)
-#: rc.cpp:80
-msgid "Do not send MDNs in response to encrypted messages"
-msgstr ""
+#. i18n: file: ui/warningconfiguration.ui:17
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mWarnUnsigned)
+#: rc.cpp:448
+msgid "Check to be warned when sending unsigned messages."
+msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
 
-#. i18n: file: ui/securitypagegeneraltab.ui:172
-#. i18n: ectx: property (text), widget (QLabel, labelWarning)
-#: rc.cpp:83
+#. i18n: file: ui/warningconfiguration.ui:25
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mWarnUnsigned)
+#: rc.cpp:451
 msgid ""
-"<b>WARNING:</b> Unconditionally returning confirmations undermines your "
-"privacy. <a href=\"whatsthis3\">More about MDNs...</a>"
-msgstr ""
-
-#. i18n: file: ui/securitypagegeneraltab.ui:188
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:86
-msgid "Certificate && Key Bundle Attachments"
-msgstr ""
-
-#. i18n: file: ui/securitypagegeneraltab.ui:194
-#. i18n: ectx: property (text), widget (QCheckBox, mAutomaticallyImportAttachedKeysCheck)
-#: rc.cpp:89
-msgid "Automatically import keys and certificate"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:16
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, CRLRB)
-#: rc.cpp:92
-msgid ""
-"If this option is selected, S/MIME certificates are validated using "
-"Certificate Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:19
-#. i18n: ectx: property (text), widget (QRadioButton, CRLRB)
-#: rc.cpp:95
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:29
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, OCSPRB)
-#: rc.cpp:98
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using "
-"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:32
-#. i18n: ectx: property (text), widget (QRadioButton, OCSPRB)
-#: rc.cpp:101
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:39
-#. i18n: ectx: property (title), widget (QGroupBox, OCSPGroupBox)
-#: rc.cpp:104
-msgid "Online Certificate Validation"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:49
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:107
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:59
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:110
-msgid "OCSP responder signature:"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:73
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, OCSPResponderURL)
-#: rc.cpp:113
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:87
-#. i18n: ectx: property (text), widget (QCheckBox, ignoreServiceURLCB)
-#: rc.cpp:116
-msgid "Ignore service URL of certificates"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:97
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, doNotCheckCertPolicyCB)
-#: rc.cpp:119
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
-"certificate policy is allowed. If this option is selected, policies are not "
-"checked."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:100
-#. i18n: ectx: property (text), widget (QCheckBox, doNotCheckCertPolicyCB)
-#: rc.cpp:122
-msgid "Do not check certificate policies"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:107
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, neverConsultCB)
-#: rc.cpp:125
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:110
-#. i18n: ectx: property (text), widget (QCheckBox, neverConsultCB)
-#: rc.cpp:128
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:117
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, fetchMissingCB)
-#: rc.cpp:131
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:120
-#. i18n: ectx: property (text), widget (QCheckBox, fetchMissingCB)
-#: rc.cpp:134
-msgid "Fetch missing issuer certificates"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:131
-#. i18n: ectx: attribute (title), widget (QWidget, tabHTTP)
-#: rc.cpp:137
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:137
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, disableHTTPCB)
-#: rc.cpp:140
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:140
-#. i18n: ectx: property (text), widget (QCheckBox, disableHTTPCB)
-#: rc.cpp:143
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:147
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreHTTPDPCB)
-#: rc.cpp:146
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
-"are URLs describing the way to access the URL. The first found DP entry is "
-"used.  With this option all entries using the HTTP scheme are ignored when "
-"looking for a suitable DP."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:150
-#. i18n: ectx: property (text), widget (QCheckBox, ignoreHTTPDPCB)
-#: rc.cpp:149
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:172
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, honorHTTPProxyRB)
-#: rc.cpp:152
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:175
-#. i18n: ectx: property (text), widget (QRadioButton, honorHTTPProxyRB)
-#: rc.cpp:155
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:192
-#. i18n: ectx: property (text), widget (QRadioButton, useCustomHTTPProxyRB)
-#: rc.cpp:161
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:199
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, customHTTPProxy)
-#: rc.cpp:164
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:209
-#. i18n: ectx: attribute (title), widget (QWidget, tabLDAP)
-#: rc.cpp:167
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:217
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, disableLDAPCB)
-#: rc.cpp:170
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:220
-#. i18n: ectx: property (text), widget (QCheckBox, disableLDAPCB)
-#: rc.cpp:173
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:227
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreLDAPDPCB)
-#: rc.cpp:176
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
-"are URLs describing the way to access the URL. The first found DP entry is "
-"used.  With this option all entries using the LDAP scheme are ignored when "
-"looking for a suitable DP."
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:230
-#. i18n: ectx: property (text), widget (QCheckBox, ignoreLDAPDPCB)
-#: rc.cpp:179
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:239
-#. i18n: ectx: property (text), widget (QLabel, customLDAPLabel)
-#: rc.cpp:182
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file: ui/smimeconfiguration.ui:250
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, customLDAPProxy)
-#: rc.cpp:185
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port "
-"part in a LDAP URL and will also be used if host and port have been omitted "
-"from the URL. Other LDAP servers will be used only if the connection to the "
-"\"proxy\" failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
-"(standard LDAP port) is used."
-msgstr ""
-
-#. i18n: file: ui/warningconfiguration.ui:17
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mWarnUnsigned)
-#: rc.cpp:189
-msgid "Check to be warned when sending unsigned messages."
-msgstr "Brithwch i gael eich rhybuddio wrth anfon negeseuon heb eu llofnodi."
-
-#. i18n: file: ui/warningconfiguration.ui:25
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mWarnUnsigned)
-#: rc.cpp:192
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or "
-"the whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</p></qt>"
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</p></qt>"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:28
 #. i18n: ectx: property (text), widget (QCheckBox, mWarnUnsigned)
-#: rc.cpp:200
+#: rc.cpp:459
 msgid "Warn when trying to send &unsigned messages"
 msgstr "Rhybuddio wrth geisio anfon negeseuon &heb eu llofnodi"
 
 #. i18n: file: ui/warningconfiguration.ui:38
 #. i18n: ectx: property (toolTip), widget (QCheckBox, warnUnencryptedCB)
-#: rc.cpp:203
+#: rc.cpp:462
 msgid "Check to be warned when sending unencrypted messages."
 msgstr ""
 "Brithwch i gael eich rhybuddio wrth geisio anfon negeseuon heb eu cêl-"
@@ -4739,7 +4701,7 @@
 
 #. i18n: file: ui/warningconfiguration.ui:46
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, warnUnencryptedCB)
-#: rc.cpp:206
+#: rc.cpp:465
 msgid ""
 "<qt>\n"
 "<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
@@ -4752,22 +4714,22 @@
 
 #. i18n: file: ui/warningconfiguration.ui:49
 #. i18n: ectx: property (text), widget (QCheckBox, warnUnencryptedCB)
-#: rc.cpp:214
+#: rc.cpp:473
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "Rhy&buddio wrth geisio anfon negeseuon heb eu cêl-ysgrifo"
 
 #. i18n: file: ui/warningconfiguration.ui:59
 #. i18n: ectx: property (toolTip), widget (QCheckBox, warnReceiverNotInCertificateCB)
-#: rc.cpp:217
+#: rc.cpp:476
 msgid "Check to be warned if the address is not in the certificate"
 msgstr "Brithwch i gael eich rhybuddio os nid yw'r cyfeiriad yn y dystysgrif"
 
 #. i18n: file: ui/warningconfiguration.ui:67
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, warnReceiverNotInCertificateCB)
-#: rc.cpp:220
+#: rc.cpp:479
 msgid ""
 "<qt>\n"
-"<h1>Warn if receiver's email address is not in certificate</h1>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
 "If this option is checked, a warning is issued if the email address of the "
 "receiver is not contained in the certificate used for encrypting.\n"
 "<p>\n"
@@ -4777,25 +4739,25 @@
 
 #. i18n: file: ui/warningconfiguration.ui:70
 #. i18n: ectx: property (text), widget (QCheckBox, warnReceiverNotInCertificateCB)
-#: rc.cpp:228
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
+#: rc.cpp:487
+msgid "Warn if &receiver's email address is not in certificate"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:80
 #. i18n: ectx: property (title), widget (QGroupBox, warnGroupBox)
-#: rc.cpp:231
+#: rc.cpp:490
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:89
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:234
+#: rc.cpp:493
 msgid "For Signing"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:102
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:237
+#: rc.cpp:496
 msgid "For Encryption"
 msgstr ""
 
@@ -4811,13 +4773,13 @@
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, mWarnSignRootCertExpiresSB)
 #. i18n: file: ui/warningconfiguration.ui:289
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, mWarnEncrRootCertExpiresSB)
-#: rc.cpp:240 rc.cpp:251 rc.cpp:262 rc.cpp:273 rc.cpp:284 rc.cpp:295
+#: rc.cpp:499 rc.cpp:510 rc.cpp:521 rc.cpp:532 rc.cpp:543 rc.cpp:554
 msgid "Select the number of days here"
 msgstr "Dewis y nifer o ddiwrnodau yma"
 
 #. i18n: file: ui/warningconfiguration.ui:129
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWarnSignKeyExpiresSB)
-#: rc.cpp:243
+#: rc.cpp:502
 msgid ""
 "<qt>\n"
 "<h1>Warn If Signature Certificate Expires</h1>\n"
@@ -4830,7 +4792,7 @@
 
 #. i18n: file: ui/warningconfiguration.ui:165
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWarnEncrKeyExpiresSB)
-#: rc.cpp:254
+#: rc.cpp:513
 msgid ""
 "<qt>\n"
 "<h1>Warn If Encryption Certificate Expires</h1>\n"
@@ -4843,7 +4805,7 @@
 
 #. i18n: file: ui/warningconfiguration.ui:201
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWarnEncrChainCertExpiresSB)
-#: rc.cpp:265
+#: rc.cpp:524
 msgid ""
 "<qt>\n"
 "<h1>Warn If A Certificate In The Chain Expires</h1>\n"
@@ -4856,7 +4818,7 @@
 
 #. i18n: file: ui/warningconfiguration.ui:231
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWarnSignChainCertExpiresSB)
-#: rc.cpp:276
+#: rc.cpp:535
 msgid ""
 "<qt>\n"
 "<h1>Warn If CA Certificate Expires</h1>\n"
@@ -4871,7 +4833,7 @@
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWarnSignRootCertExpiresSB)
 #. i18n: file: ui/warningconfiguration.ui:297
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mWarnEncrRootCertExpiresSB)
-#: rc.cpp:287 rc.cpp:298
+#: rc.cpp:546 rc.cpp:557
 msgid ""
 "<qt>\n"
 "<h1>Warn If Root Certificate Expires</h1>\n"
@@ -4884,1075 +4846,850 @@
 
 #. i18n: file: ui/warningconfiguration.ui:313
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
-#: rc.cpp:306
+#: rc.cpp:565
 msgid "For root certificates:"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:326
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:309
+#: rc.cpp:568
 msgid "For intermediate CA certificates:"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:339
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:312
+#: rc.cpp:571
 msgid "For end-user certificates/keys:"
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:402
 #. i18n: ectx: property (text), widget (QPushButton, gnupgButton)
-#: rc.cpp:315
+#: rc.cpp:574
 msgid "GnuPG Settings..."
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:426
 #. i18n: ectx: property (text), widget (QPushButton, chiasmusButton)
-#: rc.cpp:318
+#: rc.cpp:577
 msgid "Chiasmus Settings..."
 msgstr ""
 
 #. i18n: file: ui/warningconfiguration.ui:456
 #. i18n: ectx: property (text), widget (QPushButton, enableAllWarningsPB)
-#: rc.cpp:321
+#: rc.cpp:580
 msgid "Re-enable All \"Do not Ask Again\" Warnings"
 msgstr ""
 
-#. i18n: file: ui/identitypage.ui:24
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAdd)
-#: rc.cpp:324
-msgid "Add a new identity"
-msgstr ""
+#. i18n: file: ui/securitypagegeneraltab.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:583
+msgid "HTML Messages"
+msgstr "Negeseuon HTML"
 
-#. i18n: file: ui/identitypage.ui:37
-#. i18n: ectx: property (toolTip), widget (QPushButton, mModifyButton)
-#: rc.cpp:330
-msgid "Modify the selected identity"
+#. i18n: file: ui/securitypagegeneraltab.ui:23
+#. i18n: ectx: property (text), widget (QLabel, labelWarnHTML)
+#: rc.cpp:586
+msgid ""
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis1\">More about HTML mails...</a> <a href=\"whatsthis2\">More "
+"about external references...</a>"
 msgstr ""
 
-#. i18n: file: ui/identitypage.ui:50
-#. i18n: ectx: property (toolTip), widget (QPushButton, mRenameButton)
-#: rc.cpp:336
-msgid "Rename the selected identity"
+#. i18n: file: ui/securitypagegeneraltab.ui:36
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mHtmlMailCheck)
+#: rc.cpp:589
+msgid ""
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be "
+"displayed.</p><p>Displaying the HTML part makes the message look better, but "
+"at the same time increases the risk of security holes being "
+"exploited.</p><p>Displaying the plain text part loses much of the message's "
+"formatting, but makes it almost <em>impossible</em> to exploit security "
+"holes in the HTML renderer (Konqueror).</p><p>The option below guards "
+"against one common misuse of HTML messages, but it cannot guard against "
+"security issues that were not known at the time this version of KMail was "
+"written.</p><p>It is therefore advisable to <em>not</em> prefer HTML to "
+"plain text.</p><p><b>Note:</b> You can set this option on a per-folder basis "
+"from the <i>Folder</i> menu of KMail's main window.</p></qt>"
 msgstr ""
+"<qt><p>Mae negeseuon weithiau yn dod yn y dau fformat.  Mae'r dewisiad yma "
+"yn rheoli a hoffech un ai'r rhan HTML neu'r rhan destun i'w "
+"dangos.</p><p>Mae dangos y rhan HTML yn gwneud i'r neges edrych yn well, ond "
+"wrth yr un adeg mae'n cynyddu'r perygl y bydd tyllau diogelwch yn cael eu "
+"ymelwa.</p><p>Mae dangos y rhan destun plaen yn colli y mwyafrif o "
+"fformatio'r neges, ond mae'n ei gwneud hi bron yn <em>amhosibl</em> i ymelwa "
+"tyllau diogelwch yn y llunydd HTML (Konqueror).</p><p>Mae'r dewisiad isod yn "
+"amddiffyn yn erbyn un cam-ddefnydd cyffredin negeseuon HTML, ond mae'n methu "
+"amddiffyn yn erbyn problemau diogelwch nad adnabuwyd wrth yr adeg a "
+"ysgrifennwyd y fersiwn yma o KMail.</p><p>Y peth callaf, felly, yw "
+"<em>peidio</em> â dewis HTML yn lle testun plaen.</p><p><b>Noder:</b> "
+"Gallwch osod y dewisiad yma ar sail pob-plygell o'r ddewislen <i>Plygell</i> "
+"ym mhrif ffenestr KMail.</p></qt>"
 
-#. i18n: file: ui/identitypage.ui:53
-#. i18n: ectx: property (text), widget (QPushButton, mRenameButton)
-#: rc.cpp:339
-msgid "&Rename"
-msgstr "&Ailenwi"
-
-#. i18n: file: ui/identitypage.ui:63
-#. i18n: ectx: property (toolTip), widget (QPushButton, mRemoveButton)
-#: rc.cpp:342
-msgid "Remove the selected identity"
-msgstr ""
-
-#. i18n: file: ui/identitypage.ui:76
-#. i18n: ectx: property (toolTip), widget (QPushButton, mSetAsDefaultButton)
-#: rc.cpp:348
-msgid "Use the selected identity by default"
-msgstr ""
-
-#. i18n: file: ui/identitypage.ui:79
-#. i18n: ectx: property (text), widget (QPushButton, mSetAsDefaultButton)
-#: rc.cpp:351
-msgid "Set as &Default"
-msgstr "&Gosod fel Rhagosod"
-
-#. i18n: file: ui/composercryptoconfiguration.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, optionsGroup_2)
-#: rc.cpp:354
-msgid "Signing"
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:22
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoSignature)
-#: rc.cpp:357
-msgid "&Automatically sign messages"
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:25
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoSignature)
-#: rc.cpp:360
-msgid ""
-"When this option is enabled, all messages you send will be signed by "
-"default; of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:35
-#. i18n: ectx: property (title), widget (QGroupBox, optionsGroup)
-#: rc.cpp:363
-msgid "Encrypting"
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:41
-#. i18n: ectx: property (text), widget (QCheckBox, mEncToSelf)
-#: rc.cpp:366
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:44
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mEncToSelf)
-#: rc.cpp:369
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted "
-"with the receiver's public key, but also with your key. This will enable you "
-"to decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, mShowEncryptionResult)
-#: rc.cpp:372
-msgid "Show s&igned/encrypted text after composing"
-msgstr "Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
-
-#. i18n: file: ui/composercryptoconfiguration.ui:54
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowEncryptionResult)
-#: rc.cpp:375
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. "
-"This is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, mStoreEncrypted)
-#: rc.cpp:378
-msgid "Store sent messages encry&pted"
-msgstr ""
-
-#. i18n: file: ui/composercryptoconfiguration.ui:67
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mStoreEncrypted)
-#: rc.cpp:381
-msgid "Check to store messages encrypted "
-msgstr "Brithwch i gadw negeseuon wedi'u cêl-ysgrifo "
-
-#. i18n: file: ui/composercryptoconfiguration.ui:75
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mStoreEncrypted)
-#: rc.cpp:384
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages "
-"any longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. "
-"When in doubt, check with your local administrator.\n"
-"</p></qt>"
+#. i18n: file: ui/securitypagegeneraltab.ui:39
+#. i18n: ectx: property (text), widget (QCheckBox, mHtmlMailCheck)
+#: rc.cpp:592
+msgid "Prefer HTML to plain text"
 msgstr ""
 
-#. i18n: file: ui/composercryptoconfiguration.ui:82
-#. i18n: ectx: property (text), widget (QCheckBox, mShowKeyApprovalDlg)
-#: rc.cpp:392
-msgid "Always show the encryption keys &for approval"
-msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
-
-#. i18n: file: ui/composercryptoconfiguration.ui:85
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowKeyApprovalDlg)
-#: rc.cpp:395
+#. i18n: file: ui/securitypagegeneraltab.ui:46
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExternalReferences)
+#: rc.cpp:595
 msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If "
-"it is off, the application will only show the dialog if it cannot find the "
-"right key or if there are several which could be used."
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (\"web bugs\").</p><p>There is no valid reason to load images "
+"off the Internet like this, since the sender can always attach the required "
+"images directly to the message.</p><p>To guard from such a misuse of the "
+"HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
 msgstr ""
 
-#. i18n: file: ui/composercryptoconfiguration.ui:92
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoEncrypt)
-#: rc.cpp:398
-msgid "Automatically encrypt &messages whenever possible"
+#. i18n: file: ui/securitypagegeneraltab.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox, mExternalReferences)
+#: rc.cpp:598
+msgid "Allow messages to load external references from the Internet"
 msgstr ""
 
-#. i18n: file: ui/composercryptoconfiguration.ui:95
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoEncrypt)
-#: rc.cpp:401
-msgid ""
-"When this option is enabled, every message you send will be encrypted "
-"whenever encryption is possible and desired; of course, it is still possible "
-"to disable the automatic encryption for each message individually."
+#. i18n: file: ui/securitypagegeneraltab.ui:59
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:601
+msgid "Encrypted Messages"
 msgstr ""
 
-#. i18n: file: ui/composercryptoconfiguration.ui:102
-#. i18n: ectx: property (text), widget (QCheckBox, mNeverEncryptWhenSavingInDrafts)
-#: rc.cpp:404
-msgid "Never sign/encrypt when sa&ving as draft"
+#. i18n: file: ui/securitypagegeneraltab.ui:65
+#. i18n: ectx: property (text), widget (QCheckBox, mAlwaysDecrypt)
+#: rc.cpp:604
+msgid "Attempt decryption of encrypted messages when viewing"
 msgstr ""
 
-#. i18n: file: ui/miscpagemaintab.ui:19
-#. i18n: ectx: property (text), widget (QCheckBox, mEmptyFolderConfirmCheck)
-#: rc.cpp:407
-msgctxt "Corresponds to Folder->Move All Messages to Trash"
-msgid "Ask for co&nfirmation before moving all messages to trash"
-msgstr "Gofyn am gada&rnhad cyn symud pob neges i'r sbwriel"
-
-#. i18n: file: ui/miscpagemaintab.ui:26
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeImportantFromExpiry)
-#: rc.cpp:410
-msgid "E&xclude important messages from expiry"
-msgstr ""
+#. i18n: file: ui/securitypagegeneraltab.ui:75
+#. i18n: ectx: property (title), widget (QGroupBox, groupMessageDisp)
+#: rc.cpp:607
+msgid "Message Disposition Notifications"
+msgstr "Hysbysiadau Lleoliad Neges"
 
-#. i18n: file: ui/miscpagemaintab.ui:39
-#. i18n: ectx: property (text), widget (QLabel, mLoopLabel)
-#: rc.cpp:413
-msgctxt ""
-"to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\""
-msgid "&When trying to find unread messages:"
-msgstr ""
+#. i18n: file: ui/securitypagegeneraltab.ui:81
+#. i18n: ectx: property (text), widget (QLabel, labelSend)
+#: rc.cpp:610
+msgid "Send policy:"
+msgstr "Polisi anfon:"
 
-#. i18n: file: ui/miscpagemaintab.ui:64
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
-#: rc.cpp:416
-msgctxt "what's this help"
+#. i18n: file: ui/securitypagegeneraltab.ui:88
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioIgnore)
+#. i18n: file: ui/securitypagegeneraltab.ui:98
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioAsk)
+#. i18n: file: ui/securitypagegeneraltab.ui:108
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioDeny)
+#. i18n: file: ui/securitypagegeneraltab.ui:118
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioAlways)
+#. i18n: file: ui/securitypagegeneraltab.ui:135
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioNothing)
+#. i18n: file: ui/securitypagegeneraltab.ui:145
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioFull)
+#. i18n: file: ui/securitypagegeneraltab.ui:155
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioHeaders)
+#: rc.cpp:613 rc.cpp:619 rc.cpp:625 rc.cpp:631 rc.cpp:640 rc.cpp:646
+#: rc.cpp:652
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the next "
-"unread message, it may occur that no more unread messages are below the "
-"current message.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Do not loop:</span> The search will stop at the last message "
-"in the current folder.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Loop in current folder:</span> The search will continue at the "
-"top of the message list, but not go to another folder.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Loop in all folders:</span> The search will continue at the "
-"top of the message list. If no unread messages are found it will then "
-"continue to the next folder.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when searching "
-"for the previous unread message, the search will start from the bottom of "
-"the message list and continue to the previous folder depending on which "
-"option is selected.</p>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Loop in all marked folders: </span>This is the same as \"Loop "
-"in all folders\" except that only folders are taken into account which have "
-"been marked with the folder property \"Act on new/unread mail in this "
-"folder\".</p></body></html>"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:68
-#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
-#: rc.cpp:428
-msgid "Do not Loop"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:73
-#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
-#: rc.cpp:431
-msgid "Loop in Current Folder"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:78
-#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
-#: rc.cpp:434
-msgid "Loop in All Folders"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:83
-#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
-#: rc.cpp:437
-msgid "Loop in All Marked Folders"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:97
-#. i18n: ectx: property (text), widget (QLabel, mEnterFolderLabel)
-#: rc.cpp:440
-msgctxt ""
-"to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\", and \"jump to last selected message\""
-msgid "When ente&ring a folder:"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:108
-#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
-#: rc.cpp:443
-msgid "Jump to First Unread Message"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:113
-#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
-#: rc.cpp:446
-msgid "Jump to Last Selected Message"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:118
-#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
-#: rc.cpp:449
-msgid "Jump to Newest Message"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:123
-#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
-#: rc.cpp:452
-msgid "Jump to Oldest Message"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, mDelayedMarkAsRead)
-#: rc.cpp:455
-msgid "Mar&k selected message as read after"
-msgstr "No&di'r neges benodol fel darllenedig ar ôl"
-
-#. i18n: file: ui/miscpagemaintab.ui:147
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, mDelayedMarkTime)
-#: rc.cpp:458
-msgid " sec"
-msgstr " eil"
-
-#. i18n: file: ui/miscpagemaintab.ui:157
-#. i18n: ectx: property (text), widget (QCheckBox, mShowPopupAfterDnD)
-#: rc.cpp:461
-msgid "&Ask for action after dragging messages to another folder"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:170
-#. i18n: ectx: property (text), widget (QLabel, mStartUpFolderLabel)
-#: rc.cpp:464
-msgid "Open this folder on &startup:"
-msgstr ""
-
-#. i18n: file: ui/miscpagemaintab.ui:177
-#. i18n: ectx: property (text), widget (QCheckBox, mEmptyTrashCheck)
-#: rc.cpp:467
-msgid "Empty local &trash folder on program exit"
-msgstr ""
-
-#. i18n: file: ui/accountspagereceivingtab.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:470
-msgid "Incoming accounts (add at least one):"
-msgstr "Cyfrifon mewnddod (ychwanegwch o leiaf un)"
-
-#. i18n: file: ui/accountspagereceivingtab.ui:56
-#. i18n: ectx: property (text), widget (KPushButton, mRemoveAccountButton)
-#: rc.cpp:479
-msgid "R&emove"
-msgstr "G&waredu"
-
-#. i18n: file: ui/accountspagereceivingtab.ui:80
-#. i18n: ectx: property (title), widget (QGroupBox, group)
-#: rc.cpp:482
-msgid "New Mail Notification"
-msgstr "Hysbysiad Ebost Newydd"
-
-#. i18n: file: ui/accountspagereceivingtab.ui:92
-#. i18n: ectx: property (text), widget (QCheckBox, mBeepNewMailCheck)
-#: rc.cpp:485
-msgid "&Beep"
-msgstr "&Blîp"
-
-#. i18n: file: ui/accountspagereceivingtab.ui:105
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mVerboseNotificationCheck)
-#: rc.cpp:488
-msgid "Show for each folder the number of newly arrived messages"
-msgstr ""
-
-#. i18n: file: ui/accountspagereceivingtab.ui:108
-#. i18n: ectx: property (text), widget (QCheckBox, mVerboseNotificationCheck)
-#: rc.cpp:491
-msgid "Deta&iled new mail notification"
-msgstr ""
-
-#. i18n: file: ui/accountspagereceivingtab.ui:121
-#. i18n: ectx: property (text), widget (QPushButton, mOtherNewMailActionsButton)
-#: rc.cpp:494
-msgid "Other Actio&ns..."
-msgstr ""
-
-#. i18n: file: kmail_part.rc:8
-#. i18n: ectx: Menu (file)
-#. i18n: file: kmreadermainwin.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kmmainwin.rc:8
-#. i18n: ectx: Menu (file)
-#: rc.cpp:497 rc.cpp:796 rc.cpp:820
-msgid "&File"
-msgstr ""
-
-#. i18n: file: kmail_part.rc:10
-#. i18n: ectx: Menu (file_new)
-#. i18n: file: kmmainwin.rc:10
-#. i18n: ectx: Menu (file_new)
-#: rc.cpp:500 rc.cpp:823
-msgctxt "@title:menu New message, folder or new window."
-msgid "New"
-msgstr ""
-
-#. i18n: file: kmail_part.rc:38
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kmreadermainwin.rc:15
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kmmainwin.rc:38
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kmcomposerui.rc:23
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:503 rc.cpp:799 rc.cpp:826 rc.cpp:865
-msgid "&Edit"
-msgstr ""
-
-#. i18n: file: kmail_part.rc:62
-#. i18n: ectx: Menu (view)
-#. i18n: file: kmreadermainwin.rc:20
-#. i18n: ectx: Menu (view)
-#. i18n: file: kmmainwin.rc:62
-#. i18n: ectx: Menu (view)
-#. i18n: file: kmcomposerui.rc:47
-#. i18n: ectx: Menu (view)
-#: rc.cpp:506 rc.cpp:802 rc.cpp:829 rc.cpp:871
-msgid "&View"
-msgstr ""
-
-#. i18n: file: kmail_part.rc:83
-#. i18n: ectx: Menu (go)
-#. i18n: file: kmmainwin.rc:83
-#. i18n: ectx: Menu (go)
-#: rc.cpp:509 rc.cpp:832
-msgid "&Go"
-msgstr "&Mynd"
-
-#. i18n: file: kmail_part.rc:97
-#. i18n: ectx: Menu (folder)
-#. i18n: file: kmmainwin.rc:97
-#. i18n: ectx: Menu (folder)
-#: rc.cpp:512 rc.cpp:835
-msgid "F&older"
-msgstr "P&lygell"
-
-#. i18n: file: kmail_part.rc:120
-#. i18n: ectx: Menu (message)
-#. i18n: file: kmreadermainwin.rc:31
-#. i18n: ectx: Menu (message)
-#. i18n: file: kmmainwin.rc:120
-#. i18n: ectx: Menu (message)
-#. i18n: file: kmcomposerui.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:515 rc.cpp:805 rc.cpp:838 rc.cpp:862
-msgid "&Message"
-msgstr "&Neges"
-
-#. i18n: file: kmail_part.rc:127
-#. i18n: ectx: Menu (reply_special)
-#. i18n: file: kmreadermainwin.rc:38
-#. i18n: ectx: Menu (reply_special)
-#. i18n: file: kmmainwin.rc:127
-#. i18n: ectx: Menu (reply_special)
-#: rc.cpp:518 rc.cpp:808 rc.cpp:841
-msgid "Reply Special"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of "
+"MDNs:</p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically "
+"(recommended).</li><li><em>Ask</em>: Answers requests only after asking the "
+"user for permission. This way, you can send MDNs for selected messages while "
+"denying or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read "
+"etc.</li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made "
+"available.</li></ul></qt>"
 msgstr ""
+"<qt><h3>Polisi Hysbysiad Lleoliad Neges</h3><p>Mae MDNau (Message "
+"Disposition Notifications) yn cyffredinoliad o beth a gelwir yn arferol "
+"<b>derbynneb ddarllen</b>.  Mae awdur y neges yn gofyn am hysbysiad lleoliad "
+"i'w anfon, ac mae rhaglen ebost y derbyniwr yn creu ateb y gall yr awdur yn "
+"dysgu ohono be wnaeth ddigwydd i'w neges.  Mae mathau lleoliad cyffredin yn "
+"cynnwys <b>wedi'i dangos</b> (h.y. wedi'i darllen), <b>wedi'i dileu</b> a "
+"<b>wedi''i danfon</b> (h.y. wedi'i blaenyrru).</p><p>Mae'r dewisiadau "
+"dilynnol ar gael i reoli y ffordd y mae KMail yn anfon "
+"MDNau:</p><ul><li><em>Anwybyddu</em>: Anwybyddu unrhyw cais ar gyfer "
+"hysbysiadau lleoliad neges.  Ni anfonir MDN byth yn ymysgogol "
+"(argymhellir).</li><li><em>Gofyn</em>: Ateb ceisiadau ar ôl gofyn i'r "
+"defnyddiwr ar gyfer caniatâd yn unig.  Felly, gallwch anfon MDNau ar gyfer "
+"negeseuon penodol tra'n ei gwrthod neu eu anwybyddu ar gyfer "
+"eraill.</li><li><em>Gwrthod</em>: Anfon hysbysiad <b>wedi'i gwrthod</b> o "
+"hyd.  Mae hyn yn unig <em>ychydig bach</em> yn well nag anfon MDNau o hyd.  "
+"Bydd yr awdur yn dal i wybod bod rhywun wedi gweithredu ar sail y neges, yr "
+"unig beth yw na all wybod a's darllenwyd neu ddileuwyd "
+"ayyb.</li><li><em>Anfon o hyd</em>: Anfon yr hysbysiad lleoliad ceisiedig o "
+"hyd.  Golyga hyn bod awdur y neges yn cael gwybod pryd oedd rhywun yn "
+"gweithredu ar sail y neges ac, yn ychwanegol, beth a wnaeth ddigwydd iddi "
+"(wedi'i darllen, wedi'i dileu, ayyb).  Annogir i chi beidio â defnyddio'r "
+"dewisiad yma, ond darperir gan ei fod yn gwneud llawer o synnwyr ar gyfer "
+"e.e. rheoli'r berthynas efo cwsmeriaid.</li></ul></qt>"
 
-#. i18n: file: kmail_part.rc:136
-#. i18n: ectx: Menu (menubar_message_forward)
-#. i18n: file: kmreadermainwin.rc:47
-#. i18n: ectx: Menu (menubar_message_forward)
-#. i18n: file: kmmainwin.rc:136
-#. i18n: ectx: Menu (menubar_message_forward)
-#: rc.cpp:521 rc.cpp:811 rc.cpp:844
-msgid "&Forward"
-msgstr "B&laenyrru"
-
-#. i18n: file: kmail_part.rc:162
-#. i18n: ectx: Menu (tools)
-#. i18n: file: kmmainwin.rc:162
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:527 rc.cpp:850
-msgid "&Tools"
+#. i18n: file: ui/securitypagegeneraltab.ui:91
+#. i18n: ectx: property (text), widget (QRadioButton, radioIgnore)
+#: rc.cpp:616
+msgid "Ignore"
 msgstr ""
 
-#. i18n: file: kmail_part.rc:179
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmreadermainwin.rc:63
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmmainwin.rc:179
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmcomposerui.rc:86
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:530 rc.cpp:814 rc.cpp:853 rc.cpp:877
-msgid "&Settings"
+#. i18n: file: ui/securitypagegeneraltab.ui:101
+#. i18n: ectx: property (text), widget (QRadioButton, radioAsk)
+#: rc.cpp:622
+msgid "Ask"
 msgstr ""
 
-#. i18n: file: kmail_part.rc:191
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmmainwin.rc:191
-#. i18n: ectx: Menu (help)
-#: rc.cpp:533 rc.cpp:856
-msgid "&Help"
+#. i18n: file: ui/securitypagegeneraltab.ui:111
+#. i18n: ectx: property (text), widget (QRadioButton, radioDeny)
+#: rc.cpp:628
+msgid "Deny"
 msgstr ""
 
-#. i18n: file: kmail_part.rc:257
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kmreadermainwin.rc:72
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kmmainwin.rc:257
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kmcomposerui.rc:90
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:536 rc.cpp:817 rc.cpp:859 rc.cpp:880
-msgid "Main Toolbar"
+#. i18n: file: ui/securitypagegeneraltab.ui:121
+#. i18n: ectx: property (text), widget (QRadioButton, radioAlways)
+#: rc.cpp:634
+msgid "Always send"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:49
-#. i18n: ectx: whatsthis, entry (ExcludeImportantMailFromExpiry), group (Behaviour)
-#: rc.cpp:540
-msgid ""
-"This prevents the automatic expiry of old messages in a folder from deleting "
-"(or moving to an archive folder) the messages that are marked 'Important' or "
-"'Action Item'"
-msgstr ""
+#. i18n: file: ui/securitypagegeneraltab.ui:128
+#. i18n: ectx: property (text), widget (QLabel, labelQuote)
+#: rc.cpp:637
+msgid "Quote original message:"
+msgstr "Dyfynnu'r neges wreiddiol"
 
-#. i18n: file: kmail.kcfg.cmake:54
-#. i18n: ectx: label, entry (SendOnCheck), group (Behaviour)
-#: rc.cpp:543
-msgid "Send queued mail on mail check"
+#. i18n: file: ui/securitypagegeneraltab.ui:138
+#. i18n: ectx: property (text), widget (QRadioButton, radioNothing)
+#: rc.cpp:643
+msgid "Nothing"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:55
-#. i18n: ectx: whatsthis, entry (SendOnCheck), group (Behaviour)
-#: rc.cpp:546
-msgid ""
-"<qt><p>Select whether you want KMail to send all messages in the outbox on "
-"manual or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
+#. i18n: file: ui/securitypagegeneraltab.ui:148
+#. i18n: ectx: property (text), widget (QRadioButton, radioFull)
+#: rc.cpp:649
+msgid "Full message"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:65
-#. i18n: ectx: label, entry (AutoLostFoundMove), group (Behaviour)
-#: rc.cpp:549
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
+#. i18n: file: ui/securitypagegeneraltab.ui:158
+#. i18n: ectx: property (text), widget (QRadioButton, radioHeaders)
+#: rc.cpp:655
+msgid "Only headers"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:66
-#. i18n: ectx: whatsthis, entry (AutoLostFoundMove), group (Behaviour)
-#: rc.cpp:552
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now "
-"to upload them, these messages will automatically be moved into a lost and "
-"found folder."
+#. i18n: file: ui/securitypagegeneraltab.ui:165
+#. i18n: ectx: property (text), widget (QCheckBox, mNoMDNsWhenEncryptedCheck)
+#: rc.cpp:658
+msgid "Do not send MDNs in response to encrypted messages"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:71
-#. i18n: ectx: label, entry (AllowLocalFlags), group (Behaviour)
-#: rc.cpp:555
-msgid "Allow local flags in read-only folders"
+#. i18n: file: ui/securitypagegeneraltab.ui:172
+#. i18n: ectx: property (text), widget (QLabel, labelWarning)
+#: rc.cpp:661
+msgid ""
+"<b>WARNING:</b> Unconditionally returning confirmations undermines your "
+"privacy. <a href=\"whatsthis3\">More about MDNs...</a>"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:78
-#. i18n: ectx: whatsthis, entry (LastSelectedFolder), group (FolderSelectionDialog)
-#: rc.cpp:558
-msgid "The most recently selected folder in the folder selection dialog."
+#. i18n: file: ui/securitypagegeneraltab.ui:188
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:664
+msgid "Certificate && Key Bundle Attachments"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:93
-#. i18n: ectx: label, entry (SystemTrayPolicy), group (General)
-#: rc.cpp:564
-msgid "Policy for showing the system tray icon"
+#. i18n: file: ui/securitypagegeneraltab.ui:194
+#. i18n: ectx: property (text), widget (QCheckBox, mAutomaticallyImportAttachedKeysCheck)
+#: rc.cpp:667
+msgid "Automatically import keys and certificate"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:101
-#. i18n: ectx: label, entry (CloseDespiteSystemTray), group (General)
-#: rc.cpp:567
+#. i18n: file: ui/smimeconfiguration.ui:16
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, CRLRB)
+#: rc.cpp:670
 msgid ""
-"Close the application when the main window is closed, even if there is a "
-"system tray icon active."
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:105
-#. i18n: ectx: label, entry (VerboseNewMailNotification), group (General)
-#: rc.cpp:570
-msgid "Verbose new mail notification"
+#. i18n: file: ui/smimeconfiguration.ui:19
+#. i18n: ectx: property (text), widget (QRadioButton, CRLRB)
+#: rc.cpp:673
+msgid "Validate certificates using CRLs"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:106
-#. i18n: ectx: whatsthis, entry (VerboseNewMailNotification), group (General)
-#: rc.cpp:573
+#. i18n: file: ui/smimeconfiguration.ui:29
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, OCSPRB)
+#: rc.cpp:676
 msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get "
-"a simple 'New mail arrived' message."
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:110
-#. i18n: ectx: label, entry (ExternalEditor), group (General)
-#: rc.cpp:576
-msgid "Specify e&ditor:"
-msgstr "Penodi golyg&ydd"
-
-#. i18n: file: kmail.kcfg.cmake:114
-#. i18n: ectx: label, entry (UseExternalEditor), group (General)
-#: rc.cpp:579
-msgid "Use e&xternal editor instead of composer"
-msgstr "Defny&ddio golygydd allanol yn lle cyfansoddydd"
-
-#. i18n: file: kmail.kcfg.cmake:118
-#. i18n: ectx: label, entry (CustomMessageHeadersCount), group (General)
-#: rc.cpp:582
-msgid ""
-"Specifies the number of custom MIME header fields to be inserted in messages "
-"(for internal use only)"
+#. i18n: file: ui/smimeconfiguration.ui:32
+#. i18n: ectx: property (text), widget (QRadioButton, OCSPRB)
+#: rc.cpp:679
+msgid "Validate certificates online (OCSP)"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:124
-#. i18n: ectx: label, entry (CloseToQuotaThreshold), group (General)
-#: rc.cpp:585
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
+#. i18n: file: ui/smimeconfiguration.ui:39
+#. i18n: ectx: property (title), widget (QGroupBox, OCSPGroupBox)
+#: rc.cpp:682
+msgid "Online Certificate Validation"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:128
-#. i18n: ectx: label, entry (BeepOnMail), group (General)
-#: rc.cpp:588
-msgid "Beep upon receiving new mail"
+#. i18n: file: ui/smimeconfiguration.ui:49
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:685
+msgid "OCSP responder URL:"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:132
-#. i18n: ectx: label, entry (EmptyTrashOnExit), group (General)
-#: rc.cpp:591
-msgid "Empty the local trash folder on program exit"
+#. i18n: file: ui/smimeconfiguration.ui:59
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:688
+msgid "OCSP responder signature:"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:136
-#. i18n: ectx: label, entry (StartupFolder), group (General)
-#: rc.cpp:594
-msgid "Specify the folder to open when the program is started"
+#. i18n: file: ui/smimeconfiguration.ui:73
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, OCSPResponderURL)
+#: rc.cpp:691
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:140
-#. i18n: ectx: label, entry (ConfirmBeforeEmpty), group (General)
-#: rc.cpp:597
-msgid "Ask for confirmation before moving all messages to trash"
+#. i18n: file: ui/smimeconfiguration.ui:87
+#. i18n: ectx: property (text), widget (QCheckBox, ignoreServiceURLCB)
+#: rc.cpp:694
+msgid "Ignore service URL of certificates"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:144
-#. i18n: ectx: label, entry (AutoExpiring), group (General)
-#: rc.cpp:600
+#. i18n: file: ui/smimeconfiguration.ui:97
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, doNotCheckCertPolicyCB)
+#: rc.cpp:697
 msgid ""
-"Specifies whether the folders will expire in the background (for internal "
-"use only)"
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:148
-#. i18n: ectx: label, entry (FirstStart), group (General)
-#: rc.cpp:603
-msgid ""
-"Specifies whether this is the very first time that the application is run "
-"(for internal use only)"
+#. i18n: file: ui/smimeconfiguration.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, doNotCheckCertPolicyCB)
+#: rc.cpp:700
+msgid "Do not check certificate policies"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:152
-#. i18n: ectx: label, entry (PreviousVersion), group (General)
-#: rc.cpp:606
+#. i18n: file: ui/smimeconfiguration.ui:107
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, neverConsultCB)
+#: rc.cpp:703
 msgid ""
-"Specifies the version of the application that was last used (for internal "
-"use only)"
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:161
-#. i18n: ectx: whatsthis, entry (PreviousNewFeaturesMD5), group (Internal)
-#: rc.cpp:609
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
+#. i18n: file: ui/smimeconfiguration.ui:110
+#. i18n: ectx: property (text), widget (QCheckBox, neverConsultCB)
+#: rc.cpp:706
+msgid "Never consult a CRL"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:168
-#. i18n: ectx: label, entry (MaxConnectionsPerHost), group (Network)
-#: rc.cpp:612
-msgid "Maximal number of connections per host"
+#. i18n: file: ui/smimeconfiguration.ui:117
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, fetchMissingCB)
+#: rc.cpp:709
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:169
-#. i18n: ectx: whatsthis, entry (MaxConnectionsPerHost), group (Network)
-#: rc.cpp:615
-msgid ""
-"This can be used to restrict the number of connections per host while "
-"checking for new mail. By default the number of connections is unlimited (0)."
+#. i18n: file: ui/smimeconfiguration.ui:120
+#. i18n: ectx: property (text), widget (QCheckBox, fetchMissingCB)
+#: rc.cpp:712
+msgid "Fetch missing issuer certificates"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:177
-#. i18n: ectx: label, entry (EnableFolderQuickSearch), group (UserInterface)
-#: rc.cpp:618
-msgid "Show folder quick search line edit"
+#. i18n: file: ui/smimeconfiguration.ui:131
+#. i18n: ectx: attribute (title), widget (QWidget, tabHTTP)
+#: rc.cpp:715
+msgid "HTTP Requests"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:181
-#. i18n: ectx: label, entry (HideLocalInbox), group (UserInterface)
-#: rc.cpp:621
-msgid "Hide local inbox if unused"
+#. i18n: file: ui/smimeconfiguration.ui:137
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, disableHTTPCB)
+#: rc.cpp:718
+msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:189
-#. i18n: ectx: label, entry (ForwardingInlineByDefault), group (Composer)
-#: rc.cpp:624
-msgid "Forward Inline As Default."
+#. i18n: file: ui/smimeconfiguration.ui:140
+#. i18n: ectx: property (text), widget (QCheckBox, disableHTTPCB)
+#: rc.cpp:721
+msgid "Do not perform any HTTP requests"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:193
-#. i18n: ectx: whatsthis, entry (StickyIdentity), group (Composer)
-#: rc.cpp:627
+#. i18n: file: ui/smimeconfiguration.ui:147
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreHTTPDPCB)
+#: rc.cpp:724
 msgid ""
-"Remember this identity, so that it will be used in future composer windows "
-"as well.\n"
-"        "
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:197
-#. i18n: ectx: whatsthis, entry (StickyFcc), group (Composer)
-#: rc.cpp:631
-msgid ""
-"Remember this folder for sent items, so that it will be used in future "
-"composer windows as well."
+#. i18n: file: ui/smimeconfiguration.ui:150
+#. i18n: ectx: property (text), widget (QCheckBox, ignoreHTTPDPCB)
+#: rc.cpp:727
+msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:201
-#. i18n: ectx: whatsthis, entry (StickyTransport), group (Composer)
-#: rc.cpp:634
+#. i18n: file: ui/smimeconfiguration.ui:172
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, honorHTTPProxyRB)
+#: rc.cpp:730
 msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:206
-#. i18n: ectx: whatsthis, entry (StickyDictionary), group (Composer)
-#: rc.cpp:637
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows "
-"as well.\n"
-"        "
+#. i18n: file: ui/smimeconfiguration.ui:175
+#. i18n: ectx: property (text), widget (QRadioButton, honorHTTPProxyRB)
+#: rc.cpp:733
+msgid "Use system HTTP proxy:"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:210
-#. i18n: ectx: label, entry (TooManyRecipients), group (Composer)
-#: rc.cpp:641
-msgid "Warn if the number of recipients is larger than"
+#. i18n: file: ui/smimeconfiguration.ui:192
+#. i18n: ectx: property (text), widget (QRadioButton, useCustomHTTPProxyRB)
+#: rc.cpp:739
+msgid "Use this proxy for HTTP requests: "
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:212
-#. i18n: ectx: whatsthis, entry (TooManyRecipients), group (Composer)
-#. i18n: file: kmail.kcfg.cmake:219
-#. i18n: ectx: whatsthis, entry (RecipientThreshold), group (Composer)
-#: rc.cpp:644 rc.cpp:647
+#. i18n: file: ui/smimeconfiguration.ui:199
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, customHTTPProxy)
+#: rc.cpp:742
 msgid ""
-"If the number of recipients is larger than this value, KMail will warn and "
-"ask for a confirmation before sending the mail. The warning can be turned "
-"off."
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance "
+"myproxy.nowhere.com:3128."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:248
-#. i18n: ectx: label, entry (RequestMDN), group (Composer)
-#: rc.cpp:653
-msgid "Automatically request &message disposition notifications"
-msgstr "Gofyn yn ymysgogol am &hysbysiadau lleoliad negeseuon"
+#. i18n: file: ui/smimeconfiguration.ui:209
+#. i18n: ectx: attribute (title), widget (QWidget, tabLDAP)
+#: rc.cpp:745
+msgid "LDAP Requests"
+msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:249
-#. i18n: ectx: whatsthis, entry (RequestMDN), group (Composer)
-#: rc.cpp:656
-msgid ""
-"<qt><p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
-"only affects the default; you can still enable or disable MDN requesting on "
-"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
-"Disposition Notification</em>.</p></qt>"
+#. i18n: file: ui/smimeconfiguration.ui:217
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, disableLDAPCB)
+#: rc.cpp:748
+msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:270
-#. i18n: ectx: label, entry (AutosaveInterval), group (Composer)
-#: rc.cpp:659
-msgid "Autosave interval:"
+#. i18n: file: ui/smimeconfiguration.ui:220
+#. i18n: ectx: property (text), widget (QCheckBox, disableLDAPCB)
+#: rc.cpp:751
+msgid "Do not perform any LDAP requests"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:271
-#. i18n: ectx: whatsthis, entry (AutosaveInterval), group (Composer)
-#: rc.cpp:662
+#. i18n: file: ui/smimeconfiguration.ui:227
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreLDAPDPCB)
+#: rc.cpp:754
 msgid ""
-"A backup copy of the text in the composer window can be created regularly. "
-"The interval used to create the backups is set here. You can disable "
-"autosaving by setting it to the value 0."
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:275
-#. i18n: ectx: label, entry (QuoteSelectionOnly), group (Composer)
-#: rc.cpp:665
-msgid "Only quote selected text when replying"
+#. i18n: file: ui/smimeconfiguration.ui:230
+#. i18n: ectx: property (text), widget (QCheckBox, ignoreLDAPDPCB)
+#: rc.cpp:757
+msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:282
-#. i18n: ectx: label, entry (ShowSnippetManager), group (Composer)
-#: rc.cpp:668
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+#. i18n: file: ui/smimeconfiguration.ui:239
+#. i18n: ectx: property (text), widget (QLabel, customLDAPLabel)
+#: rc.cpp:760
+msgid "Primary host for LDAP requests:"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:288
-#. i18n: ectx: label, entry (ShowGnuPGAuditLogAfterSuccessfulSignEncrypt), group (Composer)
-#: rc.cpp:671
+#. i18n: file: ui/smimeconfiguration.ui:250
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, customLDAPProxy)
+#: rc.cpp:763
 msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:293
-#. i18n: ectx: label, entry (CryptoEncryptToSelf), group (Composer)
-#: rc.cpp:674
-msgid ""
-"When encrypting emails, always also encrypt to the certificate of my own "
-"identity"
+#. i18n: file: ui/miscpagemaintab.ui:19
+#. i18n: ectx: property (text), widget (QCheckBox, mEmptyFolderConfirmCheck)
+#: rc.cpp:767
+msgctxt "Corresponds to Folder->Move All Messages to Trash"
+msgid "Ask for co&nfirmation before moving all messages to trash"
+msgstr "Gofyn am gada&rnhad cyn symud pob neges i'r sbwriel"
+
+#. i18n: file: ui/miscpagemaintab.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeImportantFromExpiry)
+#: rc.cpp:770
+msgid "E&xclude important messages from expiry"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:297
-#. i18n: ectx: label, entry (CryptoShowEncryptionResult), group (Composer)
-#: rc.cpp:677
-msgid "Show signed/encrypted text after composing"
+#. i18n: file: ui/miscpagemaintab.ui:39
+#. i18n: ectx: property (text), widget (QLabel, mLoopLabel)
+#: rc.cpp:773
+msgctxt ""
+"to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
+"in all folders\""
+msgid "&When trying to find unread messages:"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:301
-#. i18n: ectx: label, entry (CryptoShowKeysForApproval), group (Composer)
-#: rc.cpp:680
+#. i18n: file: ui/miscpagemaintab.ui:64
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mLoopOnGotoUnread)
+#: rc.cpp:776
+msgctxt "what's this help"
 msgid ""
-"Always show the list of encryption keys to select the one which will be used"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">When jumping to the next "
+"unread message, it may occur that no more unread messages are below the "
+"current message.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Do not loop:</span> The search will stop at the last message "
+"in the current folder.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Loop in current folder:</span> The search will continue at the "
+"top of the message list, but not go to another folder.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Loop in all folders:</span> The search will continue at the "
+"top of the message list. If no unread messages are found it will then "
+"continue to the next folder.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Similarly, when searching "
+"for the previous unread message, the search will start from the bottom of "
+"the message list and continue to the previous folder depending on which "
+"option is selected.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Loop in all marked folders: </span>This is the same as \"Loop "
+"in all folders\" except that only folders are taken into account which have "
+"been marked with the folder property \"Act on new/unread mail in this "
+"folder\".</p></body></html>"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:305
-#. i18n: ectx: label, entry (CryptoStoreEncrypted), group (Composer)
-#: rc.cpp:683
-msgid "When check, sent messages will be stored in the encrypted form"
+#. i18n: file: ui/miscpagemaintab.ui:68
+#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
+#: rc.cpp:788
+msgid "Do not Loop"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:309
-#. i18n: ectx: label, entry (RecentUrls), group (Composer)
-#: rc.cpp:686
-msgid "A list of all the recently used URLs"
+#. i18n: file: ui/miscpagemaintab.ui:73
+#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
+#: rc.cpp:791
+msgid "Loop in Current Folder"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:315
-#. i18n: ectx: label, entry (RecentEncodings), group (Composer)
-#: rc.cpp:689
-msgid "A list of all the recently used encodings"
+#. i18n: file: ui/miscpagemaintab.ui:78
+#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
+#: rc.cpp:794
+msgid "Loop in All Folders"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:334
-#. i18n: ectx: label, entry (FilterDialogSize), group (Geometry)
-#: rc.cpp:692
-msgid "The size of the filter dialog (for internal use only)"
+#. i18n: file: ui/miscpagemaintab.ui:83
+#. i18n: ectx: property (text), item, widget (KComboBox, mLoopOnGotoUnread)
+#: rc.cpp:797
+msgid "Loop in All Marked Folders"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:338
-#. i18n: ectx: label, entry (IdentityDialogSize), group (Geometry)
-#: rc.cpp:695
-msgid "The size of the identity dialog (for internal use only)"
+#. i18n: file: ui/miscpagemaintab.ui:97
+#. i18n: ectx: property (text), widget (QLabel, mEnterFolderLabel)
+#: rc.cpp:800
+msgctxt ""
+"to be continued with \"jump to first new message\", \"jump to first unread "
+"or new message\", and \"jump to last selected message\""
+msgid "When ente&ring a folder:"
+msgstr ""
+
+#. i18n: file: ui/miscpagemaintab.ui:108
+#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
+#: rc.cpp:803
+msgid "Jump to First Unread Message"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:342
-#. i18n: ectx: label, entry (SearchWidgetWidth), group (Geometry)
-#: rc.cpp:698
-msgid "The width of the search window (for internal use only)"
+#. i18n: file: ui/miscpagemaintab.ui:113
+#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
+#: rc.cpp:806
+msgid "Jump to Last Selected Message"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:346
-#. i18n: ectx: label, entry (SearchWidgetHeight), group (Geometry)
-#: rc.cpp:701
-msgid "The height of the search window (for internal use only)"
+#. i18n: file: ui/miscpagemaintab.ui:118
+#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
+#: rc.cpp:809
+msgid "Jump to Newest Message"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:350
-#. i18n: ectx: label, entry (ConfigureDialogWidth), group (Geometry)
-#: rc.cpp:704
-msgid "The width of the Configure KMail dialog (for internal use only)"
+#. i18n: file: ui/miscpagemaintab.ui:123
+#. i18n: ectx: property (text), item, widget (KComboBox, mActionEnterFolder)
+#: rc.cpp:812
+msgid "Jump to Oldest Message"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:354
-#. i18n: ectx: label, entry (ConfigureDialogHeight), group (Geometry)
-#: rc.cpp:707
-msgid "The height of the Configure KMail dialog (for internal use only)"
-msgstr ""
+#. i18n: file: ui/miscpagemaintab.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, mDelayedMarkAsRead)
+#: rc.cpp:815
+msgid "Mar&k selected message as read after"
+msgstr "No&di'r neges benodol fel darllenedig ar ôl"
 
-#. i18n: file: kmail.kcfg.cmake:380
-#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: rc.cpp:710
-msgid "Message Preview Pane"
-msgstr "Cwarel Rhagolwg y Neges"
+#. i18n: file: ui/miscpagemaintab.ui:147
+#. i18n: ectx: property (suffix), widget (KIntSpinBox, mDelayedMarkTime)
+#: rc.cpp:818
+msgid " sec"
+msgstr " eil"
 
-#. i18n: file: kmail.kcfg.cmake:383
-#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: rc.cpp:713
-msgid "Do not show a message preview pane"
+#. i18n: file: ui/miscpagemaintab.ui:157
+#. i18n: ectx: property (text), widget (QCheckBox, mShowPopupAfterDnD)
+#: rc.cpp:821
+msgid "&Ask for action after dragging messages to another folder"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:386
-#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: rc.cpp:716
-msgid "Show the message preview pane below the message list"
+#. i18n: file: ui/miscpagemaintab.ui:170
+#. i18n: ectx: property (text), widget (QLabel, mStartUpFolderLabel)
+#: rc.cpp:824
+msgid "Open this folder on &startup:"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:389
-#. i18n: ectx: label, entry (readerWindowMode), group (Geometry)
-#: rc.cpp:719
-msgid "Show the message preview pane next to the message list"
+#. i18n: file: ui/miscpagemaintab.ui:177
+#. i18n: ectx: property (text), widget (QCheckBox, mEmptyTrashCheck)
+#: rc.cpp:827
+msgid "Empty local &trash folder on program exit"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:399
-#. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: rc.cpp:725
-msgid "Long folder list"
-msgstr ""
+#. i18n: file: ui/accountspagereceivingtab.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:830
+msgid "Incoming accounts (add at least one):"
+msgstr "Cyfrifon mewnddod (ychwanegwch o leiaf un)"
 
-#. i18n: file: kmail.kcfg.cmake:402
-#. i18n: ectx: label, entry (FolderList), group (Geometry)
-#: rc.cpp:728
-msgid "Short folder list"
-msgstr ""
+#. i18n: file: ui/accountspagereceivingtab.ui:56
+#. i18n: ectx: property (text), widget (KPushButton, mRemoveAccountButton)
+#: rc.cpp:839
+msgid "R&emove"
+msgstr "G&waredu"
 
-#. i18n: file: kmail.kcfg.cmake:411
-#. i18n: ectx: label, entry (CloseAfterReplyOrForward), group (Reader)
-#: rc.cpp:731
-msgid "Close message window after replying or forwarding"
+#. i18n: file: ui/accountspagereceivingtab.ui:73
+#. i18n: ectx: property (text), widget (KPushButton, mRestartAccountButton)
+#: rc.cpp:842
+msgid "Restart"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:419
-#. i18n: ectx: label, entry (SendMDNsWithEmptySender), group (MDN)
-#: rc.cpp:734
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
+#. i18n: file: ui/accountspagereceivingtab.ui:97
+#. i18n: ectx: property (title), widget (QGroupBox, group)
+#: rc.cpp:845
+msgid "New Mail Notification"
+msgstr "Hysbysiad Ebost Newydd"
 
-#. i18n: file: kmail.kcfg.cmake:420
-#. i18n: ectx: whatsthis, entry (SendMDNsWithEmptySender), group (MDN)
-#: rc.cpp:737
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are "
-"experiencing problems sending MDNs, uncheck this option."
-msgstr ""
+#. i18n: file: ui/accountspagereceivingtab.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, mBeepNewMailCheck)
+#: rc.cpp:848
+msgid "&Beep"
+msgstr "&Blîp"
 
-#. i18n: file: kmail.kcfg.cmake:426
-#. i18n: ectx: label, entry (TemplateNewMessage), group (GlobalTemplates)
-#: rc.cpp:740
-msgid "Message template for new message"
+#. i18n: file: ui/accountspagereceivingtab.ui:122
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mVerboseNotificationCheck)
+#: rc.cpp:851
+msgid "Show for each folder the number of newly arrived messages"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:431
-#. i18n: ectx: label, entry (TemplateReply), group (GlobalTemplates)
-#: rc.cpp:743
-msgid "Message template for reply"
+#. i18n: file: ui/accountspagereceivingtab.ui:125
+#. i18n: ectx: property (text), widget (QCheckBox, mVerboseNotificationCheck)
+#: rc.cpp:854
+msgid "Deta&iled new mail notification"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:436
-#. i18n: ectx: label, entry (TemplateReplyAll), group (GlobalTemplates)
-#: rc.cpp:746
-msgid "Message template for reply to all"
+#. i18n: file: ui/accountspagereceivingtab.ui:138
+#. i18n: ectx: property (text), widget (QPushButton, mOtherNewMailActionsButton)
+#: rc.cpp:857
+msgid "Other Actio&ns..."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:441
-#. i18n: ectx: label, entry (TemplateForward), group (GlobalTemplates)
-#: rc.cpp:749
-msgid "Message template for forward"
+#. i18n: file: ui/composercryptoconfiguration.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, optionsGroup_2)
+#: rc.cpp:860
+msgid "Signing"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:446
-#. i18n: ectx: label, entry (QuoteString), group (GlobalTemplates)
-#: rc.cpp:752
-msgid "Quote characters"
+#. i18n: file: ui/composercryptoconfiguration.ui:22
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoSignature)
+#: rc.cpp:863
+msgid "&Automatically sign messages"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:470
-#. i18n: ectx: label, entry (UpdateLevel), group (Startup)
-#: rc.cpp:755
-msgid "Specifies the number of updates to perform (for internal use only)"
+#. i18n: file: ui/composercryptoconfiguration.ui:25
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoSignature)
+#: rc.cpp:866
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:477
-#. i18n: ectx: label, entry (ToolTipDisplayPolicy), group (MainFolderView)
-#: rc.cpp:758
-msgid "Specifies the policy used when displaying policy"
+#. i18n: file: ui/composercryptoconfiguration.ui:35
+#. i18n: ectx: property (title), widget (QGroupBox, optionsGroup)
+#: rc.cpp:869
+msgid "Encrypting"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:485
-#. i18n: ectx: label, entry (CollectionWidth), group (SearchDialog)
-#: rc.cpp:761
+#. i18n: file: ui/composercryptoconfiguration.ui:41
+#. i18n: ectx: property (text), widget (QCheckBox, mEncToSelf)
+#: rc.cpp:872
 msgid ""
-"Specifies the width of the collection field in the Search Window dialog (for "
-"internal use only)"
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:489
-#. i18n: ectx: label, entry (SubjectWidth), group (SearchDialog)
-#: rc.cpp:764
+#. i18n: file: ui/composercryptoconfiguration.ui:44
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mEncToSelf)
+#: rc.cpp:875
 msgid ""
-"Specifies the width of the subject field in the Search Window dialog (for "
-"internal use only)"
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:493
-#. i18n: ectx: label, entry (SenderWidth), group (SearchDialog)
-#: rc.cpp:767
+#. i18n: file: ui/composercryptoconfiguration.ui:51
+#. i18n: ectx: property (text), widget (QCheckBox, mShowEncryptionResult)
+#: rc.cpp:878
+msgid "Show s&igned/encrypted text after composing"
+msgstr "Dangos testun llofnodedig/cêl-ysgrifedig wedi cyfansoddi"
+
+#. i18n: file: ui/composercryptoconfiguration.ui:54
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowEncryptionResult)
+#: rc.cpp:881
 msgid ""
-"Specifies the width of the sender field in the Search Window dialog (for "
-"internal use only)"
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:497
-#. i18n: ectx: label, entry (ReceiverWidth), group (SearchDialog)
-#: rc.cpp:770
+#. i18n: file: ui/composercryptoconfiguration.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, mStoreEncrypted)
+#: rc.cpp:884
+msgid "Store sent messages encry&pted"
+msgstr ""
+
+#. i18n: file: ui/composercryptoconfiguration.ui:67
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mStoreEncrypted)
+#: rc.cpp:887
+msgid "Check to store messages encrypted "
+msgstr "Brithwch i gadw negeseuon wedi'u cêl-ysgrifo "
+
+#. i18n: file: ui/composercryptoconfiguration.ui:75
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mStoreEncrypted)
+#: rc.cpp:890
 msgid ""
-"Specifies the width of the receiver field in the Search Window dialog (for "
-"internal use only)"
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</p></qt>"
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:501
-#. i18n: ectx: label, entry (DateWidth), group (SearchDialog)
-#: rc.cpp:773
+#. i18n: file: ui/composercryptoconfiguration.ui:82
+#. i18n: ectx: property (text), widget (QCheckBox, mShowKeyApprovalDlg)
+#: rc.cpp:898
+msgid "Always show the encryption keys &for approval"
+msgstr "Dangos yr allweddau &cêl-ysgrifo ar gyfer cymeradwydo o hyd"
+
+#. i18n: file: ui/composercryptoconfiguration.ui:85
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowKeyApprovalDlg)
+#: rc.cpp:901
 msgid ""
-"Specifies the width of the date field in the Search Window dialog (for "
-"internal use only)"
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
 msgstr ""
 
-#. i18n: file: kmail.kcfg.cmake:505
-#. i18n: ectx: label, entry (FolderWidth), group (SearchDialog)
-#: rc.cpp:776
+#. i18n: file: ui/composercryptoconfiguration.ui:92
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoEncrypt)
+#: rc.cpp:904
+msgid "Automatically encrypt &messages whenever possible"
+msgstr ""
+
+#. i18n: file: ui/composercryptoconfiguration.ui:95
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoEncrypt)
+#: rc.cpp:907
 msgid ""
-"Specifies the width of the folder field in the Search Window dialog (for "
-"internal use only)"
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
 msgstr ""
 
-#. i18n: file: kmcomposerui.rc:32
-#. i18n: ectx: Menu (options)
-#: rc.cpp:868
-msgid "&Options"
+#. i18n: file: ui/composercryptoconfiguration.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, mNeverEncryptWhenSavingInDrafts)
+#: rc.cpp:910
+msgid "Never sign/encrypt when sa&ving as draft"
 msgstr ""
 
-#. i18n: file: kmcomposerui.rc:66
-#. i18n: ectx: Menu (attach)
-#: rc.cpp:874
-msgid "&Attach"
-msgstr "&Atodi"
+#: newidentitydialog.cpp:46
+msgid "New Identity"
+msgstr "Dynodiad Newydd"
 
-#. i18n: file: kmcomposerui.rc:104
-#. i18n: ectx: ToolBar (htmlToolBar)
-#: rc.cpp:883
-msgid "HTML Toolbar"
+#: newidentitydialog.cpp:61
+msgid "&New identity:"
+msgstr "D&ynodiad newydd:"
+
+#: newidentitydialog.cpp:71
+msgid "&With empty fields"
+msgstr "&Efo meyseydd gwag"
+
+#: newidentitydialog.cpp:77
+msgid "&Use System Settings values"
 msgstr ""
 
-#. i18n: file: kmcomposerui.rc:123
-#. i18n: ectx: ToolBar (directionToolBar)
-#: rc.cpp:886
-msgid "Text Direction Toolbar"
+#: newidentitydialog.cpp:82
+msgid "&Duplicate existing identity"
+msgstr "D&yblygu dynodiad sy'n bodoli"
+
+#: newidentitydialog.cpp:93
+msgid "&Existing identities:"
+msgstr "Dynodiadau &sy'n bodoli:"
+
+#: kmmainwin.cpp:59
+msgid "New &Window"
+msgstr "&Ffenestr Newydd"
+
+#: kmmainwin.cpp:185
+msgid "Starting..."
 msgstr ""
 
 #. i18n: file: tips:2
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmenuedit.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmenuedit.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmenuedit.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmenuedit.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kmenuedit\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:47+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:38+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: basictab.cpp:81
 msgid ""
@@ -131,11 +131,11 @@
 msgid "Restore to System Menu"
 msgstr ""
 
-#: kmenuedit.cpp:162
+#: kmenuedit.cpp:156
 msgid "&Delete"
 msgstr ""
 
-#: kmenuedit.cpp:186
+#: kmenuedit.cpp:180
 msgid ""
 "You have made changes to the menu.\n"
 "Do you want to save the changes or discard them?"
@@ -143,7 +143,7 @@
 "Rydych wedi gwneud newidiadau i'r ddewislen.\n"
 "Ydych am gadw'r newidiadau neu eu gwaredu?"
 
-#: kmenuedit.cpp:188
+#: kmenuedit.cpp:182
 msgid "Save Menu Changes?"
 msgstr "Cadw'r Newidiadau i'r Ddewislen?"
 
@@ -212,65 +212,65 @@
 msgid "Show hidden entries"
 msgstr ""
 
-#: rc.cpp:10
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Owain Green ar ran KGyfieithu - Meddalwedd Gymraeg, ,Launchpad Contributions:"
 
-#: rc.cpp:11
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kmenueditui.rc:6
 #. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:14
+#: rc.cpp:5
 msgid "&File"
 msgstr ""
 
 #. i18n: file: kmenueditui.rc:16
 #. i18n: ectx: Menu (edit)
-#: rc.cpp:6 rc.cpp:17
+#: rc.cpp:8
 msgid "&Edit"
 msgstr ""
 
 #. i18n: file: kmenueditui.rc:28
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:9 rc.cpp:20
+#: rc.cpp:11
 msgid "Main Toolbar"
 msgstr ""
 
-#: treeview.cpp:97
+#: treeview.cpp:146
 msgid " [Hidden]"
 msgstr " [Cudd]"
 
-#: treeview.cpp:988
+#: treeview.cpp:1051
 msgid "New Submenu"
 msgstr "Is-ddewislen Newydd"
 
-#: treeview.cpp:989
+#: treeview.cpp:1052
 msgid "Submenu name:"
 msgstr "Enw'r is-ddewislen:"
 
-#: treeview.cpp:1060
+#: treeview.cpp:1121
 msgid "New Item"
 msgstr "Eitem Newydd"
 
-#: treeview.cpp:1061
+#: treeview.cpp:1122
 msgid "Item name:"
 msgstr "Enw eitem:"
 
-#: treeview.cpp:1387
+#: treeview.cpp:1439
 #, kde-format
 msgid "All submenus of '%1' will be removed. Do you want to continue?"
 msgstr ""
 
-#: treeview.cpp:1545
+#: treeview.cpp:1605
 msgid "Menu changes could not be saved because of the following problem:"
 msgstr ""
 
-#: treeview.cpp:1586
+#: treeview.cpp:1650
 msgid ""
 "Do you want to restore the system menu? Warning: This will remove all custom "
 "menus."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmines.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmines.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmines.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmines.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,15 +9,17 @@
 msgstr ""
 "Project-Id-Version: kmines\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:29
 msgid "KMines is a classic minesweeper game"
@@ -117,80 +119,80 @@
 msgid "Custom Game"
 msgstr "Gêm Addasiedig"
 
-#: rc.cpp:34
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Kyfieithu: KD, pixelM, dylunio, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:35
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kminesui.rc:12
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:33 rc.cpp:38
+#: rc.cpp:5
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: customgame.ui:16
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3 rc.cpp:41
+#: rc.cpp:8
 msgid "Width:"
 msgstr "Lled:"
 
 #. i18n: file: customgame.ui:26
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:6 rc.cpp:44
+#: rc.cpp:11
 msgid "Height:"
 msgstr "Uchder:"
 
 #. i18n: file: customgame.ui:36
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:9 rc.cpp:47
+#: rc.cpp:14
 msgid "Mines:"
 msgstr ""
 
 #. i18n: file: generalopts.ui:16
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseQuestionMarks)
-#: rc.cpp:12 rc.cpp:50
+#: rc.cpp:17
 msgid "Use '?' marks"
 msgstr ""
 
 #. i18n: file: kmines.kcfg:10
 #. i18n: ectx: label, entry (UseQuestionMarks), group (General)
-#: rc.cpp:15 rc.cpp:53
+#: rc.cpp:20
 msgid "Whether the \"unsure\" marker may be used."
 msgstr ""
 
 #. i18n: file: kmines.kcfg:14
 #. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:18 rc.cpp:56
+#: rc.cpp:23
 msgid "The graphical theme to be used."
 msgstr ""
 
 #. i18n: file: kmines.kcfg:20
 #. i18n: ectx: label, entry (CustomWidth), group (Options)
-#: rc.cpp:21 rc.cpp:59
+#: rc.cpp:26
 msgid "The width of the playing field."
 msgstr "Lled y maes chwarae."
 
 #. i18n: file: kmines.kcfg:26
 #. i18n: ectx: label, entry (CustomHeight), group (Options)
-#: rc.cpp:24 rc.cpp:62
+#: rc.cpp:29
 msgid "The height of the playing field."
 msgstr "Uchder y maes chwarae."
 
 #. i18n: file: kmines.kcfg:32
 #. i18n: ectx: label, entry (CustomMines), group (Options)
-#: rc.cpp:27 rc.cpp:65
+#: rc.cpp:32
 msgid "The number of mines in the playing field."
 msgstr "Nifer ffrwydynnau yn y maes chwarae."
 
 #. i18n: file: kmines.kcfg:37
 #. i18n: ectx: label, entry (level), group (Options)
-#: rc.cpp:30 rc.cpp:68
+#: rc.cpp:35
 msgid "The difficulty level."
 msgstr "Lefel anhawster."
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmix.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmix.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmix.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmix.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,201 +2,67 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/kmix.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:37+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:19+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: apps/main.cpp:33
-msgid "KMix - KDE's full featured mini mixer"
-msgstr ""
-
-#: apps/main.cpp:37
-msgid "KMix"
-msgstr "KMix"
-
-#: apps/main.cpp:39
+#: backends/mixer_oss4.cpp:490 backends/mixer_oss.cpp:230
 msgid ""
-"(c) 1996-2007 Christian Esken\n"
-"(c) 2000-2003 Stefan Schimanski\n"
-"(c) 2002-2005 Helio Chissini de Castro"
-msgstr ""
-
-#: apps/main.cpp:41
-msgid "Christian Esken"
-msgstr ""
-
-#: apps/main.cpp:41
-msgid "Current maintainer"
-msgstr ""
-
-#: apps/main.cpp:42
-msgid "Helio Chissini de Castro"
-msgstr ""
-
-#: apps/main.cpp:42
-msgid "Co-maintainer, Alsa 0.9x port"
-msgstr ""
-
-#: apps/main.cpp:43
-msgid "Brian Hanson"
-msgstr ""
-
-#: apps/main.cpp:43
-msgid "Solaris port"
-msgstr ""
-
-#: apps/main.cpp:48 apps/kmixctrl.cpp:45
-msgid "Stefan Schimanski"
-msgstr ""
-
-#: apps/main.cpp:48
-msgid "Temporary maintainer"
-msgstr ""
-
-#: apps/main.cpp:49
-msgid "Erwin Mascher"
-msgstr ""
-
-#: apps/main.cpp:49
-msgid "Improving support for emu10k1 based soundcards"
-msgstr ""
-
-#: apps/main.cpp:50
-msgid "Sebestyen Zoltan"
-msgstr ""
-
-#: apps/main.cpp:50 apps/main.cpp:51
-msgid "*BSD fixes"
-msgstr ""
-
-#: apps/main.cpp:51
-msgid "Lennart Augustsson"
-msgstr ""
-
-#: apps/main.cpp:52
-msgid "Nick Lopez"
-msgstr ""
-
-#: apps/main.cpp:52
-msgid "ALSA port"
-msgstr ""
-
-#: apps/main.cpp:53
-msgid "Nadeem Hasan"
-msgstr ""
-
-#: apps/main.cpp:53
-msgid "Mute and volume preview, other fixes"
-msgstr ""
-
-#: apps/main.cpp:54
-msgid "Colin Guthrie"
-msgstr ""
-
-#: apps/main.cpp:54
-msgid "PulseAudio support"
-msgstr ""
-
-#: apps/main.cpp:55
-msgid "Valentin Rusu"
-msgstr ""
-
-#: apps/main.cpp:55
-msgid "TerraTec DMX6Fire support"
+"kmix: You do not have permission to access the mixer device.\n"
+"Login as root and do a 'chmod a+rw /dev/mixer*' to allow the access."
 msgstr ""
 
-#: apps/main.cpp:60
+#: backends/mixer_oss4.cpp:494
 msgid ""
-"Inhibits the unhiding of the KMix main window, if KMix is already running."
-msgstr ""
-
-#: apps/kmixctrl.cpp:36
-msgid "kmixctrl - kmix volume save/restore utility"
-msgstr ""
-
-#: apps/kmixctrl.cpp:41
-msgid "KMixCtrl"
-msgstr ""
-
-#: apps/kmixctrl.cpp:43
-msgid "(c) 2000 by Stefan Schimanski"
-msgstr ""
-
-#: apps/kmixctrl.cpp:51
-msgid "Save current volumes as default"
-msgstr ""
-
-#: apps/kmixctrl.cpp:53
-msgid "Restore default volumes"
+"kmix: Mixer cannot be found.\n"
+"Please check that the soundcard is installed and the\n"
+"soundcard driver is loaded.\n"
+"On Linux you might need to use 'insmod' to load the driver.\n"
+"Use 'soundon' when using OSS4 from 4front."
 msgstr ""
 
-#: apps/kmixd.cpp:309 apps/kmix.cpp:812
-#, kde-format
+#: backends/mixer_backend.cpp:242
 msgid ""
-"The soundcard containing the master device was unplugged. Changing to "
-"control %1 on card %2."
-msgstr ""
-
-#: apps/kmixd.cpp:318 apps/kmix.cpp:821
-msgid "The last soundcard was unplugged."
-msgstr ""
-
-#: apps/kmix.cpp:141
-msgid "Audio Setup"
-msgstr ""
-
-#: apps/kmix.cpp:145
-msgid "Hardware &Information"
-msgstr ""
-
-#: apps/kmix.cpp:148
-msgid "Hide Mixer Window"
-msgstr ""
-
-#: apps/kmix.cpp:152
-msgid "Configure &Channels..."
-msgstr ""
-
-#: apps/kmix.cpp:155 gui/kmixdockwidget.cpp:128
-msgid "Select Master Channel..."
-msgstr ""
-
-#: apps/kmix.cpp:167 gui/mdwslider.cpp:130
-msgid "Increase Volume"
-msgstr ""
-
-#: apps/kmix.cpp:172 gui/mdwslider.cpp:144
-msgid "Decrease Volume"
+"kmix:You do not have permission to access the mixer device.\n"
+"Please check your operating systems manual to allow the access."
 msgstr ""
 
-#: apps/kmix.cpp:177
-msgid "Mute"
+#: backends/mixer_backend.cpp:246
+msgid "kmix: Could not write to mixer."
 msgstr ""
 
-#: apps/kmix.cpp:672
-msgid "Cannot add view - GUIProfile is invalid."
+#: backends/mixer_backend.cpp:249
+msgid "kmix: Could not read from mixer."
 msgstr ""
 
-#: apps/kmix.cpp:678
-msgid "View already exists. Cannot add View."
+#: backends/mixer_backend.cpp:252
+msgid ""
+"kmix: Mixer cannot be found.\n"
+"Please check that the soundcard is installed and that\n"
+"the soundcard driver is loaded.\n"
 msgstr ""
 
-#: apps/kmix.cpp:1087
-msgid "Mixer Hardware Information"
+#: backends/mixer_backend.cpp:257
+msgid "kmix: Unknown error. Please report how you produced this error."
 msgstr ""
 
-#: apps/kmix.cpp:1101
-msgid "The helper application is either not installed or not working."
+#: backends/mixer_alsa9.cpp:883
+msgid ""
+"You do not have permission to access the alsa mixer device.\n"
+"Please verify if all alsa devices are properly created."
 msgstr ""
 
-#: apps/kmix.cpp:1116
-msgid "Error"
+#: backends/mixer_alsa9.cpp:887
+msgid ""
+"Alsa mixer cannot be found.\n"
+"Please check that the soundcard is installed and the\n"
+"soundcard driver is loaded.\n"
 msgstr ""
 
 #: backends/mixer_backend_i18n.cpp:24
@@ -228,29 +94,42 @@
 msgid "---"
 msgstr ""
 
-#: backends/mixer_backend.cpp:197
-msgid ""
-"kmix:You do not have permission to access the mixer device.\n"
-"Please check your operating systems manual to allow the access."
+#: backends/mixer_sun.cpp:67
+msgid "Master Volume"
 msgstr ""
 
-#: backends/mixer_backend.cpp:201
-msgid "kmix: Could not write to mixer."
+#: backends/mixer_sun.cpp:68
+msgid "Internal Speaker"
 msgstr ""
 
-#: backends/mixer_backend.cpp:204
-msgid "kmix: Could not read from mixer."
+#: backends/mixer_sun.cpp:69
+msgid "Headphone"
 msgstr ""
 
-#: backends/mixer_backend.cpp:207
-msgid ""
-"kmix: Mixer cannot be found.\n"
-"Please check that the soundcard is installed and that\n"
-"the soundcard driver is loaded.\n"
+#: backends/mixer_sun.cpp:70
+msgid "Line Out"
 msgstr ""
 
-#: backends/mixer_backend.cpp:212
-msgid "kmix: Unknown error. Please report how you produced this error."
+#: backends/mixer_sun.cpp:71
+msgid "Record Monitor"
+msgstr ""
+
+#: backends/mixer_sun.cpp:72 backends/mixer_oss.cpp:60
+msgid "Microphone"
+msgstr ""
+
+#: backends/mixer_sun.cpp:73
+msgid "Line In"
+msgstr ""
+
+#: backends/mixer_sun.cpp:74 backends/mixer_oss.cpp:60
+msgid "CD"
+msgstr ""
+
+#: backends/mixer_sun.cpp:239
+msgid ""
+"kmix: You do not have permission to access the mixer device.\n"
+"Ask your system administrator to fix /dev/audioctl to allow access."
 msgstr ""
 
 #: backends/mixer_oss.cpp:58
@@ -281,14 +160,6 @@
 msgid "Line"
 msgstr "Llinell"
 
-#: backends/mixer_oss.cpp:60 backends/mixer_sun.cpp:72
-msgid "Microphone"
-msgstr ""
-
-#: backends/mixer_oss.cpp:60 backends/mixer_sun.cpp:74
-msgid "CD"
-msgstr ""
-
 #: backends/mixer_oss.cpp:61
 msgid "Mix"
 msgstr ""
@@ -361,7 +232,7 @@
 msgid "3D-center"
 msgstr ""
 
-#: backends/mixer_oss.cpp:67 backends/mixer_oss.cpp:68 core/mixdevice.cpp:109
+#: backends/mixer_oss.cpp:67 backends/mixer_oss.cpp:68 core/mixdevice.cpp:122
 msgid "unknown"
 msgstr "anhysbys"
 
@@ -369,12 +240,6 @@
 msgid "unused"
 msgstr ""
 
-#: backends/mixer_oss.cpp:230 backends/mixer_oss4.cpp:491
-msgid ""
-"kmix: You do not have permission to access the mixer device.\n"
-"Login as root and do a 'chmod a+rw /dev/mixer*' to allow the access."
-msgstr ""
-
 #: backends/mixer_oss.cpp:234
 msgid ""
 "kmix: Mixer cannot be found.\n"
@@ -384,362 +249,534 @@
 "Use 'soundon' when using commercial OSS."
 msgstr ""
 
-#: backends/mixer_alsa9.cpp:875
-msgid ""
-"You do not have permission to access the alsa mixer device.\n"
-"Please verify if all alsa devices are properly created."
+#: backends/mixer_pulse.cpp:321 backends/mixer_pulse.cpp:380
+msgid "Unknown Application"
 msgstr ""
 
-#: backends/mixer_alsa9.cpp:879
-msgid ""
-"Alsa mixer cannot be found.\n"
-"Please check that the soundcard is installed and the\n"
-"soundcard driver is loaded.\n"
+#: backends/mixer_pulse.cpp:428 backends/mixer_pulse.cpp:464
+msgid "Event Sounds"
 msgstr ""
 
-#: backends/mixer_sun.cpp:67
-msgid "Master Volume"
+#: backends/mixer_pulse.cpp:990
+msgid "Playback Devices"
 msgstr ""
 
-#: backends/mixer_sun.cpp:68
-msgid "Internal Speaker"
+#: backends/mixer_pulse.cpp:996
+msgid "Capture Devices"
 msgstr ""
 
-#: backends/mixer_sun.cpp:69
-msgid "Headphone"
+#: backends/mixer_pulse.cpp:1002
+msgid "Playback Streams"
 msgstr ""
 
-#: backends/mixer_sun.cpp:70
-msgid "Line Out"
+#: backends/mixer_pulse.cpp:1010
+msgid "Capture Streams"
 msgstr ""
 
-#: backends/mixer_sun.cpp:71
-msgid "Record Monitor"
+#: core/mixertoolbox.cpp:222
+msgid "Sound drivers supported:"
 msgstr ""
 
-#: backends/mixer_sun.cpp:73
-msgid "Line In"
+#: core/mixertoolbox.cpp:223
+msgid "Sound drivers used:"
 msgstr ""
 
-#: backends/mixer_sun.cpp:239
+#: apps/kmixd.cpp:313 apps/kmix.cpp:897
+#, kde-format
 msgid ""
-"kmix: You do not have permission to access the mixer device.\n"
-"Ask your system administrator to fix /dev/audioctl to allow access."
+"The soundcard containing the master device was unplugged. Changing to "
+"control %1 on card %2."
 msgstr ""
 
-#: backends/mixer_oss4.cpp:495
-msgid ""
-"kmix: Mixer cannot be found.\n"
-"Please check that the soundcard is installed and the\n"
-"soundcard driver is loaded.\n"
-"On Linux you might need to use 'insmod' to load the driver.\n"
-"Use 'soundon' when using OSS4 from 4front."
+#: apps/kmixd.cpp:323 apps/kmix.cpp:907
+msgid "The last soundcard was unplugged."
 msgstr ""
 
-#: backends/mixer_pulse.cpp:318 backends/mixer_pulse.cpp:377
-msgid "Unknown Application"
+#: apps/kmixctrl.cpp:36
+msgid "kmixctrl - kmix volume save/restore utility"
 msgstr ""
 
-#: backends/mixer_pulse.cpp:422 backends/mixer_pulse.cpp:458
-msgid "Event Sounds"
+#: apps/kmixctrl.cpp:41
+msgid "KMixCtrl"
 msgstr ""
 
-#: backends/mixer_pulse.cpp:965
-msgid "Playback Devices"
+#: apps/kmixctrl.cpp:43
+msgid "(c) 2000 by Stefan Schimanski"
 msgstr ""
 
-#: backends/mixer_pulse.cpp:971
-msgid "Capture Devices"
+#: apps/kmixctrl.cpp:45 apps/main.cpp:53
+msgid "Stefan Schimanski"
 msgstr ""
 
-#: backends/mixer_pulse.cpp:977
-msgid "Playback Streams"
-msgstr ""
-
-#: backends/mixer_pulse.cpp:985
-msgid "Capture Streams"
+#: apps/kmixctrl.cpp:51
+msgid "Save current volumes as default"
 msgstr ""
 
-#: core/mixertoolbox.cpp:201
-msgid "Sound drivers supported:"
+#: apps/kmixctrl.cpp:53
+msgid "Restore default volumes"
 msgstr ""
 
-#: core/mixertoolbox.cpp:202
-msgid "Sound drivers used:"
+#: apps/kmix.cpp:150
+msgid "Audio Setup"
 msgstr ""
 
-#: gui/dialogselectmaster.cpp:40
-msgid "Select Master Channel"
+#: apps/kmix.cpp:154
+msgid "Hardware &Information"
 msgstr ""
 
-#: gui/dialogselectmaster.cpp:78
-msgid "Current mixer:"
+#: apps/kmix.cpp:157
+msgid "Hide Mixer Window"
 msgstr ""
 
-#: gui/dialogselectmaster.cpp:97 gui/dialogaddview.cpp:113
-msgid "Current mixer"
+#: apps/kmix.cpp:161
+msgid "Configure &Channels..."
 msgstr ""
 
-#: gui/dialogselectmaster.cpp:104
-msgid "Select the channel representing the master volume:"
+#: apps/kmix.cpp:164 gui/kmixdockwidget.cpp:143
+msgid "Select Master Channel..."
 msgstr ""
 
-#: gui/dialogselectmaster.cpp:111 gui/dialogaddview.cpp:127
-msgid "No sound card is installed or currently plugged in."
+#: apps/kmix.cpp:169
+msgid "Save volume profile 1"
 msgstr ""
 
-#: gui/dialogaddview.cpp:47
-msgid "All controls"
+#: apps/kmix.cpp:174
+msgid "Save volume profile 2"
 msgstr ""
 
-#: gui/dialogaddview.cpp:48
-msgid "Only playback controls"
+#: apps/kmix.cpp:179
+msgid "Save volume profile 3"
 msgstr ""
 
-#: gui/dialogaddview.cpp:49
-msgid "Only capture controls"
+#: apps/kmix.cpp:184
+msgid "Save volume profile 4"
 msgstr ""
 
-#: gui/dialogaddview.cpp:56
-msgid "Add View"
+#: apps/kmix.cpp:189
+msgid "Load volume profile 1"
 msgstr ""
 
-#: gui/dialogaddview.cpp:94
-msgid "Select mixer:"
+#: apps/kmix.cpp:194
+msgid "Load volume profile 2"
 msgstr ""
 
-#: gui/dialogaddview.cpp:120
-msgid "Select the design for the new view:"
+#: apps/kmix.cpp:199
+msgid "Load volume profile 3"
 msgstr ""
 
-#: gui/kmixdockwidget.cpp:120
-msgid "M&ute"
+#: apps/kmix.cpp:204
+msgid "Load volume profile 4"
 msgstr ""
 
-#: gui/kmixdockwidget.cpp:216
-msgid "Mixer cannot be found"
+#: apps/kmix.cpp:216 gui/mdwslider.cpp:143
+msgid "Increase Volume"
 msgstr ""
 
-#: gui/kmixdockwidget.cpp:236
-#, kde-format
-msgid "Volume at %1%"
+#: apps/kmix.cpp:221 gui/mdwslider.cpp:157
+msgid "Decrease Volume"
 msgstr ""
 
-#: gui/kmixdockwidget.cpp:238
-msgid " (Muted)"
+#: apps/kmix.cpp:226
+msgid "Mute"
 msgstr ""
 
-#: gui/viewbase.cpp:79
-msgid "&Channels"
-msgstr "&Sianeli"
-
-#: gui/viewbase.cpp:179
-msgid "Device Settings"
+#: apps/kmix.cpp:756
+msgid "Cannot add view - GUIProfile is invalid."
 msgstr ""
 
-#: gui/mdwslider.cpp:87
-msgid "&Split Channels"
+#: apps/kmix.cpp:762
+msgid "View already exists. Cannot add View."
 msgstr ""
 
-#: gui/mdwslider.cpp:93 gui/mdwenum.cpp:60
-msgid "&Hide"
-msgstr "Cudd&io"
-
-#: gui/mdwslider.cpp:99
-msgid "&Muted"
+#: apps/kmix.cpp:1175
+msgid "Mixer Hardware Information"
 msgstr ""
 
-#: gui/mdwslider.cpp:105
-msgid "Set &Record Source"
+#: apps/kmix.cpp:1189
+msgid "The helper application is either not installed or not working."
 msgstr ""
 
-#: gui/mdwslider.cpp:110
-msgid "Mo&ve"
+#: apps/kmix.cpp:1204
+msgid "Error"
 msgstr ""
 
-#: gui/mdwslider.cpp:115 gui/mdwenum.cpp:63
-msgid "C&onfigure Shortcuts..."
-msgstr "Ff&urfweddu Byrlwybrau"
-
-#: gui/mdwslider.cpp:158
-msgid "Toggle Mute"
+#: apps/kmix.cpp:1232 gui/dialogselectmaster.cpp:111 gui/dialogaddview.cpp:127
+msgid "No sound card is installed or currently plugged in."
 msgstr ""
 
-#: gui/mdwslider.cpp:341 gui/mdwslider.cpp:394 gui/mdwslider.cpp:493
-msgid "capture"
+#: apps/main.cpp:33
+msgid "KMix - KDE's full featured mini mixer"
 msgstr ""
 
-#: gui/mdwslider.cpp:345 gui/mdwslider.cpp:399
-#, kde-format
-msgid "Capture/Uncapture %1"
-msgstr ""
+#: apps/main.cpp:37
+msgid "KMix"
+msgstr "KMix"
 
-#: gui/mdwslider.cpp:367 gui/mdwslider.cpp:452
-#, kde-format
-msgid "Mute/Unmute %1"
+#: apps/main.cpp:39
+msgid "(c) 1996-2012 The KMix Authors"
 msgstr ""
 
-#: gui/mdwslider.cpp:547
-#, kde-format
-msgid "%1 (capture)"
+#: apps/main.cpp:42
+msgid "Christian Esken"
 msgstr ""
 
-#: gui/mdwslider.cpp:1078
-msgid "Automatic According to Category"
+#: apps/main.cpp:42
+msgid "Original author and current maintainer"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:41 gui/dialogviewconfiguration.cpp:152
-msgid "Configure"
+#: apps/main.cpp:43
+msgid "Colin Guthrie"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:56
-msgid "Behavior"
+#: apps/main.cpp:43
+msgid "PulseAudio support"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:63
-msgid "&Dock in system tray"
+#: apps/main.cpp:44
+msgid "Helio Chissini de Castro"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:65
-msgid "Docks the mixer into the KDE system tray"
+#: apps/main.cpp:44
+msgid "ALSA 0.9x port"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:70
-msgid "Enable system tray &volume control"
+#: apps/main.cpp:45
+msgid "Brian Hanson"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:72
-msgid "Allows to control the volume from the system tray"
+#: apps/main.cpp:45
+msgid "Solaris support"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:78
-msgid "Restore volumes on login"
+#: apps/main.cpp:52
+msgid "Igor Poboiko"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:83
-msgid "Visual"
+#: apps/main.cpp:52
+msgid "Plasma Dataengine"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:89
-msgid "Show &tickmarks"
+#: apps/main.cpp:53
+msgid "Temporary maintainer"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:91
-msgid "Enable/disable tickmark scales on the sliders"
+#: apps/main.cpp:54
+msgid "Sebestyen Zoltan"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:96
-msgid "Show &labels"
+#: apps/main.cpp:54 apps/main.cpp:55
+msgid "*BSD fixes"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:98
-msgid "Enables/disables description labels above the sliders"
+#: apps/main.cpp:55
+msgid "Lennart Augustsson"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:105
-msgid "Slider orientation: "
+#: apps/main.cpp:56
+msgid "Nadeem Hasan"
 msgstr ""
 
-#: gui/kmixprefdlg.cpp:106
-msgid "&Horizontal"
-msgstr "&Llorweddol"
-
-#: gui/kmixprefdlg.cpp:107
-msgid "&Vertical"
-msgstr "&Fertigol"
+#: apps/main.cpp:56
+msgid "Mute and volume preview, other fixes"
+msgstr ""
 
-#: gui/dialogviewconfiguration.cpp:167
-msgid "Configuration of the channels."
+#: apps/main.cpp:57
+msgid "Erwin Mascher"
 msgstr ""
 
-#: gui/dialogviewconfiguration.cpp:228
-msgid "Available channels"
+#: apps/main.cpp:57
+msgid "Improving support for emu10k1 based soundcards"
 msgstr ""
 
-#: gui/dialogviewconfiguration.cpp:232
-msgid "Visible channels"
+#: apps/main.cpp:58
+msgid "Valentin Rusu"
 msgstr ""
 
-#: gui/viewdockareapopup.cpp:131
-msgid "Mixer"
+#: apps/main.cpp:58
+msgid "TerraTec DMX6Fire support"
 msgstr ""
 
-#: gui/kmixerwidget.cpp:75
-msgid "Invalid mixer"
+#: apps/main.cpp:63
+msgid ""
+"Inhibits the unhiding of the KMix main window, if KMix is already running."
 msgstr ""
 
-#: rc.cpp:34
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:35
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kmixui.rc:10
 #. i18n: ectx: Menu (file)
-#: rc.cpp:30 rc.cpp:38
+#: rc.cpp:5
 msgid "&File"
 msgstr ""
 
 #. i18n: file: kmixui.rc:21
 #. i18n: ectx: Menu (help)
-#: rc.cpp:33 rc.cpp:41
+#: rc.cpp:8
 msgid "&Help"
 msgstr ""
 
 #. i18n: file: colorwidget.ui:20
 #. i18n: ectx: property (text), widget (QCheckBox, customColors)
-#: rc.cpp:3 rc.cpp:44
+#: rc.cpp:11
 msgid "&Use custom colors"
 msgstr "&Defnyddio lliwiau addasiedig"
 
 #. i18n: file: colorwidget.ui:30
 #. i18n: ectx: property (title), widget (QGroupBox, activeColors)
-#: rc.cpp:6 rc.cpp:47
+#: rc.cpp:14
 msgid "Active"
 msgstr "Gweithredol"
 
 #. i18n: file: colorwidget.ui:52
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:9 rc.cpp:50
+#: rc.cpp:17
 msgid "&Silent:"
 msgstr "&Distaw :"
 
 #. i18n: file: colorwidget.ui:96
 #. i18n: ectx: property (text), widget (QLabel, labelLoad)
-#: rc.cpp:12 rc.cpp:53
+#: rc.cpp:20
 msgid "&Loud:"
 msgstr ""
 
 #. i18n: file: colorwidget.ui:112
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#: rc.cpp:15 rc.cpp:56
+#: rc.cpp:23
 msgid "&Background:"
 msgstr "&Cefndir:"
 
 #. i18n: file: colorwidget.ui:131
 #. i18n: ectx: property (title), widget (QGroupBox, mutedColors)
-#: rc.cpp:18 rc.cpp:59
+#: rc.cpp:26
 msgid "Muted"
 msgstr ""
 
 #. i18n: file: colorwidget.ui:143
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#: rc.cpp:21 rc.cpp:62
+#: rc.cpp:29
 msgid "Lou&d:"
 msgstr ""
 
 #. i18n: file: colorwidget.ui:159
 #. i18n: ectx: property (text), widget (QLabel, TextLabel8)
-#: rc.cpp:24 rc.cpp:65
+#: rc.cpp:32
 msgid "Backgrou&nd:"
 msgstr "Cefndir:"
 
 #. i18n: file: colorwidget.ui:175
 #. i18n: ectx: property (text), widget (QLabel, TextLabel7)
-#: rc.cpp:27 rc.cpp:68
+#: rc.cpp:35
 msgid "Silen&t:"
 msgstr "Dista&w :"
+
+#: gui/dialogselectmaster.cpp:40
+msgid "Select Master Channel"
+msgstr ""
+
+#: gui/dialogselectmaster.cpp:78
+msgid "Current mixer:"
+msgstr ""
+
+#: gui/dialogselectmaster.cpp:97 gui/dialogaddview.cpp:113
+msgid "Current mixer"
+msgstr ""
+
+#: gui/dialogselectmaster.cpp:104
+msgid "Select the channel representing the master volume:"
+msgstr ""
+
+#: gui/kmixdockwidget.cpp:67
+msgid "Volume Control"
+msgstr ""
+
+#: gui/kmixdockwidget.cpp:135
+msgid "M&ute"
+msgstr ""
+
+#: gui/kmixdockwidget.cpp:221
+msgid "Mixer cannot be found"
+msgstr ""
+
+#: gui/kmixdockwidget.cpp:241
+#, kde-format
+msgid "Volume at %1%"
+msgstr ""
+
+#: gui/kmixdockwidget.cpp:243
+msgid " (Muted)"
+msgstr ""
+
+#: gui/viewbase.cpp:84
+msgid "&Channels"
+msgstr "&Sianeli"
+
+#: gui/viewbase.cpp:175
+msgid "Device Settings"
+msgstr ""
+
+#: gui/dialogviewconfiguration.cpp:152 gui/kmixprefdlg.cpp:41
+msgid "Configure"
+msgstr ""
+
+#: gui/dialogviewconfiguration.cpp:167
+msgid "Configuration of the channels."
+msgstr ""
+
+#: gui/dialogviewconfiguration.cpp:228
+msgid "Available channels"
+msgstr ""
+
+#: gui/dialogviewconfiguration.cpp:232
+msgid "Visible channels"
+msgstr ""
+
+#: gui/viewdockareapopup.cpp:156
+msgid "Mixer"
+msgstr ""
+
+#: gui/mdwenum.cpp:60 gui/mdwslider.cpp:106
+msgid "&Hide"
+msgstr "Cudd&io"
+
+#: gui/mdwenum.cpp:63 gui/mdwslider.cpp:128
+msgid "C&onfigure Shortcuts..."
+msgstr "Ff&urfweddu Byrlwybrau"
+
+#: gui/mdwslider.cpp:100
+msgid "&Split Channels"
+msgstr ""
+
+#: gui/mdwslider.cpp:112
+msgid "&Muted"
+msgstr ""
+
+#: gui/mdwslider.cpp:118
+msgid "Set &Record Source"
+msgstr ""
+
+#: gui/mdwslider.cpp:123
+msgid "Mo&ve"
+msgstr ""
+
+#: gui/mdwslider.cpp:171
+msgid "Toggle Mute"
+msgstr ""
+
+#: gui/mdwslider.cpp:354 gui/mdwslider.cpp:405
+msgid "capture"
+msgstr ""
+
+#: gui/mdwslider.cpp:358 gui/mdwslider.cpp:410
+#, kde-format
+msgid "Capture/Uncapture %1"
+msgstr ""
+
+#: gui/mdwslider.cpp:380 gui/mdwslider.cpp:465
+#, kde-format
+msgid "Mute/Unmute %1"
+msgstr ""
+
+#: gui/mdwslider.cpp:549
+msgid "Capture"
+msgstr ""
+
+#: gui/mdwslider.cpp:584
+#, kde-format
+msgid "%1 (capture)"
+msgstr ""
+
+#: gui/mdwslider.cpp:1121
+msgid "Automatic According to Category"
+msgstr ""
+
+#: gui/dialogaddview.cpp:47
+msgid "All controls"
+msgstr ""
+
+#: gui/dialogaddview.cpp:48
+msgid "Only playback controls"
+msgstr ""
+
+#: gui/dialogaddview.cpp:49
+msgid "Only capture controls"
+msgstr ""
+
+#: gui/dialogaddview.cpp:56
+msgid "Add View"
+msgstr ""
+
+#: gui/dialogaddview.cpp:94
+msgid "Select mixer:"
+msgstr ""
+
+#: gui/dialogaddview.cpp:120
+msgid "Select the design for the new view:"
+msgstr ""
+
+#: gui/kmixerwidget.cpp:75
+msgid "Invalid mixer"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:56
+msgid "Behavior"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:63
+msgid "&Dock in system tray"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:65
+msgid "Docks the mixer into the KDE system tray"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:70
+msgid "Enable system tray &volume control"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:72
+msgid "Allows to control the volume from the system tray"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:78
+msgid "Restore volumes on login"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:83
+msgid "Visual"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:89
+msgid "Show &tickmarks"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:91
+msgid "Enable/disable tickmark scales on the sliders"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:96
+msgid "Show &labels"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:98
+msgid "Enables/disables description labels above the sliders"
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:105
+msgid "Slider orientation: "
+msgstr ""
+
+#: gui/kmixprefdlg.cpp:106
+msgid "&Horizontal"
+msgstr "&Llorweddol"
+
+#: gui/kmixprefdlg.cpp:107
+msgid "&Vertical"
+msgstr "&Fertigol"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmplot.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmplot.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kmplot.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kmplot.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,18 +2,27 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kmplot.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:49+0000\n"
-"PO-Revision-Date: 2012-03-12 22:03+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 23:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:38+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: parameteranimator.cpp:62
-msgid "Parameter Animator"
+#: parameterswidget.cpp:39
+#, kde-format
+msgid "Slider No. %1"
+msgstr ""
+
+#: functioneditor.cpp:60
+msgid "Functions"
+msgstr ""
+
+#: equationeditor.cpp:40
+msgid "Equation Editor"
 msgstr ""
 
 #: coordsconfigdialog.cpp:50
@@ -28,252 +37,222 @@
 msgid "The minimum range value must be lower than the maximum range value"
 msgstr ""
 
-#: functioneditor.cpp:60
-msgid "Functions"
-msgstr ""
-
-#: kmplot.cpp:82
-msgid "Could not find KmPlot's part."
+#: ksliderwindow.cpp:37
+#, kde-format
+msgid "Slider %1"
 msgstr ""
 
-#: kmplot.cpp:209 maindlg.cpp:522
+#: ksliderwindow.cpp:43
 msgid ""
-"*.fkt|KmPlot Files (*.fkt)\n"
-"*|All Files"
+"Move slider to change the parameter of the function plot connected to this "
+"slider."
 msgstr ""
 
-#: kmplot.cpp:209
-msgid "Open"
+#: ksliderwindow.cpp:94
+msgid "Sliders"
 msgstr ""
 
-#: view.cpp:2423 view.cpp:2424
-msgid "  to  "
+#: functiontools.cpp:71 functiontools.cpp:78
+msgid "Search between:"
 msgstr ""
 
-#. i18n: file: functioneditorwidget.ui:184
-#. i18n: ectx: property (title), widget (ParametersWidget, cartesianParameters)
-#. i18n: file: functioneditorwidget.ui:535
-#. i18n: ectx: property (title), widget (ParametersWidget, parametricParameters)
-#. i18n: file: functioneditorwidget.ui:640
-#. i18n: ectx: property (title), widget (ParametersWidget, polarParameters)
-#. i18n: file: functioneditorwidget.ui:715
-#. i18n: ectx: property (title), widget (ParametersWidget, implicitParameters)
-#. i18n: file: functioneditorwidget.ui:798
-#. i18n: ectx: property (title), widget (ParametersWidget, differentialParameters)
-#. i18n: file: parameterswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ParametersWidget)
-#. i18n: file: functioneditorwidget.ui:184
-#. i18n: ectx: property (title), widget (ParametersWidget, cartesianParameters)
-#. i18n: file: functioneditorwidget.ui:535
-#. i18n: ectx: property (title), widget (ParametersWidget, parametricParameters)
-#. i18n: file: functioneditorwidget.ui:640
-#. i18n: ectx: property (title), widget (ParametersWidget, polarParameters)
-#. i18n: file: functioneditorwidget.ui:715
-#. i18n: ectx: property (title), widget (ParametersWidget, implicitParameters)
-#. i18n: file: functioneditorwidget.ui:798
-#. i18n: ectx: property (title), widget (ParametersWidget, differentialParameters)
-#. i18n: file: parameterswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ParametersWidget)
-#. i18n: file: functioneditorwidget.ui:184
-#. i18n: ectx: property (title), widget (ParametersWidget, cartesianParameters)
-#. i18n: file: functioneditorwidget.ui:535
-#. i18n: ectx: property (title), widget (ParametersWidget, parametricParameters)
-#. i18n: file: functioneditorwidget.ui:640
-#. i18n: ectx: property (title), widget (ParametersWidget, polarParameters)
-#. i18n: file: functioneditorwidget.ui:715
-#. i18n: ectx: property (title), widget (ParametersWidget, implicitParameters)
-#. i18n: file: functioneditorwidget.ui:798
-#. i18n: ectx: property (title), widget (ParametersWidget, differentialParameters)
-#. i18n: file: parameterswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ParametersWidget)
-#. i18n: file: functioneditorwidget.ui:184
-#. i18n: ectx: property (title), widget (ParametersWidget, cartesianParameters)
-#. i18n: file: functioneditorwidget.ui:535
-#. i18n: ectx: property (title), widget (ParametersWidget, parametricParameters)
-#. i18n: file: functioneditorwidget.ui:640
-#. i18n: ectx: property (title), widget (ParametersWidget, polarParameters)
-#. i18n: file: functioneditorwidget.ui:715
-#. i18n: ectx: property (title), widget (ParametersWidget, implicitParameters)
-#. i18n: file: functioneditorwidget.ui:798
-#. i18n: ectx: property (title), widget (ParametersWidget, differentialParameters)
-#. i18n: file: parameterswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ParametersWidget)
-#: rc.cpp:261 rc.cpp:388 rc.cpp:425 rc.cpp:455 rc.cpp:484 rc.cpp:856
-#: rc.cpp:1511 rc.cpp:1638 rc.cpp:1675 rc.cpp:1705 rc.cpp:1734 rc.cpp:1836
-#: view.cpp:2430 rc.cpp:261 rc.cpp:388 rc.cpp:425 rc.cpp:455 rc.cpp:484
-#: rc.cpp:856 rc.cpp:1511 rc.cpp:1638 rc.cpp:1675 rc.cpp:1705 rc.cpp:1734
-#: rc.cpp:1836
-msgid "Parameters"
+#: functiontools.cpp:72
+msgid "Find Minimum Point"
 msgstr ""
 
-#: view.cpp:2430
-msgid "Plotting Range"
+#: functiontools.cpp:79
+msgid "Find Maximum Point"
 msgstr ""
 
-#: view.cpp:2430
-msgid "Axes Division"
+#: functiontools.cpp:85
+msgid "Calculate the area between:"
 msgstr ""
 
-#: view.cpp:2431
-msgid "x-Axis:"
+#: functiontools.cpp:86
+msgid "Area Under Graph"
 msgstr ""
 
-#: view.cpp:2432
-msgid "y-Axis:"
-msgstr "Echelin-Y :"
-
-#: view.cpp:2435
-msgid "Functions:"
-msgstr "Ffwythiannau :"
-
-#: view.cpp:3512
-msgid "root"
-msgstr "gwraidd"
-
-#: kconstanteditor.cpp:67
-msgid "Constants Editor"
+#: functiontools.cpp:201
+#, kde-format
+msgid "Minimum is at x = %1, %2(x) = %3"
 msgstr ""
 
-#: kconstanteditor.cpp:135
-msgid "Check this to have the constant exported when saving."
+#: functiontools.cpp:215
+#, kde-format
+msgid "Maximum is at x = %1, %2(x) = %3"
 msgstr ""
 
-#: kconstanteditor.cpp:138
-msgid ""
-"Check this to have the constant permanently available between instances of "
-"KmPlot."
+#: functiontools.cpp:234
+#, kde-format
+msgid "Area is %1"
 msgstr ""
 
-#: parser.cpp:676
+#: parser.cpp:675
 msgid "Remove all"
 msgstr ""
 
-#: parser.cpp:678
+#: parser.cpp:677
 #, kde-format
 msgid ""
 "The function %1 is depended upon by the following functions: %2. These must "
 "be removed in addition."
 msgstr ""
 
-#: parser.cpp:1198
+#: parser.cpp:1197
 msgid "Syntax error"
 msgstr ""
 
-#: parser.cpp:1201
+#: parser.cpp:1200
 msgid "Missing parenthesis"
 msgstr ""
 
-#: parser.cpp:1204
+#: parser.cpp:1203
 msgid "Stack overflow"
 msgstr ""
 
-#: parser.cpp:1207
+#: parser.cpp:1206
 msgid "Name of function is not free"
 msgstr ""
 
-#: parser.cpp:1210
+#: parser.cpp:1209
 msgid "recursive function not allowed"
 msgstr ""
 
-#: parser.cpp:1213
+#: parser.cpp:1212
 msgid "Empty function"
 msgstr ""
 
-#: parser.cpp:1216
+#: parser.cpp:1215
 msgid "Function could not be found"
 msgstr ""
 
-#: parser.cpp:1219
+#: parser.cpp:1218
 msgid "The differential equation must be at least first-order"
 msgstr ""
 
-#: parser.cpp:1222
+#: parser.cpp:1221
 msgid "Too many plus-minus symbols"
 msgstr ""
 
-#: parser.cpp:1225
+#: parser.cpp:1224
 msgid "Invalid plus-minus symbol (expression must be constant)"
 msgstr ""
 
-#: parser.cpp:1228
+#: parser.cpp:1227
 msgid "The function has too many arguments"
 msgstr ""
 
-#: parser.cpp:1231
+#: parser.cpp:1230
 msgid "The function does not have the correct number of arguments"
 msgstr ""
 
-#: main.cpp:42
-msgid "Mathematical function plotter for KDE"
+#: kprinterdlg.cpp:44
+msgid "KmPlot Options"
 msgstr ""
 
-#: main.cpp:49
-msgid "KmPlot"
-msgstr "KmPlot"
+#: kprinterdlg.cpp:50
+msgid "Print header table"
+msgstr ""
 
-#: main.cpp:51
-msgid "(c) 2000-2002, Klaus-Dieter Möller"
+#: kprinterdlg.cpp:51
+msgid "Transparent background"
+msgstr "Cefndir tryloyw"
+
+#: kprinterdlg.cpp:60
+msgid "Pixels (1/72nd in)"
 msgstr ""
 
-#: main.cpp:56
-msgid "Klaus-Dieter Möller"
+#: kprinterdlg.cpp:61
+msgid "Inches (in)"
 msgstr ""
 
-#: main.cpp:56
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
+#: kprinterdlg.cpp:62
+msgid "Centimeters (cm)"
+msgstr ""
 
-#: main.cpp:59
-msgid "Matthias Meßmer"
+#: kprinterdlg.cpp:63
+msgid "Millimeters (mm)"
 msgstr ""
 
-#: main.cpp:59
-msgid "GUI"
+#: kprinterdlg.cpp:67
+msgid "Width:"
 msgstr ""
 
-#: main.cpp:61
-msgid "Fredrik Edemar"
+#: kprinterdlg.cpp:68
+msgid "Height:"
 msgstr ""
 
-#: main.cpp:61
-msgid "Various improvements"
-msgstr "Amrywiaeth o welliannau"
+#: kprinterdlg.cpp:138
+msgid "Width is invalid"
+msgstr ""
 
-#: main.cpp:62
-msgid "David Saxton"
+#: kprinterdlg.cpp:145
+msgid "Height is invalid"
 msgstr ""
 
-#: main.cpp:62
-msgid "Porting to Qt 4, UI improvements, features"
+#: kmplot.cpp:83
+msgid "Could not find KmPlot's part."
 msgstr ""
 
-#: main.cpp:64
-msgid "David Vignoni"
+#: kmplot.cpp:190 maindlg.cpp:519
+msgid ""
+"*.fkt|KmPlot Files (*.fkt)\n"
+"*|All Files"
 msgstr ""
 
-#: main.cpp:64
-msgid "svg icon"
-msgstr "eicon SVG"
+#: kmplot.cpp:190
+msgid "Open"
+msgstr ""
 
-#: main.cpp:65
-msgid "Albert Astals Cid"
+#: kconstanteditor.cpp:67
+msgid "Constants Editor"
 msgstr ""
 
-#: main.cpp:65
-msgid "command line options, MIME type"
+#: kconstanteditor.cpp:135
+msgid "Check this to have the constant exported when saving."
 msgstr ""
 
-#: main.cpp:71
-msgid "Initial functions to plot"
+#: kconstanteditor.cpp:138
+msgid ""
+"Check this to have the constant permanently available between instances of "
+"KmPlot."
 msgstr ""
 
-#: main.cpp:72
-msgid "File to open"
-msgstr "Ffeil i agor"
+#: plotstylewidget.cpp:44
+msgid "Solid"
+msgstr ""
+
+#: plotstylewidget.cpp:45
+msgid "Dash"
+msgstr ""
+
+#: plotstylewidget.cpp:46
+msgid "Dot"
+msgstr ""
+
+#: plotstylewidget.cpp:47
+msgid "Dash Dot"
+msgstr ""
+
+#: plotstylewidget.cpp:48
+msgid "Dash Dot Dot"
+msgstr ""
+
+#: plotstylewidget.cpp:59
+msgid "Advanced..."
+msgstr ""
+
+#: plotstylewidget.cpp:63
+msgid "Color:"
+msgstr "Lliw:"
+
+#: plotstylewidget.cpp:73
+msgid "Plot Appearance"
+msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, SettingsPageGeneral)
-#: rc.cpp:1189 rc.cpp:2169 maindlg.cpp:210 rc.cpp:1189 rc.cpp:2169
+#: maindlg.cpp:210 rc.cpp:919 rc.cpp:919
 msgid "General"
 msgstr "Cyffredinol"
 
@@ -283,7 +262,7 @@
 
 #. i18n: file: settingspagediagram.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, SettingsPageDiagram)
-#: rc.cpp:1078 rc.cpp:2058 maindlg.cpp:211 rc.cpp:1078 rc.cpp:2058
+#: maindlg.cpp:211 rc.cpp:808 rc.cpp:808
 msgid "Diagram"
 msgstr ""
 
@@ -303,75 +282,75 @@
 msgid "Configure KmPlot..."
 msgstr ""
 
-#: maindlg.cpp:251
+#: maindlg.cpp:248
 msgid "E&xport..."
 msgstr "&Allforio..."
 
-#: maindlg.cpp:265
+#: maindlg.cpp:262
 msgid "&Coordinate System..."
 msgstr ""
 
-#: maindlg.cpp:270
+#: maindlg.cpp:267
 msgid "&Constants..."
 msgstr ""
 
-#: maindlg.cpp:280
+#: maindlg.cpp:277
 msgid "Zoom &In"
 msgstr "Ne&sàu"
 
-#: maindlg.cpp:286
+#: maindlg.cpp:283
 msgid "Zoom &Out"
 msgstr "Pell&hàu"
 
-#: maindlg.cpp:292
+#: maindlg.cpp:289
 msgid "&Fit Widget to Trigonometric Functions"
 msgstr ""
 
-#: maindlg.cpp:296
+#: maindlg.cpp:293
 msgid "Reset View"
 msgstr ""
 
-#: calculator.cpp:43 maindlg.cpp:304
+#: maindlg.cpp:301 calculator.cpp:43
 msgid "Calculator"
 msgstr ""
 
-#: maindlg.cpp:309
+#: maindlg.cpp:306
 msgid "Plot &Area..."
 msgstr ""
 
-#: maindlg.cpp:313
+#: maindlg.cpp:310
 msgid "Find Ma&ximum..."
 msgstr ""
 
-#: maindlg.cpp:318
+#: maindlg.cpp:315
 msgid "Find Mi&nimum..."
 msgstr ""
 
-#: maindlg.cpp:326
+#: maindlg.cpp:323
 msgid "Predefined &Math Functions"
 msgstr ""
 
-#: maindlg.cpp:334
+#: maindlg.cpp:331
 msgid "Cartesian Plot"
 msgstr ""
 
-#: maindlg.cpp:340
+#: maindlg.cpp:337
 msgid "Parametric Plot"
 msgstr ""
 
-#: maindlg.cpp:346
+#: maindlg.cpp:343
 msgid "Polar Plot"
 msgstr ""
 
-#: maindlg.cpp:352
+#: maindlg.cpp:349
 msgid "Implicit Plot"
 msgstr ""
 
-#: maindlg.cpp:358
+#: maindlg.cpp:355
 msgid "Differential Plot"
 msgstr ""
 
-#: maindlg.cpp:368
+#: maindlg.cpp:365
 msgid "Show Sliders"
 msgstr ""
 
@@ -383,330 +362,163 @@
 #. i18n: ectx: Menu (edit)
 #. i18n: file: kmplot_part_readonly.rc:9
 #. i18n: ectx: Menu (edit)
-#. i18n: file: kmplot_part.rc:13
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kmplot_part_readonly.rc:9
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kmplot_part.rc:13
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kmplot_part_readonly.rc:9
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:757 rc.cpp:772 rc.cpp:2459 rc.cpp:2474 maindlg.cpp:374 rc.cpp:757
-#: rc.cpp:772 rc.cpp:2459 rc.cpp:2474
+#: maindlg.cpp:371 rc.cpp:1212 rc.cpp:1224 rc.cpp:1212 rc.cpp:1224
 msgid "&Edit"
 msgstr ""
 
-#: maindlg.cpp:381
+#: maindlg.cpp:378
 msgid "&Hide"
 msgstr "Cudd&io"
 
-#: maindlg.cpp:386
+#: maindlg.cpp:383
 msgid "&Remove"
 msgstr ""
 
-#: maindlg.cpp:394
+#: maindlg.cpp:391
 msgid "Animate Plot..."
 msgstr ""
 
-#: maindlg.cpp:478
+#: maindlg.cpp:475
 msgid ""
 "The plot has been modified.\n"
 "Do you want to save it?"
 msgstr ""
 
-#: maindlg.cpp:508
+#: maindlg.cpp:505
 msgid ""
 "This file is saved with an old file format; if you save it, you cannot open "
 "the file with older versions of KmPlot. Are you sure you want to continue?"
 msgstr ""
 
-#: maindlg.cpp:508
+#: maindlg.cpp:505
 msgid "Save New Format"
 msgstr ""
 
-#: maindlg.cpp:522
+#: maindlg.cpp:519
 msgid "Save As"
 msgstr ""
 
-#: kparametereditor.cpp:287 maindlg.cpp:532 maindlg.cpp:563
+#: maindlg.cpp:529 maindlg.cpp:560 kparametereditor.cpp:287
 #, kde-format
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to continue and "
 "overwrite this file?"
 msgstr ""
 
-#: kparametereditor.cpp:287 maindlg.cpp:532 maindlg.cpp:563
+#: maindlg.cpp:529 maindlg.cpp:560 kparametereditor.cpp:287
 msgid "Overwrite File?"
 msgstr "Trosysgrifo'r Ffeil?"
 
-#: kparametereditor.cpp:287 maindlg.cpp:532 maindlg.cpp:563
+#: maindlg.cpp:529 maindlg.cpp:560 kparametereditor.cpp:287
 msgid "&Overwrite"
 msgstr "&Trosysgrifo"
 
-#: maindlg.cpp:539
+#: maindlg.cpp:536
 msgid "The file could not be saved"
 msgstr ""
 
-#: maindlg.cpp:552
+#: maindlg.cpp:549
 msgid ""
 "\n"
 "*.svg|Scalable Vector Graphics"
 msgstr ""
 
-#: maindlg.cpp:554
+#: maindlg.cpp:551
 msgid "Export as Image"
 msgstr ""
 
-#: maindlg.cpp:576
+#: maindlg.cpp:573
 msgid "Sorry, this file format is not supported."
 msgstr ""
 
-#: maindlg.cpp:627
+#: maindlg.cpp:624
 #, kde-format
 msgid "Sorry, something went wrong while saving to image \"%1\""
 msgstr ""
 
-#: maindlg.cpp:684
+#: maindlg.cpp:681
 msgid "Print Plot"
 msgstr ""
 
-#: maindlg.cpp:844
+#: maindlg.cpp:831
 msgid "KmPlotPart"
 msgstr "KmPlotPart"
 
-#: kprinterdlg.cpp:44
-msgid "KmPlot Options"
+#: view.cpp:2380 view.cpp:2381
+msgid "  to  "
 msgstr ""
 
-#: kprinterdlg.cpp:50
-msgid "Print header table"
+#. i18n: file: functioneditorwidget.ui:184
+#. i18n: ectx: property (title), widget (ParametersWidget, cartesianParameters)
+#. i18n: file: functioneditorwidget.ui:535
+#. i18n: ectx: property (title), widget (ParametersWidget, parametricParameters)
+#. i18n: file: functioneditorwidget.ui:640
+#. i18n: ectx: property (title), widget (ParametersWidget, polarParameters)
+#. i18n: file: functioneditorwidget.ui:714
+#. i18n: ectx: property (title), widget (ParametersWidget, implicitParameters)
+#. i18n: file: functioneditorwidget.ui:796
+#. i18n: ectx: property (title), widget (ParametersWidget, differentialParameters)
+#. i18n: file: parameterswidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ParametersWidget)
+#. i18n: file: functioneditorwidget.ui:184
+#. i18n: ectx: property (title), widget (ParametersWidget, cartesianParameters)
+#. i18n: file: functioneditorwidget.ui:535
+#. i18n: ectx: property (title), widget (ParametersWidget, parametricParameters)
+#. i18n: file: functioneditorwidget.ui:640
+#. i18n: ectx: property (title), widget (ParametersWidget, polarParameters)
+#. i18n: file: functioneditorwidget.ui:714
+#. i18n: ectx: property (title), widget (ParametersWidget, implicitParameters)
+#. i18n: file: functioneditorwidget.ui:796
+#. i18n: ectx: property (title), widget (ParametersWidget, differentialParameters)
+#. i18n: file: parameterswidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ParametersWidget)
+#: view.cpp:2387 rc.cpp:263 rc.cpp:390 rc.cpp:427 rc.cpp:456 rc.cpp:484
+#: rc.cpp:586 rc.cpp:263 rc.cpp:390 rc.cpp:427 rc.cpp:456 rc.cpp:484
+#: rc.cpp:586
+msgid "Parameters"
 msgstr ""
 
-#: kprinterdlg.cpp:51
-msgid "Transparent background"
-msgstr "Cefndir tryloyw"
-
-#: kprinterdlg.cpp:60
-msgid "Pixels (1/72nd in)"
-msgstr ""
-
-#: kprinterdlg.cpp:61
-msgid "Inches (in)"
-msgstr ""
-
-#: kprinterdlg.cpp:62
-msgid "Centimeters (cm)"
-msgstr ""
-
-#: kprinterdlg.cpp:63
-msgid "Millimeters (mm)"
-msgstr ""
-
-#: kprinterdlg.cpp:67
-msgid "Width:"
-msgstr ""
-
-#: kprinterdlg.cpp:68
-msgid "Height:"
-msgstr ""
-
-#: kprinterdlg.cpp:138
-msgid "Width is invalid"
-msgstr ""
-
-#: kprinterdlg.cpp:145
-msgid "Height is invalid"
-msgstr ""
-
-#: xparser.cpp:143
-msgid "Error in extension."
-msgstr ""
-
-#: parameterswidget.cpp:39
-#, kde-format
-msgid "Slider No. %1"
-msgstr ""
-
-#: kgradientdialog.cpp:383
-msgid "(Double-click on the gradient to add a stop)"
-msgstr ""
-
-#: kgradientdialog.cpp:384
-msgid "Remove stop"
-msgstr ""
-
-#: kgradientdialog.cpp:405
-msgid "Choose a Gradient"
-msgstr ""
-
-#: equationeditor.cpp:40
-msgid "Equation Editor"
-msgstr ""
-
-#. i18n: file: qparametereditor.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, QParameterEditor)
-#: rc.cpp:904 rc.cpp:1884 kparametereditor.cpp:51 rc.cpp:904 rc.cpp:1884
-msgid "Parameter Editor"
-msgstr ""
-
-#: kparametereditor.cpp:213 kparametereditor.cpp:283
-msgid "*.txt|Plain Text File "
-msgstr ""
-
-#: kparametereditor.cpp:219 kmplotio.cpp:342
-msgid "The file does not exist."
-msgstr ""
-
-#: kparametereditor.cpp:230 kparametereditor.cpp:272
-msgid "An error appeared when opening this file"
-msgstr ""
-
-#: kparametereditor.cpp:259
-#, kde-format
-msgid ""
-"Line %1 is not a valid parameter value and will therefore not be included. "
-"Do you want to continue?"
-msgstr ""
-
-#: kparametereditor.cpp:265
-msgid "Would you like to be informed about other lines that cannot be read?"
-msgstr ""
-
-#: kparametereditor.cpp:265
-msgid "Get Informed"
-msgstr ""
-
-#: kparametereditor.cpp:265
-msgid "Ignore Information"
-msgstr ""
-
-#: kparametereditor.cpp:306 kparametereditor.cpp:310 kparametereditor.cpp:332
-msgid "An error appeared when saving this file"
-msgstr ""
-
-#: plotstylewidget.cpp:44
-msgid "Solid"
-msgstr ""
-
-#: plotstylewidget.cpp:45
-msgid "Dash"
-msgstr ""
-
-#: plotstylewidget.cpp:46
-msgid "Dot"
-msgstr ""
-
-#: plotstylewidget.cpp:47
-msgid "Dash Dot"
-msgstr ""
-
-#: plotstylewidget.cpp:48
-msgid "Dash Dot Dot"
-msgstr ""
-
-#: plotstylewidget.cpp:59
-msgid "Advanced..."
-msgstr ""
-
-#: plotstylewidget.cpp:63
-msgid "Color:"
-msgstr "Lliw:"
-
-#: plotstylewidget.cpp:73
-msgid "Plot Appearance"
-msgstr ""
-
-#: kmplotio.cpp:322
-msgid "The file had an unknown version number"
-msgstr ""
-
-#: kmplotio.cpp:348
-#, kde-format
-msgid "An error appeared when opening this file (%1)"
-msgstr ""
-
-#: kmplotio.cpp:358
-#, kde-format
-msgid "%1 could not be opened"
-msgstr ""
-
-#: kmplotio.cpp:365
-#, kde-format
-msgid "%1 could not be loaded (%2 at line %3, column %4)"
-msgstr ""
-
-#: kmplotio.cpp:435
-msgid "automatic"
-msgstr "awtomatig"
-
-#: kmplotio.cpp:790
-#, kde-format
-msgid "The function %1 could not be loaded"
-msgstr ""
-
-#: ksliderwindow.cpp:37
-#, kde-format
-msgid "Slider %1"
-msgstr ""
-
-#: ksliderwindow.cpp:43
-msgid ""
-"Move slider to change the parameter of the function plot connected to this "
-"slider."
-msgstr ""
-
-#: ksliderwindow.cpp:94
-msgid "Sliders"
-msgstr ""
-
-#: functiontools.cpp:71 functiontools.cpp:78
-msgid "Search between:"
-msgstr ""
-
-#: functiontools.cpp:72
-msgid "Find Minimum Point"
+#: view.cpp:2387
+msgid "Plotting Range"
 msgstr ""
 
-#: functiontools.cpp:79
-msgid "Find Maximum Point"
+#: view.cpp:2387
+msgid "Axes Division"
 msgstr ""
 
-#: functiontools.cpp:85
-msgid "Calculate the area between:"
+#: view.cpp:2388
+msgid "x-Axis:"
 msgstr ""
 
-#: functiontools.cpp:86
-msgid "Area Under Graph"
-msgstr ""
+#: view.cpp:2389
+msgid "y-Axis:"
+msgstr "Echelin-Y :"
 
-#: functiontools.cpp:201
-#, kde-format
-msgid "Minimum is at x = %1, %2(x) = %3"
-msgstr ""
+#: view.cpp:2392
+msgid "Functions:"
+msgstr "Ffwythiannau :"
 
-#: functiontools.cpp:215
-#, kde-format
-msgid "Maximum is at x = %1, %2(x) = %3"
-msgstr ""
+#: view.cpp:3469
+msgid "root"
+msgstr "gwraidd"
 
-#: functiontools.cpp:234
-#, kde-format
-msgid "Area is %1"
+#: parameteranimator.cpp:62
+msgid "Parameter Animator"
 msgstr ""
 
-#: rc.cpp:1249 rc.cpp:1249
+#: rc.cpp:1 rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: rc.cpp:1250 rc.cpp:1250
+#: rc.cpp:2 rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: constantseditor.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, ConstantsEditor)
-#: rc.cpp:3 rc.cpp:1253 rc.cpp:3 rc.cpp:1253
+#: rc.cpp:5 rc.cpp:5
 msgid "Constant Editor"
 msgstr ""
 
@@ -718,16 +530,7 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, valueInvalidLabel)
 #. i18n: file: qparametereditor.ui:22
 #. i18n: ectx: property (toolTip), widget (QLabel, valueInvalidLabel)
-#. i18n: file: constantseditor.ui:26
-#. i18n: ectx: property (toolTip), widget (QLabel, valueInvalidLabel)
-#. i18n: file: qparametereditor.ui:22
-#. i18n: ectx: property (toolTip), widget (QLabel, valueInvalidLabel)
-#. i18n: file: constantseditor.ui:26
-#. i18n: ectx: property (toolTip), widget (QLabel, valueInvalidLabel)
-#. i18n: file: qparametereditor.ui:22
-#. i18n: ectx: property (toolTip), widget (QLabel, valueInvalidLabel)
-#: rc.cpp:6 rc.cpp:907 rc.cpp:1256 rc.cpp:1887 rc.cpp:6 rc.cpp:907 rc.cpp:1256
-#: rc.cpp:1887
+#: rc.cpp:8 rc.cpp:637 rc.cpp:8 rc.cpp:637
 msgid "The value must be a number (e.g. \"pi^2\")"
 msgstr ""
 
@@ -739,34 +542,25 @@
 #. i18n: ectx: property (text), widget (QLabel, valueInvalidLabel)
 #. i18n: file: qparametereditor.ui:25
 #. i18n: ectx: property (text), widget (QLabel, valueInvalidLabel)
-#. i18n: file: constantseditor.ui:29
-#. i18n: ectx: property (text), widget (QLabel, valueInvalidLabel)
-#. i18n: file: qparametereditor.ui:25
-#. i18n: ectx: property (text), widget (QLabel, valueInvalidLabel)
-#. i18n: file: constantseditor.ui:29
-#. i18n: ectx: property (text), widget (QLabel, valueInvalidLabel)
-#. i18n: file: qparametereditor.ui:25
-#. i18n: ectx: property (text), widget (QLabel, valueInvalidLabel)
-#: rc.cpp:9 rc.cpp:910 rc.cpp:1259 rc.cpp:1890 rc.cpp:9 rc.cpp:910 rc.cpp:1259
-#: rc.cpp:1890
+#: rc.cpp:11 rc.cpp:640 rc.cpp:11 rc.cpp:640
 msgid "(invalid)"
 msgstr ""
 
 #. i18n: file: constantseditor.ui:54
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:12 rc.cpp:1262 rc.cpp:12 rc.cpp:1262
+#: rc.cpp:14 rc.cpp:14
 msgid "Value:"
 msgstr "Gwerth:"
 
 #. i18n: file: constantseditor.ui:64
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:15 rc.cpp:1265 rc.cpp:15 rc.cpp:1265
+#: rc.cpp:17 rc.cpp:17
 msgid "Constant:"
 msgstr ""
 
 #. i18n: file: constantseditor.ui:74
 #. i18n: ectx: property (toolTip), widget (EquationEdit, valueEdit)
-#: rc.cpp:18 rc.cpp:1268 rc.cpp:18 rc.cpp:1268
+#: rc.cpp:20 rc.cpp:20
 msgid "Enter an expression that evaluates to a number"
 msgstr ""
 
@@ -778,16 +572,7 @@
 #. i18n: ectx: property (toolTip), widget (QPushButton, cmdNew)
 #. i18n: file: qparametereditor.ui:39
 #. i18n: ectx: property (toolTip), widget (KPushButton, cmdNew)
-#. i18n: file: constantseditor.ui:83
-#. i18n: ectx: property (toolTip), widget (QPushButton, cmdNew)
-#. i18n: file: qparametereditor.ui:39
-#. i18n: ectx: property (toolTip), widget (KPushButton, cmdNew)
-#. i18n: file: constantseditor.ui:83
-#. i18n: ectx: property (toolTip), widget (QPushButton, cmdNew)
-#. i18n: file: qparametereditor.ui:39
-#. i18n: ectx: property (toolTip), widget (KPushButton, cmdNew)
-#: rc.cpp:21 rc.cpp:913 rc.cpp:1271 rc.cpp:1893 rc.cpp:21 rc.cpp:913
-#: rc.cpp:1271 rc.cpp:1893
+#: rc.cpp:23 rc.cpp:643 rc.cpp:23 rc.cpp:643
 msgid "Add a new constant"
 msgstr ""
 
@@ -799,16 +584,7 @@
 #. i18n: ectx: property (whatsThis), widget (QPushButton, cmdNew)
 #. i18n: file: qparametereditor.ui:42
 #. i18n: ectx: property (whatsThis), widget (KPushButton, cmdNew)
-#. i18n: file: constantseditor.ui:86
-#. i18n: ectx: property (whatsThis), widget (QPushButton, cmdNew)
-#. i18n: file: qparametereditor.ui:42
-#. i18n: ectx: property (whatsThis), widget (KPushButton, cmdNew)
-#. i18n: file: constantseditor.ui:86
-#. i18n: ectx: property (whatsThis), widget (QPushButton, cmdNew)
-#. i18n: file: qparametereditor.ui:42
-#. i18n: ectx: property (whatsThis), widget (KPushButton, cmdNew)
-#: rc.cpp:24 rc.cpp:916 rc.cpp:1274 rc.cpp:1896 rc.cpp:24 rc.cpp:916
-#: rc.cpp:1274 rc.cpp:1896
+#: rc.cpp:26 rc.cpp:646 rc.cpp:26 rc.cpp:646
 msgid "Click this button to add a new constant."
 msgstr ""
 
@@ -820,46 +596,37 @@
 #. i18n: ectx: property (text), widget (QPushButton, cmdNew)
 #. i18n: file: qparametereditor.ui:45
 #. i18n: ectx: property (text), widget (KPushButton, cmdNew)
-#. i18n: file: constantseditor.ui:89
-#. i18n: ectx: property (text), widget (QPushButton, cmdNew)
-#. i18n: file: qparametereditor.ui:45
-#. i18n: ectx: property (text), widget (KPushButton, cmdNew)
-#. i18n: file: constantseditor.ui:89
-#. i18n: ectx: property (text), widget (QPushButton, cmdNew)
-#. i18n: file: qparametereditor.ui:45
-#. i18n: ectx: property (text), widget (KPushButton, cmdNew)
-#: rc.cpp:27 rc.cpp:919 rc.cpp:1277 rc.cpp:1899 rc.cpp:27 rc.cpp:919
-#: rc.cpp:1277 rc.cpp:1899
+#: rc.cpp:29 rc.cpp:649 rc.cpp:29 rc.cpp:649
 msgid "&New"
 msgstr ""
 
 #. i18n: file: constantseditor.ui:103
 #. i18n: ectx: property (text), widget (QTreeWidget, constantList)
-#: rc.cpp:30 rc.cpp:1280 rc.cpp:30 rc.cpp:1280
+#: rc.cpp:32 rc.cpp:32
 msgid "Constant"
 msgstr ""
 
 #. i18n: file: constantseditor.ui:108
 #. i18n: ectx: property (text), widget (QTreeWidget, constantList)
-#: rc.cpp:33 rc.cpp:1283 rc.cpp:33 rc.cpp:1283
+#: rc.cpp:35 rc.cpp:35
 msgid "Value"
 msgstr "Gwerth"
 
 #. i18n: file: constantseditor.ui:113
 #. i18n: ectx: property (text), widget (QTreeWidget, constantList)
-#: rc.cpp:36 rc.cpp:1286 rc.cpp:36 rc.cpp:1286
+#: rc.cpp:38 rc.cpp:38
 msgid "Document"
 msgstr ""
 
 #. i18n: file: constantseditor.ui:118
 #. i18n: ectx: property (text), widget (QTreeWidget, constantList)
-#: rc.cpp:39 rc.cpp:1289 rc.cpp:39 rc.cpp:1289
+#: rc.cpp:41 rc.cpp:41
 msgid "Global"
 msgstr ""
 
 #. i18n: file: constantseditor.ui:142
 #. i18n: ectx: property (toolTip), widget (QPushButton, cmdDelete)
-#: rc.cpp:42 rc.cpp:1292 rc.cpp:42 rc.cpp:1292
+#: rc.cpp:44 rc.cpp:44
 msgid "Delete the selected constant"
 msgstr ""
 
@@ -871,16 +638,7 @@
 #. i18n: ectx: property (whatsThis), widget (QPushButton, cmdDelete)
 #. i18n: file: qparametereditor.ui:58
 #. i18n: ectx: property (whatsThis), widget (KPushButton, cmdDelete)
-#. i18n: file: constantseditor.ui:145
-#. i18n: ectx: property (whatsThis), widget (QPushButton, cmdDelete)
-#. i18n: file: qparametereditor.ui:58
-#. i18n: ectx: property (whatsThis), widget (KPushButton, cmdDelete)
-#. i18n: file: constantseditor.ui:145
-#. i18n: ectx: property (whatsThis), widget (QPushButton, cmdDelete)
-#. i18n: file: qparametereditor.ui:58
-#. i18n: ectx: property (whatsThis), widget (KPushButton, cmdDelete)
-#: rc.cpp:45 rc.cpp:925 rc.cpp:1295 rc.cpp:1905 rc.cpp:45 rc.cpp:925
-#: rc.cpp:1295 rc.cpp:1905
+#: rc.cpp:47 rc.cpp:655 rc.cpp:47 rc.cpp:655
 msgid ""
 "Click here to delete the selected constant; it can only be removed if it is "
 "not currently used by a plot."
@@ -898,57 +656,16 @@
 #. i18n: ectx: property (text), widget (QPushButton, deleteButton)
 #. i18n: file: qparametereditor.ui:61
 #. i18n: ectx: property (text), widget (KPushButton, cmdDelete)
-#. i18n: file: constantseditor.ui:148
-#. i18n: ectx: property (text), widget (QPushButton, cmdDelete)
-#. i18n: file: functioneditorwidget.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
-#. i18n: file: qparametereditor.ui:61
-#. i18n: ectx: property (text), widget (KPushButton, cmdDelete)
-#. i18n: file: constantseditor.ui:148
-#. i18n: ectx: property (text), widget (QPushButton, cmdDelete)
-#. i18n: file: functioneditorwidget.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
-#. i18n: file: qparametereditor.ui:61
-#. i18n: ectx: property (text), widget (KPushButton, cmdDelete)
-#: rc.cpp:48 rc.cpp:219 rc.cpp:928 rc.cpp:1298 rc.cpp:1469 rc.cpp:1908
-#: rc.cpp:48 rc.cpp:219 rc.cpp:928 rc.cpp:1298 rc.cpp:1469 rc.cpp:1908
-msgid "&Delete"
-msgstr ""
-
-#. i18n: file: editcoords.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:51 rc.cpp:1301 rc.cpp:51 rc.cpp:1301
-msgid "Horizontal axis Range"
-msgstr ""
-
-#. i18n: file: editcoords.ui:32
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#. i18n: file: editcoords.ui:116
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_3)
-#. i18n: file: functioneditorwidget.ui:135
-#. i18n: ectx: property (text), widget (QCheckBox, cartesianCustomMax)
-#. i18n: file: functioneditorwidget.ui:496
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: functioneditorwidget.ui:627
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: functiontools.ui:49
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: sliderwidget.ui:80
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: editcoords.ui:32
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#. i18n: file: editcoords.ui:116
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_3)
-#. i18n: file: functioneditorwidget.ui:135
-#. i18n: ectx: property (text), widget (QCheckBox, cartesianCustomMax)
-#. i18n: file: functioneditorwidget.ui:496
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: functioneditorwidget.ui:627
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: functiontools.ui:49
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: sliderwidget.ui:80
-#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:50 rc.cpp:221 rc.cpp:658 rc.cpp:50 rc.cpp:221 rc.cpp:658
+msgid "&Delete"
+msgstr ""
+
+#. i18n: file: editcoords.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:53 rc.cpp:53
+msgid "Horizontal axis Range"
+msgstr ""
+
 #. i18n: file: editcoords.ui:32
 #. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
 #. i18n: file: editcoords.ui:116
@@ -977,11 +694,8 @@
 #. i18n: ectx: property (text), widget (QLabel, label_5)
 #. i18n: file: sliderwidget.ui:80
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:54 rc.cpp:84 rc.cpp:237 rc.cpp:373 rc.cpp:422 rc.cpp:508 rc.cpp:1248
-#: rc.cpp:1304 rc.cpp:1334 rc.cpp:1487 rc.cpp:1623 rc.cpp:1672 rc.cpp:1758
-#: rc.cpp:2228 rc.cpp:54 rc.cpp:84 rc.cpp:237 rc.cpp:373 rc.cpp:422 rc.cpp:508
-#: rc.cpp:1248 rc.cpp:1304 rc.cpp:1334 rc.cpp:1487 rc.cpp:1623 rc.cpp:1672
-#: rc.cpp:1758 rc.cpp:2228
+#: rc.cpp:56 rc.cpp:86 rc.cpp:239 rc.cpp:375 rc.cpp:424 rc.cpp:508 rc.cpp:978
+#: rc.cpp:56 rc.cpp:86 rc.cpp:239 rc.cpp:375 rc.cpp:424 rc.cpp:508 rc.cpp:978
 msgid "Max:"
 msgstr "Uchaf :"
 
@@ -1001,25 +715,8 @@
 #. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_YMax)
 #. i18n: file: editcoords.ui:129
 #. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_YMin)
-#. i18n: file: editcoords.ui:45
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_XMax)
-#. i18n: file: editcoords.ui:55
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_XMin)
-#. i18n: file: editcoords.ui:93
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_YMax)
-#. i18n: file: editcoords.ui:129
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_YMin)
-#. i18n: file: editcoords.ui:45
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_XMax)
-#. i18n: file: editcoords.ui:55
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_XMin)
-#. i18n: file: editcoords.ui:93
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_YMax)
-#. i18n: file: editcoords.ui:129
-#. i18n: ectx: property (toolTip), widget (EquationEdit, kcfg_YMin)
-#: rc.cpp:57 rc.cpp:63 rc.cpp:75 rc.cpp:87 rc.cpp:1307 rc.cpp:1313 rc.cpp:1325
-#: rc.cpp:1337 rc.cpp:57 rc.cpp:63 rc.cpp:75 rc.cpp:87 rc.cpp:1307 rc.cpp:1313
-#: rc.cpp:1325 rc.cpp:1337
+#: rc.cpp:59 rc.cpp:65 rc.cpp:77 rc.cpp:89 rc.cpp:59 rc.cpp:65 rc.cpp:77
+#: rc.cpp:89
 msgid "Custom boundary of the plot range"
 msgstr ""
 
@@ -1039,25 +736,8 @@
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_YMax)
 #. i18n: file: editcoords.ui:132
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_YMin)
-#. i18n: file: editcoords.ui:48
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_XMax)
-#. i18n: file: editcoords.ui:58
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_XMin)
-#. i18n: file: editcoords.ui:96
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_YMax)
-#. i18n: file: editcoords.ui:132
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_YMin)
-#. i18n: file: editcoords.ui:48
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_XMax)
-#. i18n: file: editcoords.ui:58
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_XMin)
-#. i18n: file: editcoords.ui:96
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_YMax)
-#. i18n: file: editcoords.ui:132
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, kcfg_YMin)
-#: rc.cpp:60 rc.cpp:66 rc.cpp:78 rc.cpp:90 rc.cpp:1310 rc.cpp:1316 rc.cpp:1328
-#: rc.cpp:1340 rc.cpp:60 rc.cpp:66 rc.cpp:78 rc.cpp:90 rc.cpp:1310 rc.cpp:1316
-#: rc.cpp:1328 rc.cpp:1340
+#: rc.cpp:62 rc.cpp:68 rc.cpp:80 rc.cpp:92 rc.cpp:62 rc.cpp:68 rc.cpp:80
+#: rc.cpp:92
 msgid "Enter a valid expression, for instance 2*pi or e/2."
 msgstr ""
 
@@ -1089,51 +769,20 @@
 #. i18n: ectx: property (text), widget (QLabel, label_4)
 #. i18n: file: sliderwidget.ui:57
 #. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: editcoords.ui:65
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: editcoords.ui:103
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_4)
-#. i18n: file: functioneditorwidget.ui:148
-#. i18n: ectx: property (text), widget (QCheckBox, cartesianCustomMin)
-#. i18n: file: functioneditorwidget.ui:486
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: functioneditorwidget.ui:617
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: functiontools.ui:29
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: sliderwidget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: editcoords.ui:65
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: editcoords.ui:103
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_4)
-#. i18n: file: functioneditorwidget.ui:148
-#. i18n: ectx: property (text), widget (QCheckBox, cartesianCustomMin)
-#. i18n: file: functioneditorwidget.ui:486
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: functioneditorwidget.ui:617
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: functiontools.ui:29
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: sliderwidget.ui:57
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:69 rc.cpp:81 rc.cpp:246 rc.cpp:370 rc.cpp:419 rc.cpp:499 rc.cpp:1245
-#: rc.cpp:1319 rc.cpp:1331 rc.cpp:1496 rc.cpp:1620 rc.cpp:1669 rc.cpp:1749
-#: rc.cpp:2225 rc.cpp:69 rc.cpp:81 rc.cpp:246 rc.cpp:370 rc.cpp:419 rc.cpp:499
-#: rc.cpp:1245 rc.cpp:1319 rc.cpp:1331 rc.cpp:1496 rc.cpp:1620 rc.cpp:1669
-#: rc.cpp:1749 rc.cpp:2225
+#: rc.cpp:71 rc.cpp:83 rc.cpp:248 rc.cpp:372 rc.cpp:421 rc.cpp:499 rc.cpp:975
+#: rc.cpp:71 rc.cpp:83 rc.cpp:248 rc.cpp:372 rc.cpp:421 rc.cpp:499 rc.cpp:975
 msgid "Min:"
 msgstr "Isaf :"
 
 #. i18n: file: editcoords.ui:81
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:72 rc.cpp:1322 rc.cpp:72 rc.cpp:1322
+#: rc.cpp:74 rc.cpp:74
 msgid "Vertical axis Range"
 msgstr ""
 
 #. i18n: file: editcoords.ui:142
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_XScalingMode)
-#: rc.cpp:93 rc.cpp:1343 rc.cpp:93 rc.cpp:1343
+#: rc.cpp:95 rc.cpp:95
 msgid "Horizontal axis Grid Spacing"
 msgstr ""
 
@@ -1145,16 +794,7 @@
 #. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton)
 #. i18n: file: editcoords.ui:184
 #. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton_3)
-#. i18n: file: editcoords.ui:148
-#. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton)
-#. i18n: file: editcoords.ui:184
-#. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton_3)
-#. i18n: file: editcoords.ui:148
-#. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton)
-#. i18n: file: editcoords.ui:184
-#. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton_3)
-#: rc.cpp:96 rc.cpp:108 rc.cpp:1346 rc.cpp:1358 rc.cpp:96 rc.cpp:108
-#: rc.cpp:1346 rc.cpp:1358
+#: rc.cpp:98 rc.cpp:110 rc.cpp:98 rc.cpp:110
 msgid ""
 "Automatic grid spacing is independent of zoom; there will be a fixed number "
 "of tics."
@@ -1168,16 +808,7 @@
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton)
 #. i18n: file: editcoords.ui:187
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_3)
-#. i18n: file: editcoords.ui:151
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton)
-#. i18n: file: editcoords.ui:187
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_3)
-#. i18n: file: editcoords.ui:151
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton)
-#. i18n: file: editcoords.ui:187
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_3)
-#: rc.cpp:99 rc.cpp:111 rc.cpp:1349 rc.cpp:1361 rc.cpp:99 rc.cpp:111
-#: rc.cpp:1349 rc.cpp:1361
+#: rc.cpp:101 rc.cpp:113 rc.cpp:101 rc.cpp:113
 msgid "Automatic"
 msgstr ""
 
@@ -1189,265 +820,247 @@
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_2)
 #. i18n: file: editcoords.ui:197
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_4)
-#. i18n: file: editcoords.ui:161
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_2)
-#. i18n: file: editcoords.ui:197
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_4)
-#. i18n: file: editcoords.ui:161
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_2)
-#. i18n: file: editcoords.ui:197
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_4)
-#: rc.cpp:102 rc.cpp:114 rc.cpp:1352 rc.cpp:1364 rc.cpp:102 rc.cpp:114
-#: rc.cpp:1352 rc.cpp:1364
+#: rc.cpp:104 rc.cpp:116 rc.cpp:104 rc.cpp:116
 msgid "Custom:"
 msgstr "Addasiedig:"
 
 #. i18n: file: editcoords.ui:178
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_YScalingMode)
-#: rc.cpp:105 rc.cpp:1355 rc.cpp:105 rc.cpp:1355
+#: rc.cpp:107 rc.cpp:107
 msgid "Vertical axis Grid Spacing"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:31
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:117 rc.cpp:1367 rc.cpp:117 rc.cpp:1367
+#: rc.cpp:119 rc.cpp:119
 msgid "Expression:"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:54
 #. i18n: ectx: property (text), widget (QPushButton, constantsButton)
-#: rc.cpp:120 rc.cpp:1370 rc.cpp:120 rc.cpp:1370
+#: rc.cpp:122 rc.cpp:122
 msgid "Edit Constants..."
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:75
 #. i18n: ectx: property (text), item, widget (KComboBox, constantList)
-#: rc.cpp:123 rc.cpp:1373 rc.cpp:123 rc.cpp:1373
+#: rc.cpp:125 rc.cpp:125
 msgid "Insert constant..."
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:84
 #. i18n: ectx: property (text), item, widget (KComboBox, functionList)
-#: rc.cpp:126 rc.cpp:1376 rc.cpp:126 rc.cpp:1376
+#: rc.cpp:128 rc.cpp:128
 msgid "Insert function..."
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:129
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_3)
-#: rc.cpp:129 rc.cpp:1379 rc.cpp:129 rc.cpp:1379
+#: rc.cpp:131 rc.cpp:131
 msgid "²"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:136
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_26)
-#: rc.cpp:132 rc.cpp:1382 rc.cpp:132 rc.cpp:1382
+#: rc.cpp:134 rc.cpp:134
 msgid "±"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:149
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_28)
-#: rc.cpp:135 rc.cpp:1385 rc.cpp:135 rc.cpp:1385
+#: rc.cpp:137 rc.cpp:137
 msgid "⁶"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:156
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_20)
-#: rc.cpp:138 rc.cpp:1388 rc.cpp:138 rc.cpp:1388
+#: rc.cpp:140 rc.cpp:140
 msgid "√"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:169
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_4)
-#: rc.cpp:141 rc.cpp:1391 rc.cpp:141 rc.cpp:1391
+#: rc.cpp:143 rc.cpp:143
 msgid "³"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:182
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_18)
-#: rc.cpp:144 rc.cpp:1394 rc.cpp:144 rc.cpp:1394
+#: rc.cpp:146 rc.cpp:146
 msgid "∣"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:189
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_19)
-#: rc.cpp:147 rc.cpp:1397 rc.cpp:147 rc.cpp:1397
+#: rc.cpp:149 rc.cpp:149
 msgid "≥"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:196
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_27)
-#: rc.cpp:150 rc.cpp:1400 rc.cpp:150 rc.cpp:1400
+#: rc.cpp:152 rc.cpp:152
 msgid "≤"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:209
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_25)
-#: rc.cpp:153 rc.cpp:1403 rc.cpp:153 rc.cpp:1403
+#: rc.cpp:155 rc.cpp:155
 msgid "⁵"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:222
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_5)
-#: rc.cpp:156 rc.cpp:1406 rc.cpp:156 rc.cpp:1406
+#: rc.cpp:158 rc.cpp:158
 msgid "⁴"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:261
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_2)
-#: rc.cpp:159 rc.cpp:1409 rc.cpp:159 rc.cpp:1409
+#: rc.cpp:161 rc.cpp:161
 msgid "π"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:268
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_16)
-#: rc.cpp:162 rc.cpp:1412 rc.cpp:162 rc.cpp:1412
+#: rc.cpp:164 rc.cpp:164
 msgid "ω"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:275
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_12)
-#: rc.cpp:165 rc.cpp:1415 rc.cpp:165 rc.cpp:1415
+#: rc.cpp:167 rc.cpp:167
 msgid "β"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:282
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_14)
-#: rc.cpp:168 rc.cpp:1418 rc.cpp:168 rc.cpp:1418
+#: rc.cpp:170 rc.cpp:170
 msgid "α"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:295
 #. i18n: ectx: property (text), widget (QToolButton, toolButton)
-#: rc.cpp:171 rc.cpp:1421 rc.cpp:171 rc.cpp:1421
+#: rc.cpp:173 rc.cpp:173
 msgid "λ"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:308
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_13)
-#: rc.cpp:174 rc.cpp:1424 rc.cpp:174 rc.cpp:1424
+#: rc.cpp:176 rc.cpp:176
 msgid "μ"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:315
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_15)
-#: rc.cpp:177 rc.cpp:1427 rc.cpp:177 rc.cpp:1427
+#: rc.cpp:179 rc.cpp:179
 msgid "φ"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:328
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_11)
-#: rc.cpp:180 rc.cpp:1430 rc.cpp:180 rc.cpp:1430
+#: rc.cpp:182 rc.cpp:182
 msgid "θ"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:361
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_24)
-#: rc.cpp:183 rc.cpp:1433 rc.cpp:183 rc.cpp:1433
+#: rc.cpp:185 rc.cpp:185
 msgid "⅘"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:368
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_21)
-#: rc.cpp:186 rc.cpp:1436 rc.cpp:186 rc.cpp:1436
+#: rc.cpp:188 rc.cpp:188
 msgid "⅕"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:375
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_8)
-#: rc.cpp:189 rc.cpp:1439 rc.cpp:189 rc.cpp:1439
+#: rc.cpp:191 rc.cpp:191
 msgid "¼"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:382
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_9)
-#: rc.cpp:192 rc.cpp:1442 rc.cpp:192 rc.cpp:1442
+#: rc.cpp:194 rc.cpp:194
 msgid "⅔"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:389
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_22)
-#: rc.cpp:195 rc.cpp:1445 rc.cpp:195 rc.cpp:1445
+#: rc.cpp:197 rc.cpp:197
 msgid "⅖"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:396
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_23)
-#: rc.cpp:198 rc.cpp:1448 rc.cpp:198 rc.cpp:1448
+#: rc.cpp:200 rc.cpp:200
 msgid "⅗"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:403
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_10)
-#: rc.cpp:201 rc.cpp:1451 rc.cpp:201 rc.cpp:1451
+#: rc.cpp:203 rc.cpp:203
 msgid "¾"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:410
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_7)
-#: rc.cpp:204 rc.cpp:1454 rc.cpp:204 rc.cpp:1454
+#: rc.cpp:206 rc.cpp:206
 msgid "½"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:417
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_6)
-#: rc.cpp:207 rc.cpp:1457 rc.cpp:207 rc.cpp:1457
+#: rc.cpp:209 rc.cpp:209
 msgid "⅓"
 msgstr ""
 
 #. i18n: file: equationeditorwidget.ui:424
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_17)
-#: rc.cpp:210 rc.cpp:1460 rc.cpp:210 rc.cpp:1460
+#: rc.cpp:212 rc.cpp:212
 msgid "⅙"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:50
 #. i18n: ectx: property (toolTip), widget (QPushButton, deleteButton)
-#: rc.cpp:213 rc.cpp:1463 rc.cpp:213 rc.cpp:1463
+#: rc.cpp:215 rc.cpp:215
 msgid "delete the selected function"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:53
 #. i18n: ectx: property (whatsThis), widget (QPushButton, deleteButton)
-#: rc.cpp:216 rc.cpp:1466 rc.cpp:216 rc.cpp:1466
+#: rc.cpp:218 rc.cpp:218
 msgid "Click here to delete the selected function from the list."
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:76
 #. i18n: ectx: property (text), widget (QPushButton, createNewPlot)
-#: rc.cpp:222 rc.cpp:1472 rc.cpp:222 rc.cpp:1472
+#: rc.cpp:224 rc.cpp:224
 msgid "Create"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:102
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: functioneditorwidget.ui:743
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: functioneditorwidget.ui:102
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: functioneditorwidget.ui:743
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: functioneditorwidget.ui:102
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: functioneditorwidget.ui:743
+#. i18n: file: functioneditorwidget.ui:742
 #. i18n: ectx: attribute (title), widget (QWidget, tab_4)
 #. i18n: file: functioneditorwidget.ui:102
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: functioneditorwidget.ui:743
+#. i18n: file: functioneditorwidget.ui:742
 #. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: rc.cpp:225 rc.cpp:461 rc.cpp:1475 rc.cpp:1711 rc.cpp:225 rc.cpp:461
-#: rc.cpp:1475 rc.cpp:1711
+#: rc.cpp:227 rc.cpp:462 rc.cpp:227 rc.cpp:462
 msgid "Function"
 msgstr "Ffwythiant"
 
 #. i18n: file: functioneditorwidget.ui:117
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:228 rc.cpp:1478 rc.cpp:228 rc.cpp:1478
+#: rc.cpp:230 rc.cpp:230
 msgid "Custom plot range"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:129
 #. i18n: ectx: property (toolTip), widget (QCheckBox, cartesianCustomMax)
-#: rc.cpp:231 rc.cpp:1481 rc.cpp:231 rc.cpp:1481
+#: rc.cpp:233 rc.cpp:233
 msgid "Customize the maximum plot range"
 msgstr ""
 
@@ -1459,28 +1072,19 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cartesianCustomMax)
 #. i18n: file: functioneditorwidget.ui:145
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cartesianCustomMin)
-#. i18n: file: functioneditorwidget.ui:132
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cartesianCustomMax)
-#. i18n: file: functioneditorwidget.ui:145
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cartesianCustomMin)
-#. i18n: file: functioneditorwidget.ui:132
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cartesianCustomMax)
-#. i18n: file: functioneditorwidget.ui:145
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cartesianCustomMin)
-#: rc.cpp:234 rc.cpp:243 rc.cpp:1484 rc.cpp:1493 rc.cpp:234 rc.cpp:243
-#: rc.cpp:1484 rc.cpp:1493
+#: rc.cpp:236 rc.cpp:245 rc.cpp:236 rc.cpp:245
 msgid "Check this button and enter the plot range boundaries below."
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:142
 #. i18n: ectx: property (toolTip), widget (QCheckBox, cartesianCustomMin)
-#: rc.cpp:240 rc.cpp:1490 rc.cpp:240 rc.cpp:1490
+#: rc.cpp:242 rc.cpp:242
 msgid "Customize the minimum plot range"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:158
 #. i18n: ectx: property (toolTip), widget (EquationEdit, cartesianMin)
-#: rc.cpp:249 rc.cpp:1499 rc.cpp:249 rc.cpp:1499
+#: rc.cpp:251 rc.cpp:251
 msgid "lower boundary of the plot range"
 msgstr ""
 
@@ -1500,25 +1104,8 @@
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, polarMin)
 #. i18n: file: functiontools.ui:42
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, min)
-#. i18n: file: functioneditorwidget.ui:161
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, cartesianMin)
-#. i18n: file: functioneditorwidget.ui:512
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, parametricMin)
-#. i18n: file: functioneditorwidget.ui:600
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, polarMin)
-#. i18n: file: functiontools.ui:42
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, min)
-#. i18n: file: functioneditorwidget.ui:161
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, cartesianMin)
-#. i18n: file: functioneditorwidget.ui:512
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, parametricMin)
-#. i18n: file: functioneditorwidget.ui:600
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, polarMin)
-#. i18n: file: functiontools.ui:42
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, min)
-#: rc.cpp:252 rc.cpp:379 rc.cpp:410 rc.cpp:505 rc.cpp:1502 rc.cpp:1629
-#: rc.cpp:1660 rc.cpp:1755 rc.cpp:252 rc.cpp:379 rc.cpp:410 rc.cpp:505
-#: rc.cpp:1502 rc.cpp:1629 rc.cpp:1660 rc.cpp:1755
+#: rc.cpp:254 rc.cpp:381 rc.cpp:412 rc.cpp:505 rc.cpp:254 rc.cpp:381
+#: rc.cpp:412 rc.cpp:505
 msgid ""
 "Enter the lower boundary of the plot range. Expressions like 2*pi are "
 "allowed, too."
@@ -1526,7 +1113,7 @@
 
 #. i18n: file: functioneditorwidget.ui:171
 #. i18n: ectx: property (toolTip), widget (EquationEdit, cartesianMax)
-#: rc.cpp:255 rc.cpp:1505 rc.cpp:255 rc.cpp:1505
+#: rc.cpp:257 rc.cpp:257
 msgid "upper boundary of the plot range"
 msgstr ""
 
@@ -1546,25 +1133,8 @@
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, polarMax)
 #. i18n: file: functiontools.ui:62
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, max)
-#. i18n: file: functioneditorwidget.ui:174
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, cartesianMax)
-#. i18n: file: functioneditorwidget.ui:525
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, parametricMax)
-#. i18n: file: functioneditorwidget.ui:610
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, polarMax)
-#. i18n: file: functiontools.ui:62
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, max)
-#. i18n: file: functioneditorwidget.ui:174
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, cartesianMax)
-#. i18n: file: functioneditorwidget.ui:525
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, parametricMax)
-#. i18n: file: functioneditorwidget.ui:610
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, polarMax)
-#. i18n: file: functiontools.ui:62
-#. i18n: ectx: property (whatsThis), widget (EquationEdit, max)
-#: rc.cpp:258 rc.cpp:385 rc.cpp:416 rc.cpp:514 rc.cpp:1508 rc.cpp:1635
-#: rc.cpp:1666 rc.cpp:1764 rc.cpp:258 rc.cpp:385 rc.cpp:416 rc.cpp:514
-#: rc.cpp:1508 rc.cpp:1635 rc.cpp:1666 rc.cpp:1764
+#: rc.cpp:260 rc.cpp:387 rc.cpp:418 rc.cpp:514 rc.cpp:260 rc.cpp:387
+#: rc.cpp:418 rc.cpp:514
 msgid ""
 "Enter the upper boundary of the plot range. Expressions like 2*pi are "
 "allowed, too."
@@ -1578,33 +1148,9 @@
 #. i18n: ectx: property (title), widget (PlotStyleWidget, parametric_f0)
 #. i18n: file: functioneditorwidget.ui:647
 #. i18n: ectx: property (title), widget (PlotStyleWidget, polar_f0)
-#. i18n: file: functioneditorwidget.ui:722
-#. i18n: ectx: property (title), widget (PlotStyleWidget, implicit_f0)
-#. i18n: file: functioneditorwidget.ui:805
-#. i18n: ectx: property (title), widget (PlotStyleWidget, differential_f0)
-#. i18n: file: functioneditorwidget.ui:191
-#. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_f0)
-#. i18n: file: functioneditorwidget.ui:378
-#. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_integral)
-#. i18n: file: functioneditorwidget.ui:542
-#. i18n: ectx: property (title), widget (PlotStyleWidget, parametric_f0)
-#. i18n: file: functioneditorwidget.ui:647
-#. i18n: ectx: property (title), widget (PlotStyleWidget, polar_f0)
-#. i18n: file: functioneditorwidget.ui:722
-#. i18n: ectx: property (title), widget (PlotStyleWidget, implicit_f0)
-#. i18n: file: functioneditorwidget.ui:805
-#. i18n: ectx: property (title), widget (PlotStyleWidget, differential_f0)
-#. i18n: file: functioneditorwidget.ui:191
-#. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_f0)
-#. i18n: file: functioneditorwidget.ui:378
-#. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_integral)
-#. i18n: file: functioneditorwidget.ui:542
-#. i18n: ectx: property (title), widget (PlotStyleWidget, parametric_f0)
-#. i18n: file: functioneditorwidget.ui:647
-#. i18n: ectx: property (title), widget (PlotStyleWidget, polar_f0)
-#. i18n: file: functioneditorwidget.ui:722
+#. i18n: file: functioneditorwidget.ui:721
 #. i18n: ectx: property (title), widget (PlotStyleWidget, implicit_f0)
-#. i18n: file: functioneditorwidget.ui:805
+#. i18n: file: functioneditorwidget.ui:803
 #. i18n: ectx: property (title), widget (PlotStyleWidget, differential_f0)
 #. i18n: file: functioneditorwidget.ui:191
 #. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_f0)
@@ -1614,26 +1160,24 @@
 #. i18n: ectx: property (title), widget (PlotStyleWidget, parametric_f0)
 #. i18n: file: functioneditorwidget.ui:647
 #. i18n: ectx: property (title), widget (PlotStyleWidget, polar_f0)
-#. i18n: file: functioneditorwidget.ui:722
+#. i18n: file: functioneditorwidget.ui:721
 #. i18n: ectx: property (title), widget (PlotStyleWidget, implicit_f0)
-#. i18n: file: functioneditorwidget.ui:805
+#. i18n: file: functioneditorwidget.ui:803
 #. i18n: ectx: property (title), widget (PlotStyleWidget, differential_f0)
-#: rc.cpp:264 rc.cpp:339 rc.cpp:391 rc.cpp:428 rc.cpp:458 rc.cpp:487
-#: rc.cpp:1514 rc.cpp:1589 rc.cpp:1641 rc.cpp:1678 rc.cpp:1708 rc.cpp:1737
-#: rc.cpp:264 rc.cpp:339 rc.cpp:391 rc.cpp:428 rc.cpp:458 rc.cpp:487
-#: rc.cpp:1514 rc.cpp:1589 rc.cpp:1641 rc.cpp:1678 rc.cpp:1708 rc.cpp:1737
+#: rc.cpp:266 rc.cpp:341 rc.cpp:393 rc.cpp:430 rc.cpp:459 rc.cpp:487
+#: rc.cpp:266 rc.cpp:341 rc.cpp:393 rc.cpp:430 rc.cpp:459 rc.cpp:487
 msgid "Appearance"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:199
 #. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#: rc.cpp:267 rc.cpp:1517 rc.cpp:267 rc.cpp:1517
+#: rc.cpp:269 rc.cpp:269
 msgid "Derivatives"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:211
 #. i18n: ectx: property (toolTip), widget (QCheckBox, showDerivative1)
-#: rc.cpp:270 rc.cpp:1520 rc.cpp:270 rc.cpp:1520
+#: rc.cpp:272 rc.cpp:272
 msgid "Show first derivative"
 msgstr ""
 
@@ -1645,52 +1189,43 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showDerivative1)
 #. i18n: file: functioneditorwidget.ui:237
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showDerivative2)
-#. i18n: file: functioneditorwidget.ui:214
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, showDerivative1)
-#. i18n: file: functioneditorwidget.ui:237
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, showDerivative2)
-#. i18n: file: functioneditorwidget.ui:214
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, showDerivative1)
-#. i18n: file: functioneditorwidget.ui:237
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, showDerivative2)
-#: rc.cpp:273 rc.cpp:285 rc.cpp:1523 rc.cpp:1535 rc.cpp:273 rc.cpp:285
-#: rc.cpp:1523 rc.cpp:1535
+#: rc.cpp:275 rc.cpp:287 rc.cpp:275 rc.cpp:287
 msgid "If this box is checked, the first derivative will be plotted, too."
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:217
 #. i18n: ectx: property (text), widget (QCheckBox, showDerivative1)
-#: rc.cpp:276 rc.cpp:1526 rc.cpp:276 rc.cpp:1526
+#: rc.cpp:278 rc.cpp:278
 msgid "Show &1st derivative"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:227
 #. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_f1)
-#: rc.cpp:279 rc.cpp:1529 rc.cpp:279 rc.cpp:1529
+#: rc.cpp:281 rc.cpp:281
 msgid "1st derivative"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:234
 #. i18n: ectx: property (toolTip), widget (QCheckBox, showDerivative2)
-#: rc.cpp:282 rc.cpp:1532 rc.cpp:282 rc.cpp:1532
+#: rc.cpp:284 rc.cpp:284
 msgid "Show second derivative"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:240
 #. i18n: ectx: property (text), widget (QCheckBox, showDerivative2)
-#: rc.cpp:288 rc.cpp:1538 rc.cpp:288 rc.cpp:1538
+#: rc.cpp:290 rc.cpp:290
 msgid "Show &2nd derivative"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:250
 #. i18n: ectx: property (title), widget (PlotStyleWidget, cartesian_f2)
-#: rc.cpp:291 rc.cpp:1541 rc.cpp:291 rc.cpp:1541
+#: rc.cpp:293 rc.cpp:293
 msgid "2nd derivative"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:258
 #. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:294 rc.cpp:1544 rc.cpp:294 rc.cpp:1544
+#: rc.cpp:296 rc.cpp:296
 msgid "Integral"
 msgstr ""
 
@@ -1702,58 +1237,49 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, showIntegral)
 #. i18n: file: functioneditorwidget.ui:273
 #. i18n: ectx: property (text), widget (QCheckBox, showIntegral)
-#. i18n: file: functioneditorwidget.ui:267
-#. i18n: ectx: property (toolTip), widget (QCheckBox, showIntegral)
-#. i18n: file: functioneditorwidget.ui:273
-#. i18n: ectx: property (text), widget (QCheckBox, showIntegral)
-#. i18n: file: functioneditorwidget.ui:267
-#. i18n: ectx: property (toolTip), widget (QCheckBox, showIntegral)
-#. i18n: file: functioneditorwidget.ui:273
-#. i18n: ectx: property (text), widget (QCheckBox, showIntegral)
-#: rc.cpp:297 rc.cpp:303 rc.cpp:1547 rc.cpp:1553 rc.cpp:297 rc.cpp:303
-#: rc.cpp:1547 rc.cpp:1553
+#: rc.cpp:299 rc.cpp:305 rc.cpp:299 rc.cpp:305
 msgid "Show integral"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:270
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showIntegral)
-#: rc.cpp:300 rc.cpp:1550 rc.cpp:300 rc.cpp:1550
+#: rc.cpp:302 rc.cpp:302
 msgid "If this box is checked, the integral will be plotted, too."
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:283
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_6)
-#: rc.cpp:306 rc.cpp:1556 rc.cpp:306 rc.cpp:1556
+#: rc.cpp:308 rc.cpp:308
 msgid "A point on the solution curve"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:286
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
-#: rc.cpp:309 rc.cpp:1559 rc.cpp:309 rc.cpp:1559
+#: rc.cpp:311 rc.cpp:311
 msgid "Initial Point"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:298
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
-#: rc.cpp:312 rc.cpp:1562 rc.cpp:312 rc.cpp:1562
+#: rc.cpp:314 rc.cpp:314
 msgid "&x:"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:308
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_5_2)
-#: rc.cpp:315 rc.cpp:1565 rc.cpp:315 rc.cpp:1565
+#: rc.cpp:317 rc.cpp:317
 msgid "&y:"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:318
 #. i18n: ectx: property (toolTip), widget (EquationEdit, txtInitX)
-#: rc.cpp:318 rc.cpp:1568 rc.cpp:318 rc.cpp:1568
+#: rc.cpp:320 rc.cpp:320
 msgid "Enter the initial x-point,for instance 2 or pi"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:321
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, txtInitX)
-#: rc.cpp:321 rc.cpp:1571 rc.cpp:321 rc.cpp:1571
+#: rc.cpp:323 rc.cpp:323
 msgid ""
 "Enter the initial x-value or expression for the integral, for example 2 or "
 "pi/2"
@@ -1761,13 +1287,13 @@
 
 #. i18n: file: functioneditorwidget.ui:328
 #. i18n: ectx: property (toolTip), widget (EquationEdit, txtInitY)
-#: rc.cpp:324 rc.cpp:1574 rc.cpp:324 rc.cpp:1574
+#: rc.cpp:326 rc.cpp:326
 msgid "enter the initial y-point, eg 2 or pi"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:331
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, txtInitY)
-#: rc.cpp:327 rc.cpp:1577 rc.cpp:327 rc.cpp:1577
+#: rc.cpp:329 rc.cpp:329
 msgid ""
 "Enter the initial y-value or expression for the integral, for example 2 or "
 "pi/2"
@@ -1775,72 +1301,41 @@
 
 #. i18n: file: functioneditorwidget.ui:344
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:767
-#. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_10)
-#. i18n: file: functioneditorwidget.ui:344
-#. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:767
-#. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_10)
-#. i18n: file: functioneditorwidget.ui:344
-#. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:767
+#. i18n: file: functioneditorwidget.ui:765
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_10)
 #. i18n: file: functioneditorwidget.ui:344
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:767
+#. i18n: file: functioneditorwidget.ui:765
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox_10)
-#: rc.cpp:330 rc.cpp:475 rc.cpp:1580 rc.cpp:1725 rc.cpp:330 rc.cpp:475
-#: rc.cpp:1580 rc.cpp:1725
+#: rc.cpp:332 rc.cpp:475 rc.cpp:332 rc.cpp:475
 msgid "The maximum step size used in numerically calculating the solution"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:347
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:770
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_10)
-#. i18n: file: functioneditorwidget.ui:347
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:770
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_10)
-#. i18n: file: functioneditorwidget.ui:347
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:770
+#. i18n: file: functioneditorwidget.ui:768
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_10)
 #. i18n: file: functioneditorwidget.ui:347
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#. i18n: file: functioneditorwidget.ui:770
+#. i18n: file: functioneditorwidget.ui:768
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_10)
-#: rc.cpp:333 rc.cpp:478 rc.cpp:1583 rc.cpp:1728 rc.cpp:333 rc.cpp:478
-#: rc.cpp:1583 rc.cpp:1728
+#: rc.cpp:335 rc.cpp:478 rc.cpp:335 rc.cpp:478
 msgid "Precision"
 msgstr "Trachywiredd"
 
 #. i18n: file: functioneditorwidget.ui:359
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: functioneditorwidget.ui:782
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#. i18n: file: parameteranimator.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: functioneditorwidget.ui:359
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: functioneditorwidget.ui:782
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#. i18n: file: parameteranimator.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: functioneditorwidget.ui:359
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: functioneditorwidget.ui:782
+#. i18n: file: functioneditorwidget.ui:780
 #. i18n: ectx: property (text), widget (QLabel, label_7)
 #. i18n: file: parameteranimator.ui:71
 #. i18n: ectx: property (text), widget (QLabel, label_3)
 #. i18n: file: functioneditorwidget.ui:359
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: functioneditorwidget.ui:782
+#. i18n: file: functioneditorwidget.ui:780
 #. i18n: ectx: property (text), widget (QLabel, label_7)
 #. i18n: file: parameteranimator.ui:71
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:336 rc.cpp:481 rc.cpp:817 rc.cpp:1586 rc.cpp:1731 rc.cpp:1797
-#: rc.cpp:336 rc.cpp:481 rc.cpp:817 rc.cpp:1586 rc.cpp:1731 rc.cpp:1797
+#: rc.cpp:338 rc.cpp:481 rc.cpp:547 rc.cpp:338 rc.cpp:481 rc.cpp:547
 msgid "Step:"
 msgstr ""
 
@@ -1856,26 +1351,13 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
 #. i18n: file: functioneditorwidget.ui:664
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_12)
-#. i18n: file: functioneditorwidget.ui:412
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_11)
-#. i18n: file: functioneditorwidget.ui:559
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: functioneditorwidget.ui:664
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_12)
-#. i18n: file: functioneditorwidget.ui:412
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_11)
-#. i18n: file: functioneditorwidget.ui:559
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: functioneditorwidget.ui:664
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_12)
-#: rc.cpp:342 rc.cpp:394 rc.cpp:431 rc.cpp:1592 rc.cpp:1644 rc.cpp:1681
-#: rc.cpp:342 rc.cpp:394 rc.cpp:431 rc.cpp:1592 rc.cpp:1644 rc.cpp:1681
+#: rc.cpp:344 rc.cpp:396 rc.cpp:433 rc.cpp:344 rc.cpp:396 rc.cpp:433
 msgid "Definition"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:424
 #. i18n: ectx: property (text), widget (QLabel, textLabelX)
-#: rc.cpp:345 rc.cpp:1595 rc.cpp:345 rc.cpp:1595
+#: rc.cpp:347 rc.cpp:347
 msgid "x:"
 msgstr ""
 
@@ -1885,7 +1367,7 @@
 #. i18n: ectx: property (toolTip), widget (EquationEdit, parametricY)
 #. i18n: file: functioneditorwidget.ui:700
 #. i18n: ectx: property (toolTip), widget (EquationEdit, implicitEquation)
-#. i18n: file: functioneditorwidget.ui:752
+#. i18n: file: functioneditorwidget.ui:751
 #. i18n: ectx: property (toolTip), widget (EquationEdit, differentialEquation)
 #. i18n: file: functioneditorwidget.ui:434
 #. i18n: ectx: property (toolTip), widget (EquationEdit, parametricX)
@@ -1893,33 +1375,16 @@
 #. i18n: ectx: property (toolTip), widget (EquationEdit, parametricY)
 #. i18n: file: functioneditorwidget.ui:700
 #. i18n: ectx: property (toolTip), widget (EquationEdit, implicitEquation)
-#. i18n: file: functioneditorwidget.ui:752
+#. i18n: file: functioneditorwidget.ui:751
 #. i18n: ectx: property (toolTip), widget (EquationEdit, differentialEquation)
-#. i18n: file: functioneditorwidget.ui:434
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricX)
-#. i18n: file: functioneditorwidget.ui:459
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricY)
-#. i18n: file: functioneditorwidget.ui:700
-#. i18n: ectx: property (toolTip), widget (EquationEdit, implicitEquation)
-#. i18n: file: functioneditorwidget.ui:752
-#. i18n: ectx: property (toolTip), widget (EquationEdit, differentialEquation)
-#. i18n: file: functioneditorwidget.ui:434
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricX)
-#. i18n: file: functioneditorwidget.ui:459
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricY)
-#. i18n: file: functioneditorwidget.ui:700
-#. i18n: ectx: property (toolTip), widget (EquationEdit, implicitEquation)
-#. i18n: file: functioneditorwidget.ui:752
-#. i18n: ectx: property (toolTip), widget (EquationEdit, differentialEquation)
-#: rc.cpp:348 rc.cpp:359 rc.cpp:447 rc.cpp:464 rc.cpp:1598 rc.cpp:1609
-#: rc.cpp:1697 rc.cpp:1714 rc.cpp:348 rc.cpp:359 rc.cpp:447 rc.cpp:464
-#: rc.cpp:1598 rc.cpp:1609 rc.cpp:1697 rc.cpp:1714
+#: rc.cpp:350 rc.cpp:361 rc.cpp:449 rc.cpp:465 rc.cpp:350 rc.cpp:361
+#: rc.cpp:449 rc.cpp:465
 msgid "Enter an expression"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:439
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, parametricX)
-#: rc.cpp:351 rc.cpp:1601 rc.cpp:351 rc.cpp:1601
+#: rc.cpp:353 rc.cpp:353
 msgid ""
 "Enter an expression for the function.\n"
 "The dummy variable is t.\n"
@@ -1928,13 +1393,13 @@
 
 #. i18n: file: functioneditorwidget.ui:449
 #. i18n: ectx: property (text), widget (QLabel, textLabelY)
-#: rc.cpp:356 rc.cpp:1606 rc.cpp:356 rc.cpp:1606
+#: rc.cpp:358 rc.cpp:358
 msgid "y:"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:464
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, parametricY)
-#: rc.cpp:362 rc.cpp:1612 rc.cpp:362 rc.cpp:1612
+#: rc.cpp:364 rc.cpp:364
 msgid ""
 "Enter an expression for the function.\n"
 "The dummy variable is t.\n"
@@ -1943,7 +1408,7 @@
 
 #. i18n: file: functioneditorwidget.ui:474
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_9)
-#: rc.cpp:367 rc.cpp:1617 rc.cpp:367 rc.cpp:1617
+#: rc.cpp:369 rc.cpp:369
 msgid "Plot range"
 msgstr ""
 
@@ -1952,42 +1417,17 @@
 #. i18n: file: functioneditorwidget.ui:597
 #. i18n: ectx: property (toolTip), widget (EquationEdit, polarMin)
 #. i18n: file: functiontools.ui:39
-#. i18n: ectx: property (toolTip), widget (EquationEdit, min)
-#. i18n: file: functioneditorwidget.ui:509
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMin)
-#. i18n: file: functioneditorwidget.ui:597
-#. i18n: ectx: property (toolTip), widget (EquationEdit, polarMin)
-#. i18n: file: functiontools.ui:39
-#. i18n: ectx: property (toolTip), widget (EquationEdit, min)
-#. i18n: file: functioneditorwidget.ui:509
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMin)
-#. i18n: file: functioneditorwidget.ui:597
-#. i18n: ectx: property (toolTip), widget (EquationEdit, polarMin)
-#. i18n: file: functiontools.ui:39
-#. i18n: ectx: property (toolTip), widget (EquationEdit, min)
-#. i18n: file: functioneditorwidget.ui:509
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMin)
-#. i18n: file: functioneditorwidget.ui:597
-#. i18n: ectx: property (toolTip), widget (EquationEdit, polarMin)
-#. i18n: file: functiontools.ui:39
-#. i18n: ectx: property (toolTip), widget (EquationEdit, min)
-#: rc.cpp:376 rc.cpp:407 rc.cpp:502 rc.cpp:1626 rc.cpp:1657 rc.cpp:1752
-#: rc.cpp:376 rc.cpp:407 rc.cpp:502 rc.cpp:1626 rc.cpp:1657 rc.cpp:1752
-msgid "Lower boundary of the plot range"
-msgstr ""
-
-#. i18n: file: functioneditorwidget.ui:522
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMax)
-#. i18n: file: functioneditorwidget.ui:607
-#. i18n: ectx: property (toolTip), widget (EquationEdit, polarMax)
-#. i18n: file: functiontools.ui:59
-#. i18n: ectx: property (toolTip), widget (EquationEdit, max)
-#. i18n: file: functioneditorwidget.ui:522
-#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMax)
-#. i18n: file: functioneditorwidget.ui:607
-#. i18n: ectx: property (toolTip), widget (EquationEdit, polarMax)
-#. i18n: file: functiontools.ui:59
-#. i18n: ectx: property (toolTip), widget (EquationEdit, max)
+#. i18n: ectx: property (toolTip), widget (EquationEdit, min)
+#. i18n: file: functioneditorwidget.ui:509
+#. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMin)
+#. i18n: file: functioneditorwidget.ui:597
+#. i18n: ectx: property (toolTip), widget (EquationEdit, polarMin)
+#. i18n: file: functiontools.ui:39
+#. i18n: ectx: property (toolTip), widget (EquationEdit, min)
+#: rc.cpp:378 rc.cpp:409 rc.cpp:502 rc.cpp:378 rc.cpp:409 rc.cpp:502
+msgid "Lower boundary of the plot range"
+msgstr ""
+
 #. i18n: file: functioneditorwidget.ui:522
 #. i18n: ectx: property (toolTip), widget (EquationEdit, parametricMax)
 #. i18n: file: functioneditorwidget.ui:607
@@ -2000,41 +1440,39 @@
 #. i18n: ectx: property (toolTip), widget (EquationEdit, polarMax)
 #. i18n: file: functiontools.ui:59
 #. i18n: ectx: property (toolTip), widget (EquationEdit, max)
-#: rc.cpp:382 rc.cpp:413 rc.cpp:511 rc.cpp:1632 rc.cpp:1663 rc.cpp:1761
-#: rc.cpp:382 rc.cpp:413 rc.cpp:511 rc.cpp:1632 rc.cpp:1663 rc.cpp:1761
+#: rc.cpp:384 rc.cpp:415 rc.cpp:511 rc.cpp:384 rc.cpp:415 rc.cpp:511
 msgid "Upper boundary of the plot range"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:571
 #. i18n: ectx: property (toolTip), widget (EquationEdit, polarEquation)
-#: rc.cpp:397 rc.cpp:1647 rc.cpp:397 rc.cpp:1647
+#: rc.cpp:399 rc.cpp:399
 msgid "Enter an equation"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:575
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, polarEquation)
-#: rc.cpp:400 rc.cpp:1650 rc.cpp:400 rc.cpp:1650
+#: rc.cpp:402 rc.cpp:402
 msgid ""
-"Enter an expression for the function. The prefix \"r\" will be added "
-"automatically.\n"
-"Example: loop(angle)=ln(angle)"
+"Enter an expression for the function. \n"
+"Example: loop(a)=ln(a)"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:585
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_13)
-#: rc.cpp:404 rc.cpp:1654 rc.cpp:404 rc.cpp:1654
+#: rc.cpp:406 rc.cpp:406
 msgid "Plot Range"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:676
 #. i18n: ectx: property (toolTip), widget (KLineEdit, implicitName)
-#: rc.cpp:434 rc.cpp:1684 rc.cpp:434 rc.cpp:1684
+#: rc.cpp:436 rc.cpp:436
 msgid "Name of the function"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:680
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, implicitName)
-#: rc.cpp:437 rc.cpp:1687 rc.cpp:437 rc.cpp:1687
+#: rc.cpp:439 rc.cpp:439
 msgid ""
 "Enter the name of the function.\n"
 "The name of a function must be unique. If you leave this line empty KmPlot "
@@ -2043,94 +1481,83 @@
 
 #. i18n: file: functioneditorwidget.ui:683
 #. i18n: ectx: property (text), widget (KLineEdit, implicitName)
-#: rc.cpp:441 rc.cpp:1691 rc.cpp:441 rc.cpp:1691
+#: rc.cpp:443 rc.cpp:443
 msgid "f(x,y)"
 msgstr ""
 
 #. i18n: file: functioneditorwidget.ui:690
 #. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#: rc.cpp:444 rc.cpp:1694 rc.cpp:444 rc.cpp:1694
+#: rc.cpp:446 rc.cpp:446
 msgid "Name:"
 msgstr "Enw:"
 
-#. i18n: file: functioneditorwidget.ui:705
+#. i18n: file: functioneditorwidget.ui:704
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, implicitEquation)
-#: rc.cpp:450 rc.cpp:1700 rc.cpp:450 rc.cpp:1700
+#: rc.cpp:452 rc.cpp:452
 msgid ""
 "Enter an expression for the function.\n"
-"The dummy variable is t.\n"
 "Example: x^2 + y^2 = 25."
 msgstr ""
 
-#. i18n: file: functioneditorwidget.ui:757
+#. i18n: file: functioneditorwidget.ui:755
 #. i18n: ectx: property (whatsThis), widget (EquationEdit, differentialEquation)
-#: rc.cpp:467 rc.cpp:1717 rc.cpp:467 rc.cpp:1717
+#: rc.cpp:468 rc.cpp:468
 msgid ""
 "Enter an expression for the function.\n"
-"The dummy variable is t.\n"
 "Example: f''(x) = -f"
 msgstr ""
 
-#. i18n: file: functioneditorwidget.ui:760
+#. i18n: file: functioneditorwidget.ui:758
 #. i18n: ectx: property (text), widget (EquationEdit, differentialEquation)
-#: rc.cpp:472 rc.cpp:1722 rc.cpp:472 rc.cpp:1722
+#: rc.cpp:472 rc.cpp:472
 msgid "f''(x) = -f"
 msgstr ""
 
-#. i18n: file: functioneditorwidget.ui:813
-#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
-#. i18n: file: initialconditionswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, InitialConditionsWidget)
-#. i18n: file: functioneditorwidget.ui:813
-#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
-#. i18n: file: initialconditionswidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, InitialConditionsWidget)
-#. i18n: file: functioneditorwidget.ui:813
+#. i18n: file: functioneditorwidget.ui:811
 #. i18n: ectx: attribute (title), widget (QWidget, tab_5)
 #. i18n: file: initialconditionswidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, InitialConditionsWidget)
-#. i18n: file: functioneditorwidget.ui:813
+#. i18n: file: functioneditorwidget.ui:811
 #. i18n: ectx: attribute (title), widget (QWidget, tab_5)
 #. i18n: file: initialconditionswidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, InitialConditionsWidget)
-#: rc.cpp:490 rc.cpp:520 rc.cpp:1740 rc.cpp:1770 rc.cpp:490 rc.cpp:520
-#: rc.cpp:1740 rc.cpp:1770
+#: rc.cpp:490 rc.cpp:520 rc.cpp:490 rc.cpp:520
 msgid "Initial Conditions"
 msgstr ""
 
 #. i18n: file: functiontools.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, FunctionTools)
-#: rc.cpp:493 rc.cpp:1743 rc.cpp:493 rc.cpp:1743
+#: rc.cpp:493 rc.cpp:493
 msgid "Function Tools"
 msgstr ""
 
 #. i18n: file: functiontools.ui:22
 #. i18n: ectx: property (text), widget (QLabel, rangeTitle)
-#: rc.cpp:496 rc.cpp:1746 rc.cpp:496 rc.cpp:1746
+#: rc.cpp:496 rc.cpp:496
 msgid "<>:"
 msgstr ""
 
 #. i18n: file: functiontools.ui:69
 #. i18n: ectx: property (text), widget (QLabel, rangeResult)
-#: rc.cpp:517 rc.cpp:1767 rc.cpp:517 rc.cpp:1767
+#: rc.cpp:517 rc.cpp:517
 msgid "<>"
 msgstr ""
 
 #. i18n: file: initialconditionswidget.ui:49
 #. i18n: ectx: property (text), widget (QPushButton, removeButton)
-#: rc.cpp:523 rc.cpp:1773 rc.cpp:523 rc.cpp:1773
+#: rc.cpp:523 rc.cpp:523
 msgid "Remove"
 msgstr ""
 
 #. i18n: file: initialconditionswidget.ui:56
 #. i18n: ectx: property (text), widget (QPushButton, addButton)
-#: rc.cpp:526 rc.cpp:1776 rc.cpp:526 rc.cpp:1776
+#: rc.cpp:526 rc.cpp:526
 msgid "Add..."
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:23
 #. i18n: ectx: property (toolTip), widget (QLabel, warningLabel)
-#: rc.cpp:799 rc.cpp:1779 rc.cpp:799 rc.cpp:1779
+#: rc.cpp:529 rc.cpp:529
 msgid ""
 "The function must have an additional variable as a parameter, e.g. f(x,k) "
 "would have k as its parameter"
@@ -2138,7 +1565,7 @@
 
 #. i18n: file: parameteranimator.ui:29
 #. i18n: ectx: property (text), widget (QLabel, warningLabel)
-#: rc.cpp:802 rc.cpp:1782 rc.cpp:802 rc.cpp:1782
+#: rc.cpp:532 rc.cpp:532
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -2153,19 +1580,19 @@
 
 #. i18n: file: parameteranimator.ui:47
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:808 rc.cpp:1788 rc.cpp:808 rc.cpp:1788
+#: rc.cpp:538 rc.cpp:538
 msgid "Final value:"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:57
 #. i18n: ectx: property (text), widget (EquationEdit, step)
-#: rc.cpp:811 rc.cpp:1791 rc.cpp:811 rc.cpp:1791
+#: rc.cpp:541 rc.cpp:541
 msgid "1"
 msgstr "1"
 
 #. i18n: file: parameteranimator.ui:64
 #. i18n: ectx: property (text), widget (EquationEdit, final)
-#: rc.cpp:814 rc.cpp:1794 rc.cpp:814 rc.cpp:1794
+#: rc.cpp:544 rc.cpp:544
 msgid "10"
 msgstr "10"
 
@@ -2177,100 +1604,91 @@
 #. i18n: ectx: property (text), widget (EquationEdit, initial)
 #. i18n: file: parameteranimator.ui:131
 #. i18n: ectx: property (text), widget (QLabel, currentValue)
-#. i18n: file: parameteranimator.ui:81
-#. i18n: ectx: property (text), widget (EquationEdit, initial)
-#. i18n: file: parameteranimator.ui:131
-#. i18n: ectx: property (text), widget (QLabel, currentValue)
-#. i18n: file: parameteranimator.ui:81
-#. i18n: ectx: property (text), widget (EquationEdit, initial)
-#. i18n: file: parameteranimator.ui:131
-#. i18n: ectx: property (text), widget (QLabel, currentValue)
-#: rc.cpp:820 rc.cpp:829 rc.cpp:1800 rc.cpp:1809 rc.cpp:820 rc.cpp:829
-#: rc.cpp:1800 rc.cpp:1809
+#: rc.cpp:550 rc.cpp:559 rc.cpp:550 rc.cpp:559
 msgid "0"
 msgstr "0"
 
 #. i18n: file: parameteranimator.ui:88
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:823 rc.cpp:1803 rc.cpp:823 rc.cpp:1803
+#: rc.cpp:553 rc.cpp:553
 msgid "Initial value:"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:124
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:826 rc.cpp:1806 rc.cpp:826 rc.cpp:1806
+#: rc.cpp:556 rc.cpp:556
 msgid "Current Value:"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:177
 #. i18n: ectx: property (text), widget (QToolButton, gotoInitial)
-#: rc.cpp:832 rc.cpp:1812 rc.cpp:832 rc.cpp:1812
+#: rc.cpp:562 rc.cpp:562
 msgid "<<"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:184
 #. i18n: ectx: property (text), widget (QToolButton, stepBackwards)
-#: rc.cpp:835 rc.cpp:1815 rc.cpp:835 rc.cpp:1815
+#: rc.cpp:565 rc.cpp:565
 msgid "<"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:194
 #. i18n: ectx: property (text), widget (QToolButton, pause)
-#: rc.cpp:838 rc.cpp:1818 rc.cpp:838 rc.cpp:1818
+#: rc.cpp:568 rc.cpp:568
 msgid "||"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:201
 #. i18n: ectx: property (text), widget (QToolButton, stepForwards)
-#: rc.cpp:841 rc.cpp:1821 rc.cpp:841 rc.cpp:1821
+#: rc.cpp:571 rc.cpp:571
 msgid ">"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:211
 #. i18n: ectx: property (text), widget (QToolButton, gotoFinal)
-#: rc.cpp:844 rc.cpp:1824 rc.cpp:844 rc.cpp:1824
+#: rc.cpp:574 rc.cpp:574
 msgid ">>"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:257
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:847 rc.cpp:1827 rc.cpp:847 rc.cpp:1827
+#: rc.cpp:577 rc.cpp:577
 msgid "Speed:"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:304
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:850 rc.cpp:1830 rc.cpp:850 rc.cpp:1830
+#: rc.cpp:580 rc.cpp:580
 msgid "Fast"
 msgstr ""
 
 #. i18n: file: parameteranimator.ui:311
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:853 rc.cpp:1833 rc.cpp:853 rc.cpp:1833
+#: rc.cpp:583 rc.cpp:583
 msgid "Slow"
 msgstr ""
 
 #. i18n: file: parameterswidget.ui:37
 #. i18n: ectx: property (text), widget (QCheckBox, useSlider)
-#: rc.cpp:859 rc.cpp:1839 rc.cpp:859 rc.cpp:1839
+#: rc.cpp:589 rc.cpp:589
 msgid "Slider:"
 msgstr ""
 
 #. i18n: file: parameterswidget.ui:44
 #. i18n: ectx: property (text), widget (QCheckBox, useList)
-#: rc.cpp:862 rc.cpp:1842 rc.cpp:862 rc.cpp:1842
+#: rc.cpp:592 rc.cpp:592
 msgid "List:"
 msgstr ""
 
 #. i18n: file: parameterswidget.ui:54
 #. i18n: ectx: property (toolTip), widget (KPushButton, editParameterListButton)
-#: rc.cpp:865 rc.cpp:1845 rc.cpp:865 rc.cpp:1845
+#: rc.cpp:595 rc.cpp:595
 msgid "Edit the list of parameters"
 msgstr ""
 
 #. i18n: file: parameterswidget.ui:57
 #. i18n: ectx: property (whatsThis), widget (KPushButton, editParameterListButton)
-#: rc.cpp:868 rc.cpp:1848 rc.cpp:868 rc.cpp:1848
+#: rc.cpp:598 rc.cpp:598
 msgid ""
 "Click here to open a list of parameter values. Here you can add, remove, and "
 "change them."
@@ -2278,19 +1696,19 @@
 
 #. i18n: file: parameterswidget.ui:60
 #. i18n: ectx: property (text), widget (KPushButton, editParameterListButton)
-#: rc.cpp:871 rc.cpp:1851 rc.cpp:871 rc.cpp:1851
+#: rc.cpp:601 rc.cpp:601
 msgid "Edit List..."
 msgstr ""
 
 #. i18n: file: parameterswidget.ui:70
 #. i18n: ectx: property (toolTip), widget (KComboBox, listOfSliders)
-#: rc.cpp:874 rc.cpp:1854 rc.cpp:874 rc.cpp:1854
+#: rc.cpp:604 rc.cpp:604
 msgid "Select a slider"
 msgstr ""
 
 #. i18n: file: parameterswidget.ui:73
 #. i18n: ectx: property (whatsThis), widget (KComboBox, listOfSliders)
-#: rc.cpp:877 rc.cpp:1857 rc.cpp:877 rc.cpp:1857
+#: rc.cpp:607 rc.cpp:607
 msgid ""
 "Select one of the sliders to change the parameter value dynamically. The "
 "values vary from 0 (left) to 100 (right)."
@@ -2298,43 +1716,43 @@
 
 #. i18n: file: plotstylewidget.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, PlotStyleWidget)
-#: rc.cpp:880 rc.cpp:1860 rc.cpp:880 rc.cpp:1860
+#: rc.cpp:610 rc.cpp:610
 msgid "Plot Style"
 msgstr ""
 
 #. i18n: file: plotstylewidget.ui:26
 #. i18n: ectx: property (text), widget (QCheckBox, showPlotName)
-#: rc.cpp:883 rc.cpp:1863 rc.cpp:883 rc.cpp:1863
+#: rc.cpp:613 rc.cpp:613
 msgid "Show the plot name"
 msgstr ""
 
 #. i18n: file: plotstylewidget.ui:33
 #. i18n: ectx: property (text), widget (QCheckBox, showExtrema)
-#: rc.cpp:886 rc.cpp:1866 rc.cpp:886 rc.cpp:1866
+#: rc.cpp:616 rc.cpp:616
 msgid "Show extrema (minimum/maximum points)"
 msgstr ""
 
 #. i18n: file: plotstylewidget.ui:53
 #. i18n: ectx: property (text), widget (QCheckBox, showTangentField)
-#: rc.cpp:889 rc.cpp:1869 rc.cpp:889 rc.cpp:1869
+#: rc.cpp:619 rc.cpp:619
 msgid "Show the tangent field:"
 msgstr ""
 
 #. i18n: file: plotstylewidget.ui:67
 #. i18n: ectx: property (text), widget (QCheckBox, useGradient)
-#: rc.cpp:892 rc.cpp:1872 rc.cpp:892 rc.cpp:1872
+#: rc.cpp:622 rc.cpp:622
 msgid "Use a gradient for parameters:"
 msgstr ""
 
 #. i18n: file: plotstylewidget.ui:74
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:895 rc.cpp:1875 rc.cpp:895 rc.cpp:1875
+#: rc.cpp:625 rc.cpp:625
 msgid "Line style:"
 msgstr ""
 
 #. i18n: file: plotstylewidget.ui:87
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:898 rc.cpp:1878 rc.cpp:898 rc.cpp:1878
+#: rc.cpp:628 rc.cpp:628
 msgid "Line width:"
 msgstr "Lled y llinell:"
 
@@ -2358,60 +1776,44 @@
 #. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_TicWidth)
 #. i18n: file: settingspagediagram.ui:236
 #. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_TicLength)
-#. i18n: file: plotstylewidget.ui:103
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, lineWidth)
-#. i18n: file: settingspagediagram.ui:140
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_AxesLineWidth)
-#. i18n: file: settingspagediagram.ui:172
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_GridLineWidth)
-#. i18n: file: settingspagediagram.ui:204
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_TicWidth)
-#. i18n: file: settingspagediagram.ui:236
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_TicLength)
-#. i18n: file: plotstylewidget.ui:103
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, lineWidth)
-#. i18n: file: settingspagediagram.ui:140
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_AxesLineWidth)
-#. i18n: file: settingspagediagram.ui:172
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_GridLineWidth)
-#. i18n: file: settingspagediagram.ui:204
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_TicWidth)
-#. i18n: file: settingspagediagram.ui:236
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, kcfg_TicLength)
-#: rc.cpp:901 rc.cpp:1132 rc.cpp:1138 rc.cpp:1144 rc.cpp:1150 rc.cpp:1881
-#: rc.cpp:2112 rc.cpp:2118 rc.cpp:2124 rc.cpp:2130 rc.cpp:901 rc.cpp:1132
-#: rc.cpp:1138 rc.cpp:1144 rc.cpp:1150 rc.cpp:1881 rc.cpp:2112 rc.cpp:2118
-#: rc.cpp:2124 rc.cpp:2130
+#: rc.cpp:631 rc.cpp:862 rc.cpp:868 rc.cpp:874 rc.cpp:880 rc.cpp:631
+#: rc.cpp:862 rc.cpp:868 rc.cpp:874 rc.cpp:880
 msgid " mm"
 msgstr ""
 
+#. i18n: file: qparametereditor.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, QParameterEditor)
+#: rc.cpp:634 kparametereditor.cpp:51 rc.cpp:634
+msgid "Parameter Editor"
+msgstr ""
+
 #. i18n: file: qparametereditor.ui:55
 #. i18n: ectx: property (toolTip), widget (KPushButton, cmdDelete)
-#: rc.cpp:922 rc.cpp:1902 rc.cpp:922 rc.cpp:1902
+#: rc.cpp:652 rc.cpp:652
 msgid "delete selected constant"
 msgstr ""
 
 #. i18n: file: qparametereditor.ui:84
 #. i18n: ectx: property (text), widget (QPushButton, moveUp)
-#: rc.cpp:931 rc.cpp:1911 rc.cpp:931 rc.cpp:1911
+#: rc.cpp:661 rc.cpp:661
 msgid "Move Up"
 msgstr ""
 
 #. i18n: file: qparametereditor.ui:91
 #. i18n: ectx: property (text), widget (QPushButton, moveDown)
-#: rc.cpp:934 rc.cpp:1914 rc.cpp:934 rc.cpp:1914
+#: rc.cpp:664 rc.cpp:664
 msgid "Move Down"
 msgstr ""
 
 #. i18n: file: qparametereditor.ui:117
 #. i18n: ectx: property (toolTip), widget (KPushButton, cmdImport)
-#: rc.cpp:937 rc.cpp:1917 rc.cpp:937 rc.cpp:1917
+#: rc.cpp:667 rc.cpp:667
 msgid "Import values from a textfile"
 msgstr ""
 
 #. i18n: file: qparametereditor.ui:120
 #. i18n: ectx: property (whatsThis), widget (KPushButton, cmdImport)
-#: rc.cpp:940 rc.cpp:1920 rc.cpp:940 rc.cpp:1920
+#: rc.cpp:670 rc.cpp:670
 msgid ""
 "Import values from a textfile. Every line in the file is parsed as a value "
 "or expression."
@@ -2419,19 +1821,19 @@
 
 #. i18n: file: qparametereditor.ui:123
 #. i18n: ectx: property (text), widget (KPushButton, cmdImport)
-#: rc.cpp:943 rc.cpp:1923 rc.cpp:943 rc.cpp:1923
+#: rc.cpp:673 rc.cpp:673
 msgid "&Import..."
 msgstr "&Mewnforio..."
 
 #. i18n: file: qparametereditor.ui:133
 #. i18n: ectx: property (toolTip), widget (KPushButton, cmdExport)
-#: rc.cpp:946 rc.cpp:1926 rc.cpp:946 rc.cpp:1926
+#: rc.cpp:676 rc.cpp:676
 msgid "Export values to a textfile"
 msgstr ""
 
 #. i18n: file: qparametereditor.ui:136
 #. i18n: ectx: property (whatsThis), widget (KPushButton, cmdExport)
-#: rc.cpp:949 rc.cpp:1929 rc.cpp:949 rc.cpp:1929
+#: rc.cpp:679 rc.cpp:679
 msgid ""
 "Export values to a textfile. Every value in the parameter list will be "
 "written to one line in the file."
@@ -2439,31 +1841,31 @@
 
 #. i18n: file: qparametereditor.ui:139
 #. i18n: ectx: property (text), widget (KPushButton, cmdExport)
-#: rc.cpp:952 rc.cpp:1932 rc.cpp:952 rc.cpp:1932
+#: rc.cpp:682 rc.cpp:682
 msgid "&Export..."
 msgstr "&Allforio..."
 
 #. i18n: file: settingspagecolor.ui:23
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:955 rc.cpp:1935 rc.cpp:955 rc.cpp:1935
+#: rc.cpp:685 rc.cpp:685
 msgid "&Coords"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:35
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:958 rc.cpp:1938 rc.cpp:958 rc.cpp:1938
+#: rc.cpp:688 rc.cpp:688
 msgid "Background Color:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:45
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_backgroundcolor)
-#: rc.cpp:961 rc.cpp:1941 rc.cpp:961 rc.cpp:1941
+#: rc.cpp:691 rc.cpp:691
 msgid "Color for the plot area behind the grid."
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:48
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_backgroundcolor)
-#: rc.cpp:964 rc.cpp:1944 rc.cpp:964 rc.cpp:1944
+#: rc.cpp:694 rc.cpp:694
 msgid ""
 "Click on the button the choose the color of the background. This option has "
 "no effect on printing nor export."
@@ -2471,25 +1873,25 @@
 
 #. i18n: file: settingspagecolor.ui:58
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:967 rc.cpp:1947 rc.cpp:967 rc.cpp:1947
+#: rc.cpp:697 rc.cpp:697
 msgid "&Axes:"
 msgstr "&Echeliniau:"
 
 #. i18n: file: settingspagecolor.ui:71
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:970 rc.cpp:1950 rc.cpp:970 rc.cpp:1950
+#: rc.cpp:700 rc.cpp:700
 msgid "&Grid:"
 msgstr "&Grid :"
 
 #. i18n: file: settingspagecolor.ui:84
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_AxesColor)
-#: rc.cpp:973 rc.cpp:1953 rc.cpp:973 rc.cpp:1953
+#: rc.cpp:703 rc.cpp:703
 msgid "select color for the axes"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:87
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_AxesColor)
-#: rc.cpp:976 rc.cpp:1956 rc.cpp:976 rc.cpp:1956
+#: rc.cpp:706 rc.cpp:706
 msgid ""
 "Specify the color of the axes. The change will appear as soon as you press "
 "the OK button."
@@ -2497,13 +1899,13 @@
 
 #. i18n: file: settingspagecolor.ui:97
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GridColor)
-#: rc.cpp:979 rc.cpp:1959 rc.cpp:979 rc.cpp:1959
+#: rc.cpp:709 rc.cpp:709
 msgid "select color for the grid"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:100
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GridColor)
-#: rc.cpp:982 rc.cpp:1962 rc.cpp:982 rc.cpp:1962
+#: rc.cpp:712 rc.cpp:712
 msgid ""
 "Specify the color of the grid. The change will appear as soon as you press "
 "the OK button."
@@ -2511,19 +1913,19 @@
 
 #. i18n: file: settingspagecolor.ui:113
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:985 rc.cpp:1965 rc.cpp:985 rc.cpp:1965
+#: rc.cpp:715 rc.cpp:715
 msgid "&Default Function Colors"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:133
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color1)
-#: rc.cpp:988 rc.cpp:1968 rc.cpp:988 rc.cpp:1968
+#: rc.cpp:718 rc.cpp:718
 msgid "the default color for function number 2"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:136
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color1)
-#: rc.cpp:991 rc.cpp:1971 rc.cpp:991 rc.cpp:1971
+#: rc.cpp:721 rc.cpp:721
 msgid ""
 "The default color for function number 2. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2533,13 +1935,13 @@
 
 #. i18n: file: settingspagecolor.ui:146
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color4)
-#: rc.cpp:994 rc.cpp:1974 rc.cpp:994 rc.cpp:1974
+#: rc.cpp:724 rc.cpp:724
 msgid "the default color for function number 5"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:149
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color4)
-#: rc.cpp:997 rc.cpp:1977 rc.cpp:997 rc.cpp:1977
+#: rc.cpp:727 rc.cpp:727
 msgid ""
 "The default color for function number 5. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2549,13 +1951,13 @@
 
 #. i18n: file: settingspagecolor.ui:159
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color0)
-#: rc.cpp:1000 rc.cpp:1980 rc.cpp:1000 rc.cpp:1980
+#: rc.cpp:730 rc.cpp:730
 msgid "the default color for function number 1"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:162
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color0)
-#: rc.cpp:1003 rc.cpp:1983 rc.cpp:1003 rc.cpp:1983
+#: rc.cpp:733 rc.cpp:733
 msgid ""
 "The default color for function number 1. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2565,19 +1967,19 @@
 
 #. i18n: file: settingspagecolor.ui:172
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:1006 rc.cpp:1986 rc.cpp:1006 rc.cpp:1986
+#: rc.cpp:736 rc.cpp:736
 msgid "Function &1:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:185
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color2)
-#: rc.cpp:1009 rc.cpp:1989 rc.cpp:1009 rc.cpp:1989
+#: rc.cpp:739 rc.cpp:739
 msgid "the default color for function number 3"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:188
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color2)
-#: rc.cpp:1012 rc.cpp:1992 rc.cpp:1012 rc.cpp:1992
+#: rc.cpp:742 rc.cpp:742
 msgid ""
 "The default color for function number 3. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2587,31 +1989,31 @@
 
 #. i18n: file: settingspagecolor.ui:198
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_13)
-#: rc.cpp:1015 rc.cpp:1995 rc.cpp:1015 rc.cpp:1995
+#: rc.cpp:745 rc.cpp:745
 msgid "Function &3:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:211
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:1018 rc.cpp:1998 rc.cpp:1018 rc.cpp:1998
+#: rc.cpp:748 rc.cpp:748
 msgid "Function &2:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:224
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_12)
-#: rc.cpp:1021 rc.cpp:2001 rc.cpp:1021 rc.cpp:2001
+#: rc.cpp:751 rc.cpp:751
 msgid "Function &4:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:237
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color3)
-#: rc.cpp:1024 rc.cpp:2004 rc.cpp:1024 rc.cpp:2004
+#: rc.cpp:754 rc.cpp:754
 msgid "the default color for function number 4"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:240
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color3)
-#: rc.cpp:1027 rc.cpp:2007 rc.cpp:1027 rc.cpp:2007
+#: rc.cpp:757 rc.cpp:757
 msgid ""
 "The default color for function number 4. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2621,31 +2023,31 @@
 
 #. i18n: file: settingspagecolor.ui:250
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_11)
-#: rc.cpp:1030 rc.cpp:2010 rc.cpp:1030 rc.cpp:2010
+#: rc.cpp:760 rc.cpp:760
 msgid "Function &5:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:289
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_9)
-#: rc.cpp:1033 rc.cpp:2013 rc.cpp:1033 rc.cpp:2013
+#: rc.cpp:763 rc.cpp:763
 msgid "Function &7:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:302
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_8)
-#: rc.cpp:1036 rc.cpp:2016 rc.cpp:1036 rc.cpp:2016
+#: rc.cpp:766 rc.cpp:766
 msgid "Function &8:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:315
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color8)
-#: rc.cpp:1039 rc.cpp:2019 rc.cpp:1039 rc.cpp:2019
+#: rc.cpp:769 rc.cpp:769
 msgid "the default color for function number 9"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:318
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color8)
-#: rc.cpp:1042 rc.cpp:2022 rc.cpp:1042 rc.cpp:2022
+#: rc.cpp:772 rc.cpp:772
 msgid ""
 "The default color for function number 9. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2655,19 +2057,19 @@
 
 #. i18n: file: settingspagecolor.ui:328
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_10)
-#: rc.cpp:1045 rc.cpp:2025 rc.cpp:1045 rc.cpp:2025
+#: rc.cpp:775 rc.cpp:775
 msgid "Function &6:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:341
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color6)
-#: rc.cpp:1048 rc.cpp:2028 rc.cpp:1048 rc.cpp:2028
+#: rc.cpp:778 rc.cpp:778
 msgid "the default color for function number 7"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:344
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color6)
-#: rc.cpp:1051 rc.cpp:2031 rc.cpp:1051 rc.cpp:2031
+#: rc.cpp:781 rc.cpp:781
 msgid ""
 "The default color for function number 7. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2677,13 +2079,13 @@
 
 #. i18n: file: settingspagecolor.ui:354
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color7)
-#: rc.cpp:1054 rc.cpp:2034 rc.cpp:1054 rc.cpp:2034
+#: rc.cpp:784 rc.cpp:784
 msgid "the default color for function number 8"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:357
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color7)
-#: rc.cpp:1057 rc.cpp:2037 rc.cpp:1057 rc.cpp:2037
+#: rc.cpp:787 rc.cpp:787
 msgid ""
 "The default color for function number 8. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2693,13 +2095,13 @@
 
 #. i18n: file: settingspagecolor.ui:367
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color5)
-#: rc.cpp:1060 rc.cpp:2040 rc.cpp:1060 rc.cpp:2040
+#: rc.cpp:790 rc.cpp:790
 msgid "the default color for function number 6"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:370
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color5)
-#: rc.cpp:1063 rc.cpp:2043 rc.cpp:1063 rc.cpp:2043
+#: rc.cpp:793 rc.cpp:793
 msgid ""
 "The default color for function number 6. Please note that this color setting "
 "only affects empty functions, so if you have defined a function at number 1 "
@@ -2709,19 +2111,19 @@
 
 #. i18n: file: settingspagecolor.ui:380
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_7)
-#: rc.cpp:1066 rc.cpp:2046 rc.cpp:1066 rc.cpp:2046
+#: rc.cpp:796 rc.cpp:796
 msgid "Function &9:"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:393
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_Color9)
-#: rc.cpp:1069 rc.cpp:2049 rc.cpp:1069 rc.cpp:2049
+#: rc.cpp:799 rc.cpp:799
 msgid "the default color for function number 10"
 msgstr ""
 
 #. i18n: file: settingspagecolor.ui:396
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_Color9)
-#: rc.cpp:1072 rc.cpp:2052 rc.cpp:1072 rc.cpp:2052
+#: rc.cpp:802 rc.cpp:802
 msgid ""
 "The default color for function number 10. Please note that this color "
 "setting only affects empty functions, so if you have defined a function at "
@@ -2731,12 +2133,10 @@
 
 #. i18n: file: settingspagecolor.ui:406
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_6)
-#: rc.cpp:1075 rc.cpp:2055 rc.cpp:1075 rc.cpp:2055
+#: rc.cpp:805 rc.cpp:805
 msgid "Function 1&0:"
 msgstr ""
 
-#. i18n: file: kmplot.kcfg:37
-#. i18n: ectx: label, entry (GridStyle), group (Coordinate System)
 #. i18n: file: settingspagediagram.ui:20
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_GridStyle)
 #. i18n: file: kmplot.kcfg:37
@@ -2745,212 +2145,211 @@
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_GridStyle)
 #. i18n: file: kmplot.kcfg:37
 #. i18n: ectx: label, entry (GridStyle), group (Coordinate System)
-#: rc.cpp:559 rc.cpp:1081 rc.cpp:2061 rc.cpp:2261 rc.cpp:559 rc.cpp:1081
-#: rc.cpp:2061 rc.cpp:2261
+#: rc.cpp:811 rc.cpp:1011 rc.cpp:811 rc.cpp:1011
 msgid "Grid Style"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:32
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton11)
-#: rc.cpp:1084 rc.cpp:2064 rc.cpp:1084 rc.cpp:2064
+#: rc.cpp:814 rc.cpp:814
 msgid "No Grid will be plotted."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:35
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton11)
-#: rc.cpp:1087 rc.cpp:2067 rc.cpp:1087 rc.cpp:2067
+#: rc.cpp:817 rc.cpp:817
 msgid "None"
 msgstr "Dim"
 
 #. i18n: file: settingspagediagram.ui:42
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton12)
-#: rc.cpp:1090 rc.cpp:2070 rc.cpp:1090 rc.cpp:2070
+#: rc.cpp:820 rc.cpp:820
 msgid "A line for every tic."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:45
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton12)
-#: rc.cpp:1093 rc.cpp:2073 rc.cpp:1093 rc.cpp:2073
+#: rc.cpp:823 rc.cpp:823
 msgid "Lines"
 msgstr "Llinellau"
 
 #. i18n: file: settingspagediagram.ui:52
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton13)
-#: rc.cpp:1096 rc.cpp:2076 rc.cpp:1096 rc.cpp:2076
+#: rc.cpp:826 rc.cpp:826
 msgid "Only little crosses in the plot area."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:55
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton13)
-#: rc.cpp:1099 rc.cpp:2079 rc.cpp:1099 rc.cpp:2079
+#: rc.cpp:829 rc.cpp:829
 msgid "Crosses"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:62
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton14)
-#: rc.cpp:1102 rc.cpp:2082 rc.cpp:1102 rc.cpp:2082
+#: rc.cpp:832 rc.cpp:832
 msgid "Circles around the Origin."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:65
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton14)
-#: rc.cpp:1105 rc.cpp:2085 rc.cpp:1105 rc.cpp:2085
+#: rc.cpp:835 rc.cpp:835
 msgid "Polar"
 msgstr "Pegynnol"
 
 #. i18n: file: settingspagediagram.ui:75
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1108 rc.cpp:2088 rc.cpp:1108 rc.cpp:2088
+#: rc.cpp:838 rc.cpp:838
 msgid "Axis Labels"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:81
 #. i18n: ectx: property (whatsThis), widget (QLabel, label)
-#: rc.cpp:1111 rc.cpp:2091 rc.cpp:1111 rc.cpp:2091
+#: rc.cpp:841 rc.cpp:841
 msgid "Label on horizontal axis."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:84
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1114 rc.cpp:2094 rc.cpp:1114 rc.cpp:2094
+#: rc.cpp:844 rc.cpp:844
 msgid "Horizontal Axis Label: "
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:94
 #. i18n: ectx: property (text), widget (QLineEdit, kcfg_LabelHorizontalAxis)
-#: rc.cpp:1117 rc.cpp:2097 rc.cpp:1117 rc.cpp:2097
+#: rc.cpp:847 rc.cpp:847
 msgid "X"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:101
 #. i18n: ectx: property (whatsThis), widget (QLabel, label_2)
-#: rc.cpp:1120 rc.cpp:2100 rc.cpp:1120 rc.cpp:2100
+#: rc.cpp:850 rc.cpp:850
 msgid "Label on vertical axis."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:104
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1123 rc.cpp:2103 rc.cpp:1123 rc.cpp:2103
+#: rc.cpp:853 rc.cpp:853
 msgid "Vertical Axis Label:"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:114
 #. i18n: ectx: property (text), widget (QLineEdit, kcfg_LabelVerticalAxis)
-#: rc.cpp:1126 rc.cpp:2106 rc.cpp:1126 rc.cpp:2106
+#: rc.cpp:856 rc.cpp:856
 msgid "Y"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:124
 #. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:1129 rc.cpp:2109 rc.cpp:1129 rc.cpp:2109
+#: rc.cpp:859 rc.cpp:859
 msgid "Axis widths:"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:156
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:1135 rc.cpp:2115 rc.cpp:1135 rc.cpp:2115
+#: rc.cpp:865 rc.cpp:865
 msgid "Line &width:"
 msgstr "&Lled y llinell:"
 
 #. i18n: file: settingspagediagram.ui:188
 #. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#: rc.cpp:1141 rc.cpp:2121 rc.cpp:1141 rc.cpp:2121
+#: rc.cpp:871 rc.cpp:871
 msgid "Tic width:"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:220
 #. i18n: ectx: property (text), widget (QLabel, textLabel8_4)
-#: rc.cpp:1147 rc.cpp:2127 rc.cpp:1147 rc.cpp:2127
+#: rc.cpp:877 rc.cpp:877
 msgid "Tic length:"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:252
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowLabel)
-#: rc.cpp:1153 rc.cpp:2133 rc.cpp:1153 rc.cpp:2133
+#: rc.cpp:883 rc.cpp:883
 msgid "visible tic labels"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:255
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowLabel)
-#: rc.cpp:1156 rc.cpp:2136 rc.cpp:1156 rc.cpp:2136
+#: rc.cpp:886 rc.cpp:886
 msgid "Check this if the axes' tics should be labeled."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:258
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowLabel)
-#: rc.cpp:1159 rc.cpp:2139 rc.cpp:1159 rc.cpp:2139
+#: rc.cpp:889 rc.cpp:889
 msgid "Show labels"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:268
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowAxes)
-#: rc.cpp:1162 rc.cpp:2142 rc.cpp:1162 rc.cpp:2142
+#: rc.cpp:892 rc.cpp:892
 msgid "visible axes"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:271
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowAxes)
-#: rc.cpp:1165 rc.cpp:2145 rc.cpp:1165 rc.cpp:2145
+#: rc.cpp:895 rc.cpp:895
 msgid "Check this if the axes should be visible."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:274
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowAxes)
-#: rc.cpp:1168 rc.cpp:2148 rc.cpp:1168 rc.cpp:2148
+#: rc.cpp:898 rc.cpp:898
 msgid "Show axes"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:284
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowArrows)
-#: rc.cpp:1171 rc.cpp:2151 rc.cpp:1171 rc.cpp:2151
+#: rc.cpp:901 rc.cpp:901
 msgid "visible arrows at the end of the axes"
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:287
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowArrows)
-#: rc.cpp:1174 rc.cpp:2154 rc.cpp:1174 rc.cpp:2154
+#: rc.cpp:904 rc.cpp:904
 msgid "Check this if the axes should have arrows at their ends."
 msgstr ""
 
 #. i18n: file: settingspagediagram.ui:290
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowArrows)
-#: rc.cpp:1177 rc.cpp:2157 rc.cpp:1177 rc.cpp:2157
+#: rc.cpp:907 rc.cpp:907
 msgid "Show arrows"
 msgstr ""
 
 #. i18n: file: settingspagefonts.ui:23
 #. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#: rc.cpp:1180 rc.cpp:2160 rc.cpp:1180 rc.cpp:2160
+#: rc.cpp:910 rc.cpp:910
 msgid "Axes labels:"
 msgstr ""
 
 #. i18n: file: settingspagefonts.ui:45
 #. i18n: ectx: property (text), widget (QLabel, textLabel10_3)
-#: rc.cpp:1183 rc.cpp:2163 rc.cpp:1183 rc.cpp:2163
+#: rc.cpp:913 rc.cpp:913
 msgid "Diagram labels:"
 msgstr ""
 
 #. i18n: file: settingspagefonts.ui:67
 #. i18n: ectx: property (text), widget (QLabel, textLabel10_4)
-#: rc.cpp:1186 rc.cpp:2166 rc.cpp:1186 rc.cpp:2166
+#: rc.cpp:916 rc.cpp:916
 msgid "Header table:"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:20
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_anglemode)
-#: rc.cpp:1192 rc.cpp:2172 rc.cpp:1192 rc.cpp:2172
+#: rc.cpp:922 rc.cpp:922
 msgid "Angle Mode"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:32
 #. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton1)
-#: rc.cpp:1195 rc.cpp:2175 rc.cpp:1195 rc.cpp:2175
+#: rc.cpp:925 rc.cpp:925
 msgid "Trigonometric functions use radian mode for angles."
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:35
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton1)
-#: rc.cpp:1198 rc.cpp:2178 rc.cpp:1198 rc.cpp:2178
+#: rc.cpp:928 rc.cpp:928
 msgid ""
 "Check this button to use radian mode to measure angles. This is important "
 "for trigonometric functions only."
@@ -2958,19 +2357,19 @@
 
 #. i18n: file: settingspagegeneral.ui:38
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton1)
-#: rc.cpp:1201 rc.cpp:2181 rc.cpp:1201 rc.cpp:2181
+#: rc.cpp:931 rc.cpp:931
 msgid "&Radian"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:45
 #. i18n: ectx: property (toolTip), widget (QRadioButton, radioButton2)
-#: rc.cpp:1204 rc.cpp:2184 rc.cpp:1204 rc.cpp:2184
+#: rc.cpp:934 rc.cpp:934
 msgid "Trigonometric functions use degree mode for angles."
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:48
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, radioButton2)
-#: rc.cpp:1207 rc.cpp:2187 rc.cpp:1207 rc.cpp:2187
+#: rc.cpp:937 rc.cpp:937
 msgid ""
 "Check this button to use degree mode to measure angles. This is important "
 "for trigonometric functions only."
@@ -2978,31 +2377,31 @@
 
 #. i18n: file: settingspagegeneral.ui:51
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton2)
-#: rc.cpp:1210 rc.cpp:2190 rc.cpp:1210 rc.cpp:2190
+#: rc.cpp:940 rc.cpp:940
 msgid "&Degree"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:61
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:1213 rc.cpp:2193 rc.cpp:1213 rc.cpp:2193
+#: rc.cpp:943 rc.cpp:943
 msgid "Zoom"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:73
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:1216 rc.cpp:2196 rc.cpp:1216 rc.cpp:2196
+#: rc.cpp:946 rc.cpp:946
 msgid "Zoom In by:"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:86
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
-#: rc.cpp:1219 rc.cpp:2199 rc.cpp:1219 rc.cpp:2199
+#: rc.cpp:949 rc.cpp:949
 msgid "Zoom Out by:"
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:99
 #. i18n: ectx: property (whatsThis), widget (KIntNumInput, kcfg_zoomOutStep)
-#: rc.cpp:1222 rc.cpp:2202 rc.cpp:1222 rc.cpp:2202
+#: rc.cpp:952 rc.cpp:952
 msgid "The value the Zoom Out tool should use."
 msgstr ""
 
@@ -3014,203 +2413,194 @@
 #. i18n: ectx: property (suffix), widget (KIntNumInput, kcfg_zoomOutStep)
 #. i18n: file: settingspagegeneral.ui:136
 #. i18n: ectx: property (suffix), widget (KIntNumInput, kcfg_zoomInStep)
-#. i18n: file: settingspagegeneral.ui:114
-#. i18n: ectx: property (suffix), widget (KIntNumInput, kcfg_zoomOutStep)
-#. i18n: file: settingspagegeneral.ui:136
-#. i18n: ectx: property (suffix), widget (KIntNumInput, kcfg_zoomInStep)
-#. i18n: file: settingspagegeneral.ui:114
-#. i18n: ectx: property (suffix), widget (KIntNumInput, kcfg_zoomOutStep)
-#. i18n: file: settingspagegeneral.ui:136
-#. i18n: ectx: property (suffix), widget (KIntNumInput, kcfg_zoomInStep)
-#: rc.cpp:1226 rc.cpp:1233 rc.cpp:2206 rc.cpp:2213 rc.cpp:1226 rc.cpp:1233
-#: rc.cpp:2206 rc.cpp:2213
+#: rc.cpp:956 rc.cpp:963 rc.cpp:956 rc.cpp:963
 #, no-c-format
 msgid "%"
 msgstr "%"
 
 #. i18n: file: settingspagegeneral.ui:121
 #. i18n: ectx: property (whatsThis), widget (KIntNumInput, kcfg_zoomInStep)
-#: rc.cpp:1229 rc.cpp:2209 rc.cpp:1229 rc.cpp:2209
+#: rc.cpp:959 rc.cpp:959
 msgid "The value the Zoom In tool should use."
 msgstr ""
 
 #. i18n: file: settingspagegeneral.ui:150
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_DetailedTracing)
-#: rc.cpp:1236 rc.cpp:2216 rc.cpp:1236 rc.cpp:2216
+#: rc.cpp:966 rc.cpp:966
 msgid "Draw tangent and normal when tracing"
 msgstr ""
 
 #. i18n: file: sliderwidget.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, SliderWidget)
-#: rc.cpp:1239 rc.cpp:2219 rc.cpp:1239 rc.cpp:2219
+#: rc.cpp:969 rc.cpp:969
 msgid "Slider"
 msgstr ""
 
 #. i18n: file: sliderwidget.ui:43
 #. i18n: ectx: property (text), widget (QLabel, valueLabel)
-#: rc.cpp:1242 rc.cpp:2222 rc.cpp:1242 rc.cpp:2222
+#: rc.cpp:972 rc.cpp:972
 msgid "<0>"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:12
 #. i18n: ectx: label, entry (AxesLineWidth), group (Coordinate System)
-#: rc.cpp:529 rc.cpp:2231 rc.cpp:529 rc.cpp:2231
+#: rc.cpp:981 rc.cpp:981
 msgid "Axis-line width"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:13
 #. i18n: ectx: whatsthis, entry (AxesLineWidth), group (Coordinate System)
-#: rc.cpp:532 rc.cpp:2234 rc.cpp:532 rc.cpp:2234
+#: rc.cpp:984 rc.cpp:984
 msgid "Enter the width of the axis lines."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:17
 #. i18n: ectx: label, entry (ShowLabel), group (Coordinate System)
-#: rc.cpp:535 rc.cpp:2237 rc.cpp:535 rc.cpp:2237
+#: rc.cpp:987 rc.cpp:987
 msgid "Checked if labels are visible"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:18
 #. i18n: ectx: whatsthis, entry (ShowLabel), group (Coordinate System)
-#: rc.cpp:538 rc.cpp:2240 rc.cpp:538 rc.cpp:2240
+#: rc.cpp:990 rc.cpp:990
 msgid "Check this box if the labels at the tics should be shown."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:22
 #. i18n: ectx: label, entry (ShowAxes), group (Coordinate System)
-#: rc.cpp:541 rc.cpp:2243 rc.cpp:541 rc.cpp:2243
+#: rc.cpp:993 rc.cpp:993
 msgid "Checked if axes are visible"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:23
 #. i18n: ectx: whatsthis, entry (ShowAxes), group (Coordinate System)
-#: rc.cpp:544 rc.cpp:2246 rc.cpp:544 rc.cpp:2246
+#: rc.cpp:996 rc.cpp:996
 msgid "Check this box if axes should be shown."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:27
 #. i18n: ectx: label, entry (ShowArrows), group (Coordinate System)
-#: rc.cpp:547 rc.cpp:2249 rc.cpp:547 rc.cpp:2249
+#: rc.cpp:999 rc.cpp:999
 msgid "Checked if arrows are visible"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:28
 #. i18n: ectx: whatsthis, entry (ShowArrows), group (Coordinate System)
-#: rc.cpp:550 rc.cpp:2252 rc.cpp:550 rc.cpp:2252
+#: rc.cpp:1002 rc.cpp:1002
 msgid "Check this box if axes should have arrows."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:32
 #. i18n: ectx: label, entry (GridLineWidth), group (Coordinate System)
-#: rc.cpp:553 rc.cpp:2255 rc.cpp:553 rc.cpp:2255
+#: rc.cpp:1005 rc.cpp:1005
 msgid "Grid Line Width"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:33
 #. i18n: ectx: whatsthis, entry (GridLineWidth), group (Coordinate System)
-#: rc.cpp:556 rc.cpp:2258 rc.cpp:556 rc.cpp:2258
+#: rc.cpp:1008 rc.cpp:1008
 msgid "Enter the width of the grid lines."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:38
 #. i18n: ectx: whatsthis, entry (GridStyle), group (Coordinate System)
-#: rc.cpp:562 rc.cpp:2264 rc.cpp:562 rc.cpp:2264
+#: rc.cpp:1014 rc.cpp:1014
 msgid "Choose a suitable grid style."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:42
 #. i18n: ectx: label, entry (TicLength), group (Coordinate System)
-#: rc.cpp:565 rc.cpp:2267 rc.cpp:565 rc.cpp:2267
+#: rc.cpp:1017 rc.cpp:1017
 msgid "Tic length"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:43
 #. i18n: ectx: whatsthis, entry (TicLength), group (Coordinate System)
-#: rc.cpp:568 rc.cpp:2270 rc.cpp:568 rc.cpp:2270
+#: rc.cpp:1020 rc.cpp:1020
 msgid "Enter the length of the tic lines"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:47
 #. i18n: ectx: label, entry (TicWidth), group (Coordinate System)
-#: rc.cpp:571 rc.cpp:2273 rc.cpp:571 rc.cpp:2273
+#: rc.cpp:1023 rc.cpp:1023
 msgid "Tic width"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:48
 #. i18n: ectx: whatsthis, entry (TicWidth), group (Coordinate System)
-#: rc.cpp:574 rc.cpp:2276 rc.cpp:574 rc.cpp:2276
+#: rc.cpp:1026 rc.cpp:1026
 msgid "Enter the width of the tic lines."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:52
 #. i18n: ectx: label, entry (XMin), group (Coordinate System)
-#: rc.cpp:577 rc.cpp:2279 rc.cpp:577 rc.cpp:2279
+#: rc.cpp:1029 rc.cpp:1029
 msgid "Left boundary"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:53
 #. i18n: ectx: whatsthis, entry (XMin), group (Coordinate System)
-#: rc.cpp:580 rc.cpp:2282 rc.cpp:580 rc.cpp:2282
+#: rc.cpp:1032 rc.cpp:1032
 msgid "Enter the left boundary of the plotting area."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:57
 #. i18n: ectx: label, entry (XMax), group (Coordinate System)
-#: rc.cpp:583 rc.cpp:2285 rc.cpp:583 rc.cpp:2285
+#: rc.cpp:1035 rc.cpp:1035
 msgid "Right boundary"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:58
 #. i18n: ectx: whatsthis, entry (XMax), group (Coordinate System)
-#: rc.cpp:586 rc.cpp:2288 rc.cpp:586 rc.cpp:2288
+#: rc.cpp:1038 rc.cpp:1038
 msgid "Enter the right boundary of the plotting area."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:62
 #. i18n: ectx: label, entry (YMin), group (Coordinate System)
-#: rc.cpp:589 rc.cpp:2291 rc.cpp:589 rc.cpp:2291
+#: rc.cpp:1041 rc.cpp:1041
 msgid "Lower boundary"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:63
 #. i18n: ectx: whatsthis, entry (YMin), group (Coordinate System)
-#: rc.cpp:592 rc.cpp:2294 rc.cpp:592 rc.cpp:2294
+#: rc.cpp:1044 rc.cpp:1044
 msgid "Enter the lower boundary of the plotting area."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:67
 #. i18n: ectx: label, entry (YMax), group (Coordinate System)
-#: rc.cpp:595 rc.cpp:2297 rc.cpp:595 rc.cpp:2297
+#: rc.cpp:1047 rc.cpp:1047
 msgid "Upper boundary"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:68
 #. i18n: ectx: whatsthis, entry (YMax), group (Coordinate System)
-#: rc.cpp:598 rc.cpp:2300 rc.cpp:598 rc.cpp:2300
+#: rc.cpp:1050 rc.cpp:1050
 msgid "Enter the upper boundary of the plotting area."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:72
 #. i18n: ectx: label, entry (LabelHorizontalAxis), group (Coordinate System)
-#: rc.cpp:601 rc.cpp:2303 rc.cpp:601 rc.cpp:2303
+#: rc.cpp:1053 rc.cpp:1053
 msgid "Label to Horizontal Axis"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:73
 #. i18n: ectx: whatsthis, entry (LabelHorizontalAxis), group (Coordinate System)
-#: rc.cpp:604 rc.cpp:2306 rc.cpp:604 rc.cpp:2306
+#: rc.cpp:1056 rc.cpp:1056
 msgid "Label to Horizontal Axis."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:77
 #. i18n: ectx: label, entry (LabelVerticalAxis), group (Coordinate System)
-#: rc.cpp:607 rc.cpp:2309 rc.cpp:607 rc.cpp:2309
+#: rc.cpp:1059 rc.cpp:1059
 msgid "Label to Vertical Axis"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:78
 #. i18n: ectx: whatsthis, entry (LabelVerticalAxis), group (Coordinate System)
-#: rc.cpp:610 rc.cpp:2312 rc.cpp:610 rc.cpp:2312
+#: rc.cpp:1062 rc.cpp:1062
 msgid "Label to Vertical Axis."
 msgstr ""
 
@@ -3222,16 +2612,7 @@
 #. i18n: ectx: label, entry (XScalingMode), group (Scaling)
 #. i18n: file: kmplot.kcfg:90
 #. i18n: ectx: label, entry (YScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:85
-#. i18n: ectx: label, entry (XScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:90
-#. i18n: ectx: label, entry (YScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:85
-#. i18n: ectx: label, entry (XScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:90
-#. i18n: ectx: label, entry (YScalingMode), group (Scaling)
-#: rc.cpp:613 rc.cpp:619 rc.cpp:2315 rc.cpp:2321 rc.cpp:613 rc.cpp:619
-#: rc.cpp:2315 rc.cpp:2321
+#: rc.cpp:1065 rc.cpp:1071 rc.cpp:1065 rc.cpp:1071
 msgid "Whether to use automatic or custom scaling."
 msgstr ""
 
@@ -3243,280 +2624,271 @@
 #. i18n: ectx: whatsthis, entry (XScalingMode), group (Scaling)
 #. i18n: file: kmplot.kcfg:91
 #. i18n: ectx: whatsthis, entry (YScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:86
-#. i18n: ectx: whatsthis, entry (XScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:91
-#. i18n: ectx: whatsthis, entry (YScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:86
-#. i18n: ectx: whatsthis, entry (XScalingMode), group (Scaling)
-#. i18n: file: kmplot.kcfg:91
-#. i18n: ectx: whatsthis, entry (YScalingMode), group (Scaling)
-#: rc.cpp:616 rc.cpp:622 rc.cpp:2318 rc.cpp:2324 rc.cpp:616 rc.cpp:622
-#: rc.cpp:2318 rc.cpp:2324
+#: rc.cpp:1068 rc.cpp:1074 rc.cpp:1068 rc.cpp:1074
 msgid "Select whether to use automatic or custom scaling."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:95
 #. i18n: ectx: label, entry (XScaling), group (Scaling)
-#: rc.cpp:625 rc.cpp:2327 rc.cpp:625 rc.cpp:2327
+#: rc.cpp:1077 rc.cpp:1077
 msgid "Width of a unit from tic to tic"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:96
 #. i18n: ectx: whatsthis, entry (XScaling), group (Scaling)
-#: rc.cpp:628 rc.cpp:2330 rc.cpp:628 rc.cpp:2330
+#: rc.cpp:1080 rc.cpp:1080
 msgid "Enter the width of a unit from tic to tic."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:100
 #. i18n: ectx: label, entry (YScaling), group (Scaling)
-#: rc.cpp:631 rc.cpp:2333 rc.cpp:631 rc.cpp:2333
+#: rc.cpp:1083 rc.cpp:1083
 msgid "Height of a unit from tic to tic"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:101
 #. i18n: ectx: whatsthis, entry (YScaling), group (Scaling)
-#: rc.cpp:634 rc.cpp:2336 rc.cpp:634 rc.cpp:2336
+#: rc.cpp:1086 rc.cpp:1086
 msgid "Enter the height of a unit from tic to tic."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:108
 #. i18n: ectx: label, entry (AxesFont), group (Fonts)
-#: rc.cpp:637 rc.cpp:2339 rc.cpp:637 rc.cpp:2339
+#: rc.cpp:1089 rc.cpp:1089
 msgid "Font of the axis labels"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:109
 #. i18n: ectx: whatsthis, entry (AxesFont), group (Fonts)
-#: rc.cpp:640 rc.cpp:2342 rc.cpp:640 rc.cpp:2342
+#: rc.cpp:1092 rc.cpp:1092
 msgid "Choose a font for the axis labels."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:113
 #. i18n: ectx: label, entry (HeaderTableFont), group (Fonts)
-#: rc.cpp:643 rc.cpp:2345 rc.cpp:643 rc.cpp:2345
+#: rc.cpp:1095 rc.cpp:1095
 msgid "Font of the printed header table"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:114
 #. i18n: ectx: whatsthis, entry (HeaderTableFont), group (Fonts)
-#: rc.cpp:646 rc.cpp:2348 rc.cpp:646 rc.cpp:2348
+#: rc.cpp:1098 rc.cpp:1098
 msgid "Choose a font for the table printed at the top of the page."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:118
 #. i18n: ectx: label, entry (LabelFont), group (Fonts)
-#: rc.cpp:649 rc.cpp:2351 rc.cpp:649 rc.cpp:2351
+#: rc.cpp:1101 rc.cpp:1101
 msgid "Font of diagram labels"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:119
 #. i18n: ectx: whatsthis, entry (LabelFont), group (Fonts)
-#: rc.cpp:652 rc.cpp:2354 rc.cpp:652 rc.cpp:2354
+#: rc.cpp:1104 rc.cpp:1104
 msgid "Choose a font for diagram labels."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:126
 #. i18n: ectx: label, entry (AxesColor), group (Colors)
-#: rc.cpp:655 rc.cpp:2357 rc.cpp:655 rc.cpp:2357
+#: rc.cpp:1107 rc.cpp:1107
 msgid "Axis-line color"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:127
 #. i18n: ectx: whatsthis, entry (AxesColor), group (Colors)
-#: rc.cpp:658 rc.cpp:2360 rc.cpp:658 rc.cpp:2360
+#: rc.cpp:1110 rc.cpp:1110
 msgid "Enter the color of the axis lines."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:131
 #. i18n: ectx: label, entry (GridColor), group (Colors)
-#: rc.cpp:661 rc.cpp:2363 rc.cpp:661 rc.cpp:2363
+#: rc.cpp:1113 rc.cpp:1113
 msgid "Grid Color"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:132
 #. i18n: ectx: whatsthis, entry (GridColor), group (Colors)
-#: rc.cpp:664 rc.cpp:2366 rc.cpp:664 rc.cpp:2366
+#: rc.cpp:1116 rc.cpp:1116
 msgid "Choose a color for the grid lines."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:136
 #. i18n: ectx: label, entry (Color0), group (Colors)
-#: rc.cpp:667 rc.cpp:2369 rc.cpp:667 rc.cpp:2369
+#: rc.cpp:1119 rc.cpp:1119
 msgid "Color of function 1"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:137
 #. i18n: ectx: whatsthis, entry (Color0), group (Colors)
-#: rc.cpp:670 rc.cpp:2372 rc.cpp:670 rc.cpp:2372
+#: rc.cpp:1122 rc.cpp:1122
 msgid "Choose a color for function 1."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:141
 #. i18n: ectx: label, entry (Color1), group (Colors)
-#: rc.cpp:673 rc.cpp:2375 rc.cpp:673 rc.cpp:2375
+#: rc.cpp:1125 rc.cpp:1125
 msgid "Color of function 2"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:142
 #. i18n: ectx: whatsthis, entry (Color1), group (Colors)
-#: rc.cpp:676 rc.cpp:2378 rc.cpp:676 rc.cpp:2378
+#: rc.cpp:1128 rc.cpp:1128
 msgid "Choose a color for function 2."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:146
 #. i18n: ectx: label, entry (Color2), group (Colors)
-#: rc.cpp:679 rc.cpp:2381 rc.cpp:679 rc.cpp:2381
+#: rc.cpp:1131 rc.cpp:1131
 msgid "Color of function 3"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:147
 #. i18n: ectx: whatsthis, entry (Color2), group (Colors)
-#: rc.cpp:682 rc.cpp:2384 rc.cpp:682 rc.cpp:2384
+#: rc.cpp:1134 rc.cpp:1134
 msgid "Choose a color for function 3."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:151
 #. i18n: ectx: label, entry (Color3), group (Colors)
-#: rc.cpp:685 rc.cpp:2387 rc.cpp:685 rc.cpp:2387
+#: rc.cpp:1137 rc.cpp:1137
 msgid "Color of function 4"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:152
 #. i18n: ectx: whatsthis, entry (Color3), group (Colors)
-#: rc.cpp:688 rc.cpp:2390 rc.cpp:688 rc.cpp:2390
+#: rc.cpp:1140 rc.cpp:1140
 msgid "Choose a color for function 4."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:156
 #. i18n: ectx: label, entry (Color4), group (Colors)
-#: rc.cpp:691 rc.cpp:2393 rc.cpp:691 rc.cpp:2393
+#: rc.cpp:1143 rc.cpp:1143
 msgid "Color of function 5"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:157
 #. i18n: ectx: whatsthis, entry (Color4), group (Colors)
-#: rc.cpp:694 rc.cpp:2396 rc.cpp:694 rc.cpp:2396
+#: rc.cpp:1146 rc.cpp:1146
 msgid "Choose a color for function 5."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:161
 #. i18n: ectx: label, entry (Color5), group (Colors)
-#: rc.cpp:697 rc.cpp:2399 rc.cpp:697 rc.cpp:2399
+#: rc.cpp:1149 rc.cpp:1149
 msgid "Color of function 6"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:162
 #. i18n: ectx: whatsthis, entry (Color5), group (Colors)
-#: rc.cpp:700 rc.cpp:2402 rc.cpp:700 rc.cpp:2402
+#: rc.cpp:1152 rc.cpp:1152
 msgid "Choose a color for function 6."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:166
 #. i18n: ectx: label, entry (Color6), group (Colors)
-#: rc.cpp:703 rc.cpp:2405 rc.cpp:703 rc.cpp:2405
+#: rc.cpp:1155 rc.cpp:1155
 msgid "Color of function 7"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:167
 #. i18n: ectx: whatsthis, entry (Color6), group (Colors)
-#: rc.cpp:706 rc.cpp:2408 rc.cpp:706 rc.cpp:2408
+#: rc.cpp:1158 rc.cpp:1158
 msgid "Choose a color for function 7."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:171
 #. i18n: ectx: label, entry (Color7), group (Colors)
-#: rc.cpp:709 rc.cpp:2411 rc.cpp:709 rc.cpp:2411
+#: rc.cpp:1161 rc.cpp:1161
 msgid "Color of function 8"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:172
 #. i18n: ectx: whatsthis, entry (Color7), group (Colors)
-#: rc.cpp:712 rc.cpp:2414 rc.cpp:712 rc.cpp:2414
+#: rc.cpp:1164 rc.cpp:1164
 msgid "Choose a color for function 8."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:176
 #. i18n: ectx: label, entry (Color8), group (Colors)
-#: rc.cpp:715 rc.cpp:2417 rc.cpp:715 rc.cpp:2417
+#: rc.cpp:1167 rc.cpp:1167
 msgid "Color of function 9"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:177
 #. i18n: ectx: whatsthis, entry (Color8), group (Colors)
-#: rc.cpp:718 rc.cpp:2420 rc.cpp:718 rc.cpp:2420
+#: rc.cpp:1170 rc.cpp:1170
 msgid "Choose a color for function 9."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:181
 #. i18n: ectx: label, entry (Color9), group (Colors)
-#: rc.cpp:721 rc.cpp:2423 rc.cpp:721 rc.cpp:2423
+#: rc.cpp:1173 rc.cpp:1173
 msgid "Color of function 10"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:182
 #. i18n: ectx: whatsthis, entry (Color9), group (Colors)
-#: rc.cpp:724 rc.cpp:2426 rc.cpp:724 rc.cpp:2426
+#: rc.cpp:1176 rc.cpp:1176
 msgid "Choose a color for function 10."
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:189
 #. i18n: ectx: label, entry (anglemode), group (General)
-#: rc.cpp:727 rc.cpp:2429 rc.cpp:727 rc.cpp:2429
+#: rc.cpp:1179 rc.cpp:1179
 msgid "Radians instead of degrees"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:190
 #. i18n: ectx: whatsthis, entry (anglemode), group (General)
-#: rc.cpp:730 rc.cpp:2432 rc.cpp:730 rc.cpp:2432
+#: rc.cpp:1182 rc.cpp:1182
 msgid "Check the box if you want to use radians"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:194
 #. i18n: ectx: label, entry (backgroundcolor), group (General)
-#: rc.cpp:733 rc.cpp:2435 rc.cpp:733 rc.cpp:2435
+#: rc.cpp:1185 rc.cpp:1185
 msgid "Background color"
 msgstr "Lliw'r cefndir"
 
 #. i18n: file: kmplot.kcfg:195
 #. i18n: ectx: whatsthis, entry (backgroundcolor), group (General)
-#: rc.cpp:736 rc.cpp:2438 rc.cpp:736 rc.cpp:2438
+#: rc.cpp:1188 rc.cpp:1188
 msgid "The background color for the graph"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:199
 #. i18n: ectx: label, entry (zoomInStep), group (General)
-#: rc.cpp:739 rc.cpp:2441 rc.cpp:739 rc.cpp:2441
+#: rc.cpp:1191 rc.cpp:1191
 msgid "Zoom-in step"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:200
 #. i18n: ectx: whatsthis, entry (zoomInStep), group (General)
-#: rc.cpp:742 rc.cpp:2444 rc.cpp:742 rc.cpp:2444
+#: rc.cpp:1194 rc.cpp:1194
 msgid "The value the zoom-in tool should use"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:204
 #. i18n: ectx: label, entry (zoomOutStep), group (General)
-#: rc.cpp:745 rc.cpp:2447 rc.cpp:745 rc.cpp:2447
+#: rc.cpp:1197 rc.cpp:1197
 msgid "Zoom-out step"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:205
 #. i18n: ectx: whatsthis, entry (zoomOutStep), group (General)
-#: rc.cpp:748 rc.cpp:2450 rc.cpp:748 rc.cpp:2450
+#: rc.cpp:1200 rc.cpp:1200
 msgid "The value the zoom-out tool should use"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:209
 #. i18n: ectx: label, entry (DetailedTracing), group (General)
-#: rc.cpp:751 rc.cpp:2453 rc.cpp:751 rc.cpp:2453
+#: rc.cpp:1203 rc.cpp:1203
 msgid "Extra detail when tracing"
 msgstr ""
 
 #. i18n: file: kmplot.kcfg:210
 #. i18n: ectx: whatsthis, entry (DetailedTracing), group (General)
-#: rc.cpp:754 rc.cpp:2456 rc.cpp:754 rc.cpp:2456
+#: rc.cpp:1206 rc.cpp:1206
 msgid ""
 "Whether to show extra detail such as the tangent and normal when tracing a "
 "plot."
@@ -3530,16 +2902,7 @@
 #. i18n: ectx: Menu (view)
 #. i18n: file: kmplot_part_readonly.rc:15
 #. i18n: ectx: Menu (view)
-#. i18n: file: kmplot_part.rc:19
-#. i18n: ectx: Menu (view)
-#. i18n: file: kmplot_part_readonly.rc:15
-#. i18n: ectx: Menu (view)
-#. i18n: file: kmplot_part.rc:19
-#. i18n: ectx: Menu (view)
-#. i18n: file: kmplot_part_readonly.rc:15
-#. i18n: ectx: Menu (view)
-#: rc.cpp:760 rc.cpp:775 rc.cpp:2462 rc.cpp:2477 rc.cpp:760 rc.cpp:775
-#: rc.cpp:2462 rc.cpp:2477
+#: rc.cpp:1215 rc.cpp:1227 rc.cpp:1215 rc.cpp:1227
 msgid "&View"
 msgstr ""
 
@@ -3551,85 +2914,181 @@
 #. i18n: ectx: Menu (tools)
 #. i18n: file: kmplot_part_readonly.rc:26
 #. i18n: ectx: Menu (tools)
-#. i18n: file: kmplot_part.rc:29
-#. i18n: ectx: Menu (tools)
-#. i18n: file: kmplot_part_readonly.rc:26
-#. i18n: ectx: Menu (tools)
-#. i18n: file: kmplot_part.rc:29
-#. i18n: ectx: Menu (tools)
-#. i18n: file: kmplot_part_readonly.rc:26
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:763 rc.cpp:778 rc.cpp:2465 rc.cpp:2480 rc.cpp:763 rc.cpp:778
-#: rc.cpp:2465 rc.cpp:2480
+#: rc.cpp:1218 rc.cpp:1230 rc.cpp:1218 rc.cpp:1230
 msgid "&Tools"
 msgstr ""
 
-#. i18n: file: kmplot_part.rc:35
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part_readonly.rc:32
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_shell.rc:13
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part.rc:35
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part_readonly.rc:32
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_shell.rc:13
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part.rc:35
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part_readonly.rc:32
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_shell.rc:13
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part.rc:35
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_part_readonly.rc:32
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kmplot_shell.rc:13
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:766 rc.cpp:781 rc.cpp:790 rc.cpp:2468 rc.cpp:2483 rc.cpp:2492
-#: rc.cpp:766 rc.cpp:781 rc.cpp:790 rc.cpp:2468 rc.cpp:2483 rc.cpp:2492
-msgid "&Settings"
-msgstr ""
-
-#. i18n: file: kmplot_part.rc:41
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_part_readonly.rc:35
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_shell.rc:26
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_part.rc:41
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_part_readonly.rc:35
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_shell.rc:26
-#. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_part.rc:41
+#. i18n: file: kmplot_part.rc:38
 #. i18n: ectx: Menu (help)
 #. i18n: file: kmplot_part_readonly.rc:35
 #. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_shell.rc:26
+#. i18n: file: kmplot_shell.rc:13
 #. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_part.rc:41
+#. i18n: file: kmplot_part.rc:38
 #. i18n: ectx: Menu (help)
 #. i18n: file: kmplot_part_readonly.rc:35
 #. i18n: ectx: Menu (help)
-#. i18n: file: kmplot_shell.rc:26
+#. i18n: file: kmplot_shell.rc:13
 #. i18n: ectx: Menu (help)
-#: rc.cpp:769 rc.cpp:784 rc.cpp:793 rc.cpp:2471 rc.cpp:2486 rc.cpp:2495
-#: rc.cpp:769 rc.cpp:784 rc.cpp:793 rc.cpp:2471 rc.cpp:2486 rc.cpp:2495
+#: rc.cpp:1221 rc.cpp:1233 rc.cpp:1239 rc.cpp:1221 rc.cpp:1233 rc.cpp:1239
 msgid "&Help"
 msgstr ""
 
 #. i18n: file: kmplot_shell.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:787 rc.cpp:2489 rc.cpp:787 rc.cpp:2489
+#: rc.cpp:1236 rc.cpp:1236
 msgid "&File"
 msgstr ""
 
-#. i18n: file: kmplot_shell.rc:30
+#. i18n: file: kmplot_shell.rc:17
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:796 rc.cpp:2498 rc.cpp:796 rc.cpp:2498
+#: rc.cpp:1242 rc.cpp:1242
 msgid "Main Toolbar"
 msgstr ""
+
+#: kgradientdialog.cpp:383
+msgid "(Double-click on the gradient to add a stop)"
+msgstr ""
+
+#: kgradientdialog.cpp:384
+msgid "Remove stop"
+msgstr ""
+
+#: kgradientdialog.cpp:405
+msgid "Choose a Gradient"
+msgstr ""
+
+#: xparser.cpp:143
+msgid "Error in extension."
+msgstr ""
+
+#: kparametereditor.cpp:213 kparametereditor.cpp:283
+msgid "*.txt|Plain Text File "
+msgstr ""
+
+#: kparametereditor.cpp:219 kmplotio.cpp:342
+msgid "The file does not exist."
+msgstr ""
+
+#: kparametereditor.cpp:230 kparametereditor.cpp:272
+msgid "An error appeared when opening this file"
+msgstr ""
+
+#: kparametereditor.cpp:259
+#, kde-format
+msgid ""
+"Line %1 is not a valid parameter value and will therefore not be included. "
+"Do you want to continue?"
+msgstr ""
+
+#: kparametereditor.cpp:265
+msgid "Would you like to be informed about other lines that cannot be read?"
+msgstr ""
+
+#: kparametereditor.cpp:265
+msgid "Get Informed"
+msgstr ""
+
+#: kparametereditor.cpp:265
+msgid "Ignore Information"
+msgstr ""
+
+#: kparametereditor.cpp:306 kparametereditor.cpp:310 kparametereditor.cpp:332
+msgid "An error appeared when saving this file"
+msgstr ""
+
+#: kmplotio.cpp:322
+msgid "The file had an unknown version number"
+msgstr ""
+
+#: kmplotio.cpp:348
+#, kde-format
+msgid "An error appeared when opening this file (%1)"
+msgstr ""
+
+#: kmplotio.cpp:358
+#, kde-format
+msgid "%1 could not be opened"
+msgstr ""
+
+#: kmplotio.cpp:365
+#, kde-format
+msgid "%1 could not be loaded (%2 at line %3, column %4)"
+msgstr ""
+
+#: kmplotio.cpp:435
+msgid "automatic"
+msgstr "awtomatig"
+
+#: kmplotio.cpp:790
+#, kde-format
+msgid "The function %1 could not be loaded"
+msgstr ""
+
+#: main.cpp:42
+msgid "Mathematical function plotter for KDE"
+msgstr ""
+
+#: main.cpp:49
+msgid "KmPlot"
+msgstr "KmPlot"
+
+#: main.cpp:51
+msgid "(c) 2000-2002, Klaus-Dieter Möller"
+msgstr ""
+
+#: main.cpp:56
+msgid "Klaus-Dieter Möller"
+msgstr ""
+
+#: main.cpp:56
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
+
+#: main.cpp:59
+msgid "Matthias Meßmer"
+msgstr ""
+
+#: main.cpp:59
+msgid "GUI"
+msgstr ""
+
+#: main.cpp:61
+msgid "Fredrik Edemar"
+msgstr ""
+
+#: main.cpp:61
+msgid "Various improvements"
+msgstr "Amrywiaeth o welliannau"
+
+#: main.cpp:62
+msgid "David Saxton"
+msgstr ""
+
+#: main.cpp:62
+msgid "Porting to Qt 4, UI improvements, features"
+msgstr ""
+
+#: main.cpp:64
+msgid "David Vignoni"
+msgstr ""
+
+#: main.cpp:64
+msgid "svg icon"
+msgstr "eicon SVG"
+
+#: main.cpp:65
+msgid "Albert Astals Cid"
+msgstr ""
+
+#: main.cpp:65
+msgid "command line options, MIME type"
+msgstr ""
+
+#: main.cpp:71
+msgid "Initial functions to plot"
+msgstr ""
+
+#: main.cpp:72
+msgid "File to open"
+msgstr "Ffeil i agor"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knetattach.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knetattach.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knetattach.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knetattach.po	2012-04-18 08:59:35.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdebase/knetattach.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:29+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 16:59+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:02+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:26+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: knetattach.cpp:89
 msgid ""
@@ -39,16 +39,16 @@
 "button."
 msgstr ""
 
-#: knetattach.cpp:220
+#: knetattach.cpp:212
 msgid ""
 "Unable to connect to server.  Please check your settings and try again."
 msgstr ""
 
-#: knetattach.cpp:58 knetattach.cpp:347
+#: knetattach.cpp:346
 msgid "Save && C&onnect"
 msgstr ""
 
-#: knetattach.cpp:349
+#: knetattach.cpp:348
 msgid "C&onnect"
 msgstr "C&ysylltu"
 
@@ -68,125 +68,131 @@
 msgid "Primary author and maintainer"
 msgstr ""
 
-#: rc.cpp:56
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:57
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: knetattach.ui:14
-#. i18n: ectx: property (windowTitle), widget (Q3Wizard, KNetAttach)
-#: rc.cpp:3 rc.cpp:60
+#. i18n: ectx: property (windowTitle), widget (QWizard, KNetAttach)
+#: rc.cpp:5
 msgid "Network Folder Wizard"
 msgstr ""
 
 #. i18n: file: knetattach.ui:18
-#. i18n: ectx: attribute (title), widget (QWidget, _folderType)
-#: rc.cpp:6 rc.cpp:63
+#. i18n: ectx: property (title), widget (QWizardPage, _folderType)
+#: rc.cpp:8
 msgid "Add Network Folder"
 msgstr "Ychwanegu Plygell Rhwydwaith"
 
-#. i18n: file: knetattach.ui:118
+#. i18n: file: knetattach.ui:24
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:24 rc.cpp:81
+#: rc.cpp:11
 msgid ""
 "Select the type of network folder you wish to connect to and press the Next "
 "button."
 msgstr ""
 
-#. i18n: file: knetattach.ui:39
+#. i18n: file: knetattach.ui:65
 #. i18n: ectx: property (text), widget (QRadioButton, _recent)
-#: rc.cpp:9 rc.cpp:66
+#: rc.cpp:14
 msgid "&Recent connection:"
 msgstr ""
 
-#. i18n: file: knetattach.ui:46
+#. i18n: file: knetattach.ui:72
 #. i18n: ectx: property (text), widget (QRadioButton, _webfolder)
-#: rc.cpp:12 rc.cpp:69
+#: rc.cpp:17
 msgid "&WebFolder (webdav)"
 msgstr ""
 
-#. i18n: file: knetattach.ui:56
+#. i18n: file: knetattach.ui:82
 #. i18n: ectx: property (text), widget (QRadioButton, _fish)
-#: rc.cpp:15 rc.cpp:72
+#: rc.cpp:20
 msgid "&Secure shell (ssh)"
 msgstr ""
 
-#. i18n: file: knetattach.ui:85
+#. i18n: file: knetattach.ui:111
 #. i18n: ectx: property (text), widget (QRadioButton, _ftp)
-#: rc.cpp:18 rc.cpp:75
+#: rc.cpp:23
 msgid "FT&P"
 msgstr "FT&P"
 
-#. i18n: file: knetattach.ui:92
+#. i18n: file: knetattach.ui:118
 #. i18n: ectx: property (text), widget (QRadioButton, _smb)
-#: rc.cpp:21 rc.cpp:78
+#: rc.cpp:26
 msgid "&Microsoft® Windows® network drive"
 msgstr ""
 
-#. i18n: file: knetattach.ui:156
-#. i18n: ectx: attribute (title), widget (QWidget, _folderParameters)
-#: rc.cpp:27 rc.cpp:84
+#. i18n: file: knetattach.ui:145
+#. i18n: ectx: property (title), widget (QWizardPage, _folderParameters)
+#: rc.cpp:29
 msgid "Network Folder Information"
 msgstr ""
 
-#. i18n: file: knetattach.ui:165
+#. i18n: file: knetattach.ui:151
 #. i18n: ectx: property (text), widget (QLabel, _informationText)
-#: rc.cpp:31 rc.cpp:88
+#: rc.cpp:33
 #, kde-format, no-c-format
 msgid ""
 "Enter a name for this <i>%1</i> as well as the server address, port and "
 "folder path to use and press the Next button."
 msgstr ""
 
-#. i18n: file: knetattach.ui:194
+#. i18n: file: knetattach.ui:180
 #. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#: rc.cpp:34 rc.cpp:91
+#: rc.cpp:36
 msgid "&Name:"
 msgstr "&Enw:"
 
-#. i18n: file: knetattach.ui:232
+#. i18n: file: knetattach.ui:199
 #. i18n: ectx: property (text), widget (QLabel, _userText)
-#: rc.cpp:37 rc.cpp:94
+#: rc.cpp:39
 msgid "&User:"
 msgstr "&Defnyddiwr:"
 
-#. i18n: file: knetattach.ui:248
+#. i18n: file: knetattach.ui:225
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:40 rc.cpp:97
+#: rc.cpp:42
 msgid "Se&rver:"
 msgstr "Gweinydd:"
 
-#. i18n: file: knetattach.ui:264
+#. i18n: file: knetattach.ui:251
 #. i18n: ectx: property (text), widget (QLabel, _portText)
-#: rc.cpp:43 rc.cpp:100
+#: rc.cpp:45
 msgid "&Port:"
 msgstr "&Porth:"
 
-#. i18n: file: knetattach.ui:300
+#. i18n: file: knetattach.ui:286
+#. i18n: ectx: property (text), widget (QLabel, _protocol)
+#: rc.cpp:48
+msgid "&Protocol:"
+msgstr ""
+
+#. i18n: file: knetattach.ui:316
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:46 rc.cpp:103
+#: rc.cpp:51
 msgid "&Folder:"
 msgstr "&Plygell :"
 
-#. i18n: file: knetattach.ui:355
+#. i18n: file: knetattach.ui:338
 #. i18n: ectx: property (text), widget (QLabel, _encodingText)
-#: rc.cpp:55 rc.cpp:112
+#: rc.cpp:54
 msgid "Encoding:"
 msgstr "Amgodio:"
 
-#. i18n: file: knetattach.ui:332
+#. i18n: file: knetattach.ui:354
 #. i18n: ectx: property (text), widget (QCheckBox, _createIcon)
-#: rc.cpp:49 rc.cpp:106
+#: rc.cpp:57
 msgid "Cr&eate an icon for this remote folder"
 msgstr ""
 
-#. i18n: file: knetattach.ui:345
+#. i18n: file: knetattach.ui:364
 #. i18n: ectx: property (text), widget (QCheckBox, _useEncryption)
-#: rc.cpp:52 rc.cpp:109
+#: rc.cpp:60
 msgid "&Use encryption"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knetwalk.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knetwalk.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knetwalk.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knetwalk.po	2012-04-18 08:59:23.000000000 +0000
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: knetwalk\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,8 +13,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:30
 msgid "KNetWalk, a game for system administrators."
@@ -118,64 +118,64 @@
 msgid "Theme"
 msgstr ""
 
-#: mainwindow.cpp:187 mainwindow.cpp:244
+#: mainwindow.cpp:188 mainwindow.cpp:245
 msgid "Moves Penalty"
 msgstr ""
 
-#: mainwindow.cpp:196
+#: mainwindow.cpp:197
 msgid "New Game"
 msgstr ""
 
-#: mainwindow.cpp:250
+#: mainwindow.cpp:251
 #, kde-format
 msgid "Your score was %1, you did not make it to the high score list."
 msgid_plural "Your score was %1, you did not make it to the high score list."
 msgstr[0] ""
 msgstr[1] ""
 
-#: mainwindow.cpp:276
+#: mainwindow.cpp:277
 #, kde-format
 msgctxt "Number of mouse clicks"
 msgid "Moves: %1"
 msgstr ""
 
-#: mainwindow.cpp:277
+#: mainwindow.cpp:278
 #, kde-format
 msgctxt "Time elapsed"
 msgid "Time: %1"
 msgstr ""
 
-#: rc.cpp:13
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD, ,Launchpad Contributions:"
 
-#: rc.cpp:14
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: knetwalkui.rc:9
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:12 rc.cpp:17
+#: rc.cpp:5
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: knetwalk.kcfg:9
 #. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:3 rc.cpp:20
+#: rc.cpp:8
 msgid "The graphical theme to be used."
 msgstr ""
 
 #. i18n: file: knetwalk.kcfg:15
 #. i18n: ectx: label, entry (username), group (Preferences)
-#: rc.cpp:6 rc.cpp:23
+#: rc.cpp:11
 msgid "Default user name"
 msgstr "Enw defnyddiwr rhagosodol"
 
 #. i18n: file: knetwalk.kcfg:18
 #. i18n: ectx: label, entry (skill), group (Preferences)
-#: rc.cpp:9 rc.cpp:26
+#: rc.cpp:14
 msgid "The difficulty level."
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knode.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knode.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knode.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knode.po	2012-04-18 08:59:26.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: knode\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:38+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-16 22:52+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,1762 +18,1454 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:41+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: knarticlemanager.cpp:86
-msgid "Save Attachment"
-msgstr "Cadw'r Atodiad"
-
-#: knarticlemanager.cpp:110
-msgid "Save Article"
-msgstr "Cadw'r Erthygl"
-
-#: knarticlemanager.cpp:193
-msgid " Creating list..."
-msgstr " Yn creu rhestr..."
-
-#: knarticlemanager.cpp:578 kngroup.cpp:457
-msgid "no subject"
-msgstr "dim pwnc"
+#: utilities.cpp:70
+#, kde-format
+msgid ""
+"<qt>A file named <b>%1</b> already exists.<br />Do you want to replace "
+"it?</qt>"
+msgstr ""
 
-#: knarticlemanager.cpp:583
-msgid "Do you really want to delete these articles?"
-msgstr "Ydych yn wir eisiau dileu'r erthyglau hyn?"
+#: utilities.cpp:71
+msgid "&Replace"
+msgstr "D&isodli"
 
-#: knarticlemanager.cpp:584
-msgid "Delete Articles"
+#: utilities.cpp:346
+msgid ""
+"Unable to load/save configuration.\n"
+"Wrong permissions on home folder?\n"
+"You should close KNode now to avoid data loss."
 msgstr ""
 
-#. i18n: file: nntpaccountlistwidget_base.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, mDeleteButton)
-#: knarticlemanager.cpp:584 knaccountmanager.cpp:143 knconfigwidgets.cpp:771
-#: knfiltermanager.cpp:261 knmainwidget.cpp:1537 knmainwidget.cpp:1588
-#: rc.cpp:699
-msgid "&Delete"
+#: utilities.cpp:352
+msgid "Unable to load/save file."
 msgstr ""
 
-#: knarticlemanager.cpp:920
-#, kde-format
-msgid ""
-"The article you requested is not available on your news server.<br />You "
-"could try to get it from <a "
-"href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>."
+#: utilities.cpp:358
+msgid "Unable to save remote file."
 msgstr ""
 
-#: knarticlemanager.cpp:1009 kngroupbrowser.cpp:423 kngroupbrowser.cpp:436
-#: knmainwidget.cpp:298
-msgid " (moderated)"
-msgstr " (cymedrolwyd)"
-
-#: knarticlemanager.cpp:1011
-#, kde-format
-msgid " %1: %2 new , %3 displayed"
-msgstr " %1: %2 newydd, %3 arddangoswyd"
+#: utilities.cpp:364
+msgid "Unable to create temporary file."
+msgstr ""
 
-#: knarticlemanager.cpp:1015
+#: kncleanup.cpp:62
 #, kde-format
-msgid " Filter: %1"
-msgstr " Hidlen: %1"
+msgid "Deleting expired articles in <b>%1</b>"
+msgstr "Yn dileu erthyglau darfodedig yn <b>%1</b>"
 
-#: knarticlemanager.cpp:1024
+#: kncleanup.cpp:68
 #, kde-format
-msgid " %1: %2 displayed"
-msgstr " %1: %2 arddangoswyd"
+msgid "Compacting folder <b>%1</b>"
+msgstr "Crynhoi plygell <b>%1</b>"
 
-#: kngrouppropdlg.cpp:44
+#: kncleanup.cpp:188
 #, kde-format
-msgctxt "@title:window %1=newsgroup name"
-msgid "Properties of %1"
+msgid "<b>%1</b><br />expired: %2<br />left: %3"
 msgstr ""
 
-#: kngrouppropdlg.cpp:51
-msgctxt "@title:tab"
-msgid "General"
-msgstr ""
+#: kncleanup.cpp:255
+msgid "Cleaning Up"
+msgstr "Tacluso"
 
-#: kngrouppropdlg.cpp:56
-msgctxt "@title:group"
-msgid "Settings"
-msgstr ""
+#: kncleanup.cpp:265
+msgid "Cleaning up. Please wait..."
+msgstr "Yn tacluso.  Arhoswch..."
 
-#: kngrouppropdlg.cpp:67
-msgctxt "@label:textbox Alternative name of a newsgroup"
-msgid "Nickname:"
+#: foldertreewidget.cpp:369
+msgid "Local"
 msgstr ""
 
-#: kngrouppropdlg.cpp:72
-msgctxt "@label:listbox"
-msgid "Use different default charset:"
+#: foldertreewidget.cpp:372
+msgid "IMAP"
 msgstr ""
 
-#: kngrouppropdlg.cpp:89
-msgctxt "@title:group"
-msgid "Description"
+#: foldertreewidget.cpp:375
+msgid "Cached IMAP"
 msgstr ""
 
-#: kngrouppropdlg.cpp:97
-msgctxt "@label name of a newsgroup"
-msgid "Name:"
+#: foldertreewidget.cpp:378
+msgid "News"
 msgstr ""
 
-#: kngrouppropdlg.cpp:102
-msgctxt "@label description of a newsgroup"
-msgid "Description:"
+#: foldertreewidget.cpp:381
+msgid "Search"
 msgstr ""
 
-#: kngrouppropdlg.cpp:107
-msgctxt "@label status of posting to a newsgroup"
-msgid "Status:"
-msgstr ""
+#. i18n: file: nntpaccountdialog_base.ui:160
+#. i18n: ectx: property (text), widget (QRadioButton, mEncNone)
+#: foldertreewidget.cpp:384 rc.cpp:662
+msgid "None"
+msgstr "Dim"
 
-#: kngrouppropdlg.cpp:111
-msgctxt "posting status"
-msgid "unknown"
+#: foldertreewidget.cpp:390
+msgid "Unknown"
 msgstr ""
 
-#: kngrouppropdlg.cpp:113
-msgid "posting forbidden"
-msgstr "Hysbysu wedi'i wahardd"
+#: knarticlefilter.cpp:34
+msgctxt "default filter name"
+msgid "all"
+msgstr "popeth"
 
-#: kngrouppropdlg.cpp:115
-msgid "posting allowed"
-msgstr "Hysbysu wedi'i ganiatau"
+#: knarticlefilter.cpp:35
+msgctxt "default filter name"
+msgid "unread"
+msgstr "heb ei ddarllen"
 
-#: kngrouppropdlg.cpp:117
-msgctxt "posting status"
-msgid "moderated"
-msgstr ""
+#: knarticlefilter.cpp:36
+msgctxt "default filter name"
+msgid "new"
+msgstr "newydd"
 
-#: kngrouppropdlg.cpp:127
-msgctxt "@title:group"
-msgid "Statistics"
-msgstr ""
+#: knarticlefilter.cpp:37
+msgctxt "default filter name"
+msgid "watched"
+msgstr "dan sylw"
 
-#: kngrouppropdlg.cpp:135
-msgid "Articles:"
-msgstr "Erhyglau:"
+#: knarticlefilter.cpp:38
+msgctxt "default filter name"
+msgid "threads with unread"
+msgstr "edau gyda rhai heb eu darllen"
 
-#: kngrouppropdlg.cpp:140
-msgid "Unread articles:"
-msgstr "Erthyglau heb eu darllen:"
+#: knarticlefilter.cpp:39
+msgctxt "default filter name"
+msgid "threads with new"
+msgstr "edau gyda rhai newydd"
 
-#: kngrouppropdlg.cpp:145
-msgid "New articles:"
-msgstr "Erthyglau newydd:"
+#: knarticlefilter.cpp:40
+msgctxt "default filter name"
+msgid "own articles"
+msgstr "fy erthyglau fy hun"
 
-#: kngrouppropdlg.cpp:150
-msgid "Threads with unread articles:"
-msgstr "Trywyddau gydag erthyglau heb eu darllen:"
+#: knarticlefilter.cpp:41
+msgctxt "default filter name"
+msgid "threads with own articles"
+msgstr "edau gyda fy erthyglau fy hun"
 
-#: kngrouppropdlg.cpp:155
-msgid "Threads with new articles:"
-msgstr "Trywyddau gydag erthyglau newydd:"
+#: kngroupbrowser.cpp:55
+msgid "S&earch:"
+msgstr "C&hwilio"
 
-#: kngrouppropdlg.cpp:167
-msgctxt "@title:tab"
-msgid "Identity"
-msgstr ""
+#: kngroupbrowser.cpp:58
+msgid "Disable &tree view"
+msgstr "Analluogi'r olwg go&eden"
 
-#: kngrouppropdlg.cpp:171
-msgctxt "@title:tab"
-msgid "Cleanup"
-msgstr ""
+#: kngroupbrowser.cpp:60
+msgid "&Subscribed only"
+msgstr "Wedi'u tany&sgrifio'n unig"
 
-#: kndisplayedheader.cpp:28
-msgctxt "collection of article headers"
-msgid "Approved"
-msgstr "Cymeradwyd"
+#: kngroupbrowser.cpp:62
+msgid "&New only"
+msgstr "&Newydd yn unig"
 
-#: kndisplayedheader.cpp:29
-msgctxt "collection of article headers"
-msgid "Content-Transfer-Encoding"
-msgstr "Amgodiad-Trosglwyddiad-Cynnwys"
+#: kngroupbrowser.cpp:70
+msgid "Loading groups..."
+msgstr "Llwytho grwpiau..."
 
-#: kndisplayedheader.cpp:30
-msgctxt "collection of article headers"
-msgid "Content-Type"
-msgstr "Math-Cynnwys"
+#: kngroupbrowser.cpp:91 kncollectionview.cpp:84 knconfigwidgets.cpp:874
+msgid "Name"
+msgstr "Enw"
 
-#: kndisplayedheader.cpp:31
-msgctxt "collection of article headers"
-msgid "Control"
-msgstr "Rheolaeth"
+#: kngroupbrowser.cpp:92
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: kndisplayedheader.cpp:32
-msgctxt "collection of article headers"
-msgid "Date"
-msgstr "Dyddiad"
+#: kngroupbrowser.cpp:369
+#, kde-format
+msgid "Groups on %1: (%2 displayed)"
+msgstr "Grwpiau ar %1: (%2 wedi'u harddangos)"
 
-#: kndisplayedheader.cpp:33
-msgctxt "collection of article headers"
-msgid "Distribution"
-msgstr "Dosbarthiad"
+#: kngroupbrowser.cpp:422 kngroupbrowser.cpp:435
+msgid "moderated"
+msgstr "Cymedrolwyd"
 
-#: kndisplayedheader.cpp:34
-msgctxt "collection of article headers"
-msgid "Expires"
-msgstr "Darfod"
+#: kngroupbrowser.cpp:423 kngroupbrowser.cpp:436 knarticlemanager.cpp:1009
+#: knmainwidget.cpp:298
+msgid " (moderated)"
+msgstr " (cymedrolwyd)"
 
-#: kndisplayedheader.cpp:35
-msgctxt "collection of article headers"
-msgid "Followup-To"
-msgstr "Ymateb-Dilyn-I"
+#: knaccountmanager.cpp:125
+msgid "Cannot create a folder for this account."
+msgstr ""
 
-#: kndisplayedheader.cpp:36
-msgctxt "collection of article headers"
-msgid "From"
-msgstr "Oddi wrth"
+#: knaccountmanager.cpp:140
+msgid ""
+"This account cannot be deleted since there are some unsent messages for it."
+msgstr ""
+"Nid yw'r cyfrif hwn yn medru cael ei dileu oherwydd mae negeseuon heb eu "
+"hanfon amdano fo."
 
-#: kndisplayedheader.cpp:37
-msgctxt "collection of article headers"
-msgid "Lines"
-msgstr "Llinellau"
+#: knaccountmanager.cpp:143
+msgid "Do you really want to delete this account?"
+msgstr "Ydych yn siwr eich bod chi eisiau dileu'r cyfrif yma?"
 
-#: kndisplayedheader.cpp:38
-msgctxt "collection of article headers"
-msgid "Mail-Copies-To"
-msgstr "Ebostio-Copïau-I"
+#. i18n: file: nntpaccountlistwidget_base.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, mDeleteButton)
+#: knaccountmanager.cpp:143 knarticlemanager.cpp:584 knmainwidget.cpp:1537
+#: knmainwidget.cpp:1588 knfiltermanager.cpp:261 knconfigwidgets.cpp:771
+#: rc.cpp:47
+msgid "&Delete"
+msgstr ""
 
-#: kndisplayedheader.cpp:39
-msgctxt "collection of article headers"
-msgid "Message-ID"
-msgstr "Clustnod-Neges"
+#: knaccountmanager.cpp:148
+msgid ""
+"At least one group of this account is currently in use.\n"
+"The account cannot be deleted at the moment."
+msgstr ""
+"Mae o leiaf un grwp o'r cyfrif hwn mewn ddefnydd.\n"
+" Nid yw'r cyfrif yn medru cael ei dileu ar hyn o bryd."
 
-#: kndisplayedheader.cpp:40
-msgctxt "collection of article headers"
-msgid "Mime-Version"
-msgstr "Fersiwn-Mime"
+#: knserverinfo.cpp:92
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, KNode can store the password in its configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
 
-#: kndisplayedheader.cpp:41
-msgctxt "collection of article headers"
-msgid "NNTP-Posting-Host"
-msgstr "Gwesteiwr-Hysbysu-NNTP"
+#: knserverinfo.cpp:100
+msgid "KWallet Not Available"
+msgstr ""
 
-#: kndisplayedheader.cpp:42
-msgctxt "collection of article headers"
-msgid "Newsgroups"
-msgstr "Grwpiau newyddion"
+#: knserverinfo.cpp:101
+msgid "Store Password"
+msgstr ""
 
-#: kndisplayedheader.cpp:43
-msgctxt "collection of article headers"
-msgid "Organization"
-msgstr "Cymdeithas"
+#: knserverinfo.cpp:102
+msgid "Do Not Store Password"
+msgstr ""
 
-#: kndisplayedheader.cpp:44
-msgctxt "collection of article headers"
-msgid "Path"
-msgstr "Llwybr"
+#: knfilterconfigwidget.cpp:36 headerview.cpp:48 knarticlefactory.cpp:315
+msgid "Subject"
+msgstr "Pwnc"
 
-#: kndisplayedheader.cpp:45
-msgctxt "collection of article headers"
+#: knfilterconfigwidget.cpp:38 headerview.cpp:49 headerview.cpp:435
+#: knarticlefactory.cpp:316
+msgid "From"
+msgstr "Oddi Wrth"
+
+#: knfilterconfigwidget.cpp:40
+msgid ""
+"The following placeholders are supported:\n"
+"%MYNAME=own name, %MYEMAIL=own email address"
+msgstr ""
+"Cefnogir y nodau lle canlynol:\n"
+" %MYNAME=eich enw'ch hun, %MYEMAIL=eich cyfeiriad ebost eich hun"
+
+#: knfilterconfigwidget.cpp:43
+msgid "Subject && &From"
+msgstr ""
+
+#: knfilterconfigwidget.cpp:49
+msgid "Message-ID"
+msgstr "Nod-neges"
+
+#: knfilterconfigwidget.cpp:51
 msgid "References"
 msgstr "Cyfeiriadau"
 
-#: kndisplayedheader.cpp:46
-msgctxt "collection of article headers"
-msgid "Reply-To"
-msgstr "Ateb-I"
+#: knfilterconfigwidget.cpp:54
+msgid "M&essage-IDs"
+msgstr "&Nodau-negeseuon"
 
-#: kndisplayedheader.cpp:47
-msgctxt "collection of article headers"
-msgid "Sender"
-msgstr "Anfonydd"
+#: knfilterconfigwidget.cpp:57
+msgid "&Status"
+msgstr "&Cyflwr"
 
-#: kndisplayedheader.cpp:48
-msgctxt "collection of article headers"
-msgid "Subject"
-msgstr "Pwnc"
+#: knfilterconfigwidget.cpp:63 headerview.cpp:50 headerview.cpp:80
+msgid "Score"
+msgstr "Sgôr"
 
-#: kndisplayedheader.cpp:49
-msgctxt "collection of article headers"
-msgid "Supersedes"
-msgstr "Yn disodli"
+#: knfilterconfigwidget.cpp:65
+msgid "Age"
+msgstr "Oedran"
 
-#: kndisplayedheader.cpp:50
-msgctxt "collection of article headers"
-msgid "To"
-msgstr "At"
+#: knfilterconfigwidget.cpp:65
+msgid " days"
+msgstr " dyddiau"
 
-#: kndisplayedheader.cpp:51
-msgctxt "collection of article headers"
-msgid "User-Agent"
-msgstr "Asiant-Defnyddiwr"
+#: knfilterconfigwidget.cpp:67 headerview.cpp:51
+msgid "Lines"
+msgstr "Llinellau"
 
-#: kndisplayedheader.cpp:52
-msgctxt "collection of article headers"
-msgid "X-Mailer"
-msgstr "Ebostydd-X"
+#: knfilterconfigwidget.cpp:70
+msgid "&Additional"
+msgstr "Ychw&anegol"
 
-#: kndisplayedheader.cpp:53
-msgctxt "collection of article headers"
-msgid "X-Newsreader"
-msgstr "Darllenydd-newyddion-X"
+#: aboutdata.cpp:30
+msgid "Maintainer"
+msgstr "Cynhaliwr"
 
-#: kndisplayedheader.cpp:54
-msgctxt "collection of article headers"
-msgid "X-No-Archive"
-msgstr "Dim-Archif-X"
+#: aboutdata.cpp:31 aboutdata.cpp:32
+msgid "Former maintainer"
+msgstr "Cyn-gynhaliwr"
 
-#: kndisplayedheader.cpp:55
-msgctxt "collection of article headers"
-msgid "XRef"
-msgstr "CyfeiriadX"
+#: aboutdata.cpp:46 knjobdata.cpp:154
+msgid "KNode"
+msgstr "KNode"
 
-#: kndisplayedheader.cpp:57
-msgctxt "collection of article headers"
-msgid "Groups"
-msgstr "Grwpiau"
+#: aboutdata.cpp:48
+msgid "A newsreader for KDE"
+msgstr "Darllenydd newyddion ar gyfer KDE"
 
-#: kscoringeditor.cpp:75
-msgid "Not"
+#: aboutdata.cpp:50
+msgid "Copyright © 1999–2010 KNode authors"
 msgstr ""
 
-#: kscoringeditor.cpp:76
-msgid "Negate this condition"
+#: aboutdata.cpp:59
+msgid "Jakob Schroeter"
 msgstr ""
 
-#: kscoringeditor.cpp:81
-msgid "Select the header to match this condition against"
-msgstr ""
+#: knarticlemanager.cpp:86
+msgid "Save Attachment"
+msgstr "Cadw'r Atodiad"
 
-#: kscoringeditor.cpp:85
-msgid "Select the type of match"
-msgstr ""
+#: knarticlemanager.cpp:110
+msgid "Save Article"
+msgstr "Cadw'r Erthygl"
 
-#: kscoringeditor.cpp:93
-msgid "The condition for the match"
-msgstr ""
+#: knarticlemanager.cpp:193
+msgid " Creating list..."
+msgstr " Yn creu rhestr..."
 
-#: kscoringeditor.cpp:97
-msgid "Edit..."
-msgstr ""
+#: knarticlemanager.cpp:578 kngroup.cpp:457
+msgid "no subject"
+msgstr "dim pwnc"
 
-#: kscoringeditor.cpp:245
-msgid "Select an action."
-msgstr ""
+#: knarticlemanager.cpp:583
+msgid "Do you really want to delete these articles?"
+msgstr "Ydych yn wir eisiau dileu'r erthyglau hyn?"
 
-#: kscoringeditor.cpp:445
-msgid "Properties"
+#: knarticlemanager.cpp:584
+msgid "Delete Articles"
 msgstr ""
 
-#: kscoringeditor.cpp:456
-msgctxt "@label rule name"
-msgid "&Name:"
+#: knarticlemanager.cpp:920
+#, kde-format
+msgid ""
+"The article you requested is not available on your news server.<br />You "
+"could try to get it from <a "
+"href=\"http://groups.google.com/groups?selm=%1\">groups.google.com</a>."
 msgstr ""
 
-#: kscoringeditor.cpp:464
-msgid "&Groups:"
-msgstr "&Grwpiau:"
+#: knarticlemanager.cpp:1011
+#, kde-format
+msgid " %1: %2 new , %3 displayed"
+msgstr " %1: %2 newydd, %3 arddangoswyd"
 
-#: kscoringeditor.cpp:469
-msgid "A&dd Group"
-msgstr ""
+#: knarticlemanager.cpp:1015
+#, kde-format
+msgid " Filter: %1"
+msgstr " Hidlen: %1"
 
-#: kscoringeditor.cpp:480
-msgid "&Expire rule automatically"
-msgstr ""
+#: knarticlemanager.cpp:1024
+#, kde-format
+msgid " %1: %2 displayed"
+msgstr " %1: %2 arddangoswyd"
 
-#: kscoringeditor.cpp:488
-msgid "&Rule is valid for:"
+#: kncomposer.cpp:74
+msgid "Edit Recent Addresses..."
 msgstr ""
 
-#: kscoringeditor.cpp:499
-msgid "Conditions"
-msgstr ""
-
-#: kscoringeditor.cpp:509
-msgid "Match a&ll conditions"
-msgstr ""
-
-#: kscoringeditor.cpp:512
-msgid "Matc&h any condition"
-msgstr ""
-
-#: kscoringeditor.cpp:522
-msgid "Actions"
-msgstr ""
-
-#: kscoringeditor.cpp:647 knconfigwidgets.cpp:1521 knconfigwidgets.cpp:1531
-#: knconfigwidgets.cpp:1539 knconfigwidgets.cpp:1619
-msgid " day"
-msgid_plural " days"
-msgstr[0] ""
-msgstr[1] ""
+#: kncomposer.cpp:208
+msgid "&Send Now"
+msgstr "&Anfon Nawr"
 
-#: kscoringeditor.cpp:682
-msgid "Move rule up"
-msgstr ""
+#: kncomposer.cpp:214
+msgid "Send &Later"
+msgstr "Anfon Nes Ym&laen"
 
-#: kscoringeditor.cpp:687
-msgid "Move rule down"
-msgstr ""
+#: kncomposer.cpp:219
+msgid "Save as &Draft"
+msgstr "Cadw fel &Drafft"
 
-#: kscoringeditor.cpp:699
-msgid "New rule"
-msgstr ""
+#: kncomposer.cpp:224
+msgid "D&elete"
+msgstr "Dil&eu"
 
-#: kscoringeditor.cpp:706
-msgid "Edit rule"
-msgstr ""
+#: kncomposer.cpp:241
+msgid "Paste as &Quotation"
+msgstr "Gludo fel &Dyfyniad"
 
-#: kscoringeditor.cpp:712
-msgid "Remove rule"
-msgstr ""
+#: kncomposer.cpp:253
+msgid "Append &Signature"
+msgstr "Atodi &Llofnod"
 
-#: kscoringeditor.cpp:717
-msgid "Copy rule"
-msgstr ""
+#: kncomposer.cpp:257
+msgid "&Insert File..."
+msgstr "Mewn&osod Ffeil..."
 
-#: kscoringeditor.cpp:728 kscoringeditor.cpp:733 kscoringeditor.cpp:774
-msgid "<placeholder>all groups</placeholder>"
-msgstr ""
+#: kncomposer.cpp:261
+msgid "Insert File (in a &box)..."
+msgstr "Mewnosod Ffeil (mewn &blwch)"
 
-#: kscoringeditor.cpp:734
-msgid "Sho&w only rules for group:"
-msgstr ""
+#: kncomposer.cpp:266
+msgid "Attach &File..."
+msgstr "Atodi &Ffeil..."
 
-#: kscoringeditor.cpp:952
-msgid "Rule Editor"
-msgstr ""
+#: kncomposer.cpp:270
+msgid "Sign Article with &PGP"
+msgstr "Llofnodi'r Erthygl gyda &PGP"
 
-#: kscoringeditor.cpp:1064
-msgid "Edit Rule"
+#: kncomposer.cpp:274
+msgid "&Remove"
 msgstr ""
 
-#: knarticlefilter.cpp:34
-msgctxt "default filter name"
-msgid "all"
-msgstr "popeth"
-
-#: knarticlefilter.cpp:35
-msgctxt "default filter name"
-msgid "unread"
-msgstr "heb ei ddarllen"
-
-#: knarticlefilter.cpp:36
-msgctxt "default filter name"
-msgid "new"
-msgstr "newydd"
-
-#: knarticlefilter.cpp:37
-msgctxt "default filter name"
-msgid "watched"
-msgstr "dan sylw"
-
-#: knarticlefilter.cpp:38
-msgctxt "default filter name"
-msgid "threads with unread"
-msgstr "edau gyda rhai heb eu darllen"
+#: kncomposer.cpp:278
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#: knarticlefilter.cpp:39
-msgctxt "default filter name"
-msgid "threads with new"
-msgstr "edau gyda rhai newydd"
+#: kncomposer.cpp:285
+msgid "Send &News Article"
+msgstr "Anfon Erthygl &Newyddion"
 
-#: knarticlefilter.cpp:40
-msgctxt "default filter name"
-msgid "own articles"
-msgstr "fy erthyglau fy hun"
+#: kncomposer.cpp:290
+msgid "Send E&mail"
+msgstr "Anfon E&bost"
 
-#: knarticlefilter.cpp:41
-msgctxt "default filter name"
-msgid "threads with own articles"
-msgstr "edau gyda fy erthyglau fy hun"
+#: kncomposer.cpp:295
+msgid "Set &Charset"
+msgstr "Gosod Set &Nodau"
 
-#: treewidget.cpp:217 headerview.cpp:77
-msgid "View Columns"
-msgstr "Gwled Colofnau"
+#: kncomposer.cpp:302
+msgid "Set Charset"
+msgstr "Gosod Set Nodau"
 
-#: kngroupbrowser.cpp:55
-msgid "S&earch:"
-msgstr "C&hwilio"
+#: kncomposer.cpp:308
+msgid "&Word Wrap"
+msgstr "La&pio Llinellau"
 
-#: kngroupbrowser.cpp:58
-msgid "Disable &tree view"
-msgstr "Analluogi'r olwg go&eden"
+#: kncomposer.cpp:311
+msgid "&Automatic Spellchecking"
+msgstr ""
 
-#: kngroupbrowser.cpp:60
-msgid "&Subscribed only"
-msgstr "Wedi'u tany&sgrifio'n unig"
+#: kncomposer.cpp:323
+msgid "Add &Quote Characters"
+msgstr "&Ychwanegu Dyfynnodau"
 
-#: kngroupbrowser.cpp:62
-msgid "&New only"
-msgstr "&Newydd yn unig"
+#: kncomposer.cpp:327
+msgid "&Remove Quote Characters"
+msgstr "D&ileu Dyfynnodau"
 
-#: kngroupbrowser.cpp:70
-msgid "Loading groups..."
-msgstr "Llwytho grwpiau..."
+#: kncomposer.cpp:331
+msgid "Add &Box"
+msgstr "Ychwanegu &Blwch"
 
-#: kngroupbrowser.cpp:91 knconfigwidgets.cpp:874 kncollectionview.cpp:84
-msgid "Name"
-msgstr "Enw"
+#: kncomposer.cpp:335
+msgid "Re&move Box"
+msgstr "Dileu Bl&wch"
 
-#: kngroupbrowser.cpp:92
-msgid "Description"
-msgstr "Disgrifiad"
+#: kncomposer.cpp:339
+msgid "Get &Original Text (not re-wrapped)"
+msgstr "Nôl y Testun &Gwreiddiol (heb ei ail-lapio)"
 
-#: kngroupbrowser.cpp:369
-#, kde-format
-msgid "Groups on %1: (%2 displayed)"
-msgstr "Grwpiau ar %1: (%2 wedi'u harddangos)"
+#: kncomposer.cpp:345
+msgid "S&cramble (Rot 13)"
+msgstr "&Cymysgu (Rot 13)"
 
-#: kngroupbrowser.cpp:422 kngroupbrowser.cpp:435
-msgid "moderated"
-msgstr "Cymedrolwyd"
+#: kncomposer.cpp:352
+msgid "Start &External Editor"
+msgstr "Cyc&hwyn Golygydd Allanol"
 
-#: configuration/identity_edition_dialog.cpp:43
-msgctxt "@title:window"
-msgid "Manage your identities"
-msgstr ""
+#: kncomposer.cpp:515 kncomposer.cpp:522 kncomposer.cpp:1204
+msgid "<posted & mailed>"
+msgstr "<wedi'i phostio ac ebostio>"
 
-#: configuration/identity_edition_dialog.cpp:45
-msgctxt "@action:button Change signing key"
-msgid "Change..."
+#: kncomposer.cpp:518 kncomposer.cpp:1205
+msgid ""
+"<posted & mailed>\n"
+"\n"
 msgstr ""
+"<wedi'i phostio ac ebostio>\n"
+"\n"
 
-#: configuration/identity_edition_dialog.cpp:46
-msgctxt "@title:window PGP key chooser"
-msgid "Your OpenPGP Key"
+#: kncomposer.cpp:540
+msgid "Your email address does not appears to be valid. Please modify it."
 msgstr ""
 
-#: configuration/identity_edition_dialog.cpp:47
-msgid "Select the OpenPGP key which should be used for signing articles."
+#: kncomposer.cpp:545
+msgid "Please enter a subject."
 msgstr ""
-"Dewiswch pa allwedd OpenPGP a ddylir ei defnyddio ar gyfer llofnodi "
-"erthyglau."
 
-#: configuration/identity_edition_dialog.cpp:190
-msgctxt "Name of a newly created identity"
-msgid "New identity"
+#: kncomposer.cpp:555
+msgid "Please enter a newsgroup."
 msgstr ""
 
-#: configuration/identity_edition_dialog.cpp:260
-#, kde-format
+#: kncomposer.cpp:560
 msgid ""
-"<qt>Do you really want to remove the identity <emphasis>%1</emphasis>?</qt>"
-msgstr ""
-
-#: configuration/identity_edition_dialog.cpp:262
-msgctxt "@title:window"
-msgid "Delete identity"
+"You are crossposting to more than 12 newsgroups.\n"
+"Please remove all newsgroups in which your article is off-topic."
 msgstr ""
 
-#: knarticlefactory.cpp:149
+#: kncomposer.cpp:565
 msgid ""
-"The author has requested a reply by email instead\n"
-"of a followup to the newsgroup. (Followup-To: poster)\n"
-"Do you want to reply in public anyway?"
-msgstr ""
-
-#: knarticlefactory.cpp:149
-msgid "Reply Public"
+"You are crossposting to more than five newsgroups.\n"
+"Please reconsider whether this is really useful\n"
+"and remove groups in which your article is off-topic.\n"
+"Do you want to re-edit the article or send it anyway?"
 msgstr ""
+"Yr ydych yn croes-hysbysu i fwy na phump o grwpiau newyddion.\n"
+" A wnewch ail-ystyried a ydy hyn yn wir ddefnyddiol\n"
+" a gwaredu'r grwpiau lle mae'ch erthygl yn amherthnasol.\n"
+" A ydych eisiau ail-olygu'ch erthygl neu'i hanfon beth bynnag?"
 
-#: knarticlefactory.cpp:149
-msgid "Reply by Email"
-msgstr ""
+#: kncomposer.cpp:566 kncomposer.cpp:576 kncomposer.cpp:588 kncomposer.cpp:659
+#: kncomposer.cpp:673 kncomposer.cpp:679
+msgid "&Send"
+msgstr "&Anfon"
 
-#: knarticlefactory.cpp:197
-msgid ""
-"The author requested a mail copy of your reply. (Mail-Copies-To header)"
-msgstr ""
-"Mae'r awdur wedi gofyn am gopi ebost o'ch ateb. (pennawd Copiau-Ebost-I)"
+#: kncomposer.cpp:566 kncomposer.cpp:576 kncomposer.cpp:588 kncomposer.cpp:659
+#: kncomposer.cpp:674 kncomposer.cpp:679
+msgctxt "edit article"
+msgid "&Edit"
+msgstr "&Golygu"
 
-#: knarticlefactory.cpp:287
+#: kncomposer.cpp:572
 msgid ""
-"This article contains attachments. Do you want them to be forwarded as well?"
+"You are crossposting to more than two newsgroups.\n"
+"Please use the \"Followup-To\" header to direct the replies to your article "
+"into one group.\n"
+"Do you want to re-edit the article or send it anyway?"
 msgstr ""
-"Mae'r erthygl hon yn cynnwys atodiadau. Ydych chi eisiau iddynt gael eu "
-"anfon ymlaen hefyd?"
-
-#: knarticlefactory.cpp:287
-msgid "Forward"
-msgstr "Ymlaen"
 
-#: knarticlefactory.cpp:287
-msgid "Do Not Forward"
+#: kncomposer.cpp:582
+msgid ""
+"You are directing replies to more than 12 newsgroups.\n"
+"Please remove some newsgroups from the \"Followup-To\" header."
 msgstr ""
 
-#: knarticlefactory.cpp:313
-msgid "Forwarded message (begin)"
-msgstr "Neges a anfonwyd ymlaen (dechrau)"
-
-#: knarticlefactory.cpp:315 headerview.cpp:48 knfilterconfigwidget.cpp:36
-msgid "Subject"
-msgstr "Pwnc"
-
-#: knarticlefactory.cpp:316 headerview.cpp:49 headerview.cpp:435
-#: knfilterconfigwidget.cpp:38
-msgid "From"
-msgstr "Oddi Wrth"
-
-#: knarticlefactory.cpp:317 headerview.cpp:52 headerview.cpp:225
-msgid "Date"
-msgstr "Dyddiad"
-
-#: knarticlefactory.cpp:318
-msgid "Newsgroup"
+#: kncomposer.cpp:587
+msgid ""
+"You are directing replies to more than five newsgroups.\n"
+"Please reconsider whether this is really useful.\n"
+"Do you want to re-edit the article or send it anyway?"
 msgstr ""
+"Yr ydych yn cyfeirio atebion at fwy na phump grŵp newyddion.\n"
+" A wnewch ail-ystyried a ydy hyn yn wir ddefnyddiol.\n"
+"  A ydych eisiau ail-olygu'r erthygl neu'i hanfon beth bynnag?"
 
-#: knarticlefactory.cpp:324
-msgid "Forwarded message (end)"
-msgstr "Neges a anfonwyd ymlaen (diwedd)"
-
-#: knarticlefactory.cpp:359
-msgid "Do you really want to cancel this article?"
-msgstr "Ydych chi'n siwr eich bod chi eisau diddymu'r erthygl yma?"
-
-#: knarticlefactory.cpp:359
-msgid "Cancel Article"
+#: kncomposer.cpp:594
+msgid "Please enter the email address."
 msgstr ""
 
-#: knarticlefactory.cpp:363
+#: kncomposer.cpp:647
 msgid ""
-"Do you want to send the cancel\n"
-"message now or later?"
+"Your message contains characters which are not included\n"
+"in the \"us-ascii\" character set; please choose\n"
+"a suitable character set from the \"Options\" menu."
 msgstr ""
-"Ydych chi eisiau anfon y neges\n"
-"diddymu rwan ta hwyrach ymlaen?"
-
-#: knarticlefactory.cpp:363
-msgid "Question"
-msgstr "Cwestiwn"
-
-#: knarticlefactory.cpp:363
-msgid "&Now"
-msgstr "Rwa&n"
-
-#: knarticlefactory.cpp:363
-msgid "&Later"
-msgstr "Nes ym&laen"
 
-#: knarticlefactory.cpp:378 knarticlefactory.cpp:456 kncomposer.cpp:1449
-msgid "You have no valid news accounts configured."
+#: kncomposer.cpp:652
+msgid "You cannot post an empty message."
 msgstr ""
 
-#: knarticlefactory.cpp:440
-msgid "Do you really want to supersede this article?"
-msgstr "Ydych yn wir eisiau disodli'r erthygl hon?"
-
-#: knarticlefactory.cpp:440
-msgid "Supersede"
+#: kncomposer.cpp:658
+msgid ""
+"Your article seems to consist entirely of quoted text;\n"
+"do you want to re-edit the article or send it anyway?"
 msgstr ""
 
-#: knarticlefactory.cpp:574
-msgid "This article cannot be edited."
-msgstr "Nid yw'n bosibl i olygu yr erthygl hon."
-
-#: knarticlefactory.cpp:606
-msgid "Article has already been sent."
-msgstr "Mae'r erthygl yma wedi ei gyrru yn barod."
-
-#: knarticlefactory.cpp:623
-msgid "Unable to load article."
+#: kncomposer.cpp:663
+msgid ""
+"You cannot post an article consisting\n"
+"entirely of quoted text."
 msgstr ""
 
-#: knarticlefactory.cpp:664
-msgid "Unable to load the outbox-folder."
+#: kncomposer.cpp:671
+msgid ""
+"Your article contains lines longer than 80 characters.\n"
+"Do you want to re-edit the article or send it anyway?"
 msgstr ""
+"Cynhwysa eich erthygl linellau sy'n hwy na 80 nod.\n"
+"  A ydych eisiau ail-olygu'r erthygl neu'i hanfon beth bynnag?"
 
-#: knarticlefactory.cpp:727
+#: kncomposer.cpp:678
 msgid ""
-"You canceled the article posting. The unsent articles are stored in the "
-"\"Outbox\" folder."
+"Your signature is more than 8 lines long.\n"
+"You should shorten it to match the widely accepted limit of 4 lines.\n"
+"Do you want to re-edit the article or send it anyway?"
 msgstr ""
+"Mae'ch llofnod yn fwy nac 8 llinell.\n"
+"  Dylech ei fyrhau i gydweddu â'r uchafswm cydnabyddedig o 4 llinell.\n"
+" A ydych eisiau ail-olygu'r erthygl neu'i hanfon beth bynnag?"
 
-#: knarticlefactory.cpp:774
+#: kncomposer.cpp:683
 msgid ""
-"Please set a hostname for the generation\n"
-"of the message-id or disable it."
+"Your signature exceeds the widely-accepted limit of 4 lines:\n"
+"please consider shortening your signature;\n"
+"otherwise, you will probably annoy your readers."
 msgstr ""
 
-#: knarticlefactory.cpp:810
-#, kde-format
+#: kncomposer.cpp:706
 msgid ""
-"<qt>Please enter a valid email address for the identity named "
-"<emphasis>%1</emphasis> at the identity section of the configuration "
-"dialog.</qt>"
+"You have not configured your preferred signing key yet;\n"
+"please specify it in the global identity configuration,\n"
+"in the account properties or in the group properties.\n"
+"The article will be sent unsigned."
 msgstr ""
 
-#: knarticlefactory.cpp:892
-msgid "Emails cannot be canceled or superseded."
-msgstr ""
+#: kncomposer.cpp:713
+msgid "Send Unsigned"
+msgstr "Anfon Heb ei Lofnodi"
 
-#: knarticlefactory.cpp:898
-msgid "Cancel messages cannot be canceled or superseded."
-msgstr ""
+#: kncomposer.cpp:905
+msgid "Do you want to save this article in the draft folder?"
+msgstr "A ydych eisiau cadw'r erthygl hon yn y blygell ddrafft?"
 
-#: knarticlefactory.cpp:903
-msgid "Only sent articles can be canceled or superseded."
-msgstr ""
+#: kncomposer.cpp:1059
+msgid "Insert File"
+msgstr "Mewnosod Ffeil"
 
-#: knarticlefactory.cpp:908
-msgid "This article has already been canceled or superseded."
-msgstr ""
+#: kncomposer.cpp:1132
+msgid "Attach File"
+msgstr "Atodi Ffeil"
 
-#: knarticlefactory.cpp:915
+#: kncomposer.cpp:1193
 msgid ""
-"This article cannot be canceled or superseded,\n"
-"because its message-id has not been created by KNode.\n"
-"But you can look for your article in the newsgroup\n"
-"and cancel (or supersede) it there."
+"The poster does not want a mail copy of your reply (Mail-Copies-To: "
+"nobody);\n"
+"please respect their request."
 msgstr ""
 
-#: knarticlefactory.cpp:936
+#: kncomposer.cpp:1194
+msgid "&Send Copy"
+msgstr "&Anfon Copi"
+
+#: kncomposer.cpp:1247 articlewidget.cpp:1426
+msgid "Select Charset"
+msgstr "Dewis y Set Nodau"
+
+#: kncomposer.cpp:1272
+msgid "This will replace all text you have written."
+msgstr ""
+
+#: kncomposer.cpp:1286
 msgid ""
-"This article does not appear to be from you.\n"
-"You can only cancel or supersede your own articles."
+"No editor configured.\n"
+"Please do this in the settings dialog."
 msgstr ""
-"Ymddengys nid oddi wrthych chi y mae'r erthygl hon.\n"
-"Dim ond eich erthyglau'ch hun y gallwch eu diddymu neu'u disodli."
+"Does dim golygydd wedi'w ffurfweddu.\n"
+"Mae angen gwneud hyn yn yr ymgom gosodiadau."
 
-#: knarticlefactory.cpp:941
+#: kncomposer.cpp:1332
 msgid ""
-"You have to download the article body\n"
-"before you can cancel or supersede the article."
+"Unable to start external editor.\n"
+"Please check your configuration in the settings dialog."
 msgstr ""
-"Rhaid i chi lawrlwytho corff yr erthygl\n"
-" cyn y cewch diddymu neu ddileu'r erthygl."
+"Methu cychwyn y golygydd allanol.\n"
+"  A wnewch edrych dros eich ffurfweddiad yn yr ymgom osodiadau."
 
-#: knarticlefactory.cpp:1035
-msgid "Errors While Sending"
-msgstr "Gwallau tra'n danfon"
+#: kncomposer.cpp:1349
+msgid "News Article"
+msgstr "Erthygl Newyddion"
 
-#: knarticlefactory.cpp:1041
-msgid "Errors occurred while sending these articles:"
-msgstr "Bu gwallau wrth ddanfon yr erthyglau hyn:"
+#: kncomposer.cpp:1351
+msgid "Email"
+msgstr "Ebost"
 
-#: knarticlefactory.cpp:1042
-msgid "The unsent articles are stored in the \"Outbox\" folder."
-msgstr "Cedwir yr erthyglau nis danfonwyd yn y blygell \"Blwch Allan\"."
+#: kncomposer.cpp:1353
+msgid "News Article & Email"
+msgstr "Erthygl Newyddion ac Ebost"
 
-#: knarticlefactory.cpp:1072
-msgid "<b>Error message:</b><br />"
-msgstr ""
+#: kncomposer.cpp:1357
+msgid " OVR "
+msgstr " DROS "
 
-#: kncomposer.cpp:74
-msgid "Edit Recent Addresses..."
-msgstr ""
+#: kncomposer.cpp:1359
+msgid " INS "
+msgstr " RHWNG "
 
-#: kncomposer.cpp:208
-msgid "&Send Now"
-msgstr "&Anfon Nawr"
+#: kncomposer.cpp:1361
+#, kde-format
+msgid " Type: %1 "
+msgstr " Math: %1 "
 
-#: kncomposer.cpp:214
-msgid "Send &Later"
-msgstr "Anfon Nes Ym&laen"
+#: kncomposer.cpp:1362
+#, kde-format
+msgid " Charset: %1 "
+msgstr " Set nodau: %1 "
 
-#: kncomposer.cpp:219
-msgid "Save as &Draft"
-msgstr "Cadw fel &Drafft"
-
-#: kncomposer.cpp:224
-msgid "D&elete"
-msgstr "Dil&eu"
-
-#: kncomposer.cpp:241
-msgid "Paste as &Quotation"
-msgstr "Gludo fel &Dyfyniad"
-
-#: kncomposer.cpp:253
-msgid "Append &Signature"
-msgstr "Atodi &Llofnod"
+#: kncomposer.cpp:1364 kncomposer.cpp:1371
+#, kde-format
+msgid " Column: %1 "
+msgstr " Colofn: %1 "
 
-#: kncomposer.cpp:257
-msgid "&Insert File..."
-msgstr "Mewn&osod Ffeil..."
+#: kncomposer.cpp:1365 kncomposer.cpp:1372
+#, kde-format
+msgid " Line: %1 "
+msgstr " Llinell: %1 "
 
-#: kncomposer.cpp:261
-msgid "Insert File (in a &box)..."
-msgstr "Mewnosod Ffeil (mewn &blwch)"
+#: kncomposer.cpp:1412
+msgid "No Subject"
+msgstr "Dim Pwnc"
 
-#: kncomposer.cpp:266
-msgid "Attach &File..."
-msgstr "Atodi &Ffeil..."
+#: kncomposer.cpp:1449 knarticlefactory.cpp:378 knarticlefactory.cpp:456
+msgid "You have no valid news accounts configured."
+msgstr ""
 
-#: kncomposer.cpp:270
-msgid "Sign Article with &PGP"
-msgstr "Llofnodi'r Erthygl gyda &PGP"
+#: kncomposer.cpp:1542
+msgid "Attachment Properties"
+msgstr "Priodweddau yr Atodiad"
 
-#: kncomposer.cpp:274
-msgid "&Remove"
+#: kncomposer.cpp:1549
+msgid "File"
 msgstr ""
 
-#: kncomposer.cpp:278
-msgid "&Properties"
-msgstr "&Priodweddau"
+#. i18n: file: nntpaccountdialog_base.ui:193
+#. i18n: ectx: property (text), widget (QLabel, mNameLabel)
+#: kncomposer.cpp:1555 rc.cpp:671
+msgid "Name:"
+msgstr "Enw:"
 
-#: kncomposer.cpp:285
-msgid "Send &News Article"
-msgstr "Anfon Erthygl &Newyddion"
+#: kncomposer.cpp:1557
+msgid "Size:"
+msgstr "Maint:"
 
-#: kncomposer.cpp:290
-msgid "Send E&mail"
-msgstr "Anfon E&bost"
+#: kncomposer.cpp:1564
+msgid "Mime"
+msgstr "Mime"
 
-#: kncomposer.cpp:295
-msgid "Set &Charset"
-msgstr "Gosod Set &Nodau"
+#: kncomposer.cpp:1573
+msgid "&Mime-Type:"
+msgstr "Math-&Mime:"
 
-#: kncomposer.cpp:302
-msgid "Set Charset"
-msgstr "Gosod Set Nodau"
+#: kncomposer.cpp:1580
+msgid "&Description:"
+msgstr "&Disgrifiad:"
 
-#: kncomposer.cpp:308
-msgid "&Word Wrap"
-msgstr "La&pio Llinellau"
+#: kncomposer.cpp:1597
+msgid "&Encoding:"
+msgstr "A&mgodiad:"
 
-#: kncomposer.cpp:311
-msgid "&Automatic Spellchecking"
+#: kncomposer.cpp:1632
+msgid ""
+"You have set an invalid mime-type.\n"
+"Please change it."
 msgstr ""
+"Yr ydych wedi gosod math-mime annilys.\n"
+"  Newidiwch ef."
 
-#: kncomposer.cpp:323
-msgid "Add &Quote Characters"
-msgstr "&Ychwanegu Dyfynnodau"
-
-#: kncomposer.cpp:327
-msgid "&Remove Quote Characters"
-msgstr "D&ileu Dyfynnodau"
-
-#: kncomposer.cpp:331
-msgid "Add &Box"
-msgstr "Ychwanegu &Blwch"
-
-#: kncomposer.cpp:335
-msgid "Re&move Box"
-msgstr "Dileu Bl&wch"
+#: kncomposer.cpp:1637
+msgid ""
+"You have changed the mime-type of this non-textual attachment\n"
+"to text. This might cause an error while loading or encoding the file.\n"
+"Proceed?"
+msgstr ""
+"Yr ydych wedi newid math-mime yr atodiad di-destun hwn\n"
+" i destun.  Gall hyn achosi gwall wrth lwytho neu amgodio'r ffeil.\n"
+"  Parhau?"
 
-#: kncomposer.cpp:339
-msgid "Get &Original Text (not re-wrapped)"
-msgstr "Nôl y Testun &Gwreiddiol (heb ei ail-lapio)"
+#: knmainwidget.cpp:142
+msgid "&Search:"
+msgstr "&Chwilio:"
 
-#: kncomposer.cpp:345
-msgid "S&cramble (Rot 13)"
-msgstr "&Cymysgu (Rot 13)"
+#: knmainwidget.cpp:269
+msgid " Ready"
+msgstr " Parod"
 
-#: kncomposer.cpp:352
-msgid "Start &External Editor"
-msgstr "Cyc&hwyn Golygydd Allanol"
+#: knmainwidget.cpp:294
+msgid "KDE News Reader"
+msgstr "Darllenydd Newyddion KDE"
 
-#: kncomposer.cpp:515 kncomposer.cpp:522 kncomposer.cpp:1204
-msgid "<posted & mailed>"
-msgstr "<wedi'i phostio ac ebostio>"
+#: knmainwidget.cpp:479
+msgid "&Next Article"
+msgstr "Erthygl &Nesaf"
 
-#: kncomposer.cpp:518 kncomposer.cpp:1205
-msgid ""
-"<posted & mailed>\n"
-"\n"
+#: knmainwidget.cpp:480
+msgid "Go to next article"
 msgstr ""
-"<wedi'i phostio ac ebostio>\n"
-"\n"
 
-#: kncomposer.cpp:540
-msgid "Your email address does not appears to be valid. Please modify it."
-msgstr ""
+#: knmainwidget.cpp:485
+msgid "&Previous Article"
+msgstr "Erthygl &Flaenorol"
 
-#: kncomposer.cpp:545
-msgid "Please enter a subject."
+#: knmainwidget.cpp:487
+msgid "Go to previous article"
 msgstr ""
 
-#: kncomposer.cpp:555
-msgid "Please enter a newsgroup."
-msgstr ""
+#: knmainwidget.cpp:492
+msgid "Next Unread &Article"
+msgstr "Erthygl Nesaf &Heb ei Darllen"
 
-#: kncomposer.cpp:560
-msgid ""
-"You are crossposting to more than 12 newsgroups.\n"
-"Please remove all newsgroups in which your article is off-topic."
-msgstr ""
+#: knmainwidget.cpp:498
+msgid "Next Unread &Thread"
+msgstr "&Trywydd Nesaf Heb ei Ddarllen"
 
-#: kncomposer.cpp:565
-msgid ""
-"You are crossposting to more than five newsgroups.\n"
-"Please reconsider whether this is really useful\n"
-"and remove groups in which your article is off-topic.\n"
-"Do you want to re-edit the article or send it anyway?"
-msgstr ""
-"Yr ydych yn croes-hysbysu i fwy na phump o grwpiau newyddion.\n"
-" A wnewch ail-ystyried a ydy hyn yn wir ddefnyddiol\n"
-" a gwaredu'r grwpiau lle mae'ch erthygl yn amherthnasol.\n"
-" A ydych eisiau ail-olygu'ch erthygl neu'i hanfon beth bynnag?"
+#: knmainwidget.cpp:504
+msgid "Ne&xt Group"
+msgstr "Grŵp N&esaf"
 
-#: kncomposer.cpp:566 kncomposer.cpp:576 kncomposer.cpp:588 kncomposer.cpp:659
-#: kncomposer.cpp:673 kncomposer.cpp:679
-msgid "&Send"
-msgstr "&Anfon"
+#: knmainwidget.cpp:510
+msgid "Pre&vious Group"
+msgstr "Grŵp Fl&aenorol"
 
-#: kncomposer.cpp:566 kncomposer.cpp:576 kncomposer.cpp:588 kncomposer.cpp:659
-#: kncomposer.cpp:674 kncomposer.cpp:679
-msgctxt "edit article"
-msgid "&Edit"
-msgstr "&Golygu"
+#: knmainwidget.cpp:515
+msgid "Read &Through Articles"
+msgstr "Darllen &Trwy Erthyglau"
 
-#: kncomposer.cpp:572
-msgid ""
-"You are crossposting to more than two newsgroups.\n"
-"Please use the \"Followup-To\" header to direct the replies to your article "
-"into one group.\n"
-"Do you want to re-edit the article or send it anyway?"
-msgstr ""
+#: knmainwidget.cpp:520
+msgid "Focus on Next Folder"
+msgstr "Canolbwyntio ar y Blygell Nesaf"
 
-#: kncomposer.cpp:582
-msgid ""
-"You are directing replies to more than 12 newsgroups.\n"
-"Please remove some newsgroups from the \"Followup-To\" header."
-msgstr ""
+#: knmainwidget.cpp:525
+msgid "Focus on Previous Folder"
+msgstr "Canolbwyntio ar y Blygell Flaenorol"
 
-#: kncomposer.cpp:587
-msgid ""
-"You are directing replies to more than five newsgroups.\n"
-"Please reconsider whether this is really useful.\n"
-"Do you want to re-edit the article or send it anyway?"
-msgstr ""
-"Yr ydych yn cyfeirio atebion at fwy na phump grŵp newyddion.\n"
-" A wnewch ail-ystyried a ydy hyn yn wir ddefnyddiol.\n"
-"  A ydych eisiau ail-olygu'r erthygl neu'i hanfon beth bynnag?"
+#: knmainwidget.cpp:530
+msgid "Select Folder with Focus"
+msgstr "Deiws y Blygell efo'r Canolbwynt"
 
-#: kncomposer.cpp:594
-msgid "Please enter the email address."
+#: knmainwidget.cpp:535
+msgid "Focus on Next Article"
 msgstr ""
 
-#: kncomposer.cpp:647
-msgid ""
-"Your message contains characters which are not included\n"
-"in the \"us-ascii\" character set; please choose\n"
-"a suitable character set from the \"Options\" menu."
+#: knmainwidget.cpp:540
+msgid "Focus on Previous Article"
 msgstr ""
 
-#: kncomposer.cpp:652
-msgid "You cannot post an empty message."
+#: knmainwidget.cpp:545
+msgid "Select Article with Focus"
 msgstr ""
 
-#: kncomposer.cpp:658
-msgid ""
-"Your article seems to consist entirely of quoted text;\n"
-"do you want to re-edit the article or send it anyway?"
+#: knmainwidget.cpp:552
+msgid "Account &Properties"
 msgstr ""
 
-#: kncomposer.cpp:663
-msgid ""
-"You cannot post an article consisting\n"
-"entirely of quoted text."
-msgstr ""
+#: knmainwidget.cpp:557
+msgid "&Rename Account"
+msgstr "Ail-enwi'r Cyf&rif"
 
-#: kncomposer.cpp:671
-msgid ""
-"Your article contains lines longer than 80 characters.\n"
-"Do you want to re-edit the article or send it anyway?"
-msgstr ""
-"Cynhwysa eich erthygl linellau sy'n hwy na 80 nod.\n"
-"  A ydych eisiau ail-olygu'r erthygl neu'i hanfon beth bynnag?"
+#: knmainwidget.cpp:562
+msgid "&Subscribe to Newsgroups..."
+msgstr "Tany&sgrifio i Grwpiau Newyddion..."
 
-#: kncomposer.cpp:678
-msgid ""
-"Your signature is more than 8 lines long.\n"
-"You should shorten it to match the widely accepted limit of 4 lines.\n"
-"Do you want to re-edit the article or send it anyway?"
-msgstr ""
-"Mae'ch llofnod yn fwy nac 8 llinell.\n"
-"  Dylech ei fyrhau i gydweddu â'r uchafswm cydnabyddedig o 4 llinell.\n"
-" A ydych eisiau ail-olygu'r erthygl neu'i hanfon beth bynnag?"
+#: knmainwidget.cpp:566
+msgid "&Expire All Groups"
+msgstr "Darfod &Pob Grŵp"
 
-#: kncomposer.cpp:683
-msgid ""
-"Your signature exceeds the widely-accepted limit of 4 lines:\n"
-"please consider shortening your signature;\n"
-"otherwise, you will probably annoy your readers."
-msgstr ""
+#: knmainwidget.cpp:571
+msgid "&Get New Articles in All Groups"
+msgstr "Cael Erthyglau Newydd ym &Mhob Grŵp"
 
-#: kncomposer.cpp:706
-msgid ""
-"You have not configured your preferred signing key yet;\n"
-"please specify it in the global identity configuration,\n"
-"in the account properties or in the group properties.\n"
-"The article will be sent unsigned."
+#: knmainwidget.cpp:576
+msgid "&Get New Articles in All Accounts"
 msgstr ""
 
-#: kncomposer.cpp:713
-msgid "Send Unsigned"
-msgstr "Anfon Heb ei Lofnodi"
+#: knmainwidget.cpp:581
+msgid "&Delete Account"
+msgstr "&Dileu Cyfrif"
 
-#: kncomposer.cpp:905
-msgid "Do you want to save this article in the draft folder?"
-msgstr "A ydych eisiau cadw'r erthygl hon yn y blygell ddrafft?"
+#: knmainwidget.cpp:586
+msgid "&Post to Newsgroup..."
+msgstr "&Hysbysu i'r Grŵp Newyddion..."
 
-#: kncomposer.cpp:1059
-msgid "Insert File"
-msgstr "Mewnosod Ffeil"
+#: knmainwidget.cpp:593
+msgid "Group &Properties"
+msgstr "Priodw&eddau'r Grwp"
 
-#: kncomposer.cpp:1132
-msgid "Attach File"
-msgstr "Atodi Ffeil"
+#: knmainwidget.cpp:598
+msgid "Rename &Group"
+msgstr "Ail-enwi'r &Grŵp"
 
-#: kncomposer.cpp:1193
-msgid ""
-"The poster does not want a mail copy of your reply (Mail-Copies-To: "
-"nobody);\n"
-"please respect their request."
-msgstr ""
+#: knmainwidget.cpp:603
+msgid "&Get New Articles"
+msgstr "&Nôl Erthyglau Newydd"
 
-#: kncomposer.cpp:1194
-msgid "&Send Copy"
-msgstr "&Anfon Copi"
+#: knmainwidget.cpp:607
+msgid "E&xpire Group"
+msgstr "&Darfod Grŵp"
 
-#: kncomposer.cpp:1247 articlewidget.cpp:1426
-msgid "Select Charset"
-msgstr "Dewis y Set Nodau"
+#: knmainwidget.cpp:611
+msgid "Re&organize Group"
+msgstr "Ad-dre&fnu Grŵp"
 
-#: kncomposer.cpp:1272
-msgid "This will replace all text you have written."
-msgstr ""
+#: knmainwidget.cpp:616
+msgid "&Unsubscribe From Group"
+msgstr "Dat-dan&ysgrifio i'r Grŵp"
 
-#: kncomposer.cpp:1286
-msgid ""
-"No editor configured.\n"
-"Please do this in the settings dialog."
-msgstr ""
-"Does dim golygydd wedi'w ffurfweddu.\n"
-"Mae angen gwneud hyn yn yr ymgom gosodiadau."
+#: knmainwidget.cpp:621
+msgid "Mark All as &Read"
+msgstr "No&di Pob Erthygl fel Wedi'i Darllen"
 
-#: kncomposer.cpp:1332
-msgid ""
-"Unable to start external editor.\n"
-"Please check your configuration in the settings dialog."
-msgstr ""
-"Methu cychwyn y golygydd allanol.\n"
-"  A wnewch edrych dros eich ffurfweddiad yn yr ymgom osodiadau."
+#: knmainwidget.cpp:625
+msgid "Mark All as U&nread"
+msgstr "Nodi Pob Erthygl fel &Heb ei Darllen"
 
-#: kncomposer.cpp:1349
-msgid "News Article"
-msgstr "Erthygl Newyddion"
+#: knmainwidget.cpp:629
+msgid "Mark Last as Unr&ead..."
+msgstr "Nodi'r Diw&eddaraf fel Heb ei Darllen..."
 
-#: kncomposer.cpp:1351
-msgid "Email"
-msgstr "Ebost"
+#: knmainwidget.cpp:634
+msgid "&Configure KNode..."
+msgstr "&Ffurfweddu KNode..."
 
-#: kncomposer.cpp:1353
-msgid "News Article & Email"
-msgstr "Erthygl Newyddion ac Ebost"
+#: knmainwidget.cpp:640
+msgid "&New Folder"
+msgstr "Plygell &Newydd"
 
-#: kncomposer.cpp:1357
-msgid " OVR "
-msgstr " DROS "
+#: knmainwidget.cpp:645
+msgid "New &Subfolder"
+msgstr "I&s-blygell Newydd"
 
-#: kncomposer.cpp:1359
-msgid " INS "
-msgstr " RHWNG "
+#: knmainwidget.cpp:650
+msgid "&Delete Folder"
+msgstr "&Dileu Plygell"
 
-#: kncomposer.cpp:1361
-#, kde-format
-msgid " Type: %1 "
-msgstr " Math: %1 "
+#: knmainwidget.cpp:655
+msgid "&Rename Folder"
+msgstr "Ail-enwi P&lygell"
 
-#: kncomposer.cpp:1362
-#, kde-format
-msgid " Charset: %1 "
-msgstr " Set nodau: %1 "
+#: knmainwidget.cpp:659
+msgid "C&ompact Folder"
+msgstr "Crynh&oi Plygell"
 
-#: kncomposer.cpp:1364 kncomposer.cpp:1371
-#, kde-format
-msgid " Column: %1 "
-msgstr " Colofn: %1 "
+#: knmainwidget.cpp:663
+msgid "Co&mpact All Folders"
+msgstr "Cryn&hoi Pob Plygell"
 
-#: kncomposer.cpp:1365 kncomposer.cpp:1372
-#, kde-format
-msgid " Line: %1 "
-msgstr " Llinell: %1 "
+#: knmainwidget.cpp:667
+msgid "&Empty Folder"
+msgstr "Gwagu Pl&ygell"
 
-#: kncomposer.cpp:1412
-msgid "No Subject"
-msgstr "Dim Pwnc"
+#: knmainwidget.cpp:671
+msgid "&Import MBox Folder..."
+msgstr "Mewnfor&io Plygell MBox..."
 
-#: kncomposer.cpp:1542
-msgid "Attachment Properties"
-msgstr "Priodweddau yr Atodiad"
+#: knmainwidget.cpp:675
+msgid "E&xport as MBox Folder..."
+msgstr "&Allforio Plygell MBox..."
 
-#: kncomposer.cpp:1549
-msgid "File"
-msgstr ""
+#: knmainwidget.cpp:680
+msgid "S&ort"
+msgstr "&Trefnu"
 
-#. i18n: file: nntpaccountdialog_base.ui:193
-#. i18n: ectx: property (text), widget (QLabel, mNameLabel)
-#: kncomposer.cpp:1555 rc.cpp:776
-msgid "Name:"
-msgstr "Enw:"
+#: knmainwidget.cpp:682
+msgid "By &Subject"
+msgstr "Yn ôl &Pwnc"
 
-#: kncomposer.cpp:1557
-msgid "Size:"
-msgstr "Maint:"
+#: knmainwidget.cpp:683
+msgid "By S&ender"
+msgstr "Yn ôl &Anfonydd"
 
-#: kncomposer.cpp:1564
-msgid "Mime"
-msgstr "Mime"
+#: knmainwidget.cpp:684
+msgid "By S&core"
+msgstr "Yn ôl &Sgôr"
 
-#: kncomposer.cpp:1573
-msgid "&Mime-Type:"
-msgstr "Math-&Mime:"
+#: knmainwidget.cpp:685
+msgid "By &Lines"
+msgstr "Yn ôl &Llinellau"
 
-#: kncomposer.cpp:1580
-msgid "&Description:"
-msgstr "&Disgrifiad:"
+#: knmainwidget.cpp:686
+msgid "By &Date"
+msgstr "Yn ôl &Dyddiad"
 
-#: kncomposer.cpp:1597
-msgid "&Encoding:"
-msgstr "A&mgodiad:"
+#: knmainwidget.cpp:692
+msgid "Sort"
+msgstr "Trefnu"
 
-#: kncomposer.cpp:1632
-msgid ""
-"You have set an invalid mime-type.\n"
-"Please change it."
-msgstr ""
-"Yr ydych wedi gosod math-mime annilys.\n"
-"  Newidiwch ef."
+#: knmainwidget.cpp:696
+msgid "&Filter"
+msgstr "&Hidlenni"
 
-#: kncomposer.cpp:1637
-msgid ""
-"You have changed the mime-type of this non-textual attachment\n"
-"to text. This might cause an error while loading or encoding the file.\n"
-"Proceed?"
-msgstr ""
-"Yr ydych wedi newid math-mime yr atodiad di-destun hwn\n"
-" i destun.  Gall hyn achosi gwall wrth lwytho neu amgodio'r ffeil.\n"
-"  Parhau?"
+#: knmainwidget.cpp:701
+msgid "Filter"
+msgstr "Hidlen"
 
-#: aboutdata.cpp:30
-msgid "Maintainer"
-msgstr "Cynhaliwr"
+#: knmainwidget.cpp:706
+msgid "&Search Articles..."
+msgstr "&Chwilio Erthyglau..."
 
-#: aboutdata.cpp:31 aboutdata.cpp:32
-msgid "Former maintainer"
-msgstr "Cyn-gynhaliwr"
+#: knmainwidget.cpp:712
+msgid "&Refresh List"
+msgstr "Cyfredoli'r &Rhestr"
 
-#: aboutdata.cpp:46 knjobdata.cpp:154
-msgid "KNode"
-msgstr "KNode"
+#: knmainwidget.cpp:717
+msgid "&Collapse All Threads"
+msgstr "&Cyfyngu pob Trywydd"
 
-#: aboutdata.cpp:48
-msgid "A newsreader for KDE"
-msgstr "Darllenydd newyddion ar gyfer KDE"
+#: knmainwidget.cpp:721
+msgid "E&xpand All Threads"
+msgstr "&Ehangu pob Trywydd"
 
-#: aboutdata.cpp:50
-msgid "Copyright © 1999–2010 KNode authors"
-msgstr ""
+#: knmainwidget.cpp:725
+msgid "&Toggle Subthread"
+msgstr "Dangos/Cuddio &Is-Drywydd"
 
-#: aboutdata.cpp:59
-msgid "Jakob Schroeter"
-msgstr ""
+#: knmainwidget.cpp:730
+msgid "Show T&hreads"
+msgstr "Dangos T&rywyddau"
 
-#: knsearchdialog.cpp:32
-msgid "Find Articles"
-msgstr ""
+#: knmainwidget.cpp:738
+msgid "Mark as &Read"
+msgstr "Nodi fel &Wedi'i Darllen"
 
-#: knsearchdialog.cpp:39
-msgid "&Search"
-msgstr ""
+#: knmainwidget.cpp:744
+msgid "Mar&k as Unread"
+msgstr "Nodi fel &Heb ei Darllen"
 
-#: knsearchdialog.cpp:40
-msgid "C&lear"
-msgstr "&Gwaredu"
+#: knmainwidget.cpp:749
+msgid "Mark &Thread as Read"
+msgstr "Nodi'r &Trywydd fel Wedi'i Ddarllen"
 
-#: knsearchdialog.cpp:49
-msgid "Sho&w complete threads"
-msgstr "Dango&s trywyddau llawn"
+#: knmainwidget.cpp:754
+msgid "Mark T&hread as Unread"
+msgstr "Nodi'r T&rywydd fel Heb ei Ddarllen"
 
-#: foldertreewidget.cpp:369
-msgid "Local"
-msgstr ""
+#: knmainwidget.cpp:760
+msgid "Open in Own &Window"
+msgstr "Agor yn ei Ffenestr ei &Hun"
 
-#: foldertreewidget.cpp:372
-msgid "IMAP"
-msgstr ""
+#: knmainwidget.cpp:767
+msgid "&Edit Scoring Rules..."
+msgstr "Golygu'r Rh&eolau Sgorio..."
 
-#: foldertreewidget.cpp:375
-msgid "Cached IMAP"
-msgstr ""
+#: knmainwidget.cpp:772
+msgid "Recalculate &Scores"
+msgstr "Ail-gyfrifo'r &Sgoriau"
 
-#: foldertreewidget.cpp:378
-msgid "News"
-msgstr ""
+#: knmainwidget.cpp:776
+msgid "&Lower Score for Author..."
+msgstr "Ise&lhau Sgôr ar gyfer Awdur..."
 
-#: foldertreewidget.cpp:381
-msgid "Search"
-msgstr ""
+#: knmainwidget.cpp:781
+msgid "&Raise Score for Author..."
+msgstr "Codi Sgô&r ar gyfer Awdur..."
 
-#. i18n: file: nntpaccountdialog_base.ui:160
-#. i18n: ectx: property (text), widget (QRadioButton, mEncNone)
-#: foldertreewidget.cpp:384 rc.cpp:767
-msgid "None"
-msgstr "Dim"
+#: knmainwidget.cpp:787
+msgid "&Ignore Thread"
+msgstr "&Anwybyddu Trywydd"
 
-#: foldertreewidget.cpp:390
-msgid "Unknown"
-msgstr ""
+#: knmainwidget.cpp:793
+msgid "&Watch Thread"
+msgstr "G&wylio Trywydd"
 
-#: knserverinfo.cpp:92
-#, kde-format
-msgid ""
-"KWallet is not available. It is strongly recommended to use KWallet for "
-"managing your passwords.\n"
-"However, KNode can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered "
-"secure from decryption efforts if access to the configuration file is "
-"obtained.\n"
-"Do you want to store the password for server '%1' in the configuration file?"
-msgstr ""
+#: knmainwidget.cpp:800
+msgid "Sen&d Pending Messages"
+msgstr "&Anfon Negeseuon sy'n Aros"
 
-#: knserverinfo.cpp:100
-msgid "KWallet Not Available"
-msgstr ""
+#: knmainwidget.cpp:805
+msgid "&Delete Article"
+msgstr "&Dileu Erthygl"
 
-#: knserverinfo.cpp:101
-msgid "Store Password"
-msgstr ""
+#: knmainwidget.cpp:811
+msgid "Send &Now"
+msgstr "Anfon &Nawr"
 
-#: knserverinfo.cpp:102
-msgid "Do Not Store Password"
-msgstr ""
+#: knmainwidget.cpp:816
+msgctxt "edit article"
+msgid "&Edit Article..."
+msgstr "Golygu &Erthygl..."
 
-#: knaccountmanager.cpp:125
-msgid "Cannot create a folder for this account."
+#: knmainwidget.cpp:823
+msgid "Stop &Network"
+msgstr "Atal y &Rhwydwaith"
+
+#: knmainwidget.cpp:828
+msgid "&Fetch Article with ID..."
+msgstr "&Nôl Erthygl gyda'r Dynodiad..."
+
+#: knmainwidget.cpp:833
+msgid "Show Quick Search"
 msgstr ""
 
-#: knaccountmanager.cpp:140
+#: knmainwidget.cpp:894
 msgid ""
-"This account cannot be deleted since there are some unsent messages for it."
+"KNode is currently sending articles. If you quit now you might lose these "
+"articles.\n"
+"Do you want to quit anyway?"
 msgstr ""
-"Nid yw'r cyfrif hwn yn medru cael ei dileu oherwydd mae negeseuon heb eu "
-"hanfon amdano fo."
+"Mae KNode yn anfon erthyglau ar hyn o bryd. Os terfynwch chi yn awr gellir "
+"colli'r erthyglau hyn.\n"
+" Hoffech chi derfynu beth bynnag?"
 
-#: knaccountmanager.cpp:143
-msgid "Do you really want to delete this account?"
-msgstr "Ydych yn siwr eich bod chi eisiau dileu'r cyfrif yma?"
+#: knmainwidget.cpp:1462
+#, kde-format
+msgid "Do you really want to unsubscribe from %1?"
+msgstr "Ydych yn wir eisiau tynnu'ch tanysgrifiad o %1?"
 
-#: knaccountmanager.cpp:148
-msgid ""
-"At least one group of this account is currently in use.\n"
-"The account cannot be deleted at the moment."
+#: knmainwidget.cpp:1462 kngroupmanager.cpp:423
+msgid "Unsubscribe"
 msgstr ""
-"Mae o leiaf un grwp o'r cyfrif hwn mewn ddefnydd.\n"
-" Nid yw'r cyfrif yn medru cael ei dileu ar hyn o bryd."
 
-#: knfolder.cpp:194
-msgid " Loading folder..."
-msgstr " Llwytho plygell..."
+#: knmainwidget.cpp:1492
+msgid "Mark Last as Unread"
+msgstr "Nodi'r Diweddaraf fel Heb ei Darllen"
 
-#: kncomposerview.cpp:301 kncomposerview.cpp:316
-msgctxt ""
-"@info/plain This message is place, as an inactive text, in the Followup-To "
-"line edit of the message composer when the user select more than one group "
-"to post his/her message."
-msgid "Choose an appropriate group to redirect replies..."
-msgstr ""
+#: knmainwidget.cpp:1493
+msgid "Enter how many articles should be marked unread:"
+msgstr "Mewnosodwch sawl erthygl dylid eu nodi fel heb eu darllen:"
 
-#: kngroupmanager.cpp:422
-msgid ""
-"Do you really want to unsubscribe\n"
-"from these groups?"
-msgstr ""
-"Ydych wir eisiau dat-danysgrifio\n"
-" o'r grwpiau hyn?"
+#: knmainwidget.cpp:1534
+msgid "You cannot delete a standard folder."
+msgstr "Fedrwch chi ddim dileu plygell safonol."
 
-#: kngroupmanager.cpp:423 knmainwidget.cpp:1462
-msgid "Unsubscribe"
-msgstr ""
+#: knmainwidget.cpp:1537
+msgid "Do you really want to delete this folder and all its children?"
+msgstr "Ydych chi wir eisiau dileu'r blygell yma a'i phlant i gyd?"
 
-#: kngroupmanager.cpp:461
-#, kde-format
+#: knmainwidget.cpp:1541
 msgid ""
-"The group \"%1\" is being updated currently.\n"
-"It is not possible to unsubscribe from it at the moment."
+"This folder cannot be deleted because some of\n"
+" its articles are currently in use."
 msgstr ""
-"Diwedderir y grŵp \"%1\" ar hyn o bryd.\n"
-"  Mae'n amhosibl diddymu'r  tanysgrifiad iddo ar hyn o bryd."
+"Ni ellir dileu'r blygell yma am fod rhai o'i\n"
+" herthyglau'n cael eu defnyddio o hyd."
 
-#: kngroupmanager.cpp:526
+#: knmainwidget.cpp:1554
+msgid "You cannot rename a standard folder."
+msgstr "Chewch chi ddim ail-enwi plygell safonol."
+
+#: knmainwidget.cpp:1584
 msgid ""
-"This group cannot be expired because it is currently being updated.\n"
-" Please try again later."
+"This folder cannot be emptied at the moment\n"
+"because some of its articles are currently in use."
 msgstr ""
-"Ni ellir darfod y grŵp hwn am ei fod yn cael ei diweddaru.\n"
-"  Ceisiwch eto nes ymlaen."
+"Ni ellir gwagu'r blygell yma ar hyn o bryd\n"
+" am fod rhai o'i herthyglau'n cael eu defnyddio o hyd."
 
-#: kngroupmanager.cpp:645
+#: knmainwidget.cpp:1588
 #, kde-format
-msgid ""
-"The group %1 does not appear to exist anymore on the server.\n"
-"You may unsubscribe."
-msgstr ""
+msgid "Do you really want to delete all articles in %1?"
+msgstr "Ydych wir eisiau dileu pob erthygl yn %1?"
 
-#: kngroupmanager.cpp:669
-msgid ""
-"You do not have any groups for this account;\n"
-"do you want to fetch a current list?"
-msgstr ""
+#: knmainwidget.cpp:1623
+msgid "Select Sort Column"
+msgstr "Dewis y Golofn Drefnu"
 
-#: kngroupmanager.cpp:669
-msgid "Fetch List"
-msgstr ""
+#: knmainwidget.cpp:1946
+msgid "Fetch Article with ID"
+msgstr "Nôl Erthygl gyda Dynodiad"
 
-#: kngroupmanager.cpp:669
-msgid "Do Not Fetch"
-msgstr ""
+#: knmainwidget.cpp:1952
+msgid "&Message-ID:"
+msgstr "&Dynodiad-Neges:"
 
-#: knfilterdialog.cpp:39
-msgid "New Filter"
-msgstr "Hidlen newydd"
+#: knmainwidget.cpp:1957
+msgid "&Fetch"
+msgstr "&Nôl"
 
-#: knfilterdialog.cpp:41 knconfigwidgets.cpp:192
-#, kde-format
-msgid "Properties of %1"
-msgstr "Nodweddion %1"
-
-#: knfilterdialog.cpp:50
-msgid "Na&me:"
-msgstr "&Enw:"
-
-#: knfilterdialog.cpp:53
-msgid "Single Articles"
-msgstr "Erthyglau Unigol"
+#: treewidget.cpp:217 headerview.cpp:77
+msgid "View Columns"
+msgstr "Gwled Colofnau"
 
-#: knfilterdialog.cpp:54
-msgid "Whole Threads"
-msgstr "Trywyddau Llawn"
+#: knfoldermanager.cpp:46
+msgid "Local Folders"
+msgstr "Plygyll Lleol"
 
-#: knfilterdialog.cpp:55
-msgid "Apply o&n:"
-msgstr "Gweithredu &ar:"
+#: knfoldermanager.cpp:50
+msgid "Drafts"
+msgstr "Drafftiau"
 
-#: knfilterdialog.cpp:57
-msgid "Sho&w in menu"
-msgstr "Dangos yn y dde&wislen"
+#: knfoldermanager.cpp:54
+msgid "Outbox"
+msgstr "All-flwch"
 
-#: knfilterdialog.cpp:115
-msgid "Please provide a name for this filter."
-msgstr "Rhowch enw ar gyfer yr hidlen hon."
+#: knfoldermanager.cpp:58
+msgid "Sent"
+msgstr "Anfonwyd"
 
-#: knfilterdialog.cpp:118
-msgid ""
-"A filter with this name exists already.\n"
-"Please choose a different name."
+#: knfoldermanager.cpp:88
+msgid "Cannot load index-file."
 msgstr ""
-"Mae hidlen o'r enw hwn eisoes mewn bod.\n"
-" Dewiswch enw arall."
 
-#: headerview.cpp:50 headerview.cpp:80 knfilterconfigwidget.cpp:63
-msgid "Score"
-msgstr "Sgôr"
+#: knfoldermanager.cpp:143
+msgid "New folder"
+msgstr "Plygell newydd"
 
-#: headerview.cpp:51 knfilterconfigwidget.cpp:67
-msgid "Lines"
-msgstr "Llinellau"
+#: knfoldermanager.cpp:306
+msgid "Import MBox Folder"
+msgstr "Mewnforio Plygell MBox"
 
-#: headerview.cpp:79
-msgid "Line Count"
-msgstr ""
+#: knfoldermanager.cpp:315
+msgid " Importing articles..."
+msgstr " Mewnforio erthyglau..."
 
-#: headerview.cpp:223
-msgid "Date (thread changed)"
-msgstr "Dyddiad (newidwyd y trywydd)"
+#: knfoldermanager.cpp:379
+msgid " Storing articles..."
+msgstr " Cadw erthyglau..."
 
-#: headerview.cpp:443
-msgid "Newsgroups / To"
-msgstr ""
+#: knfoldermanager.cpp:406
+msgid "Export Folder"
+msgstr "Plygell Allforio"
 
-#: knfilterconfigwidget.cpp:40
-msgid ""
-"The following placeholders are supported:\n"
-"%MYNAME=own name, %MYEMAIL=own email address"
-msgstr ""
-"Cefnogir y nodau lle canlynol:\n"
-" %MYNAME=eich enw'ch hun, %MYEMAIL=eich cyfeiriad ebost eich hun"
+#: knfoldermanager.cpp:410
+msgid " Exporting articles..."
+msgstr " Allforio erthyglau..."
 
-#: knfilterconfigwidget.cpp:43
-msgid "Subject && &From"
+#: knfiltermanager.cpp:261
+msgid "Do you really want to delete this filter?"
+msgstr "Ydych wir eisiau dileu'r hidlen hon?"
+
+#: knfiltermanager.cpp:344
+msgid "ERROR: no such filter."
 msgstr ""
 
-#: knfilterconfigwidget.cpp:49
-msgid "Message-ID"
-msgstr "Nod-neges"
+#: knfiltermanager.cpp:368
+msgid "Select Filter"
+msgstr "Dewis Hidlen"
 
-#: knfilterconfigwidget.cpp:51
-msgid "References"
-msgstr "Cyfeiriadau"
+#: mailsendjob.cpp:39
+msgid "Could not create mail transport job."
+msgstr ""
 
-#: knfilterconfigwidget.cpp:54
-msgid "M&essage-IDs"
-msgstr "&Nodau-negeseuon"
+#: knjobdata.cpp:156
+msgid "Sending message"
+msgstr "Anfon Neges..."
 
-#: knfilterconfigwidget.cpp:57
-msgid "&Status"
-msgstr "&Cyflwr"
+#: knjobdata.cpp:165 scheduler.cpp:213
+msgid "Waiting..."
+msgstr "Aros ..."
 
-#: knfilterconfigwidget.cpp:65
-msgid "Age"
-msgstr "Oedran"
+#: kncollectionview.cpp:85
+msgid "Unread"
+msgstr "Heb eu darllen"
 
-#: knfilterconfigwidget.cpp:65
-msgid " days"
-msgstr " dyddiau"
+#: kncollectionview.cpp:86
+msgid "Total"
+msgstr "Cyfanswm"
 
-#: knfilterconfigwidget.cpp:70
-msgid "&Additional"
-msgstr "Ychw&anegol"
+#: knfolder.cpp:194
+msgid " Loading folder..."
+msgstr " Llwytho plygell..."
 
-#: kngroup.cpp:923
-msgid " Scoring..."
-msgstr " Sgorio..."
+#: headerview.cpp:52 headerview.cpp:225 knarticlefactory.cpp:317
+msgid "Date"
+msgstr "Dyddiad"
 
-#: kngroup.cpp:970
-msgid " Reorganizing headers..."
-msgstr " Ad-drefnu penawdau..."
+#: headerview.cpp:79
+msgid "Line Count"
+msgstr ""
 
-#: kngroup.cpp:1066
-#, kde-format
-msgid "Cannot load saved headers: %1"
-msgstr "Methu llwytho penawdau wedi'u cadw: %1"
+#: headerview.cpp:223
+msgid "Date (thread changed)"
+msgstr "Dyddiad (newidwyd y trywydd)"
 
-#: kncleanup.cpp:62
-#, kde-format
-msgid "Deleting expired articles in <b>%1</b>"
-msgstr "Yn dileu erthyglau darfodedig yn <b>%1</b>"
+#: headerview.cpp:443
+msgid "Newsgroups / To"
+msgstr ""
 
-#: kncleanup.cpp:68
-#, kde-format
-msgid "Compacting folder <b>%1</b>"
-msgstr "Crynhoi plygell <b>%1</b>"
+#: knsourceviewwindow.cpp:38
+msgid "Article Source"
+msgstr "Tarddiad yr Erthygl"
 
-#: kncleanup.cpp:188
+#: kngrouppropdlg.cpp:44
 #, kde-format
-msgid "<b>%1</b><br />expired: %2<br />left: %3"
+msgctxt "@title:window %1=newsgroup name"
+msgid "Properties of %1"
 msgstr ""
 
-#: kncleanup.cpp:255
-msgid "Cleaning Up"
-msgstr "Tacluso"
-
-#: kncleanup.cpp:265
-msgid "Cleaning up. Please wait..."
-msgstr "Yn tacluso.  Arhoswch..."
-
-#: scheduler.cpp:50
-msgid "Internal Error: No account set for this job."
+#: kngrouppropdlg.cpp:51
+msgctxt "@title:tab"
+msgid "General"
 msgstr ""
 
-#: scheduler.cpp:64
-msgid "Waiting for KWallet..."
+#: kngrouppropdlg.cpp:56
+msgctxt "@title:group"
+msgid "Settings"
 msgstr ""
 
-#: scheduler.cpp:180
-msgid ""
-"You need to supply a username and a\n"
-"password to access this server"
+#: kngrouppropdlg.cpp:67
+msgctxt "@label:textbox Alternative name of a newsgroup"
+msgid "Nickname:"
 msgstr ""
-"Rhaid i chi roi enw defnyddiwr a\n"
-" chyfrinair i gael mynediad i'r gweinydd hwn"
-
-#: scheduler.cpp:182
-msgid "Authentication Failed"
-msgstr "Methodd dilysiant"
-
-#: scheduler.cpp:183
-msgid "Server:"
-msgstr "Gweinydd:"
-
-#: scheduler.cpp:213 knjobdata.cpp:165
-msgid "Waiting..."
-msgstr "Aros ..."
 
-#: utilities.cpp:70
-#, kde-format
-msgid ""
-"<qt>A file named <b>%1</b> already exists.<br />Do you want to replace "
-"it?</qt>"
+#: kngrouppropdlg.cpp:72
+msgctxt "@label:listbox"
+msgid "Use different default charset:"
 msgstr ""
 
-#: utilities.cpp:71
-msgid "&Replace"
-msgstr "D&isodli"
+#: kngrouppropdlg.cpp:89
+msgctxt "@title:group"
+msgid "Description"
+msgstr ""
 
-#: utilities.cpp:346
-msgid ""
-"Unable to load/save configuration.\n"
-"Wrong permissions on home folder?\n"
-"You should close KNode now to avoid data loss."
+#: kngrouppropdlg.cpp:97
+msgctxt "@label name of a newsgroup"
+msgid "Name:"
 msgstr ""
 
-#: utilities.cpp:352
-msgid "Unable to load/save file."
+#: kngrouppropdlg.cpp:102
+msgctxt "@label description of a newsgroup"
+msgid "Description:"
 msgstr ""
 
-#: utilities.cpp:358
-msgid "Unable to save remote file."
+#: kngrouppropdlg.cpp:107
+msgctxt "@label status of posting to a newsgroup"
+msgid "Status:"
 msgstr ""
 
-#: utilities.cpp:364
-msgid "Unable to create temporary file."
+#: kngrouppropdlg.cpp:111
+msgctxt "posting status"
+msgid "unknown"
 msgstr ""
 
-#: knconfigwidgets.cpp:134
-#, kde-format
-msgid "Server: %1"
-msgstr "Gweinydd: %1"
+#: kngrouppropdlg.cpp:113
+msgid "posting forbidden"
+msgstr "Hysbysu wedi'i wahardd"
 
-#: knconfigwidgets.cpp:135
-#, kde-format
-msgid "Port: %1"
-msgstr "Porth: %1"
-
-#: knconfigwidgets.cpp:137
-msgid "Server: "
-msgstr "Gweinydd: "
-
-#: knconfigwidgets.cpp:138
-msgid "Port: "
-msgstr "Porth: "
-
-#: knconfigwidgets.cpp:194
-msgid "New Account"
-msgstr "Cyfrif Newydd"
-
-#: knconfigwidgets.cpp:201
-msgid "Ser&ver"
-msgstr "Gw&einydd"
-
-#: knconfigwidgets.cpp:249
-msgid " minute"
-msgid_plural " minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: knconfigwidgets.cpp:253
-msgid "&Identity"
-msgstr "&Dynodiad"
-
-#: knconfigwidgets.cpp:257
-msgid "&Cleanup"
-msgstr ""
+#: kngrouppropdlg.cpp:115
+msgid "posting allowed"
+msgstr "Hysbysu wedi'i ganiatau"
 
-#: knconfigwidgets.cpp:291
-msgid ""
-"Please enter an arbitrary name for the account and the\n"
-"hostname of the news server."
+#: kngrouppropdlg.cpp:117
+msgctxt "posting status"
+msgid "moderated"
 msgstr ""
 
-#: knconfigwidgets.cpp:405
-msgid "&Use custom colors"
-msgstr "Defnyddio &llywiau addasiedig"
-
-#: knconfigwidgets.cpp:410
-msgctxt "@action:button Run a color selection dialog"
-msgid "Cha&nge..."
+#: kngrouppropdlg.cpp:127
+msgctxt "@title:group"
+msgid "Statistics"
 msgstr ""
 
-#: knconfigwidgets.cpp:420
-msgid "Use custom &fonts"
-msgstr "Defnyddio &ffontiau addasiedig"
+#: kngrouppropdlg.cpp:135
+msgid "Articles:"
+msgstr "Erhyglau:"
 
-#: knconfigwidgets.cpp:425
-msgctxt "@action:button Run a font selection dialog"
-msgid "Chang&e..."
-msgstr ""
+#: kngrouppropdlg.cpp:140
+msgid "Unread articles:"
+msgstr "Erthyglau heb eu darllen:"
 
-#: knconfigwidgets.cpp:674
-msgctxt "@action:button Add a new message header field (open dialog)"
-msgid "&Add..."
-msgstr ""
+#: kngrouppropdlg.cpp:145
+msgid "New articles:"
+msgstr "Erthyglau newydd:"
 
-#: knconfigwidgets.cpp:678
-msgctxt "@action:button Delete a message header field"
-msgid "&Delete"
-msgstr ""
+#: kngrouppropdlg.cpp:150
+msgid "Threads with unread articles:"
+msgstr "Trywyddau gydag erthyglau heb eu darllen:"
 
-#: knconfigwidgets.cpp:682 knconfigwidgets.cpp:1025
-msgctxt "modify something"
-msgid "&Edit..."
-msgstr "G&olygu..."
+#: kngrouppropdlg.cpp:155
+msgid "Threads with new articles:"
+msgstr "Trywyddau gydag erthyglau newydd:"
 
-#: knconfigwidgets.cpp:686
-msgctxt "@action:button Move an element of a list up"
-msgid "&Up"
+#: kngrouppropdlg.cpp:167
+msgctxt "@title:tab"
+msgid "Identity"
 msgstr ""
 
-#: knconfigwidgets.cpp:690
-msgctxt "@action:button Move an element of a list down"
-msgid "Do&wn"
+#: kngrouppropdlg.cpp:171
+msgctxt "@title:tab"
+msgid "Cleanup"
 msgstr ""
 
-#: knconfigwidgets.cpp:771
-msgid "Really delete this header?"
-msgstr "Wir ddileu'r penawd yma?"
-
-#: knconfigwidgets.cpp:842
-msgid "Header Properties"
-msgstr "Nodweddion Penawdau"
-
-#: knconfigwidgets.cpp:858
-msgctxt "@label:textbox Edition of a message header name"
-msgid "H&eader:"
-msgstr ""
+#: knfilterdialog.cpp:39
+msgid "New Filter"
+msgstr "Hidlen newydd"
 
-#: knconfigwidgets.cpp:866
-msgctxt ""
-"@label:textbox Edition of the displayed name in the UI of a message header"
-msgid "Displayed na&me:"
-msgstr ""
+#: knfilterdialog.cpp:41 knconfigwidgets.cpp:192
+#, kde-format
+msgid "Properties of %1"
+msgstr "Nodweddion %1"
 
-#: knconfigwidgets.cpp:881
-msgid "&Large"
-msgstr "&Mawr"
+#: knfilterdialog.cpp:50
+msgid "Na&me:"
+msgstr "&Enw:"
 
-#: knconfigwidgets.cpp:882
-msgid "&Bold"
-msgstr "&Trwm"
+#: knfilterdialog.cpp:53
+msgid "Single Articles"
+msgstr "Erthyglau Unigol"
 
-#: knconfigwidgets.cpp:883
-msgid "&Italic"
-msgstr "&Italig"
+#: knfilterdialog.cpp:54
+msgid "Whole Threads"
+msgstr "Trywyddau Llawn"
 
-#: knconfigwidgets.cpp:884
-msgid "&Underlined"
-msgstr "Wedi'i &Danllinellu"
+#: knfilterdialog.cpp:55
+msgid "Apply o&n:"
+msgstr "Gweithredu &ar:"
 
-#: knconfigwidgets.cpp:890
-msgid "Value"
-msgstr "Gwerth"
+#: knfilterdialog.cpp:57
+msgid "Sho&w in menu"
+msgstr "Dangos yn y dde&wislen"
 
-#: knconfigwidgets.cpp:897
-msgid "L&arge"
-msgstr "M&awr"
+#: knfilterdialog.cpp:115
+msgid "Please provide a name for this filter."
+msgstr "Rhowch enw ar gyfer yr hidlen hon."
 
-#: knconfigwidgets.cpp:898
-msgid "Bol&d"
-msgstr "Tr&wm"
+#: knfilterdialog.cpp:118
+msgid ""
+"A filter with this name exists already.\n"
+"Please choose a different name."
+msgstr ""
+"Mae hidlen o'r enw hwn eisoes mewn bod.\n"
+" Dewiswch enw arall."
 
-#: knconfigwidgets.cpp:899
-msgid "I&talic"
-msgstr "I&talig"
+#: settings.cpp:31
+msgid "Quoted Text - First level"
+msgstr "Testun wedi'i ddyfynnu - Lefel cyntaf"
 
-#: knconfigwidgets.cpp:900
-msgid "U&nderlined"
-msgstr "Wedi'i da&nlinellu"
+#: settings.cpp:32
+msgid "Quoted Text - Second level"
+msgstr "Testun wedi'i ddyfynnu - Ail lefel"
 
-#: knconfigwidgets.cpp:980
-msgid "Default score for &ignored threads:"
-msgstr "Sgôr rhagosodedig ar gyfer trywyddau wedi'u &hanwybyddu:"
+#: settings.cpp:33
+msgid "Quoted Text - Third level"
+msgstr "Testun wedi'i ddyfynnu - Trydydd lefel"
 
-#: knconfigwidgets.cpp:987
-msgid "Default score for &watched threads:"
-msgstr "Sgôr rhagosodedig ar gyfer trywyddau wedi'u g&wylio:"
+#: configuration/identity_edition_dialog.cpp:43
+msgctxt "@title:window"
+msgid "Manage your identities"
+msgstr ""
 
-#: knconfigwidgets.cpp:1013
-msgctxt "@title"
-msgid "&Filters:"
+#: configuration/identity_edition_dialog.cpp:45
+msgctxt "@action:button Change signing key"
+msgid "Change..."
 msgstr ""
 
-#: knconfigwidgets.cpp:1021
-msgctxt "@action:button Add a new filter"
-msgid "&Add..."
+#: configuration/identity_edition_dialog.cpp:46
+msgctxt "@title:window PGP key chooser"
+msgid "Your OpenPGP Key"
 msgstr ""
 
-#: knconfigwidgets.cpp:1029
-msgctxt "@action:button Copy a filter"
-msgid "Co&py..."
+#: configuration/identity_edition_dialog.cpp:47
+msgid "Select the OpenPGP key which should be used for signing articles."
 msgstr ""
+"Dewiswch pa allwedd OpenPGP a ddylir ei defnyddio ar gyfer llofnodi "
+"erthyglau."
 
-#: knconfigwidgets.cpp:1033
-msgctxt "@action:button Delete a filter"
-msgid "&Delete"
+#: configuration/identity_edition_dialog.cpp:190
+msgctxt "Name of a newly created identity"
+msgid "New identity"
 msgstr ""
 
-#: knconfigwidgets.cpp:1040
-msgctxt "@title"
-msgid "&Menu:"
+#: configuration/identity_edition_dialog.cpp:260
+#, kde-format
+msgid ""
+"<qt>Do you really want to remove the identity <emphasis>%1</emphasis>?</qt>"
 msgstr ""
 
-#: knconfigwidgets.cpp:1047
-msgctxt "@action:button move something up in a list"
-msgid "&Up"
+#: configuration/identity_edition_dialog.cpp:262
+msgctxt "@title:window"
+msgid "Delete identity"
 msgstr ""
 
-#: knconfigwidgets.cpp:1051
-msgctxt "@action:button move something down in a list"
-msgid "Do&wn"
+#: scheduler.cpp:50
+msgid "Internal Error: No account set for this job."
 msgstr ""
 
-#: knconfigwidgets.cpp:1055
-msgctxt "@action:button"
-msgid ""
-"Add\n"
-"&Separator"
+#: scheduler.cpp:64
+msgid "Waiting for KWallet..."
 msgstr ""
 
-#: knconfigwidgets.cpp:1059
-msgctxt "@action:button"
+#: scheduler.cpp:180
 msgid ""
-"&Remove\n"
-"Separator"
+"You need to supply a username and a\n"
+"password to access this server"
 msgstr ""
+"Rhaid i chi roi enw defnyddiwr a\n"
+" chyfrinair i gael mynediad i'r gweinydd hwn"
 
-#: knconfigwidgets.cpp:1281
-msgid "Allow 8-bit"
-msgstr "Caniatau 8-did"
-
-#: knconfigwidgets.cpp:1282
-msgid "7-bit (Quoted-Printable)"
-msgstr "7-did (Argraffadwy-Dyfynedig)"
-
-#: knconfigwidgets.cpp:1382
-msgid "Additional Header"
-msgstr ""
-
-#: knconfigwidgets.cpp:1503
-msgid "&Use global cleanup configuration"
-msgstr ""
-
-#: knconfigwidgets.cpp:1508
-msgid "Newsgroup Cleanup Settings"
-msgstr ""
-
-#: knconfigwidgets.cpp:1516
-msgid "&Expire old articles automatically"
-msgstr "Dar&fod hen erthyglau'n ymysgogol"
-
-#: knconfigwidgets.cpp:1522
-msgid "&Purge groups every:"
-msgstr "Ysgubo grw&piau bob:"
-
-#: knconfigwidgets.cpp:1532
-msgid "&Keep read articles:"
-msgstr "Cadw &erthyglau wedi'u darllen:"
-
-#: knconfigwidgets.cpp:1540
-msgid "Keep u&nread articles:"
-msgstr "Cadw erthyglau heb eu darlle&n:"
-
-#: knconfigwidgets.cpp:1546
-msgid "&Remove articles that are not available on the server"
-msgstr ""
-
-#: knconfigwidgets.cpp:1550
-msgid "Preser&ve threads"
-msgstr "Ca&dw trywyddau"
-
-#: knconfigwidgets.cpp:1606
-msgid "Folders"
-msgstr "Plygyll"
-
-#: knconfigwidgets.cpp:1614
-msgid "Co&mpact folders automatically"
-msgstr "Cryn&hoi plygyll yn ymysgogol"
-
-#: knconfigwidgets.cpp:1620
-msgid "P&urge folders every:"
-msgstr "Sg&ubo plygyll bob:"
+#: scheduler.cpp:182
+msgid "Authentication Failed"
+msgstr "Methodd dilysiant"
 
-#: mailsendjob.cpp:39
-msgid "Could not create mail transport job."
-msgstr ""
+#: scheduler.cpp:183
+msgid "Server:"
+msgstr "Gweinydd:"
 
 #: articlewidget.cpp:156
 msgid "F&ind in Article..."
@@ -1984,1136 +1676,1084 @@
 "%1"
 msgstr ""
 
-#: knsourceviewwindow.cpp:38
-msgid "Article Source"
-msgstr "Tarddiad yr Erthygl"
-
-#: kngroupselectdialog.cpp:29
-msgid "Select Destinations"
-msgstr "Dewis Cyrchfannau"
-
-#: kngroupselectdialog.cpp:35
-msgid "Groups for this article:"
-msgstr "Grŵpiau ar gyfer yr erthygl hon:"
-
-#: kngroupselectdialog.cpp:104
-msgid ""
-"You are crossposting to a moderated newsgroup.\n"
-"Please be aware that your article will not appear in any group\n"
-"until it has been approved by the moderators of the moderated group."
+#: nntpjobs.cpp:99 nntpjobs.cpp:127
+msgid "Loading group list from disk..."
 msgstr ""
-"Yr ydych yn croesbostio i grŵp newyddion wedi'i chymedroli.\n"
-" Sylwer na fydd eich erthygl yn ymddangos mewn unrhyw grŵp\n"
-" nes ei bod wedi'i chymeradwyo gan gymedrolwyr y grŵp cymedroledig."
-
-#: knstringfilter.cpp:109
-msgid "Does Contain"
-msgstr "Yn Cynnwys"
-
-#: knstringfilter.cpp:110
-msgid "Does NOT Contain"
-msgstr "HEB Gynnwys"
-
-#: knstringfilter.cpp:114
-msgid "Regular expression"
-msgstr "Mynegiad rheolaidd"
 
-#: knjobdata.cpp:156
-msgid "Sending message"
-msgstr "Anfon Neges..."
+#: nntpjobs.cpp:101 nntpjobs.cpp:130
+msgid "Unable to read the group list file"
+msgstr "Methu darllen ffeil rhestr y grwpiau"
 
-#: kncollectionview.cpp:85
-msgid "Unread"
-msgstr "Heb eu darllen"
+#: nntpjobs.cpp:107
+msgid "Writing group list to disk..."
+msgstr ""
 
-#: kncollectionview.cpp:86
-msgid "Total"
-msgstr "Cyfanswm"
+#: nntpjobs.cpp:110
+msgid "Unable to write the group list file"
+msgstr "Methu sgwennu i ffeil rhestr y grwpiau"
 
-#: knode_options.h:25
-msgid "A 'news://server/group' URL"
+#: nntpjobs.cpp:181
+msgid "Sorting..."
 msgstr ""
 
-#: knfoldermanager.cpp:46
-msgid "Local Folders"
-msgstr "Plygyll Lleol"
+#: nntpjobs.cpp:272
+#, kde-format
+msgid "The server %1 does not allow you to post articles to it."
+msgstr ""
 
-#: knfoldermanager.cpp:50
-msgid "Drafts"
-msgstr "Drafftiau"
+#: nntpjobs.cpp:275
+#, kde-format
+msgid ""
+"The posting of this article to the server %1 failed.\n"
+"Please check that you are not trying to post to a read-only group."
+msgstr ""
 
-#: knfoldermanager.cpp:54
-msgid "Outbox"
-msgstr "All-flwch"
+#: knconfigpages.cpp:96
+msgid "Newsgroup Servers"
+msgstr "Gweinyddion Grwpiau Newyddion"
 
-#: knfoldermanager.cpp:58
-msgid "Sent"
-msgstr "Anfonwyd"
+#: knconfigpages.cpp:98
+msgid "Mail Server (SMTP)"
+msgstr "Gweinydd Ebost (SMTP)"
 
-#: knfoldermanager.cpp:88
-msgid "Cannot load index-file."
-msgstr ""
+#. i18n: file: postnewscomposerwidget_base.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: postnewstechnicalwidget_base.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: knconfigpages.cpp:132 rc.cpp:498 rc.cpp:748
+msgid "General"
+msgstr "Cyffredinol"
 
-#: knfoldermanager.cpp:143
-msgid "New folder"
-msgstr "Plygell newydd"
+#: knconfigpages.cpp:133
+msgid "Navigation"
+msgstr "Llywio"
 
-#: knfoldermanager.cpp:306
-msgid "Import MBox Folder"
-msgstr "Mewnforio Plygell MBox"
+#: knconfigpages.cpp:134
+msgid "Scoring"
+msgstr "Sgorio"
 
-#: knfoldermanager.cpp:315
-msgid " Importing articles..."
-msgstr " Mewnforio erthyglau..."
+#: knconfigpages.cpp:135
+msgid "Filters"
+msgstr "Hidlenni"
 
-#: knfoldermanager.cpp:379
-msgid " Storing articles..."
-msgstr " Cadw erthyglau..."
+#: knconfigpages.cpp:136
+msgid "Headers"
+msgstr "Penawdau"
 
-#: knfoldermanager.cpp:406
-msgid "Export Folder"
-msgstr "Plygell Allforio"
+#: knconfigpages.cpp:137
+msgid "Viewer"
+msgstr "Gwelydd"
 
-#: knfoldermanager.cpp:410
-msgid " Exporting articles..."
-msgstr " Allforio erthyglau..."
+#: knconfigpages.cpp:157
+msgid "Technical"
+msgstr "Technegol"
 
-#: kscoring.cpp:87
-msgid "Notify Message"
-msgstr ""
+#. i18n: file: knode.kcfg:367
+#. i18n: ectx: label, entry (composerFont), group (VISUAL_APPEARANCE)
+#: knconfigpages.cpp:158 rc.cpp:310
+msgid "Composer"
+msgstr "Cyfansoddydd"
 
-#: kscoring.cpp:98
-msgid "Do not show this message again"
-msgstr ""
+#: knconfigpages.cpp:159
+msgid "Spelling"
+msgstr "Sillafu"
 
-#: kscoring.cpp:122
-#, kde-format
+#: knarticlefactory.cpp:149
 msgid ""
-"Article\n"
-"<b>%1</b><br /><b>%2</b><br />caused the following note to appear:<br />%3"
-msgstr ""
-
-#: kscoring.cpp:193
-msgid "Adjust Score"
+"The author has requested a reply by email instead\n"
+"of a followup to the newsgroup. (Followup-To: poster)\n"
+"Do you want to reply in public anyway?"
 msgstr ""
 
-#: kscoring.cpp:195
-msgid "Display Message"
+#: knarticlefactory.cpp:149
+msgid "Reply Public"
 msgstr ""
 
-#: kscoring.cpp:197
-msgid "Colorize Header"
+#: knarticlefactory.cpp:149
+msgid "Reply by Email"
 msgstr ""
 
-#: kscoring.cpp:199
-msgid "Mark as Read"
+#: knarticlefactory.cpp:197
+msgid ""
+"The author requested a mail copy of your reply. (Mail-Copies-To header)"
 msgstr ""
+"Mae'r awdur wedi gofyn am gopi ebost o'ch ateb. (pennawd Copiau-Ebost-I)"
 
-#: kscoring.cpp:394
-msgid "<h1>List of collected notes</h1>"
+#: knarticlefactory.cpp:287
+msgid ""
+"This article contains attachments. Do you want them to be forwarded as well?"
 msgstr ""
+"Mae'r erthygl hon yn cynnwys atodiadau. Ydych chi eisiau iddynt gael eu "
+"anfon ymlaen hefyd?"
 
-#: kscoring.cpp:418
-msgid "Collected Notes"
-msgstr ""
+#: knarticlefactory.cpp:287
+msgid "Forward"
+msgstr "Ymlaen"
 
-#: kscoring.cpp:491
-msgid "Contains Substring"
+#: knarticlefactory.cpp:287
+msgid "Do Not Forward"
 msgstr ""
 
-#: kscoring.cpp:493
-msgid "Matches Regular Expression"
-msgstr ""
+#: knarticlefactory.cpp:313
+msgid "Forwarded message (begin)"
+msgstr "Neges a anfonwyd ymlaen (dechrau)"
 
-#: kscoring.cpp:495
-msgid "Matches Regular Expression (Case Sensitive)"
+#: knarticlefactory.cpp:318
+msgid "Newsgroup"
 msgstr ""
 
-#: kscoring.cpp:497
-msgid "Is Exactly the Same As"
-msgstr ""
+#: knarticlefactory.cpp:324
+msgid "Forwarded message (end)"
+msgstr "Neges a anfonwyd ymlaen (diwedd)"
 
-#: kscoring.cpp:499
-msgid "Less Than"
+#: knarticlefactory.cpp:359
+msgid "Do you really want to cancel this article?"
+msgstr "Ydych chi'n siwr eich bod chi eisau diddymu'r erthygl yma?"
+
+#: knarticlefactory.cpp:359
+msgid "Cancel Article"
 msgstr ""
 
-#: kscoring.cpp:501
-msgid "Greater Than"
+#: knarticlefactory.cpp:363
+msgid ""
+"Do you want to send the cancel\n"
+"message now or later?"
 msgstr ""
+"Ydych chi eisiau anfon y neges\n"
+"diddymu rwan ta hwyrach ymlaen?"
 
-#: kscoring.cpp:1042
-msgid "Choose Another Rule Name"
+#: knarticlefactory.cpp:363
+msgid "Question"
+msgstr "Cwestiwn"
+
+#: knarticlefactory.cpp:363
+msgid "&Now"
+msgstr "Rwa&n"
+
+#: knarticlefactory.cpp:363
+msgid "&Later"
+msgstr "Nes ym&laen"
+
+#: knarticlefactory.cpp:440
+msgid "Do you really want to supersede this article?"
+msgstr "Ydych yn wir eisiau disodli'r erthygl hon?"
+
+#: knarticlefactory.cpp:440
+msgid "Supersede"
 msgstr ""
 
-#: kscoring.cpp:1043
-msgid "The rule name is already assigned, please choose another name:"
+#: knarticlefactory.cpp:574
+msgid "This article cannot be edited."
+msgstr "Nid yw'n bosibl i olygu yr erthygl hon."
+
+#: knarticlefactory.cpp:606
+msgid "Article has already been sent."
+msgstr "Mae'r erthygl yma wedi ei gyrru yn barod."
+
+#: knarticlefactory.cpp:623
+msgid "Unable to load article."
 msgstr ""
 
-#: kscoring.cpp:1198
-#, kde-format
-msgid "rule %1"
+#: knarticlefactory.cpp:664
+msgid "Unable to load the outbox-folder."
 msgstr ""
 
-#: knfiltermanager.cpp:261
-msgid "Do you really want to delete this filter?"
-msgstr "Ydych wir eisiau dileu'r hidlen hon?"
+#: knarticlefactory.cpp:727
+msgid ""
+"You canceled the article posting. The unsent articles are stored in the "
+"\"Outbox\" folder."
+msgstr ""
 
-#: knfiltermanager.cpp:344
-msgid "ERROR: no such filter."
+#: knarticlefactory.cpp:774
+msgid ""
+"Please set a hostname for the generation\n"
+"of the message-id or disable it."
 msgstr ""
 
-#: knfiltermanager.cpp:368
-msgid "Select Filter"
-msgstr "Dewis Hidlen"
+#: knarticlefactory.cpp:810
+#, kde-format
+msgid ""
+"<qt>Please enter a valid email address for the identity named "
+"<emphasis>%1</emphasis> at the identity section of the configuration "
+"dialog.</qt>"
+msgstr ""
 
-#: kngroupdialog.cpp:38
-msgid "Subscribe to Newsgroups"
-msgstr "Tanysgrifio i Grwpiau Newyddion"
+#: knarticlefactory.cpp:892
+msgid "Emails cannot be canceled or superseded."
+msgstr ""
 
-#: kngroupdialog.cpp:38
-msgid "New &List"
-msgstr "Rhestr &Newydd"
+#: knarticlefactory.cpp:898
+msgid "Cancel messages cannot be canceled or superseded."
+msgstr ""
 
-#: kngroupdialog.cpp:38
-msgid "New &Groups..."
-msgstr "&Grŵpiau Newydd..."
+#: knarticlefactory.cpp:903
+msgid "Only sent articles can be canceled or superseded."
+msgstr ""
 
-#: kngroupdialog.cpp:40
-msgid "Current changes:"
-msgstr "Newidiadau cyfredol:"
+#: knarticlefactory.cpp:908
+msgid "This article has already been canceled or superseded."
+msgstr ""
 
-#: kngroupdialog.cpp:42
-msgid "Subscribe To"
-msgstr "Tanysgrifio I"
+#: knarticlefactory.cpp:915
+msgid ""
+"This article cannot be canceled or superseded,\n"
+"because its message-id has not been created by KNode.\n"
+"But you can look for your article in the newsgroup\n"
+"and cancel (or supersede) it there."
+msgstr ""
 
-#: kngroupdialog.cpp:44
-msgid "Unsubscribe From"
-msgstr "Dat-danysgrifio O"
+#: knarticlefactory.cpp:936
+msgid ""
+"This article does not appear to be from you.\n"
+"You can only cancel or supersede your own articles."
+msgstr ""
+"Ymddengys nid oddi wrthych chi y mae'r erthygl hon.\n"
+"Dim ond eich erthyglau'ch hun y gallwch eu diddymu neu'u disodli."
 
-#: kngroupdialog.cpp:142
+#: knarticlefactory.cpp:941
 msgid ""
-"You have subscribed to a moderated newsgroup.\n"
-"Your articles will not appear in the group immediately.\n"
-"They have to go through a moderation process."
+"You have to download the article body\n"
+"before you can cancel or supersede the article."
 msgstr ""
-"Yr ydych wedi tanysgrifio i grŵp newyddion wedi'i gymedroli.\n"
-" Fydd eich erthyglau ddim yn ymddangos yn y grŵp yn syth.\n"
-" Rhaid iddyn nhw fynd trwy broses cymedroli."
+"Rhaid i chi lawrlwytho corff yr erthygl\n"
+" cyn y cewch diddymu neu ddileu'r erthygl."
 
-#: kngroupdialog.cpp:276
-msgid "Downloading groups..."
-msgstr "Lawrlwytho grwpiau..."
+#: knarticlefactory.cpp:1035
+msgid "Errors While Sending"
+msgstr "Gwallau tra'n danfon"
 
-#: kngroupdialog.cpp:288
-msgid "New Groups"
-msgstr "Grwpiau newydd"
+#: knarticlefactory.cpp:1041
+msgid "Errors occurred while sending these articles:"
+msgstr "Bu gwallau wrth ddanfon yr erthyglau hyn:"
 
-#: kngroupdialog.cpp:291
-msgid "Check for New Groups"
-msgstr "Edrych am Grwpiau Newydd"
+#: knarticlefactory.cpp:1042
+msgid "The unsent articles are stored in the \"Outbox\" folder."
+msgstr "Cedwir yr erthyglau nis danfonwyd yn y blygell \"Blwch Allan\"."
 
-#: kngroupdialog.cpp:295
-msgid "Created since last check:"
-msgstr "Wedi'u creu ers yr ymholiad diwethaf:"
+#: knarticlefactory.cpp:1072
+msgid "<b>Error message:</b><br />"
+msgstr ""
 
-#: kngroupdialog.cpp:303
-msgid "Created since this date:"
-msgstr "Wedi'u creu ers y dyddiad hwn:"
+#: kngroupselectdialog.cpp:29
+msgid "Select Destinations"
+msgstr "Dewis Cyrchfannau"
 
-#: kngroupdialog.cpp:321
-msgid "Checking for new groups..."
-msgstr "Ymholi am grwpiau newydd..."
+#: kngroupselectdialog.cpp:35
+msgid "Groups for this article:"
+msgstr "Grŵpiau ar gyfer yr erthygl hon:"
 
-#: nntpjobs.cpp:99 nntpjobs.cpp:127
-msgid "Loading group list from disk..."
+#: kngroupselectdialog.cpp:104
+msgid ""
+"You are crossposting to a moderated newsgroup.\n"
+"Please be aware that your article will not appear in any group\n"
+"until it has been approved by the moderators of the moderated group."
 msgstr ""
+"Yr ydych yn croesbostio i grŵp newyddion wedi'i chymedroli.\n"
+" Sylwer na fydd eich erthygl yn ymddangos mewn unrhyw grŵp\n"
+" nes ei bod wedi'i chymeradwyo gan gymedrolwyr y grŵp cymedroledig."
 
-#: nntpjobs.cpp:101 nntpjobs.cpp:130
-msgid "Unable to read the group list file"
-msgstr "Methu darllen ffeil rhestr y grwpiau"
+#: knsearchdialog.cpp:32
+msgid "Find Articles"
+msgstr ""
 
-#: nntpjobs.cpp:107
-msgid "Writing group list to disk..."
+#: knsearchdialog.cpp:39
+msgid "&Search"
 msgstr ""
 
-#: nntpjobs.cpp:110
-msgid "Unable to write the group list file"
-msgstr "Methu sgwennu i ffeil rhestr y grwpiau"
+#: knsearchdialog.cpp:40
+msgid "C&lear"
+msgstr "&Gwaredu"
 
-#: nntpjobs.cpp:181
-msgid "Sorting..."
+#: knsearchdialog.cpp:49
+msgid "Sho&w complete threads"
+msgstr "Dango&s trywyddau llawn"
+
+#: kngroupmanager.cpp:422
+msgid ""
+"Do you really want to unsubscribe\n"
+"from these groups?"
 msgstr ""
+"Ydych wir eisiau dat-danysgrifio\n"
+" o'r grwpiau hyn?"
 
-#: nntpjobs.cpp:272
+#: kngroupmanager.cpp:461
 #, kde-format
-msgid "The server %1 does not allow you to post articles to it."
+msgid ""
+"The group \"%1\" is being updated currently.\n"
+"It is not possible to unsubscribe from it at the moment."
 msgstr ""
+"Diwedderir y grŵp \"%1\" ar hyn o bryd.\n"
+"  Mae'n amhosibl diddymu'r  tanysgrifiad iddo ar hyn o bryd."
 
-#: nntpjobs.cpp:275
+#: kngroupmanager.cpp:526
+msgid ""
+"This group cannot be expired because it is currently being updated.\n"
+" Please try again later."
+msgstr ""
+"Ni ellir darfod y grŵp hwn am ei fod yn cael ei diweddaru.\n"
+"  Ceisiwch eto nes ymlaen."
+
+#: kngroupmanager.cpp:645
 #, kde-format
 msgid ""
-"The posting of this article to the server %1 failed.\n"
-"Please check that you are not trying to post to a read-only group."
+"The group %1 does not appear to exist anymore on the server.\n"
+"You may unsubscribe."
 msgstr ""
 
-#: knmainwidget.cpp:142
-msgid "&Search:"
-msgstr "&Chwilio:"
+#: kngroupmanager.cpp:669
+msgid ""
+"You do not have any groups for this account;\n"
+"do you want to fetch a current list?"
+msgstr ""
 
-#: knmainwidget.cpp:269
-msgid " Ready"
-msgstr " Parod"
+#: kngroupmanager.cpp:669
+msgid "Fetch List"
+msgstr ""
 
-#: knmainwidget.cpp:294
-msgid "KDE News Reader"
-msgstr "Darllenydd Newyddion KDE"
+#: kngroupmanager.cpp:669
+msgid "Do Not Fetch"
+msgstr ""
 
-#: knmainwidget.cpp:479
-msgid "&Next Article"
-msgstr "Erthygl &Nesaf"
-
-#: knmainwidget.cpp:480
-msgid "Go to next article"
-msgstr ""
+#: knstatusfilter.cpp:109
+msgid "Is read:"
+msgstr "Wedi'u darllen:"
 
-#: knmainwidget.cpp:485
-msgid "&Previous Article"
-msgstr "Erthygl &Flaenorol"
+#: knstatusfilter.cpp:110
+msgid "Is new:"
+msgstr "Newydd:"
 
-#: knmainwidget.cpp:487
-msgid "Go to previous article"
-msgstr ""
+#: knstatusfilter.cpp:111
+msgid "Has unread followups:"
+msgstr "Gydag erthyglau ymateb heb au darllen:"
 
-#: knmainwidget.cpp:492
-msgid "Next Unread &Article"
-msgstr "Erthygl Nesaf &Heb ei Darllen"
+#: knstatusfilter.cpp:112
+msgid "Has new followups:"
+msgstr "Erthyglau ymateb newydd:"
 
-#: knmainwidget.cpp:498
-msgid "Next Unread &Thread"
-msgstr "&Trywydd Nesaf Heb ei Ddarllen"
+#: knstatusfilter.cpp:211
+msgid "True"
+msgstr "Gwir"
 
-#: knmainwidget.cpp:504
-msgid "Ne&xt Group"
-msgstr "Grŵp N&esaf"
+#: knstatusfilter.cpp:212
+msgid "False"
+msgstr "Anghywir"
 
-#: knmainwidget.cpp:510
-msgid "Pre&vious Group"
-msgstr "Grŵp Fl&aenorol"
+#: kndisplayedheader.cpp:28
+msgctxt "collection of article headers"
+msgid "Approved"
+msgstr "Cymeradwyd"
 
-#: knmainwidget.cpp:515
-msgid "Read &Through Articles"
-msgstr "Darllen &Trwy Erthyglau"
+#: kndisplayedheader.cpp:29
+msgctxt "collection of article headers"
+msgid "Content-Transfer-Encoding"
+msgstr "Amgodiad-Trosglwyddiad-Cynnwys"
 
-#: knmainwidget.cpp:520
-msgid "Focus on Next Folder"
-msgstr "Canolbwyntio ar y Blygell Nesaf"
+#: kndisplayedheader.cpp:30
+msgctxt "collection of article headers"
+msgid "Content-Type"
+msgstr "Math-Cynnwys"
 
-#: knmainwidget.cpp:525
-msgid "Focus on Previous Folder"
-msgstr "Canolbwyntio ar y Blygell Flaenorol"
+#: kndisplayedheader.cpp:31
+msgctxt "collection of article headers"
+msgid "Control"
+msgstr "Rheolaeth"
 
-#: knmainwidget.cpp:530
-msgid "Select Folder with Focus"
-msgstr "Deiws y Blygell efo'r Canolbwynt"
+#: kndisplayedheader.cpp:32
+msgctxt "collection of article headers"
+msgid "Date"
+msgstr "Dyddiad"
 
-#: knmainwidget.cpp:535
-msgid "Focus on Next Article"
-msgstr ""
+#: kndisplayedheader.cpp:33
+msgctxt "collection of article headers"
+msgid "Distribution"
+msgstr "Dosbarthiad"
 
-#: knmainwidget.cpp:540
-msgid "Focus on Previous Article"
-msgstr ""
+#: kndisplayedheader.cpp:34
+msgctxt "collection of article headers"
+msgid "Expires"
+msgstr "Darfod"
 
-#: knmainwidget.cpp:545
-msgid "Select Article with Focus"
-msgstr ""
+#: kndisplayedheader.cpp:35
+msgctxt "collection of article headers"
+msgid "Followup-To"
+msgstr "Ymateb-Dilyn-I"
 
-#: knmainwidget.cpp:552
-msgid "Account &Properties"
-msgstr ""
+#: kndisplayedheader.cpp:36
+msgctxt "collection of article headers"
+msgid "From"
+msgstr "Oddi wrth"
 
-#: knmainwidget.cpp:557
-msgid "&Rename Account"
-msgstr "Ail-enwi'r Cyf&rif"
+#: kndisplayedheader.cpp:37
+msgctxt "collection of article headers"
+msgid "Lines"
+msgstr "Llinellau"
 
-#: knmainwidget.cpp:562
-msgid "&Subscribe to Newsgroups..."
-msgstr "Tany&sgrifio i Grwpiau Newyddion..."
+#: kndisplayedheader.cpp:38
+msgctxt "collection of article headers"
+msgid "Mail-Copies-To"
+msgstr "Ebostio-Copïau-I"
 
-#: knmainwidget.cpp:566
-msgid "&Expire All Groups"
-msgstr "Darfod &Pob Grŵp"
+#: kndisplayedheader.cpp:39
+msgctxt "collection of article headers"
+msgid "Message-ID"
+msgstr "Clustnod-Neges"
 
-#: knmainwidget.cpp:571
-msgid "&Get New Articles in All Groups"
-msgstr "Cael Erthyglau Newydd ym &Mhob Grŵp"
+#: kndisplayedheader.cpp:40
+msgctxt "collection of article headers"
+msgid "Mime-Version"
+msgstr "Fersiwn-Mime"
 
-#: knmainwidget.cpp:576
-msgid "&Get New Articles in All Accounts"
-msgstr ""
+#: kndisplayedheader.cpp:41
+msgctxt "collection of article headers"
+msgid "NNTP-Posting-Host"
+msgstr "Gwesteiwr-Hysbysu-NNTP"
 
-#: knmainwidget.cpp:581
-msgid "&Delete Account"
-msgstr "&Dileu Cyfrif"
+#: kndisplayedheader.cpp:42
+msgctxt "collection of article headers"
+msgid "Newsgroups"
+msgstr "Grwpiau newyddion"
 
-#: knmainwidget.cpp:586
-msgid "&Post to Newsgroup..."
-msgstr "&Hysbysu i'r Grŵp Newyddion..."
+#: kndisplayedheader.cpp:43
+msgctxt "collection of article headers"
+msgid "Organization"
+msgstr "Cymdeithas"
 
-#: knmainwidget.cpp:593
-msgid "Group &Properties"
-msgstr "Priodw&eddau'r Grwp"
+#: kndisplayedheader.cpp:44
+msgctxt "collection of article headers"
+msgid "Path"
+msgstr "Llwybr"
 
-#: knmainwidget.cpp:598
-msgid "Rename &Group"
-msgstr "Ail-enwi'r &Grŵp"
+#: kndisplayedheader.cpp:45
+msgctxt "collection of article headers"
+msgid "References"
+msgstr "Cyfeiriadau"
 
-#: knmainwidget.cpp:603
-msgid "&Get New Articles"
-msgstr "&Nôl Erthyglau Newydd"
+#: kndisplayedheader.cpp:46
+msgctxt "collection of article headers"
+msgid "Reply-To"
+msgstr "Ateb-I"
 
-#: knmainwidget.cpp:607
-msgid "E&xpire Group"
-msgstr "&Darfod Grŵp"
+#: kndisplayedheader.cpp:47
+msgctxt "collection of article headers"
+msgid "Sender"
+msgstr "Anfonydd"
 
-#: knmainwidget.cpp:611
-msgid "Re&organize Group"
-msgstr "Ad-dre&fnu Grŵp"
+#: kndisplayedheader.cpp:48
+msgctxt "collection of article headers"
+msgid "Subject"
+msgstr "Pwnc"
 
-#: knmainwidget.cpp:616
-msgid "&Unsubscribe From Group"
-msgstr "Dat-dan&ysgrifio i'r Grŵp"
+#: kndisplayedheader.cpp:49
+msgctxt "collection of article headers"
+msgid "Supersedes"
+msgstr "Yn disodli"
 
-#: knmainwidget.cpp:621
-msgid "Mark All as &Read"
-msgstr "No&di Pob Erthygl fel Wedi'i Darllen"
+#: kndisplayedheader.cpp:50
+msgctxt "collection of article headers"
+msgid "To"
+msgstr "At"
 
-#: knmainwidget.cpp:625
-msgid "Mark All as U&nread"
-msgstr "Nodi Pob Erthygl fel &Heb ei Darllen"
+#: kndisplayedheader.cpp:51
+msgctxt "collection of article headers"
+msgid "User-Agent"
+msgstr "Asiant-Defnyddiwr"
 
-#: knmainwidget.cpp:629
-msgid "Mark Last as Unr&ead..."
-msgstr "Nodi'r Diw&eddaraf fel Heb ei Darllen..."
+#: kndisplayedheader.cpp:52
+msgctxt "collection of article headers"
+msgid "X-Mailer"
+msgstr "Ebostydd-X"
 
-#: knmainwidget.cpp:634
-msgid "&Configure KNode..."
-msgstr "&Ffurfweddu KNode..."
+#: kndisplayedheader.cpp:53
+msgctxt "collection of article headers"
+msgid "X-Newsreader"
+msgstr "Darllenydd-newyddion-X"
 
-#: knmainwidget.cpp:640
-msgid "&New Folder"
-msgstr "Plygell &Newydd"
+#: kndisplayedheader.cpp:54
+msgctxt "collection of article headers"
+msgid "X-No-Archive"
+msgstr "Dim-Archif-X"
 
-#: knmainwidget.cpp:645
-msgid "New &Subfolder"
-msgstr "I&s-blygell Newydd"
+#: kndisplayedheader.cpp:55
+msgctxt "collection of article headers"
+msgid "XRef"
+msgstr "CyfeiriadX"
 
-#: knmainwidget.cpp:650
-msgid "&Delete Folder"
-msgstr "&Dileu Plygell"
+#: kndisplayedheader.cpp:57
+msgctxt "collection of article headers"
+msgid "Groups"
+msgstr "Grwpiau"
 
-#: knmainwidget.cpp:655
-msgid "&Rename Folder"
-msgstr "Ail-enwi P&lygell"
+#: knconfigwidgets.cpp:134
+#, kde-format
+msgid "Server: %1"
+msgstr "Gweinydd: %1"
 
-#: knmainwidget.cpp:659
-msgid "C&ompact Folder"
-msgstr "Crynh&oi Plygell"
+#: knconfigwidgets.cpp:135
+#, kde-format
+msgid "Port: %1"
+msgstr "Porth: %1"
 
-#: knmainwidget.cpp:663
-msgid "Co&mpact All Folders"
-msgstr "Cryn&hoi Pob Plygell"
-
-#: knmainwidget.cpp:667
-msgid "&Empty Folder"
-msgstr "Gwagu Pl&ygell"
+#: knconfigwidgets.cpp:137
+msgid "Server: "
+msgstr "Gweinydd: "
 
-#: knmainwidget.cpp:671
-msgid "&Import MBox Folder..."
-msgstr "Mewnfor&io Plygell MBox..."
+#: knconfigwidgets.cpp:138
+msgid "Port: "
+msgstr "Porth: "
 
-#: knmainwidget.cpp:675
-msgid "E&xport as MBox Folder..."
-msgstr "&Allforio Plygell MBox..."
+#: knconfigwidgets.cpp:194
+msgid "New Account"
+msgstr "Cyfrif Newydd"
 
-#: knmainwidget.cpp:680
-msgid "S&ort"
-msgstr "&Trefnu"
+#: knconfigwidgets.cpp:201
+msgid "Ser&ver"
+msgstr "Gw&einydd"
 
-#: knmainwidget.cpp:682
-msgid "By &Subject"
-msgstr "Yn ôl &Pwnc"
+#: knconfigwidgets.cpp:249
+msgid " minute"
+msgid_plural " minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: knmainwidget.cpp:683
-msgid "By S&ender"
-msgstr "Yn ôl &Anfonydd"
+#: knconfigwidgets.cpp:253
+msgid "&Identity"
+msgstr "&Dynodiad"
 
-#: knmainwidget.cpp:684
-msgid "By S&core"
-msgstr "Yn ôl &Sgôr"
+#: knconfigwidgets.cpp:257
+msgid "&Cleanup"
+msgstr ""
 
-#: knmainwidget.cpp:685
-msgid "By &Lines"
-msgstr "Yn ôl &Llinellau"
+#: knconfigwidgets.cpp:291
+msgid ""
+"Please enter an arbitrary name for the account and the\n"
+"hostname of the news server."
+msgstr ""
 
-#: knmainwidget.cpp:686
-msgid "By &Date"
-msgstr "Yn ôl &Dyddiad"
+#: knconfigwidgets.cpp:405
+msgid "&Use custom colors"
+msgstr "Defnyddio &llywiau addasiedig"
 
-#: knmainwidget.cpp:692
-msgid "Sort"
-msgstr "Trefnu"
+#: knconfigwidgets.cpp:410
+msgctxt "@action:button Run a color selection dialog"
+msgid "Cha&nge..."
+msgstr ""
 
-#: knmainwidget.cpp:696
-msgid "&Filter"
-msgstr "&Hidlenni"
+#: knconfigwidgets.cpp:420
+msgid "Use custom &fonts"
+msgstr "Defnyddio &ffontiau addasiedig"
 
-#: knmainwidget.cpp:701
-msgid "Filter"
-msgstr "Hidlen"
+#: knconfigwidgets.cpp:425
+msgctxt "@action:button Run a font selection dialog"
+msgid "Chang&e..."
+msgstr ""
 
-#: knmainwidget.cpp:706
-msgid "&Search Articles..."
-msgstr "&Chwilio Erthyglau..."
+#: knconfigwidgets.cpp:674
+msgctxt "@action:button Add a new message header field (open dialog)"
+msgid "&Add..."
+msgstr ""
 
-#: knmainwidget.cpp:712
-msgid "&Refresh List"
-msgstr "Cyfredoli'r &Rhestr"
+#: knconfigwidgets.cpp:678
+msgctxt "@action:button Delete a message header field"
+msgid "&Delete"
+msgstr ""
 
-#: knmainwidget.cpp:717
-msgid "&Collapse All Threads"
-msgstr "&Cyfyngu pob Trywydd"
+#: knconfigwidgets.cpp:682 knconfigwidgets.cpp:1025
+msgctxt "modify something"
+msgid "&Edit..."
+msgstr "G&olygu..."
 
-#: knmainwidget.cpp:721
-msgid "E&xpand All Threads"
-msgstr "&Ehangu pob Trywydd"
+#: knconfigwidgets.cpp:686
+msgctxt "@action:button Move an element of a list up"
+msgid "&Up"
+msgstr ""
 
-#: knmainwidget.cpp:725
-msgid "&Toggle Subthread"
-msgstr "Dangos/Cuddio &Is-Drywydd"
+#: knconfigwidgets.cpp:690
+msgctxt "@action:button Move an element of a list down"
+msgid "Do&wn"
+msgstr ""
 
-#: knmainwidget.cpp:730
-msgid "Show T&hreads"
-msgstr "Dangos T&rywyddau"
+#: knconfigwidgets.cpp:771
+msgid "Really delete this header?"
+msgstr "Wir ddileu'r penawd yma?"
 
-#: knmainwidget.cpp:738
-msgid "Mark as &Read"
-msgstr "Nodi fel &Wedi'i Darllen"
+#: knconfigwidgets.cpp:842
+msgid "Header Properties"
+msgstr "Nodweddion Penawdau"
 
-#: knmainwidget.cpp:744
-msgid "Mar&k as Unread"
-msgstr "Nodi fel &Heb ei Darllen"
+#: knconfigwidgets.cpp:858
+msgctxt "@label:textbox Edition of a message header name"
+msgid "H&eader:"
+msgstr ""
 
-#: knmainwidget.cpp:749
-msgid "Mark &Thread as Read"
-msgstr "Nodi'r &Trywydd fel Wedi'i Ddarllen"
+#: knconfigwidgets.cpp:866
+msgctxt ""
+"@label:textbox Edition of the displayed name in the UI of a message header"
+msgid "Displayed na&me:"
+msgstr ""
 
-#: knmainwidget.cpp:754
-msgid "Mark T&hread as Unread"
-msgstr "Nodi'r T&rywydd fel Heb ei Ddarllen"
+#: knconfigwidgets.cpp:881
+msgid "&Large"
+msgstr "&Mawr"
 
-#: knmainwidget.cpp:760
-msgid "Open in Own &Window"
-msgstr "Agor yn ei Ffenestr ei &Hun"
+#: knconfigwidgets.cpp:882
+msgid "&Bold"
+msgstr "&Trwm"
 
-#: knmainwidget.cpp:767
-msgid "&Edit Scoring Rules..."
-msgstr "Golygu'r Rh&eolau Sgorio..."
+#: knconfigwidgets.cpp:883
+msgid "&Italic"
+msgstr "&Italig"
 
-#: knmainwidget.cpp:772
-msgid "Recalculate &Scores"
-msgstr "Ail-gyfrifo'r &Sgoriau"
+#: knconfigwidgets.cpp:884
+msgid "&Underlined"
+msgstr "Wedi'i &Danllinellu"
 
-#: knmainwidget.cpp:776
-msgid "&Lower Score for Author..."
-msgstr "Ise&lhau Sgôr ar gyfer Awdur..."
+#: knconfigwidgets.cpp:890
+msgid "Value"
+msgstr "Gwerth"
 
-#: knmainwidget.cpp:781
-msgid "&Raise Score for Author..."
-msgstr "Codi Sgô&r ar gyfer Awdur..."
+#: knconfigwidgets.cpp:897
+msgid "L&arge"
+msgstr "M&awr"
 
-#: knmainwidget.cpp:787
-msgid "&Ignore Thread"
-msgstr "&Anwybyddu Trywydd"
+#: knconfigwidgets.cpp:898
+msgid "Bol&d"
+msgstr "Tr&wm"
 
-#: knmainwidget.cpp:793
-msgid "&Watch Thread"
-msgstr "G&wylio Trywydd"
+#: knconfigwidgets.cpp:899
+msgid "I&talic"
+msgstr "I&talig"
 
-#: knmainwidget.cpp:800
-msgid "Sen&d Pending Messages"
-msgstr "&Anfon Negeseuon sy'n Aros"
+#: knconfigwidgets.cpp:900
+msgid "U&nderlined"
+msgstr "Wedi'i da&nlinellu"
 
-#: knmainwidget.cpp:805
-msgid "&Delete Article"
-msgstr "&Dileu Erthygl"
+#: knconfigwidgets.cpp:980
+msgid "Default score for &ignored threads:"
+msgstr "Sgôr rhagosodedig ar gyfer trywyddau wedi'u &hanwybyddu:"
 
-#: knmainwidget.cpp:811
-msgid "Send &Now"
-msgstr "Anfon &Nawr"
+#: knconfigwidgets.cpp:987
+msgid "Default score for &watched threads:"
+msgstr "Sgôr rhagosodedig ar gyfer trywyddau wedi'u g&wylio:"
 
-#: knmainwidget.cpp:816
-msgctxt "edit article"
-msgid "&Edit Article..."
-msgstr "Golygu &Erthygl..."
+#: knconfigwidgets.cpp:1013
+msgctxt "@title"
+msgid "&Filters:"
+msgstr ""
 
-#: knmainwidget.cpp:823
-msgid "Stop &Network"
-msgstr "Atal y &Rhwydwaith"
+#: knconfigwidgets.cpp:1021
+msgctxt "@action:button Add a new filter"
+msgid "&Add..."
+msgstr ""
 
-#: knmainwidget.cpp:828
-msgid "&Fetch Article with ID..."
-msgstr "&Nôl Erthygl gyda'r Dynodiad..."
+#: knconfigwidgets.cpp:1029
+msgctxt "@action:button Copy a filter"
+msgid "Co&py..."
+msgstr ""
 
-#: knmainwidget.cpp:833
-msgid "Show Quick Search"
+#: knconfigwidgets.cpp:1033
+msgctxt "@action:button Delete a filter"
+msgid "&Delete"
 msgstr ""
 
-#: knmainwidget.cpp:894
-msgid ""
-"KNode is currently sending articles. If you quit now you might lose these "
-"articles.\n"
-"Do you want to quit anyway?"
+#: knconfigwidgets.cpp:1040
+msgctxt "@title"
+msgid "&Menu:"
 msgstr ""
-"Mae KNode yn anfon erthyglau ar hyn o bryd. Os terfynwch chi yn awr gellir "
-"colli'r erthyglau hyn.\n"
-" Hoffech chi derfynu beth bynnag?"
 
-#: knmainwidget.cpp:1462
-#, kde-format
-msgid "Do you really want to unsubscribe from %1?"
-msgstr "Ydych yn wir eisiau tynnu'ch tanysgrifiad o %1?"
+#: knconfigwidgets.cpp:1047
+msgctxt "@action:button move something up in a list"
+msgid "&Up"
+msgstr ""
 
-#: knmainwidget.cpp:1492
-msgid "Mark Last as Unread"
-msgstr "Nodi'r Diweddaraf fel Heb ei Darllen"
-
-#: knmainwidget.cpp:1493
-msgid "Enter how many articles should be marked unread:"
-msgstr "Mewnosodwch sawl erthygl dylid eu nodi fel heb eu darllen:"
-
-#: knmainwidget.cpp:1534
-msgid "You cannot delete a standard folder."
-msgstr "Fedrwch chi ddim dileu plygell safonol."
-
-#: knmainwidget.cpp:1537
-msgid "Do you really want to delete this folder and all its children?"
-msgstr "Ydych chi wir eisiau dileu'r blygell yma a'i phlant i gyd?"
+#: knconfigwidgets.cpp:1051
+msgctxt "@action:button move something down in a list"
+msgid "Do&wn"
+msgstr ""
 
-#: knmainwidget.cpp:1541
+#: knconfigwidgets.cpp:1055
+msgctxt "@action:button"
 msgid ""
-"This folder cannot be deleted because some of\n"
-" its articles are currently in use."
+"Add\n"
+"&Separator"
 msgstr ""
-"Ni ellir dileu'r blygell yma am fod rhai o'i\n"
-" herthyglau'n cael eu defnyddio o hyd."
-
-#: knmainwidget.cpp:1554
-msgid "You cannot rename a standard folder."
-msgstr "Chewch chi ddim ail-enwi plygell safonol."
 
-#: knmainwidget.cpp:1584
+#: knconfigwidgets.cpp:1059
+msgctxt "@action:button"
 msgid ""
-"This folder cannot be emptied at the moment\n"
-"because some of its articles are currently in use."
+"&Remove\n"
+"Separator"
 msgstr ""
-"Ni ellir gwagu'r blygell yma ar hyn o bryd\n"
-" am fod rhai o'i herthyglau'n cael eu defnyddio o hyd."
 
-#: knmainwidget.cpp:1588
-#, kde-format
-msgid "Do you really want to delete all articles in %1?"
-msgstr "Ydych wir eisiau dileu pob erthygl yn %1?"
+#: knconfigwidgets.cpp:1281
+msgid "Allow 8-bit"
+msgstr "Caniatau 8-did"
 
-#: knmainwidget.cpp:1623
-msgid "Select Sort Column"
-msgstr "Dewis y Golofn Drefnu"
+#: knconfigwidgets.cpp:1282
+msgid "7-bit (Quoted-Printable)"
+msgstr "7-did (Argraffadwy-Dyfynedig)"
 
-#: knmainwidget.cpp:1946
-msgid "Fetch Article with ID"
-msgstr "Nôl Erthygl gyda Dynodiad"
+#: knconfigwidgets.cpp:1382
+msgid "Additional Header"
+msgstr ""
 
-#: knmainwidget.cpp:1952
-msgid "&Message-ID:"
-msgstr "&Dynodiad-Neges:"
+#: knconfigwidgets.cpp:1503
+msgid "&Use global cleanup configuration"
+msgstr ""
 
-#: knmainwidget.cpp:1957
-msgid "&Fetch"
-msgstr "&Nôl"
+#: knconfigwidgets.cpp:1508
+msgid "Newsgroup Cleanup Settings"
+msgstr ""
 
-#: knstatusfilter.cpp:109
-msgid "Is read:"
-msgstr "Wedi'u darllen:"
+#: knconfigwidgets.cpp:1516
+msgid "&Expire old articles automatically"
+msgstr "Dar&fod hen erthyglau'n ymysgogol"
 
-#: knstatusfilter.cpp:110
-msgid "Is new:"
-msgstr "Newydd:"
+#: knconfigwidgets.cpp:1521 knconfigwidgets.cpp:1531 knconfigwidgets.cpp:1539
+#: knconfigwidgets.cpp:1619 kscoringeditor.cpp:647
+msgid " day"
+msgid_plural " days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: knstatusfilter.cpp:111
-msgid "Has unread followups:"
-msgstr "Gydag erthyglau ymateb heb au darllen:"
+#: knconfigwidgets.cpp:1522
+msgid "&Purge groups every:"
+msgstr "Ysgubo grw&piau bob:"
 
-#: knstatusfilter.cpp:112
-msgid "Has new followups:"
-msgstr "Erthyglau ymateb newydd:"
+#: knconfigwidgets.cpp:1532
+msgid "&Keep read articles:"
+msgstr "Cadw &erthyglau wedi'u darllen:"
 
-#: knstatusfilter.cpp:211
-msgid "True"
-msgstr "Gwir"
+#: knconfigwidgets.cpp:1540
+msgid "Keep u&nread articles:"
+msgstr "Cadw erthyglau heb eu darlle&n:"
 
-#: knstatusfilter.cpp:212
-msgid "False"
-msgstr "Anghywir"
+#: knconfigwidgets.cpp:1546
+msgid "&Remove articles that are not available on the server"
+msgstr ""
 
-#: knconfigpages.cpp:96
-msgid "Newsgroup Servers"
-msgstr "Gweinyddion Grwpiau Newyddion"
+#: knconfigwidgets.cpp:1550
+msgid "Preser&ve threads"
+msgstr "Ca&dw trywyddau"
 
-#: knconfigpages.cpp:98
-msgid "Mail Server (SMTP)"
-msgstr "Gweinydd Ebost (SMTP)"
+#: knconfigwidgets.cpp:1606
+msgid "Folders"
+msgstr "Plygyll"
 
-#. i18n: file: postnewstechnicalwidget_base.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: postnewscomposerwidget_base.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: knconfigpages.cpp:132 rc.cpp:128 rc.cpp:705
-msgid "General"
-msgstr "Cyffredinol"
+#: knconfigwidgets.cpp:1614
+msgid "Co&mpact folders automatically"
+msgstr "Cryn&hoi plygyll yn ymysgogol"
 
-#: knconfigpages.cpp:133
-msgid "Navigation"
-msgstr "Llywio"
+#: knconfigwidgets.cpp:1620
+msgid "P&urge folders every:"
+msgstr "Sg&ubo plygyll bob:"
 
-#: knconfigpages.cpp:134
-msgid "Scoring"
-msgstr "Sgorio"
+#: kngroup.cpp:923
+msgid " Scoring..."
+msgstr " Sgorio..."
 
-#: knconfigpages.cpp:135
-msgid "Filters"
-msgstr "Hidlenni"
+#: kngroup.cpp:970
+msgid " Reorganizing headers..."
+msgstr " Ad-drefnu penawdau..."
 
-#: knconfigpages.cpp:136
-msgid "Headers"
-msgstr "Penawdau"
+#: kngroup.cpp:1066
+#, kde-format
+msgid "Cannot load saved headers: %1"
+msgstr "Methu llwytho penawdau wedi'u cadw: %1"
 
-#: knconfigpages.cpp:137
-msgid "Viewer"
-msgstr "Gwelydd"
+#: knstringfilter.cpp:109
+msgid "Does Contain"
+msgstr "Yn Cynnwys"
 
-#: knconfigpages.cpp:157
-msgid "Technical"
-msgstr "Technegol"
+#: knstringfilter.cpp:110
+msgid "Does NOT Contain"
+msgstr "HEB Gynnwys"
 
-#. i18n: file: knode.kcfg:367
-#. i18n: ectx: label, entry (composerFont), group (VISUAL_APPEARANCE)
-#: knconfigpages.cpp:158 rc.cpp:676
-msgid "Composer"
-msgstr "Cyfansoddydd"
+#: knstringfilter.cpp:114
+msgid "Regular expression"
+msgstr "Mynegiad rheolaidd"
 
-#: knconfigpages.cpp:159
-msgid "Spelling"
-msgstr "Sillafu"
+#: knode_options.h:25
+msgid "A 'news://server/group' URL"
+msgstr ""
 
-#: settings.cpp:31
-msgid "Quoted Text - First level"
-msgstr "Testun wedi'i ddyfynnu - Lefel cyntaf"
+#: kncomposerview.cpp:301 kncomposerview.cpp:316
+msgctxt ""
+"@info/plain This message is place, as an inactive text, in the Followup-To "
+"line edit of the message composer when the user select more than one group "
+"to post his/her message."
+msgid "Choose an appropriate group to redirect replies..."
+msgstr ""
 
-#: settings.cpp:32
-msgid "Quoted Text - Second level"
-msgstr "Testun wedi'i ddyfynnu - Ail lefel"
+#: kscoring.cpp:87
+msgid "Notify Message"
+msgstr ""
 
-#: settings.cpp:33
-msgid "Quoted Text - Third level"
-msgstr "Testun wedi'i ddyfynnu - Trydydd lefel"
+#: kscoring.cpp:98
+msgid "Do not show this message again"
+msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
+#: kscoring.cpp:122
+#, kde-format
+msgid ""
+"Article\n"
+"<b>%1</b><br /><b>%2</b><br />caused the following note to appear:<br />%3"
 msgstr ""
-"Peter Bradley, Sue Massey drwy KGyfieithu, ,Launchpad Contributions:,KD at "
-"KGyfieithu"
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,"
+#: kscoring.cpp:193
+msgid "Adjust Score"
+msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:20
-#. i18n: ectx: property (text), widget (QCheckBox, mUseSpecificIdentity)
-#: rc.cpp:5
-msgid "Use a specific identity"
+#: kscoring.cpp:195
+msgid "Display Message"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:47
-#. i18n: ectx: property (text), widget (QLabel, mIdentitySelectorLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:29
-#. i18n: ectx: property (text), widget (QLabel, mIdentitySelectorLabel)
-#. i18n: file: composer/composer_view.ui:48
-#. i18n: ectx: property (text), widget (QLabel, mIdentitySelectorLabel)
-#: rc.cpp:8 rc.cpp:29 rc.cpp:255
-msgctxt "@label:listbox"
-msgid "Identity:"
+#: kscoring.cpp:197
+msgid "Colorize Header"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:67
-#. i18n: ectx: property (text), widget (KPushButton, mModifyIdentitiesButton)
-#: rc.cpp:11
-msgid "Modify..."
+#: kscoring.cpp:199
+msgid "Mark as Read"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:97
-#. i18n: ectx: property (text), widget (QLabel, mNameLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:162
-#. i18n: ectx: property (text), widget (QLabel, mNameLabel)
-#: rc.cpp:14 rc.cpp:50
-msgctxt "@label:textbox Name of the user in a message"
-msgid "Name:"
+#: kscoring.cpp:394
+msgid "<h1>List of collected notes</h1>"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:104
-#. i18n: ectx: property (text), widget (QLabel, mOrganisationLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:188
-#. i18n: ectx: property (text), widget (QLabel, mOrganisationLabel)
-#: rc.cpp:17 rc.cpp:65
-msgid "Organization:"
+#: kscoring.cpp:418
+msgid "Collected Notes"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:111
-#. i18n: ectx: property (text), widget (QLabel, mEmailLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:214
-#. i18n: ectx: property (text), widget (QLabel, mEmailLabel)
-#: rc.cpp:20 rc.cpp:80
-msgid "Email address:"
+#: kscoring.cpp:491
+msgid "Contains Substring"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:118
-#. i18n: ectx: property (text), widget (QLabel, mReplytoLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:240
-#. i18n: ectx: property (text), widget (QLabel, mReplytoLabel)
-#: rc.cpp:23 rc.cpp:95
-msgid "Reply-to address:"
+#: kscoring.cpp:493
+msgid "Matches Regular Expression"
 msgstr ""
 
-#. i18n: file: configuration/identity_widget.ui:125
-#. i18n: ectx: property (text), widget (QLabel, mMailcopiestoLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:266
-#. i18n: ectx: property (text), widget (QLabel, mMailcopiestoLabel)
-#: rc.cpp:26 rc.cpp:110
-msgid "Mail-copies-to:"
+#: kscoring.cpp:495
+msgid "Matches Regular Expression (Case Sensitive)"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:67
-#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonNewIdentity)
-#: rc.cpp:32
-msgid "Create an identity"
+#: kscoring.cpp:497
+msgid "Is Exactly the Same As"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:92
-#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonDuplicateIdentity)
-#: rc.cpp:35
-msgid "Duplicate this identity"
+#: kscoring.cpp:499
+msgid "Less Than"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:117
-#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonRenameIdentity)
-#: rc.cpp:38
-msgid "Rename this identity"
+#: kscoring.cpp:501
+msgid "Greater Than"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:142
-#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonRemoveIdentity)
-#: rc.cpp:41
-msgid "Remove this identity"
+#: kscoring.cpp:1042
+msgid "Choose Another Rule Name"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:159
-#. i18n: ectx: property (whatsThis), widget (QLabel, mNameLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:175
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mNameEdit)
-#: rc.cpp:44 rc.cpp:53
-msgid ""
-"<qt>\n"
-"  <p>Your name as it will appear to others reading your articles.</p>\n"
-"  <p>Ex: <b>John Stuart Masterson III</b>.</p>\n"
-"</qt>"
+#: kscoring.cpp:1043
+msgid "The rule name is already assigned, please choose another name:"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:185
-#. i18n: ectx: property (whatsThis), widget (QLabel, mOrganisationLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:201
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mOrganisationEdit)
-#: rc.cpp:59 rc.cpp:68
-msgid ""
-"<qt>\n"
-"  <p>The name of the organization you work for.</p>\n"
-"  <p>Ex: <b>KNode, Inc</b>.</p>\n"
-"</qt>"
+#: kscoring.cpp:1198
+#, kde-format
+msgid "rule %1"
 msgstr ""
 
-#. i18n: file: configuration/identity_edition_dialog.ui:211
-#. i18n: ectx: property (whatsThis), widget (QLabel, mEmailLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:227
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mEmailEdit)
-#: rc.cpp:74 rc.cpp:83
-msgid ""
-"<qt>\n"
-"  <p>Your email address as it will appear to others reading your "
-"articles</p>\n"
-"  <p>Ex: <b>nospam@please.com</b>.</p>\n"
-"</qt>"
-msgstr ""
+#: kngroupdialog.cpp:38
+msgid "Subscribe to Newsgroups"
+msgstr "Tanysgrifio i Grwpiau Newyddion"
 
-#. i18n: file: configuration/identity_edition_dialog.ui:237
-#. i18n: ectx: property (whatsThis), widget (QLabel, mReplytoLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:253
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mReplytoEdit)
-#: rc.cpp:89 rc.cpp:98
-msgid ""
-"<qt>\n"
-"  <p>When someone replies to your article by email, this is the address to "
-"which the message will be sent. If you fill in this field, please do so with "
-"a real email address.</p>\n"
-"  <p>Ex: <b>john@example.com</b>.</p>\n"
-"</qt>"
-msgstr ""
+#: kngroupdialog.cpp:38
+msgid "New &List"
+msgstr "Rhestr &Newydd"
 
-#. i18n: file: configuration/identity_edition_dialog.ui:263
-#. i18n: ectx: property (whatsThis), widget (QLabel, mMailcopiestoLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:279
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mMailcopiestoEdit)
-#: rc.cpp:104 rc.cpp:113
-msgid ""
-"<qt>\n"
-"  <p>When someone replies to your article on a group, you can ask to be sent "
-"a copy by email. This is the address to which this copy will be sent. If you "
-"fill in this field, please do so with a real email address.</p>\n"
-"  <p>Ex: <b>john@example.com</b>.</p>\n"
-"</qt>"
-msgstr ""
+#: kngroupdialog.cpp:38
+msgid "New &Groups..."
+msgstr "&Grŵpiau Newydd..."
 
-#. i18n: file: configuration/identity_edition_dialog.ui:286
-#. i18n: ectx: property (whatsThis), widget (QLabel, mSigningKeyRequesterLabel)
-#. i18n: file: configuration/identity_edition_dialog.ui:296
-#. i18n: ectx: property (whatsThis), widget (Kleo::SigningKeyRequester, mSigningKeyRequester)
-#: rc.cpp:119 rc.cpp:125
+#: kngroupdialog.cpp:40
+msgid "Current changes:"
+msgstr "Newidiadau cyfredol:"
+
+#: kngroupdialog.cpp:42
+msgid "Subscribe To"
+msgstr "Tanysgrifio I"
+
+#: kngroupdialog.cpp:44
+msgid "Unsubscribe From"
+msgstr "Dat-danysgrifio O"
+
+#: kngroupdialog.cpp:142
 msgid ""
-"<qt><p>The OpenPGP key you choose here will be used to sign your "
-"articles.</p></qt>"
+"You have subscribed to a moderated newsgroup.\n"
+"Your articles will not appear in the group immediately.\n"
+"They have to go through a moderation process."
 msgstr ""
-"<qt><p>Defnyddir yr allwedd OpenPGP a ddewisir yma i lofnodi eich "
-"erthyglau.</p></qt>"
+"Yr ydych wedi tanysgrifio i grŵp newyddion wedi'i gymedroli.\n"
+" Fydd eich erthyglau ddim yn ymddangos yn y grŵp yn syth.\n"
+" Rhaid iddyn nhw fynd trwy broses cymedroli."
 
-#. i18n: file: configuration/identity_edition_dialog.ui:289
-#. i18n: ectx: property (text), widget (QLabel, mSigningKeyRequesterLabel)
-#: rc.cpp:122
-msgid "Signing key:"
-msgstr ""
+#: kngroupdialog.cpp:276
+msgid "Downloading groups..."
+msgstr "Lawrlwytho grwpiau..."
 
-#. i18n: file: postnewstechnicalwidget_base.ui:35
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_generateMessageID)
-#: rc.cpp:131
-msgid "&Generate message-id"
-msgstr "Creu clustnod ne&ges"
+#: kngroupdialog.cpp:288
+msgid "New Groups"
+msgstr "Grwpiau newydd"
 
-#. i18n: file: postnewstechnicalwidget_base.ui:52
-#. i18n: ectx: property (text), widget (QLabel, mHostLabel)
-#: rc.cpp:134
-msgid "Ho&st name:"
-msgstr "En&w Gwesteiwr :"
+#: kngroupdialog.cpp:291
+msgid "Check for New Groups"
+msgstr "Edrych am Grwpiau Newydd"
 
-#. i18n: file: postnewstechnicalwidget_base.ui:62
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:137
-msgid "Enco&ding:"
-msgstr "Amgo&diad:"
+#: kngroupdialog.cpp:295
+msgid "Created since last check:"
+msgstr "Wedi'u creu ers yr ymholiad diwethaf:"
 
-#. i18n: file: postnewstechnicalwidget_base.ui:75
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseOwnCharset)
-#: rc.cpp:140
-msgid "Use o&wn default charset when replying"
-msgstr "Defnyddio eich set nodau rhagosodedig eich hun &wrth ymateb"
+#: kngroupdialog.cpp:303
+msgid "Created since this date:"
+msgstr "Wedi'u creu ers y dyddiad hwn:"
 
-#. i18n: file: postnewstechnicalwidget_base.ui:85
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:143
-msgid "Cha&rset:"
-msgstr "Set &Nodau:"
+#: kngroupdialog.cpp:321
+msgid "Checking for new groups..."
+msgstr "Ymholi am grwpiau newydd..."
 
-#. i18n: file: postnewstechnicalwidget_base.ui:98
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:146
-msgid "Header"
+#: kscoringeditor.cpp:75
+msgid "Not"
 msgstr ""
 
-#. i18n: file: postnewstechnicalwidget_base.ui:113
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_noUserAgent)
-#: rc.cpp:149
-msgid "Do not add the \"&User-Agent\" identification header"
+#: kscoringeditor.cpp:76
+msgid "Negate this condition"
 msgstr ""
 
-#. i18n: file: postnewstechnicalwidget_base.ui:120
-#. i18n: ectx: property (text), widget (QPushButton, mEditButton)
-#. i18n: file: nntpaccountlistwidget_base.ui:62
-#. i18n: ectx: property (text), widget (QPushButton, mEditButton)
-#: rc.cpp:152 rc.cpp:696
-msgid "&Edit..."
+#: kscoringeditor.cpp:81
+msgid "Select the header to match this condition against"
 msgstr ""
 
-#. i18n: file: postnewstechnicalwidget_base.ui:127
-#. i18n: ectx: property (text), widget (QPushButton, mDeleteButton)
-#: rc.cpp:155
-msgid "Dele&te"
-msgstr "Di&leu"
+#: kscoringeditor.cpp:85
+msgid "Select the type of match"
+msgstr ""
 
-#. i18n: file: postnewstechnicalwidget_base.ui:134
-#. i18n: ectx: property (text), widget (QPushButton, mAddButton)
-#. i18n: file: nntpaccountlistwidget_base.ui:55
-#. i18n: ectx: property (text), widget (QPushButton, mAddButton)
-#: rc.cpp:158 rc.cpp:693
-msgid "&Add..."
-msgstr "Ychw&anegu..."
+#: kscoringeditor.cpp:93
+msgid "The condition for the match"
+msgstr ""
 
-#. i18n: file: postnewstechnicalwidget_base.ui:141
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:162
-#, no-c-format
-msgid ""
-"<qt>Placeholders for replies: <b>%NAME</b>=sender's name, "
-"<b>%EMAIL</b>=sender's address</qt>"
+#: kscoringeditor.cpp:97
+msgid "Edit..."
 msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, articleHandlingBox)
-#: rc.cpp:165
-msgid "Article Handling"
-msgstr "Trin Erthyglau"
+#: kscoringeditor.cpp:245
+msgid "Select an action."
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:44
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoCheckGroups)
-#: rc.cpp:168
-msgid "Check for new articles a&utomatically"
-msgstr "Ymholi am erthyglau newydd yn &ymysgogol"
+#: kscoringeditor.cpp:445
+msgid "Properties"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:53
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:171
-msgid "&Maximum number of articles to fetch:"
-msgstr "Uchafr&if yr erthyglau i'w nôl:"
+#: kscoringeditor.cpp:456
+msgctxt "@label rule name"
+msgid "&Name:"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:73
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoMark)
-#: rc.cpp:174
-msgid "Mar&k article as read after:"
-msgstr "N&odi erthygl fel wedi'i darllen ar ôl:"
+#: kscoringeditor.cpp:464
+msgid "&Groups:"
+msgstr "&Grwpiau:"
 
-#. i18n: file: readnewsgeneralwidget_base.ui:83
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_autoMarkSeconds)
-#: rc.cpp:177
-msgid "sec"
+#: kscoringeditor.cpp:469
+msgid "A&dd Group"
 msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:95
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markCrossposts)
-#: rc.cpp:180
-msgid "Mark c&rossposted articles as read"
-msgstr "Nodi erthyglau wedi'u cro&esbostio fel wedi'u darllen"
-
-#. i18n: file: readnewsgeneralwidget_base.ui:105
-#. i18n: ectx: property (title), widget (QGroupBox, articleListBox)
-#. i18n: file: knode.kcfg:374
-#. i18n: ectx: label, entry (articleListFont), group (VISUAL_APPEARANCE)
-#: rc.cpp:183 rc.cpp:682
-msgid "Article List"
-msgstr "Rhestr Erthyglau"
+#: kscoringeditor.cpp:480
+msgid "&Expire rule automatically"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:117
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_defaultToExpandedThreads)
-#: rc.cpp:186
-msgid "Default to e&xpanded threads"
-msgstr "Trywyddau wedi'u ehangu fel rha&gosod"
+#: kscoringeditor.cpp:488
+msgid "&Rule is valid for:"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:124
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_smartScrolling)
-#: rc.cpp:189
-msgid "Smart scrolli&ng"
-msgstr "Sgrolio si&onc"
+#: kscoringeditor.cpp:499
+msgid "Conditions"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:131
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_totalExpandThreads)
-#: rc.cpp:192
-msgid "Show &whole thread on expanding"
-msgstr "Dangos y &trywydd i gyd wedi ehangu"
+#: kscoringeditor.cpp:509
+msgid "Match a&ll conditions"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:138
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showScore)
-#: rc.cpp:195
-msgid "Show article &score"
-msgstr "Dangos &sgôr yr erthygl"
+#: kscoringeditor.cpp:512
+msgid "Matc&h any condition"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:145
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showLines)
-#: rc.cpp:198
-msgid "Show &line count"
-msgstr "Dangos cyfrif y &llinellau"
+#: kscoringeditor.cpp:522
+msgid "Actions"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:152
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showUnread)
-#: rc.cpp:201
-msgid "Show unread count in &thread"
-msgstr "Dangos cyfrif y rhai heb eu darllen yn y &trywydd"
+#: kscoringeditor.cpp:682
+msgid "Move rule up"
+msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:162
-#. i18n: ectx: property (title), widget (QGroupBox, dateFormatBox)
-#: rc.cpp:204
-msgid "Date Display"
+#: kscoringeditor.cpp:687
+msgid "Move rule down"
 msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:168
-#. i18n: ectx: property (text), widget (QRadioButton, mStandardDateFormat)
-#. i18n: file: knode.kcfg:71
-#. i18n: ectx: label, entry (dateFormat), group (READNEWS)
-#: rc.cpp:207 rc.cpp:458
-msgid "Standard format"
+#: kscoringeditor.cpp:699
+msgid "New rule"
 msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:175
-#. i18n: ectx: property (text), widget (QRadioButton, mFancyDateFormat)
-#. i18n: file: knode.kcfg:77
-#. i18n: ectx: label, entry (dateFormat), group (READNEWS)
-#: rc.cpp:210 rc.cpp:464
-msgid "Fancy format"
+#: kscoringeditor.cpp:706
+msgid "Edit rule"
 msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:189
-#. i18n: ectx: property (text), widget (QRadioButton, mLocalizedDateFormat)
-#. i18n: file: knode.kcfg:74
-#. i18n: ectx: label, entry (dateFormat), group (READNEWS)
-#: rc.cpp:213 rc.cpp:461
-msgid "Localized format"
+#: kscoringeditor.cpp:712
+msgid "Remove rule"
 msgstr ""
 
-#. i18n: file: readnewsgeneralwidget_base.ui:196
-#. i18n: ectx: property (text), widget (QRadioButton, mCustomDateFormat)
-#: rc.cpp:216
-msgid "Custom format (Shift+F1 for help):"
+#: kscoringeditor.cpp:717
+msgid "Copy rule"
+msgstr ""
+
+#: kscoringeditor.cpp:728 kscoringeditor.cpp:733 kscoringeditor.cpp:774
+msgid "<placeholder>all groups</placeholder>"
+msgstr ""
+
+#: kscoringeditor.cpp:734
+msgid "Sho&w only rules for group:"
+msgstr ""
+
+#: kscoringeditor.cpp:952
+msgid "Rule Editor"
+msgstr ""
+
+#: kscoringeditor.cpp:1064
+msgid "Edit Rule"
+msgstr ""
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
 msgstr ""
+"Peter Bradley, Sue Massey drwy KGyfieithu, ,Launchpad Contributions:,KD at "
+"KGyfieithu"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: readnewsviewerwidget_base.ui:23
 #. i18n: ectx: property (title), widget (QGroupBox, appearanceBox)
-#: rc.cpp:219
+#: rc.cpp:5
 msgid "Appearance"
 msgstr ""
 
 #. i18n: file: readnewsviewerwidget_base.ui:38
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:222
+#: rc.cpp:8
 msgid "Recognized q&uote characters:"
 msgstr "Dy&fynnodau cydnabyddedig:"
 
 #. i18n: file: readnewsviewerwidget_base.ui:48
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_removeTrailingNewlines)
-#: rc.cpp:225
+#: rc.cpp:11
 msgid "Re&move trailing empty lines"
 msgstr "Cael g&wared â llinellau gwag dilynol"
 
@@ -3121,43 +2761,43 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_showRefBar)
 #. i18n: file: knode.kcfg:156
 #. i18n: ectx: label, entry (showRefBar), group (READNEWS)
-#: rc.cpp:228 rc.cpp:535
+#: rc.cpp:14 rc.cpp:169
 msgid "Show reference bar"
 msgstr ""
 
 #. i18n: file: readnewsviewerwidget_base.ui:62
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_showSignature)
-#: rc.cpp:231
+#: rc.cpp:17
 msgid "Show sig&nature"
 msgstr "Da&ngos llofnod"
 
 #. i18n: file: readnewsviewerwidget_base.ui:69
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_rewrapBody)
-#: rc.cpp:234
+#: rc.cpp:20
 msgid "Re&wrap text when necessary"
 msgstr "Ail-la&pio testun pan fo angen"
 
 #. i18n: file: readnewsviewerwidget_base.ui:79
 #. i18n: ectx: property (title), widget (QGroupBox, attachmentBox)
-#: rc.cpp:237
+#: rc.cpp:23
 msgid "Attachments"
 msgstr "Atodiadau"
 
 #. i18n: file: readnewsviewerwidget_base.ui:91
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_openAttachmentsOnClick)
-#: rc.cpp:240
+#: rc.cpp:26
 msgid "Open a&ttachments on click"
 msgstr "Agor &atodiadau wrth glic"
 
 #. i18n: file: readnewsviewerwidget_base.ui:98
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_showAlternativeContents)
-#: rc.cpp:243
+#: rc.cpp:29
 msgid "Show alternati&ve contents as attachments"
 msgstr "Dang&os cynnwysion eraill fel atodiadau:"
 
 #. i18n: file: readnewsviewerwidget_base.ui:108
 #. i18n: ectx: property (title), widget (QGroupBox, securityBox)
-#: rc.cpp:246
+#: rc.cpp:32
 msgid "Security"
 msgstr "Diogelwch"
 
@@ -3165,7 +2805,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_alwaysShowHTML)
 #. i18n: file: knode.kcfg:160
 #. i18n: ectx: label, entry (alwaysShowHTML), group (READNEWS)
-#: rc.cpp:249 rc.cpp:538
+#: rc.cpp:35 rc.cpp:172
 msgid "Prefer HTML to plain text"
 msgstr "Hoffter yw HTML yn lle testun plaen"
 
@@ -3173,420 +2813,161 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowExternalReferences)
 #. i18n: file: knode.kcfg:164
 #. i18n: ectx: label, entry (allowExternalReferences), group (READNEWS)
-#: rc.cpp:252 rc.cpp:541
+#: rc.cpp:38 rc.cpp:175
 msgid "Allow external references in HTML"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:58
-#. i18n: ectx: property (text), widget (QLabel, mToLabel)
-#: rc.cpp:258
-msgctxt "@label:textbox email recipient of a message"
-msgid "To:"
-msgstr ""
+#. i18n: file: nntpaccountlistwidget_base.ui:55
+#. i18n: ectx: property (text), widget (QPushButton, mAddButton)
+#. i18n: file: postnewstechnicalwidget_base.ui:134
+#. i18n: ectx: property (text), widget (QPushButton, mAddButton)
+#: rc.cpp:41 rc.cpp:778
+msgid "&Add..."
+msgstr "Ychw&anegu..."
 
-#. i18n: file: composer/composer_view.ui:74
-#. i18n: ectx: property (text), widget (KPushButton, mToButton)
-#: rc.cpp:261
-msgctxt "@action:button open a dialog to choose email recipients"
-msgid "Browse..."
+#. i18n: file: nntpaccountlistwidget_base.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, mEditButton)
+#. i18n: file: postnewstechnicalwidget_base.ui:120
+#. i18n: ectx: property (text), widget (QPushButton, mEditButton)
+#: rc.cpp:44 rc.cpp:772
+msgid "&Edit..."
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:81
-#. i18n: ectx: property (text), widget (QLabel, mGroupsLabel)
-#: rc.cpp:264
-msgctxt "@label:textbox"
-msgid "Groups:"
+#. i18n: file: nntpaccountlistwidget_base.ui:76
+#. i18n: ectx: property (text), widget (QPushButton, mSubscribeButton)
+#: rc.cpp:50
+msgid "&Subscribe..."
+msgstr "Tany&sgrifio..."
+
+#. i18n: file: knode.kcfg:13
+#. i18n: ectx: label, entry (identity), group (IDENTITY)
+#: rc.cpp:53
+msgid "Identity"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:91
-#. i18n: ectx: property (text), widget (QLabel, mFollowuptoLabel)
-#: rc.cpp:267
-msgctxt "@label"
-msgid "Followup-To:"
+#. i18n: file: knode.kcfg:21
+#. i18n: ectx: label, entry (autoCheckGroups), group (READNEWS)
+#: rc.cpp:56
+msgid "Check for new articles automatically"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:101
-#. i18n: ectx: property (text), widget (QLabel, mSubjetLabel)
-#: rc.cpp:270
-msgctxt "@label:textbox subject of a message"
-msgid "Subject:"
+#. i18n: file: knode.kcfg:25
+#. i18n: ectx: label, entry (maxToFetch), group (READNEWS)
+#: rc.cpp:59
+msgid "Maximum number of articles to fetch"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:111
-#. i18n: ectx: property (text), widget (KPushButton, mGroupsButton)
-#: rc.cpp:273
-msgctxt "@action:button open a dialog to choose newsgroups"
-msgid "Browse..."
+#. i18n: file: knode.kcfg:29
+#. i18n: ectx: label, entry (autoMark), group (READNEWS)
+#: rc.cpp:62
+msgid "Automatically mark articles as read"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:121
-#. i18n: ectx: property (text), widget (QLabel, mFromLabel)
-#: rc.cpp:276
-msgctxt "@label:textbox"
-msgid "From:"
+#. i18n: file: knode.kcfg:33
+#. i18n: ectx: label, entry (autoMarkSeconds), group (READNEWS)
+#: rc.cpp:65
+msgid "Mark article as read after"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:143
-#. i18n: ectx: property (whatsThis), widget (KNode::Composer::FollowuptoCombobox, mFollowuptoEdit)
-#: rc.cpp:279
-msgid ""
-"<qt>\n"
-"<p>The group <strong>where the replies to your message should be "
-"sent</strong>. Use this field when you are sending it to more than one "
-"group.<br />\n"
-"This group is usually the place where you expect the discussion you\n"
-"  are starting to fit the best.</p>\n"
-"\n"
-"<p>Remember to subscribe to this group if you are not yet.</p>\n"
-"\n"
-"<p><note>It is also good practice to indicate the \"followup-to\"\n"
-"  in your message to inform readers.</note></p>\n"
-"</qt>"
+#. i18n: file: knode.kcfg:37
+#. i18n: ectx: label, entry (markCrossposts), group (READNEWS)
+#: rc.cpp:68
+msgid "Mark crossposted articles as read"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:202
-#. i18n: ectx: property (text), widget (QLabel, mExternalKillSwitchLabel)
-#: rc.cpp:291
-msgid ""
-"You are currently editing the article body\n"
-"in an external editor. To continue, you have\n"
-"to close the external editor."
+#. i18n: file: knode.kcfg:41
+#. i18n: ectx: label, entry (smartScrolling), group (READNEWS)
+#: rc.cpp:71
+msgid "Smart scrolling"
 msgstr ""
-"Yr ydych yn golygu corff yr erthygl ar hyn o bryd\n"
-" mewn golygydd allanol.  I barhau, rhaid ichi\n"
-" gau'r golygydd allanol."
 
-#. i18n: file: composer/composer_view.ui:209
-#. i18n: ectx: property (text), widget (KPushButton, mExternalKillSwitch)
-#: rc.cpp:296
-msgctxt "@action:button"
-msgid "Kill external editor"
+#. i18n: file: knode.kcfg:45
+#. i18n: ectx: label, entry (totalExpandThreads), group (READNEWS)
+#: rc.cpp:74
+msgid "Show whole thread on expanding"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:262
-#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
-#: rc.cpp:299
-msgctxt "@title:column list of attachments of a message"
-msgid "File"
+#. i18n: file: knode.kcfg:49
+#. i18n: ectx: label, entry (defaultToExpandedThreads), group (READNEWS)
+#: rc.cpp:77
+msgid "Default to expanded threads"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:267
-#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
-#: rc.cpp:302
-msgctxt "@title:column list of attachments of a message"
-msgid "Type"
+#. i18n: file: knode.kcfg:53
+#. i18n: ectx: label, entry (showLines), group (READNEWS)
+#: rc.cpp:80
+msgid "Show line count column"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:272
-#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
-#: rc.cpp:305
-msgctxt "@title:column list of attachments of a message"
-msgid "Size"
+#. i18n: file: knode.kcfg:57
+#. i18n: ectx: label, entry (showScore), group (READNEWS)
+#: rc.cpp:83
+msgid "Show score column"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:277
-#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
-#: rc.cpp:308
-msgctxt "@title:column list of attachments of a message"
-msgid "Description"
+#. i18n: file: knode.kcfg:61
+#. i18n: ectx: label, entry (showUnread), group (READNEWS)
+#: rc.cpp:86
+msgid "Show unread count in thread"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:282
-#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
-#: rc.cpp:311
-msgctxt "@title:column list of attachments of a message"
-msgid "Encoding"
+#. i18n: file: knode.kcfg:65
+#. i18n: ectx: label, entry (showThreads), group (READNEWS)
+#: rc.cpp:89
+msgid "Show Threads"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:290
-#. i18n: ectx: property (text), widget (KPushButton, mAttachmentAddButton)
-#: rc.cpp:314
-msgctxt "@action:button Open a dialog to add a message attachment"
-msgid "Add..."
+#. i18n: file: knode.kcfg:71
+#. i18n: ectx: label, entry (dateFormat), group (READNEWS)
+#. i18n: file: readnewsgeneralwidget_base.ui:168
+#. i18n: ectx: property (text), widget (QRadioButton, mStandardDateFormat)
+#: rc.cpp:92 rc.cpp:611
+msgid "Standard format"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:297
-#. i18n: ectx: property (text), widget (KPushButton, mAttachmentPropertiesButton)
-#: rc.cpp:317
-msgctxt ""
-"@action:button open a dialog displaying properties of a message attachment"
-msgid "Properties"
+#. i18n: file: knode.kcfg:74
+#. i18n: ectx: label, entry (dateFormat), group (READNEWS)
+#. i18n: file: readnewsgeneralwidget_base.ui:189
+#. i18n: ectx: property (text), widget (QRadioButton, mLocalizedDateFormat)
+#: rc.cpp:95 rc.cpp:617
+msgid "Localized format"
 msgstr ""
 
-#. i18n: file: composer/composer_view.ui:317
-#. i18n: ectx: property (text), widget (KPushButton, mAttachmentRemoveButton)
-#: rc.cpp:320
-msgctxt "@action:button remove an attachment of a message"
-msgid "Remove"
-msgstr ""
-
-#. i18n: file: knreaderui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: knodeui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kncomposerui.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:323 rc.cpp:368 rc.cpp:401
-msgid "&File"
-msgstr ""
-
-#. i18n: file: knreaderui.rc:11
-#. i18n: ectx: Menu (edit)
-#. i18n: file: knodeui.rc:15
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kncomposerui.rc:13
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:326 rc.cpp:371 rc.cpp:404
-msgid "&Edit"
-msgstr ""
-
-#. i18n: file: knreaderui.rc:16
-#. i18n: ectx: Menu (view)
-#. i18n: file: knodeui.rc:24
-#. i18n: ectx: Menu (view)
-#: rc.cpp:329 rc.cpp:374
-msgid "&View"
-msgstr ""
-
-#. i18n: file: knreaderui.rc:28
-#. i18n: ectx: Menu (article)
-#. i18n: file: knodeui.rc:91
-#. i18n: ectx: Menu (article)
-#: rc.cpp:332 rc.cpp:389
-msgid "&Article"
-msgstr "&Erthygl"
-
-#. i18n: file: knreaderui.rc:38
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: knodeui.rc:131
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kncomposerui.rc:57
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:335 rc.cpp:398 rc.cpp:416
-msgid "Main Toolbar"
-msgstr ""
-
-#. i18n: file: readnewsnavigationwidget_base.ui:23
-#. i18n: ectx: property (title), widget (QGroupBox, markAllReadBox)
-#: rc.cpp:338
-msgid "\"Mark All as Read\" Triggers Following Actions"
-msgstr ""
-"Achosith \"Dynodi Popeth fel wedi'i Ddarllen\" y gweithredoedd canlynol"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:35
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markAllReadGoNext)
-#: rc.cpp:341
-msgid "&Switch to the next group"
-msgstr "T&roi i'r grŵp nesaf"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:45
-#. i18n: ectx: property (title), widget (QGroupBox, markThreadReadBox)
-#: rc.cpp:344
-msgid "\"Mark Thread as Read\" Triggers Following Actions"
-msgstr ""
-"Achosith \"Dynodi'r Trwywydd fel wedi'i Ddarllen\" y gweithredoedd canlynol"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:57
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markThreadReadCloseThread)
-#: rc.cpp:347
-msgid "Clos&e the current thread"
-msgstr "Cau'r trywydd cyfr&edol"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:64
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markThreadReadGoNext)
-#: rc.cpp:350
-msgid "Go &to the next unread thread"
-msgstr "Mynd i'r &trywydd heb ei ddarllen nesaf"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:74
-#. i18n: ectx: property (title), widget (QGroupBox, ignoreThreadBox)
-#: rc.cpp:353
-msgid "\"Ignore Thread\" Triggers Following Actions"
-msgstr "Achosith \"Anwybyddu'r Trywydd\" y gweithredoedd canlynol"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ignoreThreadCloseThread)
-#: rc.cpp:356
-msgid "Close the cu&rrent thread"
-msgstr "Cau'r trywydd cyf&redol"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:93
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ignoreThreadGoNext)
-#: rc.cpp:359
-msgid "Go to the next &unread thread"
-msgstr "Mynd i'r trywydd nesaf heb ei dda&rllen"
-
-#. i18n: file: readnewsnavigationwidget_base.ui:103
-#. i18n: ectx: property (title), widget (QGroupBox, leaveGroupBox)
-#: rc.cpp:362
-msgid "Leaving Group Triggers Following Actions"
-msgstr ""
-
-#. i18n: file: readnewsnavigationwidget_base.ui:115
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_leaveGroupMarkAsRead)
-#: rc.cpp:365
-msgid "Mark all articles as read"
-msgstr ""
-
-#. i18n: file: knodeui.rc:45
-#. i18n: ectx: Menu (go)
-#: rc.cpp:377
-msgid "&Go"
-msgstr "&Mynd"
-
-#. i18n: file: knodeui.rc:55
-#. i18n: ectx: Menu (account)
-#: rc.cpp:380
-msgid "A&ccount"
-msgstr "&Cyfrif"
-
-#. i18n: file: knodeui.rc:64
-#. i18n: ectx: Menu (group)
-#: rc.cpp:383
-msgid "G&roup"
-msgstr "G&rŵp"
-
-#. i18n: file: knodeui.rc:77
-#. i18n: ectx: Menu (folder)
-#: rc.cpp:386
-msgid "Fol&der"
-msgstr "Ply&gell"
-
-#. i18n: file: knodeui.rc:111
-#. i18n: ectx: Menu (scoring)
-#: rc.cpp:392
-msgid "Sc&oring"
-msgstr "Sg&orio"
-
-#. i18n: file: knodeui.rc:121
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:395
-msgid "&Settings"
-msgstr ""
-
-#. i18n: file: kncomposerui.rc:27
-#. i18n: ectx: Menu (attach)
-#: rc.cpp:407
-msgid "&Attach"
-msgstr "&Atodi"
-
-#. i18n: file: kncomposerui.rc:33
-#. i18n: ectx: Menu (options)
-#: rc.cpp:410
-msgid "Optio&ns"
-msgstr "De&wisiadau"
-
-#. i18n: file: kncomposerui.rc:42
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:413
-msgid "&Tools"
-msgstr ""
-
-#. i18n: file: knode.kcfg:13
-#. i18n: ectx: label, entry (identity), group (IDENTITY)
-#: rc.cpp:419
-msgid "Identity"
-msgstr ""
-
-#. i18n: file: knode.kcfg:21
-#. i18n: ectx: label, entry (autoCheckGroups), group (READNEWS)
-#: rc.cpp:422
-msgid "Check for new articles automatically"
-msgstr ""
-
-#. i18n: file: knode.kcfg:25
-#. i18n: ectx: label, entry (maxToFetch), group (READNEWS)
-#: rc.cpp:425
-msgid "Maximum number of articles to fetch"
-msgstr ""
-
-#. i18n: file: knode.kcfg:29
-#. i18n: ectx: label, entry (autoMark), group (READNEWS)
-#: rc.cpp:428
-msgid "Automatically mark articles as read"
-msgstr ""
-
-#. i18n: file: knode.kcfg:33
-#. i18n: ectx: label, entry (autoMarkSeconds), group (READNEWS)
-#: rc.cpp:431
-msgid "Mark article as read after"
-msgstr ""
-
-#. i18n: file: knode.kcfg:37
-#. i18n: ectx: label, entry (markCrossposts), group (READNEWS)
-#: rc.cpp:434
-msgid "Mark crossposted articles as read"
-msgstr ""
-
-#. i18n: file: knode.kcfg:41
-#. i18n: ectx: label, entry (smartScrolling), group (READNEWS)
-#: rc.cpp:437
-msgid "Smart scrolling"
-msgstr ""
-
-#. i18n: file: knode.kcfg:45
-#. i18n: ectx: label, entry (totalExpandThreads), group (READNEWS)
-#: rc.cpp:440
-msgid "Show whole thread on expanding"
-msgstr ""
-
-#. i18n: file: knode.kcfg:49
-#. i18n: ectx: label, entry (defaultToExpandedThreads), group (READNEWS)
-#: rc.cpp:443
-msgid "Default to expanded threads"
-msgstr ""
-
-#. i18n: file: knode.kcfg:53
-#. i18n: ectx: label, entry (showLines), group (READNEWS)
-#: rc.cpp:446
-msgid "Show line count column"
-msgstr ""
-
-#. i18n: file: knode.kcfg:57
-#. i18n: ectx: label, entry (showScore), group (READNEWS)
-#: rc.cpp:449
-msgid "Show score column"
-msgstr ""
-
-#. i18n: file: knode.kcfg:61
-#. i18n: ectx: label, entry (showUnread), group (READNEWS)
-#: rc.cpp:452
-msgid "Show unread count in thread"
-msgstr ""
-
-#. i18n: file: knode.kcfg:65
-#. i18n: ectx: label, entry (showThreads), group (READNEWS)
-#: rc.cpp:455
-msgid "Show Threads"
+#. i18n: file: knode.kcfg:77
+#. i18n: ectx: label, entry (dateFormat), group (READNEWS)
+#. i18n: file: readnewsgeneralwidget_base.ui:175
+#. i18n: ectx: property (text), widget (QRadioButton, mFancyDateFormat)
+#: rc.cpp:98 rc.cpp:614
+msgid "Fancy format"
 msgstr ""
 
 #. i18n: file: knode.kcfg:80
 #. i18n: ectx: label, entry (dateFormat), group (READNEWS)
-#: rc.cpp:467
+#: rc.cpp:101
 msgid "ISO format"
 msgstr ""
 
 #. i18n: file: knode.kcfg:83
 #. i18n: ectx: label, entry (dateFormat), group (READNEWS)
-#: rc.cpp:470
+#: rc.cpp:104
 msgid "Custom format"
 msgstr ""
 
 #. i18n: file: knode.kcfg:86
 #. i18n: ectx: label, entry (dateFormat), group (READNEWS)
-#: rc.cpp:473
+#: rc.cpp:107
 msgid "Date format"
 msgstr ""
 
 #. i18n: file: knode.kcfg:90
 #. i18n: ectx: label, entry (customDateFormat), group (READNEWS)
-#: rc.cpp:476
+#: rc.cpp:110
 msgid "Custom date format"
 msgstr ""
 
 #. i18n: file: knode.kcfg:120
 #. i18n: ectx: whatsthis, entry (customDateFormat), group (READNEWS)
-#: rc.cpp:479
+#: rc.cpp:113
 msgid ""
 "<!-- taken from KMail -->\n"
 "<qt><p><strong>These expressions may be used for the date:</strong></p>\n"
@@ -3626,468 +3007,1087 @@
 
 #. i18n: file: knode.kcfg:124
 #. i18n: ectx: label, entry (rewrapBody), group (READNEWS)
-#: rc.cpp:511
+#: rc.cpp:145
 msgid "Rewrap text when necessary"
 msgstr ""
 
 #. i18n: file: knode.kcfg:128
 #. i18n: ectx: label, entry (removeTrailingNewlines), group (READNEWS)
-#: rc.cpp:514
+#: rc.cpp:148
 msgid "Remove trailing empty lines"
 msgstr ""
 
 #. i18n: file: knode.kcfg:132
 #. i18n: ectx: label, entry (showSignature), group (READNEWS)
-#: rc.cpp:517
+#: rc.cpp:151
 msgid "Show signature"
 msgstr ""
 
 #. i18n: file: knode.kcfg:136
 #. i18n: ectx: label, entry (interpretFormatTags), group (READNEWS)
-#: rc.cpp:520
+#: rc.cpp:154
 msgid "Interpret emoticons and other formatting"
 msgstr ""
 
 #. i18n: file: knode.kcfg:140
 #. i18n: ectx: label, entry (quoteCharacters), group (READNEWS)
-#: rc.cpp:523
+#: rc.cpp:157
 msgid "Recognized quote characters"
 msgstr ""
 
 #. i18n: file: knode.kcfg:144
 #. i18n: ectx: label, entry (openAttachmentsOnClick), group (READNEWS)
-#: rc.cpp:526
+#: rc.cpp:160
 msgid "Open attachments on click"
 msgstr ""
 
 #. i18n: file: knode.kcfg:148
 #. i18n: ectx: label, entry (showAlternativeContents), group (READNEWS)
-#: rc.cpp:529
+#: rc.cpp:163
 msgid "Show alternative contents as attachments"
 msgstr ""
 
 #. i18n: file: knode.kcfg:152
 #. i18n: ectx: label, entry (useFixedFont), group (READNEWS)
-#: rc.cpp:532
+#: rc.cpp:166
 msgid "Use fixed font"
 msgstr ""
 
 #. i18n: file: knode.kcfg:171
 #. i18n: ectx: label, entry (markAllReadGoNext), group (READNEWS_NAVIGATION)
-#: rc.cpp:544
+#: rc.cpp:178
 msgid "Mark group as read goes to next group"
 msgstr ""
 
 #. i18n: file: knode.kcfg:176
 #. i18n: ectx: label, entry (markThreadReadGoNext), group (READNEWS_NAVIGATION)
-#: rc.cpp:547
+#: rc.cpp:181
 msgid "Mark thread as read goes to next unread thread"
 msgstr ""
 
 #. i18n: file: knode.kcfg:180
 #. i18n: ectx: label, entry (markThreadReadCloseThread), group (READNEWS_NAVIGATION)
-#: rc.cpp:550
+#: rc.cpp:184
 msgid "Mark thread as read closes the current thread"
 msgstr ""
 
 #. i18n: file: knode.kcfg:184
 #. i18n: ectx: label, entry (ignoreThreadGoNext), group (READNEWS_NAVIGATION)
-#: rc.cpp:553
+#: rc.cpp:187
 msgid "Ignore thread goes to the next unread thread"
 msgstr ""
 
 #. i18n: file: knode.kcfg:188
 #. i18n: ectx: label, entry (ignoreThreadCloseThread), group (READNEWS_NAVIGATION)
-#: rc.cpp:556
+#: rc.cpp:190
 msgid "Ignore thread closes the current thread"
 msgstr ""
 
 #. i18n: file: knode.kcfg:192
 #. i18n: ectx: label, entry (leaveGroupMarkAsRead), group (READNEWS_NAVIGATION)
-#: rc.cpp:559
+#: rc.cpp:193
 msgid "Leaving a group marks all articles as read"
 msgstr ""
 
 #. i18n: file: knode.kcfg:199
 #. i18n: ectx: label, entry (ignoredThreshold), group (SCORING)
-#: rc.cpp:562
+#: rc.cpp:196
 msgid "Default score for ignored threads"
 msgstr ""
 
 #. i18n: file: knode.kcfg:203
 #. i18n: ectx: label, entry (watchedThreshold), group (SCORING)
-#: rc.cpp:565
+#: rc.cpp:199
 msgid "Default score for watched threads"
 msgstr ""
 
 #. i18n: file: knode.kcfg:210
 #. i18n: ectx: label, entry (collCacheSize), group (CACHE)
-#: rc.cpp:568
+#: rc.cpp:202
 msgid "Cache size for headers"
 msgstr ""
 
 #. i18n: file: knode.kcfg:214
 #. i18n: ectx: label, entry (artCacheSize), group (CACHE)
-#: rc.cpp:571
+#: rc.cpp:205
 msgid "Cache size for articles"
 msgstr ""
 
 #. i18n: file: knode.kcfg:222
 #. i18n: ectx: label, entry (UseOwnCharset), group (POSTNEWS)
-#: rc.cpp:574
+#: rc.cpp:208
 msgid "Use own default charset when replying"
 msgstr ""
 
 #. i18n: file: knode.kcfg:226
 #. i18n: ectx: label, entry (hostname), group (POSTNEWS)
-#: rc.cpp:577
+#: rc.cpp:211
 msgid "Host name used to generate the message ID."
 msgstr ""
 
 #. i18n: file: knode.kcfg:229
 #. i18n: ectx: label, entry (generateMessageID), group (POSTNEWS)
-#: rc.cpp:580
+#: rc.cpp:214
 msgid "Generate message-id"
 msgstr ""
 
 #. i18n: file: knode.kcfg:233
 #. i18n: ectx: label, entry (noUserAgent), group (POSTNEWS)
-#: rc.cpp:583
+#: rc.cpp:217
 msgid "Do not add the \"User-Agent\" identification header"
 msgstr ""
 
 #. i18n: file: knode.kcfg:237
 #. i18n: ectx: label, entry (useExternalMailer), group (POSTNEWS)
-#: rc.cpp:586
+#: rc.cpp:220
 msgid "Use external mailer"
 msgstr ""
 
 #. i18n: file: knode.kcfg:241
 #. i18n: ectx: label, entry (allow8BitBody), group (POSTNEWS)
-#: rc.cpp:589
+#: rc.cpp:223
 msgid "Allow 8-bit encoding"
 msgstr ""
 
 #. i18n: file: knode.kcfg:245
 #. i18n: ectx: label, entry (Charset), group (POSTNEWS)
-#: rc.cpp:592
+#: rc.cpp:226
 msgid "Charset"
 msgstr "Set Nodau"
 
 #. i18n: file: knode.kcfg:249
 #. i18n: ectx: label, entry (wordWrap), group (POSTNEWS)
-#: rc.cpp:595
+#: rc.cpp:229
 msgid "Word wrap at column"
 msgstr ""
 
 #. i18n: file: knode.kcfg:253
 #. i18n: ectx: label, entry (autoSpellChecking), group (POSTNEWS)
-#: rc.cpp:598
+#: rc.cpp:232
 msgid "Automatic Spellchecking"
 msgstr ""
 
 #. i18n: file: knode.kcfg:257
 #. i18n: ectx: label, entry (maxLineLength), group (POSTNEWS)
-#: rc.cpp:601
+#: rc.cpp:235
 msgid "Maximum line length if word wrap is enabled"
 msgstr ""
 
 #. i18n: file: knode.kcfg:261
 #. i18n: ectx: label, entry (appendOwnSignature), group (POSTNEWS)
-#: rc.cpp:604
+#: rc.cpp:238
 msgid "Append own signature automatically"
 msgstr ""
 
 #. i18n: file: knode.kcfg:265
 #. i18n: ectx: label, entry (rewrap), group (POSTNEWS)
-#: rc.cpp:607
+#: rc.cpp:241
 msgid "Rewrap quoted text automatically"
 msgstr ""
 
 #. i18n: file: knode.kcfg:269
 #. i18n: ectx: label, entry (includeSignature), group (POSTNEWS)
-#: rc.cpp:610
+#: rc.cpp:244
 msgid "Include the original author's signature in replies"
 msgstr ""
 
 #. i18n: file: knode.kcfg:273
 #. i18n: ectx: label, entry (cursorOnTop), group (POSTNEWS)
-#: rc.cpp:613
+#: rc.cpp:247
 msgid "Put the cursor below the introduction phrase"
 msgstr ""
 
 #. i18n: file: knode.kcfg:277
 #. i18n: ectx: label, entry (useExternalEditor), group (POSTNEWS)
-#: rc.cpp:616
+#: rc.cpp:250
 msgid "Start external editor automatically"
 msgstr ""
 
 #. i18n: file: knode.kcfg:281
 #. i18n: ectx: label, entry (Intro), group (POSTNEWS)
-#: rc.cpp:619
+#: rc.cpp:253
 msgid "Introduction phrase"
 msgstr ""
 
 #. i18n: file: knode.kcfg:285
 #. i18n: ectx: label, entry (externalEditor), group (POSTNEWS)
-#: rc.cpp:622
+#: rc.cpp:256
 msgid "Path to external editor"
 msgstr ""
 
 #. i18n: file: knode.kcfg:293
 #. i18n: ectx: label, entry (useCustomColors), group (VISUAL_APPEARANCE)
-#: rc.cpp:625
+#: rc.cpp:259
 msgid "Use custom colors"
 msgstr ""
 
 #. i18n: file: knode.kcfg:297
 #. i18n: ectx: label, entry (backgroundColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:628
+#: rc.cpp:262
 msgid "Background"
 msgstr "Cefndir"
 
 #. i18n: file: knode.kcfg:301
 #. i18n: ectx: label, entry (alternateBackgroundColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:631
+#: rc.cpp:265
 msgid "Alternate Background"
 msgstr "Cefndir Arall"
 
 #. i18n: file: knode.kcfg:305
 #. i18n: ectx: label, entry (textColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:634
+#: rc.cpp:268
 msgid "Normal Text"
 msgstr "Testun Arferol"
 
 #. i18n: file: knode.kcfg:315
 #. i18n: ectx: label, entry (linkColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:637
+#: rc.cpp:271
 msgid "Link"
 msgstr "Dolen"
 
 #. i18n: file: knode.kcfg:319
 #. i18n: ectx: label, entry (readThreadColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:640
+#: rc.cpp:274
 msgid "Read Thread"
 msgstr "Trywydd wedi'i ddarllen"
 
 #. i18n: file: knode.kcfg:323
 #. i18n: ectx: label, entry (unreadThreadColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:643
+#: rc.cpp:277
 msgid "Unread Thread"
 msgstr "Trywydd heb ei ddarllen"
 
 #. i18n: file: knode.kcfg:327
 #. i18n: ectx: label, entry (readArticleColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:646
+#: rc.cpp:280
 msgid "Read Article"
 msgstr "Erthygl wedi'i darllen"
 
 #. i18n: file: knode.kcfg:331
 #. i18n: ectx: label, entry (unreadArticleColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:649
+#: rc.cpp:283
 msgid "Unread Article"
 msgstr "Erthygl heb ei darllen"
 
 #. i18n: file: knode.kcfg:335
 #. i18n: ectx: label, entry (signOkKeyOkColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:652
+#: rc.cpp:286
 msgid "Valid Signature with Trusted Key"
 msgstr ""
 
 #. i18n: file: knode.kcfg:339
 #. i18n: ectx: label, entry (signOkKeyBadColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:655
+#: rc.cpp:289
 msgid "Valid Signature with Untrusted Key"
 msgstr ""
 
 #. i18n: file: knode.kcfg:343
 #. i18n: ectx: label, entry (signWarnColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:658
+#: rc.cpp:292
 msgid "Unchecked Signature"
 msgstr ""
 
 #. i18n: file: knode.kcfg:347
 #. i18n: ectx: label, entry (signErrColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:661
+#: rc.cpp:295
 msgid "Bad Signature"
 msgstr ""
 
 #. i18n: file: knode.kcfg:351
 #. i18n: ectx: label, entry (htmlWarningColor), group (VISUAL_APPEARANCE)
-#: rc.cpp:664
+#: rc.cpp:298
 msgid "HTML Message Warning"
 msgstr ""
 
 #. i18n: file: knode.kcfg:356
 #. i18n: ectx: label, entry (useCustomFonts), group (VISUAL_APPEARANCE)
-#: rc.cpp:667
+#: rc.cpp:301
 msgid "Use custom fonts"
 msgstr ""
 
 #. i18n: file: knode.kcfg:360
 #. i18n: ectx: label, entry (articleFont), group (VISUAL_APPEARANCE)
-#: rc.cpp:670
+#: rc.cpp:304
 msgid "Article Body"
 msgstr "Corff yr Erthygl"
 
 #. i18n: file: knode.kcfg:363
 #. i18n: ectx: label, entry (articleFixedFont), group (VISUAL_APPEARANCE)
-#: rc.cpp:673
+#: rc.cpp:307
 msgid "Article Body (Fixed)"
 msgstr "Corff yr Erthygl (Sefydlog)"
 
 #. i18n: file: knode.kcfg:371
 #. i18n: ectx: label, entry (groupListFont), group (VISUAL_APPEARANCE)
-#: rc.cpp:679
+#: rc.cpp:313
 msgid "Group List"
 msgstr "Rhestr Grwpiau"
 
-#. i18n: file: nntpaccountlistwidget_base.ui:76
-#. i18n: ectx: property (text), widget (QPushButton, mSubscribeButton)
-#: rc.cpp:702
-msgid "&Subscribe..."
-msgstr "Tany&sgrifio..."
+#. i18n: file: knode.kcfg:374
+#. i18n: ectx: label, entry (articleListFont), group (VISUAL_APPEARANCE)
+#. i18n: file: readnewsgeneralwidget_base.ui:105
+#. i18n: ectx: property (title), widget (QGroupBox, articleListBox)
+#: rc.cpp:316 rc.cpp:587
+msgid "Article List"
+msgstr "Rhestr Erthyglau"
 
-#. i18n: file: postnewscomposerwidget_base.ui:35
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_wordWrap)
-#: rc.cpp:708
-msgid "Word &wrap at column:"
-msgstr "Lapio geiriau &wrth y golofn:"
+#. i18n: file: configuration/identity_widget.ui:20
+#. i18n: ectx: property (text), widget (QCheckBox, mUseSpecificIdentity)
+#: rc.cpp:327
+msgid "Use a specific identity"
+msgstr ""
 
-#. i18n: file: postnewscomposerwidget_base.ui:42
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_appendOwnSignature)
-#: rc.cpp:711
-msgid "Appe&nd signature automatically"
-msgstr "Atodi llof&nod yn ymysgogol"
+#. i18n: file: configuration/identity_widget.ui:47
+#. i18n: ectx: property (text), widget (QLabel, mIdentitySelectorLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:29
+#. i18n: ectx: property (text), widget (QLabel, mIdentitySelectorLabel)
+#. i18n: file: composer/composer_view.ui:45
+#. i18n: ectx: property (text), widget (QLabel, mIdentitySelectorLabel)
+#: rc.cpp:330 rc.cpp:351 rc.cpp:680
+msgctxt "@label:listbox"
+msgid "Identity:"
+msgstr ""
 
-#. i18n: file: postnewscomposerwidget_base.ui:55
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:714
-msgid "Reply"
-msgstr "Ymateb"
+#. i18n: file: configuration/identity_widget.ui:67
+#. i18n: ectx: property (text), widget (KPushButton, mModifyIdentitiesButton)
+#: rc.cpp:333
+msgid "Modify..."
+msgstr ""
+
+#. i18n: file: configuration/identity_widget.ui:97
+#. i18n: ectx: property (text), widget (QLabel, mNameLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:162
+#. i18n: ectx: property (text), widget (QLabel, mNameLabel)
+#: rc.cpp:336 rc.cpp:372
+msgctxt "@label:textbox Name of the user in a message"
+msgid "Name:"
+msgstr ""
+
+#. i18n: file: configuration/identity_widget.ui:104
+#. i18n: ectx: property (text), widget (QLabel, mOrganisationLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:188
+#. i18n: ectx: property (text), widget (QLabel, mOrganisationLabel)
+#: rc.cpp:339 rc.cpp:387
+msgid "Organization:"
+msgstr ""
+
+#. i18n: file: configuration/identity_widget.ui:111
+#. i18n: ectx: property (text), widget (QLabel, mEmailLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:214
+#. i18n: ectx: property (text), widget (QLabel, mEmailLabel)
+#: rc.cpp:342 rc.cpp:402
+msgid "Email address:"
+msgstr ""
+
+#. i18n: file: configuration/identity_widget.ui:118
+#. i18n: ectx: property (text), widget (QLabel, mReplytoLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:240
+#. i18n: ectx: property (text), widget (QLabel, mReplytoLabel)
+#: rc.cpp:345 rc.cpp:417
+msgid "Reply-to address:"
+msgstr ""
+
+#. i18n: file: configuration/identity_widget.ui:125
+#. i18n: ectx: property (text), widget (QLabel, mMailcopiestoLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:266
+#. i18n: ectx: property (text), widget (QLabel, mMailcopiestoLabel)
+#: rc.cpp:348 rc.cpp:432
+msgid "Mail-copies-to:"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:67
+#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonNewIdentity)
+#: rc.cpp:354
+msgid "Create an identity"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:92
+#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonDuplicateIdentity)
+#: rc.cpp:357
+msgid "Duplicate this identity"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:117
+#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonRenameIdentity)
+#: rc.cpp:360
+msgid "Rename this identity"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:142
+#. i18n: ectx: property (toolTip), widget (KPushButton, mButtonRemoveIdentity)
+#: rc.cpp:363
+msgid "Remove this identity"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:159
+#. i18n: ectx: property (whatsThis), widget (QLabel, mNameLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:175
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mNameEdit)
+#: rc.cpp:366 rc.cpp:375
+msgid ""
+"<qt>\n"
+"  <p>Your name as it will appear to others reading your articles.</p>\n"
+"  <p>Ex: <b>John Stuart Masterson III</b>.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:185
+#. i18n: ectx: property (whatsThis), widget (QLabel, mOrganisationLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:201
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mOrganisationEdit)
+#: rc.cpp:381 rc.cpp:390
+msgid ""
+"<qt>\n"
+"  <p>The name of the organization you work for.</p>\n"
+"  <p>Ex: <b>KNode, Inc</b>.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:211
+#. i18n: ectx: property (whatsThis), widget (QLabel, mEmailLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:227
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mEmailEdit)
+#: rc.cpp:396 rc.cpp:405
+msgid ""
+"<qt>\n"
+"  <p>Your email address as it will appear to others reading your "
+"articles</p>\n"
+"  <p>Ex: <b>nospam@please.com</b>.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:237
+#. i18n: ectx: property (whatsThis), widget (QLabel, mReplytoLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:253
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mReplytoEdit)
+#: rc.cpp:411 rc.cpp:420
+msgid ""
+"<qt>\n"
+"  <p>When someone replies to your article by email, this is the address to "
+"which the message will be sent. If you fill in this field, please do so with "
+"a real email address.</p>\n"
+"  <p>Ex: <b>john@example.com</b>.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:263
+#. i18n: ectx: property (whatsThis), widget (QLabel, mMailcopiestoLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:279
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mMailcopiestoEdit)
+#: rc.cpp:426 rc.cpp:435
+msgid ""
+"<qt>\n"
+"  <p>When someone replies to your article on a group, you can ask to be sent "
+"a copy by email. This is the address to which this copy will be sent. If you "
+"fill in this field, please do so with a real email address.</p>\n"
+"  <p>Ex: <b>john@example.com</b>.</p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: configuration/identity_edition_dialog.ui:286
+#. i18n: ectx: property (whatsThis), widget (QLabel, mSigningKeyRequesterLabel)
+#. i18n: file: configuration/identity_edition_dialog.ui:296
+#. i18n: ectx: property (whatsThis), widget (Kleo::SigningKeyRequester, mSigningKeyRequester)
+#: rc.cpp:441 rc.cpp:447
+msgid ""
+"<qt><p>The OpenPGP key you choose here will be used to sign your "
+"articles.</p></qt>"
+msgstr ""
+"<qt><p>Defnyddir yr allwedd OpenPGP a ddewisir yma i lofnodi eich "
+"erthyglau.</p></qt>"
+
+#. i18n: file: configuration/identity_edition_dialog.ui:289
+#. i18n: ectx: property (text), widget (QLabel, mSigningKeyRequesterLabel)
+#: rc.cpp:444
+msgid "Signing key:"
+msgstr ""
+
+#. i18n: file: knodeui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: knreaderui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kncomposerui.rc:5
+#. i18n: ectx: Menu (file)
+#: rc.cpp:450 rc.cpp:483 rc.cpp:623
+msgid "&File"
+msgstr ""
+
+#. i18n: file: knodeui.rc:15
+#. i18n: ectx: Menu (edit)
+#. i18n: file: knreaderui.rc:11
+#. i18n: ectx: Menu (edit)
+#. i18n: file: kncomposerui.rc:13
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:453 rc.cpp:486 rc.cpp:626
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: knodeui.rc:24
+#. i18n: ectx: Menu (view)
+#. i18n: file: knreaderui.rc:16
+#. i18n: ectx: Menu (view)
+#: rc.cpp:456 rc.cpp:489
+msgid "&View"
+msgstr ""
+
+#. i18n: file: knodeui.rc:45
+#. i18n: ectx: Menu (go)
+#: rc.cpp:459
+msgid "&Go"
+msgstr "&Mynd"
+
+#. i18n: file: knodeui.rc:55
+#. i18n: ectx: Menu (account)
+#: rc.cpp:462
+msgid "A&ccount"
+msgstr "&Cyfrif"
+
+#. i18n: file: knodeui.rc:64
+#. i18n: ectx: Menu (group)
+#: rc.cpp:465
+msgid "G&roup"
+msgstr "G&rŵp"
+
+#. i18n: file: knodeui.rc:77
+#. i18n: ectx: Menu (folder)
+#: rc.cpp:468
+msgid "Fol&der"
+msgstr "Ply&gell"
+
+#. i18n: file: knodeui.rc:91
+#. i18n: ectx: Menu (article)
+#. i18n: file: knreaderui.rc:28
+#. i18n: ectx: Menu (article)
+#: rc.cpp:471 rc.cpp:492
+msgid "&Article"
+msgstr "&Erthygl"
+
+#. i18n: file: knodeui.rc:111
+#. i18n: ectx: Menu (scoring)
+#: rc.cpp:474
+msgid "Sc&oring"
+msgstr "Sg&orio"
+
+#. i18n: file: knodeui.rc:121
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:477
+msgid "&Settings"
+msgstr ""
+
+#. i18n: file: knodeui.rc:131
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: knreaderui.rc:38
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kncomposerui.rc:57
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:480 rc.cpp:495 rc.cpp:638
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: file: postnewscomposerwidget_base.ui:35
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_wordWrap)
+#: rc.cpp:501
+msgid "Word &wrap at column:"
+msgstr "Lapio geiriau &wrth y golofn:"
+
+#. i18n: file: postnewscomposerwidget_base.ui:42
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_appendOwnSignature)
+#: rc.cpp:504
+msgid "Appe&nd signature automatically"
+msgstr "Atodi llof&nod yn ymysgogol"
+
+#. i18n: file: postnewscomposerwidget_base.ui:55
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:507
+msgid "Reply"
+msgstr "Ymateb"
+
+#. i18n: file: postnewscomposerwidget_base.ui:72
+#. i18n: ectx: property (text), widget (QLabel, label1)
+#: rc.cpp:510
+msgid "&Introduction phrase:"
+msgstr "Ymadrodd cyflwyn&iad"
+
+#. i18n: file: postnewscomposerwidget_base.ui:87
+#. i18n: ectx: property (text), widget (QLabel, label2)
+#: rc.cpp:514
+#, no-c-format
+msgid ""
+"<qt>Placeholders: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's "
+"address,<br><b>%DATE</b>=date, <b>%MSID</b>=message-id, "
+"<b>%MSIDX</b>=message-id without angle brackets, <b>%GROUP</b>=group name, "
+"<b>%L</b>=line break</qt>"
+msgstr ""
+
+#. i18n: file: postnewscomposerwidget_base.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_rewrap)
+#: rc.cpp:517
+msgid "Rewrap quoted te&xt automatically"
+msgstr "Ail-lapio te&stun dyfynedig yn ymysgogol"
+
+#. i18n: file: postnewscomposerwidget_base.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_includeSignature)
+#: rc.cpp:520
+msgid "Include the a&uthor's signature"
+msgstr "Cynnwys llofnod yr awd&ur"
+
+#. i18n: file: postnewscomposerwidget_base.ui:116
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_cursorOnTop)
+#: rc.cpp:523
+msgid "Put the cursor &below the introduction phrase"
+msgstr "Rhoi'r cyrchydd is&law'r ymadrodd cyflwyno"
+
+#. i18n: file: postnewscomposerwidget_base.ui:128
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:526
+msgid "External Editor"
+msgstr "Golygydd Allanol"
+
+#. i18n: file: postnewscomposerwidget_base.ui:140
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useExternalEditor)
+#: rc.cpp:529
+msgid "Start exte&rnal editor automatically"
+msgstr "Cychwyn y &golygydd allanol yn ymysgogol"
+
+#. i18n: file: postnewscomposerwidget_base.ui:147
+#. i18n: ectx: property (text), widget (QLabel, label4)
+#: rc.cpp:533
+#, no-c-format
+msgid "<qt><b>%f</b> will be replaced with the filename to edit</qt>"
+msgstr ""
+
+#. i18n: file: postnewscomposerwidget_base.ui:161
+#. i18n: ectx: property (text), widget (QLabel, label3)
+#: rc.cpp:536
+msgid "Specify editor:"
+msgstr ""
+
+#. i18n: file: readnewsnavigationwidget_base.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, markAllReadBox)
+#: rc.cpp:539
+msgid "\"Mark All as Read\" Triggers Following Actions"
+msgstr ""
+"Achosith \"Dynodi Popeth fel wedi'i Ddarllen\" y gweithredoedd canlynol"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:35
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markAllReadGoNext)
+#: rc.cpp:542
+msgid "&Switch to the next group"
+msgstr "T&roi i'r grŵp nesaf"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:45
+#. i18n: ectx: property (title), widget (QGroupBox, markThreadReadBox)
+#: rc.cpp:545
+msgid "\"Mark Thread as Read\" Triggers Following Actions"
+msgstr ""
+"Achosith \"Dynodi'r Trwywydd fel wedi'i Ddarllen\" y gweithredoedd canlynol"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:57
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markThreadReadCloseThread)
+#: rc.cpp:548
+msgid "Clos&e the current thread"
+msgstr "Cau'r trywydd cyfr&edol"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:64
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markThreadReadGoNext)
+#: rc.cpp:551
+msgid "Go &to the next unread thread"
+msgstr "Mynd i'r &trywydd heb ei ddarllen nesaf"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:74
+#. i18n: ectx: property (title), widget (QGroupBox, ignoreThreadBox)
+#: rc.cpp:554
+msgid "\"Ignore Thread\" Triggers Following Actions"
+msgstr "Achosith \"Anwybyddu'r Trywydd\" y gweithredoedd canlynol"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ignoreThreadCloseThread)
+#: rc.cpp:557
+msgid "Close the cu&rrent thread"
+msgstr "Cau'r trywydd cyf&redol"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:93
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ignoreThreadGoNext)
+#: rc.cpp:560
+msgid "Go to the next &unread thread"
+msgstr "Mynd i'r trywydd nesaf heb ei dda&rllen"
+
+#. i18n: file: readnewsnavigationwidget_base.ui:103
+#. i18n: ectx: property (title), widget (QGroupBox, leaveGroupBox)
+#: rc.cpp:563
+msgid "Leaving Group Triggers Following Actions"
+msgstr ""
+
+#. i18n: file: readnewsnavigationwidget_base.ui:115
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_leaveGroupMarkAsRead)
+#: rc.cpp:566
+msgid "Mark all articles as read"
+msgstr ""
+
+#. i18n: file: readnewsgeneralwidget_base.ui:23
+#. i18n: ectx: property (title), widget (QGroupBox, articleHandlingBox)
+#: rc.cpp:569
+msgid "Article Handling"
+msgstr "Trin Erthyglau"
+
+#. i18n: file: readnewsgeneralwidget_base.ui:44
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoCheckGroups)
+#: rc.cpp:572
+msgid "Check for new articles a&utomatically"
+msgstr "Ymholi am erthyglau newydd yn &ymysgogol"
+
+#. i18n: file: readnewsgeneralwidget_base.ui:53
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:575
+msgid "&Maximum number of articles to fetch:"
+msgstr "Uchafr&if yr erthyglau i'w nôl:"
+
+#. i18n: file: readnewsgeneralwidget_base.ui:73
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoMark)
+#: rc.cpp:578
+msgid "Mar&k article as read after:"
+msgstr "N&odi erthygl fel wedi'i darllen ar ôl:"
+
+#. i18n: file: readnewsgeneralwidget_base.ui:83
+#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_autoMarkSeconds)
+#: rc.cpp:581
+msgid "sec"
+msgstr ""
+
+#. i18n: file: readnewsgeneralwidget_base.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_markCrossposts)
+#: rc.cpp:584
+msgid "Mark c&rossposted articles as read"
+msgstr "Nodi erthyglau wedi'u cro&esbostio fel wedi'u darllen"
 
-#. i18n: file: postnewscomposerwidget_base.ui:72
-#. i18n: ectx: property (text), widget (QLabel, label1)
-#: rc.cpp:717
-msgid "&Introduction phrase:"
-msgstr "Ymadrodd cyflwyn&iad"
+#. i18n: file: readnewsgeneralwidget_base.ui:117
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_defaultToExpandedThreads)
+#: rc.cpp:590
+msgid "Default to e&xpanded threads"
+msgstr "Trywyddau wedi'u ehangu fel rha&gosod"
 
-#. i18n: file: postnewscomposerwidget_base.ui:87
-#. i18n: ectx: property (text), widget (QLabel, label2)
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<qt>Placeholders: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's "
-"address,<br><b>%DATE</b>=date, <b>%MSID</b>=message-id, "
-"<b>%MSIDX</b>=message-id without angle brackets, <b>%GROUP</b>=group name, "
-"<b>%L</b>=line break</qt>"
-msgstr ""
+#. i18n: file: readnewsgeneralwidget_base.ui:124
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_smartScrolling)
+#: rc.cpp:593
+msgid "Smart scrolli&ng"
+msgstr "Sgrolio si&onc"
 
-#. i18n: file: postnewscomposerwidget_base.ui:102
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_rewrap)
-#: rc.cpp:724
-msgid "Rewrap quoted te&xt automatically"
-msgstr "Ail-lapio te&stun dyfynedig yn ymysgogol"
+#. i18n: file: readnewsgeneralwidget_base.ui:131
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_totalExpandThreads)
+#: rc.cpp:596
+msgid "Show &whole thread on expanding"
+msgstr "Dangos y &trywydd i gyd wedi ehangu"
 
-#. i18n: file: postnewscomposerwidget_base.ui:109
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_includeSignature)
-#: rc.cpp:727
-msgid "Include the a&uthor's signature"
-msgstr "Cynnwys llofnod yr awd&ur"
+#. i18n: file: readnewsgeneralwidget_base.ui:138
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showScore)
+#: rc.cpp:599
+msgid "Show article &score"
+msgstr "Dangos &sgôr yr erthygl"
 
-#. i18n: file: postnewscomposerwidget_base.ui:116
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_cursorOnTop)
-#: rc.cpp:730
-msgid "Put the cursor &below the introduction phrase"
-msgstr "Rhoi'r cyrchydd is&law'r ymadrodd cyflwyno"
+#. i18n: file: readnewsgeneralwidget_base.ui:145
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showLines)
+#: rc.cpp:602
+msgid "Show &line count"
+msgstr "Dangos cyfrif y &llinellau"
 
-#. i18n: file: postnewscomposerwidget_base.ui:128
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:733
-msgid "External Editor"
-msgstr "Golygydd Allanol"
+#. i18n: file: readnewsgeneralwidget_base.ui:152
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showUnread)
+#: rc.cpp:605
+msgid "Show unread count in &thread"
+msgstr "Dangos cyfrif y rhai heb eu darllen yn y &trywydd"
 
-#. i18n: file: postnewscomposerwidget_base.ui:140
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useExternalEditor)
-#: rc.cpp:736
-msgid "Start exte&rnal editor automatically"
-msgstr "Cychwyn y &golygydd allanol yn ymysgogol"
+#. i18n: file: readnewsgeneralwidget_base.ui:162
+#. i18n: ectx: property (title), widget (QGroupBox, dateFormatBox)
+#: rc.cpp:608
+msgid "Date Display"
+msgstr ""
 
-#. i18n: file: postnewscomposerwidget_base.ui:147
-#. i18n: ectx: property (text), widget (QLabel, label4)
-#: rc.cpp:740
-#, no-c-format
-msgid "<qt><b>%f</b> will be replaced with the filename to edit</qt>"
+#. i18n: file: readnewsgeneralwidget_base.ui:196
+#. i18n: ectx: property (text), widget (QRadioButton, mCustomDateFormat)
+#: rc.cpp:620
+msgid "Custom format (Shift+F1 for help):"
 msgstr ""
 
-#. i18n: file: postnewscomposerwidget_base.ui:161
-#. i18n: ectx: property (text), widget (QLabel, label3)
-#: rc.cpp:743
-msgid "Specify editor:"
+#. i18n: file: kncomposerui.rc:27
+#. i18n: ectx: Menu (attach)
+#: rc.cpp:629
+msgid "&Attach"
+msgstr "&Atodi"
+
+#. i18n: file: kncomposerui.rc:33
+#. i18n: ectx: Menu (options)
+#: rc.cpp:632
+msgid "Optio&ns"
+msgstr "De&wisiadau"
+
+#. i18n: file: kncomposerui.rc:42
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:635
+msgid "&Tools"
 msgstr ""
 
 #. i18n: file: nntpaccountdialog_base.ui:52
 #. i18n: ectx: property (text), widget (QCheckBox, mIntervalChecking)
-#: rc.cpp:746
+#: rc.cpp:641
 msgid "Enable &interval news checking"
 msgstr "Galluogi y&mholi ysbeidiol am newyddion"
 
 #. i18n: file: nntpaccountdialog_base.ui:62
 #. i18n: ectx: property (text), widget (QLabel, mIntervalLabel)
-#: rc.cpp:749
+#: rc.cpp:644
 msgid "Check inter&val:"
 msgstr "Cyfnod y&mofyn:"
 
 #. i18n: file: nntpaccountdialog_base.ui:85
 #. i18n: ectx: property (text), widget (QCheckBox, mFetchDesc)
-#: rc.cpp:752
+#: rc.cpp:647
 msgid "Fetch group descriptions"
 msgstr ""
 
 #. i18n: file: nntpaccountdialog_base.ui:92
 #. i18n: ectx: property (text), widget (QCheckBox, mLogin)
-#: rc.cpp:755
+#: rc.cpp:650
 msgid "Server requires &authentication"
 msgstr "Mae &angen dilysiant ar y gweinydd"
 
 #. i18n: file: nntpaccountdialog_base.ui:125
 #. i18n: ectx: property (text), widget (QLabel, mPasswordLabel)
-#: rc.cpp:758
+#: rc.cpp:653
 msgid "Pass&word:"
 msgstr "C&yfrinair:"
 
 #. i18n: file: nntpaccountdialog_base.ui:138
 #. i18n: ectx: property (text), widget (QLabel, mUserLabel)
-#: rc.cpp:761
+#: rc.cpp:656
 msgid "&User:"
 msgstr "De&fnyddiwr:"
 
 #. i18n: file: nntpaccountdialog_base.ui:148
 #. i18n: ectx: property (title), widget (QGroupBox, mEncGroup)
-#: rc.cpp:764
+#: rc.cpp:659
 msgid "Encryption"
 msgstr "Cêl-ysgrifaeth"
 
 #. i18n: file: nntpaccountdialog_base.ui:170
 #. i18n: ectx: property (text), widget (QRadioButton, mEncSSL)
-#: rc.cpp:770
+#: rc.cpp:665
 msgid "SSL"
 msgstr "SSL"
 
 #. i18n: file: nntpaccountdialog_base.ui:180
 #. i18n: ectx: property (text), widget (QRadioButton, mEncTLS)
-#: rc.cpp:773
+#: rc.cpp:668
 msgid "TLS"
 msgstr "TLS"
 
 #. i18n: file: nntpaccountdialog_base.ui:203
 #. i18n: ectx: property (text), widget (QLabel, mServerLabel)
-#: rc.cpp:779
+#: rc.cpp:674
 msgid "&Server:"
 msgstr "Gwei&nydd:"
 
 #. i18n: file: nntpaccountdialog_base.ui:213
 #. i18n: ectx: property (text), widget (QLabel, mPortLabel)
-#: rc.cpp:782
+#: rc.cpp:677
 msgid "&Port:"
 msgstr "&Porth:"
+
+#. i18n: file: composer/composer_view.ui:55
+#. i18n: ectx: property (text), widget (QLabel, mToLabel)
+#: rc.cpp:683
+msgctxt "@label:textbox email recipient of a message"
+msgid "To:"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:68
+#. i18n: ectx: property (text), widget (KPushButton, mToButton)
+#: rc.cpp:686
+msgctxt "@action:button open a dialog to choose email recipients"
+msgid "Browse..."
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:75
+#. i18n: ectx: property (text), widget (QLabel, mGroupsLabel)
+#: rc.cpp:689
+msgctxt "@label:textbox"
+msgid "Groups:"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:85
+#. i18n: ectx: property (text), widget (QLabel, mFollowuptoLabel)
+#: rc.cpp:692
+msgctxt "@label"
+msgid "Followup-To:"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:95
+#. i18n: ectx: property (text), widget (QLabel, mSubjetLabel)
+#: rc.cpp:695
+msgctxt "@label:textbox subject of a message"
+msgid "Subject:"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:105
+#. i18n: ectx: property (text), widget (KPushButton, mGroupsButton)
+#: rc.cpp:698
+msgctxt "@action:button open a dialog to choose newsgroups"
+msgid "Browse..."
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:115
+#. i18n: ectx: property (text), widget (QLabel, mFromLabel)
+#: rc.cpp:701
+msgctxt "@label:textbox"
+msgid "From:"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:137
+#. i18n: ectx: property (whatsThis), widget (KNode::Composer::FollowuptoCombobox, mFollowuptoEdit)
+#: rc.cpp:704
+msgid ""
+"<qt>\n"
+"<p>The group <strong>where the replies to your message should be "
+"sent</strong>. Use this field when you are sending it to more than one "
+"group.<br />\n"
+"This group is usually the place where you expect the discussion you\n"
+"  are starting to fit the best.</p>\n"
+"\n"
+"<p>Remember to subscribe to this group if you are not yet.</p>\n"
+"\n"
+"<p><note>It is also good practice to indicate the \"followup-to\"\n"
+"  in your message to inform readers.</note></p>\n"
+"</qt>"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:196
+#. i18n: ectx: property (text), widget (QLabel, mExternalKillSwitchLabel)
+#: rc.cpp:716
+msgid ""
+"You are currently editing the article body\n"
+"in an external editor. To continue, you have\n"
+"to close the external editor."
+msgstr ""
+"Yr ydych yn golygu corff yr erthygl ar hyn o bryd\n"
+" mewn golygydd allanol.  I barhau, rhaid ichi\n"
+" gau'r golygydd allanol."
+
+#. i18n: file: composer/composer_view.ui:203
+#. i18n: ectx: property (text), widget (KPushButton, mExternalKillSwitch)
+#: rc.cpp:721
+msgctxt "@action:button"
+msgid "Kill external editor"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:256
+#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
+#: rc.cpp:724
+msgctxt "@title:column list of attachments of a message"
+msgid "File"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:261
+#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
+#: rc.cpp:727
+msgctxt "@title:column list of attachments of a message"
+msgid "Type"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:266
+#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
+#: rc.cpp:730
+msgctxt "@title:column list of attachments of a message"
+msgid "Size"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:271
+#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
+#: rc.cpp:733
+msgctxt "@title:column list of attachments of a message"
+msgid "Description"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:276
+#. i18n: ectx: property (text), widget (KNode::Composer::AttachmentView, mAttachmentsList)
+#: rc.cpp:736
+msgctxt "@title:column list of attachments of a message"
+msgid "Encoding"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:284
+#. i18n: ectx: property (text), widget (KPushButton, mAttachmentAddButton)
+#: rc.cpp:739
+msgctxt "@action:button Open a dialog to add a message attachment"
+msgid "Add..."
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:291
+#. i18n: ectx: property (text), widget (KPushButton, mAttachmentPropertiesButton)
+#: rc.cpp:742
+msgctxt ""
+"@action:button open a dialog displaying properties of a message attachment"
+msgid "Properties"
+msgstr ""
+
+#. i18n: file: composer/composer_view.ui:311
+#. i18n: ectx: property (text), widget (KPushButton, mAttachmentRemoveButton)
+#: rc.cpp:745
+msgctxt "@action:button remove an attachment of a message"
+msgid "Remove"
+msgstr ""
+
+#. i18n: file: postnewstechnicalwidget_base.ui:35
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_generateMessageID)
+#: rc.cpp:751
+msgid "&Generate message-id"
+msgstr "Creu clustnod ne&ges"
+
+#. i18n: file: postnewstechnicalwidget_base.ui:52
+#. i18n: ectx: property (text), widget (QLabel, mHostLabel)
+#: rc.cpp:754
+msgid "Ho&st name:"
+msgstr "En&w Gwesteiwr :"
+
+#. i18n: file: postnewstechnicalwidget_base.ui:62
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:757
+msgid "Enco&ding:"
+msgstr "Amgo&diad:"
+
+#. i18n: file: postnewstechnicalwidget_base.ui:75
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseOwnCharset)
+#: rc.cpp:760
+msgid "Use o&wn default charset when replying"
+msgstr "Defnyddio eich set nodau rhagosodedig eich hun &wrth ymateb"
+
+#. i18n: file: postnewstechnicalwidget_base.ui:85
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:763
+msgid "Cha&rset:"
+msgstr "Set &Nodau:"
+
+#. i18n: file: postnewstechnicalwidget_base.ui:98
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:766
+msgid "Header"
+msgstr ""
+
+#. i18n: file: postnewstechnicalwidget_base.ui:113
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_noUserAgent)
+#: rc.cpp:769
+msgid "Do not add the \"&User-Agent\" identification header"
+msgstr ""
+
+#. i18n: file: postnewstechnicalwidget_base.ui:127
+#. i18n: ectx: property (text), widget (QPushButton, mDeleteButton)
+#: rc.cpp:775
+msgid "Dele&te"
+msgstr "Di&leu"
+
+#. i18n: file: postnewstechnicalwidget_base.ui:141
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:782
+#, no-c-format
+msgid ""
+"<qt>Placeholders for replies: <b>%NAME</b>=sender's name, "
+"<b>%EMAIL</b>=sender's address</qt>"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knotes.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knotes.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knotes.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knotes.po	2012-04-18 08:59:26.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: knotes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 02:54+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-17 11:42+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:41+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: knote.cpp:135
 #, kde-format
@@ -136,19 +136,19 @@
 msgid "Walk Through Notes"
 msgstr ""
 
-#: knotealarmdlg.cpp:60
+#: knotealarmdlg.cpp:56
 msgid "Scheduled Alarm"
 msgstr ""
 
-#: knotealarmdlg.cpp:62
+#: knotealarmdlg.cpp:58
 msgid "&No alarm"
 msgstr ""
 
-#: knotealarmdlg.cpp:69
+#: knotealarmdlg.cpp:65
 msgid "Alarm &at:"
 msgstr ""
 
-#: knotealarmdlg.cpp:77
+#: knotealarmdlg.cpp:73
 msgid "Alarm &in:"
 msgstr ""
 
@@ -352,27 +352,27 @@
 msgid "KNotes: Sticky notes for KDE"
 msgstr ""
 
-#: knotesapp.cpp:128
+#: knotesapp.cpp:129
 msgid "New Note"
 msgstr "Nodyn Newydd"
 
-#: knotesapp.cpp:136
+#: knotesapp.cpp:135
 msgid "New Note From Clipboard"
 msgstr "Nodyn Newydd o'r Clipfwrdd"
 
-#: knotesapp.cpp:142
+#: knotesapp.cpp:140
 msgid "Show All Notes"
 msgstr ""
 
-#: knotesapp.cpp:149
+#: knotesapp.cpp:146
 msgid "Hide All Notes"
 msgstr ""
 
-#: knotesapp.cpp:481
+#: knotesapp.cpp:477
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: knotesapp.cpp:684
+#: knotesapp.cpp:680
 msgid "No Notes"
 msgstr "Dim Nodiadau"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knotify4.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knotify4.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/knotify4.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/knotify4.po	2012-04-18 08:59:35.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: knotify4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2009-07-18 18:16+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:02+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:26+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ksolidnotify.cpp:148
 msgid "Devices notification"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kolf.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kolf.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kolf.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kolf.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: kolf\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,118 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:50+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: game.cpp:252
-msgid "Course name: "
-msgstr "Enw'r cwrs: "
-
-#: game.cpp:260
-msgid "Course author: "
-msgstr "Awdur y cwrs: "
-
-#: game.cpp:270
-msgid "Par:"
-msgstr "Par:"
-
-#: game.cpp:279
-msgid "Maximum:"
-msgstr "Uchaf:"
-
-#: game.cpp:283
-msgid "Maximum number of strokes player can take on this hole."
-msgstr "Uchafswm y trawiadau y gall chwaraewr gymryd ar y twll hwn."
-
-#: game.cpp:284
-msgid "Maximum number of strokes"
-msgstr "Uchafswm y trawiadau"
-
-#: game.cpp:285
-msgid "Unlimited"
-msgstr "Heb derfyn"
-
-#: game.cpp:290
-msgid "Show border walls"
-msgstr "Dangos waliau ffin"
-
-#: game.cpp:483 game.cpp:2387
-msgid "Course Author"
-msgstr "Awdur y Cwrs"
-
-#: game.cpp:484 game.cpp:485 game.cpp:2387
-msgid "Course Name"
-msgstr "Enw'r Cwrs"
-
-#: game.cpp:1366
-msgid "Drop Outside of Hazard"
-msgstr "Disgyn Tu Allan o'r Rhwystr"
-
-#: game.cpp:1367
-msgid "Rehit From Last Location"
-msgstr "Aildaro o'r Lleoliad Diwethaf"
-
-#: game.cpp:1369
-msgid "What would you like to do for your next shot?"
-msgstr "Beth hoffech wneud am eich ergyd nesaf?"
-
-#: game.cpp:1369
-#, kde-format
-msgid "%1 is in a Hazard"
-msgstr "Mae %1 mewn Rhwystr"
-
-#: game.cpp:1539
-#, kde-format
-msgid "%1 will start off."
-msgstr "Bydd %1 yn dechrau."
-
-#: game.cpp:1539
-msgid "New Hole"
-msgstr "Twll Newydd"
-
-#: game.cpp:1700
-#, kde-format
-msgid "Course name: %1"
-msgstr "Enw'r cwrs: %1"
-
-#: game.cpp:1701
-#, kde-format
-msgid "Created by %1"
-msgstr "Creuwyd gan %1"
-
-#: game.cpp:1702 main.cpp:77
-#, kde-format
-msgid "%1 holes"
-msgstr "%1 o dyllau"
-
-#: game.cpp:1703
-msgid "Course Information"
-msgstr "Gwybodaeth am y Cwrs"
-
-#: game.cpp:1824
-msgid ""
-"This hole uses the following plugins, which you do not have installed:"
-msgstr "Mae'r twll yma yn defnyddio'r ategion dilynol, nad arsefydlwyd:"
-
-#: game.cpp:1936
-msgid "There are unsaved changes to current hole. Save them?"
-msgstr "Mae newidiadau heb eu cadw i'r twll cyfredol.  Cadw nawr?"
-
-#: game.cpp:1936
-msgid "Unsaved Changes"
-msgstr "Newidiadau Heb eu Cadw"
-
-#: game.cpp:1936
-msgid "Save &Later"
-msgstr "&Cadw Wedyn"
-
-#: game.cpp:2105 kolf.cpp:545
-msgid "Pick Kolf Course to Save To"
-msgstr "Dewis Pa Gwrs Kolf i Gadw Iddo"
-
-#: kcomboboxdialog.cpp:55
-msgid "&Do not ask again"
-msgstr "&Paid â gofyn eto"
+"X-Launchpad-Export-Date: 2012-04-18 00:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kolf.cpp:57
 msgid "Slope"
@@ -263,7 +153,7 @@
 msgid "&Tutorial"
 msgstr "&Hyfforddiad"
 
-#: kolf.cpp:447 kolf.cpp:491 kolf.cpp:518 newgame.cpp:247 scoreboard.cpp:27
+#: kolf.cpp:447 kolf.cpp:491 kolf.cpp:518 scoreboard.cpp:27 newgame.cpp:250
 msgid "Par"
 msgstr "Par"
 
@@ -281,11 +171,15 @@
 msgid "%1 won!"
 msgstr "Mae %1 wedi enill!"
 
-#: kolf.cpp:508 kolf.cpp:524 newgame.cpp:249
+#: kolf.cpp:508 kolf.cpp:524 newgame.cpp:252
 #, kde-format
 msgid "High Scores for %1"
 msgstr "Sgorau Gorau %1"
 
+#: kolf.cpp:545 game.cpp:2106
+msgid "Pick Kolf Course to Save To"
+msgstr "Dewis Pa Gwrs Kolf i Gadw Iddo"
+
 #: kolf.cpp:558
 msgid "Pick Saved Game to Save To"
 msgstr "Dewis Gêm wedi'i Chadw i Gadw Iddi"
@@ -304,40 +198,164 @@
 msgid "%1's score has reached the maximum for this hole."
 msgstr "Mae sgôr %1 wedi cyrraedd yr uchafswm ar gyfer y twll yma."
 
-#: objects.cpp:242
-msgid " degree"
-msgid_plural " degrees"
-msgstr[0] ""
-msgstr[1] ""
+#: obstacles.cpp:406
+msgid "&Top"
+msgstr "&Pen"
 
-#: objects.cpp:245
-msgid "Exiting ball angle:"
-msgstr "Ongl aeth y bêl allan:"
+#: obstacles.cpp:406
+msgid "&Left"
+msgstr "&Chwith"
 
-#: objects.cpp:252
-msgid "Minimum exit speed:"
-msgstr "Cyflymder isaf dod allan:"
+#: obstacles.cpp:406
+msgid "&Right"
+msgstr "&De"
 
-#: objects.cpp:259
-msgid "Maximum exit speed:"
+#: obstacles.cpp:406
+msgid "&Bottom"
 msgstr ""
 
-#: editor.cpp:42
-msgid "Add object:"
-msgstr "Ychwanegu gwrthrych:"
+#: obstacles.cpp:415
+msgid "Walls on:"
+msgstr "Defnyddio waliau:"
 
-#: landscape.cpp:147
-msgid "Enable show/hide"
-msgstr "Galluogi dangos/cuddio"
+#: obstacles.cpp:425
+msgid "Sign HTML:"
+msgstr "HTML Arwydd:"
+
+#: obstacles.cpp:434
+msgid "Windmill on top"
+msgstr ""
 
-#: landscape.cpp:152 obstacles.cpp:445 obstacles.cpp:463
+#: obstacles.cpp:440 obstacles.cpp:458 landscape.cpp:152
 msgid "Slow"
 msgstr "Araf"
 
-#: landscape.cpp:156 obstacles.cpp:449 obstacles.cpp:467
+#: obstacles.cpp:444 obstacles.cpp:462 landscape.cpp:156
 msgid "Fast"
 msgstr "Cyflym"
 
+#: obstacles.cpp:455
+msgid "Moving speed"
+msgstr "Cyflymder symud"
+
+#: obstacles.cpp:675
+msgid "New Text"
+msgstr "Testun Newydd"
+
+#: scoreboard.cpp:28
+msgid "Total"
+msgstr "Cyfanswm"
+
+#: config.cpp:64
+msgid "No configuration options"
+msgstr "Dim dewisiadau ffurfweddu"
+
+#: game.cpp:253
+msgid "Course name: "
+msgstr "Enw'r cwrs: "
+
+#: game.cpp:261
+msgid "Course author: "
+msgstr "Awdur y cwrs: "
+
+#: game.cpp:271
+msgid "Par:"
+msgstr "Par:"
+
+#: game.cpp:280
+msgid "Maximum:"
+msgstr "Uchaf:"
+
+#: game.cpp:284
+msgid "Maximum number of strokes player can take on this hole."
+msgstr "Uchafswm y trawiadau y gall chwaraewr gymryd ar y twll hwn."
+
+#: game.cpp:285
+msgid "Maximum number of strokes"
+msgstr "Uchafswm y trawiadau"
+
+#: game.cpp:286
+msgid "Unlimited"
+msgstr "Heb derfyn"
+
+#: game.cpp:291
+msgid "Show border walls"
+msgstr "Dangos waliau ffin"
+
+#: game.cpp:484 game.cpp:2388
+msgid "Course Author"
+msgstr "Awdur y Cwrs"
+
+#: game.cpp:485 game.cpp:486 game.cpp:2388
+msgid "Course Name"
+msgstr "Enw'r Cwrs"
+
+#: game.cpp:1367
+msgid "Drop Outside of Hazard"
+msgstr "Disgyn Tu Allan o'r Rhwystr"
+
+#: game.cpp:1368
+msgid "Rehit From Last Location"
+msgstr "Aildaro o'r Lleoliad Diwethaf"
+
+#: game.cpp:1370
+msgid "What would you like to do for your next shot?"
+msgstr "Beth hoffech wneud am eich ergyd nesaf?"
+
+#: game.cpp:1370
+#, kde-format
+msgid "%1 is in a Hazard"
+msgstr "Mae %1 mewn Rhwystr"
+
+#: game.cpp:1540
+#, kde-format
+msgid "%1 will start off."
+msgstr "Bydd %1 yn dechrau."
+
+#: game.cpp:1540
+msgid "New Hole"
+msgstr "Twll Newydd"
+
+#: game.cpp:1701
+#, kde-format
+msgid "Course name: %1"
+msgstr "Enw'r cwrs: %1"
+
+#: game.cpp:1702
+#, kde-format
+msgid "Created by %1"
+msgstr "Creuwyd gan %1"
+
+#: game.cpp:1703 main.cpp:77
+#, kde-format
+msgid "%1 holes"
+msgstr "%1 o dyllau"
+
+#: game.cpp:1704
+msgid "Course Information"
+msgstr "Gwybodaeth am y Cwrs"
+
+#: game.cpp:1825
+msgid ""
+"This hole uses the following plugins, which you do not have installed:"
+msgstr "Mae'r twll yma yn defnyddio'r ategion dilynol, nad arsefydlwyd:"
+
+#: game.cpp:1937
+msgid "There are unsaved changes to current hole. Save them?"
+msgstr "Mae newidiadau heb eu cadw i'r twll cyfredol.  Cadw nawr?"
+
+#: game.cpp:1937
+msgid "Unsaved Changes"
+msgstr "Newidiadau Heb eu Cadw"
+
+#: game.cpp:1937
+msgid "Save &Later"
+msgstr "&Cadw Wedyn"
+
+#: landscape.cpp:147
+msgid "Enable show/hide"
+msgstr "Galluogi dangos/cuddio"
+
 #: landscape.cpp:239
 msgid "Vertical"
 msgstr ""
@@ -376,41 +394,143 @@
 msgid "Grade:"
 msgstr "Gradd:"
 
-#: obstacles.cpp:411
-msgid "&Top"
-msgstr "&Pen"
+#: newgame.cpp:36
+msgid "New Game"
+msgstr ""
 
-#: obstacles.cpp:411
-msgid "&Left"
-msgstr "&Chwith"
+#: newgame.cpp:53
+msgid "Players"
+msgstr "Chwaraewyr"
 
-#: obstacles.cpp:411
-msgid "&Right"
-msgstr "&De"
+#: newgame.cpp:59
+msgid "&New Player"
+msgstr "Chwaraewr &Newydd"
 
-#: obstacles.cpp:411
-msgid "&Bottom"
+#: newgame.cpp:94
+msgid "Choose Course to Play"
+msgstr "Dewis Cwrs i Chwarae"
+
+#: newgame.cpp:95
+msgid "Course"
+msgstr "Cwrs"
+
+#: newgame.cpp:128
+msgid "Create New"
+msgstr "Creu Newydd"
+
+#: newgame.cpp:129
+msgid "You"
+msgstr "Chi"
+
+#: newgame.cpp:157
+msgid "Highscores"
+msgstr "Sgorau Gorau"
+
+#: newgame.cpp:168
+msgid "Add..."
+msgstr "Ychwanegu..."
+
+#: newgame.cpp:172 newgame.cpp:360
+msgid "Remove"
 msgstr ""
 
-#: obstacles.cpp:420
-msgid "Walls on:"
-msgstr "Defnyddio waliau:"
+#: newgame.cpp:182
+msgid "Game Options"
+msgstr "Dewisiadau Gêm"
 
-#: obstacles.cpp:430
-msgid "Sign HTML:"
-msgstr "HTML Arwydd:"
+#: newgame.cpp:183
+msgid "Options"
+msgstr ""
 
-#: obstacles.cpp:439
-msgid "Windmill on top"
+#: newgame.cpp:190
+msgid "&Strict mode"
+msgstr "Modd &llym"
+
+#: newgame.cpp:194
+msgid ""
+"In strict mode, undo, editing, and switching holes is not allowed. This is "
+"generally for competition. Only in strict mode are highscores kept."
 msgstr ""
+"Ym modd llym, ni chaniateir dadwneud, golygu, neu amnewid tyllau.  Defnyddir "
+"hyn fel rheol mewn cystadlaethau.  Cedwir sgorau gorau ym modd llym yn unig."
 
-#: obstacles.cpp:460
-msgid "Moving speed"
-msgstr "Cyflymder symud"
+#: newgame.cpp:242 main.cpp:76
+#, kde-format
+msgid "By %1"
+msgstr "Gan %1"
 
-#: obstacles.cpp:680
-msgid "New Text"
-msgstr "Testun Newydd"
+#: newgame.cpp:243
+#, kde-format
+msgid "Par %1"
+msgstr "Par %1"
+
+#: newgame.cpp:244
+#, kde-format
+msgid "%1 Holes"
+msgstr "%1 o Dyllau"
+
+#: newgame.cpp:282
+msgid "Pick Kolf Course"
+msgstr "Dewis Cwrs Kolf"
+
+#: newgame.cpp:304
+msgid "Chosen course is already on course list."
+msgstr "Mae'r cwrs dewisiedig eisoes ar y rhestr cyrsiau."
+
+#: newgame.cpp:317
+#, kde-format
+msgid "Player %1"
+msgstr "Chwaraewr %1"
+
+#: editor.cpp:42
+msgid "Add object:"
+msgstr "Ychwanegu gwrthrych:"
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr ""
+"Kyfieithu: KD, jawz, dylunio, strempan, Thierry Vignaud, ,Launchpad "
+"Contributions:"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
+
+#. i18n: file: kolfui.rc:17
+#. i18n: ectx: Menu (hole)
+#: rc.cpp:5
+msgid "Ho&le"
+msgstr "Tw&ll"
+
+#. i18n: file: kolfui.rc:31
+#. i18n: ectx: Menu (go_course)
+#: rc.cpp:8
+msgid "&Go"
+msgstr "&Ewch"
+
+#: kcomboboxdialog.cpp:55
+msgid "&Do not ask again"
+msgstr "&Paid â gofyn eto"
+
+#: objects.cpp:242
+msgid " degree"
+msgid_plural " degrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: objects.cpp:245
+msgid "Exiting ball angle:"
+msgstr "Ongl aeth y bêl allan:"
+
+#: objects.cpp:252
+msgid "Minimum exit speed:"
+msgstr "Cyflymder isaf dod allan:"
+
+#: objects.cpp:259
+msgid "Maximum exit speed:"
+msgstr ""
 
 #: main.cpp:35
 msgid "KDE Minigolf Game"
@@ -512,11 +632,6 @@
 msgid "Print course information and exit"
 msgstr "Argraffu gwybodaeth am y cyrsiau, a terfynu"
 
-#: main.cpp:76 newgame.cpp:239
-#, kde-format
-msgid "By %1"
-msgstr "Gan %1"
-
 #: main.cpp:78
 #, kde-format
 msgid "par %1"
@@ -526,118 +641,3 @@
 #, kde-format
 msgid "Course %1 does not exist."
 msgstr "Nid yw'r cwrs %1 mewn bod."
-
-#: newgame.cpp:36
-msgid "New Game"
-msgstr ""
-
-#: newgame.cpp:53
-msgid "Players"
-msgstr "Chwaraewyr"
-
-#: newgame.cpp:59
-msgid "&New Player"
-msgstr "Chwaraewr &Newydd"
-
-#: newgame.cpp:94
-msgid "Choose Course to Play"
-msgstr "Dewis Cwrs i Chwarae"
-
-#: newgame.cpp:95
-msgid "Course"
-msgstr "Cwrs"
-
-#: newgame.cpp:128
-msgid "Create New"
-msgstr "Creu Newydd"
-
-#: newgame.cpp:129
-msgid "You"
-msgstr "Chi"
-
-#: newgame.cpp:157
-msgid "Highscores"
-msgstr "Sgorau Gorau"
-
-#: newgame.cpp:168
-msgid "Add..."
-msgstr "Ychwanegu..."
-
-#: newgame.cpp:172 newgame.cpp:357
-msgid "Remove"
-msgstr ""
-
-#: newgame.cpp:182
-msgid "Game Options"
-msgstr "Dewisiadau Gêm"
-
-#: newgame.cpp:183
-msgid "Options"
-msgstr ""
-
-#: newgame.cpp:190
-msgid "&Strict mode"
-msgstr "Modd &llym"
-
-#: newgame.cpp:194
-msgid ""
-"In strict mode, undo, editing, and switching holes is not allowed. This is "
-"generally for competition. Only in strict mode are highscores kept."
-msgstr ""
-"Ym modd llym, ni chaniateir dadwneud, golygu, neu amnewid tyllau.  Defnyddir "
-"hyn fel rheol mewn cystadlaethau.  Cedwir sgorau gorau ym modd llym yn unig."
-
-#: newgame.cpp:240
-#, kde-format
-msgid "Par %1"
-msgstr "Par %1"
-
-#: newgame.cpp:241
-#, kde-format
-msgid "%1 Holes"
-msgstr "%1 o Dyllau"
-
-#: newgame.cpp:279
-msgid "Pick Kolf Course"
-msgstr "Dewis Cwrs Kolf"
-
-#: newgame.cpp:301
-msgid "Chosen course is already on course list."
-msgstr "Mae'r cwrs dewisiedig eisoes ar y rhestr cyrsiau."
-
-#: newgame.cpp:314
-#, kde-format
-msgid "Player %1"
-msgstr "Chwaraewr %1"
-
-#: config.cpp:64
-msgid "No configuration options"
-msgstr "Dim dewisiadau ffurfweddu"
-
-#: scoreboard.cpp:28
-msgid "Total"
-msgstr "Cyfanswm"
-
-#: rc.cpp:7
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr ""
-"Kyfieithu: KD, jawz, dylunio, strempan, Thierry Vignaud, ,Launchpad "
-"Contributions:"
-
-#: rc.cpp:8
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
-
-#. i18n: file: kolfui.rc:17
-#. i18n: ectx: Menu (hole)
-#: rc.cpp:3 rc.cpp:11
-msgid "Ho&le"
-msgstr "Tw&ll"
-
-#. i18n: file: kolfui.rc:31
-#. i18n: ectx: Menu (go_course)
-#: rc.cpp:6 rc.cpp:14
-msgid "&Go"
-msgstr "&Ewch"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kolourpaint.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kolourpaint.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kolourpaint.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kolourpaint.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdegraphics/kolourpaint.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 03:57+0000\n"
-"PO-Revision-Date: 2012-03-14 17:02+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-11 16:37+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,484 +11,669 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:06+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:39+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: imagelib/transforms/kpTransformCrop_ImageSelection.cpp:246
+#: imagelib/transforms/kpTransformCrop_ImageSelection.cpp:248
+#: mainWindow/kpMainWindow_Edit.cpp:367 mainWindow/kpMainWindow_Image.cpp:314
 #: tools/selection/image/kpAbstractImageSelectionTool.cpp:81
-#: mainWindow/kpMainWindow_Edit.cpp:487 mainWindow/kpMainWindow_Image.cpp:296
 msgid "Selection: Create"
 msgstr ""
 
-#: imagelib/transforms/kpTransformCrop.cpp:45
+#: imagelib/transforms/kpTransformCrop.cpp:71
+#: imagelib/transforms/kpTransformCrop.cpp:73
 msgid "Set as Image"
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:384
+#: imagelib/transforms/kpTransformAutoCrop.cpp:389
 msgid "Remove Internal B&order"
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:386
+#: imagelib/transforms/kpTransformAutoCrop.cpp:391
 msgid "Remove Internal Border"
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:391
+#: imagelib/transforms/kpTransformAutoCrop.cpp:396
 msgid "Autocr&op"
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:393
+#: imagelib/transforms/kpTransformAutoCrop.cpp:398
 msgid "Autocrop"
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:620
+#: imagelib/transforms/kpTransformAutoCrop.cpp:627
 msgid ""
 "KolourPaint cannot remove the selection's internal border as it could not be "
 "located."
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:624
+#: imagelib/transforms/kpTransformAutoCrop.cpp:629
 msgctxt "@title:window"
 msgid "Cannot Remove Internal Border"
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:628
+#: imagelib/transforms/kpTransformAutoCrop.cpp:635
 msgid ""
 "KolourPaint cannot automatically crop the image as its border could not be "
 "located."
 msgstr ""
 
-#: imagelib/transforms/kpTransformAutoCrop.cpp:632
+#: imagelib/transforms/kpTransformAutoCrop.cpp:637
 msgctxt "@title:window"
 msgid "Cannot Autocrop"
 msgstr ""
 
-#: tools/polygonal/kpToolLine.cpp:58
-msgid "Line"
-msgstr "Llinell"
-
-#: tools/polygonal/kpToolLine.cpp:59
-msgid "Draws lines"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:123
+msgctxt "@title:window"
+msgid "Document Properties"
 msgstr ""
 
-#: tools/polygonal/kpToolLine.cpp:75
-#: tools/rectangular/kpToolRectangularBase.cpp:112
-msgid "Drag to draw."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:137
+msgid "Dots &Per Inch (DPI)"
 msgstr ""
 
-#: tools/polygonal/kpToolPolyline.cpp:42
-msgid "Connected Lines"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:147
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:216
+msgid "Horizontal:"
 msgstr ""
 
-#: tools/polygonal/kpToolPolyline.cpp:43
-msgid "Draws connected lines"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:149
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:164
+msgid "Unspecified"
 msgstr ""
 
-#: tools/polygonal/kpToolPolyline.cpp:59 tools/polygonal/kpToolPolygon.cpp:80
-msgid "Drag to draw the first line."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:152
+msgctxt "Horizontal DPI 'x' Vertical DPI"
+msgid " x "
 msgstr ""
 
-#: tools/polygonal/kpToolPolyline.cpp:105
-#: tools/polygonal/kpToolPolygon.cpp:153
-msgid "Left drag another line or right click to finish."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:162
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:224
+msgid "Vertical:"
 msgstr ""
 
-#: tools/polygonal/kpToolPolyline.cpp:109
-#: tools/polygonal/kpToolPolygon.cpp:157
-msgid "Right drag another line or left click to finish."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:182
+msgid ""
+"<qt><p><b>Dots Per Inch</b> (DPI) specifies the number of pixels of the "
+"image that should be printed inside one inch (2.54cm).</p><p>The higher the "
+"image's DPI, the smaller the printed image. Note that your printer is "
+"unlikely to produce high quality prints if you increase this to more than "
+"300 or 600 DPI, depending on the printer.</p><p>If you would like to print "
+"the image so that it is the same size as it is displayed on the screen, set "
+"the image's DPI values to be the same as the screen's.</p><p>If either DPI "
+"value is <b>Unspecified</b>, the image will also be printed to be the same "
+"size as on the screen.</p><p>Not all image formats support DPI values.  If "
+"the format you save in does not support them, they will not be "
+"saved.</p></qt>"
 msgstr ""
 
-#: tools/polygonal/kpToolPolygonalBase.cpp:433
-#: tools/flow/kpToolFlowBase.cpp:302
-#: tools/rectangular/kpToolRectangularBase.cpp:333
-#: tools/kpToolColorPicker.cpp:112 tools/kpToolZoom.cpp:207
-#: tools/kpToolFloodFill.cpp:131
-#: tools/selection/kpAbstractSelectionTool.cpp:243
-#: tools/selection/kpAbstractSelectionTool.cpp:489
-msgid "Let go of all the mouse buttons."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:213
+msgid "O&ffset"
 msgstr ""
 
-#: tools/polygonal/kpToolPolygon.cpp:61
-msgid "Polygon"
-msgstr "Amlochryn"
-
-#: tools/polygonal/kpToolPolygon.cpp:62
-msgid "Draws polygons"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:246
+msgid ""
+"<qt><p>The <b>Offset</b> is the relative position where this image should be "
+"placed, compared to other images.</p><p>Not all image formats support the "
+"<b>Offset</b> feature. If the format you save in does not support it, the "
+"values specified here will not be saved.</p></qt>"
 msgstr ""
 
-#: tools/polygonal/kpToolCurve.cpp:86
-msgid "Curve"
-msgstr "Cromlin"
-
-#: tools/polygonal/kpToolCurve.cpp:87
-msgid "Draws curves"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:262
+msgid "&Text Fields"
 msgstr ""
 
-#: tools/polygonal/kpToolCurve.cpp:103
-msgid "Drag out the start and end points."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:278
+msgid "&Add Row"
 msgstr ""
 
-#: tools/polygonal/kpToolCurve.cpp:142
-msgid "Left drag to set the first control point or right click to finish."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:283
+msgid "&Delete Row"
 msgstr ""
 
-#: tools/polygonal/kpToolCurve.cpp:147
-msgid "Right drag to set the first control point or left click to finish."
-msgstr ""
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:289
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:76
+msgid "&Reset"
+msgstr "&Ailosod"
 
-#: tools/polygonal/kpToolCurve.cpp:157
-msgid "Left drag to set the last control point or right click to finish."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:306
+msgid ""
+"<qt><p><b>Text Fields</b> provide extra information about the image. This is "
+"probably a comment area that you can freely write any text "
+"in.</p><p>However, this is format-specific so the fields could theoretically "
+"be computer-interpreted data - that you should not modify - but this is "
+"unlikely.</p><p>Not all image formats support <b>Text Fields</b>.  If the "
+"format you save in does not support them, they will not be saved.</p></qt>"
 msgstr ""
 
-#: tools/polygonal/kpToolCurve.cpp:162
-msgid "Right drag to set the last control point or left click to finish."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:397
+msgid "Key"
 msgstr ""
 
-#: tools/flow/kpToolEraser.cpp:42
-msgid "Eraser"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:397
+msgid "Value"
 msgstr ""
 
-#: tools/flow/kpToolEraser.cpp:43
-msgid "Lets you rub out mistakes"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:487
+#, kde-format
+msgid "The text value \"%1\" on line %2 requires a key."
 msgstr ""
 
-#: tools/flow/kpToolEraser.cpp:72
-msgid "Click or drag to erase."
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:513
+#, kde-format
+msgid ""
+"All text keys must be unique. The text key \"%1\" on lines %2 and %3 are "
+"identical."
 msgstr ""
 
-#: tools/flow/kpToolColorEraser.cpp:54 tools/flow/kpToolColorEraser.cpp:81
-msgid "Color Eraser"
+#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:785
+msgctxt "@title:window"
+msgid "Invalid Text Fields"
 msgstr ""
 
-#: tools/flow/kpToolColorEraser.cpp:55
-msgid "Replaces pixels of the foreground color with the background color"
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:91
+msgctxt "@title:window"
+msgid "More Image Effects (Selection)"
 msgstr ""
 
-#: tools/flow/kpToolColorEraser.cpp:116
-msgid "Click or drag to erase pixels of the foreground color."
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:93
+msgctxt "@title:window"
+msgid "More Image Effects"
 msgstr ""
 
-#: tools/flow/kpToolSpraycan.cpp:61
-msgid "Spraycan"
-msgstr ""
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:106
+msgid "&Effect:"
+msgstr "&Effaith:"
 
-#: tools/flow/kpToolSpraycan.cpp:61
-msgid "Sprays graffiti"
-msgstr ""
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:112
+#: commands/imagelib/effects/kpEffectBalanceCommand.cpp:44
+msgid "Balance"
+msgstr "Cyd-bwysedd"
 
-#: tools/flow/kpToolSpraycan.cpp:78
-msgid "Click or drag to spray graffiti."
-msgstr ""
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:113
+#: commands/imagelib/effects/kpEffectEmbossCommand.cpp:43
+msgid "Emboss"
+msgstr "Boglynnu"
 
-#: tools/flow/kpToolBrush.cpp:35
-msgid "Brush"
-msgstr "Brwsh"
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:114
+#: commands/imagelib/effects/kpEffectFlattenCommand.cpp:44
+msgid "Flatten"
+msgstr "Gwastadu"
 
-#: tools/flow/kpToolBrush.cpp:36
-msgid "Draw using brushes of different shapes and sizes"
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:115
+#: commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp:41
+msgid "Histogram Equalizer"
 msgstr ""
 
-#: tools/flow/kpToolBrush.cpp:50 tools/flow/kpToolPen.cpp:66
-msgid "Click to draw dots or drag to draw strokes."
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:116
+#: commands/imagelib/effects/kpEffectHSVCommand.cpp:37
+msgid "Hue, Saturation, Value"
 msgstr ""
 
-#: tools/flow/kpToolPen.cpp:50
-msgid "Pen"
-msgstr "Pen-ysgrifennu"
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:117
+#: commands/imagelib/effects/kpEffectInvertCommand.cpp:50
+msgid "Invert"
+msgstr "Gwrthdroi"
 
-#: tools/flow/kpToolPen.cpp:50
-msgid "Draws dots and freehand strokes"
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:118
+msgid "Reduce Colors"
 msgstr ""
 
-#: tools/rectangular/kpToolEllipse.cpp:37
-msgid "Ellipse"
-msgstr "Hirgylch"
-
-#: tools/rectangular/kpToolEllipse.cpp:38
-msgid "Draws ellipses and circles"
+#: dialogs/imagelib/effects/kpEffectsDialog.cpp:119
+msgid "Soften & Sharpen"
 msgstr ""
 
-#: tools/rectangular/kpToolRectangle.cpp:37
-msgid "Rectangle"
-msgstr "Hirsgwâr"
-
-#: tools/rectangular/kpToolRectangle.cpp:38
-msgid "Draws rectangles and squares"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:70
+msgctxt "@title:window"
+msgid "Skew Selection"
 msgstr ""
 
-#: tools/rectangular/kpToolRoundedRectangle.cpp:38
-msgid "Rounded Rectangle"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:70
+msgctxt "@title:window"
+msgid "Skew Image"
 msgstr ""
 
-#: tools/rectangular/kpToolRoundedRectangle.cpp:39
-msgid "Draws rectangles and squares with rounded corners"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:71
+msgid "After skew:"
 msgstr ""
 
-#: tools/kpTool_UserNotifications.cpp:72
-msgid "Right click to cancel."
-msgstr ""
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:101
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:136
+msgid "Angle"
+msgstr "Ongl"
 
-#: tools/kpTool_UserNotifications.cpp:74
-msgid "Left click to cancel."
-msgstr ""
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:108
+msgid "&Horizontal:"
+msgstr "Llorweddol:"
 
-#: tools/kpTool_UserNotifications.cpp:98
-#, kde-format
-msgid "%1: "
-msgstr "%1 : "
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:113
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:124
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:148
+msgid "degrees"
+msgstr "graddau"
 
-#: tools/kpToolColorPicker.cpp:47
-#: commands/tools/kpToolColorPickerCommand.cpp:61
-msgid "Color Picker"
-msgstr "Casglydd Lliwiau"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:119
+msgid "&Vertical:"
+msgstr "Fertigol:"
 
-#: tools/kpToolColorPicker.cpp:47
-msgid "Lets you select a color from the image"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:252
+#, kde-format
+msgid ""
+"<qt><p>Skewing the selection to %1x%2 may take a substantial amount of "
+"memory. This can reduce system responsiveness and cause other application "
+"resource problems.</p><p>Are you sure want to skew the selection?</p></qt>"
 msgstr ""
 
-#: tools/kpToolColorPicker.cpp:72
-msgid "Click to select a color."
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:260
+msgctxt "@title:window"
+msgid "Skew Selection?"
 msgstr ""
 
-#: tools/kpToolZoom.cpp:73
-msgid "Zoom"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:261
+msgid "Sk&ew Selection"
 msgstr ""
 
-#: tools/kpToolZoom.cpp:73
-msgid "Zooms in and out of the image"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:267
+#, kde-format
+msgid ""
+"<qt><p>Skewing the image to %1x%2 may take a substantial amount of memory. "
+"This can reduce system responsiveness and cause other application resource "
+"problems.</p><p>Are you sure want to skew the image?</p></qt>"
 msgstr ""
 
-#: tools/kpToolZoom.cpp:120
-msgid "Click to zoom in/out or left drag to zoom into a specific area."
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:275
+msgctxt "@title:window"
+msgid "Skew Image?"
 msgstr ""
 
-#: tools/kpToolFloodFill.cpp:52 commands/tools/kpToolFloodFillCommand.cpp:72
-msgid "Flood Fill"
+#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:276
+msgid "Sk&ew Image"
 msgstr ""
 
-#: tools/kpToolFloodFill.cpp:52
-msgid "Fills regions in the image"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:70
+msgctxt "@title:window"
+msgid "Rotate Selection"
 msgstr ""
 
-#: tools/kpToolFloodFill.cpp:69
-msgid "Click to fill a region."
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:70
+msgctxt "@title:window"
+msgid "Rotate Image"
 msgstr ""
 
-#: tools/kpTool.cpp:160
-#, kde-format
-msgctxt "<Tool Name> (<Single Accel Key>)"
-msgid "%1 (%2)"
-msgstr "%1(%2)"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:71
+msgid "After rotate:"
+msgstr ""
 
-#: tools/selection/image/kpToolRectSelection.cpp:42
-msgid "Selection (Rectangular)"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:99
+msgid "Direction"
+msgstr "Cyfeiriad:"
+
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:110
+msgid "Cou&nterclockwise"
 msgstr ""
 
-#: tools/selection/image/kpToolRectSelection.cpp:43
-msgid "Makes a rectangular selection"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:111
+msgid "C&lockwise"
+msgstr "C&locwedd"
+
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:140
+msgid "90 &degrees"
+msgstr "90 &gradd"
+
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:141
+msgid "180 d&egrees"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool.cpp:89
-msgid "Left drag to create selection."
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:142
+msgid "270 de&grees"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool.cpp:95
-msgid "Left drag to move selection."
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:144
+msgid "C&ustom:"
+msgstr "A&ddasiedig:"
+
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:271
+#, kde-format
+msgid ""
+"<qt><p>Rotating the selection to %1x%2 may take a substantial amount of "
+"memory. This can reduce system responsiveness and cause other application "
+"resource problems.</p><p>Are you sure want to rotate the selection?</p></qt>"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool.cpp:101
-msgid "Left drag to scale selection."
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:279
+msgctxt "@title:window"
+msgid "Rotate Selection?"
 msgstr ""
 
-#: tools/selection/image/kpToolFreeFormSelection.cpp:45
-msgid "Selection (Free-Form)"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:280
+msgid "Rotat&e Selection"
 msgstr ""
 
-#: tools/selection/image/kpToolFreeFormSelection.cpp:46
-msgid "Makes a free-form selection"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:286
+#, kde-format
+msgid ""
+"<qt><p>Rotating the image to %1x%2 may take a substantial amount of memory. "
+"This can reduce system responsiveness and cause other application resource "
+"problems.</p><p>Are you sure want to rotate the image?</p></qt>"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:170
-msgid "Selection: Opaque"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:294
+msgctxt "@title:window"
+msgid "Rotate Image?"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:171
-msgid "Selection: Transparent"
+#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:295
+msgid "Rotat&e Image"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:191
-msgid "Selection: Transparency Color"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:94
+msgctxt "@title:window"
+msgid "Resize / Scale"
 msgstr ""
 
-#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:211
-msgid "Selection: Transparency Color Similarity"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:159
+msgid "Ac&t on:"
 msgstr ""
 
-#: tools/selection/image/kpToolEllipticalSelection.cpp:43
-msgid "Selection (Elliptical)"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:165
+msgid "Entire Image"
 msgstr ""
 
-#: tools/selection/image/kpToolEllipticalSelection.cpp:44
-msgid "Makes an elliptical or circular selection"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:168
+#: layers/selections/image/kpAbstractImageSelection.cpp:202
+msgid "Selection"
+msgstr "Dewisiad"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:171
+msgid "Text Box"
 msgstr ""
 
-#: tools/selection/text/kpToolText_Move.cpp:42
-msgid "Left drag to move text box."
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:213
+msgid "Operation"
+msgstr "Gweithrediad"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:215
+msgid ""
+"<qt><ul><li><b>Resize</b>: The size of the picture will be increased by "
+"creating new areas to the right and/or bottom (filled in with the background "
+"color) or decreased by cutting it at the right and/or "
+"bottom.</li><li><b>Scale</b>: The picture will be expanded by duplicating "
+"pixels or squashed by dropping pixels.</li><li><b>Smooth Scale</b>: This is "
+"the same as <i>Scale</i> except that it blends neighboring pixels to produce "
+"a smoother looking picture.</li></ul></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_Move.cpp:61
-msgid "Text: Move Box"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:236
+msgid "&Resize"
+msgstr "Newid &Maint"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:241
+msgid "&Scale"
+msgstr "&Graddfa"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:246
+msgid "S&mooth Scale"
 msgstr ""
 
-#: tools/selection/text/kpToolText_SelectText.cpp:56
-msgid "Left click to change cursor position."
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:277
+#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:131
+msgid "Dimensions"
+msgstr "Dimensiynau"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:279
+msgid "Width:"
+msgstr "Lled:"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:281
+msgid "Height:"
+msgstr "Taldra:"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:284
+#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:133
+msgid "Original:"
+msgstr "Gwreiddiol :"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:288
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:295
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:305
+msgid "x"
+msgstr "x"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:293
+msgid "&New:"
+msgstr "&Newydd:"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:298
+msgid "&Percent:"
+msgstr "&Canran :"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:304
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:311
+#: dialogs/kpColorSimilarityDialog.cpp:79
+msgid "%"
+msgstr "%"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:313
+msgid "Keep &aspect ratio"
 msgstr ""
 
-#: tools/selection/text/kpToolText_Commands.cpp:70
-msgid "Text: Backspace"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:702
+#, kde-format
+msgid ""
+"<qt><p>Resizing the text box to %1x%2 may take a substantial amount of "
+"memory. This can reduce system responsiveness and cause other application "
+"resource problems.</p><p>Are you sure you want to resize the text "
+"box?</p></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_InputMethodEvents.cpp:111
-#: tools/selection/text/kpToolText_InputMethodEvents.cpp:178
-#: tools/selection/text/kpToolText_Commands.cpp:87
-msgid "Text: Delete"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:710
+msgctxt "@title:window"
+msgid "Resize Text Box?"
 msgstr ""
 
-#: tools/selection/text/kpToolText_Commands.cpp:104
-msgid "Text: New Line"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:711
+msgid "R&esize Text Box"
 msgstr ""
 
-#: tools/selection/text/kpToolText_InputMethodEvents.cpp:131
-#: tools/selection/text/kpToolText_InputMethodEvents.cpp:200
-#: tools/selection/text/kpToolText_Commands.cpp:121
-msgid "Text: Write"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:716
+#, kde-format
+msgid ""
+"<qt><p>Resizing the image to %1x%2 may take a substantial amount of memory. "
+"This can reduce system responsiveness and cause other application resource "
+"problems.</p><p>Are you sure you want to resize the image?</p></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_Create.cpp:48
-msgid "Left drag to create text box."
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:724
+#: mainWindow/kpMainWindow_Tools.cpp:651
+msgctxt "@title:window"
+msgid "Resize Image?"
 msgstr ""
 
-#: tools/selection/text/kpToolText_ResizeScale.cpp:42
-msgid "Left drag to resize text box."
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:725
+#: mainWindow/kpMainWindow_Tools.cpp:652
+msgid "R&esize Image"
+msgstr "N&ewid Maint Delwedd"
+
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:734
+#, kde-format
+msgid ""
+"<qt><p>Scaling the image to %1x%2 may take a substantial amount of memory. "
+"This can reduce system responsiveness and cause other application resource "
+"problems.</p><p>Are you sure you want to scale the image?</p></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:118
-msgid "Text: Opaque Background"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:742
+msgctxt "@title:window"
+msgid "Scale Image?"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:119
-msgid "Text: Transparent Background"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:743
+msgid "Scal&e Image"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:141
-msgid "Text: Swap Colors"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:748
+#, kde-format
+msgid ""
+"<qt><p>Scaling the selection to %1x%2 may take a substantial amount of "
+"memory. This can reduce system responsiveness and cause other application "
+"resource problems.</p><p>Are you sure you want to scale the "
+"selection?</p></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:161
-msgid "Text: Foreground Color"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:756
+msgctxt "@title:window"
+msgid "Scale Selection?"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:181
-msgid "Text: Background Color"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:757
+msgid "Scal&e Selection"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:217
-msgid "Text: Font"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:766
+#, kde-format
+msgid ""
+"<qt><p>Smooth Scaling the image to %1x%2 may take a substantial amount of "
+"memory. This can reduce system responsiveness and cause other application "
+"resource problems.</p><p>Are you sure you want to smooth scale the "
+"image?</p></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:244
-msgid "Text: Font Size"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:774
+msgctxt "@title:window"
+msgid "Smooth Scale Image?"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:266
-msgid "Text: Bold"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:775
+msgid "Smooth Scal&e Image"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:287
-msgid "Text: Italic"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:780
+#, kde-format
+msgid ""
+"<qt><p>Smooth Scaling the selection to %1x%2 may take a substantial amount "
+"of memory. This can reduce system responsiveness and cause other application "
+"resource problems.</p><p>Are you sure you want to smooth scale the "
+"selection?</p></qt>"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:308
-msgid "Text: Underline"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:788
+msgctxt "@title:window"
+msgid "Smooth Scale Selection?"
 msgstr ""
 
-#: tools/selection/text/kpToolText_TextStyle.cpp:329
-msgid "Text: Strike Through"
+#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:789
+msgid "Smooth Scal&e Selection"
 msgstr ""
 
-#: tools/selection/text/kpToolText.cpp:60
-#: layers/selections/text/kpTextSelection.cpp:136
-msgid "Text"
-msgstr "Testun"
+#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:137
+#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:242
+#: mainWindow/kpMainWindow_StatusBar.cpp:86
+#: mainWindow/kpMainWindow_StatusBar.cpp:230
+#, kde-format
+msgid "%1 x %2"
+msgstr "%1 x %2"
 
-#: tools/selection/text/kpToolText.cpp:60
-msgid "Writes text"
+#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:166
+#: dialogs/kpColorSimilarityDialog.cpp:53
+msgid "Preview"
+msgstr "Rhagolwg"
+
+#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:173
+#: dialogs/kpColorSimilarityDialog.cpp:58
+msgid "&Update"
 msgstr ""
 
-#: tools/selection/text/kpToolText.cpp:100
-#: mainWindow/kpMainWindow_Edit.cpp:486 mainWindow/kpMainWindow_Edit.cpp:568
-#: mainWindow/kpMainWindow_Image.cpp:298
-msgid "Text: Create Box"
+#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:62
+msgid "Save Preview"
 msgstr ""
 
-#: tools/selection/kpAbstractSelectionTool_Move.cpp:311
-msgid "Selection: Move"
+#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:68
+msgctxt "@title:window"
+msgid "Save Preview"
 msgstr ""
 
-#: tools/selection/kpAbstractSelectionTool_Move.cpp:331
-#, kde-format
-msgid "%1: Smear"
+#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:140
+#, kde-format
+msgid "1 byte (approx. %2%)"
+msgid_plural "%1 bytes (approx. %2%)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: dialogs/kpColorSimilarityDialog.cpp:47
+msgctxt "@title:window"
+msgid "Color Similarity"
+msgstr ""
+
+#: dialogs/kpColorSimilarityDialog.cpp:72
+msgid "&RGB Color Cube Distance"
+msgstr ""
+
+#: dialogs/kpColorSimilarityDialog.cpp:80
+msgid "Exact Match"
+msgstr "Cydweddiad Union"
+
+#: dialogs/kpColorSimilarityDialog.cpp:85
+msgid ""
+"<a href=\"dummy_to_make_link_clickable\">What is Color Similarity?</a>"
+msgstr ""
+
+#: views/kpUnzoomedThumbnailView.cpp:88
+msgid "Unzoomed Mode - Thumbnail"
+msgstr ""
+
+#: views/kpZoomedThumbnailView.cpp:66
+#, kde-format
+msgid "%1% - Thumbnail"
+msgstr ""
+
+#: commands/imagelib/effects/kpEffectInvertCommand.cpp:50
+#: commands/imagelib/effects/kpEffectInvertCommand.cpp:58
+msgid "Invert Colors"
+msgstr ""
+
+#: commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp:58
+msgid "Soften"
+msgstr ""
+
+#: commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp:60
+msgid "Sharpen"
+msgstr "Miniogi"
+
+#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:57
+msgid "Reduce to Monochrome (Dithered)"
 msgstr ""
 
-#: kpViewScrollableContainer.cpp:158 kpViewScrollableContainer.cpp:954
-#: kpViewScrollableContainer.cpp:960 kpViewScrollableContainer.cpp:966
-msgid "Left drag the handle to resize the image."
+#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:59
+msgid "Reduce to Monochrome"
 msgstr ""
 
-#: kpViewScrollableContainer.cpp:232
-msgid "Resize Image: Let go of all the mouse buttons."
+#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:64
+msgid "Reduce to 256 Color (Dithered)"
 msgstr ""
 
-#: kpViewScrollableContainer.cpp:262
-msgid "Resize Image: Right click to cancel."
+#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:66
+msgid "Reduce to 256 Color"
 msgstr ""
 
-#: commands/imagelib/transforms/kpTransformSkewCommand.cpp:75
-msgid "Skew"
+#: commands/imagelib/effects/kpEffectClearCommand.cpp:59
+msgid "Clear"
 msgstr ""
 
+#: commands/imagelib/effects/kpEffectClearCommand.cpp:62
+#: commands/imagelib/effects/kpEffectCommandBase.cpp:67
 #: commands/imagelib/transforms/kpTransformSkewCommand.cpp:78
 #: commands/imagelib/transforms/kpTransformFlipCommand.cpp:86
 #: commands/imagelib/transforms/kpTransformRotateCommand.cpp:75
-#: commands/imagelib/effects/kpEffectCommandBase.cpp:67
-#: commands/imagelib/effects/kpEffectClearCommand.cpp:62
 #, kde-format
 msgid "Selection: %1"
 msgstr "Dewisiad : %1"
 
-#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:110
-#: commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp:62
-msgid "Text: Resize Box"
-msgstr ""
-
-#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:115
-msgid "Selection: Scale"
-msgstr ""
-
-#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:117
-#: commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp:63
-msgid "Selection: Smooth Scale"
+#: commands/imagelib/effects/kpEffectGrayscaleCommand.cpp:41
+msgid "Reduce to Grayscale"
 msgstr ""
 
-#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:125
-msgid "Resize"
-msgstr "Newid maint"
-
-#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:127
-msgid "Scale"
-msgstr "Chwyddo"
-
-#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:129
-msgid "Smooth Scale"
+#: commands/imagelib/transforms/kpTransformSkewCommand.cpp:75
+msgid "Skew"
 msgstr ""
 
 #: commands/imagelib/transforms/kpTransformFlipCommand.cpp:69
@@ -507,349 +692,178 @@
 msgid "Flip vertically"
 msgstr "Troi Drosodd yn Fertigol"
 
-#: commands/imagelib/transforms/kpTransformRotateCommand.cpp:72
-msgid "Rotate"
-msgstr "Cylchdroi"
-
-#: commands/imagelib/effects/kpEffectBalanceCommand.cpp:44
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:112
-msgid "Balance"
-msgstr "Cyd-bwysedd"
-
-#: commands/imagelib/effects/kpEffectGrayscaleCommand.cpp:41
-msgid "Reduce to Grayscale"
-msgstr ""
-
-#: commands/imagelib/effects/kpEffectHSVCommand.cpp:40
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:116
-msgid "Hue, Saturation, Value"
-msgstr ""
-
-#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:68
-msgid "Reduce to Monochrome (Dithered)"
-msgstr ""
-
-#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:70
-msgid "Reduce to Monochrome"
+#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:110
+#: commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp:62
+msgid "Text: Resize Box"
 msgstr ""
 
-#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:75
-msgid "Reduce to 256 Color (Dithered)"
+#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:115
+msgid "Selection: Scale"
 msgstr ""
 
-#: commands/imagelib/effects/kpEffectReduceColorsCommand.cpp:77
-msgid "Reduce to 256 Color"
+#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:117
+#: commands/tools/selection/kpToolSelectionResizeScaleCommand.cpp:63
+msgid "Selection: Smooth Scale"
 msgstr ""
 
-#: commands/imagelib/effects/kpEffectFlattenCommand.cpp:44
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:114
-msgid "Flatten"
-msgstr "Gwastadu"
+#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:125
+msgid "Resize"
+msgstr "Newid maint"
 
-#: commands/imagelib/effects/kpEffectClearCommand.cpp:59
-msgid "Clear"
-msgstr ""
+#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:127
+msgid "Scale"
+msgstr "Chwyddo"
 
-#: commands/imagelib/effects/kpEffectToneEnhanceCommand.cpp:41
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:115
-msgid "Histogram Equalizer"
+#: commands/imagelib/transforms/kpTransformResizeScaleCommand.cpp:129
+msgid "Smooth Scale"
 msgstr ""
 
-#: commands/imagelib/effects/kpEffectEmbossCommand.cpp:43
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:113
-msgid "Emboss"
-msgstr "Boglynnu"
-
-#: commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp:58
-msgid "Soften"
-msgstr ""
+#: commands/imagelib/transforms/kpTransformRotateCommand.cpp:72
+msgid "Rotate"
+msgstr "Cylchdroi"
 
-#: commands/imagelib/effects/kpEffectBlurSharpenCommand.cpp:60
-msgid "Sharpen"
-msgstr "Miniogi"
+#: commands/tools/kpToolColorPickerCommand.cpp:61
+#: tools/kpToolColorPicker.cpp:47
+msgid "Color Picker"
+msgstr "Casglydd Lliwiau"
 
-#: commands/imagelib/effects/kpEffectInvertCommand.cpp:50
-#: commands/imagelib/effects/kpEffectInvertCommand.cpp:58
-msgid "Invert Colors"
+#: commands/tools/kpToolFloodFillCommand.cpp:78 tools/kpToolFloodFill.cpp:55
+msgid "Flood Fill"
 msgstr ""
 
-#: commands/imagelib/effects/kpEffectInvertCommand.cpp:50
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:117
-msgid "Invert"
-msgstr "Gwrthdroi"
-
-#: commands/kpCommandHistoryBase.cpp:447
+#: commands/kpCommandHistoryBase.cpp:454
 #, kde-format
 msgid "&Undo: %1"
 msgstr "&Dadwneud: %1"
 
-#: commands/kpCommandHistoryBase.cpp:449
+#: commands/kpCommandHistoryBase.cpp:456
 msgid "&Undo"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:458
+#: commands/kpCommandHistoryBase.cpp:465
 #, kde-format
 msgid "&Redo: %1"
 msgstr "&Ail-wneud: %1"
 
-#: commands/kpCommandHistoryBase.cpp:460
+#: commands/kpCommandHistoryBase.cpp:467
 msgid "&Redo"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:470
+#: commands/kpCommandHistoryBase.cpp:477
 #, kde-format
 msgid "Undo: %1"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:472 commands/kpCommandHistoryBase.cpp:663
+#: commands/kpCommandHistoryBase.cpp:479 commands/kpCommandHistoryBase.cpp:670
 msgid "Undo"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:481
+#: commands/kpCommandHistoryBase.cpp:488
 #, kde-format
 msgid "Redo: %1"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:483 commands/kpCommandHistoryBase.cpp:684
+#: commands/kpCommandHistoryBase.cpp:490 commands/kpCommandHistoryBase.cpp:691
 msgid "Redo"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:626
+#: commands/kpCommandHistoryBase.cpp:633
 #, kde-format
 msgid "%1: %2"
 msgstr ""
 
-#: commands/kpCommandHistoryBase.cpp:636
+#: commands/kpCommandHistoryBase.cpp:643
 #, kde-format
 msgid "%1 more item"
 msgid_plural "%1 more items"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mainWindow/kpMainWindow_View_Thumbnail.cpp:69
-msgid "Show T&humbnail"
-msgstr ""
-
-#: mainWindow/kpMainWindow_View_Thumbnail.cpp:80
-msgid "Zoo&med Thumbnail Mode"
+#: kpViewScrollableContainer.cpp:160 kpViewScrollableContainer.cpp:826
+#: kpViewScrollableContainer.cpp:830 kpViewScrollableContainer.cpp:834
+msgid "Left drag the handle to resize the image."
 msgstr ""
 
-#: mainWindow/kpMainWindow_View_Thumbnail.cpp:90
-msgid "Enable Thumbnail &Rectangle"
+#: kpViewScrollableContainer.cpp:198
+msgid "Resize Image: Let go of all the mouse buttons."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Settings.cpp:69
-msgid "Show &Path"
-msgstr "Dango&s Llwybr"
-
-#: mainWindow/kpMainWindow_Tools.cpp:132
-msgid "Previous Tool Option (Group #1)"
+#: kpViewScrollableContainer.cpp:231
+msgid "Resize Image: Right click to cancel."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:138
-msgid "Next Tool Option (Group #1)"
+#: mainWindow/kpMainWindow_Edit.cpp:98
+msgid "Paste in &New Window"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:144
-msgid "Previous Tool Option (Group #2)"
+#: mainWindow/kpMainWindow_Edit.cpp:105
+msgid "&Delete Selection"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:150
-msgid "Next Tool Option (Group #2)"
+#: mainWindow/kpMainWindow_Edit.cpp:113
+msgid "C&opy to File..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:162
-msgid "&Draw Opaque"
+#: mainWindow/kpMainWindow_Edit.cpp:117
+msgid "Paste &From File..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:167
-msgid "Draw With Color Similarity..."
+#: mainWindow/kpMainWindow_Edit.cpp:366 mainWindow/kpMainWindow_Edit.cpp:440
+#: mainWindow/kpMainWindow_Image.cpp:316
+#: tools/selection/text/kpToolText.cpp:93
+msgid "Text: Create Box"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:175
-msgid "Tool Box"
+#: mainWindow/kpMainWindow_Edit.cpp:446
+msgid "Text: Paste"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Tools.cpp:625
-#, kde-format
+#: mainWindow/kpMainWindow_Edit.cpp:617
 msgid ""
-"<qt><p>Resizing the image to %1x%2 may take a substantial amount of memory. "
-"This can reduce system responsiveness and cause other application resource "
-"problems.</p><p>Are you sure want to resize the image?</p></qt>"
-msgstr ""
-
-#: mainWindow/kpMainWindow_Tools.cpp:670
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:717
-msgctxt "@title:window"
-msgid "Resize Image?"
-msgstr ""
-
-#: mainWindow/kpMainWindow_Tools.cpp:636
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:718
-msgid "R&esize Image"
-msgstr "N&ewid Maint Delwedd"
-
-#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:137
-#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:242
-#, kde-format
-msgid "%1 x %2"
-msgstr "%1 x %2"
-
-#: mainWindow/kpMainWindow_StatusBar.cpp:146
-#, kde-format
-msgid "%1,%2"
-msgstr ""
-
-#: mainWindow/kpMainWindow_StatusBar.cpp:153
-#, kde-format
-msgid "%1,%2 - %3,%4"
-msgstr ""
-
-#: mainWindow/kpMainWindow_StatusBar.cpp:194
-#: mainWindow/kpMainWindow_StatusBar.cpp:223
-#: widgets/toolbars/options/kpToolWidgetEraserSize.cpp:119
-#: widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp:92
-#, kde-format
-msgid "%1x%2"
-msgstr ""
-
-#: mainWindow/kpMainWindow_StatusBar.cpp:249
-#, kde-format
-msgid "%1bpp"
-msgstr ""
-
-#: mainWindow/kpMainWindow_StatusBar.cpp:273
-#: mainWindow/kpMainWindow_View_Zoom.cpp:90
-#, kde-format
-msgid "%1%"
-msgstr "%1%"
-
-#: mainWindow/kpMainWindow_File.cpp:99
-msgid "E&xport..."
-msgstr "&Allforio..."
-
-#: mainWindow/kpMainWindow_File.cpp:104
-msgid "Scan..."
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:114
-msgid "Acquire Screenshot"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:109
-msgid "Properties"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:115
-msgid "Reloa&d"
-msgstr "Ail-l&wytho"
-
-#: mainWindow/kpMainWindow_File.cpp:464
-msgctxt "@title:window"
-msgid "Open Image"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:526
-msgid "Scanning support is not installed."
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:527
-msgid "No Scanning Support"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:652
-msgid "Snapshot Delay"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:655
-msgid " second"
-msgid_plural " seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: mainWindow/kpMainWindow_File.cpp:656
-msgid "No delay"
+"<qt>KolourPaint cannot paste the contents of the clipboard as it has an "
+"unknown format.</qt>"
 msgstr ""
 
-#: mainWindow/kpMainWindow_File.cpp:658
-msgid "Hide Main Window"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:660
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:123
-msgid "Document Properties"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:954
-msgctxt "@title:window"
-msgid "Save Image As"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:1003
-msgctxt "@title:window"
-msgid "Export"
-msgstr ""
-
-#: mainWindow/kpMainWindow_File.cpp:1015
-#, kde-format
-msgid ""
-"The document \"%1\" has been modified.\n"
-"Reloading will lose all changes since you last saved it.\n"
-"Are you sure?"
+#: mainWindow/kpMainWindow_Edit.cpp:619
+msgid "Cannot Paste"
 msgstr ""
 
-#: mainWindow/kpMainWindow_File.cpp:1020 mainWindow/kpMainWindow_File.cpp:1030
-#: mainWindow/kpMainWindow_Colors.cpp:347
-#: mainWindow/kpMainWindow_Colors.cpp:360
-#: mainWindow/kpMainWindow_Colors.cpp:369
-msgid "&Reload"
+#: mainWindow/kpMainWindow_Edit.cpp:698
+msgid "Text: Delete Box"
 msgstr ""
 
-#: mainWindow/kpMainWindow_File.cpp:1025
-#, kde-format
-msgid ""
-"The document \"%1\" has been modified.\n"
-"Reloading will lose all changes.\n"
-"Are you sure?"
+#: mainWindow/kpMainWindow_Edit.cpp:699
+msgid "Selection: Delete"
 msgstr ""
 
-#: mainWindow/kpMainWindow_File.cpp:1320
-msgctxt "@title:window"
-msgid "Print Image"
+#: mainWindow/kpMainWindow_Edit.cpp:770
+msgid "Text: Finish"
 msgstr ""
 
-#: mainWindow/kpMainWindow_File.cpp:1352
-msgid ""
-"You must save this image before sending it.\n"
-"Do you want to save it?"
+#: mainWindow/kpMainWindow_Edit.cpp:771
+msgid "Selection: Deselect"
 msgstr ""
 
-#: mainWindow/kpMainWindow_File.cpp:1510
-#, kde-format
-msgid ""
-"The document \"%1\" has been modified.\n"
-"Do you want to save it?"
+#: mainWindow/kpMainWindow_Edit.cpp:850
+msgctxt "@title:window"
+msgid "Copy to File"
 msgstr ""
 
-#: mainWindow/kpMainWindow_View.cpp:76
-msgid "Show &Grid"
-msgstr "Dango&s Grid"
+#: mainWindow/kpMainWindow_Edit.cpp:898
+msgctxt "@title:window"
+msgid "Paste From File"
+msgstr ""
 
-#: mainWindow/kpMainWindow_View_Zoom.cpp:111
-msgid "&Zoom"
+#: mainWindow/kpMainWindow_View_Thumbnail.cpp:69
+msgid "Show T&humbnail"
 msgstr ""
 
-#: mainWindow/kpMainWindow_View_Zoom.cpp:191
-#, kde-format
-msgid ""
-"Setting the zoom level to a value that is not a multiple of 100% results in "
-"imprecise editing and redraw glitches.\n"
-"Do you really want to set to zoom level to %1%?"
+#: mainWindow/kpMainWindow_View_Thumbnail.cpp:80
+msgid "Zoo&med Thumbnail Mode"
 msgstr ""
 
-#: mainWindow/kpMainWindow_View_Zoom.cpp:196
-#, kde-format
-msgid "Set Zoom Level to %1%"
+#: mainWindow/kpMainWindow_View_Thumbnail.cpp:90
+msgid "Enable Thumbnail &Rectangle"
 msgstr ""
 
 #: mainWindow/kpMainWindow_Text.cpp:60
@@ -876,163 +890,189 @@
 msgid "Strike Through"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:141
-msgid "Paste in &New Window"
-msgstr ""
+#: mainWindow/kpMainWindow_View.cpp:76
+msgid "Show &Grid"
+msgstr "Dango&s Grid"
 
-#: mainWindow/kpMainWindow_Edit.cpp:148
-msgid "&Delete Selection"
+#: mainWindow/kpMainWindow_StatusBar.cpp:149
+#, kde-format
+msgid "%1,%2"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:156
-msgid "C&opy to File..."
+#: mainWindow/kpMainWindow_StatusBar.cpp:156
+#, kde-format
+msgid "%1,%2 - %3,%4"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:160
-msgid "Paste &From File..."
+#: mainWindow/kpMainWindow_StatusBar.cpp:199
+#: widgets/toolbars/options/kpToolWidgetEraserSize.cpp:115
+#: widgets/toolbars/options/kpToolWidgetSpraycanSize.cpp:92
+#, kde-format
+msgid "%1x%2"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:574
-msgid "Text: Paste"
+#: mainWindow/kpMainWindow_StatusBar.cpp:258
+#, kde-format
+msgid "%1bpp"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:755
-msgid ""
-"<qt><p>KolourPaint cannot paste the contents of the clipboard as the data "
-"unexpectedly disappeared.</p><p>This usually occurs if the application which "
-"was responsible for the clipboard contents has been closed.</p></qt>"
+#: mainWindow/kpMainWindow_StatusBar.cpp:284
+#: mainWindow/kpMainWindow_View_Zoom.cpp:91
+#, kde-format
+msgid "%1%"
+msgstr "%1%"
+
+#: mainWindow/kpMainWindow_Settings.cpp:67
+msgid "Show &Path"
+msgstr "Dango&s Llwybr"
+
+#: mainWindow/kpMainWindow_Tools.cpp:136
+msgid "Previous Tool Option (Group #1)"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:371 mainWindow/kpMainWindow_Edit.cpp:761
-msgid "Cannot Paste"
+#: mainWindow/kpMainWindow_Tools.cpp:142
+msgid "Next Tool Option (Group #1)"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:855
-msgid "Text: Delete Box"
+#: mainWindow/kpMainWindow_Tools.cpp:148
+msgid "Previous Tool Option (Group #2)"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:856
-msgid "Selection: Delete"
+#: mainWindow/kpMainWindow_Tools.cpp:154
+msgid "Next Tool Option (Group #2)"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:925
-msgid "Text: Finish"
+#: mainWindow/kpMainWindow_Tools.cpp:166
+msgid "&Draw Opaque"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:926
-msgid "Selection: Deselect"
+#: mainWindow/kpMainWindow_Tools.cpp:171
+msgid "Draw With Color Similarity..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:882
-msgctxt "@title:window"
-msgid "Copy to File"
+#: mainWindow/kpMainWindow_Tools.cpp:182
+msgid "Tool Box"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Edit.cpp:930
-msgctxt "@title:window"
-msgid "Paste From File"
+#: mainWindow/kpMainWindow_Tools.cpp:641
+#, kde-format
+msgid ""
+"<qt><p>Resizing the image to %1x%2 may take a substantial amount of memory. "
+"This can reduce system responsiveness and cause other application resource "
+"problems.</p><p>Are you sure want to resize the image?</p></qt>"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:59
-msgid "Use KolourPaint Defaults"
+#: mainWindow/kpMainWindow_File.cpp:103
+msgid "E&xport..."
+msgstr "&Allforio..."
+
+#: mainWindow/kpMainWindow_File.cpp:108
+msgid "Scan..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:64
-msgctxt "@item:inmenu colors"
-msgid "Use KDE's"
+#: mainWindow/kpMainWindow_File.cpp:113
+msgid "Acquire Screenshot"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:73
-msgctxt "@item:inmenu colors"
-msgid "&Open..."
+#: mainWindow/kpMainWindow_File.cpp:117
+msgid "Properties"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:78
-msgctxt "@item:inmenu colors"
+#: mainWindow/kpMainWindow_File.cpp:123
 msgid "Reloa&d"
-msgstr ""
+msgstr "Ail-l&wytho"
 
-#: mainWindow/kpMainWindow_Colors.cpp:84
-msgctxt "@item:inmenu colors"
-msgid "&Save"
+#: mainWindow/kpMainWindow_File.cpp:463
+msgctxt "@title:window"
+msgid "Open Image"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:89
-msgctxt "@item:inmenu colors"
-msgid "Save &As..."
+#: mainWindow/kpMainWindow_File.cpp:536
+msgid "Scanning support is not installed."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:95
-msgctxt "@item:inmenu colors"
-msgid "Add Row"
+#: mainWindow/kpMainWindow_File.cpp:537
+msgid "No Scanning Support"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:100
-msgctxt "@item:inmenu colors"
-msgid "Delete Last Row"
+#: mainWindow/kpMainWindow_File.cpp:651
+msgid "Snapshot Delay"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:111
-msgid "Color Box"
+#: mainWindow/kpMainWindow_File.cpp:654
+msgid " second"
+msgid_plural " seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: mainWindow/kpMainWindow_File.cpp:655
+msgid "No delay"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:187
-#, kde-format
-msgid ""
-"The color palette \"%1\" has been modified.\n"
-"Do you want to save it?"
+#: mainWindow/kpMainWindow_File.cpp:657
+msgid "Hide Main Window"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:199
-#, kde-format
-msgid ""
-"The KDE color palette \"%1\" has been modified.\n"
-"Do you want to save it to a file?"
+#: mainWindow/kpMainWindow_File.cpp:710
+msgid "Document Properties"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:208
-msgid ""
-"The default color palette has been modified.\n"
-"Do you want to save it to a file?"
+#: mainWindow/kpMainWindow_File.cpp:945
+msgctxt "@title:window"
+msgid "Save Image As"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:317
+#: mainWindow/kpMainWindow_File.cpp:994
 msgctxt "@title:window"
-msgid "Open Color Palette"
+msgid "Export"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:342
+#: mainWindow/kpMainWindow_File.cpp:1059
 #, kde-format
 msgid ""
-"The color palette \"%1\" has been modified.\n"
+"The document \"%1\" has been modified.\n"
 "Reloading will lose all changes since you last saved it.\n"
 "Are you sure?"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:355
+#: mainWindow/kpMainWindow_File.cpp:1064 mainWindow/kpMainWindow_File.cpp:1074
+#: mainWindow/kpMainWindow_Colors.cpp:347
+#: mainWindow/kpMainWindow_Colors.cpp:360
+#: mainWindow/kpMainWindow_Colors.cpp:369
+msgid "&Reload"
+msgstr ""
+
+#: mainWindow/kpMainWindow_File.cpp:1069
 #, kde-format
 msgid ""
-"The KDE color palette \"%1\" has been modified.\n"
+"The document \"%1\" has been modified.\n"
 "Reloading will lose all changes.\n"
 "Are you sure?"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:365
+#: mainWindow/kpMainWindow_File.cpp:1311
+msgctxt "@title:window"
+msgid "Print Image"
+msgstr ""
+
+#: mainWindow/kpMainWindow_File.cpp:1400
 msgid ""
-"The default color palette has been modified.\n"
-"Reloading will lose all changes.\n"
-"Are you sure?"
+"You must save this image before sending it.\n"
+"Do you want to save it?"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Colors.cpp:418
-msgid "Save Color Palette As"
+#: mainWindow/kpMainWindow_File.cpp:1441
+#, kde-format
+msgid ""
+"The document \"%1\" has been modified.\n"
+"Do you want to save it?"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:113
+#: mainWindow/kpMainWindow_Image.cpp:119
 msgid "R&esize / Scale..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:118
+#: mainWindow/kpMainWindow_Image.cpp:124
 msgid "Se&t as Image (Crop)"
 msgstr ""
 
@@ -1044,1005 +1084,983 @@
 msgid "Mirror (horizontally)"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:133
+#: mainWindow/kpMainWindow_Image.cpp:144
 msgid "&Rotate..."
 msgstr "C&ylchdroi ..."
 
-#: mainWindow/kpMainWindow_Image.cpp:139
+#: mainWindow/kpMainWindow_Image.cpp:150
 msgid "Rotate &Left"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:145
+#: mainWindow/kpMainWindow_Image.cpp:156
 msgid "Rotate Righ&t"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:151
+#: mainWindow/kpMainWindow_Image.cpp:162
 msgid "S&kew..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:156
+#: mainWindow/kpMainWindow_Image.cpp:167
 msgid "Reduce to Mo&nochrome (Dithered)"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:160
+#: mainWindow/kpMainWindow_Image.cpp:171
 msgid "Reduce to &Grayscale"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:164
+#: mainWindow/kpMainWindow_Image.cpp:175
 msgid "&Invert Colors"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:169
+#: mainWindow/kpMainWindow_Image.cpp:180
 msgid "C&lear"
 msgstr "&Gwaredu"
 
-#: mainWindow/kpMainWindow_Image.cpp:174
+#: mainWindow/kpMainWindow_Image.cpp:185
 msgid "&More Effects..."
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:210
+#: mainWindow/kpMainWindow_Image.cpp:225
 msgctxt ""
 "Image/Selection Menu caption - make sure the translation has the same accel "
 "as the Select&ion translation"
 msgid "&Image"
 msgstr ""
 
-#: mainWindow/kpMainWindow_Image.cpp:214
+#: mainWindow/kpMainWindow_Image.cpp:229
 msgctxt ""
 "Image/Selection Menu caption - make sure that translation has the same accel "
 "as the &Image translation"
 msgid "Select&ion"
 msgstr ""
 
-#: views/kpZoomedThumbnailView.cpp:66
-#, kde-format
-msgid "%1% - Thumbnail"
+#: mainWindow/kpMainWindow_Colors.cpp:59
+msgid "Use KolourPaint Defaults"
 msgstr ""
 
-#: views/kpUnzoomedThumbnailView.cpp:83
-msgid "Unzoomed Mode - Thumbnail"
+#: mainWindow/kpMainWindow_Colors.cpp:64
+msgctxt "@item:inmenu colors"
+msgid "Use KDE's"
 msgstr ""
 
-#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:62
-#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:68
-msgid "Save Preview"
+#: mainWindow/kpMainWindow_Colors.cpp:73
+msgctxt "@item:inmenu colors"
+msgid "&Open..."
 msgstr ""
 
-#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:68
-msgctxt "@title:window"
-msgid "Save Preview"
+#: mainWindow/kpMainWindow_Colors.cpp:78
+msgctxt "@item:inmenu colors"
+msgid "Reloa&d"
 msgstr ""
 
-#: dialogs/kpDocumentSaveOptionsPreviewDialog.cpp:140
-#, kde-format
-msgid "1 byte (approx. %2%)"
-msgid_plural "%1 bytes (approx. %2%)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:70
-msgctxt "@title:window"
-msgid "Rotate Selection"
+#: mainWindow/kpMainWindow_Colors.cpp:84
+msgctxt "@item:inmenu colors"
+msgid "&Save"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:70
-msgctxt "@title:window"
-msgid "Rotate Image"
+#: mainWindow/kpMainWindow_Colors.cpp:89
+msgctxt "@item:inmenu colors"
+msgid "Save &As..."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:71
-msgid "After rotate:"
+#: mainWindow/kpMainWindow_Colors.cpp:95
+msgctxt "@item:inmenu colors"
+msgid "Add Row"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:99
-#: dialogs/imagelib/transforms/kpTransformFlipDialog.cpp:56
-msgid "Direction"
-msgstr "Cyfeiriad:"
-
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:110
-msgid "Cou&nterclockwise"
+#: mainWindow/kpMainWindow_Colors.cpp:100
+msgctxt "@item:inmenu colors"
+msgid "Delete Last Row"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:111
-msgid "C&lockwise"
-msgstr "C&locwedd"
-
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:136
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:101
-msgid "Angle"
-msgstr "Ongl"
+#: mainWindow/kpMainWindow_Colors.cpp:111
+msgid "Color Box"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:140
-msgid "90 &degrees"
-msgstr "90 &gradd"
+#: mainWindow/kpMainWindow_Colors.cpp:187
+#, kde-format
+msgid ""
+"The color palette \"%1\" has been modified.\n"
+"Do you want to save it?"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:141
-msgid "180 d&egrees"
+#: mainWindow/kpMainWindow_Colors.cpp:199
+#, kde-format
+msgid ""
+"The KDE color palette \"%1\" has been modified.\n"
+"Do you want to save it to a file?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:142
-msgid "270 de&grees"
+#: mainWindow/kpMainWindow_Colors.cpp:208
+msgid ""
+"The default color palette has been modified.\n"
+"Do you want to save it to a file?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:144
-msgid "C&ustom:"
-msgstr "A&ddasiedig:"
-
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:148
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:113
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:124
-msgid "degrees"
-msgstr "graddau"
+#: mainWindow/kpMainWindow_Colors.cpp:317
+msgctxt "@title:window"
+msgid "Open Color Palette"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:271
+#: mainWindow/kpMainWindow_Colors.cpp:342
 #, kde-format
 msgid ""
-"<qt><p>Rotating the selection to %1x%2 may take a substantial amount of "
-"memory. This can reduce system responsiveness and cause other application "
-"resource problems.</p><p>Are you sure want to rotate the selection?</p></qt>"
+"The color palette \"%1\" has been modified.\n"
+"Reloading will lose all changes since you last saved it.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:279
-msgctxt "@title:window"
-msgid "Rotate Selection?"
+#: mainWindow/kpMainWindow_Colors.cpp:355
+#, kde-format
+msgid ""
+"The KDE color palette \"%1\" has been modified.\n"
+"Reloading will lose all changes.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:280
-msgid "Rotat&e Selection"
+#: mainWindow/kpMainWindow_Colors.cpp:365
+msgid ""
+"The default color palette has been modified.\n"
+"Reloading will lose all changes.\n"
+"Are you sure?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:286
-#, kde-format
-msgid ""
-"<qt><p>Rotating the image to %1x%2 may take a substantial amount of memory. "
-"This can reduce system responsiveness and cause other application resource "
-"problems.</p><p>Are you sure want to rotate the image?</p></qt>"
+#: mainWindow/kpMainWindow_Colors.cpp:418
+msgid "Save Color Palette As"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:294
-msgctxt "@title:window"
-msgid "Rotate Image?"
+#: mainWindow/kpMainWindow_View_Zoom.cpp:113
+msgid "&Zoom"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformRotateDialog.cpp:295
-msgid "Rotat&e Image"
+#: mainWindow/kpMainWindow_View_Zoom.cpp:194
+#, kde-format
+msgid ""
+"Setting the zoom level to a value that is not a multiple of 100% results in "
+"imprecise editing and redraw glitches.\n"
+"Do you really want to set to zoom level to %1%?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:70
-msgctxt "@title:window"
-msgid "Skew Selection"
+#: mainWindow/kpMainWindow_View_Zoom.cpp:199
+#, kde-format
+msgid "Set Zoom Level to %1%"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:70
+#: layers/selections/text/kpTextSelection.cpp:136
+#: tools/selection/text/kpToolText.cpp:59
+msgid "Text"
+msgstr "Testun"
+
+#: kpThumbnail.cpp:126
 msgctxt "@title:window"
-msgid "Skew Image"
+msgid "Thumbnail"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:71
-msgid "After skew:"
+#: document/kpDocument_Save.cpp:88
+msgid "Could not save image - insufficient information."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:108
-msgid "&Horizontal:"
-msgstr "Llorweddol:"
-
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:119
-msgid "&Vertical:"
-msgstr "Fertigol:"
+#: document/kpDocument_Save.cpp:93
+msgid "<empty>"
+msgstr "<gwag>"
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:252
+#: document/kpDocument_Save.cpp:89
 #, kde-format
 msgid ""
-"<qt><p>Skewing the selection to %1x%2 may take a substantial amount of "
-"memory. This can reduce system responsiveness and cause other application "
-"resource problems.</p><p>Are you sure want to skew the selection?</p></qt>"
+"URL: %1\n"
+"Mimetype: %2"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:260
+#: document/kpDocument_Save.cpp:95
 msgctxt "@title:window"
-msgid "Skew Selection?"
-msgstr ""
-
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:261
-msgid "Sk&ew Selection"
+msgid "Internal Error"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:267
+#: document/kpDocument_Save.cpp:129
 #, kde-format
 msgid ""
-"<qt><p>Skewing the image to %1x%2 may take a substantial amount of memory. "
-"This can reduce system responsiveness and cause other application resource "
-"problems.</p><p>Are you sure want to skew the image?</p></qt>"
+"<qt><p>The <b>%1</b> format may not be able to preserve all of the image's "
+"color information.</p><p>Are you sure you want to save in this "
+"format?</p></qt>"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:275
+#: document/kpDocument_Save.cpp:136
 msgctxt "@title:window"
-msgid "Skew Image?"
+msgid "Lossy File Format"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformSkewDialog.cpp:276
-msgid "Sk&ew Image"
+#: document/kpDocument_Save.cpp:145
+#, kde-format
+msgid ""
+"<qt><p>Saving the image at the low color depth of %1-bit may result in the "
+"loss of color information. Any transparency might also be removed.</p><p>Are "
+"you sure you want to save at this color depth?</p></qt>"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:102
+#: document/kpDocument_Save.cpp:155
 msgctxt "@title:window"
-msgid "Resize / Scale"
+msgid "Low Color Depth"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:165
-msgid "Ac&t on:"
+#: document/kpDocument_Save.cpp:293
+msgid "Could not save image - unable to create temporary file."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:171
-msgid "Entire Image"
+#: document/kpDocument_Save.cpp:302
+#, kde-format
+msgid "Could not save as \"%1\"."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:174
-#: layers/selections/image/kpAbstractImageSelection.cpp:195
-msgid "Selection"
-msgstr "Dewisiad"
-
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:177
-msgid "Text Box"
+#: document/kpDocument_Save.cpp:334
+#, kde-format
+msgid ""
+"A document called \"%1\" already exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:215
-msgid "Operation"
-msgstr "Gweithrediad"
+#: document/kpDocument_Save.cpp:338 lgpl/generic/kpColorCollection.cpp:298
+msgid "Overwrite"
+msgstr "Trosysgrifo"
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:217
-msgid ""
-"<qt><ul><li><b>Resize</b>: The size of the picture will be increased by "
-"creating new areas to the right and/or bottom (filled in with the background "
-"color) or decreased by cutting it at the right and/or "
-"bottom.</li><li><b>Scale</b>: The picture will be expanded by duplicating "
-"pixels or squashed by dropping pixels.</li><li><b>Smooth Scale</b>: This is "
-"the same as <i>Scale</i> except that it blends neighboring pixels to produce "
-"a smoother looking picture.</li></ul></qt>"
+#: document/kpDocument_Save.cpp:471
+msgid "Could not save image - failed to upload."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:238
-msgid "&Resize"
-msgstr "Newid &Maint"
+#: document/kpDocument_Open.cpp:107
+#, kde-format
+msgid "Could not open \"%1\"."
+msgstr "Methu agor \"%1\"."
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:243
-msgid "&Scale"
-msgstr "&Graddfa"
+#: document/kpDocument_Open.cpp:146
+#, kde-format
+msgid "Could not open \"%1\" - unknown mimetype."
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:248
-msgid "S&mooth Scale"
+#: document/kpDocument_Open.cpp:171
+#, kde-format
+msgid ""
+"Could not open \"%1\" - unsupported image format.\n"
+"The file may be corrupt."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:292
-#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:131
-msgid "Dimensions"
-msgstr "Dimensiynau"
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:294
-msgid "Width:"
-msgstr "Lled:"
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:296
-msgid "Height:"
-msgstr "Taldra:"
+#. i18n: file: kolourpaintui.rc:36
+#. i18n: ectx: Menu (view)
+#: rc.cpp:5
+msgid "&View"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:299
-#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:133
-msgid "Original:"
-msgstr "Gwreiddiol :"
+#. i18n: file: kolourpaintui.rc:71
+#. i18n: ectx: Menu (image)
+#. i18n: file: kolourpaintui.rc:205
+#. i18n: ectx: Menu (image)
+#: rc.cpp:8 rc.cpp:26
+msgid "&Image"
+msgstr "&Delwedd"
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:303
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:310
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:320
-msgid "x"
-msgstr "x"
+#. i18n: file: kolourpaintui.rc:98
+#. i18n: ectx: Menu (colors)
+#: rc.cpp:11
+msgid "&Colors"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:308
-msgid "&New:"
-msgstr "&Newydd:"
+#. i18n: file: kolourpaintui.rc:145
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:14
+msgid "Main Toolbar"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:313
-msgid "&Percent:"
-msgstr "&Canran :"
+#. i18n: file: kolourpaintui.rc:160
+#. i18n: ectx: ToolBar (textToolBar)
+#: rc.cpp:17
+msgid "Text Toolbar"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:319
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:326
-#: dialogs/kpColorSimilarityDialog.cpp:80
-msgid "%"
-msgstr "%"
+#. i18n: file: kolourpaintui.rc:170
+#. i18n: ectx: Menu (selectionToolRMBMenu)
+#: rc.cpp:20
+msgid "Selection Tool RMB Menu"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:328
-msgid "Keep &aspect ratio"
+#. i18n: file: kolourpaintui.rc:172
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:23
+msgid "&Edit"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:695
-#, kde-format
-msgid ""
-"<qt><p>Resizing the text box to %1x%2 may take a substantial amount of "
-"memory. This can reduce system responsiveness and cause other application "
-"resource problems.</p><p>Are you sure you want to resize the text "
-"box?</p></qt>"
+#: tools/kpToolZoom.cpp:74
+msgid "Zoom"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:703
-msgctxt "@title:window"
-msgid "Resize Text Box?"
+#: tools/kpToolZoom.cpp:74
+msgid "Zooms in and out of the image"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:704
-msgid "R&esize Text Box"
+#: tools/kpToolZoom.cpp:118
+msgid "Click to zoom in/out or left drag to zoom into a specific area."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:709
-#, kde-format
-msgid ""
-"<qt><p>Resizing the image to %1x%2 may take a substantial amount of memory. "
-"This can reduce system responsiveness and cause other application resource "
-"problems.</p><p>Are you sure you want to resize the image?</p></qt>"
+#: tools/kpToolZoom.cpp:205 tools/selection/kpAbstractSelectionTool.cpp:260
+#: tools/selection/kpAbstractSelectionTool.cpp:518
+#: tools/kpToolFloodFill.cpp:144
+#: tools/rectangular/kpToolRectangularBase.cpp:356
+#: tools/polygonal/kpToolPolygonalBase.cpp:437 tools/kpToolColorPicker.cpp:112
+#: tools/flow/kpToolFlowBase.cpp:302
+msgid "Let go of all the mouse buttons."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:727
+#: tools/kpTool.cpp:140
 #, kde-format
-msgid ""
-"<qt><p>Scaling the image to %1x%2 may take a substantial amount of memory. "
-"This can reduce system responsiveness and cause other application resource "
-"problems.</p><p>Are you sure you want to scale the image?</p></qt>"
-msgstr ""
+msgctxt "<Tool Name> (<Single Accel Key>)"
+msgid "%1 (%2)"
+msgstr "%1(%2)"
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:735
-msgctxt "@title:window"
-msgid "Scale Image?"
+#: tools/kpTool_UserNotifications.cpp:42
+msgid "Right click to cancel."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:736
-msgid "Scal&e Image"
+#: tools/kpTool_UserNotifications.cpp:44
+msgid "Left click to cancel."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:741
+#: tools/kpTool_UserNotifications.cpp:73
 #, kde-format
-msgid ""
-"<qt><p>Scaling the selection to %1x%2 may take a substantial amount of "
-"memory. This can reduce system responsiveness and cause other application "
-"resource problems.</p><p>Are you sure you want to scale the "
-"selection?</p></qt>"
-msgstr ""
+msgid "%1: "
+msgstr "%1 : "
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:749
-msgctxt "@title:window"
-msgid "Scale Selection?"
+#: tools/selection/text/kpToolText_ResizeScale.cpp:42
+msgid "Left drag to resize text box."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:750
-msgid "Scal&e Selection"
+#: tools/selection/text/kpToolText_SelectText.cpp:56
+msgid "Left click to change cursor position."
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:759
-#, kde-format
-msgid ""
-"<qt><p>Smooth Scaling the image to %1x%2 may take a substantial amount of "
-"memory. This can reduce system responsiveness and cause other application "
-"resource problems.</p><p>Are you sure you want to smooth scale the "
-"image?</p></qt>"
+#: tools/selection/text/kpToolText.cpp:59
+msgid "Writes text"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:767
-msgctxt "@title:window"
-msgid "Smooth Scale Image?"
+#: tools/selection/text/kpToolText_TextStyle.cpp:117
+msgid "Text: Opaque Background"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:768
-msgid "Smooth Scal&e Image"
+#: tools/selection/text/kpToolText_TextStyle.cpp:118
+msgid "Text: Transparent Background"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:773
-#, kde-format
-msgid ""
-"<qt><p>Smooth Scaling the selection to %1x%2 may take a substantial amount "
-"of memory. This can reduce system responsiveness and cause other application "
-"resource problems.</p><p>Are you sure you want to smooth scale the "
-"selection?</p></qt>"
+#: tools/selection/text/kpToolText_TextStyle.cpp:140
+msgid "Text: Swap Colors"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:781
-msgctxt "@title:window"
-msgid "Smooth Scale Selection?"
+#: tools/selection/text/kpToolText_TextStyle.cpp:160
+msgid "Text: Foreground Color"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformResizeScaleDialog.cpp:782
-msgid "Smooth Scal&e Selection"
+#: tools/selection/text/kpToolText_TextStyle.cpp:180
+msgid "Text: Background Color"
 msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:166
-#: dialogs/kpColorSimilarityDialog.cpp:53
-msgid "Preview"
-msgstr "Rhagolwg"
+#: tools/selection/text/kpToolText_TextStyle.cpp:216
+msgid "Text: Font"
+msgstr ""
 
-#: dialogs/imagelib/transforms/kpTransformPreviewDialog.cpp:173
-#: dialogs/kpColorSimilarityDialog.cpp:59
-msgid "&Update"
+#: tools/selection/text/kpToolText_TextStyle.cpp:243
+msgid "Text: Font Size"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:123
-msgctxt "@title:window"
-msgid "Document Properties"
+#: tools/selection/text/kpToolText_TextStyle.cpp:265
+msgid "Text: Bold"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:137
-msgid "Dots &Per Inch (DPI)"
+#: tools/selection/text/kpToolText_TextStyle.cpp:286
+msgid "Text: Italic"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:147
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:216
-msgid "Horizontal:"
+#: tools/selection/text/kpToolText_TextStyle.cpp:307
+msgid "Text: Underline"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:149
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:164
-msgid "Unspecified"
+#: tools/selection/text/kpToolText_TextStyle.cpp:328
+msgid "Text: Strike Through"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:152
-msgctxt "Horizontal DPI 'x' Vertical DPI"
-msgid " x "
+#: tools/selection/text/kpToolText_Create.cpp:48
+msgid "Left drag to create text box."
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:162
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:224
-msgid "Vertical:"
+#: tools/selection/text/kpToolText_Move.cpp:42
+msgid "Left drag to move text box."
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:182
-msgid ""
-"<qt><p><b>Dots Per Inch</b> (DPI) specifies the number of pixels of the "
-"image that should be printed inside one inch (2.54cm).</p><p>The higher the "
-"image's DPI, the smaller the printed image. Note that your printer is "
-"unlikely to produce high quality prints if you increase this to more than "
-"300 or 600 DPI, depending on the printer.</p><p>If you would like to print "
-"the image so that it is the same size as it is displayed on the screen, set "
-"the image's DPI values to be the same as the screen's.</p><p>If either DPI "
-"value is <b>Unspecified</b>, the image will also be printed to be the same "
-"size as on the screen.</p><p>Not all image formats support DPI values.  If "
-"the format you save in does not support them, they will not be "
-"saved.</p></qt>"
+#: tools/selection/text/kpToolText_Move.cpp:61
+msgid "Text: Move Box"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:213
-msgid "O&ffset"
+#: tools/selection/text/kpToolText_Commands.cpp:70
+msgid "Text: Backspace"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:246
-msgid ""
-"<qt><p>The <b>Offset</b> is the relative position where this image should be "
-"placed, compared to other images.</p><p>Not all image formats support the "
-"<b>Offset</b> feature. If the format you save in does not support it, the "
-"values specified here will not be saved.</p></qt>"
+#: tools/selection/text/kpToolText_Commands.cpp:87
+msgid "Text: Delete"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:262
-msgid "&Text Fields"
+#: tools/selection/text/kpToolText_Commands.cpp:104
+msgid "Text: New Line"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:284
-msgid "&Add Row"
+#: tools/selection/text/kpToolText_Commands.cpp:121
+msgid "Text: Write"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:289
-msgid "&Delete Row"
+#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:169
+msgid "Selection: Opaque"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:295
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:74
-msgid "&Reset"
-msgstr "&Ailosod"
+#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:170
+msgid "Selection: Transparent"
+msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:312
-msgid ""
-"<qt><p><b>Text Fields</b> provide extra information about the image. This is "
-"probably a comment area that you can freely write any text "
-"in.</p><p>However, this is format-specific so the fields could theoretically "
-"be computer-interpreted data - that you should not modify - but this is "
-"unlikely.</p><p>Not all image formats support <b>Text Fields</b>.  If the "
-"format you save in does not support them, they will not be saved.</p></qt>"
+#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:190
+msgid "Selection: Transparency Color"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:398
-msgid "Key"
+#: tools/selection/image/kpAbstractImageSelectionTool_Transparency.cpp:210
+msgid "Selection: Transparency Color Similarity"
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:398
-msgid "Value"
+#: tools/selection/image/kpAbstractImageSelectionTool.cpp:89
+msgid "Left drag to create selection."
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:486
-#, kde-format
-msgid "The text value \"%1\" on line %2 requires a key."
+#: tools/selection/image/kpAbstractImageSelectionTool.cpp:95
+msgid "Left drag to move selection."
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:512
-#, kde-format
-msgid ""
-"All text keys must be unique. The text key \"%1\" on lines %2 and %3 are "
-"identical."
+#: tools/selection/image/kpAbstractImageSelectionTool.cpp:101
+msgid "Left drag to scale selection."
 msgstr ""
 
-#: dialogs/imagelib/kpDocumentMetaInfoDialog.cpp:831
-msgctxt "@title:window"
-msgid "Invalid Text Fields"
+#: tools/selection/image/kpToolEllipticalSelection.cpp:43
+msgid "Selection (Elliptical)"
 msgstr ""
 
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:91
-msgctxt "@title:window"
-msgid "More Image Effects (Selection)"
+#: tools/selection/image/kpToolEllipticalSelection.cpp:44
+msgid "Makes an elliptical or circular selection"
 msgstr ""
 
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:93
-msgctxt "@title:window"
-msgid "More Image Effects"
+#: tools/selection/image/kpToolFreeFormSelection.cpp:45
+msgid "Selection (Free-Form)"
 msgstr ""
 
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:106
-msgid "&Effect:"
-msgstr "&Effaith:"
+#: tools/selection/image/kpToolFreeFormSelection.cpp:46
+msgid "Makes a free-form selection"
+msgstr ""
 
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:118
-msgid "Reduce Colors"
+#: tools/selection/image/kpToolRectSelection.cpp:42
+msgid "Selection (Rectangular)"
 msgstr ""
 
-#: dialogs/imagelib/effects/kpEffectsDialog.cpp:119
-msgid "Soften & Sharpen"
+#: tools/selection/image/kpToolRectSelection.cpp:43
+msgid "Makes a rectangular selection"
 msgstr ""
 
-#: dialogs/kpColorSimilarityDialog.cpp:47
-msgctxt "@title:window"
-msgid "Color Similarity"
+#: tools/selection/kpAbstractSelectionTool_Move.cpp:319
+msgid "Selection: Move"
 msgstr ""
 
-#: dialogs/kpColorSimilarityDialog.cpp:73
-msgid "&RGB Color Cube Distance"
+#: tools/selection/kpAbstractSelectionTool_Move.cpp:341
+#, kde-format
+msgid "%1: Smear"
 msgstr ""
 
-#: dialogs/kpColorSimilarityDialog.cpp:81
-msgid "Exact Match"
-msgstr "Cydweddiad Union"
+#: tools/kpToolFloodFill.cpp:55
+msgid "Fills regions in the image"
+msgstr ""
 
-#: dialogs/kpColorSimilarityDialog.cpp:86
-msgid ""
-"<a href=\"dummy_to_make_link_clickable\">What is Color Similarity?</a>"
+#: tools/kpToolFloodFill.cpp:75
+msgid "Click to fill a region."
 msgstr ""
 
-#: widgets/colorSimilarity/kpColorSimilarityHolder.cpp:72
-msgid ""
-"<qt><p><b>Color Similarity</b> is how <i>similar</i> the colors of different "
-"pixels must be, for operations to consider them to be the same.</p><p>If you "
-"set it to something other than <b>Exact Match</b>, you can work more "
-"effectively with dithered images and photos, in a comparable manner to the "
-"\"Magic Wand\" feature of other paint programs.</p><p>This feature applies "
-"to:</p><ul><li><b>Selections</b>: In <b>Transparent</b> mode, any color in "
-"the selection that is <i>similar</i> to the background color will be made "
-"transparent.</li><li><b>Flood Fill</b>: For regions with <i>similar</i> - "
-"but not identical - colored pixels, a higher setting is likely to fill more "
-"pixels.</li><li><b>Color Eraser</b>: Any pixel whose color is <i>similar</i> "
-"to the foreground color will be replaced with the background "
-"color.</li><li><b>Autocrop</b> and <b>Remove Internal Border</b>: For "
-"borders with <i>similar</i> - but not identical - colored pixels, a higher "
-"setting is more likely to crop the whole border.</li></ul><p>Higher settings "
-"mean that operations consider an increased range of colors to be "
-"sufficiently <i>similar</i> so as to be the same.  Therefore, you should "
-"increase the setting if the above operations are not affecting pixels whose "
-"colors you consider to be similar enough.</p><p>However, if they are having "
-"too much of an effect and are changing pixels whose colors you do not "
-"consider to be similar (e.g. if <b>Flood Fill</b> is changing too many "
-"pixels), you should decrease this setting.</p><p>To configure it, click on "
-"the cube.</p></qt>"
+#: tools/rectangular/kpToolRoundedRectangle.cpp:36
+msgid "Rounded Rectangle"
 msgstr ""
 
-#: widgets/colorSimilarity/kpColorSimilarityHolder.cpp:122
-msgid ""
-"<qt><p><b>Color Similarity</b> is how <i>similar</i> the colors of different "
-"pixels must be, for operations to consider them to be the same.</p><p>If you "
-"set it to something other than <b>Exact Match</b>, you can work more "
-"effectively with dithered images and photos, in a comparable manner to the "
-"\"Magic Wand\" feature of other paint programs.</p><p>This feature applies "
-"to:</p><ul><li><b>Selections</b>: In <b>Transparent</b> mode, any color in "
-"the selection that is <i>similar</i> to the background color will be made "
-"transparent.</li><li><b>Flood Fill</b>: For regions with <i>similar</i> - "
-"but not identical - colored pixels, a higher setting is likely to fill more "
-"pixels.</li><li><b>Color Eraser</b>: Any pixel whose color is <i>similar</i> "
-"to the foreground color will be replaced with the background "
-"color.</li><li><b>Autocrop</b> and <b>Remove Internal Border</b>: For "
-"borders with <i>similar</i> - but not identical - colored pixels, a higher "
-"setting is more likely to crop the whole border.</li></ul><p>Higher settings "
-"mean that operations consider an increased range of colors to be "
-"sufficiently <i>similar</i> so as to be the same.  Therefore, you should "
-"increase the setting if the above operations are not affecting pixels whose "
-"colors you consider to be similar enough.</p><p>However, if they are having "
-"too much of an effect and are changing pixels whose colors you do not "
-"consider to be similar (e.g. if <b>Flood Fill</b> is changing too many "
-"pixels), you should decrease this setting.</p></qt>"
+#: tools/rectangular/kpToolRoundedRectangle.cpp:37
+msgid "Draws rectangles and squares with rounded corners"
 msgstr ""
 
-#: widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp:224
-#, kde-format
-msgid ""
-"<p>Color Similarity: %1%</p><p align=\"center\">Click to configure.</p>"
+#: tools/rectangular/kpToolRectangularBase.cpp:120
+#: tools/polygonal/kpToolLine.cpp:75
+msgid "Drag to draw."
 msgstr ""
 
-#: widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp:231
-msgid ""
-"<p>Color Similarity: Exact Match</p><p align=\"center\">Click to "
-"configure.</p>"
+#: tools/rectangular/kpToolEllipse.cpp:37
+msgid "Ellipse"
+msgstr "Hirgylch"
+
+#: tools/rectangular/kpToolEllipse.cpp:38
+msgid "Draws ellipses and circles"
 msgstr ""
 
-#: widgets/kpColorCells.cpp:196
-msgid ""
-"<qt><p>To select the foreground color that tools use to draw, left-click on "
-"a filled-in color cell. To select the background color, right-click "
-"instead.</p><p>To change the color of a color cell itself, double-click on "
-"it.</p><p>You can also swap the color of a filled-in cell with any other "
-"cell using drag and drop. Also, if you hold down the <b>Ctrl</b> key, the "
-"destination cell's color will be overwritten, instead of being swapped with "
-"the color of the source cell.</p></qt>"
+#: tools/rectangular/kpToolRectangle.cpp:38
+msgid "Rectangle"
+msgstr "Hirsgwâr"
+
+#: tools/rectangular/kpToolRectangle.cpp:39
+msgid "Draws rectangles and squares"
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp:53
-#: widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp:67
-#: widgets/imagelib/effects/kpEffectEmbossWidget.cpp:54
-msgid "&Amount:"
-msgstr "&Maint:"
+#: tools/polygonal/kpToolPolygon.cpp:61
+msgid "Polygon"
+msgstr "Amlochryn"
 
-#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:60
-msgid "&Monochrome"
-msgstr "&Unlliw"
+#: tools/polygonal/kpToolPolygon.cpp:62
+msgid "Draws polygons"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:63
-msgid "Mo&nochrome (dithered)"
+#: tools/polygonal/kpToolPolygon.cpp:80 tools/polygonal/kpToolPolyline.cpp:59
+msgid "Drag to draw the first line."
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:65
-msgid "256 co&lor"
+#: tools/polygonal/kpToolPolygon.cpp:153
+#: tools/polygonal/kpToolPolyline.cpp:105
+msgid "Left drag another line or right click to finish."
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:67
-msgid "256 colo&r (dithered)"
+#: tools/polygonal/kpToolPolygon.cpp:157
+#: tools/polygonal/kpToolPolyline.cpp:109
+msgid "Right drag another line or left click to finish."
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:69
-msgid "24-&bit color"
+#: tools/polygonal/kpToolPolyline.cpp:42
+msgid "Connected Lines"
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:192
-msgid "Reduce To"
+#: tools/polygonal/kpToolPolyline.cpp:43
+msgid "Draws connected lines"
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:63
-msgid "&Red"
-msgstr "&Coch"
+#: tools/polygonal/kpToolLine.cpp:58
+msgid "Line"
+msgstr "Llinell"
 
-#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:64
-msgid "&Green"
-msgstr "&Gwyrdd"
+#: tools/polygonal/kpToolLine.cpp:59
+msgid "Draws lines"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:65
-msgid "&Blue"
-msgstr "&Glas"
+#: tools/polygonal/kpToolCurve.cpp:86
+msgid "Curve"
+msgstr "Cromlin"
 
-#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:70
-msgid "&All"
-msgstr "&Popeth"
+#: tools/polygonal/kpToolCurve.cpp:87
+msgid "Draws curves"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:144
-msgid "Channels"
-msgstr "Sianeli"
+#: tools/polygonal/kpToolCurve.cpp:103
+msgid "Drag out the start and end points."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:66
-msgid "&Brightness:"
-msgstr "&Glowyder:"
+#: tools/polygonal/kpToolCurve.cpp:142
+msgid "Left drag to set the first control point or right click to finish."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:69
-msgid "Re&set"
-msgstr "Ai&losod"
+#: tools/polygonal/kpToolCurve.cpp:147
+msgid "Right drag to set the first control point or left click to finish."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:71
-msgid "Co&ntrast:"
-msgstr "Cy&ferbyniant :"
+#: tools/polygonal/kpToolCurve.cpp:157
+msgid "Left drag to set the last control point or right click to finish."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:76
-msgid "&Gamma:"
-msgstr "&Gama :"
+#: tools/polygonal/kpToolCurve.cpp:162
+msgid "Right drag to set the last control point or left click to finish."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:85
-msgid "Rese&t"
-msgstr "Ailo&sod"
+#: tools/kpToolColorPicker.cpp:47
+msgid "Lets you select a color from the image"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:92
-msgid "C&hannels:"
-msgstr "S&ianeli :"
+#: tools/kpToolColorPicker.cpp:72
+msgid "Click to select a color."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:94
-msgid "All"
-msgstr "Popeth"
+#: tools/flow/kpToolBrush.cpp:35
+msgid "Brush"
+msgstr "Brwsh"
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:95
-msgid "Red"
-msgstr "Coch"
+#: tools/flow/kpToolBrush.cpp:36
+msgid "Draw using brushes of different shapes and sizes"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:96
-msgid "Green"
-msgstr "Gwyrdd"
+#: tools/flow/kpToolBrush.cpp:47 tools/flow/kpToolPen.cpp:70
+msgid "Click to draw dots or drag to draw strokes."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:97
-msgid "Blue"
-msgstr "Glas"
+#: tools/flow/kpToolSpraycan.cpp:61
+msgid "Spraycan"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:100
-msgid "Reset &All Values"
+#: tools/flow/kpToolSpraycan.cpp:61
+msgid "Sprays graffiti"
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:169
-msgid "Settings"
-msgstr "Gosodiadau"
+#: tools/flow/kpToolSpraycan.cpp:75
+msgid "Click or drag to spray graffiti."
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectFlattenWidget.cpp:73
-#: widgets/imagelib/effects/kpEffectEmbossWidget.cpp:74
-msgid "E&nable"
-msgstr "G&alluogi"
+#: tools/flow/kpToolColorEraser.cpp:53 tools/flow/kpToolColorEraser.cpp:80
+msgid "Color Eraser"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectFlattenWidget.cpp:136
-msgid "Colors"
-msgstr "Lliwiau"
+#: tools/flow/kpToolColorEraser.cpp:54
+msgid "Replaces pixels of the foreground color with the background color"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp:65
-msgid "&Granularity:"
+#: tools/flow/kpToolColorEraser.cpp:115
+msgid "Click or drag to erase pixels of the foreground color."
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectEmbossWidget.cpp:58
-msgid "None"
-msgstr "Dim"
+#: tools/flow/kpToolEraser.cpp:42
+msgid "Eraser"
+msgstr ""
 
-#: widgets/imagelib/effects/kpEffectHSVWidget.cpp:49
-msgid "&Hue:"
+#: tools/flow/kpToolEraser.cpp:43
+msgid "Lets you rub out mistakes"
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectHSVWidget.cpp:50
-msgid "&Saturation:"
+#: tools/flow/kpToolEraser.cpp:70
+msgid "Click or drag to erase."
 msgstr ""
 
-#: widgets/imagelib/effects/kpEffectHSVWidget.cpp:51
-msgctxt "The V of HSV"
-msgid "&Value:"
+#: tools/flow/kpToolPen.cpp:50
+msgid "Pen"
+msgstr "Pen-ysgrifennu"
+
+#: tools/flow/kpToolPen.cpp:50
+msgid "Draws dots and freehand strokes"
 msgstr ""
 
-#: widgets/kpPrintDialogPage.cpp:60
-msgctxt "@title:tab"
-msgid "I&mage Position"
+#: widgets/toolbars/kpColorToolBar.cpp:267
+msgid "KolourPaint Defaults"
 msgstr ""
 
-#: widgets/kpPrintDialogPage.cpp:65
-msgid "&Center of the page"
+#: widgets/toolbars/kpColorToolBar.cpp:271 lgpl/generic/kpUrlFormatter.cpp:40
+#: lgpl/generic/kpUrlFormatter.cpp:51
+msgid "Untitled"
 msgstr ""
 
-#: widgets/kpPrintDialogPage.cpp:67
-msgid "Top-&left of the page"
+#: widgets/toolbars/kpColorToolBar.cpp:280
+#, kde-format
+msgctxt "Colors: name_or_url_of_color_palette"
+msgid "Colors: %1"
+msgstr ""
+
+#: widgets/toolbars/kpColorToolBar.cpp:287
+#, kde-format
+msgctxt "Colors: name_or_url_of_color_palette [modified]"
+msgid "Colors: %1 [modified]"
 msgstr ""
 
-#: widgets/kpTransparentColorCell.cpp:65
+#: widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp:43
+msgid "Opaque"
+msgstr "Afloyw"
+
 #: widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp:45
+#: widgets/kpTransparentColorCell.cpp:54
 msgid "Transparent"
 msgstr "Tryloyw"
 
-#: widgets/toolbars/options/kpToolWidgetBrush.cpp:164
+#: widgets/toolbars/options/kpToolWidgetBrush.cpp:204
 msgid "1x1"
 msgstr ""
 
-#: widgets/toolbars/options/kpToolWidgetBrush.cpp:172
+#: widgets/toolbars/options/kpToolWidgetBrush.cpp:212
 msgid "Circle"
 msgstr "Cylch"
 
-#: widgets/toolbars/options/kpToolWidgetBrush.cpp:175
+#: widgets/toolbars/options/kpToolWidgetBrush.cpp:215
 msgid "Square"
 msgstr "Sgwâr"
 
-#: widgets/toolbars/options/kpToolWidgetBrush.cpp:179
+#: widgets/toolbars/options/kpToolWidgetBrush.cpp:219
 msgid "Slash"
 msgstr ""
 
-#: widgets/toolbars/options/kpToolWidgetBrush.cpp:183
+#: widgets/toolbars/options/kpToolWidgetBrush.cpp:223
 msgid "Backslash"
 msgstr ""
 
-#: widgets/toolbars/options/kpToolWidgetBrush.cpp:190
+#: widgets/toolbars/options/kpToolWidgetBrush.cpp:230
 #, kde-format
 msgid "%1x%2 %3"
 msgstr ""
 
-#: widgets/toolbars/options/kpToolWidgetFillStyle.cpp:136
+#: widgets/toolbars/options/kpToolWidgetFillStyle.cpp:123
 msgid "No Fill"
 msgstr ""
 
-#: widgets/toolbars/options/kpToolWidgetFillStyle.cpp:139
+#: widgets/toolbars/options/kpToolWidgetFillStyle.cpp:126
 msgid "Fill with Background Color"
 msgstr ""
 
-#: widgets/toolbars/options/kpToolWidgetFillStyle.cpp:142
+#: widgets/toolbars/options/kpToolWidgetFillStyle.cpp:129
 msgid "Fill with Foreground Color"
 msgstr "Llenwi gyda Lliw Blaendir"
 
-#: widgets/toolbars/options/kpToolWidgetOpaqueOrTransparent.cpp:43
-msgid "Opaque"
-msgstr "Afloyw"
+#: widgets/imagelib/effects/kpEffectBlurSharpenWidget.cpp:53
+#: widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp:60
+#: widgets/imagelib/effects/kpEffectEmbossWidget.cpp:54
+msgid "&Amount:"
+msgstr "&Maint:"
 
-#: widgets/toolbars/kpColorToolBar.cpp:260
-msgid "KolourPaint Defaults"
+#: widgets/imagelib/effects/kpEffectToneEnhanceWidget.cpp:58
+msgid "&Granularity:"
 msgstr ""
 
-#: widgets/toolbars/kpColorToolBar.cpp:264 lgpl/generic/kpUrlFormatter.cpp:39
-#: lgpl/generic/kpUrlFormatter.cpp:48
-msgid "Untitled"
+#: widgets/imagelib/effects/kpEffectHSVWidget.cpp:49
+msgid "&Hue:"
 msgstr ""
 
-#: widgets/toolbars/kpColorToolBar.cpp:273
-#, kde-format
-msgctxt "Colors: name_or_url_of_color_palette"
-msgid "Colors: %1"
+#: widgets/imagelib/effects/kpEffectHSVWidget.cpp:50
+msgid "&Saturation:"
 msgstr ""
 
-#: widgets/toolbars/kpColorToolBar.cpp:280
-#, kde-format
-msgctxt "Colors: name_or_url_of_color_palette [modified]"
-msgid "Colors: %1 [modified]"
+#: widgets/imagelib/effects/kpEffectHSVWidget.cpp:51
+msgctxt "The V of HSV"
+msgid "&Value:"
 msgstr ""
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:94
-msgid "Convert &to:"
+#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:60
+msgid "&Monochrome"
+msgstr "&Unlliw"
+
+#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:63
+msgid "Mo&nochrome (dithered)"
 msgstr ""
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:99
-msgid "Quali&ty:"
-msgstr "Ansaw&dd:"
+#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:65
+msgid "256 co&lor"
+msgstr ""
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:107
-msgid "&Preview"
-msgstr "&Rhagolwg"
+#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:67
+msgid "256 colo&r (dithered)"
+msgstr ""
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:229
-msgid "Monochrome"
-msgstr "Unlliw"
+#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:69
+msgid "24-&bit color"
+msgstr ""
+
+#: widgets/imagelib/effects/kpEffectReduceColorsWidget.cpp:145
+msgid "Reduce To"
+msgstr ""
+
+#: widgets/imagelib/effects/kpEffectFlattenWidget.cpp:73
+#: widgets/imagelib/effects/kpEffectEmbossWidget.cpp:74
+msgid "E&nable"
+msgstr "G&alluogi"
+
+#: widgets/imagelib/effects/kpEffectFlattenWidget.cpp:136
+msgid "Colors"
+msgstr "Lliwiau"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:66
+msgid "&Brightness:"
+msgstr "&Glowyder:"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:70
+msgid "Re&set"
+msgstr "Ai&losod"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:72
+msgid "Co&ntrast:"
+msgstr "Cy&ferbyniant :"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:78
+msgid "&Gamma:"
+msgstr "&Gama :"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:88
+msgid "Rese&t"
+msgstr "Ailo&sod"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:95
+msgid "C&hannels:"
+msgstr "S&ianeli :"
+
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:97
+msgid "All"
+msgstr "Popeth"
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:230
-msgid "Monochrome (Dithered)"
-msgstr ""
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:98
+msgid "Red"
+msgstr "Coch"
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:234
-msgid "256 Color"
-msgstr ""
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:99
+msgid "Green"
+msgstr "Gwyrdd"
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:235
-msgid "256 Color (Dithered)"
-msgstr ""
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:100
+msgid "Blue"
+msgstr "Glas"
 
-#: widgets/kpDocumentSaveOptionsWidget.cpp:240
-msgid "24-bit Color"
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:103
+msgid "Reset &All Values"
 msgstr ""
 
-#: lgpl/generic/kpColorCollection.cpp:118
-#, kde-format
-msgid "Could not open color palette \"%1\"."
-msgstr ""
+#: widgets/imagelib/effects/kpEffectBalanceWidget.cpp:172
+msgid "Settings"
+msgstr "Gosodiadau"
 
-#: lgpl/generic/kpColorCollection.cpp:157
-#, kde-format
-msgid ""
-"Could not open color palette \"%1\" - unsupported format.\n"
-"The file may be corrupt."
-msgstr ""
+#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:63
+msgid "&Red"
+msgstr "&Coch"
 
-#: lgpl/generic/kpColorCollection.cpp:208
-#, kde-format
-msgid "Could not open KDE color palette \"%1\"."
-msgstr ""
+#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:64
+msgid "&Green"
+msgstr "&Gwyrdd"
 
-#: lgpl/generic/kpColorCollection.cpp:257
-#, kde-format
-msgid "Could not save color palette as \"%1\"."
-msgstr ""
+#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:65
+msgid "&Blue"
+msgstr "&Glas"
 
-#: lgpl/generic/kpColorCollection.cpp:294
-#, kde-format
-msgid ""
-"A color palette called \"%1\" already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
+#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:70
+msgid "&All"
+msgstr "&Popeth"
 
-#: lgpl/generic/kpColorCollection.cpp:298 document/kpDocument_Save.cpp:340
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: widgets/imagelib/effects/kpEffectInvertWidget.cpp:144
+msgid "Channels"
+msgstr "Sianeli"
 
-#: document/kpDocument_Open.cpp:201
-#, kde-format
-msgid "Could not open \"%1\"."
-msgstr "Methu agor \"%1\"."
+#: widgets/imagelib/effects/kpEffectEmbossWidget.cpp:58
+msgid "None"
+msgstr "Dim"
 
-#: document/kpDocument_Open.cpp:241
+#: widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp:226
 #, kde-format
-msgid "Could not open \"%1\" - unknown mimetype."
+msgid ""
+"<p>Color Similarity: %1%</p><p align=\"center\">Click to configure.</p>"
 msgstr ""
 
-#: document/kpDocument_Open.cpp:266
-#, kde-format
+#: widgets/colorSimilarity/kpColorSimilarityToolBarItem.cpp:233
 msgid ""
-"Could not open \"%1\" - unsupported image format.\n"
-"The file may be corrupt."
+"<p>Color Similarity: Exact Match</p><p align=\"center\">Click to "
+"configure.</p>"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:88
-msgid "Could not save image - insufficient information."
+#: widgets/colorSimilarity/kpColorSimilarityHolder.cpp:72
+msgid ""
+"<qt><p><b>Color Similarity</b> is how <i>similar</i> the colors of different "
+"pixels must be, for operations to consider them to be the same.</p><p>If you "
+"set it to something other than <b>Exact Match</b>, you can work more "
+"effectively with dithered images and photos, in a comparable manner to the "
+"\"Magic Wand\" feature of other paint programs.</p><p>This feature applies "
+"to:</p><ul><li><b>Selections</b>: In <b>Transparent</b> mode, any color in "
+"the selection that is <i>similar</i> to the background color will be made "
+"transparent.</li><li><b>Flood Fill</b>: For regions with <i>similar</i> - "
+"but not identical - colored pixels, a higher setting is likely to fill more "
+"pixels.</li><li><b>Color Eraser</b>: Any pixel whose color is <i>similar</i> "
+"to the foreground color will be replaced with the background "
+"color.</li><li><b>Autocrop</b> and <b>Remove Internal Border</b>: For "
+"borders with <i>similar</i> - but not identical - colored pixels, a higher "
+"setting is more likely to crop the whole border.</li></ul><p>Higher settings "
+"mean that operations consider an increased range of colors to be "
+"sufficiently <i>similar</i> so as to be the same.  Therefore, you should "
+"increase the setting if the above operations are not affecting pixels whose "
+"colors you consider to be similar enough.</p><p>However, if they are having "
+"too much of an effect and are changing pixels whose colors you do not "
+"consider to be similar (e.g. if <b>Flood Fill</b> is changing too many "
+"pixels), you should decrease this setting.</p><p>To configure it, click on "
+"the cube.</p></qt>"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:93
-msgid "<empty>"
-msgstr "<gwag>"
-
-#: document/kpDocument_Save.cpp:89
-#, kde-format
+#: widgets/colorSimilarity/kpColorSimilarityHolder.cpp:122
 msgid ""
-"URL: %1\n"
-"Mimetype: %2"
+"<qt><p><b>Color Similarity</b> is how <i>similar</i> the colors of different "
+"pixels must be, for operations to consider them to be the same.</p><p>If you "
+"set it to something other than <b>Exact Match</b>, you can work more "
+"effectively with dithered images and photos, in a comparable manner to the "
+"\"Magic Wand\" feature of other paint programs.</p><p>This feature applies "
+"to:</p><ul><li><b>Selections</b>: In <b>Transparent</b> mode, any color in "
+"the selection that is <i>similar</i> to the background color will be made "
+"transparent.</li><li><b>Flood Fill</b>: For regions with <i>similar</i> - "
+"but not identical - colored pixels, a higher setting is likely to fill more "
+"pixels.</li><li><b>Color Eraser</b>: Any pixel whose color is <i>similar</i> "
+"to the foreground color will be replaced with the background "
+"color.</li><li><b>Autocrop</b> and <b>Remove Internal Border</b>: For "
+"borders with <i>similar</i> - but not identical - colored pixels, a higher "
+"setting is more likely to crop the whole border.</li></ul><p>Higher settings "
+"mean that operations consider an increased range of colors to be "
+"sufficiently <i>similar</i> so as to be the same.  Therefore, you should "
+"increase the setting if the above operations are not affecting pixels whose "
+"colors you consider to be similar enough.</p><p>However, if they are having "
+"too much of an effect and are changing pixels whose colors you do not "
+"consider to be similar (e.g. if <b>Flood Fill</b> is changing too many "
+"pixels), you should decrease this setting.</p></qt>"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:95
-msgctxt "@title:window"
-msgid "Internal Error"
+#: widgets/kpPrintDialogPage.cpp:60
+msgctxt "@title:tab"
+msgid "I&mage Position"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:128
-#, kde-format
-msgid ""
-"<qt><p>The <b>%1</b> format may not be able to preserve all of the image's "
-"color information.</p><p>Are you sure you want to save in this "
-"format?</p></qt>"
+#: widgets/kpPrintDialogPage.cpp:65
+msgid "&Center of the page"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:136
-msgctxt "@title:window"
-msgid "Lossy File Format"
+#: widgets/kpPrintDialogPage.cpp:67
+msgid "Top-&left of the page"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:144
-#, kde-format
-msgid ""
-"<qt><p>Saving the image at the low color depth of %1-bit may result in the "
-"loss of color information. Any transparency might also be removed.</p><p>Are "
-"you sure you want to save at this color depth?</p></qt>"
+#: widgets/kpDocumentSaveOptionsWidget.cpp:93
+msgid "Convert &to:"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:155
-msgctxt "@title:window"
-msgid "Low Color Depth"
-msgstr ""
+#: widgets/kpDocumentSaveOptionsWidget.cpp:98
+msgid "Quali&ty:"
+msgstr "Ansaw&dd:"
 
-#: document/kpDocument_Save.cpp:299
-msgid "Could not save image - unable to create temporary file."
+#: widgets/kpDocumentSaveOptionsWidget.cpp:106
+msgid "&Preview"
+msgstr "&Rhagolwg"
+
+#: widgets/kpDocumentSaveOptionsWidget.cpp:228
+msgid "Monochrome"
+msgstr "Unlliw"
+
+#: widgets/kpDocumentSaveOptionsWidget.cpp:229
+msgid "Monochrome (Dithered)"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:306
-#, kde-format
-msgid "Could not save as \"%1\"."
+#: widgets/kpDocumentSaveOptionsWidget.cpp:233
+msgid "256 Color"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:336
-#, kde-format
-msgid ""
-"A document called \"%1\" already exists.\n"
-"Do you want to overwrite it?"
+#: widgets/kpDocumentSaveOptionsWidget.cpp:234
+msgid "256 Color (Dithered)"
 msgstr ""
 
-#: document/kpDocument_Save.cpp:473
-msgid "Could not save image - failed to upload."
+#: widgets/kpDocumentSaveOptionsWidget.cpp:239
+msgid "24-bit Color"
 msgstr ""
 
-#: kpThumbnail.cpp:126
-msgctxt "@title:window"
-msgid "Thumbnail"
+#: widgets/kpColorCells.cpp:192
+msgid ""
+"<qt><p>To select the foreground color that tools use to draw, left-click on "
+"a filled-in color cell. To select the background color, right-click "
+"instead.</p><p>To change the color of a color cell itself, double-click on "
+"it.</p><p>You can also swap the color of a filled-in cell with any other "
+"cell using drag and drop. Also, if you hold down the <b>Ctrl</b> key, the "
+"destination cell's color will be overwritten, instead of being swapped with "
+"the color of the source cell.</p></qt>"
 msgstr ""
 
 #: kolourpaint.cpp:49
@@ -2073,7 +2091,7 @@
 msgid "Chief Investigator"
 msgstr ""
 
-#: kolourpaint.cpp:77
+#: kolourpaint.cpp:68
 msgid "Martin Koller"
 msgstr ""
 
@@ -2081,11 +2099,11 @@
 msgid "Scanning Support, Alpha Support, Current Maintainer"
 msgstr ""
 
-#: kolourpaint.cpp:68
+#: kolourpaint.cpp:69
 msgid "Kristof Borrey"
 msgstr ""
 
-#: kolourpaint.cpp:68 kolourpaint.cpp:70 kolourpaint.cpp:71
+#: kolourpaint.cpp:69 kolourpaint.cpp:72 kolourpaint.cpp:73
 msgid "Icons"
 msgstr "Eiconau"
 
@@ -2093,35 +2111,35 @@
 msgid "Tasuku Suzuki"
 msgstr ""
 
-#: kolourpaint.cpp:69
+#: kolourpaint.cpp:70 kolourpaint.cpp:71
 msgid "InputMethod Support"
 msgstr ""
 
-#: kolourpaint.cpp:69
+#: kolourpaint.cpp:71
 msgid "Kazuki Ohta"
 msgstr ""
 
-#: kolourpaint.cpp:70
+#: kolourpaint.cpp:72
 msgid "Nuno Pinheiro"
 msgstr ""
 
-#: kolourpaint.cpp:71
+#: kolourpaint.cpp:73
 msgid "Danny Allen"
 msgstr ""
 
-#: kolourpaint.cpp:72
+#: kolourpaint.cpp:74
 msgid "Mike Gashler"
 msgstr ""
 
-#: kolourpaint.cpp:72
+#: kolourpaint.cpp:74
 msgid "Image Effects"
 msgstr ""
 
-#: kolourpaint.cpp:74
+#: kolourpaint.cpp:76
 msgid "Laurent Montel"
 msgstr ""
 
-#: kolourpaint.cpp:74
+#: kolourpaint.cpp:76
 msgid "KDE 4 Porting"
 msgstr ""
 
@@ -2130,64 +2148,35 @@
 "Thanks to the many others who have helped to make this program possible."
 msgstr ""
 
-#: kolourpaint.cpp:86
+#: kolourpaint.cpp:85
 msgid "Image file to open"
 msgstr ""
 
-#: rc.cpp:25
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
-
-#: rc.cpp:26
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
-
-#. i18n: file: kolourpaintui.rc:38
-#. i18n: ectx: Menu (view)
-#: rc.cpp:3 rc.cpp:29
-msgid "&View"
-msgstr ""
-
-#. i18n: file: kolourpaintui.rc:73
-#. i18n: ectx: Menu (image)
-#. i18n: file: kolourpaintui.rc:210
-#. i18n: ectx: Menu (image)
-#. i18n: file: kolourpaintui.rc:73
-#. i18n: ectx: Menu (image)
-#. i18n: file: kolourpaintui.rc:210
-#. i18n: ectx: Menu (image)
-#: rc.cpp:6 rc.cpp:24 rc.cpp:32 rc.cpp:50
-msgid "&Image"
-msgstr "&Delwedd"
-
-#. i18n: file: kolourpaintui.rc:99
-#. i18n: ectx: Menu (colors)
-#: rc.cpp:9 rc.cpp:35
-msgid "&Colors"
+#: lgpl/generic/kpColorCollection.cpp:118
+#, kde-format
+msgid "Could not open color palette \"%1\"."
 msgstr ""
 
-#. i18n: file: kolourpaintui.rc:150
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:12 rc.cpp:38
-msgid "Main Toolbar"
+#: lgpl/generic/kpColorCollection.cpp:157
+#, kde-format
+msgid ""
+"Could not open color palette \"%1\" - unsupported format.\n"
+"The file may be corrupt."
 msgstr ""
 
-#. i18n: file: kolourpaintui.rc:165
-#. i18n: ectx: ToolBar (textToolBar)
-#: rc.cpp:15 rc.cpp:41
-msgid "Text Toolbar"
+#: lgpl/generic/kpColorCollection.cpp:208
+#, kde-format
+msgid "Could not open KDE color palette \"%1\"."
 msgstr ""
 
-#. i18n: file: kolourpaintui.rc:175
-#. i18n: ectx: Menu (selectionToolRMBMenu)
-#: rc.cpp:18 rc.cpp:44
-msgid "Selection Tool RMB Menu"
+#: lgpl/generic/kpColorCollection.cpp:257
+#, kde-format
+msgid "Could not save color palette as \"%1\"."
 msgstr ""
 
-#. i18n: file: kolourpaintui.rc:177
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:21 rc.cpp:47
-msgid "&Edit"
+#: lgpl/generic/kpColorCollection.cpp:294
+#, kde-format
+msgid ""
+"A color palette called \"%1\" already exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kommander.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kommander.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kommander.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kommander.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: kdewebdev\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 15:07+0000\n"
-"PO-Revision-Date: 2012-03-13 11:18+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-17 00:16+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,77 +16,90 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:37+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:07+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: editor/formfile.cpp:114
+#: executor/instance.cpp:123
+msgid "<qt>Unable to create dialog.</qt>"
+msgstr ""
+
+#: executor/instance.cpp:195
 #, kde-format
-msgid ""
-"Failed to save file '%1'.\n"
-"Do you want to use another file name?"
+msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
 msgstr ""
 
-#: editor/formfile.cpp:115
-msgid "Try Another"
+#: executor/instance.cpp:203
+msgid ""
+"<qt>This file does not have a <b>.kmdr</b> extension. As a security "
+"precaution Kommander will only run Kommander scripts with a clear "
+"identity.</qt>"
 msgstr ""
 
-#: editor/formfile.cpp:115
-msgid "Do Not Try"
+#: executor/instance.cpp:205
+msgid "Wrong Extension"
 msgstr ""
 
-#: editor/formfile.cpp:120
-#, kde-format
-msgid "'%1' saved."
+#: executor/instance.cpp:222
+msgid ""
+"<qt>This dialog is running from your <i>/tmp</i> directory.  This may mean "
+"that it was run from a KMail attachment or from a webpage. <p>Any script "
+"contained in this dialog will have write access to all of your home "
+"directory; <b>running such dialogs may be dangerous: </b><p>are you sure you "
+"want to continue?</qt>"
 msgstr ""
 
-#: editor/formfile.cpp:133 editor/mainwindowactions.cpp:618
-msgid "*.kmdr|Kommander Files"
+#: executor/instance.cpp:226 executor/instance.cpp:231
+msgid "Run Nevertheless"
 msgstr ""
 
-#: editor/formfile.cpp:134
+#: executor/instance.cpp:231
 #, kde-format
-msgid "Save Form '%1' As"
+msgid ""
+"<qt>The Kommander file <i>%1</i> does not have the <b>executable "
+"attribute</b> set and could possibly contain dangerous exploits.<p>If you "
+"trust the scripting (viewable in kmdr-editor) in this program, make it "
+"executable to get rid of this warning.<p>Are you sure you want to "
+"continue?</qt>"
 msgstr ""
 
-#: editor/formfile.cpp:146
-msgid "The file already exists. Do you wish to overwrite it?"
+#: executor/main.cpp:47
+msgid ""
+"Executor is a component of the Kommander dialog system that executes .kmdr "
+"files given as arguments or via stdin"
 msgstr ""
 
-#: editor/formfile.cpp:147
-msgid "Overwrite File?"
-msgstr "Trosysgrifo'r Ffeil?"
-
-#: editor/formfile.cpp:147 editor/messagelog.cpp:128
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: executor/main.cpp:52
+msgid "Kommander Executor"
+msgstr ""
 
-#: editor/formfile.cpp:174
-#, kde-format
-msgid "Dialog '%1' was modified.Do you want to save it?"
+#: executor/main.cpp:54
+msgid "(c) 2002, Marc Britton"
 msgstr ""
 
-#: editor/formfile.cpp:175
-msgid "Save File?"
+#: executor/main.cpp:55 editor/main.cpp:40 pluginmanager/main.cpp:49
+msgid "Marc Britton"
 msgstr ""
 
-#: editor/formfile.cpp:232
-msgid "unnamed"
-msgstr "di-enw"
+#: executor/main.cpp:56 editor/main.cpp:42 pluginmanager/main.cpp:51
+msgid "Michal Rudolf"
+msgstr ""
 
-#: editor/actioneditorimpl.cpp:46 editor/mainwindow.cpp:301
-msgid "Actions"
-msgstr "Gweithredoedd"
+#: executor/main.cpp:60
+msgid "Read dialog from standard input"
+msgstr ""
 
-#: editor/actioneditorimpl.cpp:51 editor/actionlistview.cpp:93
-msgid "New &Action"
-msgstr "Gwei&thred Newydd"
+#: executor/main.cpp:61
+msgid "Use given catalog for translation"
+msgstr ""
 
-#: editor/actioneditorimpl.cpp:52 editor/actionlistview.cpp:94
-msgid "New Action &Group"
-msgstr "Grŵp Newydd o Weithredoedd"
+#: executor/main.cpp:62 editor/main.cpp:48
+msgid "Dialog to open"
+msgstr ""
 
-#: editor/actioneditorimpl.cpp:53 editor/actionlistview.cpp:95
-msgid "New &Dropdown Action Group"
+#: executor/main.cpp:85
+msgid ""
+"Error: no dialog given. Use --stdin option to read dialog from standard "
+"input.\n"
 msgstr ""
 
 #: editor/mainwindowactions.cpp:79
@@ -192,7 +205,7 @@
 
 #. i18n: file: editor/listeditor.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, ListEditor)
-#: editor/mainwindowactions.cpp:173 rc.cpp:1145
+#: editor/mainwindowactions.cpp:173 rc.cpp:403
 msgid "Edit"
 msgstr ""
 
@@ -475,43 +488,43 @@
 
 #. i18n: file: editor/formsettings.ui:163
 #. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
-#: editor/mainwindowactions.cpp:578 rc.cpp:518
+#: editor/mainwindowactions.cpp:578 rc.cpp:751
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: editor/newform.ui:58
-#. i18n: ectx: property (text), widget (QPushButton, helpButton)
-#. i18n: file: editor/preferences.ui:453
+#. i18n: file: editor/listvieweditor.ui:570
 #. i18n: ectx: property (text), widget (QPushButton, helpButton)
+#. i18n: file: editor/iconvieweditor.ui:288
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/paletteeditor.ui:309
+#. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
 #. i18n: file: editor/wizardeditor.ui:126
 #. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
+#. i18n: file: editor/pixmapfunction.ui:792
+#. i18n: ectx: property (text), widget (QPushButton, helpButton)
+#. i18n: file: editor/tableeditor.ui:59
+#. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
+#. i18n: file: editor/preferences.ui:453
+#. i18n: ectx: property (text), widget (QPushButton, helpButton)
 #. i18n: file: editor/paletteeditoradvanced.ui:501
 #. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
-#. i18n: file: editor/listboxeditor.ui:58
+#. i18n: file: editor/newform.ui:58
 #. i18n: ectx: property (text), widget (QPushButton, helpButton)
 #. i18n: file: editor/multilineeditor.ui:81
 #. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
-#. i18n: file: editor/tableeditor.ui:59
-#. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
-#. i18n: file: editor/pixmapfunction.ui:792
+#. i18n: file: editor/listboxeditor.ui:58
 #. i18n: ectx: property (text), widget (QPushButton, helpButton)
-#. i18n: file: editor/templates/Tab_Dialog.ui:68
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Configuration_Dialog.ui:86
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:45
 #. i18n: ectx: property (text), widget (QPushButton)
 #. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:70
 #. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:45
+#. i18n: file: editor/templates/Tab_Dialog.ui:68
 #. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/paletteeditor.ui:309
-#. i18n: ectx: property (text), widget (QPushButton, buttonHelp)
-#. i18n: file: editor/iconvieweditor.ui:288
+#. i18n: file: editor/templates/Configuration_Dialog.ui:86
 #. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:570
-#. i18n: ectx: property (text), widget (QPushButton, helpButton)
-#: editor/mainwindowactions.cpp:584 rc.cpp:11 rc.cpp:170 rc.cpp:197 rc.cpp:347
-#: rc.cpp:593 rc.cpp:719 rc.cpp:802 rc.cpp:934 rc.cpp:949 rc.cpp:970
-#: rc.cpp:988 rc.cpp:994 rc.cpp:1048 rc.cpp:1124 rc.cpp:1349
+#: editor/mainwindowactions.cpp:584 rc.cpp:203 rc.cpp:284 rc.cpp:388
+#: rc.cpp:433 rc.cpp:466 rc.cpp:484 rc.cpp:928 rc.cpp:1084 rc.cpp:1105
+#: rc.cpp:1135 rc.cpp:1162 rc.cpp:1252 rc.cpp:1270 rc.cpp:1282 rc.cpp:1303
 msgid "&Help"
 msgstr ""
 
@@ -523,6 +536,10 @@
 msgid "Open a file..."
 msgstr "Agor Ffeil ..."
 
+#: editor/mainwindowactions.cpp:618 editor/formfile.cpp:133
+msgid "*.kmdr|Kommander Files"
+msgstr ""
+
 #: editor/mainwindowactions.cpp:618
 msgid "Open Files"
 msgstr "Agor Ffeiliau"
@@ -565,7 +582,7 @@
 #. i18n: file: editor/createtemplate.ui:32
 #. i18n: ectx: property (windowTitle), widget (QDialog, CreateTemplate)
 #: editor/mainwindowactions.cpp:784 editor/mainwindowactions.cpp:813
-#: rc.cpp:554
+#: rc.cpp:628
 msgid "Create Template"
 msgstr "Creu Patrymlun"
 
@@ -593,233 +610,113 @@
 msgid "Edit preferences..."
 msgstr ""
 
-#: editor/tableeditorimpl.cpp:57
-msgid "<no field>"
+#: editor/multilineeditorimpl.cpp:56
+#, kde-format
+msgid "Set Text of '%1'"
 msgstr ""
 
-#: editor/tableeditorimpl.cpp:317
-#, kde-format
-msgid "Edit Rows and Columns of '%1' "
+#. i18n: file: editor/paletteeditoradvanced.ui:177
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: editor/multilineeditorimpl.cpp:68 editor/mainwindow.cpp:997
+#: editor/mainwindow.cpp:1467 rc.cpp:1003
+msgid "Text"
+msgstr "Testun"
+
+#: editor/resource.cpp:571
+msgid "Paste"
 msgstr ""
 
-#: editor/command.cpp:504 editor/command.cpp:516
-msgid "Set 'name' Property"
+#: editor/sizehandle.cpp:233
+msgid "Resize"
+msgstr "Newid maint"
+
+#: editor/workspace.cpp:233
+msgid "<No Project>"
 msgstr ""
 
-#: editor/command.cpp:505
-#, kde-format
-msgid ""
-"The name of a widget must be unique.\n"
-"'%1' is already used in form '%2',\n"
-"so the name has been reverted to '%3'."
+#: editor/workspace.cpp:363
+msgid "Files"
 msgstr ""
 
-#: editor/command.cpp:517
-#, kde-format
-msgid ""
-"The name of a widget must not be null.\n"
-"The name has been reverted to '%1'."
+#: editor/workspace.cpp:668
+msgid "&Open Source File..."
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:232
-#, kde-format
-msgid "Connect/Disconnect the signals and slots of '%1' and '%2'"
+#: editor/workspace.cpp:671
+msgid "&Remove Source File From Project"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:239 editor/propertyeditor.cpp:3444
-msgid "Remove Connection"
-msgstr "Gwaredu Cysylltiad"
+#: editor/workspace.cpp:675
+msgid "&Open Form..."
+msgstr ""
 
-#: editor/connectioneditorimpl.cpp:240
-msgid "Remove Connections"
+#: editor/workspace.cpp:679 editor/workspace.cpp:689
+msgid "&Remove Form From Project"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:249 editor/propertyeditor.cpp:3494
-msgid "Add Connection"
+#: editor/workspace.cpp:681 editor/workspace.cpp:691
+msgid "&Remove Form"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:251
-msgid "Add Connections"
+#: editor/workspace.cpp:685
+msgid "&Open Form Source..."
 msgstr ""
 
-#: editor/hierarchyview.cpp:105
-msgid "(Constructor)"
+#: editor/actiondnd.cpp:306 editor/actiondnd.cpp:365
+msgid "Delete Toolbar"
 msgstr ""
 
-#: editor/hierarchyview.cpp:107
-msgid "(Destructor)"
+#: editor/actiondnd.cpp:309 editor/actiondnd.cpp:395
+#, kde-format
+msgid "Delete Toolbar '%1'"
 msgstr ""
 
-#: editor/hierarchyview.cpp:195
-msgid "Name"
-msgstr "Enw"
+#: editor/actiondnd.cpp:360 editor/actiondnd.cpp:1032
+msgid "Delete Separator"
+msgstr ""
 
-#: editor/hierarchyview.cpp:196
-msgid "Class"
-msgstr "Dosbarth"
+#. i18n: file: editor/listboxeditor.ui:128
+#. i18n: ectx: property (toolTip), widget (Q3ListBox, preview)
+#. i18n: file: editor/listboxeditor.ui:262
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemDelete)
+#: editor/actiondnd.cpp:362 editor/actiondnd.cpp:747 editor/actiondnd.cpp:1034
+#: rc.cpp:1183 rc.cpp:1234
+msgid "Delete Item"
+msgstr "Dileu Eitem"
 
-#: editor/hierarchyview.cpp:340
-msgid "Database"
-msgstr "Cronfa ddata"
+#: editor/actiondnd.cpp:363 editor/actiondnd.cpp:1035
+msgid "Insert Separator"
+msgstr "Mewnosod Gwahanydd"
 
-#: editor/hierarchyview.cpp:512 editor/hierarchyview.cpp:518
-#: editor/wizardeditorimpl.cpp:112 editor/mainwindow.cpp:1062
-#: editor/mainwindow.cpp:1098
+#: editor/actiondnd.cpp:374 editor/actiondnd.cpp:434 editor/actiondnd.cpp:457
 #, kde-format
-msgid "Add Page to %1"
+msgid "Delete Action '%1' From Toolbar '%2'"
 msgstr ""
 
-#: editor/hierarchyview.cpp:534 editor/hierarchyview.cpp:544
-#: editor/wizardeditorimpl.cpp:130 editor/mainwindow.cpp:1069
-#: editor/mainwindow.cpp:1105
+#: editor/actiondnd.cpp:389
 #, kde-format
-msgid "Delete Page %1 of %2"
-msgstr ""
-
-#: editor/hierarchyview.cpp:601 editor/choosewidgetimpl.cpp:38
-#: editor/mainwindow.cpp:268
-msgid "Widgets"
-msgstr "Celfigion"
-
-#: editor/sizehandle.cpp:233
-msgid "Resize"
-msgstr "Newid maint"
-
-#: editor/main.cpp:31
-msgid "Kommander is a graphical editor of scripted dialogs."
+msgid "Add Separator to Toolbar '%1'"
 msgstr ""
 
-#: editor/main.cpp:33
-msgid "Based on Qt Designer, (C) 2000 Trolltech AS."
+#: editor/actiondnd.cpp:476 editor/actiondnd.cpp:557
+#, kde-format
+msgid "Add Action '%1' to Toolbar '%2'"
 msgstr ""
 
-#: editor/main.cpp:37
-msgid "Kommander"
+#: editor/actiondnd.cpp:550 editor/actiondnd.cpp:1169
+msgid "Insert/Move Action"
 msgstr ""
 
-#: editor/main.cpp:39
-msgid "(C) 2002-2005 Kommander authors"
+#: editor/actiondnd.cpp:551
+#, kde-format
+msgid ""
+"Action '%1' has already been added to this toolbar.\n"
+"An Action may only occur once in a given toolbar."
 msgstr ""
 
-#: editor/main.cpp:40 pluginmanager/main.cpp:49 executor/main.cpp:55
-msgid "Marc Britton"
-msgstr ""
-
-#: editor/main.cpp:40 pluginmanager/main.cpp:49
-msgid "Original author"
-msgstr ""
-
-#: editor/main.cpp:41 pluginmanager/main.cpp:50
-msgid "Eric Laffoon"
-msgstr ""
-
-#: editor/main.cpp:41 pluginmanager/main.cpp:50
-msgid "Project manager"
-msgstr ""
-
-#: editor/main.cpp:42 pluginmanager/main.cpp:51 executor/main.cpp:56
-msgid "Michal Rudolf"
-msgstr ""
-
-#: editor/main.cpp:42 pluginmanager/main.cpp:51
-msgid "Current maintainer"
-msgstr ""
-
-#: editor/main.cpp:43 rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
-
-#: editor/main.cpp:44 rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,"
-
-#: editor/main.cpp:48 executor/main.cpp:62
-msgid "Dialog to open"
-msgstr ""
-
-#: editor/main.cpp:67
-msgid "Kommander Dialog Editor"
-msgstr ""
-
-#: editor/actionlistview.cpp:98
-msgid "&Connect Action..."
-msgstr ""
-
-#: editor/actionlistview.cpp:100
-msgid "Delete Action"
-msgstr "Dileu Gweithred"
-
-#. i18n: file: editor/templates/Configuration_Dialog.ui:31
-#. i18n: ectx: property (text), item, widget (QListBox)
-#: editor/iconvieweditorimpl.cpp:60 editor/listboxeditorimpl.cpp:64
-#: editor/widgetfactory.cpp:847 editor/widgetfactory.cpp:880
-#: editor/widgetfactory.cpp:891 editor/widgetfactory.cpp:1082
-#: editor/widgetfactory.cpp:1168 rc.cpp:961
-msgid "New Item"
-msgstr "Eitem Newydd"
-
-#: editor/iconvieweditorimpl.cpp:127 editor/listboxeditorimpl.cpp:137
-#, kde-format
-msgid "Edit Items of '%1'"
-msgstr ""
-
-#: editor/actiondnd.cpp:306 editor/actiondnd.cpp:365
-msgid "Delete Toolbar"
-msgstr ""
-
-#: editor/actiondnd.cpp:309 editor/actiondnd.cpp:395
-#, kde-format
-msgid "Delete Toolbar '%1'"
-msgstr ""
-
-#: editor/actiondnd.cpp:360 editor/actiondnd.cpp:1032
-msgid "Delete Separator"
-msgstr ""
-
-#. i18n: file: editor/listboxeditor.ui:128
-#. i18n: ectx: property (toolTip), widget (Q3ListBox, preview)
-#. i18n: file: editor/listboxeditor.ui:262
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemDelete)
-#: editor/actiondnd.cpp:362 editor/actiondnd.cpp:747 editor/actiondnd.cpp:1034
-#: rc.cpp:614 rc.cpp:665
-msgid "Delete Item"
-msgstr "Dileu Eitem"
-
-#: editor/actiondnd.cpp:363 editor/actiondnd.cpp:1035
-msgid "Insert Separator"
-msgstr "Mewnosod Gwahanydd"
-
-#: editor/actiondnd.cpp:374 editor/actiondnd.cpp:434 editor/actiondnd.cpp:457
-#, kde-format
-msgid "Delete Action '%1' From Toolbar '%2'"
-msgstr ""
-
-#: editor/actiondnd.cpp:389
-#, kde-format
-msgid "Add Separator to Toolbar '%1'"
-msgstr ""
-
-#: editor/actiondnd.cpp:476 editor/actiondnd.cpp:557
-#, kde-format
-msgid "Add Action '%1' to Toolbar '%2'"
-msgstr ""
-
-#: editor/actiondnd.cpp:550 editor/actiondnd.cpp:1169
-msgid "Insert/Move Action"
-msgstr ""
-
-#: editor/actiondnd.cpp:551
-#, kde-format
-msgid ""
-"Action '%1' has already been added to this toolbar.\n"
-"An Action may only occur once in a given toolbar."
-msgstr ""
-
-#: editor/actiondnd.cpp:683
-#, kde-format
-msgid "Add Widget '%1' to Toolbar '%2'"
+#: editor/actiondnd.cpp:683
+#, kde-format
+msgid "Add Widget '%1' to Toolbar '%2'"
 msgstr ""
 
 #: editor/actiondnd.cpp:748
@@ -871,6 +768,69 @@
 "An Action may only occur once in a given menu."
 msgstr ""
 
+#: editor/functionsimpl.cpp:133
+msgid "<p>Parameters are not obligatory."
+msgstr ""
+
+#: editor/functionsimpl.cpp:135
+#, kde-format
+msgid "<p>Only first argument is obligatory."
+msgid_plural "<p>Only first %1 arguments are obligatory."
+msgstr[0] ""
+msgstr[1] ""
+
+#: editor/functionsimpl.cpp:144
+#, kde-format
+msgid ""
+"<qt><h3>%1</h3><p><b>Description:</b> %2\n"
+"<p><b>Syntax:</b> <i>%3</i>%4</qt>"
+msgstr ""
+
+#: editor/choosewidgetimpl.cpp:38 editor/hierarchyview.cpp:601
+#: editor/mainwindow.cpp:268
+msgid "Widgets"
+msgstr "Celfigion"
+
+#: editor/widgetfactory.cpp:296 editor/widgetfactory.cpp:576
+msgid "Move Tab Page"
+msgstr ""
+
+#. i18n: file: editor/templates/Configuration_Dialog.ui:31
+#. i18n: ectx: property (text), item, widget (QListBox)
+#: editor/widgetfactory.cpp:847 editor/widgetfactory.cpp:880
+#: editor/widgetfactory.cpp:891 editor/widgetfactory.cpp:1082
+#: editor/widgetfactory.cpp:1168 editor/listboxeditorimpl.cpp:64
+#: editor/iconvieweditorimpl.cpp:60 rc.cpp:1294
+msgid "New Item"
+msgstr "Eitem Newydd"
+
+#. i18n: file: editor/listeditor.ui:32
+#. i18n: ectx: property (text), widget (Q3ListView, listview)
+#: editor/widgetfactory.cpp:890 editor/widgetfactory.cpp:1081
+#: editor/widgetfactory.cpp:1167 rc.cpp:406
+msgid "Column 1"
+msgstr ""
+
+#: editor/widgetfactory.cpp:923 editor/widgetfactory.cpp:1125
+msgid "Tab 1"
+msgstr "Tab 1"
+
+#: editor/widgetfactory.cpp:926 editor/widgetfactory.cpp:1128
+msgid "Tab 2"
+msgstr "Tab 2"
+
+#: editor/widgetfactory.cpp:970 editor/wizardeditorimpl.cpp:109
+msgid "Page"
+msgstr ""
+
+#: editor/widgetfactory.cpp:1112
+msgid "Page 1"
+msgstr ""
+
+#: editor/widgetfactory.cpp:1113
+msgid "Page 2"
+msgstr ""
+
 #: editor/formwindow.cpp:315
 msgid "&Horizontal"
 msgstr "&Llorweddol"
@@ -1004,6 +964,45 @@
 msgid "Lay Out Children in a Grid"
 msgstr ""
 
+#: editor/pixmapchooser.cpp:949
+msgid "All Pixmaps"
+msgstr ""
+
+#: editor/pixmapchooser.cpp:952
+#, kde-format
+msgid "%1-Pixmaps (%2)\n"
+msgstr ""
+
+#: editor/pixmapchooser.cpp:958
+msgid "All Files (*)"
+msgstr ""
+
+#. i18n: file: editor/pixmapfunction.ui:32
+#. i18n: ectx: property (windowTitle), widget (QDialog, PixmapFunction)
+#: editor/pixmapchooser.cpp:966 rc.cpp:454
+msgid "Choose Pixmap"
+msgstr ""
+
+#: editor/listboxeditorimpl.cpp:137 editor/iconvieweditorimpl.cpp:127
+#, kde-format
+msgid "Edit Items of '%1'"
+msgstr ""
+
+#: editor/assoctexteditorimpl.cpp:146
+#, kde-format
+msgid "Set the 'text association' of '%1'"
+msgstr ""
+
+#: editor/assoctexteditorimpl.cpp:156
+#, kde-format
+msgid "Set the 'population text' of '%1'"
+msgstr ""
+
+#: editor/assoctexteditorimpl.cpp:279
+#, kde-format
+msgid "<qt>Cannot open file<br><b>%1</b></qt>"
+msgstr ""
+
 #: editor/messagelog.cpp:34
 msgid "Copy Current &Line"
 msgstr ""
@@ -1035,6 +1034,10 @@
 msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
 msgstr ""
 
+#: editor/messagelog.cpp:128 editor/formfile.cpp:147
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
 #: editor/messagelog.cpp:132
 #, kde-format
 msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
@@ -1048,483 +1051,241 @@
 msgid "Stderr"
 msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:146
-#, kde-format
-msgid "Set the 'text association' of '%1'"
-msgstr ""
-
-#: editor/assoctexteditorimpl.cpp:156
+#: editor/formfile.cpp:114
 #, kde-format
-msgid "Set the 'population text' of '%1'"
+msgid ""
+"Failed to save file '%1'.\n"
+"Do you want to use another file name?"
 msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:279
-#, kde-format
-msgid "<qt>Cannot open file<br><b>%1</b></qt>"
+#: editor/formfile.cpp:115
+msgid "Try Another"
 msgstr ""
 
-#: editor/wizardeditorimpl.cpp:62
-msgid "Edit Wizard Pages"
+#: editor/formfile.cpp:115
+msgid "Do Not Try"
 msgstr ""
 
-#: editor/wizardeditorimpl.cpp:109 editor/widgetfactory.cpp:970
-msgid "Page"
+#: editor/formfile.cpp:120
+#, kde-format
+msgid "'%1' saved."
 msgstr ""
 
-#: editor/wizardeditorimpl.cpp:151 editor/wizardeditorimpl.cpp:171
+#: editor/formfile.cpp:134
 #, kde-format
-msgid "Swap Pages %1 and %2 of %3"
+msgid "Save Form '%1' As"
 msgstr ""
 
-#: editor/wizardeditorimpl.cpp:200 editor/mainwindow.cpp:1022
-#: editor/mainwindow.cpp:1119
-msgid "Page Title"
+#: editor/formfile.cpp:146
+msgid "The file already exists. Do you wish to overwrite it?"
 msgstr ""
 
-#: editor/wizardeditorimpl.cpp:200 editor/mainwindow.cpp:1022
-#: editor/mainwindow.cpp:1119
-msgid "New page title:"
-msgstr ""
+#: editor/formfile.cpp:147
+msgid "Overwrite File?"
+msgstr "Trosysgrifo'r Ffeil?"
 
-#: editor/wizardeditorimpl.cpp:202 editor/mainwindow.cpp:1121
+#: editor/formfile.cpp:174
 #, kde-format
-msgid "Rename page %1 of %2"
+msgid "Dialog '%1' was modified.Do you want to save it?"
 msgstr ""
 
-#: editor/resource.cpp:571
-msgid "Paste"
-msgstr ""
-
-#: editor/multilineeditorimpl.cpp:56
-#, kde-format
-msgid "Set Text of '%1'"
+#: editor/formfile.cpp:175
+msgid "Save File?"
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:177
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: editor/multilineeditorimpl.cpp:68 editor/mainwindow.cpp:997
-#: editor/mainwindow.cpp:1467 rc.cpp:266
-msgid "Text"
-msgstr "Testun"
+#: editor/formfile.cpp:232
+msgid "unnamed"
+msgstr "di-enw"
 
-#: editor/mainwindow.cpp:147
-msgid "Welcome to the Kommander Editor"
+#: editor/newformimpl.cpp:116
+msgid "Load Template"
+msgstr "Llwytho Patrymlun"
+
+#: editor/newformimpl.cpp:117
+#, kde-format
+msgid "Could not load form description from template '%1'"
 msgstr ""
 
-#: editor/mainwindow.cpp:154
-msgid "Layout"
-msgstr "Cynllun"
+#: editor/newformimpl.cpp:137
+msgid "Dialog"
+msgstr "Ymgom"
 
-#: editor/mainwindow.cpp:238
-msgid "Properties"
-msgstr ""
+#: editor/newformimpl.cpp:143
+msgid "Wizard"
+msgstr "Dewin"
 
-#: editor/mainwindow.cpp:243 editor/propertyeditor.cpp:3556
-#: editor/propertyeditor.cpp:3596
-msgid "Property Editor"
+#: editor/command.cpp:504 editor/command.cpp:516
+msgid "Set 'name' Property"
 msgstr ""
 
-#: editor/mainwindow.cpp:245
+#: editor/command.cpp:505
+#, kde-format
 msgid ""
-"<h2>The Property Editor</h2><p>You can change the appearance and behavior of "
-"the selected widget in the property editor.</p><p>You can set properties for "
-"components and forms at design time and see the immediately see the effects "
-"of the changes. Each property has its own editor which (depending on the "
-"property) can be used to enter new values, open a special dialog, or to "
-"select values from a predefined list. Click <b>F1</b> to get detailed help "
-"for the selected property.</p><p>You can resize the columns of the editor by "
-"dragging the separators in the list's header.</p><p><b>Signal "
-"Handlers</b></p><p>In the Signal Handlers tab you can define connections "
-"between the signals emitted by widgets and the slots in the form. (These "
-"connections can also be made using the connection tool.)"
+"The name of a widget must be unique.\n"
+"'%1' is already used in form '%2',\n"
+"so the name has been reverted to '%3'."
 msgstr ""
 
-#: editor/mainwindow.cpp:271
-msgid "Object Explorer"
+#: editor/command.cpp:517
+#, kde-format
+msgid ""
+"The name of a widget must not be null.\n"
+"The name has been reverted to '%1'."
 msgstr ""
 
-#: editor/mainwindow.cpp:273
-msgid ""
-"<h2>The Object Explorer</h2><p>The Object Explorer provides an overview of "
-"the relationships between the widgets in a form. You can use the clipboard "
-"functions using a context menu for each item in the view. It is also useful "
-"for selecting widgets in forms that have complex layouts.</p><p>The columns "
-"can be resized by dragging the separator in the list's header.</p><p>The "
-"second tab shows all the form's slots, class variables, includes, etc.</p>"
+#: editor/listvieweditorimpl.cpp:69
+#, kde-format
+msgid "Edit Items and Columns of '%1'"
 msgstr ""
 
-#: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
-msgid "Dialogs"
+#: editor/listvieweditorimpl.cpp:228
+msgid "New Column"
+msgstr "Colofn Newydd"
+
+#. i18n: file: editor/listvieweditor.ui:51
+#. i18n: ectx: attribute (title), widget (QWidget, Widget10)
+#: editor/listvieweditorimpl.cpp:573 rc.cpp:23
+msgid "&Items"
+msgstr "&Eitemau"
+
+#: editor/wizardeditorimpl.cpp:62
+msgid "Edit Wizard Pages"
 msgstr ""
 
-#: editor/mainwindow.cpp:287
-msgid "Start typing the buffer you want to switch to here (ALT+B)"
+#: editor/wizardeditorimpl.cpp:112 editor/hierarchyview.cpp:512
+#: editor/hierarchyview.cpp:518 editor/mainwindow.cpp:1062
+#: editor/mainwindow.cpp:1098
+#, kde-format
+msgid "Add Page to %1"
 msgstr ""
 
-#: editor/mainwindow.cpp:294
-msgid ""
-"<h2>The File Overview Window</h2><p>The File Overview Window displays all "
-"open dialogs.</p>"
+#: editor/wizardeditorimpl.cpp:130 editor/hierarchyview.cpp:534
+#: editor/hierarchyview.cpp:544 editor/mainwindow.cpp:1069
+#: editor/mainwindow.cpp:1105
+#, kde-format
+msgid "Delete Page %1 of %2"
 msgstr ""
 
-#: editor/mainwindow.cpp:305
-msgid "Action Editor"
+#: editor/wizardeditorimpl.cpp:151 editor/wizardeditorimpl.cpp:171
+#, kde-format
+msgid "Swap Pages %1 and %2 of %3"
 msgstr ""
 
-#: editor/mainwindow.cpp:306
-msgid ""
-"<b>The Action Editor</b><p>The Action Editor is used to add actions and "
-"action groups to a form, and to connect actions to slots. Actions and action "
-"groups can be dragged into menus and into toolbars, and may feature keyboard "
-"shortcuts and tooltips. If actions have pixmaps these are displayed on "
-"toolbar buttons and beside their names in menus.</p>"
+#: editor/wizardeditorimpl.cpp:200 editor/mainwindow.cpp:1022
+#: editor/mainwindow.cpp:1119
+msgid "Page Title"
 msgstr ""
 
-#: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
-msgid "Message Log"
+#: editor/wizardeditorimpl.cpp:200 editor/mainwindow.cpp:1022
+#: editor/mainwindow.cpp:1119
+msgid "New page title:"
 msgstr ""
 
-#: editor/mainwindow.cpp:379
-msgid "There is a dialog already running."
+#: editor/wizardeditorimpl.cpp:202 editor/mainwindow.cpp:1121
+#, kde-format
+msgid "Rename page %1 of %2"
 msgstr ""
 
-#: editor/mainwindow.cpp:379
-msgid "Run"
-msgstr "Rhedeg"
+#: editor/hierarchyview.cpp:105
+msgid "(Constructor)"
+msgstr ""
 
-#: editor/mainwindow.cpp:704
-msgid ""
-"<b>The Form Window</b><p>Use the various tools to add widgets or to change "
-"the layout and behavior of the components in the form. Select one or "
-"multiple widgets to move them or lay them out. If a single widget is chosen "
-"it can be resized using the resize handles.</p><p>Changes in the <b>Property "
-"Editor</b> are visible at design time, and you can preview the form in "
-"different styles.</p><p>You can change the grid resolution, or turn the grid "
-"off in the <b>Preferences</b> dialog from the <b>Edit</b> menu.<p>You can "
-"have several forms open, and all open forms are listed in the <b>Form "
-"List</b>."
+#: editor/hierarchyview.cpp:107
+msgid "(Destructor)"
 msgstr ""
 
-#: editor/mainwindow.cpp:809
-#, kde-format
-msgid "&Undo: %1"
-msgstr "&Dadwneud: %1"
+#: editor/hierarchyview.cpp:195
+msgid "Name"
+msgstr "Enw"
 
-#: editor/mainwindow.cpp:813
-#, kde-format
-msgid "&Redo: %1"
-msgstr "&Ail-wneud: %1"
+#: editor/hierarchyview.cpp:196
+msgid "Class"
+msgstr "Dosbarth"
 
-#: editor/mainwindow.cpp:892
-msgid "Choose Pixmap..."
-msgstr ""
+#: editor/hierarchyview.cpp:340
+msgid "Database"
+msgstr "Cronfa ddata"
 
-#: editor/mainwindow.cpp:896
-msgid "Edit Text..."
+#: editor/widgetdatabase.cpp:139
+msgid "Push Button"
+msgstr "Gwasgu Botwm"
+
+#: editor/widgetdatabase.cpp:146
+msgid "Tool Button"
+msgstr "Botwm Offer"
+
+#: editor/widgetdatabase.cpp:153
+msgid "Radio Button"
+msgstr "Botwm radio"
+
+#: editor/widgetdatabase.cpp:160
+msgid "Check Box"
+msgstr "Blwch Britho"
+
+#: editor/widgetdatabase.cpp:167
+msgid "Group Box"
 msgstr ""
 
-#: editor/mainwindow.cpp:900
-msgid "Edit Title..."
+#: editor/widgetdatabase.cpp:175
+msgid "Button Group"
+msgstr "Casgliad Botymau"
+
+#: editor/widgetdatabase.cpp:183
+msgid "Frame"
+msgstr "Ffrâm"
+
+#: editor/widgetdatabase.cpp:191
+msgid "Tabwidget"
 msgstr ""
 
-#: editor/mainwindow.cpp:904 editor/mainwindow.cpp:972
-msgid "Edit Page Title..."
+#: editor/widgetdatabase.cpp:199 editor/widgetdatabase.cpp:526
+msgid "List Box"
 msgstr ""
 
-#: editor/mainwindow.cpp:920 editor/mainwindow.cpp:955
-msgid "Edit Kommander Text..."
+#: editor/widgetdatabase.cpp:206
+msgid "List View"
 msgstr ""
 
-#: editor/mainwindow.cpp:929 editor/mainwindow.cpp:965
-#: editor/mainwindow.cpp:1389
-msgid "Delete Page"
-msgstr "Dileu Tudalen"
+#: editor/widgetdatabase.cpp:214
+msgid "Icon View"
+msgstr "Golwg Eicon"
 
-#: editor/mainwindow.cpp:932 editor/mainwindow.cpp:969
-#: editor/mainwindow.cpp:1388
-msgid "Add Page"
+#: editor/widgetdatabase.cpp:223 editor/propertyeditor.cpp:1908
+#: editor/propertyeditor.cpp:1942
+msgid "Table"
+msgstr "Tabl"
+
+#: editor/widgetdatabase.cpp:233
+msgid "Data Table"
 msgstr ""
 
-#: editor/mainwindow.cpp:939
-msgid "Edit..."
-msgstr "Golygu..."
+#: editor/widgetdatabase.cpp:241
+msgid "Line Edit"
+msgstr "Golygu Llinell"
 
-#: editor/mainwindow.cpp:975
-msgid "Edit Pages..."
+#: editor/widgetdatabase.cpp:248
+msgid "Spin Box"
 msgstr ""
 
-#: editor/mainwindow.cpp:981
-msgid "Add Menu Item"
+#: editor/widgetdatabase.cpp:255
+msgid "Date Edit"
 msgstr ""
 
-#: editor/mainwindow.cpp:983
-msgid "Add Toolbar"
+#: editor/widgetdatabase.cpp:263
+msgid "Time Edit"
 msgstr ""
 
-#: editor/mainwindow.cpp:997 editor/mainwindow.cpp:1467
-msgid "New text:"
-msgstr "Testun Newydd :"
+#: editor/widgetdatabase.cpp:271
+msgid "Date-Time Edit"
+msgstr ""
 
-#: editor/mainwindow.cpp:1000 editor/mainwindow.cpp:1470
-#, kde-format
-msgid "Set the 'text' of '%1'"
+#: editor/widgetdatabase.cpp:279
+msgid "Multi Line Edit"
 msgstr ""
 
-#: editor/mainwindow.cpp:1010 editor/mainwindow.cpp:1483
-msgid "Title"
-msgstr "Teitl"
-
-#: editor/mainwindow.cpp:1010 editor/mainwindow.cpp:1483
-msgid "New title:"
-msgstr "Teitl newydd:"
-
-#: editor/mainwindow.cpp:1012 editor/mainwindow.cpp:1485
-#, kde-format
-msgid "Set the 'title' of '%1'"
-msgstr ""
-
-#: editor/mainwindow.cpp:1024
-#, kde-format
-msgid "Set the 'pageTitle' of '%1'"
-msgstr ""
-
-#: editor/mainwindow.cpp:1036
-#, kde-format
-msgid "Set the 'pixmap' of '%1'"
-msgstr ""
-
-#: editor/mainwindow.cpp:1131
-#, kde-format
-msgid "Add Toolbar to '%1'"
-msgstr ""
-
-#: editor/mainwindow.cpp:1135
-#, kde-format
-msgid "Add Menu to '%1'"
-msgstr ""
-
-#: editor/mainwindow.cpp:1452
-#, kde-format
-msgid "Edit %1..."
-msgstr "Golygu %1 ..."
-
-#: editor/mainwindow.cpp:1573
-msgid ""
-"Kommander found some temporary saved files, which were\n"
-"written when Kommander crashed last time. Do you want to\n"
-"load these files?"
-msgstr ""
-
-#: editor/mainwindow.cpp:1575
-msgid "Restoring Last Session"
-msgstr ""
-
-#: editor/mainwindow.cpp:1575
-msgid "Load"
-msgstr "Llwytho"
-
-#: editor/mainwindow.cpp:1575
-msgid "Do Not Load"
-msgstr ""
-
-#: editor/mainwindow.cpp:1628
-msgid "There is no help available for this dialog at the moment."
-msgstr ""
-
-#: editor/mainwindow.cpp:1628
-msgid "Help"
-msgstr ""
-
-#: editor/mainwindow.cpp:1642
-#, kde-format
-msgid "<qt>Could not open file:<br><b>%1</b><br>File does not exist.</qt>"
-msgstr ""
-
-#: editor/mainwindow.cpp:1643
-msgid "Open File"
-msgstr "Agor Ffeil"
-
-#: editor/workspace.cpp:233
-msgid "<No Project>"
-msgstr ""
-
-#: editor/workspace.cpp:363
-msgid "Files"
-msgstr ""
-
-#: editor/workspace.cpp:668
-msgid "&Open Source File..."
-msgstr ""
-
-#: editor/workspace.cpp:671
-msgid "&Remove Source File From Project"
-msgstr ""
-
-#: editor/workspace.cpp:675
-msgid "&Open Form..."
-msgstr ""
-
-#: editor/workspace.cpp:679 editor/workspace.cpp:689
-msgid "&Remove Form From Project"
-msgstr ""
-
-#: editor/workspace.cpp:681 editor/workspace.cpp:691
-msgid "&Remove Form"
-msgstr ""
-
-#: editor/workspace.cpp:685
-msgid "&Open Form Source..."
-msgstr ""
-
-#: editor/pixmapchooser.cpp:949
-msgid "All Pixmaps"
-msgstr ""
-
-#: editor/pixmapchooser.cpp:952
-#, kde-format
-msgid "%1-Pixmaps (%2)\n"
-msgstr ""
-
-#: editor/pixmapchooser.cpp:958
-msgid "All Files (*)"
-msgstr ""
-
-#. i18n: file: editor/pixmapfunction.ui:32
-#. i18n: ectx: property (windowTitle), widget (QDialog, PixmapFunction)
-#: editor/pixmapchooser.cpp:966 rc.cpp:922
-msgid "Choose Pixmap"
-msgstr ""
-
-#: editor/listvieweditorimpl.cpp:69
-#, kde-format
-msgid "Edit Items and Columns of '%1'"
-msgstr ""
-
-#: editor/listvieweditorimpl.cpp:228
-msgid "New Column"
-msgstr "Colofn Newydd"
-
-#. i18n: file: editor/listvieweditor.ui:51
-#. i18n: ectx: attribute (title), widget (QWidget, Widget10)
-#: editor/listvieweditorimpl.cpp:573 rc.cpp:1169
-msgid "&Items"
-msgstr "&Eitemau"
-
-#: editor/newformimpl.cpp:116
-msgid "Load Template"
-msgstr "Llwytho Patrymlun"
-
-#: editor/newformimpl.cpp:117
-#, kde-format
-msgid "Could not load form description from template '%1'"
-msgstr ""
-
-#: editor/newformimpl.cpp:137
-msgid "Dialog"
-msgstr "Ymgom"
-
-#: editor/newformimpl.cpp:143
-msgid "Wizard"
-msgstr "Dewin"
-
-#: editor/functionsimpl.cpp:133
-msgid "<p>Parameters are not obligatory."
-msgstr ""
-
-#: editor/functionsimpl.cpp:135
-#, kde-format
-msgid "<p>Only first argument is obligatory."
-msgid_plural "<p>Only first %1 arguments are obligatory."
-msgstr[0] ""
-msgstr[1] ""
-
-#: editor/functionsimpl.cpp:144
-#, kde-format
-msgid ""
-"<qt><h3>%1</h3><p><b>Description:</b> %2\n"
-"<p><b>Syntax:</b> <i>%3</i>%4</qt>"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:139
-msgid "Push Button"
-msgstr "Gwasgu Botwm"
-
-#: editor/widgetdatabase.cpp:146
-msgid "Tool Button"
-msgstr "Botwm Offer"
-
-#: editor/widgetdatabase.cpp:153
-msgid "Radio Button"
-msgstr "Botwm radio"
-
-#: editor/widgetdatabase.cpp:160
-msgid "Check Box"
-msgstr "Blwch Britho"
-
-#: editor/widgetdatabase.cpp:167
-msgid "Group Box"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:175
-msgid "Button Group"
-msgstr "Casgliad Botymau"
-
-#: editor/widgetdatabase.cpp:183
-msgid "Frame"
-msgstr "Ffrâm"
-
-#: editor/widgetdatabase.cpp:191
-msgid "Tabwidget"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:199 editor/widgetdatabase.cpp:526
-msgid "List Box"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:206
-msgid "List View"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:214
-msgid "Icon View"
-msgstr "Golwg Eicon"
-
-#: editor/widgetdatabase.cpp:223 editor/propertyeditor.cpp:1908
-#: editor/propertyeditor.cpp:1942
-msgid "Table"
-msgstr "Tabl"
-
-#: editor/widgetdatabase.cpp:233
-msgid "Data Table"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:241
-msgid "Line Edit"
-msgstr "Golygu Llinell"
-
-#: editor/widgetdatabase.cpp:248
-msgid "Spin Box"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:255
-msgid "Date Edit"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:263
-msgid "Time Edit"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:271
-msgid "Date-Time Edit"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:279
-msgid "Multi Line Edit"
-msgstr ""
-
-#: editor/widgetdatabase.cpp:286
-msgid "Rich Text Edit"
-msgstr ""
+#: editor/widgetdatabase.cpp:286
+msgid "Rich Text Edit"
+msgstr ""
 
 #: editor/widgetdatabase.cpp:293
 msgid "Combo Box"
@@ -1670,179 +1431,420 @@
 msgid "A timer for running scripts periodically"
 msgstr ""
 
-#: editor/propertyeditor.cpp:420
-msgid "Reset the property to its default value"
+#: editor/mainwindow.cpp:147
+msgid "Welcome to the Kommander Editor"
 msgstr ""
 
-#: editor/propertyeditor.cpp:421
-msgid "Click this button to reset the property to its default value"
+#: editor/mainwindow.cpp:154
+msgid "Layout"
+msgstr "Cynllun"
+
+#: editor/mainwindow.cpp:238
+msgid "Properties"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:382
-#. i18n: ectx: property (text), widget (QToolButton, buttonDocPath)
-#. i18n: file: editor/listboxeditor.ui:201
-#. i18n: ectx: property (text), widget (QPushButton, itemChoosePixmap)
-#. i18n: file: editor/assoctexteditor.ui:46
-#. i18n: ectx: property (text), widget (QPushButton, treeWidgetButton)
-#. i18n: file: editor/tableeditor.ui:287
-#. i18n: ectx: property (text), widget (QPushButton, buttonChooseColPixmap)
-#. i18n: file: editor/tableeditor.ui:537
-#. i18n: ectx: property (text), widget (QPushButton, buttonChooseRowPixmap)
-#. i18n: file: editor/iconvieweditor.ui:254
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:205
-#. i18n: ectx: property (text), widget (QPushButton, itemChoosePixmap)
-#. i18n: file: editor/listvieweditor.ui:412
-#. i18n: ectx: property (text), widget (QPushButton, colChoosePixmap)
-#: editor/propertyeditor.cpp:609 rc.cpp:140 rc.cpp:635 rc.cpp:689 rc.cpp:856
-#: rc.cpp:913 rc.cpp:1115 rc.cpp:1214 rc.cpp:1286
-msgid "..."
-msgstr "..."
+#: editor/mainwindow.cpp:243 editor/propertyeditor.cpp:3556
+#: editor/propertyeditor.cpp:3596
+msgid "Property Editor"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1085 editor/propertyeditor.cpp:1146
-msgid "False"
-msgstr "Ffug"
+#: editor/mainwindow.cpp:245
+msgid ""
+"<h2>The Property Editor</h2><p>You can change the appearance and behavior of "
+"the selected widget in the property editor.</p><p>You can set properties for "
+"components and forms at design time and see the immediately see the effects "
+"of the changes. Each property has its own editor which (depending on the "
+"property) can be used to enter new values, open a special dialog, or to "
+"select values from a predefined list. Click <b>F1</b> to get detailed help "
+"for the selected property.</p><p>You can resize the columns of the editor by "
+"dragging the separators in the list's header.</p><p><b>Signal "
+"Handlers</b></p><p>In the Signal Handlers tab you can define connections "
+"between the signals emitted by widgets and the slots in the form. (These "
+"connections can also be made using the connection tool.)"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1086 editor/propertyeditor.cpp:1144
-msgid "True"
-msgstr "Gwir"
+#: editor/mainwindow.cpp:271
+msgid "Object Explorer"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1424 editor/propertyeditor.cpp:1442
-#: editor/propertyeditor.cpp:1521 editor/propertyeditor.cpp:1532
-msgid "x"
-msgstr "x"
+#: editor/mainwindow.cpp:273
+msgid ""
+"<h2>The Object Explorer</h2><p>The Object Explorer provides an overview of "
+"the relationships between the widgets in a form. You can use the clipboard "
+"functions using a context menu for each item in the view. It is also useful "
+"for selecting widgets in forms that have complex layouts.</p><p>The columns "
+"can be resized by dragging the separator in the list's header.</p><p>The "
+"second tab shows all the form's slots, class variables, includes, etc.</p>"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1426 editor/propertyeditor.cpp:1447
-#: editor/propertyeditor.cpp:1523 editor/propertyeditor.cpp:1534
-msgid "y"
-msgstr "y"
+#: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
+msgid "Dialogs"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1430 editor/propertyeditor.cpp:1452
-#: editor/propertyeditor.cpp:1525 editor/propertyeditor.cpp:1539
-msgid "width"
-msgstr "lled"
+#: editor/mainwindow.cpp:287
+msgid "Start typing the buffer you want to switch to here (ALT+B)"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1432 editor/propertyeditor.cpp:1457
-#: editor/propertyeditor.cpp:1527 editor/propertyeditor.cpp:1541
-msgid "height"
-msgstr "taldra"
+#: editor/mainwindow.cpp:294
+msgid ""
+"<h2>The File Overview Window</h2><p>The File Overview Window displays all "
+"open dialogs.</p>"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1661 editor/propertyeditor.cpp:1674
-#: editor/propertyeditor.cpp:1724
-msgid "Red"
-msgstr "Coch"
+#: editor/mainwindow.cpp:301 editor/actioneditorimpl.cpp:46
+msgid "Actions"
+msgstr "Gweithredoedd"
 
-#: editor/propertyeditor.cpp:1663 editor/propertyeditor.cpp:1676
-#: editor/propertyeditor.cpp:1726
-msgid "Green"
-msgstr "Gwyrdd"
+#: editor/mainwindow.cpp:305
+msgid "Action Editor"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1665 editor/propertyeditor.cpp:1678
-#: editor/propertyeditor.cpp:1728
-msgid "Blue"
-msgstr "Glas"
+#: editor/mainwindow.cpp:306
+msgid ""
+"<b>The Action Editor</b><p>The Action Editor is used to add actions and "
+"action groups to a form, and to connect actions to slots. Actions and action "
+"groups can be dragged into menus and into toolbars, and may feature keyboard "
+"shortcuts and tooltips. If actions have pixmaps these are displayed on "
+"toolbar buttons and beside their names in menus.</p>"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1782 editor/propertyeditor.cpp:1801
-#: editor/propertyeditor.cpp:1866
-msgid "Family"
-msgstr "Teulu"
+#: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
+msgid "Message Log"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1784 editor/propertyeditor.cpp:1804
-#: editor/propertyeditor.cpp:1868
-msgid "Point Size"
+#: editor/mainwindow.cpp:379
+msgid "There is a dialog already running."
 msgstr ""
 
-#: editor/propertyeditor.cpp:1786 editor/propertyeditor.cpp:1806
-#: editor/propertyeditor.cpp:1870
-msgid "Bold"
-msgstr "Trwm"
+#: editor/mainwindow.cpp:379
+msgid "Run"
+msgstr "Rhedeg"
 
-#: editor/propertyeditor.cpp:1788 editor/propertyeditor.cpp:1808
-#: editor/propertyeditor.cpp:1872
-msgid "Italic"
+#: editor/mainwindow.cpp:704
+msgid ""
+"<b>The Form Window</b><p>Use the various tools to add widgets or to change "
+"the layout and behavior of the components in the form. Select one or "
+"multiple widgets to move them or lay them out. If a single widget is chosen "
+"it can be resized using the resize handles.</p><p>Changes in the <b>Property "
+"Editor</b> are visible at design time, and you can preview the form in "
+"different styles.</p><p>You can change the grid resolution, or turn the grid "
+"off in the <b>Preferences</b> dialog from the <b>Edit</b> menu.<p>You can "
+"have several forms open, and all open forms are listed in the <b>Form "
+"List</b>."
 msgstr ""
 
-#: editor/propertyeditor.cpp:1790 editor/propertyeditor.cpp:1810
-#: editor/propertyeditor.cpp:1874
-msgid "Underline"
-msgstr "Tanlinellu"
-
-#: editor/propertyeditor.cpp:1792 editor/propertyeditor.cpp:1812
-#: editor/propertyeditor.cpp:1876
-msgid "Strikeout"
-msgstr "Trwylinellu"
+#: editor/mainwindow.cpp:809
+#, kde-format
+msgid "&Undo: %1"
+msgstr "&Dadwneud: %1"
 
-#: editor/propertyeditor.cpp:1906 editor/propertyeditor.cpp:1924
-msgid "Connection"
-msgstr "Cysylltiad"
+#: editor/mainwindow.cpp:813
+#, kde-format
+msgid "&Redo: %1"
+msgstr "&Ail-wneud: %1"
 
-#: editor/propertyeditor.cpp:1911 editor/propertyeditor.cpp:1965
-msgid "Field"
-msgstr "Maes"
+#: editor/mainwindow.cpp:892
+msgid "Choose Pixmap..."
+msgstr ""
 
-#: editor/propertyeditor.cpp:2073 editor/propertyeditor.cpp:2091
-#: editor/propertyeditor.cpp:2141
-msgid "hSizeType"
+#: editor/mainwindow.cpp:896
+msgid "Edit Text..."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2076 editor/propertyeditor.cpp:2093
-#: editor/propertyeditor.cpp:2143
-msgid "vSizeType"
+#: editor/mainwindow.cpp:900
+msgid "Edit Title..."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2079 editor/propertyeditor.cpp:2095
-#: editor/propertyeditor.cpp:2145
-msgid "horizontalStretch"
+#: editor/mainwindow.cpp:904 editor/mainwindow.cpp:972
+msgid "Edit Page Title..."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2081 editor/propertyeditor.cpp:2097
-#: editor/propertyeditor.cpp:2147
-msgid "verticalStretch"
+#: editor/mainwindow.cpp:920 editor/mainwindow.cpp:955
+msgid "Edit Kommander Text..."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2268
-msgid "Arrow"
-msgstr "Saeth"
+#: editor/mainwindow.cpp:929 editor/mainwindow.cpp:965
+#: editor/mainwindow.cpp:1389
+msgid "Delete Page"
+msgstr "Dileu Tudalen"
 
-#: editor/propertyeditor.cpp:2272
-msgid "Up-Arrow"
+#: editor/mainwindow.cpp:932 editor/mainwindow.cpp:969
+#: editor/mainwindow.cpp:1388
+msgid "Add Page"
 msgstr ""
 
-#: editor/propertyeditor.cpp:2276
-msgid "Cross"
-msgstr "Croes"
-
-#: editor/propertyeditor.cpp:2280
-msgid "Waiting"
-msgstr "Aros"
+#: editor/mainwindow.cpp:939
+msgid "Edit..."
+msgstr "Golygu..."
 
-#: editor/propertyeditor.cpp:2284
-msgid "iBeam"
-msgstr "iTrawst"
+#: editor/mainwindow.cpp:975
+msgid "Edit Pages..."
+msgstr ""
 
-#: editor/propertyeditor.cpp:2288
-msgid "Size Vertical"
-msgstr "Maint Fertigol"
+#: editor/mainwindow.cpp:981
+msgid "Add Menu Item"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2292
-msgid "Size Horizontal"
-msgstr "Maint Llorweddol"
+#: editor/mainwindow.cpp:983
+msgid "Add Toolbar"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2296
-msgid "Size Slash"
-msgstr "Maint Slaes"
+#: editor/mainwindow.cpp:997 editor/mainwindow.cpp:1467
+msgid "New text:"
+msgstr "Testun Newydd :"
 
-#: editor/propertyeditor.cpp:2300
-msgid "Size Backslash"
-msgstr "Maint Slaes Ôl"
+#: editor/mainwindow.cpp:1000 editor/mainwindow.cpp:1470
+#, kde-format
+msgid "Set the 'text' of '%1'"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2304
-msgid "Size All"
-msgstr "Maint Popeth"
+#: editor/mainwindow.cpp:1010 editor/mainwindow.cpp:1483
+msgid "Title"
+msgstr "Teitl"
 
-#: editor/propertyeditor.cpp:2308
-msgid "Blank"
-msgstr "Gwag"
+#: editor/mainwindow.cpp:1010 editor/mainwindow.cpp:1483
+msgid "New title:"
+msgstr "Teitl newydd:"
+
+#: editor/mainwindow.cpp:1012 editor/mainwindow.cpp:1485
+#, kde-format
+msgid "Set the 'title' of '%1'"
+msgstr ""
+
+#: editor/mainwindow.cpp:1024
+#, kde-format
+msgid "Set the 'pageTitle' of '%1'"
+msgstr ""
+
+#: editor/mainwindow.cpp:1036
+#, kde-format
+msgid "Set the 'pixmap' of '%1'"
+msgstr ""
+
+#: editor/mainwindow.cpp:1131
+#, kde-format
+msgid "Add Toolbar to '%1'"
+msgstr ""
+
+#: editor/mainwindow.cpp:1135
+#, kde-format
+msgid "Add Menu to '%1'"
+msgstr ""
+
+#: editor/mainwindow.cpp:1452
+#, kde-format
+msgid "Edit %1..."
+msgstr "Golygu %1 ..."
+
+#: editor/mainwindow.cpp:1573
+msgid ""
+"Kommander found some temporary saved files, which were\n"
+"written when Kommander crashed last time. Do you want to\n"
+"load these files?"
+msgstr ""
+
+#: editor/mainwindow.cpp:1575
+msgid "Restoring Last Session"
+msgstr ""
+
+#: editor/mainwindow.cpp:1575
+msgid "Load"
+msgstr "Llwytho"
+
+#: editor/mainwindow.cpp:1575
+msgid "Do Not Load"
+msgstr ""
+
+#: editor/mainwindow.cpp:1628
+msgid "There is no help available for this dialog at the moment."
+msgstr ""
+
+#: editor/mainwindow.cpp:1628
+msgid "Help"
+msgstr ""
+
+#: editor/mainwindow.cpp:1642
+#, kde-format
+msgid "<qt>Could not open file:<br><b>%1</b><br>File does not exist.</qt>"
+msgstr ""
+
+#: editor/mainwindow.cpp:1643
+msgid "Open File"
+msgstr "Agor Ffeil"
+
+#: editor/propertyeditor.cpp:420
+msgid "Reset the property to its default value"
+msgstr ""
+
+#: editor/propertyeditor.cpp:421
+msgid "Click this button to reset the property to its default value"
+msgstr ""
+
+#. i18n: file: editor/listvieweditor.ui:205
+#. i18n: ectx: property (text), widget (QPushButton, itemChoosePixmap)
+#. i18n: file: editor/listvieweditor.ui:412
+#. i18n: ectx: property (text), widget (QPushButton, colChoosePixmap)
+#. i18n: file: editor/iconvieweditor.ui:254
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/tableeditor.ui:287
+#. i18n: ectx: property (text), widget (QPushButton, buttonChooseColPixmap)
+#. i18n: file: editor/tableeditor.ui:537
+#. i18n: ectx: property (text), widget (QPushButton, buttonChooseRowPixmap)
+#. i18n: file: editor/assoctexteditor.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, treeWidgetButton)
+#. i18n: file: editor/preferences.ui:382
+#. i18n: ectx: property (text), widget (QToolButton, buttonDocPath)
+#. i18n: file: editor/listboxeditor.ui:201
+#. i18n: ectx: property (text), widget (QPushButton, itemChoosePixmap)
+#: editor/propertyeditor.cpp:609 rc.cpp:68 rc.cpp:140 rc.cpp:275 rc.cpp:538
+#: rc.cpp:595 rc.cpp:610 rc.cpp:898 rc.cpp:1204
+msgid "..."
+msgstr "..."
+
+#: editor/propertyeditor.cpp:1085 editor/propertyeditor.cpp:1146
+msgid "False"
+msgstr "Ffug"
+
+#: editor/propertyeditor.cpp:1086 editor/propertyeditor.cpp:1144
+msgid "True"
+msgstr "Gwir"
+
+#: editor/propertyeditor.cpp:1424 editor/propertyeditor.cpp:1442
+#: editor/propertyeditor.cpp:1521 editor/propertyeditor.cpp:1532
+msgid "x"
+msgstr "x"
+
+#: editor/propertyeditor.cpp:1426 editor/propertyeditor.cpp:1447
+#: editor/propertyeditor.cpp:1523 editor/propertyeditor.cpp:1534
+msgid "y"
+msgstr "y"
+
+#: editor/propertyeditor.cpp:1430 editor/propertyeditor.cpp:1452
+#: editor/propertyeditor.cpp:1525 editor/propertyeditor.cpp:1539
+msgid "width"
+msgstr "lled"
+
+#: editor/propertyeditor.cpp:1432 editor/propertyeditor.cpp:1457
+#: editor/propertyeditor.cpp:1527 editor/propertyeditor.cpp:1541
+msgid "height"
+msgstr "taldra"
+
+#: editor/propertyeditor.cpp:1661 editor/propertyeditor.cpp:1674
+#: editor/propertyeditor.cpp:1724
+msgid "Red"
+msgstr "Coch"
+
+#: editor/propertyeditor.cpp:1663 editor/propertyeditor.cpp:1676
+#: editor/propertyeditor.cpp:1726
+msgid "Green"
+msgstr "Gwyrdd"
+
+#: editor/propertyeditor.cpp:1665 editor/propertyeditor.cpp:1678
+#: editor/propertyeditor.cpp:1728
+msgid "Blue"
+msgstr "Glas"
+
+#: editor/propertyeditor.cpp:1782 editor/propertyeditor.cpp:1801
+#: editor/propertyeditor.cpp:1866
+msgid "Family"
+msgstr "Teulu"
+
+#: editor/propertyeditor.cpp:1784 editor/propertyeditor.cpp:1804
+#: editor/propertyeditor.cpp:1868
+msgid "Point Size"
+msgstr ""
+
+#: editor/propertyeditor.cpp:1786 editor/propertyeditor.cpp:1806
+#: editor/propertyeditor.cpp:1870
+msgid "Bold"
+msgstr "Trwm"
+
+#: editor/propertyeditor.cpp:1788 editor/propertyeditor.cpp:1808
+#: editor/propertyeditor.cpp:1872
+msgid "Italic"
+msgstr ""
+
+#: editor/propertyeditor.cpp:1790 editor/propertyeditor.cpp:1810
+#: editor/propertyeditor.cpp:1874
+msgid "Underline"
+msgstr "Tanlinellu"
+
+#: editor/propertyeditor.cpp:1792 editor/propertyeditor.cpp:1812
+#: editor/propertyeditor.cpp:1876
+msgid "Strikeout"
+msgstr "Trwylinellu"
+
+#: editor/propertyeditor.cpp:1906 editor/propertyeditor.cpp:1924
+msgid "Connection"
+msgstr "Cysylltiad"
+
+#: editor/propertyeditor.cpp:1911 editor/propertyeditor.cpp:1965
+msgid "Field"
+msgstr "Maes"
+
+#: editor/propertyeditor.cpp:2073 editor/propertyeditor.cpp:2091
+#: editor/propertyeditor.cpp:2141
+msgid "hSizeType"
+msgstr ""
+
+#: editor/propertyeditor.cpp:2076 editor/propertyeditor.cpp:2093
+#: editor/propertyeditor.cpp:2143
+msgid "vSizeType"
+msgstr ""
+
+#: editor/propertyeditor.cpp:2079 editor/propertyeditor.cpp:2095
+#: editor/propertyeditor.cpp:2145
+msgid "horizontalStretch"
+msgstr ""
+
+#: editor/propertyeditor.cpp:2081 editor/propertyeditor.cpp:2097
+#: editor/propertyeditor.cpp:2147
+msgid "verticalStretch"
+msgstr ""
+
+#: editor/propertyeditor.cpp:2268
+msgid "Arrow"
+msgstr "Saeth"
+
+#: editor/propertyeditor.cpp:2272
+msgid "Up-Arrow"
+msgstr ""
+
+#: editor/propertyeditor.cpp:2276
+msgid "Cross"
+msgstr "Croes"
+
+#: editor/propertyeditor.cpp:2280
+msgid "Waiting"
+msgstr "Aros"
+
+#: editor/propertyeditor.cpp:2284
+msgid "iBeam"
+msgstr "iTrawst"
+
+#: editor/propertyeditor.cpp:2288
+msgid "Size Vertical"
+msgstr "Maint Fertigol"
+
+#: editor/propertyeditor.cpp:2292
+msgid "Size Horizontal"
+msgstr "Maint Llorweddol"
+
+#: editor/propertyeditor.cpp:2296
+msgid "Size Slash"
+msgstr "Maint Slaes"
+
+#: editor/propertyeditor.cpp:2300
+msgid "Size Backslash"
+msgstr "Maint Slaes Ôl"
+
+#: editor/propertyeditor.cpp:2304
+msgid "Size All"
+msgstr "Maint Popeth"
+
+#: editor/propertyeditor.cpp:2308
+msgid "Blank"
+msgstr "Gwag"
 
 #: editor/propertyeditor.cpp:2312
 msgid "Split Vertical"
@@ -1901,6 +1903,14 @@
 msgid "Delete Signal Handler"
 msgstr ""
 
+#: editor/propertyeditor.cpp:3444 editor/connectioneditorimpl.cpp:239
+msgid "Remove Connection"
+msgstr "Gwaredu Cysylltiad"
+
+#: editor/propertyeditor.cpp:3494 editor/connectioneditorimpl.cpp:249
+msgid "Add Connection"
+msgstr ""
+
 #: editor/propertyeditor.cpp:3561
 msgid "P&roperties"
 msgstr "P&riodweddau"
@@ -1914,3239 +1924,3230 @@
 msgid "Property Editor (%1)"
 msgstr ""
 
-#: editor/widgetfactory.cpp:296 editor/widgetfactory.cpp:576
-msgid "Move Tab Page"
+#: editor/tableeditorimpl.cpp:57
+msgid "<no field>"
 msgstr ""
 
-#. i18n: file: editor/listeditor.ui:32
-#. i18n: ectx: property (text), widget (Q3ListView, listview)
-#: editor/widgetfactory.cpp:890 editor/widgetfactory.cpp:1081
-#: editor/widgetfactory.cpp:1167 rc.cpp:1148
-msgid "Column 1"
+#: editor/tableeditorimpl.cpp:317
+#, kde-format
+msgid "Edit Rows and Columns of '%1' "
 msgstr ""
 
-#: editor/widgetfactory.cpp:923 editor/widgetfactory.cpp:1125
-msgid "Tab 1"
-msgstr "Tab 1"
+#: editor/actionlistview.cpp:93 editor/actioneditorimpl.cpp:51
+msgid "New &Action"
+msgstr "Gwei&thred Newydd"
 
-#: editor/widgetfactory.cpp:926 editor/widgetfactory.cpp:1128
-msgid "Tab 2"
-msgstr "Tab 2"
+#: editor/actionlistview.cpp:94 editor/actioneditorimpl.cpp:52
+msgid "New Action &Group"
+msgstr "Grŵp Newydd o Weithredoedd"
 
-#: editor/widgetfactory.cpp:1112
-msgid "Page 1"
+#: editor/actionlistview.cpp:95 editor/actioneditorimpl.cpp:53
+msgid "New &Dropdown Action Group"
 msgstr ""
 
-#: editor/widgetfactory.cpp:1113
-msgid "Page 2"
+#: editor/actionlistview.cpp:98
+msgid "&Connect Action..."
 msgstr ""
 
-#: lib/kommanderfunctions.cpp:122
-msgid "Unterminated @execBegin ... @execEnd block."
-msgstr ""
+#: editor/actionlistview.cpp:100
+msgid "Delete Action"
+msgstr "Dileu Gweithred"
 
-#: lib/kommanderfunctions.cpp:140 lib/kommanderfunctions.cpp:166
-msgid "Unterminated @forEach ... @end block."
+#: editor/connectioneditorimpl.cpp:232
+#, kde-format
+msgid "Connect/Disconnect the signals and slots of '%1' and '%2'"
 msgstr ""
 
-#: lib/kommanderfunctions.cpp:203
-msgid "Unterminated @if ... @endif block."
+#: editor/connectioneditorimpl.cpp:240
+msgid "Remove Connections"
 msgstr ""
 
-#: lib/kommanderfunctions.cpp:223
-msgid "Unterminated @switch ... @end block."
+#: editor/connectioneditorimpl.cpp:251
+msgid "Add Connections"
 msgstr ""
 
-#: lib/kommanderfunctions.cpp:323
-#, kde-format
-msgid "Unknown widget: @%1."
+#: editor/main.cpp:31
+msgid "Kommander is a graphical editor of scripted dialogs."
 msgstr ""
 
-#: lib/kommanderfunctions.cpp:345
-#, kde-format
-msgid "Infinite loop: @%1 called inside @%2."
+#: editor/main.cpp:33
+msgid "Based on Qt Designer, (C) 2000 Trolltech AS."
 msgstr ""
 
-#: lib/kommanderfunctions.cpp:350
-#, kde-format
-msgid "Script for @%1 is empty."
+#: editor/main.cpp:37
+msgid "Kommander"
 msgstr ""
 
-#: lib/expression.cpp:200 lib/expression.cpp:209
-msgid "error"
+#: editor/main.cpp:39
+msgid "(C) 2002-2005 Kommander authors"
 msgstr ""
 
-#: lib/parser.cpp:117
-#, kde-format
-msgid "Invalid character: '%1'."
+#: editor/main.cpp:40 pluginmanager/main.cpp:49
+msgid "Original author"
 msgstr ""
 
-#: lib/parser.cpp:193
-msgid "Constant value expected."
+#: editor/main.cpp:41 pluginmanager/main.cpp:50
+msgid "Eric Laffoon"
 msgstr ""
 
-#: lib/parser.cpp:224
-#, kde-format
-msgid "'%1' (%2) is not a widget."
+#: editor/main.cpp:41 pluginmanager/main.cpp:50
+msgid "Project manager"
 msgstr ""
 
-#: lib/parser.cpp:236 lib/parser.cpp:536
-#, kde-format
-msgid "'%1' is not a function."
+#: editor/main.cpp:42 pluginmanager/main.cpp:51
+msgid "Current maintainer"
 msgstr ""
 
-#: lib/parser.cpp:247
-msgid "Expected a value."
-msgstr ""
+#: editor/main.cpp:43 rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: lib/parser.cpp:272 lib/parser.cpp:282
-msgid "Division by zero."
-msgstr ""
+#: editor/main.cpp:44 rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,"
 
-#: lib/parser.cpp:427
-#, kde-format
-msgid "In function '%1': too few parameters."
+#: editor/main.cpp:67
+msgid "Kommander Dialog Editor"
 msgstr ""
 
-#: lib/parser.cpp:429
-#, kde-format
-msgid "In function '%1': too many parameters."
+#. i18n: file: editor/actioneditor.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ActionEditorBase)
+#: rc.cpp:5
+msgid "Edit Actions"
 msgstr ""
 
-#: lib/parser.cpp:435
-#, kde-format
-msgctxt "Parser error - %2 is an error message"
-msgid "In function '%1': %2"
+#. i18n: file: editor/actioneditor.ui:42
+#. i18n: ectx: property (toolTip), widget (QToolButton, buttonNewAction)
+#: rc.cpp:8
+msgid "Create new Action"
 msgstr ""
 
-#: lib/parser.cpp:475
-#, kde-format
-msgctxt "Parser error - %1 is a widget, %2 is a var, %3 is an error message."
-msgid "In widget function '%1.%2': %3"
+#. i18n: file: editor/actioneditor.ui:58
+#. i18n: ectx: property (toolTip), widget (QToolButton, buttonDeleteAction)
+#: rc.cpp:11
+msgid "Delete current Action"
 msgstr ""
 
-#: lib/parser.cpp:533
-#, kde-format
-msgid "'%1' is not a widget."
+#. i18n: file: editor/actioneditor.ui:74
+#. i18n: ectx: property (toolTip), widget (QToolButton, buttonConnect)
+#: rc.cpp:14
+msgid "Connect current Action"
 msgstr ""
 
-#: lib/parser.cpp:538
-#, kde-format
-msgid "Unexpected symbol after variable '%1'."
+#. i18n: file: editor/listvieweditor.ui:32
+#. i18n: ectx: property (windowTitle), widget (QDialog, ListViewEditorBase)
+#: rc.cpp:17
+msgid "Edit Listview"
 msgstr ""
 
-#: lib/parser.cpp:789
-#, kde-format
+#. i18n: file: editor/listvieweditor.ui:38
+#. i18n: ectx: property (whatsThis), widget (QDialog, ListViewEditorBase)
+#: rc.cpp:20
 msgid ""
-"Expected '%1'<br><br>Possible cause of the error is having a variable with "
-"the same name as a widget."
+"<b>Edit Listview</b><p>Use the controls on the <b>Items</b> tab to add, edit "
+"or delete items in the listview. Change the column configuration of the "
+"listview using the controls on the <b>Columns</b> tab.</p>Click the <b>New "
+"Item</b> button to create a new item, then enter text and add a "
+"pixmap.</p><p>Select an item from the list and click the <b>Delete Item</b> "
+"button to remove the item from the list.</p>"
 msgstr ""
 
-#: lib/parser.cpp:791
-#, kde-format
-msgid "Expected '%1' got '%2'."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, itemDelete)
+#. i18n: file: editor/iconvieweditor.ui:108
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/listboxeditor.ui:259
+#. i18n: ectx: property (text), widget (QPushButton, itemDelete)
+#: rc.cpp:26 rc.cpp:242 rc.cpp:1231
+msgid "&Delete Item"
+msgstr "&Dileu Eitem"
 
-#: lib/parser.cpp:805 lib/parser.cpp:818
-msgid "Expected variable"
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:66
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemDelete)
+#. i18n: file: editor/iconvieweditor.ui:111
+#. i18n: ectx: property (toolTip), widget (QPushButton)
+#: rc.cpp:29 rc.cpp:245
+msgid "Delete item"
+msgstr "Dileu eitem"
 
-#: lib/functionlib.cpp:738
-msgid "Enter a password"
+#. i18n: file: editor/listvieweditor.ui:69
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDelete)
+#: rc.cpp:32
+msgid ""
+"<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:120 widgets/scriptobject.cpp:102
-msgid "Invalid state for associated text."
+#. i18n: file: editor/listvieweditor.ui:82
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
+#: rc.cpp:35
+msgid "Item &Properties"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:140
-#, kde-format
-msgid "Line %1: %2.\n"
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:94
+#. i18n: ectx: property (text), widget (QLabel, Label2)
+#: rc.cpp:38
+msgid "Pi&xmap:"
+msgstr "Pi&csfap :"
 
-#: lib/kommanderwidget.cpp:251
-#, kde-format
-msgid "Unknown special: '%1'."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:107
+#. i18n: ectx: property (text), widget (QLabel, Label1)
+#. i18n: file: editor/listvieweditor.ui:425
+#. i18n: ectx: property (text), widget (QLabel, Label1)
+#. i18n: file: editor/iconvieweditor.ui:164
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: editor/multilineeditor.ui:50
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#. i18n: file: editor/listboxeditor.ui:214
+#. i18n: ectx: property (text), widget (QLabel, Label1)
+#: rc.cpp:41 rc.cpp:149 rc.cpp:254 rc.cpp:1129 rc.cpp:1213
+msgid "&Text:"
+msgstr "&Testun:"
 
-#: lib/kommanderwidget.cpp:285
-#, kde-format
-msgid "Unmatched parenthesis in D-Bus call '%1'."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:126
+#. i18n: ectx: property (toolTip), widget (QLineEdit, itemText)
+#. i18n: file: editor/iconvieweditor.ui:181
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#. i18n: file: editor/listboxeditor.ui:233
+#. i18n: ectx: property (toolTip), widget (QLineEdit, itemText)
+#: rc.cpp:44 rc.cpp:257 rc.cpp:1216
+msgid "Change text"
+msgstr "Newid y Testun"
 
-#: lib/kommanderwidget.cpp:293
-#, kde-format
-msgid "Incorrect arguments in D-Bus call '%1'."
+#. i18n: file: editor/listvieweditor.ui:129
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, itemText)
+#: rc.cpp:47
+msgid ""
+"<b>Change the text of the item.</b><p>The text will be changed in the "
+"current column of the selected item.</p>"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:386
-#, kde-format
-msgid "<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>"
+#. i18n: file: editor/listvieweditor.ui:136
+#. i18n: ectx: property (toolTip), widget (QSpinBox, itemColumn)
+#: rc.cpp:50
+msgid "Change column"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:386
-msgid "Error"
+#. i18n: file: editor/listvieweditor.ui:139
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, itemColumn)
+#: rc.cpp:53
+msgid ""
+"<b>Select the current column.</b><p>The item's text and pixmap will be "
+"changed for the current column</p>"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:386
-msgid "Continue"
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:146
+#. i18n: ectx: property (text), widget (QLabel, Label4)
+#: rc.cpp:56
+msgid "Colu&mn:"
+msgstr "Colo&fn:"
 
-#: lib/kommanderwidget.cpp:386
-msgid "Continue && Ignore Next Errors"
+#. i18n: file: editor/listvieweditor.ui:167
+#. i18n: ectx: property (text), widget (QLabel, itemPixmap)
+#. i18n: file: editor/listvieweditor.ui:374
+#. i18n: ectx: property (text), widget (QLabel, colPixmap)
+#. i18n: file: editor/iconvieweditor.ui:217
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: editor/tableeditor.ui:249
+#. i18n: ectx: property (text), widget (QLabel, labelColumnPixmap)
+#. i18n: file: editor/tableeditor.ui:499
+#. i18n: ectx: property (text), widget (QLabel, labelRowPixmap)
+#. i18n: file: editor/listboxeditor.ui:163
+#. i18n: ectx: property (text), widget (QLabel, itemPixmap)
+#: rc.cpp:59 rc.cpp:131 rc.cpp:266 rc.cpp:529 rc.cpp:586 rc.cpp:1195
+msgid "Label4"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:386
-msgid "Stop"
+#. i18n: file: editor/listvieweditor.ui:189
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemDeletePixmap)
+#. i18n: file: editor/listvieweditor.ui:396
+#. i18n: ectx: property (toolTip), widget (QPushButton, colDeletePixmap)
+#. i18n: file: editor/iconvieweditor.ui:237
+#. i18n: ectx: property (toolTip), widget (QPushButton)
+#. i18n: file: editor/tableeditor.ui:271
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonDeleteColPixmap)
+#. i18n: file: editor/tableeditor.ui:521
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonDeleteRowPixmap)
+#. i18n: file: editor/listboxeditor.ui:185
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemDeletePixmap)
+#: rc.cpp:62 rc.cpp:134 rc.cpp:269 rc.cpp:532 rc.cpp:589 rc.cpp:1198
+msgid "Delete Pixmap"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:405
-#, kde-format
+#. i18n: file: editor/listvieweditor.ui:192
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDeletePixmap)
+#. i18n: file: editor/tableeditor.ui:274
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonDeleteColPixmap)
+#. i18n: file: editor/tableeditor.ui:524
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonDeleteRowPixmap)
+#: rc.cpp:65 rc.cpp:535 rc.cpp:592
 msgid ""
-"Error in widget %1:\n"
-"  %2\n"
-msgstr ""
-
-#: lib/kommanderwidget.cpp:553
-#, kde-format
-msgid "Unmatched parenthesis after '%1'."
-msgstr ""
-
-#: lib/kommanderwidget.cpp:562
-#, kde-format
-msgid "Unmatched quotes in argument of '%1'."
-msgstr ""
-
-#: lib/kommanderwidget.cpp:564
-#, kde-format
-msgid "Unknown function group: '%1'."
-msgstr ""
-
-#: lib/kommanderwidget.cpp:566
-#, kde-format
-msgid "Unknown function: '%1' in group '%2'."
+"<b>Delete the selected item's pixmap.</b><p>The pixmap in the current column "
+"of the selected item will be deleted.</p>"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:568
-#, kde-format
-msgid "Unknown widget function: '%1'."
+#. i18n: file: editor/listvieweditor.ui:208
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemChoosePixmap)
+#. i18n: file: editor/listvieweditor.ui:415
+#. i18n: ectx: property (toolTip), widget (QPushButton, colChoosePixmap)
+#. i18n: file: editor/iconvieweditor.ui:257
+#. i18n: ectx: property (toolTip), widget (QPushButton)
+#. i18n: file: editor/tableeditor.ui:290
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonChooseColPixmap)
+#. i18n: file: editor/tableeditor.ui:540
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonChooseRowPixmap)
+#. i18n: file: editor/listboxeditor.ui:204
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemChoosePixmap)
+#: rc.cpp:71 rc.cpp:143 rc.cpp:278 rc.cpp:541 rc.cpp:598 rc.cpp:1207
+msgid "Select a Pixmap"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:570
-#, kde-format
+#. i18n: file: editor/listvieweditor.ui:211
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemChoosePixmap)
+#. i18n: file: editor/tableeditor.ui:293
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonChooseColPixmap)
+#. i18n: file: editor/tableeditor.ui:543
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonChooseRowPixmap)
+#: rc.cpp:74 rc.cpp:544 rc.cpp:601
 msgid ""
-"Not enough arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
+"<b>Select a pixmap file for the item.</b><p>The pixmap will be changed in "
+"the current column of the selected item.</p>"
 msgstr ""
 
-#: lib/kommanderwidget.cpp:575
-#, kde-format
-msgid ""
-"Too many arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:223
+#. i18n: ectx: property (text), widget (QPushButton, itemNew)
+#. i18n: file: editor/iconvieweditor.ui:94
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/listboxeditor.ui:246
+#. i18n: ectx: property (text), widget (QPushButton, itemNew)
+#: rc.cpp:77 rc.cpp:233 rc.cpp:1222
+msgid "&New Item"
+msgstr "&Eitem Newydd"
 
-#: lib/specialinformation.cpp:285
-msgid "Inserts the item if it will not create a duplicate."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:226
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemNew)
+#. i18n: file: editor/iconvieweditor.ui:97
+#. i18n: ectx: property (toolTip), widget (QPushButton)
+#. i18n: file: editor/listboxeditor.ui:249
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemNew)
+#: rc.cpp:80 rc.cpp:236 rc.cpp:1225
+msgid "Add an item"
+msgstr "Ychwanegu eitem"
 
-#: lib/specialinformation.cpp:287
+#. i18n: file: editor/listvieweditor.ui:229
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemNew)
+#: rc.cpp:83
 msgid ""
-"Returns scripts associated with widget. This is an advanced feature that "
-"would not be commonly used."
+"<b>Adds a new item to the list.</b><p>The item will be inserted at the top "
+"of the list and can be moved using the up and down buttons.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:288
-msgid "Stops execution of the script associated with the widget."
+#. i18n: file: editor/listvieweditor.ui:236
+#. i18n: ectx: property (whatsThis), widget (Q3ListView, itemsPreview)
+#. i18n: file: editor/listboxeditor.ui:131
+#. i18n: ectx: property (whatsThis), widget (Q3ListBox, preview)
+#: rc.cpp:86 rc.cpp:1186
+msgid "The list of items."
 msgstr ""
 
-#: lib/specialinformation.cpp:290
-msgid "Returns text of a cell in a table."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:243
+#. i18n: ectx: property (text), widget (QPushButton, itemNewSub)
+#: rc.cpp:89
+msgid "New &Subitem"
+msgstr "&Is-eitem Newydd"
 
-#: lib/specialinformation.cpp:292
-msgid "Returns 1 for checked boxes, 0 for unchecked."
+#. i18n: file: editor/listvieweditor.ui:246
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemNewSub)
+#: rc.cpp:92
+msgid "Add a subitem"
 msgstr ""
 
-#: lib/specialinformation.cpp:294
+#. i18n: file: editor/listvieweditor.ui:249
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemNewSub)
+#: rc.cpp:95
 msgid ""
-"Returns the list of child widgets contained in the parent widget. Set the "
-"<i>recursive</i> parameter to <i>true</i> to include widgets contained by "
-"child widgets."
+"<b>Create a new sub-item for the selected item.</b><p>New sub-items are "
+"inserted at the top of the list of sub-items, and new levels are created "
+"automatically.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:296
-msgid "Removes all content from the widget."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:278
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemUp)
+#. i18n: file: editor/listvieweditor.ui:525
+#. i18n: ectx: property (toolTip), widget (QPushButton, colUp)
+#. i18n: file: editor/tableeditor.ui:183
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonColumnUp)
+#. i18n: file: editor/tableeditor.ui:398
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRowUp)
+#. i18n: file: editor/listboxeditor.ui:294
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemUp)
+#: rc.cpp:98 rc.cpp:194 rc.cpp:508 rc.cpp:562 rc.cpp:1240
+msgid "Move up"
+msgstr "Symud i fyny"
 
-#: lib/specialinformation.cpp:299
-msgid "Returns number of items in a widget such as combobox or listbox."
+#. i18n: file: editor/listvieweditor.ui:281
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemUp)
+#: rc.cpp:101
+msgid ""
+"<b>Move the selected item up.</b><p>The item will be moved within its level "
+"in the hierarchy.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:301
-msgid "Returns index of current column."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:294
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemDown)
+#. i18n: file: editor/listvieweditor.ui:496
+#. i18n: ectx: property (toolTip), widget (QPushButton, colDown)
+#. i18n: file: editor/tableeditor.ui:199
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonColumnDown)
+#. i18n: file: editor/tableeditor.ui:417
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRowDown)
+#. i18n: file: editor/listboxeditor.ui:310
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemDown)
+#: rc.cpp:104 rc.cpp:179 rc.cpp:514 rc.cpp:568 rc.cpp:1246
+msgid "Move down"
+msgstr "Symud i lawr"
 
-#: lib/specialinformation.cpp:303
-msgid "Returns index of current item."
+#. i18n: file: editor/listvieweditor.ui:297
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDown)
+#: rc.cpp:107
+msgid ""
+"<b>Move the selected item down.</b><p>The item will be moved within its "
+"level in the hierarchy.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:305
-msgid "Returns index of current row."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:310
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemLeft)
+#: rc.cpp:110
+msgid "Move left"
+msgstr "Symud i'r Chwith"
 
-#: lib/specialinformation.cpp:307
+#. i18n: file: editor/listvieweditor.ui:313
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemLeft)
+#: rc.cpp:113
 msgid ""
-"Executes the script associated with the widget. With the new parser the "
-"execute method can take one or more arguments."
+"<b>Move the selected item one level up.</b><p>This will also change the "
+"level of the item's sub-items.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:309
-msgid "Returns the index of an item with the given text."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:326
+#. i18n: ectx: property (toolTip), widget (QPushButton, itemRight)
+#: rc.cpp:116
+msgid "Move right"
+msgstr "Symud i'r Dde"
 
-#: lib/specialinformation.cpp:311
+#. i18n: file: editor/listvieweditor.ui:329
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemRight)
+#: rc.cpp:119
 msgid ""
-"Inserts new column (or <i>count</i> columns) at <i>column</i> position."
+"<b>Move the selected item one level down.</b><p>This will also change the "
+"level of the item's sub-items.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:313
-msgid "Inserts item at <i>index</i> position."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:337
+#. i18n: ectx: attribute (title), widget (QWidget, Widget11)
+#. i18n: file: editor/tableeditor.ui:130
+#. i18n: ectx: attribute (title), widget (QWidget, columns_tab)
+#: rc.cpp:122 rc.cpp:505
+msgid "Co&lumns"
+msgstr "Co&lofnau"
 
-#: lib/specialinformation.cpp:316
-msgid "Inserts multiple items (EOL-separated) at <i>index</i> position."
+#. i18n: file: editor/listvieweditor.ui:349
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
+#: rc.cpp:125
+msgid "Column Properties"
 msgstr ""
 
-#: lib/specialinformation.cpp:319
-msgid "Inserts new row (or <i>count</i> rows) at <i>row</i> position."
-msgstr ""
+#. i18n: file: editor/listvieweditor.ui:361
+#. i18n: ectx: property (text), widget (QLabel, Label2)
+#. i18n: file: editor/iconvieweditor.ui:192
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: editor/listboxeditor.ui:150
+#. i18n: ectx: property (text), widget (QLabel, Label2)
+#: rc.cpp:128 rc.cpp:263 rc.cpp:1192
+msgid "&Pixmap:"
+msgstr "&Picsfap :"
 
-#: lib/specialinformation.cpp:321
-msgid "Returns the text of the item at the given index."
+#. i18n: file: editor/listvieweditor.ui:399
+#. i18n: ectx: property (whatsThis), widget (QPushButton, colDeletePixmap)
+#: rc.cpp:137
+msgid "Delete the pixmap of the selected column."
 msgstr ""
 
-#: lib/specialinformation.cpp:323
+#. i18n: file: editor/listvieweditor.ui:418
+#. i18n: ectx: property (whatsThis), widget (QPushButton, colChoosePixmap)
+#: rc.cpp:146
 msgid ""
-"Returns the depth of the current item in the tree. Root items have depth 0."
+"<b>Select a pixmap file for the selected column.</b><p>The pixmap will be "
+"displayed in the header of the listview.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:325
-msgid "Returns the slash-separated path to the given item in the tree."
+#. i18n: file: editor/listvieweditor.ui:444
+#. i18n: ectx: property (toolTip), widget (QLineEdit, colText)
+#: rc.cpp:152
+msgid "Enter column text"
 msgstr ""
 
-#: lib/specialinformation.cpp:327
+#. i18n: file: editor/listvieweditor.ui:447
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, colText)
+#: rc.cpp:155
 msgid ""
-"Removes the column (or <i>count</i> consecutive columns) with the given "
-"index."
+"<b>Enter the text for the selected column.</b><p>The text will be displayed "
+"in the header of the listview.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:329
-msgid "Removes the item with the given index."
+#. i18n: file: editor/listvieweditor.ui:454
+#. i18n: ectx: property (text), widget (QCheckBox, colClickable)
+#: rc.cpp:158
+msgid "Clicka&ble"
+msgstr "Clicad&wy"
+
+#. i18n: file: editor/listvieweditor.ui:457
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, colClickable)
+#: rc.cpp:161
+msgid ""
+"If this option is checked, the selected column will react to mouse clicks on "
+"the header."
 msgstr ""
 
-#: lib/specialinformation.cpp:332
+#. i18n: file: editor/listvieweditor.ui:464
+#. i18n: ectx: property (text), widget (QCheckBox, colResizeable)
+#: rc.cpp:164
+msgid "Re&sizable"
+msgstr "Ge&llir newid ei faint"
+
+#. i18n: file: editor/listvieweditor.ui:467
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, colResizeable)
+#: rc.cpp:167
+msgid "The column's width will be resizeable if this option is checked."
+msgstr ""
+
+#. i18n: file: editor/listvieweditor.ui:477
+#. i18n: ectx: property (text), widget (QPushButton, colDelete)
+#. i18n: file: editor/tableeditor.ui:209
+#. i18n: ectx: property (text), widget (QPushButton, buttonDeleteColumn)
+#: rc.cpp:170 rc.cpp:520
+msgid "&Delete Column"
+msgstr "&Dileu Colofn"
+
+#. i18n: file: editor/listvieweditor.ui:480
+#. i18n: ectx: property (toolTip), widget (QPushButton, colDelete)
+#: rc.cpp:173
+msgid "Delete column"
+msgstr "Dileu Colofn"
+
+#. i18n: file: editor/listvieweditor.ui:483
+#. i18n: ectx: property (whatsThis), widget (QPushButton, colDelete)
+#: rc.cpp:176
+msgid "Deletes the selected Column."
+msgstr ""
+
+#. i18n: file: editor/listvieweditor.ui:499
+#. i18n: ectx: property (whatsThis), widget (QPushButton, colDown)
+#: rc.cpp:182
 msgid ""
-"Removes the row (or <i>count</i> consecutive rows) with the given index."
+"<b>Move the selected item down.</b><p>The top-most column will be the first "
+"column in the list.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:335
+#. i18n: file: editor/listvieweditor.ui:506
+#. i18n: ectx: property (text), widget (QPushButton, colNew)
+#. i18n: file: editor/tableeditor.ui:216
+#. i18n: ectx: property (text), widget (QPushButton, buttonNewColumn)
+#: rc.cpp:185 rc.cpp:523
+msgid "&New Column"
+msgstr "&Colofn Newydd"
+
+#. i18n: file: editor/listvieweditor.ui:509
+#. i18n: ectx: property (toolTip), widget (QPushButton, colNew)
+#: rc.cpp:188
+msgid "Add a Column"
+msgstr ""
+
+#. i18n: file: editor/listvieweditor.ui:512
+#. i18n: ectx: property (whatsThis), widget (QPushButton, colNew)
+#: rc.cpp:191
 msgid ""
-"Returns selected text or text of current item.\n"
-"In case of Table widgets, returns the selection coordinates, separated by "
-"commas in TopRow,LeftColumn,BottomRow,RightColumn form. "
+"<b>Create a new column.</b><p>New columns are appended at the end of (right "
+"of) the list and may be moved using the up and down buttons.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:337
+#. i18n: file: editor/listvieweditor.ui:528
+#. i18n: ectx: property (whatsThis), widget (QPushButton, colUp)
+#: rc.cpp:197
 msgid ""
-"Sets scripts associated with widget. This is an advanced feature that would "
-"not be commonly used."
+"<b>Move the selected item up.</b><p>The top-most column will be the first "
+"column in the list.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:339
-msgid "Enables or disables widget."
+#. i18n: file: editor/listvieweditor.ui:535
+#. i18n: ectx: property (whatsThis), widget (Q3ListBox, colPreview)
+#: rc.cpp:200
+msgid "The list of columns."
 msgstr ""
 
-#: lib/specialinformation.cpp:342
-msgid "Sets text of a cell in a table."
+#. i18n: file: editor/listvieweditor.ui:596
+#. i18n: ectx: property (text), widget (QPushButton, okButton)
+#. i18n: file: editor/iconvieweditor.ui:316
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/paletteeditor.ui:335
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/wizardeditor.ui:152
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/pixmapfunction.ui:818
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/tableeditor.ui:85
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/connectioneditor.ui:283
+#. i18n: ectx: property (text), widget (KPushButton, okButton)
+#. i18n: file: editor/formsettings.ui:71
+#. i18n: ectx: property (text), widget (KPushButton, buttonOk)
+#. i18n: file: editor/preferences.ui:479
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/choosewidget.ui:40
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/paletteeditoradvanced.ui:527
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/newform.ui:84
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/multilineeditor.ui:107
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/listboxeditor.ui:84
+#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:76
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:45
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/templates/Tab_Dialog.ui:99
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/templates/Configuration_Dialog.ui:117
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/functions.ui:253
+#. i18n: ectx: property (text), widget (KPushButton, buttonOk)
+#: rc.cpp:206 rc.cpp:287 rc.cpp:391 rc.cpp:436 rc.cpp:469 rc.cpp:487
+#: rc.cpp:715 rc.cpp:730 rc.cpp:931 rc.cpp:946 rc.cpp:1087 rc.cpp:1108
+#: rc.cpp:1138 rc.cpp:1165 rc.cpp:1258 rc.cpp:1264 rc.cpp:1288 rc.cpp:1309
+#: rc.cpp:1357
+msgid "&OK"
 msgstr ""
 
-#: lib/specialinformation.cpp:344
-msgid "Inserts a widget into a cell of a table."
+#. i18n: file: editor/listvieweditor.ui:605
+#. i18n: ectx: property (whatsThis), widget (QPushButton, okButton)
+#. i18n: file: editor/iconvieweditor.ui:325
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#. i18n: file: editor/paletteeditor.ui:344
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#. i18n: file: editor/wizardeditor.ui:161
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#. i18n: file: editor/tableeditor.ui:94
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#. i18n: file: editor/connectioneditor.ui:292
+#. i18n: ectx: property (whatsThis), widget (KPushButton, okButton)
+#. i18n: file: editor/formsettings.ui:80
+#. i18n: ectx: property (whatsThis), widget (KPushButton, buttonOk)
+#. i18n: file: editor/preferences.ui:488
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#. i18n: file: editor/paletteeditoradvanced.ui:536
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#. i18n: file: editor/multilineeditor.ui:116
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#. i18n: file: editor/listboxeditor.ui:93
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#: rc.cpp:209 rc.cpp:290 rc.cpp:394 rc.cpp:439 rc.cpp:490 rc.cpp:718
+#: rc.cpp:733 rc.cpp:934 rc.cpp:1090 rc.cpp:1141 rc.cpp:1168
+msgid "Close the dialog and apply all the changes."
 msgstr ""
 
-#: lib/specialinformation.cpp:346
-msgid ""
-"Returns the name of a widget inserted into a cell, or an empty string if the "
-"cell contains no widget or an unknown widget type."
+#. i18n: file: editor/listvieweditor.ui:612
+#. i18n: ectx: property (text), widget (QPushButton, applyButton)
+#. i18n: file: editor/iconvieweditor.ui:333
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/wizardeditor.ui:168
+#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
+#. i18n: file: editor/tableeditor.ui:101
+#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
+#. i18n: file: editor/multilineeditor.ui:123
+#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
+#. i18n: file: editor/listboxeditor.ui:100
+#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
+#: rc.cpp:212 rc.cpp:293 rc.cpp:442 rc.cpp:493 rc.cpp:1144 rc.cpp:1171
+msgid "&Apply"
 msgstr ""
 
-#: lib/specialinformation.cpp:348
-msgid "Sets/unsets checkbox."
+#. i18n: file: editor/listvieweditor.ui:618
+#. i18n: ectx: property (whatsThis), widget (QPushButton, applyButton)
+#. i18n: file: editor/iconvieweditor.ui:339
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#. i18n: file: editor/wizardeditor.ui:174
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
+#. i18n: file: editor/tableeditor.ui:107
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
+#. i18n: file: editor/multilineeditor.ui:129
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
+#. i18n: file: editor/listboxeditor.ui:106
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
+#: rc.cpp:215 rc.cpp:296 rc.cpp:445 rc.cpp:496 rc.cpp:1147 rc.cpp:1174
+msgid "Apply all changes."
 msgstr ""
 
-#: lib/specialinformation.cpp:350
-msgid "Sets caption of the column <i>column</i>."
+#. i18n: file: editor/listvieweditor.ui:625
+#. i18n: ectx: property (text), widget (QPushButton, cancelButton)
+#. i18n: file: editor/iconvieweditor.ui:347
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/paletteeditor.ui:351
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/wizardeditor.ui:181
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/pixmapfunction.ui:831
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/tableeditor.ui:114
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/createtemplate.ui:117
+#. i18n: ectx: property (text), widget (QPushButton, PushButton1)
+#. i18n: file: editor/connectioneditor.ui:299
+#. i18n: ectx: property (text), widget (KPushButton, cancelButton)
+#. i18n: file: editor/formsettings.ui:87
+#. i18n: ectx: property (text), widget (KPushButton, buttonCancel)
+#. i18n: file: editor/preferences.ui:495
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/choosewidget.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/paletteeditoradvanced.ui:543
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/newform.ui:100
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/multilineeditor.ui:136
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/listboxeditor.ui:113
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:90
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:59
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/templates/Tab_Dialog.ui:113
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/templates/Configuration_Dialog.ui:131
+#. i18n: ectx: property (text), widget (QPushButton)
+#. i18n: file: editor/functions.ui:269
+#. i18n: ectx: property (text), widget (KPushButton, buttonCancel)
+#: rc.cpp:218 rc.cpp:299 rc.cpp:397 rc.cpp:448 rc.cpp:472 rc.cpp:499
+#: rc.cpp:652 rc.cpp:721 rc.cpp:736 rc.cpp:937 rc.cpp:949 rc.cpp:1093
+#: rc.cpp:1114 rc.cpp:1150 rc.cpp:1177 rc.cpp:1261 rc.cpp:1267 rc.cpp:1291
+#: rc.cpp:1312 rc.cpp:1360
+msgid "&Cancel"
 msgstr ""
 
-#: lib/specialinformation.cpp:352
-msgid "Selects the item at the specified index. Indexes are zero based."
+#. i18n: file: editor/listvieweditor.ui:631
+#. i18n: ectx: property (whatsThis), widget (QPushButton, cancelButton)
+#. i18n: file: editor/iconvieweditor.ui:353
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#. i18n: file: editor/paletteeditor.ui:357
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/wizardeditor.ui:187
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/tableeditor.ui:120
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/connectioneditor.ui:305
+#. i18n: ectx: property (whatsThis), widget (KPushButton, cancelButton)
+#. i18n: file: editor/formsettings.ui:93
+#. i18n: ectx: property (whatsThis), widget (KPushButton, buttonCancel)
+#. i18n: file: editor/preferences.ui:504
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/paletteeditoradvanced.ui:549
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/multilineeditor.ui:142
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#. i18n: file: editor/listboxeditor.ui:119
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
+#: rc.cpp:221 rc.cpp:302 rc.cpp:400 rc.cpp:451 rc.cpp:502 rc.cpp:724
+#: rc.cpp:739 rc.cpp:940 rc.cpp:1096 rc.cpp:1153 rc.cpp:1180
+msgid "Close the dialog and discard any changes."
 msgstr ""
 
-#: lib/specialinformation.cpp:355
+#. i18n: file: editor/iconvieweditor.ui:35
+#. i18n: ectx: property (caption), widget (QDialog)
+#: rc.cpp:224
+msgid "Edit Iconview"
+msgstr ""
+
+#. i18n: file: editor/iconvieweditor.ui:41
+#. i18n: ectx: property (whatsThis), widget (QDialog)
+#: rc.cpp:227
 msgid ""
-"Inserts a tab to the tabwidget with the specified label at the given index. "
-"Indexes are zero based."
+"<b>Edit Iconview</b><p>Add, edit or delete items in the icon "
+"view.</p><p>Click the <b>New Item</b> button to create a new item, then "
+"enter text and choose a pixmap.</p><p>Select an item from the view and click "
+"the <b>Delete Item</b> button to remove the item from the iconview.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:357
-msgid "Sets maximum numeric value"
+#. i18n: file: editor/iconvieweditor.ui:72
+#. i18n: ectx: property (whatsThis), widget (QIconView)
+#: rc.cpp:230
+msgid "All items in the iconview."
 msgstr ""
 
-#: lib/specialinformation.cpp:359
-msgid ""
-"Sets pixmap at the given index to the specified icon. Use <i>index = -1</i> "
-"to set the pixmap for all items."
+#. i18n: file: editor/iconvieweditor.ui:100
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#: rc.cpp:239
+msgid "Create a new item for the iconview."
 msgstr ""
 
-#: lib/specialinformation.cpp:361
-msgid "Sets caption of the row <i>row</i>."
+#. i18n: file: editor/iconvieweditor.ui:114
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#: rc.cpp:248
+msgid "Delete the selected item."
+msgstr ""
+
+#. i18n: file: editor/iconvieweditor.ui:147
+#. i18n: ectx: property (title), widget (QGroupBox)
+#. i18n: file: editor/listboxeditor.ui:138
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
+#: rc.cpp:251 rc.cpp:1189
+msgid "&Item Properties"
+msgstr ""
+
+#. i18n: file: editor/iconvieweditor.ui:184
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#: rc.cpp:260
+msgid "Change the text for the selected item."
+msgstr ""
+
+#. i18n: file: editor/iconvieweditor.ui:240
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#. i18n: file: editor/listboxeditor.ui:188
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDeletePixmap)
+#: rc.cpp:272 rc.cpp:1201
+msgid "Delete the selected item's pixmap."
+msgstr ""
+
+#. i18n: file: editor/iconvieweditor.ui:260
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#: rc.cpp:281
+msgid "Select a pixmap file for the current item."
 msgstr ""
 
-#: lib/specialinformation.cpp:363
-msgid "Selects given text or select item containing given text."
+#. i18n: file: editor/previewwidget.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewWidgetBase)
+#: rc.cpp:305
+msgid "Preview Window"
 msgstr ""
 
-#: lib/specialinformation.cpp:366
-msgid "Sets widget's content."
+#. i18n: file: editor/previewwidget.ui:47
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup1)
+#: rc.cpp:308
+msgid "ButtonGroup"
 msgstr ""
 
-#: lib/specialinformation.cpp:369
-msgid "Shows/hides widget."
+#. i18n: file: editor/previewwidget.ui:59
+#. i18n: ectx: property (text), widget (QRadioButton, RadioButton1)
+#: rc.cpp:311
+msgid "RadioButton1"
 msgstr ""
 
-#: lib/specialinformation.cpp:370
-msgid "Returns content of widget."
+#. i18n: file: editor/previewwidget.ui:69
+#. i18n: ectx: property (text), widget (QRadioButton, RadioButton2)
+#: rc.cpp:314
+msgid "RadioButton2"
 msgstr ""
 
-#: lib/specialinformation.cpp:372
-msgid "Returns type(class) of widget."
+#. i18n: file: editor/previewwidget.ui:76
+#. i18n: ectx: property (text), widget (QRadioButton, RadioButton3)
+#: rc.cpp:317
+msgid "RadioButton3"
 msgstr ""
 
-#: lib/specialinformation.cpp:374
-msgid ""
-"Makes the widget editable or read only, depending on the editable argument."
+#. i18n: file: editor/previewwidget.ui:86
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup2)
+#: rc.cpp:320
+msgid "ButtonGroup2"
 msgstr ""
 
-#: lib/specialinformation.cpp:376
-msgid ""
-"Return the widget's geometry as <i>x y w h</i>. This is useful for "
-"positioning a created widget."
+#. i18n: file: editor/previewwidget.ui:98
+#. i18n: ectx: property (text), widget (QCheckBox, CheckBox1)
+#: rc.cpp:323
+msgid "CheckBox1"
 msgstr ""
 
-#: lib/specialinformation.cpp:378
-msgid "Returns true if the widget has focus."
+#. i18n: file: editor/previewwidget.ui:108
+#. i18n: ectx: property (text), widget (QCheckBox, CheckBox2)
+#: rc.cpp:326
+msgid "CheckBox2"
 msgstr ""
 
-#: lib/specialinformation.cpp:380
-msgid "Slots"
+#. i18n: file: editor/previewwidget.ui:135
+#. i18n: ectx: property (text), widget (QLineEdit, LineEdit1)
+#: rc.cpp:329
+msgid "LineEdit"
 msgstr ""
 
-#: lib/specialinformation.cpp:384
-msgid ""
-"Returns current widget's content. This was required inside widget A to "
-"return widget A content when requested by widget B. The new method is to use "
-"@A.text inside B instead of just @A if you just want the unaltered text."
-msgstr ""
+#. i18n: file: editor/previewwidget.ui:143
+#. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1)
+#: rc.cpp:332
+msgid "ComboBox"
+msgstr "Blwch Cyfuno"
 
-#: lib/specialinformation.cpp:386
-msgid ""
-"Returns selected text or text of current item. This is deprecated for "
-"<i>@mywidget.selected</i>."
+#. i18n: file: editor/previewwidget.ui:162
+#. i18n: ectx: property (text), widget (QPushButton, PushButton1)
+#: rc.cpp:335
+msgid "PushButton"
 msgstr ""
 
-#: lib/specialinformation.cpp:388
+#. i18n: file: editor/previewwidget.ui:196
+#. i18n: ectx: property (text), widget (Q3TextView, textView)
+#: rc.cpp:338
 msgid ""
-"Does nothing. This is useful if you request a CheckBox or RadioButton to "
-"return a value where a state, typically the unchecked state, has no value. "
-"The @null prevents an error indicating it is empty."
+"<p>\n"
+"<a href=\"http://www.trolltech.com\"> http://www.trolltech.com </a>\n"
+"</p>\n"
+"<p>\n"
+"<a href=\"http://www.kde.org\"> http://www.kde.org </a>\n"
+"</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:390
-msgid "Returns the pid (process ID) of the current process."
+#. i18n: file: editor/paletteeditor.ui:40
+#. i18n: ectx: property (windowTitle), widget (QDialog, PaletteEditorBase)
+#: rc.cpp:346
+msgid "Edit Palette"
 msgstr ""
 
-#: lib/specialinformation.cpp:392
-msgid ""
-"Returns D-Bus identifier of current process. This is shorthand for <i>kmdr-"
-"executor-@pid</i>."
+#. i18n: file: editor/paletteeditor.ui:60
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupAutoPalette)
+#: rc.cpp:349
+msgid "Build Palette"
 msgstr ""
 
-#: lib/specialinformation.cpp:395
-msgid "Returns the pid of the parent Kommander window."
+#. i18n: file: editor/paletteeditor.ui:95
+#. i18n: ectx: property (text), widget (QLabel, labelMainColor)
+#: rc.cpp:352
+msgid "&3D effects:"
 msgstr ""
 
-#: lib/specialinformation.cpp:397
-msgid "Writes <i>text</i> on stderr."
+#. i18n: file: editor/paletteeditor.ui:125
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonMainColor)
+#. i18n: file: editor/paletteeditor.ui:188
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonMainColor2)
+#. i18n: file: editor/preferences.ui:90
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonColor)
+#. i18n: file: editor/paletteeditoradvanced.ui:325
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonCentral)
+#. i18n: file: editor/paletteeditoradvanced.ui:478
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonEffect)
+#: rc.cpp:355 rc.cpp:364 rc.cpp:799 rc.cpp:1036 rc.cpp:1078
+msgid "Choose a color"
 msgstr ""
 
-#: lib/specialinformation.cpp:399
-msgid "Writes <i>text</i> on standard output."
+#. i18n: file: editor/paletteeditor.ui:128
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonMainColor)
+#: rc.cpp:358
+msgid "Choose the effect-color for the generated palette."
 msgstr ""
 
-#: lib/specialinformation.cpp:401
-msgid ""
-"Executes a script block. Bash is used if no shell is given. It is primarily "
-"for use in non-button widgets where script actions are not expected. Full "
-"path is not required for the shell which may be useful for portability. "
-"<p><i>If this is used inside a button it allows alternate script languages "
-"to be used and will return a value to the main script, which may be "
-"unexpected.</i>"
-msgstr ""
+#. i18n: file: editor/paletteeditor.ui:158
+#. i18n: ectx: property (text), widget (QLabel, labelMainColor2)
+#: rc.cpp:361
+msgid "Back&ground:"
+msgstr "Cefn&dir:"
 
-#: lib/specialinformation.cpp:403
-msgid ""
-"Returns value of an environment (shell) variable. Do not use <i>$</i> in the "
-"name. For example, <i>@env(PATH)</i>."
+#. i18n: file: editor/paletteeditor.ui:191
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonMainColor2)
+#: rc.cpp:367
+msgid "Choose the background color for the generated palette."
 msgstr ""
 
-#: lib/specialinformation.cpp:405 lib/specialinformation.cpp:407
-msgid "Executes an external shell command."
+#. i18n: file: editor/paletteeditor.ui:214
+#. i18n: ectx: property (text), widget (QPushButton, btnAdvanced)
+#: rc.cpp:370
+msgid "&Tune Palette..."
 msgstr ""
 
-#: lib/specialinformation.cpp:409
-msgid "Parses an expression and returns computed value."
-msgstr ""
+#. i18n: file: editor/paletteeditor.ui:232
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox126)
+#: rc.cpp:373
+msgid "Preview"
+msgstr "Rhagolwg"
 
-#: lib/specialinformation.cpp:411
-msgid ""
-"Executes loop: values from <i>items</i> list (passed as EOL-separated "
-"string) are assigned to the variable. <br><b>Old</b><br> <i>@forEach(i,A\\"
-"nB\\nC\\n)<br>  @# @i=A<br>@end</i><br><b>New</b><br><i>foreach i in MyArray "
-"do<br>  //i = key, MyArray[i] = val<br>end "
+#. i18n: file: editor/paletteeditor.ui:252
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#. i18n: file: editor/paletteeditoradvanced.ui:61
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:376 rc.cpp:961
+msgid "Select &palette:"
 msgstr ""
 
-#: lib/specialinformation.cpp:413
-msgid ""
-"Executes loop: variable is set to <i>start</i> and is increased by "
-"<i>step</i> each time loop is executed. Execution stops when variable "
-"becomes larger than <i>end</i>. <br><b>Old</b><br><i>@for(i,1,10,1)<br>  @# "
-"@i=1<br>@endif</i><br><b>New</b><br><i>for i=0 to 20 step 5 do<br>  "
-"debug(i)<br>end</i>."
+#. i18n: file: editor/paletteeditor.ui:266
+#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
+#. i18n: file: editor/paletteeditoradvanced.ui:75
+#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
+#: rc.cpp:379 rc.cpp:964
+msgid "Active Palette"
 msgstr ""
 
-#: lib/specialinformation.cpp:415
-msgid "Returns the value of a global variable."
+#. i18n: file: editor/paletteeditor.ui:271
+#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
+#. i18n: file: editor/paletteeditoradvanced.ui:80
+#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
+#: rc.cpp:382 rc.cpp:967
+msgid "Inactive Palette"
 msgstr ""
 
-#: lib/specialinformation.cpp:417
-msgid ""
-"Translates the string into the current language. Texts in GUI would be "
-"automatically extracted for translation."
+#. i18n: file: editor/paletteeditor.ui:276
+#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
+#. i18n: file: editor/paletteeditoradvanced.ui:85
+#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
+#: rc.cpp:385 rc.cpp:970
+msgid "Disabled Palette"
 msgstr ""
 
-#: lib/specialinformation.cpp:419
-msgid ""
-"Executes block if expression is true (non-zero number or non-empty string.) "
-"<p><b>Old</b>Close with <b>@endif</b></p><p><b>New</b><br>if val == true "
-"then<br>//  do op<br>elseif cond<br>//  second chance<br>else<br>//  cond "
-"failed<br>endif</p>"
+#. i18n: file: editor/listeditor.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, PushButton1)
+#. i18n: file: editor/wizardeditor.ui:64
+#. i18n: ectx: property (text), widget (QPushButton, buttonAdd)
+#: rc.cpp:409 rc.cpp:427
+msgid "&Add"
+msgstr "&Ychwanegu"
+
+#. i18n: file: editor/listeditor.ui:53
+#. i18n: ectx: property (text), widget (QPushButton, PushButton2)
+#. i18n: file: editor/wizardeditor.ui:71
+#. i18n: ectx: property (text), widget (QPushButton, buttonRemove)
+#: rc.cpp:412 rc.cpp:430
+msgid "&Remove"
 msgstr ""
 
-#: lib/specialinformation.cpp:421
-msgid ""
-"Executes another Kommander dialog. Current dialog directory is used if no "
-"path is given. Arguments may be given as named arguments which will become "
-"global variables in the new dialog. For instance: <i>var=val</i>"
+#. i18n: file: editor/listeditor.ui:60
+#. i18n: ectx: property (text), widget (QPushButton, PushButton3)
+#: rc.cpp:415
+msgid "Re&name"
+msgstr "Ai&l-enwi"
+
+#. i18n: file: editor/listeditor.ui:67
+#. i18n: ectx: property (text), widget (QPushButton, PushButton4)
+#: rc.cpp:418
+msgid "&Close"
 msgstr ""
 
-#: lib/specialinformation.cpp:423
-msgid "Reads setting from configuration file for this dialog."
+#. i18n: file: editor/wizardeditor.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, WizardEditorBase)
+#: rc.cpp:421
+msgid "Wizard Page Editor"
 msgstr ""
 
-#: lib/specialinformation.cpp:425
-msgid ""
-"Sets the value of a global variable. Global variables exist for the life of "
-"the Kommander window."
+#. i18n: file: editor/wizardeditor.ui:41
+#. i18n: ectx: property (text), widget (QLabel, pagesLabel)
+#: rc.cpp:424
+msgid "Wizard pages:"
 msgstr ""
 
-#: lib/specialinformation.cpp:427
-msgid "Stores setting in configuration file for this dialog."
+#. i18n: file: editor/pixmapfunction.ui:47
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
+#: rc.cpp:457
+msgid "&Enter arguments for loading the pixmap:"
 msgstr ""
 
-#: lib/specialinformation.cpp:429
-msgid ""
-"Begin of <b>switch</b> block. Following <b>case</b> values are compared to "
-"<i>expression</i>.<p>@switch()<br>@case()<br>@end"
+#. i18n: file: editor/pixmapfunction.ui:78
+#. i18n: ectx: property (text), widget (QLabel, labelFunction)
+#: rc.cpp:460
+msgid "QPixmap("
 msgstr ""
 
-#: lib/specialinformation.cpp:431
-msgid "Executes an external D-Bus call."
+#. i18n: file: editor/pixmapfunction.ui:535
+#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
+#: rc.cpp:463
+msgid ")"
+msgstr ")"
+
+#. i18n: file: editor/tableeditor.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, TableEditorBase)
+#: rc.cpp:475
+msgid "Edit Table"
 msgstr ""
 
-#: lib/specialinformation.cpp:433
-msgid "Adds a comment to EOL that Kommander will not parse"
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:38
+#. i18n: ectx: property (text), widget (Q3Table, table)
+#. i18n: file: editor/tableeditor.ui:43
+#. i18n: ectx: property (text), widget (Q3Table, table)
+#: rc.cpp:478 rc.cpp:481
+msgid "1"
+msgstr "1"
 
-#: lib/specialinformation.cpp:435
+#. i18n: file: editor/tableeditor.ui:186
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonColumnUp)
+#. i18n: file: editor/tableeditor.ui:401
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRowUp)
+#: rc.cpp:511 rc.cpp:565
 msgid ""
-"Creates a new widget with the specified type and as the child of parent."
+"<b>Move the selected item up.</b><p>The top-most column will be the first "
+"column of the list.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:437
+#. i18n: file: editor/tableeditor.ui:202
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonColumnDown)
+#. i18n: file: editor/tableeditor.ui:420
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRowDown)
+#: rc.cpp:517 rc.cpp:571
 msgid ""
-"Returns true if there is a widget with the passed name, false otherwise."
+"<b>Move the selected item down.</b><p>The top-most column will be the first "
+"column of the list.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:439
-msgid "Connects the signal of sender with the slot of the receiver"
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:231
+#. i18n: ectx: property (text), widget (QLabel, labelTable)
+#: rc.cpp:526
+msgid "Table:"
+msgstr "Tabl:"
 
-#: lib/specialinformation.cpp:441
-msgid "Disconnects the signal of sender from the slot of the receiver"
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:302
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#. i18n: file: editor/tableeditor.ui:465
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_3)
+#: rc.cpp:547 rc.cpp:580
+msgid "&Label:"
+msgstr "&Label:"
 
-#: lib/specialinformation.cpp:444
-msgid "Exits script execution and returns"
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:315
+#. i18n: ectx: property (text), widget (QLabel, Label2)
+#. i18n: file: editor/tableeditor.ui:478
+#. i18n: ectx: property (text), widget (QLabel, Label2_2)
+#: rc.cpp:550 rc.cpp:583
+msgid "Pixmap:"
+msgstr "Picsfap :"
 
-#: lib/specialinformation.cpp:446
-msgid "Exits the current block of a while, for or foreach loop"
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:328
+#. i18n: ectx: property (text), widget (QLabel, labelFields)
+#: rc.cpp:553
+msgid "&Field:"
+msgstr "&Maes :"
 
-#: lib/specialinformation.cpp:448
-msgid "Exit a step and return to the beginning of a loop"
+#. i18n: file: editor/tableeditor.ui:351
+#. i18n: ectx: property (text), widget (QLabel, labelTableValue)
+#: rc.cpp:556
+msgid "<no table>"
 msgstr ""
 
-#: lib/specialinformation.cpp:450
-msgid ""
-"Return from a script, optionaly with a value from the script to the caller"
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:364
+#. i18n: ectx: attribute (title), widget (QWidget, rows_tab)
+#: rc.cpp:559
+msgid "&Rows"
+msgstr "&Rhesi"
 
-#: lib/specialinformation.cpp:454
-msgid "Returns an EOL-separated list of all values in the array."
+#. i18n: file: editor/tableeditor.ui:443
+#. i18n: ectx: property (text), widget (QPushButton, buttonNewRow)
+#: rc.cpp:574
+msgid "&New Row"
 msgstr ""
 
-#: lib/specialinformation.cpp:456
-msgid "Returns an EOL-separated list of all keys in the array."
-msgstr ""
+#. i18n: file: editor/tableeditor.ui:450
+#. i18n: ectx: property (text), widget (QPushButton, buttonDeleteRow)
+#: rc.cpp:577
+msgid "&Delete Row"
+msgstr "&Dileu Rhes"
 
-#: lib/specialinformation.cpp:458
-msgid "Removes all elements from the array."
+#. i18n: file: editor/assoctexteditor.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, AssocTextEditorBase)
+#: rc.cpp:604
+msgid "Edit Text"
 msgstr ""
 
-#: lib/specialinformation.cpp:460
-msgid "Returns the number of elements in the array."
+#. i18n: file: editor/assoctexteditor.ui:21
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:607
+msgid "&Widget:"
 msgstr ""
 
-#: lib/specialinformation.cpp:462
-msgid "Returns the value associated with the given key."
+#. i18n: file: editor/assoctexteditor.ui:53
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:613
+msgid "&Text for:"
 msgstr ""
 
-#: lib/specialinformation.cpp:464
-msgid "Removes element with the given key from the array."
+#. i18n: file: editor/assoctexteditor.ui:87
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
+#: rc.cpp:616
+msgid "Insert"
 msgstr ""
 
-#: lib/specialinformation.cpp:466
-msgid "Adds element with the given key and value to the array"
-msgstr ""
+#. i18n: file: editor/assoctexteditor.ui:93
+#. i18n: ectx: property (text), widget (KPushButton, functionButton)
+#: rc.cpp:619
+msgid "&Function..."
+msgstr "&Ffwythiant..."
 
-#: lib/specialinformation.cpp:468
-msgid ""
-"Adds all elements in the string to the array. String should have <i>key\\"
-"tvalue\\n</i> format."
+#. i18n: file: editor/assoctexteditor.ui:124
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
+#: rc.cpp:622
+msgid "Wi&dget:"
 msgstr ""
 
-#: lib/specialinformation.cpp:471
-msgid ""
-"Returns all elements in the array in <pre>key\\tvalue\\n</pre> format."
+#. i18n: file: editor/assoctexteditor.ui:171
+#. i18n: ectx: property (text), widget (QPushButton, filePushButton)
+#: rc.cpp:625
+msgid "Fi&le..."
+msgstr "Ff&eil..."
+
+#. i18n: file: editor/createtemplate.ui:47
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:631
+msgid "Template &name:"
 msgstr ""
 
-#: lib/specialinformation.cpp:473
-msgid ""
-"Create an integer indexed array - starting from 0 - from a string. Use the "
-"separator character to split the string. The separator's default value is '\\"
-"t'."
+#. i18n: file: editor/createtemplate.ui:60
+#. i18n: ectx: property (toolTip), widget (QLineEdit, editName)
+#: rc.cpp:634
+msgid "Name of the new template"
 msgstr ""
 
-#: lib/specialinformation.cpp:475
-msgid ""
-"Create a string from an integer indexed array. Concatenate the elements with "
-"the separator character. The separator's default value is '\\t'."
+#. i18n: file: editor/createtemplate.ui:63
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, editName)
+#: rc.cpp:637
+msgid "Enter the name of the new template"
 msgstr ""
 
-#: lib/specialinformation.cpp:477
-msgid ""
-"Remove keyNum elements starting with keyStart from an indexed array and "
-"reindex the array. If keyNum is not specified, remove only the keyStart "
-"element."
+#. i18n: file: editor/createtemplate.ui:70
+#. i18n: ectx: property (toolTip), widget (Q3ListBox, listClass)
+#: rc.cpp:640
+msgid "Class of the new template"
 msgstr ""
 
-#: lib/specialinformation.cpp:479
+#. i18n: file: editor/createtemplate.ui:73
+#. i18n: ectx: property (whatsThis), widget (Q3ListBox, listClass)
+#: rc.cpp:643
 msgid ""
-"Insert the elements from string starting at key and reindex the array. Use "
-"the separator to separate the elements from the string. The separator's "
-"default value is '\\t'."
+"Enter the name of the class which should be used as the template's base class"
 msgstr ""
 
-#: lib/specialinformation.cpp:484
-msgid "Returns number of chars in the string."
-msgstr ""
+#. i18n: file: editor/createtemplate.ui:104
+#. i18n: ectx: property (text), widget (QPushButton, buttonCreate)
+#: rc.cpp:646
+msgid "C&reate"
+msgstr "C&reu"
 
-#: lib/specialinformation.cpp:486
-msgid "Checks if the string contains the given substring."
+#. i18n: file: editor/createtemplate.ui:110
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCreate)
+#: rc.cpp:649
+msgid "Creates the new template"
 msgstr ""
 
-#: lib/specialinformation.cpp:488
-msgid ""
-"Returns the position of a substring in the string, or -1 if it is not found."
+#. i18n: file: editor/createtemplate.ui:120
+#. i18n: ectx: property (whatsThis), widget (QPushButton, PushButton1)
+#: rc.cpp:655
+msgid "Closes the Dialog"
 msgstr ""
 
-#: lib/specialinformation.cpp:490
-msgid ""
-"Returns the position of a substring in the string, or -1 if it is not found. "
-"String is searched backwards"
+#. i18n: file: editor/createtemplate.ui:129
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:658
+msgid "&Baseclass for template:"
 msgstr ""
 
-#: lib/specialinformation.cpp:492
-msgid "Returns the first <i>n</i> chars of the string."
+#. i18n: file: editor/connectioneditor.ui:32
+#. i18n: ectx: property (windowTitle), widget (QDialog, ConnectionEditorBase)
+#: rc.cpp:661
+msgid "Edit Connections"
 msgstr ""
 
-#: lib/specialinformation.cpp:494
-msgid "Returns the last <i>n</i> chars of the string."
+#. i18n: file: editor/connectioneditor.ui:38
+#. i18n: ectx: property (whatsThis), widget (QDialog, ConnectionEditorBase)
+#: rc.cpp:664
+msgid ""
+"<b>Edit Connections</b><p>Add and remove connections in the current "
+"form.</p><p>Select a signal and a corresponding slot then press the "
+"<b>Connect</b> button to create a connection.</p><p>Select a connection from "
+"the list then press the <b>Disconnect</b> button to delete the "
+"connection.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:496
-msgid "Returns <i>n</i> chars of the string, starting from <i>start</i>."
+#. i18n: file: editor/connectioneditor.ui:59
+#. i18n: ectx: property (whatsThis), widget (KListView, connectionView)
+#: rc.cpp:667
+msgid "Displays the connections between the sender and the receiver."
 msgstr ""
 
-#: lib/specialinformation.cpp:498
-msgid "Removes all occurrences of given substring."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:63
+#. i18n: ectx: property (text), widget (KListView, connectionView)
+#: rc.cpp:670
+msgid "Sender"
+msgstr "Anfonwr"
 
-#: lib/specialinformation.cpp:500
-msgid ""
-"Replaces all occurrences of the given substring with the given replacement."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:74
+#. i18n: ectx: property (text), widget (KListView, connectionView)
+#: rc.cpp:673
+msgid "Signal"
+msgstr "Arwydd"
 
-#: lib/specialinformation.cpp:502
-msgid "Converts the string to uppercase."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:85
+#. i18n: ectx: property (text), widget (KListView, connectionView)
+#: rc.cpp:676
+msgid "Receiver"
+msgstr "Derbynnydd"
 
-#: lib/specialinformation.cpp:504
-msgid "Converts the string to lowercase."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:96
+#. i18n: ectx: property (text), widget (KListView, connectionView)
+#: rc.cpp:679
+msgid "Slot"
+msgstr "Agen"
 
-#: lib/specialinformation.cpp:506
+#. i18n: file: editor/connectioneditor.ui:110
+#. i18n: ectx: property (whatsThis), widget (KListBox, slotBox)
+#: rc.cpp:682
 msgid ""
-"Compares two strings. Returns 0 if they are equal, -1 if the first one is "
-"lower, 1 if the first one is higher"
+"<b>A list of slots for the receiver.</b><p>The slots that are displayed are "
+"only those which have arguments that correspond with the arguments of the "
+"signal that is currently selected in the Signal-list.</b>"
 msgstr ""
 
-#: lib/specialinformation.cpp:509
-msgid "Checks if the string is empty."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:117
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:685
+msgid "Connec&tions:"
+msgstr "Cysyll&tiadau :"
 
-#: lib/specialinformation.cpp:511
-msgid "Checks if the string is a valid number."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:130
+#. i18n: ectx: property (text), widget (KPushButton, connectButton)
+#: rc.cpp:688
+msgid "Co&nnect"
+msgstr "Cy&sylltu"
 
-#: lib/specialinformation.cpp:513
-msgid "Returns given section of a string."
+#. i18n: file: editor/connectioneditor.ui:136
+#. i18n: ectx: property (toolTip), widget (KPushButton, connectButton)
+#: rc.cpp:691
+msgid "Create connection"
 msgstr ""
 
-#: lib/specialinformation.cpp:515
-#, kde-format
-msgid ""
-"Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, "
-"<i>arg2</i>, <i>arg3</i> accordingly."
+#. i18n: file: editor/connectioneditor.ui:139
+#. i18n: ectx: property (whatsThis), widget (KPushButton, connectButton)
+#: rc.cpp:694
+msgid "Create a connection between a signal and a slot."
 msgstr ""
 
-#: lib/specialinformation.cpp:518
-msgid ""
-"Convert a string to an integer. If not possible, use the default value."
-msgstr ""
+#. i18n: file: editor/connectioneditor.ui:146
+#. i18n: ectx: property (text), widget (KPushButton, disconnectButton)
+#: rc.cpp:697
+msgid "&Disconnect"
+msgstr "&Datgysylltu"
 
-#: lib/specialinformation.cpp:520
-msgid ""
-"Convert a string to a double precision floating point value. If not "
-"possible, use the default value."
+#. i18n: file: editor/connectioneditor.ui:152
+#. i18n: ectx: property (toolTip), widget (KPushButton, disconnectButton)
+#: rc.cpp:700
+msgid "Remove the selected connection"
 msgstr ""
 
-#: lib/specialinformation.cpp:524
-msgid "Returns content of given file."
+#. i18n: file: editor/connectioneditor.ui:155
+#. i18n: ectx: property (whatsThis), widget (KPushButton, disconnectButton)
+#: rc.cpp:703
+msgid "Remove the selected connection."
 msgstr ""
 
-#: lib/specialinformation.cpp:526
-msgid "Writes given string to a file."
+#. i18n: file: editor/connectioneditor.ui:194
+#. i18n: ectx: property (whatsThis), widget (KListBox, signalBox)
+#: rc.cpp:706
+msgid "Displays the list of signals that the widget emits."
 msgstr ""
 
-#: lib/specialinformation.cpp:528
-msgid "Appends given string to the end of a file."
+#. i18n: file: editor/connectioneditor.ui:203
+#. i18n: ectx: property (text), widget (QLabel, labelSignal)
+#: rc.cpp:709
+msgid "Si&gnals:"
 msgstr ""
 
-#: lib/specialinformation.cpp:530
-msgid "Checks to see if file exists."
+#. i18n: file: editor/connectioneditor.ui:238
+#. i18n: ectx: property (text), widget (QLabel, labelSlot)
+#: rc.cpp:712
+msgid "&Slots:"
 msgstr ""
 
-#: lib/specialinformation.cpp:533
+#. i18n: file: editor/formsettings.ui:35
+#. i18n: ectx: property (whatsThis), widget (QDialog, FormSettingsBase)
+#: rc.cpp:727
 msgid ""
-"Shows color dialog. Returns color in #RRGGBB format. Defaults to the "
-"parameter, if specified."
+"<b>Form Settings</b><p>Change settings for the form. Settings like "
+"<b>Comment</b> and <b>Author</b> are for your own use and are not "
+"required.</p>"
 msgstr ""
 
-#: lib/specialinformation.cpp:535
-msgid "Shows text selection dialog. Returns entered text."
+#. i18n: file: editor/formsettings.ui:102
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox2)
+#: rc.cpp:742
+msgid "La&youts"
 msgstr ""
 
-#: lib/specialinformation.cpp:537
-msgid "Shows a dialog asking user for password and returns it."
+#. i18n: file: editor/formsettings.ui:128
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
+#: rc.cpp:745
+msgid "Default mar&gin:"
 msgstr ""
 
-#: lib/specialinformation.cpp:539
-msgid "Shows value selection dialog. Returns entered value."
+#. i18n: file: editor/formsettings.ui:141
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
+#: rc.cpp:748
+msgid "D&efault spacing:"
 msgstr ""
 
-#: lib/specialinformation.cpp:541
-msgid "Shows float value selection dialog. Returns entered value."
+#. i18n: file: editor/formsettings.ui:175
+#. i18n: ectx: property (whatsThis), widget (Q3MultiLineEdit, editComment)
+#: rc.cpp:754
+msgid "Enter a comment about the form."
 msgstr ""
 
-#: lib/specialinformation.cpp:543
-msgid "Shows existing file selection dialog. Returns selected file."
-msgstr ""
+#. i18n: file: editor/formsettings.ui:198
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:757
+msgid "Co&mment:"
+msgstr "S&ylwad:"
 
-#: lib/specialinformation.cpp:545
-msgid "Shows save file selection dialog. Returns selected file."
-msgstr ""
+#. i18n: file: editor/formsettings.ui:211
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_2)
+#: rc.cpp:760
+msgid "&License:"
+msgstr "&Trwydded:"
 
-#: lib/specialinformation.cpp:547
-msgid "Shows directory selection dialog. Returns selected directory."
-msgstr ""
+#. i18n: file: editor/formsettings.ui:224
+#. i18n: ectx: property (toolTip), widget (KLineEdit, editLicense)
+#. i18n: file: editor/formsettings.ui:260
+#. i18n: ectx: property (toolTip), widget (KLineEdit, editAuthor)
+#. i18n: file: editor/formsettings.ui:270
+#. i18n: ectx: property (toolTip), widget (KLineEdit, editVersion)
+#: rc.cpp:763 rc.cpp:775 rc.cpp:781
+msgid "Enter your name"
+msgstr "Rhowch eich Enw"
 
-#: lib/specialinformation.cpp:549
-msgid ""
-"Shows multiple files selection dialog. Returns EOL-separated list of "
-"selected files."
-msgstr ""
+#. i18n: file: editor/formsettings.ui:227
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, editLicense)
+#. i18n: file: editor/formsettings.ui:263
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, editAuthor)
+#. i18n: file: editor/formsettings.ui:273
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, editVersion)
+#: rc.cpp:766 rc.cpp:778 rc.cpp:784
+msgid "Enter your name."
+msgstr "Rhowch eich Enw."
 
-#: lib/specialinformation.cpp:553
-msgid "Shows an information dialog."
-msgstr ""
+#. i18n: file: editor/formsettings.ui:234
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_3)
+#: rc.cpp:769
+msgid "&Version:"
+msgstr "Fe&rsiwn:"
 
-#: lib/specialinformation.cpp:555
-msgid "Shows an error dialog."
-msgstr ""
+#. i18n: file: editor/formsettings.ui:247
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
+#: rc.cpp:772
+msgid "A&uthor:"
+msgstr "A&wdur:"
 
-#: lib/specialinformation.cpp:557
-msgid ""
-"Shows a warning dialog with up to three buttons. Returns number of selected "
-"button."
-msgstr ""
+#. i18n: file: editor/preferences.ui:32
+#. i18n: ectx: property (windowTitle), widget (QDialog, Preferences)
+#: rc.cpp:787
+msgid "Preferences"
+msgstr "Hoffterau"
 
-#: lib/specialinformation.cpp:559
+#. i18n: file: editor/preferences.ui:38
+#. i18n: ectx: property (whatsThis), widget (QDialog, Preferences)
+#: rc.cpp:790
 msgid ""
-"Shows a question dialog with up to three buttons. Returns number of selected "
-"button."
+"<b>Preferences</b><p>Change the preferences of Qt Designer. There is always "
+"one tab with general preferences. There may be additional tabs, depending on "
+"which plugins are installed.</p>"
 msgstr ""
 
-#: pluginmanager/main.cpp:39
-msgid ""
-"kmdr-plugins is a component of the Kommander dialog system that manages "
-"installed plugins."
-msgstr ""
+#. i18n: file: editor/preferences.ui:51
+#. i18n: ectx: attribute (title), widget (QWidget, pageGeneral)
+#: rc.cpp:793
+msgid "General"
+msgstr "Cyffredinol"
 
-#: pluginmanager/main.cpp:46
-msgid "Kommander Plugin Manager"
-msgstr ""
+#. i18n: file: editor/preferences.ui:63
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup1)
+#: rc.cpp:796
+msgid "Backgro&und"
+msgstr "Cefndir"
 
-#: pluginmanager/main.cpp:48
-msgid "(C) 2004-2005 Kommander authors"
+#. i18n: file: editor/preferences.ui:93
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonColor)
+#: rc.cpp:802
+msgid "Select a color in the color dialog."
 msgstr ""
 
-#: pluginmanager/main.cpp:56
-msgid "Register given library"
-msgstr ""
+#. i18n: file: editor/preferences.ui:103
+#. i18n: ectx: property (text), widget (QRadioButton, radioColor)
+#: rc.cpp:805
+msgid "Co&lor"
+msgstr "Ll&iw"
 
-#: pluginmanager/main.cpp:58
-msgid "Remove given library"
+#. i18n: file: editor/preferences.ui:106
+#. i18n: ectx: property (toolTip), widget (QRadioButton, radioColor)
+#: rc.cpp:808
+msgid "Use a background color"
 msgstr ""
 
-#: pluginmanager/main.cpp:60
-msgid "Check all installed plugins and remove those missing"
+#. i18n: file: editor/preferences.ui:109
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioColor)
+#: rc.cpp:811
+msgid "Use a background color."
 msgstr ""
 
-#: pluginmanager/main.cpp:62
-msgid "List all installed plugins"
-msgstr ""
+#. i18n: file: editor/preferences.ui:116
+#. i18n: ectx: property (text), widget (QRadioButton, radioPixmap)
+#: rc.cpp:814
+msgid "&Pixmap"
+msgstr "&Picsfap"
 
-#: pluginmanager/main.cpp:77
-#, kde-format
-msgid "Error adding plugin '%1'"
+#. i18n: file: editor/preferences.ui:122
+#. i18n: ectx: property (toolTip), widget (QRadioButton, radioPixmap)
+#: rc.cpp:817
+msgid "Use a background pixmap"
 msgstr ""
 
-#: pluginmanager/main.cpp:82
-#, kde-format
-msgid "Error removing plugin '%1'"
+#. i18n: file: editor/preferences.ui:125
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioPixmap)
+#: rc.cpp:820
+msgid "Use a background pixmap."
 msgstr ""
 
-#: pluginmanager/mainwindow.cpp:78
-#, kde-format
-msgid "<qt>Unable to load Kommander plugin<br><b>%1</b></qt>"
+#. i18n: file: editor/preferences.ui:144
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonPixmap)
+#. i18n: file: editor/paletteeditoradvanced.ui:274
+#. i18n: ectx: property (toolTip), widget (StyledButton, buttonPixmap)
+#: rc.cpp:823 rc.cpp:1027
+msgid "Select a pixmap"
 msgstr ""
 
-#: pluginmanager/mainwindow.cpp:79
-msgid "Cannot add plugin"
+#. i18n: file: editor/preferences.ui:147
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonPixmap)
+#: rc.cpp:826
+msgid "Choose a pixmap file."
 msgstr ""
 
-#: executor/main.cpp:47
-msgid ""
-"Executor is a component of the Kommander dialog system that executes .kmdr "
-"files given as arguments or via stdin"
-msgstr ""
+#. i18n: file: editor/preferences.ui:157
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxShowGrid)
+#: rc.cpp:829
+msgid "Show &grid"
+msgstr "Dangos &grid"
 
-#: executor/main.cpp:52
-msgid "Kommander Executor"
-msgstr ""
+#. i18n: file: editor/preferences.ui:163
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxShowGrid)
+#: rc.cpp:832
+msgid "Show Grid"
+msgstr "Dangos Grid"
 
-#: executor/main.cpp:54
-msgid "(c) 2002, Marc Britton"
+#. i18n: file: editor/preferences.ui:166
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxShowGrid)
+#: rc.cpp:835
+msgid ""
+"<b>Customize the grid appearance for all forms.</b><p>When <b>Show Grid</b> "
+"is checked, all forms show a grid.</p>"
 msgstr ""
 
-#: executor/main.cpp:60
-msgid "Read dialog from standard input"
-msgstr ""
+#. i18n: file: editor/preferences.ui:173
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
+#: rc.cpp:838
+msgid "Gr&id"
+msgstr "Gr&id"
 
-#: executor/main.cpp:61
-msgid "Use given catalog for translation"
-msgstr ""
+#. i18n: file: editor/preferences.ui:188
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxGrid)
+#: rc.cpp:841
+msgid "Sn&ap to grid"
+msgstr "Sn&apio i'r grid"
 
-#: executor/main.cpp:85
-msgid ""
-"Error: no dialog given. Use --stdin option to read dialog from standard "
-"input.\n"
+#. i18n: file: editor/preferences.ui:194
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxGrid)
+#: rc.cpp:844
+msgid "Snap to the grid"
 msgstr ""
 
-#: executor/instance.cpp:123
-msgid "<qt>Unable to create dialog.</qt>"
+#. i18n: file: editor/preferences.ui:197
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxGrid)
+#: rc.cpp:847
+msgid ""
+"<b>Customize the grid-settings for all forms.</b><p>When <b>Snap to Grid</b> "
+"is checked, the widgets snap to the grid using the X/Y resolution.</p>"
 msgstr ""
 
-#: executor/instance.cpp:195
-#, kde-format
-msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
+#. i18n: file: editor/preferences.ui:221
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinGridX)
+#. i18n: file: editor/preferences.ui:240
+#. i18n: ectx: property (toolTip), widget (QSpinBox, spinGridY)
+#: rc.cpp:850 rc.cpp:856
+msgid "Grid resolution"
 msgstr ""
 
-#: executor/instance.cpp:203
+#. i18n: file: editor/preferences.ui:224
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, spinGridX)
+#. i18n: file: editor/preferences.ui:243
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, spinGridY)
+#: rc.cpp:853 rc.cpp:859
 msgid ""
-"<qt>This file does not have a <b>.kmdr</b> extension. As a security "
-"precaution Kommander will only run Kommander scripts with a clear "
-"identity.</qt>"
+"<b>Customize the grid-settings for all forms.</b><p>When <b>Show Grid</b> is "
+"checked, a grid is shown on all forms using the X/Y resolution.</p>"
 msgstr ""
 
-#: executor/instance.cpp:205
-msgid "Wrong Extension"
+#. i18n: file: editor/preferences.ui:250
+#. i18n: ectx: property (text), widget (QLabel, Label1)
+#: rc.cpp:862
+msgid "Grid-&X:"
 msgstr ""
 
-#: executor/instance.cpp:222
-msgid ""
-"<qt>This dialog is running from your <i>/tmp</i> directory.  This may mean "
-"that it was run from a KMail attachment or from a webpage. <p>Any script "
-"contained in this dialog will have write access to all of your home "
-"directory; <b>running such dialogs may be dangerous: </b><p>are you sure you "
-"want to continue?</qt>"
+#. i18n: file: editor/preferences.ui:263
+#. i18n: ectx: property (text), widget (QLabel, Label1_2)
+#: rc.cpp:865
+msgid "Grid-&Y:"
 msgstr ""
 
-#: executor/instance.cpp:226 executor/instance.cpp:231
-msgid "Run Nevertheless"
-msgstr ""
+#. i18n: file: editor/preferences.ui:297
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox5)
+#: rc.cpp:868
+msgid "Ge&neral"
+msgstr "Cy&ffredinol"
 
-#: executor/instance.cpp:231
-#, kde-format
-msgid ""
-"<qt>The Kommander file <i>%1</i> does not have the <b>executable "
-"attribute</b> set and could possibly contain dangerous exploits.<p>If you "
-"trust the scripting (viewable in kmdr-editor) in this program, make it "
-"executable to get rid of this warning.<p>Are you sure you want to "
-"continue?</qt>"
+#. i18n: file: editor/preferences.ui:309
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxWorkspace)
+#: rc.cpp:871
+msgid "Restore last &workspace on startup"
 msgstr ""
 
-#: widgets/treewidget.cpp:66
-msgid "Add column at end with column header"
+#. i18n: file: editor/preferences.ui:315
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxWorkspace)
+#: rc.cpp:874
+msgid "Restore last workspace"
 msgstr ""
 
-#: widgets/treewidget.cpp:67
-msgid "Set sorting for a column"
+#. i18n: file: editor/preferences.ui:318
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxWorkspace)
+#: rc.cpp:877
+msgid ""
+"The current workspace settings will be restored the next time you start Qt "
+"Designer if this option is checked."
 msgstr ""
 
-#: widgets/treewidget.cpp:69
-msgid "Get the column count"
+#. i18n: file: editor/preferences.ui:325
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxSplash)
+#: rc.cpp:880
+msgid "Show &splash screen on startup"
 msgstr ""
 
-#: widgets/treewidget.cpp:70
-msgid "Get the column caption for column index"
+#. i18n: file: editor/preferences.ui:331
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxSplash)
+#: rc.cpp:883
+msgid "Show Splashscreen"
 msgstr ""
 
-#: widgets/treewidget.cpp:71
-msgid "Set the pixel width for column index - use 0 to hide"
+#. i18n: file: editor/preferences.ui:334
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxSplash)
+#: rc.cpp:886
+msgid ""
+"A splash screen is displayed when starting Qt Designer if this option is "
+"checked."
 msgstr ""
 
-#: widgets/closebutton.cpp:121
-msgid "Failed to start shell process."
+#. i18n: file: editor/preferences.ui:341
+#. i18n: ectx: property (text), widget (QCheckBox, checkAutoEdit)
+#: rc.cpp:889
+msgid "Disable data&base auto-edit in preview"
 msgstr ""
 
-#: widgets/closebutton.cpp:128
-msgid "Shell process exited with an error."
+#. i18n: file: editor/preferences.ui:351
+#. i18n: ectx: property (text), widget (QLabel, Label3)
+#: rc.cpp:892
+msgid "&Documentation path:"
 msgstr ""
 
-#: widgets/aboutdialog.cpp:62
+#. i18n: file: editor/preferences.ui:372
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, editDocPath)
+#: rc.cpp:895
 msgid ""
-"Sets information about the application. This is the first method that must "
-"be called, any addition to the dialog done before initialization will be "
-"ignored."
+"<b>Enter the path to the documentation.</b><p>You may provide an "
+"$environment variable as the first part of the pathname.</p>"
 msgstr ""
 
-#: widgets/aboutdialog.cpp:64
-msgid "Add an author. Only the author name is required."
+#. i18n: file: editor/preferences.ui:385
+#. i18n: ectx: property (toolTip), widget (QToolButton, buttonDocPath)
+#: rc.cpp:901
+msgid "Select path"
 msgstr ""
 
-#: widgets/aboutdialog.cpp:66
-msgid "Add a translator. Only the name is required."
+#. i18n: file: editor/preferences.ui:388
+#. i18n: ectx: property (whatsThis), widget (QToolButton, buttonDocPath)
+#: rc.cpp:904
+msgid "Look for the documentation path."
 msgstr ""
 
-#: widgets/aboutdialog.cpp:68
-msgid "Set a short description text."
-msgstr ""
+#. i18n: file: editor/preferences.ui:400
+#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox3)
+#: rc.cpp:907
+msgid "&Toolbars"
+msgstr "&Barrau Offer:"
 
-#: widgets/aboutdialog.cpp:70
-msgid "Set a homepage address."
+#. i18n: file: editor/preferences.ui:412
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxBigIcons)
+#: rc.cpp:910
+msgid "Show &big icons"
 msgstr ""
 
-#: widgets/aboutdialog.cpp:72
-msgid "Set an email address, where bugs can be reported."
+#. i18n: file: editor/preferences.ui:415
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxBigIcons)
+#: rc.cpp:913
+msgid "Big Icons"
 msgstr ""
 
-#: widgets/aboutdialog.cpp:74
-msgid ""
-"Sets license information of the application. The parameter can be one of the "
-"license keys - GPL_V2, LGPL_V2, BSD, ARTISTIC -, or a freely specified text."
+#. i18n: file: editor/preferences.ui:418
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxBigIcons)
+#: rc.cpp:916
+msgid "Big icons will be used in the toolbars if this is checked."
 msgstr ""
 
-#: widgets/aboutdialog.cpp:76
-msgid "Returns the set version string."
+#. i18n: file: editor/preferences.ui:425
+#. i18n: ectx: property (text), widget (QCheckBox, checkBoxTextLabels)
+#: rc.cpp:919
+msgid "Show text lab&els"
 msgstr ""
 
-#: widgets/corewidgetsplugin.cpp:38
-msgid "Kommander HTML part plugin."
+#. i18n: file: editor/preferences.ui:428
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxTextLabels)
+#: rc.cpp:922
+msgid "Text Labels"
 msgstr ""
 
-#: widgets/table.cpp:55
-msgid ""
-"Sets a column to sort ascending or descending. Optionally can sort with rows "
-"intact for database use. wholeRows is ignored under KDE4."
+#. i18n: file: editor/preferences.ui:431
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxTextLabels)
+#: rc.cpp:925
+msgid "Text labels will be used in the toolbars if this is checked."
 msgstr ""
 
-#: widgets/table.cpp:56
-msgid "Scrolls the table so the cell indicated is visible."
+#. i18n: file: editor/choosewidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, ChooseWidgetBase)
+#: rc.cpp:943
+msgid "Choose Widget"
 msgstr ""
 
-#: widgets/table.cpp:57
-msgid "Select cells using the upper left and lower right cell addresses"
+#. i18n: file: editor/choosewidget.ui:92
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:952
+msgid "Find:"
+msgstr "Canfod:"
+
+#. i18n: file: editor/paletteeditoradvanced.ui:35
+#. i18n: ectx: property (windowTitle), widget (QDialog, PaletteEditorAdvancedBase)
+#: rc.cpp:955
+msgid "Tune Palette"
 msgstr ""
 
-#: widgets/table.cpp:58
-msgid "Select the row with the zero based index."
+#. i18n: file: editor/paletteeditoradvanced.ui:41
+#. i18n: ectx: property (whatsThis), widget (QDialog, PaletteEditorAdvancedBase)
+#: rc.cpp:958
+msgid ""
+"<b>Edit Palette</b><p>Change the current widget or form's palette.</p><p>Use "
+"a generated palette or select colors for each color group and each color "
+"role.</p><p>The palette can be tested with different widget layouts in the "
+"preview section.</p>"
 msgstr ""
 
-#: widgets/table.cpp:59
-msgid "Select the column with the zero based index."
+#. i18n: file: editor/paletteeditoradvanced.ui:103
+#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup1)
+#: rc.cpp:973
+msgid "Auto"
+msgstr "Ymysgogol"
+
+#. i18n: file: editor/paletteeditoradvanced.ui:115
+#. i18n: ectx: property (text), widget (QCheckBox, checkBuildInactive)
+#: rc.cpp:976
+msgid "Build the inactive palette from the active palette."
 msgstr ""
 
-#: widgets/table.cpp:60
-msgid "Set the column read only using zero based index."
+#. i18n: file: editor/paletteeditoradvanced.ui:125
+#. i18n: ectx: property (text), widget (QCheckBox, checkBuildDisabled)
+#: rc.cpp:979
+msgid "Build the disabled palette from the active palette."
 msgstr ""
 
-#: widgets/table.cpp:61
-msgid "Set the row read only using zero based index."
+#. i18n: file: editor/paletteeditoradvanced.ui:138
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupCentral)
+#: rc.cpp:982
+msgid "Central Color &Roles"
 msgstr ""
 
-#: widgets/textedit.cpp:49
-msgid "See if the widget has been modified."
+#. i18n: file: editor/paletteeditoradvanced.ui:150
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboCentral)
+#: rc.cpp:985
+msgid "Choose the central color role"
 msgstr ""
 
-#: widgets/fontdialog.cpp:53
+#. i18n: file: editor/paletteeditoradvanced.ui:153
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboCentral)
+#: rc.cpp:988
 msgid ""
-"Sets the default font for the dialog, by specifying the family, the size and "
-"other style options."
+"<b>Select a color role.</b><p>Available central color roles are: <ul> "
+"<li>Background - general background color.</li> <li>Foreground - general "
+"foreground color. </li> <li>Base - used as the background color for example, "
+"for text entry widgets; it is usually white or another light color. </li> "
+"<li>Text - the foreground color used with Base. Usually this is the same as "
+"the Foreground, in which case it must provide good contrast both with the "
+"Background and with the Base. </li> <li>Button - general button background "
+"color; useful where buttons need a background different from Background, as "
+"in the Macintosh style. </li> <li>ButtonText - a foreground color used with "
+"the Button color. </li> <li>Highlight - a color used to indicate a selected "
+"or highlighted item. </li> <li>HighlightedText - a text color that contrasts "
+"to Highlight. </li> <li>BrightText - a text color that is very different "
+"from Foreground and contrasts well with, for example, black. </li> </ul> </p>"
 msgstr ""
 
-#: widgets/fontdialog.cpp:55
-msgid "Returns the font family."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:157
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:991
+msgid "Background"
+msgstr "Cefndir"
 
-#: widgets/fontdialog.cpp:57
-msgid "Returns the font size in points."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:162
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:994
+msgid "Foreground"
+msgstr "Blaendir"
+
+#. i18n: file: editor/paletteeditoradvanced.ui:167
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:997
+msgid "Button"
+msgstr "Botwm"
 
-#: widgets/fontdialog.cpp:59
-msgid "Returns true if the font is bold."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:172
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1000
+msgid "Base"
+msgstr "Bôn"
 
-#: widgets/fontdialog.cpp:61
-msgid "Returns true if the font is italic."
+#. i18n: file: editor/paletteeditoradvanced.ui:182
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1006
+msgid "BrightText"
 msgstr ""
 
-#: widgets/combobox.cpp:53
-msgid "Make the combobox expose its list without needing to use the mouse."
+#. i18n: file: editor/paletteeditoradvanced.ui:187
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1009
+msgid "ButtonText"
 msgstr ""
 
-#: widgets/popupmenu.cpp:59
-msgid ""
-"Insert an item into the popup menu. The executeWidget's execute method will "
-"be run when this item is selected. Returns the id of the inserted item. Use -"
-"1 as the index to insert at the end. The icon is optional."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:192
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1012
+msgid "Highlight"
+msgstr "Amlygu"
 
-#: widgets/popupmenu.cpp:60
-msgid ""
-"Insert a separator item into the popup menu. Use -1 as the index to insert "
-"at the end."
+#. i18n: file: editor/paletteeditoradvanced.ui:197
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1015
+msgid "HighlightText"
 msgstr ""
 
-#: widgets/popupmenu.cpp:61
-msgid ""
-"Change an item specified by id in the popup menu. The executeWidget's "
-"execute method will be run when this item is selected."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:202
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1018
+msgid "Link"
+msgstr "Cyswllt"
 
-#: widgets/popupmenu.cpp:62
-msgid "Enable the item specified by id in the popup menu."
+#. i18n: file: editor/paletteeditoradvanced.ui:207
+#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
+#: rc.cpp:1021
+msgid "LinkVisited"
 msgstr ""
 
-#: widgets/popupmenu.cpp:63
-msgid "Check if the item specified by id is enabled."
+#. i18n: file: editor/paletteeditoradvanced.ui:247
+#. i18n: ectx: property (text), widget (QLabel, labelPixmap)
+#: rc.cpp:1024
+msgid "Choose pi&xmap:"
 msgstr ""
 
-#: widgets/popupmenu.cpp:64
-msgid "Make the item specified by id visible."
+#. i18n: file: editor/paletteeditoradvanced.ui:277
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonPixmap)
+#: rc.cpp:1030
+msgid "Choose a pixmap file for the selected central color role."
 msgstr ""
 
-#: widgets/popupmenu.cpp:65
-msgid "Apply checked status for the item specified by id."
+#. i18n: file: editor/paletteeditoradvanced.ui:298
+#. i18n: ectx: property (text), widget (QLabel, labelCentral)
+#: rc.cpp:1033
+msgid "&Select color:"
 msgstr ""
 
-#: widgets/popupmenu.cpp:66
-msgid "Check if the item specified by id is visible."
+#. i18n: file: editor/paletteeditoradvanced.ui:328
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonCentral)
+#: rc.cpp:1039
+msgid "Choose a color for the selected central color role."
 msgstr ""
 
-#: widgets/popupmenu.cpp:67
-msgid "Verify if the item specified by id is checked."
+#. i18n: file: editor/paletteeditoradvanced.ui:340
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupEffect)
+#: rc.cpp:1042
+msgid "3D Shadow &Effects"
 msgstr ""
 
-#: widgets/popupmenu.cpp:68
-msgid ""
-"Insert submenu widget into the popup menu. Use -1 as the index to insert at "
-"the end. The icon is optional."
+#. i18n: file: editor/paletteeditoradvanced.ui:360
+#. i18n: ectx: property (text), widget (QCheckBox, checkBuildEffect)
+#: rc.cpp:1045
+msgid "Build &from button color:"
 msgstr ""
 
-#: widgets/toolbox.cpp:42
-msgid "Adds a widget to the toolbox. Returns the index of the widget."
+#. i18n: file: editor/paletteeditoradvanced.ui:366
+#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBuildEffect)
+#: rc.cpp:1048
+msgid "Generate shadings"
 msgstr ""
 
-#: widgets/toolbox.cpp:44
-msgid "Returns the name of the active widget."
+#. i18n: file: editor/paletteeditoradvanced.ui:369
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBuildEffect)
+#: rc.cpp:1051
+msgid "Check to let 3D-effect colors be calculated from the button-color."
 msgstr ""
 
-#: widgets/toolbox.cpp:45
-msgid ""
-"Remove the selected widget, returns the index of the removed widget or -1 if "
-"no such widget was found."
+#. i18n: file: editor/paletteeditoradvanced.ui:376
+#. i18n: ectx: property (toolTip), widget (QComboBox, comboEffect)
+#: rc.cpp:1054
+msgid "Choose 3D-effect color role"
 msgstr ""
 
-#: widgets/toolbox.cpp:46
+#. i18n: file: editor/paletteeditoradvanced.ui:379
+#. i18n: ectx: property (whatsThis), widget (QComboBox, comboEffect)
+#: rc.cpp:1057
 msgid ""
-"Remove the widget from the index position, returns the index of the removed "
-"widget or -1 if no widget was found."
+"<b>Select a color effect role.</b><p>Available effect roles are: <ul> "
+"<li>Light - lighter than Button color. </li> <li>Midlight - between Button "
+"and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker "
+"than Button. </li> <li>Shadow - a very dark color. </li> </ul>"
 msgstr ""
 
-#: widgets/toolbox.cpp:48
-msgid "Activates the selected widget."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:383
+#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
+#: rc.cpp:1060
+msgid "Light"
+msgstr "Golau"
 
-#: widgets/toolbox.cpp:50
-msgid "Returns the index of the active widget."
+#. i18n: file: editor/paletteeditoradvanced.ui:388
+#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
+#: rc.cpp:1063
+msgid "Midlight"
 msgstr ""
 
-#: widgets/toolbox.cpp:52
-msgid "Returns the widget having the supplied index."
-msgstr ""
+#. i18n: file: editor/paletteeditoradvanced.ui:393
+#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
+#: rc.cpp:1066
+msgid "Mid"
+msgstr "Canol"
 
-#: widgets/toolbox.cpp:54
-msgid ""
-"Returns the index of the widget, -1 if the widget is not part of the toolbox."
+#. i18n: file: editor/paletteeditoradvanced.ui:398
+#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
+#: rc.cpp:1069
+msgid "Dark"
+msgstr "Tywyll"
+
+#. i18n: file: editor/paletteeditoradvanced.ui:403
+#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
+#: rc.cpp:1072
+msgid "Shadow"
+msgstr "Cysgod"
+
+#. i18n: file: editor/paletteeditoradvanced.ui:451
+#. i18n: ectx: property (text), widget (QLabel, labelEffect)
+#: rc.cpp:1075
+msgid "Select co&lor:"
 msgstr ""
 
-#: widgets/timer.cpp:66
-msgid "Set the timer timeout interval in ms."
+#. i18n: file: editor/paletteeditoradvanced.ui:481
+#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonEffect)
+#: rc.cpp:1081
+msgid "Choose a color for the selected effect color role."
 msgstr ""
 
 #. i18n: file: editor/newform.ui:32
 #. i18n: ectx: property (windowTitle), widget (QDialog, NewFormBase)
-#: rc.cpp:5
+#: rc.cpp:1099
 msgid "New File"
-msgstr "Ffeil newydd"
-
-#. i18n: file: editor/newform.ui:38
-#. i18n: ectx: property (whatsThis), widget (QDialog, NewFormBase)
-#: rc.cpp:8
-msgid ""
-"<b>New Form</b><p>Select a template for the new form and click the <b>OK</b>-"
-"button to create it.</p>"
-msgstr ""
-
-#. i18n: file: editor/newform.ui:84
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/preferences.ui:479
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/wizardeditor.ui:152
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/paletteeditoradvanced.ui:527
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/functions.ui:253
-#. i18n: ectx: property (text), widget (KPushButton, buttonOk)
-#. i18n: file: editor/connectioneditor.ui:283
-#. i18n: ectx: property (text), widget (KPushButton, okButton)
-#. i18n: file: editor/formsettings.ui:71
-#. i18n: ectx: property (text), widget (KPushButton, buttonOk)
-#. i18n: file: editor/listboxeditor.ui:84
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/multilineeditor.ui:107
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/choosewidget.ui:40
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/tableeditor.ui:85
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/pixmapfunction.ui:818
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/templates/Tab_Dialog.ui:99
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Configuration_Dialog.ui:117
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:45
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:76
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/paletteeditor.ui:335
-#. i18n: ectx: property (text), widget (QPushButton, buttonOk)
-#. i18n: file: editor/iconvieweditor.ui:316
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:596
-#. i18n: ectx: property (text), widget (QPushButton, okButton)
-#: rc.cpp:14 rc.cpp:173 rc.cpp:200 rc.cpp:350 rc.cpp:404 rc.cpp:482 rc.cpp:497
-#: rc.cpp:596 rc.cpp:722 rc.cpp:784 rc.cpp:805 rc.cpp:937 rc.cpp:955
-#: rc.cpp:976 rc.cpp:982 rc.cpp:1000 rc.cpp:1051 rc.cpp:1127 rc.cpp:1352
-msgid "&OK"
-msgstr ""
-
-#. i18n: file: editor/newform.ui:93
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#: rc.cpp:17
-msgid "Create a new form using the selected template."
-msgstr ""
-
-#. i18n: file: editor/newform.ui:100
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/preferences.ui:495
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/wizardeditor.ui:181
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/paletteeditoradvanced.ui:543
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/functions.ui:269
-#. i18n: ectx: property (text), widget (KPushButton, buttonCancel)
-#. i18n: file: editor/connectioneditor.ui:299
-#. i18n: ectx: property (text), widget (KPushButton, cancelButton)
-#. i18n: file: editor/formsettings.ui:87
-#. i18n: ectx: property (text), widget (KPushButton, buttonCancel)
-#. i18n: file: editor/createtemplate.ui:117
-#. i18n: ectx: property (text), widget (QPushButton, PushButton1)
-#. i18n: file: editor/listboxeditor.ui:113
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/multilineeditor.ui:136
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/choosewidget.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/tableeditor.ui:114
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/pixmapfunction.ui:831
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/templates/Tab_Dialog.ui:113
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Configuration_Dialog.ui:131
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:59
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:90
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/paletteeditor.ui:351
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/iconvieweditor.ui:347
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:625
-#. i18n: ectx: property (text), widget (QPushButton, cancelButton)
-#: rc.cpp:20 rc.cpp:179 rc.cpp:212 rc.cpp:356 rc.cpp:407 rc.cpp:488 rc.cpp:503
-#: rc.cpp:578 rc.cpp:608 rc.cpp:734 rc.cpp:787 rc.cpp:817 rc.cpp:940
-#: rc.cpp:958 rc.cpp:979 rc.cpp:985 rc.cpp:1003 rc.cpp:1057 rc.cpp:1139
-#: rc.cpp:1364
-msgid "&Cancel"
+msgstr "Ffeil newydd"
+
+#. i18n: file: editor/newform.ui:38
+#. i18n: ectx: property (whatsThis), widget (QDialog, NewFormBase)
+#: rc.cpp:1102
+msgid ""
+"<b>New Form</b><p>Select a template for the new form and click the <b>OK</b>-"
+"button to create it.</p>"
+msgstr ""
+
+#. i18n: file: editor/newform.ui:93
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
+#: rc.cpp:1111
+msgid "Create a new form using the selected template."
 msgstr ""
 
 #. i18n: file: editor/newform.ui:106
 #. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#: rc.cpp:23
+#: rc.cpp:1117
 msgid "Close the dialog without creating a new form."
 msgstr ""
 
 #. i18n: file: editor/newform.ui:127
 #. i18n: ectx: property (whatsThis), widget (Q3IconView, templateView)
-#: rc.cpp:26
+#: rc.cpp:1120
 msgid "Displays a list of the available templates."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:32
-#. i18n: ectx: property (windowTitle), widget (QDialog, Preferences)
-#: rc.cpp:29
-msgid "Preferences"
-msgstr "Hoffterau"
+#. i18n: file: editor/multilineeditor.ui:32
+#. i18n: ectx: property (windowTitle), widget (QDialog, MultiLineEditorBase)
+#: rc.cpp:1123
+msgid "Edit Multiline Edit"
+msgstr ""
 
-#. i18n: file: editor/preferences.ui:38
-#. i18n: ectx: property (whatsThis), widget (QDialog, Preferences)
-#: rc.cpp:32
+#. i18n: file: editor/multilineeditor.ui:38
+#. i18n: ectx: property (whatsThis), widget (QDialog, MultiLineEditorBase)
+#: rc.cpp:1126
 msgid ""
-"<b>Preferences</b><p>Change the preferences of Qt Designer. There is always "
-"one tab with general preferences. There may be additional tabs, depending on "
-"which plugins are installed.</p>"
+"<b>Edit Multiline Edit</b><p>Enter the text and click the <b>OK</b> button "
+"to apply the changes.</p>"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:51
-#. i18n: ectx: attribute (title), widget (QWidget, pageGeneral)
-#: rc.cpp:35
-msgid "General"
-msgstr "Cyffredinol"
-
-#. i18n: file: editor/preferences.ui:63
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup1)
-#: rc.cpp:38
-msgid "Backgro&und"
-msgstr "Cefndir"
-
-#. i18n: file: editor/preferences.ui:90
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonColor)
-#. i18n: file: editor/paletteeditoradvanced.ui:325
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonCentral)
-#. i18n: file: editor/paletteeditoradvanced.ui:478
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonEffect)
-#. i18n: file: editor/paletteeditor.ui:125
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonMainColor)
-#. i18n: file: editor/paletteeditor.ui:188
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonMainColor2)
-#: rc.cpp:41 rc.cpp:299 rc.cpp:341 rc.cpp:1015 rc.cpp:1024
-msgid "Choose a color"
+#. i18n: file: editor/multilineeditor.ui:66
+#. i18n: ectx: property (whatsThis), widget (Q3MultiLineEdit, preview)
+#: rc.cpp:1132
+msgid "Enter your text here."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:93
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonColor)
-#: rc.cpp:44
-msgid "Select a color in the color dialog."
+#. i18n: file: editor/listboxeditor.ui:32
+#. i18n: ectx: property (windowTitle), widget (QDialog, ListBoxEditorBase)
+#: rc.cpp:1156
+msgid "Edit Listbox"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:103
-#. i18n: ectx: property (text), widget (QRadioButton, radioColor)
-#: rc.cpp:47
-msgid "Co&lor"
-msgstr "Ll&iw"
-
-#. i18n: file: editor/preferences.ui:106
-#. i18n: ectx: property (toolTip), widget (QRadioButton, radioColor)
-#: rc.cpp:50
-msgid "Use a background color"
+#. i18n: file: editor/listboxeditor.ui:38
+#. i18n: ectx: property (whatsThis), widget (QDialog, ListBoxEditorBase)
+#: rc.cpp:1159
+msgid ""
+"<b>Edit Listbox</b><p>Add, edit or delete items in the listbox.</p><p>Click "
+"the <b>New Item</b> button to create a new listbox entry, then enter text "
+"and choose a pixmap.</p><p>Select an item from the list and click the "
+"<b>Delete Item</b> button to remove the item from the list.</p>"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:109
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioColor)
-#: rc.cpp:53
-msgid "Use a background color."
+#. i18n: file: editor/listboxeditor.ui:207
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemChoosePixmap)
+#: rc.cpp:1210
+msgid "Choose a pixmap file for the selected item."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:116
-#. i18n: ectx: property (text), widget (QRadioButton, radioPixmap)
-#: rc.cpp:56
-msgid "&Pixmap"
-msgstr "&Picsfap"
+#. i18n: file: editor/listboxeditor.ui:236
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, itemText)
+#: rc.cpp:1219
+msgid "Change the selected item's text."
+msgstr ""
 
-#. i18n: file: editor/preferences.ui:122
-#. i18n: ectx: property (toolTip), widget (QRadioButton, radioPixmap)
-#: rc.cpp:59
-msgid "Use a background pixmap"
+#. i18n: file: editor/listboxeditor.ui:252
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemNew)
+#: rc.cpp:1228
+msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:125
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, radioPixmap)
-#: rc.cpp:62
-msgid "Use a background pixmap."
+#. i18n: file: editor/listboxeditor.ui:265
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDelete)
+#: rc.cpp:1237
+msgid "Delete the selected item"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:144
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonPixmap)
-#. i18n: file: editor/paletteeditoradvanced.ui:274
-#. i18n: ectx: property (toolTip), widget (StyledButton, buttonPixmap)
-#: rc.cpp:65 rc.cpp:290
-msgid "Select a pixmap"
+#. i18n: file: editor/listboxeditor.ui:297
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemUp)
+#: rc.cpp:1243
+msgid "Moves the selected item up."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:147
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonPixmap)
-#: rc.cpp:68
-msgid "Choose a pixmap file."
+#. i18n: file: editor/listboxeditor.ui:313
+#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDown)
+#: rc.cpp:1249
+msgid "Move the selected item down."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:157
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxShowGrid)
-#: rc.cpp:71
-msgid "Show &grid"
-msgstr "Dangos &grid"
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:48
+#. i18n: ectx: property (accel), widget (QPushButton)
+#. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:73
+#. i18n: ectx: property (accel), widget (QPushButton)
+#. i18n: file: editor/templates/Tab_Dialog.ui:71
+#. i18n: ectx: property (accel), widget (QPushButton)
+#. i18n: file: editor/templates/Configuration_Dialog.ui:89
+#. i18n: ectx: property (accel), widget (QPushButton)
+#: rc.cpp:1255 rc.cpp:1273 rc.cpp:1285 rc.cpp:1306
+msgid "F1"
+msgstr "F1"
 
-#. i18n: file: editor/preferences.ui:163
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxShowGrid)
-#: rc.cpp:74
-msgid "Show Grid"
-msgstr "Dangos Grid"
+#. i18n: file: editor/templates/Tab_Dialog.ui:37
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: editor/templates/Tab_Dialog.ui:45
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: editor/templates/Configuration_Dialog.ui:55
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: editor/templates/Configuration_Dialog.ui:63
+#. i18n: ectx: attribute (title), widget (QWidget)
+#: rc.cpp:1276 rc.cpp:1279 rc.cpp:1297 rc.cpp:1300
+msgid "Tab"
+msgstr "Tab"
 
-#. i18n: file: editor/preferences.ui:166
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxShowGrid)
-#: rc.cpp:77
-msgid ""
-"<b>Customize the grid appearance for all forms.</b><p>When <b>Show Grid</b> "
-"is checked, all forms show a grid.</p>"
+#. i18n: file: editor/functions.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, FunctionsDialogBase)
+#: rc.cpp:1315
+msgid "Function Browser"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:173
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
-#: rc.cpp:80
-msgid "Gr&id"
-msgstr "Gr&id"
+#. i18n: file: editor/functions.ui:24
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:1318
+msgid "Description:"
+msgstr "Disgrifiad:"
 
-#. i18n: file: editor/preferences.ui:188
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxGrid)
-#: rc.cpp:83
-msgid "Sn&ap to grid"
-msgstr "Sn&apio i'r grid"
+#. i18n: file: editor/functions.ui:52
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
+#: rc.cpp:1321
+msgid "&Parameters"
+msgstr "&Paramedrau"
 
-#. i18n: file: editor/preferences.ui:194
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxGrid)
-#: rc.cpp:86
-msgid "Snap to the grid"
+#. i18n: file: editor/functions.ui:58
+#. i18n: ectx: property (text), widget (QLabel, widgetLabel)
+#: rc.cpp:1324
+msgid "Widget:"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:197
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxGrid)
-#: rc.cpp:89
-msgid ""
-"<b>Customize the grid-settings for all forms.</b><p>When <b>Snap to Grid</b> "
-"is checked, the widgets snap to the grid using the X/Y resolution.</p>"
+#. i18n: file: editor/functions.ui:71
+#. i18n: ectx: property (text), widget (QLabel, argLabel1)
+#: rc.cpp:1327
+msgid "Arg1"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:221
-#. i18n: ectx: property (toolTip), widget (QSpinBox, spinGridX)
-#. i18n: file: editor/preferences.ui:240
-#. i18n: ectx: property (toolTip), widget (QSpinBox, spinGridY)
-#: rc.cpp:92 rc.cpp:98
-msgid "Grid resolution"
+#. i18n: file: editor/functions.ui:84
+#. i18n: ectx: property (text), widget (QLabel, argLabel2)
+#: rc.cpp:1330
+msgid "Arg2"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:224
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, spinGridX)
-#. i18n: file: editor/preferences.ui:243
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, spinGridY)
-#: rc.cpp:95 rc.cpp:101
-msgid ""
-"<b>Customize the grid-settings for all forms.</b><p>When <b>Show Grid</b> is "
-"checked, a grid is shown on all forms using the X/Y resolution.</p>"
+#. i18n: file: editor/functions.ui:97
+#. i18n: ectx: property (text), widget (QLabel, argLabel3)
+#: rc.cpp:1333
+msgid "Arg3"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:250
-#. i18n: ectx: property (text), widget (QLabel, Label1)
-#: rc.cpp:104
-msgid "Grid-&X:"
+#. i18n: file: editor/functions.ui:110
+#. i18n: ectx: property (text), widget (QLabel, argLabel4)
+#: rc.cpp:1336
+msgid "Arg4"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:263
-#. i18n: ectx: property (text), widget (QLabel, Label1_2)
-#: rc.cpp:107
-msgid "Grid-&Y:"
+#. i18n: file: editor/functions.ui:123
+#. i18n: ectx: property (text), widget (QLabel, argLabel5)
+#: rc.cpp:1339
+msgid "Arg5"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:297
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox5)
-#: rc.cpp:110
-msgid "Ge&neral"
-msgstr "Cy&ffredinol"
-
-#. i18n: file: editor/preferences.ui:309
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxWorkspace)
-#: rc.cpp:113
-msgid "Restore last &workspace on startup"
+#. i18n: file: editor/functions.ui:136
+#. i18n: ectx: property (text), widget (QLabel, argLabel6)
+#: rc.cpp:1342
+msgid "Arg6"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:315
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxWorkspace)
-#: rc.cpp:116
-msgid "Restore last workspace"
-msgstr ""
+#. i18n: file: editor/functions.ui:182
+#. i18n: ectx: property (toolTip), widget (KPushButton, copyButton)
+#: rc.cpp:1345
+msgid "Insert function"
+msgstr "Mewnosod Ffwythiant"
 
-#. i18n: file: editor/preferences.ui:318
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxWorkspace)
-#: rc.cpp:119
-msgid ""
-"The current workspace settings will be restored the next time you start Qt "
-"Designer if this option is checked."
+#. i18n: file: editor/functions.ui:206
+#. i18n: ectx: property (toolTip), widget (KPushButton, clearButton)
+#: rc.cpp:1348
+msgid "Clear edited text"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:325
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxSplash)
-#: rc.cpp:122
-msgid "Show &splash screen on startup"
+#. i18n: file: editor/functions.ui:213
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:1351
+msgid "Inserted &text:"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:331
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxSplash)
-#: rc.cpp:125
-msgid "Show Splashscreen"
+#. i18n: file: editor/functions.ui:226
+#. i18n: ectx: property (toolTip), widget (KLineEdit, insertedText)
+#: rc.cpp:1354
+msgid "Text to be inserted"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:334
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxSplash)
-#: rc.cpp:128
-msgid ""
-"A splash screen is displayed when starting Qt Designer if this option is "
-"checked."
-msgstr ""
+#. i18n: file: editor/functions.ui:302
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1363
+msgid "&Group:"
+msgstr "&Grŵp:"
 
-#. i18n: file: editor/preferences.ui:341
-#. i18n: ectx: property (text), widget (QCheckBox, checkAutoEdit)
-#: rc.cpp:131
-msgid "Disable data&base auto-edit in preview"
+#. i18n: file: editor/functions.ui:333
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1366
+msgid "&Function:"
+msgstr "&Ffwythiant"
+
+#: pluginmanager/mainwindow.cpp:78
+#, kde-format
+msgid "<qt>Unable to load Kommander plugin<br><b>%1</b></qt>"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:351
-#. i18n: ectx: property (text), widget (QLabel, Label3)
-#: rc.cpp:134
-msgid "&Documentation path:"
+#: pluginmanager/mainwindow.cpp:79
+msgid "Cannot add plugin"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:372
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, editDocPath)
-#: rc.cpp:137
+#: pluginmanager/main.cpp:39
 msgid ""
-"<b>Enter the path to the documentation.</b><p>You may provide an "
-"$environment variable as the first part of the pathname.</p>"
+"kmdr-plugins is a component of the Kommander dialog system that manages "
+"installed plugins."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:385
-#. i18n: ectx: property (toolTip), widget (QToolButton, buttonDocPath)
-#: rc.cpp:143
-msgid "Select path"
+#: pluginmanager/main.cpp:46
+msgid "Kommander Plugin Manager"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:388
-#. i18n: ectx: property (whatsThis), widget (QToolButton, buttonDocPath)
-#: rc.cpp:146
-msgid "Look for the documentation path."
+#: pluginmanager/main.cpp:48
+msgid "(C) 2004-2005 Kommander authors"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:400
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox3)
-#: rc.cpp:149
-msgid "&Toolbars"
-msgstr "&Barrau Offer:"
-
-#. i18n: file: editor/preferences.ui:412
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxBigIcons)
-#: rc.cpp:152
-msgid "Show &big icons"
+#: pluginmanager/main.cpp:56
+msgid "Register given library"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:415
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxBigIcons)
-#: rc.cpp:155
-msgid "Big Icons"
+#: pluginmanager/main.cpp:58
+msgid "Remove given library"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:418
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxBigIcons)
-#: rc.cpp:158
-msgid "Big icons will be used in the toolbars if this is checked."
+#: pluginmanager/main.cpp:60
+msgid "Check all installed plugins and remove those missing"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:425
-#. i18n: ectx: property (text), widget (QCheckBox, checkBoxTextLabels)
-#: rc.cpp:161
-msgid "Show text lab&els"
+#: pluginmanager/main.cpp:62
+msgid "List all installed plugins"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:428
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBoxTextLabels)
-#: rc.cpp:164
-msgid "Text Labels"
+#: pluginmanager/main.cpp:77
+#, kde-format
+msgid "Error adding plugin '%1'"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:431
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBoxTextLabels)
-#: rc.cpp:167
-msgid "Text labels will be used in the toolbars if this is checked."
+#: pluginmanager/main.cpp:82
+#, kde-format
+msgid "Error removing plugin '%1'"
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:488
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/wizardeditor.ui:161
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/paletteeditoradvanced.ui:536
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/connectioneditor.ui:292
-#. i18n: ectx: property (whatsThis), widget (KPushButton, okButton)
-#. i18n: file: editor/formsettings.ui:80
-#. i18n: ectx: property (whatsThis), widget (KPushButton, buttonOk)
-#. i18n: file: editor/listboxeditor.ui:93
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/multilineeditor.ui:116
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/tableeditor.ui:94
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/paletteeditor.ui:344
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonOk)
-#. i18n: file: editor/iconvieweditor.ui:325
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:605
-#. i18n: ectx: property (whatsThis), widget (QPushButton, okButton)
-#: rc.cpp:176 rc.cpp:203 rc.cpp:353 rc.cpp:485 rc.cpp:500 rc.cpp:599
-#: rc.cpp:725 rc.cpp:808 rc.cpp:1054 rc.cpp:1130 rc.cpp:1355
-msgid "Close the dialog and apply all the changes."
+#: widgets/aboutdialog.cpp:62
+msgid ""
+"Sets information about the application. This is the first method that must "
+"be called, any addition to the dialog done before initialization will be "
+"ignored."
 msgstr ""
 
-#. i18n: file: editor/preferences.ui:504
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/wizardeditor.ui:187
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/paletteeditoradvanced.ui:549
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/connectioneditor.ui:305
-#. i18n: ectx: property (whatsThis), widget (KPushButton, cancelButton)
-#. i18n: file: editor/formsettings.ui:93
-#. i18n: ectx: property (whatsThis), widget (KPushButton, buttonCancel)
-#. i18n: file: editor/listboxeditor.ui:119
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/multilineeditor.ui:142
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/tableeditor.ui:120
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/paletteeditor.ui:357
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCancel)
-#. i18n: file: editor/iconvieweditor.ui:353
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:631
-#. i18n: ectx: property (whatsThis), widget (QPushButton, cancelButton)
-#: rc.cpp:182 rc.cpp:215 rc.cpp:359 rc.cpp:491 rc.cpp:506 rc.cpp:611
-#: rc.cpp:737 rc.cpp:820 rc.cpp:1060 rc.cpp:1142 rc.cpp:1367
-msgid "Close the dialog and discard any changes."
+#: widgets/aboutdialog.cpp:64
+msgid "Add an author. Only the author name is required."
 msgstr ""
 
-#. i18n: file: editor/wizardeditor.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, WizardEditorBase)
-#: rc.cpp:185
-msgid "Wizard Page Editor"
+#: widgets/aboutdialog.cpp:66
+msgid "Add a translator. Only the name is required."
 msgstr ""
 
-#. i18n: file: editor/wizardeditor.ui:41
-#. i18n: ectx: property (text), widget (QLabel, pagesLabel)
-#: rc.cpp:188
-msgid "Wizard pages:"
+#: widgets/aboutdialog.cpp:68
+msgid "Set a short description text."
 msgstr ""
 
-#. i18n: file: editor/wizardeditor.ui:64
-#. i18n: ectx: property (text), widget (QPushButton, buttonAdd)
-#. i18n: file: editor/listeditor.ui:46
-#. i18n: ectx: property (text), widget (QPushButton, PushButton1)
-#: rc.cpp:191 rc.cpp:1151
-msgid "&Add"
-msgstr "&Ychwanegu"
-
-#. i18n: file: editor/wizardeditor.ui:71
-#. i18n: ectx: property (text), widget (QPushButton, buttonRemove)
-#. i18n: file: editor/listeditor.ui:53
-#. i18n: ectx: property (text), widget (QPushButton, PushButton2)
-#: rc.cpp:194 rc.cpp:1154
-msgid "&Remove"
+#: widgets/aboutdialog.cpp:70
+msgid "Set a homepage address."
 msgstr ""
 
-#. i18n: file: editor/wizardeditor.ui:168
-#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
-#. i18n: file: editor/listboxeditor.ui:100
-#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
-#. i18n: file: editor/multilineeditor.ui:123
-#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
-#. i18n: file: editor/tableeditor.ui:101
-#. i18n: ectx: property (text), widget (QPushButton, buttonApply)
-#. i18n: file: editor/iconvieweditor.ui:333
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:612
-#. i18n: ectx: property (text), widget (QPushButton, applyButton)
-#: rc.cpp:206 rc.cpp:602 rc.cpp:728 rc.cpp:811 rc.cpp:1133 rc.cpp:1358
-msgid "&Apply"
+#: widgets/aboutdialog.cpp:72
+msgid "Set an email address, where bugs can be reported."
 msgstr ""
 
-#. i18n: file: editor/wizardeditor.ui:174
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
-#. i18n: file: editor/listboxeditor.ui:106
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
-#. i18n: file: editor/multilineeditor.ui:129
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
-#. i18n: file: editor/tableeditor.ui:107
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonApply)
-#. i18n: file: editor/iconvieweditor.ui:339
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:618
-#. i18n: ectx: property (whatsThis), widget (QPushButton, applyButton)
-#: rc.cpp:209 rc.cpp:605 rc.cpp:731 rc.cpp:814 rc.cpp:1136 rc.cpp:1361
-msgid "Apply all changes."
+#: widgets/aboutdialog.cpp:74
+msgid ""
+"Sets license information of the application. The parameter can be one of the "
+"license keys - GPL_V2, LGPL_V2, BSD, ARTISTIC -, or a freely specified text."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:35
-#. i18n: ectx: property (windowTitle), widget (QDialog, PaletteEditorAdvancedBase)
-#: rc.cpp:218
-msgid "Tune Palette"
+#: widgets/aboutdialog.cpp:76
+msgid "Returns the set version string."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:41
-#. i18n: ectx: property (whatsThis), widget (QDialog, PaletteEditorAdvancedBase)
-#: rc.cpp:221
-msgid ""
-"<b>Edit Palette</b><p>Change the current widget or form's palette.</p><p>Use "
-"a generated palette or select colors for each color group and each color "
-"role.</p><p>The palette can be tested with different widget layouts in the "
-"preview section.</p>"
+#: widgets/scriptobject.cpp:102 lib/kommanderwidget.cpp:120
+msgid "Invalid state for associated text."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:61
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#. i18n: file: editor/paletteeditor.ui:252
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:224 rc.cpp:1036
-msgid "Select &palette:"
+#: widgets/closebutton.cpp:121
+msgid "Failed to start shell process."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:75
-#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
-#. i18n: file: editor/paletteeditor.ui:266
-#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
-#: rc.cpp:227 rc.cpp:1039
-msgid "Active Palette"
+#: widgets/closebutton.cpp:128
+msgid "Shell process exited with an error."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:80
-#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
-#. i18n: file: editor/paletteeditor.ui:271
-#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
-#: rc.cpp:230 rc.cpp:1042
-msgid "Inactive Palette"
+#: widgets/toolbox.cpp:42
+msgid "Adds a widget to the toolbox. Returns the index of the widget."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:85
-#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
-#. i18n: file: editor/paletteeditor.ui:276
-#. i18n: ectx: property (text), item, widget (QComboBox, paletteCombo)
-#: rc.cpp:233 rc.cpp:1045
-msgid "Disabled Palette"
+#: widgets/toolbox.cpp:44
+msgid "Returns the name of the active widget."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:103
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup1)
-#: rc.cpp:236
-msgid "Auto"
-msgstr "Ymysgogol"
+#: widgets/toolbox.cpp:45
+msgid ""
+"Remove the selected widget, returns the index of the removed widget or -1 if "
+"no such widget was found."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:115
-#. i18n: ectx: property (text), widget (QCheckBox, checkBuildInactive)
-#: rc.cpp:239
-msgid "Build the inactive palette from the active palette."
+#: widgets/toolbox.cpp:46
+msgid ""
+"Remove the widget from the index position, returns the index of the removed "
+"widget or -1 if no widget was found."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:125
-#. i18n: ectx: property (text), widget (QCheckBox, checkBuildDisabled)
-#: rc.cpp:242
-msgid "Build the disabled palette from the active palette."
+#: widgets/toolbox.cpp:48
+msgid "Activates the selected widget."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:138
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupCentral)
-#: rc.cpp:245
-msgid "Central Color &Roles"
+#: widgets/toolbox.cpp:50
+msgid "Returns the index of the active widget."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:150
-#. i18n: ectx: property (toolTip), widget (QComboBox, comboCentral)
-#: rc.cpp:248
-msgid "Choose the central color role"
+#: widgets/toolbox.cpp:52
+msgid "Returns the widget having the supplied index."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:153
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboCentral)
-#: rc.cpp:251
+#: widgets/toolbox.cpp:54
 msgid ""
-"<b>Select a color role.</b><p>Available central color roles are: <ul> "
-"<li>Background - general background color.</li> <li>Foreground - general "
-"foreground color. </li> <li>Base - used as the background color for example, "
-"for text entry widgets; it is usually white or another light color. </li> "
-"<li>Text - the foreground color used with Base. Usually this is the same as "
-"the Foreground, in which case it must provide good contrast both with the "
-"Background and with the Base. </li> <li>Button - general button background "
-"color; useful where buttons need a background different from Background, as "
-"in the Macintosh style. </li> <li>ButtonText - a foreground color used with "
-"the Button color. </li> <li>Highlight - a color used to indicate a selected "
-"or highlighted item. </li> <li>HighlightedText - a text color that contrasts "
-"to Highlight. </li> <li>BrightText - a text color that is very different "
-"from Foreground and contrasts well with, for example, black. </li> </ul> </p>"
+"Returns the index of the widget, -1 if the widget is not part of the toolbox."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:157
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:254
-msgid "Background"
-msgstr "Cefndir"
-
-#. i18n: file: editor/paletteeditoradvanced.ui:162
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:257
-msgid "Foreground"
-msgstr "Blaendir"
-
-#. i18n: file: editor/paletteeditoradvanced.ui:167
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:260
-msgid "Button"
-msgstr "Botwm"
-
-#. i18n: file: editor/paletteeditoradvanced.ui:172
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:263
-msgid "Base"
-msgstr "Bôn"
+#: widgets/combobox.cpp:53
+msgid "Make the combobox expose its list without needing to use the mouse."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:182
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:269
-msgid "BrightText"
+#: widgets/corewidgetsplugin.cpp:38
+msgid "Kommander HTML part plugin."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:187
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:272
-msgid "ButtonText"
+#: widgets/fontdialog.cpp:53
+msgid ""
+"Sets the default font for the dialog, by specifying the family, the size and "
+"other style options."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:192
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:275
-msgid "Highlight"
-msgstr "Amlygu"
+#: widgets/fontdialog.cpp:55
+msgid "Returns the font family."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:197
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:278
-msgid "HighlightText"
+#: widgets/fontdialog.cpp:57
+msgid "Returns the font size in points."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:202
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:281
-msgid "Link"
-msgstr "Cyswllt"
+#: widgets/fontdialog.cpp:59
+msgid "Returns true if the font is bold."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:207
-#. i18n: ectx: property (text), item, widget (QComboBox, comboCentral)
-#: rc.cpp:284
-msgid "LinkVisited"
+#: widgets/fontdialog.cpp:61
+msgid "Returns true if the font is italic."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:247
-#. i18n: ectx: property (text), widget (QLabel, labelPixmap)
-#: rc.cpp:287
-msgid "Choose pi&xmap:"
+#: widgets/table.cpp:55
+msgid ""
+"Sets a column to sort ascending or descending. Optionally can sort with rows "
+"intact for database use. wholeRows is ignored under KDE4."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:277
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonPixmap)
-#: rc.cpp:293
-msgid "Choose a pixmap file for the selected central color role."
+#: widgets/table.cpp:56
+msgid "Scrolls the table so the cell indicated is visible."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:298
-#. i18n: ectx: property (text), widget (QLabel, labelCentral)
-#: rc.cpp:296
-msgid "&Select color:"
+#: widgets/table.cpp:57
+msgid "Select cells using the upper left and lower right cell addresses"
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:328
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonCentral)
-#: rc.cpp:302
-msgid "Choose a color for the selected central color role."
+#: widgets/table.cpp:58
+msgid "Select the row with the zero based index."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:340
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupEffect)
-#: rc.cpp:305
-msgid "3D Shadow &Effects"
+#: widgets/table.cpp:59
+msgid "Select the column with the zero based index."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:360
-#. i18n: ectx: property (text), widget (QCheckBox, checkBuildEffect)
-#: rc.cpp:308
-msgid "Build &from button color:"
+#: widgets/table.cpp:60
+msgid "Set the column read only using zero based index."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:366
-#. i18n: ectx: property (toolTip), widget (QCheckBox, checkBuildEffect)
-#: rc.cpp:311
-msgid "Generate shadings"
+#: widgets/table.cpp:61
+msgid "Set the row read only using zero based index."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:369
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, checkBuildEffect)
-#: rc.cpp:314
-msgid "Check to let 3D-effect colors be calculated from the button-color."
+#: widgets/popupmenu.cpp:59
+msgid ""
+"Insert an item into the popup menu. The executeWidget's execute method will "
+"be run when this item is selected. Returns the id of the inserted item. Use -"
+"1 as the index to insert at the end. The icon is optional."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:376
-#. i18n: ectx: property (toolTip), widget (QComboBox, comboEffect)
-#: rc.cpp:317
-msgid "Choose 3D-effect color role"
+#: widgets/popupmenu.cpp:60
+msgid ""
+"Insert a separator item into the popup menu. Use -1 as the index to insert "
+"at the end."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:379
-#. i18n: ectx: property (whatsThis), widget (QComboBox, comboEffect)
-#: rc.cpp:320
+#: widgets/popupmenu.cpp:61
 msgid ""
-"<b>Select a color effect role.</b><p>Available effect roles are: <ul> "
-"<li>Light - lighter than Button color. </li> <li>Midlight - between Button "
-"and Light. </li> <li>Mid - between Button and Dark. </li> <li>Dark - darker "
-"than Button. </li> <li>Shadow - a very dark color. </li> </ul>"
+"Change an item specified by id in the popup menu. The executeWidget's "
+"execute method will be run when this item is selected."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:383
-#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
-#: rc.cpp:323
-msgid "Light"
-msgstr "Golau"
+#: widgets/popupmenu.cpp:62
+msgid "Enable the item specified by id in the popup menu."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:388
-#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
-#: rc.cpp:326
-msgid "Midlight"
+#: widgets/popupmenu.cpp:63
+msgid "Check if the item specified by id is enabled."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:393
-#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
-#: rc.cpp:329
-msgid "Mid"
-msgstr "Canol"
+#: widgets/popupmenu.cpp:64
+msgid "Make the item specified by id visible."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:398
-#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
-#: rc.cpp:332
-msgid "Dark"
-msgstr "Tywyll"
+#: widgets/popupmenu.cpp:65
+msgid "Apply checked status for the item specified by id."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:403
-#. i18n: ectx: property (text), item, widget (QComboBox, comboEffect)
-#: rc.cpp:335
-msgid "Shadow"
-msgstr "Cysgod"
+#: widgets/popupmenu.cpp:66
+msgid "Check if the item specified by id is visible."
+msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:451
-#. i18n: ectx: property (text), widget (QLabel, labelEffect)
-#: rc.cpp:338
-msgid "Select co&lor:"
+#: widgets/popupmenu.cpp:67
+msgid "Verify if the item specified by id is checked."
 msgstr ""
 
-#. i18n: file: editor/paletteeditoradvanced.ui:481
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonEffect)
-#: rc.cpp:344
-msgid "Choose a color for the selected effect color role."
+#: widgets/popupmenu.cpp:68
+msgid ""
+"Insert submenu widget into the popup menu. Use -1 as the index to insert at "
+"the end. The icon is optional."
 msgstr ""
 
-#. i18n: file: editor/functions.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, FunctionsDialogBase)
-#: rc.cpp:362
-msgid "Function Browser"
+#: widgets/textedit.cpp:49
+msgid "See if the widget has been modified."
 msgstr ""
 
-#. i18n: file: editor/functions.ui:24
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:365
-msgid "Description:"
-msgstr "Disgrifiad:"
+#: widgets/timer.cpp:66
+msgid "Set the timer timeout interval in ms."
+msgstr ""
 
-#. i18n: file: editor/functions.ui:52
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
-#: rc.cpp:368
-msgid "&Parameters"
-msgstr "&Paramedrau"
+#: widgets/treewidget.cpp:66
+msgid "Add column at end with column header"
+msgstr ""
 
-#. i18n: file: editor/functions.ui:58
-#. i18n: ectx: property (text), widget (QLabel, widgetLabel)
-#: rc.cpp:371
-msgid "Widget:"
+#: widgets/treewidget.cpp:67
+msgid "Set sorting for a column"
 msgstr ""
 
-#. i18n: file: editor/functions.ui:71
-#. i18n: ectx: property (text), widget (QLabel, argLabel1)
-#: rc.cpp:374
-msgid "Arg1"
+#: widgets/treewidget.cpp:69
+msgid "Get the column count"
 msgstr ""
 
-#. i18n: file: editor/functions.ui:84
-#. i18n: ectx: property (text), widget (QLabel, argLabel2)
-#: rc.cpp:377
-msgid "Arg2"
+#: widgets/treewidget.cpp:70
+msgid "Get the column caption for column index"
 msgstr ""
 
-#. i18n: file: editor/functions.ui:97
-#. i18n: ectx: property (text), widget (QLabel, argLabel3)
-#: rc.cpp:380
-msgid "Arg3"
+#: widgets/treewidget.cpp:71
+msgid "Set the pixel width for column index - use 0 to hide"
 msgstr ""
 
-#. i18n: file: editor/functions.ui:110
-#. i18n: ectx: property (text), widget (QLabel, argLabel4)
-#: rc.cpp:383
-msgid "Arg4"
+#: lib/functionlib.cpp:738
+msgid "Enter a password"
 msgstr ""
 
-#. i18n: file: editor/functions.ui:123
-#. i18n: ectx: property (text), widget (QLabel, argLabel5)
-#: rc.cpp:386
-msgid "Arg5"
+#: lib/expression.cpp:200 lib/expression.cpp:209
+msgid "error"
 msgstr ""
 
-#. i18n: file: editor/functions.ui:136
-#. i18n: ectx: property (text), widget (QLabel, argLabel6)
-#: rc.cpp:389
-msgid "Arg6"
+#: lib/parser.cpp:117
+#, kde-format
+msgid "Invalid character: '%1'."
 msgstr ""
 
-#. i18n: file: editor/functions.ui:182
-#. i18n: ectx: property (toolTip), widget (KPushButton, copyButton)
-#: rc.cpp:392
-msgid "Insert function"
-msgstr "Mewnosod Ffwythiant"
+#: lib/parser.cpp:193
+msgid "Constant value expected."
+msgstr ""
 
-#. i18n: file: editor/functions.ui:206
-#. i18n: ectx: property (toolTip), widget (KPushButton, clearButton)
-#: rc.cpp:395
-msgid "Clear edited text"
+#: lib/parser.cpp:224
+#, kde-format
+msgid "'%1' (%2) is not a widget."
 msgstr ""
 
-#. i18n: file: editor/functions.ui:213
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:398
-msgid "Inserted &text:"
+#: lib/parser.cpp:236 lib/parser.cpp:536
+#, kde-format
+msgid "'%1' is not a function."
 msgstr ""
 
-#. i18n: file: editor/functions.ui:226
-#. i18n: ectx: property (toolTip), widget (KLineEdit, insertedText)
-#: rc.cpp:401
-msgid "Text to be inserted"
+#: lib/parser.cpp:247
+msgid "Expected a value."
 msgstr ""
 
-#. i18n: file: editor/functions.ui:302
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:410
-msgid "&Group:"
-msgstr "&Grŵp:"
+#: lib/parser.cpp:272 lib/parser.cpp:282
+msgid "Division by zero."
+msgstr ""
 
-#. i18n: file: editor/functions.ui:333
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:413
-msgid "&Function:"
-msgstr "&Ffwythiant"
+#: lib/parser.cpp:427
+#, kde-format
+msgid "In function '%1': too few parameters."
+msgstr ""
 
-#. i18n: file: editor/actioneditor.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ActionEditorBase)
-#: rc.cpp:416
-msgid "Edit Actions"
+#: lib/parser.cpp:429
+#, kde-format
+msgid "In function '%1': too many parameters."
 msgstr ""
 
-#. i18n: file: editor/actioneditor.ui:42
-#. i18n: ectx: property (toolTip), widget (QToolButton, buttonNewAction)
-#: rc.cpp:419
-msgid "Create new Action"
+#: lib/parser.cpp:435
+#, kde-format
+msgctxt "Parser error - %2 is an error message"
+msgid "In function '%1': %2"
 msgstr ""
 
-#. i18n: file: editor/actioneditor.ui:58
-#. i18n: ectx: property (toolTip), widget (QToolButton, buttonDeleteAction)
-#: rc.cpp:422
-msgid "Delete current Action"
+#: lib/parser.cpp:475
+#, kde-format
+msgctxt "Parser error - %1 is a widget, %2 is a var, %3 is an error message."
+msgid "In widget function '%1.%2': %3"
 msgstr ""
 
-#. i18n: file: editor/actioneditor.ui:74
-#. i18n: ectx: property (toolTip), widget (QToolButton, buttonConnect)
-#: rc.cpp:425
-msgid "Connect current Action"
+#: lib/parser.cpp:533
+#, kde-format
+msgid "'%1' is not a widget."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:32
-#. i18n: ectx: property (windowTitle), widget (QDialog, ConnectionEditorBase)
-#: rc.cpp:428
-msgid "Edit Connections"
+#: lib/parser.cpp:538
+#, kde-format
+msgid "Unexpected symbol after variable '%1'."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:38
-#. i18n: ectx: property (whatsThis), widget (QDialog, ConnectionEditorBase)
-#: rc.cpp:431
+#: lib/parser.cpp:789
+#, kde-format
 msgid ""
-"<b>Edit Connections</b><p>Add and remove connections in the current "
-"form.</p><p>Select a signal and a corresponding slot then press the "
-"<b>Connect</b> button to create a connection.</p><p>Select a connection from "
-"the list then press the <b>Disconnect</b> button to delete the "
-"connection.</p>"
+"Expected '%1'<br><br>Possible cause of the error is having a variable with "
+"the same name as a widget."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:59
-#. i18n: ectx: property (whatsThis), widget (KListView, connectionView)
-#: rc.cpp:434
-msgid "Displays the connections between the sender and the receiver."
+#: lib/parser.cpp:791
+#, kde-format
+msgid "Expected '%1' got '%2'."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:63
-#. i18n: ectx: property (text), widget (KListView, connectionView)
-#: rc.cpp:437
-msgid "Sender"
-msgstr "Anfonwr"
+#: lib/parser.cpp:805 lib/parser.cpp:818
+msgid "Expected variable"
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:74
-#. i18n: ectx: property (text), widget (KListView, connectionView)
-#: rc.cpp:440
-msgid "Signal"
-msgstr "Arwydd"
+#: lib/kommanderwidget.cpp:140
+#, kde-format
+msgid "Line %1: %2.\n"
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:85
-#. i18n: ectx: property (text), widget (KListView, connectionView)
-#: rc.cpp:443
-msgid "Receiver"
-msgstr "Derbynnydd"
+#: lib/kommanderwidget.cpp:251
+#, kde-format
+msgid "Unknown special: '%1'."
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:96
-#. i18n: ectx: property (text), widget (KListView, connectionView)
-#: rc.cpp:446
-msgid "Slot"
-msgstr "Agen"
+#: lib/kommanderwidget.cpp:285
+#, kde-format
+msgid "Unmatched parenthesis in D-Bus call '%1'."
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:110
-#. i18n: ectx: property (whatsThis), widget (KListBox, slotBox)
-#: rc.cpp:449
-msgid ""
-"<b>A list of slots for the receiver.</b><p>The slots that are displayed are "
-"only those which have arguments that correspond with the arguments of the "
-"signal that is currently selected in the Signal-list.</b>"
+#: lib/kommanderwidget.cpp:293
+#, kde-format
+msgid "Incorrect arguments in D-Bus call '%1'."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:117
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:452
-msgid "Connec&tions:"
-msgstr "Cysyll&tiadau :"
+#: lib/kommanderwidget.cpp:386
+#, kde-format
+msgid "<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>"
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:130
-#. i18n: ectx: property (text), widget (KPushButton, connectButton)
-#: rc.cpp:455
-msgid "Co&nnect"
-msgstr "Cy&sylltu"
+#: lib/kommanderwidget.cpp:386
+msgid "Error"
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:136
-#. i18n: ectx: property (toolTip), widget (KPushButton, connectButton)
-#: rc.cpp:458
-msgid "Create connection"
+#: lib/kommanderwidget.cpp:386
+msgid "Continue"
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:139
-#. i18n: ectx: property (whatsThis), widget (KPushButton, connectButton)
-#: rc.cpp:461
-msgid "Create a connection between a signal and a slot."
+#: lib/kommanderwidget.cpp:386
+msgid "Continue && Ignore Next Errors"
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:146
-#. i18n: ectx: property (text), widget (KPushButton, disconnectButton)
-#: rc.cpp:464
-msgid "&Disconnect"
-msgstr "&Datgysylltu"
+#: lib/kommanderwidget.cpp:386
+msgid "Stop"
+msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:152
-#. i18n: ectx: property (toolTip), widget (KPushButton, disconnectButton)
-#: rc.cpp:467
-msgid "Remove the selected connection"
+#: lib/kommanderwidget.cpp:405
+#, kde-format
+msgid ""
+"Error in widget %1:\n"
+"  %2\n"
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:155
-#. i18n: ectx: property (whatsThis), widget (KPushButton, disconnectButton)
-#: rc.cpp:470
-msgid "Remove the selected connection."
+#: lib/kommanderwidget.cpp:553
+#, kde-format
+msgid "Unmatched parenthesis after '%1'."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:194
-#. i18n: ectx: property (whatsThis), widget (KListBox, signalBox)
-#: rc.cpp:473
-msgid "Displays the list of signals that the widget emits."
+#: lib/kommanderwidget.cpp:562
+#, kde-format
+msgid "Unmatched quotes in argument of '%1'."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:203
-#. i18n: ectx: property (text), widget (QLabel, labelSignal)
-#: rc.cpp:476
-msgid "Si&gnals:"
+#: lib/kommanderwidget.cpp:564
+#, kde-format
+msgid "Unknown function group: '%1'."
 msgstr ""
 
-#. i18n: file: editor/connectioneditor.ui:238
-#. i18n: ectx: property (text), widget (QLabel, labelSlot)
-#: rc.cpp:479
-msgid "&Slots:"
+#: lib/kommanderwidget.cpp:566
+#, kde-format
+msgid "Unknown function: '%1' in group '%2'."
 msgstr ""
 
-#. i18n: file: editor/formsettings.ui:35
-#. i18n: ectx: property (whatsThis), widget (QDialog, FormSettingsBase)
-#: rc.cpp:494
-msgid ""
-"<b>Form Settings</b><p>Change settings for the form. Settings like "
-"<b>Comment</b> and <b>Author</b> are for your own use and are not "
-"required.</p>"
+#: lib/kommanderwidget.cpp:568
+#, kde-format
+msgid "Unknown widget function: '%1'."
 msgstr ""
 
-#. i18n: file: editor/formsettings.ui:102
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox2)
-#: rc.cpp:509
-msgid "La&youts"
+#: lib/kommanderwidget.cpp:570
+#, kde-format
+msgid ""
+"Not enough arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
 msgstr ""
 
-#. i18n: file: editor/formsettings.ui:128
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
-#: rc.cpp:512
-msgid "Default mar&gin:"
+#: lib/kommanderwidget.cpp:575
+#, kde-format
+msgid ""
+"Too many arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
 msgstr ""
 
-#. i18n: file: editor/formsettings.ui:141
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#: rc.cpp:515
-msgid "D&efault spacing:"
+#: lib/kommanderfunctions.cpp:122
+msgid "Unterminated @execBegin ... @execEnd block."
 msgstr ""
 
-#. i18n: file: editor/formsettings.ui:175
-#. i18n: ectx: property (whatsThis), widget (Q3MultiLineEdit, editComment)
-#: rc.cpp:521
-msgid "Enter a comment about the form."
+#: lib/kommanderfunctions.cpp:140 lib/kommanderfunctions.cpp:166
+msgid "Unterminated @forEach ... @end block."
 msgstr ""
 
-#. i18n: file: editor/formsettings.ui:198
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:524
-msgid "Co&mment:"
-msgstr "S&ylwad:"
+#: lib/kommanderfunctions.cpp:203
+msgid "Unterminated @if ... @endif block."
+msgstr ""
 
-#. i18n: file: editor/formsettings.ui:211
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_2)
-#: rc.cpp:527
-msgid "&License:"
-msgstr "&Trwydded:"
+#: lib/kommanderfunctions.cpp:223
+msgid "Unterminated @switch ... @end block."
+msgstr ""
 
-#. i18n: file: editor/formsettings.ui:224
-#. i18n: ectx: property (toolTip), widget (KLineEdit, editLicense)
-#. i18n: file: editor/formsettings.ui:260
-#. i18n: ectx: property (toolTip), widget (KLineEdit, editAuthor)
-#. i18n: file: editor/formsettings.ui:270
-#. i18n: ectx: property (toolTip), widget (KLineEdit, editVersion)
-#: rc.cpp:530 rc.cpp:542 rc.cpp:548
-msgid "Enter your name"
-msgstr "Rhowch eich Enw"
+#: lib/kommanderfunctions.cpp:323
+#, kde-format
+msgid "Unknown widget: @%1."
+msgstr ""
 
-#. i18n: file: editor/formsettings.ui:227
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, editLicense)
-#. i18n: file: editor/formsettings.ui:263
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, editAuthor)
-#. i18n: file: editor/formsettings.ui:273
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, editVersion)
-#: rc.cpp:533 rc.cpp:545 rc.cpp:551
-msgid "Enter your name."
-msgstr "Rhowch eich Enw."
+#: lib/kommanderfunctions.cpp:345
+#, kde-format
+msgid "Infinite loop: @%1 called inside @%2."
+msgstr ""
 
-#. i18n: file: editor/formsettings.ui:234
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_3)
-#: rc.cpp:536
-msgid "&Version:"
-msgstr "Fe&rsiwn:"
+#: lib/kommanderfunctions.cpp:350
+#, kde-format
+msgid "Script for @%1 is empty."
+msgstr ""
 
-#. i18n: file: editor/formsettings.ui:247
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
-#: rc.cpp:539
-msgid "A&uthor:"
-msgstr "A&wdur:"
+#: lib/specialinformation.cpp:285
+msgid "Inserts the item if it will not create a duplicate."
+msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:47
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:557
-msgid "Template &name:"
+#: lib/specialinformation.cpp:287
+msgid ""
+"Returns scripts associated with widget. This is an advanced feature that "
+"would not be commonly used."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:60
-#. i18n: ectx: property (toolTip), widget (QLineEdit, editName)
-#: rc.cpp:560
-msgid "Name of the new template"
+#: lib/specialinformation.cpp:288
+msgid "Stops execution of the script associated with the widget."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:63
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, editName)
-#: rc.cpp:563
-msgid "Enter the name of the new template"
+#: lib/specialinformation.cpp:290
+msgid "Returns text of a cell in a table."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:70
-#. i18n: ectx: property (toolTip), widget (Q3ListBox, listClass)
-#: rc.cpp:566
-msgid "Class of the new template"
+#: lib/specialinformation.cpp:292
+msgid "Returns 1 for checked boxes, 0 for unchecked."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:73
-#. i18n: ectx: property (whatsThis), widget (Q3ListBox, listClass)
-#: rc.cpp:569
+#: lib/specialinformation.cpp:294
 msgid ""
-"Enter the name of the class which should be used as the template's base class"
+"Returns the list of child widgets contained in the parent widget. Set the "
+"<i>recursive</i> parameter to <i>true</i> to include widgets contained by "
+"child widgets."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:104
-#. i18n: ectx: property (text), widget (QPushButton, buttonCreate)
-#: rc.cpp:572
-msgid "C&reate"
-msgstr "C&reu"
+#: lib/specialinformation.cpp:296
+msgid "Removes all content from the widget."
+msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:110
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonCreate)
-#: rc.cpp:575
-msgid "Creates the new template"
+#: lib/specialinformation.cpp:299
+msgid "Returns number of items in a widget such as combobox or listbox."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:120
-#. i18n: ectx: property (whatsThis), widget (QPushButton, PushButton1)
-#: rc.cpp:581
-msgid "Closes the Dialog"
+#: lib/specialinformation.cpp:301
+msgid "Returns index of current column."
 msgstr ""
 
-#. i18n: file: editor/createtemplate.ui:129
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:584
-msgid "&Baseclass for template:"
+#: lib/specialinformation.cpp:303
+msgid "Returns index of current item."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:32
-#. i18n: ectx: property (windowTitle), widget (QDialog, ListBoxEditorBase)
-#: rc.cpp:587
-msgid "Edit Listbox"
+#: lib/specialinformation.cpp:305
+msgid "Returns index of current row."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:38
-#. i18n: ectx: property (whatsThis), widget (QDialog, ListBoxEditorBase)
-#: rc.cpp:590
+#: lib/specialinformation.cpp:307
 msgid ""
-"<b>Edit Listbox</b><p>Add, edit or delete items in the listbox.</p><p>Click "
-"the <b>New Item</b> button to create a new listbox entry, then enter text "
-"and choose a pixmap.</p><p>Select an item from the list and click the "
-"<b>Delete Item</b> button to remove the item from the list.</p>"
+"Executes the script associated with the widget. With the new parser the "
+"execute method can take one or more arguments."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:131
-#. i18n: ectx: property (whatsThis), widget (Q3ListBox, preview)
-#. i18n: file: editor/listvieweditor.ui:236
-#. i18n: ectx: property (whatsThis), widget (Q3ListView, itemsPreview)
-#: rc.cpp:617 rc.cpp:1232
-msgid "The list of items."
+#: lib/specialinformation.cpp:309
+msgid "Returns the index of an item with the given text."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:138
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
-#. i18n: file: editor/iconvieweditor.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:620 rc.cpp:1090
-msgid "&Item Properties"
+#: lib/specialinformation.cpp:311
+msgid ""
+"Inserts new column (or <i>count</i> columns) at <i>column</i> position."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:150
-#. i18n: ectx: property (text), widget (QLabel, Label2)
-#. i18n: file: editor/iconvieweditor.ui:192
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: editor/listvieweditor.ui:361
-#. i18n: ectx: property (text), widget (QLabel, Label2)
-#: rc.cpp:623 rc.cpp:1102 rc.cpp:1274
-msgid "&Pixmap:"
-msgstr "&Picsfap :"
+#: lib/specialinformation.cpp:313
+msgid "Inserts item at <i>index</i> position."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:163
-#. i18n: ectx: property (text), widget (QLabel, itemPixmap)
-#. i18n: file: editor/tableeditor.ui:249
-#. i18n: ectx: property (text), widget (QLabel, labelColumnPixmap)
-#. i18n: file: editor/tableeditor.ui:499
-#. i18n: ectx: property (text), widget (QLabel, labelRowPixmap)
-#. i18n: file: editor/iconvieweditor.ui:217
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: editor/listvieweditor.ui:167
-#. i18n: ectx: property (text), widget (QLabel, itemPixmap)
-#. i18n: file: editor/listvieweditor.ui:374
-#. i18n: ectx: property (text), widget (QLabel, colPixmap)
-#: rc.cpp:626 rc.cpp:847 rc.cpp:904 rc.cpp:1105 rc.cpp:1205 rc.cpp:1277
-msgid "Label4"
+#: lib/specialinformation.cpp:316
+msgid "Inserts multiple items (EOL-separated) at <i>index</i> position."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:185
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemDeletePixmap)
-#. i18n: file: editor/tableeditor.ui:271
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonDeleteColPixmap)
-#. i18n: file: editor/tableeditor.ui:521
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonDeleteRowPixmap)
-#. i18n: file: editor/iconvieweditor.ui:237
-#. i18n: ectx: property (toolTip), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:189
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemDeletePixmap)
-#. i18n: file: editor/listvieweditor.ui:396
-#. i18n: ectx: property (toolTip), widget (QPushButton, colDeletePixmap)
-#: rc.cpp:629 rc.cpp:850 rc.cpp:907 rc.cpp:1109 rc.cpp:1208 rc.cpp:1280
-msgid "Delete Pixmap"
+#: lib/specialinformation.cpp:319
+msgid "Inserts new row (or <i>count</i> rows) at <i>row</i> position."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:188
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDeletePixmap)
-#. i18n: file: editor/iconvieweditor.ui:240
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#: rc.cpp:632 rc.cpp:1112
-msgid "Delete the selected item's pixmap."
+#: lib/specialinformation.cpp:321
+msgid "Returns the text of the item at the given index."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:204
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemChoosePixmap)
-#. i18n: file: editor/tableeditor.ui:290
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonChooseColPixmap)
-#. i18n: file: editor/tableeditor.ui:540
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonChooseRowPixmap)
-#. i18n: file: editor/iconvieweditor.ui:257
-#. i18n: ectx: property (toolTip), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:208
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemChoosePixmap)
-#. i18n: file: editor/listvieweditor.ui:415
-#. i18n: ectx: property (toolTip), widget (QPushButton, colChoosePixmap)
-#: rc.cpp:638 rc.cpp:859 rc.cpp:916 rc.cpp:1118 rc.cpp:1217 rc.cpp:1289
-msgid "Select a Pixmap"
+#: lib/specialinformation.cpp:323
+msgid ""
+"Returns the depth of the current item in the tree. Root items have depth 0."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:207
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemChoosePixmap)
-#: rc.cpp:641
-msgid "Choose a pixmap file for the selected item."
+#: lib/specialinformation.cpp:325
+msgid "Returns the slash-separated path to the given item in the tree."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:214
-#. i18n: ectx: property (text), widget (QLabel, Label1)
-#. i18n: file: editor/multilineeditor.ui:50
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#. i18n: file: editor/iconvieweditor.ui:164
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: editor/listvieweditor.ui:107
-#. i18n: ectx: property (text), widget (QLabel, Label1)
-#. i18n: file: editor/listvieweditor.ui:425
-#. i18n: ectx: property (text), widget (QLabel, Label1)
-#: rc.cpp:644 rc.cpp:713 rc.cpp:1093 rc.cpp:1187 rc.cpp:1295
-msgid "&Text:"
-msgstr "&Testun:"
+#: lib/specialinformation.cpp:327
+msgid ""
+"Removes the column (or <i>count</i> consecutive columns) with the given "
+"index."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:233
-#. i18n: ectx: property (toolTip), widget (QLineEdit, itemText)
-#. i18n: file: editor/iconvieweditor.ui:181
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#. i18n: file: editor/listvieweditor.ui:126
-#. i18n: ectx: property (toolTip), widget (QLineEdit, itemText)
-#: rc.cpp:647 rc.cpp:1096 rc.cpp:1190
-msgid "Change text"
-msgstr "Newid y Testun"
+#: lib/specialinformation.cpp:329
+msgid "Removes the item with the given index."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:236
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, itemText)
-#: rc.cpp:650
-msgid "Change the selected item's text."
+#: lib/specialinformation.cpp:332
+msgid ""
+"Removes the row (or <i>count</i> consecutive rows) with the given index."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:246
-#. i18n: ectx: property (text), widget (QPushButton, itemNew)
-#. i18n: file: editor/iconvieweditor.ui:94
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:223
-#. i18n: ectx: property (text), widget (QPushButton, itemNew)
-#: rc.cpp:653 rc.cpp:1072 rc.cpp:1223
-msgid "&New Item"
-msgstr "&Eitem Newydd"
+#: lib/specialinformation.cpp:335
+msgid ""
+"Returns selected text or text of current item.\n"
+"In case of Table widgets, returns the selection coordinates, separated by "
+"commas in TopRow,LeftColumn,BottomRow,RightColumn form. "
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:249
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemNew)
-#. i18n: file: editor/iconvieweditor.ui:97
-#. i18n: ectx: property (toolTip), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:226
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemNew)
-#: rc.cpp:656 rc.cpp:1075 rc.cpp:1226
-msgid "Add an item"
-msgstr "Ychwanegu eitem"
+#: lib/specialinformation.cpp:337
+msgid ""
+"Sets scripts associated with widget. This is an advanced feature that would "
+"not be commonly used."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:252
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemNew)
-#: rc.cpp:659
-msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
+#: lib/specialinformation.cpp:339
+msgid "Enables or disables widget."
+msgstr ""
+
+#: lib/specialinformation.cpp:342
+msgid "Sets text of a cell in a table."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:259
-#. i18n: ectx: property (text), widget (QPushButton, itemDelete)
-#. i18n: file: editor/iconvieweditor.ui:108
-#. i18n: ectx: property (text), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:63
-#. i18n: ectx: property (text), widget (QPushButton, itemDelete)
-#: rc.cpp:662 rc.cpp:1081 rc.cpp:1172
-msgid "&Delete Item"
-msgstr "&Dileu Eitem"
+#: lib/specialinformation.cpp:344
+msgid "Inserts a widget into a cell of a table."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:265
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDelete)
-#: rc.cpp:668
-msgid "Delete the selected item"
+#: lib/specialinformation.cpp:346
+msgid ""
+"Returns the name of a widget inserted into a cell, or an empty string if the "
+"cell contains no widget or an unknown widget type."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:294
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemUp)
-#. i18n: file: editor/tableeditor.ui:183
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonColumnUp)
-#. i18n: file: editor/tableeditor.ui:398
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRowUp)
-#. i18n: file: editor/listvieweditor.ui:278
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemUp)
-#. i18n: file: editor/listvieweditor.ui:525
-#. i18n: ectx: property (toolTip), widget (QPushButton, colUp)
-#: rc.cpp:671 rc.cpp:826 rc.cpp:880 rc.cpp:1244 rc.cpp:1340
-msgid "Move up"
-msgstr "Symud i fyny"
+#: lib/specialinformation.cpp:348
+msgid "Sets/unsets checkbox."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:297
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemUp)
-#: rc.cpp:674
-msgid "Moves the selected item up."
+#: lib/specialinformation.cpp:350
+msgid "Sets caption of the column <i>column</i>."
 msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:310
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemDown)
-#. i18n: file: editor/tableeditor.ui:199
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonColumnDown)
-#. i18n: file: editor/tableeditor.ui:417
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRowDown)
-#. i18n: file: editor/listvieweditor.ui:294
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemDown)
-#. i18n: file: editor/listvieweditor.ui:496
-#. i18n: ectx: property (toolTip), widget (QPushButton, colDown)
-#: rc.cpp:677 rc.cpp:832 rc.cpp:886 rc.cpp:1250 rc.cpp:1325
-msgid "Move down"
-msgstr "Symud i lawr"
+#: lib/specialinformation.cpp:352
+msgid "Selects the item at the specified index. Indexes are zero based."
+msgstr ""
 
-#. i18n: file: editor/listboxeditor.ui:313
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDown)
-#: rc.cpp:680
-msgid "Move the selected item down."
+#: lib/specialinformation.cpp:355
+msgid ""
+"Inserts a tab to the tabwidget with the specified label at the given index. "
+"Indexes are zero based."
 msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, AssocTextEditorBase)
-#: rc.cpp:683
-msgid "Edit Text"
+#: lib/specialinformation.cpp:357
+msgid "Sets maximum numeric value"
 msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:21
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:686
-msgid "&Widget:"
+#: lib/specialinformation.cpp:359
+msgid ""
+"Sets pixmap at the given index to the specified icon. Use <i>index = -1</i> "
+"to set the pixmap for all items."
 msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:53
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:692
-msgid "&Text for:"
+#: lib/specialinformation.cpp:361
+msgid "Sets caption of the row <i>row</i>."
 msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:87
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
-#: rc.cpp:695
-msgid "Insert"
+#: lib/specialinformation.cpp:363
+msgid "Selects given text or select item containing given text."
 msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:93
-#. i18n: ectx: property (text), widget (KPushButton, functionButton)
-#: rc.cpp:698
-msgid "&Function..."
-msgstr "&Ffwythiant..."
+#: lib/specialinformation.cpp:366
+msgid "Sets widget's content."
+msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:124
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:701
-msgid "Wi&dget:"
+#: lib/specialinformation.cpp:369
+msgid "Shows/hides widget."
 msgstr ""
 
-#. i18n: file: editor/assoctexteditor.ui:171
-#. i18n: ectx: property (text), widget (QPushButton, filePushButton)
-#: rc.cpp:704
-msgid "Fi&le..."
-msgstr "Ff&eil..."
+#: lib/specialinformation.cpp:370
+msgid "Returns content of widget."
+msgstr ""
 
-#. i18n: file: editor/multilineeditor.ui:32
-#. i18n: ectx: property (windowTitle), widget (QDialog, MultiLineEditorBase)
-#: rc.cpp:707
-msgid "Edit Multiline Edit"
+#: lib/specialinformation.cpp:372
+msgid "Returns type(class) of widget."
 msgstr ""
 
-#. i18n: file: editor/multilineeditor.ui:38
-#. i18n: ectx: property (whatsThis), widget (QDialog, MultiLineEditorBase)
-#: rc.cpp:710
+#: lib/specialinformation.cpp:374
 msgid ""
-"<b>Edit Multiline Edit</b><p>Enter the text and click the <b>OK</b> button "
-"to apply the changes.</p>"
+"Makes the widget editable or read only, depending on the editable argument."
 msgstr ""
 
-#. i18n: file: editor/multilineeditor.ui:66
-#. i18n: ectx: property (whatsThis), widget (Q3MultiLineEdit, preview)
-#: rc.cpp:716
-msgid "Enter your text here."
+#: lib/specialinformation.cpp:376
+msgid ""
+"Return the widget's geometry as <i>x y w h</i>. This is useful for "
+"positioning a created widget."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, PreviewWidgetBase)
-#: rc.cpp:740
-msgid "Preview Window"
+#: lib/specialinformation.cpp:378
+msgid "Returns true if the widget has focus."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:47
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup1)
-#: rc.cpp:743
-msgid "ButtonGroup"
+#: lib/specialinformation.cpp:380
+msgid "Slots"
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:59
-#. i18n: ectx: property (text), widget (QRadioButton, RadioButton1)
-#: rc.cpp:746
-msgid "RadioButton1"
+#: lib/specialinformation.cpp:384
+msgid ""
+"Returns current widget's content. This was required inside widget A to "
+"return widget A content when requested by widget B. The new method is to use "
+"@A.text inside B instead of just @A if you just want the unaltered text."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:69
-#. i18n: ectx: property (text), widget (QRadioButton, RadioButton2)
-#: rc.cpp:749
-msgid "RadioButton2"
+#: lib/specialinformation.cpp:386
+msgid ""
+"Returns selected text or text of current item. This is deprecated for "
+"<i>@mywidget.selected</i>."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:76
-#. i18n: ectx: property (text), widget (QRadioButton, RadioButton3)
-#: rc.cpp:752
-msgid "RadioButton3"
+#: lib/specialinformation.cpp:388
+msgid ""
+"Does nothing. This is useful if you request a CheckBox or RadioButton to "
+"return a value where a state, typically the unchecked state, has no value. "
+"The @null prevents an error indicating it is empty."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:86
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, ButtonGroup2)
-#: rc.cpp:755
-msgid "ButtonGroup2"
+#: lib/specialinformation.cpp:390
+msgid "Returns the pid (process ID) of the current process."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:98
-#. i18n: ectx: property (text), widget (QCheckBox, CheckBox1)
-#: rc.cpp:758
-msgid "CheckBox1"
+#: lib/specialinformation.cpp:392
+msgid ""
+"Returns D-Bus identifier of current process. This is shorthand for <i>kmdr-"
+"executor-@pid</i>."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:108
-#. i18n: ectx: property (text), widget (QCheckBox, CheckBox2)
-#: rc.cpp:761
-msgid "CheckBox2"
+#: lib/specialinformation.cpp:395
+msgid "Returns the pid of the parent Kommander window."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:135
-#. i18n: ectx: property (text), widget (QLineEdit, LineEdit1)
-#: rc.cpp:764
-msgid "LineEdit"
+#: lib/specialinformation.cpp:397
+msgid "Writes <i>text</i> on stderr."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:143
-#. i18n: ectx: property (text), item, widget (QComboBox, ComboBox1)
-#: rc.cpp:767
-msgid "ComboBox"
-msgstr "Blwch Cyfuno"
-
-#. i18n: file: editor/previewwidget.ui:162
-#. i18n: ectx: property (text), widget (QPushButton, PushButton1)
-#: rc.cpp:770
-msgid "PushButton"
+#: lib/specialinformation.cpp:399
+msgid "Writes <i>text</i> on standard output."
 msgstr ""
 
-#. i18n: file: editor/previewwidget.ui:196
-#. i18n: ectx: property (text), widget (Q3TextView, textView)
-#: rc.cpp:773
+#: lib/specialinformation.cpp:401
 msgid ""
-"<p>\n"
-"<a href=\"http://www.trolltech.com\"> http://www.trolltech.com </a>\n"
-"</p>\n"
-"<p>\n"
-"<a href=\"http://www.kde.org\"> http://www.kde.org </a>\n"
-"</p>"
+"Executes a script block. Bash is used if no shell is given. It is primarily "
+"for use in non-button widgets where script actions are not expected. Full "
+"path is not required for the shell which may be useful for portability. "
+"<p><i>If this is used inside a button it allows alternate script languages "
+"to be used and will return a value to the main script, which may be "
+"unexpected.</i>"
 msgstr ""
 
-#. i18n: file: editor/choosewidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, ChooseWidgetBase)
-#: rc.cpp:781
-msgid "Choose Widget"
+#: lib/specialinformation.cpp:403
+msgid ""
+"Returns value of an environment (shell) variable. Do not use <i>$</i> in the "
+"name. For example, <i>@env(PATH)</i>."
 msgstr ""
 
-#. i18n: file: editor/choosewidget.ui:92
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:790
-msgid "Find:"
-msgstr "Canfod:"
-
-#. i18n: file: editor/tableeditor.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, TableEditorBase)
-#: rc.cpp:793
-msgid "Edit Table"
+#: lib/specialinformation.cpp:405 lib/specialinformation.cpp:407
+msgid "Executes an external shell command."
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:38
-#. i18n: ectx: property (text), widget (Q3Table, table)
-#. i18n: file: editor/tableeditor.ui:43
-#. i18n: ectx: property (text), widget (Q3Table, table)
-#: rc.cpp:796 rc.cpp:799
-msgid "1"
-msgstr "1"
+#: lib/specialinformation.cpp:409
+msgid "Parses an expression and returns computed value."
+msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:130
-#. i18n: ectx: attribute (title), widget (QWidget, columns_tab)
-#. i18n: file: editor/listvieweditor.ui:337
-#. i18n: ectx: attribute (title), widget (QWidget, Widget11)
-#: rc.cpp:823 rc.cpp:1268
-msgid "Co&lumns"
-msgstr "Co&lofnau"
+#: lib/specialinformation.cpp:411
+msgid ""
+"Executes loop: values from <i>items</i> list (passed as EOL-separated "
+"string) are assigned to the variable. <br><b>Old</b><br> <i>@forEach(i,A\\"
+"nB\\nC\\n)<br>  @# @i=A<br>@end</i><br><b>New</b><br><i>foreach i in MyArray "
+"do<br>  //i = key, MyArray[i] = val<br>end "
+msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:186
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonColumnUp)
-#. i18n: file: editor/tableeditor.ui:401
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRowUp)
-#: rc.cpp:829 rc.cpp:883
+#: lib/specialinformation.cpp:413
 msgid ""
-"<b>Move the selected item up.</b><p>The top-most column will be the first "
-"column of the list.</p>"
+"Executes loop: variable is set to <i>start</i> and is increased by "
+"<i>step</i> each time loop is executed. Execution stops when variable "
+"becomes larger than <i>end</i>. <br><b>Old</b><br><i>@for(i,1,10,1)<br>  @# "
+"@i=1<br>@endif</i><br><b>New</b><br><i>for i=0 to 20 step 5 do<br>  "
+"debug(i)<br>end</i>."
+msgstr ""
+
+#: lib/specialinformation.cpp:415
+msgid "Returns the value of a global variable."
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:202
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonColumnDown)
-#. i18n: file: editor/tableeditor.ui:420
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRowDown)
-#: rc.cpp:835 rc.cpp:889
+#: lib/specialinformation.cpp:417
 msgid ""
-"<b>Move the selected item down.</b><p>The top-most column will be the first "
-"column of the list.</p>"
+"Translates the string into the current language. Texts in GUI would be "
+"automatically extracted for translation."
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:209
-#. i18n: ectx: property (text), widget (QPushButton, buttonDeleteColumn)
-#. i18n: file: editor/listvieweditor.ui:477
-#. i18n: ectx: property (text), widget (QPushButton, colDelete)
-#: rc.cpp:838 rc.cpp:1316
-msgid "&Delete Column"
-msgstr "&Dileu Colofn"
-
-#. i18n: file: editor/tableeditor.ui:216
-#. i18n: ectx: property (text), widget (QPushButton, buttonNewColumn)
-#. i18n: file: editor/listvieweditor.ui:506
-#. i18n: ectx: property (text), widget (QPushButton, colNew)
-#: rc.cpp:841 rc.cpp:1331
-msgid "&New Column"
-msgstr "&Colofn Newydd"
-
-#. i18n: file: editor/tableeditor.ui:231
-#. i18n: ectx: property (text), widget (QLabel, labelTable)
-#: rc.cpp:844
-msgid "Table:"
-msgstr "Tabl:"
-
-#. i18n: file: editor/tableeditor.ui:274
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonDeleteColPixmap)
-#. i18n: file: editor/tableeditor.ui:524
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonDeleteRowPixmap)
-#. i18n: file: editor/listvieweditor.ui:192
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDeletePixmap)
-#: rc.cpp:853 rc.cpp:910 rc.cpp:1211
+#: lib/specialinformation.cpp:419
 msgid ""
-"<b>Delete the selected item's pixmap.</b><p>The pixmap in the current column "
-"of the selected item will be deleted.</p>"
+"Executes block if expression is true (non-zero number or non-empty string.) "
+"<p><b>Old</b>Close with <b>@endif</b></p><p><b>New</b><br>if val == true "
+"then<br>//  do op<br>elseif cond<br>//  second chance<br>else<br>//  cond "
+"failed<br>endif</p>"
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:293
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonChooseColPixmap)
-#. i18n: file: editor/tableeditor.ui:543
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonChooseRowPixmap)
-#. i18n: file: editor/listvieweditor.ui:211
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemChoosePixmap)
-#: rc.cpp:862 rc.cpp:919 rc.cpp:1220
+#: lib/specialinformation.cpp:421
 msgid ""
-"<b>Select a pixmap file for the item.</b><p>The pixmap will be changed in "
-"the current column of the selected item.</p>"
+"Executes another Kommander dialog. Current dialog directory is used if no "
+"path is given. Arguments may be given as named arguments which will become "
+"global variables in the new dialog. For instance: <i>var=val</i>"
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:302
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#. i18n: file: editor/tableeditor.ui:465
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_3)
-#: rc.cpp:865 rc.cpp:898
-msgid "&Label:"
-msgstr "&Label:"
+#: lib/specialinformation.cpp:423
+msgid "Reads setting from configuration file for this dialog."
+msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:315
-#. i18n: ectx: property (text), widget (QLabel, Label2)
-#. i18n: file: editor/tableeditor.ui:478
-#. i18n: ectx: property (text), widget (QLabel, Label2_2)
-#: rc.cpp:868 rc.cpp:901
-msgid "Pixmap:"
-msgstr "Picsfap :"
+#: lib/specialinformation.cpp:425
+msgid ""
+"Sets the value of a global variable. Global variables exist for the life of "
+"the Kommander window."
+msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:328
-#. i18n: ectx: property (text), widget (QLabel, labelFields)
-#: rc.cpp:871
-msgid "&Field:"
-msgstr "&Maes :"
+#: lib/specialinformation.cpp:427
+msgid "Stores setting in configuration file for this dialog."
+msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:351
-#. i18n: ectx: property (text), widget (QLabel, labelTableValue)
-#: rc.cpp:874
-msgid "<no table>"
+#: lib/specialinformation.cpp:429
+msgid ""
+"Begin of <b>switch</b> block. Following <b>case</b> values are compared to "
+"<i>expression</i>.<p>@switch()<br>@case()<br>@end"
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:364
-#. i18n: ectx: attribute (title), widget (QWidget, rows_tab)
-#: rc.cpp:877
-msgid "&Rows"
-msgstr "&Rhesi"
+#: lib/specialinformation.cpp:431
+msgid "Executes an external D-Bus call."
+msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:443
-#. i18n: ectx: property (text), widget (QPushButton, buttonNewRow)
-#: rc.cpp:892
-msgid "&New Row"
+#: lib/specialinformation.cpp:433
+msgid "Adds a comment to EOL that Kommander will not parse"
 msgstr ""
 
-#. i18n: file: editor/tableeditor.ui:450
-#. i18n: ectx: property (text), widget (QPushButton, buttonDeleteRow)
-#: rc.cpp:895
-msgid "&Delete Row"
-msgstr "&Dileu Rhes"
+#: lib/specialinformation.cpp:435
+msgid ""
+"Creates a new widget with the specified type and as the child of parent."
+msgstr ""
 
-#. i18n: file: editor/pixmapfunction.ui:47
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:925
-msgid "&Enter arguments for loading the pixmap:"
+#: lib/specialinformation.cpp:437
+msgid ""
+"Returns true if there is a widget with the passed name, false otherwise."
 msgstr ""
 
-#. i18n: file: editor/pixmapfunction.ui:78
-#. i18n: ectx: property (text), widget (QLabel, labelFunction)
-#: rc.cpp:928
-msgid "QPixmap("
+#: lib/specialinformation.cpp:439
+msgid "Connects the signal of sender with the slot of the receiver"
 msgstr ""
 
-#. i18n: file: editor/pixmapfunction.ui:535
-#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:931
-msgid ")"
-msgstr ")"
+#: lib/specialinformation.cpp:441
+msgid "Disconnects the signal of sender from the slot of the receiver"
+msgstr ""
 
-#. i18n: file: editor/templates/Tab_Dialog.ui:37
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: editor/templates/Tab_Dialog.ui:45
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: editor/templates/Configuration_Dialog.ui:55
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: editor/templates/Configuration_Dialog.ui:63
-#. i18n: ectx: attribute (title), widget (QWidget)
-#: rc.cpp:943 rc.cpp:946 rc.cpp:964 rc.cpp:967
-msgid "Tab"
-msgstr "Tab"
+#: lib/specialinformation.cpp:444
+msgid "Exits script execution and returns"
+msgstr ""
 
-#. i18n: file: editor/templates/Tab_Dialog.ui:71
-#. i18n: ectx: property (accel), widget (QPushButton)
-#. i18n: file: editor/templates/Configuration_Dialog.ui:89
-#. i18n: ectx: property (accel), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Right).ui:73
-#. i18n: ectx: property (accel), widget (QPushButton)
-#. i18n: file: editor/templates/Dialog_with_Buttons_(Bottom).ui:48
-#. i18n: ectx: property (accel), widget (QPushButton)
-#: rc.cpp:952 rc.cpp:973 rc.cpp:991 rc.cpp:997
-msgid "F1"
-msgstr "F1"
+#: lib/specialinformation.cpp:446
+msgid "Exits the current block of a while, for or foreach loop"
+msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:40
-#. i18n: ectx: property (windowTitle), widget (QDialog, PaletteEditorBase)
-#: rc.cpp:1006
-msgid "Edit Palette"
+#: lib/specialinformation.cpp:448
+msgid "Exit a step and return to the beginning of a loop"
 msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:60
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupAutoPalette)
-#: rc.cpp:1009
-msgid "Build Palette"
+#: lib/specialinformation.cpp:450
+msgid ""
+"Return from a script, optionaly with a value from the script to the caller"
 msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:95
-#. i18n: ectx: property (text), widget (QLabel, labelMainColor)
-#: rc.cpp:1012
-msgid "&3D effects:"
+#: lib/specialinformation.cpp:454
+msgid "Returns an EOL-separated list of all values in the array."
 msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:128
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonMainColor)
-#: rc.cpp:1018
-msgid "Choose the effect-color for the generated palette."
+#: lib/specialinformation.cpp:456
+msgid "Returns an EOL-separated list of all keys in the array."
 msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:158
-#. i18n: ectx: property (text), widget (QLabel, labelMainColor2)
-#: rc.cpp:1021
-msgid "Back&ground:"
-msgstr "Cefn&dir:"
+#: lib/specialinformation.cpp:458
+msgid "Removes all elements from the array."
+msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:191
-#. i18n: ectx: property (whatsThis), widget (StyledButton, buttonMainColor2)
-#: rc.cpp:1027
-msgid "Choose the background color for the generated palette."
+#: lib/specialinformation.cpp:460
+msgid "Returns the number of elements in the array."
 msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:214
-#. i18n: ectx: property (text), widget (QPushButton, btnAdvanced)
-#: rc.cpp:1030
-msgid "&Tune Palette..."
+#: lib/specialinformation.cpp:462
+msgid "Returns the value associated with the given key."
 msgstr ""
 
-#. i18n: file: editor/paletteeditor.ui:232
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox126)
-#: rc.cpp:1033
-msgid "Preview"
-msgstr "Rhagolwg"
+#: lib/specialinformation.cpp:464
+msgid "Removes element with the given key from the array."
+msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:35
-#. i18n: ectx: property (caption), widget (QDialog)
-#: rc.cpp:1063
-msgid "Edit Iconview"
+#: lib/specialinformation.cpp:466
+msgid "Adds element with the given key and value to the array"
 msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:41
-#. i18n: ectx: property (whatsThis), widget (QDialog)
-#: rc.cpp:1066
+#: lib/specialinformation.cpp:468
 msgid ""
-"<b>Edit Iconview</b><p>Add, edit or delete items in the icon "
-"view.</p><p>Click the <b>New Item</b> button to create a new item, then "
-"enter text and choose a pixmap.</p><p>Select an item from the view and click "
-"the <b>Delete Item</b> button to remove the item from the iconview.</p>"
+"Adds all elements in the string to the array. String should have <i>key\\"
+"tvalue\\n</i> format."
 msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:72
-#. i18n: ectx: property (whatsThis), widget (QIconView)
-#: rc.cpp:1069
-msgid "All items in the iconview."
+#: lib/specialinformation.cpp:471
+msgid ""
+"Returns all elements in the array in <pre>key\\tvalue\\n</pre> format."
 msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:100
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#: rc.cpp:1078
-msgid "Create a new item for the iconview."
+#: lib/specialinformation.cpp:473
+msgid ""
+"Create an integer indexed array - starting from 0 - from a string. Use the "
+"separator character to split the string. The separator's default value is '\\"
+"t'."
 msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:111
-#. i18n: ectx: property (toolTip), widget (QPushButton)
-#. i18n: file: editor/listvieweditor.ui:66
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemDelete)
-#: rc.cpp:1084 rc.cpp:1175
-msgid "Delete item"
-msgstr "Dileu eitem"
-
-#. i18n: file: editor/iconvieweditor.ui:114
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#: rc.cpp:1087
-msgid "Delete the selected item."
+#: lib/specialinformation.cpp:475
+msgid ""
+"Create a string from an integer indexed array. Concatenate the elements with "
+"the separator character. The separator's default value is '\\t'."
 msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:184
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#: rc.cpp:1099
-msgid "Change the text for the selected item."
+#: lib/specialinformation.cpp:477
+msgid ""
+"Remove keyNum elements starting with keyStart from an indexed array and "
+"reindex the array. If keyNum is not specified, remove only the keyStart "
+"element."
 msgstr ""
 
-#. i18n: file: editor/iconvieweditor.ui:260
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#: rc.cpp:1121
-msgid "Select a pixmap file for the current item."
+#: lib/specialinformation.cpp:479
+msgid ""
+"Insert the elements from string starting at key and reindex the array. Use "
+"the separator to separate the elements from the string. The separator's "
+"default value is '\\t'."
 msgstr ""
 
-#. i18n: file: editor/listeditor.ui:60
-#. i18n: ectx: property (text), widget (QPushButton, PushButton3)
-#: rc.cpp:1157
-msgid "Re&name"
-msgstr "Ai&l-enwi"
-
-#. i18n: file: editor/listeditor.ui:67
-#. i18n: ectx: property (text), widget (QPushButton, PushButton4)
-#: rc.cpp:1160
-msgid "&Close"
+#: lib/specialinformation.cpp:484
+msgid "Returns number of chars in the string."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:32
-#. i18n: ectx: property (windowTitle), widget (QDialog, ListViewEditorBase)
-#: rc.cpp:1163
-msgid "Edit Listview"
+#: lib/specialinformation.cpp:486
+msgid "Checks if the string contains the given substring."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:38
-#. i18n: ectx: property (whatsThis), widget (QDialog, ListViewEditorBase)
-#: rc.cpp:1166
+#: lib/specialinformation.cpp:488
 msgid ""
-"<b>Edit Listview</b><p>Use the controls on the <b>Items</b> tab to add, edit "
-"or delete items in the listview. Change the column configuration of the "
-"listview using the controls on the <b>Columns</b> tab.</p>Click the <b>New "
-"Item</b> button to create a new item, then enter text and add a "
-"pixmap.</p><p>Select an item from the list and click the <b>Delete Item</b> "
-"button to remove the item from the list.</p>"
+"Returns the position of a substring in the string, or -1 if it is not found."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:69
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDelete)
-#: rc.cpp:1178
+#: lib/specialinformation.cpp:490
 msgid ""
-"<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
+"Returns the position of a substring in the string, or -1 if it is not found. "
+"String is searched backwards"
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:82
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
-#: rc.cpp:1181
-msgid "Item &Properties"
+#: lib/specialinformation.cpp:492
+msgid "Returns the first <i>n</i> chars of the string."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:94
-#. i18n: ectx: property (text), widget (QLabel, Label2)
-#: rc.cpp:1184
-msgid "Pi&xmap:"
-msgstr "Pi&csfap :"
+#: lib/specialinformation.cpp:494
+msgid "Returns the last <i>n</i> chars of the string."
+msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:129
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, itemText)
-#: rc.cpp:1193
-msgid ""
-"<b>Change the text of the item.</b><p>The text will be changed in the "
-"current column of the selected item.</p>"
+#: lib/specialinformation.cpp:496
+msgid "Returns <i>n</i> chars of the string, starting from <i>start</i>."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:136
-#. i18n: ectx: property (toolTip), widget (QSpinBox, itemColumn)
-#: rc.cpp:1196
-msgid "Change column"
+#: lib/specialinformation.cpp:498
+msgid "Removes all occurrences of given substring."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:139
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, itemColumn)
-#: rc.cpp:1199
+#: lib/specialinformation.cpp:500
 msgid ""
-"<b>Select the current column.</b><p>The item's text and pixmap will be "
-"changed for the current column</p>"
+"Replaces all occurrences of the given substring with the given replacement."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:146
-#. i18n: ectx: property (text), widget (QLabel, Label4)
-#: rc.cpp:1202
-msgid "Colu&mn:"
-msgstr "Colo&fn:"
+#: lib/specialinformation.cpp:502
+msgid "Converts the string to uppercase."
+msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:229
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemNew)
-#: rc.cpp:1229
+#: lib/specialinformation.cpp:504
+msgid "Converts the string to lowercase."
+msgstr ""
+
+#: lib/specialinformation.cpp:506
 msgid ""
-"<b>Adds a new item to the list.</b><p>The item will be inserted at the top "
-"of the list and can be moved using the up and down buttons.</p>"
+"Compares two strings. Returns 0 if they are equal, -1 if the first one is "
+"lower, 1 if the first one is higher"
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:243
-#. i18n: ectx: property (text), widget (QPushButton, itemNewSub)
-#: rc.cpp:1235
-msgid "New &Subitem"
-msgstr "&Is-eitem Newydd"
+#: lib/specialinformation.cpp:509
+msgid "Checks if the string is empty."
+msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:246
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemNewSub)
-#: rc.cpp:1238
-msgid "Add a subitem"
+#: lib/specialinformation.cpp:511
+msgid "Checks if the string is a valid number."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:249
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemNewSub)
-#: rc.cpp:1241
-msgid ""
-"<b>Create a new sub-item for the selected item.</b><p>New sub-items are "
-"inserted at the top of the list of sub-items, and new levels are created "
-"automatically.</p>"
+#: lib/specialinformation.cpp:513
+msgid "Returns given section of a string."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:281
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemUp)
-#: rc.cpp:1247
+#: lib/specialinformation.cpp:515
+#, kde-format
 msgid ""
-"<b>Move the selected item up.</b><p>The item will be moved within its level "
-"in the hierarchy.</p>"
+"Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, "
+"<i>arg2</i>, <i>arg3</i> accordingly."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:297
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemDown)
-#: rc.cpp:1253
+#: lib/specialinformation.cpp:518
 msgid ""
-"<b>Move the selected item down.</b><p>The item will be moved within its "
-"level in the hierarchy.</p>"
+"Convert a string to an integer. If not possible, use the default value."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:310
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemLeft)
-#: rc.cpp:1256
-msgid "Move left"
-msgstr "Symud i'r Chwith"
-
-#. i18n: file: editor/listvieweditor.ui:313
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemLeft)
-#: rc.cpp:1259
+#: lib/specialinformation.cpp:520
 msgid ""
-"<b>Move the selected item one level up.</b><p>This will also change the "
-"level of the item's sub-items.</p>"
+"Convert a string to a double precision floating point value. If not "
+"possible, use the default value."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:326
-#. i18n: ectx: property (toolTip), widget (QPushButton, itemRight)
-#: rc.cpp:1262
-msgid "Move right"
-msgstr "Symud i'r Dde"
+#: lib/specialinformation.cpp:524
+msgid "Returns content of given file."
+msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:329
-#. i18n: ectx: property (whatsThis), widget (QPushButton, itemRight)
-#: rc.cpp:1265
-msgid ""
-"<b>Move the selected item one level down.</b><p>This will also change the "
-"level of the item's sub-items.</p>"
+#: lib/specialinformation.cpp:526
+msgid "Writes given string to a file."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:349
-#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox1)
-#: rc.cpp:1271
-msgid "Column Properties"
+#: lib/specialinformation.cpp:528
+msgid "Appends given string to the end of a file."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:399
-#. i18n: ectx: property (whatsThis), widget (QPushButton, colDeletePixmap)
-#: rc.cpp:1283
-msgid "Delete the pixmap of the selected column."
+#: lib/specialinformation.cpp:530
+msgid "Checks to see if file exists."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:418
-#. i18n: ectx: property (whatsThis), widget (QPushButton, colChoosePixmap)
-#: rc.cpp:1292
+#: lib/specialinformation.cpp:533
 msgid ""
-"<b>Select a pixmap file for the selected column.</b><p>The pixmap will be "
-"displayed in the header of the listview.</p>"
+"Shows color dialog. Returns color in #RRGGBB format. Defaults to the "
+"parameter, if specified."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:444
-#. i18n: ectx: property (toolTip), widget (QLineEdit, colText)
-#: rc.cpp:1298
-msgid "Enter column text"
+#: lib/specialinformation.cpp:535
+msgid "Shows text selection dialog. Returns entered text."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:447
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, colText)
-#: rc.cpp:1301
-msgid ""
-"<b>Enter the text for the selected column.</b><p>The text will be displayed "
-"in the header of the listview.</p>"
+#: lib/specialinformation.cpp:537
+msgid "Shows a dialog asking user for password and returns it."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:454
-#. i18n: ectx: property (text), widget (QCheckBox, colClickable)
-#: rc.cpp:1304
-msgid "Clicka&ble"
-msgstr "Clicad&wy"
-
-#. i18n: file: editor/listvieweditor.ui:457
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, colClickable)
-#: rc.cpp:1307
-msgid ""
-"If this option is checked, the selected column will react to mouse clicks on "
-"the header."
+#: lib/specialinformation.cpp:539
+msgid "Shows value selection dialog. Returns entered value."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:464
-#. i18n: ectx: property (text), widget (QCheckBox, colResizeable)
-#: rc.cpp:1310
-msgid "Re&sizable"
-msgstr "Ge&llir newid ei faint"
+#: lib/specialinformation.cpp:541
+msgid "Shows float value selection dialog. Returns entered value."
+msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:467
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, colResizeable)
-#: rc.cpp:1313
-msgid "The column's width will be resizeable if this option is checked."
+#: lib/specialinformation.cpp:543
+msgid "Shows existing file selection dialog. Returns selected file."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:480
-#. i18n: ectx: property (toolTip), widget (QPushButton, colDelete)
-#: rc.cpp:1319
-msgid "Delete column"
-msgstr "Dileu Colofn"
+#: lib/specialinformation.cpp:545
+msgid "Shows save file selection dialog. Returns selected file."
+msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:483
-#. i18n: ectx: property (whatsThis), widget (QPushButton, colDelete)
-#: rc.cpp:1322
-msgid "Deletes the selected Column."
+#: lib/specialinformation.cpp:547
+msgid "Shows directory selection dialog. Returns selected directory."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:499
-#. i18n: ectx: property (whatsThis), widget (QPushButton, colDown)
-#: rc.cpp:1328
+#: lib/specialinformation.cpp:549
 msgid ""
-"<b>Move the selected item down.</b><p>The top-most column will be the first "
-"column in the list.</p>"
+"Shows multiple files selection dialog. Returns EOL-separated list of "
+"selected files."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:509
-#. i18n: ectx: property (toolTip), widget (QPushButton, colNew)
-#: rc.cpp:1334
-msgid "Add a Column"
+#: lib/specialinformation.cpp:553
+msgid "Shows an information dialog."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:512
-#. i18n: ectx: property (whatsThis), widget (QPushButton, colNew)
-#: rc.cpp:1337
-msgid ""
-"<b>Create a new column.</b><p>New columns are appended at the end of (right "
-"of) the list and may be moved using the up and down buttons.</p>"
+#: lib/specialinformation.cpp:555
+msgid "Shows an error dialog."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:528
-#. i18n: ectx: property (whatsThis), widget (QPushButton, colUp)
-#: rc.cpp:1343
+#: lib/specialinformation.cpp:557
 msgid ""
-"<b>Move the selected item up.</b><p>The top-most column will be the first "
-"column in the list.</p>"
+"Shows a warning dialog with up to three buttons. Returns number of selected "
+"button."
 msgstr ""
 
-#. i18n: file: editor/listvieweditor.ui:535
-#. i18n: ectx: property (whatsThis), widget (Q3ListBox, colPreview)
-#: rc.cpp:1346
-msgid "The list of columns."
+#: lib/specialinformation.cpp:559
+msgid ""
+"Shows a question dialog with up to three buttons. Returns number of selected "
+"button."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kompare.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kompare.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kompare.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kompare.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/kompare.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2009-07-18 18:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,102 +11,94 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:24+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kompare_shell.cpp:81
-msgid "Could not find our KompareViewPart."
-msgstr ""
-
-#: kompare_shell.cpp:113
+#: kompare_shell.cpp:77
 msgid "Could not load our KompareViewPart."
 msgstr ""
 
-#: kompare_shell.cpp:121
-msgid "Could not find our KompareNavigationPart."
-msgstr ""
-
-#: kompare_shell.cpp:130
+#: kompare_shell.cpp:81
 msgid "Navigation"
 msgstr ""
 
-#: kompare_shell.cpp:148
+#: kompare_shell.cpp:98
 msgid "Could not load our KompareNavigationPart."
 msgstr ""
 
-#: kompare_shell.cpp:249
+#: kompare_shell.cpp:199
 msgid "&Open Diff..."
 msgstr ""
 
-#: kompare_shell.cpp:252
+#: kompare_shell.cpp:202
 msgid "&Compare Files..."
 msgstr ""
 
-#: kompare_shell.cpp:255
+#: kompare_shell.cpp:205
 msgid "&Blend URL with Diff..."
 msgstr ""
 
-#: kompare_shell.cpp:261
+#: kompare_shell.cpp:211
 msgid "Show T&ext View"
 msgstr ""
 
-#: kompare_shell.cpp:274
+#: kompare_shell.cpp:224
 msgid " 0 of 0 differences "
 msgstr ""
 
-#: kompare_shell.cpp:275
+#: kompare_shell.cpp:225
 msgid " 0 of 0 files "
 msgstr ""
 
-#: kompare_shell.cpp:290
+#: kompare_shell.cpp:240
 #, kde-format
 msgid " %2 of %1 file "
 msgid_plural " %2 of %1 files "
 msgstr[0] ""
 msgstr[1] ""
 
-#: kompare_shell.cpp:292
+#: kompare_shell.cpp:242
 #, kde-format
 msgid " %1 file "
 msgid_plural " %1 files "
 msgstr[0] ""
 msgstr[1] ""
 
-#: kompare_shell.cpp:295
+#: kompare_shell.cpp:245
 #, kde-format
 msgid " %2 of %1 difference, %3 applied "
 msgid_plural " %2 of %1 differences, %3 applied "
 msgstr[0] ""
 msgstr[1] ""
 
-#: kompare_shell.cpp:298
+#: kompare_shell.cpp:248
 #, kde-format
 msgid " %1 difference "
 msgid_plural " %1 differences "
 msgstr[0] ""
 msgstr[1] ""
 
-#: kompare_shell.cpp:386
+#: kompare_shell.cpp:330
 msgid "Blend File/Folder with diff Output"
 msgstr ""
 
-#: kompare_shell.cpp:387
+#: kompare_shell.cpp:331
 msgid "File/Folder"
 msgstr ""
 
-#: kompare_shell.cpp:388
+#: kompare_shell.cpp:332
 msgid "Diff Output"
 msgstr ""
 
-#: kompare_shell.cpp:390
+#: kompare_shell.cpp:334
 msgid "Blend"
 msgstr ""
 
-#: kompare_shell.cpp:390
+#: kompare_shell.cpp:334
 msgid "Blend this file or folder with the diff output"
 msgstr ""
 
-#: kompare_shell.cpp:390
+#: kompare_shell.cpp:334
 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 "
@@ -115,866 +107,865 @@
 "apply the difference(s) to a file or to the files. "
 msgstr ""
 
-#: kompare_shell.cpp:415 main.cpp:201
+#: kompare_shell.cpp:359 main.cpp:201
 msgid "Compare Files or Folders"
 msgstr ""
 
-#: kompare_shell.cpp:416 main.cpp:202
+#: kompare_shell.cpp:360 main.cpp:202
 msgid "Source"
 msgstr "Tarddiad"
 
-#: kompare_shell.cpp:417 main.cpp:203
+#: kompare_shell.cpp:361 main.cpp:203
 msgid "Destination"
 msgstr "Cyrchfan"
 
-#: kompare_shell.cpp:419 main.cpp:205
+#: kompare_shell.cpp:363 main.cpp:205
 msgid "Compare"
 msgstr ""
 
-#: kompare_shell.cpp:419
+#: kompare_shell.cpp:363
 msgid "Compare these files or folders"
 msgstr ""
 
-#: kompare_shell.cpp:419 main.cpp:205
+#: kompare_shell.cpp:363 main.cpp:205
 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:455
+#: kompare_shell.cpp:399
 msgid "Text View"
 msgstr "Golwg Testun"
 
-#: libdialogpages/diffpage.cpp:207
-msgid "Diff Program"
-msgstr ""
-
-#: libdialogpages/diffpage.cpp:212
+#: main.cpp:43
 msgid ""
-"You can select a different diff program here. On Solaris the standard diff "
-"program does not support all the options that the GNU version does. This way "
-"you can select that version."
+"A program to view the differences between files and optionally generate a "
+"diff"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:218 komparepart/kompareprefdlg.cpp:51
-#: kompareurldialog.cpp:52
-msgid "Diff"
-msgstr "Diff"
+#: main.cpp:59
+msgid "Kompare"
+msgstr "Kompare"
 
-#: libdialogpages/diffpage.cpp:231
+#: main.cpp:61
 msgid ""
-"Select the format of the output generated by diff. Unified is the one that "
-"is used most frequently because it is very readable. The KDE developers like "
-"this format the best so use it for sending patches."
-msgstr ""
-
-#: libdialogpages/diffpage.cpp:234
-msgid "Output Format"
+"(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) 2004-"
+"2005 Jeff Snyder, (c) 2007-2011 Kevin Kofler"
 msgstr ""
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:201
-#. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB)
-#: libdialogpages/diffpage.cpp:237 komparepart/kompare_part.cpp:844 rc.cpp:74
-msgid "Context"
+#: main.cpp:62 komparepart/kompare_part.cpp:631
+#: komparenavtreepart/komparenavtreepart.cpp:770
+msgid "John Firebaugh"
 msgstr ""
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:215
-#. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB)
-#: libdialogpages/diffpage.cpp:240 komparepart/kompare_part.cpp:853 rc.cpp:80
-msgid "Normal"
-msgstr "Arferol"
+#: main.cpp:62 main.cpp:63 komparepart/kompare_part.cpp:631
+#: komparepart/kompare_part.cpp:632 komparepart/kompare_part.cpp:633
+#: komparenavtreepart/komparenavtreepart.cpp:770
+#: komparenavtreepart/komparenavtreepart.cpp:771
+msgid "Author"
+msgstr "Awdur"
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:229
-#. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB)
-#: libdialogpages/diffpage.cpp:243 komparepart/kompare_part.cpp:841 rc.cpp:86
-msgid "Unified"
+#: main.cpp:63 komparepart/kompare_part.cpp:632
+#: komparenavtreepart/komparenavtreepart.cpp:771
+msgid "Otto Bruggeman"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:252
-msgid "Lines of Context"
+#: main.cpp:64
+msgid "Jeff Snyder"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:253 libdialogpages/diffpage.cpp:258
-#: libdialogpages/diffpage.cpp:261
-msgid ""
-"The number of context lines is normally 2 or 3. This makes the diff readable "
-"and applicable in most cases. More than 3 lines will only bloat the diff "
-"unnecessarily."
+#: main.cpp:64
+msgid "Developer"
 msgstr ""
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:257
-#. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
-#: libdialogpages/diffpage.cpp:256 rc.cpp:92
-msgid "Number of context lines:"
+#: main.cpp:65 komparepart/kompare_part.cpp:633
+msgid "Kevin Kofler"
 msgstr ""
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:189
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_FormatBG)
-#: libdialogpages/diffpage.cpp:267 rc.cpp:71
-msgid "Format"
-msgstr "Fformat"
-
-#: libdialogpages/diffpage.cpp:281
-msgid "General"
-msgstr "Cyffredinol"
-
-#: libdialogpages/diffpage.cpp:284
-msgid "&Treat new files as empty"
+#: main.cpp:65
+msgid "Maintainer"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:285
-msgid "This option corresponds to the -N diff option."
+#: main.cpp:66
+msgid "Chris Luetchford"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:286
-msgid ""
-"With this option enabled diff will treat a file that only exists in one of "
-"the directories as empty in the other directory. This means that the file is "
-"compared with an empty file and because of this will appear as one big "
-"insertion or deletion."
+#: main.cpp:66
+msgid "Kompare icon artist"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:289
-msgid "&Look for smaller changes"
+#: main.cpp:67
+msgid "Malte Starostik"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:290
-msgid "This corresponds to the -d diff option."
+#: main.cpp:67
+msgid "A lot of good advice"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:291
-msgid ""
-"With this option enabled diff will try a little harder (at the cost of more "
-"memory) to find fewer changes."
+#: main.cpp:68
+msgid "Bernd Gehrmann"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:293
-msgid "O&ptimize for large files"
+#: main.cpp:68
+msgid "Cervisia diff viewer"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:294
-msgid "This corresponds to the -H diff option."
+#: main.cpp:73
+msgid "This will compare URL1 with URL2"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:295
+#: main.cpp:74
 msgid ""
-"This option lets diff makes better diffs when using large files. The "
-"definition of large is nowhere to be found though."
+"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
+"and then it will read from standard input. Can be used for instance for cvs "
+"diff | kompare -o -. Kompare will do a check to see if it can find the "
+"original file(s) and then blend the original file(s) into the diffoutput and "
+"show that in the viewer. -n disables the check."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:297
-msgid "&Ignore changes in case"
+#: main.cpp:75
+msgid ""
+"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
+"the file or folder that the diffoutput needs to be blended into. "
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:298
-msgid "This corresponds to the -i diff option."
+#: main.cpp:76
+msgid ""
+"Disables the check for automatically finding the original file(s) when using "
+"'-' as URL with the -o option."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:299
+#: main.cpp:77
 msgid ""
-"With this option to ignore changes in case enabled, diff will not indicate a "
-"difference when something in one file is changed into SoMEthing in the other "
-"file."
+"Use this to specify the encoding when calling it from the command line. It "
+"will default to the local encoding if not specified."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:307
-msgid "Ignore regexp:"
+#: main.cpp:205
+msgid "Compare these files or folder"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:308
-msgid "This option corresponds to the -I diff option."
+#: libdiff2/komparemodellist.cpp:65
+msgid "&Apply Difference"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:309
-msgid ""
-"When this checkbox is enabled, an option to diff is given that will make "
-"diff ignore lines that match the regular expression."
+#: libdiff2/komparemodellist.cpp:69
+msgid "Un&apply Difference"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:313
-msgid ""
-"Add the regular expression here that you want to use\n"
-"to ignore lines that match it."
+#: libdiff2/komparemodellist.cpp:73
+msgid "App&ly All"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:319
-msgid "&Edit..."
-msgstr "&Golygu..."
+#: libdiff2/komparemodellist.cpp:77
+msgid "&Unapply All"
+msgstr ""
 
-#: libdialogpages/diffpage.cpp:320
-msgid ""
-"Clicking this will open a regular expression dialog where\n"
-"you can graphically create regular expressions."
+#: libdiff2/komparemodellist.cpp:81
+msgid "P&revious File"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:328
-msgid "Whitespace"
+#: libdiff2/komparemodellist.cpp:85
+msgid "N&ext File"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:331
-msgid "E&xpand tabs to spaces in output"
+#: libdiff2/komparemodellist.cpp:89
+msgid "&Previous Difference"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:332
-msgid "This option corresponds to the -t diff option."
+#: libdiff2/komparemodellist.cpp:93
+msgid "&Next Difference"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:333
+#: libdiff2/komparemodellist.cpp:252 libdiff2/komparemodellist.cpp:277
+#, kde-format
 msgid ""
-"This option does not always produce the right result. Due to this expansion "
-"Kompare may have problems applying the change to the destination file."
+"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
+"file.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:335
-msgid "I&gnore added or removed empty lines"
+#: libdiff2/komparemodellist.cpp:261
+#, kde-format
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file "
+"<b>%2</b>.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:336
-msgid "This option corresponds to the -B diff option."
+#: libdiff2/komparemodellist.cpp:288
+#, kde-format
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder "
+"<b>%2</b>.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:337
-msgid ""
-"This can be very useful in situations where code has been reorganized and "
-"empty lines have been added or removed to improve legibility."
+#: libdiff2/komparemodellist.cpp:320 libdiff2/komparemodellist.cpp:632
+msgid "Could not open a temporary file."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:339
-msgid "Ig&nore changes in the amount of whitespace"
+#: libdiff2/komparemodellist.cpp:368 libdiff2/komparemodellist.cpp:375
+#, kde-format
+msgid ""
+"<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:340
-msgid "This option corresponds to the -b diff option."
+#: libdiff2/komparemodellist.cpp:403
+#, kde-format
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:341
+#: libdiff2/komparemodellist.cpp:420
+#, kde-format
 msgid ""
-"If you are uninterested in differences arising due to, for example, changes "
-"in indentation, then use this option."
+"<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 ""
 
-#: libdialogpages/diffpage.cpp:343
-msgid "Ign&ore all whitespace"
+#: libdiff2/komparemodellist.cpp:485 libdiff2/komparemodellist.cpp:598
+msgid "Could not parse diff output."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:344
-msgid "This option corresponds to the -w diff option."
+#: libdiff2/komparemodellist.cpp:501
+msgid "The files are identical."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:345
-msgid ""
-"This is useful for seeing the significant changes without being overwhelmed "
-"by all the white space changes."
+#: libdiff2/komparemodellist.cpp:664
+msgid "Could not write to the temporary file."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:347
-msgid "Igno&re changes due to tab expansion"
+#: libdiff2/komparemodellist.cpp:932
+msgid ""
+"The diff is malformed. Some lines could not be parsed and will not be "
+"displayed in the diff view."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:348
-msgid "This option corresponds to the -E diff option."
+#: komparepart/kompare_part.cpp:170
+msgid "Save &All"
+msgstr "Cadw &Popeth"
+
+#: komparepart/kompare_part.cpp:172
+msgid "Save &Diff..."
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:349
-msgid ""
-"If there is a change because tabs have been expanded into spaces in the "
-"other file, then this option will make sure that these do not show up. "
-"Kompare currently has some problems applying such changes so be careful when "
-"you use this option."
+#: komparepart/kompare_part.cpp:174
+msgid "Swap Source with Destination"
 msgstr ""
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:93
-#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_OptionsGB)
-#: libdialogpages/diffpage.cpp:355 rc.cpp:41
-msgid "Options"
+#: komparepart/kompare_part.cpp:176
+msgid "Show Statistics"
+msgstr "Dangos Ystadegau"
+
+#: komparepart/kompare_part.cpp:179
+msgid "Refresh Diff"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:368
-msgid "File Pattern to Exclude"
+#: komparepart/kompare_part.cpp:288 komparepart/kompare_part.cpp:299
+#, kde-format
+msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:371
-msgid ""
-"If this is checked you can enter a shell pattern in the text box on the "
-"right or select entries from the list."
+#: komparepart/kompare_part.cpp:337
+#, kde-format
+msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:377
-msgid ""
-"Here you can enter or remove a shell pattern or select one or more entries "
-"from the list."
+#: komparepart/kompare_part.cpp:529
+msgid "Diff Options"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:386
-msgid "File with Filenames to Exclude"
+#: komparepart/kompare_part.cpp:547
+msgid "*.diff *.dif *.patch|Patch Files"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:389
-msgid ""
-"If this is checked you can enter a filename in the combo box on the right."
+#: komparepart/kompare_part.cpp:547
+msgid "Save .diff"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:393
-msgid ""
-"Here you can enter the URL of a file with shell patterns to ignore during "
-"the comparison of the folders."
+#: komparepart/kompare_part.cpp:550
+msgid "The file exists or is write-protected; do you want to overwrite it?"
 msgstr ""
 
-#: libdialogpages/diffpage.cpp:397
-msgid ""
-"Any file you select in the dialog that pops up when you click it will be put "
-"in the dialog to the left of this button."
-msgstr ""
+#: komparepart/kompare_part.cpp:550
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
 
-#: libdialogpages/diffpage.cpp:405
-msgid "Exclude"
-msgstr ""
+#: komparepart/kompare_part.cpp:550
+msgid "Overwrite"
+msgstr "Trosysgrifo"
 
-#: libdialogpages/viewpage.cpp:57
-msgid "Colors"
-msgstr "Lliwiau"
+#: komparepart/kompare_part.cpp:550
+msgid "Do Not Overwrite"
+msgstr "Peidio â Throsysgrifo"
 
-#: libdialogpages/viewpage.cpp:63
-msgid "Removed color:"
-msgstr ""
+#: komparepart/kompare_part.cpp:630
+msgid "KomparePart"
+msgstr "KomparePart"
 
-#: libdialogpages/viewpage.cpp:70
-msgid "Changed color:"
+#: komparepart/kompare_part.cpp:643
+msgid "Running diff..."
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:77
-msgid "Added color:"
+#: komparepart/kompare_part.cpp:646
+msgid "Parsing diff output..."
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:84
-msgid "Applied color:"
+#: komparepart/kompare_part.cpp:695
+#, kde-format
+msgid "Comparing file %1 with file %2"
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:94
-msgid "Mouse Wheel"
+#: komparepart/kompare_part.cpp:700
+#, kde-format
+msgid "Comparing files in %1 with files in %2"
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:98
-msgid "Number of lines:"
-msgstr "Nifel llinellau:"
-
-#: libdialogpages/viewpage.cpp:109
-msgid "Tabs to Spaces"
+#: komparepart/kompare_part.cpp:705
+#, kde-format
+msgid "Viewing diff output from %1"
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:113
-msgid "Number of spaces to convert a tab character to:"
+#: komparepart/kompare_part.cpp:708
+#, kde-format
+msgid "Blending diff output from %1 into file %2"
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:122 kompareurldialog.cpp:60
-msgid "Appearance"
+#: komparepart/kompare_part.cpp:713
+#, kde-format
+msgid "Blending diff output from %1 into folder %2"
 msgstr ""
 
-#: libdialogpages/viewpage.cpp:132
-msgid "Text Font"
-msgstr "Wynebfath y testun"
-
-#: libdialogpages/viewpage.cpp:136
-msgid "Font:"
-msgstr "Wynebfath:"
-
-#: libdialogpages/viewpage.cpp:143
-msgid "Size:"
-msgstr "Maint:"
-
-#: libdialogpages/viewpage.cpp:152
-msgid "Fonts"
+#: komparepart/kompare_part.cpp:764 komparepart/kompare_part.cpp:795
+#: komparepart/kompare_part.cpp:910
+msgid ""
+"You have made changes to the destination file(s).\n"
+"Would you like to save them?"
 msgstr ""
 
-#: libdialogpages/filespage.cpp:60
-msgid "Encoding"
-msgstr "Amgodiad"
+#: komparepart/kompare_part.cpp:766 komparepart/kompare_part.cpp:797
+#: komparepart/kompare_part.cpp:912
+msgid "Save Changes?"
+msgstr "Cadw Newidiadau?"
 
-#: komparenavtreepart/komparenavtreepart.cpp:63
-msgid "Source Folder"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:229
+#. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB)
+#: komparepart/kompare_part.cpp:835 libdialogpages/diffpage.cpp:243 rc.cpp:77
+msgid "Unified"
 msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:69
-msgid "Destination Folder"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:201
+#. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB)
+#: komparepart/kompare_part.cpp:838 libdialogpages/diffpage.cpp:237 rc.cpp:65
+msgid "Context"
 msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:75
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
-
-#: komparenavtreepart/komparenavtreepart.cpp:75
-msgid "Destination File"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:222
+#. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB)
+#: komparepart/kompare_part.cpp:841 rc.cpp:74
+msgid "RCS"
 msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:82
-msgid "Source Line"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:208
+#. i18n: ectx: property (text), widget (QRadioButton, m_EdRB)
+#: komparepart/kompare_part.cpp:844 rc.cpp:68
+msgid "Ed"
 msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:82
-msgid "Destination Line"
-msgstr ""
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:215
+#. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB)
+#: komparepart/kompare_part.cpp:847 libdialogpages/diffpage.cpp:240 rc.cpp:71
+msgid "Normal"
+msgstr "Arferol"
 
-#: komparenavtreepart/komparenavtreepart.cpp:82
-msgid "Difference"
+#: komparepart/kompare_part.cpp:851
+#: komparenavtreepart/komparenavtreepart.cpp:629
+msgid "Unknown"
+msgstr "Anhysbys"
+
+#: komparepart/kompare_part.cpp:867
+msgid ""
+"No diff file, or no 2 files have been diffed. Therefore no stats are "
+"available."
 msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:456
-#, kde-format
-msgid "Applied: Changes made to %1 line undone"
-msgid_plural "Applied: Changes made to  %1 lines undone"
-msgstr[0] ""
-msgstr[1] ""
+#: komparepart/kompare_part.cpp:869 komparepart/kompare_part.cpp:883
+#: komparepart/kompare_part.cpp:899
+msgid "Diff Statistics"
+msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:459
+#: komparepart/kompare_part.cpp:873
 #, kde-format
-msgid "Changed %1 line"
-msgid_plural "Changed %1 lines"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Statistics:\n"
+"\n"
+"Old file: %1\n"
+"New file: %2\n"
+"\n"
+"Format: %3\n"
+"Number of hunks: %4\n"
+"Number of differences: %5"
+msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:464
+#: komparepart/kompare_part.cpp:886
 #, kde-format
-msgid "Applied: Insertion of %1 line undone"
-msgid_plural "Applied: Insertion of %1 lines undone"
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"Statistics:\n"
+"\n"
+"Number of files in diff file: %1\n"
+"Format: %2\n"
+"\n"
+"Current old file: %3\n"
+"Current new file: %4\n"
+"\n"
+"Number of hunks: %5\n"
+"Number of differences: %6"
+msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:467
-#, kde-format
-msgid "Inserted %1 line"
-msgid_plural "Inserted %1 lines"
-msgstr[0] ""
-msgstr[1] ""
+#: komparepart/kompareprefdlg.cpp:35
+msgid "Preferences"
+msgstr "Hoffterau"
 
-#: komparenavtreepart/komparenavtreepart.cpp:472
-#, kde-format
-msgid "Applied: Deletion of %1 line undone"
-msgid_plural "Applied: Deletion of %1 lines undone"
-msgstr[0] ""
-msgstr[1] ""
+#: komparepart/kompareprefdlg.cpp:45
+msgid "View"
+msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:475
-#, kde-format
-msgid "Deleted %1 line"
-msgid_plural "Deleted %1 lines"
-msgstr[0] ""
-msgstr[1] ""
+#: komparepart/kompareprefdlg.cpp:47
+msgid "View Settings"
+msgstr "Gweld Gosodiadau"
 
-#: komparenavtreepart/komparenavtreepart.cpp:629
-#: komparepart/kompare_part.cpp:857
-msgid "Unknown"
-msgstr "Anhysbys"
+#: komparepart/kompareprefdlg.cpp:51 kompareurldialog.cpp:52
+#: libdialogpages/diffpage.cpp:218
+msgid "Diff"
+msgstr "Diff"
 
-#: komparenavtreepart/komparenavtreepart.cpp:800
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
+#: komparepart/kompareprefdlg.cpp:53
+msgid "Diff Settings"
+msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:801 main.cpp:62
-#: komparepart/kompare_part.cpp:637
-msgid "John Firebaugh"
+#: kompareurldialog.cpp:44
+msgid "Files"
 msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:801
-#: komparenavtreepart/komparenavtreepart.cpp:802 main.cpp:62 main.cpp:63
-#: komparepart/kompare_part.cpp:637 komparepart/kompare_part.cpp:638
-#: komparepart/kompare_part.cpp:639
-msgid "Author"
-msgstr "Awdur"
+#: kompareurldialog.cpp:46
+msgid "Here you can enter the files you want to compare."
+msgstr ""
 
-#: komparenavtreepart/komparenavtreepart.cpp:802 main.cpp:63
-#: komparepart/kompare_part.cpp:638
-msgid "Otto Bruggeman"
+#: kompareurldialog.cpp:54
+msgid "Here you can change the options for comparing the files."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:65
-msgid "&Apply Difference"
+#: kompareurldialog.cpp:60 libdialogpages/viewpage.cpp:124
+msgid "Appearance"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:69
-msgid "Un&apply Difference"
+#: kompareurldialog.cpp:62
+msgid "Here you can change the options for the view."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:73
-msgid "App&ly All"
+#: kompareurldialog.cpp:105
+msgid ""
+"File used for excluding files cannot be found, please specify another file."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:77
-msgid "&Unapply All"
+#: libdialogpages/filespage.cpp:60
+msgid "Encoding"
+msgstr "Amgodiad"
+
+#: libdialogpages/diffpage.cpp:207
+msgid "Diff Program"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:81
-msgid "P&revious File"
+#: libdialogpages/diffpage.cpp:212
+msgid ""
+"You can select a different diff program here. On Solaris the standard diff "
+"program does not support all the options that the GNU version does. This way "
+"you can select that version."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:85
-msgid "N&ext File"
+#: libdialogpages/diffpage.cpp:231
+msgid ""
+"Select the format of the output generated by diff. Unified is the one that "
+"is used most frequently because it is very readable. The KDE developers like "
+"this format the best so use it for sending patches."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:89
-msgid "&Previous Difference"
+#: libdialogpages/diffpage.cpp:234
+msgid "Output Format"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:93
-msgid "&Next Difference"
+#: libdialogpages/diffpage.cpp:252
+msgid "Lines of Context"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:219 libdiff2/komparemodellist.cpp:242
-#, kde-format
+#: libdialogpages/diffpage.cpp:253 libdialogpages/diffpage.cpp:258
+#: libdialogpages/diffpage.cpp:262
 msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
-"file.</qt>"
+"The number of context lines is normally 2 or 3. This makes the diff readable "
+"and applicable in most cases. More than 3 lines will only bloat the diff "
+"unnecessarily."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:226
-#, kde-format
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file "
-"<b>%2</b>.</qt>"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:257
+#. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
+#: libdialogpages/diffpage.cpp:256 rc.cpp:83
+msgid "Number of context lines:"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:251
-#, kde-format
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder "
-"<b>%2</b>.</qt>"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:189
+#. i18n: ectx: property (title), widget (QGroupBox, m_FormatGB)
+#: libdialogpages/diffpage.cpp:268 rc.cpp:62
+msgid "Format"
+msgstr "Fformat"
+
+#: libdialogpages/diffpage.cpp:282
+msgid "General"
+msgstr "Cyffredinol"
+
+#: libdialogpages/diffpage.cpp:285
+msgid "&Treat new files as empty"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:283 libdiff2/komparemodellist.cpp:595
-msgid "Could not open a temporary file."
+#: libdialogpages/diffpage.cpp:286
+msgid "This option corresponds to the -N diff option."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:331 libdiff2/komparemodellist.cpp:338
-#, kde-format
+#: libdialogpages/diffpage.cpp:287
 msgid ""
-"<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+"With this option enabled diff will treat a file that only exists in one of "
+"the directories as empty in the other directory. This means that the file is "
+"compared with an empty file and because of this will appear as one big "
+"insertion or deletion."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:366
-#, kde-format
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
+#: libdialogpages/diffpage.cpp:290
+msgid "&Look for smaller changes"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:383
-#, kde-format
-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>"
+#: libdialogpages/diffpage.cpp:291
+msgid "This corresponds to the -d diff option."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:448 libdiff2/komparemodellist.cpp:561
-msgid "Could not parse diff output."
+#: libdialogpages/diffpage.cpp:292
+msgid ""
+"With this option enabled diff will try a little harder (at the cost of more "
+"memory) to find fewer changes."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:464
-msgid "The files are identical."
+#: libdialogpages/diffpage.cpp:294
+msgid "O&ptimize for large files"
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:627
-msgid "Could not write to the temporary file."
+#: libdialogpages/diffpage.cpp:295
+msgid "This corresponds to the -H diff option."
 msgstr ""
 
-#: libdiff2/komparemodellist.cpp:895
+#: libdialogpages/diffpage.cpp:296
 msgid ""
-"The diff is malformed. Some lines could not be parsed and will not be "
-"displayed in the diff view."
+"This option lets diff makes better diffs when using large files. The "
+"definition of large is nowhere to be found though."
 msgstr ""
 
-#: main.cpp:43
-msgid ""
-"A program to view the differences between files and optionally generate a "
-"diff"
+#: libdialogpages/diffpage.cpp:298
+msgid "&Ignore changes in case"
 msgstr ""
 
-#: main.cpp:59
-msgid "Kompare"
-msgstr "Kompare"
+#: libdialogpages/diffpage.cpp:299
+msgid "This corresponds to the -i diff option."
+msgstr ""
 
-#: main.cpp:61
+#: libdialogpages/diffpage.cpp:300
 msgid ""
-"(c) 2001-2004 John Firebaugh, (c) 2001-2005,2009 Otto Bruggeman, (c) 2004-"
-"2005 Jeff Snyder, (c) 2007-2008 Kevin Kofler"
+"With this option to ignore changes in case enabled, diff will not indicate a "
+"difference when something in one file is changed into SoMEthing in the other "
+"file."
 msgstr ""
 
-#: main.cpp:64
-msgid "Jeff Snyder"
+#: libdialogpages/diffpage.cpp:309
+msgid "Ignore regexp:"
 msgstr ""
 
-#: main.cpp:64
-msgid "Developer"
+#: libdialogpages/diffpage.cpp:310
+msgid "This option corresponds to the -I diff option."
 msgstr ""
 
-#: main.cpp:65 komparepart/kompare_part.cpp:639
-msgid "Kevin Kofler"
+#: libdialogpages/diffpage.cpp:311
+msgid ""
+"When this checkbox is enabled, an option to diff is given that will make "
+"diff ignore lines that match the regular expression."
 msgstr ""
 
-#: main.cpp:65
-msgid "Maintainer"
+#: libdialogpages/diffpage.cpp:315
+msgid ""
+"Add the regular expression here that you want to use\n"
+"to ignore lines that match it."
 msgstr ""
 
-#: main.cpp:66
-msgid "Chris Luetchford"
+#: libdialogpages/diffpage.cpp:321
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#: libdialogpages/diffpage.cpp:323
+msgid ""
+"Clicking this will open a regular expression dialog where\n"
+"you can graphically create regular expressions."
 msgstr ""
 
-#: main.cpp:66
-msgid "Kompare icon artist"
+#: libdialogpages/diffpage.cpp:331
+msgid "Whitespace"
 msgstr ""
 
-#: main.cpp:67
-msgid "Malte Starostik"
+#: libdialogpages/diffpage.cpp:334
+msgid "E&xpand tabs to spaces in output"
 msgstr ""
 
-#: main.cpp:67
-msgid "A lot of good advice"
+#: libdialogpages/diffpage.cpp:335
+msgid "This option corresponds to the -t diff option."
 msgstr ""
 
-#: main.cpp:68
-msgid "Bernd Gehrmann"
+#: libdialogpages/diffpage.cpp:336
+msgid ""
+"This option does not always produce the right result. Due to this expansion "
+"Kompare may have problems applying the change to the destination file."
 msgstr ""
 
-#: main.cpp:68
-msgid "Cervisia diff viewer"
+#: libdialogpages/diffpage.cpp:338
+msgid "I&gnore added or removed empty lines"
 msgstr ""
 
-#: main.cpp:73
-msgid "This will compare URL1 with URL2"
+#: libdialogpages/diffpage.cpp:339
+msgid "This option corresponds to the -B diff option."
 msgstr ""
 
-#: main.cpp:74
+#: libdialogpages/diffpage.cpp:340
 msgid ""
-"This will open URL1 and expect it to be diff output. URL1 can also be a '-' "
-"and then it will read from standard input. Can be used for instance for cvs "
-"diff | kompare -o -. Kompare will do a check to see if it can find the "
-"original file(s) and then blend the original file(s) into the diffoutput and "
-"show that in the viewer. -n disables the check."
+"This can be very useful in situations where code has been reorganized and "
+"empty lines have been added or removed to improve legibility."
 msgstr ""
 
-#: main.cpp:75
-msgid ""
-"This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 "
-"the file or folder that the diffoutput needs to be blended into. "
+#: libdialogpages/diffpage.cpp:342
+msgid "Ig&nore changes in the amount of whitespace"
 msgstr ""
 
-#: main.cpp:76
-msgid ""
-"Disables the check for automatically finding the original file(s) when using "
-"'-' as URL with the -o option."
+#: libdialogpages/diffpage.cpp:343
+msgid "This option corresponds to the -b diff option."
 msgstr ""
 
-#: main.cpp:77
+#: libdialogpages/diffpage.cpp:344
 msgid ""
-"Use this to specify the encoding when calling it from the command line. It "
-"will default to the local encoding if not specified."
+"If you are uninterested in differences arising due to, for example, changes "
+"in indentation, then use this option."
 msgstr ""
 
-#: main.cpp:205
-msgid "Compare these files or folder"
+#: libdialogpages/diffpage.cpp:346
+msgid "Ign&ore all whitespace"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:176
-msgid "Save &All"
-msgstr "Cadw &Popeth"
+#: libdialogpages/diffpage.cpp:347
+msgid "This option corresponds to the -w diff option."
+msgstr ""
 
-#: komparepart/kompare_part.cpp:178
-msgid "Save &Diff..."
+#: libdialogpages/diffpage.cpp:348
+msgid ""
+"This is useful for seeing the significant changes without being overwhelmed "
+"by all the white space changes."
 msgstr ""
 
-#: komparepart/kompare_part.cpp:180
-msgid "Swap Source with Destination"
+#: libdialogpages/diffpage.cpp:350
+msgid "Igno&re changes due to tab expansion"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:182
-msgid "Show Statistics"
-msgstr "Dangos Ystadegau"
+#: libdialogpages/diffpage.cpp:351
+msgid "This option corresponds to the -E diff option."
+msgstr ""
 
-#: komparepart/kompare_part.cpp:185
-msgid "Refresh Diff"
+#: libdialogpages/diffpage.cpp:352
+msgid ""
+"If there is a change because tabs have been expanded into spaces in the "
+"other file, then this option will make sure that these do not show up. "
+"Kompare currently has some problems applying such changes so be careful when "
+"you use this option."
 msgstr ""
 
-#: komparepart/kompare_part.cpp:294 komparepart/kompare_part.cpp:305
-#, kde-format
-msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
+#. i18n: file: komparepart/komparesaveoptionsbase.ui:93
+#. i18n: ectx: property (title), widget (QGroupBox, m_OptionsGB)
+#: libdialogpages/diffpage.cpp:358 rc.cpp:32
+msgid "Options"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:343
-#, kde-format
-msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
+#: libdialogpages/diffpage.cpp:372
+msgid "File Pattern to Exclude"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:535
-msgid "Diff Options"
+#: libdialogpages/diffpage.cpp:373
+msgid ""
+"If this is checked you can enter a shell pattern in the text box on the "
+"right or select entries from the list."
 msgstr ""
 
-#: komparepart/kompare_part.cpp:553
-msgid "*.diff *.dif *.patch|Patch Files"
+#: libdialogpages/diffpage.cpp:379
+msgid ""
+"Here you can enter or remove a shell pattern or select one or more entries "
+"from the list."
 msgstr ""
 
-#: komparepart/kompare_part.cpp:553
-msgid "Save .diff"
+#: libdialogpages/diffpage.cpp:389
+msgid "File with Filenames to Exclude"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:556
-msgid "The file exists or is write-protected; do you want to overwrite it?"
+#: libdialogpages/diffpage.cpp:390
+msgid "If this is checked you can enter a filename in the combo box below."
 msgstr ""
 
-#: komparepart/kompare_part.cpp:556
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
+#: libdialogpages/diffpage.cpp:394
+msgid ""
+"Here you can enter the URL of a file with shell patterns to ignore during "
+"the comparison of the folders."
+msgstr ""
 
-#: komparepart/kompare_part.cpp:556
-msgid "Overwrite"
-msgstr "Trosysgrifo"
+#: libdialogpages/diffpage.cpp:398
+msgid ""
+"Any file you select in the dialog that pops up when you click it will be put "
+"in the dialog to the left of this button."
+msgstr ""
 
-#: komparepart/kompare_part.cpp:556
-msgid "Do Not Overwrite"
-msgstr "Peidio â Throsysgrifo"
+#: libdialogpages/diffpage.cpp:406
+msgid "Exclude"
+msgstr ""
 
-#: komparepart/kompare_part.cpp:636
-msgid "KomparePart"
-msgstr "KomparePart"
+#: libdialogpages/viewpage.cpp:57
+msgid "Colors"
+msgstr "Lliwiau"
 
-#: komparepart/kompare_part.cpp:649
-msgid "Running diff..."
+#: libdialogpages/viewpage.cpp:63
+msgid "Removed color:"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:652
-msgid "Parsing diff output..."
+#: libdialogpages/viewpage.cpp:70
+msgid "Changed color:"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:701
-#, kde-format
-msgid "Comparing file %1 with file %2"
+#: libdialogpages/viewpage.cpp:77
+msgid "Added color:"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:706
-#, kde-format
-msgid "Comparing files in %1 with files in %2"
+#: libdialogpages/viewpage.cpp:84
+msgid "Applied color:"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:711
-#, kde-format
-msgid "Viewing diff output from %1"
+#: libdialogpages/viewpage.cpp:94
+msgid "Mouse Wheel"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:714
-#, kde-format
-msgid "Blending diff output from %1 into file %2"
-msgstr ""
+#: libdialogpages/viewpage.cpp:98
+msgid "Number of lines:"
+msgstr "Nifel llinellau:"
 
-#: komparepart/kompare_part.cpp:719
-#, kde-format
-msgid "Blending diff output from %1 into folder %2"
+#: libdialogpages/viewpage.cpp:110
+msgid "Tabs to Spaces"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:770 komparepart/kompare_part.cpp:801
-#: komparepart/kompare_part.cpp:916
-msgid ""
-"You have made changes to the destination file(s).\n"
-"Would you like to save them?"
+#: libdialogpages/viewpage.cpp:114
+msgid "Number of spaces to convert a tab character to:"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:772 komparepart/kompare_part.cpp:803
-#: komparepart/kompare_part.cpp:918
-msgid "Save Changes?"
-msgstr "Cadw Newidiadau?"
+#: libdialogpages/viewpage.cpp:134
+msgid "Text Font"
+msgstr "Wynebfath y testun"
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:222
-#. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB)
-#: komparepart/kompare_part.cpp:847 rc.cpp:83
-msgid "RCS"
-msgstr ""
+#: libdialogpages/viewpage.cpp:138
+msgid "Font:"
+msgstr "Wynebfath:"
 
-#. i18n: file: komparepart/komparesaveoptionsbase.ui:208
-#. i18n: ectx: property (text), widget (QRadioButton, m_EdRB)
-#: komparepart/kompare_part.cpp:850 rc.cpp:77
-msgid "Ed"
+#: libdialogpages/viewpage.cpp:145
+msgid "Size:"
+msgstr "Maint:"
+
+#: libdialogpages/viewpage.cpp:155
+msgid "Fonts"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:873
-msgid ""
-"No diff file, or no 2 files have been diffed. Therefore no stats are "
-"available."
+#: komparenavtreepart/komparenavtreepart.cpp:63
+msgid "Source Folder"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:875 komparepart/kompare_part.cpp:889
-#: komparepart/kompare_part.cpp:905
-msgid "Diff Statistics"
+#: komparenavtreepart/komparenavtreepart.cpp:69
+msgid "Destination Folder"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:879
-#, kde-format
-msgid ""
-"Statistics:\n"
-"\n"
-"Old file: %1\n"
-"New file: %2\n"
-"\n"
-"Format: %3\n"
-"Number of hunks: %4\n"
-"Number of differences: %5"
+#: komparenavtreepart/komparenavtreepart.cpp:75
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
+
+#: komparenavtreepart/komparenavtreepart.cpp:75
+msgid "Destination File"
 msgstr ""
 
-#: komparepart/kompare_part.cpp:892
-#, kde-format
-msgid ""
-"Statistics:\n"
-"\n"
-"Number of files in diff file: %1\n"
-"Format: %2\n"
-"\n"
-"Current old file: %3\n"
-"Current new file: %4\n"
-"\n"
-"Number of hunks: %5\n"
-"Number of differences: %6"
+#: komparenavtreepart/komparenavtreepart.cpp:82
+msgid "Source Line"
 msgstr ""
 
-#: komparepart/kompareprefdlg.cpp:35
-msgid "Preferences"
-msgstr "Hoffterau"
+#: komparenavtreepart/komparenavtreepart.cpp:82
+msgid "Destination Line"
+msgstr ""
 
-#: komparepart/kompareprefdlg.cpp:45
-msgid "View"
+#: komparenavtreepart/komparenavtreepart.cpp:82
+msgid "Difference"
 msgstr ""
 
-#: komparepart/kompareprefdlg.cpp:47
-msgid "View Settings"
-msgstr "Gweld Gosodiadau"
+#: komparenavtreepart/komparenavtreepart.cpp:456
+#, kde-format
+msgid "Applied: Changes made to %1 line undone"
+msgid_plural "Applied: Changes made to  %1 lines undone"
+msgstr[0] ""
+msgstr[1] ""
 
-#: komparepart/kompareprefdlg.cpp:53
-msgid "Diff Settings"
-msgstr ""
+#: komparenavtreepart/komparenavtreepart.cpp:459
+#, kde-format
+msgid "Changed %1 line"
+msgid_plural "Changed %1 lines"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kompareurldialog.cpp:44
-msgid "Files"
-msgstr ""
+#: komparenavtreepart/komparenavtreepart.cpp:464
+#, kde-format
+msgid "Applied: Insertion of %1 line undone"
+msgid_plural "Applied: Insertion of %1 lines undone"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kompareurldialog.cpp:46
-msgid "Here you can enter the files you want to compare."
-msgstr ""
+#: komparenavtreepart/komparenavtreepart.cpp:467
+#, kde-format
+msgid "Inserted %1 line"
+msgid_plural "Inserted %1 lines"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kompareurldialog.cpp:54
-msgid "Here you can change the options for comparing the files."
-msgstr ""
+#: komparenavtreepart/komparenavtreepart.cpp:472
+#, kde-format
+msgid "Applied: Deletion of %1 line undone"
+msgid_plural "Applied: Deletion of %1 lines undone"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kompareurldialog.cpp:62
-msgid "Here you can change the options for the view."
-msgstr ""
+#: komparenavtreepart/komparenavtreepart.cpp:475
+#, kde-format
+msgid "Deleted %1 line"
+msgid_plural "Deleted %1 lines"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kompareurldialog.cpp:105
-msgid ""
-"File used for excluding files cannot be found, please specify another file."
-msgstr ""
+#: komparenavtreepart/komparenavtreepart.cpp:769
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
 
-#: rc.cpp:10
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:11
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
@@ -983,7 +974,7 @@
 #. i18n: ectx: Menu (file)
 #. i18n: file: komparepart/komparepartui.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:14 rc.cpp:23
+#: rc.cpp:5 rc.cpp:14
 msgid "&File"
 msgstr ""
 
@@ -991,96 +982,96 @@
 #. i18n: ectx: Menu (settings)
 #. i18n: file: komparepart/komparepartui.rc:29
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:6 rc.cpp:17 rc.cpp:29
+#: rc.cpp:8 rc.cpp:20
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: kompareui.rc:27
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:9 rc.cpp:20
+#: rc.cpp:11
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: komparepart/komparepartui.rc:17
 #. i18n: ectx: Menu (difference)
-#: rc.cpp:26
+#: rc.cpp:17
 msgid "&Difference"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:30
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox2)
-#: rc.cpp:32
+#: rc.cpp:23
 msgid "Run Diff In"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:65
 #. i18n: ectx: property (title), widget (QGroupBox, m_CommandLineGB)
-#: rc.cpp:35
+#: rc.cpp:26
 msgid "Command Line"
 msgstr "Llinell orchymyn"
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:80
 #. i18n: ectx: property (text), widget (QLabel, m_CommandLineLabel)
-#: rc.cpp:38
+#: rc.cpp:29
 msgid "cd dir && diff -udHprNa -- source destination"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:105
 #. i18n: ectx: property (text), widget (QCheckBox, m_SmallerChangesCB)
-#: rc.cpp:44
+#: rc.cpp:35
 msgid "Look for smaller changes"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:115
 #. i18n: ectx: property (text), widget (QCheckBox, m_LargeFilesCB)
-#: rc.cpp:47
+#: rc.cpp:38
 msgid "Optimize for large files"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:125
 #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreCaseCB)
-#: rc.cpp:50
+#: rc.cpp:41
 msgid "Ignore changes in case"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:132
 #. i18n: ectx: property (text), widget (QCheckBox, m_ExpandTabsCB)
-#: rc.cpp:53
+#: rc.cpp:44
 msgid "Expand tabs to spaces"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:139
 #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreEmptyLinesCB)
-#: rc.cpp:56
+#: rc.cpp:47
 msgid "Ignore added or removed empty lines"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:146
 #. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB)
-#: rc.cpp:59
+#: rc.cpp:50
 msgid "Ignore changes in whitespace"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:153
 #. i18n: ectx: property (text), widget (QCheckBox, m_FunctionNamesCB)
-#: rc.cpp:62
+#: rc.cpp:53
 msgid "Show function names"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:163
 #. i18n: ectx: property (text), widget (QCheckBox, m_RecursiveCB)
-#: rc.cpp:65
+#: rc.cpp:56
 msgid "Compare folders recursively"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:173
 #. i18n: ectx: property (text), widget (QCheckBox, m_NewFilesCB)
-#: rc.cpp:68
+#: rc.cpp:59
 msgid "Treat new files as empty"
 msgstr ""
 
 #. i18n: file: komparepart/komparesaveoptionsbase.ui:239
 #. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB)
-#: rc.cpp:89
+#: rc.cpp:80
 msgid "Side-by-side"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konqueror.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konqueror.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konqueror.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konqueror.po	2012-04-18 08:59:36.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: konqueror\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 18:11+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -20,361 +20,488 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:25+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: src/konqmainwindow.cpp:577
+#: src/konqprofiledlg.cpp:111
+msgctxt "@title:window"
+msgid "Profile Management"
+msgstr ""
+
+#: src/konqprofiledlg.cpp:114
+msgid "&Rename Profile"
+msgstr "&Ail-enwi Proffil"
+
+#: src/konqprofiledlg.cpp:115
+msgid "&Delete Profile"
+msgstr "&Dileu Proffil"
+
+#: src/konqsessiondlg.cpp:77
+msgctxt "@title:window"
+msgid "Manage Sessions"
+msgstr ""
+
+#: src/konqsessiondlg.cpp:81
+msgid "&Open"
+msgstr ""
+
+#: src/konqsessiondlg.cpp:175
+msgctxt "@title:window"
+msgid "Rename Session"
+msgstr ""
+
+#: src/konqsessiondlg.cpp:223
+msgctxt "@title:window"
+msgid "Save Session"
+msgstr ""
+
+#: src/konqsessiondlg.cpp:247
+#, kde-format
+msgid ""
+"A session with the name '%1' already exists, do you want to overwrite it?"
+msgstr ""
+
+#: src/konqsessiondlg.cpp:248
+msgctxt "@title:window"
+msgid "Session exists. Overwrite?"
+msgstr ""
+
+#: src/konqundomanager.cpp:110 src/konqundomanager.cpp:266
+msgid "Und&o: Closed Tab"
+msgstr ""
+
+#: src/konqundomanager.cpp:112 src/konqundomanager.cpp:120
+#: src/konqundomanager.cpp:162
+msgid "Und&o: Closed Window"
+msgstr ""
+
+#: src/konqundomanager.cpp:122
+msgid "Und&o"
+msgstr ""
+
+#: src/konqframestatusbar.cpp:116
+msgid ""
+"Checking this box on at least two views sets those views as 'linked'. Then, "
+"when you change directories in one view, the other views linked with it will "
+"automatically update to show the current directory. This is especially "
+"useful with different types of views, such as a directory tree with an icon "
+"view or detailed view, and possibly a terminal emulator window."
+msgstr ""
+"Mae llenwi'r y blwch yma, ar o leiaf dau olwg, yn 'cysylltu'  y golygon "
+"hynny at ei gilydd. Wedyn, pan newidiwch gyfeiriadur mewn un golwg, "
+"diweddara'r golygon cysylltiedig eraill yn awtomatig i ddangos y cyfeiriadur "
+"cyfredol. Mae hyn yn arbennig o ddefnyddiol gyda golygon o sawl math "
+"gwahanol, megis coeden cyfeiriaduron â golwg eiconig neu manwl, a ffenestr "
+"efelychu terfynell o bosib."
+
+#: src/konqframestatusbar.cpp:163
+msgid "Close View"
+msgstr ""
+
+#: src/konqframestatusbar.cpp:243
+#, kde-format
+msgid "%1/s"
+msgstr "%1/s"
+
+#: src/konqframestatusbar.cpp:245
+msgid "Stalled"
+msgstr "Wedi Seibio"
+
+#: src/konqmain.cpp:97
+msgid "Start without a default window, when called without URLs"
+msgstr ""
+
+#: src/konqmain.cpp:99
+msgid ""
+"Preload for later use. This mode does not support URLs on the command line"
+msgstr ""
+
+#: src/konqmain.cpp:101
+msgid "Profile to open"
+msgstr ""
+
+#: src/konqmain.cpp:103
+msgid "List available profiles"
+msgstr ""
+
+#: src/konqmain.cpp:105
+msgid "List available sessions"
+msgstr ""
+
+#: src/konqmain.cpp:107
+msgid "Session to open"
+msgstr ""
+
+#: src/konqmain.cpp:109
+msgid "Mimetype to use for this URL (e.g. text/html or inode/directory)"
+msgstr ""
+
+#: src/konqmain.cpp:110
+msgid "Part to use (e.g. khtml or kwebkitpart)"
+msgstr ""
+
+#: src/konqmain.cpp:112
+msgid ""
+"For URLs that point to files, opens the directory and selects the file, "
+"instead of opening the actual file"
+msgstr ""
+
+#: src/konqmain.cpp:114
+msgid "Location to open"
+msgstr ""
+
+#: src/konqmainwindow.cpp:588
 msgctxt "@title:tab"
 msgid "Loading..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:1646
+#: src/konqmainwindow.cpp:1612
 msgid "Canceled."
 msgstr "Wedi'i ddiddymu"
 
-#: src/konqmainwindow.cpp:1678
+#: src/konqmainwindow.cpp:1644
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Reloading the page will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:1626 src/konqmainwindow.cpp:2353
-#: src/konqmainwindow.cpp:2431 src/konqmainwindow.cpp:2461
-#: src/konqmainwindow.cpp:2503 src/konqmainwindow.cpp:2525
-#: src/konqmainwindow.cpp:4987 src/konqviewmanager.cpp:1427
+#: src/konqmainwindow.cpp:1645 src/konqmainwindow.cpp:2372
+#: src/konqmainwindow.cpp:2452 src/konqmainwindow.cpp:2482
+#: src/konqmainwindow.cpp:2524 src/konqmainwindow.cpp:2546
+#: src/konqmainwindow.cpp:5032 src/konqviewmanager.cpp:1423
 msgctxt "@title:window"
 msgid "Discard Changes?"
 msgstr ""
 
-#: src/konqmainwindow.cpp:1679 src/konqmainwindow.cpp:2401
-#: src/konqmainwindow.cpp:2425 src/konqmainwindow.cpp:2515
-#: src/konqmainwindow.cpp:2533 src/konqmainwindow.cpp:2556
-#: src/konqmainwindow.cpp:2608 src/konqmainwindow.cpp:2641
-#: src/konqmainwindow.cpp:5087 src/konqviewmanager.cpp:1409
+#: src/konqmainwindow.cpp:1645 src/konqmainwindow.cpp:2372
+#: src/konqmainwindow.cpp:2452 src/konqmainwindow.cpp:2482
+#: src/konqmainwindow.cpp:2524 src/konqmainwindow.cpp:2547
+#: src/konqmainwindow.cpp:5032 src/konqviewmanager.cpp:1423
 msgid "&Discard Changes"
 msgstr "&Taflu Newidiadau"
 
-#: src/konqmainwindow.cpp:1785
+#: src/konqmainwindow.cpp:1755
 msgid "File Management"
 msgstr ""
 
-#: src/konqmainwindow.cpp:1801 about/konq_aboutpage.cc:220
+#: src/konqmainwindow.cpp:1771 about/konq_aboutpage.cc:205
 msgid "Web Browsing"
 msgstr "Pori'r Wê"
 
-#: src/konqmainwindow.cpp:2057 src/konqmainwindow.cpp:2063
+#: src/konqmainwindow.cpp:2031 src/konqmainwindow.cpp:2037
+#: about/konq_aboutpage.cc:91
 msgid "Home Folder"
 msgstr "Plygell Cartref"
 
-#: src/konqmainwindow.cpp:2058 src/konqmainwindow.cpp:3617
+#: src/konqmainwindow.cpp:2032 src/konqmainwindow.cpp:3540
 msgid "Home"
 msgstr "Cartref"
 
-#: src/konqmainwindow.cpp:2064
+#: src/konqmainwindow.cpp:2038
 msgid "Navigate to your 'Home Folder'"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2065
+#: src/konqmainwindow.cpp:2039
 msgid "Navigate to your local 'Home Folder'"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:11
 #. i18n: ectx: label, entry, group (UserSettings)
-#: src/konqmainwindow.cpp:2068 rc.cpp:104
+#: src/konqmainwindow.cpp:2042 rc.cpp:101
 msgid "Home Page"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2070
+#: src/konqmainwindow.cpp:2044
 msgid "Navigate to your 'Home Page'"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2071
+#: src/konqmainwindow.cpp:2045
 msgid ""
 "<html>Navigate to your 'Home Page'<br /><br />You can configure the location "
 "where this button takes you under <b>Settings -> Configure Konqueror -> "
 "General</b>.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2400 src/konqmainwindow.cpp:2424
+#: src/konqmainwindow.cpp:2371
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Detaching the tab will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:2514
+#: src/konqmainwindow.cpp:2451
 msgid ""
 "This view contains changes that have not been submitted.\n"
 "Closing the view will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:2532 src/konqmainwindow.cpp:2555
+#: src/konqmainwindow.cpp:2481
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing the tab will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:2588
+#: src/konqmainwindow.cpp:2507
 msgid "Do you really want to close all other tabs?"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2487
+#: src/konqmainwindow.cpp:2508
 msgctxt "@title:window"
 msgid "Close Other Tabs Confirmation"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2589 src/konqmainwindow.cpp:3710
-#: src/konqtabs.cpp:357
+#: src/konqmainwindow.cpp:2508 src/konqmainwindow.cpp:3633
+#: src/konqtabs.cpp:352
 msgid "Close &Other Tabs"
 msgstr "Cau Tabiau &Eraill"
 
-#: src/konqmainwindow.cpp:2607
+#: src/konqmainwindow.cpp:2523
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing other tabs will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:2640
+#: src/konqmainwindow.cpp:2545
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Reloading all tabs will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:2567
+#: src/konqmainwindow.cpp:2588
 msgctxt "@title:window"
 msgid "Enter Target"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2693
+#: src/konqmainwindow.cpp:2597
 #, kde-format
 msgid "<qt><b>%1</b> is not valid</qt>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2708
+#: src/konqmainwindow.cpp:2612
 #, kde-format
 msgid "Copy selected files from %1 to:"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2717
+#: src/konqmainwindow.cpp:2621
 #, kde-format
 msgid "Move selected files from %1 to:"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2898
+#: src/konqmainwindow.cpp:2808
 msgctxt "This menu entry empties the closed items history"
 msgid "Empty Closed Items History"
 msgstr ""
 
-#: src/konqmainwindow.cpp:2923
+#: src/konqmainwindow.cpp:2833
 msgid "Save As..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:2925
+#: src/konqmainwindow.cpp:2835
 msgid "Manage..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:3517
+#: src/konqmainwindow.cpp:3440
 msgid "New &Window"
 msgstr "&Ffenestr Newydd"
 
-#: src/konqmainwindow.cpp:3522
+#: src/konqmainwindow.cpp:3445
 msgid "&Duplicate Window"
 msgstr "&Dyblygu Ffenestr"
 
-#: src/konqmainwindow.cpp:3527
+#: src/konqmainwindow.cpp:3450
 msgid "Send &Link Address..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:3531
+#: src/konqmainwindow.cpp:3454
 msgid "S&end File..."
 msgstr "A&nfon Ffeil"
 
-#: src/konqmainwindow.cpp:3535
+#: src/konqmainwindow.cpp:3458
 msgid "&Open Location"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3541
+#: src/konqmainwindow.cpp:3464
 msgid "&Open File..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:3546
+#: src/konqmainwindow.cpp:3469
 msgid "&Find File..."
 msgstr "&Canfod Ffeil..."
 
-#: src/konqmainwindow.cpp:3555
+#: src/konqmainwindow.cpp:3478
 msgid "&Use index.html"
 msgstr "&Defnyddio index.html"
 
-#: src/konqmainwindow.cpp:3558
+#: src/konqmainwindow.cpp:3481
 msgid "Lock to Current Location"
 msgstr "Cloi i'r Lleoliad Cyfredol"
 
-#: src/konqmainwindow.cpp:3561
+#: src/konqmainwindow.cpp:3484
 msgctxt "This option links konqueror views"
 msgid "Lin&k View"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3566
+#: src/konqmainwindow.cpp:3489
 msgid "&Up"
 msgstr "I &Fyny"
 
-#: src/konqmainwindow.cpp:3578
+#: src/konqmainwindow.cpp:3501
 msgid "Closed Items"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3592
+#: src/konqmainwindow.cpp:3515
 msgid "Sessions"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3623
+#: src/konqmainwindow.cpp:3546
 msgctxt "@action:inmenu Go"
 msgid "Most Often Visited"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3627
+#: src/konqmainwindow.cpp:3550
 msgctxt "@action:inmenu Go"
 msgid "Recently Visited"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3636
+#: src/konqmainwindow.cpp:3559
 msgctxt "@action:inmenu Go"
 msgid "Show History"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3642
+#: src/konqmainwindow.cpp:3565
 msgid "&Save View Profile As..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:3663
+#: src/konqmainwindow.cpp:3586
 msgid "Configure Extensions..."
 msgstr ""
 
-#: src/konqmainwindow.cpp:3667
+#: src/konqmainwindow.cpp:3590
 msgid "Configure Spell Checking..."
 msgstr "Ffurfweddu Gwirio Sillafu..."
 
-#: src/konqmainwindow.cpp:3673
+#: src/konqmainwindow.cpp:3596
 msgid "Split View &Left/Right"
 msgstr "Hollti Golwg &Chwith/Dde"
 
-#: src/konqmainwindow.cpp:3678
+#: src/konqmainwindow.cpp:3601
 msgid "Split View &Top/Bottom"
 msgstr "Hollti Golwg &Pen/Gwaelod"
 
-#: src/konqmainwindow.cpp:3683 src/konqtabs.cpp:470
+#: src/konqmainwindow.cpp:3606 src/konqtabs.cpp:463
 msgid "&New Tab"
 msgstr "Tab &Newydd"
 
-#: src/konqmainwindow.cpp:3689
+#: src/konqmainwindow.cpp:3612
 msgid "&Duplicate Current Tab"
 msgstr "&Dyblygu'r Tab Cyfredol"
 
-#: src/konqmainwindow.cpp:3694
+#: src/konqmainwindow.cpp:3617
 msgid "Detach Current Tab"
 msgstr "Datglymu'r Tab Cyfredol"
 
-#: src/konqmainwindow.cpp:3699
+#: src/konqmainwindow.cpp:3622
 msgid "&Close Active View"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3704
+#: src/konqmainwindow.cpp:3627
 msgid "Close Current Tab"
 msgstr "Cau'r Tab Cyfredol"
 
-#: src/konqmainwindow.cpp:3714
+#: src/konqmainwindow.cpp:3637
 msgid "Activate Next Tab"
 msgstr "Gweithredu'r Tab Nesaf"
 
-#: src/konqmainwindow.cpp:3718
+#: src/konqmainwindow.cpp:3641
 msgid "Activate Previous Tab"
 msgstr "Gweithredu'r Tab Cynt"
 
-#: src/konqmainwindow.cpp:3726
+#: src/konqmainwindow.cpp:3649
 #, kde-format
 msgid "Activate Tab %1"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3731
+#: src/konqmainwindow.cpp:3654
 msgid "Move Tab Left"
 msgstr "Symud Tab i'r Chwith"
 
-#: src/konqmainwindow.cpp:3736
+#: src/konqmainwindow.cpp:3659
 msgid "Move Tab Right"
 msgstr "Symud Tab i'r Dde"
 
-#: src/konqmainwindow.cpp:3744
+#: src/konqmainwindow.cpp:3667
 msgid "Dump Debug Info"
 msgstr "Tomenu Gwybodaeth Dadnamu"
 
-#: src/konqmainwindow.cpp:3749
+#: src/konqmainwindow.cpp:3672
 msgid "C&onfigure View Profiles..."
 msgstr "Ff&urfweddu Proffilau Golwg..."
 
-#: src/konqmainwindow.cpp:3751
+#: src/konqmainwindow.cpp:3674
 msgid "Load &View Profile"
 msgstr "Llwytho Proffil &Golwg"
 
-#: src/konqmainwindow.cpp:3767 sidebar/web_module/web_module.cpp:68
+#: src/konqmainwindow.cpp:3690 sidebar/web_module/web_module.cpp:68
 msgid "&Reload"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3772 src/konqtabs.cpp:334
+#: src/konqmainwindow.cpp:3695 src/konqtabs.cpp:329
 msgid "&Reload All Tabs"
 msgstr "&Ail-lwytho bob tab"
 
-#: src/konqmainwindow.cpp:3780
+#: src/konqmainwindow.cpp:3703
 msgid "&Force Reload"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3802
+#: src/konqmainwindow.cpp:3725
 msgid "&Stop"
 msgstr "&Atal"
 
-#: src/konqmainwindow.cpp:3669
+#: src/konqmainwindow.cpp:3735
 msgid "Throbber"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3811 src/konqmainwindow.cpp:3814
+#: src/konqmainwindow.cpp:3739 src/konqmainwindow.cpp:3742
 msgid "L&ocation: "
 msgstr "Ll&eoliad: "
 
-#: src/konqmainwindow.cpp:3821
+#: src/konqmainwindow.cpp:3749
 msgid "Location Bar"
 msgstr "Bar Lleoliad"
 
-#: src/konqmainwindow.cpp:3827
+#: src/konqmainwindow.cpp:3755
 msgid ""
 "<html>Location Bar<br /><br />Enter a web address or search term.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3831
+#: src/konqmainwindow.cpp:3759
 msgid "Clear Location Bar"
 msgstr "Clirio'r Bar Lleoliad"
 
-#: src/konqmainwindow.cpp:3835
+#: src/konqmainwindow.cpp:3763
 msgid ""
 "<html>Clear Location bar<br /><br />Clears the contents of the location "
 "bar.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3840
+#: src/konqmainwindow.cpp:3768
 msgid "&Bookmarks"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3857
+#: src/konqmainwindow.cpp:3792
 msgid "Kon&queror Introduction"
 msgstr "Cyflwyniad Kon&queror"
 
-#: src/konqmainwindow.cpp:3862
+#: src/konqmainwindow.cpp:3797
 msgid "Go"
 msgstr "Ewch"
 
-#: src/konqmainwindow.cpp:3864
+#: src/konqmainwindow.cpp:3799
 msgid ""
 "<html>Go<br /><br />Goes to the page that has been entered into the location "
 "bar.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3870
+#: src/konqmainwindow.cpp:3805
 #, kde-format
 msgid ""
 "<html>Enter the parent folder<br /><br />For instance, if the current "
@@ -382,52 +509,52 @@
 "file:/home.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3873
+#: src/konqmainwindow.cpp:3808
 msgid "Enter the parent folder"
 msgstr "Mynd i mewn i'r blygell riant"
 
-#: src/konqmainwindow.cpp:3875 src/konqmainwindow.cpp:3876
+#: src/konqmainwindow.cpp:3810 src/konqmainwindow.cpp:3811
 msgid "Move backwards one step in the browsing history"
 msgstr "Symud yn ôl un cam drwy'r hanes pori"
 
-#: src/konqmainwindow.cpp:3878 src/konqmainwindow.cpp:3879
+#: src/konqmainwindow.cpp:3813 src/konqmainwindow.cpp:3814
 msgid "Move forward one step in the browsing history"
 msgstr "Symud ymlaen un cam drwy'r hanes pori"
 
-#: src/konqmainwindow.cpp:3882 src/konqmainwindow.cpp:3883
+#: src/konqmainwindow.cpp:3817 src/konqmainwindow.cpp:3818
 msgid "Move backwards one step in the closed tabs history"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3886
+#: src/konqmainwindow.cpp:3821
 msgid ""
 "<html>Reload the currently displayed document<br /><br />This may, for "
 "example, be needed to refresh web pages that have been modified since they "
 "were loaded, in order to make the changes visible.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3889
+#: src/konqmainwindow.cpp:3824
 msgid "Reload the currently displayed document"
 msgstr "Ail-lwytho'r ddogfen arddangosedig cyfredol"
 
-#: src/konqmainwindow.cpp:3891
+#: src/konqmainwindow.cpp:3826
 msgid ""
 "<html>Reload all currently displayed documents in tabs<br /><br />This may, "
 "for example, be needed to refresh web pages that have been modified since "
 "they were loaded, in order to make the changes visible.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3894
+#: src/konqmainwindow.cpp:3829
 msgid "Reload all currently displayed document in tabs"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3896
+#: src/konqmainwindow.cpp:3831
 msgid ""
 "<html>Stop loading the document<br /><br />All network transfers will be "
 "stopped and Konqueror will display the content that has been received so "
 "far.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3900
+#: src/konqmainwindow.cpp:3835
 msgid ""
 "<html>Reload the currently displayed document<br /><br />This may, for "
 "example, be needed to refresh web pages that have been modified since they "
@@ -435,48 +562,48 @@
 "are downloaded again, even if cached copies exist.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3904
+#: src/konqmainwindow.cpp:3839
 msgid ""
 "Force a reload of the currently displayed document and any contained images"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3907
+#: src/konqmainwindow.cpp:3842
 msgid "Stop loading the document"
 msgstr "Atal llwytho'r ddogfen"
 
-#: src/konqmainwindow.cpp:3909
+#: src/konqmainwindow.cpp:3844
 msgid ""
 "<html>Cut the currently selected text or item(s) and move it to the system "
 "clipboard<br /><br />This makes it available to the <b>Paste</b> command in "
 "Konqueror and other KDE applications.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3913
+#: src/konqmainwindow.cpp:3848
 msgid "Move the selected text or item(s) to the clipboard"
 msgstr "Symud y testun neu eitem(au) dewisiedig i'r gludfwrdd"
 
-#: src/konqmainwindow.cpp:3915
+#: src/konqmainwindow.cpp:3850
 msgid ""
 "<html>Copy the currently selected text or item(s) to the system clipboard<br "
 "/><br />This makes it available to the <b>Paste</b> command in Konqueror and "
 "other KDE applications.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3919
+#: src/konqmainwindow.cpp:3854
 msgid "Copy the selected text or item(s) to the clipboard"
 msgstr "Copïo'r testun neu eitem(au) dewisiedig cyfredol i'r clipfwrdd"
 
-#: src/konqmainwindow.cpp:3921
+#: src/konqmainwindow.cpp:3856
 msgid ""
 "<html>Paste the previously cut or copied clipboard contents<br /><br />This "
 "also works for text copied or cut from other KDE applications.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3924
+#: src/konqmainwindow.cpp:3859
 msgid "Paste the clipboard contents"
 msgstr "Gludo cynnwys y gludfwrdd"
 
-#: src/konqmainwindow.cpp:3926
+#: src/konqmainwindow.cpp:3861
 msgid ""
 "<html>Print the currently displayed document<br /><br />You will be "
 "presented with a dialog where you can set various options, such as the "
@@ -485,21 +612,21 @@
 "file from the current document.</html>"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3932
+#: src/konqmainwindow.cpp:3867
 msgid "Print the current document"
 msgstr "Argraffu'r ddogfen cyfredol"
 
-#: src/konqmainwindow.cpp:3938
+#: src/konqmainwindow.cpp:3873
 msgid "If present, open index.html when entering a folder."
 msgstr "Agor index.html wrth fynd i blygell, os mae'n bresennol."
 
-#: src/konqmainwindow.cpp:3939
+#: src/konqmainwindow.cpp:3874
 msgid ""
 "A locked view cannot change folders. Use in combination with 'link view' to "
 "explore many files from one folder"
 msgstr ""
 
-#: src/konqmainwindow.cpp:3940
+#: src/konqmainwindow.cpp:3875
 msgid ""
 "Sets the view as 'linked'. A linked view follows folder changes made in "
 "other linked views."
@@ -507,121 +634,121 @@
 "Gosoda'r golwg yn 'olwg gyswllt'. Dilyna golygion cyswllt newidion plygell a "
 "wnaed mewn golygon cyswllt eraill."
 
-#: src/konqmainwindow.cpp:4122
+#: src/konqmainwindow.cpp:4058
 msgid "Copy &Files..."
 msgstr "Copïo &Ffeiliau..."
 
-#: src/konqmainwindow.cpp:4126
+#: src/konqmainwindow.cpp:4062
 msgid "M&ove Files..."
 msgstr "S&ymud Ffeiliau..."
 
-#: src/konqmainwindow.cpp:4474
+#: src/konqmainwindow.cpp:4412
 msgid ""
 "You have requested to open more than 20 bookmarks in tabs. This might take a "
 "while. Continue?"
 msgstr ""
 
-#: src/konqmainwindow.cpp:4374
+#: src/konqmainwindow.cpp:4414
 msgctxt "@title:window"
 msgid "Open bookmarks folder in new tabs"
 msgstr ""
 
-#: src/konqmainwindow.cpp:4642
+#: src/konqmainwindow.cpp:4581
 msgid "Open in T&his Window"
 msgstr "Agor yn y Ffenest &Hon"
 
-#: src/konqmainwindow.cpp:4643
+#: src/konqmainwindow.cpp:4582
 msgid "Open the document in current window"
 msgstr ""
 
-#: src/konqmainwindow.cpp:4649 src/konqhistoryview.cpp:62
+#: src/konqmainwindow.cpp:4588 src/konqhistoryview.cpp:62
 #: sidebar/web_module/web_module.cpp:61
 msgid "Open in New &Window"
 msgstr "Agor mewn Ffenestr &Newydd"
 
-#: src/konqmainwindow.cpp:4650
+#: src/konqmainwindow.cpp:4589
 msgid "Open the document in a new window"
 msgstr "Agor y ddogfen mewn ffenestr newydd"
 
-#: src/konqmainwindow.cpp:4656
+#: src/konqmainwindow.cpp:4595
 msgid "Open in &New Tab"
 msgstr "Agor mewn Tab &Newydd"
 
-#: src/konqmainwindow.cpp:4658
+#: src/konqmainwindow.cpp:4597
 msgid "Open the document in a new tab"
 msgstr "Agor y ddogfen mewn tab newydd"
 
-#: src/konqmainwindow.cpp:4868
+#: src/konqmainwindow.cpp:4809
 msgid "&Open With"
 msgstr ""
 
-#: src/konqmainwindow.cpp:4882
+#: src/konqmainwindow.cpp:4823
 #, kde-format
 msgid "Open with %1"
 msgstr "Agor gyda %1"
 
-#: src/konqmainwindow.cpp:4928
+#: src/konqmainwindow.cpp:4869
 msgctxt "@action:inmenu View"
 msgid "&View Mode"
 msgstr ""
 
-#: src/konqmainwindow.cpp:5047
+#: src/konqmainwindow.cpp:4995
 msgid ""
 "You have multiple tabs open in this window, are you sure you want to quit?"
 msgstr ""
 
-#: src/konqmainwindow.cpp:4952 src/konqviewmanager.cpp:1413
+#: src/konqmainwindow.cpp:4997 src/konqviewmanager.cpp:1409
 msgctxt "@title:window"
 msgid "Confirmation"
 msgstr ""
 
-#: src/konqmainwindow.cpp:5051
+#: src/konqmainwindow.cpp:4999
 msgid "C&lose Current Tab"
 msgstr "C&au'r Tab Cyfredol"
 
-#: src/konqmainwindow.cpp:5084
+#: src/konqmainwindow.cpp:5028
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing the window will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:5085
+#: src/konqmainwindow.cpp:5029
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Closing the window will discard these changes."
 msgstr ""
 
-#: src/konqmainwindow.cpp:5126 src/konqmainwindow.cpp:5186
+#: src/konqmainwindow.cpp:5070 src/konqmainwindow.cpp:5130
 #: src/konqclosedwindowsmanager.cpp:418
 msgid "no name"
 msgstr ""
 
-#: src/konqmainwindow.cpp:5253
+#: src/konqmainwindow.cpp:5197
 msgid ""
 "Your sidebar is not functional or unavailable. A new entry cannot be added."
 msgstr ""
 "Nid yw'ch bar ochr yn gweithio, neu nid yw ar gael. Nid oes modd ychwanegu "
 "cofnod newydd."
 
-#: src/konqmainwindow.cpp:5152 src/konqmainwindow.cpp:5159
+#: src/konqmainwindow.cpp:5197 src/konqmainwindow.cpp:5204
 msgctxt "@title:window"
 msgid "Web Sidebar"
 msgstr ""
 
-#: src/konqmainwindow.cpp:5258
+#: src/konqmainwindow.cpp:5202
 #, kde-format
 msgid "Add new web extension \"%1\" to your sidebar?"
 msgstr "Ychwanegu estyniad gwê newydd \"%1\" i'ch bar ochr?"
 
-#: src/konqmainwindow.cpp:5260
+#: src/konqmainwindow.cpp:5204
 msgid "Add"
 msgstr ""
 
-#: src/konqmainwindow.cpp:5260
+#: src/konqmainwindow.cpp:5204
 msgid "Do Not Add"
 msgstr "Na Ychwaneger"
 
-#: src/konqmainwindow.cpp:5562
+#: src/konqmainwindow.cpp:5517
 #, kde-format
 msgid ""
 "There appears to be a configuration error. You have associated Konqueror "
@@ -630,156 +757,17 @@
 "Ymddengys bod gwall ffurfweddu.  Rydych wedi cysylltu Konqueror efo %1, ond "
 "ni all drin y math yma o ffeil."
 
-#: src/konqprofiledlg.cpp:111
-msgctxt "@title:window"
-msgid "Profile Management"
-msgstr ""
-
-#: src/konqprofiledlg.cpp:115
-msgid "&Rename Profile"
-msgstr "&Ail-enwi Proffil"
-
-#: src/konqprofiledlg.cpp:116
-msgid "&Delete Profile"
-msgstr "&Dileu Proffil"
-
-#: src/konqsessionmanager.cpp:343
-msgid ""
-"Konqueror did not close correctly. Would you like to restore the previous "
-"session?"
-msgstr ""
-
-#: src/konqsessionmanager.cpp:332
-msgctxt "@title:window"
-msgid "Restore Session?"
-msgstr ""
-
-#: src/konqsessionmanager.cpp:346
-msgid "Restore Session"
-msgstr ""
-
-#: src/konqsessionmanager.cpp:347
-msgid "Do Not Restore"
-msgstr ""
-
-#: src/konqsessionmanager.cpp:348
-msgid "Ask Me Later"
-msgstr ""
-
-#: src/konqmain.cpp:97
-msgid "Start without a default window, when called without URLs"
-msgstr ""
-
-#: src/konqmain.cpp:99
-msgid ""
-"Preload for later use. This mode does not support URLs on the command line"
-msgstr ""
-
-#: src/konqmain.cpp:56
-msgid "Profile to open"
-msgstr ""
-
-#: src/konqmain.cpp:58
-msgid "List available profiles"
-msgstr ""
-
-#: src/konqmain.cpp:60
-msgid "List available sessions"
-msgstr ""
-
-#: src/konqmain.cpp:62
-msgid "Session to open"
-msgstr ""
-
-#: src/konqmain.cpp:64
-msgid "Mimetype to use for this URL (e.g. text/html or inode/directory)"
-msgstr ""
-
-#: src/konqmain.cpp:110
-msgid "Part to use (e.g. khtml or kwebkitpart)"
-msgstr ""
-
-#: src/konqmain.cpp:66
-msgid ""
-"For URLs that point to files, opens the directory and selects the file, "
-"instead of opening the actual file"
-msgstr ""
-
-#: src/konqmain.cpp:68
-msgid "Location to open"
-msgstr ""
-
-#: src/konqextensionmanager.cpp:54
-msgctxt "@title:window"
-msgid "Configure"
-msgstr ""
-
-#: src/konqextensionmanager.cpp:75 src/konqextensionmanager.cpp:78
-#: src/konqextensionmanager.cpp:79
-msgid "Extensions"
-msgstr ""
-
-#: src/konqundomanager.cpp:110 src/konqundomanager.cpp:266
-msgid "Und&o: Closed Tab"
-msgstr ""
-
-#: src/konqundomanager.cpp:112 src/konqundomanager.cpp:120
-#: src/konqundomanager.cpp:162
-msgid "Und&o: Closed Window"
-msgstr ""
-
-#: src/konqundomanager.cpp:122
-msgid "Und&o"
-msgstr ""
-
-#: src/konqhistorydialog.cpp:44
-msgctxt "@title:window"
-msgid "History"
-msgstr ""
-
-#: src/konqhistorydialog.cpp:60 src/konqhistoryview.cpp:143
-msgctxt "@action:inmenu Parent of 'By Name' and 'By Date'"
-msgid "Sort"
-msgstr ""
-
-#: src/konqtabs.cpp:66
-msgid ""
-"This bar contains the list of currently open tabs. Click on a tab to make it "
-"active. You can also use keyboard shortcuts to navigate through tabs. The "
-"text on the tab shows the content currently open in it; place your mouse "
-"over the tab to see the full title, in case it has been shortened to fit the "
-"tab width."
-msgstr ""
-
-#: src/konqtabs.cpp:102
-msgid "Open a new tab"
-msgstr "Agor tab newydd"
-
-#: src/konqtabs.cpp:111
-msgid "Close the current tab"
-msgstr "Cau'r tab cyfredol"
-
-#: src/konqtabs.cpp:475
-msgid "&Duplicate Tab"
-msgstr "&Dyblygu Tab"
-
-#: src/konqtabs.cpp:480
-msgid "&Reload Tab"
-msgstr ""
-
-#: src/konqtabs.cpp:487
-msgid "Other Tabs"
+#: src/konqguiclients.cpp:66
+#, kde-format
+msgid "Preview &in %1"
 msgstr ""
 
-#: src/konqtabs.cpp:492
-msgid "D&etach Tab"
-msgstr "D&atglymu Tab"
-
-#: src/konqtabs.cpp:498
-msgid "&Close Tab"
-msgstr "&Cau Tab"
+#: src/konqguiclients.cpp:135
+#, kde-format
+msgid "Show %1"
+msgstr "Dangos %1"
 
-#: src/konqview.cpp:1233
+#: src/konqview.cpp:1203
 msgid ""
 "The page you are trying to view is the result of posted form data. If you "
 "resend the data, any action the form carried out (such as search or online "
@@ -794,105 +782,31 @@
 msgid "Warning"
 msgstr ""
 
-#: src/konqview.cpp:1235
+#: src/konqview.cpp:1205
 msgid "Resend"
 msgstr "Ail-anfon"
 
-#: src/konqhistorymodel.cpp:137
-#, kde-format
+#: src/konqsessionmanager.cpp:330
 msgid ""
-"<qt><center><b>%1</b></center><hr />Last visited: %2<br />First visited: "
-"%3<br />Number of times visited: %4</qt>"
-msgstr ""
-
-#: src/konqhistorymodel.cpp:233
-msgid "Local"
-msgstr ""
-
-#: src/konqhistorymodel.cpp:236
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/konqsessiondlg.cpp:77
-msgctxt "@title:window"
-msgid "Manage Sessions"
-msgstr ""
-
-#: src/konqsessiondlg.cpp:83
-msgid "&Open"
-msgstr ""
-
-#: src/konqsessiondlg.cpp:175
-msgctxt "@title:window"
-msgid "Rename Session"
-msgstr ""
-
-#: src/konqsessiondlg.cpp:223
-msgctxt "@title:window"
-msgid "Save Session"
-msgstr ""
-
-#: src/konqsessiondlg.cpp:253
-#, kde-format
-msgid ""
-"A session with the name '%1' already exists, do you want to overwrite it?"
+"Konqueror did not close correctly. Would you like to restore the previous "
+"session?"
 msgstr ""
 
-#: src/konqsessiondlg.cpp:248
+#: src/konqsessionmanager.cpp:332
 msgctxt "@title:window"
-msgid "Session exists. Overwrite?"
-msgstr ""
-
-#: src/konqguiclients.cpp:66
-#, kde-format
-msgid "Preview &in %1"
-msgstr ""
-
-#: src/konqguiclients.cpp:135
-#, kde-format
-msgid "Show %1"
-msgstr "Dangos %1"
-
-#: src/konqhistoryview.cpp:67 sidebar/trees/konq_sidebartree.cpp:235
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:94
-msgid "Open in New Tab"
-msgstr "Agor mewn Tab Newydd"
-
-#: src/konqhistoryview.cpp:71
-msgid "&Copy Link Address"
+msgid "Restore Session?"
 msgstr ""
 
-#: src/konqhistoryview.cpp:76
-msgid "&Remove Entry"
-msgstr "&Gwaredu Cofnod"
-
-#: src/konqhistoryview.cpp:83
-msgid "C&lear History"
-msgstr "C&lirio'r Hanes"
-
-#: src/konqhistoryview.cpp:88
-msgid "&Preferences..."
+#: src/konqsessionmanager.cpp:333
+msgid "Restore Session"
 msgstr ""
 
-#: src/konqhistoryview.cpp:95
-msgid "By &Name"
-msgstr "Gan &Enw"
-
-#: src/konqhistoryview.cpp:101
-msgid "By &Date"
-msgstr "Gan &Ddyddiad"
-
-#: src/konqhistoryview.cpp:111
-msgid "Search in history"
+#: src/konqsessionmanager.cpp:334
+msgid "Do Not Restore"
 msgstr ""
 
-#: src/konqhistoryview.cpp:171 sidebar/history_module/kcmhistory.cpp:254
-msgid "Do you really want to clear the entire history?"
-msgstr "Ydych wir am glirio'r hanes gyfan?"
-
-#: src/konqhistoryview.cpp:172 sidebar/history_module/kcmhistory.cpp:256
-msgctxt "@title:window"
-msgid "Clear History?"
+#: src/konqsessionmanager.cpp:335
+msgid "Ask Me Later"
 msgstr ""
 
 #: src/konqfactory.cpp:90
@@ -906,9 +820,9 @@
 "Dyma'r ddiagnosteg:\n"
 " %2"
 
-#: src/konqfactory.cpp:229 about/konq_aboutpage.cc:91
-#: about/konq_aboutpage.cc:151 about/konq_aboutpage.cc:205
-#: about/konq_aboutpage.cc:303
+#: src/konqfactory.cpp:229 about/konq_aboutpage.cc:80
+#: about/konq_aboutpage.cc:136 about/konq_aboutpage.cc:190
+#: about/konq_aboutpage.cc:288
 msgid "Konqueror"
 msgstr "Konqueror"
 
@@ -1170,143 +1084,195 @@
 msgid "Eduardo Robles Elvira"
 msgstr ""
 
-#: src/konqframestatusbar.cpp:107
-msgid ""
-"Checking this box on at least two views sets those views as 'linked'. Then, "
-"when you change directories in one view, the other views linked with it will "
-"automatically update to show the current directory. This is especially "
-"useful with different types of views, such as a directory tree with an icon "
-"view or detailed view, and possibly a terminal emulator window."
+#: src/konqhistoryview.cpp:67 sidebar/trees/konq_sidebartree.cpp:232
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:94
+msgid "Open in New Tab"
+msgstr "Agor mewn Tab Newydd"
+
+#: src/konqhistoryview.cpp:71
+msgid "&Copy Link Address"
+msgstr ""
+
+#: src/konqhistoryview.cpp:76
+msgid "&Remove Entry"
+msgstr "&Gwaredu Cofnod"
+
+#: src/konqhistoryview.cpp:83
+msgid "C&lear History"
+msgstr "C&lirio'r Hanes"
+
+#: src/konqhistoryview.cpp:88
+msgid "&Preferences..."
+msgstr ""
+
+#: src/konqhistoryview.cpp:95
+msgid "By &Name"
+msgstr "Gan &Enw"
+
+#: src/konqhistoryview.cpp:101
+msgid "By &Date"
+msgstr "Gan &Ddyddiad"
+
+#: src/konqhistoryview.cpp:111
+msgid "Search in history"
+msgstr ""
+
+#: src/konqhistoryview.cpp:143 src/konqhistorydialog.cpp:61
+msgctxt "@action:inmenu Parent of 'By Name' and 'By Date'"
+msgid "Sort"
+msgstr ""
+
+#: src/konqhistoryview.cpp:171 sidebar/history_module/kcmhistory.cpp:254
+msgid "Do you really want to clear the entire history?"
+msgstr "Ydych wir am glirio'r hanes gyfan?"
+
+#: src/konqhistoryview.cpp:172 sidebar/history_module/kcmhistory.cpp:256
+msgctxt "@title:window"
+msgid "Clear History?"
+msgstr ""
+
+#: src/konqhistorydialog.cpp:45
+msgctxt "@title:window"
+msgid "History"
+msgstr ""
+
+#: src/konqextensionmanager.cpp:54
+msgctxt "@title:window"
+msgid "Configure"
+msgstr ""
+
+#: src/konqextensionmanager.cpp:74 src/konqextensionmanager.cpp:77
+#: src/konqextensionmanager.cpp:78
+msgid "Extensions"
+msgstr ""
+
+#: src/konqtabs.cpp:66
+msgid ""
+"This bar contains the list of currently open tabs. Click on a tab to make it "
+"active. You can also use keyboard shortcuts to navigate through tabs. The "
+"text on the tab shows the content currently open in it; place your mouse "
+"over the tab to see the full title, in case it has been shortened to fit the "
+"tab width."
+msgstr ""
+
+#: src/konqtabs.cpp:100
+msgid "Open a new tab"
+msgstr "Agor tab newydd"
+
+#: src/konqtabs.cpp:109
+msgid "Close the current tab"
+msgstr "Cau'r tab cyfredol"
+
+#: src/konqtabs.cpp:468
+msgid "&Duplicate Tab"
+msgstr "&Dyblygu Tab"
+
+#: src/konqtabs.cpp:473
+msgid "&Reload Tab"
 msgstr ""
-"Mae llenwi'r y blwch yma, ar o leiaf dau olwg, yn 'cysylltu'  y golygon "
-"hynny at ei gilydd. Wedyn, pan newidiwch gyfeiriadur mewn un golwg, "
-"diweddara'r golygon cysylltiedig eraill yn awtomatig i ddangos y cyfeiriadur "
-"cyfredol. Mae hyn yn arbennig o ddefnyddiol gyda golygon o sawl math "
-"gwahanol, megis coeden cyfeiriaduron â golwg eiconig neu manwl, a ffenestr "
-"efelychu terfynell o bosib."
 
-#: src/konqframestatusbar.cpp:166
-msgid "Close View"
+#: src/konqtabs.cpp:480
+msgid "Other Tabs"
 msgstr ""
 
-#: src/konqframestatusbar.cpp:246
-#, kde-format
-msgid "%1/s"
-msgstr "%1/s"
+#: src/konqtabs.cpp:485
+msgid "D&etach Tab"
+msgstr "D&atglymu Tab"
 
-#: src/konqframestatusbar.cpp:248
-msgid "Stalled"
-msgstr "Wedi Seibio"
+#: src/konqtabs.cpp:491
+msgid "&Close Tab"
+msgstr "&Cau Tab"
 
-#: src/konqviewmanager.cpp:1389
+#: src/konqviewmanager.cpp:1407
 msgid ""
 "You have multiple tabs open in this window.\n"
 "Loading a view profile will close them."
 msgstr ""
 
-#: src/konqviewmanager.cpp:1392
+#: src/konqviewmanager.cpp:1410
 msgid "Load View Profile"
 msgstr "Llwytho Proffil Golwg"
 
-#: src/konqviewmanager.cpp:1408
+#: src/konqviewmanager.cpp:1422
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Loading a profile will discard these changes."
 msgstr ""
 
-#: sidebar/web_module/web_module.cpp:57
-msgid "&Open Link"
-msgstr "&Agor Cyswllt"
-
-#: sidebar/web_module/web_module.cpp:73
-msgid "Set &Automatic Reload"
+#: src/konqhistorymodel.cpp:137
+#, kde-format
+msgid ""
+"<qt><center><b>%1</b></center><hr />Last visited: %2<br />First visited: "
+"%3<br />Number of times visited: %4</qt>"
 msgstr ""
 
-#: sidebar/web_module/web_module.cpp:137
-msgctxt "@title:window"
-msgid "Set Refresh Timeout (0 disables)"
+#: src/konqhistorymodel.cpp:233
+msgid "Local"
 msgstr ""
 
-#: sidebar/web_module/web_module.cpp:145
-msgid " minute"
-msgid_plural " minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sidebar/web_module/web_module.cpp:148
-msgid " second"
-msgid_plural " seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sidebar/web_module/web_module.cpp:280
-msgctxt "@action:inmenu Add"
-msgid "Web Sidebar Module"
+#: src/konqhistorymodel.cpp:236
+msgid "Miscellaneous"
 msgstr ""
 
-#: sidebar/web_module/web_module.cpp:300
 #: sidebar/trees/konqsidebar_oldtreemodule.cpp:179
+#: sidebar/web_module/web_module.cpp:300
 msgctxt "@label"
 msgid "Name:"
 msgstr ""
 
-#: sidebar/web_module/web_module.cpp:300
 #: sidebar/trees/konqsidebar_oldtreemodule.cpp:179
+#: sidebar/web_module/web_module.cpp:300
 msgctxt "@label"
 msgid "Path or URL:"
 msgstr ""
 
-#: sidebar/web_module/web_module.cpp:301
+#: sidebar/trees/konqsidebar_oldtreemodule.cpp:180
 msgctxt "@title:window"
-msgid "Add web sidebar module"
+msgid "Add folder sidebar module"
 msgstr ""
 
-#: sidebar/sidebar_part.cpp:28
-msgid "Extended Sidebar"
-msgstr "Bar Ochr Estynedig"
-
 #: sidebar/trees/dirtree_module/dirtree_module.cpp:417
 #, kde-format
 msgid "Cannot find parent item %1 in the tree. Internal error."
 msgstr ""
 
-#: sidebar/trees/konq_sidebartree.cpp:206
+#: sidebar/trees/konq_sidebartree.cpp:203
 msgid "&Create New Folder..."
 msgstr "&Creu Plygell Newydd..."
 
-#: sidebar/trees/konq_sidebartree.cpp:210
+#: sidebar/trees/konq_sidebartree.cpp:207
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:78
 msgid "Delete Folder"
 msgstr "Dileu Plygell"
 
-#: sidebar/trees/konq_sidebartree.cpp:214
+#: sidebar/trees/konq_sidebartree.cpp:211
 msgid "Move to Trash"
 msgstr ""
 
-#: sidebar/trees/konq_sidebartree.cpp:218
+#: sidebar/trees/konq_sidebartree.cpp:215
 msgid "Rename"
 msgstr "Ail-enwi"
 
-#: sidebar/trees/konq_sidebartree.cpp:223
+#: sidebar/trees/konq_sidebartree.cpp:220
 msgid "Delete Link"
 msgstr ""
 
-#: sidebar/trees/konq_sidebartree.cpp:227
+#: sidebar/trees/konq_sidebartree.cpp:224
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:86
 msgid "Properties"
 msgstr ""
 
-#: sidebar/trees/konq_sidebartree.cpp:231
+#: sidebar/trees/konq_sidebartree.cpp:228
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:90
 msgid "Open in New Window"
 msgstr "Agor mewn Ffenestr Newydd"
 
-#: sidebar/trees/konq_sidebartree.cpp:239
+#: sidebar/trees/konq_sidebartree.cpp:236
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:102
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad Cyswllt"
 
-#: sidebar/trees/konq_sidebartree.cpp:954
+#: sidebar/trees/konq_sidebartree.cpp:951
 msgid "New Folder"
 msgstr "Plygell Newydd:"
 
@@ -1315,15 +1281,10 @@
 msgid "Create New Folder"
 msgstr ""
 
-#: sidebar/trees/konq_sidebartree.cpp:959
+#: sidebar/trees/konq_sidebartree.cpp:956
 msgid "Enter folder name:"
 msgstr "Rhowch enw'r blygell:"
 
-#: sidebar/trees/konqsidebar_oldtreemodule.cpp:180
-msgctxt "@title:window"
-msgid "Add folder sidebar module"
-msgstr ""
-
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:74
 msgid "&Create New Folder"
 msgstr "&Creu Plygell Newydd"
@@ -1336,14 +1297,14 @@
 msgid "Open Folder in Tabs"
 msgstr "Agor Plygell mewn Tabiau"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:334
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:335
 #, kde-format
 msgid ""
 "Are you sure you wish to remove the bookmark folder\n"
 "\"%1\"?"
 msgstr ""
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:335
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:336
 #, kde-format
 msgid ""
 "Are you sure you wish to remove the bookmark\n"
@@ -1382,6 +1343,20 @@
 msgid "Add Bookmark"
 msgstr ""
 
+#: sidebar/sidebar_part.cpp:28
+msgid "Extended Sidebar"
+msgstr "Bar Ochr Estynedig"
+
+#: sidebar/places_module/places_module.cpp:119
+msgctxt "@action:inmenu Add"
+msgid "Places Sidebar Module"
+msgstr ""
+
+#: sidebar/places_module/places_module.cpp:142
+msgctxt "@title:tab"
+msgid "Places"
+msgstr ""
+
 #: sidebar/sidebar_widget.cpp:94
 msgid "Rollback to System Default"
 msgstr "Rholio'n ôl i Ragosodyn y Cysawd"
@@ -1470,6 +1445,16 @@
 msgid "Web module"
 msgstr ""
 
+#: sidebar/history_module/history_module.cpp:126
+msgctxt "@action:inmenu Add"
+msgid "History Sidebar Module"
+msgstr ""
+
+#: sidebar/history_module/history_module.cpp:149
+msgctxt "@title:tab"
+msgid "History"
+msgstr ""
+
 #: sidebar/history_module/kcmhistory.cpp:71
 msgid " day"
 msgid_plural " days"
@@ -1504,61 +1489,76 @@
 msgid "<h1>History Sidebar</h1> You can configure the history sidebar here."
 msgstr "<h1>Bar Ochr Hanes</h1> Gallwch ffurfweddu'r bar ochr hanes yma."
 
-#: sidebar/history_module/history_module.cpp:126
-msgctxt "@action:inmenu Add"
-msgid "History Sidebar Module"
+#: sidebar/web_module/web_module.cpp:57
+msgid "&Open Link"
+msgstr "&Agor Cyswllt"
+
+#: sidebar/web_module/web_module.cpp:73
+msgid "Set &Automatic Reload"
 msgstr ""
 
-#: sidebar/history_module/history_module.cpp:149
-msgctxt "@title:tab"
-msgid "History"
+#: sidebar/web_module/web_module.cpp:137
+msgctxt "@title:window"
+msgid "Set Refresh Timeout (0 disables)"
 msgstr ""
 
-#: sidebar/places_module/places_module.cpp:119
+#: sidebar/web_module/web_module.cpp:145
+msgid " minute"
+msgid_plural " minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: sidebar/web_module/web_module.cpp:148
+msgid " second"
+msgid_plural " seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: sidebar/web_module/web_module.cpp:280
 msgctxt "@action:inmenu Add"
-msgid "Places Sidebar Module"
+msgid "Web Sidebar Module"
 msgstr ""
 
-#: sidebar/places_module/places_module.cpp:142
-msgctxt "@title:tab"
-msgid "Places"
+#: sidebar/web_module/web_module.cpp:301
+msgctxt "@title:window"
+msgid "Add web sidebar module"
 msgstr ""
 
-#: about/konq_aboutpage.cc:90 about/konq_aboutpage.cc:92
-#: about/konq_aboutpage.cc:150 about/konq_aboutpage.cc:152
-#: about/konq_aboutpage.cc:204 about/konq_aboutpage.cc:206
-#: about/konq_aboutpage.cc:302 about/konq_aboutpage.cc:304
+#: about/konq_aboutpage.cc:79 about/konq_aboutpage.cc:81
+#: about/konq_aboutpage.cc:135 about/konq_aboutpage.cc:137
+#: about/konq_aboutpage.cc:189 about/konq_aboutpage.cc:191
+#: about/konq_aboutpage.cc:287 about/konq_aboutpage.cc:289
 msgctxt "KDE 4 tag line, see http://kde.org/img/kde40.png"
 msgid "Be free."
 msgstr ""
 
-#: about/konq_aboutpage.cc:93 about/konq_aboutpage.cc:153
-#: about/konq_aboutpage.cc:207 about/konq_aboutpage.cc:305
+#: about/konq_aboutpage.cc:82 about/konq_aboutpage.cc:138
+#: about/konq_aboutpage.cc:192 about/konq_aboutpage.cc:290
 msgid ""
 "Konqueror is a web browser, file manager and universal document viewer."
 msgstr ""
 
-#: about/konq_aboutpage.cc:94 about/konq_aboutpage.cc:154
-#: about/konq_aboutpage.cc:208 about/konq_aboutpage.cc:306
+#: about/konq_aboutpage.cc:83 about/konq_aboutpage.cc:139
+#: about/konq_aboutpage.cc:193 about/konq_aboutpage.cc:291
 msgctxt ""
 "Link that points to the first page of the Konqueror 'about page', Starting "
 "Points contains links to Home, Network Folders, Trash, etc."
 msgid "Starting Points"
 msgstr ""
 
-#: about/konq_aboutpage.cc:95 about/konq_aboutpage.cc:155
-#: about/konq_aboutpage.cc:209 about/konq_aboutpage.cc:307
+#: about/konq_aboutpage.cc:84 about/konq_aboutpage.cc:140
+#: about/konq_aboutpage.cc:194 about/konq_aboutpage.cc:292
 msgid "Introduction"
 msgstr "Cyflwyniad"
 
-#: about/konq_aboutpage.cc:96 about/konq_aboutpage.cc:156
-#: about/konq_aboutpage.cc:210 about/konq_aboutpage.cc:308
+#: about/konq_aboutpage.cc:85 about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:195 about/konq_aboutpage.cc:293
 msgid "Tips"
 msgstr "Cynghorion"
 
-#: about/konq_aboutpage.cc:97 about/konq_aboutpage.cc:157
-#: about/konq_aboutpage.cc:211 about/konq_aboutpage.cc:212
-#: about/konq_aboutpage.cc:309
+#: about/konq_aboutpage.cc:86 about/konq_aboutpage.cc:142
+#: about/konq_aboutpage.cc:196 about/konq_aboutpage.cc:197
+#: about/konq_aboutpage.cc:294
 msgid "Specifications"
 msgstr "Penodiadau"
 
@@ -1582,7 +1582,7 @@
 msgid "Shared files and folders"
 msgstr ""
 
-#: about/konq_aboutpage.cc:118
+#: about/konq_aboutpage.cc:103
 msgid "Bookmarks"
 msgstr ""
 
@@ -1594,18 +1594,18 @@
 msgid "Next: An Introduction to Konqueror"
 msgstr ""
 
-#: about/konq_aboutpage.cc:124
+#: about/konq_aboutpage.cc:109
 msgid "Search the Web"
 msgstr ""
 
-#: about/konq_aboutpage.cc:158
+#: about/konq_aboutpage.cc:143
 msgid ""
 "Konqueror makes working with and managing your files easy. You can browse "
 "both local and networked folders while enjoying advanced features such as "
 "the powerful sidebar and file previews."
 msgstr ""
 
-#: about/konq_aboutpage.cc:162
+#: about/konq_aboutpage.cc:147
 msgid ""
 "Konqueror is also a full featured and easy to use web browser which you can "
 "use to explore the Internet. Enter the address (e.g. <a "
@@ -1614,28 +1614,28 @@
 "the Bookmarks menu."
 msgstr ""
 
-#: about/konq_aboutpage.cc:167
+#: about/konq_aboutpage.cc:152
 #, kde-format
 msgid ""
 "To return to the previous location, press the back button <img width='16' "
 "height='16' src=\"%1\"></img> in the toolbar. "
 msgstr ""
 
-#: about/konq_aboutpage.cc:170
+#: about/konq_aboutpage.cc:155
 #, kde-format
 msgid ""
 "To quickly go to your Home folder press the  home button <img width='16' "
 "height='16' src=\"%1\"></img>."
 msgstr ""
 
-#: about/konq_aboutpage.cc:172
+#: about/konq_aboutpage.cc:157
 #, kde-format
 msgid ""
 "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>."
 msgstr ""
 "Am ddogfennaeth mwy manwl am Konqueror cliciwch <A HREF=\"%1\">yma</A>."
 
-#: about/konq_aboutpage.cc:174
+#: about/konq_aboutpage.cc:159
 #, kde-format
 msgid ""
 "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster, "
@@ -1645,11 +1645,11 @@
 "As... -> \"Web Browsing\"."
 msgstr ""
 
-#: about/konq_aboutpage.cc:179
+#: about/konq_aboutpage.cc:164
 msgid "Next: Tips &amp; Tricks"
 msgstr ""
 
-#: about/konq_aboutpage.cc:213
+#: about/konq_aboutpage.cc:198
 #, kde-format
 msgid ""
 "Konqueror is designed to embrace and support Internet standards. The aim is "
@@ -1660,15 +1660,15 @@
 "<A HREF=\"%1\">XBEL bookmarks</A>, Konqueror also implements:"
 msgstr ""
 
-#: about/konq_aboutpage.cc:221
+#: about/konq_aboutpage.cc:206
 msgid "Supported standards"
 msgstr "Safonau cynnaledig"
 
-#: about/konq_aboutpage.cc:222
+#: about/konq_aboutpage.cc:207
 msgid "Additional requirements*"
 msgstr "Gofynion Ychwanegol*"
 
-#: about/konq_aboutpage.cc:223
+#: about/konq_aboutpage.cc:208
 #, kde-format
 msgid ""
 "<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based <A "
@@ -1677,31 +1677,31 @@
 "<a href=\"%1\">DOM</a>Sail  (Lefel 1, Level 2 rhannol)<a href=\"%2 \">HTML "
 "4.01</a>"
 
-#: about/konq_aboutpage.cc:225 about/konq_aboutpage.cc:227
-#: about/konq_aboutpage.cc:239 about/konq_aboutpage.cc:244
-#: about/konq_aboutpage.cc:246
+#: about/konq_aboutpage.cc:210 about/konq_aboutpage.cc:212
+#: about/konq_aboutpage.cc:225 about/konq_aboutpage.cc:230
+#: about/konq_aboutpage.cc:232
 msgid "built-in"
 msgstr "mewnadeiladedig"
 
-#: about/konq_aboutpage.cc:226
+#: about/konq_aboutpage.cc:211
 #, kde-format
 msgid "<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)"
 msgstr ""
 "<a href=\"%1\">Dalennau Arddull Rhaeadru (CSS)</a> (CSS 1,  CSS 2 rhannol)"
 
-#: about/konq_aboutpage.cc:228
+#: about/konq_aboutpage.cc:213
 #, kde-format
 msgid "<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)"
 msgstr "<a href=\"%1\">ECMA-262</a> Rhifyn 3 (yn fras fel JavaScript 1.5)"
 
-#: about/konq_aboutpage.cc:229
+#: about/konq_aboutpage.cc:215
 #, kde-format
 msgid ""
 "JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>."
 msgstr ""
 "JavaScript analluog (yn eang). Galluogwch JavaScript <a href=\"%1\">yma</a>."
 
-#: about/konq_aboutpage.cc:230
+#: about/konq_aboutpage.cc:216
 #, kde-format
 msgid ""
 "JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\"
@@ -1710,7 +1710,7 @@
 "JavaScript galluog (yn eang). Analluogwch JavaScript <A HREF=\\\"%1\\"
 "\">yma</ A>."
 
-#: about/konq_aboutpage.cc:231
+#: about/konq_aboutpage.cc:217
 #, kde-format
 msgid "Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support"
 msgstr "Cynhaliaeth <a href=\"%1\">Java</a><sup>&reg;</sup> diogel"
@@ -1722,12 +1722,12 @@
 "HREF=\"%2\">Sun/Oracle</A>)"
 msgstr ""
 
-#: about/konq_aboutpage.cc:234
+#: about/konq_aboutpage.cc:220
 #, kde-format
 msgid "Enable Java (globally) <A HREF=\"%1\">here</A>."
 msgstr "Galluogwch Java (yn eang) <a href=\"%1\">yma</a>."
 
-#: about/konq_aboutpage.cc:235
+#: about/konq_aboutpage.cc:221
 #, kde-format
 msgid ""
 "Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> (for "
@@ -1740,42 +1740,42 @@
 "\">Real<sup>&reg;</sup></a>Audio, <a "
 "href=\"%3\">Real<sup>&reg;</sup></a>Video, ayyb)"
 
-#: about/konq_aboutpage.cc:240
+#: about/konq_aboutpage.cc:226
 msgid "Secure Sockets Layer"
 msgstr "Haen Socedi Diogel (SSL)"
 
-#: about/konq_aboutpage.cc:241
+#: about/konq_aboutpage.cc:227
 msgid "(TLS/SSL v2/3) for secure communications up to 168bit"
 msgstr "(TLS/SSL f2/3) ar gyfer cyfathrebu diogel hyd at 168did"
 
-#: about/konq_aboutpage.cc:242
+#: about/konq_aboutpage.cc:228
 msgid "OpenSSL"
 msgstr "OpenSSL"
 
-#: about/konq_aboutpage.cc:243
+#: about/konq_aboutpage.cc:229
 msgid "Bidirectional 16bit unicode support"
 msgstr "Cynhaliaeth unicode deuffordd 16did"
 
-#: about/konq_aboutpage.cc:245
+#: about/konq_aboutpage.cc:231
 msgid "AutoCompletion for forms"
 msgstr "Hunan-Gwblhau i ffurflenni"
 
-#: about/konq_aboutpage.cc:247
+#: about/konq_aboutpage.cc:233
 msgctxt "Title of an html 'group box' explaining konqueror features"
 msgid "General"
 msgstr ""
 
-#: about/konq_aboutpage.cc:248
+#: about/konq_aboutpage.cc:234
 msgid "Feature"
 msgstr "Nodwedd"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:128
 #. i18n: ectx: property (title), widget (QGroupBox, gbDetails)
-#: about/konq_aboutpage.cc:249 rc.cpp:92
+#: about/konq_aboutpage.cc:235 rc.cpp:89
 msgid "Details"
 msgstr "Manylion"
 
-#: about/konq_aboutpage.cc:250
+#: about/konq_aboutpage.cc:236
 msgid "Image formats"
 msgstr "Fformatau Delwedd"
 
@@ -1783,15 +1783,15 @@
 msgid "PNG<br />JPG<br />GIF"
 msgstr ""
 
-#: about/konq_aboutpage.cc:252
+#: about/konq_aboutpage.cc:238
 msgid "Transfer protocols"
 msgstr "Protocolau trosglwyddo"
 
-#: about/konq_aboutpage.cc:253
+#: about/konq_aboutpage.cc:239
 msgid "HTTP 1.1 (including gzip/bzip2 compression)"
 msgstr "HTTP 1.1 (gan gynnwys cywasgu gzip/bzip2)"
 
-#: about/konq_aboutpage.cc:254
+#: about/konq_aboutpage.cc:240
 msgid "FTP"
 msgstr "FTP"
 
@@ -1800,24 +1800,24 @@
 msgid "and <A HREF=\"%1\">many more (see Kioslaves in KHelpcenter)...</A>"
 msgstr ""
 
-#: about/konq_aboutpage.cc:256
+#: about/konq_aboutpage.cc:242
 msgctxt "A feature of Konqueror"
 msgid "URL-Completion"
 msgstr ""
 
-#: about/konq_aboutpage.cc:257
+#: about/konq_aboutpage.cc:243
 msgid "Manual"
 msgstr "Â llaw"
 
-#: about/konq_aboutpage.cc:258
+#: about/konq_aboutpage.cc:244
 msgid "Popup"
 msgstr "Neidiol"
 
-#: about/konq_aboutpage.cc:259
+#: about/konq_aboutpage.cc:245
 msgid "(Short-) Automatic"
 msgstr "(Byr-) Awtomatig"
 
-#: about/konq_aboutpage.cc:261
+#: about/konq_aboutpage.cc:247
 #, kde-format
 msgctxt ""
 "Link that points to the first page of the Konqueror 'about page', Starting "
@@ -1825,11 +1825,11 @@
 msgid "<a href=\"%1\">Return to Starting Points</a>"
 msgstr ""
 
-#: about/konq_aboutpage.cc:310
+#: about/konq_aboutpage.cc:295
 msgid "Tips &amp; Tricks"
 msgstr ""
 
-#: about/konq_aboutpage.cc:311
+#: about/konq_aboutpage.cc:296
 #, kde-format
 msgid ""
 "Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, using "
@@ -1846,7 +1846,7 @@
 "the HTML toolbar to increase the font size on your web page."
 msgstr ""
 
-#: about/konq_aboutpage.cc:318
+#: about/konq_aboutpage.cc:303
 #, kde-format
 msgid ""
 "When you want to paste a new address into the Location toolbar you might "
@@ -1861,7 +1861,7 @@
 "to the desktop, and choose \"Icon\"."
 msgstr ""
 
-#: about/konq_aboutpage.cc:325
+#: about/konq_aboutpage.cc:310
 #, kde-format
 msgid ""
 "You can also find <img width='16' height='16' src=\"%1\" /> \"Full-Screen "
@@ -1869,7 +1869,7 @@
 "sessions."
 msgstr ""
 
-#: about/konq_aboutpage.cc:328
+#: about/konq_aboutpage.cc:313
 #, kde-format
 msgid ""
 "Divide et impera (lat. \"Divide and conquer\") - by splitting a window into "
@@ -1879,7 +1879,7 @@
 "your own ones."
 msgstr ""
 
-#: about/konq_aboutpage.cc:333
+#: about/konq_aboutpage.cc:318
 #, kde-format
 msgid ""
 "Use the <a href=\"%1\">user-agent</a> feature if the website you are "
@@ -1894,7 +1894,7 @@
 "ensures that you can keep track of the pages you have visited recently."
 msgstr ""
 
-#: about/konq_aboutpage.cc:338
+#: about/konq_aboutpage.cc:323
 #, kde-format
 msgid ""
 "Use a caching <a href=\"%1\">proxy</a> to speed up your Internet connection."
@@ -1902,7 +1902,7 @@
 "Defnyddiwch <a href=\"%1\">ddirprwy</a> strorfa dros dro i gyflymu'ch "
 "cysylltiad i'r Rhyngrwyd."
 
-#: about/konq_aboutpage.cc:340
+#: about/konq_aboutpage.cc:325
 #, kde-format
 msgid ""
 "Advanced users will appreciate the Konsole which you can embed into "
@@ -1910,29 +1910,29 @@
 "Terminal Emulator)."
 msgstr ""
 
-#: about/konq_aboutpage.cc:344
+#: about/konq_aboutpage.cc:329
 msgid "Next: Specifications"
 msgstr ""
 
-#: about/konq_aboutpage.cc:359
+#: about/konq_aboutpage.cc:344
 msgid "Installed Plugins"
 msgstr "Ategion a Osodir"
 
-#: about/konq_aboutpage.cc:360
+#: about/konq_aboutpage.cc:345
 msgid "<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"
 msgstr "<td>Ategyn</td><td>Disgrifiad</td><td>Ffeil</td><td>Mathau</td>"
 
-#: about/konq_aboutpage.cc:361
+#: about/konq_aboutpage.cc:346
 msgid "Installed"
 msgstr "Wedi'u Gosod"
 
-#: about/konq_aboutpage.cc:362
+#: about/konq_aboutpage.cc:347
 msgid ""
 "<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>"
 msgstr ""
 "<td>Math Mime</td><td>Disgrifiad</td><td>Ôlddodiadau</td><td>Ategyn</td>"
 
-#: about/konq_aboutpage.cc:487
+#: about/konq_aboutpage.cc:463
 msgid ""
 "Do you want to disable showing the introduction in the webbrowsing profile?"
 msgstr "Hoffech analluogi dangos y cyflwyniad yn y proffil pori gwê?"
@@ -1942,11 +1942,11 @@
 msgid "Faster Startup?"
 msgstr ""
 
-#: about/konq_aboutpage.cc:489
+#: about/konq_aboutpage.cc:465
 msgid "Disable"
 msgstr "Analluogi"
 
-#: about/konq_aboutpage.cc:489
+#: about/konq_aboutpage.cc:465
 msgid "Keep"
 msgstr "Cadw"
 
@@ -2022,36 +2022,60 @@
 msgid "Location Toolbar"
 msgstr "Bar Lleoliad"
 
-#. i18n: file: src/konqueror.rc:113
+#. i18n: file: src/konqueror.rc:115
 #. i18n: ectx: ToolBar (bookmarkToolBar)
 #: rc.cpp:35
 msgid "Bookmark Toolbar"
 msgstr "Bar Tudnodau"
 
+#. i18n: file: src/konqprofiledlg_base.ui:16
+#. i18n: ectx: property (text), widget (QLabel, lblName)
+#: rc.cpp:38
+msgid "&Profile name:"
+msgstr "Enw &Proffil:"
+
+#. i18n: file: src/konqprofiledlg_base.ui:32
+#. i18n: ectx: property (text), widget (QCheckBox, m_cbSaveURLs)
+#: rc.cpp:41
+msgid "Save &URLs in profile"
+msgstr "Cadw &URLau yn y proffil"
+
+#. i18n: file: src/konqnewsessiondlg_base.ui:33
+#. i18n: ectx: property (text), widget (QLabel, lblDescription)
+#: rc.cpp:44
+msgid "Save open tabs and windows for easy retrieval"
+msgstr ""
+
+#. i18n: file: src/konqnewsessiondlg_base.ui:48
+#. i18n: ectx: property (text), widget (QLabel, lblSessionName)
+#: rc.cpp:47
+msgid "&Session name:"
+msgstr ""
+
 #. i18n: file: src/konqsessiondlg_base.ui:25
 #. i18n: ectx: property (text), widget (KPushButton, m_pNewButton)
-#: rc.cpp:41
+#: rc.cpp:50
 msgctxt "@action:button New session"
 msgid "New..."
 msgstr ""
 
 #. i18n: file: src/konqsessiondlg_base.ui:32
 #. i18n: ectx: property (text), widget (KPushButton, m_pSaveCurrentButton)
-#: rc.cpp:44
+#: rc.cpp:53
 msgctxt "@action:button Save current session"
 msgid "Save Current"
 msgstr ""
 
 #. i18n: file: src/konqsessiondlg_base.ui:39
 #. i18n: ectx: property (text), widget (KPushButton, m_pRenameButton)
-#: rc.cpp:47
+#: rc.cpp:56
 msgctxt "@action:button Rename session"
 msgid "Rename..."
 msgstr ""
 
 #. i18n: file: src/konqsessiondlg_base.ui:46
 #. i18n: ectx: property (text), widget (KPushButton, m_pDeleteButton)
-#: rc.cpp:50
+#: rc.cpp:59
 msgctxt "@action:button Delete session"
 msgid "Delete"
 msgstr ""
@@ -2060,61 +2084,37 @@
 #. i18n: ectx: property (text), widget (QCheckBox, m_pOpenTabsInsideCurrentWindow)
 #. i18n: file: src/konqueror.kcfg:531
 #. i18n: ectx: label, entry, group (Trash)
-#: rc.cpp:53 rc.cpp:306
+#: rc.cpp:62 rc.cpp:164
 msgid "Open tabs inside current window"
 msgstr ""
 
-#. i18n: file: src/konqnewsessiondlg_base.ui:33
-#. i18n: ectx: property (text), widget (QLabel, lblDescription)
-#: rc.cpp:56
-msgid "Save open tabs and windows for easy retrieval"
-msgstr ""
-
-#. i18n: file: src/konqnewsessiondlg_base.ui:48
-#. i18n: ectx: property (text), widget (QLabel, lblSessionName)
-#: rc.cpp:59
-msgid "&Session name:"
-msgstr ""
-
-#. i18n: file: src/konqprofiledlg_base.ui:16
-#. i18n: ectx: property (text), widget (QLabel, lblName)
-#: rc.cpp:62
-msgid "&Profile name:"
-msgstr "Enw &Proffil:"
-
-#. i18n: file: src/konqprofiledlg_base.ui:32
-#. i18n: ectx: property (text), widget (QCheckBox, m_cbSaveURLs)
-#: rc.cpp:65
-msgid "Save &URLs in profile"
-msgstr "Cadw &URLau yn y proffil"
-
 #. i18n: file: sidebar/history_module/history_dlg.ui:16
 #. i18n: ectx: property (title), widget (QGroupBox, gbLimits)
-#: rc.cpp:68
+#: rc.cpp:65
 msgid "Limits"
 msgstr "Terfynau"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:38
 #. i18n: ectx: property (text), widget (QCheckBox, cbExpire)
-#: rc.cpp:71
+#: rc.cpp:68
 msgid "URLs e&xpire after"
 msgstr "URLau yn &darfod ar ôl"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:48
 #. i18n: ectx: property (text), widget (QLabel, lEntries)
-#: rc.cpp:74
+#: rc.cpp:71
 msgid "Maximum &number of URLs:"
 msgstr "&Nifer Mwyaf o URLau"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:67
 #. i18n: ectx: property (title), widget (QGroupBox, gbFonts)
-#: rc.cpp:77
+#: rc.cpp:74
 msgid "Custom Fonts For"
 msgstr "Addasu Ffont Am"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:82
 #. i18n: ectx: property (text), widget (QLabel, lbNewer)
-#: rc.cpp:80
+#: rc.cpp:77
 msgid "URLs newer than"
 msgstr "URLau iau na"
 
@@ -2122,19 +2122,19 @@
 #. i18n: ectx: property (text), widget (QPushButton, btnFontOlder)
 #. i18n: file: sidebar/history_module/history_dlg.ui:118
 #. i18n: ectx: property (text), widget (QPushButton, btnFontNewer)
-#: rc.cpp:83 rc.cpp:89
+#: rc.cpp:80 rc.cpp:86
 msgid "Choose Font..."
 msgstr "Dewis Ffont..."
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:105
 #. i18n: ectx: property (text), widget (QLabel, lbOlder)
-#: rc.cpp:86
+#: rc.cpp:83
 msgid "URLs older than"
 msgstr "URLau hyn na"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:134
 #. i18n: ectx: property (toolTip), widget (QCheckBox, cbDetailedTips)
-#: rc.cpp:95
+#: rc.cpp:92
 msgid ""
 "Shows the number of times visited and the dates of the first and last "
 "visits, in addition to the URL"
@@ -2144,19 +2144,19 @@
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:137
 #. i18n: ectx: property (text), widget (QCheckBox, cbDetailedTips)
-#: rc.cpp:98
+#: rc.cpp:95
 msgid "Detailed tooltips"
 msgstr "Cymorth offer manwl"
 
 #. i18n: file: sidebar/history_module/history_dlg.ui:149
 #. i18n: ectx: property (text), widget (QPushButton, btnClearHistory)
-#: rc.cpp:101
+#: rc.cpp:98
 msgid "Clear History"
 msgstr "Gwaredu Hanes"
 
 #. i18n: file: src/konqueror.kcfg:12
 #. i18n: ectx: whatsthis, entry, group (UserSettings)
-#: rc.cpp:107
+#: rc.cpp:104
 msgid ""
 "This is the URL of the web page where Konqueror (as web browser) will jump "
 "to when the \\\"Home\\\" button is pressed. When Konqueror is started as a "
@@ -2165,13 +2165,13 @@
 
 #. i18n: file: src/konqueror.kcfg:22
 #. i18n: ectx: label, entry, group (UndoManagerSettings)
-#: rc.cpp:110
+#: rc.cpp:107
 msgid "Maximum number of Closed Items"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:23
 #. i18n: ectx: whatsthis, entry, group (UndoManagerSettings)
-#: rc.cpp:113
+#: rc.cpp:110
 msgid ""
 "This sets the maximum number of closed items that will be stored in memory. "
 "This limit will not be surpassed."
@@ -2179,13 +2179,13 @@
 
 #. i18n: file: src/konqueror.kcfg:32
 #. i18n: ectx: label, entry, group (FMSettings)
-#: rc.cpp:116
+#: rc.cpp:113
 msgid "Open folders in separate windows"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:33
 #. i18n: ectx: whatsthis, entry, group (FMSettings)
-#: rc.cpp:119
+#: rc.cpp:116
 msgid ""
 "If this option is checked, Konqueror will open a new window when you open a "
 "folder, rather than showing that folder's contents in the current window."
@@ -2193,13 +2193,13 @@
 
 #. i18n: file: src/konqueror.kcfg:38
 #. i18n: ectx: label, entry, group (FMSettings)
-#: rc.cpp:122
+#: rc.cpp:119
 msgid "Show file tips"
 msgstr "Dangos cynghorion ffeil"
 
 #. i18n: file: src/konqueror.kcfg:39
 #. i18n: ectx: whatsthis, entry, group (FMSettings)
-#: rc.cpp:125
+#: rc.cpp:122
 msgid ""
 "Here you can control if, when moving the mouse over a file, you want to see "
 "a small popup window with additional information about that file"
@@ -2209,13 +2209,13 @@
 
 #. i18n: file: src/konqueror.kcfg:50
 #. i18n: ectx: label, entry, group (FMSettings)
-#: rc.cpp:130
+#: rc.cpp:125
 msgid "Show previews in file tips"
 msgstr "Dangos rhagolygon mewn cynghorion ffeil"
 
 #. i18n: file: src/konqueror.kcfg:51
 #. i18n: ectx: whatsthis, entry, group (FMSettings)
-#: rc.cpp:133
+#: rc.cpp:128
 msgid ""
 "Here you can control if you want the popup window to contain a larger "
 "preview for the file, when moving the mouse over it"
@@ -2225,13 +2225,13 @@
 
 #. i18n: file: src/konqueror.kcfg:56
 #. i18n: ectx: label, entry, group (FMSettings)
-#: rc.cpp:136
+#: rc.cpp:131
 msgid "Show 'Delete' menu entries which bypass the trashcan"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:57
 #. i18n: ectx: whatsthis, entry, group (FMSettings)
-#: rc.cpp:139
+#: rc.cpp:134
 msgid ""
 "Check this if you want 'Delete' menu commands to be displayed on the desktop "
 "and in the file manager's menus and context menus. You can always delete "
@@ -2242,38 +2242,38 @@
 #. i18n: ectx: label, entry, group (FMSettings)
 #. i18n: file: src/konqueror.kcfg:150
 #. i18n: ectx: whatsthis, entry, group (FMSettings)
-#: rc.cpp:170 rc.cpp:173
+#: rc.cpp:137 rc.cpp:140
 msgid "Number of Open With items in the File menu"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:159
 #. i18n: ectx: label, entry, group (HTML Settings)
-#: rc.cpp:176
+#: rc.cpp:143
 msgid "Standard font"
 msgstr "Wynebfath safonol:"
 
 #. i18n: file: src/konqueror.kcfg:160
 #. i18n: ectx: whatsthis, entry, group (HTML Settings)
-#: rc.cpp:179
+#: rc.cpp:146
 msgid "This is the font used to display text in Konqueror windows."
 msgstr ""
 "Dyma'r wynebfath a ddefnyddir i ddangos testun mewn ffenestri Konqueror."
 
 #. i18n: file: src/konqueror.kcfg:317
 #. i18n: ectx: label, entry, group (HistorySettings)
-#: rc.cpp:224
+#: rc.cpp:149
 msgid "Maximum number of history items per view"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:518
 #. i18n: ectx: label, entry, group (Trash)
-#: rc.cpp:294
+#: rc.cpp:152
 msgid "Ask confirmation for deleting a file."
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:519
 #. i18n: ectx: whatsthis, entry, group (Trash)
-#: rc.cpp:297
+#: rc.cpp:155
 msgid ""
 "This option tells Konqueror whether to ask for a confirmation when you "
 "delete a file without using the trash folder. Warning, deleted files can not "
@@ -2282,13 +2282,13 @@
 
 #. i18n: file: src/konqueror.kcfg:524
 #. i18n: ectx: label, entry, group (Trash)
-#: rc.cpp:300
+#: rc.cpp:158
 msgid "Ask confirmation for move to trash"
 msgstr ""
 
 #. i18n: file: src/konqueror.kcfg:525
 #. i18n: ectx: whatsthis, entry, group (Trash)
-#: rc.cpp:303
+#: rc.cpp:161
 msgid ""
 "This option tells Konqueror whether to ask for a confirmation when you move "
 "the file to your trash folder, from where it can be recovered very easily."
@@ -2296,7 +2296,7 @@
 
 #. i18n: file: src/konqueror.kcfg:532
 #. i18n: ectx: whatsthis, entry, group (Trash)
-#: rc.cpp:309
+#: rc.cpp:167
 msgid ""
 "If true, when opening a session from within the sessions dialog the tabs "
 "will be opened inside current window."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konquest.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konquest.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konquest.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konquest.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: konquest\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,123 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#: dialogs/scoredlg.cc:43
+msgctxt "The player name"
+msgid "Player"
+msgstr ""
+
+#: dialogs/scoredlg.cc:43
+msgid ""
+"Ships\n"
+"Built"
+msgstr ""
+
+#: dialogs/scoredlg.cc:44
+msgid ""
+"Planets\n"
+"Conquered"
+msgstr ""
+
+#: dialogs/scoredlg.cc:44
+msgid ""
+"Fleets\n"
+"Launched"
+msgstr ""
+
+#: dialogs/scoredlg.cc:45
+msgid ""
+"Fleets\n"
+"Destroyed"
+msgstr ""
+
+#: dialogs/scoredlg.cc:45
+msgid ""
+"Ships\n"
+"Destroyed"
+msgstr ""
+
+#: dialogs/fleetdlg.cc:44
+msgid "Fleet Overview"
+msgstr "Trosolwg Llynges"
+
+#: dialogs/fleetdlg.cc:50
+msgid "Fleet No."
+msgstr "Rhif Llynges."
+
+#: dialogs/fleetdlg.cc:50
+msgid "Destination"
+msgstr "Cyrchfan"
+
+#: dialogs/fleetdlg.cc:50
+msgid "Ships"
+msgstr "Llongau"
+
+#: dialogs/fleetdlg.cc:51
+msgid "Kill Percentage"
+msgstr "Canran Lladd"
+
+#: dialogs/fleetdlg.cc:51
+msgid "Arrival Turn"
+msgstr "Tro Cyrraedd"
+
+#: dialogs/fleetdlg.cc:87 gameview.cc:121
+msgid "Standing order"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:71
+#, kde-format
+msgctxt "Default player name is \"player \" + player number"
+msgid "Player %1"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:109 dialogs/newgamedlg.cc:160
+#: dialogs/newgamedlg.cc:169 dialogs/newgamedlg.cc:268
+msgctxt "A human player"
+msgid "Human"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:115 dialogs/newgamedlg.cc:154
+#: dialogs/newgamedlg.cc:172 dialogs/newgamedlg.cc:269
+msgid "Computer Weak"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:116 dialogs/newgamedlg.cc:156
+#: dialogs/newgamedlg.cc:174 dialogs/newgamedlg.cc:270
+msgid "Computer Normal"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:117 dialogs/newgamedlg.cc:158
+#: dialogs/newgamedlg.cc:176 dialogs/newgamedlg.cc:271
+msgid "Computer Hard"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:130
+msgctxt "The player name"
+msgid "Name"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:131
+msgid "Type"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:299
+msgid "Start New Game"
+msgstr "Dechrau Gêm Newydd"
+
+#: dialogs/newgamedlg.cc:338
+msgid "vacant"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:341
+msgid "neutral"
+msgstr ""
+
+#: dialogs/newgamedlg.cc:431
+msgid "The game is much more fun when you add a human player!"
+msgstr "Mae'r gêm yn llawer mwy o hwyl pan mae chwaraewr dynol hefyd!"
 
 #: Konquest.cc:30
 msgid "Galactic Strategy KDE Game"
@@ -30,7 +145,7 @@
 msgstr "Konquest"
 
 #: Konquest.cc:38
-msgid "Copyright (c) 1999-2010, Developers"
+msgid "Copyright (c) 1999-2011, Developers"
 msgstr ""
 
 #: Konquest.cc:40
@@ -57,7 +172,7 @@
 msgid "Inge Wallin"
 msgstr ""
 
-#: Konquest.cc:43 Konquest.cc:44
+#: Konquest.cc:43
 msgid "Cleaning and bugfixing"
 msgstr ""
 
@@ -65,6 +180,10 @@
 msgid "Pierre Ducroquet"
 msgstr ""
 
+#: Konquest.cc:44
+msgid "Cleaning and bugfixing, maintenance"
+msgstr ""
+
 #: Konquest.cc:45
 msgid "Sean D'Epagnier"
 msgstr ""
@@ -73,80 +192,34 @@
 msgid "Gameplay Enhancements"
 msgstr ""
 
-#: fleetdlg.cc:44
-msgid "Fleet Overview"
-msgstr "Trosolwg Llynges"
-
-#: fleetdlg.cc:50
-msgid "Fleet No."
-msgstr "Rhif Llynges."
-
-#: fleetdlg.cc:50
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: fleetdlg.cc:50
-msgid "Ships"
-msgstr "Llongau"
-
-#: fleetdlg.cc:51
-msgid "Kill Percentage"
-msgstr "Canran Lladd"
-
-#: fleetdlg.cc:51
-msgid "Arrival Turn"
-msgstr "Tro Cyrraedd"
+#: gameview.cc:108
+msgid "End Turn"
+msgstr "Gorffen Tro"
 
-#: gamelogic.cc:180
+#: gameview.cc:283
 #, kde-format
-msgid "The once mighty empire of %1 has fallen in ruins."
+msgid "<qt>%1: Select source planet...</qt>"
 msgstr ""
-"Mae'r ymerodraeth %1, a oedd mor gryf yn yr oes a fu, wedi mynd yn furlun."
 
-#: gamelogic.cc:187
+#: gameview.cc:301
 #, kde-format
-msgid "The fallen empire of %1 has staggered back to life."
+msgid "<qt>%1: Select destination planet...</qt>"
 msgstr ""
-"Mae'r ymerodraeth %1, a syrthiodd mor drwm, wedi ailflodeuo rywfaint."
 
-#: gamelogic.cc:208
-#, kde-format
-msgid "Reinforcements (1 ship) have arrived for planet %2."
-msgid_plural "Reinforcements (%1 ships) have arrived for planet %2."
-msgstr[0] ""
-msgstr[1] ""
-
-#: gamelogic.cc:258
-#, kde-format
-msgid "Planet %2 has held against an attack from %1."
-msgstr "Mae planed %2 wedi bwrw'n ôl ymosodiad gan %1."
+#: gameview.cc:312
+msgid "Not enough ships to send."
+msgstr "Dim digon o longau i'w hanfon."
 
-#: gamelogic.cc:266
+#: gameview.cc:325
 #, kde-format
-msgid "Planet %2 has fallen to %1."
-msgstr "Mae planed %2 wedi syrthio i %1."
-
-#: gameview.cc:110
-msgid "End Turn"
-msgstr "Gorffen Tro"
-
-#: gameview.cc:280
-msgid "Select source planet..."
-msgstr "Dewis planed darddiad..."
-
-#: gameview.cc:300
-msgid "Select destination planet..."
-msgstr "Dewis planed gyrchfan..."
-
-#: gameview.cc:323
-msgid ": How many ships?"
-msgstr ": Sawl llong?"
+msgid "%1: How many ships?"
+msgstr ""
 
-#: gameview.cc:347
+#: gameview.cc:349
 msgid "Ruler: Select starting planet."
 msgstr "Rheolydd: Dewis planed gychwynnol."
 
-#: gameview.cc:361
+#: gameview.cc:363
 #, kde-format
 msgid ""
 "The distance from Planet %1 to Planet %2 is %3 light years.\n"
@@ -155,312 +228,242 @@
 "%3 o flynyddoedd golau yw'r pellter rhwng Planed %1 a Planed %2.\n"
 "Bydd llong sy'n gadael ar y tro yma yn cyrraedd ar dro %4"
 
-#: gameview.cc:367
+#: gameview.cc:369
 msgid "Distance"
 msgstr "Pellter"
 
-#: gameview.cc:372
+#: gameview.cc:374
 msgid "Ruler: Select ending planet."
 msgstr "Rheolydd: Dewis planed terfynol."
 
-#: gameview.cc:410
-#, kde-format
-msgid "Messages for %1"
-msgstr ""
-
-#: gameview.cc:425
-#, kde-format
-msgid "The mighty %1 has conquered the galaxy!"
-msgstr "Mae %1 nerthol wedi gorchfygu'r Alaeth!"
-
-#: gameview.cc:426
-msgid "Game Over"
-msgstr "Gêm Drosodd"
-
-#: gameview.cc:473
+#: gameview.cc:420
 #, kde-format
 msgid "Turn %1:"
 msgstr ""
 
-#: gameview.cc:566
+#: gameview.cc:494
 msgid "Do you wish to retire this game?"
 msgstr "Ydych eisiau ymddeol o'r gêm yma?"
 
-#: gameview.cc:567
+#: gameview.cc:495
 msgid "End Game"
 msgstr "Gorffen Gêm"
 
-#: gameview.cc:580
+#: gameview.cc:510
 msgid "Final Standings"
 msgstr "Sefyllfa Derfynol"
 
-#: gameview.cc:757
-msgid "Not enough ships to send."
-msgstr "Dim digon o longau i'w hanfon."
-
-#: gameview.cc:783
+#: gameview.cc:669
 msgid "Current Standings"
 msgstr "Sefylfa Gyfredol"
 
-#: mainwin.cc:49 mainwin.cc:56
-msgid "Galactic Conquest"
-msgstr "Gorchfygiad Galaethol"
-
-#: mainwin.cc:80
-msgid "&Measure Distance"
-msgstr "&Mesur Pellter"
-
-#: mainwin.cc:88
-msgid "&Show Standings"
-msgstr "Dang&os Sefyllfa"
-
-#: mainwin.cc:96
-msgid "&Fleet Overview"
-msgstr "Trosolwg Llyn&ges"
-
-#: mainwin.cc:135
+#: game.cpp:111
 #, kde-format
-msgid "Turn # %1"
-msgstr ""
-
-#: mapitems.cc:226
-#, kde-format
-msgid "Planet name: %1"
-msgstr "Enw'r planed: %1"
-
-#: mapitems.cc:231
-#, kde-format
-msgid "Owner: %1"
-msgstr "Perchennog: %1"
-
-#: mapitems.cc:234
-#, kde-format
-msgid "Ships: %1"
-msgstr "Llongau : %1"
-
-#: mapitems.cc:237
-#, kde-format
-msgid "Production: %1"
-msgstr "Cynhyrchiad: %1"
+msgid "Reinforcements (1 ship) have arrived for planet %2."
+msgid_plural "Reinforcements (%1 ships) have arrived for planet %2."
+msgstr[0] ""
+msgstr[1] ""
 
-#: mapitems.cc:239
+#: game.cpp:156
 #, kde-format
-msgid "Kill percent: %1"
-msgstr "Canran lladd: %1"
-
-#: newgamedlg.cc:99 newgamedlg.cc:136 newgamedlg.cc:233
-msgctxt "A human player"
-msgid "Human"
-msgstr ""
-
-#: newgamedlg.cc:100 newgamedlg.cc:138 newgamedlg.cc:234
-msgid "Computer Weak"
-msgstr ""
-
-#: newgamedlg.cc:101 newgamedlg.cc:140 newgamedlg.cc:235
-msgid "Computer Normal"
-msgstr ""
-
-#: newgamedlg.cc:102 newgamedlg.cc:142 newgamedlg.cc:236
-msgid "Computer Hard"
-msgstr ""
-
-#: newgamedlg.cc:114
-msgctxt "The player name"
-msgid "Name"
-msgstr ""
-
-#: newgamedlg.cc:115
-msgid "Type"
-msgstr ""
+msgid "Planet %2 has held against an attack from %1."
+msgstr "Mae planed %2 wedi bwrw'n ôl ymosodiad gan %1."
 
-#: newgamedlg.cc:163
+#: game.cpp:164
 #, kde-format
-msgctxt "Default player name is \"player \" + player number"
-msgid "Player %1"
-msgstr ""
-
-#: newgamedlg.cc:267
-msgid "Start New Game"
-msgstr "Dechrau Gêm Newydd"
-
-#: newgamedlg.cc:398
-msgid "The game is much more fun when you add a human player!"
-msgstr "Mae'r gêm yn llawer mwy o hwyl pan mae chwaraewr dynol hefyd!"
-
-#: scoredlg.cc:43
-msgctxt "The player name"
-msgid "Player"
-msgstr ""
-
-#: scoredlg.cc:43
-msgid ""
-"Ships\n"
-"Built"
-msgstr ""
-
-#: scoredlg.cc:44
-msgid ""
-"Planets\n"
-"Conquered"
-msgstr ""
-
-#: scoredlg.cc:44
-msgid ""
-"Fleets\n"
-"Launched"
-msgstr ""
-
-#: scoredlg.cc:45
-msgid ""
-"Fleets\n"
-"Destroyed"
-msgstr ""
-
-#: scoredlg.cc:45
-msgid ""
-"Ships\n"
-"Destroyed"
-msgstr ""
+msgid "Planet %2 has fallen to %1."
+msgstr "Mae planed %2 wedi syrthio i %1."
 
-#: rc.cpp:67
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, dylunio, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:68
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: konquestui.rc:10
-#. i18n: ectx: Menu (game)
-#: rc.cpp:3 rc.cpp:71
-msgid "&Game"
-msgstr ""
-
-#. i18n: file: konquestui.rc:17
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:6 rc.cpp:74
-msgid "Main Toolbar"
-msgstr ""
-
-#. i18n: file: newGameDialog.ui:14
+#. i18n: file: dialogs/newGameDialog.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, newGameDialog)
-#: rc.cpp:9 rc.cpp:77
+#: rc.cpp:5
 msgid "Dialog"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:26
+#. i18n: file: dialogs/newGameDialog.ui:26
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:12 rc.cpp:80
+#: rc.cpp:8
 msgid "Players"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:45
+#. i18n: file: dialogs/newGameDialog.ui:45
 #. i18n: ectx: property (text), widget (QPushButton, addPlayerButton)
-#: rc.cpp:15 rc.cpp:83
+#: rc.cpp:11
 msgid "&Add"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:52
+#. i18n: file: dialogs/newGameDialog.ui:52
 #. i18n: ectx: property (text), widget (QPushButton, removePlayerButton)
-#: rc.cpp:18 rc.cpp:86
+#: rc.cpp:14
 msgid "&Remove"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:68
+#. i18n: file: dialogs/newGameDialog.ui:68
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:21 rc.cpp:89
+#: rc.cpp:17
 msgid "Map"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:74
+#. i18n: file: dialogs/newGameDialog.ui:74
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:24 rc.cpp:92
+#: rc.cpp:20
 msgid "&Neutral planets:"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:97
+#. i18n: file: dialogs/newGameDialog.ui:97
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:27 rc.cpp:95
+#: rc.cpp:23
 msgid "&Width:"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:120
+#. i18n: file: dialogs/newGameDialog.ui:120
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:30 rc.cpp:98
+#: rc.cpp:26
 msgid "&Height:"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:153
+#. i18n: file: dialogs/newGameDialog.ui:153
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:33 rc.cpp:101
+#: rc.cpp:29
 msgid "Production:"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:192
+#. i18n: file: dialogs/newGameDialog.ui:192
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:36 rc.cpp:104
+#: rc.cpp:32
 msgid "Kill Percentage:"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:202
+#. i18n: file: dialogs/newGameDialog.ui:202
 #. i18n: ectx: property (text), widget (QPushButton, randomizeMap)
-#: rc.cpp:39 rc.cpp:107
+#: rc.cpp:35
 msgid "&Randomize"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:209
+#. i18n: file: dialogs/newGameDialog.ui:209
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:42 rc.cpp:110
+#: rc.cpp:38
 msgid "Owner"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:228
+#. i18n: file: dialogs/newGameDialog.ui:228
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:45 rc.cpp:113
+#: rc.cpp:41
 msgid "Options"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:234
+#. i18n: file: dialogs/newGameDialog.ui:234
 #. i18n: ectx: property (text), widget (QCheckBox, BlindMapCB)
-#: rc.cpp:48 rc.cpp:116
+#: rc.cpp:44
 msgid "Blind Map"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:241
+#. i18n: file: dialogs/newGameDialog.ui:241
 #. i18n: ectx: property (text), widget (QCheckBox, CumulativeProductionCB)
-#: rc.cpp:51 rc.cpp:119
+#: rc.cpp:47
 msgid "Cumulative Production"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:248
+#. i18n: file: dialogs/newGameDialog.ui:248
 #. i18n: ectx: property (text), widget (QCheckBox, ProductionAfterConquereCB)
-#: rc.cpp:54 rc.cpp:122
+#: rc.cpp:50
 msgid "Production After Capture"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:258
+#. i18n: file: dialogs/newGameDialog.ui:258
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:57 rc.cpp:125
+#: rc.cpp:53
 msgid "Neutrals"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:273
+#. i18n: file: dialogs/newGameDialog.ui:273
 #. i18n: ectx: property (text), widget (QCheckBox, NeutralsShowShipsCB)
-#: rc.cpp:60 rc.cpp:128
+#: rc.cpp:56
 msgid "Show Ships"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:280
+#. i18n: file: dialogs/newGameDialog.ui:280
 #. i18n: ectx: property (text), widget (QCheckBox, NeutralsShowStatsCB)
-#: rc.cpp:63 rc.cpp:131
+#: rc.cpp:59
 msgid "Show Stats"
 msgstr ""
 
-#. i18n: file: newGameDialog.ui:287
+#. i18n: file: dialogs/newGameDialog.ui:287
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:66 rc.cpp:134
+#: rc.cpp:62
 msgid "Production"
 msgstr ""
+
+#. i18n: file: konquestui.rc:10
+#. i18n: ectx: Menu (game)
+#: rc.cpp:65
+msgid "&Game"
+msgstr ""
+
+#. i18n: file: konquestui.rc:17
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:68
+msgid "Main Toolbar"
+msgstr ""
+
+#: map/mapitems.cc:228
+#, kde-format
+msgid "Planet name: %1"
+msgstr "Enw'r planed: %1"
+
+#: map/mapitems.cc:233
+#, kde-format
+msgid "Owner: %1"
+msgstr "Perchennog: %1"
+
+#: map/mapitems.cc:236
+#, kde-format
+msgid "Ships: %1"
+msgstr "Llongau : %1"
+
+#: map/mapitems.cc:246
+#, kde-format
+msgctxt "regarding standing orders"
+msgid "Ships due: %1"
+msgstr ""
+
+#: map/mapitems.cc:249
+#, kde-format
+msgid "Production: %1"
+msgstr "Cynhyrchiad: %1"
+
+#: map/mapitems.cc:251
+#, kde-format
+msgid "Kill percent: %1"
+msgstr "Canran lladd: %1"
+
+#: mainwin.cc:48 mainwin.cc:55
+msgid "Galactic Conquest"
+msgstr "Gorchfygiad Galaethol"
+
+#: mainwin.cc:79
+msgid "&Measure Distance"
+msgstr "&Mesur Pellter"
+
+#: mainwin.cc:85
+msgid "&Show Standings"
+msgstr "Dang&os Sefyllfa"
+
+#: mainwin.cc:91
+msgid "&Fleet Overview"
+msgstr "Trosolwg Llyn&ges"
+
+#: mainwin.cc:145
+#, kde-format
+msgid "Turn # %1"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konsolekalendar.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konsolekalendar.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konsolekalendar.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konsolekalendar.po	2012-04-18 08:59:26.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: konsolekalendar\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 02:46+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-16 23:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:41+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: konsolekalendar.cpp:85
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konsole.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konsole.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/konsole.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/konsole.po	2012-04-18 08:59:37.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: konsole\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 17:24+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
 "PO-Revision-Date: 2009-07-18 18:13+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -20,198 +20,250 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:41+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: BookmarkHandler.cpp:134
+#: BookmarkHandler.cpp:121
 #, kde-format
 msgctxt "@item:inmenu The user's name and host they are connected to via ssh"
 msgid "%1 on %2"
 msgstr ""
 
-#: BookmarkHandler.cpp:136
+#: BookmarkHandler.cpp:123
 #, kde-format
 msgctxt "@item:inmenu The host the user is connected to via ssh"
 msgid "%1"
 msgstr ""
 
-#: ColorScheme.cpp:93
+#: ColorScheme.cpp:94
+msgctxt "@item:intable palette"
 msgid "Foreground"
 msgstr ""
 
-#: ColorScheme.cpp:94
+#: ColorScheme.cpp:95
+msgctxt "@item:intable palette"
 msgid "Background"
 msgstr ""
 
-#: ColorScheme.cpp:95
+#: ColorScheme.cpp:96
+msgctxt "@item:intable palette"
 msgid "Color 1"
 msgstr ""
 
-#: ColorScheme.cpp:96
+#: ColorScheme.cpp:97
+msgctxt "@item:intable palette"
 msgid "Color 2"
 msgstr ""
 
-#: ColorScheme.cpp:97
+#: ColorScheme.cpp:98
+msgctxt "@item:intable palette"
 msgid "Color 3"
 msgstr ""
 
-#: ColorScheme.cpp:98
+#: ColorScheme.cpp:99
+msgctxt "@item:intable palette"
 msgid "Color 4"
 msgstr ""
 
-#: ColorScheme.cpp:99
+#: ColorScheme.cpp:100
+msgctxt "@item:intable palette"
 msgid "Color 5"
 msgstr ""
 
-#: ColorScheme.cpp:100
+#: ColorScheme.cpp:101
+msgctxt "@item:intable palette"
 msgid "Color 6"
 msgstr ""
 
-#: ColorScheme.cpp:101
+#: ColorScheme.cpp:102
+msgctxt "@item:intable palette"
 msgid "Color 7"
 msgstr ""
 
-#: ColorScheme.cpp:102
+#: ColorScheme.cpp:103
+msgctxt "@item:intable palette"
 msgid "Color 8"
 msgstr ""
 
-#: ColorScheme.cpp:103
+#: ColorScheme.cpp:104
+msgctxt "@item:intable palette"
 msgid "Foreground (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:104
+#: ColorScheme.cpp:105
+msgctxt "@item:intable palette"
 msgid "Background (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:105
+#: ColorScheme.cpp:106
+msgctxt "@item:intable palette"
 msgid "Color 1 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:106
+#: ColorScheme.cpp:107
+msgctxt "@item:intable palette"
 msgid "Color 2 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:107
+#: ColorScheme.cpp:108
+msgctxt "@item:intable palette"
 msgid "Color 3 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:108
+#: ColorScheme.cpp:109
+msgctxt "@item:intable palette"
 msgid "Color 4 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:109
+#: ColorScheme.cpp:110
+msgctxt "@item:intable palette"
 msgid "Color 5 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:110
+#: ColorScheme.cpp:111
+msgctxt "@item:intable palette"
 msgid "Color 6 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:111
+#: ColorScheme.cpp:112
+msgctxt "@item:intable palette"
 msgid "Color 7 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:112
+#: ColorScheme.cpp:113
+msgctxt "@item:intable palette"
 msgid "Color 8 (Intense)"
 msgstr ""
 
-#: ColorScheme.cpp:269
+#: ColorScheme.cpp:273
 msgid "Un-named Color Scheme"
 msgstr ""
 
-#: ColorScheme.cpp:386
+#: ColorScheme.cpp:444
 msgid "Accessible Color Scheme"
 msgstr ""
 
-#: ColorSchemeEditor.cpp:83
+#: ColorSchemeEditor.cpp:72
 msgctxt "@label:listbox Column header text for color names"
 msgid "Name"
 msgstr ""
 
-#: ColorSchemeEditor.cpp:83
+#: ColorSchemeEditor.cpp:72
 msgctxt "@label:listbox Column header text for the actual colors"
 msgid "Color"
 msgstr ""
 
-#: ColorSchemeEditor.cpp:104
+#: ColorSchemeEditor.cpp:93
 msgctxt "@info:status"
 msgid ""
 "The background transparency setting will not be used because your desktop "
 "does not appear to support transparent windows."
 msgstr ""
 
+#: ColorSchemeEditor.cpp:130
+msgctxt "@action:button"
+msgid "Select wallpaper image file"
+msgstr ""
+
 #: CopyInputDialog.cpp:35
 msgid "Copy Input"
 msgstr ""
 
-#: EditProfileDialog.cpp:63
+#: EditProfileDialog.cpp:70
 msgid "Edit Profile"
 msgstr ""
 
-#: EditProfileDialog.cpp:149
+#: EditProfileDialog.cpp:141
+msgid ""
+"<p>Each profile must have a name before it can be saved into disk.</p>"
+msgstr ""
+
+#: EditProfileDialog.cpp:176
 #, kde-format
 msgid "Editing profile: %2"
 msgid_plural "Editing %1 profiles: %2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: EditProfileDialog.cpp:152
+#: EditProfileDialog.cpp:183
 #, kde-format
 msgid "Edit Profile \"%1\""
 msgstr ""
 
-#: EditProfileDialog.cpp:283
+#: EditProfileDialog.cpp:260
+msgid "Profile name is empty."
+msgstr ""
+
+#: EditProfileDialog.cpp:326
+msgid "One environment variable per line"
+msgstr ""
+
+#: EditProfileDialog.cpp:328
 msgid "Edit Environment"
 msgstr ""
 
-#: EditProfileDialog.cpp:309
+#: EditProfileDialog.cpp:355
 msgid "Always Hide Tab Bar"
 msgstr ""
 
-#: EditProfileDialog.cpp:310
+#: EditProfileDialog.cpp:356
 msgid "Show Tab Bar When Needed"
 msgstr ""
 
-#: EditProfileDialog.cpp:311
+#: EditProfileDialog.cpp:357
 msgid "Always Show Tab Bar"
 msgstr ""
 
-#: EditProfileDialog.cpp:316
+#: EditProfileDialog.cpp:362
 msgid "Below Terminal Displays"
 msgstr ""
 
-#: EditProfileDialog.cpp:317
+#: EditProfileDialog.cpp:363
 msgid "Above Terminal Displays"
 msgstr ""
 
-#: EditProfileDialog.cpp:413
-msgid "Select Initial Directory"
+#: EditProfileDialog.cpp:368
+msgid "Put New Tab At The End"
 msgstr ""
 
-#: EditProfileDialog.cpp:430
-msgid ""
-"This color scheme uses a transparent background which does not appear to be "
-"supported on your desktop"
+#: EditProfileDialog.cpp:369
+msgid "Put New Tab After Current Tab"
+msgstr ""
+
+#: EditProfileDialog.cpp:495
+msgid "Select Initial Directory"
 msgstr ""
 
-#: EditProfileDialog.cpp:596
+#: EditProfileDialog.cpp:688
 #, kde-format
 msgid "%1, size %2"
 msgstr ""
 
-#: EditProfileDialog.cpp:709 EditProfileDialog.cpp:718
+#: EditProfileDialog.cpp:801 EditProfileDialog.cpp:810
 msgid "New Color Scheme"
 msgstr ""
 
-#: EditProfileDialog.cpp:711
+#: EditProfileDialog.cpp:803
 msgid "Edit Color Scheme"
 msgstr ""
 
-#: EditProfileDialog.cpp:844 EditProfileDialog.cpp:855
+#: EditProfileDialog.cpp:879
+msgid ""
+"This color scheme uses a transparent background which does not appear to be "
+"supported on your desktop"
+msgstr ""
+
+#: EditProfileDialog.cpp:886
+msgid ""
+"Konsole was started before desktop effects were enabled. You need to restart "
+"Konsole to see transparent background."
+msgstr ""
+
+#: EditProfileDialog.cpp:997 EditProfileDialog.cpp:1008
 msgid "New Key Binding List"
 msgstr ""
 
-#: EditProfileDialog.cpp:846
+#: EditProfileDialog.cpp:999
 msgid "Edit Key Binding List"
 msgstr ""
 
@@ -231,59 +283,59 @@
 msgid "Copy Email Address"
 msgstr ""
 
-#: HistorySizeDialog.cpp:51 SessionController.cpp:527
-msgid "Scrollback Options"
+#: HistorySizeDialog.cpp:47
+msgid "Adjust Scrollback"
 msgstr ""
 
-#: HistorySizeDialog.cpp:64
+#: HistorySizeDialog.cpp:58
 msgid "No scrollback"
 msgstr ""
 
-#: HistorySizeDialog.cpp:65
+#: HistorySizeDialog.cpp:59
 msgid "Fixed size scrollback: "
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:684
+#. i18n: file: EditProfileDialog.ui:757
 #. i18n: ectx: property (text), widget (QRadioButton, unlimitedScrollbackButton)
-#: HistorySizeDialog.cpp:66 rc.cpp:199 rc.cpp:686
+#: HistorySizeDialog.cpp:60 rc.cpp:260
 msgid "Unlimited scrollback"
 msgstr ""
 
-#: HistorySizeDialog.cpp:67
-msgid "Save to current profile"
+#: HistorySizeDialog.cpp:82
+msgid "lines"
 msgstr ""
 
-#: HistorySizeDialog.cpp:87
-msgid "lines"
+#: HistorySizeDialog.cpp:89
+msgid "<center>The adjustment is only temporary</center>"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:53
+#: IncrementalSearchBar.cpp:52
 msgid "Close the search bar"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:58
+#: IncrementalSearchBar.cpp:57
 msgid "Find:"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:63
+#: IncrementalSearchBar.cpp:62
 msgid "Enter the text to search for here"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:82
+#: IncrementalSearchBar.cpp:81
 msgctxt "@action:button Go to the next phrase"
 msgid "Next"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:86
+#: IncrementalSearchBar.cpp:84
 msgid "Find the next match for the current search phrase"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:91
+#: IncrementalSearchBar.cpp:89
 msgctxt "@action:button Go to the previous phrase"
 msgid "Previous"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:95
+#: IncrementalSearchBar.cpp:92
 msgid "Find the previous match for the current search phrase"
 msgstr ""
 
@@ -300,11 +352,11 @@
 msgid "Case sensitive"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:112
+#: IncrementalSearchBar.cpp:117
 msgid "Sets whether the search is case sensitive"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:118
+#: IncrementalSearchBar.cpp:121
 msgid "Match regular expression"
 msgstr ""
 
@@ -312,1572 +364,1679 @@
 msgid "Highlight all matches"
 msgstr ""
 
-#: IncrementalSearchBar.cpp:102
+#: IncrementalSearchBar.cpp:128
 msgid "Sets whether matching text should be highlighted"
 msgstr ""
 
-#: KeyBindingEditor.cpp:49
+#: KeyBindingEditor.cpp:50
 msgid "Key Combination"
 msgstr ""
 
-#: KeyBindingEditor.cpp:49
+#: KeyBindingEditor.cpp:50
 msgid "Output"
 msgstr ""
 
-#: MainWindow.cpp:242
-msgid "&New Tab"
-msgstr ""
-
-#: MainWindow.cpp:241
-msgid "New &Window"
-msgstr "&Ffenestr Newydd"
+#: main.cpp:59
+msgid "Konsole"
+msgstr "Konsole"
 
-#: MainWindow.cpp:257
-msgid "&Bookmarks"
+#: main.cpp:61
+msgid "Terminal emulator"
 msgstr ""
 
-#: MainWindow.cpp:295 Part.cpp:116
-msgid "Configure Profiles..."
+#: main.cpp:103
+msgid "Name of profile to use for new Konsole instance"
 msgstr ""
 
-#: MainWindow.cpp:305
-msgid "Activate Menu"
+#: main.cpp:104
+msgid "List the available profiles"
 msgstr ""
 
-#: MainWindow.cpp:362
-msgid "You have multiple tabs in this window, are you sure you want to quit?"
+#: main.cpp:106
+msgid ""
+"Start Konsole in the background and bring to the front when the F12 key is "
+"pressed"
 msgstr ""
 
-#: MainWindow.cpp:364 SessionController.cpp:632
-msgid "Confirm Close"
+#: main.cpp:109
+msgid ""
+"Create a new tab in an existing window rather than creating a new window"
 msgstr ""
 
-#: MainWindow.cpp:366
-msgid "Close Current Tab"
+#: main.cpp:110
+msgid "Create tabs as specified in given tabs configuration file"
 msgstr ""
 
-#: ManageProfilesDialog.cpp:48
-msgctxt "@title:window"
-msgid "Manage Profiles"
+#: main.cpp:111
+msgid "Set the initial working directory of the new tab or window to 'dir'"
 msgstr ""
 
-#: ManageProfilesDialog.cpp:217
-msgctxt "@title:column Profile label"
-msgid "Name"
+#: main.cpp:113
+msgid "Disable transparent backgrounds, even if the system supports them."
 msgstr ""
 
-#: ManageProfilesDialog.cpp:218
-msgctxt "@title:column Display profile in file menu"
-msgid "Show in Menu"
+#: main.cpp:114
+msgid ""
+"Try to enable transparency, even if the system does not appear to support it."
 msgstr ""
 
-#: ManageProfilesDialog.cpp:219
-msgctxt "@title:column Profile shortcut text"
-msgid "Shortcut"
+#: main.cpp:116
+msgid "Do not close the initial session automatically when it ends."
 msgstr ""
 
-#: ManageProfilesDialog.cpp:347
-msgctxt "@item This will be used as part of the file name"
-msgid "New Profile"
+#: main.cpp:118
+msgid "Change the value of a profile property."
 msgstr ""
 
-#: Profile.cpp:145
-msgid "Shell"
+#: main.cpp:119
+msgid ""
+"List all the profile properties names and their type (for use with -p)"
 msgstr ""
 
-#: ProfileList.cpp:49
-msgid "Default profile"
+#: main.cpp:120
+msgid "Debian policy compatibility, not used"
 msgstr ""
 
-#: SessionController.cpp:582
-msgid "Rename Tab"
+#: main.cpp:121
+msgid "Command to execute"
 msgstr ""
 
-#: Session.cpp:333
-msgid "Could not find binary: "
+#: main.cpp:122
+msgid "Arguments passed to command"
 msgstr ""
 
-#: Session.cpp:376
-msgctxt "@info:shell Alert the user with red color text"
-msgid "Warning: "
+#: main.cpp:123
+msgid "Use --nofork to run in the foreground (helpful with the -e option)."
 msgstr ""
 
-#: Session.cpp:383
-#, kde-format
-msgid ""
-"Could not find '%1', starting '%2' instead.  Please check your profile "
-"settings."
+#: main.cpp:128
+msgid "Kurt Hindenburg"
 msgstr ""
 
-#: Session.cpp:388
-msgid "Could not find an interactive shell to start."
+#: main.cpp:129
+msgid "General maintainer, bug fixes and general improvements"
 msgstr ""
 
-#: Session.cpp:422
-#, kde-format
-msgid "Could not start program '%1' with arguments '%2'."
+#: main.cpp:131
+msgid "Robert Knight"
 msgstr ""
 
-#: Session.cpp:532
-#, kde-format
-msgid "Silence in session '%1'"
-msgstr "Tawelwch yn sesiwn '%1'"
-
-#: Session.cpp:567
-#, kde-format
-msgid "Bell in session '%1'"
-msgstr "Cloch yn sesiwn '%1'"
-
-#: Session.cpp:578
-#, kde-format
-msgid "Activity in session '%1'"
-msgstr "Gweithgarwch yn sesiwn '%1'"
-
-#: Session.cpp:771
-msgctxt "@info:shell This session is done"
-msgid "Finished"
+#: main.cpp:132
+msgid "Previous maintainer, ported to KDE4"
 msgstr ""
 
-#: Session.cpp:731
-#, kde-format
-msgid "Program '%1' exited with status %2."
+#: main.cpp:134
+msgid "Lars Doelle"
 msgstr ""
 
-#: Session.cpp:733
-#, kde-format
-msgid "Program '%1' crashed."
+#: main.cpp:135
+msgid "Original author"
 msgstr ""
 
-#: Session.cpp:1049
-msgid "ZModem Progress"
-msgstr "Cynnydd ZModem"
-
-#: SessionController.cpp:278
-msgid "Konsole does not know how to open the bookmark: "
+#: main.cpp:137
+msgid "Jekyll Wu"
 msgstr ""
 
-#: SessionController.cpp:396
-msgid "&Close Tab"
+#: main.cpp:138 main.cpp:141 main.cpp:144
+msgid "Bug fixes and general improvements"
 msgstr ""
 
-#: SessionController.cpp:402
-msgid "Open File Manager"
+#: main.cpp:140
+msgid "Waldo Bastian"
 msgstr ""
 
-#: SessionController.cpp:426
-msgid "Paste Selection"
-msgstr "Gludo'r Dewisiad"
-
-#: SessionController.cpp:432
-msgid "&Rename Tab..."
+#: main.cpp:143
+msgid "Stephan Binner"
 msgstr ""
 
-#: SessionController.cpp:438
-msgid "&All Tabs in Current Window"
+#: main.cpp:146
+msgid "Thomas Dreibholz"
 msgstr ""
 
-#: SessionController.cpp:445
-msgid "&Select Tabs..."
+#: main.cpp:147
+msgid "General improvements"
 msgstr ""
 
-#: SessionController.cpp:436
-msgctxt "@action:inmenu Do not select any tabs"
-msgid "&None"
+#: main.cpp:149
+msgid "Chris Machemer"
 msgstr ""
 
-#: SessionController.cpp:464
-msgid "&ZModem Upload..."
-msgstr "Fyny-lwytho â &ZModem..."
-
-#: SessionController.cpp:470
-msgid "Monitor for &Activity"
-msgstr "Archwilio am &Weithgarwch"
-
-#: SessionController.cpp:475
-msgid "Monitor for &Silence"
-msgstr "Archwilio am &Dawelwch"
-
-#: SessionController.cpp:458
-msgid "Set &Encoding"
+#: main.cpp:150 main.cpp:186 main.cpp:189 main.cpp:192 main.cpp:195
+msgid "Bug fixes"
 msgstr ""
 
-#: SessionController.cpp:466
-msgid "Enlarge Font"
-msgstr "Cynyddu Maint yr Wynebfath"
-
-#: SessionController.cpp:471
-msgid "Shrink Font"
-msgstr "Lleihau Wynebfath"
-
-#: SessionController.cpp:489
-msgid "Save Output &As..."
+#: main.cpp:152
+msgid "Stephan Kulow"
 msgstr ""
 
-#: SessionController.cpp:492
-msgid "Configure Scrollback..."
+#: main.cpp:153
+msgid "Solaris support and history"
 msgstr ""
 
-#: SessionController.cpp:496
-msgid "Clear Scrollback"
+#: main.cpp:155
+msgid "Alexander Neundorf"
 msgstr ""
 
-#: SessionController.cpp:500
-msgid "Clear Scrollback and Reset"
+#: main.cpp:156
+msgid "Bug fixes and improved startup performance"
 msgstr ""
 
-#: SessionController.cpp:506
-msgid "Configure Current Profile..."
+#: main.cpp:158
+msgid "Peter Silva"
 msgstr ""
 
-#: SessionController.cpp:542
-msgid "Change Profile"
+#: main.cpp:159
+msgid "Marking improvements"
 msgstr ""
 
-#: SessionController.cpp:626
-msgid ""
-"A program is currently running in this session.  Are you sure you want to "
-"close it?"
+#: main.cpp:161
+msgid "Lotzi Boloni"
 msgstr ""
 
-#: SessionController.cpp:629
-#, kde-format
+#: main.cpp:162
 msgid ""
-"The program '%1' is currently running in this session.  Are you sure you "
-"want to close it?"
+"Embedded Konsole\n"
+"Toolbar and session names"
 msgstr ""
 
-#: SessionController.cpp:1187
-msgid "Save ZModem Download to..."
+#: main.cpp:165
+msgid "David Faure"
 msgstr ""
 
-#: SessionController.cpp:1166
+#: main.cpp:166
 msgid ""
-"<p>A ZModem file transfer attempt has been detected, but no suitable ZModem "
-"software was found on this system.</p><p>You may wish to install the 'rzsz' "
-"or 'lrzsz' package.</p>"
+"Embedded Konsole\n"
+"General improvements"
 msgstr ""
 
-#: SessionController.cpp:1178
-msgid ""
-"<p>The current session already has a ZModem file transfer in progress.</p>"
+#: main.cpp:169
+msgid "Antonio Larrosa"
 msgstr ""
 
-#: SessionController.cpp:1187
-msgid ""
-"<p>No suitable ZModem software was found on this system.</p><p>You may wish "
-"to install the 'rzsz' or 'lrzsz' package.</p>"
+#: main.cpp:170
+msgid "Visual effects"
 msgstr ""
 
-#: SessionController.cpp:1223
-msgid "Select Files for ZModem Upload"
+#: main.cpp:172
+msgid "Matthias Ettrich"
 msgstr ""
 
-#: SessionController.cpp:1295
-#, kde-format
-msgid "Save Output From %1"
+#: main.cpp:173
+msgid ""
+"Code from the kvt project\n"
+"General improvements"
 msgstr ""
 
-#: SessionController.cpp:1306
-#, kde-format
-msgid "%1 is an invalid URL, the output could not be saved."
+#: main.cpp:176
+msgid "Warwick Allison"
 msgstr ""
 
-#: SessionController.cpp:1395
-#, kde-format
-msgid ""
-"A problem occurred when saving the output.\n"
-"%1"
+#: main.cpp:177
+msgid "Schema and text selection improvements"
 msgstr ""
 
-#: SessionManager.cpp:939
-msgctxt "@item:intable The session index"
-msgid "Number"
+#: main.cpp:179
+msgid "Dan Pilone"
 msgstr ""
 
-#: SessionManager.cpp:941
-msgctxt "@item:intable The session title"
-msgid "Title"
+#: main.cpp:180
+msgid "SGI port"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:34
-msgid "Program Name"
+#: main.cpp:182
+msgid "Kevin Street"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:35
-msgid "Current Directory (Short)"
-msgstr ""
+#: main.cpp:183
+msgid "FreeBSD port"
+msgstr "Porthiad FreeBSD"
 
-#: TabTitleFormatAction.cpp:36
-msgid "Current Directory (Long)"
+#: main.cpp:185
+msgid "Sven Fischer"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:37 TabTitleFormatAction.cpp:47
-msgid "Window Title Set by Shell"
+#: main.cpp:188
+msgid "Dale M. Flaven"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:38 TabTitleFormatAction.cpp:48
-msgid "Session Number"
+#: main.cpp:191
+msgid "Martin Jones"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:39 TabTitleFormatAction.cpp:44
-msgid "User Name"
+#: main.cpp:194
+msgid "Lars Knoll"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:45
-msgid "Remote Host (Short)"
+#: main.cpp:197
+msgid "Thanks to many others.\n"
 msgstr ""
 
-#: TabTitleFormatAction.cpp:46
-msgid "Remote Host (Long)"
+#: MainWindow.cpp:254
+msgid "&New Tab"
 msgstr ""
 
-#: TerminalDisplay.cpp:1126 TerminalDisplay.cpp:1127
-msgid "Size: XXX x XXX"
-msgstr "Maint: XXX x XXX"
-
-#: TerminalDisplay.cpp:1137
-#, kde-format
-msgid "Size: %1 x %2"
-msgstr "Maint: %1 x %2"
+#: MainWindow.cpp:263
+msgid "New &Window"
+msgstr "&Ffenestr Newydd"
 
-#: TerminalDisplay.cpp:2879
-msgid ""
-"<qt>Output has been <a "
-"href=\"http://en.wikipedia.org/wiki/Flow_control\">suspended</a> by pressing "
-"Ctrl+S.  Press <b>Ctrl+Q</b> to resume.</qt>"
+#: MainWindow.cpp:274
+msgid "&Bookmarks"
 msgstr ""
 
-#: ViewContainer.cpp:490
-msgctxt "@action:inmenu"
-msgid "&Detach Tab"
+#: MainWindow.cpp:292 Part.cpp:100
+msgid "Manage Profiles..."
 msgstr ""
 
-#: ViewContainer.cpp:494
-msgctxt "@action:inmenu"
-msgid "&Rename Tab..."
+#: MainWindow.cpp:298
+msgid "Activate Menu"
 msgstr ""
 
-#: ViewContainer.cpp:498
-msgctxt "@action:inmenu"
-msgid "&Close Tab"
+#: MainWindow.cpp:417
+msgid "You have multiple tabs in this window, are you sure you want to quit?"
 msgstr ""
 
-#: ViewManager.cpp:138
-msgid "Next Tab"
+#: MainWindow.cpp:419 SessionController.cpp:632 SessionController.cpp:658
+msgid "Confirm Close"
 msgstr ""
 
-#: ViewManager.cpp:139
-msgid "Previous Tab"
+#: MainWindow.cpp:421
+msgid "Close Current Tab"
 msgstr ""
 
-#: ViewManager.cpp:139
-msgid "Next View Container"
+#: ManageProfilesDialog.cpp:48
+msgctxt "@title:window"
+msgid "Manage Profiles"
 msgstr ""
 
-#: ViewManager.cpp:142
-msgid "Move Tab Left"
+#: ManageProfilesDialog.cpp:235
+msgctxt "@title:column Profile label"
+msgid "Name"
 msgstr ""
 
-#: ViewManager.cpp:143
-msgid "Move Tab Right"
+#: ManageProfilesDialog.cpp:236
+msgctxt "@title:column Display profile in file menu"
+msgid "Show in Menu"
 msgstr ""
 
-#: ViewManager.cpp:152
-msgctxt "@action:inmenu"
-msgid "Split View Left/Right"
+#: ManageProfilesDialog.cpp:237
+msgctxt "@title:column Profile shortcut text"
+msgid "Shortcut"
 msgstr ""
 
-#: ViewManager.cpp:159
-msgctxt "@action:inmenu"
-msgid "Split View Top/Bottom"
+#: ManageProfilesDialog.cpp:368
+msgctxt "@item This will be used as part of the file name"
+msgid "New Profile"
 msgstr ""
 
-#: ViewManager.cpp:164
-msgctxt "@action:inmenu Close Active View"
-msgid "Close Active"
+#: Profile.cpp:150
+msgid "Shell"
 msgstr ""
 
-#: ViewManager.cpp:173
-msgctxt "@action:inmenu Close Other Views"
-msgid "Close Others"
+#: ProfileList.cpp:47
+msgid "Default profile"
 msgstr ""
 
-#: ViewManager.cpp:184
-msgid "D&etach Current Tab"
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
 msgstr ""
+"KGyfieithu - meddalwedd rhydd yn Gymraeg, ,Launchpad Contributions:,KD at "
+"KGyfieithu"
 
-#: ViewManager.cpp:192
-msgctxt "@action:inmenu"
-msgid "Expand View"
-msgstr ""
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,"
 
-#: ViewManager.cpp:199
-msgctxt "@action:inmenu"
-msgid "Shrink View"
+#. i18n: file: ColorSchemeEditor.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: KeyBindingEditor.ui:21
+#. i18n: ectx: property (text), widget (QLabel, descriptionLabel)
+#: rc.cpp:5 rc.cpp:440
+msgid "Description:"
 msgstr ""
 
-#: ViewManager.cpp:219
-#, kde-format
-msgid "Switch to Tab %1"
+#. i18n: file: ColorSchemeEditor.ui:42
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:8
+msgid "Background transparency:"
 msgstr ""
 
-#: Vt102Emulation.cpp:967
-msgid ""
-"No keyboard translator available.  The information needed to convert key "
-"presses into characters to send to the terminal is missing."
+#. i18n: file: ColorSchemeEditor.ui:62
+#. i18n: ectx: property (text), widget (QLabel, transparencyPercentLabel)
+#: rc.cpp:11
+msgid "Percent"
 msgstr ""
 
-#: ZModemDialog.cpp:35
-msgid "&Stop"
-msgstr "&Gorffen"
-
-#: main.cpp:51
-msgid "Konsole"
-msgstr "Konsole"
+#. i18n: file: ColorSchemeEditor.ui:74
+#. i18n: ectx: property (text), widget (QCheckBox, randomizedBackgroundCheck)
+#: rc.cpp:14
+msgid "Vary the background color for each tab"
+msgstr ""
 
-#: main.cpp:53
-msgid "Terminal emulator"
+#. i18n: file: ColorSchemeEditor.ui:83
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:17
+msgid "Wallpaper:"
 msgstr ""
 
-#: main.cpp:91
-msgid "Name of profile to use for new Konsole instance"
+#. i18n: file: ColorSchemeEditor.ui:90
+#. i18n: ectx: property (toolTip), widget (KLineEdit, wallpaperPath)
+#: rc.cpp:20
+msgid "The wallpaper picture file path"
 msgstr ""
 
-#: main.cpp:92
-msgid "List the available profiles"
+#. i18n: file: ColorSchemeEditor.ui:97
+#. i18n: ectx: property (text), widget (QToolButton, wallpaperSelectButton)
+#. i18n: file: EditProfileDialog.ui:111
+#. i18n: ectx: property (text), widget (QToolButton, dirSelectButton)
+#: rc.cpp:23 rc.cpp:86
+msgid "..."
 msgstr ""
 
-#: main.cpp:94
-msgid ""
-"Start Konsole in the background and bring to the front when the F12 key is "
-"pressed"
+#. i18n: file: CopyInputDialog.ui:18
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:26
+msgid "Filter:"
 msgstr ""
 
-#: main.cpp:97
-msgid ""
-"Create a new tab in an existing window rather than creating a new window"
+#. i18n: file: CopyInputDialog.ui:45
+#. i18n: ectx: property (text), widget (QPushButton, selectAllButton)
+#: rc.cpp:29
+msgid "Select All"
 msgstr ""
 
-#: main.cpp:98
-msgid "Create tabs as specified in given tabs configuration file"
+#. i18n: file: CopyInputDialog.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, deselectAllButton)
+#: rc.cpp:32
+msgid "Deselect All"
 msgstr ""
 
-#: main.cpp:98
-msgid "Set the initial working directory of the new tab or window to 'dir'"
+#. i18n: file: RenameTabsDialog.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: EditProfileDialog.ui:288
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:35 rc.cpp:134
+msgid "Tab title format:"
 msgstr ""
 
-#: main.cpp:100
-msgid "Disable transparent backgrounds, even if the system supports them."
+#. i18n: file: RenameTabsDialog.ui:36
+#. i18n: ectx: property (toolTip), widget (KLineEdit, tabTitleEdit)
+#. i18n: file: EditProfileDialog.ui:298
+#. i18n: ectx: property (toolTip), widget (KLineEdit, tabTitleEdit)
+#: rc.cpp:38 rc.cpp:137
+msgid "Normal tab title format"
 msgstr ""
 
-#: main.cpp:101
-msgid ""
-"Try to enable transparency, even if the system does not appear to support it."
+#. i18n: file: RenameTabsDialog.ui:43
+#. i18n: ectx: property (toolTip), widget (QPushButton, tabTitleEditButton)
+#. i18n: file: EditProfileDialog.ui:305
+#. i18n: ectx: property (toolTip), widget (QPushButton, tabTitleEditButton)
+#: rc.cpp:41 rc.cpp:140
+msgid "Edit normal tab title format"
 msgstr ""
 
-#: main.cpp:103
-msgid "Do not close the initial session automatically when it ends."
+#. i18n: file: RenameTabsDialog.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, tabTitleEditButton)
+#. i18n: file: RenameTabsDialog.ui:73
+#. i18n: ectx: property (text), widget (QPushButton, remoteTabTitleEditButton)
+#. i18n: file: EditProfileDialog.ui:308
+#. i18n: ectx: property (text), widget (QPushButton, tabTitleEditButton)
+#. i18n: file: EditProfileDialog.ui:335
+#. i18n: ectx: property (text), widget (QPushButton, remoteTabTitleEditButton)
+#: rc.cpp:44 rc.cpp:56 rc.cpp:143 rc.cpp:155
+msgid "Insert"
 msgstr ""
 
-#: main.cpp:105
-msgid "Change the value of a profile property."
+#. i18n: file: RenameTabsDialog.ui:53
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: EditProfileDialog.ui:315
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:47 rc.cpp:146
+msgid "Remote tab title format:"
 msgstr ""
 
-#: main.cpp:107
+#. i18n: file: RenameTabsDialog.ui:63
+#. i18n: ectx: property (toolTip), widget (KLineEdit, remoteTabTitleEdit)
+#. i18n: file: EditProfileDialog.ui:325
+#. i18n: ectx: property (toolTip), widget (KLineEdit, remoteTabTitleEdit)
+#: rc.cpp:50 rc.cpp:149
 msgid ""
-"List all the profile properties names and their type (for use with -p)"
+"Tab title format used when a remote command (e.g. connection to another "
+"computer via SSH) is being executed"
 msgstr ""
 
-#: main.cpp:106
-msgid "Debian policy compatibility, not used"
+#. i18n: file: RenameTabsDialog.ui:70
+#. i18n: ectx: property (toolTip), widget (QPushButton, remoteTabTitleEditButton)
+#. i18n: file: EditProfileDialog.ui:332
+#. i18n: ectx: property (toolTip), widget (QPushButton, remoteTabTitleEditButton)
+#: rc.cpp:53 rc.cpp:152
+msgid "Edit tab title format used when executing remote commands"
 msgstr ""
 
-#: main.cpp:107
-msgid "Command to execute"
+#. i18n: file: EditProfileDialog.ui:33
+#. i18n: ectx: attribute (title), widget (QWidget, generalTab)
+#: rc.cpp:59
+msgctxt "@title:tab Generic, common options"
+msgid "General"
 msgstr ""
 
-#: main.cpp:108
-msgid "Arguments passed to command"
+#. i18n: file: EditProfileDialog.ui:39
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_10)
+#: rc.cpp:62
+msgctxt "@title:group Generic, common options"
+msgid "General"
 msgstr ""
 
-#: main.cpp:113
-msgid "Robert Knight"
+#. i18n: file: EditProfileDialog.ui:48
+#. i18n: ectx: property (text), widget (QLabel, profileNameLabel)
+#: rc.cpp:65
+msgid "Profile name:"
 msgstr ""
 
-#: main.cpp:113
-msgid "Maintainer"
-msgstr "Cynhaliwr"
-
-#: main.cpp:114
-msgid "Lars Doelle"
+#. i18n: file: EditProfileDialog.ui:58
+#. i18n: ectx: property (toolTip), widget (KLineEdit, profileNameEdit)
+#: rc.cpp:68
+msgid "A descriptive name for the profile"
 msgstr ""
 
-#: main.cpp:114
-msgid "Author"
-msgstr "Awdur"
+#. i18n: file: EditProfileDialog.ui:68
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:71
+msgid "Command:"
+msgstr ""
 
-#: main.cpp:115
-msgid "Kurt V. Hindenburg"
+#. i18n: file: EditProfileDialog.ui:78
+#. i18n: ectx: property (toolTip), widget (KLineEdit, commandEdit)
+#: rc.cpp:74
+msgid ""
+"The command to execute when new terminal sessions are created using this "
+"profile"
 msgstr ""
 
-#: main.cpp:116 main.cpp:119 main.cpp:122
-msgid "Bug fixes and general improvements"
+#. i18n: file: EditProfileDialog.ui:88
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:77
+msgid "Initial directory:"
 msgstr ""
 
-#: main.cpp:118
-msgid "Waldo Bastian"
+#. i18n: file: EditProfileDialog.ui:98
+#. i18n: ectx: property (toolTip), widget (KLineEdit, initialDirEdit)
+#: rc.cpp:80
+msgid ""
+"The initial working directory for new terminal sessions using this profile"
 msgstr ""
 
-#: main.cpp:121
-msgid "Stephan Binner"
+#. i18n: file: EditProfileDialog.ui:108
+#. i18n: ectx: property (toolTip), widget (QToolButton, dirSelectButton)
+#: rc.cpp:83
+msgid "Browse for initial directory"
 msgstr ""
 
-#: main.cpp:124
-msgid "Thomas Dreibholz"
+#. i18n: file: EditProfileDialog.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, startInSameDirButton)
+#: rc.cpp:89
+msgid "Start in same directory as current tab"
 msgstr ""
 
-#: main.cpp:125
-msgid "General improvements"
+#. i18n: file: EditProfileDialog.ui:125
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:92
+msgid "Icon:"
 msgstr ""
 
-#: main.cpp:127
-msgid "Chris Machemer"
+#. i18n: file: EditProfileDialog.ui:153
+#. i18n: ectx: property (toolTip), widget (QPushButton, iconSelectButton)
+#: rc.cpp:95
+msgid "Select the icon displayed on tabs using this profile"
 msgstr ""
 
-#: main.cpp:128 main.cpp:164 main.cpp:167 main.cpp:170 main.cpp:173
-msgid "Bug fixes"
+#. i18n: file: EditProfileDialog.ui:182
+#. i18n: ectx: property (text), widget (QLabel, environmentLabel)
+#: rc.cpp:98
+msgid "Environment:"
 msgstr ""
 
-#: main.cpp:130
-msgid "Stephan Kulow"
+#. i18n: file: EditProfileDialog.ui:192
+#. i18n: ectx: property (toolTip), widget (QPushButton, environmentEditButton)
+#: rc.cpp:101
+msgid "Edit the list of environment variables and associated values"
 msgstr ""
 
-#: main.cpp:131
-msgid "Solaris support and history"
+#. i18n: file: EditProfileDialog.ui:195
+#. i18n: ectx: property (text), widget (QPushButton, environmentEditButton)
+#. i18n: file: EditProfileDialog.ui:530
+#. i18n: ectx: property (text), widget (QPushButton, editColorSchemeButton)
+#. i18n: file: EditProfileDialog.ui:889
+#. i18n: ectx: property (text), widget (QPushButton, editKeyBindingsButton)
+#: rc.cpp:104 rc.cpp:197 rc.cpp:302
+msgid "Edit..."
 msgstr ""
 
-#: main.cpp:133
-msgid "Alexander Neundorf"
+#. i18n: file: EditProfileDialog.ui:205
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_12)
+#: rc.cpp:107
+msgid "Window"
 msgstr ""
 
-#: main.cpp:134
-msgid "Bug fixes and improved startup performance"
+#. i18n: file: EditProfileDialog.ui:220
+#. i18n: ectx: property (toolTip), widget (QCheckBox, showMenuBarButton)
+#: rc.cpp:110
+msgid "Show or hide the menu bar in terminal windows"
 msgstr ""
 
-#: main.cpp:136
-msgid "Peter Silva"
+#. i18n: file: EditProfileDialog.ui:223
+#. i18n: ectx: property (text), widget (QCheckBox, showMenuBarButton)
+#: rc.cpp:113
+msgid "Show menu bar in new windows"
 msgstr ""
 
-#: main.cpp:137
-msgid "Marking improvements"
+#. i18n: file: EditProfileDialog.ui:236
+#. i18n: ectx: property (toolTip), widget (QCheckBox, saveGeometryOnExitButton)
+#: rc.cpp:116
+msgid "Set the window size and position for this profile when exiting"
 msgstr ""
 
-#: main.cpp:139
-msgid "Lotzi Boloni"
+#. i18n: file: EditProfileDialog.ui:239
+#. i18n: ectx: property (text), widget (QCheckBox, saveGeometryOnExitButton)
+#: rc.cpp:119
+msgid "Save window size and position on exit"
 msgstr ""
 
-#: main.cpp:140
+#. i18n: file: EditProfileDialog.ui:246
+#. i18n: ectx: property (toolTip), widget (QCheckBox, showTerminalSizeHintButton)
+#: rc.cpp:122
 msgid ""
-"Embedded Konsole\n"
-"Toolbar and session names"
+"Show terminal size in columns and lines in the center of window after "
+"resizing"
 msgstr ""
 
-#: main.cpp:143
-msgid "David Faure"
+#. i18n: file: EditProfileDialog.ui:249
+#. i18n: ectx: property (text), widget (QCheckBox, showTerminalSizeHintButton)
+#: rc.cpp:125
+msgid "Show hint for terminal size after resizing"
 msgstr ""
 
-#: main.cpp:144
-msgid ""
-"Embedded Konsole\n"
-"General improvements"
+#. i18n: file: EditProfileDialog.ui:273
+#. i18n: ectx: attribute (title), widget (QWidget, tabsTab)
+#: rc.cpp:128
+msgid "Tabs"
 msgstr ""
 
-#: main.cpp:147
-msgid "Antonio Larrosa"
+#. i18n: file: EditProfileDialog.ui:279
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_5)
+#: rc.cpp:131
+msgid "Tab Titles"
 msgstr ""
 
-#: main.cpp:148
-msgid "Visual effects"
-msgstr ""
-
-#: main.cpp:150
-msgid "Matthias Ettrich"
+#. i18n: file: EditProfileDialog.ui:345
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:158
+msgid "Tab Bar"
 msgstr ""
 
-#: main.cpp:151
-msgid ""
-"Code from the kvt project\n"
-"General improvements"
+#. i18n: file: EditProfileDialog.ui:354
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:161
+msgid "Tab bar display:"
 msgstr ""
 
-#: main.cpp:154
-msgid "Warwick Allison"
+#. i18n: file: EditProfileDialog.ui:377
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#: rc.cpp:164
+msgid "Tab bar position:"
 msgstr ""
 
-#: main.cpp:155
-msgid "Schema and text selection improvements"
+#. i18n: file: EditProfileDialog.ui:397
+#. i18n: ectx: property (text), widget (QLabel, label_16)
+#: rc.cpp:167
+msgid "New tab behavior:"
 msgstr ""
 
-#: main.cpp:157
-msgid "Dan Pilone"
+#. i18n: file: EditProfileDialog.ui:417
+#. i18n: ectx: property (text), widget (QCheckBox, newTabButton)
+#: rc.cpp:170
+msgid "Show 'New Tab' and 'Close Tab' buttons in tab bar"
 msgstr ""
 
-#: main.cpp:158
-msgid "SGI port"
+#. i18n: file: EditProfileDialog.ui:427
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_13)
+#: rc.cpp:173
+msgid "Tab Monitoring"
 msgstr ""
 
-#: main.cpp:160
-msgid "Kevin Street"
+#. i18n: file: EditProfileDialog.ui:436
+#. i18n: ectx: property (text), widget (QLabel, silenceSecondsLabel)
+#: rc.cpp:176
+msgid "Seconds to detect silence:"
 msgstr ""
 
-#: main.cpp:161
-msgid "FreeBSD port"
-msgstr "Porthiad FreeBSD"
-
-#: main.cpp:163
-msgid "Sven Fischer"
+#. i18n: file: EditProfileDialog.ui:446
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, silenceSecondsSpinner)
+#: rc.cpp:179
+msgid "The threshold of detected silence in seconds"
 msgstr ""
 
-#: main.cpp:166
-msgid "Dale M. Flaven"
+#. i18n: file: EditProfileDialog.ui:489
+#. i18n: ectx: attribute (title), widget (QWidget, appearanceTab)
+#: rc.cpp:182
+msgid "Appearance"
 msgstr ""
 
-#: main.cpp:169
-msgid "Martin Jones"
+#. i18n: file: EditProfileDialog.ui:501
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:185
+msgid "Color Scheme && Background"
 msgstr ""
 
-#: main.cpp:172
-msgid "Lars Knoll"
+#. i18n: file: EditProfileDialog.ui:517
+#. i18n: ectx: property (toolTip), widget (QPushButton, newColorSchemeButton)
+#: rc.cpp:188
+msgid "Create a new color scheme based upon the selected scheme"
 msgstr ""
 
-#: main.cpp:175
-msgid "Thanks to many others.\n"
+#. i18n: file: EditProfileDialog.ui:520
+#. i18n: ectx: property (text), widget (QPushButton, newColorSchemeButton)
+#: rc.cpp:191
+msgctxt "@action:button Create an alternate color scheme"
+msgid "New..."
 msgstr ""
 
-#: rc.cpp:423
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
+#. i18n: file: EditProfileDialog.ui:527
+#. i18n: ectx: property (toolTip), widget (QPushButton, editColorSchemeButton)
+#: rc.cpp:194
+msgid "Edit the selected color scheme"
 msgstr ""
-"KGyfieithu - meddalwedd rhydd yn Gymraeg, ,Launchpad Contributions:,KD at "
-"KGyfieithu"
 
-#: rc.cpp:424
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,"
+#. i18n: file: EditProfileDialog.ui:537
+#. i18n: ectx: property (toolTip), widget (QPushButton, removeColorSchemeButton)
+#: rc.cpp:200
+msgid "Delete the selected color scheme"
+msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:28
-#. i18n: ectx: property (toolTip), widget (QPushButton, newSessionButton)
-#: rc.cpp:362 rc.cpp:454
-msgid "Create a new profile based upon the selected profile"
+#. i18n: file: EditProfileDialog.ui:540
+#. i18n: ectx: property (text), widget (QPushButton, removeColorSchemeButton)
+#. i18n: file: EditProfileDialog.ui:899
+#. i18n: ectx: property (text), widget (QPushButton, removeKeyBindingsButton)
+#. i18n: file: KeyBindingEditor.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, removeEntryButton)
+#: rc.cpp:203 rc.cpp:308 rc.cpp:446
+msgid "Remove"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:31
-#. i18n: ectx: property (text), widget (QPushButton, newSessionButton)
-#: rc.cpp:365 rc.cpp:457
-msgid "New Profile..."
+#. i18n: file: EditProfileDialog.ui:566
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:206
+msgid "Font"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:41
-#. i18n: ectx: property (toolTip), widget (QPushButton, editSessionButton)
-#: rc.cpp:368 rc.cpp:460
-msgid "Edit the selected profile(s)"
+#. i18n: file: EditProfileDialog.ui:577
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:209
+msgid "Preview:"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, editSessionButton)
-#: rc.cpp:371 rc.cpp:463
-msgid "Edit Profile..."
+#. i18n: file: EditProfileDialog.ui:601
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:212
+msgid "Text size:"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:54
-#. i18n: ectx: property (toolTip), widget (QPushButton, deleteSessionButton)
-#: rc.cpp:374 rc.cpp:466
-msgid "Delete the selected profile(s)"
+#. i18n: file: EditProfileDialog.ui:611
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:215
+msgctxt "@item:inrange Minimum Size"
+msgid "Small"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:57
-#. i18n: ectx: property (text), widget (QPushButton, deleteSessionButton)
-#: rc.cpp:377 rc.cpp:469
-msgid "Delete Profile"
+#. i18n: file: EditProfileDialog.ui:618
+#. i18n: ectx: property (toolTip), widget (QSlider, fontSizeSlider)
+#: rc.cpp:218
+msgid "Adjust the font size used in this profile"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:67
-#. i18n: ectx: property (toolTip), widget (QPushButton, setAsDefaultButton)
-#: rc.cpp:380 rc.cpp:472
-msgid "Set the selected profile as the default for new terminal sessions"
+#. i18n: file: EditProfileDialog.ui:634
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:221
+msgctxt "@item:inrange Maximum Size"
+msgid "Large"
 msgstr ""
 
-#. i18n: file: ManageProfilesDialog.ui:70
-#. i18n: ectx: property (text), widget (QPushButton, setAsDefaultButton)
-#: rc.cpp:383 rc.cpp:475
-msgid "Set as Default"
+#. i18n: file: EditProfileDialog.ui:641
+#. i18n: ectx: property (toolTip), widget (QPushButton, editFontButton)
+#: rc.cpp:224
+msgid "Change the font used in this profile"
 msgstr ""
 
-#. i18n: file: CopyInputDialog.ui:18
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:15 rc.cpp:490
-msgid "Filter:"
+#. i18n: file: EditProfileDialog.ui:644
+#. i18n: ectx: property (text), widget (QPushButton, editFontButton)
+#: rc.cpp:227
+msgid "Edit Font..."
 msgstr ""
 
-#. i18n: file: CopyInputDialog.ui:45
-#. i18n: ectx: property (text), widget (QPushButton, selectAllButton)
-#: rc.cpp:18 rc.cpp:493
-msgid "Select All"
+#. i18n: file: EditProfileDialog.ui:653
+#. i18n: ectx: property (text), widget (QCheckBox, antialiasTextButton)
+#: rc.cpp:230
+msgid "Smooth fonts"
 msgstr ""
 
-#. i18n: file: CopyInputDialog.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, deselectAllButton)
-#: rc.cpp:21 rc.cpp:496
-msgid "Deselect All"
+#. i18n: file: EditProfileDialog.ui:660
+#. i18n: ectx: property (text), widget (QCheckBox, boldIntenseButton)
+#: rc.cpp:233
+msgid "Draw intense colors in bold font"
 msgstr ""
 
-#. i18n: file: ColorSchemeEditor.ui:21
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: KeyBindingEditor.ui:21
-#. i18n: ectx: property (text), widget (QLabel, descriptionLabel)
-#. i18n: file: ColorSchemeEditor.ui:21
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: KeyBindingEditor.ui:21
-#. i18n: ectx: property (text), widget (QLabel, descriptionLabel)
-#: rc.cpp:3 rc.cpp:344 rc.cpp:499 rc.cpp:831
-msgid "Description:"
+#. i18n: file: EditProfileDialog.ui:671
+#. i18n: ectx: attribute (title), widget (QWidget, scrollingTab)
+#. i18n: file: EditProfileDialog.ui:677
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
+#: rc.cpp:236 rc.cpp:239
+msgid "Scrolling"
 msgstr ""
 
-#. i18n: file: ColorSchemeEditor.ui:41
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:6 rc.cpp:502
-msgid "Background transparency:"
+#. i18n: file: EditProfileDialog.ui:692
+#. i18n: ectx: property (toolTip), widget (QRadioButton, disableScrollbackButton)
+#: rc.cpp:242
+msgid "Disable scroll bar and do not remember previous output"
 msgstr ""
 
-#. i18n: file: ColorSchemeEditor.ui:61
-#. i18n: ectx: property (text), widget (QLabel, transparencyPercentLabel)
-#: rc.cpp:9 rc.cpp:505
-msgid "Percent"
+#. i18n: file: EditProfileDialog.ui:695
+#. i18n: ectx: property (text), widget (QRadioButton, disableScrollbackButton)
+#: rc.cpp:245
+msgid "Disable scrollback"
 msgstr ""
 
-#. i18n: file: ColorSchemeEditor.ui:73
-#. i18n: ectx: property (text), widget (QCheckBox, randomizedBackgroundCheck)
-#: rc.cpp:12 rc.cpp:508
-msgid "Vary the background color for each tab"
+#. i18n: file: EditProfileDialog.ui:710
+#. i18n: ectx: property (toolTip), widget (QRadioButton, fixedScrollbackButton)
+#: rc.cpp:248
+msgid "Limit the remembered output to a fixed number of lines"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:274
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:87 rc.cpp:574
-msgid "Tab title format:"
+#. i18n: file: EditProfileDialog.ui:713
+#. i18n: ectx: property (text), widget (QRadioButton, fixedScrollbackButton)
+#: rc.cpp:251
+msgid "Fixed number of lines: "
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:284
-#. i18n: ectx: property (toolTip), widget (KLineEdit, tabTitleEdit)
-#: rc.cpp:90 rc.cpp:577
-msgid "Normal tab title format"
+#. i18n: file: EditProfileDialog.ui:720
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, scrollBackLinesSpinner)
+#: rc.cpp:254
+msgid "Number of lines of output to remember"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:291
-#. i18n: ectx: property (toolTip), widget (QPushButton, tabTitleEditButton)
-#: rc.cpp:93 rc.cpp:580
-msgid "Edit normal tab title format"
+#. i18n: file: EditProfileDialog.ui:754
+#. i18n: ectx: property (toolTip), widget (QRadioButton, unlimitedScrollbackButton)
+#: rc.cpp:257
+msgid "Remember all output produced by the terminal"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:294
-#. i18n: ectx: property (text), widget (QPushButton, tabTitleEditButton)
-#. i18n: file: EditProfileDialog.ui:321
-#. i18n: ectx: property (text), widget (QPushButton, remoteTabTitleEditButton)
-#. i18n: file: EditProfileDialog.ui:294
-#. i18n: ectx: property (text), widget (QPushButton, tabTitleEditButton)
-#. i18n: file: EditProfileDialog.ui:321
-#. i18n: ectx: property (text), widget (QPushButton, remoteTabTitleEditButton)
-#: rc.cpp:96 rc.cpp:108 rc.cpp:583 rc.cpp:595
-msgid "Insert"
+#. i18n: file: EditProfileDialog.ui:767
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_7)
+#: rc.cpp:263
+msgid "Scroll Bar"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:301
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:99 rc.cpp:586
-msgid "Remote tab title format:"
+#. i18n: file: EditProfileDialog.ui:782
+#. i18n: ectx: property (toolTip), widget (QRadioButton, scrollBarLeftButton)
+#: rc.cpp:266
+msgid "Show the scroll bar on the left side of the terminal window"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:311
-#. i18n: ectx: property (toolTip), widget (KLineEdit, remoteTabTitleEdit)
-#: rc.cpp:102 rc.cpp:589
-msgid ""
-"Tab title format used when a remote command (e.g. connection to another "
-"computer via SSH) is being executed"
+#. i18n: file: EditProfileDialog.ui:785
+#. i18n: ectx: property (text), widget (QRadioButton, scrollBarLeftButton)
+#: rc.cpp:269
+msgid "Show on left side"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:318
-#. i18n: ectx: property (toolTip), widget (QPushButton, remoteTabTitleEditButton)
-#: rc.cpp:105 rc.cpp:592
-msgid "Edit tab title format used when executing remote commands"
+#. i18n: file: EditProfileDialog.ui:798
+#. i18n: ectx: property (toolTip), widget (QRadioButton, scrollBarRightButton)
+#: rc.cpp:272
+msgid "Show the scroll bar on the right side of the terminal window"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:33
-#. i18n: ectx: attribute (title), widget (QWidget, generalTab)
-#: rc.cpp:24 rc.cpp:544
-msgctxt "@title:tab Generic, common options"
-msgid "General"
+#. i18n: file: EditProfileDialog.ui:801
+#. i18n: ectx: property (text), widget (QRadioButton, scrollBarRightButton)
+#: rc.cpp:275
+msgid "Show on right side"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:39
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_10)
-#: rc.cpp:27 rc.cpp:547
-msgctxt "@title:group Generic, common options"
-msgid "General"
+#. i18n: file: EditProfileDialog.ui:814
+#. i18n: ectx: property (toolTip), widget (QRadioButton, scrollBarHiddenButton)
+#: rc.cpp:278
+msgid "Hide the scroll bar"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:55
-#. i18n: ectx: property (text), widget (QLabel, profileNameLabel)
-#: rc.cpp:30 rc.cpp:517
-msgid "Profile name:"
+#. i18n: file: EditProfileDialog.ui:817
+#. i18n: ectx: property (text), widget (QRadioButton, scrollBarHiddenButton)
+#: rc.cpp:281
+msgctxt "@option:radio Conceal the scroll bar"
+msgid "Hidden"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:65
-#. i18n: ectx: property (toolTip), widget (KLineEdit, profileNameEdit)
-#: rc.cpp:33 rc.cpp:520
-msgid "A descriptive name for the profile"
+#. i18n: file: EditProfileDialog.ui:841
+#. i18n: ectx: attribute (title), widget (QWidget, keyboardTab)
+#: rc.cpp:284
+msgid "Input"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:72
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:36 rc.cpp:523
-msgid "Command:"
+#. i18n: file: EditProfileDialog.ui:847
+#. i18n: ectx: property (title), widget (QGroupBox, keyBindingsGroup)
+#: rc.cpp:287
+msgid "Key Bindings"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:82
-#. i18n: ectx: property (toolTip), widget (KLineEdit, commandEdit)
-#: rc.cpp:39 rc.cpp:526
+#. i18n: file: EditProfileDialog.ui:856
+#. i18n: ectx: property (text), widget (QLabel, label_15)
+#: rc.cpp:290
 msgid ""
-"The command to execute when new terminal sessions are created using this "
-"profile"
+"Key bindings control how combinations of key presses in the terminal window "
+"are converted into the stream of characters which is sent to the current "
+"terminal program."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:92
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:42 rc.cpp:529
-msgid "Initial directory:"
+#. i18n: file: EditProfileDialog.ui:876
+#. i18n: ectx: property (toolTip), widget (QPushButton, newKeyBindingsButton)
+#: rc.cpp:293
+msgid "Create a new key bindings list based upon the selected bindings"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:102
-#. i18n: ectx: property (toolTip), widget (KLineEdit, initialDirEdit)
-#: rc.cpp:45 rc.cpp:532
-msgid ""
-"The initial working directory for new terminal sessions using this profile"
+#. i18n: file: EditProfileDialog.ui:879
+#. i18n: ectx: property (text), widget (QPushButton, newKeyBindingsButton)
+#: rc.cpp:296
+msgctxt "@action:button Create an alternate key binding"
+msgid "New..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:112
-#. i18n: ectx: property (toolTip), widget (QToolButton, dirSelectButton)
-#: rc.cpp:48 rc.cpp:535
-msgid "Browse for initial directory"
+#. i18n: file: EditProfileDialog.ui:886
+#. i18n: ectx: property (toolTip), widget (QPushButton, editKeyBindingsButton)
+#: rc.cpp:299
+msgid "Edit the selected key bindings list"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:115
-#. i18n: ectx: property (text), widget (QToolButton, dirSelectButton)
-#: rc.cpp:51 rc.cpp:538
-msgid "..."
+#. i18n: file: EditProfileDialog.ui:896
+#. i18n: ectx: property (toolTip), widget (QPushButton, removeKeyBindingsButton)
+#: rc.cpp:305
+msgid "Delete the selected key bindings list"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:122
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:54 rc.cpp:541
-msgid "Icon:"
+#. i18n: file: EditProfileDialog.ui:923
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: rc.cpp:311
+msgctxt "@title:tab Complex options"
+msgid "Advanced"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:150
-#. i18n: ectx: property (toolTip), widget (QPushButton, iconSelectButton)
-#: rc.cpp:57 rc.cpp:544
-msgid "Select the icon displayed on tabs using this profile"
+#. i18n: file: EditProfileDialog.ui:929
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:314
+msgid "Terminal Features"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:179
-#. i18n: ectx: property (text), widget (QLabel, environmentLabel)
-#: rc.cpp:60 rc.cpp:547
-msgid "Environment:"
+#. i18n: file: EditProfileDialog.ui:944
+#. i18n: ectx: property (toolTip), widget (QCheckBox, enableBlinkingTextButton)
+#: rc.cpp:317
+msgid "Allow terminal programs to create blinking sections of text"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:189
-#. i18n: ectx: property (toolTip), widget (QPushButton, environmentEditButton)
-#: rc.cpp:63 rc.cpp:550
-msgid "Edit the list of environment variables and associated values"
+#. i18n: file: EditProfileDialog.ui:947
+#. i18n: ectx: property (text), widget (QCheckBox, enableBlinkingTextButton)
+#: rc.cpp:320
+msgid "Allow blinking text"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:192
-#. i18n: ectx: property (text), widget (QPushButton, environmentEditButton)
-#. i18n: file: EditProfileDialog.ui:456
-#. i18n: ectx: property (text), widget (QPushButton, editColorSchemeButton)
-#. i18n: file: EditProfileDialog.ui:824
-#. i18n: ectx: property (text), widget (QPushButton, editKeyBindingsButton)
-#. i18n: file: EditProfileDialog.ui:192
-#. i18n: ectx: property (text), widget (QPushButton, environmentEditButton)
-#. i18n: file: EditProfileDialog.ui:456
-#. i18n: ectx: property (text), widget (QPushButton, editColorSchemeButton)
-#. i18n: file: EditProfileDialog.ui:824
-#. i18n: ectx: property (text), widget (QPushButton, editKeyBindingsButton)
-#: rc.cpp:66 rc.cpp:138 rc.cpp:241 rc.cpp:553 rc.cpp:625 rc.cpp:728
-msgid "Edit..."
+#. i18n: file: EditProfileDialog.ui:960
+#. i18n: ectx: property (toolTip), widget (QCheckBox, enableFlowControlButton)
+#: rc.cpp:323
+msgid "Allow the output to be suspended by pressing Ctrl+S"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:199
-#. i18n: ectx: property (text), widget (QCheckBox, startInSameDirButton)
-#: rc.cpp:69 rc.cpp:556
-msgid "Start in same directory as current tab"
+#. i18n: file: EditProfileDialog.ui:963
+#. i18n: ectx: property (text), widget (QCheckBox, enableFlowControlButton)
+#: rc.cpp:326
+msgid "Enable flow control using Ctrl+S, Ctrl+Q"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:209
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_12)
-#: rc.cpp:72 rc.cpp:559
-msgid "Window"
+#. i18n: file: EditProfileDialog.ui:976
+#. i18n: ectx: property (toolTip), widget (QCheckBox, enableResizeWindowButton)
+#: rc.cpp:329
+msgid "Allow terminal programs to resize the window"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:224
-#. i18n: ectx: property (toolTip), widget (QCheckBox, showMenuBarButton)
-#: rc.cpp:75 rc.cpp:562
-msgid "Show or hide the menu bar in terminal windows"
+#. i18n: file: EditProfileDialog.ui:979
+#. i18n: ectx: property (text), widget (QCheckBox, enableResizeWindowButton)
+#: rc.cpp:332
+msgid "Allow programs to resize terminal window"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:227
-#. i18n: ectx: property (text), widget (QCheckBox, showMenuBarButton)
-#: rc.cpp:78 rc.cpp:565
-msgid "Show menu bar in new windows"
+#. i18n: file: EditProfileDialog.ui:992
+#. i18n: ectx: property (toolTip), widget (QCheckBox, enableBidiRenderingButton)
+#: rc.cpp:335
+msgid ""
+"Enable Bi-Directional display on terminals (valid for Arabic, Farsi or "
+"Hebrew only)"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:233
-#. i18n: ectx: property (toolTip), widget (QCheckBox, saveGeometryOnExitButton)
-#: rc.cpp:81 rc.cpp:601
-msgid "Set the window size and position for this profile when exiting"
+#. i18n: file: EditProfileDialog.ui:995
+#. i18n: ectx: property (text), widget (QCheckBox, enableBidiRenderingButton)
+#: rc.cpp:338
+msgid "Enable Bi-Directional text rendering"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:236
-#. i18n: ectx: property (text), widget (QCheckBox, saveGeometryOnExitButton)
-#: rc.cpp:84 rc.cpp:604
-msgid "Save window size and position on exit"
+#. i18n: file: EditProfileDialog.ui:1005
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_9)
+#: rc.cpp:341
+msgid "Mouse Interaction"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:259
-#. i18n: ectx: attribute (title), widget (QWidget, tabsTab)
-#: rc.cpp:81 rc.cpp:568
-msgid "Tabs"
+#. i18n: file: EditProfileDialog.ui:1016
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:344
+msgid "Characters considered part of a word when double clicking: "
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:265
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_5)
-#: rc.cpp:84 rc.cpp:571
-msgid "Tab Titles"
+#. i18n: file: EditProfileDialog.ui:1029
+#. i18n: ectx: property (toolTip), widget (KLineEdit, wordCharacterEdit)
+#: rc.cpp:347
+msgid ""
+"Characters which are considered part of a word when double-clicking to "
+"select whole words in the terminal"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:331
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:111 rc.cpp:598
-msgid "Tab Bar"
+#. i18n: file: EditProfileDialog.ui:1040
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#: rc.cpp:350
+msgid "Triple-click select: "
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:340
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:114 rc.cpp:601
-msgid "Tab bar display:"
+#. i18n: file: EditProfileDialog.ui:1047
+#. i18n: ectx: property (toolTip), widget (KComboBox, tripleClickModeCombo)
+#: rc.cpp:353
+msgid "Which part of current line should be selected with triple click ."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:363
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#: rc.cpp:117 rc.cpp:604
-msgid "Tab bar position:"
+#. i18n: file: EditProfileDialog.ui:1051
+#. i18n: ectx: property (text), item, widget (KComboBox, tripleClickModeCombo)
+#: rc.cpp:356
+msgid " The whole current line"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:383
-#. i18n: ectx: property (text), widget (QCheckBox, newTabButton)
-#: rc.cpp:120 rc.cpp:607
-msgid "Show 'New Tab' and 'Close Tab' buttons in tab bar"
+#. i18n: file: EditProfileDialog.ui:1056
+#. i18n: ectx: property (text), item, widget (KComboBox, tripleClickModeCombo)
+#: rc.cpp:359
+msgid " From mouse position to the end of line"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:415
-#. i18n: ectx: attribute (title), widget (QWidget, appearanceTab)
-#: rc.cpp:123 rc.cpp:610
-msgid "Appearance"
+#. i18n: file: EditProfileDialog.ui:1079
+#. i18n: ectx: property (toolTip), widget (QCheckBox, underlineLinksButton)
+#: rc.cpp:362
+msgid ""
+"Text recognized as a link or an email address will be underlined when "
+"hovered by the mouse pointer."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:427
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:126 rc.cpp:613
-msgid "Color Scheme && Background"
+#. i18n: file: EditProfileDialog.ui:1082
+#. i18n: ectx: property (text), widget (QCheckBox, underlineLinksButton)
+#: rc.cpp:365
+msgid "Underline links"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:443
-#. i18n: ectx: property (toolTip), widget (QPushButton, newColorSchemeButton)
-#: rc.cpp:129 rc.cpp:616
-msgid "Create a new color scheme based upon the selected scheme"
+#. i18n: file: EditProfileDialog.ui:1092
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
+#: rc.cpp:368
+msgid "Cursor"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:439
-#. i18n: ectx: property (text), widget (QPushButton, newColorSchemeButton)
-#: rc.cpp:138 rc.cpp:658
-msgctxt "@action:button Create an alternate color scheme"
-msgid "New..."
+#. i18n: file: EditProfileDialog.ui:1107
+#. i18n: ectx: property (toolTip), widget (QCheckBox, enableBlinkingCursorButton)
+#: rc.cpp:371
+msgid "Make the cursor blink regularly"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:453
-#. i18n: ectx: property (toolTip), widget (QPushButton, editColorSchemeButton)
-#: rc.cpp:135 rc.cpp:622
-msgid "Edit the selected color scheme"
+#. i18n: file: EditProfileDialog.ui:1110
+#. i18n: ectx: property (text), widget (QCheckBox, enableBlinkingCursorButton)
+#: rc.cpp:374
+msgid "Blinking cursor"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:463
-#. i18n: ectx: property (toolTip), widget (QPushButton, removeColorSchemeButton)
-#: rc.cpp:141 rc.cpp:628
-msgid "Delete the selected color scheme"
+#. i18n: file: EditProfileDialog.ui:1119
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:377
+msgid "Cursor shape:"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:466
-#. i18n: ectx: property (text), widget (QPushButton, removeColorSchemeButton)
-#. i18n: file: EditProfileDialog.ui:834
-#. i18n: ectx: property (text), widget (QPushButton, removeKeyBindingsButton)
-#. i18n: file: KeyBindingEditor.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, removeEntryButton)
-#. i18n: file: EditProfileDialog.ui:466
-#. i18n: ectx: property (text), widget (QPushButton, removeColorSchemeButton)
-#. i18n: file: EditProfileDialog.ui:834
-#. i18n: ectx: property (text), widget (QPushButton, removeKeyBindingsButton)
-#. i18n: file: KeyBindingEditor.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, removeEntryButton)
-#: rc.cpp:144 rc.cpp:247 rc.cpp:350 rc.cpp:631 rc.cpp:734 rc.cpp:837
-msgid "Remove"
+#. i18n: file: EditProfileDialog.ui:1126
+#. i18n: ectx: property (toolTip), widget (KComboBox, cursorShapeCombo)
+#: rc.cpp:380
+msgid "Change the shape of the cursor"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:492
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:147 rc.cpp:634
-msgid "Font"
+#. i18n: file: EditProfileDialog.ui:1130
+#. i18n: ectx: property (text), item, widget (KComboBox, cursorShapeCombo)
+#: rc.cpp:383
+msgctxt "The shape of the cursor"
+msgid "Block"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:503
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:150 rc.cpp:637
-msgid "Preview:"
+#. i18n: file: EditProfileDialog.ui:1135
+#. i18n: ectx: property (text), item, widget (KComboBox, cursorShapeCombo)
+#: rc.cpp:386
+msgctxt "The shape of the cursor, similar to a capital I"
+msgid "I-Beam"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:527
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:154 rc.cpp:641
-msgid "Text size:"
+#. i18n: file: EditProfileDialog.ui:1140
+#. i18n: ectx: property (text), item, widget (KComboBox, cursorShapeCombo)
+#: rc.cpp:389
+msgctxt "The shape of the cursor"
+msgid "Underline"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:530
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:163 rc.cpp:683
-msgctxt "@item:inrange Minimum Size"
-msgid "Small"
+#. i18n: file: EditProfileDialog.ui:1169
+#. i18n: ectx: property (toolTip), widget (QRadioButton, autoCursorColorButton)
+#: rc.cpp:392
+msgid "Set the cursor to match the color of the character underneath it."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:544
-#. i18n: ectx: property (toolTip), widget (QSlider, fontSizeSlider)
-#: rc.cpp:160 rc.cpp:647
-msgid "Adjust the font size used in this profile"
+#. i18n: file: EditProfileDialog.ui:1172
+#. i18n: ectx: property (text), widget (QRadioButton, autoCursorColorButton)
+#: rc.cpp:395
+msgid "Set cursor color to match current character"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:553
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:169 rc.cpp:689
-msgctxt "@item:inrange Maximum Size"
-msgid "Large"
+#. i18n: file: EditProfileDialog.ui:1187
+#. i18n: ectx: property (toolTip), widget (QRadioButton, customCursorColorButton)
+#: rc.cpp:398
+msgid "Use a custom, fixed color for the cursor"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:567
-#. i18n: ectx: property (toolTip), widget (QPushButton, editFontButton)
-#: rc.cpp:166 rc.cpp:653
-msgid "Change the font used in this profile"
+#. i18n: file: EditProfileDialog.ui:1190
+#. i18n: ectx: property (text), widget (QRadioButton, customCursorColorButton)
+#: rc.cpp:401
+msgid "Custom cursor color:"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:570
-#. i18n: ectx: property (text), widget (QPushButton, editFontButton)
-#: rc.cpp:169 rc.cpp:656
-msgid "Edit Font..."
+#. i18n: file: EditProfileDialog.ui:1203
+#. i18n: ectx: property (toolTip), widget (KColorButton, customColorSelectButton)
+#: rc.cpp:404
+msgid "Select the color used to draw the cursor"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:579
-#. i18n: ectx: property (text), widget (QCheckBox, antialiasTextButton)
-#: rc.cpp:172 rc.cpp:659
-msgid "Smooth fonts"
+#. i18n: file: EditProfileDialog.ui:1231
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_11)
+#: rc.cpp:407
+msgid "Encoding"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:579
-#. i18n: ectx: property (text), widget (QCheckBox, boldIntenseButton)
-#: rc.cpp:181 rc.cpp:701
-msgid "Draw intense colors in bold font"
+#. i18n: file: EditProfileDialog.ui:1240
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#: rc.cpp:410
+msgid "Default character encoding:"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:598
-#. i18n: ectx: attribute (title), widget (QWidget, scrollingTab)
-#. i18n: file: EditProfileDialog.ui:604
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
-#. i18n: file: EditProfileDialog.ui:598
-#. i18n: ectx: attribute (title), widget (QWidget, scrollingTab)
-#. i18n: file: EditProfileDialog.ui:604
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
-#: rc.cpp:175 rc.cpp:178 rc.cpp:662 rc.cpp:665
-msgid "Scrolling"
+#. i18n: file: EditProfileDialog.ui:1260
+#. i18n: ectx: property (text), widget (QPushButton, selectEncodingButton)
+#: rc.cpp:413
+msgctxt "@action:button Pick an encoding"
+msgid "Select"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:619
-#. i18n: ectx: property (toolTip), widget (QRadioButton, disableScrollbackButton)
-#: rc.cpp:181 rc.cpp:668
-msgid "Disable scroll bar and do not remember previous output"
+#. i18n: file: ManageProfilesDialog.ui:20
+#. i18n: ectx: property (toolTip), widget (QPushButton, newProfileButton)
+#: rc.cpp:416
+msgid "Create a new profile based upon the selected profile"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:622
-#. i18n: ectx: property (text), widget (QRadioButton, disableScrollbackButton)
-#: rc.cpp:184 rc.cpp:671
-msgid "Disable scrollback"
+#. i18n: file: ManageProfilesDialog.ui:23
+#. i18n: ectx: property (text), widget (QPushButton, newProfileButton)
+#: rc.cpp:419
+msgid "&New Profile..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:637
-#. i18n: ectx: property (toolTip), widget (QRadioButton, fixedScrollbackButton)
-#: rc.cpp:187 rc.cpp:674
-msgid "Limit the remembered output to a fixed number of lines"
+#. i18n: file: ManageProfilesDialog.ui:33
+#. i18n: ectx: property (toolTip), widget (QPushButton, editProfileButton)
+#: rc.cpp:422
+msgid "Edit the selected profile(s)"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:640
-#. i18n: ectx: property (text), widget (QRadioButton, fixedScrollbackButton)
-#: rc.cpp:190 rc.cpp:677
-msgid "Fixed number of lines: "
+#. i18n: file: ManageProfilesDialog.ui:36
+#. i18n: ectx: property (text), widget (QPushButton, editProfileButton)
+#: rc.cpp:425
+msgid "&Edit Profile..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:647
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, scrollBackLinesSpinner)
-#: rc.cpp:193 rc.cpp:680
-msgid "Number of lines of output to remember"
+#. i18n: file: ManageProfilesDialog.ui:46
+#. i18n: ectx: property (toolTip), widget (QPushButton, deleteProfileButton)
+#: rc.cpp:428
+msgid "Delete the selected profile(s)"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:681
-#. i18n: ectx: property (toolTip), widget (QRadioButton, unlimitedScrollbackButton)
-#: rc.cpp:196 rc.cpp:683
-msgid "Remember all output produced by the terminal"
+#. i18n: file: ManageProfilesDialog.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, deleteProfileButton)
+#: rc.cpp:431
+msgid "&Delete Profile"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:694
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_7)
-#: rc.cpp:202 rc.cpp:689
-msgid "Scroll Bar"
+#. i18n: file: ManageProfilesDialog.ui:59
+#. i18n: ectx: property (toolTip), widget (QPushButton, setAsDefaultButton)
+#: rc.cpp:434
+msgid "Set the selected profile as the default for new terminal sessions"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:709
-#. i18n: ectx: property (toolTip), widget (QRadioButton, scrollBarLeftButton)
-#: rc.cpp:205 rc.cpp:692
-msgid "Show the scroll bar on the left side of the terminal window"
+#. i18n: file: ManageProfilesDialog.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, setAsDefaultButton)
+#: rc.cpp:437
+msgid "&Set as Default"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:712
-#. i18n: ectx: property (text), widget (QRadioButton, scrollBarLeftButton)
-#: rc.cpp:208 rc.cpp:695
-msgid "Show on left side"
+#. i18n: file: KeyBindingEditor.ui:45
+#. i18n: ectx: property (text), widget (QPushButton, addEntryButton)
+#: rc.cpp:443
+msgid "Add"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:725
-#. i18n: ectx: property (toolTip), widget (QRadioButton, scrollBarRightButton)
-#: rc.cpp:211 rc.cpp:698
-msgid "Show the scroll bar on the right side of the terminal window"
+#. i18n: file: KeyBindingEditor.ui:74
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:449
+msgctxt "Title of the area where you test your keys are properly configured"
+msgid "Test Area"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:728
-#. i18n: ectx: property (text), widget (QRadioButton, scrollBarRightButton)
-#: rc.cpp:214 rc.cpp:701
-msgid "Show on right side"
+#. i18n: file: KeyBindingEditor.ui:83
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:452
+msgid "Input:"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:741
-#. i18n: ectx: property (toolTip), widget (QRadioButton, scrollBarHiddenButton)
-#: rc.cpp:217 rc.cpp:704
-msgid "Hide the scroll bar"
+#. i18n: file: KeyBindingEditor.ui:96
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:455
+msgid "Output:"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:736
-#. i18n: ectx: property (text), widget (QRadioButton, scrollBarHiddenButton)
-#: rc.cpp:229 rc.cpp:749
-msgctxt "@option:radio Conceal the scroll bar"
-msgid "Hidden"
+#. i18n: file: ../desktop/sessionui.rc:17
+#. i18n: ectx: Menu (edit-copy-input-to)
+#: rc.cpp:458
+msgid "Copy Input To"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:776
-#. i18n: ectx: attribute (title), widget (QWidget, keyboardTab)
-#: rc.cpp:223 rc.cpp:710
-msgid "Input"
+#. i18n: file: ../desktop/sessionui.rc:44
+#. i18n: ectx: Menu (debug)
+#: rc.cpp:461
+msgid "Debug"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:782
-#. i18n: ectx: property (title), widget (QGroupBox, keyBindingsGroup)
-#: rc.cpp:226 rc.cpp:713
-msgid "Key Bindings"
+#. i18n: file: ../desktop/sessionui.rc:63
+#. i18n: ectx: Menu (switch-profile)
+#. i18n: file: ../desktop/partui.rc:23
+#. i18n: ectx: Menu (switch-profile)
+#: rc.cpp:464 rc.cpp:488
+msgid "&Switch Profile"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:791
-#. i18n: ectx: property (text), widget (QLabel, label_15)
-#: rc.cpp:229 rc.cpp:716
-msgid ""
-"Key bindings control how combinations of key presses in the terminal window "
-"are converted into the stream of characters which is sent to the current "
-"terminal program."
+#. i18n: file: ../desktop/konsoleui.rc:5
+#. i18n: ectx: Menu (file)
+#: rc.cpp:467
+msgid "File"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:811
-#. i18n: ectx: property (toolTip), widget (QPushButton, newKeyBindingsButton)
-#: rc.cpp:232 rc.cpp:719
-msgid "Create a new key bindings list based upon the selected bindings"
+#. i18n: file: ../desktop/konsoleui.rc:14
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:470
+msgid "Edit"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:798
-#. i18n: ectx: property (text), widget (QPushButton, newKeyBindingsButton)
-#: rc.cpp:244 rc.cpp:764
-msgctxt "@action:button Create an alternate key binding"
-msgid "New..."
+#. i18n: file: ../desktop/konsoleui.rc:17
+#. i18n: ectx: Menu (view)
+#: rc.cpp:473
+msgid "View"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:821
-#. i18n: ectx: property (toolTip), widget (QPushButton, editKeyBindingsButton)
-#: rc.cpp:238 rc.cpp:725
-msgid "Edit the selected key bindings list"
+#. i18n: file: ../desktop/konsoleui.rc:18
+#. i18n: ectx: Menu (view-split)
+#: rc.cpp:476
+msgid "Split View"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:831
-#. i18n: ectx: property (toolTip), widget (QPushButton, removeKeyBindingsButton)
-#: rc.cpp:244 rc.cpp:731
-msgid "Delete the selected key bindings list"
+#. i18n: file: ../desktop/konsoleui.rc:33
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:479
+msgid "Settings"
+msgstr "Gosodiadau"
+
+#. i18n: file: ../desktop/konsoleui.rc:44
+#. i18n: ectx: Menu (help)
+#: rc.cpp:482
+msgid "Help"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:842
-#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
-#: rc.cpp:259 rc.cpp:779
-msgctxt "@title:tab Complex options"
-msgid "Advanced"
+#. i18n: file: ../desktop/partui.rc:7
+#. i18n: ectx: Menu (history)
+#: rc.cpp:485
+msgid "S&crollback"
+msgstr ""
+
+#: RenameTabsDialog.cpp:32
+msgid "Rename Tab"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:872
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:253 rc.cpp:740
-msgid "Terminal Features"
+#: schemas.cpp:1
+msgid "Black on Light Yellow"
+msgstr "Du ar Felyn Golau"
+
+#: schemas.cpp:2
+msgid "Black on White"
+msgstr "Du ar Wyn"
+
+#: schemas.cpp:3
+msgid "White on Black"
+msgstr "Gwyn ar Ddu"
+
+#: schemas.cpp:4
+msgid "Black on Random Light"
+msgstr ""
+
+#: schemas.cpp:5
+msgid "Dark Pastels"
+msgstr ""
+
+#: schemas.cpp:6
+msgid "Green on Black"
+msgstr "Gwyrdd ar Ddu"
+
+#: schemas.cpp:7
+msgid "Linux Colors"
+msgstr "Lliwiau Linux"
+
+#: schemas.cpp:8
+msgid "Solarized"
+msgstr ""
+
+#: schemas.cpp:9
+msgid "Default (XFree 4)"
+msgstr ""
+
+#: schemas.cpp:10
+msgid "Linux console"
+msgstr ""
+
+#: schemas.cpp:11
+msgid "Solaris console"
+msgstr ""
+
+#: schemas.cpp:12
+msgid "DEC VT420 Terminal"
+msgstr ""
+
+#: SessionController.cpp:279
+msgid "Konsole does not know how to open the bookmark: "
+msgstr ""
+
+#: SessionController.cpp:419
+msgid "&Close Tab"
+msgstr ""
+
+#: SessionController.cpp:425
+msgid "Open File Manager"
+msgstr ""
+
+#: SessionController.cpp:441
+msgid "Paste Selection"
+msgstr "Gludo'r Dewisiad"
+
+#: SessionController.cpp:445
+msgid "&Select All"
+msgstr ""
+
+#: SessionController.cpp:452
+msgid "&Rename Tab..."
+msgstr ""
+
+#: SessionController.cpp:458
+msgid "&All Tabs in Current Window"
+msgstr ""
+
+#: SessionController.cpp:463
+msgid "&Select Tabs..."
+msgstr ""
+
+#: SessionController.cpp:469
+msgctxt "@action:inmenu Do not select any tabs"
+msgid "&None"
+msgstr ""
+
+#: SessionController.cpp:475
+msgid "&ZModem Upload..."
+msgstr "Fyny-lwytho â &ZModem..."
+
+#: SessionController.cpp:480
+msgid "Monitor for &Activity"
+msgstr "Archwilio am &Weithgarwch"
+
+#: SessionController.cpp:485
+msgid "Monitor for &Silence"
+msgstr "Archwilio am &Dawelwch"
+
+#: SessionController.cpp:491
+msgid "Set &Encoding"
+msgstr ""
+
+#: SessionController.cpp:499
+msgid "Enlarge Font"
+msgstr "Cynyddu Maint yr Wynebfath"
+
+#: SessionController.cpp:504
+msgid "Shrink Font"
+msgstr "Lleihau Wynebfath"
+
+#: SessionController.cpp:522
+msgid "Save Output &As..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:887
-#. i18n: ectx: property (toolTip), widget (QCheckBox, enableBlinkingTextButton)
-#: rc.cpp:256 rc.cpp:743
-msgid "Allow terminal programs to create blinking sections of text"
+#: SessionController.cpp:525
+msgid "Adjust Scrollback..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:890
-#. i18n: ectx: property (text), widget (QCheckBox, enableBlinkingTextButton)
-#: rc.cpp:259 rc.cpp:746
-msgid "Allow blinking text"
+#: SessionController.cpp:530
+msgid "Clear Scrollback"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:903
-#. i18n: ectx: property (toolTip), widget (QCheckBox, enableFlowControlButton)
-#: rc.cpp:262 rc.cpp:749
-msgid "Allow the output to be suspended by pressing Ctrl+S"
+#: SessionController.cpp:534
+msgid "Clear Scrollback and Reset"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:906
-#. i18n: ectx: property (text), widget (QCheckBox, enableFlowControlButton)
-#: rc.cpp:265 rc.cpp:752
-msgid "Enable flow control using Ctrl+S, Ctrl+Q"
+#: SessionController.cpp:540
+msgid "Configure Current Profile..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:919
-#. i18n: ectx: property (toolTip), widget (QCheckBox, enableResizeWindowButton)
-#: rc.cpp:268 rc.cpp:755
-msgid "Allow terminal programs to resize the window"
+#: SessionController.cpp:543
+msgid "Switch Profile"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:922
-#. i18n: ectx: property (text), widget (QCheckBox, enableResizeWindowButton)
-#: rc.cpp:271 rc.cpp:758
-msgid "Allow programs to resize terminal window"
+#: SessionController.cpp:626
+msgid ""
+"A program is currently running in this session.  Are you sure you want to "
+"close it?"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:935
-#. i18n: ectx: property (toolTip), widget (QCheckBox, enableBidiRenderingButton)
-#: rc.cpp:274 rc.cpp:761
+#: SessionController.cpp:629
+#, kde-format
 msgid ""
-"Enable Bi-Directional display on terminals (valid for Arabic, Farsi or "
-"Hebrew only)"
+"The program '%1' is currently running in this session.  Are you sure you "
+"want to close it?"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:938
-#. i18n: ectx: property (text), widget (QCheckBox, enableBidiRenderingButton)
-#: rc.cpp:277 rc.cpp:764
-msgid "Enable Bi-Directional text rendering"
+#: SessionController.cpp:652
+msgid ""
+"A program in this session would not die.  Are you sure you want to kill it "
+"by force?"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:948
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_9)
-#: rc.cpp:280 rc.cpp:767
-msgid "Mouse Interaction"
+#: SessionController.cpp:655
+#, kde-format
+msgid ""
+"The program '%1' is in this session would not die.  Are you sure you want to "
+"kill it by force?"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:935
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:292 rc.cpp:812
-msgid "Characters considered part of a word when double clicking: "
+#: SessionController.cpp:1244
+msgid "Save ZModem Download to..."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:969
-#. i18n: ectx: property (toolTip), widget (KLineEdit, wordCharacterEdit)
-#: rc.cpp:286 rc.cpp:773
+#: SessionController.cpp:1253
 msgid ""
-"Characters which are considered part of a word when double-clicking to "
-"select whole words in the terminal"
+"<p>A ZModem file transfer attempt has been detected, but no suitable ZModem "
+"software was found on this system.</p><p>You may wish to install the 'rzsz' "
+"or 'lrzsz' package.</p>"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:981
-#. i18n: ectx: property (toolTip), widget (QCheckBox, tripleClickMode)
-#: rc.cpp:292 rc.cpp:779
+#: SessionController.cpp:1265
 msgid ""
-"All characters from the current word to the end of line will be selected."
-msgstr ""
-
-#. i18n: file: EditProfileDialog.ui:978
-#. i18n: ectx: property (text), widget (QCheckBox, tripleClickMode)
-#: rc.cpp:289 rc.cpp:776
-msgid "Triple click selects from current word forward"
+"<p>The current session already has a ZModem file transfer in progress.</p>"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:967
-#. i18n: ectx: property (toolTip), widget (QCheckBox, underlineLinksButton)
-#: rc.cpp:353
+#: SessionController.cpp:1274
 msgid ""
-"Text recognized as a link or an email address will be underlined when "
-"hovered by the mouse pointer."
+"<p>No suitable ZModem software was found on this system.</p><p>You may wish "
+"to install the 'rzsz' or 'lrzsz' package.</p>"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:970
-#. i18n: ectx: property (text), widget (QCheckBox, underlineLinksButton)
-#: rc.cpp:356
-msgid "Underline links"
+#: SessionController.cpp:1280
+msgid "Select Files for ZModem Upload"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:991
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#: rc.cpp:295 rc.cpp:782
-msgid "Cursor"
+#: SessionController.cpp:1352
+#, kde-format
+msgid "Save Output From %1"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1006
-#. i18n: ectx: property (toolTip), widget (QCheckBox, enableBlinkingCursorButton)
-#: rc.cpp:298 rc.cpp:785
-msgid "Make the cursor blink regularly"
+#: SessionController.cpp:1363
+#, kde-format
+msgid "%1 is an invalid URL, the output could not be saved."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1009
-#. i18n: ectx: property (text), widget (QCheckBox, enableBlinkingCursorButton)
-#: rc.cpp:301 rc.cpp:788
-msgid "Blinking cursor"
+#: SessionController.cpp:1441
+#, kde-format
+msgid ""
+"A problem occurred when saving the output.\n"
+"%1"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1018
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:304 rc.cpp:791
-msgid "Cursor shape:"
+#: Session.cpp:376
+msgid "Could not find binary: "
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1025
-#. i18n: ectx: property (toolTip), widget (QComboBox, cursorShapeCombo)
-#: rc.cpp:307 rc.cpp:794
-msgid "Change the shape of the cursor"
+#: Session.cpp:385
+msgctxt "@info:shell Alert the user with red color text"
+msgid "Warning: "
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1029
-#. i18n: ectx: property (text), item, widget (QComboBox, cursorShapeCombo)
-#: rc.cpp:310 rc.cpp:797
-msgctxt "The shape of the cursor"
-msgid "Block"
+#: Session.cpp:448
+#, kde-format
+msgid ""
+"Could not find '%1', starting '%2' instead.  Please check your profile "
+"settings."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1034
-#. i18n: ectx: property (text), item, widget (QComboBox, cursorShapeCombo)
-#: rc.cpp:313 rc.cpp:800
-msgctxt "The shape of the cursor, similar to a capital I"
-msgid "I-Beam"
+#: Session.cpp:453
+msgid "Could not find an interactive shell to start."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1039
-#. i18n: ectx: property (text), item, widget (QComboBox, cursorShapeCombo)
-#: rc.cpp:316 rc.cpp:803
-msgctxt "The shape of the cursor"
-msgid "Underline"
+#: Session.cpp:491
+#, kde-format
+msgid "Could not start program '%1' with arguments '%2'."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1068
-#. i18n: ectx: property (toolTip), widget (QRadioButton, autoCursorColorButton)
-#: rc.cpp:319 rc.cpp:806
-msgid "Set the cursor to match the color of the character underneath it."
+#: Session.cpp:601
+#, kde-format
+msgid "Silence in session '%1'"
+msgstr "Tawelwch yn sesiwn '%1'"
+
+#: Session.cpp:653
+#, kde-format
+msgid "Bell in session '%1'"
+msgstr "Cloch yn sesiwn '%1'"
+
+#: Session.cpp:659
+#, kde-format
+msgid "Activity in session '%1'"
+msgstr "Gweithgarwch yn sesiwn '%1'"
+
+#: Session.cpp:849
+msgctxt "@info:shell This session is done"
+msgid "Finished"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1071
-#. i18n: ectx: property (text), widget (QRadioButton, autoCursorColorButton)
-#: rc.cpp:322 rc.cpp:809
-msgid "Set cursor color to match current character"
+#: Session.cpp:865 Session.cpp:878
+#, kde-format
+msgid "Program '%1' crashed."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1086
-#. i18n: ectx: property (toolTip), widget (QRadioButton, customCursorColorButton)
-#: rc.cpp:325 rc.cpp:812
-msgid "Use a custom, fixed color for the cursor"
+#: Session.cpp:867
+#, kde-format
+msgid "Program '%1' exited with status %2."
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1089
-#. i18n: ectx: property (text), widget (QRadioButton, customCursorColorButton)
-#: rc.cpp:328 rc.cpp:815
-msgid "Custom cursor color:"
+#: Session.cpp:1218
+msgid "ZModem Progress"
+msgstr "Cynnydd ZModem"
+
+#: SessionManager.cpp:946
+msgctxt "@item:intable The session index"
+msgid "Number"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1102
-#. i18n: ectx: property (toolTip), widget (KColorButton, customColorSelectButton)
-#: rc.cpp:331 rc.cpp:818
-msgid "Select the color used to draw the cursor"
+#: SessionManager.cpp:948
+msgctxt "@item:intable The session title"
+msgid "Title"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1130
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_11)
-#: rc.cpp:334 rc.cpp:821
-msgid "Encoding"
+#: TabTitleFormatAction.cpp:34
+#, c-format
+msgid "Program Name: %n"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1139
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: rc.cpp:337 rc.cpp:824
-msgid "Default character encoding:"
+#: TabTitleFormatAction.cpp:35
+#, c-format
+msgid "Current Directory (Short): %d"
 msgstr ""
 
-#. i18n: file: EditProfileDialog.ui:1138
-#. i18n: ectx: property (text), widget (QPushButton, selectEncodingButton)
-#: rc.cpp:350 rc.cpp:870
-msgctxt "@action:button Pick an encoding"
-msgid "Select"
+#: TabTitleFormatAction.cpp:36
+msgid "Current Directory (Long): %D"
 msgstr ""
 
-#. i18n: file: KeyBindingEditor.ui:45
-#. i18n: ectx: property (text), widget (QPushButton, addEntryButton)
-#: rc.cpp:347 rc.cpp:834
-msgid "Add"
+#: TabTitleFormatAction.cpp:37 TabTitleFormatAction.cpp:49
+msgid "Window Title Set by Shell: %w"
 msgstr ""
 
-#. i18n: file: KeyBindingEditor.ui:74
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:353 rc.cpp:840
-msgctxt "Title of the area where you test your keys are properly configured"
-msgid "Test Area"
+#: TabTitleFormatAction.cpp:38 TabTitleFormatAction.cpp:50
+msgid "Session Number: %#"
 msgstr ""
 
-#. i18n: file: KeyBindingEditor.ui:83
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:356 rc.cpp:843
-msgid "Input:"
+#: TabTitleFormatAction.cpp:39 TabTitleFormatAction.cpp:46
+#, c-format
+msgid "User Name: %u"
 msgstr ""
 
-#. i18n: file: KeyBindingEditor.ui:96
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:359 rc.cpp:846
-msgid "Output:"
+#: TabTitleFormatAction.cpp:47
+msgid "Remote Host (Short): %h"
 msgstr ""
 
-#. i18n: file: ../desktop/partui.rc:8
-#. i18n: ectx: Menu (history)
-#: rc.cpp:849
-msgid "S&crollback"
+#: TabTitleFormatAction.cpp:48
+msgid "Remote Host (Long): %H"
 msgstr ""
 
-#. i18n: file: ../desktop/partui.rc:26
-#. i18n: ectx: Menu (change-profile)
-#. i18n: file: ../desktop/sessionui.rc:66
-#. i18n: ectx: Menu (change-profile)
-#: rc.cpp:852 rc.cpp:861
-msgid "&Change Profile"
+#: TerminalDisplay.cpp:1126 TerminalDisplay.cpp:1127
+msgid "Size: XXX x XXX"
+msgstr "Maint: XXX x XXX"
+
+#: TerminalDisplay.cpp:1137
+#, kde-format
+msgid "Size: %1 x %2"
+msgstr "Maint: %1 x %2"
+
+#: TerminalDisplay.cpp:2922
+msgid "&Paste as text"
 msgstr ""
 
-#. i18n: file: ../desktop/sessionui.rc:14
-#. i18n: ectx: Menu (edit-copy-input-to)
-#: rc.cpp:855
-msgid "Copy Input To"
+#: TerminalDisplay.cpp:2982
+msgid ""
+"<qt>Output has been <a "
+"href=\"http://en.wikipedia.org/wiki/Flow_control\">suspended</a> by pressing "
+"Ctrl+S.  Press <b>Ctrl+Q</b> to resume.</qt>"
 msgstr ""
 
-#. i18n: file: ../desktop/sessionui.rc:47
-#. i18n: ectx: Menu (debug)
-#: rc.cpp:858
-msgid "Debug"
+#: ViewContainer.cpp:456
+msgctxt "@action:inmenu"
+msgid "&Detach Tab"
 msgstr ""
 
-#. i18n: file: ../desktop/konsoleui.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:864
-msgid "File"
+#: ViewContainer.cpp:460
+msgctxt "@action:inmenu"
+msgid "&Rename Tab..."
 msgstr ""
 
-#. i18n: file: ../desktop/konsoleui.rc:15
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:867
-msgid "Edit"
+#: ViewContainer.cpp:464
+msgctxt "@action:inmenu"
+msgid "&Close Tab"
 msgstr ""
 
-#. i18n: file: ../desktop/konsoleui.rc:21
-#. i18n: ectx: Menu (view)
-#: rc.cpp:873
-msgid "View"
+#: ViewManager.cpp:137
+msgctxt "@action Shortcut entry"
+msgid "Next Tab"
 msgstr ""
 
-#. i18n: file: ../desktop/konsoleui.rc:22
-#. i18n: ectx: Menu (view-split)
-#: rc.cpp:876
-msgid "Split View"
+#: ViewManager.cpp:138
+msgctxt "@action Shortcut entry"
+msgid "Previous Tab"
 msgstr ""
 
-#. i18n: file: ../desktop/konsoleui.rc:40
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:879
-msgid "Settings"
-msgstr "Gosodiadau"
+#: ViewManager.cpp:139
+msgctxt "@action Shortcut entry"
+msgid "Switch to Last Tab"
+msgstr ""
 
-#. i18n: file: ../desktop/konsoleui.rc:47
-#. i18n: ectx: Menu (help)
-#: rc.cpp:882
-msgid "Help"
+#: ViewManager.cpp:140
+msgctxt "@action Shortcut entry"
+msgid "Next View Container"
 msgstr ""
 
-#: schemas.cpp:1
-msgid "Black on Light Yellow"
-msgstr "Du ar Felyn Golau"
+#: ViewManager.cpp:142
+msgctxt "@action Shortcut entry"
+msgid "Move Tab Left"
+msgstr ""
 
-#: schemas.cpp:2
-msgid "Black on White"
-msgstr "Du ar Wyn"
+#: ViewManager.cpp:143
+msgctxt "@action Shortcut entry"
+msgid "Move Tab Right"
+msgstr ""
 
-#: schemas.cpp:3
-msgid "White on Black"
-msgstr "Gwyn ar Ddu"
+#: ViewManager.cpp:153
+msgctxt "@action:inmenu"
+msgid "Split View Left/Right"
+msgstr ""
 
-#: schemas.cpp:4
-msgid "Black on Random Light"
+#: ViewManager.cpp:160
+msgctxt "@action:inmenu"
+msgid "Split View Top/Bottom"
 msgstr ""
 
-#: schemas.cpp:5
-msgid "Dark Pastels"
+#: ViewManager.cpp:165
+msgctxt "@action:inmenu Close Active View"
+msgid "Close Active"
 msgstr ""
 
-#: schemas.cpp:6
-msgid "Green on Black"
-msgstr "Gwyrdd ar Ddu"
+#: ViewManager.cpp:174
+msgctxt "@action:inmenu Close Other Views"
+msgid "Close Others"
+msgstr ""
 
-#: schemas.cpp:7
-msgid "Linux Colors"
-msgstr "Lliwiau Linux"
+#: ViewManager.cpp:184
+msgctxt "@action:inmenu"
+msgid "D&etach Current Tab"
+msgstr ""
 
-#: schemas.cpp:8
-msgid "Default (XFree 4)"
+#: ViewManager.cpp:193
+msgctxt "@action:inmenu"
+msgid "Expand View"
 msgstr ""
 
-#: schemas.cpp:9
-msgid "Linux console"
+#: ViewManager.cpp:201
+msgctxt "@action:inmenu"
+msgid "Shrink View"
 msgstr ""
 
-#: schemas.cpp:10
-msgid "Solaris console"
+#: ViewManager.cpp:223
+#, kde-format
+msgctxt "@action Shortcut entry"
+msgid "Switch to Tab %1"
 msgstr ""
 
-#: schemas.cpp:11
-msgid "DEC VT420 Terminal"
+#: Vt102Emulation.cpp:1011
+msgid ""
+"No keyboard translator available.  The information needed to convert key "
+"presses into characters to send to the terminal is missing."
 msgstr ""
+
+#: ZModemDialog.cpp:36
+msgid "&Stop"
+msgstr "&Gorffen"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kontactinterfaces.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kontactinterfaces.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kontactinterfaces.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kontactinterfaces.po	2012-04-18 08:59:29.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdepimlibs\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2010-12-18 02:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kontact.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kontact.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kontact.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kontact.po	2012-04-18 08:59:26.000000000 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: kontact\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:38+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-11 17:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:15+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:42+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -61,41 +61,27 @@
 "this box if you would like the specified plugin to come up on start instead."
 msgstr ""
 
-#. i18n: file: plugins/knotes/knotes_part.rc:4
-#. i18n: ectx: Menu (file)
-#. i18n: file: src/kontactui.rc:6
-#. i18n: ectx: Menu (file)
-#: rc.cpp:20 rc.cpp:539
-msgid "&File"
-msgstr ""
-
-#. i18n: file: plugins/knotes/knotes_part.rc:8
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:23
-msgid "&Edit"
-msgstr ""
-
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:16
 #. i18n: ectx: property (windowTitle), widget (QWidget, SDSummaryConfig_Base)
-#: rc.cpp:26
+#: rc.cpp:20
 msgid "Special Dates Summary Configuration"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, mDaysGroup)
-#: rc.cpp:29
+#: rc.cpp:23
 msgid "Show Special Dates Starting"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:28
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:32
+#: rc.cpp:26
 msgid "Show special occasions for today only"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:31
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:35
+#: rc.cpp:29
 msgid ""
 "Check this box if you want to see special occasions occurring on this date "
 "only."
@@ -105,23 +91,23 @@
 #. i18n: ectx: property (text), widget (QRadioButton, mDateTodayButton)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:153
 #. i18n: ectx: property (text), widget (QRadioButton, mDateTodayButton)
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:26
-#. i18n: ectx: property (text), widget (QRadioButton, mDateTodayButton)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:34
 #. i18n: ectx: property (text), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:38 rc.cpp:209 rc.cpp:365 rc.cpp:443
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:26
+#. i18n: ectx: property (text), widget (QRadioButton, mDateTodayButton)
+#: rc.cpp:32 rc.cpp:203 rc.cpp:368 rc.cpp:473
 msgid "&Today only"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:44
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:41
+#: rc.cpp:35
 msgid "Show special occasions starting within the next month"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:47
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:44
+#: rc.cpp:38
 msgid ""
 "Check this box if you want to see special occasions that start sometime "
 "during the next 31 days."
@@ -131,23 +117,23 @@
 #. i18n: ectx: property (text), widget (QRadioButton, mDateMonthButton)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:169
 #. i18n: ectx: property (text), widget (QRadioButton, mDateMonthButton)
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:42
-#. i18n: ectx: property (text), widget (QRadioButton, mDateMonthButton)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:50
 #. i18n: ectx: property (text), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:47 rc.cpp:218 rc.cpp:374 rc.cpp:452
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:42
+#. i18n: ectx: property (text), widget (QRadioButton, mDateMonthButton)
+#: rc.cpp:41 rc.cpp:212 rc.cpp:377 rc.cpp:482
 msgid "Within the next &month (31 days)"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:65
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:50
+#: rc.cpp:44
 msgid "Select the days for showing upcoming special occasions"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:68
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:53
+#: rc.cpp:47
 msgid ""
 "Check this box if you want to specify the number of days in the future for "
 "upcoming special occasions."
@@ -157,23 +143,23 @@
 #. i18n: ectx: property (text), widget (QRadioButton, mDateRangeButton)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:190
 #. i18n: ectx: property (text), widget (QRadioButton, mDateRangeButton)
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:63
-#. i18n: ectx: property (text), widget (QRadioButton, mDateRangeButton)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:74
 #. i18n: ectx: property (text), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:56 rc.cpp:227 rc.cpp:383 rc.cpp:461
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:63
+#. i18n: ectx: property (text), widget (QRadioButton, mDateRangeButton)
+#: rc.cpp:50 rc.cpp:221 rc.cpp:386 rc.cpp:491
 msgid "Within the &next:"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:84
 #. i18n: ectx: property (toolTip), widget (QSpinBox, mCustomDays)
-#: rc.cpp:59
+#: rc.cpp:53
 msgid "Set the number of days to show upcoming special occasions"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:87
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, mCustomDays)
-#: rc.cpp:62
+#: rc.cpp:56
 msgid ""
 "Use this spinbox to set the number of days to show upcoming special "
 "occasions up to one year in the future."
@@ -183,11 +169,11 @@
 #. i18n: ectx: property (specialValueText), widget (QSpinBox, mCustomDays)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:209
 #. i18n: ectx: property (specialValueText), widget (QSpinBox, mCustomDays)
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:82
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, mCustomDays)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:93
 #. i18n: ectx: property (specialValueText), widget (QSpinBox, mCustomDays)
-#: rc.cpp:65 rc.cpp:236 rc.cpp:392 rc.cpp:470
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:82
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, mCustomDays)
+#: rc.cpp:59 rc.cpp:230 rc.cpp:395 rc.cpp:500
 msgid "1 day"
 msgstr ""
 
@@ -195,30 +181,30 @@
 #. i18n: ectx: property (suffix), widget (QSpinBox, mCustomDays)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:212
 #. i18n: ectx: property (suffix), widget (QSpinBox, mCustomDays)
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:85
-#. i18n: ectx: property (suffix), widget (QSpinBox, mCustomDays)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:96
 #. i18n: ectx: property (suffix), widget (QSpinBox, mCustomDays)
-#: rc.cpp:68 rc.cpp:239 rc.cpp:395 rc.cpp:473
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:85
+#. i18n: ectx: property (suffix), widget (QSpinBox, mCustomDays)
+#: rc.cpp:62 rc.cpp:233 rc.cpp:398 rc.cpp:503
 msgctxt "days to show in summary"
 msgid " days"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:130
 #. i18n: ectx: property (title), widget (QGroupBox, mShowFromCalGroup)
-#: rc.cpp:71
+#: rc.cpp:65
 msgid "Show These Special Dates From Your Calendar"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:136
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowBirthdaysFromCalBox)
-#: rc.cpp:74
+#: rc.cpp:68
 msgid "Show birthdays from your calendar"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:139
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowBirthdaysFromCalBox)
-#: rc.cpp:77
+#: rc.cpp:71
 msgid ""
 "Enable this option to include birthdays from your calendar in the upcoming "
 "special occasions summary. Typically, these are events with the \"Birthday\" "
@@ -229,19 +215,19 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mShowBirthdaysFromCalBox)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:134
 #. i18n: ectx: property (text), widget (QCheckBox, mShowBirthdaysFromCal)
-#: rc.cpp:80 rc.cpp:407
+#: rc.cpp:74 rc.cpp:515
 msgid "Show &birthdays"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:152
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowAnniversariesFromCalBox)
-#: rc.cpp:83
+#: rc.cpp:77
 msgid "Show anniversaries from your calendar"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:155
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowAnniversariesFromCalBox)
-#: rc.cpp:86
+#: rc.cpp:80
 msgid ""
 "Enable this option to include anniversaries from your calendar in the "
 "upcoming special occasions summary. Typically, these are events with the "
@@ -252,7 +238,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mShowAnniversariesFromCalBox)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:147
 #. i18n: ectx: property (text), widget (QCheckBox, mShowAnniversariesFromCal)
-#: rc.cpp:89 rc.cpp:416
+#: rc.cpp:83 rc.cpp:524
 msgid "Show &anniversaries"
 msgstr ""
 
@@ -260,13 +246,13 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowHolidaysFromCalBox)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:450
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHolidaysCal)
-#: rc.cpp:92 rc.cpp:335
+#: rc.cpp:86 rc.cpp:329
 msgid "Show holidays from your calendar"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:171
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowHolidaysFromCalBox)
-#: rc.cpp:95
+#: rc.cpp:89
 msgid ""
 "Enable this option to include holidays from your calendar in the upcoming "
 "special occasions summary. These are events from your configured holiday "
@@ -275,7 +261,7 @@
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:174
 #. i18n: ectx: property (text), widget (QCheckBox, mShowHolidaysFromCalBox)
-#: rc.cpp:98
+#: rc.cpp:92
 msgid "Show &holidays"
 msgstr ""
 
@@ -283,7 +269,7 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowSpecialsFromCalBox)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:466
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mSpecialOccasionsCal)
-#: rc.cpp:101 rc.cpp:344
+#: rc.cpp:95 rc.cpp:338
 msgid "Show special occasions from your calendar"
 msgstr ""
 
@@ -291,7 +277,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowSpecialsFromCalBox)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:469
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mSpecialOccasionsCal)
-#: rc.cpp:104 rc.cpp:347
+#: rc.cpp:98 rc.cpp:341
 msgid ""
 "Enable this option to include events from your calendar with the \"special "
 "occasion\" category."
@@ -299,13 +285,13 @@
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:190
 #. i18n: ectx: property (text), widget (QCheckBox, mShowSpecialsFromCalBox)
-#: rc.cpp:107
+#: rc.cpp:101
 msgid "Show s&pecial occasions"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:203
 #. i18n: ectx: property (title), widget (QGroupBox, mShowFromKABButtonGroup)
-#: rc.cpp:110
+#: rc.cpp:104
 msgid "Show These Special Dates From Your Contact List"
 msgstr ""
 
@@ -313,13 +299,13 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowBirthdaysFromKABBox)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:418
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mBirthdayConList)
-#: rc.cpp:113 rc.cpp:317
+#: rc.cpp:107 rc.cpp:311
 msgid "Show birthdays from your address book"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:212
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowBirthdaysFromKABBox)
-#: rc.cpp:116
+#: rc.cpp:110
 msgid ""
 "Enable this option to include birthdays from your address book in the "
 "upcoming special occasions summary."
@@ -327,7 +313,7 @@
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:215
 #. i18n: ectx: property (text), widget (QCheckBox, mShowBirthdaysFromKABBox)
-#: rc.cpp:119
+#: rc.cpp:113
 msgid "Show birth&days"
 msgstr ""
 
@@ -335,13 +321,13 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowAnniversariesFromKABBox)
 #. i18n: file: plugins/planner/plannerconfig_base.ui:434
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mAnniversariesConList)
-#: rc.cpp:122 rc.cpp:326
+#: rc.cpp:116 rc.cpp:320
 msgid "Show anniversaries from your address book"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:228
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowAnniversariesFromKABBox)
-#: rc.cpp:125
+#: rc.cpp:119
 msgid ""
 "Enable this option to include anniversaries from your address book in the "
 "upcoming special occasions summary."
@@ -349,17 +335,17 @@
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:231
 #. i18n: ectx: property (text), widget (QCheckBox, mShowAnniversariesFromKABBox)
-#: rc.cpp:128
+#: rc.cpp:122
 msgid "Show anni&versaries"
 msgstr ""
 
 #. i18n: file: plugins/specialdates/sdsummaryconfig_base.ui:244
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:157
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:216
 #. i18n: ectx: property (title), widget (QGroupBox, mGroupwareGroup)
-#: rc.cpp:131 rc.cpp:419 rc.cpp:524
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:157
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:125 rc.cpp:449 rc.cpp:527
 msgid "Groupware Settings"
 msgstr ""
 
@@ -369,7 +355,7 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowMyEventsOnly)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:163
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowMineOnly)
-#: rc.cpp:134 rc.cpp:242 rc.cpp:422
+#: rc.cpp:128 rc.cpp:236 rc.cpp:530
 msgid "Show events belonging to my calendars only"
 msgstr ""
 
@@ -379,7 +365,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowMyEventsOnly)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:166
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowMineOnly)
-#: rc.cpp:137 rc.cpp:245 rc.cpp:425
+#: rc.cpp:131 rc.cpp:239 rc.cpp:533
 msgid ""
 "Check this box if you want the summary to show events belonging to your "
 "calendars only."
@@ -391,38 +377,38 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mShowMyEventsOnly)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:169
 #. i18n: ectx: property (text), widget (QCheckBox, mShowMineOnly)
-#: rc.cpp:140 rc.cpp:248 rc.cpp:428
+#: rc.cpp:134 rc.cpp:242 rc.cpp:536
 msgid "Show &my events only"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:16
 #. i18n: ectx: property (windowTitle), widget (QWidget, PlannerSummaryConfig_Base)
-#: rc.cpp:143
+#: rc.cpp:137
 msgid "Planner Summary Configuration"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:26
 #. i18n: ectx: attribute (title), widget (QWidget, GeneralTab)
-#: rc.cpp:146
+#: rc.cpp:140
 msgctxt "general settings"
 msgid "General"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:32
 #. i18n: ectx: property (title), widget (QGroupBox, mGeneralBox)
-#: rc.cpp:149
+#: rc.cpp:143
 msgid "General Configuration"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:38
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowRecurrence)
-#: rc.cpp:152
+#: rc.cpp:146
 msgid "Show an icon indicating a recurring item"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:41
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowRecurrence)
-#: rc.cpp:155
+#: rc.cpp:149
 msgid ""
 "Check this box if you want to see an icon that indicates an event or to-do "
 "is recurring."
@@ -430,19 +416,19 @@
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:44
 #. i18n: ectx: property (text), widget (QCheckBox, mShowRecurrence)
-#: rc.cpp:158
+#: rc.cpp:152
 msgid "Show recurrence icon"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:54
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowReminder)
-#: rc.cpp:161
+#: rc.cpp:155
 msgid "Show an icon indicating the item has a reminder"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:57
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowReminder)
-#: rc.cpp:164
+#: rc.cpp:158
 msgid ""
 "Check this box if you want to see an icon indicating that the event or to-do "
 "has a reminder."
@@ -450,73 +436,73 @@
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:60
 #. i18n: ectx: property (text), widget (QCheckBox, mShowReminder)
-#: rc.cpp:167
+#: rc.cpp:161
 msgid "Show reminder icon"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:70
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mUnderline)
-#: rc.cpp:170
+#: rc.cpp:164
 msgid "Underline links in descriptions"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:73
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mUnderline)
-#: rc.cpp:173
+#: rc.cpp:167
 msgid "Check this box if you want URL links to be underlined."
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:76
 #. i18n: ectx: property (text), widget (QCheckBox, mUnderline)
-#: rc.cpp:176
+#: rc.cpp:170
 msgid "Underline links"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:86
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mTodo)
-#: rc.cpp:179
+#: rc.cpp:173
 msgid "Show to-dos in the summary"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:89
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mTodo)
-#: rc.cpp:182
+#: rc.cpp:176
 msgid "Check this box if you want to see to-dos in the summary."
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:92
 #. i18n: ectx: property (text), widget (QCheckBox, mTodo)
-#: rc.cpp:185
+#: rc.cpp:179
 msgid "Show To-dos in planner"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:102
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mSd)
-#: rc.cpp:188
+#: rc.cpp:182
 msgid "Show special dates in the summary"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:105
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mSd)
-#: rc.cpp:191
+#: rc.cpp:185
 msgid "Check this box if you want to see special dates in the summary."
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:108
 #. i18n: ectx: property (text), widget (QCheckBox, mSd)
-#: rc.cpp:194
+#: rc.cpp:188
 msgid "Show special dates in planner"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:135
 #. i18n: ectx: attribute (title), widget (QWidget, CalendarTab)
-#: rc.cpp:197
+#: rc.cpp:191
 msgid "Events"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:141
 #. i18n: ectx: property (title), widget (QGroupBox, mDaysGroup)
-#: rc.cpp:200
+#: rc.cpp:194
 msgid "Show Calendar Events"
 msgstr ""
 
@@ -524,7 +510,7 @@
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateTodayButton)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:20
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:203 rc.cpp:359
+#: rc.cpp:197 rc.cpp:467
 msgid "Show events for today only"
 msgstr ""
 
@@ -532,7 +518,7 @@
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateTodayButton)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:23
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:206 rc.cpp:362
+#: rc.cpp:200 rc.cpp:470
 msgid "Check this box if you want to see events occurring on this date only."
 msgstr ""
 
@@ -540,7 +526,7 @@
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateMonthButton)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:36
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:212 rc.cpp:368
+#: rc.cpp:206 rc.cpp:476
 msgid "Show events starting within the next month"
 msgstr ""
 
@@ -548,7 +534,7 @@
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateMonthButton)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:39
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:215 rc.cpp:371
+#: rc.cpp:209 rc.cpp:479
 msgid ""
 "Check this box if you want to see events that start sometime during the next "
 "31 days."
@@ -558,7 +544,7 @@
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateRangeButton)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:57
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:221 rc.cpp:377
+#: rc.cpp:215 rc.cpp:485
 msgid "Select the days for showing upcoming events"
 msgstr ""
 
@@ -566,7 +552,7 @@
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateRangeButton)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:60
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:224 rc.cpp:380
+#: rc.cpp:218 rc.cpp:488
 msgid ""
 "Check this box if you want to specify the number of days in the future for "
 "upcoming events."
@@ -576,7 +562,7 @@
 #. i18n: ectx: property (toolTip), widget (QSpinBox, mCustomDays)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:76
 #. i18n: ectx: property (toolTip), widget (QSpinBox, mCustomDays)
-#: rc.cpp:230 rc.cpp:386
+#: rc.cpp:224 rc.cpp:494
 msgid "Set the number of days to show upcoming events"
 msgstr ""
 
@@ -584,7 +570,7 @@
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, mCustomDays)
 #. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:79
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, mCustomDays)
-#: rc.cpp:233 rc.cpp:389
+#: rc.cpp:227 rc.cpp:497
 msgid ""
 "Use this spinbox to set the number of days to show upcoming events up to 1 "
 "year in the future."
@@ -592,7 +578,7 @@
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:283
 #. i18n: ectx: attribute (title), widget (QWidget, TodoTab)
-#: rc.cpp:251
+#: rc.cpp:245
 msgid "To-dos"
 msgstr ""
 
@@ -600,19 +586,19 @@
 #. i18n: ectx: property (title), widget (QGroupBox, mHideGroup)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:133
 #. i18n: ectx: property (title), widget (QGroupBox, mHideGroup)
-#: rc.cpp:254 rc.cpp:476
+#: rc.cpp:248 rc.cpp:401
 msgid "Hide Following To-do Types"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:295
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideCompletedBox)
-#: rc.cpp:257
+#: rc.cpp:251
 msgid "Hide completed to-dos"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:298
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideCompletedBox)
-#: rc.cpp:260
+#: rc.cpp:254
 msgid ""
 "Check this box if you do not want to see to-dos that have already been "
 "completed."
@@ -622,19 +608,19 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mHideCompletedBox)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:145
 #. i18n: ectx: property (text), widget (QCheckBox, mHideCompletedBox)
-#: rc.cpp:263 rc.cpp:485
+#: rc.cpp:257 rc.cpp:410
 msgid "&Completed"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:311
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideOpenEndedBox)
-#: rc.cpp:266
+#: rc.cpp:260
 msgid "Hide to-dos without a due date"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:314
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideOpenEndedBox)
-#: rc.cpp:269
+#: rc.cpp:263
 msgid "Check this box if you do not want to see open-ended to-dos."
 msgstr ""
 
@@ -642,19 +628,19 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mHideOpenEndedBox)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:161
 #. i18n: ectx: property (text), widget (QCheckBox, mHideOpenEndedBox)
-#: rc.cpp:272 rc.cpp:494
+#: rc.cpp:266 rc.cpp:419
 msgid "&Open-ended (no due date)"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:327
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideUnstartedBox)
-#: rc.cpp:275
+#: rc.cpp:269
 msgid "Hide unstarted to-dos"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:330
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideUnstartedBox)
-#: rc.cpp:278
+#: rc.cpp:272
 msgid ""
 "Check this box if you do not want to see to-dos with a start date in the "
 "future."
@@ -664,19 +650,19 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mHideUnstartedBox)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:177
 #. i18n: ectx: property (text), widget (QCheckBox, mHideUnstartedBox)
-#: rc.cpp:281 rc.cpp:503
+#: rc.cpp:275 rc.cpp:428
 msgid "&Unstarted (start date is in the future)"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:340
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideInProgressBox)
-#: rc.cpp:284
+#: rc.cpp:278
 msgid "Hide in-progress to-dos"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:343
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideInProgressBox)
-#: rc.cpp:287
+#: rc.cpp:281
 msgid ""
 "Check this box if you do not want to see to-dos that have been started but "
 "are not yet completed."
@@ -686,19 +672,19 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mHideInProgressBox)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:190
 #. i18n: ectx: property (text), widget (QCheckBox, mHideInProgressBox)
-#: rc.cpp:290 rc.cpp:512
+#: rc.cpp:284 rc.cpp:437
 msgid "&In-progress (started but not completed)"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:353
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideOverdueBox)
-#: rc.cpp:293
+#: rc.cpp:287
 msgid "Hide overdue to-dos"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:356
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideOverdueBox)
-#: rc.cpp:296
+#: rc.cpp:290
 msgid ""
 "Check this box if you do not want to see to-dos that are past their due date "
 "but have not yet been completed."
@@ -708,7 +694,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mHideOverdueBox)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:206
 #. i18n: ectx: property (text), widget (QCheckBox, mHideOverdueBox)
-#: rc.cpp:299 rc.cpp:521
+#: rc.cpp:293 rc.cpp:446
 msgid "Over&due (not completed and beyond due-date)"
 msgstr ""
 
@@ -716,7 +702,7 @@
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowMyTodosOnly)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:222
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mShowMineOnly)
-#: rc.cpp:302 rc.cpp:527
+#: rc.cpp:296 rc.cpp:452
 msgid "Show To-dos belonging to my calendars only"
 msgstr ""
 
@@ -724,7 +710,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowMyTodosOnly)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:225
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowMineOnly)
-#: rc.cpp:305 rc.cpp:530
+#: rc.cpp:299 rc.cpp:455
 msgid ""
 "Check this box if you want the summary to show To-dos belonging to your "
 "calendars only."
@@ -734,25 +720,25 @@
 #. i18n: ectx: property (text), widget (QCheckBox, mShowMyTodosOnly)
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:228
 #. i18n: ectx: property (text), widget (QCheckBox, mShowMineOnly)
-#: rc.cpp:308 rc.cpp:533
+#: rc.cpp:302 rc.cpp:458
 msgid "Show &my To-dos only"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:403
 #. i18n: ectx: attribute (title), widget (QWidget, SdTab)
-#: rc.cpp:311
+#: rc.cpp:305
 msgid "Special Dates"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:409
 #. i18n: ectx: property (title), widget (QGroupBox, mSdBox)
-#: rc.cpp:314
+#: rc.cpp:308
 msgid "Show these Special Dates"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:421
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mBirthdayConList)
-#: rc.cpp:320
+#: rc.cpp:314
 msgid ""
 "Enable this option to include birthdays from your address book in the "
 "planner summary."
@@ -760,13 +746,13 @@
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:424
 #. i18n: ectx: property (text), widget (QCheckBox, mBirthdayConList)
-#: rc.cpp:323
+#: rc.cpp:317
 msgid "Show birthdays from address book"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:437
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mAnniversariesConList)
-#: rc.cpp:329
+#: rc.cpp:323
 msgid ""
 "Enable this option to include anniversaries from your address book in the "
 "planner summary."
@@ -774,13 +760,13 @@
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:440
 #. i18n: ectx: property (text), widget (QCheckBox, mAnniversariesConList)
-#: rc.cpp:332
+#: rc.cpp:326
 msgid "Show anniversaries from address book"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:453
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHolidaysCal)
-#: rc.cpp:338
+#: rc.cpp:332
 msgid ""
 "Enable this option to include holidays from your calendar in the planner "
 "summary. These are events from your configured holiday region, or events "
@@ -789,99 +775,71 @@
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:456
 #. i18n: ectx: property (text), widget (QCheckBox, mHolidaysCal)
-#: rc.cpp:341
+#: rc.cpp:335
 msgid "Show holidays from calendar"
 msgstr ""
 
 #. i18n: file: plugins/planner/plannerconfig_base.ui:472
 #. i18n: ectx: property (text), widget (QCheckBox, mSpecialOccasionsCal)
-#: rc.cpp:350
+#: rc.cpp:344
 msgid "Show special occasions from calendar"
 msgstr ""
 
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:8
-#. i18n: ectx: property (windowTitle), widget (QWidget, ApptSummaryConfig_Base)
-#: rc.cpp:353
-msgid "Event Summary Configuration"
-msgstr ""
-
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:14
-#. i18n: ectx: property (title), widget (QGroupBox, mDaysButtonGroup)
-#: rc.cpp:356
-msgid "Show Upcoming Events Starting"
-msgstr ""
-
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:122
-#. i18n: ectx: property (title), widget (QGroupBox, mShowButtonGroup)
-#: rc.cpp:398
-msgid "Show These Upcoming Events From Your Calendar"
-msgstr ""
-
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:128
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mShowBirthdaysFromCal)
-#: rc.cpp:401
-msgid ""
-"Show birthdays from your calendar when also using the Birthday resource"
-msgstr ""
-
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:131
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowBirthdaysFromCal)
-#: rc.cpp:404
-msgid ""
-"Enable this option to include birthdays from your calendar in the upcoming "
-"events summary. This option is only available if you are using the Birthdays "
-"resource in your calendar."
+#. i18n: file: plugins/knotes/knotes_part.rc:4
+#. i18n: ectx: Menu (file)
+#. i18n: file: src/kontactui.rc:6
+#. i18n: ectx: Menu (file)
+#: rc.cpp:347 rc.cpp:539
+msgid "&File"
 msgstr ""
 
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:141
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mShowAnniversariesFromCal)
-#: rc.cpp:410
-msgid ""
-"Shows anniversaries from your calendar when using the Birthdays resource"
+#. i18n: file: plugins/knotes/knotes_part.rc:8
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:350
+msgid "&Edit"
 msgstr ""
 
-#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:144
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowAnniversariesFromCal)
-#: rc.cpp:413
-msgid ""
-"Enable this option to include anniversaries from your calendar in the "
-"upcoming events summary. This option is only available if you are using the "
-"Birthdays resource in your calendar."
+#. i18n: file: plugins/summary/kontactsummary_part.rc:5
+#. i18n: ectx: Menu (settings)
+#. i18n: file: src/kontactui.rc:16
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:353 rc.cpp:542
+msgid "&Settings"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:16
 #. i18n: ectx: property (windowTitle), widget (QWidget, TodoSummaryConfig_Base)
-#: rc.cpp:431
+#: rc.cpp:356
 msgid "To-do Summary Configuration"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, mDaysGroup)
-#: rc.cpp:434
+#: rc.cpp:359
 msgid "Show To-dos Due"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:28
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:437
+#: rc.cpp:362
 msgid "Show To-dos due today only"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:31
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateTodayButton)
-#: rc.cpp:440
+#: rc.cpp:365
 msgid "Check this box if you want to see To-dos due on this date only."
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:44
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:446
+#: rc.cpp:371
 msgid "Show To-dos due within the next month"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:47
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateMonthButton)
-#: rc.cpp:449
+#: rc.cpp:374
 msgid ""
 "Check this box if you want to see To-dos that are due sometime during the "
 "next 31 days."
@@ -889,13 +847,13 @@
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:65
 #. i18n: ectx: property (toolTip), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:455
+#: rc.cpp:380
 msgid "Select the days for showing pending To-dos"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:71
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mDateRangeButton)
-#: rc.cpp:458
+#: rc.cpp:383
 msgid ""
 "Check this box if you want specify the number of days in the future for "
 "pending To-dos."
@@ -903,13 +861,13 @@
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:87
 #. i18n: ectx: property (toolTip), widget (QSpinBox, mCustomDays)
-#: rc.cpp:464
+#: rc.cpp:389
 msgid "Set the number of days to show pending To-dos"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:90
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, mCustomDays)
-#: rc.cpp:467
+#: rc.cpp:392
 msgid ""
 "Use this spinbox to set the number of days to show pending To-dos up to 1 "
 "year in the future."
@@ -917,13 +875,13 @@
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:139
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideCompletedBox)
-#: rc.cpp:479
+#: rc.cpp:404
 msgid "Hide completed To-dos"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:142
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideCompletedBox)
-#: rc.cpp:482
+#: rc.cpp:407
 msgid ""
 "Check this box if you do not want to see To-dos that have already been "
 "completed."
@@ -931,25 +889,25 @@
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:155
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideOpenEndedBox)
-#: rc.cpp:488
+#: rc.cpp:413
 msgid "Hide To-dos without a due date"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:158
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideOpenEndedBox)
-#: rc.cpp:491
+#: rc.cpp:416
 msgid "Check this box if you do not want to see open-ended To-dos."
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:171
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideUnstartedBox)
-#: rc.cpp:497
+#: rc.cpp:422
 msgid "Hide unstarted To-dos"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:174
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideUnstartedBox)
-#: rc.cpp:500
+#: rc.cpp:425
 msgid ""
 "Check this box if you do not want to see To-dos with a start date in the "
 "future."
@@ -957,13 +915,13 @@
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:184
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideInProgressBox)
-#: rc.cpp:506
+#: rc.cpp:431
 msgid "Hide in-progress To-dos"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:187
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideInProgressBox)
-#: rc.cpp:509
+#: rc.cpp:434
 msgid ""
 "Check this box if you do not want to see To-dos that have been started but "
 "are not yet completed."
@@ -971,24 +929,66 @@
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:197
 #. i18n: ectx: property (toolTip), widget (QCheckBox, mHideOverdueBox)
-#: rc.cpp:515
+#: rc.cpp:440
 msgid "Hide overdue To-dos"
 msgstr ""
 
 #. i18n: file: plugins/korganizer/todosummaryconfig_base.ui:203
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideOverdueBox)
-#: rc.cpp:518
+#: rc.cpp:443
 msgid ""
 "Check this box if you do not want to see To-dos that are past their due date "
 "but have not yet been completed."
 msgstr ""
 
-#. i18n: file: plugins/summary/kontactsummary_part.rc:5
-#. i18n: ectx: Menu (settings)
-#. i18n: file: src/kontactui.rc:16
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:536 rc.cpp:542
-msgid "&Settings"
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:8
+#. i18n: ectx: property (windowTitle), widget (QWidget, ApptSummaryConfig_Base)
+#: rc.cpp:461
+msgid "Event Summary Configuration"
+msgstr ""
+
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:14
+#. i18n: ectx: property (title), widget (QGroupBox, mDaysButtonGroup)
+#: rc.cpp:464
+msgid "Show Upcoming Events Starting"
+msgstr ""
+
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:122
+#. i18n: ectx: property (title), widget (QGroupBox, mShowButtonGroup)
+#: rc.cpp:506
+msgid "Show These Upcoming Events From Your Calendar"
+msgstr ""
+
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:128
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mShowBirthdaysFromCal)
+#: rc.cpp:509
+msgid ""
+"Show birthdays from your calendar when also using the Birthday resource"
+msgstr ""
+
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:131
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowBirthdaysFromCal)
+#: rc.cpp:512
+msgid ""
+"Enable this option to include birthdays from your calendar in the upcoming "
+"events summary. This option is only available if you are using the Birthdays "
+"resource in your calendar."
+msgstr ""
+
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:141
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mShowAnniversariesFromCal)
+#: rc.cpp:518
+msgid ""
+"Shows anniversaries from your calendar when using the Birthdays resource"
+msgstr ""
+
+#. i18n: file: plugins/korganizer/apptsummaryconfig_base.ui:144
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowAnniversariesFromCal)
+#: rc.cpp:521
+msgid ""
+"Enable this option to include anniversaries from your calendar in the "
+"upcoming events summary. This option is only available if you are using the "
+"Birthdays resource in your calendar."
 msgstr ""
 
 #. i18n: file: src/kontactui.rc:24
@@ -1201,7 +1201,7 @@
 
 #: src/main.cpp:166 plugins/korganizer/kcmapptsummary.cpp:169
 #: plugins/korganizer/kcmtodosummary.cpp:165
-#: plugins/planner/kcmplanner.cpp:246 plugins/planner/plannerplugin.cpp:62
+#: plugins/planner/kcmplanner.cpp:251 plugins/planner/plannerplugin.cpp:62
 #: plugins/specialdates/kcmsdsummary.cpp:181
 #: plugins/specialdates/specialdates_plugin.cpp:62
 msgid "Allen Winter"
@@ -1259,125 +1259,125 @@
 msgid "Git Migration"
 msgstr ""
 
-#: src/mainwindow.cpp:356
+#: src/mainwindow.cpp:359
 msgctxt "@item:intext"
 msgid "Loading Kontact..."
 msgstr ""
 
-#: src/mainwindow.cpp:355
+#: src/mainwindow.cpp:358
 #, kde-format
 msgctxt "@item"
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 msgstr ""
 
-#: src/mainwindow.cpp:367
+#: src/mainwindow.cpp:370
 msgctxt "@info:status"
 msgid " Initializing..."
 msgstr ""
 
-#: src/mainwindow.cpp:392
+#: src/mainwindow.cpp:398
 msgctxt "@item:intext"
 msgid "KDE Kontact"
 msgstr ""
 
-#: src/mainwindow.cpp:393
+#: src/mainwindow.cpp:399
 msgctxt "@item:intext"
 msgid "Get Organized!"
 msgstr ""
 
-#: src/mainwindow.cpp:394
+#: src/mainwindow.cpp:400
 msgctxt "@item:intext"
 msgid "The KDE Personal Information Management Suite"
 msgstr ""
 
-#: src/mainwindow.cpp:421
+#: src/mainwindow.cpp:427
 msgctxt "@title:menu create new pim items (message,calendar,to-do,etc.)"
 msgid "New"
 msgstr ""
 
-#: src/mainwindow.cpp:443
+#: src/mainwindow.cpp:449
 msgctxt "@title:menu synchronize pim items (message,calendar,to-do,etc.)"
 msgid "Sync"
 msgstr ""
 
-#: src/mainwindow.cpp:451
+#: src/mainwindow.cpp:457
 msgctxt "@action:inmenu"
 msgid "Configure Kontact..."
 msgstr ""
 
-#: src/mainwindow.cpp:453
+#: src/mainwindow.cpp:459
 msgctxt "@info:status"
 msgid "Configure Kontact"
 msgstr ""
 
-#: src/mainwindow.cpp:456
+#: src/mainwindow.cpp:462
 msgctxt "@info:whatsthis"
 msgid "You will be presented with a dialog where you can configure Kontact."
 msgstr ""
 
-#: src/mainwindow.cpp:462
+#: src/mainwindow.cpp:468
 msgctxt "@action:inmenu"
 msgid "&Kontact Introduction"
 msgstr ""
 
-#: src/mainwindow.cpp:464
+#: src/mainwindow.cpp:470
 msgctxt "@info:status"
 msgid "Show the Kontact Introduction page"
 msgstr ""
 
-#: src/mainwindow.cpp:467
+#: src/mainwindow.cpp:473
 msgctxt "@info:whatsthis"
 msgid "Choose this option to see the Kontact Introduction page."
 msgstr ""
 
-#: src/mainwindow.cpp:473
+#: src/mainwindow.cpp:479
 msgctxt "@action:inmenu"
 msgid "&Tip of the Day"
 msgstr ""
 
-#: src/mainwindow.cpp:475
+#: src/mainwindow.cpp:481
 msgctxt "@info:status"
 msgid "Show the Tip-of-the-Day dialog"
 msgstr ""
 
-#: src/mainwindow.cpp:478
+#: src/mainwindow.cpp:484
 msgctxt "@info:whatsthis"
 msgid ""
 "You will be presented with a dialog showing small tips to help you use this "
 "program more effectively."
 msgstr ""
 
-#: src/mainwindow.cpp:675
+#: src/mainwindow.cpp:681
 #, kde-format
 msgctxt "@info:status"
 msgid "Plugin %1"
 msgstr ""
 
-#: src/mainwindow.cpp:678
+#: src/mainwindow.cpp:684
 #, kde-format
 msgctxt "@info:whatsthis"
 msgid "Switch to plugin %1"
 msgstr ""
 
-#: src/mainwindow.cpp:778
+#: src/mainwindow.cpp:784
 msgctxt "@info:status"
 msgid "Application is running standalone. Foregrounding..."
 msgstr ""
 
-#: src/mainwindow.cpp:797
+#: src/mainwindow.cpp:803
 #, kde-format
 msgctxt "@info"
 msgid "Cannot load part for %1."
 msgstr ""
 
-#: src/mainwindow.cpp:866
+#: src/mainwindow.cpp:872
 #, kde-format
 msgctxt "@title:window Plugin dependent window title"
 msgid "%1 - Kontact"
 msgstr ""
 
-#: src/mainwindow.cpp:1202
+#: src/mainwindow.cpp:1211
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -1395,38 +1395,38 @@
 "bottom: 0px\"> <a href=\"%24\">Skip this introduction</a></p>"
 msgstr ""
 
-#: src/mainwindow.cpp:1215
+#: src/mainwindow.cpp:1224
 msgctxt "@item:intext"
 msgid ""
 "Kontact handles your e-mail, address book, calendar, to-do list and more."
 msgstr ""
 
-#: src/mainwindow.cpp:1221
+#: src/mainwindow.cpp:1230
 msgctxt "@item:intext"
 msgid "Read Manual"
 msgstr ""
 
-#: src/mainwindow.cpp:1222
+#: src/mainwindow.cpp:1231
 msgctxt "@item:intext"
 msgid "Learn more about Kontact and its components"
 msgstr ""
 
-#: src/mainwindow.cpp:1228
+#: src/mainwindow.cpp:1237
 msgctxt "@item:intext"
 msgid "Visit Kontact Website"
 msgstr ""
 
-#: src/mainwindow.cpp:1229
+#: src/mainwindow.cpp:1238
 msgctxt "@item:intext"
 msgid "Access online resources and tutorials"
 msgstr ""
 
-#: src/mainwindow.cpp:1235
+#: src/mainwindow.cpp:1244
 msgctxt "@item:intext"
 msgid "Configure Kontact as Groupware Client"
 msgstr ""
 
-#: src/mainwindow.cpp:1236
+#: src/mainwindow.cpp:1245
 msgctxt "@item:intext"
 msgid "Prepare Kontact for use in corporate networks"
 msgstr ""
@@ -1540,7 +1540,7 @@
 #: plugins/kmail/kcmkmailsummary.cpp:73
 #: plugins/korganizer/kcmapptsummary.cpp:168
 #: plugins/korganizer/kcmtodosummary.cpp:163
-#: plugins/planner/kcmplanner.cpp:245 plugins/planner/plannerplugin.cpp:64
+#: plugins/planner/kcmplanner.cpp:250 plugins/planner/plannerplugin.cpp:64
 #: plugins/specialdates/kcmsdsummary.cpp:182
 #: plugins/specialdates/specialdates_plugin.cpp:64
 #: plugins/summary/kcmkontactsummary.cpp:119
@@ -1597,26 +1597,26 @@
 msgid "Choose this option to synchronize your groupware email."
 msgstr ""
 
-#: plugins/kmail/summarywidget.cpp:62
+#: plugins/kmail/summarywidget.cpp:61
 msgid "New Messages"
 msgstr "Negeseuon Newydd"
 
-#: plugins/kmail/summarywidget.cpp:170
+#: plugins/kmail/summarywidget.cpp:169
 #, kde-format
 msgid "<qt><b>%1</b><br/>Total: %2<br/>Unread: %3</qt>"
 msgstr ""
 
-#: plugins/kmail/summarywidget.cpp:183
+#: plugins/kmail/summarywidget.cpp:182
 #, kde-format
 msgctxt "%1: number of unread messages %2: total number of messages"
 msgid "%1 / %2"
 msgstr "%1 / %2"
 
-#: plugins/kmail/summarywidget.cpp:222
+#: plugins/kmail/summarywidget.cpp:220
 msgid "No unread messages in your monitored folders"
 msgstr ""
 
-#: plugins/kmail/summarywidget.cpp:239
+#: plugins/kmail/summarywidget.cpp:238
 #, kde-format
 msgid "Open Folder: \"%1\""
 msgstr ""
@@ -1810,15 +1810,15 @@
 msgstr ""
 
 #: plugins/knotes/knotes_plugin.cpp:157
-#: plugins/korganizer/korganizerplugin.cpp:207
-#: plugins/korganizer/todoplugin.cpp:211
+#: plugins/korganizer/korganizerplugin.cpp:208
+#: plugins/korganizer/todoplugin.cpp:212
 msgctxt "@item"
 msgid "Meeting"
 msgstr ""
 
 #: plugins/knotes/knotes_plugin.cpp:169
-#: plugins/korganizer/korganizerplugin.cpp:222
-#: plugins/korganizer/todoplugin.cpp:226
+#: plugins/korganizer/korganizerplugin.cpp:224
+#: plugins/korganizer/todoplugin.cpp:227
 #, kde-format
 msgctxt "@item"
 msgid "Note: %1"
@@ -1830,15 +1830,15 @@
 msgstr ""
 
 #: plugins/knotes/knotes_plugin.cpp:188
-#: plugins/korganizer/korganizerplugin.cpp:246
-#: plugins/korganizer/todoplugin.cpp:249
+#: plugins/korganizer/korganizerplugin.cpp:248
+#: plugins/korganizer/todoplugin.cpp:250
 msgctxt "@info"
 msgid "Dropping multiple mails is not supported."
 msgstr ""
 
 #: plugins/knotes/knotes_plugin.cpp:191
-#: plugins/korganizer/korganizerplugin.cpp:249
-#: plugins/korganizer/todoplugin.cpp:252
+#: plugins/korganizer/korganizerplugin.cpp:251
+#: plugins/korganizer/todoplugin.cpp:253
 #, kde-format
 msgctxt "@item"
 msgid ""
@@ -1848,8 +1848,8 @@
 msgstr ""
 
 #: plugins/knotes/knotes_plugin.cpp:194
-#: plugins/korganizer/korganizerplugin.cpp:258
-#: plugins/korganizer/todoplugin.cpp:261
+#: plugins/korganizer/korganizerplugin.cpp:260
+#: plugins/korganizer/todoplugin.cpp:262
 #, kde-format
 msgctxt "@item"
 msgid "Mail: %1"
@@ -1868,28 +1868,28 @@
 msgid "Read Popup Note: \"%1\""
 msgstr ""
 
-#: plugins/korganizer/apptsummarywidget.cpp:68
+#: plugins/korganizer/apptsummarywidget.cpp:69
 msgid "Upcoming Events"
 msgstr ""
 
-#: plugins/korganizer/apptsummarywidget.cpp:228
+#: plugins/korganizer/apptsummarywidget.cpp:230
 #, kde-format
 msgid "No upcoming events starting within the next day"
 msgid_plural "No upcoming events starting within the next %1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/korganizer/apptsummarywidget.cpp:264
+#: plugins/korganizer/apptsummarywidget.cpp:266
 #: plugins/planner/planner.cpp:802
 msgid "&Edit Appointment..."
 msgstr ""
 
-#: plugins/korganizer/apptsummarywidget.cpp:266
+#: plugins/korganizer/apptsummarywidget.cpp:268
 #: plugins/planner/planner.cpp:803
 msgid "&Delete Appointment"
 msgstr ""
 
-#: plugins/korganizer/apptsummarywidget.cpp:287
+#: plugins/korganizer/apptsummarywidget.cpp:289
 #, kde-format
 msgid "Edit Event: \"%1\""
 msgstr ""
@@ -1956,62 +1956,62 @@
 msgid "Pending To-dos Configuration Dialog"
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:64
+#: plugins/korganizer/korganizerplugin.cpp:65
 msgctxt "@action:inmenu"
 msgid "New Event..."
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:68
+#: plugins/korganizer/korganizerplugin.cpp:69
 msgctxt "@info:status"
 msgid "Create a new event"
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:71
+#: plugins/korganizer/korganizerplugin.cpp:72
 msgctxt "@info:whatsthis"
 msgid ""
 "You will be presented with a dialog where you can create a new event item."
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:77
+#: plugins/korganizer/korganizerplugin.cpp:78
 msgctxt "@action:inmenu"
 msgid "Sync Calendar"
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:80
+#: plugins/korganizer/korganizerplugin.cpp:81
 msgctxt "@info:status"
 msgid "Synchronize groupware calendar"
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:83
+#: plugins/korganizer/korganizerplugin.cpp:84
 msgctxt "@info:whatsthis"
 msgid "Choose this option to synchronize your groupware events."
 msgstr ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:192
+#: plugins/korganizer/summaryeventinfo.cpp:190
 msgctxt "the appointment is today"
 msgid "Today"
 msgstr ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:196
+#: plugins/korganizer/summaryeventinfo.cpp:194
 msgctxt "the appointment is tomorrow"
 msgid "Tomorrow"
 msgstr ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:218
-#: plugins/korganizer/todosummarywidget.cpp:237
-#: plugins/specialdates/sdsummarywidget.cpp:522
+#: plugins/korganizer/summaryeventinfo.cpp:216
+#: plugins/korganizer/todosummarywidget.cpp:238
+#: plugins/specialdates/sdsummarywidget.cpp:524
 #, kde-format
 msgid "in 1 day"
 msgid_plural "in %1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:231
+#: plugins/korganizer/summaryeventinfo.cpp:229
 msgctxt "eg. in 1 hour 2 minutes"
 msgid "in "
 msgstr ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:235
+#: plugins/korganizer/summaryeventinfo.cpp:233
 #, kde-format
 msgctxt "use abbreviation for hour to keep the text short"
 msgid "1 hr"
@@ -2019,7 +2019,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:242
+#: plugins/korganizer/summaryeventinfo.cpp:240
 #, kde-format
 msgctxt "use abbreviation for minute to keep the text short"
 msgid "1 min"
@@ -2027,54 +2027,54 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:245
-#: plugins/specialdates/sdsummarywidget.cpp:520
+#: plugins/korganizer/summaryeventinfo.cpp:243
+#: plugins/specialdates/sdsummarywidget.cpp:522
 msgid "now"
 msgstr "rwan"
 
-#: plugins/korganizer/summaryeventinfo.cpp:248
+#: plugins/korganizer/summaryeventinfo.cpp:246
 msgid "all day"
 msgstr ""
 
-#: plugins/korganizer/summaryeventinfo.cpp:279 plugins/planner/planner.cpp:528
+#: plugins/korganizer/summaryeventinfo.cpp:278 plugins/planner/planner.cpp:528
 #, kde-format
 msgctxt "Time from - to"
 msgid "%1 - %2"
 msgstr "%1 - %2"
 
-#: plugins/korganizer/summaryeventinfo.cpp:297
+#: plugins/korganizer/summaryeventinfo.cpp:296
 #, kde-format
 msgctxt "next occurrence"
 msgid "Next: %1"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:62
+#: plugins/korganizer/todoplugin.cpp:63
 msgctxt "@action:inmenu"
 msgid "New To-do..."
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:66
+#: plugins/korganizer/todoplugin.cpp:67
 msgctxt "@info:status"
 msgid "Create a new to-do"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:69
+#: plugins/korganizer/todoplugin.cpp:70
 msgctxt "@info:whatsthis"
 msgid ""
 "You will be presented with a dialog where you can create a new to-do item."
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:75
+#: plugins/korganizer/todoplugin.cpp:76
 msgctxt "@action:inmenu"
 msgid "Sync To-do List"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:77
+#: plugins/korganizer/todoplugin.cpp:78
 msgctxt "@info:status"
 msgid "Synchronize groupware to-do list"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:80
+#: plugins/korganizer/todoplugin.cpp:81
 msgctxt "@info:whatsthis"
 msgid "Choose this option to synchronize your groupware to-do list."
 msgstr ""
@@ -2083,86 +2083,86 @@
 msgid "Pending To-dos"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:215
+#: plugins/korganizer/todosummarywidget.cpp:216
 msgctxt "the to-do is due today"
 msgid "Today"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:217
+#: plugins/korganizer/todosummarywidget.cpp:218
 msgctxt "the to-do is due tomorrow"
 msgid "Tomorrow"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:239
+#: plugins/korganizer/todosummarywidget.cpp:240
 #, kde-format
 msgid "1 day ago"
 msgid_plural "%1 days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/korganizer/todosummarywidget.cpp:241
+#: plugins/korganizer/todosummarywidget.cpp:242
 msgctxt "the to-do is due"
 msgid "due"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:303
+#: plugins/korganizer/todosummarywidget.cpp:305
 #, kde-format
 msgid "No pending to-dos due within the next day"
 msgid_plural "No pending to-dos due within the next %1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/korganizer/todosummarywidget.cpp:354
+#: plugins/korganizer/todosummarywidget.cpp:356
 #: plugins/planner/planner.cpp:864
 msgid "&Edit To-do..."
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:355
+#: plugins/korganizer/todosummarywidget.cpp:357
 #: plugins/planner/planner.cpp:865
 msgid "&Delete To-do"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:366
+#: plugins/korganizer/todosummarywidget.cpp:368
 #: plugins/planner/planner.cpp:870
 msgid "&Mark To-do Completed"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:387
+#: plugins/korganizer/todosummarywidget.cpp:389
 #: plugins/planner/planner.cpp:962
 #, kde-format
 msgid "Edit To-do: \"%1\""
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:412
+#: plugins/korganizer/todosummarywidget.cpp:414
 msgid "open-ended"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:415
+#: plugins/korganizer/todosummarywidget.cpp:417
 msgctxt "the to-do is overdue"
 msgid "overdue"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:418
+#: plugins/korganizer/todosummarywidget.cpp:420
 msgctxt "the to-do starts today"
 msgid "starts today"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:422
+#: plugins/korganizer/todosummarywidget.cpp:424
 msgctxt "the to-do has not been started yet"
 msgid "not-started"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:424
+#: plugins/korganizer/todosummarywidget.cpp:426
 msgctxt "the to-do is completed"
 msgid "completed"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:426
+#: plugins/korganizer/todosummarywidget.cpp:428
 msgctxt "the to-do is in-progress"
 msgid "in-progress "
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:431
+#: plugins/korganizer/todosummarywidget.cpp:433
 msgctxt "Separator for status like this: overdue, completed"
 msgid ","
 msgstr ""
@@ -2184,7 +2184,7 @@
 "time tracker."
 msgstr ""
 
-#: plugins/ktimetracker/ktimetracker_plugin.cpp:99
+#: plugins/ktimetracker/ktimetracker_plugin.cpp:98
 msgid "task_popup"
 msgstr ""
 
@@ -2192,18 +2192,18 @@
 msgid "kcmplanner"
 msgstr ""
 
-#: plugins/planner/kcmplanner.cpp:240
+#: plugins/planner/kcmplanner.cpp:242
 msgid "Planner Summary Configuration Dialog"
 msgstr ""
 
-#: plugins/planner/kcmplanner.cpp:241
+#: plugins/planner/kcmplanner.cpp:246
 msgid ""
 "Copyright © 2004 Tobias Koenig\n"
 "Copyright © 2006–2008 Oral Timocin\n"
 "Copyright © 2009–2010 Allen Winter"
 msgstr ""
 
-#: plugins/planner/kcmplanner.cpp:247 plugins/planner/plannerplugin.cpp:66
+#: plugins/planner/kcmplanner.cpp:252 plugins/planner/plannerplugin.cpp:66
 msgid "Oral Timocin"
 msgstr ""
 
@@ -2235,27 +2235,27 @@
 msgstr ""
 
 #: plugins/planner/planner.cpp:721
-#: plugins/specialdates/sdsummarywidget.cpp:533
+#: plugins/specialdates/sdsummarywidget.cpp:535
 msgid "Birthday"
 msgstr "Penblwydd"
 
 #: plugins/planner/planner.cpp:724
-#: plugins/specialdates/sdsummarywidget.cpp:536
+#: plugins/specialdates/sdsummarywidget.cpp:538
 msgid "Anniversary"
 msgstr "Dathliad"
 
 #: plugins/planner/planner.cpp:727
-#: plugins/specialdates/sdsummarywidget.cpp:539
+#: plugins/specialdates/sdsummarywidget.cpp:541
 msgid "Holiday"
 msgstr "Gŵyl"
 
 #: plugins/planner/planner.cpp:730
-#: plugins/specialdates/sdsummarywidget.cpp:542
+#: plugins/specialdates/sdsummarywidget.cpp:544
 msgid "Special Occasion"
 msgstr "Achlysur Arbennig"
 
 #: plugins/planner/planner.cpp:771
-#: plugins/specialdates/sdsummarywidget.cpp:584
+#: plugins/specialdates/sdsummarywidget.cpp:586
 #, kde-format
 msgid "one year"
 msgid_plural "%1 years"
@@ -2343,36 +2343,36 @@
 "Copyright © 2004–2010 Allen Winter"
 msgstr ""
 
-#: plugins/specialdates/sdsummarywidget.cpp:146
+#: plugins/specialdates/sdsummarywidget.cpp:147
 msgid "Upcoming Special Dates"
 msgstr ""
 
-#: plugins/specialdates/sdsummarywidget.cpp:493
+#: plugins/specialdates/sdsummarywidget.cpp:495
 msgctxt "the special day is today"
 msgid "Today"
 msgstr ""
 
-#: plugins/specialdates/sdsummarywidget.cpp:495
+#: plugins/specialdates/sdsummarywidget.cpp:497
 msgctxt "the special day is tomorrow"
 msgid "Tomorrow"
 msgstr ""
 
-#: plugins/specialdates/sdsummarywidget.cpp:595
+#: plugins/specialdates/sdsummarywidget.cpp:597
 #, kde-format
 msgid "No special dates within the next 1 day"
 msgid_plural "No special dates pending within the next %1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugins/specialdates/sdsummarywidget.cpp:687
+#: plugins/specialdates/sdsummarywidget.cpp:688
 msgid "Send &Mail"
 msgstr "Anfon &Ebost"
 
-#: plugins/specialdates/sdsummarywidget.cpp:690
+#: plugins/specialdates/sdsummarywidget.cpp:691
 msgid "View &Contact"
 msgstr "Gweld &Cyswllt"
 
-#: plugins/specialdates/sdsummarywidget.cpp:705
+#: plugins/specialdates/sdsummarywidget.cpp:706
 #, kde-format
 msgid "Mail to:\"%1\""
 msgstr ""
@@ -2460,12 +2460,12 @@
 msgid "Sven Lueppken"
 msgstr ""
 
-#: plugins/knotes/knotes_part_p.h:123
+#: plugins/knotes/knotes_part_p.h:121
 msgctxt "@title:window"
 msgid "Edit Popup Note"
 msgstr ""
 
-#: plugins/knotes/knotes_part_p.h:142
+#: plugins/knotes/knotes_part_p.h:140
 msgctxt "@label popup note name"
 msgid "Name:"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kopete.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kopete.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kopete.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kopete.po	2012-04-18 08:59:25.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: kopete\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:57+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -13,2455 +13,2506 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:27+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: plugins/privacy/privacyplugin.cpp:52
-#: plugins/privacy/privacyguiclient.cpp:47
-msgid "Add to WhiteList"
+#: protocols/skype/skypeconference.cpp:44
+msgid "Conference Call"
 msgstr ""
 
-#: plugins/privacy/privacyplugin.cpp:55
-#: plugins/privacy/privacyguiclient.cpp:50
-msgid "Add to BlackList"
+#: protocols/skype/skypechatsession.cpp:114
+#: protocols/skype/skypechatsession.cpp:155
+#: protocols/skype/skypeprotocol.cpp:109
+msgid "Call"
 msgstr ""
 
-#: plugins/privacy/privacyplugin.cpp:160
-#, kde-format
-msgid ""
-"A message from %1 was dropped, because this contact is not on your whitelist."
-msgstr ""
+#: protocols/skype/skypechatsession.cpp:125
+#: protocols/skype/skypechatsession.cpp:163
+#: protocols/groupwise/gwmessagemanager.cpp:77
+#: protocols/wlm/wlmchatsession.cpp:119 protocols/qq/qqchatsession.cpp:67
+msgid "&Invite"
+msgstr "G&wahodd"
 
-#: plugins/privacy/privacyplugin.cpp:170
-#, kde-format
-msgid ""
-"A message from %1 was dropped, because this contact is on your blacklist."
+#: protocols/skype/skypeeditaccount.cpp:124
+msgid "You can have only one skype account"
 msgstr ""
 
-#: plugins/privacy/privacyplugin.cpp:180
-#, kde-format
-msgid ""
-"A message from %1 was dropped, because this contact is not on your contact "
-"list."
+#: protocols/skype/skypeeditaccount.cpp:124
+#: protocols/skype/skypeaddcontact.cpp:74
+#: protocols/skype/skypeaddcontact.cpp:79
+#: protocols/skype/skypeaddcontact.cpp:84
+#: protocols/skype/skypeaddcontact.cpp:89
+msgid "Wrong Information"
 msgstr ""
 
-#: plugins/privacy/privacyplugin.cpp:197
-#, kde-format
-msgid ""
-"A message from %1 was dropped, because it contained a blacklisted word."
+#: protocols/skype/skypeeditaccount.cpp:208
+msgid "Configure Skype client"
 msgstr ""
 
-#: plugins/privacy/privacyplugin.cpp:221
-#, kde-format
-msgid ""
-"A message from %1 was dropped, because it contained blacklisted words."
+#: protocols/skype/skypeeditaccount.cpp:208
+msgid "Please enter your skype user name"
 msgstr ""
 
-#: plugins/privacy/privacypreferences.cpp:164
-msgid "Add Contact to Whitelist"
+#: protocols/skype/skypeeditaccount.cpp:211
+msgid "You must enter your skype user name"
 msgstr ""
 
-#: plugins/privacy/privacypreferences.cpp:190
-msgid "Add Contact to Blacklist"
+#: protocols/skype/skypeeditaccount.cpp:211
+#: protocols/skype/skypeeditaccount.cpp:226
+#: protocols/skype/skypeeditaccount.cpp:243
+#: protocols/skype/skypeeditaccount.cpp:251
+#: protocols/skype/libskype/skype.cpp:291
+#: protocols/skype/skypeaccount.cpp:1094 protocols/skype/skypeaccount.cpp:1108
+#: protocols/skype/skypeaccount.cpp:1130 protocols/skype/skypeaccount.cpp:1135
+#: protocols/skype/skypeaccount.cpp:1143 protocols/skype/skypeaccount.cpp:1155
+#: protocols/skype/skypeaccount.cpp:1160
+msgid "Skype protocol"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:222
+#: protocols/skype/skypeeditaccount.cpp:226
+#: protocols/skype/skypeeditaccount.cpp:243
 #, kde-format
+msgid "Cannot create/open file %1 for configuring the Skype client."
+msgstr ""
+
+#: protocols/skype/skypeeditaccount.cpp:251
 msgid ""
-"<b>Received a new fingerprint from <a>%1</a>. You should authenticate this "
-"contact.</b>"
+"Process has completed.\n"
+"Skype is now configured for Kopete.\n"
+"You must restart the Skype client for changes to take effect."
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:242
-msgid "<b>Private OTR session started.</b>"
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:92
+msgid "Could not ping Skype"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:248
-msgid "<b>Unverified OTR session started.</b>"
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:112
+msgid "Skype did not accept this application"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:263
-msgid "<b>OTR Session ended. Note that the conversation is now insecure.</b>"
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:123
+msgid "Skype API syntax error"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:275
-msgid "<b>OTR connection refreshed successfully.</b>"
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:132
+msgid "Skype API not ready yet, wait a bit longer"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:393
-#, kde-format
-msgid "<b>%1</b> has ended the OTR session. You should do the same."
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:178
+msgid "Cannot register Skype communication for Kopete on D-Bus"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:453
-#, kde-format
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:209
 msgid ""
-"Authentication with <b>%1</b> successful. The conversation is now secure."
+"Could not launch Skype.\n"
+"You need to install the original dynamic linked Skype version 2.0 binary "
+"from http://www.skype.com"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:461
-#: plugins/otr/authenticationwizard.cpp:318
-#, kde-format
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:216
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:324
 msgid ""
-"<b>%1</b> has successfully authenticated you. You may want to authenticate "
-"this contact as well by asking your own question."
+"Could not find Skype.\n"
+"You need to install the original dynamic linked Skype version 2.0 binary "
+"from http://www.skype.com"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:470
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:263
 #, kde-format
 msgid ""
-"Authentication with <b>%1</b> failed. The conversation is now insecure."
+"Could not ping Skype.\n"
+"Maybe Skype not running.\n"
+"Error while sending a message to Skype (%1)."
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:490
-msgid "<b>Authentication successful. The conversation is now secure.</b>"
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:265
+#, kde-format
+msgid "Error while sending a message to Skype (%1)."
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:498
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:273
 msgid ""
-"<b>Authentication failed. Note that the conversation is now insecure.</b>"
-msgstr ""
-
-#: plugins/otr/otrlchatinterface.cpp:510
-msgid "<b>Authentication error.</b>"
+"Could not ping Skype.\n"
+"You are logged out from Skype, please log in."
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:565
-msgid "Encryption error"
+#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:326
+msgid "Please login to Skype first"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:595
-msgid "Terminating OTR session."
+#: protocols/skype/libskype/skype.cpp:257
+msgid "This version of Skype is too old, consider upgrading"
 msgstr ""
 
-#: plugins/otr/otrlchatinterface.cpp:749
-msgid ""
-"<b>Authentication aborted. Note that the conversation is now insecure.</b>"
-msgstr ""
+#: protocols/skype/libskype/skype.cpp:406
+#: protocols/groupwise/gwprotocol.cpp:66
+#: protocols/jabber/jingle/jinglecontentdialog.cpp:38
+#: protocols/oscar/icq/icqstatusmanager.cpp:37
+#: protocols/oscar/icq/icqprotocol.cpp:450
+#: protocols/oscar/icq/icqprotocol.cpp:532
+#: protocols/oscar/aim/aimstatusmanager.cpp:33
+#: plugins/translator/translatorlanguages.cpp:33
+#: plugins/translator/translatorlanguages.cpp:96
+#: libkopete/kopeteonlinestatus.cpp:174
+msgid "Unknown"
+msgstr "Anhysbys"
 
-#: plugins/otr/otrlchatinterface.cpp:760 plugins/otr/otrlchatinterface.cpp:772
-#: plugins/otr/otrlchatinterface.cpp:785
-msgid "<b>Authenticating contact...</b>"
+#: protocols/skype/libskype/skype.cpp:408
+#: protocols/groupwise/libgroupwise/gwerror.cpp:41
+msgid "User not found"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:52
-#, kde-format
-msgid "Waiting for %1..."
+#: protocols/skype/libskype/skype.cpp:410
+msgid "Does not have multi-user chat capability"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:53
-msgid "Checking if answers match..."
+#: protocols/skype/libskype/skype.cpp:412
+msgid "Chat denied"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:75
-#, kde-format
-msgid "Incoming authentication request from %1"
+#: protocols/skype/libskype/skype.cpp:489
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:112
+msgid "Unknown error"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:78 kopete/infoeventwidget.cpp:230
-msgid "View"
+#: protocols/skype/libskype/skype.cpp:492
+msgid "Misc error"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:78
-msgid "Close"
+#: protocols/skype/libskype/skype.cpp:495
+msgid "User or phone number does not exist"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:102
-msgctxt "@title"
-msgid "Select authentication method"
+#: protocols/skype/libskype/skype.cpp:498
+msgid "User is offline"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:104
-msgid "Question and Answer"
+#: protocols/skype/libskype/skype.cpp:501
+msgid "No proxy found"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:105
-msgid "Shared Secret"
+#: protocols/skype/libskype/skype.cpp:504
+msgid "Session terminated"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:106
-msgid "Manual fingerprint verification"
+#: protocols/skype/libskype/skype.cpp:507
+msgid "No common codec found"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:135
-msgctxt "@title"
-msgid "Question and Answer"
+#: protocols/skype/libskype/skype.cpp:510
+msgid "Sound I/O error"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:137
-#, kde-format
-msgctxt "@info"
-msgid "Enter a question that only %1 is able to answer:"
+#: protocols/skype/libskype/skype.cpp:513
+msgid "Problem with remote sound device"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:141
-msgctxt "@info"
-msgid "Enter the answer to your question:"
+#: protocols/skype/libskype/skype.cpp:516
+msgid "Call blocked by recipient"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:145
-#, kde-format
-msgctxt "@info"
-msgid "Authentication with %1"
+#: protocols/skype/libskype/skype.cpp:519
+msgid "Recipient not a friend"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:146
-#, kde-format
-msgctxt "@info"
-msgid ""
-"%1 would like to verify your authentication. Please answer the following "
-"question in the field below:"
+#: protocols/skype/libskype/skype.cpp:522
+msgid "User not authorized by recipient"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:167
-msgctxt "@title"
-msgid "Shared Secret"
+#: protocols/skype/libskype/skype.cpp:525
+msgid "Sound recording error"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:169
-#, kde-format
-msgctxt "@info"
-msgid "Enter a secret passphrase known only to you and %1:"
+#: protocols/skype/libskype/skype.cpp:822
+msgid "This version of Skype does not support adding users to chat."
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:171
-#, kde-format
-msgctxt "@title"
-msgid "Authentication with %1"
+#: protocols/skype/libskype/skype.cpp:822
+msgid "Skype Protocol"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:172
+#: protocols/skype/skypeaccount.cpp:922
 #, kde-format
-msgctxt "@info"
-msgid "Enter the secret passphrase known only to you and %1:"
+msgid "Skype (%1)"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:184
-msgctxt "@title"
-msgid "Manual Verification"
-msgstr ""
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:127
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#: protocols/skype/skypeaccount.cpp:926 protocols/skype/skypeprotocol.cpp:81
+#: protocols/groupwise/gwprotocol.cpp:54 protocols/sms/smsprotocol.cpp:38
+#: protocols/jabber/jabberprotocol.cpp:66
+#: protocols/jabber/jabbercontact.cpp:191
+#: protocols/bonjour/bonjourprotocol.cpp:37
+#: protocols/winpopup/wpprotocol.cpp:55 protocols/winpopup/wpaccount.cpp:172
+#: protocols/wlm/wlmprotocol.cpp:43
+#: protocols/oscar/icq/icqstatusmanager.cpp:87
+#: protocols/oscar/aim/aimstatusmanager.cpp:79 protocols/qq/qqprotocol.cpp:36
+#: protocols/gadu/gaduprotocol.cpp:82 protocols/gadu/gaduprotocol.cpp:86
+#: protocols/meanwhile/meanwhileprotocol.cpp:40
+#: protocols/yahoo/yahooprotocol.cpp:44
+#: plugins/statistics/statisticscontact.cpp:264
+#: plugins/statistics/statisticsdialog.cpp:380
+#: plugins/statistics/statisticsdialog.cpp:675
+#: libkopete/kopeteonlinestatus.cpp:158 libkopete/kopetemetacontact.cpp:496
+#: libkopete/kopetestatusmanager.cpp:277 rc.cpp:6154
+#: kopete/config/status/statusconfig_manager.cpp:54 rc.cpp:6154
+msgid "Online"
+msgstr "Ar-lein"
 
-#: plugins/otr/authenticationwizard.cpp:188
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Contact %1 via another secure channel and verify that the following "
-"fingerprint is correct:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:122
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#: protocols/skype/skypeaccount.cpp:930 protocols/skype/skypeprotocol.cpp:80
+#: protocols/groupwise/gwprotocol.cpp:52 protocols/sms/smsprotocol.cpp:39
+#: protocols/jabber/jabberprotocol.cpp:70
+#: protocols/bonjour/bonjourprotocol.cpp:42
+#: protocols/winpopup/wpprotocol.cpp:57 protocols/wlm/wlmprotocol.cpp:62
+#: protocols/oscar/icq/icqstatusmanager.cpp:75
+#: protocols/oscar/aim/aimstatusmanager.cpp:67 protocols/qq/qqprotocol.cpp:40
+#: protocols/gadu/gaduprotocol.cpp:57 protocols/gadu/gaduprotocol.cpp:63
+#: protocols/meanwhile/meanwhileprotocol.cpp:35
+#: protocols/yahoo/yahooprotocol.cpp:43
+#: plugins/statistics/statisticscontact.cpp:266
+#: plugins/statistics/statisticsdialog.cpp:386
+#: plugins/statistics/statisticsdialog.cpp:681
+#: libkopete/kopeteonlinestatus.cpp:170 libkopete/kopetemetacontact.cpp:502
+#: libkopete/kopeteidentity.cpp:167 libkopete/kopetestatusmanager.cpp:299
+#: rc.cpp:6151 kopete/kopetewindow.cpp:387
+#: kopete/config/status/statusconfig_manager.cpp:68 rc.cpp:6151
+msgid "Offline"
+msgstr "All-lein"
+
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:169
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:132
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:169
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:132
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#: protocols/skype/skypeaccount.cpp:934 protocols/skype/skypeprotocol.cpp:83
+#: protocols/groupwise/gwprotocol.cpp:58
+#: protocols/jabber/jabberprotocol.cpp:67
+#: protocols/jabber/jabbercontact.cpp:193 protocols/winpopup/wpprotocol.cpp:56
+#: protocols/winpopup/wpaccount.cpp:178 protocols/wlm/wlmprotocol.cpp:46
+#: protocols/oscar/icq/icqstatusmanager.cpp:83
+#: protocols/oscar/aim/aimstatusmanager.cpp:75 protocols/qq/qqprotocol.cpp:38
+#: protocols/meanwhile/meanwhileprotocol.cpp:44
+#: plugins/statistics/statisticscontact.cpp:265
+#: plugins/statistics/statisticsdialog.cpp:382
+#: plugins/statistics/statisticsdialog.cpp:677
+#: plugins/statistics/statisticsdialog.cpp:679
+#: libkopete/kopeteonlinestatus.cpp:161 libkopete/kopetemetacontact.cpp:498
+#: libkopete/kopetestatusmanager.cpp:282 rc.cpp:5203 rc.cpp:6157
+#: kopete/config/status/statusconfig_manager.cpp:58 rc.cpp:5203 rc.cpp:6157
+msgid "Away"
+msgstr "I ffwrdd"
+
+#: protocols/skype/skypeaccount.cpp:938 protocols/skype/skypeprotocol.cpp:84
+#: protocols/oscar/icq/icqstatusmanager.cpp:81
+#: protocols/oscar/aim/aimstatusmanager.cpp:73
+msgid "Not Available"
+msgstr "Dim ar gael"
+
+#: protocols/skype/skypeaccount.cpp:942 protocols/skype/skypeprotocol.cpp:85
+#: protocols/jabber/jabbercontact.cpp:195
+#: protocols/oscar/icq/icqstatusmanager.cpp:77
+#: protocols/oscar/aim/aimstatusmanager.cpp:69
+msgid "Do Not Disturb"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:194
-msgctxt "@item:inlistbox ...verified that"
-msgid "I have not"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:812
+#. i18n: ectx: attribute (title), widget (QWidget, tabInvisible)
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:142
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:812
+#. i18n: ectx: attribute (title), widget (QWidget, tabInvisible)
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:142
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#: protocols/skype/skypeaccount.cpp:946 protocols/skype/skypeprotocol.cpp:86
+#: protocols/jabber/jabberprotocol.cpp:71
+#: protocols/jabber/jabbercontact.cpp:196 protocols/wlm/wlmprotocol.cpp:59
+#: protocols/oscar/icq/icqstatusmanager.cpp:92
+#: protocols/oscar/aim/aimstatusmanager.cpp:85
+#: protocols/gadu/gaduprotocol.cpp:74 protocols/gadu/gaduprotocol.cpp:79
+#: protocols/yahoo/yahooprotocol.cpp:55 libkopete/kopeteonlinestatus.cpp:167
+#: libkopete/kopetestatusmanager.cpp:294 rc.cpp:2688 rc.cpp:6163
+#: kopete/config/status/statusconfig_manager.cpp:66 rc.cpp:2688 rc.cpp:6163
+msgid "Invisible"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:195
-msgctxt "@item:inlistbox ...verified that"
-msgid "I have"
+#: protocols/skype/skypeaccount.cpp:950 protocols/skype/skypeprotocol.cpp:82
+msgid "Skype Me"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:204
-#, kde-format
-msgctxt "@info:label I have..."
-msgid "verified that this is in fact the correct fingerprint for %1"
+#: protocols/skype/skypeaccount.cpp:956
+msgid "Make Test Call"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:308
-msgid "Authentication successful"
+#: protocols/skype/skypeaccount.cpp:968 protocols/winpopup/wpaccount.cpp:187
+#: protocols/gadu/gaduaccount.cpp:387 libkopete/kopeteaccount.cpp:479
+msgid "Properties"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:312
-#: plugins/otr/authenticationwizard.cpp:316
-#: plugins/otr/authenticationwizard.cpp:322
+#: protocols/skype/skypeaccount.cpp:1094
 #, kde-format
-msgid ""
-"The authentication with %1 was completed successfully. The conversation is "
-"now secure."
+msgid "Cannot open info about user %1"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:325
-#: protocols/groupwise/libgroupwise/gwerror.cpp:107
-msgid "Authentication failed"
+#: protocols/skype/skypeaccount.cpp:1108 protocols/skype/skypeaccount.cpp:1130
+#: protocols/skype/skypeaccount.cpp:1135 protocols/skype/skypeaccount.cpp:1160
+msgid "Unknown action from SkypeActionHandler"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:326
-#, kde-format
-msgid ""
-"The authentication with %1 failed. To make sure you are not talking to an "
-"imposter, try again using the manual fingerprint verification method. Note "
-"that the conversation is now insecure."
+#: protocols/skype/skypeaccount.cpp:1143
+msgid "Add contact from SkypeActionHandler is not supported yet"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:344
-msgid "Authentication aborted"
+#: protocols/skype/skypeaccount.cpp:1155
+msgid "Send voicemail from SkypeActionHandler is not supported yet"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:345
+#: protocols/skype/skypecalldialog.cpp:106
 #, kde-format
-msgid ""
-"%1 has aborted the authentication process. To make sure you are not talking "
-"to an imposter, try again using the manual fingerprint verification method."
+msgid "Call with %1"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:352
-#, kde-format
-msgid ""
-"Ask %1 a question, the answer to which is known only to you and them. If the "
-"answer does not match, you may be talking to an imposter."
+#: protocols/skype/skypecalldialog.cpp:139
+msgid "Canceled"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:354
-#, kde-format
-msgid ""
-"Pick a secret known only to you and %1. If the secret does not match, you "
-"may be talking to an imposter. Do not send the secret through the chat "
-"window, or this authentication method could be compromised with ease."
+#: protocols/skype/skypecalldialog.cpp:146
+msgid "Other person is busy"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:356
-#, kde-format
-msgid ""
-"Verify %1's fingerprint manually. For example via a phone call or signed "
-"(and verified) email."
+#: protocols/skype/skypecalldialog.cpp:153
+msgid "Refused"
 msgstr ""
 
-#: plugins/otr/authenticationwizard.cpp:373
-msgctxt "@title"
-msgid "Authenticating contact..."
+#: protocols/skype/skypecalldialog.cpp:160
+msgid "Call Back"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:68
-msgctxt "@info"
-msgid "No fingerprint present."
+#: protocols/skype/skypecalldialog.cpp:161
+msgid "Missed"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:108
-msgctxt "@item:intable Fingerprint was never used"
-msgid "Unused"
-msgstr ""
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddAccountWizardPage2)
+#: protocols/skype/skypecalldialog.cpp:169 rc.cpp:6500 rc.cpp:6500
+msgid "Finished"
+msgstr "Wedi Gorffen"
 
-#: plugins/otr/otrlconfinterface.cpp:112
-msgctxt "@item:intable Fingerprint is used in a private conversation"
-msgid "Private"
+#: protocols/skype/skypecalldialog.cpp:174
+msgid "Resume"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:114
-msgctxt "@item:intable Fingerprint is used in an unverified conversation"
-msgid "Unverified"
+#: protocols/skype/skypecalldialog.cpp:177
+msgid "On hold (local)"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:117
-msgctxt "@item:intable Private conversation finished"
-msgid "Finished"
+#: protocols/skype/skypecalldialog.cpp:183
+msgid "On hold (remote)"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:119
-msgctxt "@item:intable Conversation is not private"
-msgid "Not Private"
+#: protocols/skype/skypecalldialog.cpp:189
+msgid "On hold"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:123
-msgctxt "@item:intable The fingerprint is trusted"
-msgid "Yes"
+#: protocols/skype/skypecalldialog.cpp:193
+msgid "Hold"
 msgstr ""
 
-#: plugins/otr/otrlconfinterface.cpp:125
-msgctxt "@item:intable The fingerprint is not trusted"
-msgid "No"
+#: protocols/skype/skypecalldialog.cpp:196
+msgid "In progress"
 msgstr ""
 
-#: plugins/otr/otrguiclient.cpp:63
-msgid "OTR Encryption"
+#: protocols/skype/skypecalldialog.cpp:202
+msgid "Ringing"
 msgstr ""
 
-#: plugins/otr/otrguiclient.cpp:68 plugins/otr/otrguiclient.cpp:118
-#: plugins/otr/otrguiclient.cpp:136
-msgid "Start OTR Session"
+#: protocols/skype/skypecalldialog.cpp:210
+msgid "Failed"
 msgstr ""
 
-#: plugins/otr/otrguiclient.cpp:72
-msgid "End OTR Session"
+#: protocols/skype/skypecalldialog.cpp:216
+#: protocols/skype/skypeprotocol.cpp:87 protocols/groupwise/gwprotocol.cpp:70
+#: protocols/sms/smsprotocol.cpp:40 protocols/jabber/jabberprotocol.cpp:72
+#: protocols/wlm/wlmprotocol.cpp:71 protocols/gadu/gaduprotocol.cpp:89
+#: protocols/yahoo/yahooprotocol.cpp:58 libkopete/kopeteonlinestatus.cpp:164
+msgid "Connecting"
+msgstr "Cysylltu"
+
+#: protocols/skype/skypecalldialog.cpp:222
+msgctxt ""
+"Early media means the media played before the call is established. For "
+"example it can be a calling tone or a waiting message such as all operators "
+"are busy."
+msgid "Early media (waiting for operator...)"
 msgstr ""
 
-#: plugins/otr/otrguiclient.cpp:76
-msgid "Authenticate Contact"
+#: protocols/skype/skypecalldialog.cpp:277
+#, kde-format
+msgid "Failed (%1)"
 msgstr ""
 
-#: plugins/otr/otrguiclient.cpp:124 plugins/otr/otrguiclient.cpp:130
-msgid "Refresh OTR Session"
+#: protocols/skype/skypecalldialog.cpp:297
+#, kde-format
+msgid ""
+"%1 active\n"
+"%2 total"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:95
-msgctxt "@item:inmenu"
-msgid "&OTR Policy"
+#: protocols/skype/skypecalldialog.cpp:303
+msgid "Skypeout inactive"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:101
-msgctxt ""
-"@item:inmenu Use the default encryption mode specified in settings dialog"
-msgid "&Default"
+#: protocols/skype/skypedetails.cpp:71
+#, kde-format
+msgid "Details for User %1"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:103
-msgctxt "@item:inmenu Always encrypt messages"
-msgid "Al&ways"
+#: protocols/skype/skypecontact.cpp:101
+msgid "Call contact"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:104
-msgctxt "@item:inmenu Use the opportunistic encryption mode"
-msgid "&Opportunistic"
+#: protocols/skype/skypecontact.cpp:106 protocols/jabber/jabbercontact.cpp:147
+msgid "(Re)send Authorization To"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:105
-msgctxt "@item:inmenu Use the manual encryption mode"
-msgid "&Manual"
+#: protocols/skype/skypecontact.cpp:111 protocols/jabber/jabbercontact.cpp:161
+msgid "Remove Authorization From"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:106
-msgctxt "@item:inmenu Never encrypt messages"
-msgid "Ne&ver"
+#: protocols/skype/skypecontact.cpp:116
+msgid "Block contact"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:177
-msgid "An error occurred while encrypting the message."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:218
+#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:650
+#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:264
+#. i18n: ectx: property (text), item, widget (QComboBox, gender)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:218
+#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:650
+#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:264
+#. i18n: ectx: property (text), item, widget (QComboBox, gender)
+#: protocols/skype/skypecontact.cpp:235
+#: protocols/oscar/icq/icqprotocol.cpp:199 rc.cpp:2879 rc.cpp:3261 rc.cpp:3309
+#: rc.cpp:2879 rc.cpp:3261 rc.cpp:3309
+msgid "Male"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:230
-msgctxt "@info:status"
-msgid "Your policy settings do not allow encrypted sessions to this contact."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:223
+#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:645
+#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:269
+#. i18n: ectx: property (text), item, widget (QComboBox, gender)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:223
+#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:645
+#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:269
+#. i18n: ectx: property (text), item, widget (QComboBox, gender)
+#: protocols/skype/skypecontact.cpp:237
+#: protocols/oscar/icq/icqprotocol.cpp:198 rc.cpp:2882 rc.cpp:3258 rc.cpp:3312
+#: rc.cpp:2882 rc.cpp:3258 rc.cpp:3312
+msgid "Female"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:239
-#, kde-format
-msgctxt "@info:status"
-msgid "Attempting to refresh the OTR session with <b>%1</b>..."
+#: protocols/skype/skypeprotocol.cpp:88
+msgid "Not in Skype list"
 msgstr ""
 
-#: plugins/otr/otrplugin.cpp:241
-#, kde-format
-msgctxt "@info:status"
-msgid "Attempting to start a private OTR session with <b>%1</b>..."
+#: protocols/skype/skypeprotocol.cpp:89
+msgid "Not authorized"
 msgstr ""
 
-#: plugins/otr/privkeypopup.cpp:34
-msgid "Please wait"
+#: protocols/skype/skypeprotocol.cpp:90
+msgid "SkypeOut contact"
 msgstr ""
 
-#: plugins/otr/otrpreferences.cpp:115
-msgid "Selected account already has a key. Do you want to create a new one?"
+#: protocols/skype/skypeaddcontact.cpp:69
+msgid "You must connect to Skype first."
 msgstr ""
 
-#: plugins/otr/otrpreferences.cpp:115
-msgid "Overwrite key?"
+#: protocols/skype/skypeaddcontact.cpp:69
+#: protocols/wlm/ui/wlmaddcontactpage.cpp:58
+#: protocols/gadu/gadusession.cpp:216 protocols/gadu/gadusession.cpp:229
+#: protocols/gadu/gadusession.cpp:241 protocols/gadu/gadusession.cpp:274
+#: protocols/gadu/gadusession.cpp:288 protocols/gadu/gadusession.cpp:306
+#: protocols/irc/ui/channellist.cpp:298 libkopete/kabcpersistence.cpp:371
+msgid "Not Connected"
+msgstr "Heb gysylltu"
+
+#: protocols/skype/skypeaddcontact.cpp:74
+msgid "You must write the contact's name."
 msgstr ""
 
-#: plugins/otr/otrpreferences.cpp:155
-#, kde-format
+#: protocols/skype/skypeaddcontact.cpp:79
 msgid ""
-"Please contact %1 via another secure way and verify that the following "
-"fingerprint is correct:"
+"Contact echo123 is not needed. You can make test call in Skype protocol "
+"actions."
 msgstr ""
 
-#: plugins/otr/otrpreferences.cpp:159
-msgid "Are you sure you want to trust this fingerprint?"
+#: protocols/skype/skypeaddcontact.cpp:84
+msgid "This contact already exists in this account."
 msgstr ""
 
-#: plugins/otr/otrpreferences.cpp:160
-msgid "Verify fingerprint"
+#: protocols/skype/skypeaddcontact.cpp:89
+msgid "You cannot add yourself as a contact."
 msgstr ""
 
-#: plugins/highlight/highlightpreferences.cpp:198
-msgid "Rename Filter"
-msgstr "Ailenwi Hidlen"
-
-#: plugins/highlight/highlightpreferences.cpp:198
-msgid "Please enter the new name for the filter:"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:116
+#. i18n: ectx: property (text), widget (QRadioButton, offlineButton_)
+#: protocols/groupwise/gwprotocol.cpp:52
+#: protocols/bonjour/bonjourprotocol.cpp:42 protocols/wlm/wlmprotocol.cpp:62
+#: protocols/oscar/icq/icqstatusmanager.cpp:75
+#: protocols/oscar/aim/aimstatusmanager.cpp:67 protocols/qq/qqprotocol.cpp:40
+#: protocols/gadu/gaduprotocol.cpp:58 rc.cpp:3473 rc.cpp:3473
+msgid "O&ffline"
+msgstr "A&ll-lein"
 
-#: plugins/highlight/highlightconfig.cpp:71
-msgid "-New filter-"
-msgstr ""
+#: protocols/groupwise/gwprotocol.cpp:54
+msgid "A&vailable"
+msgstr "A&r gael"
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:127
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:37
-#. i18n: ectx: property (text), widget (QPushButton, m_btnAdd)
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:127
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:37
-#. i18n: ectx: property (text), widget (QPushButton, m_btnAdd)
-#: plugins/alias/aliaspreferences.cpp:316
-#: protocols/oscar/oscarlistnonservercontacts.cpp:38 rc.cpp:632 rc.cpp:4671
-#: rc.cpp:632 rc.cpp:4671
-msgid "&Add"
-msgstr "&Ychwanegu"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:137
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
+#: protocols/groupwise/gwprotocol.cpp:56 protocols/wlm/wlmprotocol.cpp:48
+#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:69
+#: protocols/meanwhile/meanwhileprotocol.cpp:49
+#: protocols/yahoo/yahooprotocol.cpp:46
+#: plugins/statistics/statisticscontact.cpp:267
+#: plugins/statistics/statisticsdialog.cpp:384
+#: libkopete/kopetemetacontact.cpp:500 libkopete/kopetestatusmanager.cpp:288
+#: rc.cpp:6160 kopete/config/status/statusconfig_manager.cpp:62 rc.cpp:6160
+msgid "Busy"
+msgstr "Prysur"
 
-#: plugins/alias/aliaspreferences.cpp:326
-#: plugins/alias/aliaspreferences.cpp:415
-#, kde-format
-msgid ""
-"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the "
-"characters \"_\" or \"=\".</qt>"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:84
+#. i18n: ectx: property (text), widget (QRadioButton, awayButton_)
+#: protocols/groupwise/gwprotocol.cpp:56 protocols/wlm/wlmprotocol.cpp:48
+#: rc.cpp:3455 kopete/kopetewindow.cpp:401 rc.cpp:3455
+msgid "&Busy"
+msgstr "&Prysur"
 
-#: plugins/alias/aliaspreferences.cpp:328
-#: plugins/alias/aliaspreferences.cpp:417
-msgid "Invalid Alias Name"
-msgstr ""
+#: protocols/groupwise/gwprotocol.cpp:58 protocols/wlm/wlmprotocol.cpp:46
+#: protocols/oscar/icq/icqstatusmanager.cpp:83
+#: protocols/oscar/aim/aimstatusmanager.cpp:75 protocols/qq/qqprotocol.cpp:38
+#: kopete/kopetewindow.cpp:397
+msgid "&Away"
+msgstr "&I ffwrdd"
 
-#: plugins/alias/aliaspreferences.cpp:344
-#, kde-format
-msgid ""
-"<qt>Could not add alias <b>%1</b>. This command is already being handled "
-"either by another alias or Kopete itself.</qt>"
-msgstr ""
+#: protocols/groupwise/gwprotocol.cpp:60 protocols/wlm/wlmprotocol.cpp:66
+#: protocols/meanwhile/meanwhileprotocol.cpp:54
+#: protocols/yahoo/yahooprotocol.cpp:57
+#: kopete/config/status/statusconfig_manager.cpp:64
+msgid "Idle"
+msgstr "Segur"
 
-#: plugins/alias/aliaspreferences.cpp:346
-#: plugins/alias/aliaspreferences.cpp:442
-msgid "Could Not Add Alias"
+#: protocols/groupwise/gwprotocol.cpp:63
+msgid "Appear Offline"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:440
-#, kde-format
-msgid ""
-"<qt>Could not add alias <b>%1</b>. This command is already being handled by "
-"either another alias or Kopete itself.</qt>"
+#: protocols/groupwise/gwprotocol.cpp:63
+msgid "A&ppear Offline"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:462
-msgid "Are you sure you want to delete the selected aliases?"
+#: protocols/groupwise/gwprotocol.cpp:68
+msgid "Invalid Status"
 msgstr ""
 
-#: plugins/alias/aliaspreferences.cpp:462
-msgid "Delete Aliases"
+#: protocols/groupwise/gwprotocol.cpp:74
+msgid "Auto Reply Message"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, buttonDelete)
-#: plugins/alias/aliaspreferences.cpp:462
-#: protocols/wlm/ui/wlmeditaccountwidget.cpp:110
-#: protocols/wlm/ui/wlmeditaccountwidget.cpp:113 rc.cpp:2729 rc.cpp:2729
-msgid "Delete"
-msgstr ""
+#: protocols/groupwise/gwprotocol.cpp:75
+msgid "Common Name"
+msgstr "Enw Cyffredin"
 
-#: plugins/nowlistening/nlquodlibet.cpp:67
-#: plugins/nowlistening/nowlisteningplugin.cpp:449
-msgid "Unknown artist"
+#: protocols/groupwise/gwmessagemanager.cpp:81
+#: protocols/groupwise/gwmessagemanager.cpp:517
+#: protocols/qq/qqchatsession.cpp:72 protocols/qq/qqchatsession.cpp:497
+msgid "Security Status"
 msgstr ""
 
-#: plugins/nowlistening/nlquodlibet.cpp:68
-#: plugins/nowlistening/nowlisteningplugin.cpp:456
-msgid "Unknown album"
+#: protocols/groupwise/gwmessagemanager.cpp:83
+#: protocols/qq/qqchatsession.cpp:74
+msgid "Conversation is secure"
 msgstr ""
 
-#: plugins/nowlistening/nlquodlibet.cpp:69
-#: plugins/nowlistening/nowlisteningplugin.cpp:440
-msgid "Unknown track"
+#: protocols/groupwise/gwmessagemanager.cpp:85
+#: protocols/groupwise/gwmessagemanager.cpp:524
+#: protocols/qq/qqchatsession.cpp:78 protocols/qq/qqchatsession.cpp:504
+msgid "Archiving Status"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:133
-msgid "USAGE: /media - Displays information on current song"
+#: protocols/groupwise/gwmessagemanager.cpp:210
+#: protocols/qq/qqchatsession.cpp:177
+#, kde-format
+msgid "An error occurred when trying to start a chat: %1"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:172
-msgctxt ""
-"Message from Kopete user to another user; used when sending media "
-"information even though there are no songs playing or no media players "
-"running"
+#: protocols/groupwise/gwmessagemanager.cpp:238
+#: protocols/qq/qqchatsession.cpp:206
 msgid ""
-"Now Listening for Kopete - it would tell you what I am listening to, if I "
-"was listening to something on a supported media player."
+"Your message could not be sent. You cannot send messages while your status "
+"is Appear Offline. "
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningplugin.cpp:463
-msgid "Unknown player"
-msgstr ""
+#: protocols/groupwise/gwmessagemanager.cpp:328
+#: protocols/qq/qqchatsession.cpp:300
+msgid "&Other..."
+msgstr "&Eraill..."
 
-#: plugins/nowlistening/nowlisteningguiclient.cpp:39
-msgid "Send Media Info"
+#: protocols/groupwise/gwmessagemanager.cpp:350
+#: protocols/groupwise/gwmessagemanager.cpp:398
+#: protocols/qq/qqchatsession.cpp:322
+msgid "Enter Invitation Message"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningguiclient.cpp:64
-msgid ""
-"None of the supported media players (Amarok, KsCD, JuK, Kaffeine, Quod "
-"Libet, or Qmmp) are playing anything."
+#: protocols/groupwise/gwmessagemanager.cpp:351
+#: protocols/groupwise/gwmessagemanager.cpp:399
+#: protocols/qq/qqchatsession.cpp:323
+msgid "Enter the reason for the invitation, or leave blank for no reason:"
 msgstr ""
 
-#: plugins/nowlistening/nowlisteningguiclient.cpp:65
-msgid "Nothing to Send"
+#: protocols/groupwise/gwmessagemanager.cpp:375
+#: protocols/qq/qqchatsession.cpp:348
+msgid "Search for Contact to Invite"
 msgstr ""
 
-#: plugins/urlpicpreview/urlpicpreviewplugin.cpp:152
-msgid "Preview of:"
+#: protocols/groupwise/gwmessagemanager.cpp:411
+#: protocols/qq/qqchatsession.cpp:387
+msgctxt ""
+"label attached to contacts who have been invited but are yet to join a chat"
+msgid "(pending)"
 msgstr ""
 
-#: plugins/latex/latexplugin.cpp:96
+#: protocols/groupwise/gwmessagemanager.cpp:459
+#: protocols/qq/qqchatsession.cpp:434
 msgid ""
-"Cannot find the Magick 'convert' program.\n"
-"convert is required to render the LaTeX formulae.\n"
-"Please get the software from www.imagemagick.org or from your distribution's "
-"package manager."
+"All the other participants have left, and other invitations are still "
+"pending. Your messages will not be delivered until someone else joins the "
+"chat."
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:43
-msgid "Preview Latex Images"
+#: protocols/groupwise/gwmessagemanager.cpp:485
+#: protocols/qq/qqchatsession.cpp:461
+#, kde-format
+msgid "%1 has rejected an invitation to join this conversation."
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:64
-msgid ""
-"The message you are typing does not contain any LaTeX.  A LaTeX formula must "
-"be enclosed within two pairs of dollar signs: $$formula$$ "
+#: protocols/groupwise/gwmessagemanager.cpp:504
+#: protocols/qq/qqchatsession.cpp:484
+msgid "Conversation is being administratively logged"
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:64
-msgid "No LaTeX Formula"
+#: protocols/groupwise/gwmessagemanager.cpp:509
+#: protocols/qq/qqchatsession.cpp:489
+msgid "Conversation is not being administratively logged"
 msgstr ""
 
-#: plugins/latex/latexguiclient.cpp:70
-#, kde-format
-msgid "<b>Preview of the LaTeX message :</b> <br />%1"
+#: protocols/groupwise/gwmessagemanager.cpp:517
+#: protocols/qq/qqchatsession.cpp:497
+msgid "This conversation is secured with SSL security."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:33
-#: plugins/translator/translatorlanguages.cpp:96
-#: protocols/jabber/jingle/jinglecontentdialog.cpp:38
-#: protocols/oscar/icq/icqprotocol.cpp:450
-#: protocols/oscar/icq/icqprotocol.cpp:532
-#: protocols/oscar/icq/icqstatusmanager.cpp:37
-#: protocols/oscar/aim/aimstatusmanager.cpp:33
-#: protocols/skype/libskype/skype.cpp:406
-#: protocols/groupwise/gwprotocol.cpp:66 libkopete/kopeteonlinestatus.cpp:174
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: plugins/translator/translatorlanguages.cpp:34
-msgid "Detect language"
+#: protocols/groupwise/gwmessagemanager.cpp:524
+#: protocols/qq/qqchatsession.cpp:504
+msgid "This conversation is being logged administratively."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:35
-msgid "Afrikaans"
+#: protocols/groupwise/gwaccount.cpp:83
+msgid "&Set Auto-Reply..."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:36
-msgid "Albanian"
+#: protocols/groupwise/gwaccount.cpp:86
+msgid "&Join Channel..."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:37
-msgid "Arabic"
+#: protocols/groupwise/gwaccount.cpp:89
+msgid "&Manage Privacy..."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:38
-msgid "Armenian"
+#: protocols/groupwise/gwaccount.cpp:255
+#: protocols/jabber/ui/jabberregisteraccount.cpp:271
+#, kde-format
+msgid ""
+"SSL support could not be initialized for account %1. This is most likely "
+"because the QCA TLS plugin is not installed on your system."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:39
-#: plugins/translator/translatorlanguages.cpp:40
-msgid "Azerbaijani"
+#: protocols/groupwise/gwaccount.cpp:257
+msgid "GroupWise SSL Error"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:41
-msgid "Basque"
+#: protocols/groupwise/gwaccount.cpp:370
+#, kde-format
+msgctxt "Message Sending Failed using the named local account"
+msgid ""
+"Kopete was not able to send the last message sent on account '%1'.\n"
+"If possible, please send the console output from Kopete to "
+"<wstephenson@novell.com> for analysis."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:42
-msgid "Belarusian"
+#: protocols/groupwise/gwaccount.cpp:370
+#, kde-format
+msgctxt "message sending failed using the named local account"
+msgid "Unable to Send Message on Account '%1'"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:43
-msgid "Bulgarian"
+#: protocols/groupwise/gwaccount.cpp:586
+msgid "Kopete: Conflicting Changes Made Offline"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:44
-msgid "Catalan"
+#: protocols/groupwise/gwaccount.cpp:586
+msgid ""
+"A change happened to your GroupWise contact list while you were offline "
+"which was impossible to reconcile."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:45
-#: plugins/translator/translatorlanguages.cpp:108
-msgid "Chinese (Simplified)"
+#: protocols/groupwise/gwaccount.cpp:659
+#, kde-format
+msgctxt "Error shown when connecting failed"
+msgid ""
+"Kopete was not able to connect to the GroupWise Messenger server for account "
+"'%1'.\n"
+"Please check your server and port settings and try again."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:46
-#: plugins/translator/translatorlanguages.cpp:109
-msgid "Chinese (Traditional)"
+#: protocols/groupwise/gwaccount.cpp:659
+#, kde-format
+msgid "Unable to Connect '%1'"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:47
-msgid "Croatian"
+#: protocols/groupwise/gwaccount.cpp:734
+#: protocols/jabber/jabberaccount.cpp:475
+msgid "The host name does not match the one in the certificate."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:48
-msgid "Czech"
+#: protocols/groupwise/gwaccount.cpp:738
+#: protocols/jabber/jabberaccount.cpp:479
+msgid "The certificate is invalid."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:49
-msgid "Danish"
+#: protocols/groupwise/gwaccount.cpp:742
+#: protocols/jabber/jabberaccount.cpp:483
+msgid "No certificate was presented."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:50
-#: plugins/translator/translatorlanguages.cpp:98
-msgid "Dutch"
+#: protocols/groupwise/gwaccount.cpp:752
+#: protocols/jabber/jabberaccount.cpp:493
+msgid "The Certificate Authority rejected the certificate."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:51
-#: plugins/translator/translatorlanguages.cpp:97
-msgid "English"
-msgstr "Saesneg"
-
-#: plugins/translator/translatorlanguages.cpp:52
-msgid "Estonian"
+#: protocols/groupwise/gwaccount.cpp:756
+#: protocols/jabber/jabberaccount.cpp:497
+msgid "The certificate is not trusted."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:53
-msgid "Filipino"
+#: protocols/groupwise/gwaccount.cpp:760
+#: protocols/jabber/jabberaccount.cpp:501
+msgid "The signature is invalid."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:54
-msgid "Finnish"
+#: protocols/groupwise/gwaccount.cpp:764
+#: protocols/jabber/jabberaccount.cpp:505
+msgid "The Certificate Authority is invalid."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:55
-#: plugins/translator/translatorlanguages.cpp:99
-msgid "French"
-msgstr "Ffrengig"
-
-#: plugins/translator/translatorlanguages.cpp:56
-msgid "Galician"
+#: protocols/groupwise/gwaccount.cpp:768
+#: protocols/jabber/jabberaccount.cpp:509
+msgid "Invalid certificate purpose."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:57
-msgid "Georgian"
+#: protocols/groupwise/gwaccount.cpp:772
+#: protocols/jabber/jabberaccount.cpp:513
+msgid "The certificate is self-signed."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:58
-#: plugins/translator/translatorlanguages.cpp:100
-msgid "German"
-msgstr "Almaenaidd"
-
-#: plugins/translator/translatorlanguages.cpp:59
-#: plugins/translator/translatorlanguages.cpp:101
-msgid "Greek"
+#: protocols/groupwise/gwaccount.cpp:776
+#: protocols/jabber/jabberaccount.cpp:517
+msgid "The certificate has been revoked."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:60
-msgid "Haitian Creole"
+#: protocols/groupwise/gwaccount.cpp:780
+#: protocols/jabber/jabberaccount.cpp:521
+msgid "Maximum certificate chain length was exceeded."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:61
-msgid "Hebrew"
+#: protocols/groupwise/gwaccount.cpp:784
+#: protocols/jabber/jabberaccount.cpp:525
+msgid "The certificate has expired."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:62
-msgid "Hindi"
+#: protocols/groupwise/gwaccount.cpp:788
+#: protocols/jabber/jabberaccount.cpp:529
+msgid "The Certificate Authority has expired."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:63
-msgid "Hungarian"
+#: protocols/groupwise/gwaccount.cpp:792
+#: protocols/jabber/jabberaccount.cpp:533
+msgid "Validity is unknown."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:64
-msgid "Icelandic"
+#: protocols/groupwise/gwaccount.cpp:803
+#: protocols/jabber/jabberaccount.cpp:544
+#, kde-format
+msgid ""
+"<qt><p>The identity and the certificate of server %1 could not be validated "
+"for account %2:</p><p>%3</p><p>%4</p><p>Do you want to continue?</p></qt>"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:65
-msgid "Indonesian"
+#: protocols/groupwise/gwaccount.cpp:809 protocols/groupwise/gwaccount.cpp:814
+#: protocols/jabber/jabberaccount.cpp:550
+#: protocols/jabber/jabberaccount.cpp:555
+#, kde-format
+msgid ""
+"<qt><p>The certificate of server %1 could not be validated for account %2: "
+"%3</p><p>Do you want to continue?</p></qt>"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:66
-msgid "Irish"
+#: protocols/groupwise/gwaccount.cpp:821
+msgid "GroupWise Connection Certificate Problem"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:67
-#: plugins/translator/translatorlanguages.cpp:102
-msgid "Italian"
-msgstr "Eidalaidd"
-
-#: plugins/translator/translatorlanguages.cpp:68
-#: plugins/translator/translatorlanguages.cpp:103
-msgid "Japanese"
-msgstr "Siapanëaidd"
-
-#: plugins/translator/translatorlanguages.cpp:69
-#: plugins/translator/translatorlanguages.cpp:104
-msgid "Korean"
-msgstr "Coreeg"
+#: protocols/groupwise/gwaccount.cpp:871
+#, kde-format
+msgctxt ""
+"Prefix used for automatically generated auto-reply messages when the contact "
+"is Away, contains contact's name"
+msgid "Auto reply from %1: "
+msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:70
-msgid "Latvian"
+#: protocols/groupwise/gwaccount.cpp:877
+#, kde-format
+msgctxt "Prefix used for broadcast messages"
+msgid "Broadcast message from %1: "
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:71
-msgid "Lithuanian"
+#: protocols/groupwise/gwaccount.cpp:883
+#, kde-format
+msgctxt "Prefix used for system broadcast messages"
+msgid "System Broadcast message from %1: "
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:72
-msgid "Macedonian"
+#: protocols/groupwise/gwaccount.cpp:1272
+#, kde-format
+msgid ""
+"The contact %1 could not be added to the contact list, with error message: %2"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:73
-msgid "Malay"
+#: protocols/groupwise/gwaccount.cpp:1274
+msgid "Error Adding Contact"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:74
-msgid "Maltese"
+#: protocols/groupwise/gwaccount.cpp:1318
+#, kde-format
+msgid "Kopete: Signed in as %1 Elsewhere"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:75
-msgid "Norwegian"
+#: protocols/groupwise/gwaccount.cpp:1318
+#, kde-format
+msgctxt "The parameter is the user's own account id for this protocol"
+msgid ""
+"You have been disconnected from GroupWise Messenger because you signed in as "
+"%1 elsewhere"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:76
-msgid "Persian"
+#: protocols/groupwise/gwaccount.cpp:1431
+#, kde-format
+msgid "%1 has been invited to join this conversation."
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:77
-msgid "Polish"
+#: protocols/groupwise/gwaccount.cpp:1457
+msgid "Enter Auto-Reply Message"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:78
-#: plugins/translator/translatorlanguages.cpp:105
-msgid "Portuguese"
-msgstr "Portwgëaidd"
-
-#: plugins/translator/translatorlanguages.cpp:79
-msgid "Romanian"
+#: protocols/groupwise/gwaccount.cpp:1458
+msgid ""
+"Please enter an Auto-Reply message that will be shown to users who message "
+"you while Away or Busy"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:80
-#: plugins/translator/translatorlanguages.cpp:106
-msgid "Russian"
-msgstr "Rwsiaidd"
-
-#: plugins/translator/translatorlanguages.cpp:81
-msgid "Serbian"
+#: protocols/groupwise/gwcontact.cpp:160 protocols/qq/qqcontact.cpp:136
+msgid "Unblock User"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:82
-msgid "Slovak"
+#: protocols/groupwise/gwcontact.cpp:160 protocols/qq/qqcontact.cpp:136
+msgid "Block User"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:83
-msgid "Slovenian"
+#: protocols/groupwise/gwcontact.cpp:239
+#, kde-format
+msgid "%1|Blocked"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:84
-#: plugins/translator/translatorlanguages.cpp:107
-msgid "Spanish"
-msgstr "Sbaenaidd"
-
-#: plugins/translator/translatorlanguages.cpp:85
-msgid "Swahili"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:29
+msgid "Access denied"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:86
-msgid "Swedish"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:32
+msgid "Not supported"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:87
-msgid "Thai"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:35
+msgid "Password expired"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:88
-msgid "Turkish"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:38
+msgid "Invalid password"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:89
-msgid "Ukrainian"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:44
+msgid "Attribute not found"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:90
-msgid "Urdu"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:47
+msgid "User not enabled"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:91
-msgid "Vietnamese"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:50
+msgid "Directory failure"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:92
-msgid "Welsh"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:53
+msgid "Host not found"
 msgstr ""
 
-#: plugins/translator/translatorlanguages.cpp:93
-msgid "Yiddish"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:56
+msgid "Locked by admin"
 msgstr ""
 
-#: plugins/translator/translatordialog.cpp:27
-msgid "Translator Plugin"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:59
+msgid "Duplicate participant"
 msgstr ""
 
-#: plugins/translator/translatorguiclient.cpp:47
-msgid "Translate"
-msgstr "Trosi"
-
-#: plugins/translator/translatorplugin.cpp:73
-msgid "Set &Language"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:62
+msgid "Server busy"
 msgstr ""
 
-#: plugins/translator/translatorplugin.cpp:369
-#, kde-format
-msgid ""
-"%2 \n"
-"Auto Translated: \n"
-"%1"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:65
+msgid "Object not found"
 msgstr ""
 
-#: plugins/translator/translatorplugin.cpp:371
-#, kde-format
-msgid "%2 <br/>Auto Translated: <br/>%1"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:68
+msgid "Directory update"
 msgstr ""
 
-#: plugins/autoreplace/autoreplaceconfig.cpp:68
-msgctxt "list_of_words_to_replace"
-msgid "ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:71
+msgid "Duplicate folder"
 msgstr ""
 
-#: plugins/autoreplace/autoreplacepreferences.cpp:48
-msgid "Text"
-msgstr "Testun"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:74
+msgid "Contact list entry already exists"
+msgstr ""
 
-#: plugins/autoreplace/autoreplacepreferences.cpp:49
-msgid "Replacement"
-msgstr "Amnewidiad"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:77
+msgid "User not allowed"
+msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:127
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
-#: plugins/statistics/statisticscontact.cpp:264
-#: plugins/statistics/statisticsdialog.cpp:380
-#: plugins/statistics/statisticsdialog.cpp:675
-#: protocols/sms/smsprotocol.cpp:38 protocols/wlm/wlmprotocol.cpp:43
-#: protocols/meanwhile/meanwhileprotocol.cpp:40
-#: protocols/bonjour/bonjourprotocol.cpp:37
-#: protocols/jabber/jabbercontact.cpp:191
-#: protocols/jabber/jabberprotocol.cpp:66
-#: protocols/oscar/icq/icqstatusmanager.cpp:87
-#: protocols/oscar/aim/aimstatusmanager.cpp:79
-#: protocols/gadu/gaduprotocol.cpp:82 protocols/gadu/gaduprotocol.cpp:86
-#: protocols/yahoo/yahooprotocol.cpp:44 protocols/winpopup/wpaccount.cpp:172
-#: protocols/winpopup/wpprotocol.cpp:55 protocols/skype/skypeaccount.cpp:926
-#: protocols/skype/skypeprotocol.cpp:81 protocols/qq/qqprotocol.cpp:36
-#: protocols/groupwise/gwprotocol.cpp:54 libkopete/kopeteonlinestatus.cpp:158
-#: libkopete/kopetemetacontact.cpp:496 libkopete/kopetestatusmanager.cpp:273
-#: kopete/config/status/statusconfig_manager.cpp:54 rc.cpp:5612 rc.cpp:5612
-msgid "Online"
-msgstr "Ar-lein"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:80
+msgid "Too many contacts"
+msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:132
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
-#: plugins/statistics/statisticscontact.cpp:265
-#: plugins/statistics/statisticsdialog.cpp:382
-#: plugins/statistics/statisticsdialog.cpp:677
-#: plugins/statistics/statisticsdialog.cpp:679
-#: protocols/wlm/wlmprotocol.cpp:46
-#: protocols/meanwhile/meanwhileprotocol.cpp:44
-#: protocols/jabber/jabbercontact.cpp:193
-#: protocols/jabber/jabberprotocol.cpp:67
-#: protocols/oscar/icq/icqstatusmanager.cpp:83
-#: protocols/oscar/aim/aimstatusmanager.cpp:75
-#: protocols/winpopup/wpaccount.cpp:178 protocols/winpopup/wpprotocol.cpp:56
-#: protocols/skype/skypeaccount.cpp:934 protocols/skype/skypeprotocol.cpp:83
-#: protocols/qq/qqprotocol.cpp:38 protocols/groupwise/gwprotocol.cpp:58
-#: libkopete/kopeteonlinestatus.cpp:161 libkopete/kopetemetacontact.cpp:498
-#: libkopete/kopetestatusmanager.cpp:278
-#: kopete/config/status/statusconfig_manager.cpp:58 rc.cpp:5615 rc.cpp:5615
-msgid "Away"
-msgstr "I ffwrdd"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:83
+msgid "Conference not found"
+msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:122
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
-#: plugins/statistics/statisticscontact.cpp:266
-#: plugins/statistics/statisticsdialog.cpp:386
-#: plugins/statistics/statisticsdialog.cpp:681
-#: protocols/sms/smsprotocol.cpp:39 protocols/wlm/wlmprotocol.cpp:62
-#: protocols/meanwhile/meanwhileprotocol.cpp:35
-#: protocols/bonjour/bonjourprotocol.cpp:42
-#: protocols/jabber/jabberprotocol.cpp:70
-#: protocols/oscar/icq/icqstatusmanager.cpp:75
-#: protocols/oscar/aim/aimstatusmanager.cpp:67
-#: protocols/gadu/gaduprotocol.cpp:57 protocols/gadu/gaduprotocol.cpp:63
-#: protocols/yahoo/yahooprotocol.cpp:43 protocols/winpopup/wpprotocol.cpp:57
-#: protocols/skype/skypeaccount.cpp:930 protocols/skype/skypeprotocol.cpp:80
-#: protocols/qq/qqprotocol.cpp:40 protocols/groupwise/gwprotocol.cpp:52
-#: libkopete/kopeteonlinestatus.cpp:170 libkopete/kopeteidentity.cpp:167
-#: libkopete/kopetemetacontact.cpp:502 libkopete/kopetestatusmanager.cpp:295
-#: kopete/kopetewindow.cpp:387
-#: kopete/config/status/statusconfig_manager.cpp:68 rc.cpp:5609 rc.cpp:5609
-msgid "Offline"
-msgstr "All-lein"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:86
+msgid "Too many folders"
+msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:137
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
-#: plugins/statistics/statisticscontact.cpp:267
-#: plugins/statistics/statisticsdialog.cpp:384
-#: protocols/wlm/wlmprotocol.cpp:48
-#: protocols/meanwhile/meanwhileprotocol.cpp:49
-#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:69
-#: protocols/yahoo/yahooprotocol.cpp:46 protocols/groupwise/gwprotocol.cpp:56
-#: libkopete/kopetemetacontact.cpp:500 libkopete/kopetestatusmanager.cpp:284
-#: kopete/config/status/statusconfig_manager.cpp:62 rc.cpp:5618 rc.cpp:5618
-msgid "Busy"
-msgstr "Prysur"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:89
+msgid "Server protocol error"
+msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:50
-#, kde-format
-msgid "Statistics for %1"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:92
+msgid "Conversation invitation error"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:547
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_General)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:547
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_General)
-#: plugins/statistics/statisticsdialog.cpp:68 rc.cpp:1211 rc.cpp:4360
-#: rc.cpp:5546 rc.cpp:1211 rc.cpp:4360 rc.cpp:5546
-msgid "General"
-msgstr "Cyffredinol"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:95
+msgid "User is blocked"
+msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:86
-#, kde-format
-msgid ""
-"Key:  <font color=\"%1\">Online</font>  <font color=\"%2\">Away</font>  "
-"<font color=\"%3\">Offline</font>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:98
+msgid "Master archive is missing"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:230
-#, kde-format
-msgid "<h1>Statistics for %1</h1>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:101
+msgid "Expired password in use"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:233
-msgid ""
-"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
-"summary view\">General</a></b><br><span title=\"Select the day or month for "
-"which you want to view statistics\"><b>Days: </b><a "
-"href=\"dayofweek:1\">Monday</a>&nbsp;<a "
-"href=\"dayofweek:2\">Tuesday</a>&nbsp;<a "
-"href=\"dayofweek:3\">Wednesday</a>&nbsp;<a "
-"href=\"dayofweek:4\">Thursday</a>&nbsp;<a "
-"href=\"dayofweek:5\">Friday</a>&nbsp;<a "
-"href=\"dayofweek:6\">Saturday</a>&nbsp;<a "
-"href=\"dayofweek:7\">Sunday</a><br><b>Months: </b><a "
-"href=\"monthofyear:1\">January</a>&nbsp;<a "
-"href=\"monthofyear:2\">February</a>&nbsp;<a "
-"href=\"monthofyear:3\">March</a>&nbsp;<a "
-"href=\"monthofyear:4\">April</a>&nbsp;<a "
-"href=\"monthofyear:5\">May</a>&nbsp;<a "
-"href=\"monthofyear:6\">June</a>&nbsp;<a "
-"href=\"monthofyear:7\">July</a>&nbsp;<a "
-"href=\"monthofyear:8\">August</a>&nbsp;<a "
-"href=\"monthofyear:9\">September</a>&nbsp;<a "
-"href=\"monthofyear:10\">October</a>&nbsp;<a "
-"href=\"monthofyear:11\">November</a>&nbsp;<a "
-"href=\"monthofyear:12\">December</a>&nbsp;</span></div><br>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:104
+msgid "Credentials missing"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:264
-msgid ""
-"<div class=\"statgroup\" title=\"Contact status history for "
-"today\"><h2>Today</h2><table "
-"width=\"100%\"><tr><td>Status</td><td>From</td><td>To</td></tr>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:107
+#: plugins/otr/authenticationwizard.cpp:325
+msgid "Authentication failed"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:420
-msgid "<div class=\"statgroup\">"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:110
+msgid "Eval connection limit"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:421
-#, kde-format
-msgid ""
-"<b title=\"The total time %1 was visible\">Total visible time :</b> %2 "
-"hour(s)<br>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:113
+msgid "Unsupported client version"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:423
-#, kde-format
-msgid ""
-"<b title=\"The total time %1 was online\">Total online time :</b> %2 "
-"hour(s)<br>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:116
+msgid "A duplicate chat was found"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:425
-#, kde-format
-msgid ""
-"<b title=\"The total time %1 was away\">Total busy time :</b> %2 hour(s)<br>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:119
+msgid "Chat not found"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:426
-#, kde-format
-msgid ""
-"<b title=\"The total time %1 was offline\">Total offline time :</b> %2 "
-"hour(s)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:122
+msgid "Invalid chat name"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:429
-#: plugins/statistics/statisticsdialog.cpp:522
-#: plugins/statistics/statisticsdialog.cpp:540
-msgid "General information"
-msgstr "Gwybodaeth Cyffredinol"
-
-#: plugins/statistics/statisticsdialog.cpp:435
-#, kde-format
-msgid "<b>Average message length:</b> %1 character<br>"
-msgid_plural "<b>Average message length:</b> %1 characters<br>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/statistics/statisticsdialog.cpp:437
-#, kde-format
-msgid "<b>Time between two messages:</b> %1 second"
-msgid_plural "<b>Time between two messages:</b> %1 seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/statistics/statisticsdialog.cpp:442
-#, kde-format
-msgid "<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:125
+msgid "The chat is active"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:443
-#, kde-format
-msgid ""
-"<b title=\"The last time %1 was online or away\">Last time present :</b> %2"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:128
+msgid "Chat is busy; try again"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:453
-msgid "Current status"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:131
+msgid "Tried request too soon after another; try again"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:454
-#, kde-format
-msgid "Is <b>%1</b> since <b>%2</b>"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:134
+msgid "Server's chat subsystem is not active"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:466
-#, kde-format
-msgctxt ""
-"TRANSLATOR: please reverse 'left' and 'right' as appropriate for your "
-"language"
-msgid ""
-"When was this contact visible?<br />All charts are in 24 blocks, one per "
-"hour, encompassing one day. %1 is on the left, and %2 is on the right."
+#: protocols/groupwise/libgroupwise/gwerror.cpp:137
+msgid "The chat update request is invalid"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:492
-#, kde-format
-msgid "Between %1 and %2, %3 was visible for %4% of the hour."
+#: protocols/groupwise/libgroupwise/gwerror.cpp:140
+msgid "Write failed due to directory mismatch"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:504
-msgid "Online time"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:143
+msgid "Recipient's client version is too old"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:506
-msgid "Away time"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:146
+msgid "Chat has been removed from server"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:508
-msgid "Offline time"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:149
+#, kde-format
+msgid "Unrecognized error code: %1"
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:512
-msgid "online"
-msgstr "arlein"
-
-#: plugins/statistics/statisticsdialog.cpp:515
-msgid "away"
-msgstr "i ffwrdd"
-
-#: plugins/statistics/statisticsdialog.cpp:518
-msgid "offline"
-msgstr "all-lein"
+#: protocols/groupwise/ui/gwaddcontactpage.cpp:67
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:67
+#: protocols/wlm/ui/wlmaddcontactpage.cpp:57
+#: protocols/oscar/aim/aimprotocol.cpp:180
+msgid "You need to be connected to be able to add contacts."
+msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:567
-#, kde-format
-msgid "Between %1 and %2, %3 was %4% %5."
+#: protocols/groupwise/ui/gwaddcontactpage.cpp:68
+msgid "Connect to GroupWise Messenger and try again."
 msgstr ""
 
-#: plugins/statistics/statisticsdialog.cpp:661
+#: protocols/groupwise/ui/gwprivacydialog.cpp:58
 #, kde-format
-msgid ""
-"<h2>%1</h2><table "
-"width=\"100%\"><tr><td>Status</td><td>From</td><td>To</td></tr>"
+msgctxt "Account specific privacy settings"
+msgid "Manage Privacy for %1"
 msgstr ""
 
-#: plugins/statistics/statisticsplugin.cpp:58
-msgid "View &Statistics"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:70
+msgid "Privacy settings have been administratively locked"
 msgstr ""
 
-#: plugins/history/converter.cpp:42
-msgid "Would you like to remove the old history files?"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:110
+msgid "<Everyone Else>"
 msgstr ""
 
-#: plugins/history/converter.cpp:42
-msgid "History Converter"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:187
+msgid "Search for Contact to Block"
 msgstr ""
 
-#: plugins/history/converter.cpp:42 protocols/jabber/jabbercontact.cpp:996
-#: protocols/jabber/jabberaccount.cpp:1175
-msgid "Keep"
-msgstr "Cadw"
-
-#: plugins/history/converter.cpp:44
-msgid "History converter"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:358
+msgid ""
+"You can only change privacy settings while you are logged in to the "
+"GroupWise Messenger server."
 msgstr ""
 
-#: plugins/history/converter.cpp:109
+#: protocols/groupwise/ui/gwprivacydialog.cpp:358
 #, kde-format
-msgid "Parsing the old history in %1"
+msgid "'%1' Not Logged In"
 msgstr ""
 
-#: plugins/history/converter.cpp:119
-#, kde-format
-msgid ""
-"Parsing the old history in %1:\n"
-"%2"
+#: protocols/groupwise/ui/gwchatpropsdialog.cpp:35
+#: protocols/groupwise/ui/gwchatpropsdialog.cpp:48
+msgid "Chatroom properties"
 msgstr ""
 
-#: plugins/history/historyplugin.cpp:46
-msgid "History"
-msgstr "Hanes"
+#: protocols/groupwise/ui/gwchatsearchdialog.cpp:43
+msgid "Search Chatrooms"
+msgstr ""
 
-#: plugins/history/historyplugin.cpp:52
-#: plugins/history/historyguiclient.cpp:63
-msgid "View &History"
+#: protocols/groupwise/ui/gwchatsearchdialog.cpp:70
+msgid "Updating chatroom list..."
 msgstr ""
 
-#: plugins/history/historyplugin.cpp:72
-msgid ""
-"Old history files from Kopete 0.6.x or older has been detected.\n"
-"Do you want to import and convert them to the new history format?"
+#: protocols/groupwise/ui/gwcontactproperties.cpp:81
+msgid "Contact Properties"
 msgstr ""
 
-#: plugins/history/historyplugin.cpp:74
-msgid "History Plugin"
-msgstr "Ategyn Hanes"
+#: protocols/groupwise/ui/gwcontactproperties.cpp:103
+msgid "Telephone Number"
+msgstr "Rhif Teleffôn"
 
-#: plugins/history/historyplugin.cpp:74
-msgid "Import && Convert"
-msgstr ""
+#: protocols/groupwise/ui/gwcontactproperties.cpp:105
+msgid "Department"
+msgstr "Adran"
 
-#: plugins/history/historyplugin.cpp:74
-msgid "Do Not Import"
+#: protocols/groupwise/ui/gwcontactproperties.cpp:107
+msgid "Location"
+msgstr "Lleoliad"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:109
+msgid "Mailstop"
 msgstr ""
 
-#: plugins/history/historydialog.cpp:87 plugins/history/historydialog.cpp:580
-#, kde-format
-msgid "History for %1"
+#: protocols/groupwise/ui/gwcontactproperties.cpp:111
+msgid "Personal Title"
 msgstr ""
 
-#: plugins/history/historydialog.cpp:109
-msgid "All"
-msgstr "Popeth"
+#: protocols/groupwise/ui/gwcontactproperties.cpp:113
+#: protocols/yahoo/yahooprotocol.cpp:66
+#: kopete/config/status/statusmodel.cpp:122
+msgid "Title"
+msgstr "Teitl"
 
-#: plugins/history/historydialog.cpp:169
-#: kopete/chatwindow/chatmessagepart.cpp:280
-msgid "Copy Link Address"
-msgstr "Copïo Cyfeiriad Cyswllt"
+#: protocols/groupwise/ui/gwcontactproperties.cpp:115
+#: libkopete/kopeteglobal.cpp:201
+msgid "Email Address"
+msgstr "Cyfeiriad Ebost"
 
-#: plugins/history/historydialog.cpp:204
-#: protocols/yahoo/ui/yahoochatselectordialog.cpp:41
-#: protocols/yahoo/ui/yahoochatselectordialog.cpp:63
-msgid "Loading..."
-msgstr "Llwytho..."
+#: protocols/groupwise/ui/gweditaccountwidget.cpp:104
+msgid ""
+"The changes you just made will take effect next time you log in with "
+"GroupWise."
+msgstr ""
 
-#: plugins/history/historydialog.cpp:467
-msgid "Searching..."
-msgstr "Yn chwilio..."
+#: protocols/groupwise/ui/gweditaccountwidget.cpp:105
+msgid "GroupWise Settings Changed While Signed In"
+msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialog.ui:91
-#. i18n: ectx: property (text), widget (KPushButton, kPushButton3)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:228
-#. i18n: ectx: property (text), widget (QPushButton, m_cancelButton)
-#. i18n: file: protocols/jabber/ui/dlgcommand.ui:145
-#. i18n: ectx: property (text), widget (QPushButton, btnCancel)
-#. i18n: file: plugins/alias/aliasdialog.ui:91
-#. i18n: ectx: property (text), widget (KPushButton, kPushButton3)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:228
-#. i18n: ectx: property (text), widget (QPushButton, m_cancelButton)
-#. i18n: file: protocols/jabber/ui/dlgcommand.ui:145
-#. i18n: ectx: property (text), widget (QPushButton, btnCancel)
-#: plugins/history/historydialog.cpp:468
-#: protocols/gadu/gaduregisteraccount.cpp:55 rc.cpp:343 rc.cpp:1415
-#: rc.cpp:2272 rc.cpp:343 rc.cpp:1415 rc.cpp:2272
-msgid "&Cancel"
+#: protocols/groupwise/ui/gwreceiveinvitationdialog.cpp:39
+msgid "Invitation to Conversation"
 msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:169
-#. i18n: ectx: property (text), widget (QPushButton, searchButton)
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:70
-#. i18n: ectx: property (text), widget (KPushButton, searchButton)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:242
-#. i18n: ectx: property (text), widget (KPushButton, searchButton)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:193
-#. i18n: ectx: property (text), widget (QPushButton, m_search)
-#. i18n: file: plugins/history/historyviewer.ui:169
-#. i18n: ectx: property (text), widget (QPushButton, searchButton)
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:70
-#. i18n: ectx: property (text), widget (KPushButton, searchButton)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:242
-#. i18n: ectx: property (text), widget (KPushButton, searchButton)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:193
-#. i18n: ectx: property (text), widget (QPushButton, m_search)
-#: plugins/history/historydialog.cpp:560 rc.cpp:707 rc.cpp:2720 rc.cpp:2783
-#: rc.cpp:4800 rc.cpp:707 rc.cpp:2720 rc.cpp:2783 rc.cpp:4800
-msgid "&Search"
-msgstr "&Chwilio"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:42
+#. i18n: ectx: property (title), widget (QGroupBox, statusGroup_)
+#. i18n: file: plugins/otr/otrprefs.ui:206
+#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:63
+#. i18n: ectx: ToolBar (statusToolBar)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:42
+#. i18n: ectx: ToolBar (statusToolBar)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:98
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:68
+#. i18n: ectx: property (text), widget (AccountTreeWidget, mAccountList)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:42
+#. i18n: ectx: property (title), widget (QGroupBox, statusGroup_)
+#. i18n: file: plugins/otr/otrprefs.ui:206
+#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:63
+#. i18n: ectx: ToolBar (statusToolBar)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:42
+#. i18n: ectx: ToolBar (statusToolBar)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:98
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:68
+#. i18n: ectx: property (text), widget (AccountTreeWidget, mAccountList)
+#: protocols/groupwise/ui/gwsearch.cpp:95 rc.cpp:3437 rc.cpp:4970 rc.cpp:5493
+#: rc.cpp:5523 rc.cpp:5904 rc.cpp:6208 kopete/kopetewindow.cpp:415 rc.cpp:3437
+#: rc.cpp:4970 rc.cpp:5493 rc.cpp:5523 rc.cpp:5904 rc.cpp:6208
+msgid "Status"
+msgstr "Cyflwr"
 
-#: plugins/history/historydialog.cpp:573
-msgid "History for All Contacts"
-msgstr ""
+#: protocols/groupwise/ui/gwsearch.cpp:98
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:63
+#: libkopete/kopeteglobal.cpp:165
+msgid "First Name"
+msgstr "Enw Cyntaf"
 
-#. i18n: file: plugins/history/historyviewer.ui:186
-#. i18n: ectx: property (text), widget (QLabel, statusLabel)
-#: plugins/history/historydialog.cpp:596 rc.cpp:710 rc.cpp:710
-msgid "Ready"
-msgstr "Parod"
+#: protocols/groupwise/ui/gwsearch.cpp:101
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:64
+#: libkopete/kopeteglobal.cpp:171
+msgid "Last Name"
+msgstr "Enw Olaf"
 
-#: plugins/history/historyimport.cpp:52
-msgid "Import History"
-msgstr ""
+#: protocols/groupwise/ui/gwsearch.cpp:104
+msgid "User ID"
+msgstr "Dynodiad Defnyddiwr"
 
-#: plugins/history/historyimport.cpp:53
-msgid "Import Listed Logs"
-msgstr ""
+#: protocols/groupwise/ui/gwsearch.cpp:328
+msgid "Searching"
+msgstr "Yn chwilio"
 
-#: plugins/history/historyimport.cpp:63
-msgid "Get History From &Pidgin..."
+#: protocols/groupwise/ui/gwsearch.cpp:391
+#, kde-format
+msgid "1 matching user found"
+msgid_plural "%1 matching users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: protocols/sms/services/smssend.cpp:59
+msgid "No provider configured."
 msgstr ""
 
-#: plugins/history/historyimport.cpp:78
-msgid "Select log directory by hand"
+#: protocols/sms/services/smssend.cpp:59
+#: protocols/sms/services/smsclient.cpp:68
+#: protocols/sms/services/smssendprovider.cpp:217
+#: protocols/sms/services/smssendprovider.cpp:225
+#: protocols/sms/smscontact.cpp:59
+msgid "Could Not Send Message"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:89
-msgid "Parsed History"
+#: protocols/sms/services/smssend.cpp:66
+msgid ""
+"No prefix set for SMSSend, please change it in the configuration dialog."
 msgstr ""
 
-#: plugins/history/historyimport.cpp:112
-msgid "Saving logs to disk ..."
+#: protocols/sms/services/smssend.cpp:66
+msgid "No Prefix"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:112
-msgid "Abort Saving"
+#: protocols/sms/services/smssend.cpp:186
+#, kde-format
+msgid "%1 Settings"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:113
-msgid "Saving"
+#: protocols/sms/services/smssend.cpp:243
+#, kde-format
+msgid ""
+"<qt>SMSSend is a program for sending SMS through gateways on the web. It can "
+"be found on <a href=\"%1\">%2</a></qt>"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:260
-msgid "Are You Sure?"
+#: protocols/sms/services/smsclient.cpp:68
+msgid "No provider configured"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:261
+#: protocols/sms/services/smsclient.cpp:181
+#, kde-format
 msgid ""
-"You already imported logs from pidgin. If you do it twice, each message is "
-"imported twice.\n"
-"Are you sure you want to continue?"
+"<qt>SMSClient is a program for sending SMS with the modem. The program can "
+"be found on <a href=\"%1\">%1</a></qt>"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:270
-msgid "Select Log Directory"
+#: protocols/sms/services/gsmlib.cpp:448
+#, kde-format
+msgid ""
+"<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. "
+"The program can be found on <a href=\"%1\">%1</a></qt>"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:273
-msgid "Parsing history from pidgin ..."
+#: protocols/sms/services/smssendprovider.cpp:216
+msgid "Could not determine which argument should contain the message."
 msgstr ""
 
-#: plugins/history/historyimport.cpp:273
-msgid "Abort parsing"
+#: protocols/sms/services/smssendprovider.cpp:224
+msgid "Could not determine which argument should contain the number."
 msgstr ""
 
-#: plugins/history/historyimport.cpp:274
-msgid "Parsing history"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:74
+#. i18n: ectx: property (text), widget (QTableWidget, listServers)
+#: protocols/sms/smseditaccountwidget.cpp:138
+#: protocols/oscar/icq/xtrazstatusmodel.cpp:129 rc.cpp:1420
+#: kopete/addaccountwizard/addaccountwizard.cpp:74 rc.cpp:1420
+msgid "Description"
+msgstr "Disgrifiad"
 
-#: plugins/history/historyimport.cpp:299
-#, kde-format
-msgid "WARNING: Cannot find matching account for %1 (%2).\n"
+#: protocols/sms/smsuserpreferences.cpp:31
+msgid "User Preferences"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:311
+#: protocols/sms/smsaccount.cpp:88
 #, kde-format
 msgid ""
-"WARNING: Cannot find %1 (%2) in your contact list. Found logs will not be "
-"imported.\n"
+"This message is longer than the maximum length (%1). Should it be divided to "
+"%2 messages?"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:326
-#, kde-format
-msgid "WARNING: Cannot open file %1. Skipping.\n"
+#: protocols/sms/smsaccount.cpp:89
+msgid "Message Too Long"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:375
-msgid "Cannot Map Nickname to Account"
+#: protocols/sms/smsaccount.cpp:89
+msgid "Divide"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:376
-#, kde-format
-msgid "Did you use \"%1\" as nickname in history?"
+#: protocols/sms/smsaccount.cpp:89
+msgid "Do Not Divide"
 msgstr ""
 
-#: plugins/history/historyimport.cpp:423
-#, kde-format
-msgid ""
-"WARNING: Cannot parse date \"%1\". You may want to edit the file containing "
-"this date manually. (Example recognized date strings: \"05/31/2008 "
-"15:24:30\".)\n"
+#: protocols/sms/smsaccount.cpp:153
+msgid "Message too long."
 msgstr ""
 
-#: plugins/history/historyimport.cpp:546
-#, kde-format
-msgid "WARNING: XML parser error in %1 at line %2, character %3: %4"
+#: protocols/sms/smscontact.cpp:58
+msgid "Something went wrong while sending the message."
 msgstr ""
 
-#: plugins/history/historyimport.cpp:549
-#, kde-format
-msgid "\t%1"
+#: protocols/sms/smscontact.cpp:130
+msgid "&Contact Settings"
 msgstr ""
 
-#: plugins/history/historyguiclient.cpp:55
-msgid "Latest History"
+#: protocols/sms/serviceloader.cpp:46
+#, kde-format
+msgid "Could not load service %1."
 msgstr ""
 
-#: plugins/history/historyguiclient.cpp:68
-msgid "Quote Last Message"
+#: protocols/sms/serviceloader.cpp:47
+msgid "Error Loading Service"
 msgstr ""
 
-#: plugins/contactnotes/contactnotesplugin.cpp:42
-msgid "&Notes"
-msgstr "&Nodiadau"
-
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:132
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: plugins/contactnotes/contactnotesedit.cpp:33 rc.cpp:2885 rc.cpp:2885
-msgid "Contact Notes"
-msgstr "Nodiadau Cysylltiad"
-
-#: plugins/contactnotes/contactnotesedit.cpp:42
-#, kde-format
-msgid "Notes about %1:"
+#: protocols/jabber/googletalk/googletalk.cpp:317
+msgid "Answer for incoming call"
 msgstr ""
 
-#: plugins/pipes/pipesmodel.cpp:89
-msgid "Path"
+#: protocols/jabber/googletalk/googletalk.cpp:327
+msgid "Accepted"
 msgstr ""
 
-#: plugins/pipes/pipesmodel.cpp:91
-msgid "Direction"
+#: protocols/jabber/googletalk/googletalk.cpp:336
+msgid "Calling..."
 msgstr ""
 
-#: plugins/pipes/pipesmodel.cpp:93
-msgid "Pipe Contents"
+#: protocols/jabber/googletalk/googletalk.cpp:341
+msgid "Rejected"
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:38
-msgctxt "adjective decribing instant message"
-msgid "Inbound"
+#: protocols/jabber/googletalk/googletalk.cpp:353
+msgid "Call in progress"
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:39
-msgctxt "adjective decribing instant message"
-msgid "Outbound"
+#: protocols/jabber/googletalk/googletalk.cpp:360
+msgid "Other side hung up"
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:40 plugins/pipes/pipesdelegate.cpp:156
-msgctxt "adjective decribing instant message directions inbound and outbound"
-msgid "Both Directions"
+#: protocols/jabber/googletalk/googletalk.cpp:407
+msgid "Waiting..."
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:47 plugins/pipes/pipesdelegate.cpp:164
-msgid "HTML Message Body"
+#: protocols/jabber/jabberbasecontact.cpp:130
+msgid "You cannot see each others' status."
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:48 plugins/pipes/pipesdelegate.cpp:166
-msgid "Plain Text Message Body"
+#: protocols/jabber/jabberbasecontact.cpp:134
+msgid "You can see this contact's status, but he/she cannot see your status."
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:49 plugins/pipes/pipesdelegate.cpp:168
-msgid "Kopete Message XML"
+#: protocols/jabber/jabberbasecontact.cpp:138
+msgid "This contact can see your status, but you cannot see his/her status."
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:152
-msgctxt "adjective decribing an instant message"
-msgid "Inbound"
+#: protocols/jabber/jabberbasecontact.cpp:142
+msgid "You can see each others' status."
 msgstr ""
 
-#: plugins/pipes/pipesdelegate.cpp:154
-msgctxt "adjective decribing an instant message"
-msgid "Outbound"
+#: protocols/jabber/jabberbasecontact.cpp:258
+#: protocols/oscar/oscarprotocol.cpp:38
+msgid "Client"
+msgstr "Dibynnydd:"
+
+#: protocols/jabber/jabberbasecontact.cpp:283
+msgid "Timestamp"
 msgstr ""
 
-#: plugins/pipes/pipespreferences.cpp:85
-msgid "Select Program or Script to Pipe Messages Through"
+#: protocols/jabber/jabberbasecontact.cpp:290
+#: protocols/oscar/icq/xtrazstatusmodel.cpp:131
+msgid "Message"
+msgstr "Neges"
+
+#: protocols/jabber/jabberbasecontact.cpp:653
+msgid "Failed to download Jabber contact photo."
 msgstr ""
 
-#: plugins/pipes/pipesplugin.cpp:303
-#, kde-format
-msgid ""
-"The pipe %1 returned malformed XML to the Pipes plugin.The error is:\n"
-"\n"
-"%2\n"
-"\n"
-"Located at line %3 and column %4"
+#: protocols/jabber/jabberprotocol.cpp:65
+msgid "Free for Chat"
 msgstr ""
 
-#: plugins/webpresence/webpresenceplugin.cpp:205
-msgid ""
-"An error occurred when uploading your presence page.\n"
-"Check the path and write permissions of the destination."
+#: protocols/jabber/jabberprotocol.cpp:68
+#: protocols/jabber/jabbercontact.cpp:194
+#: kopete/config/status/statusconfig_manager.cpp:60
+msgid "Extended Away"
 msgstr ""
 
-#: plugins/webpresence/webpresenceplugin.cpp:215
-msgid "Not yet known"
+#: protocols/jabber/jabberprotocol.cpp:69
+msgid "Do not Disturb"
 msgstr ""
 
-#: protocols/sms/smsprotocol.cpp:40 protocols/wlm/wlmprotocol.cpp:71
-#: protocols/jabber/jabberprotocol.cpp:72 protocols/gadu/gaduprotocol.cpp:89
-#: protocols/yahoo/yahooprotocol.cpp:58
-#: protocols/skype/skypecalldialog.cpp:216
-#: protocols/skype/skypeprotocol.cpp:87 protocols/groupwise/gwprotocol.cpp:70
-#: libkopete/kopeteonlinestatus.cpp:164
-msgid "Connecting"
-msgstr "Cysylltu"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:134
+#. i18n: ectx: property (text), item, widget (KComboBox, cb_type)
+#: protocols/jabber/jabberprotocol.cpp:83
+#: protocols/jabber/ui/privacyruledlg.cpp:41
+#: protocols/jabber/ui/privacyruledlg.cpp:88
+#: protocols/jabber/ui/privacyruledlg.cpp:133 rc.cpp:1499 rc.cpp:1499
+msgid "Subscription"
+msgstr "Tanysgrifiad"
 
-#: protocols/sms/smscontact.cpp:58
-msgid "Something went wrong while sending the message."
+#: protocols/jabber/jabberprotocol.cpp:84
+msgid "Authorization Status"
 msgstr ""
 
-#: protocols/sms/smscontact.cpp:59
-#: protocols/sms/services/smssendprovider.cpp:217
-#: protocols/sms/services/smssendprovider.cpp:225
-#: protocols/sms/services/smssend.cpp:59
-#: protocols/sms/services/smsclient.cpp:68
-msgid "Could Not Send Message"
+#: protocols/jabber/jabberprotocol.cpp:85
+msgid "Available Resources"
 msgstr ""
 
-#: protocols/sms/smscontact.cpp:130
-msgid "&Contact Settings"
+#: protocols/jabber/jabberprotocol.cpp:86
+msgid "vCard Cache Timestamp"
 msgstr ""
 
-#: protocols/sms/smsaccount.cpp:88
-#, kde-format
-msgid ""
-"This message is longer than the maximum length (%1). Should it be divided to "
-"%2 messages?"
+#: protocols/jabber/jabberprotocol.cpp:88
+msgid "Jabber ID"
 msgstr ""
 
-#: protocols/sms/smsaccount.cpp:89
-msgid "Message Too Long"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:206
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: protocols/jabber/jabberprotocol.cpp:89 protocols/yahoo/yahooprotocol.cpp:97
+#: rc.cpp:2223 rc.cpp:2223
+msgid "Birthday"
+msgstr "Penblwydd"
 
-#: protocols/sms/smsaccount.cpp:89
-msgid "Divide"
-msgstr ""
+#: protocols/jabber/jabberprotocol.cpp:90
+msgid "Timezone"
+msgstr "Cylchfa amser:"
 
-#: protocols/sms/smsaccount.cpp:89
-msgid "Do Not Divide"
-msgstr ""
+#: protocols/jabber/jabberprotocol.cpp:91
+msgid "Homepage"
+msgstr "Tudalen gartref"
 
-#: protocols/sms/smsaccount.cpp:153
-msgid "Message too long."
-msgstr ""
+#: protocols/jabber/jabberprotocol.cpp:92
+msgid "Company name"
+msgstr "Enw cwmni"
 
-#: protocols/sms/services/smssendprovider.cpp:216
-msgid "Could not determine which argument should contain the message."
+#: protocols/jabber/jabberprotocol.cpp:93
+msgid "Company Departement"
 msgstr ""
 
-#: protocols/sms/services/smssendprovider.cpp:224
-msgid "Could not determine which argument should contain the number."
+#: protocols/jabber/jabberprotocol.cpp:94
+msgid "Company Position"
 msgstr ""
 
-#: protocols/sms/services/smssend.cpp:59
-msgid "No provider configured."
+#: protocols/jabber/jabberprotocol.cpp:95
+msgid "Company Role"
 msgstr ""
 
-#: protocols/sms/services/smssend.cpp:66
-msgid ""
-"No prefix set for SMSSend, please change it in the configuration dialog."
+#: protocols/jabber/jabberprotocol.cpp:96
+msgid "Work Street"
 msgstr ""
 
-#: protocols/sms/services/smssend.cpp:66
-msgid "No Prefix"
+#: protocols/jabber/jabberprotocol.cpp:97
+msgid "Work Extra Address"
 msgstr ""
 
-#: protocols/sms/services/smssend.cpp:186
-#, kde-format
-msgid "%1 Settings"
+#: protocols/jabber/jabberprotocol.cpp:98
+msgid "Work PO Box"
 msgstr ""
 
-#: protocols/sms/services/smssend.cpp:243
-#, kde-format
-msgid ""
-"<qt>SMSSend is a program for sending SMS through gateways on the web. It can "
-"be found on <a href=\"%1\">%2</a></qt>"
+#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:91
+msgid "Work City"
 msgstr ""
 
-#: protocols/sms/services/gsmlib.cpp:448
-#, kde-format
-msgid ""
-"<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. "
-"The program can be found on <a href=\"%1\">%1</a></qt>"
+#: protocols/jabber/jabberprotocol.cpp:100
+msgid "Work Postal Code"
 msgstr ""
 
-#: protocols/sms/services/smsclient.cpp:68
-msgid "No provider configured"
+#: protocols/jabber/jabberprotocol.cpp:101
+#: protocols/yahoo/yahooprotocol.cpp:94
+msgid "Work Country"
 msgstr ""
 
-#: protocols/sms/services/smsclient.cpp:181
-#, kde-format
-msgid ""
-"<qt>SMSClient is a program for sending SMS with the modem. The program can "
-"be found on <a href=\"%1\">%1</a></qt>"
+#: protocols/jabber/jabberprotocol.cpp:102
+msgid "Work Email Address"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:74
-#. i18n: ectx: property (text), widget (QTableWidget, listServers)
-#: protocols/sms/smseditaccountwidget.cpp:138
-#: protocols/oscar/icq/xtrazstatusmodel.cpp:129
-#: kopete/addaccountwizard/addaccountwizard.cpp:74 rc.cpp:2257 rc.cpp:2257
-msgid "Description"
-msgstr "Disgrifiad"
-
-#: protocols/sms/smsuserpreferences.cpp:31
-msgid "User Preferences"
+#: protocols/jabber/jabberprotocol.cpp:103
+msgid "Home Street"
 msgstr ""
 
-#: protocols/sms/serviceloader.cpp:46
-#, kde-format
-msgid "Could not load service %1."
+#: protocols/jabber/jabberprotocol.cpp:104
+msgid "Home Extra Address"
 msgstr ""
 
-#: protocols/sms/serviceloader.cpp:47
-msgid "Error Loading Service"
+#: protocols/jabber/jabberprotocol.cpp:105
+msgid "Home PO Box"
 msgstr ""
 
-#: protocols/wlm/ui/wlmeditaccountwidget.cpp:213
-#: protocols/wlm/ui/wlmaddcontactpage.cpp:67
-msgid "<qt>You must enter a valid WLM passport.</qt>"
+#: protocols/jabber/jabberprotocol.cpp:106
+msgid "Home City"
 msgstr ""
 
-#: protocols/wlm/ui/wlmeditaccountwidget.cpp:213
-#: protocols/wlm/wlmcontact.cpp:385
-msgid "WLM Plugin"
+#: protocols/jabber/jabberprotocol.cpp:107
+msgid "Home Postal Code"
 msgstr ""
 
-#: protocols/wlm/ui/wlmaddcontactpage.cpp:57
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:67
-#: protocols/oscar/aim/aimprotocol.cpp:180
-#: protocols/groupwise/ui/gwaddcontactpage.cpp:67
-msgid "You need to be connected to be able to add contacts."
+#: protocols/jabber/jabberprotocol.cpp:108
+msgid "Home Country"
 msgstr ""
 
-#: protocols/wlm/ui/wlmaddcontactpage.cpp:58
-#: protocols/irc/ui/channellist.cpp:298 protocols/gadu/gadusession.cpp:220
-#: protocols/gadu/gadusession.cpp:233 protocols/gadu/gadusession.cpp:245
-#: protocols/gadu/gadusession.cpp:278 protocols/gadu/gadusession.cpp:292
-#: protocols/gadu/gadusession.cpp:310 protocols/skype/skypeaddcontact.cpp:69
-#: libkopete/kabcpersistence.cpp:371
-msgid "Not Connected"
-msgstr "Heb gysylltu"
-
-#: protocols/wlm/ui/wlmaddcontactpage.cpp:67
-msgid "MSN Plugin"
-msgstr "Ategyn MSN"
+#: protocols/jabber/jabberprotocol.cpp:109
+msgid "Fax"
+msgstr "Ffacs"
 
-#: protocols/wlm/wlmchatsessioninkarea.cpp:54
-msgid "Select the pen's color"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:511
+#. i18n: ectx: attribute (title), widget (QWidget, tab_9)
+#: protocols/jabber/jabberprotocol.cpp:110 rc.cpp:2924 rc.cpp:2924
+msgid "About"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:59
-msgid "Block Contact"
+#: protocols/jabber/jabberprotocol.cpp:391
+#: protocols/oscar/icq/icqprotocol.cpp:100
+#: protocols/oscar/aim/aimprotocol.cpp:156 libkopete/kabcpersistence.cpp:380
+msgid "Choose Account"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:62 protocols/gadu/gaducontact.cpp:192
-#: protocols/qq/qqcontact.cpp:143
-msgid "Show Profile"
+#: protocols/jabber/jabberprotocol.cpp:397
+#, kde-format
+msgid "Choose an account to handle the URL %1"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:65
-msgid "Update Photo"
+#: protocols/jabber/jabberprotocol.cpp:446
+#: protocols/oscar/aim/aimprotocol.cpp:186
+#, kde-format
+msgid "Do you want to add '%1' to your contact list?"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:69
-msgid "&Block custom emoticons"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:763
+#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:800
+#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:844
+#. i18n: ectx: property (text), widget (QPushButton, ignoreAdd)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, addEmailButton)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:22
+#. i18n: ectx: property (text), widget (QPushButton, buttonAdd)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:777
+#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:863
+#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:173
+#. i18n: ectx: property (text), widget (QPushButton, btnCustomAdd)
+#. i18n: file: plugins/privacy/privacydialog.ui:116
+#. i18n: ectx: property (text), widget (QPushButton, btnAddToBlackList)
+#. i18n: file: plugins/privacy/privacydialog.ui:183
+#. i18n: ectx: property (text), widget (QPushButton, btnAddToWhiteList)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, pbAddStatus)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:763
+#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:800
+#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:844
+#. i18n: ectx: property (text), widget (QPushButton, ignoreAdd)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, addEmailButton)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:22
+#. i18n: ectx: property (text), widget (QPushButton, buttonAdd)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:777
+#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:863
+#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:173
+#. i18n: ectx: property (text), widget (QPushButton, btnCustomAdd)
+#. i18n: file: plugins/privacy/privacydialog.ui:116
+#. i18n: ectx: property (text), widget (QPushButton, btnAddToBlackList)
+#. i18n: file: plugins/privacy/privacydialog.ui:183
+#. i18n: ectx: property (text), widget (QPushButton, btnAddToWhiteList)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, pbAddStatus)
+#: protocols/jabber/jabberprotocol.cpp:447
+#: protocols/oscar/icq/icqprotocol.cpp:131
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:50
+#: protocols/oscar/aim/aimprotocol.cpp:187 rc.cpp:2160 rc.cpp:2169 rc.cpp:2184
+#: rc.cpp:2370 rc.cpp:2453 rc.cpp:2679 rc.cpp:2697 rc.cpp:3629 rc.cpp:4274
+#: rc.cpp:4292 rc.cpp:4533 rc.cpp:5753 kopete/kopetewindow.cpp:379 rc.cpp:2160
+#: rc.cpp:2169 rc.cpp:2184 rc.cpp:2370 rc.cpp:2453 rc.cpp:2679 rc.cpp:2697
+#: rc.cpp:3629 rc.cpp:4274 rc.cpp:4292 rc.cpp:4533 rc.cpp:5753
+msgid "Add"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:176
-#: protocols/jabber/jabbergroupmembercontact.cpp:259
-#: protocols/jabber/jabbercontact.cpp:1095
-#: protocols/jabber/jabbergroupcontact.cpp:328
-#: protocols/oscar/oscarcontact.cpp:363 protocols/gadu/gaducontact.cpp:100
-#: protocols/qq/qqcontact.cpp:418 libkopete/kopetetransfermanager.cpp:488
-msgid "Kopete File Transfer"
-msgstr ""
+#: protocols/jabber/jabberprotocol.cpp:447
+#: protocols/oscar/icq/icqprotocol.cpp:131
+#: protocols/oscar/aim/aimprotocol.cpp:187
+msgid "Do Not Add"
+msgstr "Na Ychwaneger"
 
-#: protocols/wlm/wlmcontact.cpp:384
-msgid ""
-"<qt>You need to go online to remove a contact from your contact list. This "
-"contact will appear again when you reconnect.</qt>"
+#: protocols/jabber/jabberprotocol.cpp:463
+#, kde-format
+msgid "Do you want to remove '%1' from your contact list?"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:428
-msgid "This contact does not have you in his/her list"
+#. i18n: file: protocols/jabber/ui/dlgjabberbookmarkeditor.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#. i18n: file: protocols/jabber/ui/privacy.ui:249
+#. i18n: ectx: property (text), widget (KPushButton, pb_remove)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:756
+#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:793
+#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:837
+#. i18n: ectx: property (text), widget (QPushButton, ignoreRemove)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:76
+#. i18n: ectx: property (text), widget (QPushButton, removeEmailButton)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:784
+#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:856
+#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
+#. i18n: file: plugins/privacy/privacydialog.ui:92
+#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromBlackList)
+#. i18n: file: plugins/privacy/privacydialog.ui:176
+#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromWhiteList)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:66
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:53
+#. i18n: ectx: property (text), widget (QPushButton, pbRemove)
+#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:45
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#. i18n: file: protocols/jabber/ui/dlgjabberbookmarkeditor.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#. i18n: file: protocols/jabber/ui/privacy.ui:249
+#. i18n: ectx: property (text), widget (KPushButton, pb_remove)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:756
+#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:793
+#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:837
+#. i18n: ectx: property (text), widget (QPushButton, ignoreRemove)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:76
+#. i18n: ectx: property (text), widget (QPushButton, removeEmailButton)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:784
+#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:856
+#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
+#. i18n: file: plugins/privacy/privacydialog.ui:92
+#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromBlackList)
+#. i18n: file: plugins/privacy/privacydialog.ui:176
+#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromWhiteList)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:66
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:53
+#. i18n: ectx: property (text), widget (QPushButton, pbRemove)
+#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:45
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: protocols/jabber/jabberprotocol.cpp:464 libkopete/kopetecontact.cpp:452
+#: rc.cpp:999 rc.cpp:1538 rc.cpp:2157 rc.cpp:2166 rc.cpp:2181 rc.cpp:2373
+#: rc.cpp:2682 rc.cpp:2694 rc.cpp:4268 rc.cpp:4289 rc.cpp:4536 rc.cpp:5756
+#: rc.cpp:5877 kopete/contactlist/kopetecontactlistview.cpp:397
+#: kopete/contactlist/kopetecontactlistview.cpp:412
+#: kopete/contactlist/kopetecontactlistview.cpp:837 rc.cpp:999 rc.cpp:1538
+#: rc.cpp:2157 rc.cpp:2166 rc.cpp:2181 rc.cpp:2373 rc.cpp:2682 rc.cpp:2694
+#: rc.cpp:4268 rc.cpp:4289 rc.cpp:4536 rc.cpp:5756 rc.cpp:5877
+msgid "Remove"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:435
-msgid "This contact is blocked"
+#: protocols/jabber/jabberprotocol.cpp:464
+msgid "Do Not Remove"
 msgstr ""
 
-#: protocols/wlm/wlmcontact.cpp:437
-msgid "This contact does not have you in his/her list and is blocked"
+#: protocols/jabber/jabberprotocol.cpp:486
+#, kde-format
+msgid "Please enter your nickname for the room %1"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:76 protocols/yahoo/yahooaccount.cpp:88
-msgid "Open Inbo&x..."
+#: protocols/jabber/jabberprotocol.cpp:487
+#: protocols/jabber/jabberaccount.cpp:1575
+msgid "Provide your nickname"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:79
-msgid "&Change Display Name..."
+#: protocols/jabber/jabberprotocol.cpp:509
+#: protocols/jabber/jabbergroupchatmanager.cpp:149
+#, kde-format
+msgid "You have been invited to %1"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:85
-msgid "Open MS&N service status site..."
+#: protocols/jabber/jabbergroupmembercontact.cpp:197
+#: protocols/jabber/jabbercontact.cpp:401
+#: protocols/jabber/jabbergroupcontact.cpp:182
+#, kde-format
+msgid "Your message could not be delivered: \"%1\", Reason: \"%2\""
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:141 protocols/wlm/wlmaccount.cpp:143
-#: protocols/oscar/oscaraccount.cpp:295 protocols/oscar/oscaraccount.cpp:903
-#: protocols/oscar/oscaraccount.cpp:909
-msgid "Buddies"
+#: protocols/jabber/jabbergroupmembercontact.cpp:259
+#: protocols/jabber/jabbercontact.cpp:1095
+#: protocols/jabber/jabbergroupcontact.cpp:328
+#: protocols/wlm/wlmcontact.cpp:176 protocols/oscar/oscarcontact.cpp:363
+#: protocols/qq/qqcontact.cpp:418 protocols/gadu/gaducontact.cpp:100
+#: libkopete/kopetetransfermanager.cpp:488
+msgid "Kopete File Transfer"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:244 protocols/wlm/wlmaccount.cpp:255
-msgid "Change Display Name - MSN Plugin"
+#: protocols/jabber/jabbertransport.cpp:136 libkopete/kopeteaccount.cpp:473
+#, kde-format
+msgid "%2 <%1>"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:245
-msgid ""
-"Enter the new display name by which you want to be visible to your friends "
-"on MSN:"
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:319
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3_2)
+#: protocols/jabber/jabbercontact.cpp:141 rc.cpp:122 rc.cpp:122
+msgid "Authorization"
+msgstr "Awdurdodi"
 
-#: protocols/wlm/wlmaccount.cpp:253
-msgid ""
-"<qt>The display name you entered is too long. Please use a shorter name.\n"
-"Your display name has <b>not</b> been changed.</qt>"
+#: protocols/jabber/jabbercontact.cpp:154
+msgid "(Re)request Authorization From"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:1157
-#, kde-format
-msgid "You have one unread message in your Hotmail inbox."
-msgid_plural "You have %1 unread messages in your Hotmail inbox."
-msgstr[0] ""
-msgstr[1] ""
-
-#: protocols/wlm/wlmaccount.cpp:1159 protocols/wlm/wlmaccount.cpp:1174
-msgctxt "@action"
-msgid "Open Inbox"
+#: protocols/jabber/jabbercontact.cpp:173
+msgid "Call Google Talk contact"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:1159 protocols/wlm/wlmaccount.cpp:1175
-#: protocols/yahoo/yahooaccount.cpp:1170 protocols/yahoo/yahooaccount.cpp:1613
-#: protocols/yahoo/yahooaccount.cpp:1824
-#: libkopete/private/kopeteviewmanager.cpp:412
-msgctxt "@action"
-msgid "Close"
+#: protocols/jabber/jabbercontact.cpp:182
+msgid "Set Availability"
 msgstr ""
 
-#: protocols/wlm/wlmaccount.cpp:1173
-#, kde-format
-msgid "New message from %1 in your Hotmail inbox.<p>Subject: %2"
+#: protocols/jabber/jabbercontact.cpp:192
+msgid "Free to Chat"
 msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:32
-msgid "WLM"
+#: protocols/jabber/jabbercontact.cpp:200
+msgid "Select Resource"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:68
-#. i18n: ectx: property (text), widget (QRadioButton, onlineButton_)
-#: protocols/wlm/wlmprotocol.cpp:43 protocols/bonjour/bonjourprotocol.cpp:37
-#: protocols/oscar/icq/icqstatusmanager.cpp:87
-#: protocols/oscar/aim/aimstatusmanager.cpp:79 protocols/qq/qqprotocol.cpp:36
-#: rc.cpp:3169 rc.cpp:3169
-msgid "O&nline"
-msgstr "A&r-lein"
-
-#: protocols/wlm/wlmprotocol.cpp:46
-#: protocols/oscar/icq/icqstatusmanager.cpp:83
-#: protocols/oscar/aim/aimstatusmanager.cpp:75 protocols/qq/qqprotocol.cpp:38
-#: protocols/groupwise/gwprotocol.cpp:58 kopete/kopetewindow.cpp:397
-msgid "&Away"
-msgstr "&I ffwrdd"
+#: protocols/jabber/jabbercontact.cpp:217
+msgid "Automatic (best/default resource)"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:84
-#. i18n: ectx: property (text), widget (QRadioButton, awayButton_)
-#: protocols/wlm/wlmprotocol.cpp:48 protocols/groupwise/gwprotocol.cpp:56
-#: kopete/kopetewindow.cpp:401 rc.cpp:3179 rc.cpp:3179
-msgid "&Busy"
-msgstr "&Prysur"
+#: protocols/jabber/jabbercontact.cpp:270
+msgid "Test action"
+msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:50
-msgid "Be Right Back"
+#: protocols/jabber/jabbercontact.cpp:274
+msgid "Jingle Audio call"
 msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:51
-msgid "Be &Right Back"
+#: protocols/jabber/jabbercontact.cpp:277
+msgid "Jingle Video call"
 msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:53
-msgid "On the Phone"
+#: protocols/jabber/jabbercontact.cpp:317
+#, kde-format
+msgid "The original message is : <i>\" %1 \"</i><br />"
 msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:54
-msgid "On The &Phone"
+#: protocols/jabber/jabbercontact.cpp:318
+#, kde-format
+msgid ""
+"<qt><i>%1</i> has invited you to join the conference <b>%2</b><br />%3<br "
+"/>If you want to accept and join, just <b>enter your nickname</b> and press "
+"OK.<br />If you want to decline, press Cancel.</qt>"
 msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:56
-msgid "Out to Lunch"
+#: protocols/jabber/jabbercontact.cpp:324
+msgid "Invited to a conference - Jabber Plugin"
 msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:57
-msgid "Out To &Lunch"
+#: protocols/jabber/jabbercontact.cpp:341
+msgid "Message has been displayed"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:812
-#. i18n: ectx: attribute (title), widget (QWidget, tabInvisible)
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:142
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:812
-#. i18n: ectx: attribute (title), widget (QWidget, tabInvisible)
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:142
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_initialStatus)
-#: protocols/wlm/wlmprotocol.cpp:59 protocols/jabber/jabbercontact.cpp:196
-#: protocols/jabber/jabberprotocol.cpp:71
-#: protocols/oscar/icq/icqstatusmanager.cpp:92
-#: protocols/oscar/aim/aimstatusmanager.cpp:85
-#: protocols/gadu/gaduprotocol.cpp:74 protocols/gadu/gaduprotocol.cpp:79
-#: protocols/yahoo/yahooprotocol.cpp:55 protocols/skype/skypeaccount.cpp:946
-#: protocols/skype/skypeprotocol.cpp:86 libkopete/kopeteonlinestatus.cpp:167
-#: libkopete/kopetestatusmanager.cpp:290
-#: kopete/config/status/statusconfig_manager.cpp:66 rc.cpp:3095 rc.cpp:5621
-#: rc.cpp:3095 rc.cpp:5621
-msgid "Invisible"
+#: protocols/jabber/jabbercontact.cpp:344
+msgid "Message has been delivered"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:100
-#. i18n: ectx: property (text), widget (QRadioButton, invisibleButton_)
-#: protocols/wlm/wlmprotocol.cpp:60 kopete/kopetewindow.cpp:406 rc.cpp:3189
-#: rc.cpp:3189
-msgid "&Invisible"
+#: protocols/jabber/jabbercontact.cpp:350
+msgid "Message stored on the server, contact offline"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:116
-#. i18n: ectx: property (text), widget (QRadioButton, offlineButton_)
-#: protocols/wlm/wlmprotocol.cpp:62 protocols/bonjour/bonjourprotocol.cpp:42
-#: protocols/oscar/icq/icqstatusmanager.cpp:75
-#: protocols/oscar/aim/aimstatusmanager.cpp:67
-#: protocols/gadu/gaduprotocol.cpp:58 protocols/qq/qqprotocol.cpp:40
-#: protocols/groupwise/gwprotocol.cpp:52 rc.cpp:3199 rc.cpp:3199
-msgid "O&ffline"
-msgstr "A&ll-lein"
+#: protocols/jabber/jabbercontact.cpp:358
+#, kde-format
+msgid "%1 has ended his/her participation in the chat session."
+msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:66
-#: protocols/meanwhile/meanwhileprotocol.cpp:54
-#: protocols/yahoo/yahooprotocol.cpp:57 protocols/groupwise/gwprotocol.cpp:60
-#: kopete/config/status/statusconfig_manager.cpp:64
-msgid "Idle"
-msgstr "Segur"
+#: protocols/jabber/jabbercontact.cpp:994
+#, kde-format
+msgid ""
+"Do you also want to remove user %1's authorization to see your status?"
+msgstr ""
 
-#: protocols/wlm/wlmprotocol.cpp:66
-msgid "&Idle"
-msgstr "&Segur"
+#: protocols/jabber/jabbercontact.cpp:995
+#: protocols/jabber/jabberaccount.cpp:1175
+msgid "Notification"
+msgstr "Hysbysiad"
 
-#: protocols/wlm/wlmprotocol.cpp:69 libkopete/kopetemetacontact.cpp:505
-msgid "Status not available"
-msgstr ""
+#: protocols/jabber/jabbercontact.cpp:996
+#: protocols/jabber/jabberaccount.cpp:1175 plugins/history/converter.cpp:42
+msgid "Keep"
+msgstr "Cadw"
 
-#: protocols/wlm/wlmprotocol.cpp:72
-msgctxt "This is used in the tooltip of a contact"
-msgid "Listening To"
+#: protocols/jabber/jabbercontact.cpp:1166
+#, kde-format
+msgid ""
+"You have preselected a resource for contact %1, but you still have open chat "
+"windows for this contact. The preselected resource will only apply to newly "
+"opened chat windows."
 msgstr ""
 
-#: protocols/wlm/wlmchatsessioninkaction.cpp:62
-msgid "Send Ink"
+#: protocols/jabber/jabbercontact.cpp:1170
+msgid "Jabber Resource Selector"
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:112
-msgid "Send Nudge"
+#: protocols/jabber/jabberaccount.cpp:203
+msgid ""
+"Could not bind the Jabber file transfer manager to a local port. Please "
+"check if the file transfer port is already in use, or choose another port in "
+"the account settings."
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:119
-#: protocols/skype/skypechatsession.cpp:125
-#: protocols/skype/skypechatsession.cpp:163 protocols/qq/qqchatsession.cpp:67
-#: protocols/groupwise/gwmessagemanager.cpp:77
-msgid "&Invite"
-msgstr "G&wahodd"
+#: protocols/jabber/jabberaccount.cpp:204
+msgid "Failed to start Jabber File Transfer Manager"
+msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:142
-msgid "Send &Voice"
+#: protocols/jabber/jabberaccount.cpp:220
+msgid "Join Groupchat..."
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:149
-msgid "Sound card not detected"
+#: protocols/jabber/jabberaccount.cpp:234
+msgid "Services..."
+msgstr "Gwasanaethau ..."
+
+#: protocols/jabber/jabberaccount.cpp:241
+#: protocols/jabber/ui/dlgxmppconsole.cpp:28
+msgid "XML Console"
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:157
-msgid "Stop &recording"
+#: protocols/jabber/jabberaccount.cpp:247
+#: protocols/oscar/icq/icqaccount.cpp:137
+#: protocols/oscar/aim/aimaccount.cpp:236
+msgid "Edit User Info..."
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:286
-msgid "The other contact needs to be online to receive voice clips."
+#: protocols/jabber/jabberaccount.cpp:252
+msgid "Set Mood"
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:298
-msgid "You cannot send voice clips in invisible status"
+#: protocols/jabber/jabberaccount.cpp:311
+msgid "Please connect first."
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:345
-msgid "The maximum recording time is 15 seconds"
+#: protocols/jabber/jabberaccount.cpp:311
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:94
+#: protocols/jabber/ui/dlgregister.cpp:73
+#: protocols/jabber/ui/dlgjabberchatjoin.cpp:143
+#: protocols/jabber/ui/dlgsearch.cpp:73
+#: protocols/jabber/ui/dlgjabberregister.cpp:53
+msgid "Jabber Error"
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:389
-msgid "The voice clip must be longer"
+#: protocols/jabber/jabberaccount.cpp:435
+#, kde-format
+msgid ""
+"SSL support could not be initialized for account %1. This is most likely "
+"because TLS support for QCA is not available."
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:663
-msgid "has sent a nudge"
+#: protocols/jabber/jabberaccount.cpp:437
+#: protocols/jabber/ui/jabberregisteraccount.cpp:273
+msgid "Jabber SSL Error"
 msgstr ""
 
-#: protocols/wlm/wlmchatsession.cpp:1080
-msgid "has sent you a nudge"
+#: protocols/jabber/jabberaccount.cpp:562
+msgid "Jabber Connection Certificate Problem"
 msgstr ""
 
-#: protocols/wlm/wlmtransfermanager.cpp:113
-#: protocols/wlm/wlmtransfermanager.cpp:246
-#: protocols/wlm/wlmtransfermanager.cpp:252
-msgid "File transfer cancelled."
+#: protocols/jabber/jabberaccount.cpp:596
+msgid ""
+"An encrypted connection with the Jabber server could not be established."
 msgstr ""
 
-#: protocols/meanwhile/meanwhileaccount.cpp:142
-msgid "&Change Status Message"
+#: protocols/jabber/jabberaccount.cpp:597
+msgid "Jabber Connection Error"
 msgstr ""
 
-#: protocols/meanwhile/meanwhileaccount.cpp:212
-msgid "Meanwhile Plugin: Message from server"
+#: protocols/jabber/jabberaccount.cpp:799
+msgid "Malformed packet received."
 msgstr ""
 
-#: protocols/meanwhile/meanwhileprotocol.cpp:58
-#: libkopete/kopeteprotocol.cpp:60
-msgid "Account Offline"
-msgstr "Cyfrif All-lein"
+#: protocols/jabber/jabberaccount.cpp:804
+msgid "There was an unrecoverable error in the protocol."
+msgstr ""
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:148
-#: protocols/yahoo/yahooeditaccount.cpp:105
-#: protocols/winpopup/wpeditaccount.cpp:104
-msgid "<qt>You must enter a valid screen name.</qt>"
+#: protocols/jabber/jabberaccount.cpp:811
+msgid "Generic stream error."
 msgstr ""
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:149
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:156
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:163
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:170
-#: protocols/meanwhile/meanwhilesession.cpp:207
-#: protocols/meanwhile/meanwhilesession.cpp:611
-msgid "Meanwhile Plugin"
+#: protocols/jabber/jabberaccount.cpp:815
+msgid "There was a conflict in the information received."
 msgstr ""
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:155
-msgid ""
-"<qt>You must deselect password remembering or enter a valid password.</qt>"
+#: protocols/jabber/jabberaccount.cpp:818
+msgid "The stream timed out."
 msgstr ""
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:162
-msgid "<qt>You must enter the server's hostname/ip address.</qt>"
+#: protocols/jabber/jabberaccount.cpp:821
+msgid "Internal server error."
 msgstr ""
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:169
-msgid "<qt>0 is not a valid port number.</qt>"
+#: protocols/jabber/jabberaccount.cpp:824
+msgid "Stream packet received from an invalid address."
 msgstr ""
 
-#: protocols/meanwhile/meanwhilesession.cpp:207
-msgid "Could not connect to server"
+#: protocols/jabber/jabberaccount.cpp:827
+msgid "Malformed stream packet received."
 msgstr ""
 
-#: protocols/meanwhile/meanwhilesession.cpp:610
-msgid "Could not connect to redirected server"
+#: protocols/jabber/jabberaccount.cpp:831
+msgid "Policy violation in the protocol stream."
 msgstr ""
 
-#: protocols/meanwhile/meanwhilesession.cpp:1002
-msgid "Meanwhile Plugin: Conference invitation"
+#: protocols/jabber/jabberaccount.cpp:835
+msgid "Resource constraint."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:155
+#: protocols/jabber/jabberaccount.cpp:839
+msgid "System shutdown."
+msgstr ""
+
+#: protocols/jabber/jabberaccount.cpp:842
+msgid "Unknown reason."
+msgstr ""
+
+#: protocols/jabber/jabberaccount.cpp:846
 #, kde-format
-msgid "Temporary Network - %1"
+msgid "There was an error in the protocol stream: %1"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:156
-msgid "Network imported from previous version of Kopete, or an IRC URI"
+#: protocols/jabber/jabberaccount.cpp:854
+msgid "Host not found."
+msgstr "Ni chafwyd gweinydd."
+
+#: protocols/jabber/jabberaccount.cpp:857
+msgid "Address is already in use."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:188
-msgid "Join Channel..."
-msgstr "Ymuno â'r Sianel..."
+#: protocols/jabber/jabberaccount.cpp:860
+msgid "Connection refused."
+msgstr "Gwrthodwyd y cysylltiad."
 
-#: protocols/irc/ircaccount.cpp:190
-msgid "Search Channels..."
+#: protocols/jabber/jabberaccount.cpp:863
+msgid "Connection attempt already in progress."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:259
-msgid ""
-"<qt>The network associated with this account has no valid hosts. Please "
-"ensure that the account has a valid network.</qt>"
+#: protocols/jabber/jabberaccount.cpp:866
+msgid "Network failure."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:261 protocols/irc/ircaccount.cpp:269
-msgid "Network is Empty"
+#: protocols/jabber/jabberaccount.cpp:869
+msgid "Socket timed out."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:267
+#: protocols/jabber/jabberaccount.cpp:872
+msgid "Remote closed connection."
+msgstr ""
+
+#: protocols/jabber/jabberaccount.cpp:876
 #, kde-format
-msgid ""
-"<qt>The network associated with this account, <b>%1</b>, has no valid hosts. "
-"Please ensure that the account has a valid network.</qt>"
+msgid "Unexpected error condition (%1)."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:275
+#: protocols/jabber/jabberaccount.cpp:880
 #, kde-format
-msgid ""
-"<qt>Kopete could not connect to any of the servers in the network associated "
-"with this account (<b>%1</b>). Please try again later.</qt>"
+msgid "There was a connection error: %1"
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:278
-msgid "Network is Unavailable"
+#: protocols/jabber/jabberaccount.cpp:888
+msgid "Unknown host."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:586
-msgid "Join Channel"
+#: protocols/jabber/jabberaccount.cpp:892
+msgid "Could not connect to a required remote resource."
 msgstr ""
 
-#: protocols/irc/ircaccount.cpp:587 protocols/irc/ui/ircdialogs.cpp:59
-msgid "Please enter the name of the channel you want to join:"
+#: protocols/jabber/jabberaccount.cpp:895
+msgid ""
+"It appears we have been redirected to another server; I do not know how to "
+"handle this."
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:25
+#: protocols/jabber/jabberaccount.cpp:898
+msgid "Unsupported protocol version."
+msgstr ""
+
+#: protocols/jabber/jabberaccount.cpp:901
+#: protocols/jabber/jabberaccount.cpp:918
+#: protocols/jabber/jabberaccount.cpp:962
+#: protocols/jabber/jabberaccount.cpp:979
+#: protocols/jabber/jabberaccount.cpp:996
+#: protocols/jabber/jabberaccount.cpp:1004
+msgid "Unknown error."
+msgstr "Gwall anhysbys."
+
+#: protocols/jabber/jabberaccount.cpp:905
 #, kde-format
-msgid "The nickname %1 is already in use"
+msgid "There was a negotiation error: %1"
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:25 protocols/irc/ui/ircdialogs.cpp:34
-#: protocols/irc/ui/ircdialogs.cpp:93
-msgid "IRC Plugin"
+#: protocols/jabber/jabberaccount.cpp:912
+msgid "Server rejected our request to start the TLS handshake."
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:35
-#, kde-format
-msgid ""
-"The nickname %1 is already in use. Please enter an alternative nickname:"
+#: protocols/jabber/jabberaccount.cpp:915
+msgid "Failed to establish a secure connection."
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:92
+#: protocols/jabber/jabberaccount.cpp:922
 #, kde-format
-msgid ""
-"\"%1\" is an invalid channel name. Channels must start with '#', '!', '+', "
-"or '&'."
+msgid "There was a Transport Layer Security (TLS) error: %1"
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:103
-#, kde-format
-msgid "Channel List for %1"
+#: protocols/jabber/jabberaccount.cpp:929
+msgid "Login failed with unknown reason."
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:122
-msgid "The IRC server is currently too busy to respond to this request."
+#: protocols/jabber/jabberaccount.cpp:932
+msgid "No appropriate authentication mechanism available."
 msgstr ""
 
-#: protocols/irc/ui/ircdialogs.cpp:123
-msgid "Server is Busy"
+#: protocols/jabber/jabberaccount.cpp:935
+msgid "Bad SASL authentication protocol."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:190
-msgid " members"
+#: protocols/jabber/jabberaccount.cpp:938
+msgid "Server failed mutual authentication."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:198 protocols/irc/ui/channellist.cpp:221
-msgid "Channel"
-msgstr "Sianel"
+#: protocols/jabber/jabberaccount.cpp:941
+msgid "Encryption is required but not present."
+msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:199 protocols/irc/ui/channellist.cpp:222
-msgid "Users"
-msgstr "Defnyddwyr"
-
-#: protocols/irc/ui/channellist.cpp:201 protocols/irc/ui/channellist.cpp:223
-msgid "Topic"
+#: protocols/jabber/jabberaccount.cpp:944
+msgid "Invalid user ID."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:209
-msgid "Search for:"
-msgstr "Chwilio am:"
-
-#: protocols/irc/ui/channellist.cpp:210
-msgid ""
-"You may search for channels on the IRC server, using a text string entered "
-"here."
+#: protocols/jabber/jabberaccount.cpp:947
+msgid "Invalid mechanism."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:211 protocols/irc/ui/channellist.cpp:212
-msgid "Channels returned must have at least this many members."
+#: protocols/jabber/jabberaccount.cpp:950
+msgid "Invalid realm."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:213 protocols/irc/ui/channellist.cpp:215
-msgid ""
-"You may search for channels on the IRC server, using a text string entered "
-"here.  For instance, you may type 'linux' to find channels that have "
-"something to do with Linux."
+#: protocols/jabber/jabberaccount.cpp:953
+msgid "Mechanism too weak."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:214
-msgid ""
-"You may search for channels on the IRC server for a text string entered here."
+#: protocols/jabber/jabberaccount.cpp:956
+msgid "Wrong credentials supplied. (check your user ID and password)"
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:216 protocols/gadu/gadupubdir.cpp:120
-#: protocols/gadu/gadupubdir.cpp:297
-msgid "S&earch"
-msgstr "C&hwilio"
+#: protocols/jabber/jabberaccount.cpp:959
+msgid "Temporary failure, please try again later."
+msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:217
-msgid "Perform a channel search."
+#: protocols/jabber/jabberaccount.cpp:966
+#, kde-format
+msgid "There was an error authenticating with the server: %1"
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:218
-msgid ""
-"Perform a channel search.  Please be patient, as this can be slow, depending "
-"on the total number of channels on the server."
+#: protocols/jabber/jabberaccount.cpp:973
+msgid "Transport Layer Security (TLS) problem."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:220
-msgid "Double click on a channel to select it."
+#: protocols/jabber/jabberaccount.cpp:976
+msgid "Simple Authentication and Security Layer (SASL) problem."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:297
-msgid "You must be connected to the IRC server to perform a channel listing."
+#: protocols/jabber/jabberaccount.cpp:983
+#, kde-format
+msgid "There was an error in the security layer: %1"
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:336
-msgid "You have been disconnected from the IRC server."
+#: protocols/jabber/jabberaccount.cpp:990
+msgid "No permission to bind the resource."
 msgstr ""
 
-#: protocols/irc/ui/channellist.cpp:337
-msgid "Disconnected"
-msgstr "Datgysylltwyd"
+#: protocols/jabber/jabberaccount.cpp:993
+msgid "The resource is already in use."
+msgstr ""
 
-#: protocols/irc/ui/ircaddcontactpage.cpp:79
-msgid "<qt>You need to specify a channel to join, or a query to open.</qt>"
+#: protocols/jabber/jabberaccount.cpp:1000
+#, kde-format
+msgid "Could not bind a resource: %1"
 msgstr ""
 
-#: protocols/irc/ui/ircaddcontactpage.cpp:79
-msgid "You Must Specify a Channel"
+#: protocols/jabber/jabberaccount.cpp:1013
+#, kde-format
+msgid "Kopete: Connection problem with Jabber server %1"
 msgstr ""
 
-#: protocols/irc/ui/irceditaccountwidget.cpp:280
-msgid "<qt>You must enter a nickname.</qt>"
+#: protocols/jabber/jabberaccount.cpp:1172
+#, kde-format
+msgid ""
+"The Jabber user %1 removed %2's subscription to him/her. This account will "
+"no longer be able to view his/her online/offline status. Do you want to "
+"delete the contact?"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:516
-#. i18n: ectx: property (text), widget (QLineEdit, mResource)
-#: protocols/irc/ui/irceditaccountwidget.cpp:280
-#: protocols/oscar/liboscar/userdetails.cpp:600 kopete/kopetewindow.cpp:1114
-#: kopete/main.cpp:32 rc.cpp:1991 rc.cpp:1991
-msgid "Kopete"
-msgstr "Kopete"
+#: protocols/jabber/jabberaccount.cpp:1348
+msgid "Waiting for authorization"
+msgstr "Yn aros am awdurdodiad"
 
-#: protocols/irc/ui/networkconfigwidget.cpp:282
+#: protocols/jabber/jabberaccount.cpp:1565
 #, kde-format
-msgid ""
-"<qt>Are you sure you want to delete the network <b>%1</b>?<br>Any accounts "
-"which use this network will have to be modified.</qt>"
+msgid "A password is required to join the room %1."
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:284
-msgid "Deleting Network"
+#: protocols/jabber/jabberaccount.cpp:1574
+#, kde-format
+msgid "Error trying to join %1 : nickname %2 is already in use"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:285
-msgid "&Delete Network"
+#: protocols/jabber/jabberaccount.cpp:1588
+#, kde-format
+msgid "You cannot join the room %1 because you have been banned"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:297
+#: protocols/jabber/jabberaccount.cpp:1589
+#: protocols/jabber/jabberaccount.cpp:1596
+#: protocols/jabber/jabberaccount.cpp:1606
+msgid "Jabber Group Chat"
+msgstr ""
+
+#: protocols/jabber/jabberaccount.cpp:1595
 #, kde-format
-msgid "<qt>Are you sure you want to delete the host <b>%1</b>?</qt>"
+msgid ""
+"You cannot join the room %1 because the maximum number of users has been "
+"reached"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:298
-msgid "Deleting Host"
+#: protocols/jabber/jabberaccount.cpp:1601
+msgid "No reason given by the server"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:299
-msgid "&Delete Host"
+#: protocols/jabber/jabberaccount.cpp:1605
+#, kde-format
+msgid ""
+"There was an error processing your request for groupchat %1. (Reason: %2, "
+"Code %3)"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:352
-msgid "New Host"
+#: protocols/jabber/jabberaccount.cpp:1678
+#, kde-format
+msgid ""
+"Do you want to also unregister \"%1\" from the Jabber server ?\n"
+"If you unregister, your whole contact list may be removed from the server, "
+"and you will never be able to connect to this account with any client"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:353
-msgid "Enter the hostname of the new server:"
+#: protocols/jabber/jabberaccount.cpp:1681
+msgid "Unregister"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:362
-msgid "A host already exists with that name"
+#: protocols/jabber/jabberaccount.cpp:1682
+msgid "Remove and Unregister"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:390
-msgid "Rename Network"
+#: protocols/jabber/jabberaccount.cpp:1683
+msgid "Remove only from Kopete"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:391
-msgid "Enter the new name for this network:"
+#: protocols/jabber/jabberaccount.cpp:1727
+#, kde-format
+msgid ""
+"An error occurred while trying to remove the account:\n"
+"%1"
 msgstr ""
 
-#: protocols/irc/ui/networkconfigwidget.cpp:401
-msgid "A network already exists with that name"
+#: protocols/jabber/jabberaccount.cpp:1728
+msgid "Jabber Account Unregistration"
 msgstr ""
 
-#: protocols/irc/libkirc/plugins/ctcp/kirctransfer.cpp:358
-msgid "Acknowledge size is greater than the expected file size"
+#: protocols/jabber/jabberbookmarks.cpp:236
+#: protocols/jabber/jabberbookmarks.cpp:253
+msgid "Edit Bookmarks..."
 msgstr ""
 
-#: protocols/irc/libkirc/client/kircclientchannelhandler.cpp:665
-#: protocols/irc/libkirc/client/kircclienthandler.cpp:756
-msgid "Password Incorect"
+#: protocols/jabber/jabberbookmarks.cpp:241
+msgid "Groupchat Bookmark"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:366
-#, kde-format
-msgid "There is 1 operator online."
-msgid_plural "There are %1 operators online."
-msgstr[0] ""
-msgstr[1] ""
+#: protocols/jabber/jabberfiletransfer.cpp:175
+#: protocols/gadu/gadudcctransaction.cpp:234
+msgid "&Resume"
+msgstr "Ai&l-ddechrau"
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:374
-#, kde-format
-msgid "There is 1 unknown connection."
-msgid_plural "There are %1 unknown connections."
-msgstr[0] ""
-msgstr[1] ""
+#: protocols/jabber/jabberfiletransfer.cpp:176
+#: protocols/gadu/gadudcctransaction.cpp:235
+msgid "Over&write"
+msgstr "Tros&ysgrifo"
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:382
+#: protocols/jabber/jabberfiletransfer.cpp:179
+#: protocols/gadu/gadudcctransaction.cpp:237
 #, kde-format
-msgid "There has been 1 channel formed."
-msgid_plural "There have been %1 channels formed."
-msgstr[0] ""
-msgstr[1] ""
+msgid "The file %1 already exists, do you want to resume or overwrite it?"
+msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:400
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:204
+#: protocols/jabber/jabberfiletransfer.cpp:180
+#: protocols/gadu/gadudcctransaction.cpp:238
 #, kde-format
-msgid "Server was too busy to execute %1."
-msgstr ""
+msgid "File Exists: %1"
+msgstr "Ffeil yn Bodoli : %1"
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:466
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:270
-msgid "You have been marked as being away."
+#: protocols/jabber/jingle/jinglecontentdialog.cpp:29
+msgid "Audio"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:474
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:278
-#, kde-format
-msgid "%1 is a registered nick."
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, AVDeviceConfig_VideoDevice)
+#: protocols/jabber/jingle/jinglecontentdialog.cpp:32 rc.cpp:5720 rc.cpp:5720
+msgid "Video"
+msgstr "Fideo"
+
+#: protocols/jabber/jingle/jinglecontentdialog.cpp:35
+#: libkopete/kopetetransfermanager.cpp:532
+#: libkopete/kopetetransfermanager.cpp:581
+msgid "File Transfer"
+msgstr "Trosglwyddo ffeiliau"
+
+#: protocols/jabber/jingle/jinglecontentdialog.cpp:74
+msgid "Choose the contents you want to accept:"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:498
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:302
+#: protocols/jabber/jingle/jinglecontentdialog.cpp:81
 #, kde-format
-msgid "%1 is an IRC operator."
+msgid "New Jingle session from %1"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:711
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:513
-#, kde-format
-msgid "You cannot send messages to channel %1."
+#: protocols/jabber/jabberchatsession.cpp:74
+msgid "Show audio calls"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:752
-#, kde-format
-msgid "Nickname %1 is already in use."
+#: protocols/jabber/jabberchatsession.cpp:79
+msgid "Start audio call"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:759
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:562
+#: protocols/jabber/jabberchatsession.cpp:159
 #, kde-format
-msgid "You are not on channel %1."
+msgctxt "a contact's online status in parenthesis."
+msgid " (%1)"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:769
-#: protocols/gadu/gadusession.cpp:668
-msgid "Incorrect password."
-msgstr "Cyfrinair anghywir."
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:57
+msgid "Loading instructions from gateway..."
+msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:780
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:582
-#, kde-format
-msgid "Cannot join %1, channel is full."
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:69
+msgid "Connect to the Jabber network and try again."
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:791
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:593
-#, kde-format
-msgid "Cannot join %1, channel is invite only."
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:158
+msgid "An error occurred while loading instructions from the gateway."
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:799
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:601
-#, kde-format
-msgid "Cannot join %1, you are banned from that channel."
+#. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:50
+#. i18n: ectx: property (text), widget (QPushButton, clear_btn)
+#. i18n: file: plugins/privacy/privacydialog.ui:85
+#. i18n: ectx: property (text), widget (QPushButton, btnClearBlackList)
+#. i18n: file: plugins/privacy/privacydialog.ui:190
+#. i18n: ectx: property (text), widget (QPushButton, btnClearWhiteList)
+#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:43
+#. i18n: ectx: property (toolTip), widget (KPushButton, btnClear)
+#. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:50
+#. i18n: ectx: property (text), widget (QPushButton, clear_btn)
+#. i18n: file: plugins/privacy/privacydialog.ui:85
+#. i18n: ectx: property (text), widget (QPushButton, btnClearBlackList)
+#. i18n: file: plugins/privacy/privacydialog.ui:190
+#. i18n: ectx: property (text), widget (QPushButton, btnClearWhiteList)
+#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:43
+#. i18n: ectx: property (toolTip), widget (KPushButton, btnClear)
+#: protocols/jabber/ui/dlgxmppconsole.cpp:31 rc.cpp:1769 rc.cpp:4265
+#: rc.cpp:4295 rc.cpp:5291 rc.cpp:1769 rc.cpp:4265 rc.cpp:4295 rc.cpp:5291
+msgid "Clear"
 msgstr ""
 
-#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:807
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:609
-#, kde-format
-msgid "Cannot join %1, wrong channel key was given."
+#. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:43
+#. i18n: ectx: property (text), widget (QPushButton, send_btn)
+#: protocols/jabber/ui/dlgxmppconsole.cpp:32 rc.cpp:1766
+#: kopete/chatwindow/kopeteemailwindow.cpp:499
+#: kopete/chatwindow/kopeteemailwindow.cpp:517 rc.cpp:1766
+msgid "Send"
+msgstr "Anfon"
+
+#: protocols/jabber/ui/dlgjabberbookmarkeditor.cpp:138
+msgid "Group Chat Name"
 msgstr ""
 
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:172
-#, kde-format
-msgid "There is one operator online."
-msgid_plural "There are %1 operators online."
-msgstr[0] ""
-msgstr[1] ""
+#: protocols/jabber/ui/dlgjabberbookmarkeditor.cpp:139
+msgid "Enter a name for the group chat:"
+msgstr ""
 
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:180
-#, kde-format
-msgid "There is one unknown connection."
-msgid_plural "There are %1 unknown connections."
-msgstr[0] ""
-msgstr[1] ""
+#: protocols/jabber/ui/dlgahclist.cpp:38
+#: kopete/config/avdevice/avdeviceconfig.cpp:151
+#: kopete/config/avdevice/avdeviceconfig.cpp:224
+msgid "Execute"
+msgstr ""
 
-#: protocols/irc/libkirc/kircengine_numericreplies.cpp:188
-#, kde-format
-msgid "One channel has been formed."
-msgid_plural "%1 channels have been formed."
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:177
+#. i18n: ectx: property (text), widget (QPushButton, mRefresh)
+#: protocols/jabber/ui/dlgahclist.cpp:39 rc.cpp:1706 rc.cpp:1706
+msgid "Refresh"
+msgstr ""
 
-#: protocols/bonjour/bonjouraccount.cpp:195
-msgid ""
-"Unable to publish Bonjour service. Currently the Bonjour plugin only works "
-"with Avahi."
+#: protocols/jabber/ui/dlgahclist.cpp:40
+msgid "Execute command"
 msgstr ""
 
-#: protocols/bonjour/bonjouraccount.cpp:206
-msgid ""
-"Unable to connect to the local mDNS server. Please ensure the Avahi daemon "
-"is running."
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:27
+msgid "List Chatrooms"
 msgstr ""
 
-#: protocols/bonjour/bonjourprotocol.cpp:39
-msgctxt "This Means the User is Away"
-msgid "Away"
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:29
+#: protocols/jabber/ui/dlgjabberchatjoin.cpp:36
+#: protocols/oscar/aim/aimjoinchat.cpp:35
+msgid "Join"
+msgstr "Uniad"
+
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:94
+#: protocols/jabber/ui/dlgjabberchatjoin.cpp:143
+msgid "Unable to retrieve the list of chat rooms."
 msgstr ""
 
-#: protocols/bonjour/bonjourprotocol.cpp:39
-msgctxt "This Means the User is Away"
-msgid "&Away"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:54
+msgid "Register New Jabber Account"
 msgstr ""
 
-#: protocols/jabber/jabbergroupmembercontact.cpp:197
-#: protocols/jabber/jabbercontact.cpp:401
-#: protocols/jabber/jabbergroupcontact.cpp:182
-#, kde-format
-msgid "Your message could not be delivered: \"%1\", Reason: \"%2\""
+#: protocols/jabber/ui/jabberregisteraccount.cpp:66
+#: protocols/jabber/ui/dlgregister.cpp:47
+#: protocols/jabber/ui/dlgregister.cpp:50
+msgid "Register"
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:134
+msgid "Please enter a server name, or click Choose."
 msgstr ""
 
-#: protocols/jabber/jabbertransport.cpp:136 libkopete/kopeteaccount.cpp:440
+#: protocols/jabber/ui/jabberregisteraccount.cpp:145
+msgid "Please enter a valid Jabber ID."
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:158
+#: protocols/gadu/gaduregisteraccount.cpp:108
+msgid "Please enter the same password twice."
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:165
+#: protocols/gadu/gaduregisteraccount.cpp:115
+msgid "Password entries do not match."
+msgstr ""
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:197
 #, kde-format
-msgid "%2 <%1>"
+msgid ""
+"Unless you know what you are doing, your JID should be of the form "
+"\"username@server.com\".  In your case for example \"username@%1\"."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberservices.cpp:46
-msgid "Services"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:252
+msgid "Connecting to server..."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberservices.cpp:62
-msgid "Register..."
+#: protocols/jabber/ui/jabberregisteraccount.cpp:320
+msgid "Protocol error."
+msgstr "Gwall protocol."
+
+#: protocols/jabber/ui/jabberregisteraccount.cpp:333
+msgid "Connected successfully, registering new account..."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberservices.cpp:64
-msgid "Search..."
+#: protocols/jabber/ui/jabberregisteraccount.cpp:348
+msgid "Registration successful."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberservices.cpp:66
-msgid "Execute..."
+#: protocols/jabber/ui/jabberregisteraccount.cpp:382
+msgid "Registration failed."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgcommand.ui:70
-#. i18n: ectx: property (text), widget (QLabel, lblWait)
-#: protocols/jabber/ui/dlgregister.cpp:44 rc.cpp:2266 rc.cpp:2266
-msgid "Please wait while querying the server..."
+#: protocols/jabber/ui/jabberregisteraccount.cpp:384
+msgid ""
+"Unable to create an account on the server. The Jabber ID is probably already "
+"in use."
 msgstr ""
 
-#: protocols/jabber/ui/dlgregister.cpp:47
-#: protocols/jabber/ui/dlgregister.cpp:50
-#: protocols/jabber/ui/jabberregisteraccount.cpp:66
-msgid "Register"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:385
+msgid "Jabber Account Registration"
 msgstr ""
 
-#: protocols/jabber/ui/dlgregister.cpp:73
-#: protocols/jabber/ui/dlgjabberregister.cpp:53
+#: protocols/jabber/ui/privacydlg.cpp:39
 #, kde-format
-msgid ""
-"Unable to retrieve registration form.\n"
-"Reason: \"%1\""
+msgid "%1: Privacy Lists"
 msgstr ""
 
-#: protocols/jabber/ui/dlgregister.cpp:73
-#: protocols/jabber/ui/dlgjabberregister.cpp:53
-#: protocols/jabber/ui/dlgjabberchatjoin.cpp:143
-#: protocols/jabber/ui/dlgsearch.cpp:73
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:94
-#: protocols/jabber/jabberaccount.cpp:311
-msgid "Jabber Error"
+#: protocols/jabber/ui/privacydlg.cpp:156
+#: protocols/jabber/ui/privacydlg.cpp:168
+msgid "<None>"
 msgstr ""
 
-#: protocols/jabber/ui/dlgregister.cpp:130
-#: protocols/jabber/ui/dlgjabberregister.cpp:95
-msgid "Registration sent successfully."
+#: protocols/jabber/ui/privacydlg.cpp:273
+msgid "There was an error changing the list."
 msgstr ""
 
-#: protocols/jabber/ui/dlgregister.cpp:130
-#: protocols/jabber/ui/dlgregister.cpp:135
-#: protocols/jabber/ui/dlgjabberregister.cpp:95
-#: protocols/jabber/ui/dlgjabberregister.cpp:102
-msgid "Jabber Registration"
+#: protocols/jabber/ui/privacydlg.cpp:273
+#: protocols/jabber/ui/privacydlg.cpp:286
+#: protocols/jabber/ui/privacydlg.cpp:316
+msgid "Error"
 msgstr ""
 
-#: protocols/jabber/ui/dlgregister.cpp:135
-#: protocols/jabber/ui/dlgjabberregister.cpp:102
-#, kde-format
-msgid ""
-"The server rejected the registration form.\n"
-"Reason: \"%1\""
+#: protocols/jabber/ui/privacydlg.cpp:286
+msgid "There was an error processing your request."
+msgstr ""
+
+#: protocols/jabber/ui/privacydlg.cpp:311
+msgid "New List"
+msgstr ""
+
+#: protocols/jabber/ui/privacydlg.cpp:311
+msgid "Enter the name of the new list:"
+msgstr ""
+
+#: protocols/jabber/ui/privacydlg.cpp:316
+msgid "A list with this name already exists."
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabberservices.cpp:46
+msgid "Services"
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabberservices.cpp:62
+msgid "Register..."
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabberservices.cpp:64
+msgid "Search..."
+msgstr ""
+
+#: protocols/jabber/ui/dlgjabberservices.cpp:66
+msgid "Execute..."
 msgstr ""
 
 #: protocols/jabber/ui/privacyruledlg.cpp:31
 msgid "Edit Privacy List Rule"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:134
-#. i18n: ectx: property (text), item, widget (KComboBox, cb_type)
-#: protocols/jabber/ui/privacyruledlg.cpp:41
-#: protocols/jabber/ui/privacyruledlg.cpp:88
-#: protocols/jabber/ui/privacyruledlg.cpp:133
-#: protocols/jabber/jabberprotocol.cpp:83 rc.cpp:2151 rc.cpp:2151
-msgid "Subscription"
-msgstr "Tanysgrifiad"
-
 #: protocols/jabber/ui/privacyruledlg.cpp:43
 #: protocols/jabber/ui/privacyruledlg.cpp:94
 #: protocols/jabber/ui/privacyruledlg.cpp:135
@@ -2488,18 +2539,18 @@
 msgid "To"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:124
-#. i18n: ectx: property (text), item, widget (KComboBox, cb_type)
 #. i18n: file: protocols/jabber/ui/dlgservices.ui:90
 #. i18n: ectx: property (text), widget (QTreeWidget, trServices)
 #. i18n: file: protocols/jabber/ui/privacyrule.ui:124
 #. i18n: ectx: property (text), item, widget (KComboBox, cb_type)
 #. i18n: file: protocols/jabber/ui/dlgservices.ui:90
 #. i18n: ectx: property (text), widget (QTreeWidget, trServices)
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:124
+#. i18n: ectx: property (text), item, widget (KComboBox, cb_type)
 #: protocols/jabber/ui/privacyruledlg.cpp:57
 #: protocols/jabber/ui/privacyruledlg.cpp:100
-#: protocols/jabber/ui/dlgsearch.cpp:183 rc.cpp:2145 rc.cpp:2287 rc.cpp:2145
-#: rc.cpp:2287
+#: protocols/jabber/ui/dlgsearch.cpp:183 rc.cpp:975 rc.cpp:1493 rc.cpp:975
+#: rc.cpp:1493
 msgid "JID"
 msgstr ""
 
@@ -2512,28 +2563,28 @@
 #. i18n: file: protocols/gadu/ui/gaduadd.ui:310
 #. i18n: ectx: property (text), widget (Q3ListView, groups)
 #: protocols/jabber/ui/privacyruledlg.cpp:60
-#: protocols/jabber/ui/privacyruledlg.cpp:103 rc.cpp:2148 rc.cpp:3558
-#: rc.cpp:2148 rc.cpp:3558
+#: protocols/jabber/ui/privacyruledlg.cpp:103 rc.cpp:1496 rc.cpp:3426
+#: rc.cpp:1496 rc.cpp:3426
 msgid "Group"
 msgstr "Gr?p"
 
 #. i18n: file: protocols/jabber/ui/privacyrule.ui:139
 #. i18n: ectx: property (text), item, widget (KComboBox, cb_type)
 #: protocols/jabber/ui/privacyruledlg.cpp:63
-#: protocols/jabber/ui/privacyruledlg.cpp:144 rc.cpp:2154 rc.cpp:2154
+#: protocols/jabber/ui/privacyruledlg.cpp:144 rc.cpp:1502 rc.cpp:1502
 msgid "*"
 msgstr ""
 
 #. i18n: file: protocols/jabber/ui/privacyrule.ui:115
 #. i18n: ectx: property (text), item, widget (KComboBox, cb_action)
-#: protocols/jabber/ui/privacyruledlg.cpp:70 rc.cpp:2142 rc.cpp:2142
+#: protocols/jabber/ui/privacyruledlg.cpp:70 rc.cpp:1490 rc.cpp:1490
 msgid "Allow"
 msgstr "Caniatáu"
 
 #. i18n: file: protocols/jabber/ui/privacyrule.ui:110
 #. i18n: ectx: property (text), item, widget (KComboBox, cb_action)
 #: protocols/jabber/ui/privacyruledlg.cpp:73
-#: protocols/jabber/ui/privacyruledlg.cpp:113 rc.cpp:2139 rc.cpp:2139
+#: protocols/jabber/ui/privacyruledlg.cpp:113 rc.cpp:1487 rc.cpp:1487
 msgid "Deny"
 msgstr "Gwrthod"
 
@@ -2553,85 +2604,42 @@
 msgid "Could not parse the server list."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
-msgid "Join Jabber Groupchat"
+#. i18n: file: protocols/jabber/ui/dlgcommand.ui:70
+#. i18n: ectx: property (text), widget (QLabel, lblWait)
+#: protocols/jabber/ui/dlgregister.cpp:44 rc.cpp:1300 rc.cpp:1300
+msgid "Please wait while querying the server..."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchatjoin.cpp:36
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:29
-#: protocols/oscar/aim/aimjoinchat.cpp:35
-msgid "Join"
-msgstr "Uniad"
-
-#: protocols/jabber/ui/dlgjabberchatjoin.cpp:143
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:94
-msgid "Unable to retrieve the list of chat rooms."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:66
-msgid "Jabber vCard"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:68 protocols/qq/ui/dlgqqvcard.cpp:46
-msgid "&Save User Info"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:69 protocols/qq/ui/dlgqqvcard.cpp:47
-msgid "Fetch vCard"
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:307
-#: protocols/qq/ui/dlgqqvcard.cpp:225
-msgid "Saving vCard to server..."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:429
-msgid "vCard successfully saved."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:434
-msgid "Error: Unable to save vCard."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:442
-#: protocols/qq/ui/dlgqqvcard.cpp:247
-msgid "Fetching contact vCard..."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:465
-msgid "vCard successfully retrieved."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:472
-msgid "No vCard available."
-msgstr ""
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:474
+#: protocols/jabber/ui/dlgregister.cpp:73
+#: protocols/jabber/ui/dlgjabberregister.cpp:53
+#, kde-format
 msgid ""
-"Error: vCard could not be fetched correctly.\n"
-"Check connectivity with the Jabber server."
+"Unable to retrieve registration form.\n"
+"Reason: \"%1\""
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:499
-msgid ""
-"<qt>An error occurred when trying to change the photo.<br />Make sure that "
-"you have selected a valid image file</qt>"
+#: protocols/jabber/ui/dlgregister.cpp:130
+#: protocols/jabber/ui/dlgjabberregister.cpp:95
+msgid "Registration sent successfully."
 msgstr ""
 
-#: protocols/jabber/ui/dlgahclist.cpp:38
-#: kopete/config/avdevice/avdeviceconfig.cpp:151
-#: kopete/config/avdevice/avdeviceconfig.cpp:224
-msgid "Execute"
+#: protocols/jabber/ui/dlgregister.cpp:130
+#: protocols/jabber/ui/dlgregister.cpp:135
+#: protocols/jabber/ui/dlgjabberregister.cpp:95
+#: protocols/jabber/ui/dlgjabberregister.cpp:102
+msgid "Jabber Registration"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:177
-#. i18n: ectx: property (text), widget (QPushButton, mRefresh)
-#: protocols/jabber/ui/dlgahclist.cpp:39 rc.cpp:4014 rc.cpp:4014
-msgid "Refresh"
+#: protocols/jabber/ui/dlgregister.cpp:135
+#: protocols/jabber/ui/dlgjabberregister.cpp:102
+#, kde-format
+msgid ""
+"The server rejected the registration form.\n"
+"Reason: \"%1\""
 msgstr ""
 
-#: protocols/jabber/ui/dlgahclist.cpp:40
-msgid "Execute command"
+#: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
+msgid "Join Jabber Groupchat"
 msgstr ""
 
 #: protocols/jabber/ui/dlgahcommand.cpp:41
@@ -2654,7 +2662,7 @@
 #. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:29
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
 #: protocols/jabber/ui/dlgsearch.cpp:43 protocols/jabber/ui/dlgsearch.cpp:44
-#: rc.cpp:4023 rc.cpp:4023
+#: rc.cpp:336 rc.cpp:336
 msgid "Search"
 msgstr ""
 
@@ -2693,4085 +2701,3676 @@
 msgid "e-mail"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:54
-msgid "Register New Jabber Account"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:36
+msgid "Change Jabber Password"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:134
-msgid "Please enter a server name, or click Choose."
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:64
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:64
+msgid "You entered your current password incorrectly."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:145
-msgid "Please enter a valid Jabber ID."
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:65
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:73
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:65
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:73
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:81
+msgid "Password Incorrect"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:158
-#: protocols/gadu/gaduregisteraccount.cpp:108
-msgid "Please enter the same password twice."
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:72
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:72
+msgid "Your new passwords do not match. Please enter them again."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:165
-#: protocols/gadu/gaduregisteraccount.cpp:115
-msgid "Password entries do not match."
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
+msgid "For security reasons, you are not allowed to set an empty password."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:197
-#, kde-format
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:88
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:52
 msgid ""
-"Unless you know what you are doing, your JID should be of the form "
-"\"username@server.com\".  In your case for example \"username@%1\"."
+"Your account needs to be connected before the password can be changed. Do "
+"you want to try to connect now?"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:252
-msgid "Connecting to server..."
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:89
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:129
+msgid "Jabber Password Change"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:271
-#: protocols/groupwise/gwaccount.cpp:255
-#, kde-format
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:89
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:53
+#: libkopete/connectionmanager.cpp:162
+msgid "Connect"
+msgstr "Cysylltu"
+
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:89
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:53
+#: libkopete/connectionmanager.cpp:162
+msgid "Stay Offline"
+msgstr "Aros All-lein"
+
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
 msgid ""
-"SSL support could not be initialized for account %1. This is most likely "
-"because the QCA TLS plugin is not installed on your system."
+"Your password has been changed successfully. Please note that the change may "
+"not be instantaneous. If you have problems logging in with your new "
+"password, please contact the administrator."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:273
-#: protocols/jabber/jabberaccount.cpp:437
-msgid "Jabber SSL Error"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:136
+msgid ""
+"Your password could not be changed. Either your server does not support this "
+"feature or the administrator does not allow you to change your password."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:320
-msgid "Protocol error."
-msgstr "Gwall protocol."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:66
+msgid "Jabber vCard"
+msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:333
-msgid "Connected successfully, registering new account..."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:68 protocols/qq/ui/dlgqqvcard.cpp:46
+msgid "&Save User Info"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:348
-msgid "Registration successful."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:69 protocols/qq/ui/dlgqqvcard.cpp:47
+msgid "Fetch vCard"
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:382
-msgid "Registration failed."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:307
+#: protocols/qq/ui/dlgqqvcard.cpp:225
+msgid "Saving vCard to server..."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:384
-msgid ""
-"Unable to create an account on the server. The Jabber ID is probably already "
-"in use."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:429
+msgid "vCard successfully saved."
 msgstr ""
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:385
-msgid "Jabber Account Registration"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:434
+msgid "Error: Unable to save vCard."
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:27
-msgid "List Chatrooms"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:442
+#: protocols/qq/ui/dlgqqvcard.cpp:247
+msgid "Fetching contact vCard..."
 msgstr ""
 
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:57
-msgid "Loading instructions from gateway..."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:465
+msgid "vCard successfully retrieved."
 msgstr ""
 
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:69
-msgid "Connect to the Jabber network and try again."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:472
+msgid "No vCard available."
 msgstr ""
 
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:158
-msgid "An error occurred while loading instructions from the gateway."
+#: protocols/jabber/ui/dlgjabbervcard.cpp:474
+msgid ""
+"Error: vCard could not be fetched correctly.\n"
+"Check connectivity with the Jabber server."
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:39
-#, kde-format
-msgid "%1: Privacy Lists"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:499
+msgid ""
+"<qt>An error occurred when trying to change the photo.<br />Make sure that "
+"you have selected a valid image file</qt>"
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:156
-#: protocols/jabber/ui/privacydlg.cpp:168
-msgid "<None>"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:276
+msgid ""
+"The changes you just made will take effect next time you log in with Jabber."
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:273
-msgid "There was an error changing the list."
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:277
+msgid "Jabber Changes During Online Jabber Session"
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:273
-#: protocols/jabber/ui/privacydlg.cpp:286
-#: protocols/jabber/ui/privacydlg.cpp:316
-msgid "Error"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:356
+msgid ""
+"The Jabber ID you have chosen is invalid. Please make sure it is in the form "
+"user@server.com, like an email address."
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:286
-msgid "There was an error processing your request."
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:358
+msgid "Invalid Jabber ID"
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:311
-msgid "New List"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:366
+msgid ""
+"Google Talk libjingle support is only for GTalk/Gmail account, which connect "
+"to server talk.google.com."
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:311
-msgid "Enter the name of the new list:"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:366
+msgid "Invalid Google Talk"
 msgstr ""
 
-#: protocols/jabber/ui/privacydlg.cpp:316
-msgid "A list with this name already exists."
+#: protocols/jabber/jabbergroupcontact.cpp:131
+msgid "Change nickname"
 msgstr ""
 
-#: protocols/jabber/ui/dlgxmppconsole.cpp:28
-#: protocols/jabber/jabberaccount.cpp:241
-msgid "XML Console"
+#: protocols/jabber/jabbergroupcontact.cpp:392
+msgid "Change nickname - Jabber Plugin"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:85
-#. i18n: ectx: property (text), widget (QPushButton, btnClearBlackList)
-#. i18n: file: plugins/privacy/privacydialog.ui:190
-#. i18n: ectx: property (text), widget (QPushButton, btnClearWhiteList)
-#. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:50
-#. i18n: ectx: property (text), widget (QPushButton, clear_btn)
-#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:43
-#. i18n: ectx: property (toolTip), widget (KPushButton, btnClear)
-#. i18n: file: plugins/privacy/privacydialog.ui:85
-#. i18n: ectx: property (text), widget (QPushButton, btnClearBlackList)
-#. i18n: file: plugins/privacy/privacydialog.ui:190
-#. i18n: ectx: property (text), widget (QPushButton, btnClearWhiteList)
-#. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:50
-#. i18n: ectx: property (text), widget (QPushButton, clear_btn)
-#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:43
-#. i18n: ectx: property (toolTip), widget (KPushButton, btnClear)
-#: protocols/jabber/ui/dlgxmppconsole.cpp:31 rc.cpp:20 rc.cpp:50 rc.cpp:1098
-#: rc.cpp:5135 rc.cpp:20 rc.cpp:50 rc.cpp:1098 rc.cpp:5135
-msgid "Clear"
+#: protocols/jabber/jabbergroupcontact.cpp:393
+#, kde-format
+msgid "Please enter the new nickname you want to have in the room <i>%1</i>"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:43
-#. i18n: ectx: property (text), widget (QPushButton, send_btn)
-#: protocols/jabber/ui/dlgxmppconsole.cpp:32
-#: kopete/chatwindow/kopeteemailwindow.cpp:499
-#: kopete/chatwindow/kopeteemailwindow.cpp:517 rc.cpp:1095 rc.cpp:1095
-msgid "Send"
-msgstr "Anfon"
-
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:276
-msgid ""
-"The changes you just made will take effect next time you log in with Jabber."
+#: protocols/jabber/tasks/mood.cpp:79
+msgid "Afraid"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:277
-msgid "Jabber Changes During Online Jabber Session"
+#: protocols/jabber/tasks/mood.cpp:81
+msgid "Amazed"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:356
-msgid ""
-"The Jabber ID you have chosen is invalid. Please make sure it is in the form "
-"user@server.com, like an email address."
+#: protocols/jabber/tasks/mood.cpp:83
+msgid "Angry"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:358
-msgid "Invalid Jabber ID"
+#: protocols/jabber/tasks/mood.cpp:85
+msgid "Annoyed"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:366
-msgid ""
-"Google Talk libjingle support is only for GTalk/Gmail account, which connect "
-"to server talk.google.com."
+#: protocols/jabber/tasks/mood.cpp:87
+msgid "Anxious"
 msgstr ""
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:366
-msgid "Invalid Google Talk"
+#: protocols/jabber/tasks/mood.cpp:89
+msgid "Aroused"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:36
-msgid "Change Jabber Password"
+#: protocols/jabber/tasks/mood.cpp:91
+msgid "Ashamed"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:64
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:64
-msgid "You entered your current password incorrectly."
+#: protocols/jabber/tasks/mood.cpp:93
+msgid "Bored"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:65
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:73
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:65
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:73
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:81
-msgid "Password Incorrect"
+#: protocols/jabber/tasks/mood.cpp:95
+msgid "Brave"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:72
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:72
-msgid "Your new passwords do not match. Please enter them again."
+#: protocols/jabber/tasks/mood.cpp:97
+msgid "Calm"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
-msgid "For security reasons, you are not allowed to set an empty password."
+#: protocols/jabber/tasks/mood.cpp:99
+msgid "Cold"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:88
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:52
-msgid ""
-"Your account needs to be connected before the password can be changed. Do "
-"you want to try to connect now?"
+#: protocols/jabber/tasks/mood.cpp:101
+msgid "Confused"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:89
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:129
-msgid "Jabber Password Change"
+#: protocols/jabber/tasks/mood.cpp:103
+msgid "Contented"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:89
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:53
-#: libkopete/connectionmanager.cpp:162
-msgid "Connect"
-msgstr "Cysylltu"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:89
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:53
-#: libkopete/connectionmanager.cpp:162
-msgid "Stay Offline"
-msgstr "Aros All-lein"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
-msgid ""
-"Your password has been changed successfully. Please note that the change may "
-"not be instantaneous. If you have problems logging in with your new "
-"password, please contact the administrator."
+#: protocols/jabber/tasks/mood.cpp:105
+msgid "Cranky"
 msgstr ""
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:136
-msgid ""
-"Your password could not be changed. Either your server does not support this "
-"feature or the administrator does not allow you to change your password."
+#: protocols/jabber/tasks/mood.cpp:107
+msgid "Curious"
 msgstr ""
 
-#: protocols/jabber/jabberfiletransfer.cpp:175
-#: protocols/gadu/gadudcctransaction.cpp:238
-msgid "&Resume"
-msgstr "Ai&l-ddechrau"
-
-#: protocols/jabber/jabberfiletransfer.cpp:176
-#: protocols/gadu/gadudcctransaction.cpp:239
-msgid "Over&write"
-msgstr "Tros&ysgrifo"
-
-#: protocols/jabber/jabberfiletransfer.cpp:179
-#: protocols/gadu/gadudcctransaction.cpp:241
-#, kde-format
-msgid "The file %1 already exists, do you want to resume or overwrite it?"
+#: protocols/jabber/tasks/mood.cpp:109
+msgid "Depressed"
 msgstr ""
 
-#: protocols/jabber/jabberfiletransfer.cpp:180
-#: protocols/gadu/gadudcctransaction.cpp:242
-#, kde-format
-msgid "File Exists: %1"
-msgstr "Ffeil yn Bodoli : %1"
-
-#: protocols/jabber/googletalk/googletalk.cpp:51
-#, kde-format
-msgid "Cannot start process %1. Check your installation of Kopete."
+#: protocols/jabber/tasks/mood.cpp:111
+msgid "Disappointed"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:304
-msgid "Answer for incoming call"
+#: protocols/jabber/tasks/mood.cpp:113
+msgid "Disgusted"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:314
-msgid "Accepted"
+#: protocols/jabber/tasks/mood.cpp:115
+msgid "Distracted"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:323
-msgid "Calling..."
+#: protocols/jabber/tasks/mood.cpp:117
+msgid "Embarrassed"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:328
-msgid "Rejected"
+#: protocols/jabber/tasks/mood.cpp:119
+msgid "Excited"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:340
-msgid "Call in progress"
+#: protocols/jabber/tasks/mood.cpp:121
+msgid "Flirtatious"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:347
-msgid "Other side hung up"
+#: protocols/jabber/tasks/mood.cpp:123
+msgid "Frustrated"
 msgstr ""
 
-#: protocols/jabber/googletalk/googletalk.cpp:394
-msgid "Waiting..."
+#: protocols/jabber/tasks/mood.cpp:125
+msgid "Grumpy"
 msgstr ""
 
-#: protocols/jabber/jabberbookmarks.cpp:135
-msgid "Groupchat Bookmark"
+#: protocols/jabber/tasks/mood.cpp:127
+msgid "Guilty"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:130
-msgid "You cannot see each others' status."
+#: protocols/jabber/tasks/mood.cpp:129
+msgid "Happy"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:134
-msgid "You can see this contact's status, but he/she cannot see your status."
+#: protocols/jabber/tasks/mood.cpp:131
+msgid "Hot"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:138
-msgid "This contact can see your status, but you cannot see his/her status."
+#: protocols/jabber/tasks/mood.cpp:133
+msgid "Humbled"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:142
-msgid "You can see each others' status."
+#: protocols/jabber/tasks/mood.cpp:135
+msgid "Humiliated"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:258
-#: protocols/oscar/oscarprotocol.cpp:38
-msgid "Client"
-msgstr "Dibynnydd:"
-
-#: protocols/jabber/jabberbasecontact.cpp:283
-msgid "Timestamp"
+#: protocols/jabber/tasks/mood.cpp:137
+msgid "Hungry"
 msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:290
-#: protocols/oscar/icq/xtrazstatusmodel.cpp:131
-msgid "Message"
-msgstr "Neges"
+#: protocols/jabber/tasks/mood.cpp:139
+msgid "Hurt"
+msgstr ""
 
-#: protocols/jabber/jabberbasecontact.cpp:653
-msgid "Failed to download Jabber contact photo."
+#: protocols/jabber/tasks/mood.cpp:141
+msgid "Impressed"
 msgstr ""
 
-#: protocols/jabber/jabbergroupchatmanager.cpp:149
-#: protocols/jabber/jabberprotocol.cpp:509
-#, kde-format
-msgid "You have been invited to %1"
+#: protocols/jabber/tasks/mood.cpp:143
+msgid "In awe"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:319
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3_2)
-#: protocols/jabber/jabbercontact.cpp:141 rc.cpp:4140 rc.cpp:4140
-msgid "Authorization"
-msgstr "Awdurdodi"
+#: protocols/jabber/tasks/mood.cpp:145
+msgid "In love"
+msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:147 protocols/skype/skypecontact.cpp:106
-msgid "(Re)send Authorization To"
+#: protocols/jabber/tasks/mood.cpp:147
+msgid "Indignant"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:154
-msgid "(Re)request Authorization From"
+#: protocols/jabber/tasks/mood.cpp:149
+msgid "Interested"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:161 protocols/skype/skypecontact.cpp:111
-msgid "Remove Authorization From"
+#: protocols/jabber/tasks/mood.cpp:151
+msgid "Intoxicated"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:173
-msgid "Call Google Talk contact"
+#: protocols/jabber/tasks/mood.cpp:153
+msgid "Invincible"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:182
-msgid "Set Availability"
+#: protocols/jabber/tasks/mood.cpp:155
+msgid "Jealous"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:192
-msgid "Free to Chat"
+#: protocols/jabber/tasks/mood.cpp:157
+msgid "Lonely"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:194
-#: protocols/jabber/jabberprotocol.cpp:68
-#: kopete/config/status/statusconfig_manager.cpp:60
-msgid "Extended Away"
+#: protocols/jabber/tasks/mood.cpp:159
+msgid "Mean"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:195
-#: protocols/oscar/icq/icqstatusmanager.cpp:77
-#: protocols/oscar/aim/aimstatusmanager.cpp:69
-#: protocols/skype/skypeaccount.cpp:942 protocols/skype/skypeprotocol.cpp:85
-msgid "Do Not Disturb"
+#: protocols/jabber/tasks/mood.cpp:161
+msgid "Moody"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:200
-msgid "Select Resource"
+#: protocols/jabber/tasks/mood.cpp:163
+msgid "Nervous"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:217
-msgid "Automatic (best/default resource)"
+#: protocols/jabber/tasks/mood.cpp:165
+msgid "Neutral"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:270
-msgid "Test action"
+#: protocols/jabber/tasks/mood.cpp:167
+msgid "Offended"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:274
-msgid "Jingle Audio call"
+#: protocols/jabber/tasks/mood.cpp:169
+msgid "Playful"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:277
-msgid "Jingle Video call"
+#: protocols/jabber/tasks/mood.cpp:171
+msgid "Proud"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:317
-#, kde-format
-msgid "The original message is : <i>\" %1 \"</i><br />"
+#: protocols/jabber/tasks/mood.cpp:173
+msgid "Relieved"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:318
-#, kde-format
-msgid ""
-"<qt><i>%1</i> has invited you to join the conference <b>%2</b><br />%3<br "
-"/>If you want to accept and join, just <b>enter your nickname</b> and press "
-"OK.<br />If you want to decline, press Cancel.</qt>"
+#: protocols/jabber/tasks/mood.cpp:175
+msgid "Remorseful"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:324
-msgid "Invited to a conference - Jabber Plugin"
+#: protocols/jabber/tasks/mood.cpp:177
+msgid "Restless"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:341
-msgid "Message has been displayed"
+#: protocols/jabber/tasks/mood.cpp:179
+msgid "Sad"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:344
-msgid "Message has been delivered"
+#: protocols/jabber/tasks/mood.cpp:181
+msgid "Sarcastic"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:350
-msgid "Message stored on the server, contact offline"
+#: protocols/jabber/tasks/mood.cpp:183
+msgid "Serious"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:358
-#, kde-format
-msgid "%1 has ended his/her participation in the chat session."
+#: protocols/jabber/tasks/mood.cpp:185
+msgid "Shocked"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:994
-#, kde-format
-msgid ""
-"Do you also want to remove user %1's authorization to see your status?"
+#: protocols/jabber/tasks/mood.cpp:187
+msgid "Shy"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:995
-#: protocols/jabber/jabberaccount.cpp:1175
-msgid "Notification"
-msgstr "Hysbysiad"
+#: protocols/jabber/tasks/mood.cpp:189
+msgid "Sick"
+msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:1166
-#, kde-format
-msgid ""
-"You have preselected a resource for contact %1, but you still have open chat "
-"windows for this contact. The preselected resource will only apply to newly "
-"opened chat windows."
+#: protocols/jabber/tasks/mood.cpp:191
+msgid "Sleepy"
 msgstr ""
 
-#: protocols/jabber/jabbercontact.cpp:1170
-msgid "Jabber Resource Selector"
+#: protocols/jabber/tasks/mood.cpp:193
+msgid "Stressed"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:65
-msgid "Free for Chat"
+#: protocols/jabber/tasks/mood.cpp:195
+msgid "Surprised"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:69
-msgid "Do not Disturb"
+#: protocols/jabber/tasks/mood.cpp:197
+msgid "Thirsty"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:84
-msgid "Authorization Status"
+#: protocols/jabber/tasks/mood.cpp:199
+msgid "Worried"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:85
-msgid "Available Resources"
+#: protocols/bonjour/bonjouraccount.cpp:195
+msgid ""
+"Unable to publish Bonjour service. Currently the Bonjour plugin only works "
+"with Avahi."
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:86
-msgid "vCard Cache Timestamp"
+#: protocols/bonjour/bonjouraccount.cpp:206
+msgid ""
+"Unable to connect to the local mDNS server. Please ensure the Avahi daemon "
+"is running."
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:88
-msgid "Jabber ID"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:68
+#. i18n: ectx: property (text), widget (QRadioButton, onlineButton_)
+#: protocols/bonjour/bonjourprotocol.cpp:37 protocols/wlm/wlmprotocol.cpp:43
+#: protocols/oscar/icq/icqstatusmanager.cpp:87
+#: protocols/oscar/aim/aimstatusmanager.cpp:79 protocols/qq/qqprotocol.cpp:36
+#: rc.cpp:3446 rc.cpp:3446
+msgid "O&nline"
+msgstr "A&r-lein"
+
+#: protocols/bonjour/bonjourprotocol.cpp:39
+msgctxt "This Means the User is Away"
+msgid "Away"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:206
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: protocols/jabber/jabberprotocol.cpp:89 protocols/yahoo/yahooprotocol.cpp:97
-#: rc.cpp:2437 rc.cpp:2437
-msgid "Birthday"
-msgstr "Penblwydd"
+#: protocols/bonjour/bonjourprotocol.cpp:39
+msgctxt "This Means the User is Away"
+msgid "&Away"
+msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:90
-msgid "Timezone"
-msgstr "Cylchfa amser:"
+#: protocols/winpopup/wpprotocol.cpp:146
+msgid "The Samba configuration file has been modified."
+msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:91
-msgid "Homepage"
-msgstr "Tudalen gartref"
+#: protocols/winpopup/wpprotocol.cpp:146
+msgid "Configuration Successful"
+msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:92
-msgid "Company name"
-msgstr "Enw cwmni"
+#: protocols/winpopup/wpprotocol.cpp:148
+msgid "Updating the Samba configuration file failed."
+msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:93
-msgid "Company Departement"
+#: protocols/winpopup/wpprotocol.cpp:148
+msgid "Configuration Failed"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:94
-msgid "Company Position"
+#: protocols/winpopup/wpeditaccount.cpp:104
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:148
+#: protocols/yahoo/yahooeditaccount.cpp:105
+msgid "<qt>You must enter a valid screen name.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:95
-msgid "Company Role"
+#: protocols/winpopup/wpeditaccount.cpp:104
+#: protocols/winpopup/wpeditaccount.cpp:110
+#: protocols/winpopup/wpaddcontact.cpp:100
+#: protocols/winpopup/wpaddcontact.cpp:107
+msgid "WinPopup"
+msgstr "WinPopup"
+
+#: protocols/winpopup/wpeditaccount.cpp:110
+msgid "<qt>You must enter a valid smbclient path.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:96
-msgid "Work Street"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:107
+#, kde-format
+msgid ""
+"The working directory %1 does not exist.\n"
+"If you have not yet configured anything for Samba please see\n"
+"Install Into Samba (Configure... -> Account -> Edit) information\n"
+"on how to do this.\n"
+"Should the directory be created? (May require the root password)"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:97
-msgid "Work Extra Address"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:112
+msgid "Create Directory"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:98
-msgid "Work PO Box"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:112
+msgid "Do Not Create"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:91
-msgid "Work City"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:126
+#, kde-format
+msgid ""
+"Permissions of the working directory %1 are incorrect.\n"
+"You will not receive messages if choose No.\n"
+"You can also correct it manually (chmod 0777 %1), restart Kopete.\n"
+"Fix this (may require the root password)?"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:100
-msgid "Work Postal Code"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:131
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:326
+msgid "Fix"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:101
-#: protocols/yahoo/yahooprotocol.cpp:94
-msgid "Work Country"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:131
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:326
+msgid "Do Not Fix"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:102
-msgid "Work Email Address"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:256
+msgid ""
+"Connection to localhost failed.\n"
+"Is your samba server running?"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:103
-msgid "Home Street"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:323
+msgid ""
+"A message file could not be removed; maybe the permissions are incorrect.\n"
+"Fix this (may require the root password)?"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:104
-msgid "Home Extra Address"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:331
+msgid "Still cannot remove it; please fix it manually."
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:105
-msgid "Home PO Box"
+#: protocols/winpopup/wpaddcontact.cpp:100
+msgid "<qt>You must enter a valid hostname.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:106
-msgid "Home City"
+#: protocols/winpopup/wpaddcontact.cpp:107
+msgid "<qt>LOCALHOST is not allowed as a contact.</qt>"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:107
-msgid "Home Postal Code"
+#: protocols/winpopup/wpaccount.cpp:168
+#, kde-format
+msgid "WinPopup (%1)"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:108
-msgid "Home Country"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:228
+#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
+#: protocols/winpopup/wpuserinfo.cpp:39 rc.cpp:2885 rc.cpp:2885
+msgid "N/A"
+msgstr "N/A"
+
+#: protocols/winpopup/wpuserinfo.cpp:45
+#, kde-format
+msgid "User Info for %1"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:109
-msgid "Fax"
-msgstr "Ffacs"
+#: protocols/wlm/wlmprotocol.cpp:32
+msgid "WLM"
+msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:511
-#. i18n: ectx: attribute (title), widget (QWidget, tab_9)
-#: protocols/jabber/jabberprotocol.cpp:110 rc.cpp:4426 rc.cpp:4426
-msgid "About"
+#: protocols/wlm/wlmprotocol.cpp:50
+msgid "Be Right Back"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:391
-#: protocols/oscar/icq/icqprotocol.cpp:100
-#: protocols/oscar/aim/aimprotocol.cpp:156 libkopete/kabcpersistence.cpp:380
-msgid "Choose Account"
+#: protocols/wlm/wlmprotocol.cpp:51
+msgid "Be &Right Back"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:397
-#, kde-format
-msgid "Choose an account to handle the URL %1"
+#: protocols/wlm/wlmprotocol.cpp:53
+msgid "On the Phone"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:446
-#: protocols/oscar/aim/aimprotocol.cpp:186
-#, kde-format
-msgid "Do you want to add '%1' to your contact list?"
+#: protocols/wlm/wlmprotocol.cpp:54
+msgid "On The &Phone"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:116
-#. i18n: ectx: property (text), widget (QPushButton, btnAddToBlackList)
-#. i18n: file: plugins/privacy/privacydialog.ui:183
-#. i18n: ectx: property (text), widget (QPushButton, btnAddToWhiteList)
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:763
-#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:800
-#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:844
-#. i18n: ectx: property (text), widget (QPushButton, ignoreAdd)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:22
-#. i18n: ectx: property (text), widget (QPushButton, buttonAdd)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, addEmailButton)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:777
-#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:863
-#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:173
-#. i18n: ectx: property (text), widget (QPushButton, btnCustomAdd)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:46
-#. i18n: ectx: property (text), widget (QPushButton, pbAddStatus)
-#. i18n: file: plugins/privacy/privacydialog.ui:116
-#. i18n: ectx: property (text), widget (QPushButton, btnAddToBlackList)
-#. i18n: file: plugins/privacy/privacydialog.ui:183
-#. i18n: ectx: property (text), widget (QPushButton, btnAddToWhiteList)
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:763
-#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:800
-#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:844
-#. i18n: ectx: property (text), widget (QPushButton, ignoreAdd)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:22
-#. i18n: ectx: property (text), widget (QPushButton, buttonAdd)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, addEmailButton)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:777
-#. i18n: ectx: property (text), widget (QPushButton, visibleAdd)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:863
-#. i18n: ectx: property (text), widget (QPushButton, invisibleAdd)
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:173
-#. i18n: ectx: property (text), widget (QPushButton, btnCustomAdd)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:46
-#. i18n: ectx: property (text), widget (QPushButton, pbAddStatus)
-#: protocols/jabber/jabberprotocol.cpp:447
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:50
-#: protocols/oscar/icq/icqprotocol.cpp:131
-#: protocols/oscar/aim/aimprotocol.cpp:187 kopete/kopetewindow.cpp:379
-#: rc.cpp:29 rc.cpp:47 rc.cpp:242 rc.cpp:2681 rc.cpp:2690 rc.cpp:2705
-#: rc.cpp:2726 rc.cpp:2867 rc.cpp:3086 rc.cpp:3104 rc.cpp:3816 rc.cpp:5992
-#: rc.cpp:29 rc.cpp:47 rc.cpp:242 rc.cpp:2681 rc.cpp:2690 rc.cpp:2705
-#: rc.cpp:2726 rc.cpp:2867 rc.cpp:3086 rc.cpp:3104 rc.cpp:3816 rc.cpp:5992
-msgid "Add"
+#: protocols/wlm/wlmprotocol.cpp:56
+msgid "Out to Lunch"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:447
-#: protocols/oscar/icq/icqprotocol.cpp:131
-#: protocols/oscar/aim/aimprotocol.cpp:187
-msgid "Do Not Add"
-msgstr "Na Ychwaneger"
-
-#: protocols/jabber/jabberprotocol.cpp:463
-#, kde-format
-msgid "Do you want to remove '%1' from your contact list?"
+#: protocols/wlm/wlmprotocol.cpp:57
+msgid "Out To &Lunch"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:92
-#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromBlackList)
-#. i18n: file: plugins/privacy/privacydialog.ui:176
-#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromWhiteList)
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:66
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#. i18n: file: protocols/jabber/ui/privacy.ui:249
-#. i18n: ectx: property (text), widget (KPushButton, pb_remove)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:756
-#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:793
-#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:837
-#. i18n: ectx: property (text), widget (QPushButton, ignoreRemove)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:76
-#. i18n: ectx: property (text), widget (QPushButton, removeEmailButton)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:784
-#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:856
-#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
-#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:45
-#. i18n: ectx: property (text), widget (QPushButton, removeButton)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:53
-#. i18n: ectx: property (text), widget (QPushButton, pbRemove)
-#. i18n: file: plugins/privacy/privacydialog.ui:92
-#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromBlackList)
-#. i18n: file: plugins/privacy/privacydialog.ui:176
-#. i18n: ectx: property (text), widget (QPushButton, btnRemoveFromWhiteList)
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:66
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#. i18n: file: protocols/jabber/ui/privacy.ui:249
-#. i18n: ectx: property (text), widget (KPushButton, pb_remove)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:756
-#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:793
-#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:837
-#. i18n: ectx: property (text), widget (QPushButton, ignoreRemove)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:76
-#. i18n: ectx: property (text), widget (QPushButton, removeEmailButton)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:784
-#. i18n: ectx: property (text), widget (QPushButton, visibleRemove)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:856
-#. i18n: ectx: property (text), widget (QPushButton, invisibleRemove)
-#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:45
-#. i18n: ectx: property (text), widget (QPushButton, removeButton)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:53
-#. i18n: ectx: property (text), widget (QPushButton, pbRemove)
-#: protocols/jabber/jabberprotocol.cpp:464 libkopete/kopetecontact.cpp:454
-#: kopete/contactlist/kopetecontactlistview.cpp:397
-#: kopete/contactlist/kopetecontactlistview.cpp:412
-#: kopete/contactlist/kopetecontactlistview.cpp:837 rc.cpp:23 rc.cpp:44
-#: rc.cpp:245 rc.cpp:2223 rc.cpp:2678 rc.cpp:2687 rc.cpp:2702 rc.cpp:2870
-#: rc.cpp:3089 rc.cpp:3101 rc.cpp:5968 rc.cpp:5995 rc.cpp:23 rc.cpp:44
-#: rc.cpp:245 rc.cpp:2223 rc.cpp:2678 rc.cpp:2687 rc.cpp:2702 rc.cpp:2870
-#: rc.cpp:3089 rc.cpp:3101 rc.cpp:5968 rc.cpp:5995
-msgid "Remove"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:100
+#. i18n: ectx: property (text), widget (QRadioButton, invisibleButton_)
+#: protocols/wlm/wlmprotocol.cpp:60 rc.cpp:3464 kopete/kopetewindow.cpp:406
+#: rc.cpp:3464
+msgid "&Invisible"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:464
-msgid "Do Not Remove"
-msgstr ""
+#: protocols/wlm/wlmprotocol.cpp:66
+msgid "&Idle"
+msgstr "&Segur"
 
-#: protocols/jabber/jabberprotocol.cpp:486
-#, kde-format
-msgid "Please enter your nickname for the room %1"
+#: protocols/wlm/wlmprotocol.cpp:69 libkopete/kopetemetacontact.cpp:505
+msgid "Status not available"
 msgstr ""
 
-#: protocols/jabber/jabberprotocol.cpp:487
-#: protocols/jabber/jabberaccount.cpp:1575
-msgid "Provide your nickname"
+#: protocols/wlm/wlmprotocol.cpp:72
+msgctxt "This is used in the tooltip of a contact"
+msgid "Listening To"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:79
-msgid "Afraid"
+#: protocols/wlm/wlmchatsessioninkaction.cpp:56
+msgid "Send Ink"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:81
-msgid "Amazed"
+#: protocols/wlm/wlmtransfermanager.cpp:113
+#: protocols/wlm/wlmtransfermanager.cpp:246
+#: protocols/wlm/wlmtransfermanager.cpp:252
+msgid "File transfer cancelled."
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:83
-msgid "Angry"
+#: protocols/wlm/wlmchatsessioninkarea.cpp:54
+msgid "Select the pen's color"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:85
-msgid "Annoyed"
+#: protocols/wlm/wlmaccount.cpp:76 protocols/yahoo/yahooaccount.cpp:90
+msgid "Open Inbo&x..."
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:87
-msgid "Anxious"
+#: protocols/wlm/wlmaccount.cpp:79
+msgid "&Change Display Name..."
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:89
-msgid "Aroused"
+#: protocols/wlm/wlmaccount.cpp:85
+msgid "Open MS&N service status site..."
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:91
-msgid "Ashamed"
+#: protocols/wlm/wlmaccount.cpp:141 protocols/wlm/wlmaccount.cpp:143
+#: protocols/oscar/oscaraccount.cpp:297 protocols/oscar/oscaraccount.cpp:905
+#: protocols/oscar/oscaraccount.cpp:911
+msgid "Buddies"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:93
-msgid "Bored"
+#: protocols/wlm/wlmaccount.cpp:244 protocols/wlm/wlmaccount.cpp:255
+msgid "Change Display Name - MSN Plugin"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:95
-msgid "Brave"
+#: protocols/wlm/wlmaccount.cpp:245
+msgid ""
+"Enter the new display name by which you want to be visible to your friends "
+"on MSN:"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:97
-msgid "Calm"
+#: protocols/wlm/wlmaccount.cpp:253
+msgid ""
+"<qt>The display name you entered is too long. Please use a shorter name.\n"
+"Your display name has <b>not</b> been changed.</qt>"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:99
-msgid "Cold"
+#: protocols/wlm/wlmaccount.cpp:1157
+#, kde-format
+msgid "You have one unread message in your Hotmail inbox."
+msgid_plural "You have %1 unread messages in your Hotmail inbox."
+msgstr[0] ""
+msgstr[1] ""
+
+#: protocols/wlm/wlmaccount.cpp:1159 protocols/wlm/wlmaccount.cpp:1175
+msgctxt "@action"
+msgid "Open Inbox"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:101
-msgid "Confused"
+#: protocols/wlm/wlmaccount.cpp:1159 protocols/wlm/wlmaccount.cpp:1175
+#: protocols/yahoo/yahooaccount.cpp:1172 protocols/yahoo/yahooaccount.cpp:1615
+#: protocols/yahoo/yahooaccount.cpp:1826
+#: libkopete/private/kopeteviewmanager.cpp:412
+msgctxt "@action"
+msgid "Close"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:103
-msgid "Contented"
+#: protocols/wlm/wlmaccount.cpp:1174
+#, kde-format
+msgid "New message from %1 in your Hotmail inbox.<p>Subject: %2"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:105
-msgid "Cranky"
+#: protocols/wlm/wlmcontact.cpp:59
+msgid "Block Contact"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:107
-msgid "Curious"
+#: protocols/wlm/wlmcontact.cpp:62 protocols/qq/qqcontact.cpp:143
+#: protocols/gadu/gaducontact.cpp:192
+msgid "Show Profile"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:109
-msgid "Depressed"
+#: protocols/wlm/wlmcontact.cpp:65
+msgid "Update Photo"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:111
-msgid "Disappointed"
+#: protocols/wlm/wlmcontact.cpp:69
+msgid "&Block custom emoticons"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:113
-msgid "Disgusted"
+#: protocols/wlm/wlmcontact.cpp:384
+msgid ""
+"<qt>You need to go online to remove a contact from your contact list. This "
+"contact will appear again when you reconnect.</qt>"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:115
-msgid "Distracted"
+#: protocols/wlm/wlmcontact.cpp:385
+#: protocols/wlm/ui/wlmeditaccountwidget.cpp:213
+msgid "WLM Plugin"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:117
-msgid "Embarrassed"
+#: protocols/wlm/wlmcontact.cpp:428
+msgid "This contact does not have you in his/her list"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:119
-msgid "Excited"
+#: protocols/wlm/wlmcontact.cpp:435
+msgid "This contact is blocked"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:121
-msgid "Flirtatious"
+#: protocols/wlm/wlmcontact.cpp:437
+msgid "This contact does not have you in his/her list and is blocked"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:123
-msgid "Frustrated"
+#: protocols/wlm/wlmchatsession.cpp:112
+msgid "Send Nudge"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:125
-msgid "Grumpy"
+#: protocols/wlm/wlmchatsession.cpp:142
+msgid "Send &Voice"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:127
-msgid "Guilty"
+#: protocols/wlm/wlmchatsession.cpp:149
+msgid "Sound card not detected"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:129
-msgid "Happy"
+#: protocols/wlm/wlmchatsession.cpp:157
+msgid "Stop &recording"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:131
-msgid "Hot"
+#: protocols/wlm/wlmchatsession.cpp:286
+msgid "The other contact needs to be online to receive voice clips."
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:133
-msgid "Humbled"
+#: protocols/wlm/wlmchatsession.cpp:298
+msgid "You cannot send voice clips in invisible status"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:135
-msgid "Humiliated"
+#: protocols/wlm/wlmchatsession.cpp:345
+msgid "The maximum recording time is 15 seconds"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:137
-msgid "Hungry"
+#: protocols/wlm/wlmchatsession.cpp:389
+msgid "The voice clip must be longer"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:139
-msgid "Hurt"
+#: protocols/wlm/wlmchatsession.cpp:663
+msgid "has sent a nudge"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:141
-msgid "Impressed"
+#: protocols/wlm/wlmchatsession.cpp:1080
+msgid "has sent you a nudge"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:143
-msgid "In awe"
+#: protocols/wlm/ui/wlmaddcontactpage.cpp:67
+#: protocols/wlm/ui/wlmeditaccountwidget.cpp:213
+msgid "<qt>You must enter a valid WLM passport.</qt>"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:145
-msgid "In love"
-msgstr ""
+#: protocols/wlm/ui/wlmaddcontactpage.cpp:67
+msgid "MSN Plugin"
+msgstr "Ategyn MSN"
 
-#: protocols/jabber/tasks/mood.cpp:147
-msgid "Indignant"
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, buttonDelete)
+#: protocols/wlm/ui/wlmeditaccountwidget.cpp:110
+#: protocols/wlm/ui/wlmeditaccountwidget.cpp:113
+#: plugins/alias/aliaspreferences.cpp:462 rc.cpp:2456 rc.cpp:2456
+msgid "Delete"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:149
-msgid "Interested"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:516
+#. i18n: ectx: property (text), widget (QLineEdit, mResource)
+#: protocols/oscar/liboscar/userdetails.cpp:600
+#: protocols/irc/ui/irceditaccountwidget.cpp:280 rc.cpp:1125
+#: kopete/kopetewindow.cpp:1118 kopete/main.cpp:32 rc.cpp:1125
+msgid "Kopete"
+msgstr "Kopete"
 
-#: protocols/jabber/tasks/mood.cpp:151
-msgid "Intoxicated"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:296
+msgid "file is empty: "
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:153
-msgid "Invincible"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:554
+msgid "Bad Request"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:155
-msgid "Jealous"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:557
+msgid "Request Timed Out"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:157
-msgid "Lonely"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:560
+msgid "Acceptance Period Timed Out"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:159
-msgid "Mean"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:563
+msgid "Unknown Error: "
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:161
-msgid "Moody"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:666
+msgid "missing IP or port"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:163
-msgid "Nervous"
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:757
+#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:767
+msgid "Timeout"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:165
-msgid "Neutral"
+#: protocols/oscar/icq/icqreadaway.cpp:34
+msgid "&Fetch Again"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:167
-msgid "Offended"
+#: protocols/oscar/icq/icqreadaway.cpp:40
+#: protocols/oscar/icq/icqreadaway.cpp:83
+#, kde-format
+msgid "'%2' Message for %1"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:169
-msgid "Playful"
+#: protocols/oscar/icq/icqreadaway.cpp:78
+#, kde-format
+msgid "Fetching '%2' Message for %1..."
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:171
-msgid "Proud"
+#: protocols/oscar/icq/icqcontact.cpp:266 protocols/oscar/oscarcontact.cpp:421
+msgid "Request Authorization"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:173
-msgid "Relieved"
+#: protocols/oscar/icq/icqcontact.cpp:267
+msgid "Reason for requesting authorization:"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:175
-msgid "Remorseful"
+#: protocols/oscar/icq/icqcontact.cpp:268 protocols/oscar/oscarcontact.cpp:422
+msgid "Please authorize me so I can add you to my contact list"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:177
-msgid "Restless"
+#: protocols/oscar/icq/icqcontact.cpp:292
+#, kde-format
+msgid ""
+"User %1 has granted your authorization request.\n"
+"Reason: %2"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:179
-msgid "Sad"
+#: protocols/oscar/icq/icqcontact.cpp:301
+#, kde-format
+msgid ""
+"User %1 has rejected the authorization request.\n"
+"Reason: %2"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:181
-msgid "Sarcastic"
-msgstr ""
+#: protocols/oscar/icq/icqcontact.cpp:452
+#, kde-format
+msgctxt "Translators: client-name client-version"
+msgid "%1 %2"
+msgstr "%1 %2"
 
-#: protocols/jabber/tasks/mood.cpp:183
-msgid "Serious"
-msgstr ""
+#: protocols/oscar/icq/icqcontact.cpp:461 protocols/oscar/oscarcontact.cpp:248
+msgid "UTF-8"
+msgstr "UTF-8"
 
-#: protocols/jabber/tasks/mood.cpp:185
-msgid "Shocked"
+#: protocols/oscar/icq/icqcontact.cpp:463
+msgid "RTF-Messages"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:187
-msgid "Shy"
+#: protocols/oscar/icq/icqcontact.cpp:465 protocols/oscar/oscarcontact.cpp:256
+msgid "DirectIM/IMImage"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:189
-msgid "Sick"
+#: protocols/oscar/icq/icqcontact.cpp:467
+msgid "Groupchat"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:191
-msgid "Sleepy"
+#: protocols/oscar/icq/icqcontact.cpp:538
+msgid ""
+"<qt>You must be logged on to ICQ before you can send a message to a "
+"user.</qt>"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:193
-msgid "Stressed"
+#: protocols/oscar/icq/icqcontact.cpp:540
+msgid "Not Signed On"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:195
-msgid "Surprised"
+#: protocols/oscar/icq/icqcontact.cpp:566
+msgid "&Request Authorization"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:197
-msgid "Thirsty"
+#: protocols/oscar/icq/icqcontact.cpp:571
+msgid "&Grant Authorization"
 msgstr ""
 
-#: protocols/jabber/tasks/mood.cpp:199
-msgid "Worried"
-msgstr ""
+#: protocols/oscar/icq/icqcontact.cpp:576
+#: protocols/oscar/icq/aimcontact.cpp:59
+msgid "&Ignore"
+msgstr "&Anwybyddu"
 
-#: protocols/jabber/jabberaccount.cpp:203
-msgid ""
-"Could not bind the Jabber file transfer manager to a local port. Please "
-"check if the file transfer port is already in use, or choose another port in "
-"the account settings."
+#: protocols/oscar/icq/icqcontact.cpp:580
+#: protocols/oscar/icq/aimcontact.cpp:63
+#: protocols/oscar/aim/icqcontact.cpp:151
+#: protocols/oscar/aim/aimcontact.cpp:75
+msgid "Always &Visible To"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:204
-msgid "Failed to start Jabber File Transfer Manager"
+#: protocols/oscar/icq/icqcontact.cpp:584
+#: protocols/oscar/icq/aimcontact.cpp:67
+#: protocols/oscar/aim/icqcontact.cpp:155
+#: protocols/oscar/aim/aimcontact.cpp:79
+msgid "Always &Invisible To"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:220
-msgid "Join Groupchat..."
+#: protocols/oscar/icq/icqcontact.cpp:588
+#: protocols/oscar/icq/aimcontact.cpp:71
+msgid "Select Encoding..."
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:234
-msgid "Services..."
-msgstr "Gwasanaethau ..."
+#: protocols/oscar/icq/icqstatusmanager.cpp:35
+#: protocols/oscar/aim/aimstatusmanager.cpp:31
+msgid "Connecting..."
+msgstr "Yn cysylltu..."
 
-#: protocols/jabber/jabberaccount.cpp:247
-#: protocols/oscar/icq/icqaccount.cpp:137
-#: protocols/oscar/aim/aimaccount.cpp:236
-msgid "Edit User Info..."
-msgstr ""
+#: protocols/oscar/icq/icqstatusmanager.cpp:39
+#: protocols/oscar/aim/aimstatusmanager.cpp:35
+msgid "Waiting for Authorization"
+msgstr "Yn aros am awdurdodiad"
 
-#: protocols/jabber/jabberaccount.cpp:252
-msgid "Set Mood"
+#: protocols/oscar/icq/icqstatusmanager.cpp:77
+#: protocols/oscar/aim/aimstatusmanager.cpp:69
+msgid "&Do Not Disturb"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:311
-msgid "Please connect first."
+#: protocols/oscar/icq/icqstatusmanager.cpp:79
+#: protocols/oscar/aim/aimstatusmanager.cpp:71
+msgid "O&ccupied"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:435
-#, kde-format
-msgid ""
-"SSL support could not be initialized for account %1. This is most likely "
-"because TLS support for QCA is not available."
+#: protocols/oscar/icq/icqstatusmanager.cpp:79
+#: protocols/oscar/aim/aimstatusmanager.cpp:71
+msgid "Occupied"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:475
-#: protocols/groupwise/gwaccount.cpp:734
-msgid "The host name does not match the one in the certificate."
-msgstr ""
+#: protocols/oscar/icq/icqstatusmanager.cpp:81
+#: protocols/oscar/aim/aimstatusmanager.cpp:73
+msgid "Not A&vailable"
+msgstr "Dim a&r gael"
 
-#: protocols/jabber/jabberaccount.cpp:479
-#: protocols/groupwise/gwaccount.cpp:738
-msgid "The certificate is invalid."
+#: protocols/oscar/icq/icqstatusmanager.cpp:85
+#: protocols/oscar/aim/aimstatusmanager.cpp:77
+msgid "&Free for Chat"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:483
-#: protocols/groupwise/gwaccount.cpp:742
-msgid "No certificate was presented."
+#: protocols/oscar/icq/icqstatusmanager.cpp:85
+#: protocols/oscar/aim/aimstatusmanager.cpp:77
+#: kopete/config/status/statusconfig_manager.cpp:56
+msgid "Free For Chat"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:493
-#: protocols/groupwise/gwaccount.cpp:752
-msgid "The Certificate Authority rejected the certificate."
+#: protocols/oscar/icq/icqstatusmanager.cpp:93
+#: protocols/oscar/aim/aimstatusmanager.cpp:86
+msgid "Mobile"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:497
-#: protocols/groupwise/gwaccount.cpp:756
-msgid "The certificate is not trusted."
+#: protocols/oscar/icq/icqstatusmanager.cpp:94
+#: protocols/oscar/oscaraccount.cpp:1221
+#: protocols/oscar/aim/aimprotocol.cpp:181
+#: protocols/yahoo/yahooprotocol.cpp:75
+msgid "AIM"
+msgstr "AIM"
+
+#: protocols/oscar/icq/icqstatusmanager.cpp:144
+msgctxt "@item icq xtraz status"
+msgid "angry"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:501
-#: protocols/groupwise/gwaccount.cpp:760
-msgid "The signature is invalid."
+#: protocols/oscar/icq/icqstatusmanager.cpp:145
+msgctxt "@item icq xtraz status"
+msgid "bath"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:505
-#: protocols/groupwise/gwaccount.cpp:764
-msgid "The Certificate Authority is invalid."
+#: protocols/oscar/icq/icqstatusmanager.cpp:146
+msgctxt "@item icq xtraz status"
+msgid "tired"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:509
-#: protocols/groupwise/gwaccount.cpp:768
-msgid "Invalid certificate purpose."
+#: protocols/oscar/icq/icqstatusmanager.cpp:147
+msgctxt "@item icq xtraz status"
+msgid "party"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:513
-#: protocols/groupwise/gwaccount.cpp:772
-msgid "The certificate is self-signed."
+#: protocols/oscar/icq/icqstatusmanager.cpp:148
+msgctxt "@item icq xtraz status"
+msgid "beer"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:517
-#: protocols/groupwise/gwaccount.cpp:776
-msgid "The certificate has been revoked."
+#: protocols/oscar/icq/icqstatusmanager.cpp:149
+msgctxt "@item icq xtraz status"
+msgid "thinking"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:521
-#: protocols/groupwise/gwaccount.cpp:780
-msgid "Maximum certificate chain length was exceeded."
+#: protocols/oscar/icq/icqstatusmanager.cpp:150
+msgctxt "@item icq xtraz status"
+msgid "eating"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:525
-#: protocols/groupwise/gwaccount.cpp:784
-msgid "The certificate has expired."
+#: protocols/oscar/icq/icqstatusmanager.cpp:151
+msgctxt "@item icq xtraz status"
+msgid "watching tv"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:529
-#: protocols/groupwise/gwaccount.cpp:788
-msgid "The Certificate Authority has expired."
+#: protocols/oscar/icq/icqstatusmanager.cpp:152
+msgctxt "@item icq xtraz status"
+msgid "meeting"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:533
-#: protocols/groupwise/gwaccount.cpp:792
-msgid "Validity is unknown."
+#: protocols/oscar/icq/icqstatusmanager.cpp:153
+msgctxt "@item icq xtraz status"
+msgid "coffee"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:544
-#: protocols/groupwise/gwaccount.cpp:803
-#, kde-format
-msgid ""
-"<qt><p>The identity and the certificate of server %1 could not be validated "
-"for account %2:</p><p>%3</p><p>%4</p><p>Do you want to continue?</p></qt>"
+#: protocols/oscar/icq/icqstatusmanager.cpp:154
+msgctxt "@item icq xtraz status"
+msgid "music"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:550
-#: protocols/jabber/jabberaccount.cpp:555
-#: protocols/groupwise/gwaccount.cpp:809 protocols/groupwise/gwaccount.cpp:814
-#, kde-format
-msgid ""
-"<qt><p>The certificate of server %1 could not be validated for account %2: "
-"%3</p><p>Do you want to continue?</p></qt>"
+#: protocols/oscar/icq/icqstatusmanager.cpp:155
+msgctxt "@item icq xtraz status"
+msgid "business"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:562
-msgid "Jabber Connection Certificate Problem"
+#: protocols/oscar/icq/icqstatusmanager.cpp:156
+msgctxt "@item icq xtraz status, taking pictures with camera"
+msgid "shooting"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:596
-msgid ""
-"An encrypted connection with the Jabber server could not be established."
+#: protocols/oscar/icq/icqstatusmanager.cpp:157
+msgctxt "@item icq xtraz status"
+msgid "having fun"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:597
-msgid "Jabber Connection Error"
+#: protocols/oscar/icq/icqstatusmanager.cpp:158
+msgctxt "@item icq xtraz status"
+msgid "phone"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:799
-msgid "Malformed packet received."
+#: protocols/oscar/icq/icqstatusmanager.cpp:159
+msgctxt "@item icq xtraz status"
+msgid "gaming"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:804
-msgid "There was an unrecoverable error in the protocol."
+#: protocols/oscar/icq/icqstatusmanager.cpp:160
+msgctxt "@item icq xtraz status"
+msgid "studying"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:811
-msgid "Generic stream error."
+#: protocols/oscar/icq/icqstatusmanager.cpp:161
+msgctxt "@item icq xtraz status"
+msgid "shopping"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:815
-msgid "There was a conflict in the information received."
+#: protocols/oscar/icq/icqstatusmanager.cpp:162
+msgctxt "@item icq xtraz status"
+msgid "sick"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:818
-msgid "The stream timed out."
+#: protocols/oscar/icq/icqstatusmanager.cpp:163
+msgctxt "@item icq xtraz status"
+msgid "sleeping"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:821
-msgid "Internal server error."
+#: protocols/oscar/icq/icqstatusmanager.cpp:164
+msgctxt "@item icq xtraz status, water sport"
+msgid "surfing"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:824
-msgid "Stream packet received from an invalid address."
+#: protocols/oscar/icq/icqstatusmanager.cpp:165
+msgctxt "@item icq xtraz status, browsing the Internet"
+msgid "browsing"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:827
-msgid "Malformed stream packet received."
+#: protocols/oscar/icq/icqstatusmanager.cpp:166
+msgctxt "@item icq xtraz status"
+msgid "working"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:831
-msgid "Policy violation in the protocol stream."
+#: protocols/oscar/icq/icqstatusmanager.cpp:167
+msgctxt "@item icq xtraz status"
+msgid "typing"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:835
-msgid "Resource constraint."
+#: protocols/oscar/icq/icqstatusmanager.cpp:168
+msgctxt "@item icq xtraz status"
+msgid "picnic"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:839
-msgid "System shutdown."
+#: protocols/oscar/icq/icqstatusmanager.cpp:169
+msgctxt "@item icq xtraz status"
+msgid "cooking"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:842
-msgid "Unknown reason."
+#: protocols/oscar/icq/icqstatusmanager.cpp:170
+msgctxt "@item icq xtraz status"
+msgid "smoking"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:846
-#, kde-format
-msgid "There was an error in the protocol stream: %1"
+#: protocols/oscar/icq/icqstatusmanager.cpp:171
+msgctxt "@item icq xtraz status"
+msgid "i am high"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:854
-msgid "Host not found."
-msgstr "Ni chafwyd gweinydd."
-
-#: protocols/jabber/jabberaccount.cpp:857
-msgid "Address is already in use."
+#: protocols/oscar/icq/icqstatusmanager.cpp:172
+msgctxt "@item icq xtraz status"
+msgid "wc"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:860
-msgid "Connection refused."
-msgstr "Gwrthodwyd y cysylltiad."
-
-#: protocols/jabber/jabberaccount.cpp:863
-msgid "Connection attempt already in progress."
+#: protocols/oscar/icq/icqstatusmanager.cpp:173
+msgctxt "@item icq xtraz status"
+msgid "to be or not to be"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:866
-msgid "Network failure."
+#: protocols/oscar/icq/icqstatusmanager.cpp:175
+msgctxt "@item icq xtraz status"
+msgid "love"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:869
-msgid "Socket timed out."
+#: protocols/oscar/icq/icqprotocol.cpp:121
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
+msgid "You must be online to add a contact."
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:872
-msgid "Remote closed connection."
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:121
+#: protocols/oscar/icq/ui/icqeditaccountwidget.cpp:312
+#: protocols/oscar/oscaraccount.cpp:1221
+#: protocols/oscar/aim/aimstatusmanager.cpp:87
+#: protocols/yahoo/yahooprotocol.cpp:76
+msgid "ICQ"
+msgstr "ICQ"
 
-#: protocols/jabber/jabberaccount.cpp:876
+#: protocols/oscar/icq/icqprotocol.cpp:126
 #, kde-format
-msgid "Unexpected error condition (%1)."
+msgid "'%1'"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:880
+#: protocols/oscar/icq/icqprotocol.cpp:127
 #, kde-format
-msgid "There was a connection error: %1"
+msgid "'%1' (%2)"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:888
-msgid "Unknown host."
+#: protocols/oscar/icq/icqprotocol.cpp:130
+#, kde-format
+msgid "Do you want to add %1 to your contact list?"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:892
-msgid "Could not connect to a required remote resource."
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:164
+msgid "IP Address"
+msgstr "Cyfeiriad IP"
 
-#: protocols/jabber/jabberaccount.cpp:895
-msgid ""
-"It appears we have been redirected to another server; I do not know how to "
-"handle this."
+#: protocols/oscar/icq/icqprotocol.cpp:214
+msgid "Antigua"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:898
-msgid "Unsupported protocol version."
+#: protocols/oscar/icq/icqprotocol.cpp:219
+msgid "Ascension Island"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:901
-#: protocols/jabber/jabberaccount.cpp:918
-#: protocols/jabber/jabberaccount.cpp:962
-#: protocols/jabber/jabberaccount.cpp:979
-#: protocols/jabber/jabberaccount.cpp:996
-#: protocols/jabber/jabberaccount.cpp:1004
-msgid "Unknown error."
-msgstr "Gwall anhysbys."
-
-#: protocols/jabber/jabberaccount.cpp:905
-#, kde-format
-msgid "There was a negotiation error: %1"
+#: protocols/oscar/icq/icqprotocol.cpp:227
+msgid "Barbuda"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:912
-msgid "Server rejected our request to start the TLS handshake."
+#: protocols/oscar/icq/icqprotocol.cpp:238
+msgid "British Virgin Islands"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:915
-msgid "Failed to establish a secure connection."
+#: protocols/oscar/icq/icqprotocol.cpp:250
+msgid "Canary Islands"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:922
-#, kde-format
-msgid "There was a Transport Layer Security (TLS) error: %1"
+#: protocols/oscar/icq/icqprotocol.cpp:254
+msgid "Cocos-Keeling Islands"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:929
-msgid "Login failed with unknown reason."
+#: protocols/oscar/icq/icqprotocol.cpp:255
+msgid "Cocos (Keeling) Islands"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:932
-msgid "No appropriate authentication mechanism available."
+#: protocols/oscar/icq/icqprotocol.cpp:266
+msgid "Diego Garcia"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:935
-msgid "Bad SASL authentication protocol."
+#: protocols/oscar/icq/icqprotocol.cpp:282
+msgid "French Antilles"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:938
-msgid "Server failed mutual authentication."
+#: protocols/oscar/icq/icqprotocol.cpp:283
+msgid "Antilles"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:941
-msgid "Encryption is required but not present."
+#: protocols/oscar/icq/icqprotocol.cpp:284
+msgid "French Guiana"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:944
-msgid "Invalid user ID."
+#: protocols/oscar/icq/icqprotocol.cpp:344
+msgid "Mayotte Island"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:947
-msgid "Invalid mechanism."
+#: protocols/oscar/icq/icqprotocol.cpp:359
+msgid "Nevis"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:950
-msgid "Invalid realm."
+#: protocols/oscar/icq/icqprotocol.cpp:381
+msgid "Reunion Island"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:953
-msgid "Mechanism too weak."
+#: protocols/oscar/icq/icqprotocol.cpp:383
+msgid "Rota Island"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:956
-msgid "Wrong credentials supplied. (check your user ID and password)"
+#: protocols/oscar/icq/icqprotocol.cpp:387
+msgid "Saipan Island"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:959
-msgid "Temporary failure, please try again later."
+#: protocols/oscar/icq/icqprotocol.cpp:393
+msgid "Sierra Leone"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:966
-#, kde-format
-msgid "There was an error authenticating with the server: %1"
+#: protocols/oscar/icq/icqprotocol.cpp:403
+msgid "St. Kitts"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:973
-msgid "Transport Layer Security (TLS) problem."
+#: protocols/oscar/icq/icqprotocol.cpp:417
+msgid "Tinian Island"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:976
-msgid "Simple Authentication and Security Layer (SASL) problem."
+#: protocols/oscar/icq/icqprotocol.cpp:432
+msgid "Wales"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:983
-#, kde-format
-msgid "There was an error in the security layer: %1"
+#: protocols/oscar/icq/icqprotocol.cpp:433
+msgid "Scotland"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:990
-msgid "No permission to bind the resource."
+#: protocols/oscar/icq/icqprotocol.cpp:444
+msgid "Yugoslavia - Serbia"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:993
-msgid "The resource is already in use."
+#: protocols/oscar/icq/icqprotocol.cpp:445
+msgid "Yugoslavia - Montenegro"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1000
-#, kde-format
-msgid "Could not bind a resource: %1"
+#: protocols/oscar/icq/icqprotocol.cpp:446
+msgid "Yugoslavia"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1013
-#, kde-format
-msgid "Kopete: Connection problem with Jabber server %1"
+#: protocols/oscar/icq/icqprotocol.cpp:447
+msgid "Congo, Democratic Republic of (Zaire)"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1172
-#, kde-format
-msgid ""
-"The Jabber user %1 removed %2's subscription to him/her. This account will "
-"no longer be able to view his/her online/offline status. Do you want to "
-"delete the contact?"
+#. i18n("Arabic")
+#: protocols/oscar/icq/icqprotocol.cpp:461
+msgid "Bhojpuri"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1348
-msgid "Waiting for authorization"
-msgstr "Yn aros am awdurdodiad"
+#. i18n("Bulgarian")
+#. i18n("Burmese")
+#: protocols/oscar/icq/icqprotocol.cpp:464
+msgid "Cantonese"
+msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1565
-#, kde-format
-msgid "A password is required to join the room %1."
+#. i18n("Catalan")
+#. i18n("Chinese")
+#. i18n("Croatian")
+#. i18n("Czech")
+#. i18n("Danish")
+#. i18n("Dutch")
+#. i18n("English")
+#. i18n("Esperanto")
+#. i18n("Estonian")
+#: protocols/oscar/icq/icqprotocol.cpp:474
+msgid "Farsi"
+msgstr "Ffarsi"
+
+#. i18n("Finnish")
+#. i18n("French")
+#. i18n("Gaelic")
+#. i18n("German")
+#. i18n("Greek")
+#. i18n("Hebrew")
+#. i18n("Hindi")
+#. i18n("Hungarian")
+#. i18n("Icelandic")
+#. i18n("Indonesian")
+#. i18n("Italian")
+#. i18n("Japanese")
+#. i18n("Khmer")
+#. i18n("Korean")
+#. i18n("Lao")
+#. i18n("Latvian")
+#. i18n("Lithuanian")
+#. i18n("Malay")
+#. i18n("Norwegian")
+#. i18n("Polish")
+#. i18n("Portuguese")
+#. i18n("Romanian")
+#. i18n("Russian")
+#. i18n("Serbian")
+#. i18n("Slovak")
+#. i18n("Slovenian")
+#. i18n("Somali")
+#. i18n("Spanish")
+#. i18n("Swahili")
+#. i18n("Swedish")
+#. i18n("Tagalog")
+#. i18n("Tatar")
+#. i18n("Thai")
+#. i18n("Turkish")
+#. i18n("Ukrainian")
+#. i18n("Urdu")
+#. i18n("Vietnamese")
+#. i18n("Yiddish")
+#. i18n("Yoruba")
+#. i18n("Afrikaans")
+#. i18n("Bosnian")
+#. i18n("Persian")
+#. i18n("Albanian")
+#. i18n("Armenian")
+#: protocols/oscar/icq/icqprotocol.cpp:519
+msgid "Punjabi"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1574
-#, kde-format
-msgid "Error trying to join %1 : nickname %2 is already in use"
+#. i18n("Chamorro")
+#. i18n("Mongolian")
+#: protocols/oscar/icq/icqprotocol.cpp:522
+msgid "Mandarin"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1588
-#, kde-format
-msgid "You cannot join the room %1 because you have been banned"
+#: protocols/oscar/icq/icqprotocol.cpp:523
+msgid "Taiwanese"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1589
-#: protocols/jabber/jabberaccount.cpp:1596
-#: protocols/jabber/jabberaccount.cpp:1606
-msgid "Jabber Group Chat"
+#. i18n("Macedonian")
+#. i18n("Sindhi")
+#. i18n("Welsh")
+#. i18n("Azerbaijani")
+#. i18n("Kurdish")
+#. i18n("Gujarati")
+#. i18n("Tamil")
+#: protocols/oscar/icq/icqprotocol.cpp:531
+msgid "Belorussian"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1595
-#, kde-format
-msgid ""
-"You cannot join the room %1 because the maximum number of users has been "
-"reached"
+#: protocols/oscar/icq/icqprotocol.cpp:540
+#: protocols/oscar/oscarencodingselectiondialog.cpp:41
+msgid "Big5"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1601
-msgid "No reason given by the server"
+#: protocols/oscar/icq/icqprotocol.cpp:541
+#: protocols/oscar/oscarencodingselectiondialog.cpp:42
+msgid "Big5-HKSCS"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1605
-#, kde-format
-msgid ""
-"There was an error processing your request for groupchat %1. (Reason: %2, "
-"Code %3)"
+#: protocols/oscar/icq/icqprotocol.cpp:542
+#: protocols/oscar/oscarencodingselectiondialog.cpp:43
+msgid "euc-JP Japanese"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1678
-#, kde-format
-msgid ""
-"Do you want to also unregister \"%1\" from the Jabber server ?\n"
-"If you unregister, your whole contact list may be removed from the server, "
-"and you will never be able to connect to this account with any client"
+#: protocols/oscar/icq/icqprotocol.cpp:543
+#: protocols/oscar/oscarencodingselectiondialog.cpp:44
+msgid "euc-KR Korean"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1681
-msgid "Unregister"
+#: protocols/oscar/icq/icqprotocol.cpp:544
+#: protocols/oscar/oscarencodingselectiondialog.cpp:45
+msgid "GB-2312 Chinese"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1682
-msgid "Remove and Unregister"
+#: protocols/oscar/icq/icqprotocol.cpp:545
+#: protocols/oscar/oscarencodingselectiondialog.cpp:46
+msgid "GBK Chinese"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1683
-msgid "Remove only from Kopete"
+#: protocols/oscar/icq/icqprotocol.cpp:546
+#: protocols/oscar/oscarencodingselectiondialog.cpp:47
+msgid "GB18030 Chinese"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1727
-#, kde-format
-msgid ""
-"An error occurred while trying to remove the account:\n"
-"%1"
+#: protocols/oscar/icq/icqprotocol.cpp:548
+#: protocols/oscar/oscarencodingselectiondialog.cpp:49
+msgid "JIS Japanese"
 msgstr ""
 
-#: protocols/jabber/jabberaccount.cpp:1728
-msgid "Jabber Account Unregistration"
+#: protocols/oscar/icq/icqprotocol.cpp:549
+#: protocols/oscar/oscarencodingselectiondialog.cpp:50
+msgid "Shift-JIS Japanese"
 msgstr ""
 
-#: protocols/jabber/jabberchatsession.cpp:74
-msgid "Show audio calls"
+#: protocols/oscar/icq/icqprotocol.cpp:551
+#: protocols/oscar/oscarencodingselectiondialog.cpp:52
+msgid "KOI8-R Russian"
 msgstr ""
 
-#: protocols/jabber/jabberchatsession.cpp:79
-msgid "Start audio call"
+#: protocols/oscar/icq/icqprotocol.cpp:552
+#: protocols/oscar/oscarencodingselectiondialog.cpp:53
+msgid "KOI8-U Ukrainian"
 msgstr ""
 
-#: protocols/jabber/jabberchatsession.cpp:159
-#, kde-format
-msgctxt "a contact's online status in parenthesis."
-msgid " (%1)"
+#: protocols/oscar/icq/icqprotocol.cpp:554
+#: protocols/oscar/oscarencodingselectiondialog.cpp:55
+msgid "ISO-8859-1 Western"
 msgstr ""
 
-#: protocols/jabber/jingle/jinglecontentdialog.cpp:29
-msgid "Audio"
+#: protocols/oscar/icq/icqprotocol.cpp:555
+#: protocols/oscar/oscarencodingselectiondialog.cpp:56
+msgid "ISO-8859-2 Central European"
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, AVDeviceConfig_VideoDevice)
-#: protocols/jabber/jingle/jinglecontentdialog.cpp:32 rc.cpp:5808 rc.cpp:5808
-msgid "Video"
-msgstr "Fideo"
-
-#: protocols/jabber/jingle/jinglecontentdialog.cpp:35
-#: libkopete/kopetetransfermanager.cpp:532
-#: libkopete/kopetetransfermanager.cpp:581
-msgid "File Transfer"
-msgstr "Trosglwyddo ffeiliau"
-
-#: protocols/jabber/jingle/jinglecontentdialog.cpp:74
-msgid "Choose the contents you want to accept:"
-msgstr ""
-
-#: protocols/jabber/jingle/jinglecontentdialog.cpp:81
-#, kde-format
-msgid "New Jingle session from %1"
-msgstr ""
-
-#: protocols/jabber/jabbergroupcontact.cpp:131
-msgid "Change nickname"
-msgstr ""
-
-#: protocols/jabber/jabbergroupcontact.cpp:392
-msgid "Change nickname - Jabber Plugin"
-msgstr ""
-
-#: protocols/jabber/jabbergroupcontact.cpp:393
-#, kde-format
-msgid "Please enter the new nickname you want to have in the room <i>%1</i>"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:29
-msgid "Select Encoding"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:40
-msgid "Default"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:41
-#: protocols/oscar/icq/icqprotocol.cpp:540
-msgid "Big5"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:42
-#: protocols/oscar/icq/icqprotocol.cpp:541
-msgid "Big5-HKSCS"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:43
-#: protocols/oscar/icq/icqprotocol.cpp:542
-msgid "euc-JP Japanese"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:44
-#: protocols/oscar/icq/icqprotocol.cpp:543
-msgid "euc-KR Korean"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:45
-#: protocols/oscar/icq/icqprotocol.cpp:544
-msgid "GB-2312 Chinese"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:46
-#: protocols/oscar/icq/icqprotocol.cpp:545
-msgid "GBK Chinese"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:47
-#: protocols/oscar/icq/icqprotocol.cpp:546
-msgid "GB18030 Chinese"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:49
-#: protocols/oscar/icq/icqprotocol.cpp:548
-msgid "JIS Japanese"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:50
-#: protocols/oscar/icq/icqprotocol.cpp:549
-msgid "Shift-JIS Japanese"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:52
-#: protocols/oscar/icq/icqprotocol.cpp:551
-msgid "KOI8-R Russian"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:53
-#: protocols/oscar/icq/icqprotocol.cpp:552
-msgid "KOI8-U Ukrainian"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:55
-#: protocols/oscar/icq/icqprotocol.cpp:554
-msgid "ISO-8859-1 Western"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:56
-#: protocols/oscar/icq/icqprotocol.cpp:555
-msgid "ISO-8859-2 Central European"
-msgstr ""
-
-#: protocols/oscar/oscarencodingselectiondialog.cpp:57
 #: protocols/oscar/icq/icqprotocol.cpp:556
+#: protocols/oscar/oscarencodingselectiondialog.cpp:57
 msgid "ISO-8859-3 Central European"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:58
 #: protocols/oscar/icq/icqprotocol.cpp:557
+#: protocols/oscar/oscarencodingselectiondialog.cpp:58
 msgid "ISO-8859-4 Baltic"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:59
 #: protocols/oscar/icq/icqprotocol.cpp:558
+#: protocols/oscar/oscarencodingselectiondialog.cpp:59
 msgid "ISO-8859-5 Cyrillic"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:60
 #: protocols/oscar/icq/icqprotocol.cpp:559
+#: protocols/oscar/oscarencodingselectiondialog.cpp:60
 msgid "ISO-8859-6 Arabic"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:61
 #: protocols/oscar/icq/icqprotocol.cpp:560
+#: protocols/oscar/oscarencodingselectiondialog.cpp:61
 msgid "ISO-8859-7 Greek"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:62
 #: protocols/oscar/icq/icqprotocol.cpp:561
+#: protocols/oscar/oscarencodingselectiondialog.cpp:62
 msgid "ISO-8859-8 Hebrew, visually ordered"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:63
 #: protocols/oscar/icq/icqprotocol.cpp:562
+#: protocols/oscar/oscarencodingselectiondialog.cpp:63
 msgid "ISO-8859-8-I Hebrew, logically ordered"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:64
 #: protocols/oscar/icq/icqprotocol.cpp:563
+#: protocols/oscar/oscarencodingselectiondialog.cpp:64
 msgid "ISO-8859-9 Turkish"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:65
 #: protocols/oscar/icq/icqprotocol.cpp:564
+#: protocols/oscar/oscarencodingselectiondialog.cpp:65
 msgid "ISO-8859-10"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:66
 #: protocols/oscar/icq/icqprotocol.cpp:565
+#: protocols/oscar/oscarencodingselectiondialog.cpp:66
 msgid "ISO-8859-13"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:67
 #: protocols/oscar/icq/icqprotocol.cpp:566
+#: protocols/oscar/oscarencodingselectiondialog.cpp:67
 msgid "ISO-8859-14"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:68
 #: protocols/oscar/icq/icqprotocol.cpp:567
+#: protocols/oscar/oscarencodingselectiondialog.cpp:68
 msgid "ISO-8859-15 Western"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:70
 #: protocols/oscar/icq/icqprotocol.cpp:569
+#: protocols/oscar/oscarencodingselectiondialog.cpp:70
 msgid "Windows-1250 Central European"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:71
 #: protocols/oscar/icq/icqprotocol.cpp:570
+#: protocols/oscar/oscarencodingselectiondialog.cpp:71
 msgid "Windows-1251 Cyrillic"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:72
 #: protocols/oscar/icq/icqprotocol.cpp:571
+#: protocols/oscar/oscarencodingselectiondialog.cpp:72
 msgid "Windows-1252 Western"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:73
 #: protocols/oscar/icq/icqprotocol.cpp:572
+#: protocols/oscar/oscarencodingselectiondialog.cpp:73
 msgid "Windows-1253 Greek"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:74
 #: protocols/oscar/icq/icqprotocol.cpp:573
+#: protocols/oscar/oscarencodingselectiondialog.cpp:74
 msgid "Windows-1254 Turkish"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:75
 #: protocols/oscar/icq/icqprotocol.cpp:574
+#: protocols/oscar/oscarencodingselectiondialog.cpp:75
 msgid "Windows-1255 Hebrew"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:76
 #: protocols/oscar/icq/icqprotocol.cpp:575
+#: protocols/oscar/oscarencodingselectiondialog.cpp:76
 msgid "Windows-1256 Arabic"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:77
 #: protocols/oscar/icq/icqprotocol.cpp:576
+#: protocols/oscar/oscarencodingselectiondialog.cpp:77
 msgid "Windows-1257 Baltic"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:78
 #: protocols/oscar/icq/icqprotocol.cpp:577
+#: protocols/oscar/oscarencodingselectiondialog.cpp:78
 msgid "Windows-1258 Viet Nam"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:80
 #: protocols/oscar/icq/icqprotocol.cpp:579
+#: protocols/oscar/oscarencodingselectiondialog.cpp:80
 msgid "IBM 850"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:81
 #: protocols/oscar/icq/icqprotocol.cpp:580
+#: protocols/oscar/oscarencodingselectiondialog.cpp:81
 msgid "IBM 866"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:83
 #: protocols/oscar/icq/icqprotocol.cpp:582
+#: protocols/oscar/oscarencodingselectiondialog.cpp:83
 msgid "TIS-620 Thai"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:85
 #: protocols/oscar/icq/icqprotocol.cpp:584
+#: protocols/oscar/oscarencodingselectiondialog.cpp:85
 msgid "UTF-8 Unicode"
 msgstr ""
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:86
 #: protocols/oscar/icq/icqprotocol.cpp:585
+#: protocols/oscar/oscarencodingselectiondialog.cpp:86
 msgid "UTF-16 Unicode"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:461
-#, kde-format
-msgctxt "@action:button filter-yes"
-msgid "%1"
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:597
+msgid "Single"
+msgstr "Sengl"
 
-#: protocols/oscar/oscaraccount.cpp:462
-#, kde-format
-msgctxt "@action:button filter-no"
-msgid "%1"
+#: protocols/oscar/icq/icqprotocol.cpp:598
+msgid "Long term relationship"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:463
-msgctxt "@action:button post-filter"
-msgid "."
+#: protocols/oscar/icq/icqprotocol.cpp:599
+msgid "Engaged"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:466
-msgid "Chat Room Invitation"
+#: protocols/oscar/icq/icqprotocol.cpp:600
+msgid "Married"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:627
-msgid "ICQ Web Express"
+#: protocols/oscar/icq/icqprotocol.cpp:601
+msgid "Divorced"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:629
-msgid "ICQ Email Express"
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:602
+msgid "Separated"
+msgstr "Ar wahan"
 
-#: protocols/oscar/oscaraccount.cpp:1021 protocols/oscar/oscaraccount.cpp:1038
-#, kde-format
-msgctxt "account has been disconnected"
-msgid "Kopete: %1 disconnected"
+#: protocols/oscar/icq/icqprotocol.cpp:603
+msgid "Widowed"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1075
-msgid ""
-"There was an error in the protocol handling; it was not fatal, so you will "
-"not be disconnected."
+#: protocols/oscar/icq/icqprotocol.cpp:610
+msgid "Art"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1077
-msgid ""
-"There was an error in the protocol handling; automatic reconnection "
-"occurring."
+#: protocols/oscar/icq/icqprotocol.cpp:611
+msgid "Cars"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1079
-msgid "Kopete: OSCAR Protocol error"
+#: protocols/oscar/icq/icqprotocol.cpp:612
+msgid "Celebrity Fans"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1219
-#: protocols/oscar/icq/ui/icqeditaccountwidget.cpp:312
-#: protocols/oscar/icq/icqprotocol.cpp:121
-#: protocols/oscar/aim/aimstatusmanager.cpp:87
-#: protocols/yahoo/yahooprotocol.cpp:76
-msgid "ICQ"
-msgstr "ICQ"
-
-#: protocols/oscar/oscaraccount.cpp:1219
-#: protocols/oscar/icq/icqstatusmanager.cpp:94
-#: protocols/oscar/aim/aimprotocol.cpp:181
-#: protocols/yahoo/yahooprotocol.cpp:75
-msgid "AIM"
-msgstr "AIM"
-
-#: protocols/oscar/oscaraccount.cpp:1220
-msgctxt "ICQ user id"
-msgid "UIN"
+#: protocols/oscar/icq/icqprotocol.cpp:613
+msgid "Collections"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1220
-msgctxt "AIM user id"
-msgid "screen name"
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:614
+#: protocols/oscar/icq/icqprotocol.cpp:671
+msgid "Computers"
+msgstr "Cyfrifiaduron"
 
-#: protocols/oscar/oscaraccount.cpp:1230
-#, kde-format
-msgid ""
-"You have logged in more than once with the same %1, account %2 is now "
-"disconnected."
+#: protocols/oscar/icq/icqprotocol.cpp:615
+msgid "Culture"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1236
-#, kde-format
-msgid ""
-"Sign on failed because either your %1 or password are invalid. Please check "
-"your settings for account %2."
+#: protocols/oscar/icq/icqprotocol.cpp:616
+msgid "Fitness"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1244
-#, kde-format
-msgid "The %1 service is temporarily unavailable. Please try again later."
+#: protocols/oscar/icq/icqprotocol.cpp:617
+#: protocols/oscar/oscarcontact.cpp:262
+msgid "Games"
+msgstr "Gemau"
+
+#: protocols/oscar/icq/icqprotocol.cpp:618
+msgid "Hobbies"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1249
-#, kde-format
-msgid ""
-"Could not sign on to %1 with account %2 because the password was incorrect."
+#: protocols/oscar/icq/icqprotocol.cpp:619
+msgid "ICQ - Help"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1254
-#, kde-format
-msgid "Could not sign on to %1 with nonexistent account %2."
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:620
+msgid "Internet"
+msgstr "Rhyngrwyd"
 
-#: protocols/oscar/oscaraccount.cpp:1258
-#, kde-format
-msgid "Sign on to %1 failed because your account %2 expired."
+#: protocols/oscar/icq/icqprotocol.cpp:621
+msgid "Lifestyle"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1262
-#, kde-format
-msgid "Sign on to %1 failed because your account %2 is currently suspended."
+#: protocols/oscar/icq/icqprotocol.cpp:622
+msgid "Movies and TV"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1268
-#, kde-format
-msgid ""
-"Could not sign on to %1 as there are too many clients from the same computer."
+#: protocols/oscar/icq/icqprotocol.cpp:623
+msgid "Music"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1274
-#, kde-format
-msgid ""
-"Account %1 was blocked on the %2 server for sending messages too quickly. "
-"Wait ten minutes and try again. If you continue to try, you will need to "
-"wait even longer."
+#: protocols/oscar/icq/icqprotocol.cpp:624
+msgid "Outdoors"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1283
-#, kde-format
-msgid ""
-"Account %1 was blocked on the %2 server for reconnecting too quickly. Wait "
-"ten minutes and try again. If you continue to try, you will need to wait "
-"even longer."
+#: protocols/oscar/icq/icqprotocol.cpp:625
+msgid "Parenting"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1295 protocols/oscar/oscaraccount.cpp:1313
-#, kde-format
-msgid "Sign on to %1 with your account %2 failed."
+#: protocols/oscar/icq/icqprotocol.cpp:626
+msgid "Pets and Animals"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1300
-#, kde-format
-msgid ""
-"The %1 server thinks the client you are using is too old. Please report this "
-"as a bug at http://bugs.kde.org"
+#: protocols/oscar/icq/icqprotocol.cpp:627
+msgid "Religion"
 msgstr ""
 
-#: protocols/oscar/oscaraccount.cpp:1306
-#, kde-format
-msgid ""
-"Account %1 was disabled on the %2 server because of your age (under than 13)."
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:628
+msgid "Science"
+msgstr "Gwyddoniaeth"
 
-#: protocols/oscar/icq/ui/xtrazicqstatuseditor.cpp:35
-msgid "Xtraz Status Editor"
+#: protocols/oscar/icq/icqprotocol.cpp:629
+msgid "Skills"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:30
-msgid "Authorization Reply"
-msgstr ""
+#: protocols/oscar/icq/icqprotocol.cpp:630
+#: protocols/oscar/icq/icqprotocol.cpp:691
+msgid "Sports"
+msgstr "Chwaraeon"
 
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:59
-#, kde-format
-msgid "<b>%1</b> requested authorization to add you to his/her contact list."
+#: protocols/oscar/icq/icqprotocol.cpp:631
+msgid "Web Design"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:61
-#, kde-format
-msgid "Authorization reply to <b>%1</b>."
+#: protocols/oscar/icq/icqprotocol.cpp:632
+msgid "Ecology"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:47
-msgid "ICQ User Search"
+#: protocols/oscar/icq/icqprotocol.cpp:633
+msgid "News and Media"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:51
-msgid "Add the selected user to your contact list"
+#: protocols/oscar/icq/icqprotocol.cpp:634
+#: protocols/oscar/icq/icqprotocol.cpp:676
+msgid "Government"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:61
-msgid "UIN"
+#: protocols/oscar/icq/icqprotocol.cpp:635
+msgid "Business"
+msgstr "Busnes"
+
+#: protocols/oscar/icq/icqprotocol.cpp:636
+msgid "Mystics"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:63
-#: protocols/groupwise/ui/gwsearch.cpp:98 libkopete/kopeteglobal.cpp:165
-msgid "First Name"
-msgstr "Enw Cyntaf"
+#: protocols/oscar/icq/icqprotocol.cpp:637
+msgid "Travel"
+msgstr "Teithio"
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:64
-#: protocols/groupwise/ui/gwsearch.cpp:101 libkopete/kopeteglobal.cpp:171
-msgid "Last Name"
-msgstr "Enw Olaf"
+#: protocols/oscar/icq/icqprotocol.cpp:638
+msgid "Astronomy"
+msgstr "Astroleg"
 
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:105
-#. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:65
-#: libkopete/ui/addressbookselectorwidget.cpp:78 rc.cpp:5171 rc.cpp:5171
-msgid "Email"
-msgstr "Ebost"
+#: protocols/oscar/icq/icqprotocol.cpp:639
+msgid "Space"
+msgstr "Gofodnod"
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:66
-msgid "Requires Authorization"
+#: protocols/oscar/icq/icqprotocol.cpp:640
+msgid "Clothing"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:98
-msgid "You must be online to search the ICQ Whitepages."
+#: protocols/oscar/icq/icqprotocol.cpp:641
+msgid "Parties"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:98
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:123
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:162
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:193
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:95
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:105
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:69
-msgid "ICQ Plugin"
+#: protocols/oscar/icq/icqprotocol.cpp:642
+msgid "Women"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:123
-msgid "You must enter a valid UIN."
+#: protocols/oscar/icq/icqprotocol.cpp:643
+msgid "Social science"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:162
-msgid "You must enter search criteria."
+#: protocols/oscar/icq/icqprotocol.cpp:644
+msgid "60's"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:193
-msgid "You must be online to display user info."
+#: protocols/oscar/icq/icqprotocol.cpp:645
+msgid "70's"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:282
-msgid "Yes"
+#: protocols/oscar/icq/icqprotocol.cpp:646
+msgid "80's"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:282
-msgid "No"
+#: protocols/oscar/icq/icqprotocol.cpp:647
+msgid "50's"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:97
-msgid "ICQ User Information"
+#: protocols/oscar/icq/icqprotocol.cpp:648
+msgid "Finance and Corporate"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitygeneral.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, IdentityGeneral)
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:110
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:57 rc.cpp:6236 rc.cpp:6236
-msgid "General Info"
+#: protocols/oscar/icq/icqprotocol.cpp:649
+msgid "Entertainment"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:111
-msgid "General ICQ Information"
+#: protocols/oscar/icq/icqprotocol.cpp:650
+msgid "Consumer Electronics"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:117
-msgid "Home Info"
+#: protocols/oscar/icq/icqprotocol.cpp:651
+msgid "Retail Stores"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:118
-msgid "Home Information"
+#: protocols/oscar/icq/icqprotocol.cpp:652
+msgid "Health and Beauty"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:124
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:64
-msgid "Work Info"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:860
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: protocols/oscar/icq/icqprotocol.cpp:653 rc.cpp:1186 rc.cpp:1186
+msgid "Media"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:125
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:65
-msgid "Work Information"
+#: protocols/oscar/icq/icqprotocol.cpp:654
+msgid "Household Products"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:131
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:71
-msgid "Other Info"
+#: protocols/oscar/icq/icqprotocol.cpp:655
+msgid "Mail Order Catalog"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:132
-msgid "Other ICQ Information"
+#: protocols/oscar/icq/icqprotocol.cpp:656
+msgid "Business Services"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:138
-msgid "Interest Info"
+#: protocols/oscar/icq/icqprotocol.cpp:657
+msgid "Audio and Visual"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:139
-msgid "Interest Information"
+#: protocols/oscar/icq/icqprotocol.cpp:658
+msgid "Sporting and Athletic"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:145
-msgid "Org & Aff Info"
+#: protocols/oscar/icq/icqprotocol.cpp:659
+msgid "Publishing"
+msgstr "Cyhoeddi"
+
+#: protocols/oscar/icq/icqprotocol.cpp:660
+msgid "Home Automation"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:146
-msgid "Organization & Affiliation Information"
+#: protocols/oscar/icq/icqprotocol.cpp:667
+msgid "Academic"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:150
-msgid "Type"
+#: protocols/oscar/icq/icqprotocol.cpp:668
+msgid "Administrative"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:152
-msgid "Publish Email/Email"
+#: protocols/oscar/icq/icqprotocol.cpp:669
+msgid "Art/Entertainment"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:424
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:701
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:731
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:800
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:801
-msgctxt "Primary email address"
-msgid "Primary"
+#: protocols/oscar/icq/icqprotocol.cpp:670
+msgid "College Student"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:474
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:701
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:717
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:800
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:801
-msgctxt "Other email address"
-msgid "More"
+#: protocols/oscar/icq/icqprotocol.cpp:672
+msgid "Community & Social"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:28
-msgid "Change ICQ Password"
+#: protocols/oscar/icq/icqprotocol.cpp:673
+msgid "Education"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:53
-msgid "ICQ Password Change"
+#: protocols/oscar/icq/icqprotocol.cpp:674
+msgid "Engineering"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:80
-msgid "Your new password must be between 6-8 characters long."
+#: protocols/oscar/icq/icqprotocol.cpp:675
+msgid "Financial Services"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:87
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:105
-msgid "Your password could not be changed."
+#: protocols/oscar/icq/icqprotocol.cpp:677
+msgid "High School Student"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:100
-msgid "Your password has been changed successfully."
+#: protocols/oscar/icq/icqprotocol.cpp:678
+msgid "Home"
 msgstr ""
 
-#: protocols/oscar/icq/ui/xtrazicqstatusdialog.cpp:29
-#: protocols/oscar/icq/icqaccount.cpp:190
-msgid "Set Xtraz Status"
+#: protocols/oscar/icq/icqprotocol.cpp:679
+msgid "ICQ - Providing Help"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
-#: protocols/oscar/icq/icqprotocol.cpp:121
-msgid "You must be online to add a contact."
+#: protocols/oscar/icq/icqprotocol.cpp:680
+msgid "Law"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:95
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:69
-msgid "You must enter a valid ICQ number."
+#: protocols/oscar/icq/icqprotocol.cpp:681
+msgid "Managerial"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:105
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:79
-msgid "You must enter a valid AOL screen name."
+#: protocols/oscar/icq/icqprotocol.cpp:682
+msgid "Manufacturing"
 msgstr ""
 
-#: protocols/oscar/icq/ui/icqeditaccountwidget.cpp:312
-msgid "<qt>You must enter a valid ICQ No.</qt>"
+#: protocols/oscar/icq/icqprotocol.cpp:683
+msgid "Medical/Health"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:126
-#, kde-format
-msgid "'%1'"
+#: protocols/oscar/icq/icqprotocol.cpp:684
+#: protocols/oscar/icq/icqprotocol.cpp:731
+msgid "Military"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:127
-#, kde-format
-msgid "'%1' (%2)"
+#: protocols/oscar/icq/icqprotocol.cpp:685
+msgid "Non-Government Organization"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:130
-#, kde-format
-msgid "Do you want to add %1 to your contact list?"
+#: protocols/oscar/icq/icqprotocol.cpp:686
+msgid "Other Services"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:164
-msgid "IP Address"
-msgstr "Cyfeiriad IP"
-
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:269
-#. i18n: ectx: property (text), item, widget (QComboBox, gender)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:645
-#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:223
-#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:269
-#. i18n: ectx: property (text), item, widget (QComboBox, gender)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:645
-#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:223
-#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
-#: protocols/oscar/icq/icqprotocol.cpp:198
-#: protocols/skype/skypecontact.cpp:237 rc.cpp:3140 rc.cpp:3357 rc.cpp:4384
-#: rc.cpp:3140 rc.cpp:3357 rc.cpp:4384
-msgid "Female"
+#: protocols/oscar/icq/icqprotocol.cpp:687
+msgid "Professional"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:264
-#. i18n: ectx: property (text), item, widget (QComboBox, gender)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:650
-#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:218
-#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:264
-#. i18n: ectx: property (text), item, widget (QComboBox, gender)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:650
-#. i18n: ectx: property (text), item, widget (QComboBox, uiGender)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:218
-#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
-#: protocols/oscar/icq/icqprotocol.cpp:199
-#: protocols/skype/skypecontact.cpp:235 rc.cpp:3137 rc.cpp:3360 rc.cpp:4381
-#: rc.cpp:3137 rc.cpp:3360 rc.cpp:4381
-msgid "Male"
+#: protocols/oscar/icq/icqprotocol.cpp:688
+msgid "Retail"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:214
-msgid "Antigua"
+#: protocols/oscar/icq/icqprotocol.cpp:689
+msgid "Retired"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:219
-msgid "Ascension Island"
+#: protocols/oscar/icq/icqprotocol.cpp:690
+msgid "Science & Research"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:227
-msgid "Barbuda"
+#: protocols/oscar/icq/icqprotocol.cpp:692
+msgid "Technical"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:238
-msgid "British Virgin Islands"
+#: protocols/oscar/icq/icqprotocol.cpp:693
+msgid "University Student"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:250
-msgid "Canary Islands"
+#: protocols/oscar/icq/icqprotocol.cpp:694
+msgid "Web Building"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:254
-msgid "Cocos-Keeling Islands"
+#: protocols/oscar/icq/icqprotocol.cpp:701
+msgid "Alumni Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:255
-msgid "Cocos (Keeling) Islands"
+#: protocols/oscar/icq/icqprotocol.cpp:702
+msgid "Charity Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:266
-msgid "Diego Garcia"
+#: protocols/oscar/icq/icqprotocol.cpp:703
+msgid "Club/Social Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:282
-msgid "French Antilles"
+#: protocols/oscar/icq/icqprotocol.cpp:704
+msgid "Community Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:283
-msgid "Antilles"
+#: protocols/oscar/icq/icqprotocol.cpp:705
+msgid "Cultural Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:284
-msgid "French Guiana"
+#: protocols/oscar/icq/icqprotocol.cpp:706
+msgid "Fan Clubs"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:344
-msgid "Mayotte Island"
+#: protocols/oscar/icq/icqprotocol.cpp:707
+msgid "Fraternity/Sorority"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:359
-msgid "Nevis"
+#: protocols/oscar/icq/icqprotocol.cpp:708
+msgid "Hobbyists Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:381
-msgid "Reunion Island"
+#: protocols/oscar/icq/icqprotocol.cpp:709
+msgid "International Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:383
-msgid "Rota Island"
+#: protocols/oscar/icq/icqprotocol.cpp:710
+msgid "Nature and Environment Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:387
-msgid "Saipan Island"
+#: protocols/oscar/icq/icqprotocol.cpp:711
+#: protocols/oscar/icq/icqprotocol.cpp:734
+msgid "Other"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:393
-msgid "Sierra Leone"
+#: protocols/oscar/icq/icqprotocol.cpp:712
+msgid "Professional Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:403
-msgid "St. Kitts"
+#: protocols/oscar/icq/icqprotocol.cpp:713
+msgid "Scientific/Technical Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:417
-msgid "Tinian Island"
+#: protocols/oscar/icq/icqprotocol.cpp:714
+msgid "Self Improvement Group"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:432
-msgid "Wales"
+#: protocols/oscar/icq/icqprotocol.cpp:715
+msgid "Spiritual/Religious Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:433
-msgid "Scotland"
+#: protocols/oscar/icq/icqprotocol.cpp:716
+msgid "Sports Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:444
-msgid "Yugoslavia - Serbia"
+#: protocols/oscar/icq/icqprotocol.cpp:717
+msgid "Support Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:445
-msgid "Yugoslavia - Montenegro"
+#: protocols/oscar/icq/icqprotocol.cpp:718
+msgid "Trade and Business Org."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:446
-msgid "Yugoslavia"
+#: protocols/oscar/icq/icqprotocol.cpp:719
+msgid "Union"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:447
-msgid "Congo, Democratic Republic of (Zaire)"
+#: protocols/oscar/icq/icqprotocol.cpp:720
+msgid "Voluntary Org."
 msgstr ""
 
-#. i18n("Arabic")
-#: protocols/oscar/icq/icqprotocol.cpp:461
-msgid "Bhojpuri"
+#: protocols/oscar/icq/icqprotocol.cpp:727
+msgid "Elementary School"
 msgstr ""
 
-#. i18n("Bulgarian")
-#. i18n("Burmese")
-#: protocols/oscar/icq/icqprotocol.cpp:464
-msgid "Cantonese"
+#: protocols/oscar/icq/icqprotocol.cpp:728
+msgid "High School"
 msgstr ""
 
-#. i18n("Catalan")
-#. i18n("Chinese")
-#. i18n("Croatian")
-#. i18n("Czech")
-#. i18n("Danish")
-#. i18n("Dutch")
-#. i18n("English")
-#. i18n("Esperanto")
-#. i18n("Estonian")
-#: protocols/oscar/icq/icqprotocol.cpp:474
-msgid "Farsi"
-msgstr "Ffarsi"
+#: protocols/oscar/icq/icqprotocol.cpp:729
+msgid "College"
+msgstr ""
 
-#. i18n("Finnish")
-#. i18n("French")
-#. i18n("Gaelic")
-#. i18n("German")
-#. i18n("Greek")
-#. i18n("Hebrew")
-#. i18n("Hindi")
-#. i18n("Hungarian")
-#. i18n("Icelandic")
-#. i18n("Indonesian")
-#. i18n("Italian")
-#. i18n("Japanese")
-#. i18n("Khmer")
-#. i18n("Korean")
-#. i18n("Lao")
-#. i18n("Latvian")
-#. i18n("Lithuanian")
-#. i18n("Malay")
-#. i18n("Norwegian")
-#. i18n("Polish")
-#. i18n("Portuguese")
-#. i18n("Romanian")
-#. i18n("Russian")
-#. i18n("Serbian")
-#. i18n("Slovak")
-#. i18n("Slovenian")
-#. i18n("Somali")
-#. i18n("Spanish")
-#. i18n("Swahili")
-#. i18n("Swedish")
-#. i18n("Tagalog")
-#. i18n("Tatar")
-#. i18n("Thai")
-#. i18n("Turkish")
-#. i18n("Ukrainian")
-#. i18n("Urdu")
-#. i18n("Vietnamese")
-#. i18n("Yiddish")
-#. i18n("Yoruba")
-#. i18n("Afrikaans")
-#. i18n("Bosnian")
-#. i18n("Persian")
-#. i18n("Albanian")
-#. i18n("Armenian")
-#: protocols/oscar/icq/icqprotocol.cpp:519
-msgid "Punjabi"
+#: protocols/oscar/icq/icqprotocol.cpp:730
+msgid "University"
 msgstr ""
 
-#. i18n("Chamorro")
-#. i18n("Mongolian")
-#: protocols/oscar/icq/icqprotocol.cpp:522
-msgid "Mandarin"
+#: protocols/oscar/icq/icqprotocol.cpp:732
+msgid "Past Work Place"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:523
-msgid "Taiwanese"
+#: protocols/oscar/icq/icqprotocol.cpp:733
+msgid "Past Organization"
 msgstr ""
 
-#. i18n("Macedonian")
-#. i18n("Sindhi")
-#. i18n("Welsh")
-#. i18n("Azerbaijani")
-#. i18n("Kurdish")
-#. i18n("Gujarati")
-#. i18n("Tamil")
-#: protocols/oscar/icq/icqprotocol.cpp:531
-msgid "Belorussian"
+#: protocols/oscar/icq/icqaccount.cpp:140
+#: protocols/oscar/aim/aimaccount.cpp:239
+msgid "In&visible"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:597
-msgid "Single"
-msgstr "Sengl"
-
-#: protocols/oscar/icq/icqprotocol.cpp:598
-msgid "Long term relationship"
+#: protocols/oscar/icq/icqaccount.cpp:190
+#: protocols/oscar/icq/ui/xtrazicqstatusdialog.cpp:29
+msgid "Set Xtraz Status"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:599
-msgid "Engaged"
+#: protocols/oscar/icq/icqaccount.cpp:192
+msgid "Set Status..."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:600
-msgid "Married"
+#: protocols/oscar/icq/icqaccount.cpp:196
+#: kopete/statusmenu/kopetestatusrootaction.cpp:169
+msgid "Edit Statuses..."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:601
-msgid "Divorced"
+#: protocols/oscar/icq/icqaccount.cpp:350
+#, kde-format
+msgid "User %1 is reading your status message"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:602
-msgid "Separated"
-msgstr "Ar wahan"
-
-#: protocols/oscar/icq/icqprotocol.cpp:603
-msgid "Widowed"
+#: protocols/oscar/icq/ui/xtrazicqstatuseditor.cpp:35
+msgid "Xtraz Status Editor"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:610
-msgid "Art"
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:95
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:105
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:98
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:123
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:162
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:193
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:69
+msgid "ICQ Plugin"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:611
-msgid "Cars"
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:95
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:69
+msgid "You must enter a valid ICQ number."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:612
-msgid "Celebrity Fans"
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:105
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:79
+msgid "You must enter a valid AOL screen name."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:613
-msgid "Collections"
+#: protocols/oscar/icq/ui/icqeditaccountwidget.cpp:312
+msgid "<qt>You must enter a valid ICQ No.</qt>"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:614
-#: protocols/oscar/icq/icqprotocol.cpp:671
-msgid "Computers"
-msgstr "Cyfrifiaduron"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:47
+msgid "ICQ User Search"
+msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:615
-msgid "Culture"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:51
+msgid "Add the selected user to your contact list"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:616
-msgid "Fitness"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:61
+msgid "UIN"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:617
-#: protocols/oscar/oscarcontact.cpp:262
-msgid "Games"
-msgstr "Gemau"
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:105
+#. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:65
+#: libkopete/ui/addressbookselectorwidget.cpp:78 rc.cpp:5232 rc.cpp:5232
+msgid "Email"
+msgstr "Ebost"
 
-#: protocols/oscar/icq/icqprotocol.cpp:618
-msgid "Hobbies"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:66
+msgid "Requires Authorization"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:619
-msgid "ICQ - Help"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:98
+msgid "You must be online to search the ICQ Whitepages."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:620
-msgid "Internet"
-msgstr "Rhyngrwyd"
-
-#: protocols/oscar/icq/icqprotocol.cpp:621
-msgid "Lifestyle"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:123
+msgid "You must enter a valid UIN."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:622
-msgid "Movies and TV"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:162
+msgid "You must enter search criteria."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:623
-msgid "Music"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:193
+msgid "You must be online to display user info."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:624
-msgid "Outdoors"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:282
+msgid "Yes"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:625
-msgid "Parenting"
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:282
+msgid "No"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:626
-msgid "Pets and Animals"
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:30
+msgid "Authorization Reply"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:627
-msgid "Religion"
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:59
+#, kde-format
+msgid "<b>%1</b> requested authorization to add you to his/her contact list."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:628
-msgid "Science"
-msgstr "Gwyddoniaeth"
-
-#: protocols/oscar/icq/icqprotocol.cpp:629
-msgid "Skills"
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:61
+#, kde-format
+msgid "Authorization reply to <b>%1</b>."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:630
-#: protocols/oscar/icq/icqprotocol.cpp:691
-msgid "Sports"
-msgstr "Chwaraeon"
-
-#: protocols/oscar/icq/icqprotocol.cpp:631
-msgid "Web Design"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:97
+msgid "ICQ User Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:632
-msgid "Ecology"
+#. i18n: file: kopete/identity/identitygeneral.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, IdentityGeneral)
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:110
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:57 rc.cpp:6323 rc.cpp:6323
+msgid "General Info"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:633
-msgid "News and Media"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:111
+msgid "General ICQ Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:634
-#: protocols/oscar/icq/icqprotocol.cpp:676
-msgid "Government"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:117
+msgid "Home Info"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:635
-msgid "Business"
-msgstr "Busnes"
-
-#: protocols/oscar/icq/icqprotocol.cpp:636
-msgid "Mystics"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:118
+msgid "Home Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:637
-msgid "Travel"
-msgstr "Teithio"
-
-#: protocols/oscar/icq/icqprotocol.cpp:638
-msgid "Astronomy"
-msgstr "Astroleg"
-
-#: protocols/oscar/icq/icqprotocol.cpp:639
-msgid "Space"
-msgstr "Gofodnod"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:124
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:64
+msgid "Work Info"
+msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:640
-msgid "Clothing"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:125
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:65
+msgid "Work Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:641
-msgid "Parties"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:131
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:71
+msgid "Other Info"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:642
-msgid "Women"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:132
+msgid "Other ICQ Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:643
-msgid "Social science"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:138
+msgid "Interest Info"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:644
-msgid "60's"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:139
+msgid "Interest Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:645
-msgid "70's"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:145
+msgid "Org & Aff Info"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:646
-msgid "80's"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:146
+msgid "Organization & Affiliation Information"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:647
-msgid "50's"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:150
+msgid "Type"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:648
-msgid "Finance and Corporate"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:152
+msgid "Publish Email/Email"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:649
-msgid "Entertainment"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:424
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:701
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:731
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:800
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:801
+msgctxt "Primary email address"
+msgid "Primary"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:650
-msgid "Consumer Electronics"
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:474
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:701
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:717
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:800
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:801
+msgctxt "Other email address"
+msgid "More"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:651
-msgid "Retail Stores"
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:28
+msgid "Change ICQ Password"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:652
-msgid "Health and Beauty"
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:53
+msgid "ICQ Password Change"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:860
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: protocols/oscar/icq/icqprotocol.cpp:653 rc.cpp:2052 rc.cpp:2052
-msgid "Media"
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:80
+msgid "Your new password must be between 6-8 characters long."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:654
-msgid "Household Products"
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:87
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:105
+msgid "Your password could not be changed."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:655
-msgid "Mail Order Catalog"
+#: protocols/oscar/icq/ui/icqchangepassworddialog.cpp:100
+msgid "Your password has been changed successfully."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:656
-msgid "Business Services"
+#: protocols/oscar/oscarlistnonservercontacts.cpp:30
+msgid "Add Contacts to Server List"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:657
-msgid "Audio and Visual"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:37
+#. i18n: ectx: property (text), widget (QPushButton, m_btnAdd)
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:127
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:37
+#. i18n: ectx: property (text), widget (QPushButton, m_btnAdd)
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:127
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#: protocols/oscar/oscarlistnonservercontacts.cpp:38
+#: plugins/alias/aliaspreferences.cpp:316 rc.cpp:612 rc.cpp:4410 rc.cpp:612
+#: rc.cpp:4410
+msgid "&Add"
+msgstr "&Ychwanegu"
 
-#: protocols/oscar/icq/icqprotocol.cpp:658
-msgid "Sporting and Athletic"
-msgstr ""
+#: protocols/oscar/oscarlistnonservercontacts.cpp:39
+msgid "Do &Not Add"
+msgstr "&Na Ychwaneger"
 
-#: protocols/oscar/icq/icqprotocol.cpp:659
-msgid "Publishing"
-msgstr "Cyhoeddi"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:153
+#. i18n: ectx: property (text), widget (KPushButton, deleteButton)
+#: protocols/oscar/oscarlistnonservercontacts.cpp:40 rc.cpp:5621 rc.cpp:5621
+msgid "&Delete"
+msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:660
-msgid "Home Automation"
+#: protocols/oscar/oscarprotocol.cpp:34
+msgid "Client Features"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:667
-msgid "Academic"
+#: protocols/oscar/oscarprotocol.cpp:35
+msgid "Buddy Icon MD5 Hash"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:668
-msgid "Administrative"
+#: protocols/oscar/oscarprotocol.cpp:36
+msgid "Contact Encoding"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:669
-msgid "Art/Entertainment"
+#: protocols/oscar/oscarprotocol.cpp:37
+msgid "Member Since"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:670
-msgid "College Student"
+#: protocols/oscar/oscarprotocol.cpp:39
+msgid "Protocol Version"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:672
-msgid "Community & Social"
+#: protocols/oscar/oscaraccount.cpp:463
+#, kde-format
+msgctxt "@action:button filter-yes"
+msgid "%1"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:673
-msgid "Education"
+#: protocols/oscar/oscaraccount.cpp:464
+#, kde-format
+msgctxt "@action:button filter-no"
+msgid "%1"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:674
-msgid "Engineering"
+#: protocols/oscar/oscaraccount.cpp:465
+msgctxt "@action:button post-filter"
+msgid "."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:675
-msgid "Financial Services"
+#: protocols/oscar/oscaraccount.cpp:468
+msgid "Chat Room Invitation"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:677
-msgid "High School Student"
+#: protocols/oscar/oscaraccount.cpp:629
+msgid "ICQ Web Express"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:678
-msgid "Home"
+#: protocols/oscar/oscaraccount.cpp:631
+msgid "ICQ Email Express"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:679
-msgid "ICQ - Providing Help"
+#: protocols/oscar/oscaraccount.cpp:1023 protocols/oscar/oscaraccount.cpp:1040
+#, kde-format
+msgctxt "account has been disconnected"
+msgid "Kopete: %1 disconnected"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:680
-msgid "Law"
+#: protocols/oscar/oscaraccount.cpp:1077
+msgid ""
+"There was an error in the protocol handling; it was not fatal, so you will "
+"not be disconnected."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:681
-msgid "Managerial"
+#: protocols/oscar/oscaraccount.cpp:1079
+msgid ""
+"There was an error in the protocol handling; automatic reconnection "
+"occurring."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:682
-msgid "Manufacturing"
+#: protocols/oscar/oscaraccount.cpp:1081
+msgid "Kopete: OSCAR Protocol error"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:683
-msgid "Medical/Health"
+#: protocols/oscar/oscaraccount.cpp:1222
+msgctxt "ICQ user id"
+msgid "UIN"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:684
-#: protocols/oscar/icq/icqprotocol.cpp:731
-msgid "Military"
+#: protocols/oscar/oscaraccount.cpp:1222
+msgctxt "AIM user id"
+msgid "screen name"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:685
-msgid "Non-Government Organization"
+#: protocols/oscar/oscaraccount.cpp:1232
+#, kde-format
+msgid ""
+"You have logged in more than once with the same %1, account %2 is now "
+"disconnected."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:686
-msgid "Other Services"
+#: protocols/oscar/oscaraccount.cpp:1238
+#, kde-format
+msgid ""
+"Sign on failed because either your %1 or password are invalid. Please check "
+"your settings for account %2."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:687
-msgid "Professional"
+#: protocols/oscar/oscaraccount.cpp:1246
+#, kde-format
+msgid "The %1 service is temporarily unavailable. Please try again later."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:688
-msgid "Retail"
+#: protocols/oscar/oscaraccount.cpp:1251
+#, kde-format
+msgid ""
+"Could not sign on to %1 with account %2 because the password was incorrect."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:689
-msgid "Retired"
+#: protocols/oscar/oscaraccount.cpp:1256
+#, kde-format
+msgid "Could not sign on to %1 with nonexistent account %2."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:690
-msgid "Science & Research"
+#: protocols/oscar/oscaraccount.cpp:1260
+#, kde-format
+msgid "Sign on to %1 failed because your account %2 expired."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:692
-msgid "Technical"
+#: protocols/oscar/oscaraccount.cpp:1264
+#, kde-format
+msgid "Sign on to %1 failed because your account %2 is currently suspended."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:693
-msgid "University Student"
+#: protocols/oscar/oscaraccount.cpp:1270
+#, kde-format
+msgid ""
+"Could not sign on to %1 as there are too many clients from the same computer."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:694
-msgid "Web Building"
+#: protocols/oscar/oscaraccount.cpp:1276
+#, kde-format
+msgid ""
+"Account %1 was blocked on the %2 server for sending messages too quickly. "
+"Wait ten minutes and try again. If you continue to try, you will need to "
+"wait even longer."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:701
-msgid "Alumni Org."
+#: protocols/oscar/oscaraccount.cpp:1285
+#, kde-format
+msgid ""
+"Account %1 was blocked on the %2 server for reconnecting too quickly. Wait "
+"ten minutes and try again. If you continue to try, you will need to wait "
+"even longer."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:702
-msgid "Charity Org."
+#: protocols/oscar/oscaraccount.cpp:1297 protocols/oscar/oscaraccount.cpp:1315
+#, kde-format
+msgid "Sign on to %1 with your account %2 failed."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:703
-msgid "Club/Social Org."
+#: protocols/oscar/oscaraccount.cpp:1302
+#, kde-format
+msgid ""
+"The %1 server thinks the client you are using is too old. Please report this "
+"as a bug at http://bugs.kde.org"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:704
-msgid "Community Org."
+#: protocols/oscar/oscaraccount.cpp:1308
+#, kde-format
+msgid ""
+"Account %1 was disabled on the %2 server because of your age (under than 13)."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:705
-msgid "Cultural Org."
+#: protocols/oscar/oscarencodingselectiondialog.cpp:29
+msgid "Select Encoding"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:706
-msgid "Fan Clubs"
+#: protocols/oscar/oscarencodingselectiondialog.cpp:40
+msgid "Default"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:707
-msgid "Fraternity/Sorority"
+#: protocols/oscar/oscarcontact.cpp:246
+msgid "Buddy icons"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:708
-msgid "Hobbyists Org."
+#: protocols/oscar/oscarcontact.cpp:250
+msgid "Rich text messages"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:709
-msgid "International Org."
+#: protocols/oscar/oscarcontact.cpp:252
+msgid "Group chat"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:710
-msgid "Nature and Environment Org."
+#: protocols/oscar/oscarcontact.cpp:254
+msgid "Voice chat"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:711
-#: protocols/oscar/icq/icqprotocol.cpp:734
-msgid "Other"
+#: protocols/oscar/oscarcontact.cpp:258
+msgid "Send buddy list"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:712
-msgid "Professional Org."
+#: protocols/oscar/oscarcontact.cpp:260
+msgid "File transfers"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:713
-msgid "Scientific/Technical Org."
+#: protocols/oscar/oscarcontact.cpp:417
+#, kde-format
+msgid ""
+"The user %1 requires authorization before being added to a contact list. Do "
+"you want to send an authorization request?\n"
+"\n"
+"Reason for requesting authorization:"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:714
-msgid "Self Improvement Group"
+#: protocols/oscar/nscainfoevent.cpp:27
+msgid "Adding contacts"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:715
-msgid "Spiritual/Religious Org."
+#: protocols/oscar/nscainfoevent.cpp:30
+msgid "Adding contacts to ICQ server list."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:716
-msgid "Sports Org."
+#: protocols/oscar/nscainfoevent.cpp:32
+msgid "Adding contacts to AIM server list."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:717
-msgid "Support Org."
+#: protocols/oscar/nscainfoevent.cpp:41
+#, kde-format
+msgctxt "%1 out of %2 contacts have been added"
+msgid "%1 out of %2 added."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:718
-msgid "Trade and Business Org."
+#: protocols/oscar/aim/aimaccount.cpp:218
+msgid ""
+"Visit the Kopete website at <a "
+"href=\"http://kopete.kde.org\">http://kopete.kde.org</a>"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:719
-msgid "Union"
+#: protocols/oscar/aim/aimaccount.cpp:233
+msgid "Join Chat..."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:720
-msgid "Voluntary Org."
+#: protocols/oscar/aim/aimaccount.cpp:381
+msgid "Editing your user info is not possible because you are not connected."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:727
-msgid "Elementary School"
+#: protocols/oscar/aim/aimaccount.cpp:383
+msgid "Unable to edit user info"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:728
-msgid "High School"
+#: protocols/oscar/aim/aimaccount.cpp:404
+msgid ""
+"Joining an AIM chat room is not possible because you are not connected."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:729
-msgid "College"
+#: protocols/oscar/aim/aimaccount.cpp:406
+msgid "Unable to Join AIM Chat Room"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:730
-msgid "University"
+#: protocols/oscar/aim/aimprotocol.cpp:209
+#, kde-format
+msgid ""
+"Unable to connect to the chat room %1 because the account for %2 is not "
+"connected."
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:732
-msgid "Past Work Place"
+#: protocols/oscar/aim/aimprotocol.cpp:227
+msgid "User Profile"
 msgstr ""
 
-#: protocols/oscar/icq/icqprotocol.cpp:733
-msgid "Past Organization"
+#: protocols/oscar/aim/aimuserinfo.cpp:42
+#: protocols/oscar/aim/aimuserinfo.cpp:143
+#: protocols/oscar/aim/aimuserinfo.cpp:160
+#, kde-format
+msgid "User Information on %1"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:266 protocols/oscar/oscarcontact.cpp:421
-msgid "Request Authorization"
+#: protocols/oscar/aim/aimuserinfo.cpp:95
+msgid "&Save Profile"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:267
-msgid "Reason for requesting authorization:"
+#: protocols/oscar/aim/aimuserinfo.cpp:115 protocols/gadu/gadupubdir.cpp:122
+#: protocols/gadu/gaduregisteraccount.cpp:170
+msgid "&Close"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:268 protocols/oscar/oscarcontact.cpp:422
-msgid "Please authorize me so I can add you to my contact list"
+#: protocols/oscar/aim/aimuserinfo.cpp:122
+msgid "Requesting User Profile, please wait..."
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:292
-#, kde-format
-msgid ""
-"User %1 has granted your authorization request.\n"
-"Reason: %2"
+#: protocols/oscar/aim/aimuserinfo.cpp:205
+msgid "<html><body><I>No user information provided</I></body></html>"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:301
+#: protocols/oscar/aim/aimcontact.cpp:71
+msgid "&Warn User"
+msgstr ""
+
+#: protocols/oscar/aim/aimcontact.cpp:221
 #, kde-format
 msgid ""
-"User %1 has rejected the authorization request.\n"
-"Reason: %2"
+"<qt>Would you like to warn %1 anonymously or with your name?<br>(Warning a "
+"user on AIM will result in a \"Warning Level\" increasing for the user you "
+"warn. Once this level has reached a certain point, they will not be able to "
+"sign on. Please do not abuse this function, it is meant for legitimate "
+"practices.)</qt>"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:452
+#: protocols/oscar/aim/aimcontact.cpp:229
 #, kde-format
-msgctxt "Translators: client-name client-version"
-msgid "%1 %2"
-msgstr "%1 %2"
-
-#: protocols/oscar/icq/icqcontact.cpp:461 protocols/oscar/oscarcontact.cpp:248
-msgid "UTF-8"
-msgstr "UTF-8"
-
-#: protocols/oscar/icq/icqcontact.cpp:463
-msgid "RTF-Messages"
+msgid "Warn User %1?"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:465 protocols/oscar/oscarcontact.cpp:256
-msgid "DirectIM/IMImage"
+#: protocols/oscar/aim/aimcontact.cpp:230
+msgid "Warn Anonymously"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:467
-msgid "Groupchat"
-msgstr ""
+#: protocols/oscar/aim/aimcontact.cpp:230
+msgid "Warn"
+msgstr "Rhybuddio"
 
-#: protocols/oscar/icq/icqcontact.cpp:538
-msgid ""
-"<qt>You must be logged on to ICQ before you can send a message to a "
-"user.</qt>"
+#: protocols/oscar/aim/aimjoinchat.cpp:32
+msgid "Join AIM Chat Room"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:540
-msgid "Not Signed On"
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:45
+msgid ""
+"You need to be connected to be able to add contacts.\n"
+"Connect to the AIM network and try again."
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:566
-msgid "&Request Authorization"
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:79
+msgid "No Screen Name"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:571
-msgid "&Grant Authorization"
+#: protocols/qq/qqsocket.cpp:152
+msgid ""
+"There was an error while connecting to the QQ server.\n"
+"Error message:\n"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:576
-#: protocols/oscar/icq/aimcontact.cpp:59
-msgid "&Ignore"
-msgstr "&Anwybyddu"
-
-#: protocols/oscar/icq/icqcontact.cpp:580
-#: protocols/oscar/icq/aimcontact.cpp:63
-#: protocols/oscar/aim/icqcontact.cpp:151
-#: protocols/oscar/aim/aimcontact.cpp:75
-msgid "Always &Visible To"
+#: protocols/qq/qqsocket.cpp:154
+#, kde-format
+msgid "Unable to lookup %1"
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:584
-#: protocols/oscar/icq/aimcontact.cpp:67
-#: protocols/oscar/aim/icqcontact.cpp:155
-#: protocols/oscar/aim/aimcontact.cpp:79
-msgid "Always &Invisible To"
+#: protocols/qq/qqsocket.cpp:234
+#, kde-format
+msgid ""
+"Unhandled QQ error code %1 \n"
+"Please file a bug report with a detailed description and, if possible, the "
+"last console debug output."
 msgstr ""
 
-#: protocols/oscar/icq/icqcontact.cpp:588
-#: protocols/oscar/icq/aimcontact.cpp:71
-msgid "Select Encoding..."
+#: protocols/qq/qqaccount.cpp:136
+msgid "Show my own video..."
 msgstr ""
 
-#: protocols/oscar/icq/icqaccount.cpp:140
-#: protocols/oscar/aim/aimaccount.cpp:239
-msgid "In&visible"
+#: protocols/qq/qqprotocol.cpp:43
+msgid "Country"
 msgstr ""
 
-#: protocols/oscar/icq/icqaccount.cpp:192
-msgid "Set Status..."
+#: protocols/qq/qqprotocol.cpp:44 protocols/qq/qqprotocol.cpp:45
+msgid "State"
 msgstr ""
 
-#: protocols/oscar/icq/icqaccount.cpp:196
-#: kopete/statusmenu/kopetestatusrootaction.cpp:169
-msgid "Edit Statuses..."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:325
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: protocols/qq/qqprotocol.cpp:46 rc.cpp:2894 rc.cpp:2894
+msgid "Home Address"
 msgstr ""
 
-#: protocols/oscar/icq/icqaccount.cpp:350
-#, kde-format
-msgid "User %1 is reading your status message"
+#: protocols/qq/qqprotocol.cpp:47
+msgid "Zipcode"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:35
-#: protocols/oscar/aim/aimstatusmanager.cpp:31
-msgid "Connecting..."
-msgstr "Yn cysylltu..."
+#: protocols/qq/qqprotocol.cpp:48
+msgid "Age"
+msgstr "Oedran"
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:39
-#: protocols/oscar/aim/aimstatusmanager.cpp:35
-msgid "Waiting for Authorization"
-msgstr "Yn aros am awdurdodiad"
+#: protocols/qq/qqcontact.cpp:147
+#: kopete/contactlist/kopetecontactlistview.cpp:182
+msgid "Send Email..."
+msgstr "Anfon Ebost ..."
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:77
-#: protocols/oscar/aim/aimstatusmanager.cpp:69
-msgid "&Do Not Disturb"
+#: protocols/qq/qqcontact.cpp:151
+msgid "View Contact's Webcam"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:79
-#: protocols/oscar/aim/aimstatusmanager.cpp:71
-msgid "O&ccupied"
+#: protocols/qq/qqcontact.cpp:155
+msgid "Send Webcam"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:79
-#: protocols/oscar/aim/aimstatusmanager.cpp:71
-msgid "Occupied"
+#: protocols/qq/ui/dlgqqvcard.cpp:44
+msgid "QQ vCard"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:81
-#: protocols/oscar/aim/aimstatusmanager.cpp:73
-msgid "Not A&vailable"
-msgstr "Dim a&r gael"
-
-#: protocols/oscar/icq/icqstatusmanager.cpp:81
-#: protocols/oscar/aim/aimstatusmanager.cpp:73
-#: protocols/skype/skypeaccount.cpp:938 protocols/skype/skypeprotocol.cpp:84
-msgid "Not Available"
-msgstr "Dim ar gael"
-
-#: protocols/oscar/icq/icqstatusmanager.cpp:85
-#: protocols/oscar/aim/aimstatusmanager.cpp:77
-msgid "&Free for Chat"
+#: protocols/qq/ui/dlgqqvcard.cpp:57
+msgid "WARNING: This vCard may be out-of-date."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:85
-#: protocols/oscar/aim/aimstatusmanager.cpp:77
-#: kopete/config/status/statusconfig_manager.cpp:56
-msgid "Free For Chat"
+#: protocols/qq/ui/qqeditaccountwidget.cpp:175
+msgid "<qt>You must enter a valid email address.</qt>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:93
-#: protocols/oscar/aim/aimstatusmanager.cpp:86
-msgid "Mobile"
+#: protocols/qq/ui/qqeditaccountwidget.cpp:175
+msgid "QQ Plugin"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:144
-msgctxt "@item icq xtraz status"
-msgid "angry"
+#: protocols/qq/ui/qqwebcamdialog.cpp:35
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:33
+#, kde-format
+msgid "Webcam for %1"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:145
-msgctxt "@item icq xtraz status"
-msgid "bath"
+#: protocols/qq/ui/qqwebcamdialog.cpp:52
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:50
+msgid "No webcam image received"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:146
-msgctxt "@item icq xtraz status"
-msgid "tired"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/privacy.ui:270
+#. i18n: ectx: property (text), widget (KPushButton, pb_edit)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:166
+#. i18n: ectx: property (text), widget (QPushButton, m_editregexp)
+#. i18n: file: protocols/jabber/ui/privacy.ui:270
+#. i18n: ectx: property (text), widget (KPushButton, pb_edit)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:166
+#. i18n: ectx: property (text), widget (QPushButton, m_editregexp)
+#: protocols/gadu/gaducontact.cpp:198 rc.cpp:1547 rc.cpp:4551 rc.cpp:1547
+#: rc.cpp:4551
+msgid "Edit..."
+msgstr "Golygu..."
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:147
-msgctxt "@item icq xtraz status"
-msgid "party"
+#: protocols/gadu/gaducontact.cpp:243
+msgid ""
+"<qt>You need to go online to remove a contact from your contact list.</qt>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:148
-msgctxt "@item icq xtraz status"
-msgid "beer"
+#: protocols/gadu/gaducontact.cpp:244
+msgid "Gadu-Gadu Plugin"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:149
-msgctxt "@item icq xtraz status"
-msgid "thinking"
+#: protocols/gadu/gadueditcontact.cpp:51 protocols/gadu/gadueditcontact.cpp:72
+msgid "Edit Contact's Properties"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:150
-msgctxt "@item icq xtraz status"
-msgid "eating"
+#: protocols/gadu/gadueditaccount.cpp:91
+msgctxt "personal information being fetched from server"
+msgid "<p align=\"center\">Fetching from server</p>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:151
-msgctxt "@item icq xtraz status"
-msgid "watching tv"
+#: protocols/gadu/gadueditaccount.cpp:198
+msgid "<b>Registration FAILED.</b>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:152
-msgctxt "@item icq xtraz status"
-msgid "meeting"
-msgstr ""
+#: protocols/gadu/gadueditaccount.cpp:198
+#: protocols/gadu/gadueditaccount.cpp:219
+#: protocols/gadu/gadueditaccount.cpp:224
+#: protocols/gadu/gadueditaccount.cpp:229
+#: protocols/gadu/gadueditaccount.cpp:263 protocols/gadu/gaducommands.cpp:144
+#: protocols/gadu/gaducommands.cpp:181 protocols/gadu/gaducommands.cpp:197
+#: protocols/gadu/gaducommands.cpp:232 protocols/gadu/gaducommands.cpp:248
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:153
-msgctxt "@item icq xtraz status"
-msgid "coffee"
+#: protocols/gadu/gadueditaccount.cpp:219
+msgid "<b>Enter UIN please.</b>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:154
-msgctxt "@item icq xtraz status"
-msgid "music"
+#: protocols/gadu/gadueditaccount.cpp:224
+msgid "<b>UIN should be a positive number.</b>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:155
-msgctxt "@item icq xtraz status"
-msgid "business"
+#: protocols/gadu/gadueditaccount.cpp:229
+msgid "<b>Enter password please.</b>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:156
-msgctxt "@item icq xtraz status, taking pictures with camera"
-msgid "shooting"
+#: protocols/gadu/gadueditaccount.cpp:263
+msgid "<b>Starting DCC listening socket failed; dcc is not working now.</b>"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:157
-msgctxt "@item icq xtraz status"
-msgid "having fun"
+#: protocols/gadu/gadudcctransaction.cpp:405
+msgid ""
+"Connection to peer was refused; it possibly does not listen for incoming "
+"connections."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:158
-msgctxt "@item icq xtraz status"
-msgid "phone"
+#: protocols/gadu/gadudcctransaction.cpp:409
+msgid "File transfer transaction was not agreed by peer."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:159
-msgctxt "@item icq xtraz status"
-msgid "gaming"
+#: protocols/gadu/gadudcctransaction.cpp:413
+msgid "File-transfer handshake failure."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:160
-msgctxt "@item icq xtraz status"
-msgid "studying"
+#: protocols/gadu/gadudcctransaction.cpp:416
+msgid "File transfer had problems with the file."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:161
-msgctxt "@item icq xtraz status"
-msgid "shopping"
+#: protocols/gadu/gadudcctransaction.cpp:419
+msgid "There was network error during file transfer."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:162
-msgctxt "@item icq xtraz status"
-msgid "sick"
+#: protocols/gadu/gadudcctransaction.cpp:422
+msgid "Unknown File-Transfer error."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:163
-msgctxt "@item icq xtraz status"
-msgid "sleeping"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:17
+#. i18n: ectx: property (windowTitle), widget (QWidget, GaduAwayUI)
+#: protocols/gadu/gaduaway.cpp:38 rc.cpp:3429 rc.cpp:3429
+msgid "Away Dialog"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:164
-msgctxt "@item icq xtraz status, water sport"
-msgid "surfing"
+#: protocols/gadu/gadusession.cpp:216 protocols/gadu/gadusession.cpp:229
+#: protocols/gadu/gadusession.cpp:241 protocols/gadu/gadusession.cpp:274
+msgid "You are not connected to the server."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:165
-msgctxt "@item icq xtraz status, browsing the Internet"
-msgid "browsing"
+#: protocols/gadu/gadusession.cpp:288 protocols/gadu/gadusession.cpp:306
+msgid "You have to be connected to the server to change your status."
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:166
-msgctxt "@item icq xtraz status"
-msgid "working"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:599
+msgid "idle"
+msgstr "segur"
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:167
-msgctxt "@item icq xtraz status"
-msgid "typing"
+#: protocols/gadu/gadusession.cpp:601
+msgid "resolving host"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:168
-msgctxt "@item icq xtraz status"
-msgid "picnic"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:603
+msgid "connecting"
+msgstr "cysylltu"
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:169
-msgctxt "@item icq xtraz status"
-msgid "cooking"
+#: protocols/gadu/gadusession.cpp:605
+msgid "reading data"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:170
-msgctxt "@item icq xtraz status"
-msgid "smoking"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:607
+msgid "error"
+msgstr "gwall"
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:171
-msgctxt "@item icq xtraz status"
-msgid "i am high"
+#: protocols/gadu/gadusession.cpp:609
+msgid "connecting to hub"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:172
-msgctxt "@item icq xtraz status"
-msgid "wc"
+#: protocols/gadu/gadusession.cpp:611
+msgid "connecting to server"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:173
-msgctxt "@item icq xtraz status"
-msgid "to be or not to be"
+#: protocols/gadu/gadusession.cpp:613
+msgid "retrieving key"
 msgstr ""
 
-#: protocols/oscar/icq/icqstatusmanager.cpp:175
-msgctxt "@item icq xtraz status"
-msgid "love"
+#: protocols/gadu/gadusession.cpp:615
+msgid "waiting for reply"
 msgstr ""
 
-#: protocols/oscar/icq/icqreadaway.cpp:34
-msgid "&Fetch Again"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:617
+msgid "connected"
+msgstr "wedi cysylltu"
 
-#: protocols/oscar/icq/icqreadaway.cpp:40
-#: protocols/oscar/icq/icqreadaway.cpp:83
-#, kde-format
-msgid "'%2' Message for %1"
+#: protocols/gadu/gadusession.cpp:619
+msgid "sending query"
 msgstr ""
 
-#: protocols/oscar/icq/icqreadaway.cpp:78
-#, kde-format
-msgid "Fetching '%2' Message for %1..."
+#: protocols/gadu/gadusession.cpp:621
+msgid "reading header"
 msgstr ""
 
-#: protocols/oscar/oscarprotocol.cpp:34
-msgid "Client Features"
+#: protocols/gadu/gadusession.cpp:623
+msgid "parsing data"
 msgstr ""
 
-#: protocols/oscar/oscarprotocol.cpp:35
-msgid "Buddy Icon MD5 Hash"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:625
+msgid "done"
+msgstr "wedi gorffen"
 
-#: protocols/oscar/oscarprotocol.cpp:36
-msgid "Contact Encoding"
+#: protocols/gadu/gadusession.cpp:627
+msgid "TLS connection negotiation"
 msgstr ""
 
-#: protocols/oscar/oscarprotocol.cpp:37
-msgid "Member Since"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:629
+msgid "unknown"
+msgstr "anhysbys"
 
-#: protocols/oscar/oscarprotocol.cpp:39
-msgid "Protocol Version"
+#: protocols/gadu/gadusession.cpp:637
+msgid "Resolving error."
 msgstr ""
 
-#: protocols/oscar/oscarlistnonservercontacts.cpp:30
-msgid "Add Contacts to Server List"
+#: protocols/gadu/gadusession.cpp:639
+msgid "Connecting error."
 msgstr ""
 
-#: protocols/oscar/oscarlistnonservercontacts.cpp:39
-msgid "Do &Not Add"
-msgstr "&Na Ychwaneger"
-
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:153
-#. i18n: ectx: property (text), widget (KPushButton, deleteButton)
-#: protocols/oscar/oscarlistnonservercontacts.cpp:40 rc.cpp:5543 rc.cpp:5543
-msgid "&Delete"
+#: protocols/gadu/gadusession.cpp:641
+msgid "Reading error."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:246
-msgid "Buddy icons"
+#: protocols/gadu/gadusession.cpp:643
+msgid "Writing error."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:250
-msgid "Rich text messages"
+#: protocols/gadu/gadusession.cpp:645 protocols/gadu/gadusession.cpp:670
+#, kde-format
+msgid "Unknown error number %1."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:252
-msgid "Group chat"
+#: protocols/gadu/gadusession.cpp:654
+msgid "Unable to resolve server address. DNS failure."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:254
-msgid "Voice chat"
+#: protocols/gadu/gadusession.cpp:656
+msgid "Unable to connect to server."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:258
-msgid "Send buddy list"
+#: protocols/gadu/gadusession.cpp:658
+msgid "Server sent incorrect data. Protocol error."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:260
-msgid "File transfers"
+#: protocols/gadu/gadusession.cpp:660
+msgid "Problem reading data from server."
 msgstr ""
 
-#: protocols/oscar/oscarcontact.cpp:417
-#, kde-format
-msgid ""
-"The user %1 requires authorization before being added to a contact list. Do "
-"you want to send an authorization request?\n"
-"\n"
-"Reason for requesting authorization:"
+#: protocols/gadu/gadusession.cpp:662
+msgid "Problem sending data to server."
 msgstr ""
 
-#: protocols/oscar/aim/aimjoinchat.cpp:32
-msgid "Join AIM Chat Room"
-msgstr ""
+#: protocols/gadu/gadusession.cpp:664
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:769
+msgid "Incorrect password."
+msgstr "Cyfrinair anghywir."
 
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:45
+#: protocols/gadu/gadusession.cpp:668
 msgid ""
-"You need to be connected to be able to add contacts.\n"
-"Connect to the AIM network and try again."
+"Unable to connect over an encrypted channel.\n"
+"Try to turn off encryption support in the Gadu account settings, then "
+"reconnect."
 msgstr ""
 
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:79
-msgid "No Screen Name"
+#: protocols/gadu/gadupubdir.cpp:81 protocols/gadu/gadupubdir.cpp:332
+msgid "Search &More..."
 msgstr ""
 
-#: protocols/oscar/aim/aimaccount.cpp:218
-msgid ""
-"Visit the Kopete website at <a "
-"href=\"http://kopete.kde.org\">http://kopete.kde.org</a>"
+#: protocols/gadu/gadupubdir.cpp:110
+msgid "Gadu-Gadu Public Directory"
 msgstr ""
 
-#: protocols/oscar/aim/aimaccount.cpp:233
-msgid "Join Chat..."
+#: protocols/gadu/gadupubdir.cpp:119
+msgid "&New Search"
 msgstr ""
 
-#: protocols/oscar/aim/aimaccount.cpp:381
-msgid "Editing your user info is not possible because you are not connected."
-msgstr ""
+#: protocols/gadu/gadupubdir.cpp:120 protocols/gadu/gadupubdir.cpp:297
+#: protocols/irc/ui/channellist.cpp:216
+msgid "S&earch"
+msgstr "C&hwilio"
 
-#: protocols/oscar/aim/aimaccount.cpp:383
-msgid "Unable to edit user info"
+#: protocols/gadu/gadupubdir.cpp:121
+msgid "&Add User..."
 msgstr ""
 
-#: protocols/oscar/aim/aimaccount.cpp:404
-msgid ""
-"Joining an AIM chat room is not possible because you are not connected."
-msgstr ""
-
-#: protocols/oscar/aim/aimaccount.cpp:406
-msgid "Unable to Join AIM Chat Room"
+#: protocols/gadu/gaduaccount.cpp:203
+msgid "&Search for Friends"
 msgstr ""
 
-#: protocols/oscar/aim/aimcontact.cpp:71
-msgid "&Warn User"
+#: protocols/gadu/gaduaccount.cpp:206
+msgid "Export Contacts to Server"
 msgstr ""
 
-#: protocols/oscar/aim/aimcontact.cpp:221
-#, kde-format
-msgid ""
-"<qt>Would you like to warn %1 anonymously or with your name?<br>(Warning a "
-"user on AIM will result in a \"Warning Level\" increasing for the user you "
-"warn. Once this level has reached a certain point, they will not be able to "
-"sign on. Please do not abuse this function, it is meant for legitimate "
-"practices.)</qt>"
+#: protocols/gadu/gaduaccount.cpp:210
+msgid "Import Contacts from Server"
 msgstr ""
 
-#: protocols/oscar/aim/aimcontact.cpp:229
-#, kde-format
-msgid "Warn User %1?"
+#: protocols/gadu/gaduaccount.cpp:214
+msgid "Delete Contacts from Server"
 msgstr ""
 
-#: protocols/oscar/aim/aimcontact.cpp:230
-msgid "Warn Anonymously"
+#: protocols/gadu/gaduaccount.cpp:218
+msgid "Export Contacts to File..."
 msgstr ""
 
-#: protocols/oscar/aim/aimcontact.cpp:230
-msgid "Warn"
-msgstr "Rhybuddio"
-
-#: protocols/oscar/aim/aimprotocol.cpp:209
-#, kde-format
-msgid ""
-"Unable to connect to the chat room %1 because the account for %2 is not "
-"connected."
+#: protocols/gadu/gaduaccount.cpp:222
+msgid "Import Contacts from File..."
 msgstr ""
 
-#: protocols/oscar/aim/aimprotocol.cpp:227
-msgid "User Profile"
+#: protocols/gadu/gaduaccount.cpp:226
+msgid "Only for Friends"
 msgstr ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:42
-#: protocols/oscar/aim/aimuserinfo.cpp:143
-#: protocols/oscar/aim/aimuserinfo.cpp:160
+#: protocols/gadu/gaduaccount.cpp:288
 #, kde-format
-msgid "User Information on %1"
+msgid "%1 <%2> "
 msgstr ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:95
-msgid "&Save Profile"
+#: protocols/gadu/gaduaccount.cpp:329
+msgid "Go O&nline"
 msgstr ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:115
-#: protocols/gadu/gaduregisteraccount.cpp:170
-#: protocols/gadu/gadupubdir.cpp:122
-msgid "&Close"
+#: protocols/gadu/gaduaccount.cpp:336
+msgid "Set &Busy"
 msgstr ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:122
-msgid "Requesting User Profile, please wait..."
+#: protocols/gadu/gaduaccount.cpp:343
+msgid "Set &Invisible"
 msgstr ""
 
-#: protocols/oscar/aim/aimuserinfo.cpp:205
-msgid "<html><body><I>No user information provided</I></body></html>"
+#: protocols/gadu/gaduaccount.cpp:350
+msgid "Go &Offline"
 msgstr ""
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:296
-msgid "file is empty: "
+#: protocols/gadu/gaduaccount.cpp:355
+msgid "Set &Description..."
 msgstr ""
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:554
-msgid "Bad Request"
-msgstr ""
+#: protocols/gadu/gaduaccount.cpp:369
+#: libkopete/ui/metacontactselectorwidget.cpp:216
+msgid "Contacts"
+msgstr "Cysylltau"
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:557
-msgid "Request Timed Out"
+#: protocols/gadu/gaduaccount.cpp:379
+msgid "Export Contacts on change"
 msgstr ""
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:560
-msgid "Acceptance Period Timed Out"
+#: protocols/gadu/gaduaccount.cpp:775
+msgid "connection using SSL was not possible, retrying without."
 msgstr ""
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:563
-msgid "Unknown Error: "
+#: protocols/gadu/gaduaccount.cpp:803
+#, kde-format
+msgid "unable to connect to the Gadu-Gadu server(\"%1\")."
 msgstr ""
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:666
-msgid "missing IP or port"
+#: protocols/gadu/gaduaccount.cpp:804 protocols/gadu/gaducommands.cpp:326
+#: protocols/gadu/gaducommands.cpp:334 protocols/gadu/gaducommands.cpp:382
+msgid "Connection Error"
 msgstr ""
 
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:757
-#: protocols/oscar/liboscar/tasks/filetransfertask.cpp:767
-msgid "Timeout"
+#: protocols/gadu/gaduaccount.cpp:942
+msgid "Imported contacts list is empty."
 msgstr ""
 
-#: protocols/oscar/nscainfoevent.cpp:27
-msgid "Adding contacts"
+#: protocols/gadu/gaduaccount.cpp:989
+msgid "Contacts imported."
 msgstr ""
 
-#: protocols/oscar/nscainfoevent.cpp:30
-msgid "Adding contacts to ICQ server list."
+#: protocols/gadu/gaduaccount.cpp:998
+msgid "Contacts exported."
 msgstr ""
 
-#: protocols/oscar/nscainfoevent.cpp:32
-msgid "Adding contacts to AIM server list."
+#: protocols/gadu/gaduaccount.cpp:1004
+msgid "Contacts deleted from the server."
 msgstr ""
 
-#: protocols/oscar/nscainfoevent.cpp:41
+#: protocols/gadu/gaduaccount.cpp:1040
 #, kde-format
-msgctxt "%1 out of %2 contacts have been added"
-msgid "%1 out of %2 added."
-msgstr ""
-
-#: protocols/gadu/gadueditcontact.cpp:51 protocols/gadu/gadueditcontact.cpp:72
-msgid "Edit Contact's Properties"
-msgstr ""
-
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:50
-#. i18n: ectx: property (text), item, widget (QComboBox, authorCombo)
-#: protocols/gadu/gaduprotocol.cpp:54 rc.cpp:4044 rc.cpp:4044
-msgid "Blocked"
-msgstr ""
-
-#: protocols/gadu/gaduprotocol.cpp:63
-msgid "A&way"
-msgstr "I& ffwrdd"
-
-#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:70
-msgid "B&usy"
-msgstr "P&rysur"
-
-#: protocols/gadu/gaduprotocol.cpp:74 protocols/gadu/gaduprotocol.cpp:79
-msgid "I&nvisible"
-msgstr ""
-
-#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:40
-#. i18n: ectx: property (text), widget (QRadioButton, radioOnline)
-#: protocols/gadu/gaduprotocol.cpp:82 protocols/gadu/gaduprotocol.cpp:86
-#: kopete/kopetewindow.cpp:410 rc.cpp:3564 rc.cpp:3564
-msgid "&Online"
-msgstr "&Ar-lein"
-
-#: protocols/gadu/gadueditaccount.cpp:91
-msgctxt "personal information being fetched from server"
-msgid "<p align=\"center\">Fetching from server</p>"
-msgstr ""
-
-#: protocols/gadu/gadueditaccount.cpp:198
-msgid "<b>Registration FAILED.</b>"
+msgid "Save Contacts List for Account %1 As"
 msgstr ""
 
-#: protocols/gadu/gadueditaccount.cpp:198
-#: protocols/gadu/gadueditaccount.cpp:219
-#: protocols/gadu/gadueditaccount.cpp:224
-#: protocols/gadu/gadueditaccount.cpp:229
-#: protocols/gadu/gadueditaccount.cpp:263 protocols/gadu/gaducommands.cpp:148
-#: protocols/gadu/gaducommands.cpp:185 protocols/gadu/gaducommands.cpp:201
-#: protocols/gadu/gaducommands.cpp:236 protocols/gadu/gaducommands.cpp:252
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: protocols/gadu/gadueditaccount.cpp:219
-msgid "<b>Enter UIN please.</b>"
+#: protocols/gadu/gaduaccount.cpp:1048
+msgid "Unable to create temporary file."
 msgstr ""
 
-#: protocols/gadu/gadueditaccount.cpp:224
-msgid "<b>UIN should be a positive number.</b>"
+#: protocols/gadu/gaduaccount.cpp:1048 protocols/gadu/gaduaccount.cpp:1062
+msgid "Save Contacts List Failed"
 msgstr ""
 
-#: protocols/gadu/gadueditaccount.cpp:229
-msgid "<b>Enter password please.</b>"
+#: protocols/gadu/gaduaccount.cpp:1086
+#, kde-format
+msgid "Load Contacts List for Account %1 As"
 msgstr ""
 
-#: protocols/gadu/gadueditaccount.cpp:263
-msgid "<b>Starting DCC listening socket failed; dcc is not working now.</b>"
+#: protocols/gadu/gaduaccount.cpp:1106 protocols/gadu/gaduaccount.cpp:1112
+msgid "Contacts List Load Has Failed"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:148 protocols/gadu/gaducommands.cpp:236
+#: protocols/gadu/gaducommands.cpp:144 protocols/gadu/gaducommands.cpp:232
 msgid "Unable to retrieve token."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:185
+#: protocols/gadu/gaducommands.cpp:181
 msgid "Registration FAILED"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:201
+#: protocols/gadu/gaducommands.cpp:197
 msgid "Unknown connection error while retrieving token."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:209
+#: protocols/gadu/gaducommands.cpp:205
 #, kde-format
 msgid "Token retrieving status: %1"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:218
+#: protocols/gadu/gaducommands.cpp:214
 msgid "Gadu-Gadu token retrieve problem"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:252
+#: protocols/gadu/gaducommands.cpp:248
 msgid "Unknown connection error while registering."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:259
+#: protocols/gadu/gaducommands.cpp:255
 #, kde-format
 msgid "Registration status: %1"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:268
+#: protocols/gadu/gaducommands.cpp:264
 msgid "Gadu-Gadu Registration Error"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:280
+#: protocols/gadu/gaducommands.cpp:276
 msgid "Registration Finished"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:280
+#: protocols/gadu/gaducommands.cpp:276
 msgid "Registration has been completed successfully."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:283
+#: protocols/gadu/gaducommands.cpp:279
 msgid "Registration Error"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:283
+#: protocols/gadu/gaducommands.cpp:279
 msgid "Incorrect data sent to server."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:330 protocols/gadu/gaducommands.cpp:338
-#: protocols/gadu/gaducommands.cpp:386 protocols/gadu/gaduaccount.cpp:804
-msgid "Connection Error"
-msgstr ""
-
-#: protocols/gadu/gaducommands.cpp:330 protocols/gadu/gaducommands.cpp:338
+#: protocols/gadu/gaducommands.cpp:326 protocols/gadu/gaducommands.cpp:334
 msgid "Password reminding finished prematurely due to a connection error."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:346
+#: protocols/gadu/gaducommands.cpp:342
 msgid "Success"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:346
+#: protocols/gadu/gaducommands.cpp:342
 msgid "Unsuccessful. Please retry."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:347
+#: protocols/gadu/gaducommands.cpp:343
 msgid "Remind Password"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:347
+#: protocols/gadu/gaducommands.cpp:343
 msgid "Remind password finished: "
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:386
+#: protocols/gadu/gaducommands.cpp:382
 msgid "Password changing finished prematurely due to a connection error."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:394
+#: protocols/gadu/gaducommands.cpp:390
 msgid "State Error"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:395
+#: protocols/gadu/gaducommands.cpp:391
 msgid ""
 "Password changing finished prematurely due to a session related problem (try "
 "again later)."
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:402
+#: protocols/gadu/gaducommands.cpp:398
 msgid "Changed Password"
 msgstr ""
 
-#: protocols/gadu/gaducommands.cpp:402
+#: protocols/gadu/gaducommands.cpp:398
 msgid "Your password has been changed."
 msgstr "Newidwyd eich cyfrinair."
 
-#: protocols/gadu/gaduaccount.cpp:203
-msgid "&Search for Friends"
+#: protocols/gadu/gaduregisteraccount.cpp:43
+msgid "Register New Account"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:206
-msgid "Export Contacts to Server"
+#: protocols/gadu/gaduregisteraccount.cpp:54
+msgid "&Register"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:210
-msgid "Import Contacts from Server"
+#. i18n: file: protocols/jabber/ui/dlgcommand.ui:145
+#. i18n: ectx: property (text), widget (QPushButton, btnCancel)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:228
+#. i18n: ectx: property (text), widget (QPushButton, m_cancelButton)
+#. i18n: file: plugins/alias/aliasdialog.ui:91
+#. i18n: ectx: property (text), widget (KPushButton, kPushButton3)
+#. i18n: file: protocols/jabber/ui/dlgcommand.ui:145
+#. i18n: ectx: property (text), widget (QPushButton, btnCancel)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:228
+#. i18n: ectx: property (text), widget (QPushButton, m_cancelButton)
+#. i18n: file: plugins/alias/aliasdialog.ui:91
+#. i18n: ectx: property (text), widget (KPushButton, kPushButton3)
+#: protocols/gadu/gaduregisteraccount.cpp:55
+#: plugins/history/historydialog.cpp:468 rc.cpp:1306 rc.cpp:4187 rc.cpp:4640
+#: rc.cpp:1306 rc.cpp:4187 rc.cpp:4640
+msgid "&Cancel"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:214
-msgid "Delete Contacts from Server"
+#: protocols/gadu/gaduregisteraccount.cpp:76
+msgid "Retrieving token"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:218
-msgid "Export Contacts to File..."
+#: protocols/gadu/gaduregisteraccount.cpp:98
+msgid "Please enter a valid E-Mail Address."
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:222
-msgid "Import Contacts from File..."
+#: protocols/gadu/gaduregisteraccount.cpp:122
+msgid "Please enter the verification sequence."
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:226
-msgid "Only for Friends"
+#: protocols/gadu/gaduregisteraccount.cpp:168
+#, kde-format
+msgid "Account created; your new UIN is %1."
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:288
+#: protocols/gadu/gaduregisteraccount.cpp:176
 #, kde-format
-msgid "%1 <%2> "
+msgid "Registration failed: %1"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:329
-msgid "Go O&nline"
+#: protocols/gadu/gaduregisteraccount.cpp:177
+msgid "Registration was unsucessful, please try again."
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:336
-msgid "Set &Busy"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:50
+#. i18n: ectx: property (text), item, widget (QComboBox, authorCombo)
+#: protocols/gadu/gaduprotocol.cpp:54 rc.cpp:26 rc.cpp:26
+msgid "Blocked"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:343
-msgid "Set &Invisible"
-msgstr ""
+#: protocols/gadu/gaduprotocol.cpp:63
+msgid "A&way"
+msgstr "I& ffwrdd"
 
-#: protocols/gadu/gaduaccount.cpp:350
-msgid "Go &Offline"
-msgstr ""
+#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:70
+msgid "B&usy"
+msgstr "P&rysur"
 
-#: protocols/gadu/gaduaccount.cpp:355
-msgid "Set &Description..."
+#: protocols/gadu/gaduprotocol.cpp:74 protocols/gadu/gaduprotocol.cpp:79
+msgid "I&nvisible"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:369
-#: libkopete/ui/metacontactselectorwidget.cpp:211
-msgid "Contacts"
-msgstr "Cysylltau"
-
-#: protocols/gadu/gaduaccount.cpp:379
-msgid "Export Contacts on change"
-msgstr ""
+#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:40
+#. i18n: ectx: property (text), widget (QRadioButton, radioOnline)
+#: protocols/gadu/gaduprotocol.cpp:82 protocols/gadu/gaduprotocol.cpp:86
+#: rc.cpp:3899 kopete/kopetewindow.cpp:410 rc.cpp:3899
+msgid "&Online"
+msgstr "&Ar-lein"
 
-#: protocols/gadu/gaduaccount.cpp:387 protocols/winpopup/wpaccount.cpp:187
-#: protocols/skype/skypeaccount.cpp:968 libkopete/kopeteaccount.cpp:446
-msgid "Properties"
+#: protocols/meanwhile/meanwhilesession.cpp:207
+msgid "Could not connect to server"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:775
-msgid "connection using SSL was not possible, retrying without."
+#: protocols/meanwhile/meanwhilesession.cpp:207
+#: protocols/meanwhile/meanwhilesession.cpp:611
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:149
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:156
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:163
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:170
+msgid "Meanwhile Plugin"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:803
-#, kde-format
-msgid "unable to connect to the Gadu-Gadu server(\"%1\")."
+#: protocols/meanwhile/meanwhilesession.cpp:610
+msgid "Could not connect to redirected server"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:942
-msgid "Imported contacts list is empty."
+#: protocols/meanwhile/meanwhilesession.cpp:1002
+msgid "Meanwhile Plugin: Conference invitation"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:989
-msgid "Contacts imported."
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:155
+msgid ""
+"<qt>You must deselect password remembering or enter a valid password.</qt>"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:998
-msgid "Contacts exported."
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:162
+msgid "<qt>You must enter the server's hostname/ip address.</qt>"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:1004
-msgid "Contacts deleted from the server."
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:169
+msgid "<qt>0 is not a valid port number.</qt>"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:1040
-#, kde-format
-msgid "Save Contacts List for Account %1 As"
+#: protocols/meanwhile/meanwhileprotocol.cpp:58
+#: libkopete/kopeteprotocol.cpp:60
+msgid "Account Offline"
+msgstr "Cyfrif All-lein"
+
+#: protocols/meanwhile/meanwhileaccount.cpp:142
+msgid "&Change Status Message"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:1048
-msgid "Unable to create temporary file."
+#: protocols/meanwhile/meanwhileaccount.cpp:212
+msgid "Meanwhile Plugin: Message from server"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:1048 protocols/gadu/gaduaccount.cpp:1062
-msgid "Save Contacts List Failed"
+#: protocols/yahoo/yahooprotocol.cpp:45
+msgid "Be right back"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:1086
-#, kde-format
-msgid "Load Contacts List for Account %1 As"
+#: protocols/yahoo/yahooprotocol.cpp:47
+msgid "Not at home"
 msgstr ""
 
-#: protocols/gadu/gaduaccount.cpp:1106 protocols/gadu/gaduaccount.cpp:1112
-msgid "Contacts List Load Has Failed"
+#: protocols/yahoo/yahooprotocol.cpp:48
+msgid "Not at my desk"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:220 protocols/gadu/gadusession.cpp:233
-#: protocols/gadu/gadusession.cpp:245 protocols/gadu/gadusession.cpp:278
-msgid "You are not connected to the server."
+#: protocols/yahoo/yahooprotocol.cpp:49
+msgid "Not in the office"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:292 protocols/gadu/gadusession.cpp:310
-msgid "You have to be connected to the server to change your status."
+#: protocols/yahoo/yahooprotocol.cpp:50
+msgid "On the phone"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:603
-msgid "idle"
-msgstr "segur"
+#: protocols/yahoo/yahooprotocol.cpp:51
+msgid "On vacation"
+msgstr ""
 
-#: protocols/gadu/gadusession.cpp:605
-msgid "resolving host"
+#: protocols/yahoo/yahooprotocol.cpp:52
+msgid "Out to lunch"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:607
-msgid "connecting"
-msgstr "cysylltu"
+#: protocols/yahoo/yahooprotocol.cpp:53
+msgid "Stepped out"
+msgstr ""
 
-#: protocols/gadu/gadusession.cpp:609
-msgid "reading data"
+#: protocols/yahoo/yahooprotocol.cpp:54
+msgid "I'm On SMS"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:611
-msgid "error"
-msgstr "gwall"
+#: protocols/yahoo/yahooprotocol.cpp:56
+msgid "Custom"
+msgstr "Addasiedig"
 
-#: protocols/gadu/gadusession.cpp:613
-msgid "connecting to hub"
+#: protocols/yahoo/yahooprotocol.cpp:59
+msgid "Buddy Icon Checksum"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:615
-msgid "connecting to server"
+#: protocols/yahoo/yahooprotocol.cpp:60
+msgid "Buddy Icon Expires"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:617
-msgid "retrieving key"
+#: protocols/yahoo/yahooprotocol.cpp:61
+msgid "Buddy Icon Remote URL"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:619
-msgid "waiting for reply"
+#: protocols/yahoo/yahooprotocol.cpp:69
+msgid "YAB Id"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:621
-msgid "connected"
-msgstr "wedi cysylltu"
-
-#: protocols/gadu/gadusession.cpp:623
-msgid "sending query"
+#: protocols/yahoo/yahooprotocol.cpp:70
+msgid "Pager number"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:625
-msgid "reading header"
+#: protocols/yahoo/yahooprotocol.cpp:71
+msgid "Fax number"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:627
-msgid "parsing data"
+#: protocols/yahoo/yahooprotocol.cpp:72
+msgid "Additional number"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:629
-msgid "done"
-msgstr "wedi gorffen"
-
-#: protocols/gadu/gadusession.cpp:631
-msgid "TLS connection negotiation"
+#: protocols/yahoo/yahooprotocol.cpp:73 protocols/yahoo/yahooprotocol.cpp:74
+msgid "Alternative email 1"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:633
-msgid "unknown"
-msgstr "anhysbys"
-
-#: protocols/gadu/gadusession.cpp:641
-msgid "Resolving error."
+#: protocols/yahoo/yahooprotocol.cpp:77
+msgid "MSN"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:643
-msgid "Connecting error."
+#: protocols/yahoo/yahooprotocol.cpp:78
+msgid "GoogleTalk"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:645
-msgid "Reading error."
+#: protocols/yahoo/yahooprotocol.cpp:79
+msgid "Skype"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:647
-msgid "Writing error."
-msgstr ""
+#. i18n: file: protocols/irc/ircchatui.rc:5
+#. i18n: ectx: Menu (irc)
+#: protocols/yahoo/yahooprotocol.cpp:80 rc.cpp:3908 rc.cpp:3908
+msgid "IRC"
+msgstr "IRC"
 
-#: protocols/gadu/gadusession.cpp:649 protocols/gadu/gadusession.cpp:674
-#, kde-format
-msgid "Unknown error number %1."
+#: protocols/yahoo/yahooprotocol.cpp:81
+msgid "QQ"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:658
-msgid "Unable to resolve server address. DNS failure."
+#: protocols/yahoo/yahooprotocol.cpp:82
+msgid "Private Address"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:660
-msgid "Unable to connect to server."
+#: protocols/yahoo/yahooprotocol.cpp:83
+msgid "Private City"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:662
-msgid "Server sent incorrect data. Protocol error."
+#: protocols/yahoo/yahooprotocol.cpp:84
+msgid "Private State"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:664
-msgid "Problem reading data from server."
+#: protocols/yahoo/yahooprotocol.cpp:85
+msgid "Private ZIP"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:666
-msgid "Problem sending data to server."
+#: protocols/yahoo/yahooprotocol.cpp:86
+msgid "Private Country"
 msgstr ""
 
-#: protocols/gadu/gadusession.cpp:672
-msgid ""
-"Unable to connect over an encrypted channel.\n"
-"Try to turn off encryption support in the Gadu account settings, then "
-"reconnect."
+#: protocols/yahoo/yahooprotocol.cpp:88
+msgid "Private URL"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:43
-msgid "Register New Account"
+#: protocols/yahoo/yahooprotocol.cpp:89
+msgid "Corporation"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:54
-msgid "&Register"
+#: protocols/yahoo/yahooprotocol.cpp:90
+msgid "Work Address"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:76
-msgid "Retrieving token"
+#: protocols/yahoo/yahooprotocol.cpp:92
+msgid "Work State"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:98
-msgid "Please enter a valid E-Mail Address."
+#: protocols/yahoo/yahooprotocol.cpp:93
+msgid "Work ZIP"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:122
-msgid "Please enter the verification sequence."
+#: protocols/yahoo/yahooprotocol.cpp:96
+msgid "Work URL"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:168
-#, kde-format
-msgid "Account created; your new UIN is %1."
+#: protocols/yahoo/yahooprotocol.cpp:98
+msgid "Anniversary"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:176
-#, kde-format
-msgid "Registration failed: %1"
+#: protocols/yahoo/yahooprotocol.cpp:99
+msgid "Notes"
 msgstr ""
 
-#: protocols/gadu/gaduregisteraccount.cpp:177
-msgid "Registration was unsucessful, please try again."
+#: protocols/yahoo/yahooprotocol.cpp:100
+msgid "Additional 1"
 msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:166
-#. i18n: ectx: property (text), widget (QPushButton, m_editregexp)
-#. i18n: file: protocols/jabber/ui/privacy.ui:270
-#. i18n: ectx: property (text), widget (KPushButton, pb_edit)
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:166
-#. i18n: ectx: property (text), widget (QPushButton, m_editregexp)
-#. i18n: file: protocols/jabber/ui/privacy.ui:270
-#. i18n: ectx: property (text), widget (KPushButton, pb_edit)
-#: protocols/gadu/gaducontact.cpp:198 rc.cpp:260 rc.cpp:2232 rc.cpp:260
-#: rc.cpp:2232
-msgid "Edit..."
-msgstr "Golygu..."
-
-#: protocols/gadu/gaducontact.cpp:243
-msgid ""
-"<qt>You need to go online to remove a contact from your contact list.</qt>"
+#: protocols/yahoo/yahooprotocol.cpp:101
+msgid "Additional 2"
 msgstr ""
 
-#: protocols/gadu/gaducontact.cpp:244
-msgid "Gadu-Gadu Plugin"
+#: protocols/yahoo/yahooprotocol.cpp:102
+msgid "Additional 3"
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:409
-msgid ""
-"Connection to peer was refused; it possibly does not listen for incoming "
-"connections."
+#: protocols/yahoo/yahooprotocol.cpp:103
+msgid "Additional 4"
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:413
-msgid "File transfer transaction was not agreed by peer."
+#: protocols/yahoo/yahooconferencemessagemanager.cpp:52
+msgid "&Invite others"
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:417
-msgid "File-transfer handshake failure."
+#: protocols/yahoo/yahooaccount.cpp:93
+msgid "Open &Address book..."
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:420
-msgid "File transfer had problems with the file."
+#: protocols/yahoo/yahooaccount.cpp:96
+msgid "&Edit my contact details..."
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:423
-msgid "There was network error during file transfer."
+#: protocols/yahoo/yahooaccount.cpp:99
+msgid "&Join chat room..."
 msgstr ""
 
-#: protocols/gadu/gadudcctransaction.cpp:426
-msgid "Unknown File-Transfer error."
-msgstr ""
-
-#: protocols/gadu/gadupubdir.cpp:81 protocols/gadu/gadupubdir.cpp:332
-msgid "Search &More..."
+#: protocols/yahoo/yahooaccount.cpp:738
+#, kde-format
+msgid ""
+"Could not log into the Yahoo service: your account has been locked.\n"
+"Visit %1 to reactivate it."
 msgstr ""
 
-#: protocols/gadu/gadupubdir.cpp:110
-msgid "Gadu-Gadu Public Directory"
+#: protocols/yahoo/yahooaccount.cpp:747
+msgid ""
+"Could not log into the Yahoo service: the username specified was invalid."
 msgstr ""
 
-#: protocols/gadu/gadupubdir.cpp:119
-msgid "&New Search"
+#: protocols/yahoo/yahooaccount.cpp:756
+msgid ""
+"You have been logged out of the Yahoo service, possibly due to a duplicate "
+"login."
 msgstr ""
 
-#: protocols/gadu/gadupubdir.cpp:121
-msgid "&Add User..."
+#: protocols/yahoo/yahooaccount.cpp:774
+#, kde-format
+msgctxt "@info"
+msgid ""
+"Could not log into the Yahoo service. Error code: "
+"<message><numid>%1</numid></message>."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:17
-#. i18n: ectx: property (windowTitle), widget (QWidget, GaduAwayUI)
-#: protocols/gadu/gaduaway.cpp:38 rc.cpp:3152 rc.cpp:3152
-msgid "Away Dialog"
+#: protocols/yahoo/yahooaccount.cpp:791
+#, kde-format
+msgid ""
+"%1 has been disconnected.\n"
+"Error message:\n"
+"%2 - %3"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:45
-msgid "Yahoo User Information"
+#: protocols/yahoo/yahooaccount.cpp:804
+#, kde-format
+msgid ""
+"There was an error while connecting %1 to the Yahoo server.\n"
+"Error message:\n"
+"%2 - %3"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:48
-msgid "Save and Close"
+#: protocols/yahoo/yahooaccount.cpp:815 protocols/yahoo/yahooaccount.cpp:818
+#, kde-format
+msgid ""
+"%1\n"
+"\n"
+"Reason: %2"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:49
-msgid "Merge with existing entry"
+#: protocols/yahoo/yahooaccount.cpp:816 protocols/yahoo/yahooaccount.cpp:819
+#: protocols/yahoo/yahooaccount.cpp:1437 protocols/yahoo/yahooaccount.cpp:1623
+#: protocols/yahoo/yahooaccount.cpp:1721 protocols/yahoo/yahooaccount.cpp:1736
+#: protocols/yahoo/yahooeditaccount.cpp:171
+msgid "Yahoo Plugin"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:58
-msgid "General Yahoo Information"
+#: protocols/yahoo/yahooaccount.cpp:874
+#, kde-format
+msgid "User %1 has granted your authorization request."
 msgstr ""
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:72
-msgid "Other Yahoo Information"
+#: protocols/yahoo/yahooaccount.cpp:886
+#, kde-format
+msgid ""
+"User %1 has rejected your authorization request.\n"
+"%2"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:225
-msgid "Replace existing entry"
+#: protocols/yahoo/yahooaccount.cpp:1130
+msgctxt "This string is shown when the user is buzzed by a contact"
+msgid "Buzz"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoochatselectordialog.cpp:29
-msgid "Choose a chat room..."
+#: protocols/yahoo/yahooaccount.cpp:1171
+#, kde-format
+msgid ""
+"%1 has invited you to join a conference with %2.\n"
+"\n"
+"His/her message: %3\n"
+"\n"
+"Accept?"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoochatselectordialog.cpp:86
-msgid "Yahoo Chat rooms"
+#: protocols/yahoo/yahooaccount.cpp:1172 protocols/yahoo/yahooaccount.cpp:1615
+#: protocols/yahoo/yahooaccount.cpp:1826
+msgctxt "@action"
+msgid "Accept"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoochatselectordialog.cpp:157
+#: protocols/yahoo/yahooaccount.cpp:1264
 #, kde-format
-msgid "Users: %1 Webcams: %2 Voices: %3"
+msgid "%1 has declined to join the conference: \"%2\""
 msgstr ""
 
-#: protocols/yahoo/ui/yahooinvitelistimpl.cpp:30
-msgid "Invite"
-msgstr ""
+#: protocols/yahoo/yahooaccount.cpp:1576
+#, kde-format
+msgid "You have one unread message in your Yahoo inbox."
+msgid_plural "You have %1 unread messages in your Yahoo inbox."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:33
-#: protocols/qq/ui/qqwebcamdialog.cpp:35
+#: protocols/yahoo/yahooaccount.cpp:1585
 #, kde-format
-msgid "Webcam for %1"
+msgid "%1 has a message from %2 in your Yahoo inbox. <br><br>Subject: %3"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:50
-#: protocols/qq/ui/qqwebcamdialog.cpp:52
-msgid "No webcam image received"
+#: protocols/yahoo/yahooaccount.cpp:1614
+#, kde-format
+msgid "%1 has invited you to view his/her webcam. Accept?"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:85
+#: protocols/yahoo/yahooaccount.cpp:1623
 #, kde-format
-msgid "%1 has stopped broadcasting"
+msgid "Webcam for %1 is not available."
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:87
-#, kde-format
-msgid "%1 has cancelled viewing permission"
+#: protocols/yahoo/yahooaccount.cpp:1721
+#: protocols/yahoo/yahooeditaccount.cpp:171
+msgid ""
+"<qt>The selected buddy icon could not be opened. <br />Please set a new "
+"buddy icon.</qt>"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:89
-#, kde-format
-msgid "%1 has declined permission to view webcam"
+#: protocols/yahoo/yahooaccount.cpp:1736
+msgid "An error occurred when trying to change the display picture."
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:91
+#: protocols/yahoo/yahooaccount.cpp:1825
 #, kde-format
-msgid "%1 does not have his/her webcam online"
+msgid "%1 wants to view your webcam. Grant access?"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:93
+#: protocols/yahoo/yahooaccount.cpp:1963
 #, kde-format
-msgid "Unable to view %1's webcam for an unknown reason"
+msgid "You are now in %1 (%2)"
 msgstr ""
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:102
-#, kde-format
-msgid "1 viewer"
-msgid_plural "%1 viewers"
-msgstr[0] ""
-msgstr[1] ""
+#: protocols/yahoo/yahooeditaccount.cpp:105
+#: protocols/yahoo/yahooeditaccount.cpp:110
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: protocols/yahoo/yahoocontact.cpp:122
+#: protocols/yahoo/yahooeditaccount.cpp:110
+msgid "<qt>You must enter a valid password.</qt>"
+msgstr ""
+
+#: protocols/yahoo/yahoocontact.cpp:120
 #, kde-format
 msgid "%1|Stealthed"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:405
+#: protocols/yahoo/yahoocontact.cpp:403
 msgid "View &Webcam"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:417
+#: protocols/yahoo/yahoocontact.cpp:415
 #: protocols/yahoo/yahoochatsession.cpp:74
 msgid "Invite to view your Webcam"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:429
+#: protocols/yahoo/yahoocontact.cpp:427
 msgid "&Buzz Contact"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:441
+#: protocols/yahoo/yahoocontact.cpp:439
 msgid "&Stealth Setting"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:453
+#: protocols/yahoo/yahoocontact.cpp:451
 msgid "&Invite to Conference"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:465
+#: protocols/yahoo/yahoocontact.cpp:463
 msgid "&View Yahoo Profile"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:517
+#: protocols/yahoo/yahoocontact.cpp:515
 msgid "Stealth Setting"
 msgstr ""
 
-#: protocols/yahoo/yahoocontact.cpp:578
+#: protocols/yahoo/yahoocontact.cpp:576
 msgid "Buzz"
 msgstr ""
 
-#: protocols/yahoo/yahooconferencemessagemanager.cpp:52
-msgid "&Invite others"
-msgstr ""
-
-#: protocols/yahoo/yahoochatsession.cpp:61
-msgid "Buzz Contact"
-msgstr ""
-
-#: protocols/yahoo/yahoochatsession.cpp:66
-msgid "Show User Info"
-msgstr ""
-
-#: protocols/yahoo/yahoochatsession.cpp:70
-msgid "Request Webcam"
+#: protocols/yahoo/libkyahoo/picturenotifiertask.cpp:152
+#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:80
+msgid "The picture was not successfully uploaded"
 msgstr ""
 
-#: protocols/yahoo/yahoochatsession.cpp:82
-msgid "Yahoo Display Picture"
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:207
+#, kde-format
+msgid ""
+"Webcam connection to the user %1 could not be established.\n"
+"\n"
+"Please relogin and try again."
 msgstr ""
 
-#: protocols/yahoo/yahooeditaccount.cpp:105
-#: protocols/yahoo/yahooeditaccount.cpp:110
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: protocols/yahoo/yahooeditaccount.cpp:110
-msgid "<qt>You must enter a valid password.</qt>"
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:524
+msgid "An error occurred closing the webcam session. "
 msgstr ""
 
-#: protocols/yahoo/yahooeditaccount.cpp:171
-#: protocols/yahoo/yahooaccount.cpp:1717
-msgid ""
-"<qt>The selected buddy icon could not be opened. <br />Please set a new "
-"buddy icon.</qt>"
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:524
+msgid "You tried to close a connection that did not exist."
 msgstr ""
 
-#: protocols/yahoo/yahooeditaccount.cpp:171
-#: protocols/yahoo/yahooaccount.cpp:812 protocols/yahoo/yahooaccount.cpp:815
-#: protocols/yahoo/yahooaccount.cpp:1433 protocols/yahoo/yahooaccount.cpp:1619
-#: protocols/yahoo/yahooaccount.cpp:1717 protocols/yahoo/yahooaccount.cpp:1732
-msgid "Yahoo Plugin"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:154
+msgid "Unable to connect to file transfer server"
 msgstr ""
 
-#: protocols/yahoo/yahooverifyaccount.cpp:42
-msgid "Account Verification - Yahoo"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:218
+msgid "An error occurred while sending the file."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
+#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:44
 msgid "An error occurred while sending the message"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
+#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:44
 msgid "The message is empty."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:82
-#, kde-format
-msgid "An error occurred while downloading a buddy icon (%1)"
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/picturenotifiertask.cpp:151
-#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:79
-msgid "The picture was not successfully uploaded"
-msgstr ""
-
 #: protocols/yahoo/libkyahoo/receivefiletask.cpp:55
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:175
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:216
 msgid "Could not open file for writing."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:144
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:157
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:184
 msgid "An error occurred while downloading the file."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/sendfiletask.cpp:103
-#: protocols/skype/libskype/skype.cpp:489
-msgid "Unknown error"
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/sendfiletask.cpp:145
-msgid "Unable to connect to file transfer server"
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/sendfiletask.cpp:210
-msgid "An error occurred while sending the file."
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:108
+#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:109
 #, kde-format
 msgid "Error opening file: %1"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/statusnotifiertask.cpp:103
-msgid "An unknown error has occurred."
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:93
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:121
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:95
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:123
 msgid "An error occurred while saving the address book entry."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:178
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:180
 #, kde-format
 msgid ""
 "The Yahoo Address Book entry could not be saved:\n"
 "%1 - %2"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:185
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:187
 #, kde-format
 msgid ""
 "The Yahoo Address Book entry could not be created:\n"
 "%1 - %2"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:192
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:194
 #, kde-format
 msgid ""
 "The Yahoo Address Book entry could not be deleted:\n"
 "%1 - %2"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:206
-#, kde-format
-msgid ""
-"Webcam connection to the user %1 could not be established.\n"
-"\n"
-"Please relogin and try again."
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:525
-msgid "An error occurred closing the webcam session. "
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:525
-msgid "You tried to close a connection that did not exist."
-msgstr ""
-
-#: protocols/yahoo/libkyahoo/yahoochattask.cpp:261
-#: protocols/yahoo/libkyahoo/yahoochattask.cpp:265
-#: protocols/yahoo/libkyahoo/yahoochattask.cpp:269
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:263
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:267
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:271
 msgid "Could not join chat"
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoochattask.cpp:262
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:264
 msgid "The room is full. Please choose another one."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoochattask.cpp:266
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:268
 msgid "Invalid user."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yahoochattask.cpp:270
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:272
 msgid "An unknown error occurred while joining the chat room."
 msgstr ""
 
-#: protocols/yahoo/libkyahoo/yabtask.cpp:119
+#: protocols/yahoo/libkyahoo/statusnotifiertask.cpp:105
+msgid "An unknown error has occurred."
+msgstr ""
+
+#: protocols/yahoo/libkyahoo/yabtask.cpp:121
 msgid "Could not retrieve server side address book for user info."
 msgstr ""
 
+#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:84
+#, kde-format
+msgid "An error occurred while downloading a buddy icon (%1)"
+msgstr ""
+
 #: protocols/yahoo/yahoochatchatsession.cpp:43
 msgid "Yahoo Chat: "
 msgstr ""
@@ -6781,1933 +6380,2074 @@
 msgid "Yahoo Chat: %1"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:91
-msgid "Open &Address book..."
+#: protocols/yahoo/yahooverifyaccount.cpp:42
+msgid "Account Verification - Yahoo"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:94
-msgid "&Edit my contact details..."
+#: protocols/yahoo/yahoochatsession.cpp:61
+msgid "Buzz Contact"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:97
-msgid "&Join chat room..."
+#: protocols/yahoo/yahoochatsession.cpp:66
+msgid "Show User Info"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:736
-#, kde-format
-msgid ""
-"Could not log into the Yahoo service: your account has been locked.\n"
-"Visit %1 to reactivate it."
+#: protocols/yahoo/yahoochatsession.cpp:70
+msgid "Request Webcam"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:745
-msgid ""
-"Could not log into the Yahoo service: the username specified was invalid."
+#: protocols/yahoo/yahoochatsession.cpp:82
+msgid "Yahoo Display Picture"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:754
-msgid ""
-"You have been logged out of the Yahoo service, possibly due to a duplicate "
-"login."
+#: protocols/yahoo/ui/yahooinvitelistimpl.cpp:30
+msgid "Invite"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:772
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Could not log into the Yahoo service. Error code: "
-"<message><numid>%1</numid></message>."
+#: protocols/yahoo/ui/yahoochatselectordialog.cpp:29
+msgid "Choose a chat room..."
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:787
-#, kde-format
-msgid ""
-"%1 has been disconnected.\n"
-"Error message:\n"
-"%2 - %3"
-msgstr ""
+#: protocols/yahoo/ui/yahoochatselectordialog.cpp:41
+#: protocols/yahoo/ui/yahoochatselectordialog.cpp:63
+#: plugins/history/historydialog.cpp:204
+msgid "Loading..."
+msgstr "Llwytho..."
 
-#: protocols/yahoo/yahooaccount.cpp:800
-#, kde-format
-msgid ""
-"There was an error while connecting %1 to the Yahoo server.\n"
-"Error message:\n"
-"%2 - %3"
+#: protocols/yahoo/ui/yahoochatselectordialog.cpp:86
+msgid "Yahoo Chat rooms"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:811 protocols/yahoo/yahooaccount.cpp:814
+#: protocols/yahoo/ui/yahoochatselectordialog.cpp:157
 #, kde-format
-msgid ""
-"%1\n"
-"\n"
-"Reason: %2"
+msgid "Users: %1 Webcams: %2 Voices: %3"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:870
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:85
 #, kde-format
-msgid "User %1 has granted your authorization request."
+msgid "%1 has stopped broadcasting"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:882
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:87
 #, kde-format
-msgid ""
-"User %1 has rejected your authorization request.\n"
-"%2"
-msgstr ""
-
-#: protocols/yahoo/yahooaccount.cpp:1126
-msgctxt "This string is shown when the user is buzzed by a contact"
-msgid "Buzz"
+msgid "%1 has cancelled viewing permission"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1167
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:89
 #, kde-format
-msgid ""
-"%1 has invited you to join a conference with %2.\n"
-"\n"
-"His/her message: %3\n"
-"\n"
-"Accept?"
+msgid "%1 has declined permission to view webcam"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1168 protocols/yahoo/yahooaccount.cpp:1611
-#: protocols/yahoo/yahooaccount.cpp:1822
-msgctxt "@action"
-msgid "Accept"
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:91
+#, kde-format
+msgid "%1 does not have his/her webcam online"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1260
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:93
 #, kde-format
-msgid "%1 has declined to join the conference: \"%2\""
+msgid "Unable to view %1's webcam for an unknown reason"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1572
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:102
 #, kde-format
-msgid "You have one unread message in your Yahoo inbox."
-msgid_plural "You have %1 unread messages in your Yahoo inbox."
+msgid "1 viewer"
+msgid_plural "%1 viewers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: protocols/yahoo/yahooaccount.cpp:1581
-#, kde-format
-msgid "%1 has a message from %2 in your Yahoo inbox. <br><br>Subject: %3"
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:45
+msgid "Yahoo User Information"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1610
-#, kde-format
-msgid "%1 has invited you to view his/her webcam. Accept?"
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:48
+msgid "Save and Close"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1619
-#, kde-format
-msgid "Webcam for %1 is not available."
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:49
+msgid "Merge with existing entry"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1732
-msgid "An error occurred when trying to change the display picture."
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:58
+msgid "General Yahoo Information"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1821
-#, kde-format
-msgid "%1 wants to view your webcam. Grant access?"
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:72
+msgid "Other Yahoo Information"
 msgstr ""
 
-#: protocols/yahoo/yahooaccount.cpp:1959
-#, kde-format
-msgid "You are now in %1 (%2)"
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:225
+msgid "Replace existing entry"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:45
-msgid "Be right back"
+#: protocols/irc/ircaccount.cpp:155
+#, kde-format
+msgid "Temporary Network - %1"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:47
-msgid "Not at home"
+#: protocols/irc/ircaccount.cpp:156
+msgid "Network imported from previous version of Kopete, or an IRC URI"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:48
-msgid "Not at my desk"
-msgstr ""
+#: protocols/irc/ircaccount.cpp:188
+msgid "Join Channel..."
+msgstr "Ymuno â'r Sianel..."
 
-#: protocols/yahoo/yahooprotocol.cpp:49
-msgid "Not in the office"
+#: protocols/irc/ircaccount.cpp:190
+msgid "Search Channels..."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:50
-msgid "On the phone"
+#: protocols/irc/ircaccount.cpp:259
+msgid ""
+"<qt>The network associated with this account has no valid hosts. Please "
+"ensure that the account has a valid network.</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:51
-msgid "On vacation"
+#: protocols/irc/ircaccount.cpp:261 protocols/irc/ircaccount.cpp:269
+msgid "Network is Empty"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:52
-msgid "Out to lunch"
+#: protocols/irc/ircaccount.cpp:267
+#, kde-format
+msgid ""
+"<qt>The network associated with this account, <b>%1</b>, has no valid hosts. "
+"Please ensure that the account has a valid network.</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:53
-msgid "Stepped out"
+#: protocols/irc/ircaccount.cpp:275
+#, kde-format
+msgid ""
+"<qt>Kopete could not connect to any of the servers in the network associated "
+"with this account (<b>%1</b>). Please try again later.</qt>"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:54
-msgid "I'm On SMS"
+#: protocols/irc/ircaccount.cpp:278
+msgid "Network is Unavailable"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:56
-msgid "Custom"
-msgstr "Addasiedig"
-
-#: protocols/yahoo/yahooprotocol.cpp:59
-msgid "Buddy Icon Checksum"
+#: protocols/irc/ircaccount.cpp:586
+msgid "Join Channel"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:60
-msgid "Buddy Icon Expires"
+#: protocols/irc/ircaccount.cpp:587 protocols/irc/ui/ircdialogs.cpp:59
+msgid "Please enter the name of the channel you want to join:"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:61
-msgid "Buddy Icon Remote URL"
+#: protocols/irc/libkirc/plugins/ctcp/kirctransfer.cpp:358
+msgid "Acknowledge size is greater than the expected file size"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:66
-#: protocols/groupwise/ui/gwcontactproperties.cpp:113
-#: kopete/config/status/statusmodel.cpp:122
-msgid "Title"
-msgstr "Teitl"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:172
+#, kde-format
+msgid "There is one operator online."
+msgid_plural "There are %1 operators online."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/yahooprotocol.cpp:69
-msgid "YAB Id"
-msgstr ""
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:180
+#, kde-format
+msgid "There is one unknown connection."
+msgid_plural "There are %1 unknown connections."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/yahooprotocol.cpp:70
-msgid "Pager number"
-msgstr ""
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:188
+#, kde-format
+msgid "One channel has been formed."
+msgid_plural "%1 channels have been formed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/yahooprotocol.cpp:71
-msgid "Fax number"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:204
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:400
+#, kde-format
+msgid "Server was too busy to execute %1."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:72
-msgid "Additional number"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:270
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:466
+msgid "You have been marked as being away."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:73 protocols/yahoo/yahooprotocol.cpp:74
-msgid "Alternative email 1"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:278
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:474
+#, kde-format
+msgid "%1 is a registered nick."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:77
-msgid "MSN"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:302
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:498
+#, kde-format
+msgid "%1 is an IRC operator."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:78
-msgid "GoogleTalk"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:513
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:711
+#, kde-format
+msgid "You cannot send messages to channel %1."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:79
-msgid "Skype"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:562
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:759
+#, kde-format
+msgid "You are not on channel %1."
 msgstr ""
 
-#. i18n: file: protocols/irc/ircchatui.rc:5
-#. i18n: ectx: Menu (irc)
-#: protocols/yahoo/yahooprotocol.cpp:80 rc.cpp:1655 rc.cpp:1655
-msgid "IRC"
-msgstr "IRC"
-
-#: protocols/yahoo/yahooprotocol.cpp:81
-msgid "QQ"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:582
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:780
+#, kde-format
+msgid "Cannot join %1, channel is full."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:82
-msgid "Private Address"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:593
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:791
+#, kde-format
+msgid "Cannot join %1, channel is invite only."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:83
-msgid "Private City"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:601
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:799
+#, kde-format
+msgid "Cannot join %1, you are banned from that channel."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:84
-msgid "Private State"
+#: protocols/irc/libkirc/kircengine_numericreplies.cpp:609
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:807
+#, kde-format
+msgid "Cannot join %1, wrong channel key was given."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:85
-msgid "Private ZIP"
+#: protocols/irc/libkirc/client/kircclientchannelhandler.cpp:665
+#: protocols/irc/libkirc/client/kircclienthandler.cpp:756
+msgid "Password Incorect"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:86
-msgid "Private Country"
-msgstr ""
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:366
+#, kde-format
+msgid "There is 1 operator online."
+msgid_plural "There are %1 operators online."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/yahooprotocol.cpp:88
-msgid "Private URL"
-msgstr ""
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:374
+#, kde-format
+msgid "There is 1 unknown connection."
+msgid_plural "There are %1 unknown connections."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/yahooprotocol.cpp:89
-msgid "Corporation"
-msgstr ""
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:382
+#, kde-format
+msgid "There has been 1 channel formed."
+msgid_plural "There have been %1 channels formed."
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/yahoo/yahooprotocol.cpp:90
-msgid "Work Address"
+#: protocols/irc/libkirc/client/tasks/kirci18ntask.cpp:752
+#, kde-format
+msgid "Nickname %1 is already in use."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:92
-msgid "Work State"
+#: protocols/irc/ui/channellist.cpp:190
+msgid " members"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:93
-msgid "Work ZIP"
-msgstr ""
+#: protocols/irc/ui/channellist.cpp:198 protocols/irc/ui/channellist.cpp:221
+msgid "Channel"
+msgstr "Sianel"
 
-#: protocols/yahoo/yahooprotocol.cpp:96
-msgid "Work URL"
-msgstr ""
+#: protocols/irc/ui/channellist.cpp:199 protocols/irc/ui/channellist.cpp:222
+msgid "Users"
+msgstr "Defnyddwyr"
 
-#: protocols/yahoo/yahooprotocol.cpp:98
-msgid "Anniversary"
+#: protocols/irc/ui/channellist.cpp:201 protocols/irc/ui/channellist.cpp:223
+msgid "Topic"
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:99
-msgid "Notes"
-msgstr ""
+#: protocols/irc/ui/channellist.cpp:209
+msgid "Search for:"
+msgstr "Chwilio am:"
 
-#: protocols/yahoo/yahooprotocol.cpp:100
-msgid "Additional 1"
+#: protocols/irc/ui/channellist.cpp:210
+msgid ""
+"You may search for channels on the IRC server, using a text string entered "
+"here."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:101
-msgid "Additional 2"
+#: protocols/irc/ui/channellist.cpp:211 protocols/irc/ui/channellist.cpp:212
+msgid "Channels returned must have at least this many members."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:102
-msgid "Additional 3"
+#: protocols/irc/ui/channellist.cpp:213 protocols/irc/ui/channellist.cpp:215
+msgid ""
+"You may search for channels on the IRC server, using a text string entered "
+"here.  For instance, you may type 'linux' to find channels that have "
+"something to do with Linux."
 msgstr ""
 
-#: protocols/yahoo/yahooprotocol.cpp:103
-msgid "Additional 4"
+#: protocols/irc/ui/channellist.cpp:214
+msgid ""
+"You may search for channels on the IRC server for a text string entered here."
 msgstr ""
 
-#: protocols/winpopup/wpaccount.cpp:168
-#, kde-format
-msgid "WinPopup (%1)"
+#: protocols/irc/ui/channellist.cpp:217
+msgid "Perform a channel search."
 msgstr ""
 
-#: protocols/winpopup/wpeditaccount.cpp:104
-#: protocols/winpopup/wpeditaccount.cpp:110
-#: protocols/winpopup/wpaddcontact.cpp:100
-#: protocols/winpopup/wpaddcontact.cpp:107
-msgid "WinPopup"
-msgstr "WinPopup"
-
-#: protocols/winpopup/wpeditaccount.cpp:110
-msgid "<qt>You must enter a valid smbclient path.</qt>"
+#: protocols/irc/ui/channellist.cpp:218
+msgid ""
+"Perform a channel search.  Please be patient, as this can be slow, depending "
+"on the total number of channels on the server."
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:228
-#. i18n: ectx: property (text), item, widget (QComboBox, cbGender)
-#: protocols/winpopup/wpuserinfo.cpp:39 rc.cpp:4387 rc.cpp:4387
-msgid "N/A"
-msgstr "N/A"
-
-#: protocols/winpopup/wpuserinfo.cpp:45
-#, kde-format
-msgid "User Info for %1"
+#: protocols/irc/ui/channellist.cpp:220
+msgid "Double click on a channel to select it."
 msgstr ""
 
-#: protocols/winpopup/wpprotocol.cpp:146
-msgid "The Samba configuration file has been modified."
+#: protocols/irc/ui/channellist.cpp:297
+msgid "You must be connected to the IRC server to perform a channel listing."
 msgstr ""
 
-#: protocols/winpopup/wpprotocol.cpp:146
-msgid "Configuration Successful"
+#: protocols/irc/ui/channellist.cpp:336
+msgid "You have been disconnected from the IRC server."
 msgstr ""
 
-#: protocols/winpopup/wpprotocol.cpp:148
-msgid "Updating the Samba configuration file failed."
-msgstr ""
+#: protocols/irc/ui/channellist.cpp:337
+msgid "Disconnected"
+msgstr "Datgysylltwyd"
 
-#: protocols/winpopup/wpprotocol.cpp:148
-msgid "Configuration Failed"
+#: protocols/irc/ui/ircdialogs.cpp:25
+#, kde-format
+msgid "The nickname %1 is already in use"
 msgstr ""
 
-#: protocols/winpopup/wpaddcontact.cpp:100
-msgid "<qt>You must enter a valid hostname.</qt>"
+#: protocols/irc/ui/ircdialogs.cpp:25 protocols/irc/ui/ircdialogs.cpp:34
+#: protocols/irc/ui/ircdialogs.cpp:93
+msgid "IRC Plugin"
 msgstr ""
 
-#: protocols/winpopup/wpaddcontact.cpp:107
-msgid "<qt>LOCALHOST is not allowed as a contact.</qt>"
+#: protocols/irc/ui/ircdialogs.cpp:35
+#, kde-format
+msgid ""
+"The nickname %1 is already in use. Please enter an alternative nickname:"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:107
+#: protocols/irc/ui/ircdialogs.cpp:92
 #, kde-format
 msgid ""
-"The working directory %1 does not exist.\n"
-"If you have not yet configured anything for Samba please see\n"
-"Install Into Samba (Configure... -> Account -> Edit) information\n"
-"on how to do this.\n"
-"Should the directory be created? (May require the root password)"
+"\"%1\" is an invalid channel name. Channels must start with '#', '!', '+', "
+"or '&'."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:112
-msgid "Create Directory"
+#: protocols/irc/ui/ircdialogs.cpp:103
+#, kde-format
+msgid "Channel List for %1"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:112
-msgid "Do Not Create"
+#: protocols/irc/ui/ircdialogs.cpp:122
+msgid "The IRC server is currently too busy to respond to this request."
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:126
-#, kde-format
-msgid ""
-"Permissions of the working directory %1 are incorrect.\n"
-"You will not receive messages if choose No.\n"
-"You can also correct it manually (chmod 0777 %1), restart Kopete.\n"
-"Fix this (may require the root password)?"
+#: protocols/irc/ui/ircdialogs.cpp:123
+msgid "Server is Busy"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:131
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:326
-msgid "Fix"
+#: protocols/irc/ui/ircaddcontactpage.cpp:79
+msgid "<qt>You need to specify a channel to join, or a query to open.</qt>"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:131
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:326
-msgid "Do Not Fix"
+#: protocols/irc/ui/ircaddcontactpage.cpp:79
+msgid "You Must Specify a Channel"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:256
+#: protocols/irc/ui/networkconfigwidget.cpp:282
+#, kde-format
 msgid ""
-"Connection to localhost failed.\n"
-"Is your samba server running?"
+"<qt>Are you sure you want to delete the network <b>%1</b>?<br>Any accounts "
+"which use this network will have to be modified.</qt>"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:323
-msgid ""
-"A message file could not be removed; maybe the permissions are incorrect.\n"
-"Fix this (may require the root password)?"
+#: protocols/irc/ui/networkconfigwidget.cpp:284
+msgid "Deleting Network"
 msgstr ""
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:331
-msgid "Still cannot remove it; please fix it manually."
+#: protocols/irc/ui/networkconfigwidget.cpp:285
+msgid "&Delete Network"
 msgstr ""
 
-#: protocols/skype/skypedetails.cpp:71
+#: protocols/irc/ui/networkconfigwidget.cpp:297
 #, kde-format
-msgid "Details for User %1"
+msgid "<qt>Are you sure you want to delete the host <b>%1</b>?</qt>"
 msgstr ""
 
-#: protocols/skype/skypechatsession.cpp:114
-#: protocols/skype/skypechatsession.cpp:155
-#: protocols/skype/skypeprotocol.cpp:109
-msgid "Call"
+#: protocols/irc/ui/networkconfigwidget.cpp:298
+msgid "Deleting Host"
 msgstr ""
 
-#: protocols/skype/skypeconference.cpp:44
-msgid "Conference Call"
+#: protocols/irc/ui/networkconfigwidget.cpp:299
+msgid "&Delete Host"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:922
-#, kde-format
-msgid "Skype (%1)"
+#: protocols/irc/ui/networkconfigwidget.cpp:352
+msgid "New Host"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:950 protocols/skype/skypeprotocol.cpp:82
-msgid "Skype Me"
+#: protocols/irc/ui/networkconfigwidget.cpp:353
+msgid "Enter the hostname of the new server:"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:956
-msgid "Make Test Call"
+#: protocols/irc/ui/networkconfigwidget.cpp:362
+msgid "A host already exists with that name"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:1094
-#, kde-format
-msgid "Cannot open info about user %1"
+#: protocols/irc/ui/networkconfigwidget.cpp:390
+msgid "Rename Network"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:1094 protocols/skype/skypeaccount.cpp:1108
-#: protocols/skype/skypeaccount.cpp:1130 protocols/skype/skypeaccount.cpp:1135
-#: protocols/skype/skypeaccount.cpp:1143 protocols/skype/skypeaccount.cpp:1155
-#: protocols/skype/skypeaccount.cpp:1160
-#: protocols/skype/skypeeditaccount.cpp:211
-#: protocols/skype/skypeeditaccount.cpp:226
-#: protocols/skype/skypeeditaccount.cpp:243
-#: protocols/skype/skypeeditaccount.cpp:251
-#: protocols/skype/libskype/skype.cpp:291
-msgid "Skype protocol"
+#: protocols/irc/ui/networkconfigwidget.cpp:391
+msgid "Enter the new name for this network:"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:1108 protocols/skype/skypeaccount.cpp:1130
-#: protocols/skype/skypeaccount.cpp:1135 protocols/skype/skypeaccount.cpp:1160
-msgid "Unknown action from SkypeActionHandler"
+#: protocols/irc/ui/networkconfigwidget.cpp:401
+msgid "A network already exists with that name"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:1143
-msgid "Add contact from SkypeActionHandler is not supported yet"
+#: protocols/irc/ui/irceditaccountwidget.cpp:280
+msgid "<qt>You must enter a nickname.</qt>"
 msgstr ""
 
-#: protocols/skype/skypeaccount.cpp:1155
-msgid "Send voicemail from SkypeActionHandler is not supported yet"
+#: plugins/statistics/statisticsplugin.cpp:58
+msgid "View &Statistics"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:106
+#: plugins/statistics/statisticsdialog.cpp:50
 #, kde-format
-msgid "Call with %1"
+msgid "Statistics for %1"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:139
-msgid "Canceled"
-msgstr ""
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:547
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:42
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_General)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:547
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:42
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_General)
+#: plugins/statistics/statisticsdialog.cpp:68 rc.cpp:1931 rc.cpp:2858
+#: rc.cpp:6088 rc.cpp:1931 rc.cpp:2858 rc.cpp:6088
+msgid "General"
+msgstr "Cyffredinol"
 
-#: protocols/skype/skypecalldialog.cpp:146
-msgid "Other person is busy"
+#: plugins/statistics/statisticsdialog.cpp:86
+#, kde-format
+msgid ""
+"Key:  <font color=\"%1\">Online</font>  <font color=\"%2\">Away</font>  "
+"<font color=\"%3\">Offline</font>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:153
-msgid "Refused"
+#: plugins/statistics/statisticsdialog.cpp:230
+#, kde-format
+msgid "<h1>Statistics for %1</h1>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:160
-msgid "Call Back"
-msgstr ""
-
-#: protocols/skype/skypecalldialog.cpp:161
-msgid "Missed"
+#: plugins/statistics/statisticsdialog.cpp:233
+msgid ""
+"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
+"summary view\">General</a></b><br><span title=\"Select the day or month for "
+"which you want to view statistics\"><b>Days: </b><a "
+"href=\"dayofweek:1\">Monday</a>&nbsp;<a "
+"href=\"dayofweek:2\">Tuesday</a>&nbsp;<a "
+"href=\"dayofweek:3\">Wednesday</a>&nbsp;<a "
+"href=\"dayofweek:4\">Thursday</a>&nbsp;<a "
+"href=\"dayofweek:5\">Friday</a>&nbsp;<a "
+"href=\"dayofweek:6\">Saturday</a>&nbsp;<a "
+"href=\"dayofweek:7\">Sunday</a><br><b>Months: </b><a "
+"href=\"monthofyear:1\">January</a>&nbsp;<a "
+"href=\"monthofyear:2\">February</a>&nbsp;<a "
+"href=\"monthofyear:3\">March</a>&nbsp;<a "
+"href=\"monthofyear:4\">April</a>&nbsp;<a "
+"href=\"monthofyear:5\">May</a>&nbsp;<a "
+"href=\"monthofyear:6\">June</a>&nbsp;<a "
+"href=\"monthofyear:7\">July</a>&nbsp;<a "
+"href=\"monthofyear:8\">August</a>&nbsp;<a "
+"href=\"monthofyear:9\">September</a>&nbsp;<a "
+"href=\"monthofyear:10\">October</a>&nbsp;<a "
+"href=\"monthofyear:11\">November</a>&nbsp;<a "
+"href=\"monthofyear:12\">December</a>&nbsp;</span></div><br>"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AddAccountWizardPage2)
-#: protocols/skype/skypecalldialog.cpp:169 rc.cpp:6449 rc.cpp:6449
-msgid "Finished"
-msgstr "Wedi Gorffen"
-
-#: protocols/skype/skypecalldialog.cpp:174
-msgid "Resume"
+#: plugins/statistics/statisticsdialog.cpp:264
+msgid ""
+"<div class=\"statgroup\" title=\"Contact status history for "
+"today\"><h2>Today</h2><table "
+"width=\"100%\"><tr><td>Status</td><td>From</td><td>To</td></tr>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:177
-msgid "On hold (local)"
+#: plugins/statistics/statisticsdialog.cpp:420
+msgid "<div class=\"statgroup\">"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:183
-msgid "On hold (remote)"
+#: plugins/statistics/statisticsdialog.cpp:421
+#, kde-format
+msgid ""
+"<b title=\"The total time %1 was visible\">Total visible time :</b> %2 "
+"hour(s)<br>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:189
-msgid "On hold"
+#: plugins/statistics/statisticsdialog.cpp:423
+#, kde-format
+msgid ""
+"<b title=\"The total time %1 was online\">Total online time :</b> %2 "
+"hour(s)<br>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:193
-msgid "Hold"
+#: plugins/statistics/statisticsdialog.cpp:425
+#, kde-format
+msgid ""
+"<b title=\"The total time %1 was away\">Total busy time :</b> %2 hour(s)<br>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:196
-msgid "In progress"
+#: plugins/statistics/statisticsdialog.cpp:426
+#, kde-format
+msgid ""
+"<b title=\"The total time %1 was offline\">Total offline time :</b> %2 "
+"hour(s)"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:202
-msgid "Ringing"
-msgstr ""
+#: plugins/statistics/statisticsdialog.cpp:429
+#: plugins/statistics/statisticsdialog.cpp:522
+#: plugins/statistics/statisticsdialog.cpp:540
+msgid "General information"
+msgstr "Gwybodaeth Cyffredinol"
 
-#: protocols/skype/skypecalldialog.cpp:210
-msgid "Failed"
-msgstr ""
+#: plugins/statistics/statisticsdialog.cpp:435
+#, kde-format
+msgid "<b>Average message length:</b> %1 character<br>"
+msgid_plural "<b>Average message length:</b> %1 characters<br>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/skype/skypecalldialog.cpp:222
-msgctxt ""
-"Early media means the media played before the call is established. For "
-"example it can be a calling tone or a waiting message such as all operators "
-"are busy."
-msgid "Early media (waiting for operator...)"
-msgstr ""
+#: plugins/statistics/statisticsdialog.cpp:437
+#, kde-format
+msgid "<b>Time between two messages:</b> %1 second"
+msgid_plural "<b>Time between two messages:</b> %1 seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: protocols/skype/skypecalldialog.cpp:277
+#: plugins/statistics/statisticsdialog.cpp:442
 #, kde-format
-msgid "Failed (%1)"
+msgid "<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:297
+#: plugins/statistics/statisticsdialog.cpp:443
 #, kde-format
 msgid ""
-"%1 active\n"
-"%2 total"
+"<b title=\"The last time %1 was online or away\">Last time present :</b> %2"
 msgstr ""
 
-#: protocols/skype/skypecalldialog.cpp:303
-msgid "Skypeout inactive"
+#: plugins/statistics/statisticsdialog.cpp:453
+msgid "Current status"
 msgstr ""
 
-#: protocols/skype/skypecontact.cpp:101
-msgid "Call contact"
+#: plugins/statistics/statisticsdialog.cpp:454
+#, kde-format
+msgid "Is <b>%1</b> since <b>%2</b>"
 msgstr ""
 
-#: protocols/skype/skypecontact.cpp:116
-msgid "Block contact"
+#: plugins/statistics/statisticsdialog.cpp:466
+#, kde-format
+msgctxt ""
+"TRANSLATOR: please reverse 'left' and 'right' as appropriate for your "
+"language"
+msgid ""
+"When was this contact visible?<br />All charts are in 24 blocks, one per "
+"hour, encompassing one day. %1 is on the left, and %2 is on the right."
 msgstr ""
 
-#: protocols/skype/skypeeditaccount.cpp:124
-msgid "You can have only one skype account"
+#: plugins/statistics/statisticsdialog.cpp:492
+#, kde-format
+msgid "Between %1 and %2, %3 was visible for %4% of the hour."
 msgstr ""
 
-#: protocols/skype/skypeeditaccount.cpp:124
-#: protocols/skype/skypeaddcontact.cpp:74
-#: protocols/skype/skypeaddcontact.cpp:79
-#: protocols/skype/skypeaddcontact.cpp:84
-#: protocols/skype/skypeaddcontact.cpp:89
-msgid "Wrong Information"
+#: plugins/statistics/statisticsdialog.cpp:504
+msgid "Online time"
 msgstr ""
 
-#: protocols/skype/skypeeditaccount.cpp:208
-msgid "Configure Skype client"
+#: plugins/statistics/statisticsdialog.cpp:506
+msgid "Away time"
 msgstr ""
 
-#: protocols/skype/skypeeditaccount.cpp:208
-msgid "Please enter your skype user name"
+#: plugins/statistics/statisticsdialog.cpp:508
+msgid "Offline time"
 msgstr ""
 
-#: protocols/skype/skypeeditaccount.cpp:211
-msgid "You must enter your skype user name"
-msgstr ""
+#: plugins/statistics/statisticsdialog.cpp:512
+msgid "online"
+msgstr "arlein"
 
-#: protocols/skype/skypeeditaccount.cpp:226
-#: protocols/skype/skypeeditaccount.cpp:243
+#: plugins/statistics/statisticsdialog.cpp:515
+msgid "away"
+msgstr "i ffwrdd"
+
+#: plugins/statistics/statisticsdialog.cpp:518
+msgid "offline"
+msgstr "all-lein"
+
+#: plugins/statistics/statisticsdialog.cpp:567
 #, kde-format
-msgid "Cannot create/open file %1 for configuring the Skype client."
+msgid "Between %1 and %2, %3 was %4% %5."
 msgstr ""
 
-#: protocols/skype/skypeeditaccount.cpp:251
+#: plugins/statistics/statisticsdialog.cpp:661
+#, kde-format
 msgid ""
-"Process has completed.\n"
-"Skype is now configured for Kopete.\n"
-"You must restart the Skype client for changes to take effect."
+"<h2>%1</h2><table "
+"width=\"100%\"><tr><td>Status</td><td>From</td><td>To</td></tr>"
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:92
-msgid "Could not ping Skype"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:132
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: plugins/contactnotes/contactnotesedit.cpp:33 rc.cpp:2388 rc.cpp:2388
+msgid "Contact Notes"
+msgstr "Nodiadau Cysylltiad"
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:112
-msgid "Skype did not accept this application"
+#: plugins/contactnotes/contactnotesedit.cpp:42
+#, kde-format
+msgid "Notes about %1:"
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:123
-msgid "Skype API syntax error"
-msgstr ""
+#: plugins/contactnotes/contactnotesplugin.cpp:42
+msgid "&Notes"
+msgstr "&Nodiadau"
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:132
-msgid "Skype API not ready yet, wait a bit longer"
+#: plugins/privacy/privacyplugin.cpp:52
+#: plugins/privacy/privacyguiclient.cpp:47
+msgid "Add to WhiteList"
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:178
-msgid "Cannot register Skype communication for Kopete on D-Bus"
+#: plugins/privacy/privacyplugin.cpp:55
+#: plugins/privacy/privacyguiclient.cpp:50
+msgid "Add to BlackList"
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:209
+#: plugins/privacy/privacyplugin.cpp:160
+#, kde-format
 msgid ""
-"Could not launch Skype.\n"
-"You need to install the original dynamic linked Skype version 2.0 binary "
-"from http://www.skype.com"
+"A message from %1 was dropped, because this contact is not on your whitelist."
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:216
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:324
+#: plugins/privacy/privacyplugin.cpp:170
+#, kde-format
 msgid ""
-"Could not find Skype.\n"
-"You need to install the original dynamic linked Skype version 2.0 binary "
-"from http://www.skype.com"
+"A message from %1 was dropped, because this contact is on your blacklist."
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:263
+#: plugins/privacy/privacyplugin.cpp:180
 #, kde-format
 msgid ""
-"Could not ping Skype.\n"
-"Maybe Skype not running.\n"
-"Error while sending a message to Skype (%1)."
+"A message from %1 was dropped, because this contact is not on your contact "
+"list."
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:265
+#: plugins/privacy/privacyplugin.cpp:197
 #, kde-format
-msgid "Error while sending a message to Skype (%1)."
-msgstr ""
-
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:273
 msgid ""
-"Could not ping Skype.\n"
-"You are logged out from Skype, please log in."
+"A message from %1 was dropped, because it contained a blacklisted word."
 msgstr ""
 
-#: protocols/skype/libskype/skypedbus/skypeconnection.cpp:326
-msgid "Please login to Skype first"
+#: plugins/privacy/privacyplugin.cpp:221
+#, kde-format
+msgid ""
+"A message from %1 was dropped, because it contained blacklisted words."
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:257
-msgid "This version of Skype is too old, consider upgrading"
+#: plugins/privacy/privacypreferences.cpp:164
+msgid "Add Contact to Whitelist"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:408
-#: protocols/groupwise/libgroupwise/gwerror.cpp:41
-msgid "User not found"
+#: plugins/privacy/privacypreferences.cpp:190
+msgid "Add Contact to Blacklist"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:410
-msgid "Does not have multi-user chat capability"
+#: plugins/urlpicpreview/urlpicpreviewplugin.cpp:152
+msgid "Preview of:"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:412
-msgid "Chat denied"
+#: plugins/latex/latexplugin.cpp:96
+msgid ""
+"Cannot find the Magick 'convert' program.\n"
+"convert is required to render the LaTeX formulae.\n"
+"Please get the software from www.imagemagick.org or from your distribution's "
+"package manager."
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:492
-msgid "Misc error"
+#: plugins/latex/latexguiclient.cpp:43
+msgid "Preview Latex Images"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:495
-msgid "User or phone number does not exist"
+#: plugins/latex/latexguiclient.cpp:64
+msgid ""
+"The message you are typing does not contain any LaTeX.  A LaTeX formula must "
+"be enclosed within two pairs of dollar signs: $$formula$$ "
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:498
-msgid "User is offline"
+#: plugins/latex/latexguiclient.cpp:64
+msgid "No LaTeX Formula"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:501
-msgid "No proxy found"
+#: plugins/latex/latexguiclient.cpp:70
+#, kde-format
+msgid "<b>Preview of the LaTeX message :</b> <br />%1"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:504
-msgid "Session terminated"
-msgstr ""
+#: plugins/autoreplace/autoreplacepreferences.cpp:48
+msgid "Text"
+msgstr "Testun"
 
-#: protocols/skype/libskype/skype.cpp:507
-msgid "No common codec found"
-msgstr ""
+#: plugins/autoreplace/autoreplacepreferences.cpp:49
+msgid "Replacement"
+msgstr "Amnewidiad"
 
-#: protocols/skype/libskype/skype.cpp:510
-msgid "Sound I/O error"
+#: plugins/autoreplace/autoreplaceconfig.cpp:68
+msgctxt "list_of_words_to_replace"
+msgid "ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:513
-msgid "Problem with remote sound device"
+#: plugins/nowlistening/nowlisteningguiclient.cpp:39
+msgid "Send Media Info"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:516
-msgid "Call blocked by recipient"
+#: plugins/nowlistening/nowlisteningguiclient.cpp:64
+msgid ""
+"None of the supported media players (Amarok, KsCD, JuK, Kaffeine, Quod "
+"Libet, or Qmmp) are playing anything."
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:519
-msgid "Recipient not a friend"
+#: plugins/nowlistening/nowlisteningguiclient.cpp:65
+msgid "Nothing to Send"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:522
-msgid "User not authorized by recipient"
+#: plugins/nowlistening/nowlisteningplugin.cpp:133
+msgid "USAGE: /media - Displays information on current song"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:525
-msgid "Sound recording error"
+#: plugins/nowlistening/nowlisteningplugin.cpp:172
+msgctxt ""
+"Message from Kopete user to another user; used when sending media "
+"information even though there are no songs playing or no media players "
+"running"
+msgid ""
+"Now Listening for Kopete - it would tell you what I am listening to, if I "
+"was listening to something on a supported media player."
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:822
-msgid "This version of Skype does not support adding users to chat."
+#: plugins/nowlistening/nowlisteningplugin.cpp:440
+#: plugins/nowlistening/nlquodlibet.cpp:69
+msgid "Unknown track"
 msgstr ""
 
-#: protocols/skype/libskype/skype.cpp:822
-msgid "Skype Protocol"
+#: plugins/nowlistening/nowlisteningplugin.cpp:449
+#: plugins/nowlistening/nlquodlibet.cpp:67
+msgid "Unknown artist"
 msgstr ""
 
-#: protocols/skype/skypeaddcontact.cpp:69
-msgid "You must connect to Skype first."
+#: plugins/nowlistening/nowlisteningplugin.cpp:456
+#: plugins/nowlistening/nlquodlibet.cpp:68
+msgid "Unknown album"
 msgstr ""
 
-#: protocols/skype/skypeaddcontact.cpp:74
-msgid "You must write the contact's name."
+#: plugins/nowlistening/nowlisteningplugin.cpp:463
+msgid "Unknown player"
 msgstr ""
 
-#: protocols/skype/skypeaddcontact.cpp:79
-msgid ""
-"Contact echo123 is not needed. You can make test call in Skype protocol "
-"actions."
+#: plugins/highlight/highlightconfig.cpp:71
+msgid "-New filter-"
 msgstr ""
 
-#: protocols/skype/skypeaddcontact.cpp:84
-msgid "This contact already exists in this account."
-msgstr ""
+#: plugins/highlight/highlightpreferences.cpp:198
+msgid "Rename Filter"
+msgstr "Ailenwi Hidlen"
 
-#: protocols/skype/skypeaddcontact.cpp:89
-msgid "You cannot add yourself as a contact."
+#: plugins/highlight/highlightpreferences.cpp:198
+msgid "Please enter the new name for the filter:"
 msgstr ""
 
-#: protocols/skype/skypeprotocol.cpp:88
-msgid "Not in Skype list"
+#: plugins/pipes/pipesdelegate.cpp:38
+msgctxt "adjective decribing instant message"
+msgid "Inbound"
 msgstr ""
 
-#: protocols/skype/skypeprotocol.cpp:89
-msgid "Not authorized"
+#: plugins/pipes/pipesdelegate.cpp:39
+msgctxt "adjective decribing instant message"
+msgid "Outbound"
 msgstr ""
 
-#: protocols/skype/skypeprotocol.cpp:90
-msgid "SkypeOut contact"
+#: plugins/pipes/pipesdelegate.cpp:40 plugins/pipes/pipesdelegate.cpp:156
+msgctxt "adjective decribing instant message directions inbound and outbound"
+msgid "Both Directions"
 msgstr ""
 
-#: protocols/qq/ui/qqeditaccountwidget.cpp:175
-msgid "<qt>You must enter a valid email address.</qt>"
+#: plugins/pipes/pipesdelegate.cpp:47 plugins/pipes/pipesdelegate.cpp:164
+msgid "HTML Message Body"
 msgstr ""
 
-#: protocols/qq/ui/qqeditaccountwidget.cpp:175
-msgid "QQ Plugin"
+#: plugins/pipes/pipesdelegate.cpp:48 plugins/pipes/pipesdelegate.cpp:166
+msgid "Plain Text Message Body"
 msgstr ""
 
-#: protocols/qq/ui/dlgqqvcard.cpp:44
-msgid "QQ vCard"
+#: plugins/pipes/pipesdelegate.cpp:49 plugins/pipes/pipesdelegate.cpp:168
+msgid "Kopete Message XML"
 msgstr ""
 
-#: protocols/qq/ui/dlgqqvcard.cpp:57
-msgid "WARNING: This vCard may be out-of-date."
+#: plugins/pipes/pipesdelegate.cpp:152
+msgctxt "adjective decribing an instant message"
+msgid "Inbound"
 msgstr ""
 
-#: protocols/qq/qqsocket.cpp:152
-msgid ""
-"There was an error while connecting to the QQ server.\n"
-"Error message:\n"
+#: plugins/pipes/pipesdelegate.cpp:154
+msgctxt "adjective decribing an instant message"
+msgid "Outbound"
 msgstr ""
 
-#: protocols/qq/qqsocket.cpp:154
-#, kde-format
-msgid "Unable to lookup %1"
+#: plugins/pipes/pipespreferences.cpp:85
+msgid "Select Program or Script to Pipe Messages Through"
 msgstr ""
 
-#: protocols/qq/qqsocket.cpp:234
+#: plugins/pipes/pipesplugin.cpp:303
 #, kde-format
 msgid ""
-"Unhandled QQ error code %1 \n"
-"Please file a bug report with a detailed description and, if possible, the "
-"last console debug output."
+"The pipe %1 returned malformed XML to the Pipes plugin.The error is:\n"
+"\n"
+"%2\n"
+"\n"
+"Located at line %3 and column %4"
 msgstr ""
 
-#: protocols/qq/qqaccount.cpp:136
-msgid "Show my own video..."
+#: plugins/pipes/pipesmodel.cpp:89
+msgid "Path"
 msgstr ""
 
-#: protocols/qq/qqprotocol.cpp:43
-msgid "Country"
+#: plugins/pipes/pipesmodel.cpp:91
+msgid "Direction"
 msgstr ""
 
-#: protocols/qq/qqprotocol.cpp:44 protocols/qq/qqprotocol.cpp:45
-msgid "State"
+#: plugins/pipes/pipesmodel.cpp:93
+msgid "Pipe Contents"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:325
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: protocols/qq/qqprotocol.cpp:46 rc.cpp:4396 rc.cpp:4396
-msgid "Home Address"
+#: plugins/alias/aliaspreferences.cpp:326
+#: plugins/alias/aliaspreferences.cpp:415
+#, kde-format
+msgid ""
+"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the "
+"characters \"_\" or \"=\".</qt>"
 msgstr ""
 
-#: protocols/qq/qqprotocol.cpp:47
-msgid "Zipcode"
+#: plugins/alias/aliaspreferences.cpp:328
+#: plugins/alias/aliaspreferences.cpp:417
+msgid "Invalid Alias Name"
 msgstr ""
 
-#: protocols/qq/qqprotocol.cpp:48
-msgid "Age"
-msgstr "Oedran"
+#: plugins/alias/aliaspreferences.cpp:344
+#, kde-format
+msgid ""
+"<qt>Could not add alias <b>%1</b>. This command is already being handled "
+"either by another alias or Kopete itself.</qt>"
+msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:72 protocols/qq/qqchatsession.cpp:497
-#: protocols/groupwise/gwmessagemanager.cpp:81
-#: protocols/groupwise/gwmessagemanager.cpp:517
-msgid "Security Status"
+#: plugins/alias/aliaspreferences.cpp:346
+#: plugins/alias/aliaspreferences.cpp:442
+msgid "Could Not Add Alias"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:74
-#: protocols/groupwise/gwmessagemanager.cpp:83
-msgid "Conversation is secure"
+#: plugins/alias/aliaspreferences.cpp:440
+#, kde-format
+msgid ""
+"<qt>Could not add alias <b>%1</b>. This command is already being handled by "
+"either another alias or Kopete itself.</qt>"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:78 protocols/qq/qqchatsession.cpp:504
-#: protocols/groupwise/gwmessagemanager.cpp:85
-#: protocols/groupwise/gwmessagemanager.cpp:524
-msgid "Archiving Status"
+#: plugins/alias/aliaspreferences.cpp:462
+msgid "Are you sure you want to delete the selected aliases?"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:177
-#: protocols/groupwise/gwmessagemanager.cpp:210
-#, kde-format
-msgid "An error occurred when trying to start a chat: %1"
+#: plugins/alias/aliaspreferences.cpp:462
+msgid "Delete Aliases"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:206
-#: protocols/groupwise/gwmessagemanager.cpp:238
+#: plugins/webpresence/webpresenceplugin.cpp:206
 msgid ""
-"Your message could not be sent. You cannot send messages while your status "
-"is Appear Offline. "
+"An error occurred when uploading your presence page.\n"
+"Check the path and write permissions of the destination."
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:300
-#: protocols/groupwise/gwmessagemanager.cpp:328
-msgid "&Other..."
-msgstr "&Eraill..."
+#: plugins/webpresence/webpresenceplugin.cpp:216
+msgid "Not yet known"
+msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:322
-#: protocols/groupwise/gwmessagemanager.cpp:350
-#: protocols/groupwise/gwmessagemanager.cpp:398
-msgid "Enter Invitation Message"
+#: plugins/translator/translatorlanguages.cpp:34
+msgid "Detect language"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:323
-#: protocols/groupwise/gwmessagemanager.cpp:351
-#: protocols/groupwise/gwmessagemanager.cpp:399
-msgid "Enter the reason for the invitation, or leave blank for no reason:"
+#: plugins/translator/translatorlanguages.cpp:35
+msgid "Afrikaans"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:348
-#: protocols/groupwise/gwmessagemanager.cpp:375
-msgid "Search for Contact to Invite"
+#: plugins/translator/translatorlanguages.cpp:36
+msgid "Albanian"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:387
-#: protocols/groupwise/gwmessagemanager.cpp:411
-msgctxt ""
-"label attached to contacts who have been invited but are yet to join a chat"
-msgid "(pending)"
+#: plugins/translator/translatorlanguages.cpp:37
+msgid "Arabic"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:434
-#: protocols/groupwise/gwmessagemanager.cpp:459
-msgid ""
-"All the other participants have left, and other invitations are still "
-"pending. Your messages will not be delivered until someone else joins the "
-"chat."
+#: plugins/translator/translatorlanguages.cpp:38
+msgid "Armenian"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:461
-#: protocols/groupwise/gwmessagemanager.cpp:485
-#, kde-format
-msgid "%1 has rejected an invitation to join this conversation."
+#: plugins/translator/translatorlanguages.cpp:39
+#: plugins/translator/translatorlanguages.cpp:40
+msgid "Azerbaijani"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:484
-#: protocols/groupwise/gwmessagemanager.cpp:504
-msgid "Conversation is being administratively logged"
+#: plugins/translator/translatorlanguages.cpp:41
+msgid "Basque"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:489
-#: protocols/groupwise/gwmessagemanager.cpp:509
-msgid "Conversation is not being administratively logged"
+#: plugins/translator/translatorlanguages.cpp:42
+msgid "Belarusian"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:497
-#: protocols/groupwise/gwmessagemanager.cpp:517
-msgid "This conversation is secured with SSL security."
+#: plugins/translator/translatorlanguages.cpp:43
+msgid "Bulgarian"
 msgstr ""
 
-#: protocols/qq/qqchatsession.cpp:504
-#: protocols/groupwise/gwmessagemanager.cpp:524
-msgid "This conversation is being logged administratively."
+#: plugins/translator/translatorlanguages.cpp:44
+msgid "Catalan"
 msgstr ""
 
-#: protocols/qq/qqcontact.cpp:136 protocols/groupwise/gwcontact.cpp:160
-msgid "Unblock User"
+#: plugins/translator/translatorlanguages.cpp:45
+#: plugins/translator/translatorlanguages.cpp:108
+msgid "Chinese (Simplified)"
 msgstr ""
 
-#: protocols/qq/qqcontact.cpp:136 protocols/groupwise/gwcontact.cpp:160
-msgid "Block User"
+#: plugins/translator/translatorlanguages.cpp:46
+#: plugins/translator/translatorlanguages.cpp:109
+msgid "Chinese (Traditional)"
 msgstr ""
 
-#: protocols/qq/qqcontact.cpp:147
-#: kopete/contactlist/kopetecontactlistview.cpp:182
-msgid "Send Email..."
-msgstr "Anfon Ebost ..."
-
-#: protocols/qq/qqcontact.cpp:151
-msgid "View Contact's Webcam"
+#: plugins/translator/translatorlanguages.cpp:47
+msgid "Croatian"
 msgstr ""
 
-#: protocols/qq/qqcontact.cpp:155
-msgid "Send Webcam"
+#: plugins/translator/translatorlanguages.cpp:48
+msgid "Czech"
 msgstr ""
 
-#: protocols/groupwise/ui/gwchatsearchdialog.cpp:43
-msgid "Search Chatrooms"
+#: plugins/translator/translatorlanguages.cpp:49
+msgid "Danish"
 msgstr ""
 
-#: protocols/groupwise/ui/gwchatsearchdialog.cpp:70
-msgid "Updating chatroom list..."
+#: plugins/translator/translatorlanguages.cpp:50
+#: plugins/translator/translatorlanguages.cpp:98
+msgid "Dutch"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:206
-#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:42
-#. i18n: ectx: property (title), widget (QGroupBox, statusGroup_)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:98
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:68
-#. i18n: ectx: property (text), widget (AccountTreeWidget, mAccountList)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:63
-#. i18n: ectx: ToolBar (statusToolBar)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:42
-#. i18n: ectx: ToolBar (statusToolBar)
-#. i18n: file: plugins/otr/otrprefs.ui:206
-#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:42
-#. i18n: ectx: property (title), widget (QGroupBox, statusGroup_)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:98
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:68
-#. i18n: ectx: property (text), widget (AccountTreeWidget, mAccountList)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:63
-#. i18n: ectx: ToolBar (statusToolBar)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:42
-#. i18n: ectx: ToolBar (statusToolBar)
-#: protocols/groupwise/ui/gwsearch.cpp:95 kopete/kopetewindow.cpp:415
-#: rc.cpp:221 rc.cpp:3160 rc.cpp:5932 rc.cpp:6034 rc.cpp:6203 rc.cpp:6221
-#: rc.cpp:221 rc.cpp:3160 rc.cpp:5932 rc.cpp:6034 rc.cpp:6203 rc.cpp:6221
-msgid "Status"
-msgstr "Cyflwr"
-
-#: protocols/groupwise/ui/gwsearch.cpp:104
-msgid "User ID"
-msgstr "Dynodiad Defnyddiwr"
+#: plugins/translator/translatorlanguages.cpp:51
+#: plugins/translator/translatorlanguages.cpp:97
+msgid "English"
+msgstr "Saesneg"
 
-#: protocols/groupwise/ui/gwsearch.cpp:328
-msgid "Searching"
-msgstr "Yn chwilio"
+#: plugins/translator/translatorlanguages.cpp:52
+msgid "Estonian"
+msgstr ""
 
-#: protocols/groupwise/ui/gwsearch.cpp:391
-#, kde-format
-msgid "1 matching user found"
-msgid_plural "%1 matching users found"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/translator/translatorlanguages.cpp:53
+msgid "Filipino"
+msgstr ""
 
-#: protocols/groupwise/ui/gweditaccountwidget.cpp:104
-msgid ""
-"The changes you just made will take effect next time you log in with "
-"GroupWise."
+#: plugins/translator/translatorlanguages.cpp:54
+msgid "Finnish"
 msgstr ""
 
-#: protocols/groupwise/ui/gweditaccountwidget.cpp:105
-msgid "GroupWise Settings Changed While Signed In"
+#: plugins/translator/translatorlanguages.cpp:55
+#: plugins/translator/translatorlanguages.cpp:99
+msgid "French"
+msgstr "Ffrengig"
+
+#: plugins/translator/translatorlanguages.cpp:56
+msgid "Galician"
 msgstr ""
 
-#: protocols/groupwise/ui/gwreceiveinvitationdialog.cpp:39
-msgid "Invitation to Conversation"
+#: plugins/translator/translatorlanguages.cpp:57
+msgid "Georgian"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:58
-#, kde-format
-msgctxt "Account specific privacy settings"
-msgid "Manage Privacy for %1"
+#: plugins/translator/translatorlanguages.cpp:58
+#: plugins/translator/translatorlanguages.cpp:100
+msgid "German"
+msgstr "Almaenaidd"
+
+#: plugins/translator/translatorlanguages.cpp:59
+#: plugins/translator/translatorlanguages.cpp:101
+msgid "Greek"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:70
-msgid "Privacy settings have been administratively locked"
+#: plugins/translator/translatorlanguages.cpp:60
+msgid "Haitian Creole"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:110
-msgid "<Everyone Else>"
+#: plugins/translator/translatorlanguages.cpp:61
+msgid "Hebrew"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:187
-msgid "Search for Contact to Block"
+#: plugins/translator/translatorlanguages.cpp:62
+msgid "Hindi"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:358
-msgid ""
-"You can only change privacy settings while you are logged in to the "
-"GroupWise Messenger server."
+#: plugins/translator/translatorlanguages.cpp:63
+msgid "Hungarian"
 msgstr ""
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:358
-#, kde-format
-msgid "'%1' Not Logged In"
+#: plugins/translator/translatorlanguages.cpp:64
+msgid "Icelandic"
 msgstr ""
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:81
-msgid "Contact Properties"
+#: plugins/translator/translatorlanguages.cpp:65
+msgid "Indonesian"
 msgstr ""
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:103
-msgid "Telephone Number"
-msgstr "Rhif Teleffôn"
+#: plugins/translator/translatorlanguages.cpp:66
+msgid "Irish"
+msgstr ""
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:105
-msgid "Department"
-msgstr "Adran"
+#: plugins/translator/translatorlanguages.cpp:67
+#: plugins/translator/translatorlanguages.cpp:102
+msgid "Italian"
+msgstr "Eidalaidd"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:107
-msgid "Location"
-msgstr "Lleoliad"
+#: plugins/translator/translatorlanguages.cpp:68
+#: plugins/translator/translatorlanguages.cpp:103
+msgid "Japanese"
+msgstr "Siapanëaidd"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:109
-msgid "Mailstop"
-msgstr ""
+#: plugins/translator/translatorlanguages.cpp:69
+#: plugins/translator/translatorlanguages.cpp:104
+msgid "Korean"
+msgstr "Coreeg"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:111
-msgid "Personal Title"
+#: plugins/translator/translatorlanguages.cpp:70
+msgid "Latvian"
 msgstr ""
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:115
-#: libkopete/kopeteglobal.cpp:201
-msgid "Email Address"
-msgstr "Cyfeiriad Ebost"
-
-#: protocols/groupwise/ui/gwchatpropsdialog.cpp:35
-#: protocols/groupwise/ui/gwchatpropsdialog.cpp:48
-msgid "Chatroom properties"
+#: plugins/translator/translatorlanguages.cpp:71
+msgid "Lithuanian"
 msgstr ""
 
-#: protocols/groupwise/ui/gwaddcontactpage.cpp:68
-msgid "Connect to GroupWise Messenger and try again."
+#: plugins/translator/translatorlanguages.cpp:72
+msgid "Macedonian"
 msgstr ""
 
-#: protocols/groupwise/gwcontact.cpp:239
-#, kde-format
-msgid "%1|Blocked"
+#: plugins/translator/translatorlanguages.cpp:73
+msgid "Malay"
 msgstr ""
 
-#: protocols/groupwise/gwprotocol.cpp:54
-msgid "A&vailable"
-msgstr "A&r gael"
-
-#: protocols/groupwise/gwprotocol.cpp:63
-msgid "Appear Offline"
+#: plugins/translator/translatorlanguages.cpp:74
+msgid "Maltese"
 msgstr ""
 
-#: protocols/groupwise/gwprotocol.cpp:63
-msgid "A&ppear Offline"
+#: plugins/translator/translatorlanguages.cpp:75
+msgid "Norwegian"
 msgstr ""
 
-#: protocols/groupwise/gwprotocol.cpp:68
-msgid "Invalid Status"
+#: plugins/translator/translatorlanguages.cpp:76
+msgid "Persian"
 msgstr ""
 
-#: protocols/groupwise/gwprotocol.cpp:74
-msgid "Auto Reply Message"
+#: plugins/translator/translatorlanguages.cpp:77
+msgid "Polish"
 msgstr ""
 
-#: protocols/groupwise/gwprotocol.cpp:75
-msgid "Common Name"
-msgstr "Enw Cyffredin"
+#: plugins/translator/translatorlanguages.cpp:78
+#: plugins/translator/translatorlanguages.cpp:105
+msgid "Portuguese"
+msgstr "Portwgëaidd"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:29
-msgid "Access denied"
+#: plugins/translator/translatorlanguages.cpp:79
+msgid "Romanian"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:32
-msgid "Not supported"
+#: plugins/translator/translatorlanguages.cpp:80
+#: plugins/translator/translatorlanguages.cpp:106
+msgid "Russian"
+msgstr "Rwsiaidd"
+
+#: plugins/translator/translatorlanguages.cpp:81
+msgid "Serbian"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:35
-msgid "Password expired"
+#: plugins/translator/translatorlanguages.cpp:82
+msgid "Slovak"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:38
-msgid "Invalid password"
+#: plugins/translator/translatorlanguages.cpp:83
+msgid "Slovenian"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:44
-msgid "Attribute not found"
+#: plugins/translator/translatorlanguages.cpp:84
+#: plugins/translator/translatorlanguages.cpp:107
+msgid "Spanish"
+msgstr "Sbaenaidd"
+
+#: plugins/translator/translatorlanguages.cpp:85
+msgid "Swahili"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:47
-msgid "User not enabled"
+#: plugins/translator/translatorlanguages.cpp:86
+msgid "Swedish"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:50
-msgid "Directory failure"
+#: plugins/translator/translatorlanguages.cpp:87
+msgid "Thai"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:53
-msgid "Host not found"
+#: plugins/translator/translatorlanguages.cpp:88
+msgid "Turkish"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:56
-msgid "Locked by admin"
+#: plugins/translator/translatorlanguages.cpp:89
+msgid "Ukrainian"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:59
-msgid "Duplicate participant"
+#: plugins/translator/translatorlanguages.cpp:90
+msgid "Urdu"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:62
-msgid "Server busy"
+#: plugins/translator/translatorlanguages.cpp:91
+msgid "Vietnamese"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:65
-msgid "Object not found"
+#: plugins/translator/translatorlanguages.cpp:92
+msgid "Welsh"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:68
-msgid "Directory update"
+#: plugins/translator/translatorlanguages.cpp:93
+msgid "Yiddish"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:71
-msgid "Duplicate folder"
+#: plugins/translator/translatorguiclient.cpp:47
+msgid "Translate"
+msgstr "Trosi"
+
+#: plugins/translator/translatordialog.cpp:27
+msgid "Translator Plugin"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:74
-msgid "Contact list entry already exists"
+#: plugins/translator/translatorplugin.cpp:73
+msgid "Set &Language"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:77
-msgid "User not allowed"
+#: plugins/translator/translatorplugin.cpp:370
+#, kde-format
+msgid ""
+"%2 \n"
+"Auto Translated: \n"
+"%1"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:80
-msgid "Too many contacts"
+#: plugins/translator/translatorplugin.cpp:372
+#, kde-format
+msgid "%2 <br/>Auto Translated: <br/>%1"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:83
-msgid "Conference not found"
+#: plugins/otr/privkeypopup.cpp:34
+msgid "Please wait"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:86
-msgid "Too many folders"
+#: plugins/otr/otrplugin.cpp:95
+msgctxt "@item:inmenu"
+msgid "&OTR Policy"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:89
-msgid "Server protocol error"
+#: plugins/otr/otrplugin.cpp:101
+msgctxt ""
+"@item:inmenu Use the default encryption mode specified in settings dialog"
+msgid "&Default"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:92
-msgid "Conversation invitation error"
+#: plugins/otr/otrplugin.cpp:103
+msgctxt "@item:inmenu Always encrypt messages"
+msgid "Al&ways"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:95
-msgid "User is blocked"
+#: plugins/otr/otrplugin.cpp:104
+msgctxt "@item:inmenu Use the opportunistic encryption mode"
+msgid "&Opportunistic"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:98
-msgid "Master archive is missing"
+#: plugins/otr/otrplugin.cpp:105
+msgctxt "@item:inmenu Use the manual encryption mode"
+msgid "&Manual"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:101
-msgid "Expired password in use"
+#: plugins/otr/otrplugin.cpp:106
+msgctxt "@item:inmenu Never encrypt messages"
+msgid "Ne&ver"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:104
-msgid "Credentials missing"
+#: plugins/otr/otrplugin.cpp:177
+msgid "An error occurred while encrypting the message."
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:110
-msgid "Eval connection limit"
+#: plugins/otr/otrplugin.cpp:230
+msgctxt "@info:status"
+msgid "Your policy settings do not allow encrypted sessions to this contact."
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:113
-msgid "Unsupported client version"
+#: plugins/otr/otrplugin.cpp:239
+#, kde-format
+msgctxt "@info:status"
+msgid "Attempting to refresh the OTR session with <b>%1</b>..."
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:116
-msgid "A duplicate chat was found"
+#: plugins/otr/otrplugin.cpp:241
+#, kde-format
+msgctxt "@info:status"
+msgid "Attempting to start a private OTR session with <b>%1</b>..."
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:119
-msgid "Chat not found"
+#: plugins/otr/authenticationwizard.cpp:52
+#, kde-format
+msgid "Waiting for %1..."
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:122
-msgid "Invalid chat name"
+#: plugins/otr/authenticationwizard.cpp:53
+msgid "Checking if answers match..."
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:125
-msgid "The chat is active"
+#: plugins/otr/authenticationwizard.cpp:75
+#, kde-format
+msgid "Incoming authentication request from %1"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:128
-msgid "Chat is busy; try again"
+#: plugins/otr/authenticationwizard.cpp:78 kopete/infoeventwidget.cpp:230
+msgid "View"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:131
-msgid "Tried request too soon after another; try again"
+#: plugins/otr/authenticationwizard.cpp:78
+msgid "Close"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:134
-msgid "Server's chat subsystem is not active"
+#: plugins/otr/authenticationwizard.cpp:102
+msgctxt "@title"
+msgid "Select authentication method"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:137
-msgid "The chat update request is invalid"
+#: plugins/otr/authenticationwizard.cpp:104
+msgid "Question and Answer"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:140
-msgid "Write failed due to directory mismatch"
+#: plugins/otr/authenticationwizard.cpp:105
+msgid "Shared Secret"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:143
-msgid "Recipient's client version is too old"
+#: plugins/otr/authenticationwizard.cpp:106
+msgid "Manual fingerprint verification"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:146
-msgid "Chat has been removed from server"
+#: plugins/otr/authenticationwizard.cpp:135
+msgctxt "@title"
+msgid "Question and Answer"
 msgstr ""
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:149
+#: plugins/otr/authenticationwizard.cpp:137
 #, kde-format
-msgid "Unrecognized error code: %1"
+msgctxt "@info"
+msgid "Enter a question that only %1 is able to answer:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:83
-msgid "&Set Auto-Reply..."
+#: plugins/otr/authenticationwizard.cpp:141
+msgctxt "@info"
+msgid "Enter the answer to your question:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:86
-msgid "&Join Channel..."
+#: plugins/otr/authenticationwizard.cpp:145
+#, kde-format
+msgctxt "@info"
+msgid "Authentication with %1"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:89
-msgid "&Manage Privacy..."
+#: plugins/otr/authenticationwizard.cpp:146
+#, kde-format
+msgctxt "@info"
+msgid ""
+"%1 would like to verify your authentication. Please answer the following "
+"question in the field below:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:257
-msgid "GroupWise SSL Error"
+#: plugins/otr/authenticationwizard.cpp:167
+msgctxt "@title"
+msgid "Shared Secret"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:370
+#: plugins/otr/authenticationwizard.cpp:169
 #, kde-format
-msgctxt "Message Sending Failed using the named local account"
-msgid ""
-"Kopete was not able to send the last message sent on account '%1'.\n"
-"If possible, please send the console output from Kopete to "
-"<wstephenson@novell.com> for analysis."
+msgctxt "@info"
+msgid "Enter a secret passphrase known only to you and %1:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:370
+#: plugins/otr/authenticationwizard.cpp:171
 #, kde-format
-msgctxt "message sending failed using the named local account"
-msgid "Unable to Send Message on Account '%1'"
+msgctxt "@title"
+msgid "Authentication with %1"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:586
-msgid "Kopete: Conflicting Changes Made Offline"
+#: plugins/otr/authenticationwizard.cpp:172
+#, kde-format
+msgctxt "@info"
+msgid "Enter the secret passphrase known only to you and %1:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:586
-msgid ""
-"A change happened to your GroupWise contact list while you were offline "
-"which was impossible to reconcile."
+#: plugins/otr/authenticationwizard.cpp:184
+msgctxt "@title"
+msgid "Manual Verification"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:659
+#: plugins/otr/authenticationwizard.cpp:188
 #, kde-format
-msgctxt "Error shown when connecting failed"
+msgctxt "@info"
 msgid ""
-"Kopete was not able to connect to the GroupWise Messenger server for account "
-"'%1'.\n"
-"Please check your server and port settings and try again."
+"Contact %1 via another secure channel and verify that the following "
+"fingerprint is correct:"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:659
-#, kde-format
-msgid "Unable to Connect '%1'"
+#: plugins/otr/authenticationwizard.cpp:194
+msgctxt "@item:inlistbox ...verified that"
+msgid "I have not"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:821
-msgid "GroupWise Connection Certificate Problem"
-msgstr ""
+#: plugins/otr/authenticationwizard.cpp:195
+msgctxt "@item:inlistbox ...verified that"
+msgid "I have"
+msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:871
+#: plugins/otr/authenticationwizard.cpp:204
 #, kde-format
-msgctxt ""
-"Prefix used for automatically generated auto-reply messages when the contact "
-"is Away, contains contact's name"
-msgid "Auto reply from %1: "
+msgctxt "@info:label I have..."
+msgid "verified that this is in fact the correct fingerprint for %1"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:877
-#, kde-format
-msgctxt "Prefix used for broadcast messages"
-msgid "Broadcast message from %1: "
+#: plugins/otr/authenticationwizard.cpp:308
+msgid "Authentication successful"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:883
+#: plugins/otr/authenticationwizard.cpp:312
+#: plugins/otr/authenticationwizard.cpp:316
+#: plugins/otr/authenticationwizard.cpp:322
 #, kde-format
-msgctxt "Prefix used for system broadcast messages"
-msgid "System Broadcast message from %1: "
+msgid ""
+"The authentication with %1 was completed successfully. The conversation is "
+"now secure."
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:1272
+#: plugins/otr/authenticationwizard.cpp:318
+#: plugins/otr/otrlchatinterface.cpp:461
 #, kde-format
 msgid ""
-"The contact %1 could not be added to the contact list, with error message: %2"
+"<b>%1</b> has successfully authenticated you. You may want to authenticate "
+"this contact as well by asking your own question."
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:1274
-msgid "Error Adding Contact"
+#: plugins/otr/authenticationwizard.cpp:326
+#, kde-format
+msgid ""
+"The authentication with %1 failed. To make sure you are not talking to an "
+"imposter, try again using the manual fingerprint verification method. Note "
+"that the conversation is now insecure."
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:1318
-#, kde-format
-msgid "Kopete: Signed in as %1 Elsewhere"
+#: plugins/otr/authenticationwizard.cpp:344
+msgid "Authentication aborted"
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:1318
+#: plugins/otr/authenticationwizard.cpp:345
 #, kde-format
-msgctxt "The parameter is the user's own account id for this protocol"
 msgid ""
-"You have been disconnected from GroupWise Messenger because you signed in as "
-"%1 elsewhere"
+"%1 has aborted the authentication process. To make sure you are not talking "
+"to an imposter, try again using the manual fingerprint verification method."
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:1431
+#: plugins/otr/authenticationwizard.cpp:352
 #, kde-format
-msgid "%1 has been invited to join this conversation."
-msgstr ""
-
-#: protocols/groupwise/gwaccount.cpp:1457
-msgid "Enter Auto-Reply Message"
+msgid ""
+"Ask %1 a question, the answer to which is known only to you and them. If the "
+"answer does not match, you may be talking to an imposter."
 msgstr ""
 
-#: protocols/groupwise/gwaccount.cpp:1458
+#: plugins/otr/authenticationwizard.cpp:354
+#, kde-format
 msgid ""
-"Please enter an Auto-Reply message that will be shown to users who message "
-"you while Away or Busy"
+"Pick a secret known only to you and %1. If the secret does not match, you "
+"may be talking to an imposter. Do not send the secret through the chat "
+"window, or this authentication method could be compromised with ease."
 msgstr ""
 
-#: libkopete/ui/addressbooklinkwidget.cpp:80
+#: plugins/otr/authenticationwizard.cpp:356
 #, kde-format
-msgid "Choose the corresponding entry for '%1'"
+msgid ""
+"Verify %1's fingerprint manually. For example via a phone call or signed "
+"(and verified) email."
 msgstr ""
 
-#: libkopete/ui/addressbooklinkwidget.cpp:82
-msgid "Choose the corresponding entry in the address book"
+#: plugins/otr/authenticationwizard.cpp:373
+msgctxt "@title"
+msgid "Authenticating contact..."
 msgstr ""
 
-#: libkopete/ui/addressbooklinkwidget.cpp:89
-msgid "Address Book Association"
+#: plugins/otr/otrguiclient.cpp:63
+msgid "OTR Encryption"
 msgstr ""
 
-#: libkopete/ui/avatardialog.cpp:50
-msgid "Select Avatar"
+#: plugins/otr/otrguiclient.cpp:68 plugins/otr/otrguiclient.cpp:118
+#: plugins/otr/otrguiclient.cpp:136
+msgid "Start OTR Session"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:83
-msgid "Start &Chat..."
+#: plugins/otr/otrguiclient.cpp:72
+msgid "End OTR Session"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:88
-msgid "&Send Single Message..."
-msgstr "&Anfon Neges Sengl..."
-
-#: libkopete/ui/kopetestdaction.cpp:93
-msgid "User &Info"
-msgstr "Gwybo&daeth am Ddefnyddwyr"
-
-#: libkopete/ui/kopetestdaction.cpp:98
-msgid "Send &File..."
-msgstr "Anfon& Ffeil..."
+#: plugins/otr/otrguiclient.cpp:76
+msgid "Authenticate Contact"
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:103
-msgid "View &History..."
+#: plugins/otr/otrguiclient.cpp:124 plugins/otr/otrguiclient.cpp:130
+msgid "Refresh OTR Session"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:108
-msgid "&Create Group..."
+#: plugins/otr/otrlconfinterface.cpp:68
+msgctxt "@info"
+msgid "No fingerprint present."
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:113 libkopete/kopetecontact.cpp:287
-msgid "Visible when offline"
+#: plugins/otr/otrlconfinterface.cpp:108
+msgctxt "@item:intable Fingerprint was never used"
+msgid "Unused"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:118
-msgid "Cha&nge Meta Contact..."
+#: plugins/otr/otrlconfinterface.cpp:112
+msgctxt "@item:intable Fingerprint is used in a private conversation"
+msgid "Private"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:123
-msgid "&Delete Contact"
-msgstr "&Dileu y Cyswllt"
+#: plugins/otr/otrlconfinterface.cpp:114
+msgctxt "@item:intable Fingerprint is used in an unverified conversation"
+msgid "Unverified"
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:131
-msgid "Change A&lias..."
+#: plugins/otr/otrlconfinterface.cpp:117
+msgctxt "@item:intable Private conversation finished"
+msgid "Finished"
 msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:136
-msgid "&Block Contact"
-msgstr "&Atal Cyswllt"
+#: plugins/otr/otrlconfinterface.cpp:119
+msgctxt "@item:intable Conversation is not private"
+msgid "Not Private"
+msgstr ""
 
-#: libkopete/ui/kopetestdaction.cpp:141
-msgid "Un&block Contact"
-msgstr "&Dadatal y Cyswllt"
+#: plugins/otr/otrlconfinterface.cpp:123
+msgctxt "@item:intable The fingerprint is trusted"
+msgid "Yes"
+msgstr ""
 
-#: libkopete/ui/avatarwebcamdialog.cpp:61
-msgid "Take a photo"
+#: plugins/otr/otrlconfinterface.cpp:125
+msgctxt "@item:intable The fingerprint is not trusted"
+msgid "No"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:169
-#. i18n: ectx: property (title), widget (QGroupBox)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:136
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:118
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:325
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:169
-#. i18n: ectx: property (title), widget (QGroupBox)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:136
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:118
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:325
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: libkopete/ui/kopeteinfodialog.cpp:49 libkopete/ui/kopeteinfodialog.cpp:63
-#: rc.cpp:920 rc.cpp:1691 rc.cpp:3945 rc.cpp:3975 rc.cpp:920 rc.cpp:1691
-#: rc.cpp:3945 rc.cpp:3975
-msgid "Information"
+#: plugins/otr/otrpreferences.cpp:116
+msgid "Selected account already has a key. Do you want to create a new one?"
 msgstr ""
 
-#: libkopete/ui/avatarselectorwidget.cpp:71
-#: libkopete/ui/avatarselectorwidget.cpp:142
-msgid "No Avatar"
+#: plugins/otr/otrpreferences.cpp:116
+msgid "Overwrite key?"
 msgstr ""
 
-#: libkopete/ui/addressbookselectorwidget.cpp:148
-msgid "New Address Book Entry"
+#: plugins/otr/otrpreferences.cpp:156
+#, kde-format
+msgid ""
+"Please contact %1 via another secure way and verify that the following "
+"fingerprint is correct:"
 msgstr ""
 
-#: libkopete/ui/addressbookselectorwidget.cpp:148
-msgid "Name the new entry:"
+#: plugins/otr/otrpreferences.cpp:160
+msgid "Are you sure you want to trust this fingerprint?"
 msgstr ""
 
-#: libkopete/ui/contactaddednotifydialog.cpp:58
-msgid "Someone Has Added You"
+#: plugins/otr/otrpreferences.cpp:161
+msgid "Verify fingerprint"
 msgstr ""
 
-#: libkopete/ui/contactaddednotifydialog.cpp:69
+#: plugins/otr/otrlchatinterface.cpp:222
 #, kde-format
 msgid ""
-"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added "
-"you to his/her contact list. (Account %3)</qt>"
+"<b>Received a new fingerprint from <a>%1</a>. You should authenticate this "
+"contact.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:182
-#: libkopete/kopetetransfermanager.cpp:207
-msgid "Copying"
+#: plugins/otr/otrlchatinterface.cpp:242
+msgid "<b>Private OTR session started.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:183
-#: libkopete/kopetetransfermanager.cpp:208
-msgid "Source"
+#: plugins/otr/otrlchatinterface.cpp:248
+msgid "<b>Unverified OTR session started.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:184
-#: libkopete/kopetetransfermanager.cpp:209
-msgid "Destination"
+#: plugins/otr/otrlchatinterface.cpp:263
+msgid "<b>OTR Session ended. Note that the conversation is now insecure.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:253
-#, kde-format
-msgid "File transfer %1 completed."
+#: plugins/otr/otrlchatinterface.cpp:275
+msgid "<b>OTR connection refreshed successfully.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:263
+#: plugins/otr/otrlchatinterface.cpp:393
 #, kde-format
-msgid "File transfer %1 failed."
+msgid "<b>%1</b> has ended the OTR session. You should do the same."
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:272
+#: plugins/otr/otrlchatinterface.cpp:453
 #, kde-format
-msgid "You cancelled file transfer %1"
+msgid ""
+"Authentication with <b>%1</b> successful. The conversation is now secure."
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:290
+#: plugins/otr/otrlchatinterface.cpp:470
 #, kde-format
-msgid "File transfer %1 cancelled."
-msgstr ""
-
-#: libkopete/kopetetransfermanager.cpp:509
 msgid ""
-"Sorry, sending files which are not stored locally is not yet supported by "
-"this protocol.\n"
-"Please copy this file to your computer and try again."
+"Authentication with <b>%1</b> failed. The conversation is now insecure."
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:538
-msgid "You must provide a valid local filename"
+#: plugins/otr/otrlchatinterface.cpp:490
+msgid "<b>Authentication successful. The conversation is now secure.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:547
-msgid "You do not have permission to write to selected file"
+#: plugins/otr/otrlchatinterface.cpp:498
+msgid ""
+"<b>Authentication failed. Note that the conversation is now insecure.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:551
-#, kde-format
-msgid ""
-"The file '%1' already exists.\n"
-"Do you want to overwrite it ?"
+#: plugins/otr/otrlchatinterface.cpp:510
+msgid "<b>Authentication error.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:552
-msgid "Overwrite File"
-msgstr "Trosysgrifo Ffeil"
+#: plugins/otr/otrlchatinterface.cpp:565
+msgid "Encryption error"
+msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:561
-#: libkopete/kopetetransfermanager.cpp:594
-#, kde-format
-msgid "The directory %1 does not exist"
+#: plugins/otr/otrlchatinterface.cpp:595
+msgid "Terminating OTR session."
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:566
-#: libkopete/kopetetransfermanager.cpp:599
-msgid "You do not have permission to write to selected directory"
+#: plugins/otr/otrlchatinterface.cpp:749
+msgid ""
+"<b>Authentication aborted. Note that the conversation is now insecure.</b>"
 msgstr ""
 
-#: libkopete/kopetetransfermanager.cpp:587
-msgid "You must provide a valid local directory"
+#: plugins/otr/otrlchatinterface.cpp:760 plugins/otr/otrlchatinterface.cpp:772
+#: plugins/otr/otrlchatinterface.cpp:785
+msgid "<b>Authenticating contact...</b>"
 msgstr ""
 
-#: libkopete/private/kopeteactivenotification.cpp:54
-#, kde-format
-msgid "+ %1 more message"
-msgid_plural "+ %1 more messages"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/history/converter.cpp:42
+msgid "Would you like to remove the old history files?"
+msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:372
-#, kde-format
-msgctxt "@title %1 is contact's name"
-msgid "Incoming file transfer request from <i>%1</i>"
+#: plugins/history/converter.cpp:42
+msgid "History Converter"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:375
+#: plugins/history/converter.cpp:44
+msgid "History converter"
+msgstr ""
+
+#: plugins/history/converter.cpp:109
 #, kde-format
-msgctxt "@info"
-msgid "A user is trying to send you a file <filename>%1</filename>"
+msgid "Parsing the old history in %1"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:379
+#: plugins/history/converter.cpp:119
 #, kde-format
-msgctxt "@info %2 is message"
 msgid ""
-"A user is trying to send you a file <filename>%1</filename> with the "
-"message:<nl/>\"%2\""
+"Parsing the old history in %1:\n"
+"%2"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:368
+#: plugins/history/historydialog.cpp:87 plugins/history/historydialog.cpp:580
 #, kde-format
-msgid "Incoming message from <i>%1</i>"
+msgid "History for %1"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:376
-#, kde-format
-msgid "A highlighted message arrived from <i>%1</i>"
+#: plugins/history/historydialog.cpp:109
+msgid "All"
+msgstr "Popeth"
+
+#: plugins/history/historydialog.cpp:169
+#: kopete/chatwindow/chatmessagepart.cpp:282
+msgid "Copy Link Address"
+msgstr "Copïo Cyfeiriad Cyswllt"
+
+#: plugins/history/historydialog.cpp:467
+msgid "Searching..."
+msgstr "Yn chwilio..."
+
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:193
+#. i18n: ectx: property (text), widget (QPushButton, m_search)
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:70
+#. i18n: ectx: property (text), widget (KPushButton, searchButton)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:242
+#. i18n: ectx: property (text), widget (KPushButton, searchButton)
+#. i18n: file: plugins/history/historyviewer.ui:169
+#. i18n: ectx: property (text), widget (QPushButton, searchButton)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:193
+#. i18n: ectx: property (text), widget (QPushButton, m_search)
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:70
+#. i18n: ectx: property (text), widget (KPushButton, searchButton)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:242
+#. i18n: ectx: property (text), widget (KPushButton, searchButton)
+#. i18n: file: plugins/history/historyviewer.ui:169
+#. i18n: ectx: property (text), widget (QPushButton, searchButton)
+#: plugins/history/historydialog.cpp:560 rc.cpp:489 rc.cpp:2298 rc.cpp:2346
+#: rc.cpp:5057 rc.cpp:489 rc.cpp:2298 rc.cpp:2346 rc.cpp:5057
+msgid "&Search"
+msgstr "&Chwilio"
+
+#: plugins/history/historydialog.cpp:573
+msgid "History for All Contacts"
 msgstr ""
 
-#: libkopete/private/kopeteviewmanager.cpp:394
-msgctxt "@action"
-msgid "View"
+#. i18n: file: plugins/history/historyviewer.ui:186
+#. i18n: ectx: property (text), widget (QLabel, statusLabel)
+#: plugins/history/historydialog.cpp:596 rc.cpp:5060 rc.cpp:5060
+msgid "Ready"
+msgstr "Parod"
+
+#: plugins/history/historyplugin.cpp:46
+msgid "History"
+msgstr "Hanes"
+
+#: plugins/history/historyplugin.cpp:52
+#: plugins/history/historyguiclient.cpp:63
+msgid "View &History"
 msgstr ""
 
-#: libkopete/kopetecommand.cpp:91
-msgid "Enter Arguments"
+#: plugins/history/historyplugin.cpp:72
+msgid ""
+"Old history files from Kopete 0.6.x or older has been detected.\n"
+"Do you want to import and convert them to the new history format?"
 msgstr ""
 
-#: libkopete/kopetecommand.cpp:91
-#, kde-format
-msgid "Enter the arguments to %1:"
+#: plugins/history/historyplugin.cpp:74
+msgid "History Plugin"
+msgstr "Ategyn Hanes"
+
+#: plugins/history/historyplugin.cpp:74
+msgid "Import && Convert"
 msgstr ""
 
-#: libkopete/kopetecommand.cpp:104
-#, kde-format
-msgid "Alias \"%1\" expands to itself."
+#: plugins/history/historyplugin.cpp:74
+msgid "Do Not Import"
 msgstr ""
 
-#: libkopete/kopetecommand.cpp:108
-#, kde-format
-msgid "\"%2\" requires at least %1 argument."
-msgid_plural "\"%2\" requires at least %1 arguments."
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/history/historyguiclient.cpp:55
+msgid "Latest History"
+msgstr ""
 
-#: libkopete/kopetecommand.cpp:114
-#, kde-format
-msgid "\"%2\" has a maximum of %1 argument."
-msgid_plural "\"%2\" has a maximum of %1 arguments."
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/history/historyguiclient.cpp:68
+msgid "Quote Last Message"
+msgstr ""
 
-#: libkopete/kopetecommand.cpp:120
-#, kde-format
-msgid "You are not authorized to perform the command \"%1\"."
+#: plugins/history/historyimport.cpp:52
+msgid "Import History"
 msgstr ""
 
-#: libkopete/kopetecommand.cpp:158
-msgid "Command Error"
+#: plugins/history/historyimport.cpp:53
+msgid "Import Listed Logs"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:291
-msgid "Outgoing Message Sent"
+#: plugins/history/historyimport.cpp:63
+msgid "Get History From &Pidgin..."
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:307
-msgid "A contact sent you a buzz/nudge."
+#: plugins/history/historyimport.cpp:78
+msgid "Select log directory by hand"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:565
-#, kde-format
-msgid "User <i>%1</i> is typing a message"
+#: plugins/history/historyimport.cpp:89
+msgid "Parsed History"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:568 libkopete/kopetemetacontact.cpp:1339
-#: libkopete/kopetemetacontact.cpp:1343
-msgctxt "@action"
-msgid "Chat"
+#: plugins/history/historyimport.cpp:112
+msgid "Saving logs to disk ..."
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:655
-msgid ""
-"<qt>An error has occurred while creating a new chat window. The chat window "
-"has not been created.</qt>"
+#: plugins/history/historyimport.cpp:112
+msgid "Abort Saving"
 msgstr ""
 
-#: libkopete/kopetechatsession.cpp:656
-msgid "Error While Creating Chat Window"
+#: plugins/history/historyimport.cpp:113
+msgid "Saving"
 msgstr ""
 
-#: libkopete/kopetepassword.cpp:179
-msgid "Password Required"
-msgstr "Mae angen cyfrinair"
+#: plugins/history/historyimport.cpp:260
+msgid "Are You Sure?"
+msgstr ""
 
-#: libkopete/kopetepassword.cpp:271
+#: plugins/history/historyimport.cpp:261
 msgid ""
-"<qt>Kopete is unable to save your password securely in your wallet;<br />do "
-"you want to save the password in the <b>unsafe</b> configuration file "
-"instead?</qt>"
+"You already imported logs from pidgin. If you do it twice, each message is "
+"imported twice.\n"
+"Are you sure you want to continue?"
 msgstr ""
 
-#: libkopete/kopetepassword.cpp:273
-msgid "Unable to Store Secure Password"
+#: plugins/history/historyimport.cpp:270
+msgid "Select Log Directory"
 msgstr ""
 
-#: libkopete/kopetepassword.cpp:274
-msgid "Store &Unsafe"
+#: plugins/history/historyimport.cpp:273
+msgid "Parsing history from pidgin ..."
 msgstr ""
 
-#: libkopete/kopetegroup.cpp:37 libkopete/kopetecontactlist.cpp:202
-msgid "Top Level"
-msgstr "Lefel Uchaf"
+#: plugins/history/historyimport.cpp:273
+msgid "Abort parsing"
+msgstr ""
 
-#: libkopete/kopetegroup.cpp:45
-msgid "Not in your contact list"
+#: plugins/history/historyimport.cpp:274
+msgid "Parsing history"
 msgstr ""
 
-#: libkopete/kopeteidentity.cpp:161
+#: plugins/history/historyimport.cpp:299
 #, kde-format
-msgctxt ""
-"Identity tooltip information: <nobr>ICON <b>NAME</b></nobr><br /><br />"
-msgid ""
-"<nobr><img src=\"kopete-identity-icon:%1\"> <b>%2</b></nobr><br /><br />"
+msgid "WARNING: Cannot find matching account for %1 (%2).\n"
 msgstr ""
 
-#: libkopete/kopeteidentity.cpp:169
+#: plugins/history/historyimport.cpp:311
 #, kde-format
-msgctxt ""
-"Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME "
-"(<i>STATUS</i>)</nobr><br />"
 msgid ""
-"<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 "
-"(<i>%5</i>)</nobr><br />"
+"WARNING: Cannot find %1 (%2) in your contact list. Found logs will not be "
+"imported.\n"
 msgstr ""
 
-#: libkopete/kopeteidentitymanager.cpp:145
-msgctxt ""
-"Label for the default identity, used by users to group their instant "
-"messaging accounts"
-msgid "Default Identity"
+#: plugins/history/historyimport.cpp:326
+#, kde-format
+msgid "WARNING: Cannot open file %1. Skipping.\n"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:45
-msgid "You have been disconnected."
+#: plugins/history/historyimport.cpp:375
+msgid "Cannot Map Nickname to Account"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:46
-msgid "Connection Lost."
+#: plugins/history/historyimport.cpp:376
+#, kde-format
+msgid "Did you use \"%1\" as nickname in history?"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:47
+#: plugins/history/historyimport.cpp:423
+#, kde-format
 msgid ""
-"Kopete lost the channel used to talk to the instant messaging system.\n"
-"This can be because either your internet access went down, the service is "
-"experiencing problems, or the service disconnected you because you tried to "
-"connect with the same account from another location. Try connecting again "
-"later."
+"WARNING: Cannot parse date \"%1\". You may want to edit the file containing "
+"this date manually. (Example recognized date strings: \"05/31/2008 "
+"15:24:30\".)\n"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:49
-msgid "Cannot connect with the instant messaging server or peers."
+#: plugins/history/historyimport.cpp:546
+#, kde-format
+msgid "WARNING: XML parser error in %1 at line %2, character %3: %4"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:50
-msgid "Cannot connect."
+#: plugins/history/historyimport.cpp:549
+#, kde-format
+msgid "\t%1"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:51
+#: libkopete/kopetegroup.cpp:37 libkopete/kopetecontactlist.cpp:202
+msgid "Top Level"
+msgstr "Lefel Uchaf"
+
+#: libkopete/kopetegroup.cpp:45
+msgid "Not in your contact list"
+msgstr ""
+
+#: libkopete/kopetepassword.cpp:179
+msgid "Password Required"
+msgstr "Mae angen cyfrinair"
+
+#: libkopete/kopetepassword.cpp:271
 msgid ""
-"This means Kopete cannot reach the instant messaging server or peers.\n"
-"This can be because either your internet access is down or the server is "
-"experiencing problems. Try connecting again later."
+"<qt>Kopete is unable to save your password securely in your wallet;<br />do "
+"you want to save the password in the <b>unsafe</b> configuration file "
+"instead?</qt>"
 msgstr ""
 
-#: libkopete/kopeteutils.cpp:70
-msgid "More Information..."
-msgstr "Mwy o Wybodaeth..."
+#: libkopete/kopetepassword.cpp:273
+msgid "Unable to Store Secure Password"
+msgstr ""
 
-#: libkopete/kopetemimetypehandler.cpp:152
+#: libkopete/kopetepassword.cpp:274
+msgid "Store &Unsafe"
+msgstr ""
+
+#: libkopete/kabcpersistence.cpp:297
 #, kde-format
-msgid "Unable to find the file %1."
+msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
 msgstr ""
 
-#: libkopete/kopetemimetypehandler.cpp:156
+#: libkopete/kabcpersistence.cpp:298
+msgid "Could Not Sync with KDE Address Book"
+msgstr ""
+
+#: libkopete/kabcpersistence.cpp:345
 #, kde-format
 msgid ""
-"<qt>Unable to download the requested file;<br />please check that address %1 "
-"is correct.</qt>"
+"<qt>An address was added to this contact by another application.<br />Would "
+"you like to use it in Kopete?<br /><b>Protocol:</b> %1<br /><b>Address:</b> "
+"%2</qt>"
 msgstr ""
 
-#: libkopete/kopetemetacontact.cpp:331 libkopete/kopetemetacontact.cpp:349
-#: libkopete/kopetemetacontact.cpp:426
-msgid ""
-"This user is not reachable at the moment. Please make sure you are connected "
-"and using a protocol that supports offline sending, or wait until this user "
-"comes online."
+#: libkopete/kabcpersistence.cpp:345
+msgid "Import Address From Address Book"
 msgstr ""
 
-#: libkopete/kopetemetacontact.cpp:332 libkopete/kopetemetacontact.cpp:350
-#: libkopete/kopetemetacontact.cpp:427 libkopete/kopetecontact.cpp:446
-msgid "User is Not Reachable"
+#: libkopete/kabcpersistence.cpp:345
+msgid "Use"
+msgstr "Defnydd"
+
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:389
+#. i18n: ectx: property (text), item, widget (QComboBox, useTls_)
+#: libkopete/kabcpersistence.cpp:345 rc.cpp:3219 rc.cpp:3219
+msgid "Do Not Use"
 msgstr ""
 
-#: libkopete/kopetemetacontact.cpp:1352
+#: libkopete/kabcpersistence.cpp:370
 #, kde-format
-msgid "<qt><i>%1</i> is now %2.</qt>"
+msgid ""
+"<qt>One or more of your accounts using %1 are offline.  Most systems have to "
+"be connected to add contacts.  Please connect these accounts and try "
+"again.</qt>"
 msgstr ""
 
-#: libkopete/kopeteaddedinfoevent.cpp:122
-msgid "You have been added"
+#: libkopete/kabcpersistence.cpp:395
+#, kde-format
+msgid ""
+"<qt>You do not have an account configured for <b>%1</b> yet.  Please create "
+"an account, connect it, and try again.</qt>"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:242
-#. i18n: ectx: property (text), widget (KPushButton, pb_add)
-#: libkopete/kopeteaddedinfoevent.cpp:125 rc.cpp:2220 rc.cpp:2220
-msgid "Add..."
+#: libkopete/kabcpersistence.cpp:396
+msgid "No Account Found"
 msgstr ""
 
-#: libkopete/kopeteaddedinfoevent.cpp:127
-msgid "Authorize"
+#: libkopete/kabcpersistence.cpp:408
+msgid "<qt>It was not possible to add the contact.</qt>"
 msgstr ""
 
-#: libkopete/kopeteaddedinfoevent.cpp:129
-msgid "Block"
+#: libkopete/kabcpersistence.cpp:409
+msgid "Could Not Add Contact"
 msgstr ""
 
-#: libkopete/kopeteaddedinfoevent.cpp:131
-msgid "Info..."
+#: libkopete/kopeteidentitymanager.cpp:145
+msgctxt ""
+"Label for the default identity, used by users to group their instant "
+"messaging accounts"
+msgid "Default Identity"
 msgstr ""
 
-#: libkopete/kopeteaddedinfoevent.cpp:133
+#: libkopete/kopetecommandhandler.cpp:132
+msgid ""
+"USAGE: /help [<command>] - Used to list available commands, or show help for "
+"a specified command."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:135
+msgid "USAGE: /url - Opens last URL for current chat in default browser."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:138
+msgid "USAGE: /close - Closes the current view."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:142
+msgid "USAGE: /part - Closes the current view."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:145
+msgid "USAGE: /clear - Clears the active view's chat buffer."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:151
+msgid ""
+"USAGE: /away [<reason>] - Marks you as away/back for the current account "
+"only."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:154
+msgid "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:157
+msgid ""
+"USAGE: /say <text> - Say text in this chat. This is the same as just typing "
+"a message, but is very useful for scripts."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:161
+msgid ""
+"USAGE: /exec [-o] <command> - Executes the specified command and displays "
+"the output in the chat buffer. If -o is specified, the output is sent to all "
+"members of the chat."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:272
+msgid "Available Commands:\n"
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:285
+msgid ""
+"\n"
+"Type /help <command> for more information."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:294
 #, kde-format
-msgid "The contact <b>%1</b> has added you to his/her contact list."
+msgid "There is no help available for '%1'."
+msgstr ""
+
+#: libkopete/kopetecommandhandler.cpp:345
+msgid ""
+"ERROR: Shell access has been restricted on your system. The /exec command "
+"will not function."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:243
+#: libkopete/kopetecontact.cpp:241
 msgid "&Add to Your Contact List"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:318
+#: libkopete/kopetecontact.cpp:285 libkopete/ui/kopetestdaction.cpp:113
+msgid "Visible when offline"
+msgstr ""
+
+#: libkopete/kopetecontact.cpp:316
 msgid "Move Contact"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:326
+#: libkopete/kopetecontact.cpp:324
 msgid "Select the meta contact to which you want to move this contact:"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:329
+#: libkopete/kopetecontact.cpp:327
 msgid "Create a new metacontact for this contact"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:330
+#: libkopete/kopetecontact.cpp:328
 msgid ""
 "If you select this option, a new metacontact will be created in the top-"
 "level group with the name of this contact and the contact will be moved to "
 "it."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:445
+#: libkopete/kopetecontact.cpp:443
 msgid ""
 "This user is not reachable at the moment. Please try a protocol that "
 "supports offline sending, or wait until this user comes online."
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:453
+#: libkopete/kopetecontact.cpp:444 libkopete/kopetemetacontact.cpp:332
+#: libkopete/kopetemetacontact.cpp:350 libkopete/kopetemetacontact.cpp:427
+msgid "User is Not Reachable"
+msgstr ""
+
+#: libkopete/kopetecontact.cpp:451
 #, kde-format
 msgid ""
 "Are you sure you want to remove the contact  '%1' from your contact list?"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:454
+#: libkopete/kopetecontact.cpp:452
 #: kopete/contactlist/kopetecontactlistview.cpp:816
 msgid "Remove Contact"
 msgstr "Gwaredu Cyswllt"
 
-#: libkopete/kopetecontact.cpp:595
+#: libkopete/kopetecontact.cpp:593
 #, kde-format
 msgctxt "@label:textbox %3 is contact-display-name, %1 is its status"
 msgid "<b><nobr>%3</nobr></b><br /><img src=\"%2\">&nbsp;%1"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:602
+#: libkopete/kopetecontact.cpp:600
 #, kde-format
 msgctxt ""
 "@label:textbox %4 is contact-display-name, %3 is contact-id, %1 is its status"
 msgid "<nobr><b>%4</b> (%3)</nobr><br /><img src=\"%2\">&nbsp;%1"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:620
+#: libkopete/kopetecontact.cpp:618
 #, kde-format
 msgctxt "@label:textbox formatted name"
 msgid "<br /><b>Full Name:</b>&nbsp;<nobr>%1</nobr>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:629
+#: libkopete/kopetecontact.cpp:627
 #, kde-format
 msgctxt "@label:textbox formatted idle time"
 msgid "<br /><b>Idle:</b>&nbsp;<nobr>%1</nobr>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:638
+#: libkopete/kopetecontact.cpp:636
 #, kde-format
 msgctxt "@label:textbox formatted url"
 msgid "<br /><b>Home Page:</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:648
+#: libkopete/kopetecontact.cpp:646
 #, kde-format
 msgctxt "@label:textbox formatted status title"
 msgid "<br /><b>Status&nbsp;Title:</b>&nbsp;%1"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:657 kopete/kopetewindow.cpp:1335
+#: libkopete/kopetecontact.cpp:655 kopete/kopetewindow.cpp:1339
 #, kde-format
 msgctxt "@label:textbox formatted status message"
 msgid "<br /><b>Status&nbsp;Message:</b>&nbsp;%1"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:694
+#: libkopete/kopetecontact.cpp:692
 #, kde-format
 msgctxt "@label:textbox property label %2 is name, %1 is value"
 msgid "<br /><nobr><b>%2:</b></nobr>&nbsp;%1"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:717
+#: libkopete/kopetecontact.cpp:715
 #, kde-format
 msgctxt "firstName lastName"
 msgid "%2 %1"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:753
+#: libkopete/kopetecontact.cpp:751
 #, kde-format
 msgctxt "<days>d <hours>h <minutes>m <seconds>s"
 msgid "%4d %3h %2m %1s"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:761
+#: libkopete/kopetecontact.cpp:759
 #, kde-format
 msgctxt "<hours>h <minutes>m <seconds>s"
 msgid "%3h %2m %1s"
 msgstr ""
 
-#: libkopete/kopetecontact.cpp:769
+#: libkopete/kopetecontact.cpp:767
 #, kde-format, no-c-format
 msgctxt "<minutes>m <seconds>s"
 msgid "%2m %1s"
@@ -9007,12 +8747,12 @@
 msgstr ""
 
 #: libkopete/avdevice/dummy-V4L2apiCustomStrings.cpp:158
-#: kopete/chatwindow/kopetechatwindow.cpp:1130
+#: kopete/chatwindow/kopetechatwindow.cpp:1135
 msgid "Top"
 msgstr ""
 
 #: libkopete/avdevice/dummy-V4L2apiCustomStrings.cpp:159
-#: kopete/chatwindow/kopetechatwindow.cpp:1133
+#: kopete/chatwindow/kopetechatwindow.cpp:1138
 msgid "Bottom"
 msgstr ""
 
@@ -9032,7 +8772,7 @@
 
 #. i18n: file: protocols/wlm/ui/wlmchatsessioninkpopup.ui:57
 #. i18n: ectx: property (text), widget (QPushButton, color_btn)
-#: libkopete/avdevice/videodevice.cpp:134 rc.cpp:1101 rc.cpp:1101
+#: libkopete/avdevice/videodevice.cpp:134 rc.cpp:1772 rc.cpp:1772
 msgid "Color"
 msgstr ""
 
@@ -9085,7 +8825,7 @@
 
 #. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:63
 #. i18n: ectx: property (text), widget (QPushButton, muteButton)
-#: libkopete/avdevice/videodevice.cpp:3051 rc.cpp:2311 rc.cpp:2311
+#: libkopete/avdevice/videodevice.cpp:3051 rc.cpp:948 rc.cpp:948
 msgid "Mute"
 msgstr ""
 
@@ -9189,189 +8929,193 @@
 msgid "Illuminator 2"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:171
-msgid "You have been disconnected"
+#: libkopete/kopeteaddedinfoevent.cpp:122
+msgid "You have been added"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:171
-#, kde-format
-msgid ""
-"You have connected from another client or computer to the account '%1'"
+#. i18n: file: protocols/jabber/ui/privacy.ui:242
+#. i18n: ectx: property (text), widget (KPushButton, pb_add)
+#: libkopete/kopeteaddedinfoevent.cpp:125 rc.cpp:1535 rc.cpp:1535
+msgid "Add..."
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:171
-msgid ""
-"Most proprietary Instant Messaging services do not allow you to connect from "
-"more than one location. Check that nobody is using your account without your "
-"permission. If you need a service that supports connection from various "
-"locations at the same time, use the Jabber protocol."
+#: libkopete/kopeteaddedinfoevent.cpp:127
+msgid "Authorize"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:306 libkopete/kopeteaccount.cpp:380
-#, kde-format
-msgid ""
-"You are not allowed to add yourself to the contact list. The addition of "
-"\"%1\" to account \"%2\" will not take place."
+#: libkopete/kopeteaddedinfoevent.cpp:129
+msgid "Block"
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:306 libkopete/kopeteaccount.cpp:380
-msgid "Error Creating Contact"
+#: libkopete/kopeteaddedinfoevent.cpp:131
+msgid "Info..."
 msgstr ""
 
-#: libkopete/kopeteaccount.cpp:621
-msgid "Edit Account"
-msgstr "Golygu Cyfrif:"
-
-#: libkopete/kabcpersistence.cpp:297
+#: libkopete/kopeteaddedinfoevent.cpp:133
 #, kde-format
-msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
+msgid "The contact <b>%1</b> has added you to his/her contact list."
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:298
-msgid "Could Not Sync with KDE Address Book"
+#: libkopete/kopetemimetypehandler.cpp:152
+#, kde-format
+msgid "Unable to find the file %1."
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:345
+#: libkopete/kopetemimetypehandler.cpp:156
 #, kde-format
 msgid ""
-"<qt>An address was added to this contact by another application.<br />Would "
-"you like to use it in Kopete?<br /><b>Protocol:</b> %1<br /><b>Address:</b> "
-"%2</qt>"
+"<qt>Unable to download the requested file;<br />please check that address %1 "
+"is correct.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:345
-msgid "Import Address From Address Book"
+#: libkopete/kopetemetacontact.cpp:331 libkopete/kopetemetacontact.cpp:349
+#: libkopete/kopetemetacontact.cpp:426
+msgid ""
+"This user is not reachable at the moment. Please make sure you are connected "
+"and using a protocol that supports offline sending, or wait until this user "
+"comes online."
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:345
-msgid "Use"
-msgstr "Defnydd"
+#: libkopete/kopetemetacontact.cpp:1339 libkopete/kopetemetacontact.cpp:1343
+#: libkopete/kopetechatsession.cpp:568
+msgctxt "@action"
+msgid "Chat"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:389
-#. i18n: ectx: property (text), item, widget (QComboBox, useTls_)
-#: libkopete/kabcpersistence.cpp:345 rc.cpp:3318 rc.cpp:3318
-msgid "Do Not Use"
+#: libkopete/kopetemetacontact.cpp:1352
+#, kde-format
+msgid "<qt><i>%1</i> is now %2.</qt>"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:370
+#: libkopete/kopeteidentity.cpp:161
 #, kde-format
+msgctxt ""
+"Identity tooltip information: <nobr>ICON <b>NAME</b></nobr><br /><br />"
 msgid ""
-"<qt>One or more of your accounts using %1 are offline.  Most systems have to "
-"be connected to add contacts.  Please connect these accounts and try "
-"again.</qt>"
+"<nobr><img src=\"kopete-identity-icon:%1\"> <b>%2</b></nobr><br /><br />"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:395
+#: libkopete/kopeteidentity.cpp:169
 #, kde-format
+msgctxt ""
+"Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME "
+"(<i>STATUS</i>)</nobr><br />"
 msgid ""
-"<qt>You do not have an account configured for <b>%1</b> yet.  Please create "
-"an account, connect it, and try again.</qt>"
+"<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 "
+"(<i>%5</i>)</nobr><br />"
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:396
-msgid "No Account Found"
+#: libkopete/kopeteutils.cpp:45
+msgid "You have been disconnected."
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:408
-msgid "<qt>It was not possible to add the contact.</qt>"
+#: libkopete/kopeteutils.cpp:46
+msgid "Connection Lost."
 msgstr ""
 
-#: libkopete/kabcpersistence.cpp:409
-msgid "Could Not Add Contact"
+#: libkopete/kopeteutils.cpp:47
+msgid ""
+"Kopete lost the channel used to talk to the instant messaging system.\n"
+"This can be because either your internet access went down, the service is "
+"experiencing problems, or the service disconnected you because you tried to "
+"connect with the same account from another location. Try connecting again "
+"later."
 msgstr ""
 
-#: libkopete/kopetestatusmanager.cpp:279
-msgid "I am gone right now, but I will be back later"
+#: libkopete/kopeteutils.cpp:49
+msgid "Cannot connect with the instant messaging server or peers."
 msgstr ""
 
-#: libkopete/kopetestatusmanager.cpp:285
-msgid "Sorry, I am busy right now"
+#: libkopete/kopeteutils.cpp:50
+msgid "Cannot connect."
 msgstr ""
 
-#: libkopete/kopetestatusmanager.cpp:357
-msgid "Going Online - Kopete"
+#: libkopete/kopeteutils.cpp:51
+msgid ""
+"This means Kopete cannot reach the instant messaging server or peers.\n"
+"This can be because either your internet access is down or the server is "
+"experiencing problems. Try connecting again later."
 msgstr ""
 
-#: libkopete/kopetestatusmanager.cpp:365
-msgid "Do You Want to Change Status to Available?"
-msgstr ""
+#: libkopete/kopeteutils.cpp:70
+msgid "More Information..."
+msgstr "Mwy o Wybodaeth..."
 
-#: libkopete/kopetecommandhandler.cpp:132
-msgid ""
-"USAGE: /help [<command>] - Used to list available commands, or show help for "
-"a specified command."
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:173
+#: libkopete/kopetestatusmanager.cpp:283 rc.cpp:5205 rc.cpp:5205
+msgid "I am gone right now, but I will be back later"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:135
-msgid "USAGE: /url - Opens last URL for current chat in default browser."
+#: libkopete/kopetestatusmanager.cpp:289
+msgid "Sorry, I am busy right now"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:138
-msgid "USAGE: /close - Closes the current view."
+#: libkopete/kopetestatusmanager.cpp:361
+msgid "Going Online - Kopete"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:142
-msgid "USAGE: /part - Closes the current view."
+#: libkopete/kopetestatusmanager.cpp:369
+msgid "Do You Want to Change Status to Available?"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:145
-msgid "USAGE: /clear - Clears the active view's chat buffer."
+#: libkopete/kopetecommand.cpp:91
+msgid "Enter Arguments"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:151
-msgid ""
-"USAGE: /away [<reason>] - Marks you as away/back for the current account "
-"only."
+#: libkopete/kopetecommand.cpp:91
+#, kde-format
+msgid "Enter the arguments to %1:"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:154
-msgid "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."
+#: libkopete/kopetecommand.cpp:104
+#, kde-format
+msgid "Alias \"%1\" expands to itself."
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:157
-msgid ""
-"USAGE: /say <text> - Say text in this chat. This is the same as just typing "
-"a message, but is very useful for scripts."
-msgstr ""
+#: libkopete/kopetecommand.cpp:108
+#, kde-format
+msgid "\"%2\" requires at least %1 argument."
+msgid_plural "\"%2\" requires at least %1 arguments."
+msgstr[0] ""
+msgstr[1] ""
 
-#: libkopete/kopetecommandhandler.cpp:161
-msgid ""
-"USAGE: /exec [-o] <command> - Executes the specified command and displays "
-"the output in the chat buffer. If -o is specified, the output is sent to all "
-"members of the chat."
-msgstr ""
+#: libkopete/kopetecommand.cpp:114
+#, kde-format
+msgid "\"%2\" has a maximum of %1 argument."
+msgid_plural "\"%2\" has a maximum of %1 arguments."
+msgstr[0] ""
+msgstr[1] ""
 
-#: libkopete/kopetecommandhandler.cpp:272
-msgid "Available Commands:\n"
+#: libkopete/kopetecommand.cpp:120
+#, kde-format
+msgid "You are not authorized to perform the command \"%1\"."
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:285
-msgid ""
-"\n"
-"Type /help <command> for more information."
+#: libkopete/kopetecommand.cpp:158
+msgid "Command Error"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:294
-#, kde-format
-msgid "There is no help available for '%1'."
+#: libkopete/kopetechatsession.cpp:291
+msgid "Outgoing Message Sent"
 msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:345
-msgid ""
-"ERROR: Shell access has been restricted on your system. The /exec command "
-"will not function."
+#: libkopete/kopetechatsession.cpp:307
+msgid "A contact sent you a buzz/nudge."
 msgstr ""
 
-#: libkopete/kopetepasswordedaccount.cpp:75
+#: libkopete/kopetechatsession.cpp:565
 #, kde-format
+msgid "User <i>%1</i> is typing a message"
+msgstr ""
+
+#: libkopete/kopetechatsession.cpp:655
 msgid ""
-"<qt><b>The password was wrong.</b> Please re-enter your password for %1 "
-"account <b>%2</b></qt>"
+"<qt>An error has occurred while creating a new chat window. The chat window "
+"has not been created.</qt>"
 msgstr ""
 
-#: libkopete/kopetepasswordedaccount.cpp:77
-#, kde-format
-msgid "<qt>Please enter your password for %1 account <b>%2</b></qt>"
+#: libkopete/kopetechatsession.cpp:656
+msgid "Error While Creating Chat Window"
 msgstr ""
 
 #: libkopete/contactlist/xmlcontactstorage.cpp:131
@@ -9386,32 +9130,6 @@
 msgid "Could not write contact list to a file."
 msgstr ""
 
-#: libkopete/contactlist/xmlcontactstorage.cpp:565
-msgid "(Unnamed Group)"
-msgstr ""
-
-#: libkopete/connectionmanager.cpp:157
-msgid ""
-"A network connection was disconnected.  The application is now in offline "
-"mode.  Do you want the application to resume network operations when the "
-"network is available again?"
-msgstr ""
-
-#: libkopete/connectionmanager.cpp:158
-msgid ""
-"This application is currently in offline mode.  Do you want to connect?"
-msgstr ""
-
-#: libkopete/connectionmanager.cpp:160
-msgid ""
-"This application is currently in offline mode.  Do you want to connect in "
-"order to carry out this operation?"
-msgstr ""
-
-#: libkopete/connectionmanager.cpp:161
-msgid "Leave Offline Mode?"
-msgstr ""
-
 #: libkopete/kopeteglobal.cpp:129
 msgid "Full Name"
 msgstr "Enw Llawn"
@@ -9433,7 +9151,7 @@
 msgid "Status Title"
 msgstr ""
 
-#: libkopete/kopeteglobal.cpp:159 kopete/kopetewindow.cpp:1345
+#: libkopete/kopeteglobal.cpp:159 kopete/kopetewindow.cpp:1349
 #: kopete/contactlist/contactlistlayoutmanager.cpp:61
 msgid "Status Message"
 msgstr ""
@@ -9474,13881 +9192,14208 @@
 #. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
 #. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:250
 #. i18n: ectx: property (text), widget (QLabel, photoLabel)
-#: libkopete/kopeteglobal.cpp:219 rc.cpp:1784 rc.cpp:5165 rc.cpp:6401
-#: rc.cpp:1784 rc.cpp:5165 rc.cpp:6401
+#: libkopete/kopeteglobal.cpp:219 rc.cpp:1330 rc.cpp:5226 rc.cpp:6458
+#: rc.cpp:1330 rc.cpp:5226 rc.cpp:6458
 msgid "Photo"
 msgstr "Ffoto"
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:255
-#. i18n: ectx: property (text), widget (KPushButton, clearButton)
-#: kopete/statusmenu/kopetestatuseditaction.cpp:39 rc.cpp:2789 rc.cpp:2789
-msgid "C&lear"
-msgstr "&Gwaredu"
-
-#: kopete/statusmenu/kopetestatuseditaction.cpp:137
-msgid "Edit Message"
+#: libkopete/kopetetransfermanager.cpp:182
+#: libkopete/kopetetransfermanager.cpp:207
+msgid "Copying"
 msgstr ""
 
-#: kopete/statusmenu/kopetestatusrootaction.cpp:165
-msgid "Edit Message..."
+#: libkopete/kopetetransfermanager.cpp:183
+#: libkopete/kopetetransfermanager.cpp:208
+msgid "Source"
 msgstr ""
 
-#: kopete/statusmenu/kopetestatusrootaction.cpp:204
-msgid "Configure Statuses"
+#: libkopete/kopetetransfermanager.cpp:184
+#: libkopete/kopetetransfermanager.cpp:209
+msgid "Destination"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:120
-msgid "Global status message"
+#: libkopete/kopetetransfermanager.cpp:253
+#, kde-format
+msgid "File transfer %1 completed."
 msgstr ""
 
-#: kopete/kopetewindow.cpp:140
-msgid "Service messages"
+#: libkopete/kopetetransfermanager.cpp:263
+#, kde-format
+msgid "File transfer %1 failed."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/ircadd.ui:34
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: kopete/kopetewindow.cpp:378
-#: kopete/contactlist/kopetecontactlistview.cpp:195 rc.cpp:1631 rc.cpp:1631
-msgid "&Add Contact"
-msgstr "&Ychwanegu Cyswllt"
-
-#: kopete/kopetewindow.cpp:392
-msgid "&Export Contacts..."
-msgstr "&Allforio Cyswlltau..."
-
-#: kopete/kopetewindow.cpp:414
-msgid "&Set Status"
-msgstr "&Gosod Cyflwr"
-
-#: kopete/kopetewindow.cpp:442
-msgid "Configure &Global Shortcuts..."
+#: libkopete/kopetetransfermanager.cpp:272
+#, kde-format
+msgid "You cancelled file transfer %1"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:451
-msgid "Show &All"
+#: libkopete/kopetetransfermanager.cpp:290
+#, kde-format
+msgid "File transfer %1 cancelled."
 msgstr ""
 
-#: kopete/kopetewindow.cpp:456
-msgid "Show Offline &Users"
+#: libkopete/kopetetransfermanager.cpp:509
+msgid ""
+"Sorry, sending files which are not stored locally is not yet supported by "
+"this protocol.\n"
+"Please copy this file to your computer and try again."
 msgstr ""
 
-#: kopete/kopetewindow.cpp:460
-msgid "Show Empty &Groups"
+#: libkopete/kopetetransfermanager.cpp:538
+msgid "You must provide a valid local filename"
 msgstr ""
 
-#. i18n: file: kopete/kopeteui.rc:54
-#. i18n: ectx: ToolBar (quickSearchBar)
-#: kopete/kopetewindow.cpp:473 rc.cpp:6302 rc.cpp:6302
-msgid "Quick Search Bar"
-msgstr "Bar Chwilio Brys"
-
-#: kopete/kopetewindow.cpp:482
-msgid "Read Message"
+#: libkopete/kopetetransfermanager.cpp:547
+msgid "You do not have permission to write to selected file"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:486
-msgid "Read the next pending message"
+#: libkopete/kopetetransfermanager.cpp:551
+#, kde-format
+msgid ""
+"The file '%1' already exists.\n"
+"Do you want to overwrite it ?"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:488
-msgid "Show/Hide Contact List"
-msgstr ""
+#: libkopete/kopetetransfermanager.cpp:552
+msgid "Overwrite File"
+msgstr "Trosysgrifo Ffeil"
 
-#: kopete/kopetewindow.cpp:492
-msgid "Show or hide the contact list"
+#: libkopete/kopetetransfermanager.cpp:561
+#: libkopete/kopetetransfermanager.cpp:594
+#, kde-format
+msgid "The directory %1 does not exist"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:494
-msgid "Set Away/Back"
-msgstr "Gosod I Ffwrdd/Yn Ôl"
-
-#: kopete/kopetewindow.cpp:839
-msgid ""
-"<qt>Closing the main window will keep Kopete running in the system tray. Use "
-"'Quit' from the 'File' menu to quit the application.</qt>"
+#: libkopete/kopetetransfermanager.cpp:566
+#: libkopete/kopetetransfermanager.cpp:599
+msgid "You do not have permission to write to selected directory"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:841
-msgid "Docking in System Tray"
+#: libkopete/kopetetransfermanager.cpp:587
+msgid "You must provide a valid local directory"
 msgstr ""
 
-#: kopete/kopetewindow.cpp:1109
+#: libkopete/private/kopeteactivenotification.cpp:54
 #, kde-format
-msgctxt ""
-"Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME "
-"(<i>STATUS</i>)</nobr><br />"
-msgid ""
-"<nobr><img src=\"%3\" width=\"16\" height=\"16\" /> <b>%1:</b> %2 "
-"(<i>%4</i>)</nobr><br />"
-msgstr ""
+msgid "+ %1 more message"
+msgid_plural "+ %1 more messages"
+msgstr[0] ""
+msgstr[1] ""
 
-#: kopete/kopetewindow.cpp:1332
+#: libkopete/private/kopeteviewmanager.cpp:372
 #, kde-format
-msgctxt "@label:textbox formatted status title"
-msgid "<b>Status&nbsp;Title:</b>&nbsp;%1"
-msgstr ""
-
-#: kopete/kopetewindow.cpp:1380
-#: kopete/contactlist/kopetecontactlistview.cpp:959
-msgid "Add Contact"
-msgstr "Ychwanegu Cyswllt"
-
-#: kopete/config/chatwindow/chatwindowconfig.cpp:161
-msgid "&Style"
-msgstr ""
-
-#: kopete/config/chatwindow/chatwindowconfig.cpp:206
-msgid "&Emoticons"
-msgstr ""
-
-#: kopete/config/chatwindow/chatwindowconfig.cpp:220
-#: kopete/config/appearance/appearanceconfig.cpp:116
-msgid "Colors && Fonts"
-msgstr ""
-
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:25
-#. i18n: ectx: Menu (tabs)
-#: rc.cpp:6191 rc.cpp:6191
-msgid "&Tabs"
-msgstr ""
-
-#: kopete/config/chatwindow/chatwindowconfig.cpp:345
-msgid "(No Variant)"
+msgctxt "@title %1 is contact's name"
+msgid "Incoming file transfer request from <i>%1</i>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:402
-msgid "Choose Chat Window Style to Install"
+#: libkopete/private/kopeteviewmanager.cpp:375
+#, kde-format
+msgctxt "@info"
+msgid "A user is trying to send you a file <filename>%1</filename>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:413
+#: libkopete/private/kopeteviewmanager.cpp:379
+#, kde-format
+msgctxt "@info %2 is message"
 msgid ""
-"The specified archive cannot be opened.\n"
-"Make sure that the archive is a valid ZIP or TAR archive."
+"A user is trying to send you a file <filename>%1</filename> with the "
+"message:<nl/>\"%2\""
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:413
-msgid "Cannot Open Archive"
+#: libkopete/private/kopeteviewmanager.cpp:385
+#, kde-format
+msgid "Incoming message from <i>%1</i>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:418
-msgid "Could not find a suitable place to install the chat window style."
+#: libkopete/private/kopeteviewmanager.cpp:393
+#, kde-format
+msgid "A highlighted message arrived from <i>%1</i>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:418
-msgid "Cannot Find Styles Directory"
+#: libkopete/private/kopeteviewmanager.cpp:411
+msgctxt "@action"
+msgid "View"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:422
-msgid "The specified archive does not contain a valid chat window style."
+#: libkopete/kopetepasswordedaccount.cpp:75
+#, kde-format
+msgid ""
+"<qt><b>The password was wrong.</b> Please re-enter your password for %1 "
+"account <b>%2</b></qt>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:422
-msgid "Invalid Style"
+#: libkopete/kopetepasswordedaccount.cpp:77
+#, kde-format
+msgid "<qt>Please enter your password for %1 account <b>%2</b></qt>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:426
-msgid "The chat window style was successfully installed."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:169
+#. i18n: ectx: property (title), widget (QGroupBox)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:136
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:118
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:325
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:169
+#. i18n: ectx: property (title), widget (QGroupBox)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:136
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:118
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:325
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: libkopete/ui/kopeteinfodialog.cpp:49 libkopete/ui/kopeteinfodialog.cpp:63
+#: rc.cpp:816 rc.cpp:1586 rc.cpp:1637 rc.cpp:1667 rc.cpp:816 rc.cpp:1586
+#: rc.cpp:1637 rc.cpp:1667
+msgid "Information"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:426
-msgid "Install Successful"
+#: libkopete/ui/avatardialog.cpp:50
+msgid "Select Avatar"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:432
-msgid ""
-"An unknown error occurred while trying to install the chat window style."
+#: libkopete/ui/addressbookselectorwidget.cpp:148
+msgid "New Address Book Entry"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:432
-msgid "Unknown Error"
+#: libkopete/ui/addressbookselectorwidget.cpp:148
+msgid "Name the new entry:"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:467
-#, kde-format
-msgctxt "@info"
-msgid ""
-"The Chat Window Style <resource>%1</resource> was successfully deleted."
+#: libkopete/ui/contactaddednotifydialog.cpp:58
+msgid "Someone Has Added You"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:472
+#: libkopete/ui/contactaddednotifydialog.cpp:69
 #, kde-format
-msgctxt "@info"
 msgid ""
-"An error occurred while trying to delete the <resource>%1</resource> Chat "
-"Window Style. Your account might not have permission to remove it."
+"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> has added "
+"you to his/her contact list. (Account %3)</qt>"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:505
-#, kde-format
-msgctxt "@title:window"
-msgid "Chat Window Style <resource>%1</resource> installation"
+#: libkopete/ui/avatarselectorwidget.cpp:71
+#: libkopete/ui/avatarselectorwidget.cpp:142
+msgid "No Avatar"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:510
-#, kde-format
-msgctxt "@info"
-msgid ""
-"The specified archive <filename>%1</filename> cannot be opened.\n"
-"Make sure that the archive is a valid ZIP or TAR archive."
+#: libkopete/ui/avatarwebcamdialog.cpp:61
+msgid "Take a photo"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:515
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Could not find a suitable place to install the Chat Window Style "
-"<resource>%1</resource>."
+#: libkopete/ui/kopetestdaction.cpp:83
+msgid "Start &Chat..."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:519
-#, kde-format
-msgctxt "@info"
-msgid ""
-"The specified archive <filename>%1</filename> does not contain a valid Chat "
-"Window Style."
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:88
+msgid "&Send Single Message..."
+msgstr "&Anfon Neges Sengl..."
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:529
-#, kde-format
-msgctxt "@info"
-msgid ""
-"An unknown error occurred while trying to install the Chat Window Style "
-"<resource>%1</resource>."
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:93
+msgid "User &Info"
+msgstr "Gwybo&daeth am Ddefnyddwyr"
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:538
-#, kde-format
-msgid "One Chat Window Style package has been installed."
-msgid_plural "%1 Chat Window Style packages have been installed."
-msgstr[0] ""
-msgstr[1] ""
+#: libkopete/ui/kopetestdaction.cpp:98
+msgid "Send &File..."
+msgstr "Anfon& Ffeil..."
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:550
-msgctxt "This is the myself preview contact id"
-msgid "myself@preview"
+#: libkopete/ui/kopetestdaction.cpp:103
+msgid "View &History..."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:551
-msgctxt "This is the myself preview contact nickname"
-msgid "Myself"
+#: libkopete/ui/kopetestdaction.cpp:108
+msgid "&Create Group..."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:555
-msgid "Jack"
+#: libkopete/ui/kopetestdaction.cpp:118
+msgid "Cha&nge Meta Contact..."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:558
-msgctxt "This is the other preview contact id"
-msgid "jack@preview"
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:123
+msgid "&Delete Contact"
+msgstr "&Dileu y Cyswllt"
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:559
-msgctxt "This is the other preview contact nickname"
-msgid "Jack"
+#: libkopete/ui/kopetestdaction.cpp:131
+msgid "Change A&lias..."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:567
-msgctxt "preview of a chat session"
-msgid "Preview Session"
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:136
+msgid "&Block Contact"
+msgstr "&Atal Cyswllt"
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:573
-msgid "Hello, this is an incoming message :-)"
-msgstr ""
+#: libkopete/ui/kopetestdaction.cpp:141
+msgid "Un&block Contact"
+msgstr "&Dadatal y Cyswllt"
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:577
-msgid "Hello, this is an incoming consecutive message."
+#: libkopete/ui/addressbooklinkwidget.cpp:80
+#, kde-format
+msgid "Choose the corresponding entry for '%1'"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:581
-msgid "Ok, this is an outgoing message"
+#: libkopete/ui/addressbooklinkwidget.cpp:82
+msgid "Choose the corresponding entry in the address book"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:585
-msgid "Ok, an outgoing consecutive message."
+#: libkopete/ui/addressbooklinkwidget.cpp:89
+msgid "Address Book Association"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:589
-msgid "Message that is being sent."
+#: libkopete/connectionmanager.cpp:157
+msgid ""
+"A network connection was disconnected.  The application is now in offline "
+"mode.  Do you want the application to resume network operations when the "
+"network is available again?"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:594
-msgid "Delivered message."
+#: libkopete/connectionmanager.cpp:158
+msgid ""
+"This application is currently in offline mode.  Do you want to connect?"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:599
-msgid "Message that cannot be delivered."
+#: libkopete/connectionmanager.cpp:160
+msgid ""
+"This application is currently in offline mode.  Do you want to connect in "
+"order to carry out this operation?"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:604
-msgid "Here is an incoming colored message."
+#: libkopete/connectionmanager.cpp:161
+msgid "Leave Offline Mode?"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:610
-msgid "This is an internal message"
+#: libkopete/kopeteaccount.cpp:204
+msgid "You have been disconnected"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:614
-msgid "performed an action"
+#: libkopete/kopeteaccount.cpp:204
+#, kde-format
+msgid ""
+"You have connected from another client or computer to the account '%1'"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:619
-msgid "This is a highlighted message"
+#: libkopete/kopeteaccount.cpp:204
+msgid ""
+"Most proprietary Instant Messaging services do not allow you to connect from "
+"more than one location. Check that nobody is using your account without your "
+"permission. If you need a service that supports connection from various "
+"locations at the same time, use the Jabber protocol."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:624
-msgid "Hello, this is an incoming file transfer request"
+#: libkopete/kopeteaccount.cpp:339 libkopete/kopeteaccount.cpp:413
+#, kde-format
+msgid ""
+"You are not allowed to add yourself to the contact list. The addition of "
+"\"%1\" to account \"%2\" will not take place."
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:631
-msgid "Hello, this is a disabled incoming file transfer request"
+#: libkopete/kopeteaccount.cpp:339 libkopete/kopeteaccount.cpp:413
+msgid "Error Creating Contact"
 msgstr ""
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:640
-msgctxt ""
-"This special UTF-8 string is to test if the style supports Right-to-Left "
-"language display."
-msgid "הודעות טקסט"
-msgstr ""
+#: libkopete/kopeteaccount.cpp:654
+msgid "Edit Account"
+msgstr "Golygu Cyfrif:"
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:644
-msgid "Bye"
-msgstr "Ta ra"
+#: rc.cpp:1 kopete/main.cpp:82 rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Kevin Donnelly"
 
-#: kopete/config/chatwindow/chatwindowconfig.cpp:723
-msgid "Configure Emoticon Themes"
-msgstr ""
+#: rc.cpp:2 kopete/main.cpp:83 rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,"
 
-#: kopete/config/behavior/behaviorconfig_events.cpp:30
-msgid ""
-"Animation is not possible as your Qt version does not support the mng video "
-"format."
-msgstr ""
-
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:27
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:29
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:27
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:29
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: kopete/config/behavior/behaviorconfig.cpp:61
-#: kopete/config/status/statusconfig.cpp:47 rc.cpp:1763 rc.cpp:6344
-#: rc.cpp:6362 rc.cpp:1763 rc.cpp:6344 rc.cpp:6362
-msgid "&General"
-msgstr "&Cyffredinol"
-
-#: kopete/config/behavior/behaviorconfig.cpp:66
-msgid "&Events"
-msgstr "&Digwyddiadau:"
-
-#: kopete/config/behavior/behaviorconfig.cpp:71
-msgid "A&way Settings"
-msgstr "Gosodiadau I Ffwrdd"
-
-#: kopete/config/behavior/behaviorconfig.cpp:76
-msgid "Cha&t"
-msgstr "S&gwrsio"
-
-#: kopete/config/plugins/kopetepluginconfig.cpp:55
-msgid "General Plugins"
-msgstr ""
-
-#: kopete/config/avdevice/avdeviceconfig.cpp:148
-msgid "Reset sliders & options to default values"
+#. i18n: file: protocols/skype/skypechatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/latex/latexchatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/nowlistening/nowlisteningchatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/translator/translatorchatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/otr/otrchatui.rc:4
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/history/historychatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: protocols/skype/skypechatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/latex/latexchatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/nowlistening/nowlisteningchatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/translator/translatorchatui.rc:5
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/otr/otrchatui.rc:4
+#. i18n: ectx: Menu (tools)
+#. i18n: file: plugins/history/historychatui.rc:5
+#. i18n: ectx: Menu (tools)
+#: rc.cpp:5 rc.cpp:4370 rc.cpp:4434 rc.cpp:4850 rc.cpp:4898 rc.cpp:5027
+#: rc.cpp:5 rc.cpp:4370 rc.cpp:4434 rc.cpp:4850 rc.cpp:4898 rc.cpp:5027
+msgid "&Tools"
 msgstr ""
 
-#: kopete/config/appearance/contactlisttoken.cpp:43
-msgid "Optimal width"
+#. i18n: file: protocols/skype/skypeui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:44
+#. i18n: ectx: property (text), widget (QPushButton, m_btnEdit)
+#. i18n: file: plugins/statistics/statisticsui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/contactnotes/contactnotesui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:137
+#. i18n: ectx: property (text), widget (QPushButton, m_edit)
+#. i18n: file: plugins/translator/translatorui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/otr/otrui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/history/historyui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: kopete/kopeteui.rc:17
+#. i18n: ectx: Menu (edit)
+#. i18n: file: protocols/skype/skypeui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:44
+#. i18n: ectx: property (text), widget (QPushButton, m_btnEdit)
+#. i18n: file: plugins/statistics/statisticsui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/contactnotes/contactnotesui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:137
+#. i18n: ectx: property (text), widget (QPushButton, m_edit)
+#. i18n: file: plugins/translator/translatorui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/otr/otrui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: plugins/history/historyui.rc:5
+#. i18n: ectx: Menu (edit)
+#. i18n: file: kopete/kopeteui.rc:17
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:8 rc.cpp:615 rc.cpp:4202 rc.cpp:4208 rc.cpp:4413 rc.cpp:4886
+#: rc.cpp:4889 rc.cpp:5024 rc.cpp:5457 rc.cpp:8 rc.cpp:615 rc.cpp:4202
+#: rc.cpp:4208 rc.cpp:4413 rc.cpp:4886 rc.cpp:4889 rc.cpp:5024 rc.cpp:5457
+msgid "&Edit"
 msgstr ""
 
-#: kopete/config/appearance/contactlisttoken.cpp:51
-msgid "Small"
+#. i18n: file: protocols/skype/skypeui.rc:12
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/kopeteui.rc:47
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:46
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:24
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:29
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: protocols/skype/skypeui.rc:12
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/kopeteui.rc:47
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:46
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:24
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:29
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:11 rc.cpp:5463 rc.cpp:5487 rc.cpp:5505 rc.cpp:5520 rc.cpp:11
+#: rc.cpp:5463 rc.cpp:5487 rc.cpp:5505 rc.cpp:5520
+msgid "Main Toolbar"
 msgstr ""
 
-#: kopete/config/appearance/contactlistlayouteditwidget.cpp:44
-msgid "Show Icon"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:6
+#. i18n: ectx: property (windowTitle), widget (QWidget, SkypeDetailsBase)
+#: rc.cpp:14 rc.cpp:14
+msgid "User's Details"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:65
-msgid "Bold"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:12
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:17 rc.cpp:17
+msgid "Skype ID:"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:70
-msgid "Italic"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:40
+#. i18n: ectx: property (text), item, widget (QComboBox, authorCombo)
+#: rc.cpp:20 rc.cpp:20
+msgid "Authorized"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:75
-#: kopete/chatwindow/kopetechatwindow.cpp:1136
-msgid "Left"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:45
+#. i18n: ectx: property (text), item, widget (QComboBox, authorCombo)
+#: rc.cpp:23 rc.cpp:23
+msgid "Not Authorized"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:76
-msgid "Center"
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:58
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: kopete/identity/identitydetailed.ui:45
+#. i18n: ectx: property (text), widget (QLabel, mobileLabel)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:88
+#. i18n: ectx: property (text), widget (QLabel, mLblMobilePhone)
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:58
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: kopete/identity/identitydetailed.ui:45
+#. i18n: ectx: property (text), widget (QLabel, mobileLabel)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:88
+#. i18n: ectx: property (text), widget (QLabel, mLblMobilePhone)
+#: rc.cpp:29 rc.cpp:6359 rc.cpp:6383 rc.cpp:29 rc.cpp:6359 rc.cpp:6383
+msgid "Mobile phone:"
+msgstr "Ffôn Symudol :"
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:77
-#: kopete/chatwindow/kopetechatwindow.cpp:1139
-msgid "Right"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:71
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:78
+#. i18n: ectx: property (text), widget (QLabel, mLblWorkPhone)
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:71
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:78
+#. i18n: ectx: property (text), widget (QLabel, mLblWorkPhone)
+#: rc.cpp:32 rc.cpp:6380 rc.cpp:32 rc.cpp:6380
+msgid "Work phone:"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:99
-msgid "Alignment"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:91
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: kopete/identity/identitydetailed.ui:32
+#. i18n: ectx: property (text), widget (QLabel, phoneLabel)
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:91
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: kopete/identity/identitydetailed.ui:32
+#. i18n: ectx: property (text), widget (QLabel, phoneLabel)
+#: rc.cpp:35 rc.cpp:6356 rc.cpp:35 rc.cpp:6356
+msgid "Private phone:"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:103
-msgid "Width"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:104
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:38 rc.cpp:38
+msgid "Is authorized:"
 msgstr ""
 
-#: kopete/config/appearance/layout/TokenWithLayout.cpp:170
-#: kopete/config/appearance/appearanceconfig.cpp:129
-#: kopete/config/appearance/contactlistlayoutwidget.cpp:152
-msgid "Layout"
-msgstr "Cynllun"
-
-#: kopete/config/appearance/appearanceconfig.cpp:109
-msgid "Contact List"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:131
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:41 rc.cpp:41
+msgid "Display Name:"
 msgstr ""
 
-#: kopete/config/appearance/appearanceconfig.cpp:124
-msgid "Advanced"
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:158
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:45
+#. i18n: ectx: property (text), widget (QLabel, lblName)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:164
+#. i18n: ectx: property (text), widget (QLabel, lblName)
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:158
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:45
+#. i18n: ectx: property (text), widget (QLabel, lblName)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:164
+#. i18n: ectx: property (text), widget (QLabel, lblName)
+#: rc.cpp:44 rc.cpp:1315 rc.cpp:2870 rc.cpp:44 rc.cpp:1315 rc.cpp:2870
+msgid "Full name:"
+msgstr "Enw llawn:"
 
-#: kopete/config/appearance/contactlistlayoutwidget.cpp:152
-msgid "Unsaved data?"
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:171
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:76
+#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:150
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:621
+#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:177
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:171
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:76
+#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:150
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:621
+#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:177
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#: rc.cpp:47 rc.cpp:1321 rc.cpp:2271 rc.cpp:2963 rc.cpp:3887 rc.cpp:47
+#: rc.cpp:1321 rc.cpp:2271 rc.cpp:2963 rc.cpp:3887
+msgid "Homepage:"
+msgstr "Tudalen Gartref:"
 
-#: kopete/config/appearance/contactlistlayoutwidget.cpp:163
-msgid "Reserved Layout Name"
+#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:184
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:50 rc.cpp:50
+msgid "Sex:"
 msgstr ""
 
-#: kopete/config/appearance/contactlistlayoutwidget.cpp:164
-#, kde-format
-msgid ""
-"The layout '%1' is one of the default layouts and cannot be overwritten. "
-"Please select a different name."
-msgstr ""
-
-#: kopete/config/appearance/tooltipeditdialog.cpp:36
-msgid "Tooltip Editor"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:21
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:39
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:41
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:42
+#. i18n: ectx: attribute (title), widget (QWidget, tab_connection)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:44
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:21
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:39
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:41
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:42
+#. i18n: ectx: attribute (title), widget (QWidget, tab_connection)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:44
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:53 rc.cpp:1005 rc.cpp:2520 rc.cpp:2739 rc.cpp:3656 rc.cpp:53
+#: rc.cpp:1005 rc.cpp:2520 rc.cpp:2739 rc.cpp:3656
+msgid "&Basic Setup"
 msgstr ""
 
-#: kopete/config/status/statusconfig_manager.cpp:70
-msgid "Do Not Change"
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:27
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:59
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox55)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:71
+#. i18n: ectx: property (title), widget (QGroupBox)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:45
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:56
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:46
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:33
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:163
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, m_accountInfo)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:61
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:41
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox53)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:65
+#. i18n: ectx: property (title), widget (QGroupBox, mAccountInfo)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:52
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox59)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:27
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:59
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox55)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:71
+#. i18n: ectx: property (title), widget (QGroupBox)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:45
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:56
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:46
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:33
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:163
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, m_accountInfo)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:61
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:41
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox53)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:65
+#. i18n: ectx: property (title), widget (QGroupBox, mAccountInfo)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:52
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox59)
+#: rc.cpp:56 rc.cpp:525 rc.cpp:777 rc.cpp:1008 rc.cpp:1559 rc.cpp:1610
+#: rc.cpp:1830 rc.cpp:2532 rc.cpp:2742 rc.cpp:3125 rc.cpp:3497 rc.cpp:3659
+#: rc.cpp:3938 rc.cpp:56 rc.cpp:525 rc.cpp:777 rc.cpp:1008 rc.cpp:1559
+#: rc.cpp:1610 rc.cpp:1830 rc.cpp:2532 rc.cpp:2742 rc.cpp:3125 rc.cpp:3497
+#: rc.cpp:3659 rc.cpp:3938
+msgid "Account Information"
+msgstr "Gwybodaeth Cyfrif"
 
-#: kopete/config/status/statusconfig_manager.cpp:107
-msgid "New Status"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:35
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, excludeCheck)
+#: rc.cpp:59 rc.cpp:59
+msgid "Check this if you do not want to connect with other protocols"
 msgstr ""
 
-#: kopete/config/status/statusconfig_manager.cpp:122
-#: kopete/contactlist/kopetecontactlistview.cpp:343
-msgid "New Group"
-msgstr "Grwp Newydd"
-
-#: kopete/config/status/statusconfig.cpp:43
-msgid "&Manager"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:38
+#. i18n: ectx: property (text), widget (QCheckBox, excludeCheck)
+#: rc.cpp:62 rc.cpp:62
+msgid "E&xclude from connection"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:262
-msgid "Modify Account"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:66
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:65 rc.cpp:65
+msgid "Important Note"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:314
-#, kde-format
-msgid "Are you sure you want to remove the account \"%1\"?"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:72
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:68 rc.cpp:68
+msgid ""
+"The Skype plugin serves as a bridge to an externally running copy of Skype. "
+"This has some consequences on how it functions: you need an instance of "
+"Skype to be running, and only one Skype account can be used.<br /><br />Note "
+"that you need to install the original dynamic linked Skype version 2.0 or "
+"2.1 from <a href=\"http://www.skype.com\">http://www.skype.com</a><br /><br "
+"/>This plugin will only work if the language in the Skype client set to "
+"English. Kopete shows notifications (incoming call, message, ...), so you "
+"can turn off the notifications in Skype."
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:315
-msgid "Remove Account"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:88
+#. i18n: ectx: property (text), widget (QPushButton, configureSkypeClient)
+#: rc.cpp:71 rc.cpp:71
+msgid ""
+"Disable Skype notifications and set up English language in Skype client"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:331
-#, kde-format
-msgid "Are you sure you want to remove the identity \"%1\"?"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:112
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:74 rc.cpp:74
+msgid "Lau&nch"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:332
-msgid "Remove Identity"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:118
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, LaunchGroup)
+#: rc.cpp:77 rc.cpp:77
+msgid "You can set whether and when should kopete launch Skype."
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:343
-#, kde-format
-msgid ""
-"Before removing the identity %1, the following accounts must be assigned to "
-"another identity:"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:121
+#. i18n: ectx: property (title), widget (QGroupBox, LaunchGroup)
+#: rc.cpp:80 rc.cpp:80
+msgid "Launch Skype"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:376
-msgid "Select an identity for the account:"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:127
+#. i18n: ectx: property (text), widget (QRadioButton, LaunchNeededRadio)
+#: rc.cpp:83 rc.cpp:83
+msgid "When &not running"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:413
-msgid "New Identity"
-msgstr "Dynodiad Newydd"
-
-#: kopete/config/accounts/kopeteaccountconfig.cpp:435
-#, kde-format
-msgctxt "String used for creating first copy of a named item"
-msgid "Copy of %1"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:137
+#. i18n: ectx: property (text), widget (QRadioButton, LaunchNeverRadio)
+#: rc.cpp:86 rc.cpp:86
+msgid "N&ever"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:443
-#, kde-format
-msgctxt ""
-"String used for creating second and subsequent copies of a named item"
-msgid "Copy %1 of %2"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:149
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:89 rc.cpp:89
+msgid "Command to launch Skype:"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:543
-msgid "&Add Account..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:159
+#. i18n: ectx: property (text), widget (QLineEdit, CommandEdit)
+#: rc.cpp:92 rc.cpp:92
+msgid "skype"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:136
-#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountModify)
-#: kopete/config/accounts/kopeteaccountconfig.cpp:551 rc.cpp:6074 rc.cpp:6074
-msgid "&Modify Account..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:170
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#: rc.cpp:95 rc.cpp:95
+msgid "Launch timeout:"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:123
-#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountRemove)
-#: kopete/config/accounts/kopeteaccountconfig.cpp:559 rc.cpp:6065 rc.cpp:6065
-msgid "&Remove Account"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:193
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:252
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:579
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:193
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:252
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:579
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:98 rc.cpp:110 rc.cpp:191 rc.cpp:98 rc.cpp:110 rc.cpp:191
+msgid "s"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:568
-msgid "&Switch Identity..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:223
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_4)
+#: rc.cpp:101 rc.cpp:101
+msgid "Wait before trying to connect to Skype:"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:162
-#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountSetColor)
-#: kopete/config/accounts/kopeteaccountconfig.cpp:574 rc.cpp:6092 rc.cpp:6092
-msgid "Set C&olor..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:233
+#. i18n: ectx: property (toolTip), widget (QSpinBox, WaitSpin)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:236
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, WaitSpin)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:233
+#. i18n: ectx: property (toolTip), widget (QSpinBox, WaitSpin)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:236
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, WaitSpin)
+#: rc.cpp:104 rc.cpp:107 rc.cpp:104 rc.cpp:107
+msgid "trying"
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:580
-msgid "Add &Identity..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:280
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:113 rc.cpp:113
+msgid ""
+"If you get error that Skype was not found, but in fact it is running, check "
+"the instructions at <a "
+"href=\"https://developer.skype.com/Docs/ApiDoc/Skype_API_on_Linux\">https://d"
+"eveloper.skype.com/Docs/ApiDoc/Skype_API_on_Linux</a>.<br /><br />Note that "
+"only the dynamic linked Skype binary is supported."
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:204
-#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityCopy)
-#: kopete/config/accounts/kopeteaccountconfig.cpp:588 rc.cpp:6107 rc.cpp:6107
-msgid "&Copy Identity..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:310
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:270
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:310
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:270
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:116 rc.cpp:3983 rc.cpp:116 rc.cpp:3983
+msgid "C&onnection"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:230
-#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityModify)
-#: kopete/config/accounts/kopeteaccountconfig.cpp:596 rc.cpp:6125 rc.cpp:6125
-msgid "M&odify Identity..."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:316
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, groupBox3_2)
+#: rc.cpp:119 rc.cpp:119
+msgid ""
+"Each application that wants to use Skype must provide its name to it, and "
+"the user is asked whether to allow said application to access Skype.<br>By "
+"default, kopete provides kopete as its name, but if you suspect another "
+"application is accessing Skype with this name, you can change the name "
+"Kopete uses here, and then within Skype disallow applications that refer to "
+"themselves as kopete."
 msgstr ""
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:604
-msgid "R&emove Identity"
-msgstr ""
-
-#: kopete/config/accounts/kopeteaccountconfig.cpp:612
-msgid "Set &Default"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:325
+#. i18n: ectx: property (text), widget (QCheckBox, AuthorCheck)
+#: rc.cpp:125 rc.cpp:125
+msgid "&Non-standard authorization"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:316
-msgid "Save Conversation"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:342
+#. i18n: ectx: property (toolTip), widget (QGroupBox, BusGroup)
+#: rc.cpp:128 rc.cpp:128
+msgid "What bus do you want to use"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:358
-#, kde-format
-msgid "<qt>Could not open <b>%1</b> for writing.</qt>"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:345
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, BusGroup)
+#: rc.cpp:131 rc.cpp:131
+msgid ""
+"Which D-Bus do you want to use to connect to Skype?<br>Session: Your own, "
+"other people cannot use it (use --use-session-dbus to start Skype on that "
+"bus.)<br>System: Shared by all people on the same computer. This one is used "
+"by default by Skype.<br>You have to specify the same D-Bus used by Skype."
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:359
-msgid "Error While Saving"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:348
+#. i18n: ectx: property (title), widget (QGroupBox, BusGroup)
+#: rc.cpp:134 rc.cpp:134
+msgid "Bus"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:795
-msgid "User Has Left"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:354
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton4)
+#: rc.cpp:137 rc.cpp:137
+msgid "Sessi&on"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:1377
-msgid "Chat style could not be found, or is invalid."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:364
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton5)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:221
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:364
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton5)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:221
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:140 rc.cpp:1652 rc.cpp:140 rc.cpp:1652
+msgid "S&ystem"
+msgstr "C&ysawd:"
+
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:374
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:143 rc.cpp:143
+msgid ""
+"Note that Kopete will freeze while Skype asks you if it can allow Kopete to "
+"access it. This is normal, and if you allow it forever (check that "
+"\"Remember\" checkbox in Skype's dialog), it will not happen again.<br /><br "
+"/>The 'System Bus' option is not yet supported by Skype"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:1434
-msgid "Save File as"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:404
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:146 rc.cpp:146
+msgid "&Activity"
 msgstr ""
 
-#: kopete/chatwindow/chatmessagepart.cpp:1434
-msgid "Wav file (*.wav)"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:410
+#. i18n: ectx: property (toolTip), widget (QCheckBox, HitchCheck)
+#: rc.cpp:149 rc.cpp:149
+msgid "Show all incoming messages"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemoticonaction.cpp:65
-msgid "Add Smiley"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:413
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, HitchCheck)
+#: rc.cpp:152 rc.cpp:152
+msgid ""
+"This will show all incoming Skype messages. If this is off, they are showed "
+"only if the message belongs to chat that is started by kopete."
 msgstr ""
 
-#: kopete/chatwindow/chattexteditpart.cpp:511
-msgid "Chat Text Edit Part"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:416
+#. i18n: ectx: property (text), widget (QCheckBox, HitchCheck)
+#: rc.cpp:155 rc.cpp:155
+msgid "Show all incoming &messages"
 msgstr ""
 
-#: kopete/chatwindow/chattexteditpart.cpp:512
-msgid "A simple rich text editor part"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:426
+#. i18n: ectx: property (toolTip), widget (QCheckBox, MarkCheck)
+#: rc.cpp:158 rc.cpp:158
+msgid ""
+"This will mark incoming messages as read, so if you have Skype set up not to "
+"automatically pop-up chats, it will not flash the exclamation icon."
 msgstr ""
 
-#: kopete/chatwindow/chattexteditpart.cpp:514
-msgid "Richard J. Moore"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:429
+#. i18n: ectx: property (text), widget (QCheckBox, MarkCheck)
+#: rc.cpp:161 rc.cpp:161
+msgid "Mar&k as read"
 msgstr ""
 
-#: kopete/chatwindow/chattexteditpart.cpp:515 kopete/main.cpp:44
-msgid "Jason Keirstead"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:439
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ScanCheck)
+#: rc.cpp:164 rc.cpp:164
+msgid ""
+"If this is checked, Kopete will ask Skype on login if it has any messages "
+"that have not been shown, and if so, will show them. This is useful if you "
+"start Kopete later than Skype, and Skype is configured not to show incoming "
+"messages."
 msgstr ""
 
-#: kopete/chatwindow/chattexteditpart.cpp:516 kopete/main.cpp:47
-msgid "Michaël Larouche"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:442
+#. i18n: ectx: property (text), widget (QCheckBox, ScanCheck)
+#: rc.cpp:167 rc.cpp:167
+msgid "Scan f&or unread"
 msgstr ""
 
-#: kopete/chatwindow/chattexteditpart.cpp:517
-msgid "Benson Tsai"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:452
+#. i18n: ectx: property (toolTip), widget (QCheckBox, CallCheck)
+#: rc.cpp:170 rc.cpp:170
+msgid "Show call control window for all calls"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:250
-#, kde-format
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:455
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, CallCheck)
+#: rc.cpp:173 rc.cpp:173
 msgid ""
-"<qt>You have received a message from <b>%1</b> in the last second. Are you "
-"sure you want to clear this chat?</qt>"
+"This will show a call control window for every call (both incoming and "
+"outgoing). If it is off, you can call from Kopete, but you have to control "
+"that call from Skype."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:251 kopete/chatwindow/chatview.cpp:359
-#: kopete/chatwindow/kopeteemailwindow.cpp:466
-msgid "Unread Message"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:458
+#. i18n: ectx: property (text), widget (QCheckBox, CallCheck)
+#: rc.cpp:176 rc.cpp:176
+msgid "S&how call control (this will also hide Skype client call dialog)"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:252
-msgctxt "@action:button"
-msgid "Clear Chat"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:486
+#. i18n: ectx: property (toolTip), widget (QCheckBox, AutoCloseCallCheck)
+#: rc.cpp:179 rc.cpp:179
+msgid "Auto close the call control window"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:351
-#: kopete/chatwindow/kopeteemailwindow.cpp:458
-#, kde-format
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:489
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, AutoCloseCallCheck)
+#: rc.cpp:182 rc.cpp:182
 msgid ""
-"<qt>You are about to leave the groupchat session <b>%1</b>.<br />You will "
-"not receive future messages from this conversation.</qt>"
+"This will close the call control window automatically when the call finishes"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:352
-#: kopete/chatwindow/kopeteemailwindow.cpp:459
-msgid "Closing Group Chat"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:492
+#. i18n: ectx: property (text), widget (QCheckBox, AutoCloseCallCheck)
+#: rc.cpp:185 rc.cpp:185
+msgid "Autoc&lose"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:353 kopete/chatwindow/chatview.cpp:360
-#: kopete/chatwindow/chatview.cpp:367
-msgctxt "@action:button"
-msgid "Close Chat"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:544
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:188 rc.cpp:188
+msgid "Timeout:"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:358
-#: kopete/chatwindow/kopeteemailwindow.cpp:465
-#, kde-format
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:607
+#. i18n: ectx: property (toolTip), widget (QCheckBox, PingsCheck)
+#: rc.cpp:194 rc.cpp:194
 msgid ""
-"<qt>You have received a message from <b>%1</b> in the last second. Are you "
-"sure you want to close this chat?</qt>"
+"If this is enabled, Kopete keeps track of whether or not Skype is running."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:365
-#: kopete/chatwindow/kopeteemailwindow.cpp:472
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:610
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, PingsCheck)
+#: rc.cpp:197 rc.cpp:197
 msgid ""
-"You have a message send in progress, which will be aborted if this chat is "
-"closed. Are you sure you want to close this chat?"
+"This keeps track of whether Skype is running. Turning this off only makes "
+"sense it you are trying to get non-flooded debug output."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:366
-#: kopete/chatwindow/kopeteemailwindow.cpp:473
-msgid "Message in Transit"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:613
+#. i18n: ectx: property (text), widget (QCheckBox, PingsCheck)
+#: rc.cpp:200 rc.cpp:200
+msgid "Pi&ng Skype"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:407
-#, kde-format
-msgid "One other person in the chat"
-msgid_plural "%1 other people in the chat"
-msgstr[0] ""
-msgstr[1] ""
-
-#: kopete/chatwindow/chatview.cpp:459
-#, kde-format
-msgid "%1 is typing a message"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:623
+#. i18n: ectx: property (toolTip), widget (QCheckBox, LeaveCheck)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:629
+#. i18n: ectx: property (text), widget (QCheckBox, LeaveCheck)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:623
+#. i18n: ectx: property (toolTip), widget (QCheckBox, LeaveCheck)
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:629
+#. i18n: ectx: property (text), widget (QCheckBox, LeaveCheck)
+#: rc.cpp:203 rc.cpp:209 rc.cpp:203 rc.cpp:209
+msgid "Do not leave a chat on window exit"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:463
-#, kde-format
-msgctxt "%1 is a list of names"
-msgid "%1 are typing a message"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:626
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, LeaveCheck)
+#: rc.cpp:206 rc.cpp:206
+msgid ""
+"Do not leave a chat when the chat window is closed. Makes a difference only "
+"with multi-user chats: if it is checked, you will continue receiving "
+"messages from that chat even after closing the window."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:520 kopete/chatwindow/chatview.cpp:529
-#, kde-format
-msgid "%1 is now known as %2"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:656
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:212 rc.cpp:212
+msgid "&Calls"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:548
-#, kde-format
-msgid "%1 has joined the chat."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:662
+#. i18n: ectx: property (text), widget (QCheckBox, StartCallCommandCheck)
+#: rc.cpp:215 rc.cpp:215
+msgid "E&xecute before call"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:595
-#, kde-format
-msgid "%1 has left the chat."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:717
+#. i18n: ectx: property (toolTip), widget (QCheckBox, WaitForStartCallCommandCheck)
+#: rc.cpp:218 rc.cpp:218
+msgid ""
+"This will wait before making/accepting the call for the command to finish."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:597
-#, kde-format
-msgid "%1 has left the chat (%2)."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:721
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, WaitForStartCallCommandCheck)
+#: rc.cpp:221 rc.cpp:221
+msgid ""
+"This will wait for the command to finish before accepting/making the "
+"call.<br>\n"
+"Note that kopete will freeze whilst waiting."
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:704
-#, kde-format
-msgid "You are now marked as %1."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:724
+#. i18n: ectx: property (text), widget (QCheckBox, WaitForStartCallCommandCheck)
+#: rc.cpp:225 rc.cpp:225
+msgid "Wait for fi&nish"
 msgstr ""
 
-#: kopete/chatwindow/chatview.cpp:709
-#, kde-format
-msgid "%2 is now %1."
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:733
+#. i18n: ectx: property (text), widget (QCheckBox, EndCallCommandCheck)
+#: rc.cpp:228 rc.cpp:228
+msgid "Execute after call"
 msgstr ""
 
-#: kopete/chatwindow/kopeterichtextwidget.cpp:142
-#: kopete/chatwindow/kopetechatwindow.cpp:464
-msgid "Automatic Spell Checking"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:791
+#. i18n: ectx: property (toolTip), widget (QCheckBox, OnlyLastCallCommandCheck)
+#: rc.cpp:231 rc.cpp:231
+msgid ""
+"Usually this makes no difference, but if there are some other calls on hold, "
+"it is executed only for the most recently ended one."
 msgstr ""
 
-#: kopete/chatwindow/kopeterichtextwidget.cpp:151
-msgid "Enable &Rich Text"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:794
+#. i18n: ectx: property (text), widget (QCheckBox, OnlyLastCallCommandCheck)
+#: rc.cpp:234 rc.cpp:234
+msgid "Onl&y for last call"
 msgstr ""
 
-#: kopete/chatwindow/kopeterichtextwidget.cpp:164
-msgid "Reset Font And Color"
+#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:803
+#. i18n: ectx: property (text), widget (QCheckBox, IncomingCommandCheck)
+#: rc.cpp:237 rc.cpp:237
+msgid "Execute on inco&ming call"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:167
-msgid "<< Prev"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:6
+#. i18n: ectx: property (windowTitle), widget (QWidget, SkypeCallDialogBase)
+#: rc.cpp:240 rc.cpp:240
+msgid "Skype Call"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:172
-msgid "(0) Next >>"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:14
+#. i18n: ectx: property (toolTip), widget (QLabel, NameLabel)
+#: rc.cpp:243 rc.cpp:243
+msgid "Name(s) of Participant(s)"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:219
-#: kopete/chatwindow/kopetechatwindow.cpp:366
-msgid "&Send Message"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:17
+#. i18n: ectx: property (whatsThis), widget (QLabel, NameLabel)
+#: rc.cpp:246 rc.cpp:246
+msgid ""
+"Name of the other participant in the call (or a list of names if it is a "
+"conference call.)"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:232
-msgid "&Set Font..."
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:33
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#: rc.cpp:249 kopete/chatwindow/kopetechatwindow.cpp:207
+#: kopete/chatwindow/kopetechatwindow.cpp:471 rc.cpp:249
+msgid "Participants"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:236
-msgid "Set Text &Color..."
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:36
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:85
+#. i18n: ectx: property (text), widget (QTreeWidget, trServices)
+#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:69
+#. i18n: ectx: property (text), widget (QTableWidget, listServers)
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:100
+#. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:47
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:93
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:36
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:85
+#. i18n: ectx: property (text), widget (QTreeWidget, trServices)
+#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:69
+#. i18n: ectx: property (text), widget (QTableWidget, listServers)
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:100
+#. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:47
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:93
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
+#: rc.cpp:252 rc.cpp:972 rc.cpp:1417 rc.cpp:5229 rc.cpp:5892 rc.cpp:5901
+#: kopete/addaccountwizard/addaccountwizard.cpp:74 rc.cpp:252 rc.cpp:972
+#: rc.cpp:1417 rc.cpp:5229 rc.cpp:5892 rc.cpp:5901
+msgid "Name"
+msgstr "Enw"
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:240
-msgid "Set &Background Color..."
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:39
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:77
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:34
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:121
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:39
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:77
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:34
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:121
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:255 rc.cpp:1562 rc.cpp:2253 rc.cpp:3881 rc.cpp:255 rc.cpp:1562
+#: rc.cpp:2253 rc.cpp:3881
+msgid "Name:"
+msgstr "Enw:"
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:269
-msgid "Spacer for Animation"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:52
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:55
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:90
+#. i18n: ectx: property (toolTip), widget (QLabel, TimeLabel)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:52
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:55
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:90
+#. i18n: ectx: property (toolTip), widget (QLabel, TimeLabel)
+#: rc.cpp:258 rc.cpp:261 rc.cpp:273 rc.cpp:258 rc.cpp:261 rc.cpp:273
+msgid "Total time elapsed."
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:272
-#: kopete/chatwindow/kopetechatwindow.cpp:503
-msgid "Toolbar Animation"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:58
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:264 rc.cpp:264
+msgid "Time:"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:380
-#, kde-format
-msgid "(%1) Next >>"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:71
+#. i18n: ectx: property (toolTip), widget (QLabel, CreditLabel)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:74
+#. i18n: ectx: property (whatsThis), widget (QLabel, CreditLabel)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:135
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:138
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:71
+#. i18n: ectx: property (toolTip), widget (QLabel, CreditLabel)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:74
+#. i18n: ectx: property (whatsThis), widget (QLabel, CreditLabel)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:135
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:138
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#: rc.cpp:267 rc.cpp:270 rc.cpp:282 rc.cpp:285 rc.cpp:267 rc.cpp:270
+#: rc.cpp:282 rc.cpp:285
+msgid "SkypeOut credits left"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:460
-#: kopete/chatwindow/kopeteemailwindow.cpp:467
-#: kopete/chatwindow/kopeteemailwindow.cpp:474
-msgid "Cl&ose Chat"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:93
+#. i18n: ectx: property (whatsThis), widget (QLabel, TimeLabel)
+#: rc.cpp:276 rc.cpp:276
+msgid ""
+"Total length of the call/<br />(i.e. both time speaking and time on hold.)"
 msgstr ""
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:506
-msgid "Reply"
-msgstr "Ymateb"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:122
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:78
+#. i18n: ectx: property (text), widget (QLabel, textLabel14)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:122
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:78
+#. i18n: ectx: property (text), widget (QLabel, textLabel14)
+#: rc.cpp:279 rc.cpp:378 rc.cpp:279 rc.cpp:378
+msgid "Status:"
+msgstr "Cyflwr:"
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:33
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#: kopete/chatwindow/kopetechatwindow.cpp:207
-#: kopete/chatwindow/kopetechatwindow.cpp:471 rc.cpp:4267 rc.cpp:4267
-msgid "Participants"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:141
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:288 rc.cpp:288
+msgid "SkypeOut credits:"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:247
-msgctxt "@action:button"
-msgid "Send"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:174
+#. i18n: ectx: property (toolTip), widget (QPushButton, AcceptButton)
+#: rc.cpp:291 rc.cpp:291
+msgid "Accept call"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:258
-msgctxt "@info:status"
-msgid "Ready."
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:177
+#. i18n: ectx: property (whatsThis), widget (QPushButton, AcceptButton)
+#: rc.cpp:294 rc.cpp:294
+msgid "Accept incoming call"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:380
-msgid "Send File..."
-msgstr ""
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:180
+#. i18n: ectx: property (text), widget (QPushButton, AcceptButton)
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:42
+#. i18n: ectx: property (text), widget (QPushButton, acceptButton)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:180
+#. i18n: ectx: property (text), widget (QPushButton, AcceptButton)
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:42
+#. i18n: ectx: property (text), widget (QPushButton, acceptButton)
+#: rc.cpp:297 rc.cpp:939 rc.cpp:297 rc.cpp:939
+msgid "Accept"
+msgstr "Derbyn"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:388
-msgid "Close All Chats"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:190
+#. i18n: ectx: property (toolTip), widget (QPushButton, HangButton)
+#: rc.cpp:300 rc.cpp:300
+msgid "Finish the call"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:393
-msgid "&Activate Next Active Tab"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:193
+#. i18n: ectx: property (whatsThis), widget (QPushButton, HangButton)
+#: rc.cpp:303 rc.cpp:303
+msgid "Terminate the call"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:399
-msgid "&Activate Next Tab"
-msgstr "&Gweithredu'r Tab Nesaf"
-
-#: kopete/chatwindow/kopetechatwindow.cpp:405
-msgid "&Activate Previous Tab"
-msgstr "&Gweithredu'r Tab Cynt"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:196
+#. i18n: ectx: property (text), widget (QPushButton, HangButton)
+#: rc.cpp:306 rc.cpp:306
+msgid "H&ang up"
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:413
-msgid "Nic&k Completion"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:203
+#. i18n: ectx: property (toolTip), widget (QPushButton, HoldButton)
+#: rc.cpp:309 rc.cpp:309
+msgid "Hold the call"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:417
-msgid "&Detach Chat"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:206
+#. i18n: ectx: property (whatsThis), widget (QPushButton, HoldButton)
+#: rc.cpp:312 rc.cpp:312
+msgid "Interrupt the call for a moment and resume (or hang up) later."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:422
-msgid "Close &All But This Tab"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:209
+#. i18n: ectx: property (text), widget (QPushButton, HoldButton)
+#: rc.cpp:315 rc.cpp:315
+msgid "H&old"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:427
-msgid "&Move Tab to Window"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:216
+#. i18n: ectx: property (toolTip), widget (QPushButton, ChatButton)
+#: rc.cpp:318 rc.cpp:318
+msgid "Open chat to the person."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:434
-msgid "&Tab Placement"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:219
+#. i18n: ectx: property (whatsThis), widget (QPushButton, ChatButton)
+#: rc.cpp:321 rc.cpp:321
+msgid "Open chat to the person with whom you are talking."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:447
-msgid "Previous History"
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:222
+#. i18n: ectx: property (text), widget (QPushButton, ChatButton)
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_Chat)
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:222
+#. i18n: ectx: property (text), widget (QPushButton, ChatButton)
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_Chat)
+#: rc.cpp:324 rc.cpp:5937 rc.cpp:324 rc.cpp:5937
+msgid "Chat"
+msgstr "Sgwrsio"
+
+#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:232
+#. i18n: ectx: property (text), widget (QPushButton, VideoButton)
+#: rc.cpp:327 rc.cpp:327
+msgid "Start/Stop Video"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:452
-msgid "Next History"
+#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:6
+#. i18n: ectx: property (windowTitle), widget (QWidget, SkypeAddContactBase)
+#: rc.cpp:330 rc.cpp:330
+msgid "Add Skype Contact"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:470
-msgid "Show Participants"
+#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:14
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:333 rc.cpp:333
+msgid "Skype name:"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:480
-msgid "Co&ntacts"
-msgstr "Cy&sylltau"
+#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:35
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:339 rc.cpp:339
+msgid "Sorry, but the search function is not yet implemented."
+msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:666
-msgctxt "@info:tooltip"
-msgid "Close the current tab"
+#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, SearchButton)
+#: rc.cpp:342 rc.cpp:342
+msgid "Se&arch"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindow.cpp:1114
-msgid "More..."
-msgstr "Mwy..."
+#. i18n: file: protocols/groupwise/gwaddui.ui:38
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:82
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/groupwise/gwaddui.ui:38
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:82
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:345 rc.cpp:780 rc.cpp:345 rc.cpp:780
+msgid "&Account name:"
+msgstr "Enw &Cyfrif:"
 
-#: kopete/chatwindow/kopetechatwindowstyle.cpp:384
-msgid "Download"
+#. i18n: file: protocols/groupwise/gwaddui.ui:44
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/groupwise/gwaddui.ui:47
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/groupwise/gwaddui.ui:55
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#. i18n: file: protocols/groupwise/gwaddui.ui:58
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:17
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:20
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:36
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_uniqueName)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:39
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_uniqueName)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:30
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:33
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:46
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_uniqueName)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_uniqueName)
+#. i18n: file: protocols/groupwise/gwaddui.ui:44
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/groupwise/gwaddui.ui:47
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/groupwise/gwaddui.ui:55
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#. i18n: file: protocols/groupwise/gwaddui.ui:58
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:17
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:20
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:36
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_uniqueName)
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:39
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_uniqueName)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:30
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:33
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:46
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_uniqueName)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_uniqueName)
+#: rc.cpp:348 rc.cpp:351 rc.cpp:354 rc.cpp:357 rc.cpp:1775 rc.cpp:1778
+#: rc.cpp:1784 rc.cpp:1787 rc.cpp:3020 rc.cpp:3023 rc.cpp:3029 rc.cpp:3032
+#: rc.cpp:348 rc.cpp:351 rc.cpp:354 rc.cpp:357 rc.cpp:1775 rc.cpp:1778
+#: rc.cpp:1784 rc.cpp:1787 rc.cpp:3020 rc.cpp:3023 rc.cpp:3029 rc.cpp:3032
+msgid "The account name of the account you would like to add."
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindowstyle.cpp:384
-msgid "Cancel"
+#. i18n: file: protocols/groupwise/gwaddui.ui:68
+#. i18n: ectx: property (title), widget (QButtonGroup)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:58
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/groupwise/gwaddui.ui:68
+#. i18n: ectx: property (title), widget (QButtonGroup)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:58
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:360 rc.cpp:3035 rc.cpp:360 rc.cpp:3035
+msgid "Contact Type"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindowstyle.cpp:417
-msgid "Play"
+#. i18n: file: protocols/groupwise/gwaddui.ui:79
+#. i18n: ectx: property (text), widget (QRadioButton)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:76
+#. i18n: ectx: property (text), widget (QRadioButton, m_rbEcho)
+#. i18n: file: protocols/groupwise/gwaddui.ui:79
+#. i18n: ectx: property (text), widget (QRadioButton)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:76
+#. i18n: ectx: property (text), widget (QRadioButton, m_rbEcho)
+#: rc.cpp:363 rc.cpp:3044 rc.cpp:363 rc.cpp:3044
+msgid "&Echo"
 msgstr ""
 
-#: kopete/chatwindow/kopetechatwindowstyle.cpp:417
-msgid "Save as"
+#. i18n: file: protocols/groupwise/gwaddui.ui:85
+#. i18n: ectx: property (toolTip), widget (QRadioButton)
+#. i18n: file: protocols/groupwise/gwaddui.ui:88
+#. i18n: ectx: property (whatsThis), widget (QRadioButton)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:70
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_rbEcho)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:73
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_rbEcho)
+#. i18n: file: protocols/groupwise/gwaddui.ui:85
+#. i18n: ectx: property (toolTip), widget (QRadioButton)
+#. i18n: file: protocols/groupwise/gwaddui.ui:88
+#. i18n: ectx: property (whatsThis), widget (QRadioButton)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:70
+#. i18n: ectx: property (toolTip), widget (QRadioButton, m_rbEcho)
+#. i18n: file: protocols/qq/ui/qqaddui.ui:73
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_rbEcho)
+#: rc.cpp:366 rc.cpp:369 rc.cpp:3038 rc.cpp:3041 rc.cpp:366 rc.cpp:369
+#: rc.cpp:3038 rc.cpp:3041
+msgid ""
+"Hey look!  Only one option.  Could you please make this a dropdown and add "
+"Null?"
 msgstr ""
 
-#: kopete/identity/identitydialog.cpp:39 kopete/identity/identitydialog.cpp:44
-msgid "Identity Information"
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:22
+#. i18n: ectx: property (text), widget (QLabel, userId)
+#: rc.cpp:372 rc.cpp:372
+msgid "USER_ID"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitygeneral.ui:39
-#. i18n: ectx: property (text), widget (QLabel, photo)
-#: kopete/identity/identitydialog.cpp:56
-#: kopete/identity/identitydialog.cpp:152 rc.cpp:6239 rc.cpp:6239
-msgid "No Photo"
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:65
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lastName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:88
+#. i18n: ectx: property (toolTip), widget (QLineEdit, displayName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:134
+#. i18n: ectx: property (toolTip), widget (QLineEdit, firstName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:65
+#. i18n: ectx: property (toolTip), widget (QLineEdit, lastName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:88
+#. i18n: ectx: property (toolTip), widget (QLineEdit, displayName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:134
+#. i18n: ectx: property (toolTip), widget (QLineEdit, firstName)
+#: rc.cpp:375 rc.cpp:381 rc.cpp:393 rc.cpp:375 rc.cpp:381 rc.cpp:393
+msgid "Change the display name used for this contact"
 msgstr ""
 
-#: kopete/identity/identitydialog.cpp:64
-msgid "General Information"
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:101
+#. i18n: ectx: property (text), widget (QLabel, status)
+#: rc.cpp:384 rc.cpp:384
+msgid "USER_STATUS"
 msgstr ""
 
-#: kopete/identity/identitydialog.cpp:69
-msgid "Detailed Information"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:111
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:91
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:480
+#. i18n: ectx: property (text), widget (QLabel, fullNameLabel_2)
+#. i18n: file: kopete/identity/identitygeneral.ui:165
+#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:37
+#. i18n: ectx: property (text), widget (QLabel, mLblFirstName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:111
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:91
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:480
+#. i18n: ectx: property (text), widget (QLabel, fullNameLabel_2)
+#. i18n: file: kopete/identity/identitygeneral.ui:165
+#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:37
+#. i18n: ectx: property (text), widget (QLabel, mLblFirstName)
+#: rc.cpp:387 rc.cpp:1568 rc.cpp:3848 rc.cpp:6341 rc.cpp:6374 rc.cpp:387
+#: rc.cpp:1568 rc.cpp:3848 rc.cpp:6341 rc.cpp:6374
+msgid "First name:"
+msgstr "Enw cyntaf:"
 
-#: kopete/identity/identitystatuswidget.cpp:207
-#: kopete/identity/identitystatuswidget.cpp:243
-msgctxt "Button to open account configuration widget"
-msgid "Click to add an account"
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:121
+#. i18n: ectx: property (text), widget (QLabel, lbldisplayName)
+#: rc.cpp:390 rc.cpp:390
+msgid "&Display name:"
 msgstr ""
 
-#: kopete/main.cpp:28
-msgid "Kopete, the KDE Instant Messenger"
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:147
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:119
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:417
+#. i18n: ectx: property (text), widget (QLabel, LastNameLabel)
+#. i18n: file: kopete/identity/identitygeneral.ui:184
+#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:117
+#. i18n: ectx: property (text), widget (QLabel, mLblLastName)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:147
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:119
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:417
+#. i18n: ectx: property (text), widget (QLabel, LastNameLabel)
+#. i18n: file: kopete/identity/identitygeneral.ui:184
+#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:117
+#. i18n: ectx: property (text), widget (QLabel, mLblLastName)
+#: rc.cpp:396 rc.cpp:1580 rc.cpp:3842 rc.cpp:6344 rc.cpp:6389 rc.cpp:396
+#: rc.cpp:1580 rc.cpp:3842 rc.cpp:6344 rc.cpp:6389
+msgid "Last name:"
+msgstr "Enw olaf:"
+
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:172
+#. i18n: ectx: property (text), widget (QLabel, textLabel15)
+#: rc.cpp:399 rc.cpp:399
+msgid "Additional properties:"
 msgstr ""
 
-#: kopete/main.cpp:34
-msgid ""
-"(c) 2001-2004, Duncan Mac-Vicar Prett\n"
-"(c) 2002-2008, Kopete Development Team"
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:195
+#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:200
+#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:195
+#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
+#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:200
+#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
+#: rc.cpp:402 rc.cpp:405 rc.cpp:402 rc.cpp:405
+msgid "New Column"
 msgstr ""
 
-#: kopete/main.cpp:34
-msgid "kopete-devel@kde.org"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:408 rc.cpp:408
+msgid "<p align=\"right\">From:</p>"
 msgstr ""
 
-#: kopete/main.cpp:36
-msgid "Duncan Mac-Vicar Prett"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:411 rc.cpp:411
+msgid "<p align=\"right\">Sent:</p>"
 msgstr ""
 
-#: kopete/main.cpp:36
-msgid "Developer and Project founder"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:77
+#. i18n: ectx: property (text), widget (QLabel, dateTime)
+#: rc.cpp:414 rc.cpp:414
+msgid "Invitation Date"
 msgstr ""
 
-#: kopete/main.cpp:37
-msgid "Andre Duffeck"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:87
+#. i18n: ectx: property (text), widget (QLabel, contactName)
+#: rc.cpp:417 rc.cpp:417
+msgid "Contact Name"
 msgstr ""
 
-#: kopete/main.cpp:37
-msgid "Developer, Yahoo plugin maintainer"
-msgstr "Datblygwr, cynhaliwr yr ategyn Yahoo"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:105
+#. i18n: ectx: property (text), widget (QLabel, message)
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:233
+#. i18n: ectx: property (text), widget (QLabel, txtInvMsg)
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:105
+#. i18n: ectx: property (text), widget (QLabel, message)
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:233
+#. i18n: ectx: property (text), widget (QLabel, txtInvMsg)
+#: rc.cpp:420 rc.cpp:3635 rc.cpp:420 rc.cpp:3635
+msgid "Invitation Message"
+msgstr ""
 
-#: kopete/main.cpp:38
-msgid "Andy Goossens"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:135
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:423 rc.cpp:423
+msgid "Would you like to join the conversation?"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:126
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_lastName)
-#: kopete/main.cpp:38 kopete/main.cpp:43 kopete/main.cpp:44 kopete/main.cpp:54
-#: kopete/main.cpp:56 rc.cpp:1688 rc.cpp:1688
-msgid "Developer"
-msgstr "Datblygwr"
-
-#: kopete/main.cpp:39
-msgid "Chris Howells"
-msgstr ""
-
-#: kopete/main.cpp:39
-msgid "Developer, Connection status plugin author"
-msgstr "Datblygwr, cynhaliwr yr ategyn cyflwr cysylltiad"
-
-#: kopete/main.cpp:40
-msgid "Cláudio da Silveira Pinheiro"
-msgstr ""
-
-#: kopete/main.cpp:40
-msgid "Developer, Video device support"
-msgstr "Datblygwr, cynhaliaeth dyfais fideo"
-
-#: kopete/main.cpp:41
-msgid "Gregg Edghill"
-msgstr ""
-
-#: kopete/main.cpp:41
-msgid "Developer, MSN"
-msgstr "Datblygwr, MSN"
-
-#: kopete/main.cpp:42
-msgid "Grzegorz Jaskiewicz"
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:163
+#. i18n: ectx: property (text), widget (QCheckBox, cbDontShowAgain)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:307
+#. i18n: ectx: property (text), widget (QCheckBox, alwaysAccept)
+#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:163
+#. i18n: ectx: property (text), widget (QCheckBox, cbDontShowAgain)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:307
+#. i18n: ectx: property (text), widget (QCheckBox, alwaysAccept)
+#: rc.cpp:426 rc.cpp:582 rc.cpp:426 rc.cpp:582
+msgid "A&lways accept invitations"
 msgstr ""
 
-#: kopete/main.cpp:42
-msgid "Developer, Gadu plugin maintainer"
-msgstr "Datblygwr, cynhaliwr yr ategyn Gadu"
+#. i18n: file: protocols/groupwise/ui/gwchatsearch.ui:74
+#. i18n: ectx: property (text), widget (QPushButton, btnRefresh)
+#: rc.cpp:429 rc.cpp:429
+msgid "&Refresh"
+msgstr "&Ailfywio"
 
-#: kopete/main.cpp:43
-msgid "Gustavo Pichorim Boiko"
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, GroupWiseContactSearchWidget)
+#: rc.cpp:432 rc.cpp:432
+msgid "Search GroupWise Messenger"
 msgstr ""
 
-#: kopete/main.cpp:45
-msgid "Matt Rogers"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:30
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:435 rc.cpp:435
+msgid "&First name"
+msgstr "&Enw cyntaf"
 
-#: kopete/main.cpp:45
-msgid "Lead Developer, AIM and ICQ plugin maintainer"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:43
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:438 rc.cpp:438
+msgid "&User ID"
+msgstr "&Dynodiad Defnyddiwr"
 
-#: kopete/main.cpp:46
-msgid "Michel Hermier"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:56
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:441 rc.cpp:441
+msgid "&Title"
+msgstr "&Teitl"
 
-#: kopete/main.cpp:46
-msgid "IRC plugin maintainer"
-msgstr "Cynhaliwr yr ategyn IRC"
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:75
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:444 rc.cpp:444
+msgid "&Department"
+msgstr "&Adran"
 
-#: kopete/main.cpp:47
-msgid "Lead Developer, Telepathy and Messenger plugin maintainer"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:89
+#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:108
+#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:130
+#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:169
+#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:204
+#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:89
+#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:108
+#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:130
+#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:169
+#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:204
+#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
+#: rc.cpp:447 rc.cpp:456 rc.cpp:465 rc.cpp:480 rc.cpp:492 rc.cpp:447
+#: rc.cpp:456 rc.cpp:465 rc.cpp:480 rc.cpp:492
+msgid "contains"
+msgstr "yn cynnwys"
 
-#: kopete/main.cpp:48
-msgid "Olivier Goffart"
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:94
+#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:113
+#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:135
+#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:174
+#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:209
+#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:94
+#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:113
+#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:135
+#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:174
+#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:209
+#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
+#: rc.cpp:450 rc.cpp:459 rc.cpp:468 rc.cpp:483 rc.cpp:495 rc.cpp:450
+#: rc.cpp:459 rc.cpp:468 rc.cpp:483 rc.cpp:495
+msgid "begins with"
 msgstr ""
 
-#: kopete/main.cpp:48
-msgid "Lead Developer, MSN plugin maintainer"
-msgstr "Prif ddatblygwr, cynhaliwr yr ategyn MSN"
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:99
+#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:118
+#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:140
+#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:179
+#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:214
+#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:99
+#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:118
+#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:140
+#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:179
+#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:214
+#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
+#: rc.cpp:453 rc.cpp:462 rc.cpp:471 rc.cpp:486 rc.cpp:498 rc.cpp:453
+#: rc.cpp:462 rc.cpp:471 rc.cpp:486 rc.cpp:498
+msgid "equals"
+msgstr "yn gyfartal i"
 
-#: kopete/main.cpp:49
-msgid "Ollivier Lapeyre Johann"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:148
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:474 rc.cpp:474
+msgid "Last &name"
+msgstr "&Enw olaf"
 
-#: kopete/main.cpp:49
-msgid "Artist / Developer, Artwork maintainer"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:161
+#. i18n: ectx: property (text), widget (QPushButton, m_clear)
+#: rc.cpp:477 rc.cpp:477
+msgid "Cl&ear"
+msgstr "Cl&irio"
 
-#: kopete/main.cpp:50
-msgid "Richard Smith"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:237
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#: rc.cpp:501 rc.cpp:501
+msgid "&Results:"
+msgstr "&Canlyniadau:"
 
-#: kopete/main.cpp:50
-msgid "Developer, UI maintainer"
-msgstr "Datblygwr, cynhaliwr y rhyngwyneb defnyddiwr"
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:276
+#. i18n: ectx: property (text), widget (QPushButton, m_details)
+#: rc.cpp:504 rc.cpp:504
+msgid "Detai&ls"
+msgstr "Manyl&ion"
 
-#: kopete/main.cpp:51
-msgid "Tiago Salem Herrmann"
+#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:303
+#. i18n: ectx: property (text), widget (QLabel, m_matchCount)
+#: rc.cpp:507 rc.cpp:507
+msgid "0 matching users found"
 msgstr ""
 
-#: kopete/main.cpp:51
-msgid "Developer, WLM plugin maintainer"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:510 rc.cpp:510
+msgid "&Status:"
+msgstr "&Cyflwr :"
 
-#: kopete/main.cpp:52
-msgid "Till Gerken"
+#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:74
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:513 rc.cpp:513
+msgid "Awa&y message:"
 msgstr ""
 
-#: kopete/main.cpp:52
-msgid "Developer, Jabber plugin maintainer"
-msgstr "Datblygwr, cynhaliwr yr ategyn Jabber"
-
-#: kopete/main.cpp:53
-msgid "Will Stephenson"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:87
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:52
+#. i18n: ectx: property (text), widget (QLabel, lblDisplayName)
+#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:87
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:52
+#. i18n: ectx: property (text), widget (QLabel, lblDisplayName)
+#: rc.cpp:516 rc.cpp:6404 rc.cpp:516 rc.cpp:6404
+msgid "&Name:"
+msgstr "&Enw:"
 
-#: kopete/main.cpp:53
-msgid "Lead Developer, GroupWise maintainer"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, GroupWiseAccountPreferences)
+#: rc.cpp:519 rc.cpp:519
+msgid "Account Preferences - Groupwise"
 msgstr ""
 
-#: kopete/main.cpp:54
-msgid "Rafael Fernández López"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:60
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:49
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:40
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:60
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:49
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:40
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:522 rc.cpp:774 rc.cpp:1556 rc.cpp:1827 rc.cpp:3122 rc.cpp:3494
+#: rc.cpp:3935 rc.cpp:522 rc.cpp:774 rc.cpp:1556 rc.cpp:1827 rc.cpp:3122
+#: rc.cpp:3494 rc.cpp:3935
+msgid "B&asic Setup"
 msgstr ""
 
-#: kopete/main.cpp:55
-msgid "Roman Jarosz"
-msgstr ""
-
-#: kopete/main.cpp:55
-msgid "Developer, AIM and ICQ"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:97
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:100
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:116
+#. i18n: ectx: property (toolTip), widget (QLineEdit, userId)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:119
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, userId)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:41
+#. i18n: ectx: property (toolTip), widget (QLabel, accountLabel)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:44
+#. i18n: ectx: property (whatsThis), widget (QLabel, accountLabel)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:60
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_passport)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:63
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_passport)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:97
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:100
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:116
+#. i18n: ectx: property (toolTip), widget (QLineEdit, userId)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:119
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, userId)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:41
+#. i18n: ectx: property (toolTip), widget (QLabel, accountLabel)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:44
+#. i18n: ectx: property (whatsThis), widget (QLabel, accountLabel)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:60
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_passport)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:63
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_passport)
+#: rc.cpp:528 rc.cpp:531 rc.cpp:537 rc.cpp:540 rc.cpp:1833 rc.cpp:1836
+#: rc.cpp:1842 rc.cpp:1845 rc.cpp:528 rc.cpp:531 rc.cpp:537 rc.cpp:540
+#: rc.cpp:1833 rc.cpp:1836 rc.cpp:1842 rc.cpp:1845
+msgid "The account name of your account."
 msgstr ""
 
-#: kopete/main.cpp:56
-msgid "Charles Connell"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:103
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:33
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:103
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:33
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:534 rc.cpp:3590 rc.cpp:534 rc.cpp:3590
+msgid "&User ID:"
+msgstr "C&lustnod Defnyddiwr:"
 
-#: kopete/main.cpp:57
-msgid "Tejas Dinkar"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:131
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoConnect)
+#: rc.cpp:543 rc.cpp:543
+msgid ""
+"Check to disable automatic connection.  If checked, you may connect to this "
+"account manually using the icon in the bottom of the main Kopete window"
 msgstr ""
 
-#: kopete/main.cpp:57
-msgid "Developer, Bonjour Plugin Maintainer"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:134
+#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, cbAutoConnect)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:78
+#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, chkAutoLogin)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:235
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoLogon)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:178
+#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, autoLoginCheck_)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:342
+#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:134
+#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, cbAutoConnect)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:78
+#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, chkAutoLogin)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:235
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoLogon)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:178
+#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, autoLoginCheck_)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:342
+#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
+#: rc.cpp:546 rc.cpp:1029 rc.cpp:1851 rc.cpp:1970 rc.cpp:2553 rc.cpp:2763
+#: rc.cpp:3146 rc.cpp:3518 rc.cpp:3680 rc.cpp:3995 rc.cpp:546 rc.cpp:1029
+#: rc.cpp:1851 rc.cpp:1970 rc.cpp:2553 rc.cpp:2763 rc.cpp:3146 rc.cpp:3518
+#: rc.cpp:3680 rc.cpp:3995
+msgid "E&xclude from connect all"
 msgstr ""
 
-#: kopete/main.cpp:58
-msgid "Pali Rohár"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:180
+#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:208
+#. i18n: ectx: property (toolTip), widget (QLineEdit, server)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:375
+#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:394
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mServer)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:180
+#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:208
+#. i18n: ectx: property (toolTip), widget (QLineEdit, server)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:375
+#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:394
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mServer)
+#: rc.cpp:549 rc.cpp:558 rc.cpp:1077 rc.cpp:1086 rc.cpp:549 rc.cpp:558
+#: rc.cpp:1077 rc.cpp:1086
+msgid ""
+"The IP address or hostname of the server you would like to connect to."
 msgstr ""
 
-#: kopete/main.cpp:58
-msgid "Developer, Skype plugin maintainer"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:183
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:211
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, server)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:183
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:211
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, server)
+#: rc.cpp:552 rc.cpp:561 rc.cpp:552 rc.cpp:561
+msgid ""
+"The IP address or hostname of the server you would like to connect to (for "
+"example im.yourcorp.com)."
 msgstr ""
 
-#: kopete/main.cpp:60
-msgid "Vally8"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:186
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:381
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:340
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:125
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:352
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:186
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:381
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:340
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:125
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:352
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#: rc.cpp:555 rc.cpp:1083 rc.cpp:2571 rc.cpp:3533 rc.cpp:3713 rc.cpp:555
+#: rc.cpp:1083 rc.cpp:2571 rc.cpp:3533 rc.cpp:3713
+msgid "Ser&ver:"
+msgstr "Gweinydd:"
 
-#: kopete/main.cpp:60
-msgid "Konki style author"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:230
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:258
+#. i18n: ectx: property (toolTip), widget (QSpinBox, port)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:416
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:441
+#. i18n: ectx: property (toolTip), widget (QSpinBox, mPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:230
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:258
+#. i18n: ectx: property (toolTip), widget (QSpinBox, port)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:416
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:441
+#. i18n: ectx: property (toolTip), widget (QSpinBox, mPort)
+#: rc.cpp:564 rc.cpp:573 rc.cpp:1092 rc.cpp:1101 rc.cpp:564 rc.cpp:573
+#: rc.cpp:1092 rc.cpp:1101
+msgid "The port on the server that you would like to connect to."
 msgstr ""
 
-#: kopete/main.cpp:61
-msgid "Tm_T"
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:233
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:261
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, port)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:419
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:444
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, mPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:233
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:261
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, port)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:419
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:444
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, mPort)
+#: rc.cpp:567 rc.cpp:576 rc.cpp:1095 rc.cpp:1104 rc.cpp:567 rc.cpp:576
+#: rc.cpp:1095 rc.cpp:1104
+msgid ""
+"The port on the server that you would like to connect to (default is 5222)."
 msgstr ""
 
-#: kopete/main.cpp:61
-msgid "Hacker style author"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:236
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:422
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:358
+#. i18n: ectx: property (text), widget (QLabel, lblServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:467
+#. i18n: ectx: property (text), widget (QLabel, lblProxyServerPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:375
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:158
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:236
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:422
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:358
+#. i18n: ectx: property (text), widget (QLabel, lblServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:467
+#. i18n: ectx: property (text), widget (QLabel, lblProxyServerPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:375
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:158
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#: rc.cpp:570 rc.cpp:1098 rc.cpp:2046 rc.cpp:2082 rc.cpp:2589 rc.cpp:3548
+#: rc.cpp:570 rc.cpp:1098 rc.cpp:2046 rc.cpp:2082 rc.cpp:2589 rc.cpp:3548
+msgid "Po&rt:"
+msgstr "Po&rth:"
 
-#: kopete/main.cpp:62
-msgid "Luciash d' Being"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:286
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:579 rc.cpp:579
+msgid "Advanced &Options"
+msgstr "Dewisiada&u Uwch"
 
-#: kopete/main.cpp:62
-msgid "Kopete's icon author"
-msgstr "Awdur eicon Kopete"
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:585 rc.cpp:585
+msgid "&Basic"
+msgstr "&Sylfaenol"
 
-#: kopete/main.cpp:63
-msgid "Steve Cable"
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:59
+#. i18n: ectx: property (title), widget (QGroupBox, bg_addMethod)
+#: rc.cpp:588 rc.cpp:588
+msgid "Add Using"
 msgstr ""
 
-#: kopete/main.cpp:63
-msgid "Sounds"
-msgstr "Syniau"
-
-#: kopete/main.cpp:64
-msgid "Jessica Hall"
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:86
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_userName)
+#: rc.cpp:591 rc.cpp:591
+msgid "A full or partial name. Asterisks are ignored"
 msgstr ""
 
-#: kopete/main.cpp:64
-msgid "Kopete Docugoddess, Bug and Patch Testing."
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:89
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_userName)
+#: rc.cpp:594 rc.cpp:594
+msgid "Type some or all of the contact's name.  Matches will be shown below"
 msgstr ""
 
-#: kopete/main.cpp:65
-msgid "Justin Karneges"
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:96
+#. i18n: ectx: property (text), widget (QRadioButton, rb_userId)
+#: rc.cpp:597 rc.cpp:597
+msgid "User &ID:"
+msgstr "Dynod&iad Defnyddiwr:"
+
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:109
+#. i18n: ectx: property (text), widget (QRadioButton, rb_userName)
+#: rc.cpp:600 rc.cpp:600
+msgid "Userna&me:"
+msgstr "Enw de&fnyddiwr:"
+
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:119
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_userId)
+#: rc.cpp:603 rc.cpp:603
+msgid "A correct User ID"
 msgstr ""
 
-#: kopete/main.cpp:65
-msgid "Iris Jabber Backend Library"
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:122
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_userId)
+#: rc.cpp:606 rc.cpp:606
+msgid ""
+"Use this field to add a contact if you already know the user's exact User ID"
 msgstr ""
 
-#: kopete/main.cpp:66
-msgid "Tom Linsky"
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:133
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:374
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/groupwise/ui/gwaddui.ui:133
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:374
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:609 rc.cpp:6476 rc.cpp:609 rc.cpp:6476
+msgid "Ad&vanced"
+msgstr "&Uwch"
+
+#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:51
+#. i18n: ectx: property (text), widget (QPushButton, m_btnRemove)
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:163
+#. i18n: ectx: property (text), widget (QPushButton, btnRemove)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, m_removeHost)
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:163
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:97
+#. i18n: ectx: property (text), widget (QPushButton, mColorsRemove)
+#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:51
+#. i18n: ectx: property (text), widget (QPushButton, m_btnRemove)
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:163
+#. i18n: ectx: property (text), widget (QPushButton, btnRemove)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, m_removeHost)
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:163
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:97
+#. i18n: ectx: property (text), widget (QPushButton, mColorsRemove)
+#: rc.cpp:618 rc.cpp:636 rc.cpp:4145 rc.cpp:4416 rc.cpp:4664 rc.cpp:618
+#: rc.cpp:636 rc.cpp:4145 rc.cpp:4416 rc.cpp:4664
+msgid "&Remove"
 msgstr ""
 
-#: kopete/main.cpp:66
-msgid "OscarSocket author"
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:31
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:621 rc.cpp:621
+msgid "Users who can see my online status and send me messages:"
 msgstr ""
 
-#: kopete/main.cpp:67
-msgid "Olaf Lueg"
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:75
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:624 rc.cpp:624
+msgid "A&llowed"
 msgstr ""
 
-#: kopete/main.cpp:67
-msgid "Kmerlin MSN code"
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:126
+#. i18n: ectx: property (text), widget (QPushButton, btnBlock)
+#: rc.cpp:627 rc.cpp:627
+msgid "&Block >>"
 msgstr ""
 
-#: kopete/main.cpp:68
-msgid "Chetan Reddy"
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:133
+#. i18n: ectx: property (text), widget (QPushButton, btnAllow)
+#: rc.cpp:630 rc.cpp:630
+msgid "<< Allo&w"
 msgstr ""
 
-#: kopete/main.cpp:68 kopete/main.cpp:70 kopete/main.cpp:71 kopete/main.cpp:72
-#: kopete/main.cpp:73 kopete/main.cpp:76 kopete/main.cpp:79
-msgid "Former developer"
-msgstr "Cyn-ddatblygwr"
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:156
+#. i18n: ectx: property (text), widget (QPushButton, btnAdd)
+#: rc.cpp:633 rc.cpp:633
+msgid "A&dd..."
+msgstr "Yc&hwanegu..."
 
-#: kopete/main.cpp:69
-msgid "Nick Betcher"
+#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:205
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:639 rc.cpp:639
+msgid "Bloc&ked"
 msgstr ""
 
-#: kopete/main.cpp:69
-msgid "Former developer, project co-founder"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, GroupWiseChatProps)
+#: rc.cpp:642 rc.cpp:642
+msgid "GroupWise Chat Properties"
 msgstr ""
 
-#: kopete/main.cpp:70
-msgid "Ryan Cumming"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:34
+#. i18n: ectx: property (text), widget (QLabel, displayName)
+#: rc.cpp:645 rc.cpp:645
+msgid "DISPLAY NAME"
 msgstr ""
 
-#: kopete/main.cpp:71
-msgid "Stefan Gehn"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:64
+#. i18n: ectx: property (toolTip), widget (QLineEdit, creator)
+#: rc.cpp:648 rc.cpp:648
+msgid "The user who created the chatroom"
 msgstr ""
 
-#: kopete/main.cpp:72
-msgid "Martijn Klingens"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:77
+#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
+#: rc.cpp:651 rc.cpp:651
+msgid "Query:"
 msgstr ""
 
-#: kopete/main.cpp:73
-msgid "Andres Krapf"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:90
+#. i18n: ectx: property (text), widget (QLabel, lblTopic)
+#: rc.cpp:654 rc.cpp:654
+msgid "Topic:"
 msgstr ""
 
-#: kopete/main.cpp:74
-msgid "Carsten Pfeiffer"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:103
+#. i18n: ectx: property (toolTip), widget (QLineEdit, disclaimer)
+#: rc.cpp:657 rc.cpp:657
+msgid "A disclaimer for users entering the chatroom"
 msgstr ""
 
-#: kopete/main.cpp:74
-msgid "Misc bugfixes and enhancements"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:116
+#. i18n: ectx: property (text), widget (QLabel, m__2_2)
+#: rc.cpp:660 rc.cpp:660
+msgid "Owner:"
 msgstr ""
 
-#: kopete/main.cpp:75
-msgid "Zack Rusin"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:129
+#. i18n: ectx: property (toolTip), widget (QLineEdit, topic)
+#: rc.cpp:663 rc.cpp:663
+msgid "The current topic of the discussion"
 msgstr ""
 
-#: kopete/main.cpp:75
-msgid "Former developer, original Gadu plugin author"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:142
+#. i18n: ectx: property (toolTip), widget (QLineEdit, query)
+#: rc.cpp:666 rc.cpp:666
+msgid "UNKNOWN"
 msgstr ""
 
-#: kopete/main.cpp:76
-msgid "Richard Stellingwerff"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:155
+#. i18n: ectx: property (text), widget (QLabel, textLabel11_2_2)
+#: rc.cpp:669 rc.cpp:669
+msgid "Maximum users:"
 msgstr ""
 
-#: kopete/main.cpp:77
-msgid "Daniel Stone"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:168
+#. i18n: ectx: property (text), widget (QLabel, m__2_2_2)
+#: rc.cpp:672 rc.cpp:672
+msgid "Created on:"
 msgstr ""
 
-#: kopete/main.cpp:77
-msgid "Former developer, Jabber plugin author"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:181
+#. i18n: ectx: property (text), widget (QLabel, lbl_displayName_2)
+#: rc.cpp:675 rc.cpp:675
+msgid "Disclaimer:"
 msgstr ""
 
-#: kopete/main.cpp:78
-msgid "Chris TenHarmsel"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:194
+#. i18n: ectx: property (toolTip), widget (QLineEdit, description)
+#: rc.cpp:678 rc.cpp:678
+msgid "General description of the chatroom"
 msgstr ""
 
-#: kopete/main.cpp:78
-msgid "Former developer, Oscar plugin"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:207
+#. i18n: ectx: property (toolTip), widget (QLineEdit, maxUsers)
+#: rc.cpp:681 rc.cpp:681
+msgid "Maximum number of simultaneous users allowed in the chatroom"
 msgstr ""
 
-#: kopete/main.cpp:79
-msgid "Hendrik vom Lehn"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:220
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#: rc.cpp:684 rc.cpp:684
+msgid "Creator:"
 msgstr ""
 
-#: kopete/main.cpp:80
-msgid "Gav Wood"
-msgstr ""
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:233
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:51
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:233
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:51
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:687 rc.cpp:2468 rc.cpp:687 rc.cpp:2468
+msgid "Description:"
+msgstr "Disgrifiad:"
 
-#: kopete/main.cpp:80
-msgid "Former developer and WinPopup maintainer"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:246
+#. i18n: ectx: property (toolTip), widget (QLineEdit, createdOn)
+#: rc.cpp:690 rc.cpp:690
+msgid "Date and time the chatroom was created"
 msgstr ""
 
-#: kopete/main.cpp:82 rc.cpp:1 rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Kevin Donnelly"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:265
+#. i18n: ectx: property (toolTip), widget (QCheckBox, archive)
+#: rc.cpp:693 rc.cpp:693
+msgid "Indicates if the chatroom is being archived on the server"
+msgstr ""
 
-#: kopete/main.cpp:83 rc.cpp:2 rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:268
+#. i18n: ectx: property (text), widget (QCheckBox, archive)
+#: rc.cpp:696 rc.cpp:696
+msgid "Archived"
+msgstr ""
 
-#: kopete/main.cpp:88
-msgid "Do not load plugins. This option overrides all other options."
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:278
+#. i18n: ectx: property (toolTip), widget (QLineEdit, owner)
+#: rc.cpp:699 rc.cpp:699
+msgid "The user who owns this chatroom"
 msgstr ""
 
-#: kopete/main.cpp:89
-msgid "Disable auto-connection"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:306
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2)
+#: rc.cpp:702 rc.cpp:702
+msgid "Default Access"
 msgstr ""
 
-#: kopete/main.cpp:90
-msgid ""
-"Auto-connect the specified accounts. Use a comma-separated list\n"
-"to auto-connect multiple accounts."
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:327
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkRead)
+#: rc.cpp:705 rc.cpp:705
+msgid "General permission to read messages in the chatroom"
 msgstr ""
 
-#: kopete/main.cpp:92
-msgid ""
-"Do not load the specified plugin. Use a comma-separated list\n"
-"to disable multiple plugins."
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:330
+#. i18n: ectx: property (text), widget (QCheckBox, chkRead)
+#: rc.cpp:708 rc.cpp:708
+msgid "Read message"
 msgstr ""
 
-#: kopete/main.cpp:94
-msgid ""
-"Load only the specified plugins. Use a comma-separated list\n"
-"to load multiple plugins. This option has no effect when\n"
-"--noplugins is set and overrides all other plugin related\n"
-"command line options."
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:340
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkWrite)
+#: rc.cpp:711 rc.cpp:711
+msgid "General permission to write messages in the chatroom"
 msgstr ""
 
-#: kopete/main.cpp:100
-msgid "URLs to pass to kopete / emoticon themes to install"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:343
+#. i18n: ectx: property (text), widget (QCheckBox, chkWrite)
+#: rc.cpp:714 rc.cpp:714
+msgid "Write message"
 msgstr ""
 
-#: kopete/contactlist/contactlisttreemodel.cpp:274
-#, kde-format
-msgid "%1 (%2/%3)"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:353
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkModify)
+#: rc.cpp:717 rc.cpp:717
+msgid "General permission to modify the chatroom's access control list"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:158
-msgid "Create New Group..."
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:356
+#. i18n: ectx: property (text), widget (QCheckBox, chkModify)
+#: rc.cpp:720 rc.cpp:720
+msgid "Modify access"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:168
-msgid "&Move To"
-msgstr "&Symud I"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:369
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:723 rc.cpp:723
+msgid "Access Control List"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:171
-msgid "&Copy To"
-msgstr "&Copïo I"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:382
+#. i18n: ectx: property (toolTip), widget (K3ListBox, acl)
+#: rc.cpp:726 rc.cpp:726
+msgid "Access permissions for specific users"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:175
-msgid "Merge Meta Contacts"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:406
+#. i18n: ectx: property (toolTip), widget (KPushButton, addAcl)
+#: rc.cpp:729 rc.cpp:729
+msgid "Add a new ACL entry"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:197
-msgid "Select Account"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:413
+#. i18n: ectx: property (toolTip), widget (KPushButton, editAcl)
+#: rc.cpp:732 rc.cpp:732
+msgid "Edit an existing ACL entry"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:199
-msgid "Add to Your Contact List"
+#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:420
+#. i18n: ectx: property (toolTip), widget (KPushButton, deleteAcl)
+#: rc.cpp:735 rc.cpp:735
+msgid "Delete an ACL entry"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:210
-msgid "&Properties"
-msgstr "&Priodweddau"
+#. i18n: file: protocols/groupwise/gwchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/jabber/jabberchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/wlm/wlmchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/qq/qqchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/yahoo/yahooconferenceui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/groupwise/gwchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/jabber/jabberchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/wlm/wlmchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/qq/qqchatui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: protocols/yahoo/yahooconferenceui.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:5
+#. i18n: ectx: Menu (file)
+#: rc.cpp:738 rc.cpp:951 rc.cpp:1763 rc.cpp:2733 rc.cpp:3611 rc.cpp:5475
+#: rc.cpp:5511 rc.cpp:738 rc.cpp:951 rc.cpp:1763 rc.cpp:2733 rc.cpp:3611
+#: rc.cpp:5475 rc.cpp:5511
+msgid "&Chat"
+msgstr "&Sgwrsio"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:344
-msgid "Please enter the name for the new group:"
+#. i18n: file: protocols/sms/services/smsclientprefs.ui:49
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:741 rc.cpp:741
+msgid "SMSClient Settings"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:386
-#, kde-format
-msgid ""
-"<qt>Are you sure you want to remove the contact <b>%1</b> from your contact "
-"list?</qt>"
+#. i18n: file: protocols/sms/services/smsclientprefs.ui:79
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:744 rc.cpp:744
+msgid "SMSClient &program:"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:392
-#, kde-format
-msgid ""
-"<qt>Are you sure you want to remove the group <b>%1</b> and all contacts "
-"that are contained within it?</qt>"
-msgstr ""
+#. i18n: file: protocols/sms/services/smsclientprefs.ui:90
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/services/smssendprefs.ui:105
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/services/smsclientprefs.ui:90
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/services/smssendprefs.ui:105
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:747 rc.cpp:762 rc.cpp:747 rc.cpp:762
+msgid "Pro&vider:"
+msgstr "Dar&parwr:"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:407
-msgid ""
-"Are you sure you want to remove these contacts from your contact list?"
+#. i18n: file: protocols/sms/services/smsclientprefs.ui:116
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:750 rc.cpp:750
+msgid "SMSClient &config path:"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:409
-msgid ""
-"Are you sure you want to remove these groups and contacts from your contact "
-"list?"
+#. i18n: file: protocols/sms/services/gsmlibprefs.ui:49
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:753 rc.cpp:753
+msgid "GSMLib Settings"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:526
-msgid ""
-"There is no email address set for this contact in the KDE address book."
+#. i18n: file: protocols/sms/services/gsmlibprefs.ui:79
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:150
+#. i18n: ectx: property (text), widget (QLabel, deviceLabel)
+#. i18n: file: protocols/sms/services/gsmlibprefs.ui:79
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:150
+#. i18n: ectx: property (text), widget (QLabel, deviceLabel)
+#: rc.cpp:756 rc.cpp:5726 rc.cpp:756 rc.cpp:5726
+msgid "Device:"
+msgstr "Dyfais:"
+
+#. i18n: file: protocols/sms/services/smssendprefs.ui:49
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:759 rc.cpp:759
+msgid "SMSSend Options"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:526
-msgid "No Email Address in Address Book"
+#. i18n: file: protocols/sms/services/smssendprefs.ui:124
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:765 rc.cpp:765
+msgid "SMSSend prefi&x:"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:530
-msgid ""
-"This contact was not found in the KDE address book. Check that a contact is "
-"selected in the properties dialog."
+#. i18n: file: protocols/sms/services/smssendprefs.ui:159
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:768 rc.cpp:768
+msgid "Provider Options"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:530
-msgid "Not Found in Address Book"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:25
+#. i18n: ectx: property (windowTitle), widget (QWidget)
+#: rc.cpp:771 rc.cpp:771
+msgid "Account Preferences - SMS"
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:817
-msgid "Send Single Message..."
-msgstr "Anfon Neges Sengl..."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:88
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:91
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:116
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsadd.ui:77
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:80
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:109
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsadd.ui:112
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:88
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:91
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:116
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsadd.ui:77
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:80
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:109
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsadd.ui:112
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#: rc.cpp:783 rc.cpp:786 rc.cpp:798 rc.cpp:894 rc.cpp:897 rc.cpp:906
+#: rc.cpp:909 rc.cpp:783 rc.cpp:786 rc.cpp:798 rc.cpp:894 rc.cpp:897
+#: rc.cpp:906 rc.cpp:909
+msgid "A unique name for this SMS account."
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:820
-msgid "&Add Subcontact"
-msgstr "&Ychwanegu Isgyswllt"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:99
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:789 rc.cpp:789
+msgid "&SMS delivery service:"
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:826
-msgid "Remove Group"
-msgstr "Gwaredu Grŵp"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:105
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:140
+#. i18n: ectx: property (toolTip), widget (QComboBox)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:105
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:140
+#. i18n: ectx: property (toolTip), widget (QComboBox)
+#: rc.cpp:792 rc.cpp:801 rc.cpp:792 rc.cpp:801
+msgid "The delivery service that you would like to use."
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:827
-msgid "Send Message to Group"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:108
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:143
+#. i18n: ectx: property (whatsThis), widget (QComboBox)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:108
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:143
+#. i18n: ectx: property (whatsThis), widget (QComboBox)
+#: rc.cpp:795 rc.cpp:804 rc.cpp:795 rc.cpp:804
+msgid ""
+"The delivery service that you would like to use.  Note that you will need to "
+"have this software installed prior to using this account."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:831
-msgid "&Add Contact to Group"
-msgstr "&Ychwanegu Cyswllt i'r Grŵp"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:151
+#. i18n: ectx: property (text), widget (QPushButton)
+#: rc.cpp:807 rc.cpp:807
+msgid "&Description"
+msgstr "&Disgrifiad"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:841
-msgid "Make Meta Contact"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:154
+#. i18n: ectx: property (toolTip), widget (QPushButton)
+#: rc.cpp:810 rc.cpp:810
+msgid "Description of the SMS delivery service."
 msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1037
-#, kde-format
-msgctxt "Translators: format: '<nickname> (<online status>)'"
-msgid "%1 (%2)"
-msgstr "%1(%2)"
-
-#: kopete/contactlist/kopetecontactlistview.cpp:1065
-#, kde-format
-msgctxt "Translators: format: '<displayName> (<id>)'"
-msgid "%2 <%1>"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:157
+#. i18n: ectx: property (whatsThis), widget (QPushButton)
+#: rc.cpp:813 rc.cpp:813
+msgid ""
+"Description of the SMS delivery service, including download locations."
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:75
-#, kde-format
-msgid "Properties of Group %1"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:188
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:819 rc.cpp:819
+msgid "To use SMS, you will need an account with a delivery service."
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:91
-#: kopete/contactlist/kopetelviprops.cpp:200
-msgid "Custom &Notifications"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:223
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:250
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:223
+#. i18n: ectx: attribute (title), widget (QWidget)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:250
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:822 rc.cpp:3165 rc.cpp:822 rc.cpp:3165
+msgid "A&ccount Preferences"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:165
-#, kde-format
-msgid "Properties of Meta Contact %1"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:234
+#. i18n: ectx: property (title), widget (QGroupBox)
+#: rc.cpp:825 rc.cpp:825
+msgid "Messaging Preferences"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:190
-msgid "Sync KABC..."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:253
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:828 rc.cpp:828
+msgid "If the message is too &long:"
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:393
-msgid "No Contacts with Photo Support"
-msgstr "Dim Cysylltau sy'n Cynnal Ffoto"
-
-#: kopete/contactlist/kopetelviprops.cpp:546
-msgid "No contacts were imported from the address book."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:259
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:285
+#. i18n: ectx: property (toolTip), item, widget (QComboBox)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:259
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:285
+#. i18n: ectx: property (toolTip), item, widget (QComboBox)
+#: rc.cpp:831 rc.cpp:846 rc.cpp:831 rc.cpp:846
+msgid ""
+"What should happen if you type a message that is too long to fit in a single "
+"SMS message."
 msgstr ""
 
-#: kopete/contactlist/kopetelviprops.cpp:547
-msgid "No Change"
-msgstr "Dim Newid"
-
-#: kopete/contactlist/kabcexport.cpp:61
-msgid "Select Address Book"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:262
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:288
+#. i18n: ectx: property (whatsThis), item, widget (QComboBox)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:262
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:288
+#. i18n: ectx: property (whatsThis), item, widget (QComboBox)
+#: rc.cpp:834 rc.cpp:849 rc.cpp:834 rc.cpp:849
+msgid ""
+"What should happen if you type a message that is too long to fit in a single "
+"SMS message.  You can either choose to break it up into smaller messages "
+"automatically, cancel the message from being sent entirely, or have Kopete "
+"prompt you each time you enter a message that is too long."
 msgstr ""
 
-#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:21
-#. i18n: ectx: property (windowTitle), widget (QWidget, ContactSelectorWidget_Base)
-#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:21
-#. i18n: ectx: property (windowTitle), widget (QWidget, MetaContactSelectorWidget_Base)
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, AddressBookSelectorWidget_Base)
-#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:21
-#. i18n: ectx: property (windowTitle), widget (QWidget, ContactSelectorWidget_Base)
-#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:21
-#. i18n: ectx: property (windowTitle), widget (QWidget, MetaContactSelectorWidget_Base)
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, AddressBookSelectorWidget_Base)
-#: kopete/contactlist/kabcexport.cpp:64 rc.cpp:92 rc.cpp:5126 rc.cpp:5153
-#: rc.cpp:92 rc.cpp:5126 rc.cpp:5153
-msgid "Select Contact"
-msgstr "Dewis Cyswllt"
-
-#: kopete/contactlist/kabcexport.cpp:98
-msgid "No writeable address book resource found."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:268
+#. i18n: ectx: property (text), item, widget (QComboBox)
+#: rc.cpp:837 rc.cpp:837
+msgid "Prompt (recommended)"
 msgstr ""
 
-#: kopete/contactlist/kabcexport.cpp:99
-msgid "Add or enable one using the KDE System Settings."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:273
+#. i18n: ectx: property (text), item, widget (QComboBox)
+#: rc.cpp:840 rc.cpp:840
+msgid "Break Into Multiple"
 msgstr ""
 
-#: kopete/contactlist/kabcexport.cpp:110
-msgid " (already in address book)"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:278
+#. i18n: ectx: property (text), item, widget (QComboBox)
+#: rc.cpp:843 rc.cpp:843
+msgid "Cancel Sending"
 msgstr ""
 
-#: kopete/contactlist/contactlistlayoutmanager.cpp:58
-msgid "Placeholder"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:298
+#. i18n: ectx: property (text), widget (QCheckBox)
+#: rc.cpp:852 rc.cpp:852
+msgid "&Enable phone number internationalization"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:187
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: kopete/contactlist/contactlistlayoutmanager.cpp:59 rc.cpp:827 rc.cpp:827
-msgid "Display Name"
-msgstr "Enw Dangos"
-
-#: kopete/contactlist/contactlistlayoutmanager.cpp:62
-msgid "Contact Icons"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:301
+#. i18n: ectx: property (toolTip), widget (QCheckBox)
+#: rc.cpp:855 rc.cpp:855
+msgid "Check if you would like to enable phone number internationalization."
 msgstr ""
 
-#: kopete/contactlist/contactlistlayoutmanager.cpp:368
-#, kde-format
-msgid "The layout '%1' is one of the default layouts and cannot be deleted."
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:304
+#. i18n: ectx: property (whatsThis), widget (QCheckBox)
+#: rc.cpp:858 rc.cpp:858
+msgid ""
+"Check if you would like to enable phone number internationalization.  "
+"Without this option, you will only be able to use SMS for accounts within "
+"your country."
 msgstr ""
 
-#: kopete/contactlist/contactlistlayoutmanager.cpp:369
-msgid "Cannot Delete Default Layouts"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:331
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:861 rc.cpp:861
+msgid "Substitute leading &zero with code:"
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:77
-#: kopete/contactlist/kopeteaddrbookexport.cpp:84
-#: kopete/contactlist/kopeteaddrbookexport.cpp:91
-#: kopete/contactlist/kopeteaddrbookexport.cpp:100
-#: kopete/contactlist/kopeteaddrbookexport.cpp:120
-msgid "<Not Set>"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:337
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:340
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:365
+#. i18n: ectx: property (toolTip), widget (KRestrictedLine)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:368
+#. i18n: ectx: property (whatsThis), widget (KRestrictedLine)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:337
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:340
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:365
+#. i18n: ectx: property (toolTip), widget (KRestrictedLine)
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:368
+#. i18n: ectx: property (whatsThis), widget (KRestrictedLine)
+#: rc.cpp:864 rc.cpp:867 rc.cpp:876 rc.cpp:879 rc.cpp:864 rc.cpp:867
+#: rc.cpp:876 rc.cpp:879
+msgid "Whatever you want to substitute for a leading zero."
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:179
-msgid "Export to Address Book"
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:359
+#. i18n: ectx: property (text), widget (KRestrictedLine)
+#: rc.cpp:870 rc.cpp:870
+msgid "+"
+msgstr "+"
+
+#. i18n: file: protocols/sms/ui/smsactprefs.ui:362
+#. i18n: ectx: property (validChars), widget (KRestrictedLine)
+#: rc.cpp:873 rc.cpp:873
+msgid "1234567890+"
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:185
-msgid "Export"
+#. i18n: file: protocols/sms/ui/smsadd.ui:54
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:70
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:207
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_4_2)
+#. i18n: file: protocols/sms/ui/smsadd.ui:54
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:70
+#. i18n: ectx: property (text), widget (QLabel)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:207
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_4_2)
+#: rc.cpp:882 rc.cpp:915 rc.cpp:3384 rc.cpp:882 rc.cpp:915 rc.cpp:3384
+msgid "&Telephone number:"
 msgstr ""
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:186
-msgid "Set address book fields using the selected data from Kopete"
+#. i18n: file: protocols/sms/ui/smsadd.ui:60
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:98
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsadd.ui:60
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:98
+#. i18n: ectx: property (toolTip), widget (QLineEdit)
+#: rc.cpp:885 rc.cpp:900 rc.cpp:885 rc.cpp:900
+msgid "The telephone number of the contact you would like to add."
 msgstr ""
 
-#: kopete/contactlist/contactlistmodel.cpp:418
-#, kde-format
+#. i18n: file: protocols/sms/ui/smsadd.ui:63
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:101
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#. i18n: file: protocols/sms/ui/smsadd.ui:63
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsadd.ui:101
+#. i18n: ectx: property (whatsThis), widget (QLineEdit)
+#: rc.cpp:888 rc.cpp:903 rc.cpp:888 rc.cpp:903
 msgid ""
-"<qt>This contact is already on your contact list. It is a child contact of "
-"<b>%1</b></qt>"
+"The telephone number of the contact you would like to add.  This should be a "
+"number with SMS service available."
 msgstr ""
 
-#: kopete/contactlist/contactlistmodel.cpp:474
-#, kde-format
-msgid ""
-"<qt>Are you sure you want to merge meta contacts?\n"
-"<b>%1</b>"
+#. i18n: file: protocols/sms/ui/smsadd.ui:71
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:891 rc.cpp:891
+msgid "Contact na&me:"
 msgstr ""
 
-#: kopete/contactlist/contactlistmodel.cpp:475
-msgid "Meta Contact Merge"
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:40
+#. i18n: ectx: property (text), widget (QLabel)
+#: rc.cpp:912 rc.cpp:912
+msgid "Some One"
 msgstr ""
 
-#: kopete/contactlist/contactlistmodel.cpp:648
-#, kde-format
-msgctxt ""
-"<tr><td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td><td>STATUS "
-"DESCRIPTION</td></tr>"
-msgid ""
-"<tr style='white-space:pre'><td><img "
-"src=\"%1\">&nbsp;</td><td><b>%2</b>&nbsp;(%3)</td><td "
-"align=\"right\">%4</td></tr>"
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:76
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:87
+#. i18n: ectx: property (toolTip), widget (KLineEdit)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:76
+#. i18n: ectx: property (toolTip), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:87
+#. i18n: ectx: property (toolTip), widget (KLineEdit)
+#: rc.cpp:918 rc.cpp:924 rc.cpp:918 rc.cpp:924
+msgid "The telephone number of the contact."
 msgstr ""
 
-#: kopete/contactlist/contactlistmodel.cpp:659
-#, kde-format
-msgctxt "<tr><td><small><i>STATUS MESSAGE</i></small></td></tr>"
-msgid "<tr><td>&nbsp;</td><td colspan='2'><small><i>%1</i></small></td></tr>"
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:79
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:90
+#. i18n: ectx: property (whatsThis), widget (KLineEdit)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:79
+#. i18n: ectx: property (whatsThis), widget (QLabel)
+#. i18n: file: protocols/sms/ui/smsuserprefs.ui:90
+#. i18n: ectx: property (whatsThis), widget (KLineEdit)
+#: rc.cpp:921 rc.cpp:927 rc.cpp:921 rc.cpp:927
+msgid ""
+"The telephone number of the contact.  This should be a number with SMS "
+"service available."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:69
-#. i18n: ectx: property (text), widget (QTableWidget, listServers)
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:85
-#. i18n: ectx: property (text), widget (QTreeWidget, trServices)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:36
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:100
-#. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:47
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:93
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
-#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:69
-#. i18n: ectx: property (text), widget (QTableWidget, listServers)
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:85
-#. i18n: ectx: property (text), widget (QTreeWidget, trServices)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:36
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:100
-#. i18n: ectx: property (text), widget (K3ListView, addresseeListView)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:47
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:93
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
-#: kopete/addaccountwizard/addaccountwizard.cpp:74 rc.cpp:2254 rc.cpp:2284
-#: rc.cpp:4270 rc.cpp:5168 rc.cpp:5920 rc.cpp:5929 rc.cpp:2254 rc.cpp:2284
-#: rc.cpp:4270 rc.cpp:5168 rc.cpp:5920 rc.cpp:5929
-msgid "Name"
-msgstr "Enw"
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:6
+#. i18n: ectx: property (windowTitle), widget (QWidget, GoogleTalkCallDialog)
+#: rc.cpp:930 rc.cpp:930
+msgid "Google Talk Voice Call"
+msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:77
-msgctxt ""
-"1st message shown to users on first run of Kopete. Please keep the "
-"formatting."
-msgid ""
-"<h2>Welcome to Kopete</h2><p>Which messaging service do you want to connect "
-"to?</p>"
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:14
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:933 rc.cpp:933
+msgid "Calling with:"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:83
-msgid "Step Two: Account Information"
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:28
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:936 rc.cpp:936
+msgid "Call Status:"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:89
-msgctxt ""
-"2nd message shown to users on first run of Kopete. Please keep the "
-"formatting."
-msgid ""
-"<h2>Congratulations</h2><p>You have finished configuring the account. You "
-"can add more accounts with <i>Settings->Configure</i>.  Please click the "
-"\"Finish\" button.</p>"
-msgstr ""
-
-#: kopete/addaccountwizard/addaccountwizard.cpp:169
-#, kde-format
-msgid "Cannot load the %1 protocol plugin."
-msgstr ""
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, rejectButton)
+#: rc.cpp:942 rc.cpp:942
+msgid "Reject"
+msgstr "Gwrthod"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:170
-#: kopete/addaccountwizard/addaccountwizard.cpp:179
-msgid "Error While Adding Account"
+#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, hangupButton)
+#: rc.cpp:945 rc.cpp:945
+msgid "Hang up"
 msgstr ""
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:178
-msgid "This protocol does not currently support adding accounts."
+#. i18n: file: protocols/jabber/jingle/jinglecallsgui.ui:13
+#. i18n: ectx: property (windowTitle), widget (QMainWindow, jingleCallsGui)
+#: rc.cpp:954 rc.cpp:954
+msgid "Main Window"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyui.rc:5
-#. i18n: ectx: Menu (privacyMenu)
-#. i18n: file: plugins/privacy/privacyui.rc:12
-#. i18n: ectx: Menu (privacyMenu)
-#. i18n: file: plugins/privacy/privacyui.rc:18
-#. i18n: ectx: Menu (privacyMenu)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:152
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#. i18n: file: plugins/privacy/privacyui.rc:5
-#. i18n: ectx: Menu (privacyMenu)
-#. i18n: file: plugins/privacy/privacyui.rc:12
-#. i18n: ectx: Menu (privacyMenu)
-#. i18n: file: plugins/privacy/privacyui.rc:18
-#. i18n: ectx: Menu (privacyMenu)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:152
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#: rc.cpp:5 rc.cpp:8 rc.cpp:11 rc.cpp:1143 rc.cpp:5 rc.cpp:8 rc.cpp:11
-#: rc.cpp:1143
-msgid "Privacy"
-msgstr "Preifatwydd"
-
-#. i18n: file: plugins/privacy/privacydialog.ui:34
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:14 rc.cpp:14
-msgid "Filter by Sender"
+#. i18n: file: protocols/jabber/jingle/jinglecallsgui.ui:50
+#. i18n: ectx: property (windowTitle), widget (QToolBar, toolBar)
+#: rc.cpp:957 rc.cpp:957
+msgid "Toolbar"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:58
-#. i18n: ectx: property (text), widget (QRadioButton, radioOnlyWhiteList)
-#: rc.cpp:17 rc.cpp:17
-msgid "Allow messages only from contacts on the whitelist"
+#. i18n: file: protocols/jabber/jingle/jinglecontentdialog.ui:19
+#. i18n: ectx: property (windowTitle), widget (QDialog, jingleContentDialog)
+#: rc.cpp:960 rc.cpp:960
+msgid "Dialog"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:99
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:36
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:30
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:26
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:26 rc.cpp:26
-msgid "Blacklist:"
-msgstr ""
-
-#. i18n: file: plugins/privacy/privacydialog.ui:125
-#. i18n: ectx: property (text), widget (QRadioButton, radioAllowAll)
-#: rc.cpp:32 rc.cpp:32
-msgid "Allow all messages"
-msgstr ""
-
-#. i18n: file: plugins/privacy/privacydialog.ui:135
-#. i18n: ectx: property (text), widget (QRadioButton, radioOnlyContactList)
-#: rc.cpp:35 rc.cpp:35
-msgid "Allow messages only from contacts on my contact list"
-msgstr ""
-
-#. i18n: file: plugins/privacy/privacydialog.ui:142
-#. i18n: ectx: property (text), widget (QRadioButton, radioAllButBlackList)
-#: rc.cpp:38 rc.cpp:38
-msgid "Allow all messages but messages from contacts on the blacklist"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:36
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:30
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:963 rc.cpp:981 rc.cpp:1258 rc.cpp:963 rc.cpp:981 rc.cpp:1258
+msgid "Server:"
+msgstr "Gweinydd:"
 
-#. i18n: file: plugins/privacy/privacydialog.ui:169
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:53
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:41 rc.cpp:41
-msgid "Whitelist:"
+#: rc.cpp:966 rc.cpp:966
+msgid "Node:"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:212
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:53 rc.cpp:53
-msgid "Filter by Content (separate multiple words by commas)"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, btnQuery)
+#: rc.cpp:969 rc.cpp:969
+msgid "&Query Server"
+msgstr "&Gweinydd Ymholiad"
 
-#. i18n: file: plugins/privacy/privacydialog.ui:242
-#. i18n: ectx: property (text), widget (QCheckBox, chkDropAll)
-#: rc.cpp:56 rc.cpp:56
-msgid "Drop messages that contain all of the following words:"
+#. i18n: file: protocols/jabber/ui/dlgservices.ui:95
+#. i18n: ectx: property (text), widget (QTreeWidget, trServices)
+#: rc.cpp:978 rc.cpp:978
+msgid "Node"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacydialog.ui:249
-#. i18n: ectx: property (text), widget (QCheckBox, chkDropAtLeastOne)
-#: rc.cpp:59 rc.cpp:59
-msgid "Drop messages that contain at least one of the following words:"
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:40
+#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:40
+#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:46
+#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
+#: rc.cpp:984 rc.cpp:1261 rc.cpp:984 rc.cpp:1261
+msgid "&Query"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:11
-#. i18n: ectx: label, entry (Sender_AllowAll), group (Privacy Plugin)
-#: rc.cpp:62 rc.cpp:62
-msgid "Allow everyone to send you messages."
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:50
+#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:57
+#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:50
+#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:57
+#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
+#: rc.cpp:987 rc.cpp:1264 rc.cpp:987 rc.cpp:1264
+msgid "Chatroom Name"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:15
-#. i18n: ectx: label, entry (Sender_AllowNoneButWhiteList), group (Privacy Plugin)
-#: rc.cpp:65 rc.cpp:65
-msgid ""
-"Allow nobody to send you messages, except the contacts on the whitelist."
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:55
+#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:62
+#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
+#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:55
+#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:62
+#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
+#: rc.cpp:990 rc.cpp:1267 rc.cpp:990 rc.cpp:1267
+msgid "Chatroom Description"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:19
-#. i18n: ectx: label, entry (Sender_AllowAllButBlackList), group (Privacy Plugin)
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:23
-#. i18n: ectx: label, entry (Sender_AllowNoneButContactList), group (Privacy Plugin)
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:19
-#. i18n: ectx: label, entry (Sender_AllowAllButBlackList), group (Privacy Plugin)
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:23
-#. i18n: ectx: label, entry (Sender_AllowNoneButContactList), group (Privacy Plugin)
-#: rc.cpp:68 rc.cpp:71 rc.cpp:68 rc.cpp:71
-msgid ""
-"Allow everyone to send you messages, except the contacts on the blacklist."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabberbookmarkeditor.ui:22
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:86
+#. i18n: ectx: property (text), widget (QPushButton, m_rename)
+#. i18n: file: protocols/jabber/ui/dlgjabberbookmarkeditor.ui:22
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:86
+#. i18n: ectx: property (text), widget (QPushButton, m_rename)
+#: rc.cpp:993 rc.cpp:4539 rc.cpp:993 rc.cpp:4539
+msgid "Rename..."
+msgstr "Ail-enwi..."
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:27
-#. i18n: ectx: label, entry (WhiteList), group (Privacy Plugin)
-#: rc.cpp:74 rc.cpp:74
-msgid "Contacts on the whitelist."
+#. i18n: file: protocols/jabber/ui/dlgjabberbookmarkeditor.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, autoJoinButton)
+#: rc.cpp:996 rc.cpp:996
+msgid "Toggle Auto Join"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:31
-#. i18n: ectx: label, entry (BlackList), group (Privacy Plugin)
-#: rc.cpp:77 rc.cpp:77
-msgid "Contacts on the blacklist."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, DlgJabberEditAccountWidget)
+#: rc.cpp:1002 rc.cpp:1002
+msgid "Account Preferences - Jabber"
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:35
-#. i18n: ectx: label, entry (Content_DropIfAny), group (Privacy Plugin)
-#: rc.cpp:80 rc.cpp:80
-msgid "Drop messages that contain at least one of the following words."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:65
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:81
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mID)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:65
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:81
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mID)
+#: rc.cpp:1011 rc.cpp:1020 rc.cpp:1011 rc.cpp:1020
+msgid "The Jabber ID for the account you would like to use."
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:39
-#. i18n: ectx: label, entry (DropIfAny), group (Privacy Plugin)
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:47
-#. i18n: ectx: label, entry (DropIfAll), group (Privacy Plugin)
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:39
-#. i18n: ectx: label, entry (DropIfAny), group (Privacy Plugin)
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:47
-#. i18n: ectx: label, entry (DropIfAll), group (Privacy Plugin)
-#: rc.cpp:83 rc.cpp:89 rc.cpp:83 rc.cpp:89
-msgid "Words to look for."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:68
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_3)
+#: rc.cpp:1014 rc.cpp:1014
+msgid ""
+"The Jabber ID for the account you would like to use.  Note that this must "
+"include the username and the domain (like an E-mail address), as there are "
+"many Jabber servers."
 msgstr ""
 
-#. i18n: file: plugins/privacy/privacyconfig.kcfg:43
-#. i18n: ectx: label, entry (Content_DropIfAll), group (Privacy Plugin)
-#: rc.cpp:86 rc.cpp:86
-msgid "Drop messages that contain all of the following words."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:71
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:39
+#. i18n: ectx: property (text), widget (QLabel, lblID)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:71
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:39
+#. i18n: ectx: property (text), widget (QLabel, lblID)
+#: rc.cpp:1017 rc.cpp:1282 rc.cpp:1017 rc.cpp:1282
+msgid "&Jabber ID:"
 msgstr ""
 
-#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:33
-#. i18n: ectx: property (text), widget (QRadioButton, radioAddExistingMetaContact)
-#: rc.cpp:95 rc.cpp:95
-msgid "Add an existing metacontact:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:84
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mID)
+#: rc.cpp:1023 rc.cpp:1023
+msgid ""
+"The Jabber ID for the account you would like to use.  Note that this must "
+"include the username and the domain (for example, joe@jabber.org), as there "
+"are many Jabber servers."
 msgstr ""
 
-#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:46
-#. i18n: ectx: property (text), widget (QRadioButton, radioAnotherContact)
-#: rc.cpp:98 rc.cpp:98
-msgid "Specify another contact:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:106
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAutoConnect)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:83
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:134
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:106
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAutoConnect)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:83
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:134
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
+#: rc.cpp:1026 rc.cpp:3515 rc.cpp:3677 rc.cpp:1026 rc.cpp:3515 rc.cpp:3677
+msgid ""
+"Check to disable automatic connection.  If checked, you can connect manually "
+"to this account, using the icon at the bottom of the main Kopete window"
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:39
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:101 rc.cpp:101
-msgid "&Colors"
-msgstr "&Lliwiau"
-
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:89
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:119
+#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:91
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:109
+#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:78
+#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:215
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:78
-#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:89
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:147
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:147
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:78
-#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
-#: rc.cpp:104 rc.cpp:5455 rc.cpp:5983 rc.cpp:104 rc.cpp:5455 rc.cpp:5983
-msgid "Colors"
-msgstr "Lliwiau"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:119
+#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:91
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:109
+#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:78
+#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:215
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:147
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:147
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1032 rc.cpp:1854 rc.cpp:1973 rc.cpp:2523 rc.cpp:2769 rc.cpp:3149
+#: rc.cpp:3683 rc.cpp:1032 rc.cpp:1854 rc.cpp:1973 rc.cpp:2523 rc.cpp:2769
+#: rc.cpp:3149 rc.cpp:3683
+msgid "Registration"
+msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:90
-#. i18n: ectx: property (text), widget (QPushButton, mColorsAdd)
-#: rc.cpp:107 rc.cpp:107
-msgid "&Add..."
-msgstr "Ychw&anegu..."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:157
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnRegister)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:160
+#. i18n: ectx: property (whatsThis), widget (QPushButton, btnRegister)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:191
+#. i18n: ectx: property (toolTip), widget (QPushButton, registerNew)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:194
+#. i18n: ectx: property (whatsThis), widget (QPushButton, registerNew)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:212
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:215
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:157
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnRegister)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:160
+#. i18n: ectx: property (whatsThis), widget (QPushButton, btnRegister)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:191
+#. i18n: ectx: property (toolTip), widget (QPushButton, registerNew)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:194
+#. i18n: ectx: property (whatsThis), widget (QPushButton, registerNew)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:212
+#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:215
+#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRegister)
+#: rc.cpp:1035 rc.cpp:1038 rc.cpp:3156 rc.cpp:3159 rc.cpp:3689 rc.cpp:3692
+#: rc.cpp:1035 rc.cpp:1038 rc.cpp:3156 rc.cpp:3159 rc.cpp:3689 rc.cpp:3692
+msgid "Register a new account on this network."
+msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:97
-#. i18n: ectx: property (text), widget (QPushButton, mColorsRemove)
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:62
-#. i18n: ectx: property (text), widget (QPushButton, m_removeHost)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:51
-#. i18n: ectx: property (text), widget (QPushButton, m_btnRemove)
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, btnRemove)
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:97
-#. i18n: ectx: property (text), widget (QPushButton, mColorsRemove)
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:62
-#. i18n: ectx: property (text), widget (QPushButton, m_removeHost)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:51
-#. i18n: ectx: property (text), widget (QPushButton, m_btnRemove)
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, btnRemove)
-#: rc.cpp:110 rc.cpp:638 rc.cpp:1373 rc.cpp:4677 rc.cpp:4962 rc.cpp:110
-#: rc.cpp:638 rc.cpp:1373 rc.cpp:4677 rc.cpp:4962
-msgid "&Remove"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:163
+#. i18n: ectx: property (text), widget (QPushButton, btnRegister)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:147
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:260
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:197
+#. i18n: ectx: property (text), widget (QPushButton, registerNew)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:163
+#. i18n: ectx: property (text), widget (QPushButton, btnRegister)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:147
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:128
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:260
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:197
+#. i18n: ectx: property (text), widget (QPushButton, registerNew)
+#: rc.cpp:1041 rc.cpp:1860 rc.cpp:1980 rc.cpp:2526 rc.cpp:2777 rc.cpp:3162
+#: rc.cpp:1041 rc.cpp:1860 rc.cpp:1980 rc.cpp:2526 rc.cpp:2777 rc.cpp:3162
+msgid "Re&gister New Account"
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:104
-#. i18n: ectx: property (text), widget (QPushButton, mColorsUp)
-#: rc.cpp:113 rc.cpp:113
-msgid "Move &Up"
-msgstr "Symud i &Fyny"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:182
+#. i18n: ectx: property (text), widget (QLabel, lblRegistration)
+#: rc.cpp:1044 rc.cpp:1044
+msgid ""
+"To connect to the Jabber network, you will need an account on a Jabber "
+"server.  If you do not yet have an account, please click the button to "
+"create one."
+msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:111
-#. i18n: ectx: property (text), widget (QPushButton, mColorsDown)
-#: rc.cpp:116 rc.cpp:116
-msgid "Move &Down"
-msgstr "Symud i &Lawr"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:198
+#. i18n: ectx: property (title), widget (QGroupBox, changePasswordGroupBox)
+#: rc.cpp:1047 rc.cpp:1047
+msgid "Change Password"
+msgstr "Newid Cyfrinair"
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, m_colorRandom)
-#: rc.cpp:119 rc.cpp:119
-msgid "Random order"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:236
+#. i18n: ectx: property (text), widget (QPushButton, btnChangePassword)
+#: rc.cpp:1050 rc.cpp:1050
+msgid "Change &Your Password..."
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:154
-#. i18n: ectx: property (text), widget (QCheckBox, m_fg)
-#: rc.cpp:122 rc.cpp:122
-msgid "Change global text foreground color"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:252
+#. i18n: ectx: property (text), widget (QLabel, tlChangePwSuccess)
+#: rc.cpp:1053 rc.cpp:1053
+msgid ""
+"If you have an existing Jabber account and would like to change its "
+"password, you can use this button to enter a new password."
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:161
-#. i18n: ectx: property (text), widget (QCheckBox, m_char)
-#: rc.cpp:125 rc.cpp:125
-msgid "Change color every letter"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:267
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:267
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:1056 rc.cpp:1880 rc.cpp:1056 rc.cpp:1880
+msgid "Co&nnection"
+msgstr "Cy&sylltiad"
+
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:297
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:287
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:267
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:308
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:262
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:109
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox54)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:279
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:288
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:297
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:287
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:267
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:308
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:262
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:109
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox54)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:279
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:288
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:1059 rc.cpp:2025 rc.cpp:2559 rc.cpp:2783 rc.cpp:3168 rc.cpp:3524
+#: rc.cpp:3701 rc.cpp:3986 rc.cpp:1059 rc.cpp:2025 rc.cpp:2559 rc.cpp:2783
+#: rc.cpp:3168 rc.cpp:3524 rc.cpp:3701 rc.cpp:3986
+msgid "Connection Preferences"
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:168
-#. i18n: ectx: property (text), widget (QCheckBox, m_words)
-#: rc.cpp:128 rc.cpp:128
-msgid "Change color every word"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:309
+#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
+#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:309
+#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
+#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
+#: rc.cpp:1062 rc.cpp:1451 rc.cpp:1062 rc.cpp:1451
+msgid "Check this box to enable SSL encrypted communication with the server."
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:176
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:131 rc.cpp:131
-msgid "Effects"
-msgstr "Effeithiau"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:312
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:134
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:312
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:134
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
+#: rc.cpp:1065 rc.cpp:1454 rc.cpp:1065 rc.cpp:1454
+msgid ""
+"Check this box to enable SSL encrypted communication with the server.  Note "
+"that this is not end-to-end encryption, but rather encrypted communication "
+"with the server."
+msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:203
-#. i18n: ectx: property (text), widget (QCheckBox, m_lamer)
-#: rc.cpp:134 rc.cpp:134
-msgid "L4m3r t4lk"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:315
+#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:315
+#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
+#: rc.cpp:1068 rc.cpp:1457 rc.cpp:1068 rc.cpp:1457
+msgid "Use protocol encr&yption (SSL)"
 msgstr ""
 
-#. i18n: file: plugins/texteffect/texteffectprefs.ui:216
-#. i18n: ectx: property (text), widget (QCheckBox, m_casewaves)
-#: rc.cpp:137 rc.cpp:137
-msgid "CasE wAVes"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:322
+#. i18n: ectx: property (text), widget (QCheckBox, cbAllowPlainTextPassword)
+#: rc.cpp:1071 rc.cpp:1071
+msgid "Allow plain-te&xt password authentication"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/translator/translatorui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:137
-#. i18n: ectx: property (text), widget (QPushButton, m_edit)
-#. i18n: file: plugins/statistics/statisticsui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/history/historyui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/contactnotes/contactnotesui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: protocols/skype/skypeui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, m_btnEdit)
-#. i18n: file: kopete/kopeteui.rc:17
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/otr/otrui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/translator/translatorui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:137
-#. i18n: ectx: property (text), widget (QPushButton, m_edit)
-#. i18n: file: plugins/statistics/statisticsui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/history/historyui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: plugins/contactnotes/contactnotesui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: protocols/skype/skypeui.rc:5
-#. i18n: ectx: Menu (edit)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatus.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, m_btnEdit)
-#. i18n: file: kopete/kopeteui.rc:17
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:140 rc.cpp:602 rc.cpp:635 rc.cpp:656 rc.cpp:713 rc.cpp:752
-#: rc.cpp:4351 rc.cpp:4674 rc.cpp:6293 rc.cpp:140 rc.cpp:602 rc.cpp:635
-#: rc.cpp:656 rc.cpp:713 rc.cpp:752 rc.cpp:4351 rc.cpp:4674 rc.cpp:6293
-msgid "&Edit"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:332
+#. i18n: ectx: property (text), widget (QCheckBox, cbCustomServer)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:279
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:299
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:288
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:329
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:332
+#. i18n: ectx: property (text), widget (QCheckBox, cbCustomServer)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:279
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:299
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:288
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:329
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#: rc.cpp:1074 rc.cpp:1886 rc.cpp:2028 rc.cpp:2562 rc.cpp:2786 rc.cpp:1074
+#: rc.cpp:1886 rc.cpp:2028 rc.cpp:2562 rc.cpp:2786
+msgid "&Override default server information"
 msgstr ""
 
-#. i18n: file: plugins/otr/kopete_otr.kcfg:7
-#. i18n: ectx: label, entry (rbAlways), group (Policy)
-#: rc.cpp:143 rc.cpp:143
-msgid "Always encrypt outgoing messages"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:378
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:397
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:378
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:397
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServer)
+#: rc.cpp:1080 rc.cpp:1089 rc.cpp:1080 rc.cpp:1089
+msgid ""
+"The IP address or hostname of the server you would like to connect to (for "
+"example jabber.org)."
 msgstr ""
 
-#. i18n: file: plugins/otr/kopete_otr.kcfg:11
-#. i18n: ectx: label, entry (rbOpportunistic), group (Policy)
-#: rc.cpp:146 rc.cpp:146
-msgid "Automatically encrypt messages if the other side supports OTR"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:468
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_5)
+#: rc.cpp:1107 rc.cpp:1107
+msgid "Location Settings"
 msgstr ""
 
-#. i18n: file: plugins/otr/kopete_otr.kcfg:15
-#. i18n: ectx: label, entry (rbManual), group (Policy)
-#. i18n: file: plugins/otr/otrprefs.ui:129
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbManual)
-#. i18n: file: plugins/otr/kopete_otr.kcfg:15
-#. i18n: ectx: label, entry (rbManual), group (Policy)
-#. i18n: file: plugins/otr/otrprefs.ui:129
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbManual)
-#: rc.cpp:149 rc.cpp:197 rc.cpp:149 rc.cpp:197
-msgid "Encrypt messages if the other side requests an OTR connection"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:482
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:510
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mResource)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:545
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3_2)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:482
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:510
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mResource)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:545
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3_2)
+#: rc.cpp:1110 rc.cpp:1119 rc.cpp:1128 rc.cpp:1110 rc.cpp:1119 rc.cpp:1128
+msgid "The resource name you would like to use on the Jabber network."
 msgstr ""
 
-#. i18n: file: plugins/otr/kopete_otr.kcfg:19
-#. i18n: ectx: label, entry (rbNever), group (Policy)
-#: rc.cpp:152 rc.cpp:152
-msgid "Never encrypt outgoing messages"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:485
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:513
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mResource)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:548
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3_2)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:485
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:513
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mResource)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:548
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3_2)
+#: rc.cpp:1113 rc.cpp:1122 rc.cpp:1131 rc.cpp:1113 rc.cpp:1122 rc.cpp:1131
+msgid ""
+"The resource name you would like to use on the Jabber network.  Jabber "
+"allows you to sign on with the same account from multiple locations with "
+"different resource names, so you may wish to enter 'Home' or 'Work' here, "
+"for example."
 msgstr ""
 
-#. i18n: file: plugins/otr/otrchatui.rc:4
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/nowlistening/nowlisteningchatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/latex/latexchatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/translator/translatorchatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/history/historychatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: protocols/skype/skypechatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/otr/otrchatui.rc:4
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/nowlistening/nowlisteningchatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/latex/latexchatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/translator/translatorchatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: plugins/history/historychatui.rc:5
-#. i18n: ectx: Menu (tools)
-#. i18n: file: protocols/skype/skypechatui.rc:5
-#. i18n: ectx: Menu (tools)
-#: rc.cpp:155 rc.cpp:385 rc.cpp:536 rc.cpp:539 rc.cpp:662 rc.cpp:4348
-#: rc.cpp:155 rc.cpp:385 rc.cpp:536 rc.cpp:539 rc.cpp:662 rc.cpp:4348
-msgid "&Tools"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:488
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3_3)
+#: rc.cpp:1116 rc.cpp:1116
+msgid "R&esource:"
+msgstr "A&dnodd :"
 
-#. i18n: file: plugins/otr/otrchatui.rc:5
-#. i18n: ectx: Menu (otr_menu)
-#: rc.cpp:158 rc.cpp:158
-msgid "OTR Settings"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:551
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_2)
+#: rc.cpp:1134 rc.cpp:1134
+msgid "P&riority:"
+msgstr "B&laenoriaeth:"
 
-#. i18n: file: plugins/otr/privkeypopup.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, PrivKeyPopup)
-#: rc.cpp:161 rc.cpp:161
-msgid "Please Wait"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:584
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, mPriority)
+#: rc.cpp:1137 rc.cpp:1137
+msgid ""
+"<qt>Each resource can have different <b>priority </b> levels. The messages "
+"will be sent to the resource which has the highest priority level.\n"
+"\n"
+"If two resources have the same priority, the messages will be sent to the "
+"one most recently connected.</qt>"
 msgstr ""
 
-#. i18n: file: plugins/otr/privkeypopup.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:164 rc.cpp:164
-msgid "Please wait while generating the private key"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:604
+#. i18n: ectx: property (text), widget (QCheckBox, cbAdjustPriority)
+#: rc.cpp:1142 rc.cpp:1142
+msgid "When absent, adjust priority to:"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, OTRPrefsUI)
-#: rc.cpp:167 rc.cpp:167
-msgid "OTR Plugin Preferences"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:651
+#. i18n: ectx: property (text), widget (QCheckBox, mergeMessages)
+#: rc.cpp:1145 rc.cpp:1145
+msgid "Merge all messages from all resources to one window/tab"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:23
-#. i18n: ectx: attribute (title), widget (QWidget, settings)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:35
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:22
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kopete/kopeteui.rc:32
-#. i18n: ectx: Menu (settings)
-#. i18n: file: plugins/otr/otrprefs.ui:23
-#. i18n: ectx: attribute (title), widget (QWidget, settings)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:35
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:22
-#. i18n: ectx: Menu (settings)
-#. i18n: file: kopete/kopeteui.rc:32
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:170 rc.cpp:6194 rc.cpp:6215 rc.cpp:6296 rc.cpp:170 rc.cpp:6194
-#: rc.cpp:6215 rc.cpp:6296
-msgid "&Settings"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:678
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:1148 rc.cpp:1148
+msgid "Fi&le Transfer"
+msgstr "T&rosglwyddo ffeiliau"
+
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:690
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
+#: rc.cpp:1151 rc.cpp:1151
+msgid "File Transfer Settings"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:35
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:173 rc.cpp:173
-msgid "Private Keys"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:707
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:1154 rc.cpp:1154
+msgid "Pro&xy JID:"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:41
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:728
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:184
+#. i18n: ectx: property (text), widget (QLabel, m_portLabel)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:728
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:184
+#. i18n: ectx: property (text), widget (QLabel, m_portLabel)
+#: rc.cpp:1157 rc.cpp:4181 rc.cpp:1157 rc.cpp:4181
+msgid "Por&t:"
+msgstr "Por&th:"
+
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:750
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:176 rc.cpp:176
-msgid "Account:"
+#: rc.cpp:1160 rc.cpp:1160
+msgid "Public &IP address:"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:61
-#. i18n: ectx: property (text), widget (QPushButton, btGenFingerprint)
-#: rc.cpp:179 rc.cpp:179
-msgid "&Generate"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:766
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1163 rc.cpp:1163
+msgid ""
+"<i><ul><li>The information in the \"public IP address\" and \"port\" fields "
+"applies to all Jabber accounts.</li>\n"
+"<li>You can leave the \"public IP address\" empty if your computer is "
+"directly connected to the internet.</li>\n"
+"<li>A hostname is also valid.</li>\n"
+"<li>Changes to these fields will only take effect the next time you start "
+"Kopete.</li>\n"
+"<li>The \"Proxy JID\" can be configured per account.</li></ul></i>"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:68
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:182 rc.cpp:182
-msgid "Fingerprint:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:799
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:1170 rc.cpp:1170
+msgid "&Jingle"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:78
-#. i18n: ectx: property (text), widget (QLabel, tlFingerprint)
-#: rc.cpp:185 rc.cpp:185
-msgid "No Fingerprint"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:807
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:1173 rc.cpp:1173
+msgid "Network"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:110
-#. i18n: ectx: property (title), widget (QGroupBox, gbPolicy)
-#: rc.cpp:188 rc.cpp:188
-msgid "Default OTR Policy"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:813
+#. i18n: ectx: property (text), widget (QCheckBox, autoDetectIPBox)
+#: rc.cpp:1176 rc.cpp:1176
+msgid "Auto-detect external IP address"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:116
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbAlways)
-#: rc.cpp:191 rc.cpp:191
-msgid "Always encrypt messages"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:822
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1179 rc.cpp:1179
+msgid "First port to use:"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:119
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbAlways)
-#: rc.cpp:194 rc.cpp:194
-msgid "Al&ways"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:836
+#. i18n: ectx: property (toolTip), widget (QSpinBox, firstPortEdit)
+#: rc.cpp:1182 rc.cpp:1182
+msgid ""
+"Set the first incoming port to use for Jingle sessions.\n"
+"One media type uses 2 ports and each new Jingle session will use the next 2 "
+"available ports."
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:132
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbManual)
-#: rc.cpp:200 rc.cpp:200
-msgid "&Manual"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:868
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1189 rc.cpp:1189
+msgid "Microphone to use:"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:142
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbOpportunistic)
-#: rc.cpp:203 rc.cpp:203
-msgid "Encrypt messages automatically if the other side supports OTR"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:882
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1192 rc.cpp:1192
+msgid "Audio output:"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:145
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbOpportunistic)
-#: rc.cpp:206 rc.cpp:206
-msgid "&Opportunistic"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:913
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:1195 rc.cpp:1195
+msgid "&Google Talk"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:152
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbNever)
-#: rc.cpp:209 rc.cpp:209
-msgid "Never encrypt messages"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:919
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_17)
+#: rc.cpp:1198 rc.cpp:1198
+msgid "Google Talk libjingle settings"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:155
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbNever)
-#: rc.cpp:212 rc.cpp:212
-msgid "Ne&ver"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:925
+#. i18n: ectx: property (toolTip), widget (QCheckBox, GoogleTalk)
+#: rc.cpp:1201 rc.cpp:1201
+msgid "This enable Google Talk libjingle voice call"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:179
-#. i18n: ectx: attribute (title), widget (QWidget, fingerprints)
-#: rc.cpp:215 rc.cpp:215
-msgid "K&nown Fingerprints"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:928
+#. i18n: ectx: property (text), widget (QCheckBox, GoogleTalk)
+#: rc.cpp:1204 rc.cpp:1204
+msgid "Enable Google Talk libjingle support (only for GTalk/Gmail accounts)"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:201
-#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
-#: rc.cpp:218 rc.cpp:218
-msgid "Contact ID"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:946
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:642
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:946
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:642
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1207 rc.cpp:2649 rc.cpp:1207 rc.cpp:2649
+msgid "Pri&vacy"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:211
-#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
-#: rc.cpp:224 rc.cpp:224
-msgid "Verified"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:958
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_7)
+#: rc.cpp:1210 rc.cpp:1210
+msgid "General Privacy"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:216
-#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
-#: rc.cpp:227 rc.cpp:227
-msgid "Fingerprint"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:970
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbHideSystemInfo)
+#: rc.cpp:1213 rc.cpp:1213
+msgid ""
+"By default, Kopete gives the other users some info about your system and the "
+"client. Checking this box will hide that information."
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:221
-#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
-#: rc.cpp:230 rc.cpp:230
-msgid "Protocol"
-msgstr "Protocol"
-
-#. i18n: file: plugins/otr/otrprefs.ui:232
-#. i18n: ectx: property (text), widget (QPushButton, btVerify)
-#: rc.cpp:233 rc.cpp:233
-msgid "&Verify Fingerprint"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:973
+#. i18n: ectx: property (text), widget (QCheckBox, cbHideSystemInfo)
+#: rc.cpp:1216 rc.cpp:1216
+msgid "&Hide system and client info"
 msgstr ""
 
-#. i18n: file: plugins/otr/otrprefs.ui:242
-#. i18n: ectx: property (text), widget (QPushButton, btForget)
-#: rc.cpp:236 rc.cpp:236
-msgid "F&orget Fingerprint"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:999
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, notifyGroupBox)
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:999
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, notifyGroupBox)
+#: rc.cpp:1219 rc.cpp:5994 rc.cpp:1219 rc.cpp:5994
+msgid "Notifications"
 msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:239 rc.cpp:239
-msgid "Available Filters"
-msgstr "Hidlau ar Gael"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:86
-#. i18n: ectx: property (text), widget (QPushButton, m_rename)
-#: rc.cpp:248 rc.cpp:248
-msgid "Rename..."
-msgstr "Ail-enwi..."
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:96
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:251 rc.cpp:251
-msgid "Criteria"
-msgstr "Meini prawf"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:123
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:254 rc.cpp:254
-msgid "If the message contains:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1014
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendEvents)
+#: rc.cpp:1222 rc.cpp:1222
+msgid ""
+"Check this box if you always want to send notifications to your contacts."
 msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:150
-#. i18n: ectx: property (text), widget (QCheckBox, m_regexp)
-#: rc.cpp:257 rc.cpp:257
-msgid "Regular expression"
-msgstr "Mynegiad rheolaidd"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:191
-#. i18n: ectx: property (text), widget (QCheckBox, m_case)
-#: rc.cpp:263 rc.cpp:263
-msgid "Case sensitive"
-msgstr "Llythrennau mawr/bach o bwys"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:201
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:266 rc.cpp:266
-msgid "Action"
-msgstr "Gweithred"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:245
-#. i18n: ectx: property (text), widget (QCheckBox, m_setImportance)
-#: rc.cpp:269 rc.cpp:269
-msgid "Set the message importance to:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1017
+#. i18n: ectx: property (text), widget (QCheckBox, cbSendEvents)
+#: rc.cpp:1225 rc.cpp:1225
+msgid "Always send not&ifications"
 msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:262
-#. i18n: ectx: property (text), item, widget (QComboBox, m_importance)
-#: rc.cpp:272 rc.cpp:272
-msgid "Low"
-msgstr "Isel"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:267
-#. i18n: ectx: property (text), item, widget (QComboBox, m_importance)
-#: rc.cpp:275 rc.cpp:275
-msgid "Normal"
-msgstr "Arferol"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:272
-#. i18n: ectx: property (text), item, widget (QComboBox, m_importance)
-#: rc.cpp:278 rc.cpp:278
-msgid "Highlight"
-msgstr "Amlygu"
-
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:315
-#. i18n: ectx: property (text), widget (QCheckBox, m_setBG)
-#: rc.cpp:281 rc.cpp:281
-msgid "Change the background color to:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1062
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendDeliveredEvent)
+#: rc.cpp:1228 rc.cpp:1228
+msgid ""
+"<qt>Check this box to send the <b>Delivered notification</b> to your "
+"contacts : when a message is delivered to Kopete, Kopete can notify your "
+"contact that it has received the message.</qt>"
 msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:373
-#. i18n: ectx: property (text), widget (QCheckBox, m_setFG)
-#: rc.cpp:284 rc.cpp:284
-msgid "Change the foreground color to:"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1065
+#. i18n: ectx: property (text), widget (QCheckBox, cbSendDeliveredEvent)
+#: rc.cpp:1231 rc.cpp:1231
+msgid "Alwa&ys send delivered notifications"
 msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:431
-#. i18n: ectx: property (text), widget (QCheckBox, m_raise)
-#: rc.cpp:287 rc.cpp:287
-msgid "Raise window"
-msgstr "Codi'r Ffenestr"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1078
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendDisplayedEvent)
+#: rc.cpp:1234 rc.cpp:1234
+msgid ""
+"<qt>Check this box to send the <b>Displayed notification</b> to your "
+"contacts : when a message is displayed in Kopete, Kopete can notify your "
+"contact that it has displayed the message.</qt>"
+msgstr ""
 
-#. i18n: file: plugins/highlight/highlightprefsbase.ui:457
-#. i18n: ectx: property (text), widget (QPushButton, m_notifications)
-#: rc.cpp:290 rc.cpp:290
-msgid "Configure Notifications..."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1081
+#. i18n: ectx: property (text), widget (QCheckBox, cbSendDisplayedEvent)
+#: rc.cpp:1237 rc.cpp:1237
+msgid "Al&ways send displayed notifications"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialogbase.ui:34
-#. i18n: ectx: property (whatsThis), widget (K3ListView, aliasList)
-#: rc.cpp:293 rc.cpp:293
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1094
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendComposingEvent)
+#: rc.cpp:1240 rc.cpp:1240
 msgid ""
-"This is the list of custom aliases and the commands that you have already "
-"added"
+"<qt>Check this box to send the <b>Typing notification</b> to your contacts : "
+"when you are composing a message, you might want your contact to know that "
+"you are typing so that he/she knows you are answering.</qt>"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialogbase.ui:50
-#. i18n: ectx: property (text), widget (K3ListView, aliasList)
-#: rc.cpp:296 rc.cpp:296
-msgid "Alias"
-msgstr "Ffugenw"
-
-#. i18n: file: plugins/alias/aliasdialogbase.ui:55
-#. i18n: ectx: property (text), widget (K3ListView, aliasList)
-#: rc.cpp:299 rc.cpp:299
-msgid "Command"
-msgstr "Gorchymyn"
-
-#. i18n: file: plugins/alias/aliasdialogbase.ui:60
-#. i18n: ectx: property (text), widget (K3ListView, aliasList)
-#. i18n: file: plugins/alias/aliasdialog.ui:123
-#. i18n: ectx: property (text), widget (K3ListView, protocolList)
-#. i18n: file: plugins/alias/aliasdialogbase.ui:60
-#. i18n: ectx: property (text), widget (K3ListView, aliasList)
-#. i18n: file: plugins/alias/aliasdialog.ui:123
-#. i18n: ectx: property (text), widget (K3ListView, protocolList)
-#: rc.cpp:302 rc.cpp:352 rc.cpp:302 rc.cpp:352
-msgid "Protocols"
-msgstr "Protocolau"
-
-#. i18n: file: plugins/alias/aliasdialogbase.ui:68
-#. i18n: ectx: property (text), widget (KPushButton, addButton)
-#: rc.cpp:305 rc.cpp:305
-msgid "&Add New Alias..."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1097
+#. i18n: ectx: property (text), widget (QCheckBox, cbSendComposingEvent)
+#: rc.cpp:1243 rc.cpp:1243
+msgid "Always send &typing notifications"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialogbase.ui:75
-#. i18n: ectx: property (text), widget (KPushButton, deleteButton)
-#: rc.cpp:308 rc.cpp:308
-msgid "&Delete Selected"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1107
+#. i18n: ectx: property (text), widget (QCheckBox, cbSendGoneEvent)
+#: rc.cpp:1246 rc.cpp:1246
+msgid "Always send &gone notifications (closing the window)"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialogbase.ui:82
-#. i18n: ectx: property (text), widget (KPushButton, editButton)
-#: rc.cpp:311 rc.cpp:311
-msgid "Edit Alias..."
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1124
+#. i18n: ectx: property (text), widget (KPushButton, privacyListsButton)
+#: rc.cpp:1249 rc.cpp:1249
+msgid "Privacy Lists"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, AliasDialog)
-#: rc.cpp:314 rc.cpp:314
-msgid "Add New Alias"
-msgstr ""
-
-#. i18n: file: plugins/alias/aliasdialog.ui:37
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:317 rc.cpp:317
-msgid "Command:"
-msgstr "Gorchymyn:"
-
-#. i18n: file: plugins/alias/aliasdialog.ui:47
-#. i18n: ectx: property (toolTip), widget (KLineEdit, command)
-#: rc.cpp:320 rc.cpp:320
-msgid ""
-"This is the command that you want to run when you execute this alias. "
-msgstr ""
-
-#. i18n: file: plugins/alias/aliasdialog.ui:54
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, command)
-#: rc.cpp:324 rc.cpp:324
-#, no-c-format
-msgid ""
-"<qt>This is the command that you want to run when you execute this alias.\n"
-"\n"
-"You can use the variables <b>%1, %2 ... %9</b> in your command, and they "
-"will be replaced with the arguments of the alias. The variable <b>%s</b> "
-"will be replaced with all arguments. <b>%n</b> expands to your nickname.\n"
-"\n"
-"Do not include the '/' in the command (if you do it will be stripped off "
-"anyway).</qt>"
+#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1131
+#. i18n: ectx: property (text), widget (QCheckBox, oldEncrypted)
+#: rc.cpp:1252 rc.cpp:1252
+msgid "Use old inline PGP format for signed and encrypted messages"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialog.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:88
-#. i18n: ectx: property (text), widget (QLabel, aliasLabel)
-#. i18n: file: plugins/alias/aliasdialog.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:88
-#. i18n: ectx: property (text), widget (QLabel, aliasLabel)
-#: rc.cpp:331 rc.cpp:2419 rc.cpp:331 rc.cpp:2419
-msgid "Alias:"
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:16
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:140
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3a)
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:16
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:140
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3a)
+#: rc.cpp:1255 rc.cpp:3294 rc.cpp:1255 rc.cpp:3294
+msgid "Nick:"
 msgstr "Ffugenw :"
 
-#. i18n: file: plugins/alias/aliasdialog.ui:71
-#. i18n: ectx: property (toolTip), widget (KLineEdit, alias)
-#: rc.cpp:334 rc.cpp:334
-msgid ""
-"This is the alias you are adding (what you will type after the command "
-"identifier, '/')."
+#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:70
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1270 rc.cpp:1270
+msgid "Room:"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialog.ui:74
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, alias)
-#: rc.cpp:337 rc.cpp:337
-msgid ""
-"This is the alias you are adding (what you will type after the command "
-"identifier, '/'). Do not include the '/' (it will be stripped off if you do "
-"anyway)."
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, dlgAddContact)
+#: rc.cpp:1273 rc.cpp:1273
+msgid "Add Contacts"
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialog.ui:81
-#. i18n: ectx: property (text), widget (KPushButton, addButton)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:235
-#. i18n: ectx: property (text), widget (QPushButton, m_saveButton)
-#. i18n: file: plugins/alias/aliasdialog.ui:81
-#. i18n: ectx: property (text), widget (KPushButton, addButton)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:235
-#. i18n: ectx: property (text), widget (QPushButton, m_saveButton)
-#: rc.cpp:340 rc.cpp:1418 rc.cpp:340 rc.cpp:1418
-msgid "&Save"
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:33
+#. i18n: ectx: property (toolTip), widget (QLabel, lblID)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:52
+#. i18n: ectx: property (toolTip), widget (KLineEdit, addID)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:33
+#. i18n: ectx: property (toolTip), widget (QLabel, lblID)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:52
+#. i18n: ectx: property (toolTip), widget (KLineEdit, addID)
+#: rc.cpp:1276 rc.cpp:1285 rc.cpp:1276 rc.cpp:1285
+msgid "The Jabber ID for the account you would like to add."
 msgstr ""
 
-#. i18n: file: plugins/alias/aliasdialog.ui:101
-#. i18n: ectx: property (toolTip), widget (K3ListView, protocolList)
-#. i18n: file: plugins/alias/aliasdialog.ui:104
-#. i18n: ectx: property (whatsThis), widget (K3ListView, protocolList)
-#. i18n: file: plugins/alias/aliasdialog.ui:101
-#. i18n: ectx: property (toolTip), widget (K3ListView, protocolList)
-#. i18n: file: plugins/alias/aliasdialog.ui:104
-#. i18n: ectx: property (whatsThis), widget (K3ListView, protocolList)
-#: rc.cpp:346 rc.cpp:349 rc.cpp:346 rc.cpp:349
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:36
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblID)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:55
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, addID)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:36
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblID)
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:55
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, addID)
+#: rc.cpp:1279 rc.cpp:1288 rc.cpp:1279 rc.cpp:1288
 msgid ""
-"If you want this alias to only be active for certain protocols, select those "
-"protocols here."
-msgstr ""
-
-#. i18n: file: plugins/alias/aliasdialog.ui:134
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:355 rc.cpp:355
-msgid "For protocols:"
+"The Jabber ID for the account you would like to add.  Note that this must "
+"include the username and the domain (like an E-mail address), as there are "
+"many Jabber servers."
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:11
-#. i18n: ectx: label, entry (Header), group (Now Listening Plugin)
-#: rc.cpp:358 rc.cpp:358
-msgid "Header of the message advertised."
+#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:64
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1291 rc.cpp:1291
+msgid "<i>(for example: joe@jabber.org)</i>"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:16
-#. i18n: ectx: label, entry (PerTrack), group (Now Listening Plugin)
-#: rc.cpp:361 rc.cpp:361
-msgid "Core of the message advertised."
+#. i18n: file: protocols/jabber/ui/dlgcommand.ui:19
+#. i18n: ectx: property (windowTitle), widget (QDialog, dlgRegister)
+#: rc.cpp:1294 rc.cpp:1294
+msgid "Register with Jabber Service"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:21
-#. i18n: ectx: label, entry (Conjunction), group (Now Listening Plugin)
-#: rc.cpp:364 rc.cpp:364
-msgid "Conjunction when multiple track are playing."
+#. i18n: file: protocols/jabber/ui/dlgcommand.ui:43
+#. i18n: ectx: property (title), widget (QGroupBox, grpForm)
+#: rc.cpp:1297 rc.cpp:1297
+msgid "Registration Form"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:26
-#. i18n: ectx: label, entry (ExplicitAdvertising), group (Now Listening Plugin)
-#: rc.cpp:367 rc.cpp:367
-msgid ""
-"Show explicitly the current music listened via a menu or /media command."
+#. i18n: file: protocols/jabber/ui/dlgcommand.ui:132
+#. i18n: ectx: property (text), widget (QPushButton, btnRegister)
+#: rc.cpp:1303 rc.cpp:1303
+msgid "&Execute"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:31
-#. i18n: ectx: label, entry (ChatAdvertising), group (Now Listening Plugin)
-#: rc.cpp:370 rc.cpp:370
-msgid "Show the current music listened in chat window."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:29
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:29
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1309 rc.cpp:6401 rc.cpp:6419
+#: kopete/config/status/statusconfig.cpp:47
+#: kopete/config/behavior/behaviorconfig.cpp:61 rc.cpp:1309 rc.cpp:6401
+#: rc.cpp:6419
+msgid "&General"
+msgstr "&Cyffredinol"
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:36
-#. i18n: ectx: label, entry (StatusAdvertising), group (Now Listening Plugin)
-#: rc.cpp:373 rc.cpp:373
-msgid "Show the current music listened in place of your status message."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:35
+#. i18n: ectx: property (text), widget (QLabel, lblNick)
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:40
+#. i18n: ectx: property (text), widget (QLabel, lblNickName)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:121
+#. i18n: ectx: property (text), widget (QLabel, lblNick)
+#. i18n: file: kopete/identity/identitygeneral.ui:146
+#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:35
+#. i18n: ectx: property (text), widget (QLabel, lblNick)
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:40
+#. i18n: ectx: property (text), widget (QLabel, lblNickName)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:121
+#. i18n: ectx: property (text), widget (QLabel, lblNick)
+#. i18n: file: kopete/identity/identitygeneral.ui:146
+#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
+#: rc.cpp:1312 rc.cpp:2703 rc.cpp:2864 rc.cpp:6338 rc.cpp:1312 rc.cpp:2703
+#: rc.cpp:2864 rc.cpp:6338
+msgid "Nickname:"
+msgstr "Ffugenw:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:41
-#. i18n: ectx: label, entry (AppendStatusAdvertising), group (Now Listening Plugin)
-#: rc.cpp:376 rc.cpp:376
-msgid "Show the current music listened appended to your status message."
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:59
+#. i18n: ectx: property (text), widget (QLabel, lblJID)
+#: rc.cpp:1318 rc.cpp:1318
+msgid "Jabber ID:"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:46
-#. i18n: ectx: label, entry (UseSpecifiedMediaPlayer), group (Now Listening Plugin)
-#: rc.cpp:379 rc.cpp:379
-msgid "Use the specified media player."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:110
+#. i18n: ectx: property (text), widget (QLabel, lblBirthday)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:490
+#. i18n: ectx: property (text), widget (QLabel, birthdayLabel)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:110
+#. i18n: ectx: property (text), widget (QLabel, lblBirthday)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:490
+#. i18n: ectx: property (text), widget (QLabel, birthdayLabel)
+#: rc.cpp:1324 rc.cpp:3851 rc.cpp:1324 rc.cpp:3851
+msgid "Birthday:"
+msgstr "Penblwydd :"
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:51
-#. i18n: ectx: label, entry (SelectedMediaPlayer), group (Now Listening Plugin)
-#: rc.cpp:382 rc.cpp:382
-msgid "Selected Media Player for source of listening advertising."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:127
+#. i18n: ectx: property (text), widget (QLabel, lblTimezone)
+#: rc.cpp:1327 rc.cpp:1327
+msgid "Timezone:"
+msgstr "Cylchfa amser:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:12
-#: rc.cpp:384 rc.cpp:384
-msgid "Now listening to: "
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:212
+#. i18n: ectx: property (text), widget (QPushButton, btnSelectPhoto)
+#: rc.cpp:1333 rc.cpp:1333
+msgid "&Select Photo..."
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:17
-#: rc.cpp:386 rc.cpp:386
-msgid "%track( by %artist)( on %album)"
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:219
+#. i18n: ectx: property (text), widget (QPushButton, btnClearPhoto)
+#: rc.cpp:1336 rc.cpp:1336
+msgid "Clear Pho&to"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:156
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_Conjunction)
-#: rc.cpp:421 rc.cpp:421
-msgid ", and "
-msgstr ", a "
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:246
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1339 rc.cpp:1339
+msgid "&Home Address"
+msgstr "Cyfeiriad &Cartref"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, NowListeningPrefsUI)
-#: rc.cpp:388 rc.cpp:388
-msgid "Now Listening"
-msgstr "Rwan yn Gwrando ar"
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:252
+#. i18n: ectx: property (text), widget (QLabel, lblStreet)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:352
+#. i18n: ectx: property (text), widget (QLabel, lblStreet_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:369
+#. i18n: ectx: property (text), widget (QLabel, lblStreet)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:252
+#. i18n: ectx: property (text), widget (QLabel, lblStreet)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:352
+#. i18n: ectx: property (text), widget (QLabel, lblStreet_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:369
+#. i18n: ectx: property (text), widget (QLabel, lblStreet)
+#: rc.cpp:1342 rc.cpp:1363 rc.cpp:2897 rc.cpp:1342 rc.cpp:1363 rc.cpp:2897
+msgid "Street:"
+msgstr "Stryd:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:25
-#. i18n: ectx: property (text), widget (QLabel, advertiseNewMediaToBuddiesLabel)
-#: rc.cpp:391 rc.cpp:391
-msgid "<b>Share Your Musical Taste</b>"
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:265
+#. i18n: ectx: property (text), widget (QLabel, lblPOBox)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:365
+#. i18n: ectx: property (text), widget (QLabel, lblPOBox_2)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:265
+#. i18n: ectx: property (text), widget (QLabel, lblPOBox)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:365
+#. i18n: ectx: property (text), widget (QLabel, lblPOBox_2)
+#: rc.cpp:1345 rc.cpp:1366 rc.cpp:1345 rc.cpp:1366
+msgid "PO box:"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:57
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:394 rc.cpp:394
-msgid "Messa&ge"
-msgstr "Neg&es"
-
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:77
-#. i18n: ectx: property (text), widget (QLabel, useThisMessageLabel)
-#: rc.cpp:397 rc.cpp:397
-msgid "Use this message when advertising:"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:275
+#. i18n: ectx: property (text), widget (QLabel, lblCity)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:375
+#. i18n: ectx: property (text), widget (QLabel, lblCity_2)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:68
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:273
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:406
+#. i18n: ectx: property (text), widget (QLabel, lblCity)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:598
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_3)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:147
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2a)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:128
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:275
+#. i18n: ectx: property (text), widget (QLabel, lblCity)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:375
+#. i18n: ectx: property (text), widget (QLabel, lblCity_2)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:68
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:273
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:406
+#. i18n: ectx: property (text), widget (QLabel, lblCity)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:598
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_3)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:147
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2a)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:128
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1348 rc.cpp:1369 rc.cpp:2259 rc.cpp:2444 rc.cpp:2909 rc.cpp:3255
+#: rc.cpp:3297 rc.cpp:3884 rc.cpp:1348 rc.cpp:1369 rc.cpp:2259 rc.cpp:2444
+#: rc.cpp:2909 rc.cpp:3255 rc.cpp:3297 rc.cpp:3884
+msgid "City:"
+msgstr "Dinas:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:85
-#. i18n: ectx: property (text), widget (QLabel, helperLabel)
-#: rc.cpp:401 rc.cpp:401
-#, no-c-format
-msgid ""
-"%track, %artist, %album, %player will be substituted if known.\n"
-"Expressions in brackets depend on a substitution being made."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:285
+#. i18n: ectx: property (text), widget (QLabel, lblState)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:385
+#. i18n: ectx: property (text), widget (QLabel, lblState_2)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:285
+#. i18n: ectx: property (text), widget (QLabel, lblState)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:385
+#. i18n: ectx: property (text), widget (QLabel, lblState_2)
+#: rc.cpp:1351 rc.cpp:1372 rc.cpp:1351 rc.cpp:1372
+msgid "Postal code:"
+msgstr "Côd post:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:103
-#. i18n: ectx: property (text), widget (QLabel, m_headerLabel)
-#: rc.cpp:405 rc.cpp:405
-msgid "Start with:"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:295
+#. i18n: ectx: property (text), widget (QLabel, lblCountry)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:395
+#. i18n: ectx: property (text), widget (QLabel, lblCountry_2)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:137
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:307
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:386
+#. i18n: ectx: property (text), widget (QLabel, lblCountry)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:295
+#. i18n: ectx: property (text), widget (QLabel, lblCountry)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:395
+#. i18n: ectx: property (text), widget (QLabel, lblCountry_2)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:137
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:307
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:386
+#. i18n: ectx: property (text), widget (QLabel, lblCountry)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#: rc.cpp:1354 rc.cpp:1375 rc.cpp:2268 rc.cpp:2450 rc.cpp:2903 rc.cpp:3875
+#: rc.cpp:1354 rc.cpp:1375 rc.cpp:2268 rc.cpp:2450 rc.cpp:2903 rc.cpp:3875
+msgid "Country:"
+msgstr "Gwlad:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:116
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_Header)
-#: rc.cpp:408 rc.cpp:408
-msgid "Now Listening To: "
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:311
+#. i18n: ectx: property (text), widget (QLabel, lblEmail)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:405
+#. i18n: ectx: property (text), widget (QLabel, lblEmail_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:662
+#. i18n: ectx: property (text), widget (QLabel, lblEmail)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:134
+#. i18n: ectx: property (text), widget (QLabel, mLblEmail)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:311
+#. i18n: ectx: property (text), widget (QLabel, lblEmail)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:405
+#. i18n: ectx: property (text), widget (QLabel, lblEmail_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:662
+#. i18n: ectx: property (text), widget (QLabel, lblEmail)
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:134
+#. i18n: ectx: property (text), widget (QLabel, mLblEmail)
+#: rc.cpp:1357 rc.cpp:1378 rc.cpp:2975 rc.cpp:6392 rc.cpp:1357 rc.cpp:1378
+#: rc.cpp:2975 rc.cpp:6392
+msgid "Email:"
+msgstr "Ebost:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:123
-#. i18n: ectx: property (text), widget (QLabel, m_perTrackLabel)
-#: rc.cpp:411 rc.cpp:411
-msgid "For each track:"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:346
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1360 rc.cpp:1360
+msgid "&Work Address"
+msgstr "Cyfeiriad &Gwaith"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:136
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_PerTrack)
-#: rc.cpp:415 rc.cpp:415
-#, no-c-format
-msgid "%track (by %artist)(on %album)"
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:440
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1381 rc.cpp:1381
+msgid "Wor&k Information"
 msgstr ""
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:143
-#. i18n: ectx: property (text), widget (QLabel, m_conjunctionLabel)
-#: rc.cpp:418 rc.cpp:418
-msgid "Conjunction (if >1 track):"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:446
+#. i18n: ectx: property (text), widget (QLabel, lblCompany)
+#: rc.cpp:1384 rc.cpp:1384
+msgid "Company:"
+msgstr "Cwmni:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:192
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:456
+#. i18n: ectx: property (text), widget (QLabel, lblDepartment)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:194
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:456
+#. i18n: ectx: property (text), widget (QLabel, lblDepartment)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:194
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:1387 rc.cpp:2277 rc.cpp:1387 rc.cpp:2277
+msgid "Department:"
+msgstr "Adran:"
+
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:466
+#. i18n: ectx: property (text), widget (QLabel, lblPosition)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:211
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:466
+#. i18n: ectx: property (text), widget (QLabel, lblPosition)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:211
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:1390 rc.cpp:2280 rc.cpp:1390 rc.cpp:2280
+msgid "Position:"
+msgstr "Lleoliad:"
+
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:476
+#. i18n: ectx: property (text), widget (QLabel, lblRole)
+#: rc.cpp:1393 rc.cpp:1393
+msgid "Role:"
+msgstr "Swyddogaeth:"
+
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:487
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:424 rc.cpp:424
-msgid "A&dvertising Mode"
-msgstr ""
+#: rc.cpp:1396 rc.cpp:1396
+msgid "Phone &Numbers"
+msgstr "&Rhifau ffôn"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:206
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExplicitAdvertising)
-#: rc.cpp:427 rc.cpp:427
-msgid ""
-"Explicit &via \"Tools->Send Media Info\",\n"
-"or by typing \"/media\" in the chat\n"
-"window edit area."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:493
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:95
+#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:462
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:493
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:95
+#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:462
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
+#: rc.cpp:1399 rc.cpp:1808 rc.cpp:2915 rc.cpp:1399 rc.cpp:1808 rc.cpp:2915
+msgid "Home:"
+msgstr "Cartref :"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:213
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ChatAdvertising)
-#: rc.cpp:432 rc.cpp:432
-msgid "&Show in chat window (automatic)"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:503
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneWork)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:81
+#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:503
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneWork)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:81
+#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
+#: rc.cpp:1402 rc.cpp:1805 rc.cpp:1402 rc.cpp:1805
+msgid "Work:"
+msgstr "Gwaith :"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:221
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_StatusAdvertising)
-#: rc.cpp:435 rc.cpp:435
-msgid ""
-"Show &the music you are listening to \n"
-"in place of your status message."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:513
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneFax)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:265
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:513
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneFax)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:265
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#: rc.cpp:1405 rc.cpp:2289 rc.cpp:1405 rc.cpp:2289
+msgid "Fax:"
+msgstr "Ffacs:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:228
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_AppendStatusAdvertising)
-#: rc.cpp:439 rc.cpp:439
-msgid "Appe&nd to your status message"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:523
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:469
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:523
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:469
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
+#: rc.cpp:1408 rc.cpp:2918 rc.cpp:1408 rc.cpp:2918
+msgid "Cell:"
+msgstr "Cell:"
 
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:260
+#. i18n: file: protocols/jabber/ui/dlgvcard.ui:534
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:442 rc.cpp:442
-msgid "Media Pla&yer"
-msgstr "Chwar&aewr Cyfryngau"
-
-#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:280
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseSpecifiedMediaPlayer)
-#: rc.cpp:445 rc.cpp:445
-msgid "Use &specified media player"
+#: rc.cpp:1411 rc.cpp:1411
+msgid "A&bout"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, URLPicPreviewPrefsUI)
-#: rc.cpp:448 rc.cpp:448
-msgid "Picture Preview Preferences"
+#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, DlgJabberChooseServer)
+#: rc.cpp:1414 rc.cpp:1414
+msgid "Choose Server - Jabber"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:37
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
-#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, previewButton)
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:37
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
-#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:52
-#. i18n: ectx: property (text), widget (QPushButton, previewButton)
-#: rc.cpp:451 rc.cpp:5971 rc.cpp:451 rc.cpp:5971
-msgid "Preview"
-msgstr ""
-
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:44
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, restrictPreviews)
-#: rc.cpp:454 rc.cpp:454
-msgid ""
-"If checked, only the selected number of pictures are downloaded and "
-"displayed as previews.\n"
-"Otherwise, an unlimited number of previews are generated."
-msgstr ""
-
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:47
-#. i18n: ectx: property (text), widget (QCheckBox, restrictPreviews)
-#: rc.cpp:458 rc.cpp:458
-msgid "&Restrict number of previews:"
-msgstr ""
-
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:57
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, previewAmount)
-#: rc.cpp:461 rc.cpp:461
-msgid "The maximum number of pictures to download and preview."
-msgstr ""
-
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:98
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox2)
-#: rc.cpp:464 rc.cpp:464
-msgid "Scaling"
-msgstr ""
-
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:111
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, enableScaling)
-#: rc.cpp:467 rc.cpp:467
-msgid ""
-"If checked, preview images get scaled down to the width specified.\n"
-"Otherwise, the images are not scaled at all and appear in their original "
-"size."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:30
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:30
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1423 rc.cpp:2397 rc.cpp:1423 rc.cpp:2397
+msgid "Current password:"
+msgstr "Cyfrinair cyfredol:"
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:114
-#. i18n: ectx: property (text), widget (QCheckBox, enableScaling)
-#: rc.cpp:471 rc.cpp:471
-msgid "Scale &to:"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:29
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:50
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:70
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:29
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:50
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:70
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1426 rc.cpp:1429 rc.cpp:2400 rc.cpp:2403 rc.cpp:1426 rc.cpp:1429
+#: rc.cpp:2400 rc.cpp:2403
+msgid "New password:"
+msgstr "Cyfrinair newydd:"
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:124
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, previewScaleWidth)
-#: rc.cpp:474 rc.cpp:474
+#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:61
+#. i18n: ectx: property (text), widget (QLabel, lblStatus)
+#: rc.cpp:1432 rc.cpp:1432
 msgid ""
-"The width to which images should be scaled down. Smaller images will appear "
-"in their original size."
+"Please enter your current password first\n"
+"and then your new password twice."
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:127
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, previewScaleWidth)
-#: rc.cpp:477 rc.cpp:477
-msgid " pixel"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgsearch.ui:38
+#. i18n: ectx: property (title), widget (QGroupBox, dynamicForm)
+#: rc.cpp:1436 rc.cpp:1436
+msgid "Search For"
+msgstr "Chwilio am:"
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:165
-#. i18n: ectx: property (title), widget (Q3GroupBox, linkPreviewGroup)
-#: rc.cpp:480 rc.cpp:480
-msgid "Link Preview"
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, DlgJabberRegisterAccount)
+#: rc.cpp:1439 rc.cpp:1439
+msgid "Register Account - Jabber"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:173
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, enableLinkPreview)
-#: rc.cpp:483 rc.cpp:483
-msgid "Creates a preview picture of the link."
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:43
+#. i18n: ectx: property (text), widget (QLabel, lblJID)
+#: rc.cpp:1442 rc.cpp:1442
+msgid "Desired Jabber &ID:"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:176
-#. i18n: ectx: property (text), widget (QCheckBox, enableLinkPreview)
-#: rc.cpp:486 rc.cpp:486
-msgid "Enable lin&k preview"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:93
+#. i18n: ectx: property (text), widget (KPushButton, btnChooseServer)
+#: rc.cpp:1445 rc.cpp:1445
+msgid "C&hoose..."
+msgstr "&Dewis..."
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:203
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:489 rc.cpp:489
-msgid "Abort creating previe&w after"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:102
+#. i18n: ectx: property (text), widget (QLabel, lblPassword)
+#: rc.cpp:1448 rc.cpp:1448
+msgid "Pass&word:"
+msgstr "Cyf&rinair"
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:220
-#. i18n: ectx: property (whatsThis), widget (KIntNumInput, timeoutLinkPreview)
-#: rc.cpp:492 rc.cpp:492
-msgid ""
-"After the specified number of seconds the creation of the preview is aborted "
-"automatically.\n"
-"Use 0 seconds to never abort the creation."
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:163
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#: rc.cpp:1460 rc.cpp:1460
+msgid "&Port:"
+msgstr "&Porth:"
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:226
-#. i18n: ectx: property (suffix), widget (KIntNumInput, timeoutLinkPreview)
-#: rc.cpp:496 rc.cpp:496
-msgid " seconds"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:176
+#. i18n: ectx: property (text), widget (QLabel, lblPasswordVerify)
+#: rc.cpp:1463 rc.cpp:1463
+msgid "&Repeat password:"
+msgstr "&Ailadrodd cyfrinair:"
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:7
-#. i18n: ectx: label, entry (PreviewAmount), group (URLPicPreview Plugin)
-#: rc.cpp:499 rc.cpp:499
-msgid "Maximum number of Previews"
+#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:209
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#: rc.cpp:1466 rc.cpp:1466
+msgid "Jabber &server:"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:11
-#. i18n: ectx: label, entry (Scaling), group (URLPicPreview Plugin)
-#: rc.cpp:502 rc.cpp:502
-msgid "Should the image be scaled"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, PrivacyRule)
+#: rc.cpp:1469 rc.cpp:1469
+msgid "Edit Privacy Rule"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:15
-#. i18n: ectx: label, entry (PreviewRestriction), group (URLPicPreview Plugin)
-#: rc.cpp:505 rc.cpp:505
-msgid "Should the number of previews be restricted?"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1472 rc.cpp:1472
+msgid "Then:"
 msgstr ""
 
-#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:19
-#. i18n: ectx: label, entry (PreviewScaleWidth), group (URLPicPreview Plugin)
-#: rc.cpp:508 rc.cpp:508
-msgid "Scale images to the width"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:79
+#. i18n: ectx: property (text), widget (QCheckBox, ck_messages)
+#: rc.cpp:1475 rc.cpp:1475
+msgid "Messages"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexprefsbase.ui:21
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:511 rc.cpp:511
-msgid ""
-"The KopeteTeX plugin allows Kopete to render LaTeX formulas in the chat "
-"window. The sender must enclose the formula between two pairs of $ signs. "
-"ie: $$formula$$\n"
-"This plugin requires that the ImageMagick convert program be installed in "
-"order to work."
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, ck_queries)
+#: rc.cpp:1478 rc.cpp:1478
+msgid "Queries"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexprefsbase.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:515 rc.cpp:515
-msgid "Options"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:93
+#. i18n: ectx: property (text), widget (QCheckBox, ck_presenceOut)
+#: rc.cpp:1481 rc.cpp:1481
+msgid "Outgoing presence"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexprefsbase.ui:41
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:518 rc.cpp:518
-msgid "LaTeX include file:"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, ck_presenceIn)
+#: rc.cpp:1484 rc.cpp:1484
+msgid "Incoming presence"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexprefsbase.ui:55
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:521 rc.cpp:521
-msgid "Rendering resolution (DPI):"
+#. i18n: file: protocols/jabber/ui/privacyrule.ui:147
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1505 rc.cpp:1505
+msgid "If:"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexprefsbase.ui:65
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:524 rc.cpp:524
-msgid "x"
-msgstr "x"
-
-#. i18n: file: plugins/latex/latexconfig.kcfg:11
-#. i18n: ectx: label, entry (HorizontalDPI), group (Latex Plugin)
-#: rc.cpp:527 rc.cpp:527
-msgid "Horizontal Rendering Resolution (DPI)."
+#. i18n: file: protocols/jabber/ui/privacy.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, gb_settings)
+#: rc.cpp:1508 rc.cpp:1508
+msgid "Settings"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexconfig.kcfg:15
-#. i18n: ectx: label, entry (VerticalDPI), group (Latex Plugin)
-#: rc.cpp:530 rc.cpp:530
-msgid "Vertical Rendering Resolution (DPI)."
+#. i18n: file: protocols/jabber/ui/privacy.ui:89
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1511 rc.cpp:1511
+msgid "Default list (all sessions):"
 msgstr ""
 
-#. i18n: file: plugins/latex/latexconfig.kcfg:19
-#. i18n: ectx: label, entry (LatexIncludeFile), group (Latex Plugin)
-#: rc.cpp:533 rc.cpp:533
-msgid "Latex Include File."
+#. i18n: file: protocols/jabber/ui/privacy.ui:96
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1514 rc.cpp:1514
+msgid "Active list (current session):"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:10
-#. i18n: ectx: label, entry (DefaultLanguage), group (Translator plugin)
-#: rc.cpp:542 rc.cpp:542
-msgid "Default native language"
+#. i18n: file: protocols/jabber/ui/privacy.ui:113
+#. i18n: ectx: property (title), widget (QGroupBox, gb_listSettings)
+#: rc.cpp:1517 rc.cpp:1517
+msgid "List Editor"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:15
-#. i18n: ectx: label, entry (Service), group (Translator plugin)
-#: rc.cpp:545 rc.cpp:545
-msgid "Translation service"
+#. i18n: file: protocols/jabber/ui/privacy.ui:151
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1520 rc.cpp:1520
+msgid "List:"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:20
-#. i18n: ectx: label, entry (IncomingDontTranslate), group (Translator plugin)
-#: rc.cpp:548 rc.cpp:548
-msgid "Do not translate incoming messages"
+#. i18n: file: protocols/jabber/ui/privacy.ui:178
+#. i18n: ectx: property (text), widget (KPushButton, pb_newList)
+#: rc.cpp:1523 rc.cpp:1523
+msgid "New List..."
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:25
-#. i18n: ectx: label, entry (IncomingShowOriginal), group (Translator plugin)
-#: rc.cpp:551 rc.cpp:551
-msgid "Show the original incoming message"
+#. i18n: file: protocols/jabber/ui/privacy.ui:185
+#. i18n: ectx: property (text), widget (KPushButton, pb_deleteList)
+#: rc.cpp:1526 rc.cpp:1526
+msgid "Delete List"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:30
-#. i18n: ectx: label, entry (IncomingTranslate), group (Translator plugin)
-#: rc.cpp:554 rc.cpp:554
-msgid "Translate incoming message directly"
+#. i18n: file: protocols/jabber/ui/privacy.ui:194
+#. i18n: ectx: property (text), widget (QCheckBox, ck_autoActivate)
+#: rc.cpp:1529 rc.cpp:1529
+msgid "Automatically activate this list on connect"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:35
-#. i18n: ectx: label, entry (OutgoingDontTranslate), group (Translator plugin)
-#: rc.cpp:557 rc.cpp:557
-msgid "Do not translate outgoing messages"
+#. i18n: file: protocols/jabber/ui/privacy.ui:201
+#. i18n: ectx: property (title), widget (QGroupBox, gb_rules)
+#: rc.cpp:1532 rc.cpp:1532
+msgid "Rules"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:40
-#. i18n: ectx: label, entry (OutgoingShowOriginal), group (Translator plugin)
-#: rc.cpp:560 rc.cpp:560
-msgid "Show the original outgoing message"
-msgstr ""
+#. i18n: file: protocols/jabber/ui/privacy.ui:256
+#. i18n: ectx: property (text), widget (KPushButton, pb_up)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:96
+#. i18n: ectx: property (text), widget (QPushButton, upEmailButton)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, buttonUp)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:126
+#. i18n: ectx: property (text), widget (QPushButton, upButton)
+#. i18n: file: protocols/jabber/ui/privacy.ui:256
+#. i18n: ectx: property (text), widget (KPushButton, pb_up)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:96
+#. i18n: ectx: property (text), widget (QPushButton, upEmailButton)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, buttonUp)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:126
+#. i18n: ectx: property (text), widget (QPushButton, upButton)
+#: rc.cpp:1541 rc.cpp:2376 rc.cpp:2459 rc.cpp:4169 rc.cpp:1541 rc.cpp:2376
+#: rc.cpp:2459 rc.cpp:4169
+msgid "Up"
+msgstr "I fyny"
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:45
-#. i18n: ectx: label, entry (OutgoingTranslate), group (Translator plugin)
-#: rc.cpp:563 rc.cpp:563
-msgid "Translate outgoing message directly"
+#. i18n: file: protocols/jabber/ui/privacy.ui:263
+#. i18n: ectx: property (text), widget (KPushButton, pb_down)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:103
+#. i18n: ectx: property (text), widget (QPushButton, downEmailButton)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, buttonDown)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:110
+#. i18n: ectx: property (text), widget (QPushButton, downButton)
+#. i18n: file: protocols/jabber/ui/privacy.ui:263
+#. i18n: ectx: property (text), widget (KPushButton, pb_down)
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:103
+#. i18n: ectx: property (text), widget (QPushButton, downEmailButton)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, buttonDown)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:110
+#. i18n: ectx: property (text), widget (QPushButton, downButton)
+#: rc.cpp:1544 rc.cpp:2379 rc.cpp:2462 rc.cpp:4160 rc.cpp:1544 rc.cpp:2379
+#: rc.cpp:2462 rc.cpp:4160
+msgid "Down"
+msgstr "I Lawr"
+
+#. i18n: file: protocols/jabber/ui/privacy.ui:290
+#. i18n: ectx: property (text), widget (KPushButton, pb_apply)
+#: rc.cpp:1550 rc.cpp:1550
+msgid "Apply"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorconfig.kcfg:50
-#. i18n: ectx: label, entry (OutgoingAsk), group (Translator plugin)
-#: rc.cpp:566 rc.cpp:566
-msgid "Show dialog before sending message"
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, BonjourAccountPreferences)
+#: rc.cpp:1553 rc.cpp:1553
+msgid "Account Preferences - Bonjour"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:71
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#: rc.cpp:569 rc.cpp:569
-msgid "Translation service:"
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:84
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_username)
+#: rc.cpp:1565 rc.cpp:1565
+msgid "kde-devel"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:78
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:572 rc.cpp:572
-msgid "Default native language:"
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:98
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_firstName)
+#: rc.cpp:1571 rc.cpp:1571
+msgid "KDE"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:100
-#. i18n: ectx: property (title), widget (QGroupBox, IncomingMessages)
-#: rc.cpp:575 rc.cpp:575
-msgid "Incoming Messages"
-msgstr "Negeseuon newydd Gyraedd"
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:105
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:25
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:105
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:25
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
+#: rc.cpp:1574 rc.cpp:1793 rc.cpp:1574 rc.cpp:1793
+msgid "Email address:"
+msgstr "Cyfeiriad Ebost:"
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:121
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingDontTranslate)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:172
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingDontTranslate)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:121
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingDontTranslate)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:172
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingDontTranslate)
-#: rc.cpp:578 rc.cpp:590 rc.cpp:578 rc.cpp:590
-msgid "Do not translate"
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:112
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_emailAddress)
+#: rc.cpp:1577 rc.cpp:1577
+msgid "kde@example.com"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:131
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingShowOriginal)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:182
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingShowOriginal)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:131
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingShowOriginal)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:182
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingShowOriginal)
-#: rc.cpp:581 rc.cpp:593 rc.cpp:581 rc.cpp:593
-msgid "Show the original message"
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:126
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_lastName)
+#: rc.cpp:1583 kopete/main.cpp:38 kopete/main.cpp:43 kopete/main.cpp:44
+#: kopete/main.cpp:54 kopete/main.cpp:56 rc.cpp:1583
+msgid "Developer"
+msgstr "Datblygwr"
+
+#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:163
+#. i18n: ectx: property (text), widget (QLabel, textLabel12)
+#: rc.cpp:1589 rc.cpp:1589
+msgid ""
+"The Bonjour protocol needs you to at least specify a name. The name can be "
+"of form 'Full Name@Hostname'"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:141
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingTranslate)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:192
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingTranslate)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:141
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingTranslate)
-#. i18n: file: plugins/translator/translatorprefsbase.ui:192
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingTranslate)
-#: rc.cpp:584 rc.cpp:596 rc.cpp:584 rc.cpp:596
-msgid "Translate directly"
+#. i18n: file: protocols/bonjour/bonjouraddui.ui:33
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1592 rc.cpp:1592
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">The Bonjour "
+"protocol does not allow you to add contacts. </p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">Contacts "
+"will appear as they come online.</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">If you "
+"expect to see a contact, but they are not appearing</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">1) Please "
+"ensure that your local mDNS server (avahi-daemon) is running properly.</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">2) Run "
+"\"<span style=\" font-style:italic;\">avahi-browse _presence._tcp -"
+"t\"</span> in konsole and ensure you see the contact there.</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">3) Ensure "
+"that ports 5353/UDP and 5298/TCP are open in your firewall</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:151
-#. i18n: ectx: property (title), widget (QGroupBox, OutgoingTranslate)
-#: rc.cpp:587 rc.cpp:587
-msgid "Outgoing Messages"
-msgstr "Negeseuon i fynd"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, WPEditAccountBase)
+#: rc.cpp:1604 rc.cpp:1604
+msgid "Account Preferences - WinPopup"
+msgstr ""
 
-#. i18n: file: plugins/translator/translatorprefsbase.ui:199
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingAsk)
-#: rc.cpp:599 rc.cpp:599
-msgid "Show dialog before sending"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:34
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1607 rc.cpp:1607
+msgid "Basi&c Setup"
 msgstr ""
 
-#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup1)
-#: rc.cpp:605 rc.cpp:605
-msgid "Use Subfolder for Each Contact"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:66
+#. i18n: ectx: property (toolTip), widget (QLabel, label1)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:82
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mHostName)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:66
+#. i18n: ectx: property (toolTip), widget (QLabel, label1)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:82
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mHostName)
+#: rc.cpp:1613 rc.cpp:1622 rc.cpp:1613 rc.cpp:1622
+msgid "The hostname under which you want to send WinPopup messages."
 msgstr ""
 
-#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:55
-#. i18n: ectx: property (text), widget (QRadioButton, yesButton)
-#: rc.cpp:608 rc.cpp:608
-msgid "Always"
-msgstr "Bob tro"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:69
+#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:85
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mHostName)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:69
+#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:85
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mHostName)
+#: rc.cpp:1616 rc.cpp:1625 rc.cpp:1616 rc.cpp:1625
+msgid ""
+"The host name under which you want to send WinPopup messages. Note that you "
+"do not have to specify the true hostname in order to send messages, but you "
+"do if you want to receive them."
+msgstr ""
 
-#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:68
-#. i18n: ectx: property (text), widget (QRadioButton, noButton)
-#: rc.cpp:611 rc.cpp:611
-msgid "Never"
-msgstr "Byth"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:72
+#. i18n: ectx: property (text), widget (QLabel, label1)
+#: rc.cpp:1619 rc.cpp:1619
+msgid "Hos&tname:"
+msgstr "&Enw gwesteiwr:"
 
-#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:78
-#. i18n: ectx: property (text), widget (QRadioButton, onlySelectedButton)
-#: rc.cpp:614 rc.cpp:614
-msgid "Only the selected contacts"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:92
+#. i18n: ectx: property (toolTip), widget (KPushButton, doInstallSamba)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:95
+#. i18n: ectx: property (whatsThis), widget (KPushButton, doInstallSamba)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:92
+#. i18n: ectx: property (toolTip), widget (KPushButton, doInstallSamba)
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:95
+#. i18n: ectx: property (whatsThis), widget (KPushButton, doInstallSamba)
+#: rc.cpp:1628 rc.cpp:1631 rc.cpp:1628 rc.cpp:1631
+msgid "Install support into Samba to enable this service."
 msgstr ""
 
-#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:91
-#. i18n: ectx: property (text), widget (QRadioButton, onlyNotSelectedButton)
-#: rc.cpp:617 rc.cpp:617
-msgid "Not the selected contacts"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:98
+#. i18n: ectx: property (text), widget (KPushButton, doInstallSamba)
+#: rc.cpp:1634 rc.cpp:1634
+msgid "I&nstall Into Samba"
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:620 rc.cpp:620
-msgid "Sentence Options"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:138
+#. i18n: ectx: property (text), widget (QLabel, textLabel12)
+#: rc.cpp:1640 rc.cpp:1640
+msgid ""
+"To receive WinPopup messages sent from other machines, the hostname above "
+"must be set to this machine's hostname."
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:53
-#. i18n: ectx: property (text), widget (QCheckBox, DotEndSentence)
-#: rc.cpp:623 rc.cpp:623
-msgid "Add a dot at the end of each sent line"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:162
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:1643 rc.cpp:1643
+msgid "The samba server must be configured and running."
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:60
-#. i18n: ectx: property (text), widget (QCheckBox, CapitalizeBeginningSentence)
-#: rc.cpp:626 rc.cpp:626
-msgid "Start each sent line with a capital letter"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:185
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1647 rc.cpp:1647
+#, no-c-format
+msgid ""
+"\"Install into Samba\" is a simple method to create the directory for the "
+"temporary message files and configure your samba server.<br>\n"
+"However, the recommended way is to ask your administrator to create this "
+"directory ('mkdir -p -m 0777 /var/lib/winpopup') and for you to add\n"
+"'message command = _PATH_TO_/winpopup-send %s %m %t &' (substitute _PATH_TO_ "
+"by the real path) to the [global] section in your smb.conf."
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:70
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:629 rc.cpp:629
-msgid "Replacements List"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:233
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:1655 rc.cpp:1655
+msgid "Protocol Preferences"
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:189
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:641 rc.cpp:641
-msgid "&Text:"
-msgstr "&Testun:"
-
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:202
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:644 rc.cpp:644
-msgid "Re&placement:"
-msgstr "Am&newidiad:"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:281
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:1658 rc.cpp:1658
+msgid "second(s)"
+msgstr "eiliad(au)"
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:220
-#. i18n: ectx: property (title), widget (QGroupBox, gb_options)
-#: rc.cpp:647 rc.cpp:647
-msgid "Replacement Options"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:303
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:1661 rc.cpp:1661
+msgid "Host check frequency:"
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:241
-#. i18n: ectx: property (text), widget (QCheckBox, AutoReplaceIncoming)
-#: rc.cpp:650 rc.cpp:650
-msgid "Auto replace on incoming messages"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:313
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1664 rc.cpp:1664
+msgid "Path to 'smbclient' executable:"
 msgstr ""
 
-#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:248
-#. i18n: ectx: property (text), widget (QCheckBox, AutoReplaceOutgoing)
-#: rc.cpp:653 rc.cpp:653
-msgid "Auto replace on outgoing messages"
+#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:337
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:1670 rc.cpp:1670
+msgid "<i>These options apply to all WinPopup accounts.</i>"
 msgstr ""
 
-#. i18n: file: plugins/statistics/statisticswidgetbase.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:659 rc.cpp:659
-msgid "&Calendar View"
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:30
+#. i18n: ectx: property (windowTitle), widget (QWidget, WPAddContactBase)
+#: rc.cpp:1673 rc.cpp:1673
+msgid "Add WinPopup Contact"
 msgstr ""
 
-#. i18n: file: plugins/history/historyconfig.kcfg:11
-#. i18n: ectx: label, entry (Auto_chatwindow), group (History Plugin)
-#: rc.cpp:665 rc.cpp:665
-msgid "Show previous messages in new chats."
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:71
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel2_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:74
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel2_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:134
+#. i18n: ectx: property (toolTip), widget (KComboBox, mHostName)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:137
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostName)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:71
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel2_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:74
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel2_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:134
+#. i18n: ectx: property (toolTip), widget (KComboBox, mHostName)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:137
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostName)
+#: rc.cpp:1676 rc.cpp:1679 rc.cpp:1694 rc.cpp:1697 rc.cpp:1676 rc.cpp:1679
+#: rc.cpp:1694 rc.cpp:1697
+msgid "The hostname to which you want to send WinPopup messages."
 msgstr ""
 
-#. i18n: file: plugins/history/historyconfig.kcfg:16
-#. i18n: ectx: label, entry (Number_Auto_chatwindow), group (History Plugin)
-#: rc.cpp:668 rc.cpp:668
-msgid "Number of messages to show."
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:77
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
+#: rc.cpp:1682 rc.cpp:1682
+msgid "Com&puter hostname:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyconfig.kcfg:21
-#. i18n: ectx: label, entry (Number_ChatWindow), group (History Plugin)
-#: rc.cpp:671 rc.cpp:671
-msgid "Number of messages per page"
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:90
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:93
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:90
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:93
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
+#: rc.cpp:1685 rc.cpp:1688 rc.cpp:1685 rc.cpp:1688
+msgid ""
+"The workgroup or domain containing the computer to which you want to send "
+"WinPopup messages."
 msgstr ""
 
-#. i18n: file: plugins/history/historyconfig.kcfg:26
-#. i18n: ectx: label, entry (History_color), group (History Plugin)
-#: rc.cpp:674 rc.cpp:674
-msgid "Color of messages"
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:96
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:77
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:96
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:77
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1691 rc.cpp:1733 rc.cpp:1691 rc.cpp:1733
+msgid "&Workgroup/domain:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyconfig.kcfg:31
-#. i18n: ectx: label, entry (BrowserStyle), group (History Plugin)
-#: rc.cpp:677 rc.cpp:677
-msgid "Style to use in history-browser."
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:150
+#. i18n: ectx: property (toolTip), widget (KComboBox, mHostGroup)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:153
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostGroup)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:150
+#. i18n: ectx: property (toolTip), widget (KComboBox, mHostGroup)
+#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:153
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostGroup)
+#: rc.cpp:1700 rc.cpp:1703 rc.cpp:1700 rc.cpp:1703
+msgid ""
+"The workgroup or domain containing the computer to which you want to send "
+"WinPopup messages"
 msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:39
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:680 rc.cpp:680
-msgid "Contact:"
-msgstr "Cyswllt :"
-
-#. i18n: file: plugins/history/historyviewer.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, importHistory)
-#: rc.cpp:683 rc.cpp:683
-msgid "Import History..."
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:22
+#. i18n: ectx: property (toolTip), widget (QLabel, lblComputerName)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:25
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblComputerName)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:22
+#. i18n: ectx: property (toolTip), widget (QLabel, lblComputerName)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:25
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblComputerName)
+#: rc.cpp:1709 rc.cpp:1712 rc.cpp:1709 rc.cpp:1712
+msgid "The host name of this contact's computer."
 msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:63
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:686 rc.cpp:686
-msgid "Message filter:"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:28
+#. i18n: ectx: property (text), widget (QLabel, lblComputerName)
+#: rc.cpp:1715 rc.cpp:1715
+msgid "&Computer name:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:83
-#. i18n: ectx: property (text), item, widget (QComboBox, messageFilterBox)
-#: rc.cpp:689 rc.cpp:689
-msgid "All Messages"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:44
+#. i18n: ectx: property (text), widget (QLabel, sComputerName)
+#: rc.cpp:1718 rc.cpp:1718
+msgid "Computer Name"
 msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:88
-#. i18n: ectx: property (text), item, widget (QComboBox, messageFilterBox)
-#: rc.cpp:692 rc.cpp:692
-msgid "Only Incoming"
-msgstr ""
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:1721 rc.cpp:1721
+msgid "Comment:"
+msgstr "Sylwad:"
 
-#. i18n: file: plugins/history/historyviewer.ui:93
-#. i18n: ectx: property (text), item, widget (QComboBox, messageFilterBox)
-#: rc.cpp:695 rc.cpp:695
-msgid "Only Outgoing"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:64
+#. i18n: ectx: property (text), widget (QLabel, sComment)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:93
+#. i18n: ectx: property (text), widget (QLabel, sWorkgroup)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, sOS)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:151
+#. i18n: ectx: property (text), widget (QLabel, sServer)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:64
+#. i18n: ectx: property (text), widget (QLabel, sComment)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:93
+#. i18n: ectx: property (text), widget (QLabel, sWorkgroup)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, sOS)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:151
+#. i18n: ectx: property (text), widget (QLabel, sServer)
+#: rc.cpp:1724 rc.cpp:1736 rc.cpp:1748 rc.cpp:1760 rc.cpp:1724 rc.cpp:1736
+#: rc.cpp:1748 rc.cpp:1760
+msgid "Looking"
 msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:129
-#. i18n: ectx: property (text), widget (QTreeWidget, dateTreeWidget)
-#: rc.cpp:698 rc.cpp:698
-msgid "Date"
-msgstr "Dyddiad"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:71
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:74
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:71
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:74
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#: rc.cpp:1727 rc.cpp:1730 rc.cpp:1727 rc.cpp:1730
+msgid "The workgroup or domain containing this contact's computer."
+msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:134
-#. i18n: ectx: property (text), widget (QTreeWidget, dateTreeWidget)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:304
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#. i18n: file: plugins/history/historyviewer.ui:134
-#. i18n: ectx: property (text), widget (QTreeWidget, dateTreeWidget)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:304
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:701 rc.cpp:4393 rc.cpp:701 rc.cpp:4393
-msgid "Contact"
-msgstr "Cyswllt"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:100
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:103
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:100
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:103
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#: rc.cpp:1739 rc.cpp:1742 rc.cpp:1739 rc.cpp:1742
+msgid "The operating system running on this contact's computer."
+msgstr ""
 
-#. i18n: file: plugins/history/historyviewer.ui:156
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:704 rc.cpp:704
-msgid "Search:"
-msgstr "Chwiliad:"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:106
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1745 rc.cpp:1745
+msgid "Operating s&ystem:"
+msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:716 rc.cpp:716
-msgid "Chat History"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:129
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:132
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:129
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:132
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#: rc.cpp:1751 rc.cpp:1754 rc.cpp:1751 rc.cpp:1754
+msgid "The software running on this contact's computer."
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:72
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblNoLinesPerPage)
-#: rc.cpp:719 rc.cpp:719
-msgid ""
-"The number of messages that are shown when browsing history in the chat "
-"window"
+#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:135
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1757 rc.cpp:1757
+msgid "Ser&ver software:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:75
-#. i18n: ectx: property (text), widget (QLabel, lblNoLinesPerPage)
-#: rc.cpp:722 rc.cpp:722
-msgid "Number of messages per page:"
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:23
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1781 rc.cpp:1781
+msgid "&WLM passport:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:82
-#. i18n: ectx: property (whatsThis), widget (QLabel, colorLabel)
-#. i18n: file: plugins/history/historyprefsui.ui:108
-#. i18n: ectx: property (whatsThis), widget (KColorButton, History_color)
-#. i18n: file: plugins/history/historyprefsui.ui:82
-#. i18n: ectx: property (whatsThis), widget (QLabel, colorLabel)
-#. i18n: file: plugins/history/historyprefsui.ui:108
-#. i18n: ectx: property (whatsThis), widget (KColorButton, History_color)
-#: rc.cpp:725 rc.cpp:737 rc.cpp:725 rc.cpp:737
-msgid "Color of history messages in the chat window"
+#. i18n: file: protocols/wlm/ui/wlmaddui.ui:46
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1790 rc.cpp:1790
+msgid "<i>(for example: joe@hotmail.com)</i>"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:85
-#. i18n: ectx: property (text), widget (QLabel, colorLabel)
-#: rc.cpp:728 rc.cpp:728
-msgid "Color of messages:"
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:45
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:113
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:45
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:113
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:1796 rc.cpp:5266 rc.cpp:1796 rc.cpp:5266
+msgid "Display name:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:95
-#. i18n: ectx: property (whatsThis), widget (QLabel, numberLabel)
-#. i18n: file: plugins/history/historyprefsui.ui:125
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, Number_Auto_chatwindow)
-#. i18n: file: plugins/history/historyprefsui.ui:95
-#. i18n: ectx: property (whatsThis), widget (QLabel, numberLabel)
-#. i18n: file: plugins/history/historyprefsui.ui:125
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, Number_Auto_chatwindow)
-#: rc.cpp:731 rc.cpp:740 rc.cpp:731 rc.cpp:740
-msgid ""
-"This is the number of messages that will be added automatically in the chat "
-"window when opening a new chat."
-msgstr ""
-
-#. i18n: file: plugins/history/historyprefsui.ui:98
-#. i18n: ectx: property (text), widget (QLabel, numberLabel)
-#: rc.cpp:734 rc.cpp:734
-msgid "Number of messages to show:"
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:59
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1799 rc.cpp:1799
+msgid "Personal message:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:141
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, Number_ChatWindow)
-#: rc.cpp:743 rc.cpp:743
-msgid ""
-"The number of message that are shown when borwsing history in the chat window"
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:75
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1802 rc.cpp:1802
+msgid "Phones"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:157
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkShowPrevious)
-#: rc.cpp:746 rc.cpp:746
-msgid ""
-"When a new chat is opened, automatically add the last few messages between "
-"you and that contact."
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:109
+#. i18n: ectx: property (text), widget (QLabel, TextLabel7)
+#: rc.cpp:1811 rc.cpp:1811
+msgid "Mobile:"
 msgstr ""
 
-#. i18n: file: plugins/history/historyprefsui.ui:160
-#. i18n: ectx: property (text), widget (QCheckBox, chkShowPrevious)
-#: rc.cpp:749 rc.cpp:749
-msgid "Show chat history in new chats"
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:126
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_reversed)
+#: rc.cpp:1814 rc.cpp:1814
+msgid "Show whether you are on the contact list of this user"
 msgstr ""
 
-#. i18n: file: plugins/pipes/pipesprefsbase.ui:38
-#. i18n: ectx: property (text), widget (KPushButton, addButton)
-#: rc.cpp:755 rc.cpp:755
-msgctxt "verb"
-msgid "&Add..."
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:130
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_reversed)
+#: rc.cpp:1817 rc.cpp:1817
+msgid ""
+"If this box is checked, you are on this user's contact list.\n"
+"If not, the user has not added you to their list, or has removed you."
 msgstr ""
 
-#. i18n: file: plugins/pipes/pipesprefsbase.ui:45
-#. i18n: ectx: property (text), widget (KPushButton, removeButton)
-#: rc.cpp:758 rc.cpp:758
-msgctxt "verb"
-msgid "&Remove"
+#. i18n: file: protocols/wlm/ui/wlminfo.ui:133
+#. i18n: ectx: property (text), widget (QCheckBox, m_reversed)
+#: rc.cpp:1821 rc.cpp:1821
+msgid "I am on &the contact list of this contact"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:25
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:761 rc.cpp:761
-msgid "Uploading"
-msgstr "Llwytho"
-
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:43
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:764 rc.cpp:764
-msgid "Uplo&ad to:"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, WlmAccountPreferences)
+#: rc.cpp:1824 rc.cpp:1824
+msgid "Account Preferences - Wlm"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:59
-#. i18n: ectx: property (title), widget (QGroupBox, formatHTML)
-#: rc.cpp:767 rc.cpp:767
-msgid "Formatting"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:47
+#. i18n: ectx: property (text), widget (QLabel, accountLabel)
+#: rc.cpp:1839 rc.cpp:1839
+msgid "WLM passport:"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:71
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_formatHTML)
-#: rc.cpp:770 rc.cpp:770
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:75
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:175
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:75
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:175
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
+#: rc.cpp:1848 rc.cpp:2760 rc.cpp:1848 rc.cpp:2760
 msgid ""
-"HTML 4.01 Transitional using the ISO-8859-1 (aka. Latin 1) character set "
-"encoding."
+"If you check this checkbox, the account will not be connected when you press "
+"the \"Connect All\" button, or at startup when automatic connection at "
+"startup is enabled."
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:76
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_formatHTML)
-#: rc.cpp:773 rc.cpp:773
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:115
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:1857 rc.cpp:1857
 msgid ""
-"HTML 4.01 Transitional formatting using ISO-8859-1 (aka. Latin 1) character "
-"set encoding.\n"
-"\n"
-"This version should be easily opened by most web browsers."
+"To connect to the Microsoft network, you will need a Microsoft "
+"Passport.<br><br>If you do not currently have a Passport, please click the "
+"button to create one."
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:79
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatHTML)
-#: rc.cpp:778 rc.cpp:778
-msgid "HTML (simple loo&k)"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:152
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#. i18n: file: plugins/privacy/privacyui.rc:5
+#. i18n: ectx: Menu (privacyMenu)
+#. i18n: file: plugins/privacy/privacyui.rc:12
+#. i18n: ectx: Menu (privacyMenu)
+#. i18n: file: plugins/privacy/privacyui.rc:18
+#. i18n: ectx: Menu (privacyMenu)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:152
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#. i18n: file: plugins/privacy/privacyui.rc:5
+#. i18n: ectx: Menu (privacyMenu)
+#. i18n: file: plugins/privacy/privacyui.rc:12
+#. i18n: ectx: Menu (privacyMenu)
+#. i18n: file: plugins/privacy/privacyui.rc:18
+#. i18n: ectx: Menu (privacyMenu)
+#: rc.cpp:1863 rc.cpp:4241 rc.cpp:4244 rc.cpp:4247 rc.cpp:1863 rc.cpp:4241
+#: rc.cpp:4244 rc.cpp:4247
+msgid "Privacy"
+msgstr "Preifatwydd"
+
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:166
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1866 rc.cpp:1866
+msgid "Blocked contacts:"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:89
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_formatXHTML)
-#: rc.cpp:781 rc.cpp:781
-msgid "XHTML 1.0 Strict"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:213
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1869 rc.cpp:1869
+msgid "Allowed contacts:"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:94
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_formatXHTML)
-#: rc.cpp:784 rc.cpp:784
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:238
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1872 rc.cpp:1872
 msgid ""
-"The resulting page will be formatted using the XHTML 1.0 Strict W3C "
-"Recommendation. The character set encoding is UTF-8.\n"
-"\n"
-"Note that some web browsers do not support XHTML. You should also make sure "
-"your web server serves it out with the correct mime type, such as "
-"application/xhtml+xml."
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"style:italic;\">Italics</span> contacts are not on your contact "
+"list.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:97
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatXHTML)
-#: rc.cpp:789 rc.cpp:789
-msgid "XHTML (simple look)"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:256
+#. i18n: ectx: property (text), widget (QLabel, m_warning)
+#: rc.cpp:1877 rc.cpp:1877
+msgid "WARNING: You need to be connected to modify this page"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:104
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_formatXML)
-#: rc.cpp:792 rc.cpp:792
-msgid "Save the output in XML format using UTF-8 character set."
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:273
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:1883 rc.cpp:1883
+msgid "Connection Preferences (for advanced users)"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:107
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_formatXML)
-#: rc.cpp:795 rc.cpp:795
-msgid "Save the output in XML format using the UTF-8 encoding."
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:309
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:339
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:448
+#. i18n: ectx: property (text), widget (QLabel, lblProxyServer)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:376
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:309
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:339
+#. i18n: ectx: property (text), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:448
+#. i18n: ectx: property (text), widget (QLabel, lblProxyServer)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:376
+#. i18n: ectx: property (text), widget (QLabel, labelServer)
+#: rc.cpp:1889 rc.cpp:2037 rc.cpp:2073 rc.cpp:2789 rc.cpp:1889 rc.cpp:2037
+#: rc.cpp:2073 rc.cpp:2789
+msgid "Ser&ver /"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:110
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatXML)
-#: rc.cpp:798 rc.cpp:798
-msgid "&XML"
-msgstr "&XML"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:322
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:389
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:766
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:322
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:389
+#. i18n: ectx: property (text), widget (QLabel, labelPort)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:766
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#: rc.cpp:1892 rc.cpp:2792 rc.cpp:3279 rc.cpp:1892 rc.cpp:2792 rc.cpp:3279
+msgid "po&rt:"
+msgstr "po&rth:"
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:117
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatStylesheet)
-#: rc.cpp:801 rc.cpp:801
-msgid "XML transformation &using this XSLT sheet:"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:343
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_serverName)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:346
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_serverName)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:359
+#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:362
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:420
+#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:423
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:448
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_serverName)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:451
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_serverName)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:343
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_serverName)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:346
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_serverName)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:359
+#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:362
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:420
+#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:423
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:448
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_serverName)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:451
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_serverName)
+#: rc.cpp:1895 rc.cpp:1898 rc.cpp:1904 rc.cpp:1907 rc.cpp:2795 rc.cpp:2798
+#: rc.cpp:2801 rc.cpp:2804 rc.cpp:1895 rc.cpp:1898 rc.cpp:1904 rc.cpp:1907
+#: rc.cpp:2795 rc.cpp:2798 rc.cpp:2801 rc.cpp:2804
+msgid ""
+"Only modify these values if you want to use a special IM proxy server, like "
+"SIMP"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:157
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useImagesHTML)
-#: rc.cpp:804 rc.cpp:804
-msgid "Replaces the protocol names, such as MSN and IRC, with images."
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:349
+#. i18n: ectx: property (text), widget (KLineEdit, m_serverName)
+#: rc.cpp:1901 rc.cpp:1901
+msgid "messenger.hotmail.com"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:174
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_useImagesHTML)
-#: rc.cpp:807 rc.cpp:807
-msgid ""
-"Replaces the protocol names, such as MSN and IRC, with images.\n"
-"\n"
-"Note that you have to manually copy the PNG files into place.\n"
-"\n"
-"The following files are used by default:\n"
-"\n"
-"images/msn_protocol.png\n"
-"images/icq_protocol.png\n"
-"images/jabber_protocol.png\n"
-"images/yahoo_protocol.png\n"
-"images/aim_protocol.png\n"
-"images/irc_protocol.png\n"
-"images/sms_protocol.png\n"
-"images/gadu_protocol.png\n"
-"images/winpopup_protocol.png"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:380
+#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:408
+#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:380
+#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:408
+#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
+#: rc.cpp:1910 rc.cpp:2064 rc.cpp:1910 rc.cpp:2064
+msgid "Enable Proxy"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:177
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useImagesHTML)
-#: rc.cpp:824 rc.cpp:824
-msgid "Repla&ce protocol text with images in (X)HTML"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:410
+#. i18n: ectx: property (text), widget (QLabel, m_labelProxyHost)
+#: rc.cpp:1913 rc.cpp:1913
+msgid "Host /"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:199
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_showName)
-#: rc.cpp:830 rc.cpp:830
-msgid "Use one of &your IM names"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:420
+#. i18n: ectx: property (text), widget (QLabel, m_labelProxyPort)
+#: rc.cpp:1916 rc.cpp:1916
+msgid "port:"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:209
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_includeIMAddress)
-#: rc.cpp:833 rc.cpp:833
-msgid "Include &IM addresses"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:468
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioProxyHttp)
+#: rc.cpp:1919 rc.cpp:1919
+msgid "HTTP"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceprefs.ui:216
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_showAnotherName)
-#: rc.cpp:836 rc.cpp:836
-msgid "Use another &name:"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:481
+#. i18n: ectx: property (text), widget (QRadioButton, m_radioProxySocks5)
+#: rc.cpp:1922 rc.cpp:1922
+msgid "Socks5"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:10
-#. i18n: ectx: label, entry (UploadFrequency), group (Web Presence Plugin)
-#: rc.cpp:839 rc.cpp:839
-msgid "Delay in seconds before updating the file"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:491
+#. i18n: ectx: property (text), widget (QLabel, m_labelProxyUsername)
+#: rc.cpp:1925 rc.cpp:1925
+msgid "Username:"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:15
-#. i18n: ectx: label, entry (uploadURL), group (Web Presence Plugin)
-#: rc.cpp:842 rc.cpp:842
-msgid "The URL where the file should be uploaded to"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:508
+#. i18n: ectx: property (text), widget (QLabel, m_labelProxyPassword)
+#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:60
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:508
+#. i18n: ectx: property (text), widget (QLabel, m_labelProxyPassword)
+#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:60
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1928 rc.cpp:5306 rc.cpp:1928 rc.cpp:5306
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:553
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:1934 rc.cpp:1934
+msgid "General Options"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:19
-#. i18n: ectx: label, entry (formatHTML), group (Web Presence Plugin)
-#: rc.cpp:845 rc.cpp:845
-msgid "HTML formatting"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:559
+#. i18n: ectx: property (text), widget (QCheckBox, m_doNotSendEmoticons)
+#: rc.cpp:1937 rc.cpp:1937
+msgid "Do not send custom emoticons to other contacts"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:24
-#. i18n: ectx: label, entry (formatXHTML), group (Web Presence Plugin)
-#: rc.cpp:848 rc.cpp:848
-msgid "XHTML formatting"
+#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:566
+#. i18n: ectx: property (text), widget (QCheckBox, m_doNotRequestEmoticons)
+#: rc.cpp:1940 rc.cpp:1940
+msgid "Do not show custom emoticons from other contacts"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:29
-#. i18n: ectx: label, entry (formatXML), group (Web Presence Plugin)
-#: rc.cpp:851 rc.cpp:851
-msgid "XML formatting"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, ICQEditAccountUI)
+#: rc.cpp:1943 rc.cpp:1943
+msgid "Account Preferences - ICQ"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:34
-#. i18n: ectx: label, entry (formatStylesheet), group (Web Presence Plugin)
-#: rc.cpp:854 rc.cpp:854
-msgid "XML transformation with a XSLT sheet"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:30
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1946 rc.cpp:1946
+msgctxt "@title:tab"
+msgid "&Basic Setup"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:39
-#. i18n: ectx: label, entry (formatStylesheetURL), group (Web Presence Plugin)
-#: rc.cpp:857 rc.cpp:857
-msgid "XSLT sheet"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:42
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1949 rc.cpp:1949
+msgid "Account Preferences"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:43
-#. i18n: ectx: label, entry (useImagesHTML), group (Web Presence Plugin)
-#: rc.cpp:860 rc.cpp:860
-msgid "Replace protocol text with images in (X)HTML"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:62
+#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:78
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:62
+#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:78
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
+#: rc.cpp:1952 rc.cpp:1961 rc.cpp:1952 rc.cpp:1961
+msgid "The user ID of your ICQ account."
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:48
-#. i18n: ectx: label, entry (showName), group (Web Presence Plugin)
-#: rc.cpp:863 rc.cpp:863
-msgid "Use one of your IM names as display name"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:65
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:81
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:65
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:81
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
+#: rc.cpp:1955 rc.cpp:1964 rc.cpp:1955 rc.cpp:1964
+msgid ""
+"The user ID of your ICQ account.  This should be in the form of a number (no "
+"decimals, no spaces)."
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:53
-#. i18n: ectx: label, entry (showAnotherName), group (Web Presence Plugin)
-#: rc.cpp:866 rc.cpp:866
-msgid "Use another name as display name"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:68
+#. i18n: ectx: property (text), widget (QLabel, lblAccountId)
+#: rc.cpp:1958 rc.cpp:1958
+msgid "IC&Q UIN:"
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:58
-#. i18n: ectx: label, entry (showThisName), group (Web Presence Plugin)
-#: rc.cpp:869 rc.cpp:869
-msgid "Desired display name"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:96
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkAutoLogin)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:232
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoLogon)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:339
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoConnect)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:96
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkAutoLogin)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:232
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoLogon)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:339
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoConnect)
+#: rc.cpp:1967 rc.cpp:2550 rc.cpp:3992 rc.cpp:1967 rc.cpp:2550 rc.cpp:3992
+msgid ""
+"If you enable this option, this account will not be connected when you press "
+"the \"Connect All\" button, nor at startup even if you have enabled "
+"automatic connection at startup."
 msgstr ""
 
-#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:62
-#. i18n: ectx: label, entry (includeIMAddress), group (Web Presence Plugin)
-#: rc.cpp:872 rc.cpp:872
-msgid "Include IM addresses"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:134
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:1976 rc.cpp:1976
+msgid ""
+"To connect to the ICQ network, you will need an ICQ account.<br><br>\n"
+"If you do not currently have an ICQ account, please click the button to "
+"create one."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:25
-#. i18n: ectx: property (windowTitle), widget (QWidget)
-#: rc.cpp:875 rc.cpp:875
-msgid "Account Preferences - SMS"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:157
+#. i18n: ectx: property (title), widget (QGroupBox, changePasswordGroupBox)
+#: rc.cpp:1983 rc.cpp:1983
+msgid "Change password"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:60
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:27
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:40
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:49
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:60
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:27
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:40
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:49
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:878 rc.cpp:1107 rc.cpp:1277 rc.cpp:1430 rc.cpp:1661 rc.cpp:3221
-#: rc.cpp:4974 rc.cpp:878 rc.cpp:1107 rc.cpp:1277 rc.cpp:1430 rc.cpp:1661
-#: rc.cpp:3221 rc.cpp:4974
-msgid "B&asic Setup"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:175
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1986 rc.cpp:1986
+msgid ""
+"If you have an existing ICQ account and would like to change its password, "
+"you can use this button to enter a new password."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:71
-#. i18n: ectx: property (title), widget (QGroupBox)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:33
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:41
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox53)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:52
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox59)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:56
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:45
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:163
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:61
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:65
-#. i18n: ectx: property (title), widget (QGroupBox, mAccountInfo)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:46
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:27
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, m_accountInfo)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:59
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox55)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:71
-#. i18n: ectx: property (title), widget (QGroupBox)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:33
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:41
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox53)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:52
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox59)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:56
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:45
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:163
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:61
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:65
-#. i18n: ectx: property (title), widget (QGroupBox, mAccountInfo)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:46
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:27
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, m_accountInfo)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:59
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox55)
-#: rc.cpp:881 rc.cpp:1110 rc.cpp:1280 rc.cpp:1433 rc.cpp:1664 rc.cpp:1874
-#: rc.cpp:2939 rc.cpp:3224 rc.cpp:3579 rc.cpp:3918 rc.cpp:4074 rc.cpp:4555
-#: rc.cpp:4977 rc.cpp:881 rc.cpp:1110 rc.cpp:1280 rc.cpp:1433 rc.cpp:1664
-#: rc.cpp:1874 rc.cpp:2939 rc.cpp:3224 rc.cpp:3579 rc.cpp:3918 rc.cpp:4074
-#: rc.cpp:4555 rc.cpp:4977
-msgid "Account Information"
-msgstr "Gwybodaeth Cyfrif"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:191
+#. i18n: ectx: property (text), widget (QPushButton, buttonChangePassword)
+#: rc.cpp:1989 rc.cpp:1989
+msgid "Change Your Password..."
+msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:82
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/groupwise/gwaddui.ui:38
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:82
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/groupwise/gwaddui.ui:38
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:884 rc.cpp:5040 rc.cpp:884 rc.cpp:5040
-msgid "&Account name:"
-msgstr "Enw &Cyfrif:"
-
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:88
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:91
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:116
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsadd.ui:77
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:80
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:109
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsadd.ui:112
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:88
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:91
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:116
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsadd.ui:77
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:80
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:109
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsadd.ui:112
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#: rc.cpp:887 rc.cpp:890 rc.cpp:902 rc.cpp:1016 rc.cpp:1019 rc.cpp:1028
-#: rc.cpp:1031 rc.cpp:887 rc.cpp:890 rc.cpp:902 rc.cpp:1016 rc.cpp:1019
-#: rc.cpp:1028 rc.cpp:1031
-msgid "A unique name for this SMS account."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:218
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:1992 rc.cpp:1992
+msgctxt "@title:tab"
+msgid "Accou&nt Preferences"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:99
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:893 rc.cpp:893
-msgid "&SMS delivery service:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:230
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:1995 rc.cpp:1995
+msgid "Privacy Options"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:105
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:140
-#. i18n: ectx: property (toolTip), widget (QComboBox)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:105
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:140
-#. i18n: ectx: property (toolTip), widget (QComboBox)
-#: rc.cpp:896 rc.cpp:905 rc.cpp:896 rc.cpp:905
-msgid "The delivery service that you would like to use."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:242
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkRequireAuth)
+#: rc.cpp:1998 rc.cpp:1998
+msgid ""
+"Enable the authorization requirement, which will not allow users to add you "
+"to their contact list without authorization from you."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:108
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:143
-#. i18n: ectx: property (whatsThis), widget (QComboBox)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:108
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:143
-#. i18n: ectx: property (whatsThis), widget (QComboBox)
-#: rc.cpp:899 rc.cpp:908 rc.cpp:899 rc.cpp:908
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:245
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkRequireAuth)
+#: rc.cpp:2001 rc.cpp:2001
 msgid ""
-"The delivery service that you would like to use.  Note that you will need to "
-"have this software installed prior to using this account."
+"Enable the authorization requirement, which will not allow users to add you "
+"to their contact list without authorization from you.  Check this box, and "
+"you will have to confirm any users who add you to their list before they may "
+"see your online status."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:151
-#. i18n: ectx: property (text), widget (QPushButton)
-#: rc.cpp:911 rc.cpp:911
-msgid "&Description"
-msgstr "&Disgrifiad"
-
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:154
-#. i18n: ectx: property (toolTip), widget (QPushButton)
-#: rc.cpp:914 rc.cpp:914
-msgid "Description of the SMS delivery service."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:248
+#. i18n: ectx: property (text), widget (QCheckBox, chkRequireAuth)
+#: rc.cpp:2004 rc.cpp:2004
+msgid ""
+"&Require authorization before someone can add you to their contact list"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:157
-#. i18n: ectx: property (whatsThis), widget (QPushButton)
-#: rc.cpp:917 rc.cpp:917
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:255
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkHideIP)
+#: rc.cpp:2007 rc.cpp:2007
 msgid ""
-"Description of the SMS delivery service, including download locations."
+"Check this to hide your IP address from people when they view your user info"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:188
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:923 rc.cpp:923
-msgid "To use SMS, you will need an account with a delivery service."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:258
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkHideIP)
+#: rc.cpp:2010 rc.cpp:2010
+msgid ""
+"Checking this box prevent people from seeing your IP address if they view "
+"your ICQ user details such as name, address, or age."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:223
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:250
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:223
-#. i18n: ectx: attribute (title), widget (QWidget)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:250
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:926 rc.cpp:3264 rc.cpp:926 rc.cpp:3264
-msgid "A&ccount Preferences"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:261
+#. i18n: ectx: property (text), widget (QCheckBox, chkHideIP)
+#: rc.cpp:2013 rc.cpp:2013
+msgid "Hide &IP address"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:234
-#. i18n: ectx: property (title), widget (QGroupBox)
-#: rc.cpp:929 rc.cpp:929
-msgid "Messaging Preferences"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:268
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkWebAware)
+#: rc.cpp:2016 rc.cpp:2016
+msgid "Check this box to enable Web Aware functionality."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:253
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:932 rc.cpp:932
-msgid "If the message is too &long:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:271
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkWebAware)
+#: rc.cpp:2019 rc.cpp:2019
+msgid ""
+"Check this box to enable ICQ's Web Aware functionality, which allows people "
+"to see your online status from ICQ's web page, and send you a message "
+"without necessarily having ICQ themselves."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:259
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:285
-#. i18n: ectx: property (toolTip), item, widget (QComboBox)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:259
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:285
-#. i18n: ectx: property (toolTip), item, widget (QComboBox)
-#: rc.cpp:935 rc.cpp:950 rc.cpp:935 rc.cpp:950
-msgid ""
-"What should happen if you type a message that is too long to fit in a single "
-"SMS message."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:274
+#. i18n: ectx: property (text), widget (QCheckBox, chkWebAware)
+#: rc.cpp:2022 rc.cpp:2022
+msgid "Make my status available via &ICQ's unified messaging center"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:262
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:288
-#. i18n: ectx: property (whatsThis), item, widget (QComboBox)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:262
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:288
-#. i18n: ectx: property (whatsThis), item, widget (QComboBox)
-#: rc.cpp:938 rc.cpp:953 rc.cpp:938 rc.cpp:953
-msgid ""
-"What should happen if you type a message that is too long to fit in a single "
-"SMS message.  You can either choose to break it up into smaller messages "
-"automatically, cancel the message from being sent entirely, or have Kopete "
-"prompt you each time you enter a message that is too long."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:333
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:371
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:333
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:371
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
+#: rc.cpp:2031 rc.cpp:2049 rc.cpp:2031 rc.cpp:2049
+msgid "The IP address or hostmask of the ICQ server you wish to connect to."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:268
-#. i18n: ectx: property (text), item, widget (QComboBox)
-#: rc.cpp:941 rc.cpp:941
-msgid "Prompt (recommended)"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:336
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:374
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:336
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:374
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
+#: rc.cpp:2034 rc.cpp:2052 rc.cpp:2034 rc.cpp:2052
+msgid ""
+"The IP address or hostmask of the ICQ server you wish to connect to.  "
+"Normally you will want the default (login.icq.com)."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:273
-#. i18n: ectx: property (text), item, widget (QComboBox)
-#: rc.cpp:944 rc.cpp:944
-msgid "Break Into Multiple"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:352
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:387
+#. i18n: ectx: property (toolTip), widget (QSpinBox, edtServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:352
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:387
+#. i18n: ectx: property (toolTip), widget (QSpinBox, edtServerPort)
+#: rc.cpp:2040 rc.cpp:2058 rc.cpp:2040 rc.cpp:2058
+msgid "The port on the ICQ server that you would like to connect to."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:278
-#. i18n: ectx: property (text), item, widget (QComboBox)
-#: rc.cpp:947 rc.cpp:947
-msgid "Cancel Sending"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:355
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:390
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, edtServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:355
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:390
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, edtServerPort)
+#: rc.cpp:2043 rc.cpp:2061 rc.cpp:2043 rc.cpp:2061
+msgid ""
+"The port on the ICQ server that you would like to connect to.  Normally this "
+"is 5190."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:298
-#. i18n: ectx: property (text), widget (QCheckBox)
-#: rc.cpp:956 rc.cpp:956
-msgid "&Enable phone number internationalization"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:377
+#. i18n: ectx: property (text), widget (QLineEdit, edtServerAddress)
+#: rc.cpp:2055 rc.cpp:2055
+msgid "login.icq.com"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:301
-#. i18n: ectx: property (toolTip), widget (QCheckBox)
-#: rc.cpp:959 rc.cpp:959
-msgid "Check if you would like to enable phone number internationalization."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:442
+#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:480
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtProxyServerAddress)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:442
+#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:480
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtProxyServerAddress)
+#: rc.cpp:2067 rc.cpp:2085 rc.cpp:2067 rc.cpp:2085
+msgid ""
+"The IP address or hostmask of the proxy server you wish to use for "
+"connecting to an ICQ server."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:304
-#. i18n: ectx: property (whatsThis), widget (QCheckBox)
-#: rc.cpp:962 rc.cpp:962
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:445
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblProxyServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:483
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtProxyServerAddress)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:445
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblProxyServer)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:483
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtProxyServerAddress)
+#: rc.cpp:2070 rc.cpp:2088 rc.cpp:2070 rc.cpp:2088
 msgid ""
-"Check if you would like to enable phone number internationalization.  "
-"Without this option, you will only be able to use SMS for accounts within "
-"your country."
+"The IP address or hostmask of the proxy server you wish to use for "
+"connecting to an ICQ server. The proxy server must support a CONNECT command "
+"and allow connections to the ICQ server port (normally 5190)."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:331
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:965 rc.cpp:965
-msgid "Substitute leading &zero with code:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:461
+#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:496
+#. i18n: ectx: property (toolTip), widget (QSpinBox, edtProxyServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:461
+#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServerPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:496
+#. i18n: ectx: property (toolTip), widget (QSpinBox, edtProxyServerPort)
+#: rc.cpp:2076 rc.cpp:2091 rc.cpp:2076 rc.cpp:2091
+msgid "The port that the proxy server listens to."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:337
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:340
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:365
-#. i18n: ectx: property (toolTip), widget (KRestrictedLine)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:368
-#. i18n: ectx: property (whatsThis), widget (KRestrictedLine)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:337
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:340
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:365
-#. i18n: ectx: property (toolTip), widget (KRestrictedLine)
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:368
-#. i18n: ectx: property (whatsThis), widget (KRestrictedLine)
-#: rc.cpp:968 rc.cpp:971 rc.cpp:980 rc.cpp:983 rc.cpp:968 rc.cpp:971
-#: rc.cpp:980 rc.cpp:983
-msgid "Whatever you want to substitute for a leading zero."
-msgstr ""
-
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:359
-#. i18n: ectx: property (text), widget (KRestrictedLine)
-#: rc.cpp:974 rc.cpp:974
-msgid "+"
-msgstr "+"
-
-#. i18n: file: protocols/sms/ui/smsactprefs.ui:362
-#. i18n: ectx: property (validChars), widget (KRestrictedLine)
-#: rc.cpp:977 rc.cpp:977
-msgid "1234567890+"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:464
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblProxyServerPort)
+#: rc.cpp:2079 rc.cpp:2079
+msgid ""
+"The port that the proxy server listens to. Normally this will be 3128 or "
+"8080."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:40
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:986 rc.cpp:986
-msgid "Some One"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:499
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, edtProxyServerPort)
+#: rc.cpp:2094 rc.cpp:2094
+msgid ""
+"The port that the proxy server listens to. Normally this will be 3128, 8080, "
+"or 443 (https)."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:70
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:54
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:207
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_4_2)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:70
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:54
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:207
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_4_2)
-#: rc.cpp:989 rc.cpp:1004 rc.cpp:3516 rc.cpp:989 rc.cpp:1004 rc.cpp:3516
-msgid "&Telephone number:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:520
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:2097 rc.cpp:2097
+msgid "Peer Connection Options"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:76
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:87
-#. i18n: ectx: property (toolTip), widget (KLineEdit)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:76
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:87
-#. i18n: ectx: property (toolTip), widget (KLineEdit)
-#: rc.cpp:992 rc.cpp:998 rc.cpp:992 rc.cpp:998
-msgid "The telephone number of the contact."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:540
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:450
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:540
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:450
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#: rc.cpp:2100 rc.cpp:2601 rc.cpp:2100 rc.cpp:2601
+msgid "The ports to use for direct connections."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:79
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:90
-#. i18n: ectx: property (whatsThis), widget (KLineEdit)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:79
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsuserprefs.ui:90
-#. i18n: ectx: property (whatsThis), widget (KLineEdit)
-#: rc.cpp:995 rc.cpp:1001 rc.cpp:995 rc.cpp:1001
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:543
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:453
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:543
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:453
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#: rc.cpp:2103 rc.cpp:2604 rc.cpp:2103 rc.cpp:2604
 msgid ""
-"The telephone number of the contact.  This should be a number with SMS "
-"service available."
+"The ports to use when listening for direct connections. These must not be "
+"blocked by a firewall or router."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsadd.ui:60
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:98
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsadd.ui:60
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:98
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#: rc.cpp:1007 rc.cpp:1022 rc.cpp:1007 rc.cpp:1022
-msgid "The telephone number of the contact you would like to add."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:546
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:456
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:546
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:456
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#: rc.cpp:2106 rc.cpp:2607 rc.cpp:2106 rc.cpp:2607
+msgid "Po&rt range:"
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsadd.ui:63
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:101
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#. i18n: file: protocols/sms/ui/smsadd.ui:63
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/sms/ui/smsadd.ui:101
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#: rc.cpp:1010 rc.cpp:1025 rc.cpp:1010 rc.cpp:1025
-msgid ""
-"The telephone number of the contact you would like to add.  This should be a "
-"number with SMS service available."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:556
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:466
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:556
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:466
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
+#: rc.cpp:2109 rc.cpp:2610 rc.cpp:2109 rc.cpp:2610
+msgid "The start of the port range."
 msgstr ""
 
-#. i18n: file: protocols/sms/ui/smsadd.ui:71
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1013 rc.cpp:1013
-msgid "Contact na&me:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:559
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:469
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:559
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:469
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
+#: rc.cpp:2112 rc.cpp:2613 rc.cpp:2112 rc.cpp:2613
+msgid "The start of the port range. Normally this is 5190."
 msgstr ""
 
-#. i18n: file: protocols/sms/services/gsmlibprefs.ui:49
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1034 rc.cpp:1034
-msgid "GSMLib Settings"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:575
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:485
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:575
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:485
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
+#: rc.cpp:2115 rc.cpp:2616 rc.cpp:2115 rc.cpp:2616
+msgid "The end of the port range."
 msgstr ""
 
-#. i18n: file: protocols/sms/services/gsmlibprefs.ui:79
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:150
-#. i18n: ectx: property (text), widget (QLabel, deviceLabel)
-#. i18n: file: protocols/sms/services/gsmlibprefs.ui:79
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:150
-#. i18n: ectx: property (text), widget (QLabel, deviceLabel)
-#: rc.cpp:1037 rc.cpp:5814 rc.cpp:1037 rc.cpp:5814
-msgid "Device:"
-msgstr "Dyfais:"
-
-#. i18n: file: protocols/sms/services/smsclientprefs.ui:49
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1040 rc.cpp:1040
-msgid "SMSClient Settings"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:578
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:488
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:578
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:488
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
+#: rc.cpp:2118 rc.cpp:2619 rc.cpp:2118 rc.cpp:2619
+msgid "The end of the port range. Normally this is 5199."
 msgstr ""
 
-#. i18n: file: protocols/sms/services/smsclientprefs.ui:79
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1043 rc.cpp:1043
-msgid "SMSClient &program:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:596
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:506
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:596
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:506
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
+#: rc.cpp:2121 rc.cpp:2622 rc.cpp:2121 rc.cpp:2622
+msgid ""
+"Use AOL proxy server instead of direct connections. If you are behind a "
+"router that you do not control, you will probably want this."
 msgstr ""
 
-#. i18n: file: protocols/sms/services/smsclientprefs.ui:90
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/sms/services/smssendprefs.ui:105
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/sms/services/smsclientprefs.ui:90
-#. i18n: ectx: property (text), widget (QLabel)
-#. i18n: file: protocols/sms/services/smssendprefs.ui:105
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1046 rc.cpp:1055 rc.cpp:1046 rc.cpp:1055
-msgid "Pro&vider:"
-msgstr "Dar&parwr:"
-
-#. i18n: file: protocols/sms/services/smsclientprefs.ui:116
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1049 rc.cpp:1049
-msgid "SMSClient &config path:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:599
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:509
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:599
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:509
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
+#: rc.cpp:2124 rc.cpp:2625 rc.cpp:2124 rc.cpp:2625
+msgid ""
+"Use the AOL proxy server for things that would normally need a direct "
+"connection, like file transfers. You will want this if there is a firewall "
+"or router that blocks connections to your computer and you cannot get "
+"unblocked. If a direct connection fails, a proxy connection will be tried "
+"regardless of this setting."
 msgstr ""
 
-#. i18n: file: protocols/sms/services/smssendprefs.ui:49
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1052 rc.cpp:1052
-msgid "SMSSend Options"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:602
+#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:512
+#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:602
+#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:512
+#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
+#: rc.cpp:2127 rc.cpp:2628 rc.cpp:2127 rc.cpp:2628
+msgid "&Use proxy instead"
 msgstr ""
 
-#. i18n: file: protocols/sms/services/smssendprefs.ui:124
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1058 rc.cpp:1058
-msgid "SMSSend prefi&x:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:617
+#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:633
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:536
+#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:552
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:617
+#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:633
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:536
+#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:552
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
+#: rc.cpp:2130 rc.cpp:2139 rc.cpp:2631 rc.cpp:2640 rc.cpp:2130 rc.cpp:2139
+#: rc.cpp:2631 rc.cpp:2640
+msgid "Timeout for direct connections."
 msgstr ""
 
-#. i18n: file: protocols/sms/services/smssendprefs.ui:159
-#. i18n: ectx: property (text), widget (QLabel)
-#: rc.cpp:1061 rc.cpp:1061
-msgid "Provider Options"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:620
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:636
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:539
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:555
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:620
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:636
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:539
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:555
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
+#: rc.cpp:2133 rc.cpp:2142 rc.cpp:2634 rc.cpp:2643 rc.cpp:2133 rc.cpp:2142
+#: rc.cpp:2634 rc.cpp:2643
+msgid ""
+"The number of seconds to wait for a connection to succeed before trying a "
+"different method."
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:25
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:105
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:25
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:105
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:1064 rc.cpp:1679 rc.cpp:1064 rc.cpp:1679
-msgid "Email address:"
-msgstr "Cyfeiriad Ebost:"
-
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:45
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:113
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:45
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2_2)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:113
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:1067 rc.cpp:5089 rc.cpp:1067 rc.cpp:5089
-msgid "Display name:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:623
+#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:542
+#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:623
+#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:542
+#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
+#: rc.cpp:2136 rc.cpp:2637 rc.cpp:2136 rc.cpp:2637
+msgid "T&imeout (secs):"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:59
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:668
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1070 rc.cpp:1070
-msgid "Personal message:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:596
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:668
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:596
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2145 rc.cpp:2646 rc.cpp:2145 rc.cpp:2646
+msgid "Default to the following &encoding for messages:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:75
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1073 rc.cpp:1073
-msgid "Phones"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:717
+#. i18n: ectx: attribute (title), widget (QWidget, tabVisible)
+#: rc.cpp:2148 rc.cpp:2148
+msgctxt "@title:tab"
+msgid "Visible"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:81
-#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:503
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneWork)
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:81
-#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:503
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneWork)
-#: rc.cpp:1076 rc.cpp:1856 rc.cpp:1076 rc.cpp:1856
-msgid "Work:"
-msgstr "Gwaith :"
-
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:95
-#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:493
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:462
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:95
-#. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:493
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:462
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneHome)
-#: rc.cpp:1079 rc.cpp:1853 rc.cpp:4417 rc.cpp:1079 rc.cpp:1853 rc.cpp:4417
-msgid "Home:"
-msgstr "Cartref :"
-
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:109
-#. i18n: ectx: property (text), widget (QLabel, TextLabel7)
-#: rc.cpp:1082 rc.cpp:1082
-msgid "Mobile:"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:732
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:770
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:732
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:770
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:2151 rc.cpp:2676 rc.cpp:2151 rc.cpp:2676
+msgid "Always visible:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:126
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_reversed)
-#: rc.cpp:1085 rc.cpp:1085
-msgid "Show whether you are on the contact list of this user"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:739
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:817
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:871
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:791
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:870
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:739
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:817
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:871
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:791
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:870
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:2154 rc.cpp:2175 rc.cpp:2190 rc.cpp:2685 rc.cpp:2700 rc.cpp:2154
+#: rc.cpp:2175 rc.cpp:2190 rc.cpp:2685 rc.cpp:2700
+msgid "Contact to add:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:130
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_reversed)
-#: rc.cpp:1088 rc.cpp:1088
-msgid ""
-"If this box is checked, you are on this user's contact list.\n"
-"If not, the user has not added you to their list, or has removed you."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:771
+#. i18n: ectx: attribute (title), widget (QWidget, tabInvisible)
+#: rc.cpp:2163 rc.cpp:2163
+msgctxt "@title:tab"
+msgid "Invisible"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlminfo.ui:133
-#. i18n: ectx: property (text), widget (QCheckBox, m_reversed)
-#: rc.cpp:1092 rc.cpp:1092
-msgid "I am on &the contact list of this contact"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:810
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:836
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:810
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:836
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:2172 rc.cpp:2691 rc.cpp:2172 rc.cpp:2691
+msgid "Always invisible:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, WlmAccountPreferences)
-#: rc.cpp:1104 rc.cpp:1104
-msgid "Account Preferences - Wlm"
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:825
+#. i18n: ectx: attribute (title), widget (QWidget, tabIgnore)
+#: rc.cpp:2178 rc.cpp:2178
+msgctxt "@title:tab"
+msgid "Ignore"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:41
-#. i18n: ectx: property (toolTip), widget (QLabel, accountLabel)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:44
-#. i18n: ectx: property (whatsThis), widget (QLabel, accountLabel)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:60
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_passport)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:63
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_passport)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:97
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:100
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:116
-#. i18n: ectx: property (toolTip), widget (QLineEdit, userId)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:119
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, userId)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:41
-#. i18n: ectx: property (toolTip), widget (QLabel, accountLabel)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:44
-#. i18n: ectx: property (whatsThis), widget (QLabel, accountLabel)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:60
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_passport)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:63
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_passport)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:97
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:100
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:116
-#. i18n: ectx: property (toolTip), widget (QLineEdit, userId)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:119
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, userId)
-#: rc.cpp:1113 rc.cpp:1116 rc.cpp:1122 rc.cpp:1125 rc.cpp:4980 rc.cpp:4983
-#: rc.cpp:4989 rc.cpp:4992 rc.cpp:1113 rc.cpp:1116 rc.cpp:1122 rc.cpp:1125
-#: rc.cpp:4980 rc.cpp:4983 rc.cpp:4989 rc.cpp:4992
-msgid "The account name of your account."
+#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:864
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#: rc.cpp:2187 rc.cpp:2187
+msgid "Ignore:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:47
-#. i18n: ectx: property (text), widget (QLabel, accountLabel)
-#: rc.cpp:1119 rc.cpp:1119
-msgid "WLM passport:"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:384
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:384
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2193 rc.cpp:3839 rc.cpp:2193 rc.cpp:3839
+msgid "Personal Information"
+msgstr "Gwybodaeth Bersonol"
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:75
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:175
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:75
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:175
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_autologin)
-#: rc.cpp:1128 rc.cpp:4573 rc.cpp:1128 rc.cpp:4573
-msgid ""
-"If you check this checkbox, the account will not be connected when you press "
-"the \"Connect All\" button, or at startup when automatic connection at "
-"startup is enabled."
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:34
+#. i18n: ectx: property (text), widget (QLabel, uinLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:175
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:34
+#. i18n: ectx: property (text), widget (QLabel, uinLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:175
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2196 rc.cpp:2337 rc.cpp:2196 rc.cpp:2337
+msgid "&UIN #:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:78
-#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:342
-#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:109
-#. i18n: ectx: property (text), widget (QCheckBox, cbAutoConnect)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, chkAutoLogin)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:235
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoLogon)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, autoLoginCheck_)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:178
-#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:134
-#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:78
-#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:342
-#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:109
-#. i18n: ectx: property (text), widget (QCheckBox, cbAutoConnect)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, chkAutoLogin)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:235
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoLogon)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, autoLoginCheck_)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:178
-#. i18n: ectx: property (text), widget (QCheckBox, m_autologin)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:134
-#. i18n: ectx: property (text), widget (QCheckBox, autoConnect)
-#: rc.cpp:1131 rc.cpp:1301 rc.cpp:1490 rc.cpp:1895 rc.cpp:2491 rc.cpp:2960
-#: rc.cpp:3245 rc.cpp:3600 rc.cpp:4576 rc.cpp:4998 rc.cpp:1131 rc.cpp:1301
-#: rc.cpp:1490 rc.cpp:1895 rc.cpp:2491 rc.cpp:2960 rc.cpp:3245 rc.cpp:3600
-#: rc.cpp:4576 rc.cpp:4998
-msgid "E&xclude from connect all"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:51
+#. i18n: ectx: property (text), widget (QLabel, ipLabel)
+#: rc.cpp:2199 rc.cpp:2199
+msgid "&IP:"
+msgstr "&IP :"
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:91
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:119
-#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:109
-#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:78
-#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:215
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:91
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:119
-#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:109
-#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:78
-#. i18n: ectx: property (title), widget (QGroupBox, registrationGroupBox)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:215
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1134 rc.cpp:1898 rc.cpp:2494 rc.cpp:2930 rc.cpp:3248 rc.cpp:3603
-#: rc.cpp:4582 rc.cpp:1134 rc.cpp:1898 rc.cpp:2494 rc.cpp:2930 rc.cpp:3248
-#: rc.cpp:3603 rc.cpp:4582
-msgid "Registration"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:71
+#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:41
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:533
+#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:71
+#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:41
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:533
+#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
+#: rc.cpp:2202 rc.cpp:2307 rc.cpp:3860 rc.cpp:2202 rc.cpp:2307 rc.cpp:3860
+msgid "&Nickname:"
+msgstr "Ffuge&nw:"
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:115
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:88
+#. i18n: ectx: property (text), widget (QLabel, aliasLabel)
+#. i18n: file: plugins/alias/aliasdialog.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:88
+#. i18n: ectx: property (text), widget (QLabel, aliasLabel)
+#. i18n: file: plugins/alias/aliasdialog.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2205 rc.cpp:4628 rc.cpp:2205 rc.cpp:4628
+msgid "Alias:"
+msgstr "Ffugenw :"
+
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:105
+#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:54
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:105
+#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:54
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:2208 rc.cpp:2310 rc.cpp:2208 rc.cpp:2310
+msgid "&First name:"
+msgstr "&Enw cyntaf:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:128
+#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:80
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:128
+#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:80
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:2211 rc.cpp:2316 rc.cpp:2211 rc.cpp:2316
+msgid "&Last name:"
+msgstr "&Enw olaf:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:151
 #. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:1137 rc.cpp:1137
-msgid ""
-"To connect to the Microsoft network, you will need a Microsoft "
-"Passport.<br><br>If you do not currently have a Passport, please click the "
-"button to create one."
+#: rc.cpp:2214 rc.cpp:2214
+msgid "Gen&der:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:128
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, btnRegister)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:147
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:128
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:197
-#. i18n: ectx: property (text), widget (QPushButton, registerNew)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:260
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:128
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:163
-#. i18n: ectx: property (text), widget (QPushButton, btnRegister)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:147
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:128
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:197
-#. i18n: ectx: property (text), widget (QPushButton, registerNew)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:260
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#: rc.cpp:1140 rc.cpp:1907 rc.cpp:2501 rc.cpp:2933 rc.cpp:3261 rc.cpp:4590
-#: rc.cpp:1140 rc.cpp:1907 rc.cpp:2501 rc.cpp:2933 rc.cpp:3261 rc.cpp:4590
-msgid "Re&gister New Account"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:164
+#. i18n: ectx: property (text), widget (QLabel, maritalLabel)
+#: rc.cpp:2217 rc.cpp:2217
+msgid "Marital status:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:166
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:1146 rc.cpp:1146
-msgid "Blocked contacts:"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:190
+#. i18n: ectx: property (text), widget (QLabel, textLabel7)
+#: rc.cpp:2220 rc.cpp:2220
+msgid "&Timezone:"
+msgstr "&Amserfa:"
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:213
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1149 rc.cpp:1149
-msgid "Allowed contacts:"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:214
+#. i18n: ectx: property (text), widget (QLabel, birthdayDayLabel)
+#: rc.cpp:2226 rc.cpp:2226
+msgid "Day:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:238
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1152 rc.cpp:1152
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head><body>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"style:italic;\">Italics</span> contacts are not on your contact "
-"list.</p></body></html>"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:234
+#. i18n: ectx: property (text), widget (QLabel, birthdayMonthLabel)
+#: rc.cpp:2229 rc.cpp:2229
+msgid "Month:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:256
-#. i18n: ectx: property (text), widget (QLabel, m_warning)
-#: rc.cpp:1157 rc.cpp:1157
-msgid "WARNING: You need to be connected to modify this page"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:257
+#. i18n: ectx: property (text), widget (QLabel, birthdayYearLabel)
+#: rc.cpp:2232 rc.cpp:2232
+msgid "Year:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:267
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:267
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:285
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:1160 rc.cpp:1922 rc.cpp:1160 rc.cpp:1922
-msgid "Co&nnection"
-msgstr "Cy&sylltiad"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:300
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#: rc.cpp:2235 rc.cpp:2235
+msgid "A&ge:"
+msgstr "O&edran :"
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:273
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:1163 rc.cpp:1163
-msgid "Connection Preferences (for advanced users)"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:337
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2238 rc.cpp:2238
+msgid "Spoken Languages"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:279
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:332
-#. i18n: ectx: property (text), widget (QCheckBox, cbCustomServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:299
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:288
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:329
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:279
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:332
-#. i18n: ectx: property (text), widget (QCheckBox, cbCustomServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:299
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:288
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:329
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#: rc.cpp:1166 rc.cpp:1940 rc.cpp:2549 rc.cpp:2969 rc.cpp:4599 rc.cpp:1166
-#: rc.cpp:1940 rc.cpp:2549 rc.cpp:2969 rc.cpp:4599
-msgid "&Override default server information"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:361
+#. i18n: ectx: property (text), widget (QLabel, language1Label)
+#: rc.cpp:2241 rc.cpp:2241
+msgid "First:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:309
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:339
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:448
-#. i18n: ectx: property (text), widget (QLabel, lblProxyServer)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:376
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:309
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:339
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:448
-#. i18n: ectx: property (text), widget (QLabel, lblProxyServer)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:376
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#: rc.cpp:1169 rc.cpp:2558 rc.cpp:2594 rc.cpp:4602 rc.cpp:1169 rc.cpp:2558
-#: rc.cpp:2594 rc.cpp:4602
-msgid "Ser&ver /"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:374
+#. i18n: ectx: property (text), widget (QLabel, language2Label)
+#: rc.cpp:2244 rc.cpp:2244
+msgid "Second:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:322
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:766
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:389
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:322
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:766
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:389
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#: rc.cpp:1172 rc.cpp:3378 rc.cpp:4605 rc.cpp:1172 rc.cpp:3378 rc.cpp:4605
-msgid "po&rt:"
-msgstr "po&rth:"
+#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:387
+#. i18n: ectx: property (text), widget (QLabel, language3Label)
+#: rc.cpp:2247 rc.cpp:2247
+msgid "Third:"
+msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:343
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_serverName)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:346
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_serverName)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:359
-#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:362
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:420
-#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:423
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:448
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_serverName)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:451
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_serverName)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:343
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_serverName)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:346
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_serverName)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:359
-#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:362
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:420
-#. i18n: ectx: property (toolTip), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:423
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, m_serverPort)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:448
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_serverName)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:451
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_serverName)
-#: rc.cpp:1175 rc.cpp:1178 rc.cpp:1184 rc.cpp:1187 rc.cpp:4608 rc.cpp:4611
-#: rc.cpp:4614 rc.cpp:4617 rc.cpp:1175 rc.cpp:1178 rc.cpp:1184 rc.cpp:1187
-#: rc.cpp:4608 rc.cpp:4611 rc.cpp:4614 rc.cpp:4617
-msgid ""
-"Only modify these values if you want to use a special IM proxy server, like "
-"SIMP"
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:47
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:47
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2250 rc.cpp:3866 rc.cpp:2250 rc.cpp:3866
+msgid "Company Location Information"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:349
-#. i18n: ectx: property (text), widget (KLineEdit, m_serverName)
-#: rc.cpp:1181 rc.cpp:1181
-msgid "messenger.hotmail.com"
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:114
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:114
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:2256 rc.cpp:3878 rc.cpp:2256 rc.cpp:3878
+msgid "Address:"
+msgstr "Cyfeiriad:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:290
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:399
+#. i18n: ectx: property (text), widget (QLabel, lblState)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:290
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:399
+#. i18n: ectx: property (text), widget (QLabel, lblState)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:2262 rc.cpp:2447 rc.cpp:2906 rc.cpp:3872 rc.cpp:2262 rc.cpp:2447
+#: rc.cpp:2906 rc.cpp:3872
+msgid "State:"
+msgstr "Talaith:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:114
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:71
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:114
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:71
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:2265 rc.cpp:3869 rc.cpp:2265 rc.cpp:3869
+msgid "Zip:"
+msgstr "Zip :"
+
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:170
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:190
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:170
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:190
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2274 rc.cpp:3890 rc.cpp:2274 rc.cpp:3890
+msgid "Personal Work Information"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:380
-#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:408
-#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:380
-#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:408
-#. i18n: ectx: property (text), widget (QCheckBox, optionEnableProxy)
-#: rc.cpp:1190 rc.cpp:2585 rc.cpp:1190 rc.cpp:2585
-msgid "Enable Proxy"
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:228
+#. i18n: ectx: property (text), widget (QLabel, occupationLabel)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:628
+#. i18n: ectx: property (text), widget (QLabel, lblOccupation)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:228
+#. i18n: ectx: property (text), widget (QLabel, occupationLabel)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:628
+#. i18n: ectx: property (text), widget (QLabel, lblOccupation)
+#: rc.cpp:2283 rc.cpp:2966 rc.cpp:2283 rc.cpp:2966
+msgid "Occupation:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:410
-#. i18n: ectx: property (text), widget (QLabel, m_labelProxyHost)
-#: rc.cpp:1193 rc.cpp:1193
-msgid "Host /"
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:248
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:227
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:248
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:227
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#: rc.cpp:2286 rc.cpp:3893 rc.cpp:2286 rc.cpp:3893
+msgid "Phone:"
+msgstr "Ffôn:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:34
+#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
+#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:48
+#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:34
+#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
+#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:48
+#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
+#: rc.cpp:2292 rc.cpp:2514 rc.cpp:2292 rc.cpp:2514
+msgid "ICQ number:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:420
-#. i18n: ectx: property (text), widget (QLabel, m_labelProxyPort)
-#: rc.cpp:1196 rc.cpp:1196
-msgid "port:"
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:47
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:2295 rc.cpp:2295
+msgid "Alternatively, you can search the ICQ Whitepages :"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:468
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioProxyHttp)
-#: rc.cpp:1199 rc.cpp:1199
-msgid "HTTP"
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:84
+#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
+#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:28
+#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
+#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:84
+#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
+#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:28
+#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
+#: rc.cpp:2301 rc.cpp:2511 rc.cpp:2301 rc.cpp:2511
+msgid "AOL screen name:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:481
-#. i18n: ectx: property (text), widget (QRadioButton, m_radioProxySocks5)
-#: rc.cpp:1202 rc.cpp:1202
-msgid "Socks5"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:35
+#. i18n: ectx: attribute (title), widget (QWidget, tabWhitepages)
+#: rc.cpp:2304 rc.cpp:2304
+msgid "ICQ Whitepages Search"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:491
-#. i18n: ectx: property (text), widget (QLabel, m_labelProxyUsername)
-#: rc.cpp:1205 rc.cpp:1205
-msgid "Username:"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:67
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:67
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:67
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:67
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#: rc.cpp:2313 rc.cpp:3797 rc.cpp:2313 rc.cpp:3797
+msgid "&Email:"
+msgstr "E&bost:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:93
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#: rc.cpp:2319 rc.cpp:2319
+msgid "&Gender:"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:508
-#. i18n: ectx: property (text), widget (QLabel, m_labelProxyPassword)
-#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:60
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:508
-#. i18n: ectx: property (text), widget (QLabel, m_labelProxyPassword)
-#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:60
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1208 rc.cpp:5117 rc.cpp:1208 rc.cpp:5117
-msgid "Password:"
-msgstr "Cyfrinair:"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:106
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:338
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:106
+#. i18n: ectx: property (text), widget (QLabel, textLabel10)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:78
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:338
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:2322 rc.cpp:2417 rc.cpp:3833 rc.cpp:2322 rc.cpp:2417 rc.cpp:3833
+msgid "&City:"
+msgstr "&Dinas:"
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:553
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:1214 rc.cpp:1214
-msgid "General Options"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:119
+#. i18n: ectx: property (text), widget (QLabel, textLabel9)
+#: rc.cpp:2325 rc.cpp:2325
+msgid "Lan&guage:"
+msgstr "Iai&th:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:132
+#. i18n: ectx: property (text), widget (QLabel, textLabel11)
+#: rc.cpp:2328 rc.cpp:2328
+msgid "C&ountry:"
+msgstr "G&wlad:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:145
+#. i18n: ectx: property (text), widget (QCheckBox, onlyOnline)
+#: rc.cpp:2331 rc.cpp:2331
+msgid "Only search for online contacts"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:559
-#. i18n: ectx: property (text), widget (QCheckBox, m_doNotSendEmoticons)
-#: rc.cpp:1217 rc.cpp:1217
-msgid "Do not send custom emoticons to other contacts"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:169
+#. i18n: ectx: attribute (title), widget (QWidget, tabUIN)
+#: rc.cpp:2334 rc.cpp:2334
+msgid "UIN Search"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaccountpreferences.ui:566
-#. i18n: ectx: property (text), widget (QCheckBox, m_doNotRequestEmoticons)
-#: rc.cpp:1220 rc.cpp:1220
-msgid "Do not show custom emoticons from other contacts"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:221
+#. i18n: ectx: property (whatsThis), widget (QTreeView, searchResults)
+#: rc.cpp:2340 rc.cpp:2340
+msgid ""
+"This is where the results from your search are displayed. If you double-"
+"click a result, the search window will close and pass the UIN of the contact "
+"you wish to add back to the Add Contact Wizard. You can only add one contact "
+"at a time."
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:17
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:20
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:36
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_uniqueName)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:39
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_uniqueName)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:30
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:33
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:46
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_uniqueName)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_uniqueName)
-#. i18n: file: protocols/groupwise/gwaddui.ui:44
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/groupwise/gwaddui.ui:47
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/groupwise/gwaddui.ui:55
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#. i18n: file: protocols/groupwise/gwaddui.ui:58
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:17
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:20
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:36
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_uniqueName)
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:39
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_uniqueName)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:30
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:33
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:46
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_uniqueName)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_uniqueName)
-#. i18n: file: protocols/groupwise/gwaddui.ui:44
-#. i18n: ectx: property (toolTip), widget (QLabel)
-#. i18n: file: protocols/groupwise/gwaddui.ui:47
-#. i18n: ectx: property (whatsThis), widget (QLabel)
-#. i18n: file: protocols/groupwise/gwaddui.ui:55
-#. i18n: ectx: property (toolTip), widget (QLineEdit)
-#. i18n: file: protocols/groupwise/gwaddui.ui:58
-#. i18n: ectx: property (whatsThis), widget (QLineEdit)
-#: rc.cpp:1223 rc.cpp:1226 rc.cpp:1232 rc.cpp:1235 rc.cpp:4522 rc.cpp:4525
-#: rc.cpp:4531 rc.cpp:4534 rc.cpp:5043 rc.cpp:5046 rc.cpp:5049 rc.cpp:5052
-#: rc.cpp:1223 rc.cpp:1226 rc.cpp:1232 rc.cpp:1235 rc.cpp:4522 rc.cpp:4525
-#: rc.cpp:4531 rc.cpp:4534 rc.cpp:5043 rc.cpp:5046 rc.cpp:5049 rc.cpp:5052
-msgid "The account name of the account you would like to add."
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:239
+#. i18n: ectx: property (whatsThis), widget (KPushButton, searchButton)
+#: rc.cpp:2343 rc.cpp:2343
+msgid "Search the ICQ Whitepages with your search criteria"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:23
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1229 rc.cpp:1229
-msgid "&WLM passport:"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:252
+#. i18n: ectx: property (whatsThis), widget (KPushButton, clearButton)
+#: rc.cpp:2349 rc.cpp:2349
+msgid "Clears both search fields and results"
 msgstr ""
 
-#. i18n: file: protocols/wlm/ui/wlmaddui.ui:46
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:1238 rc.cpp:1238
-msgid "<i>(for example: joe@hotmail.com)</i>"
-msgstr ""
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:255
+#. i18n: ectx: property (text), widget (KPushButton, clearButton)
+#: rc.cpp:2352 kopete/statusmenu/kopetestatuseditaction.cpp:39 rc.cpp:2352
+msgid "C&lear"
+msgstr "&Gwaredu"
 
-#. i18n: file: protocols/wlm/wlmchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/jabber/jabberchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/yahoo/yahooconferenceui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/qq/qqchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/groupwise/gwchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/wlm/wlmchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/jabber/jabberchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/yahoo/yahooconferenceui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/qq/qqchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: protocols/groupwise/gwchatui.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:1241 rc.cpp:1709 rc.cpp:3855 rc.cpp:4357 rc.cpp:5037 rc.cpp:6185
-#: rc.cpp:6209 rc.cpp:1241 rc.cpp:1709 rc.cpp:3855 rc.cpp:4357 rc.cpp:5037
-#: rc.cpp:6185 rc.cpp:6209
-msgid "&Chat"
-msgstr "&Sgwrsio"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:265
+#. i18n: ectx: property (whatsThis), widget (KPushButton, stopButton)
+#: rc.cpp:2355 rc.cpp:2355
+msgid "Stops the search"
+msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, MeanwhileAddUI)
-#: rc.cpp:1244 rc.cpp:1244
-msgid "Add Sametime Contact"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:268
+#. i18n: ectx: property (text), widget (KPushButton, stopButton)
+#: rc.cpp:2358 rc.cpp:2358
+msgid "Stop"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:27
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:30
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:46
-#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:27
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:30
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:46
-#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
-#: rc.cpp:1247 rc.cpp:1250 rc.cpp:1256 rc.cpp:1259 rc.cpp:1247 rc.cpp:1250
-#: rc.cpp:1256 rc.cpp:1259
-msgid "The user ID of the contact you would like to add."
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:281
+#. i18n: ectx: property (whatsThis), widget (KPushButton, userInfoButton)
+#: rc.cpp:2361 rc.cpp:2361
+msgid "Show information about the selected contact"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:33
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:103
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:33
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:103
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1253 rc.cpp:4986 rc.cpp:1253 rc.cpp:4986
-msgid "&User ID:"
-msgstr "C&lustnod Defnyddiwr:"
+#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:284
+#. i18n: ectx: property (text), widget (KPushButton, userInfoButton)
+#: rc.cpp:2364 rc.cpp:2364
+msgid "User Info"
+msgstr "Gwybodaeth am Ddefnyddwyr"
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:56
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnFindUser)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:59
-#. i18n: ectx: property (whatsThis), widget (QPushButton, btnFindUser)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:56
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnFindUser)
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:59
-#. i18n: ectx: property (whatsThis), widget (QPushButton, btnFindUser)
-#: rc.cpp:1262 rc.cpp:1265 rc.cpp:1262 rc.cpp:1265
-msgid "Find User ID"
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2367 rc.cpp:2367
+msgid "Email Addresses"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:62
-#. i18n: ectx: property (text), widget (QPushButton, btnFindUser)
-#: rc.cpp:1268 rc.cpp:1268
-msgid "&Find"
-msgstr "&Canfod"
-
-#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:71
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:1271 rc.cpp:1271
-msgid "<i>(for example: johndoe)</i>"
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:112
+#. i18n: ectx: property (text), widget (QCheckBox, sendInfoCheck)
+#: rc.cpp:2382 rc.cpp:2382
+msgid "Send updates and ICQ promotional info to my primary email"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, MeanwhileEditAccount)
-#: rc.cpp:1274 rc.cpp:1274
-msgid "Edit Meanwhile Account"
+#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:119
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2385 rc.cpp:2385
+msgid "Non-published email will be used for password retrieval purposes."
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:49
-#. i18n: ectx: property (toolTip), widget (QLabel, label1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:52
-#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:68
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:71
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:49
-#. i18n: ectx: property (toolTip), widget (QLabel, label1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:52
-#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:68
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:71
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
-#: rc.cpp:1283 rc.cpp:1286 rc.cpp:1292 rc.cpp:1295 rc.cpp:1283 rc.cpp:1286
-#: rc.cpp:1292 rc.cpp:1295
-msgid "Your Sametime user ID"
+#. i18n: file: protocols/oscar/icq/ui/icqorgaffinfowidget.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2391 rc.cpp:2391
+msgid "Organization Type"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label1)
-#: rc.cpp:1289 rc.cpp:1289
-msgid "Meanwhile &username:"
+#. i18n: file: protocols/oscar/icq/ui/icqorgaffinfowidget.ui:88
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2394 rc.cpp:2394
+msgid "Past Affiliation"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:83
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:106
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAutoConnect)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:134
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:83
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:106
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAutoConnect)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:134
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoConnect)
-#: rc.cpp:1298 rc.cpp:1892 rc.cpp:3597 rc.cpp:1298 rc.cpp:1892 rc.cpp:3597
+#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:100
+#. i18n: ectx: property (text), widget (QLabel, lblStatus)
+#: rc.cpp:2406 rc.cpp:2406
 msgid ""
-"Check to disable automatic connection.  If checked, you can connect manually "
-"to this account, using the icon at the bottom of the main Kopete window"
+"Please enter your current password first\n"
+"and then your new password twice.\n"
+"Password have to be between 6-8 characters long."
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:97
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1304 rc.cpp:1304
-msgid "Connection"
-msgstr "Cysylltiad"
-
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:109
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox54)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:288
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:297
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:287
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:267
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:262
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:279
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:308
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:109
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox54)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:288
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:297
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:287
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:267
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:262
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:279
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:308
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:31
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:1307 rc.cpp:1481 rc.cpp:1925 rc.cpp:2546 rc.cpp:2966 rc.cpp:3267
-#: rc.cpp:3621 rc.cpp:4596 rc.cpp:1307 rc.cpp:1481 rc.cpp:1925 rc.cpp:2546
-#: rc.cpp:2966 rc.cpp:3267 rc.cpp:3621 rc.cpp:4596
-msgid "Connection Preferences"
-msgstr ""
-
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:119
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:122
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:138
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mServerName)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:141
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServerName)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:119
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:122
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:138
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mServerName)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:141
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServerName)
-#: rc.cpp:1310 rc.cpp:1313 rc.cpp:1319 rc.cpp:1322 rc.cpp:1310 rc.cpp:1313
-#: rc.cpp:1319 rc.cpp:1322
-msgid ""
-"The IP address or hostname of the Sametime server you wish to connect to."
+#: rc.cpp:2411 rc.cpp:2411
+msgid "Location && Contact Information"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:125
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:381
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:340
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:352
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:186
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:125
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:381
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:340
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:352
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:186
-#. i18n: ectx: property (text), widget (QLabel, labelServer)
-#: rc.cpp:1316 rc.cpp:1949 rc.cpp:2978 rc.cpp:3633 rc.cpp:5007 rc.cpp:1316
-#: rc.cpp:1949 rc.cpp:2978 rc.cpp:3633 rc.cpp:5007
-msgid "Ser&ver:"
-msgstr "Gweinydd:"
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:55
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:289
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:55
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:289
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2414 rc.cpp:3827 rc.cpp:2414 rc.cpp:3827
+msgid "&Address:"
+msgstr "Cyf&eiriad:"
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:152
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:171
-#. i18n: ectx: property (toolTip), widget (QSpinBox, mServerPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:152
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:171
-#. i18n: ectx: property (toolTip), widget (QSpinBox, mServerPort)
-#: rc.cpp:1325 rc.cpp:1334 rc.cpp:1325 rc.cpp:1334
-msgid "The port on the Sametime server that you would like to connect to."
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:101
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:279
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:101
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:279
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:2420 rc.cpp:3824 rc.cpp:2420 rc.cpp:3824
+msgid "&State:"
+msgstr "&Talaith:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:124
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:348
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:124
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:348
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:2423 rc.cpp:3836 rc.cpp:2423 rc.cpp:3836
+msgid "&Zip:"
+msgstr "&Zip :"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:150
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:299
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:150
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:299
+#. i18n: ectx: property (text), widget (QLabel, textLabel8)
+#: rc.cpp:2426 rc.cpp:3830 rc.cpp:2426 rc.cpp:3830
+msgid "Countr&y:"
+msgstr "Gwlad:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:163
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:156
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:163
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:156
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:2429 rc.cpp:3809 rc.cpp:2429 rc.cpp:3809
+msgid "&Phone:"
+msgstr "&Ffôn:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:183
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:212
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:183
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:212
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
+#: rc.cpp:2432 rc.cpp:3818 rc.cpp:2432 rc.cpp:3818
+msgid "Ce&ll:"
+msgstr "Ce&ll:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:206
+#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:133
+#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:206
+#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:133
+#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
+#: rc.cpp:2435 rc.cpp:3806 rc.cpp:2435 rc.cpp:3806
+msgid "Fa&x:"
+msgstr "Ff&acs:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:223
+#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:202
+#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:223
+#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:202
+#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
+#: rc.cpp:2438 rc.cpp:3815 rc.cpp:2438 rc.cpp:3815
+msgid "&Homepage:"
+msgstr "T&udalen Gartref:"
+
+#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:249
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:2441 rc.cpp:2441
+msgid "Origin"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:155
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:174
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, mServerPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:155
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:174
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, mServerPort)
-#: rc.cpp:1328 rc.cpp:1337 rc.cpp:1328 rc.cpp:1337
-msgid ""
-"The port on the Sametime server that you would like to connect to.  Usually "
-"this is 1533."
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:28
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:2465 rc.cpp:2465
+msgid "Icon:"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:158
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:422
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:358
-#. i18n: ectx: property (text), widget (QLabel, lblServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:467
-#. i18n: ectx: property (text), widget (QLabel, lblProxyServerPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:375
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:236
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:158
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:422
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:358
-#. i18n: ectx: property (text), widget (QLabel, lblServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:467
-#. i18n: ectx: property (text), widget (QLabel, lblProxyServerPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:375
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:236
-#. i18n: ectx: property (text), widget (QLabel, labelPort)
-#: rc.cpp:1331 rc.cpp:1964 rc.cpp:2567 rc.cpp:2603 rc.cpp:2996 rc.cpp:5022
-#: rc.cpp:1331 rc.cpp:1964 rc.cpp:2567 rc.cpp:2603 rc.cpp:2996 rc.cpp:5022
-msgid "Po&rt:"
-msgstr "Po&rth:"
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:64
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:30
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:124
+#. i18n: ectx: property (text), widget (QLabel, lblStatusMessage)
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:159
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:64
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:30
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:124
+#. i18n: ectx: property (text), widget (QLabel, lblStatusMessage)
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:159
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:2471 rc.cpp:5591 rc.cpp:5768 rc.cpp:6196 rc.cpp:2471 rc.cpp:5591
+#: rc.cpp:5768 rc.cpp:6196
+msgid "Message:"
+msgstr "Neges:"
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:204
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox5)
-#: rc.cpp:1340 rc.cpp:1340
-msgid "Client Identifier"
+#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:77
+#. i18n: ectx: property (text), widget (QCheckBox, checkAppend)
+#: rc.cpp:2474 rc.cpp:2474
+msgid "Append to menu"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:216
-#. i18n: ectx: property (text), widget (QCheckBox, chkCustomClientID)
-#: rc.cpp:1343 rc.cpp:1343
-msgid "Use custom client identifier"
+#. i18n: file: protocols/oscar/icq/ui/icqinterestinfowidget.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2477 rc.cpp:2477
+msgid "Interests"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:235
-#. i18n: ectx: property (text), widget (QLabel, lblClientIdentifier)
-#: rc.cpp:1346 rc.cpp:1346
-msgid "Client identifier:"
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ICQAuthReplyUI)
+#: rc.cpp:2480 rc.cpp:2480
+msgid "ICQ Authorization Reply"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:263
-#. i18n: ectx: property (text), widget (QLabel, lblVersionSeparator)
-#: rc.cpp:1349 rc.cpp:1349
-msgid "."
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:34
+#. i18n: ectx: property (text), widget (QLabel, lblUserReq)
+#: rc.cpp:2484 rc.cpp:2484
+#, kde-format, no-c-format
+msgid "%1 requested authorization to add you to his/her contact list."
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:291
-#. i18n: ectx: property (text), widget (QLabel, lblClientVersion)
-#: rc.cpp:1352 rc.cpp:1352
-msgid "Client version (major.minor):"
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:64
+#. i18n: ectx: property (text), widget (QLabel, lblReqReason)
+#: rc.cpp:2487 rc.cpp:2487
+msgid "Request Reason:"
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:315
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnServerDefaults)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:318
-#. i18n: ectx: property (whatsThis), widget (QPushButton, btnServerDefaults)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:315
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnServerDefaults)
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:318
-#. i18n: ectx: property (whatsThis), widget (QPushButton, btnServerDefaults)
-#: rc.cpp:1355 rc.cpp:1358 rc.cpp:1355 rc.cpp:1358
-msgid "Restore the server and port values to their defaults."
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:77
+#. i18n: ectx: property (text), widget (QLabel, lblRequestReason)
+#: rc.cpp:2490 rc.cpp:2490
+msgid "Some reason..."
 msgstr ""
 
-#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:321
-#. i18n: ectx: property (text), widget (QPushButton, btnServerDefaults)
-#: rc.cpp:1361 rc.cpp:1361
-msgid "Restore &Defaults"
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:135
+#. i18n: ectx: property (text), widget (QRadioButton, rbGrant)
+#: rc.cpp:2493 rc.cpp:2493
+msgid "&Grant authorization"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, NetworkConfig)
-#: rc.cpp:1364 rc.cpp:1364
-msgid "Network Configuration"
-msgstr "Ffurfweddiad y Rhwydwaith"
-
-#. i18n: file: protocols/irc/ui/networkconfig.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:1367 rc.cpp:1367
-msgid "Host Con&figurations"
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:145
+#. i18n: ectx: property (text), widget (QRadioButton, rbDecline)
+#: rc.cpp:2496 rc.cpp:2496
+msgid "&Decline authorization"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, m_newHost)
-#: rc.cpp:1370 rc.cpp:1370
-msgid "&New..."
-msgstr "&Newydd..."
+#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:193
+#. i18n: ectx: property (text), widget (QLabel, lblReason)
+#: rc.cpp:2499 rc.cpp:2499
+msgid "Reason:"
+msgstr "Rheswm:"
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:91
-#. i18n: ectx: property (toolTip), widget (Q3ListBox, m_hostList)
-#: rc.cpp:1376 rc.cpp:1376
-msgid "The IRC servers associated with this network"
+#. i18n: file: protocols/oscar/oscarencodingselectionbase.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:2502 rc.cpp:2502
+msgid "Use this &encoding when chatting with this contact:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:94
-#. i18n: ectx: property (whatsThis), widget (Q3ListBox, m_hostList)
-#: rc.cpp:1379 rc.cpp:1379
+#. i18n: file: protocols/oscar/oscarlistcontactsbase.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2505 rc.cpp:2505
 msgid ""
-"The IRC servers associated with this network. Use the up and down buttons to "
-"alter the order in which connections are attempted."
+"The following contacts are not on your contact list. Would you like to add "
+"them?"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:104
-#. i18n: ectx: property (toolTip), widget (QPushButton, downButton)
-#: rc.cpp:1382 rc.cpp:1382
-msgid "Move this server down"
-msgstr ""
+#. i18n: file: protocols/oscar/oscarlistcontactsbase.ui:39
+#. i18n: ectx: property (text), widget (QCheckBox, doNotShowAgain)
+#: rc.cpp:2508 rc.cpp:2508
+msgid "Do &not ask again"
+msgstr "P&eidio a gofyn eto"
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:107
-#. i18n: ectx: property (whatsThis), widget (QPushButton, downButton)
-#: rc.cpp:1385 rc.cpp:1385
-msgid "Decrease connection-attempt priority for this server"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, aimEditAccountUI)
+#: rc.cpp:2517 rc.cpp:2517
+msgid "Account Preferences - AIM"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:110
-#. i18n: ectx: property (text), widget (QPushButton, downButton)
-#. i18n: file: protocols/jabber/ui/privacy.ui:263
-#. i18n: ectx: property (text), widget (KPushButton, pb_down)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, buttonDown)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:103
-#. i18n: ectx: property (text), widget (QPushButton, downEmailButton)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:110
-#. i18n: ectx: property (text), widget (QPushButton, downButton)
-#. i18n: file: protocols/jabber/ui/privacy.ui:263
-#. i18n: ectx: property (text), widget (KPushButton, pb_down)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, buttonDown)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:103
-#. i18n: ectx: property (text), widget (QPushButton, downEmailButton)
-#: rc.cpp:1388 rc.cpp:2229 rc.cpp:2735 rc.cpp:2876 rc.cpp:1388 rc.cpp:2229
-#: rc.cpp:2735 rc.cpp:2876
-msgid "Down"
-msgstr "I Lawr"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:147
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:2529 rc.cpp:2529
+msgid ""
+"To connect to the AOL Instant Messaging network, you will need to use a "
+"screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an "
+"AIM screen name, please click the button to create one."
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:120
-#. i18n: ectx: property (toolTip), widget (QPushButton, upButton)
-#: rc.cpp:1391 rc.cpp:1391
-msgid "Move this server up"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:201
+#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:217
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:201
+#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:217
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
+#: rc.cpp:2535 rc.cpp:2544 rc.cpp:2535 rc.cpp:2544
+msgid "The screen name of your AIM account."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:123
-#. i18n: ectx: property (whatsThis), widget (QPushButton, upButton)
-#: rc.cpp:1394 rc.cpp:1394
-msgid "Increase connection-attempt priority for this server"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:204
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:220
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:204
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:220
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
+#: rc.cpp:2538 rc.cpp:2547 rc.cpp:2538 rc.cpp:2547
+msgid ""
+"The screen name of your AIM account.  This should be in the form of an "
+"alphanumeric string (spaces allowed, not case sensitive)."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:126
-#. i18n: ectx: property (text), widget (QPushButton, upButton)
-#. i18n: file: protocols/jabber/ui/privacy.ui:256
-#. i18n: ectx: property (text), widget (KPushButton, pb_up)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, buttonUp)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:96
-#. i18n: ectx: property (text), widget (QPushButton, upEmailButton)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:126
-#. i18n: ectx: property (text), widget (QPushButton, upButton)
-#. i18n: file: protocols/jabber/ui/privacy.ui:256
-#. i18n: ectx: property (text), widget (KPushButton, pb_up)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatuseditorui.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, buttonUp)
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:96
-#. i18n: ectx: property (text), widget (QPushButton, upEmailButton)
-#: rc.cpp:1397 rc.cpp:2226 rc.cpp:2732 rc.cpp:2873 rc.cpp:1397 rc.cpp:2226
-#: rc.cpp:2732 rc.cpp:2873
-msgid "Up"
-msgstr "I fyny"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:207
+#. i18n: ectx: property (text), widget (QLabel, lblAccountId)
+#: rc.cpp:2541 rc.cpp:2541
+msgid "AIM &screen name:"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:154
-#. i18n: ectx: property (toolTip), widget (QCheckBox, useSSL)
-#: rc.cpp:1400 rc.cpp:1400
-msgid "Check this to enable SSL for this connection"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:246
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:287
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:246
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:287
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:2556 rc.cpp:2780 rc.cpp:2556 rc.cpp:2780
+msgid "Accou&nt Preferences"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:157
-#. i18n: ectx: property (text), widget (QCheckBox, useSSL)
-#: rc.cpp:1403 rc.cpp:1403
-msgid "Use SS&L"
-msgstr "Defnyddier SS&L"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:334
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:353
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:334
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:353
+#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
+#: rc.cpp:2565 rc.cpp:2574 rc.cpp:2565 rc.cpp:2574
+msgid "The IP address or hostmask of the AIM server you wish to connect to."
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:164
-#. i18n: ectx: property (text), widget (QLabel, m_hostLabel)
-#: rc.cpp:1406 rc.cpp:1406
-msgid "&Host:"
-msgstr "&Gwesteiwr:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:337
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:356
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:337
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:356
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
+#: rc.cpp:2568 rc.cpp:2577 rc.cpp:2568 rc.cpp:2577
+msgid ""
+"The IP address or hostmask of the AIM server you wish to connect to.  "
+"Normally you will want the default (login.oscar.aol.com)."
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:184
-#. i18n: ectx: property (text), widget (QLabel, m_portLabel)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:728
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/irc/ui/networkconfig.ui:184
-#. i18n: ectx: property (text), widget (QLabel, m_portLabel)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:728
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:1409 rc.cpp:2023 rc.cpp:1409 rc.cpp:2023
-msgid "Por&t:"
-msgstr "Por&th:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:359
+#. i18n: ectx: property (text), widget (QLineEdit, edtServerAddress)
+#: rc.cpp:2580 rc.cpp:2580
+msgid "login.oscar.aol.com"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:218
-#. i18n: ectx: property (text), widget (QLabel, m_descriptionLabel)
-#: rc.cpp:1412 rc.cpp:1412
-msgid "&Description:"
-msgstr "&Disgrifiad:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:369
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:388
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxServerPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:369
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:388
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxServerPort)
+#: rc.cpp:2583 rc.cpp:2592 rc.cpp:2583 rc.cpp:2592
+msgid "The port on the AIM server that you would like to connect to."
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:242
-#. i18n: ectx: property (text), widget (QPushButton, m_newNetworkButton)
-#: rc.cpp:1421 rc.cpp:1421
-msgid "Ne&w"
-msgstr "Ne&wydd"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:372
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:391
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:372
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:391
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
+#: rc.cpp:2586 rc.cpp:2595 rc.cpp:2586 rc.cpp:2595
+msgid ""
+"The port on the AIM server that you would like to connect to.  Normally this "
+"is 5190."
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:275
-#. i18n: ectx: property (text), widget (QPushButton, m_renameNetworkButton)
-#: rc.cpp:1424 rc.cpp:1424
-msgid "Rena&me..."
-msgstr "Ail-&enwi..."
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:412
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:2598 rc.cpp:2598
+msgid "Direct Connect Options"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/networkconfig.ui:282
-#. i18n: ectx: property (text), widget (QPushButton, m_removeNetworkButton)
-#: rc.cpp:1427 rc.cpp:1427
-msgid "Remo&ve"
-msgstr "&Gwaredu"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:663
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:2652 rc.cpp:2652
+msgid "Visibility Settings"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:83
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_nickNamesLabel)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:163
-#. i18n: ectx: property (toolTip), widget (QLineEdit, nickNames)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:83
-#. i18n: ectx: property (whatsThis), widget (QLabel, m_nickNamesLabel)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:163
-#. i18n: ectx: property (toolTip), widget (QLineEdit, nickNames)
-#: rc.cpp:1436 rc.cpp:1463 rc.cpp:1436 rc.cpp:1463
-msgid "This is the name that everyone will see every time you say something"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:687
+#. i18n: ectx: property (text), widget (QRadioButton, rbAllowPerimtList)
+#: rc.cpp:2655 rc.cpp:2655
+msgid "Allow only from visible list"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:86
-#. i18n: ectx: property (text), widget (QLabel, m_nickNamesLabel)
-#: rc.cpp:1439 rc.cpp:1439
-msgid "N&icknames:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:694
+#. i18n: ectx: property (text), widget (QRadioButton, rbAllowMyContacts)
+#: rc.cpp:2658 rc.cpp:2658
+msgid "Allow only contact list's users"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:96
-#. i18n: ectx: property (text), widget (QLabel, m_realNameLabel)
-#: rc.cpp:1442 rc.cpp:1442
-msgid "&Real name:"
-msgstr "&Enw go iawn:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:701
+#. i18n: ectx: property (text), widget (QRadioButton, rbAllowAll)
+#: rc.cpp:2661 rc.cpp:2661
+msgid "Allow all users"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:106
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:125
-#. i18n: ectx: property (toolTip), widget (QLineEdit, userName)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:128
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, userName)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:147
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, realName)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:106
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:125
-#. i18n: ectx: property (toolTip), widget (QLineEdit, userName)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:128
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, userName)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:147
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, realName)
-#: rc.cpp:1445 rc.cpp:1451 rc.cpp:1454 rc.cpp:1460 rc.cpp:1445 rc.cpp:1451
-#: rc.cpp:1454 rc.cpp:1460
-msgid ""
-"The username you would prefer to use on IRC, if your system does not have "
-"identd support.  Leave blank to use your system account name."
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:708
+#. i18n: ectx: property (text), widget (QRadioButton, rbBlockAll)
+#: rc.cpp:2664 rc.cpp:2664
+msgid "Block all users"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:109
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:1448 rc.cpp:1448
-msgid "&Username:"
-msgstr "&Enw Defnyddiwr:"
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:715
+#. i18n: ectx: property (text), widget (QRadioButton, rbBlockAIM)
+#: rc.cpp:2667 rc.cpp:2667
+msgid "Block AIM users"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:144
-#. i18n: ectx: property (toolTip), widget (QLineEdit, realName)
-#: rc.cpp:1457 rc.cpp:1457
-msgid ""
-"The username you would prefer to use on IRC, if your system does not have "
-"identd support."
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:722
+#. i18n: ectx: property (text), widget (QRadioButton, rbBlockDenyList)
+#: rc.cpp:2670 rc.cpp:2670
+msgid "Block only from invisible list"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:166
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, nickNames)
-#: rc.cpp:1466 rc.cpp:1466
-msgid ""
-"The alias you would like to use on IRC.  Once you are online, you can change "
-"it with the /nick command."
+#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:746
+#. i18n: ectx: attribute (title), widget (QWidget, tabVisible)
+#: rc.cpp:2673 rc.cpp:2673
+msgid "Visible"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:173
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
-#: rc.cpp:1469 rc.cpp:1469
-msgid "Network:"
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:63
+#. i18n: ectx: property (text), widget (QLabel, lblScreenName)
+#: rc.cpp:2706 rc.cpp:2706
+msgid "Screen name:"
+msgstr "Enw sgrîn:"
+
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:77
+#. i18n: ectx: property (text), widget (QLabel, lblWarnLevel)
+#: rc.cpp:2709 rc.cpp:2709
+msgid "Warning level:"
+msgstr "Lefel rybudd :"
+
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:91
+#. i18n: ectx: property (text), widget (QLabel, lblIdleTime)
+#: rc.cpp:2712 rc.cpp:2712
+msgid "Idle minutes:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:183
-#. i18n: ectx: property (text), widget (QPushButton, editButton)
-#: rc.cpp:1472 rc.cpp:1472
-msgid "&Edit..."
-msgstr "&Golygu..."
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:118
+#. i18n: ectx: property (text), widget (QLabel, lblOnlineSince)
+#: rc.cpp:2715 rc.cpp:2715
+msgid "Online since:"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:235
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:1475 rc.cpp:1475
-msgid ""
-"<p><b>Note:</b> most IRC servers do not require a password to connect, only "
-"a nickname.</p>"
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:138
+#. i18n: ectx: property (text), widget (QLabel, lblAwayMessage)
+#: rc.cpp:2718 rc.cpp:2718
+msgid "Away message:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:270
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:310
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:270
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:310
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:1478 rc.cpp:4134 rc.cpp:1478 rc.cpp:4134
-msgid "C&onnection"
+#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:158
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2721 rc.cpp:2721
+msgid "Profile:"
+msgstr "Proffiliau :"
+
+#. i18n: file: protocols/oscar/aim/ui/aimjoinchatbase.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:2724 rc.cpp:2724
+msgid "Please enter the name of the chat room you wish to join."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:308
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
-#: rc.cpp:1484 rc.cpp:1484
-msgid "Default &charset:"
+#. i18n: file: protocols/oscar/aim/ui/aimjoinchatbase.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:2727 rc.cpp:2727
+msgid "Room &name:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:339
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoConnect)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:96
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkAutoLogin)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:232
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoLogon)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:339
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoConnect)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:96
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkAutoLogin)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:232
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mAutoLogon)
-#: rc.cpp:1487 rc.cpp:2488 rc.cpp:2957 rc.cpp:1487 rc.cpp:2488 rc.cpp:2957
-msgid ""
-"If you enable this option, this account will not be connected when you press "
-"the \"Connect All\" button, nor at startup even if you have enabled "
-"automatic connection at startup."
+#. i18n: file: protocols/oscar/aim/ui/aimjoinchatbase.ui:71
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:2730 rc.cpp:2730
+msgid "E&xchange:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:349
-#. i18n: ectx: property (text), widget (QCheckBox, preferSSL)
-#: rc.cpp:1493 rc.cpp:1493
-msgid "&Prefer SSL-based connections"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, QQEditAccountUI)
+#: rc.cpp:2736 rc.cpp:2736
+msgid "Account Preferences - QQ"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:371
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox60)
-#: rc.cpp:1496 rc.cpp:1496
-msgid "Run the Following Commands on Connect"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:107
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:123
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_login)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:107
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:123
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_login)
+#: rc.cpp:2745 rc.cpp:2754 rc.cpp:2745 rc.cpp:2754
+msgid "The user ID of the QQ contact you would like to use."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:389
-#. i18n: ectx: property (toolTip), widget (QListView, commandList)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:392
-#. i18n: ectx: property (whatsThis), widget (QListView, commandList)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:389
-#. i18n: ectx: property (toolTip), widget (QListView, commandList)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:392
-#. i18n: ectx: property (whatsThis), widget (QListView, commandList)
-#: rc.cpp:1499 rc.cpp:1502 rc.cpp:1499 rc.cpp:1502
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:110
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:126
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_login)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:110
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_3)
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:126
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_login)
+#: rc.cpp:2748 rc.cpp:2757 rc.cpp:2748 rc.cpp:2757
 msgid ""
-"Any commands added here will be run as soon as you are connected to the IRC "
-"server."
+"The user ID of the QQ contact you would like to use.  This should be in the "
+"form of a valid E-mail address."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:417
-#. i18n: ectx: property (text), widget (QPushButton, addButton)
-#: rc.cpp:1505 rc.cpp:1505
-msgid "Add Co&mmand"
-msgstr "Ychwan&egu Gorchymyn"
-
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:438
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1508 rc.cpp:1508
-msgid "A&dvanced Configuration"
-msgstr "F&furfweddiad Uwch"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:113
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
+#: rc.cpp:2751 rc.cpp:2751
+msgid "&QQ ID:"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:462
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
-#: rc.cpp:1511 rc.cpp:1511
-msgid "Custom CTCP Replies"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:203
+#. i18n: ectx: property (text), widget (QPushButton, buttonVCard)
+#: rc.cpp:2766 rc.cpp:2766
+msgid "View && Update my vCard"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:480
-#. i18n: ectx: property (whatsThis), widget (QListView, ctcpList)
-#: rc.cpp:1514 rc.cpp:1514
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:250
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:2772 rc.cpp:2772
 msgid ""
-"You can use this dialog to add custom replies for when people send you CTCP "
-"requests. You can also use this dialog to override the built-in replies for "
-"VERSION, USERINFO, and CLIENTINFO."
+"To connect to the QQ network, you will need a QQ ID.\n"
+"\n"
+"If you do not currently have an ID, please create one."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:495
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:1517 rc.cpp:1517
-msgid "&CTCP:"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:454
+#. i18n: ectx: property (text), widget (QLineEdit, m_serverName)
+#: rc.cpp:2807 rc.cpp:2807
+msgid "tcpconn.tencent.com"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:508
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#: rc.cpp:1520 rc.cpp:1520
-msgid "&Reply:"
-msgstr "&Ymateb :"
-
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:521
-#. i18n: ectx: property (text), widget (QPushButton, addReply)
-#: rc.cpp:1523 rc.cpp:1523
-msgid "Add Repl&y"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:466
+#. i18n: ectx: property (title), widget (QGroupBox, global_settings_page)
+#: rc.cpp:2810 rc.cpp:2810
+msgid "Global QQ Options"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:533
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
-#: rc.cpp:1526 rc.cpp:1526
-msgid "Default Messages"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:487
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:2813 rc.cpp:2813
+msgid "<qt><b>Note:</b> These settings are applicable to all QQ accounts"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:545
-#. i18n: ectx: property (toolTip), widget (QLineEdit, quitMessage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:548
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, quitMessage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:545
-#. i18n: ectx: property (toolTip), widget (QLineEdit, quitMessage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:548
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, quitMessage)
-#: rc.cpp:1529 rc.cpp:1532 rc.cpp:1529 rc.cpp:1532
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:503
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, NotifyNewChat)
+#: rc.cpp:2816 rc.cpp:2816
 msgid ""
-"The message you want people to see when you disconnect from IRC without "
-"giving a reason. Leave this field blank to use the Kopete default message."
+"This option will notify you when a contact starts typing their message, "
+"before the message is sent or finished."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:555
-#. i18n: ectx: property (toolTip), widget (QLineEdit, partMessage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:558
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, partMessage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:555
-#. i18n: ectx: property (toolTip), widget (QLineEdit, partMessage)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:558
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, partMessage)
-#: rc.cpp:1535 rc.cpp:1538 rc.cpp:1535 rc.cpp:1538
-msgid ""
-"The message you want people to see when you part a channel without giving a "
-"reason. Leave this field blank to use the Kopete default message."
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:506
+#. i18n: ectx: property (text), widget (QCheckBox, NotifyNewChat)
+#: rc.cpp:2819 rc.cpp:2819
+msgid "Au&tomatically open a chat window when someone starts a conversation"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:565
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:1541 rc.cpp:1541
-msgid "&Quit message:"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:533
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1_4)
+#: rc.cpp:2822 rc.cpp:2822
+msgid ""
+"<qt><p>Indicate when Kopete will download the display pictures of "
+"contacts</p>\n"
+"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
+"It is only downloaded when the user requests it</dd>\n"
+"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
+"conversation socket is opened, i.e. when you open a chat window</dd>\n"
+"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
+"has one.  <b>Note:</b> this will open a socket, and let the user know you "
+"are downloading their picture.</dd></dl>"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:575
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:1544 rc.cpp:1544
-msgid "&Part message:"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:536
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#: rc.cpp:2828 rc.cpp:2828
+msgid "Download the QQ picture:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:597
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1547 rc.cpp:1547
-msgid "Windows"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:552
+#. i18n: ectx: property (whatsThis), widget (QComboBox, DownloadPicture)
+#: rc.cpp:2831 rc.cpp:2831
+msgid ""
+"<qt><p>Indicate when Kopete will download the pictures of contacts</p>\n"
+"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
+"It is only downloaded when the user requests it</dd>\n"
+"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
+"conversation socket is opened, i.e. when you open a chat window</dd>\n"
+"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
+"has one.  <b>Note:</b> this will open a socket, and let the user know you "
+"are downloading their picture.</dd></dl>"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:622
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox7)
-#: rc.cpp:1550 rc.cpp:1550
-msgid "Message Destinations"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:559
+#. i18n: ectx: property (text), item, widget (QComboBox, DownloadPicture)
+#: rc.cpp:2837 rc.cpp:2837
+msgid "Only Manually"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:634
-#. i18n: ectx: property (text), widget (QCheckBox, autoShowAnonWindows)
-#: rc.cpp:1553 rc.cpp:1553
-msgid "Auto-show anonymous windows"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:564
+#. i18n: ectx: property (text), item, widget (QComboBox, DownloadPicture)
+#: rc.cpp:2840 rc.cpp:2840
+msgid "When a Chat is Open (default)"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:641
-#. i18n: ectx: property (text), widget (QCheckBox, autoShowServerWindow)
-#: rc.cpp:1556 rc.cpp:1556
-msgid "Auto-show the server window"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:569
+#. i18n: ectx: property (text), item, widget (QComboBox, DownloadPicture)
+#: rc.cpp:2843 rc.cpp:2843
+msgid "Automatically (read help)"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:656
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
-#: rc.cpp:1559 rc.cpp:1559
-msgid "Server messages:"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:579
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, useCustomEmoticons)
+#: rc.cpp:2846 rc.cpp:2846
+msgid ""
+"QQ Messenger allows users to download and use custom emoticons. If this "
+"option is enabled, Kopete will download and display such emoticons."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:666
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_3_2)
-#: rc.cpp:1562 rc.cpp:1562
-msgid "Server notices:"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:582
+#. i18n: ectx: property (text), widget (QCheckBox, useCustomEmoticons)
+#: rc.cpp:2849 rc.cpp:2849
+msgid "&Download and show custom emoticons"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:680
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:712
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:761
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:800
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:680
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:712
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:761
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:800
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#: rc.cpp:1565 rc.cpp:1580 rc.cpp:1598 rc.cpp:1616 rc.cpp:1565 rc.cpp:1580
-#: rc.cpp:1598 rc.cpp:1616
-msgid "Active Window"
-msgstr "Ffenestr Weithredol"
-
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:685
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:717
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:766
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:805
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:685
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:717
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:766
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:805
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#: rc.cpp:1568 rc.cpp:1583 rc.cpp:1601 rc.cpp:1619 rc.cpp:1568 rc.cpp:1583
-#: rc.cpp:1601 rc.cpp:1619
-msgid "Server Window"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:592
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, exportEmoticons)
+#: rc.cpp:2852 rc.cpp:2852
+msgid ""
+"Export all the emoticon themes as custom emoticons (only works for emoticons "
+"in the PNG format)."
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:690
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:722
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:771
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:810
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:690
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:722
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:771
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:810
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#: rc.cpp:1571 rc.cpp:1586 rc.cpp:1604 rc.cpp:1622 rc.cpp:1571 rc.cpp:1586
-#: rc.cpp:1604 rc.cpp:1622
-msgid "Anonymous Window"
+#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:595
+#. i18n: ectx: property (text), widget (QCheckBox, exportEmoticons)
+#: rc.cpp:2855 rc.cpp:2855
+msgid "E&xport the current emoticon theme to users"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:695
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:727
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:776
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:815
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:695
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:727
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:776
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:815
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#: rc.cpp:1574 rc.cpp:1589 rc.cpp:1607 rc.cpp:1625 rc.cpp:1574 rc.cpp:1589
-#: rc.cpp:1607 rc.cpp:1625
-msgid "KNotify"
-msgstr "KHysbysu"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:104
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2861 rc.cpp:2861
+msgid "Picture"
+msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:700
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:732
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:781
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:820
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:700
-#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:732
-#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:781
-#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:820
-#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
-#: rc.cpp:1577 rc.cpp:1592 rc.cpp:1610 rc.cpp:1628 rc.cpp:1577 rc.cpp:1592
-#: rc.cpp:1610 rc.cpp:1628
-msgctxt "@item:inlistbox"
-msgid "Ignore"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:138
+#. i18n: ectx: property (text), widget (QLabel, lblQQId)
+#: rc.cpp:2867 rc.cpp:2867
+msgid "QQ ID:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:750
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_3_2)
-#: rc.cpp:1595 rc.cpp:1595
-msgid "Error messages:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:184
+#. i18n: ectx: property (text), widget (QLabel, lblAge)
+#: rc.cpp:2873 rc.cpp:2873
+msgid "Age:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/irceditaccount.ui:789
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2)
-#: rc.cpp:1613 rc.cpp:1613
-msgid "Information replies:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:210
+#. i18n: ectx: property (text), widget (QLabel, lblGender)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:584
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:242
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4a)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:210
+#. i18n: ectx: property (text), widget (QLabel, lblGender)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:584
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:242
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4a)
+#: rc.cpp:2876 rc.cpp:3249 rc.cpp:3306 rc.cpp:2876 rc.cpp:3249 rc.cpp:3306
+msgid "Gender:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/ircadd.ui:54
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/irc/ui/ircadd.ui:70
-#. i18n: ectx: property (toolTip), widget (QLineEdit, addID)
-#. i18n: file: protocols/irc/ui/ircadd.ui:54
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/irc/ui/ircadd.ui:70
-#. i18n: ectx: property (toolTip), widget (QLineEdit, addID)
-#: rc.cpp:1634 rc.cpp:1643 rc.cpp:1634 rc.cpp:1643
-msgid "The name of the IRC contact or channel you would like to add."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:281
+#. i18n: ectx: property (text), widget (QLabel, lblSignature)
+#: rc.cpp:2888 rc.cpp:2888
+msgid "Signature:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/ircadd.ui:57
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/irc/ui/ircadd.ui:73
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, addID)
-#. i18n: file: protocols/irc/ui/ircadd.ui:57
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/irc/ui/ircadd.ui:73
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, addID)
-#: rc.cpp:1637 rc.cpp:1646 rc.cpp:1637 rc.cpp:1646
-msgid ""
-"The name of the IRC contact or channel you would like to add.  You can type "
-"a person's nickname, or a channel name, preceded by a pound sign ('#')."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:304
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#. i18n: file: plugins/history/historyviewer.ui:134
+#. i18n: ectx: property (text), widget (QTreeWidget, dateTreeWidget)
+#. i18n: file: protocols/qq/ui/qqvcard.ui:304
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#. i18n: file: plugins/history/historyviewer.ui:134
+#. i18n: ectx: property (text), widget (QTreeWidget, dateTreeWidget)
+#: rc.cpp:2891 rc.cpp:5051 rc.cpp:2891 rc.cpp:5051
+msgid "Contact"
+msgstr "Cyswllt"
+
+#. i18n: file: protocols/qq/ui/qqvcard.ui:379
+#. i18n: ectx: property (text), widget (QLabel, lblZip)
+#: rc.cpp:2900 rc.cpp:2900
+msgid "Zip code:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/ircadd.ui:60
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:1640 rc.cpp:1640
-msgid "N&ickname/channel to add:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:421
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2912 rc.cpp:2912
+msgid "Phone Numbers"
+msgstr "Rhifau ffôn"
+
+#. i18n: file: protocols/qq/ui/qqvcard.ui:476
+#. i18n: ectx: property (text), widget (QLabel, lblPhoneQQ)
+#: rc.cpp:2921 rc.cpp:2921
+msgid "QQ:"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/ircadd.ui:82
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:1649 rc.cpp:1649
-msgid "<i>(for example: joe_bob or #somechannel)</i>"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:553
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2927 rc.cpp:2927
+msgid "Rat"
 msgstr ""
 
-#. i18n: file: protocols/irc/ui/ircadd.ui:117
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1652 rc.cpp:1652
-msgid "&Search Channels"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:558
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2930 rc.cpp:2930
+msgid "Ox"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, BonjourAccountPreferences)
-#: rc.cpp:1658 rc.cpp:1658
-msgid "Account Preferences - Bonjour"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:563
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2933 rc.cpp:2933
+msgid "Tiger"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:77
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:34
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:121
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:39
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:77
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:34
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:121
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:39
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1667 rc.cpp:2819 rc.cpp:3786 rc.cpp:4273 rc.cpp:1667 rc.cpp:2819
-#: rc.cpp:3786 rc.cpp:4273
-msgid "Name:"
-msgstr "Enw:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:568
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2936 rc.cpp:2936
+msgid "Rabbit"
+msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:84
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_username)
-#: rc.cpp:1670 rc.cpp:1670
-msgid "kde-devel"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:573
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2939 rc.cpp:2939
+msgid "Dragon"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:91
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:480
-#. i18n: ectx: property (text), widget (QLabel, fullNameLabel_2)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:111
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: kopete/identity/identitygeneral.ui:165
-#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:37
-#. i18n: ectx: property (text), widget (QLabel, mLblFirstName)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:91
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:480
-#. i18n: ectx: property (text), widget (QLabel, fullNameLabel_2)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:111
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: kopete/identity/identitygeneral.ui:165
-#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:37
-#. i18n: ectx: property (text), widget (QLabel, mLblFirstName)
-#: rc.cpp:1673 rc.cpp:3732 rc.cpp:4695 rc.cpp:6254 rc.cpp:6314 rc.cpp:1673
-#: rc.cpp:3732 rc.cpp:4695 rc.cpp:6254 rc.cpp:6314
-msgid "First name:"
-msgstr "Enw cyntaf:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:578
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2942 rc.cpp:2942
+msgid "Snake"
+msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:98
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_firstName)
-#: rc.cpp:1676 rc.cpp:1676
-msgid "KDE"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:583
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2945 rc.cpp:2945
+msgid "Horse"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:112
-#. i18n: ectx: property (text), widget (QLineEdit, kcfg_emailAddress)
-#: rc.cpp:1682 rc.cpp:1682
-msgid "kde@example.com"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:588
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2948 rc.cpp:2948
+msgid "Ram"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:119
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:417
-#. i18n: ectx: property (text), widget (QLabel, LastNameLabel)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:147
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: kopete/identity/identitygeneral.ui:184
-#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:117
-#. i18n: ectx: property (text), widget (QLabel, mLblLastName)
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:119
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:417
-#. i18n: ectx: property (text), widget (QLabel, LastNameLabel)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:147
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: kopete/identity/identitygeneral.ui:184
-#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:117
-#. i18n: ectx: property (text), widget (QLabel, mLblLastName)
-#: rc.cpp:1685 rc.cpp:3726 rc.cpp:4704 rc.cpp:6257 rc.cpp:6329 rc.cpp:1685
-#: rc.cpp:3726 rc.cpp:4704 rc.cpp:6257 rc.cpp:6329
-msgid "Last name:"
-msgstr "Enw olaf:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:593
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2951 rc.cpp:2951
+msgid "Monkey"
+msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraccountpreferences.ui:163
-#. i18n: ectx: property (text), widget (QLabel, textLabel12)
-#: rc.cpp:1694 rc.cpp:1694
-msgid ""
-"The Bonjour protocol needs you to at least specify a name. The name can be "
-"of form 'Full Name@Hostname'"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:598
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2954 rc.cpp:2954
+msgid "Rooster"
 msgstr ""
 
-#. i18n: file: protocols/bonjour/bonjouraddui.ui:33
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1697 rc.cpp:1697
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">The Bonjour "
-"protocol does not allow you to add contacts. </p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">Contacts "
-"will appear as they come online.</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">If you "
-"expect to see a contact, but they are not appearing</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">1) Please "
-"ensure that your local mDNS server (avahi-daemon) is running properly.</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">2) Run "
-"\"<span style=\" font-style:italic;\">avahi-browse _presence._tcp -"
-"t\"</span> in konsole and ensure you see the contact there.</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\">3) Ensure "
-"that ports 5353/UDP and 5298/TCP are open in your firewall</p></body></html>"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:603
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2957 rc.cpp:2957
+msgid "Dog"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, dlgAddContact)
-#: rc.cpp:1712 rc.cpp:1712
-msgid "Add Contacts"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:608
+#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
+#: rc.cpp:2960 rc.cpp:2960
+msgid "Pig"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:33
-#. i18n: ectx: property (toolTip), widget (QLabel, lblID)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:52
-#. i18n: ectx: property (toolTip), widget (KLineEdit, addID)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:33
-#. i18n: ectx: property (toolTip), widget (QLabel, lblID)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:52
-#. i18n: ectx: property (toolTip), widget (KLineEdit, addID)
-#: rc.cpp:1715 rc.cpp:1724 rc.cpp:1715 rc.cpp:1724
-msgid "The Jabber ID for the account you would like to add."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:635
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:2969 rc.cpp:2969
+msgid "Graduate:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:36
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblID)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:55
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, addID)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:36
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblID)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:55
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, addID)
-#: rc.cpp:1718 rc.cpp:1727 rc.cpp:1718 rc.cpp:1727
-msgid ""
-"The Jabber ID for the account you would like to add.  Note that this must "
-"include the username and the domain (like an E-mail address), as there are "
-"many Jabber servers."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:642
+#. i18n: ectx: property (text), widget (QLabel, lblZodiac)
+#: rc.cpp:2972 rc.cpp:2972
+msgid "Zodiac:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:39
-#. i18n: ectx: property (text), widget (QLabel, lblID)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:71
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:39
-#. i18n: ectx: property (text), widget (QLabel, lblID)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:71
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
-#: rc.cpp:1721 rc.cpp:1883 rc.cpp:1721 rc.cpp:1883
-msgid "&Jabber ID:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:670
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2978 rc.cpp:2978
+msgid "Aries"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgaddcontact.ui:64
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:1730 rc.cpp:1730
-msgid "<i>(for example: joe@jabber.org)</i>"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:675
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2981 rc.cpp:2981
+msgid "Taurus"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, DlgJabberRegisterAccount)
-#: rc.cpp:1733 rc.cpp:1733
-msgid "Register Account - Jabber"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:680
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2984 rc.cpp:2984
+msgid "Gemini"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:43
-#. i18n: ectx: property (text), widget (QLabel, lblJID)
-#: rc.cpp:1736 rc.cpp:1736
-msgid "Desired Jabber &ID:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:685
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2987 rc.cpp:2987
+msgid "Cancer"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:93
-#. i18n: ectx: property (text), widget (KPushButton, btnChooseServer)
-#: rc.cpp:1739 rc.cpp:1739
-msgid "C&hoose..."
-msgstr "&Dewis..."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:690
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2990 rc.cpp:2990
+msgid "Leo"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:102
-#. i18n: ectx: property (text), widget (QLabel, lblPassword)
-#: rc.cpp:1742 rc.cpp:1742
-msgid "Pass&word:"
-msgstr "Cyf&rinair"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:695
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2993 rc.cpp:2993
+msgid "Virgo"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
-#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:309
-#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:131
-#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:309
-#. i18n: ectx: property (toolTip), widget (QCheckBox, cbUseSSL)
-#: rc.cpp:1745 rc.cpp:1928 rc.cpp:1745 rc.cpp:1928
-msgid "Check this box to enable SSL encrypted communication with the server."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:700
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2996 rc.cpp:2996
+msgid "Libra"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:134
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:312
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:134
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:312
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbUseSSL)
-#: rc.cpp:1748 rc.cpp:1931 rc.cpp:1748 rc.cpp:1931
-msgid ""
-"Check this box to enable SSL encrypted communication with the server.  Note "
-"that this is not end-to-end encryption, but rather encrypted communication "
-"with the server."
+#. i18n: file: protocols/qq/ui/qqvcard.ui:705
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:2999 rc.cpp:2999
+msgid "Scorpio"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:315
-#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:315
-#. i18n: ectx: property (text), widget (QCheckBox, cbUseSSL)
-#: rc.cpp:1751 rc.cpp:1934 rc.cpp:1751 rc.cpp:1934
-msgid "Use protocol encr&yption (SSL)"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:710
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:3002 rc.cpp:3002
+msgid "Sagittarius"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:163
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#: rc.cpp:1754 rc.cpp:1754
-msgid "&Port:"
-msgstr "&Porth:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:715
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:3005 rc.cpp:3005
+msgid "Capricorn"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:176
-#. i18n: ectx: property (text), widget (QLabel, lblPasswordVerify)
-#: rc.cpp:1757 rc.cpp:1757
-msgid "&Repeat password:"
-msgstr "&Ailadrodd cyfrinair:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:720
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:3008 rc.cpp:3008
+msgid "Aquarius"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberregisteraccount.ui:209
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#: rc.cpp:1760 rc.cpp:1760
-msgid "Jabber &server:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:725
+#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
+#: rc.cpp:3011 rc.cpp:3011
+msgid "Pisces"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:35
-#. i18n: ectx: property (text), widget (QLabel, lblNick)
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:40
-#. i18n: ectx: property (text), widget (QLabel, lblNickName)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:121
-#. i18n: ectx: property (text), widget (QLabel, lblNick)
-#. i18n: file: kopete/identity/identitygeneral.ui:146
-#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:35
-#. i18n: ectx: property (text), widget (QLabel, lblNick)
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:40
-#. i18n: ectx: property (text), widget (QLabel, lblNickName)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:121
-#. i18n: ectx: property (text), widget (QLabel, lblNick)
-#. i18n: file: kopete/identity/identitygeneral.ui:146
-#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
-#: rc.cpp:1766 rc.cpp:2903 rc.cpp:4366 rc.cpp:6251 rc.cpp:1766 rc.cpp:2903
-#: rc.cpp:4366 rc.cpp:6251
-msgid "Nickname:"
-msgstr "Ffugenw:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:733
+#. i18n: ectx: property (text), widget (QLabel, lblHoroscope)
+#: rc.cpp:3014 rc.cpp:3014
+msgid "Horoscope:"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:45
-#. i18n: ectx: property (text), widget (QLabel, lblName)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:158
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:164
-#. i18n: ectx: property (text), widget (QLabel, lblName)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:45
-#. i18n: ectx: property (text), widget (QLabel, lblName)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:158
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:164
-#. i18n: ectx: property (text), widget (QLabel, lblName)
-#: rc.cpp:1769 rc.cpp:4062 rc.cpp:4372 rc.cpp:1769 rc.cpp:4062 rc.cpp:4372
-msgid "Full name:"
-msgstr "Enw llawn:"
+#. i18n: file: protocols/qq/ui/qqvcard.ui:817
+#. i18n: ectx: property (text), widget (QLabel, lblIntroduction)
+#: rc.cpp:3017 rc.cpp:3017
+msgid "Introduction:"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:59
-#. i18n: ectx: property (text), widget (QLabel, lblJID)
-#: rc.cpp:1772 rc.cpp:1772
-msgid "Jabber ID:"
+#. i18n: file: protocols/qq/ui/qqaddui.ui:36
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:3026 rc.cpp:3026
+msgid "&Contact name:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:76
-#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:150
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:177
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:171
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:621
-#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:76
-#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:150
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:177
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:171
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:621
-#. i18n: ectx: property (text), widget (QLabel, lblHomepage)
-#: rc.cpp:1775 rc.cpp:2837 rc.cpp:3792 rc.cpp:4065 rc.cpp:4465 rc.cpp:1775
-#: rc.cpp:2837 rc.cpp:3792 rc.cpp:4065 rc.cpp:4465
-msgid "Homepage:"
-msgstr "Tudalen Gartref:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, GaduRegisterAccountUI)
+#: rc.cpp:3047 rc.cpp:3047
+msgid "Register Account - Gadu-Gadu"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:110
-#. i18n: ectx: property (text), widget (QLabel, lblBirthday)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:490
-#. i18n: ectx: property (text), widget (QLabel, birthdayLabel)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:110
-#. i18n: ectx: property (text), widget (QLabel, lblBirthday)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:490
-#. i18n: ectx: property (text), widget (QLabel, birthdayLabel)
-#: rc.cpp:1778 rc.cpp:3735 rc.cpp:1778 rc.cpp:3735
-msgid "Birthday:"
-msgstr "Penblwydd :"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:63
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPasswordVerify)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:244
+#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePasswordVerify)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:63
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPasswordVerify)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:244
+#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePasswordVerify)
+#: rc.cpp:3050 rc.cpp:3104 rc.cpp:3050 rc.cpp:3104
+msgid "A confirmation of the password you would like to use."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:127
-#. i18n: ectx: property (text), widget (QLabel, lblTimezone)
-#: rc.cpp:1781 rc.cpp:1781
-msgid "Timezone:"
-msgstr "Cylchfa amser:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:66
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPasswordVerify)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:247
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePasswordVerify)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:66
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPasswordVerify)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:247
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePasswordVerify)
+#: rc.cpp:3053 rc.cpp:3107 rc.cpp:3053 rc.cpp:3107
+msgid ""
+"A confirmation of the password you would like to use for this account."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:212
-#. i18n: ectx: property (text), widget (QPushButton, btnSelectPhoto)
-#: rc.cpp:1787 rc.cpp:1787
-msgid "&Select Photo..."
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:69
+#. i18n: ectx: property (text), widget (QLabel, labelPasswordVerify)
+#: rc.cpp:3056 rc.cpp:3056
+msgid "Repeat pass&word:"
+msgstr "Ailadrodd c&yfrinair:"
+
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:79
+#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePassword)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:228
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPassword)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:79
+#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePassword)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:228
+#. i18n: ectx: property (toolTip), widget (QLabel, labelPassword)
+#: rc.cpp:3059 rc.cpp:3095 rc.cpp:3059 rc.cpp:3095
+msgid "The password you would like to use."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:219
-#. i18n: ectx: property (text), widget (QPushButton, btnClearPhoto)
-#: rc.cpp:1790 rc.cpp:1790
-msgid "Clear Pho&to"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:82
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePassword)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:231
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPassword)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:82
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePassword)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:231
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelPassword)
+#: rc.cpp:3062 rc.cpp:3098 rc.cpp:3062 rc.cpp:3098
+msgid "The password you would like to use for this account."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:246
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1793 rc.cpp:1793
-msgid "&Home Address"
-msgstr "Cyfeiriad &Cartref"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:92
+#. i18n: ectx: property (toolTip), widget (KLineEdit, valueEmailAddress)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:129
+#. i18n: ectx: property (toolTip), widget (QLabel, labelEmailAddress)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:92
+#. i18n: ectx: property (toolTip), widget (KLineEdit, valueEmailAddress)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:129
+#. i18n: ectx: property (toolTip), widget (QLabel, labelEmailAddress)
+#: rc.cpp:3065 rc.cpp:3071 rc.cpp:3065 rc.cpp:3071
+msgid "Your E-mail address."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:252
-#. i18n: ectx: property (text), widget (QLabel, lblStreet)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:352
-#. i18n: ectx: property (text), widget (QLabel, lblStreet_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:369
-#. i18n: ectx: property (text), widget (QLabel, lblStreet)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:252
-#. i18n: ectx: property (text), widget (QLabel, lblStreet)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:352
-#. i18n: ectx: property (text), widget (QLabel, lblStreet_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:369
-#. i18n: ectx: property (text), widget (QLabel, lblStreet)
-#: rc.cpp:1796 rc.cpp:1817 rc.cpp:4399 rc.cpp:1796 rc.cpp:1817 rc.cpp:4399
-msgid "Street:"
-msgstr "Stryd:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:95
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, valueEmailAddress)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:132
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelEmailAddress)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:95
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, valueEmailAddress)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:132
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelEmailAddress)
+#: rc.cpp:3068 rc.cpp:3074 rc.cpp:3068 rc.cpp:3074
+msgid "The E-mail address you would like to use to register this account."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:265
-#. i18n: ectx: property (text), widget (QLabel, lblPOBox)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:365
-#. i18n: ectx: property (text), widget (QLabel, lblPOBox_2)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:265
-#. i18n: ectx: property (text), widget (QLabel, lblPOBox)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:365
-#. i18n: ectx: property (text), widget (QLabel, lblPOBox_2)
-#: rc.cpp:1799 rc.cpp:1820 rc.cpp:1799 rc.cpp:1820
-msgid "PO box:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:135
+#. i18n: ectx: property (text), widget (QLabel, labelEmailAddress)
+#: rc.cpp:3077 rc.cpp:3077
+msgid "&E-Mail address:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:275
-#. i18n: ectx: property (text), widget (QLabel, lblCity)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:375
-#. i18n: ectx: property (text), widget (QLabel, lblCity_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:273
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:68
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:147
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2a)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:598
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_3)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:128
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:406
-#. i18n: ectx: property (text), widget (QLabel, lblCity)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:275
-#. i18n: ectx: property (text), widget (QLabel, lblCity)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:375
-#. i18n: ectx: property (text), widget (QLabel, lblCity_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:273
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:68
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:147
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2a)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:598
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_3)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:128
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:406
-#. i18n: ectx: property (text), widget (QLabel, lblCity)
-#: rc.cpp:1802 rc.cpp:1823 rc.cpp:2398 rc.cpp:2825 rc.cpp:3125 rc.cpp:3354
-#: rc.cpp:3789 rc.cpp:4411 rc.cpp:1802 rc.cpp:1823 rc.cpp:2398 rc.cpp:2825
-#: rc.cpp:3125 rc.cpp:3354 rc.cpp:3789 rc.cpp:4411
-msgid "City:"
-msgstr "Dinas:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:175
+#. i18n: ectx: property (toolTip), widget (QLabel, labelVerificationSequence)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:191
+#. i18n: ectx: property (toolTip), widget (QLineEdit, valueVerificationSequence)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:175
+#. i18n: ectx: property (toolTip), widget (QLabel, labelVerificationSequence)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:191
+#. i18n: ectx: property (toolTip), widget (QLineEdit, valueVerificationSequence)
+#: rc.cpp:3080 rc.cpp:3089 rc.cpp:3080 rc.cpp:3089
+msgid "The text from the image below."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:285
-#. i18n: ectx: property (text), widget (QLabel, lblState)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:385
-#. i18n: ectx: property (text), widget (QLabel, lblState_2)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:285
-#. i18n: ectx: property (text), widget (QLabel, lblState)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:385
-#. i18n: ectx: property (text), widget (QLabel, lblState_2)
-#: rc.cpp:1805 rc.cpp:1826 rc.cpp:1805 rc.cpp:1826
-msgid "Postal code:"
-msgstr "Côd post:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:178
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelVerificationSequence)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:194
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, valueVerificationSequence)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:178
+#. i18n: ectx: property (whatsThis), widget (QLabel, labelVerificationSequence)
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:194
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, valueVerificationSequence)
+#: rc.cpp:3083 rc.cpp:3092 rc.cpp:3083 rc.cpp:3092
+msgid ""
+"The text from the image below.  This is used to prevent abusive automated "
+"registration scripts."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:295
-#. i18n: ectx: property (text), widget (QLabel, lblCountry)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:395
-#. i18n: ectx: property (text), widget (QLabel, lblCountry_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:307
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:137
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:386
-#. i18n: ectx: property (text), widget (QLabel, lblCountry)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:295
-#. i18n: ectx: property (text), widget (QLabel, lblCountry)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:395
-#. i18n: ectx: property (text), widget (QLabel, lblCountry_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:307
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:137
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:386
-#. i18n: ectx: property (text), widget (QLabel, lblCountry)
-#: rc.cpp:1808 rc.cpp:1829 rc.cpp:2404 rc.cpp:2834 rc.cpp:3780 rc.cpp:4405
-#: rc.cpp:1808 rc.cpp:1829 rc.cpp:2404 rc.cpp:2834 rc.cpp:3780 rc.cpp:4405
-msgid "Country:"
-msgstr "Gwlad:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:181
+#. i18n: ectx: property (text), widget (QLabel, labelVerificationSequence)
+#: rc.cpp:3086 rc.cpp:3086
+msgid "&Verification sequence:"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:311
-#. i18n: ectx: property (text), widget (QLabel, lblEmail)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:405
-#. i18n: ectx: property (text), widget (QLabel, lblEmail_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:662
-#. i18n: ectx: property (text), widget (QLabel, lblEmail)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:134
-#. i18n: ectx: property (text), widget (QLabel, mLblEmail)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:311
-#. i18n: ectx: property (text), widget (QLabel, lblEmail)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:405
-#. i18n: ectx: property (text), widget (QLabel, lblEmail_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:662
-#. i18n: ectx: property (text), widget (QLabel, lblEmail)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:134
-#. i18n: ectx: property (text), widget (QLabel, mLblEmail)
-#: rc.cpp:1811 rc.cpp:1832 rc.cpp:4477 rc.cpp:6332 rc.cpp:1811 rc.cpp:1832
-#: rc.cpp:4477 rc.cpp:6332
-msgid "Email:"
-msgstr "Ebost:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:234
+#. i18n: ectx: property (text), widget (QLabel, labelPassword)
+#: rc.cpp:3101 rc.cpp:3101
+msgid "&Password:"
+msgstr "&Cyfrinair:"
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:346
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1814 rc.cpp:1814
-msgid "&Work Address"
-msgstr "Cyfeiriad &Gwaith"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:303
+#. i18n: ectx: property (toolTip), widget (QLabel, pixmapToken)
+#: rc.cpp:3110 rc.cpp:3110
+msgid "Gadu-Gadu registration token."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:440
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1835 rc.cpp:1835
-msgid "Wor&k Information"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:306
+#. i18n: ectx: property (whatsThis), widget (QLabel, pixmapToken)
+#: rc.cpp:3113 rc.cpp:3113
+msgid ""
+"This field contains an image showing a number that you need to type into the "
+"<b>Verification Sequence</b> field above."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:446
-#. i18n: ectx: property (text), widget (QLabel, lblCompany)
-#: rc.cpp:1838 rc.cpp:1838
-msgid "Company:"
-msgstr "Cwmni:"
+#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:348
+#. i18n: ectx: property (text), widget (QLabel, labelInstructions)
+#: rc.cpp:3116 rc.cpp:3116
+msgid ""
+"<i>Type the letters and numbers shown in the image above into the "
+"<b>Verification Sequence</b> field.  This is used to prevent automated "
+"registration abuse.</i>"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:456
-#. i18n: ectx: property (text), widget (QLabel, lblDepartment)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:194
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:456
-#. i18n: ectx: property (text), widget (QLabel, lblDepartment)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:194
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:1841 rc.cpp:2843 rc.cpp:1841 rc.cpp:2843
-msgid "Department:"
-msgstr "Adran:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, GaduAccountEditUI)
+#: rc.cpp:3119 rc.cpp:3119
+msgid "Account Preferences - Gadu-Gadu"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:466
-#. i18n: ectx: property (text), widget (QLabel, lblPosition)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:211
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:466
-#. i18n: ectx: property (text), widget (QLabel, lblPosition)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:211
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:1844 rc.cpp:2846 rc.cpp:1844 rc.cpp:2846
-msgid "Position:"
-msgstr "Lleoliad:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:81
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:100
+#. i18n: ectx: property (toolTip), widget (KLineEdit, loginEdit_)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:81
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:100
+#. i18n: ectx: property (toolTip), widget (KLineEdit, loginEdit_)
+#: rc.cpp:3128 rc.cpp:3137 rc.cpp:3128 rc.cpp:3137
+msgid "The user ID of your Gadu-Gadu account."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:476
-#. i18n: ectx: property (text), widget (QLabel, lblRole)
-#: rc.cpp:1847 rc.cpp:1847
-msgid "Role:"
-msgstr "Swyddogaeth:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:84
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:103
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, loginEdit_)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:84
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:103
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, loginEdit_)
+#: rc.cpp:3131 rc.cpp:3140 rc.cpp:3131 rc.cpp:3140
+msgid ""
+"The user ID of your Gadu-Gadu account.  This should be in the form of a "
+"number (no decimals, no spaces)."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:487
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1850 rc.cpp:1850
-msgid "Phone &Numbers"
-msgstr "&Rhifau ffôn"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:87
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:44
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:87
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:44
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:3134 rc.cpp:3330 rc.cpp:3134 rc.cpp:3330
+msgid "Gadu-Gadu &UIN:"
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:513
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneFax)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:265
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:513
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneFax)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:265
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#: rc.cpp:1859 rc.cpp:2855 rc.cpp:1859 rc.cpp:2855
-msgid "Fax:"
-msgstr "Ffacs:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:134
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoLoginCheck_)
+#: rc.cpp:3143 rc.cpp:3143
+msgid ""
+"Check to disable automatic connection. When checked, you may connect to this "
+"account manually via the icon in the bottom of the main Kopete window."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:523
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:469
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:523
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:469
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneCell)
-#: rc.cpp:1862 rc.cpp:4420 rc.cpp:1862 rc.cpp:4420
-msgid "Cell:"
-msgstr "Cell:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:172
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:3152 rc.cpp:3152
+msgid ""
+"To connect to the Gadu-Gadu network, you will need a Gadu-Gadu "
+"account.<br><br>\n"
+"If you do not currently have an account, please click the button to create "
+"one."
+msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgvcard.ui:534
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1865 rc.cpp:1865
-msgid "A&bout"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:271
+#. i18n: ectx: property (toolTip), widget (QCheckBox, cacheServersCheck__)
+#: rc.cpp:3171 rc.cpp:3171
+msgid ""
+"Cache connection information for each server connected to in case the main "
+"load-balancing server fails."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, DlgJabberEditAccountWidget)
-#: rc.cpp:1868 rc.cpp:1868
-msgid "Account Preferences - Jabber"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:274
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, cacheServersCheck__)
+#: rc.cpp:3174 rc.cpp:3174
+msgid ""
+"This option is used whenever the primary Gadu-Gadu load-balancing server "
+"fails.  If this is checked, Kopete will try to connect to the actual servers "
+"directly using cached information about them.  This prevents connection "
+"errors when the main load-balancing server does not answer. In practice it "
+"only helps very rarely."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:39
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:41
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:44
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:21
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, tab_connection)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:39
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:41
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:44
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:21
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:42
-#. i18n: ectx: attribute (title), widget (QWidget, tab_connection)
-#: rc.cpp:1871 rc.cpp:2927 rc.cpp:3576 rc.cpp:4071 rc.cpp:4552 rc.cpp:1871
-#: rc.cpp:2927 rc.cpp:3576 rc.cpp:4071 rc.cpp:4552
-msgid "&Basic Setup"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:277
+#. i18n: ectx: property (text), widget (QCheckBox, cacheServersCheck__)
+#: rc.cpp:3177 rc.cpp:3177
+msgid "C&ache server information"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:65
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:81
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mID)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:65
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:81
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mID)
-#: rc.cpp:1877 rc.cpp:1886 rc.cpp:1877 rc.cpp:1886
-msgid "The Jabber ID for the account you would like to use."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:290
+#. i18n: ectx: property (text), widget (QCheckBox, dccCheck_)
+#: rc.cpp:3180 rc.cpp:3180
+msgid "&Use direct connections (DCC)"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:68
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_3)
-#: rc.cpp:1880 rc.cpp:1880
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:300
+#. i18n: ectx: property (toolTip), widget (QCheckBox, exportCheck_)
+#: rc.cpp:3183 rc.cpp:3183
 msgid ""
-"The Jabber ID for the account you would like to use.  Note that this must "
-"include the username and the domain (like an E-mail address), as there are "
-"many Jabber servers."
+"Keep your local and server side contact list in sync. Any change in local "
+"list will result in exporting your list to server."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:84
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mID)
-#: rc.cpp:1889 rc.cpp:1889
-msgid ""
-"The Jabber ID for the account you would like to use.  Note that this must "
-"include the username and the domain (for example, joe@jabber.org), as there "
-"are many Jabber servers."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:303
+#. i18n: ectx: property (text), widget (QCheckBox, exportCheck_)
+#: rc.cpp:3186 rc.cpp:3186
+msgid "&Export contact list on change"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:157
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnRegister)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:160
-#. i18n: ectx: property (whatsThis), widget (QPushButton, btnRegister)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:191
-#. i18n: ectx: property (toolTip), widget (QPushButton, registerNew)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:194
-#. i18n: ectx: property (whatsThis), widget (QPushButton, registerNew)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:212
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:215
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:157
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnRegister)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:160
-#. i18n: ectx: property (whatsThis), widget (QPushButton, btnRegister)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:191
-#. i18n: ectx: property (toolTip), widget (QPushButton, registerNew)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:194
-#. i18n: ectx: property (whatsThis), widget (QPushButton, registerNew)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:212
-#. i18n: ectx: property (toolTip), widget (QPushButton, buttonRegister)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:215
-#. i18n: ectx: property (whatsThis), widget (QPushButton, buttonRegister)
-#: rc.cpp:1901 rc.cpp:1904 rc.cpp:3255 rc.cpp:3258 rc.cpp:3609 rc.cpp:3612
-#: rc.cpp:1901 rc.cpp:1904 rc.cpp:3255 rc.cpp:3258 rc.cpp:3609 rc.cpp:3612
-msgid "Register a new account on this network."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:313
+#. i18n: ectx: property (toolTip), widget (QCheckBox, importCheck_)
+#: rc.cpp:3189 rc.cpp:3189
+msgid "On each connection Kopete will import your list "
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:182
-#. i18n: ectx: property (text), widget (QLabel, lblRegistration)
-#: rc.cpp:1910 rc.cpp:1910
-msgid ""
-"To connect to the Jabber network, you will need an account on a Jabber "
-"server.  If you do not yet have an account, please click the button to "
-"create one."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:316
+#. i18n: ectx: property (text), widget (QCheckBox, importCheck_)
+#: rc.cpp:3192 rc.cpp:3192
+msgid "I&mport contact list on startup"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:198
-#. i18n: ectx: property (title), widget (QGroupBox, changePasswordGroupBox)
-#: rc.cpp:1913 rc.cpp:1913
-msgid "Change Password"
-msgstr "Newid Cyfrinair"
-
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:236
-#. i18n: ectx: property (text), widget (QPushButton, btnChangePassword)
-#: rc.cpp:1916 rc.cpp:1916
-msgid "Change &Your Password..."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:329
+#. i18n: ectx: property (text), widget (QCheckBox, ignoreCheck_)
+#: rc.cpp:3195 rc.cpp:3195
+msgid "&Ignore people not on your contact list"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:252
-#. i18n: ectx: property (text), widget (QLabel, tlChangePwSuccess)
-#: rc.cpp:1919 rc.cpp:1919
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:350
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:366
+#. i18n: ectx: property (toolTip), widget (QComboBox, useTls_)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:350
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:366
+#. i18n: ectx: property (toolTip), widget (QComboBox, useTls_)
+#: rc.cpp:3198 rc.cpp:3207 rc.cpp:3198 rc.cpp:3207
 msgid ""
-"If you have an existing Jabber account and would like to change its "
-"password, you can use this button to enter a new password."
-msgstr ""
-
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:322
-#. i18n: ectx: property (text), widget (QCheckBox, cbAllowPlainTextPassword)
-#: rc.cpp:1937 rc.cpp:1937
-msgid "Allow plain-te&xt password authentication"
+"Whether or not you want to enable SSL encrypted communication with the "
+"server."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:375
-#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:394
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:180
-#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:208
-#. i18n: ectx: property (toolTip), widget (QLineEdit, server)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:375
-#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:394
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:180
-#. i18n: ectx: property (toolTip), widget (QLabel, labelServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:208
-#. i18n: ectx: property (toolTip), widget (QLineEdit, server)
-#: rc.cpp:1943 rc.cpp:1952 rc.cpp:5001 rc.cpp:5010 rc.cpp:1943 rc.cpp:1952
-#: rc.cpp:5001 rc.cpp:5010
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:353
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:369
+#. i18n: ectx: property (whatsThis), widget (QComboBox, useTls_)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:353
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:369
+#. i18n: ectx: property (whatsThis), widget (QComboBox, useTls_)
+#: rc.cpp:3201 rc.cpp:3210 rc.cpp:3201 rc.cpp:3210
 msgid ""
-"The IP address or hostname of the server you would like to connect to."
+"Whether or not you want to enable SSL encrypted communication with the "
+"server.  Note that this is not end-to-end encryption, but rather encrypted "
+"communication with the server."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:378
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:397
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:378
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:397
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServer)
-#: rc.cpp:1946 rc.cpp:1955 rc.cpp:1946 rc.cpp:1955
-msgid ""
-"The IP address or hostname of the server you would like to connect to (for "
-"example jabber.org)."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:356
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:3204 rc.cpp:3204
+msgid "Use protocol encr&yption (SSL):"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:416
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:441
-#. i18n: ectx: property (toolTip), widget (QSpinBox, mPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:230
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:258
-#. i18n: ectx: property (toolTip), widget (QSpinBox, port)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:416
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:441
-#. i18n: ectx: property (toolTip), widget (QSpinBox, mPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:230
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:258
-#. i18n: ectx: property (toolTip), widget (QSpinBox, port)
-#: rc.cpp:1958 rc.cpp:1967 rc.cpp:5016 rc.cpp:5025 rc.cpp:1958 rc.cpp:1967
-#: rc.cpp:5016 rc.cpp:5025
-msgid "The port on the server that you would like to connect to."
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:379
+#. i18n: ectx: property (text), item, widget (QComboBox, useTls_)
+#: rc.cpp:3213 rc.cpp:3213
+msgid "If Available"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:419
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:444
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, mPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:233
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:261
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, port)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:419
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:444
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, mPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:233
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPort)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:261
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, port)
-#: rc.cpp:1961 rc.cpp:1970 rc.cpp:5019 rc.cpp:5028 rc.cpp:1961 rc.cpp:1970
-#: rc.cpp:5019 rc.cpp:5028
-msgid ""
-"The port on the server that you would like to connect to (default is 5222)."
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:384
+#. i18n: ectx: property (text), item, widget (QComboBox, useTls_)
+#: rc.cpp:3216 rc.cpp:3216
+msgid "Required"
+msgstr "Angenrheidiol"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:468
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_5)
-#: rc.cpp:1973 rc.cpp:1973
-msgid "Location Settings"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:432
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:3222 rc.cpp:3222
+msgid "U&ser Information"
+msgstr "G&wybodaeth Defnyddiwr"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:482
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:510
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mResource)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:545
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3_2)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:482
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:510
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mResource)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:545
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel3_3_2)
-#: rc.cpp:1976 rc.cpp:1985 rc.cpp:1994 rc.cpp:1976 rc.cpp:1985 rc.cpp:1994
-msgid "The resource name you would like to use on the Jabber network."
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:444
+#. i18n: ectx: property (title), widget (QGroupBox, userInformation)
+#: rc.cpp:3225 rc.cpp:3225
+msgid "User Information"
+msgstr "Gwybodaeth Defnyddiwr"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:485
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:513
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mResource)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:548
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3_2)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:485
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:513
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mResource)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:548
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3_3_2)
-#: rc.cpp:1979 rc.cpp:1988 rc.cpp:1997 rc.cpp:1979 rc.cpp:1988 rc.cpp:1997
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:459
+#. i18n: ectx: property (text), widget (QLabel, connectLabel)
+#: rc.cpp:3228 rc.cpp:3228
 msgid ""
-"The resource name you would like to use on the Jabber network.  Jabber "
-"allows you to sign on with the same account from multiple locations with "
-"different resource names, so you may wish to enter 'Home' or 'Work' here, "
-"for example."
+"<p align=\"center\">You must be connected to change your Personal "
+"Information.</p>"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:488
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3_3)
-#: rc.cpp:1982 rc.cpp:1982
-msgid "R&esource:"
-msgstr "A&dnodd :"
-
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:551
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3_3_2)
-#: rc.cpp:2000 rc.cpp:2000
-msgid "P&riority:"
-msgstr "B&laenoriaeth:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:482
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_4)
+#: rc.cpp:3231 rc.cpp:3231
+msgid "Maiden name:"
+msgstr "Enw Morwynol:"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:584
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, mPriority)
-#: rc.cpp:2003 rc.cpp:2003
-msgid ""
-"<qt>Each resource can have different <b>priority </b> levels. The messages "
-"will be sent to the resource which has the highest priority level.\n"
-"\n"
-"If two resources have the same priority, the messages will be sent to the "
-"one most recently connected.</qt>"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:489
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_4_3)
+#: rc.cpp:3234 rc.cpp:3234
+msgid "City of origin:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:604
-#. i18n: ectx: property (text), widget (QCheckBox, cbAdjustPriority)
-#: rc.cpp:2008 rc.cpp:2008
-msgid "When absent, adjust priority to:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:524
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_4_2)
+#: rc.cpp:3237 rc.cpp:3237
+msgid ""
+"The values below will be used in the search, but will not appear in the "
+"results."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:651
-#. i18n: ectx: property (text), widget (QCheckBox, mergeMessages)
-#: rc.cpp:2011 rc.cpp:2011
-msgid "Merge all messages from all resources to one window/tab"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:563
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:126
+#. i18n: ectx: property (text), widget (QLabel, textLabel1a)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:563
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:126
+#. i18n: ectx: property (text), widget (QLabel, textLabel1a)
+#: rc.cpp:3240 rc.cpp:3288 rc.cpp:3240 rc.cpp:3288
+msgid "Forename:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:678
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:2014 rc.cpp:2014
-msgid "Fi&le Transfer"
-msgstr "T&rosglwyddo ffeiliau"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:570
+#. i18n: ectx: property (text), widget (QLabel, uiSurnamea)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:133
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:570
+#. i18n: ectx: property (text), widget (QLabel, uiSurnamea)
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:133
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:3243 rc.cpp:3291 rc.cpp:3243 rc.cpp:3291
+msgid "Surname:"
+msgstr "Cyfenw :"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:690
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_6)
-#: rc.cpp:2017 rc.cpp:2017
-msgid "File Transfer Settings"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:577
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3)
+#: rc.cpp:3246 rc.cpp:3246
+msgid "Your nickname:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:707
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:2020 rc.cpp:2020
-msgid "Pro&xy JID:"
-msgstr ""
-
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:750
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:2026 rc.cpp:2026
-msgid "Public &IP address:"
-msgstr ""
-
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:766
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:2029 rc.cpp:2029
-msgid ""
-"<i><ul><li>The information in the \"public IP address\" and \"port\" fields "
-"applies to all Jabber accounts.</li>\n"
-"<li>You can leave the \"public IP address\" empty if your computer is "
-"directly connected to the internet.</li>\n"
-"<li>A hostname is also valid.</li>\n"
-"<li>Changes to these fields will only take effect the next time you start "
-"Kopete.</li>\n"
-"<li>The \"Proxy JID\" can be configured per account.</li></ul></i>"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:591
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_2)
+#: rc.cpp:3252 rc.cpp:3252
+msgid "Year of birth:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:799
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:680
 #. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:2036 rc.cpp:2036
-msgid "&Jingle"
-msgstr ""
+#: rc.cpp:3264 rc.cpp:3264
+msgid "&File Transfer"
+msgstr "Trosglwyddo &ffeiliau"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:807
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2039 rc.cpp:2039
-msgid "Network"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:692
+#. i18n: ectx: property (title), widget (QGroupBox, dcc)
+#: rc.cpp:3267 rc.cpp:3267
+msgid "Global DCC Options"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:813
-#. i18n: ectx: property (text), widget (QCheckBox, autoDetectIPBox)
-#: rc.cpp:2042 rc.cpp:2042
-msgid "Auto-detect external IP address"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:704
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#: rc.cpp:3270 rc.cpp:3270
+msgid ""
+"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect "
+"<b>all</b> Gadu-Gadu accounts.</font></p></qt>"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:822
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2045 rc.cpp:2045
-msgid "First port to use:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:711
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideDCC)
+#: rc.cpp:3273 rc.cpp:3273
+msgid "&Override default configuration"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:836
-#. i18n: ectx: property (toolTip), widget (QSpinBox, firstPortEdit)
-#: rc.cpp:2048 rc.cpp:2048
-msgid ""
-"Set the first incoming port to use for Jingle sessions.\n"
-"One media type uses 2 ports and each new Jingle session will use the next 2 "
-"available ports."
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:753
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:3276 rc.cpp:3276
+msgid "Local &IP address /"
+msgstr "Cyfeiriadau Lleol /"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:868
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:2055 rc.cpp:2055
-msgid "Microphone to use:"
+#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:787
+#. i18n: ectx: property (text), widget (KRestrictedLine, ipAddress)
+#: rc.cpp:3282 rc.cpp:3282
+msgid "0.0.0.0"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:882
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:2058 rc.cpp:2058
-msgid "Audio output:"
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:52
+#. i18n: ectx: property (text), widget (QRadioButton, radioByData)
+#: rc.cpp:3285 rc.cpp:3285
+msgid "Search by specified data:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:913
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:2061 rc.cpp:2061
-msgid "&Google Talk"
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:164
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2a)
+#: rc.cpp:3300 rc.cpp:3300
+msgid "Age from:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:919
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_17)
-#: rc.cpp:2064 rc.cpp:2064
-msgid "Google Talk libjingle settings"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:190
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_4)
+#: rc.cpp:3303 rc.cpp:3303
+msgid "to:"
+msgstr "i:"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:925
-#. i18n: ectx: property (toolTip), widget (QCheckBox, GoogleTalk)
-#: rc.cpp:2067 rc.cpp:2067
-msgid "This enable Google Talk libjingle voice call"
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:282
+#. i18n: ectx: property (text), widget (QRadioButton, radioByUin)
+#: rc.cpp:3315 rc.cpp:3315
+msgid "Request information about user:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:928
-#. i18n: ectx: property (text), widget (QCheckBox, GoogleTalk)
-#: rc.cpp:2070 rc.cpp:2070
-msgid "Enable Google Talk libjingle support (only for GTalk/Gmail accounts)"
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:319
+#. i18n: ectx: property (text), widget (QLabel, uin_static)
+#: rc.cpp:3318 rc.cpp:3318
+msgid "User number:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:946
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:642
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:946
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:642
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:2073 rc.cpp:3056 rc.cpp:2073 rc.cpp:3056
-msgid "Pri&vacy"
+#. i18n: file: protocols/gadu/ui/gadusearch.ui:343
+#. i18n: ectx: property (text), widget (QCheckBox, onlyOnline)
+#: rc.cpp:3321 rc.cpp:3321
+msgid "Lookup only those that are currently online"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:958
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_7)
-#: rc.cpp:2076 rc.cpp:2076
-msgid "General Privacy"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:38
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:63
+#. i18n: ectx: property (toolTip), widget (KRestrictedLine, addEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:38
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:63
+#. i18n: ectx: property (toolTip), widget (KRestrictedLine, addEdit_)
+#: rc.cpp:3324 rc.cpp:3333 rc.cpp:3324 rc.cpp:3333
+msgid "The user ID of the Gadu-Gadu account you would like to add."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:970
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbHideSystemInfo)
-#: rc.cpp:2079 rc.cpp:2079
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:41
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:66
+#. i18n: ectx: property (whatsThis), widget (KRestrictedLine, addEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:41
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:66
+#. i18n: ectx: property (whatsThis), widget (KRestrictedLine, addEdit_)
+#: rc.cpp:3327 rc.cpp:3336 rc.cpp:3327 rc.cpp:3336
 msgid ""
-"By default, Kopete gives the other users some info about your system and the "
-"client. Checking this box will hide that information."
+"The user ID of the Gadu-Gadu account you would like to add.  This should be "
+"in the form of a number (no decimals, no spaces).  This field is mandatory."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:973
-#. i18n: ectx: property (text), widget (QCheckBox, cbHideSystemInfo)
-#: rc.cpp:2082 rc.cpp:2082
-msgid "&Hide system and client info"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:75
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:3339 rc.cpp:3339
+msgid "<i>(for example: 1234567)</i>"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:999
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, notifyGroupBox)
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:999
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_8)
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, notifyGroupBox)
-#: rc.cpp:2085 rc.cpp:5627 rc.cpp:2085 rc.cpp:5627
-msgid "Notifications"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:104
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:230
+#. i18n: ectx: property (toolTip), widget (QLineEdit, fornameEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:104
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:230
+#. i18n: ectx: property (toolTip), widget (QLineEdit, fornameEdit_)
+#: rc.cpp:3342 rc.cpp:3387 rc.cpp:3342 rc.cpp:3387
+msgid "The forename of the contact you wish to add."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1014
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendEvents)
-#: rc.cpp:2088 rc.cpp:2088
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:107
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:233
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, fornameEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:107
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:233
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, fornameEdit_)
+#: rc.cpp:3345 rc.cpp:3390 rc.cpp:3345 rc.cpp:3390
 msgid ""
-"Check this box if you always want to send notifications to your contacts."
+"The forename (first name) of the contact you wish to add.  Optionally this "
+"may include a middle name."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1017
-#. i18n: ectx: property (text), widget (QCheckBox, cbSendEvents)
-#: rc.cpp:2091 rc.cpp:2091
-msgid "Always send not&ifications"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:110
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:3348 rc.cpp:3348
+msgid "&Forename:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1062
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendDeliveredEvent)
-#: rc.cpp:2094 rc.cpp:2094
-msgid ""
-"<qt>Check this box to send the <b>Delivered notification</b> to your "
-"contacts : when a message is delivered to Kopete, Kopete can notify your "
-"contact that it has received the message.</qt>"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:123
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:243
+#. i18n: ectx: property (toolTip), widget (QLineEdit, snameEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:123
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:243
+#. i18n: ectx: property (toolTip), widget (QLineEdit, snameEdit_)
+#: rc.cpp:3351 rc.cpp:3393 rc.cpp:3351 rc.cpp:3393
+msgid "The surname of the contact you wish to add."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1065
-#. i18n: ectx: property (text), widget (QCheckBox, cbSendDeliveredEvent)
-#: rc.cpp:2097 rc.cpp:2097
-msgid "Alwa&ys send delivered notifications"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:126
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:246
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, snameEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:126
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:246
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, snameEdit_)
+#: rc.cpp:3354 rc.cpp:3396 rc.cpp:3354 rc.cpp:3396
+msgid "The surname (last name) of the contact you wish to add."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1078
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendDisplayedEvent)
-#: rc.cpp:2100 rc.cpp:2100
-msgid ""
-"<qt>Check this box to send the <b>Displayed notification</b> to your "
-"contacts : when a message is displayed in Kopete, Kopete can notify your "
-"contact that it has displayed the message.</qt>"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:129
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
+#: rc.cpp:3357 rc.cpp:3357
+msgid "&Surname:"
+msgstr "&Cyfenw :"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1081
-#. i18n: ectx: property (text), widget (QCheckBox, cbSendDisplayedEvent)
-#: rc.cpp:2103 rc.cpp:2103
-msgid "Al&ways send displayed notifications"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:147
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:150
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:253
+#. i18n: ectx: property (toolTip), widget (QLineEdit, nickEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:256
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, nickEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:147
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:150
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:253
+#. i18n: ectx: property (toolTip), widget (QLineEdit, nickEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:256
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, nickEdit_)
+#: rc.cpp:3360 rc.cpp:3363 rc.cpp:3399 rc.cpp:3402 rc.cpp:3360 rc.cpp:3363
+#: rc.cpp:3399 rc.cpp:3402
+msgid "A nickname for the contact you wish to add."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1094
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cbSendComposingEvent)
-#: rc.cpp:2106 rc.cpp:2106
-msgid ""
-"<qt>Check this box to send the <b>Typing notification</b> to your contacts : "
-"when you are composing a message, you might want your contact to know that "
-"you are typing so that he/she knows you are answering.</qt>"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:153
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_2)
+#: rc.cpp:3366 rc.cpp:3366
+msgid "N&ickname:"
+msgstr "F&fugenw:"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1097
-#. i18n: ectx: property (text), widget (QCheckBox, cbSendComposingEvent)
-#: rc.cpp:2109 rc.cpp:2109
-msgid "Always send &typing notifications"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:174
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:177
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:201
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:204
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:266
+#. i18n: ectx: property (toolTip), widget (QLineEdit, emailEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:269
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, emailEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:279
+#. i18n: ectx: property (toolTip), widget (QLineEdit, telephoneEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:282
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, telephoneEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:174
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:177
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:201
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:204
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4_2)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:266
+#. i18n: ectx: property (toolTip), widget (QLineEdit, emailEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:269
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, emailEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:279
+#. i18n: ectx: property (toolTip), widget (QLineEdit, telephoneEdit_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:282
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, telephoneEdit_)
+#: rc.cpp:3369 rc.cpp:3372 rc.cpp:3378 rc.cpp:3381 rc.cpp:3405 rc.cpp:3408
+#: rc.cpp:3411 rc.cpp:3414 rc.cpp:3369 rc.cpp:3372 rc.cpp:3378 rc.cpp:3381
+#: rc.cpp:3405 rc.cpp:3408 rc.cpp:3411 rc.cpp:3414
+msgid "E-Mail address for this contact."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1107
-#. i18n: ectx: property (text), widget (QCheckBox, cbSendGoneEvent)
-#: rc.cpp:2112 rc.cpp:2112
-msgid "Always send &gone notifications (closing the window)"
-msgstr ""
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:180
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1_4)
+#: rc.cpp:3375 rc.cpp:3375
+msgid "&Email address:"
+msgstr "&Cyfeiriad ebost:"
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1124
-#. i18n: ectx: property (text), widget (KPushButton, privacyListsButton)
-#: rc.cpp:2115 rc.cpp:2115
-msgid "Privacy Lists"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:296
+#. i18n: ectx: property (toolTip), widget (QCheckBox, notAFriend_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:299
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, notAFriend_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:296
+#. i18n: ectx: property (toolTip), widget (QCheckBox, notAFriend_)
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:299
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, notAFriend_)
+#: rc.cpp:3417 rc.cpp:3420 rc.cpp:3417 rc.cpp:3420
+msgid ""
+"Check if you want to exclude this contact from the \"Just for friends\" "
+"status mode."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabbereditaccountwidget.ui:1131
-#. i18n: ectx: property (text), widget (QCheckBox, oldEncrypted)
-#: rc.cpp:2118 rc.cpp:2118
-msgid "Use old inline PGP format for signed and encrypted messages"
+#. i18n: file: protocols/gadu/ui/gaduadd.ui:302
+#. i18n: ectx: property (text), widget (QCheckBox, notAFriend_)
+#: rc.cpp:3423 rc.cpp:3423
+msgid "Offline to contact when you set \"&Just for friends\""
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, PrivacyRule)
-#: rc.cpp:2121 rc.cpp:2121
-msgid "Edit Privacy Rule"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:39
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, statusGroup_)
+#: rc.cpp:3432 rc.cpp:3432
+msgid ""
+"Choose a status; by default Online status is selected. \n"
+"So all you need to do is just to type in your description. \n"
+"Choosing Offline status will disconnect you, with given description."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:2124 rc.cpp:2124
-msgid "Then:"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:62
+#. i18n: ectx: property (toolTip), widget (QRadioButton, onlineButton_)
+#: rc.cpp:3440 rc.cpp:3440
+msgid "Set your status to Online."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:79
-#. i18n: ectx: property (text), widget (QCheckBox, ck_messages)
-#: rc.cpp:2127 rc.cpp:2127
-msgid "Messages"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:65
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, onlineButton_)
+#: rc.cpp:3443 rc.cpp:3443
+msgid ""
+"Set your status to Online, indicating that you are available to chat with "
+"anyone who wishes."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, ck_queries)
-#: rc.cpp:2130 rc.cpp:2130
-msgid "Queries"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:78
+#. i18n: ectx: property (toolTip), widget (QRadioButton, awayButton_)
+#: rc.cpp:3449 rc.cpp:3449
+msgid "Set your status to busy."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:93
-#. i18n: ectx: property (text), widget (QCheckBox, ck_presenceOut)
-#: rc.cpp:2133 rc.cpp:2133
-msgid "Outgoing presence"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:81
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, awayButton_)
+#: rc.cpp:3452 rc.cpp:3452
+msgid ""
+"Set your status to busy, indicating that you should not be bothered with "
+"trivial chat, and may not be able to reply immediately."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:100
-#. i18n: ectx: property (text), widget (QCheckBox, ck_presenceIn)
-#: rc.cpp:2136 rc.cpp:2136
-msgid "Incoming presence"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:94
+#. i18n: ectx: property (toolTip), widget (QRadioButton, invisibleButton_)
+#: rc.cpp:3458 rc.cpp:3458
+msgid ""
+"Set status to invisible, which will hide your presence from other users."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacyrule.ui:147
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2157 rc.cpp:2157
-msgid "If:"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:97
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, invisibleButton_)
+#: rc.cpp:3461 rc.cpp:3461
+msgid ""
+"Set status to invisible, which will hide your presence from other users (who "
+"will see you as offline).  However you may still chat, and see the online "
+"presence of others."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:26
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:36
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:26
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:36
-#. i18n: ectx: property (text), widget (QLabel, lblServer)
-#: rc.cpp:2160 rc.cpp:2175 rc.cpp:2275 rc.cpp:2160 rc.cpp:2175 rc.cpp:2275
-msgid "Server:"
-msgstr "Gweinydd:"
-
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:40
-#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:46
-#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:40
-#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:46
-#. i18n: ectx: property (text), widget (QPushButton, pbQuery)
-#: rc.cpp:2163 rc.cpp:2178 rc.cpp:2163 rc.cpp:2178
-msgid "&Query"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:110
+#. i18n: ectx: property (toolTip), widget (QRadioButton, offlineButton_)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:113
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, offlineButton_)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:110
+#. i18n: ectx: property (toolTip), widget (QRadioButton, offlineButton_)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:113
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, offlineButton_)
+#: rc.cpp:3467 rc.cpp:3470 rc.cpp:3467 rc.cpp:3470
+msgid "Choose this status to disconnect with the description entered below."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:50
-#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:57
-#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:50
-#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:57
-#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
-#: rc.cpp:2166 rc.cpp:2181 rc.cpp:2166 rc.cpp:2181
-msgid "Chatroom Name"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:139
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:158
+#. i18n: ectx: property (toolTip), widget (QLineEdit, textEdit_)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:139
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:158
+#. i18n: ectx: property (toolTip), widget (QLineEdit, textEdit_)
+#: rc.cpp:3476 rc.cpp:3485 rc.cpp:3476 rc.cpp:3485
+msgid "Description of your status."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:55
-#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:62
-#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
-#. i18n: file: protocols/jabber/ui/dlgchatroomslist.ui:55
-#. i18n: ectx: property (text), widget (QTableWidget, tblChatRoomsList)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:62
-#. i18n: ectx: property (text), widget (QTreeWidget, tblChatRoomsList)
-#: rc.cpp:2169 rc.cpp:2184 rc.cpp:2169 rc.cpp:2184
-msgid "Chatroom Description"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:142
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:161
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, textEdit_)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:142
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:161
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, textEdit_)
+#: rc.cpp:3479 rc.cpp:3488 rc.cpp:3479 rc.cpp:3488
+msgid "Description of your status (up to 70 characters)."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:16
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:140
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3a)
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:16
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:140
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3a)
-#: rc.cpp:2172 rc.cpp:3122 rc.cpp:2172 rc.cpp:3122
-msgid "Nick:"
-msgstr "Ffugenw :"
+#. i18n: file: protocols/gadu/ui/gaduawayui.ui:145
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:3482 rc.cpp:3482
+msgid "&Message:"
+msgstr "&Neges:"
 
-#. i18n: file: protocols/jabber/ui/dlgchatjoin.ui:70
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2187 rc.cpp:2187
-msgid "Room:"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, MeanwhileEditAccount)
+#: rc.cpp:3491 rc.cpp:3491
+msgid "Edit Meanwhile Account"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgsearch.ui:38
-#. i18n: ectx: property (title), widget (QGroupBox, dynamicForm)
-#: rc.cpp:2190 rc.cpp:2190
-msgid "Search For"
-msgstr "Chwilio am:"
-
-#. i18n: file: protocols/jabber/ui/privacy.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, gb_settings)
-#: rc.cpp:2193 rc.cpp:2193
-msgid "Settings"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:49
+#. i18n: ectx: property (toolTip), widget (QLabel, label1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:52
+#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:68
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:71
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:49
+#. i18n: ectx: property (toolTip), widget (QLabel, label1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:52
+#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:68
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:71
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
+#: rc.cpp:3500 rc.cpp:3503 rc.cpp:3509 rc.cpp:3512 rc.cpp:3500 rc.cpp:3503
+#: rc.cpp:3509 rc.cpp:3512
+msgid "Your Sametime user ID"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:89
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:2196 rc.cpp:2196
-msgid "Default list (all sessions):"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label1)
+#: rc.cpp:3506 rc.cpp:3506
+msgid "Meanwhile &username:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:96
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2199 rc.cpp:2199
-msgid "Active list (current session):"
-msgstr ""
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:97
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:3521 rc.cpp:3521
+msgid "Connection"
+msgstr "Cysylltiad"
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:113
-#. i18n: ectx: property (title), widget (QGroupBox, gb_listSettings)
-#: rc.cpp:2202 rc.cpp:2202
-msgid "List Editor"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:119
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:122
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:138
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mServerName)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:141
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServerName)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:119
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:122
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:138
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mServerName)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:141
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mServerName)
+#: rc.cpp:3527 rc.cpp:3530 rc.cpp:3536 rc.cpp:3539 rc.cpp:3527 rc.cpp:3530
+#: rc.cpp:3536 rc.cpp:3539
+msgid ""
+"The IP address or hostname of the Sametime server you wish to connect to."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:151
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:2205 rc.cpp:2205
-msgid "List:"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:152
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:171
+#. i18n: ectx: property (toolTip), widget (QSpinBox, mServerPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:152
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:171
+#. i18n: ectx: property (toolTip), widget (QSpinBox, mServerPort)
+#: rc.cpp:3542 rc.cpp:3551 rc.cpp:3542 rc.cpp:3551
+msgid "The port on the Sametime server that you would like to connect to."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:178
-#. i18n: ectx: property (text), widget (KPushButton, pb_newList)
-#: rc.cpp:2208 rc.cpp:2208
-msgid "New List..."
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:155
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:174
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, mServerPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:155
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:174
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, mServerPort)
+#: rc.cpp:3545 rc.cpp:3554 rc.cpp:3545 rc.cpp:3554
+msgid ""
+"The port on the Sametime server that you would like to connect to.  Usually "
+"this is 1533."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:185
-#. i18n: ectx: property (text), widget (KPushButton, pb_deleteList)
-#: rc.cpp:2211 rc.cpp:2211
-msgid "Delete List"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:204
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox5)
+#: rc.cpp:3557 rc.cpp:3557
+msgid "Client Identifier"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:194
-#. i18n: ectx: property (text), widget (QCheckBox, ck_autoActivate)
-#: rc.cpp:2214 rc.cpp:2214
-msgid "Automatically activate this list on connect"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:216
+#. i18n: ectx: property (text), widget (QCheckBox, chkCustomClientID)
+#: rc.cpp:3560 rc.cpp:3560
+msgid "Use custom client identifier"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:201
-#. i18n: ectx: property (title), widget (QGroupBox, gb_rules)
-#: rc.cpp:2217 rc.cpp:2217
-msgid "Rules"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:235
+#. i18n: ectx: property (text), widget (QLabel, lblClientIdentifier)
+#: rc.cpp:3563 rc.cpp:3563
+msgid "Client identifier:"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/privacy.ui:290
-#. i18n: ectx: property (text), widget (KPushButton, pb_apply)
-#: rc.cpp:2235 rc.cpp:2235
-msgid "Apply"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:263
+#. i18n: ectx: property (text), widget (QLabel, lblVersionSeparator)
+#: rc.cpp:3566 rc.cpp:3566
+msgid "."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:30
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:30
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2238 rc.cpp:2351 rc.cpp:2238 rc.cpp:2351
-msgid "Current password:"
-msgstr "Cyfrinair cyfredol:"
-
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:29
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:50
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:70
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:29
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:50
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:70
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:2241 rc.cpp:2244 rc.cpp:2354 rc.cpp:2357 rc.cpp:2241 rc.cpp:2244
-#: rc.cpp:2354 rc.cpp:2357
-msgid "New password:"
-msgstr "Cyfrinair newydd:"
-
-#. i18n: file: protocols/jabber/ui/dlgchangepassword.ui:61
-#. i18n: ectx: property (text), widget (QLabel, lblStatus)
-#: rc.cpp:2247 rc.cpp:2247
-msgid ""
-"Please enter your current password first\n"
-"and then your new password twice."
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:291
+#. i18n: ectx: property (text), widget (QLabel, lblClientVersion)
+#: rc.cpp:3569 rc.cpp:3569
+msgid "Client version (major.minor):"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgjabberchooseserver.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, DlgJabberChooseServer)
-#: rc.cpp:2251 rc.cpp:2251
-msgid "Choose Server - Jabber"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:315
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnServerDefaults)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:318
+#. i18n: ectx: property (whatsThis), widget (QPushButton, btnServerDefaults)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:315
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnServerDefaults)
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:318
+#. i18n: ectx: property (whatsThis), widget (QPushButton, btnServerDefaults)
+#: rc.cpp:3572 rc.cpp:3575 rc.cpp:3572 rc.cpp:3575
+msgid "Restore the server and port values to their defaults."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgcommand.ui:19
-#. i18n: ectx: property (windowTitle), widget (QDialog, dlgRegister)
-#: rc.cpp:2260 rc.cpp:2260
-msgid "Register with Jabber Service"
+#. i18n: file: protocols/meanwhile/ui/meanwhileeditaccount.ui:321
+#. i18n: ectx: property (text), widget (QPushButton, btnServerDefaults)
+#: rc.cpp:3578 rc.cpp:3578
+msgid "Restore &Defaults"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgcommand.ui:43
-#. i18n: ectx: property (title), widget (QGroupBox, grpForm)
-#: rc.cpp:2263 rc.cpp:2263
-msgid "Registration Form"
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, MeanwhileAddUI)
+#: rc.cpp:3581 rc.cpp:3581
+msgid "Add Sametime Contact"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgcommand.ui:132
-#. i18n: ectx: property (text), widget (QPushButton, btnRegister)
-#: rc.cpp:2269 rc.cpp:2269
-msgid "&Execute"
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:27
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:30
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:46
+#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:27
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:30
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:46
+#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
+#: rc.cpp:3584 rc.cpp:3587 rc.cpp:3593 rc.cpp:3596 rc.cpp:3584 rc.cpp:3587
+#: rc.cpp:3593 rc.cpp:3596
+msgid "The user ID of the contact you would like to add."
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:53
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2278 rc.cpp:2278
-msgid "Node:"
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:56
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnFindUser)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:59
+#. i18n: ectx: property (whatsThis), widget (QPushButton, btnFindUser)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:56
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnFindUser)
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:59
+#. i18n: ectx: property (whatsThis), widget (QPushButton, btnFindUser)
+#: rc.cpp:3599 rc.cpp:3602 rc.cpp:3599 rc.cpp:3602
+msgid "Find User ID"
 msgstr ""
 
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, btnQuery)
-#: rc.cpp:2281 rc.cpp:2281
-msgid "&Query Server"
-msgstr "&Gweinydd Ymholiad"
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, btnFindUser)
+#: rc.cpp:3605 rc.cpp:3605
+msgid "&Find"
+msgstr "&Canfod"
 
-#. i18n: file: protocols/jabber/ui/dlgservices.ui:95
-#. i18n: ectx: property (text), widget (QTreeWidget, trServices)
-#: rc.cpp:2290 rc.cpp:2290
-msgid "Node"
+#. i18n: file: protocols/meanwhile/ui/meanwhileaddcontact.ui:71
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#: rc.cpp:3608 rc.cpp:3608
+msgid "<i>(for example: johndoe)</i>"
 msgstr ""
 
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:6
-#. i18n: ectx: property (windowTitle), widget (QWidget, GoogleTalkCallDialog)
-#: rc.cpp:2293 rc.cpp:2293
-msgid "Google Talk Voice Call"
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, YahooInviteListBase)
+#: rc.cpp:3614 rc.cpp:3614
+msgid "Invite Friends to Conference"
 msgstr ""
 
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:14
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2296 rc.cpp:2296
-msgid "Calling with:"
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:37
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:3617 rc.cpp:3617
+msgid "Conference Members"
 msgstr ""
 
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:28
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:2299 rc.cpp:2299
-msgid "Call Status:"
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:94
+#. i18n: ectx: property (text), widget (QPushButton, btn_Add)
+#: rc.cpp:3620 rc.cpp:3620
+msgid "Add >>"
 msgstr ""
 
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:42
-#. i18n: ectx: property (text), widget (QPushButton, acceptButton)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:180
-#. i18n: ectx: property (text), widget (QPushButton, AcceptButton)
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:42
-#. i18n: ectx: property (text), widget (QPushButton, acceptButton)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:180
-#. i18n: ectx: property (text), widget (QPushButton, AcceptButton)
-#: rc.cpp:2302 rc.cpp:4315 rc.cpp:2302 rc.cpp:4315
-msgid "Accept"
-msgstr "Derbyn"
-
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, rejectButton)
-#: rc.cpp:2305 rc.cpp:2305
-msgid "Reject"
-msgstr "Gwrthod"
-
-#. i18n: file: protocols/jabber/googletalk/googletalkcalldialog.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, hangupButton)
-#: rc.cpp:2308 rc.cpp:2308
-msgid "Hang up"
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:101
+#. i18n: ectx: property (text), widget (QPushButton, btn_Remove)
+#: rc.cpp:3623 rc.cpp:3623
+msgid "<< Remove"
 msgstr ""
 
-#. i18n: file: protocols/jabber/jingle/jinglecontentdialog.ui:19
-#. i18n: ectx: property (windowTitle), widget (QDialog, jingleContentDialog)
-#: rc.cpp:2314 rc.cpp:2314
-msgid "Dialog"
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:143
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:3626 rc.cpp:3626
+msgid "Chat Invitation List"
 msgstr ""
 
-#. i18n: file: protocols/jabber/jingle/jinglecallsgui.ui:13
-#. i18n: ectx: property (windowTitle), widget (QMainWindow, jingleCallsGui)
-#: rc.cpp:2317 rc.cpp:2317
-msgid "Main Window"
+#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:201
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:3632 rc.cpp:3632
+msgid "Friend List"
 msgstr ""
 
-#. i18n: file: protocols/jabber/jingle/jinglecallsgui.ui:50
-#. i18n: ectx: property (windowTitle), widget (QToolBar, toolBar)
-#: rc.cpp:2320 rc.cpp:2320
-msgid "Toolbar"
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, YahooChatSelectorWidgetBase)
+#: rc.cpp:3638 rc.cpp:3638
+msgid "Choose Chat Room"
 msgstr ""
 
-#. i18n: file: protocols/oscar/oscarlistcontactsbase.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2323 rc.cpp:2323
-msgid ""
-"The following contacts are not on your contact list. Would you like to add "
-"them?"
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:25
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:3641 rc.cpp:3641
+msgid "Chat rooms:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/oscarlistcontactsbase.ui:39
-#. i18n: ectx: property (text), widget (QCheckBox, doNotShowAgain)
-#: rc.cpp:2326 rc.cpp:2326
-msgid "Do &not ask again"
-msgstr "P&eidio a gofyn eto"
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:3644 rc.cpp:3644
+msgid "Categories:"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ICQAuthReplyUI)
-#: rc.cpp:2329 rc.cpp:2329
-msgid "ICQ Authorization Reply"
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:46
+#. i18n: ectx: property (text), widget (QTreeWidget, treeCategories)
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:61
+#. i18n: ectx: property (text), widget (QTreeWidget, treeRooms)
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:52
+#. i18n: ectx: property (text), widget (QTreeWidget, protocolListView)
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:46
+#. i18n: ectx: property (text), widget (QTreeWidget, treeCategories)
+#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:61
+#. i18n: ectx: property (text), widget (QTreeWidget, treeRooms)
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:52
+#. i18n: ectx: property (text), widget (QTreeWidget, protocolListView)
+#: rc.cpp:3647 rc.cpp:3650 rc.cpp:6536 rc.cpp:3647 rc.cpp:3650 rc.cpp:6536
+msgid "1"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:34
-#. i18n: ectx: property (text), widget (QLabel, lblUserReq)
-#: rc.cpp:2333 rc.cpp:2333
-#, kde-format, no-c-format
-msgid "%1 requested authorization to add you to his/her contact list."
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, YahooEditAccountBase)
+#: rc.cpp:3653 rc.cpp:3653
+msgid "Account Preferences - Yahoo"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:64
-#. i18n: ectx: property (text), widget (QLabel, lblReqReason)
-#: rc.cpp:2336 rc.cpp:2336
-msgid "Request Reason:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:103
+#. i18n: ectx: property (toolTip), widget (QLabel, label1)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:119
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:103
+#. i18n: ectx: property (toolTip), widget (QLabel, label1)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:119
+#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
+#: rc.cpp:3662 rc.cpp:3671 rc.cpp:3662 rc.cpp:3671
+msgid "The account name of your Yahoo account."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:77
-#. i18n: ectx: property (text), widget (QLabel, lblRequestReason)
-#: rc.cpp:2339 rc.cpp:2339
-msgid "Some reason..."
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:106
+#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:122
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:106
+#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:122
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
+#: rc.cpp:3665 rc.cpp:3674 rc.cpp:3665 rc.cpp:3674
+msgid ""
+"The account name of your Yahoo account.  This should be in the form of an "
+"alphanumeric string (no spaces)."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:135
-#. i18n: ectx: property (text), widget (QRadioButton, rbGrant)
-#: rc.cpp:2342 rc.cpp:2342
-msgid "&Grant authorization"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:109
+#. i18n: ectx: property (text), widget (QLabel, label1)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:39
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:109
+#. i18n: ectx: property (text), widget (QLabel, label1)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:39
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:3668 rc.cpp:3758 rc.cpp:3668 rc.cpp:3758
+msgid "&Yahoo username:"
+msgstr "Enw'r defnyddiwr &Yahoo :"
+
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:183
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:3686 rc.cpp:3686
+msgid ""
+"To connect to the Yahoo network, you will need a Yahoo account.<br><br>If "
+"you do not currently have a Yahoo account, please click the button to create "
+"one."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:145
-#. i18n: ectx: property (text), widget (QRadioButton, rbDecline)
-#: rc.cpp:2345 rc.cpp:2345
-msgid "&Decline authorization"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:218
+#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
+#: rc.cpp:3695 rc.cpp:3695
+msgid "Register &New Account"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqauthreplyui.ui:193
-#. i18n: ectx: property (text), widget (QLabel, lblReason)
-#: rc.cpp:2348 rc.cpp:2348
-msgid "Reason:"
-msgstr "Rheswm:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:258
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:3698 rc.cpp:3698
+msgid "Accoun&t Preferences"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqchangepassword.ui:100
-#. i18n: ectx: property (text), widget (QLabel, lblStatus)
-#: rc.cpp:2360 rc.cpp:2360
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:300
+#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
+#: rc.cpp:3704 rc.cpp:3704
+msgid "O&verride default server information"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:346
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:365
+#. i18n: ectx: property (toolTip), widget (QLineEdit, editServerAddress)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:346
+#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:365
+#. i18n: ectx: property (toolTip), widget (QLineEdit, editServerAddress)
+#: rc.cpp:3707 rc.cpp:3716 rc.cpp:3707 rc.cpp:3716
 msgid ""
-"Please enter your current password first\n"
-"and then your new password twice.\n"
-"Password have to be between 6-8 characters long."
+"The IP address or hostmask of the Yahoo server you wish to connect to."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2365 rc.cpp:2365
-msgid "Location && Contact Information"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:349
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:368
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, editServerAddress)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:349
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:368
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, editServerAddress)
+#: rc.cpp:3710 rc.cpp:3719 rc.cpp:3710 rc.cpp:3719
+msgid ""
+"The IP address or hostmask of the Yahoo server you wish to connect to.  "
+"Normally you will want the default (scs.msg.yahoo.com)."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:55
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:289
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:55
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:289
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2368 rc.cpp:3711 rc.cpp:2368 rc.cpp:3711
-msgid "&Address:"
-msgstr "Cyf&eiriad:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:371
+#. i18n: ectx: property (text), widget (QLineEdit, editServerAddress)
+#: rc.cpp:3722 rc.cpp:3722
+msgid "scs.msg.yahoo.com"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:78
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:106
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:338
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:78
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:106
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:338
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:2371 rc.cpp:2759 rc.cpp:3717 rc.cpp:2371 rc.cpp:2759 rc.cpp:3717
-msgid "&City:"
-msgstr "&Dinas:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:381
+#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
+#: rc.cpp:3725 rc.cpp:3725
+msgid "The port on the Yahoo server that you would like to connect to."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:101
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:279
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:101
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:279
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:2374 rc.cpp:3708 rc.cpp:2374 rc.cpp:3708
-msgid "&State:"
-msgstr "&Talaith:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:384
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:403
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:384
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:403
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
+#: rc.cpp:3728 rc.cpp:3737 rc.cpp:3728 rc.cpp:3737
+msgid ""
+"The port on the Yahoo server that you would like to connect to.  Normally "
+"this is 5050, but Yahoo also allows port 80 in case you are behind a "
+"firewall."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:124
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:348
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:124
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:348
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:2377 rc.cpp:3720 rc.cpp:2377 rc.cpp:3720
-msgid "&Zip:"
-msgstr "&Zip :"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:387
+#. i18n: ectx: property (text), widget (QLabel, lblPort)
+#: rc.cpp:3731 rc.cpp:3731
+msgid "P&ort:"
+msgstr "&Porth:"
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:150
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:299
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:150
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:299
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:2380 rc.cpp:3714 rc.cpp:2380 rc.cpp:3714
-msgid "Countr&y:"
-msgstr "Gwlad:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:400
+#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxServerPort)
+#: rc.cpp:3734 rc.cpp:3734
+msgid "The port on the Yahoo server that you would like to connect  to."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:163
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:156
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:163
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:156
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:2383 rc.cpp:3693 rc.cpp:2383 rc.cpp:3693
-msgid "&Phone:"
-msgstr "&Ffôn:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:424
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:3740 rc.cpp:3740
+msgid "Buddy Icon"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:183
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:212
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:183
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:212
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
-#: rc.cpp:2386 rc.cpp:3702 rc.cpp:2386 rc.cpp:3702
-msgid "Ce&ll:"
-msgstr "Ce&ll:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:465
+#. i18n: ectx: property (text), widget (QCheckBox, optionSendBuddyIcon)
+#: rc.cpp:3743 rc.cpp:3743
+msgid "Se&nd buddy icon to other users"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:206
-#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:133
-#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:206
-#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:133
-#. i18n: ectx: property (text), widget (QLabel, textLabel7_2)
-#: rc.cpp:2389 rc.cpp:3690 rc.cpp:2389 rc.cpp:3690
-msgid "Fa&x:"
-msgstr "Ff&acs:"
+#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:508
+#. i18n: ectx: property (text), widget (QPushButton, buttonSelectPicture)
+#: rc.cpp:3746 rc.cpp:3746
+msgid "Select Picture..."
+msgstr "Dewis Llun ..."
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:223
-#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:202
-#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:223
-#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:202
-#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
-#: rc.cpp:2392 rc.cpp:3699 rc.cpp:2392 rc.cpp:3699
-msgid "&Homepage:"
-msgstr "T&udalen Gartref:"
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, YahooAddContactBase)
+#: rc.cpp:3749 rc.cpp:3749
+msgid "Add Yahoo Contact"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:249
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:2395 rc.cpp:2395
-msgid "Origin"
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:33
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:49
+#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:33
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:49
+#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
+#: rc.cpp:3752 rc.cpp:3761 rc.cpp:3752 rc.cpp:3761
+msgid "The account name of the Yahoo account you would like to add."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:290
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:78
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:399
-#. i18n: ectx: property (text), widget (QLabel, lblState)
-#. i18n: file: protocols/oscar/icq/ui/icqhomeinfowidget.ui:290
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:78
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:399
-#. i18n: ectx: property (text), widget (QLabel, lblState)
-#: rc.cpp:2401 rc.cpp:2828 rc.cpp:3777 rc.cpp:4408 rc.cpp:2401 rc.cpp:2828
-#: rc.cpp:3777 rc.cpp:4408
-msgid "State:"
-msgstr "Talaith:"
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:36
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:52
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:36
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:52
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
+#: rc.cpp:3755 rc.cpp:3764 rc.cpp:3755 rc.cpp:3764
+msgid ""
+"The account name of the Yahoo account you would like to add.  This should be "
+"in the form of an alphanumeric string (no spaces)."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:384
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:384
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:2407 rc.cpp:3723 rc.cpp:2407 rc.cpp:3723
-msgid "Personal Information"
-msgstr "Gwybodaeth Bersonol"
+#. i18n: file: protocols/yahoo/ui/yahooadd.ui:61
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#: rc.cpp:3767 rc.cpp:3767
+msgid "<i>(for example: joe8752)</i>"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:34
-#. i18n: ectx: property (text), widget (QLabel, uinLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:175
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:34
-#. i18n: ectx: property (text), widget (QLabel, uinLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:175
+#. i18n: file: protocols/yahoo/ui/yahooverifyaccountbase.ui:28
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2410 rc.cpp:2774 rc.cpp:2410 rc.cpp:2774
-msgid "&UIN #:"
+#: rc.cpp:3770 rc.cpp:3770
+msgid ""
+"Your Account has to be verified due to too many failed login attempts.<br>"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:51
-#. i18n: ectx: property (text), widget (QLabel, ipLabel)
-#: rc.cpp:2413 rc.cpp:2413
-msgid "&IP:"
-msgstr "&IP :"
-
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:71
-#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:41
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:533
-#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:71
-#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:41
+#. i18n: file: protocols/yahoo/ui/yahooverifyaccountbase.ui:43
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:533
-#. i18n: ectx: property (text), widget (QLabel, nickNameLabel)
-#: rc.cpp:2416 rc.cpp:2744 rc.cpp:3744 rc.cpp:2416 rc.cpp:2744 rc.cpp:3744
-msgid "&Nickname:"
-msgstr "Ffuge&nw:"
+#: rc.cpp:3773 rc.cpp:3773
+msgid "Please enter the characters shown in the picture:"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:105
-#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:54
+#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:60
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:3776 rc.cpp:3776
+msgid "Note 4:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:74
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:3779 rc.cpp:3779
+msgid "Note 3:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:88
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:105
-#. i18n: ectx: property (text), widget (QLabel, firstNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:54
+#: rc.cpp:3782 rc.cpp:3782
+msgid "Note 2:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:102
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:3785 rc.cpp:3785
+msgid "Note 1:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:109
+#. i18n: ectx: property (text), widget (QLabel, textLabel13)
+#: rc.cpp:3788 rc.cpp:3788
+msgid "Contact comments:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:38
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:3791 rc.cpp:3791
+msgid "Contact Information"
+msgstr "Gwybodaeth Cysylltu"
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:50
+#. i18n: ectx: property (text), widget (QLabel, textLabel9_3)
+#: rc.cpp:3794 rc.cpp:3794
+msgid "Email &3:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:90
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2_2)
+#: rc.cpp:3800 rc.cpp:3800
+msgid "Pager:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:123
+#. i18n: ectx: property (text), widget (QLabel, textLabel9_2)
+#: rc.cpp:3803 rc.cpp:3803
+msgid "Email &2:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:166
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2_2_2)
+#: rc.cpp:3812 rc.cpp:3812
+msgid "Additional:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:251
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:3821 rc.cpp:3821
+msgid "Location Information"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:457
+#. i18n: ectx: property (text), widget (QLabel, birthdayLabel_2)
+#: rc.cpp:3845 rc.cpp:3845
+msgid "Anniversary:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:513
+#. i18n: ectx: property (text), widget (QLabel, yahooIdLabel)
+#: rc.cpp:3854 rc.cpp:3854
+msgid "Yahoo ID:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:523
+#. i18n: ectx: property (text), widget (QLabel, fullNameLabel_2_2)
+#: rc.cpp:3857 rc.cpp:3857
+msgid "Second name:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:543
+#. i18n: ectx: property (text), widget (QLabel, yahooIdLabel_2)
+#: rc.cpp:3863 rc.cpp:3863
+msgctxt "Person's name suffix or prefix"
+msgid "Title:"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:3896 rc.cpp:3896
+msgid "Show Me As"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:53
+#. i18n: ectx: property (text), widget (QRadioButton, radioOffline)
+#: rc.cpp:3902 rc.cpp:3902
+msgid "Off&line"
+msgstr ""
+
+#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:63
+#. i18n: ectx: property (text), widget (QRadioButton, radioPermOffline)
+#: rc.cpp:3905 rc.cpp:3905
+msgid "Perma&nently offline"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/ircadd.ui:34
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:3911 kopete/kopetewindow.cpp:378
+#: kopete/contactlist/kopetecontactlistview.cpp:195 rc.cpp:3911
+msgid "&Add Contact"
+msgstr "&Ychwanegu Cyswllt"
+
+#. i18n: file: protocols/irc/ui/ircadd.ui:54
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/irc/ui/ircadd.ui:70
+#. i18n: ectx: property (toolTip), widget (QLineEdit, addID)
+#. i18n: file: protocols/irc/ui/ircadd.ui:54
+#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/irc/ui/ircadd.ui:70
+#. i18n: ectx: property (toolTip), widget (QLineEdit, addID)
+#: rc.cpp:3914 rc.cpp:3923 rc.cpp:3914 rc.cpp:3923
+msgid "The name of the IRC contact or channel you would like to add."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/ircadd.ui:57
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/irc/ui/ircadd.ui:73
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, addID)
+#. i18n: file: protocols/irc/ui/ircadd.ui:57
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
+#. i18n: file: protocols/irc/ui/ircadd.ui:73
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, addID)
+#: rc.cpp:3917 rc.cpp:3926 rc.cpp:3917 rc.cpp:3926
+msgid ""
+"The name of the IRC contact or channel you would like to add.  You can type "
+"a person's nickname, or a channel name, preceded by a pound sign ('#')."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/ircadd.ui:60
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:3920 rc.cpp:3920
+msgid "N&ickname/channel to add:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/ircadd.ui:82
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:2422 rc.cpp:2747 rc.cpp:2422 rc.cpp:2747
-msgid "&First name:"
-msgstr "&Enw cyntaf:"
+#: rc.cpp:3929 rc.cpp:3929
+msgid "<i>(for example: joe_bob or #somechannel)</i>"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:128
-#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:80
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:128
-#. i18n: ectx: property (text), widget (QLabel, lastNameLabel)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:80
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:2425 rc.cpp:2753 rc.cpp:2425 rc.cpp:2753
-msgid "&Last name:"
-msgstr "&Enw olaf:"
+#. i18n: file: protocols/irc/ui/ircadd.ui:117
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:3932 rc.cpp:3932
+msgid "&Search Channels"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:83
+#. i18n: ectx: property (whatsThis), widget (QLabel, m_nickNamesLabel)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:163
+#. i18n: ectx: property (toolTip), widget (QLineEdit, nickNames)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:83
+#. i18n: ectx: property (whatsThis), widget (QLabel, m_nickNamesLabel)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:163
+#. i18n: ectx: property (toolTip), widget (QLineEdit, nickNames)
+#: rc.cpp:3941 rc.cpp:3968 rc.cpp:3941 rc.cpp:3968
+msgid "This is the name that everyone will see every time you say something"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:86
+#. i18n: ectx: property (text), widget (QLabel, m_nickNamesLabel)
+#: rc.cpp:3944 rc.cpp:3944
+msgid "N&icknames:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:96
+#. i18n: ectx: property (text), widget (QLabel, m_realNameLabel)
+#: rc.cpp:3947 rc.cpp:3947
+msgid "&Real name:"
+msgstr "&Enw go iawn:"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:106
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:125
+#. i18n: ectx: property (toolTip), widget (QLineEdit, userName)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:128
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, userName)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:147
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, realName)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:106
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:125
+#. i18n: ectx: property (toolTip), widget (QLineEdit, userName)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:128
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, userName)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:147
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, realName)
+#: rc.cpp:3950 rc.cpp:3956 rc.cpp:3959 rc.cpp:3965 rc.cpp:3950 rc.cpp:3956
+#: rc.cpp:3959 rc.cpp:3965
+msgid ""
+"The username you would prefer to use on IRC, if your system does not have "
+"identd support.  Leave blank to use your system account name."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:109
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:3953 rc.cpp:3953
+msgid "&Username:"
+msgstr "&Enw Defnyddiwr:"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:144
+#. i18n: ectx: property (toolTip), widget (QLineEdit, realName)
+#: rc.cpp:3962 rc.cpp:3962
+msgid ""
+"The username you would prefer to use on IRC, if your system does not have "
+"identd support."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:166
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, nickNames)
+#: rc.cpp:3971 rc.cpp:3971
+msgid ""
+"The alias you would like to use on IRC.  Once you are online, you can change "
+"it with the /nick command."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:173
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
+#: rc.cpp:3974 rc.cpp:3974
+msgid "Network:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:183
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: rc.cpp:3977 rc.cpp:3977
+msgid "&Edit..."
+msgstr "&Golygu..."
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:235
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:3980 rc.cpp:3980
+msgid ""
+"<p><b>Note:</b> most IRC servers do not require a password to connect, only "
+"a nickname.</p>"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:308
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2)
+#: rc.cpp:3989 rc.cpp:3989
+msgid "Default &charset:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:349
+#. i18n: ectx: property (text), widget (QCheckBox, preferSSL)
+#: rc.cpp:3998 rc.cpp:3998
+msgid "&Prefer SSL-based connections"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:371
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox60)
+#: rc.cpp:4001 rc.cpp:4001
+msgid "Run the Following Commands on Connect"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:389
+#. i18n: ectx: property (toolTip), widget (QListView, commandList)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:392
+#. i18n: ectx: property (whatsThis), widget (QListView, commandList)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:389
+#. i18n: ectx: property (toolTip), widget (QListView, commandList)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:392
+#. i18n: ectx: property (whatsThis), widget (QListView, commandList)
+#: rc.cpp:4004 rc.cpp:4007 rc.cpp:4004 rc.cpp:4007
+msgid ""
+"Any commands added here will be run as soon as you are connected to the IRC "
+"server."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:417
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: rc.cpp:4010 rc.cpp:4010
+msgid "Add Co&mmand"
+msgstr "Ychwan&egu Gorchymyn"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:438
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:4013 rc.cpp:4013
+msgid "A&dvanced Configuration"
+msgstr "F&furfweddiad Uwch"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:462
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
+#: rc.cpp:4016 rc.cpp:4016
+msgid "Custom CTCP Replies"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:480
+#. i18n: ectx: property (whatsThis), widget (QListView, ctcpList)
+#: rc.cpp:4019 rc.cpp:4019
+msgid ""
+"You can use this dialog to add custom replies for when people send you CTCP "
+"requests. You can also use this dialog to override the built-in replies for "
+"VERSION, USERINFO, and CLIENTINFO."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:495
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#: rc.cpp:4022 rc.cpp:4022
+msgid "&CTCP:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:508
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
+#: rc.cpp:4025 rc.cpp:4025
+msgid "&Reply:"
+msgstr "&Ymateb :"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:521
+#. i18n: ectx: property (text), widget (QPushButton, addReply)
+#: rc.cpp:4028 rc.cpp:4028
+msgid "Add Repl&y"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:533
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
+#: rc.cpp:4031 rc.cpp:4031
+msgid "Default Messages"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:545
+#. i18n: ectx: property (toolTip), widget (QLineEdit, quitMessage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:548
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, quitMessage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:545
+#. i18n: ectx: property (toolTip), widget (QLineEdit, quitMessage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:548
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, quitMessage)
+#: rc.cpp:4034 rc.cpp:4037 rc.cpp:4034 rc.cpp:4037
+msgid ""
+"The message you want people to see when you disconnect from IRC without "
+"giving a reason. Leave this field blank to use the Kopete default message."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:555
+#. i18n: ectx: property (toolTip), widget (QLineEdit, partMessage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:558
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, partMessage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:555
+#. i18n: ectx: property (toolTip), widget (QLineEdit, partMessage)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:558
+#. i18n: ectx: property (whatsThis), widget (QLineEdit, partMessage)
+#: rc.cpp:4040 rc.cpp:4043 rc.cpp:4040 rc.cpp:4043
+msgid ""
+"The message you want people to see when you part a channel without giving a "
+"reason. Leave this field blank to use the Kopete default message."
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:565
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#: rc.cpp:4046 rc.cpp:4046
+msgid "&Quit message:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:575
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:4049 rc.cpp:4049
+msgid "&Part message:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:597
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:4052 rc.cpp:4052
+msgid "Windows"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:622
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox7)
+#: rc.cpp:4055 rc.cpp:4055
+msgid "Message Destinations"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:634
+#. i18n: ectx: property (text), widget (QCheckBox, autoShowAnonWindows)
+#: rc.cpp:4058 rc.cpp:4058
+msgid "Auto-show anonymous windows"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:641
+#. i18n: ectx: property (text), widget (QCheckBox, autoShowServerWindow)
+#: rc.cpp:4061 rc.cpp:4061
+msgid "Auto-show the server window"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:656
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
+#: rc.cpp:4064 rc.cpp:4064
+msgid "Server messages:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:666
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_3_2)
+#: rc.cpp:4067 rc.cpp:4067
+msgid "Server notices:"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:680
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:712
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:761
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:800
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:680
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:712
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:761
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:800
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#: rc.cpp:4070 rc.cpp:4085 rc.cpp:4103 rc.cpp:4121 rc.cpp:4070 rc.cpp:4085
+#: rc.cpp:4103 rc.cpp:4121
+msgid "Active Window"
+msgstr "Ffenestr Weithredol"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:685
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:717
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:766
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:805
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:685
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:717
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:766
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:805
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#: rc.cpp:4073 rc.cpp:4088 rc.cpp:4106 rc.cpp:4124 rc.cpp:4073 rc.cpp:4088
+#: rc.cpp:4106 rc.cpp:4124
+msgid "Server Window"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:690
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:722
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:771
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:810
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:690
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:722
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:771
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:810
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#: rc.cpp:4076 rc.cpp:4091 rc.cpp:4109 rc.cpp:4127 rc.cpp:4076 rc.cpp:4091
+#: rc.cpp:4109 rc.cpp:4127
+msgid "Anonymous Window"
+msgstr ""
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:695
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:727
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:776
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:815
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:695
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:727
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:776
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:815
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#: rc.cpp:4079 rc.cpp:4094 rc.cpp:4112 rc.cpp:4130 rc.cpp:4079 rc.cpp:4094
+#: rc.cpp:4112 rc.cpp:4130
+msgid "KNotify"
+msgstr "KHysbysu"
+
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:700
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:732
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:781
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:820
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:700
+#. i18n: ectx: property (text), item, widget (QComboBox, serverNotices_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:732
+#. i18n: ectx: property (text), item, widget (QComboBox, serverMessages_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:781
+#. i18n: ectx: property (text), item, widget (QComboBox, informationReplies_2)
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:820
+#. i18n: ectx: property (text), item, widget (QComboBox, errorMessages_2)
+#: rc.cpp:4082 rc.cpp:4097 rc.cpp:4115 rc.cpp:4133 rc.cpp:4082 rc.cpp:4097
+#: rc.cpp:4115 rc.cpp:4133
+msgctxt "@item:inlistbox"
+msgid "Ignore"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:151
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:2428 rc.cpp:2428
-msgid "Gen&der:"
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:750
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_3_2)
+#: rc.cpp:4100 rc.cpp:4100
+msgid "Error messages:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:164
-#. i18n: ectx: property (text), widget (QLabel, maritalLabel)
-#: rc.cpp:2431 rc.cpp:2431
-msgid "Marital status:"
+#. i18n: file: protocols/irc/ui/irceditaccount.ui:789
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2)
+#: rc.cpp:4118 rc.cpp:4118
+msgid "Information replies:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:190
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:2434 rc.cpp:2434
-msgid "&Timezone:"
-msgstr "&Amserfa:"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, NetworkConfig)
+#: rc.cpp:4136 rc.cpp:4136
+msgid "Network Configuration"
+msgstr "Ffurfweddiad y Rhwydwaith"
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:214
-#. i18n: ectx: property (text), widget (QLabel, birthdayDayLabel)
-#: rc.cpp:2440 rc.cpp:2440
-msgid "Day:"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:4139 rc.cpp:4139
+msgid "Host Con&figurations"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:234
-#. i18n: ectx: property (text), widget (QLabel, birthdayMonthLabel)
-#: rc.cpp:2443 rc.cpp:2443
-msgid "Month:"
-msgstr ""
+#. i18n: file: protocols/irc/ui/networkconfig.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, m_newHost)
+#: rc.cpp:4142 rc.cpp:4142
+msgid "&New..."
+msgstr "&Newydd..."
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:257
-#. i18n: ectx: property (text), widget (QLabel, birthdayYearLabel)
-#: rc.cpp:2446 rc.cpp:2446
-msgid "Year:"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:91
+#. i18n: ectx: property (toolTip), widget (Q3ListBox, m_hostList)
+#: rc.cpp:4148 rc.cpp:4148
+msgid "The IRC servers associated with this network"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:300
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#: rc.cpp:2449 rc.cpp:2449
-msgid "A&ge:"
-msgstr "O&edran :"
-
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:337
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2452 rc.cpp:2452
-msgid "Spoken Languages"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:94
+#. i18n: ectx: property (whatsThis), widget (Q3ListBox, m_hostList)
+#: rc.cpp:4151 rc.cpp:4151
+msgid ""
+"The IRC servers associated with this network. Use the up and down buttons to "
+"alter the order in which connections are attempted."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:361
-#. i18n: ectx: property (text), widget (QLabel, language1Label)
-#: rc.cpp:2455 rc.cpp:2455
-msgid "First:"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:104
+#. i18n: ectx: property (toolTip), widget (QPushButton, downButton)
+#: rc.cpp:4154 rc.cpp:4154
+msgid "Move this server down"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:374
-#. i18n: ectx: property (text), widget (QLabel, language2Label)
-#: rc.cpp:2458 rc.cpp:2458
-msgid "Second:"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:107
+#. i18n: ectx: property (whatsThis), widget (QPushButton, downButton)
+#: rc.cpp:4157 rc.cpp:4157
+msgid "Decrease connection-attempt priority for this server"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqgeneralinfo.ui:387
-#. i18n: ectx: property (text), widget (QLabel, language3Label)
-#: rc.cpp:2461 rc.cpp:2461
-msgid "Third:"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:120
+#. i18n: ectx: property (toolTip), widget (QPushButton, upButton)
+#: rc.cpp:4163 rc.cpp:4163
+msgid "Move this server up"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, ICQEditAccountUI)
-#: rc.cpp:2464 rc.cpp:2464
-msgid "Account Preferences - ICQ"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:123
+#. i18n: ectx: property (whatsThis), widget (QPushButton, upButton)
+#: rc.cpp:4166 rc.cpp:4166
+msgid "Increase connection-attempt priority for this server"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:30
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:2467 rc.cpp:2467
-msgctxt "@title:tab"
-msgid "&Basic Setup"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:154
+#. i18n: ectx: property (toolTip), widget (QCheckBox, useSSL)
+#: rc.cpp:4172 rc.cpp:4172
+msgid "Check this to enable SSL for this connection"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:42
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:2470 rc.cpp:2470
-msgid "Account Preferences"
+#. i18n: file: protocols/irc/ui/networkconfig.ui:157
+#. i18n: ectx: property (text), widget (QCheckBox, useSSL)
+#: rc.cpp:4175 rc.cpp:4175
+msgid "Use SS&L"
+msgstr "Defnyddier SS&L"
+
+#. i18n: file: protocols/irc/ui/networkconfig.ui:164
+#. i18n: ectx: property (text), widget (QLabel, m_hostLabel)
+#: rc.cpp:4178 rc.cpp:4178
+msgid "&Host:"
+msgstr "&Gwesteiwr:"
+
+#. i18n: file: protocols/irc/ui/networkconfig.ui:218
+#. i18n: ectx: property (text), widget (QLabel, m_descriptionLabel)
+#: rc.cpp:4184 rc.cpp:4184
+msgid "&Description:"
+msgstr "&Disgrifiad:"
+
+#. i18n: file: protocols/irc/ui/networkconfig.ui:235
+#. i18n: ectx: property (text), widget (QPushButton, m_saveButton)
+#. i18n: file: plugins/alias/aliasdialog.ui:81
+#. i18n: ectx: property (text), widget (KPushButton, addButton)
+#. i18n: file: protocols/irc/ui/networkconfig.ui:235
+#. i18n: ectx: property (text), widget (QPushButton, m_saveButton)
+#. i18n: file: plugins/alias/aliasdialog.ui:81
+#. i18n: ectx: property (text), widget (KPushButton, addButton)
+#: rc.cpp:4190 rc.cpp:4637 rc.cpp:4190 rc.cpp:4637
+msgid "&Save"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:62
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:78
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:62
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:78
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
-#: rc.cpp:2473 rc.cpp:2482 rc.cpp:2473 rc.cpp:2482
-msgid "The user ID of your ICQ account."
+#. i18n: file: protocols/irc/ui/networkconfig.ui:242
+#. i18n: ectx: property (text), widget (QPushButton, m_newNetworkButton)
+#: rc.cpp:4193 rc.cpp:4193
+msgid "Ne&w"
+msgstr "Ne&wydd"
+
+#. i18n: file: protocols/irc/ui/networkconfig.ui:275
+#. i18n: ectx: property (text), widget (QPushButton, m_renameNetworkButton)
+#: rc.cpp:4196 rc.cpp:4196
+msgid "Rena&me..."
+msgstr "Ail-&enwi..."
+
+#. i18n: file: protocols/irc/ui/networkconfig.ui:282
+#. i18n: ectx: property (text), widget (QPushButton, m_removeNetworkButton)
+#: rc.cpp:4199 rc.cpp:4199
+msgid "Remo&ve"
+msgstr "&Gwaredu"
+
+#. i18n: file: plugins/statistics/statisticswidgetbase.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:4205 rc.cpp:4205
+msgid "&Calendar View"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:65
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:81
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:65
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:81
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
-#: rc.cpp:2476 rc.cpp:2485 rc.cpp:2476 rc.cpp:2485
-msgid ""
-"The user ID of your ICQ account.  This should be in the form of a number (no "
-"decimals, no spaces)."
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:11
+#. i18n: ectx: label, entry (Sender_AllowAll), group (Privacy Plugin)
+#: rc.cpp:4211 rc.cpp:4211
+msgid "Allow everyone to send you messages."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:68
-#. i18n: ectx: property (text), widget (QLabel, lblAccountId)
-#: rc.cpp:2479 rc.cpp:2479
-msgid "IC&Q UIN:"
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:15
+#. i18n: ectx: label, entry (Sender_AllowNoneButWhiteList), group (Privacy Plugin)
+#: rc.cpp:4214 rc.cpp:4214
+msgid ""
+"Allow nobody to send you messages, except the contacts on the whitelist."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:134
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:2497 rc.cpp:2497
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:19
+#. i18n: ectx: label, entry (Sender_AllowAllButBlackList), group (Privacy Plugin)
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:23
+#. i18n: ectx: label, entry (Sender_AllowNoneButContactList), group (Privacy Plugin)
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:19
+#. i18n: ectx: label, entry (Sender_AllowAllButBlackList), group (Privacy Plugin)
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:23
+#. i18n: ectx: label, entry (Sender_AllowNoneButContactList), group (Privacy Plugin)
+#: rc.cpp:4217 rc.cpp:4220 rc.cpp:4217 rc.cpp:4220
 msgid ""
-"To connect to the ICQ network, you will need an ICQ account.<br><br>\n"
-"If you do not currently have an ICQ account, please click the button to "
-"create one."
+"Allow everyone to send you messages, except the contacts on the blacklist."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:157
-#. i18n: ectx: property (title), widget (QGroupBox, changePasswordGroupBox)
-#: rc.cpp:2504 rc.cpp:2504
-msgid "Change password"
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:27
+#. i18n: ectx: label, entry (WhiteList), group (Privacy Plugin)
+#: rc.cpp:4223 rc.cpp:4223
+msgid "Contacts on the whitelist."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:175
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2507 rc.cpp:2507
-msgid ""
-"If you have an existing ICQ account and would like to change its password, "
-"you can use this button to enter a new password."
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:31
+#. i18n: ectx: label, entry (BlackList), group (Privacy Plugin)
+#: rc.cpp:4226 rc.cpp:4226
+msgid "Contacts on the blacklist."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:191
-#. i18n: ectx: property (text), widget (QPushButton, buttonChangePassword)
-#: rc.cpp:2510 rc.cpp:2510
-msgid "Change Your Password..."
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:35
+#. i18n: ectx: label, entry (Content_DropIfAny), group (Privacy Plugin)
+#: rc.cpp:4229 rc.cpp:4229
+msgid "Drop messages that contain at least one of the following words."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:218
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:2513 rc.cpp:2513
-msgctxt "@title:tab"
-msgid "Accou&nt Preferences"
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:39
+#. i18n: ectx: label, entry (DropIfAny), group (Privacy Plugin)
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:47
+#. i18n: ectx: label, entry (DropIfAll), group (Privacy Plugin)
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:39
+#. i18n: ectx: label, entry (DropIfAny), group (Privacy Plugin)
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:47
+#. i18n: ectx: label, entry (DropIfAll), group (Privacy Plugin)
+#: rc.cpp:4232 rc.cpp:4238 rc.cpp:4232 rc.cpp:4238
+msgid "Words to look for."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:230
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:2516 rc.cpp:2516
-msgid "Privacy Options"
+#. i18n: file: plugins/privacy/privacyconfig.kcfg:43
+#. i18n: ectx: label, entry (Content_DropIfAll), group (Privacy Plugin)
+#: rc.cpp:4235 rc.cpp:4235
+msgid "Drop messages that contain all of the following words."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:242
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkRequireAuth)
-#: rc.cpp:2519 rc.cpp:2519
-msgid ""
-"Enable the authorization requirement, which will not allow users to add you "
-"to their contact list without authorization from you."
+#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:21
+#. i18n: ectx: property (windowTitle), widget (QWidget, ContactSelectorWidget_Base)
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddressBookSelectorWidget_Base)
+#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:21
+#. i18n: ectx: property (windowTitle), widget (QWidget, MetaContactSelectorWidget_Base)
+#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:21
+#. i18n: ectx: property (windowTitle), widget (QWidget, ContactSelectorWidget_Base)
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddressBookSelectorWidget_Base)
+#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:21
+#. i18n: ectx: property (windowTitle), widget (QWidget, MetaContactSelectorWidget_Base)
+#: rc.cpp:4250 rc.cpp:5214 rc.cpp:5315 kopete/contactlist/kabcexport.cpp:64
+#: rc.cpp:4250 rc.cpp:5214 rc.cpp:5315
+msgid "Select Contact"
+msgstr "Dewis Cyswllt"
+
+#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:33
+#. i18n: ectx: property (text), widget (QRadioButton, radioAddExistingMetaContact)
+#: rc.cpp:4253 rc.cpp:4253
+msgid "Add an existing metacontact:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:245
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkRequireAuth)
-#: rc.cpp:2522 rc.cpp:2522
-msgid ""
-"Enable the authorization requirement, which will not allow users to add you "
-"to their contact list without authorization from you.  Check this box, and "
-"you will have to confirm any users who add you to their list before they may "
-"see your online status."
+#. i18n: file: plugins/privacy/contactselectorwidget_base.ui:46
+#. i18n: ectx: property (text), widget (QRadioButton, radioAnotherContact)
+#: rc.cpp:4256 rc.cpp:4256
+msgid "Specify another contact:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:248
-#. i18n: ectx: property (text), widget (QCheckBox, chkRequireAuth)
-#: rc.cpp:2525 rc.cpp:2525
-msgid ""
-"&Require authorization before someone can add you to their contact list"
+#. i18n: file: plugins/privacy/privacydialog.ui:34
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:4259 rc.cpp:4259
+msgid "Filter by Sender"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:255
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkHideIP)
-#: rc.cpp:2528 rc.cpp:2528
-msgid ""
-"Check this to hide your IP address from people when they view your user info"
+#. i18n: file: plugins/privacy/privacydialog.ui:58
+#. i18n: ectx: property (text), widget (QRadioButton, radioOnlyWhiteList)
+#: rc.cpp:4262 rc.cpp:4262
+msgid "Allow messages only from contacts on the whitelist"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:258
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkHideIP)
-#: rc.cpp:2531 rc.cpp:2531
-msgid ""
-"Checking this box prevent people from seeing your IP address if they view "
-"your ICQ user details such as name, address, or age."
+#. i18n: file: plugins/privacy/privacydialog.ui:99
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:4271 rc.cpp:4271
+msgid "Blacklist:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:261
-#. i18n: ectx: property (text), widget (QCheckBox, chkHideIP)
-#: rc.cpp:2534 rc.cpp:2534
-msgid "Hide &IP address"
+#. i18n: file: plugins/privacy/privacydialog.ui:125
+#. i18n: ectx: property (text), widget (QRadioButton, radioAllowAll)
+#: rc.cpp:4277 rc.cpp:4277
+msgid "Allow all messages"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:268
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkWebAware)
-#: rc.cpp:2537 rc.cpp:2537
-msgid "Check this box to enable Web Aware functionality."
+#. i18n: file: plugins/privacy/privacydialog.ui:135
+#. i18n: ectx: property (text), widget (QRadioButton, radioOnlyContactList)
+#: rc.cpp:4280 rc.cpp:4280
+msgid "Allow messages only from contacts on my contact list"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:271
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkWebAware)
-#: rc.cpp:2540 rc.cpp:2540
-msgid ""
-"Check this box to enable ICQ's Web Aware functionality, which allows people "
-"to see your online status from ICQ's web page, and send you a message "
-"without necessarily having ICQ themselves."
+#. i18n: file: plugins/privacy/privacydialog.ui:142
+#. i18n: ectx: property (text), widget (QRadioButton, radioAllButBlackList)
+#: rc.cpp:4283 rc.cpp:4283
+msgid "Allow all messages but messages from contacts on the blacklist"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:274
-#. i18n: ectx: property (text), widget (QCheckBox, chkWebAware)
-#: rc.cpp:2543 rc.cpp:2543
-msgid "Make my status available via &ICQ's unified messaging center"
+#. i18n: file: plugins/privacy/privacydialog.ui:169
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:4286 rc.cpp:4286
+msgid "Whitelist:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:333
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:371
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:333
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:371
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
-#: rc.cpp:2552 rc.cpp:2570 rc.cpp:2552 rc.cpp:2570
-msgid "The IP address or hostmask of the ICQ server you wish to connect to."
+#. i18n: file: plugins/privacy/privacydialog.ui:212
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:4298 rc.cpp:4298
+msgid "Filter by Content (separate multiple words by commas)"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:336
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:374
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:336
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:374
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
-#: rc.cpp:2555 rc.cpp:2573 rc.cpp:2555 rc.cpp:2573
-msgid ""
-"The IP address or hostmask of the ICQ server you wish to connect to.  "
-"Normally you will want the default (login.icq.com)."
+#. i18n: file: plugins/privacy/privacydialog.ui:242
+#. i18n: ectx: property (text), widget (QCheckBox, chkDropAll)
+#: rc.cpp:4301 rc.cpp:4301
+msgid "Drop messages that contain all of the following words:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:352
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:387
-#. i18n: ectx: property (toolTip), widget (QSpinBox, edtServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:352
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:387
-#. i18n: ectx: property (toolTip), widget (QSpinBox, edtServerPort)
-#: rc.cpp:2561 rc.cpp:2579 rc.cpp:2561 rc.cpp:2579
-msgid "The port on the ICQ server that you would like to connect to."
+#. i18n: file: plugins/privacy/privacydialog.ui:249
+#. i18n: ectx: property (text), widget (QCheckBox, chkDropAtLeastOne)
+#: rc.cpp:4304 rc.cpp:4304
+msgid "Drop messages that contain at least one of the following words:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:355
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:390
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, edtServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:355
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:390
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, edtServerPort)
-#: rc.cpp:2564 rc.cpp:2582 rc.cpp:2564 rc.cpp:2582
-msgid ""
-"The port on the ICQ server that you would like to connect to.  Normally this "
-"is 5190."
+#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:7
+#. i18n: ectx: label, entry (PreviewAmount), group (URLPicPreview Plugin)
+#: rc.cpp:4307 rc.cpp:4307
+msgid "Maximum number of Previews"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:377
-#. i18n: ectx: property (text), widget (QLineEdit, edtServerAddress)
-#: rc.cpp:2576 rc.cpp:2576
-msgid "login.icq.com"
+#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:11
+#. i18n: ectx: label, entry (Scaling), group (URLPicPreview Plugin)
+#: rc.cpp:4310 rc.cpp:4310
+msgid "Should the image be scaled"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:442
-#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:480
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtProxyServerAddress)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:442
-#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:480
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtProxyServerAddress)
-#: rc.cpp:2588 rc.cpp:2606 rc.cpp:2588 rc.cpp:2606
-msgid ""
-"The IP address or hostmask of the proxy server you wish to use for "
-"connecting to an ICQ server."
+#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:15
+#. i18n: ectx: label, entry (PreviewRestriction), group (URLPicPreview Plugin)
+#: rc.cpp:4313 rc.cpp:4313
+msgid "Should the number of previews be restricted?"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:445
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblProxyServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:483
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtProxyServerAddress)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:445
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblProxyServer)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:483
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtProxyServerAddress)
-#: rc.cpp:2591 rc.cpp:2609 rc.cpp:2591 rc.cpp:2609
-msgid ""
-"The IP address or hostmask of the proxy server you wish to use for "
-"connecting to an ICQ server. The proxy server must support a CONNECT command "
-"and allow connections to the ICQ server port (normally 5190)."
+#. i18n: file: plugins/urlpicpreview/urlpicpreview.kcfg:19
+#. i18n: ectx: label, entry (PreviewScaleWidth), group (URLPicPreview Plugin)
+#: rc.cpp:4316 rc.cpp:4316
+msgid "Scale images to the width"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:461
-#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:496
-#. i18n: ectx: property (toolTip), widget (QSpinBox, edtProxyServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:461
-#. i18n: ectx: property (toolTip), widget (QLabel, lblProxyServerPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:496
-#. i18n: ectx: property (toolTip), widget (QSpinBox, edtProxyServerPort)
-#: rc.cpp:2597 rc.cpp:2612 rc.cpp:2597 rc.cpp:2612
-msgid "The port that the proxy server listens to."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, URLPicPreviewPrefsUI)
+#: rc.cpp:4319 rc.cpp:4319
+msgid "Picture Preview Preferences"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:464
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblProxyServerPort)
-#: rc.cpp:2600 rc.cpp:2600
-msgid ""
-"The port that the proxy server listens to. Normally this will be 3128 or "
-"8080."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:37
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
+#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, previewButton)
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:37
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
+#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:52
+#. i18n: ectx: property (text), widget (QPushButton, previewButton)
+#: rc.cpp:4322 rc.cpp:5880 rc.cpp:4322 rc.cpp:5880
+msgid "Preview"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:499
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, edtProxyServerPort)
-#: rc.cpp:2615 rc.cpp:2615
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:44
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, restrictPreviews)
+#: rc.cpp:4325 rc.cpp:4325
 msgid ""
-"The port that the proxy server listens to. Normally this will be 3128, 8080, "
-"or 443 (https)."
-msgstr ""
-
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:520
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:2618 rc.cpp:2618
-msgid "Peer Connection Options"
+"If checked, only the selected number of pictures are downloaded and "
+"displayed as previews.\n"
+"Otherwise, an unlimited number of previews are generated."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:540
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:450
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:540
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:450
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#: rc.cpp:2621 rc.cpp:3008 rc.cpp:2621 rc.cpp:3008
-msgid "The ports to use for direct connections."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:47
+#. i18n: ectx: property (text), widget (QCheckBox, restrictPreviews)
+#: rc.cpp:4329 rc.cpp:4329
+msgid "&Restrict number of previews:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:543
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:453
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:543
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:453
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#: rc.cpp:2624 rc.cpp:3011 rc.cpp:2624 rc.cpp:3011
-msgid ""
-"The ports to use when listening for direct connections. These must not be "
-"blocked by a firewall or router."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:57
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, previewAmount)
+#: rc.cpp:4332 rc.cpp:4332
+msgid "The maximum number of pictures to download and preview."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:546
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:456
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:546
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:456
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#: rc.cpp:2627 rc.cpp:3014 rc.cpp:2627 rc.cpp:3014
-msgid "Po&rt range:"
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:98
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox2)
+#: rc.cpp:4335 rc.cpp:4335
+msgid "Scaling"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:556
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:466
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:556
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:466
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxFirstPort)
-#: rc.cpp:2630 rc.cpp:3017 rc.cpp:2630 rc.cpp:3017
-msgid "The start of the port range."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:111
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, enableScaling)
+#: rc.cpp:4338 rc.cpp:4338
+msgid ""
+"If checked, preview images get scaled down to the width specified.\n"
+"Otherwise, the images are not scaled at all and appear in their original "
+"size."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:559
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:469
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:559
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:469
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxFirstPort)
-#: rc.cpp:2633 rc.cpp:3020 rc.cpp:2633 rc.cpp:3020
-msgid "The start of the port range. Normally this is 5190."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:114
+#. i18n: ectx: property (text), widget (QCheckBox, enableScaling)
+#: rc.cpp:4342 rc.cpp:4342
+msgid "Scale &to:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:575
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:485
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:575
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:485
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxLastPort)
-#: rc.cpp:2636 rc.cpp:3023 rc.cpp:2636 rc.cpp:3023
-msgid "The end of the port range."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:124
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, previewScaleWidth)
+#: rc.cpp:4345 rc.cpp:4345
+msgid ""
+"The width to which images should be scaled down. Smaller images will appear "
+"in their original size."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:578
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:488
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:578
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:488
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxLastPort)
-#: rc.cpp:2639 rc.cpp:3026 rc.cpp:2639 rc.cpp:3026
-msgid "The end of the port range. Normally this is 5199."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:127
+#. i18n: ectx: property (suffix), widget (KIntSpinBox, previewScaleWidth)
+#: rc.cpp:4348 rc.cpp:4348
+msgid " pixel"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:596
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:506
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:596
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:506
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkFileProxy)
-#: rc.cpp:2642 rc.cpp:3029 rc.cpp:2642 rc.cpp:3029
-msgid ""
-"Use AOL proxy server instead of direct connections. If you are behind a "
-"router that you do not control, you will probably want this."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:165
+#. i18n: ectx: property (title), widget (Q3GroupBox, linkPreviewGroup)
+#: rc.cpp:4351 rc.cpp:4351
+msgid "Link Preview"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:599
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:509
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:599
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:509
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkFileProxy)
-#: rc.cpp:2645 rc.cpp:3032 rc.cpp:2645 rc.cpp:3032
-msgid ""
-"Use the AOL proxy server for things that would normally need a direct "
-"connection, like file transfers. You will want this if there is a firewall "
-"or router that blocks connections to your computer and you cannot get "
-"unblocked. If a direct connection fails, a proxy connection will be tried "
-"regardless of this setting."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:173
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, enableLinkPreview)
+#: rc.cpp:4354 rc.cpp:4354
+msgid "Creates a preview picture of the link."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:602
-#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:512
-#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:602
-#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:512
-#. i18n: ectx: property (text), widget (QCheckBox, chkFileProxy)
-#: rc.cpp:2648 rc.cpp:3035 rc.cpp:2648 rc.cpp:3035
-msgid "&Use proxy instead"
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:176
+#. i18n: ectx: property (text), widget (QCheckBox, enableLinkPreview)
+#: rc.cpp:4357 rc.cpp:4357
+msgid "Enable lin&k preview"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:617
-#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:633
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:536
-#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:552
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:617
-#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:633
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:536
-#. i18n: ectx: property (toolTip), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:552
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxTimeout)
-#: rc.cpp:2651 rc.cpp:2660 rc.cpp:3038 rc.cpp:3047 rc.cpp:2651 rc.cpp:2660
-#: rc.cpp:3038 rc.cpp:3047
-msgid "Timeout for direct connections."
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:203
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:4360 rc.cpp:4360
+msgid "Abort creating previe&w after"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:620
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:636
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:539
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:555
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:620
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:636
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:539
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:555
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxTimeout)
-#: rc.cpp:2654 rc.cpp:2663 rc.cpp:3041 rc.cpp:3050 rc.cpp:2654 rc.cpp:2663
-#: rc.cpp:3041 rc.cpp:3050
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:220
+#. i18n: ectx: property (whatsThis), widget (KIntNumInput, timeoutLinkPreview)
+#: rc.cpp:4363 rc.cpp:4363
 msgid ""
-"The number of seconds to wait for a connection to succeed before trying a "
-"different method."
+"After the specified number of seconds the creation of the preview is aborted "
+"automatically.\n"
+"Use 0 seconds to never abort the creation."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:623
-#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:542
-#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:623
-#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:542
-#. i18n: ectx: property (text), widget (QLabel, lblTimeout)
-#: rc.cpp:2657 rc.cpp:3044 rc.cpp:2657 rc.cpp:3044
-msgid "T&imeout (secs):"
+#. i18n: file: plugins/urlpicpreview/urlpicpreviewprefsbase.ui:226
+#. i18n: ectx: property (suffix), widget (KIntNumInput, timeoutLinkPreview)
+#: rc.cpp:4367 rc.cpp:4367
+msgid " seconds"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:668
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:596
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:668
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:596
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2666 rc.cpp:3053 rc.cpp:2666 rc.cpp:3053
-msgid "Default to the following &encoding for messages:"
+#. i18n: file: plugins/latex/latexconfig.kcfg:11
+#. i18n: ectx: label, entry (HorizontalDPI), group (Latex Plugin)
+#: rc.cpp:4373 rc.cpp:4373
+msgid "Horizontal Rendering Resolution (DPI)."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:717
-#. i18n: ectx: attribute (title), widget (QWidget, tabVisible)
-#: rc.cpp:2669 rc.cpp:2669
-msgctxt "@title:tab"
-msgid "Visible"
+#. i18n: file: plugins/latex/latexconfig.kcfg:15
+#. i18n: ectx: label, entry (VerticalDPI), group (Latex Plugin)
+#: rc.cpp:4376 rc.cpp:4376
+msgid "Vertical Rendering Resolution (DPI)."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:732
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:770
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:732
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:770
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:2672 rc.cpp:3083 rc.cpp:2672 rc.cpp:3083
-msgid "Always visible:"
+#. i18n: file: plugins/latex/latexconfig.kcfg:19
+#. i18n: ectx: label, entry (LatexIncludeFile), group (Latex Plugin)
+#: rc.cpp:4379 rc.cpp:4379
+msgid "Latex Include File."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:739
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:817
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:871
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:791
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:870
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:739
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:817
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:871
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:791
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:870
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:2675 rc.cpp:2696 rc.cpp:2711 rc.cpp:3092 rc.cpp:3107 rc.cpp:2675
-#: rc.cpp:2696 rc.cpp:2711 rc.cpp:3092 rc.cpp:3107
-msgid "Contact to add:"
+#. i18n: file: plugins/latex/latexprefsbase.ui:21
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:4382 rc.cpp:4382
+msgid ""
+"The KopeteTeX plugin allows Kopete to render LaTeX formulas in the chat "
+"window. The sender must enclose the formula between two pairs of $ signs. "
+"ie: $$formula$$\n"
+"This plugin requires that the ImageMagick convert program be installed in "
+"order to work."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:771
-#. i18n: ectx: attribute (title), widget (QWidget, tabInvisible)
-#: rc.cpp:2684 rc.cpp:2684
-msgctxt "@title:tab"
-msgid "Invisible"
+#. i18n: file: plugins/latex/latexprefsbase.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:4386 rc.cpp:4386
+msgid "Options"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:810
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:836
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:810
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:836
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:2693 rc.cpp:3098 rc.cpp:2693 rc.cpp:3098
-msgid "Always invisible:"
+#. i18n: file: plugins/latex/latexprefsbase.ui:41
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:4389 rc.cpp:4389
+msgid "LaTeX include file:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:825
-#. i18n: ectx: attribute (title), widget (QWidget, tabIgnore)
-#: rc.cpp:2699 rc.cpp:2699
-msgctxt "@title:tab"
-msgid "Ignore"
+#. i18n: file: plugins/latex/latexprefsbase.ui:55
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:4392 rc.cpp:4392
+msgid "Rendering resolution (DPI):"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqeditaccountui.ui:864
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:2708 rc.cpp:2708
-msgid "Ignore:"
+#. i18n: file: plugins/latex/latexprefsbase.ui:65
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:4395 rc.cpp:4395
+msgid "x"
+msgstr "x"
+
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:4398 rc.cpp:4398
+msgid "Sentence Options"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:34
-#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
-#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:48
-#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:34
-#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
-#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:48
-#. i18n: ectx: property (text), widget (QRadioButton, icqRadioButton)
-#: rc.cpp:2714 rc.cpp:2891 rc.cpp:2714 rc.cpp:2891
-msgid "ICQ number:"
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:53
+#. i18n: ectx: property (text), widget (QCheckBox, DotEndSentence)
+#: rc.cpp:4401 rc.cpp:4401
+msgid "Add a dot at the end of each sent line"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:47
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:2717 rc.cpp:2717
-msgid "Alternatively, you can search the ICQ Whitepages :"
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:60
+#. i18n: ectx: property (text), widget (QCheckBox, CapitalizeBeginningSentence)
+#: rc.cpp:4404 rc.cpp:4404
+msgid "Start each sent line with a capital letter"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:84
-#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
-#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:28
-#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
-#. i18n: file: protocols/oscar/icq/ui/icqadd.ui:84
-#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
-#. i18n: file: protocols/oscar/aim/ui/aimaddcontactui.ui:28
-#. i18n: ectx: property (text), widget (QRadioButton, aimRadioButton)
-#: rc.cpp:2723 rc.cpp:2888 rc.cpp:2723 rc.cpp:2888
-msgid "AOL screen name:"
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:70
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:4407 rc.cpp:4407
+msgid "Replacements List"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqinterestinfowidget.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:2738 rc.cpp:2738
-msgid "Interests"
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:189
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:4419 rc.cpp:4419
+msgid "&Text:"
+msgstr "&Testun:"
+
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:202
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:4422 rc.cpp:4422
+msgid "Re&placement:"
+msgstr "Am&newidiad:"
+
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:220
+#. i18n: ectx: property (title), widget (QGroupBox, gb_options)
+#: rc.cpp:4425 rc.cpp:4425
+msgid "Replacement Options"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:35
-#. i18n: ectx: attribute (title), widget (QWidget, tabWhitepages)
-#: rc.cpp:2741 rc.cpp:2741
-msgid "ICQ Whitepages Search"
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:241
+#. i18n: ectx: property (text), widget (QCheckBox, AutoReplaceIncoming)
+#: rc.cpp:4428 rc.cpp:4428
+msgid "Auto replace on incoming messages"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:67
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:67
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:67
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:67
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#: rc.cpp:2750 rc.cpp:3681 rc.cpp:2750 rc.cpp:3681
-msgid "&Email:"
-msgstr "E&bost:"
+#. i18n: file: plugins/autoreplace/autoreplaceprefs.ui:248
+#. i18n: ectx: property (text), widget (QCheckBox, AutoReplaceOutgoing)
+#: rc.cpp:4431 rc.cpp:4431
+msgid "Auto replace on outgoing messages"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:93
-#. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:2756 rc.cpp:2756
-msgid "&Gender:"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, NowListeningPrefsUI)
+#: rc.cpp:4437 rc.cpp:4437
+msgid "Now Listening"
+msgstr "Rwan yn Gwrando ar"
+
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:25
+#. i18n: ectx: property (text), widget (QLabel, advertiseNewMediaToBuddiesLabel)
+#: rc.cpp:4440 rc.cpp:4440
+msgid "<b>Share Your Musical Taste</b>"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:119
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#: rc.cpp:2762 rc.cpp:2762
-msgid "Lan&guage:"
-msgstr "Iai&th:"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:57
+#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
+#: rc.cpp:4443 rc.cpp:4443
+msgid "Messa&ge"
+msgstr "Neg&es"
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:132
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#: rc.cpp:2765 rc.cpp:2765
-msgid "C&ountry:"
-msgstr "G&wlad:"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:77
+#. i18n: ectx: property (text), widget (QLabel, useThisMessageLabel)
+#: rc.cpp:4446 rc.cpp:4446
+msgid "Use this message when advertising:"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:145
-#. i18n: ectx: property (text), widget (QCheckBox, onlyOnline)
-#: rc.cpp:2768 rc.cpp:2768
-msgid "Only search for online contacts"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:85
+#. i18n: ectx: property (text), widget (QLabel, helperLabel)
+#: rc.cpp:4450 rc.cpp:4450
+#, no-c-format
+msgid ""
+"%track, %artist, %album, %player will be substituted if known.\n"
+"Expressions in brackets depend on a substitution being made."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:169
-#. i18n: ectx: attribute (title), widget (QWidget, tabUIN)
-#: rc.cpp:2771 rc.cpp:2771
-msgid "UIN Search"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:103
+#. i18n: ectx: property (text), widget (QLabel, m_headerLabel)
+#: rc.cpp:4454 rc.cpp:4454
+msgid "Start with:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:221
-#. i18n: ectx: property (whatsThis), widget (QTreeView, searchResults)
-#: rc.cpp:2777 rc.cpp:2777
-msgid ""
-"This is where the results from your search are displayed. If you double-"
-"click a result, the search window will close and pass the UIN of the contact "
-"you wish to add back to the Add Contact Wizard. You can only add one contact "
-"at a time."
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:116
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_Header)
+#: rc.cpp:4457 rc.cpp:4457
+msgid "Now Listening To: "
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:239
-#. i18n: ectx: property (whatsThis), widget (KPushButton, searchButton)
-#: rc.cpp:2780 rc.cpp:2780
-msgid "Search the ICQ Whitepages with your search criteria"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:123
+#. i18n: ectx: property (text), widget (QLabel, m_perTrackLabel)
+#: rc.cpp:4460 rc.cpp:4460
+msgid "For each track:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:252
-#. i18n: ectx: property (whatsThis), widget (KPushButton, clearButton)
-#: rc.cpp:2786 rc.cpp:2786
-msgid "Clears both search fields and results"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:136
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_PerTrack)
+#: rc.cpp:4464 rc.cpp:4464
+#, no-c-format
+msgid "%track (by %artist)(on %album)"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:265
-#. i18n: ectx: property (whatsThis), widget (KPushButton, stopButton)
-#: rc.cpp:2792 rc.cpp:2792
-msgid "Stops the search"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:143
+#. i18n: ectx: property (text), widget (QLabel, m_conjunctionLabel)
+#: rc.cpp:4467 rc.cpp:4467
+msgid "Conjunction (if >1 track):"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:268
-#. i18n: ectx: property (text), widget (KPushButton, stopButton)
-#: rc.cpp:2795 rc.cpp:2795
-msgid "Stop"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:156
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_Conjunction)
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:22
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:156
+#. i18n: ectx: property (text), widget (QLineEdit, kcfg_Conjunction)
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:22
+#: rc.cpp:4470 rc.cpp:4527 rc.cpp:4470 rc.cpp:4527
+msgid ", and "
+msgstr ", a "
+
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:192
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:4473 rc.cpp:4473
+msgid "A&dvertising Mode"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:281
-#. i18n: ectx: property (whatsThis), widget (KPushButton, userInfoButton)
-#: rc.cpp:2798 rc.cpp:2798
-msgid "Show information about the selected contact"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:206
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ExplicitAdvertising)
+#: rc.cpp:4476 rc.cpp:4476
+msgid ""
+"Explicit &via \"Tools->Send Media Info\",\n"
+"or by typing \"/media\" in the chat\n"
+"window edit area."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqsearchbase.ui:284
-#. i18n: ectx: property (text), widget (KPushButton, userInfoButton)
-#: rc.cpp:2801 rc.cpp:2801
-msgid "User Info"
-msgstr "Gwybodaeth am Ddefnyddwyr"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:213
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_ChatAdvertising)
+#: rc.cpp:4481 rc.cpp:4481
+msgid "&Show in chat window (automatic)"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:28
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:2804 rc.cpp:2804
-msgid "Icon:"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:221
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_StatusAdvertising)
+#: rc.cpp:4484 rc.cpp:4484
+msgid ""
+"Show &the music you are listening to \n"
+"in place of your status message."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:51
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:233
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:51
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:233
-#. i18n: ectx: property (text), widget (QLabel, textLabel11)
-#: rc.cpp:2807 rc.cpp:4866 rc.cpp:2807 rc.cpp:4866
-msgid "Description:"
-msgstr "Disgrifiad:"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:228
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_AppendStatusAdvertising)
+#: rc.cpp:4488 rc.cpp:4488
+msgid "Appe&nd to your status message"
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:64
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:159
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:124
-#. i18n: ectx: property (text), widget (QLabel, lblStatusMessage)
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:64
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:30
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:159
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:124
-#. i18n: ectx: property (text), widget (QLabel, lblStatusMessage)
-#: rc.cpp:2810 rc.cpp:5426 rc.cpp:5751 rc.cpp:6007 rc.cpp:2810 rc.cpp:5426
-#: rc.cpp:5751 rc.cpp:6007
-msgid "Message:"
-msgstr "Neges:"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:260
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:4491 rc.cpp:4491
+msgid "Media Pla&yer"
+msgstr "Chwar&aewr Cyfryngau"
 
-#. i18n: file: protocols/oscar/icq/ui/xtrazicqstatusui.ui:77
-#. i18n: ectx: property (text), widget (QCheckBox, checkAppend)
-#: rc.cpp:2813 rc.cpp:2813
-msgid "Append to menu"
+#. i18n: file: plugins/nowlistening/nowlisteningprefs.ui:280
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseSpecifiedMediaPlayer)
+#: rc.cpp:4494 rc.cpp:4494
+msgid "Use &specified media player"
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:47
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:47
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2816 rc.cpp:3771 rc.cpp:2816 rc.cpp:3771
-msgid "Company Location Information"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:11
+#. i18n: ectx: label, entry (Header), group (Now Listening Plugin)
+#: rc.cpp:4497 rc.cpp:4497
+msgid "Header of the message advertised."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:114
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:114
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:2822 rc.cpp:3783 rc.cpp:2822 rc.cpp:3783
-msgid "Address:"
-msgstr "Cyfeiriad:"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:16
+#. i18n: ectx: label, entry (PerTrack), group (Now Listening Plugin)
+#: rc.cpp:4500 rc.cpp:4500
+msgid "Core of the message advertised."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:114
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:71
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:114
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:71
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:2831 rc.cpp:3774 rc.cpp:2831 rc.cpp:3774
-msgid "Zip:"
-msgstr "Zip :"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:21
+#. i18n: ectx: label, entry (Conjunction), group (Now Listening Plugin)
+#: rc.cpp:4503 rc.cpp:4503
+msgid "Conjunction when multiple track are playing."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:170
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:190
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:170
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:190
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:2840 rc.cpp:3795 rc.cpp:2840 rc.cpp:3795
-msgid "Personal Work Information"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:26
+#. i18n: ectx: label, entry (ExplicitAdvertising), group (Now Listening Plugin)
+#: rc.cpp:4506 rc.cpp:4506
+msgid ""
+"Show explicitly the current music listened via a menu or /media command."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:228
-#. i18n: ectx: property (text), widget (QLabel, occupationLabel)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:628
-#. i18n: ectx: property (text), widget (QLabel, lblOccupation)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:228
-#. i18n: ectx: property (text), widget (QLabel, occupationLabel)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:628
-#. i18n: ectx: property (text), widget (QLabel, lblOccupation)
-#: rc.cpp:2849 rc.cpp:4468 rc.cpp:2849 rc.cpp:4468
-msgid "Occupation:"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:31
+#. i18n: ectx: label, entry (ChatAdvertising), group (Now Listening Plugin)
+#: rc.cpp:4509 rc.cpp:4509
+msgid "Show the current music listened in chat window."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:248
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:227
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: protocols/oscar/icq/ui/icqworkinfowidget.ui:248
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#. i18n: file: protocols/yahoo/ui/yahooworkinfowidget.ui:227
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#: rc.cpp:2852 rc.cpp:3798 rc.cpp:2852 rc.cpp:3798
-msgid "Phone:"
-msgstr "Ffôn:"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:36
+#. i18n: ectx: label, entry (StatusAdvertising), group (Now Listening Plugin)
+#: rc.cpp:4512 rc.cpp:4512
+msgid "Show the current music listened in place of your status message."
+msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqorgaffinfowidget.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:2858 rc.cpp:2858
-msgid "Organization Type"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:41
+#. i18n: ectx: label, entry (AppendStatusAdvertising), group (Now Listening Plugin)
+#: rc.cpp:4515 rc.cpp:4515
+msgid "Show the current music listened appended to your status message."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqorgaffinfowidget.ui:88
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2861 rc.cpp:2861
-msgid "Past Affiliation"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:46
+#. i18n: ectx: label, entry (UseSpecifiedMediaPlayer), group (Now Listening Plugin)
+#: rc.cpp:4518 rc.cpp:4518
+msgid "Use the specified media player."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:2864 rc.cpp:2864
-msgid "Email Addresses"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:51
+#. i18n: ectx: label, entry (SelectedMediaPlayer), group (Now Listening Plugin)
+#: rc.cpp:4521 rc.cpp:4521
+msgid "Selected Media Player for source of listening advertising."
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:112
-#. i18n: ectx: property (text), widget (QCheckBox, sendInfoCheck)
-#: rc.cpp:2879 rc.cpp:2879
-msgid "Send updates and ICQ promotional info to my primary email"
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:12
+#: rc.cpp:4523 rc.cpp:4523
+msgid "Now listening to: "
 msgstr ""
 
-#. i18n: file: protocols/oscar/icq/ui/icqotherinfowidget.ui:119
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:2882 rc.cpp:2882
-msgid "Non-published email will be used for password retrieval purposes."
+#. i18n: file: plugins/nowlistening/nowlisteningconfig.kcfg:17
+#: rc.cpp:4525 rc.cpp:4525
+msgid "%track( by %artist)( on %album)"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimjoinchatbase.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:2894 rc.cpp:2894
-msgid "Please enter the name of the chat room you wish to join."
-msgstr ""
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:4530 rc.cpp:4530
+msgid "Available Filters"
+msgstr "Hidlau ar Gael"
 
-#. i18n: file: protocols/oscar/aim/ui/aimjoinchatbase.ui:61
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:96
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:4542 rc.cpp:4542
+msgid "Criteria"
+msgstr "Meini prawf"
+
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:123
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2897 rc.cpp:2897
-msgid "Room &name:"
+#: rc.cpp:4545 rc.cpp:4545
+msgid "If the message contains:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimjoinchatbase.ui:71
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:2900 rc.cpp:2900
-msgid "E&xchange:"
-msgstr ""
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:150
+#. i18n: ectx: property (text), widget (QCheckBox, m_regexp)
+#: rc.cpp:4548 rc.cpp:4548
+msgid "Regular expression"
+msgstr "Mynegiad rheolaidd"
 
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:63
-#. i18n: ectx: property (text), widget (QLabel, lblScreenName)
-#: rc.cpp:2906 rc.cpp:2906
-msgid "Screen name:"
-msgstr "Enw sgrîn:"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:191
+#. i18n: ectx: property (text), widget (QCheckBox, m_case)
+#: rc.cpp:4554 rc.cpp:4554
+msgid "Case sensitive"
+msgstr "Llythrennau mawr/bach o bwys"
 
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:77
-#. i18n: ectx: property (text), widget (QLabel, lblWarnLevel)
-#: rc.cpp:2909 rc.cpp:2909
-msgid "Warning level:"
-msgstr "Lefel rybudd :"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:201
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:4557 rc.cpp:4557
+msgid "Action"
+msgstr "Gweithred"
 
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:91
-#. i18n: ectx: property (text), widget (QLabel, lblIdleTime)
-#: rc.cpp:2912 rc.cpp:2912
-msgid "Idle minutes:"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:245
+#. i18n: ectx: property (text), widget (QCheckBox, m_setImportance)
+#: rc.cpp:4560 rc.cpp:4560
+msgid "Set the message importance to:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:118
-#. i18n: ectx: property (text), widget (QLabel, lblOnlineSince)
-#: rc.cpp:2915 rc.cpp:2915
-msgid "Online since:"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:262
+#. i18n: ectx: property (text), item, widget (QComboBox, m_importance)
+#: rc.cpp:4563 rc.cpp:4563
+msgid "Low"
+msgstr "Isel"
+
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:267
+#. i18n: ectx: property (text), item, widget (QComboBox, m_importance)
+#: rc.cpp:4566 rc.cpp:4566
+msgid "Normal"
+msgstr "Arferol"
+
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:272
+#. i18n: ectx: property (text), item, widget (QComboBox, m_importance)
+#: rc.cpp:4569 rc.cpp:4569
+msgid "Highlight"
+msgstr "Amlygu"
+
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:315
+#. i18n: ectx: property (text), widget (QCheckBox, m_setBG)
+#: rc.cpp:4572 rc.cpp:4572
+msgid "Change the background color to:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:138
-#. i18n: ectx: property (text), widget (QLabel, lblAwayMessage)
-#: rc.cpp:2918 rc.cpp:2918
-msgid "Away message:"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:373
+#. i18n: ectx: property (text), widget (QCheckBox, m_setFG)
+#: rc.cpp:4575 rc.cpp:4575
+msgid "Change the foreground color to:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aiminfobase.ui:158
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:2921 rc.cpp:2921
-msgid "Profile:"
-msgstr "Proffiliau :"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:431
+#. i18n: ectx: property (text), widget (QCheckBox, m_raise)
+#: rc.cpp:4578 rc.cpp:4578
+msgid "Raise window"
+msgstr "Codi'r Ffenestr"
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, aimEditAccountUI)
-#: rc.cpp:2924 rc.cpp:2924
-msgid "Account Preferences - AIM"
+#. i18n: file: plugins/highlight/highlightprefsbase.ui:457
+#. i18n: ectx: property (text), widget (QPushButton, m_notifications)
+#: rc.cpp:4581 rc.cpp:4581
+msgid "Configure Notifications..."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:147
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:2936 rc.cpp:2936
-msgid ""
-"To connect to the AOL Instant Messaging network, you will need to use a "
-"screen name from AIM, AOL, or .Mac.<br><br>If you do not currently have an "
-"AIM screen name, please click the button to create one."
+#. i18n: file: plugins/pipes/pipesprefsbase.ui:38
+#. i18n: ectx: property (text), widget (KPushButton, addButton)
+#: rc.cpp:4584 rc.cpp:4584
+msgctxt "verb"
+msgid "&Add..."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:201
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:217
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:201
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:217
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtAccountId)
-#: rc.cpp:2942 rc.cpp:2951 rc.cpp:2942 rc.cpp:2951
-msgid "The screen name of your AIM account."
+#. i18n: file: plugins/pipes/pipesprefsbase.ui:45
+#. i18n: ectx: property (text), widget (KPushButton, removeButton)
+#: rc.cpp:4587 rc.cpp:4587
+msgctxt "verb"
+msgid "&Remove"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:204
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:220
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:204
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAccountId)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:220
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtAccountId)
-#: rc.cpp:2945 rc.cpp:2954 rc.cpp:2945 rc.cpp:2954
+#. i18n: file: plugins/alias/aliasdialogbase.ui:34
+#. i18n: ectx: property (whatsThis), widget (K3ListView, aliasList)
+#: rc.cpp:4590 rc.cpp:4590
 msgid ""
-"The screen name of your AIM account.  This should be in the form of an "
-"alphanumeric string (spaces allowed, not case sensitive)."
+"This is the list of custom aliases and the commands that you have already "
+"added"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:207
-#. i18n: ectx: property (text), widget (QLabel, lblAccountId)
-#: rc.cpp:2948 rc.cpp:2948
-msgid "AIM &screen name:"
+#. i18n: file: plugins/alias/aliasdialogbase.ui:50
+#. i18n: ectx: property (text), widget (K3ListView, aliasList)
+#: rc.cpp:4593 rc.cpp:4593
+msgid "Alias"
+msgstr "Ffugenw"
+
+#. i18n: file: plugins/alias/aliasdialogbase.ui:55
+#. i18n: ectx: property (text), widget (K3ListView, aliasList)
+#: rc.cpp:4596 rc.cpp:4596
+msgid "Command"
+msgstr "Gorchymyn"
+
+#. i18n: file: plugins/alias/aliasdialogbase.ui:60
+#. i18n: ectx: property (text), widget (K3ListView, aliasList)
+#. i18n: file: plugins/alias/aliasdialog.ui:123
+#. i18n: ectx: property (text), widget (K3ListView, protocolList)
+#. i18n: file: plugins/alias/aliasdialogbase.ui:60
+#. i18n: ectx: property (text), widget (K3ListView, aliasList)
+#. i18n: file: plugins/alias/aliasdialog.ui:123
+#. i18n: ectx: property (text), widget (K3ListView, protocolList)
+#: rc.cpp:4599 rc.cpp:4649 rc.cpp:4599 rc.cpp:4649
+msgid "Protocols"
+msgstr "Protocolau"
+
+#. i18n: file: plugins/alias/aliasdialogbase.ui:68
+#. i18n: ectx: property (text), widget (KPushButton, addButton)
+#: rc.cpp:4602 rc.cpp:4602
+msgid "&Add New Alias..."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:246
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:287
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:246
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:287
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:2963 rc.cpp:4593 rc.cpp:2963 rc.cpp:4593
-msgid "Accou&nt Preferences"
+#. i18n: file: plugins/alias/aliasdialogbase.ui:75
+#. i18n: ectx: property (text), widget (KPushButton, deleteButton)
+#: rc.cpp:4605 rc.cpp:4605
+msgid "&Delete Selected"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:334
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:353
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:334
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:353
-#. i18n: ectx: property (toolTip), widget (QLineEdit, edtServerAddress)
-#: rc.cpp:2972 rc.cpp:2981 rc.cpp:2972 rc.cpp:2981
-msgid "The IP address or hostmask of the AIM server you wish to connect to."
+#. i18n: file: plugins/alias/aliasdialogbase.ui:82
+#. i18n: ectx: property (text), widget (KPushButton, editButton)
+#: rc.cpp:4608 rc.cpp:4608
+msgid "Edit Alias..."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:337
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:356
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:337
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:356
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, edtServerAddress)
-#: rc.cpp:2975 rc.cpp:2984 rc.cpp:2975 rc.cpp:2984
+#. i18n: file: plugins/alias/aliasdialog.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, AliasDialog)
+#: rc.cpp:4611 rc.cpp:4611
+msgid "Add New Alias"
+msgstr ""
+
+#. i18n: file: plugins/alias/aliasdialog.ui:37
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:4614 rc.cpp:4614
+msgid "Command:"
+msgstr "Gorchymyn:"
+
+#. i18n: file: plugins/alias/aliasdialog.ui:47
+#. i18n: ectx: property (toolTip), widget (KLineEdit, command)
+#: rc.cpp:4617 rc.cpp:4617
 msgid ""
-"The IP address or hostmask of the AIM server you wish to connect to.  "
-"Normally you will want the default (login.oscar.aol.com)."
+"This is the command that you want to run when you execute this alias. "
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:359
-#. i18n: ectx: property (text), widget (QLineEdit, edtServerAddress)
-#: rc.cpp:2987 rc.cpp:2987
-msgid "login.oscar.aol.com"
+#. i18n: file: plugins/alias/aliasdialog.ui:54
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, command)
+#: rc.cpp:4621 rc.cpp:4621
+#, no-c-format
+msgid ""
+"<qt>This is the command that you want to run when you execute this alias.\n"
+"\n"
+"You can use the variables <b>%1, %2 ... %9</b> in your command, and they "
+"will be replaced with the arguments of the alias. The variable <b>%s</b> "
+"will be replaced with all arguments. <b>%n</b> expands to your nickname.\n"
+"\n"
+"Do not include the '/' in the command (if you do it will be stripped off "
+"anyway).</qt>"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:369
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:388
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxServerPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:369
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:388
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxServerPort)
-#: rc.cpp:2990 rc.cpp:2999 rc.cpp:2990 rc.cpp:2999
-msgid "The port on the AIM server that you would like to connect to."
+#. i18n: file: plugins/alias/aliasdialog.ui:71
+#. i18n: ectx: property (toolTip), widget (KLineEdit, alias)
+#: rc.cpp:4631 rc.cpp:4631
+msgid ""
+"This is the alias you are adding (what you will type after the command "
+"identifier, '/')."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:372
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:391
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:372
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:391
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
-#: rc.cpp:2993 rc.cpp:3002 rc.cpp:2993 rc.cpp:3002
+#. i18n: file: plugins/alias/aliasdialog.ui:74
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, alias)
+#: rc.cpp:4634 rc.cpp:4634
 msgid ""
-"The port on the AIM server that you would like to connect to.  Normally this "
-"is 5190."
+"This is the alias you are adding (what you will type after the command "
+"identifier, '/'). Do not include the '/' (it will be stripped off if you do "
+"anyway)."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:412
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:3005 rc.cpp:3005
-msgid "Direct Connect Options"
+#. i18n: file: plugins/alias/aliasdialog.ui:101
+#. i18n: ectx: property (toolTip), widget (K3ListView, protocolList)
+#. i18n: file: plugins/alias/aliasdialog.ui:104
+#. i18n: ectx: property (whatsThis), widget (K3ListView, protocolList)
+#. i18n: file: plugins/alias/aliasdialog.ui:101
+#. i18n: ectx: property (toolTip), widget (K3ListView, protocolList)
+#. i18n: file: plugins/alias/aliasdialog.ui:104
+#. i18n: ectx: property (whatsThis), widget (K3ListView, protocolList)
+#: rc.cpp:4643 rc.cpp:4646 rc.cpp:4643 rc.cpp:4646
+msgid ""
+"If you want this alias to only be active for certain protocols, select those "
+"protocols here."
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:663
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:3059 rc.cpp:3059
-msgid "Visibility Settings"
+#. i18n: file: plugins/alias/aliasdialog.ui:134
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:4652 rc.cpp:4652
+msgid "For protocols:"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:687
-#. i18n: ectx: property (text), widget (QRadioButton, rbAllowPerimtList)
-#: rc.cpp:3062 rc.cpp:3062
-msgid "Allow only from visible list"
-msgstr ""
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:39
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:4655 rc.cpp:4655
+msgid "&Colors"
+msgstr "&Lliwiau"
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:694
-#. i18n: ectx: property (text), widget (QRadioButton, rbAllowMyContacts)
-#: rc.cpp:3065 rc.cpp:3065
-msgid "Allow only contact list's users"
-msgstr ""
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:89
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:78
+#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:89
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:78
+#. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup)
+#: rc.cpp:4658 rc.cpp:5668 rc.cpp:5841 rc.cpp:4658 rc.cpp:5668 rc.cpp:5841
+msgid "Colors"
+msgstr "Lliwiau"
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:701
-#. i18n: ectx: property (text), widget (QRadioButton, rbAllowAll)
-#: rc.cpp:3068 rc.cpp:3068
-msgid "Allow all users"
-msgstr ""
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:90
+#. i18n: ectx: property (text), widget (QPushButton, mColorsAdd)
+#: rc.cpp:4661 rc.cpp:4661
+msgid "&Add..."
+msgstr "Ychw&anegu..."
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:708
-#. i18n: ectx: property (text), widget (QRadioButton, rbBlockAll)
-#: rc.cpp:3071 rc.cpp:3071
-msgid "Block all users"
-msgstr ""
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:104
+#. i18n: ectx: property (text), widget (QPushButton, mColorsUp)
+#: rc.cpp:4667 rc.cpp:4667
+msgid "Move &Up"
+msgstr "Symud i &Fyny"
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:715
-#. i18n: ectx: property (text), widget (QRadioButton, rbBlockAIM)
-#: rc.cpp:3074 rc.cpp:3074
-msgid "Block AIM users"
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:111
+#. i18n: ectx: property (text), widget (QPushButton, mColorsDown)
+#: rc.cpp:4670 rc.cpp:4670
+msgid "Move &Down"
+msgstr "Symud i &Lawr"
+
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, m_colorRandom)
+#: rc.cpp:4673 rc.cpp:4673
+msgid "Random order"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:722
-#. i18n: ectx: property (text), widget (QRadioButton, rbBlockDenyList)
-#: rc.cpp:3077 rc.cpp:3077
-msgid "Block only from invisible list"
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:154
+#. i18n: ectx: property (text), widget (QCheckBox, m_fg)
+#: rc.cpp:4676 rc.cpp:4676
+msgid "Change global text foreground color"
 msgstr ""
 
-#. i18n: file: protocols/oscar/aim/ui/aimeditaccountui.ui:746
-#. i18n: ectx: attribute (title), widget (QWidget, tabVisible)
-#: rc.cpp:3080 rc.cpp:3080
-msgid "Visible"
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:161
+#. i18n: ectx: property (text), widget (QCheckBox, m_char)
+#: rc.cpp:4679 rc.cpp:4679
+msgid "Change color every letter"
 msgstr ""
 
-#. i18n: file: protocols/oscar/oscarencodingselectionbase.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:3110 rc.cpp:3110
-msgid "Use this &encoding when chatting with this contact:"
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:168
+#. i18n: ectx: property (text), widget (QCheckBox, m_words)
+#: rc.cpp:4682 rc.cpp:4682
+msgid "Change color every word"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:52
-#. i18n: ectx: property (text), widget (QRadioButton, radioByData)
-#: rc.cpp:3113 rc.cpp:3113
-msgid "Search by specified data:"
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:176
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:4685 rc.cpp:4685
+msgid "Effects"
+msgstr "Effeithiau"
+
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:203
+#. i18n: ectx: property (text), widget (QCheckBox, m_lamer)
+#: rc.cpp:4688 rc.cpp:4688
+msgid "L4m3r t4lk"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:126
-#. i18n: ectx: property (text), widget (QLabel, textLabel1a)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:563
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:126
-#. i18n: ectx: property (text), widget (QLabel, textLabel1a)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:563
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
-#: rc.cpp:3116 rc.cpp:3339 rc.cpp:3116 rc.cpp:3339
-msgid "Forename:"
+#. i18n: file: plugins/texteffect/texteffectprefs.ui:216
+#. i18n: ectx: property (text), widget (QCheckBox, m_casewaves)
+#: rc.cpp:4691 rc.cpp:4691
+msgid "CasE wAVes"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:133
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:570
-#. i18n: ectx: property (text), widget (QLabel, uiSurnamea)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:133
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:570
-#. i18n: ectx: property (text), widget (QLabel, uiSurnamea)
-#: rc.cpp:3119 rc.cpp:3342 rc.cpp:3119 rc.cpp:3342
-msgid "Surname:"
-msgstr "Cyfenw :"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:25
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:4694 rc.cpp:4694
+msgid "Uploading"
+msgstr "Llwytho"
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:164
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_2a)
-#: rc.cpp:3128 rc.cpp:3128
-msgid "Age from:"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:43
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:4697 rc.cpp:4697
+msgid "Uplo&ad to:"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:190
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2_4)
-#: rc.cpp:3131 rc.cpp:3131
-msgid "to:"
-msgstr "i:"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:59
+#. i18n: ectx: property (title), widget (QGroupBox, formatHTML)
+#: rc.cpp:4700 rc.cpp:4700
+msgid "Formatting"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:242
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4a)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:584
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:210
-#. i18n: ectx: property (text), widget (QLabel, lblGender)
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:242
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4a)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:584
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2)
-#. i18n: file: protocols/qq/ui/qqvcard.ui:210
-#. i18n: ectx: property (text), widget (QLabel, lblGender)
-#: rc.cpp:3134 rc.cpp:3348 rc.cpp:4378 rc.cpp:3134 rc.cpp:3348 rc.cpp:4378
-msgid "Gender:"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:71
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_formatHTML)
+#: rc.cpp:4703 rc.cpp:4703
+msgid ""
+"HTML 4.01 Transitional using the ISO-8859-1 (aka. Latin 1) character set "
+"encoding."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:282
-#. i18n: ectx: property (text), widget (QRadioButton, radioByUin)
-#: rc.cpp:3143 rc.cpp:3143
-msgid "Request information about user:"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:76
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_formatHTML)
+#: rc.cpp:4706 rc.cpp:4706
+msgid ""
+"HTML 4.01 Transitional formatting using ISO-8859-1 (aka. Latin 1) character "
+"set encoding.\n"
+"\n"
+"This version should be easily opened by most web browsers."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:319
-#. i18n: ectx: property (text), widget (QLabel, uin_static)
-#: rc.cpp:3146 rc.cpp:3146
-msgid "User number:"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:79
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatHTML)
+#: rc.cpp:4711 rc.cpp:4711
+msgid "HTML (simple loo&k)"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadusearch.ui:343
-#. i18n: ectx: property (text), widget (QCheckBox, onlyOnline)
-#: rc.cpp:3149 rc.cpp:3149
-msgid "Lookup only those that are currently online"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:89
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_formatXHTML)
+#: rc.cpp:4714 rc.cpp:4714
+msgid "XHTML 1.0 Strict"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:39
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, statusGroup_)
-#: rc.cpp:3155 rc.cpp:3155
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:94
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_formatXHTML)
+#: rc.cpp:4717 rc.cpp:4717
 msgid ""
-"Choose a status; by default Online status is selected. \n"
-"So all you need to do is just to type in your description. \n"
-"Choosing Offline status will disconnect you, with given description."
+"The resulting page will be formatted using the XHTML 1.0 Strict W3C "
+"Recommendation. The character set encoding is UTF-8.\n"
+"\n"
+"Note that some web browsers do not support XHTML. You should also make sure "
+"your web server serves it out with the correct mime type, such as "
+"application/xhtml+xml."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:62
-#. i18n: ectx: property (toolTip), widget (QRadioButton, onlineButton_)
-#: rc.cpp:3163 rc.cpp:3163
-msgid "Set your status to Online."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:97
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatXHTML)
+#: rc.cpp:4722 rc.cpp:4722
+msgid "XHTML (simple look)"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:65
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, onlineButton_)
-#: rc.cpp:3166 rc.cpp:3166
-msgid ""
-"Set your status to Online, indicating that you are available to chat with "
-"anyone who wishes."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:104
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_formatXML)
+#: rc.cpp:4725 rc.cpp:4725
+msgid "Save the output in XML format using UTF-8 character set."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:78
-#. i18n: ectx: property (toolTip), widget (QRadioButton, awayButton_)
-#: rc.cpp:3173 rc.cpp:3173
-msgid "Set your status to busy."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:107
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_formatXML)
+#: rc.cpp:4728 rc.cpp:4728
+msgid "Save the output in XML format using the UTF-8 encoding."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:81
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, awayButton_)
-#: rc.cpp:3176 rc.cpp:3176
-msgid ""
-"Set your status to busy, indicating that you should not be bothered with "
-"trivial chat, and may not be able to reply immediately."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:110
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatXML)
+#: rc.cpp:4731 rc.cpp:4731
+msgid "&XML"
+msgstr "&XML"
+
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:117
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_formatStylesheet)
+#: rc.cpp:4734 rc.cpp:4734
+msgid "XML transformation &using this XSLT sheet:"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:94
-#. i18n: ectx: property (toolTip), widget (QRadioButton, invisibleButton_)
-#: rc.cpp:3183 rc.cpp:3183
-msgid ""
-"Set status to invisible, which will hide your presence from other users."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:157
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useImagesHTML)
+#: rc.cpp:4737 rc.cpp:4737
+msgid "Replaces the protocol names, such as MSN and IRC, with images."
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:97
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, invisibleButton_)
-#: rc.cpp:3186 rc.cpp:3186
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:174
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_useImagesHTML)
+#: rc.cpp:4740 rc.cpp:4740
 msgid ""
-"Set status to invisible, which will hide your presence from other users (who "
-"will see you as offline).  However you may still chat, and see the online "
-"presence of others."
+"Replaces the protocol names, such as MSN and IRC, with images.\n"
+"\n"
+"Note that you have to manually copy the PNG files into place.\n"
+"\n"
+"The following files are used by default:\n"
+"\n"
+"images/msn_protocol.png\n"
+"images/icq_protocol.png\n"
+"images/jabber_protocol.png\n"
+"images/yahoo_protocol.png\n"
+"images/aim_protocol.png\n"
+"images/irc_protocol.png\n"
+"images/sms_protocol.png\n"
+"images/gadu_protocol.png\n"
+"images/winpopup_protocol.png"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:110
-#. i18n: ectx: property (toolTip), widget (QRadioButton, offlineButton_)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:113
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, offlineButton_)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:110
-#. i18n: ectx: property (toolTip), widget (QRadioButton, offlineButton_)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:113
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, offlineButton_)
-#: rc.cpp:3193 rc.cpp:3196 rc.cpp:3193 rc.cpp:3196
-msgid "Choose this status to disconnect with the description entered below."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:177
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useImagesHTML)
+#: rc.cpp:4757 rc.cpp:4757
+msgid "Repla&ce protocol text with images in (X)HTML"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:139
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:158
-#. i18n: ectx: property (toolTip), widget (QLineEdit, textEdit_)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:139
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:158
-#. i18n: ectx: property (toolTip), widget (QLineEdit, textEdit_)
-#: rc.cpp:3203 rc.cpp:3212 rc.cpp:3203 rc.cpp:3212
-msgid "Description of your status."
-msgstr ""
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:187
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:4760 kopete/contactlist/contactlistlayoutmanager.cpp:59 rc.cpp:4760
+msgid "Display Name"
+msgstr "Enw Dangos"
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:142
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:161
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, textEdit_)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:142
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:161
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, textEdit_)
-#: rc.cpp:3206 rc.cpp:3215 rc.cpp:3206 rc.cpp:3215
-msgid "Description of your status (up to 70 characters)."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:199
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_showName)
+#: rc.cpp:4763 rc.cpp:4763
+msgid "Use one of &your IM names"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduawayui.ui:145
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:3209 rc.cpp:3209
-msgid "&Message:"
-msgstr "&Neges:"
-
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, GaduAccountEditUI)
-#: rc.cpp:3218 rc.cpp:3218
-msgid "Account Preferences - Gadu-Gadu"
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:209
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_includeIMAddress)
+#: rc.cpp:4766 rc.cpp:4766
+msgid "Include &IM addresses"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:81
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:100
-#. i18n: ectx: property (toolTip), widget (KLineEdit, loginEdit_)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:81
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:100
-#. i18n: ectx: property (toolTip), widget (KLineEdit, loginEdit_)
-#: rc.cpp:3227 rc.cpp:3236 rc.cpp:3227 rc.cpp:3236
-msgid "The user ID of your Gadu-Gadu account."
+#. i18n: file: plugins/webpresence/webpresenceprefs.ui:216
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_showAnotherName)
+#: rc.cpp:4769 rc.cpp:4769
+msgid "Use another &name:"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:84
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:103
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, loginEdit_)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:84
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:103
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, loginEdit_)
-#: rc.cpp:3230 rc.cpp:3239 rc.cpp:3230 rc.cpp:3239
-msgid ""
-"The user ID of your Gadu-Gadu account.  This should be in the form of a "
-"number (no decimals, no spaces)."
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:10
+#. i18n: ectx: label, entry (UploadFrequency), group (Web Presence Plugin)
+#: rc.cpp:4772 rc.cpp:4772
+msgid "Delay in seconds before updating the file"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:87
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:44
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:87
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:44
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:3233 rc.cpp:3462 rc.cpp:3233 rc.cpp:3462
-msgid "Gadu-Gadu &UIN:"
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:15
+#. i18n: ectx: label, entry (uploadURL), group (Web Presence Plugin)
+#: rc.cpp:4775 rc.cpp:4775
+msgid "The URL where the file should be uploaded to"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:134
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoLoginCheck_)
-#: rc.cpp:3242 rc.cpp:3242
-msgid ""
-"Check to disable automatic connection. When checked, you may connect to this "
-"account manually via the icon in the bottom of the main Kopete window."
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:19
+#. i18n: ectx: label, entry (formatHTML), group (Web Presence Plugin)
+#: rc.cpp:4778 rc.cpp:4778
+msgid "HTML formatting"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:172
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:3251 rc.cpp:3251
-msgid ""
-"To connect to the Gadu-Gadu network, you will need a Gadu-Gadu "
-"account.<br><br>\n"
-"If you do not currently have an account, please click the button to create "
-"one."
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:24
+#. i18n: ectx: label, entry (formatXHTML), group (Web Presence Plugin)
+#: rc.cpp:4781 rc.cpp:4781
+msgid "XHTML formatting"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:271
-#. i18n: ectx: property (toolTip), widget (QCheckBox, cacheServersCheck__)
-#: rc.cpp:3270 rc.cpp:3270
-msgid ""
-"Cache connection information for each server connected to in case the main "
-"load-balancing server fails."
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:29
+#. i18n: ectx: label, entry (formatXML), group (Web Presence Plugin)
+#: rc.cpp:4784 rc.cpp:4784
+msgid "XML formatting"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:274
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, cacheServersCheck__)
-#: rc.cpp:3273 rc.cpp:3273
-msgid ""
-"This option is used whenever the primary Gadu-Gadu load-balancing server "
-"fails.  If this is checked, Kopete will try to connect to the actual servers "
-"directly using cached information about them.  This prevents connection "
-"errors when the main load-balancing server does not answer. In practice it "
-"only helps very rarely."
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:34
+#. i18n: ectx: label, entry (formatStylesheet), group (Web Presence Plugin)
+#: rc.cpp:4787 rc.cpp:4787
+msgid "XML transformation with a XSLT sheet"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:277
-#. i18n: ectx: property (text), widget (QCheckBox, cacheServersCheck__)
-#: rc.cpp:3276 rc.cpp:3276
-msgid "C&ache server information"
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:39
+#. i18n: ectx: label, entry (formatStylesheetURL), group (Web Presence Plugin)
+#: rc.cpp:4790 rc.cpp:4790
+msgid "XSLT sheet"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:290
-#. i18n: ectx: property (text), widget (QCheckBox, dccCheck_)
-#: rc.cpp:3279 rc.cpp:3279
-msgid "&Use direct connections (DCC)"
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:43
+#. i18n: ectx: label, entry (useImagesHTML), group (Web Presence Plugin)
+#: rc.cpp:4793 rc.cpp:4793
+msgid "Replace protocol text with images in (X)HTML"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:300
-#. i18n: ectx: property (toolTip), widget (QCheckBox, exportCheck_)
-#: rc.cpp:3282 rc.cpp:3282
-msgid ""
-"Keep your local and server side contact list in sync. Any change in local "
-"list will result in exporting your list to server."
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:48
+#. i18n: ectx: label, entry (showName), group (Web Presence Plugin)
+#: rc.cpp:4796 rc.cpp:4796
+msgid "Use one of your IM names as display name"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:303
-#. i18n: ectx: property (text), widget (QCheckBox, exportCheck_)
-#: rc.cpp:3285 rc.cpp:3285
-msgid "&Export contact list on change"
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:53
+#. i18n: ectx: label, entry (showAnotherName), group (Web Presence Plugin)
+#: rc.cpp:4799 rc.cpp:4799
+msgid "Use another name as display name"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:313
-#. i18n: ectx: property (toolTip), widget (QCheckBox, importCheck_)
-#: rc.cpp:3288 rc.cpp:3288
-msgid "On each connection Kopete will import your list "
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:58
+#. i18n: ectx: label, entry (showThisName), group (Web Presence Plugin)
+#: rc.cpp:4802 rc.cpp:4802
+msgid "Desired display name"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:316
-#. i18n: ectx: property (text), widget (QCheckBox, importCheck_)
-#: rc.cpp:3291 rc.cpp:3291
-msgid "I&mport contact list on startup"
+#. i18n: file: plugins/webpresence/webpresenceconfig.kcfg:62
+#. i18n: ectx: label, entry (includeIMAddress), group (Web Presence Plugin)
+#: rc.cpp:4805 rc.cpp:4805
+msgid "Include IM addresses"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:329
-#. i18n: ectx: property (text), widget (QCheckBox, ignoreCheck_)
-#: rc.cpp:3294 rc.cpp:3294
-msgid "&Ignore people not on your contact list"
+#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup1)
+#: rc.cpp:4808 rc.cpp:4808
+msgid "Use Subfolder for Each Contact"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:350
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:366
-#. i18n: ectx: property (toolTip), widget (QComboBox, useTls_)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:350
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:366
-#. i18n: ectx: property (toolTip), widget (QComboBox, useTls_)
-#: rc.cpp:3297 rc.cpp:3306 rc.cpp:3297 rc.cpp:3306
-msgid ""
-"Whether or not you want to enable SSL encrypted communication with the "
-"server."
+#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:55
+#. i18n: ectx: property (text), widget (QRadioButton, yesButton)
+#: rc.cpp:4811 rc.cpp:4811
+msgid "Always"
+msgstr "Bob tro"
+
+#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:68
+#. i18n: ectx: property (text), widget (QRadioButton, noButton)
+#: rc.cpp:4814 rc.cpp:4814
+msgid "Never"
+msgstr "Byth"
+
+#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:78
+#. i18n: ectx: property (text), widget (QRadioButton, onlySelectedButton)
+#: rc.cpp:4817 rc.cpp:4817
+msgid "Only the selected contacts"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:353
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:369
-#. i18n: ectx: property (whatsThis), widget (QComboBox, useTls_)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:353
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:369
-#. i18n: ectx: property (whatsThis), widget (QComboBox, useTls_)
-#: rc.cpp:3300 rc.cpp:3309 rc.cpp:3300 rc.cpp:3309
-msgid ""
-"Whether or not you want to enable SSL encrypted communication with the "
-"server.  Note that this is not end-to-end encryption, but rather encrypted "
-"communication with the server."
+#. i18n: file: plugins/addbookmarks/addbookmarksprefsui.ui:91
+#. i18n: ectx: property (text), widget (QRadioButton, onlyNotSelectedButton)
+#: rc.cpp:4820 rc.cpp:4820
+msgid "Not the selected contacts"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:356
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:3303 rc.cpp:3303
-msgid "Use protocol encr&yption (SSL):"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:10
+#. i18n: ectx: label, entry (DefaultLanguage), group (Translator plugin)
+#: rc.cpp:4823 rc.cpp:4823
+msgid "Default native language"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:379
-#. i18n: ectx: property (text), item, widget (QComboBox, useTls_)
-#: rc.cpp:3312 rc.cpp:3312
-msgid "If Available"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:15
+#. i18n: ectx: label, entry (Service), group (Translator plugin)
+#: rc.cpp:4826 rc.cpp:4826
+msgid "Translation service"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:384
-#. i18n: ectx: property (text), item, widget (QComboBox, useTls_)
-#: rc.cpp:3315 rc.cpp:3315
-msgid "Required"
-msgstr "Angenrheidiol"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:20
+#. i18n: ectx: label, entry (IncomingDontTranslate), group (Translator plugin)
+#: rc.cpp:4829 rc.cpp:4829
+msgid "Do not translate incoming messages"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:432
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:3321 rc.cpp:3321
-msgid "U&ser Information"
-msgstr "G&wybodaeth Defnyddiwr"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:25
+#. i18n: ectx: label, entry (IncomingShowOriginal), group (Translator plugin)
+#: rc.cpp:4832 rc.cpp:4832
+msgid "Show the original incoming message"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:444
-#. i18n: ectx: property (title), widget (QGroupBox, userInformation)
-#: rc.cpp:3324 rc.cpp:3324
-msgid "User Information"
-msgstr "Gwybodaeth Defnyddiwr"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:30
+#. i18n: ectx: label, entry (IncomingTranslate), group (Translator plugin)
+#: rc.cpp:4835 rc.cpp:4835
+msgid "Translate incoming message directly"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:459
-#. i18n: ectx: property (text), widget (QLabel, connectLabel)
-#: rc.cpp:3327 rc.cpp:3327
-msgid ""
-"<p align=\"center\">You must be connected to change your Personal "
-"Information.</p>"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:35
+#. i18n: ectx: label, entry (OutgoingDontTranslate), group (Translator plugin)
+#: rc.cpp:4838 rc.cpp:4838
+msgid "Do not translate outgoing messages"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:482
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_4)
-#: rc.cpp:3330 rc.cpp:3330
-msgid "Maiden name:"
-msgstr "Enw Morwynol:"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:40
+#. i18n: ectx: label, entry (OutgoingShowOriginal), group (Translator plugin)
+#: rc.cpp:4841 rc.cpp:4841
+msgid "Show the original outgoing message"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:489
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_4_3)
-#: rc.cpp:3333 rc.cpp:3333
-msgid "City of origin:"
+#. i18n: file: plugins/translator/translatorconfig.kcfg:45
+#. i18n: ectx: label, entry (OutgoingTranslate), group (Translator plugin)
+#: rc.cpp:4844 rc.cpp:4844
+msgid "Translate outgoing message directly"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:524
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_4_2)
-#: rc.cpp:3336 rc.cpp:3336
-msgid ""
-"The values below will be used in the search, but will not appear in the "
-"results."
+#. i18n: file: plugins/translator/translatorconfig.kcfg:50
+#. i18n: ectx: label, entry (OutgoingAsk), group (Translator plugin)
+#: rc.cpp:4847 rc.cpp:4847
+msgid "Show dialog before sending message"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:577
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3)
-#: rc.cpp:3345 rc.cpp:3345
-msgid "Your nickname:"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:71
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
+#: rc.cpp:4853 rc.cpp:4853
+msgid "Translation service:"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:591
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5_3_2_2)
-#: rc.cpp:3351 rc.cpp:3351
-msgid "Year of birth:"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:78
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:4856 rc.cpp:4856
+msgid "Default native language:"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:680
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:3363 rc.cpp:3363
-msgid "&File Transfer"
-msgstr "Trosglwyddo &ffeiliau"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:100
+#. i18n: ectx: property (title), widget (QGroupBox, IncomingMessages)
+#: rc.cpp:4859 rc.cpp:4859
+msgid "Incoming Messages"
+msgstr "Negeseuon newydd Gyraedd"
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:692
-#. i18n: ectx: property (title), widget (QGroupBox, dcc)
-#: rc.cpp:3366 rc.cpp:3366
-msgid "Global DCC Options"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:121
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingDontTranslate)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:172
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingDontTranslate)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:121
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingDontTranslate)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:172
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingDontTranslate)
+#: rc.cpp:4862 rc.cpp:4874 rc.cpp:4862 rc.cpp:4874
+msgid "Do not translate"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:704
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:3369 rc.cpp:3369
-msgid ""
-"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect "
-"<b>all</b> Gadu-Gadu accounts.</font></p></qt>"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:131
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingShowOriginal)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:182
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingShowOriginal)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:131
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingShowOriginal)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:182
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingShowOriginal)
+#: rc.cpp:4865 rc.cpp:4877 rc.cpp:4865 rc.cpp:4877
+msgid "Show the original message"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:711
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideDCC)
-#: rc.cpp:3372 rc.cpp:3372
-msgid "&Override default configuration"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:141
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingTranslate)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:192
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingTranslate)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:141
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_IncomingTranslate)
+#. i18n: file: plugins/translator/translatorprefsbase.ui:192
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingTranslate)
+#: rc.cpp:4868 rc.cpp:4880 rc.cpp:4868 rc.cpp:4880
+msgid "Translate directly"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:753
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:3375 rc.cpp:3375
-msgid "Local &IP address /"
-msgstr "Cyfeiriadau Lleol /"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:151
+#. i18n: ectx: property (title), widget (QGroupBox, OutgoingTranslate)
+#: rc.cpp:4871 rc.cpp:4871
+msgid "Outgoing Messages"
+msgstr "Negeseuon i fynd"
 
-#. i18n: file: protocols/gadu/ui/gadueditaccountui.ui:787
-#. i18n: ectx: property (text), widget (KRestrictedLine, ipAddress)
-#: rc.cpp:3381 rc.cpp:3381
-msgid "0.0.0.0"
+#. i18n: file: plugins/translator/translatorprefsbase.ui:199
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_OutgoingAsk)
+#: rc.cpp:4883 rc.cpp:4883
+msgid "Show dialog before sending"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, GaduRegisterAccountUI)
-#: rc.cpp:3384 rc.cpp:3384
-msgid "Register Account - Gadu-Gadu"
+#. i18n: file: plugins/otr/privkeypopup.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, PrivKeyPopup)
+#: rc.cpp:4892 rc.cpp:4892
+msgid "Please Wait"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:63
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPasswordVerify)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:244
-#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePasswordVerify)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:63
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPasswordVerify)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:244
-#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePasswordVerify)
-#: rc.cpp:3387 rc.cpp:3441 rc.cpp:3387 rc.cpp:3441
-msgid "A confirmation of the password you would like to use."
+#. i18n: file: plugins/otr/privkeypopup.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:4895 rc.cpp:4895
+msgid "Please wait while generating the private key"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:66
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPasswordVerify)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:247
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePasswordVerify)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:66
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPasswordVerify)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:247
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePasswordVerify)
-#: rc.cpp:3390 rc.cpp:3444 rc.cpp:3390 rc.cpp:3444
-msgid ""
-"A confirmation of the password you would like to use for this account."
+#. i18n: file: plugins/otr/otrchatui.rc:5
+#. i18n: ectx: Menu (otr_menu)
+#: rc.cpp:4901 rc.cpp:4901
+msgid "OTR Settings"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:69
-#. i18n: ectx: property (text), widget (QLabel, labelPasswordVerify)
-#: rc.cpp:3393 rc.cpp:3393
-msgid "Repeat pass&word:"
-msgstr "Ailadrodd c&yfrinair:"
+#. i18n: file: plugins/otr/kopete_otr.kcfg:7
+#. i18n: ectx: label, entry (rbAlways), group (Policy)
+#: rc.cpp:4904 rc.cpp:4904
+msgid "Always encrypt outgoing messages"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:79
-#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePassword)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:228
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPassword)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:79
-#. i18n: ectx: property (toolTip), widget (KLineEdit, valuePassword)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:228
-#. i18n: ectx: property (toolTip), widget (QLabel, labelPassword)
-#: rc.cpp:3396 rc.cpp:3432 rc.cpp:3396 rc.cpp:3432
-msgid "The password you would like to use."
+#. i18n: file: plugins/otr/kopete_otr.kcfg:11
+#. i18n: ectx: label, entry (rbOpportunistic), group (Policy)
+#: rc.cpp:4907 rc.cpp:4907
+msgid "Automatically encrypt messages if the other side supports OTR"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:82
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePassword)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:231
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPassword)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:82
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, valuePassword)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:231
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelPassword)
-#: rc.cpp:3399 rc.cpp:3435 rc.cpp:3399 rc.cpp:3435
-msgid "The password you would like to use for this account."
+#. i18n: file: plugins/otr/kopete_otr.kcfg:15
+#. i18n: ectx: label, entry (rbManual), group (Policy)
+#. i18n: file: plugins/otr/otrprefs.ui:129
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbManual)
+#. i18n: file: plugins/otr/kopete_otr.kcfg:15
+#. i18n: ectx: label, entry (rbManual), group (Policy)
+#. i18n: file: plugins/otr/otrprefs.ui:129
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbManual)
+#: rc.cpp:4910 rc.cpp:4946 rc.cpp:4910 rc.cpp:4946
+msgid "Encrypt messages if the other side requests an OTR connection"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:92
-#. i18n: ectx: property (toolTip), widget (KLineEdit, valueEmailAddress)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:129
-#. i18n: ectx: property (toolTip), widget (QLabel, labelEmailAddress)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:92
-#. i18n: ectx: property (toolTip), widget (KLineEdit, valueEmailAddress)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:129
-#. i18n: ectx: property (toolTip), widget (QLabel, labelEmailAddress)
-#: rc.cpp:3402 rc.cpp:3408 rc.cpp:3402 rc.cpp:3408
-msgid "Your E-mail address."
+#. i18n: file: plugins/otr/kopete_otr.kcfg:19
+#. i18n: ectx: label, entry (rbNever), group (Policy)
+#: rc.cpp:4913 rc.cpp:4913
+msgid "Never encrypt outgoing messages"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:95
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, valueEmailAddress)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:132
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelEmailAddress)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:95
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, valueEmailAddress)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:132
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelEmailAddress)
-#: rc.cpp:3405 rc.cpp:3411 rc.cpp:3405 rc.cpp:3411
-msgid "The E-mail address you would like to use to register this account."
+#. i18n: file: plugins/otr/otrprefs.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, OTRPrefsUI)
+#: rc.cpp:4916 rc.cpp:4916
+msgid "OTR Plugin Preferences"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:135
-#. i18n: ectx: property (text), widget (QLabel, labelEmailAddress)
-#: rc.cpp:3414 rc.cpp:3414
-msgid "&E-Mail address:"
+#. i18n: file: plugins/otr/otrprefs.ui:23
+#. i18n: ectx: attribute (title), widget (QWidget, settings)
+#. i18n: file: kopete/kopeteui.rc:32
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:35
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:22
+#. i18n: ectx: Menu (settings)
+#. i18n: file: plugins/otr/otrprefs.ui:23
+#. i18n: ectx: attribute (title), widget (QWidget, settings)
+#. i18n: file: kopete/kopeteui.rc:32
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:35
+#. i18n: ectx: Menu (settings)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:22
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:4919 rc.cpp:5460 rc.cpp:5484 rc.cpp:5517 rc.cpp:4919 rc.cpp:5460
+#: rc.cpp:5484 rc.cpp:5517
+msgid "&Settings"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:175
-#. i18n: ectx: property (toolTip), widget (QLabel, labelVerificationSequence)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:191
-#. i18n: ectx: property (toolTip), widget (QLineEdit, valueVerificationSequence)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:175
-#. i18n: ectx: property (toolTip), widget (QLabel, labelVerificationSequence)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:191
-#. i18n: ectx: property (toolTip), widget (QLineEdit, valueVerificationSequence)
-#: rc.cpp:3417 rc.cpp:3426 rc.cpp:3417 rc.cpp:3426
-msgid "The text from the image below."
+#. i18n: file: plugins/otr/otrprefs.ui:35
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:4922 rc.cpp:4922
+msgid "Private Keys"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:178
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelVerificationSequence)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:194
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, valueVerificationSequence)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:178
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelVerificationSequence)
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:194
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, valueVerificationSequence)
-#: rc.cpp:3420 rc.cpp:3429 rc.cpp:3420 rc.cpp:3429
-msgid ""
-"The text from the image below.  This is used to prevent abusive automated "
-"registration scripts."
+#. i18n: file: plugins/otr/otrprefs.ui:41
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:4925 rc.cpp:4925
+msgid "Account:"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:181
-#. i18n: ectx: property (text), widget (QLabel, labelVerificationSequence)
-#: rc.cpp:3423 rc.cpp:3423
-msgid "&Verification sequence:"
+#. i18n: file: plugins/otr/otrprefs.ui:61
+#. i18n: ectx: property (text), widget (QPushButton, btGenFingerprint)
+#: rc.cpp:4928 rc.cpp:4928
+msgid "&Generate"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:234
-#. i18n: ectx: property (text), widget (QLabel, labelPassword)
-#: rc.cpp:3438 rc.cpp:3438
-msgid "&Password:"
-msgstr "&Cyfrinair:"
+#. i18n: file: plugins/otr/otrprefs.ui:68
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:4931 rc.cpp:4931
+msgid "Fingerprint:"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:303
-#. i18n: ectx: property (toolTip), widget (QLabel, pixmapToken)
-#: rc.cpp:3447 rc.cpp:3447
-msgid "Gadu-Gadu registration token."
+#. i18n: file: plugins/otr/otrprefs.ui:78
+#. i18n: ectx: property (text), widget (QLabel, tlFingerprint)
+#: rc.cpp:4934 rc.cpp:4934
+msgid "No Fingerprint"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:306
-#. i18n: ectx: property (whatsThis), widget (QLabel, pixmapToken)
-#: rc.cpp:3450 rc.cpp:3450
-msgid ""
-"This field contains an image showing a number that you need to type into the "
-"<b>Verification Sequence</b> field above."
+#. i18n: file: plugins/otr/otrprefs.ui:110
+#. i18n: ectx: property (title), widget (QGroupBox, gbPolicy)
+#: rc.cpp:4937 rc.cpp:4937
+msgid "Default OTR Policy"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduregisteraccountui.ui:348
-#. i18n: ectx: property (text), widget (QLabel, labelInstructions)
-#: rc.cpp:3453 rc.cpp:3453
-msgid ""
-"<i>Type the letters and numbers shown in the image above into the "
-"<b>Verification Sequence</b> field.  This is used to prevent automated "
-"registration abuse.</i>"
+#. i18n: file: plugins/otr/otrprefs.ui:116
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbAlways)
+#: rc.cpp:4940 rc.cpp:4940
+msgid "Always encrypt messages"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:38
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:63
-#. i18n: ectx: property (toolTip), widget (KRestrictedLine, addEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:38
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:63
-#. i18n: ectx: property (toolTip), widget (KRestrictedLine, addEdit_)
-#: rc.cpp:3456 rc.cpp:3465 rc.cpp:3456 rc.cpp:3465
-msgid "The user ID of the Gadu-Gadu account you would like to add."
+#. i18n: file: plugins/otr/otrprefs.ui:119
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbAlways)
+#: rc.cpp:4943 rc.cpp:4943
+msgid "Al&ways"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:41
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:66
-#. i18n: ectx: property (whatsThis), widget (KRestrictedLine, addEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:41
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:66
-#. i18n: ectx: property (whatsThis), widget (KRestrictedLine, addEdit_)
-#: rc.cpp:3459 rc.cpp:3468 rc.cpp:3459 rc.cpp:3468
-msgid ""
-"The user ID of the Gadu-Gadu account you would like to add.  This should be "
-"in the form of a number (no decimals, no spaces).  This field is mandatory."
+#. i18n: file: plugins/otr/otrprefs.ui:132
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbManual)
+#: rc.cpp:4949 rc.cpp:4949
+msgid "&Manual"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:75
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:3471 rc.cpp:3471
-msgid "<i>(for example: 1234567)</i>"
+#. i18n: file: plugins/otr/otrprefs.ui:142
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbOpportunistic)
+#: rc.cpp:4952 rc.cpp:4952
+msgid "Encrypt messages automatically if the other side supports OTR"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:104
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:230
-#. i18n: ectx: property (toolTip), widget (QLineEdit, fornameEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:104
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:230
-#. i18n: ectx: property (toolTip), widget (QLineEdit, fornameEdit_)
-#: rc.cpp:3474 rc.cpp:3519 rc.cpp:3474 rc.cpp:3519
-msgid "The forename of the contact you wish to add."
+#. i18n: file: plugins/otr/otrprefs.ui:145
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbOpportunistic)
+#: rc.cpp:4955 rc.cpp:4955
+msgid "&Opportunistic"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:107
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:233
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, fornameEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:107
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:233
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, fornameEdit_)
-#: rc.cpp:3477 rc.cpp:3522 rc.cpp:3477 rc.cpp:3522
-msgid ""
-"The forename (first name) of the contact you wish to add.  Optionally this "
-"may include a middle name."
+#. i18n: file: plugins/otr/otrprefs.ui:152
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_rbNever)
+#: rc.cpp:4958 rc.cpp:4958
+msgid "Never encrypt messages"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:110
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:3480 rc.cpp:3480
-msgid "&Forename:"
+#. i18n: file: plugins/otr/otrprefs.ui:155
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_rbNever)
+#: rc.cpp:4961 rc.cpp:4961
+msgid "Ne&ver"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:123
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:243
-#. i18n: ectx: property (toolTip), widget (QLineEdit, snameEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:123
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:243
-#. i18n: ectx: property (toolTip), widget (QLineEdit, snameEdit_)
-#: rc.cpp:3483 rc.cpp:3525 rc.cpp:3483 rc.cpp:3525
-msgid "The surname of the contact you wish to add."
+#. i18n: file: plugins/otr/otrprefs.ui:179
+#. i18n: ectx: attribute (title), widget (QWidget, fingerprints)
+#: rc.cpp:4964 rc.cpp:4964
+msgid "K&nown Fingerprints"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:126
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:246
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, snameEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:126
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:246
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, snameEdit_)
-#: rc.cpp:3486 rc.cpp:3528 rc.cpp:3486 rc.cpp:3528
-msgid "The surname (last name) of the contact you wish to add."
+#. i18n: file: plugins/otr/otrprefs.ui:201
+#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
+#: rc.cpp:4967 rc.cpp:4967
+msgid "Contact ID"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:129
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
-#: rc.cpp:3489 rc.cpp:3489
-msgid "&Surname:"
-msgstr "&Cyfenw :"
+#. i18n: file: plugins/otr/otrprefs.ui:211
+#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
+#: rc.cpp:4973 rc.cpp:4973
+msgid "Verified"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:147
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:150
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:253
-#. i18n: ectx: property (toolTip), widget (QLineEdit, nickEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:256
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, nickEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:147
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:150
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:253
-#. i18n: ectx: property (toolTip), widget (QLineEdit, nickEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:256
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, nickEdit_)
-#: rc.cpp:3492 rc.cpp:3495 rc.cpp:3531 rc.cpp:3534 rc.cpp:3492 rc.cpp:3495
-#: rc.cpp:3531 rc.cpp:3534
-msgid "A nickname for the contact you wish to add."
+#. i18n: file: plugins/otr/otrprefs.ui:216
+#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
+#: rc.cpp:4976 rc.cpp:4976
+msgid "Fingerprint"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:153
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2_2)
-#: rc.cpp:3498 rc.cpp:3498
-msgid "N&ickname:"
-msgstr "F&fugenw:"
+#. i18n: file: plugins/otr/otrprefs.ui:221
+#. i18n: ectx: property (text), widget (QTableWidget, tbFingerprints)
+#: rc.cpp:4979 rc.cpp:4979
+msgid "Protocol"
+msgstr "Protocol"
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:174
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:177
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:201
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:204
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:266
-#. i18n: ectx: property (toolTip), widget (QLineEdit, emailEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:269
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, emailEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:279
-#. i18n: ectx: property (toolTip), widget (QLineEdit, telephoneEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:282
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, telephoneEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:174
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:177
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:201
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_4_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:204
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_4_2)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:266
-#. i18n: ectx: property (toolTip), widget (QLineEdit, emailEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:269
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, emailEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:279
-#. i18n: ectx: property (toolTip), widget (QLineEdit, telephoneEdit_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:282
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, telephoneEdit_)
-#: rc.cpp:3501 rc.cpp:3504 rc.cpp:3510 rc.cpp:3513 rc.cpp:3537 rc.cpp:3540
-#: rc.cpp:3543 rc.cpp:3546 rc.cpp:3501 rc.cpp:3504 rc.cpp:3510 rc.cpp:3513
-#: rc.cpp:3537 rc.cpp:3540 rc.cpp:3543 rc.cpp:3546
-msgid "E-Mail address for this contact."
+#. i18n: file: plugins/otr/otrprefs.ui:232
+#. i18n: ectx: property (text), widget (QPushButton, btVerify)
+#: rc.cpp:4982 rc.cpp:4982
+msgid "&Verify Fingerprint"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:180
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_4)
-#: rc.cpp:3507 rc.cpp:3507
-msgid "&Email address:"
-msgstr "&Cyfeiriad ebost:"
+#. i18n: file: plugins/otr/otrprefs.ui:242
+#. i18n: ectx: property (text), widget (QPushButton, btForget)
+#: rc.cpp:4985 rc.cpp:4985
+msgid "F&orget Fingerprint"
+msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:296
-#. i18n: ectx: property (toolTip), widget (QCheckBox, notAFriend_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:299
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, notAFriend_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:296
-#. i18n: ectx: property (toolTip), widget (QCheckBox, notAFriend_)
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:299
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, notAFriend_)
-#: rc.cpp:3549 rc.cpp:3552 rc.cpp:3549 rc.cpp:3552
+#. i18n: file: plugins/history/historyprefsui.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:4988 rc.cpp:4988
+msgid "Chat History"
+msgstr ""
+
+#. i18n: file: plugins/history/historyprefsui.ui:72
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblNoLinesPerPage)
+#: rc.cpp:4991 rc.cpp:4991
 msgid ""
-"Check if you want to exclude this contact from the \"Just for friends\" "
-"status mode."
+"The number of messages that are shown when browsing history in the chat "
+"window"
 msgstr ""
 
-#. i18n: file: protocols/gadu/ui/gaduadd.ui:302
-#. i18n: ectx: property (text), widget (QCheckBox, notAFriend_)
-#: rc.cpp:3555 rc.cpp:3555
-msgid "Offline to contact when you set \"&Just for friends\""
+#. i18n: file: plugins/history/historyprefsui.ui:75
+#. i18n: ectx: property (text), widget (QLabel, lblNoLinesPerPage)
+#: rc.cpp:4994 rc.cpp:4994
+msgid "Number of messages per page:"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:3561 rc.cpp:3561
-msgid "Show Me As"
+#. i18n: file: plugins/history/historyprefsui.ui:82
+#. i18n: ectx: property (whatsThis), widget (QLabel, colorLabel)
+#. i18n: file: plugins/history/historyprefsui.ui:108
+#. i18n: ectx: property (whatsThis), widget (KColorButton, History_color)
+#. i18n: file: plugins/history/historyprefsui.ui:82
+#. i18n: ectx: property (whatsThis), widget (QLabel, colorLabel)
+#. i18n: file: plugins/history/historyprefsui.ui:108
+#. i18n: ectx: property (whatsThis), widget (KColorButton, History_color)
+#: rc.cpp:4997 rc.cpp:5009 rc.cpp:4997 rc.cpp:5009
+msgid "Color of history messages in the chat window"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:53
-#. i18n: ectx: property (text), widget (QRadioButton, radioOffline)
-#: rc.cpp:3567 rc.cpp:3567
-msgid "Off&line"
+#. i18n: file: plugins/history/historyprefsui.ui:85
+#. i18n: ectx: property (text), widget (QLabel, colorLabel)
+#: rc.cpp:5000 rc.cpp:5000
+msgid "Color of messages:"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoostealthsetting.ui:63
-#. i18n: ectx: property (text), widget (QRadioButton, radioPermOffline)
-#: rc.cpp:3570 rc.cpp:3570
-msgid "Perma&nently offline"
+#. i18n: file: plugins/history/historyprefsui.ui:95
+#. i18n: ectx: property (whatsThis), widget (QLabel, numberLabel)
+#. i18n: file: plugins/history/historyprefsui.ui:125
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, Number_Auto_chatwindow)
+#. i18n: file: plugins/history/historyprefsui.ui:95
+#. i18n: ectx: property (whatsThis), widget (QLabel, numberLabel)
+#. i18n: file: plugins/history/historyprefsui.ui:125
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, Number_Auto_chatwindow)
+#: rc.cpp:5003 rc.cpp:5012 rc.cpp:5003 rc.cpp:5012
+msgid ""
+"This is the number of messages that will be added automatically in the chat "
+"window when opening a new chat."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, YahooEditAccountBase)
-#: rc.cpp:3573 rc.cpp:3573
-msgid "Account Preferences - Yahoo"
+#. i18n: file: plugins/history/historyprefsui.ui:98
+#. i18n: ectx: property (text), widget (QLabel, numberLabel)
+#: rc.cpp:5006 rc.cpp:5006
+msgid "Number of messages to show:"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:103
-#. i18n: ectx: property (toolTip), widget (QLabel, label1)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:119
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:103
-#. i18n: ectx: property (toolTip), widget (QLabel, label1)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:119
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mScreenName)
-#: rc.cpp:3582 rc.cpp:3591 rc.cpp:3582 rc.cpp:3591
-msgid "The account name of your Yahoo account."
+#. i18n: file: plugins/history/historyprefsui.ui:141
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, Number_ChatWindow)
+#: rc.cpp:5015 rc.cpp:5015
+msgid ""
+"The number of message that are shown when borwsing history in the chat window"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:106
-#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:122
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:106
-#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:122
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mScreenName)
-#: rc.cpp:3585 rc.cpp:3594 rc.cpp:3585 rc.cpp:3594
+#. i18n: file: plugins/history/historyprefsui.ui:157
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, chkShowPrevious)
+#: rc.cpp:5018 rc.cpp:5018
 msgid ""
-"The account name of your Yahoo account.  This should be in the form of an "
-"alphanumeric string (no spaces)."
+"When a new chat is opened, automatically add the last few messages between "
+"you and that contact."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:109
-#. i18n: ectx: property (text), widget (QLabel, label1)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:39
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:109
-#. i18n: ectx: property (text), widget (QLabel, label1)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:39
+#. i18n: file: plugins/history/historyprefsui.ui:160
+#. i18n: ectx: property (text), widget (QCheckBox, chkShowPrevious)
+#: rc.cpp:5021 rc.cpp:5021
+msgid "Show chat history in new chats"
+msgstr ""
+
+#. i18n: file: plugins/history/historyviewer.ui:39
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:3588 rc.cpp:3759 rc.cpp:3588 rc.cpp:3759
-msgid "&Yahoo username:"
-msgstr "Enw'r defnyddiwr &Yahoo :"
+#: rc.cpp:5030 rc.cpp:5030
+msgid "Contact:"
+msgstr "Cyswllt :"
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:183
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:3606 rc.cpp:3606
-msgid ""
-"To connect to the Yahoo network, you will need a Yahoo account.<br><br>If "
-"you do not currently have a Yahoo account, please click the button to create "
-"one."
+#. i18n: file: plugins/history/historyviewer.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, importHistory)
+#: rc.cpp:5033 rc.cpp:5033
+msgid "Import History..."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:218
-#. i18n: ectx: property (text), widget (QPushButton, buttonRegister)
-#: rc.cpp:3615 rc.cpp:3615
-msgid "Register &New Account"
+#. i18n: file: plugins/history/historyviewer.ui:63
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:5036 rc.cpp:5036
+msgid "Message filter:"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:258
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:3618 rc.cpp:3618
-msgid "Accoun&t Preferences"
+#. i18n: file: plugins/history/historyviewer.ui:83
+#. i18n: ectx: property (text), item, widget (QComboBox, messageFilterBox)
+#: rc.cpp:5039 rc.cpp:5039
+msgid "All Messages"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:300
-#. i18n: ectx: property (text), widget (QCheckBox, optionOverrideServer)
-#: rc.cpp:3624 rc.cpp:3624
-msgid "O&verride default server information"
+#. i18n: file: plugins/history/historyviewer.ui:88
+#. i18n: ectx: property (text), item, widget (QComboBox, messageFilterBox)
+#: rc.cpp:5042 rc.cpp:5042
+msgid "Only Incoming"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:346
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:365
-#. i18n: ectx: property (toolTip), widget (QLineEdit, editServerAddress)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:346
-#. i18n: ectx: property (toolTip), widget (QLabel, lblServer)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:365
-#. i18n: ectx: property (toolTip), widget (QLineEdit, editServerAddress)
-#: rc.cpp:3627 rc.cpp:3636 rc.cpp:3627 rc.cpp:3636
-msgid ""
-"The IP address or hostmask of the Yahoo server you wish to connect to."
+#. i18n: file: plugins/history/historyviewer.ui:93
+#. i18n: ectx: property (text), item, widget (QComboBox, messageFilterBox)
+#: rc.cpp:5045 rc.cpp:5045
+msgid "Only Outgoing"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:349
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:368
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, editServerAddress)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:349
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblServer)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:368
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, editServerAddress)
-#: rc.cpp:3630 rc.cpp:3639 rc.cpp:3630 rc.cpp:3639
-msgid ""
-"The IP address or hostmask of the Yahoo server you wish to connect to.  "
-"Normally you will want the default (scs.msg.yahoo.com)."
+#. i18n: file: plugins/history/historyviewer.ui:129
+#. i18n: ectx: property (text), widget (QTreeWidget, dateTreeWidget)
+#: rc.cpp:5048 rc.cpp:5048
+msgid "Date"
+msgstr "Dyddiad"
+
+#. i18n: file: plugins/history/historyviewer.ui:156
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:5054 rc.cpp:5054
+msgid "Search:"
+msgstr "Chwiliad:"
+
+#. i18n: file: plugins/history/historyconfig.kcfg:11
+#. i18n: ectx: label, entry (Auto_chatwindow), group (History Plugin)
+#: rc.cpp:5063 rc.cpp:5063
+msgid "Show previous messages in new chats."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:371
-#. i18n: ectx: property (text), widget (QLineEdit, editServerAddress)
-#: rc.cpp:3642 rc.cpp:3642
-msgid "scs.msg.yahoo.com"
+#. i18n: file: plugins/history/historyconfig.kcfg:16
+#. i18n: ectx: label, entry (Number_Auto_chatwindow), group (History Plugin)
+#: rc.cpp:5066 rc.cpp:5066
+msgid "Number of messages to show."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:381
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPort)
-#: rc.cpp:3645 rc.cpp:3645
-msgid "The port on the Yahoo server that you would like to connect to."
+#. i18n: file: plugins/history/historyconfig.kcfg:21
+#. i18n: ectx: label, entry (Number_ChatWindow), group (History Plugin)
+#: rc.cpp:5069 rc.cpp:5069
+msgid "Number of messages per page"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:384
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:403
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:384
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPort)
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:403
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, sbxServerPort)
-#: rc.cpp:3648 rc.cpp:3657 rc.cpp:3648 rc.cpp:3657
-msgid ""
-"The port on the Yahoo server that you would like to connect to.  Normally "
-"this is 5050, but Yahoo also allows port 80 in case you are behind a "
-"firewall."
+#. i18n: file: plugins/history/historyconfig.kcfg:26
+#. i18n: ectx: label, entry (History_color), group (History Plugin)
+#: rc.cpp:5072 rc.cpp:5072
+msgid "Color of messages"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:387
-#. i18n: ectx: property (text), widget (QLabel, lblPort)
-#: rc.cpp:3651 rc.cpp:3651
-msgid "P&ort:"
-msgstr "&Porth:"
+#. i18n: file: plugins/history/historyconfig.kcfg:31
+#. i18n: ectx: label, entry (BrowserStyle), group (History Plugin)
+#: rc.cpp:5075 rc.cpp:5075
+msgid "Style to use in history-browser."
+msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:400
-#. i18n: ectx: property (toolTip), widget (QSpinBox, sbxServerPort)
-#: rc.cpp:3654 rc.cpp:3654
-msgid "The port on the Yahoo server that you would like to connect  to."
+#. i18n: file: doc/t3/tutorialprefs.ui:16
+#. i18n: ectx: property (text), widget (QCheckBox, fastLearner)
+#: rc.cpp:5078 rc.cpp:5078
+msgid "I am a fast learner"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:424
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:3660 rc.cpp:3660
-msgid "Buddy Icon"
+#. i18n: file: libkopete/kopetecommandui.rc:6
+#. i18n: ectx: Menu (commandmenu)
+#: rc.cpp:5081 rc.cpp:5081
+msgid "Commands"
+msgstr "Gorchmynion:"
+
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:12
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5084 rc.cpp:5084
+msgid "Start Kopete docked."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:465
-#. i18n: ectx: property (text), widget (QCheckBox, optionSendBuddyIcon)
-#: rc.cpp:3663 rc.cpp:3663
-msgid "Se&nd buddy icon to other users"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:16
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5087 rc.cpp:5087
+msgid "Show Kopete in system tray."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooeditaccountbase.ui:508
-#. i18n: ectx: property (text), widget (QPushButton, buttonSelectPicture)
-#: rc.cpp:3666 rc.cpp:3666
-msgid "Select Picture..."
-msgstr "Dewis Llun ..."
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:20
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5090 rc.cpp:5090
+msgid "Use message queue."
+msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooverifyaccountbase.ui:28
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:3669 rc.cpp:3669
-msgid ""
-"Your Account has to be verified due to too many failed login attempts.<br>"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:24
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5093 rc.cpp:5093
+msgid "Queue unread messages."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooverifyaccountbase.ui:43
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:3672 rc.cpp:3672
-msgid "Please enter the characters shown in the picture:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:28
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5096 rc.cpp:5096
+msgid "Use mouse navigation only in contact list."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:38
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:3675 rc.cpp:3675
-msgid "Contact Information"
-msgstr "Gwybodaeth Cysylltu"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:32
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5099 rc.cpp:5099
+msgid "Reconnect on disconnect."
+msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:50
-#. i18n: ectx: property (text), widget (QLabel, textLabel9_3)
-#: rc.cpp:3678 rc.cpp:3678
-msgid "Email &3:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:36
+#. i18n: ectx: label, entry, group (Behavior)
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:109
+#. i18n: ectx: property (title), widget (QGroupBox, initialStatusGroup)
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:36
+#. i18n: ectx: label, entry, group (Behavior)
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:109
+#. i18n: ectx: property (title), widget (QGroupBox, initialStatusGroup)
+#: rc.cpp:5102 rc.cpp:6142 rc.cpp:5102 rc.cpp:6142
+msgid "Initial Status"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:90
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2_2)
-#: rc.cpp:3684 rc.cpp:3684
-msgid "Pager:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:48
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5105 rc.cpp:5105
+msgid "Raise message view on new messages."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:123
-#. i18n: ectx: property (text), widget (QLabel, textLabel9_2)
-#: rc.cpp:3687 rc.cpp:3687
-msgid "Email &2:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:52
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5108 rc.cpp:5108
+msgid "Show events in chat window."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:166
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2_2_2)
-#: rc.cpp:3696 rc.cpp:3696
-msgid "Additional:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:56
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5111 rc.cpp:5111
+msgid "Queue only highlighted messages in group chats"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:251
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:3705 rc.cpp:3705
-msgid "Location Information"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:60
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5114 rc.cpp:5114
+msgid "Queue Only Messages On Another Desktop"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:457
-#. i18n: ectx: property (text), widget (QLabel, birthdayLabel_2)
-#: rc.cpp:3729 rc.cpp:3729
-msgid "Anniversary:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:64
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5117 rc.cpp:5117
+msgid "Single notification for messages from the same sender."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:513
-#. i18n: ectx: property (text), widget (QLabel, yahooIdLabel)
-#: rc.cpp:3738 rc.cpp:3738
-msgid "Yahoo ID:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:68
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5120 rc.cpp:5120
+msgid "Balloon Notification Ignore Closes Chat View"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:523
-#. i18n: ectx: property (text), widget (QLabel, fullNameLabel_2_2)
-#: rc.cpp:3741 rc.cpp:3741
-msgid "Second name:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:72
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5123 rc.cpp:5123
+msgid "Trayflash Notification"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoogeneralinfowidget.ui:543
-#. i18n: ectx: property (text), widget (QLabel, yahooIdLabel_2)
-#: rc.cpp:3747 rc.cpp:3747
-msgctxt "Person's name suffix or prefix"
-msgid "Title:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:76
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5126 rc.cpp:5126
+msgid "Trayflash Notification Left Click Opens Message."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, YahooAddContactBase)
-#: rc.cpp:3750 rc.cpp:3750
-msgid "Add Yahoo Contact"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:80
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5129 rc.cpp:5129
+msgid "Animate on message with open chat."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:33
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:49
-#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:33
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:49
-#. i18n: ectx: property (toolTip), widget (QLineEdit, contactID)
-#: rc.cpp:3753 rc.cpp:3762 rc.cpp:3753 rc.cpp:3762
-msgid "The account name of the Yahoo account you would like to add."
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:84
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5132 rc.cpp:5132
+msgid "Trayflash Notification Set Current Desktop To Chat View"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:36
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:52
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:36
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:52
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, contactID)
-#: rc.cpp:3756 rc.cpp:3765 rc.cpp:3756 rc.cpp:3765
-msgid ""
-"The account name of the Yahoo account you would like to add.  This should be "
-"in the form of an alphanumeric string (no spaces)."
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:88
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5135 rc.cpp:5135
+msgid "Enable events while away."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooadd.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:3768 rc.cpp:3768
-msgid "<i>(for example: joe8752)</i>"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:94
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5138 rc.cpp:5138
+msgid "Chat window grouping policy."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, YahooInviteListBase)
-#: rc.cpp:3801 rc.cpp:3801
-msgid "Invite Friends to Conference"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:105
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5141 rc.cpp:5141
+msgid "Enable spell checking by default."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:37
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:3804 rc.cpp:3804
-msgid "Conference Members"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:109
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5144 rc.cpp:5144
+msgid "Enable rich text by default."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:94
-#. i18n: ectx: property (text), widget (QPushButton, btn_Add)
-#: rc.cpp:3807 rc.cpp:3807
-msgid "Add >>"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:113
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5147 rc.cpp:5147
+msgid "Show send button in Chat Window."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:101
-#. i18n: ectx: property (text), widget (QPushButton, btn_Remove)
-#: rc.cpp:3810 rc.cpp:3810
-msgid "<< Remove"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:117
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5150 rc.cpp:5150
+msgid "Show message dates."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:143
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:3813 rc.cpp:3813
-msgid "Chat Invitation List"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:121
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5153 rc.cpp:5153
+msgid "Truncate contact name."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:201
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:3819 rc.cpp:3819
-msgid "Friend List"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:125
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5156 rc.cpp:5156
+msgid "Truncate contact name max length."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:233
-#. i18n: ectx: property (text), widget (QLabel, txtInvMsg)
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:105
-#. i18n: ectx: property (text), widget (QLabel, message)
-#. i18n: file: protocols/yahoo/ui/yahooinvitelistbase.ui:233
-#. i18n: ectx: property (text), widget (QLabel, txtInvMsg)
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:105
-#. i18n: ectx: property (text), widget (QLabel, message)
-#: rc.cpp:3822 rc.cpp:4929 rc.cpp:3822 rc.cpp:4929
-msgid "Invitation Message"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:129
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5159 rc.cpp:5159
+msgid "Maximum number of messages to show in a chat window."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:60
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:3825 rc.cpp:3825
-msgid "Note 4:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:133
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5162 rc.cpp:5162
+msgid "Hightlight messages containing your nickname."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:74
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:3828 rc.cpp:3828
-msgid "Note 3:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:137
+#. i18n: ectx: label, entry, group (Behavior)
+#: rc.cpp:5165 rc.cpp:5165
+msgid "Selected view plugin for Chat Window."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:88
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:3831 rc.cpp:3831
-msgid "Note 2:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:144
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5168 rc.cpp:5168
+msgid "Use auto away."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:102
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:3834 rc.cpp:3834
-msgid "Note 1:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:148
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5171 rc.cpp:5171
+msgid "Auto away timeout."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoootherinfowidget.ui:109
-#. i18n: ectx: property (text), widget (QLabel, textLabel13)
-#: rc.cpp:3837 rc.cpp:3837
-msgid "Contact comments:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:152
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5174 rc.cpp:5174
+msgid "Go available after detecting an activity."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, YahooChatSelectorWidgetBase)
-#: rc.cpp:3840 rc.cpp:3840
-msgid "Choose Chat Room"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:156
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5177 rc.cpp:5177
+msgid "Confirm Before Coming Back from Auto Away"
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:25
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:3843 rc.cpp:3843
-msgid "Chat rooms:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:160
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5180 rc.cpp:5180
+msgid "When setting the auto away message, use the latest away message."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3846 rc.cpp:3846
-msgid "Categories:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:164
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5183 rc.cpp:5183
+msgid "When setting the auto away message, use a custom away message."
 msgstr ""
 
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:46
-#. i18n: ectx: property (text), widget (QTreeWidget, treeCategories)
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:61
-#. i18n: ectx: property (text), widget (QTreeWidget, treeRooms)
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:52
-#. i18n: ectx: property (text), widget (QTreeWidget, protocolListView)
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:46
-#. i18n: ectx: property (text), widget (QTreeWidget, treeCategories)
-#. i18n: file: protocols/yahoo/ui/yahoochatselectorwidgetbase.ui:61
-#. i18n: ectx: property (text), widget (QTreeWidget, treeRooms)
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:52
-#. i18n: ectx: property (text), widget (QTreeWidget, protocolListView)
-#: rc.cpp:3849 rc.cpp:3852 rc.cpp:6485 rc.cpp:3849 rc.cpp:3852 rc.cpp:6485
-msgid "1"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:168
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5186 rc.cpp:5186
+msgid "The custom auto away title."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:22
-#. i18n: ectx: property (toolTip), widget (QLabel, lblComputerName)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:25
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblComputerName)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:22
-#. i18n: ectx: property (toolTip), widget (QLabel, lblComputerName)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:25
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblComputerName)
-#: rc.cpp:3858 rc.cpp:3861 rc.cpp:3858 rc.cpp:3861
-msgid "The host name of this contact's computer."
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:172
+#. i18n: ectx: label, entry, group (AutoAway)
+#: rc.cpp:5189 rc.cpp:5189
+msgid "The custom auto away message."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:28
-#. i18n: ectx: property (text), widget (QLabel, lblComputerName)
-#: rc.cpp:3864 rc.cpp:3864
-msgid "&Computer name:"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:179
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5192 rc.cpp:5192
+msgid "Enable smooth scrolling in contact list."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:44
-#. i18n: ectx: property (text), widget (QLabel, sComputerName)
-#: rc.cpp:3867 rc.cpp:3867
-msgid "Computer Name"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:186
+#. i18n: ectx: label, entry, group (ChatWindowSettings)
+#: rc.cpp:5195 rc.cpp:5195
+msgid "Always show tabs."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:3870 rc.cpp:3870
-msgid "Comment:"
-msgstr "Sylwad:"
-
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:64
-#. i18n: ectx: property (text), widget (QLabel, sComment)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:93
-#. i18n: ectx: property (text), widget (QLabel, sWorkgroup)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, sOS)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:151
-#. i18n: ectx: property (text), widget (QLabel, sServer)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:64
-#. i18n: ectx: property (text), widget (QLabel, sComment)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:93
-#. i18n: ectx: property (text), widget (QLabel, sWorkgroup)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, sOS)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:151
-#. i18n: ectx: property (text), widget (QLabel, sServer)
-#: rc.cpp:3873 rc.cpp:3885 rc.cpp:3897 rc.cpp:3909 rc.cpp:3873 rc.cpp:3885
-#: rc.cpp:3897 rc.cpp:3909
-msgid "Looking"
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:190
+#. i18n: ectx: label, entry, group (ChatWindowSettings)
+#: rc.cpp:5198 rc.cpp:5198
+msgid "Show contact name for each tab."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:71
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:74
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:71
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:74
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#: rc.cpp:3876 rc.cpp:3879 rc.cpp:3876 rc.cpp:3879
-msgid "The workgroup or domain containing this contact's computer."
+#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:194
+#. i18n: ectx: label, entry, group (ChatWindowSettings)
+#: rc.cpp:5201 rc.cpp:5201
+msgid "Show close button for each tab."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:77
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:96
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:77
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:96
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_2)
-#: rc.cpp:3882 rc.cpp:3999 rc.cpp:3882 rc.cpp:3999
-msgid "&Workgroup/domain:"
+#. i18n: file: libkopete/kopetestatussettings.kcfg:12
+#. i18n: ectx: label, entry, group (Status)
+#: rc.cpp:5208 rc.cpp:5208
+msgid "Protocol's status menu type."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:100
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:103
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:100
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:103
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#: rc.cpp:3888 rc.cpp:3891 rc.cpp:3888 rc.cpp:3891
-msgid "The operating system running on this contact's computer."
+#. i18n: file: libkopete/ui/kopeteawaydialogbase.ui:22
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:5211 rc.cpp:5211
+msgid "Please specify an away message, or choose a predefined one."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:106
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:3894 rc.cpp:3894
-msgid "Operating s&ystem:"
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:59
+#. i18n: ectx: property (toolTip), widget (QPushButton, addAddresseeButton)
+#: rc.cpp:5217 rc.cpp:5217
+msgid "Create a new entry in your address book"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:129
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:132
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:129
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel1)
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:132
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1)
-#: rc.cpp:3900 rc.cpp:3903 rc.cpp:3900 rc.cpp:3903
-msgid "The software running on this contact's computer."
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:62
+#. i18n: ectx: property (text), widget (QPushButton, addAddresseeButton)
+#: rc.cpp:5220 rc.cpp:5220
+msgid "Create New Entr&y..."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpuserinfowidget.ui:135
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:3906 rc.cpp:3906
-msgid "Ser&ver software:"
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:85
+#. i18n: ectx: property (toolTip), widget (K3ListView, addresseeListView)
+#: rc.cpp:5223 rc.cpp:5223
+msgid "Select the contact you want to communicate with via Instant Messaging"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, WPEditAccountBase)
-#: rc.cpp:3912 rc.cpp:3912
-msgid "Account Preferences - WinPopup"
-msgstr ""
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:136
+#. i18n: ectx: property (text), widget (QLabel, lblSearch)
+#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:61
+#. i18n: ectx: property (text), widget (QLabel, lblSearch)
+#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:136
+#. i18n: ectx: property (text), widget (QLabel, lblSearch)
+#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:61
+#. i18n: ectx: property (text), widget (QLabel, lblSearch)
+#: rc.cpp:5235 rc.cpp:5318 rc.cpp:5235 rc.cpp:5318
+msgid "S&earch:"
+msgstr "C&hwilio"
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:34
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:3915 rc.cpp:3915
-msgid "Basi&c Setup"
+#. i18n: file: libkopete/ui/avatarselectorwidget.ui:76
+#. i18n: ectx: property (text), widget (QPushButton, buttonAddAvatar)
+#: rc.cpp:5238 rc.cpp:5238
+msgid "Add Avatar..."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:66
-#. i18n: ectx: property (toolTip), widget (QLabel, label1)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:82
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mHostName)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:66
-#. i18n: ectx: property (toolTip), widget (QLabel, label1)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:82
-#. i18n: ectx: property (toolTip), widget (QLineEdit, mHostName)
-#: rc.cpp:3921 rc.cpp:3930 rc.cpp:3921 rc.cpp:3930
-msgid "The hostname under which you want to send WinPopup messages."
+#. i18n: file: libkopete/ui/avatarselectorwidget.ui:83
+#. i18n: ectx: property (text), widget (QPushButton, buttonRemoveAvatar)
+#: rc.cpp:5241 rc.cpp:5241
+msgid "Remove Avatar"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:69
-#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:85
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mHostName)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:69
-#. i18n: ectx: property (whatsThis), widget (QLabel, label1)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:85
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, mHostName)
-#: rc.cpp:3924 rc.cpp:3933 rc.cpp:3924 rc.cpp:3933
-msgid ""
-"The host name under which you want to send WinPopup messages. Note that you "
-"do not have to specify the true hostname in order to send messages, but you "
-"do if you want to receive them."
+#. i18n: file: libkopete/ui/avatarselectorwidget.ui:90
+#. i18n: ectx: property (text), widget (QPushButton, buttonFromWebcam)
+#: rc.cpp:5244 rc.cpp:5244
+msgid "From Webcam"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:72
-#. i18n: ectx: property (text), widget (QLabel, label1)
-#: rc.cpp:3927 rc.cpp:3927
-msgid "Hos&tname:"
-msgstr "&Enw gwesteiwr:"
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:23
+#. i18n: ectx: property (text), widget (QLabel, m_label)
+#: rc.cpp:5247 rc.cpp:5247
+msgid "The contact XXX has added you to his/her contactlist"
+msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:92
-#. i18n: ectx: property (toolTip), widget (KPushButton, doInstallSamba)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:95
-#. i18n: ectx: property (whatsThis), widget (KPushButton, doInstallSamba)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:92
-#. i18n: ectx: property (toolTip), widget (KPushButton, doInstallSamba)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:95
-#. i18n: ectx: property (whatsThis), widget (KPushButton, doInstallSamba)
-#: rc.cpp:3936 rc.cpp:3939 rc.cpp:3936 rc.cpp:3939
-msgid "Install support into Samba to enable this service."
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:57
+#. i18n: ectx: property (text), widget (KPushButton, m_infoButton)
+#: rc.cpp:5250 rc.cpp:5250
+msgid "Read More Info About This Contact"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:98
-#. i18n: ectx: property (text), widget (KPushButton, doInstallSamba)
-#: rc.cpp:3942 rc.cpp:3942
-msgid "I&nstall Into Samba"
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:66
+#. i18n: ectx: property (text), widget (QCheckBox, m_authorizeCb)
+#: rc.cpp:5253 rc.cpp:5253
+msgid "Authorize this contact to see my status"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:138
-#. i18n: ectx: property (text), widget (QLabel, textLabel12)
-#: rc.cpp:3948 rc.cpp:3948
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:76
+#. i18n: ectx: property (text), widget (QCheckBox, m_addCb)
+#: rc.cpp:5256 rc.cpp:5256
+msgid "Add this contact in my contactlist"
+msgstr "Ychwanegu'r cyswllt yma i'm rhestr cysylltau"
+
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:106
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel7)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:120
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_displayNameEdit)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:106
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel7)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:120
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_displayNameEdit)
+#: rc.cpp:5259 rc.cpp:5269 rc.cpp:5259 rc.cpp:5269
 msgid ""
-"To receive WinPopup messages sent from other machines, the hostname above "
-"must be set to this machine's hostname."
+"The display name of the contact.  Leave it empty to use the contact's "
+"nickname."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:162
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:3951 rc.cpp:3951
-msgid "The samba server must be configured and running."
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:110
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel7)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:124
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_displayNameEdit)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:110
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel7)
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:124
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_displayNameEdit)
+#: rc.cpp:5262 rc.cpp:5272 rc.cpp:5262 rc.cpp:5272
+msgid ""
+"Enter the contact's display name. This is how the contact will appear in the "
+"contact list.\n"
+"Leave it empty if you want to see the contact's nickname as their display "
+"name."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:185
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3955 rc.cpp:3955
-#, no-c-format
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:141
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
+#: rc.cpp:5276 rc.cpp:5276
 msgid ""
-"\"Install into Samba\" is a simple method to create the directory for the "
-"temporary message files and configure your samba server.<br>\n"
-"However, the recommended way is to ask your administrator to create this "
-"directory ('mkdir -p -m 0777 /var/lib/winpopup') and for you to add\n"
-"'message command = _PATH_TO_/winpopup-send %s %m %t &' (substitute _PATH_TO_ "
-"by the real path) to the [global] section in your smb.conf."
+"Enter the group where the contact should be added. Leave it empty to add it "
+"in the top level group."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:221
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:364
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton5)
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:221
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:364
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton5)
-#: rc.cpp:3960 rc.cpp:4158 rc.cpp:3960 rc.cpp:4158
-msgid "S&ystem"
-msgstr "C&ysawd:"
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:144
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:5279 rc.cpp:5279
+msgid "In the group:"
+msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:233
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:3963 rc.cpp:3963
-msgid "Protocol Preferences"
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:159
+#. i18n: ectx: property (whatsThis), widget (KComboBox, m_groupList)
+#: rc.cpp:5282 rc.cpp:5282
+msgid ""
+"Enter the group where the contact should be added. Leave it empty to add it "
+"to the top level group."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:281
+#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:171
 #. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:3966 rc.cpp:3966
-msgid "second(s)"
-msgstr "eiliad(au)"
-
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:303
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:3969 rc.cpp:3969
-msgid "Host check frequency:"
+#: rc.cpp:5285 rc.cpp:5285
+msgid "Address book link:"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:313
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:3972 rc.cpp:3972
-msgid "Path to 'smbclient' executable:"
+#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:30
+#. i18n: ectx: property (toolTip), widget (KLineEdit, edtAddressee)
+#: rc.cpp:5288 rc.cpp:5288
+msgid "The KDE Address Book entry associated with this Kopete Contact"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpeditaccountbase.ui:337
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:3978 rc.cpp:3978
-msgid "<i>These options apply to all WinPopup accounts.</i>"
+#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:56
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnSelectAddressee)
+#: rc.cpp:5294 rc.cpp:5294
+msgid "Select an address book entry"
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:30
-#. i18n: ectx: property (windowTitle), widget (QWidget, WPAddContactBase)
-#: rc.cpp:3981 rc.cpp:3981
-msgid "Add WinPopup Contact"
-msgstr ""
+#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:59
+#. i18n: ectx: property (text), widget (QPushButton, btnSelectAddressee)
+#: rc.cpp:5297 rc.cpp:5297
+msgid "C&hange..."
+msgstr "N&ewid..."
 
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:71
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel2_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:74
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel2_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:134
-#. i18n: ectx: property (toolTip), widget (KComboBox, mHostName)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:137
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostName)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:71
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel2_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:74
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel2_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:134
-#. i18n: ectx: property (toolTip), widget (KComboBox, mHostName)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:137
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostName)
-#: rc.cpp:3984 rc.cpp:3987 rc.cpp:4002 rc.cpp:4005 rc.cpp:3984 rc.cpp:3987
-#: rc.cpp:4002 rc.cpp:4005
-msgid "The hostname to which you want to send WinPopup messages."
+#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:31
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mRemembered)
+#: rc.cpp:5300 rc.cpp:5300
+msgid ""
+"Check this and enter your password below if you would like your password to "
+"be stored in your wallet, so Kopete does not have to ask you for it each "
+"time it is needed."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:77
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2_2)
-#: rc.cpp:3990 rc.cpp:3990
-msgid "Com&puter hostname:"
+#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:34
+#. i18n: ectx: property (text), widget (QCheckBox, mRemembered)
+#: rc.cpp:5303 rc.cpp:5303
+msgid "Remember password"
+msgstr "Cofio cyfrinair"
+
+#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:78
+#. i18n: ectx: property (toolTip), widget (KLineEdit, mPassword)
+#: rc.cpp:5309 rc.cpp:5309
+msgid "Enter your password here."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:90
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:93
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:90
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_2)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:93
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_2)
-#: rc.cpp:3993 rc.cpp:3996 rc.cpp:3993 rc.cpp:3996
+#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:81
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mPassword)
+#: rc.cpp:5312 rc.cpp:5312
 msgid ""
-"The workgroup or domain containing the computer to which you want to send "
-"WinPopup messages."
+"Enter your password here. If you would rather not save your password, "
+"uncheck the Remember password checkbox above; you will then be prompted for "
+"your password whenever it is needed."
 msgstr ""
 
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:150
-#. i18n: ectx: property (toolTip), widget (KComboBox, mHostGroup)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:153
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostGroup)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:150
-#. i18n: ectx: property (toolTip), widget (KComboBox, mHostGroup)
-#. i18n: file: protocols/winpopup/ui/wpaddcontactbase.ui:153
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mHostGroup)
-#: rc.cpp:4008 rc.cpp:4011 rc.cpp:4008 rc.cpp:4011
-msgid ""
-"The workgroup or domain containing the computer to which you want to send "
-"WinPopup messages"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:14
+#. i18n: ectx: label
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:14
+#. i18n: ectx: label
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:14
+#. i18n: ectx: label
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:14
+#. i18n: ectx: label
+#: rc.cpp:5321 rc.cpp:5526 rc.cpp:5321 rc.cpp:5526
+msgid "Emitted when the font and colors settings have changed."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:6
-#. i18n: ectx: property (windowTitle), widget (QWidget, SkypeAddContactBase)
-#: rc.cpp:4017 rc.cpp:4017
-msgid "Add Skype Contact"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:17
+#. i18n: ectx: label
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:17
+#. i18n: ectx: label
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:17
+#. i18n: ectx: label
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:17
+#. i18n: ectx: label
+#: rc.cpp:5324 rc.cpp:5529 rc.cpp:5324 rc.cpp:5529
+msgid "Emitted when the message overrides settings have changed."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:14
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4020 rc.cpp:4020
-msgid "Skype name:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:20
+#. i18n: ectx: label
+#: rc.cpp:5327 rc.cpp:5327
+msgid "Emitted when the contact list appearance has changed."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:35
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4026 rc.cpp:4026
-msgid "Sorry, but the search function is not yet implemented."
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:26
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5330 rc.cpp:5330
+msgid "Enable emoticon support in Kopete."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeaddcontactbase.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, SearchButton)
-#: rc.cpp:4029 rc.cpp:4029
-msgid "Se&arch"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:35
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:49
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:35
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:49
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5333 rc.cpp:5550 rc.cpp:5333 rc.cpp:5550
+msgid "Text color used when highlighting."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:6
-#. i18n: ectx: property (windowTitle), widget (QWidget, SkypeDetailsBase)
-#: rc.cpp:4032 rc.cpp:4032
-msgid "User's Details"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:40
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:54
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:40
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:54
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5336 rc.cpp:5553 rc.cpp:5336 rc.cpp:5553
+msgid "Background color used when highlighting."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:12
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4035 rc.cpp:4035
-msgid "Skype ID:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:47
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:61
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:47
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:61
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5339 rc.cpp:5556 rc.cpp:5339 rc.cpp:5556
+msgid "Disable custom text color set by users."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:40
-#. i18n: ectx: property (text), item, widget (QComboBox, authorCombo)
-#: rc.cpp:4038 rc.cpp:4038
-msgid "Authorized"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:52
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:66
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:52
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:66
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5342 rc.cpp:5559 rc.cpp:5342 rc.cpp:5559
+msgid "Disable custom background color set by users."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:45
-#. i18n: ectx: property (text), item, widget (QComboBox, authorCombo)
-#: rc.cpp:4041 rc.cpp:4041
-msgid "Not Authorized"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:57
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:71
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:57
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:71
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5345 rc.cpp:5562 rc.cpp:5345 rc.cpp:5562
+msgid "Disable rich text set by users."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:58
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: kopete/identity/identitydetailed.ui:45
-#. i18n: ectx: property (text), widget (QLabel, mobileLabel)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:88
-#. i18n: ectx: property (text), widget (QLabel, mLblMobilePhone)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:58
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: kopete/identity/identitydetailed.ui:45
-#. i18n: ectx: property (text), widget (QLabel, mobileLabel)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:88
-#. i18n: ectx: property (text), widget (QLabel, mLblMobilePhone)
-#: rc.cpp:4047 rc.cpp:6287 rc.cpp:6323 rc.cpp:4047 rc.cpp:6287 rc.cpp:6323
-msgid "Mobile phone:"
-msgstr "Ffôn Symudol :"
-
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:71
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:78
-#. i18n: ectx: property (text), widget (QLabel, mLblWorkPhone)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:71
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:78
-#. i18n: ectx: property (text), widget (QLabel, mLblWorkPhone)
-#: rc.cpp:4050 rc.cpp:6320 rc.cpp:4050 rc.cpp:6320
-msgid "Work phone:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:64
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:78
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:64
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:78
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5348 rc.cpp:5565 rc.cpp:5348 rc.cpp:5565
+msgid "Chat text color."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:91
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: kopete/identity/identitydetailed.ui:32
-#. i18n: ectx: property (text), widget (QLabel, phoneLabel)
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:91
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: kopete/identity/identitydetailed.ui:32
-#. i18n: ectx: property (text), widget (QLabel, phoneLabel)
-#: rc.cpp:4053 rc.cpp:6284 rc.cpp:4053 rc.cpp:6284
-msgid "Private phone:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:69
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:83
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:69
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:83
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5351 rc.cpp:5568 rc.cpp:5351 rc.cpp:5568
+msgid "Chat background color."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:104
-#. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:4056 rc.cpp:4056
-msgid "Is authorized:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:74
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:88
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:74
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:88
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5354 rc.cpp:5571 rc.cpp:5354 rc.cpp:5571
+msgid "Chat link color."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:131
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4059 rc.cpp:4059
-msgid "Display Name:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:79
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5357 rc.cpp:5357
+msgid "Whether using the system font for the chat window."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypedetailsbase.ui:184
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:4068 rc.cpp:4068
-msgid "Sex:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:84
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:93
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:84
+#. i18n: ectx: label, entry, group (Appearance)
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:93
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5360 rc.cpp:5574 rc.cpp:5360 rc.cpp:5574
+msgid "Chat font."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:35
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, excludeCheck)
-#: rc.cpp:4077 rc.cpp:4077
-msgid "Check this if you do not want to connect with other protocols"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:91
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5363 rc.cpp:5363
+msgid "Color used to identify idle contacts."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, excludeCheck)
-#: rc.cpp:4080 rc.cpp:4080
-msgid "E&xclude from connection"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:96
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5366 rc.cpp:5366
+msgid "Whether to use a different color for idle contacts."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:66
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:4083 rc.cpp:4083
-msgid "Important Note"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:103
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5369 rc.cpp:5369
+msgid "Contact properties that contact tooltip will show."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:72
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:4086 rc.cpp:4086
-msgid ""
-"The Skype plugin serves as a bridge to an externally running copy of Skype. "
-"This has some consequences on how it functions: you need an instance of "
-"Skype to be running, and only one Skype account can be used.<br /><br />Note "
-"that you need to install the original dynamic linked Skype version 2.0 or "
-"2.1 from <a href=\"http://www.skype.com\">http://www.skype.com</a><br /><br "
-"/>This plugin will only work if the language in the Skype client set to "
-"English. Kopete shows notifications (incoming call, message, ...), so you "
-"can turn off the notifications in Skype."
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:111
+#. i18n: ectx: label, entry, group (ContactList)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:120
+#. i18n: ectx: label, entry, group (ContactList)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:111
+#. i18n: ectx: label, entry, group (ContactList)
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:120
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5372 rc.cpp:5375 rc.cpp:5372 rc.cpp:5375
+msgid "Contact list group sorting"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:88
-#. i18n: ectx: property (text), widget (QPushButton, configureSkypeClient)
-#: rc.cpp:4089 rc.cpp:4089
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:130
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5378 rc.cpp:5378
 msgid ""
-"Disable Skype notifications and set up English language in Skype client"
+"Contact list icon display mode. Either the protocol icon or the contact "
+"photo."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:112
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:4092 rc.cpp:4092
-msgid "Lau&nch"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:139
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5381 rc.cpp:5381
+msgid "Enable borders on the contact's photo."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:118
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, LaunchGroup)
-#: rc.cpp:4095 rc.cpp:4095
-msgid "You can set whether and when should kopete launch Skype."
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:144
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5384 rc.cpp:5384
+msgid "Round contact photo corners."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:121
-#. i18n: ectx: property (title), widget (QGroupBox, LaunchGroup)
-#: rc.cpp:4098 rc.cpp:4098
-msgid "Launch Skype"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:149
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5387 rc.cpp:5387
+msgid "Show contact list as a tree view."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:127
-#. i18n: ectx: property (text), widget (QRadioButton, LaunchNeededRadio)
-#: rc.cpp:4101 rc.cpp:4101
-msgid "When &not running"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:154
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5390 rc.cpp:5390
+msgid "Indent contacts if you do not show tree lines."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:137
-#. i18n: ectx: property (text), widget (QRadioButton, LaunchNeverRadio)
-#: rc.cpp:4104 rc.cpp:4104
-msgid "N&ever"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:159
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5393 rc.cpp:5393
+msgid "Hide the vertical scroll bar."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:149
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4107 rc.cpp:4107
-msgid "Command to launch Skype:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:164
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5396 rc.cpp:5396
+msgid "Group contacts by group."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:159
-#. i18n: ectx: property (text), widget (QLineEdit, CommandEdit)
-#: rc.cpp:4110 rc.cpp:4110
-msgid "skype"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:169
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5399 rc.cpp:5399
+msgid "Use custom fonts for contact list."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:170
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:4113 rc.cpp:4113
-msgid "Launch timeout:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:174
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5402 rc.cpp:5402
+msgid "Automatically resize the main window."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:193
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:252
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:579
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:193
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:252
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_5)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:579
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:4116 rc.cpp:4128 rc.cpp:4209 rc.cpp:4116 rc.cpp:4128 rc.cpp:4209
-msgid "s"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:179
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5405 rc.cpp:5405
+msgid "Corner at which to anchor main window when auto-resizing."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:223
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_4)
-#: rc.cpp:4119 rc.cpp:4119
-msgid "Wait before trying to connect to Skype:"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:197
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5408 rc.cpp:5408
+msgid "Normal font for contact list"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:233
-#. i18n: ectx: property (toolTip), widget (QSpinBox, WaitSpin)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:236
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, WaitSpin)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:233
-#. i18n: ectx: property (toolTip), widget (QSpinBox, WaitSpin)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:236
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, WaitSpin)
-#: rc.cpp:4122 rc.cpp:4125 rc.cpp:4122 rc.cpp:4125
-msgid "trying"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:202
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5411 rc.cpp:5411
+msgid "Small font for contact list (for status message)"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:280
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4131 rc.cpp:4131
-msgid ""
-"If you get error that Skype was not found, but in fact it is running, check "
-"the instructions at <a "
-"href=\"https://developer.skype.com/Docs/ApiDoc/Skype_API_on_Linux\">https://d"
-"eveloper.skype.com/Docs/ApiDoc/Skype_API_on_Linux</a>.<br /><br />Note that "
-"only the dynamic linked Skype binary is supported."
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:207
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5414 rc.cpp:5414
+msgid "Color for group name."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:316
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, groupBox3_2)
-#: rc.cpp:4137 rc.cpp:4137
-msgid ""
-"Each application that wants to use Skype must provide its name to it, and "
-"the user is asked whether to allow said application to access Skype.<br>By "
-"default, kopete provides kopete as its name, but if you suspect another "
-"application is accessing Skype with this name, you can change the name "
-"Kopete uses here, and then within Skype disallow applications that refer to "
-"themselves as kopete."
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:212
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5417 rc.cpp:5417
+msgid "Animate contact list on contact list changes."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:325
-#. i18n: ectx: property (text), widget (QCheckBox, AuthorCheck)
-#: rc.cpp:4143 rc.cpp:4143
-msgid "&Non-standard authorization"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:217
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5420 rc.cpp:5420
+msgid "Fade-in/Fade-out on contact status changes."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:342
-#. i18n: ectx: property (toolTip), widget (QGroupBox, BusGroup)
-#: rc.cpp:4146 rc.cpp:4146
-msgid "What bus do you want to use"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:222
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5423 rc.cpp:5423
+msgid "Fold-in/Fold-out on contact status changes."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:345
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, BusGroup)
-#: rc.cpp:4149 rc.cpp:4149
-msgid ""
-"Which D-Bus do you want to use to connect to Skype?<br>Session: Your own, "
-"other people cannot use it (use --use-session-dbus to start Skype on that "
-"bus.)<br>System: Shared by all people on the same computer. This one is used "
-"by default by Skype.<br>You have to specify the same D-Bus used by Skype."
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:227
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5426 rc.cpp:5426
+msgid "Auto-hide contact list after a while."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:348
-#. i18n: ectx: property (title), widget (QGroupBox, BusGroup)
-#: rc.cpp:4152 rc.cpp:4152
-msgid "Bus"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:232
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5429 rc.cpp:5429
+msgid "Auto-hide vertical scrollbar in contact list after a while."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:354
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton4)
-#: rc.cpp:4155 rc.cpp:4155
-msgid "Sessi&on"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:237
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5432 rc.cpp:5432
+msgid "Auto-hide timeout"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:374
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:4161 rc.cpp:4161
-msgid ""
-"Note that Kopete will freeze while Skype asks you if it can allow Kopete to "
-"access it. This is normal, and if you allow it forever (check that "
-"\"Remember\" checkbox in Skype's dialog), it will not happen again.<br /><br "
-"/>The 'System Bus' option is not yet supported by Skype"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:244
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5435 rc.cpp:5435
+msgid "Show offline users in contact list."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:404
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:4164 rc.cpp:4164
-msgid "&Activity"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:249
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5438 rc.cpp:5438
+msgid "Show empty groups in contact list."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:410
-#. i18n: ectx: property (toolTip), widget (QCheckBox, HitchCheck)
-#: rc.cpp:4167 rc.cpp:4167
-msgid "Show all incoming messages"
+#. i18n: file: libkopete/kopeteappearancesettings.kcfg:255
+#. i18n: ectx: label, entry, group (ContactList)
+#: rc.cpp:5441 rc.cpp:5441
+msgid "Show identities in status bar instead of accounts."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:413
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, HitchCheck)
-#: rc.cpp:4170 rc.cpp:4170
-msgid ""
-"This will show all incoming Skype messages. If this is off, they are showed "
-"only if the message belongs to chat that is started by kopete."
+#. i18n: file: kopete/kopeteui.rc:5
+#. i18n: ectx: Menu (file)
+#: rc.cpp:5454 rc.cpp:5454
+msgid "&File"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:416
-#. i18n: ectx: property (text), widget (QCheckBox, HitchCheck)
-#: rc.cpp:4173 rc.cpp:4173
-msgid "Show all incoming &messages"
-msgstr ""
+#. i18n: file: kopete/kopeteui.rc:54
+#. i18n: ectx: ToolBar (quickSearchBar)
+#: rc.cpp:5466 kopete/kopetewindow.cpp:473 rc.cpp:5466
+msgid "Quick Search Bar"
+msgstr "Bar Chwilio Brys"
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:426
-#. i18n: ectx: property (toolTip), widget (QCheckBox, MarkCheck)
-#: rc.cpp:4176 rc.cpp:4176
-msgid ""
-"This will mark incoming messages as read, so if you have Skype set up not to "
-"automatically pop-up chats, it will not flash the exclamation icon."
-msgstr ""
+#. i18n: file: kopete/kopeteui.rc:65
+#. i18n: ectx: Menu (contact_popup_actions)
+#: rc.cpp:5469 rc.cpp:5469
+msgid "&Other Actions"
+msgstr "Gweithredoedd &eraill"
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:429
-#. i18n: ectx: property (text), widget (QCheckBox, MarkCheck)
-#: rc.cpp:4179 rc.cpp:4179
-msgid "Mar&k as read"
+#. i18n: file: kopete/kopeteui.rc:72
+#. i18n: ectx: Menu (contact_popup_groups)
+#: rc.cpp:5472 rc.cpp:5472
+msgid "&Groups"
+msgstr "&Grwpiau"
+
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:20
+#. i18n: ectx: Menu (format)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:14
+#. i18n: ectx: Menu (format)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:20
+#. i18n: ectx: Menu (format)
+#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:14
+#. i18n: ectx: Menu (format)
+#: rc.cpp:5478 rc.cpp:5514 rc.cpp:5478 rc.cpp:5514
+msgid "&Format"
+msgstr "&Fformat"
+
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:25
+#. i18n: ectx: Menu (tabs)
+#: rc.cpp:5481 kopete/config/chatwindow/chatwindowconfig.cpp:227 rc.cpp:5481
+msgid "&Tabs"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:439
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ScanCheck)
-#: rc.cpp:4182 rc.cpp:4182
-msgid ""
-"If this is checked, Kopete will ask Skype on login if it has any messages "
-"that have not been shown, and if so, will show them. This is useful if you "
-"start Kopete later than Skype, and Skype is configured not to show incoming "
-"messages."
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:51
+#. i18n: ectx: ToolBar (chatToolBar)
+#: rc.cpp:5490 rc.cpp:5490
+msgid "Chat Toolbar"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:442
-#. i18n: ectx: property (text), widget (QCheckBox, ScanCheck)
-#: rc.cpp:4185 rc.cpp:4185
-msgid "Scan f&or unread"
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:67
+#. i18n: ectx: ToolBar (formatToolBar)
+#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:32
+#. i18n: ectx: ToolBar (formatToolBar)
+#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:67
+#. i18n: ectx: ToolBar (formatToolBar)
+#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:32
+#. i18n: ectx: ToolBar (formatToolBar)
+#: rc.cpp:5496 rc.cpp:5508 rc.cpp:5496 rc.cpp:5508
+msgid "Format Toolbar"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:452
-#. i18n: ectx: property (toolTip), widget (QCheckBox, CallCheck)
-#: rc.cpp:4188 rc.cpp:4188
-msgid "Show call control window for all calls"
-msgstr ""
+#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:4
+#. i18n: ectx: Menu (format)
+#: rc.cpp:5499 rc.cpp:5499
+msgid "F&ormat"
+msgstr "&Fformat"
+
+#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:10
+#. i18n: ectx: Menu (alignment)
+#: rc.cpp:5502 rc.cpp:5502
+msgid "&Alignment"
+msgstr "&Aliniad"
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:455
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, CallCheck)
-#: rc.cpp:4191 rc.cpp:4191
-msgid ""
-"This will show a call control window for every call (both incoming and "
-"outgoing). If it is off, you can call from Kopete, but you have to control "
-"that call from Skype."
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:20
+#. i18n: ectx: label
+#: rc.cpp:5532 rc.cpp:5532
+msgid "Emitted when the chat window style has changed."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:458
-#. i18n: ectx: property (text), widget (QCheckBox, CallCheck)
-#: rc.cpp:4194 rc.cpp:4194
-msgid "S&how call control (this will also hide Skype client call dialog)"
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:24
+#. i18n: ectx: label
+#: rc.cpp:5535 rc.cpp:5535
+msgid "Emitted when ChatWindowStyle variant has changed."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:486
-#. i18n: ectx: property (toolTip), widget (QCheckBox, AutoCloseCallCheck)
-#: rc.cpp:4197 rc.cpp:4197
-msgid "Auto close the call control window"
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:31
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5538 rc.cpp:5538
+msgid "Name of a Adium/Kopete chat window style."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:489
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, AutoCloseCallCheck)
-#: rc.cpp:4200 rc.cpp:4200
-msgid ""
-"This will close the call control window automatically when the call finishes"
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:36
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5541 rc.cpp:5541
+msgid "Relative path to a CSS variant for the current style."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:492
-#. i18n: ectx: property (text), widget (QCheckBox, AutoCloseCallCheck)
-#: rc.cpp:4203 rc.cpp:4203
-msgid "Autoc&lose"
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:39
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5544 rc.cpp:5544
+msgid "Group consecutive messages from the same user as one block."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:544
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:4206 rc.cpp:4206
-msgid "Timeout:"
+#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:43
+#. i18n: ectx: label, entry, group (Appearance)
+#: rc.cpp:5547 rc.cpp:5547
+msgid "Use a compact variant of the chat style for chatrooms."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:607
-#. i18n: ectx: property (toolTip), widget (QCheckBox, PingsCheck)
-#: rc.cpp:4212 rc.cpp:4212
-msgid ""
-"If this is enabled, Kopete keeps track of whether or not Skype is running."
+#. i18n: file: kopete/groupkabcselectorwidget.ui:31
+#. i18n: ectx: property (text), widget (QLabel, groupLabel)
+#: rc.cpp:5582 rc.cpp:5582
+msgid "&Group:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:610
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, PingsCheck)
-#: rc.cpp:4215 rc.cpp:4215
-msgid ""
-"This keeps track of whether Skype is running. Turning this off only makes "
-"sense it you are trying to get non-flooded debug output."
+#. i18n: file: kopete/groupkabcselectorwidget.ui:44
+#. i18n: ectx: property (text), widget (QLabel, kabcLabel)
+#: rc.cpp:5585 rc.cpp:5585
+msgid "Address book entry:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:613
-#. i18n: ectx: property (text), widget (QCheckBox, PingsCheck)
-#: rc.cpp:4218 rc.cpp:4218
-msgid "Pi&ng Skype"
+#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:98
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:145
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:98
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:145
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:5588 rc.cpp:5762 rc.cpp:6193 rc.cpp:5588 rc.cpp:5762 rc.cpp:6193
+msgid "Title:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:623
-#. i18n: ectx: property (toolTip), widget (QCheckBox, LeaveCheck)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:629
-#. i18n: ectx: property (text), widget (QCheckBox, LeaveCheck)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:623
-#. i18n: ectx: property (toolTip), widget (QCheckBox, LeaveCheck)
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:629
-#. i18n: ectx: property (text), widget (QCheckBox, LeaveCheck)
-#: rc.cpp:4221 rc.cpp:4227 rc.cpp:4221 rc.cpp:4227
-msgid "Do not leave a chat on window exit"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, ChatWindowConfig_Style)
+#: rc.cpp:5594 rc.cpp:5594
+msgid "Chat Window Appearance"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:626
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, LeaveCheck)
-#: rc.cpp:4224 rc.cpp:4224
-msgid ""
-"Do not leave a chat when the chat window is closed. Makes a difference only "
-"with multi-user chats: if it is checked, you will continue receiving "
-"messages from that chat even after closing the window."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:34
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:5597 rc.cpp:5597
+msgid "Display"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:656
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:4230 rc.cpp:4230
-msgid "&Calls"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:40
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_groupConsecutiveMessages)
+#: rc.cpp:5600 rc.cpp:5600
+msgid "Group consecuti&ve messages"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:662
-#. i18n: ectx: property (text), widget (QCheckBox, StartCallCommandCheck)
-#: rc.cpp:4233 rc.cpp:4233
-msgid "E&xecute before call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:47
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useCompact)
+#: rc.cpp:5603 rc.cpp:5603
+msgid "Co&mpact style in chatrooms"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:717
-#. i18n: ectx: property (toolTip), widget (QCheckBox, WaitForStartCallCommandCheck)
-#: rc.cpp:4236 rc.cpp:4236
-msgid ""
-"This will wait before making/accepting the call for the command to finish."
-msgstr ""
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:63
+#. i18n: ectx: property (title), widget (QGroupBox, stylesGroupBox)
+#: rc.cpp:5606 rc.cpp:5606
+msgid "Styles"
+msgstr "Arddulliau"
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:721
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, WaitForStartCallCommandCheck)
-#: rc.cpp:4239 rc.cpp:4239
-msgid ""
-"This will wait for the command to finish before accepting/making the "
-"call.<br>\n"
-"Note that kopete will freeze whilst waiting."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:94
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:5609 rc.cpp:5609
+msgid "Style variant:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:724
-#. i18n: ectx: property (text), widget (QCheckBox, WaitForStartCallCommandCheck)
-#: rc.cpp:4243 rc.cpp:4243
-msgid "Wait for fi&nish"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:124
+#. i18n: ectx: property (toolTip), widget (KPushButton, btnGetStyles)
+#: rc.cpp:5612 rc.cpp:5612
+msgid "Get new Chat Window styles over the Internet"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:733
-#. i18n: ectx: property (text), widget (QCheckBox, EndCallCommandCheck)
-#: rc.cpp:4246 rc.cpp:4246
-msgid "Execute after call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:127
+#. i18n: ectx: property (text), widget (KPushButton, btnGetStyles)
+#: rc.cpp:5615 rc.cpp:5615
+msgid "&Get New..."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:791
-#. i18n: ectx: property (toolTip), widget (QCheckBox, OnlyLastCallCommandCheck)
-#: rc.cpp:4249 rc.cpp:4249
-msgid ""
-"Usually this makes no difference, but if there are some other calls on hold, "
-"it is executed only for the most recently ended one."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:140
+#. i18n: ectx: property (text), widget (KPushButton, installButton)
+#: rc.cpp:5618 rc.cpp:5618
+msgid "&Install..."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:794
-#. i18n: ectx: property (text), widget (QCheckBox, OnlyLastCallCommandCheck)
-#: rc.cpp:4252 rc.cpp:4252
-msgid "Onl&y for last call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_tab.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:5624 rc.cpp:5624
+msgid "For each tab"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypeeditaccountbase.ui:803
-#. i18n: ectx: property (text), widget (QCheckBox, IncomingCommandCheck)
-#: rc.cpp:4255 rc.cpp:4255
-msgid "Execute on inco&ming call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_tab.ui:23
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowContactName)
+#: rc.cpp:5627 rc.cpp:5627
+msgid "Show contact name"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:6
-#. i18n: ectx: property (windowTitle), widget (QWidget, SkypeCallDialogBase)
-#: rc.cpp:4258 rc.cpp:4258
-msgid "Skype Call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_tab.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_HoverClose)
+#: rc.cpp:5630 rc.cpp:5630
+msgid "Show close button"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:14
-#. i18n: ectx: property (toolTip), widget (QLabel, NameLabel)
-#: rc.cpp:4261 rc.cpp:4261
-msgid "Name(s) of Participant(s)"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_emoticons.ui:22
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_useEmoticons)
+#: rc.cpp:5633 rc.cpp:5633
+msgid ""
+"If this is checked, the text representation of emoticons in messages will be "
+"replaced by an image"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:17
-#. i18n: ectx: property (whatsThis), widget (QLabel, NameLabel)
-#: rc.cpp:4264 rc.cpp:4264
-msgid ""
-"Name of the other participant in the call (or a list of names if it is a "
-"conference call.)"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_emoticons.ui:25
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useEmoticons)
+#: rc.cpp:5636 rc.cpp:5636
+msgid "U&se the following emoticon theme:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:52
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:55
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:90
-#. i18n: ectx: property (toolTip), widget (QLabel, TimeLabel)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:52
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel2)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:55
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:90
-#. i18n: ectx: property (toolTip), widget (QLabel, TimeLabel)
-#: rc.cpp:4276 rc.cpp:4279 rc.cpp:4291 rc.cpp:4276 rc.cpp:4279 rc.cpp:4291
-msgid "Total time elapsed."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_emoticons.ui:48
+#. i18n: ectx: property (text), widget (QPushButton, btnManageThemes)
+#: rc.cpp:5639 rc.cpp:5639
+msgid "&Manage Emoticons..."
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:58
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4282 rc.cpp:4282
-msgid "Time:"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:17
+#. i18n: ectx: property (title), widget (KButtonGroup, kcfg_chatFontSelection)
+#: rc.cpp:5642 rc.cpp:5642
+msgid "Fonts"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:71
-#. i18n: ectx: property (toolTip), widget (QLabel, CreditLabel)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:74
-#. i18n: ectx: property (whatsThis), widget (QLabel, CreditLabel)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:135
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:30
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3_2)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:73
+#. i18n: ectx: property (toolTip), widget (KFontRequester, kcfg_chatFont)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:99
 #. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:138
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:71
-#. i18n: ectx: property (toolTip), widget (QLabel, CreditLabel)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:74
-#. i18n: ectx: property (whatsThis), widget (QLabel, CreditLabel)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:135
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:30
+#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3_2)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:73
+#. i18n: ectx: property (toolTip), widget (KFontRequester, kcfg_chatFont)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:99
 #. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:138
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#: rc.cpp:4285 rc.cpp:4288 rc.cpp:4300 rc.cpp:4303 rc.cpp:4285 rc.cpp:4288
-#: rc.cpp:4300 rc.cpp:4303
-msgid "SkypeOut credits left"
-msgstr ""
-
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:93
-#. i18n: ectx: property (whatsThis), widget (QLabel, TimeLabel)
-#: rc.cpp:4294 rc.cpp:4294
+#: rc.cpp:5645 rc.cpp:5661 rc.cpp:5671 rc.cpp:5645 rc.cpp:5661 rc.cpp:5671
 msgid ""
-"Total length of the call/<br />(i.e. both time speaking and time on hold.)"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Base font in the chat "
+"window</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:122
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:78
-#. i18n: ectx: property (text), widget (QLabel, textLabel14)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:122
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:78
-#. i18n: ectx: property (text), widget (QLabel, textLabel14)
-#: rc.cpp:4297 rc.cpp:4686 rc.cpp:4297 rc.cpp:4686
-msgid "Status:"
-msgstr "Cyflwr:"
-
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:141
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:33
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:102
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:4306 rc.cpp:4306
-msgid "SkypeOut credits:"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:33
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:102
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:5652 rc.cpp:5678 rc.cpp:5652 rc.cpp:5678
+msgid "Base &font:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:174
-#. i18n: ectx: property (toolTip), widget (QPushButton, AcceptButton)
-#: rc.cpp:4309 rc.cpp:4309
-msgid "Accept call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:43
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton)
+#: rc.cpp:5655 rc.cpp:5655
+msgid "Use system font"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:177
-#. i18n: ectx: property (whatsThis), widget (QPushButton, AcceptButton)
-#: rc.cpp:4312 rc.cpp:4312
-msgid "Accept incoming call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:50
+#. i18n: ectx: property (text), widget (QRadioButton, radioButton_2)
+#: rc.cpp:5658 rc.cpp:5658
+msgid "Use custom font:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:190
-#. i18n: ectx: property (toolTip), widget (QPushButton, HangButton)
-#: rc.cpp:4318 rc.cpp:4318
-msgid "Finish the call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:112
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_chatTextColor)
+#: rc.cpp:5681 rc.cpp:5681
+msgid "Base font color for the chat window"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:193
-#. i18n: ectx: property (whatsThis), widget (QPushButton, HangButton)
-#: rc.cpp:4321 rc.cpp:4321
-msgid "Terminate the call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:122
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:5684 rc.cpp:5684
+msgid "&Highlight foreground:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:196
-#. i18n: ectx: property (text), widget (QPushButton, HangButton)
-#: rc.cpp:4324 rc.cpp:4324
-msgid "H&ang up"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:132
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_highlightForegroundColor)
+#: rc.cpp:5687 rc.cpp:5687
+msgid "Foreground color for highlighted messages"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:203
-#. i18n: ectx: property (toolTip), widget (QPushButton, HoldButton)
-#: rc.cpp:4327 rc.cpp:4327
-msgid "Hold the call"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:142
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:5690 rc.cpp:5690
+msgid "&Background color:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:206
-#. i18n: ectx: property (whatsThis), widget (QPushButton, HoldButton)
-#: rc.cpp:4330 rc.cpp:4330
-msgid "Interrupt the call for a moment and resume (or hang up) later."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:152
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_chatBackgroundColor)
+#: rc.cpp:5693 rc.cpp:5693
+msgid "Color for the background of the chat window"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:209
-#. i18n: ectx: property (text), widget (QPushButton, HoldButton)
-#: rc.cpp:4333 rc.cpp:4333
-msgid "H&old"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:169
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:5696 rc.cpp:5696
+msgid "Highlight bac&kground:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:216
-#. i18n: ectx: property (toolTip), widget (QPushButton, ChatButton)
-#: rc.cpp:4336 rc.cpp:4336
-msgid "Open chat to the person."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:179
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_highlightBackgroundColor)
+#: rc.cpp:5699 rc.cpp:5699
+msgid "Background color for highlighted messages"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:219
-#. i18n: ectx: property (whatsThis), widget (QPushButton, ChatButton)
-#: rc.cpp:4339 rc.cpp:4339
-msgid "Open chat to the person with whom you are talking."
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:189
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:5702 rc.cpp:5702
+msgid "&Link color:"
 msgstr ""
 
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:222
-#. i18n: ectx: property (text), widget (QPushButton, ChatButton)
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_Chat)
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:222
-#. i18n: ectx: property (text), widget (QPushButton, ChatButton)
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_Chat)
-#: rc.cpp:4342 rc.cpp:5754 rc.cpp:4342 rc.cpp:5754
-msgid "Chat"
-msgstr "Sgwrsio"
-
-#. i18n: file: protocols/skype/ui/skypecalldialogbase.ui:232
-#. i18n: ectx: property (text), widget (QPushButton, VideoButton)
-#: rc.cpp:4345 rc.cpp:4345
-msgid "Start/Stop Video"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:199
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_chatLinkColor)
+#: rc.cpp:5705 rc.cpp:5705
+msgid "Color used for links in chats"
 msgstr ""
 
-#. i18n: file: protocols/skype/skypeui.rc:12
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:46
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:29
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:24
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/kopeteui.rc:47
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: protocols/skype/skypeui.rc:12
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:46
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:29
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:24
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: kopete/kopeteui.rc:47
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:4354 rc.cpp:6197 rc.cpp:6218 rc.cpp:6230 rc.cpp:6299 rc.cpp:4354
-#: rc.cpp:6197 rc.cpp:6218 rc.cpp:6230 rc.cpp:6299
-msgid "Main Toolbar"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:219
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:5708 rc.cpp:5708
+msgid "Formatting Overrides"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:104
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:4363 rc.cpp:4363
-msgid "Picture"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:225
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_chatBgOverride)
+#: rc.cpp:5711 rc.cpp:5711
+msgid "Do not show user specified back&ground color"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:138
-#. i18n: ectx: property (text), widget (QLabel, lblQQId)
-#: rc.cpp:4369 rc.cpp:4369
-msgid "QQ ID:"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:232
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_chatFgOverride)
+#: rc.cpp:5714 rc.cpp:5714
+msgid "&Do not show user specified foreground color"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:184
-#. i18n: ectx: property (text), widget (QLabel, lblAge)
-#: rc.cpp:4375 rc.cpp:4375
-msgid "Age:"
+#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:239
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_chatRtfOverride)
+#: rc.cpp:5717 rc.cpp:5717
+msgid "Do not show user specified &rich text"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:281
-#. i18n: ectx: property (text), widget (QLabel, lblSignature)
-#: rc.cpp:4390 rc.cpp:4390
-msgid "Signature:"
-msgstr ""
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:140
+#. i18n: ectx: attribute (title), widget (QWidget, deviceTab)
+#: rc.cpp:5723 rc.cpp:5723
+msgid "Device"
+msgstr "Dyfais"
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:379
-#. i18n: ectx: property (text), widget (QLabel, lblZip)
-#: rc.cpp:4402 rc.cpp:4402
-msgid "Zip code:"
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:157
+#. i18n: ectx: property (text), widget (QLabel, inputLabel)
+#: rc.cpp:5729 rc.cpp:5729
+msgid "Input:"
+msgstr "Mewnbwn:"
+
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:164
+#. i18n: ectx: property (text), widget (QLabel, standardLabel)
+#: rc.cpp:5732 rc.cpp:5732
+msgctxt ""
+"Label of a combo box containing video standards like PAL-B, NTSC-M, etc"
+msgid "Standard:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:421
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:4414 rc.cpp:4414
-msgid "Phone Numbers"
-msgstr "Rhifau ffôn"
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:190
+#. i18n: ectx: property (toolTip), widget (KComboBox, mDeviceKComboBox)
+#: rc.cpp:5735 rc.cpp:5735
+msgid "Select the device to take video input from"
+msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:476
-#. i18n: ectx: property (text), widget (QLabel, lblPhoneQQ)
-#: rc.cpp:4423 rc.cpp:4423
-msgid "QQ:"
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:203
+#. i18n: ectx: property (toolTip), widget (KComboBox, mInputKComboBox)
+#: rc.cpp:5738 rc.cpp:5738
+msgid "Select from multiple inputs provided by some devices"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:553
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4429 rc.cpp:4429
-msgid "Rat"
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:216
+#. i18n: ectx: property (toolTip), widget (KComboBox, mStandardKComboBox)
+#: rc.cpp:5741 rc.cpp:5741
+msgid "Select the video standard to use"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:558
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4432 rc.cpp:4432
-msgid "Ox"
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:244
+#. i18n: ectx: attribute (title), widget (QWidget, controlsTab)
+#: rc.cpp:5744 rc.cpp:5744
+msgid "Sliders"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:563
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4435 rc.cpp:4435
-msgid "Tiger"
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:270
+#. i18n: ectx: attribute (title), widget (QWidget, optionsTab)
+#: rc.cpp:5747 rc.cpp:5747
+msgid "Optio&ns"
+msgstr "De&wisiadau"
+
+#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:319
+#. i18n: ectx: attribute (title), widget (QWidget, actionsTab)
+#: rc.cpp:5750 rc.cpp:5750
+msgid "Actions"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:568
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4438 rc.cpp:4438
-msgid "Rabbit"
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:60
+#. i18n: ectx: property (text), widget (QPushButton, pbAddGroup)
+#: rc.cpp:5759 rc.cpp:5759
+msgid "Add Group"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:573
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4441 rc.cpp:4441
-msgid "Dragon"
+#. i18n: file: kopete/config/status/statusconfig_manager.ui:111
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:5765 rc.cpp:5765
+msgid "Category:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:578
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4444 rc.cpp:4444
-msgid "Snake"
+#. i18n: file: kopete/config/status/statusconfig_general.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:5771 rc.cpp:5771
+msgid "Online Status Menu"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:583
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4447 rc.cpp:4447
-msgid "Horse"
+#. i18n: file: kopete/config/status/statusconfig_general.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:5774 rc.cpp:5774
+msgid "Protocol's online status menu:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:588
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4450 rc.cpp:4450
-msgid "Ram"
+#. i18n: file: kopete/config/status/statusconfig_general.ui:31
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_protocolStatusMenuType)
+#: rc.cpp:5777 rc.cpp:5777
+msgid "As Global Status Menu"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:593
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4453 rc.cpp:4453
-msgid "Monkey"
+#. i18n: file: kopete/config/status/statusconfig_general.ui:36
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_protocolStatusMenuType)
+#: rc.cpp:5780 rc.cpp:5780
+msgid "Only Statuses With Matching Category"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:598
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4456 rc.cpp:4456
-msgid "Rooster"
+#. i18n: file: kopete/config/status/statusconfig_general.ui:41
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_protocolStatusMenuType)
+#: rc.cpp:5783 rc.cpp:5783
+msgid "All Statuses With Parent Category"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:603
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4459 rc.cpp:4459
-msgid "Dog"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, AppearanceConfig_Advanced)
+#: rc.cpp:5786 rc.cpp:5786
+msgid "Contact List Advanced"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:608
-#. i18n: ectx: property (text), item, widget (QComboBox, cbZodiac)
-#: rc.cpp:4462 rc.cpp:4462
-msgid "Pig"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:26
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:5789 rc.cpp:5789
+msgid "Contact List Animations"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:635
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:4471 rc.cpp:4471
-msgid "Graduate:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:38
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListAnimateChange)
+#: rc.cpp:5792 rc.cpp:5792
+msgid "A&nimate changes to contact list items"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:642
-#. i18n: ectx: property (text), widget (QLabel, lblZodiac)
-#: rc.cpp:4474 rc.cpp:4474
-msgid "Zodiac:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:51
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListFading)
+#: rc.cpp:5795 rc.cpp:5795
+msgid "Fade in / out contacts as the&y appear / disappear"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:670
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4480 rc.cpp:4480
-msgid "Aries"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:64
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListFolding)
+#: rc.cpp:5798 rc.cpp:5798
+msgid "Fo&ld in / out contacts as they appear / disappear"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:675
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4483 rc.cpp:4483
-msgid "Taurus"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:74
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:5801 rc.cpp:5801
+msgid "Contact List Auto-Hide"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:680
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4486 rc.cpp:4486
-msgid "Gemini"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListAutoHide)
+#: rc.cpp:5804 rc.cpp:5804
+msgid "A&uto-hide contact list"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:685
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4489 rc.cpp:4489
-msgid "Cancer"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:100
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_contactListAutoHideVScroll)
+#: rc.cpp:5807 rc.cpp:5807
+msgid ""
+"Since vertical scrollbars occupy space, we introduced this auto-hide "
+"feature. The vertical scrollbar will not be available until you move your "
+"mouse over the contact list.<br>\n"
+"(<b>Disabled</b> if \"<b>Hide vertical scrollbar</b>\" option is selected "
+"above.)"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:690
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4492 rc.cpp:4492
-msgid "Leo"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:103
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListAutoHideVScroll)
+#: rc.cpp:5811 rc.cpp:5811
+msgid "Auto-hide vertical &scrollbar"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:695
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4495 rc.cpp:4495
-msgid "Virgo"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:143
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_contactListAutoHideTimeout)
+#: rc.cpp:5814 rc.cpp:5814
+msgid "The timeout value for both contact list and scrollbar auto-hiding."
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:700
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4498 rc.cpp:4498
-msgid "Libra"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:146
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_contactListAutoHideTimeout)
+#: rc.cpp:5817 rc.cpp:5817
+msgid " Sec"
+msgstr " eil"
+
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:165
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:5820 rc.cpp:5820
+msgid "after the cursor leaves the window"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:705
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4501 rc.cpp:4501
-msgid "Scorpio"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:177
+#. i18n: ectx: property (title), widget (KButtonGroup, kcfg_contactListResizeAnchor)
+#: rc.cpp:5823 rc.cpp:5823
+msgid ""
+"&Automatically resize contact list window to fit number of contacts onscreen"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:710
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4504 rc.cpp:4504
-msgid "Sagittarius"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:186
+#. i18n: ectx: property (text), widget (QRadioButton, top)
+#: rc.cpp:5826 rc.cpp:5826
+msgid "Anchor resizing at &top"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:715
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4507 rc.cpp:4507
-msgid "Capricorn"
+#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:193
+#. i18n: ectx: property (text), widget (QRadioButton, bottom)
+#: rc.cpp:5829 rc.cpp:5829
+msgid "Anchor resizing at &bottom"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:720
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4510 rc.cpp:4510
-msgid "Aquarius"
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_contactListUseCustomFont)
+#: rc.cpp:5832 rc.cpp:5832
+msgid "C&ustom Fonts"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:725
-#. i18n: ectx: property (text), item, widget (QComboBox, cbHoroscope)
-#: rc.cpp:4513 rc.cpp:4513
-msgid "Pisces"
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:35
+#. i18n: ectx: property (text), widget (QLabel, mNormalFontLabel)
+#: rc.cpp:5835 rc.cpp:5835
+msgid "Base font:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:733
-#. i18n: ectx: property (text), widget (QLabel, lblHoroscope)
-#: rc.cpp:4516 rc.cpp:4516
-msgid "Horoscope:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:58
+#. i18n: ectx: property (text), widget (QLabel, mSmallFontLabel)
+#: rc.cpp:5838 rc.cpp:5838
+msgid "Small font:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqvcard.ui:817
-#. i18n: ectx: property (text), widget (QLabel, lblIntroduction)
-#: rc.cpp:4519 rc.cpp:4519
-msgid "Introduction:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:90
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_greyIdleMetaContacts)
+#: rc.cpp:5844 rc.cpp:5844
+msgid "Tint &idle contacts:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqaddui.ui:36
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4528 rc.cpp:4528
-msgid "&Contact name:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:132
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#: rc.cpp:5847 rc.cpp:5847
+msgid "&Group names:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqaddui.ui:58
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/groupwise/gwaddui.ui:68
-#. i18n: ectx: property (title), widget (QButtonGroup)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:58
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: protocols/groupwise/gwaddui.ui:68
-#. i18n: ectx: property (title), widget (QButtonGroup)
-#: rc.cpp:4537 rc.cpp:5055 rc.cpp:4537 rc.cpp:5055
-msgid "Contact Type"
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:66
+#. i18n: ectx: property (whatsThis), widget (QToolButton, tbDown)
+#: rc.cpp:5850 rc.cpp:5850
+msgid "Use this arrow to reorder the items in the list."
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqaddui.ui:70
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_rbEcho)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:73
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_rbEcho)
-#. i18n: file: protocols/groupwise/gwaddui.ui:85
-#. i18n: ectx: property (toolTip), widget (QRadioButton)
-#. i18n: file: protocols/groupwise/gwaddui.ui:88
-#. i18n: ectx: property (whatsThis), widget (QRadioButton)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:70
-#. i18n: ectx: property (toolTip), widget (QRadioButton, m_rbEcho)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:73
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, m_rbEcho)
-#. i18n: file: protocols/groupwise/gwaddui.ui:85
-#. i18n: ectx: property (toolTip), widget (QRadioButton)
-#. i18n: file: protocols/groupwise/gwaddui.ui:88
-#. i18n: ectx: property (whatsThis), widget (QRadioButton)
-#: rc.cpp:4540 rc.cpp:4543 rc.cpp:5061 rc.cpp:5064 rc.cpp:4540 rc.cpp:4543
-#: rc.cpp:5061 rc.cpp:5064
-msgid ""
-"Hey look!  Only one option.  Could you please make this a dropdown and add "
-"Null?"
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:69
+#. i18n: ectx: property (text), widget (QToolButton, tbDown)
+#: rc.cpp:5853 rc.cpp:5853
+msgid "v"
+msgstr "v"
+
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:76
+#. i18n: ectx: property (text), widget (QToolButton, tbUp)
+#: rc.cpp:5856 rc.cpp:5856
+msgid "^"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqaddui.ui:76
-#. i18n: ectx: property (text), widget (QRadioButton, m_rbEcho)
-#. i18n: file: protocols/groupwise/gwaddui.ui:79
-#. i18n: ectx: property (text), widget (QRadioButton)
-#. i18n: file: protocols/qq/ui/qqaddui.ui:76
-#. i18n: ectx: property (text), widget (QRadioButton, m_rbEcho)
-#. i18n: file: protocols/groupwise/gwaddui.ui:79
-#. i18n: ectx: property (text), widget (QRadioButton)
-#: rc.cpp:4546 rc.cpp:5058 rc.cpp:4546 rc.cpp:5058
-msgid "&Echo"
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:83
+#. i18n: ectx: property (text), widget (QToolButton, tbRemove)
+#: rc.cpp:5859 rc.cpp:5859
+msgid "<"
+msgstr "<"
+
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:90
+#. i18n: ectx: property (whatsThis), widget (QToolButton, tbAdd)
+#: rc.cpp:5862 rc.cpp:5862
+msgid "Use this arrows to add or remove items to your contact tooltips."
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, QQEditAccountUI)
-#: rc.cpp:4549 rc.cpp:4549
-msgid "Account Preferences - QQ"
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:93
+#. i18n: ectx: property (text), widget (QToolButton, tbAdd)
+#: rc.cpp:5865 rc.cpp:5865
+msgid ">"
+msgstr ">"
+
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:138
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:5868 rc.cpp:5868
+msgid ""
+"Using the arrow buttons, put on the right the items you want to see in the "
+"contact tooltips. You can then sort them."
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:107
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:123
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_login)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:107
-#. i18n: ectx: property (toolTip), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:123
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_login)
-#: rc.cpp:4558 rc.cpp:4567 rc.cpp:4558 rc.cpp:4567
-msgid "The user ID of the QQ contact you would like to use."
+#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:151
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:5871 rc.cpp:5871
+msgid "<b>Here you can customize the contact tooltips</b>"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:110
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:126
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_login)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:110
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel1_3)
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:126
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_login)
-#: rc.cpp:4561 rc.cpp:4570 rc.cpp:4561 rc.cpp:4570
-msgid ""
-"The user ID of the QQ contact you would like to use.  This should be in the "
-"form of a valid E-mail address."
+#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:5874 rc.cpp:5874
+msgid "Layout name:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:113
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1_3)
-#: rc.cpp:4564 rc.cpp:4564
-msgid "&QQ ID:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, AppearanceConfig_ContactList)
+#: rc.cpp:5883 rc.cpp:5883
+msgid "Contact List Appearance"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:203
-#. i18n: ectx: property (text), widget (QPushButton, buttonVCard)
-#: rc.cpp:4579 rc.cpp:4579
-msgid "View && Update my vCard"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:28
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:5886 rc.cpp:5886
+msgid "Group sorting:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:250
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:4585 rc.cpp:4585
-msgid ""
-"To connect to the QQ network, you will need a QQ ID.\n"
-"\n"
-"If you do not currently have an ID, please create one."
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:42
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:88
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:42
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:88
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
+#: rc.cpp:5889 rc.cpp:5898 rc.cpp:5889 rc.cpp:5898
+msgid "Manual"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:454
-#. i18n: ectx: property (text), widget (QLineEdit, m_serverName)
-#: rc.cpp:4620 rc.cpp:4620
-msgid "tcpconn.tencent.com"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:74
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:5895 rc.cpp:5895
+msgid "Contact sorting:"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:466
-#. i18n: ectx: property (title), widget (QGroupBox, global_settings_page)
-#: rc.cpp:4623 rc.cpp:4623
-msgid "Global QQ Options"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:114
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIconMode)
+#: rc.cpp:5907 rc.cpp:5907
+msgid "Use contact photos &when available"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:487
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:4626 rc.cpp:4626
-msgid "<qt><b>Note:</b> These settings are applicable to all QQ accounts"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:142
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIconBorders)
+#: rc.cpp:5910 rc.cpp:5910
+msgid "Borders"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:503
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, NotifyNewChat)
-#: rc.cpp:4629 rc.cpp:4629
-msgid ""
-"This option will notify you when a contact starts typing their message, "
-"before the message is sent or finished."
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:172
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIconRounded)
+#: rc.cpp:5913 rc.cpp:5913
+msgid "Rounded corners"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:506
-#. i18n: ectx: property (text), widget (QCheckBox, NotifyNewChat)
-#: rc.cpp:4632 rc.cpp:4632
-msgid "Au&tomatically open a chat window when someone starts a conversation"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:187
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_groupContactByGroup)
+#: rc.cpp:5916 rc.cpp:5916
+msgid "Arrange metacontacts by &group"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:533
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel1_4)
-#: rc.cpp:4635 rc.cpp:4635
-msgid ""
-"<qt><p>Indicate when Kopete will download the display pictures of "
-"contacts</p>\n"
-"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
-"It is only downloaded when the user requests it</dd>\n"
-"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
-"conversation socket is opened, i.e. when you open a chat window</dd>\n"
-"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
-"has one.  <b>Note:</b> this will open a socket, and let the user know you "
-"are downloading their picture.</dd></dl>"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:200
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListTreeView)
+#: rc.cpp:5919 rc.cpp:5919
+msgid "Show tree &branch lines"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:536
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:4641 rc.cpp:4641
-msgid "Download the QQ picture:"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:234
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIndentContact)
+#: rc.cpp:5922 rc.cpp:5922
+msgid "In&dent contacts"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:552
-#. i18n: ectx: property (whatsThis), widget (QComboBox, DownloadPicture)
-#: rc.cpp:4644 rc.cpp:4644
-msgid ""
-"<qt><p>Indicate when Kopete will download the pictures of contacts</p>\n"
-"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. "
-"It is only downloaded when the user requests it</dd>\n"
-"<dt>When a chat is open</dt><dd>The picture is downloaded when a "
-"conversation socket is opened, i.e. when you open a chat window</dd>\n"
-"<dt>Automatically</dt><dd>Always try to download the picture if the contact "
-"has one.  <b>Note:</b> this will open a socket, and let the user know you "
-"are downloading their picture.</dd></dl>"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:249
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_contactListHideVerticalScrollBar)
+#: rc.cpp:5925 rc.cpp:5925
+msgid "<b>Always</b> disables the vertical scrollbar"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:559
-#. i18n: ectx: property (text), item, widget (QComboBox, DownloadPicture)
-#: rc.cpp:4650 rc.cpp:4650
-msgid "Only Manually"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:252
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListHideVerticalScrollBar)
+#: rc.cpp:5928 rc.cpp:5928
+msgid "&Hide vertical scrollbar"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:564
-#. i18n: ectx: property (text), item, widget (QComboBox, DownloadPicture)
-#: rc.cpp:4653 rc.cpp:4653
-msgid "When a Chat is Open (default)"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:259
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showIdentityIcons)
+#: rc.cpp:5931 rc.cpp:5931
+msgid "Show identities in status bar instead of accounts"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:569
-#. i18n: ectx: property (text), item, widget (QComboBox, DownloadPicture)
-#: rc.cpp:4656 rc.cpp:4656
-msgid "Automatically (read help)"
+#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:274
+#. i18n: ectx: property (text), widget (QPushButton, mEditTooltips)
+#: rc.cpp:5934 rc.cpp:5934
+msgid "Change &Tooltip Contents..."
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:579
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, useCustomEmoticons)
-#: rc.cpp:4659 rc.cpp:4659
-msgid ""
-"QQ Messenger allows users to download and use custom emoticons. If this "
-"option is enabled, Kopete will download and display such emoticons."
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:20
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showEvents)
+#: rc.cpp:5940 rc.cpp:5940
+msgid "Show events in chat &window"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:582
-#. i18n: ectx: property (text), widget (QCheckBox, useCustomEmoticons)
-#: rc.cpp:4662 rc.cpp:4662
-msgid "&Download and show custom emoticons"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_highlightEnabled)
+#: rc.cpp:5943 rc.cpp:5943
+msgid "High&light messages containing your nickname"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:592
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, exportEmoticons)
-#: rc.cpp:4665 rc.cpp:4665
-msgid ""
-"Export all the emoticon themes as custom emoticons (only works for emoticons "
-"in the PNG format)."
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:46
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_spellCheck)
+#: rc.cpp:5946 rc.cpp:5946
+msgid "E&nable automatic spell checking by default"
 msgstr ""
 
-#. i18n: file: protocols/qq/ui/qqeditaccountui.ui:595
-#. i18n: ectx: property (text), widget (QCheckBox, exportEmoticons)
-#: rc.cpp:4668 rc.cpp:4668
-msgid "E&xport the current emoticon theme to users"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:59
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_richTextByDefault)
+#: rc.cpp:5949 rc.cpp:5949
+msgid "E&nable rich text by default"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:22
-#. i18n: ectx: property (text), widget (QLabel, userId)
-#: rc.cpp:4680 rc.cpp:4680
-msgid "USER_ID"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:66
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AlwaysShowTabs)
+#: rc.cpp:5952 rc.cpp:5952
+msgid "&Always show tabs"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:65
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lastName)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:88
-#. i18n: ectx: property (toolTip), widget (QLineEdit, displayName)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:134
-#. i18n: ectx: property (toolTip), widget (QLineEdit, firstName)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:65
-#. i18n: ectx: property (toolTip), widget (QLineEdit, lastName)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:88
-#. i18n: ectx: property (toolTip), widget (QLineEdit, displayName)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:134
-#. i18n: ectx: property (toolTip), widget (QLineEdit, firstName)
-#: rc.cpp:4683 rc.cpp:4689 rc.cpp:4701 rc.cpp:4683 rc.cpp:4689 rc.cpp:4701
-msgid "Change the display name used for this contact"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:73
+#. i18n: ectx: property (title), widget (QGroupBox, interfaceGroup)
+#: rc.cpp:5955 rc.cpp:5955
+msgid "&Interface Preference"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:101
-#. i18n: ectx: property (text), widget (QLabel, status)
-#: rc.cpp:4692 rc.cpp:4692
-msgid "USER_STATUS"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:85
+#. i18n: ectx: property (title), widget (QGroupBox, chatWindowGroup)
+#: rc.cpp:5958 rc.cpp:5958
+msgid "Chat Window Grouping &Policy"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:121
-#. i18n: ectx: property (text), widget (QLabel, lbldisplayName)
-#: rc.cpp:4698 rc.cpp:4698
-msgid "&Display name:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:91
+#. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_chatWindowGroupPolicy)
+#: rc.cpp:5961 rc.cpp:5961
+msgid "Every chat will have its own window."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:172
-#. i18n: ectx: property (text), widget (QLabel, textLabel15)
-#: rc.cpp:4707 rc.cpp:4707
-msgid "Additional properties:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:95
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
+#: rc.cpp:5964 rc.cpp:5964
+msgid "Open All Messages in New Chat Window"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:195
-#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:200
-#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:195
-#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
-#. i18n: file: protocols/groupwise/ui/gwcontactprops.ui:200
-#. i18n: ectx: property (text), widget (QTreeWidget, propsView)
-#: rc.cpp:4710 rc.cpp:4713 rc.cpp:4710 rc.cpp:4713
-msgid "New Column"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:100
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
+#: rc.cpp:5967 rc.cpp:5967
+msgid "Group Messages From Same Account in Same Chat Window"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:4716 rc.cpp:4716
-msgid "&Basic"
-msgstr "&Sylfaenol"
-
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:59
-#. i18n: ectx: property (title), widget (QGroupBox, bg_addMethod)
-#: rc.cpp:4719 rc.cpp:4719
-msgid "Add Using"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:105
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
+#: rc.cpp:5970 rc.cpp:5970
+msgid "Group All Messages in Same Chat Window"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:86
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_userName)
-#: rc.cpp:4722 rc.cpp:4722
-msgid "A full or partial name. Asterisks are ignored"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:110
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
+#: rc.cpp:5973 rc.cpp:5973
+msgid "Group Messages From Contacts in Same Group in Same Chat Window"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:89
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_userName)
-#: rc.cpp:4725 rc.cpp:4725
-msgid "Type some or all of the contact's name.  Matches will be shown below"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:115
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
+#: rc.cpp:5976 rc.cpp:5976
+msgid "Group Messages From Same Metacontact in Same Chat Window"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:96
-#. i18n: ectx: property (text), widget (QRadioButton, rb_userId)
-#: rc.cpp:4728 rc.cpp:4728
-msgid "User &ID:"
-msgstr "Dynod&iad Defnyddiwr:"
-
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:109
-#. i18n: ectx: property (text), widget (QRadioButton, rb_userName)
-#: rc.cpp:4731 rc.cpp:4731
-msgid "Userna&me:"
-msgstr "Enw de&fnyddiwr:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:126
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showDates)
+#: rc.cpp:5979 rc.cpp:5979
+msgid "Show message dates"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:119
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_userId)
-#: rc.cpp:4734 rc.cpp:4734
-msgid "A correct User ID"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:141
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_truncateContactName)
+#: rc.cpp:5982 rc.cpp:5982
+msgid "&Truncate contact name with more characters than:"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:122
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, m_userId)
-#: rc.cpp:4737 rc.cpp:4737
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:187
+#. i18n: ectx: property (whatsThis), widget (QLabel, txtChatViewBufferSize)
+#: rc.cpp:5985 rc.cpp:5985
 msgid ""
-"Use this field to add a contact if you already know the user's exact User ID"
+"Limit the maximum number of lines visible in a chat window to improve speed "
+"for complex layouts."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:133
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:374
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#. i18n: file: protocols/groupwise/ui/gwaddui.ui:133
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:374
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:4740 rc.cpp:6419 rc.cpp:4740 rc.cpp:6419
-msgid "Ad&vanced"
-msgstr "&Uwch"
-
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, GroupWiseContactSearchWidget)
-#: rc.cpp:4743 rc.cpp:4743
-msgid "Search GroupWise Messenger"
+#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:190
+#. i18n: ectx: property (text), widget (QLabel, txtChatViewBufferSize)
+#: rc.cpp:5988 rc.cpp:5988
+msgid "Ma&ximum number of chat window lines:"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:30
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4746 rc.cpp:4746
-msgid "&First name"
-msgstr "&Enw cyntaf"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_Events)
+#: rc.cpp:5991 rc.cpp:5991
+msgid "Events"
+msgstr "Digwyddiadau"
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:43
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:4749 rc.cpp:4749
-msgid "&User ID"
-msgstr "&Dynodiad Defnyddiwr"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:26
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_trayflashNotify)
+#: rc.cpp:5997 rc.cpp:5997
+msgid "Animate the system tray icon on an incoming message"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:56
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:4752 rc.cpp:4752
-msgid "&Title"
-msgstr "&Teitl"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:29
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_trayflashNotify)
+#: rc.cpp:6000 rc.cpp:6000
+msgid "Animate the system tray icon whenever a message comes in."
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:75
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:4755 rc.cpp:4755
-msgid "&Department"
-msgstr "&Adran"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:32
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayflashNotify)
+#: rc.cpp:6003 rc.cpp:6003
+msgid "Animate s&ystem tray icon"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:89
-#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:108
-#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:130
-#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:169
-#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:204
-#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:89
-#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:108
-#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:130
-#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:169
-#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:204
-#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
-#: rc.cpp:4758 rc.cpp:4767 rc.cpp:4776 rc.cpp:4791 rc.cpp:4803 rc.cpp:4758
-#: rc.cpp:4767 rc.cpp:4776 rc.cpp:4791 rc.cpp:4803
-msgid "contains"
-msgstr "yn cynnwys"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:66
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_trayflashNotifyLeftClickOpensMessage)
+#: rc.cpp:6006 rc.cpp:6006
+msgid ""
+"Left mouse click on flashing system tray opens message instead of "
+"restoring/minimizing contact list"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:94
-#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:113
-#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:135
-#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:174
-#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:209
-#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:94
-#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:113
-#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:135
-#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:174
-#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:209
-#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
-#: rc.cpp:4761 rc.cpp:4770 rc.cpp:4779 rc.cpp:4794 rc.cpp:4806 rc.cpp:4761
-#: rc.cpp:4770 rc.cpp:4779 rc.cpp:4794 rc.cpp:4806
-msgid "begins with"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:69
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_trayflashNotifyLeftClickOpensMessage)
+#: rc.cpp:6009 rc.cpp:6009
+msgid ""
+"A left mouse click on the flashing system tray icon opens the incoming "
+"message instead of restoring/minimizing the contact list (e.g. to check who "
+"is sending messages). A middle click always opens this message."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:99
-#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:118
-#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:140
-#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:179
-#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:214
-#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:99
-#. i18n: ectx: property (text), item, widget (QComboBox, m_userIdOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:118
-#. i18n: ectx: property (text), item, widget (QComboBox, m_firstNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:140
-#. i18n: ectx: property (text), item, widget (QComboBox, m_lastNameOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:179
-#. i18n: ectx: property (text), item, widget (QComboBox, m_deptOperation)
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:214
-#. i18n: ectx: property (text), item, widget (QComboBox, m_titleOperation)
-#: rc.cpp:4764 rc.cpp:4773 rc.cpp:4782 rc.cpp:4797 rc.cpp:4809 rc.cpp:4764
-#: rc.cpp:4773 rc.cpp:4782 rc.cpp:4797 rc.cpp:4809
-msgid "equals"
-msgstr "yn gyfartal i"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:72
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayflashNotifyLeftClickOpensMessage)
+#: rc.cpp:6012 rc.cpp:6012
+msgid "&Left mouse click opens message"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:148
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4785 rc.cpp:4785
-msgid "Last &name"
-msgstr "&Enw olaf"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:81
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_animateOnMessageWithOpenChat)
+#: rc.cpp:6015 rc.cpp:6015
+msgid ""
+"Animate the contact list or the system tray icon on an incoming message with "
+"open chat"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:161
-#. i18n: ectx: property (text), widget (QPushButton, m_clear)
-#: rc.cpp:4788 rc.cpp:4788
-msgid "Cl&ear"
-msgstr "Cl&irio"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:84
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_animateOnMessageWithOpenChat)
+#: rc.cpp:6018 rc.cpp:6018
+msgid "Animate on message with open chat"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:237
-#. i18n: ectx: property (text), widget (QLabel, textLabel9)
-#: rc.cpp:4812 rc.cpp:4812
-msgid "&Results:"
-msgstr "&Canlyniadau:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:91
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:97
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:91
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:97
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
+#: rc.cpp:6021 rc.cpp:6027 rc.cpp:6021 rc.cpp:6027
+msgid "Use a single notification for messages from the same sender"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:276
-#. i18n: ectx: property (text), widget (QPushButton, m_details)
-#: rc.cpp:4815 rc.cpp:4815
-msgid "Detai&ls"
-msgstr "Manyl&ion"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:94
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
+#: rc.cpp:6024 rc.cpp:6024
+msgid ""
+"When a message arrives from a user who already has a message for which a "
+"notification is still active, then that notification is updated to indicate "
+"a new message has arrived, instead of creating a new notification."
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcontactsearch.ui:303
-#. i18n: ectx: property (text), widget (QLabel, m_matchCount)
-#: rc.cpp:4818 rc.cpp:4818
-msgid "0 matching users found"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:104
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_balloonNotifyIgnoreClosesChatView)
+#: rc.cpp:6030 rc.cpp:6030
+msgid ""
+"The \"Ignore\" button of the new message popup closes the chat window for "
+"the sender"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, GroupWiseChatProps)
-#: rc.cpp:4821 rc.cpp:4821
-msgid "GroupWise Chat Properties"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:107
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_balloonNotifyIgnoreClosesChatView)
+#: rc.cpp:6033 rc.cpp:6033
+msgid ""
+"If there is already a chat window opened for the sender of the message "
+"displayed in the new message popup the \"Ignore\" button will close this "
+"chat window."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:34
-#. i18n: ectx: property (text), widget (QLabel, displayName)
-#: rc.cpp:4824 rc.cpp:4824
-msgid "DISPLAY NAME"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:110
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_balloonNotifyIgnoreClosesChatView)
+#: rc.cpp:6036 rc.cpp:6036
+msgid "Button \"I&gnore\" in new message popups closes chat"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:64
-#. i18n: ectx: property (toolTip), widget (QLineEdit, creator)
-#: rc.cpp:4827 rc.cpp:4827
-msgid "The user who created the chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:117
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_queueOnlyHighlightedMessagesInGroupChats)
+#: rc.cpp:6039 rc.cpp:6039
+msgid "Notify only highlighted messages in group chats"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:77
-#. i18n: ectx: property (text), widget (QLabel, textLabel10_2)
-#: rc.cpp:4830 rc.cpp:4830
-msgid "Query:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:120
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_queueOnlyHighlightedMessagesInGroupChats)
+#: rc.cpp:6042 rc.cpp:6042
+msgid ""
+"In very active group chats, important messages can be singled out by "
+"preventing notifications for non-highlighted messages."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:90
-#. i18n: ectx: property (text), widget (QLabel, lblTopic)
-#: rc.cpp:4833 rc.cpp:4833
-msgid "Topic:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:123
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_queueOnlyHighlightedMessagesInGroupChats)
+#: rc.cpp:6045 rc.cpp:6045
+msgid "Exclude non-&highlighted messages in group chats"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:103
-#. i18n: ectx: property (toolTip), widget (QLineEdit, disclaimer)
-#: rc.cpp:4836 rc.cpp:4836
-msgid "A disclaimer for users entering the chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:130
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_queueOnlyMessagesOnAnotherDesktop)
+#: rc.cpp:6048 rc.cpp:6048
+msgid ""
+"Use the same notifications for events in the active chat window and other "
+"chat windows on the current desktop (usually less intrusive)"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:116
-#. i18n: ectx: property (text), widget (QLabel, m__2_2)
-#: rc.cpp:4839 rc.cpp:4839
-msgid "Owner:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:134
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_queueOnlyMessagesOnAnotherDesktop)
+#: rc.cpp:6051 rc.cpp:6051
+msgid ""
+"If activated, events for chat windows that are on the current desktop will "
+"be handled like events in the active chat window: The system tray icon and "
+"the sender icon in the contact list are not animated and the \"Incoming "
+"Message for Active Chat\" event is used for the notification. Chat windows "
+"on other desktops will trigger notifications.\n"
+"If not activated, all chat windows except the active one will notify you "
+"that an event has occurred using animations (if activated) and the "
+"\"Incoming Message\" event."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:129
-#. i18n: ectx: property (toolTip), widget (QLineEdit, topic)
-#: rc.cpp:4842 rc.cpp:4842
-msgid "The current topic of the discussion"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:137
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_queueOnlyMessagesOnAnotherDesktop)
+#: rc.cpp:6055 rc.cpp:6055
+msgid "Treat all chats on the current des&ktop like active chats"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:142
-#. i18n: ectx: property (toolTip), widget (QLineEdit, query)
-#: rc.cpp:4845 rc.cpp:4845
-msgid "UNKNOWN"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:147
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:6058 rc.cpp:6058
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:155
-#. i18n: ectx: property (text), widget (QLabel, textLabel11_2_2)
-#: rc.cpp:4848 rc.cpp:4848
-msgid "Maximum users:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:153
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_enableEventsWhileAway)
+#: rc.cpp:6061 rc.cpp:6061
+msgid "Enable events if your account status is \"Away\""
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:168
-#. i18n: ectx: property (text), widget (QLabel, m__2_2_2)
-#: rc.cpp:4851 rc.cpp:4851
-msgid "Created on:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:156
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_enableEventsWhileAway)
+#: rc.cpp:6064 rc.cpp:6064
+msgid ""
+"Enable notification events even if your account status is \"Away\" or less "
+"available, e.g. \"Not Available\" or \"Do not Disturb\". Note: This does not "
+"affect the flashing of the system tray icon."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:181
-#. i18n: ectx: property (text), widget (QLabel, lbl_displayName_2)
-#: rc.cpp:4854 rc.cpp:4854
-msgid "Disclaimer:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:159
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_enableEventsWhileAway)
+#: rc.cpp:6067 rc.cpp:6067
+msgid "E&nable events while away"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:194
-#. i18n: ectx: property (toolTip), widget (QLineEdit, description)
-#: rc.cpp:4857 rc.cpp:4857
-msgid "General description of the chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:166
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_trayflashNotifySetCurrentDesktopToChatView)
+#: rc.cpp:6070 rc.cpp:6070
+msgid ""
+"Switch to the desktop which contains the chat window for the sender when "
+"opening his/her message"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:207
-#. i18n: ectx: property (toolTip), widget (QLineEdit, maxUsers)
-#: rc.cpp:4860 rc.cpp:4860
-msgid "Maximum number of simultaneous users allowed in the chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:169
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_trayflashNotifySetCurrentDesktopToChatView)
+#: rc.cpp:6073 rc.cpp:6073
+msgid ""
+"If there is already a chat window open for the sender of the message, "
+"opening his/her message will cause a switch to the desktop which contains "
+"this chat window."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:220
-#. i18n: ectx: property (text), widget (QLabel, textLabel10)
-#: rc.cpp:4863 rc.cpp:4863
-msgid "Creator:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:172
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayflashNotifySetCurrentDesktopToChatView)
+#: rc.cpp:6076 rc.cpp:6076
+msgid "Switch &to desktop containing chat on opening message"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:246
-#. i18n: ectx: property (toolTip), widget (QLineEdit, createdOn)
-#: rc.cpp:4869 rc.cpp:4869
-msgid "Date and time the chatroom was created"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:179
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_raiseMessageWindow)
+#: rc.cpp:6079 rc.cpp:6079
+msgid "Raise the chat window/tab on an incoming message"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:265
-#. i18n: ectx: property (toolTip), widget (QCheckBox, archive)
-#: rc.cpp:4872 rc.cpp:4872
-msgid "Indicates if the chatroom is being archived on the server"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:182
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_raiseMessageWindow)
+#: rc.cpp:6082 rc.cpp:6082
+msgid ""
+"If there is already a chat window opened for the sender of an incoming "
+"message this window will be put on the current desktop and in front of all "
+"other windows."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:268
-#. i18n: ectx: property (text), widget (QCheckBox, archive)
-#: rc.cpp:4875 rc.cpp:4875
-msgid "Archived"
+#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:185
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_raiseMessageWindow)
+#: rc.cpp:6085 rc.cpp:6085
+msgid "&Raise window on incoming message"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:278
-#. i18n: ectx: property (toolTip), widget (QLineEdit, owner)
-#: rc.cpp:4878 rc.cpp:4878
-msgid "The user who owns this chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:6091 rc.cpp:6091
+msgid "System Tray"
+msgstr "Bar Tasgau"
+
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:26
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showSystemTray)
+#: rc.cpp:6094 rc.cpp:6094
+msgid "Show the icon in the system tray"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:306
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2)
-#: rc.cpp:4881 rc.cpp:4881
-msgid "Default Access"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:29
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_showSystemTray)
+#: rc.cpp:6097 rc.cpp:6097
+msgid ""
+"By default, the system tray icon indicates new incoming messages using an "
+"animation. A left or middle mouse click on the icon will open the message in "
+"a new chat window. Pressing the \"View\" button in the notification popup "
+"has the same effect."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:327
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkRead)
-#: rc.cpp:4884 rc.cpp:4884
-msgid "General permission to read messages in the chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:32
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showSystemTray)
+#: rc.cpp:6100 rc.cpp:6100
+msgid "Show system &tray icon"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:330
-#. i18n: ectx: property (text), widget (QCheckBox, chkRead)
-#: rc.cpp:4887 rc.cpp:4887
-msgid "Read message"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:42
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_startDocked)
+#: rc.cpp:6103 rc.cpp:6103
+msgid "Start with the main window minimized to the system tray"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:340
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkWrite)
-#: rc.cpp:4890 rc.cpp:4890
-msgid "General permission to write messages in the chatroom"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:45
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_startDocked)
+#: rc.cpp:6106 rc.cpp:6106
+msgid ""
+"Start with the main window hidden. The only visible item is the system tray "
+"icon."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:343
-#. i18n: ectx: property (text), widget (QCheckBox, chkWrite)
-#: rc.cpp:4893 rc.cpp:4893
-msgid "Write message"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:48
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_startDocked)
+#: rc.cpp:6109 rc.cpp:6109
+msgid "Start &with hidden main window"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:353
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkModify)
-#: rc.cpp:4896 rc.cpp:4896
-msgid "General permission to modify the chatroom's access control list"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:58
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:6112 rc.cpp:6112
+msgid "Message Handling"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:356
-#. i18n: ectx: property (text), widget (QCheckBox, chkModify)
-#: rc.cpp:4899 rc.cpp:4899
-msgid "Modify access"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:64
+#. i18n: ectx: property (toolTip), widget (QRadioButton, mInstantMessageOpeningChk)
+#: rc.cpp:6115 rc.cpp:6115
+msgid "Instantly open incoming messages"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:369
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4902 rc.cpp:4902
-msgid "Access Control List"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:67
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, mInstantMessageOpeningChk)
+#: rc.cpp:6118 rc.cpp:6118
+msgid ""
+"If there is no chat window open, a new message arriving will cause a new "
+"window to open. If there is already a chat window opened for that sender, "
+"the message will immediately be displayed there."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:382
-#. i18n: ectx: property (toolTip), widget (K3ListBox, acl)
-#: rc.cpp:4905 rc.cpp:4905
-msgid "Access permissions for specific users"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:70
+#. i18n: ectx: property (text), widget (QRadioButton, mInstantMessageOpeningChk)
+#: rc.cpp:6121 rc.cpp:6121
+msgid "Open messages instantl&y"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:406
-#. i18n: ectx: property (toolTip), widget (KPushButton, addAcl)
-#: rc.cpp:4908 rc.cpp:4908
-msgid "Add a new ACL entry"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:77
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_useMessageQueue)
+#: rc.cpp:6124 rc.cpp:6124
+msgid "Use a message queue to store incoming messages"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:413
-#. i18n: ectx: property (toolTip), widget (KPushButton, editAcl)
-#: rc.cpp:4911 rc.cpp:4911
-msgid "Edit an existing ACL entry"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:80
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_useMessageQueue)
+#: rc.cpp:6127 rc.cpp:6127
+msgid ""
+"Store new incoming messages in a message queue. New messages are messages "
+"that cannot be displayed in an already open chat window. Only queued "
+"messages trigger notification via chat window and system tray icon "
+"animations."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatprops.ui:420
-#. i18n: ectx: property (toolTip), widget (KPushButton, deleteAcl)
-#: rc.cpp:4914 rc.cpp:4914
-msgid "Delete an ACL entry"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:83
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useMessageQueue)
+#: rc.cpp:6130 rc.cpp:6130
+msgid "Use message &queue"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4917 rc.cpp:4917
-msgid "<p align=\"right\">From:</p>"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:93
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_queueUnreadMessages)
+#: rc.cpp:6133 rc.cpp:6133
+msgid "Also add unread messages to queue"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:4920 rc.cpp:4920
-msgid "<p align=\"right\">Sent:</p>"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:96
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_queueUnreadMessages)
+#: rc.cpp:6136 rc.cpp:6136
+msgid ""
+"Unread messages are messages that will be displayed in an already opened but "
+"inactive chat window. Only incoming queued messages trigger notification via "
+"chat window and system tray icon animations. With this option disabled only "
+"new incoming messages are queued, i.e. messages that cannot be displayed in "
+"an already open chat window."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:77
-#. i18n: ectx: property (text), widget (QLabel, dateTime)
-#: rc.cpp:4923 rc.cpp:4923
-msgid "Invitation Date"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_queueUnreadMessages)
+#: rc.cpp:6139 rc.cpp:6139
+msgid "Queue unrea&d messages"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:87
-#. i18n: ectx: property (text), widget (QLabel, contactName)
-#: rc.cpp:4926 rc.cpp:4926
-msgid "Contact Name"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:115
+#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_initialStatus)
+#: rc.cpp:6145 rc.cpp:6145
+msgid "Set the initial status"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:135
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:4932 rc.cpp:4932
-msgid "Would you like to join the conversation?"
+#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:118
+#. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_initialStatus)
+#: rc.cpp:6148 rc.cpp:6148
+msgid ""
+"When starting Kopete, and whenever your computer is online, all your "
+"accounts will go into the status selected here. You can exclude accounts "
+"individually in their properties."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:163
-#. i18n: ectx: property (text), widget (QCheckBox, cbDontShowAgain)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:307
-#. i18n: ectx: property (text), widget (QCheckBox, alwaysAccept)
-#. i18n: file: protocols/groupwise/ui/gwshowinvitation.ui:163
-#. i18n: ectx: property (text), widget (QCheckBox, cbDontShowAgain)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:307
-#. i18n: ectx: property (text), widget (QCheckBox, alwaysAccept)
-#: rc.cpp:4935 rc.cpp:5034 rc.cpp:4935 rc.cpp:5034
-msgid "A&lways accept invitations"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:6166 rc.cpp:6166
+msgid "Auto Away"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:4938 rc.cpp:4938
-msgid "&Status:"
-msgstr "&Cyflwr :"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:23
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useAutoAway)
+#: rc.cpp:6169 rc.cpp:6169
+msgid "&Use auto away"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:74
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4941 rc.cpp:4941
-msgid "Awa&y message:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:41
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:6172 rc.cpp:6172
+msgid "Become away after"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:87
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:52
-#. i18n: ectx: property (text), widget (QLabel, lblDisplayName)
-#. i18n: file: protocols/groupwise/ui/gwcustomstatusedit.ui:87
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:52
-#. i18n: ectx: property (text), widget (QLabel, lblDisplayName)
-#: rc.cpp:4944 rc.cpp:6347 rc.cpp:4944 rc.cpp:6347
-msgid "&Name:"
-msgstr "&Enw:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:58
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:6175 rc.cpp:6175
+msgid "minutes of inactivity"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:31
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:4947 rc.cpp:4947
-msgid "Users who can see my online status and send me messages:"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:83
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoAwayGoAvailable)
+#: rc.cpp:6178 rc.cpp:6178
+msgid "Become available when detecting activity again"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:75
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:4950 rc.cpp:4950
-msgid "A&llowed"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:111
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoAwayAskAvailable)
+#: rc.cpp:6181 rc.cpp:6181
+msgid "Confirm before becoming available"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:126
-#. i18n: ectx: property (text), widget (QPushButton, btnBlock)
-#: rc.cpp:4953 rc.cpp:4953
-msgid "&Block >>"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:123
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:6184 rc.cpp:6184
+msgid "Auto Away Message"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:133
-#. i18n: ectx: property (text), widget (QPushButton, btnAllow)
-#: rc.cpp:4956 rc.cpp:4956
-msgid "<< Allo&w"
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:129
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useLastAwayMessage)
+#: rc.cpp:6187 rc.cpp:6187
+msgid "Display the &last away message used"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:156
-#. i18n: ectx: property (text), widget (QPushButton, btnAdd)
-#: rc.cpp:4959 rc.cpp:4959
-msgid "A&dd..."
-msgstr "Yc&hwanegu..."
+#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:136
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useCustomAwayMessage)
+#: rc.cpp:6190 rc.cpp:6190
+msgid "Display the &following away message:"
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwprivacy.ui:205
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:4965 rc.cpp:4965
-msgid "Bloc&ked"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:15
+#. i18n: ectx: property (windowTitle), widget (QWidget, KopeteAccountConfigBase)
+#: rc.cpp:6199 rc.cpp:6199
+msgid "Manage Accounts"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwchatsearch.ui:74
-#. i18n: ectx: property (text), widget (QPushButton, btnRefresh)
-#: rc.cpp:4968 rc.cpp:4968
-msgid "&Refresh"
-msgstr "&Ailfywio"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:35
+#. i18n: ectx: property (whatsThis), widget (AccountTreeWidget, mAccountList)
+#: rc.cpp:6202 rc.cpp:6202
+msgid ""
+"This widget shows your identities and accounts in a hierarchical view. Each "
+"configured identity shows its associated accounts."
+msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, GroupWiseAccountPreferences)
-#: rc.cpp:4971 rc.cpp:4971
-msgid "Account Preferences - Groupwise"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:63
+#. i18n: ectx: property (text), widget (AccountTreeWidget, mAccountList)
+#: rc.cpp:6205 rc.cpp:6205
+msgid "Account ID"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:131
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, autoConnect)
-#: rc.cpp:4995 rc.cpp:4995
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:76
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:6211 rc.cpp:6211
+msgctxt "second-person command"
 msgid ""
-"Check to disable automatic connection.  If checked, you may connect to this "
-"account manually using the icon in the bottom of the main Kopete window"
+"<span style=\" font-style:italic;\">Check to Include in Global "
+"Connection</span>"
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:183
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:211
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, server)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:183
-#. i18n: ectx: property (whatsThis), widget (QLabel, labelServer)
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:211
-#. i18n: ectx: property (whatsThis), widget (QLineEdit, server)
-#: rc.cpp:5004 rc.cpp:5013 rc.cpp:5004 rc.cpp:5013
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:85
+#. i18n: ectx: property (whatsThis), widget (QLabel, label_2)
+#: rc.cpp:6214 rc.cpp:6214
 msgid ""
-"The IP address or hostname of the server you would like to connect to (for "
-"example im.yourcorp.com)."
+"Use drag & drop to increase or decrease the priority of accounts, accounts "
+"at the top of the list have highest priority.\n"
+"\n"
+"The priority is used to determine which contact to use when you click on a "
+"metacontact: Kopete will use the contact of the account with the greatest "
+"priority (if all contacts have the same online status)."
 msgstr ""
 
-#. i18n: file: protocols/groupwise/ui/gwaccountpreferences.ui:286
-#. i18n: ectx: attribute (title), widget (QWidget, TabPage)
-#: rc.cpp:5031 rc.cpp:5031
-msgid "Advanced &Options"
-msgstr "Dewisiada&u Uwch"
-
-#. i18n: file: libkopete/ui/kopeteawaydialogbase.ui:22
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:5067 rc.cpp:5067
-msgid "Please specify an away message, or choose a predefined one."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:88
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:6219 rc.cpp:6219
+msgid ""
+"<span style=\" font-style:italic;\">Accounts at the top of the list have "
+"highest priority</span>"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:23
-#. i18n: ectx: property (text), widget (QLabel, m_label)
-#: rc.cpp:5070 rc.cpp:5070
-msgid "The contact XXX has added you to his/her contactlist"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:99
+#. i18n: ectx: property (title), widget (QGroupBox, mGroupBoxAccounts)
+#: rc.cpp:6222 rc.cpp:6222
+msgid "Accounts"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:57
-#. i18n: ectx: property (text), widget (KPushButton, m_infoButton)
-#: rc.cpp:5073 rc.cpp:5073
-msgid "Read More Info About This Contact"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:105
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountAdd)
+#: rc.cpp:6225 rc.cpp:6225
+msgid "Add a new account"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:66
-#. i18n: ectx: property (text), widget (QCheckBox, m_authorizeCb)
-#: rc.cpp:5076 rc.cpp:5076
-msgid "Authorize this contact to see my status"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:110
+#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountAdd)
+#: rc.cpp:6228 rc.cpp:6228
+msgid ""
+"Add Account\n"
+"KAction replaces\n"
+"these labels!"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:76
-#. i18n: ectx: property (text), widget (QCheckBox, m_addCb)
-#: rc.cpp:5079 rc.cpp:5079
-msgid "Add this contact in my contactlist"
-msgstr "Ychwanegu'r cyswllt yma i'm rhestr cysylltau"
-
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:106
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel7)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:120
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_displayNameEdit)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:106
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel7)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:120
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_displayNameEdit)
-#: rc.cpp:5082 rc.cpp:5092 rc.cpp:5082 rc.cpp:5092
-msgid ""
-"The display name of the contact.  Leave it empty to use the contact's "
-"nickname."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:117
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountRemove)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:120
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountRemove)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:117
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountRemove)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:120
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountRemove)
+#: rc.cpp:6233 rc.cpp:6236 rc.cpp:6233 rc.cpp:6236
+msgid "Remove selected account"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:110
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel7)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:124
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_displayNameEdit)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:110
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel7)
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:124
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_displayNameEdit)
-#: rc.cpp:5085 rc.cpp:5095 rc.cpp:5085 rc.cpp:5095
-msgid ""
-"Enter the contact's display name. This is how the contact will appear in the "
-"contact list.\n"
-"Leave it empty if you want to see the contact's nickname as their display "
-"name."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:123
+#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountRemove)
+#: rc.cpp:6239 kopete/config/accounts/kopeteaccountconfig.cpp:559 rc.cpp:6239
+msgid "&Remove Account"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:141
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel5)
-#: rc.cpp:5099 rc.cpp:5099
-msgid ""
-"Enter the group where the contact should be added. Leave it empty to add it "
-"in the top level group."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:130
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountModify)
+#: rc.cpp:6242 rc.cpp:6242
+msgid "Modify selected account"
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:144
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:5102 rc.cpp:5102
-msgid "In the group:"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:133
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountModify)
+#: rc.cpp:6245 rc.cpp:6245
+msgid "Lets you edit the account's properties."
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:159
-#. i18n: ectx: property (whatsThis), widget (KComboBox, m_groupList)
-#: rc.cpp:5105 rc.cpp:5105
-msgid ""
-"Enter the group where the contact should be added. Leave it empty to add it "
-"to the top level group."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:136
+#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountModify)
+#: rc.cpp:6248 kopete/config/accounts/kopeteaccountconfig.cpp:551 rc.cpp:6248
+msgid "&Modify Account..."
 msgstr ""
 
-#. i18n: file: libkopete/ui/contactaddednotifywidget.ui:171
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: rc.cpp:5108 rc.cpp:5108
-msgid "Address book link:"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:143
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountSwitchIdentity)
+#: rc.cpp:6251 rc.cpp:6251
+msgid "Associate the selected account with another identity"
 msgstr ""
 
-#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:31
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mRemembered)
-#: rc.cpp:5111 rc.cpp:5111
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:146
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountSwitchIdentity)
+#: rc.cpp:6254 rc.cpp:6254
 msgid ""
-"Check this and enter your password below if you would like your password to "
-"be stored in your wallet, so Kopete does not have to ask you for it each "
-"time it is needed."
+"Each account is associated with exactly one identity. You can use this "
+"button to change the association and switch an account to a different "
+"identity"
 msgstr ""
 
-#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:34
-#. i18n: ectx: property (text), widget (QCheckBox, mRemembered)
-#: rc.cpp:5114 rc.cpp:5114
-msgid "Remember password"
-msgstr "Cofio cyfrinair"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:149
+#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountSwitchIdentity)
+#: rc.cpp:6257 rc.cpp:6257
+msgid "Switch &Identity..."
+msgstr ""
 
-#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:78
-#. i18n: ectx: property (toolTip), widget (KLineEdit, mPassword)
-#: rc.cpp:5120 rc.cpp:5120
-msgid "Enter your password here."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:156
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountSetColor)
+#: rc.cpp:6260 rc.cpp:6260
+msgid "Set a custom color for this account"
 msgstr ""
 
-#. i18n: file: libkopete/ui/kopetepasswordwidgetbase.ui:81
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mPassword)
-#: rc.cpp:5123 rc.cpp:5123
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:159
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountSetColor)
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:77
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mUseColor)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:159
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountSetColor)
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:77
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mUseColor)
+#: rc.cpp:6263 rc.cpp:6510 rc.cpp:6263 rc.cpp:6510
 msgid ""
-"Enter your password here. If you would rather not save your password, "
-"uncheck the Remember password checkbox above; you will then be prompted for "
-"your password whenever it is needed."
+"Account are often differentiated by the protocol icon. But if you have "
+"severals accounts of the same protocol, you may apply a color filter to that "
+"icon to differentiate accounts from the same protocols."
 msgstr ""
 
-#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:61
-#. i18n: ectx: property (text), widget (QLabel, lblSearch)
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:136
-#. i18n: ectx: property (text), widget (QLabel, lblSearch)
-#. i18n: file: libkopete/ui/metacontactselectorwidget_base.ui:61
-#. i18n: ectx: property (text), widget (QLabel, lblSearch)
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:136
-#. i18n: ectx: property (text), widget (QLabel, lblSearch)
-#: rc.cpp:5129 rc.cpp:5174 rc.cpp:5129 rc.cpp:5174
-msgid "S&earch:"
-msgstr "C&hwilio"
-
-#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:30
-#. i18n: ectx: property (toolTip), widget (KLineEdit, edtAddressee)
-#: rc.cpp:5132 rc.cpp:5132
-msgid "The KDE Address Book entry associated with this Kopete Contact"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:162
+#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountSetColor)
+#: rc.cpp:6266 kopete/config/accounts/kopeteaccountconfig.cpp:574 rc.cpp:6266
+msgid "Set C&olor..."
 msgstr ""
 
-#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:56
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnSelectAddressee)
-#: rc.cpp:5138 rc.cpp:5138
-msgid "Select an address book entry"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:185
+#. i18n: ectx: property (title), widget (QGroupBox, mGroupBoxIdentities)
+#: rc.cpp:6269 rc.cpp:6269
+msgid "Identities"
 msgstr ""
 
-#. i18n: file: libkopete/ui/addressbooklinkwidget_base.ui:59
-#. i18n: ectx: property (text), widget (QPushButton, btnSelectAddressee)
-#: rc.cpp:5141 rc.cpp:5141
-msgid "C&hange..."
-msgstr "N&ewid..."
-
-#. i18n: file: libkopete/ui/avatarselectorwidget.ui:76
-#. i18n: ectx: property (text), widget (QPushButton, buttonAddAvatar)
-#: rc.cpp:5144 rc.cpp:5144
-msgid "Add Avatar..."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:191
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityAdd)
+#: rc.cpp:6272 rc.cpp:6272
+msgid "Add a new identity"
 msgstr ""
 
-#. i18n: file: libkopete/ui/avatarselectorwidget.ui:83
-#. i18n: ectx: property (text), widget (QPushButton, buttonRemoveAvatar)
-#: rc.cpp:5147 rc.cpp:5147
-msgid "Remove Avatar"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:194
+#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityAdd)
+#: rc.cpp:6275 rc.cpp:6275
+msgid "A&dd Identity..."
 msgstr ""
 
-#. i18n: file: libkopete/ui/avatarselectorwidget.ui:90
-#. i18n: ectx: property (text), widget (QPushButton, buttonFromWebcam)
-#: rc.cpp:5150 rc.cpp:5150
-msgid "From Webcam"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:201
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityCopy)
+#: rc.cpp:6278 rc.cpp:6278
+msgid "Create a new identity based on an existing one"
 msgstr ""
 
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:59
-#. i18n: ectx: property (toolTip), widget (QPushButton, addAddresseeButton)
-#: rc.cpp:5156 rc.cpp:5156
-msgid "Create a new entry in your address book"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:204
+#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityCopy)
+#: rc.cpp:6281 kopete/config/accounts/kopeteaccountconfig.cpp:588 rc.cpp:6281
+msgid "&Copy Identity..."
 msgstr ""
 
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:62
-#. i18n: ectx: property (text), widget (QPushButton, addAddresseeButton)
-#: rc.cpp:5159 rc.cpp:5159
-msgid "Create New Entr&y..."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:211
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityRemove)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:214
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonIdentityRemove)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:211
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityRemove)
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:214
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonIdentityRemove)
+#: rc.cpp:6284 rc.cpp:6287 rc.cpp:6284 rc.cpp:6287
+msgid "Remove selected identity"
 msgstr ""
 
-#. i18n: file: libkopete/ui/addressbookselectorwidget_base.ui:85
-#. i18n: ectx: property (toolTip), widget (K3ListView, addresseeListView)
-#: rc.cpp:5162 rc.cpp:5162
-msgid "Select the contact you want to communicate with via Instant Messaging"
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:217
+#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityRemove)
+#: rc.cpp:6290 rc.cpp:6290
+msgid "R&emove"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:14
-#. i18n: ectx: label
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:14
-#. i18n: ectx: label
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:14
-#. i18n: ectx: label
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:14
-#. i18n: ectx: label
-#: rc.cpp:5177 rc.cpp:6134 rc.cpp:5177 rc.cpp:6134
-msgid "Emitted when the font and colors settings have changed."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:224
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityModify)
+#: rc.cpp:6293 rc.cpp:6293
+msgid "Modify selected identity"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:17
-#. i18n: ectx: label
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:17
-#. i18n: ectx: label
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:17
-#. i18n: ectx: label
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:17
-#. i18n: ectx: label
-#: rc.cpp:5180 rc.cpp:6137 rc.cpp:5180 rc.cpp:6137
-msgid "Emitted when the message overrides settings have changed."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:227
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonIdentityModify)
+#: rc.cpp:6296 rc.cpp:6296
+msgid "Let you edit the account's properties."
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:20
-#. i18n: ectx: label
-#: rc.cpp:5183 rc.cpp:5183
-msgid "Emitted when the contact list appearance has changed."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:230
+#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityModify)
+#: rc.cpp:6299 kopete/config/accounts/kopeteaccountconfig.cpp:596 rc.cpp:6299
+msgid "M&odify Identity..."
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:26
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5186 rc.cpp:5186
-msgid "Enable emoticon support in Kopete."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:237
+#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentitySetDefault)
+#: rc.cpp:6302 rc.cpp:6302
+msgid "Set the selected identity as default identity"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:35
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:49
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:35
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:49
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5189 rc.cpp:6158 rc.cpp:5189 rc.cpp:6158
-msgid "Text color used when highlighting."
+#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:240
+#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentitySetDefault)
+#: rc.cpp:6305 rc.cpp:6305
+msgid "&Set Default"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:40
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:54
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:40
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:54
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5192 rc.cpp:6161 rc.cpp:5192 rc.cpp:6161
-msgid "Background color used when highlighting."
+#. i18n: file: kopete/identity/accountidentitybase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AccountIdentityBase)
+#. i18n: file: kopete/identity/accountidentitybase.ui:31
+#. i18n: ectx: property (text), widget (KTitleWidget, title)
+#. i18n: file: kopete/identity/accountidentitybase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AccountIdentityBase)
+#. i18n: file: kopete/identity/accountidentitybase.ui:31
+#. i18n: ectx: property (text), widget (KTitleWidget, title)
+#: rc.cpp:6308 rc.cpp:6311 rc.cpp:6308 rc.cpp:6311
+msgid "Account Identity"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:47
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:61
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:47
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:61
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5195 rc.cpp:6164 rc.cpp:5195 rc.cpp:6164
-msgid "Disable custom text color set by users."
+#. i18n: file: kopete/identity/accountidentitybase.ui:38
+#. i18n: ectx: property (text), widget (QLabel, selectText)
+#: rc.cpp:6314 rc.cpp:6314
+msgid "Select the identity to be used by the accounts:"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:52
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:66
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:52
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:66
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5198 rc.cpp:6167 rc.cpp:5198 rc.cpp:6167
-msgid "Disable custom background color set by users."
+#. i18n: file: kopete/identity/accountidentitybase.ui:69
+#. i18n: ectx: property (text), widget (QLabel, accounts)
+#: rc.cpp:6317 rc.cpp:6317
+msgid "<img name=foobar> My Account"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:57
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:71
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:57
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:71
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5201 rc.cpp:6170 rc.cpp:5201 rc.cpp:6170
-msgid "Disable rich text set by users."
+#. i18n: file: kopete/identity/accountidentitybase.ui:100
+#. i18n: ectx: property (text), widget (QTreeWidget, identityList)
+#: rc.cpp:6320 rc.cpp:6320
+msgid "Identity"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:64
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:78
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:64
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:78
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5204 rc.cpp:6173 rc.cpp:5204 rc.cpp:6173
-msgid "Chat text color."
+#. i18n: file: kopete/identity/identitygeneral.ui:39
+#. i18n: ectx: property (text), widget (QLabel, photo)
+#: rc.cpp:6326 kopete/identity/identitydialog.cpp:56
+#: kopete/identity/identitydialog.cpp:152 rc.cpp:6326
+msgid "No Photo"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:69
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:83
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:69
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:83
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5207 rc.cpp:6176 rc.cpp:5207 rc.cpp:6176
-msgid "Chat background color."
+#. i18n: file: kopete/identity/identitygeneral.ui:73
+#. i18n: ectx: property (toolTip), widget (QToolButton, selectPhoto)
+#: rc.cpp:6329 rc.cpp:6329
+msgid "Select Photo"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:74
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:88
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:74
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:88
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5210 rc.cpp:6179 rc.cpp:5210 rc.cpp:6179
-msgid "Chat link color."
+#. i18n: file: kopete/identity/identitygeneral.ui:86
+#. i18n: ectx: property (toolTip), widget (QToolButton, clearPhoto)
+#: rc.cpp:6332 rc.cpp:6332
+msgid "Clear Photo"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:79
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5213 rc.cpp:5213
-msgid "Whether using the system font for the chat window."
+#. i18n: file: kopete/identity/identitygeneral.ui:127
+#. i18n: ectx: property (text), widget (QLabel, labelLabel)
+#: rc.cpp:6335 rc.cpp:6335
+msgid "Show as:"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:84
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:93
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:84
-#. i18n: ectx: label, entry, group (Appearance)
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:93
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5216 rc.cpp:6182 rc.cpp:5216 rc.cpp:6182
-msgid "Chat font."
+#. i18n: file: kopete/identity/identitystatusbase.ui:73
+#. i18n: ectx: property (text), widget (QLabel, identityName)
+#: rc.cpp:6347 rc.cpp:6347
+msgid "Identity Name"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:91
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5219 rc.cpp:5219
-msgid "Color used to identify idle contacts."
+#. i18n: file: kopete/identity/identitydetailed.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, IdentityDetailed)
+#: rc.cpp:6350 rc.cpp:6350
+msgid "Detailed Info"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:96
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5222 rc.cpp:5222
-msgid "Whether to use a different color for idle contacts."
+#. i18n: file: kopete/identity/identitydetailed.ui:19
+#. i18n: ectx: property (text), widget (QLabel, emailLabel)
+#: rc.cpp:6353 rc.cpp:6353
+msgid "E-mail: "
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:103
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:5225 rc.cpp:5225
-msgid "Contact properties that contact tooltip will show."
+#. i18n: file: kopete/contactlist/kabcexport_page2.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:6362 rc.cpp:6362
+msgid "Selected contacts will be added to the KDE address book."
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:111
-#. i18n: ectx: label, entry, group (ContactList)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:120
-#. i18n: ectx: label, entry, group (ContactList)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:111
-#. i18n: ectx: label, entry, group (ContactList)
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:120
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5228 rc.cpp:5231 rc.cpp:5228 rc.cpp:5231
-msgid "Contact list group sorting"
+#. i18n: file: kopete/contactlist/kabcexport_page2.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, btnSelectAll)
+#: rc.cpp:6365 rc.cpp:6365
+msgid "Select &All"
+msgstr "Dewis Pope&th"
+
+#. i18n: file: kopete/contactlist/kabcexport_page2.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, btnDeselectAll)
+#: rc.cpp:6368 rc.cpp:6368
+msgid "&Deselect All"
+msgstr "Da&tddewis Popeth"
+
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddressBookExportUI)
+#: rc.cpp:6371 rc.cpp:6371
+msgid "Merge with Address Book"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:130
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5234 rc.cpp:5234
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:47
+#. i18n: ectx: property (text), widget (QLabel, mLblHomePhone)
+#: rc.cpp:6377 rc.cpp:6377
+msgid "Home phone:"
+msgstr "Ffôn cartref :"
+
+#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:98
+#. i18n: ectx: property (text), widget (QLabel, mLblUrl)
+#: rc.cpp:6386 rc.cpp:6386
+msgid "URL:"
+msgstr "URL:"
+
+#. i18n: file: kopete/contactlist/kabcexport_page1.ui:22
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:6395 rc.cpp:6395
 msgid ""
-"Contact list icon display mode. Either the protocol icon or the contact "
-"photo."
+"This wizard helps you export instant messaging contacts to the KDE address "
+"book."
+msgstr ""
+
+#. i18n: file: kopete/contactlist/kabcexport_page1.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:6398 rc.cpp:6398
+msgid "&Select Address Book"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:139
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5237 rc.cpp:5237
-msgid "Enable borders on the contact's photo."
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:67
+#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:380
+#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:67
+#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:380
+#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
+#: rc.cpp:6407 rc.cpp:6479 rc.cpp:6407 rc.cpp:6479
+msgid "Icons"
+msgstr "Eiconau"
+
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:120
+#. i18n: ectx: property (text), widget (QCheckBox, chkUseCustomIcons)
+#: rc.cpp:6410 rc.cpp:6410
+msgid "Use custom &icons"
+msgstr "Defnyddio &eiconau addasiedig"
+
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:127
+#. i18n: ectx: property (text), widget (QLabel, lblOpen)
+#: rc.cpp:6413 rc.cpp:6413
+msgid "O&pen:"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:144
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5240 rc.cpp:5240
-msgid "Round contact photo corners."
+#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:144
+#. i18n: ectx: property (text), widget (QLabel, lblClosed)
+#: rc.cpp:6416 rc.cpp:6416
+msgid "C&losed:"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:149
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5243 rc.cpp:5243
-msgid "Show contact list as a tree view."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:47
+#. i18n: ectx: property (title), widget (QGroupBox, grpAddressbook)
+#: rc.cpp:6422 rc.cpp:6422
+msgid "Address Book Link"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:154
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5246 rc.cpp:5246
-msgid "Indent contacts if you do not show tree lines."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:91
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnExportKABC)
+#: rc.cpp:6425 rc.cpp:6425
+msgid "Export contact's details to the KDE Address Book"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:159
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5249 rc.cpp:5249
-msgid "Hide the vertical scroll bar."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:94
+#. i18n: ectx: property (text), widget (QPushButton, btnExportKABC)
+#: rc.cpp:6428 rc.cpp:6428
+msgid "E&xport Details..."
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:164
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5252 rc.cpp:5252
-msgid "Group contacts by group."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:120
+#. i18n: ectx: property (toolTip), widget (QPushButton, btnImportKABC)
+#: rc.cpp:6431 rc.cpp:6431
+msgid "Import contacts from the KDE Address Book"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:169
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5255 rc.cpp:5255
-msgid "Use custom fonts for contact list."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:123
+#. i18n: ectx: property (text), widget (QPushButton, btnImportKABC)
+#: rc.cpp:6434 rc.cpp:6434
+msgid "&Import Contacts"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:174
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5258 rc.cpp:5258
-msgid "Automatically resize the main window."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:135
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup1)
+#: rc.cpp:6437 rc.cpp:6437
+msgid "Display Name Source"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:179
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5261 rc.cpp:5261
-msgid "Corner at which to anchor main window when auto-resizing."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:141
+#. i18n: ectx: property (text), widget (QRadioButton, radioNameKABC)
+#: rc.cpp:6440 rc.cpp:6440
+msgid "Use address book &name (needs address book link)"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:197
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5264 rc.cpp:5264
-msgid "Normal font for contact list"
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:148
+#. i18n: ectx: property (text), widget (QRadioButton, radioNameContact)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:265
+#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoContact)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:148
+#. i18n: ectx: property (text), widget (QRadioButton, radioNameContact)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:265
+#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoContact)
+#: rc.cpp:6443 rc.cpp:6461 rc.cpp:6443 rc.cpp:6461
+msgid "From contact:"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:202
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5267 rc.cpp:5267
-msgid "Small font for contact list (for status message)"
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:177
+#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountName)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:294
+#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountPhoto)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:177
+#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountName)
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:294
+#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountPhoto)
+#: rc.cpp:6446 rc.cpp:6464 rc.cpp:6446 rc.cpp:6464
+msgid "Contact with which to synchronize the displayname."
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:207
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5270 rc.cpp:5270
-msgid "Color for group name."
-msgstr ""
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:184
+#. i18n: ectx: property (text), widget (QRadioButton, radioNameCustom)
+#: rc.cpp:6449 rc.cpp:6449
+msgid "Cus&tom:"
+msgstr "Adda&siedig :"
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:212
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5273 rc.cpp:5273
-msgid "Animate contact list on contact list changes."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:213
+#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2)
+#: rc.cpp:6452 rc.cpp:6452
+msgid "Photo Source"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:217
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5276 rc.cpp:5276
-msgid "Fade-in/Fade-out on contact status changes."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:219
+#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoKABC)
+#: rc.cpp:6455 rc.cpp:6455
+msgid "U&se address book photo (needs address book link)"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:222
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5279 rc.cpp:5279
-msgid "Fold-in/Fold-out on contact status changes."
-msgstr ""
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:305
+#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoCustom)
+#: rc.cpp:6467 rc.cpp:6467
+msgid "Custom:"
+msgstr "Addasiedig:"
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:227
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5282 rc.cpp:5282
-msgid "Auto-hide contact list after a while."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:328
+#. i18n: ectx: property (text), widget (QPushButton, btnChoosePhoto)
+#: rc.cpp:6470 rc.cpp:6470
+msgid "Choose..."
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:232
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5285 rc.cpp:5285
-msgid "Auto-hide vertical scrollbar in contact list after a while."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:353
+#. i18n: ectx: property (text), widget (QCheckBox, chkSyncPhoto)
+#: rc.cpp:6473 rc.cpp:6473
+msgid "S&ync photo to address book"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:237
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5288 rc.cpp:5288
-msgid "Auto-hide timeout"
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:386
+#. i18n: ectx: property (toolTip), widget (QCheckBox, chkUseCustomIcons)
+#: rc.cpp:6482 rc.cpp:6482
+msgid "Check to set custom icons for this contact"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:244
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5291 rc.cpp:5291
-msgid "Show offline users in contact list."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:389
+#. i18n: ectx: property (text), widget (QCheckBox, chkUseCustomIcons)
+#: rc.cpp:6485 rc.cpp:6485
+msgid "Use custom status &icons"
 msgstr ""
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:249
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5294 rc.cpp:5294
-msgid "Show empty groups in contact list."
-msgstr ""
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:396
+#. i18n: ectx: property (text), widget (QLabel, lblOnline)
+#: rc.cpp:6488 rc.cpp:6488
+msgid "&Online:"
+msgstr "&Ar-lein :"
 
-#. i18n: file: libkopete/kopeteappearancesettings.kcfg:255
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5297 rc.cpp:5297
-msgid "Show identities in status bar instead of accounts."
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:413
+#. i18n: ectx: property (text), widget (QLabel, lblOffline)
+#: rc.cpp:6491 rc.cpp:6491
+msgid "O&ffline:"
+msgstr "A&ll-lein :"
+
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:446
+#. i18n: ectx: property (text), widget (QLabel, lblAway)
+#: rc.cpp:6494 rc.cpp:6494
+msgid "Awa&y:"
+msgstr "I f&fwrdd :"
+
+#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:463
+#. i18n: ectx: property (text), widget (QLabel, lblUnknown)
+#: rc.cpp:6497 rc.cpp:6497
+msgid "Un&known:"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:12
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5300 rc.cpp:5300
-msgid "Start Kopete docked."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:44
+#. i18n: ectx: property (text), widget (QLabel, m_header)
+#: rc.cpp:6503 rc.cpp:6503
+msgid ""
+"<h2>Congratulations</h2>\n"
+"<p>You have finished configuring the account. Please click the \"Finish\" "
+"button.</p>"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:16
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5303 rc.cpp:5303
-msgid "Show Kopete in system tray."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:74
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mUseColor)
+#: rc.cpp:6507 rc.cpp:6507
+msgid "Use a custom color for this account"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:20
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5306 rc.cpp:5306
-msgid "Use message queue."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:81
+#. i18n: ectx: property (text), widget (QCheckBox, mUseColor)
+#: rc.cpp:6513 rc.cpp:6513
+msgid ""
+"Use &custom color\n"
+"for account:"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:24
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5309 rc.cpp:5309
-msgid "Queue unread messages."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:88
+#. i18n: ectx: property (toolTip), widget (KColorButton, mColorButton)
+#: rc.cpp:6517 rc.cpp:6517
+msgid "Account custom color selector"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:28
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5312 rc.cpp:5312
-msgid "Use mouse navigation only in contact list."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:139
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mConnectNow)
+#: rc.cpp:6520 rc.cpp:6520
+msgid "Connect right after Finish is pressed"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:32
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5315 rc.cpp:5315
-msgid "Reconnect on disconnect."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:142
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mConnectNow)
+#: rc.cpp:6523 rc.cpp:6523
+msgid ""
+"If this is checked, the account will be connected right after you clicked on "
+"<i>Finished</i>."
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:36
-#. i18n: ectx: label, entry, group (Behavior)
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:109
-#. i18n: ectx: property (title), widget (QGroupBox, initialStatusGroup)
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:36
-#. i18n: ectx: label, entry, group (Behavior)
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:109
-#. i18n: ectx: property (title), widget (QGroupBox, initialStatusGroup)
-#: rc.cpp:5318 rc.cpp:5600 rc.cpp:5318 rc.cpp:5600
-msgid "Initial Status"
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:145
+#. i18n: ectx: property (text), widget (QCheckBox, mConnectNow)
+#: rc.cpp:6526 rc.cpp:6526
+msgid "Co&nnect now"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:48
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5321 rc.cpp:5321
-msgid "Raise message view on new messages."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddAccountWizardPage1)
+#: rc.cpp:6529 rc.cpp:6529
+msgid "Step One: Select Messaging Service"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:52
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5324 rc.cpp:5324
-msgid "Show events in chat window."
+#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:32
+#. i18n: ectx: property (text), widget (QLabel, m_header)
+#: rc.cpp:6532 rc.cpp:6532
+msgid ""
+"<h2>Welcome to the Add Account Wizard</h2>\n"
+"<p>Select the messaging service from the list below.</p>"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:56
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5327 rc.cpp:5327
-msgid "Queue only highlighted messages in group chats"
+#: kopete/chatwindow/chatmessagepart.cpp:318
+msgid "Save Conversation"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:60
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5330 rc.cpp:5330
-msgid "Queue Only Messages On Another Desktop"
+#: kopete/chatwindow/chatmessagepart.cpp:360
+#, kde-format
+msgid "<qt>Could not open <b>%1</b> for writing.</qt>"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:64
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5333 rc.cpp:5333
-msgid "Single notification for messages from the same sender."
+#: kopete/chatwindow/chatmessagepart.cpp:361
+msgid "Error While Saving"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:68
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5336 rc.cpp:5336
-msgid "Balloon Notification Ignore Closes Chat View"
+#: kopete/chatwindow/chatmessagepart.cpp:806
+msgid "User Has Left"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:72
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5339 rc.cpp:5339
-msgid "Trayflash Notification"
+#: kopete/chatwindow/chatmessagepart.cpp:1388
+msgid "Chat style could not be found, or is invalid."
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:76
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5342 rc.cpp:5342
-msgid "Trayflash Notification Left Click Opens Message."
+#: kopete/chatwindow/chatmessagepart.cpp:1445
+msgid "Save File as"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:80
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5345 rc.cpp:5345
-msgid "Animate on message with open chat."
+#: kopete/chatwindow/chatmessagepart.cpp:1445
+msgid "Wav file (*.wav)"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:84
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5348 rc.cpp:5348
-msgid "Trayflash Notification Set Current Desktop To Chat View"
+#: kopete/chatwindow/kopeterichtextwidget.cpp:142
+#: kopete/chatwindow/kopetechatwindow.cpp:464
+msgid "Automatic Spell Checking"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:88
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5351 rc.cpp:5351
-msgid "Enable events while away."
+#: kopete/chatwindow/kopeterichtextwidget.cpp:151
+msgid "Enable &Rich Text"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:94
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5354 rc.cpp:5354
-msgid "Chat window grouping policy."
+#: kopete/chatwindow/kopeterichtextwidget.cpp:164
+msgid "Reset Font And Color"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:105
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5357 rc.cpp:5357
-msgid "Enable spell checking by default."
+#: kopete/chatwindow/kopetechatwindow.cpp:247
+msgctxt "@action:button"
+msgid "Send"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:109
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5360 rc.cpp:5360
-msgid "Enable rich text by default."
+#: kopete/chatwindow/kopetechatwindow.cpp:258
+msgctxt "@info:status"
+msgid "Ready."
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:113
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5363 rc.cpp:5363
-msgid "Show send button in Chat Window."
+#: kopete/chatwindow/kopetechatwindow.cpp:366
+#: kopete/chatwindow/kopeteemailwindow.cpp:219
+msgid "&Send Message"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:117
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5366 rc.cpp:5366
-msgid "Show message dates."
+#: kopete/chatwindow/kopetechatwindow.cpp:380
+msgid "Send File..."
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:121
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5369 rc.cpp:5369
-msgid "Truncate contact name."
+#: kopete/chatwindow/kopetechatwindow.cpp:388
+msgid "Close All Chats"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:125
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5372 rc.cpp:5372
-msgid "Truncate contact name max length."
+#: kopete/chatwindow/kopetechatwindow.cpp:393
+msgid "&Activate Next Active Tab"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:129
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5375 rc.cpp:5375
-msgid "Maximum number of messages to show in a chat window."
+#: kopete/chatwindow/kopetechatwindow.cpp:399
+msgid "&Activate Next Tab"
+msgstr "&Gweithredu'r Tab Nesaf"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:405
+msgid "&Activate Previous Tab"
+msgstr "&Gweithredu'r Tab Cynt"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:413
+msgid "Nic&k Completion"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:133
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5378 rc.cpp:5378
-msgid "Hightlight messages containing your nickname."
+#: kopete/chatwindow/kopetechatwindow.cpp:417
+msgid "&Detach Chat"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:137
-#. i18n: ectx: label, entry, group (Behavior)
-#: rc.cpp:5381 rc.cpp:5381
-msgid "Selected view plugin for Chat Window."
+#: kopete/chatwindow/kopetechatwindow.cpp:422
+msgid "Close &All But This Tab"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:144
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5384 rc.cpp:5384
-msgid "Use auto away."
+#: kopete/chatwindow/kopetechatwindow.cpp:427
+msgid "&Move Tab to Window"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:148
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5387 rc.cpp:5387
-msgid "Auto away timeout."
+#: kopete/chatwindow/kopetechatwindow.cpp:434
+msgid "&Tab Placement"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:152
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5390 rc.cpp:5390
-msgid "Go available after detecting an activity."
+#: kopete/chatwindow/kopetechatwindow.cpp:447
+msgid "Previous History"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:156
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5393 rc.cpp:5393
-msgid "Confirm Before Coming Back from Auto Away"
+#: kopete/chatwindow/kopetechatwindow.cpp:452
+msgid "Next History"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:160
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5396 rc.cpp:5396
-msgid "When setting the auto away message, use the latest away message."
+#: kopete/chatwindow/kopetechatwindow.cpp:470
+msgid "Show Participants"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:164
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5399 rc.cpp:5399
-msgid "When setting the auto away message, use a custom away message."
+#: kopete/chatwindow/kopetechatwindow.cpp:480
+msgid "Co&ntacts"
+msgstr "Cy&sylltau"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:503
+#: kopete/chatwindow/kopeteemailwindow.cpp:272
+msgid "Toolbar Animation"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:168
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5402 rc.cpp:5402
-msgid "The custom auto away title."
+#: kopete/chatwindow/kopetechatwindow.cpp:667
+msgctxt "@info:tooltip"
+msgid "Close the current tab"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:172
-#. i18n: ectx: label, entry, group (AutoAway)
-#: rc.cpp:5405 rc.cpp:5405
-msgid "The custom auto away message."
+#: kopete/chatwindow/kopetechatwindow.cpp:1119
+msgid "More..."
+msgstr "Mwy..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:1141
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:75
+msgid "Left"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:179
-#. i18n: ectx: label, entry, group (ContactList)
-#: rc.cpp:5408 rc.cpp:5408
-msgid "Enable smooth scrolling in contact list."
+#: kopete/chatwindow/kopetechatwindow.cpp:1144
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:77
+msgid "Right"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:186
-#. i18n: ectx: label, entry, group (ChatWindowSettings)
-#: rc.cpp:5411 rc.cpp:5411
-msgid "Always show tabs."
+#: kopete/chatwindow/chattexteditpart.cpp:511
+msgid "Chat Text Edit Part"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:190
-#. i18n: ectx: label, entry, group (ChatWindowSettings)
-#: rc.cpp:5426 rc.cpp:5426
-msgid "Show contact name for each tab."
+#: kopete/chatwindow/chattexteditpart.cpp:512
+msgid "A simple rich text editor part"
 msgstr ""
 
-#. i18n: file: libkopete/kopetebehaviorsettings.kcfg:194
-#. i18n: ectx: label, entry, group (ChatWindowSettings)
-#: rc.cpp:5429 rc.cpp:5429
-msgid "Show close button for each tab."
+#: kopete/chatwindow/chattexteditpart.cpp:514
+msgid "Richard J. Moore"
 msgstr ""
 
-#. i18n: file: libkopete/kopetestatussettings.kcfg:12
-#. i18n: ectx: label, entry, group (Status)
-#: rc.cpp:5414 rc.cpp:5414
-msgid "Protocol's status menu type."
+#: kopete/chatwindow/chattexteditpart.cpp:515 kopete/main.cpp:44
+msgid "Jason Keirstead"
 msgstr ""
 
-#. i18n: file: libkopete/kopetecommandui.rc:6
-#. i18n: ectx: Menu (commandmenu)
-#: rc.cpp:5417 rc.cpp:5417
-msgid "Commands"
-msgstr "Gorchmynion:"
+#: kopete/chatwindow/chattexteditpart.cpp:516 kopete/main.cpp:47
+msgid "Michaël Larouche"
+msgstr ""
 
-#. i18n: file: doc/t3/tutorialprefs.ui:16
-#. i18n: ectx: property (text), widget (QCheckBox, fastLearner)
-#: rc.cpp:5420 rc.cpp:5420
-msgid "I am a fast learner"
+#: kopete/chatwindow/chattexteditpart.cpp:517
+msgid "Benson Tsai"
 msgstr ""
 
-#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:145
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:98
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: kopete/statusmenu/kopetestatuseditwidget_base.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:145
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:98
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:5423 rc.cpp:5748 rc.cpp:6001 rc.cpp:5423 rc.cpp:5748 rc.cpp:6001
-msgid "Title:"
+#: kopete/chatwindow/chatview.cpp:250
+#, kde-format
+msgid ""
+"<qt>You have received a message from <b>%1</b> in the last second. Are you "
+"sure you want to clear this chat?</qt>"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:17
-#. i18n: ectx: property (title), widget (KButtonGroup, kcfg_chatFontSelection)
-#: rc.cpp:5429 rc.cpp:5429
-msgid "Fonts"
+#: kopete/chatwindow/chatview.cpp:251 kopete/chatwindow/chatview.cpp:359
+#: kopete/chatwindow/kopeteemailwindow.cpp:466
+msgid "Unread Message"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:30
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3_2)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:73
-#. i18n: ectx: property (toolTip), widget (KFontRequester, kcfg_chatFont)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:99
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:30
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3_2)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:73
-#. i18n: ectx: property (toolTip), widget (KFontRequester, kcfg_chatFont)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:99
-#. i18n: ectx: property (toolTip), widget (QLabel, textLabel3)
-#: rc.cpp:5432 rc.cpp:5448 rc.cpp:5458 rc.cpp:5432 rc.cpp:5448 rc.cpp:5458
+#: kopete/chatwindow/chatview.cpp:252
+msgctxt "@action:button"
+msgid "Clear Chat"
+msgstr ""
+
+#: kopete/chatwindow/chatview.cpp:351
+#: kopete/chatwindow/kopeteemailwindow.cpp:458
+#, kde-format
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Base font in the chat "
-"window</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p></body></html>"
+"<qt>You are about to leave the groupchat session <b>%1</b>.<br />You will "
+"not receive future messages from this conversation.</qt>"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:33
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:102
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:33
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:102
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:5439 rc.cpp:5465 rc.cpp:5439 rc.cpp:5465
-msgid "Base &font:"
+#: kopete/chatwindow/chatview.cpp:352
+#: kopete/chatwindow/kopeteemailwindow.cpp:459
+msgid "Closing Group Chat"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:43
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton)
-#: rc.cpp:5442 rc.cpp:5442
-msgid "Use system font"
+#: kopete/chatwindow/chatview.cpp:353 kopete/chatwindow/chatview.cpp:360
+#: kopete/chatwindow/chatview.cpp:367
+msgctxt "@action:button"
+msgid "Close Chat"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:50
-#. i18n: ectx: property (text), widget (QRadioButton, radioButton_2)
-#: rc.cpp:5445 rc.cpp:5445
-msgid "Use custom font:"
+#: kopete/chatwindow/chatview.cpp:358
+#: kopete/chatwindow/kopeteemailwindow.cpp:465
+#, kde-format
+msgid ""
+"<qt>You have received a message from <b>%1</b> in the last second. Are you "
+"sure you want to close this chat?</qt>"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:112
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_chatTextColor)
-#: rc.cpp:5468 rc.cpp:5468
-msgid "Base font color for the chat window"
+#: kopete/chatwindow/chatview.cpp:365
+#: kopete/chatwindow/kopeteemailwindow.cpp:472
+msgid ""
+"You have a message send in progress, which will be aborted if this chat is "
+"closed. Are you sure you want to close this chat?"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:122
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:5471 rc.cpp:5471
-msgid "&Highlight foreground:"
+#: kopete/chatwindow/chatview.cpp:366
+#: kopete/chatwindow/kopeteemailwindow.cpp:473
+msgid "Message in Transit"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:132
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_highlightForegroundColor)
-#: rc.cpp:5474 rc.cpp:5474
-msgid "Foreground color for highlighted messages"
+#: kopete/chatwindow/chatview.cpp:407
+#, kde-format
+msgid "One other person in the chat"
+msgid_plural "%1 other people in the chat"
+msgstr[0] ""
+msgstr[1] ""
+
+#: kopete/chatwindow/chatview.cpp:459
+#, kde-format
+msgid "%1 is typing a message"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:142
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:5477 rc.cpp:5477
-msgid "&Background color:"
+#: kopete/chatwindow/chatview.cpp:463
+#, kde-format
+msgctxt "%1 is a list of names"
+msgid "%1 are typing a message"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:152
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_chatBackgroundColor)
-#: rc.cpp:5480 rc.cpp:5480
-msgid "Color for the background of the chat window"
+#: kopete/chatwindow/chatview.cpp:520 kopete/chatwindow/chatview.cpp:529
+#, kde-format
+msgid "%1 is now known as %2"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:169
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:5483 rc.cpp:5483
-msgid "Highlight bac&kground:"
+#: kopete/chatwindow/chatview.cpp:548
+#, kde-format
+msgid "%1 has joined the chat."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:179
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_highlightBackgroundColor)
-#: rc.cpp:5486 rc.cpp:5486
-msgid "Background color for highlighted messages"
+#: kopete/chatwindow/chatview.cpp:595
+#, kde-format
+msgid "%1 has left the chat."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:189
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:5489 rc.cpp:5489
-msgid "&Link color:"
+#: kopete/chatwindow/chatview.cpp:597
+#, kde-format
+msgid "%1 has left the chat (%2)."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:199
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_chatLinkColor)
-#: rc.cpp:5492 rc.cpp:5492
-msgid "Color used for links in chats"
+#: kopete/chatwindow/chatview.cpp:704
+#, kde-format
+msgid "You are now marked as %1."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:219
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:5495 rc.cpp:5495
-msgid "Formatting Overrides"
+#: kopete/chatwindow/chatview.cpp:709
+#, kde-format
+msgid "%2 is now %1."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:225
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_chatBgOverride)
-#: rc.cpp:5498 rc.cpp:5498
-msgid "Do not show user specified back&ground color"
+#: kopete/chatwindow/kopeteemoticonaction.cpp:65
+msgid "Add Smiley"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:232
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_chatFgOverride)
-#: rc.cpp:5501 rc.cpp:5501
-msgid "&Do not show user specified foreground color"
+#: kopete/chatwindow/kopeteemailwindow.cpp:167
+msgid "<< Prev"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_colors.ui:239
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_chatRtfOverride)
-#: rc.cpp:5504 rc.cpp:5504
-msgid "Do not show user specified &rich text"
+#: kopete/chatwindow/kopeteemailwindow.cpp:172
+msgid "(0) Next >>"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_emoticons.ui:22
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_useEmoticons)
-#: rc.cpp:5507 rc.cpp:5507
-msgid ""
-"If this is checked, the text representation of emoticons in messages will be "
-"replaced by an image"
+#: kopete/chatwindow/kopeteemailwindow.cpp:232
+msgid "&Set Font..."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_emoticons.ui:25
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useEmoticons)
-#: rc.cpp:5510 rc.cpp:5510
-msgid "U&se the following emoticon theme:"
+#: kopete/chatwindow/kopeteemailwindow.cpp:236
+msgid "Set Text &Color..."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_emoticons.ui:48
-#. i18n: ectx: property (text), widget (QPushButton, btnManageThemes)
-#: rc.cpp:5513 rc.cpp:5513
-msgid "&Manage Emoticons..."
+#: kopete/chatwindow/kopeteemailwindow.cpp:240
+msgid "Set &Background Color..."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_tab.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:5538 rc.cpp:5538
-msgid "For each tab"
+#: kopete/chatwindow/kopeteemailwindow.cpp:269
+msgid "Spacer for Animation"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_tab.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowContactName)
-#: rc.cpp:5541 rc.cpp:5541
-msgid "Show contact name"
+#: kopete/chatwindow/kopeteemailwindow.cpp:380
+#, kde-format
+msgid "(%1) Next >>"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_tab.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_HoverClose)
-#: rc.cpp:5544 rc.cpp:5544
-msgid "Show close button"
+#: kopete/chatwindow/kopeteemailwindow.cpp:460
+#: kopete/chatwindow/kopeteemailwindow.cpp:467
+#: kopete/chatwindow/kopeteemailwindow.cpp:474
+msgid "Cl&ose Chat"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, ChatWindowConfig_Style)
-#: rc.cpp:5516 rc.cpp:5516
-msgid "Chat Window Appearance"
+#: kopete/chatwindow/kopeteemailwindow.cpp:506
+msgid "Reply"
+msgstr "Ymateb"
+
+#: kopete/chatwindow/kopetechatwindowstyle.cpp:384
+msgid "Download"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:34
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:5519 rc.cpp:5519
-msgid "Display"
+#: kopete/chatwindow/kopetechatwindowstyle.cpp:384
+msgid "Cancel"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:40
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_groupConsecutiveMessages)
-#: rc.cpp:5522 rc.cpp:5522
-msgid "Group consecuti&ve messages"
+#: kopete/chatwindow/kopetechatwindowstyle.cpp:417
+msgid "Play"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:47
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useCompact)
-#: rc.cpp:5525 rc.cpp:5525
-msgid "Co&mpact style in chatrooms"
+#: kopete/chatwindow/kopetechatwindowstyle.cpp:417
+msgid "Save as"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:63
-#. i18n: ectx: property (title), widget (QGroupBox, stylesGroupBox)
-#: rc.cpp:5528 rc.cpp:5528
-msgid "Styles"
-msgstr "Arddulliau"
+#: kopete/kopetewindow.cpp:120
+msgid "Global status message"
+msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:94
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:5531 rc.cpp:5531
-msgid "Style variant:"
+#: kopete/kopetewindow.cpp:140
+msgid "Service messages"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:124
-#. i18n: ectx: property (toolTip), widget (KPushButton, btnGetStyles)
-#: rc.cpp:5534 rc.cpp:5534
-msgid "Get new Chat Window styles over the Internet"
+#: kopete/kopetewindow.cpp:392
+msgid "&Export Contacts..."
+msgstr "&Allforio Cyswlltau..."
+
+#: kopete/kopetewindow.cpp:414
+msgid "&Set Status"
+msgstr "&Gosod Cyflwr"
+
+#: kopete/kopetewindow.cpp:442
+msgid "Configure &Global Shortcuts..."
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:127
-#. i18n: ectx: property (text), widget (KPushButton, btnGetStyles)
-#: rc.cpp:5537 rc.cpp:5537
-msgid "&Get New..."
+#: kopete/kopetewindow.cpp:451
+msgid "Show &All"
 msgstr ""
 
-#. i18n: file: kopete/config/chatwindow/chatwindowconfig_style.ui:140
-#. i18n: ectx: property (text), widget (KPushButton, installButton)
-#: rc.cpp:5540 rc.cpp:5540
-msgid "&Install..."
+#: kopete/kopetewindow.cpp:456
+msgid "Show Offline &Users"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:5549 rc.cpp:5549
-msgid "System Tray"
-msgstr "Bar Tasgau"
+#: kopete/kopetewindow.cpp:460
+msgid "Show Empty &Groups"
+msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:26
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showSystemTray)
-#: rc.cpp:5552 rc.cpp:5552
-msgid "Show the icon in the system tray"
+#: kopete/kopetewindow.cpp:482
+msgid "Read Message"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:29
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_showSystemTray)
-#: rc.cpp:5555 rc.cpp:5555
-msgid ""
-"By default, the system tray icon indicates new incoming messages using an "
-"animation. A left or middle mouse click on the icon will open the message in "
-"a new chat window. Pressing the \"View\" button in the notification popup "
-"has the same effect."
+#: kopete/kopetewindow.cpp:486
+msgid "Read the next pending message"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:32
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showSystemTray)
-#: rc.cpp:5558 rc.cpp:5558
-msgid "Show system &tray icon"
+#: kopete/kopetewindow.cpp:488
+msgid "Show/Hide Contact List"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:42
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_startDocked)
-#: rc.cpp:5561 rc.cpp:5561
-msgid "Start with the main window minimized to the system tray"
+#: kopete/kopetewindow.cpp:492
+msgid "Show or hide the contact list"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:45
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_startDocked)
-#: rc.cpp:5564 rc.cpp:5564
+#: kopete/kopetewindow.cpp:494
+msgid "Set Away/Back"
+msgstr "Gosod I Ffwrdd/Yn Ôl"
+
+#: kopete/kopetewindow.cpp:839
+msgid ""
+"<qt>Closing the main window will keep Kopete running in the system tray. Use "
+"'Quit' from the 'File' menu to quit the application.</qt>"
+msgstr ""
+
+#: kopete/kopetewindow.cpp:841
+msgid "Docking in System Tray"
+msgstr ""
+
+#: kopete/kopetewindow.cpp:1113
+#, kde-format
+msgctxt ""
+"Account tooltip information: <nobr>ICON <b>PROTOCOL:</b> NAME "
+"(<i>STATUS</i>)</nobr><br />"
 msgid ""
-"Start with the main window hidden. The only visible item is the system tray "
-"icon."
+"<nobr><img src=\"%3\" width=\"16\" height=\"16\" /> <b>%1:</b> %2 "
+"(<i>%4</i>)</nobr><br />"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:48
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_startDocked)
-#: rc.cpp:5567 rc.cpp:5567
-msgid "Start &with hidden main window"
+#: kopete/kopetewindow.cpp:1336
+#, kde-format
+msgctxt "@label:textbox formatted status title"
+msgid "<b>Status&nbsp;Title:</b>&nbsp;%1"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:58
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:5570 rc.cpp:5570
-msgid "Message Handling"
+#: kopete/kopetewindow.cpp:1384
+#: kopete/contactlist/kopetecontactlistview.cpp:959
+msgid "Add Contact"
+msgstr "Ychwanegu Cyswllt"
+
+#: kopete/statusmenu/kopetestatusrootaction.cpp:165
+msgid "Edit Message..."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:64
-#. i18n: ectx: property (toolTip), widget (QRadioButton, mInstantMessageOpeningChk)
-#: rc.cpp:5573 rc.cpp:5573
-msgid "Instantly open incoming messages"
+#: kopete/statusmenu/kopetestatusrootaction.cpp:204
+msgid "Configure Statuses"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:67
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, mInstantMessageOpeningChk)
-#: rc.cpp:5576 rc.cpp:5576
-msgid ""
-"If there is no chat window open, a new message arriving will cause a new "
-"window to open. If there is already a chat window opened for that sender, "
-"the message will immediately be displayed there."
+#: kopete/statusmenu/kopetestatuseditaction.cpp:137
+msgid "Edit Message"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:70
-#. i18n: ectx: property (text), widget (QRadioButton, mInstantMessageOpeningChk)
-#: rc.cpp:5579 rc.cpp:5579
-msgid "Open messages instantl&y"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:162
+msgid "&Style"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:77
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_useMessageQueue)
-#: rc.cpp:5582 rc.cpp:5582
-msgid "Use a message queue to store incoming messages"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:207
+msgid "&Emoticons"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:80
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, kcfg_useMessageQueue)
-#: rc.cpp:5585 rc.cpp:5585
-msgid ""
-"Store new incoming messages in a message queue. New messages are messages "
-"that cannot be displayed in an already open chat window. Only queued "
-"messages trigger notification via chat window and system tray icon "
-"animations."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:221
+#: kopete/config/appearance/appearanceconfig.cpp:116
+msgid "Colors && Fonts"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:83
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useMessageQueue)
-#: rc.cpp:5588 rc.cpp:5588
-msgid "Use message &queue"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:352
+msgid "(No Variant)"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:93
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_queueUnreadMessages)
-#: rc.cpp:5591 rc.cpp:5591
-msgid "Also add unread messages to queue"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:409
+msgid "Choose Chat Window Style to Install"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:96
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_queueUnreadMessages)
-#: rc.cpp:5594 rc.cpp:5594
+#: kopete/config/chatwindow/chatwindowconfig.cpp:420
 msgid ""
-"Unread messages are messages that will be displayed in an already opened but "
-"inactive chat window. Only incoming queued messages trigger notification via "
-"chat window and system tray icon animations. With this option disabled only "
-"new incoming messages are queued, i.e. messages that cannot be displayed in "
-"an already open chat window."
+"The specified archive cannot be opened.\n"
+"Make sure that the archive is a valid ZIP or TAR archive."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_queueUnreadMessages)
-#: rc.cpp:5597 rc.cpp:5597
-msgid "Queue unrea&d messages"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:420
+msgid "Cannot Open Archive"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:115
-#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_initialStatus)
-#: rc.cpp:5603 rc.cpp:5603
-msgid "Set the initial status"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:425
+msgid "Could not find a suitable place to install the chat window style."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_general.ui:118
-#. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_initialStatus)
-#: rc.cpp:5606 rc.cpp:5606
-msgid ""
-"When starting Kopete, and whenever your computer is online, all your "
-"accounts will go into the status selected here. You can exclude accounts "
-"individually in their properties."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:425
+msgid "Cannot Find Styles Directory"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, BehaviorConfig_Events)
-#: rc.cpp:5624 rc.cpp:5624
-msgid "Events"
-msgstr "Digwyddiadau"
-
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:26
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_trayflashNotify)
-#: rc.cpp:5630 rc.cpp:5630
-msgid "Animate the system tray icon on an incoming message"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:429
+msgid "The specified archive does not contain a valid chat window style."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:29
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_trayflashNotify)
-#: rc.cpp:5633 rc.cpp:5633
-msgid "Animate the system tray icon whenever a message comes in."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:429
+msgid "Invalid Style"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:32
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayflashNotify)
-#: rc.cpp:5636 rc.cpp:5636
-msgid "Animate s&ystem tray icon"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:433
+msgid "The chat window style was successfully installed."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:66
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_trayflashNotifyLeftClickOpensMessage)
-#: rc.cpp:5639 rc.cpp:5639
-msgid ""
-"Left mouse click on flashing system tray opens message instead of "
-"restoring/minimizing contact list"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:433
+msgid "Install Successful"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:69
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_trayflashNotifyLeftClickOpensMessage)
-#: rc.cpp:5642 rc.cpp:5642
+#: kopete/config/chatwindow/chatwindowconfig.cpp:439
 msgid ""
-"A left mouse click on the flashing system tray icon opens the incoming "
-"message instead of restoring/minimizing the contact list (e.g. to check who "
-"is sending messages). A middle click always opens this message."
+"An unknown error occurred while trying to install the chat window style."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:72
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayflashNotifyLeftClickOpensMessage)
-#: rc.cpp:5645 rc.cpp:5645
-msgid "&Left mouse click opens message"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:439
+msgid "Unknown Error"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:81
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_animateOnMessageWithOpenChat)
-#: rc.cpp:5648 rc.cpp:5648
+#: kopete/config/chatwindow/chatwindowconfig.cpp:474
+#, kde-format
+msgctxt "@info"
 msgid ""
-"Animate the contact list or the system tray icon on an incoming message with "
-"open chat"
+"The Chat Window Style <resource>%1</resource> was successfully deleted."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:84
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_animateOnMessageWithOpenChat)
-#: rc.cpp:5651 rc.cpp:5651
-msgid "Animate on message with open chat"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:479
+#, kde-format
+msgctxt "@info"
+msgid ""
+"An error occurred while trying to delete the <resource>%1</resource> Chat "
+"Window Style. Your account might not have permission to remove it."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:91
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:97
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:91
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:97
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
-#: rc.cpp:5654 rc.cpp:5660 rc.cpp:5654 rc.cpp:5660
-msgid "Use a single notification for messages from the same sender"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:512
+#, kde-format
+msgctxt "@title:window"
+msgid "Chat Window Style <resource>%1</resource> installation"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:94
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_balloonGroupMessageNotificationsPerSender)
-#: rc.cpp:5657 rc.cpp:5657
+#: kopete/config/chatwindow/chatwindowconfig.cpp:517
+#, kde-format
+msgctxt "@info"
 msgid ""
-"When a message arrives from a user who already has a message for which a "
-"notification is still active, then that notification is updated to indicate "
-"a new message has arrived, instead of creating a new notification."
+"The specified archive <filename>%1</filename> cannot be opened.\n"
+"Make sure that the archive is a valid ZIP or TAR archive."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:104
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_balloonNotifyIgnoreClosesChatView)
-#: rc.cpp:5663 rc.cpp:5663
+#: kopete/config/chatwindow/chatwindowconfig.cpp:522
+#, kde-format
+msgctxt "@info"
 msgid ""
-"The \"Ignore\" button of the new message popup closes the chat window for "
-"the sender"
+"Could not find a suitable place to install the Chat Window Style "
+"<resource>%1</resource>."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:107
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_balloonNotifyIgnoreClosesChatView)
-#: rc.cpp:5666 rc.cpp:5666
+#: kopete/config/chatwindow/chatwindowconfig.cpp:526
+#, kde-format
+msgctxt "@info"
 msgid ""
-"If there is already a chat window opened for the sender of the message "
-"displayed in the new message popup the \"Ignore\" button will close this "
-"chat window."
+"The specified archive <filename>%1</filename> does not contain a valid Chat "
+"Window Style."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:110
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_balloonNotifyIgnoreClosesChatView)
-#: rc.cpp:5669 rc.cpp:5669
-msgid "Button \"I&gnore\" in new message popups closes chat"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:536
+#, kde-format
+msgctxt "@info"
+msgid ""
+"An unknown error occurred while trying to install the Chat Window Style "
+"<resource>%1</resource>."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:117
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_queueOnlyHighlightedMessagesInGroupChats)
-#: rc.cpp:5672 rc.cpp:5672
-msgid "Notify only highlighted messages in group chats"
-msgstr ""
+#: kopete/config/chatwindow/chatwindowconfig.cpp:545
+#, kde-format
+msgid "One Chat Window Style package has been installed."
+msgid_plural "%1 Chat Window Style packages have been installed."
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:120
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_queueOnlyHighlightedMessagesInGroupChats)
-#: rc.cpp:5675 rc.cpp:5675
-msgid ""
-"In very active group chats, important messages can be singled out by "
-"preventing notifications for non-highlighted messages."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:557
+msgctxt "This is the myself preview contact id"
+msgid "myself@preview"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:123
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_queueOnlyHighlightedMessagesInGroupChats)
-#: rc.cpp:5678 rc.cpp:5678
-msgid "Exclude non-&highlighted messages in group chats"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:558
+msgctxt "This is the myself preview contact nickname"
+msgid "Myself"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:130
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_queueOnlyMessagesOnAnotherDesktop)
-#: rc.cpp:5681 rc.cpp:5681
-msgid ""
-"Use the same notifications for events in the active chat window and other "
-"chat windows on the current desktop (usually less intrusive)"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:562
+msgid "Jack"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:134
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_queueOnlyMessagesOnAnotherDesktop)
-#: rc.cpp:5684 rc.cpp:5684
-msgid ""
-"If activated, events for chat windows that are on the current desktop will "
-"be handled like events in the active chat window: The system tray icon and "
-"the sender icon in the contact list are not animated and the \"Incoming "
-"Message for Active Chat\" event is used for the notification. Chat windows "
-"on other desktops will trigger notifications.\n"
-"If not activated, all chat windows except the active one will notify you "
-"that an event has occurred using animations (if activated) and the "
-"\"Incoming Message\" event."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:565
+msgctxt "This is the other preview contact id"
+msgid "jack@preview"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_queueOnlyMessagesOnAnotherDesktop)
-#: rc.cpp:5688 rc.cpp:5688
-msgid "Treat all chats on the current des&ktop like active chats"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:566
+msgctxt "This is the other preview contact nickname"
+msgid "Jack"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:5691 rc.cpp:5691
-msgid "Miscellaneous"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:574
+msgctxt "preview of a chat session"
+msgid "Preview Session"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:153
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_enableEventsWhileAway)
-#: rc.cpp:5694 rc.cpp:5694
-msgid "Enable events if your account status is \"Away\""
+#: kopete/config/chatwindow/chatwindowconfig.cpp:580
+msgid "Hello, this is an incoming message :-)"
 msgstr ""
-
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:156
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_enableEventsWhileAway)
-#: rc.cpp:5697 rc.cpp:5697
-msgid ""
-"Enable notification events even if your account status is \"Away\" or less "
-"available, e.g. \"Not Available\" or \"Do not Disturb\". Note: This does not "
-"affect the flashing of the system tray icon."
+
+#: kopete/config/chatwindow/chatwindowconfig.cpp:584
+msgid "Hello, this is an incoming consecutive message."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:159
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_enableEventsWhileAway)
-#: rc.cpp:5700 rc.cpp:5700
-msgid "E&nable events while away"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:588
+msgid "Ok, this is an outgoing message"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:166
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_trayflashNotifySetCurrentDesktopToChatView)
-#: rc.cpp:5703 rc.cpp:5703
-msgid ""
-"Switch to the desktop which contains the chat window for the sender when "
-"opening his/her message"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:592
+msgid "Ok, an outgoing consecutive message."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:169
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_trayflashNotifySetCurrentDesktopToChatView)
-#: rc.cpp:5706 rc.cpp:5706
-msgid ""
-"If there is already a chat window open for the sender of the message, "
-"opening his/her message will cause a switch to the desktop which contains "
-"this chat window."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:596
+msgid "Message that is being sent."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:172
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayflashNotifySetCurrentDesktopToChatView)
-#: rc.cpp:5709 rc.cpp:5709
-msgid "Switch &to desktop containing chat on opening message"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:601
+msgid "Delivered message."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:179
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_raiseMessageWindow)
-#: rc.cpp:5712 rc.cpp:5712
-msgid "Raise the chat window/tab on an incoming message"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:606
+msgid "Message that cannot be delivered."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:182
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_raiseMessageWindow)
-#: rc.cpp:5715 rc.cpp:5715
-msgid ""
-"If there is already a chat window opened for the sender of an incoming "
-"message this window will be put on the current desktop and in front of all "
-"other windows."
+#: kopete/config/chatwindow/chatwindowconfig.cpp:611
+msgid "Here is an incoming colored message."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_events.ui:185
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_raiseMessageWindow)
-#: rc.cpp:5718 rc.cpp:5718
-msgid "&Raise window on incoming message"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:617
+msgid "This is an internal message"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:5721 rc.cpp:5721
-msgid "Auto Away"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:621
+msgid "performed an action"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useAutoAway)
-#: rc.cpp:5724 rc.cpp:5724
-msgid "&Use auto away"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:626
+msgid "This is a highlighted message"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:41
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:5727 rc.cpp:5727
-msgid "Become away after"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:631
+msgid "Hello, this is an incoming file transfer request"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:58
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:5730 rc.cpp:5730
-msgid "minutes of inactivity"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:638
+msgid "Hello, this is a disabled incoming file transfer request"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:83
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoAwayGoAvailable)
-#: rc.cpp:5733 rc.cpp:5733
-msgid "Become available when detecting activity again"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:647
+msgctxt ""
+"This special UTF-8 string is to test if the style supports Right-to-Left "
+"language display."
+msgid "הודעות טקסט"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:111
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoAwayAskAvailable)
-#: rc.cpp:5736 rc.cpp:5736
-msgid "Confirm before becoming available"
+#: kopete/config/chatwindow/chatwindowconfig.cpp:651
+msgid "Bye"
+msgstr "Ta ra"
+
+#: kopete/config/chatwindow/chatwindowconfig.cpp:730
+msgid "Configure Emoticon Themes"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:123
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:5739 rc.cpp:5739
-msgid "Auto Away Message"
+#: kopete/config/plugins/kopetepluginconfig.cpp:55
+msgid "General Plugins"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:129
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useLastAwayMessage)
-#: rc.cpp:5742 rc.cpp:5742
-msgid "Display the &last away message used"
+#: kopete/config/avdevice/avdeviceconfig.cpp:148
+msgid "Reset sliders & options to default values"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_away.ui:136
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useCustomAwayMessage)
-#: rc.cpp:5745 rc.cpp:5745
-msgid "Display the &following away message:"
+#: kopete/config/status/statusconfig_manager.cpp:70
+msgid "Do Not Change"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:20
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showEvents)
-#: rc.cpp:5757 rc.cpp:5757
-msgid "Show events in chat &window"
+#: kopete/config/status/statusconfig_manager.cpp:107
+msgid "New Status"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_highlightEnabled)
-#: rc.cpp:5760 rc.cpp:5760
-msgid "High&light messages containing your nickname"
+#: kopete/config/status/statusconfig_manager.cpp:122
+#: kopete/contactlist/kopetecontactlistview.cpp:343
+msgid "New Group"
+msgstr "Grwp Newydd"
+
+#: kopete/config/status/statusconfig.cpp:43
+msgid "&Manager"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:46
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_spellCheck)
-#: rc.cpp:5763 rc.cpp:5763
-msgid "E&nable automatic spell checking by default"
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:65
+msgid "Bold"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:59
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_richTextByDefault)
-#: rc.cpp:5766 rc.cpp:5766
-msgid "E&nable rich text by default"
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:70
+msgid "Italic"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:66
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AlwaysShowTabs)
-#: rc.cpp:5769 rc.cpp:5769
-msgid "&Always show tabs"
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:76
+msgid "Center"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:73
-#. i18n: ectx: property (title), widget (QGroupBox, interfaceGroup)
-#: rc.cpp:5772 rc.cpp:5772
-msgid "&Interface Preference"
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:99
+msgid "Alignment"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:85
-#. i18n: ectx: property (title), widget (QGroupBox, chatWindowGroup)
-#: rc.cpp:5775 rc.cpp:5775
-msgid "Chat Window Grouping &Policy"
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:103
+msgid "Width"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:91
-#. i18n: ectx: property (whatsThis), widget (QComboBox, kcfg_chatWindowGroupPolicy)
-#: rc.cpp:5778 rc.cpp:5778
-msgid "Every chat will have its own window."
+#: kopete/config/appearance/layout/TokenWithLayout.cpp:170
+#: kopete/config/appearance/appearanceconfig.cpp:129
+#: kopete/config/appearance/contactlistlayoutwidget.cpp:152
+msgid "Layout"
+msgstr "Cynllun"
+
+#: kopete/config/appearance/contactlisttoken.cpp:43
+msgid "Optimal width"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:95
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
-#: rc.cpp:5781 rc.cpp:5781
-msgid "Open All Messages in New Chat Window"
+#: kopete/config/appearance/contactlisttoken.cpp:51
+msgid "Small"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:100
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
-#: rc.cpp:5784 rc.cpp:5784
-msgid "Group Messages From Same Account in Same Chat Window"
+#: kopete/config/appearance/contactlistlayouteditwidget.cpp:44
+msgid "Show Icon"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:105
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
-#: rc.cpp:5787 rc.cpp:5787
-msgid "Group All Messages in Same Chat Window"
+#: kopete/config/appearance/tooltipeditdialog.cpp:36
+msgid "Tooltip Editor"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:110
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
-#: rc.cpp:5790 rc.cpp:5790
-msgid "Group Messages From Contacts in Same Group in Same Chat Window"
+#: kopete/config/appearance/appearanceconfig.cpp:109
+msgid "Contact List"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:115
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_chatWindowGroupPolicy)
-#: rc.cpp:5793 rc.cpp:5793
-msgid "Group Messages From Same Metacontact in Same Chat Window"
+#: kopete/config/appearance/appearanceconfig.cpp:124
+msgid "Advanced"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:126
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showDates)
-#: rc.cpp:5796 rc.cpp:5796
-msgid "Show message dates"
+#: kopete/config/appearance/contactlistlayoutwidget.cpp:152
+msgid "Unsaved data?"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:141
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_truncateContactName)
-#: rc.cpp:5799 rc.cpp:5799
-msgid "&Truncate contact name with more characters than:"
+#: kopete/config/appearance/contactlistlayoutwidget.cpp:163
+msgid "Reserved Layout Name"
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:187
-#. i18n: ectx: property (whatsThis), widget (QLabel, txtChatViewBufferSize)
-#: rc.cpp:5802 rc.cpp:5802
+#: kopete/config/appearance/contactlistlayoutwidget.cpp:164
+#, kde-format
 msgid ""
-"Limit the maximum number of lines visible in a chat window to improve speed "
-"for complex layouts."
+"The layout '%1' is one of the default layouts and cannot be overwritten. "
+"Please select a different name."
 msgstr ""
 
-#. i18n: file: kopete/config/behavior/behaviorconfig_chat.ui:190
-#. i18n: ectx: property (text), widget (QLabel, txtChatViewBufferSize)
-#: rc.cpp:5805 rc.cpp:5805
-msgid "Ma&ximum number of chat window lines:"
+#: kopete/config/behavior/behaviorconfig_events.cpp:30
+msgid ""
+"Animation is not possible as your Qt version does not support the mng video "
+"format."
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:140
-#. i18n: ectx: attribute (title), widget (QWidget, deviceTab)
-#: rc.cpp:5811 rc.cpp:5811
-msgid "Device"
-msgstr "Dyfais"
+#: kopete/config/behavior/behaviorconfig.cpp:66
+msgid "&Events"
+msgstr "&Digwyddiadau:"
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:157
-#. i18n: ectx: property (text), widget (QLabel, inputLabel)
-#: rc.cpp:5817 rc.cpp:5817
-msgid "Input:"
-msgstr "Mewnbwn:"
+#: kopete/config/behavior/behaviorconfig.cpp:71
+msgid "A&way Settings"
+msgstr "Gosodiadau I Ffwrdd"
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:164
-#. i18n: ectx: property (text), widget (QLabel, standardLabel)
-#: rc.cpp:5820 rc.cpp:5820
-msgctxt ""
-"Label of a combo box containing video standards like PAL-B, NTSC-M, etc"
-msgid "Standard:"
+#: kopete/config/behavior/behaviorconfig.cpp:76
+msgid "Cha&t"
+msgstr "S&gwrsio"
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:262
+msgid "Modify Account"
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:190
-#. i18n: ectx: property (toolTip), widget (KComboBox, mDeviceKComboBox)
-#: rc.cpp:5823 rc.cpp:5823
-msgid "Select the device to take video input from"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:314
+#, kde-format
+msgid "Are you sure you want to remove the account \"%1\"?"
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:203
-#. i18n: ectx: property (toolTip), widget (KComboBox, mInputKComboBox)
-#: rc.cpp:5826 rc.cpp:5826
-msgid "Select from multiple inputs provided by some devices"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:315
+msgid "Remove Account"
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:216
-#. i18n: ectx: property (toolTip), widget (KComboBox, mStandardKComboBox)
-#: rc.cpp:5829 rc.cpp:5829
-msgid "Select the video standard to use"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:331
+#, kde-format
+msgid "Are you sure you want to remove the identity \"%1\"?"
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:244
-#. i18n: ectx: attribute (title), widget (QWidget, controlsTab)
-#: rc.cpp:5832 rc.cpp:5832
-msgid "Sliders"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:332
+msgid "Remove Identity"
 msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:270
-#. i18n: ectx: attribute (title), widget (QWidget, optionsTab)
-#: rc.cpp:5835 rc.cpp:5835
-msgid "Optio&ns"
-msgstr "De&wisiadau"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:343
+#, kde-format
+msgid ""
+"Before removing the identity %1, the following accounts must be assigned to "
+"another identity:"
+msgstr ""
 
-#. i18n: file: kopete/config/avdevice/avdeviceconfig_videodevice.ui:319
-#. i18n: ectx: attribute (title), widget (QWidget, actionsTab)
-#: rc.cpp:5838 rc.cpp:5838
-msgid "Actions"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:376
+msgid "Select an identity for the account:"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, AppearanceConfig_Advanced)
-#: rc.cpp:5841 rc.cpp:5841
-msgid "Contact List Advanced"
-msgstr ""
+#: kopete/config/accounts/kopeteaccountconfig.cpp:413
+msgid "New Identity"
+msgstr "Dynodiad Newydd"
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:26
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:5844 rc.cpp:5844
-msgid "Contact List Animations"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:435
+#, kde-format
+msgctxt "String used for creating first copy of a named item"
+msgid "Copy of %1"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:38
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListAnimateChange)
-#: rc.cpp:5847 rc.cpp:5847
-msgid "A&nimate changes to contact list items"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:443
+#, kde-format
+msgctxt ""
+"String used for creating second and subsequent copies of a named item"
+msgid "Copy %1 of %2"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListFading)
-#: rc.cpp:5850 rc.cpp:5850
-msgid "Fade in / out contacts as the&y appear / disappear"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:543
+msgid "&Add Account..."
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:64
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListFolding)
-#: rc.cpp:5853 rc.cpp:5853
-msgid "Fo&ld in / out contacts as they appear / disappear"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:568
+msgid "&Switch Identity..."
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:74
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:5856 rc.cpp:5856
-msgid "Contact List Auto-Hide"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:580
+msgid "Add &Identity..."
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListAutoHide)
-#: rc.cpp:5859 rc.cpp:5859
-msgid "A&uto-hide contact list"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:604
+msgid "R&emove Identity"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:100
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_contactListAutoHideVScroll)
-#: rc.cpp:5862 rc.cpp:5862
-msgid ""
-"Since vertical scrollbars occupy space, we introduced this auto-hide "
-"feature. The vertical scrollbar will not be available until you move your "
-"mouse over the contact list.<br>\n"
-"(<b>Disabled</b> if \"<b>Hide vertical scrollbar</b>\" option is selected "
-"above.)"
+#: kopete/config/accounts/kopeteaccountconfig.cpp:612
+msgid "Set &Default"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:103
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListAutoHideVScroll)
-#: rc.cpp:5866 rc.cpp:5866
-msgid "Auto-hide vertical &scrollbar"
+#: kopete/identity/identitystatuswidget.cpp:207
+#: kopete/identity/identitystatuswidget.cpp:243
+msgctxt "Button to open account configuration widget"
+msgid "Click to add an account"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:143
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_contactListAutoHideTimeout)
-#: rc.cpp:5869 rc.cpp:5869
-msgid "The timeout value for both contact list and scrollbar auto-hiding."
+#: kopete/identity/identitydialog.cpp:39 kopete/identity/identitydialog.cpp:44
+msgid "Identity Information"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:146
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_contactListAutoHideTimeout)
-#: rc.cpp:5872 rc.cpp:5872
-msgid " Sec"
-msgstr " eil"
+#: kopete/identity/identitydialog.cpp:64
+msgid "General Information"
+msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:165
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:5875 rc.cpp:5875
-msgid "after the cursor leaves the window"
+#: kopete/identity/identitydialog.cpp:69
+msgid "Detailed Information"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:177
-#. i18n: ectx: property (title), widget (KButtonGroup, kcfg_contactListResizeAnchor)
-#: rc.cpp:5878 rc.cpp:5878
+#: kopete/contactlist/contactlistmodel.cpp:418
+#, kde-format
 msgid ""
-"&Automatically resize contact list window to fit number of contacts onscreen"
+"<qt>This contact is already on your contact list. It is a child contact of "
+"<b>%1</b></qt>"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:186
-#. i18n: ectx: property (text), widget (QRadioButton, top)
-#: rc.cpp:5881 rc.cpp:5881
-msgid "Anchor resizing at &top"
+#: kopete/contactlist/contactlistmodel.cpp:474
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to merge meta contacts?\n"
+"<b>%1</b>"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_advanced.ui:193
-#. i18n: ectx: property (text), widget (QRadioButton, bottom)
-#: rc.cpp:5884 rc.cpp:5884
-msgid "Anchor resizing at &bottom"
+#: kopete/contactlist/contactlistmodel.cpp:475
+msgid "Meta Contact Merge"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:66
-#. i18n: ectx: property (whatsThis), widget (QToolButton, tbDown)
-#: rc.cpp:5887 rc.cpp:5887
-msgid "Use this arrow to reorder the items in the list."
+#: kopete/contactlist/contactlistmodel.cpp:497
+#, kde-format
+msgctxt "%1 is display name, %2 is status (connected/away/etc.)"
+msgid "%1 (%2)"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:69
-#. i18n: ectx: property (text), widget (QToolButton, tbDown)
-#: rc.cpp:5890 rc.cpp:5890
-msgid "v"
-msgstr "v"
+#: kopete/contactlist/contactlistmodel.cpp:500
+#, kde-format
+msgctxt "%1 is display name, %2 is status and %3 is status message"
+msgid ""
+"%1 (%2)\n"
+"%3"
+msgstr ""
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:76
-#. i18n: ectx: property (text), widget (QToolButton, tbUp)
-#: rc.cpp:5893 rc.cpp:5893
-msgid "^"
+#: kopete/contactlist/contactlistmodel.cpp:654
+#, kde-format
+msgctxt ""
+"<tr><td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td><td>STATUS "
+"DESCRIPTION</td></tr>"
+msgid ""
+"<tr style='white-space:pre'><td><img "
+"src=\"%1\">&nbsp;</td><td><b>%2</b>&nbsp;(%3)</td><td "
+"align=\"right\">%4</td></tr>"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:83
-#. i18n: ectx: property (text), widget (QToolButton, tbRemove)
-#: rc.cpp:5896 rc.cpp:5896
-msgid "<"
-msgstr "<"
+#: kopete/contactlist/contactlistmodel.cpp:665
+#, kde-format
+msgctxt "<tr><td><small><i>STATUS MESSAGE</i></small></td></tr>"
+msgid "<tr><td>&nbsp;</td><td colspan='2'><small><i>%1</i></small></td></tr>"
+msgstr ""
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:90
-#. i18n: ectx: property (whatsThis), widget (QToolButton, tbAdd)
-#: rc.cpp:5899 rc.cpp:5899
-msgid "Use this arrows to add or remove items to your contact tooltips."
+#: kopete/contactlist/kopetecontactlistview.cpp:158
+msgid "Create New Group..."
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:93
-#. i18n: ectx: property (text), widget (QToolButton, tbAdd)
-#: rc.cpp:5902 rc.cpp:5902
-msgid ">"
-msgstr ">"
+#: kopete/contactlist/kopetecontactlistview.cpp:168
+msgid "&Move To"
+msgstr "&Symud I"
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:138
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:5905 rc.cpp:5905
-msgid ""
-"Using the arrow buttons, put on the right the items you want to see in the "
-"contact tooltips. You can then sort them."
-msgstr ""
+#: kopete/contactlist/kopetecontactlistview.cpp:171
+msgid "&Copy To"
+msgstr "&Copïo I"
 
-#. i18n: file: kopete/config/appearance/tooltipeditwidget.ui:151
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:5908 rc.cpp:5908
-msgid "<b>Here you can customize the contact tooltips</b>"
+#: kopete/contactlist/kopetecontactlistview.cpp:175
+msgid "Merge Meta Contacts"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, AppearanceConfig_ContactList)
-#: rc.cpp:5911 rc.cpp:5911
-msgid "Contact List Appearance"
+#: kopete/contactlist/kopetecontactlistview.cpp:197
+msgid "Select Account"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:28
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:5914 rc.cpp:5914
-msgid "Group sorting:"
+#: kopete/contactlist/kopetecontactlistview.cpp:199
+msgid "Add to Your Contact List"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:42
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:88
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:42
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListGroupSorting)
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:88
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_contactListMetaContactSorting)
-#: rc.cpp:5917 rc.cpp:5926 rc.cpp:5917 rc.cpp:5926
-msgid "Manual"
-msgstr ""
+#: kopete/contactlist/kopetecontactlistview.cpp:210
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:74
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:5923 rc.cpp:5923
-msgid "Contact sorting:"
+#: kopete/contactlist/kopetecontactlistview.cpp:344
+msgid "Please enter the name for the new group:"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:114
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIconMode)
-#: rc.cpp:5935 rc.cpp:5935
-msgid "Use contact photos &when available"
+#: kopete/contactlist/kopetecontactlistview.cpp:386
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to remove the contact <b>%1</b> from your contact "
+"list?</qt>"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:142
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIconBorders)
-#: rc.cpp:5938 rc.cpp:5938
-msgid "Borders"
+#: kopete/contactlist/kopetecontactlistview.cpp:392
+#, kde-format
+msgid ""
+"<qt>Are you sure you want to remove the group <b>%1</b> and all contacts "
+"that are contained within it?</qt>"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:172
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIconRounded)
-#: rc.cpp:5941 rc.cpp:5941
-msgid "Rounded corners"
+#: kopete/contactlist/kopetecontactlistview.cpp:407
+msgid ""
+"Are you sure you want to remove these contacts from your contact list?"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:187
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_groupContactByGroup)
-#: rc.cpp:5944 rc.cpp:5944
-msgid "Arrange metacontacts by &group"
+#: kopete/contactlist/kopetecontactlistview.cpp:409
+msgid ""
+"Are you sure you want to remove these groups and contacts from your contact "
+"list?"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:200
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListTreeView)
-#: rc.cpp:5947 rc.cpp:5947
-msgid "Show tree &branch lines"
+#: kopete/contactlist/kopetecontactlistview.cpp:526
+msgid ""
+"There is no email address set for this contact in the KDE address book."
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:234
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListIndentContact)
-#: rc.cpp:5950 rc.cpp:5950
-msgid "In&dent contacts"
+#: kopete/contactlist/kopetecontactlistview.cpp:526
+msgid "No Email Address in Address Book"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:249
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_contactListHideVerticalScrollBar)
-#: rc.cpp:5953 rc.cpp:5953
-msgid "<b>Always</b> disables the vertical scrollbar"
+#: kopete/contactlist/kopetecontactlistview.cpp:530
+msgid ""
+"This contact was not found in the KDE address book. Check that a contact is "
+"selected in the properties dialog."
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:252
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_contactListHideVerticalScrollBar)
-#: rc.cpp:5956 rc.cpp:5956
-msgid "&Hide vertical scrollbar"
+#: kopete/contactlist/kopetecontactlistview.cpp:530
+msgid "Not Found in Address Book"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:259
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showIdentityIcons)
-#: rc.cpp:5959 rc.cpp:5959
-msgid "Show identities in status bar instead of accounts"
-msgstr ""
+#: kopete/contactlist/kopetecontactlistview.cpp:817
+msgid "Send Single Message..."
+msgstr "Anfon Neges Sengl..."
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_contactlist.ui:274
-#. i18n: ectx: property (text), widget (QPushButton, mEditTooltips)
-#: rc.cpp:5962 rc.cpp:5962
-msgid "Change &Tooltip Contents..."
-msgstr ""
+#: kopete/contactlist/kopetecontactlistview.cpp:820
+msgid "&Add Subcontact"
+msgstr "&Ychwanegu Isgyswllt"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:826
+msgid "Remove Group"
+msgstr "Gwaredu Grŵp"
 
-#. i18n: file: kopete/config/appearance/contactlistlayoutwidget.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:5965 rc.cpp:5965
-msgid "Layout name:"
+#: kopete/contactlist/kopetecontactlistview.cpp:827
+msgid "Send Message to Group"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_contactListUseCustomFont)
-#: rc.cpp:5974 rc.cpp:5974
-msgid "C&ustom Fonts"
-msgstr ""
+#: kopete/contactlist/kopetecontactlistview.cpp:831
+msgid "&Add Contact to Group"
+msgstr "&Ychwanegu Cyswllt i'r Grŵp"
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:35
-#. i18n: ectx: property (text), widget (QLabel, mNormalFontLabel)
-#: rc.cpp:5977 rc.cpp:5977
-msgid "Base font:"
+#: kopete/contactlist/kopetecontactlistview.cpp:841
+msgid "Make Meta Contact"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:58
-#. i18n: ectx: property (text), widget (QLabel, mSmallFontLabel)
-#: rc.cpp:5980 rc.cpp:5980
-msgid "Small font:"
-msgstr ""
+#: kopete/contactlist/kopetecontactlistview.cpp:1037
+#, kde-format
+msgctxt "Translators: format: '<nickname> (<online status>)'"
+msgid "%1 (%2)"
+msgstr "%1(%2)"
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:90
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_greyIdleMetaContacts)
-#: rc.cpp:5986 rc.cpp:5986
-msgid "Tint &idle contacts:"
+#: kopete/contactlist/kopetecontactlistview.cpp:1065
+#, kde-format
+msgctxt "Translators: format: '<displayName> (<id>)'"
+msgid "%2 <%1>"
 msgstr ""
 
-#. i18n: file: kopete/config/appearance/appearanceconfig_colors.ui:132
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:5989 rc.cpp:5989
-msgid "&Group names:"
+#: kopete/contactlist/kabcexport.cpp:61
+msgid "Select Address Book"
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:60
-#. i18n: ectx: property (text), widget (QPushButton, pbAddGroup)
-#: rc.cpp:5998 rc.cpp:5998
-msgid "Add Group"
+#: kopete/contactlist/kabcexport.cpp:98
+msgid "No writeable address book resource found."
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_manager.ui:111
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:6004 rc.cpp:6004
-msgid "Category:"
+#: kopete/contactlist/kabcexport.cpp:99
+msgid "Add or enable one using the KDE System Settings."
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_general.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:6010 rc.cpp:6010
-msgid "Online Status Menu"
+#: kopete/contactlist/kabcexport.cpp:110
+msgid " (already in address book)"
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_general.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:6013 rc.cpp:6013
-msgid "Protocol's online status menu:"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:77
+#: kopete/contactlist/kopeteaddrbookexport.cpp:84
+#: kopete/contactlist/kopeteaddrbookexport.cpp:91
+#: kopete/contactlist/kopeteaddrbookexport.cpp:100
+#: kopete/contactlist/kopeteaddrbookexport.cpp:120
+msgid "<Not Set>"
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_general.ui:31
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_protocolStatusMenuType)
-#: rc.cpp:6016 rc.cpp:6016
-msgid "As Global Status Menu"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:179
+msgid "Export to Address Book"
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_general.ui:36
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_protocolStatusMenuType)
-#: rc.cpp:6019 rc.cpp:6019
-msgid "Only Statuses With Matching Category"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:185
+msgid "Export"
 msgstr ""
 
-#. i18n: file: kopete/config/status/statusconfig_general.ui:41
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_protocolStatusMenuType)
-#: rc.cpp:6022 rc.cpp:6022
-msgid "All Statuses With Parent Category"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:186
+msgid "Set address book fields using the selected data from Kopete"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:15
-#. i18n: ectx: property (windowTitle), widget (QWidget, KopeteAccountConfigBase)
-#: rc.cpp:6025 rc.cpp:6025
-msgid "Manage Accounts"
+#: kopete/contactlist/contactlisttreemodel.cpp:274
+#, kde-format
+msgid "%1 (%2/%3)"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:35
-#. i18n: ectx: property (whatsThis), widget (AccountTreeWidget, mAccountList)
-#: rc.cpp:6028 rc.cpp:6028
-msgid ""
-"This widget shows your identities and accounts in a hierarchical view. Each "
-"configured identity shows its associated accounts."
+#: kopete/contactlist/kopetelviprops.cpp:75
+#, kde-format
+msgid "Properties of Group %1"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:63
-#. i18n: ectx: property (text), widget (AccountTreeWidget, mAccountList)
-#: rc.cpp:6031 rc.cpp:6031
-msgid "Account ID"
+#: kopete/contactlist/kopetelviprops.cpp:91
+#: kopete/contactlist/kopetelviprops.cpp:200
+msgid "Custom &Notifications"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:76
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:6037 rc.cpp:6037
-msgctxt "second-person command"
-msgid ""
-"<span style=\" font-style:italic;\">Check to Include in Global "
-"Connection</span>"
+#: kopete/contactlist/kopetelviprops.cpp:165
+#, kde-format
+msgid "Properties of Meta Contact %1"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:85
-#. i18n: ectx: property (whatsThis), widget (QLabel, label_2)
-#: rc.cpp:6040 rc.cpp:6040
-msgid ""
-"Use drag & drop to increase or decrease the priority of accounts, accounts "
-"at the top of the list have highest priority.\n"
-"\n"
-"The priority is used to determine which contact to use when you click on a "
-"metacontact: Kopete will use the contact of the account with the greatest "
-"priority (if all contacts have the same online status)."
+#: kopete/contactlist/kopetelviprops.cpp:190
+msgid "Sync KABC..."
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:88
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:6045 rc.cpp:6045
-msgid ""
-"<span style=\" font-style:italic;\">Accounts at the top of the list have "
-"highest priority</span>"
-msgstr ""
+#: kopete/contactlist/kopetelviprops.cpp:393
+msgid "No Contacts with Photo Support"
+msgstr "Dim Cysylltau sy'n Cynnal Ffoto"
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:99
-#. i18n: ectx: property (title), widget (QGroupBox, mGroupBoxAccounts)
-#: rc.cpp:6048 rc.cpp:6048
-msgid "Accounts"
+#: kopete/contactlist/kopetelviprops.cpp:546
+msgid "No contacts were imported from the address book."
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:105
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountAdd)
-#: rc.cpp:6051 rc.cpp:6051
-msgid "Add a new account"
-msgstr ""
+#: kopete/contactlist/kopetelviprops.cpp:547
+msgid "No Change"
+msgstr "Dim Newid"
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:110
-#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountAdd)
-#: rc.cpp:6054 rc.cpp:6054
-msgid ""
-"Add Account\n"
-"KAction replaces\n"
-"these labels!"
+#: kopete/contactlist/contactlistlayoutmanager.cpp:58
+msgid "Placeholder"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:117
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountRemove)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:120
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountRemove)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:117
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountRemove)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:120
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountRemove)
-#: rc.cpp:6059 rc.cpp:6062 rc.cpp:6059 rc.cpp:6062
-msgid "Remove selected account"
+#: kopete/contactlist/contactlistlayoutmanager.cpp:62
+msgid "Contact Icons"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:130
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountModify)
-#: rc.cpp:6068 rc.cpp:6068
-msgid "Modify selected account"
+#: kopete/contactlist/contactlistlayoutmanager.cpp:368
+#, kde-format
+msgid "The layout '%1' is one of the default layouts and cannot be deleted."
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:133
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountModify)
-#: rc.cpp:6071 rc.cpp:6071
-msgid "Lets you edit the account's properties."
+#: kopete/contactlist/contactlistlayoutmanager.cpp:369
+msgid "Cannot Delete Default Layouts"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:143
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountSwitchIdentity)
-#: rc.cpp:6077 rc.cpp:6077
-msgid "Associate the selected account with another identity"
+#: kopete/addaccountwizard/addaccountwizard.cpp:77
+msgctxt ""
+"1st message shown to users on first run of Kopete. Please keep the "
+"formatting."
+msgid ""
+"<h2>Welcome to Kopete</h2><p>Which messaging service do you want to connect "
+"to?</p>"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:146
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountSwitchIdentity)
-#: rc.cpp:6080 rc.cpp:6080
-msgid ""
-"Each account is associated with exactly one identity. You can use this "
-"button to change the association and switch an account to a different "
-"identity"
+#: kopete/addaccountwizard/addaccountwizard.cpp:83
+msgid "Step Two: Account Information"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:149
-#. i18n: ectx: property (text), widget (QPushButton, mButtonAccountSwitchIdentity)
-#: rc.cpp:6083 rc.cpp:6083
-msgid "Switch &Identity..."
+#: kopete/addaccountwizard/addaccountwizard.cpp:89
+msgctxt ""
+"2nd message shown to users on first run of Kopete. Please keep the "
+"formatting."
+msgid ""
+"<h2>Congratulations</h2><p>You have finished configuring the account. You "
+"can add more accounts with <i>Settings->Configure</i>.  Please click the "
+"\"Finish\" button.</p>"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:156
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonAccountSetColor)
-#: rc.cpp:6086 rc.cpp:6086
-msgid "Set a custom color for this account"
+#: kopete/addaccountwizard/addaccountwizard.cpp:169
+#, kde-format
+msgid "Cannot load the %1 protocol plugin."
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:159
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountSetColor)
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:77
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mUseColor)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:159
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonAccountSetColor)
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:77
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mUseColor)
-#: rc.cpp:6089 rc.cpp:6459 rc.cpp:6089 rc.cpp:6459
-msgid ""
-"Account are often differentiated by the protocol icon. But if you have "
-"severals accounts of the same protocol, you may apply a color filter to that "
-"icon to differentiate accounts from the same protocols."
+#: kopete/addaccountwizard/addaccountwizard.cpp:170
+#: kopete/addaccountwizard/addaccountwizard.cpp:179
+msgid "Error While Adding Account"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:185
-#. i18n: ectx: property (title), widget (QGroupBox, mGroupBoxIdentities)
-#: rc.cpp:6095 rc.cpp:6095
-msgid "Identities"
+#: kopete/addaccountwizard/addaccountwizard.cpp:178
+msgid "This protocol does not currently support adding accounts."
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:191
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityAdd)
-#: rc.cpp:6098 rc.cpp:6098
-msgid "Add a new identity"
+#: kopete/main.cpp:28
+msgid "Kopete, the KDE Instant Messenger"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:194
-#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityAdd)
-#: rc.cpp:6101 rc.cpp:6101
-msgid "A&dd Identity..."
+#: kopete/main.cpp:34
+msgid ""
+"(c) 2001-2004, Duncan Mac-Vicar Prett\n"
+"(c) 2002-2008, Kopete Development Team"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:201
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityCopy)
-#: rc.cpp:6104 rc.cpp:6104
-msgid "Create a new identity based on an existing one"
+#: kopete/main.cpp:34
+msgid "kopete-devel@kde.org"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:211
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityRemove)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:214
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonIdentityRemove)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:211
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityRemove)
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:214
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonIdentityRemove)
-#: rc.cpp:6110 rc.cpp:6113 rc.cpp:6110 rc.cpp:6113
-msgid "Remove selected identity"
+#: kopete/main.cpp:36
+msgid "Duncan Mac-Vicar Prett"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:217
-#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentityRemove)
-#: rc.cpp:6116 rc.cpp:6116
-msgid "R&emove"
+#: kopete/main.cpp:36
+msgid "Developer and Project founder"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:224
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentityModify)
-#: rc.cpp:6119 rc.cpp:6119
-msgid "Modify selected identity"
+#: kopete/main.cpp:37
+msgid "Andre Duffeck"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:227
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mButtonIdentityModify)
-#: rc.cpp:6122 rc.cpp:6122
-msgid "Let you edit the account's properties."
+#: kopete/main.cpp:37
+msgid "Developer, Yahoo plugin maintainer"
+msgstr "Datblygwr, cynhaliwr yr ategyn Yahoo"
+
+#: kopete/main.cpp:38
+msgid "Andy Goossens"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:237
-#. i18n: ectx: property (toolTip), widget (QPushButton, mButtonIdentitySetDefault)
-#: rc.cpp:6128 rc.cpp:6128
-msgid "Set the selected identity as default identity"
+#: kopete/main.cpp:39
+msgid "Chris Howells"
 msgstr ""
 
-#. i18n: file: kopete/config/accounts/kopeteaccountconfigbase.ui:240
-#. i18n: ectx: property (text), widget (QPushButton, mButtonIdentitySetDefault)
-#: rc.cpp:6131 rc.cpp:6131
-msgid "&Set Default"
+#: kopete/main.cpp:39
+msgid "Developer, Connection status plugin author"
+msgstr "Datblygwr, cynhaliwr yr ategyn cyflwr cysylltiad"
+
+#: kopete/main.cpp:40
+msgid "Cláudio da Silveira Pinheiro"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:20
-#. i18n: ectx: label
-#: rc.cpp:6140 rc.cpp:6140
-msgid "Emitted when the chat window style has changed."
+#: kopete/main.cpp:40
+msgid "Developer, Video device support"
+msgstr "Datblygwr, cynhaliaeth dyfais fideo"
+
+#: kopete/main.cpp:41
+msgid "Gregg Edghill"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:24
-#. i18n: ectx: label
-#: rc.cpp:6143 rc.cpp:6143
-msgid "Emitted when ChatWindowStyle variant has changed."
+#: kopete/main.cpp:41
+msgid "Developer, MSN"
+msgstr "Datblygwr, MSN"
+
+#: kopete/main.cpp:42
+msgid "Grzegorz Jaskiewicz"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:31
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:6146 rc.cpp:6146
-msgid "Name of a Adium/Kopete chat window style."
+#: kopete/main.cpp:42
+msgid "Developer, Gadu plugin maintainer"
+msgstr "Datblygwr, cynhaliwr yr ategyn Gadu"
+
+#: kopete/main.cpp:43
+msgid "Gustavo Pichorim Boiko"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:36
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:6149 rc.cpp:6149
-msgid "Relative path to a CSS variant for the current style."
+#: kopete/main.cpp:45
+msgid "Matt Rogers"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:39
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:6152 rc.cpp:6152
-msgid "Group consecutive messages from the same user as one block."
+#: kopete/main.cpp:45
+msgid "Lead Developer, AIM and ICQ plugin maintainer"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindowsettings.kcfg:43
-#. i18n: ectx: label, entry, group (Appearance)
-#: rc.cpp:6155 rc.cpp:6155
-msgid "Use a compact variant of the chat style for chatrooms."
+#: kopete/main.cpp:46
+msgid "Michel Hermier"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:20
-#. i18n: ectx: Menu (format)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:14
-#. i18n: ectx: Menu (format)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:20
-#. i18n: ectx: Menu (format)
-#. i18n: file: kopete/chatwindow/kopeteemailwindow.rc:14
-#. i18n: ectx: Menu (format)
-#: rc.cpp:6188 rc.cpp:6212 rc.cpp:6188 rc.cpp:6212
-msgid "&Format"
-msgstr "&Fformat"
+#: kopete/main.cpp:46
+msgid "IRC plugin maintainer"
+msgstr "Cynhaliwr yr ategyn IRC"
 
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:51
-#. i18n: ectx: ToolBar (chatToolBar)
-#: rc.cpp:6200 rc.cpp:6200
-msgid "Chat Toolbar"
+#: kopete/main.cpp:47
+msgid "Lead Developer, Telepathy and Messenger plugin maintainer"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:67
-#. i18n: ectx: ToolBar (formatToolBar)
-#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:32
-#. i18n: ectx: ToolBar (formatToolBar)
-#. i18n: file: kopete/chatwindow/kopetechatwindow.rc:67
-#. i18n: ectx: ToolBar (formatToolBar)
-#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:32
-#. i18n: ectx: ToolBar (formatToolBar)
-#: rc.cpp:6206 rc.cpp:6233 rc.cpp:6206 rc.cpp:6233
-msgid "Format Toolbar"
+#: kopete/main.cpp:48
+msgid "Olivier Goffart"
 msgstr ""
 
-#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:4
-#. i18n: ectx: Menu (format)
-#: rc.cpp:6224 rc.cpp:6224
-msgid "F&ormat"
-msgstr "&Fformat"
-
-#. i18n: file: kopete/chatwindow/kopeterichtexteditpartfull.rc:10
-#. i18n: ectx: Menu (alignment)
-#: rc.cpp:6227 rc.cpp:6227
-msgid "&Alignment"
-msgstr "&Aliniad"
+#: kopete/main.cpp:48
+msgid "Lead Developer, MSN plugin maintainer"
+msgstr "Prif ddatblygwr, cynhaliwr yr ategyn MSN"
 
-#. i18n: file: kopete/identity/identitygeneral.ui:73
-#. i18n: ectx: property (toolTip), widget (QToolButton, selectPhoto)
-#: rc.cpp:6242 rc.cpp:6242
-msgid "Select Photo"
+#: kopete/main.cpp:49
+msgid "Ollivier Lapeyre Johann"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitygeneral.ui:86
-#. i18n: ectx: property (toolTip), widget (QToolButton, clearPhoto)
-#: rc.cpp:6245 rc.cpp:6245
-msgid "Clear Photo"
+#: kopete/main.cpp:49
+msgid "Artist / Developer, Artwork maintainer"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitygeneral.ui:127
-#. i18n: ectx: property (text), widget (QLabel, labelLabel)
-#: rc.cpp:6248 rc.cpp:6248
-msgid "Show as:"
+#: kopete/main.cpp:50
+msgid "Richard Smith"
 msgstr ""
 
-#. i18n: file: kopete/identity/accountidentitybase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AccountIdentityBase)
-#. i18n: file: kopete/identity/accountidentitybase.ui:31
-#. i18n: ectx: property (text), widget (KTitleWidget, title)
-#. i18n: file: kopete/identity/accountidentitybase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AccountIdentityBase)
-#. i18n: file: kopete/identity/accountidentitybase.ui:31
-#. i18n: ectx: property (text), widget (KTitleWidget, title)
-#: rc.cpp:6260 rc.cpp:6263 rc.cpp:6260 rc.cpp:6263
-msgid "Account Identity"
-msgstr ""
+#: kopete/main.cpp:50
+msgid "Developer, UI maintainer"
+msgstr "Datblygwr, cynhaliwr y rhyngwyneb defnyddiwr"
 
-#. i18n: file: kopete/identity/accountidentitybase.ui:38
-#. i18n: ectx: property (text), widget (QLabel, selectText)
-#: rc.cpp:6266 rc.cpp:6266
-msgid "Select the identity to be used by the accounts:"
+#: kopete/main.cpp:51
+msgid "Tiago Salem Herrmann"
 msgstr ""
 
-#. i18n: file: kopete/identity/accountidentitybase.ui:69
-#. i18n: ectx: property (text), widget (QLabel, accounts)
-#: rc.cpp:6269 rc.cpp:6269
-msgid "<img name=foobar> My Account"
+#: kopete/main.cpp:51
+msgid "Developer, WLM plugin maintainer"
 msgstr ""
 
-#. i18n: file: kopete/identity/accountidentitybase.ui:100
-#. i18n: ectx: property (text), widget (QTreeWidget, identityList)
-#: rc.cpp:6272 rc.cpp:6272
-msgid "Identity"
+#: kopete/main.cpp:52
+msgid "Till Gerken"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitystatusbase.ui:73
-#. i18n: ectx: property (text), widget (QLabel, identityName)
-#: rc.cpp:6275 rc.cpp:6275
-msgid "Identity Name"
+#: kopete/main.cpp:52
+msgid "Developer, Jabber plugin maintainer"
+msgstr "Datblygwr, cynhaliwr yr ategyn Jabber"
+
+#: kopete/main.cpp:53
+msgid "Will Stephenson"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitydetailed.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, IdentityDetailed)
-#: rc.cpp:6278 rc.cpp:6278
-msgid "Detailed Info"
+#: kopete/main.cpp:53
+msgid "Lead Developer, GroupWise maintainer"
 msgstr ""
 
-#. i18n: file: kopete/identity/identitydetailed.ui:19
-#. i18n: ectx: property (text), widget (QLabel, emailLabel)
-#: rc.cpp:6281 rc.cpp:6281
-msgid "E-mail: "
+#: kopete/main.cpp:54
+msgid "Rafael Fernández López"
 msgstr ""
 
-#. i18n: file: kopete/kopeteui.rc:5
-#. i18n: ectx: Menu (file)
-#: rc.cpp:6290 rc.cpp:6290
-msgid "&File"
+#: kopete/main.cpp:55
+msgid "Roman Jarosz"
 msgstr ""
 
-#. i18n: file: kopete/kopeteui.rc:65
-#. i18n: ectx: Menu (contact_popup_actions)
-#: rc.cpp:6305 rc.cpp:6305
-msgid "&Other Actions"
-msgstr "Gweithredoedd &eraill"
+#: kopete/main.cpp:55
+msgid "Developer, AIM and ICQ"
+msgstr ""
 
-#. i18n: file: kopete/kopeteui.rc:72
-#. i18n: ectx: Menu (contact_popup_groups)
-#: rc.cpp:6308 rc.cpp:6308
-msgid "&Groups"
-msgstr "&Grwpiau"
+#: kopete/main.cpp:56
+msgid "Charles Connell"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AddressBookExportUI)
-#: rc.cpp:6311 rc.cpp:6311
-msgid "Merge with Address Book"
+#: kopete/main.cpp:57
+msgid "Tejas Dinkar"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:47
-#. i18n: ectx: property (text), widget (QLabel, mLblHomePhone)
-#: rc.cpp:6317 rc.cpp:6317
-msgid "Home phone:"
-msgstr "Ffôn cartref :"
+#: kopete/main.cpp:57
+msgid "Developer, Bonjour Plugin Maintainer"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopeteaddrbookexportui.ui:98
-#. i18n: ectx: property (text), widget (QLabel, mLblUrl)
-#: rc.cpp:6326 rc.cpp:6326
-msgid "URL:"
-msgstr "URL:"
+#: kopete/main.cpp:58
+msgid "Pali Rohár"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kabcexport_page2.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:6335 rc.cpp:6335
-msgid "Selected contacts will be added to the KDE address book."
+#: kopete/main.cpp:58
+msgid "Developer, Skype plugin maintainer"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kabcexport_page2.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, btnSelectAll)
-#: rc.cpp:6338 rc.cpp:6338
-msgid "Select &All"
-msgstr "Dewis Pope&th"
+#: kopete/main.cpp:60
+msgid "Vally8"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kabcexport_page2.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, btnDeselectAll)
-#: rc.cpp:6341 rc.cpp:6341
-msgid "&Deselect All"
-msgstr "Da&tddewis Popeth"
+#: kopete/main.cpp:60
+msgid "Konki style author"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:67
-#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:380
-#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:67
-#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:380
-#. i18n: ectx: property (title), widget (QGroupBox, grpIcons)
-#: rc.cpp:6350 rc.cpp:6422 rc.cpp:6350 rc.cpp:6422
-msgid "Icons"
-msgstr "Eiconau"
+#: kopete/main.cpp:61
+msgid "Tm_T"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:120
-#. i18n: ectx: property (text), widget (QCheckBox, chkUseCustomIcons)
-#: rc.cpp:6353 rc.cpp:6353
-msgid "Use custom &icons"
-msgstr "Defnyddio &eiconau addasiedig"
+#: kopete/main.cpp:61
+msgid "Hacker style author"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:127
-#. i18n: ectx: property (text), widget (QLabel, lblOpen)
-#: rc.cpp:6356 rc.cpp:6356
-msgid "O&pen:"
+#: kopete/main.cpp:62
+msgid "Luciash d' Being"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetegvipropswidget.ui:144
-#. i18n: ectx: property (text), widget (QLabel, lblClosed)
-#: rc.cpp:6359 rc.cpp:6359
-msgid "C&losed:"
+#: kopete/main.cpp:62
+msgid "Kopete's icon author"
+msgstr "Awdur eicon Kopete"
+
+#: kopete/main.cpp:63
+msgid "Steve Cable"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:47
-#. i18n: ectx: property (title), widget (QGroupBox, grpAddressbook)
-#: rc.cpp:6365 rc.cpp:6365
-msgid "Address Book Link"
+#: kopete/main.cpp:63
+msgid "Sounds"
+msgstr "Syniau"
+
+#: kopete/main.cpp:64
+msgid "Jessica Hall"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:91
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnExportKABC)
-#: rc.cpp:6368 rc.cpp:6368
-msgid "Export contact's details to the KDE Address Book"
+#: kopete/main.cpp:64
+msgid "Kopete Docugoddess, Bug and Patch Testing."
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:94
-#. i18n: ectx: property (text), widget (QPushButton, btnExportKABC)
-#: rc.cpp:6371 rc.cpp:6371
-msgid "E&xport Details..."
+#: kopete/main.cpp:65
+msgid "Justin Karneges"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:120
-#. i18n: ectx: property (toolTip), widget (QPushButton, btnImportKABC)
-#: rc.cpp:6374 rc.cpp:6374
-msgid "Import contacts from the KDE Address Book"
+#: kopete/main.cpp:65
+msgid "Iris Jabber Backend Library"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:123
-#. i18n: ectx: property (text), widget (QPushButton, btnImportKABC)
-#: rc.cpp:6377 rc.cpp:6377
-msgid "&Import Contacts"
+#: kopete/main.cpp:66
+msgid "Tom Linsky"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:135
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup1)
-#: rc.cpp:6380 rc.cpp:6380
-msgid "Display Name Source"
+#: kopete/main.cpp:66
+msgid "OscarSocket author"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:141
-#. i18n: ectx: property (text), widget (QRadioButton, radioNameKABC)
-#: rc.cpp:6383 rc.cpp:6383
-msgid "Use address book &name (needs address book link)"
+#: kopete/main.cpp:67
+msgid "Olaf Lueg"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:148
-#. i18n: ectx: property (text), widget (QRadioButton, radioNameContact)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:265
-#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoContact)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:148
-#. i18n: ectx: property (text), widget (QRadioButton, radioNameContact)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:265
-#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoContact)
-#: rc.cpp:6386 rc.cpp:6404 rc.cpp:6386 rc.cpp:6404
-msgid "From contact:"
+#: kopete/main.cpp:67
+msgid "Kmerlin MSN code"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:177
-#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountName)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:294
-#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountPhoto)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:177
-#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountName)
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:294
-#. i18n: ectx: property (toolTip), widget (QComboBox, cmbAccountPhoto)
-#: rc.cpp:6389 rc.cpp:6407 rc.cpp:6389 rc.cpp:6407
-msgid "Contact with which to synchronize the displayname."
+#: kopete/main.cpp:68
+msgid "Chetan Reddy"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:184
-#. i18n: ectx: property (text), widget (QRadioButton, radioNameCustom)
-#: rc.cpp:6392 rc.cpp:6392
-msgid "Cus&tom:"
-msgstr "Adda&siedig :"
+#: kopete/main.cpp:68 kopete/main.cpp:70 kopete/main.cpp:71 kopete/main.cpp:72
+#: kopete/main.cpp:73 kopete/main.cpp:76 kopete/main.cpp:79
+msgid "Former developer"
+msgstr "Cyn-ddatblygwr"
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:213
-#. i18n: ectx: property (title), widget (QGroupBox, buttonGroup2)
-#: rc.cpp:6395 rc.cpp:6395
-msgid "Photo Source"
+#: kopete/main.cpp:69
+msgid "Nick Betcher"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:219
-#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoKABC)
-#: rc.cpp:6398 rc.cpp:6398
-msgid "U&se address book photo (needs address book link)"
+#: kopete/main.cpp:69
+msgid "Former developer, project co-founder"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:305
-#. i18n: ectx: property (text), widget (QRadioButton, radioPhotoCustom)
-#: rc.cpp:6410 rc.cpp:6410
-msgid "Custom:"
-msgstr "Addasiedig:"
+#: kopete/main.cpp:70
+msgid "Ryan Cumming"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:328
-#. i18n: ectx: property (text), widget (QPushButton, btnChoosePhoto)
-#: rc.cpp:6413 rc.cpp:6413
-msgid "Choose..."
+#: kopete/main.cpp:71
+msgid "Stefan Gehn"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:353
-#. i18n: ectx: property (text), widget (QCheckBox, chkSyncPhoto)
-#: rc.cpp:6416 rc.cpp:6416
-msgid "S&ync photo to address book"
+#: kopete/main.cpp:72
+msgid "Martijn Klingens"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:386
-#. i18n: ectx: property (toolTip), widget (QCheckBox, chkUseCustomIcons)
-#: rc.cpp:6425 rc.cpp:6425
-msgid "Check to set custom icons for this contact"
+#: kopete/main.cpp:73
+msgid "Andres Krapf"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:389
-#. i18n: ectx: property (text), widget (QCheckBox, chkUseCustomIcons)
-#: rc.cpp:6428 rc.cpp:6428
-msgid "Use custom status &icons"
+#: kopete/main.cpp:74
+msgid "Carsten Pfeiffer"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:396
-#. i18n: ectx: property (text), widget (QLabel, lblOnline)
-#: rc.cpp:6431 rc.cpp:6431
-msgid "&Online:"
-msgstr "&Ar-lein :"
+#: kopete/main.cpp:74
+msgid "Misc bugfixes and enhancements"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:413
-#. i18n: ectx: property (text), widget (QLabel, lblOffline)
-#: rc.cpp:6434 rc.cpp:6434
-msgid "O&ffline:"
-msgstr "A&ll-lein :"
+#: kopete/main.cpp:75
+msgid "Zack Rusin"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:446
-#. i18n: ectx: property (text), widget (QLabel, lblAway)
-#: rc.cpp:6437 rc.cpp:6437
-msgid "Awa&y:"
-msgstr "I f&fwrdd :"
+#: kopete/main.cpp:75
+msgid "Former developer, original Gadu plugin author"
+msgstr ""
 
-#. i18n: file: kopete/contactlist/kopetemetalvipropswidget.ui:463
-#. i18n: ectx: property (text), widget (QLabel, lblUnknown)
-#: rc.cpp:6440 rc.cpp:6440
-msgid "Un&known:"
+#: kopete/main.cpp:76
+msgid "Richard Stellingwerff"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kabcexport_page1.ui:22
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:6443 rc.cpp:6443
-msgid ""
-"This wizard helps you export instant messaging contacts to the KDE address "
-"book."
+#: kopete/main.cpp:77
+msgid "Daniel Stone"
 msgstr ""
 
-#. i18n: file: kopete/contactlist/kabcexport_page1.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:6446 rc.cpp:6446
-msgid "&Select Address Book"
+#: kopete/main.cpp:77
+msgid "Former developer, Jabber plugin author"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:44
-#. i18n: ectx: property (text), widget (QLabel, m_header)
-#: rc.cpp:6452 rc.cpp:6452
-msgid ""
-"<h2>Congratulations</h2>\n"
-"<p>You have finished configuring the account. Please click the \"Finish\" "
-"button.</p>"
+#: kopete/main.cpp:78
+msgid "Chris TenHarmsel"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:74
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mUseColor)
-#: rc.cpp:6456 rc.cpp:6456
-msgid "Use a custom color for this account"
+#: kopete/main.cpp:78
+msgid "Former developer, Oscar plugin"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:81
-#. i18n: ectx: property (text), widget (QCheckBox, mUseColor)
-#: rc.cpp:6462 rc.cpp:6462
-msgid ""
-"Use &custom color\n"
-"for account:"
+#: kopete/main.cpp:79
+msgid "Hendrik vom Lehn"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:88
-#. i18n: ectx: property (toolTip), widget (KColorButton, mColorButton)
-#: rc.cpp:6466 rc.cpp:6466
-msgid "Account custom color selector"
+#: kopete/main.cpp:80
+msgid "Gav Wood"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:139
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mConnectNow)
-#: rc.cpp:6469 rc.cpp:6469
-msgid "Connect right after Finish is pressed"
+#: kopete/main.cpp:80
+msgid "Former developer and WinPopup maintainer"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:142
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mConnectNow)
-#: rc.cpp:6472 rc.cpp:6472
-msgid ""
-"If this is checked, the account will be connected right after you clicked on "
-"<i>Finished</i>."
+#: kopete/main.cpp:88
+msgid "Do not load plugins. This option overrides all other options."
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage2.ui:145
-#. i18n: ectx: property (text), widget (QCheckBox, mConnectNow)
-#: rc.cpp:6475 rc.cpp:6475
-msgid "Co&nnect now"
+#: kopete/main.cpp:89
+msgid "Disable auto-connection"
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, AddAccountWizardPage1)
-#: rc.cpp:6478 rc.cpp:6478
-msgid "Step One: Select Messaging Service"
+#: kopete/main.cpp:90
+msgid ""
+"Auto-connect the specified accounts. Use a comma-separated list\n"
+"to auto-connect multiple accounts."
 msgstr ""
 
-#. i18n: file: kopete/addaccountwizard/addaccountwizardpage1.ui:32
-#. i18n: ectx: property (text), widget (QLabel, m_header)
-#: rc.cpp:6481 rc.cpp:6481
+#: kopete/main.cpp:92
 msgid ""
-"<h2>Welcome to the Add Account Wizard</h2>\n"
-"<p>Select the messaging service from the list below.</p>"
+"Do not load the specified plugin. Use a comma-separated list\n"
+"to disable multiple plugins."
 msgstr ""
 
-#. i18n: file: kopete/groupkabcselectorwidget.ui:31
-#. i18n: ectx: property (text), widget (QLabel, groupLabel)
-#: rc.cpp:6488 rc.cpp:6488
-msgid "&Group:"
+#: kopete/main.cpp:94
+msgid ""
+"Load only the specified plugins. Use a comma-separated list\n"
+"to load multiple plugins. This option has no effect when\n"
+"--noplugins is set and overrides all other plugin related\n"
+"command line options."
 msgstr ""
 
-#. i18n: file: kopete/groupkabcselectorwidget.ui:44
-#. i18n: ectx: property (text), widget (QLabel, kabcLabel)
-#: rc.cpp:6491 rc.cpp:6491
-msgid "Address book entry:"
+#: kopete/main.cpp:100
+msgid "URLs to pass to kopete / emoticon themes to install"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/korganizer.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/korganizer.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/korganizer.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/korganizer.po	2012-04-18 08:59:26.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: korganizer\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2009-07-18 17:50+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -20,36 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:16+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: kdatenavigator.cpp:202
-#, kde-format
-msgctxt "start/end week number of line in date picker"
-msgid "%1/%2"
-msgstr ""
-
-#: kdatenavigator.cpp:208
-#, kde-format
-msgid "Scroll to week number %1"
-msgstr ""
-
-#: kdatenavigator.cpp:210
-#, kde-format
-msgid ""
-"Click here to scroll the display to week number %1 of the currently "
-"displayed year."
-msgstr ""
-
-#: kdatenavigator.cpp:260
-#, kde-format
-msgid "%1"
-msgstr "%1"
-
-#: kdatenavigator.cpp:262
-#, kde-format
-msgid "A column header of the %1 dates in the month."
-msgstr ""
+"X-Launchpad-Export-Date: 2012-04-18 00:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: publishdialog.cpp:42
 msgid "Select Addresses"
@@ -88,34 +60,85 @@
 msgid "(EmptyEmail)"
 msgstr "(EbostGwag)"
 
-#: themes/themeimporter.cpp:58
-msgid "This file is not a KOrganizer theme file."
+#: searchdialog.cpp:42
+msgid "Search Calendar"
 msgstr ""
 
-#: themes/thememain.cpp:39
-msgid "KOrganizer Theming Stub"
+#: searchdialog.cpp:48
+msgctxt "search in calendar"
+msgid "&Search"
 msgstr ""
 
-#: themes/thememain.cpp:41
-msgid "DO NOT USE - Stub doing various things with KOrganizer themes"
+#: searchdialog.cpp:49
+msgid "Start searching"
 msgstr ""
 
-#: themes/thememain.cpp:43
-msgid "© 2007 Loïc Corbasson"
+#: searchdialog.cpp:102
+msgid ""
+"Invalid search expression, cannot perform the search. Please enter a search "
+"expression using the wildcard characters '*' and '?' where needed."
 msgstr ""
+"Mynegiad chilio annilys, methu gwneud y chwiliad.  Mewnosodwch fynegiad "
+"chwilio gan ddefnyddio'r nodau-chwilio '*' a '?' lle bo angen."
 
-#: themes/thememain.cpp:51
-msgid "Theme to use"
+#: searchdialog.cpp:114
+msgid "No items were found that match your search pattern."
 msgstr ""
 
-#: kohelper.cpp:79
+#: searchdialog.cpp:117
 #, kde-format
-msgid "Unable to save %1 \"%2\"."
+msgid "%1 item"
+msgid_plural "%1 items"
+msgstr[0] ""
+msgstr[1] ""
+
+#: koeventview.cpp:194
+msgid "Also &Future Items"
 msgstr ""
 
-#: kocorehelper.cpp:51
-msgctxt "@item:intext delimiter for joining holiday names"
-msgid ","
+#: koeventview.cpp:204
+msgid ""
+"The item you are trying to change is a recurring item. Should the changes be "
+"applied only to this single occurrence, also to future items, or to all "
+"items in the recurrence?"
+msgstr ""
+
+#: koeventview.cpp:209
+msgid ""
+"The item you are trying to change is a recurring item. Should the changes be "
+"applied only to this single occurrence or to all items in the recurrence?"
+msgstr ""
+
+#: koeventview.cpp:219
+msgid "Changing Recurring Item"
+msgstr ""
+
+#: koeventview.cpp:220
+msgid "Only &This Item"
+msgstr ""
+
+#: koeventview.cpp:222
+msgid "&All Occurrences"
+msgstr ""
+
+#: previewdialog.cpp:53
+msgid "Import Calendar/Event"
+msgstr ""
+
+#: previewdialog.cpp:77
+msgid "&Add as new calendar..."
+msgstr ""
+
+#: previewdialog.cpp:79
+msgid "&Add as new calendar"
+msgstr ""
+
+#: previewdialog.cpp:148
+msgid "*.vcs *.ics|Calendar Files"
+msgstr "*.vcs *.ics|Ffeiliau Calendr"
+
+#: previewdialog.cpp:149
+msgid "Select path for new calendar"
 msgstr ""
 
 #: aboutdata.cpp:30
@@ -151,7 +174,7 @@
 msgid "Former Maintainer"
 msgstr ""
 
-#: aboutdata.cpp:52 kcmdesignerfields.cpp:151 korgac/korgacmain.cpp:74
+#: aboutdata.cpp:52 kcmdesignerfields.cpp:170 korgac/korgacmain.cpp:74
 msgid "Cornelius Schumacher"
 msgstr ""
 
@@ -295,2870 +318,3034 @@
 msgid "Fester Zigterman"
 msgstr ""
 
-#: actionmanager.cpp:164
-#, kde-format
-msgid ""
-"<qt>This will hide the menu bar completely. You can show it again by typing "
-"%1.</qt>"
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:143
+#. i18n: ectx: property (text), item, widget (KComboBox, mSubDays)
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:157
+#. i18n: ectx: property (text), item, widget (KComboBox, mHolidays)
+#: kcmdesignerfields.cpp:82 kcmdesignerfields.cpp:83 kcmdesignerfields.cpp:88
+#: kcmdesignerfields.cpp:89 rc.cpp:1509 rc.cpp:1515
+msgid "Text"
 msgstr ""
 
-#: actionmanager.cpp:372
-msgid "Import &Calendar..."
+#: kcmdesignerfields.cpp:84
+msgid "Numeric Value"
 msgstr ""
 
-#: actionmanager.cpp:374
-msgid "Merge the contents of another iCalendar"
+#: kcmdesignerfields.cpp:85
+msgid "Boolean"
 msgstr ""
 
-#: actionmanager.cpp:376
-msgid ""
-"Select this menu entry if you would like to merge the contents of another "
-"iCalendar into your current calendar."
+#: kcmdesignerfields.cpp:86
+msgid "Selection"
 msgstr ""
 
-#: actionmanager.cpp:381
-msgid "&Import From UNIX Ical Tool"
+#: kcmdesignerfields.cpp:87 kcmdesignerfields.cpp:90
+msgid "Date & Time"
 msgstr ""
 
-#: actionmanager.cpp:383
-msgid "Import a calendar in another format"
+#: kcmdesignerfields.cpp:91
+msgid "Date"
 msgstr ""
 
-#: actionmanager.cpp:385
-msgid ""
-"Select this menu entry if you would like to import the contents of a non-"
-"iCalendar formatted file into your current calendar."
+#: kcmdesignerfields.cpp:164
+msgid "KCMDesignerfields"
 msgstr ""
 
-#: actionmanager.cpp:390
-msgid "Get &Hot New Stuff..."
-msgstr "Cael& y Diweddaraf..."
-
-#: actionmanager.cpp:394
-msgid "Export &Web Page..."
-msgstr "Allfori&o Tudalen Wê"
-
-#: actionmanager.cpp:398
-msgid "Export as &iCalendar..."
+#: kcmdesignerfields.cpp:165
+msgid "Qt Designer Fields Dialog"
 msgstr ""
 
-#: actionmanager.cpp:402
-msgid "Export as &vCalendar..."
+#: kcmdesignerfields.cpp:167
+msgid "(c), 2004 Tobias Koenig"
 msgstr ""
 
-#: actionmanager.cpp:411
-msgid "Archive O&ld Entries..."
-msgstr "Archifio &Hen Gofnodion..."
-
-#: actionmanager.cpp:415
-msgid "Pur&ge Completed To-dos"
+#: kcmdesignerfields.cpp:169
+msgid "Tobias Koenig"
 msgstr ""
 
-#. i18n: file: filteredit_base.ui:44
-#. i18n: ectx: property (text), widget (QPushButton, mDeleteButton)
-#: actionmanager.cpp:442 actionmanager.cpp:660 actionmanager.cpp:1687
-#: actionmanager.cpp:1718 views/todoview/kotodoview.cpp:193
-#: views/journalview/journalview.cpp:196 rc.cpp:11
-msgid "&Delete"
+#: kcmdesignerfields.cpp:209
+#, kde-format
+msgid "<qt>Do you really want to delete '<b>%1</b>'?</qt>"
 msgstr ""
 
-#: actionmanager.cpp:464
-msgid "What's &Next"
-msgstr "Beth sy'n &Nesaf"
-
-#: actionmanager.cpp:469
-msgid "&Month View"
+#: kcmdesignerfields.cpp:220
+msgid "*.ui|Designer Files"
 msgstr ""
 
-#: actionmanager.cpp:474
-msgid "&Agenda"
+#: kcmdesignerfields.cpp:221
+msgid "Import Page"
 msgstr ""
 
-#: actionmanager.cpp:479
-msgid "&Event List"
+#: kcmdesignerfields.cpp:315
+msgid ""
+"<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
+"installed. You will only be able to import existing designer files.</qt>"
 msgstr ""
 
-#: actionmanager.cpp:484
-msgid "&To-do List"
-msgstr "&Rhestr I'w-Wneud"
+#: kcmdesignerfields.cpp:326
+msgid "Available Pages"
+msgstr ""
 
-#: actionmanager.cpp:489
-msgid "&Journal"
-msgstr "&Dyddlyfr"
+#: kcmdesignerfields.cpp:332
+msgid "Preview of Selected Page"
+msgstr ""
 
-#: actionmanager.cpp:494
-msgid "Time&line"
+#: kcmdesignerfields.cpp:352
+#, kde-format
+msgid ""
+"<qt><p>This section allows you to add your own GUI Elements "
+"('<i>Widgets</i>') to store your own values into %1. Proceed as described "
+"below:</p><ol><li>Click on '<i>Edit with Qt Designer</i>'</li><li>In the "
+"dialog, select '<i>Widget</i>', then click <i>OK</i></li><li>Add your "
+"widgets to the form</li><li>Save the file in the directory proposed by Qt "
+"Designer</li><li>Close Qt Designer</li></ol><p>In case you already have a "
+"designer file (*.ui) located somewhere on your hard disk, simply choose "
+"'<i>Import Page</i>'</p><p><b>Important:</b> The name of each input widget "
+"you place within the form must start with '<i>X_</i>'; so if you want the "
+"widget to correspond to your custom entry '<i>X-Foo</i>', set the widget's "
+"<i>name</i> property to '<i>X_Foo</i>'.</p><p><b>Important:</b> The widget "
+"will edit custom fields with an application name of %2.  To change the "
+"application name to be edited, set the widget name in Qt Designer.</p></qt>"
 msgstr ""
 
-#: actionmanager.cpp:499
-msgid "Time&spent"
+#: kcmdesignerfields.cpp:374
+#, kde-format
+msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr ""
 
-#: actionmanager.cpp:505
-msgid "&Refresh"
-msgstr "&Ailfywio"
+#: kcmdesignerfields.cpp:386
+msgid "Delete Page"
+msgstr ""
 
-#: actionmanager.cpp:511
-msgid "F&ilter"
-msgstr "&Hidlo"
+#: kcmdesignerfields.cpp:389
+msgid "Import Page..."
+msgstr ""
 
-#: actionmanager.cpp:524
-msgid "In Horizontally"
+#: kcmdesignerfields.cpp:391
+msgid "Edit with Qt Designer..."
 msgstr ""
 
-#: actionmanager.cpp:530
-msgid "Out Horizontally"
+#: kcmdesignerfields.cpp:415
+msgid "Key:"
 msgstr ""
 
-#: actionmanager.cpp:536
-msgid "In Vertically"
+#: kcmdesignerfields.cpp:417
+msgid "Type:"
 msgstr ""
 
-#: actionmanager.cpp:542
-msgid "Out Vertically"
+#: kcmdesignerfields.cpp:419
+msgid "Classname:"
 msgstr ""
 
-#: actionmanager.cpp:553
-msgctxt "@action Jump to today"
-msgid "To &Today"
+#: kcmdesignerfields.cpp:421 printing/calprintdefaultplugins.cpp:467
+msgid "Description:"
 msgstr ""
 
-#: actionmanager.cpp:554
-msgid "Today"
+#: importdialog.cpp:43
+msgid "Import Calendar"
+msgstr "Mewnforio Calendr"
+
+#: importdialog.cpp:54
+#, kde-format
+msgid ""
+"Please select import method for calendar at\n"
+"\n"
+"%1."
 msgstr ""
 
-#: actionmanager.cpp:555
-msgid "Scroll to Today"
+#: importdialog.cpp:65
+msgid "Add as new calendar"
 msgstr ""
 
-#: actionmanager.cpp:560
-msgctxt "scroll backward"
-msgid "&Backward"
+#: importdialog.cpp:68
+msgid "Merge into existing calendar"
 msgstr ""
 
-#: actionmanager.cpp:561
-msgctxt "scroll backward"
-msgid "Back"
+#: statusdialog.cpp:49
+msgid "Set Your Status"
+msgstr "Gosod Eich Cyflwr"
+
+#: statusdialog.cpp:58
+msgid "Set your status"
+msgstr "Gosod eich cyflwr"
+
+#: koeventviewerdialog.cpp:40
+msgid "Event Viewer"
+msgstr "Gwelydd Digwyddiadau"
+
+#: koeventviewerdialog.cpp:43
+msgid "Edit..."
+msgstr "Golygu..."
+
+#: koeventviewerdialog.cpp:44
+msgid "Show in Context"
 msgstr ""
 
-#: actionmanager.cpp:562
-msgid "Scroll Backward"
+#: akonadicollectionview.cpp:303
+#, kde-format
+msgctxt "@title:window"
+msgid "Properties of Calendar Folder %1"
 msgstr ""
 
-#: actionmanager.cpp:575
-msgctxt "scroll forward"
-msgid "&Forward"
+#: akonadicollectionview.cpp:315
+msgid "&Disable Color"
 msgstr ""
 
-#: actionmanager.cpp:576
-msgctxt "scoll forward"
-msgid "Forward"
+#: akonadicollectionview.cpp:322
+msgid "&Assign Color..."
 msgstr ""
 
-#: actionmanager.cpp:577
-msgid "Scroll Forward"
+#: akonadicollectionview.cpp:328
+msgid "Use as &Default Calendar"
 msgstr ""
 
-#: actionmanager.cpp:585
-msgid "&Day"
-msgstr "&Dydd"
+#: akonadicollectionview.cpp:461
+msgid "Add Calendar"
+msgstr ""
 
-#: actionmanager.cpp:596 actionmanager.cpp:1394 calendarview.cpp:2104
+#: akonadicollectionview.cpp:503
 #, kde-format
-msgid "&Next Day"
-msgid_plural "&Next %1 Days"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Do you really want to delete calendar %1?"
+msgstr ""
 
-#: actionmanager.cpp:598
-msgid "W&ork Week"
-msgstr "W&ythnos Gwaith"
+#: akonadicollectionview.cpp:504
+msgid "Delete Calendar"
+msgstr ""
 
-#: actionmanager.cpp:604
-msgid "&Week"
-msgstr "&Wythnos"
+#: koprefsdialog.cpp:103
+msgctxt "@title:tab personal settings"
+msgid "Personal"
+msgstr ""
 
-#: actionmanager.cpp:611 kodaymatrix.cpp:528
-msgid "New E&vent..."
-msgstr "D&igwyddiad Newydd..."
+#: koprefsdialog.cpp:111
+msgctxt "@title:group email settings"
+msgid "Email Settings"
+msgstr ""
 
-#: actionmanager.cpp:613
-msgid "Create a new Event"
+#: koprefsdialog.cpp:131
+msgctxt "@title:tab"
+msgid "Save"
 msgstr ""
 
-#: actionmanager.cpp:619 views/todoview/kotodoview.cpp:202 kodaymatrix.cpp:530
-msgid "New &To-do..."
-msgstr "&I'w-Gwneud Newydd..."
+#: koprefsdialog.cpp:135
+msgctxt "@title:group"
+msgid "Exporting Calendar"
+msgstr ""
 
-#: actionmanager.cpp:621
-msgid "Create a new To-do"
+#: koprefsdialog.cpp:169
+msgctxt "@title:tab systray settings"
+msgid "System Tray"
 msgstr ""
 
-#: actionmanager.cpp:626 views/todoview/kotodoview.cpp:205
-msgid "New Su&b-to-do..."
-msgstr "Is-I'w-&Gwneud Newydd..."
+#: koprefsdialog.cpp:172
+msgctxt "@title:group"
+msgid "Show/Hide Options"
+msgstr ""
 
-#: actionmanager.cpp:634 kodaymatrix.cpp:532
-msgid "New &Journal..."
+#: koprefsdialog.cpp:181
+msgctxt "@info:tooltip"
+msgid ""
+"Enable this setting to show the KOrganizer reminder daemon in your system "
+"tray (recommended)."
 msgstr ""
 
-#: actionmanager.cpp:636
-msgid "Create a new Journal"
+#: koprefsdialog.cpp:186
+msgctxt "@info"
+msgid ""
+"<note>The daemon will continue running even if it is not shown in the system "
+"tray.</note>"
 msgstr ""
 
-#: actionmanager.cpp:641
-msgid "Configure View..."
+#: koprefsdialog.cpp:195
+msgctxt "@title:tab calendar account settings"
+msgid "Calendars"
 msgstr ""
 
-#: actionmanager.cpp:642
-msgid "Configure"
+#: koprefsdialog.cpp:323
+msgctxt "@title:tab"
+msgid "Regional"
 msgstr ""
 
-#: actionmanager.cpp:643
-msgid "Configure the view"
+#: koprefsdialog.cpp:329
+msgctxt "@title:group"
+msgid "General Time and Date"
 msgstr ""
 
-#: actionmanager.cpp:650 actionmanager.cpp:1681 actionmanager.cpp:1716
-#: views/todoview/kotodoview.cpp:173 koeventpopupmenu.cpp:48
-msgid "&Show"
-msgstr "&Dangos"
+#: koprefsdialog.cpp:340
+msgctxt "@title:group"
+msgid "Holidays"
+msgstr ""
 
-#: actionmanager.cpp:655 actionmanager.cpp:1684 actionmanager.cpp:1717
-#: views/todoview/kotodoview.cpp:177 koeventpopupmenu.cpp:51
-msgid "&Edit..."
-msgstr "&Golygu..."
+#: koprefsdialog.cpp:350
+msgctxt "@label"
+msgid "Use holiday region:"
+msgstr ""
 
-#: actionmanager.cpp:666
-msgid "&Make Sub-to-do Independent"
-msgstr "&Gwneud Is-I'w-Wneud yn Annibynnol"
+#: koprefsdialog.cpp:369
+#, kde-format
+msgctxt "Holday region, region language"
+msgid "%1 (%2)"
+msgstr ""
 
-#: actionmanager.cpp:680
-msgid "&Publish Item Information..."
+#: koprefsdialog.cpp:374
+msgctxt "No holiday region"
+msgid "None"
 msgstr ""
 
-#: actionmanager.cpp:685
-msgid "Send &Invitation to Attendees"
+#: koprefsdialog.cpp:389
+msgctxt "@title:group"
+msgid "Working Period"
 msgstr ""
 
-#: actionmanager.cpp:692
-msgid "Re&quest Update"
+#: koprefsdialog.cpp:407
+msgctxt "@info:whatsthis"
+msgid ""
+"Check this box to make KOrganizer mark the working hours for this day of the "
+"week. If this is a work day for you, check this box, or the working hours "
+"will not be marked with color."
 msgstr ""
 
-#: actionmanager.cpp:699
-msgid "Send &Cancellation to Attendees"
+#: koprefsdialog.cpp:445
+msgctxt "@title:tab"
+msgid "Default Values"
 msgstr ""
 
-#: actionmanager.cpp:706
-msgid "Send Status &Update"
+#: koprefsdialog.cpp:450
+msgctxt "@title:group"
+msgid "Appointments"
 msgstr ""
 
-#: actionmanager.cpp:713
-msgctxt "counter proposal"
-msgid "Request Chan&ge"
+#: koprefsdialog.cpp:468
+msgctxt "@title:group"
+msgid "Reminders"
 msgstr ""
 
-#: actionmanager.cpp:720
-msgid "&Mail Free Busy Information..."
+#: koprefsdialog.cpp:474
+msgctxt "@label"
+msgid "Default reminder time:"
 msgstr ""
 
-#: actionmanager.cpp:725
-msgid "&Send as iCalendar..."
+#: koprefsdialog.cpp:493
+msgctxt "@item:inlistbox reminder units in minutes"
+msgid "minute(s)"
 msgstr ""
 
-#: actionmanager.cpp:730
-msgid "&Upload Free Busy Information"
+#: koprefsdialog.cpp:495
+msgctxt "@item:inlistbox reminder time units in hours"
+msgid "hour(s)"
 msgstr ""
 
-#: actionmanager.cpp:736
-msgid "&Address Book"
+#: koprefsdialog.cpp:497
+msgctxt "@item:inlistbox reminder time units in days"
+msgid "day(s)"
 msgstr ""
 
-#: actionmanager.cpp:744
-msgid "Show Date Navigator"
+#: koprefsdialog.cpp:511
+msgid ""
+"*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|Audio Files (*.ogg "
+"*.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra)"
 msgstr ""
 
-#: actionmanager.cpp:748
-msgid "Show To-do View"
+#: koprefsdialog.cpp:624
+msgctxt "@title:tab general settings"
+msgid "General"
 msgstr ""
 
-#: actionmanager.cpp:752
-msgid "Show Item Viewer"
+#: koprefsdialog.cpp:630 koprefsdialog.cpp:677 koprefsdialog.cpp:735
+#: koprefsdialog.cpp:773
+msgctxt "@title:group"
+msgid "Display Options"
 msgstr ""
 
-#: actionmanager.cpp:767
-msgid "Show Calendar Manager"
+#: koprefsdialog.cpp:638
+msgctxt "@label suffix in the N days spin box"
+msgid " days"
 msgstr ""
 
-#: actionmanager.cpp:780
-msgid "Configure &Date && Time..."
-msgstr "Ffurfweddu &Dyddiad && Amser..."
+#: koprefsdialog.cpp:653
+msgctxt "@title:group"
+msgid "Date Navigator"
+msgstr ""
 
-#: actionmanager.cpp:789
-msgid "Manage View &Filters..."
+#: koprefsdialog.cpp:671
+msgctxt "@title:tab"
+msgid "Agenda View"
 msgstr ""
 
-#: actionmanager.cpp:794
-msgid "Manage C&ategories..."
+#: koprefsdialog.cpp:685
+msgctxt "@label suffix in the hour size spin box"
+msgid " pixels"
 msgstr ""
 
-#: actionmanager.cpp:800
-msgid "&Configure Calendar..."
+#: koprefsdialog.cpp:729
+msgctxt "@title:tab"
+msgid "Month View"
 msgstr ""
 
-#: actionmanager.cpp:960
-msgid ""
-"You have no ical file in your home directory.\n"
-"Import cannot proceed.\n"
+#: koprefsdialog.cpp:767
+msgctxt "@title:tab"
+msgid "Todo View"
 msgstr ""
-"Nid oes gennych ffeil ical yn eich cyfeiriadur cartref.\n"
-" Ni all y mewnforiad fynd ymlaen.\n"
 
-#: actionmanager.cpp:981
-msgid ""
-"KOrganizer successfully imported and merged your .calendar file from ical "
-"into the currently opened calendar."
+#: koprefsdialog.cpp:783
+msgctxt "@title:group"
+msgid "Other Options"
 msgstr ""
-"Mi wnaeth KTrefnydd fewnforio a chyfuno eich ffeil .calendar o ical i'r "
-"calendr agoredig cyfredol."
 
-#: actionmanager.cpp:987
-msgid ""
-"KOrganizer encountered some unknown fields while parsing your .calendar ical "
-"file, and had to discard them; please check to see that all your relevant "
-"data was correctly imported."
+#: koprefsdialog.cpp:829
+msgctxt "@title:tab"
+msgid "Colors"
 msgstr ""
 
-#: actionmanager.cpp:991
-msgid "ICal Import Successful with Warning"
+#: koprefsdialog.cpp:875
+msgctxt "@title:group"
+msgid "Categories"
 msgstr ""
 
-#: actionmanager.cpp:995
+#: koprefsdialog.cpp:893
+msgctxt "@info:whatsthis"
 msgid ""
-"KOrganizer encountered an error parsing your .calendar file from ical; "
-"import has failed."
+"Select here the event category you want to modify. You can change the "
+"selected category color using the button below."
 msgstr ""
 
-#: actionmanager.cpp:999
+#: koprefsdialog.cpp:902
+msgctxt "@info:whatsthis"
 msgid ""
-"KOrganizer does not think that your .calendar file is a valid ical calendar; "
-"import has failed."
+"Choose here the color of the event category selected using the combo box "
+"above."
 msgstr ""
 
-#: actionmanager.cpp:1051
-#, kde-format
-msgid "New calendar '%1'."
+#: koprefsdialog.cpp:910
+msgctxt "@title:group"
+msgid "Resources"
 msgstr ""
 
-#: actionmanager.cpp:1082
-#, kde-format
-msgid "Cannot download calendar from '%1'."
-msgstr "Methu lawrlywtho calendr oddi wrth '%1'."
-
-#: actionmanager.cpp:1114
-msgid "Failed to obtain D-Bus interface for remote configuration."
+#: koprefsdialog.cpp:926
+msgctxt "@info:whatsthis"
+msgid ""
+"Select the calendar you want to modify. You can change the selected calendar "
+"color using the button below."
 msgstr ""
 
-#: actionmanager.cpp:1126
-#, kde-format
-msgid "Merged calendar '%1'."
-msgstr "Calendr '%1' wedi ei gyfuno."
-
-#: actionmanager.cpp:1129
-#, kde-format
-msgid "Opened calendar '%1'."
-msgstr "Calendr '%1' wedi ei agor."
-
-#: actionmanager.cpp:1154
+#: koprefsdialog.cpp:935
+msgctxt "@info:whatsthis"
 msgid ""
-"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to "
-"save in vCalendar format."
+"Choose here the color of the calendar selected using the combo box above."
 msgstr ""
-"Cedwir eich calendr yn fformat iCalendar. Defnyddiwch 'Allforio vCalendar' "
-"i'w gadw mewn fformat vCalendar."
-
-#: actionmanager.cpp:1156
-msgid "Format Conversion"
-msgstr "Trosiad Fformat"
-
-#: actionmanager.cpp:1156 calendarview.cpp:2046
-msgid "Proceed"
-msgstr "Mynd Ymlaen"
-
-#: actionmanager.cpp:1179
-#, kde-format
-msgid "Cannot upload calendar to '%1'"
-msgstr "Methu llwytho calendr i fyny i '%1'"
 
-#: actionmanager.cpp:1186
-#, kde-format
-msgid "Saved calendar '%1'."
-msgstr "Wedi cadw'r calendr '%1'."
+#: koprefsdialog.cpp:944
+msgctxt "@title:tab"
+msgid "Fonts"
+msgstr ""
 
-#: actionmanager.cpp:1222
-#, kde-format
-msgid "Do you want to overwrite file \"%1\"?"
+#: koprefsdialog.cpp:959 koprefsdialog.cpp:967
+msgctxt "@label"
+msgid "Event text"
 msgstr ""
 
-#: actionmanager.cpp:1285
-#, kde-format
-msgid "Unable to save calendar to the file %1."
+#: koprefsdialog.cpp:1105
+msgctxt "@label"
+msgid "Mail transport:"
 msgstr ""
 
-#: actionmanager.cpp:1286
-msgid "Error"
+#: koprefsdialog.cpp:1113
+msgctxt "@label"
+msgid "Additional email addresses:"
 msgstr ""
 
-#: actionmanager.cpp:1313
+#: koprefsdialog.cpp:1115
+msgctxt "@info:whatsthis"
 msgid ""
-"The calendar has been modified.\n"
-"Do you want to save it?"
+"Add, edit or remove additional e-mails addresses here. These email addresses "
+"are the ones you have in addition to the one set in personal preferences. If "
+"you are an attendee of one event, but use another email address there, you "
+"need to list this address here so KOrganizer can recognize it as yours."
 msgstr ""
-"Mae'r calendr wedi newid.\n"
-"A ydych chi eisiau ei gadw?"
 
-#: actionmanager.cpp:1341
-msgid "*.ics *.vcs|Calendar Files"
+#: koprefsdialog.cpp:1129
+msgctxt "@label"
+msgid "Additional email address:"
 msgstr ""
 
-#: actionmanager.cpp:1422
-msgid "Could not start control module for date and time format."
+#: koprefsdialog.cpp:1131
+msgctxt "@info:whatsthis"
+msgid ""
+"Edit additional e-mails addresses here. To edit an address select it from "
+"the list above or press the \"New\" button below. These email addresses are "
+"the ones you have in addition to the one set in personal preferences."
 msgstr ""
 
-#: actionmanager.cpp:1601
-#, kde-format
-msgid "Could not load calendar %1."
+#: koprefsdialog.cpp:1145
+msgctxt "@action:button add a new email address"
+msgid "New"
 msgstr ""
 
-#: actionmanager.cpp:1609
-msgid "The downloaded events will be merged into your current calendar."
-msgstr ""
-"Mi fydd y disgwyddiadau â lawrlwythwyd yn cael eu cyfuno i'ch calendr "
-"cyfredol."
-
-#: actionmanager.cpp:1645
-msgid "&Show Event"
-msgstr "Dango&s Digwyddiad"
-
-#: actionmanager.cpp:1648
-msgid "&Edit Event..."
-msgstr "&Golygu Digwyddiad..."
-
-#: actionmanager.cpp:1651
-msgid "&Delete Event"
-msgstr "&Dileu Digwyddiad"
-
-#: actionmanager.cpp:1658
-msgid "&Show To-do"
-msgstr "Dango&s I'w-Wneud"
-
-#: actionmanager.cpp:1661
-msgid "&Edit To-do..."
-msgstr "&Golygu I'w-Wneud"
-
-#: actionmanager.cpp:1664
-msgid "&Delete To-do"
-msgstr "&Dileu I'w-Wneud"
-
-#: actionmanager.cpp:1807 actionmanager.cpp:1912
-msgid "Attach as &link"
+#: koprefsdialog.cpp:1148
+msgctxt "@info:whatsthis"
+msgid ""
+"Press this button to add a new entry to the additional e-mail addresses "
+"list. Use the edit box above to edit the new entry."
 msgstr ""
 
-#: actionmanager.cpp:1808 actionmanager.cpp:1913
-msgid "Attach &inline"
+#: koprefsdialog.cpp:1153
+msgctxt "@action:button"
+msgid "Remove"
 msgstr ""
 
-#: actionmanager.cpp:1809
-msgid "Attach inline &without attachments"
+#: koprefsdialog.cpp:1196
+msgctxt "@label"
+msgid "(EmptyEmail)"
 msgstr ""
 
-#: actionmanager.cpp:1811 actionmanager.cpp:1915
-msgid "C&ancel"
+#: koprefsdialog.cpp:1424
+msgctxt "@title:column plugin name"
+msgid "Name"
 msgstr ""
 
-#: actionmanager.cpp:1851
-msgid "Removing attachments from an email might invalidate its signature."
+#: koprefsdialog.cpp:1443
+msgctxt "@action:button"
+msgid "Configure &Plugin..."
 msgstr ""
 
-#: actionmanager.cpp:1852
-msgid "Remove Attachments"
+#: koprefsdialog.cpp:1446
+msgctxt "@info:whatsthis"
+msgid ""
+"This button allows you to configure the plugin that you have selected in the "
+"list above"
 msgstr ""
 
-#: actionmanager.cpp:1993 actionmanager.cpp:2002
-msgid "Undo"
+#: koprefsdialog.cpp:1453
+msgctxt "@title:group"
+msgid "Position"
 msgstr ""
 
-#: actionmanager.cpp:1999
-#, kde-format
-msgid "Undo: %1"
+#: koprefsdialog.cpp:1457
+msgctxt "@option:check"
+msgid "Show at the top of the agenda views"
 msgstr ""
 
-#: actionmanager.cpp:2009 actionmanager.cpp:2013
-msgid "Redo"
+#: koprefsdialog.cpp:1459
+msgctxt "@option:check"
+msgid "Show at the bottom of the agenda views"
 msgstr ""
 
-#: actionmanager.cpp:2015
-#, kde-format
-msgid "Redo (%1)"
-msgstr "Ailwneud (%1)"
+#: koprefsdialog.cpp:1494
+msgctxt "@title:group"
+msgid "Calendar Decorations"
+msgstr ""
 
-#: actionmanager.cpp:2029
-#, kde-format
-msgid "URL '%1' is invalid."
+#: koprefsdialog.cpp:1497
+msgctxt "@title:group"
+msgid "Print Plugins"
 msgstr ""
 
-#: previewdialog.cpp:53
-msgid "Import Calendar/Event"
+#: koprefsdialog.cpp:1500
+msgctxt "@title:group"
+msgid "Other Plugins"
 msgstr ""
 
-#: previewdialog.cpp:77
-msgid "&Add as new calendar..."
+#: koprefsdialog.cpp:1569
+msgctxt "@info"
+msgid "Unable to configure this plugin"
 msgstr ""
 
-#: previewdialog.cpp:79
-msgid "&Add as new calendar"
+#: kodaymatrix.cpp:248
+msgctxt "delimiter for joining holiday names"
+msgid ","
 msgstr ""
 
-#: previewdialog.cpp:148
-msgid "*.vcs *.ics|Calendar Files"
-msgstr "*.vcs *.ics|Ffeiliau Calendr"
+#: kodaymatrix.cpp:529 actionmanager.cpp:613
+msgid "New E&vent..."
+msgstr "D&igwyddiad Newydd..."
 
-#: previewdialog.cpp:149
-msgid "Select path for new calendar"
-msgstr ""
+#: kodaymatrix.cpp:531 views/todoview/kotodoview.cpp:204 actionmanager.cpp:621
+msgid "New &To-do..."
+msgstr "&I'w-Gwneud Newydd..."
 
-#: koprefsdialog.cpp:104
-msgctxt "@title:tab personal settings"
-msgid "Personal"
+#: kodaymatrix.cpp:533 actionmanager.cpp:636
+msgid "New &Journal..."
 msgstr ""
 
-#: koprefsdialog.cpp:112
-msgctxt "@title:group email settings"
-msgid "Email Settings"
+#: kodaymatrix.cpp:694
+msgid "&Move"
 msgstr ""
 
-#: koprefsdialog.cpp:130
-msgctxt "@title:tab"
-msgid "Save"
+#: kodaymatrix.cpp:696
+msgid "&Copy"
 msgstr ""
 
-#: koprefsdialog.cpp:134
-msgctxt "@title:group"
-msgid "Exporting Calendar"
-msgstr ""
+#: kodaymatrix.cpp:699
+msgid "&Add"
+msgstr "&Ychwanegu..."
 
-#: koprefsdialog.cpp:168
-msgctxt "@title:tab systray settings"
-msgid "System Tray"
+#: kodaymatrix.cpp:702
+msgid "&Cancel"
 msgstr ""
 
-#: koprefsdialog.cpp:171
-msgctxt "@title:group"
-msgid "Show/Hide Options"
+#: navigatorbar.cpp:47
+msgid "Scroll backward to the previous year"
 msgstr ""
 
-#: koprefsdialog.cpp:180
-msgctxt "@info:tooltip"
+#: navigatorbar.cpp:48
 msgid ""
-"Enable this setting to show the KOrganizer reminder daemon in your system "
-"tray (recommended)."
+"Click this button to scroll the display to the same approximate day of the "
+"previous year"
 msgstr ""
 
-#: koprefsdialog.cpp:185
-msgctxt "@info"
+#: navigatorbar.cpp:53
+msgid "Scroll backward to the previous month"
+msgstr ""
+
+#: navigatorbar.cpp:54
 msgid ""
-"<note>The daemon will continue running even if it is not shown in the system "
-"tray.</note>"
+"Click this button to scroll the display to the same approximate date of the "
+"previous month"
 msgstr ""
 
-#: koprefsdialog.cpp:194
-msgctxt "@title:tab calendar account settings"
-msgid "Calendars"
+#: navigatorbar.cpp:59
+msgid "Scroll forward to the next month"
 msgstr ""
 
-#: koprefsdialog.cpp:315
-msgctxt "@title:tab"
-msgid "Regional"
+#: navigatorbar.cpp:60
+msgid ""
+"Click this button to scroll the display to the same approximate date of the "
+"next month"
 msgstr ""
 
-#: koprefsdialog.cpp:321
-msgctxt "@title:group"
-msgid "General Time and Date"
+#: navigatorbar.cpp:65
+msgid "Scroll forward to the next year"
 msgstr ""
 
-#: koprefsdialog.cpp:332
-msgctxt "@title:group"
-msgid "Holidays"
+#: navigatorbar.cpp:66
+msgid ""
+"Click this button to scroll the display to the same approximate day of the "
+"next year"
 msgstr ""
 
-#: koprefsdialog.cpp:342
-msgctxt "@label"
-msgid "Use holiday region:"
+#: navigatorbar.cpp:74
+msgid "Select a month"
+msgstr "Dewiswch mis"
+
+#: navigatorbar.cpp:81
+msgid "Select a year"
 msgstr ""
 
-#: koprefsdialog.cpp:360
+#: navigatorbar.cpp:134
 #, kde-format
-msgctxt "Holday region, region language"
-msgid "%1 (%2)"
+msgctxt "monthname"
+msgid "%1"
 msgstr ""
 
-#: koprefsdialog.cpp:365
-msgctxt "No holiday region"
-msgid "None"
+#: navigatorbar.cpp:135
+#, kde-format
+msgctxt "4 digit year"
+msgid "%1"
 msgstr ""
 
-#: koprefsdialog.cpp:379
-msgctxt "@title:group"
-msgid "Working Period"
+#: views/multiagendaview/multiagendaview.cpp:47
+#, kde-format
+msgid "Agenda %1"
 msgstr ""
 
-#: koprefsdialog.cpp:397
-msgctxt "@info:whatsthis"
-msgid ""
-"Check this box to make KOrganizer mark the working hours for this day of the "
-"week. If this is a work day for you, check this box, or the working hours "
-"will not be marked with color."
+#: views/multiagendaview/multiagendaview.cpp:324
+msgid "Configure Side-By-Side View"
 msgstr ""
 
-#: koprefsdialog.cpp:435
-msgctxt "@title:tab"
-msgid "Default Values"
+#: views/timespentview/kotimespentview.cpp:67
+msgid "Time Tracker"
 msgstr ""
 
-#: koprefsdialog.cpp:440
-msgctxt "@title:group"
-msgid "Appointments"
-msgstr ""
+#: views/timespentview/kotimespentview.cpp:75
+#, kde-format
+msgctxt "Date from - to"
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: koprefsdialog.cpp:457
-msgctxt "@title:group"
-msgid "Reminders"
+#: views/timespentview/kotimespentview.cpp:144
+msgid "No category"
 msgstr ""
 
-#: koprefsdialog.cpp:463
-msgctxt "@label"
-msgid "Default reminder time:"
+#: views/timespentview/kotimespentview.cpp:186
+#, kde-format
+msgctxt "number of hours spent"
+msgid "%1 hour"
+msgid_plural "%1 hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: views/timespentview/kotimespentview.cpp:187
+#, kde-format
+msgctxt "percent of hours spent"
+msgid " (%1%)"
 msgstr ""
 
-#: koprefsdialog.cpp:479
-msgctxt "@item:inlistbox reminder units in minutes"
-msgid "minute(s)"
+#. i18n: file: korganizer_part.rc:33
+#. i18n: ectx: Menu (edit)
+#. i18n: file: korganizerui.rc:25
+#. i18n: ectx: Menu (edit)
+#: views/journalview/journalview.cpp:184 rc.cpp:1425 rc.cpp:1702
+msgid "&Edit"
 msgstr ""
 
-#: koprefsdialog.cpp:481
-msgctxt "@item:inlistbox reminder time units in hours"
-msgid "hour(s)"
+#: views/journalview/journalview.cpp:187
+msgid "Edit this journal entry"
 msgstr ""
 
-#: koprefsdialog.cpp:483
-msgctxt "@item:inlistbox reminder time units in days"
-msgid "day(s)"
+#: views/journalview/journalview.cpp:188
+msgid "Opens an editor dialog for this journal entry"
 msgstr ""
 
-#: koprefsdialog.cpp:493
-msgid ""
-"*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|Audio Files (*.ogg "
-"*.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra)"
+#. i18n: file: filteredit_base.ui:44
+#. i18n: ectx: property (text), widget (QPushButton, mDeleteButton)
+#: views/journalview/journalview.cpp:194 views/todoview/kotodoview.cpp:195
+#: actionmanager.cpp:445 actionmanager.cpp:662 actionmanager.cpp:1687
+#: actionmanager.cpp:1718 rc.cpp:11
+msgid "&Delete"
 msgstr ""
 
-#: koprefsdialog.cpp:599
-msgctxt "@title:tab general settings"
-msgid "General"
+#: views/journalview/journalview.cpp:198 views/journalview/journalview.cpp:199
+msgid "Delete this journal entry"
 msgstr ""
 
-#: koprefsdialog.cpp:605 koprefsdialog.cpp:652 koprefsdialog.cpp:709
-#: koprefsdialog.cpp:746
-msgctxt "@title:group"
-msgid "Display Options"
+#: views/journalview/journalview.cpp:204
+msgid "&Print"
 msgstr ""
 
-#: koprefsdialog.cpp:613
-msgctxt "@label suffix in the N days spin box"
-msgid " days"
+#: views/journalview/journalview.cpp:208
+msgid "Print this journal entry"
 msgstr ""
 
-#: koprefsdialog.cpp:628
-msgctxt "@title:group"
-msgid "Date Navigator"
+#: views/journalview/journalview.cpp:209
+msgid "Opens a print dialog for this journal entry"
 msgstr ""
 
-#: koprefsdialog.cpp:646
-msgctxt "@title:tab"
-msgid "Agenda View"
+#: views/todoview/kotododelegates.cpp:221
+msgctxt "@action:inmenu Unspecified priority"
+msgid "unspecified"
 msgstr ""
 
-#: koprefsdialog.cpp:660
-msgctxt "@label suffix in the hour size spin box"
-msgid " pixels"
+#: views/todoview/kotododelegates.cpp:222
+msgctxt "@action:inmenu highest priority"
+msgid "1 (highest)"
 msgstr ""
 
-#: koprefsdialog.cpp:703
-msgctxt "@title:tab"
-msgid "Month View"
+#: views/todoview/kotododelegates.cpp:223
+msgctxt "@action:inmenu"
+msgid "2"
 msgstr ""
 
-#: koprefsdialog.cpp:740
-msgctxt "@title:tab"
-msgid "Todo View"
+#: views/todoview/kotododelegates.cpp:224
+msgctxt "@action:inmenu"
+msgid "3"
 msgstr ""
 
-#: koprefsdialog.cpp:756
-msgctxt "@title:group"
-msgid "Other Options"
+#: views/todoview/kotododelegates.cpp:225
+msgctxt "@action:inmenu"
+msgid "4"
 msgstr ""
 
-#: koprefsdialog.cpp:800
-msgctxt "@title:tab"
-msgid "Colors"
+#: views/todoview/kotododelegates.cpp:226
+msgctxt "@action:inmenu medium priority"
+msgid "5 (medium)"
 msgstr ""
 
-#: koprefsdialog.cpp:846
-msgctxt "@title:group"
-msgid "Categories"
+#: views/todoview/kotododelegates.cpp:227
+msgctxt "@action:inmenu"
+msgid "6"
 msgstr ""
 
-#: koprefsdialog.cpp:863
-msgctxt "@info:whatsthis"
-msgid ""
-"Select here the event category you want to modify. You can change the "
-"selected category color using the button below."
+#: views/todoview/kotododelegates.cpp:228
+msgctxt "@action:inmenu"
+msgid "7"
 msgstr ""
 
-#: koprefsdialog.cpp:872
-msgctxt "@info:whatsthis"
-msgid ""
-"Choose here the color of the event category selected using the combo box "
-"above."
+#: views/todoview/kotododelegates.cpp:229
+msgctxt "@action:inmenu"
+msgid "8"
 msgstr ""
 
-#: koprefsdialog.cpp:880
-msgctxt "@title:group"
-msgid "Resources"
+#: views/todoview/kotododelegates.cpp:230
+msgctxt "@action:inmenu lowest priority"
+msgid "9 (lowest)"
 msgstr ""
 
-#: koprefsdialog.cpp:896
-msgctxt "@info:whatsthis"
-msgid ""
-"Select the calendar you want to modify. You can change the selected calendar "
-"color using the button below."
+#: views/todoview/kotodoview.cpp:139
+msgctxt "Checkbox to display todos not hirarchical"
+msgid "Flat View"
+msgstr ""
+
+#: views/todoview/kotodoview.cpp:142
+msgctxt "@info:tooltip"
+msgid "Display to-dos in flat list instead of a tree"
 msgstr ""
 
-#: koprefsdialog.cpp:905
+#: views/todoview/kotodoview.cpp:145
 msgctxt "@info:whatsthis"
 msgid ""
-"Choose here the color of the calendar selected using the combo box above."
+"Checking this option will cause the to-dos to be displayed as a flat list "
+"instead of a hierarchical tree; the parental relationships are removed in "
+"the display."
 msgstr ""
 
-#: koprefsdialog.cpp:914
-msgctxt "@title:tab"
-msgid "Fonts"
-msgstr ""
+#: views/todoview/kotodoview.cpp:176 actionmanager.cpp:652
+#: actionmanager.cpp:1681 actionmanager.cpp:1716 koeventpopupmenu.cpp:48
+msgid "&Show"
+msgstr "&Dangos"
 
-#: koprefsdialog.cpp:929 koprefsdialog.cpp:937
-msgctxt "@label"
-msgid "Event text"
-msgstr ""
+#: views/todoview/kotodoview.cpp:179 actionmanager.cpp:657
+#: actionmanager.cpp:1684 actionmanager.cpp:1717 koeventpopupmenu.cpp:51
+msgid "&Edit..."
+msgstr "&Golygu..."
 
-#: koprefsdialog.cpp:1062
-msgctxt "@label"
-msgid "Mail transport:"
+#: views/todoview/kotodoview.cpp:186 koeventpopupmenu.cpp:54
+msgid "&Print..."
 msgstr ""
 
-#: koprefsdialog.cpp:1071
-msgctxt "@label"
-msgid "Additional email addresses:"
+#: views/todoview/kotodoview.cpp:190 koeventpopupmenu.cpp:57
+msgid "Print Previe&w..."
 msgstr ""
 
-#: koprefsdialog.cpp:1073
-msgctxt "@info:whatsthis"
-msgid ""
-"Add, edit or remove additional e-mails addresses here. These email addresses "
-"are the ones you have in addition to the one set in personal preferences. If "
-"you are an attendee of one event, but use another email address there, you "
-"need to list this address here so KOrganizer can recognize it as yours."
-msgstr ""
+#: views/todoview/kotodoview.cpp:207 actionmanager.cpp:628
+msgid "New Su&b-to-do..."
+msgstr "Is-I'w-&Gwneud Newydd..."
 
-#: koprefsdialog.cpp:1087
-msgctxt "@label"
-msgid "Additional email address:"
+#: views/todoview/kotodoview.cpp:211
+msgid "&Make this To-do Independent"
 msgstr ""
 
-#: koprefsdialog.cpp:1089
-msgctxt "@info:whatsthis"
-msgid ""
-"Edit additional e-mails addresses here. To edit an address select it from "
-"the list above or press the \"New\" button below. These email addresses are "
-"the ones you have in addition to the one set in personal preferences."
+#: views/todoview/kotodoview.cpp:214
+msgid "Make all Sub-to-dos &Independent"
 msgstr ""
 
-#: koprefsdialog.cpp:1103
-msgctxt "@action:button add a new email address"
-msgid "New"
-msgstr ""
+#: views/todoview/kotodoview.cpp:229
+msgid "&Copy To"
+msgstr "&Copïo I"
 
-#: koprefsdialog.cpp:1106
-msgctxt "@info:whatsthis"
-msgid ""
-"Press this button to add a new entry to the additional e-mail addresses "
-"list. Use the edit box above to edit the new entry."
-msgstr ""
+#: views/todoview/kotodoview.cpp:241
+msgid "&Move To"
+msgstr "&Symud I"
 
-#: koprefsdialog.cpp:1111
-msgctxt "@action:button"
-msgid "Remove"
-msgstr ""
+#: views/todoview/kotodoview.cpp:254
+msgctxt "delete completed to-dos"
+msgid "Pur&ge Completed"
+msgstr "&Carthiad wedi'i Gwblhau"
 
-#: koprefsdialog.cpp:1150
-msgctxt "@label"
-msgid "(EmptyEmail)"
+#: views/todoview/kotodoview.cpp:258
+msgctxt "unspecified priority"
+msgid "unspecified"
 msgstr ""
 
-#: koprefsdialog.cpp:1377
-msgctxt "@title:column plugin name"
-msgid "Name"
+#: views/todoview/kotodoview.cpp:259
+msgctxt "highest priority"
+msgid "1 (highest)"
 msgstr ""
 
-#: koprefsdialog.cpp:1396
-msgctxt "@action:button"
-msgid "Configure &Plugin..."
-msgstr ""
+#: views/todoview/kotodoview.cpp:260
+msgid "2"
+msgstr "2"
 
-#: koprefsdialog.cpp:1399
-msgctxt "@info:whatsthis"
-msgid ""
-"This button allows you to configure the plugin that you have selected in the "
-"list above"
-msgstr ""
+#: views/todoview/kotodoview.cpp:261
+msgid "3"
+msgstr "3"
 
-#: koprefsdialog.cpp:1406
-msgctxt "@title:group"
-msgid "Position"
-msgstr ""
+#: views/todoview/kotodoview.cpp:262
+msgid "4"
+msgstr "4"
 
-#: koprefsdialog.cpp:1410
-msgctxt "@option:check"
-msgid "Show at the top of the agenda views"
+#: views/todoview/kotodoview.cpp:263
+msgctxt "medium priority"
+msgid "5 (medium)"
 msgstr ""
 
-#: koprefsdialog.cpp:1412
-msgctxt "@option:check"
-msgid "Show at the bottom of the agenda views"
-msgstr ""
+#: views/todoview/kotodoview.cpp:264
+msgid "6"
+msgstr "6"
 
-#: koprefsdialog.cpp:1447
-msgctxt "@title:group"
-msgid "Calendar Decorations"
-msgstr ""
+#: views/todoview/kotodoview.cpp:265
+msgid "7"
+msgstr "7"
 
-#: koprefsdialog.cpp:1450
-msgctxt "@title:group"
-msgid "Print Plugins"
-msgstr ""
+#: views/todoview/kotodoview.cpp:266
+msgid "8"
+msgstr "8"
 
-#: koprefsdialog.cpp:1453
-msgctxt "@title:group"
-msgid "Other Plugins"
+#: views/todoview/kotodoview.cpp:267
+msgctxt "lowest priority"
+msgid "9 (lowest)"
 msgstr ""
 
-#: koprefsdialog.cpp:1522
-msgctxt "@info"
-msgid "Unable to configure this plugin"
+#: views/todoview/kotodoviewquicksearch.cpp:61
+msgctxt "@label in QuickSearchLine"
+msgid "Search"
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:45
-msgid "Configure Picture of the Day"
+#: views/todoview/kotodoviewquicksearch.cpp:69
+msgctxt "@item:inlistbox"
+msgid "Select Categories"
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:55
-msgid "Thumbnail Aspect Ratio Mode"
+#: views/todoview/kotodoviewquicksearch.cpp:70
+msgctxt "@item:intext delimiter for joining category names"
+msgid ","
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:61
-msgid "Ignore aspect ratio"
+#: views/todoview/kotodoviewview.cpp:62
+msgid "View Columns"
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:62
-msgid ""
-"The thumbnail will be scaled freely. The aspect ratio will not be preserved."
+#: views/todoview/kotodomodel.cpp:671
+msgctxt "yes, recurring to-do"
+msgid "Yes"
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:66
-msgid "Keep aspect ratio"
+#: views/todoview/kotodomodel.cpp:672
+msgctxt "no, not a recurring to-do"
+msgid "No"
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:67
-msgid ""
-"The thumbnail will be scaled to a rectangle as large as possible inside a "
-"given rectangle, preserving the aspect ratio."
+#: views/todoview/kotodomodel.cpp:689
+msgctxt "delimiter for joining category names"
+msgid ","
 msgstr ""
 
-#: plugins/picoftheday/configdialog.cpp:72
-msgid "Keep aspect ratio by expanding"
-msgstr ""
+#: views/todoview/kotodomodel.cpp:816
+msgid "Summary"
+msgstr "Crynodeb"
 
-#: plugins/picoftheday/configdialog.cpp:74
-msgid ""
-"The thumbnail will be scaled to a rectangle as small as possible outside a "
-"given rectangle, preserving the aspect ratio."
-msgstr ""
+#: views/todoview/kotodomodel.cpp:818
+msgid "Recurs"
+msgstr "Yn Ail-ddigwydd"
 
-#: plugins/picoftheday/picoftheday.cpp:67
-msgid ""
-"<qt>This plugin provides the Wikipedia <i>Picture of the Day</i>.</qt>"
-msgstr ""
+#: views/todoview/kotodomodel.cpp:820 printing/calprintdefaultplugins.cpp:1497
+msgid "Priority"
+msgstr "Blaenoriaeth"
 
-#: plugins/picoftheday/picoftheday.cpp:91
-msgid "Loading..."
+#: views/todoview/kotodomodel.cpp:822
+msgctxt "@title:column percent complete"
+msgid "Complete"
 msgstr ""
 
-#: plugins/picoftheday/picoftheday.cpp:92
-msgid "<qt>Loading <i>Picture of the Day</i>...</qt>"
+#: views/todoview/kotodomodel.cpp:824
+msgid "Due Date/Time"
 msgstr ""
 
-#: plugins/picoftheday/picoftheday.cpp:197
-msgid "Picture Page"
-msgstr ""
+#. i18n: file: filteredit_base.ui:188
+#. i18n: ectx: property (title), widget (QGroupBox, mCategoriesButtonGroup)
+#: views/todoview/kotodomodel.cpp:826 rc.cpp:47
+msgid "Categories"
+msgstr "Categorïau"
 
-#: plugins/datenums/configdialog.cpp:46
-msgid "Configure Day Numbers"
+#: views/todoview/kotodomodel.cpp:828
+msgid "Description"
 msgstr ""
 
-#: plugins/datenums/configdialog.cpp:56
-msgid "Show Date Number"
-msgstr ""
+#. i18n: file: htmlexportsettings.kcfg:31
+#. i18n: file: htmlexportsettings.kcfg:79
+#: views/todoview/kotodomodel.cpp:830 korganizer.cpp:277 rc.cpp:1679
+#: rc.cpp:1681
+msgid "Calendar"
+msgstr "Calendr"
 
-#: plugins/datenums/configdialog.cpp:62
-msgid "Show day number"
+#: views/todoview/kotodomodel.cpp:1005
+msgid "Cannot move to-do to itself or a child of itself."
 msgstr ""
 
-#: plugins/datenums/configdialog.cpp:65
-msgid "Show days to end of year"
-msgstr ""
+#: views/todoview/kotodomodel.cpp:1006
+msgid "Drop To-do"
+msgstr "Gwaredu I'w-Wneud"
 
-#: plugins/datenums/configdialog.cpp:68
-msgid "Show both"
+#: views/todoview/kotodoviewquickaddline.cpp:38
+msgid "Click to add a new to-do"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:60
-msgid "This plugin shows information on a day's position in the year."
-msgstr ""
+#: views/whatsnextview/kowhatsnextview.cpp:85
+msgid "What's Next?"
+msgstr "Beth sydd nesaf?"
 
-#: plugins/datenums/datenums.cpp:78
+#: views/whatsnextview/kowhatsnextview.cpp:93
+#: views/whatsnextview/kowhatsnextview.cpp:278
+#: plugins/printing/year/yearprint.cpp:176
 #, kde-format
-msgid "1 day before the end of the year"
-msgid_plural "%1 days before the end of the year"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "date from - to"
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: plugins/datenums/datenums.cpp:85
+#: views/whatsnextview/kowhatsnextview.cpp:113
+msgid "Events:"
+msgstr "Digwyddiadau:"
+
+#: views/whatsnextview/kowhatsnextview.cpp:156
+msgid "To-do:"
+msgstr "I'w-Wneud:"
+
+#: views/whatsnextview/kowhatsnextview.cpp:194
+#: views/whatsnextview/kowhatsnextview.cpp:215
+msgid "Events and to-dos that need a reply:"
+msgstr "Digwyddiadau ac I'w-Gwneud sydd angen ateb:"
+
+#: views/whatsnextview/kowhatsnextview.cpp:285
 #, kde-format
-msgctxt "dayOfYear / daysTillEndOfYear"
-msgid "%1 / %2"
-msgstr "%1 / %2"
+msgctxt "date, from - to"
+msgid "%1, %2 - %3"
+msgstr ""
 
-#: plugins/datenums/datenums.cpp:87
+#: views/whatsnextview/kowhatsnextview.cpp:322
 #, kde-format
-msgid "1 day since the beginning of the year,\n"
-msgid_plural "%1 days since the beginning of the year,\n"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "to-do due date"
+msgid "  (Due: %1)"
+msgstr ""
 
-#: plugins/datenums/datenums.cpp:90
+#: history.cpp:315
 #, kde-format
-msgid "1 day until the end of the year"
-msgid_plural "%1 days until the end of the year"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Delete %1"
+msgstr "Dileu %1"
 
-#: plugins/datenums/datenums.cpp:122
+#: history.cpp:353
 #, kde-format
-msgctxt "Week weekOfYear"
-msgid "Week %1"
-msgstr ""
+msgid "Add %1"
+msgstr "Ychwanegu %1"
 
-#: plugins/datenums/datenums.cpp:123 plugins/datenums/datenums.cpp:138
-#: plugins/datenums/datenums.cpp:146
+#: history.cpp:389
 #, kde-format
-msgid "1 week since the beginning of the year"
-msgid_plural "%1 weeks since the beginning of the year"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Edit %1"
+msgstr "Golygu %1"
 
-#: plugins/datenums/datenums.cpp:130
+#: printing/calprintpluginbase.cpp:137
+msgid "This printing style does not have any configuration options."
+msgstr "Nid oes dewisiadau ffurfweddu gan yr arddull argraffu yma."
+
+#: printing/calprintpluginbase.cpp:287
+msgid "Holiday"
+msgstr "Gŵyl"
+
+#: printing/calprintpluginbase.cpp:620
 #, kde-format
-msgctxt "weekOfYear (year)"
-msgid "%1 (%2)"
+msgctxt "print date: formatted-datetime"
+msgid "printed: %1"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:132
+#: printing/calprintpluginbase.cpp:979 printing/calprintpluginbase.cpp:1094
+#: printing/calprintpluginbase.cpp:1149
+#: printing/calprintdefaultplugins.cpp:902
 #, kde-format
-msgctxt "Week weekOfYear (year)"
-msgid "Week %1 (%2)"
+msgctxt "summary, location"
+msgid "%1, %2"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:153
+#: printing/calprintpluginbase.cpp:985
 #, kde-format
-msgid "1 week remaining"
-msgid_plural "%1 weeks remaining"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "starttime - endtime summary"
+msgid "%1-%2 %3"
+msgstr ""
 
-#: plugins/datenums/datenums.cpp:156
+#: printing/calprintpluginbase.cpp:991
 #, kde-format
-msgid "1 week until the end of the year"
-msgid_plural "%1 weeks until the end of the year"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "starttime - endtime summary, location"
+msgid "%1-%2 %3, %4"
+msgstr ""
 
-#: plugins/datenums/datenums.cpp:160
+#: printing/calprintpluginbase.cpp:1038
 #, kde-format
-msgctxt "weekOfYear / weeksTillEndOfYear"
-msgid "%1 / %2"
+msgctxt "weekday, shortmonthname daynumber"
+msgid "%1, %2 <numid>%3</numid>"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:179
+#: printing/calprintpluginbase.cpp:1158
 #, kde-format
-msgctxt ""
-"n weeks since the beginning of the year\n"
-"n weeks until the end of the year"
-msgid ""
-"%1\n"
-"%2"
+msgctxt "to-do summary (Due: datetime)"
+msgid "%1 (Due: %2)"
 msgstr ""
 
-#: plugins/hebrew/holiday.cpp:74
-msgctxt ""
-"These are Jewish holidays and mostly do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters."
-msgid "Sh. HaHodesh"
+#: printing/calprintpluginbase.cpp:1162
+#, kde-format
+msgctxt "to-do summary (Due: date)"
+msgid "%1 (Due: %2)"
 msgstr ""
 
-#: plugins/hebrew/holiday.cpp:82
-msgid "Erev Pesach"
-msgstr "Erev Pesach"
-
-#: plugins/hebrew/holiday.cpp:93
-msgid "Sh. HaGadol"
-msgstr "Sh. HaGadol"
+#: printing/calprintpluginbase.cpp:1171
+#, kde-format
+msgid "To-do: %1"
+msgstr "I'w-Wneud: %1"
 
-#: plugins/hebrew/holiday.cpp:101
-msgid "Pesach"
-msgstr "Pesach"
+#: printing/calprintpluginbase.cpp:1906
+#, kde-format
+msgid "%1%"
+msgstr "%1%"
 
-#: plugins/hebrew/holiday.cpp:112 plugins/hebrew/holiday.cpp:284
-msgid "Chol Hamoed"
-msgstr "Chol Hamoed"
+#: printing/calprintpluginbase.cpp:2040
+#, kde-format
+msgctxt "Description - date"
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: plugins/hebrew/holiday.cpp:118
-msgid "Yom HaShoah"
-msgstr "Yom HaShoah"
+#: printing/calprintpluginbase.cpp:2059
+#, kde-format
+msgid "Person: %1"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:141 plugins/hebrew/holiday.cpp:148
-#: plugins/hebrew/holiday.cpp:159
-msgid "Yom HaAtzmaut"
-msgstr "Yom HaAtzmaut"
+#: printing/calprintpluginbase.cpp:2083
+#, kde-format
+msgctxt "Date range: Month dayStart - dayEnd"
+msgid "%1 %2 - %3"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:143 plugins/hebrew/holiday.cpp:157
-msgid "Yom HaZikaron"
-msgstr "Yom HaZikaron"
+#: printing/calprintpluginbase.cpp:2088
+#, kde-format
+msgctxt "Date range: monthStart dayStart - monthEnd dayEnd"
+msgid "%1 %2 - %3 %4"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:167
-msgid "Yom Yerushalayim"
-msgstr "Yom Yerushalayim"
+#: printing/calprintdefaultplugins.cpp:146
+#: printing/calprintdefaultplugins.cpp:175
+#: printing/calprintdefaultplugins.cpp:194
+msgid "Start date: "
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:171
-msgid "Lag BaOmer"
-msgstr "Lag BaOmer"
+#: printing/calprintdefaultplugins.cpp:150
+#: printing/calprintdefaultplugins.cpp:179
+msgid "No start date"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:197
-msgid "Erev Shavuot"
-msgstr "Erev Shavuot"
+#: printing/calprintdefaultplugins.cpp:155
+msgid "End date: "
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:201
-msgid "Shavuot"
-msgstr "Shavuot"
+#: printing/calprintdefaultplugins.cpp:159
+msgid "Duration: "
+msgstr "Hyd: "
 
-#: plugins/hebrew/holiday.cpp:211
-msgid "Tzom Tammuz"
-msgstr "Tzom Tammuz"
+#: printing/calprintdefaultplugins.cpp:162
+#, kde-format
+msgid "1 hour "
+msgid_plural "%1 hours "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/holiday.cpp:219
-msgid "Sh. Hazon"
-msgstr "Sh. Hazon"
+#: printing/calprintdefaultplugins.cpp:165
+#, kde-format
+msgid "1 minute "
+msgid_plural "%1 minutes "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/holiday.cpp:221
-msgid "Sh. Nahamu"
-msgstr "Sh. Nahamu"
+#: printing/calprintdefaultplugins.cpp:168
+msgid "No end date"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:226
-msgid "Tisha B'Av"
-msgstr "Tisha B'Av"
+#: printing/calprintdefaultplugins.cpp:184
+msgid "Due date: "
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:232
-msgid "S'lichot"
-msgstr "S'lichot"
+#: printing/calprintdefaultplugins.cpp:188
+msgid "No due date"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:234
-msgid "Erev R.H."
-msgstr "Erev R.H."
+#: printing/calprintdefaultplugins.cpp:317
+msgctxt "except for listed dates"
+msgid " except"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:241
-msgid "Rosh Hashana"
-msgstr "Rosh Hashana"
+#: printing/calprintdefaultplugins.cpp:325
+msgid "Repeats: "
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:245 plugins/hebrew/holiday.cpp:260
-msgid "Sh. Shuvah"
-msgstr "Sh. Shuvah"
+#: printing/calprintdefaultplugins.cpp:335
+msgid "No reminders"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:247 plugins/hebrew/holiday.cpp:252
-msgid "Tzom Gedalia"
-msgstr "Tzom Gedalia"
+#: printing/calprintdefaultplugins.cpp:338
+#, kde-format
+msgid "Reminder: "
+msgid_plural "%1 reminders: "
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/holiday.cpp:264
-msgid "Erev Y.K."
-msgstr "Erev Y.K."
+#: printing/calprintdefaultplugins.cpp:352
+#, kde-format
+msgctxt "N days/hours/minutes before/after the start/end"
+msgid "%1 before the start"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:267
-msgid "Yom Kippur"
-msgstr "Yom Kippur"
+#: printing/calprintdefaultplugins.cpp:356
+#, kde-format
+msgctxt "N days/hours/minutes before/after the start/end"
+msgid "%1 after the start"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:270
-msgid "Erev Sukkot"
-msgstr "Erev Sukkot"
+#: printing/calprintdefaultplugins.cpp:362
+#, kde-format
+msgctxt "N days/hours/minutes before/after the start/end"
+msgid "%1 before the end"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:275
-msgid "Sukkot"
-msgstr "Sukkot"
+#: printing/calprintdefaultplugins.cpp:366
+#, kde-format
+msgctxt "N days/hours/minutes before/after the start/end"
+msgid "%1 after the end"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:288
-msgid "Hoshana Rabah"
-msgstr "Hoshana Rabah"
+#: printing/calprintdefaultplugins.cpp:375
+#, kde-format
+msgid "1 day"
+msgid_plural "%1 days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/holiday.cpp:291
-msgid "Shmini Atzeret"
-msgstr "Shmini Atzeret"
+#: printing/calprintdefaultplugins.cpp:378
+#, kde-format
+msgid "1 hour"
+msgid_plural "%1 hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/holiday.cpp:295
-msgid "Simchat Torah"
-msgstr "Simchat Torah"
+#: printing/calprintdefaultplugins.cpp:381
+#, kde-format
+msgid "1 minute"
+msgid_plural "%1 minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/holiday.cpp:306
-msgid "Erev Hanukah"
-msgstr "Erev Hanukah"
+#: printing/calprintdefaultplugins.cpp:385
+#: printing/calprintdefaultplugins.cpp:657
+msgctxt "Spacer for the joined list of categories"
+msgid ", "
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:308 plugins/hebrew/holiday.cpp:316
-msgid "Hanukah"
-msgstr "Hanukah"
+#: printing/calprintdefaultplugins.cpp:392
+msgid "Organizer: "
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:404
+msgid "Location: "
+msgstr "Lleoliad: "
+
+#: printing/calprintdefaultplugins.cpp:480
+msgid "Notes:"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:488
+msgid "No Subitems"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:491
+#, kde-format
+msgid "1 Subitem:"
+msgid_plural "%1 Subitems:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: printing/calprintdefaultplugins.cpp:510
+msgctxt "no status"
+msgid "none"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:512
+msgctxt "unknown status"
+msgid "unknown"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:520
+#, kde-format
+msgctxt "subitem start date"
+msgid "Start Date: %1\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:525
+#, kde-format
+msgctxt "subitem start time"
+msgid "Start Time: %1\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:532
+#, kde-format
+msgctxt "subitem due date"
+msgid "Due Date: %1\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:539
+#, kde-format
+msgctxt "subitem due time"
+msgid "Due Time: %1\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:545
+#, kde-format
+msgctxt "subitem counter"
+msgid "%1: "
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:553
+#, kde-format
+msgctxt "subitem Status: statusString"
+msgid "Status: %1\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:557
+#, kde-format
+msgctxt "subitem Priority: N"
+msgid "Priority: <numid>%1</numid>\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:560
+#, kde-format
+msgctxt "subitem Secrecy: secrecyString"
+msgid "Secrecy: %1\n"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:574
+msgid "No Attachments"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:577
+#, kde-format
+msgid "1 Attachment:"
+msgid_plural "%1 Attachments:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: printing/calprintdefaultplugins.cpp:585
+msgctxt "Spacer for list of attachments"
+msgid "  "
+msgstr "  "
+
+#: printing/calprintdefaultplugins.cpp:598
+msgid "No Attendees"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:600
+#, kde-format
+msgid "1 Attendee:"
+msgid_plural "%1 Attendees:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: printing/calprintdefaultplugins.cpp:614
+#, kde-format
+msgctxt ""
+"Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+"<reinhold@kainhofer.com> (Participant): Awaiting Response'"
+msgid "%1 (%2): %3"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:627
+#, kde-format
+msgid "Status: %1"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:631
+#, kde-format
+msgid "Secrecy: %1"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:637
+msgid "Show as: Busy"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:639
+msgid "Show as: Free"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:645
+msgid "This task is overdue!"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:651
+msgid "Settings: "
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:656
+msgid "Categories: "
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:814
+#: printing/calprintdefaultplugins.cpp:1100
+#, kde-format
+msgctxt "date from-to"
+msgid "%1 - %2"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:816
+#: printing/calprintdefaultplugins.cpp:1102
+#, kde-format
+msgctxt ""
+"date from-\n"
+"to"
+msgid ""
+"%1 -\n"
+"%2"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:879
+msgid "Today's Events"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1125
+#, kde-format
+msgctxt "date from - to (week number)"
+msgid "%1 - %2 (Week %3)"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1128
+#, kde-format
+msgctxt ""
+"date from -\n"
+"to (week number)"
+msgid ""
+"%1 -\n"
+"%2 (Week %3)"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1315
+#, kde-format
+msgctxt "monthname year"
+msgid "%1 <numid>%2</numid>"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1416
+msgctxt "@option sort by title"
+msgid "Title"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1417
+msgctxt "@option sort by start date/time"
+msgid "Start Date"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1418
+msgctxt "@option sort by due date/time"
+msgid "Due Date"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1419
+msgctxt "@option sort by priority"
+msgid "Priority"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1420
+msgctxt "@option sort by percent completed"
+msgid "Percent Complete"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1426
+msgctxt "@option sort in increasing order"
+msgid "Ascending"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1427
+msgctxt "@option sort in descreasing order"
+msgid "Descending"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1437
+msgid "To-do list"
+msgstr "Rhestr I'w-Wneud"
+
+#: printing/calprintdefaultplugins.cpp:1504
+msgctxt "@label to-do summary"
+msgid "Title"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1512
+msgctxt "@label to-do percentage complete"
+msgid "Complete"
+msgstr ""
+
+#: printing/calprintdefaultplugins.cpp:1520
+msgctxt "@label to-do due date"
+msgid "Due"
+msgstr ""
+
+#: printing/calprintdefaultplugins.h:49
+msgid "Print &incidence"
+msgstr ""
+
+#: printing/calprintdefaultplugins.h:53
+msgid "Prints an incidence on one page"
+msgstr ""
+
+#: printing/calprintdefaultplugins.h:100
+msgid "Print da&y"
+msgstr "Argraffu& diwrnod"
+
+#: printing/calprintdefaultplugins.h:104
+msgid "Prints all events of a single day on one page"
+msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
+
+#: printing/calprintdefaultplugins.h:145
+msgid "Print &week"
+msgstr "Argraf&fu wythnos"
+
+#: printing/calprintdefaultplugins.h:149
+msgid "Prints all events of one week on one page"
+msgstr "Argraffu pob digwyddiad wythnos sengl ar un dudalen"
+
+#: printing/calprintdefaultplugins.h:194
+msgid "Print mont&h"
+msgstr "Argraffu m&is"
 
-#: plugins/hebrew/holiday.cpp:320
-msgid "Tzom Tevet"
-msgstr "Tzom Tevet"
+#: printing/calprintdefaultplugins.h:198
+msgid "Prints all events of one month on one page"
+msgstr "Argraffu pob digwyddiad mis sengl ar un dudalen"
 
-#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:339
-#: plugins/hebrew/holiday.cpp:344 plugins/hebrew/holiday.cpp:349
-msgid "Sh. Shirah"
-msgstr "Sh. Shirah"
+#: printing/calprintdefaultplugins.h:238
+msgid "Print to-&dos"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:346
-msgid "Tu B'Shvat"
-msgstr "Tu B'Shvat"
+#: printing/calprintdefaultplugins.h:242
+msgid "Prints all to-dos in a (tree-like) list"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:360 plugins/hebrew/holiday.cpp:372
-#: plugins/hebrew/holiday.cpp:380
-msgid "Sh. Shekalim"
-msgstr "Sh. Shekalim"
+#: printing/calprinter.cpp:132
+msgid "Unable to print, no valid print style was returned."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:369
-msgid "Purim Katan"
-msgstr "Purim Katan"
+#: printing/calprinter.cpp:133
+msgid "Printing error"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:388 plugins/hebrew/holiday.cpp:408
-msgid "Ta'anit Ester"
-msgstr "Ta'anit Ester"
+#: printing/calprinter.cpp:175
+msgid "Print"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:397 plugins/hebrew/holiday.cpp:402
-msgid "Sh. Zachor"
-msgstr "Sh. Zachor"
+#: printing/calprinter.cpp:184
+msgid "Print Style"
+msgstr "Arddull Argraffu"
 
-#: plugins/hebrew/holiday.cpp:404
-msgid "Erev Purim"
-msgstr "Erev Purim"
+#: printing/calprinter.cpp:195
+msgid "Page &orientation:"
+msgstr "Cyf&eiriadaeth y dudalen:"
 
-#: plugins/hebrew/holiday.cpp:412
-msgid "Purim"
-msgstr "Purim"
+#: printing/calprinter.cpp:200
+msgid "Use Default Orientation of Selected Style"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:416 plugins/hebrew/holiday.cpp:421
-msgid "Shushan Purim"
-msgstr "Shushan Purim"
+#: printing/calprinter.cpp:201
+msgid "Use Printer Default"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:432
-msgid "Sh. Parah"
-msgstr "Sh. Parah"
+#: printing/calprinter.cpp:202
+msgid "Portrait"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:442
-msgid "Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
+#: printing/calprinter.cpp:203
+msgid "Landscape"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:459
-msgid " Omer"
-msgstr " Omer"
+#: printing/calprinter.cpp:253
+msgid "&Preview"
+msgstr "&Rhagolwg"
 
-#: plugins/hebrew/hebrew.cpp:85
+#: actionmanager.cpp:164
 #, kde-format
-msgctxt ""
-"Change the next two strings if emphasis is done differently in your language."
 msgid ""
-"<qt><p align=\"center\"><i>\n"
-"%1\n"
-"</i></p></qt>"
+"<qt>This will hide the menu bar completely. You can show it again by typing "
+"%1.</qt>"
 msgstr ""
 
-#: plugins/hebrew/hebrew.cpp:93
-msgid "This plugin provides the date in the Jewish calendar."
-msgstr "Mae'r ategyn yma yn darparu'r dyddiad yn y calendr Iddewig."
+#: actionmanager.cpp:375
+msgid "Import &Calendar..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:41
-msgctxt ""
-"These are weekly readings and do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters"
-msgid "Bereshit"
+#: actionmanager.cpp:377
+msgid "Merge the contents of another iCalendar"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:42
-msgid "Noach"
-msgstr "Noach"
+#: actionmanager.cpp:379
+msgid ""
+"Select this menu entry if you would like to merge the contents of another "
+"iCalendar into your current calendar."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:43
-msgid "Lech L'cha"
-msgstr "Lech L'cha"
+#: actionmanager.cpp:384
+msgid "&Import From UNIX Ical Tool"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:44
-msgid "Vayera"
-msgstr "Vayera"
+#: actionmanager.cpp:386
+msgid "Import a calendar in another format"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:45
-msgid "Chaye Sarah"
-msgstr "Chaye Sarah"
+#: actionmanager.cpp:388
+msgid ""
+"Select this menu entry if you would like to import the contents of a non-"
+"iCalendar formatted file into your current calendar."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:46
-msgid "Toldot"
-msgstr "Toldot"
+#: actionmanager.cpp:393
+msgid "Get &Hot New Stuff..."
+msgstr "Cael& y Diweddaraf..."
 
-#: plugins/hebrew/parsha.cpp:47
-msgid "Vayetze"
-msgstr "Vayetze"
+#: actionmanager.cpp:397
+msgid "Export &Web Page..."
+msgstr "Allfori&o Tudalen Wê"
 
-#: plugins/hebrew/parsha.cpp:48
-msgid "Vayishlach"
-msgstr "Vayishlach"
+#: actionmanager.cpp:401
+msgid "Export as &iCalendar..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:49
-msgid "Vayeshev"
-msgstr "Vayeshev"
+#: actionmanager.cpp:405
+msgid "Export as &vCalendar..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:50
-msgid "Miketz"
-msgstr "Miketz"
+#: actionmanager.cpp:414
+msgid "Archive O&ld Entries..."
+msgstr "Archifio &Hen Gofnodion..."
 
-#: plugins/hebrew/parsha.cpp:51
-msgid "Vayigash"
-msgstr "Vayigash"
+#: actionmanager.cpp:418
+msgid "Pur&ge Completed To-dos"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:52
-msgid "Vayechi"
-msgstr "Vayechi"
+#: actionmanager.cpp:467
+msgid "What's &Next"
+msgstr "Beth sy'n &Nesaf"
 
-#: plugins/hebrew/parsha.cpp:53
-msgid "Shemot"
-msgstr "Shemot"
+#: actionmanager.cpp:472
+msgid "&Month View"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:54
-msgid "Vaera"
-msgstr "Vaera"
+#: actionmanager.cpp:477
+msgid "&Agenda"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:55
-msgid "Bo"
-msgstr "Bo"
+#: actionmanager.cpp:482
+msgid "&Event List"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:56
-msgid "Beshalach"
-msgstr "Beshalach"
+#: actionmanager.cpp:487
+msgid "&To-do List"
+msgstr "&Rhestr I'w-Wneud"
 
-#: plugins/hebrew/parsha.cpp:57
-msgid "Yitro"
-msgstr "Yitro"
+#: actionmanager.cpp:492
+msgid "&Journal"
+msgstr "&Dyddlyfr"
 
-#: plugins/hebrew/parsha.cpp:58
-msgid "Mishpatim"
-msgstr "Mishpatim"
+#: actionmanager.cpp:497
+msgid "Time&line"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:59
-msgid "Terumah"
-msgstr "Terumah"
+#: actionmanager.cpp:502
+msgid "Time&spent"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:60
-msgid "Tetzaveh"
-msgstr "Tetzaveh"
+#: actionmanager.cpp:508
+msgid "&Refresh"
+msgstr "&Ailfywio"
 
-#: plugins/hebrew/parsha.cpp:61
-msgid "Ki Tisa"
-msgstr "Ki Tisa"
+#: actionmanager.cpp:514
+msgid "F&ilter"
+msgstr "&Hidlo"
 
-#: plugins/hebrew/parsha.cpp:62
-msgid "Vayakhel"
-msgstr "Vayakhel"
+#: actionmanager.cpp:527
+msgid "In Horizontally"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:63
-msgid "Pekudei"
-msgstr "Pekudei"
+#: actionmanager.cpp:533
+msgid "Out Horizontally"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:64
-msgid "Vayikra"
-msgstr "Vayikra"
+#: actionmanager.cpp:539
+msgid "In Vertically"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:65
-msgid "Tzav"
-msgstr "Tzav"
+#: actionmanager.cpp:545
+msgid "Out Vertically"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:66
-msgid "Shemini"
-msgstr "Shemini"
+#: actionmanager.cpp:555
+msgctxt "@action Jump to today"
+msgid "To &Today"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:67
-msgid "Tazria"
-msgstr "Tazria"
+#: actionmanager.cpp:556
+msgid "Today"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:68
-msgid "Metzora"
-msgstr "Metzora"
+#: actionmanager.cpp:557
+msgid "Scroll to Today"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:69
-msgid "Acharei Mot"
-msgstr "Acharei Mot"
+#: actionmanager.cpp:562
+msgctxt "scroll backward"
+msgid "&Backward"
+msgstr ""
+
+#: actionmanager.cpp:563
+msgctxt "scroll backward"
+msgid "Back"
+msgstr ""
+
+#: actionmanager.cpp:564
+msgid "Scroll Backward"
+msgstr ""
+
+#: actionmanager.cpp:577
+msgctxt "scroll forward"
+msgid "&Forward"
+msgstr ""
+
+#: actionmanager.cpp:578
+msgctxt "scoll forward"
+msgid "Forward"
+msgstr ""
+
+#: actionmanager.cpp:579
+msgid "Scroll Forward"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:70
-msgid "Kedoshim"
-msgstr "Kedoshim"
+#: actionmanager.cpp:587
+msgid "&Day"
+msgstr "&Dydd"
 
-#: plugins/hebrew/parsha.cpp:71
-msgid "Emor"
-msgstr "Emor"
+#: actionmanager.cpp:598 actionmanager.cpp:1391 calendarview.cpp:2101
+#, kde-format
+msgid "&Next Day"
+msgid_plural "&Next %1 Days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/hebrew/parsha.cpp:72
-msgid "Behar"
-msgstr "Behar"
+#: actionmanager.cpp:600
+msgid "W&ork Week"
+msgstr "W&ythnos Gwaith"
 
-#: plugins/hebrew/parsha.cpp:73
-msgid "Bechukotai"
-msgstr "Bechukotai"
+#: actionmanager.cpp:606
+msgid "&Week"
+msgstr "&Wythnos"
 
-#: plugins/hebrew/parsha.cpp:74
-msgid "Bemidbar"
-msgstr "Bemidbar"
+#: actionmanager.cpp:615
+msgid "Create a new Event"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:75
-msgid "Naso"
-msgstr "Naso"
+#: actionmanager.cpp:623
+msgid "Create a new To-do"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:76
-msgid "Behaalotcha"
-msgstr "Behaalotcha"
+#: actionmanager.cpp:638
+msgid "Create a new Journal"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:77
-msgid "Shelach"
-msgstr "Shelach"
+#: actionmanager.cpp:643
+msgid "Configure View..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:78
-msgid "Korach"
-msgstr "Korach"
+#: actionmanager.cpp:644
+msgid "Configure"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:79
-msgid "Chukat"
-msgstr "Chukat"
+#: actionmanager.cpp:645
+msgid "Configure the view"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:80
-msgid "Balak"
-msgstr "Balak"
+#: actionmanager.cpp:668
+msgid "&Make Sub-to-do Independent"
+msgstr "&Gwneud Is-I'w-Wneud yn Annibynnol"
 
-#: plugins/hebrew/parsha.cpp:81
-msgid "Pinchas"
-msgstr "Pinchas"
+#: actionmanager.cpp:682
+msgid "&Publish Item Information..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:82
-msgid "Matot"
-msgstr "Matot"
+#: actionmanager.cpp:688
+msgid "Send &Invitation to Attendees"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:83
-msgid "Masei"
-msgstr "Masei"
+#: actionmanager.cpp:695
+msgid "Re&quest Update"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:84
-msgid "Devarim"
-msgstr "Devarim"
+#: actionmanager.cpp:702
+msgid "Send &Cancellation to Attendees"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:85
-msgid "Vaetchanan"
-msgstr "Vaetchanan"
+#: actionmanager.cpp:710
+msgid "Send Status &Update"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:86
-msgid "Ekev"
-msgstr "Ekev"
+#: actionmanager.cpp:717
+msgctxt "counter proposal"
+msgid "Request Chan&ge"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:87
-msgid "Reeh"
-msgstr "Reeh"
+#: actionmanager.cpp:724
+msgid "&Mail Free Busy Information..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:88
-msgid "Shoftim"
-msgstr "Shoftim"
+#: actionmanager.cpp:729
+msgid "&Send as iCalendar..."
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:89
-msgid "Ki Tetze"
-msgstr "Ki Tetze"
+#: actionmanager.cpp:734
+msgid "&Upload Free Busy Information"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:90
-msgid "Ki Tavo"
-msgstr "Ki Tavo"
+#: actionmanager.cpp:740
+msgid "&Address Book"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:91
-msgid "Nitzavim"
-msgstr "Nitzavim"
+#: actionmanager.cpp:748
+msgid "Show Date Navigator"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:92
-msgid "Vayelech"
-msgstr "Vayelech"
+#: actionmanager.cpp:752
+msgid "Show To-do View"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:93
-msgid "Haazinu"
-msgstr "Haazinu"
+#: actionmanager.cpp:756
+msgid "Show Item Viewer"
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:38
-msgid "Configure Holidays"
-msgstr "Ffurfweddu Gwyliau"
+#: actionmanager.cpp:772
+msgid "Show Calendar Manager"
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:47
-msgid "Use Israeli holidays"
-msgstr "Defnyddiwch gwyliau Israeli"
+#: actionmanager.cpp:785
+msgid "Configure &Date && Time..."
+msgstr "Ffurfweddu &Dyddiad && Amser..."
 
-#: plugins/hebrew/configdialog.cpp:51
-msgid "Show weekly parsha"
-msgstr "Dangos parsha wythnosol"
+#: actionmanager.cpp:794
+msgid "Manage View &Filters..."
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:55
-msgid "Show day of Omer"
-msgstr "Dangos diwrnod Omer"
+#: actionmanager.cpp:799
+msgid "Manage C&ategories..."
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:59
-msgid "Show Chol HaMoed"
-msgstr "Dangos Chol HaMoed"
+#: actionmanager.cpp:805
+msgid "&Configure Calendar..."
+msgstr ""
 
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:53
+#: actionmanager.cpp:952
 msgid ""
-"This plugin provides links to Wikipedia's 'This Day in History' pages."
+"You have no ical file in your home directory.\n"
+"Import cannot proceed.\n"
 msgstr ""
+"Nid oes gennych ffeil ical yn eich cyfeiriadur cartref.\n"
+" Ni all y mewnforiad fynd ymlaen.\n"
 
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:62
-msgid "This day in history"
+#: actionmanager.cpp:973
+msgid ""
+"KOrganizer successfully imported and merged your .calendar file from ical "
+"into the currently opened calendar."
 msgstr ""
+"Mi wnaeth KTrefnydd fewnforio a chyfuno eich ffeil .calendar o ical i'r "
+"calendr agoredig cyfredol."
 
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:64
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:81
-msgctxt "Localized Wikipedia website"
-msgid "http://en.wikipedia.org/wiki/"
+#: actionmanager.cpp:979
+msgid ""
+"KOrganizer encountered some unknown fields while parsing your .calendar ical "
+"file, and had to discard them; please check to see that all your relevant "
+"data was correctly imported."
 msgstr ""
 
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:67
-msgctxt "Qt date format used by thelocalized Wikipedia"
-msgid "MMMM_d"
+#: actionmanager.cpp:983
+msgid "ICal Import Successful with Warning"
 msgstr ""
 
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:79
-msgid "This month in history"
+#: actionmanager.cpp:987
+msgid ""
+"KOrganizer encountered an error parsing your .calendar file from ical; "
+"import has failed."
 msgstr ""
 
-#: plugins/thisdayinhistory/thisdayinhistory.cpp:84
-msgctxt "Qt date format used by the localized Wikipedia"
-msgid "MMMM_yyyy"
+#: actionmanager.cpp:991
+msgid ""
+"KOrganizer does not think that your .calendar file is a valid ical calendar; "
+"import has failed."
 msgstr ""
 
-#: plugins/printing/journal/journalprint.h:39
-msgid "Print &journal"
+#: actionmanager.cpp:1043
+#, kde-format
+msgid "New calendar '%1'."
 msgstr ""
 
-#: plugins/printing/journal/journalprint.h:40
-msgid "Prints all journals for a given date range"
+#: actionmanager.cpp:1074
+#, kde-format
+msgid "Cannot download calendar from '%1'."
+msgstr "Methu lawrlywtho calendr oddi wrth '%1'."
+
+#: actionmanager.cpp:1113
+msgid "Failed to obtain D-Bus interface for remote configuration."
 msgstr ""
 
-#: plugins/printing/journal/journalprint.cpp:139
-msgid "Journal entries"
-msgstr "Cofnodion dyddlyfr"
+#: actionmanager.cpp:1125
+#, kde-format
+msgid "Merged calendar '%1'."
+msgstr "Calendr '%1' wedi ei gyfuno."
 
-#: plugins/printing/year/yearprint.h:40
-msgid "Print &year"
-msgstr ""
+#: actionmanager.cpp:1127
+#, kde-format
+msgid "Opened calendar '%1'."
+msgstr "Calendr '%1' wedi ei agor."
 
-#: plugins/printing/year/yearprint.h:41
-msgid "Prints a calendar for an entire year"
+#: actionmanager.cpp:1150
+msgid ""
+"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to "
+"save in vCalendar format."
 msgstr ""
+"Cedwir eich calendr yn fformat iCalendar. Defnyddiwch 'Allforio vCalendar' "
+"i'w gadw mewn fformat vCalendar."
 
-#: plugins/printing/year/yearprint.cpp:176
-#: views/whatsnextview/kowhatsnextview.cpp:93
-#: views/whatsnextview/kowhatsnextview.cpp:277
+#: actionmanager.cpp:1152
+msgid "Format Conversion"
+msgstr "Trosiad Fformat"
+
+#: actionmanager.cpp:1152 calendarview.cpp:2043
+msgid "Proceed"
+msgstr "Mynd Ymlaen"
+
+#: actionmanager.cpp:1175
 #, kde-format
-msgctxt "date from - to"
-msgid "%1 - %2"
-msgstr "%1 - %2"
+msgid "Cannot upload calendar to '%1'"
+msgstr "Methu llwytho calendr i fyny i '%1'"
 
-#: plugins/printing/year/yearprint.cpp:178
+#: actionmanager.cpp:1182
 #, kde-format
-msgctxt ""
-"date from -\n"
-"to"
-msgid ""
-"%1 -\n"
-"%2"
+msgid "Saved calendar '%1'."
+msgstr "Wedi cadw'r calendr '%1'."
+
+#: actionmanager.cpp:1218
+#, kde-format
+msgid "Do you want to overwrite file \"%1\"?"
 msgstr ""
 
-#: plugins/printing/list/listprint.h:39
-msgid "Print list"
+#: actionmanager.cpp:1282
+#, kde-format
+msgid "Unable to save calendar to the file %1."
 msgstr ""
 
-#: plugins/printing/list/listprint.h:40
-msgid "Prints a list of events and to-dos"
+#: actionmanager.cpp:1283
+msgid "Error"
 msgstr ""
 
-#: plugins/printing/whatsnext/whatsnextprint.h:39
-msgid "Print What's Next"
+#: actionmanager.cpp:1310
+msgid ""
+"The calendar has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Mae'r calendr wedi newid.\n"
+"A ydych chi eisiau ei gadw?"
+
+#: actionmanager.cpp:1338
+msgid "*.ics *.vcs|Calendar Files"
 msgstr ""
 
-#: plugins/printing/whatsnext/whatsnextprint.h:40
-msgid "Prints a list of all upcoming events and todos."
+#: actionmanager.cpp:1419
+msgid "Could not start control module for date and time format."
 msgstr ""
 
-#: korganizer_options.h:36
-msgid "Import the specified files as separate calendars"
+#: actionmanager.cpp:1598
+#, kde-format
+msgid "Could not load calendar %1."
 msgstr ""
 
-#: korganizer_options.h:39
-msgid "Merge the specified files into the standard calendar "
+#: actionmanager.cpp:1606
+msgid "The downloaded events will be merged into your current calendar."
 msgstr ""
+"Mi fydd y disgwyddiadau â lawrlwythwyd yn cael eu cyfuno i'ch calendr "
+"cyfredol."
 
-#: korganizer_options.h:42
-msgid "Open the specified files as calendars in a new window"
-msgstr ""
+#: actionmanager.cpp:1642
+msgid "&Show Event"
+msgstr "Dango&s Digwyddiad"
 
-#: korganizer_options.h:44
-msgid ""
-"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the "
-"user will be asked whether to import, merge or open in a separate window."
-msgstr ""
+#: actionmanager.cpp:1645
+msgid "&Edit Event..."
+msgstr "&Golygu Digwyddiad..."
 
-#: koeventviewerdialog.cpp:40
-msgid "Event Viewer"
-msgstr "Gwelydd Digwyddiadau"
+#: actionmanager.cpp:1648
+msgid "&Delete Event"
+msgstr "&Dileu Digwyddiad"
 
-#: koeventviewerdialog.cpp:43
-msgid "Edit..."
-msgstr "Golygu..."
+#: actionmanager.cpp:1656
+msgid "&Show To-do"
+msgstr "Dango&s I'w-Wneud"
 
-#: koeventviewerdialog.cpp:44
-msgid "Show in Context"
-msgstr ""
+#: actionmanager.cpp:1659
+msgid "&Edit To-do..."
+msgstr "&Golygu I'w-Wneud"
 
-#: importdialog.cpp:44
-msgid "Import Calendar"
-msgstr "Mewnforio Calendr"
+#: actionmanager.cpp:1662
+msgid "&Delete To-do"
+msgstr "&Dileu I'w-Wneud"
 
-#: importdialog.cpp:55
-#, kde-format
-msgid ""
-"Please select import method for calendar at\n"
-"\n"
-"%1."
+#: actionmanager.cpp:1809 actionmanager.cpp:1914
+msgid "Attach as &link"
 msgstr ""
 
-#: importdialog.cpp:66
-msgid "Add as new calendar"
+#: actionmanager.cpp:1810 actionmanager.cpp:1915
+msgid "Attach &inline"
 msgstr ""
 
-#: importdialog.cpp:69
-msgid "Merge into existing calendar"
+#: actionmanager.cpp:1811
+msgid "Attach inline &without attachments"
 msgstr ""
 
-#: filtereditdialog.cpp:40
-msgctxt "@title::window"
-msgid "Edit Calendar Filters"
+#: actionmanager.cpp:1813 actionmanager.cpp:1917
+msgid "C&ancel"
 msgstr ""
 
-#: filtereditdialog.cpp:94
-msgctxt "@info:whatsthis"
-msgid "Press this button to define a new filter."
+#: actionmanager.cpp:1853
+msgid "Removing attachments from an email might invalidate its signature."
 msgstr ""
 
-#: filtereditdialog.cpp:97
-msgctxt "@info:whatsthis"
-msgid "Press this button to remove the currently active filter."
+#: actionmanager.cpp:1854
+msgid "Remove Attachments"
 msgstr ""
 
-#: filtereditdialog.cpp:231
-#, kde-format
-msgctxt "@label default filter name"
-msgid "New Filter %1"
+#: actionmanager.cpp:1995 actionmanager.cpp:2004
+msgid "Undo"
 msgstr ""
 
-#: filtereditdialog.cpp:250
+#: actionmanager.cpp:2001
 #, kde-format
-msgctxt "@info"
-msgid "Do you really want to permanently remove the filter \"%1\"?"
+msgid "Undo: %1"
 msgstr ""
 
-#: filtereditdialog.cpp:251
-msgctxt "@title:window"
-msgid "Delete Filter?"
+#: actionmanager.cpp:2011 actionmanager.cpp:2015
+msgid "Redo"
 msgstr ""
 
-#: searchdialog.cpp:43
-msgid "Search Calendar"
+#: actionmanager.cpp:2017
+#, kde-format
+msgid "Redo (%1)"
+msgstr "Ailwneud (%1)"
+
+#: actionmanager.cpp:2031
+#, kde-format
+msgid "URL '%1' is invalid."
 msgstr ""
 
-#: searchdialog.cpp:49
-msgctxt "search in calendar"
-msgid "&Search"
+#: koviewmanager.cpp:502
+msgid "Merged calendar"
 msgstr ""
 
-#: searchdialog.cpp:50
-msgid "Start searching"
+#: koviewmanager.cpp:521
+msgid "Calendars Side by Side"
 msgstr ""
 
-#: searchdialog.cpp:101
+#: koviewmanager.cpp:555
 msgid ""
-"Invalid search expression, cannot perform the search. Please enter a search "
-"expression using the wildcard characters '*' and '?' where needed."
+"Unable to display the work week since there are no work days configured. "
+"Please properly configure at least 1 work day in the Time and Date "
+"preferences."
 msgstr ""
-"Mynegiad chilio annilys, methu gwneud y chwiliad.  Mewnosodwch fynegiad "
-"chwilio gan ddefnyddio'r nodau-chwilio '*' a '?' lle bo angen."
 
-#: searchdialog.cpp:113
-msgid "No items were found that match your search pattern."
-msgstr ""
+#: exportwebdialog.cpp:71
+msgid "Export Calendar as Web Page"
+msgstr "Allforio Calendr fel Tudalen Wê"
 
-#: searchdialog.cpp:116
-#, kde-format
-msgid "%1 item"
-msgid_plural "%1 items"
-msgstr[0] ""
-msgstr[1] ""
+#: exportwebdialog.cpp:77
+msgid "Export"
+msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:31
-#. i18n: file: htmlexportsettings.kcfg:79
-#: korganizer.cpp:277 views/todoview/kotodomodel.cpp:826 rc.cpp:536 rc.cpp:538
-msgid "Calendar"
-msgstr "Calendr"
+#: exportwebdialog.cpp:136
+msgid ""
+"You are about to set all preferences to default values. All custom "
+"modifications will be lost."
+msgstr ""
+"Rydych ar fin gosod yr holl werthoedd i'r gwerthoedd rhagosod. Collir pob "
+"addasiad."
 
-#: korganizer.cpp:288
-msgid "New Calendar"
-msgstr "Calendr Newydd"
+#: exportwebdialog.cpp:138
+msgid "Setting Default Preferences"
+msgstr "Gosod Hoffiannau Rhagosod"
 
-#: korganizer.cpp:292
-msgctxt "the calendar is read-only"
-msgid "read-only"
+#: exportwebdialog.cpp:139
+msgid "Reset to Defaults"
 msgstr ""
 
-#: calendarview.cpp:235
-msgid ""
-"<p><em>No Item Selected</em></p><p>Select an event, to-do or journal entry "
-"to view its details here.</p>"
+#: exportwebdialog.cpp:147
+msgctxt "general settings for html export"
+msgid "General"
 msgstr ""
 
-#: calendarview.cpp:241
-msgid ""
-"View the details of events, journal entries or to-dos selected in "
-"KOrganizer's main view here."
+#. i18n: file: searchdialog_base.ui:170
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#: exportwebdialog.cpp:151 rc.cpp:675
+msgid "Date Range"
+msgstr "Amrediad Dyddiadau"
+
+#: exportwebdialog.cpp:163
+msgid "View Type"
+msgstr "Gweld Math"
+
+#: exportwebdialog.cpp:182
+msgid "Destination"
+msgstr "Cyrchfan"
+
+#: exportwebdialog.cpp:206
+msgid "To-dos"
 msgstr ""
 
-#: calendarview.cpp:440
-#, kde-format
-msgid "Could not load calendar '%1'."
-msgstr "Wedi methu llwytho calendr '%1'."
+#: exportwebdialog.cpp:229
+msgid "Events"
+msgstr "Digwyddiadau"
 
-#: calendarview.cpp:661
+#: datenavigatorcontainer.cpp:51
 msgid ""
-"The time zone setting was changed. Do you want to keep the absolute time of "
-"the items in your calendar, which will show them to be at a different time "
-"than before, or move them to be at the old time also in the new time zone?"
+"<qt><p>Select the dates you want to display in KOrganizer's main view here. "
+"Hold the mouse button to select more than one day.</p><p>Press the top "
+"buttons to browse to the next / previous months or years.</p><p>Each line "
+"shows a week. The number in the left column is the number of the week in the "
+"year. Press it to select the whole week.</p></qt>"
 msgstr ""
 
-#: calendarview.cpp:668
-msgid "Keep Absolute Times?"
+#: filtereditdialog.cpp:40
+msgctxt "@title::window"
+msgid "Edit Calendar Filters"
 msgstr ""
 
-#: calendarview.cpp:669
-msgid "Keep Times"
+#: filtereditdialog.cpp:94
+msgctxt "@info:whatsthis"
+msgid "Press this button to define a new filter."
 msgstr ""
 
-#: calendarview.cpp:670
-msgid "Move Times"
+#: filtereditdialog.cpp:97
+msgctxt "@info:whatsthis"
+msgid "Press this button to remove the currently active filter."
 msgstr ""
 
-#: calendarview.cpp:745
+#: filtereditdialog.cpp:232
 #, kde-format
-msgid "Todo completed: %1 (%2)"
+msgctxt "@label default filter name"
+msgid "New Filter %1"
 msgstr ""
 
-#: calendarview.cpp:754
+#: filtereditdialog.cpp:251
 #, kde-format
-msgid "Journal of %1"
+msgctxt "@info"
+msgid "Do you really want to permanently remove the filter \"%1\"?"
 msgstr ""
 
-#: calendarview.cpp:808
-#, kde-format
-msgid ""
-"The item \"%1\" is filtered by your current filter rules, so it will be "
-"hidden and not appear in the view."
+#: filtereditdialog.cpp:252
+msgctxt "@title:window"
+msgid "Delete Filter?"
 msgstr ""
 
-#: calendarview.cpp:811
-msgid "Filter Applied"
+#: themes/themeimporter.cpp:58
+msgid "This file is not a KOrganizer theme file."
 msgstr ""
 
-#: calendarview.cpp:889
-#, kde-format
-msgctxt "@info"
-msgid "Do you really want to permanently remove the item \"%1\"?"
+#: themes/thememain.cpp:39
+msgid "KOrganizer Theming Stub"
 msgstr ""
 
-#: calendarview.cpp:890
-msgctxt "@title:window"
-msgid "Delete Item?"
+#: themes/thememain.cpp:41
+msgid "DO NOT USE - Stub doing various things with KOrganizer themes"
 msgstr ""
 
-#: calendarview.cpp:909
-#, kde-format
-msgid ""
-"The item \"%1\" has sub-to-dos. Do you want to cut just this item and make "
-"all its sub-to-dos independent, or cut the to-do with all its sub-to-dos?"
+#: themes/thememain.cpp:43
+msgid "© 2007 Loïc Corbasson"
 msgstr ""
 
-#: calendarview.cpp:914 calendarview.cpp:955 calendarview.cpp:1772
-#: calendarview.cpp:1785 calendarview.cpp:2571 calendarview.cpp:2645
-#: calendarview.cpp:2676
-msgid "KOrganizer Confirmation"
-msgstr "Cadarnhâd KOrganizer"
-
-#: calendarview.cpp:915
-msgid "Cut Only This"
+#: themes/thememain.cpp:51
+msgid "Theme to use"
 msgstr ""
 
-#: calendarview.cpp:916
-msgid "Cut All"
+#: koeventpopupmenu.cpp:64
+msgctxt "cut this event"
+msgid "C&ut"
 msgstr ""
 
-#: calendarview.cpp:951
-#, kde-format
-msgid ""
-"The item \"%1\" has sub-to-dos. Do you want to copy just this item or copy "
-"the to-do with all its sub-to-dos?"
+#: koeventpopupmenu.cpp:67
+msgctxt "copy this event"
+msgid "&Copy"
 msgstr ""
 
-#: calendarview.cpp:956
-msgid "Copy Only This"
+#: koeventpopupmenu.cpp:71
+msgid "&Paste"
 msgstr ""
 
-#: calendarview.cpp:957
-msgid "Copy All"
+#: koeventpopupmenu.cpp:74
+msgctxt "delete this incidence"
+msgid "&Delete"
 msgstr ""
 
-#: calendarview.cpp:1020
-msgid "Paste failed: unable to determine a valid target date."
+#: koeventpopupmenu.cpp:79
+msgid "Togg&le To-do Completed"
 msgstr ""
 
-#: calendarview.cpp:1509
-msgid "Make sub-to-dos independent"
+#: koeventpopupmenu.cpp:82
+msgid "&Toggle Reminder"
 msgstr ""
 
-#: calendarview.cpp:1646
-#, kde-format
-msgctxt "@info"
-msgid "\"%1\" was successfully copied to %2."
+#: koeventpopupmenu.cpp:86
+msgid "&Dissociate From Recurrence..."
 msgstr ""
 
-#: calendarview.cpp:1649
-msgctxt "@title:window"
-msgid "Copying Succeeded"
+#: koeventpopupmenu.cpp:92
+msgid "Send as iCalendar..."
 msgstr ""
 
-#: calendarview.cpp:1655
-#, kde-format
-msgctxt "@info"
-msgid "Unable to copy the item \"%1\" to %2."
+#: kitemiconcheckcombo.cpp:45
+msgid "To-do"
 msgstr ""
 
-#: calendarview.cpp:1658
-msgctxt "@title:window"
-msgid "Copying Failed"
+#: kitemiconcheckcombo.cpp:46
+msgid "Journal"
 msgstr ""
 
-#: calendarview.cpp:1716
-#, kde-format
-msgctxt "@info"
-msgid ""
-"Unable to remove the item \"%1\" from %2. However, a copy of this item has "
-"been put into %3."
+#: kitemiconcheckcombo.cpp:47
+msgid "Recurring"
 msgstr ""
 
-#: calendarview.cpp:1721 calendarview.cpp:1742
-msgctxt "@title:window"
-msgid "Moving Failed"
+#: kitemiconcheckcombo.cpp:48
+msgid "Alarm"
 msgstr ""
 
-#: calendarview.cpp:1727
-#, kde-format
-msgctxt "@info"
-msgid "\"%1\" was successfully moved from %2 to %3."
+#: kitemiconcheckcombo.cpp:49
+msgid "Read Only"
 msgstr ""
 
-#: calendarview.cpp:1731
-msgctxt "@title:window"
-msgid "Moving Succeeded"
+#: kitemiconcheckcombo.cpp:50
+msgid "Needs Reply"
 msgstr ""
 
-#: calendarview.cpp:1738
-#, kde-format
-msgctxt "@info"
-msgid "Unable to add the item \"%1\" into %2. This item has not been moved."
+#: kitemiconcheckcombo.cpp:51
+msgid "Attending"
 msgstr ""
 
-#: calendarview.cpp:1768
-#, kde-format
-msgid "Do you want to dissociate the occurrence on %1 from the recurrence?"
+#: kitemiconcheckcombo.cpp:53
+msgid "Maybe Attending"
 msgstr ""
 
-#: calendarview.cpp:1773
-msgid "&Dissociate"
+#: kitemiconcheckcombo.cpp:54
+msgid "Organizer"
 msgstr ""
 
-#: calendarview.cpp:1780
-#, kde-format
-msgid ""
-"Do you want to dissociate the occurrence on %1 from the recurrence or also "
-"dissociate future ones?"
+#: kitemiconcheckcombo.cpp:63
+msgctxt "@item:inlistbox"
+msgid "Icons to use"
 msgstr ""
 
-#: calendarview.cpp:1786
-msgid "&Only Dissociate This One"
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:57
+msgid ""
+"This plugin provides links to Wikipedia's 'This Day in History' pages."
 msgstr ""
 
-#: calendarview.cpp:1787
-msgid "&Also Dissociate Future Ones"
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:66
+msgid "This day in history"
 msgstr ""
 
-#: calendarview.cpp:1803
-msgid "Dissociate occurrence"
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:69
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:86
+msgctxt "Localized Wikipedia website"
+msgid "http://en.wikipedia.org/wiki/"
 msgstr ""
 
-#: calendarview.cpp:1813
-msgid "Dissociating the occurrence failed."
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:71
+msgctxt "Qt date format used by the localized Wikipedia"
+msgid "MMMM_d"
 msgstr ""
 
-#: calendarview.cpp:1814 calendarview.cpp:1841
-msgid "Dissociating Failed"
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:83
+msgid "This month in history"
 msgstr ""
 
-#: calendarview.cpp:1824
-msgid "Dissociate future occurrences"
+#: plugins/thisdayinhistory/thisdayinhistory.cpp:88
+msgctxt "Qt date format used by the localized Wikipedia"
+msgid "MMMM_yyyy"
 msgstr ""
 
-#: calendarview.cpp:1840
-msgid "Dissociating the future occurrences failed."
+#: plugins/printing/year/yearprint.h:40
+msgid "Print &year"
 msgstr ""
 
-#: calendarview.cpp:2003
-msgid "*.ics|iCalendars"
+#: plugins/printing/year/yearprint.h:41
+msgid "Prints a calendar for an entire year"
 msgstr ""
 
-#: calendarview.cpp:2013 calendarview.cpp:2065
+#: plugins/printing/year/yearprint.cpp:178
 #, kde-format
-msgid "Do you want to overwrite %1?"
+msgctxt ""
+"date from -\n"
+"to"
+msgid ""
+"%1 -\n"
+"%2"
 msgstr ""
 
-#: calendarview.cpp:2028 calendarview.cpp:2080
-msgctxt "save failure cause unknown"
-msgid "Reason unknown"
-msgstr ""
+#: plugins/printing/journal/journalprint.cpp:137
+msgid "Journal entries"
+msgstr "Cofnodion dyddlyfr"
 
-#: calendarview.cpp:2033
-#, kde-format
-msgctxt "@info"
-msgid "Cannot write iCalendar file %1. %2"
+#: plugins/printing/journal/journalprint.h:39
+msgid "Print &journal"
 msgstr ""
 
-#: calendarview.cpp:2044
-msgid "The journal entries cannot be exported to a vCalendar file."
+#: plugins/printing/journal/journalprint.h:40
+msgid "Prints all journals for a given date range"
 msgstr ""
 
-#: calendarview.cpp:2045
-msgid "Data Loss Warning"
-msgstr "Rhybydd Colled Data"
+#: plugins/printing/whatsnext/whatsnextprint.h:39
+msgid "Print What's Next"
+msgstr ""
 
-#: calendarview.cpp:2056
-msgid "*.vcs|vCalendars"
+#: plugins/printing/whatsnext/whatsnextprint.h:40
+msgid "Prints a list of all upcoming events and todos."
 msgstr ""
 
-#: calendarview.cpp:2085
-#, kde-format
-msgctxt "@info"
-msgid "Cannot write vCalendar file %1. %2"
+#: plugins/printing/list/listprint.h:39
+msgid "Print list"
 msgstr ""
 
-#: calendarview.cpp:2103
-msgid "&Previous Day"
-msgstr "Dyddiad &Blaenorol"
+#: plugins/printing/list/listprint.h:40
+msgid "Prints a list of events and to-dos"
+msgstr ""
 
-#: calendarview.cpp:2106
-msgid "&Previous Week"
-msgstr "Wythnos &Blaenorol"
+#: plugins/datenums/datenums.cpp:60
+msgid "This plugin shows information on a day's position in the year."
+msgstr ""
 
-#: calendarview.cpp:2107
-msgid "&Next Week"
-msgstr "Wythnos &Nesaf"
+#: plugins/datenums/datenums.cpp:78
+#, kde-format
+msgid "1 day before the end of the year"
+msgid_plural "%1 days before the end of the year"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendarview.cpp:2204 calendarview.cpp:2243
-msgid "No filter"
-msgstr ""
+#: plugins/datenums/datenums.cpp:85
+#, kde-format
+msgctxt "dayOfYear / daysTillEndOfYear"
+msgid "%1 / %2"
+msgstr "%1 / %2"
 
-#: calendarview.cpp:2566
+#: plugins/datenums/datenums.cpp:87
 #, kde-format
-msgid ""
-"The item \"%1\" has sub-to-dos. Do you want to delete just this item and "
-"make all its sub-to-dos independent, or delete the to-do with all its sub-to-"
-"dos?"
-msgstr ""
+msgid "1 day since the beginning of the year,\n"
+msgid_plural "%1 days since the beginning of the year,\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendarview.cpp:2572
-msgid "Delete Only This"
-msgstr ""
+#: plugins/datenums/datenums.cpp:90
+#, kde-format
+msgid "1 day until the end of the year"
+msgid_plural "%1 days until the end of the year"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendarview.cpp:2573 calendarview.cpp:2646
-msgid "Delete All"
+#: plugins/datenums/datenums.cpp:122
+#, kde-format
+msgctxt "Week weekOfYear"
+msgid "Week %1"
 msgstr ""
 
-#: calendarview.cpp:2575
-msgid "Deleting sub-to-dos"
-msgstr ""
+#: plugins/datenums/datenums.cpp:123 plugins/datenums/datenums.cpp:138
+#: plugins/datenums/datenums.cpp:146
+#, kde-format
+msgid "1 week since the beginning of the year"
+msgid_plural "%1 weeks since the beginning of the year"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendarview.cpp:2609
+#: plugins/datenums/datenums.cpp:130
 #, kde-format
-msgid ""
-"The item \"%1\" is marked read-only and cannot be deleted; it probably "
-"belongs to a read-only calendar."
+msgctxt "weekOfYear (year)"
+msgid "%1 (%2)"
 msgstr ""
 
-#: calendarview.cpp:2613
-msgid "Removing not possible"
+#: plugins/datenums/datenums.cpp:132
+#, kde-format
+msgctxt "Week weekOfYear (year)"
+msgid "Week %1 (%2)"
 msgstr ""
 
-#: calendarview.cpp:2642
+#: plugins/datenums/datenums.cpp:153
 #, kde-format
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates; are you sure you want "
-"to delete it and all its recurrences?"
-msgstr ""
+msgid "1 week remaining"
+msgid_plural "%1 weeks remaining"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendarview.cpp:2653
-msgid "Also Delete &Future"
-msgstr ""
+#: plugins/datenums/datenums.cpp:156
+#, kde-format
+msgid "1 week until the end of the year"
+msgid_plural "%1 weeks until the end of the year"
+msgstr[0] ""
+msgstr[1] ""
 
-#: calendarview.cpp:2657
+#: plugins/datenums/datenums.cpp:160
 #, kde-format
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates. Do you want to delete "
-"only the current one on %2, also future occurrences, or all its occurrences?"
+msgctxt "weekOfYear / weeksTillEndOfYear"
+msgid "%1 / %2"
 msgstr ""
 
-#: calendarview.cpp:2664
+#: plugins/datenums/datenums.cpp:179
 #, kde-format
+msgctxt ""
+"n weeks since the beginning of the year\n"
+"n weeks until the end of the year"
 msgid ""
-"The calendar item \"%1\" recurs over multiple dates. Do you want to delete "
-"only the current one on %2 or all its occurrences?"
+"%1\n"
+"%2"
 msgstr ""
 
-#: calendarview.cpp:2677
-msgid "Delete C&urrent"
-msgstr "Dileu'r &Cyfredol"
-
-#: calendarview.cpp:2679
-msgid "Delete &All"
-msgstr "Dileu'r& cwbl"
+#: plugins/datenums/configdialog.cpp:46
+msgid "Configure Day Numbers"
+msgstr ""
 
-#: calendarview.cpp:2753
-msgid "Delete all completed to-dos?"
-msgstr "Dileu pob I'w-Wneud sydd wedi eu gorffen?"
+#: plugins/datenums/configdialog.cpp:56
+msgid "Show Date Number"
+msgstr ""
 
-#: calendarview.cpp:2754
-msgid "Purge To-dos"
-msgstr "Carthu I-Wneudau"
+#: plugins/datenums/configdialog.cpp:62
+msgid "Show day number"
+msgstr ""
 
-#: calendarview.cpp:2755
-msgid "Purge"
-msgstr "Carthu"
+#: plugins/datenums/configdialog.cpp:65
+msgid "Show days to end of year"
+msgstr ""
 
-#: calendarview.cpp:2759
-msgid "Purging completed to-dos"
+#: plugins/datenums/configdialog.cpp:68
+msgid "Show both"
 msgstr ""
 
-#: calendarview.cpp:2779
-msgctxt "@info"
-msgid "Unable to purge to-dos with uncompleted children."
+#: plugins/hebrew/parsha.cpp:41
+msgctxt ""
+"These are weekly readings and do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters"
+msgid "Bereshit"
 msgstr ""
 
-#: calendarview.cpp:2780
-msgid "Delete To-do"
-msgstr "Dileu I'w-Wneud"
+#: plugins/hebrew/parsha.cpp:42
+msgid "Noach"
+msgstr "Noach"
 
-#: calendarview.cpp:2793
-#, kde-format
-msgctxt "@info"
-msgid "Unable to edit \"%1\" because it is locked by another process."
-msgstr ""
+#: plugins/hebrew/parsha.cpp:43
+msgid "Lech L'cha"
+msgstr "Lech L'cha"
 
-#: calendarview.cpp:2827
-#, kde-format
-msgid "Unable to copy the item to %1."
-msgstr ""
+#: plugins/hebrew/parsha.cpp:44
+msgid "Vayera"
+msgstr "Vayera"
 
-#: calendarview.cpp:2828
-msgid "Copying Failed"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:45
+msgid "Chaye Sarah"
+msgstr "Chaye Sarah"
 
-#: calendarview.cpp:2874
-#, kde-format
-msgid "Unable to move the item to  %1."
-msgstr ""
+#: plugins/hebrew/parsha.cpp:46
+msgid "Toldot"
+msgstr "Toldot"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Vayetze"
+msgstr "Vayetze"
 
-#: calendarview.cpp:2875
-msgid "Moving Failed"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:48
+msgid "Vayishlach"
+msgstr "Vayishlach"
 
-#: statusdialog.cpp:49
-msgid "Set Your Status"
-msgstr "Gosod Eich Cyflwr"
+#: plugins/hebrew/parsha.cpp:49
+msgid "Vayeshev"
+msgstr "Vayeshev"
 
-#: statusdialog.cpp:58
-msgid "Set your status"
-msgstr "Gosod eich cyflwr"
+#: plugins/hebrew/parsha.cpp:50
+msgid "Miketz"
+msgstr "Miketz"
 
-#: kitemiconcheckcombo.cpp:45
-msgid "To-do"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:51
+msgid "Vayigash"
+msgstr "Vayigash"
 
-#: kitemiconcheckcombo.cpp:46
-msgid "Journal"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:52
+msgid "Vayechi"
+msgstr "Vayechi"
 
-#: kitemiconcheckcombo.cpp:47
-msgid "Recurring"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:53
+msgid "Shemot"
+msgstr "Shemot"
 
-#: kitemiconcheckcombo.cpp:48
-msgid "Alarm"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:54
+msgid "Vaera"
+msgstr "Vaera"
 
-#: kitemiconcheckcombo.cpp:49
-msgid "Read Only"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:55
+msgid "Bo"
+msgstr "Bo"
 
-#: kitemiconcheckcombo.cpp:50
-msgid "Needs Reply"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:56
+msgid "Beshalach"
+msgstr "Beshalach"
 
-#: kitemiconcheckcombo.cpp:51
-msgid "Attending"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:57
+msgid "Yitro"
+msgstr "Yitro"
 
-#: kitemiconcheckcombo.cpp:52
-msgid "Maybe Attending"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:58
+msgid "Mishpatim"
+msgstr "Mishpatim"
 
-#: kitemiconcheckcombo.cpp:53
-msgid "Organizer"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:59
+msgid "Terumah"
+msgstr "Terumah"
 
-#: kitemiconcheckcombo.cpp:62
-msgctxt "@item:inlistbox"
-msgid "Icons to use"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:60
+msgid "Tetzaveh"
+msgstr "Tetzaveh"
 
-#: views/todoview/kotodoview.cpp:136
-msgctxt "Checkbox to display todos not hirarchical"
-msgid "Flat View"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:61
+msgid "Ki Tisa"
+msgstr "Ki Tisa"
 
-#: views/todoview/kotodoview.cpp:139
-msgctxt "@info:tooltip"
-msgid "Display to-dos in flat list instead of a tree"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:62
+msgid "Vayakhel"
+msgstr "Vayakhel"
 
-#: views/todoview/kotodoview.cpp:142
-msgctxt "@info:whatsthis"
-msgid ""
-"Checking this option will cause the to-dos to be displayed as a flat list "
-"instead of a hierarchical tree; the parental relationships are removed in "
-"the display."
-msgstr ""
+#: plugins/hebrew/parsha.cpp:63
+msgid "Pekudei"
+msgstr "Pekudei"
 
-#: views/todoview/kotodoview.cpp:184 koeventpopupmenu.cpp:54
-msgid "&Print..."
-msgstr ""
+#: plugins/hebrew/parsha.cpp:64
+msgid "Vayikra"
+msgstr "Vayikra"
 
-#: views/todoview/kotodoview.cpp:188 koeventpopupmenu.cpp:56
-msgid "Print Previe&w..."
-msgstr ""
+#: plugins/hebrew/parsha.cpp:65
+msgid "Tzav"
+msgstr "Tzav"
 
-#: views/todoview/kotodoview.cpp:209
-msgid "&Make this To-do Independent"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:66
+msgid "Shemini"
+msgstr "Shemini"
 
-#: views/todoview/kotodoview.cpp:212
-msgid "Make all Sub-to-dos &Independent"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:67
+msgid "Tazria"
+msgstr "Tazria"
 
-#: views/todoview/kotodoview.cpp:227
-msgid "&Copy To"
-msgstr "&Copïo I"
+#: plugins/hebrew/parsha.cpp:68
+msgid "Metzora"
+msgstr "Metzora"
 
-#: views/todoview/kotodoview.cpp:239
-msgid "&Move To"
-msgstr "&Symud I"
+#: plugins/hebrew/parsha.cpp:69
+msgid "Acharei Mot"
+msgstr "Acharei Mot"
 
-#: views/todoview/kotodoview.cpp:252
-msgctxt "delete completed to-dos"
-msgid "Pur&ge Completed"
-msgstr "&Carthiad wedi'i Gwblhau"
+#: plugins/hebrew/parsha.cpp:70
+msgid "Kedoshim"
+msgstr "Kedoshim"
 
-#: views/todoview/kotodoview.cpp:256
-msgctxt "unspecified priority"
-msgid "unspecified"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:71
+msgid "Emor"
+msgstr "Emor"
 
-#: views/todoview/kotodoview.cpp:257
-msgctxt "highest priority"
-msgid "1 (highest)"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:72
+msgid "Behar"
+msgstr "Behar"
 
-#: views/todoview/kotodoview.cpp:258
-msgid "2"
-msgstr "2"
+#: plugins/hebrew/parsha.cpp:73
+msgid "Bechukotai"
+msgstr "Bechukotai"
 
-#: views/todoview/kotodoview.cpp:259
-msgid "3"
-msgstr "3"
+#: plugins/hebrew/parsha.cpp:74
+msgid "Bemidbar"
+msgstr "Bemidbar"
 
-#: views/todoview/kotodoview.cpp:260
-msgid "4"
-msgstr "4"
+#: plugins/hebrew/parsha.cpp:75
+msgid "Naso"
+msgstr "Naso"
 
-#: views/todoview/kotodoview.cpp:261
-msgctxt "medium priority"
-msgid "5 (medium)"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:76
+msgid "Behaalotcha"
+msgstr "Behaalotcha"
 
-#: views/todoview/kotodoview.cpp:262
-msgid "6"
-msgstr "6"
+#: plugins/hebrew/parsha.cpp:77
+msgid "Shelach"
+msgstr "Shelach"
 
-#: views/todoview/kotodoview.cpp:263
-msgid "7"
-msgstr "7"
+#: plugins/hebrew/parsha.cpp:78
+msgid "Korach"
+msgstr "Korach"
 
-#: views/todoview/kotodoview.cpp:264
-msgid "8"
-msgstr "8"
+#: plugins/hebrew/parsha.cpp:79
+msgid "Chukat"
+msgstr "Chukat"
 
-#: views/todoview/kotodoview.cpp:265
-msgctxt "lowest priority"
-msgid "9 (lowest)"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:80
+msgid "Balak"
+msgstr "Balak"
 
-#: views/todoview/kotodoviewview.cpp:62
-msgid "View Columns"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:81
+msgid "Pinchas"
+msgstr "Pinchas"
 
-#: views/todoview/kotodoviewquicksearch.cpp:61
-msgctxt "@label in QuickSearchLine"
-msgid "Search"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:82
+msgid "Matot"
+msgstr "Matot"
 
-#: views/todoview/kotodoviewquicksearch.cpp:69
-msgctxt "@item:inlistbox"
-msgid "Select Categories"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:83
+msgid "Masei"
+msgstr "Masei"
 
-#: views/todoview/kotodoviewquicksearch.cpp:70
-msgctxt "@item:intext delimiter for joining category names"
-msgid ","
-msgstr ""
+#: plugins/hebrew/parsha.cpp:84
+msgid "Devarim"
+msgstr "Devarim"
 
-#: views/todoview/kotododelegates.cpp:225
-msgctxt "@action:inmenu Unspecified priority"
-msgid "unspecified"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:85
+msgid "Vaetchanan"
+msgstr "Vaetchanan"
 
-#: views/todoview/kotododelegates.cpp:226
-msgctxt "@action:inmenu highest priority"
-msgid "1 (highest)"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:86
+msgid "Ekev"
+msgstr "Ekev"
 
-#: views/todoview/kotododelegates.cpp:227
-msgctxt "@action:inmenu"
-msgid "2"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:87
+msgid "Reeh"
+msgstr "Reeh"
 
-#: views/todoview/kotododelegates.cpp:228
-msgctxt "@action:inmenu"
-msgid "3"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:88
+msgid "Shoftim"
+msgstr "Shoftim"
+
+#: plugins/hebrew/parsha.cpp:89
+msgid "Ki Tetze"
+msgstr "Ki Tetze"
 
-#: views/todoview/kotododelegates.cpp:229
-msgctxt "@action:inmenu"
-msgid "4"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:90
+msgid "Ki Tavo"
+msgstr "Ki Tavo"
 
-#: views/todoview/kotododelegates.cpp:230
-msgctxt "@action:inmenu medium priority"
-msgid "5 (medium)"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:91
+msgid "Nitzavim"
+msgstr "Nitzavim"
 
-#: views/todoview/kotododelegates.cpp:231
-msgctxt "@action:inmenu"
-msgid "6"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:92
+msgid "Vayelech"
+msgstr "Vayelech"
 
-#: views/todoview/kotododelegates.cpp:232
-msgctxt "@action:inmenu"
-msgid "7"
-msgstr ""
+#: plugins/hebrew/parsha.cpp:93
+msgid "Haazinu"
+msgstr "Haazinu"
 
-#: views/todoview/kotododelegates.cpp:233
-msgctxt "@action:inmenu"
-msgid "8"
+#: plugins/hebrew/hebrew.cpp:85
+#, kde-format
+msgctxt ""
+"Change the next two strings if emphasis is done differently in your language."
+msgid ""
+"<qt><p align=\"center\"><i>\n"
+"%1\n"
+"</i></p></qt>"
 msgstr ""
 
-#: views/todoview/kotododelegates.cpp:234
-msgctxt "@action:inmenu lowest priority"
-msgid "9 (lowest)"
-msgstr ""
+#: plugins/hebrew/hebrew.cpp:93
+msgid "This plugin provides the date in the Jewish calendar."
+msgstr "Mae'r ategyn yma yn darparu'r dyddiad yn y calendr Iddewig."
 
-#: views/todoview/kotodoviewquickaddline.cpp:38
-msgid "Click to add a new to-do"
+#: plugins/hebrew/holiday.cpp:74
+msgctxt ""
+"These are Jewish holidays and mostly do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters."
+msgid "Sh. HaHodesh"
 msgstr ""
 
-#: views/todoview/kotodomodel.cpp:670
-msgctxt "yes, recurring to-do"
-msgid "Yes"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:82
+msgid "Erev Pesach"
+msgstr "Erev Pesach"
 
-#: views/todoview/kotodomodel.cpp:671
-msgctxt "no, not a recurring to-do"
-msgid "No"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:93
+msgid "Sh. HaGadol"
+msgstr "Sh. HaGadol"
 
-#: views/todoview/kotodomodel.cpp:688
-msgctxt "delimiter for joining category names"
-msgid ","
-msgstr ""
+#: plugins/hebrew/holiday.cpp:101
+msgid "Pesach"
+msgstr "Pesach"
 
-#: views/todoview/kotodomodel.cpp:812
-msgid "Summary"
-msgstr "Crynodeb"
+#: plugins/hebrew/holiday.cpp:112 plugins/hebrew/holiday.cpp:284
+msgid "Chol Hamoed"
+msgstr "Chol Hamoed"
 
-#: views/todoview/kotodomodel.cpp:814
-msgid "Recurs"
-msgstr "Yn Ail-ddigwydd"
+#: plugins/hebrew/holiday.cpp:118
+msgid "Yom HaShoah"
+msgstr "Yom HaShoah"
 
-#: views/todoview/kotodomodel.cpp:816 printing/calprintdefaultplugins.cpp:1493
-msgid "Priority"
-msgstr "Blaenoriaeth"
+#: plugins/hebrew/holiday.cpp:141 plugins/hebrew/holiday.cpp:148
+#: plugins/hebrew/holiday.cpp:159
+msgid "Yom HaAtzmaut"
+msgstr "Yom HaAtzmaut"
 
-#: views/todoview/kotodomodel.cpp:818
-msgctxt "@title:column percent complete"
-msgid "Complete"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:143 plugins/hebrew/holiday.cpp:157
+msgid "Yom HaZikaron"
+msgstr "Yom HaZikaron"
 
-#: views/todoview/kotodomodel.cpp:820
-msgid "Due Date/Time"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:167
+msgid "Yom Yerushalayim"
+msgstr "Yom Yerushalayim"
 
-#. i18n: file: filteredit_base.ui:188
-#. i18n: ectx: property (title), widget (QGroupBox, mCategoriesButtonGroup)
-#: views/todoview/kotodomodel.cpp:822 rc.cpp:47
-msgid "Categories"
-msgstr "Categorïau"
+#: plugins/hebrew/holiday.cpp:171
+msgid "Lag BaOmer"
+msgstr "Lag BaOmer"
 
-#: views/todoview/kotodomodel.cpp:824
-msgid "Description"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:197
+msgid "Erev Shavuot"
+msgstr "Erev Shavuot"
 
-#: views/todoview/kotodomodel.cpp:999
-msgid "Cannot move to-do to itself or a child of itself."
-msgstr ""
+#: plugins/hebrew/holiday.cpp:201
+msgid "Shavuot"
+msgstr "Shavuot"
 
-#: views/todoview/kotodomodel.cpp:1000
-msgid "Drop To-do"
-msgstr "Gwaredu I'w-Wneud"
+#: plugins/hebrew/holiday.cpp:211
+msgid "Tzom Tammuz"
+msgstr "Tzom Tammuz"
 
-#: views/timespentview/kotimespentview.cpp:67
-msgid "Time Tracker"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:219
+msgid "Sh. Hazon"
+msgstr "Sh. Hazon"
 
-#: views/timespentview/kotimespentview.cpp:75
-#, kde-format
-msgctxt "Date from - to"
-msgid "%1 - %2"
-msgstr "%1 - %2"
+#: plugins/hebrew/holiday.cpp:221
+msgid "Sh. Nahamu"
+msgstr "Sh. Nahamu"
 
-#: views/timespentview/kotimespentview.cpp:144
-msgid "No category"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:226
+msgid "Tisha B'Av"
+msgstr "Tisha B'Av"
 
-#: views/timespentview/kotimespentview.cpp:184
-#, kde-format
-msgctxt "number of hours spent"
-msgid "%1 hour"
-msgid_plural "%1 hours"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/hebrew/holiday.cpp:232
+msgid "S'lichot"
+msgstr "S'lichot"
 
-#: views/timespentview/kotimespentview.cpp:185
-#, kde-format
-msgctxt "percent of hours spent"
-msgid " (%1%)"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:234
+msgid "Erev R.H."
+msgstr "Erev R.H."
 
-#: views/whatsnextview/kowhatsnextview.cpp:85
-msgid "What's Next?"
-msgstr "Beth sydd nesaf?"
+#: plugins/hebrew/holiday.cpp:241
+msgid "Rosh Hashana"
+msgstr "Rosh Hashana"
 
-#: views/whatsnextview/kowhatsnextview.cpp:112
-msgid "Events:"
-msgstr "Digwyddiadau:"
+#: plugins/hebrew/holiday.cpp:245 plugins/hebrew/holiday.cpp:260
+msgid "Sh. Shuvah"
+msgstr "Sh. Shuvah"
 
-#: views/whatsnextview/kowhatsnextview.cpp:155
-msgid "To-do:"
-msgstr "I'w-Wneud:"
+#: plugins/hebrew/holiday.cpp:247 plugins/hebrew/holiday.cpp:252
+msgid "Tzom Gedalia"
+msgstr "Tzom Gedalia"
 
-#: views/whatsnextview/kowhatsnextview.cpp:193
-#: views/whatsnextview/kowhatsnextview.cpp:214
-msgid "Events and to-dos that need a reply:"
-msgstr "Digwyddiadau ac I'w-Gwneud sydd angen ateb:"
+#: plugins/hebrew/holiday.cpp:264
+msgid "Erev Y.K."
+msgstr "Erev Y.K."
 
-#: views/whatsnextview/kowhatsnextview.cpp:284
-#, kde-format
-msgctxt "date, from - to"
-msgid "%1, %2 - %3"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:267
+msgid "Yom Kippur"
+msgstr "Yom Kippur"
 
-#: views/whatsnextview/kowhatsnextview.cpp:320
-#, kde-format
-msgctxt "to-do due date"
-msgid "  (Due: %1)"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:270
+msgid "Erev Sukkot"
+msgstr "Erev Sukkot"
 
-#. i18n: file: korganizer_part.rc:33
-#. i18n: ectx: Menu (edit)
-#. i18n: file: korganizerui.rc:25
-#. i18n: ectx: Menu (edit)
-#: views/journalview/journalview.cpp:186 rc.cpp:252 rc.cpp:1204
-msgid "&Edit"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:275
+msgid "Sukkot"
+msgstr "Sukkot"
 
-#: views/journalview/journalview.cpp:189
-msgid "Edit this journal entry"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:288
+msgid "Hoshana Rabah"
+msgstr "Hoshana Rabah"
 
-#: views/journalview/journalview.cpp:190
-msgid "Opens an editor dialog for this journal entry"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:291
+msgid "Shmini Atzeret"
+msgstr "Shmini Atzeret"
 
-#: views/journalview/journalview.cpp:200 views/journalview/journalview.cpp:201
-msgid "Delete this journal entry"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:295
+msgid "Simchat Torah"
+msgstr "Simchat Torah"
 
-#: views/journalview/journalview.cpp:206
-msgid "&Print"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:306
+msgid "Erev Hanukah"
+msgstr "Erev Hanukah"
 
-#: views/journalview/journalview.cpp:210
-msgid "Print this journal entry"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:308 plugins/hebrew/holiday.cpp:316
+msgid "Hanukah"
+msgstr "Hanukah"
 
-#: views/journalview/journalview.cpp:211
-msgid "Opens a print dialog for this journal entry"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:320
+msgid "Tzom Tevet"
+msgstr "Tzom Tevet"
 
-#: views/multiagendaview/multiagendaview.cpp:47
-#, kde-format
-msgid "Agenda %1"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:339
+#: plugins/hebrew/holiday.cpp:344 plugins/hebrew/holiday.cpp:349
+msgid "Sh. Shirah"
+msgstr "Sh. Shirah"
 
-#: views/multiagendaview/multiagendaview.cpp:321
-msgid "Configure Side-By-Side View"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:346
+msgid "Tu B'Shvat"
+msgstr "Tu B'Shvat"
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:143
-#. i18n: ectx: property (text), item, widget (KComboBox, mSubDays)
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:157
-#. i18n: ectx: property (text), item, widget (KComboBox, mHolidays)
-#: kcmdesignerfields.cpp:82 kcmdesignerfields.cpp:83 kcmdesignerfields.cpp:88
-#: kcmdesignerfields.cpp:89 rc.cpp:384 rc.cpp:390
-msgid "Text"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:360 plugins/hebrew/holiday.cpp:372
+#: plugins/hebrew/holiday.cpp:380
+msgid "Sh. Shekalim"
+msgstr "Sh. Shekalim"
+
+#: plugins/hebrew/holiday.cpp:369
+msgid "Purim Katan"
+msgstr "Purim Katan"
 
-#: kcmdesignerfields.cpp:84
-msgid "Numeric Value"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:388 plugins/hebrew/holiday.cpp:408
+msgid "Ta'anit Ester"
+msgstr "Ta'anit Ester"
 
-#: kcmdesignerfields.cpp:85
-msgid "Boolean"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:397 plugins/hebrew/holiday.cpp:402
+msgid "Sh. Zachor"
+msgstr "Sh. Zachor"
 
-#: kcmdesignerfields.cpp:86
-msgid "Selection"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:404
+msgid "Erev Purim"
+msgstr "Erev Purim"
 
-#: kcmdesignerfields.cpp:87 kcmdesignerfields.cpp:90
-msgid "Date & Time"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:412
+msgid "Purim"
+msgstr "Purim"
 
-#: kcmdesignerfields.cpp:91
-msgid "Date"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:416 plugins/hebrew/holiday.cpp:421
+msgid "Shushan Purim"
+msgstr "Shushan Purim"
 
-#: kcmdesignerfields.cpp:145
-msgid "KCMDesignerfields"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:432
+msgid "Sh. Parah"
+msgstr "Sh. Parah"
 
-#: kcmdesignerfields.cpp:146
-msgid "Qt Designer Fields Dialog"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:442
+msgid "Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
 
-#: kcmdesignerfields.cpp:148
-msgid "(c), 2004 Tobias Koenig"
-msgstr ""
+#: plugins/hebrew/holiday.cpp:459
+msgid " Omer"
+msgstr " Omer"
 
-#: kcmdesignerfields.cpp:150
-msgid "Tobias Koenig"
-msgstr ""
+#: plugins/hebrew/configdialog.cpp:38
+msgid "Configure Holidays"
+msgstr "Ffurfweddu Gwyliau"
 
-#: kcmdesignerfields.cpp:189
-#, kde-format
-msgid "<qt>Do you really want to delete '<b>%1</b>'?</qt>"
-msgstr ""
+#: plugins/hebrew/configdialog.cpp:47
+msgid "Use Israeli holidays"
+msgstr "Defnyddiwch gwyliau Israeli"
 
-#: kcmdesignerfields.cpp:198
-msgid "*.ui|Designer Files"
-msgstr ""
+#: plugins/hebrew/configdialog.cpp:51
+msgid "Show weekly parsha"
+msgstr "Dangos parsha wythnosol"
 
-#: kcmdesignerfields.cpp:199
-msgid "Import Page"
-msgstr ""
+#: plugins/hebrew/configdialog.cpp:55
+msgid "Show day of Omer"
+msgstr "Dangos diwrnod Omer"
+
+#: plugins/hebrew/configdialog.cpp:59
+msgid "Show Chol HaMoed"
+msgstr "Dangos Chol HaMoed"
 
-#: kcmdesignerfields.cpp:295
+#: plugins/picoftheday/picoftheday.cpp:67
 msgid ""
-"<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
-"installed. You will only be able to import existing designer files.</qt>"
+"<qt>This plugin provides the Wikipedia <i>Picture of the Day</i>.</qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:306
-msgid "Available Pages"
+#: plugins/picoftheday/picoftheday.cpp:91
+msgid "Loading..."
 msgstr ""
 
-#: kcmdesignerfields.cpp:312
-msgid "Preview of Selected Page"
+#: plugins/picoftheday/picoftheday.cpp:92
+msgid "<qt>Loading <i>Picture of the Day</i>...</qt>"
 msgstr ""
 
-#: kcmdesignerfields.cpp:331
-#, kde-format
-msgid ""
-"<qt><p>This section allows you to add your own GUI Elements "
-"('<i>Widgets</i>') to store your own values into %1. Proceed as described "
-"below:</p><ol><li>Click on '<i>Edit with Qt Designer</i>'</li><li>In the "
-"dialog, select '<i>Widget</i>', then click <i>OK</i></li><li>Add your "
-"widgets to the form</li><li>Save the file in the directory proposed by Qt "
-"Designer</li><li>Close Qt Designer</li></ol><p>In case you already have a "
-"designer file (*.ui) located somewhere on your hard disk, simply choose "
-"'<i>Import Page</i>'</p><p><b>Important:</b> The name of each input widget "
-"you place within the form must start with '<i>X_</i>'; so if you want the "
-"widget to correspond to your custom entry '<i>X-Foo</i>', set the widget's "
-"<i>name</i> property to '<i>X_Foo</i>'.</p><p><b>Important:</b> The widget "
-"will edit custom fields with an application name of %2.  To change the "
-"application name to be edited, set the widget name in Qt Designer.</p></qt>"
+#: plugins/picoftheday/picoftheday.cpp:197
+msgid "Picture Page"
 msgstr ""
 
-#: kcmdesignerfields.cpp:353
-#, kde-format
-msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
+#: plugins/picoftheday/configdialog.cpp:45
+msgid "Configure Picture of the Day"
 msgstr ""
 
-#: kcmdesignerfields.cpp:365
-msgid "Delete Page"
+#: plugins/picoftheday/configdialog.cpp:55
+msgid "Thumbnail Aspect Ratio Mode"
 msgstr ""
 
-#: kcmdesignerfields.cpp:368
-msgid "Import Page..."
+#: plugins/picoftheday/configdialog.cpp:61
+msgid "Ignore aspect ratio"
 msgstr ""
 
-#: kcmdesignerfields.cpp:370
-msgid "Edit with Qt Designer..."
+#: plugins/picoftheday/configdialog.cpp:62
+msgid ""
+"The thumbnail will be scaled freely. The aspect ratio will not be preserved."
 msgstr ""
 
-#: kcmdesignerfields.cpp:392
-msgid "Key:"
+#: plugins/picoftheday/configdialog.cpp:66
+msgid "Keep aspect ratio"
 msgstr ""
 
-#: kcmdesignerfields.cpp:394
-msgid "Type:"
+#: plugins/picoftheday/configdialog.cpp:67
+msgid ""
+"The thumbnail will be scaled to a rectangle as large as possible inside a "
+"given rectangle, preserving the aspect ratio."
 msgstr ""
 
-#: kcmdesignerfields.cpp:396
-msgid "Classname:"
+#: plugins/picoftheday/configdialog.cpp:72
+msgid "Keep aspect ratio by expanding"
 msgstr ""
 
-#: kcmdesignerfields.cpp:398 printing/calprintdefaultplugins.cpp:467
-msgid "Description:"
+#: plugins/picoftheday/configdialog.cpp:74
+msgid ""
+"The thumbnail will be scaled to a rectangle as small as possible outside a "
+"given rectangle, preserving the aspect ratio."
 msgstr ""
 
-#: history.cpp:308
-#, kde-format
-msgid "Delete %1"
-msgstr "Dileu %1"
-
-#: history.cpp:346
-#, kde-format
-msgid "Add %1"
-msgstr "Ychwanegu %1"
-
-#: history.cpp:380
-#, kde-format
-msgid "Edit %1"
-msgstr "Golygu %1"
-
-#: htmlexportjob.cpp:154
+#: htmlexportjob.cpp:159
 msgid "Unable to write the output file."
 msgstr ""
 
-#: htmlexportjob.cpp:160
+#: htmlexportjob.cpp:165
 msgid "Unable to write the temporary file for uploading."
 msgstr ""
 
-#: htmlexportjob.cpp:163
+#: htmlexportjob.cpp:168
 msgid "Unable to upload the export file."
 msgstr ""
 
-#: htmlexportjob.cpp:171
+#: htmlexportjob.cpp:176
 #, kde-format
 msgid "Web page successfully written to \"%1\""
 msgstr ""
 
-#: htmlexportjob.cpp:173
+#: htmlexportjob.cpp:178
 #, kde-format
 msgid "Export failed. %1"
 msgstr ""
 
-#: htmlexportjob.cpp:177
+#: htmlexportjob.cpp:182
 msgctxt "@title:window"
 msgid "Export Status"
 msgstr ""
 
-#: htmlexportjob.cpp:291
+#: htmlexportjob.cpp:296
 #, kde-format
 msgctxt "@title month and year"
 msgid "%1 %2"
 msgstr ""
 
-#: htmlexportjob.cpp:371
+#: htmlexportjob.cpp:376
 msgctxt "@title:column event start time"
 msgid "Start Time"
 msgstr ""
 
-#: htmlexportjob.cpp:373
+#: htmlexportjob.cpp:378
 msgctxt "@title:column event end time"
 msgid "End Time"
 msgstr ""
 
-#: htmlexportjob.cpp:375
+#: htmlexportjob.cpp:380
 msgctxt "@title:column event description"
 msgid "Event"
 msgstr ""
 
-#: htmlexportjob.cpp:378
+#: htmlexportjob.cpp:383
 msgctxt "@title:column event locatin"
 msgid "Location"
 msgstr ""
 
-#: htmlexportjob.cpp:383
+#: htmlexportjob.cpp:388
 msgctxt "@title:column event categories"
 msgid "Categories"
 msgstr ""
 
-#: htmlexportjob.cpp:388
+#: htmlexportjob.cpp:393
 msgctxt "@title:column event attendees"
 msgid "Attendees"
 msgstr ""
 
-#: htmlexportjob.cpp:507
-msgctxt "@title:column"
-msgid "To-do"
-msgstr ""
-
-#: htmlexportjob.cpp:508
-msgctxt "@title:column to-do priority"
-msgid "Priority"
-msgstr ""
-
-#: htmlexportjob.cpp:510
-msgctxt "@title:column to-do percent completed"
-msgid "Completed"
-msgstr ""
-
-#: htmlexportjob.cpp:512
-msgctxt "@title:column to-do due date"
-msgid "Due Date"
-msgstr ""
-
-#: htmlexportjob.cpp:516
-msgctxt "@title:column to-do location"
-msgid "Location"
-msgstr ""
-
-#: htmlexportjob.cpp:520
-msgctxt "@title:column to-do categories"
-msgid "Categories"
-msgstr ""
-
-#: htmlexportjob.cpp:524
-msgctxt "@title:column to-do attendees"
-msgid "Attendees"
-msgstr ""
-
-#: htmlexportjob.cpp:551
-msgctxt "@title:column sub-to-dos of the parent to-do"
-msgid "Sub-To-dos of: "
-msgstr ""
-
-#: htmlexportjob.cpp:607
-msgctxt "@title:column sub-to-dos of the parent to-do"
-msgid "Sub-To-dos"
-msgstr ""
-
-#: htmlexportjob.cpp:625
-#, kde-format
-msgctxt "@info/plain to-do percent complete"
-msgid "%1 %"
-msgstr ""
-
-#: htmlexportjob.cpp:780
-msgctxt "@info/plain"
-msgid "This page was created "
-msgstr ""
-
-#: htmlexportjob.cpp:789
-#, kde-format
-msgctxt "@info/plain page creator email link with name"
-msgid "by <link url='mailto:%1'>%2</link> "
-msgstr ""
-
-#: htmlexportjob.cpp:793
-#, kde-format
-msgctxt "@info/plain page creator email link"
-msgid "by <link url='mailto:%1'>%2</link> "
-msgstr ""
-
-#: htmlexportjob.cpp:799
-#, kde-format
-msgctxt "@info/plain page creator name only"
-msgid "by %1 "
-msgstr ""
-
-#: htmlexportjob.cpp:805
-#, kde-format
-msgctxt "@info/plain page credit with name and link"
-msgid "with <link url='%1'>%2</link>"
-msgstr ""
-
-#: htmlexportjob.cpp:809
-#, kde-format
-msgctxt "@info/plain page credit name only"
-msgid "with %1"
-msgstr ""
-
-#: htmlexportjob.cpp:876
-#, kde-format
-msgctxt "@info/plain holiday by date and name"
-msgid "%1, %2"
-msgstr ""
-
-#: koeventview.cpp:189
-msgid "Also &Future Items"
-msgstr ""
-
-#: koeventview.cpp:199
-msgid ""
-"The item you are trying to change is a recurring item. Should the changes be "
-"applied only to this single occurrence, also to future items, or to all "
-"items in the recurrence?"
-msgstr ""
-
-#: koeventview.cpp:204
-msgid ""
-"The item you are trying to change is a recurring item. Should the changes be "
-"applied only to this single occurrence or to all items in the recurrence?"
-msgstr ""
-
-#: koeventview.cpp:214
-msgid "Changing Recurring Item"
-msgstr ""
-
-#: koeventview.cpp:215
-msgid "Only &This Item"
-msgstr ""
-
-#: koeventview.cpp:217
-msgid "&All Occurrences"
-msgstr ""
-
-#: koeventpopupmenu.cpp:62
-msgctxt "cut this event"
-msgid "C&ut"
-msgstr ""
-
-#: koeventpopupmenu.cpp:65
-msgctxt "copy this event"
-msgid "&Copy"
-msgstr ""
-
-#: koeventpopupmenu.cpp:69
-msgid "&Paste"
+#: htmlexportjob.cpp:512
+msgctxt "@title:column"
+msgid "To-do"
 msgstr ""
 
-#: koeventpopupmenu.cpp:72
-msgctxt "delete this incidence"
-msgid "&Delete"
+#: htmlexportjob.cpp:513
+msgctxt "@title:column to-do priority"
+msgid "Priority"
 msgstr ""
 
-#: koeventpopupmenu.cpp:77
-msgid "Togg&le To-do Completed"
+#: htmlexportjob.cpp:515
+msgctxt "@title:column to-do percent completed"
+msgid "Completed"
 msgstr ""
 
-#: koeventpopupmenu.cpp:80
-msgid "&Toggle Reminder"
+#: htmlexportjob.cpp:517
+msgctxt "@title:column to-do due date"
+msgid "Due Date"
 msgstr ""
 
-#: koeventpopupmenu.cpp:84
-msgid "&Dissociate From Recurrence..."
+#: htmlexportjob.cpp:521
+msgctxt "@title:column to-do location"
+msgid "Location"
 msgstr ""
 
-#: koeventpopupmenu.cpp:90
-msgid "Send as iCalendar..."
+#: htmlexportjob.cpp:525
+msgctxt "@title:column to-do categories"
+msgid "Categories"
 msgstr ""
 
-#: exportwebdialog.cpp:72
-msgid "Export Calendar as Web Page"
-msgstr "Allforio Calendr fel Tudalen Wê"
-
-#: exportwebdialog.cpp:78
-msgid "Export"
+#: htmlexportjob.cpp:529
+msgctxt "@title:column to-do attendees"
+msgid "Attendees"
 msgstr ""
 
-#: exportwebdialog.cpp:137
-msgid ""
-"You are about to set all preferences to default values. All custom "
-"modifications will be lost."
+#: htmlexportjob.cpp:559
+msgctxt "@title:column sub-to-dos of the parent to-do"
+msgid "Sub-To-dos of: "
 msgstr ""
-"Rydych ar fin gosod yr holl werthoedd i'r gwerthoedd rhagosod. Collir pob "
-"addasiad."
-
-#: exportwebdialog.cpp:139
-msgid "Setting Default Preferences"
-msgstr "Gosod Hoffiannau Rhagosod"
 
-#: exportwebdialog.cpp:140
-msgid "Reset to Defaults"
+#: htmlexportjob.cpp:615
+msgctxt "@title:column sub-to-dos of the parent to-do"
+msgid "Sub-To-dos"
 msgstr ""
 
-#: exportwebdialog.cpp:148
-msgctxt "general settings for html export"
-msgid "General"
+#: htmlexportjob.cpp:633
+#, kde-format
+msgctxt "@info/plain to-do percent complete"
+msgid "%1 %"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:170
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#: exportwebdialog.cpp:152 rc.cpp:631
-msgid "Date Range"
-msgstr "Amrediad Dyddiadau"
-
-#: exportwebdialog.cpp:164
-msgid "View Type"
-msgstr "Gweld Math"
-
-#: exportwebdialog.cpp:183
-msgid "Destination"
-msgstr "Cyrchfan"
-
-#: exportwebdialog.cpp:207
-msgid "To-dos"
+#: htmlexportjob.cpp:788
+msgctxt "@info/plain"
+msgid "This page was created "
 msgstr ""
 
-#: exportwebdialog.cpp:230
-msgid "Events"
-msgstr "Digwyddiadau"
-
-#: datenavigatorcontainer.cpp:51
-msgid ""
-"<qt><p>Select the dates you want to display in KOrganizer's main view here. "
-"Hold the mouse button to select more than one day.</p><p>Press the top "
-"buttons to browse to the next / previous months or years.</p><p>Each line "
-"shows a week. The number in the left column is the number of the week in the "
-"year. Press it to select the whole week.</p></qt>"
+#: htmlexportjob.cpp:797
+#, kde-format
+msgctxt "@info/plain page creator email link with name"
+msgid "by <link url='mailto:%1'>%2</link> "
 msgstr ""
 
-#: akonadicollectionview.cpp:269
+#: htmlexportjob.cpp:801
 #, kde-format
-msgctxt "@title:window"
-msgid "Properties of Calendar Folder %1"
+msgctxt "@info/plain page creator email link"
+msgid "by <link url='mailto:%1'>%2</link> "
 msgstr ""
 
-#: akonadicollectionview.cpp:279
-msgid "&Disable Color"
+#: htmlexportjob.cpp:807
+#, kde-format
+msgctxt "@info/plain page creator name only"
+msgid "by %1 "
 msgstr ""
 
-#: akonadicollectionview.cpp:285
-msgid "&Assign Color..."
+#: htmlexportjob.cpp:813
+#, kde-format
+msgctxt "@info/plain page credit with name and link"
+msgid "with <link url='%1'>%2</link>"
 msgstr ""
 
-#: akonadicollectionview.cpp:291
-msgid "Use as &Default Calendar"
+#: htmlexportjob.cpp:817
+#, kde-format
+msgctxt "@info/plain page credit name only"
+msgid "with %1"
 msgstr ""
 
-#: akonadicollectionview.cpp:420
-msgid "Add Calendar"
+#: htmlexportjob.cpp:884
+#, kde-format
+msgctxt "@info/plain holiday by date and name"
+msgid "%1, %2"
 msgstr ""
 
-#: akonadicollectionview.cpp:461
+#: kohelper.cpp:78
 #, kde-format
-msgid "Do you really want to delete calendar %1?"
+msgid "Unable to save %1 \"%2\"."
 msgstr ""
 
-#: akonadicollectionview.cpp:462
-msgid "Delete Calendar"
+#: kocorehelper.cpp:51
+msgctxt "@item:intext delimiter for joining holiday names"
+msgid ","
 msgstr ""
 
-#: koprefs.cpp:77
-msgctxt "Default export file"
-msgid "calendar.html"
-msgstr "calendar.html"
-
 #: korgac/alarmdialog.cpp:143
 msgctxt "@title:window"
 msgid "Reminders"
@@ -3344,697 +3531,511 @@
 msgid "Janitorial Staff"
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:49
-msgctxt "@title:window"
-msgid "KOrganizer Reminder Daemon"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:60
-msgctxt "@info"
-msgid "Cannot load system tray icon."
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:73
-msgctxt "@action:inmenu"
-msgid "Suspend All Reminders"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:76
-msgctxt "@action:inmenu"
-msgid "Dismiss All Reminders"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:83
-msgctxt "@action:inmenu"
-msgid "Enable Reminders"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:88
-msgctxt "@action:inmenu"
-msgid "Start Reminder Daemon at Login"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:121
-#, kde-format
-msgctxt "@info:status"
-msgid "There is 1 active reminder."
-msgid_plural "There are %1 active reminders."
-msgstr[0] ""
-msgstr[1] ""
-
-#: korgac/alarmdockwindow.cpp:124
-msgctxt "@info:status"
-msgid "No active reminders."
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:173
-msgctxt "@info"
-msgid ""
-"Do you want to quit the KOrganizer reminder daemon?<nl/><note> you will not "
-"get calendar reminders unless the daemon is running.</note>"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:175 korgac/alarmdockwindow.cpp:187
-msgctxt "@title:window"
-msgid "Close KOrganizer Reminder Daemon"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:185
-msgctxt "@info"
-msgid ""
-"Do you want to start the KOrganizer reminder daemon at login?<nl/><note> you "
-"will not get calendar reminders unless the daemon is running.</note>"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:188
-msgctxt "@action:button start the reminder daemon"
-msgid "Start"
-msgstr ""
-
-#: korgac/alarmdockwindow.cpp:189
-msgctxt "@action:button do not start the reminder daemon"
-msgid "Do Not Start"
-msgstr ""
-
-#: navigatorbar.cpp:47
-msgid "Scroll backward to the previous year"
-msgstr ""
-
-#: navigatorbar.cpp:48
-msgid ""
-"Click this button to scroll the display to the same approximate day of the "
-"previous year"
-msgstr ""
-
-#: navigatorbar.cpp:53
-msgid "Scroll backward to the previous month"
-msgstr ""
-
-#: navigatorbar.cpp:54
-msgid ""
-"Click this button to scroll the display to the same approximate date of the "
-"previous month"
-msgstr ""
-
-#: navigatorbar.cpp:59
-msgid "Scroll forward to the next month"
-msgstr ""
-
-#: navigatorbar.cpp:60
-msgid ""
-"Click this button to scroll the display to the same approximate date of the "
-"next month"
-msgstr ""
-
-#: navigatorbar.cpp:65
-msgid "Scroll forward to the next year"
-msgstr ""
-
-#: navigatorbar.cpp:66
-msgid ""
-"Click this button to scroll the display to the same approximate day of the "
-"next year"
-msgstr ""
-
-#: navigatorbar.cpp:74
-msgid "Select a month"
-msgstr "Dewiswch mis"
-
-#: navigatorbar.cpp:81
-msgid "Select a year"
-msgstr ""
-
-#: navigatorbar.cpp:134
-#, kde-format
-msgctxt "monthname"
-msgid "%1"
-msgstr ""
-
-#: navigatorbar.cpp:135
-#, kde-format
-msgctxt "4 digit year"
-msgid "%1"
-msgstr ""
-
-#: koviewmanager.cpp:502
-msgid "Merged calendar"
-msgstr ""
-
-#: koviewmanager.cpp:521
-msgid "Calendars Side by Side"
-msgstr ""
-
-#: koviewmanager.cpp:555
-msgid ""
-"Unable to display the work week since there are no work days configured. "
-"Please properly configure at least 1 work day in the Time and Date "
-"preferences."
-msgstr ""
-
-#: printing/calprinter.cpp:129
-msgid "Unable to print, no valid print style was returned."
-msgstr ""
-
-#: printing/calprinter.cpp:130
-msgid "Printing error"
-msgstr ""
-
-#: printing/calprinter.cpp:171
-msgid "Print"
+#: korgac/alarmdockwindow.cpp:49
+msgctxt "@title:window"
+msgid "KOrganizer Reminder Daemon"
 msgstr ""
 
-#: printing/calprinter.cpp:180
-msgid "Print Style"
-msgstr "Arddull Argraffu"
-
-#: printing/calprinter.cpp:191
-msgid "Page &orientation:"
-msgstr "Cyf&eiriadaeth y dudalen:"
+#: korgac/alarmdockwindow.cpp:60
+msgctxt "@info"
+msgid "Cannot load system tray icon."
+msgstr ""
 
-#: printing/calprinter.cpp:196
-msgid "Use Default Orientation of Selected Style"
+#: korgac/alarmdockwindow.cpp:73
+msgctxt "@action:inmenu"
+msgid "Suspend All Reminders"
 msgstr ""
 
-#: printing/calprinter.cpp:197
-msgid "Use Printer Default"
+#: korgac/alarmdockwindow.cpp:76
+msgctxt "@action:inmenu"
+msgid "Dismiss All Reminders"
 msgstr ""
 
-#: printing/calprinter.cpp:198
-msgid "Portrait"
+#: korgac/alarmdockwindow.cpp:83
+msgctxt "@action:inmenu"
+msgid "Enable Reminders"
 msgstr ""
 
-#: printing/calprinter.cpp:199
-msgid "Landscape"
+#: korgac/alarmdockwindow.cpp:88
+msgctxt "@action:inmenu"
+msgid "Start Reminder Daemon at Login"
 msgstr ""
 
-#: printing/calprinter.cpp:248
-msgid "&Preview"
-msgstr "&Rhagolwg"
+#: korgac/alarmdockwindow.cpp:121
+#, kde-format
+msgctxt "@info:status"
+msgid "There is 1 active reminder."
+msgid_plural "There are %1 active reminders."
+msgstr[0] ""
+msgstr[1] ""
 
-#: printing/calprintpluginbase.cpp:137
-msgid "This printing style does not have any configuration options."
-msgstr "Nid oes dewisiadau ffurfweddu gan yr arddull argraffu yma."
+#: korgac/alarmdockwindow.cpp:124
+msgctxt "@info:status"
+msgid "No active reminders."
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:287
-msgid "Holiday"
-msgstr "Gŵyl"
+#: korgac/alarmdockwindow.cpp:173
+msgctxt "@info"
+msgid ""
+"Do you want to quit the KOrganizer reminder daemon?<nl/><note> you will not "
+"get calendar reminders unless the daemon is running.</note>"
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:620
-#, kde-format
-msgctxt "print date: formatted-datetime"
-msgid "printed: %1"
+#: korgac/alarmdockwindow.cpp:175 korgac/alarmdockwindow.cpp:187
+msgctxt "@title:window"
+msgid "Close KOrganizer Reminder Daemon"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:979 printing/calprintpluginbase.cpp:1094
-#: printing/calprintpluginbase.cpp:1144
-#: printing/calprintdefaultplugins.cpp:897
-#, kde-format
-msgctxt "summary, location"
-msgid "%1, %2"
+#: korgac/alarmdockwindow.cpp:185
+msgctxt "@info"
+msgid ""
+"Do you want to start the KOrganizer reminder daemon at login?<nl/><note> you "
+"will not get calendar reminders unless the daemon is running.</note>"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:985
-#, kde-format
-msgctxt "starttime - endtime summary"
-msgid "%1-%2 %3"
+#: korgac/alarmdockwindow.cpp:188
+msgctxt "@action:button start the reminder daemon"
+msgid "Start"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:991
-#, kde-format
-msgctxt "starttime - endtime summary, location"
-msgid "%1-%2 %3, %4"
+#: korgac/alarmdockwindow.cpp:189
+msgctxt "@action:button do not start the reminder daemon"
+msgid "Do Not Start"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1038
-#, kde-format
-msgctxt "weekday, shortmonthname daynumber"
-msgid "%1, %2 <numid>%3</numid>"
+#: calendarview.cpp:234
+msgid ""
+"<p><em>No Item Selected</em></p><p>Select an event, to-do or journal entry "
+"to view its details here.</p>"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1153
-#, kde-format
-msgctxt "to-do summary (Due: datetime)"
-msgid "%1 (Due: %2)"
+#: calendarview.cpp:240
+msgid ""
+"View the details of events, journal entries or to-dos selected in "
+"KOrganizer's main view here."
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1157
+#: calendarview.cpp:448
 #, kde-format
-msgctxt "to-do summary (Due: date)"
-msgid "%1 (Due: %2)"
+msgid "Could not load calendar '%1'."
+msgstr "Wedi methu llwytho calendr '%1'."
+
+#: calendarview.cpp:669
+msgid ""
+"The time zone setting was changed. Do you want to keep the absolute time of "
+"the items in your calendar, which will show them to be at a different time "
+"than before, or move them to be at the old time also in the new time zone?"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1166
-#, kde-format
-msgid "To-do: %1"
-msgstr "I'w-Wneud: %1"
+#: calendarview.cpp:676
+msgid "Keep Absolute Times?"
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:1900
-#, kde-format
-msgid "%1%"
-msgstr "%1%"
+#: calendarview.cpp:677
+msgid "Keep Times"
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:2034
-#, kde-format
-msgctxt "Description - date"
-msgid "%1 - %2"
-msgstr "%1 - %2"
+#: calendarview.cpp:678
+msgid "Move Times"
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:2053
+#: calendarview.cpp:752
 #, kde-format
-msgid "Person: %1"
+msgid "Todo completed: %1 (%2)"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:2077
+#: calendarview.cpp:762
 #, kde-format
-msgctxt "Date range: Month dayStart - dayEnd"
-msgid "%1 %2 - %3"
+msgid "Journal of %1"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:2082
+#: calendarview.cpp:816
 #, kde-format
-msgctxt "Date range: monthStart dayStart - monthEnd dayEnd"
-msgid "%1 %2 - %3 %4"
+msgid ""
+"The item \"%1\" is filtered by your current filter rules, so it will be "
+"hidden and not appear in the view."
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:49
-msgid "Print &incidence"
+#: calendarview.cpp:819
+msgid "Filter Applied"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:53
-msgid "Prints an incidence on one page"
+#: calendarview.cpp:897
+#, kde-format
+msgctxt "@info"
+msgid "Do you really want to permanently remove the item \"%1\"?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:100
-msgid "Print da&y"
-msgstr "Argraffu& diwrnod"
-
-#: printing/calprintdefaultplugins.h:104
-msgid "Prints all events of a single day on one page"
-msgstr "Argraffu pob digwyddiad diwrnod sengl ar un dudalen"
-
-#: printing/calprintdefaultplugins.h:145
-msgid "Print &week"
-msgstr "Argraf&fu wythnos"
-
-#: printing/calprintdefaultplugins.h:149
-msgid "Prints all events of one week on one page"
-msgstr "Argraffu pob digwyddiad wythnos sengl ar un dudalen"
-
-#: printing/calprintdefaultplugins.h:194
-msgid "Print mont&h"
-msgstr "Argraffu m&is"
-
-#: printing/calprintdefaultplugins.h:198
-msgid "Prints all events of one month on one page"
-msgstr "Argraffu pob digwyddiad mis sengl ar un dudalen"
-
-#: printing/calprintdefaultplugins.h:238
-msgid "Print to-&dos"
+#: calendarview.cpp:899
+msgctxt "@title:window"
+msgid "Delete Item?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:242
-msgid "Prints all to-dos in a (tree-like) list"
+#: calendarview.cpp:919
+#, kde-format
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to cut just this item and make "
+"all its sub-to-dos independent, or cut the to-do with all its sub-to-dos?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:146
-#: printing/calprintdefaultplugins.cpp:175
-#: printing/calprintdefaultplugins.cpp:194
-msgid "Start date: "
-msgstr ""
+#: calendarview.cpp:924 calendarview.cpp:965 calendarview.cpp:1766
+#: calendarview.cpp:1779 calendarview.cpp:2573 calendarview.cpp:2647
+#: calendarview.cpp:2678
+msgid "KOrganizer Confirmation"
+msgstr "Cadarnhâd KOrganizer"
 
-#: printing/calprintdefaultplugins.cpp:150
-#: printing/calprintdefaultplugins.cpp:179
-msgid "No start date"
+#: calendarview.cpp:925
+msgid "Cut Only This"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:155
-msgid "End date: "
+#: calendarview.cpp:926
+msgid "Cut All"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:159
-msgid "Duration: "
-msgstr "Hyd: "
-
-#: printing/calprintdefaultplugins.cpp:162
-#, kde-format
-msgid "1 hour "
-msgid_plural "%1 hours "
-msgstr[0] ""
-msgstr[1] ""
-
-#: printing/calprintdefaultplugins.cpp:165
+#: calendarview.cpp:961
 #, kde-format
-msgid "1 minute "
-msgid_plural "%1 minutes "
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to copy just this item or copy "
+"the to-do with all its sub-to-dos?"
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:168
-msgid "No end date"
+#: calendarview.cpp:966
+msgid "Copy Only This"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:184
-msgid "Due date: "
+#: calendarview.cpp:967
+msgid "Copy All"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:188
-msgid "No due date"
+#: calendarview.cpp:1030
+msgid "Paste failed: unable to determine a valid target date."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:317
-msgctxt "except for listed dates"
-msgid " except"
+#: calendarview.cpp:1496
+msgid "Make sub-to-dos independent"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:325
-msgid "Repeats: "
+#: calendarview.cpp:1636
+#, kde-format
+msgctxt "@info"
+msgid "\"%1\" was successfully copied to %2."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:335
-msgid "No reminders"
+#: calendarview.cpp:1639
+msgctxt "@title:window"
+msgid "Copying Succeeded"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:338
+#: calendarview.cpp:1645
 #, kde-format
-msgid "Reminder: "
-msgid_plural "%1 reminders: "
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info"
+msgid "Unable to copy the item \"%1\" to %2."
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:352
-#, kde-format
-msgctxt "N days/hours/minutes before/after the start/end"
-msgid "%1 before the start"
+#: calendarview.cpp:1648
+msgctxt "@title:window"
+msgid "Copying Failed"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:356
+#: calendarview.cpp:1708
 #, kde-format
-msgctxt "N days/hours/minutes before/after the start/end"
-msgid "%1 after the start"
+msgctxt "@info"
+msgid ""
+"Unable to remove the item \"%1\" from %2. However, a copy of this item has "
+"been put into %3."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:362
-#, kde-format
-msgctxt "N days/hours/minutes before/after the start/end"
-msgid "%1 before the end"
+#: calendarview.cpp:1713 calendarview.cpp:1734
+msgctxt "@title:window"
+msgid "Moving Failed"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:366
+#: calendarview.cpp:1719
 #, kde-format
-msgctxt "N days/hours/minutes before/after the start/end"
-msgid "%1 after the end"
+msgctxt "@info"
+msgid "\"%1\" was successfully moved from %2 to %3."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:375
-#, kde-format
-msgid "1 day"
-msgid_plural "%1 days"
-msgstr[0] ""
-msgstr[1] ""
+#: calendarview.cpp:1723
+msgctxt "@title:window"
+msgid "Moving Succeeded"
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:378
+#: calendarview.cpp:1730
 #, kde-format
-msgid "1 hour"
-msgid_plural "%1 hours"
-msgstr[0] ""
-msgstr[1] ""
+msgctxt "@info"
+msgid "Unable to add the item \"%1\" into %2. This item has not been moved."
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:381
+#: calendarview.cpp:1762
 #, kde-format
-msgid "1 minute"
-msgid_plural "%1 minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Do you want to dissociate the occurrence on %1 from the recurrence?"
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:385
-#: printing/calprintdefaultplugins.cpp:652
-msgctxt "Spacer for the joined list of categories"
-msgid ", "
+#: calendarview.cpp:1767
+msgid "&Dissociate"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:392
-msgid "Organizer: "
+#: calendarview.cpp:1774
+#, kde-format
+msgid ""
+"Do you want to dissociate the occurrence on %1 from the recurrence or also "
+"dissociate future ones?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:404
-msgid "Location: "
-msgstr "Lleoliad: "
+#: calendarview.cpp:1780
+msgid "&Only Dissociate This One"
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:480
-msgid "Notes:"
+#: calendarview.cpp:1781
+msgid "&Also Dissociate Future Ones"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:488
-msgid "No Subitems"
+#: calendarview.cpp:1797
+msgid "Dissociate occurrence"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:491
-#, kde-format
-msgid "1 Subitem:"
-msgid_plural "%1 Subitems:"
-msgstr[0] ""
-msgstr[1] ""
+#: calendarview.cpp:1809
+msgid "Dissociating the occurrence failed."
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:510
-msgctxt "no status"
-msgid "none"
+#: calendarview.cpp:1810 calendarview.cpp:1837
+msgid "Dissociating Failed"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:512
-msgctxt "unknown status"
-msgid "unknown"
+#: calendarview.cpp:1820
+msgid "Dissociate future occurrences"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:520
-#, kde-format
-msgctxt "subitem start date"
-msgid "Start Date: %1\n"
+#: calendarview.cpp:1836
+msgid "Dissociating the future occurrences failed."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:525
-#, kde-format
-msgctxt "subitem start time"
-msgid "Start Time: %1\n"
+#: calendarview.cpp:2000
+msgid "*.ics|iCalendars"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:532
+#: calendarview.cpp:2010 calendarview.cpp:2062
 #, kde-format
-msgctxt "subitem due date"
-msgid "Due Date: %1\n"
+msgid "Do you want to overwrite %1?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:537
-#, kde-format
-msgctxt "subitem due time"
-msgid "Due Time: %1\n"
+#: calendarview.cpp:2025 calendarview.cpp:2077
+msgctxt "save failure cause unknown"
+msgid "Reason unknown"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:542
+#: calendarview.cpp:2030
 #, kde-format
-msgctxt "subitem counter"
-msgid "%1: "
+msgctxt "@info"
+msgid "Cannot write iCalendar file %1. %2"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:550
-#, kde-format
-msgctxt "subitem Status: statusString"
-msgid "Status: %1\n"
+#: calendarview.cpp:2041
+msgid "The journal entries cannot be exported to a vCalendar file."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:554
-#, kde-format
-msgctxt "subitem Priority: N"
-msgid "Priority: <numid>%1</numid>\n"
+#: calendarview.cpp:2042
+msgid "Data Loss Warning"
+msgstr "Rhybydd Colled Data"
+
+#: calendarview.cpp:2053
+msgid "*.vcs|vCalendars"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:557
+#: calendarview.cpp:2082
 #, kde-format
-msgctxt "subitem Secrecy: secrecyString"
-msgid "Secrecy: %1\n"
+msgctxt "@info"
+msgid "Cannot write vCalendar file %1. %2"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:571
-msgid "No Attachments"
-msgstr ""
+#: calendarview.cpp:2100
+msgid "&Previous Day"
+msgstr "Dyddiad &Blaenorol"
 
-#: printing/calprintdefaultplugins.cpp:574
-#, kde-format
-msgid "1 Attachment:"
-msgid_plural "%1 Attachments:"
-msgstr[0] ""
-msgstr[1] ""
+#: calendarview.cpp:2103
+msgid "&Previous Week"
+msgstr "Wythnos &Blaenorol"
 
-#: printing/calprintdefaultplugins.cpp:582
-msgctxt "Spacer for list of attachments"
-msgid "  "
-msgstr "  "
+#: calendarview.cpp:2104
+msgid "&Next Week"
+msgstr "Wythnos &Nesaf"
 
-#: printing/calprintdefaultplugins.cpp:595
-msgid "No Attendees"
+#: calendarview.cpp:2202 calendarview.cpp:2241
+msgid "No filter"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:597
+#: calendarview.cpp:2568
 #, kde-format
-msgid "1 Attendee:"
-msgid_plural "%1 Attendees:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: printing/calprintdefaultplugins.cpp:611
-#, kde-format
-msgctxt ""
-"Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
-"<reinhold@kainhofer.com> (Participant): Awaiting Response'"
-msgid "%1 (%2): %3"
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to delete just this item and "
+"make all its sub-to-dos independent, or delete the to-do with all its sub-to-"
+"dos?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:622
-#, kde-format
-msgid "Status: %1"
+#: calendarview.cpp:2574
+msgid "Delete Only This"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:626
-#, kde-format
-msgid "Secrecy: %1"
+#: calendarview.cpp:2575 calendarview.cpp:2648
+msgid "Delete All"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:632
-msgid "Show as: Busy"
+#: calendarview.cpp:2577
+msgid "Deleting sub-to-dos"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:634
-msgid "Show as: Free"
+#: calendarview.cpp:2611
+#, kde-format
+msgid ""
+"The item \"%1\" is marked read-only and cannot be deleted; it probably "
+"belongs to a read-only calendar."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:640
-msgid "This task is overdue!"
+#: calendarview.cpp:2615
+msgid "Removing not possible"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:646
-msgid "Settings: "
+#: calendarview.cpp:2644
+#, kde-format
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates; are you sure you want "
+"to delete it and all its recurrences?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:651
-msgid "Categories: "
+#: calendarview.cpp:2655
+msgid "Also Delete &Future"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:809
-#: printing/calprintdefaultplugins.cpp:1095
+#: calendarview.cpp:2659
 #, kde-format
-msgctxt "date from-to"
-msgid "%1 - %2"
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete "
+"only the current one on %2, also future occurrences, or all its occurrences?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:811
-#: printing/calprintdefaultplugins.cpp:1097
+#: calendarview.cpp:2666
 #, kde-format
-msgctxt ""
-"date from-\n"
-"to"
 msgid ""
-"%1 -\n"
-"%2"
+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete "
+"only the current one on %2 or all its occurrences?"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:874
-msgid "Today's Events"
-msgstr ""
+#: calendarview.cpp:2679
+msgid "Delete C&urrent"
+msgstr "Dileu'r &Cyfredol"
 
-#: printing/calprintdefaultplugins.cpp:1120
-#, kde-format
-msgctxt "date from - to (week number)"
-msgid "%1 - %2 (Week %3)"
+#: calendarview.cpp:2681
+msgid "Delete &All"
+msgstr "Dileu'r& cwbl"
+
+#: calendarview.cpp:2757
+msgid "Delete all completed to-dos?"
+msgstr "Dileu pob I'w-Wneud sydd wedi eu gorffen?"
+
+#: calendarview.cpp:2758
+msgid "Purge To-dos"
+msgstr "Carthu I-Wneudau"
+
+#: calendarview.cpp:2759
+msgid "Purge"
+msgstr "Carthu"
+
+#: calendarview.cpp:2763
+msgid "Purging completed to-dos"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1123
-#, kde-format
-msgctxt ""
-"date from -\n"
-"to (week number)"
-msgid ""
-"%1 -\n"
-"%2 (Week %3)"
+#: calendarview.cpp:2783
+msgctxt "@info"
+msgid "Unable to purge to-dos with uncompleted children."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1310
+#: calendarview.cpp:2784
+msgid "Delete To-do"
+msgstr "Dileu I'w-Wneud"
+
+#: calendarview.cpp:2797
 #, kde-format
-msgctxt "monthname year"
-msgid "%1 <numid>%2</numid>"
+msgctxt "@info"
+msgid "Unable to edit \"%1\" because it is locked by another process."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1412
-msgctxt "@option sort by title"
-msgid "Title"
+#: calendarview.cpp:2831
+#, kde-format
+msgid "Unable to copy the item to %1."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1413
-msgctxt "@option sort by start date/time"
-msgid "Start Date"
+#: calendarview.cpp:2832
+msgid "Copying Failed"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1414
-msgctxt "@option sort by due date/time"
-msgid "Due Date"
+#: calendarview.cpp:2878
+#, kde-format
+msgid "Unable to move the item to  %1."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1415
-msgctxt "@option sort by priority"
-msgid "Priority"
+#: calendarview.cpp:2879
+msgid "Moving Failed"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1416
-msgctxt "@option sort by percent completed"
-msgid "Percent Complete"
+#: korganizer_options.h:36
+msgid "Import the specified files as separate calendars"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1422
-msgctxt "@option sort in increasing order"
-msgid "Ascending"
+#: korganizer_options.h:39
+msgid "Merge the specified files into the standard calendar "
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1423
-msgctxt "@option sort in descreasing order"
-msgid "Descending"
+#: korganizer_options.h:42
+msgid "Open the specified files as calendars in a new window"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1433
-msgid "To-do list"
-msgstr "Rhestr I'w-Wneud"
-
-#: printing/calprintdefaultplugins.cpp:1500
-msgctxt "@label to-do summary"
-msgid "Title"
+#: korganizer_options.h:44
+msgid ""
+"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the "
+"user will be asked whether to import, merge or open in a separate window."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1508
-msgctxt "@label to-do percentage complete"
-msgid "Complete"
+#: kdatenavigator.cpp:202
+#, kde-format
+msgctxt "start/end week number of line in date picker"
+msgid "%1/%2"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1516
-msgctxt "@label to-do due date"
-msgid "Due"
+#: kdatenavigator.cpp:208
+#, kde-format
+msgid "Scroll to week number %1"
 msgstr ""
 
-#: kodaymatrix.cpp:248
-msgctxt "delimiter for joining holiday names"
-msgid ","
+#: kdatenavigator.cpp:210
+#, kde-format
+msgid ""
+"Click here to scroll the display to week number %1 of the currently "
+"displayed year."
 msgstr ""
 
-#: kodaymatrix.cpp:693
-msgid "&Move"
-msgstr ""
+#: kdatenavigator.cpp:260
+#, kde-format
+msgid "%1"
+msgstr "%1"
 
-#: kodaymatrix.cpp:695
-msgid "&Copy"
+#: kdatenavigator.cpp:262
+#, kde-format
+msgid "A column header of the %1 dates in the month."
 msgstr ""
 
-#: kodaymatrix.cpp:698
-msgid "&Add"
-msgstr "&Ychwanegu..."
+#: koprefs.cpp:78
+msgctxt "Default export file"
+msgid "calendar.html"
+msgstr "calendar.html"
 
-#: kodaymatrix.cpp:701
-msgid "&Cancel"
+#: korganizer.cpp:288
+msgid "New Calendar"
+msgstr "Calendr Newydd"
+
+#: korganizer.cpp:292
+msgctxt "the calendar is read-only"
+msgid "read-only"
 msgstr ""
 
 #: rc.cpp:1
@@ -4057,7 +4058,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, mNewButton)
 #. i18n: file: publishdialog_base.ui:43
 #. i18n: ectx: property (text), widget (QPushButton, mNew)
-#: rc.cpp:8 rc.cpp:306
+#: rc.cpp:8 rc.cpp:1377
 msgid "&New"
 msgstr "&Newydd"
 
@@ -4140,2277 +4141,2341 @@
 "item.)"
 msgstr ""
 
-#. i18n: file: filteredit_base.ui:181
-#. i18n: ectx: property (text), widget (QCheckBox, mHideInactiveTodosCheck)
-#: rc.cpp:44
-msgid "Hide &inactive to-dos"
-msgstr ""
-
-#. i18n: file: filteredit_base.ui:223
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, mCatHideCheck)
-#: rc.cpp:50
-msgid ""
-"When this option is enabled, this filter will show all items which do "
-"<i>not</i> contain the selected categories."
-msgstr ""
-
-#. i18n: file: filteredit_base.ui:226
-#. i18n: ectx: property (text), widget (QRadioButton, mCatHideCheck)
-#: rc.cpp:53
-msgid "Show all except selected"
-msgstr ""
-
-#. i18n: file: filteredit_base.ui:239
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, mCatShowCheck)
-#: rc.cpp:56
-msgid ""
-"When this option is enabled, this filter will show all items containing at "
-"least the selected items."
-msgstr ""
-
-#. i18n: file: filteredit_base.ui:242
-#. i18n: ectx: property (text), widget (QRadioButton, mCatShowCheck)
-#: rc.cpp:59
-msgid "Show only selected"
-msgstr "Dangos y dewisiad yn unig"
-
-#. i18n: file: filteredit_base.ui:252
-#. i18n: ectx: property (text), widget (QPushButton, mCatEditButton)
-#: rc.cpp:62
-msgid "Change..."
-msgstr "Newid..."
-
-#. i18n: file: filteredit_base.ui:266
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideTodosNotAssignedToMeCheck)
-#: rc.cpp:65
-msgid ""
-"This option hides all to-dos from your list which are assigned to someone "
-"else.<br>\n"
-"Only to-dos which have least one attendee will be checked.  If you are not "
-"in the list of attendees the to-do will be hidden."
-msgstr ""
-
-#. i18n: file: filteredit_base.ui:269
-#. i18n: ectx: property (text), widget (QCheckBox, mHideTodosNotAssignedToMeCheck)
-#: rc.cpp:69
-msgid "Hide to-dos not assigned to me"
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:27
-#. i18n: ectx: attribute (title), widget (QWidget, tabPublish)
-#: rc.cpp:72
-msgid "P&ublish"
-msgstr "Cyh&oeddi"
-
-#. i18n: file: kogroupwareprefspage.ui:39
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:75
-msgid ""
-"By publishing Free/Busy information, you allow others to take your calendar "
-"into account when inviting you for a meeting. Only the times you have "
-"already busy are published, not why they are busy."
-msgstr ""
-"Os cyhoeddwch wybodaeth Rhydd/Prysur, rydych yn gadael i eraill gymryd sylw "
-"o'ch calendr wrth eich gwahodd i gyfarfod.  Cyhoeddir yn unig yr amserau "
-"pryd yr ydych yn brysur, dim pam y maent yn brysur."
-
-#. i18n: file: kogroupwareprefspage.ui:51
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, publishEnable)
-#: rc.cpp:78
-msgid ""
-"Check this box to upload your Free/Busy information automatically.\n"
-"It is possible to skip this option and mail or upload your Free/Busy "
-"information using the Schedule menu of KOrganizer.\n"
-"Note: If KOrganizer is acting as a KDE Kolab client, this is not required, "
-"as the Kolab2 server taking care of publishing your Free/Busy information "
-"and manages the access to it from other users."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:54
-#. i18n: ectx: property (text), widget (QCheckBox, publishEnable)
-#: rc.cpp:83
-msgid "Publish your free/&busy information automatically"
-msgstr "Cyhoeddi eich &gwybodaeth rydd/brysur yn ymysgogol"
-
-#. i18n: file: kogroupwareprefspage.ui:69
-#. i18n: ectx: property (whatsThis), widget (QLabel, publishDelayLabel)
-#. i18n: file: kogroupwareprefspage.ui:82
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, publishDelay)
-#: rc.cpp:86 rc.cpp:92
-msgid ""
-"Configure minimum the interval of time in minutes between each upload here. "
-"This configuration is only effective in case you choose to publish your "
-"information automatically."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:72
-#. i18n: ectx: property (text), widget (QLabel, publishDelayLabel)
-#: rc.cpp:89
-msgid "Minimum time between uploads (in minutes):"
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:102
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3)
-#. i18n: file: kogroupwareprefspage.ui:115
-#. i18n: ectx: property (whatsThis), widget (QSpinBox, publishDays)
-#. i18n: file: kogroupwareprefspage.ui:131
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel4)
-#: rc.cpp:95 rc.cpp:101 rc.cpp:104
-msgid ""
-"Configure the number of calendar days you wish to be published and available "
-"to others here."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:105
-#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#: rc.cpp:98
-msgid "Publish"
-msgstr "Cyhoeddi"
-
-#. i18n: file: kogroupwareprefspage.ui:134
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#: rc.cpp:107
-msgid "days of free/busy information"
-msgstr "dyddiadau o wybodaeth rhydd/prysur"
-
-#. i18n: file: kogroupwareprefspage.ui:159
-#. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup2)
-#. i18n: file: kogroupwareprefspage.ui:338
-#. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup2_2)
-#: rc.cpp:110 rc.cpp:177
-msgid "Server Information"
-msgstr "Gwybodaeth Gweinydd"
-
-#. i18n: file: kogroupwareprefspage.ui:178
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, publishUrl)
-#. i18n: file: kogroupwareprefspage.ui:250
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel7)
-#: rc.cpp:113 rc.cpp:146
-msgid ""
-"Enter the URL for the server on which your Free/Busy information shall be "
-"published here.\n"
-"Ask the server administrator for this information."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:185
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, publishPassword)
-#. i18n: file: kogroupwareprefspage.ui:195
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
-#. i18n: file: kogroupwareprefspage.ui:350
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, retrievePassword)
-#. i18n: file: kogroupwareprefspage.ui:423
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
-#: rc.cpp:117 rc.cpp:120 rc.cpp:180 rc.cpp:221
-msgid "Enter your groupware server login password here."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:198
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:123
-msgid "Password:"
-msgstr "Cyfrinair:"
-
-#. i18n: file: kogroupwareprefspage.ui:210
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel6)
-#. i18n: file: kogroupwareprefspage.ui:231
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, publishUser)
-#. i18n: file: kogroupwareprefspage.ui:362
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, retrieveUser)
-#. i18n: file: kogroupwareprefspage.ui:410
-#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
-#: rc.cpp:126 rc.cpp:134 rc.cpp:183 rc.cpp:213
-msgid ""
-"Enter the login information relative to your account on the server here.\n"
-"\n"
-"A Kolab2 server specificity: Registered your UID (Unique IDentifier). By "
-"default your UID would be your email address on the Kolab2 server but it may "
-"also be different. In the last case enter your UID."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:213
-#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
-#: rc.cpp:131
-msgctxt "login name on the Kolab server"
-msgid "Username:"
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:239
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, publishSavePassword)
-#. i18n: file: kogroupwareprefspage.ui:443
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, retrieveSavePassword)
-#: rc.cpp:139 rc.cpp:227
-msgid ""
-"Check this box to make KOrganizer remember your password and skip asking you "
-"each time it uploads your Free/Busy information, by storing it in the "
-"configuration file.\n"
-"For security reasons, it is not recommended to store your password in the "
-"configuration file."
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:242
-#. i18n: ectx: property (text), widget (QCheckBox, publishSavePassword)
-#: rc.cpp:143
-msgid "Remember p&assword"
-msgstr "Cofio cyfr&inair"
-
-#. i18n: file: kogroupwareprefspage.ui:253
-#. i18n: ectx: property (text), widget (QLabel, TextLabel7)
-#. i18n: file: kogroupwareprefspage.ui:398
-#. i18n: ectx: property (text), widget (QLabel, TextLabel7_2)
-#: rc.cpp:150 rc.cpp:210
-msgid "Server URL:"
-msgstr "URL y gweinydd:"
-
-#. i18n: file: kogroupwareprefspage.ui:263
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:153
-msgid "(No need if using Kolab server version 2)"
-msgstr ""
-
-#. i18n: file: kogroupwareprefspage.ui:290
-#. i18n: ectx: attribute (title), widget (QWidget, tabRetrieve)
-#: rc.cpp:156
-msgid "&Retrieve"
-msgstr "&Nôl"
-
-#. i18n: file: kogroupwareprefspage.ui:302
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:159
-msgid ""
-"By retrieving Free/Busy information that others have published, you can take "
-"their calendar into account when inviting them to a meeting."
+#. i18n: file: filteredit_base.ui:181
+#. i18n: ectx: property (text), widget (QCheckBox, mHideInactiveTodosCheck)
+#: rc.cpp:44
+msgid "Hide &inactive to-dos"
 msgstr ""
-"Gan nôl gwybodaeth rydd/brysur a gyhoeddwyd gan eraill, gallwch gymryd sylw "
-"o'u calendr wrth eu gwahodd i gyfarfod."
 
-#. i18n: file: kogroupwareprefspage.ui:312
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, retrieveEnable)
-#: rc.cpp:162
+#. i18n: file: filteredit_base.ui:223
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, mCatHideCheck)
+#: rc.cpp:50
 msgid ""
-"Check this box to retrieve other peoples' Free/Busy information "
-"automatically. Note that you have to fill the correct server information to "
-"make this possible."
+"When this option is enabled, this filter will show all items which do "
+"<i>not</i> contain the selected categories."
 msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:315
-#. i18n: ectx: property (text), widget (QCheckBox, retrieveEnable)
-#: rc.cpp:165
-msgid "Retrieve other peoples' free/&busy information automatically"
+#. i18n: file: filteredit_base.ui:226
+#. i18n: ectx: property (text), widget (QRadioButton, mCatHideCheck)
+#: rc.cpp:53
+msgid "Show all except selected"
 msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:325
-#. i18n: ectx: property (toolTip), widget (QCheckBox, fullDomainRetrieval)
-#: rc.cpp:168
+#. i18n: file: filteredit_base.ui:239
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, mCatShowCheck)
+#: rc.cpp:56
 msgid ""
-"Set this to retrieve user@domain.ifb instead of user.ifb from the server"
+"When this option is enabled, this filter will show all items containing at "
+"least the selected items."
 msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:328
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, fullDomainRetrieval)
-#: rc.cpp:171
+#. i18n: file: filteredit_base.ui:242
+#. i18n: ectx: property (text), widget (QRadioButton, mCatShowCheck)
+#: rc.cpp:59
+msgid "Show only selected"
+msgstr "Dangos y dewisiad yn unig"
+
+#. i18n: file: filteredit_base.ui:252
+#. i18n: ectx: property (text), widget (QPushButton, mCatEditButton)
+#: rc.cpp:62
+msgid "Change..."
+msgstr "Newid..."
+
+#. i18n: file: filteredit_base.ui:266
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mHideTodosNotAssignedToMeCheck)
+#: rc.cpp:65
 msgid ""
-"Check this box to download a free/busy file in the format "
-"\"user@domain.ifb\" (for example joe@company.com.ifb). Otherwise, it will "
-"download a free/busy file in the format user.ifb (for example joe.ifb). Ask "
-"the server Administrator if you are not sure about how to configure this "
-"option."
+"This option hides all to-dos from your list which are assigned to someone "
+"else.<br>\n"
+"Only to-dos which have least one attendee will be checked.  If you are not "
+"in the list of attendees the to-do will be hidden."
 msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:331
-#. i18n: ectx: property (text), widget (QCheckBox, fullDomainRetrieval)
-#: rc.cpp:174
-msgid "Use full email &address for retrieval"
+#. i18n: file: filteredit_base.ui:269
+#. i18n: ectx: property (text), widget (QCheckBox, mHideTodosNotAssignedToMeCheck)
+#: rc.cpp:69
+msgid "Hide to-dos not assigned to me"
 msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:380
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, retrieveUrl)
-#. i18n: file: kogroupwareprefspage.ui:395
-#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel7_2)
-#: rc.cpp:188 rc.cpp:199
-msgctxt "@info:whatsthis"
+#. i18n: file: korganizer.kcfg:16
+#. i18n: ectx: label, entry, group (Save Settings)
+#: rc.cpp:72
+msgid "Export to HTML periodically"
+msgstr ""
+
+#. i18n: file: korganizer.kcfg:17
+#. i18n: ectx: whatsthis, entry, group (Save Settings)
+#: rc.cpp:75
 msgid ""
-"Enter the URL for the server on which the Free/Busy information is published "
-"here.\n"
-"Ask the server administrator for this information.\n"
-"Here is a Kolab2 Server URL example:\n"
-"\n"
-"https://kolab2.example.com/freebusy/\n"
-"\n"
-"Alternatively, you can specify a full path to the Free/Busy. For example: \n"
-"\n"
-"https://kolab2.example.com/freebusy/user.xfb"
+"Check this box to export the calendar to a HTML-file periodically. By "
+"default, this file will be called calendar.html and placed in the user home "
+"folder."
 msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:413
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:218
-msgid "User&name:"
-msgstr "Enw &defnyddiwr:"
+#. i18n: file: korganizer.kcfg:22
+#. i18n: ectx: label, entry, group (Save Settings)
+#: rc.cpp:78
+msgid "Export &interval in minutes"
+msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:426
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:224
-msgid "Passwor&d:"
-msgstr "Cyfrina&ir:"
+#. i18n: file: korganizer.kcfg:23
+#. i18n: ectx: whatsthis, entry, group (Save Settings)
+#: rc.cpp:81
+msgid ""
+"Set the interval between automatic exporting of calendar events in minutes "
+"here."
+msgstr ""
 
-#. i18n: file: kogroupwareprefspage.ui:446
-#. i18n: ectx: property (text), widget (QCheckBox, retrieveSavePassword)
-#: rc.cpp:231
-msgid "Re&member password"
-msgstr "Co&fio cyfrinair"
+#. i18n: file: korganizer.kcfg:29
+#. i18n: ectx: label, entry (Confirm), group (Save Settings)
+#: rc.cpp:84
+msgid "Confirm deletes"
+msgstr "Cadarnhau dileuon"
 
-#. i18n: file: accountscalendarwidget.ui:29
-#. i18n: ectx: property (text), widget (QPushButton, mAddAccountButton)
-#: rc.cpp:234
-msgid "A&dd..."
+#. i18n: file: korganizer.kcfg:30
+#. i18n: ectx: whatsthis, entry (Confirm), group (Save Settings)
+#: rc.cpp:87
+msgid "Check this box to display a confirmation dialog when deleting items."
 msgstr ""
 
-#. i18n: file: accountscalendarwidget.ui:39
-#. i18n: ectx: property (text), widget (KPushButton, mModifyAccountButton)
-#: rc.cpp:237
-msgid "&Modify..."
+#. i18n: file: korganizer.kcfg:35
+#. i18n: ectx: label, entry (Destination), group (Save Settings)
+#: rc.cpp:90
+msgid "New Events, To-dos and Journal Entries Should"
 msgstr ""
 
-#. i18n: file: accountscalendarwidget.ui:49
-#. i18n: ectx: property (text), widget (KPushButton, mRemoveAccountButton)
-#: rc.cpp:240
-msgid "R&emove"
+#. i18n: file: korganizer.kcfg:38
+#. i18n: ectx: label, entry (Destination), group (Save Settings)
+#: rc.cpp:93
+msgid "Be added to the standard calendar"
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:5
-#. i18n: ectx: Menu (file)
-#. i18n: file: korganizerui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:243 rc.cpp:1195
-msgid "&File"
+#. i18n: file: korganizer.kcfg:39
+#. i18n: ectx: whatsthis, entry (Destination), group (Save Settings)
+#: rc.cpp:96
+msgid ""
+"Select this option to always record new events, to-dos and journal entries "
+"using the standard calendar."
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:12
-#. i18n: ectx: Menu (import)
-#. i18n: file: korganizerui.rc:5
-#. i18n: ectx: Menu (import)
-#: rc.cpp:246 rc.cpp:1198
-msgid "&Import"
-msgstr "&Mewnforio"
+#. i18n: file: korganizer.kcfg:42
+#. i18n: ectx: label, entry (Destination), group (Save Settings)
+#: rc.cpp:99
+msgid "Be asked which calendar to use"
+msgstr ""
 
-#. i18n: file: korganizer_part.rc:19
-#. i18n: ectx: Menu (export)
-#. i18n: file: korganizerui.rc:12
-#. i18n: ectx: Menu (export)
-#: rc.cpp:249 rc.cpp:1201
-msgid "&Export"
-msgstr "&Allforio"
+#. i18n: file: korganizer.kcfg:43
+#. i18n: ectx: whatsthis, entry (Destination), group (Save Settings)
+#: rc.cpp:102
+msgid ""
+"Select this option to choose the calendar to be used to record the item each "
+"time you create a new event, to-do or journal entry. This choice is "
+"recommended if you intend to use the shared folders functionality of the "
+"Kolab server or have to manage multiple accounts using Kontact as a KDE "
+"Kolab client. "
+msgstr ""
 
-#. i18n: file: korganizer_part.rc:45
-#. i18n: ectx: Menu (view)
-#. i18n: file: korganizerui.rc:30
-#. i18n: ectx: Menu (view)
-#: rc.cpp:255 rc.cpp:1207
-msgid "&View"
+#. i18n: file: korganizer.kcfg:53
+#. i18n: ectx: label, entry, group (System Tray)
+#: rc.cpp:105
+msgid "Show Reminder Daemon in the System Tray"
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:62
-#. i18n: ectx: Menu (zoom)
-#. i18n: file: korganizerui.rc:47
-#. i18n: ectx: Menu (zoom)
-#: rc.cpp:258 rc.cpp:1210
-msgid "&Zoom"
+#. i18n: file: korganizer.kcfg:54
+#. i18n: ectx: whatsthis, entry, group (System Tray)
+#: rc.cpp:108
+msgid ""
+"Check this box to show the KOrganizer reminder daemon in the system tray."
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:70
-#. i18n: ectx: Menu (go)
-#. i18n: file: korganizerui.rc:55
-#. i18n: ectx: Menu (go)
-#: rc.cpp:261 rc.cpp:1213
-msgid "&Go"
-msgstr "&Ewch"
+#. i18n: file: korganizer.kcfg:62
+#. i18n: ectx: whatsthis, entry (TimeZoneId), group (Time &amp; Date)
+#: rc.cpp:111
+msgid ""
+"Select your timezone from the list of locations on this drop down box. If "
+"your city is not listed, select one which shares the same timezone. "
+"KOrganizer will automatically adjust for daylight savings."
+msgstr ""
 
-#. i18n: file: korganizer_part.rc:82
-#. i18n: ectx: Menu (actions)
-#. i18n: file: korganizerui.rc:68
-#. i18n: ectx: Menu (actions)
-#: rc.cpp:264 rc.cpp:1216
-msgid "&Actions"
-msgstr "&Gweithredau"
+#. i18n: file: korganizer.kcfg:66
+#. i18n: ectx: label, entry (DayBegins), group (Time &amp; Date)
+#: rc.cpp:114
+msgid "Day begins at"
+msgstr "Diwrnod yn ddechrau am:"
 
-#. i18n: file: korganizer_part.rc:97
-#. i18n: ectx: Menu (schedule)
-#. i18n: file: korganizerui.rc:84
-#. i18n: ectx: Menu (schedule)
-#: rc.cpp:267 rc.cpp:1219
-msgid "S&chedule"
-msgstr "&Trefnlen"
+#. i18n: file: korganizer.kcfg:67
+#. i18n: ectx: whatsthis, entry (DayBegins), group (Time &amp; Date)
+#: rc.cpp:117
+msgid ""
+"Enter the start time for events here. This time should be the earliest time "
+"that you use for events, as it will be displayed at the top."
+msgstr ""
 
-#. i18n: file: korganizer_part.rc:109
-#. i18n: ectx: Menu (settings)
-#. i18n: file: korganizerui.rc:96
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:270 rc.cpp:1222
-msgid "&Settings"
+#. i18n: file: korganizer.kcfg:72
+#. i18n: ectx: label, entry (Holidays), group (Time &amp; Date)
+#: rc.cpp:120
+msgid "Use holiday region:"
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:110
-#. i18n: ectx: Menu (sidebar)
-#. i18n: file: korganizerui.rc:97
-#. i18n: ectx: Menu (sidebar)
-#: rc.cpp:273 rc.cpp:1225
-msgid "&Sidebar"
+#. i18n: file: korganizer.kcfg:73
+#. i18n: ectx: whatsthis, entry (Holidays), group (Time &amp; Date)
+#: rc.cpp:123
+msgid ""
+"Select from which region you want to use the holidays here. Defined holidays "
+"are shown as non-working days in the date navigator, the agenda view, etc."
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:128
-#. i18n: ectx: Menu (help)
-#. i18n: file: korganizerui.rc:111
-#. i18n: ectx: Menu (help)
-#: rc.cpp:276 rc.cpp:1228
-msgid "&Help"
+#. i18n: file: korganizer.kcfg:77
+#. i18n: ectx: label, entry (WorkingHoursStart), group (Time &amp; Date)
+#: rc.cpp:126
+msgid "Daily starting hour"
+msgstr "Awr ddechrau dyddiol:"
+
+#. i18n: file: korganizer.kcfg:78
+#. i18n: ectx: whatsthis, entry (WorkingHoursStart), group (Time &amp; Date)
+#: rc.cpp:129
+msgid ""
+"Enter the start time for the working hours here. The working hours will be "
+"marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:133
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: korganizerui.rc:117
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:279 rc.cpp:1231
-msgctxt "main toolbar"
-msgid "Main"
+#. i18n: file: korganizer.kcfg:83
+#. i18n: ectx: label, entry (WorkingHoursEnd), group (Time &amp; Date)
+#: rc.cpp:132
+msgid "Daily ending hour"
+msgstr "Awr orffen dyddiol:"
+
+#. i18n: file: korganizer.kcfg:84
+#. i18n: ectx: whatsthis, entry (WorkingHoursEnd), group (Time &amp; Date)
+#: rc.cpp:135
+msgid ""
+"Enter the ending time for the working hours here. The working hours will be "
+"marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:149
-#. i18n: ectx: ToolBar (korganizer_toolbar)
-#. i18n: file: korganizerui.rc:134
-#. i18n: ectx: ToolBar (korganizer_toolbar)
-#: rc.cpp:282 rc.cpp:1234
-msgid "Views"
-msgstr "Golygon"
+#. i18n: file: korganizer.kcfg:89
+#. i18n: ectx: label, entry, group (Time &amp; Date)
+#: rc.cpp:138
+msgid "Exclude holidays"
+msgstr "Gwahardd gwyliau"
 
-#. i18n: file: korganizer_part.rc:158
-#. i18n: ectx: ToolBar (schedule_toolbar)
-#. i18n: file: korganizerui.rc:143
-#. i18n: ectx: ToolBar (schedule_toolbar)
-#: rc.cpp:285 rc.cpp:1237
-msgid "Schedule"
-msgstr "Trefnlen"
+#. i18n: file: korganizer.kcfg:90
+#. i18n: ectx: whatsthis, entry, group (Time &amp; Date)
+#: rc.cpp:141
+msgid ""
+"Check this box to prevent KOrganizer from marking the working hours on "
+"holidays."
+msgstr ""
 
-#. i18n: file: korganizer_part.rc:164
-#. i18n: ectx: ToolBar (filter_toolbar)
-#. i18n: file: korganizerui.rc:150
-#. i18n: ectx: ToolBar (filter_toolbar)
-#: rc.cpp:288 rc.cpp:1240
-msgid "Filters Toolbar"
+#. i18n: file: korganizer.kcfg:95
+#. i18n: ectx: label, entry (ColorMonthBusyDaysEnabled), group (Time &amp; Date)
+#. i18n: file: korganizer.kcfg:227
+#. i18n: ectx: label, entry (ColorBusyDaysEnabled), group (Agenda View)
+#: rc.cpp:144 rc.cpp:294
+msgid "Color busy days with a different background color"
 msgstr ""
 
-#. i18n: file: korganizer_part.rc:184
-#. i18n: ectx: Menu (calendar_color)
-#. i18n: file: korganizerui.rc:170
-#. i18n: ectx: Menu (calendar_color)
-#: rc.cpp:291 rc.cpp:1243
-msgid "Calendar Colors"
+#. i18n: file: korganizer.kcfg:96
+#. i18n: ectx: whatsthis, entry (ColorMonthBusyDaysEnabled), group (Time &amp; Date)
+#: rc.cpp:147
+msgid ""
+"Check this box if you want month view's background to be filled with a "
+"different color on days which have at least one all day event marked as "
+"busy. Also, you can change the background color used for this option on the "
+"Colors configuration page. Look for the \"Busy days background color\" "
+"setting."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:23
-#. i18n: ectx: property (toolTip), widget (QListWidget, mListWidget)
-#: rc.cpp:294
-msgid "The list of addressees to receive the invitation"
+#. i18n: file: korganizer.kcfg:105
+#. i18n: ectx: label, entry, group (General View)
+#: rc.cpp:150
+msgid "Enable tooltips for displaying summaries"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:26
-#. i18n: ectx: property (whatsThis), widget (QListWidget, mListWidget)
-#: rc.cpp:297
+#. i18n: file: korganizer.kcfg:106
+#. i18n: ectx: whatsthis, entry, group (General View)
+#: rc.cpp:153
 msgid ""
-"This is a list of all the addresses you have currently selected to receive "
-"the iCalendar invitation."
+"Check this box to display summary tooltips when hovering the mouse over an "
+"event or a to-do."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:37
-#. i18n: ectx: property (toolTip), widget (QPushButton, mNew)
-#: rc.cpp:300
-msgid "Create a new recipient"
+#. i18n: file: korganizer.kcfg:111
+#. i18n: ectx: label, entry, group (General View)
+#: rc.cpp:156
+msgid "To-dos use category colors"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:40
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mNew)
-#: rc.cpp:303
+#. i18n: file: korganizer.kcfg:112
+#. i18n: ectx: whatsthis, entry, group (General View)
+#: rc.cpp:159
 msgid ""
-"Click this button and you will be able to enter a name and email for a new "
-"addressee to add to the recipients list"
+"Check this box so that to-dos will use category colors and not colors "
+"specific to their due, due today or overdue state"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:50
-#. i18n: ectx: property (toolTip), widget (QPushButton, mRemove)
-#: rc.cpp:309
-msgid "Remove the recipient currently selected"
+#. i18n: file: korganizer.kcfg:117
+#. i18n: ectx: label, entry, group (General View)
+#: rc.cpp:162
+msgid "Next x days"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:53
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mRemove)
-#: rc.cpp:312
+#. i18n: file: korganizer.kcfg:118
+#. i18n: ectx: whatsthis, entry, group (General View)
+#: rc.cpp:165
 msgid ""
-"Click this button to remove the recipient currently selected from the list"
+"Select the number of \"x\" days to be displayed in the next days view. To "
+"access the  the next \"x\" days view, choose the \"Next X Days\" menu item "
+"from the \"View\" menu."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:56
-#. i18n: ectx: property (text), widget (QPushButton, mRemove)
-#: rc.cpp:315
-msgid "&Remove"
+#. i18n: file: korganizer.kcfg:119
+#. i18n: ectx: tooltip, entry, group (General View)
+#: rc.cpp:168
+msgid "Show this many days at a time in the Next \"x\" days view"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:63
-#. i18n: ectx: property (toolTip), widget (QPushButton, mSelectAddressee)
-#: rc.cpp:318
-msgid "Select a recipient from your address book"
+#. i18n: file: korganizer.kcfg:124
+#. i18n: ectx: label, entry (DailyRecur), group (General View)
+#: rc.cpp:171
+msgid "Show items that recur daily"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:66
-#. i18n: ectx: property (whatsThis), widget (QPushButton, mSelectAddressee)
-#: rc.cpp:321
+#. i18n: file: korganizer.kcfg:125
+#. i18n: ectx: whatsthis, entry (DailyRecur), group (General View)
+#: rc.cpp:174
 msgid ""
-"Click this button to show another dialog where you will be able to select a "
-"recipient from your address book"
+"Check this box to show the days containing daily recurring events in bold "
+"typeface in the Date Navigator, or uncheck it to give more prominence to "
+"other (non daily recurring) events."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:69
-#. i18n: ectx: property (text), widget (QPushButton, mSelectAddressee)
-#: rc.cpp:324
-msgid "&Select..."
+#. i18n: file: korganizer.kcfg:130
+#. i18n: ectx: label, entry (WeeklyRecur), group (General View)
+#: rc.cpp:177
+msgid "Show items that recur weekly"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:98
-#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:327
-msgctxt "recipient name"
-msgid "Name:"
+#. i18n: file: korganizer.kcfg:131
+#. i18n: ectx: whatsthis, entry (WeeklyRecur), group (General View)
+#: rc.cpp:180
+msgid ""
+"Check this box to show the days containing weekly recurring events in bold "
+"typeface in the Date Navigator, or uncheck it to give more prominence to "
+"other (non weekly recurring) events."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:108
-#. i18n: ectx: property (toolTip), widget (KLineEdit, mNameLineEdit)
-#: rc.cpp:330
-msgid "The recipient's name"
+#. i18n: file: korganizer.kcfg:136
+#. i18n: ectx: label, entry (HighlightTodos), group (General View)
+#: rc.cpp:183
+msgid "Show to-dos instead of events when in Todo View"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:111
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mNameLineEdit)
-#: rc.cpp:333
-msgid "This field contains the name of the recipient"
+#. i18n: file: korganizer.kcfg:137
+#. i18n: ectx: whatsthis, entry (HighlightTodos), group (General View)
+#: rc.cpp:186
+msgid ""
+"Check this box to show the days containing to-dos in bold typeface in the "
+"Date Navigator when in to-do view."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:125
-#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:336
-msgctxt "recipient email"
-msgid "Email:"
+#. i18n: file: korganizer.kcfg:142
+#. i18n: ectx: label, entry (HighlightJournals), group (General View)
+#: rc.cpp:189
+msgid "Show journals instead of events when in Journal View"
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:135
-#. i18n: ectx: property (toolTip), widget (KLineEdit, mEmailLineEdit)
-#: rc.cpp:339
-msgid "The recipient's email address"
+#. i18n: file: korganizer.kcfg:143
+#. i18n: ectx: whatsthis, entry (HighlightJournals), group (General View)
+#: rc.cpp:192
+msgid ""
+"Check this box to show the days containing journals in bold typeface in the "
+"Date Navigator when in journal view."
 msgstr ""
 
-#. i18n: file: publishdialog_base.ui:138
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mEmailLineEdit)
-#: rc.cpp:342
-msgid "This field contains the email address of the recipient"
+#. i18n: file: korganizer.kcfg:148
+#. i18n: ectx: label, entry (WeekNumbersShowWork), group (General View)
+#: rc.cpp:195
+msgid "Week numbers select a work week when in work week mode"
 msgstr ""
 
-#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:345
+#. i18n: file: korganizer.kcfg:149
+#. i18n: ectx: whatsthis, entry (WeekNumbersShowWork), group (General View)
+#: rc.cpp:198
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Print journal options:</span></p></body></html>"
+"Check this box to select a working week when clicking on the Date "
+"Navigator's week numbers, or uncheck it to choose the whole week."
 msgstr ""
 
-#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:43
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:24
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#. i18n: file: plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui:24
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#. i18n: file: printing/calprintweekconfig_base.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#. i18n: file: printing/calprintmonthconfig_base.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#. i18n: file: printing/calprintdayconfig_base.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#: rc.cpp:351 rc.cpp:396 rc.cpp:417 rc.cpp:1252 rc.cpp:1381 rc.cpp:1567
-msgid "Date && Time Range"
-msgstr "Amrediad Dyddiad ac Amser"
+#. i18n: file: korganizer.kcfg:157
+#. i18n: ectx: label, entry, group (Agenda View)
+#: rc.cpp:201
+msgid "Hour size"
+msgstr ""
+
+#. i18n: file: korganizer.kcfg:158
+#. i18n: ectx: whatsthis, entry, group (Agenda View)
+#: rc.cpp:204
+msgid ""
+"Select the height of the hour rows in the agenda grid, in pixels. Increasing "
+"this value will make each row in the agenda grid taller."
+msgstr ""
+
+#. i18n: file: korganizer.kcfg:159
+#. i18n: ectx: tooltip, entry, group (Agenda View)
+#: rc.cpp:207
+msgid "Set the height (in pixels) for an hour in the agenda grid"
+msgstr ""
 
-#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:49
-#. i18n: ectx: property (text), widget (QRadioButton, mAllJournals)
-#: rc.cpp:354
-msgid "&All journal entries"
+#. i18n: file: korganizer.kcfg:166
+#. i18n: ectx: label, entry (EnableAgendaItemIcons), group (Agenda View)
+#: rc.cpp:210
+msgid "Show icons in agenda view items"
 msgstr ""
 
-#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:59
-#. i18n: ectx: property (text), widget (QRadioButton, mRangeJournals)
-#: rc.cpp:357
-msgid "Date &range:"
+#. i18n: file: korganizer.kcfg:167
+#. i18n: ectx: whatsthis, entry (EnableAgendaItemIcons), group (Agenda View)
+#: rc.cpp:213
+msgid ""
+"Check this box to display icons (alarm, recursion, etc.) in agenda view "
+"items."
 msgstr ""
 
-#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:99
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:52
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#. i18n: file: plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui:52
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#. i18n: file: printing/calprintweekconfig_base.ui:68
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#. i18n: file: printing/calprinttodoconfig_base.ui:121
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:40
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#: rc.cpp:360 rc.cpp:399 rc.cpp:420 rc.cpp:1258 rc.cpp:1495 rc.cpp:1573
-msgid "&Start date:"
-msgstr "Dyddiad &dechrau:"
+#. i18n: file: korganizer.kcfg:168
+#. i18n: ectx: tooltip, entry (EnableAgendaItemIcons), group (Agenda View)
+#: rc.cpp:216
+msgid "Display icons in agenda view items"
+msgstr ""
 
-#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:116
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:69
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#. i18n: file: plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui:69
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#. i18n: file: printing/calprintweekconfig_base.ui:187
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#. i18n: file: printing/calprinttodoconfig_base.ui:169
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:114
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#: rc.cpp:363 rc.cpp:402 rc.cpp:423 rc.cpp:1300 rc.cpp:1504 rc.cpp:1597
-msgid "&End date:"
-msgstr "Dyddiad &gorffen:"
+#. i18n: file: korganizer.kcfg:173
+#. i18n: ectx: label, entry (ShowTodosAgendaView), group (Agenda View)
+#. i18n: file: korganizer.kcfg:277
+#. i18n: ectx: label, entry (ShowTodosMonthView), group (Month View)
+#: rc.cpp:219 rc.cpp:354
+msgid "Show to-dos"
+msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:21
-#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
-#: rc.cpp:366
-msgid "Yearly Print Options"
+#. i18n: file: korganizer.kcfg:174
+#. i18n: ectx: whatsthis, entry (ShowTodosAgendaView), group (Agenda View)
+#: rc.cpp:222
+msgid "Check this box to display to-dos in the agenda view."
 msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:33
-#. i18n: ectx: property (text), widget (QLabel, mYearLabel)
-#: rc.cpp:369
-msgid "Print &year:"
+#. i18n: file: korganizer.kcfg:175
+#. i18n: ectx: tooltip, entry (ShowTodosAgendaView), group (Agenda View)
+#: rc.cpp:225
+msgid "Display to-dos in the agenda view"
 msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:46
-#. i18n: ectx: property (text), widget (QLabel, mPagesLabel)
-#: rc.cpp:372
-msgid "Number of &pages:"
+#. i18n: file: korganizer.kcfg:180
+#. i18n: ectx: label, entry (MarcusBainsEnabled), group (Agenda View)
+#: rc.cpp:228
+msgid "Show current-time (Marcus Bains) line"
 msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:110
-#. i18n: ectx: property (title), widget (QGroupBox, mDisplayOptionsGroup)
-#: rc.cpp:375
-msgid "Display Options"
+#. i18n: file: korganizer.kcfg:181
+#. i18n: ectx: whatsthis, entry (MarcusBainsEnabled), group (Agenda View)
+#: rc.cpp:231
+msgid ""
+"Check this box to display a line in the day or week view indicating the "
+"current-time line (Marcus Bains line)."
 msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:119
-#. i18n: ectx: property (text), widget (QLabel, mSubDaysLabel)
-#: rc.cpp:378
-msgid "Show sub-day events as:"
+#. i18n: file: korganizer.kcfg:182
+#. i18n: ectx: tooltip, entry (MarcusBainsEnabled), group (Agenda View)
+#: rc.cpp:234
+msgid "Display the current-time indicator"
 msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:129
-#. i18n: ectx: property (text), widget (QLabel, mHolidaysLabel)
-#: rc.cpp:381
-msgid "Show holidays as:"
+#. i18n: file: korganizer.kcfg:187
+#. i18n: ectx: label, entry (MarcusBainsShowSeconds), group (Agenda View)
+#: rc.cpp:237
+msgid "Show seconds on the current-time (Marcus Bains) line"
 msgstr ""
 
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:148
-#. i18n: ectx: property (text), item, widget (KComboBox, mSubDays)
-#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:162
-#. i18n: ectx: property (text), item, widget (KComboBox, mHolidays)
-#: rc.cpp:387 rc.cpp:393
-msgid "Time Boxes"
+#. i18n: file: korganizer.kcfg:188
+#. i18n: ectx: whatsthis, entry (MarcusBainsShowSeconds), group (Agenda View)
+#: rc.cpp:240
+msgid "Check this box if you want to show seconds on the current-time line."
 msgstr ""
 
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:105
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:405
-msgid "Print Incidences of Type"
+#. i18n: file: korganizer.kcfg:189
+#. i18n: ectx: tooltip, entry (MarcusBainsShowSeconds), group (Agenda View)
+#: rc.cpp:243
+msgid "Display seconds with the current-time indicator"
 msgstr ""
 
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:117
-#. i18n: ectx: property (text), widget (QCheckBox, mEvents)
-#. i18n: file: searchdialog_base.ui:64
-#. i18n: ectx: property (text), widget (QCheckBox, mEventsCheck)
-#: rc.cpp:408 rc.cpp:571
-msgid "&Events"
-msgstr "&Digwyddiadau:"
+#. i18n: file: korganizer.kcfg:194
+#. i18n: ectx: label, entry (SelectionStartsEditor), group (Agenda View)
+#: rc.cpp:246
+msgid "Time range selection in agenda view starts event editor"
+msgstr ""
+"Mae dewis amrediad amser yng golwg agenda yn dechrau'r golygydd digwyddiadau"
 
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:124
-#. i18n: ectx: property (text), widget (QCheckBox, mTodos)
-#: rc.cpp:411
-msgid "&To-dos"
+#. i18n: file: korganizer.kcfg:195
+#. i18n: ectx: whatsthis, entry (SelectionStartsEditor), group (Agenda View)
+#: rc.cpp:249
+msgid ""
+"Check this box to start the event editor automatically when you select a "
+"time range in the daily and weekly view. To select a time range, drag the "
+"mouse from the start time to the end time of the event you are about to plan."
 msgstr ""
 
-#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:131
-#. i18n: ectx: property (text), widget (QCheckBox, mJournals)
-#. i18n: file: searchdialog_base.ui:80
-#. i18n: ectx: property (text), widget (QCheckBox, mJournalsCheck)
-#: rc.cpp:414 rc.cpp:580
-msgid "&Journals"
+#. i18n: file: korganizer.kcfg:196
+#. i18n: ectx: tooltip, entry (SelectionStartsEditor), group (Agenda View)
+#: rc.cpp:252
+msgid "Enable automatic event editor with time range selection"
 msgstr ""
 
-#. i18n: file: viewconfigurationwidget.ui:29
-#. i18n: ectx: property (text), widget (QCheckBox, useCustomCalendarSelection)
-#: rc.cpp:426
-msgid "Show custom calendars"
+#. i18n: file: korganizer.kcfg:201
+#. i18n: ectx: label, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:297
+#. i18n: ectx: label, entry, group (Month View)
+#: rc.cpp:255 rc.cpp:378
+msgid "Color Usage"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:13
-#. i18n: ectx: label, entry, group ($(application)-General)
-#. i18n: file: htmlexportsettings.kcfg:14
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:429 rc.cpp:432
-msgid "Full name of the calendar owner"
+#. i18n: file: korganizer.kcfg:204
+#. i18n: ectx: label, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:300
+#. i18n: ectx: label, entry, group (Month View)
+#: rc.cpp:258 rc.cpp:381
+msgid "Category inside, calendar outside"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:17
-#. i18n: ectx: label, entry, group ($(application)-General)
-#. i18n: file: htmlexportsettings.kcfg:18
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:435 rc.cpp:438
-msgid "Email of the calendar owner"
+#. i18n: file: korganizer.kcfg:205
+#. i18n: ectx: whatsthis, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:301
+#. i18n: ectx: whatsthis, entry, group (Month View)
+#: rc.cpp:261 rc.cpp:384
+msgid ""
+"Select the \"Category inside, calendar outside\" option if you would like to "
+"draw calendar items in their associated category color, with the item's "
+"border drawn in the color of its calendar.  Please use the Colors and Fonts "
+"configuration page for setting these colors."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:21
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:441
-msgid "Creator application"
+#. i18n: file: korganizer.kcfg:206
+#. i18n: ectx: tooltip, entry, group (Agenda View)
+#: rc.cpp:264
+msgid ""
+"Draw agenda items in their category color inside and calendar color for "
+"their border"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:22
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:444
-msgid "Creator application of the calendar"
+#. i18n: file: korganizer.kcfg:209
+#. i18n: ectx: label, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:305
+#. i18n: ectx: label, entry, group (Month View)
+#: rc.cpp:267 rc.cpp:390
+msgid "Calendar inside, category outside"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:25
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:447
-msgid "Creator URL"
+#. i18n: file: korganizer.kcfg:210
+#. i18n: ectx: whatsthis, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:306
+#. i18n: ectx: whatsthis, entry, group (Month View)
+#: rc.cpp:270 rc.cpp:393
+msgid ""
+"Select the \"Calendar inside, category outside\" option if you would like to "
+"draw calendar items in their associated calendar color, with the item's "
+"border drawn in the color of its category.  Please use the Colors and Fonts "
+"configuration page for setting these colors."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:26
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:450
-msgid "URL of the creator application of the calendar."
+#. i18n: file: korganizer.kcfg:211
+#. i18n: ectx: tooltip, entry, group (Agenda View)
+#: rc.cpp:273
+msgid ""
+"Draw agenda items in their calendar color inside and category color for "
+"their border"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:30
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:453
-msgid "Page Title"
+#. i18n: file: korganizer.kcfg:214
+#. i18n: ectx: label, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:310
+#. i18n: ectx: label, entry, group (Month View)
+#: rc.cpp:276 rc.cpp:399
+msgid "Only category"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:35
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:456
-msgid "Date start"
+#. i18n: file: korganizer.kcfg:215
+#. i18n: ectx: whatsthis, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:311
+#. i18n: ectx: whatsthis, entry, group (Month View)
+#: rc.cpp:279 rc.cpp:402
+msgid ""
+"Select the \"Only category\" option if you would like to draw calendar items "
+"(both inside and border) in the color of their associated category.  Please "
+"use the Colors and Fonts configuration page for setting these colors."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:36
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:459
-msgid "First day of the range that shall be exported to HTML."
+#. i18n: file: korganizer.kcfg:216
+#. i18n: ectx: tooltip, entry, group (Agenda View)
+#: rc.cpp:282
+msgid ""
+"Draw agenda items using their category color for the inside and border"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:39
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:462
-msgid "Date end"
+#. i18n: file: korganizer.kcfg:219
+#. i18n: ectx: label, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:315
+#. i18n: ectx: label, entry, group (Month View)
+#: rc.cpp:285 rc.cpp:408
+msgid "Only calendar"
+msgstr ""
+
+#. i18n: file: korganizer.kcfg:220
+#. i18n: ectx: whatsthis, entry, group (Agenda View)
+#. i18n: file: korganizer.kcfg:316
+#. i18n: ectx: whatsthis, entry, group (Month View)
+#: rc.cpp:288 rc.cpp:411
+msgid ""
+"Select the \"Only calendar\" option if you would like to draw calendar items "
+"(both inside and border) in the color of their calendar.  Please use the "
+"Colors and Fonts configuration page for setting these colors."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:40
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:465
-msgid "Last day of the range that shall be exported to HTML."
+#. i18n: file: korganizer.kcfg:221
+#. i18n: ectx: tooltip, entry, group (Agenda View)
+#: rc.cpp:291
+msgid ""
+"Draw agenda items using their calendar color for the inside and border"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:44
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:468
-msgid "Output filename"
+#. i18n: file: korganizer.kcfg:228
+#. i18n: ectx: whatsthis, entry (ColorBusyDaysEnabled), group (Agenda View)
+#: rc.cpp:297
+msgid ""
+"Check this box if you want agenda's background to be filled with a different "
+"color on days which have at least one all day event marked as busy. Also, "
+"you can change the background color used for this option on the Colors "
+"configuration page. Look for the \"Busy days background color\" setting."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:45
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:471
-msgid "The output file name for the HTML export."
+#. i18n: file: korganizer.kcfg:232
+#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:300
+msgid "Multiple Calendar Display"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:49
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:474
-msgid "Style sheet"
+#. i18n: file: korganizer.kcfg:235
+#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:303
+msgid "Merge all calendars into one view"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:50
-#. i18n: ectx: whatsthis, entry, group ($(application)-General)
-#: rc.cpp:477
+#. i18n: file: korganizer.kcfg:236
+#. i18n: ectx: whatsthis, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:306
 msgid ""
-"CSS style sheet to be used by the final HTML page. This string contains the "
-"actual contents of the CSS, not a path to the style sheet."
+"Select the \"Merge all calendars into one view\" option if you would like "
+"all your calendars to be shown together in one agenda view."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:54
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:480
-msgid "Exclude private incidences from the export"
+#. i18n: file: korganizer.kcfg:237
+#. i18n: ectx: tooltip, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:309
+msgid "Show all calendars merged together"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:58
-#. i18n: ectx: label, entry, group ($(application)-General)
-#: rc.cpp:483
-msgid "Exclude confidential incidences from the export"
+#. i18n: file: korganizer.kcfg:240
+#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:312
+msgid "Show calendars side by side"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:66
-#. i18n: ectx: label, entry, group ($(application)-Events)
-#: rc.cpp:486
-msgid "Export events as list"
+#. i18n: file: korganizer.kcfg:241
+#. i18n: ectx: whatsthis, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:315
+msgid ""
+"Select the \"Show calendars side by side\" option if you would like to see "
+"two calendars at once, in a side-by-side view."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:70
-#. i18n: ectx: label, entry, group ($(application)-Events)
-#: rc.cpp:489
-msgid "Export in month view"
+#. i18n: file: korganizer.kcfg:242
+#. i18n: ectx: tooltip, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:318
+msgid "Show two calendars side-by-side"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:74
-#. i18n: ectx: label, entry, group ($(application)-Events)
-#: rc.cpp:492
-msgid "Export in week view"
+#. i18n: file: korganizer.kcfg:245
+#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:321
+msgid "Switch between views with tabs"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:78
-#. i18n: ectx: label, entry (EventTitle), group ($(application)-Events)
-#: rc.cpp:495
-msgid "Title of the calendar"
+#. i18n: file: korganizer.kcfg:246
+#. i18n: ectx: whatsthis, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:324
+msgid ""
+"Select \"Switch between views with tabs\" if you would like to alternate "
+"between calendars using the tab key."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:83
-#. i18n: ectx: label, entry (EventLocation), group ($(application)-Events)
-#: rc.cpp:498
-msgid "Export location of the events"
+#. i18n: file: korganizer.kcfg:247
+#. i18n: ectx: tooltip, entry (AgendaViewCalendarDisplay), group (Agenda View)
+#: rc.cpp:327
+msgid "Tab through calendars"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:87
-#. i18n: ectx: label, entry (EventCategories), group ($(application)-Events)
-#: rc.cpp:501
-msgid "Export categories of the events"
-msgstr ""
+#. i18n: file: korganizer.kcfg:257
+#. i18n: ectx: label, entry (EnableMonthScroll), group (Month View)
+#: rc.cpp:330
+msgid "Enable scrollbars in month view cells"
+msgstr "Galluogi bariau scrolio tu fewn i gellau'r golwg misol"
 
-#. i18n: file: htmlexportsettings.kcfg:91
-#. i18n: ectx: label, entry (EventAttendees), group ($(application)-Events)
-#: rc.cpp:504
-msgid "Export attendees of the events"
+#. i18n: file: korganizer.kcfg:258
+#. i18n: ectx: whatsthis, entry (EnableMonthScroll), group (Month View)
+#: rc.cpp:333
+msgid ""
+"Check this box to display scrollbars when clicking on a cell in the month "
+"view; they will only appear when needed though."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:99
-#. i18n: ectx: label, entry, group ($(application)-Todos)
-#: rc.cpp:507
-msgid "Export to-do list"
+#. i18n: file: korganizer.kcfg:263
+#. i18n: ectx: label, entry (EnableMonthItemIcons), group (Month View)
+#: rc.cpp:336
+msgid "Show icons in month view items"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:103
-#. i18n: ectx: label, entry, group ($(application)-Todos)
-#: rc.cpp:510
-msgid "Title of the to-do list"
+#. i18n: file: korganizer.kcfg:264
+#. i18n: ectx: whatsthis, entry (EnableMonthItemIcons), group (Month View)
+#: rc.cpp:339
+msgid ""
+"Check this box to display icons (alarm, recursion, etc.) in month view items."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:108
-#. i18n: ectx: label, entry (TaskDueDate), group ($(application)-Todos)
-#: rc.cpp:513
-msgid "Export due dates of the to-dos"
+#. i18n: file: korganizer.kcfg:265
+#. i18n: ectx: tooltip, entry (EnableMonthItemIcons), group (Month View)
+#: rc.cpp:342
+msgid "Display icons in month view items"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:112
-#. i18n: ectx: label, entry (TaskLocation), group ($(application)-Todos)
-#: rc.cpp:516
-msgid "Export location of the to-dos"
+#. i18n: file: korganizer.kcfg:270
+#. i18n: ectx: label, entry (ShowTimeInMonthView), group (Month View)
+#: rc.cpp:345
+msgid "Show time in month view items"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:116
-#. i18n: ectx: label, entry (TaskCategories), group ($(application)-Todos)
-#: rc.cpp:519
-msgid "Export categories of the to-dos"
+#. i18n: file: korganizer.kcfg:271
+#. i18n: ectx: whatsthis, entry (ShowTimeInMonthView), group (Month View)
+#: rc.cpp:348
+msgid "Check this box to display the time in month view items."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:120
-#. i18n: ectx: label, entry (TaskAttendees), group ($(application)-Todos)
-#: rc.cpp:522
-msgid "Export attendees of the to-dos"
+#. i18n: file: korganizer.kcfg:272
+#. i18n: ectx: tooltip, entry (ShowTimeInMonthView), group (Month View)
+#: rc.cpp:351
+msgid "Display time in month view items"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:128
-#. i18n: ectx: label, entry, group ($(application)-Journals)
-#. i18n: file: htmlexportsettings.kcfg:139
-#. i18n: ectx: label, entry, group ($(application)-FreeBusy)
-#: rc.cpp:525 rc.cpp:531
-msgid "Export journals"
+#. i18n: file: korganizer.kcfg:278
+#. i18n: ectx: whatsthis, entry (ShowTodosMonthView), group (Month View)
+#: rc.cpp:357
+msgid "Check this box to display to-dos in the month view."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:132
-#. i18n: ectx: label, entry, group ($(application)-Journals)
-#: rc.cpp:528
-msgid "Title of the journal list"
+#. i18n: file: korganizer.kcfg:279
+#. i18n: ectx: tooltip, entry (ShowTodosMonthView), group (Month View)
+#: rc.cpp:360
+msgid "Display to-dos in the month view"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:143
-#. i18n: ectx: label, entry (FreeBusyTitle), group ($(application)-FreeBusy)
-#: rc.cpp:534
-msgid "Title of the free/busy list"
+#. i18n: file: korganizer.kcfg:284
+#. i18n: ectx: label, entry (ShowJournalsMonthView), group (Month View)
+#: rc.cpp:363
+msgid "Show journals"
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:104
-#. i18n: file: printing/calprinttodoconfig_base.ui:40
-#. i18n: ectx: property (text), widget (KLineEdit, mTitle)
-#: rc.cpp:540 rc.cpp:1480
-msgid "To-do List"
-msgstr "Rhestr I'w-Wneud"
-
-#. i18n: file: htmlexportsettings.kcfg:133
-#: rc.cpp:542
-msgid "Journals"
+#. i18n: file: korganizer.kcfg:285
+#. i18n: ectx: whatsthis, entry (ShowJournalsMonthView), group (Month View)
+#: rc.cpp:366
+msgid "Check this box to display journals in the month view."
 msgstr ""
 
-#. i18n: file: htmlexportsettings.kcfg:144
-#: rc.cpp:544
-msgid "Busy times"
+#. i18n: file: korganizer.kcfg:286
+#. i18n: ectx: tooltip, entry (ShowJournalsMonthView), group (Month View)
+#: rc.cpp:369
+msgid "Display journals in the month view"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:16
-#. i18n: ectx: property (windowTitle), widget (QWidget, SearchDialog)
-#: rc.cpp:547
-msgid "Find Events - KOrganizer"
-msgstr ""
+#. i18n: file: korganizer.kcfg:291
+#. i18n: ectx: label, entry, group (Month View)
+#: rc.cpp:372
+msgid "Month view uses full window"
+msgstr "Mae'r golwg misol yn defnyddio ffenestr llawn"
 
-#. i18n: file: searchdialog_base.ui:24
-#. i18n: ectx: property (text), widget (QLabel, mSearchLabel)
-#: rc.cpp:550
-msgid "&Search for:"
-msgstr "&Chwilio am:"
+#. i18n: file: korganizer.kcfg:292
+#. i18n: ectx: whatsthis, entry, group (Month View)
+#: rc.cpp:375
+msgid ""
+"Check this box to use the full KOrganizer window when displaying the month "
+"view. If this box is checked, you will gain some space for the monthly view, "
+"but other widgets, such as the date navigator, the item details and the "
+"calendars list, will not be displayed."
+msgstr ""
 
-#. i18n: file: searchdialog_base.ui:37
-#. i18n: ectx: property (toolTip), widget (KLineEdit, mSearchEdit)
-#: rc.cpp:553
-msgid "Search pattern, use wildcards '*' and '?' as desired."
+#. i18n: file: korganizer.kcfg:302
+#. i18n: ectx: tooltip, entry, group (Month View)
+#: rc.cpp:387
+msgid ""
+"Draw month items in their category color inside and calendar color for their "
+"border"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:40
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, mSearchEdit)
-#: rc.cpp:556
+#. i18n: file: korganizer.kcfg:307
+#. i18n: ectx: tooltip, entry, group (Month View)
+#: rc.cpp:396
 msgid ""
-"Enter your search pattern here. Wildcards '*' (matches any string) and '?' "
-"(matches any character) are supported.  For example, to match any string "
-"starting with the letter 'a', use the search pattern a*."
+"Draw month items in their calendar color inside and category color for their "
+"border"
+msgstr ""
+
+#. i18n: file: korganizer.kcfg:312
+#. i18n: ectx: tooltip, entry, group (Month View)
+#: rc.cpp:405
+msgid "Draw month items using their category color for the inside and border"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:43
-#. i18n: ectx: property (text), widget (KLineEdit, mSearchEdit)
-#: rc.cpp:559
-msgid "*"
+#. i18n: file: korganizer.kcfg:317
+#. i18n: ectx: tooltip, entry, group (Month View)
+#: rc.cpp:414
+msgid "Draw month items using their calendar color for the inside and border"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:52
-#. i18n: ectx: property (title), widget (QGroupBox, mSearchTypeGroup)
-#: rc.cpp:562
-msgid "Search For"
-msgstr "Chwilio am:"
-
-#. i18n: file: searchdialog_base.ui:58
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mEventsCheck)
-#: rc.cpp:565
-msgid "Search for Events with matching criteria"
+#. i18n: file: korganizer.kcfg:327
+#. i18n: ectx: label, entry, group (Todo View)
+#: rc.cpp:417
+msgid "Always display completed to-dos at the bottom of the list"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:61
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mEventsCheck)
-#: rc.cpp:568
+#. i18n: file: korganizer.kcfg:328
+#. i18n: ectx: whatsthis, entry, group (Todo View)
+#: rc.cpp:420
 msgid ""
-"Check this box if you want to search for Event items that match the search "
-"criteria."
+"Check this box if you want all completed to-dos to be always grouped at the "
+"bottom of the to-do list."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:74
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mJournalsCheck)
-#: rc.cpp:574
-msgid "Search for Journals with matching criteria"
+#. i18n: file: korganizer.kcfg:333
+#. i18n: ectx: label, entry, group (Todo View)
+#: rc.cpp:423
+msgid "To-do list view uses full window"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:77
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mJournalsCheck)
-#: rc.cpp:577
+#. i18n: file: korganizer.kcfg:334
+#. i18n: ectx: whatsthis, entry, group (Todo View)
+#: rc.cpp:426
 msgid ""
-"Check this box if you want to search for Journal items that match the search "
-"criteria."
+"Check this box to use the full KOrganizer window when displaying the to-do "
+"list view. If this box is checked, you will gain some space for the to-do "
+"list view, but other widgets, such as the date navigator, the to-do details "
+"and the calendars list, will not be displayed."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:87
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mTodosCheck)
-#: rc.cpp:583
-msgid "Search for To-dos with matching criteria"
+#. i18n: file: korganizer.kcfg:339
+#. i18n: ectx: label, entry, group (Todo View)
+#: rc.cpp:429
+msgid "Record completed to-dos in journal entries"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:90
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mTodosCheck)
-#: rc.cpp:586
+#. i18n: file: korganizer.kcfg:340
+#. i18n: ectx: whatsthis, entry, group (Todo View)
+#: rc.cpp:432
 msgid ""
-"Check this box if you want to search To-do items that match the search "
-"criteria."
+"Check this box to record the completion of a to-do in a new entry of your "
+"journal automatically."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:93
-#. i18n: ectx: property (text), widget (QCheckBox, mTodosCheck)
-#: rc.cpp:589
-msgid "To-&dos"
+#. i18n: file: korganizer.kcfg:348
+#. i18n: ectx: label, entry, group (Colors)
+#. i18n: file: korganizer.kcfg:579
+#. i18n: ectx: label, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:683
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:435 rc.cpp:543 rc.cpp:585
+msgid "Holiday color"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:106
-#. i18n: ectx: property (title), widget (QGroupBox, mSearchGroup)
-#: rc.cpp:592
-msgid "Search In"
-msgstr "Chwilio Mewn"
-
-#. i18n: file: searchdialog_base.ui:112
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mCategoryCheck)
-#: rc.cpp:595
-msgid "Include item categories in your search"
+#. i18n: file: korganizer.kcfg:349
+#. i18n: ectx: whatsthis, entry, group (Colors)
+#. i18n: file: korganizer.kcfg:580
+#. i18n: ectx: whatsthis, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:684
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:438 rc.cpp:546 rc.cpp:588
+msgid ""
+"Select the holiday color here. The holiday color will be used for the "
+"holiday name in the month view and the holiday number in the date navigator."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:115
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mCategoryCheck)
-#: rc.cpp:598
-msgid ""
-"Check this box if you want to match item categories against your search "
-"pattern."
+#. i18n: file: korganizer.kcfg:354
+#. i18n: ectx: label, entry (AgendaBgColor), group (Colors)
+#. i18n: file: korganizer.kcfg:494
+#. i18n: ectx: label, entry, group (Theming)
+#: rc.cpp:441 rc.cpp:519
+msgid "Agenda view background color"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:118
-#. i18n: ectx: property (text), widget (QCheckBox, mCategoryCheck)
-#: rc.cpp:601
-msgid "Cate&gories"
-msgstr "Ca&tegorïau"
+#. i18n: file: korganizer.kcfg:355
+#. i18n: ectx: whatsthis, entry (AgendaBgColor), group (Colors)
+#. i18n: file: korganizer.kcfg:495
+#. i18n: ectx: whatsthis, entry, group (Theming)
+#: rc.cpp:444 rc.cpp:522
+msgid "Select the agenda view background color here."
+msgstr ""
 
-#. i18n: file: searchdialog_base.ui:125
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mLocationCheck)
-#: rc.cpp:604
-msgid "Include item locations in your search"
+#. i18n: file: korganizer.kcfg:360
+#. i18n: ectx: label, entry, group (Colors)
+#: rc.cpp:447
+msgid "Agenda view current-time line color"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:128
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mLocationCheck)
-#: rc.cpp:607
-msgid ""
-"Check this box if you want to match item locations against your search "
-"pattern."
+#. i18n: file: korganizer.kcfg:361
+#. i18n: ectx: whatsthis, entry, group (Colors)
+#: rc.cpp:450
+msgid "Select a color to use for the current-time (Marcus Bains) line."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:131
-#. i18n: ectx: property (text), widget (QCheckBox, mLocationCheck)
-#: rc.cpp:610
-msgid "Locations"
+#. i18n: file: korganizer.kcfg:362
+#. i18n: ectx: tooltip, entry, group (Colors)
+#: rc.cpp:453
+msgid "Use this color for the Agenda View current-time (Marcus Bains) line"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:138
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mDescriptionCheck)
-#: rc.cpp:613
-msgid "Include item descriptions in your search"
+#. i18n: file: korganizer.kcfg:367
+#. i18n: ectx: label, entry (ViewBgBusyColor), group (Colors)
+#: rc.cpp:456
+msgid "Busy days background color"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:141
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mDescriptionCheck)
-#: rc.cpp:616
+#. i18n: file: korganizer.kcfg:368
+#. i18n: ectx: whatsthis, entry (ViewBgBusyColor), group (Colors)
+#: rc.cpp:459
 msgid ""
-"Check this box if you want to match item descriptions against your search "
-"pattern."
+"When you have an all day event marked as busy, you can have a different "
+"agenda or month view background color for that day. Select the color here."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:144
-#. i18n: ectx: property (text), widget (QCheckBox, mDescriptionCheck)
-#: rc.cpp:619
-msgid "Desc&riptions"
-msgstr "Dis&grifiadau"
-
-#. i18n: file: searchdialog_base.ui:151
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mSummaryCheck)
-#: rc.cpp:622
-msgid "Include item summaries in your search"
+#. i18n: file: korganizer.kcfg:373
+#. i18n: ectx: label, entry, group (Colors)
+#. i18n: file: korganizer.kcfg:603
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:462 rc.cpp:561
+msgid "Working hours color"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:154
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSummaryCheck)
-#: rc.cpp:625
-msgid ""
-"Check this box if you want to match item summaries against your search "
-"pattern."
+#. i18n: file: korganizer.kcfg:374
+#. i18n: ectx: whatsthis, entry, group (Colors)
+#: rc.cpp:465
+msgid "Select the working hours color for the agenda view here."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:157
-#. i18n: ectx: property (text), widget (QCheckBox, mSummaryCheck)
-#: rc.cpp:628
-msgid "Su&mmaries"
-msgstr "Cr&ynodebau"
+#. i18n: file: korganizer.kcfg:379
+#. i18n: ectx: label, entry (TodoDueTodayColor), group (Colors)
+#. i18n: file: korganizer.kcfg:548
+#. i18n: ectx: label, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:654
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:468 rc.cpp:531 rc.cpp:573
+msgid "To-do due today color"
+msgstr ""
 
-#. i18n: file: searchdialog_base.ui:178
-#. i18n: ectx: property (text), widget (QLabel, mStartDateLabel)
-#: rc.cpp:634
-msgid "Fr&om:"
-msgstr "Od&diwrth:"
+#. i18n: file: korganizer.kcfg:380
+#. i18n: ectx: whatsthis, entry (TodoDueTodayColor), group (Colors)
+#. i18n: file: korganizer.kcfg:549
+#. i18n: ectx: whatsthis, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:655
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:471 rc.cpp:534 rc.cpp:576
+msgid "Select the to-do due today color here."
+msgstr ""
 
-#. i18n: file: searchdialog_base.ui:197
-#. i18n: ectx: property (toolTip), widget (KPIM::KDateEdit, mStartDate)
-#: rc.cpp:637
-msgid "Include items with a starting date on or after this date"
+#. i18n: file: korganizer.kcfg:385
+#. i18n: ectx: label, entry (TodoOverdueColor), group (Colors)
+#. i18n: file: korganizer.kcfg:563
+#. i18n: ectx: label, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:668
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:474 rc.cpp:537 rc.cpp:579
+msgid "To-do overdue color"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:200
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mStartDate)
-#: rc.cpp:640
-msgid ""
-"Search for items with a starting date on or after the date you specify here."
+#. i18n: file: korganizer.kcfg:386
+#. i18n: ectx: whatsthis, entry (TodoOverdueColor), group (Colors)
+#. i18n: file: korganizer.kcfg:564
+#. i18n: ectx: whatsthis, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:669
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:477 rc.cpp:540 rc.cpp:582
+msgid "Select the to-do overdue color here."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:204
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mStartDate)
-#. i18n: file: searchdialog_base.ui:242
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mEndDate)
-#: rc.cpp:643 rc.cpp:655
-msgid "2008-08-18"
+#. i18n: file: korganizer.kcfg:394
+#. i18n: ectx: label, entry, group (Fonts)
+#: rc.cpp:480
+msgid "Time bar"
+msgstr "Bar amser:"
+
+#. i18n: file: korganizer.kcfg:395
+#. i18n: ectx: whatsthis, entry, group (Fonts)
+#: rc.cpp:483
+msgid ""
+"Press this button to configure the time bar font. The time bar is the widget "
+"that shows the hours in the agenda view. This button will open the \"Select "
+"Font\" dialog, allowing you to choose the hour font for the time bar."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:216
-#. i18n: ectx: property (text), widget (QLabel, mEndDateLabel)
-#: rc.cpp:646
-msgid "&To:"
-msgstr "&I:"
+#. i18n: file: korganizer.kcfg:399
+#. i18n: ectx: label, entry, group (Fonts)
+#: rc.cpp:486
+msgid "Month view"
+msgstr "Golwg mis"
 
-#. i18n: file: searchdialog_base.ui:235
-#. i18n: ectx: property (toolTip), widget (KPIM::KDateEdit, mEndDate)
-#: rc.cpp:649
-msgid "Include items with ending date on or before this date"
+#. i18n: file: korganizer.kcfg:400
+#. i18n: ectx: whatsthis, entry, group (Fonts)
+#: rc.cpp:489
+msgid ""
+"Press this button to configure the month view font. This button will open "
+"the \"Select Font\" dialog, allowing you to choose the font for the items in "
+"the month view."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:238
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mEndDate)
-#: rc.cpp:652
+#. i18n: file: korganizer.kcfg:404
+#. i18n: ectx: label, entry, group (Fonts)
+#: rc.cpp:492
+msgid "Agenda view"
+msgstr "Golwg agenda:"
+
+#. i18n: file: korganizer.kcfg:405
+#. i18n: ectx: whatsthis, entry, group (Fonts)
+#: rc.cpp:495
 msgid ""
-"Search for items with an ending date on or before the date you specify here."
+"Press this button to configure the agenda view font. This button will open "
+"the \"Select Font\" dialog, allowing you to choose the font for the events "
+"in the agenda view."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:252
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mInclusiveCheck)
-#: rc.cpp:658
-msgid ""
-"Include Events only if their date range falls into the range specified above"
+#. i18n: file: korganizer.kcfg:409
+#. i18n: ectx: label, entry, group (Fonts)
+#: rc.cpp:498
+msgid "Current-time line"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:255
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mInclusiveCheck)
-#: rc.cpp:661
+#. i18n: file: korganizer.kcfg:410
+#. i18n: ectx: whatsthis, entry, group (Fonts)
+#: rc.cpp:501
 msgid ""
-"Check this box if you want to include Events that occur within the date "
-"range specified.  Events that do not fall completely within the date range "
-"will be excluded from the search results."
+"Press this button to configure the current-time line font. This button will "
+"open the \"Select Font\" dialog, allowing you to choose the font for the "
+"current-time line in the agenda view."
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:258
-#. i18n: ectx: property (text), widget (QCheckBox, mInclusiveCheck)
-#: rc.cpp:664
-msgid "Include E&vents within the specified date range"
+#. i18n: file: korganizer.kcfg:434
+#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
+#: rc.cpp:504
+msgid "Default todo attachment method"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:265
-#. i18n: ectx: property (toolTip), widget (QCheckBox, mIncludeUndatedTodos)
-#: rc.cpp:667
-msgid "Include To-dos in the search that do not have a due date"
+#. i18n: file: korganizer.kcfg:435
+#. i18n: ectx: whatsthis, entry (DefaultTodoAttachMethod), group (Hidden Options)
+#: rc.cpp:507
+msgid "The default way of attaching dropped emails to a task"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:268
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeUndatedTodos)
-#: rc.cpp:670
-msgid ""
-"Check this box to include To-dos without a due date in the search results."
+#. i18n: file: korganizer.kcfg:438
+#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
+#: rc.cpp:510
+msgid "Always ask"
 msgstr ""
 
-#. i18n: file: searchdialog_base.ui:271
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeUndatedTodos)
-#: rc.cpp:673
-msgid "Include To-dos &without a due date"
+#. i18n: file: korganizer.kcfg:441
+#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
+#: rc.cpp:513
+msgid "Only attach link to message"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:16
-#. i18n: ectx: label, entry, group (Save Settings)
-#: rc.cpp:676
-msgid "Export to HTML periodically"
+#. i18n: file: korganizer.kcfg:444
+#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
+#: rc.cpp:516
+msgid "Attach complete message"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:17
-#. i18n: ectx: whatsthis, entry, group (Save Settings)
-#: rc.cpp:679
+#. i18n: file: korganizer.kcfg:501
+#. i18n: ectx: label, entry, group (Theming)
+#. i18n: file: korganizer.kcfg:598
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:525 rc.cpp:555
+msgid "Highlight color"
+msgstr "Lliw amlygu"
+
+#. i18n: file: korganizer.kcfg:502
+#. i18n: ectx: whatsthis, entry, group (Theming)
+#: rc.cpp:528
 msgid ""
-"Check this box to export the calendar to a HTML-file periodically. By "
-"default, this file will be called calendar.html and placed in the user home "
-"folder."
+"Select the highlight color here. The highlight color will be used for "
+"marking the currently selected area in your agenda and in the date navigator."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:22
-#. i18n: ectx: label, entry, group (Save Settings)
-#: rc.cpp:682
-msgid "Export &interval in minutes"
+#. i18n: file: korganizer.kcfg:591
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:549
+msgid "Month view background color"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:23
-#. i18n: ectx: whatsthis, entry, group (Save Settings)
-#: rc.cpp:685
-msgid ""
-"Set the interval between automatic exporting of calendar events in minutes "
-"here."
+#. i18n: file: korganizer.kcfg:592
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:552
+msgid "Select the Month view background color here."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:29
-#. i18n: ectx: label, entry (Confirm), group (Save Settings)
-#: rc.cpp:688
-msgid "Confirm deletes"
-msgstr "Cadarnhau dileuon"
-
-#. i18n: file: korganizer.kcfg:30
-#. i18n: ectx: whatsthis, entry (Confirm), group (Save Settings)
-#: rc.cpp:691
-msgid "Check this box to display a confirmation dialog when deleting items."
+#. i18n: file: korganizer.kcfg:599
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:558
+msgid ""
+"Select the highlight color here. The highlight color will be used for "
+"marking the currently selected area in your Month and in the date navigator."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:35
-#. i18n: ectx: label, entry (Destination), group (Save Settings)
-#: rc.cpp:694
-msgid "New Events, To-dos and Journal Entries Should"
+#. i18n: file: korganizer.kcfg:604
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:564
+msgid "Select the working hours background color for the Month view here."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:38
-#. i18n: ectx: label, entry (Destination), group (Save Settings)
-#: rc.cpp:697
-msgid "Be added to the standard calendar"
+#. i18n: file: korganizer.kcfg:626
+#. i18n: ectx: label, entry, group (Theme/Month view)
+#: rc.cpp:567
+msgid "Default event color"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:39
-#. i18n: ectx: whatsthis, entry (Destination), group (Save Settings)
-#: rc.cpp:700
+#. i18n: file: korganizer.kcfg:627
+#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
+#: rc.cpp:570
 msgid ""
-"Select this option to always record new events, to-dos and journal entries "
-"using the standard calendar."
+"Select the default event color here. The default event color will be used "
+"for events categories in your Month. Note that you can specify a separate "
+"color for each event category below."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:42
-#. i18n: ectx: label, entry (Destination), group (Save Settings)
-#: rc.cpp:703
-msgid "Be asked which calendar to use"
+#. i18n: file: searchdialog_base.ui:16
+#. i18n: ectx: property (windowTitle), widget (QWidget, SearchDialog)
+#: rc.cpp:591
+msgid "Find Events - KOrganizer"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:43
-#. i18n: ectx: whatsthis, entry (Destination), group (Save Settings)
-#: rc.cpp:706
-msgid ""
-"Select this option to choose the calendar to be used to record the item each "
-"time you create a new event, to-do or journal entry. This choice is "
-"recommended if you intend to use the shared folders functionality of the "
-"Kolab server or have to manage multiple accounts using Kontact as a KDE "
-"Kolab client. "
-msgstr ""
+#. i18n: file: searchdialog_base.ui:24
+#. i18n: ectx: property (text), widget (QLabel, mSearchLabel)
+#: rc.cpp:594
+msgid "&Search for:"
+msgstr "&Chwilio am:"
 
-#. i18n: file: korganizer.kcfg:53
-#. i18n: ectx: label, entry, group (System Tray)
-#: rc.cpp:709
-msgid "Show Reminder Daemon in the System Tray"
+#. i18n: file: searchdialog_base.ui:37
+#. i18n: ectx: property (toolTip), widget (KLineEdit, mSearchEdit)
+#: rc.cpp:597
+msgid "Search pattern, use wildcards '*' and '?' as desired."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:54
-#. i18n: ectx: whatsthis, entry, group (System Tray)
-#: rc.cpp:712
+#. i18n: file: searchdialog_base.ui:40
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mSearchEdit)
+#: rc.cpp:600
 msgid ""
-"Check this box to show the KOrganizer reminder daemon in the system tray."
+"Enter your search pattern here. Wildcards '*' (matches any string) and '?' "
+"(matches any character) are supported.  For example, to match any string "
+"starting with the letter 'a', use the search pattern a*."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:62
-#. i18n: ectx: whatsthis, entry (TimeZoneId), group (Time &amp; Date)
-#: rc.cpp:715
-msgid ""
-"Select your timezone from the list of locations on this drop down box. If "
-"your city is not listed, select one which shares the same timezone. "
-"KOrganizer will automatically adjust for daylight savings."
+#. i18n: file: searchdialog_base.ui:43
+#. i18n: ectx: property (text), widget (KLineEdit, mSearchEdit)
+#: rc.cpp:603
+msgid "*"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:66
-#. i18n: ectx: label, entry (DayBegins), group (Time &amp; Date)
-#: rc.cpp:718
-msgid "Day begins at"
-msgstr "Diwrnod yn ddechrau am:"
-
-#. i18n: file: korganizer.kcfg:67
-#. i18n: ectx: whatsthis, entry (DayBegins), group (Time &amp; Date)
-#: rc.cpp:721
-msgid ""
-"Enter the start time for events here. This time should be the earliest time "
-"that you use for events, as it will be displayed at the top."
-msgstr ""
+#. i18n: file: searchdialog_base.ui:52
+#. i18n: ectx: property (title), widget (QGroupBox, mSearchTypeGroup)
+#: rc.cpp:606
+msgid "Search For"
+msgstr "Chwilio am:"
 
-#. i18n: file: korganizer.kcfg:72
-#. i18n: ectx: label, entry (Holidays), group (Time &amp; Date)
-#: rc.cpp:724
-msgid "Use holiday region:"
+#. i18n: file: searchdialog_base.ui:58
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mEventsCheck)
+#: rc.cpp:609
+msgid "Search for Events with matching criteria"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:73
-#. i18n: ectx: whatsthis, entry (Holidays), group (Time &amp; Date)
-#: rc.cpp:727
+#. i18n: file: searchdialog_base.ui:61
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mEventsCheck)
+#: rc.cpp:612
 msgid ""
-"Select from which region you want to use the holidays here. Defined holidays "
-"are shown as non-working days in the date navigator, the agenda view, etc."
+"Check this box if you want to search for Event items that match the search "
+"criteria."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:77
-#. i18n: ectx: label, entry (WorkingHoursStart), group (Time &amp; Date)
-#: rc.cpp:730
-msgid "Daily starting hour"
-msgstr "Awr ddechrau dyddiol:"
+#. i18n: file: searchdialog_base.ui:64
+#. i18n: ectx: property (text), widget (QCheckBox, mEventsCheck)
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:117
+#. i18n: ectx: property (text), widget (QCheckBox, mEvents)
+#: rc.cpp:615 rc.cpp:1563
+msgid "&Events"
+msgstr "&Digwyddiadau:"
 
-#. i18n: file: korganizer.kcfg:78
-#. i18n: ectx: whatsthis, entry (WorkingHoursStart), group (Time &amp; Date)
-#: rc.cpp:733
-msgid ""
-"Enter the start time for the working hours here. The working hours will be "
-"marked with color by KOrganizer."
+#. i18n: file: searchdialog_base.ui:74
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mJournalsCheck)
+#: rc.cpp:618
+msgid "Search for Journals with matching criteria"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:83
-#. i18n: ectx: label, entry (WorkingHoursEnd), group (Time &amp; Date)
-#: rc.cpp:736
-msgid "Daily ending hour"
-msgstr "Awr orffen dyddiol:"
-
-#. i18n: file: korganizer.kcfg:84
-#. i18n: ectx: whatsthis, entry (WorkingHoursEnd), group (Time &amp; Date)
-#: rc.cpp:739
+#. i18n: file: searchdialog_base.ui:77
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mJournalsCheck)
+#: rc.cpp:621
 msgid ""
-"Enter the ending time for the working hours here. The working hours will be "
-"marked with color by KOrganizer."
+"Check this box if you want to search for Journal items that match the search "
+"criteria."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:89
-#. i18n: ectx: label, entry, group (Time &amp; Date)
-#: rc.cpp:742
-msgid "Exclude holidays"
-msgstr "Gwahardd gwyliau"
-
-#. i18n: file: korganizer.kcfg:90
-#. i18n: ectx: whatsthis, entry, group (Time &amp; Date)
-#: rc.cpp:745
-msgid ""
-"Check this box to prevent KOrganizer from marking the working hours on "
-"holidays."
+#. i18n: file: searchdialog_base.ui:80
+#. i18n: ectx: property (text), widget (QCheckBox, mJournalsCheck)
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:131
+#. i18n: ectx: property (text), widget (QCheckBox, mJournals)
+#: rc.cpp:624 rc.cpp:1569
+msgid "&Journals"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:95
-#. i18n: ectx: label, entry (ColorMonthBusyDaysEnabled), group (Time &amp; Date)
-#. i18n: file: korganizer.kcfg:227
-#. i18n: ectx: label, entry (ColorBusyDaysEnabled), group (Agenda View)
-#: rc.cpp:748 rc.cpp:898
-msgid "Color busy days with a different background color"
+#. i18n: file: searchdialog_base.ui:87
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mTodosCheck)
+#: rc.cpp:627
+msgid "Search for To-dos with matching criteria"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:96
-#. i18n: ectx: whatsthis, entry (ColorMonthBusyDaysEnabled), group (Time &amp; Date)
-#: rc.cpp:751
+#. i18n: file: searchdialog_base.ui:90
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mTodosCheck)
+#: rc.cpp:630
 msgid ""
-"Check this box if you want month view's background to be filled with a "
-"different color on days which have at least one all day event marked as "
-"busy. Also, you can change the background color used for this option on the "
-"Colors configuration page. Look for the \"Busy days background color\" "
-"setting."
+"Check this box if you want to search To-do items that match the search "
+"criteria."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:105
-#. i18n: ectx: label, entry, group (General View)
-#: rc.cpp:754
-msgid "Enable tooltips for displaying summaries"
+#. i18n: file: searchdialog_base.ui:93
+#. i18n: ectx: property (text), widget (QCheckBox, mTodosCheck)
+#: rc.cpp:633
+msgid "To-&dos"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:106
-#. i18n: ectx: whatsthis, entry, group (General View)
-#: rc.cpp:757
-msgid ""
-"Check this box to display summary tooltips when hovering the mouse over an "
-"event or a to-do."
-msgstr ""
+#. i18n: file: searchdialog_base.ui:106
+#. i18n: ectx: property (title), widget (QGroupBox, mSearchGroup)
+#: rc.cpp:636
+msgid "Search In"
+msgstr "Chwilio Mewn"
 
-#. i18n: file: korganizer.kcfg:111
-#. i18n: ectx: label, entry, group (General View)
-#: rc.cpp:760
-msgid "To-dos use category colors"
+#. i18n: file: searchdialog_base.ui:112
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mCategoryCheck)
+#: rc.cpp:639
+msgid "Include item categories in your search"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:112
-#. i18n: ectx: whatsthis, entry, group (General View)
-#: rc.cpp:763
+#. i18n: file: searchdialog_base.ui:115
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mCategoryCheck)
+#: rc.cpp:642
 msgid ""
-"Check this box so that to-dos will use category colors and not colors "
-"specific to their due, due today or overdue state"
+"Check this box if you want to match item categories against your search "
+"pattern."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:117
-#. i18n: ectx: label, entry, group (General View)
-#: rc.cpp:766
-msgid "Next x days"
+#. i18n: file: searchdialog_base.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, mCategoryCheck)
+#: rc.cpp:645
+msgid "Cate&gories"
+msgstr "Ca&tegorïau"
+
+#. i18n: file: searchdialog_base.ui:125
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mLocationCheck)
+#: rc.cpp:648
+msgid "Include item locations in your search"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:118
-#. i18n: ectx: whatsthis, entry, group (General View)
-#: rc.cpp:769
+#. i18n: file: searchdialog_base.ui:128
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mLocationCheck)
+#: rc.cpp:651
 msgid ""
-"Select the number of \"x\" days to be displayed in the next days view. To "
-"access the  the next \"x\" days view, choose the \"Next X Days\" menu item "
-"from the \"View\" menu."
+"Check this box if you want to match item locations against your search "
+"pattern."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:119
-#. i18n: ectx: tooltip, entry, group (General View)
-#: rc.cpp:772
-msgid "Show this many days at a time in the Next \"x\" days view"
+#. i18n: file: searchdialog_base.ui:131
+#. i18n: ectx: property (text), widget (QCheckBox, mLocationCheck)
+#: rc.cpp:654
+msgid "Locations"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:124
-#. i18n: ectx: label, entry (DailyRecur), group (General View)
-#: rc.cpp:775
-msgid "Show items that recur daily"
+#. i18n: file: searchdialog_base.ui:138
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mDescriptionCheck)
+#: rc.cpp:657
+msgid "Include item descriptions in your search"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:125
-#. i18n: ectx: whatsthis, entry (DailyRecur), group (General View)
-#: rc.cpp:778
+#. i18n: file: searchdialog_base.ui:141
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mDescriptionCheck)
+#: rc.cpp:660
 msgid ""
-"Check this box to show the days containing daily recurring events in bold "
-"typeface in the Date Navigator, or uncheck it to give more prominence to "
-"other (non daily recurring) events."
+"Check this box if you want to match item descriptions against your search "
+"pattern."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:130
-#. i18n: ectx: label, entry (WeeklyRecur), group (General View)
-#: rc.cpp:781
-msgid "Show items that recur weekly"
+#. i18n: file: searchdialog_base.ui:144
+#. i18n: ectx: property (text), widget (QCheckBox, mDescriptionCheck)
+#: rc.cpp:663
+msgid "Desc&riptions"
+msgstr "Dis&grifiadau"
+
+#. i18n: file: searchdialog_base.ui:151
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mSummaryCheck)
+#: rc.cpp:666
+msgid "Include item summaries in your search"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:131
-#. i18n: ectx: whatsthis, entry (WeeklyRecur), group (General View)
-#: rc.cpp:784
+#. i18n: file: searchdialog_base.ui:154
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSummaryCheck)
+#: rc.cpp:669
 msgid ""
-"Check this box to show the days containing weekly recurring events in bold "
-"typeface in the Date Navigator, or uncheck it to give more prominence to "
-"other (non weekly recurring) events."
+"Check this box if you want to match item summaries against your search "
+"pattern."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:136
-#. i18n: ectx: label, entry (HighlightTodos), group (General View)
-#: rc.cpp:787
-msgid "Show to-dos instead of events when in Todo View"
+#. i18n: file: searchdialog_base.ui:157
+#. i18n: ectx: property (text), widget (QCheckBox, mSummaryCheck)
+#: rc.cpp:672
+msgid "Su&mmaries"
+msgstr "Cr&ynodebau"
+
+#. i18n: file: searchdialog_base.ui:178
+#. i18n: ectx: property (text), widget (QLabel, mStartDateLabel)
+#: rc.cpp:678
+msgid "Fr&om:"
+msgstr "Od&diwrth:"
+
+#. i18n: file: searchdialog_base.ui:197
+#. i18n: ectx: property (toolTip), widget (KDateComboBox, mStartDate)
+#: rc.cpp:681
+msgid "Include items with a starting date on or after this date"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:137
-#. i18n: ectx: whatsthis, entry (HighlightTodos), group (General View)
-#: rc.cpp:790
+#. i18n: file: searchdialog_base.ui:200
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mStartDate)
+#: rc.cpp:684
 msgid ""
-"Check this box to show the days containing to-dos in bold typeface in the "
-"Date Navigator when in to-do view."
+"Search for items with a starting date on or after the date you specify here."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:142
-#. i18n: ectx: label, entry (HighlightJournals), group (General View)
-#: rc.cpp:793
-msgid "Show journals instead of events when in Journal View"
+#. i18n: file: searchdialog_base.ui:204
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mStartDate)
+#. i18n: file: searchdialog_base.ui:242
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mEndDate)
+#: rc.cpp:687 rc.cpp:699
+msgid "2008-08-18"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:143
-#. i18n: ectx: whatsthis, entry (HighlightJournals), group (General View)
-#: rc.cpp:796
-msgid ""
-"Check this box to show the days containing journals in bold typeface in the "
-"Date Navigator when in journal view."
-msgstr ""
+#. i18n: file: searchdialog_base.ui:216
+#. i18n: ectx: property (text), widget (QLabel, mEndDateLabel)
+#: rc.cpp:690
+msgid "&To:"
+msgstr "&I:"
 
-#. i18n: file: korganizer.kcfg:148
-#. i18n: ectx: label, entry (WeekNumbersShowWork), group (General View)
-#: rc.cpp:799
-msgid "Week numbers select a work week when in work week mode"
+#. i18n: file: searchdialog_base.ui:235
+#. i18n: ectx: property (toolTip), widget (KDateComboBox, mEndDate)
+#: rc.cpp:693
+msgid "Include items with ending date on or before this date"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:149
-#. i18n: ectx: whatsthis, entry (WeekNumbersShowWork), group (General View)
-#: rc.cpp:802
+#. i18n: file: searchdialog_base.ui:238
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mEndDate)
+#: rc.cpp:696
 msgid ""
-"Check this box to select a working week when clicking on the Date "
-"Navigator's week numbers, or uncheck it to choose the whole week."
+"Search for items with an ending date on or before the date you specify here."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:157
-#. i18n: ectx: label, entry, group (Agenda View)
-#: rc.cpp:805
-msgid "Hour size"
+#. i18n: file: searchdialog_base.ui:252
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mInclusiveCheck)
+#: rc.cpp:702
+msgid ""
+"Include Events only if their date range falls into the range specified above"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:158
-#. i18n: ectx: whatsthis, entry, group (Agenda View)
-#: rc.cpp:808
+#. i18n: file: searchdialog_base.ui:255
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mInclusiveCheck)
+#: rc.cpp:705
 msgid ""
-"Select the height of the hour rows in the agenda grid, in pixels. Increasing "
-"this value will make each row in the agenda grid taller."
+"Check this box if you want to include Events that occur within the date "
+"range specified.  Events that do not fall completely within the date range "
+"will be excluded from the search results."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:159
-#. i18n: ectx: tooltip, entry, group (Agenda View)
-#: rc.cpp:811
-msgid "Set the height (in pixels) for an hour in the agenda grid"
+#. i18n: file: searchdialog_base.ui:258
+#. i18n: ectx: property (text), widget (QCheckBox, mInclusiveCheck)
+#: rc.cpp:708
+msgid "Include E&vents within the specified date range"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:166
-#. i18n: ectx: label, entry (EnableAgendaItemIcons), group (Agenda View)
-#: rc.cpp:814
-msgid "Show icons in agenda view items"
+#. i18n: file: searchdialog_base.ui:265
+#. i18n: ectx: property (toolTip), widget (QCheckBox, mIncludeUndatedTodos)
+#: rc.cpp:711
+msgid "Include To-dos in the search that do not have a due date"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:167
-#. i18n: ectx: whatsthis, entry (EnableAgendaItemIcons), group (Agenda View)
-#: rc.cpp:817
+#. i18n: file: searchdialog_base.ui:268
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeUndatedTodos)
+#: rc.cpp:714
 msgid ""
-"Check this box to display icons (alarm, recursion, etc.) in agenda view "
-"items."
+"Check this box to include To-dos without a due date in the search results."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:168
-#. i18n: ectx: tooltip, entry (EnableAgendaItemIcons), group (Agenda View)
-#: rc.cpp:820
-msgid "Display icons in agenda view items"
+#. i18n: file: searchdialog_base.ui:271
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeUndatedTodos)
+#: rc.cpp:717
+msgid "Include To-dos &without a due date"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:173
-#. i18n: ectx: label, entry (ShowTodosAgendaView), group (Agenda View)
-#. i18n: file: korganizer.kcfg:277
-#. i18n: ectx: label, entry (ShowTodosMonthView), group (Month View)
-#: rc.cpp:823 rc.cpp:958
-msgid "Show to-dos"
+#. i18n: file: kogroupwareprefspage.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, tabPublish)
+#: rc.cpp:720
+msgid "P&ublish"
+msgstr "Cyh&oeddi"
+
+#. i18n: file: kogroupwareprefspage.ui:39
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:723
+msgid ""
+"By publishing Free/Busy information, you allow others to take your calendar "
+"into account when inviting you for a meeting. Only the times you have "
+"already busy are published, not why they are busy."
 msgstr ""
+"Os cyhoeddwch wybodaeth Rhydd/Prysur, rydych yn gadael i eraill gymryd sylw "
+"o'ch calendr wrth eich gwahodd i gyfarfod.  Cyhoeddir yn unig yr amserau "
+"pryd yr ydych yn brysur, dim pam y maent yn brysur."
 
-#. i18n: file: korganizer.kcfg:174
-#. i18n: ectx: whatsthis, entry (ShowTodosAgendaView), group (Agenda View)
-#: rc.cpp:826
-msgid "Check this box to display to-dos in the agenda view."
+#. i18n: file: kogroupwareprefspage.ui:51
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, publishEnable)
+#: rc.cpp:726
+msgid ""
+"Check this box to upload your Free/Busy information automatically.\n"
+"It is possible to skip this option and mail or upload your Free/Busy "
+"information using the Schedule menu of KOrganizer.\n"
+"Note: If KOrganizer is acting as a KDE Kolab client, this is not required, "
+"as the Kolab2 server taking care of publishing your Free/Busy information "
+"and manages the access to it from other users."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:175
-#. i18n: ectx: tooltip, entry (ShowTodosAgendaView), group (Agenda View)
-#: rc.cpp:829
-msgid "Display to-dos in the agenda view"
+#. i18n: file: kogroupwareprefspage.ui:54
+#. i18n: ectx: property (text), widget (QCheckBox, publishEnable)
+#: rc.cpp:731
+msgid "Publish your free/&busy information automatically"
+msgstr "Cyhoeddi eich &gwybodaeth rydd/brysur yn ymysgogol"
+
+#. i18n: file: kogroupwareprefspage.ui:69
+#. i18n: ectx: property (whatsThis), widget (QLabel, publishDelayLabel)
+#. i18n: file: kogroupwareprefspage.ui:82
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, publishDelay)
+#: rc.cpp:734 rc.cpp:740
+msgid ""
+"Configure minimum the interval of time in minutes between each upload here. "
+"This configuration is only effective in case you choose to publish your "
+"information automatically."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:180
-#. i18n: ectx: label, entry (MarcusBainsEnabled), group (Agenda View)
-#: rc.cpp:832
-msgid "Show current-time (Marcus Bains) line"
+#. i18n: file: kogroupwareprefspage.ui:72
+#. i18n: ectx: property (text), widget (QLabel, publishDelayLabel)
+#: rc.cpp:737
+msgid "Minimum time between uploads (in minutes):"
+msgstr ""
+
+#. i18n: file: kogroupwareprefspage.ui:102
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel3)
+#. i18n: file: kogroupwareprefspage.ui:115
+#. i18n: ectx: property (whatsThis), widget (QSpinBox, publishDays)
+#. i18n: file: kogroupwareprefspage.ui:131
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel4)
+#: rc.cpp:743 rc.cpp:749 rc.cpp:752
+msgid ""
+"Configure the number of calendar days you wish to be published and available "
+"to others here."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:181
-#. i18n: ectx: whatsthis, entry (MarcusBainsEnabled), group (Agenda View)
-#: rc.cpp:835
+#. i18n: file: kogroupwareprefspage.ui:105
+#. i18n: ectx: property (text), widget (QLabel, TextLabel3)
+#: rc.cpp:746
+msgid "Publish"
+msgstr "Cyhoeddi"
+
+#. i18n: file: kogroupwareprefspage.ui:134
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4)
+#: rc.cpp:755
+msgid "days of free/busy information"
+msgstr "dyddiadau o wybodaeth rhydd/prysur"
+
+#. i18n: file: kogroupwareprefspage.ui:159
+#. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup2)
+#. i18n: file: kogroupwareprefspage.ui:338
+#. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup2_2)
+#: rc.cpp:758 rc.cpp:825
+msgid "Server Information"
+msgstr "Gwybodaeth Gweinydd"
+
+#. i18n: file: kogroupwareprefspage.ui:178
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, publishUrl)
+#. i18n: file: kogroupwareprefspage.ui:250
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel7)
+#: rc.cpp:761 rc.cpp:794
 msgid ""
-"Check this box to display a line in the day or week view indicating the "
-"current-time line (Marcus Bains line)."
-msgstr ""
-
-#. i18n: file: korganizer.kcfg:182
-#. i18n: ectx: tooltip, entry (MarcusBainsEnabled), group (Agenda View)
-#: rc.cpp:838
-msgid "Display the current-time indicator"
+"Enter the URL for the server on which your Free/Busy information shall be "
+"published here.\n"
+"Ask the server administrator for this information."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:187
-#. i18n: ectx: label, entry (MarcusBainsShowSeconds), group (Agenda View)
-#: rc.cpp:841
-msgid "Show seconds on the current-time (Marcus Bains) line"
+#. i18n: file: kogroupwareprefspage.ui:185
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, publishPassword)
+#. i18n: file: kogroupwareprefspage.ui:195
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel2)
+#. i18n: file: kogroupwareprefspage.ui:350
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, retrievePassword)
+#. i18n: file: kogroupwareprefspage.ui:423
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel4)
+#: rc.cpp:765 rc.cpp:768 rc.cpp:828 rc.cpp:869
+msgid "Enter your groupware server login password here."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:188
-#. i18n: ectx: whatsthis, entry (MarcusBainsShowSeconds), group (Agenda View)
-#: rc.cpp:844
-msgid "Check this box if you want to show seconds on the current-time line."
-msgstr ""
+#. i18n: file: kogroupwareprefspage.ui:198
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:771
+msgid "Password:"
+msgstr "Cyfrinair:"
 
-#. i18n: file: korganizer.kcfg:189
-#. i18n: ectx: tooltip, entry (MarcusBainsShowSeconds), group (Agenda View)
-#: rc.cpp:847
-msgid "Display seconds with the current-time indicator"
+#. i18n: file: kogroupwareprefspage.ui:210
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel6)
+#. i18n: file: kogroupwareprefspage.ui:231
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, publishUser)
+#. i18n: file: kogroupwareprefspage.ui:362
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, retrieveUser)
+#. i18n: file: kogroupwareprefspage.ui:410
+#. i18n: ectx: property (whatsThis), widget (QLabel, textLabel3)
+#: rc.cpp:774 rc.cpp:782 rc.cpp:831 rc.cpp:861
+msgid ""
+"Enter the login information relative to your account on the server here.\n"
+"\n"
+"A Kolab2 server specificity: Registered your UID (Unique IDentifier). By "
+"default your UID would be your email address on the Kolab2 server but it may "
+"also be different. In the last case enter your UID."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:194
-#. i18n: ectx: label, entry (SelectionStartsEditor), group (Agenda View)
-#: rc.cpp:850
-msgid "Time range selection in agenda view starts event editor"
+#. i18n: file: kogroupwareprefspage.ui:213
+#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
+#: rc.cpp:779
+msgctxt "login name on the Kolab server"
+msgid "Username:"
 msgstr ""
-"Mae dewis amrediad amser yng golwg agenda yn dechrau'r golygydd digwyddiadau"
 
-#. i18n: file: korganizer.kcfg:195
-#. i18n: ectx: whatsthis, entry (SelectionStartsEditor), group (Agenda View)
-#: rc.cpp:853
+#. i18n: file: kogroupwareprefspage.ui:239
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, publishSavePassword)
+#. i18n: file: kogroupwareprefspage.ui:443
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, retrieveSavePassword)
+#: rc.cpp:787 rc.cpp:875
 msgid ""
-"Check this box to start the event editor automatically when you select a "
-"time range in the daily and weekly view. To select a time range, drag the "
-"mouse from the start time to the end time of the event you are about to plan."
+"Check this box to make KOrganizer remember your password and skip asking you "
+"each time it uploads your Free/Busy information, by storing it in the "
+"configuration file.\n"
+"For security reasons, it is not recommended to store your password in the "
+"configuration file."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:196
-#. i18n: ectx: tooltip, entry (SelectionStartsEditor), group (Agenda View)
-#: rc.cpp:856
-msgid "Enable automatic event editor with time range selection"
-msgstr ""
+#. i18n: file: kogroupwareprefspage.ui:242
+#. i18n: ectx: property (text), widget (QCheckBox, publishSavePassword)
+#: rc.cpp:791
+msgid "Remember p&assword"
+msgstr "Cofio cyfr&inair"
 
-#. i18n: file: korganizer.kcfg:201
-#. i18n: ectx: label, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:297
-#. i18n: ectx: label, entry, group (Month View)
-#: rc.cpp:859 rc.cpp:982
-msgid "Color Usage"
-msgstr ""
+#. i18n: file: kogroupwareprefspage.ui:253
+#. i18n: ectx: property (text), widget (QLabel, TextLabel7)
+#. i18n: file: kogroupwareprefspage.ui:398
+#. i18n: ectx: property (text), widget (QLabel, TextLabel7_2)
+#: rc.cpp:798 rc.cpp:858
+msgid "Server URL:"
+msgstr "URL y gweinydd:"
 
-#. i18n: file: korganizer.kcfg:204
-#. i18n: ectx: label, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:300
-#. i18n: ectx: label, entry, group (Month View)
-#: rc.cpp:862 rc.cpp:985
-msgid "Category inside, calendar outside"
+#. i18n: file: kogroupwareprefspage.ui:263
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:801
+msgid "(No need if using Kolab server version 2)"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:205
-#. i18n: ectx: whatsthis, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:301
-#. i18n: ectx: whatsthis, entry, group (Month View)
-#: rc.cpp:865 rc.cpp:988
+#. i18n: file: kogroupwareprefspage.ui:290
+#. i18n: ectx: attribute (title), widget (QWidget, tabRetrieve)
+#: rc.cpp:804
+msgid "&Retrieve"
+msgstr "&Nôl"
+
+#. i18n: file: kogroupwareprefspage.ui:302
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:807
 msgid ""
-"Select the \"Category inside, calendar outside\" option if you would like to "
-"draw calendar items in their associated category color, with the item's "
-"border drawn in the color of its calendar.  Please use the Colors and Fonts "
-"configuration page for setting these colors."
+"By retrieving Free/Busy information that others have published, you can take "
+"their calendar into account when inviting them to a meeting."
 msgstr ""
+"Gan nôl gwybodaeth rydd/brysur a gyhoeddwyd gan eraill, gallwch gymryd sylw "
+"o'u calendr wrth eu gwahodd i gyfarfod."
 
-#. i18n: file: korganizer.kcfg:206
-#. i18n: ectx: tooltip, entry, group (Agenda View)
-#: rc.cpp:868
+#. i18n: file: kogroupwareprefspage.ui:312
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, retrieveEnable)
+#: rc.cpp:810
 msgid ""
-"Draw agenda items in their category color inside and calendar color for "
-"their border"
+"Check this box to retrieve other peoples' Free/Busy information "
+"automatically. Note that you have to fill the correct server information to "
+"make this possible."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:209
-#. i18n: ectx: label, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:305
-#. i18n: ectx: label, entry, group (Month View)
-#: rc.cpp:871 rc.cpp:994
-msgid "Calendar inside, category outside"
+#. i18n: file: kogroupwareprefspage.ui:315
+#. i18n: ectx: property (text), widget (QCheckBox, retrieveEnable)
+#: rc.cpp:813
+msgid "Retrieve other peoples' free/&busy information automatically"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:210
-#. i18n: ectx: whatsthis, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:306
-#. i18n: ectx: whatsthis, entry, group (Month View)
-#: rc.cpp:874 rc.cpp:997
+#. i18n: file: kogroupwareprefspage.ui:325
+#. i18n: ectx: property (toolTip), widget (QCheckBox, fullDomainRetrieval)
+#: rc.cpp:816
 msgid ""
-"Select the \"Calendar inside, category outside\" option if you would like to "
-"draw calendar items in their associated calendar color, with the item's "
-"border drawn in the color of its category.  Please use the Colors and Fonts "
-"configuration page for setting these colors."
+"Set this to retrieve user@domain.ifb instead of user.ifb from the server"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:211
-#. i18n: ectx: tooltip, entry, group (Agenda View)
-#: rc.cpp:877
+#. i18n: file: kogroupwareprefspage.ui:328
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, fullDomainRetrieval)
+#: rc.cpp:819
 msgid ""
-"Draw agenda items in their calendar color inside and category color for "
-"their border"
+"Check this box to download a free/busy file in the format "
+"\"user@domain.ifb\" (for example joe@company.com.ifb). Otherwise, it will "
+"download a free/busy file in the format user.ifb (for example joe.ifb). Ask "
+"the server Administrator if you are not sure about how to configure this "
+"option."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:214
-#. i18n: ectx: label, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:310
-#. i18n: ectx: label, entry, group (Month View)
-#: rc.cpp:880 rc.cpp:1003
-msgid "Only category"
+#. i18n: file: kogroupwareprefspage.ui:331
+#. i18n: ectx: property (text), widget (QCheckBox, fullDomainRetrieval)
+#: rc.cpp:822
+msgid "Use full email &address for retrieval"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:215
-#. i18n: ectx: whatsthis, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:311
-#. i18n: ectx: whatsthis, entry, group (Month View)
-#: rc.cpp:883 rc.cpp:1006
+#. i18n: file: kogroupwareprefspage.ui:380
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, retrieveUrl)
+#. i18n: file: kogroupwareprefspage.ui:395
+#. i18n: ectx: property (whatsThis), widget (QLabel, TextLabel7_2)
+#: rc.cpp:836 rc.cpp:847
+msgctxt "@info:whatsthis"
 msgid ""
-"Select the \"Only category\" option if you would like to draw calendar items "
-"(both inside and border) in the color of their associated category.  Please "
-"use the Colors and Fonts configuration page for setting these colors."
+"Enter the URL for the server on which the Free/Busy information is published "
+"here.\n"
+"Ask the server administrator for this information.\n"
+"Here is a Kolab2 Server URL example:\n"
+"\n"
+"https://kolab2.example.com/freebusy/\n"
+"\n"
+"Alternatively, you can specify a full path to the Free/Busy. For example: \n"
+"\n"
+"https://kolab2.example.com/freebusy/user.xfb"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:216
-#. i18n: ectx: tooltip, entry, group (Agenda View)
-#: rc.cpp:886
-msgid ""
-"Draw agenda items using their category color for the inside and border"
-msgstr ""
+#. i18n: file: kogroupwareprefspage.ui:413
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:866
+msgid "User&name:"
+msgstr "Enw &defnyddiwr:"
 
-#. i18n: file: korganizer.kcfg:219
-#. i18n: ectx: label, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:315
-#. i18n: ectx: label, entry, group (Month View)
-#: rc.cpp:889 rc.cpp:1012
-msgid "Only calendar"
-msgstr ""
+#. i18n: file: kogroupwareprefspage.ui:426
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:872
+msgid "Passwor&d:"
+msgstr "Cyfrina&ir:"
 
-#. i18n: file: korganizer.kcfg:220
-#. i18n: ectx: whatsthis, entry, group (Agenda View)
-#. i18n: file: korganizer.kcfg:316
-#. i18n: ectx: whatsthis, entry, group (Month View)
-#: rc.cpp:892 rc.cpp:1015
-msgid ""
-"Select the \"Only calendar\" option if you would like to draw calendar items "
-"(both inside and border) in the color of their calendar.  Please use the "
-"Colors and Fonts configuration page for setting these colors."
-msgstr ""
+#. i18n: file: kogroupwareprefspage.ui:446
+#. i18n: ectx: property (text), widget (QCheckBox, retrieveSavePassword)
+#: rc.cpp:879
+msgid "Re&member password"
+msgstr "Co&fio cyfrinair"
 
-#. i18n: file: korganizer.kcfg:221
-#. i18n: ectx: tooltip, entry, group (Agenda View)
-#: rc.cpp:895
+#. i18n: file: printing/calprintmonthconfig_base.ui:21
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:882
 msgid ""
-"Draw agenda items using their calendar color for the inside and border"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Print month options:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:228
-#. i18n: ectx: whatsthis, entry (ColorBusyDaysEnabled), group (Agenda View)
-#: rc.cpp:901
+#. i18n: file: printing/calprintmonthconfig_base.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#. i18n: file: printing/calprintdayconfig_base.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#. i18n: file: printing/calprintweekconfig_base.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:43
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#. i18n: file: plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui:24
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:24
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#: rc.cpp:888 rc.cpp:984 rc.cpp:1242 rc.cpp:1527 rc.cpp:1542 rc.cpp:1551
+msgid "Date && Time Range"
+msgstr "Amrediad Dyddiad ac Amser"
+
+#. i18n: file: printing/calprintmonthconfig_base.ui:49
+#. i18n: ectx: property (whatsThis), widget (QLabel, mFromDateLabel)
+#. i18n: file: printing/calprintmonthconfig_base.ui:62
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mFromMonth)
+#. i18n: file: printing/calprintmonthconfig_base.ui:69
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mFromYear)
+#. i18n: file: printing/calprintmonthconfig_base.ui:95
+#. i18n: ectx: property (whatsThis), widget (KComboBox, mToMonth)
+#. i18n: file: printing/calprintmonthconfig_base.ui:102
+#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mToYear)
+#: rc.cpp:891 rc.cpp:897 rc.cpp:900 rc.cpp:909 rc.cpp:912
 msgid ""
-"Check this box if you want agenda's background to be filled with a different "
-"color on days which have at least one all day event marked as busy. Also, "
-"you can change the background color used for this option on the Colors "
-"configuration page. Look for the \"Busy days background color\" setting."
-msgstr ""
-
-#. i18n: file: korganizer.kcfg:232
-#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:904
-msgid "Multiple Calendar Display"
+"When you want to print more months at once, you can define a month range. "
+"This option defines the first month to be printed. Use the option <i>End "
+"month</i> to define the last month in this range."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:235
-#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:907
-msgid "Merge all calendars into one view"
-msgstr ""
+#. i18n: file: printing/calprintmonthconfig_base.ui:52
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#: rc.cpp:894
+msgid "&Start month:"
+msgstr "Mis dec&hrau:"
 
-#. i18n: file: korganizer.kcfg:236
-#. i18n: ectx: whatsthis, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:910
+#. i18n: file: printing/calprintmonthconfig_base.ui:82
+#. i18n: ectx: property (whatsThis), widget (QLabel, mToDateLabel)
+#: rc.cpp:903
 msgid ""
-"Select the \"Merge all calendars into one view\" option if you would like "
-"all your calendars to be shown together in one agenda view."
+"When you want to print more months at once, you can define a month range. "
+"This option defines the last month to be printed. Use the option <i>Start "
+"month</i> to define the first month in this range."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:237
-#. i18n: ectx: tooltip, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:913
-msgid "Show all calendars merged together"
-msgstr ""
+#. i18n: file: printing/calprintmonthconfig_base.ui:85
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#: rc.cpp:906
+msgid "&End month:"
+msgstr "&Mis gorffen:"
 
-#. i18n: file: korganizer.kcfg:240
-#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:916
-msgid "Show calendars side by side"
+#. i18n: file: printing/calprintmonthconfig_base.ui:131
+#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
+#. i18n: file: printing/calprintdayconfig_base.ui:246
+#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
+#. i18n: file: printing/calprinttodoconfig_base.ui:312
+#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
+#. i18n: file: printing/calprintweekconfig_base.ui:257
+#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
+#: rc.cpp:915 rc.cpp:1062 rc.cpp:1212 rc.cpp:1314
+msgid "Security Exclusions"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:241
-#. i18n: ectx: whatsthis, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:919
-msgid ""
-"Select the \"Show calendars side by side\" option if you would like to see "
-"two calendars at once, in a side-by-side view."
+#. i18n: file: printing/calprintmonthconfig_base.ui:140
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
+#. i18n: file: printing/calprintdayconfig_base.ui:255
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
+#. i18n: file: printing/calprinttodoconfig_base.ui:321
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
+#. i18n: file: printing/calprintweekconfig_base.ui:266
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
+#: rc.cpp:918 rc.cpp:1065 rc.cpp:1215 rc.cpp:1317
+msgid "Check this option to exclude confidential events."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:242
-#. i18n: ectx: tooltip, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:922
-msgid "Show two calendars side-by-side"
+#. i18n: file: printing/calprintmonthconfig_base.ui:143
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
+#. i18n: file: printing/calprintdayconfig_base.ui:258
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
+#. i18n: file: printing/calprinttodoconfig_base.ui:324
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
+#. i18n: file: printing/calprintweekconfig_base.ui:269
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
+#: rc.cpp:921 rc.cpp:1068 rc.cpp:1218 rc.cpp:1320
+msgid "Exclude c&onfidential"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:245
-#. i18n: ectx: label, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:925
-msgid "Switch between views with tabs"
+#. i18n: file: printing/calprintmonthconfig_base.ui:150
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
+#. i18n: file: printing/calprintdayconfig_base.ui:265
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
+#. i18n: file: printing/calprinttodoconfig_base.ui:331
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
+#. i18n: file: printing/calprintweekconfig_base.ui:276
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
+#: rc.cpp:924 rc.cpp:1071 rc.cpp:1221 rc.cpp:1323
+msgid "Check this option to exclude private events"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:246
-#. i18n: ectx: whatsthis, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:928
-msgid ""
-"Select \"Switch between views with tabs\" if you would like to alternate "
-"between calendars using the tab key."
+#. i18n: file: printing/calprintmonthconfig_base.ui:153
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
+#. i18n: file: printing/calprintdayconfig_base.ui:268
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
+#. i18n: file: printing/calprinttodoconfig_base.ui:334
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
+#. i18n: file: printing/calprintweekconfig_base.ui:279
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
+#: rc.cpp:927 rc.cpp:1074 rc.cpp:1224 rc.cpp:1326
+msgid "Exclude pri&vate"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:247
-#. i18n: ectx: tooltip, entry (AgendaViewCalendarDisplay), group (Agenda View)
-#: rc.cpp:931
-msgid "Tab through calendars"
+#. i18n: file: printing/calprintmonthconfig_base.ui:163
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mWeekNumbers)
+#: rc.cpp:930
+msgid "Enable this to print week numbers at the left of each row."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:257
-#. i18n: ectx: label, entry (EnableMonthScroll), group (Month View)
-#: rc.cpp:934
-msgid "Enable scrollbars in month view cells"
-msgstr "Galluogi bariau scrolio tu fewn i gellau'r golwg misol"
+#. i18n: file: printing/calprintmonthconfig_base.ui:166
+#. i18n: ectx: property (text), widget (QCheckBox, mWeekNumbers)
+#: rc.cpp:933
+msgid "Print week &numbers"
+msgstr "Argra&ffu rhifau wythnos"
 
-#. i18n: file: korganizer.kcfg:258
-#. i18n: ectx: whatsthis, entry (EnableMonthScroll), group (Month View)
-#: rc.cpp:937
+#. i18n: file: printing/calprintmonthconfig_base.ui:173
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mRecurDaily)
+#: rc.cpp:936
 msgid ""
-"Check this box to display scrollbars when clicking on a cell in the month "
-"view; they will only appear when needed though."
+"With this option it is possible to leave out the daily recurring to-dos and "
+"events in the print. They take a lot of space and make the month view "
+"needlessly complicated."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:263
-#. i18n: ectx: label, entry (EnableMonthItemIcons), group (Month View)
-#: rc.cpp:940
-msgid "Show icons in month view items"
+#. i18n: file: printing/calprintmonthconfig_base.ui:176
+#. i18n: ectx: property (text), widget (QCheckBox, mRecurDaily)
+#: rc.cpp:939
+msgid "Print daily re&curring to-dos and events"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:264
-#. i18n: ectx: whatsthis, entry (EnableMonthItemIcons), group (Month View)
-#: rc.cpp:943
+#. i18n: file: printing/calprintmonthconfig_base.ui:183
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mRecurWeekly)
+#: rc.cpp:942
 msgid ""
-"Check this box to display icons (alarm, recursion, etc.) in month view items."
+"Similar to \"Print daily recurring to-dos and events\". Weekly to-dos and "
+"events will be omitted when making a print of the selected month."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:265
-#. i18n: ectx: tooltip, entry (EnableMonthItemIcons), group (Month View)
-#: rc.cpp:946
-msgid "Display icons in month view items"
+#. i18n: file: printing/calprintmonthconfig_base.ui:186
+#. i18n: ectx: property (text), widget (QCheckBox, mRecurWeekly)
+#: rc.cpp:945
+msgid "Print weekl&y recurring to-dos and events"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:270
-#. i18n: ectx: label, entry (ShowTimeInMonthView), group (Month View)
-#: rc.cpp:949
-msgid "Show time in month view items"
+#. i18n: file: printing/calprintmonthconfig_base.ui:196
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeTodos)
+#. i18n: file: printing/calprintweekconfig_base.ui:302
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeTodos)
+#: rc.cpp:948 rc.cpp:1335
+msgid ""
+"Check this option if you want to have to-dos on the print, placed by their "
+"due date."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:271
-#. i18n: ectx: whatsthis, entry (ShowTimeInMonthView), group (Month View)
-#: rc.cpp:952
-msgid "Check this box to display the time in month view items."
+#. i18n: file: printing/calprintmonthconfig_base.ui:199
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeTodos)
+#. i18n: file: printing/calprintdayconfig_base.ui:294
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeTodos)
+#. i18n: file: printing/calprintweekconfig_base.ui:305
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeTodos)
+#: rc.cpp:951 rc.cpp:1086 rc.cpp:1338
+msgid "Include to-&dos that are due on the printed day(s)"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:272
-#. i18n: ectx: tooltip, entry (ShowTimeInMonthView), group (Month View)
-#: rc.cpp:955
-msgid "Display time in month view items"
+#. i18n: file: printing/calprintmonthconfig_base.ui:206
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeDescription)
+#. i18n: file: printing/calprintdayconfig_base.ui:301
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeDescription)
+#. i18n: file: printing/calprintweekconfig_base.ui:312
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeDescription)
+#: rc.cpp:954 rc.cpp:1089 rc.cpp:1341
+msgid ""
+"Check this option to include the more detailed description for each event."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:278
-#. i18n: ectx: whatsthis, entry (ShowTodosMonthView), group (Month View)
-#: rc.cpp:961
-msgid "Check this box to display to-dos in the month view."
+#. i18n: file: printing/calprintmonthconfig_base.ui:209
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeDescription)
+#. i18n: file: printing/calprintdayconfig_base.ui:304
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeDescription)
+#. i18n: file: printing/calprintweekconfig_base.ui:315
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeDescription)
+#: rc.cpp:957 rc.cpp:1092 rc.cpp:1344
+msgid "Include &descriptions"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:279
-#. i18n: ectx: tooltip, entry (ShowTodosMonthView), group (Month View)
-#: rc.cpp:964
-msgid "Display to-dos in the month view"
+#. i18n: file: printing/calprintmonthconfig_base.ui:216
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
+#: rc.cpp:960
+msgid "Check this option to show note lines."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:284
-#. i18n: ectx: label, entry (ShowJournalsMonthView), group (Month View)
-#: rc.cpp:967
-msgid "Show journals"
+#. i18n: file: printing/calprintmonthconfig_base.ui:219
+#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
+#. i18n: file: printing/calprintdayconfig_base.ui:314
+#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
+#. i18n: file: printing/calprintincidenceconfig_base.ui:71
+#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
+#: rc.cpp:963 rc.cpp:1098 rc.cpp:1137
+msgid "Show note &lines"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:285
-#. i18n: ectx: whatsthis, entry (ShowJournalsMonthView), group (Month View)
-#: rc.cpp:970
-msgid "Check this box to display journals in the month view."
+#. i18n: file: printing/calprintmonthconfig_base.ui:226
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSingleLineLimit)
+#. i18n: file: printing/calprintdayconfig_base.ui:321
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSingleLineLimit)
+#. i18n: file: printing/calprintweekconfig_base.ui:332
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSingleLineLimit)
+#: rc.cpp:966 rc.cpp:1101 rc.cpp:1353
+msgid "Check this option to limit events to a single line."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:286
-#. i18n: ectx: tooltip, entry (ShowJournalsMonthView), group (Month View)
-#: rc.cpp:973
-msgid "Display journals in the month view"
+#. i18n: file: printing/calprintmonthconfig_base.ui:229
+#. i18n: ectx: property (text), widget (QCheckBox, mSingleLineLimit)
+#. i18n: file: printing/calprintdayconfig_base.ui:324
+#. i18n: ectx: property (text), widget (QCheckBox, mSingleLineLimit)
+#. i18n: file: printing/calprintweekconfig_base.ui:335
+#. i18n: ectx: property (text), widget (QCheckBox, mSingleLineLimit)
+#: rc.cpp:969 rc.cpp:1104 rc.cpp:1356
+msgid "Limit events in each day to a &single line"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:291
-#. i18n: ectx: label, entry, group (Month View)
-#: rc.cpp:976
-msgid "Month view uses full window"
-msgstr "Mae'r golwg misol yn defnyddio ffenestr llawn"
-
-#. i18n: file: korganizer.kcfg:292
-#. i18n: ectx: whatsthis, entry, group (Month View)
-#: rc.cpp:979
+#. i18n: file: printing/calprintmonthconfig_base.ui:236
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
+#. i18n: file: printing/calprintweekconfig_base.ui:342
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
+#: rc.cpp:972 rc.cpp:1359
 msgid ""
-"Check this box to use the full KOrganizer window when displaying the month "
-"view. If this box is checked, you will gain some space for the monthly view, "
-"but other widgets, such as the date navigator, the item details and the "
-"calendars list, will not be displayed."
+"The timetable view supports colors. If you want to make use of colors you "
+"should check this option. The category colors will be used."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:302
-#. i18n: ectx: tooltip, entry, group (Month View)
-#: rc.cpp:991
+#. i18n: file: printing/calprintmonthconfig_base.ui:239
+#. i18n: ectx: property (text), widget (QCheckBox, mColors)
+#. i18n: file: printing/calprintdayconfig_base.ui:334
+#. i18n: ectx: property (text), widget (QCheckBox, mColors)
+#. i18n: file: printing/calprintincidenceconfig_base.ui:81
+#. i18n: ectx: property (text), widget (QCheckBox, mColors)
+#. i18n: file: printing/calprintweekconfig_base.ui:345
+#. i18n: ectx: property (text), widget (QCheckBox, mColors)
+#: rc.cpp:975 rc.cpp:1110 rc.cpp:1143 rc.cpp:1362
+msgid "&Use colors"
+msgstr "&Defnyddio lliwiau"
+
+#. i18n: file: printing/calprintdayconfig_base.ui:21
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:978
 msgid ""
-"Draw month items in their category color inside and calendar color for their "
-"border"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Print day options:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:307
-#. i18n: ectx: tooltip, entry, group (Month View)
-#: rc.cpp:1000
+#. i18n: file: printing/calprintdayconfig_base.ui:37
+#. i18n: ectx: property (whatsThis), widget (QLabel, mFromDateLabel)
+#. i18n: file: printing/calprintdayconfig_base.ui:53
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mFromDate)
+#. i18n: file: printing/calprinttodoconfig_base.ui:148
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mFromDate)
+#: rc.cpp:987 rc.cpp:993 rc.cpp:1173
 msgid ""
-"Draw month items in their calendar color inside and category color for their "
-"border"
-msgstr ""
-
-#. i18n: file: korganizer.kcfg:312
-#. i18n: ectx: tooltip, entry, group (Month View)
-#: rc.cpp:1009
-msgid "Draw month items using their category color for the inside and border"
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>End date</i> option. This option is used to define "
+"the start date."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:317
-#. i18n: ectx: tooltip, entry, group (Month View)
-#: rc.cpp:1018
-msgid "Draw month items using their calendar color for the inside and border"
-msgstr ""
+#. i18n: file: printing/calprintdayconfig_base.ui:40
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#. i18n: file: printing/calprinttodoconfig_base.ui:121
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#. i18n: file: printing/calprintweekconfig_base.ui:68
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:99
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#. i18n: file: plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui:52
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:52
+#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
+#: rc.cpp:990 rc.cpp:1170 rc.cpp:1248 rc.cpp:1536 rc.cpp:1545 rc.cpp:1554
+msgid "&Start date:"
+msgstr "Dyddiad &dechrau:"
 
-#. i18n: file: korganizer.kcfg:327
-#. i18n: ectx: label, entry, group (Todo View)
-#: rc.cpp:1021
-msgid "Always display completed to-dos at the bottom of the list"
+#. i18n: file: printing/calprintdayconfig_base.ui:57
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mFromDate)
+#. i18n: file: printing/calprintdayconfig_base.ui:131
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mToDate)
+#. i18n: file: printing/calprinttodoconfig_base.ui:152
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mFromDate)
+#. i18n: file: printing/calprinttodoconfig_base.ui:189
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mToDate)
+#. i18n: file: printing/calprintweekconfig_base.ui:85
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mFromDate)
+#. i18n: file: printing/calprintweekconfig_base.ui:176
+#. i18n: ectx: property (text), item, widget (KDateComboBox, mToDate)
+#: rc.cpp:996 rc.cpp:1020 rc.cpp:1176 rc.cpp:1185 rc.cpp:1254 rc.cpp:1284
+msgid "2009-01-19"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:328
-#. i18n: ectx: whatsthis, entry, group (Todo View)
-#: rc.cpp:1024
+#. i18n: file: printing/calprintdayconfig_base.ui:65
+#. i18n: ectx: property (whatsThis), widget (QLabel, mFromTimeLabel)
+#. i18n: file: printing/calprintdayconfig_base.ui:78
+#. i18n: ectx: property (whatsThis), widget (QTimeEdit, mFromTime)
+#: rc.cpp:999 rc.cpp:1005
 msgid ""
-"Check this box if you want all completed to-dos to be always grouped at the "
-"bottom of the to-do list."
+"It is possible to print only those events which are inside a given "
+"timerange. With this time selection box you can define the start of this "
+"time range. The end time should be defined with the <i>End time</i> option. "
+"Note you can automatically modify these settings if you check <i>Extend time "
+"range to include all events</i>."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:333
-#. i18n: ectx: label, entry, group (Todo View)
-#: rc.cpp:1027
-msgid "To-do list view uses full window"
+#. i18n: file: printing/calprintdayconfig_base.ui:68
+#. i18n: ectx: property (text), widget (QLabel, mFromTimeLabel)
+#. i18n: file: printing/calprintweekconfig_base.ui:142
+#. i18n: ectx: property (text), widget (QLabel, mFromTimeLabel)
+#: rc.cpp:1002 rc.cpp:1272
+msgid "Start &time:"
+msgstr "&Amser dechrau:"
+
+#. i18n: file: printing/calprintdayconfig_base.ui:81
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mFromTime)
+#. i18n: file: printing/calprintdayconfig_base.ui:155
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mToTime)
+#. i18n: file: printing/calprintweekconfig_base.ui:125
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mToTime)
+#. i18n: file: printing/calprintweekconfig_base.ui:155
+#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mFromTime)
+#: rc.cpp:1008 rc.cpp:1032 rc.cpp:1266 rc.cpp:1278
+msgid "hh:mm"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:334
-#. i18n: ectx: whatsthis, entry, group (Todo View)
-#: rc.cpp:1030
+#. i18n: file: printing/calprintdayconfig_base.ui:111
+#. i18n: ectx: property (whatsThis), widget (QLabel, mToDateLabel)
+#. i18n: file: printing/calprintdayconfig_base.ui:127
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mToDate)
+#. i18n: file: printing/calprinttodoconfig_base.ui:185
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mToDate)
+#: rc.cpp:1011 rc.cpp:1017 rc.cpp:1182
 msgid ""
-"Check this box to use the full KOrganizer window when displaying the to-do "
-"list view. If this box is checked, you will gain some space for the to-do "
-"list view, but other widgets, such as the date navigator, the to-do details "
-"and the calendars list, will not be displayed."
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>Start date</i> option. This option is used to define "
+"the end date."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:339
-#. i18n: ectx: label, entry, group (Todo View)
-#: rc.cpp:1033
-msgid "Record completed to-dos in journal entries"
-msgstr ""
+#. i18n: file: printing/calprintdayconfig_base.ui:114
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#. i18n: file: printing/calprinttodoconfig_base.ui:169
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#. i18n: file: printing/calprintweekconfig_base.ui:187
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:116
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#. i18n: file: plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui:69
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:69
+#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
+#: rc.cpp:1014 rc.cpp:1179 rc.cpp:1290 rc.cpp:1539 rc.cpp:1548 rc.cpp:1557
+msgid "&End date:"
+msgstr "Dyddiad &gorffen:"
 
-#. i18n: file: korganizer.kcfg:340
-#. i18n: ectx: whatsthis, entry, group (Todo View)
-#: rc.cpp:1036
+#. i18n: file: printing/calprintdayconfig_base.ui:139
+#. i18n: ectx: property (whatsThis), widget (QLabel, mToTimeLabel)
+#. i18n: file: printing/calprintdayconfig_base.ui:152
+#. i18n: ectx: property (whatsThis), widget (QTimeEdit, mToTime)
+#: rc.cpp:1023 rc.cpp:1029
 msgid ""
-"Check this box to record the completion of a to-do in a new entry of your "
-"journal automatically."
+"It is possible to print only those events which are inside a given "
+"timerange. With this time selection box you can define the end of this time "
+"range. The start time should be defined with the <i>Start time</i> option. "
+"Note you can automatically modify these settings if you check <i>Extend time "
+"range to include all events</i>."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:348
-#. i18n: ectx: label, entry, group (Colors)
-#. i18n: file: korganizer.kcfg:579
-#. i18n: ectx: label, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:683
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1039 rc.cpp:1147 rc.cpp:1189
-msgid "Holiday color"
-msgstr ""
+#. i18n: file: printing/calprintdayconfig_base.ui:142
+#. i18n: ectx: property (text), widget (QLabel, mToTimeLabel)
+#. i18n: file: printing/calprintweekconfig_base.ui:96
+#. i18n: ectx: property (text), widget (QLabel, mToTimeLabel)
+#: rc.cpp:1026 rc.cpp:1260
+msgid "End ti&me:"
+msgstr "A&mser gorffen:"
 
-#. i18n: file: korganizer.kcfg:349
-#. i18n: ectx: whatsthis, entry, group (Colors)
-#. i18n: file: korganizer.kcfg:580
-#. i18n: ectx: whatsthis, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:684
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1042 rc.cpp:1150 rc.cpp:1192
+#. i18n: file: printing/calprintdayconfig_base.ui:185
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeAllEvents)
+#: rc.cpp:1035
 msgid ""
-"Select the holiday color here. The holiday color will be used for the "
-"holiday name in the month view and the holiday number in the date navigator."
+"Check this option to automatically determine the required time range, so all "
+"events will be shown."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:354
-#. i18n: ectx: label, entry (AgendaBgColor), group (Colors)
-#. i18n: file: korganizer.kcfg:494
-#. i18n: ectx: label, entry, group (Theming)
-#: rc.cpp:1045 rc.cpp:1123
-msgid "Agenda view background color"
-msgstr ""
+#. i18n: file: printing/calprintdayconfig_base.ui:188
+#. i18n: ectx: property (text), widget (QCheckBox, mIncludeAllEvents)
+#: rc.cpp:1038
+msgid "E&xtend time range to include all events"
+msgstr "&Estyn yr amrediad amser i gynnwys pob ddigwyddiad"
 
-#. i18n: file: korganizer.kcfg:355
-#. i18n: ectx: whatsthis, entry (AgendaBgColor), group (Colors)
-#. i18n: file: korganizer.kcfg:495
-#. i18n: ectx: whatsthis, entry, group (Theming)
-#: rc.cpp:1048 rc.cpp:1126
-msgid "Select the agenda view background color here."
+#. i18n: file: printing/calprintdayconfig_base.ui:198
+#. i18n: ectx: property (title), widget (QGroupBox, mPrintType)
+#. i18n: file: printing/calprintweekconfig_base.ui:200
+#. i18n: ectx: property (title), widget (QGroupBox, mPrintType)
+#: rc.cpp:1041 rc.cpp:1293
+msgid "Print Layout"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:360
-#. i18n: ectx: label, entry, group (Colors)
-#: rc.cpp:1051
-msgid "Agenda view current-time line color"
+#. i18n: file: printing/calprintdayconfig_base.ui:207
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeFilofax)
+#: rc.cpp:1044
+msgid ""
+"The Filofax format prints the information for the days selected without a "
+"timeline."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:361
-#. i18n: ectx: whatsthis, entry, group (Colors)
-#: rc.cpp:1054
-msgid "Select a color to use for the current-time (Marcus Bains) line."
+#. i18n: file: printing/calprintdayconfig_base.ui:210
+#. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeFilofax)
+#: rc.cpp:1047
+msgid "Print date range as &Filofax format, all on one page"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:362
-#. i18n: ectx: tooltip, entry, group (Colors)
-#: rc.cpp:1057
-msgid "Use this color for the Agenda View current-time (Marcus Bains) line"
+#. i18n: file: printing/calprintdayconfig_base.ui:217
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeTimetable)
+#: rc.cpp:1050
+msgid "The timetable print view has the times to the left of the page"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:367
-#. i18n: ectx: label, entry (ViewBgBusyColor), group (Colors)
-#: rc.cpp:1060
-msgid "Busy days background color"
+#. i18n: file: printing/calprintdayconfig_base.ui:220
+#. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeTimetable)
+#: rc.cpp:1053
+msgid "Print as &timetable view, one page per day"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:368
-#. i18n: ectx: whatsthis, entry (ViewBgBusyColor), group (Colors)
-#: rc.cpp:1063
+#. i18n: file: printing/calprintdayconfig_base.ui:230
+#. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeSingleTimetable)
+#: rc.cpp:1056
 msgid ""
-"When you have an all day event marked as busy, you can have a different "
-"agenda or month view background color for that day. Select the color here."
-msgstr ""
-
-#. i18n: file: korganizer.kcfg:373
-#. i18n: ectx: label, entry, group (Colors)
-#. i18n: file: korganizer.kcfg:603
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1066 rc.cpp:1165
-msgid "Working hours color"
+"The timetable print view has the times to the left of the page, all days are "
+"printed as columns in one big timetable."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:374
-#. i18n: ectx: whatsthis, entry, group (Colors)
-#: rc.cpp:1069
-msgid "Select the working hours color for the agenda view here."
+#. i18n: file: printing/calprintdayconfig_base.ui:233
+#. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeSingleTimetable)
+#: rc.cpp:1059
+msgid "Print as timetable view, all days on a single page"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:379
-#. i18n: ectx: label, entry (TodoDueTodayColor), group (Colors)
-#. i18n: file: korganizer.kcfg:548
-#. i18n: ectx: label, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:654
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1072 rc.cpp:1135 rc.cpp:1177
-msgid "To-do due today color"
+#. i18n: file: printing/calprintdayconfig_base.ui:278
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeTime)
+#. i18n: file: printing/calprintweekconfig_base.ui:289
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeTime)
+#: rc.cpp:1077 rc.cpp:1329
+msgid "Check this option to exclude the time in description box"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:380
-#. i18n: ectx: whatsthis, entry (TodoDueTodayColor), group (Colors)
-#. i18n: file: korganizer.kcfg:549
-#. i18n: ectx: whatsthis, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:655
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1075 rc.cpp:1138 rc.cpp:1180
-msgid "Select the to-do due today color here."
+#. i18n: file: printing/calprintdayconfig_base.ui:281
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeTime)
+#. i18n: file: printing/calprintweekconfig_base.ui:292
+#. i18n: ectx: property (text), widget (QCheckBox, mExcludeTime)
+#: rc.cpp:1080 rc.cpp:1332
+msgid "Exclude t&ime from timetable detail display items"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:385
-#. i18n: ectx: label, entry (TodoOverdueColor), group (Colors)
-#. i18n: file: korganizer.kcfg:563
-#. i18n: ectx: label, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:668
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1078 rc.cpp:1141 rc.cpp:1183
-msgid "To-do overdue color"
+#. i18n: file: printing/calprintdayconfig_base.ui:291
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeTodos)
+#: rc.cpp:1083
+msgid ""
+"You should check this option if you want to print to-dos which are due on "
+"one of the dates which are in the supplied date range."
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:386
-#. i18n: ectx: whatsthis, entry (TodoOverdueColor), group (Colors)
-#. i18n: file: korganizer.kcfg:564
-#. i18n: ectx: whatsthis, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:669
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1081 rc.cpp:1144 rc.cpp:1186
-msgid "Select the to-do overdue color here."
+#. i18n: file: printing/calprintdayconfig_base.ui:311
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
+#: rc.cpp:1095
+msgid "Check this option to draw note lines "
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:394
-#. i18n: ectx: label, entry, group (Fonts)
-#: rc.cpp:1084
-msgid "Time bar"
-msgstr "Bar amser:"
+#. i18n: file: printing/calprintdayconfig_base.ui:331
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
+#. i18n: file: printing/calprintincidenceconfig_base.ui:78
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
+#: rc.cpp:1107 rc.cpp:1140
+msgid ""
+"If you want to use colors to distinguish certain categories on the print, "
+"check this option."
+msgstr ""
 
-#. i18n: file: korganizer.kcfg:395
-#. i18n: ectx: whatsthis, entry, group (Fonts)
-#: rc.cpp:1087
+#. i18n: file: printing/calprintincidenceconfig_base.ui:21
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1113
 msgid ""
-"Press this button to configure the time bar font. The time bar is the widget "
-"that shows the hours in the agenda view. This button will open the \"Select "
-"Font\" dialog, allowing you to choose the hour font for the time bar."
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Print incidence options:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:399
-#. i18n: ectx: label, entry, group (Fonts)
-#: rc.cpp:1090
-msgid "Month view"
-msgstr "Golwg mis"
+#. i18n: file: printing/calprintincidenceconfig_base.ui:28
+#. i18n: ectx: property (title), widget (QGroupBox, mComponentsGroup)
+#. i18n: file: printing/calprinttodoconfig_base.ui:218
+#. i18n: ectx: property (title), widget (QGroupBox, includeInfoBox)
+#: rc.cpp:1119 rc.cpp:1188
+msgid "Include Information"
+msgstr ""
 
-#. i18n: file: korganizer.kcfg:400
-#. i18n: ectx: whatsthis, entry, group (Fonts)
-#: rc.cpp:1093
-msgid ""
-"Press this button to configure the month view font. This button will open "
-"the \"Select Font\" dialog, allowing you to choose the font for the items in "
-"the month view."
+#. i18n: file: printing/calprintincidenceconfig_base.ui:37
+#. i18n: ectx: property (text), widget (QCheckBox, mShowDetails)
+#: rc.cpp:1122
+msgid "Detai&ls (visiblility, secrecy, etc.)"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:404
-#. i18n: ectx: label, entry, group (Fonts)
-#: rc.cpp:1096
-msgid "Agenda view"
-msgstr "Golwg agenda:"
+#. i18n: file: printing/calprintincidenceconfig_base.ui:44
+#. i18n: ectx: property (text), widget (QCheckBox, mShowAttendees)
+#: rc.cpp:1125
+msgid "&Attendees"
+msgstr ""
 
-#. i18n: file: korganizer.kcfg:405
-#. i18n: ectx: whatsthis, entry, group (Fonts)
-#: rc.cpp:1099
-msgid ""
-"Press this button to configure the agenda view font. This button will open "
-"the \"Select Font\" dialog, allowing you to choose the font for the events "
-"in the agenda view."
+#. i18n: file: printing/calprintincidenceconfig_base.ui:51
+#. i18n: ectx: property (text), widget (QCheckBox, mShowSubitemsNotes)
+#: rc.cpp:1128
+msgid "&Notes, subitems"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:409
-#. i18n: ectx: label, entry, group (Fonts)
-#: rc.cpp:1102
-msgid "Current-time line"
+#. i18n: file: printing/calprintincidenceconfig_base.ui:58
+#. i18n: ectx: property (text), widget (QCheckBox, mShowAttachments)
+#: rc.cpp:1131
+msgid "Attach&ments"
+msgstr "Atodia&dau"
+
+#. i18n: file: printing/calprintincidenceconfig_base.ui:68
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
+#: rc.cpp:1134
+msgid "Draw note lines in empty area"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:410
-#. i18n: ectx: whatsthis, entry, group (Fonts)
-#: rc.cpp:1105
+#. i18n: file: printing/calprinttodoconfig_base.ui:21
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1146
 msgid ""
-"Press this button to configure the current-time line font. This button will "
-"open the \"Select Font\" dialog, allowing you to choose the font for the "
-"current-time line in the agenda view."
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Print to-dos options:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:434
-#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
-#: rc.cpp:1108
-msgid "Default todo attachment method"
-msgstr ""
+#. i18n: file: printing/calprinttodoconfig_base.ui:30
+#. i18n: ectx: property (text), widget (QLabel, mTitleLabel)
+#: rc.cpp:1152
+msgid "&Title:"
+msgstr "&Teitl:"
 
-#. i18n: file: korganizer.kcfg:435
-#. i18n: ectx: whatsthis, entry (DefaultTodoAttachMethod), group (Hidden Options)
-#: rc.cpp:1111
-msgid "The default way of attaching dropped emails to a task"
+#. i18n: file: printing/calprinttodoconfig_base.ui:40
+#. i18n: ectx: property (text), widget (KLineEdit, mTitle)
+#. i18n: file: htmlexportsettings.kcfg:104
+#: rc.cpp:1155 rc.cpp:1683
+msgid "To-do List"
+msgstr "Rhestr I'w-Wneud"
+
+#. i18n: file: printing/calprinttodoconfig_base.ui:49
+#. i18n: ectx: property (title), widget (QGroupBox, mPrintType)
+#: rc.cpp:1158
+msgid "To-dos to Print"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:438
-#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
-#: rc.cpp:1114
-msgid "Always ask"
+#. i18n: file: printing/calprinttodoconfig_base.ui:58
+#. i18n: ectx: property (text), widget (QRadioButton, mPrintAll)
+#: rc.cpp:1161
+msgid "Print &all to-dos"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:441
-#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
-#: rc.cpp:1117
-msgid "Only attach link to message"
+#. i18n: file: printing/calprinttodoconfig_base.ui:71
+#. i18n: ectx: property (text), widget (QRadioButton, mPrintUnfinished)
+#: rc.cpp:1164
+msgid "Print &unfinished to-dos only"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:444
-#. i18n: ectx: label, entry (DefaultTodoAttachMethod), group (Hidden Options)
-#: rc.cpp:1120
-msgid "Attach complete message"
+#. i18n: file: printing/calprinttodoconfig_base.ui:81
+#. i18n: ectx: property (text), widget (QRadioButton, mPrintDueRange)
+#: rc.cpp:1167
+msgid "Print only to-dos due in the &range:"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:501
-#. i18n: ectx: label, entry, group (Theming)
-#. i18n: file: korganizer.kcfg:598
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1129 rc.cpp:1159
-msgid "Highlight color"
-msgstr "Lliw amlygu"
+#. i18n: file: printing/calprinttodoconfig_base.ui:230
+#. i18n: ectx: property (text), widget (QCheckBox, mDescription)
+#: rc.cpp:1191
+msgid "&Description"
+msgstr "&Disgrifiad"
 
-#. i18n: file: korganizer.kcfg:502
-#. i18n: ectx: whatsthis, entry, group (Theming)
-#: rc.cpp:1132
-msgid ""
-"Select the highlight color here. The highlight color will be used for "
-"marking the currently selected area in your agenda and in the date navigator."
+#. i18n: file: printing/calprinttodoconfig_base.ui:240
+#. i18n: ectx: property (text), widget (QCheckBox, mPriority)
+#: rc.cpp:1194
+msgid "&Priority"
+msgstr "&Blaenoriaeth"
+
+#. i18n: file: printing/calprinttodoconfig_base.ui:250
+#. i18n: ectx: property (text), widget (QCheckBox, mDueDate)
+#: rc.cpp:1197
+msgid "Due date"
+msgstr "Dyddiad Disgwyliedig"
+
+#. i18n: file: printing/calprinttodoconfig_base.ui:263
+#. i18n: ectx: property (text), widget (QCheckBox, mPercentComplete)
+#: rc.cpp:1200
+msgid "Per&centage completed"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:591
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1153
-msgid "Month view background color"
+#. i18n: file: printing/calprinttodoconfig_base.ui:280
+#. i18n: ectx: property (title), widget (QGroupBox, otherOptionsBox)
+#: rc.cpp:1203
+msgid "Other Options"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:592
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1156
-msgid "Select the Month view background color here."
+#. i18n: file: printing/calprinttodoconfig_base.ui:289
+#. i18n: ectx: property (text), widget (QCheckBox, mConnectSubTodos)
+#: rc.cpp:1206
+msgid "Co&nnect sub-to-dos with its parent"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:599
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1162
-msgid ""
-"Select the highlight color here. The highlight color will be used for "
-"marking the currently selected area in your Month and in the date navigator."
+#. i18n: file: printing/calprinttodoconfig_base.ui:299
+#. i18n: ectx: property (text), widget (QCheckBox, mStrikeOutCompleted)
+#: rc.cpp:1209
+msgid "Strike &out completed to-do summaries"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:604
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1168
-msgid "Select the working hours background color for the Month view here."
+#. i18n: file: printing/calprinttodoconfig_base.ui:344
+#. i18n: ectx: property (title), widget (QGroupBox, sortingOptionsBox)
+#: rc.cpp:1227
+msgid "Sorting Options"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:626
-#. i18n: ectx: label, entry, group (Theme/Month view)
-#: rc.cpp:1171
-msgid "Default event color"
+#. i18n: file: printing/calprinttodoconfig_base.ui:358
+#. i18n: ectx: property (text), widget (QLabel, sortFieldLabel)
+#: rc.cpp:1230
+msgid "Sort field:"
 msgstr ""
 
-#. i18n: file: korganizer.kcfg:627
-#. i18n: ectx: whatsthis, entry, group (Theme/Month view)
-#: rc.cpp:1174
-msgid ""
-"Select the default event color here. The default event color will be used "
-"for events categories in your Month. Note that you can specify a separate "
-"color for each event category below."
+#. i18n: file: printing/calprinttodoconfig_base.ui:385
+#. i18n: ectx: property (text), widget (QLabel, sortDirectionLabel)
+#: rc.cpp:1233
+msgid "Sort direction:"
 msgstr ""
 
 #. i18n: file: printing/calprintweekconfig_base.ui:21
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1246
+#: rc.cpp:1236
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -6425,110 +6490,58 @@
 #. i18n: file: printing/calprintweekconfig_base.ui:65
 #. i18n: ectx: property (whatsThis), widget (QLabel, mFromDateLabel)
 #. i18n: file: printing/calprintweekconfig_base.ui:81
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mFromDate)
-#: rc.cpp:1255 rc.cpp:1261
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mFromDate)
+#: rc.cpp:1245 rc.cpp:1251
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
 "check enables you to enter the start date of the date range. Use the <i>End "
 "date</i> to enter the end date of the daterange."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:85
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mFromDate)
-#. i18n: file: printing/calprintweekconfig_base.ui:176
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mToDate)
-#. i18n: file: printing/calprinttodoconfig_base.ui:152
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mFromDate)
-#. i18n: file: printing/calprinttodoconfig_base.ui:189
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mToDate)
-#. i18n: file: printing/calprintdayconfig_base.ui:57
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mFromDate)
-#. i18n: file: printing/calprintdayconfig_base.ui:131
-#. i18n: ectx: property (text), item, widget (KPIM::KDateEdit, mToDate)
-#: rc.cpp:1264 rc.cpp:1294 rc.cpp:1501 rc.cpp:1510 rc.cpp:1579 rc.cpp:1603
-msgid "2009-01-19"
-msgstr ""
-
 #. i18n: file: printing/calprintweekconfig_base.ui:93
 #. i18n: ectx: property (whatsThis), widget (QLabel, mToTimeLabel)
 #. i18n: file: printing/calprintweekconfig_base.ui:122
 #. i18n: ectx: property (whatsThis), widget (QTimeEdit, mToTime)
-#: rc.cpp:1267 rc.cpp:1273
+#: rc.cpp:1257 rc.cpp:1263
 msgid "All events which start later than the given time will not be printed."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:96
-#. i18n: ectx: property (text), widget (QLabel, mToTimeLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:142
-#. i18n: ectx: property (text), widget (QLabel, mToTimeLabel)
-#: rc.cpp:1270 rc.cpp:1609
-msgid "End ti&me:"
-msgstr "A&mser gorffen:"
-
-#. i18n: file: printing/calprintweekconfig_base.ui:125
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mToTime)
-#. i18n: file: printing/calprintweekconfig_base.ui:155
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mFromTime)
-#. i18n: file: printing/calprintdayconfig_base.ui:81
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mFromTime)
-#. i18n: file: printing/calprintdayconfig_base.ui:155
-#. i18n: ectx: property (displayFormat), widget (QTimeEdit, mToTime)
-#: rc.cpp:1276 rc.cpp:1288 rc.cpp:1591 rc.cpp:1615
-msgid "hh:mm"
-msgstr ""
-
 #. i18n: file: printing/calprintweekconfig_base.ui:139
 #. i18n: ectx: property (whatsThis), widget (QLabel, mFromTimeLabel)
 #. i18n: file: printing/calprintweekconfig_base.ui:152
-#. i18n: ectx: property (whatsThis), widget (QTimeEdit, mFromTime)
-#: rc.cpp:1279 rc.cpp:1285
-msgid ""
-"All events which start earlier than the given time will not be printed."
-msgstr ""
-
-#. i18n: file: printing/calprintweekconfig_base.ui:142
-#. i18n: ectx: property (text), widget (QLabel, mFromTimeLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:68
-#. i18n: ectx: property (text), widget (QLabel, mFromTimeLabel)
-#: rc.cpp:1282 rc.cpp:1585
-msgid "Start &time:"
-msgstr "&Amser dechrau:"
+#. i18n: ectx: property (whatsThis), widget (QTimeEdit, mFromTime)
+#: rc.cpp:1269 rc.cpp:1275
+msgid ""
+"All events which start earlier than the given time will not be printed."
+msgstr ""
 
 #. i18n: file: printing/calprintweekconfig_base.ui:172
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mToDate)
+#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mToDate)
 #. i18n: file: printing/calprintweekconfig_base.ui:184
 #. i18n: ectx: property (whatsThis), widget (QLabel, mToDateLabel)
-#: rc.cpp:1291 rc.cpp:1297
+#: rc.cpp:1281 rc.cpp:1287
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
 "check enables you to enter the end date of the date range. Use the <i>Start "
 "date</i> to enter the start date of the daterange."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:200
-#. i18n: ectx: property (title), widget (QGroupBox, mPrintType)
-#. i18n: file: printing/calprintdayconfig_base.ui:198
-#. i18n: ectx: property (title), widget (QGroupBox, mPrintType)
-#: rc.cpp:1303 rc.cpp:1624
-msgid "Print Layout"
-msgstr ""
-
 #. i18n: file: printing/calprintweekconfig_base.ui:221
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeFilofax)
-#: rc.cpp:1306
+#: rc.cpp:1296
 msgid ""
 "The Filofax view prints one week per page, so all days have a large surface."
 msgstr ""
 
 #. i18n: file: printing/calprintweekconfig_base.ui:224
 #. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeFilofax)
-#: rc.cpp:1309
+#: rc.cpp:1299
 msgid "Print as &Filofax page"
 msgstr "Argraffu fel tudalen &Filofax"
 
 #. i18n: file: printing/calprintweekconfig_base.ui:234
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeTimetable)
-#: rc.cpp:1312
+#: rc.cpp:1302
 msgid ""
 "This view is similar to the weekview in KOrganizer. The week is printed in "
 "landscape layout. You can even use the same colors for the items if you "
@@ -6537,13 +6550,13 @@
 
 #. i18n: file: printing/calprintweekconfig_base.ui:237
 #. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeTimetable)
-#: rc.cpp:1315
+#: rc.cpp:1305
 msgid "Print as &timetable view"
 msgstr ""
 
 #. i18n: file: printing/calprintweekconfig_base.ui:244
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeSplitWeek)
-#: rc.cpp:1318
+#: rc.cpp:1308
 msgid ""
 "This view is similar to the week view in KOrganizer. The only difference "
 "with the timetable view is the page layout. Timetables are printed in "
@@ -6552,293 +6565,351 @@
 
 #. i18n: file: printing/calprintweekconfig_base.ui:247
 #. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeSplitWeek)
-#: rc.cpp:1321
+#: rc.cpp:1311
 msgid "Print as split week view"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:257
-#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
-#. i18n: file: printing/calprintmonthconfig_base.ui:131
-#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
-#. i18n: file: printing/calprinttodoconfig_base.ui:312
-#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
-#. i18n: file: printing/calprintdayconfig_base.ui:246
-#. i18n: ectx: property (title), widget (QGroupBox, mSecurity)
-#: rc.cpp:1324 rc.cpp:1408 rc.cpp:1537 rc.cpp:1645
-msgid "Security Exclusions"
+#. i18n: file: printing/calprintweekconfig_base.ui:322
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
+#: rc.cpp:1347
+msgid "Check this option to draw note lines."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:266
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
-#. i18n: file: printing/calprintmonthconfig_base.ui:140
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
-#. i18n: file: printing/calprinttodoconfig_base.ui:321
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
-#. i18n: file: printing/calprintdayconfig_base.ui:255
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeConfidential)
-#: rc.cpp:1327 rc.cpp:1411 rc.cpp:1540 rc.cpp:1648
-msgid "Check this option to exclude confidential events."
+#. i18n: file: printing/calprintweekconfig_base.ui:325
+#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
+#: rc.cpp:1350
+msgid "Show note &lines in Filofax layout"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:269
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
-#. i18n: file: printing/calprintmonthconfig_base.ui:143
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
-#. i18n: file: printing/calprinttodoconfig_base.ui:324
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
-#. i18n: file: printing/calprintdayconfig_base.ui:258
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeConfidential)
-#: rc.cpp:1330 rc.cpp:1414 rc.cpp:1543 rc.cpp:1651
-msgid "Exclude c&onfidential"
+#. i18n: file: publishdialog_base.ui:23
+#. i18n: ectx: property (toolTip), widget (QListWidget, mListWidget)
+#: rc.cpp:1365
+msgid "The list of addressees to receive the invitation"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:276
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
-#. i18n: file: printing/calprintmonthconfig_base.ui:150
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
-#. i18n: file: printing/calprinttodoconfig_base.ui:331
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
-#. i18n: file: printing/calprintdayconfig_base.ui:265
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludePrivate)
-#: rc.cpp:1333 rc.cpp:1417 rc.cpp:1546 rc.cpp:1654
-msgid "Check this option to exclude private events"
+#. i18n: file: publishdialog_base.ui:26
+#. i18n: ectx: property (whatsThis), widget (QListWidget, mListWidget)
+#: rc.cpp:1368
+msgid ""
+"This is a list of all the addresses you have currently selected to receive "
+"the iCalendar invitation."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:279
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
-#. i18n: file: printing/calprintmonthconfig_base.ui:153
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
-#. i18n: file: printing/calprinttodoconfig_base.ui:334
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
-#. i18n: file: printing/calprintdayconfig_base.ui:268
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludePrivate)
-#: rc.cpp:1336 rc.cpp:1420 rc.cpp:1549 rc.cpp:1657
-msgid "Exclude pri&vate"
+#. i18n: file: publishdialog_base.ui:37
+#. i18n: ectx: property (toolTip), widget (QPushButton, mNew)
+#: rc.cpp:1371
+msgid "Create a new recipient"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:289
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeTime)
-#. i18n: file: printing/calprintdayconfig_base.ui:278
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mExcludeTime)
-#: rc.cpp:1339 rc.cpp:1660
-msgid "Check this option to exclude the time in description box"
+#. i18n: file: publishdialog_base.ui:40
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mNew)
+#: rc.cpp:1374
+msgid ""
+"Click this button and you will be able to enter a name and email for a new "
+"addressee to add to the recipients list"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:292
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeTime)
-#. i18n: file: printing/calprintdayconfig_base.ui:281
-#. i18n: ectx: property (text), widget (QCheckBox, mExcludeTime)
-#: rc.cpp:1342 rc.cpp:1663
-msgid "Exclude t&ime from timetable detail display items"
+#. i18n: file: publishdialog_base.ui:50
+#. i18n: ectx: property (toolTip), widget (QPushButton, mRemove)
+#: rc.cpp:1380
+msgid "Remove the recipient currently selected"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:302
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeTodos)
-#. i18n: file: printing/calprintmonthconfig_base.ui:196
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeTodos)
-#: rc.cpp:1345 rc.cpp:1441
+#. i18n: file: publishdialog_base.ui:53
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mRemove)
+#: rc.cpp:1383
 msgid ""
-"Check this option if you want to have to-dos on the print, placed by their "
-"due date."
+"Click this button to remove the recipient currently selected from the list"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:305
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeTodos)
-#. i18n: file: printing/calprintmonthconfig_base.ui:199
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeTodos)
-#. i18n: file: printing/calprintdayconfig_base.ui:294
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeTodos)
-#: rc.cpp:1348 rc.cpp:1444 rc.cpp:1669
-msgid "Include to-&dos that are due on the printed day(s)"
+#. i18n: file: publishdialog_base.ui:56
+#. i18n: ectx: property (text), widget (QPushButton, mRemove)
+#: rc.cpp:1386
+msgid "&Remove"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:312
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeDescription)
-#. i18n: file: printing/calprintmonthconfig_base.ui:206
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeDescription)
-#. i18n: file: printing/calprintdayconfig_base.ui:301
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeDescription)
-#: rc.cpp:1351 rc.cpp:1447 rc.cpp:1672
+#. i18n: file: publishdialog_base.ui:63
+#. i18n: ectx: property (toolTip), widget (QPushButton, mSelectAddressee)
+#: rc.cpp:1389
+msgid "Select a recipient from your address book"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:66
+#. i18n: ectx: property (whatsThis), widget (QPushButton, mSelectAddressee)
+#: rc.cpp:1392
 msgid ""
-"Check this option to include the more detailed description for each event."
+"Click this button to show another dialog where you will be able to select a "
+"recipient from your address book"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:69
+#. i18n: ectx: property (text), widget (QPushButton, mSelectAddressee)
+#: rc.cpp:1395
+msgid "&Select..."
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:98
+#. i18n: ectx: property (text), widget (QLabel, TextLabel1)
+#: rc.cpp:1398
+msgctxt "recipient name"
+msgid "Name:"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:108
+#. i18n: ectx: property (toolTip), widget (KLineEdit, mNameLineEdit)
+#: rc.cpp:1401
+msgid "The recipient's name"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:111
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mNameLineEdit)
+#: rc.cpp:1404
+msgid "This field contains the name of the recipient"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:125
+#. i18n: ectx: property (text), widget (QLabel, TextLabel2)
+#: rc.cpp:1407
+msgctxt "recipient email"
+msgid "Email:"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:135
+#. i18n: ectx: property (toolTip), widget (KLineEdit, mEmailLineEdit)
+#: rc.cpp:1410
+msgid "The recipient's email address"
+msgstr ""
+
+#. i18n: file: publishdialog_base.ui:138
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, mEmailLineEdit)
+#: rc.cpp:1413
+msgid "This field contains the email address of the recipient"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:5
+#. i18n: ectx: Menu (file)
+#. i18n: file: korganizerui.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:1416 rc.cpp:1693
+msgid "&File"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:12
+#. i18n: ectx: Menu (import)
+#. i18n: file: korganizerui.rc:5
+#. i18n: ectx: Menu (import)
+#: rc.cpp:1419 rc.cpp:1696
+msgid "&Import"
+msgstr "&Mewnforio"
+
+#. i18n: file: korganizer_part.rc:19
+#. i18n: ectx: Menu (export)
+#. i18n: file: korganizerui.rc:12
+#. i18n: ectx: Menu (export)
+#: rc.cpp:1422 rc.cpp:1699
+msgid "&Export"
+msgstr "&Allforio"
+
+#. i18n: file: korganizer_part.rc:45
+#. i18n: ectx: Menu (view)
+#. i18n: file: korganizerui.rc:30
+#. i18n: ectx: Menu (view)
+#: rc.cpp:1428 rc.cpp:1705
+msgid "&View"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:62
+#. i18n: ectx: Menu (zoom)
+#. i18n: file: korganizerui.rc:47
+#. i18n: ectx: Menu (zoom)
+#: rc.cpp:1431 rc.cpp:1708
+msgid "&Zoom"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:70
+#. i18n: ectx: Menu (go)
+#. i18n: file: korganizerui.rc:55
+#. i18n: ectx: Menu (go)
+#: rc.cpp:1434 rc.cpp:1711
+msgid "&Go"
+msgstr "&Ewch"
+
+#. i18n: file: korganizer_part.rc:82
+#. i18n: ectx: Menu (actions)
+#. i18n: file: korganizerui.rc:68
+#. i18n: ectx: Menu (actions)
+#: rc.cpp:1437 rc.cpp:1714
+msgid "&Actions"
+msgstr "&Gweithredau"
+
+#. i18n: file: korganizer_part.rc:97
+#. i18n: ectx: Menu (schedule)
+#. i18n: file: korganizerui.rc:84
+#. i18n: ectx: Menu (schedule)
+#: rc.cpp:1440 rc.cpp:1717
+msgid "S&chedule"
+msgstr "&Trefnlen"
+
+#. i18n: file: korganizer_part.rc:109
+#. i18n: ectx: Menu (settings)
+#. i18n: file: korganizerui.rc:96
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:1443 rc.cpp:1720
+msgid "&Settings"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:110
+#. i18n: ectx: Menu (sidebar)
+#. i18n: file: korganizerui.rc:97
+#. i18n: ectx: Menu (sidebar)
+#: rc.cpp:1446 rc.cpp:1723
+msgid "&Sidebar"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:128
+#. i18n: ectx: Menu (help)
+#. i18n: file: korganizerui.rc:111
+#. i18n: ectx: Menu (help)
+#: rc.cpp:1449 rc.cpp:1726
+msgid "&Help"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:315
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeDescription)
-#. i18n: file: printing/calprintmonthconfig_base.ui:209
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeDescription)
-#. i18n: file: printing/calprintdayconfig_base.ui:304
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeDescription)
-#: rc.cpp:1354 rc.cpp:1450 rc.cpp:1675
-msgid "Include &descriptions"
+#. i18n: file: korganizer_part.rc:133
+#. i18n: ectx: ToolBar (mainToolBar)
+#. i18n: file: korganizerui.rc:117
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:1452 rc.cpp:1729
+msgctxt "main toolbar"
+msgid "Main"
+msgstr ""
+
+#. i18n: file: korganizer_part.rc:149
+#. i18n: ectx: ToolBar (korganizer_toolbar)
+#. i18n: file: korganizerui.rc:134
+#. i18n: ectx: ToolBar (korganizer_toolbar)
+#: rc.cpp:1455 rc.cpp:1732
+msgid "Views"
+msgstr "Golygon"
+
+#. i18n: file: korganizer_part.rc:158
+#. i18n: ectx: ToolBar (schedule_toolbar)
+#. i18n: file: korganizerui.rc:143
+#. i18n: ectx: ToolBar (schedule_toolbar)
+#: rc.cpp:1458 rc.cpp:1735
+msgid "Schedule"
+msgstr "Trefnlen"
+
+#. i18n: file: korganizer_part.rc:164
+#. i18n: ectx: ToolBar (filter_toolbar)
+#. i18n: file: korganizerui.rc:150
+#. i18n: ectx: ToolBar (filter_toolbar)
+#: rc.cpp:1461 rc.cpp:1738
+msgid "Filters Toolbar"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:322
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
-#: rc.cpp:1357
-msgid "Check this option to draw note lines."
+#. i18n: file: korganizer_part.rc:184
+#. i18n: ectx: Menu (calendar_color)
+#. i18n: file: korganizerui.rc:170
+#. i18n: ectx: Menu (calendar_color)
+#: rc.cpp:1464 rc.cpp:1741
+msgid "Calendar Colors"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:325
-#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
-#: rc.cpp:1360
-msgid "Show note &lines in Filofax layout"
+#. i18n: file: accountscalendarwidget.ui:29
+#. i18n: ectx: property (text), widget (QPushButton, mAddAccountButton)
+#: rc.cpp:1467
+msgid "A&dd..."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:332
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSingleLineLimit)
-#. i18n: file: printing/calprintmonthconfig_base.ui:226
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSingleLineLimit)
-#. i18n: file: printing/calprintdayconfig_base.ui:321
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mSingleLineLimit)
-#: rc.cpp:1363 rc.cpp:1459 rc.cpp:1684
-msgid "Check this option to limit events to a single line."
+#. i18n: file: accountscalendarwidget.ui:39
+#. i18n: ectx: property (text), widget (KPushButton, mModifyAccountButton)
+#: rc.cpp:1470
+msgid "&Modify..."
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:335
-#. i18n: ectx: property (text), widget (QCheckBox, mSingleLineLimit)
-#. i18n: file: printing/calprintmonthconfig_base.ui:229
-#. i18n: ectx: property (text), widget (QCheckBox, mSingleLineLimit)
-#. i18n: file: printing/calprintdayconfig_base.ui:324
-#. i18n: ectx: property (text), widget (QCheckBox, mSingleLineLimit)
-#: rc.cpp:1366 rc.cpp:1462 rc.cpp:1687
-msgid "Limit events in each day to a &single line"
+#. i18n: file: accountscalendarwidget.ui:49
+#. i18n: ectx: property (text), widget (KPushButton, mRemoveAccountButton)
+#: rc.cpp:1473
+msgid "R&emove"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:342
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
-#. i18n: file: printing/calprintmonthconfig_base.ui:236
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
-#: rc.cpp:1369 rc.cpp:1465
-msgid ""
-"The timetable view supports colors. If you want to make use of colors you "
-"should check this option. The category colors will be used."
+#. i18n: file: multiagendaviewconfigwidget.ui:17
+#. i18n: ectx: property (text), widget (QRadioButton, useDefaultRB)
+#: rc.cpp:1476
+msgid "Show one calendar per agenda column"
 msgstr ""
 
-#. i18n: file: printing/calprintweekconfig_base.ui:345
-#. i18n: ectx: property (text), widget (QCheckBox, mColors)
-#. i18n: file: printing/calprintmonthconfig_base.ui:239
-#. i18n: ectx: property (text), widget (QCheckBox, mColors)
-#. i18n: file: printing/calprintdayconfig_base.ui:334
-#. i18n: ectx: property (text), widget (QCheckBox, mColors)
-#. i18n: file: printing/calprintincidenceconfig_base.ui:81
-#. i18n: ectx: property (text), widget (QCheckBox, mColors)
-#: rc.cpp:1372 rc.cpp:1468 rc.cpp:1693 rc.cpp:1726
-msgid "&Use colors"
-msgstr "&Defnyddio lliwiau"
-
-#. i18n: file: printing/calprintmonthconfig_base.ui:21
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1375
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Print month options:</span></p></body></html>"
+#. i18n: file: multiagendaviewconfigwidget.ui:27
+#. i18n: ectx: property (text), widget (QRadioButton, useCustomRB)
+#: rc.cpp:1479
+msgid "Use custom calendar setup"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLabel, mFromDateLabel)
-#. i18n: file: printing/calprintmonthconfig_base.ui:62
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mFromMonth)
-#. i18n: file: printing/calprintmonthconfig_base.ui:69
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mFromYear)
-#. i18n: file: printing/calprintmonthconfig_base.ui:95
-#. i18n: ectx: property (whatsThis), widget (KComboBox, mToMonth)
-#. i18n: file: printing/calprintmonthconfig_base.ui:102
-#. i18n: ectx: property (whatsThis), widget (KIntSpinBox, mToYear)
-#: rc.cpp:1384 rc.cpp:1390 rc.cpp:1393 rc.cpp:1402 rc.cpp:1405
-msgid ""
-"When you want to print more months at once, you can define a month range. "
-"This option defines the first month to be printed. Use the option <i>End "
-"month</i> to define the last month in this range."
+#. i18n: file: multiagendaviewconfigwidget.ui:36
+#. i18n: ectx: property (text), widget (QLabel, columnNumberLabel)
+#: rc.cpp:1482
+msgid "Number of columns"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:52
-#. i18n: ectx: property (text), widget (QLabel, mFromDateLabel)
-#: rc.cpp:1387
-msgid "&Start month:"
-msgstr "Mis dec&hrau:"
-
-#. i18n: file: printing/calprintmonthconfig_base.ui:82
-#. i18n: ectx: property (whatsThis), widget (QLabel, mToDateLabel)
-#: rc.cpp:1396
-msgid ""
-"When you want to print more months at once, you can define a month range. "
-"This option defines the last month to be printed. Use the option <i>Start "
-"month</i> to define the first month in this range."
+#. i18n: file: multiagendaviewconfigwidget.ui:84
+#. i18n: ectx: property (text), widget (QLabel, titleLabel)
+#: rc.cpp:1485
+msgid "Title"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:85
-#. i18n: ectx: property (text), widget (QLabel, mToDateLabel)
-#: rc.cpp:1399
-msgid "&End month:"
-msgstr "&Mis gorffen:"
-
-#. i18n: file: printing/calprintmonthconfig_base.ui:163
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mWeekNumbers)
-#: rc.cpp:1423
-msgid "Enable this to print week numbers at the left of each row."
+#. i18n: file: multiagendaviewconfigwidget.ui:102
+#. i18n: ectx: property (text), widget (QLabel, selectedCalendarsLabel)
+#: rc.cpp:1488
+msgid "Selected Calendars"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:166
-#. i18n: ectx: property (text), widget (QCheckBox, mWeekNumbers)
-#: rc.cpp:1426
-msgid "Print week &numbers"
-msgstr "Argra&ffu rhifau wythnos"
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:21
+#. i18n: ectx: property (title), widget (QGroupBox, mDateRangeGroup)
+#: rc.cpp:1491
+msgid "Yearly Print Options"
+msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:173
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mRecurDaily)
-#: rc.cpp:1429
-msgid ""
-"With this option it is possible to leave out the daily recurring to-dos and "
-"events in the print. They take a lot of space and make the month view "
-"needlessly complicated."
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:33
+#. i18n: ectx: property (text), widget (QLabel, mYearLabel)
+#: rc.cpp:1494
+msgid "Print &year:"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:176
-#. i18n: ectx: property (text), widget (QCheckBox, mRecurDaily)
-#: rc.cpp:1432
-msgid "Print daily re&curring to-dos and events"
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:46
+#. i18n: ectx: property (text), widget (QLabel, mPagesLabel)
+#: rc.cpp:1497
+msgid "Number of &pages:"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:183
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mRecurWeekly)
-#: rc.cpp:1435
-msgid ""
-"Similar to \"Print daily recurring to-dos and events\". Weekly to-dos and "
-"events will be omitted when making a print of the selected month."
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:110
+#. i18n: ectx: property (title), widget (QGroupBox, mDisplayOptionsGroup)
+#: rc.cpp:1500
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:186
-#. i18n: ectx: property (text), widget (QCheckBox, mRecurWeekly)
-#: rc.cpp:1438
-msgid "Print weekl&y recurring to-dos and events"
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:119
+#. i18n: ectx: property (text), widget (QLabel, mSubDaysLabel)
+#: rc.cpp:1503
+msgid "Show sub-day events as:"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:216
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
-#: rc.cpp:1453
-msgid "Check this option to show note lines."
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:129
+#. i18n: ectx: property (text), widget (QLabel, mHolidaysLabel)
+#: rc.cpp:1506
+msgid "Show holidays as:"
 msgstr ""
 
-#. i18n: file: printing/calprintmonthconfig_base.ui:219
-#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
-#. i18n: file: printing/calprintdayconfig_base.ui:314
-#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
-#. i18n: file: printing/calprintincidenceconfig_base.ui:71
-#. i18n: ectx: property (text), widget (QCheckBox, mShowNoteLines)
-#: rc.cpp:1456 rc.cpp:1681 rc.cpp:1720
-msgid "Show note &lines"
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:148
+#. i18n: ectx: property (text), item, widget (KComboBox, mSubDays)
+#. i18n: file: plugins/printing/year/calprintyearconfig_base.ui:162
+#. i18n: ectx: property (text), item, widget (KComboBox, mHolidays)
+#: rc.cpp:1512 rc.cpp:1518
+msgid "Time Boxes"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:21
+#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:36
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1471
+#: rc.cpp:1521
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -6847,323 +6918,253 @@
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Print to-dos options:</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: printing/calprinttodoconfig_base.ui:30
-#. i18n: ectx: property (text), widget (QLabel, mTitleLabel)
-#: rc.cpp:1477
-msgid "&Title:"
-msgstr "&Teitl:"
-
-#. i18n: file: printing/calprinttodoconfig_base.ui:49
-#. i18n: ectx: property (title), widget (QGroupBox, mPrintType)
-#: rc.cpp:1483
-msgid "To-dos to Print"
-msgstr ""
-
-#. i18n: file: printing/calprinttodoconfig_base.ui:58
-#. i18n: ectx: property (text), widget (QRadioButton, mPrintAll)
-#: rc.cpp:1486
-msgid "Print &all to-dos"
+"weight:600;\">Print journal options:</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:71
-#. i18n: ectx: property (text), widget (QRadioButton, mPrintUnfinished)
-#: rc.cpp:1489
-msgid "Print &unfinished to-dos only"
+#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:49
+#. i18n: ectx: property (text), widget (QRadioButton, mAllJournals)
+#: rc.cpp:1530
+msgid "&All journal entries"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:81
-#. i18n: ectx: property (text), widget (QRadioButton, mPrintDueRange)
-#: rc.cpp:1492
-msgid "Print only to-dos due in the &range:"
+#. i18n: file: plugins/printing/journal/calprintjournalconfig_base.ui:59
+#. i18n: ectx: property (text), widget (QRadioButton, mRangeJournals)
+#: rc.cpp:1533
+msgid "Date &range:"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:148
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mFromDate)
-#. i18n: file: printing/calprintdayconfig_base.ui:37
-#. i18n: ectx: property (whatsThis), widget (QLabel, mFromDateLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:53
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mFromDate)
-#: rc.cpp:1498 rc.cpp:1570 rc.cpp:1576
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>End date</i> option. This option is used to define "
-"the start date."
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:105
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:1560
+msgid "Print Incidences of Type"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:185
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mToDate)
-#. i18n: file: printing/calprintdayconfig_base.ui:111
-#. i18n: ectx: property (whatsThis), widget (QLabel, mToDateLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:127
-#. i18n: ectx: property (whatsThis), widget (KPIM::KDateEdit, mToDate)
-#: rc.cpp:1507 rc.cpp:1594 rc.cpp:1600
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>Start date</i> option. This option is used to define "
-"the end date."
+#. i18n: file: plugins/printing/list/calprintlistconfig_base.ui:124
+#. i18n: ectx: property (text), widget (QCheckBox, mTodos)
+#: rc.cpp:1566
+msgid "&To-dos"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:218
-#. i18n: ectx: property (title), widget (QGroupBox, includeInfoBox)
-#. i18n: file: printing/calprintincidenceconfig_base.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, mComponentsGroup)
-#: rc.cpp:1513 rc.cpp:1702
-msgid "Include Information"
+#. i18n: file: htmlexportsettings.kcfg:13
+#. i18n: ectx: label, entry, group ($(application)-General)
+#. i18n: file: htmlexportsettings.kcfg:14
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1572 rc.cpp:1575
+msgid "Full name of the calendar owner"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:230
-#. i18n: ectx: property (text), widget (QCheckBox, mDescription)
-#: rc.cpp:1516
-msgid "&Description"
-msgstr "&Disgrifiad"
+#. i18n: file: htmlexportsettings.kcfg:17
+#. i18n: ectx: label, entry, group ($(application)-General)
+#. i18n: file: htmlexportsettings.kcfg:18
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1578 rc.cpp:1581
+msgid "Email of the calendar owner"
+msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:240
-#. i18n: ectx: property (text), widget (QCheckBox, mPriority)
-#: rc.cpp:1519
-msgid "&Priority"
-msgstr "&Blaenoriaeth"
+#. i18n: file: htmlexportsettings.kcfg:21
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1584
+msgid "Creator application"
+msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:250
-#. i18n: ectx: property (text), widget (QCheckBox, mDueDate)
-#: rc.cpp:1522
-msgid "Due date"
-msgstr "Dyddiad Disgwyliedig"
+#. i18n: file: htmlexportsettings.kcfg:22
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1587
+msgid "Creator application of the calendar"
+msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:263
-#. i18n: ectx: property (text), widget (QCheckBox, mPercentComplete)
-#: rc.cpp:1525
-msgid "Per&centage completed"
+#. i18n: file: htmlexportsettings.kcfg:25
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1590
+msgid "Creator URL"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:280
-#. i18n: ectx: property (title), widget (QGroupBox, otherOptionsBox)
-#: rc.cpp:1528
-msgid "Other Options"
+#. i18n: file: htmlexportsettings.kcfg:26
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1593
+msgid "URL of the creator application of the calendar."
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:289
-#. i18n: ectx: property (text), widget (QCheckBox, mConnectSubTodos)
-#: rc.cpp:1531
-msgid "Co&nnect sub-to-dos with its parent"
+#. i18n: file: htmlexportsettings.kcfg:30
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1596
+msgid "Page Title"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:299
-#. i18n: ectx: property (text), widget (QCheckBox, mStrikeOutCompleted)
-#: rc.cpp:1534
-msgid "Strike &out completed to-do summaries"
+#. i18n: file: htmlexportsettings.kcfg:35
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1599
+msgid "Date start"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:344
-#. i18n: ectx: property (title), widget (QGroupBox, sortingOptionsBox)
-#: rc.cpp:1552
-msgid "Sorting Options"
+#. i18n: file: htmlexportsettings.kcfg:36
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1602
+msgid "First day of the range that shall be exported to HTML."
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:358
-#. i18n: ectx: property (text), widget (QLabel, sortFieldLabel)
-#: rc.cpp:1555
-msgid "Sort field:"
+#. i18n: file: htmlexportsettings.kcfg:39
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1605
+msgid "Date end"
 msgstr ""
 
-#. i18n: file: printing/calprinttodoconfig_base.ui:385
-#. i18n: ectx: property (text), widget (QLabel, sortDirectionLabel)
-#: rc.cpp:1558
-msgid "Sort direction:"
+#. i18n: file: htmlexportsettings.kcfg:40
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1608
+msgid "Last day of the range that shall be exported to HTML."
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:21
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1561
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Print day options:</span></p></body></html>"
+#. i18n: file: htmlexportsettings.kcfg:44
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1611
+msgid "Output filename"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:65
-#. i18n: ectx: property (whatsThis), widget (QLabel, mFromTimeLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:78
-#. i18n: ectx: property (whatsThis), widget (QTimeEdit, mFromTime)
-#: rc.cpp:1582 rc.cpp:1588
-msgid ""
-"It is possible to print only those events which are inside a given "
-"timerange. With this time selection box you can define the start of this "
-"time range. The end time should be defined with the <i>End time</i> option. "
-"Note you can automatically modify these settings if you check <i>Extend time "
-"range to include all events</i>."
+#. i18n: file: htmlexportsettings.kcfg:45
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1614
+msgid "The output file name for the HTML export."
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:139
-#. i18n: ectx: property (whatsThis), widget (QLabel, mToTimeLabel)
-#. i18n: file: printing/calprintdayconfig_base.ui:152
-#. i18n: ectx: property (whatsThis), widget (QTimeEdit, mToTime)
-#: rc.cpp:1606 rc.cpp:1612
-msgid ""
-"It is possible to print only those events which are inside a given "
-"timerange. With this time selection box you can define the end of this time "
-"range. The start time should be defined with the <i>Start time</i> option. "
-"Note you can automatically modify these settings if you check <i>Extend time "
-"range to include all events</i>."
+#. i18n: file: htmlexportsettings.kcfg:49
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1617
+msgid "Style sheet"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:185
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeAllEvents)
-#: rc.cpp:1618
+#. i18n: file: htmlexportsettings.kcfg:50
+#. i18n: ectx: whatsthis, entry, group ($(application)-General)
+#: rc.cpp:1620
 msgid ""
-"Check this option to automatically determine the required time range, so all "
-"events will be shown."
+"CSS style sheet to be used by the final HTML page. This string contains the "
+"actual contents of the CSS, not a path to the style sheet."
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:188
-#. i18n: ectx: property (text), widget (QCheckBox, mIncludeAllEvents)
-#: rc.cpp:1621
-msgid "E&xtend time range to include all events"
-msgstr "&Estyn yr amrediad amser i gynnwys pob ddigwyddiad"
+#. i18n: file: htmlexportsettings.kcfg:54
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1623
+msgid "Exclude private incidences from the export"
+msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:207
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeFilofax)
-#: rc.cpp:1627
-msgid ""
-"The Filofax format prints the information for the days selected without a "
-"timeline."
+#. i18n: file: htmlexportsettings.kcfg:58
+#. i18n: ectx: label, entry, group ($(application)-General)
+#: rc.cpp:1626
+msgid "Exclude confidential incidences from the export"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:210
-#. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeFilofax)
-#: rc.cpp:1630
-msgid "Print date range as &Filofax format, all on one page"
+#. i18n: file: htmlexportsettings.kcfg:66
+#. i18n: ectx: label, entry, group ($(application)-Events)
+#: rc.cpp:1629
+msgid "Export events as list"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:217
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeTimetable)
-#: rc.cpp:1633
-msgid "The timetable print view has the times to the left of the page"
+#. i18n: file: htmlexportsettings.kcfg:70
+#. i18n: ectx: label, entry, group ($(application)-Events)
+#: rc.cpp:1632
+msgid "Export in month view"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:220
-#. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeTimetable)
-#: rc.cpp:1636
-msgid "Print as &timetable view, one page per day"
+#. i18n: file: htmlexportsettings.kcfg:74
+#. i18n: ectx: label, entry, group ($(application)-Events)
+#: rc.cpp:1635
+msgid "Export in week view"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:230
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, mPrintTypeSingleTimetable)
-#: rc.cpp:1639
-msgid ""
-"The timetable print view has the times to the left of the page, all days are "
-"printed as columns in one big timetable."
+#. i18n: file: htmlexportsettings.kcfg:78
+#. i18n: ectx: label, entry (EventTitle), group ($(application)-Events)
+#: rc.cpp:1638
+msgid "Title of the calendar"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:233
-#. i18n: ectx: property (text), widget (QRadioButton, mPrintTypeSingleTimetable)
-#: rc.cpp:1642
-msgid "Print as timetable view, all days on a single page"
+#. i18n: file: htmlexportsettings.kcfg:83
+#. i18n: ectx: label, entry (EventLocation), group ($(application)-Events)
+#: rc.cpp:1641
+msgid "Export location of the events"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:291
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mIncludeTodos)
-#: rc.cpp:1666
-msgid ""
-"You should check this option if you want to print to-dos which are due on "
-"one of the dates which are in the supplied date range."
+#. i18n: file: htmlexportsettings.kcfg:87
+#. i18n: ectx: label, entry (EventCategories), group ($(application)-Events)
+#: rc.cpp:1644
+msgid "Export categories of the events"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:311
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
-#: rc.cpp:1678
-msgid "Check this option to draw note lines "
+#. i18n: file: htmlexportsettings.kcfg:91
+#. i18n: ectx: label, entry (EventAttendees), group ($(application)-Events)
+#: rc.cpp:1647
+msgid "Export attendees of the events"
 msgstr ""
 
-#. i18n: file: printing/calprintdayconfig_base.ui:331
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
-#. i18n: file: printing/calprintincidenceconfig_base.ui:78
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mColors)
-#: rc.cpp:1690 rc.cpp:1723
-msgid ""
-"If you want to use colors to distinguish certain categories on the print, "
-"check this option."
+#. i18n: file: htmlexportsettings.kcfg:99
+#. i18n: ectx: label, entry, group ($(application)-Todos)
+#: rc.cpp:1650
+msgid "Export to-do list"
 msgstr ""
 
-#. i18n: file: printing/calprintincidenceconfig_base.ui:21
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1696
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Print incidence options:</span></p></body></html>"
+#. i18n: file: htmlexportsettings.kcfg:103
+#. i18n: ectx: label, entry, group ($(application)-Todos)
+#: rc.cpp:1653
+msgid "Title of the to-do list"
 msgstr ""
 
-#. i18n: file: printing/calprintincidenceconfig_base.ui:37
-#. i18n: ectx: property (text), widget (QCheckBox, mShowDetails)
-#: rc.cpp:1705
-msgid "Detai&ls (visiblility, secrecy, etc.)"
+#. i18n: file: htmlexportsettings.kcfg:108
+#. i18n: ectx: label, entry (TaskDueDate), group ($(application)-Todos)
+#: rc.cpp:1656
+msgid "Export due dates of the to-dos"
 msgstr ""
 
-#. i18n: file: printing/calprintincidenceconfig_base.ui:44
-#. i18n: ectx: property (text), widget (QCheckBox, mShowAttendees)
-#: rc.cpp:1708
-msgid "&Attendees"
+#. i18n: file: htmlexportsettings.kcfg:112
+#. i18n: ectx: label, entry (TaskLocation), group ($(application)-Todos)
+#: rc.cpp:1659
+msgid "Export location of the to-dos"
 msgstr ""
 
-#. i18n: file: printing/calprintincidenceconfig_base.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, mShowSubitemsNotes)
-#: rc.cpp:1711
-msgid "&Notes, subitems"
+#. i18n: file: htmlexportsettings.kcfg:116
+#. i18n: ectx: label, entry (TaskCategories), group ($(application)-Todos)
+#: rc.cpp:1662
+msgid "Export categories of the to-dos"
 msgstr ""
 
-#. i18n: file: printing/calprintincidenceconfig_base.ui:58
-#. i18n: ectx: property (text), widget (QCheckBox, mShowAttachments)
-#: rc.cpp:1714
-msgid "Attach&ments"
-msgstr "Atodia&dau"
+#. i18n: file: htmlexportsettings.kcfg:120
+#. i18n: ectx: label, entry (TaskAttendees), group ($(application)-Todos)
+#: rc.cpp:1665
+msgid "Export attendees of the to-dos"
+msgstr ""
 
-#. i18n: file: printing/calprintincidenceconfig_base.ui:68
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, mShowNoteLines)
-#: rc.cpp:1717
-msgid "Draw note lines in empty area"
+#. i18n: file: htmlexportsettings.kcfg:128
+#. i18n: ectx: label, entry, group ($(application)-Journals)
+#. i18n: file: htmlexportsettings.kcfg:139
+#. i18n: ectx: label, entry, group ($(application)-FreeBusy)
+#: rc.cpp:1668 rc.cpp:1674
+msgid "Export journals"
 msgstr ""
 
-#. i18n: file: multiagendaviewconfigwidget.ui:17
-#. i18n: ectx: property (text), widget (QRadioButton, useDefaultRB)
-#: rc.cpp:1729
-msgid "Show one calendar per agenda column"
+#. i18n: file: htmlexportsettings.kcfg:132
+#. i18n: ectx: label, entry, group ($(application)-Journals)
+#: rc.cpp:1671
+msgid "Title of the journal list"
 msgstr ""
 
-#. i18n: file: multiagendaviewconfigwidget.ui:27
-#. i18n: ectx: property (text), widget (QRadioButton, useCustomRB)
-#: rc.cpp:1732
-msgid "Use custom calendar setup"
+#. i18n: file: htmlexportsettings.kcfg:143
+#. i18n: ectx: label, entry (FreeBusyTitle), group ($(application)-FreeBusy)
+#: rc.cpp:1677
+msgid "Title of the free/busy list"
 msgstr ""
 
-#. i18n: file: multiagendaviewconfigwidget.ui:36
-#. i18n: ectx: property (text), widget (QLabel, columnNumberLabel)
-#: rc.cpp:1735
-msgid "Number of columns"
+#. i18n: file: htmlexportsettings.kcfg:133
+#: rc.cpp:1685
+msgid "Journals"
 msgstr ""
 
-#. i18n: file: multiagendaviewconfigwidget.ui:84
-#. i18n: ectx: property (text), widget (QLabel, titleLabel)
-#: rc.cpp:1738
-msgid "Title"
+#. i18n: file: htmlexportsettings.kcfg:144
+#: rc.cpp:1687
+msgid "Busy times"
 msgstr ""
 
-#. i18n: file: multiagendaviewconfigwidget.ui:102
-#. i18n: ectx: property (text), widget (QLabel, selectedCalendarsLabel)
-#: rc.cpp:1741
-msgid "Selected Calendars"
+#. i18n: file: viewconfigurationwidget.ui:29
+#. i18n: ectx: property (text), widget (QCheckBox, useCustomCalendarSelection)
+#: rc.cpp:1690
+msgid "Show custom calendars"
 msgstr ""
 
 #. i18n: file: tips:2
@@ -7172,10 +7173,9 @@
 msgid ""
 "<p>...that you can select whether the week starts on Monday or on Sunday in "
 "the System Settings? KOrganizer uses this setting. Look at \n"
-"Regional & Language->Country/Region & Languages in the System Settings, or "
-"select <b>Settings</b>,\n"
-"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
-"tab.\n"
+"Locale->Country/Region & Languages in the System Settings, or select "
+"<b>Settings</b>,\n"
+"<b>Configure Date & Time...</b> from the menu bar. Select the Calendar tab.\n"
 "</p>\n"
 msgstr ""
 
@@ -7267,12 +7267,13 @@
 #: tips.cpp:59
 msgid ""
 "<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
-"menu and choose <b>Purge Completed</b>.\n"
+"menu and choose <b>Purge Completed To-dos</b>.\n"
+"</p>\n"
 msgstr ""
 
 #. i18n: file: tips:74
 #. i18n: ectx: @info:tipoftheday
-#: tips.cpp:64
+#: tips.cpp:65
 msgid ""
 "<p>...that you can create a new sub-to-do by pasting a to-do while another "
 "one is selected?\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpartloader.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpartloader.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpartloader.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpartloader.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdesdk\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2010-12-23 08:49+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:24+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kpartloader.cpp:38
 msgid "&Quit"
@@ -40,6 +40,6 @@
 
 #. i18n: file: kpartloaderui.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:6
+#: rc.cpp:3
 msgid "&File"
 msgstr "&Ffeil"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpartsaver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpartsaver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpartsaver.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpartsaver.po	2012-04-18 08:59:23.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeartwork/kpartsaver.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 15:58+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-02-15 21:56+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kpartsaver.cpp:86
 msgid "KPart Screen Saver"
@@ -36,78 +36,78 @@
 msgid "Select Media Files"
 msgstr ""
 
-#: rc.cpp:34
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:,Thierry Vignaud"
 
-#: rc.cpp:35
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ",,"
 
 #. i18n: file: configwidget.ui:23
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:3 rc.cpp:38
+#: rc.cpp:5
 msgid "Files"
 msgstr ""
 
 #. i18n: file: configwidget.ui:49
 #. i18n: ectx: property (text), widget (QPushButton, m_down)
-#: rc.cpp:6 rc.cpp:41
+#: rc.cpp:8
 msgid "&Down"
 msgstr "I &Lawr"
 
 #. i18n: file: configwidget.ui:59
 #. i18n: ectx: property (text), widget (QPushButton, m_up)
-#: rc.cpp:9 rc.cpp:44
+#: rc.cpp:11
 msgid "&Up"
 msgstr "I &Fyny"
 
 #. i18n: file: configwidget.ui:66
 #. i18n: ectx: property (text), widget (QPushButton, m_add)
-#: rc.cpp:12 rc.cpp:47
+#: rc.cpp:14
 msgid "&Add..."
 msgstr "Ychw&anegu..."
 
 #. i18n: file: configwidget.ui:76
 #. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#: rc.cpp:15 rc.cpp:50
+#: rc.cpp:17
 msgid "&Remove"
 msgstr ""
 
 #. i18n: file: configwidget.ui:104
 #. i18n: ectx: property (title), widget (QGroupBox, ButtonGroup1)
-#: rc.cpp:18 rc.cpp:53
+#: rc.cpp:20
 msgid "Settings"
 msgstr "Gosodiadau"
 
 #. i18n: file: configwidget.ui:116
 #. i18n: ectx: property (text), widget (QRadioButton, m_single)
-#: rc.cpp:21 rc.cpp:56
+#: rc.cpp:23
 msgid "Only show one randomly chosen medium"
 msgstr ""
 
 #. i18n: file: configwidget.ui:139
 #. i18n: ectx: property (text), widget (QRadioButton, m_multiple)
-#: rc.cpp:24 rc.cpp:59
+#: rc.cpp:26
 msgid "Switch to another medium after a delay"
 msgstr ""
 
 #. i18n: file: configwidget.ui:157
 #. i18n: ectx: property (text), widget (QLabel, m_delayLabel)
-#: rc.cpp:27 rc.cpp:62
+#: rc.cpp:29
 msgid "Delay:"
 msgstr "Oedi:"
 
 #. i18n: file: configwidget.ui:177
 #. i18n: ectx: property (text), widget (QCheckBox, m_random)
-#: rc.cpp:30 rc.cpp:65
+#: rc.cpp:32
 msgid "Choose next medium randomly"
 msgstr ""
 
 #. i18n: file: configwidget.ui:187
 #. i18n: ectx: property (text), widget (QLabel, m_secondsLabel)
-#: rc.cpp:33 rc.cpp:68
+#: rc.cpp:35
 msgid "seconds"
 msgstr "eiliad"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpasswdserver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpasswdserver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpasswdserver.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpasswdserver.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,28 +7,28 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 01:50+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:27+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kpasswdserver.cpp:535
+#: kpasswdserver.cpp:539
 msgid "Do you want to retry?"
 msgstr "Dach chi eisiau i ceisio eto?"
 
-#: kpasswdserver.cpp:537
+#: kpasswdserver.cpp:541
 msgid "Authentication"
 msgstr "Dilysiad"
 
-#: kpasswdserver.cpp:537
+#: kpasswdserver.cpp:541
 msgid "Retry"
 msgstr "Ceisio eto"
 
-#: kpasswdserver.cpp:584
+#: kpasswdserver.cpp:592
 msgid "Authorization Dialog"
 msgstr "Ymgom Awdurdodi"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpat.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpat.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kpat.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kpat.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: kpat\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 18:37+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,69 +18,69 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: clock.cpp:150
 msgid "Grandfather's Clock"
 msgstr ""
 
-#: dealer.cpp:786
+#: dealer.cpp:794
 msgid "Congratulations! We have won."
 msgstr ""
 
-#: dealer.cpp:788
+#: dealer.cpp:796
 msgid "Congratulations! You have won."
 msgstr ""
 
-#: dealer.cpp:971 dealer.cpp:1275
+#: dealer.cpp:979 dealer.cpp:1283
 msgid "Solver: This game is winnable."
 msgstr ""
 
-#: dealer.cpp:977 dealer.cpp:1279
+#: dealer.cpp:985 dealer.cpp:1287
 msgid "Solver: This game is no longer winnable."
 msgstr ""
 
-#: dealer.cpp:979 dealer.cpp:1281
+#: dealer.cpp:987 dealer.cpp:1289
 msgid "Solver: This game cannot be won."
 msgstr ""
 
-#: dealer.cpp:984 dealer.cpp:1284
+#: dealer.cpp:992 dealer.cpp:1292
 msgid "Solver: Unable to determine if this game is winnable."
 msgstr ""
 
-#: dealer.cpp:1039
+#: dealer.cpp:1047
 msgid "Solver: This game is lost."
 msgstr ""
 
-#: dealer.cpp:1260
+#: dealer.cpp:1268
 msgid "Solver: Calculating..."
 msgstr ""
 
-#: dealer.cpp:1708
+#: dealer.cpp:1712
 msgid ""
 "A new game has been requested, but there is already a game in progress.\n"
 "\n"
 "A loss will be recorded in the statistics if the current game is abandoned."
 msgstr ""
 
-#: dealer.cpp:1710
+#: dealer.cpp:1714
 msgid "Abandon Current Game?"
 msgstr ""
 
-#: dealer.cpp:1711
+#: dealer.cpp:1715
 msgid "Abandon Current Game"
 msgstr ""
 
-#: fortyeight.cpp:209
+#: fortyeight.cpp:246
 msgid "Forty & Eight"
 msgstr ""
 
-#: freecell.cpp:405
+#: freecell.cpp:262
 msgid "Freecell"
 msgstr ""
 
-#: golf.cpp:169
+#: golf.cpp:171
 msgid "Golf"
 msgstr ""
 
@@ -88,306 +88,306 @@
 msgid "Grandfather"
 msgstr ""
 
-#: gypsy.cpp:169
+#: gypsy.cpp:170
 msgid "Gypsy"
 msgstr ""
 
-#: idiot.cpp:246
+#: idiot.cpp:247
 msgid "Aces Up"
 msgstr ""
 
-#: klondike.cpp:135
+#: klondike.cpp:136
 msgid "Klondike &Options"
 msgstr ""
 
-#: klondike.cpp:136
+#: klondike.cpp:137
 msgid "Draw 1"
 msgstr ""
 
-#: klondike.cpp:137
+#: klondike.cpp:138
 msgid "Draw 3"
 msgstr ""
 
-#: klondike.cpp:333
+#: klondike.cpp:341
 msgid "Klondike"
 msgstr ""
 
-#: klondike.cpp:335
+#: klondike.cpp:343
 msgid "Klondike (Draw 1)"
 msgstr ""
 
-#: klondike.cpp:336
+#: klondike.cpp:344
 msgid "Klondike (Draw 3)"
 msgstr ""
 
-#: main.cpp:106
+#: main.cpp:105
 msgid "KPatience"
 msgstr "KPatience"
 
-#: main.cpp:108
+#: main.cpp:107
 msgid "KDE Patience Game"
 msgstr "Gêm Patience KDE"
 
-#: main.cpp:110
+#: main.cpp:109
 msgid ""
 "© 1995 Paul Olav Tvete\n"
 "© 2000 Stephan Kulow"
 msgstr ""
 
-#: main.cpp:114
+#: main.cpp:113
 msgid "Paul Olav Tvete"
 msgstr ""
 
-#: main.cpp:115
+#: main.cpp:114
 msgid "Author of original Qt version"
 msgstr ""
 
-#: main.cpp:117
+#: main.cpp:116
 msgid "Mario Weilguni"
 msgstr ""
 
-#: main.cpp:118
+#: main.cpp:117
 msgid "Initial KDE port"
 msgstr ""
 
-#: main.cpp:120
+#: main.cpp:119
 msgid "Matthias Ettrich"
 msgstr ""
 
-#: main.cpp:123
+#: main.cpp:122
 msgid "Rodolfo Borges"
 msgstr ""
 
-#: main.cpp:124
+#: main.cpp:123
 msgid "New game types"
 msgstr ""
 
-#: main.cpp:126
+#: main.cpp:125
 msgid "Peter H. Ruegg"
 msgstr ""
 
-#: main.cpp:129
+#: main.cpp:128
 msgid "Michael Koch"
 msgstr ""
 
-#: main.cpp:130 main.cpp:151
+#: main.cpp:129 main.cpp:150
 msgid "Bug fixes"
 msgstr "Trwsio namau"
 
-#: main.cpp:132
+#: main.cpp:131
 msgid "Marcus Meissner"
 msgstr ""
 
-#: main.cpp:133
+#: main.cpp:132
 msgid "Shuffle algorithm for game numbers"
 msgstr "Algorithm cymysgu ar gyfer rhifau'r gêm"
 
-#: main.cpp:135
+#: main.cpp:134
 msgid "Tom Holroyd"
 msgstr ""
 
-#: main.cpp:136
+#: main.cpp:135
 msgid "Initial patience solver"
 msgstr ""
 
-#: main.cpp:138
+#: main.cpp:137
 msgid "Stephan Kulow"
 msgstr ""
 
-#: main.cpp:139
+#: main.cpp:138
 msgid "Rewrite and current maintainer"
 msgstr "Ail-ysgrifennwr a chynhaliwr cyfredol"
 
-#: main.cpp:141
+#: main.cpp:140
 msgid "Erik Sigra"
 msgstr ""
 
-#: main.cpp:142
+#: main.cpp:141
 msgid "Klondike improvements"
 msgstr ""
 
-#: main.cpp:144
+#: main.cpp:143
 msgid "Josh Metzler"
 msgstr ""
 
-#: main.cpp:145
+#: main.cpp:144
 msgid "Spider implementation"
 msgstr ""
 
-#: main.cpp:147
+#: main.cpp:146
 msgid "Maren Pakura"
 msgstr ""
 
-#: main.cpp:148
+#: main.cpp:147
 msgid "Documentation"
 msgstr "Dogfenniaeth"
 
-#: main.cpp:150
+#: main.cpp:149
 msgid "Inge Wallin"
 msgstr ""
 
-#: main.cpp:153
+#: main.cpp:152
 msgid "Simon Hürlimann"
 msgstr ""
 
-#: main.cpp:154
+#: main.cpp:153
 msgid "Menu and toolbar work"
 msgstr ""
 
-#: main.cpp:156
+#: main.cpp:155
 msgid "Parker Coates"
 msgstr ""
 
-#: main.cpp:157
+#: main.cpp:156
 msgid "Cleanup and polish"
 msgstr ""
 
-#: main.cpp:174
+#: main.cpp:173
 msgctxt "List separator"
 msgid ", "
 msgstr ""
 
-#: main.cpp:180
+#: main.cpp:179
 msgid "Try to find a solution to the given savegame"
 msgstr ""
 
-#: main.cpp:181
+#: main.cpp:180
 msgid "Dealer to solve (debug)"
 msgstr ""
 
-#: main.cpp:182
+#: main.cpp:181
 msgid "Game range start (default 0:INT_MAX)"
 msgstr ""
 
-#: main.cpp:183
+#: main.cpp:182
 msgid "Game range end (default start:start if start given)"
 msgstr ""
 
-#: main.cpp:184
+#: main.cpp:183
 #, kde-format
 msgid ""
 "Skip the selection screen and load a particular game type. Valid values are: "
 "%1"
 msgstr ""
 
-#: main.cpp:190
+#: main.cpp:184
 msgid "Directory with test cases"
 msgstr ""
 
-#: main.cpp:191
+#: main.cpp:185
 msgid "Generate random test cases"
 msgstr ""
 
-#: main.cpp:185
+#: main.cpp:186
 msgid "File to load"
 msgstr "Ffeil i lwytho"
 
-#: mainwindow.cpp:142
+#: mainwindow.cpp:150
 msgctxt "Start a new game of a different type"
 msgid "New &Game..."
 msgstr ""
 
-#: mainwindow.cpp:148
+#: mainwindow.cpp:156
 msgctxt "Start a new game of without changing the game type"
 msgid "New &Deal"
 msgstr ""
 
-#: mainwindow.cpp:154
+#: mainwindow.cpp:162
 msgctxt "Start a game by giving its particular number"
 msgid "New &Numbered Deal..."
 msgstr ""
 
-#: mainwindow.cpp:159
+#: mainwindow.cpp:167
 msgctxt "Replay the current deal from the start"
 msgid "Restart Deal"
 msgstr ""
 
-#: mainwindow.cpp:165
+#: mainwindow.cpp:173
 msgctxt "Start the game with the number one greater than the current one"
 msgid "Next Deal"
 msgstr ""
 
-#: mainwindow.cpp:174
+#: mainwindow.cpp:182
 msgctxt "Start the game with the number one less than the current one"
 msgid "Previous Deal"
 msgstr ""
 
 #. i18n: file: statisticsdialog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, GameStats)
-#: mainwindow.cpp:188 rc.cpp:9 rc.cpp:38 statisticsdialog.cpp:59
+#: mainwindow.cpp:196 rc.cpp:11 statisticsdialog.cpp:59
 msgid "Statistics"
 msgstr "Ystadegau"
 
-#: mainwindow.cpp:218
+#: mainwindow.cpp:226
 msgctxt ""
 "Take one or more cards from the deck, flip them, and place them in play"
 msgid "Dra&w"
 msgstr ""
 
-#: mainwindow.cpp:223
+#: mainwindow.cpp:231
 msgctxt "Deal a new row of cards from the deck"
 msgid "Dea&l Row"
 msgstr ""
 
-#: mainwindow.cpp:228
+#: mainwindow.cpp:236
 msgctxt "Collect the cards in play, shuffle them and redeal them"
 msgid "&Redeal"
 msgstr ""
 
-#: mainwindow.cpp:233
+#: mainwindow.cpp:241
 msgctxt "Automatically move cards to the foundation piles"
 msgid "Dro&p"
 msgstr ""
 
-#: mainwindow.cpp:242
+#: mainwindow.cpp:250
 msgid "Change Appearance..."
 msgstr ""
 
-#: mainwindow.cpp:246
+#: mainwindow.cpp:254
 msgid "&Enable Autodrop"
 msgstr "&Galluogi gostwng ymysgogol"
 
-#: mainwindow.cpp:251
+#: mainwindow.cpp:259
 msgid "E&nable Solver"
 msgstr ""
 
-#: mainwindow.cpp:256
+#: mainwindow.cpp:264
 msgid "Play &Sounds"
 msgstr ""
 
-#: mainwindow.cpp:261
+#: mainwindow.cpp:269
 msgid "&Remember State on Exit"
 msgstr ""
 
-#: mainwindow.cpp:278
+#: mainwindow.cpp:286
 msgid "Generate a theme preview image"
 msgstr ""
 
-#: mainwindow.cpp:283
+#: mainwindow.cpp:291
 msgid "Take Game Preview Snapshots"
 msgstr ""
 
-#: mainwindow.cpp:288
+#: mainwindow.cpp:296
 msgid "Random Cards"
 msgstr ""
 
-#: mainwindow.cpp:424
+#: mainwindow.cpp:432
 msgid "Card Deck"
 msgstr ""
 
-#: mainwindow.cpp:426
+#: mainwindow.cpp:434
 msgid "Select a card deck"
 msgstr ""
 
-#: mainwindow.cpp:430
+#: mainwindow.cpp:438
 msgid "Game Theme"
 msgstr ""
 
-#: mainwindow.cpp:432
+#: mainwindow.cpp:440
 msgid "Select a theme for non-card game elements"
 msgstr ""
 
-#: mainwindow.cpp:521
+#: mainwindow.cpp:529
 #, kde-format
 msgctxt ""
 "Is disabled and changes to \"Help &with Current Game\" when there is no "
@@ -395,38 +395,59 @@
 msgid "Help &with %1"
 msgstr ""
 
-#: mainwindow.cpp:555
+#: mainwindow.cpp:563
 msgctxt "Shown when there is no game open. Is always disabled."
 msgid "Help &with Current Game"
 msgstr ""
 
-#: mainwindow.cpp:843
-msgid "The saved game is of an unknown type."
+#: mainwindow.cpp:823
+msgid "Downloading file failed."
 msgstr ""
 
-#: mainwindow.cpp:848
-msgid "The file is not a KPatience saved game."
+#: mainwindow.cpp:832
+msgid "Opening file failed."
 msgstr ""
 
-#: mainwindow.cpp:853
-#, kde-format
-msgid ""
-"The following error occurred while reading the file:\n"
-"\"%1\""
+#: mainwindow.cpp:845
+msgid "Error reading XML file: "
 msgstr ""
 
-#: mainwindow.cpp:860
-msgid "Unable to load the saved game file."
+#: mainwindow.cpp:851
+msgid "File is not a valid KPat save."
 msgstr ""
 
-#: mainwindow.cpp:904
+#: mainwindow.cpp:859
+msgid "Unrecognized game id."
+msgstr ""
+
+#: mainwindow.cpp:888
+msgid "Load"
+msgstr ""
+
+#: mainwindow.cpp:909
+msgid "Save"
+msgstr ""
+
+#: mainwindow.cpp:922
+msgid "Error opening file for writing. Saving failed."
+msgstr ""
+
+#: mainwindow.cpp:932
+msgid "Unable to create temporary file. Saving failed."
+msgstr ""
+
+#: mainwindow.cpp:940
+msgid "Error uploading file. Saving failed."
+msgstr ""
+
+#: mainwindow.cpp:964
 #, kde-format
 msgid "1 move"
 msgid_plural "%1 moves"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mod3.cpp:231
+#: mod3.cpp:232
 msgid "Mod3"
 msgstr ""
 
@@ -436,7 +457,7 @@
 
 #. i18n: file: statisticsdialog.ui:33
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: numbereddealdialog.cpp:42 rc.cpp:12 rc.cpp:41
+#: numbereddealdialog.cpp:42 rc.cpp:14
 msgid "Game:"
 msgstr "Gêm:"
 
@@ -444,55 +465,55 @@
 msgid "Deal number:"
 msgstr ""
 
-#: rc.cpp:28
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, dylunio, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:29
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kpatui.rc:23
 #. i18n: ectx: Menu (move)
-#: rc.cpp:3 rc.cpp:32
+#: rc.cpp:5
 msgid "Move"
 msgstr ""
 
 #. i18n: file: kpatui.rc:43
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:6 rc.cpp:35
+#: rc.cpp:8
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: statisticsdialog.ui:75
 #. i18n: ectx: property (text), widget (QLabel, textLabel7)
-#: rc.cpp:15 rc.cpp:44
+#: rc.cpp:17
 msgid "Longest winning streak:"
 msgstr "Cyfnod hiraf o ennill:"
 
 #. i18n: file: statisticsdialog.ui:82
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:18 rc.cpp:47
+#: rc.cpp:20
 msgid "Games played:"
 msgstr "Gêmau wedi'u chwarae:"
 
 #. i18n: file: statisticsdialog.ui:99
 #. i18n: ectx: property (text), widget (QLabel, textLabel8)
-#: rc.cpp:21 rc.cpp:50
+#: rc.cpp:23
 msgid "Longest losing streak:"
 msgstr "Cyfnod hiraf o golli:"
 
 #. i18n: file: statisticsdialog.ui:116
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:24 rc.cpp:53
+#: rc.cpp:26
 msgid "Games won:"
 msgstr "Gemau wedi'u hennill:"
 
 #. i18n: file: statisticsdialog.ui:133
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:27 rc.cpp:56
+#: rc.cpp:29
 msgid "Current streak:"
 msgstr ""
 
@@ -500,35 +521,35 @@
 msgid "Simple Simon"
 msgstr ""
 
-#: spider.cpp:114
+#: spider.cpp:129
 msgid "Spider &Options"
 msgstr ""
 
-#: spider.cpp:115
+#: spider.cpp:130
 msgid "1 Suit (Easy)"
 msgstr ""
 
-#: spider.cpp:116
+#: spider.cpp:131
 msgid "2 Suits (Medium)"
 msgstr ""
 
-#: spider.cpp:117
+#: spider.cpp:132
 msgid "4 Suits (Hard)"
 msgstr ""
 
-#: spider.cpp:481
+#: spider.cpp:474
 msgid "Spider"
 msgstr ""
 
-#: spider.cpp:483
+#: spider.cpp:476
 msgid "Spider (1 Suit)"
 msgstr ""
 
-#: spider.cpp:484
+#: spider.cpp:477
 msgid "Spider (2 Suit)"
 msgstr ""
 
-#: spider.cpp:485
+#: spider.cpp:478
 msgid "Spider (4 Suit)"
 msgstr ""
 
@@ -559,6 +580,6 @@
 msgid "Loading..."
 msgstr ""
 
-#: libkcardgame/kcardthemewidget.cpp:398
+#: libkcardgame/kcardthemewidget.cpp:399
 msgid "Get New Card Decks..."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kppplogview.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kppplogview.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kppplogview.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kppplogview.po	2012-04-18 08:59:25.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: kppplogview\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:57+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -20,8 +20,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: export.cpp:39
 msgid "CSV"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kppp.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kppp.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kppp.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kppp.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kppp\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:59+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: accounts.cpp:77 modems.cpp:78
 msgid "&Edit..."
@@ -1964,38 +1964,6 @@
 msgid "Resetting Modem"
 msgstr "Ail-osod y Modem"
 
-#: modem.cpp:126
-msgid "Unable to open modem."
-msgstr "Methu agor y modem."
-
-#: modem.cpp:133
-msgid "Unable to detect state of CD line."
-msgstr "Methu darganfod cyflwr y llinell CD."
-
-#: modem.cpp:139
-msgid "The modem is not ready."
-msgstr "Nid yw'r modem yn barod."
-
-#: modem.cpp:155 modem.cpp:203
-msgid "The modem is busy."
-msgstr "Mae'r modem yn brysur."
-
-#: modem.cpp:209
-msgid "Modem Ready."
-msgstr "Modem yn Barod."
-
-#: modem.cpp:221
-msgid "Can not restore tty settings: tcsetattr()\n"
-msgstr ""
-
-#: modem.cpp:373
-msgid "The modem does not respond."
-msgstr "Nid yw'r modem yn ymateb."
-
-#: modem.cpp:511
-msgid "Unknown speed"
-msgstr "Cyflymdra anhysbys"
-
 #: modemcmds.cpp:56
 msgid "Edit Modem Commands"
 msgstr "Golygu Gorchmynion y Modem"
@@ -2085,6 +2053,38 @@
 msgid "Volume off/low/high:"
 msgstr "Lefel sain i ffwrdd/isel/uchel:"
 
+#: modem.cpp:126
+msgid "Unable to open modem."
+msgstr "Methu agor y modem."
+
+#: modem.cpp:133
+msgid "Unable to detect state of CD line."
+msgstr "Methu darganfod cyflwr y llinell CD."
+
+#: modem.cpp:139
+msgid "The modem is not ready."
+msgstr "Nid yw'r modem yn barod."
+
+#: modem.cpp:155 modem.cpp:203
+msgid "The modem is busy."
+msgstr "Mae'r modem yn brysur."
+
+#: modem.cpp:209
+msgid "Modem Ready."
+msgstr "Modem yn Barod."
+
+#: modem.cpp:221
+msgid "Can not restore tty settings: tcsetattr()\n"
+msgstr ""
+
+#: modem.cpp:373
+msgid "The modem does not respond."
+msgstr "Nid yw'r modem yn ymateb."
+
+#: modem.cpp:511
+msgid "Unknown speed"
+msgstr "Cyflymdra anhysbys"
+
 #: modemdb.cpp:51
 msgid "Select Modem Type"
 msgstr "Dewis Math y Modem"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kquitapp.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kquitapp.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kquitapp.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kquitapp.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,54 +7,54 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-01 10:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:27+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kquitapp.cpp:28
+#: kquitapp.cpp:29
 msgid "Command-line application quitter"
 msgstr ""
 
-#: kquitapp.cpp:29
+#: kquitapp.cpp:30
 msgid "Quit a D-Bus enabled application easily"
 msgstr ""
 
-#: kquitapp.cpp:30
+#: kquitapp.cpp:31
 msgid "(c) 2006, Aaron Seigo"
 msgstr "(c) 2006, Aaron Seigo"
 
-#: kquitapp.cpp:31
+#: kquitapp.cpp:32
 msgid "Aaron J. Seigo"
 msgstr "Aaron J. Seigo"
 
-#: kquitapp.cpp:31
+#: kquitapp.cpp:32
 msgid "Current maintainer"
 msgstr "Cynhalwr cyfredol"
 
-#: kquitapp.cpp:35
+#: kquitapp.cpp:37
 msgid "Full service name, overrides application name provided"
 msgstr ""
 
-#: kquitapp.cpp:36
+#: kquitapp.cpp:38
 msgid "Path in the D-Bus interface to use"
 msgstr ""
 
-#: kquitapp.cpp:37
+#: kquitapp.cpp:39
 msgid "The name of the application to quit"
 msgstr ""
 
-#: kquitapp.cpp:64
+#: kquitapp.cpp:66
 #, kde-format
 msgid "Application %1 could not be found using service %2 and path %3."
 msgstr ""
 
-#: kquitapp.cpp:70
+#: kquitapp.cpp:72
 #, kde-format
 msgid ""
 "Quitting application %1 failed. Error reported was:\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krandr.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krandr.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krandr.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krandr.po	2012-04-18 08:59:38.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: krandr\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:06+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:41+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,43 +15,43 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:10+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:39+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: krandrmodule.cpp:46
+#: krandrmodule.cpp:47
 msgid ""
 "Your X server does not support resizing and rotating the display. Please "
 "update to version 4.3 or greater. You need the X Resize, Rotate, and Reflect "
 "extension (RANDR) version 1.1 or greater to use this feature."
 msgstr ""
 
-#: krandrtray.cpp:87
+#: krandrtray.cpp:94
 msgid "Required X Extension Not Available"
 msgstr "Nid yw'r Estyniad X Gofynnol ar Gael"
 
-#: krandrtray.cpp:104 legacyrandrconfig.cpp:38
+#: krandrtray.cpp:111 legacyrandrconfig.cpp:38
 #, kde-format
 msgid "Screen %1"
 msgstr "Sgrîn %1"
 
-#: krandrtray.cpp:127
+#: krandrtray.cpp:134
 msgid "Configure Display..."
 msgstr "Ffurfweddu Dangosydd..."
 
-#: krandrtray.cpp:145
+#: krandrtray.cpp:152
 msgid "Display"
 msgstr ""
 
-#: krandrtray.cpp:146
+#: krandrtray.cpp:153
 msgid "Resize, rotate and configure screens."
 msgstr ""
 
-#: krandrtray.cpp:163
+#: krandrtray.cpp:170
 #, kde-format
 msgid "Resolution: %1 x %2"
 msgstr ""
 
-#: krandrtray.cpp:178
+#: krandrtray.cpp:185
 #, kde-format
 msgid "Rotation: %1"
 msgstr ""
@@ -60,64 +60,64 @@
 msgid "Disabled"
 msgstr ""
 
-#: krandrtray.cpp:196
+#: krandrtray.cpp:218
 #, kde-format
 msgid "<td align=\"right\">Resolution: </td><td>%1 x %2</td></tr>"
 msgstr ""
 
-#: krandrtray.cpp:202
+#: krandrtray.cpp:224
 msgid "Refresh: "
 msgstr ""
 
-#: krandrtray.cpp:203 krandrtray.cpp:490 legacyrandrconfig.cpp:274
-#: legacyrandrscreen.cpp:246 outputconfig.cpp:424
+#: krandrtray.cpp:225 krandrtray.cpp:512 legacyrandrconfig.cpp:274
+#: legacyrandrscreen.cpp:246 outputconfig.cpp:501
 #, kde-format
 msgid "%1 Hz"
 msgstr ""
 
-#: krandrtray.cpp:211
+#: krandrtray.cpp:233
 msgid "Rotation: "
 msgstr ""
 
-#: krandrtray.cpp:248
+#: krandrtray.cpp:270
 msgid "Screen configuration has changed"
 msgstr "Newidwyd ffurfweddiad y sgrîn"
 
-#: krandrtray.cpp:283 krandrtray.cpp:408
+#: krandrtray.cpp:305 krandrtray.cpp:430
 msgid "Screen Size"
 msgstr "Maint y Sgrîn"
 
-#: krandrtray.cpp:291 krandrtray.cpp:357 krandrtray.cpp:421
+#: krandrtray.cpp:313 krandrtray.cpp:379 krandrtray.cpp:443
 msgid "Orientation"
 msgstr ""
 
-#: krandrtray.cpp:308
+#: krandrtray.cpp:330
 msgid "Outputs"
 msgstr ""
 
-#: krandrtray.cpp:324
+#: krandrtray.cpp:346
 #, kde-format
 msgid "%1 - Screen Size"
 msgstr ""
 
-#: krandrtray.cpp:341
+#: krandrtray.cpp:363
 msgid "Disable"
 msgstr ""
 
-#: krandrtray.cpp:367 krandrtray.cpp:430
+#: krandrtray.cpp:389 krandrtray.cpp:452
 msgid "Refresh Rate"
 msgstr "Graddfa Ailfywio"
 
-#: krandrtray.cpp:378
+#: krandrtray.cpp:400
 msgctxt "(checkbox) designate this output as the primary output"
 msgid "Primary output"
 msgstr ""
 
-#: krandrtray.cpp:396
+#: krandrtray.cpp:418
 msgid "Unify Outputs"
 msgstr ""
 
-#: krandrtray.cpp:584
+#: krandrtray.cpp:606
 msgid "Configure Display"
 msgstr "Ffurfweddu Dangosydd"
 
@@ -206,49 +206,49 @@
 msgid "Application is being auto-started at KDE session start"
 msgstr "Hunan-gyhwynnir y cymhwysiad wrth gychwyn y sesiwn KDE"
 
-#: outputconfig.cpp:211
+#: outputconfig.cpp:229
 msgid "Left of"
 msgstr ""
 
-#: outputconfig.cpp:212
+#: outputconfig.cpp:230
 msgid "Right of"
 msgstr ""
 
-#: outputconfig.cpp:213
+#: outputconfig.cpp:231
 msgctxt "Output is placed above another one"
 msgid "Above"
 msgstr ""
 
-#: outputconfig.cpp:214
+#: outputconfig.cpp:232
 msgctxt "Output is placed below another one"
 msgid "Below"
 msgstr ""
 
-#: outputconfig.cpp:215
+#: outputconfig.cpp:233
 msgid "Clone of"
 msgstr ""
 
-#: outputconfig.cpp:216
+#: outputconfig.cpp:234
 msgctxt "Fixed, abitrary position"
 msgid "Absolute"
 msgstr ""
 
-#: outputconfig.cpp:219
+#: outputconfig.cpp:237
 msgid "No relative position"
 msgstr ""
 
-#: outputconfig.cpp:375
+#: outputconfig.cpp:450
 msgctxt "Screen size"
 msgid "Disabled"
 msgstr ""
 
-#: outputconfig.cpp:381
+#: outputconfig.cpp:456
 #, kde-format
 msgctxt "Automatic screen size (native resolution)"
 msgid "%1 (Auto)"
 msgstr ""
 
-#: outputconfig.cpp:417
+#: outputconfig.cpp:494
 msgctxt "Automatic refresh rate configuration"
 msgid "Auto"
 msgstr ""
@@ -334,28 +334,28 @@
 msgid "unknown orientation"
 msgstr "cylchdroi anhysbys"
 
-#: randr.cpp:127
+#: randr.cpp:129
 msgid "Confirm Display Setting Change"
 msgstr "Cadarnhau Newid Gosodiadau'r Dangosydd"
 
-#: randr.cpp:131
+#: randr.cpp:133
 msgid "&Accept Configuration"
 msgstr "&Derbyn Ffurfweddiad"
 
-#: randr.cpp:132
+#: randr.cpp:134
 msgid "&Revert to Previous Configuration"
 msgstr ""
 
-#: randr.cpp:134
+#: randr.cpp:136
 msgid ""
 "Your screen configuration has been changed to the requested settings. Please "
 "indicate whether you wish to keep this configuration. In 15 seconds the "
 "display will revert to your previous settings."
 msgstr ""
 
-#. i18n: file: randrconfigbase.ui:94
+#. i18n: file: randrconfigbase.ui:81
 #. i18n: ectx: property (text), widget (QPushButton, saveAsDefaultButton)
-#: randrconfig.cpp:61 rc.cpp:66 rc.cpp:134
+#: randrconfig.cpp:61 rc.cpp:71
 msgid "Save as Default"
 msgstr ""
 
@@ -363,25 +363,25 @@
 msgid "Reset"
 msgstr ""
 
-#: randrconfig.cpp:119
+#: randrconfig.cpp:125
 msgctxt "No display selected"
 msgid "None"
 msgstr ""
 
-#: randrconfig.cpp:134
+#: randrconfig.cpp:140 randrconfig.cpp:185
 #, kde-format
 msgid "%1 (Connected)"
 msgstr ""
 
-#: randrconfig.cpp:303
+#: randrconfig.cpp:329
 msgid "Configuration has been set as the desktop default."
 msgstr ""
 
-#: randrconfig.cpp:312
+#: randrconfig.cpp:338
 msgid "Default desktop setup has been reset."
 msgstr ""
 
-#: randrconfig.cpp:422
+#: randrconfig.cpp:456
 msgid ""
 "Insufficient virtual size for the total screen size.\n"
 "The configured virtual size of your X server is insufficient for this setup. "
@@ -389,13 +389,13 @@
 "Do you wish to run a tool to adjust the configuration?"
 msgstr ""
 
-#: randrconfig.cpp:430
+#: randrconfig.cpp:464
 msgid ""
 "Configuration has been adjusted. Please restart your session for this change "
 "to take effect."
 msgstr ""
 
-#: randrconfig.cpp:433
+#: randrconfig.cpp:467
 msgid "Changing configuration failed. Please adjust your xorg.conf manually."
 msgstr ""
 
@@ -404,25 +404,25 @@
 msgid "X Resize and Rotate extension version %1.%2"
 msgstr ""
 
-#: rc.cpp:67
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD at KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:68
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: legacyrandrconfigbase.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, LegacyRandRConfigBase)
-#: rc.cpp:3 rc.cpp:71
+#: rc.cpp:5
 msgid "Screen Resize and Rotate Settings"
 msgstr ""
 
 #. i18n: file: legacyrandrconfigbase.ui:17
 #. i18n: ectx: property (whatsThis), widget (QWidget, LegacyRandRConfigBase)
-#: rc.cpp:6 rc.cpp:74
+#: rc.cpp:8
 msgid ""
 "If this option is enabled, options set by the system tray applet will be "
 "saved and loaded when KDE starts instead of being temporary."
@@ -432,13 +432,13 @@
 
 #. i18n: file: legacyrandrconfigbase.ui:25
 #. i18n: ectx: property (text), widget (QLabel, screenLabel)
-#: rc.cpp:9 rc.cpp:77
+#: rc.cpp:11
 msgid "Settings for screen:"
 msgstr ""
 
 #. i18n: file: legacyrandrconfigbase.ui:38
 #. i18n: ectx: property (whatsThis), widget (KComboBox, screenCombo)
-#: rc.cpp:12 rc.cpp:80
+#: rc.cpp:14
 msgid ""
 "The screen whose settings you would like to change can be selected using "
 "this drop-down list."
@@ -448,13 +448,13 @@
 
 #. i18n: file: legacyrandrconfigbase.ui:49
 #. i18n: ectx: property (text), widget (QLabel, sizeLabel)
-#: rc.cpp:15 rc.cpp:83
+#: rc.cpp:17
 msgid "Screen size:"
 msgstr "Maint y sgrîn:"
 
 #. i18n: file: legacyrandrconfigbase.ui:62
 #. i18n: ectx: property (whatsThis), widget (KComboBox, sizeCombo)
-#: rc.cpp:18 rc.cpp:86
+#: rc.cpp:20
 msgid ""
 "The size, otherwise known as the resolution, of your screen can be selected "
 "from this drop-down list."
@@ -463,20 +463,20 @@
 
 #. i18n: file: legacyrandrconfigbase.ui:73
 #. i18n: ectx: property (text), widget (QLabel, rateLabel)
-#: rc.cpp:21 rc.cpp:89
+#: rc.cpp:23
 msgid "Refresh rate:"
 msgstr "Graddfa adfywio:"
 
 #. i18n: file: legacyrandrconfigbase.ui:83
 #. i18n: ectx: property (whatsThis), widget (KComboBox, rateCombo)
-#: rc.cpp:24 rc.cpp:92
+#: rc.cpp:26
 msgid ""
 "The refresh rate of your screen can be selected from this drop-down list."
 msgstr "Gellir dewis graddfa adfywio eich sgrîn o'r llam-restr yma."
 
 #. i18n: file: legacyrandrconfigbase.ui:98
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, rotationGroup)
-#: rc.cpp:27 rc.cpp:95
+#: rc.cpp:29
 msgid ""
 "The options in this section allow you to change the rotation of your screen."
 msgstr ""
@@ -484,13 +484,13 @@
 
 #. i18n: file: legacyrandrconfigbase.ui:101
 #. i18n: ectx: property (title), widget (QGroupBox, rotationGroup)
-#: rc.cpp:30 rc.cpp:98
+#: rc.cpp:32
 msgid "Orientation (degrees counterclockwise)"
 msgstr "Cyfeiriadaeth (graddau wrthglocwedd)"
 
 #. i18n: file: legacyrandrconfigbase.ui:108
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, applyOnStartup)
-#: rc.cpp:33 rc.cpp:101
+#: rc.cpp:35
 msgid ""
 "If this option is enabled the size and orientation settings will be used "
 "when KDE starts."
@@ -500,50 +500,50 @@
 
 #. i18n: file: legacyrandrconfigbase.ui:111
 #. i18n: ectx: property (text), widget (QCheckBox, applyOnStartup)
-#: rc.cpp:36 rc.cpp:104
+#: rc.cpp:38
 msgid "Apply settings on KDE startup"
 msgstr "Gweithredu'r gosodiadau wrth ymgychwyn KDE"
 
 #. i18n: file: legacyrandrconfigbase.ui:118
 #. i18n: ectx: property (text), widget (QCheckBox, syncTrayApp)
-#: rc.cpp:39 rc.cpp:107
+#: rc.cpp:41
 msgid "Allow tray application to change startup settings"
 msgstr "Caniatáu i gymhwysiad cafn newid gosodiadau ymgychwyn"
 
 #. i18n: file: outputconfigbase.ui:26
 #. i18n: ectx: property (windowTitle), widget (QWidget, OutputConfigBase)
-#: rc.cpp:42 rc.cpp:110
+#: rc.cpp:44
 msgid "Output Config"
 msgstr ""
 
 #. i18n: file: outputconfigbase.ui:32
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:45 rc.cpp:113
+#: rc.cpp:47
 msgid "Size:"
 msgstr ""
 
 #. i18n: file: outputconfigbase.ui:48
 #. i18n: ectx: property (text), widget (QLabel, rateLabel)
-#: rc.cpp:48 rc.cpp:116
+#: rc.cpp:50
 msgid "Refresh:"
 msgstr ""
 
 #. i18n: file: outputconfigbase.ui:64
 #. i18n: ectx: property (text), widget (QLabel, orientationLabel)
-#: rc.cpp:51 rc.cpp:119
+#: rc.cpp:53
 msgid "Orientation:"
 msgstr ""
 
 #. i18n: file: outputconfigbase.ui:80
 #. i18n: ectx: property (text), widget (QLabel, positionLabel)
-#: rc.cpp:54 rc.cpp:122
+#: rc.cpp:56
 msgctxt "Position of the screen"
 msgid "Position:"
 msgstr ""
 
 #. i18n: file: randrconfigbase.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, RandRConfigBase)
-#: rc.cpp:57 rc.cpp:125
+#: rc.cpp:59
 msgid "Display Configuration (X11 Resize, Rotate and Reflect)"
 msgstr ""
 
@@ -553,14 +553,14 @@
 msgid "Unify outputs"
 msgstr ""
 
-#. i18n: file: randrconfigbase.ui:73
+#. i18n: file: randrconfigbase.ui:52
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:60 rc.cpp:128
+#: rc.cpp:65
 msgid "Primary output:"
 msgstr ""
 
-#. i18n: file: randrconfigbase.ui:87
+#. i18n: file: randrconfigbase.ui:74
 #. i18n: ectx: property (text), widget (QPushButton, identifyOutputsButton)
-#: rc.cpp:63 rc.cpp:131
+#: rc.cpp:68
 msgid "Identify Outputs"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krdc.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krdc.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krdc.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krdc.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: krdc\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
-"PO-Revision-Date: 2012-03-12 21:58+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:05+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: bookmarkmanager.cpp:53
 msgid "History"
@@ -149,292 +149,292 @@
 msgid "URLs to connect after startup"
 msgstr ""
 
-#: mainwindow.cpp:131
+#: mainwindow.cpp:132
 msgid "KDE Remote Desktop Client started"
 msgstr ""
 
-#: mainwindow.cpp:136 mainwindow.cpp:151 mainwindow.cpp:1074
-#: mainwindow.cpp:1173
+#: mainwindow.cpp:137 mainwindow.cpp:152 mainwindow.cpp:1078
+#: mainwindow.cpp:1177
 msgid "New Connection"
 msgstr ""
 
-#: mainwindow.cpp:156
+#: mainwindow.cpp:157
 msgid "Copy Screenshot to Clipboard"
 msgstr ""
 
-#: mainwindow.cpp:157
+#: mainwindow.cpp:158
 msgid "Screenshot"
 msgstr ""
 
-#: mainwindow.cpp:162 mainwindow.cpp:521
+#: mainwindow.cpp:163 mainwindow.cpp:527
 msgid "Switch to Full Screen Mode"
 msgstr ""
 
-#: mainwindow.cpp:163 mainwindow.cpp:522
+#: mainwindow.cpp:164 mainwindow.cpp:528
 msgid "Full Screen"
 msgstr ""
 
-#: mainwindow.cpp:170
+#: mainwindow.cpp:171
 msgid "View Only"
 msgstr "Golwg yn Unig"
 
-#: mainwindow.cpp:175
+#: mainwindow.cpp:176
 msgid "Disconnect"
 msgstr ""
 
-#: mainwindow.cpp:183
+#: mainwindow.cpp:184
 msgid "Show Local Cursor"
 msgstr ""
 
-#: mainwindow.cpp:184
+#: mainwindow.cpp:185
 msgid "Local Cursor"
 msgstr ""
 
-#: mainwindow.cpp:190
+#: mainwindow.cpp:191
 msgid "Grab All Possible Keys"
 msgstr ""
 
-#: mainwindow.cpp:191
+#: mainwindow.cpp:192
 msgid "Grab Keys"
 msgstr ""
 
-#: mainwindow.cpp:197
+#: mainwindow.cpp:198
 msgid "Scale Remote Screen to Fit Window Size"
 msgstr ""
 
-#: mainwindow.cpp:198
+#: mainwindow.cpp:199
 msgid "Scale"
 msgstr "Chwyddo"
 
-#: mainwindow.cpp:210
+#: mainwindow.cpp:211
 msgid "Bookmarks"
 msgstr ""
 
-#: mainwindow.cpp:318
+#: mainwindow.cpp:319
 msgid ""
 "The entered address does not have the required form.\n"
 " Syntax: [username@]host[:port]"
 msgstr ""
 
-#: mainwindow.cpp:319
+#: mainwindow.cpp:320
 msgid "Malformed URL"
 msgstr ""
 
-#: mainwindow.cpp:342
+#: mainwindow.cpp:343
 msgid "The entered address cannot be handled."
 msgstr ""
 
-#: mainwindow.cpp:343 mainwindow.cpp:679 config/hostpreferenceslist.cpp:119
+#: mainwindow.cpp:344 mainwindow.cpp:685 config/hostpreferenceslist.cpp:119
 msgid "Unusable URL"
 msgstr ""
 
-#: mainwindow.cpp:452
+#: mainwindow.cpp:453
 #, kde-format
 msgid "Connecting to %1"
 msgstr ""
 
-#: mainwindow.cpp:456
+#: mainwindow.cpp:457
 #, kde-format
 msgid "Authenticating at %1"
 msgstr ""
 
-#: mainwindow.cpp:460
+#: mainwindow.cpp:461
 #, kde-format
 msgid "Preparing connection to %1"
 msgstr ""
 
-#: mainwindow.cpp:464
+#: mainwindow.cpp:465
 #, kde-format
 msgid "Connected to %1"
 msgstr ""
 
-#: mainwindow.cpp:530
+#: mainwindow.cpp:536
 msgctxt ""
 "window title when in full screen mode (for example displayed in tasklist)"
 msgid "KDE Remote Desktop Client (Full Screen)"
 msgstr ""
 
-#: mainwindow.cpp:678 config/hostpreferenceslist.cpp:118
+#: mainwindow.cpp:684 config/hostpreferenceslist.cpp:118
 msgid "The selected host cannot be handled."
 msgstr ""
 
-#: mainwindow.cpp:700
+#: mainwindow.cpp:706
 msgid "Connect"
 msgstr "Cysylltu"
 
-#: mainwindow.cpp:701
+#: mainwindow.cpp:707
 msgid "Rename"
 msgstr ""
 
-#: mainwindow.cpp:702
+#: mainwindow.cpp:708
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: mainwindow.cpp:703
+#: mainwindow.cpp:709
 msgid "Delete"
 msgstr ""
 
-#: mainwindow.cpp:706 remotedesktopsmodel.cpp:119
+#: mainwindow.cpp:712 remotedesktopsmodel.cpp:119
 msgctxt "Where each displayed link comes from"
 msgid "Bookmarks"
 msgstr ""
 
-#: mainwindow.cpp:707 remotedesktopsmodel.cpp:121
+#: mainwindow.cpp:713 remotedesktopsmodel.cpp:121
 msgctxt "Where each displayed link comes from"
 msgid "History"
 msgstr ""
 
-#: mainwindow.cpp:719
+#: mainwindow.cpp:725
 #, kde-format
 msgid "Rename %1"
 msgstr ""
 
-#: mainwindow.cpp:719
+#: mainwindow.cpp:725
 #, kde-format
 msgid "Rename %1 to"
 msgstr ""
 
-#: mainwindow.cpp:727
+#: mainwindow.cpp:733
 #, kde-format
 msgid "Are you sure you want to delete %1?"
 msgstr ""
 
-#: mainwindow.cpp:727
+#: mainwindow.cpp:733
 #, kde-format
 msgid "Delete %1"
 msgstr ""
 
-#: mainwindow.cpp:748
+#: mainwindow.cpp:754
 msgid "Add Bookmark"
 msgstr ""
 
-#: mainwindow.cpp:749
+#: mainwindow.cpp:755
 msgid "Close Tab"
 msgstr ""
 
-#: mainwindow.cpp:811
+#: mainwindow.cpp:817
 msgid "Switch to Window Mode"
 msgstr ""
 
-#: mainwindow.cpp:812
+#: mainwindow.cpp:818
 msgid "Window Mode"
 msgstr ""
 
-#: mainwindow.cpp:834
+#: mainwindow.cpp:840
 msgid "Minimize Full Screen Window"
 msgstr ""
 
-#: mainwindow.cpp:849
+#: mainwindow.cpp:855
 msgid "Stick Toolbar"
 msgstr ""
 
-#: mainwindow.cpp:965
+#: mainwindow.cpp:969
 msgid "Are you sure you want to quit the KDE Remote Desktop Client?"
 msgstr ""
 
-#: mainwindow.cpp:966
+#: mainwindow.cpp:970
 msgid "Confirm Quit"
 msgstr ""
 
-#: mainwindow.cpp:1090
+#: mainwindow.cpp:1094
 msgid ""
 "<h1>KDE Remote Desktop Client</h1><br />Enter or select the address of the "
 "desktop you would like to connect to."
 msgstr ""
 
-#: mainwindow.cpp:1103
+#: mainwindow.cpp:1107
 msgid "Connect to:"
 msgstr ""
 
-#: mainwindow.cpp:1107
+#: mainwindow.cpp:1111
 msgid "Type here to connect to an address and filter the list."
 msgstr ""
 
-#: mainwindow.cpp:1115
+#: mainwindow.cpp:1119
 msgid ""
 "Type an IP or DNS Name here. Clear the line to get a list of connection "
 "methods."
 msgstr ""
 
-#: mainwindow.cpp:1118
+#: mainwindow.cpp:1122
 msgid "Goto Address"
 msgstr ""
 
-#: mainwindow.cpp:1205
+#: mainwindow.cpp:1209
 msgid "Remote Desktops"
 msgstr ""
 
-#: mainwindow.cpp:1236
+#: mainwindow.cpp:1240
 msgid "Filter"
 msgstr ""
 
-#: rc.cpp:7
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:8
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: config/general.ui:17
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_RememberSessions)
-#: rc.cpp:11
+#: rc.cpp:5
 msgid "Remember open sessions for next startup"
 msgstr ""
 
 #. i18n: file: config/general.ui:24
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_RememberHistory)
-#: rc.cpp:14
+#: rc.cpp:8
 msgid "Remember connection history"
 msgstr ""
 
 #. i18n: file: config/general.ui:31
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_WalletSupport)
-#: rc.cpp:17
+#: rc.cpp:11
 msgid "Remember passwords (KWallet)"
 msgstr ""
 
 #. i18n: file: config/general.ui:38
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_SystemTrayIcon)
-#: rc.cpp:20
+#: rc.cpp:14
 msgid "Enable system tray icon"
 msgstr ""
 
 #. i18n: file: config/general.ui:45
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowStatusBar)
-#: rc.cpp:23
+#: rc.cpp:17
 msgid "Show status bar"
 msgstr ""
 
 #. i18n: file: config/general.ui:52
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_KeepAspectRatio)
-#: rc.cpp:26
+#: rc.cpp:20
 msgid "Keep aspect ratio when scaling"
 msgstr ""
 
 #. i18n: file: config/general.ui:61
 #. i18n: ectx: property (text), widget (QLabel, backgroundLabel)
-#: rc.cpp:29
+#: rc.cpp:23
 msgid "Background color of empty place:"
 msgstr ""
 
 #. i18n: file: config/general.ui:93
 #. i18n: ectx: property (title), widget (QGroupBox, connectionGroupBox)
-#: rc.cpp:32
+#: rc.cpp:26
 msgid "When Connecting"
 msgstr ""
 
 #. i18n: file: config/general.ui:99
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowPreferencesForNewConnections)
-#: rc.cpp:35
+#: rc.cpp:29
 msgid "Show the preferences dialog for new connections"
 msgstr ""
 
 #. i18n: file: config/general.ui:106
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ResizeOnConnect)
-#: rc.cpp:38
+#: rc.cpp:32
 msgid ""
 "This option will resize the window to fit the connection size.  If it is too "
 "big, it will maximize the window."
@@ -442,13 +442,13 @@
 
 #. i18n: file: config/general.ui:109
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ResizeOnConnect)
-#: rc.cpp:41
+#: rc.cpp:35
 msgid "Resize to fit"
 msgstr ""
 
 #. i18n: file: config/general.ui:116
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FullscreenOnConnect)
-#: rc.cpp:44
+#: rc.cpp:38
 msgid ""
 "This option switches to fullscreen only if the connection resolution is the "
 "same as the current screen resolution"
@@ -456,61 +456,61 @@
 
 #. i18n: file: config/general.ui:119
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_FullscreenOnConnect)
-#: rc.cpp:47
+#: rc.cpp:41
 msgid "Switch to Fullscreen if appropriate"
 msgstr ""
 
 #. i18n: file: config/general.ui:129
 #. i18n: ectx: property (title), widget (QGroupBox, tabGroupBox)
-#: rc.cpp:50
+#: rc.cpp:44
 msgid "Tab Settings"
 msgstr ""
 
 #. i18n: file: config/general.ui:135
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowTabBar)
-#: rc.cpp:53
+#: rc.cpp:47
 msgid "Always show tab bar"
 msgstr ""
 
 #. i18n: file: config/general.ui:142
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_TabCloseButton)
-#: rc.cpp:56
+#: rc.cpp:50
 msgid "Show close button on tabs"
 msgstr ""
 
 #. i18n: file: config/general.ui:149
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_TabMiddleClick)
-#: rc.cpp:59
+#: rc.cpp:53
 msgid "Middle-click on a tab closes it"
 msgstr ""
 
 #. i18n: file: config/general.ui:158
 #. i18n: ectx: property (text), widget (QLabel, tabOrientationLabel)
-#: rc.cpp:62
+#: rc.cpp:56
 msgid "Tab position:"
 msgstr ""
 
 #. i18n: file: config/general.ui:166
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_TabPosition)
-#: rc.cpp:65
+#: rc.cpp:59
 msgid "Top"
 msgstr ""
 
 #. i18n: file: config/general.ui:171
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_TabPosition)
-#: rc.cpp:68
+#: rc.cpp:62
 msgid "Bottom"
 msgstr ""
 
 #. i18n: file: config/general.ui:176
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_TabPosition)
-#: rc.cpp:71
+#: rc.cpp:65
 msgid "Left"
 msgstr ""
 
 #. i18n: file: config/general.ui:181
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_TabPosition)
-#: rc.cpp:74
+#: rc.cpp:68
 msgid "Right"
 msgstr ""
 
@@ -520,7 +520,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, connectionGroupBox)
 #. i18n: file: vnc/vncpreferences.ui:17
 #. i18n: ectx: property (title), widget (QGroupBox, vncGroupBox)
-#: rc.cpp:77 rc.cpp:302 rc.cpp:512
+#: rc.cpp:71 rc.cpp:296 rc.cpp:506
 msgid "Connection"
 msgstr "Cysylltiad"
 
@@ -528,7 +528,7 @@
 #. i18n: ectx: property (text), widget (QLabel, resolutionLabel)
 #. i18n: file: rdp/rdppreferences.ui:25
 #. i18n: ectx: property (text), widget (QLabel, resolutionLabel)
-#: rc.cpp:80 rc.cpp:305
+#: rc.cpp:74 rc.cpp:299
 msgid "Desktop &resolution:"
 msgstr "Cy&draniad y penbwrdd:"
 
@@ -538,7 +538,7 @@
 #. i18n: ectx: property (whatsThis), widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:86
 #. i18n: ectx: property (whatsThis), widget (KComboBox, resolutionComboBox)
-#: rc.cpp:83 rc.cpp:308 rc.cpp:533
+#: rc.cpp:77 rc.cpp:302 rc.cpp:527
 msgid ""
 "Here you can specify the resolution of the remote desktop. This resolution "
 "determines the size of the desktop that will be presented to you."
@@ -552,7 +552,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:93
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:86 rc.cpp:311 rc.cpp:536
+#: rc.cpp:80 rc.cpp:305 rc.cpp:530
 msgid "Minimal (640x480)"
 msgstr ""
 
@@ -562,7 +562,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:98
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:89 rc.cpp:314 rc.cpp:539
+#: rc.cpp:83 rc.cpp:308 rc.cpp:533
 msgid "Small (800x600)"
 msgstr ""
 
@@ -572,7 +572,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:103
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:92 rc.cpp:317 rc.cpp:542
+#: rc.cpp:86 rc.cpp:311 rc.cpp:536
 msgid "Normal (1024x768)"
 msgstr ""
 
@@ -582,7 +582,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:108
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:95 rc.cpp:320 rc.cpp:545
+#: rc.cpp:89 rc.cpp:314 rc.cpp:539
 msgid "Large (1280x1024)"
 msgstr ""
 
@@ -592,7 +592,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:113
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:98 rc.cpp:323 rc.cpp:548
+#: rc.cpp:92 rc.cpp:317 rc.cpp:542
 msgid "Very Large (1600x1200)"
 msgstr ""
 
@@ -602,7 +602,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:118
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:101 rc.cpp:326 rc.cpp:551
+#: rc.cpp:95 rc.cpp:320 rc.cpp:545
 msgid "Current Screen Resolution"
 msgstr ""
 
@@ -612,7 +612,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
 #. i18n: file: vnc/vncpreferences.ui:123
 #. i18n: ectx: property (text), item, widget (KComboBox, resolutionComboBox)
-#: rc.cpp:104 rc.cpp:329 rc.cpp:554
+#: rc.cpp:98 rc.cpp:323 rc.cpp:548
 msgid "Custom Resolution (...)"
 msgstr ""
 
@@ -622,7 +622,7 @@
 #. i18n: ectx: property (text), widget (QLabel, widthLabel)
 #. i18n: file: vnc/vncpreferences.ui:136
 #. i18n: ectx: property (text), widget (QLabel, widthLabel)
-#: rc.cpp:107 rc.cpp:332 rc.cpp:557
+#: rc.cpp:101 rc.cpp:326 rc.cpp:551
 msgid "&Width:"
 msgstr "&Lled:"
 
@@ -632,7 +632,7 @@
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_Width)
 #. i18n: file: vnc/vncpreferences.ui:152
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_ScalingWidth)
-#: rc.cpp:110 rc.cpp:335 rc.cpp:560
+#: rc.cpp:104 rc.cpp:329 rc.cpp:554
 msgid ""
 "This is the width of the remote desktop. You can only change this value "
 "manually if you select Custom as desktop resolution above."
@@ -646,7 +646,7 @@
 #. i18n: ectx: property (text), widget (QLabel, heightLabel)
 #. i18n: file: vnc/vncpreferences.ui:168
 #. i18n: ectx: property (text), widget (QLabel, heightLabel)
-#: rc.cpp:113 rc.cpp:338 rc.cpp:563
+#: rc.cpp:107 rc.cpp:332 rc.cpp:557
 msgid "H&eight:"
 msgstr "&Taldra:"
 
@@ -656,7 +656,7 @@
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_Height)
 #. i18n: file: vnc/vncpreferences.ui:184
 #. i18n: ectx: property (whatsThis), widget (QSpinBox, kcfg_ScalingHeight)
-#: rc.cpp:116 rc.cpp:341 rc.cpp:566
+#: rc.cpp:110 rc.cpp:335 rc.cpp:560
 msgid ""
 "This is the height of the remote desktop. You can only change this value "
 "manually if you select Custom as desktop resolution above."
@@ -666,37 +666,37 @@
 
 #. i18n: file: nx/nxpreferences.ui:168
 #. i18n: ectx: property (text), widget (QLabel, desktopTypeLabel)
-#: rc.cpp:119
+#: rc.cpp:113
 msgid "Desktop &type:"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:184
 #. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_NxDesktopType)
-#: rc.cpp:122
+#: rc.cpp:116
 msgid "Here you can specify the desktop environment of the remote desktop."
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:188
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxDesktopType)
-#: rc.cpp:125
+#: rc.cpp:119
 msgid "KDE"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:193
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxDesktopType)
-#: rc.cpp:128
+#: rc.cpp:122
 msgid "Gnome"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:198
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxDesktopType)
-#: rc.cpp:131
+#: rc.cpp:125
 msgid "CDE"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:203
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxDesktopType)
-#: rc.cpp:134
+#: rc.cpp:128
 msgid "XDM"
 msgstr ""
 
@@ -704,7 +704,7 @@
 #. i18n: ectx: property (text), widget (QLabel, layoutLabel)
 #. i18n: file: rdp/rdppreferences.ui:198
 #. i18n: ectx: property (text), widget (QLabel, layoutLabel)
-#: rc.cpp:137 rc.cpp:356
+#: rc.cpp:131 rc.cpp:350
 msgid "&Keyboard layout:"
 msgstr "Cynllun &bysellfwrdd:"
 
@@ -712,7 +712,7 @@
 #. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:214
 #. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:140 rc.cpp:359
+#: rc.cpp:134 rc.cpp:353
 msgid ""
 "Use this to specify your keyboard layout. This layout setting is used to "
 "send the correct keyboard codes to the server."
@@ -724,7 +724,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:221
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:143 rc.cpp:362
+#: rc.cpp:137 rc.cpp:356
 msgid "Arabic (ar)"
 msgstr "Arabeg (ar)"
 
@@ -732,7 +732,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:226
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:146 rc.cpp:365
+#: rc.cpp:140 rc.cpp:359
 msgid "Czech (cs)"
 msgstr ""
 
@@ -740,7 +740,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:231
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:149 rc.cpp:368
+#: rc.cpp:143 rc.cpp:362
 msgid "Danish (da)"
 msgstr "Daneg (da)"
 
@@ -748,7 +748,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:236
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:152 rc.cpp:371
+#: rc.cpp:146 rc.cpp:365
 msgid "German (de)"
 msgstr "Almaeneg (de)"
 
@@ -756,7 +756,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:241
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:155 rc.cpp:374
+#: rc.cpp:149 rc.cpp:368
 msgid "Swiss German (de-ch)"
 msgstr ""
 
@@ -764,7 +764,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:246
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:158 rc.cpp:377
+#: rc.cpp:152 rc.cpp:371
 msgid "American Dvorak (en-dv)"
 msgstr ""
 
@@ -772,7 +772,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:251
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:161 rc.cpp:380
+#: rc.cpp:155 rc.cpp:374
 msgid "British English (en-gb)"
 msgstr ""
 
@@ -780,7 +780,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:256
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:164 rc.cpp:383
+#: rc.cpp:158 rc.cpp:377
 msgid "US English (en-us)"
 msgstr ""
 
@@ -788,7 +788,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:261
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:167 rc.cpp:386
+#: rc.cpp:161 rc.cpp:380
 msgid "Spanish (es)"
 msgstr "Sbaeneg (es)"
 
@@ -796,7 +796,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:266
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:170 rc.cpp:389
+#: rc.cpp:164 rc.cpp:383
 msgid "Estonian (et)"
 msgstr ""
 
@@ -804,7 +804,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:271
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:173 rc.cpp:392
+#: rc.cpp:167 rc.cpp:386
 msgid "Finnish (fi)"
 msgstr "Ffineg (fi)"
 
@@ -812,7 +812,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:276
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:176 rc.cpp:395
+#: rc.cpp:170 rc.cpp:389
 msgid "Faroese (fo)"
 msgstr ""
 
@@ -820,7 +820,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:281
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:179 rc.cpp:398
+#: rc.cpp:173 rc.cpp:392
 msgid "French (fr)"
 msgstr "Ffrangeg (fr)"
 
@@ -828,7 +828,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:286
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:182 rc.cpp:401
+#: rc.cpp:176 rc.cpp:395
 msgid "Belgian (fr-be)"
 msgstr ""
 
@@ -836,7 +836,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:291
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:185 rc.cpp:404
+#: rc.cpp:179 rc.cpp:398
 msgid "French Canadian (fr-ca)"
 msgstr ""
 
@@ -844,7 +844,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:296
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:188 rc.cpp:407
+#: rc.cpp:182 rc.cpp:401
 msgid "Swiss French (fr-ch)"
 msgstr ""
 
@@ -852,7 +852,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:301
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:191 rc.cpp:410
+#: rc.cpp:185 rc.cpp:404
 msgid "Hebrew (he)"
 msgstr ""
 
@@ -860,7 +860,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:306
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:194 rc.cpp:413
+#: rc.cpp:188 rc.cpp:407
 msgid "Croatian (hr)"
 msgstr ""
 
@@ -868,7 +868,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:311
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:197 rc.cpp:416
+#: rc.cpp:191 rc.cpp:410
 msgid "Hungarian (hu)"
 msgstr "Hwngareg (hu)"
 
@@ -876,7 +876,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:316
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:200 rc.cpp:419
+#: rc.cpp:194 rc.cpp:413
 msgid "Icelandic (is)"
 msgstr ""
 
@@ -884,7 +884,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:321
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:203 rc.cpp:422
+#: rc.cpp:197 rc.cpp:416
 msgid "Italian (it)"
 msgstr "Eidaleg (it)"
 
@@ -892,7 +892,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:326
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:206 rc.cpp:425
+#: rc.cpp:200 rc.cpp:419
 msgid "Japanese (ja)"
 msgstr "Siaponeg (ja)"
 
@@ -900,7 +900,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:331
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:209 rc.cpp:428
+#: rc.cpp:203 rc.cpp:422
 msgid "Korean (ko)"
 msgstr ""
 
@@ -908,7 +908,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:336
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:212 rc.cpp:431
+#: rc.cpp:206 rc.cpp:425
 msgid "Lithuanian (lt)"
 msgstr "Lithwaneg (lt)"
 
@@ -916,7 +916,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:341
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:215 rc.cpp:434
+#: rc.cpp:209 rc.cpp:428
 msgid "Latvian (lv)"
 msgstr "Latfieg (lv)"
 
@@ -924,7 +924,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:346
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:218 rc.cpp:437
+#: rc.cpp:212 rc.cpp:431
 msgid "Macedonian (mk)"
 msgstr "Macedoneg (mk)"
 
@@ -932,7 +932,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:351
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:221 rc.cpp:440
+#: rc.cpp:215 rc.cpp:434
 msgid "Dutch (nl)"
 msgstr ""
 
@@ -940,7 +940,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:356
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:224 rc.cpp:443
+#: rc.cpp:218 rc.cpp:437
 msgid "Belgian Dutch (nl-be)"
 msgstr ""
 
@@ -948,7 +948,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:361
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:227 rc.cpp:446
+#: rc.cpp:221 rc.cpp:440
 msgid "Norwegian (no)"
 msgstr "Norwyeg (no)"
 
@@ -956,7 +956,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:366
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:230 rc.cpp:449
+#: rc.cpp:224 rc.cpp:443
 msgid "Polish (pl)"
 msgstr "Poleg (po)"
 
@@ -964,7 +964,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:371
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:233 rc.cpp:452
+#: rc.cpp:227 rc.cpp:446
 msgid "Portuguese (pt)"
 msgstr "Portiwgaleg (pt)"
 
@@ -972,7 +972,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:376
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:236 rc.cpp:455
+#: rc.cpp:230 rc.cpp:449
 msgid "Brazilian (pt-br)"
 msgstr "Portiwgaleg Brasil (pt-br)"
 
@@ -980,7 +980,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:381
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:239 rc.cpp:458
+#: rc.cpp:233 rc.cpp:452
 msgid "Russian (ru)"
 msgstr "Rwsieg (ru)"
 
@@ -988,7 +988,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:386
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:242 rc.cpp:461
+#: rc.cpp:236 rc.cpp:455
 msgid "Slovenian (sl)"
 msgstr "Slofeneg (sl)"
 
@@ -996,7 +996,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:391
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:245 rc.cpp:464
+#: rc.cpp:239 rc.cpp:458
 msgid "Swedish (sv)"
 msgstr "Swedeg (sv)"
 
@@ -1004,7 +1004,7 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:396
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:248 rc.cpp:467
+#: rc.cpp:242 rc.cpp:461
 msgid "Thai (th)"
 msgstr "Thai (th)"
 
@@ -1012,20 +1012,20 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_NxKeyboardLayout)
 #. i18n: file: rdp/rdppreferences.ui:401
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_KeyboardLayout)
-#: rc.cpp:251 rc.cpp:470
+#: rc.cpp:245 rc.cpp:464
 msgid "Turkish (tr)"
 msgstr "Twrceg (tr)"
 
 #. i18n: file: nx/nxpreferences.ui:422
 #. i18n: ectx: property (text), widget (QLabel, labelPrivateKey)
-#: rc.cpp:254
+#: rc.cpp:248
 msgctxt "label for soundsettings in preferences dialog"
 msgid "Private key:"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:431
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, checkboxDefaultPrivateKey)
-#: rc.cpp:257
+#: rc.cpp:251
 msgid ""
 "The authentication on the NX server requires a private key. By default, it "
 "is the NoMachine DSA key. Use this box to choose the default key, or "
@@ -1034,19 +1034,19 @@
 
 #. i18n: file: nx/nxpreferences.ui:434
 #. i18n: ectx: property (text), widget (QCheckBox, checkboxDefaultPrivateKey)
-#: rc.cpp:260
+#: rc.cpp:254
 msgid "NoMachine Key"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:449
 #. i18n: ectx: property (title), widget (QGroupBox, groupboxPrivateKey)
-#: rc.cpp:263
+#: rc.cpp:257
 msgid "Private Key Management"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:461
 #. i18n: ectx: property (whatsThis), widget (KTextEdit, kcfg_NxPrivateKey)
-#: rc.cpp:266
+#: rc.cpp:260
 msgid ""
 "Use this textbox to edit the private key for the authentication on the NX "
 "server."
@@ -1054,182 +1054,182 @@
 
 #. i18n: file: nx/nxpreferences.ui:476
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:269
+#: rc.cpp:263
 msgid "Private DSA Key :"
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:486
 #. i18n: ectx: property (whatsThis), widget (QPushButton, buttonImportPrivateKey)
-#: rc.cpp:272
+#: rc.cpp:266
 msgid "Use this button to import the private key from a file."
 msgstr ""
 
 #. i18n: file: nx/nxpreferences.ui:489
 #. i18n: ectx: property (text), widget (QPushButton, buttonImportPrivateKey)
-#: rc.cpp:275
+#: rc.cpp:269
 msgid "Import ..."
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:23
 #. i18n: ectx: property (text), widget (QTreeWidget, sessionsList)
-#: rc.cpp:278
+#: rc.cpp:272
 msgid "Display"
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:28
 #. i18n: ectx: property (text), widget (QTreeWidget, sessionsList)
-#: rc.cpp:281
+#: rc.cpp:275
 msgid "Type"
 msgstr "Math"
 
 #. i18n: file: nx/nxresumesessions.ui:33
 #. i18n: ectx: property (text), widget (QTreeWidget, sessionsList)
-#: rc.cpp:284
+#: rc.cpp:278
 msgid "Session ID"
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:38
 #. i18n: ectx: property (text), widget (QTreeWidget, sessionsList)
-#: rc.cpp:287
+#: rc.cpp:281
 msgid "Colour Depth"
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:43
 #. i18n: ectx: property (text), widget (QTreeWidget, sessionsList)
-#: rc.cpp:290
+#: rc.cpp:284
 msgid "Resolution"
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:48
 #. i18n: ectx: property (text), widget (QTreeWidget, sessionsList)
-#: rc.cpp:293
+#: rc.cpp:287
 msgid "Session Name"
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:77
 #. i18n: ectx: property (text), widget (QPushButton, buttonNew)
-#: rc.cpp:296
+#: rc.cpp:290
 msgid "&New"
 msgstr ""
 
 #. i18n: file: nx/nxresumesessions.ui:84
 #. i18n: ectx: property (text), widget (QPushButton, buttonResume)
-#: rc.cpp:299
+#: rc.cpp:293
 msgid "&Resume"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:163
 #. i18n: ectx: property (text), widget (QLabel, colorDepthLabel)
-#: rc.cpp:344
+#: rc.cpp:338
 msgid "Color &depth:"
 msgstr "Dyfnde&r lliw :"
 
 #. i18n: file: rdp/rdppreferences.ui:180
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ColorDepth)
-#: rc.cpp:347
+#: rc.cpp:341
 msgid "Low Color (8 Bit)"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:185
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ColorDepth)
-#: rc.cpp:350
+#: rc.cpp:344
 msgid "High Color (16 Bit)"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:190
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ColorDepth)
-#: rc.cpp:353
+#: rc.cpp:347
 msgid "True Color (24 Bit)"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:409
 #. i18n: ectx: property (text), widget (QLabel, soundLabel)
-#: rc.cpp:473
+#: rc.cpp:467
 msgctxt "label for soundsettings in preferences dialog"
 msgid "Sound:"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:420
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_Sound)
-#: rc.cpp:476
+#: rc.cpp:470
 msgid "On This Computer"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:425
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_Sound)
-#: rc.cpp:479
+#: rc.cpp:473
 msgid "On Remote Computer"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:430
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_Sound)
-#: rc.cpp:482
+#: rc.cpp:476
 msgid "Disable Sound"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:441
 #. i18n: ectx: property (title), widget (QGroupBox, expertGroupBox)
-#: rc.cpp:485
+#: rc.cpp:479
 msgid "Expert Options"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:447
 #. i18n: ectx: property (text), widget (QLabel, consoleLabel)
-#: rc.cpp:488
+#: rc.cpp:482
 msgid "Console login:"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:457
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Console)
-#: rc.cpp:491
+#: rc.cpp:485
 msgid "Attach to Windows Server console"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:464
 #. i18n: ectx: property (text), widget (QLabel, extraOptionsLabel)
-#: rc.cpp:494
+#: rc.cpp:488
 msgid "Extra options:"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:480
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, kcfg_ExtraOptions)
-#: rc.cpp:497
+#: rc.cpp:491
 msgid "Here you can enter additional rdesktop options."
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:493
 #. i18n: ectx: property (title), widget (QGroupBox, loginGroupBox)
-#: rc.cpp:500
+#: rc.cpp:494
 msgid "Login"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:501
 #. i18n: ectx: property (text), widget (QLabel, defaultUserLabel)
-#: rc.cpp:503
+#: rc.cpp:497
 msgid "Default user name:"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:508
 #. i18n: ectx: property (clickMessage), widget (KLineEdit, kcfg_DefaultRdpUserName)
-#: rc.cpp:506
+#: rc.cpp:500
 msgid "No default user name"
 msgstr ""
 
 #. i18n: file: rdp/rdppreferences.ui:520
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_RecognizeLdapLogins)
-#: rc.cpp:509
+#: rc.cpp:503
 msgid "Automatically recognize \"LDAP\"-Logins and share passwords"
 msgstr ""
 
 #. i18n: file: vnc/vncpreferences.ui:23
 #. i18n: ectx: property (text), widget (QLabel, connectionLabel)
-#: rc.cpp:515
+#: rc.cpp:509
 msgid "Connection type:"
 msgstr ""
 
 #. i18n: file: vnc/vncpreferences.ui:39
 #. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_Quality)
-#: rc.cpp:518
+#: rc.cpp:512
 msgid ""
 "Use this to specify the performance of your connection. Note that you should "
 "select the speed of the weakest link - even if you have a high speed "
@@ -1242,43 +1242,43 @@
 
 #. i18n: file: vnc/vncpreferences.ui:43
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_Quality)
-#: rc.cpp:521
+#: rc.cpp:515
 msgid "High Quality (LAN, direct connection)"
 msgstr "Ansawdd Uchel (LAN, cysylltiad uniongyrchol)"
 
 #. i18n: file: vnc/vncpreferences.ui:48
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_Quality)
-#: rc.cpp:524
+#: rc.cpp:518
 msgid "Medium Quality (DSL, Cable, fast Internet)"
 msgstr "Ansawdd Canolig (DSL, Cêbl, Rhyngrwyd cyflym)"
 
 #. i18n: file: vnc/vncpreferences.ui:53
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_Quality)
-#: rc.cpp:527
+#: rc.cpp:521
 msgid "Low Quality (Modem, ISDN, slow Internet)"
 msgstr "Ansawdd Isel (Modem, ISDN, Rhyngrwyd araf)"
 
 #. i18n: file: vnc/vncpreferences.ui:63
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Scaling)
-#: rc.cpp:530
+#: rc.cpp:524
 msgid "Scale to Size:"
 msgstr ""
 
 #. i18n: file: krdcui.rc:8
 #. i18n: ectx: Menu (session)
-#: rc.cpp:3 rc.cpp:569
+#: rc.cpp:563
 msgid "&Session"
 msgstr ""
 
 #. i18n: file: krdcui.rc:22
 #. i18n: ectx: ToolBar (krdc_remote_view_toolbar)
-#: rc.cpp:6 rc.cpp:572
+#: rc.cpp:566
 msgid "Remote View Toolbar"
 msgstr ""
 
 #. i18n: file: core/krdc.kcfg:13
 #. i18n: ectx: label, entry (OpenSessions), group (General)
-#: rc.cpp:575
+#: rc.cpp:569
 msgid "Sessions"
 msgstr ""
 
@@ -1444,7 +1444,7 @@
 msgid "Please enter the username you would like to use for login."
 msgstr ""
 
-#: nx/nxview.cpp:140 rdp/rdpview.cpp:140 vnc/vncview.cpp:275
+#: nx/nxview.cpp:140 rdp/rdpview.cpp:140 vnc/vncview.cpp:265
 msgid "Access to the system requires a password."
 msgstr "Mae angen cyfrinair i gael mynediad i'r cysawd."
 
@@ -1561,11 +1561,11 @@
 msgid "VNC server closed connection."
 msgstr ""
 
-#: vnc/vncview.cpp:276
+#: vnc/vncview.cpp:266
 msgid "Authentication failed. Please try again."
 msgstr ""
 
-#: vnc/vncview.cpp:300 vnc/vncview.cpp:302
+#: vnc/vncview.cpp:290 vnc/vncview.cpp:292
 msgid "VNC failure"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kreadconfig.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kreadconfig.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kreadconfig.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kreadconfig.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kreadconfig\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:31+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-16 14:19+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kreadconfig.cpp:54
 msgid "KReadConfig"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kres_groupwise.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kres_groupwise.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kres_groupwise.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kres_groupwise.po	2012-04-18 08:59:26.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kabc_resourcegroupwise.cpp:208
 #, kde-format
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kres_remote.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kres_remote.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kres_remote.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kres_remote.po	2012-04-18 08:59:26.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdepim/kres_remote.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2008-02-15 21:48+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: resourceremote.cpp:205
 msgid "Downloading Calendar"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kreversi.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kreversi.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kreversi.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kreversi.po	2012-04-18 08:59:24.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kreversi\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:55+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:51+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: highscores.cpp:48
 msgid "Very Easy"
@@ -27,7 +27,7 @@
 msgid "Easy"
 msgstr ""
 
-#: highscores.cpp:48 mainwindow.cpp:144
+#: highscores.cpp:48 mainwindow.cpp:138
 msgid "Normal"
 msgstr ""
 
@@ -150,150 +150,150 @@
 msgid "White"
 msgstr "Gwyn"
 
-#: mainwindow.cpp:80 mainwindow.cpp:321 mainwindow.cpp:389
+#: mainwindow.cpp:80 mainwindow.cpp:314 mainwindow.cpp:382
 msgid "Your turn."
 msgstr ""
 
-#: mainwindow.cpp:81 mainwindow.cpp:450
+#: mainwindow.cpp:81 mainwindow.cpp:443
 #, kde-format
 msgid "You: %1"
 msgstr ""
 
-#: mainwindow.cpp:82 mainwindow.cpp:451
+#: mainwindow.cpp:82 mainwindow.cpp:444
 #, kde-format
 msgid "%1: %2"
 msgstr ""
 
-#: mainwindow.cpp:95
+#: mainwindow.cpp:92
 msgid "Move History"
 msgstr ""
 
-#: mainwindow.cpp:127
+#: mainwindow.cpp:121
 msgid "Players && Seats"
 msgstr ""
 
-#: mainwindow.cpp:132
+#: mainwindow.cpp:126
 msgid "Show Last Move"
 msgstr "Dangos Symudiad Diwethaf"
 
-#: mainwindow.cpp:136
+#: mainwindow.cpp:130
 msgid "Show Legal Moves"
 msgstr "Dangos Symudiadau Cyfreithiol"
 
-#: mainwindow.cpp:140
+#: mainwindow.cpp:134
 msgid "Animation Speed"
 msgstr "Cyflymder Bywlunio"
 
-#: mainwindow.cpp:144
+#: mainwindow.cpp:138
 msgid "Slow"
 msgstr "Araf"
 
-#: mainwindow.cpp:144
+#: mainwindow.cpp:138
 msgid "Fast"
 msgstr "Cyflym"
 
-#: mainwindow.cpp:157
+#: mainwindow.cpp:151
 msgid "Use Colored Chips"
 msgstr ""
 
-#: mainwindow.cpp:162
+#: mainwindow.cpp:156
 msgid "Show Move History"
 msgstr ""
 
-#: mainwindow.cpp:286
+#: mainwindow.cpp:279
 msgid "Online game"
 msgstr ""
 
-#: mainwindow.cpp:339
+#: mainwindow.cpp:332
 msgid "GAME OVER"
 msgstr ""
 
-#: mainwindow.cpp:351
+#: mainwindow.cpp:344
 msgid "Game is drawn!"
 msgstr ""
 
-#: mainwindow.cpp:356
+#: mainwindow.cpp:349
 msgid "You win!"
 msgstr ""
 
-#: mainwindow.cpp:361
+#: mainwindow.cpp:354
 msgid "You have lost!"
 msgstr ""
 
-#: mainwindow.cpp:365
+#: mainwindow.cpp:358
 #, kde-format
 msgid ""
 "\n"
 "You: %1"
 msgstr ""
 
-#: mainwindow.cpp:366
+#: mainwindow.cpp:359
 #, kde-format
 msgid ""
 "\n"
 "%1: %2"
 msgstr ""
 
-#: mainwindow.cpp:368
+#: mainwindow.cpp:361
 msgid "Game over"
 msgstr ""
 
-#: mainwindow.cpp:456
+#: mainwindow.cpp:449
 msgid "Opponent"
 msgstr ""
 
-#: mainwindow.cpp:456
+#: mainwindow.cpp:449
 msgid "Computer"
 msgstr ""
 
-#: rc.cpp:22
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, Thierry Vignaud, ,Launchpad Contributions:"
 
-#: rc.cpp:23
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kreversiui.rc:13
 #. i18n: ectx: Menu (view)
-#: rc.cpp:15 rc.cpp:26
+#: rc.cpp:5
 msgid "&View"
 msgstr ""
 
 #. i18n: file: kreversiui.rc:18
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:18 rc.cpp:29
+#: rc.cpp:8
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: kreversiui.rc:25
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:21 rc.cpp:32
+#: rc.cpp:11
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: kreversi.kcfg:9
 #. i18n: ectx: label, entry (AnimationSpeed), group (Game)
-#: rc.cpp:3 rc.cpp:35
+#: rc.cpp:14
 msgid "The speed of the animations."
 msgstr "Cyflymder y bywlunio."
 
 #. i18n: file: kreversi.kcfg:18
 #. i18n: ectx: label, entry (CompetitiveGameChoice), group (Game)
-#: rc.cpp:6 rc.cpp:38
+#: rc.cpp:17
 msgid "Whether to play competitively in contrast to casually."
 msgstr "A ddylai chwarae fel cystadleuaeth yn lle am hwyl."
 
 #. i18n: file: kreversi.kcfg:22
 #. i18n: ectx: label, entry (level), group (Game)
-#: rc.cpp:9 rc.cpp:41
+#: rc.cpp:20
 msgid "Difficulty level"
 msgstr ""
 
 #. i18n: file: kreversi.kcfg:26
 #. i18n: ectx: label, entry (UseColoredChips), group (Game)
-#: rc.cpp:12 rc.cpp:44
+#: rc.cpp:23
 msgid "Whether to use colored chips instead of black and white ones."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krfb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krfb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krfb.po	2012-03-23 07:39:14.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krfb.po	2012-04-18 08:59:25.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: krfb\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 21:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-07-18 17:59+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:05+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: connectiondialog.cpp:35
 msgid "New Connection"
@@ -75,7 +75,7 @@
 
 #. i18n: file: ui/invitewidget.ui:125
 #. i18n: ectx: property (text), widget (QPushButton, btnManageInvite)
-#: invitedialog.cpp:72 rc.cpp:87
+#: invitedialog.cpp:72 rc.cpp:63
 #, kde-format, no-c-format
 msgid "&Manage Invitations (%1)..."
 msgstr "&Trefnu Gwahoddiadau (%1)..."
@@ -290,71 +290,69 @@
 "different address or be unreachable for other computers."
 msgstr ""
 
-#: rc.cpp:25
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KGyfieithu - Meddalwedd Gymraeg, ,Launchpad Contributions:"
 
-#: rc.cpp:26
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: ui/configsecurity.ui:20
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_askOnConnect)
-#: rc.cpp:29
+#: rc.cpp:5
 msgid "Ask before accepting connections"
 msgstr ""
 
 #. i18n: file: ui/configsecurity.ui:30
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowDesktopControl)
-#: rc.cpp:32
+#: rc.cpp:8
 msgid "Allow remote connections to control your desktop"
 msgstr ""
 
 #. i18n: file: ui/configsecurity.ui:40
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowUninvitedConnections)
-#: rc.cpp:35
+#: rc.cpp:11
 msgid "Allow uninvited connections"
 msgstr ""
 
 #. i18n: file: ui/configsecurity.ui:50
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:38
+#: rc.cpp:14
 msgid "Uninvited connections password:"
 msgstr ""
 
-#. i18n: file: krfb.kcfg:16
-#. i18n: ectx: label, entry (publishService), group (TCP)
 #. i18n: file: ui/configtcp.ui:22
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_publishService)
 #. i18n: file: krfb.kcfg:16
 #. i18n: ectx: label, entry (publishService), group (TCP)
-#: rc.cpp:9 rc.cpp:41 rc.cpp:181
+#: rc.cpp:17 rc.cpp:157
 msgid "Announce the service on the local network"
 msgstr ""
 
 #. i18n: file: ui/configtcp.ui:32
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_useDefaultPort)
-#: rc.cpp:44
+#: rc.cpp:20
 msgid "Use default port"
 msgstr ""
 
 #. i18n: file: ui/configtcp.ui:50
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:47
+#: rc.cpp:23
 msgid "Listening port:"
 msgstr ""
 
 #. i18n: file: ui/connectionwidget.ui:47
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:50
+#: rc.cpp:26
 msgid "Attention"
 msgstr "Taler Sylw"
 
 #. i18n: file: ui/connectionwidget.ui:72
 #. i18n: ectx: property (text), widget (QLabel, mainTextLabel)
-#: rc.cpp:53
+#: rc.cpp:29
 msgid ""
 "Somebody is requesting a connection to your computer. Granting this will "
 "allow the remote user to watch your desktop. "
@@ -364,13 +362,13 @@
 
 #. i18n: file: ui/connectionwidget.ui:102
 #. i18n: ectx: property (text), widget (QLabel, TextLabel1)
-#: rc.cpp:56
+#: rc.cpp:32
 msgid "Remote system:"
 msgstr "Cysawd pell:"
 
 #. i18n: file: ui/connectionwidget.ui:118
 #. i18n: ectx: property (text), widget (QLabel, remoteHost)
-#: rc.cpp:59
+#: rc.cpp:35
 msgid "123.234.123.234"
 msgstr "123.234.123.234"
 
@@ -378,7 +376,7 @@
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAllowRemoteControl)
 #. i18n: file: ui/tubesconnectionwidget.ui:101
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbAllowRemoteControl)
-#: rc.cpp:62 rc.cpp:169
+#: rc.cpp:38 rc.cpp:145
 msgid ""
 "If you turn this option on, the remote user can enter keystrokes and use "
 "your mouse pointer. This gives them full control over your computer, so be "
@@ -394,7 +392,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, cbAllowRemoteControl)
 #. i18n: file: ui/tubesconnectionwidget.ui:104
 #. i18n: ectx: property (text), widget (QCheckBox, cbAllowRemoteControl)
-#: rc.cpp:65 rc.cpp:172
+#: rc.cpp:41 rc.cpp:148
 msgid "Allow remote user to &control keyboard and mouse"
 msgstr "Caniatáu i'r defnyddiwr pell &reoli'r bysellfwrdd a'r lygoden"
 
@@ -402,13 +400,13 @@
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2)
 #. i18n: file: ui/manageinvitations.ui:25
 #. i18n: ectx: property (text), widget (QLabel, TextLabel2)
-#: rc.cpp:68 rc.cpp:93
+#: rc.cpp:44 rc.cpp:69
 msgid "Welcome to KDE Desktop Sharing"
 msgstr "Croeso i Rannu Penbwrdd KDE"
 
 #. i18n: file: ui/invitewidget.ui:50
 #. i18n: ectx: property (text), widget (QLabel, helpLabel)
-#: rc.cpp:71
+#: rc.cpp:47
 msgid ""
 "KDE Desktop Sharing allows you to invite somebody at a remote location to "
 "watch and possibly control your desktop. <a href=\"whatsthis\">More about "
@@ -417,7 +415,7 @@
 
 #. i18n: file: ui/invitewidget.ui:105
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnCreateInvite)
-#: rc.cpp:74
+#: rc.cpp:50
 msgid ""
 "Create a new invitation and display the connection data. Use this option if "
 "you want to invite somebody personally, for example, to give the connection "
@@ -429,13 +427,13 @@
 
 #. i18n: file: ui/invitewidget.ui:108
 #. i18n: ectx: property (text), widget (QPushButton, btnCreateInvite)
-#: rc.cpp:77
+#: rc.cpp:53
 msgid "Create &Personal Invitation..."
 msgstr "Creu Gwahoddiad &Personol..."
 
 #. i18n: file: ui/invitewidget.ui:115
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnEmailInvite)
-#: rc.cpp:80
+#: rc.cpp:56
 msgid ""
 "This button will start your email application with a pre-configured text "
 "that explains to the recipient how to connect to your computer. "
@@ -445,19 +443,19 @@
 
 #. i18n: file: ui/invitewidget.ui:118
 #. i18n: ectx: property (text), widget (QPushButton, btnEmailInvite)
-#: rc.cpp:83
+#: rc.cpp:59
 msgid "Invite via &Email..."
 msgstr "Gwahodd drwy &Ebost..."
 
 #. i18n: file: ui/manageinvitations.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, ManageInvitationsDialog)
-#: rc.cpp:90
+#: rc.cpp:66
 msgid "Manage Invitations - Desktop Sharing"
 msgstr "Trefnu Gwahoddiadau - Rhannu Penbwrdd"
 
 #. i18n: file: ui/manageinvitations.ui:38
 #. i18n: ectx: property (text), widget (QLabel, helpLabel)
-#: rc.cpp:96
+#: rc.cpp:72
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -473,79 +471,79 @@
 
 #. i18n: file: ui/manageinvitations.ui:95
 #. i18n: ectx: property (text), widget (QTreeWidget, invitationWidget)
-#: rc.cpp:102
+#: rc.cpp:78
 msgid "Creation Time"
 msgstr ""
 
 #. i18n: file: ui/manageinvitations.ui:100
 #. i18n: ectx: property (text), widget (QTreeWidget, invitationWidget)
-#: rc.cpp:105
+#: rc.cpp:81
 msgid "Expire Time"
 msgstr ""
 
 #. i18n: file: ui/manageinvitations.ui:124
 #. i18n: ectx: property (toolTip), widget (QPushButton, newPersonalInvitationButton)
-#: rc.cpp:108
+#: rc.cpp:84
 msgid "Create a new personal invitation..."
 msgstr "Creu gwahoddiad personol newydd..."
 
 #. i18n: file: ui/manageinvitations.ui:127
 #. i18n: ectx: property (whatsThis), widget (QPushButton, newPersonalInvitationButton)
-#: rc.cpp:111
+#: rc.cpp:87
 msgid "Click this button to create a new personal invitation."
 msgstr "Cliciwch ar y botwm yma i greu gwahoddiad personol newydd."
 
 #. i18n: file: ui/manageinvitations.ui:130
 #. i18n: ectx: property (text), widget (QPushButton, newPersonalInvitationButton)
-#: rc.cpp:114
+#: rc.cpp:90
 msgid "New &Personal Invitation..."
 msgstr "Gwahoddiad &Personol Newydd..."
 
 #. i18n: file: ui/manageinvitations.ui:137
 #. i18n: ectx: property (toolTip), widget (QPushButton, newEmailInvitationButton)
-#: rc.cpp:117
+#: rc.cpp:93
 msgid "Send a new invitation via email..."
 msgstr "Anfon gwahoddiad newydd drwy ebost..."
 
 #. i18n: file: ui/manageinvitations.ui:140
 #. i18n: ectx: property (whatsThis), widget (QPushButton, newEmailInvitationButton)
-#: rc.cpp:120
+#: rc.cpp:96
 msgid "Click this button to send a new invitation via email."
 msgstr "Cliciwch ar y botwm yma i anfon gwahoddiad newydd drwy ebost."
 
 #. i18n: file: ui/manageinvitations.ui:143
 #. i18n: ectx: property (text), widget (QPushButton, newEmailInvitationButton)
-#: rc.cpp:123
+#: rc.cpp:99
 msgid "&New Email Invitation..."
 msgstr "Gwahoddiad Ebost &Newydd..."
 
 #. i18n: file: ui/manageinvitations.ui:153
 #. i18n: ectx: property (toolTip), widget (QPushButton, deleteAllButton)
-#: rc.cpp:126
+#: rc.cpp:102
 msgid "Delete all invitations"
 msgstr "Dileu pob gwahoddiad"
 
 #. i18n: file: ui/manageinvitations.ui:156
 #. i18n: ectx: property (whatsThis), widget (QPushButton, deleteAllButton)
-#: rc.cpp:129
+#: rc.cpp:105
 msgid "Deletes all open invitations."
 msgstr "Dileu pob gwahoddiad agored"
 
 #. i18n: file: ui/manageinvitations.ui:159
 #. i18n: ectx: property (text), widget (QPushButton, deleteAllButton)
-#: rc.cpp:132
+#: rc.cpp:108
 msgid "Delete All"
 msgstr ""
 
 #. i18n: file: ui/manageinvitations.ui:169
 #. i18n: ectx: property (toolTip), widget (QPushButton, deleteOneButton)
-#: rc.cpp:135
+#: rc.cpp:111
 msgid "Delete the selected invitation"
 msgstr "Dileu'r gwahoddiad dewisiedig"
 
 #. i18n: file: ui/manageinvitations.ui:172
 #. i18n: ectx: property (whatsThis), widget (QPushButton, deleteOneButton)
-#: rc.cpp:138
+#: rc.cpp:114
 msgid ""
 "Delete the selected invitation. The invited person will not be able to "
 "connect using this invitation anymore."
@@ -555,13 +553,13 @@
 
 #. i18n: file: ui/manageinvitations.ui:175
 #. i18n: ectx: property (text), widget (QPushButton, deleteOneButton)
-#: rc.cpp:141
+#: rc.cpp:117
 msgid "&Delete"
 msgstr ""
 
 #. i18n: file: ui/personalinvitewidget.ui:47
 #. i18n: ectx: property (text), widget (QLabel, mainTextLabel)
-#: rc.cpp:144
+#: rc.cpp:120
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -580,13 +578,13 @@
 
 #. i18n: file: ui/personalinvitewidget.ui:81
 #. i18n: ectx: property (text), widget (QLabel, kActiveLabel5)
-#: rc.cpp:151
+#: rc.cpp:127
 msgid "<b>Host:</b>"
 msgstr "<b>Gwesteiwr:</b>"
 
 #. i18n: file: ui/personalinvitewidget.ui:116
 #. i18n: ectx: property (text), widget (QLabel, hostHelpLabel)
-#: rc.cpp:154
+#: rc.cpp:130
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -600,70 +598,70 @@
 
 #. i18n: file: ui/personalinvitewidget.ui:129
 #. i18n: ectx: property (text), widget (QLabel, kActiveLabel6)
-#: rc.cpp:160
+#: rc.cpp:136
 msgid "<b>Password:</b>"
 msgstr "<b>Cyfrinair:</b>"
 
 #. i18n: file: ui/personalinvitewidget.ui:161
 #. i18n: ectx: property (text), widget (QLabel, kActiveLabel7)
-#: rc.cpp:163
+#: rc.cpp:139
 msgid "<b>Expiration time:</b>"
 msgstr "<b>Amser daw i ben:</b>"
 
 #. i18n: file: ui/tubesconnectionwidget.ui:48
 #. i18n: ectx: property (text), widget (QLabel, TextLabel5)
-#: rc.cpp:166
+#: rc.cpp:142
 msgid "Confirmation"
 msgstr ""
 
 #. i18n: file: krfb.kcfg:8
 #. i18n: ectx: label, entry (useDefaultPort), group (TCP)
-#: rc.cpp:3 rc.cpp:175
+#: rc.cpp:151
 msgid "Use the default port for VNC (5900)"
 msgstr ""
 
 #. i18n: file: krfb.kcfg:12
 #. i18n: ectx: label, entry (port), group (TCP)
-#: rc.cpp:6 rc.cpp:178
+#: rc.cpp:154
 msgid "This is the port on which krfb will listen."
 msgstr ""
 
 #. i18n: file: krfb.kcfg:22
 #. i18n: ectx: label, entry (allowDesktopControl), group (Security)
-#: rc.cpp:12 rc.cpp:184
+#: rc.cpp:160
 msgid "Allow remote connections to manage the desktop."
 msgstr ""
 
 #. i18n: file: krfb.kcfg:26
 #. i18n: ectx: label, entry (askOnConnect), group (Security)
-#: rc.cpp:15 rc.cpp:187
+#: rc.cpp:163
 msgid "Ask before allowing a remote connection."
 msgstr ""
 
 #. i18n: file: krfb.kcfg:30
 #. i18n: ectx: label, entry (allowUninvitedConnections), group (Security)
-#: rc.cpp:18 rc.cpp:190
+#: rc.cpp:166
 msgid "Allow connections without an invitation."
 msgstr ""
 
 #. i18n: file: krfb.kcfg:34
 #. i18n: ectx: label, entry (uninvitedConnectionPassword), group (Security)
-#: rc.cpp:21 rc.cpp:193
+#: rc.cpp:169
 msgid "Password for uninvited connections."
 msgstr ""
 
 #. i18n: file: krfb.kcfg:39
 #. i18n: ectx: label, entry (preferredFrameBufferPlugin), group (FrameBuffer)
-#: rc.cpp:24 rc.cpp:196
+#: rc.cpp:172
 msgid "Preferred Frame Buffer Plugin"
 msgstr ""
 
-#: rfbservermanager.cpp:214
+#: rfbservermanager.cpp:216
 #, kde-format
 msgid "The remote user %1 is now connected."
 msgstr ""
 
-#: rfbservermanager.cpp:228
+#: rfbservermanager.cpp:230
 #, kde-format
 msgid "The remote user %1 disconnected."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kruler.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kruler.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kruler.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kruler.po	2012-04-18 08:59:37.000000000 +0000
@@ -2,150 +2,150 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdegraphics/kruler.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 04:01+0000\n"
-"PO-Revision-Date: 2012-03-14 17:01+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-11 16:36+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:31+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: klineal.cpp:96
 msgctxt "@title:window"
 msgid "KRuler"
 msgstr ""
 
-#: klineal.cpp:99
+#: klineal.cpp:100
 msgid ""
 "This is a tool to measure pixel distances and colors on the screen. It is "
 "useful for working on layouts of dialogs, web pages etc."
 msgstr ""
 
-#: klineal.cpp:128
+#: klineal.cpp:129
 msgid "This is the current distance measured in pixels."
 msgstr ""
 
-#: klineal.cpp:135
+#: klineal.cpp:136
 msgid ""
 "This is the current color in hexadecimal rgb representation as you may use "
 "it in HTML or as a QColor name. The rectangles background shows the color of "
 "the pixel inside the little square at the end of the line cursor."
 msgstr ""
 
-#: klineal.cpp:142
+#: klineal.cpp:143
 msgid "Turn Left"
 msgstr ""
 
-#: klineal.cpp:147
+#: klineal.cpp:148
 msgid "Turn Right"
 msgstr ""
 
-#: klineal.cpp:157
+#: klineal.cpp:158
 msgid "KRuler"
 msgstr "KMesurydd"
 
-#: klineal.cpp:158
+#: klineal.cpp:159
 msgid "&Orientation"
 msgstr "&Cyfeiriadaeth"
 
-#: klineal.cpp:159
+#: klineal.cpp:160
 msgctxt "Turn Kruler North"
 msgid "&North"
 msgstr ""
 
-#: klineal.cpp:161
+#: klineal.cpp:162
 msgctxt "Turn Kruler East"
 msgid "&East"
 msgstr ""
 
-#: klineal.cpp:163
+#: klineal.cpp:164
 msgctxt "Turn Kruler South"
 msgid "&South"
 msgstr ""
 
-#: klineal.cpp:165
+#: klineal.cpp:166
 msgctxt "Turn Kruler West"
 msgid "&West"
 msgstr ""
 
-#: klineal.cpp:167
+#: klineal.cpp:168
 msgid "&Turn Right"
 msgstr ""
 
-#: klineal.cpp:169
+#: klineal.cpp:170
 msgid "Turn &Left"
 msgstr ""
 
-#: klineal.cpp:173
+#: klineal.cpp:174
 msgid "&Length"
 msgstr "&Hyd"
 
-#: klineal.cpp:174
+#: klineal.cpp:175
 msgctxt "Make Kruler Height Short"
 msgid "&Short"
 msgstr ""
 
-#: klineal.cpp:176
+#: klineal.cpp:177
 msgctxt "Make Kruler Height Medium"
 msgid "&Medium"
 msgstr ""
 
-#: klineal.cpp:178
+#: klineal.cpp:179
 msgctxt "Make Kruler Height Tall"
 msgid "&Tall"
 msgstr ""
 
-#: klineal.cpp:180 klineal.cpp:438
+#: klineal.cpp:181 klineal.cpp:439
 msgid "&Full Screen Width"
 msgstr ""
 
-#: klineal.cpp:183
+#: klineal.cpp:184
 msgid "Length..."
 msgstr ""
 
-#: klineal.cpp:187
+#: klineal.cpp:188
 msgid "&Scale"
 msgstr ""
 
-#: klineal.cpp:188 klineal.cpp:538
+#: klineal.cpp:189 klineal.cpp:539
 msgid "Right to Left"
 msgstr ""
 
-#: klineal.cpp:190
+#: klineal.cpp:191
 msgid "Center Origin"
 msgstr ""
 
-#: klineal.cpp:193
+#: klineal.cpp:194
 msgid "Offset..."
 msgstr ""
 
-#: klineal.cpp:197
+#: klineal.cpp:198
 msgid "Percentage"
 msgstr ""
 
-#: klineal.cpp:205
+#: klineal.cpp:206
 msgid "O&pacity"
 msgstr ""
 
-#: klineal.cpp:226
+#: klineal.cpp:227
 msgid "Copy Color"
 msgstr ""
 
-#: klineal.cpp:438
+#: klineal.cpp:439
 msgid "&Full Screen Height"
 msgstr ""
 
-#: klineal.cpp:538
+#: klineal.cpp:539
 msgid "Left to Right"
 msgstr ""
 
-#: klineal.cpp:540
+#: klineal.cpp:541
 msgid "Bottom to Top"
 msgstr ""
 
-#: klineal.cpp:540
+#: klineal.cpp:541
 msgid "Top to Bottom"
 msgstr ""
 
@@ -154,7 +154,7 @@
 msgid "Scale Offset"
 msgstr ""
 
-#: klineal.cpp:587
+#: klineal.cpp:588
 msgid "Offset:"
 msgstr ""
 
@@ -163,24 +163,24 @@
 msgid "Ruler Length"
 msgstr ""
 
-#: klineal.cpp:604
+#: klineal.cpp:605
 msgid "Length:"
 msgstr ""
 
-#: klineal.cpp:633
+#: klineal.cpp:634
 msgid "Appearance"
 msgstr ""
 
-#: klineal.cpp:638
+#: klineal.cpp:639
 msgid "Advanced"
 msgstr ""
 
-#: klineal.cpp:994
+#: klineal.cpp:993
 #, kde-format
 msgid "Offset: %1"
 msgstr ""
 
-#: klineal.cpp:1001
+#: klineal.cpp:1000
 #, kde-format
 msgid "Length: %1 px"
 msgstr ""
@@ -223,19 +223,19 @@
 msgid "Initial port to KDE 2"
 msgstr ""
 
-#: rc.cpp:58
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:59
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: cfg_advanced.ui:23
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_NativeMoving)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid ""
 "If this option is enabled, the window is being moved using the operations "
 "from the window manager."
@@ -243,108 +243,108 @@
 
 #. i18n: file: cfg_advanced.ui:26
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_NativeMoving)
-#: rc.cpp:6
+#: rc.cpp:8
 msgid "Native moving"
 msgstr ""
 
 #. i18n: file: cfg_appearance.ui:20
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:9
+#: rc.cpp:11
 msgid "Background color:"
 msgstr ""
 
 #. i18n: file: cfg_appearance.ui:30
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:12
+#: rc.cpp:14
 msgid "Font:"
 msgstr ""
 
 #. i18n: file: cfg_appearance.ui:40
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_TrayIcon)
-#: rc.cpp:15
+#: rc.cpp:17
 msgid "Show tray icon"
 msgstr ""
 
 #. i18n: file: cfg_appearance.ui:47
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_RotateButtonsVisible)
-#: rc.cpp:18
+#: rc.cpp:20
 msgid "Show rotation buttons"
 msgstr ""
 
 #. i18n: file: cfg_appearance.ui:54
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_CloseButtonVisible)
-#: rc.cpp:21
+#: rc.cpp:23
 msgid "Show close button"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:8
 #. i18n: ectx: label, entry (BgColor), group (StoredSettings)
-#: rc.cpp:24
+#: rc.cpp:26
 msgid "Background color of the ruler."
 msgstr ""
 
 #. i18n: file: kruler.kcfg:12
 #. i18n: ectx: label, entry (Length), group (StoredSettings)
-#: rc.cpp:27
+#: rc.cpp:29
 msgid "Length of the ruler."
 msgstr ""
 
 #. i18n: file: kruler.kcfg:16
 #. i18n: ectx: label, entry (ScaleFont), group (StoredSettings)
-#: rc.cpp:30
+#: rc.cpp:32
 msgid "Font of the text on the ruler scale."
 msgstr ""
 
 #. i18n: file: kruler.kcfg:20
 #. i18n: ectx: label, entry (Orientation), group (StoredSettings)
-#: rc.cpp:33
+#: rc.cpp:35
 msgid "Orientation of the ruler"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:24
 #. i18n: ectx: label, entry (LeftToRight), group (StoredSettings)
-#: rc.cpp:36
+#: rc.cpp:38
 msgid "Direction of the ruler"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:28
 #. i18n: ectx: label, entry (Offset), group (StoredSettings)
-#: rc.cpp:39
+#: rc.cpp:41
 msgid "Offset of the origin"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:32
 #. i18n: ectx: label, entry (RelativeScale), group (StoredSettings)
-#: rc.cpp:42
+#: rc.cpp:44
 msgid "Is the scale of the ruler relative (percentage)"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:36
 #. i18n: ectx: label, entry (TrayIcon), group (StoredSettings)
-#: rc.cpp:45
+#: rc.cpp:47
 msgid "Is a tray icon used"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:40
 #. i18n: ectx: label, entry (Opacity), group (StoredSettings)
-#: rc.cpp:48
+#: rc.cpp:50
 msgid "Opacity of the window"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:44
 #. i18n: ectx: label, entry (RotateButtonsVisible), group (StoredSettings)
-#: rc.cpp:51
+#: rc.cpp:53
 msgid "Are the rotate buttons visible"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:48
 #. i18n: ectx: label, entry (CloseButtonVisible), group (StoredSettings)
-#: rc.cpp:54
+#: rc.cpp:56
 msgid "Is the close button visible"
 msgstr ""
 
 #. i18n: file: kruler.kcfg:52
 #. i18n: ectx: label, entry (NativeMoving), group (StoredSettings)
-#: rc.cpp:57
+#: rc.cpp:59
 msgid "Is native moving (possibly wobbling windows) active"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krunner.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krunner.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/krunner.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/krunner.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 02:35+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,82 +16,58 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:11+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:39+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: lock/main.cc:61
-msgid "KDE Screen Locker"
-msgstr ""
-
-#: lock/main.cc:62
-msgid "Session Locker for KDE Workspace"
-msgstr ""
-
-#: lock/main.cc:65
-msgid "Force session locking"
-msgstr "Gorfodi cloi'r sesiwn"
-
-#: lock/main.cc:66
-msgid "Only start screen saver"
+#: krunnerapp.cpp:127 krunnerdialog.cpp:74
+msgid "Run Command"
 msgstr ""
 
-#: lock/main.cc:67
-msgid "Immediately show the unlock dialog"
+#: krunnerapp.cpp:132
+msgid "Run Command on clipboard contents"
 msgstr ""
 
-#: lock/main.cc:67
-msgid "Only use the blank screen saver"
+#: krunnerapp.cpp:138
+msgid "Show System Activity"
 msgstr ""
 
-#: lock/main.cc:68
-msgid "start with plasma unlocked for configuring"
-msgstr ""
+#: krunnerapp.cpp:144
+msgid "Switch User"
+msgstr "Newid Defnyddiwr"
 
-#: lock/main.cc:70
-msgid "Fork into the background after starting up"
+#: krunnerapp.cpp:154
+msgid "Lock Session"
 msgstr ""
 
-#: lock/autologout.cc:38
-msgid "<qt><nobr><b>Automatic Log Out</b></nobr></qt>"
+#: krunnerapp.cpp:194
+#, kde-format
+msgctxt "Run krunner restricting the search only to runner %1"
+msgid "Run Command (runner \"%1\" only)"
 msgstr ""
 
-#: lock/autologout.cc:39
-msgid ""
-"<qt>To prevent being logged out, resume using this session by moving the "
-"mouse or pressing a key.</qt>"
+#: main.cpp:38
+msgid "KDE run command interface"
 msgstr ""
-"<qt>I atal cael eich logio allan, parhewch i ddefnyddio'r sesiwn yma trwy "
-"symud y llygoden a pwyso unrhyw allwedd ar yr allweddell</qt>"
 
-#: lock/autologout.cc:44
-msgid "Time Remaining:"
+#: main.cpp:50
+msgid "Run Command Interface"
 msgstr ""
 
-#: lock/autologout.cc:77
-#, kde-format
-msgid ""
-"<qt><nobr>You will be automatically logged out in 1 second</nobr></qt>"
-msgid_plural ""
-"<qt><nobr>You will be automatically logged out in %1 seconds</nobr></qt>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lock/lockprocess.cc:817
-msgid "Will not lock the session, as unlocking would be impossible:\n"
-msgstr "Ni fydd yn cloi'r sesiwn, oherwydd buasai datgloi yn amhosibl:\n"
+#: main.cpp:52
+msgid "(c) 2006, Aaron Seigo"
+msgstr "(c) 2006, Aaron Seigo"
 
-#: lock/lockprocess.cc:821
-msgid "Cannot start <i>kcheckpass</i>."
-msgstr "Methu cychwyn <i>kcheckpass</i>."
+#: main.cpp:53
+msgid "Aaron J. Seigo"
+msgstr "Aaron J. Seigo"
 
-#: lock/lockprocess.cc:822
-msgid ""
-"<i>kcheckpass</i> is unable to operate. Possibly it is not setuid root."
+#: main.cpp:54
+msgid "Author and maintainer"
 msgstr ""
 
-#: lock/lockprocess.cc:885
-msgid "No appropriate greeter plugin configured."
-msgstr "Ni ffurfweddir ategyn cyfarchydd penodol."
+#: ksystemactivitydialog.cpp:40
+msgid "System Activity"
+msgstr ""
 
 #: lock/lockdlg.cc:100
 msgid "<nobr><b>The session is locked</b></nobr><br />"
@@ -164,10 +140,98 @@
 msgid "Start &New Session"
 msgstr "Dechrau Sesiwn &Newydd"
 
-#: krunnerdialog.cpp:67 krunnerapp.cpp:126
-msgid "Run Command"
+#: lock/main.cc:61
+msgid "KDE Screen Locker"
+msgstr ""
+
+#: lock/main.cc:62
+msgid "Session Locker for KDE Workspace"
 msgstr ""
 
+#: lock/main.cc:65
+msgid "Force session locking"
+msgstr "Gorfodi cloi'r sesiwn"
+
+#: lock/main.cc:66
+msgid "Only start screen saver"
+msgstr ""
+
+#: lock/main.cc:67
+msgid "Immediately show the unlock dialog"
+msgstr ""
+
+#: lock/main.cc:68
+msgid "Only use the blank screen saver"
+msgstr ""
+
+#: lock/main.cc:69
+msgid "start with plasma unlocked for configuring"
+msgstr ""
+
+#: lock/main.cc:70
+msgid "Fork into the background after starting up"
+msgstr ""
+
+#: lock/lockprocess.cc:834
+msgid "Will not lock the session, as unlocking would be impossible:\n"
+msgstr "Ni fydd yn cloi'r sesiwn, oherwydd buasai datgloi yn amhosibl:\n"
+
+#: lock/lockprocess.cc:838
+msgid "Cannot start <i>kcheckpass</i>."
+msgstr "Methu cychwyn <i>kcheckpass</i>."
+
+#: lock/lockprocess.cc:839
+msgid ""
+"<i>kcheckpass</i> is unable to operate. Possibly it is not setuid root."
+msgstr ""
+
+#: lock/lockprocess.cc:902
+msgid "No appropriate greeter plugin configured."
+msgstr "Ni ffurfweddir ategyn cyfarchydd penodol."
+
+#: lock/autologout.cc:38
+msgid "<qt><nobr><b>Automatic Log Out</b></nobr></qt>"
+msgstr ""
+
+#: lock/autologout.cc:39
+msgid ""
+"<qt>To prevent being logged out, resume using this session by moving the "
+"mouse or pressing a key.</qt>"
+msgstr ""
+"<qt>I atal cael eich logio allan, parhewch i ddefnyddio'r sesiwn yma trwy "
+"symud y llygoden a pwyso unrhyw allwedd ar yr allweddell</qt>"
+
+#: lock/autologout.cc:44
+msgid "Time Remaining:"
+msgstr ""
+
+#: lock/autologout.cc:77
+#, kde-format
+msgid ""
+"<qt><nobr>You will be automatically logged out in 1 second</nobr></qt>"
+msgid_plural ""
+"<qt><nobr>You will be automatically logged out in %1 seconds</nobr></qt>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: configdialog.cpp:52
+msgid "Plugins"
+msgstr ""
+
+#: configdialog.cpp:81
+msgid "User Interface"
+msgstr ""
+
+#: configdialog.cpp:87
+msgid "Available Features"
+msgstr ""
+
+#: interfaces/quicksand/qs_statusbar.cpp:57
+#, kde-format
+msgctxt "%1 current item number, %2 total number of items"
+msgid "%1 of %2"
+msgstr "%1 o %2"
+
 #: interfaces/quicksand/qs_matchview.cpp:193
 msgid "Type to search."
 msgstr ""
@@ -195,7 +259,7 @@
 msgstr ""
 
 #: interfaces/quicksand/qs_dialog.cpp:59 interfaces/quicksand/qs_dialog.cpp:60
-#: interfaces/default/interface.cpp:85 interfaces/default/interface.cpp:86
+#: interfaces/default/interface.cpp:90 interfaces/default/interface.cpp:91
 msgid "Settings"
 msgstr "Gosodiadau"
 
@@ -203,108 +267,44 @@
 msgid "Actions"
 msgstr ""
 
-#: interfaces/quicksand/qs_dialog.cpp:317 interfaces/default/interface.cpp:256
+#: interfaces/quicksand/qs_dialog.cpp:317 interfaces/default/interface.cpp:273
 #, kde-format
 msgctxt "tooltip, shortcut"
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: interfaces/quicksand/qs_statusbar.cpp:57
-#, kde-format
-msgctxt "%1 current item number, %2 total number of items"
-msgid "%1 of %2"
-msgstr "%1 o %2"
-
-#: interfaces/default/interface.cpp:107
+#: interfaces/default/interface.cpp:112
 msgid "Help"
 msgstr "Cymorth"
 
-#: interfaces/default/interface.cpp:108
+#: interfaces/default/interface.cpp:113
 msgid "Information on using this application"
 msgstr ""
 
-#: interfaces/default/interface.cpp:406
+#: interfaces/default/interface.cpp:429
 #, kde-format
 msgid "(From %1, %2)"
 msgstr ""
 
-#: main.cpp:38
-msgid "KDE run command interface"
-msgstr ""
-
-#: main.cpp:50
-msgid "Run Command Interface"
-msgstr ""
-
-#: main.cpp:52
-msgid "(c) 2006, Aaron Seigo"
-msgstr "(c) 2006, Aaron Seigo"
-
-#: main.cpp:53
-msgid "Aaron J. Seigo"
-msgstr "Aaron J. Seigo"
-
-#: main.cpp:54
-msgid "Author and maintainer"
-msgstr ""
-
-#: configdialog.cpp:52
-msgid "Plugins"
-msgstr ""
-
-#: configdialog.cpp:81
-msgid "User Interface"
-msgstr ""
-
-#: configdialog.cpp:87
-msgid "Available Features"
-msgstr ""
-
-#: ksystemactivitydialog.cpp:39
-msgid "System Activity"
-msgstr ""
-
-#: krunnerapp.cpp:131
-msgid "Run Command on clipboard contents"
-msgstr ""
-
-#: krunnerapp.cpp:137
-msgid "Show System Activity"
-msgstr ""
-
-#: krunnerapp.cpp:150
-msgid "Switch User"
-msgstr "Newid Defnyddiwr"
-
-#: krunnerapp.cpp:160
-msgid "Lock Session"
-msgstr ""
-
-#: krunnerapp.cpp:199
-#, kde-format
-msgctxt "Run krunner restricting the search only to runner %1"
-msgid "Run Command (runner \"%1\" only)"
-msgstr ""
-
-#: rc.cpp:22
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:23
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ",,"
 
 #. i18n: file: kcfg/krunner.kcfg:13
 #. i18n: ectx: label, entry, group (General)
-#: rc.cpp:26
+#: rc.cpp:5
 msgid "The interface style to use in KRunner"
 msgstr ""
 
 #. i18n: file: kcfg/krunner.kcfg:21
 #. i18n: ectx: label, entry, group (General)
-#: rc.cpp:29
+#: rc.cpp:8
 msgid ""
 "Set to true to show the interface in a freely floating dialog instead of at "
 "the top of the screen"
@@ -312,55 +312,55 @@
 
 #. i18n: file: kcfg/krunner.kcfg:26
 #. i18n: ectx: label, entry, group (General)
-#: rc.cpp:32
+#: rc.cpp:11
 msgid "Completion mode used for the query text."
 msgstr ""
 
 #. i18n: file: kcfg/krunner.kcfg:31
 #. i18n: ectx: label, entry (PastQueries), group (General)
-#: rc.cpp:35
+#: rc.cpp:14
 msgid "History if past queries successfully completed"
 msgstr ""
 
 #. i18n: file: kcfg/krunner.kcfg:40
 #. i18n: ectx: label, entry (KeepTaskDialogAbove), group (TaskDialog)
-#: rc.cpp:39
+#: rc.cpp:17
 msgid "Whether to keep the tasks dialog above other windows when shown."
 msgstr ""
 
 #. i18n: file: kcfg/kscreensaversettings.kcfg:11
 #. i18n: ectx: label, entry (ScreenSaverEnabled), group (ScreenSaver)
-#: rc.cpp:44
+#: rc.cpp:23
 msgid "Enable screen saver"
 msgstr ""
 
 #. i18n: file: kcfg/kscreensaversettings.kcfg:12
 #. i18n: ectx: whatsthis, entry (ScreenSaverEnabled), group (ScreenSaver)
-#: rc.cpp:47
+#: rc.cpp:26
 msgid "Enables the screen saver."
 msgstr ""
 
 #. i18n: file: kcfg/kscreensaversettings.kcfg:16
 #. i18n: ectx: label, entry, group (ScreenSaver)
-#: rc.cpp:50
+#: rc.cpp:29
 msgid "Screen saver timeout"
 msgstr ""
 
 #. i18n: file: kcfg/kscreensaversettings.kcfg:17
 #. i18n: ectx: whatsthis, entry, group (ScreenSaver)
-#: rc.cpp:53
+#: rc.cpp:32
 msgid "Sets the seconds after which the screen saver is started."
 msgstr ""
 
 #. i18n: file: kcfg/kscreensaversettings.kcfg:21
 #. i18n: ectx: label, entry (SuspendWhenInvisible), group (ScreenSaver)
-#: rc.cpp:56
+#: rc.cpp:35
 msgid "Suspend screen saver when DPMS kicks in"
 msgstr ""
 
 #. i18n: file: kcfg/kscreensaversettings.kcfg:24
 #. i18n: ectx: whatsthis, entry (SuspendWhenInvisible), group (ScreenSaver)
-#: rc.cpp:59
+#: rc.cpp:38
 msgid ""
 "Usually the screen saver is suspended when display power saving kicks in,\n"
 "       as nothing can be seen on the screen anyway, obviously. However, some "
@@ -371,42 +371,42 @@
 
 #. i18n: file: interfaceOptions.ui:17
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:3
+#: rc.cpp:43
 msgid "Positioning:"
 msgstr ""
 
 #. i18n: file: interfaceOptions.ui:27
 #. i18n: ectx: property (text), widget (QRadioButton, topEdgeButton)
-#: rc.cpp:6
+#: rc.cpp:46
 msgid "Top edge of screen"
 msgstr ""
 
 #. i18n: file: interfaceOptions.ui:37
 #. i18n: ectx: property (text), widget (QRadioButton, freeFloatingButton)
-#: rc.cpp:9
+#: rc.cpp:49
 msgid "Free floating window"
 msgstr ""
 
 #. i18n: file: interfaceOptions.ui:57
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:12
+#: rc.cpp:52
 msgid "Style:"
 msgstr ""
 
 #. i18n: file: interfaceOptions.ui:67
 #. i18n: ectx: property (text), widget (QRadioButton, commandButton)
-#: rc.cpp:15
+#: rc.cpp:55
 msgid "Command oriented"
 msgstr ""
 
 #. i18n: file: interfaceOptions.ui:77
 #. i18n: ectx: property (text), widget (QRadioButton, taskButton)
-#: rc.cpp:18
+#: rc.cpp:58
 msgid "Task oriented"
 msgstr ""
 
 #. i18n: file: interfaceOptions.ui:97
 #. i18n: ectx: property (text), widget (QPushButton, previewButton)
-#: rc.cpp:21
+#: rc.cpp:61
 msgid "Preview"
 msgstr "Rhagolygu"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kscd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kscd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kscd.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kscd.po	2012-04-18 08:59:24.000000000 +0000
@@ -4,203 +4,203 @@
 msgstr ""
 "Project-Id-Version: kscd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:37+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:20+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kscd.cpp:41
 msgid "KDE CD player"
 msgstr "Chwaraeydd CD KDE"
 
-#: kscd.cpp:89 kscd.cpp:90
+#: kscd.cpp:92 kscd.cpp:93
 msgid "Configure Shortcuts..."
 msgstr ""
 
-#: kscd.cpp:99 kscd.cpp:100
+#: kscd.cpp:102 kscd.cpp:103
 msgid "Configure..."
 msgstr ""
 
-#: kscd.cpp:105 kscd.cpp:106
+#: kscd.cpp:108 kscd.cpp:109
 msgid "Download Info"
 msgstr ""
 
-#: kscd.cpp:112
+#: kscd.cpp:115
 msgid "Upload Info"
 msgstr ""
 
-#: kscd.cpp:118
+#: kscd.cpp:121
 msgid "Play/Pause"
 msgstr "Chwarae/Seibio"
 
-#: kscd.cpp:125
+#: kscd.cpp:128
 msgid "Stop"
 msgstr ""
 
-#: kscd.cpp:132
+#: kscd.cpp:135
 msgctxt "This action allow user to pass to the following track"
 msgid "Next"
 msgstr ""
 
-#: kscd.cpp:139
+#: kscd.cpp:142
 msgctxt "This action allow the user to pass to the preceding track"
 msgid "Previous"
 msgstr ""
 
-#: kscd.cpp:146
+#: kscd.cpp:149
 msgctxt " This action allow to eject the inserted disc"
 msgid "Eject"
 msgstr ""
 
-#: kscd.cpp:153
+#: kscd.cpp:156
 msgid "Volume Up"
 msgstr ""
 
-#: kscd.cpp:160
+#: kscd.cpp:163
 msgid "Volume Down"
 msgstr ""
 
-#: kscd.cpp:167
+#: kscd.cpp:170
 msgctxt "This action allow the user to listen a random track list"
 msgid "Random"
 msgstr ""
 
-#: kscd.cpp:174
+#: kscd.cpp:177
 msgid "Repeat Track"
 msgstr ""
 
-#: kscd.cpp:181
+#: kscd.cpp:184
 msgid "Repeat Album"
 msgstr ""
 
-#: kscd.cpp:188
+#: kscd.cpp:191
 msgid "Show Tracklist"
 msgstr ""
 
-#: kscd.cpp:194
+#: kscd.cpp:197
 msgid "Mute/Unmute"
 msgstr ""
 
-#: kscd.cpp:200
+#: kscd.cpp:203
 msgid "Minimize"
 msgstr ""
 
-#: kscd.cpp:483 kscd.cpp:533 kscd.cpp:567
+#: kscd.cpp:504 kscd.cpp:554 kscd.cpp:588
 msgid "No disc"
 msgstr "Dim disg"
 
-#: kscd.cpp:487 kscd.cpp:537 kscd.cpp:571
+#: kscd.cpp:508 kscd.cpp:558 kscd.cpp:592
 msgid "Invalid disc"
 msgstr ""
 
-#: kscd.cpp:748 kscd.cpp:765
+#: kscd.cpp:769 kscd.cpp:786
 msgctxt "General option in the configuration dialog"
 msgid "General"
 msgstr ""
 
-#: kscd.cpp:755 kscd.cpp:760
+#: kscd.cpp:776 kscd.cpp:781
 msgid "Settings"
 msgstr ""
 
-#: kscd.cpp:779
+#: kscd.cpp:800
 msgid "Appearance"
 msgstr ""
 
-#: kscd.cpp:822
+#: kscd.cpp:843
 msgid "KsCD"
 msgstr "KsCD"
 
-#: kscd.cpp:825
+#: kscd.cpp:846
 msgid ""
 "(c) 2001, Dirk Försterling\n"
 "(c) 2003, Aaron J. Seigo"
 msgstr ""
 
-#: kscd.cpp:826
+#: kscd.cpp:847
 msgid "Amine Bouchikhi"
 msgstr ""
 
-#: kscd.cpp:826
+#: kscd.cpp:847
 msgid "Current maintainer, Solid/Phonon Upgrade, QDBus connection"
 msgstr ""
 
-#: kscd.cpp:827
+#: kscd.cpp:848
 msgid "Aaron J. Seigo"
 msgstr ""
 
-#: kscd.cpp:827
+#: kscd.cpp:848
 msgid "Previous maintainer"
 msgstr ""
 
-#: kscd.cpp:828
+#: kscd.cpp:849
 msgid "Alexander Kern"
 msgstr ""
 
-#: kscd.cpp:828
+#: kscd.cpp:849
 msgid "Workman library update, CDTEXT, CDDA"
 msgstr "Diweddariad llyfrgell Workman, CDTEXT, CDDA"
 
-#: kscd.cpp:829
+#: kscd.cpp:850
 msgid "Bernd Johannes Wuebben"
 msgstr ""
 
-#: kscd.cpp:830
+#: kscd.cpp:851
 msgid "Dirk Försterling"
 msgstr ""
 
-#: kscd.cpp:830
+#: kscd.cpp:851
 msgid "Workman library, previous maintainer"
 msgstr "Llyfrgell Workman, cynhaliwr cynt"
 
-#: kscd.cpp:831
+#: kscd.cpp:852
 msgid "Wilfried Huss"
 msgstr ""
 
-#: kscd.cpp:831
+#: kscd.cpp:852
 msgid "Patches galore"
 msgstr "Digonedd o gywiriadau"
 
-#: kscd.cpp:832
+#: kscd.cpp:853
 msgid "Steven Grimm"
 msgstr ""
 
-#: kscd.cpp:832
+#: kscd.cpp:853
 msgid "Workman library"
 msgstr "Llyfrgell Workman"
 
-#: kscd.cpp:833
+#: kscd.cpp:854
 msgid "Sven Lueppken"
 msgstr ""
 
-#: kscd.cpp:833
+#: kscd.cpp:854
 msgid "UI Work"
 msgstr "Gwaith Rhyngwyneb Graffegol"
 
-#: kscd.cpp:834
+#: kscd.cpp:855
 msgid "freedb.org"
 msgstr ""
 
-#: kscd.cpp:834
+#: kscd.cpp:855
 msgid ""
 "Special thanks to freedb.org for providing a free CDDB-like CD database"
 msgstr ""
 "Diolchiadau arbennig i freedb.org am ddarparu cronfa ddata CD rydd sy'n "
 "debyg i CDDB"
 
-#: kscd.cpp:840
+#: kscd.cpp:861
 msgid "Start playing"
 msgstr ""
 
-#: mbmanager.cpp:141 mbmanager.cpp:163
+#: mbmanager.cpp:141 mbmanager.cpp:162 mbmanager.cpp:169
 msgid "Unknown album"
 msgstr ""
 
-#: mbmanager.cpp:142 mbmanager.cpp:164
+#: mbmanager.cpp:142 mbmanager.cpp:163 mbmanager.cpp:170
 msgid "Unknown artist"
 msgstr ""
 
@@ -208,105 +208,47 @@
 msgid "Unknown title"
 msgstr ""
 
-#: mbmanager.cpp:165
+#: mbmanager.cpp:164 mbmanager.cpp:171
 msgid "No Disc"
 msgstr "Dim disg"
 
-#: rc.cpp:43
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD, ,Launchpad Contributions:"
 
-#: rc.cpp:44
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: interfaceSettings.ui:37
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:6 rc.cpp:47
+#: rc.cpp:5
 msgid "Text font:"
 msgstr ""
 
 #. i18n: file: interfaceSettings.ui:54
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:9 rc.cpp:50
+#: rc.cpp:8
 msgid "Text color:"
 msgstr ""
 
 #. i18n: file: interfaceSettings.ui:64
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:12 rc.cpp:53
+#: rc.cpp:11
 msgid "URL:"
 msgstr ""
 
-#. i18n: file: gui/trackListDlgUI.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, trackListDlgUI)
-#: rc.cpp:56
-msgid "KsCD - TrackList"
-msgstr ""
-
-#. i18n: file: gui/trackListDlgUI.ui:50
-#. i18n: ectx: property (text), widget (QLabel, albumLbl)
-#: rc.cpp:59
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"size:12pt; font-weight:600;\">Album</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: gui/trackListDlgUI.ui:60
-#. i18n: ectx: property (text), widget (QLabel, yearLbl)
-#: rc.cpp:65
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"style:italic;\">Year</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: gui/trackListDlgUI.ui:105
-#. i18n: ectx: property (text), widget (QTableWidget, trackTable)
-#: rc.cpp:71
-msgid "Track"
-msgstr ""
-
-#. i18n: file: gui/trackListDlgUI.ui:110
-#. i18n: ectx: property (text), widget (QTableWidget, trackTable)
-#: rc.cpp:74
-msgid "Title"
-msgstr "Teitl"
-
-#. i18n: file: gui/trackListDlgUI.ui:115
-#. i18n: ectx: property (text), widget (QTableWidget, trackTable)
-#: rc.cpp:77
-msgid "Length"
-msgstr ""
-
-#. i18n: file: generalSettings.ui:18
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EjectOnFinish)
-#: rc.cpp:3 rc.cpp:80
-msgid "Eject CD when finished playing"
-msgstr ""
-
 #. i18n: file: kscd.kcfg:12
 #. i18n: ectx: label, entry (Autoplay), group (General)
-#: rc.cpp:15 rc.cpp:83
+#: rc.cpp:14
 msgid "Start playing when a CD is inserted."
 msgstr "Dechrau chwarae wrth fewnosod CD."
 
 #. i18n: file: kscd.kcfg:13
 #. i18n: ectx: whatsthis, entry (Autoplay), group (General)
-#: rc.cpp:18 rc.cpp:86
+#: rc.cpp:17
 msgid ""
 "When this option is selected the CD will start playing automatically upon "
 "being inserted into the CD-ROM."
@@ -316,13 +258,13 @@
 
 #. i18n: file: kscd.kcfg:17
 #. i18n: ectx: label, entry (EjectOnFinish), group (General)
-#: rc.cpp:21 rc.cpp:89
+#: rc.cpp:20
 msgid "Eject CD when playing is finished."
 msgstr "Allfwrw'r CD pan gorffenir y chwarae."
 
 #. i18n: file: kscd.kcfg:18
 #. i18n: ectx: whatsthis, entry (EjectOnFinish), group (General)
-#: rc.cpp:24 rc.cpp:92
+#: rc.cpp:23
 msgid ""
 "When this option is selected the CD will automatically eject when it is "
 "finished."
@@ -332,40 +274,98 @@
 
 #. i18n: file: kscd.kcfg:24
 #. i18n: ectx: label, entry (TextColor), group (Appearance)
-#: rc.cpp:27 rc.cpp:95
+#: rc.cpp:26
 msgid "The text color that will be used in the panel."
 msgstr ""
 
 #. i18n: file: kscd.kcfg:25
 #. i18n: ectx: whatsthis, entry (TextColor), group (Appearance)
-#: rc.cpp:30 rc.cpp:98
+#: rc.cpp:29
 msgid "Change the color of the text in the panel"
 msgstr ""
 
 #. i18n: file: kscd.kcfg:29
 #. i18n: ectx: label, entry (TextFont), group (Appearance)
-#: rc.cpp:33 rc.cpp:101
+#: rc.cpp:32
 msgid "The font that will be used for the panel."
 msgstr ""
 
 #. i18n: file: kscd.kcfg:30
 #. i18n: ectx: whatsthis, entry (TextFont), group (Appearance)
-#: rc.cpp:36 rc.cpp:104
+#: rc.cpp:35
 msgid "Change the font of the text in the panel"
 msgstr ""
 
 #. i18n: file: kscd.kcfg:34
 #. i18n: ectx: label, entry (url), group (Appearance)
-#: rc.cpp:39 rc.cpp:107
+#: rc.cpp:38
 msgid "The skin that will be use for the application"
 msgstr ""
 
 #. i18n: file: kscd.kcfg:35
 #. i18n: ectx: whatsthis, entry (url), group (Appearance)
-#: rc.cpp:42 rc.cpp:110
+#: rc.cpp:41
 msgid "Change the skin of the application"
 msgstr ""
 
+#. i18n: file: gui/trackListDlgUI.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, trackListDlgUI)
+#: rc.cpp:45
+msgid "KsCD - TrackList"
+msgstr ""
+
+#. i18n: file: gui/trackListDlgUI.ui:50
+#. i18n: ectx: property (text), widget (QLabel, albumLbl)
+#: rc.cpp:48
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"size:12pt; font-weight:600;\">Album</span></p></body></html>"
+msgstr ""
+
+#. i18n: file: gui/trackListDlgUI.ui:60
+#. i18n: ectx: property (text), widget (QLabel, yearLbl)
+#: rc.cpp:54
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"style:italic;\">Year</span></p></body></html>"
+msgstr ""
+
+#. i18n: file: gui/trackListDlgUI.ui:105
+#. i18n: ectx: property (text), widget (QTableWidget, trackTable)
+#: rc.cpp:60
+msgid "Track"
+msgstr ""
+
+#. i18n: file: gui/trackListDlgUI.ui:110
+#. i18n: ectx: property (text), widget (QTableWidget, trackTable)
+#: rc.cpp:63
+msgid "Title"
+msgstr "Teitl"
+
+#. i18n: file: gui/trackListDlgUI.ui:115
+#. i18n: ectx: property (text), widget (QTableWidget, trackTable)
+#: rc.cpp:66
+msgid "Length"
+msgstr ""
+
+#. i18n: file: generalSettings.ui:18
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_EjectOnFinish)
+#: rc.cpp:69
+msgid "Eject CD when finished playing"
+msgstr ""
+
 #: gui/kscdwindow.cpp:361
 msgid "loop track  "
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kscreensaver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kscreensaver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kscreensaver.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kscreensaver.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kscreensaver\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:15+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:41+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: random.cpp:45
 #, kde-format
@@ -48,14 +48,14 @@
 msgid "Run in the root XWindow"
 msgstr ""
 
-#: random.cpp:195
+#: random.cpp:179
 msgid "Setup Random Screen Saver"
 msgstr "Gosod Arbedydd Sgrîn Hap"
 
-#: random.cpp:203
+#: random.cpp:187
 msgid "Use OpenGL screen savers"
 msgstr "Defnyddio arbedyddion sgrîn OpenGL"
 
-#: random.cpp:206
+#: random.cpp:190
 msgid "Use screen savers that manipulate the screen"
 msgstr "Defnyddio arbedyddion sgrîn sy'n trin y sgrîn"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kshisen.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kshisen.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kshisen.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kshisen.po	2012-04-18 08:59:24.000000000 +0000
@@ -9,17 +9,17 @@
 msgstr ""
 "Project-Id-Version: kshisen\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:52+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: src/app.cpp:90 src/app.cpp:329
+#: src/app.cpp:90 src/app.cpp:330
 msgid "Select a tile"
 msgstr ""
 
@@ -39,7 +39,7 @@
 msgid "Play Sounds"
 msgstr ""
 
-#: src/app.cpp:243
+#: src/app.cpp:245
 #, kde-format
 msgctxt "time string: hh:mm:ss"
 msgid "%1:%2:%3"
@@ -47,19 +47,19 @@
 
 #. i18n: file: src/settings.ui:26
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Gravity)
-#: src/app.cpp:252 src/app.cpp:361 rc.cpp:8
+#: src/app.cpp:254 src/app.cpp:362 rc.cpp:8
 msgid "Gravity"
 msgstr "Disgyrchiant"
 
-#: src/app.cpp:255
+#: src/app.cpp:257
 msgid "Yes"
 msgstr ""
 
-#: src/app.cpp:257
+#: src/app.cpp:259
 msgid "No"
 msgstr ""
 
-#: src/app.cpp:262
+#: src/app.cpp:264
 msgid ""
 "\n"
 "You could have been in the highscores\n"
@@ -67,128 +67,128 @@
 "Try without them next time."
 msgstr ""
 
-#: src/app.cpp:240 src/app.cpp:263 src/app.cpp:271
+#: src/app.cpp:265 src/app.cpp:273
 msgid "End of Game"
 msgstr "Diwedd y Gêm"
 
-#: src/app.cpp:266
+#: src/app.cpp:268
 msgid ""
 "Congratulations!\n"
 "You made it into the hall of fame."
 msgstr ""
 
-#: src/app.cpp:270
+#: src/app.cpp:272
 #, kde-format
 msgctxt "%1 - time string like hh:mm:ss"
 msgid "You made it in %1"
 msgstr ""
 
-#: src/app.cpp:289
+#: src/app.cpp:291
 msgid "(Paused) "
 msgstr "(Wedi'i seibio) "
 
-#: src/app.cpp:285
+#: src/app.cpp:287
 #, kde-format
 msgid "Your time: %1:%2:%3 %4"
 msgstr ""
 
-#: src/app.cpp:300
+#: src/app.cpp:301
 #, kde-format
 msgid "Removed: %1/%2 "
 msgstr ""
 
-#: src/app.cpp:334
+#: src/app.cpp:335
 msgid "Select a matching tile"
 msgstr ""
 
-#: src/app.cpp:339
+#: src/app.cpp:340
 msgid "Select the move you want by clicking on the blue line"
 msgstr ""
 
-#: src/app.cpp:344
+#: src/app.cpp:345
 msgid "This tile did not match the one you selected"
 msgstr ""
 
-#: src/app.cpp:349
+#: src/app.cpp:350
 msgid "You cannot make this move"
 msgstr ""
 
-#: src/app.cpp:378
+#: src/app.cpp:379
 msgid "General"
 msgstr "Cyffredinol"
 
-#: src/board.cpp:661
+#: src/board.cpp:690
 msgid ""
 "Game Paused\n"
 "Click to resume game."
 msgstr ""
 
-#: src/board.cpp:703
+#: src/board.cpp:694
 msgid ""
 "Game Stuck\n"
 "No more moves possible."
 msgstr ""
 
-#: src/board.cpp:663
+#: src/board.cpp:697
 msgid ""
 "Game Over\n"
 "Click to start a new game."
 msgstr ""
 
-#: src/main.cpp:31
+#: src/main.cpp:30
 msgid "A KDE game similar to Mahjongg"
 msgstr ""
 
-#: src/main.cpp:35
+#: src/main.cpp:34
 msgid "Shisen-Sho"
 msgstr "Shisen-Sho"
 
-#: src/main.cpp:37
+#: src/main.cpp:36
 msgid "(c) 1997, Mario Weilguni"
 msgstr ""
 
-#: src/main.cpp:38
+#: src/main.cpp:37
 msgid "Frederik Schwarzer"
 msgstr ""
 
-#: src/main.cpp:38
+#: src/main.cpp:37
 msgid "Current Maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
-#: src/main.cpp:39
+#: src/main.cpp:38
 msgid "Dave Corrie"
 msgstr ""
 
-#: src/main.cpp:39
+#: src/main.cpp:38
 msgid "Former Maintainer"
 msgstr ""
 
-#: src/main.cpp:40
+#: src/main.cpp:39
 msgid "Mario Weilguni"
 msgstr ""
 
-#: src/main.cpp:40
+#: src/main.cpp:39
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: src/main.cpp:41
+#: src/main.cpp:40
 msgid "Mauricio Piacentini"
 msgstr ""
 
-#: src/main.cpp:41
+#: src/main.cpp:40
 msgid "KMahjonggLib integration for KDE4"
 msgstr ""
 
-#: src/main.cpp:42
+#: src/main.cpp:41
 msgid "Jason Lane"
 msgstr ""
 
-#: src/main.cpp:42
+#: src/main.cpp:41
 msgid ""
 "Added 'tiles removed' counter<br/>Tile smooth-scaling and window resizing"
 msgstr ""
 
-#: src/main.cpp:43
+#: src/main.cpp:42
 msgid "Thanks also to everyone who should be listed here but is not!"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kshorturifilter.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kshorturifilter.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kshorturifilter.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kshorturifilter.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,27 +7,27 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-12-18 01:50+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kshorturifilter.cpp:294
+#: kshorturifilter.cpp:266
 #, kde-format
 msgid "<qt><b>%1</b> does not have a home folder.</qt>"
 msgstr "<qt>Nid oes gan <b>%1</b> blygell cartref.</qt>"
 
-#: kshorturifilter.cpp:295
+#: kshorturifilter.cpp:268
 #, kde-format
 msgid "<qt>There is no user called <b>%1</b>.</qt>"
 msgstr "<qt>Nid oes defnyddiwr o'r enw <b>%1</b>.</qt>"
 
-#: kshorturifilter.cpp:527
+#: kshorturifilter.cpp:520
 #, kde-format
 msgid "<qt>The file or folder <b>%1</b> does not exist.</qt>"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksmserver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksmserver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksmserver.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksmserver.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: ksmserver\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:15+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:47+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:41+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:52
 msgid ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksnapshot.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksnapshot.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksnapshot.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksnapshot.po	2012-04-18 08:59:37.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdegraphics/ksnapshot.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-09 05:03+0000\n"
-"PO-Revision-Date: 2012-03-14 17:02+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-11 16:37+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:40+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ksnapshot_options.h:30
 msgid ""
@@ -31,29 +31,29 @@
 msgid "Captures a free region (not rectangular)"
 msgstr ""
 
-#: ksnapshot_options.h:33
+#: ksnapshot_options.h:34
 msgid "Captures a part of windows"
 msgstr ""
 
-#: freeregiongrabber.cpp:121 regiongrabber.cpp:117
+#: freeregiongrabber.cpp:122 regiongrabber.cpp:117
 msgid ""
 "Select a region using the mouse. To take the snapshot, press the Enter key "
 "or double click. Press Esc to quit."
 msgstr ""
 
-#: kbackgroundsnapshot.cpp:91 ksnapshot.cpp:166
+#: kbackgroundsnapshot.cpp:92 ksnapshot.cpp:263
 msgid "snapshot"
 msgstr ""
 
-#: kbackgroundsnapshot.cpp:172
+#: kbackgroundsnapshot.cpp:173
 msgid "KDE Background Screenshot Utility"
 msgstr ""
 
-#: kbackgroundsnapshot.cpp:176
+#: kbackgroundsnapshot.cpp:177
 msgid "KBackgroundSnapshot"
 msgstr ""
 
-#: kbackgroundsnapshot.cpp:178
+#: kbackgroundsnapshot.cpp:179
 msgid "(c) 2007, Montel Laurent"
 msgstr ""
 
@@ -65,77 +65,77 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ksnapshot.cpp:99
+#: ksnapshot.cpp:100
 msgid "untitled"
 msgstr ""
 
-#: ksnapshot.cpp:105
+#: ksnapshot.cpp:106
 msgid "Copy"
 msgstr ""
 
-#: ksnapshot.cpp:106
+#: ksnapshot.cpp:107
 msgid "Send To..."
 msgstr ""
 
-#: ksnapshot.cpp:111
+#: ksnapshot.cpp:159
 msgid " second"
 msgid_plural " seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ksnapshot.cpp:180
+#: ksnapshot.cpp:272
 msgid "Quick Save Snapshot &As..."
 msgstr ""
 
-#: ksnapshot.cpp:181
+#: ksnapshot.cpp:273
 msgid ""
 "Save the snapshot to the file specified by the user without showing the file "
 "dialog."
 msgstr ""
 
-#: ksnapshot.cpp:183
+#: ksnapshot.cpp:275
 msgid "Save Snapshot &As..."
 msgstr "Cadw'r Ciplun &Fel..."
 
-#: ksnapshot.cpp:184
+#: ksnapshot.cpp:276
 msgid "Save the snapshot to the file specified by the user."
 msgstr ""
 
-#: ksnapshot.cpp:233
+#: ksnapshot.cpp:337
 msgid "Save As"
 msgstr ""
 
-#: ksnapshot.cpp:371
+#: ksnapshot.cpp:556
 msgid "Other Application..."
 msgstr ""
 
-#: ksnapshot.cpp:451
+#: ksnapshot.cpp:666
 msgid "The screen has been successfully grabbed."
 msgstr "Mae'r sgrin wedi'i gipio'n lwyddiannus."
 
-#: ksnapshot.cpp:573
+#: ksnapshot.cpp:839
 #, kde-format
 msgid "Preview of the snapshot image (%1 x %2)"
 msgstr ""
 
-#: ksnapshotobject.cpp:111
+#: ksnapshotobject.cpp:118
 msgid "File Exists"
 msgstr "Ffeil yn Bodoli"
 
-#: ksnapshotobject.cpp:112
+#: ksnapshotobject.cpp:119
 #, kde-format
 msgid "<qt>Do you really want to overwrite <b>%1</b>?</qt>"
 msgstr ""
 
-#: ksnapshotobject.cpp:113
+#: ksnapshotobject.cpp:120
 msgid "Overwrite"
 msgstr "Trosysgrifo"
 
-#: ksnapshotobject.cpp:149
+#: ksnapshotobject.cpp:156
 msgid "Unable to Save Image"
 msgstr ""
 
-#: ksnapshotobject.cpp:150
+#: ksnapshotobject.cpp:157
 #, kde-format
 msgid ""
 "KSnapshot was unable to save the image to\n"
@@ -144,11 +144,11 @@
 "Roedd KCiplun yn methu cadw'r ddelwedd i\n"
 "%1."
 
-#: ksnapshotobject.cpp:172
+#: ksnapshotobject.cpp:179
 msgid "Title"
 msgstr ""
 
-#: ksnapshotobject.cpp:174
+#: ksnapshotobject.cpp:181
 msgid "Window Class"
 msgstr ""
 
@@ -205,19 +205,19 @@
 msgid "Free region grabbing, KIPI plugins support, port to Windows"
 msgstr ""
 
-#: rc.cpp:85
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:86
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: ksnapshotwidget.ui:32
+#. i18n: file: ksnapshotwidget.ui:33
 #. i18n: ectx: property (whatsThis), widget (KSnapshotPreview, lblImage)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid ""
 "This is a preview of the current snapshot.\n"
 "\n"
@@ -227,27 +227,27 @@
 "You can also copy the image to the clipboard by pressing Ctrl+C."
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:174
+#. i18n: file: ksnapshotwidget.ui:55
 #. i18n: ectx: property (whatsThis), widget (KPushButton, btnNew)
-#: rc.cpp:63
+#: rc.cpp:12
 msgid "Click this button to take a new snapshot."
 msgstr "Cliciwch y botwm yma i dynnu ciplun newydd."
 
 #. i18n: file: ksnapshotwidget.ui:58
 #. i18n: ectx: property (text), widget (KPushButton, btnNew)
-#: rc.cpp:13 rc.cpp:87
+#: rc.cpp:15
 msgid "Take a &New Snapshot"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:85
+#. i18n: file: ksnapshotwidget.ui:95
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:29
+#: rc.cpp:18
 msgid "Cap&ture mode:"
 msgstr "Modd ci&pio:"
 
-#. i18n: file: ksnapshotwidget.ui:134
+#. i18n: file: ksnapshotwidget.ui:115
 #. i18n: ectx: property (whatsThis), widget (QComboBox, comboMode)
-#: rc.cpp:38
+#: rc.cpp:21
 msgid ""
 "<qt>Using this menu, you can select from the five following snapshot modes:\n"
 "<p>\n"
@@ -265,57 +265,57 @@
 "</p></qt>"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:138
+#. i18n: file: ksnapshotwidget.ui:119
 #. i18n: ectx: property (text), item, widget (QComboBox, comboMode)
-#: rc.cpp:48
+#: rc.cpp:31
 msgid "Full Screen"
 msgstr "Sgrîn Lawn"
 
-#. i18n: file: ksnapshotwidget.ui:143
+#. i18n: file: ksnapshotwidget.ui:124
 #. i18n: ectx: property (text), item, widget (QComboBox, comboMode)
-#: rc.cpp:51
+#: rc.cpp:34
 msgid "Window Under Cursor"
 msgstr "Ffenestr Dan y Cyrchydd"
 
 #. i18n: file: ksnapshotwidget.ui:129
 #. i18n: ectx: property (text), item, widget (QComboBox, comboMode)
-#: rc.cpp:35 rc.cpp:109
+#: rc.cpp:37
 msgid "Rectangular Region"
 msgstr ""
 
 #. i18n: file: ksnapshotwidget.ui:134
 #. i18n: ectx: property (text), item, widget (QComboBox, comboMode)
-#: rc.cpp:38 rc.cpp:112
+#: rc.cpp:40
 msgid "Freehand Region"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:153
+#. i18n: file: ksnapshotwidget.ui:139
 #. i18n: ectx: property (text), item, widget (QComboBox, comboMode)
-#: rc.cpp:57
+#: rc.cpp:43
 msgid "Section of Window"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:158
+#. i18n: file: ksnapshotwidget.ui:144
 #. i18n: ectx: property (text), item, widget (QComboBox, comboMode)
-#: rc.cpp:60
+#: rc.cpp:46
 msgid "Current Screen"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:72
+#. i18n: file: ksnapshotwidget.ui:152
 #. i18n: ectx: property (text), widget (QLabel, lblDelay)
-#: rc.cpp:26
+#: rc.cpp:49
 msgid "Snapshot &delay:"
 msgstr "Saib &ciplunio:"
 
-#. i18n: file: ksnapshotwidget.ui:52
+#. i18n: file: ksnapshotwidget.ui:171
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, spinDelay)
-#: rc.cpp:10
+#: rc.cpp:52
 msgid "Snapshot delay in seconds"
 msgstr "Saib ciplunio mewn eiliadau"
 
-#. i18n: file: ksnapshotwidget.ui:62
+#. i18n: file: ksnapshotwidget.ui:181
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, spinDelay)
-#: rc.cpp:13
+#: rc.cpp:55
 msgid ""
 "<qt><p>\n"
 "This is the number of seconds to wait after clicking the <i>New Snapshot</i> "
@@ -330,21 +330,21 @@
 "</qt>"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:65
+#. i18n: file: ksnapshotwidget.ui:184
 #. i18n: ectx: property (specialValueText), widget (KIntSpinBox, spinDelay)
-#: rc.cpp:23
+#: rc.cpp:65
 msgid "No delay"
 msgstr "Dim saib"
 
 #. i18n: file: ksnapshotwidget.ui:194
 #. i18n: ectx: property (text), widget (QLabel, lblIncludeDecorations)
-#: rc.cpp:66 rc.cpp:140
+#: rc.cpp:68
 msgid "Include &window decorations:"
 msgstr ""
 
-#. i18n: file: ksnapshotwidget.ui:114
+#. i18n: file: ksnapshotwidget.ui:207
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, cbIncludeDecorations)
-#: rc.cpp:32
+#: rc.cpp:71
 msgid ""
 "When enabled, snapshot of a window will also include the window decorations"
 msgstr ""
@@ -352,11 +352,11 @@
 
 #. i18n: file: ksnapshotwidget.ui:220
 #. i18n: ectx: property (text), widget (QLabel, lblIncludePointer)
-#: rc.cpp:72 rc.cpp:146
+#: rc.cpp:74
 msgid "Include mouse &pointer:"
 msgstr ""
 
-#: snapshottimer.cpp:35 snapshottimer.cpp:89
+#: snapshottimer.cpp:36 snapshottimer.cpp:111
 #, kde-format
 msgid "Snapshot will be taken in 1 second"
 msgid_plural "Snapshot will be taken in %1 seconds"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kspaceduel.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kspaceduel.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kspaceduel.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kspaceduel.po	2012-04-18 08:59:24.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: kspaceduel\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:57+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:52+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:13+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: dialogs.cpp:77
 msgid "Game speed:"
@@ -224,61 +224,61 @@
 msgid "Wins"
 msgstr "Ennill"
 
-#: rc.cpp:64
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: Thierry Vignaud, jr, KD, ,Launchpad Contributions:"
 
-#: rc.cpp:65
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kspaceduelui.rc:10
 #. i18n: ectx: Menu (game)
-#: rc.cpp:60 rc.cpp:68
+#: rc.cpp:5
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: kspaceduelui.rc:15
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:63 rc.cpp:71
+#: rc.cpp:8
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: general.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:3 rc.cpp:74
+#: rc.cpp:11
 msgid "Hit Points"
 msgstr "Pwyntiau taro"
 
 #. i18n: file: general.ui:42
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:6 rc.cpp:77
+#: rc.cpp:14
 msgid "Red player:"
 msgstr "Chwaraewr coch:"
 
 #. i18n: file: general.ui:82
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:9 rc.cpp:80
+#: rc.cpp:17
 msgid "Blue player:"
 msgstr "Chwaraewr glas:"
 
 #. i18n: file: general.ui:117
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
-#: rc.cpp:12 rc.cpp:83
+#: rc.cpp:20
 msgid "Graphics"
 msgstr "Graffeg"
 
 #. i18n: file: general.ui:129
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:15 rc.cpp:86
+#: rc.cpp:23
 msgid "Refresh time:"
 msgstr "Amser Cyfredoli:"
 
 #. i18n: file: general.ui:176
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:18 rc.cpp:89
+#: rc.cpp:26
 msgid "Red Player"
 msgstr "Chwaraewr Coch"
 
@@ -286,11 +286,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Player0IsAi)
 #. i18n: file: general.ui:299
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Player1IsAi)
-#. i18n: file: general.ui:196
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Player0IsAi)
-#. i18n: file: general.ui:299
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Player1IsAi)
-#: rc.cpp:21 rc.cpp:42 rc.cpp:92 rc.cpp:113
+#: rc.cpp:29 rc.cpp:50
 msgid "Player is AI"
 msgstr "Mae'r chwaraewr yn DA (AI)"
 
@@ -298,11 +294,7 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #. i18n: file: general.ui:332
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: general.ui:229
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: general.ui:332
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:24 rc.cpp:45 rc.cpp:95 rc.cpp:116
+#: rc.cpp:32 rc.cpp:53
 msgid "Difficulty:"
 msgstr "Anhawster:"
 
@@ -310,11 +302,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
 #. i18n: file: general.ui:346
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#. i18n: file: general.ui:243
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
-#. i18n: file: general.ui:346
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#: rc.cpp:27 rc.cpp:48 rc.cpp:98 rc.cpp:119
+#: rc.cpp:35 rc.cpp:56
 msgid "Trainee"
 msgstr "Hyforddai"
 
@@ -322,11 +310,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
 #. i18n: file: general.ui:351
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#. i18n: file: general.ui:248
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
-#. i18n: file: general.ui:351
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#: rc.cpp:30 rc.cpp:51 rc.cpp:101 rc.cpp:122
+#: rc.cpp:38 rc.cpp:59
 msgid "Normal"
 msgstr "Arferol"
 
@@ -334,11 +318,7 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
 #. i18n: file: general.ui:356
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#. i18n: file: general.ui:253
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
-#. i18n: file: general.ui:356
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#: rc.cpp:33 rc.cpp:54 rc.cpp:104 rc.cpp:125
+#: rc.cpp:41 rc.cpp:62
 msgid "Hard"
 msgstr "Anodd"
 
@@ -346,17 +326,13 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
 #. i18n: file: general.ui:361
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#. i18n: file: general.ui:258
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty0)
-#. i18n: file: general.ui:361
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_AiDifficulty1)
-#: rc.cpp:36 rc.cpp:57 rc.cpp:107 rc.cpp:128
+#: rc.cpp:44 rc.cpp:65
 msgid "Insane"
 msgstr "Gwallgof"
 
 #. i18n: file: general.ui:279
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:39 rc.cpp:110
+#: rc.cpp:47
 msgid "Blue Player"
 msgstr "Chwaraewr Glas"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksplashthemes.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksplashthemes.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksplashthemes.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksplashthemes.po	2012-04-18 08:59:38.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: ksplashthemes\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:06+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:41+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:13+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:42+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: installer.cpp:127
 msgid "Get New Themes..."
@@ -83,7 +83,7 @@
 msgid "Failed to remove theme '%1'"
 msgstr "Methodd gwaredu thema '%1'"
 
-#: installer.cpp:393 installer.cpp:461
+#: installer.cpp:393 installer.cpp:465
 msgid "(Could not load theme)"
 msgstr "(Methu llwytho thema)"
 
@@ -137,28 +137,28 @@
 msgid "<b>Homepage:</b> %1"
 msgstr ""
 
-#: installer.cpp:442
+#: installer.cpp:446
 #, kde-format
 msgid "This theme requires the plugin %1 which is not installed."
 msgstr "Gofynna'r thema yma yr ategyn %1 ni osodir."
 
-#: installer.cpp:450
+#: installer.cpp:454
 msgid "Could not load theme configuration file."
 msgstr "Methu llwytho ffeil ffurfweddu themau."
 
-#: installer.cpp:470
+#: installer.cpp:474
 msgid "No preview available."
 msgstr "Dim rhagolwg ar gael."
 
-#: installer.cpp:492
+#: installer.cpp:496
 msgid "KSplash Theme Files"
 msgstr ""
 
-#: installer.cpp:493
+#: installer.cpp:497
 msgid "Add Theme"
 msgstr "Ychwnaegu Thema"
 
-#: installer.cpp:546 installer.cpp:554 installer.cpp:562
+#: installer.cpp:551 installer.cpp:559 installer.cpp:567 installer.cpp:575
 msgid "Failed to successfully test the splash screen."
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstartperf.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstartperf.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstartperf.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstartperf.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/kstartperf.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2008-02-15 21:57+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:24+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kstartperf.cpp:90
 msgid "KStartPerf"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstart.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstart.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstart.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstart.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kstart\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:33+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-11 17:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:28+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kstart.cpp:300
 msgid "KStart"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstyle_config.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstyle_config.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstyle_config.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstyle_config.po	2012-04-18 08:59:38.000000000 +0000
@@ -7,229 +7,156 @@
 msgstr ""
 "Project-Id-Version: all.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-05-30 13:39+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:13+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:42+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: web/plugin.cpp:9
-msgid "Web style plugin"
-msgstr ""
-
-#: web/webstyle.cpp:1604
-msgid "modified"
-msgstr ""
-
-#: oxygen/config/oxygenanimationconfigitem.cpp:69
-msgid "oxygen-settings - information"
-msgstr ""
-
-#: oxygen/config/main.cpp:38 oxygen/config/oxygenconfigdialog.cpp:56
-#: oxygen/config/oxygenconfigdialog.cpp:169
-msgid "Oxygen Settings"
-msgstr ""
-
-#: oxygen/config/main.cpp:40
-msgid "Oxygen expert configuration tool"
-msgstr ""
-
-#: oxygen/config/main.cpp:42 oxygen/demo/main.cpp:45
-msgid "(c) 2010, Hugo Pereira Da Costa"
-msgstr ""
-
-#: oxygen/config/main.cpp:44 oxygen/demo/main.cpp:47
-msgid "Hugo Pereira Da Costa"
-msgstr ""
-
-#: oxygen/config/oxygenstyleconfig.cpp:194
-msgid "Animations"
-msgstr ""
-
-#: oxygen/config/oxygenconfigdialog.cpp:72
-msgid "Widget Style"
-msgstr ""
-
-#: oxygen/config/oxygenconfigdialog.cpp:73
-msgid "Modify the appearance of widgets"
-msgstr ""
-
-#: oxygen/config/oxygenconfigdialog.cpp:91
-msgid "Window Decorations"
-msgstr ""
-
-#: oxygen/config/oxygenconfigdialog.cpp:92
-msgid "Modify the appearance of window decorations"
-msgstr ""
-
-#: oxygen/config/oxygenconfigdialog.cpp:202
-#: oxygen/config/oxygenconfigdialog.cpp:212
-msgid "Unable to find oxygen style configuration plugin"
-msgstr ""
-
-#: oxygen/config/oxygenconfigdialog.cpp:248
-#: oxygen/config/oxygenconfigdialog.cpp:258
-msgid "Unable to find oxygen decoration configuration plugin"
-msgstr ""
-
-#: oxygen/config/oxygenanimationconfigwidget.cpp:52
+#: oxygen/config/oxygenanimationconfigwidget.cpp:50
 msgid "Focus, mouseover and widget state transition"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:53
+#: oxygen/config/oxygenanimationconfigwidget.cpp:51
 msgid ""
 "Configure widgets' focus and mouseover highlight animation, as well as "
 "widget enabled/disabled state transition"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:56
+#: oxygen/config/oxygenanimationconfigwidget.cpp:54
 msgid "Toolbar highlight"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:57
+#: oxygen/config/oxygenanimationconfigwidget.cpp:55
 msgid "Configure toolbars' mouseover highlight animation"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:61
+#: oxygen/config/oxygenanimationconfigwidget.cpp:59
 msgid "Menu bar highlight"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:62
+#: oxygen/config/oxygenanimationconfigwidget.cpp:60
 msgid "Configure menu bars' mouseover highlight animation"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:65
+#: oxygen/config/oxygenanimationconfigwidget.cpp:63
 msgid "Menu highlight"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:66
+#: oxygen/config/oxygenanimationconfigwidget.cpp:64
 msgid "Configure menus' mouseover highlight animation"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:69
+#: oxygen/config/oxygenanimationconfigwidget.cpp:67
 msgid "Progress bar animation"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:70
+#: oxygen/config/oxygenanimationconfigwidget.cpp:68
 msgid "Configure progress bars' steps animation"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:73
+#: oxygen/config/oxygenanimationconfigwidget.cpp:71
 msgid "Tab transitions"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:73
+#: oxygen/config/oxygenanimationconfigwidget.cpp:71
 msgid "Configure fading transition between tabs"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:76
+#: oxygen/config/oxygenanimationconfigwidget.cpp:74
 msgid "Label transitions"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:76
+#: oxygen/config/oxygenanimationconfigwidget.cpp:74
 msgid "Configure fading transition when a label's text is changed"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:79
+#: oxygen/config/oxygenanimationconfigwidget.cpp:77
 msgid "Text editor transitions"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:79
+#: oxygen/config/oxygenanimationconfigwidget.cpp:77
 msgid "Configure fading transition when an editor's text is changed"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:82
+#: oxygen/config/oxygenanimationconfigwidget.cpp:80
 msgid "Combo box transitions"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:82
+#: oxygen/config/oxygenanimationconfigwidget.cpp:80
 msgid ""
 "Configure fading transition when a combo box's selected choice is changed"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:92
+#: oxygen/config/oxygenanimationconfigwidget.cpp:90
 msgid "Busy indicator steps"
 msgstr ""
 
-#: oxygen/config/oxygenanimationconfigwidget.cpp:93
+#: oxygen/config/oxygenanimationconfigwidget.cpp:91
 msgid "Configure progress bars' busy indicator animation"
 msgstr ""
 
-#: oxygen/demo/main.cpp:41 oxygen/demo/oxygendemodialog.cpp:57
-#: oxygen/demo/oxygendemodialog.cpp:198
-msgid "Oxygen Demo"
-msgstr ""
-
-#: oxygen/demo/oxygendemodialog.cpp:69
-msgid "Enabled"
-msgstr ""
-
-#: oxygen/demo/oxygendemodialog.cpp:74
-msgid "Right to left layout"
-msgstr ""
-
-#: oxygen/demo/oxygendemodialog.cpp:92
-msgid "Input Widgets"
-msgstr ""
-
-#: oxygen/demo/oxygendemodialog.cpp:94
-msgid "Shows the appearance of text input widgets"
+#: oxygen/config/oxygenstyleconfig.cpp:186
+msgid "Hide Advanced Configuration Options"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:102
-msgid "Tab Widgets"
+#: oxygen/config/oxygenstyleconfig.cpp:186
+msgid "Show Advanced Configuration Options"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:104 oxygen/demo/oxygendemodialog.cpp:135
-msgid "Shows the appearance of tab widgets"
+#: oxygen/config/oxygenstyleconfig.cpp:204
+msgid "Animations"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:112
-msgid "Buttons"
+#: oxygen/config/main.cpp:38 oxygen/config/oxygenconfigdialog.cpp:56
+#: oxygen/config/oxygenconfigdialog.cpp:169
+msgid "Oxygen Settings"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:114
-msgid "Shows the appearance of buttons"
+#: oxygen/config/main.cpp:40
+msgid "Oxygen expert configuration tool"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:122
-msgid "Lists"
+#: oxygen/config/main.cpp:42 oxygen/demo/main.cpp:45
+msgid "(c) 2010, Hugo Pereira Da Costa"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:124
-msgid "Shows the appearance of lists, trees and tables"
+#: oxygen/config/main.cpp:44 oxygen/demo/main.cpp:47
+msgid "Hugo Pereira Da Costa"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:133
-msgid "Frames"
+#: oxygen/config/oxygenconfigdialog.cpp:72
+msgid "Widget Style"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:135
-msgid "Shows the appearance of various framed widgets"
+#: oxygen/config/oxygenconfigdialog.cpp:73
+msgid "Modify the appearance of widgets"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:153
-msgid "Sliders"
+#: oxygen/config/oxygenconfigdialog.cpp:91
+msgid "Window Decorations"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:155
-msgid "Shows the appearance of sliders, progress bars and scrollbars"
+#: oxygen/config/oxygenconfigdialog.cpp:92
+msgid "Modify the appearance of window decorations"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:164
-msgid "Benchmark"
+#: oxygen/config/oxygenconfigdialog.cpp:202
+#: oxygen/config/oxygenconfigdialog.cpp:212
+msgid "Unable to find oxygen style configuration plugin"
 msgstr ""
 
-#: oxygen/demo/oxygendemodialog.cpp:166
-msgid "Emulates user interaction with widgets for benchmarking"
+#: oxygen/config/oxygenconfigdialog.cpp:248
+#: oxygen/config/oxygenconfigdialog.cpp:258
+msgid "Unable to find oxygen decoration configuration plugin"
 msgstr ""
 
-#: oxygen/demo/main.cpp:43
-msgid "Oxygen style demonstration"
+#: oxygen/demo/oxygensimulator.h:91
+msgid "This is a sample text"
 msgstr ""
 
 #: oxygen/demo/oxygenmdidemowidget.cpp:52
@@ -248,6 +175,15 @@
 msgid "Select Previous Window"
 msgstr ""
 
+#: oxygen/demo/main.cpp:41 oxygen/demo/oxygendemodialog.cpp:57
+#: oxygen/demo/oxygendemodialog.cpp:198
+msgid "Oxygen Demo"
+msgstr ""
+
+#: oxygen/demo/main.cpp:43
+msgid "Oxygen style demonstration"
+msgstr ""
+
 #: oxygen/demo/oxygeninputdemowidget.cpp:39
 msgid "Example text"
 msgstr ""
@@ -256,11 +192,7 @@
 msgid "password"
 msgstr ""
 
-#: oxygen/demo/oxygensimulator.h:91
-msgid "This is a sample text"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:272
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:251
 #. i18n: ectx: property (text), item, widget (KComboBox, _viewTriangularExpanderSize)
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:142
 #. i18n: ectx: property (text), widget (KPushButton, pushButton)
@@ -282,30 +214,30 @@
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_4)
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:280
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_5)
-#: oxygen/demo/oxygenbuttondemowidget.cpp:57 rc.cpp:65 rc.cpp:227 rc.cpp:230
-#: rc.cpp:236 rc.cpp:245 rc.cpp:248 rc.cpp:254 rc.cpp:257 rc.cpp:263
-#: rc.cpp:266 rc.cpp:269
+#: oxygen/demo/oxygenbuttondemowidget.cpp:57 rc.cpp:71 rc.cpp:254 rc.cpp:257
+#: rc.cpp:263 rc.cpp:272 rc.cpp:275 rc.cpp:281 rc.cpp:284 rc.cpp:290
+#: rc.cpp:293 rc.cpp:296
 msgid "Normal"
 msgstr ""
 
 #: oxygen/demo/oxygenbuttondemowidget.cpp:58
 #: oxygen/demo/oxygenbuttondemowidget.cpp:77
-#: oxygen/demo/oxygenbuttondemowidget.cpp:247
-#: oxygen/demo/oxygenbuttondemowidget.cpp:257
+#: oxygen/demo/oxygenbuttondemowidget.cpp:249
+#: oxygen/demo/oxygenbuttondemowidget.cpp:259
 msgid "New"
 msgstr ""
 
 #: oxygen/demo/oxygenbuttondemowidget.cpp:59
 #: oxygen/demo/oxygenbuttondemowidget.cpp:78
-#: oxygen/demo/oxygenbuttondemowidget.cpp:248
-#: oxygen/demo/oxygenbuttondemowidget.cpp:258
+#: oxygen/demo/oxygenbuttondemowidget.cpp:250
+#: oxygen/demo/oxygenbuttondemowidget.cpp:260
 msgid "Open"
 msgstr ""
 
 #: oxygen/demo/oxygenbuttondemowidget.cpp:60
 #: oxygen/demo/oxygenbuttondemowidget.cpp:79
-#: oxygen/demo/oxygenbuttondemowidget.cpp:249
-#: oxygen/demo/oxygenbuttondemowidget.cpp:259
+#: oxygen/demo/oxygenbuttondemowidget.cpp:251
+#: oxygen/demo/oxygenbuttondemowidget.cpp:261
 msgid "Save"
 msgstr ""
 
@@ -313,639 +245,599 @@
 msgid "Toggle authentication"
 msgstr ""
 
-#: keramik/config/keramikconf.cpp:50
-msgid "Highlight scroll bar handles"
+#: oxygen/demo/oxygendemodialog.cpp:69
+msgid "Enabled"
 msgstr ""
 
-#: keramik/config/keramikconf.cpp:51
-msgid "Animate progress bars"
+#: oxygen/demo/oxygendemodialog.cpp:74
+msgid "Right to left layout"
 msgstr ""
 
-#: highcontrast/config/highcontrastconfig.cpp:49
-msgid "Use wider lines"
+#: oxygen/demo/oxygendemodialog.cpp:92
+msgid "Input Widgets"
 msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr " ,Launchpad Contributions:"
+#: oxygen/demo/oxygendemodialog.cpp:94
+msgid "Shows the appearance of text input widgets"
+msgstr ""
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr ","
+#: oxygen/demo/oxygendemodialog.cpp:102
+msgid "Tab Widgets"
+msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:20
-#. i18n: ectx: property (windowTitle), widget (QFrame, FollowMouseAnimationConfigBox)
-#. i18n: file: oxygen/config/ui/oxygengenericanimationconfigbox.ui:20
-#. i18n: ectx: property (windowTitle), widget (QFrame, GenericAnimationConfigBox)
-#. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:111
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:128 rc.cpp:149 rc.cpp:404
-msgid "Frame"
+#: oxygen/demo/oxygendemodialog.cpp:104
+msgid "Shows the appearance of tab widgets"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygengenericanimationconfigbox.ui:38
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:152
-msgid "Duration (ms):"
+#: oxygen/demo/oxygendemodialog.cpp:112
+msgid "Buttons"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:131
-msgid "Animation type:"
+#: oxygen/demo/oxygendemodialog.cpp:114
+msgid "Shows the appearance of buttons"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:46
-#. i18n: ectx: property (text), item, widget (KComboBox, typeComboBox_)
-#: rc.cpp:134
-msgid "Fade"
+#: oxygen/demo/oxygendemodialog.cpp:122
+msgid "Lists"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:51
-#. i18n: ectx: property (text), item, widget (KComboBox, typeComboBox_)
-#: rc.cpp:137
-msgid "Follow Mouse"
+#: oxygen/demo/oxygendemodialog.cpp:124
+msgid "Shows the appearance of lists, trees and tables"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:59
-#. i18n: ectx: property (text), widget (QLabel, durationLabel_)
-#: rc.cpp:140
-msgid "Fade duration:"
+#: oxygen/demo/oxygendemodialog.cpp:133
+msgid "Frames"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:85
-#. i18n: ectx: property (text), widget (QLabel, followMouseDurationLabel_)
-#: rc.cpp:143
-msgid "Follow mouse duration:"
+#: oxygen/demo/oxygendemodialog.cpp:135
+msgid "Shows the appearance of various framed widgets"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenanimationconfigitem.ui:29
-#. i18n: ectx: property (text), widget (QCheckBox, enableCheckBox_)
-#: rc.cpp:146
-msgid "CheckBox"
+#: oxygen/demo/oxygendemodialog.cpp:153
+msgid "Sliders"
+msgstr ""
+
+#: oxygen/demo/oxygendemodialog.cpp:155
+msgid "Shows the appearance of sliders, progress bars and scrollbars"
+msgstr ""
+
+#: oxygen/demo/oxygendemodialog.cpp:164
+msgid "Benchmark"
+msgstr ""
+
+#: oxygen/demo/oxygendemodialog.cpp:166
+msgid "Emulates user interaction with widgets for benchmarking"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, OxygenConfigDialog)
-#: rc.cpp:3
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr " ,Launchpad Contributions:"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr ","
+
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, OxygenStyleConfig)
+#: rc.cpp:5
 msgid "Dialog"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:30
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:45
 #. i18n: ectx: attribute (title), widget (QWidget, tab_1)
-#: rc.cpp:6
+#: rc.cpp:8
 msgid "General"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:36
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:51
 #. i18n: ectx: property (text), widget (QCheckBox, _toolBarDrawItemSeparator)
-#: rc.cpp:9
+#: rc.cpp:11
 msgid "Draw toolbar item separators"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:194
-#. i18n: ectx: property (text), widget (QCheckBox, _showMnemonics)
-#: rc.cpp:41
-msgid "Draw keyboard accelerators"
-msgstr ""
-
-#. i18n: file: oxygen/config/oxygenconf.ui:63
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:58
 #. i18n: ectx: property (text), widget (QCheckBox, _checkDrawX)
-#: rc.cpp:15
+#: rc.cpp:14
 msgid "Use 'X' in checkboxes instead of check"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:187
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:65
 #. i18n: ectx: property (text), widget (QCheckBox, _cacheEnabled)
-#: rc.cpp:38
+#: rc.cpp:17
 msgid "Enable pixmap cache"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:43
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:72
 #. i18n: ectx: property (text), widget (QCheckBox, _animationsEnabled)
-#: rc.cpp:12
+#: rc.cpp:20
 msgid "Enable animations"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:132
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:87
 #. i18n: ectx: property (text), widget (QLabel, label_3)
 #: rc.cpp:23
 msgid "Windows' drag mode:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:146
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:101
 #. i18n: ectx: property (text), item, widget (KComboBox, _windowDragMode)
 #: rc.cpp:26
 msgid "Drag windows from titlebar only"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:151
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:106
 #. i18n: ectx: property (text), item, widget (KComboBox, _windowDragMode)
 #: rc.cpp:29
 msgid "Drag windows from titlebar, menubar and toolbars"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:156
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:111
 #. i18n: ectx: property (text), item, widget (KComboBox, _windowDragMode)
 #: rc.cpp:32
 msgid "Drag windows from all empty areas"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:164
-#. i18n: ectx: property (text), widget (QCheckBox, _useWMMoveResize)
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:119
+#. i18n: ectx: property (text), widget (QLabel, _mnemonicsLabel)
 #: rc.cpp:35
+msgid "Keyboard accelerators visibility:"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:140
+#. i18n: ectx: property (text), item, widget (KComboBox, _mnemonicsMode)
+#: rc.cpp:38
+msgid "Always Hide Keyboard Accelerators"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:145
+#. i18n: ectx: property (text), item, widget (KComboBox, _mnemonicsMode)
+#: rc.cpp:41
+msgid "Show Keyboard Accelerators When Needed"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:150
+#. i18n: ectx: property (text), item, widget (KComboBox, _mnemonicsMode)
+#: rc.cpp:44
+msgid "Always Show Keyboard Accelerators"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:160
+#. i18n: ectx: property (text), widget (QCheckBox, _useWMMoveResize)
+#: rc.cpp:47
 msgid "Use window manager to perform windows' drag"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:100
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:181
 #. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:21
+#: rc.cpp:50
 msgid "Views"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:120
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:187
 #. i18n: ectx: property (text), widget (QCheckBox, _viewDrawFocusIndicator)
-#: rc.cpp:30
+#: rc.cpp:53
 msgid "Draw focus indicator"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:113
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:194
 #. i18n: ectx: property (text), widget (QCheckBox, _viewDrawTreeBranchLines)
-#: rc.cpp:27
+#: rc.cpp:56
 msgid "Draw tree branch lines"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:106
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:201
 #. i18n: ectx: property (text), widget (QCheckBox, _viewDrawTriangularExpander)
-#: rc.cpp:24
+#: rc.cpp:59
 msgid "Use triangle tree expander instead of +/-"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:251
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:230
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:56
+#: rc.cpp:62
 msgid "Triangle size:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:262
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:241
 #. i18n: ectx: property (text), item, widget (KComboBox, _viewTriangularExpanderSize)
-#: rc.cpp:59
+#: rc.cpp:65
 msgid "Tiny"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:267
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:246
 #. i18n: ectx: property (text), item, widget (KComboBox, _viewTriangularExpanderSize)
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:160
 #. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
-#: rc.cpp:62 rc.cpp:233
+#: rc.cpp:68 rc.cpp:260
 msgid "Small"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:154
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:289
 #. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#: rc.cpp:33
+#: rc.cpp:74
 msgid "Tabs"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:329
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:308
 #. i18n: ectx: property (text), widget (QRadioButton, _tabStyleSingle)
-#: rc.cpp:71
+#: rc.cpp:77
 msgctxt "Renders each inactive tab in a tabbar as separate darker slab"
 msgid "Single"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:336
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:315
 #. i18n: ectx: property (text), widget (QRadioButton, _tabStylePlain)
-#: rc.cpp:74
+#: rc.cpp:80
 msgctxt "Renders inactive tabs in a tabbar as a unique darker slab"
 msgid "Plain"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:343
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:322
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:77
+#: rc.cpp:83
 msgid "Inactive tabs style:"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:214
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:330
 #. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: rc.cpp:45
+#: rc.cpp:86
 msgid "Scrollbars"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:373
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:338
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:89
 msgid "Scrollbar width:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:438
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:403
 #. i18n: ectx: property (text), widget (QLabel, label_5)
 #: rc.cpp:92
 msgid "Top arrow button type:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:448
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:413
 #. i18n: ectx: property (text), widget (QLabel, label_6)
 #: rc.cpp:95
 msgid "Bottom arrow button type:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:459
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:424
 #. i18n: ectx: property (text), item, widget (KComboBox, _scrollBarSubLineButtons)
 #: rc.cpp:98
 msgid "No buttons"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:464
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:429
 #. i18n: ectx: property (text), item, widget (KComboBox, _scrollBarSubLineButtons)
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:496
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:461
 #. i18n: ectx: property (text), item, widget (KComboBox, _scrollBarAddLineButtons)
 #: rc.cpp:101 rc.cpp:110
 msgid "One button"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:469
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:434
 #. i18n: ectx: property (text), item, widget (KComboBox, _scrollBarSubLineButtons)
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:501
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:466
 #. i18n: ectx: property (text), item, widget (KComboBox, _scrollBarAddLineButtons)
 #: rc.cpp:104 rc.cpp:113
 msgid "Two buttons"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:491
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:456
 #. i18n: ectx: property (text), item, widget (KComboBox, _scrollBarAddLineButtons)
 #: rc.cpp:107
 msgid "No button"
 msgstr ""
 
-#. i18n: file: oxygen/config/oxygenconf.ui:303
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:490
 #. i18n: ectx: attribute (title), widget (QWidget, tab_5)
-#: rc.cpp:57
+#: rc.cpp:116
 msgid "Menu Highlight"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:531
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:496
 #. i18n: ectx: property (text), widget (QRadioButton, _menuHighlightDark)
 #: rc.cpp:119
 msgid "Use dark color"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:538
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:503
 #. i18n: ectx: property (text), widget (QRadioButton, _menuHighlightStrong)
 #: rc.cpp:122
 msgid "Use selection color (plain)"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:545
+#. i18n: file: oxygen/config/ui/oxygenstyleconfig.ui:510
 #. i18n: ectx: property (text), widget (QRadioButton, _menuHighlightSubtle)
 #: rc.cpp:125
 msgid "Use selection color (subtle)"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:20
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:353
-msgid "Single line text editor:"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:56
+#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:20
+#. i18n: ectx: property (windowTitle), widget (QFrame, FollowMouseAnimationConfigBox)
+#. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:111
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:356
-msgid "Password editor:"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:79
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:359
-msgid "Editable combobox"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:96
-#. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
-#: rc.cpp:362
-msgid "First item"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:101
-#. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
-#: rc.cpp:365
-msgid "Second item"
+#: rc.cpp:128 rc.cpp:497
+msgid "Frame"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:106
-#. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
-#: rc.cpp:368
-msgid "Third item"
+#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:131
+msgid "Animation type:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:114
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:371
-msgid "Spinbox:"
+#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:46
+#. i18n: ectx: property (text), item, widget (KComboBox, typeComboBox)
+#: rc.cpp:134
+msgid "Fade"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:140
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:374
-msgid "Multi-line text editor:"
+#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:51
+#. i18n: ectx: property (text), item, widget (KComboBox, typeComboBox)
+#: rc.cpp:137
+msgid "Follow Mouse"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:150
-#. i18n: ectx: property (text), widget (QCheckBox, wrapCheckBox)
-#: rc.cpp:377
-msgid "Wrap words"
+#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:59
+#. i18n: ectx: property (text), widget (QLabel, durationLabel)
+#: rc.cpp:140
+msgid "Fade duration:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:157
-#. i18n: ectx: property (text), widget (QCheckBox, flatCheckBox)
-#: rc.cpp:380
-msgid "Use flat widgets"
+#. i18n: file: oxygen/config/ui/oxygenfollowmouseanimationconfigbox.ui:85
+#. i18n: ectx: property (text), widget (QLabel, followMouseDurationLabel)
+#: rc.cpp:143
+msgid "Follow mouse duration:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:20
+#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:347
-msgid "Horizontal"
+#: rc.cpp:146
+msgid "Modules"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:49
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox)
-#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:66
-#. i18n: ectx: property (text), widget (QCheckBox, checkBox_2)
-#: rc.cpp:182 rc.cpp:185
-msgid "Busy"
+#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:149
+msgid "Select below the modules for which you want to run the simulation:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:104
+#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:39
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:350
-msgid "Vertical"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:25
-#. i18n: ectx: property (text), item, widget (QListWidget, listWidget)
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:95
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:419 rc.cpp:464
-msgid "First Item"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:30
-#. i18n: ectx: property (text), item, widget (QListWidget, listWidget)
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:71
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:422 rc.cpp:446
-msgid "Second Item"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:35
-#. i18n: ectx: property (text), item, widget (QListWidget, listWidget)
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:55
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:425 rc.cpp:434
-msgid "Third Item"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:45
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#: rc.cpp:428
-msgid "Title"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:50
-#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
-#: rc.cpp:431
-msgid "Description"
-msgstr ""
-
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:58
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:437
-msgid "Third Description"
+#: rc.cpp:152
+msgid "Options"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:62
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:440
-msgid "Third Subitem"
+#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:45
+#. i18n: ectx: property (text), widget (QCheckBox, grabMouseCheckBox)
+#: rc.cpp:155
+msgid "Grab mouse"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:65
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:443
-msgid "Third Subitem Description"
+#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:86
+#. i18n: ectx: property (text), widget (KPushButton, runButton)
+#: rc.cpp:158
+msgid "Run Simulation"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:74
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:449
-msgid "Second Description"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:161
+msgid "Tab position:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:78
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:452
-msgid "Second Subitem"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:33
+#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
+#: rc.cpp:164
+msgid "North"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:81
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:455
-msgid "Second Subitem Description"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:38
+#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
+#: rc.cpp:167
+msgid "South"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:86
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:458
-msgid "First Subitem"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:43
+#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
+#: rc.cpp:170
+msgid "West"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:89
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:461
-msgid "First Subitem Description"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:48
+#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
+#: rc.cpp:173
+msgid "East"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:98
-#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
-#: rc.cpp:467
-msgid "First Description"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:69
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:395
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:176 rc.cpp:320
+msgid "Text position:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:108
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:470
-msgid "New Row"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:83
+#. i18n: ectx: property (text), item, widget (KComboBox, textPositionComboBox)
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:409
+#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
+#: rc.cpp:179 rc.cpp:323
+msgid "Icons Only"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:113
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:473
-msgid "First Row"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:88
+#. i18n: ectx: property (text), item, widget (KComboBox, textPositionComboBox)
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:414
+#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
+#: rc.cpp:182 rc.cpp:326
+msgid "Text Only"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:118
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:476
-msgid "Third Row"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:93
+#. i18n: ectx: property (text), item, widget (KComboBox, textPositionComboBox)
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:419
+#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
+#: rc.cpp:185 rc.cpp:329
+msgid "Text Alongside Icons"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:123
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:479
-msgid "First Column"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:103
+#. i18n: ectx: property (text), widget (QCheckBox, documentModeCheckBox)
+#: rc.cpp:188
+msgid "Document mode"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:128
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:482
-msgid "Second Column"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:110
+#. i18n: ectx: property (text), widget (QCheckBox, cornerWidgetsCheckBox)
+#: rc.cpp:191
+msgid "Show Corner Buttons"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:133
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:485
-msgid "Third Column"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:117
+#. i18n: ectx: property (text), widget (QCheckBox, tabBarVisibilityCheckBox)
+#: rc.cpp:194
+msgid "Hide tabbar"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:138
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:488
-msgid "Top-left"
+#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:124
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:197
+msgid "Preview"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:143
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:491
-msgid "Top"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:27
+#. i18n: ectx: property (windowTitle), widget (QWidget, Editors)
+#: rc.cpp:200
+msgid "Editors"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:148
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:494
-msgid "Top-right"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:33
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:203
+msgid "Title:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:153
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:497
-msgid "Left "
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:60
+#. i18n: ectx: property (windowTitle), widget (QWidget, Toolbox)
+#: rc.cpp:206
+msgid "Toolbox"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:158
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:500
-msgid "Center"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:78
+#. i18n: ectx: attribute (label), widget (QWidget, page)
+#: rc.cpp:209
+msgid "First Page"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:163
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:503
-msgid "Right"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:92
+#. i18n: ectx: attribute (label), widget (QWidget, page_2)
+#: rc.cpp:212
+msgid "Second Page"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:168
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:506
-msgid "Bottom-left"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:98
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:215
+msgid "First Label"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:173
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:509
-msgid "Bottom"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:105
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:218
+msgid "Second Label"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:178
-#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
-#: rc.cpp:512
-msgid "Bottom-right"
+#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:134
+#. i18n: ectx: attribute (label), widget (QWidget, page_3)
+#: rc.cpp:221
+msgid "Third Page"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:197
+#: rc.cpp:224
 msgid "Checkboxes"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:28
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox)
-#: rc.cpp:200
+#: rc.cpp:227
 msgid "Off"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:35
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_2)
-#: rc.cpp:203
+#: rc.cpp:230
 msgid "Partial"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:45
 #. i18n: ectx: property (text), widget (QCheckBox, checkBox_3)
-#: rc.cpp:206
+#: rc.cpp:233
 msgid "On"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:73
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:209
+#: rc.cpp:236
 msgid "Radiobuttons"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:84
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton)
-#: rc.cpp:212
+#: rc.cpp:239
 msgid "First Choice"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:94
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_2)
-#: rc.cpp:215
+#: rc.cpp:242
 msgid "Second Choice"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:101
 #. i18n: ectx: property (text), widget (QRadioButton, radioButton_3)
-#: rc.cpp:218
+#: rc.cpp:245
 msgid "Third Choice"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:126
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:221
+#: rc.cpp:248
 msgid "Pushbuttons"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:132
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:224
+#: rc.cpp:251
 msgid "Text only:"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:170
 #. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
-#: rc.cpp:239
+#: rc.cpp:266
 msgid "Large"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:191
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:242
+#: rc.cpp:269
 msgid "Text and icon:"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:215
 #. i18n: ectx: property (text), widget (QCheckBox, flatButtonCheckBox)
-#: rc.cpp:251
+#: rc.cpp:278
 msgid "Use flat buttons"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:242
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:260
+#: rc.cpp:287
 msgid "Toolbuttons"
 msgstr ""
 
@@ -955,298 +847,394 @@
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_7)
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:336
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_8)
-#: rc.cpp:272 rc.cpp:275 rc.cpp:278
+#: rc.cpp:299 rc.cpp:302 rc.cpp:305
 msgid "Flat"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:349
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_9)
-#: rc.cpp:281
+#: rc.cpp:308
 msgid "Up Arrow"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:359
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_10)
-#: rc.cpp:284
+#: rc.cpp:311
 msgid "Down Arrow"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:372
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_11)
-#: rc.cpp:287
+#: rc.cpp:314
 msgid "Left Arrow"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:382
 #. i18n: ectx: property (text), widget (QToolButton, toolButton_12)
-#: rc.cpp:290
+#: rc.cpp:317
 msgid "Right Arrow"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:69
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:395
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:173 rc.cpp:293
-msgid "Text position:"
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:424
+#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
+#: rc.cpp:332
+msgid "Text Under Icons"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:83
-#. i18n: ectx: property (text), item, widget (KComboBox, textPositionComboBox)
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:409
-#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
-#: rc.cpp:176 rc.cpp:296
-msgid "Icons Only"
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:445
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:335
+msgid "Icon size:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:88
-#. i18n: ectx: property (text), item, widget (KComboBox, textPositionComboBox)
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:414
-#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
-#: rc.cpp:179 rc.cpp:299
-msgid "Text Only"
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:459
+#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
+#: rc.cpp:338
+msgid "Small (16x16)"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:464
+#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
+#: rc.cpp:341
+msgid "Medium (22x22)"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:469
+#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
+#: rc.cpp:344
+msgid "Large (32x32)"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:474
+#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
+#: rc.cpp:347
+msgid "Huge (48x48)"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:25
+#. i18n: ectx: property (text), item, widget (QListWidget, listWidget)
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:95
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:350 rc.cpp:395
+msgid "First Item"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:30
+#. i18n: ectx: property (text), item, widget (QListWidget, listWidget)
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:71
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:353 rc.cpp:377
+msgid "Second Item"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:35
+#. i18n: ectx: property (text), item, widget (QListWidget, listWidget)
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:55
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:356 rc.cpp:365
+msgid "Third Item"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:45
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
+#: rc.cpp:359
+msgid "Title"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:50
+#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
+#: rc.cpp:362
+msgid "Description"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:58
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:368
+msgid "Third Description"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:62
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:371
+msgid "Third Subitem"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:65
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:374
+msgid "Third Subitem Description"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:74
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:380
+msgid "Second Description"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:78
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:383
+msgid "Second Subitem"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:93
-#. i18n: ectx: property (text), item, widget (KComboBox, textPositionComboBox)
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:419
-#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
-#: rc.cpp:182 rc.cpp:302
-msgid "Text Alongside Icons"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:81
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:386
+msgid "Second Subitem Description"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:424
-#. i18n: ectx: property (text), item, widget (KComboBox, textPosition)
-#: rc.cpp:305
-msgid "Text Under Icons"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:86
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:389
+msgid "First Subitem"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:445
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: rc.cpp:308
-msgid "Icon size:"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:89
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:392
+msgid "First Subitem Description"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:459
-#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
-#: rc.cpp:311
-msgid "Small (16x16)"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:98
+#. i18n: ectx: property (text), item, widget (QTreeWidget, treeWidget)
+#: rc.cpp:398
+msgid "First Description"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:464
-#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
-#: rc.cpp:314
-msgid "Medium (22x22)"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:108
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:401
+msgid "New Row"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:469
-#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
-#: rc.cpp:317
-msgid "Large (32x32)"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:113
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:404
+msgid "First Row"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbuttondemowidget.ui:474
-#. i18n: ectx: property (text), item, widget (KComboBox, iconSize)
-#: rc.cpp:320
-msgid "Huge (48x48)"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:118
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:407
+msgid "Third Row"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:515
-msgid "Modules"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:123
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:410
+msgid "First Column"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:26
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:518
-msgid "Select below the modules for which you want to run the simulation:"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:128
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:413
+msgid "Second Column"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:39
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:521
-msgid "Options"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:133
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:416
+msgid "Third Column"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:45
-#. i18n: ectx: property (text), widget (QCheckBox, grabMouseCheckBox)
-#: rc.cpp:524
-msgid "Grab mouse"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:138
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:419
+msgid "Top-left"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenbenchmarkwidget.ui:86
-#. i18n: ectx: property (text), widget (KPushButton, runButton)
-#: rc.cpp:527
-msgid "Run Simulation"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:143
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:422
+msgid "Top"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:158
-msgid "Tab position:"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:148
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:425
+msgid "Top-right"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:33
-#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
-#: rc.cpp:161
-msgid "North"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:153
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:428
+msgid "Left "
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:38
-#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
-#: rc.cpp:164
-msgid "South"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:158
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:431
+msgid "Center"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:43
-#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
-#: rc.cpp:167
-msgid "West"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:163
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:434
+msgid "Right"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:48
-#. i18n: ectx: property (text), item, widget (KComboBox, tabPositionComboBox)
-#: rc.cpp:170
-msgid "East"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:168
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:437
+msgid "Bottom-left"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:103
-#. i18n: ectx: property (text), widget (QCheckBox, documentModeCheckBox)
-#: rc.cpp:185
-msgid "Document mode"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:173
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:440
+msgid "Bottom"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:110
-#. i18n: ectx: property (text), widget (QCheckBox, cornerWidgetsCheckBox)
-#: rc.cpp:188
-msgid "Show Corner Buttons"
+#. i18n: file: oxygen/demo/ui/oxygenlistdemowidget.ui:178
+#. i18n: ectx: property (text), item, widget (QTableWidget, tableWidget)
+#: rc.cpp:443
+msgid "Bottom-right"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:117
-#. i18n: ectx: property (text), widget (QCheckBox, tabBarVisibilityCheckBox)
-#: rc.cpp:191
-msgid "Hide tabbar"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:20
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:446
+msgid "Single line text editor:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygentabdemowidget.ui:124
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:194
-msgid "Preview"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:56
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:449
+msgid "Password editor:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:27
-#. i18n: ectx: property (windowTitle), widget (QWidget, Editors)
-#: rc.cpp:323
-msgid "Editors"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:79
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:452
+msgid "Editable combobox"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:33
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:326
-msgid "Title:"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:96
+#. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
+#: rc.cpp:455
+msgid "First item"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:60
-#. i18n: ectx: property (windowTitle), widget (QWidget, Toolbox)
-#: rc.cpp:329
-msgid "Toolbox"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:101
+#. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
+#: rc.cpp:458
+msgid "Second item"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:78
-#. i18n: ectx: attribute (label), widget (QWidget, page)
-#: rc.cpp:332
-msgid "First Page"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:106
+#. i18n: ectx: property (text), item, widget (KComboBox, kcombobox)
+#: rc.cpp:461
+msgid "Third item"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:92
-#. i18n: ectx: attribute (label), widget (QWidget, page_2)
-#: rc.cpp:335
-msgid "Second Page"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:114
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:464
+msgid "Spinbox:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:98
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:482
-msgid "First Label"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:140
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:467
+msgid "Multi-line text editor:"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:105
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:485
-msgid "Second Label"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:150
+#. i18n: ectx: property (text), widget (QCheckBox, wrapCheckBox)
+#: rc.cpp:470
+msgid "Wrap words"
 msgstr ""
 
-#. i18n: file: oxygen/demo/ui/oxygenmdidemowidget.ui:134
-#. i18n: ectx: attribute (label), widget (QWidget, page_3)
-#: rc.cpp:344
-msgid "Third Page"
+#. i18n: file: oxygen/demo/ui/oxygeninputdemowidget.ui:157
+#. i18n: ectx: property (text), widget (QCheckBox, flatCheckBox)
+#: rc.cpp:473
+msgid "Use flat widgets"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:19
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:491
+#: rc.cpp:476
 msgid "Layout direction:"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:33
 #. i18n: ectx: property (text), item, widget (KComboBox, directionComboBox)
-#: rc.cpp:386
+#: rc.cpp:479
 msgid "Left to Right"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:38
 #. i18n: ectx: property (text), item, widget (KComboBox, directionComboBox)
-#: rc.cpp:389
+#: rc.cpp:482
 msgid "Right to Left"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:43
 #. i18n: ectx: property (text), item, widget (KComboBox, directionComboBox)
-#: rc.cpp:392
+#: rc.cpp:485
 msgid "Top to Bottom"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:48
 #. i18n: ectx: property (text), item, widget (KComboBox, directionComboBox)
-#: rc.cpp:395
+#: rc.cpp:488
 msgid "Bottom to Top"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:73
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:398
+#: rc.cpp:491
 msgid "GroupBox"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:79
 #. i18n: ectx: property (text), widget (QCheckBox, flatGroupBoxCheckBox)
-#: rc.cpp:401
+#: rc.cpp:494
 msgctxt "Flat group box. No frame is actually drawn"
 msgid "Flat"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:121
 #. i18n: ectx: property (text), widget (QRadioButton, raisedFrameRadioButton)
-#: rc.cpp:407
+#: rc.cpp:500
 msgid "Raised"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:134
 #. i18n: ectx: property (text), widget (QRadioButton, plainFrameRadioButton)
-#: rc.cpp:410
+#: rc.cpp:503
 msgctxt "Flat frame. No frame is actually drawn."
 msgid "Flat"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:141
 #. i18n: ectx: property (text), widget (QRadioButton, sunkenFrameRadioButton)
-#: rc.cpp:413
+#: rc.cpp:506
 msgid "Sunken"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenframedemowidget.ui:168
 #. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:416
+#: rc.cpp:509
 msgid "Tab Widget"
 msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:512
+msgid "Horizontal"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox)
+#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:66
+#. i18n: ectx: property (text), widget (QCheckBox, checkBox_2)
+#: rc.cpp:515 rc.cpp:518
+msgid "Busy"
+msgstr ""
+
+#. i18n: file: oxygen/demo/ui/oxygensliderdemowidget.ui:121
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:521
+msgid "Vertical"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstyle_keramik_config.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstyle_keramik_config.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kstyle_keramik_config.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kstyle_keramik_config.po	2012-04-18 08:59:39.000000000 +0000
@@ -13,8 +13,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: keramikconf.cpp:50
 msgid "Highlight scroll bar handles"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksysguardlsofwidgets.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksysguardlsofwidgets.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksysguardlsofwidgets.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksysguardlsofwidgets.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 01:56+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:15+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: LsofSearchWidget.cpp:36
 msgid "Renice Process"
@@ -28,7 +28,7 @@
 
 #. i18n: file: LsofSearchWidget.ui:28
 #. i18n: ectx: property (text), widget (KLsofWidget, klsofwidget)
-#: lsof.cpp:21 rc.cpp:6 rc.cpp:15
+#: lsof.cpp:21 rc.cpp:6
 msgid "Type"
 msgstr "Teip"
 
@@ -38,12 +38,12 @@
 
 #. i18n: file: LsofSearchWidget.ui:23
 #. i18n: ectx: property (text), widget (KLsofWidget, klsofwidget)
-#: rc.cpp:3 rc.cpp:12
+#: rc.cpp:3
 msgid "Stream"
 msgstr ""
 
 #. i18n: file: LsofSearchWidget.ui:33
 #. i18n: ectx: property (text), widget (KLsofWidget, klsofwidget)
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:9
 msgid "Filename"
 msgstr "Enw ffeil"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksysguard.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksysguard.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksysguard.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksysguard.po	2012-04-18 08:59:39.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ksysguard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:15+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:47+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,558 +18,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:14+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: TimerSettings.cc:38
-msgid "Timer Settings"
-msgstr "Gosodiadau Cyfrifydd Amser"
-
-#: TimerSettings.cc:48
-msgid "Use update interval of worksheet"
-msgstr "Defnyddio egwyl diweddaru  o weithlen"
-
-#: WorkSheetSettings.cc:90 TimerSettings.cc:51
-msgid "Update interval:"
-msgstr "Egwyl diweddaru:"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:49
-#. i18n: ectx: property (suffix), widget (KIntNumInput, m_timerInterval)
-#: WorkSheetSettings.cc:94 TimerSettings.cc:58 rc.cpp:47
-msgid " sec"
-msgstr " eil"
-
-#: WorkSheetSettings.cc:100 TimerSettings.cc:61
-msgid "All displays of the sheet are updated at the rate specified here."
-msgstr ""
-"Mae pob dangosiad o'r daflen yn cael ei diweddaru ar y raddfa a welir yma."
-
-#: HostConnector.cc:44
-msgid "Connect Host"
-msgstr "Cysylltu Westeiwr"
-
-#: HostConnector.cc:55
-msgid "Host:"
-msgstr "Gwesteiwr"
-
-#: HostConnector.cc:65
-msgid "Enter the name of the host you want to connect to."
-msgstr "Rhowch enw o'r gwesteiwr rydych chi eisiau cysylltu iddo."
-
-#: HostConnector.cc:71
-msgid "Connection Type"
-msgstr "Math Cysylltiad"
-
-#: HostConnector.cc:77
-msgid "ssh"
-msgstr "ssh"
-
-#: HostConnector.cc:80
-msgid "Select this to use the secure shell to login to the remote host."
-msgstr ""
-"Dewisiwch hwn i ddefnyddio'r plisgyn diogel i fewngofnodi i'r gwesteiwr pell."
-
-#: HostConnector.cc:83
-msgid "rsh"
-msgstr "rsh"
-
-#: HostConnector.cc:84
-msgid "Select this to use the remote shell to login to the remote host."
-msgstr ""
-"Dewisiwch hwn i ddefnyddio'r plisgyn pell i fewngofnodi i'r gwesteiwr pell."
-
-#: HostConnector.cc:87
-msgid "Daemon"
-msgstr "Daemon"
-
-#: HostConnector.cc:88
-msgid ""
-"Select this if you want to connect to a ksysguard daemon that is running on "
-"the machine you want to connect to, and is listening for client requests."
-msgstr ""
-"Dewisiwch hwn os rydych chi eisiau cysylltu i daemon ksysguard sy'n rhedeg "
-"ar y cyfrifiadur rydych chi eisiau cysylltu iddo, ac sy'n gwrando am "
-"geisiadau dibynnydd."
-
-#: HostConnector.cc:91
-msgid "Custom command"
-msgstr "Gorchymyn Addasu"
-
-#: HostConnector.cc:92
-msgid ""
-"Select this to use the command you entered below to start ksysguardd on the "
-"remote host."
-msgstr ""
-"Dewisiwch hyn i ddefnyddio'r gorchymyn yr ydych wedi mewnosod isod i gychwyn "
-"ksysguardd ar y gwesteiwr pell."
-
-#: HostConnector.cc:95
-msgid "Port:"
-msgstr "Porth:"
-
-#: HostConnector.cc:102
-msgid ""
-"Enter the port number on which the ksysguard daemon is listening for "
-"connections."
-msgstr ""
-"Mewnosodwch y rhif porth y mae'r daemon ksysguard yn gwrando arno am "
-"gysylltiadau."
-
-#: HostConnector.cc:105
-msgid "e.g.  3112"
-msgstr "e.e. 3112"
-
-#: HostConnector.cc:108
-msgid "Command:"
-msgstr "Gorchymyn:"
-
-#: HostConnector.cc:117
-msgid ""
-"Enter the command that runs ksysguardd on the host you want to monitor."
-msgstr ""
-"Mewnosodwch y gorchymyn sy'n rhedeg ksysguardd ar y gwesteiwr rydych eisiau "
-"ei fonitro."
-
-#: HostConnector.cc:121
-msgid "e.g. ssh -l root remote.host.org ksysguardd"
-msgstr "e.e. ssh -l root remote.host.org ksysguardd"
-
-#: SensorDisplayLib/FancyPlotter.cc:178
-msgctxt "Largest axis title"
-msgid "99999 XXXX"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:281 SensorDisplayLib/DancingBars.cc:96
+#: SensorDisplayLib/DancingBars.cpp:96 SensorDisplayLib/FancyPlotter.cpp:283
 msgid "OK"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotter.cc:281 SensorDisplayLib/FancyPlotter.cc:515
-#: SensorDisplayLib/FancyPlotter.cc:585 SensorDisplayLib/DancingBars.cc:96
+#: SensorDisplayLib/DancingBars.cpp:96 SensorDisplayLib/FancyPlotter.cpp:283
+#: SensorDisplayLib/FancyPlotter.cpp:519 SensorDisplayLib/FancyPlotter.cpp:597
 msgid "Error"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotter.cc:511 SensorDisplayLib/FancyPlotter.cc:574
-#: SensorDisplayLib/FancyPlotter.cc:637
-#, kde-format
-msgctxt "units"
-msgid "%1%"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:518
-#, kde-format
-msgctxt ""
-"%1 is what is being shown statistics for, like 'Memory', 'Swap', etc."
-msgid "<p><b>%1:</b><br>"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:582
-#, kde-format
-msgid "%1 of %2œ%1"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:610
-#, kde-format
-msgctxt "units"
-msgid "%1 TiB"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:613
-#, kde-format
-msgctxt "units"
-msgid "%1 GiB"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:616
-#, kde-format
-msgctxt "units"
-msgid "%1 MiB"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:619
-#, kde-format
-msgctxt "units"
-msgid "%1 KiB"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:624
-#, kde-format
-msgctxt "units"
-msgid "%1 TiB/s"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:627
-#, kde-format
-msgctxt "units"
-msgid "%1 GiB/s"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:630
-#, kde-format
-msgctxt "units"
-msgid "%1 MiB/s"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:633
-#, kde-format
-msgctxt "units"
-msgid "%1 KiB/s"
-msgstr ""
-
-#: SensorDisplayLib/FancyPlotter.cc:639
-#, kde-format
-msgctxt "unitless - just a number"
-msgid "%1"
-msgstr ""
-
-#: SensorDisplayLib/LogFile.cc:92
-msgid "File logging settings"
-msgstr ""
-
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:61
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: SensorDisplayLib/LogFile.cc:98 rc.cpp:23
-msgid "Foreground color:"
-msgstr "Lliw blaendir:"
-
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:74
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:77
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:228
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:64
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: SensorDisplayLib/DancingBarsSettings.cc:175 SensorDisplayLib/LogFile.cc:100
-#: rc.cpp:26 rc.cpp:86 rc.cpp:125 rc.cpp:137
-msgid "Background color:"
-msgstr "Lliw cefndir:"
-
-#: SensorDisplayLib/ListViewSettings.cc:30
-msgid "List View Settings"
-msgstr "Gosodiadau Golwg Restr"
-
-#: SensorDisplayLib/SensorLoggerDlg.cc:32 SensorDisplayLib/SensorLogger.cc:431
-msgid "Sensor Logger"
-msgstr "Cofnodydd Synhwyrydd"
-
-#: SensorDisplayLib/SensorDisplay.cc:118 SensorDisplayLib/SensorLogger.cc:598
-msgid "&Properties"
-msgstr "&Priodweddau"
-
-#: SensorDisplayLib/SensorDisplay.cc:123 SensorDisplayLib/SensorLogger.cc:603
-msgid "&Remove Display"
-msgstr "&Gwaredu Dangosydd"
-
-#: SensorDisplayLib/SensorDisplay.cc:193
-#, kde-format
-msgid ""
-"<qt><p>This is a sensor display. To customize a sensor display click the "
-"right mouse button here and select the <i>Properties</i> entry from the "
-"popup menu. Select <i>Remove</i> to delete the display from the "
-"worksheet.</p>%1</qt>"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:45
-#, kde-format
-msgid "%1 K"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:46
-#, kde-format
-msgid "%1 M"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:47
-#, kde-format
-msgid "%1 G"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:48
-#, kde-format
-msgid "%1 T"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:49
-#, kde-format
-msgid "%1 P"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:152
-msgid "Display Units"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:156
-msgid "Mixed"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:162
-msgid "Kilobytes"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:168
-msgid "Megabytes"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:174
-msgid "Gigabytes"
-msgstr ""
-
-#: SensorDisplayLib/ListView.cpp:180
-msgid "Terabytes"
-msgstr ""
-
-#: SensorDisplayLib/SensorModel.cc:166
+#: SensorDisplayLib/SensorModel.cpp:166
 msgid "Host"
 msgstr "Gwesteiwr"
 
-#: SensorDisplayLib/SensorModel.cc:169
+#: SensorDisplayLib/SensorModel.cpp:169
 msgid "Sensor"
-msgstr "Synhwyrydd"
-
-#: SensorDisplayLib/SensorModel.cc:172
-msgid "Unit"
-msgstr "Uned"
-
-#: SensorDisplayLib/SensorModel.cc:175
-msgid "Status"
-msgstr "Cyflwr"
-
-#: SensorDisplayLib/SensorModel.cc:178
-msgid "Label"
-msgstr "Label"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:43
-msgid "Edit BarGraph Preferences"
-msgstr "Golygu Hoffiannau GraffBar"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:52
-msgid "Range"
-msgstr "Amrediad"
-
-#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, titleFrame)
-#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, titleFrame)
-#: WorkSheetSettings.cc:50 SensorDisplayLib/DancingBarsSettings.cc:57
-#: rc.cpp:74 rc.cpp:128
-msgid "Title"
-msgstr "Teitl"
-
-#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:35
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_title)
-#: SensorDisplayLib/DancingBarsSettings.cc:62
-#: SensorDisplayLib/FancyPlotterSettings.cc:73 rc.cpp:92
-msgid "Enter the title of the display here."
-msgstr "Rhowch deitl y dangosydd yma."
-
-#: SensorDisplayLib/DancingBarsSettings.cc:67
-msgid "Display Range"
-msgstr "Amrediad Dangosydd"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:72
-#: SensorDisplayLib/FancyPlotterSettings.cc:101
-msgid "Minimum value:"
-msgstr "Gwerth isaf:"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:80
-msgid ""
-"Enter the minimum value for the display here. If both values are 0, "
-"automatic range detection is enabled."
-msgstr ""
-
-#: SensorDisplayLib/DancingBarsSettings.cc:84
-#: SensorDisplayLib/FancyPlotterSettings.cc:112
-msgid "Maximum value:"
-msgstr "Gwerth uchaf:"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:92
-msgid ""
-"Enter the maximum value for the display here. If both values are 0, "
-"automatic range detection is enabled."
-msgstr ""
-
-#: SensorDisplayLib/DancingBarsSettings.cc:102
-msgid "Alarms"
-msgstr "Larymau"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:59
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: SensorDisplayLib/DancingBarsSettings.cc:107 rc.cpp:50
-msgid "Alarm for Minimum Value"
-msgstr "Larwm Gwerth Isaf"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:112
-#: SensorDisplayLib/DancingBarsSettings.cc:135
-msgid "Enable alarm"
-msgstr "Galluogi Larwm"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:71
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_lowerLimitActive)
-#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:56
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_lowerLimitActive)
-#: SensorDisplayLib/DancingBarsSettings.cc:113 rc.cpp:56 rc.cpp:101
-msgid "Enable the minimum value alarm."
-msgstr "Galluogi'r larwm gwerth isaf."
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:97
-#. i18n: ectx: property (text), widget (QLabel, m_lblLowerLimit)
-#: SensorDisplayLib/DancingBarsSettings.cc:116 rc.cpp:59
-msgid "Lower limit:"
-msgstr "Terfyn is:"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:123
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1_2)
-#: SensorDisplayLib/DancingBarsSettings.cc:130 rc.cpp:62
-msgid "Alarm for Maximum Value"
-msgstr "Larwm Gwerth Uchaf"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:135
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_upperLimitActive)
-#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:115
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_upperLimitActive)
-#: SensorDisplayLib/DancingBarsSettings.cc:136 rc.cpp:68 rc.cpp:110
-msgid "Enable the maximum value alarm."
-msgstr "Galluogi'r larwm gwerth uchaf."
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:161
-#. i18n: ectx: property (text), widget (QLabel, m_lblUpperLimit)
-#: SensorDisplayLib/DancingBarsSettings.cc:139 rc.cpp:71
-msgid "Upper limit:"
-msgstr "Terfyn uwch:"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:156
-msgctxt "@title:tab Appearance of the bar graph"
-msgid "Look"
-msgstr ""
-
-#: SensorDisplayLib/DancingBarsSettings.cc:161
-msgid "Normal bar color:"
-msgstr "Lliw bar arferol:"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:168
-msgid "Out-of-range color:"
-msgstr "Lliw tu-allan-i'r-amrediad:"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:182
-#: SensorDisplayLib/FancyPlotterSettings.cc:183
-msgid "Font size:"
-msgstr "Maint ffont:"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:186
-msgid ""
-"This determines the size of the font used to print a label underneath the "
-"bars. Bars are automatically suppressed if text becomes too large, so it is "
-"advisable to use a small font size here."
-msgstr ""
-"Penna hwn faint y wynebfath a ddefnyddir i argraffu label o dan y bariau. Fe "
-"rwystrir bariau'n ymysgogol os ddaw testun yn rhy fawr, felly mae'n syniad "
-"da dewis maint wynebfath bach yma."
-
-#: SensorDisplayLib/DancingBarsSettings.cc:194
-#: SensorDisplayLib/FancyPlotterSettings.cc:198
-msgid "Sensors"
-msgstr "Synwyryddion"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:207
-msgid "Edit..."
-msgstr "Golygu..."
-
-#: SensorDisplayLib/DancingBarsSettings.cc:208
-msgid "Push this button to configure the label."
-msgstr "Gwasgwch y botwm yma i ffurfweddu'r label."
-
-#: SensorDisplayLib/DancingBarsSettings.cc:211
-#: SensorDisplayLib/FancyPlotterSettings.cc:231
-msgid "Delete"
-msgstr ""
-
-#: SensorDisplayLib/DancingBarsSettings.cc:212
-#: SensorDisplayLib/FancyPlotterSettings.cc:232
-msgid "Push this button to delete the sensor."
-msgstr "Gwasgwch y botwm yma i ddileu'r synhwyrydd."
-
-#: SensorDisplayLib/DancingBarsSettings.cc:366
-msgid "Label of Bar Graph"
-msgstr "Label Graff Bar"
-
-#: SensorDisplayLib/DancingBarsSettings.cc:367
-msgid "Enter new label:"
-msgstr "Rhowch label newydd:"
-
-#: SensorDisplayLib/DummyDisplay.cc:30 SensorDisplayLib/DummyDisplay.cc:38
-msgid "Drop Sensor Here"
-msgstr "Gollyngwch Synhwyrydd Yma"
-
-#: SensorDisplayLib/DummyDisplay.cc:32
-msgid ""
-"This is an empty space in a worksheet. Drag a sensor from the Sensor Browser "
-"and drop it here. A sensor display will appear that allows you to monitor "
-"the values of the sensor over time."
-msgstr ""
-"Dyma le gwag mewn gweithlen. Llusgwch synhwyrydd yma o'r Porydd Synwyryddion "
-"a'i ollwng yma. Ymddengys dangosydd synhwyrydd sy'n caniatáu i chi arsylwi "
-"gwerthoedd y synhwyrydd dros amser."
-
-#: SensorDisplayLib/SensorLogger.cc:138
-msgid "Logging"
-msgstr "Cofnodi"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, timerFrame)
-#: SensorDisplayLib/SensorLogger.cc:141 rc.cpp:44
-msgid "Timer Interval"
-msgstr "Cyfnod Amserydd"
-
-#: SensorDisplayLib/SensorLogger.cc:144
-msgid "Sensor Name"
-msgstr "Enw Synhwyrydd"
-
-#: SensorDisplayLib/SensorLogger.cc:147
-msgid "Host Name"
-msgstr "Enw Gwesteiwr"
-
-#: SensorDisplayLib/SensorLogger.cc:150
-msgid "Log File"
-msgstr "Ffeil Gofnod"
-
-#: SensorDisplayLib/SensorLogger.cc:608
-msgid "&Remove Sensor"
-msgstr "&Gwaredu Synhwyrydd"
-
-#: SensorDisplayLib/SensorLogger.cc:613
-msgid "&Edit Sensor..."
-msgstr "&Golygu Synhwyrydd"
+msgstr "Synhwyrydd"
 
-#: SensorDisplayLib/SensorLogger.cc:621
-msgid "St&op Logging"
-msgstr "Peidi&o rhag Cofnodi"
+#: SensorDisplayLib/SensorModel.cpp:172
+msgid "Unit"
+msgstr "Uned"
 
-#: SensorDisplayLib/SensorLogger.cc:624
-msgid "S&tart Logging"
-msgstr "&Dechrau Cofnodi"
+#: SensorDisplayLib/SensorModel.cpp:175
+msgid "Status"
+msgstr "Cyflwr"
 
-#: SensorDisplayLib/SensorLoggerSettings.cc:30
-msgid "Sensor Logger Settings"
-msgstr "Gosodiadau Cofnodydd Synhwyrydd"
+#: SensorDisplayLib/SensorModel.cpp:178
+msgid "Label"
+msgstr "Label"
 
-#: SensorDisplayLib/MultiMeterSettings.cc:31
-msgctxt ""
-"Multimeter is a sensor display that mimics 'digital multimeter' aparatus"
-msgid "Multimeter Settings"
-msgstr ""
+#: SensorDisplayLib/SensorLoggerDlg.cpp:32
+#: SensorDisplayLib/SensorLogger.cpp:429
+msgid "Sensor Logger"
+msgstr "Cofnodydd Synhwyrydd"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:51
+#: SensorDisplayLib/FancyPlotterSettings.cpp:51
 msgid "Plotter Settings"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:64
+#: SensorDisplayLib/FancyPlotterSettings.cpp:64
 msgid "General"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:69
+#: SensorDisplayLib/FancyPlotterSettings.cpp:69
 msgid "Title:"
 msgstr "Teitl:"
 
+#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:35
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, m_title)
+#: SensorDisplayLib/FancyPlotterSettings.cpp:73
+#: SensorDisplayLib/DancingBarsSettings.cpp:62 rc.cpp:32
+msgid "Enter the title of the display here."
+msgstr "Rhowch deitl y dangosydd yma."
+
 #: SensorDisplayLib/FancyPlotterSettings.cpp:77
 msgid "Stack the beams on top of each other"
 msgstr ""
@@ -581,91 +85,101 @@
 "beam will be drawn at value 2 and the other beam drawn at 2+3=5."
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:85
+#: SensorDisplayLib/FancyPlotterSettings.cpp:85
 msgid "Scales"
 msgstr "Graddfeydd"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:90
+#: SensorDisplayLib/FancyPlotterSettings.cpp:90
 msgid "Vertical scale"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:96
+#: SensorDisplayLib/FancyPlotterSettings.cpp:96
 msgid "Specify graph range:"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:97
+#: SensorDisplayLib/FancyPlotterSettings.cpp:97
 msgid ""
 "Check this box if you want the display range to adapt dynamically to the "
 "currently displayed values; if you do not check this, you have to specify "
 "the range you want in the fields below."
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:107
+#: SensorDisplayLib/FancyPlotterSettings.cpp:101
+#: SensorDisplayLib/DancingBarsSettings.cpp:72
+msgid "Minimum value:"
+msgstr "Gwerth isaf:"
+
+#: SensorDisplayLib/FancyPlotterSettings.cpp:107
 msgid "Enter the minimum value for the display here."
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:118
+#: SensorDisplayLib/FancyPlotterSettings.cpp:112
+#: SensorDisplayLib/DancingBarsSettings.cpp:84
+msgid "Maximum value:"
+msgstr "Gwerth uchaf:"
+
+#: SensorDisplayLib/FancyPlotterSettings.cpp:118
 msgid ""
 "Enter the soft maximum value for the display here. The upper range will not "
 "be reduced below this value, but will still go above this number for values "
 "above this value."
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:125
+#: SensorDisplayLib/FancyPlotterSettings.cpp:125
 msgid "Horizontal scale"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:132
+#: SensorDisplayLib/FancyPlotterSettings.cpp:132
 msgid "Pixels per time period:"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:139
+#: SensorDisplayLib/FancyPlotterSettings.cpp:139
 msgid "Grid"
 msgstr "Grid"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:144
+#: SensorDisplayLib/FancyPlotterSettings.cpp:144
 msgid "Lines"
 msgstr "Llinellau"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:150
+#: SensorDisplayLib/FancyPlotterSettings.cpp:150
 msgid "Vertical lines"
 msgstr "Llinellau fertigol"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:151
+#: SensorDisplayLib/FancyPlotterSettings.cpp:151
 msgid "Check this to activate the vertical lines if display is large enough."
 msgstr ""
 "Dewiswch hwn i weithredoli'r llinellau fertigol os yw'r dangosydd digon mawr."
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:154
+#: SensorDisplayLib/FancyPlotterSettings.cpp:154
 msgid "Distance:"
 msgstr "Pellder:"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:160
+#: SensorDisplayLib/FancyPlotterSettings.cpp:160
 msgid "Enter the distance between two vertical lines here."
 msgstr "Rhowch y pellder rhwng dwy linell fertigol yma."
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:164
+#: SensorDisplayLib/FancyPlotterSettings.cpp:164
 msgid "Vertical lines scroll"
 msgstr "Sgrolio llinellau fertigol"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:167
+#: SensorDisplayLib/FancyPlotterSettings.cpp:167
 msgid "Horizontal lines"
 msgstr "Llinellau llorweddol"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:168
+#: SensorDisplayLib/FancyPlotterSettings.cpp:168
 msgid "Check this to enable horizontal lines if display is large enough."
 msgstr ""
 "Dewiswch hwn i alluogi llinellau llorweddol os yw'r dangosydd digon mawr."
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:173
+#: SensorDisplayLib/FancyPlotterSettings.cpp:173
 msgid "Text"
 msgstr "Testun"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:179
+#: SensorDisplayLib/FancyPlotterSettings.cpp:179
 msgid "Show axis labels"
 msgstr ""
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:180
+#: SensorDisplayLib/FancyPlotterSettings.cpp:180
 msgid ""
 "Check this box if horizontal lines should be decorated with the values they "
 "mark."
@@ -673,880 +187,698 @@
 "Dewiswch y blwch hwn os y dylid addurno'r llinellau llorweddol â'r "
 "gwerthoedd y maent yn eu nodi."
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:223
+#: SensorDisplayLib/FancyPlotterSettings.cpp:183
+#: SensorDisplayLib/DancingBarsSettings.cpp:182
+msgid "Font size:"
+msgstr "Maint ffont:"
+
+#: SensorDisplayLib/FancyPlotterSettings.cpp:198
+#: SensorDisplayLib/DancingBarsSettings.cpp:194
+msgid "Sensors"
+msgstr "Synwyryddion"
+
+#: SensorDisplayLib/FancyPlotterSettings.cpp:223
 msgid "Set Color..."
 msgstr "Gosod Lliw..."
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:224
+#: SensorDisplayLib/FancyPlotterSettings.cpp:224
 msgid "Push this button to configure the color of the sensor in the diagram."
 msgstr "Gwasgwch y botwm yma i ffurfweddu lliw y synhwyrydd yn y ddiagram."
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:236
+#: SensorDisplayLib/FancyPlotterSettings.cpp:231
+#: SensorDisplayLib/DancingBarsSettings.cpp:211
+msgid "Delete"
+msgstr ""
+
+#: SensorDisplayLib/FancyPlotterSettings.cpp:232
+#: SensorDisplayLib/DancingBarsSettings.cpp:212
+msgid "Push this button to delete the sensor."
+msgstr "Gwasgwch y botwm yma i ddileu'r synhwyrydd."
+
+#: SensorDisplayLib/FancyPlotterSettings.cpp:236
 msgid "Move Up"
 msgstr "Symud i Fyny"
 
-#: SensorDisplayLib/FancyPlotterSettings.cc:241
+#: SensorDisplayLib/FancyPlotterSettings.cpp:241
 msgid "Move Down"
 msgstr "Symud i Lawr"
 
-#: WorkSheetSettings.cc:40
-msgid "Tab Properties"
-msgstr ""
-
-#: WorkSheetSettings.cc:61
-msgid "Properties"
+#: SensorDisplayLib/LogFile.cpp:92
+msgid "File logging settings"
 msgstr ""
 
-#: WorkSheetSettings.cc:70
-msgid "Rows:"
-msgstr "Rhesi:"
-
-#: WorkSheetSettings.cc:79
-msgid "Columns:"
-msgstr "Colofnau:"
-
-#: WorkSheetSettings.cc:87
-msgid "Enter the number of rows the sheet should have."
-msgstr "Rhowch y nifer o resi dylai bod ar y len."
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:54
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: SensorDisplayLib/LogFile.cpp:98 rc.cpp:11
+msgid "Foreground color:"
+msgstr "Lliw blaendir:"
 
-#: WorkSheetSettings.cc:88
-msgid "Enter the number of columns the sheet should have."
-msgstr "Rhowch y nifer o golofnau dylai bod ar y len."
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:67
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:228
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:64
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:77
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: SensorDisplayLib/LogFile.cpp:100
+#: SensorDisplayLib/DancingBarsSettings.cpp:175 rc.cpp:14 rc.cpp:65 rc.cpp:77
+#: rc.cpp:95
+msgid "Background color:"
+msgstr "Lliw cefndir:"
 
-#: WorkSheetSettings.cc:101
-msgid "Enter the title of the worksheet here."
-msgstr "Rhowch deitl y weithlen yma."
+#: SensorDisplayLib/SensorLogger.cpp:138
+msgid "Logging"
+msgstr "Cofnodi"
 
-#: SensorBrowser.cc:117
-msgid "Sensor Browser"
-msgstr "Porydd Synwyryddion"
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, timerFrame)
+#: SensorDisplayLib/SensorLogger.cpp:141 rc.cpp:101
+msgid "Timer Interval"
+msgstr "Cyfnod Amserydd"
 
-#: SensorBrowser.cc:473
-msgid "Drag sensors to empty cells of a worksheet "
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:144
+msgid "Sensor Name"
+msgstr "Enw Synhwyrydd"
 
-#: SensorBrowser.cc:474
-msgid ""
-"The sensor browser lists the connected hosts and the sensors that they "
-"provide. Click and drag sensors into drop zones of a worksheet. A display "
-"will appear that visualizes the values provided by the sensor. Some sensor "
-"displays can display values of multiple sensors. Simply drag other sensors "
-"on to the display to add more sensors."
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:147
+msgid "Host Name"
+msgstr "Enw Gwesteiwr"
 
-#: Workspace.cc:112
-#, kde-format
-msgid "Sheet %1"
-msgstr "Taflen %1"
+#: SensorDisplayLib/SensorLogger.cpp:150
+msgid "Log File"
+msgstr "Ffeil Gofnod"
 
-#: Workspace.cc:171
-#, kde-format
-msgid ""
-"The tab '%1' contains unsaved data.\n"
-"Do you want to save the tab?"
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:598
+#: SensorDisplayLib/SensorDisplay.cpp:118
+msgid "&Properties"
+msgstr "&Priodweddau"
 
-#: Workspace.cc:186
-msgid "*.sgrd|Sensor Files (*.sgrd)"
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:603
+#: SensorDisplayLib/SensorDisplay.cpp:123
+msgid "&Remove Display"
+msgstr "&Gwaredu Dangosydd"
 
-#: Workspace.cc:186
-msgid "Select Tab File to Import"
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:608
+msgid "&Remove Sensor"
+msgstr "&Gwaredu Synhwyrydd"
 
-#: Workspace.cc:214 Workspace.cc:235
-msgid "You do not have a tab that could be saved."
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:613
+msgid "&Edit Sensor..."
+msgstr "&Golygu Synhwyrydd"
 
-#: Workspace.cc:242
-msgid "Export Tab"
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:621
+msgid "St&op Logging"
+msgstr "Peidi&o rhag Cofnodi"
 
-#: Workspace.cc:260
-msgid "There are no tabs that could be deleted."
-msgstr ""
+#: SensorDisplayLib/SensorLogger.cpp:624
+msgid "S&tart Logging"
+msgstr "&Dechrau Cofnodi"
 
-#: Workspace.cc:300
+#: SensorDisplayLib/SensorDisplay.cpp:190
 #, kde-format
 msgid ""
-"<qt>To propose the current custom tab as a new System Monitor tab, email "
-"<br><a href=\"file:%1\">%2</a><br> to <a "
-"href=\"mailto:john.tapsell@kde.org?subject='System Monitor "
-"Tab'&attach='file://%2'\">john.tapsell@kde.org</a></qt>"
-msgstr ""
-
-#: Workspace.cc:300
-msgid "Upload custom System Monitor tab"
-msgstr ""
-
-#: ksysguard.cc:74
-msgid "KDE System Monitor"
-msgstr ""
-
-#: ksysguard.cc:154 ksysguard.cc:530
-msgid "System Monitor"
-msgstr ""
-
-#: ksysguard.cc:155
-msgid "&Refresh Tab"
-msgstr ""
-
-#: ksysguard.cc:156
-msgid "&New Tab..."
-msgstr ""
-
-#: ksysguard.cc:157
-msgid "Import Tab Fr&om File..."
-msgstr ""
-
-#: ksysguard.cc:158
-msgid "Save Tab &As..."
-msgstr ""
-
-#: ksysguard.cc:159
-msgid "&Close Tab"
-msgstr ""
-
-#: ksysguard.cc:160
-msgid "Monitor &Remote Machine..."
-msgstr ""
-
-#: ksysguard.cc:161
-msgid "&Download New Tabs..."
-msgstr ""
-
-#: ksysguard.cc:162
-msgid "&Upload Current Tab..."
-msgstr ""
-
-#: ksysguard.cc:164
-msgid "Tab &Properties"
-msgstr ""
-
-#: ksysguard.cc:359
-#, kde-format
-msgid "1 processœ1"
-msgid_plural "%1 processesœ%1"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ksysguard.cc:443
-#, kde-format
-msgid "CPU: %1%œ%1%"
-msgstr ""
-
-#: ksysguard.cc:458
-#, kde-format
-msgctxt "Arguments are formatted byte sizes (used/total)"
-msgid "Memory: %1 / %2œMem: %1 / %2œMem: %1œ%1"
-msgstr ""
-
-#: ksysguard.cc:485
-msgid " No swap space available "
-msgstr ""
-
-#: ksysguard.cc:487
-#, kde-format
-msgctxt "Arguments are formatted byte sizes (used/total)"
-msgid "Swap: %1 / %2œSwap: %1œ%1"
-msgstr ""
-
-#: ksysguard.cc:532
-msgid "(c) 1996-2008 The KDE System Monitor Developers"
-msgstr ""
-
-#: ksysguard.cc:533
-msgid "John Tapsell"
-msgstr ""
-
-#: ksysguard.cc:533
-msgid "Current Maintainer"
-msgstr ""
-
-#: ksysguard.cc:534
-msgid "Chris Schlaeger"
-msgstr ""
-
-#: ksysguard.cc:534
-msgid "Previous Maintainer"
-msgstr ""
-
-#: ksysguard.cc:535
-msgid "Greg Martyn"
-msgstr ""
-
-#: ksysguard.cc:536
-msgid "Tobias Koenig"
-msgstr ""
-
-#: ksysguard.cc:537
-msgid "Nicolas Leclercq"
-msgstr ""
-
-#: ksysguard.cc:538
-msgid "Alex Sanda"
-msgstr ""
-
-#: ksysguard.cc:539
-msgid "Bernd Johannes Wuebben"
-msgstr ""
-
-#: ksysguard.cc:540
-msgid "Ralf Mueller"
-msgstr ""
-
-#: ksysguard.cc:541
-msgid "Hamish Rodda"
-msgstr ""
-
-#: ksysguard.cc:542
-msgid "Torsten Kasch"
+"<qt><p>This is a sensor display. To customize a sensor display click the "
+"right mouse button here and select the <i>Properties</i> entry from the "
+"popup menu. Select <i>Remove</i> to delete the display from the "
+"worksheet.</p>%1</qt>"
 msgstr ""
 
-#: ksysguard.cc:542
-msgid ""
-"Solaris Support\n"
-"Parts derived (by permission) from the sunos5\n"
-"module of William LeFebvre's \"top\" utility."
-msgstr ""
-"Solaris Support\n"
-"Parts derived (by permission) from the sunos5\n"
-"module of William LeFebvre's \"top\" utility."
+#: SensorDisplayLib/DancingBarsSettings.cpp:43
+msgid "Edit BarGraph Preferences"
+msgstr "Golygu Hoffiannau GraffBar"
 
-#: ksysguard.cc:551
-msgid "Optional worksheet files to load"
-msgstr "Ffeiliau gweithlenni dewisol i'w llwytho"
+#: SensorDisplayLib/DancingBarsSettings.cpp:52
+msgid "Range"
+msgstr "Amrediad"
 
-#: ksgrd/SensorShellAgent.cc:126
-#, kde-format
-msgid "Could not run daemon program '%1'."
-msgstr ""
+#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, titleFrame)
+#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, titleFrame)
+#: SensorDisplayLib/DancingBarsSettings.cpp:57 WorkSheetSettings.cpp:50
+#: rc.cpp:68 rc.cpp:83
+msgid "Title"
+msgstr "Teitl"
 
-#: ksgrd/SensorShellAgent.cc:133
-#, kde-format
-msgid "The daemon program '%1' failed."
-msgstr ""
+#: SensorDisplayLib/DancingBarsSettings.cpp:67
+msgid "Display Range"
+msgstr "Amrediad Dangosydd"
 
-#: ksgrd/SensorAgent.cc:109
-#, kde-format
-msgctxt "%1 is a host name"
+#: SensorDisplayLib/DancingBarsSettings.cpp:80
 msgid ""
-"Message from %1:\n"
-"%2"
+"Enter the minimum value for the display here. If both values are 0, "
+"automatic range detection is enabled."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:60
-msgid "Change"
+#: SensorDisplayLib/DancingBarsSettings.cpp:92
+msgid ""
+"Enter the maximum value for the display here. If both values are 0, "
+"automatic range detection is enabled."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:61
-msgid "Rate"
-msgstr ""
+#: SensorDisplayLib/DancingBarsSettings.cpp:102
+msgid "Alarms"
+msgstr "Larymau"
 
-#: ksgrd/SensorManager.cc:63
-msgid "CPU Load"
-msgstr "Llwyth CPU"
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:59
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
+#: SensorDisplayLib/DancingBarsSettings.cpp:107 rc.cpp:107
+msgid "Alarm for Minimum Value"
+msgstr "Larwm Gwerth Isaf"
 
-#: ksgrd/SensorManager.cc:64
-msgid "Idling"
-msgstr ""
+#: SensorDisplayLib/DancingBarsSettings.cpp:112
+#: SensorDisplayLib/DancingBarsSettings.cpp:135
+msgid "Enable alarm"
+msgstr "Galluogi Larwm"
 
-#: ksgrd/SensorManager.cc:65
-msgid "Nice Load"
-msgstr "Llwyth Neis"
+#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:56
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_lowerLimitActive)
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:71
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_lowerLimitActive)
+#: SensorDisplayLib/DancingBarsSettings.cpp:113 rc.cpp:41 rc.cpp:113
+msgid "Enable the minimum value alarm."
+msgstr "Galluogi'r larwm gwerth isaf."
 
-#: ksgrd/SensorManager.cc:66
-msgid "User Load"
-msgstr "Llwyth Defnyddiwr"
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:97
+#. i18n: ectx: property (text), widget (QLabel, m_lblLowerLimit)
+#: SensorDisplayLib/DancingBarsSettings.cpp:116 rc.cpp:116
+msgid "Lower limit:"
+msgstr "Terfyn is:"
 
-#: ksgrd/SensorManager.cc:67
-msgctxt "@item sensor description"
-msgid "System Load"
-msgstr ""
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:123
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1_2)
+#: SensorDisplayLib/DancingBarsSettings.cpp:130 rc.cpp:119
+msgid "Alarm for Maximum Value"
+msgstr "Larwm Gwerth Uchaf"
 
-#: ksgrd/SensorManager.cc:68
-msgid "Waiting"
-msgstr ""
+#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:115
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_upperLimitActive)
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:135
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_upperLimitActive)
+#: SensorDisplayLib/DancingBarsSettings.cpp:136 rc.cpp:50 rc.cpp:125
+msgid "Enable the maximum value alarm."
+msgstr "Galluogi'r larwm gwerth uchaf."
 
-#: ksgrd/SensorManager.cpp:69
-msgid "Interrupt Load"
-msgstr ""
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:161
+#. i18n: ectx: property (text), widget (QLabel, m_lblUpperLimit)
+#: SensorDisplayLib/DancingBarsSettings.cpp:139 rc.cpp:128
+msgid "Upper limit:"
+msgstr "Terfyn uwch:"
 
-#: ksgrd/SensorManager.cc:69
-msgid "Total Load"
+#: SensorDisplayLib/DancingBarsSettings.cpp:156
+msgctxt "@title:tab Appearance of the bar graph"
+msgid "Look"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:70
-msgid "Memory"
-msgstr "Cof"
+#: SensorDisplayLib/DancingBarsSettings.cpp:161
+msgid "Normal bar color:"
+msgstr "Lliw bar arferol:"
 
-#: ksgrd/SensorManager.cc:71
-msgid "Physical Memory"
-msgstr "Cof Corfforol"
+#: SensorDisplayLib/DancingBarsSettings.cpp:168
+msgid "Out-of-range color:"
+msgstr "Lliw tu-allan-i'r-amrediad:"
 
-#: ksgrd/SensorManager.cc:72
-msgid "Swap Memory"
-msgstr "Cyfnewid Cof"
+#: SensorDisplayLib/DancingBarsSettings.cpp:186
+msgid ""
+"This determines the size of the font used to print a label underneath the "
+"bars. Bars are automatically suppressed if text becomes too large, so it is "
+"advisable to use a small font size here."
+msgstr ""
+"Penna hwn faint y wynebfath a ddefnyddir i argraffu label o dan y bariau. Fe "
+"rwystrir bariau'n ymysgogol os ddaw testun yn rhy fawr, felly mae'n syniad "
+"da dewis maint wynebfath bach yma."
 
-#: ksgrd/SensorManager.cc:73
-msgid "Cached Memory"
-msgstr "Cof Storfa"
+#: SensorDisplayLib/DancingBarsSettings.cpp:207
+msgid "Edit..."
+msgstr "Golygu..."
 
-#: ksgrd/SensorManager.cc:74
-msgid "Buffered Memory"
-msgstr "Cof Byffer"
+#: SensorDisplayLib/DancingBarsSettings.cpp:208
+msgid "Push this button to configure the label."
+msgstr "Gwasgwch y botwm yma i ffurfweddu'r label."
 
-#: ksgrd/SensorManager.cc:75
-msgid "Used Memory"
-msgstr "Cof wedi'i Ddefnyddio"
+#: SensorDisplayLib/DancingBarsSettings.cpp:366
+msgid "Label of Bar Graph"
+msgstr "Label Graff Bar"
 
-#: ksgrd/SensorManager.cc:76
-msgid "Application Memory"
-msgstr "Cof Cymhwysiadau"
+#: SensorDisplayLib/DancingBarsSettings.cpp:367
+msgid "Enter new label:"
+msgstr "Rhowch label newydd:"
 
-#: ksgrd/SensorManager.cc:77
-msgid "Free Memory"
-msgstr "Cof Rhydd"
+#: SensorDisplayLib/SensorLoggerSettings.cpp:30
+msgid "Sensor Logger Settings"
+msgstr "Gosodiadau Cofnodydd Synhwyrydd"
 
-#: ksgrd/SensorManager.cc:78
-msgid "Active Memory"
-msgstr ""
+#: SensorDisplayLib/ListViewSettings.cpp:30
+msgid "List View Settings"
+msgstr "Gosodiadau Golwg Restr"
 
-#: ksgrd/SensorManager.cc:79
-msgid "Inactive Memory"
+#: SensorDisplayLib/MultiMeterSettings.cpp:31
+msgctxt ""
+"Multimeter is a sensor display that mimics 'digital multimeter' aparatus"
+msgid "Multimeter Settings"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:80
-msgid "Wired Memory"
+#: SensorDisplayLib/ListView.cpp:45
+#, kde-format
+msgid "%1 K"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:81
-msgid "Exec Pages"
+#: SensorDisplayLib/ListView.cpp:46
+#, kde-format
+msgid "%1 M"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:82
-msgid "File Pages"
+#: SensorDisplayLib/ListView.cpp:47
+#, kde-format
+msgid "%1 G"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:86
-msgid "Processes"
+#: SensorDisplayLib/ListView.cpp:48
+#, kde-format
+msgid "%1 T"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:84 ksgrd/SensorManager.cc:193
-msgid "Process Controller"
-msgstr "Rheolydd Proses"
-
-#: ksgrd/SensorManager.cpp:88
-msgid "Last Process ID"
+#: SensorDisplayLib/ListView.cpp:49
+#, kde-format
+msgid "%1 P"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:89
-msgid "Process Spawn Count"
+#: SensorDisplayLib/ListView.cpp:152
+msgid "Display Units"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:83
-msgid "Process Count"
-msgstr "Cyfrif Proses"
-
-#: ksgrd/SensorManager.cpp:91
-msgid "Idle Processes Count"
+#: SensorDisplayLib/ListView.cpp:156
+msgid "Mixed"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:92
-msgid "Running Processes Count"
+#: SensorDisplayLib/ListView.cpp:162
+msgid "Kilobytes"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:93
-msgid "Sleeping Processes Count"
+#: SensorDisplayLib/ListView.cpp:168
+msgid "Megabytes"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:94
-msgid "Stopped Processes Count"
+#: SensorDisplayLib/ListView.cpp:174
+msgid "Gigabytes"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:95
-msgid "Zombie Processes Count"
+#: SensorDisplayLib/ListView.cpp:180
+msgid "Terabytes"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:96
-msgid "Waiting Processes Count"
+#: SensorDisplayLib/FancyPlotter.cpp:178
+msgctxt "Largest axis title"
+msgid "99999 XXXX"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:97
-msgid "Locked Processes Count"
+#: SensorDisplayLib/FancyPlotter.cpp:515 SensorDisplayLib/FancyPlotter.cpp:586
+#: SensorDisplayLib/FancyPlotter.cpp:649
+#, kde-format
+msgctxt "units"
+msgid "%1%"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:85
-msgid "Disk Throughput"
-msgstr "Trwybwn Disg"
-
-#: ksgrd/SensorManager.cc:86
-msgctxt "CPU Load"
-msgid "Load"
-msgstr "Llwyth"
-
-#: ksgrd/SensorManager.cc:87
-msgid "Total Accesses"
-msgstr "Cyfanswm Cyrchiadau"
-
-#: ksgrd/SensorManager.cc:88
-msgid "Read Accesses"
-msgstr "Cyrchiadau Darllen"
-
-#: ksgrd/SensorManager.cc:89
-msgid "Write Accesses"
-msgstr "Cyrchiadau Ysgrifennu"
-
-#: ksgrd/SensorManager.cc:90
-msgid "Read Data"
-msgstr "Data Darllen"
-
-#: ksgrd/SensorManager.cc:91
-msgid "Written Data"
+#: SensorDisplayLib/FancyPlotter.cpp:523
+#, kde-format
+msgctxt ""
+"%1 is what is being shown statistics for, like 'Memory', 'Swap', etc."
+msgid "<p><b>%1:</b><br>"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:92
-msgid "Milliseconds spent reading"
+#: SensorDisplayLib/FancyPlotter.cpp:594
+#, kde-format
+msgid "%1 of %2œ%1"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:93
-msgid "Milliseconds spent writing"
+#: SensorDisplayLib/FancyPlotter.cpp:622
+#, kde-format
+msgctxt "units"
+msgid "%1 TiB"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:94
-msgid "I/Os currently in progress"
+#: SensorDisplayLib/FancyPlotter.cpp:625
+#, kde-format
+msgctxt "units"
+msgid "%1 GiB"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:95
-msgid "Pages In"
-msgstr "Tudalenni i Mewn"
-
-#: ksgrd/SensorManager.cc:96
-msgid "Pages Out"
-msgstr "Tudalenni Allan"
-
-#: ksgrd/SensorManager.cc:97
-msgid "Context Switches"
-msgstr "Switsiadau Cyd-destun"
-
-#: ksgrd/SensorManager.cpp:112
-msgid "Traps"
+#: SensorDisplayLib/FancyPlotter.cpp:628
+#, kde-format
+msgctxt "units"
+msgid "%1 MiB"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:113
-msgid "System Calls"
+#: SensorDisplayLib/FancyPlotter.cpp:631
+#, kde-format
+msgctxt "units"
+msgid "%1 KiB"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:98
-msgid "Network"
-msgstr "Rhwydwaith"
-
-#: ksgrd/SensorManager.cc:99
-msgid "Interfaces"
-msgstr "Rhyngwynebau"
-
-#: ksgrd/SensorManager.cc:100
-msgid "Receiver"
-msgstr "Derbynnydd"
-
-#: ksgrd/SensorManager.cc:101
-msgid "Transmitter"
-msgstr "Trosglwyddydd"
-
-#: ksgrd/SensorManager.cc:103
-msgid "Data Rate"
+#: SensorDisplayLib/FancyPlotter.cpp:636
+#, kde-format
+msgctxt "units"
+msgid "%1 TiB/s"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:104
-msgid "Compressed Packets Rate"
+#: SensorDisplayLib/FancyPlotter.cpp:639
+#, kde-format
+msgctxt "units"
+msgid "%1 GiB/s"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:105
-msgid "Dropped Packets Rate"
+#: SensorDisplayLib/FancyPlotter.cpp:642
+#, kde-format
+msgctxt "units"
+msgid "%1 MiB/s"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:106
-msgid "Error Rate"
+#: SensorDisplayLib/FancyPlotter.cpp:645
+#, kde-format
+msgctxt "units"
+msgid "%1 KiB/s"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:107
-msgid "FIFO Overruns Rate"
+#: SensorDisplayLib/FancyPlotter.cpp:651
+#, kde-format
+msgctxt "unitless - just a number"
+msgid "%1"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:108
-msgid "Frame Error Rate"
-msgstr ""
+#: SensorDisplayLib/DummyDisplay.cpp:30 SensorDisplayLib/DummyDisplay.cpp:38
+msgid "Drop Sensor Here"
+msgstr "Gollyngwch Synhwyrydd Yma"
 
-#: ksgrd/SensorManager.cc:109
-msgid "Multicast Packet Rate"
+#: SensorDisplayLib/DummyDisplay.cpp:32
+msgid ""
+"This is an empty space in a worksheet. Drag a sensor from the Sensor Browser "
+"and drop it here. A sensor display will appear that allows you to monitor "
+"the values of the sensor over time."
 msgstr ""
+"Dyma le gwag mewn gweithlen. Llusgwch synhwyrydd yma o'r Porydd Synwyryddion "
+"a'i ollwng yma. Ymddengys dangosydd synhwyrydd sy'n caniatáu i chi arsylwi "
+"gwerthoedd y synhwyrydd dros amser."
 
-#: ksgrd/SensorManager.cc:110
-msgid "Packet Rate"
+#: WorkSheetSettings.cpp:40
+msgid "Tab Properties"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:111
-msgctxt "@item sensor description ('carrier' is a type of network signal)"
-msgid "Carrier Loss Rate"
+#: WorkSheetSettings.cpp:61
+msgid "Properties"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:112 ksgrd/SensorManager.cc:123
-msgid "Collisions"
-msgstr "Chwalfeydd"
-
-#: ksgrd/SensorManager.cc:114
-msgid "Data"
-msgstr "Data"
-
-#: ksgrd/SensorManager.cc:115
-msgid "Compressed Packets"
-msgstr "Pecynnau Cywasgiedig"
-
-#: ksgrd/SensorManager.cc:116
-msgid "Dropped Packets"
-msgstr "Pecynnau wedi'u Disgyn"
+#: WorkSheetSettings.cpp:70
+msgid "Rows:"
+msgstr "Rhesi:"
 
-#: ksgrd/SensorManager.cc:117
-msgid "Errors"
-msgstr "Gwallau"
+#: WorkSheetSettings.cpp:79
+msgid "Columns:"
+msgstr "Colofnau:"
 
-#: ksgrd/SensorManager.cc:118
-msgid "FIFO Overruns"
-msgstr "Trosrediadau FIFO"
+#: WorkSheetSettings.cpp:87
+msgid "Enter the number of rows the sheet should have."
+msgstr "Rhowch y nifer o resi dylai bod ar y len."
 
-#: ksgrd/SensorManager.cc:119
-msgid "Frame Errors"
-msgstr "Gwallau Ffram"
+#: WorkSheetSettings.cpp:88
+msgid "Enter the number of columns the sheet should have."
+msgstr "Rhowch y nifer o golofnau dylai bod ar y len."
 
-#: ksgrd/SensorManager.cc:120
-msgid "Multicast Packets"
-msgstr ""
+#: WorkSheetSettings.cpp:90 TimerSettings.cpp:51
+msgid "Update interval:"
+msgstr "Egwyl diweddaru:"
 
-#: ksgrd/SensorManager.cc:121
-msgid "Packets"
-msgstr "Pecynnau"
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:49
+#. i18n: ectx: property (suffix), widget (KIntNumInput, m_timerInterval)
+#: WorkSheetSettings.cpp:94 TimerSettings.cpp:58 rc.cpp:104
+msgid " sec"
+msgstr " eil"
 
-#: ksgrd/SensorManager.cc:122
-msgctxt "@item sensor description ('carrier' is a type of network signal)"
-msgid "Carrier Losses"
+#: WorkSheetSettings.cpp:100 TimerSettings.cpp:61
+msgid "All displays of the sheet are updated at the rate specified here."
 msgstr ""
+"Mae pob dangosiad o'r daflen yn cael ei diweddaru ar y raddfa a welir yma."
 
-#: ksgrd/SensorManager.cc:125
-msgid "Sockets"
-msgstr "Socedi"
-
-#: ksgrd/SensorManager.cc:126
-msgid "Total Number"
-msgstr "Rhif Cyfanswm"
-
-#: ksgrd/SensorManager.cc:127 ksgrd/SensorManager.cc:194
-msgid "Table"
-msgstr "Tabl"
-
-#: ksgrd/SensorManager.cc:128
-msgid "Advanced Power Management"
-msgstr "Rheoli Pŵer Uwch"
+#: WorkSheetSettings.cpp:101
+msgid "Enter the title of the worksheet here."
+msgstr "Rhowch deitl y weithlen yma."
 
-#: ksgrd/SensorManager.cc:129
-msgid "ACPI"
-msgstr "ACPI"
+#: SensorBrowser.cpp:117
+msgid "Sensor Browser"
+msgstr "Porydd Synwyryddion"
 
-#: ksgrd/SensorManager.cc:130
-msgid "Thermal Zone"
+#: SensorBrowser.cpp:474
+msgid "Drag sensors to empty cells of a worksheet "
 msgstr ""
 
-#: ksgrd/SensorManager.cc:131
-msgid "Temperature"
-msgstr "Tymheredd[1]"
-
-#: ksgrd/SensorManager.cpp:148
-msgid "Average CPU Temperature"
+#: SensorBrowser.cpp:475
+msgid ""
+"The sensor browser lists the connected hosts and the sensors that they "
+"provide. Click and drag sensors into drop zones of a worksheet. A display "
+"will appear that visualizes the values provided by the sensor. Some sensor "
+"displays can display values of multiple sensors. Simply drag other sensors "
+"on to the display to add more sensors."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:132
-msgid "Fan"
-msgstr "Gwyntyll"
+#: HostConnector.cpp:44
+msgid "Connect Host"
+msgstr "Cysylltu Westeiwr"
 
-#: ksgrd/SensorManager.cc:133
-msgid "State"
-msgstr "Cyflwr"
+#: HostConnector.cpp:55
+msgid "Host:"
+msgstr "Gwesteiwr"
 
-#: ksgrd/SensorManager.cc:134
-msgid "Battery"
-msgstr "Batri"
+#: HostConnector.cpp:65
+msgid "Enter the name of the host you want to connect to."
+msgstr "Rhowch enw o'r gwesteiwr rydych chi eisiau cysylltu iddo."
 
-#: ksgrd/SensorManager.cpp:152
-msgid "Battery Capacity"
-msgstr ""
+#: HostConnector.cpp:71
+msgid "Connection Type"
+msgstr "Math Cysylltiad"
 
-#: ksgrd/SensorManager.cc:135
-msgid "Battery Charge"
-msgstr "Ynni'r Batri"
+#: HostConnector.cpp:77
+msgid "ssh"
+msgstr "ssh"
 
-#: ksgrd/SensorManager.cc:136
-msgid "Battery Usage"
+#: HostConnector.cpp:80
+msgid "Select this to use the secure shell to login to the remote host."
 msgstr ""
+"Dewisiwch hwn i ddefnyddio'r plisgyn diogel i fewngofnodi i'r gwesteiwr pell."
 
-#: ksgrd/SensorManager.cpp:155
-msgid "Battery Voltage"
-msgstr ""
+#: HostConnector.cpp:83
+msgid "rsh"
+msgstr "rsh"
 
-#: ksgrd/SensorManager.cpp:156
-msgid "Battery Discharge Rate"
+#: HostConnector.cpp:84
+msgid "Select this to use the remote shell to login to the remote host."
 msgstr ""
+"Dewisiwch hwn i ddefnyddio'r plisgyn pell i fewngofnodi i'r gwesteiwr pell."
 
-#: ksgrd/SensorManager.cc:137
-msgid "Remaining Time"
-msgstr "Amser ar ôl"
-
-#: ksgrd/SensorManager.cc:138
-msgid "Interrupts"
-msgstr "Ymyriadau"
-
-#: ksgrd/SensorManager.cc:139
-msgid "Load Average (1 min)"
-msgstr "Cyfartaledd Llwytho (1 munud)"
-
-#: ksgrd/SensorManager.cc:140
-msgid "Load Average (5 min)"
-msgstr "Cyfartaledd Llwytho (5 munud)"
-
-#: ksgrd/SensorManager.cc:141
-msgid "Load Average (15 min)"
-msgstr "Cyfartaledd Llwytho (15 munud)"
-
-#: ksgrd/SensorManager.cc:142
-msgid "Clock Frequency"
-msgstr "Amlder Cloc"
+#: HostConnector.cpp:87
+msgid "Daemon"
+msgstr "Daemon"
 
-#: ksgrd/SensorManager.cpp:163
-msgid "Average Clock Frequency"
+#: HostConnector.cpp:88
+msgid ""
+"Select this if you want to connect to a ksysguard daemon that is running on "
+"the machine you want to connect to, and is listening for client requests."
 msgstr ""
+"Dewisiwch hwn os rydych chi eisiau cysylltu i daemon ksysguard sy'n rhedeg "
+"ar y cyfrifiadur rydych chi eisiau cysylltu iddo, ac sy'n gwrando am "
+"geisiadau dibynnydd."
 
-#: ksgrd/SensorManager.cc:143
-msgid "Hardware Sensors"
-msgstr "Synhwyryddion Caledwedd"
-
-#: ksgrd/SensorManager.cc:144
-msgid "Partition Usage"
-msgstr "Defnydd y Rhaniadau Disg"
-
-#: ksgrd/SensorManager.cc:145
-msgid "Used Space"
-msgstr "Lle wedi'i Ddefnyddio"
-
-#: ksgrd/SensorManager.cc:146
-msgid "Free Space"
-msgstr "Lle Rhydd"
-
-#: ksgrd/SensorManager.cc:147
-msgid "Fill Level"
-msgstr "Lefel Llenwi"
+#: HostConnector.cpp:91
+msgid "Custom command"
+msgstr "Gorchymyn Addasu"
 
-#: ksgrd/SensorManager.cpp:169
-msgid "Used Inodes"
+#: HostConnector.cpp:92
+msgid ""
+"Select this to use the command you entered below to start ksysguardd on the "
+"remote host."
 msgstr ""
+"Dewisiwch hyn i ddefnyddio'r gorchymyn yr ydych wedi mewnosod isod i gychwyn "
+"ksysguardd ar y gwesteiwr pell."
 
-#: ksgrd/SensorManager.cpp:170
-msgid "Free Inodes"
-msgstr ""
+#: HostConnector.cpp:95
+msgid "Port:"
+msgstr "Porth:"
 
-#: ksgrd/SensorManager.cpp:171
-msgid "Inode Level"
+#: HostConnector.cpp:102
+msgid ""
+"Enter the port number on which the ksysguard daemon is listening for "
+"connections."
 msgstr ""
+"Mewnosodwch y rhif porth y mae'r daemon ksysguard yn gwrando arno am "
+"gysylltiadau."
 
-#: ksgrd/SensorManager.cc:148
-msgid "System"
-msgstr ""
+#: HostConnector.cpp:105
+msgid "e.g.  3112"
+msgstr "e.e. 3112"
 
-#: ksgrd/SensorManager.cc:149
-msgid "Uptime"
-msgstr ""
+#: HostConnector.cpp:108
+msgid "Command:"
+msgstr "Gorchymyn:"
 
-#: ksgrd/SensorManager.cc:150
-msgid "Linux Soft Raid (md)"
+#: HostConnector.cpp:117
+msgid ""
+"Enter the command that runs ksysguardd on the host you want to monitor."
 msgstr ""
+"Mewnosodwch y gorchymyn sy'n rhedeg ksysguardd ar y gwesteiwr rydych eisiau "
+"ei fonitro."
 
-#: ksgrd/SensorManager.cc:151
-msgid "Processors"
-msgstr ""
+#: HostConnector.cpp:121
+msgid "e.g. ssh -l root remote.host.org ksysguardd"
+msgstr "e.e. ssh -l root remote.host.org ksysguardd"
 
-#: ksgrd/SensorManager.cc:152
-msgid "Cores"
+#: ksysguard.cpp:74
+msgid "KDE System Monitor"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:153
-msgid "Number of Blocks"
+#: ksysguard.cpp:154 ksysguard.cpp:530
+msgid "System Monitor"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:154
-msgid "Total Number of Devices"
+#: ksysguard.cpp:155
+msgid "&Refresh Tab"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:155
-msgid "Failed Devices"
+#: ksysguard.cpp:156
+msgid "&New Tab..."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:156
-msgid "Spare Devices"
+#: ksysguard.cpp:157
+msgid "Import Tab Fr&om File..."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:157
-msgid "Number of Raid Devices"
+#: ksysguard.cpp:158
+msgid "Save Tab &As..."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:158
-msgid "Working Devices"
+#: ksysguard.cpp:159
+msgid "&Close Tab"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:159
-msgid "Active Devices"
+#: ksysguard.cpp:160
+msgid "Monitor &Remote Machine..."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:160
-msgid "Number of Devices"
+#: ksysguard.cpp:161
+msgid "&Download New Tabs..."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:161
-msgid "Resyncing Percent"
+#: ksysguard.cpp:162
+msgid "&Upload Current Tab..."
 msgstr ""
 
-#: ksgrd/SensorManager.cc:162
-msgid "Disk Information"
+#: ksysguard.cpp:164
+msgid "Tab &Properties"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:165
+#: ksysguard.cpp:359
 #, kde-format
-msgid "CPU %1"
-msgstr ""
+msgid "1 processœ1"
+msgid_plural "%1 processesœ%1"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ksgrd/SensorManager.cc:166
+#: ksysguard.cpp:443
 #, kde-format
-msgid "Disk %1"
+msgid "CPU: %1%œ%1%"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:194
+#: ksysguard.cpp:458
 #, kde-format
-msgid "Battery %1"
+msgctxt "Arguments are formatted byte sizes (used/total)"
+msgid "Memory: %1 / %2œMem: %1 / %2œMem: %1œ%1"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:170
-#, kde-format
-msgid "Fan %1"
+#: ksysguard.cpp:485
+msgid " No swap space available "
 msgstr ""
 
-#: ksgrd/SensorManager.cc:171
+#: ksysguard.cpp:487
 #, kde-format
-msgid "Temperature %1"
+msgctxt "Arguments are formatted byte sizes (used/total)"
+msgid "Swap: %1 / %2œSwap: %1œ%1"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:174
-msgid "Total"
-msgstr "Cyfanswm"
-
-#: ksgrd/SensorManager.cpp:200
-msgid "Software Interrupts"
+#: ksysguard.cpp:532
+msgid "(c) 1996-2008 The KDE System Monitor Developers"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:201
-msgid "Hardware Interrupts"
+#: ksysguard.cpp:533
+msgid "John Tapsell"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:179
-#, kde-format
-msgid "Int %1"
+#: ksysguard.cpp:533
+msgid "Current Maintainer"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:184
-msgctxt "the unit 1 per second"
-msgid "1/s"
-msgstr "1/e"
-
-#: ksgrd/SensorManager.cc:185
-msgid "kBytes"
-msgstr "kBeitiau"
-
-#: ksgrd/SensorManager.cc:186
-msgctxt "the unit minutes"
-msgid "min"
-msgstr "mun"
-
-#: ksgrd/SensorManager.cc:187
-msgctxt "the frequency unit"
-msgid "MHz"
-msgstr "MHz"
-
-#: ksgrd/SensorManager.cc:188
-msgctxt "a percentage"
-msgid "%"
+#: ksysguard.cpp:534
+msgid "Chris Schlaeger"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:218
-msgctxt "the unit milliamperes"
-msgid "mA"
+#: ksysguard.cpp:534
+msgid "Previous Maintainer"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:219
-msgctxt "the unit milliampere hours"
-msgid "mAh"
+#: ksysguard.cpp:535
+msgid "Greg Martyn"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:220
-msgctxt "the unit milliwatts"
-msgid "mW"
+#: ksysguard.cpp:536
+msgid "Tobias Koenig"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:221
-msgctxt "the unit milliwatt hours"
-msgid "mWh"
+#: ksysguard.cpp:537
+msgid "Nicolas Leclercq"
 msgstr ""
 
-#: ksgrd/SensorManager.cpp:222
-msgctxt "the unit millivolts"
-msgid "mV"
+#: ksysguard.cpp:538
+msgid "Alex Sanda"
 msgstr ""
 
-#: ksgrd/SensorManager.cc:191
-msgid "Integer Value"
-msgstr "Gwerth Cyfanrif"
+#: ksysguard.cpp:539
+msgid "Bernd Johannes Wuebben"
+msgstr ""
 
-#: ksgrd/SensorManager.cc:192
-msgid "Floating Point Value"
-msgstr "Gwerth Pwynt Arnawf"
+#: ksysguard.cpp:540
+msgid "Ralf Mueller"
+msgstr ""
 
-#: ksgrd/SensorSocketAgent.cc:103
-#, kde-format
-msgid "Connection to %1 refused"
-msgstr "Cysylltiad i %1 wedi'i gwrthod"
+#: ksysguard.cpp:541
+msgid "Hamish Rodda"
+msgstr ""
 
-#: ksgrd/SensorSocketAgent.cc:107
-#, kde-format
-msgid "Host %1 not found"
-msgstr "Gwesteiwr %1 heb ei ganfod"
+#: ksysguard.cpp:542
+msgid "Torsten Kasch"
+msgstr ""
 
-#: ksgrd/SensorSocketAgent.cc:111
-#, kde-format
+#: ksysguard.cpp:542
 msgid ""
-"An error occurred with the network (e.g. the network cable was accidentally "
-"unplugged) for host %1."
+"Solaris Support\n"
+"Parts derived (by permission) from the sunos5\n"
+"module of William LeFebvre's \"top\" utility."
 msgstr ""
+"Solaris Support\n"
+"Parts derived (by permission) from the sunos5\n"
+"module of William LeFebvre's \"top\" utility."
 
-#: ksgrd/SensorSocketAgent.cc:115
-#, kde-format
-msgid "Error for host %1: %2"
-msgstr ""
+#: ksysguard.cpp:551
+msgid "Optional worksheet files to load"
+msgstr "Ffeiliau gweithlenni dewisol i'w llwytho"
 
-#: WorkSheet.cc:88
+#: WorkSheet.cpp:88
 #, kde-format
 msgid "Cannot open the file %1."
 msgstr ""
 
-#: WorkSheet.cc:96
+#: WorkSheet.cpp:96
 #, kde-format
 msgid "The file %1 does not contain valid XML."
 msgstr "Nid yw'r ffeil %1 yn cynnwys XML dilys."
 
-#: WorkSheet.cc:103
+#: WorkSheet.cpp:103
 #, kde-format
 msgid ""
 "The file %1 does not contain a valid worksheet definition, which must have a "
@@ -1555,242 +887,295 @@
 "Nid yw'r ffeil %1 yn cynnwys diffiniad gweithlen, sydd angen biau math "
 "dogfen 'KSysGuardWorkSheet'."
 
-#: WorkSheet.cc:127
+#: WorkSheet.cpp:127
 #, kde-format
 msgid "The file %1 has an invalid worksheet size."
 msgstr "Mae'r ffeil %1 gyda maint gweithlen annilys."
 
-#: WorkSheet.cc:228
+#: WorkSheet.cpp:228
 #, kde-format
 msgid "Cannot save file %1"
 msgstr ""
 
-#: WorkSheet.cc:274
+#: WorkSheet.cpp:274
 msgid "The clipboard does not contain a valid display description."
 msgstr "Nid yw'r gludfwrdd yn cynnwys disgrifiad dangosydd dilys."
 
-#: WorkSheet.cc:372
+#: WorkSheet.cpp:375
 msgid "Select Display Type"
 msgstr "Dewis Math Dangosydd"
 
-#: WorkSheet.cc:373
+#: WorkSheet.cpp:376
 msgid "&Line graph"
 msgstr ""
 
-#: WorkSheet.cc:374
+#: WorkSheet.cpp:377
 msgid "&Digital display"
 msgstr ""
 
-#: WorkSheet.cc:375
+#: WorkSheet.cpp:378
 msgid "&Bar graph"
 msgstr ""
 
-#: WorkSheet.cc:376
+#: WorkSheet.cpp:379
 msgid "Log to a &file"
 msgstr ""
 
-#: WorkSheet.cc:525
+#: WorkSheet.cpp:533
 msgid "Remove this display?"
 msgstr ""
 
-#: WorkSheet.cc:526
+#: WorkSheet.cpp:534
 msgid "Remove Display"
 msgstr ""
 
-#: WorkSheet.cc:567
+#: WorkSheet.cpp:575
 msgid "Dummy"
 msgstr ""
 
-#: rc.cpp:13
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
+#: TimerSettings.cpp:38
+msgid "Timer Settings"
+msgstr "Gosodiadau Cyfrifydd Amser"
 
-#: rc.cpp:14
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
+#: TimerSettings.cpp:48
+msgid "Use update interval of worksheet"
+msgstr "Defnyddio egwyl diweddaru  o weithlen"
 
-#. i18n: file: ksysguardui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:3
-msgid "&File"
+#: Workspace.cpp:113
+#, kde-format
+msgid "Sheet %1"
+msgstr "Taflen %1"
+
+#: Workspace.cpp:172
+#, kde-format
+msgid ""
+"The tab '%1' contains unsaved data.\n"
+"Do you want to save the tab?"
 msgstr ""
 
-#. i18n: file: ksysguardui.rc:14
-#. i18n: ectx: Menu (view)
-#: rc.cpp:6
-msgid "&View"
+#: Workspace.cpp:187
+msgid "*.sgrd|Sensor Files (*.sgrd)"
 msgstr ""
 
-#. i18n: file: ksysguardui.rc:18
-#. i18n: ectx: Menu (settings)
-#: rc.cpp:9
-msgid "&Settings"
+#: Workspace.cpp:187
+msgid "Select Tab File to Import"
 msgstr ""
 
-#. i18n: file: ksysguardui.rc:21
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:12
-msgid "Main Toolbar"
+#: Workspace.cpp:215 Workspace.cpp:236
+msgid "You do not have a tab that could be saved."
+msgstr ""
+
+#: Workspace.cpp:243
+msgid "Export Tab"
+msgstr ""
+
+#: Workspace.cpp:261
+msgid "There are no tabs that could be deleted."
+msgstr ""
+
+#: Workspace.cpp:301
+#, kde-format
+msgid ""
+"<qt>To propose the current custom tab as a new System Monitor tab, email "
+"<br><a href=\"file:%1\">%2</a><br> to <a "
+"href=\"mailto:john.tapsell@kde.org?subject='System Monitor "
+"Tab'&attach='file://%2'\">john.tapsell@kde.org</a></qt>"
 msgstr ""
 
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:28
+#: Workspace.cpp:301
+msgid "Upload custom System Monitor tab"
+msgstr ""
+
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Owain Green drwy KGyfieithu, ,Launchpad Contributions:"
+
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
+
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:21
 #. i18n: ectx: attribute (title), widget (QWidget, textTab)
-#: rc.cpp:17
+#: rc.cpp:5
 msgid "&Text"
 msgstr ""
 
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:36
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:29
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:20
+#: rc.cpp:8
 msgid "T&itle:"
 msgstr ""
 
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:154
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:139
 #. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:29
+#: rc.cpp:17
 msgid "Fi&lter"
 msgstr ""
 
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:175
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:160
 #. i18n: ectx: property (text), widget (QPushButton, addButton)
-#: rc.cpp:32
+#: rc.cpp:20
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:182
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:167
 #. i18n: ectx: property (text), widget (QPushButton, deleteButton)
-#: rc.cpp:35
+#: rc.cpp:23
 msgid "&Delete"
 msgstr ""
 
-#. i18n: file: SensorDisplayLib/LogFileSettings.ui:189
+#. i18n: file: SensorDisplayLib/LogFileSettings.ui:174
 #. i18n: ectx: property (text), widget (QPushButton, changeButton)
-#: rc.cpp:38
+#: rc.cpp:26
 msgid "&Change"
 msgstr "&Newid"
 
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, fileFrame)
-#: rc.cpp:41
-msgid "File"
-msgstr ""
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:68
-#. i18n: ectx: property (text), widget (QCheckBox, m_lowerLimitActive)
-#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:59
-#. i18n: ectx: property (text), widget (QCheckBox, m_lowerLimitActive)
-#: rc.cpp:53 rc.cpp:104
-msgid "&Enable alarm"
-msgstr "&Galluogi larwm"
-
-#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, m_upperLimitActive)
-#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:118
-#. i18n: ectx: property (text), widget (QCheckBox, m_upperLimitActive)
-#: rc.cpp:65 rc.cpp:113
-msgid "E&nable alarm"
-msgstr "G&alluogi larwm"
-
-#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:37
-#. i18n: ectx: property (title), widget (QGroupBox, colorFrame)
-#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:37
-#. i18n: ectx: property (title), widget (QGroupBox, colorFrame)
-#: rc.cpp:77 rc.cpp:131
-msgid "Colors"
-msgstr "Lliwiau:"
-
-#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:51
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:80 rc.cpp:134
-msgid "Text color:"
-msgstr "Lliw testun:"
-
-#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:64
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:83
-msgid "Grid color:"
-msgstr "Lliw grid:"
-
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:25
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:89
+#: rc.cpp:29
 msgid "&Title:"
 msgstr ""
 
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:42
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, m_showUnit)
-#: rc.cpp:95
+#: rc.cpp:35
 msgid "Enable this to append the unit to the title of the display."
 msgstr "Galluogwch hwn i atodi'r uned i deitl y dangosydd."
 
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:45
 #. i18n: ectx: property (text), widget (QCheckBox, m_showUnit)
-#: rc.cpp:98
+#: rc.cpp:38
 msgid "&Show unit"
 msgstr "&Dangos uned"
 
+#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:59
+#. i18n: ectx: property (text), widget (QCheckBox, m_lowerLimitActive)
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:68
+#. i18n: ectx: property (text), widget (QCheckBox, m_lowerLimitActive)
+#: rc.cpp:44 rc.cpp:110
+msgid "&Enable alarm"
+msgstr "&Galluogi larwm"
+
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:85
 #. i18n: ectx: property (text), widget (QLabel, m_lblLowerLimit)
-#: rc.cpp:107
+#: rc.cpp:47
 msgid "Lo&wer limit:"
 msgstr ""
 
+#. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, m_upperLimitActive)
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, m_upperLimitActive)
+#: rc.cpp:53 rc.cpp:122
+msgid "E&nable alarm"
+msgstr "G&alluogi larwm"
+
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:144
 #. i18n: ectx: property (text), widget (QLabel, m_lblUpperLimit)
-#: rc.cpp:116
+#: rc.cpp:56
 msgid "&Upper limit:"
 msgstr ""
 
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:174
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:119
+#: rc.cpp:59
 msgid "Normal digit color:"
 msgstr "Lliw digid arferol:"
 
 #. i18n: file: SensorDisplayLib/MultiMeterSettingsWidget.ui:201
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:122
+#: rc.cpp:62
 msgid "Alarm digit color:"
 msgstr "Lliw digid larwm:"
 
+#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:37
+#. i18n: ectx: property (title), widget (QGroupBox, colorFrame)
+#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:37
+#. i18n: ectx: property (title), widget (QGroupBox, colorFrame)
+#: rc.cpp:71 rc.cpp:86
+msgid "Colors"
+msgstr "Lliwiau:"
+
+#. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:51
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:74 rc.cpp:89
+msgid "Text color:"
+msgstr "Lliw testun:"
+
 #. i18n: file: SensorDisplayLib/SensorLoggerSettingsWidget.ui:77
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:140
+#: rc.cpp:80
 msgid "Alarm color:"
 msgstr "Lliw larwm:"
 
+#. i18n: file: SensorDisplayLib/ListViewSettingsWidget.ui:64
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:92
+msgid "Grid color:"
+msgstr "Lliw grid:"
+
+#. i18n: file: SensorDisplayLib/SensorLoggerDlgWidget.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, fileFrame)
+#: rc.cpp:98
+msgid "File"
+msgstr ""
+
+#. i18n: file: ksysguardui.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:131
+msgid "&File"
+msgstr ""
+
+#. i18n: file: ksysguardui.rc:14
+#. i18n: ectx: Menu (view)
+#: rc.cpp:134
+msgid "&View"
+msgstr ""
+
+#. i18n: file: ksysguardui.rc:18
+#. i18n: ectx: Menu (settings)
+#: rc.cpp:137
+msgid "&Settings"
+msgstr ""
+
+#. i18n: file: ksysguardui.rc:21
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:140
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: tag WorkSheet attribute title
+#. i18n: file: ./ProcessTable.sgrd:3
+#. i18n: tag display attribute title
+#. i18n: file: ./ProcessTable.sgrd:5
+#: rc.cpp:143 rc.cpp:146
+msgid "Process Table"
+msgstr "Tabl Prosesau"
+
 #. i18n: tag WorkSheet attribute title
 #. i18n: file: ./SystemLoad2.sgrd:3
-#: rc.cpp:143
+#: rc.cpp:149
 msgid "System Load"
 msgstr "Llwyth Cysawd"
 
 #. i18n: tag display attribute title
 #. i18n: file: ./SystemLoad2.sgrd:5
-#: rc.cpp:146
+#: rc.cpp:152
 msgid "CPU History"
 msgstr ""
 
 #. i18n: tag display attribute title
 #. i18n: file: ./SystemLoad2.sgrd:8
-#: rc.cpp:149
+#: rc.cpp:155
 msgid "Memory and Swap History"
 msgstr ""
 
 #. i18n: tag display attribute title
 #. i18n: file: ./SystemLoad2.sgrd:12
-#: rc.cpp:152
+#: rc.cpp:158
 msgid "Network History"
 msgstr ""
-
-#. i18n: tag WorkSheet attribute title
-#. i18n: file: ./ProcessTable.sgrd:3
-#. i18n: tag display attribute title
-#. i18n: file: ./ProcessTable.sgrd:5
-#: rc.cpp:155 rc.cpp:158
-msgid "Process Table"
-msgstr "Tabl Prosesau"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksystemlog.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksystemlog.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksystemlog.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksystemlog.po	2012-04-18 08:59:22.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ksystemlog\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 02:38+0000\n"
-"PO-Revision-Date: 2012-03-13 07:42+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-16 22:44+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:41+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: src/mainWindow.cpp:383
 #, kde-format
@@ -310,347 +310,442 @@
 msgid "Others"
 msgstr ""
 
-#: src/tabLogViewsWidget.cpp:109
-msgid "No Log"
+#: src/statusBar.cpp:118
+#, kde-format
+msgid "Last updated: %1."
 msgstr ""
 
-#: src/lib/logModeItemBuilder.cpp:68 src/lib/logModeItemBuilder.cpp:85
-#: src/modes/cups/cupsItemBuilder.h:53 src/modes/cups/cupsPageItemBuilder.h:55
-#: src/modes/cups/cupsAccessItemBuilder.h:55
-#: src/modes/cups/cupsPdfItemBuilder.h:55
-#: src/modes/samba/sambaItemBuilder.h:55 src/modes/acpid/acpidItemBuilder.h:57
-#: src/modes/cron/cronItemBuilder.h:55 src/modes/kernel/kernelItemBuilder.h:57
-#: src/modes/apache/apacheItemBuilder.h:55
-#: src/modes/apache/apacheAccessItemBuilder.h:55
-msgid "Date:"
-msgstr "Dyddiad:"
+#: src/statusBar.cpp:123
+#, kde-format
+msgid "%1: %2"
+msgstr ""
 
-#: src/lib/logModeItemBuilder.cpp:69 src/modes/cups/cupsAccessItemBuilder.h:57
-#: src/modes/cron/cronItemBuilder.h:56
-msgid "Hostname:"
-msgstr "Enw Gwesteiwr:"
+#: src/loggerDialog.cpp:91 src/loggerDialog.cpp:124
+#: src/modes/cron/cronAnalyzer.h:54 src/modes/apache/apacheAccessAnalyzer.h:56
+#: src/modes/cups/cupsAccessAnalyzer.h:56 src/modes/cups/cupsPageAnalyzer.h:55
+msgid "User"
+msgstr "Defnyddiwr"
 
-#: src/lib/logModeItemBuilder.cpp:70 src/modes/cron/cronItemBuilder.h:57
-msgid "Process:"
-msgstr "Proses :"
+#: src/loggerDialog.cpp:114
+msgid "Authentication"
+msgstr "Dilysiant"
 
-#: src/lib/logModeItemBuilder.cpp:71 src/lib/logModeItemBuilder.cpp:86
-#: src/modes/cups/cupsItemBuilder.h:54 src/modes/cups/cupsPageItemBuilder.h:56
-#: src/modes/cups/cupsAccessItemBuilder.h:56
-#: src/modes/cups/cupsPdfItemBuilder.h:56
-#: src/modes/samba/sambaItemBuilder.h:56 src/modes/acpid/acpidItemBuilder.h:58
-#: src/modes/cron/cronItemBuilder.h:59 src/modes/kernel/kernelItemBuilder.h:58
-#: src/modes/apache/apacheItemBuilder.h:56
-#: src/modes/apache/apacheAccessItemBuilder.h:56
-msgid "Level:"
-msgstr "Lefel :"
+#: src/loggerDialog.cpp:115
+msgid "Private Authentication"
+msgstr ""
 
-#: src/lib/logModeItemBuilder.cpp:72 src/lib/logModeItemBuilder.cpp:87
-#: src/modes/xorg/xorgItemBuilder.h:78
-#: src/modes/xsession/xsessionItemBuilder.h:78
-#: src/modes/cron/cronItemBuilder.h:60
-msgid "Original file:"
+#: src/loggerDialog.cpp:116
+msgid "Cron"
 msgstr ""
 
-#: src/lib/logViewWidget.cpp:124
-#, kde-format
-msgid "Display/Hide the '%1' column"
+#: src/loggerDialog.cpp:117
+msgid "Daemon"
+msgstr "Daemon"
+
+#: src/loggerDialog.cpp:118
+msgid "FTP"
+msgstr "FTP"
+
+#: src/loggerDialog.cpp:119
+msgid "Kernel"
+msgstr "Cnewyllyn"
+
+#: src/loggerDialog.cpp:120
+msgid "LPR"
 msgstr ""
 
-#: src/lib/logManager.cpp:82
-msgid "Loading log..."
+#: src/loggerDialog.cpp:121
+msgid "Mail"
+msgstr "Post"
+
+#: src/loggerDialog.cpp:122
+msgid "News"
+msgstr "Newyddion"
+
+#: src/loggerDialog.cpp:123
+msgid "Syslog"
+msgstr "Cofnod cysawd"
+
+#: src/loggerDialog.cpp:125
+msgid "UUCP"
 msgstr ""
 
-#: src/lib/logManager.cpp:105
-msgid "Log successfully loaded."
+#: src/loggerDialog.cpp:127
+msgid "Local 0"
 msgstr ""
 
-#: src/lib/globals.cpp:135
-msgid "None"
-msgstr "Dim"
+#: src/loggerDialog.cpp:128
+msgid "Local 1"
+msgstr ""
 
-#: src/lib/globals.cpp:138
-msgid "Debug"
+#: src/loggerDialog.cpp:129
+msgid "Local 2"
 msgstr ""
 
-#: src/lib/globals.cpp:141
-msgid "Information"
+#: src/loggerDialog.cpp:130
+msgid "Local 3"
 msgstr ""
 
-#: src/lib/globals.cpp:144
-msgid "Notice"
+#: src/loggerDialog.cpp:131
+msgid "Local 4"
 msgstr ""
 
-#: src/lib/globals.cpp:147
-msgid "Warning"
+#: src/loggerDialog.cpp:132
+msgid "Local 5"
 msgstr ""
 
-#: src/lib/globals.cpp:150
-msgid "Error"
+#: src/loggerDialog.cpp:133
+msgid "Local 6"
 msgstr ""
 
-#: src/lib/globals.cpp:153
-msgid "Critical"
+#: src/loggerDialog.cpp:134
+msgid "Local 7"
 msgstr ""
 
-#: src/lib/globals.cpp:156
-msgid "Alert"
+#: src/loggerDialog.cpp:242
+msgid ""
+"Unable to find the 'logger' command on your system. Please type 'logger' in "
+"a Konsole to determine whether this command is installed."
 msgstr ""
 
-#: src/lib/globals.cpp:159
-msgid "Emergency"
+#: src/loggerDialog.cpp:242
+msgid "Command not found"
 msgstr ""
 
-#: src/lib/analyzer.cpp:146
-#, kde-format
-msgid "Opening '%1'..."
+#: src/loggerDialog.cpp:247
+msgid "The 'logger' command has not been properly exited."
 msgstr ""
 
-#: src/lib/analyzer.cpp:153
-#, kde-format
-msgid "Log file '%1' loaded successfully."
+#: src/loggerDialog.cpp:247
+msgid "Execution problem"
 msgstr ""
 
-#: src/lib/analyzer.cpp:167
-#, kde-format
-msgid "Log file '%1' has changed."
+#: src/loggerDialog.cpp:253
+msgid "This file does not exist, please choose another."
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:115
-#: src/lib/processOutputLogFileReader.cpp:109
-msgid ""
-"This file is not valid. Please adjust it in the settings of KSystemLog."
+#: src/loggerDialog.cpp:253
+msgid "File not valid"
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:116 src/lib/localLogFileReader.cpp:130
-#: src/lib/processOutputLogFileReader.cpp:110
-msgid "File Does Not Exist"
+#: src/configurationDialog.cpp:54
+msgid "Settings"
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:129
-#, kde-format
-msgid "The file '%1' does not exist."
+#: src/configurationDialog.cpp:108
+msgid "General"
+msgstr "Cyffredinol"
+
+#: src/modes/postfix/postfixConfigurationWidget.h:48
+#: src/modes/postfix/postfixLogMode.cpp:39
+msgid "Postfix Log"
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:149
-#, kde-format
-msgid "Unable to uncompress the '%2' format of '%1'."
+#: src/modes/postfix/postfixConfigurationWidget.h:54
+msgid "<p>These files will be analyzed to show the <b>Postfix Logs</b>.</p>"
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:150
-msgid "Unable to Uncompress File"
+#: src/modes/postfix/postfixLogMode.cpp:48
+msgid "Display the Postfix log."
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:157
-#, kde-format
-msgid "You do not have sufficient permissions to read '%1'."
+#: src/modes/postfix/postfixLogMode.cpp:49
+msgid ""
+"Displays the Postfix log in the current tab. Postfix is the most known and "
+"used mail server in the Linux world."
 msgstr ""
 
-#: src/lib/localLogFileReader.cpp:158
-msgid "Insufficient Permissions"
-msgstr "Caniatadau Annigonol"
+#: src/modes/authentication/authenticationLogMode.cpp:38
+#: src/modes/authentication/authenticationConfigurationWidget.h:49
+msgid "Authentication Log"
+msgstr ""
 
-#: src/lib/logViewSearchWidget.cpp:185
-msgid "Reached end of list."
+#: src/modes/authentication/authenticationLogMode.cpp:47
+msgid "Display the authentication log."
 msgstr ""
 
-#: src/lib/logViewSearchWidget.cpp:272
-msgid "Phrase not found."
+#: src/modes/authentication/authenticationLogMode.cpp:48
+msgid ""
+"Displays the authentication log in the current tab. This log displays all "
+"logins made by each user of the system, and can help you to know if someone "
+"tried to crack your system."
 msgstr ""
 
-#: src/lib/logViewExport.cpp:57
-msgid "Here are my logs:\n"
+#: src/modes/authentication/authenticationConfigurationWidget.h:56
+msgid "Authentication Log File"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:59 src/lib/logViewExport.cpp:73
-msgid "---------------------------------------\n"
+#: src/modes/authentication/authenticationConfigurationWidget.h:62
+msgid "Authentication log file:"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:77
+#: src/modes/authentication/authenticationConfigurationWidget.h:67
 msgid ""
-"You have selected too many lines. Please only select important log lines."
+"You can type or choose the authentication log file (example: "
+"<i>/var/log/auth.log</i>)."
 msgstr ""
 
-#: src/lib/logViewExport.cpp:77
-msgid "Too Many Lines Selected"
+#: src/modes/authentication/authenticationConfigurationWidget.h:68
+msgid ""
+"You can type or choose here the authentication log file. This file will be "
+"analyzed when you select the <b>Authentication log</b> menu. Generally, its "
+"name is <i>/var/log/auth.log</i>"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:90
-msgid "Log Lines of my problem"
+#: src/modes/system/systemConfigurationWidget.h:48
+#: src/modes/system/systemLogMode.cpp:39
+msgid "System Log"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:213
-msgid "No items selected. Nothing copied to clipboard."
+#: src/modes/system/systemConfigurationWidget.h:54
+msgid "<p>These files will be analyzed to show the <b>System logs</b>.</p>"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:219
-#, kde-format
-msgid "1 log line copied to clipboard."
-msgid_plural "%1 log lines copied to clipboard."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modes/system/systemLogMode.cpp:48
+msgid "Display the system log."
+msgstr ""
 
-#: src/lib/logViewExport.cpp:233
-msgid "No items selected. Please select items to be able to save them."
+#: src/modes/system/systemLogMode.cpp:49
+msgid ""
+"Displays the system log in the current tab. This log is generally used by "
+"non-specialized processes (like \"sudo\" or \"fsck\" commands)"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:264
-#, kde-format
-msgid "1 log line saved to '%2'."
-msgid_plural "%1 log lines saved to '%2'."
-msgstr[0] ""
-msgstr[1] ""
+#: src/modes/cron/cronAnalyzer.h:51 src/modes/acpid/acpidAnalyzer.h:49
+#: src/modes/base/syslogAnalyzer.cpp:58 src/modes/samba/sambaAnalyzer.h:54
+#: src/modes/apache/apacheAnalyzer.h:53
+#: src/modes/apache/apacheAccessAnalyzer.h:53
+#: src/modes/kernel/kernelAnalyzer.h:58 src/modes/cups/cupsAccessAnalyzer.h:53
+#: src/modes/cups/cupsAnalyzer.h:55 src/modes/cups/cupsPageAnalyzer.h:53
+#: src/modes/cups/cupsPdfAnalyzer.h:54
+msgid "Date"
+msgstr "Dyddiad"
 
-#: src/lib/logViewExport.cpp:267
-#, kde-format
-msgid "Unable to save file '%1': Permission Denied."
+#: src/modes/cron/cronAnalyzer.h:52 src/modes/base/syslogAnalyzer.cpp:59
+#: src/modes/cups/cupsAccessAnalyzer.h:54
+msgid "Host"
 msgstr ""
 
-#: src/lib/logViewExport.cpp:268
-msgid "Unable to save file."
+#: src/modes/cron/cronAnalyzer.h:53 src/modes/base/syslogAnalyzer.cpp:60
+msgid "Process"
+msgstr "Proses"
+
+#: src/modes/cron/cronAnalyzer.h:55
+msgid "Command"
 msgstr ""
 
-#: src/lib/loadingBar.cpp:66
-msgid "Loading Progress..."
+#: src/modes/cron/cronConfigurationWidget.h:49
+#: src/modes/cron/cronLogMode.cpp:38
+msgid "Cron Log"
 msgstr ""
 
-#: src/lib/loadingBar.cpp:94
-#, kde-format
-msgid "Loading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>)"
-msgid_plural "Loading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>/%1 files)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/lib/loadingBar.cpp:98
-#, kde-format
-msgid "Reloading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>)"
-msgid_plural "Reloading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>/%1 files)"
-msgstr[0] ""
-msgstr[1] ""
+#: src/modes/cron/cronConfigurationWidget.h:55
+msgid ""
+"<p>These files will be analyzed to show the <b>Cron Logs</b> (i.e. planned "
+"tasks logs). <a href='man:/cron'>More information...</a></p>"
+msgstr ""
 
-#: src/lib/loadingBar.cpp:105
-#, kde-format
-msgid "Loading <b>%1</b>...<br /><i>%2</i>"
+#: src/modes/cron/cronConfigurationWidget.h:63
+msgid "Enable Process Filtering"
 msgstr ""
 
-#: src/lib/loadingBar.cpp:107
-#, kde-format
-msgid "Reloading <b>%1</b>...<br /><i>%2</i>"
+#: src/modes/cron/cronConfigurationWidget.h:75
+msgid "Only keeps lines which matches this process :"
 msgstr ""
 
-#: src/lib/logModeConfiguration.cpp:217 src/lib/logModeConfiguration.cpp:245
-#: src/modes/base/genericConfiguration.cpp:100
-#, kde-format
-msgid "URL '%1' is not valid, skipping this URL."
+#: src/modes/cron/cronLogMode.cpp:47
+msgid "Display the planned tasks log (Cron log)."
 msgstr ""
 
-#: src/lib/processOutputLogFileReader.cpp:156
-#, kde-format
-msgid "The process '%1' crashed."
+#: src/modes/cron/cronLogMode.cpp:48
+msgid ""
+"Displays the planned tasks log in the current tab. Cron process is a program "
+"in charge of launching planned tasks on your system, like security checks, "
+"or auto-restarting of some services. Use this menu to see the recently "
+"launched processes."
 msgstr ""
 
-#: src/lib/processOutputLogFileReader.cpp:157
-msgid "Process Crashed"
+#: src/modes/cron/cronItemBuilder.h:55 src/modes/acpid/acpidItemBuilder.h:57
+#: src/modes/samba/sambaItemBuilder.h:55
+#: src/modes/apache/apacheAccessItemBuilder.h:55
+#: src/modes/apache/apacheItemBuilder.h:55
+#: src/modes/kernel/kernelItemBuilder.h:57
+#: src/modes/cups/cupsAccessItemBuilder.h:55
+#: src/modes/cups/cupsPdfItemBuilder.h:55 src/modes/cups/cupsItemBuilder.h:53
+#: src/modes/cups/cupsPageItemBuilder.h:55 src/lib/logModeItemBuilder.cpp:68
+#: src/lib/logModeItemBuilder.cpp:85
+msgid "Date:"
+msgstr "Dyddiad:"
+
+#: src/modes/cron/cronItemBuilder.h:56
+#: src/modes/cups/cupsAccessItemBuilder.h:57 src/lib/logModeItemBuilder.cpp:69
+msgid "Hostname:"
+msgstr "Enw Gwesteiwr:"
+
+#: src/modes/cron/cronItemBuilder.h:57 src/lib/logModeItemBuilder.cpp:70
+msgid "Process:"
+msgstr "Proses :"
+
+#: src/modes/cron/cronItemBuilder.h:58
+msgid "User:"
+msgstr "Defnyddiwr:"
+
+#: src/modes/cron/cronItemBuilder.h:59 src/modes/acpid/acpidItemBuilder.h:58
+#: src/modes/samba/sambaItemBuilder.h:56
+#: src/modes/apache/apacheAccessItemBuilder.h:56
+#: src/modes/apache/apacheItemBuilder.h:56
+#: src/modes/kernel/kernelItemBuilder.h:58
+#: src/modes/cups/cupsAccessItemBuilder.h:56
+#: src/modes/cups/cupsPdfItemBuilder.h:56 src/modes/cups/cupsItemBuilder.h:54
+#: src/modes/cups/cupsPageItemBuilder.h:56 src/lib/logModeItemBuilder.cpp:71
+#: src/lib/logModeItemBuilder.cpp:86
+msgid "Level:"
+msgstr "Lefel :"
+
+#: src/modes/cron/cronItemBuilder.h:60 src/modes/xorg/xorgItemBuilder.h:78
+#: src/modes/xsession/xsessionItemBuilder.h:78
+#: src/lib/logModeItemBuilder.cpp:72 src/lib/logModeItemBuilder.cpp:87
+msgid "Original file:"
 msgstr ""
 
-#: src/lib/levelPrintPage.cpp:41
-msgid "Log Level Printing"
+#: src/modes/xorg/xorgAnalyzer.h:59 src/modes/xsession/xsessionAnalyzer.h:53
+#: src/modes/samba/sambaAnalyzer.h:57
+msgid "Line"
+msgstr "Llinell"
+
+#: src/modes/xorg/xorgAnalyzer.h:60 src/modes/acpid/acpidAnalyzer.h:50
+msgid "Type"
+msgstr "Math"
+
+#. i18n: file: src/detailDialogBase.ui:28
+#. i18n: ectx: property (text), widget (KTextEdit, message)
+#. i18n: file: src/loggerDialogBase.ui:33
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: src/modes/xorg/xorgAnalyzer.h:61 src/modes/acpid/acpidAnalyzer.h:51
+#: src/modes/xsession/xsessionAnalyzer.h:55
+#: src/modes/base/syslogAnalyzer.cpp:61 src/modes/samba/sambaAnalyzer.h:58
+#: src/modes/apache/apacheAnalyzer.h:55 src/modes/kernel/kernelAnalyzer.h:60
+#: src/modes/cups/cupsAnalyzer.h:56 src/modes/cups/cupsPdfAnalyzer.h:55
+#: rc.cpp:11 rc.cpp:378
+msgid "Message"
+msgstr "Neges"
+
+#: src/modes/xorg/xorgAnalyzer.h:116
+msgid "Probed"
 msgstr ""
 
-#: src/lib/levelPrintPage.cpp:48
-msgid "Choose which log levels you wish to print in color."
+#: src/modes/xorg/xorgAnalyzer.h:117
+msgid "From config file"
 msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:80
-msgid "Type your filter here"
+#: src/modes/xorg/xorgAnalyzer.h:118
+msgid "Default setting"
 msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:81
-msgid "Allows you to only list items that match the content of this text."
+#: src/modes/xorg/xorgAnalyzer.h:119
+msgid "From command Line"
 msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:82
-msgid "Enter your search here..."
+#: src/modes/xorg/xorgAnalyzer.h:124
+msgid "Not implemented"
 msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:89
-msgid "Filter:"
-msgstr "Hidl:"
+#: src/modes/xorg/xorgLogMode.cpp:38
+#: src/modes/xorg/xorgConfigurationWidget.h:46
+msgid "X.org Log"
+msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:109
-msgid "Choose the filtered column here"
+#: src/modes/xorg/xorgLogMode.cpp:47
+msgid "Display the X.org log."
 msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:110
+#: src/modes/xorg/xorgLogMode.cpp:48
 msgid ""
-"Allows you to apply the item filter only on the specified column here. "
-"\"<i>All</i>\" column means no specific filter."
+"Displays the X.org log in the current tab. X.org is the service which "
+"displays on screen your desktop and manage your graphical hardware. See this "
+"log if you want to know why you do not have 3D accelerations or why your "
+"input device is not recognized."
 msgstr ""
 
-#: src/lib/logViewFilterWidget.cpp:112 src/lib/logViewFilterWidget.cpp:129
-msgid "All"
-msgstr "Popeth"
-
-#: src/configurationDialog.cpp:54
-msgid "Settings"
+#: src/modes/xorg/xorgConfigurationWidget.h:52
+msgid "<p>These files will be analyzed to show the <b>X.org log</b>.</p>"
 msgstr ""
 
-#: src/configurationDialog.cpp:108
-msgid "General"
-msgstr "Cyffredinol"
+#: src/modes/xorg/xorgItemBuilder.h:74 src/modes/xorg/xorgItemBuilder.h:76
+#: src/modes/acpid/acpidItemBuilder.h:59
+msgid "Type:"
+msgstr "Math:"
 
-#: src/main.cpp:36
-msgid "KSystemlog"
-msgstr ""
+#: src/modes/xorg/xorgItemBuilder.h:74
+#: src/modes/xsession/xsessionItemBuilder.h:74
+msgid "none"
+msgstr "dim"
 
-#: src/main.cpp:38
-msgid "System Logs Viewer for KDE"
+#: src/modes/acpid/acpidLogMode.cpp:38
+msgid "ACPI Log"
 msgstr ""
 
-#: src/main.cpp:40
-msgid "(C) 2007, Nicolas Ternisien"
+#: src/modes/acpid/acpidLogMode.cpp:47
+msgid "Display the ACPI log."
 msgstr ""
 
-#: src/main.cpp:41
+#: src/modes/acpid/acpidLogMode.cpp:48
 msgid ""
-"Do not hesitate to report bugs and problems to Nicolas Ternisien <a "
-"href='mailto:nicolas.ternisien@gmail.com'>nicolas.ternisien@gmail.com</a>"
+"Displays the ACPI log in the current tab. ACPI is used to manage the "
+"hardware components of your computer, like notebook batteries, reset "
+"buttons..."
 msgstr ""
 
-#: src/main.cpp:47
-msgid "Nicolas Ternisien"
+#: src/modes/acpid/acpidConfigurationWidget.h:47
+msgid "Acpid Log"
 msgstr ""
 
-#: src/main.cpp:48
-msgid "Main developer"
+#: src/modes/acpid/acpidConfigurationWidget.h:53
+msgid "<p>These files will be analyzed to show the <b>Acpid log</b>.</p>"
 msgstr ""
 
-#: src/main.cpp:54
-msgid "Bojan Djurkovic"
-msgstr ""
+#: src/modes/xsession/xsessionAnalyzer.h:54
+msgid "Program"
+msgstr "Rhaglen"
 
-#: src/main.cpp:54
-msgid "Log Printing"
+#: src/modes/xsession/xsessionConfigurationWidget.h:51
+#: src/modes/xsession/xsessionLogMode.cpp:38
+msgid "X Session Log"
 msgstr ""
 
-#: src/main.cpp:59
-msgid "Document to open"
-msgstr "Dogfen i'w hagor"
+#: src/modes/xsession/xsessionConfigurationWidget.h:79
+msgid ""
+"You can type or choose the X Session log file (example: <i>~/.xsession-"
+"errors</i>)."
+msgstr ""
 
-#: src/generalConfigurationWidget.cpp:50
-msgid "No Log Mode"
+#: src/modes/xsession/xsessionConfigurationWidget.h:80
+msgid ""
+"You can type or choose here the X Session log file. This file will be "
+"analyzed when you select the <b>X Session log</b> menu. Generally, its name "
+"is <i>~/.xsession-errors</i>"
 msgstr ""
 
-#: src/generalConfigurationWidget.cpp:95
+#: src/modes/xsession/xsessionConfigurationWidget.h:140
 #, kde-format
-msgctxt "Date format Option (Date example)"
-msgid "%1 (%2)"
+msgid "<li><b>%1</b>: ...</li>"
 msgstr ""
 
-#: src/tabLogManager.cpp:77
-#, kde-format
-msgctxt "Log mode name (added lines count)"
-msgid "%1 (%2)"
+#: src/modes/xsession/xsessionItemBuilder.h:74
+#: src/modes/xsession/xsessionItemBuilder.h:76
+msgid "Program:"
+msgstr "Rhaglen:"
+
+#: src/modes/xsession/xsessionLogMode.cpp:47
+msgid "Display the X Session log."
+msgstr ""
+
+#: src/modes/xsession/xsessionLogMode.cpp:48
+msgid ""
+"Displays the X Session log in the current tab. X Session log is the place "
+"where graphical programs write their output. See this log if you want to "
+"know why a program has crashed, or why your display manager (KDE, Gnome,...) "
+"has not started."
 msgstr ""
 
 #: src/modes/daemon/daemonLogMode.cpp:39
@@ -673,903 +768,811 @@
 msgid "<p>These files will be analyzed to show the <b>Daemons' Logs</b>.</p>"
 msgstr ""
 
-#: src/modes/xorg/xorgConfigurationWidget.h:46
-#: src/modes/xorg/xorgLogMode.cpp:38
-msgid "X.org Log"
+#: src/modes/base/parsingHelper.cpp:164
+#, kde-format
+msgctxt "HttpResponseNumber HttpResponseDescription"
+msgid "%1 %2"
 msgstr ""
 
-#: src/modes/xorg/xorgConfigurationWidget.h:52
-msgid "<p>These files will be analyzed to show the <b>X.org log</b>.</p>"
+#: src/modes/base/logLevelFileList.cpp:59
+msgid "&Change Status..."
 msgstr ""
 
-#: src/modes/xorg/xorgLogMode.cpp:47
-msgid "Display the X.org log."
+#: src/modes/base/logLevelFileList.cpp:60
+msgid "Change the level of the current file(s)"
 msgstr ""
 
-#: src/modes/xorg/xorgLogMode.cpp:48
+#: src/modes/base/logLevelFileList.cpp:61
 msgid ""
-"Displays the X.org log in the current tab. X.org is the service which "
-"displays on screen your desktop and manage your graphical hardware. See this "
-"log if you want to know why you do not have 3D accelerations or why your "
-"input device is not recognized."
+"Changes the level of the current file(s). See KSystemLog documentation for "
+"more information about each log level."
 msgstr ""
 
-#: src/modes/xorg/xorgItemBuilder.h:74 src/modes/xorg/xorgItemBuilder.h:76
-#: src/modes/acpid/acpidItemBuilder.h:59
-msgid "Type:"
-msgstr "Math:"
+#: src/modes/base/logLevelFileList.cpp:168
+msgid ""
+"The two arrays size are different, skipping the reading of generic paths."
+msgstr ""
 
-#: src/modes/xorg/xorgItemBuilder.h:74
-#: src/modes/xsession/xsessionItemBuilder.h:74
-msgid "none"
-msgstr "dim"
-
-#: src/modes/xorg/xorgAnalyzer.h:59 src/modes/xsession/xsessionAnalyzer.h:53
-#: src/modes/samba/sambaAnalyzer.h:57
-msgid "Line"
-msgstr "Llinell"
-
-#: src/modes/xorg/xorgAnalyzer.h:60 src/modes/acpid/acpidAnalyzer.h:50
-msgid "Type"
-msgstr "Math"
-
-#. i18n: file: src/detailDialogBase.ui:28
-#. i18n: ectx: property (text), widget (KTextEdit, message)
-#. i18n: file: src/loggerDialogBase.ui:33
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: src/modes/xorg/xorgAnalyzer.h:61 src/modes/cups/cupsPdfAnalyzer.h:55
-#: src/modes/cups/cupsAnalyzer.h:56 src/modes/xsession/xsessionAnalyzer.h:55
-#: src/modes/samba/sambaAnalyzer.h:58 src/modes/acpid/acpidAnalyzer.h:51
-#: src/modes/base/syslogAnalyzer.cpp:61 src/modes/kernel/kernelAnalyzer.h:60
-#: src/modes/apache/apacheAnalyzer.h:55 rc.cpp:11 rc.cpp:95
-msgid "Message"
-msgstr "Neges"
-
-#: src/modes/xorg/xorgAnalyzer.h:116
-msgid "Probed"
+#: src/modes/base/multipleFileList.cpp:395
+msgid "No log file..."
 msgstr ""
 
-#: src/modes/xorg/xorgAnalyzer.h:117
-msgid "From config file"
+#: src/modes/base/fileListHelper.cpp:113
+#, kde-format
+msgid "'%1' is not a local file."
 msgstr ""
 
-#: src/modes/xorg/xorgAnalyzer.h:118
-msgid "Default setting"
+#: src/modes/base/fileListHelper.cpp:114
+msgid "File selection failed"
 msgstr ""
 
-#: src/modes/xorg/xorgAnalyzer.h:119
-msgid "From command Line"
+#: src/modes/base/fileListHelper.cpp:127 src/modes/base/fileListHelper.cpp:136
+msgid "All Files (*)"
 msgstr ""
 
-#: src/modes/xorg/xorgAnalyzer.h:124
-msgid "Not implemented"
+#: src/modes/base/fileListHelper.cpp:127 src/modes/base/fileListHelper.cpp:136
+msgid "Log Files (*.log)"
 msgstr ""
 
-#: src/modes/cups/cupsLogMode.cpp:39
-#: src/modes/cups/cupsConfigurationWidget.h:45
-msgid "Cups Log"
+#: src/modes/base/fileListHelper.cpp:128 src/modes/base/fileListHelper.cpp:137
+msgid "Choose Log File"
 msgstr ""
 
-#: src/modes/cups/cupsLogMode.cpp:48
-msgid "Display the Cups log."
+#: src/modes/base/genericConfiguration.cpp:80
+msgid "The two arrays size are different, skipping the reading of log files."
 msgstr ""
 
-#: src/modes/cups/cupsLogMode.cpp:49
-msgid ""
-"Displays the CUPS log in the current tab. CUPS is the program which manages "
-"printing on your computer."
+#: src/modes/base/genericConfiguration.cpp:100
+#: src/lib/logModeConfiguration.cpp:217 src/lib/logModeConfiguration.cpp:245
+#, kde-format
+msgid "URL '%1' is not valid, skipping this URL."
 msgstr ""
 
-#: src/modes/cups/cupsPdfAnalyzer.h:54 src/modes/cups/cupsPageAnalyzer.h:53
-#: src/modes/cups/cupsAccessAnalyzer.h:53 src/modes/cups/cupsAnalyzer.h:55
-#: src/modes/samba/sambaAnalyzer.h:54 src/modes/acpid/acpidAnalyzer.h:49
-#: src/modes/cron/cronAnalyzer.h:51 src/modes/base/syslogAnalyzer.cpp:58
-#: src/modes/kernel/kernelAnalyzer.h:58 src/modes/apache/apacheAnalyzer.h:53
-#: src/modes/apache/apacheAccessAnalyzer.h:53
-msgid "Date"
-msgstr "Dyddiad"
+#: src/modes/samba/sambaAnalyzer.h:55
+msgid "Source File"
+msgstr "Ffeil Tarddiad"
 
-#: src/modes/cups/cupsFactory.cpp:58
-msgid "Cups"
+#: src/modes/samba/sambaAnalyzer.h:56
+msgid "Function"
+msgstr "Ffwythiant"
+
+#: src/modes/samba/sambaFactory.cpp:58
+msgid "Samba"
 msgstr ""
 
-#: src/modes/cups/cupsAccessLogMode.cpp:39
-msgid "Cups Web Log"
+#: src/modes/samba/netbiosLogMode.cpp:39
+msgid "Netbios Log"
 msgstr ""
 
-#: src/modes/cups/cupsAccessLogMode.cpp:48
-msgid "Display the CUPS Web Server Access log."
+#: src/modes/samba/netbiosLogMode.cpp:47
+msgid "Display the Netbios log."
 msgstr ""
 
-#: src/modes/cups/cupsAccessLogMode.cpp:49
+#: src/modes/samba/netbiosLogMode.cpp:48
 msgid ""
-"Displays the CUPS Web Server Access log in the current tab. CUPS is the "
-"program which manages printing on your computer. This log saves all requests "
-"performed to the CUPS embedded web server (default: "
-"<i>http://localhost:631</i>)."
+"Displays the Netbios log in the current tab. Netbios is the file sharing "
+"protocol developed by Microsoft."
 msgstr ""
 
-#: src/modes/cups/cupsPageAnalyzer.h:54
-msgid "Printer"
+#: src/modes/samba/sambaAccessLogMode.cpp:39
+msgid "Samba Access Log"
 msgstr ""
 
-#: src/modes/cups/cupsPageAnalyzer.h:55 src/modes/cups/cupsAccessAnalyzer.h:56
-#: src/modes/cron/cronAnalyzer.h:54 src/modes/apache/apacheAccessAnalyzer.h:56
-#: src/loggerDialog.cpp:91 src/loggerDialog.cpp:124
-msgid "User"
-msgstr "Defnyddiwr"
-
-#: src/modes/cups/cupsPageAnalyzer.h:56
-msgid "Job Id"
+#: src/modes/samba/sambaAccessLogMode.cpp:47
+msgid "Display the Samba Access log."
 msgstr ""
 
-#: src/modes/cups/cupsPageAnalyzer.h:57
-msgid "Page Number"
+#: src/modes/samba/sambaAccessLogMode.cpp:48
+msgid ""
+"Displays the Samba Access log in the current tab. This log mode allows you "
+"to see connections between your shares and remote hosts."
 msgstr ""
 
-#: src/modes/cups/cupsPageAnalyzer.h:58
-msgid "Num Copies"
+#: src/modes/samba/sambaConfigurationWidget.h:45
+#: src/modes/samba/sambaLogMode.cpp:39
+msgid "Samba Log"
 msgstr ""
 
-#: src/modes/cups/cupsPageAnalyzer.h:59
-msgid "Job Billing"
+#: src/modes/samba/sambaConfigurationWidget.h:51
+msgid ""
+"<p>These files will be analyzed to show <b>Samba log</b>, <b>Samba Access "
+"log</b> and <b>Netbios log</b>.</p>"
 msgstr ""
 
-#: src/modes/cups/cupsPageLogMode.cpp:39
-msgid "Cups Page Log"
+#: src/modes/samba/sambaConfigurationWidget.h:53
+msgid "Samba Log Files"
 msgstr ""
 
-#: src/modes/cups/cupsPageLogMode.cpp:48
-msgid "Display the CUPS Page log."
+#: src/modes/samba/sambaConfigurationWidget.h:53
+msgid "Add Samba File..."
 msgstr ""
 
-#: src/modes/cups/cupsPageLogMode.cpp:49
-msgid ""
-"Displays the CUPS Page log in the current tab. CUPS is the program which "
-"manages printing on your computer. This log saves all requests performed to "
-"the CUPS embedded web server (default: <i>http://localhost:631</i>)."
+#: src/modes/samba/sambaConfigurationWidget.h:54
+msgid "Samba Access Log Files"
 msgstr ""
 
-#: src/modes/cups/cupsPdfLogMode.cpp:39
-msgid "Cups PDF Log"
+#: src/modes/samba/sambaConfigurationWidget.h:54
+msgid "Add Samba Access File..."
 msgstr ""
 
-#: src/modes/cups/cupsPdfLogMode.cpp:48
-msgid "Display the CUPS PDF log."
+#: src/modes/samba/sambaConfigurationWidget.h:55
+msgid "Netbios Log Files"
 msgstr ""
 
-#: src/modes/cups/cupsPdfLogMode.cpp:49
-msgid ""
-"Displays the CUPS PDF log in the current tab. CUPS is the program which "
-"manages printing on your computer. This log saves all requests performed to "
-"the CUPS embedded web server (default: <i>http://localhost:631</i>)."
+#: src/modes/samba/sambaConfigurationWidget.h:55
+msgid "Add Netbios File..."
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:45
-msgid "Cups &amp; Cups Web Server Log"
+#: src/modes/samba/sambaLogMode.cpp:47
+msgid "Display the Samba log."
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:51
+#: src/modes/samba/sambaLogMode.cpp:48
 msgid ""
-"<p>These files will be analyzed to show the <b>Cups log</b> and the <b>Cups "
-"Web Access log</b>.</p>"
+"Displays the Samba log in the current tab. Samba is the file sharing server "
+"which interacts with Microsoft Windows network."
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:53
-msgid "Cups Log Files"
-msgstr ""
+#: src/modes/samba/sambaItemBuilder.h:57
+msgid "Source File:"
+msgstr "Ffeil Tarddiad :"
 
-#: src/modes/cups/cupsConfigurationWidget.h:53
-msgid "Add Cups File..."
-msgstr ""
+#: src/modes/samba/sambaItemBuilder.h:58
+msgid "Function:"
+msgstr "Ffwythiant"
 
-#: src/modes/cups/cupsConfigurationWidget.h:54
-msgid "Cups Access Log Files"
+#: src/modes/samba/sambaItemBuilder.h:59
+msgid "Line:"
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:54
-msgid "Add Cups Access File..."
+#: src/modes/apache/apacheLogMode.cpp:39
+#: src/modes/apache/apacheConfigurationWidget.h:45
+msgid "Apache Log"
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:55
-msgid "Cups Page Log Files"
+#: src/modes/apache/apacheLogMode.cpp:48
+msgid "Display the Apache log."
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:55
-msgid "Add Cups Page File..."
+#: src/modes/apache/apacheLogMode.cpp:49
+msgid ""
+"Displays the Apache log in the current tab. Apache is the main used Web "
+"server in the world."
 msgstr ""
 
-#: src/modes/cups/cupsConfigurationWidget.h:56
-msgid "Cups PDF Log Files"
-msgstr ""
+#: src/modes/apache/apacheAnalyzer.h:54
+msgid "Client"
+msgstr "Dibynnydd:"
 
-#: src/modes/cups/cupsConfigurationWidget.h:56
-msgid "Add Cups PDF File..."
+#: src/modes/apache/apacheAccessItemBuilder.h:57
+msgid "Host Name:"
 msgstr ""
 
-#: src/modes/cups/cupsPageItemBuilder.h:57
-msgid "Printer:"
-msgstr ""
+#: src/modes/apache/apacheAccessItemBuilder.h:58
+#: src/modes/cups/cupsAccessItemBuilder.h:58
+msgid "Identification:"
+msgstr "Dynodiad :"
 
-#: src/modes/cups/cupsPageItemBuilder.h:58
-#: src/modes/cups/cupsAccessItemBuilder.h:59
 #: src/modes/apache/apacheAccessItemBuilder.h:59
+#: src/modes/cups/cupsAccessItemBuilder.h:59
+#: src/modes/cups/cupsPageItemBuilder.h:58
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#: src/modes/cups/cupsPageItemBuilder.h:59
-msgid "Job Id:"
+#: src/modes/apache/apacheAccessItemBuilder.h:60
+#: src/modes/cups/cupsAccessItemBuilder.h:60
+msgid "HTTP Response:"
 msgstr ""
 
-#: src/modes/cups/cupsPageItemBuilder.h:60
-msgid "Page Number:"
-msgstr ""
+#: src/modes/apache/apacheAccessItemBuilder.h:61
+#: src/modes/cups/cupsAccessItemBuilder.h:61
+msgid "Bytes Sent:"
+msgstr "Didau Wedi'u Hanfon :"
 
-#: src/modes/cups/cupsPageItemBuilder.h:61
-msgid "Num Copies:"
+#: src/modes/apache/apacheAccessItemBuilder.h:62
+msgid "Agent Identity:"
 msgstr ""
 
-#: src/modes/cups/cupsPageItemBuilder.h:62
-msgid "Job Billing:"
+#: src/modes/apache/apacheAccessItemBuilder.h:63
+msgid "HTTP Request:"
 msgstr ""
 
-#: src/modes/cups/cupsAccessAnalyzer.h:54 src/modes/cron/cronAnalyzer.h:52
-#: src/modes/base/syslogAnalyzer.cpp:59
-msgid "Host"
-msgstr ""
+#: src/modes/apache/apacheItemBuilder.h:57
+msgid "Client:"
+msgstr "Dibynnydd:"
 
-#: src/modes/cups/cupsAccessAnalyzer.h:55
-msgid "Group"
+#: src/modes/apache/apacheFactory.cpp:54
+msgid "Apache"
 msgstr ""
 
-#: src/modes/cups/cupsAccessAnalyzer.h:57
-#: src/modes/apache/apacheAccessAnalyzer.h:60
-msgid "HTTP Request"
+#: src/modes/apache/apacheConfigurationWidget.h:51
+msgid ""
+"<p>These files will be analyzed to show the <b>Apache log</b> and the "
+"<b>Apache Access log</b>.</p>"
 msgstr ""
 
-#: src/modes/cups/cupsAccessAnalyzer.h:58
-msgid "Status"
+#: src/modes/apache/apacheConfigurationWidget.h:53
+msgid "Apache Log Files"
 msgstr ""
 
-#: src/modes/cups/cupsAccessAnalyzer.h:59
-msgid "Bytes"
+#: src/modes/apache/apacheConfigurationWidget.h:53
+msgid "Add Apache File..."
 msgstr ""
 
-#: src/modes/cups/cupsAccessAnalyzer.h:60
-msgid "IPP Operation"
+#: src/modes/apache/apacheConfigurationWidget.h:54
+msgid "Apache Access Log Files"
 msgstr ""
 
-#: src/modes/cups/cupsAccessAnalyzer.h:61
-msgid "IPP Status"
-msgstr ""
-
-#: src/modes/cups/cupsAnalyzer.h:119
-msgid "debug 2"
+#: src/modes/apache/apacheConfigurationWidget.h:54
+msgid "Add Apache Access File..."
 msgstr ""
 
-#: src/modes/cups/cupsAnalyzer.h:139
-msgid ""
-"New Log Level detected: Please send this log file to the KSystemLog "
-"developer to add it."
-msgstr ""
+#: src/modes/apache/apacheAccessAnalyzer.h:54
+msgid "Host Name"
+msgstr "Enw Gwesteiwr"
 
-#: src/modes/cups/cupsAccessItemBuilder.h:58
-#: src/modes/apache/apacheAccessItemBuilder.h:58
-msgid "Identification:"
-msgstr "Dynodiad :"
+#: src/modes/apache/apacheAccessAnalyzer.h:55
+msgid "Id."
+msgstr "Dynodiad (Id)."
 
-#: src/modes/cups/cupsAccessItemBuilder.h:60
-#: src/modes/apache/apacheAccessItemBuilder.h:60
-msgid "HTTP Response:"
-msgstr ""
+#: src/modes/apache/apacheAccessAnalyzer.h:57
+msgid "Response"
+msgstr "Ymateb"
 
-#: src/modes/cups/cupsAccessItemBuilder.h:61
-#: src/modes/apache/apacheAccessItemBuilder.h:61
-msgid "Bytes Sent:"
-msgstr "Didau Wedi'u Hanfon :"
+#: src/modes/apache/apacheAccessAnalyzer.h:58
+msgid "Bytes Sent"
+msgstr "Didau Wedi'u Hanfon"
 
-#: src/modes/cups/cupsPdfItemBuilder.h:57
-msgid "Message:"
+#: src/modes/apache/apacheAccessAnalyzer.h:59
+msgid "Agent Identity"
 msgstr ""
 
-#: src/modes/system/systemConfigurationWidget.h:48
-#: src/modes/system/systemLogMode.cpp:39
-msgid "System Log"
+#: src/modes/apache/apacheAccessAnalyzer.h:60
+#: src/modes/cups/cupsAccessAnalyzer.h:57
+msgid "HTTP Request"
 msgstr ""
 
-#: src/modes/system/systemConfigurationWidget.h:54
-msgid "<p>These files will be analyzed to show the <b>System logs</b>.</p>"
+#: src/modes/apache/apacheAccessAnalyzer.h:61
+msgid "URL"
+msgstr "URL"
+
+#: src/modes/apache/apacheAccessLogMode.cpp:39
+msgid "Apache Access Log"
 msgstr ""
 
-#: src/modes/system/systemLogMode.cpp:48
-msgid "Display the system log."
+#: src/modes/apache/apacheAccessLogMode.cpp:48
+msgid "Display the Apache Access log."
 msgstr ""
 
-#: src/modes/system/systemLogMode.cpp:49
+#: src/modes/apache/apacheAccessLogMode.cpp:49
 msgid ""
-"Displays the system log in the current tab. This log is generally used by "
-"non-specialized processes (like \"sudo\" or \"fsck\" commands)"
+"Displays the Apache Access log in the current tab. Apache is the main used "
+"Web server in the world. This log saves all requests performed by the Apache "
+"web server."
 msgstr ""
 
-#: src/modes/xsession/xsessionItemBuilder.h:74
-#: src/modes/xsession/xsessionItemBuilder.h:76
-msgid "Program:"
-msgstr "Rhaglen:"
-
-#: src/modes/xsession/xsessionAnalyzer.h:54
-msgid "Program"
-msgstr "Rhaglen"
-
-#: src/modes/xsession/xsessionLogMode.cpp:38
-#: src/modes/xsession/xsessionConfigurationWidget.h:51
-msgid "X Session Log"
+#: src/modes/kernel/kernelAnalyzer.h:59
+msgid "Component"
 msgstr ""
 
-#: src/modes/xsession/xsessionLogMode.cpp:47
-msgid "Display the X Session log."
+#: src/modes/kernel/kernelItemBuilder.h:59
+msgid "Component:"
 msgstr ""
 
-#: src/modes/xsession/xsessionLogMode.cpp:48
-msgid ""
-"Displays the X Session log in the current tab. X Session log is the place "
-"where graphical programs write their output. See this log if you want to "
-"know why a program has crashed, or why your display manager (KDE, Gnome,...) "
-"has not started."
+#: src/modes/kernel/kernelLogMode.cpp:38
+msgid "Kernel Log"
 msgstr ""
 
-#: src/modes/xsession/xsessionConfigurationWidget.h:79
-msgid ""
-"You can type or choose the X Session log file (example: <i>~/.xsession-"
-"errors</i>)."
+#: src/modes/kernel/kernelLogMode.cpp:47
+msgid "Display the kernel log."
 msgstr ""
 
-#: src/modes/xsession/xsessionConfigurationWidget.h:80
+#: src/modes/kernel/kernelLogMode.cpp:48
 msgid ""
-"You can type or choose here the X Session log file. This file will be "
-"analyzed when you select the <b>X Session log</b> menu. Generally, its name "
-"is <i>~/.xsession-errors</i>"
+"Displays the kernel log in the current tab. This log is only useful for "
+"users who want to know why the Kernel does not detect their hardware or what "
+"is the cause of the last <i>kernel panic/oops</i>."
 msgstr ""
 
-#: src/modes/xsession/xsessionConfigurationWidget.h:140
-#, kde-format
-msgid "<li><b>%1</b>: ...</li>"
+#: src/modes/cups/cupsPdfLogMode.cpp:39
+msgid "Cups PDF Log"
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:45
-#: src/modes/samba/sambaLogMode.cpp:39
-msgid "Samba Log"
+#: src/modes/cups/cupsPdfLogMode.cpp:48
+msgid "Display the CUPS PDF log."
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:51
+#: src/modes/cups/cupsPdfLogMode.cpp:49
 msgid ""
-"<p>These files will be analyzed to show <b>Samba log</b>, <b>Samba Access "
-"log</b> and <b>Netbios log</b>.</p>"
+"Displays the CUPS PDF log in the current tab. CUPS is the program which "
+"manages printing on your computer. This log saves all requests performed to "
+"the CUPS embedded web server (default: <i>http://localhost:631</i>)."
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:53
-msgid "Samba Log Files"
+#: src/modes/cups/cupsFactory.cpp:58
+msgid "Cups"
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:53
-msgid "Add Samba File..."
+#: src/modes/cups/cupsConfigurationWidget.h:45
+#: src/modes/cups/cupsLogMode.cpp:39
+msgid "Cups Log"
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:54
-msgid "Samba Access Log Files"
+#: src/modes/cups/cupsConfigurationWidget.h:45
+msgid "Cups &amp; Cups Web Server Log"
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:54
-msgid "Add Samba Access File..."
+#: src/modes/cups/cupsConfigurationWidget.h:51
+msgid ""
+"<p>These files will be analyzed to show the <b>Cups log</b> and the <b>Cups "
+"Web Access log</b>.</p>"
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:55
-msgid "Netbios Log Files"
+#: src/modes/cups/cupsConfigurationWidget.h:53
+msgid "Cups Log Files"
 msgstr ""
 
-#: src/modes/samba/sambaConfigurationWidget.h:55
-msgid "Add Netbios File..."
+#: src/modes/cups/cupsConfigurationWidget.h:53
+msgid "Add Cups File..."
 msgstr ""
 
-#: src/modes/samba/sambaAnalyzer.h:55
-msgid "Source File"
-msgstr "Ffeil Tarddiad"
+#: src/modes/cups/cupsConfigurationWidget.h:54
+msgid "Cups Access Log Files"
+msgstr ""
 
-#: src/modes/samba/sambaAnalyzer.h:56
-msgid "Function"
-msgstr "Ffwythiant"
+#: src/modes/cups/cupsConfigurationWidget.h:54
+msgid "Add Cups Access File..."
+msgstr ""
 
-#: src/modes/samba/sambaFactory.cpp:58
-msgid "Samba"
+#: src/modes/cups/cupsConfigurationWidget.h:55
+msgid "Cups Page Log Files"
 msgstr ""
 
-#: src/modes/samba/sambaLogMode.cpp:47
-msgid "Display the Samba log."
+#: src/modes/cups/cupsConfigurationWidget.h:55
+msgid "Add Cups Page File..."
 msgstr ""
 
-#: src/modes/samba/sambaLogMode.cpp:48
-msgid ""
-"Displays the Samba log in the current tab. Samba is the file sharing server "
-"which interacts with Microsoft Windows network."
+#: src/modes/cups/cupsConfigurationWidget.h:56
+msgid "Cups PDF Log Files"
 msgstr ""
 
-#: src/modes/samba/sambaAccessLogMode.cpp:39
-msgid "Samba Access Log"
+#: src/modes/cups/cupsConfigurationWidget.h:56
+msgid "Add Cups PDF File..."
 msgstr ""
 
-#: src/modes/samba/sambaAccessLogMode.cpp:47
-msgid "Display the Samba Access log."
+#: src/modes/cups/cupsAccessAnalyzer.h:55
+msgid "Group"
 msgstr ""
 
-#: src/modes/samba/sambaAccessLogMode.cpp:48
-msgid ""
-"Displays the Samba Access log in the current tab. This log mode allows you "
-"to see connections between your shares and remote hosts."
+#: src/modes/cups/cupsAccessAnalyzer.h:58
+msgid "Status"
 msgstr ""
 
-#: src/modes/samba/sambaItemBuilder.h:57
-msgid "Source File:"
-msgstr "Ffeil Tarddiad :"
+#: src/modes/cups/cupsAccessAnalyzer.h:59
+msgid "Bytes"
+msgstr ""
 
-#: src/modes/samba/sambaItemBuilder.h:58
-msgid "Function:"
-msgstr "Ffwythiant"
+#: src/modes/cups/cupsAccessAnalyzer.h:60
+msgid "IPP Operation"
+msgstr ""
 
-#: src/modes/samba/sambaItemBuilder.h:59
-msgid "Line:"
+#: src/modes/cups/cupsAccessAnalyzer.h:61
+msgid "IPP Status"
 msgstr ""
 
-#: src/modes/samba/netbiosLogMode.cpp:39
-msgid "Netbios Log"
+#: src/modes/cups/cupsPdfItemBuilder.h:57
+msgid "Message:"
 msgstr ""
 
-#: src/modes/samba/netbiosLogMode.cpp:47
-msgid "Display the Netbios log."
+#: src/modes/cups/cupsAnalyzer.h:119
+msgid "debug 2"
 msgstr ""
 
-#: src/modes/samba/netbiosLogMode.cpp:48
+#: src/modes/cups/cupsAnalyzer.h:139
 msgid ""
-"Displays the Netbios log in the current tab. Netbios is the file sharing "
-"protocol developed by Microsoft."
+"New Log Level detected: Please send this log file to the KSystemLog "
+"developer to add it."
 msgstr ""
 
-#: src/modes/acpid/acpidConfigurationWidget.h:47
-msgid "Acpid Log"
+#: src/modes/cups/cupsPageItemBuilder.h:57
+msgid "Printer:"
 msgstr ""
 
-#: src/modes/acpid/acpidConfigurationWidget.h:53
-msgid "<p>These files will be analyzed to show the <b>Acpid log</b>.</p>"
+#: src/modes/cups/cupsPageItemBuilder.h:59
+msgid "Job Id:"
 msgstr ""
 
-#: src/modes/acpid/acpidLogMode.cpp:38
-msgid "ACPI Log"
+#: src/modes/cups/cupsPageItemBuilder.h:60
+msgid "Page Number:"
 msgstr ""
 
-#: src/modes/acpid/acpidLogMode.cpp:47
-msgid "Display the ACPI log."
+#: src/modes/cups/cupsPageItemBuilder.h:61
+msgid "Num Copies:"
 msgstr ""
 
-#: src/modes/acpid/acpidLogMode.cpp:48
-msgid ""
-"Displays the ACPI log in the current tab. ACPI is used to manage the "
-"hardware components of your computer, like notebook batteries, reset "
-"buttons..."
+#: src/modes/cups/cupsPageItemBuilder.h:62
+msgid "Job Billing:"
 msgstr ""
 
-#: src/modes/cron/cronAnalyzer.h:53 src/modes/base/syslogAnalyzer.cpp:60
-msgid "Process"
-msgstr "Proses"
-
-#: src/modes/cron/cronAnalyzer.h:55
-msgid "Command"
+#: src/modes/cups/cupsPageAnalyzer.h:54
+msgid "Printer"
 msgstr ""
 
-#: src/modes/cron/cronLogMode.cpp:38
-#: src/modes/cron/cronConfigurationWidget.h:49
-msgid "Cron Log"
+#: src/modes/cups/cupsPageAnalyzer.h:56
+msgid "Job Id"
 msgstr ""
 
-#: src/modes/cron/cronLogMode.cpp:47
-msgid "Display the planned tasks log (Cron log)."
+#: src/modes/cups/cupsPageAnalyzer.h:57
+msgid "Page Number"
 msgstr ""
 
-#: src/modes/cron/cronLogMode.cpp:48
-msgid ""
-"Displays the planned tasks log in the current tab. Cron process is a program "
-"in charge of launching planned tasks on your system, like security checks, "
-"or auto-restarting of some services. Use this menu to see the recently "
-"launched processes."
+#: src/modes/cups/cupsPageAnalyzer.h:58
+msgid "Num Copies"
 msgstr ""
 
-#: src/modes/cron/cronItemBuilder.h:58
-msgid "User:"
-msgstr "Defnyddiwr:"
-
-#: src/modes/cron/cronConfigurationWidget.h:55
-msgid ""
-"<p>These files will be analyzed to show the <b>Cron Logs</b> (i.e. planned "
-"tasks logs). <a href='man:/cron'>More information...</a></p>"
+#: src/modes/cups/cupsPageAnalyzer.h:59
+msgid "Job Billing"
 msgstr ""
 
-#: src/modes/cron/cronConfigurationWidget.h:63
-msgid "Enable Process Filtering"
+#: src/modes/cups/cupsLogMode.cpp:48
+msgid "Display the Cups log."
 msgstr ""
 
-#: src/modes/cron/cronConfigurationWidget.h:75
-msgid "Only keeps lines which matches this process :"
+#: src/modes/cups/cupsLogMode.cpp:49
+msgid ""
+"Displays the CUPS log in the current tab. CUPS is the program which manages "
+"printing on your computer."
 msgstr ""
 
-#: src/modes/authentication/authenticationLogMode.cpp:38
-#: src/modes/authentication/authenticationConfigurationWidget.h:49
-msgid "Authentication Log"
+#: src/modes/cups/cupsAccessLogMode.cpp:39
+msgid "Cups Web Log"
 msgstr ""
 
-#: src/modes/authentication/authenticationLogMode.cpp:47
-msgid "Display the authentication log."
+#: src/modes/cups/cupsAccessLogMode.cpp:48
+msgid "Display the CUPS Web Server Access log."
 msgstr ""
 
-#: src/modes/authentication/authenticationLogMode.cpp:48
+#: src/modes/cups/cupsAccessLogMode.cpp:49
 msgid ""
-"Displays the authentication log in the current tab. This log displays all "
-"logins made by each user of the system, and can help you to know if someone "
-"tried to crack your system."
+"Displays the CUPS Web Server Access log in the current tab. CUPS is the "
+"program which manages printing on your computer. This log saves all requests "
+"performed to the CUPS embedded web server (default: "
+"<i>http://localhost:631</i>)."
 msgstr ""
 
-#: src/modes/authentication/authenticationConfigurationWidget.h:56
-msgid "Authentication Log File"
+#: src/modes/cups/cupsPageLogMode.cpp:39
+msgid "Cups Page Log"
 msgstr ""
 
-#: src/modes/authentication/authenticationConfigurationWidget.h:62
-msgid "Authentication log file:"
+#: src/modes/cups/cupsPageLogMode.cpp:48
+msgid "Display the CUPS Page log."
 msgstr ""
 
-#: src/modes/authentication/authenticationConfigurationWidget.h:67
+#: src/modes/cups/cupsPageLogMode.cpp:49
 msgid ""
-"You can type or choose the authentication log file (example: "
-"<i>/var/log/auth.log</i>)."
+"Displays the CUPS Page log in the current tab. CUPS is the program which "
+"manages printing on your computer. This log saves all requests performed to "
+"the CUPS embedded web server (default: <i>http://localhost:631</i>)."
 msgstr ""
 
-#: src/modes/authentication/authenticationConfigurationWidget.h:68
-msgid ""
-"You can type or choose here the authentication log file. This file will be "
-"analyzed when you select the <b>Authentication log</b> menu. Generally, its "
-"name is <i>/var/log/auth.log</i>"
-msgstr ""
+#: src/modes/open/openLogMode.cpp:43
+msgid "Log File"
+msgstr "Ffeil Gofnod"
 
-#: src/modes/postfix/postfixConfigurationWidget.h:48
-#: src/modes/postfix/postfixLogMode.cpp:39
-msgid "Postfix Log"
-msgstr ""
+#: src/modes/open/openLogMode.cpp:66
+msgid "Open Location"
+msgstr "Agor Lleoliad"
 
-#: src/modes/postfix/postfixConfigurationWidget.h:54
-msgid "<p>These files will be analyzed to show the <b>Postfix Logs</b>.</p>"
+#: src/modes/open/openLogMode.cpp:82
+msgid "Malformed URL. Unable to open this file."
 msgstr ""
 
-#: src/modes/postfix/postfixLogMode.cpp:48
-msgid "Display the Postfix log."
+#: src/modes/open/openLogMode.cpp:83
+msgid "Unable to open this file."
 msgstr ""
 
-#: src/modes/postfix/postfixLogMode.cpp:49
-msgid ""
-"Displays the Postfix log in the current tab. Postfix is the most known and "
-"used mail server in the Linux world."
+#: src/tabLogViewsWidget.cpp:109
+msgid "No Log"
 msgstr ""
 
-#: src/modes/base/multipleFileList.cpp:395
-msgid "No log file..."
+#: src/generalConfigurationWidget.cpp:50
+msgid "No Log Mode"
 msgstr ""
 
-#: src/modes/base/parsingHelper.cpp:164
+#: src/generalConfigurationWidget.cpp:95
 #, kde-format
-msgctxt "HttpResponseNumber HttpResponseDescription"
-msgid "%1 %2"
+msgctxt "Date format Option (Date example)"
+msgid "%1 (%2)"
 msgstr ""
 
-#: src/modes/base/genericConfiguration.cpp:80
-msgid "The two arrays size are different, skipping the reading of log files."
+#: src/lib/logManager.cpp:82
+msgid "Loading log..."
 msgstr ""
 
-#: src/modes/base/logLevelFileList.cpp:59
-msgid "&Change Status..."
+#: src/lib/logManager.cpp:105
+msgid "Log successfully loaded."
 msgstr ""
 
-#: src/modes/base/logLevelFileList.cpp:60
-msgid "Change the level of the current file(s)"
+#: src/lib/logViewExport.cpp:57
+msgid "Here are my logs:\n"
 msgstr ""
 
-#: src/modes/base/logLevelFileList.cpp:61
-msgid ""
-"Changes the level of the current file(s). See KSystemLog documentation for "
-"more information about each log level."
+#: src/lib/logViewExport.cpp:59 src/lib/logViewExport.cpp:73
+msgid "---------------------------------------\n"
 msgstr ""
 
-#: src/modes/base/logLevelFileList.cpp:168
+#: src/lib/logViewExport.cpp:77
 msgid ""
-"The two arrays size are different, skipping the reading of generic paths."
+"You have selected too many lines. Please only select important log lines."
 msgstr ""
 
-#: src/modes/base/fileListHelper.cpp:113
-#, kde-format
-msgid "'%1' is not a local file."
+#: src/lib/logViewExport.cpp:77
+msgid "Too Many Lines Selected"
 msgstr ""
 
-#: src/modes/base/fileListHelper.cpp:114
-msgid "File selection failed"
+#: src/lib/logViewExport.cpp:90
+msgid "Log Lines of my problem"
 msgstr ""
 
-#: src/modes/base/fileListHelper.cpp:127 src/modes/base/fileListHelper.cpp:136
-msgid "All Files (*)"
+#: src/lib/logViewExport.cpp:213
+msgid "No items selected. Nothing copied to clipboard."
 msgstr ""
 
-#: src/modes/base/fileListHelper.cpp:127 src/modes/base/fileListHelper.cpp:136
-msgid "Log Files (*.log)"
-msgstr ""
+#: src/lib/logViewExport.cpp:219
+#, kde-format
+msgid "1 log line copied to clipboard."
+msgid_plural "%1 log lines copied to clipboard."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modes/base/fileListHelper.cpp:128 src/modes/base/fileListHelper.cpp:137
-msgid "Choose Log File"
+#: src/lib/logViewExport.cpp:233
+msgid "No items selected. Please select items to be able to save them."
 msgstr ""
 
-#: src/modes/kernel/kernelLogMode.cpp:38
-msgid "Kernel Log"
-msgstr ""
+#: src/lib/logViewExport.cpp:264
+#, kde-format
+msgid "1 log line saved to '%2'."
+msgid_plural "%1 log lines saved to '%2'."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modes/kernel/kernelLogMode.cpp:47
-msgid "Display the kernel log."
+#: src/lib/logViewExport.cpp:267
+#, kde-format
+msgid "Unable to save file '%1': Permission Denied."
 msgstr ""
 
-#: src/modes/kernel/kernelLogMode.cpp:48
-msgid ""
-"Displays the kernel log in the current tab. This log is only useful for "
-"users who want to know why the Kernel does not detect their hardware or what "
-"is the cause of the last <i>kernel panic/oops</i>."
+#: src/lib/logViewExport.cpp:268
+msgid "Unable to save file."
 msgstr ""
 
-#: src/modes/kernel/kernelItemBuilder.h:59
-msgid "Component:"
+#: src/lib/logViewFilterWidget.cpp:80
+msgid "Type your filter here"
 msgstr ""
 
-#: src/modes/kernel/kernelAnalyzer.h:59
-msgid "Component"
+#: src/lib/logViewFilterWidget.cpp:81
+msgid "Allows you to only list items that match the content of this text."
 msgstr ""
 
-#: src/modes/open/openLogMode.cpp:43
-msgid "Log File"
-msgstr "Ffeil Gofnod"
+#: src/lib/logViewFilterWidget.cpp:82
+msgid "Enter your search here..."
+msgstr ""
 
-#: src/modes/open/openLogMode.cpp:66
-msgid "Open Location"
-msgstr "Agor Lleoliad"
+#: src/lib/logViewFilterWidget.cpp:89
+msgid "Filter:"
+msgstr "Hidl:"
 
-#: src/modes/open/openLogMode.cpp:82
-msgid "Malformed URL. Unable to open this file."
+#: src/lib/logViewFilterWidget.cpp:109
+msgid "Choose the filtered column here"
 msgstr ""
 
-#: src/modes/open/openLogMode.cpp:83
-msgid "Unable to open this file."
+#: src/lib/logViewFilterWidget.cpp:110
+msgid ""
+"Allows you to apply the item filter only on the specified column here. "
+"\"<i>All</i>\" column means no specific filter."
 msgstr ""
 
-#: src/modes/apache/apacheItemBuilder.h:57
-msgid "Client:"
-msgstr "Dibynnydd:"
+#: src/lib/logViewFilterWidget.cpp:112 src/lib/logViewFilterWidget.cpp:129
+msgid "All"
+msgstr "Popeth"
 
-#: src/modes/apache/apacheConfigurationWidget.h:45
-#: src/modes/apache/apacheLogMode.cpp:39
-msgid "Apache Log"
+#: src/lib/logViewSearchWidget.cpp:185
+msgid "Reached end of list."
 msgstr ""
 
-#: src/modes/apache/apacheConfigurationWidget.h:51
-msgid ""
-"<p>These files will be analyzed to show the <b>Apache log</b> and the "
-"<b>Apache Access log</b>.</p>"
+#: src/lib/logViewSearchWidget.cpp:272
+msgid "Phrase not found."
 msgstr ""
 
-#: src/modes/apache/apacheConfigurationWidget.h:53
-msgid "Apache Log Files"
+#: src/lib/globals.cpp:135
+msgid "None"
+msgstr "Dim"
+
+#: src/lib/globals.cpp:138
+msgid "Debug"
 msgstr ""
 
-#: src/modes/apache/apacheConfigurationWidget.h:53
-msgid "Add Apache File..."
+#: src/lib/globals.cpp:141
+msgid "Information"
 msgstr ""
 
-#: src/modes/apache/apacheConfigurationWidget.h:54
-msgid "Apache Access Log Files"
+#: src/lib/globals.cpp:144
+msgid "Notice"
 msgstr ""
 
-#: src/modes/apache/apacheConfigurationWidget.h:54
-msgid "Add Apache Access File..."
+#: src/lib/globals.cpp:147
+msgid "Warning"
 msgstr ""
 
-#: src/modes/apache/apacheAccessLogMode.cpp:39
-msgid "Apache Access Log"
+#: src/lib/globals.cpp:150
+msgid "Error"
 msgstr ""
 
-#: src/modes/apache/apacheAccessLogMode.cpp:48
-msgid "Display the Apache Access log."
+#: src/lib/globals.cpp:153
+msgid "Critical"
 msgstr ""
 
-#: src/modes/apache/apacheAccessLogMode.cpp:49
-msgid ""
-"Displays the Apache Access log in the current tab. Apache is the main used "
-"Web server in the world. This log saves all requests performed by the Apache "
-"web server."
+#: src/lib/globals.cpp:156
+msgid "Alert"
 msgstr ""
 
-#: src/modes/apache/apacheAccessItemBuilder.h:57
-msgid "Host Name:"
+#: src/lib/globals.cpp:159
+msgid "Emergency"
 msgstr ""
 
-#: src/modes/apache/apacheAccessItemBuilder.h:62
-msgid "Agent Identity:"
+#: src/lib/loadingBar.cpp:66
+msgid "Loading Progress..."
 msgstr ""
 
-#: src/modes/apache/apacheAccessItemBuilder.h:63
-msgid "HTTP Request:"
-msgstr ""
+#: src/lib/loadingBar.cpp:94
+#, kde-format
+msgid "Loading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>)"
+msgid_plural "Loading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>/%1 files)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modes/apache/apacheAnalyzer.h:54
-msgid "Client"
-msgstr "Dibynnydd:"
+#: src/lib/loadingBar.cpp:98
+#, kde-format
+msgid "Reloading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>)"
+msgid_plural "Reloading <b>%2</b>...<br /><i>%3</i> - (<b>%4</b>/%1 files)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/modes/apache/apacheFactory.cpp:54
-msgid "Apache"
+#: src/lib/loadingBar.cpp:105
+#, kde-format
+msgid "Loading <b>%1</b>...<br /><i>%2</i>"
 msgstr ""
 
-#: src/modes/apache/apacheAccessAnalyzer.h:54
-msgid "Host Name"
-msgstr "Enw Gwesteiwr"
-
-#: src/modes/apache/apacheAccessAnalyzer.h:55
-msgid "Id."
-msgstr "Dynodiad (Id)."
-
-#: src/modes/apache/apacheAccessAnalyzer.h:57
-msgid "Response"
-msgstr "Ymateb"
-
-#: src/modes/apache/apacheAccessAnalyzer.h:58
-msgid "Bytes Sent"
-msgstr "Didau Wedi'u Hanfon"
-
-#: src/modes/apache/apacheAccessAnalyzer.h:59
-msgid "Agent Identity"
+#: src/lib/loadingBar.cpp:107
+#, kde-format
+msgid "Reloading <b>%1</b>...<br /><i>%2</i>"
 msgstr ""
 
-#: src/modes/apache/apacheAccessAnalyzer.h:61
-msgid "URL"
-msgstr "URL"
-
-#: src/modes/apache/apacheLogMode.cpp:48
-msgid "Display the Apache log."
+#: src/lib/logViewWidget.cpp:124
+#, kde-format
+msgid "Display/Hide the '%1' column"
 msgstr ""
 
-#: src/modes/apache/apacheLogMode.cpp:49
+#: src/lib/localLogFileReader.cpp:115
+#: src/lib/processOutputLogFileReader.cpp:109
 msgid ""
-"Displays the Apache log in the current tab. Apache is the main used Web "
-"server in the world."
+"This file is not valid. Please adjust it in the settings of KSystemLog."
 msgstr ""
 
-#: src/loggerDialog.cpp:114
-msgid "Authentication"
-msgstr "Dilysiant"
-
-#: src/loggerDialog.cpp:115
-msgid "Private Authentication"
+#: src/lib/localLogFileReader.cpp:116 src/lib/localLogFileReader.cpp:130
+#: src/lib/processOutputLogFileReader.cpp:110
+msgid "File Does Not Exist"
 msgstr ""
 
-#: src/loggerDialog.cpp:116
-msgid "Cron"
+#: src/lib/localLogFileReader.cpp:129
+#, kde-format
+msgid "The file '%1' does not exist."
 msgstr ""
 
-#: src/loggerDialog.cpp:117
-msgid "Daemon"
-msgstr "Daemon"
-
-#: src/loggerDialog.cpp:118
-msgid "FTP"
-msgstr "FTP"
-
-#: src/loggerDialog.cpp:119
-msgid "Kernel"
-msgstr "Cnewyllyn"
-
-#: src/loggerDialog.cpp:120
-msgid "LPR"
+#: src/lib/localLogFileReader.cpp:149
+#, kde-format
+msgid "Unable to uncompress the '%2' format of '%1'."
 msgstr ""
 
-#: src/loggerDialog.cpp:121
-msgid "Mail"
-msgstr "Post"
+#: src/lib/localLogFileReader.cpp:150
+msgid "Unable to Uncompress File"
+msgstr ""
 
-#: src/loggerDialog.cpp:122
-msgid "News"
-msgstr "Newyddion"
+#: src/lib/localLogFileReader.cpp:157
+#, kde-format
+msgid "You do not have sufficient permissions to read '%1'."
+msgstr ""
 
-#: src/loggerDialog.cpp:123
-msgid "Syslog"
-msgstr "Cofnod cysawd"
+#: src/lib/localLogFileReader.cpp:158
+msgid "Insufficient Permissions"
+msgstr "Caniatadau Annigonol"
 
-#: src/loggerDialog.cpp:125
-msgid "UUCP"
+#: src/lib/analyzer.cpp:146
+#, kde-format
+msgid "Opening '%1'..."
 msgstr ""
 
-#: src/loggerDialog.cpp:127
-msgid "Local 0"
+#: src/lib/analyzer.cpp:153
+#, kde-format
+msgid "Log file '%1' loaded successfully."
 msgstr ""
 
-#: src/loggerDialog.cpp:128
-msgid "Local 1"
+#: src/lib/analyzer.cpp:167
+#, kde-format
+msgid "Log file '%1' has changed."
 msgstr ""
 
-#: src/loggerDialog.cpp:129
-msgid "Local 2"
+#: src/lib/processOutputLogFileReader.cpp:156
+#, kde-format
+msgid "The process '%1' crashed."
 msgstr ""
 
-#: src/loggerDialog.cpp:130
-msgid "Local 3"
+#: src/lib/processOutputLogFileReader.cpp:157
+msgid "Process Crashed"
 msgstr ""
 
-#: src/loggerDialog.cpp:131
-msgid "Local 4"
+#: src/lib/levelPrintPage.cpp:41
+msgid "Log Level Printing"
 msgstr ""
 
-#: src/loggerDialog.cpp:132
-msgid "Local 5"
+#: src/lib/levelPrintPage.cpp:48
+msgid "Choose which log levels you wish to print in color."
 msgstr ""
 
-#: src/loggerDialog.cpp:133
-msgid "Local 6"
+#. i18n: file: src/lib/logViewSearchWidgetBase.ui:68
+#. i18n: ectx: property (text), widget (QPushButton, previous)
+#: src/detailDialog.cpp:41 rc.cpp:426
+msgid "&Previous"
 msgstr ""
 
-#: src/loggerDialog.cpp:134
-msgid "Local 7"
-msgstr ""
+#. i18n: file: src/lib/logViewSearchWidgetBase.ui:58
+#. i18n: ectx: property (text), widget (QPushButton, next)
+#: src/detailDialog.cpp:45 rc.cpp:423
+msgid "&Next"
+msgstr "&Nesaf"
 
-#: src/loggerDialog.cpp:242
-msgid ""
-"Unable to find the 'logger' command on your system. Please type 'logger' in "
-"a Konsole to determine whether this command is installed."
+#: src/tabLogManager.cpp:77
+#, kde-format
+msgctxt "Log mode name (added lines count)"
+msgid "%1 (%2)"
 msgstr ""
 
-#: src/loggerDialog.cpp:242
-msgid "Command not found"
+#: src/main.cpp:36
+msgid "KSystemlog"
 msgstr ""
 
-#: src/loggerDialog.cpp:247
-msgid "The 'logger' command has not been properly exited."
+#: src/main.cpp:38
+msgid "System Logs Viewer for KDE"
 msgstr ""
 
-#: src/loggerDialog.cpp:247
-msgid "Execution problem"
+#: src/main.cpp:40
+msgid "(C) 2007, Nicolas Ternisien"
 msgstr ""
 
-#: src/loggerDialog.cpp:253
-msgid "This file does not exist, please choose another."
+#: src/main.cpp:41
+msgid ""
+"Do not hesitate to report bugs and problems to Nicolas Ternisien <a "
+"href='mailto:nicolas.ternisien@gmail.com'>nicolas.ternisien@gmail.com</a>"
 msgstr ""
 
-#: src/loggerDialog.cpp:253
-msgid "File not valid"
+#: src/main.cpp:47
+msgid "Nicolas Ternisien"
 msgstr ""
 
-#: src/statusBar.cpp:118
-#, kde-format
-msgid "Last updated: %1."
+#: src/main.cpp:48
+msgid "Main developer"
 msgstr ""
 
-#: src/statusBar.cpp:123
-#, kde-format
-msgid "%1: %2"
+#: src/main.cpp:54
+msgid "Bojan Djurkovic"
 msgstr ""
 
-#. i18n: file: src/lib/logViewSearchWidgetBase.ui:68
-#. i18n: ectx: property (text), widget (QPushButton, previous)
-#: src/detailDialog.cpp:41 rc.cpp:83
-msgid "&Previous"
+#: src/main.cpp:54
+msgid "Log Printing"
 msgstr ""
 
-#. i18n: file: src/lib/logViewSearchWidgetBase.ui:58
-#. i18n: ectx: property (text), widget (QPushButton, next)
-#: src/detailDialog.cpp:45 rc.cpp:80
-msgid "&Next"
-msgstr "&Nesaf"
+#: src/main.cpp:59
+msgid "Document to open"
+msgstr "Dogfen i'w hagor"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -1665,195 +1668,467 @@
 msgid "&Close"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:13
-#. i18n: ectx: label, entry (StartupLogMode), group (KSystemLogGeneral)
+#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #: rc.cpp:47
-msgid "Load this log mode at startup."
+msgid "X Session Log File"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:18
-#. i18n: ectx: label, entry (MaxLines), group (KSystemLogGeneral)
+#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:50
-msgid "The log view line count limit."
-msgstr ""
-
-#. i18n: file: src/config/ksystemlog.kcfg:23
-#. i18n: ectx: label, entry (DeleteDuplicatedLines), group (KSystemLogGeneral)
-#: rc.cpp:53
-msgid "Option is true if the user wants to delete repeated log lines."
+msgid "Log file:"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:28
-#. i18n: ectx: label, entry (DeleteProcessIdentifier), group (KSystemLogGeneral)
-#: rc.cpp:56
-msgid ""
-"Option is true if the PID in the process column of the SystemLog is to be "
-"omitted."
+#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:45
+#. i18n: ectx: property (toolTip), widget (QCheckBox, ignoreXorgErrors)
+#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:48
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreXorgErrors)
+#: rc.cpp:53 rc.cpp:56
+msgid "Check this option to remove Xorg errors"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:33
-#. i18n: ectx: label, entry (ColorizeLogLines), group (KSystemLogGeneral)
+#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:51
+#. i18n: ectx: property (text), widget (QCheckBox, ignoreXorgErrors)
 #: rc.cpp:59
-msgid ""
-"Option is true if the log lines are to be colored depending on their log "
-"level."
+msgid "Ignore Xorg errors"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:39
-#. i18n: ectx: label, entry (TooltipEnabled), group (KSystemLogGeneral)
+#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:58
+#. i18n: ectx: property (text), widget (QLabel, xorgErrorsDescription)
 #: rc.cpp:62
-msgid "Whether the tooltips are enabled."
+msgid ""
+"<p><b>Note:</b> Check this option to remove X.org errors.</p><p "
+"style=\"margin-bottom:0px\">The following lines will be ignored:</p>"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:44
-#. i18n: ectx: label, entry (NewLinesDisplayed), group (KSystemLogGeneral)
+#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, LogLevelSelectionDialogBase)
 #: rc.cpp:65
-msgid "Whether new lines are displayed."
+msgid "Selecting File Type"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:49
-#. i18n: ectx: label, entry (ToggleFilterBar), group (KSystemLogGeneral)
+#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
 #: rc.cpp:68
-msgid "Whether the filter bar is shown."
+msgid "Please select the type of this file:"
 msgstr ""
 
-#. i18n: file: src/config/ksystemlog.kcfg:54
-#. i18n: ectx: label, entry (DateFormat), group (KSystemLogGeneral)
+#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:35
+#. i18n: ectx: property (toolTip), widget (QListWidget, logLevelsList)
 #: rc.cpp:71
-msgid "The date format of log lines."
-msgstr ""
-
-#. i18n: file: src/config/ksystemlog.kcfg:70
-#. i18n: ectx: label, entry (SambaPaths), group (KSystemLogGeneral)
-#: rc.cpp:74
-msgid "The Samba log file paths."
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">List of existing log "
+"levels</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/lib/logViewSearchWidgetBase.ui:41
-#. i18n: ectx: property (text), widget (QLabel, searchLabel)
+#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:42
+#. i18n: ectx: property (whatsThis), widget (QListWidget, logLevelsList)
 #: rc.cpp:77
-msgid "Find:"
-msgstr ""
-
-#. i18n: file: src/lib/logViewSearchWidgetBase.ui:78
-#. i18n: ectx: property (text), widget (QCheckBox, caseSensitive)
-#: rc.cpp:86
-msgid "Match &case"
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">This is the list of all "
+"existing log levels. </p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Please select one of them "
+"to be used for the files selected on the list.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/lib/logViewSearchWidgetBase.ui:85
-#. i18n: ectx: property (text), widget (QCheckBox, highlightAllButton)
-#: rc.cpp:89
-msgid "&Highlight all"
+#. i18n: file: src/modes/base/fileListBase.ui:31
+#. i18n: ectx: property (text), widget (QLabel, description)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:31
+#. i18n: ectx: property (text), widget (QLabel, description)
+#: rc.cpp:84 rc.cpp:186
+msgid "File List Description"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:24
-#. i18n: ectx: property (windowTitle), widget (QDialog, LoggerDialogBase)
-#: rc.cpp:92
-msgid "Log Message"
+#. i18n: file: src/modes/base/fileListBase.ui:44
+#. i18n: ectx: property (title), widget (QGroupBox, filesBox)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:44
+#. i18n: ectx: property (title), widget (QGroupBox, filesBox)
+#: rc.cpp:87 rc.cpp:189
+msgid "Log Files"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:39
-#. i18n: ectx: property (text), widget (QRadioButton, messageActivation)
-#: rc.cpp:98
-msgid "&Message:"
-msgstr "&Neges:"
-
-#. i18n: file: src/loggerDialogBase.ui:52
-#. i18n: ectx: property (text), widget (QRadioButton, fileActivation)
-#: rc.cpp:101
-msgid "&File content:"
+#. i18n: file: src/modes/base/fileListBase.ui:55
+#. i18n: ectx: property (toolTip), widget (QPushButton, add)
+#: rc.cpp:90
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Choose a new "
+"file</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:75
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:104
-msgid "Properties"
+#. i18n: file: src/modes/base/fileListBase.ui:61
+#. i18n: ectx: property (whatsThis), widget (QPushButton, add)
+#: rc.cpp:96
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Opens a dialog box to "
+"choose a new file to be added to the list.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:101
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:107
-msgid "&Priority:"
-msgstr "&Blaenoriaeth:"
+#. i18n: file: src/modes/base/fileListBase.ui:64
+#. i18n: ectx: property (text), widget (QPushButton, add)
+#: rc.cpp:102
+msgid "&Add File..."
+msgstr "&Ychwanegu Ffeil..."
 
-#. i18n: file: src/loggerDialogBase.ui:162
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
-#: rc.cpp:110
-msgid "&Facility:"
+#. i18n: file: src/modes/base/fileListBase.ui:71
+#. i18n: ectx: property (text), widget (QPushButton, modify)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:70
+#. i18n: ectx: property (text), widget (QPushButton, modify)
+#: rc.cpp:105 rc.cpp:195
+msgid "&Modify File..."
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:206
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: src/generalConfigurationWidgetBase.ui:107
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:113 rc.cpp:170
-msgid "Options"
+#. i18n: file: src/modes/base/fileListBase.ui:81
+#. i18n: ectx: property (toolTip), widget (QPushButton, remove)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:80
+#. i18n: ectx: property (toolTip), widget (QPushButton, remove)
+#: rc.cpp:108 rc.cpp:198
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Delete the current "
+"file(s)</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:229
-#. i18n: ectx: property (text), widget (QCheckBox, tagActivation)
-#: rc.cpp:116
-msgid "&Tag:"
+#. i18n: file: src/modes/base/fileListBase.ui:87
+#. i18n: ectx: property (whatsThis), widget (QPushButton, remove)
+#: rc.cpp:114
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Deletes the files selected "
+"on the list.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:241
-#. i18n: ectx: property (text), widget (QCheckBox, useProcessIdentifier)
-#: rc.cpp:119
-msgid "Log process &identifier"
+#. i18n: file: src/modes/base/fileListBase.ui:90
+#. i18n: ectx: property (text), widget (QPushButton, remove)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:89
+#. i18n: ectx: property (text), widget (QPushButton, remove)
+#: rc.cpp:120 rc.cpp:210
+msgid "&Remove"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:290
-#. i18n: ectx: property (toolTip), widget (QLabel, loggerManual)
-#: rc.cpp:122
-msgid "Open the 'logger' command manual."
+#. i18n: file: src/modes/base/fileListBase.ui:100
+#. i18n: ectx: property (toolTip), widget (QPushButton, removeAll)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:99
+#. i18n: ectx: property (toolTip), widget (QPushButton, removeAll)
+#: rc.cpp:123 rc.cpp:213
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Remove all "
+"files</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:293
-#. i18n: ectx: property (statusTip), widget (QLabel, loggerManual)
-#: rc.cpp:125
-msgid "This link opens the 'logger' command manual."
+#. i18n: file: src/modes/base/fileListBase.ui:106
+#. i18n: ectx: property (whatsThis), widget (QPushButton, removeAll)
+#: rc.cpp:129
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Remove all the files on "
+"the list, even if they are not selected.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:296
-#. i18n: ectx: property (text), widget (QLabel, loggerManual)
-#: rc.cpp:128
-msgid "<a href=\"man:/logger\">Logger Manual</a>"
+#. i18n: file: src/modes/base/fileListBase.ui:109
+#. i18n: ectx: property (text), widget (QPushButton, removeAll)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:108
+#. i18n: ectx: property (text), widget (QPushButton, removeAll)
+#: rc.cpp:135 rc.cpp:225
+msgid "Rem&ove All"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:322
-#. i18n: ectx: property (text), widget (QPushButton, buttonOK)
-#: rc.cpp:131
-msgid "&OK"
+#. i18n: file: src/modes/base/fileListBase.ui:122
+#. i18n: ectx: property (toolTip), widget (QPushButton, up)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:121
+#. i18n: ectx: property (toolTip), widget (QPushButton, up)
+#: rc.cpp:138 rc.cpp:228
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Move up the current "
+"file(s)</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/loggerDialogBase.ui:338
-#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
-#: rc.cpp:134
-msgid "&Cancel"
+#. i18n: file: src/modes/base/fileListBase.ui:128
+#. i18n: ectx: property (whatsThis), widget (QPushButton, up)
+#: rc.cpp:144
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves the selected files "
+"up in the list. This option allows the files to be read <span style=\" font-"
+"weight:600;\">in first</span> by KSystemLog.</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/generalConfigurationWidgetBase.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:137
-msgid "Startup"
-msgstr ""
+#. i18n: file: src/modes/base/fileListBase.ui:131
+#. i18n: ectx: property (text), widget (QPushButton, up)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:130
+#. i18n: ectx: property (text), widget (QPushButton, up)
+#: rc.cpp:150 rc.cpp:240
+msgid "Move &Up"
+msgstr "Symud i &Fyny"
 
-#. i18n: file: src/generalConfigurationWidgetBase.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:140
-msgid "Load this log mode at startup:"
+#. i18n: file: src/modes/base/fileListBase.ui:141
+#. i18n: ectx: property (toolTip), widget (QPushButton, down)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:140
+#. i18n: ectx: property (toolTip), widget (QPushButton, down)
+#: rc.cpp:153 rc.cpp:243
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Move down the current "
+"file(s)</p></body></html>"
 msgstr ""
 
-#. i18n: file: src/generalConfigurationWidgetBase.ui:33
-#. i18n: ectx: property (toolTip), widget (QComboBox, startupLogMode)
-#: rc.cpp:143
-msgid "The log mode which is loaded by default at startup"
-msgstr ""
+#. i18n: file: src/modes/base/fileListBase.ui:147
+#. i18n: ectx: property (whatsThis), widget (QPushButton, down)
+#: rc.cpp:159
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves the selected files "
+"down in the list. This option allows the files to be read <span style=\" "
+"font-weight:600;\">in last</span> by KSystemLog.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/fileListBase.ui:150
+#. i18n: ectx: property (text), widget (QPushButton, down)
+#. i18n: file: src/modes/base/multipleFileListBase.ui:149
+#. i18n: ectx: property (text), widget (QPushButton, down)
+#: rc.cpp:165 rc.cpp:255
+msgid "Move &Down"
+msgstr "Symud i &Lawr"
+
+#. i18n: file: src/modes/base/fileListBase.ui:175
+#. i18n: ectx: property (text), widget (QLabel, notes)
+#: rc.cpp:168
+msgid ""
+"<p style='margin-top:0px;margin-bottom:0px;'><b>Notes:</b></p><ul "
+"style='margin-top:0px'><li>Files are read using the order of this "
+"list.</li><li>Compressed and plain text files are accepted <i>(*.log, *.gz, "
+"*.bz2,...)</i>.</li><li>Use the <b>'*'</b> wildcard to select multiple log "
+"files when adding files.</li></ul>"
+msgstr ""
+
+#. i18n: file: src/modes/base/fileListBase.ui:191
+#. i18n: ectx: property (toolTip), widget (QListWidget, fileList)
+#: rc.cpp:171
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">List of files used by this "
+"log type.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/fileListBase.ui:197
+#. i18n: ectx: property (whatsThis), widget (QListWidget, fileList)
+#: rc.cpp:177
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Here is a list of every "
+"file that will be read by KSystemLog to display the current log "
+"lines.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/fileListBase.ui:210
+#. i18n: ectx: property (text), widget (QListWidget, fileList)
+#: rc.cpp:183
+msgid "add"
+msgstr ""
+
+#. i18n: file: src/modes/base/multipleFileListBase.ui:60
+#. i18n: ectx: property (text), widget (QTreeWidget, fileList)
+#: rc.cpp:192
+msgid "1"
+msgstr ""
+
+#. i18n: file: src/modes/base/multipleFileListBase.ui:86
+#. i18n: ectx: property (whatsThis), widget (QPushButton, remove)
+#: rc.cpp:204
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Deletes the selected files "
+"of the list.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/multipleFileListBase.ui:105
+#. i18n: ectx: property (whatsThis), widget (QPushButton, removeAll)
+#: rc.cpp:219
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Remove all files of the "
+"list, even if they are not selected.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/multipleFileListBase.ui:127
+#. i18n: ectx: property (whatsThis), widget (QPushButton, up)
+#: rc.cpp:234
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves up the selected "
+"files in the list. This option allows the files to be read <span style=\" "
+"font-weight:600;\">in first</span> by KSystemLog.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/multipleFileListBase.ui:146
+#. i18n: ectx: property (whatsThis), widget (QPushButton, down)
+#: rc.cpp:249
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves down the selected "
+"files in the list. This option allows the files to be read <span style=\" "
+"font-weight:600;\">at last</span> by KSystemLog.</p></body></html>"
+msgstr ""
+
+#. i18n: file: src/modes/base/multipleFileListBase.ui:174
+#. i18n: ectx: property (text), widget (QLabel, notes)
+#: rc.cpp:258
+msgid ""
+"<p style='margin-top:0px;margin-bottom:0px;'><b>Notes:</b></p><ul "
+"style='margin-top:0px'><li>Files are read using the order of this "
+"list.</li><li>Compressed and plain text files are accepted <i>(*.log, *.gz, "
+"*.bz2,...)</i>.</li><li>Use the <b>'*'</b> joker to select multiple log "
+"files when adding files.</li></ul>"
+msgstr ""
+
+#. i18n: file: src/ksystemlogui.rc:13
+#. i18n: ectx: Menu (edit)
+#: rc.cpp:261
+msgid "&Edit"
+msgstr ""
+
+#. i18n: file: src/ksystemlogui.rc:31
+#. i18n: ectx: Menu (logs)
+#: rc.cpp:264
+msgid "Logs"
+msgstr ""
+
+#. i18n: file: src/ksystemlogui.rc:36
+#. i18n: ectx: Menu (window)
+#: rc.cpp:267
+msgid "&Window"
+msgstr "&Ffenestr"
+
+#. i18n: file: src/ksystemlogui.rc:55
+#. i18n: ectx: ToolBar (logToolBar)
+#: rc.cpp:270
+msgid "Logs Toolbar"
+msgstr ""
+
+#. i18n: file: src/ksystemlogui.rc:60
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:273
+msgid "Main Toolbar"
+msgstr ""
+
+#. i18n: file: src/generalConfigurationWidgetBase.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:276
+msgid "Startup"
+msgstr ""
+
+#. i18n: file: src/generalConfigurationWidgetBase.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:279
+msgid "Load this log mode at startup:"
+msgstr ""
+
+#. i18n: file: src/generalConfigurationWidgetBase.ui:33
+#. i18n: ectx: property (toolTip), widget (QComboBox, startupLogMode)
+#: rc.cpp:282
+msgid "The log mode which is loaded by default at startup"
+msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:36
 #. i18n: ectx: property (whatsThis), widget (QComboBox, startupLogMode)
-#: rc.cpp:146
+#: rc.cpp:285
 msgid ""
 "The log mode loaded by default at startup. Choose 'No Log Mode' if you do "
 "not want this to happen."
@@ -1861,26 +2136,26 @@
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:46
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:149
+#: rc.cpp:288
 msgid "Log Lines List"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:54
 #. i18n: ectx: property (text), widget (QLabel, maxLinesLabel)
-#: rc.cpp:152
+#: rc.cpp:291
 msgid "Maximum lines displayed:"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:70
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, maxLines)
-#: rc.cpp:155
+#: rc.cpp:294
 msgid ""
 "Choose here the maximum number of log lines displayed in the main view."
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:73
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, maxLines)
-#: rc.cpp:158
+#: rc.cpp:297
 msgid ""
 "You can choose here the maximum number of log lines displayed in the main "
 "view."
@@ -1888,7 +2163,7 @@
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:91
 #. i18n: ectx: property (toolTip), widget (QCheckBox, deleteDuplicatedLines)
-#: rc.cpp:161
+#: rc.cpp:300
 msgid ""
 "Select this option if you want to delete duplicate log lines <b>(may be "
 "slow)</b>."
@@ -1896,7 +2171,7 @@
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:94
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, deleteDuplicatedLines)
-#: rc.cpp:164
+#: rc.cpp:303
 msgid ""
 "Select this option if you want to delete duplicate log lines. <b>This option "
 "can slow log reading</b>."
@@ -1904,19 +2179,27 @@
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:97
 #. i18n: ectx: property (text), widget (QCheckBox, deleteDuplicatedLines)
-#: rc.cpp:167
+#: rc.cpp:306
 msgid "Remove &duplicate log lines (may be slower)"
 msgstr ""
 
+#. i18n: file: src/generalConfigurationWidgetBase.ui:107
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: src/loggerDialogBase.ui:206
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:309 rc.cpp:396
+msgid "Options"
+msgstr ""
+
 #. i18n: file: src/generalConfigurationWidgetBase.ui:113
 #. i18n: ectx: property (toolTip), widget (QCheckBox, deleteProcessId)
-#: rc.cpp:173
+#: rc.cpp:312
 msgid "Remove process identifier from process name."
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:116
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, deleteProcessId)
-#: rc.cpp:176
+#: rc.cpp:315
 msgid ""
 "Select this option if you want to remove the process identifier from the "
 "process name. For example, the <b>Process</b> column may contain entries "
@@ -1926,20 +2209,20 @@
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:119
 #. i18n: ectx: property (text), widget (QCheckBox, deleteProcessId)
-#: rc.cpp:179
+#: rc.cpp:318
 msgid "Remove &identifier from process name"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:126
 #. i18n: ectx: property (toolTip), widget (QCheckBox, colorizeLogLines)
-#: rc.cpp:182
+#: rc.cpp:321
 msgid ""
 "This option allows log lines to be colored depending on their log level."
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:129
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, colorizeLogLines)
-#: rc.cpp:185
+#: rc.cpp:324
 msgid ""
 "This option allows log lines to be colored depending on their log level. For "
 "example, errors will be shown in red, warnings in orange, and so on. This "
@@ -1948,476 +2231,196 @@
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:132
 #. i18n: ectx: property (text), widget (QCheckBox, colorizeLogLines)
-#: rc.cpp:188
+#: rc.cpp:327
 msgid "&Colored log lines"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:142
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:191
+#: rc.cpp:330
 msgid "Date Format"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:151
 #. i18n: ectx: property (text), widget (QRadioButton, formatShortDate)
-#: rc.cpp:194
+#: rc.cpp:333
 msgid "&Short date format"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:158
 #. i18n: ectx: property (text), widget (QRadioButton, formatFancyShortDate)
-#: rc.cpp:197
+#: rc.cpp:336
 msgid "&Fancy short date format"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:165
 #. i18n: ectx: property (text), widget (QRadioButton, formatLongDate)
-#: rc.cpp:200
+#: rc.cpp:339
 msgid "&Long date format"
 msgstr ""
 
 #. i18n: file: src/generalConfigurationWidgetBase.ui:172
 #. i18n: ectx: property (text), widget (QRadioButton, formatFancyLongDate)
-#: rc.cpp:203
+#: rc.cpp:342
 msgid "Fanc&y long date format"
 msgstr ""
 
-#. i18n: file: src/ksystemlogui.rc:13
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:206
-msgid "&Edit"
+#. i18n: file: src/config/ksystemlog.kcfg:13
+#. i18n: ectx: label, entry (StartupLogMode), group (KSystemLogGeneral)
+#: rc.cpp:345
+msgid "Load this log mode at startup."
 msgstr ""
 
-#. i18n: file: src/ksystemlogui.rc:31
-#. i18n: ectx: Menu (logs)
-#: rc.cpp:209
-msgid "Logs"
+#. i18n: file: src/config/ksystemlog.kcfg:18
+#. i18n: ectx: label, entry (MaxLines), group (KSystemLogGeneral)
+#: rc.cpp:348
+msgid "The log view line count limit."
 msgstr ""
 
-#. i18n: file: src/ksystemlogui.rc:36
-#. i18n: ectx: Menu (window)
-#: rc.cpp:212
-msgid "&Window"
-msgstr "&Ffenestr"
+#. i18n: file: src/config/ksystemlog.kcfg:23
+#. i18n: ectx: label, entry (DeleteDuplicatedLines), group (KSystemLogGeneral)
+#: rc.cpp:351
+msgid "Option is true if the user wants to delete repeated log lines."
+msgstr ""
 
-#. i18n: file: src/ksystemlogui.rc:55
-#. i18n: ectx: ToolBar (logToolBar)
-#: rc.cpp:215
-msgid "Logs Toolbar"
+#. i18n: file: src/config/ksystemlog.kcfg:28
+#. i18n: ectx: label, entry (DeleteProcessIdentifier), group (KSystemLogGeneral)
+#: rc.cpp:354
+msgid ""
+"Option is true if the PID in the process column of the SystemLog is to be "
+"omitted."
 msgstr ""
 
-#. i18n: file: src/ksystemlogui.rc:60
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:218
-msgid "Main Toolbar"
+#. i18n: file: src/config/ksystemlog.kcfg:33
+#. i18n: ectx: label, entry (ColorizeLogLines), group (KSystemLogGeneral)
+#: rc.cpp:357
+msgid ""
+"Option is true if the log lines are to be colored depending on their log "
+"level."
 msgstr ""
 
-#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:221
-msgid "X Session Log File"
+#. i18n: file: src/config/ksystemlog.kcfg:39
+#. i18n: ectx: label, entry (TooltipEnabled), group (KSystemLogGeneral)
+#: rc.cpp:360
+msgid "Whether the tooltips are enabled."
 msgstr ""
 
-#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:224
-msgid "Log file:"
+#. i18n: file: src/config/ksystemlog.kcfg:44
+#. i18n: ectx: label, entry (NewLinesDisplayed), group (KSystemLogGeneral)
+#: rc.cpp:363
+msgid "Whether new lines are displayed."
 msgstr ""
 
-#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:45
-#. i18n: ectx: property (toolTip), widget (QCheckBox, ignoreXorgErrors)
-#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:48
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ignoreXorgErrors)
-#: rc.cpp:227 rc.cpp:230
-msgid "Check this option to remove Xorg errors"
+#. i18n: file: src/config/ksystemlog.kcfg:49
+#. i18n: ectx: label, entry (ToggleFilterBar), group (KSystemLogGeneral)
+#: rc.cpp:366
+msgid "Whether the filter bar is shown."
 msgstr ""
 
-#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, ignoreXorgErrors)
-#: rc.cpp:233
-msgid "Ignore Xorg errors"
+#. i18n: file: src/config/ksystemlog.kcfg:54
+#. i18n: ectx: label, entry (DateFormat), group (KSystemLogGeneral)
+#: rc.cpp:369
+msgid "The date format of log lines."
 msgstr ""
 
-#. i18n: file: src/modes/xsession/xsessionConfigurationWidgetBase.ui:58
-#. i18n: ectx: property (text), widget (QLabel, xorgErrorsDescription)
-#: rc.cpp:236
-msgid ""
-"<p><b>Note:</b> Check this option to remove X.org errors.</p><p "
-"style=\"margin-bottom:0px\">The following lines will be ignored:</p>"
+#. i18n: file: src/config/ksystemlog.kcfg:70
+#. i18n: ectx: label, entry (SambaPaths), group (KSystemLogGeneral)
+#: rc.cpp:372
+msgid "The Samba log file paths."
 msgstr ""
 
-#. i18n: file: src/modes/base/multipleFileListBase.ui:31
-#. i18n: ectx: property (text), widget (QLabel, description)
-#. i18n: file: src/modes/base/fileListBase.ui:31
-#. i18n: ectx: property (text), widget (QLabel, description)
-#: rc.cpp:239 rc.cpp:333
-msgid "File List Description"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:44
-#. i18n: ectx: property (title), widget (QGroupBox, filesBox)
-#. i18n: file: src/modes/base/fileListBase.ui:44
-#. i18n: ectx: property (title), widget (QGroupBox, filesBox)
-#: rc.cpp:242 rc.cpp:336
-msgid "Log Files"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:60
-#. i18n: ectx: property (text), widget (QTreeWidget, fileList)
-#: rc.cpp:245
-msgid "1"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:70
-#. i18n: ectx: property (text), widget (QPushButton, modify)
-#. i18n: file: src/modes/base/fileListBase.ui:71
-#. i18n: ectx: property (text), widget (QPushButton, modify)
-#: rc.cpp:248 rc.cpp:354
-msgid "&Modify File..."
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:80
-#. i18n: ectx: property (toolTip), widget (QPushButton, remove)
-#. i18n: file: src/modes/base/fileListBase.ui:81
-#. i18n: ectx: property (toolTip), widget (QPushButton, remove)
-#: rc.cpp:251 rc.cpp:357
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Delete the current "
-"file(s)</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:86
-#. i18n: ectx: property (whatsThis), widget (QPushButton, remove)
-#: rc.cpp:257
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Deletes the selected files "
-"of the list.</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:89
-#. i18n: ectx: property (text), widget (QPushButton, remove)
-#. i18n: file: src/modes/base/fileListBase.ui:90
-#. i18n: ectx: property (text), widget (QPushButton, remove)
-#: rc.cpp:263 rc.cpp:369
-msgid "&Remove"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:99
-#. i18n: ectx: property (toolTip), widget (QPushButton, removeAll)
-#. i18n: file: src/modes/base/fileListBase.ui:100
-#. i18n: ectx: property (toolTip), widget (QPushButton, removeAll)
-#: rc.cpp:266 rc.cpp:372
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Remove all "
-"files</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:105
-#. i18n: ectx: property (whatsThis), widget (QPushButton, removeAll)
-#: rc.cpp:272
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Remove all files of the "
-"list, even if they are not selected.</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:108
-#. i18n: ectx: property (text), widget (QPushButton, removeAll)
-#. i18n: file: src/modes/base/fileListBase.ui:109
-#. i18n: ectx: property (text), widget (QPushButton, removeAll)
-#: rc.cpp:278 rc.cpp:384
-msgid "Rem&ove All"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:121
-#. i18n: ectx: property (toolTip), widget (QPushButton, up)
-#. i18n: file: src/modes/base/fileListBase.ui:122
-#. i18n: ectx: property (toolTip), widget (QPushButton, up)
-#: rc.cpp:281 rc.cpp:387
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Move up the current "
-"file(s)</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:127
-#. i18n: ectx: property (whatsThis), widget (QPushButton, up)
-#: rc.cpp:287
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves up the selected "
-"files in the list. This option allows the files to be read <span style=\" "
-"font-weight:600;\">in first</span> by KSystemLog.</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:130
-#. i18n: ectx: property (text), widget (QPushButton, up)
-#. i18n: file: src/modes/base/fileListBase.ui:131
-#. i18n: ectx: property (text), widget (QPushButton, up)
-#: rc.cpp:293 rc.cpp:399
-msgid "Move &Up"
-msgstr "Symud i &Fyny"
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:140
-#. i18n: ectx: property (toolTip), widget (QPushButton, down)
-#. i18n: file: src/modes/base/fileListBase.ui:141
-#. i18n: ectx: property (toolTip), widget (QPushButton, down)
-#: rc.cpp:296 rc.cpp:402
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Move down the current "
-"file(s)</p></body></html>"
-msgstr ""
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:146
-#. i18n: ectx: property (whatsThis), widget (QPushButton, down)
-#: rc.cpp:302
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves down the selected "
-"files in the list. This option allows the files to be read <span style=\" "
-"font-weight:600;\">at last</span> by KSystemLog.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:24
+#. i18n: ectx: property (windowTitle), widget (QDialog, LoggerDialogBase)
+#: rc.cpp:375
+msgid "Log Message"
 msgstr ""
 
-#. i18n: file: src/modes/base/multipleFileListBase.ui:149
-#. i18n: ectx: property (text), widget (QPushButton, down)
-#. i18n: file: src/modes/base/fileListBase.ui:150
-#. i18n: ectx: property (text), widget (QPushButton, down)
-#: rc.cpp:308 rc.cpp:414
-msgid "Move &Down"
-msgstr "Symud i &Lawr"
-
-#. i18n: file: src/modes/base/multipleFileListBase.ui:174
-#. i18n: ectx: property (text), widget (QLabel, notes)
-#: rc.cpp:311
-msgid ""
-"<p style='margin-top:0px;margin-bottom:0px;'><b>Notes:</b></p><ul "
-"style='margin-top:0px'><li>Files are read using the order of this "
-"list.</li><li>Compressed and plain text files are accepted <i>(*.log, *.gz, "
-"*.bz2,...)</i>.</li><li>Use the <b>'*'</b> joker to select multiple log "
-"files when adding files.</li></ul>"
-msgstr ""
+#. i18n: file: src/loggerDialogBase.ui:39
+#. i18n: ectx: property (text), widget (QRadioButton, messageActivation)
+#: rc.cpp:381
+msgid "&Message:"
+msgstr "&Neges:"
 
-#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, LogLevelSelectionDialogBase)
-#: rc.cpp:314
-msgid "Selecting File Type"
+#. i18n: file: src/loggerDialogBase.ui:52
+#. i18n: ectx: property (text), widget (QRadioButton, fileActivation)
+#: rc.cpp:384
+msgid "&File content:"
 msgstr ""
 
-#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:317
-msgid "Please select the type of this file:"
+#. i18n: file: src/loggerDialogBase.ui:75
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:387
+msgid "Properties"
 msgstr ""
 
-#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:35
-#. i18n: ectx: property (toolTip), widget (QListWidget, logLevelsList)
-#: rc.cpp:320
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">List of existing log "
-"levels</p></body></html>"
-msgstr ""
+#. i18n: file: src/loggerDialogBase.ui:101
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:390
+msgid "&Priority:"
+msgstr "&Blaenoriaeth:"
 
-#. i18n: file: src/modes/base/logLevelSelectionDialogBase.ui:42
-#. i18n: ectx: property (whatsThis), widget (QListWidget, logLevelsList)
-#: rc.cpp:326
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">This is the list of all "
-"existing log levels. </p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Please select one of them "
-"to be used for the files selected on the list.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:162
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_2)
+#: rc.cpp:393
+msgid "&Facility:"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:55
-#. i18n: ectx: property (toolTip), widget (QPushButton, add)
-#: rc.cpp:339
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Choose a new "
-"file</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:229
+#. i18n: ectx: property (text), widget (QCheckBox, tagActivation)
+#: rc.cpp:399
+msgid "&Tag:"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:61
-#. i18n: ectx: property (whatsThis), widget (QPushButton, add)
-#: rc.cpp:345
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Opens a dialog box to "
-"choose a new file to be added to the list.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:241
+#. i18n: ectx: property (text), widget (QCheckBox, useProcessIdentifier)
+#: rc.cpp:402
+msgid "Log process &identifier"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:64
-#. i18n: ectx: property (text), widget (QPushButton, add)
-#: rc.cpp:351
-msgid "&Add File..."
-msgstr "&Ychwanegu Ffeil..."
-
-#. i18n: file: src/modes/base/fileListBase.ui:87
-#. i18n: ectx: property (whatsThis), widget (QPushButton, remove)
-#: rc.cpp:363
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Deletes the files selected "
-"on the list.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:290
+#. i18n: ectx: property (toolTip), widget (QLabel, loggerManual)
+#: rc.cpp:405
+msgid "Open the 'logger' command manual."
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:106
-#. i18n: ectx: property (whatsThis), widget (QPushButton, removeAll)
-#: rc.cpp:378
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Remove all the files on "
-"the list, even if they are not selected.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:293
+#. i18n: ectx: property (statusTip), widget (QLabel, loggerManual)
+#: rc.cpp:408
+msgid "This link opens the 'logger' command manual."
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:128
-#. i18n: ectx: property (whatsThis), widget (QPushButton, up)
-#: rc.cpp:393
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves the selected files "
-"up in the list. This option allows the files to be read <span style=\" font-"
-"weight:600;\">in first</span> by KSystemLog.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:296
+#. i18n: ectx: property (text), widget (QLabel, loggerManual)
+#: rc.cpp:411
+msgid "<a href=\"man:/logger\">Logger Manual</a>"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:147
-#. i18n: ectx: property (whatsThis), widget (QPushButton, down)
-#: rc.cpp:408
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Moves the selected files "
-"down in the list. This option allows the files to be read <span style=\" "
-"font-weight:600;\">in last</span> by KSystemLog.</p></body></html>"
+#. i18n: file: src/loggerDialogBase.ui:322
+#. i18n: ectx: property (text), widget (QPushButton, buttonOK)
+#: rc.cpp:414
+msgid "&OK"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:175
-#. i18n: ectx: property (text), widget (QLabel, notes)
+#. i18n: file: src/loggerDialogBase.ui:338
+#. i18n: ectx: property (text), widget (QPushButton, buttonCancel)
 #: rc.cpp:417
-msgid ""
-"<p style='margin-top:0px;margin-bottom:0px;'><b>Notes:</b></p><ul "
-"style='margin-top:0px'><li>Files are read using the order of this "
-"list.</li><li>Compressed and plain text files are accepted <i>(*.log, *.gz, "
-"*.bz2,...)</i>.</li><li>Use the <b>'*'</b> wildcard to select multiple log "
-"files when adding files.</li></ul>"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:191
-#. i18n: ectx: property (toolTip), widget (QListWidget, fileList)
+#. i18n: file: src/lib/logViewSearchWidgetBase.ui:41
+#. i18n: ectx: property (text), widget (QLabel, searchLabel)
 #: rc.cpp:420
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">List of files used by this "
-"log type.</p></body></html>"
+msgid "Find:"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:197
-#. i18n: ectx: property (whatsThis), widget (QListWidget, fileList)
-#: rc.cpp:426
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Here is a list of every "
-"file that will be read by KSystemLog to display the current log "
-"lines.</p></body></html>"
+#. i18n: file: src/lib/logViewSearchWidgetBase.ui:78
+#. i18n: ectx: property (text), widget (QCheckBox, caseSensitive)
+#: rc.cpp:429
+msgid "Match &case"
 msgstr ""
 
-#. i18n: file: src/modes/base/fileListBase.ui:210
-#. i18n: ectx: property (text), widget (QListWidget, fileList)
+#. i18n: file: src/lib/logViewSearchWidgetBase.ui:85
+#. i18n: ectx: property (text), widget (QCheckBox, highlightAllButton)
 #: rc.cpp:432
-msgid "add"
+msgid "&Highlight all"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksystraycmd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksystraycmd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ksystraycmd.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ksystraycmd.po	2012-04-18 08:59:39.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: ksystraycmd\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:03+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:38+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:16+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ksystraycmd.cpp:80
 #, kde-format
@@ -26,23 +26,23 @@
 msgid "KSysTrayCmd: K3ShellProcess cannot find a shell."
 msgstr ""
 
-#: ksystraycmd.cpp:247 main.cpp:26
+#: ksystraycmd.cpp:248 main.cpp:26
 msgid "KSysTrayCmd"
 msgstr "KSysTrayCmd"
 
-#: ksystraycmd.cpp:248
+#: ksystraycmd.cpp:249
 msgid "&Hide"
 msgstr "&Cuddio"
 
-#: ksystraycmd.cpp:248
+#: ksystraycmd.cpp:249
 msgid "&Restore"
 msgstr "&Adfer"
 
-#: ksystraycmd.cpp:249
+#: ksystraycmd.cpp:250
 msgid "&Undock"
 msgstr "&Dad-ddocio"
 
-#: ksystraycmd.cpp:250
+#: ksystraycmd.cpp:251
 msgid "&Quit"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kteatime.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kteatime.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kteatime.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kteatime.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: kdetoys\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 04:38+0000\n"
-"PO-Revision-Date: 2012-03-14 17:37+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-11 17:08+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -31,84 +31,84 @@
 
 #. i18n: file: src/settings.ui:18
 #. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup1)
-#: rc.cpp:17
+#: rc.cpp:5
 msgid "Tea List"
 msgstr "Rhestr Te"
 
 #. i18n: file: src/settings.ui:122
 #. i18n: ectx: property (title), widget (QGroupBox, teaPropertiesGroup)
-#: rc.cpp:24
+#: rc.cpp:8
 msgid "Tea Properties"
 msgstr "Priodweddau'r Te"
 
 #. i18n: file: src/settings.ui:128
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:27 src/tealistmodel.cpp:112
+#: rc.cpp:11 src/tealistmodel.cpp:112
 msgid "Name"
 msgstr "Enw"
 
 #. i18n: file: src/settings.ui:142
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:30 src/tealistmodel.cpp:112
+#: rc.cpp:14 src/tealistmodel.cpp:112
 msgid "Time"
 msgstr "Amser"
 
-#. i18n: file: src/timeedit.ui:52
-#. i18n: ectx: property (text), widget (QLabel, minutesLabel)
 #. i18n: file: src/settings.ui:159
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:11 rc.cpp:33
+#. i18n: file: src/timeedit.ui:52
+#. i18n: ectx: property (text), widget (QLabel, minutesLabel)
+#: rc.cpp:17 rc.cpp:44
 msgid "min"
 msgstr ""
 
-#. i18n: file: src/timeedit.ui:66
-#. i18n: ectx: property (text), widget (QLabel, secondsLabel)
 #. i18n: file: src/settings.ui:176
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:14 rc.cpp:36
+#. i18n: file: src/timeedit.ui:66
+#. i18n: ectx: property (text), widget (QLabel, secondsLabel)
+#: rc.cpp:20 rc.cpp:47
 msgid "sec"
 msgstr ""
 
 #. i18n: file: src/settings.ui:199
 #. i18n: ectx: property (title), widget (KButtonGroup, kbuttongroup2)
-#: rc.cpp:39
+#: rc.cpp:23
 msgid "Action"
 msgstr "Gweithrediad"
 
 #. i18n: file: src/settings.ui:205
 #. i18n: ectx: property (text), widget (QCheckBox, popupCheckBox)
-#: rc.cpp:42
+#: rc.cpp:26
 msgid "Popup"
 msgstr "Naidlen"
 
 #. i18n: file: src/settings.ui:236
 #. i18n: ectx: property (text), widget (QCheckBox, autohideCheckBox)
-#: rc.cpp:45
+#: rc.cpp:29
 msgid "Auto hide popup after"
 msgstr ""
 
 #. i18n: file: src/settings.ui:285
 #. i18n: ectx: property (text), widget (QCheckBox, reminderCheckBox)
-#: rc.cpp:48
+#: rc.cpp:32
 msgid "Reminder every"
 msgstr ""
 
 #. i18n: file: src/settings.ui:332
 #. i18n: ectx: property (text), widget (QCheckBox, visualizeCheckBox)
-#: rc.cpp:51
+#: rc.cpp:35
 msgid "Visualize progress in icon tray"
 msgstr "Gweld cynnydd yng nghafn eiconau"
 
 #. i18n: file: src/timeedit.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, TimeEditWidget)
-#: rc.cpp:5 src/main.cpp:83 src/tea.cpp:40 src/timeedit.cpp:45
+#: rc.cpp:38 src/main.cpp:83 src/tea.cpp:40 src/timeedit.cpp:45
 #: src/timeedit.cpp:105
 msgid "Anonymous Tea"
 msgstr "Te Di-enw"
 
 #. i18n: file: src/timeedit.ui:32
 #. i18n: ectx: property (text), widget (QLabel, minutesLabel_2)
-#: rc.cpp:8
+#: rc.cpp:41
 msgid "Tea time:"
 msgstr "Amser te:"
 
@@ -288,59 +288,59 @@
 msgid "Close this dialog without starting a new tea."
 msgstr ""
 
-#: src/toplevel.cpp:54
+#: src/toplevel.cpp:56
 msgid "Unknown Tea"
 msgstr ""
 
-#: src/toplevel.cpp:61
+#: src/toplevel.cpp:63
 msgid "Black Tea"
 msgstr "Te Du"
 
-#: src/toplevel.cpp:62
+#: src/toplevel.cpp:64
 msgid "Earl Grey"
 msgstr "Earl Grey"
 
-#: src/toplevel.cpp:63
+#: src/toplevel.cpp:65
 msgid "Fruit Tea"
 msgstr "Te Ffrwyth"
 
-#: src/toplevel.cpp:72
+#: src/toplevel.cpp:74
 msgid "&Stop"
 msgstr ""
 
-#: src/toplevel.cpp:77
+#: src/toplevel.cpp:79
 msgid "&Configure..."
 msgstr "&Ffurfweddu..."
 
-#: src/toplevel.cpp:80
+#: src/toplevel.cpp:82
 msgid "&Anonymous..."
 msgstr "&Di-enw..."
 
-#: src/toplevel.cpp:133
+#: src/toplevel.cpp:130
 msgid "No steeping tea."
 msgstr ""
 
-#: src/toplevel.cpp:182
+#: src/toplevel.cpp:178
 #, kde-format
 msgctxt "%1 - name of the tea, %2 - the predefined time for the tea"
 msgid "%1 (%2)"
 msgstr ""
 
-#: src/toplevel.cpp:133 src/toplevel.cpp:134 src/toplevel.cpp:262
+#: src/toplevel.cpp:242 src/toplevel.cpp:342
 msgid "The Tea Cooker"
 msgstr "Y Tegell Te"
 
-#: src/toplevel.cpp:267
+#: src/toplevel.cpp:247
 #, kde-format
 msgid "%1 is now ready!"
 msgstr ""
 
-#: src/toplevel.cpp:287
+#: src/toplevel.cpp:267
 #, kde-format
 msgid "%1 is ready since %2!"
 msgstr ""
 
-#: src/toplevel.cpp:305 src/toplevel.cpp:306
+#: src/toplevel.cpp:283
 #, kde-format
 msgctxt "%1 is the time, %2 is the name of the tea"
 msgid "%1 left for %2."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktimetracker.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktimetracker.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktimetracker.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktimetracker.po	2012-04-18 08:59:26.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: karm\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 02:55+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-17 11:34+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:45+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: csvexportdialog.h:37
 msgctxt "@action:button"
@@ -33,20 +33,20 @@
 
 #. i18n: file: csvexportdialog_base.ui:176
 #. i18n: ectx: property (text), item, widget (QComboBox, combodecimalminutes)
-#: csvexportdialog.cpp:93 rc.cpp:44
+#: csvexportdialog.cpp:91 rc.cpp:80
 msgctxt "format to display times"
 msgid "Decimal"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:203
 #. i18n: ectx: property (text), item, widget (QComboBox, combosessiontimes)
-#: csvexportdialog.cpp:108 rc.cpp:53
+#: csvexportdialog.cpp:106 rc.cpp:89
 msgid "Session Times"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:220
 #. i18n: ectx: property (text), item, widget (QComboBox, comboalltasks)
-#: csvexportdialog.cpp:109 rc.cpp:56
+#: csvexportdialog.cpp:107 rc.cpp:92
 msgid "All Tasks"
 msgstr ""
 
@@ -78,21 +78,26 @@
 msgid "Please select a task to delete."
 msgstr ""
 
-#: idletimedetector.cpp:118
+#: idletimedetector.cpp:112
+#, kde-format
+msgid "Desktop has been idle since %1. What do you want to do ?"
+msgstr ""
+
+#: idletimedetector.cpp:117
 #, kde-format
 msgid "Continue timing. Timing has started at %1"
 msgstr ""
 
-#: idletimedetector.cpp:119
+#: idletimedetector.cpp:118
 #, kde-format
 msgid "Stop timing and revert back to the time at %1."
 msgstr ""
 
-#: idletimedetector.cpp:120
+#: idletimedetector.cpp:119
 msgid "Continue timing."
 msgstr ""
 
-#: idletimedetector.cpp:121
+#: idletimedetector.cpp:120
 msgid "Revert timing"
 msgstr ""
 
@@ -134,15 +139,15 @@
 msgid "KArm is now ktimetracker"
 msgstr ""
 
-#: ktimetrackerpart.cpp:73
+#: ktimetrackerpart.cpp:72
 msgid "ktimetracker"
 msgstr ""
 
-#: ktimetrackerpart.cpp:86 mainwindow.cpp:167
+#: ktimetrackerpart.cpp:85 mainwindow.cpp:166
 msgid "Configure key bindings"
 msgstr "Ffurfweddu rhwymiadau bysyll"
 
-#: ktimetrackerpart.cpp:87 mainwindow.cpp:168
+#: ktimetrackerpart.cpp:86 mainwindow.cpp:167
 msgid ""
 "This will let you configure keybindings which are specific to ktimetracker"
 msgstr ""
@@ -155,7 +160,7 @@
 msgid "Just caught a software interrupt."
 msgstr "Newydd ddal ymyriad meddalwedd."
 
-#: main.cpp:85 timetrackerstorage.cpp:987 timetrackerstorage.cpp:1010
+#: main.cpp:85 timetrackerstorage.cpp:1005 timetrackerstorage.cpp:1028
 msgid "KTimeTracker"
 msgstr ""
 
@@ -163,79 +168,79 @@
 msgid "Copyright © 1997-2011 KDE PIM authors"
 msgstr ""
 
-#: main.cpp:89
+#: main.cpp:90
 msgid "Thorsten Stärk"
 msgstr ""
 
-#: main.cpp:89
+#: main.cpp:90
 msgid "Current Maintainer"
 msgstr "Cynhaliwr Cyfredol"
 
-#: main.cpp:91
+#: main.cpp:92
 msgid "Sirtaj Singh Kang"
 msgstr ""
 
-#: main.cpp:91
+#: main.cpp:92
 msgid "Original Author"
 msgstr "Awdur Gwreiddiol"
 
-#: main.cpp:93
+#: main.cpp:94
 msgid "Allen Winter"
 msgstr ""
 
-#: main.cpp:94
+#: main.cpp:95
 msgid "David Faure"
 msgstr ""
 
-#: main.cpp:95
+#: main.cpp:96
 msgid "Mathias Soeken"
 msgstr ""
 
-#: main.cpp:96
+#: main.cpp:97
 msgid "Jesper Pedersen"
 msgstr ""
 
-#: main.cpp:97
+#: main.cpp:98
 msgid "Kalle Dalheimer"
 msgstr ""
 
-#: main.cpp:98
+#: main.cpp:99
 msgid "Mark Bucciarelli"
 msgstr ""
 
-#: main.cpp:102
+#: main.cpp:103
 msgid "The iCalendar file to open"
 msgstr ""
 
-#: main.cpp:103
+#: main.cpp:104
 msgid "List all tasks as text output"
 msgstr ""
 
-#: main.cpp:104
+#: main.cpp:105
 msgid "Add task <taskname>"
 msgstr ""
 
-#: main.cpp:105
+#: main.cpp:106
 msgid "Delete task <taskid>"
 msgstr ""
 
-#: main.cpp:106
+#: main.cpp:107
 msgid "Print the task ids for all tasks named <taskname>"
 msgstr ""
 
-#: main.cpp:107
+#: main.cpp:108
 msgid "Start timer for task <taskid>"
 msgstr ""
 
-#: main.cpp:108
+#: main.cpp:109
 msgid "Stop timer for task <taskid>"
 msgstr ""
 
-#: main.cpp:109
+#: main.cpp:110
 msgid "Deliver total minutes for task id"
 msgstr ""
 
-#: main.cpp:110
+#: main.cpp:111
 msgid "Outputs the version"
 msgstr ""
 
@@ -247,11 +252,11 @@
 msgid "Could not find the KTimeTracker part."
 msgstr ""
 
-#: mainwindow.cpp:125
+#: mainwindow.cpp:124
 msgid "Configure KTimeTracker..."
 msgstr ""
 
-#: mainwindow.cpp:207
+#: mainwindow.cpp:206
 msgid "task_popup"
 msgstr "naidlen_tasg"
 
@@ -276,61 +281,129 @@
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_autoSavePeriod)
 #. i18n: file: cfgbehavior.ui:23
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_period)
-#: rc.cpp:8 rc.cpp:155
+#: rc.cpp:8 rc.cpp:122
 msgid " min"
 msgstr " munud"
 
+#. i18n: file: new/mainwindow.ui:50
+#. i18n: ectx: property (title), widget (QMenu, menuFile)
+#: rc.cpp:11
+msgid "File"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:58
+#. i18n: ectx: property (title), widget (QMenu, menuHelp)
+#. i18n: file: new/mainwindow.ui:104
+#. i18n: ectx: property (text), widget (QToolBar, toolBar)
+#: rc.cpp:14 rc.cpp:32
+msgid "Help"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:64
+#. i18n: ectx: property (title), widget (QMenu, menuConfigure)
+#: rc.cpp:17
+msgid "Configure"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:75
+#. i18n: ectx: property (windowTitle), widget (QToolBar, toolBar)
+#: rc.cpp:20
+msgid "toolBar"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:89
+#. i18n: ectx: property (text), widget (QToolBar, toolBar)
+#: rc.cpp:23
+msgid "Load"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:94
+#. i18n: ectx: property (text), widget (QToolBar, toolBar)
+#: rc.cpp:26
+msgid "Save"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:99
+#. i18n: ectx: property (text), widget (QToolBar, toolBar)
+#: rc.cpp:29
+msgid "Quit"
+msgstr ""
+
+#. i18n: file: new/mainwindow.ui:109
+#. i18n: ectx: property (text), widget (QToolBar, toolBar)
+#: rc.cpp:35
+msgid "Configure ktimetracker"
+msgstr ""
+
+#. i18n: file: historydialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, historydialog)
+#: rc.cpp:38
+msgid "Edit History"
+msgstr ""
+
+#. i18n: file: historydialog.ui:23
+#. i18n: ectx: property (text), widget (QPushButton, deletepushbutton)
+#: rc.cpp:41
+msgid "Delete"
+msgstr ""
+
+#. i18n: file: historydialog.ui:33
+#. i18n: ectx: property (text), widget (QPushButton, okpushbutton)
+#: rc.cpp:44
+msgid "Close"
+msgstr ""
+
 #. i18n: file: csvexportdialog_base.ui:13
 #. i18n: ectx: property (windowTitle), widget (KDialog, CSVExportDialogBase)
-#: rc.cpp:11
+#: rc.cpp:47
 msgid "CSV Export"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:36
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:14
+#: rc.cpp:50
 msgid "Export to:"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:46
 #. i18n: ectx: property (whatsThis), widget (KUrlRequester, urlExportTo)
-#: rc.cpp:17
+#: rc.cpp:53
 msgid "The file where KTimeTracker will write the data."
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:64
 #. i18n: ectx: property (text), widget (QLabel, quotesLabel)
-#: rc.cpp:20
+#: rc.cpp:56
 msgid "Quotes:"
 msgstr "Dyfynodau:"
 
 #. i18n: file: csvexportdialog_base.ui:85
 #. i18n: ectx: property (whatsThis), widget (QComboBox, cboQuote)
-#: rc.cpp:23
+#: rc.cpp:59
 msgid "All fields are quoted in the output."
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:89
 #. i18n: ectx: property (text), item, widget (QComboBox, cboQuote)
-#: rc.cpp:26
+#: rc.cpp:62
 msgid "\""
 msgstr "\""
 
 #. i18n: file: csvexportdialog_base.ui:94
 #. i18n: ectx: property (text), item, widget (QComboBox, cboQuote)
-#: rc.cpp:29
+#: rc.cpp:65
 msgid "'"
 msgstr "'"
 
 #. i18n: file: csvexportdialog_base.ui:105
 #. i18n: ectx: property (title), widget (QGroupBox, grpDateRange)
-#: rc.cpp:32
+#: rc.cpp:68
 msgid "Date Range"
 msgstr "Amrediad Dyddiadau"
 
 #. i18n: file: csvexportdialog_base.ui:108
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, grpDateRange)
-#: rc.cpp:35
+#: rc.cpp:71
 msgid ""
 "<p>An inclusive date range for reporting on time card history.  Not enabled "
 "when reporting on totals.</p>"
@@ -338,246 +411,105 @@
 
 #. i18n: file: csvexportdialog_base.ui:114
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:38
+#: rc.cpp:74
 msgid "From:"
 msgstr "O:"
 
 #. i18n: file: csvexportdialog_base.ui:139
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:41
+#: rc.cpp:77
 msgid "To:"
 msgstr "I:"
 
 #. i18n: file: csvexportdialog_base.ui:181
 #. i18n: ectx: property (text), item, widget (QComboBox, combodecimalminutes)
-#: rc.cpp:47
+#: rc.cpp:83
 msgid "Hours:Minutes"
 msgstr "Awr:munud"
 
 #. i18n: file: csvexportdialog_base.ui:198
 #. i18n: ectx: property (text), item, widget (QComboBox, combosessiontimes)
-#: rc.cpp:50
+#: rc.cpp:86
 msgid "All Times"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:225
 #. i18n: ectx: property (text), item, widget (QComboBox, comboalltasks)
-#: rc.cpp:59
+#: rc.cpp:95
 msgid "Only Selected"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:241
 #. i18n: ectx: property (title), widget (QGroupBox, grpDelimiter)
-#: rc.cpp:62
+#: rc.cpp:98
 msgid "Delimiter"
 msgstr "Amffinydd"
 
 #. i18n: file: csvexportdialog_base.ui:244
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, grpDelimiter)
-#: rc.cpp:65
+#: rc.cpp:101
 msgid "The character used to separate one field from another in the output."
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:256
 #. i18n: ectx: property (text), widget (QRadioButton, radioTab)
-#: rc.cpp:68
+#: rc.cpp:104
 msgctxt "tabulator delimiter"
 msgid "Tab"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:263
 #. i18n: ectx: property (text), widget (QRadioButton, radioOther)
-#: rc.cpp:71
+#: rc.cpp:107
 msgctxt "user can set an user defined delimiter"
 msgid "Other:"
 msgstr ""
 
 #. i18n: file: csvexportdialog_base.ui:270
 #. i18n: ectx: property (text), widget (QRadioButton, radioSpace)
-#: rc.cpp:74
+#: rc.cpp:110
 msgid "Space"
 msgstr "Gofodnod"
 
 #. i18n: file: csvexportdialog_base.ui:277
 #. i18n: ectx: property (text), widget (QRadioButton, radioComma)
-#: rc.cpp:77
+#: rc.cpp:113
 msgid "Comma"
 msgstr "Atalnod"
 
 #. i18n: file: csvexportdialog_base.ui:314
 #. i18n: ectx: property (text), widget (QRadioButton, radioSemicolon)
-#: rc.cpp:80
+#: rc.cpp:116
 msgid "Semicolon"
 msgstr "Gwahannod"
 
-#. i18n: file: cfgdisplay.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:83
-msgctxt "title of group box, general options"
-msgid "General"
-msgstr ""
-
-#. i18n: file: cfgdisplay.ui:25
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_decimalFormat)
-#: rc.cpp:86
-msgid "Decimal number format"
-msgstr ""
-
-#. i18n: file: cfgdisplay.ui:32
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_configPDA)
-#: rc.cpp:89
-msgid ""
-"Choose this if you have a touchscreen and your screen real estate is "
-"precious. It will disable the search bar and every click will pop up a "
-"context menu."
-msgstr ""
-
-#. i18n: file: cfgdisplay.ui:35
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_configPDA)
-#: rc.cpp:92
-msgctxt ""
-"Choose this if you have a touchscreen and your screen real estate is "
-"precious."
-msgid "Configuration for PDA"
-msgstr ""
-
-#. i18n: file: cfgdisplay.ui:45
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:95
-msgid "Columns Displayed"
-msgstr ""
-
-#. i18n: file: cfgdisplay.ui:51
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displaySessionTime)
-#: rc.cpp:98
-msgid "Session time"
-msgstr "Amser sesiwn"
-
-#. i18n: file: cfgdisplay.ui:58
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayTime)
-#: rc.cpp:101
-msgid "Cumulative task time"
-msgstr "Amser tasg cynyddol"
-
-#. i18n: file: cfgdisplay.ui:65
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayTotalSessionTime)
-#: rc.cpp:104
-msgid "Total session time"
-msgstr "Cyfanswm amser sesiwn"
-
-#. i18n: file: cfgdisplay.ui:72
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayTotalTime)
-#: rc.cpp:107
-msgid "Total task time"
-msgstr "Cyfanswm amser tasg"
-
-#. i18n: file: cfgdisplay.ui:79
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayPriority)
-#: rc.cpp:110 taskview.cpp:183
-msgid "Priority"
-msgstr ""
-
-#. i18n: file: cfgdisplay.ui:86
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayPercentComplete)
-#: rc.cpp:113
-msgid "Percent complete"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:50
-#. i18n: ectx: property (title), widget (QMenu, menuFile)
-#: rc.cpp:116
-msgid "File"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:58
-#. i18n: ectx: property (title), widget (QMenu, menuHelp)
-#. i18n: file: new/mainwindow.ui:104
-#. i18n: ectx: property (text), widget (QToolBar, toolBar)
-#: rc.cpp:119 rc.cpp:137
-msgid "Help"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:64
-#. i18n: ectx: property (title), widget (QMenu, menuConfigure)
-#: rc.cpp:122
-msgid "Configure"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:75
-#. i18n: ectx: property (windowTitle), widget (QToolBar, toolBar)
-#: rc.cpp:125
-msgid "toolBar"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:89
-#. i18n: ectx: property (text), widget (QToolBar, toolBar)
-#: rc.cpp:128
-msgid "Load"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:94
-#. i18n: ectx: property (text), widget (QToolBar, toolBar)
-#: rc.cpp:131
-msgid "Save"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:99
-#. i18n: ectx: property (text), widget (QToolBar, toolBar)
-#: rc.cpp:134
-msgid "Quit"
-msgstr ""
-
-#. i18n: file: new/mainwindow.ui:109
-#. i18n: ectx: property (text), widget (QToolBar, toolBar)
-#: rc.cpp:140
-msgid "Configure ktimetracker"
-msgstr ""
-
-#. i18n: file: historydialog.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, historydialog)
-#: rc.cpp:143
-msgid "Edit History"
-msgstr ""
-
-#. i18n: file: historydialog.ui:23
-#. i18n: ectx: property (text), widget (QPushButton, deletepushbutton)
-#: rc.cpp:146
-msgid "Delete"
-msgstr ""
-
-#. i18n: file: historydialog.ui:33
-#. i18n: ectx: property (text), widget (QPushButton, okpushbutton)
-#: rc.cpp:149
-msgid "Close"
-msgstr ""
-
 #. i18n: file: cfgbehavior.ui:16
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_enabled)
-#: rc.cpp:152
+#: rc.cpp:119
 msgid "Detect desktop as idle after:"
 msgstr ""
 
 #. i18n: file: cfgbehavior.ui:36
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:158
+#: rc.cpp:125
 msgid "Minimum desktop active time:"
 msgstr ""
 
 #. i18n: file: cfgbehavior.ui:43
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_minActiveTime)
-#: rc.cpp:161
+#: rc.cpp:128
 msgid " sec"
 msgstr ""
 
 #. i18n: file: cfgbehavior.ui:56
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_promptDelete)
-#: rc.cpp:164
+#: rc.cpp:131
 msgid "Prompt before deleting tasks"
 msgstr "Annog cyn dileu tasgau"
 
 #. i18n: file: cfgbehavior.ui:63
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_uniTasking)
-#: rc.cpp:167
+#: rc.cpp:134
 msgid ""
 "Unitasking - allow only one task to be timed at a time. Does not stop any "
 "timer."
@@ -585,31 +517,31 @@
 
 #. i18n: file: cfgbehavior.ui:66
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_uniTasking)
-#: rc.cpp:170
+#: rc.cpp:137
 msgid "Allow only one timer at a time"
 msgstr ""
 
 #. i18n: file: cfgbehavior.ui:73
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_trayIcon)
-#: rc.cpp:173
+#: rc.cpp:140
 msgid "Place an icon to the system tray"
 msgstr ""
 
 #. i18n: file: edittaskdialog.ui:14
 #. i18n: ectx: property (windowTitle), widget (QDialog, EditTaskDialog)
-#: rc.cpp:176
-msgid "Dialog"
+#: rc.cpp:143
+msgid "Add/Edit a task"
 msgstr ""
 
 #. i18n: file: edittaskdialog.ui:26
 #. i18n: ectx: property (text), widget (QLabel, tasknamelabel)
-#: rc.cpp:179
+#: rc.cpp:146
 msgid "Task Name:"
 msgstr ""
 
 #. i18n: file: edittaskdialog.ui:44
 #. i18n: ectx: property (whatsThis), widget (QLineEdit, tasknamelineedit)
-#: rc.cpp:182
+#: rc.cpp:149
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -626,75 +558,154 @@
 "style:italic;\">Example:</span> phone with mother</p></body></html>"
 msgstr ""
 
-#. i18n: file: edittaskdialog.ui:57
+#. i18n: file: edittaskdialog.ui:51
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:157
+msgid "Description:"
+msgstr ""
+
+#. i18n: file: edittaskdialog.ui:74
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:160
+msgid "Change time (in minutes, e.g. -60)"
+msgstr ""
+
+#. i18n: file: edittaskdialog.ui:103
+#. i18n: ectx: property (title), widget (QGroupBox, autotrackinggroupbox)
+#: rc.cpp:163
+msgid "Auto Tracking"
+msgstr ""
+
+#. i18n: file: edittaskdialog.ui:133
 #. i18n: ectx: property (whatsThis), widget (QPushButton, edittimespushbutton)
-#: rc.cpp:190
+#: rc.cpp:166
 msgid "To change this task's time, you have to edit its event history."
 msgstr ""
 
-#. i18n: file: edittaskdialog.ui:60
+#. i18n: file: edittaskdialog.ui:136
 #. i18n: ectx: property (text), widget (QPushButton, edittimespushbutton)
-#: rc.cpp:193
+#: rc.cpp:169
 msgid "Edit Times"
 msgstr ""
 
-#. i18n: file: edittaskdialog.ui:73
-#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: cfgdisplay.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:172
+msgctxt "title of group box, general options"
+msgid "General"
+msgstr ""
+
+#. i18n: file: cfgdisplay.ui:25
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_decimalFormat)
+#: rc.cpp:175
+msgid "Decimal number format"
+msgstr ""
+
+#. i18n: file: cfgdisplay.ui:32
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_configPDA)
+#: rc.cpp:178
+msgid ""
+"Choose this if you have a touchscreen and your screen real estate is "
+"precious. It will disable the search bar and every click will pop up a "
+"context menu."
+msgstr ""
+
+#. i18n: file: cfgdisplay.ui:35
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_configPDA)
+#: rc.cpp:181
+msgctxt ""
+"Choose this if you have a touchscreen and your screen real estate is "
+"precious."
+msgid "Configuration for PDA"
+msgstr ""
+
+#. i18n: file: cfgdisplay.ui:45
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:184
+msgid "Columns Displayed"
+msgstr ""
+
+#. i18n: file: cfgdisplay.ui:51
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displaySessionTime)
+#: rc.cpp:187
+msgid "Session time"
+msgstr "Amser sesiwn"
+
+#. i18n: file: cfgdisplay.ui:58
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayTime)
+#: rc.cpp:190
+msgid "Cumulative task time"
+msgstr "Amser tasg cynyddol"
+
+#. i18n: file: cfgdisplay.ui:65
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayTotalSessionTime)
+#: rc.cpp:193
+msgid "Total session time"
+msgstr "Cyfanswm amser sesiwn"
+
+#. i18n: file: cfgdisplay.ui:72
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayTotalTime)
 #: rc.cpp:196
-msgid "Change time (in minutes, e.g. -60)"
+msgid "Total task time"
+msgstr "Cyfanswm amser tasg"
+
+#. i18n: file: cfgdisplay.ui:79
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayPriority)
+#: rc.cpp:199 taskview.cpp:183
+msgid "Priority"
 msgstr ""
 
-#. i18n: file: edittaskdialog.ui:90
-#. i18n: ectx: property (title), widget (QGroupBox, autotrackinggroupbox)
-#: rc.cpp:199
-msgid "Auto Tracking"
+#. i18n: file: cfgdisplay.ui:86
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_displayPercentComplete)
+#: rc.cpp:202
+msgid "Percent complete"
 msgstr ""
 
 #. i18n: file: ktimetrackerui.rc:5
 #. i18n: ectx: Menu (file)
-#: rc.cpp:202
+#: rc.cpp:205
 msgid "&File"
 msgstr ""
 
-#. i18n: file: ktimetrackerui.rc:16
+#. i18n: file: ktimetrackerui.rc:14
 #. i18n: ectx: Menu (import)
-#: rc.cpp:205
+#: rc.cpp:208
 msgid "&Import"
 msgstr ""
 
-#. i18n: file: ktimetrackerui.rc:20
+#. i18n: file: ktimetrackerui.rc:18
 #. i18n: ectx: Menu (export)
-#: rc.cpp:208
+#: rc.cpp:211
 msgid "&Export"
 msgstr "&Allforio"
 
-#. i18n: file: ktimetrackerui.rc:31
+#. i18n: file: ktimetrackerui.rc:27
 #. i18n: ectx: Menu (clock)
-#: rc.cpp:211
+#: rc.cpp:214
 msgid "&Clock"
 msgstr "&Cloc"
 
-#. i18n: file: ktimetrackerui.rc:38
+#. i18n: file: ktimetrackerui.rc:34
 #. i18n: ectx: Menu (task)
-#: rc.cpp:214
+#: rc.cpp:217
 msgid "&Task"
 msgstr "&Tasg"
 
-#. i18n: file: ktimetrackerui.rc:49
+#. i18n: file: ktimetrackerui.rc:45
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:217
+#: rc.cpp:220
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: ktimetrackerui.rc:54
+#. i18n: file: ktimetrackerui.rc:50
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:220
+#: rc.cpp:223
 msgid "Main Toolbar"
 msgstr ""
 
-#. i18n: file: ktimetrackerui.rc:63
+#. i18n: file: ktimetrackerui.rc:59
 #. i18n: ectx: ToolBar (taskToolBar)
-#: rc.cpp:223
+#: rc.cpp:226
 msgid "Tasks"
 msgstr ""
 
@@ -722,11 +733,11 @@
 msgid "Percent Complete"
 msgstr ""
 
-#: taskview.cpp:185 timetrackerstorage.cpp:258
+#: taskview.cpp:185 timetrackerstorage.cpp:259
 msgid "The task name is what you call the task, it can be chosen freely."
 msgstr ""
 
-#: taskview.cpp:186 timetrackerstorage.cpp:259
+#: taskview.cpp:186 timetrackerstorage.cpp:260
 msgid ""
 "The session time is the time since you last chose \"start new session.\""
 msgstr ""
@@ -764,7 +775,7 @@
 msgid "9 (lowest)"
 msgstr ""
 
-#: taskview.cpp:300 taskview.cpp:887
+#: taskview.cpp:300 taskview.cpp:888
 msgid ""
 "Error storing new task. Your changes were not saved. Make sure you can edit "
 "your iCalendar file. Also quit all applications using this file and remove "
@@ -788,29 +799,29 @@
 msgid "New Task"
 msgstr "Tasg Newydd"
 
-#: taskview.cpp:872 taskview.cpp:944
+#: taskview.cpp:872 taskview.cpp:946
 msgid "Unnamed Task"
 msgstr "Tasg Di-enw"
 
-#: taskview.cpp:926
+#: taskview.cpp:927
 msgid "New Sub Task"
 msgstr "Is-Dasg Newydd"
 
-#: taskview.cpp:939
+#: taskview.cpp:940
 msgid "Edit Task"
 msgstr "Golygu Tasg"
 
-#: taskview.cpp:977 taskview.cpp:1018 taskview.cpp:1040
+#: taskview.cpp:979 taskview.cpp:1020 taskview.cpp:1042
 msgid "No task selected."
 msgstr "Dim tasg wedi'i dewis."
 
-#: taskview.cpp:1026
+#: taskview.cpp:1028
 msgid ""
 "Are you sure you want to delete the selected task and its entire history?\n"
 "NOTE: all subtasks and their history will also be deleted."
 msgstr ""
 
-#: taskview.cpp:1030
+#: taskview.cpp:1032
 msgid "Deleting Task"
 msgstr ""
 
@@ -832,7 +843,7 @@
 msgid "Week of %1"
 msgstr "Wythnos o %1"
 
-#: timetrackerstorage.cpp:189 timetrackerstorage.cpp:275
+#: timetrackerstorage.cpp:190 timetrackerstorage.cpp:276
 #, kde-format
 msgid "Error loading \"%1\": could not find parent (uid=%2)"
 msgstr "Gwall wrth lwytho ffeil \"%1\": methu canfod rhiant (uid=%2)"
@@ -841,35 +852,35 @@
 msgid "Export Progress"
 msgstr ""
 
-#: timetrackerstorage.cpp:698 timetrackerstorage.cpp:831
+#: timetrackerstorage.cpp:698 timetrackerstorage.cpp:873
 #, kde-format
 msgid "Could not open \"%1\"."
 msgstr "Methu agor \"%1\"."
 
-#: timetrackerwidget.cpp:106
+#: timetrackerwidget.cpp:104
 msgid "Search or add task"
 msgstr ""
 
-#: timetrackerwidget.cpp:107
+#: timetrackerwidget.cpp:105
 msgid ""
 "This is a combined field. As long as you do not type ENTER, it acts as a "
 "filter. Then, only tasks that match your input are shown. As soon as you "
 "type ENTER, your input is used as name to create a new task."
 msgstr ""
 
-#: timetrackerwidget.cpp:175
+#: timetrackerwidget.cpp:152
 msgid "Cannot create new file."
 msgstr ""
 
-#: timetrackerwidget.cpp:280
+#: timetrackerwidget.cpp:208
 msgid "Start &New Session"
 msgstr "&Dechrau Sesiwn Newydd"
 
-#: timetrackerwidget.cpp:281
+#: timetrackerwidget.cpp:209
 msgid "Starts a new session"
 msgstr ""
 
-#: timetrackerwidget.cpp:281
+#: timetrackerwidget.cpp:209
 msgid ""
 "This will reset the session time to 0 for all tasks, to start a new session, "
 "without affecting the totals."
@@ -877,29 +888,29 @@
 "Bydd hwn yn ailosod amser y sesiwn yn 0 ar gyfer pob tasg, i ddechrau sesiwn "
 "newydd, heb effeithio ar y cyfansymiau."
 
-#: timetrackerwidget.cpp:285
+#: timetrackerwidget.cpp:213
 msgid "Edit History..."
 msgstr ""
 
-#: timetrackerwidget.cpp:286
+#: timetrackerwidget.cpp:214
 msgid "Edits history of all tasks of the current document"
 msgstr ""
 
-#: timetrackerwidget.cpp:286
+#: timetrackerwidget.cpp:214
 msgid ""
 "A window will be opened where you can change start and stop times of tasks "
 "or add a comment to them."
 msgstr ""
 
-#: timetrackerwidget.cpp:290
+#: timetrackerwidget.cpp:218
 msgid "&Reset All Times"
 msgstr "&Ailosod Pob Amser"
 
-#: timetrackerwidget.cpp:291
+#: timetrackerwidget.cpp:219
 msgid "Resets all times"
 msgstr ""
 
-#: timetrackerwidget.cpp:291
+#: timetrackerwidget.cpp:219
 msgid ""
 "This will reset the session and total time to 0 for all tasks, to restart "
 "from scratch."
@@ -907,15 +918,15 @@
 "Bydd hwn yn ailosod yr amserau sesiwn a chyfanswm i 0 ar gyfer pob tasg, i "
 "ddechrau o'r newydd."
 
-#: timetrackerwidget.cpp:294
+#: timetrackerwidget.cpp:222
 msgid "&Start"
 msgstr ""
 
-#: timetrackerwidget.cpp:295
+#: timetrackerwidget.cpp:223
 msgid "Starts timing for selected task"
 msgstr ""
 
-#: timetrackerwidget.cpp:295
+#: timetrackerwidget.cpp:223
 msgid ""
 "This will start timing for the selected task.\n"
 "It is even possible to time several tasks simultanously.\n"
@@ -924,92 +935,92 @@
 "on a given task. This will, however, stop timing of other tasks."
 msgstr ""
 
-#: timetrackerwidget.cpp:301
+#: timetrackerwidget.cpp:229
 msgid "S&top"
 msgstr "A&tal"
 
-#: timetrackerwidget.cpp:302
+#: timetrackerwidget.cpp:230
 msgid "Stops timing of the selected task"
 msgstr ""
 
-#: timetrackerwidget.cpp:304
+#: timetrackerwidget.cpp:232
 msgid "Focus on Searchbar"
 msgstr ""
 
-#: timetrackerwidget.cpp:305
+#: timetrackerwidget.cpp:233
 msgid "Sets the focus on the searchbar"
 msgstr ""
 
-#: timetrackerwidget.cpp:307
+#: timetrackerwidget.cpp:235
 msgid "Stop &All Timers"
 msgstr "Atal &Pob Amserydd"
 
-#: timetrackerwidget.cpp:308
+#: timetrackerwidget.cpp:236
 msgid "Stops all of the active timers"
 msgstr ""
 
-#: timetrackerwidget.cpp:310
+#: timetrackerwidget.cpp:238
 msgid "Track Active Applications"
 msgstr ""
 
-#: timetrackerwidget.cpp:311
+#: timetrackerwidget.cpp:239
 msgid ""
 "Auto-creates and updates tasks when the focus of the current window has "
 "changed"
 msgstr ""
 
-#: timetrackerwidget.cpp:312
+#: timetrackerwidget.cpp:240
 msgid ""
 "If the focus of a window changes for the first time when this action is "
 "enabled, a new task will be created with the title of the window as its name "
 "and will be started. If there already exists such an task it will be started."
 msgstr ""
 
-#: timetrackerwidget.cpp:320
+#: timetrackerwidget.cpp:248
 msgid "&New Task..."
 msgstr ""
 
-#: timetrackerwidget.cpp:320
+#: timetrackerwidget.cpp:248
 msgid "Creates new top level task"
 msgstr ""
 
-#: timetrackerwidget.cpp:321
+#: timetrackerwidget.cpp:249
 msgid "This will create a new top level task."
 msgstr "Bydd hwn yn creu tasg lefel uchaf newydd."
 
-#: timetrackerwidget.cpp:323
+#: timetrackerwidget.cpp:251
 msgid "New &Subtask..."
 msgstr "&Is-dasg Newydd..."
 
-#: timetrackerwidget.cpp:324
+#: timetrackerwidget.cpp:252
 msgid "Creates a new subtask to the current selected task"
 msgstr ""
 
-#: timetrackerwidget.cpp:325
+#: timetrackerwidget.cpp:253
 msgid "This will create a new subtask to the current selected task."
 msgstr ""
 
-#: timetrackerwidget.cpp:327
+#: timetrackerwidget.cpp:255
 msgid "&Delete"
 msgstr ""
 
-#: timetrackerwidget.cpp:327
+#: timetrackerwidget.cpp:255
 msgid "Deletes selected task"
 msgstr ""
 
-#: timetrackerwidget.cpp:328
+#: timetrackerwidget.cpp:256
 msgid "This will delete the selected task(s) and all subtasks."
 msgstr ""
 
-#: timetrackerwidget.cpp:331
+#: timetrackerwidget.cpp:259
 msgid "&Edit..."
 msgstr "&Golygu..."
 
-#: timetrackerwidget.cpp:332
+#: timetrackerwidget.cpp:260
 msgid "Edits name or times for selected task"
 msgstr ""
 
-#: timetrackerwidget.cpp:332
+#: timetrackerwidget.cpp:260
 msgid ""
 "This will bring up a dialog box where you may edit the parameters for the "
 "selected task."
@@ -1017,104 +1028,96 @@
 "Bydd hwn yn codi blwch ymgom lle gallwch ffurfweddu paramedrau'r dasg "
 "ddewisiedig."
 
-#: timetrackerwidget.cpp:335
+#: timetrackerwidget.cpp:263
 msgid "&Mark as Complete"
 msgstr ""
 
-#: timetrackerwidget.cpp:338
+#: timetrackerwidget.cpp:266
 msgid "&Mark as Incomplete"
 msgstr ""
 
-#: timetrackerwidget.cpp:341
+#: timetrackerwidget.cpp:269
 msgid "&Export Times..."
 msgstr ""
 
-#: timetrackerwidget.cpp:344
+#: timetrackerwidget.cpp:272
 msgid "Export &History..."
 msgstr ""
 
-#: timetrackerwidget.cpp:347
+#: timetrackerwidget.cpp:275
 msgid "Import Tasks From &Planner..."
 msgstr ""
 
-#: timetrackerwidget.cpp:350
+#: timetrackerwidget.cpp:278
 msgid "Show Searchbar"
 msgstr ""
 
-#: timetrackerwidget.cpp:446
-msgid "This document has not been saved yet. Do you want to save it?"
-msgstr ""
-
-#: timetrackerwidget.cpp:447
-msgid "Untitled"
-msgstr ""
-
-#: timetrackerwidget.cpp:621
+#: timetrackerwidget.cpp:500
 msgid "Settings"
 msgstr ""
 
-#: timetrackerwidget.cpp:722
+#: timetrackerwidget.cpp:583
 msgctxt "@info in message box"
 msgid ""
 "There is no history yet. Start and stop a task and you will have an entry in "
 "your history."
 msgstr ""
 
-#: timetrackerwidget.cpp:731
+#: timetrackerwidget.cpp:592
 msgid ""
 "Do you really want to reset the time to zero for all tasks? This will delete "
 "the entire history."
 msgstr ""
 
-#: timetrackerwidget.cpp:732
+#: timetrackerwidget.cpp:593
 msgid "Confirmation Required"
 msgstr "Mynnir Cadarnhad"
 
-#: timetrackerwidget.cpp:732
+#: timetrackerwidget.cpp:593
 msgid "Reset All Times"
 msgstr "Ailosod Pob Amser"
 
-#: timetrackerwidget.cpp:921
+#: timetrackerwidget.cpp:733
 msgid "Save failed, most likely because the file could not be locked."
 msgstr ""
 
-#: timetrackerwidget.cpp:923
+#: timetrackerwidget.cpp:735
 msgid "Could not modify calendar resource."
 msgstr ""
 
-#: timetrackerwidget.cpp:925
+#: timetrackerwidget.cpp:737
 msgid "Out of memory--could not create object."
 msgstr ""
 
-#: timetrackerwidget.cpp:927
+#: timetrackerwidget.cpp:739
 msgid "UID not found."
 msgstr ""
 
-#: timetrackerwidget.cpp:929
+#: timetrackerwidget.cpp:741
 msgid "Invalidate date--format is YYYY-MM-DD."
 msgstr ""
 
-#: timetrackerwidget.cpp:931
+#: timetrackerwidget.cpp:743
 msgid "Invalid time--format is YYYY-MM-DDTHH:MM:SS."
 msgstr ""
 
-#: timetrackerwidget.cpp:933
+#: timetrackerwidget.cpp:745
 msgid "Invalid task duration--must be greater than zero."
 msgstr ""
 
-#: timetrackerwidget.cpp:935
+#: timetrackerwidget.cpp:747
 #, kde-format
 msgid "Invalid error number: %1"
 msgstr ""
 
-#: timetrackerwidget.cpp:1148
+#: timetrackerwidget.cpp:969
 msgid ""
 "This is ktimetracker, KDE's program to help you track your time. Best, start "
 "with creating your first task - enter it into the field where you see "
 "\"search or add task\"."
 msgstr ""
 
-#: timetrackerwidget.cpp:1149
+#: timetrackerwidget.cpp:970
 msgid "You have already created a task. You can now start and stop timing"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktorrent.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktorrent.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktorrent.po	2012-03-23 07:39:17.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktorrent.po	2012-04-18 08:59:28.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-22 22:34+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
 "PO-Revision-Date: 2011-12-31 20:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -11,17 +11,19 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:45+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:16+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: plasma/applet/appletconfig.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, AppletConfig)
-#: plasma/applet/applet.cpp:234
-#: obj-i686-linux-gnu/plasma/applet/ui_appletconfig.h:73 rc.cpp:5 rc.cpp:5
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:234
+#: rc.cpp:2947 plasma/applet/applet.cpp:239 rc.cpp:2947
 msgid "Applet"
 msgstr ""
 
-#: plasma/applet/applet.cpp:298 plasma/applet/applet.cpp:363
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:298
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:363
+#: plasma/applet/applet.cpp:303 plasma/applet/applet.cpp:387
 #, kde-format
 msgid ""
 "<table>\t\t\t\t<tr><td>Download Speed:</td><td>%5 </td><td>Seeders: "
@@ -29,7 +31,9 @@
 "</td><td>Leechers: </td><td>%3 (%4)</td></tr>"
 msgstr ""
 
-#: plasma/applet/applet.cpp:303 plasma/applet/applet.cpp:368
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:303
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:368
+#: plasma/applet/applet.cpp:308 plasma/applet/applet.cpp:392
 #, kde-format
 msgid ""
 "<tr><td>Downloaded:</td><td>%1 </td><td>Size: </td><td>%2</td></tr>\t\t\t\t"
@@ -37,4788 +41,3992 @@
 "\t</table>"
 msgstr ""
 
-#: plasma/applet/applet.cpp:309
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:309
+#: plasma/applet/applet.cpp:314
 #, kde-format
 msgid "<b>%1</b><br/>%2 (Share Ratio: <font color=\"%4\">%3</font>)"
 msgstr ""
 
-#: plasma/applet/applet.cpp:374
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:374
+#: plasma/applet/applet.cpp:398
 msgid "KTorrent is not running."
 msgstr ""
 
-#: plasma/applet/applet.cpp:376
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:376
+#: plasma/applet/applet.cpp:400
 msgid "No torrents loaded."
 msgstr ""
 
-#: plasma/applet/applet.cpp:378
+#: .pc/plasma_applet_remove_taskmanager.diff/plasma/applet/applet.cpp:378
+#: plasma/applet/applet.cpp:402
 msgid "Selected torrent is unavailable."
 msgstr ""
 
-#: ktmagnetdownloader/magnetdownloader.cpp:44
-msgid "KTMagnetDownloader"
-msgstr ""
-
-#: ktmagnetdownloader/magnetdownloader.cpp:45
-msgid "KTorrent's magnet link downloader"
-msgstr ""
-
-#: ktmagnetdownloader/magnetdownloader.cpp:47
-msgid "(C) 2009 Joris Guisson"
-msgstr ""
-
-#: ktmagnetdownloader/magnetdownloader.cpp:52 ktorrent/main.cpp:152
-msgid "Document to open"
-msgstr "Dogfen i'w hagor"
-
-#: libktcore/dbus/dbustorrent.cpp:322
-msgid "Maximum share ratio reached."
-msgstr ""
-
-#: libktcore/dbus/dbustorrent.cpp:325
-msgid "Maximum seed time reached."
+#: plugins/zeroconf/zeroconfplugin.cpp:51
+#: plugins/zeroconf/zeroconfplugin.cpp:68
+msgid "ZeroConf"
 msgstr ""
 
-#: libktcore/torrent/basicjobprogresswidget.cpp:53
+#: plugins/ipfilter/downloadandconvertjob.cpp:82
+#: plugins/ipfilter/downloadandconvertjob.cpp:104
+#: plugins/ipfilter/downloadandconvertjob.cpp:147
+#: plugins/ipfilter/downloadandconvertjob.cpp:236
 #, kde-format
-msgid "%1: %2<br/>%3: %4"
+msgid "Automatic update of IP filter failed: %1"
 msgstr ""
 
-#: libktcore/torrent/basicjobprogresswidget.cpp:68
+#: plugins/ipfilter/downloadandconvertjob.cpp:162
 #, kde-format
-msgid "Warning: %1"
+msgid "Cannot open zip file %1."
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:114
+#: plugins/ipfilter/downloadandconvertjob.cpp:166
 #, kde-format
-msgid ""
-"The torrent \"%1\" has reached its maximum share ratio and its maximum seed "
-"time. Ignore the limit and start seeding anyway?"
+msgid "Automatic update of IP filter failed: cannot open zip file %1"
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:116
+#: plugins/ipfilter/downloadandconvertjob.cpp:203
 #, kde-format
-msgid ""
-"The torrent \"%1\" has reached its maximum share ratio. Ignore the limit and "
-"start seeding anyway?"
+msgid "Cannot find blocklist in zip file %1."
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:118
+#: plugins/ipfilter/downloadandconvertjob.cpp:207
 #, kde-format
 msgid ""
-"The torrent \"%1\" has reached its maximum seed time. Ignore the limit and "
-"start seeding anyway?"
+"Automatic update of IP filter failed: cannot find blocklist in zip file %1"
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:122
-msgid "Limits reached."
+#: plugins/ipfilter/ipfilterplugin.cpp:62
+#: plugins/ipfilter/ipfilterplugin.cpp:75
+#: plugins/ipfilter/ipblockingprefpage.cpp:35 ktorrent/gui.cpp:430
+msgid "IP Filter"
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:148
-msgid ""
-"You don't have enough disk space to download this torrent. Are you sure you "
-"want to continue?"
-msgstr ""
+#: plugins/ipfilter/ipblockingprefpage.cpp:42
+msgid " day"
+msgid_plural " days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: libktcore/torrent/queuemanager.cpp:151
-#, kde-format
-msgid "Insufficient disk space for %1"
-msgstr ""
+#: plugins/ipfilter/ipblockingprefpage.cpp:67
+#: plugins/ipfilter/ipblockingprefpage.cpp:89
+#: plugins/ipfilter/ipblockingprefpage.cpp:155
+msgid "Status: Loaded and running."
+msgstr "Statws: Wedi llwytho ac yn rhedeg"
 
-#: libktcore/torrent/queuemanager.cpp:241
-msgid ""
-"Not enough disk space for the following torrents. Do you want to start them "
-"anyway?"
+#: plugins/ipfilter/ipblockingprefpage.cpp:69
+#: plugins/ipfilter/ipblockingprefpage.cpp:91
+#: plugins/ipfilter/ipblockingprefpage.cpp:102
+#: plugins/ipfilter/ipblockingprefpage.cpp:157
+msgid "Status: Not loaded."
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:280
-msgid ""
-"The following torrents have reached their maximum seed time. Do you want to "
-"start them anyway?"
+#: plugins/ipfilter/ipblockingprefpage.cpp:120
+msgid "Status: Downloading and converting new block list..."
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:309
-msgid ""
-"The following torrents have reached their maximum share ratio. Do you want "
-"to start them anyway?"
+#: plugins/ipfilter/ipblockingprefpage.cpp:200
+msgid "No update done yet."
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:737
+#: plugins/ipfilter/ipblockingprefpage.cpp:204
 #, kde-format
-msgid "Error starting torrent %1: %2"
+msgid "%1 (Last update attempt failed.)"
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:739
-#: libktcore/torrent/queuemanager.cpp:755
-msgid "Error"
+#: plugins/ipfilter/ipblockingprefpage.cpp:218
+msgid "Never"
 msgstr ""
 
-#: libktcore/torrent/queuemanager.cpp:753
+#: plugins/ipfilter/convertthread.cpp:67
+#: plugins/ipfilter/convertthread.cpp:167
+#: plugins/search/searchenginelist.cpp:192
+#: ktorrent/dialogs/importdialog.cpp:285
 #, kde-format
-msgid "Error stopping torrent %1: %2"
+msgid "Cannot open %1: %2"
 msgstr ""
 
-#: libktcore/torrent/torrentfilelistmodel.cpp:76
-#: libktcore/torrent/torrentfiletreemodel.cpp:399
-msgid "File"
+#: plugins/ipfilter/convertthread.cpp:72
+msgid "Loading txt file..."
 msgstr ""
 
-#: libktcore/torrent/torrentfilelistmodel.cpp:77
-#: libktcore/torrent/torrentfiletreemodel.cpp:400
-#: ktorrent/view/viewmodel.cpp:439
-msgid "Size"
-msgstr "Maint"
-
-#: libktcore/torrent/chunkbar.cpp:93
-msgid ""
-"<img src=\"available_color\">&nbsp; - Downloaded Chunks<br><img "
-"src=\"unavailable_color\">&nbsp; - Chunks to Download<br><img "
-"src=\"excluded_color\">&nbsp; - Excluded Chunks"
+#: plugins/ipfilter/convertthread.cpp:156
+#, kde-format
+msgid "There are no IP addresses to convert in %1"
 msgstr ""
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:7
-#. i18n: ectx: Menu (Torrents)
-#. i18n: file: ktorrent/kttorrentactivityui.rc:77
-#. i18n: ectx: ToolBar (TorrentsToolBar)
-#. i18n: file: ktorrent/kttorrentactivityui.rc:7
-#. i18n: ectx: Menu (Torrents)
-#. i18n: file: ktorrent/kttorrentactivityui.rc:77
-#. i18n: ectx: ToolBar (TorrentsToolBar)
-#: libktcore/interfaces/functions.cpp:186 ktorrent/torrentactivity.cpp:48
-#: rc.cpp:462 rc.cpp:483 rc.cpp:462 rc.cpp:483
-msgid "Torrents"
+#. i18n: file: plugins/ipfilter/convertdialog.ui:19
+#. i18n: ectx: property (windowTitle), widget (QDialog, ConvertDialog)
+#: plugins/ipfilter/convertthread.cpp:174 rc.cpp:51 rc.cpp:51
+msgid "Converting..."
 msgstr ""
 
-#: libktcore/interfaces/functions.cpp:188
-#: plugins/bwscheduler/scheduleeditor.cpp:142
-#: plugins/scripting/scriptingplugin.cpp:186
-msgid "All files"
-msgstr "Pob Ffeil"
-
-#: libktcore/plugin/pluginactivity.cpp:38
-#: libktcore/plugin/pluginactivity.cpp:55
-msgid "Plugins"
-msgstr "Ategion"
-
-#: libktcore/groups/ungroupedgroup.cpp:27
-msgid "Ungrouped Torrents"
+#: plugins/shutdown/shutdownplugin.cpp:50
+msgid "Shutdown Enabled"
 msgstr ""
 
-#: libktcore/groups/allgroup.cpp:26 ktorrent/dialogs/pastedialog.cpp:62
-#: ktorrent/dialogs/fileselectdlg.cpp:427
-#: ktorrent/dialogs/torrentcreatordlg.cpp:118
-msgid "All Torrents"
+#: plugins/shutdown/shutdownplugin.cpp:54
+msgid "Configure Shutdown"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:100
-msgid "Uploads"
+#. i18n: file: plugins/shutdown/ktshutdownpluginui.rc:5
+#. i18n: ectx: Menu (shutdown)
+#: plugins/shutdown/shutdownplugin.cpp:166 plugins/shutdown/shutdowndlg.cpp:37
+#: rc.cpp:76 rc.cpp:76
+msgid "Shutdown"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:102
-msgid "Running Uploads"
+#: plugins/shutdown/shutdownplugin.cpp:170 plugins/shutdown/shutdowndlg.cpp:38
+msgid "Lock"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:104
-msgid "Not Running Uploads"
+#: plugins/shutdown/shutdownplugin.cpp:174 plugins/shutdown/shutdowndlg.cpp:42
+#: plugins/shutdown/shutdowndlg.cpp:52
+msgid "Standby"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:108
-msgid "Downloads"
-msgstr "Lawrlwythiadau"
+#: plugins/shutdown/shutdownplugin.cpp:178 plugins/shutdown/shutdowndlg.cpp:45
+#: plugins/shutdown/shutdowndlg.cpp:55
+msgid "Sleep (suspend to RAM)"
+msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:110
-msgid "Running Downloads"
+#: plugins/shutdown/shutdownplugin.cpp:182 plugins/shutdown/shutdowndlg.cpp:48
+#: plugins/shutdown/shutdowndlg.cpp:58
+msgid "Hibernate (suspend to disk)"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:112
-msgid "Not Running Downloads"
+#: plugins/shutdown/shutdowntorrentmodel.cpp:92
+#: plugins/shutdown/shutdowntorrentmodel.cpp:235
+msgid "Downloading finishes"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:116
-msgid "Active Torrents"
+#: plugins/shutdown/shutdowntorrentmodel.cpp:94
+#: plugins/shutdown/shutdowntorrentmodel.cpp:236
+msgid "Seeding finishes"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:118
-msgid "Active Downloads"
+#: plugins/shutdown/shutdowntorrentmodel.cpp:153
+#: plugins/syndication/feedwidgetmodel.cpp:84
+#: ktorrent/dialogs/speedlimitsmodel.cpp:110
+msgid "Torrent"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:120
-msgid "Active Uploads"
+#: plugins/shutdown/shutdowntorrentmodel.cpp:154
+msgid "Event"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:122
-msgid "Passive Torrents"
+#: plugins/shutdown/shutdowndlg.cpp:34
+msgctxt "@title:window"
+msgid "Configure Shutdown"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:124
-msgid "Passive Downloads"
+#: plugins/shutdown/shutdowndlg.cpp:60
+msgid "When all torrents finish downloading"
 msgstr ""
 
-#: libktcore/groups/groupmanager.cpp:126
-msgid "Passive Uploads"
+#: plugins/shutdown/shutdowndlg.cpp:61
+msgid "When all torrents finish seeding"
 msgstr ""
 
-#: libktcore/util/mmapfile.cpp:164
-msgid "Cannot write beyond end of the mmap buffer."
+#: plugins/shutdown/shutdowndlg.cpp:62
+msgid "When the events below happen"
 msgstr ""
 
-#: ktorrent/core.cpp:178
-#, kde-format
-msgid ""
-"KTorrent is unable to accept connections because the TCP ports %1 is already "
-"in use by another program."
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_x2)
+#: plugins/magnetgenerator/magnetgeneratorprefwidget.cpp:35 rc.cpp:103
+#: rc.cpp:103
+msgid "Magnet Generator"
 msgstr ""
 
-#: ktorrent/core.cpp:192
-#, kde-format
-msgid ""
-"KTorrent is unable to accept connections because the UDP port %1 is already "
-"in use by another program."
+#: plugins/magnetgenerator/magnetgeneratorplugin.cpp:49
+msgid "Copy Magnet URI"
 msgstr ""
 
-#: ktorrent/core.cpp:305
-#, kde-format
-msgid ""
-"Opening the torrent <b>%1</b>, would share one or more files with the "
-"following torrents. .Torrents are not allowed to write to the same files. "
+#: plugins/magnetgenerator/magnetgeneratorplugin.cpp:143
+#: ktorrent/torrentactivity.cpp:85
+msgid "Magnet"
 msgstr ""
 
-#: ktorrent/core.cpp:1022
-msgid "KTorrent is running one or more torrents"
+#: plugins/magnetgenerator/magnetgeneratorplugin.cpp:143
+msgid "Magnet link copied to clipboard"
 msgstr ""
 
-#: ktorrent/core.cpp:1109
-#, kde-format
-msgid "Cannot create torrent: %1"
+#: plugins/scanfolder/scanfolderplugin.cpp:62
+#: plugins/scanfolder/scanfolderplugin.cpp:71
+#: plugins/scanfolder/scanfolderprefpage.cpp:37
+msgctxt "plugin name"
+msgid "Scan Folder"
 msgstr ""
 
-#: ktorrent/core.cpp:1212
-#, kde-format
-msgid ""
-"Several data files of the torrent \"%1\" are missing. \n"
-"Do you want to recreate them, or do you want to not download them?"
+#: plugins/scanfolder/scanfolder.cpp:73 plugins/scanfolder/scanfolder.cpp:74
+#: plugins/scanfolder/scanfolder.cpp:92 plugins/scanfolder/scanfolder.cpp:202
+#: plugins/scanfolder/scanfolder.cpp:240 plugins/scanfolder/scanfolder.cpp:241
+msgid "loaded"
+msgstr "wedi'i lwytho"
+
+#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:4
+#. i18n: ectx: ToolBar (ScriptingToolbar)
+#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:15
+#. i18n: ectx: Menu (ScriptingMenu)
+#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:4
+#. i18n: ectx: ToolBar (ScriptingToolbar)
+#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:15
+#. i18n: ectx: Menu (ScriptingMenu)
+#: plugins/scripting/scriptingplugin.cpp:75
+#: plugins/scripting/scriptingplugin.cpp:96 rc.cpp:217 rc.cpp:220 rc.cpp:217
+#: rc.cpp:220
+msgid "Scripting"
 msgstr ""
 
-#: ktorrent/core.cpp:1221 ktorrent/core.cpp:1232 ktorrent/core.cpp:1245
-msgid "Data files are missing"
+#: plugins/scripting/scriptingplugin.cpp:184
+msgid "KTorrent Script Packages"
 msgstr ""
 
-#: ktorrent/core.cpp:1231
-#, kde-format
-msgid "Cannot deselect missing files: %1"
+#: plugins/scripting/scriptingplugin.cpp:185
+#: plugins/scripting/scriptmanager.cpp:43
+msgid "Scripts"
 msgstr ""
 
-#: ktorrent/core.cpp:1244
-#, kde-format
-msgid "Cannot recreate missing files: %1"
+#: plugins/scripting/scriptingplugin.cpp:186
+#: plugins/bwscheduler/scheduleeditor.cpp:142
+#: libktcore/interfaces/functions.cpp:188
+msgid "All files"
+msgstr "Pob Ffeil"
+
+#: plugins/scripting/scriptingplugin.cpp:245
+msgid ""
+"Removing these scripts will fully delete them from your disk. Are you sure "
+"you want to do this?"
 msgstr ""
 
-#: ktorrent/core.cpp:1255
+#: plugins/scripting/scriptmanager.cpp:47
+msgid "Widget to start, stop and manage scripts"
+msgstr ""
+
+#: plugins/scripting/scriptmanager.cpp:90
+msgid "Add Script"
+msgstr ""
+
+#: plugins/scripting/scriptmanager.cpp:94
+msgid "Remove Script"
+msgstr ""
+
+#: plugins/scripting/scriptmanager.cpp:98
+msgid "Run Script"
+msgstr ""
+
+#: plugins/scripting/scriptmanager.cpp:102
+msgid "Stop Script"
+msgstr ""
+
+#: plugins/scripting/scriptmanager.cpp:106
+msgid "Edit Script"
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, PropertiesExtender)
+#: plugins/scripting/scriptmanager.cpp:110 rc.cpp:1917 rc.cpp:1917
+msgid "Properties"
+msgstr ""
+
+#: plugins/scripting/scriptmanager.cpp:114
+msgid "Configure"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scriptproperties.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ScriptProperties)
+#: plugins/scripting/scriptmanager.cpp:229 rc.cpp:223 rc.cpp:223
+msgid "Script Properties"
+msgstr ""
+
+#: plugins/scripting/scriptmodel.cpp:112
+msgid "Cannot open archive for reading."
+msgstr ""
+
+#: plugins/scripting/scriptmodel.cpp:116
+msgid "Invalid archive."
+msgstr ""
+
+#: plugins/scripting/scriptmodel.cpp:143
 #, kde-format
+msgid "There is already a script package named %1 installed."
+msgstr ""
+
+#: plugins/scripting/scriptmodel.cpp:149
 msgid ""
-"The file where the data is saved of the torrent \"%1\" is missing.\n"
-"Do you want to recreate it?"
+"Failed to load script from archive. There is something wrong with the "
+"desktop file."
 msgstr ""
 
-#: ktorrent/core.cpp:1262 ktorrent/core.cpp:1272
-msgid "Data file is missing"
+#: plugins/scripting/scriptmodel.cpp:154
+msgid "No script found in archive."
 msgstr ""
 
-#: ktorrent/core.cpp:1271
+#: plugins/scripting/scriptmodel.cpp:178 plugins/syndication/feedlist.cpp:185
 #, kde-format
-msgid "Cannot recreate data file: %1"
+msgid "<b>%1</b><br/><br/>%2"
 msgstr ""
 
-#: ktorrent/core.cpp:1359
+#: plugins/upnp/routermodel.cpp:69
+msgid "Device"
+msgstr "Dyfais"
+
+#: plugins/upnp/routermodel.cpp:70
+msgid "Port Forwarded"
+msgstr ""
+
+#: plugins/upnp/routermodel.cpp:71
+msgid "WAN Connection"
+msgstr ""
+
+#: plugins/upnp/routermodel.cpp:115
 #, kde-format
 msgid ""
-"KTorrent has found a torrent from the KDE3 version of KTorrent, do you want "
-"to import it?"
-msgid_plural ""
-"KTorrent has found %1 torrents from the KDE3 version of KTorrent, do you "
-"want to import them?"
-msgstr[0] ""
-msgstr[1] ""
+"Model Name: <b>%1</b><br/>Manufacturer: <b>%2</b><br/>Model Description: "
+"<b>%3</b><br/>"
+msgstr ""
 
-#: ktorrent/core.cpp:1381
-msgid "No torrents from the KDE3 version were found."
+#. i18n: file: plugins/upnp/upnpwidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, UPnPWidget)
+#: plugins/upnp/upnpplugin.cpp:56 plugins/upnp/upnpplugin.cpp:60
+#: plugins/upnp/upnpplugin.cpp:71 rc.cpp:304 rc.cpp:304
+msgid "UPnP"
 msgstr ""
 
-#: ktorrent/core.cpp:1413 ktorrent/core.cpp:1432
+#: plugins/upnp/upnpplugin.cpp:61
+msgid "Shows the status of the UPnP plugin"
+msgstr ""
+
+#: plugins/syndication/feedwidgetmodel.cpp:82
+#: plugins/mediaplayer/playlist.cpp:91
+msgid "Title"
+msgstr ""
+
+#: plugins/syndication/feedwidgetmodel.cpp:83
+msgid "Date Published"
+msgstr ""
+
+#: plugins/syndication/syndicationactivity.cpp:48
+#: plugins/syndication/syndicationplugin.cpp:42
+#: plugins/syndication/syndicationplugin.cpp:47
+msgid "Syndication"
+msgstr ""
+
+#: plugins/syndication/syndicationactivity.cpp:54
+msgid "Manages RSS and Atom feeds"
+msgstr ""
+
+#: plugins/syndication/syndicationactivity.cpp:131
+msgid "Enter the URL"
+msgstr ""
+
+#: plugins/syndication/syndicationactivity.cpp:131
+msgid "Please enter the URL of the RSS or Atom feed."
+msgstr ""
+
+#: plugins/syndication/syndicationactivity.cpp:156
 #, kde-format
-msgid "Invalid magnet bittorrent link: %1"
+msgid "Failed to load feed %1."
 msgstr ""
 
-#: ktorrent/core.cpp:1418 ktorrent/core.cpp:1437
-msgid ""
-"You are attempting to download a magnet link, and DHT is not enabled. For "
-"optimum results enable DHT."
+#: plugins/syndication/syndicationactivity.cpp:172
+#, kde-format
+msgid "Failed to create directory for feed %1: %2"
 msgstr ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:97
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:127
+#. i18n: ectx: property (text), widget (QPushButton, m_new_filter)
+#: plugins/syndication/syndicationactivity.cpp:280 rc.cpp:494 rc.cpp:494
+msgid "New Filter"
+msgstr ""
+
+#: plugins/syndication/syndicationactivity.cpp:282
+msgid "Add New Filter"
+msgstr ""
+
+#: plugins/syndication/feedlist.cpp:175
 #, kde-format
-msgid "Importing 1 torrent ..."
-msgid_plural "Importing %1 torrents ..."
+msgid ""
+"%2\n"
+"1 active filter"
+msgid_plural ""
+"%2\n"
+"%1 active filters"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:105
+#: plugins/syndication/feedlist.cpp:183
 #, kde-format
-msgid "Importing <b>%1</b> ..."
+msgid "<b>%1</b><br/><br/>Download failed: <b>%2</b>"
 msgstr ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:110
-msgid "Finished import."
+#: plugins/syndication/feedwidget.cpp:107
+msgid "Authentication Cookie"
 msgstr ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:145
-#, kde-format
-msgid "Torrent <b>%1</b> already loaded."
+#: plugins/syndication/feedwidget.cpp:107
+msgid "Enter the new authentication cookie"
 msgstr ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:152
-#, kde-format
-msgid "Failed to load <b>%1</b>"
+#: plugins/syndication/feedwidget.cpp:126
+msgid "<b>OK</b>"
 msgstr ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:160
+#: plugins/syndication/feedwidget.cpp:129
+msgid "<b>Not Loaded</b>"
+msgstr ""
+
+#: plugins/syndication/feedwidget.cpp:132
 #, kde-format
-msgid "Failed to import <b>%1</b>: %2"
+msgid "<b>Download Failed: %1</b>"
 msgstr ""
 
-#: ktorrent/dialogs/torrentmigratordlg.cpp:164
+#: plugins/syndication/feedwidget.cpp:135
+msgid "<b>Downloading</b>"
+msgstr ""
+
+#: plugins/syndication/linkdownloader.cpp:169
 #, kde-format
-msgid "Imported <b>%1</b>"
+msgid "Could not find a valid link to a torrent on %1"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:83
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_rate)
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:106
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:94
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_download_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:114
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_upload_rate)
-#. i18n: file: ktorrent/pref/networkpref.ui:134
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxDownloadRate)
-#. i18n: file: ktorrent/pref/networkpref.ui:157
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxUploadRate)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:133
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_avg_speed_slot)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:55
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverUploadLimit)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:84
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverDownloadLimit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:118
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:138
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:169
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:189
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:143
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:163
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:194
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:214
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:83
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_rate)
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:106
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:94
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_download_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:114
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_upload_rate)
-#. i18n: file: ktorrent/pref/networkpref.ui:134
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxDownloadRate)
-#. i18n: file: ktorrent/pref/networkpref.ui:157
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxUploadRate)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:133
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_avg_speed_slot)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:55
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverUploadLimit)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:84
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverDownloadLimit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:118
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:138
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:169
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:189
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:143
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:163
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:194
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:214
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
-#: ktorrent/dialogs/spinboxdelegate.cpp:39
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:312
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:315
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:319
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:322
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:284
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:287
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:291
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:294
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:193
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:199
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:146
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:149
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:202
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:205
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:315
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:321
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:326 rc.cpp:184
-#: rc.cpp:193 rc.cpp:594 rc.cpp:603 rc.cpp:1023 rc.cpp:1035 rc.cpp:1438
-#: rc.cpp:1781 rc.cpp:1793 rc.cpp:1856 rc.cpp:1865 rc.cpp:1877 rc.cpp:1886
-#: rc.cpp:1949 rc.cpp:1958 rc.cpp:1970 rc.cpp:1979 rc.cpp:184 rc.cpp:193
-#: rc.cpp:594 rc.cpp:603 rc.cpp:1023 rc.cpp:1035 rc.cpp:1438 rc.cpp:1781
-#: rc.cpp:1793 rc.cpp:1856 rc.cpp:1865 rc.cpp:1877 rc.cpp:1886 rc.cpp:1949
-#: rc.cpp:1958 rc.cpp:1970 rc.cpp:1979
-msgid " KiB/s"
-msgstr ""
-
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:80
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_rate)
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:103
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:91
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_download_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:111
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_upload_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:131
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_seed_time)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:154
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_share_ratio)
-#. i18n: file: ktorrent/pref/qmpref.ui:45
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxDownloads)
-#. i18n: file: ktorrent/pref/qmpref.ui:65
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxSeeds)
-#. i18n: file: ktorrent/pref/qmpref.ui:249
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxRatio)
-#. i18n: file: ktorrent/pref/qmpref.ui:272
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxSeedTime)
-#. i18n: file: ktorrent/pref/qmpref.ui:301
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_greenRatio)
-#. i18n: file: ktorrent/pref/networkpref.ui:91
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxConnections)
-#. i18n: file: ktorrent/pref/networkpref.ui:111
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxTotalConnections)
-#. i18n: file: ktorrent/pref/networkpref.ui:131
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxDownloadRate)
-#. i18n: file: ktorrent/pref/networkpref.ui:154
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxUploadRate)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:52
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverUploadLimit)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:81
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverDownloadLimit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:115
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:135
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:166
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:186
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:226
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:243
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:140
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:160
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:191
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:211
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:266
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:283
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
-#. i18n: file: plugins/infowidget/statustab.ui:289
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, ratio_limit)
-#. i18n: file: plugins/infowidget/statustab.ui:315
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, time_limit)
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:80
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_rate)
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:103
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:91
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_download_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:111
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_upload_rate)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:131
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_seed_time)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:154
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_share_ratio)
-#. i18n: file: ktorrent/pref/qmpref.ui:45
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxDownloads)
-#. i18n: file: ktorrent/pref/qmpref.ui:65
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxSeeds)
-#. i18n: file: ktorrent/pref/qmpref.ui:249
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxRatio)
-#. i18n: file: ktorrent/pref/qmpref.ui:272
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxSeedTime)
-#. i18n: file: ktorrent/pref/qmpref.ui:301
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_greenRatio)
-#. i18n: file: ktorrent/pref/networkpref.ui:91
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxConnections)
-#. i18n: file: ktorrent/pref/networkpref.ui:111
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxTotalConnections)
-#. i18n: file: ktorrent/pref/networkpref.ui:131
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxDownloadRate)
-#. i18n: file: ktorrent/pref/networkpref.ui:154
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxUploadRate)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:52
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverUploadLimit)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:81
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverDownloadLimit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:115
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:135
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:166
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:186
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:226
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:243
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:140
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:160
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:191
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:211
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:266
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:283
-#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
-#. i18n: file: plugins/infowidget/statustab.ui:289
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, ratio_limit)
-#. i18n: file: plugins/infowidget/statustab.ui:315
-#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, time_limit)
-#: ktorrent/dialogs/spinboxdelegate.cpp:41
-#: ktorrent/dialogs/speedlimitsmodel.cpp:138
-#: ktorrent/dialogs/speedlimitsmodel.cpp:143
-#: plugins/infowidget/statustab.cpp:66
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:294
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:296
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:311
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:314
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:318
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:321
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:326
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:328
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:283
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:286
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:290
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:293
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:298
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:300
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:192
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:198
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:145
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:148
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:201
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:204
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:207
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:210
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:252
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:257
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:310
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:315
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:323
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:304
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:309
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:314
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:320 rc.cpp:181 rc.cpp:190
-#: rc.cpp:591 rc.cpp:600 rc.cpp:609 rc.cpp:618 rc.cpp:740 rc.cpp:749
-#: rc.cpp:824 rc.cpp:833 rc.cpp:845 rc.cpp:1002 rc.cpp:1011 rc.cpp:1020
-#: rc.cpp:1032 rc.cpp:1778 rc.cpp:1790 rc.cpp:1853 rc.cpp:1862 rc.cpp:1874
-#: rc.cpp:1883 rc.cpp:1898 rc.cpp:1904 rc.cpp:1946 rc.cpp:1955 rc.cpp:1967
-#: rc.cpp:1976 rc.cpp:1991 rc.cpp:1997 rc.cpp:2413 rc.cpp:2419 rc.cpp:181
-#: rc.cpp:190 rc.cpp:591 rc.cpp:600 rc.cpp:609 rc.cpp:618 rc.cpp:740
-#: rc.cpp:749 rc.cpp:824 rc.cpp:833 rc.cpp:845 rc.cpp:1002 rc.cpp:1011
-#: rc.cpp:1020 rc.cpp:1032 rc.cpp:1778 rc.cpp:1790 rc.cpp:1853 rc.cpp:1862
-#: rc.cpp:1874 rc.cpp:1883 rc.cpp:1898 rc.cpp:1904 rc.cpp:1946 rc.cpp:1955
-#: rc.cpp:1967 rc.cpp:1976 rc.cpp:1991 rc.cpp:1997 rc.cpp:2413 rc.cpp:2419
-msgid "No limit"
-msgstr ""
-
-#: ktorrent/dialogs/spinboxdelegate.cpp:43
-#: ktorrent/dialogs/speedlimitsmodel.cpp:148
-#: ktorrent/dialogs/speedlimitsmodel.cpp:153
-msgid "No assured speed"
-msgstr ""
-
-#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, PasteDlgBase)
-#: ktorrent/dialogs/pastedialog.cpp:38
-#: obj-i686-linux-gnu/ktorrent/ui_pastedlgbase.h:122 rc.cpp:337 rc.cpp:337
-msgid "Open an URL"
-msgstr ""
-
-#: ktorrent/dialogs/pastedialog.cpp:105
-#: ktorrent/dialogs/torrentcreatordlg.cpp:251 ktorrent/gui.cpp:341
-#, kde-format
-msgid "Invalid URL: %1"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:84
-msgid "Show a file tree"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:87
-msgid "Show a file list"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:96 plugins/infowidget/fileview.cpp:70
-msgid "Filter"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:113
-#, kde-format
-msgid "Opening %1"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:224
-msgid ""
-"Some files of this torrent have been found in the completed downloads "
-"directory. Do you want to import these files and use the completed downloads "
-"directory as the location?"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:227
-msgid ""
-"All files of this torrent have been found in the completed downloads "
-"directory. Do you want to import these files and use the completed downloads "
-"directory as the location?"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:231
-#, kde-format
-msgid ""
-"The file <b>%1</b> was found in the completed downloads directory. Do you "
-"want to import this file?"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:246
-#: ktorrent/dialogs/fileselectdlg.cpp:263
-#, kde-format
-msgid "The directory %1 does not exist, do you want to create it?"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:296
-msgid ""
-"You have deselected the following existing files. You will lose all data in "
-"these files, are you sure you want to do this?"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:300
-msgid "Yes, delete the files"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:301
-msgid "No, keep the files"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:326
-#, kde-format
-msgid ""
-"Opening the torrent <b>%1</b>, would share one or more files with the "
-"following torrents. Torrents are not allowed to write to the same files. "
-"Please select a different location."
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:499
-msgid "<b>Unable to determine free space</b>"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:511
-#, kde-format
-msgctxt "We are %1 bytes short of what we need"
-msgid "%1 short"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:532
-msgid "Existing files: <b>None</b>"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:534
-msgid "Existing files: <b>All</b>"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:536
-#, kde-format
-msgid "Existing files: <b>%1</b> of <b>%2</b>"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:542
-msgid "Existing file: <b>No</b>"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:544
-msgid "Existing file: <b>Yes</b>"
-msgstr ""
-
-#: ktorrent/dialogs/fileselectdlg.cpp:616
-msgid "Clear History"
-msgstr ""
-
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, SpeedLimitsDlg)
-#: ktorrent/dialogs/speedlimitsdlg.cpp:50 ktorrent/view/viewmanager.cpp:686
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:140 rc.cpp:166 rc.cpp:166
-msgid "Speed Limits"
-msgstr ""
-
-#: ktorrent/dialogs/torrentcreatordlg.cpp:44
-msgid "Create A Torrent"
-msgstr ""
-
-#: ktorrent/dialogs/torrentcreatordlg.cpp:257
-msgid "Only HTTP is supported for webseeding."
-msgstr ""
-
-#: ktorrent/dialogs/torrentcreatordlg.cpp:289
-msgid "You must select a file or a folder."
-msgstr ""
-
-#: ktorrent/dialogs/torrentcreatordlg.cpp:295
-msgid ""
-"You have not added a tracker, are you sure you want to create this torrent?"
-msgstr ""
-
-#: ktorrent/dialogs/torrentcreatordlg.cpp:303
-msgid "You must add at least one node."
-msgstr ""
-
-#: ktorrent/dialogs/torrentcreatordlg.cpp:369
-msgid "Choose a file to save the torrent"
-msgstr ""
-
-#: ktorrent/dialogs/speedlimitsmodel.cpp:110
-#: plugins/shutdown/shutdowntorrentmodel.cpp:153
-#: plugins/syndication/feedwidgetmodel.cpp:84
-msgid "Torrent"
-msgstr ""
-
-#: ktorrent/dialogs/speedlimitsmodel.cpp:111
-msgid "Download Limit"
-msgstr ""
-
-#: ktorrent/dialogs/speedlimitsmodel.cpp:112
-msgid "Upload Limit"
-msgstr ""
-
-#: ktorrent/dialogs/speedlimitsmodel.cpp:113
-msgid "Assured Download Speed"
-msgstr ""
-
-#: ktorrent/dialogs/speedlimitsmodel.cpp:114
-msgid "Assured Upload Speed"
-msgstr ""
-
-#: ktorrent/dialogs/importdialog.cpp:225 ktorrent/dialogs/importdialog.cpp:257
-#, kde-format
-msgid "Cannot load the torrent file: %1"
-msgstr ""
-
-#: ktorrent/dialogs/importdialog.cpp:285
-#: plugins/search/searchenginelist.cpp:192
-#: plugins/ipfilter/convertthread.cpp:67
-#: plugins/ipfilter/convertthread.cpp:167
-#, kde-format
-msgid "Cannot open %1: %2"
-msgstr ""
-
-#: ktorrent/dialogs/importdialog.cpp:394 ktorrent/dialogs/importdialog.cpp:411
-#, kde-format
-msgid "Failed to create %1: %2"
-msgstr ""
-
-#: ktorrent/dialogs/missingfilesdlg.cpp:72
-#: ktorrent/dialogs/missingfilesdlg.cpp:105
-msgid "Select the directory where the data now is."
-msgstr ""
-
-#: ktorrent/dialogs/missingfilesdlg.cpp:83
-msgid ""
-"The data files are not present in the location you selected. Do you want to "
-"create all the files in the selected directory?"
-msgstr ""
-
-#: ktorrent/dialogs/missingfilesdlg.cpp:85
-msgid ""
-"Not all files were found in the new location; some are still missing. Do you "
-"want to create the missing files in the selected directory?"
-msgstr ""
-
-#: ktorrent/dialogs/missingfilesdlg.cpp:114
-msgid ""
-"The data file is not present in the location you selected. Do you want to "
-"create the file in the selected directory?"
-msgstr ""
-
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, QueueManagerWidget)
-#. i18n: file: ktorrent/pref/qmpref.ui:27
-#. i18n: ectx: property (title), widget (QGroupBox, m_qm_group_box)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:266
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, QueueManagerWidget)
-#. i18n: file: ktorrent/pref/qmpref.ui:27
-#. i18n: ectx: property (title), widget (QGroupBox, m_qm_group_box)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:266
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: ktorrent/torrentactivity.cpp:82 ktorrent/pref/qmpref.cpp:25
-#: obj-i686-linux-gnu/ktorrent/ui_queuemanagerwidget.h:113
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:247
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:339 rc.cpp:518
-#: rc.cpp:731 rc.cpp:1465 rc.cpp:518 rc.cpp:731 rc.cpp:1465
-msgid "Queue Manager"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:82
-msgid "Widget to manage the torrent queue"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:85
-#: plugins/magnetgenerator/magnetgeneratorplugin.cpp:143
-msgid "Magnet"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:86
-msgid "Displays the currently downloading magnet links"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:110
-msgid "Start All"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:111
-msgid "Start all torrents"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:115
-msgid "Stop All"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:116
-msgid "Stop all torrents"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:120
-msgid "Suspend Torrents"
-msgstr ""
-
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:124
-#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:124
-#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
-#: ktorrent/torrentactivity.cpp:122
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:309
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:281 rc.cpp:1847
-#: rc.cpp:1940 rc.cpp:1847 rc.cpp:1940
-msgid "Suspend all running torrents"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:127
-msgid "Group View Visible"
-msgstr ""
-
-#: ktorrent/torrentactivity.cpp:128
-msgid "Show or hide the group view"
-msgstr ""
-
-#: ktorrent/ipfilterwidget.cpp:53
-msgid "IP Filter List"
-msgstr ""
-
-#: ktorrent/ipfilterwidget.cpp:103
-#, kde-format
-msgid ""
-"Invalid IP address <b>%1</b>. IP addresses must be in the format "
-"'XXX.XXX.XXX.XXX'.<br/><br/>You can also use wildcards like '127.0.0.*' or "
-"specify ranges like '200.10.10.0-200.10.10.40'."
-msgstr ""
-
-#: ktorrent/ipfilterwidget.cpp:135
-msgid "Choose a file"
-msgstr "Dewiswch ffeil"
-
-#: ktorrent/ipfilterwidget.cpp:147
-msgid "Choose a filename to save under"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/advancedpref.ui:174
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
-#: ktorrent/main.cpp:94 plugins/search/webview.cpp:158
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:243 rc.cpp:914 rc.cpp:914
-msgid "KTorrent"
-msgstr "KTorrent"
-
-#: ktorrent/main.cpp:95
-msgid "Bittorrent client for KDE"
-msgstr ""
-
-#: ktorrent/main.cpp:97
-msgid "(C) 2005 - 2010 Joris Guisson and Ivan Vasic"
-msgstr ""
-
-#: ktorrent/main.cpp:101
-msgid "Joris Guisson"
-msgstr ""
-
-#: ktorrent/main.cpp:102
-msgid "Ivan Vasic"
-msgstr ""
-
-#: ktorrent/main.cpp:103
-msgid "Alan Jones"
-msgstr ""
-
-#: ktorrent/main.cpp:103
-msgid "BitFinder Plugin"
-msgstr ""
-
-#: ktorrent/main.cpp:104
-msgid "Diego R. Brogna"
-msgstr ""
-
-#: ktorrent/main.cpp:104
-msgid "Webinterface Plugin"
-msgstr ""
-
-#: ktorrent/main.cpp:105
-msgid "Krzysztof Kundzicz"
-msgstr ""
-
-#: ktorrent/main.cpp:105
-msgid "Statistics Plugin"
-msgstr ""
-
-#: ktorrent/main.cpp:106
-msgid "Christian Weilbach"
-msgstr ""
-
-#: ktorrent/main.cpp:106
-msgid "kio-magnet"
-msgstr ""
-
-#: ktorrent/main.cpp:108
-msgid "Mladen Babic"
-msgstr ""
-
-#: ktorrent/main.cpp:108
-msgid "Application icon and a couple of others"
-msgstr ""
-
-#: ktorrent/main.cpp:109
-msgid "Adam Treat"
-msgstr ""
-
-#: ktorrent/main.cpp:110
-msgid "Danny Allen"
-msgstr ""
-
-#: ktorrent/main.cpp:110
-msgid "1.0 application icon"
-msgstr ""
-
-#: ktorrent/main.cpp:111
-msgid "Vincent Wagelaar"
-msgstr ""
-
-#: ktorrent/main.cpp:112
-msgid "Knut Morten Johansson"
-msgstr ""
-
-#: ktorrent/main.cpp:113
-msgid "Felix Berger"
-msgstr ""
-
-#: ktorrent/main.cpp:113
-msgid "ChunkBar's tooltip and IWFileTreeItem sorting"
-msgstr ""
-
-#: ktorrent/main.cpp:114
-msgid "Andreas Kling"
-msgstr ""
-
-#: ktorrent/main.cpp:115
-msgid "Felipe Sateler"
+#: plugins/syndication/syndicationplugin.cpp:86
+msgid "Add Feed"
 msgstr ""
 
-#: ktorrent/main.cpp:116
-msgid "Maxmind"
+#: plugins/syndication/syndicationplugin.cpp:89
+msgid "Remove Feed"
 msgstr ""
 
-#: ktorrent/main.cpp:116
-msgid ""
-"Country locator for InfoWidget plugin. Flags are taken from "
-"http://flags.blogpotato.de/ so thanks to them too."
+#: plugins/syndication/syndicationplugin.cpp:92
+msgid "Show Feed"
 msgstr ""
 
-#: ktorrent/main.cpp:117
-msgid "Adam Forsyth"
+#: plugins/syndication/syndicationplugin.cpp:95
+#: plugins/syndication/managefiltersdlg.cpp:33
+msgid "Add/Remove Filters"
 msgstr ""
 
-#: ktorrent/main.cpp:117
-msgid "File prioritization and some other patches"
+#: plugins/syndication/syndicationplugin.cpp:98
+msgid "Rename"
 msgstr ""
 
-#: ktorrent/main.cpp:118
-msgid "Thomas Bernard"
+#: plugins/syndication/syndicationplugin.cpp:101
+msgid "Add Filter"
 msgstr ""
 
-#: ktorrent/main.cpp:118
-msgid "Miniupnp was used as an example for our own UPnP implementation"
+#: plugins/syndication/syndicationplugin.cpp:104
+msgid "Remove Filter"
 msgstr ""
 
-#: ktorrent/main.cpp:119
-msgid "Diego Rosario Brogna"
+#: plugins/syndication/syndicationplugin.cpp:107
+#: plugins/syndication/filtereditor.cpp:39
+msgid "Edit Filter"
 msgstr ""
 
-#: ktorrent/main.cpp:119
-msgid "Global max share ratio patch"
+#: plugins/syndication/filtereditor.cpp:233
+#, kde-format
+msgid "There already is a filter named %1, filter names must be unique."
 msgstr ""
 
-#: ktorrent/main.cpp:120
-msgid "Lesly Weyts"
+#: plugins/syndication/managefiltersdlg.cpp:35
+#, kde-format
+msgid "Feed: <b>%1</b>"
 msgstr ""
 
-#: ktorrent/main.cpp:120 ktorrent/main.cpp:121
-msgid "Zeroconf enhancements"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:48
+#: plugins/mediaplayer/mediaplayeractivity.cpp:157
+#: plugins/mediaplayer/mediaplayeractivity.cpp:369
+#: plugins/mediaplayer/mediaplayerplugin.cpp:49
+#: plugins/mediaplayer/mediaplayerplugin.cpp:61
+msgid "Media Player"
 msgstr ""
 
-#: ktorrent/main.cpp:121
-msgid "Kevin Andre"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:75
+msgid "Play List"
 msgstr ""
 
-#: ktorrent/main.cpp:122
-msgid "Dagur Valberg Johannsson"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:99
+#: plugins/mediaplayer/videowidget.cpp:68
+msgid "Play"
 msgstr ""
 
-#: ktorrent/main.cpp:122
-msgid "Coldmilk webgui"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:103
+msgid "Pause"
 msgstr ""
 
-#: ktorrent/main.cpp:123
-msgid "Alexander Dymo"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:107
+#: plugins/mediaplayer/videowidget.cpp:71
+msgid "Stop"
 msgstr ""
 
-#: ktorrent/main.cpp:123
-msgid "IDEAl code from KDevelop"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:111
+msgid "Previous"
 msgstr ""
 
-#: ktorrent/main.cpp:124
-msgid "Scott Wolchok"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:115
+msgid "Next"
 msgstr ""
 
-#: ktorrent/main.cpp:124
-msgid "Conversion speed improvement in ipfilter plugin"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:119
+msgid "Show Video"
 msgstr ""
 
-#: ktorrent/main.cpp:125
-msgid "Bryan Burns of Juniper Networks"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:123
+#: plugins/mediaplayer/playlistwidget.cpp:109
+msgid "Add Media"
 msgstr ""
 
-#: ktorrent/main.cpp:125
-msgid "Discovered 2 security vulnerabilities (both are fixed)"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:127
+#: plugins/mediaplayer/playlistwidget.cpp:110
+msgid "Clear Playlist"
 msgstr ""
 
-#: ktorrent/main.cpp:126
-msgid "Goten Xiao"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:131
+msgid "Toggle Fullscreen"
 msgstr ""
 
-#: ktorrent/main.cpp:126
-msgid "Patch to load silently with a save location"
+#: plugins/mediaplayer/mediaplayeractivity.cpp:171
+#: plugins/mediaplayer/mediaplayeractivity.cpp:372
+msgid "Movie player"
 msgstr ""
 
-#: ktorrent/main.cpp:127
-msgid "Rapsys"
+#: plugins/mediaplayer/playlistwidget.cpp:71
+#: plugins/mediaplayer/playlistwidget.cpp:164
+msgid "Ready to play"
 msgstr ""
 
-#: ktorrent/main.cpp:127
-msgid "Fixes in PHP code of webinterface"
+#: plugins/mediaplayer/playlistwidget.cpp:85
+msgid "Mode:"
 msgstr ""
 
-#: ktorrent/main.cpp:128
-msgid "Athantor"
+#: plugins/mediaplayer/playlistwidget.cpp:87
+msgid "Single File"
 msgstr ""
 
-#: ktorrent/main.cpp:128
-msgid "XFS specific disk preallocation"
+#: plugins/mediaplayer/playlistwidget.cpp:88
+msgid "Playlist"
 msgstr ""
 
-#: ktorrent/main.cpp:129
-msgid "twisted_fall"
+#: plugins/mediaplayer/playlistwidget.cpp:89
+msgid "Random"
 msgstr ""
 
-#: ktorrent/main.cpp:129
-msgid "Patch to not show very low speeds"
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:67
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:181
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:287
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_node)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:331
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_webseed)
+#. i18n: file: ktorrent/ipfilterwidget.ui:65
+#. i18n: ectx: property (text), widget (KPushButton, m_remove)
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:67
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:181
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:287
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_node)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:331
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_webseed)
+#. i18n: file: ktorrent/ipfilterwidget.ui:65
+#. i18n: ectx: property (text), widget (KPushButton, m_remove)
+#: plugins/mediaplayer/playlistwidget.cpp:107 rc.cpp:485 rc.cpp:1747
+#: rc.cpp:1774 rc.cpp:1783 rc.cpp:1979 rc.cpp:485 rc.cpp:1747 rc.cpp:1774
+#: rc.cpp:1783 rc.cpp:1979
+msgid "Remove"
 msgstr ""
 
-#: ktorrent/main.cpp:130
-msgid "Lucke"
+#: plugins/mediaplayer/playlistwidget.cpp:175
+#: plugins/mediaplayer/playlistwidget.cpp:182
+#: plugins/mediaplayer/playlistwidget.cpp:211
+#, kde-format
+msgid "Playing: <b>%1</b>"
 msgstr ""
 
-#: ktorrent/main.cpp:130
-msgid "Patch to show potentially firewalled status"
+#: plugins/mediaplayer/playlistwidget.cpp:196
+#, kde-format
+msgid "Title: <b>%1</b><br/>Artist: <b>%2</b><br/>Album: <b>%3</b>"
 msgstr ""
 
-#: ktorrent/main.cpp:131
-msgid "Modestas Vainius"
+#: plugins/mediaplayer/playlistwidget.cpp:197
+#: plugins/mediaplayer/playlistwidget.cpp:202
+#: plugins/mediaplayer/playlistwidget.cpp:207
+#, kde-format
+msgid ""
+"Playing: <b>%1</b><br/>\n"
+"%2"
 msgstr ""
 
-#: ktorrent/main.cpp:131
-msgid "Several patches"
+#: plugins/mediaplayer/playlistwidget.cpp:201
+#, kde-format
+msgid "Title: <b>%1</b><br/>Artist: <b>%2</b>"
 msgstr ""
 
-#: ktorrent/main.cpp:132
-msgid "Stefan Monov"
+#: plugins/mediaplayer/playlistwidget.cpp:206
+#, kde-format
+msgid "Title: <b>%1</b>"
 msgstr ""
 
-#: ktorrent/main.cpp:132
-msgid "Patch to hide menu bar"
+#: plugins/mediaplayer/mediaview.cpp:54
+msgid "Search media files"
 msgstr ""
 
-#: ktorrent/main.cpp:133
-msgid "The_Kernel"
-msgstr ""
+#: plugins/mediaplayer/mediamodel.cpp:88
+msgid "Available"
+msgstr "Ar gael"
 
-#: ktorrent/main.cpp:133
-msgid "Patch to change file priorities in the webgui"
+#: plugins/mediaplayer/mediamodel.cpp:88
+msgid "Pending"
 msgstr ""
 
-#: ktorrent/main.cpp:134
-msgid "Rafał Miłecki"
+#: plugins/mediaplayer/mediamodel.cpp:89
+#, kde-format
+msgid "<b>%1</b><br/>Preview: %2<br/>Downloaded: %3 %"
 msgstr ""
 
-#: ktorrent/main.cpp:134
-msgid "Several webgui patches"
+#: plugins/mediaplayer/playlist.cpp:92
+msgid "Artist"
 msgstr ""
 
-#: ktorrent/main.cpp:135
-msgid "Ozzi"
+#: plugins/mediaplayer/playlist.cpp:93
+msgid "Album"
 msgstr ""
 
-#: ktorrent/main.cpp:135
-msgid "Fixes for several warnings"
+#: plugins/mediaplayer/playlist.cpp:94
+msgid "Length"
 msgstr ""
 
-#: ktorrent/main.cpp:136
-msgid "Markus Brueffer"
+#: plugins/mediaplayer/playlist.cpp:95
+msgid "Year"
 msgstr ""
 
-#: ktorrent/main.cpp:136
-msgid "Patch to fix free diskspace calculation on FreeBSD"
+#: plugins/mediaplayer/videowidget.cpp:201
+msgid "KTorrent is playing a video."
 msgstr ""
 
-#: ktorrent/main.cpp:137
-msgid "Lukas Appelhans"
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, EditItemDlg)
+#: plugins/bwscheduler/edititemdlg.cpp:46 rc.cpp:530 rc.cpp:530
+msgid "Edit an item"
 msgstr ""
 
-#: ktorrent/main.cpp:137
-msgid "Patch to fix a crash in ChunkDownloadView"
+#: plugins/bwscheduler/bwschedulerplugin.cpp:87
+#: plugins/bwscheduler/bwschedulerplugin.cpp:119
+#: plugins/bwscheduler/bwprefpage.cpp:27
+#: plugins/infowidget/infowidgetplugin.cpp:96
+msgid "Bandwidth Scheduler"
 msgstr ""
 
-#: ktorrent/main.cpp:138
-msgid "Rickard Närström"
+#. i18n: file: plugins/bwscheduler/ktbwschedulerpluginui.rc:4
+#. i18n: ectx: ToolBar (SchedulerToolbar)
+#: plugins/bwscheduler/scheduleeditor.cpp:42 rc.cpp:771 rc.cpp:771
+msgid "Bandwidth Schedule"
 msgstr ""
 
-#: ktorrent/main.cpp:138
-msgid "A couple of bugfixes"
+#: plugins/bwscheduler/scheduleeditor.cpp:45
+msgid "Edit the bandwidth schedule"
 msgstr ""
 
-#: ktorrent/main.cpp:139
-msgid "caruccio"
+#: plugins/bwscheduler/scheduleeditor.cpp:88
+msgid "Load Schedule"
 msgstr ""
 
-#: ktorrent/main.cpp:139
-msgid "Patch to load torrents silently from the command line"
+#: plugins/bwscheduler/scheduleeditor.cpp:89
+msgid "Save Schedule"
 msgstr ""
 
-#: ktorrent/main.cpp:140
-msgid "Lee Olson"
+#: plugins/bwscheduler/scheduleeditor.cpp:90
+msgid "New Item"
 msgstr ""
 
-#: ktorrent/main.cpp:140
-msgid "New set of icons"
+#: plugins/bwscheduler/scheduleeditor.cpp:91
+msgid "Remove Item"
 msgstr ""
 
-#: ktorrent/main.cpp:141
-msgid "Aaron J. Seigo"
+#: plugins/bwscheduler/scheduleeditor.cpp:92
+msgid "Edit Item"
 msgstr ""
 
-#: ktorrent/main.cpp:141
-msgid "Drag and drop support for Plasma applet"
+#: plugins/bwscheduler/scheduleeditor.cpp:93
+msgid "Clear Schedule"
 msgstr ""
 
-#: ktorrent/main.cpp:142
-msgid "Ian Higginson"
+#: plugins/bwscheduler/scheduleeditor.cpp:96
+msgid "Scheduler Active"
 msgstr ""
 
-#: ktorrent/main.cpp:142
-msgid "Patch to cleanup the plugin list"
+#: plugins/bwscheduler/scheduleeditor.cpp:97
+msgid "Activate or deactivate the scheduler"
 msgstr ""
 
-#: ktorrent/main.cpp:143
-msgid "Amichai Rothman"
+#: plugins/bwscheduler/scheduleeditor.cpp:126
+#: plugins/bwscheduler/scheduleeditor.cpp:142
+msgid "KTorrent scheduler files"
 msgstr ""
 
-#: ktorrent/main.cpp:143
-msgid "Patch to make the Plasma applet a popup applet"
+#: plugins/bwscheduler/scheduleeditor.cpp:189
+msgid ""
+"This item conflicts with another item in the schedule, we cannot change it."
 msgstr ""
 
-#: ktorrent/main.cpp:144
-msgid "Leo Trubach"
+#: plugins/bwscheduler/schedule.cpp:124 plugins/bwscheduler/schedule.cpp:245
+#, kde-format
+msgid "Cannot open file %1: %2"
 msgstr ""
 
-#: ktorrent/main.cpp:144
-msgid "Patch to add support for IP ranges in IP filter dialog"
+#: plugins/bwscheduler/schedule.cpp:140 plugins/bwscheduler/schedule.cpp:146
+#, kde-format
+msgid "The file %1 is corrupted or not a proper KTorrent schedule file."
 msgstr ""
 
-#: ktorrent/main.cpp:145
-msgid "Andrei Barbu"
+#: plugins/bwscheduler/weekscene.cpp:74
+msgid "Current schedule: suspended"
 msgstr ""
 
-#: ktorrent/main.cpp:145
-msgid "Feature which adds the date a torrent was added"
+#: plugins/bwscheduler/weekscene.cpp:76
+#, kde-format
+msgid "Current schedule: %1/s download, %2/s upload"
 msgstr ""
 
-#: ktorrent/main.cpp:147
-msgid "Jonas Lundqvist"
+#: plugins/bwscheduler/weekscene.cpp:79
+#, kde-format
+msgid "Current schedule: unlimited download, %1/s upload"
 msgstr ""
 
-#: ktorrent/main.cpp:147
-msgid "Feature to disable authentication in the webinterface"
+#: plugins/bwscheduler/weekscene.cpp:81
+#, kde-format
+msgid "Current schedule: %1/s download, unlimited upload"
 msgstr ""
 
-#: ktorrent/main.cpp:148
-msgid "Jaroslaw Swierczynski"
+#: plugins/bwscheduler/weekscene.cpp:83
+msgid "Current schedule: unlimited upload and download"
 msgstr ""
 
-#: ktorrent/main.cpp:148
-msgid "Exclusion patterns in the syndication plugin"
+#: plugins/bwscheduler/weekscene.cpp:86
+msgid " (scheduler disabled)"
 msgstr ""
 
-#: ktorrent/main.cpp:149
-msgid "Alexey Shildyakov "
+#: plugins/bwscheduler/weekscene.cpp:107
+msgid "Current schedule:"
 msgstr ""
 
-#: ktorrent/main.cpp:149
-msgid "Patch to rename single file torrents to the file inside"
+#: plugins/bwscheduler/additemdlg.cpp:52
+msgid "Add an item"
 msgstr ""
 
-#: ktorrent/main.cpp:153
-msgid "Silently open torrent given on URL"
+#: plugins/bwscheduler/additemdlg.cpp:78
+msgid "No day has been selected."
 msgstr ""
 
-#: ktorrent/tools/magnetview.cpp:42
-msgid "Start Magnet"
+#: plugins/bwscheduler/additemdlg.cpp:110
+msgid ""
+"Failed to add item, because it conflicts with another item on the schedule."
 msgstr ""
 
-#: ktorrent/tools/magnetview.cpp:43
-msgid "Stop Magnet"
+#: plugins/bwscheduler/additemdlg.cpp:115
+msgid ""
+"This item could not be added to all selected days, because it conflicts with "
+"another item on the schedule."
 msgstr ""
 
-#: ktorrent/tools/magnetview.cpp:45
-msgid "Remove Magnet"
+#: plugins/bwscheduler/schedulegraphicsitem.cpp:78
+msgid "Suspended"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:57 plugins/search/webview.cpp:161
-#: plugins/search/searchactivity.cpp:81 plugins/search/searchtoolbar.cpp:70
-msgid "Search"
-msgstr "Chwilio"
+#: plugins/bwscheduler/schedulegraphicsitem.cpp:83
+#: plugins/bwscheduler/schedulegraphicsitem.cpp:84 ktorrent/trayicon.cpp:360
+msgid "Unlimited"
+msgstr "Heb derfyn"
 
-#: ktorrent/tools/queuemanagerwidget.cpp:66
-msgid "Show Search"
+#: plugins/bwscheduler/schedulegraphicsitem.cpp:85
+#, kde-format
+msgid ""
+"%1 Down\n"
+"%2 Up"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:67
-msgid "Show or hide the search bar"
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, DownloadOrderWidget)
+#: plugins/downloadorder/downloadorderplugin.cpp:46
+#: plugins/downloadorder/downloadorderdialog.cpp:38 rc.cpp:774 rc.cpp:774
+msgid "File Download Order"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:71
-msgid "Move Top"
+#: plugins/downloadorder/downloadorderdialog.cpp:39
+#, kde-format
+msgid "File download order for <b>%1</b>:"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:72
-msgid "Move a torrent to the top of the queue"
+#: plugins/webinterface/httpclienthandler.cpp:202
+#, kde-format
+msgid "An internal server error occurred: %1"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:188
-#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:50
-#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:188
-#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:50
-#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
-#: ktorrent/tools/queuemanagerwidget.cpp:74
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:121
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:378 rc.cpp:298
-#: rc.cpp:2018 rc.cpp:298 rc.cpp:2018
-msgid "Move Up"
+#: plugins/webinterface/torrentposthandler.cpp:52
+msgid "HTTP Get not supported when uploading a torrent"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:75
-msgid "Move a torrent up in the queue"
+#: plugins/webinterface/torrentposthandler.cpp:65
+msgid "Invalid data received"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:195
-#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:57
-#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:195
-#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:57
-#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
-#: ktorrent/tools/queuemanagerwidget.cpp:77
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:122
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:379 rc.cpp:301
-#: rc.cpp:2021 rc.cpp:301 rc.cpp:2021
-msgid "Move Down"
+#: plugins/webinterface/torrentposthandler.cpp:77
+msgid "Failed to open temporary file"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:78
-msgid "Move a torrent down in the queue"
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: plugins/webinterface/webinterfaceplugin.cpp:55
+#: plugins/webinterface/webinterfaceplugin.cpp:65
+#: plugins/webinterface/webinterfaceprefwidget.cpp:40 rc.cpp:798 rc.cpp:798
+msgid "Web Interface"
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:80
-msgid "Move Bottom"
+#: plugins/webinterface/httpserver.cpp:327
+msgid "Cannot find web interface skins."
 msgstr ""
 
-#: ktorrent/tools/queuemanagerwidget.cpp:81
-msgid "Move a torrent to the bottom of the queue"
+#: plugins/webinterface/httpserver.cpp:492
+msgid "Unsupported HTTP method"
 msgstr ""
 
-#: ktorrent/tools/magnetmodel.cpp:128
-msgid "Magnet Link"
+#: plugins/search/searchenginelist.cpp:216
+#, kde-format
+msgid "Failed to parse %1"
 msgstr ""
 
-#: ktorrent/tools/magnetmodel.cpp:129 ktorrent/tools/queuemanagermodel.cpp:123
-#: ktorrent/view/viewmodel.cpp:437 ktorrent/trayicon.cpp:150
-#: plugins/infowidget/trackermodel.cpp:148
-#: plugins/infowidget/webseedsmodel.cpp:127
-msgid "Status"
-msgstr "Cyflwr"
+#: plugins/search/searchenginelist.cpp:365
+#, kde-format
+msgid "URL: <b>%1</b>"
+msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:166
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#. i18n: file: plugins/stats/Spd.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, PeersSpdGbw)
-#. i18n: file: plugins/stats/DisplaySettings.ui:164
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#. i18n: file: plugins/stats/Settings.ui:166
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#. i18n: file: plugins/stats/Spd.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, PeersSpdGbw)
-#. i18n: file: plugins/stats/DisplaySettings.ui:164
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: ktorrent/tools/magnetmodel.cpp:130
-#: plugins/infowidget/infowidgetplugin.cpp:222
-#: obj-i686-linux-gnu/plugins/stats/ui_Spd.h:95
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:295
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:658 rc.cpp:1513
-#: rc.cpp:1549 rc.cpp:1672 rc.cpp:1513 rc.cpp:1549 rc.cpp:1672
-msgid "Peers"
+#: plugins/search/searchprefpage.cpp:58 plugins/search/searchactivity.cpp:47
+#: plugins/search/searchplugin.cpp:65 plugins/search/searchplugin.cpp:83
+msgctxt "plugin name"
+msgid "Search"
 msgstr ""
 
-#: ktorrent/tools/magnetmodel.cpp:205
-msgid "Downloading"
-msgstr "Lawrlwytho"
+#: plugins/search/searchprefpage.cpp:105 plugins/search/searchprefpage.cpp:146
+msgid "Add a Search Engine"
+msgstr ""
 
-#: ktorrent/tools/magnetmodel.cpp:207
-msgid "Stopped"
-msgstr "Wedi aros"
+#: plugins/search/searchprefpage.cpp:106
+msgid "Enter the hostname of the search engine (for example www.google.com):"
+msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:121
-msgid "Order"
+#: plugins/search/searchprefpage.cpp:144
+#, kde-format
+msgid ""
+"Opensearch is not supported by %1, you will need to enter the search URL "
+"manually. The URL should contain {searchTerms}, ktorrent will replace this "
+"by the thing you are searching for."
 msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:122 ktorrent/view/viewmodel.cpp:436
-msgid "Name"
-msgstr "Enw"
+#: plugins/search/searchprefpage.cpp:151
+#, kde-format
+msgid "The URL %1 does not contain {searchTerms}."
+msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:124
-msgid "Time Stalled"
+#: plugins/search/webview.cpp:157
+msgid "Home"
 msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:125
-#: plugins/infowidget/iwfiletreemodel.cpp:89
-#: plugins/infowidget/iwfilelistmodel.cpp:77
-msgid "Priority"
+#. i18n: file: ktorrent/pref/advancedpref.ui:174
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
+#: plugins/search/webview.cpp:158 ktorrent/main.cpp:94 rc.cpp:2060 rc.cpp:2060
+msgid "KTorrent"
+msgstr "KTorrent"
+
+#: plugins/search/webview.cpp:159
+msgctxt "KDE 4 tag line, see http://kde.org/img/kde40.png"
+msgid "Be free."
 msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:158
-msgid "Running"
+#: plugins/search/webview.cpp:160
+msgid "Search the web for torrents."
 msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:160
-msgid "Queued"
-msgstr "Mewn Ciw"
+#: plugins/search/webview.cpp:161 plugins/search/searchtoolbar.cpp:70
+#: plugins/search/searchactivity.cpp:81
+#: ktorrent/tools/queuemanagerwidget.cpp:57
+msgid "Search"
+msgstr "Chwilio"
 
-#: ktorrent/tools/queuemanagermodel.cpp:162
-msgid "Not queued"
+#: plugins/search/webview.cpp:188
+#, kde-format
+msgid "Save %1 to"
 msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:171
+#: plugins/search/webview.cpp:205
 #, kde-format
-msgid "%1"
+msgid "Cannot open <b>%1</b>: %2"
 msgstr ""
 
-#: ktorrent/tools/queuemanagermodel.cpp:183
-msgid ""
-"Order of a torrent in the queue.\n"
-"Use drag and drop or the move up and down buttons on the right to change the "
-"order."
+#: plugins/search/searchtoolbar.cpp:66
+msgid "Search Text"
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:118
-msgid "Custom Groups"
+#: plugins/search/searchtoolbar.cpp:75
+msgid "Search Engine"
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:140 ktorrent/view/viewmanager.cpp:654
-msgid "New Group"
+#: plugins/search/searchtoolbar.cpp:80
+msgid "Search Engine Label"
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:144
-msgid "Edit Name"
+#: plugins/search/searchtoolbar.cpp:81
+msgid " Engine: "
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:148
-msgid "Remove Group"
+#: plugins/search/searchwidget.cpp:75
+msgid " Engine:"
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:152
-msgid "Open Tab"
+#: plugins/search/searchwidget.cpp:228
+msgid "Do you want to download or save the torrent?"
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:156
-msgid "Group Policy"
+#: plugins/search/searchwidget.cpp:229
+msgid "Download Torrent"
 msgstr ""
 
-#: ktorrent/groups/groupview.cpp:322
-msgid "Please enter the group name."
-msgstr ""
+#. i18n: file: plugins/syndication/feedwidget.ui:121
+#. i18n: ectx: property (text), widget (KPushButton, m_download)
+#. i18n: file: plugins/stats/DisplaySettings.ui:26
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: plugins/stats/DisplaySettings.ui:36
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#. i18n: file: plugins/stats/Spd.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, DlSpdGbw)
+#. i18n: file: plugins/stats/Settings.ui:114
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#. i18n: file: plugins/syndication/feedwidget.ui:121
+#. i18n: ectx: property (text), widget (KPushButton, m_download)
+#. i18n: file: plugins/stats/DisplaySettings.ui:26
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#. i18n: file: plugins/stats/DisplaySettings.ui:36
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#. i18n: file: plugins/stats/Spd.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, DlSpdGbw)
+#. i18n: file: plugins/stats/Settings.ui:114
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: plugins/search/searchwidget.cpp:230 rc.cpp:512 rc.cpp:1108 rc.cpp:1111
+#: rc.cpp:1210 rc.cpp:1240 rc.cpp:512 rc.cpp:1108 rc.cpp:1111 rc.cpp:1210
+#: rc.cpp:1240
+msgid "Download"
+msgstr "Lawrlwytho"
 
-#: ktorrent/groups/groupview.cpp:329 ktorrent/groups/groupview.cpp:453
+#: plugins/search/searchactivity.cpp:246
 #, kde-format
-msgid "The group %1 already exists."
+msgid "Search for %1"
 msgstr ""
 
-#: ktorrent/groups/grouppolicydlg.cpp:31
-#, kde-format
-msgid "Policy for the %1 group"
+#: plugins/logviewer/logviewer.cpp:35
+msgid "Log"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:438 plugins/infowidget/peerviewmodel.cpp:266
-#: plugins/infowidget/webseedsmodel.cpp:126
-msgid "Downloaded"
+#: plugins/logviewer/logviewer.cpp:37
+msgid "View the logging output generated by KTorrent"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:440 plugins/infowidget/peerviewmodel.cpp:267
-msgid "Uploaded"
+#: plugins/logviewer/logviewer.cpp:47
+msgid "Suspend Output"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:441
-#: plugins/infowidget/chunkdownloadmodel.cpp:201
-#: plugins/infowidget/peerviewmodel.cpp:257
-msgid "Down Speed"
+#: plugins/logviewer/logviewer.cpp:127
+msgid "<font color=\"#FF0000\">Logging output suspended</font>"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:442 plugins/infowidget/peerviewmodel.cpp:258
-msgid "Up Speed"
+#: plugins/logviewer/logviewer.cpp:129
+msgid "<font color=\"#00FF00\">Logging output resumed</font>"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:443
-msgid "Time Left"
+#: plugins/logviewer/logprefpage.cpp:30
+msgid "Log Viewer"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:444 plugins/infowidget/trackermodel.cpp:149
-msgid "Seeders"
-msgstr ""
+#: plugins/logviewer/logflagsdelegate.cpp:43
+#: plugins/logviewer/logflags.cpp:204
+msgid "All"
+msgstr "Popeth"
 
-#: ktorrent/view/viewmodel.cpp:445 plugins/infowidget/trackermodel.cpp:150
-msgid "Leechers"
-msgstr ""
+#: plugins/logviewer/logflagsdelegate.cpp:44
+#: plugins/logviewer/logflags.cpp:203
+msgid "Important"
+msgstr "Pwysig"
 
-#: ktorrent/view/viewmodel.cpp:447
-#, no-c-format
-msgid "% Complete"
-msgstr ""
+#: plugins/logviewer/logflagsdelegate.cpp:45
+#: plugins/logviewer/logflags.cpp:202
+msgid "Notice"
+msgstr "Noder"
 
-#: ktorrent/view/viewmodel.cpp:448
-msgid "Share Ratio"
+#: plugins/logviewer/logflagsdelegate.cpp:46
+#: plugins/logviewer/logflags.cpp:201
+msgid "Debug"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:449
-msgid "Time Downloaded"
-msgstr ""
+#: plugins/logviewer/logflagsdelegate.cpp:47
+#: plugins/logviewer/logflags.cpp:205
+msgid "None"
+msgstr "Dim"
 
-#: ktorrent/view/viewmodel.cpp:450
-msgid "Time Seeded"
+#: plugins/logviewer/logflags.cpp:121
+msgid "System"
+msgstr "Cysawd"
+
+#: plugins/logviewer/logflags.cpp:122
+msgid "Log Level"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:451
-msgid "Location"
+#. i18n: file: plugins/stats/DisplaySettings.ui:512
+#. i18n: ectx: property (text), widget (QLabel, label_23)
+#: plugins/stats/ConnsTabPage.cc:57 rc.cpp:1153 rc.cpp:1153
+msgid "Leechers connected"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:452
-msgid "Added"
+#. i18n: file: plugins/stats/DisplaySettings.ui:547
+#. i18n: ectx: property (text), widget (QLabel, label_24)
+#: plugins/stats/ConnsTabPage.cc:61 plugins/stats/ConnsTabPage.cc:106
+#: rc.cpp:1156 rc.cpp:1156
+msgid "Leechers in swarms"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:460
-msgid "How much data we have downloaded of the torrent"
+#. i18n: file: plugins/stats/DisplaySettings.ui:582
+#. i18n: ectx: property (text), widget (QLabel, label_25)
+#: plugins/stats/ConnsTabPage.cc:64 rc.cpp:1159 rc.cpp:1159
+msgid "Seeds connected"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:461
-msgid "Total size of the torrent, excluded files are not included"
+#: plugins/stats/ConnsTabPage.cc:68 plugins/stats/ConnsTabPage.cc:120
+#: plugins/stats/ConnsTabPage.cc:122
+msgid "Seeds in swarms"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:462
-msgid "How much data we have uploaded"
+#. i18n: file: plugins/stats/DisplaySettings.ui:652
+#. i18n: ectx: property (text), widget (QLabel, label_27)
+#: plugins/stats/ConnsTabPage.cc:71 rc.cpp:1165 rc.cpp:1165
+msgid "Average leechers connected per torrent"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:463
-msgid "Current download speed"
+#. i18n: file: plugins/stats/DisplaySettings.ui:687
+#. i18n: ectx: property (text), widget (QLabel, label_28)
+#: plugins/stats/ConnsTabPage.cc:73 rc.cpp:1168 rc.cpp:1168
+msgid "Average seeds connected per torrent"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:464
-msgid "Current upload speed"
+#: plugins/stats/ConnsTabPage.cc:75
+msgid "Average leechers connected per running torrent"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:465
-msgid ""
-"How much time is left before the torrent is finished or before the maximum "
-"share ratio is reached, if that is enabled"
+#: plugins/stats/ConnsTabPage.cc:77
+msgid "Average seeds connected per running torrent"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:466
-msgid ""
-"How many seeders we are connected to (How many seeders there are according "
-"to the tracker)"
+#. i18n: file: plugins/stats/DisplaySettings.ui:805
+#. i18n: ectx: property (text), widget (QLabel, label_31)
+#: plugins/stats/ConnsTabPage.cc:83 rc.cpp:1180 rc.cpp:1180
+msgid "Nodes"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:467
-msgid ""
-"How many leechers we are connected to (How many leechers there are according "
-"to the tracker)"
+#. i18n: file: plugins/stats/DisplaySettings.ui:844
+#. i18n: ectx: property (text), widget (QLabel, label_32)
+#: plugins/stats/ConnsTabPage.cc:84 rc.cpp:1183 rc.cpp:1183
+msgid "Tasks"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:469
-#, no-c-format
-msgid ""
-"The percentage of data we have of the whole torrent, not including excluded "
-"files"
+#: plugins/stats/drawer/ChartDrawerData.cc:25
+msgid "Unknown"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:470
+#: plugins/stats/drawer/KPlotWgtDrawer.cc:340
+#: plugins/stats/drawer/PlainChartDrawer.cc:530
 msgid ""
-"Share ratio is the number of bytes uploaded divided by the number of bytes "
-"downloaded"
+"<h1 align='center' style='font-size: large; text-decoration: "
+"underline'>Legend:</h1><ul type='square'>"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:471
-msgid "How long we have been downloading the torrent"
+#: plugins/stats/drawer/KPlotWgtDrawer.cc:344
+#: plugins/stats/drawer/PlainChartDrawer.cc:534
+#, kde-format
+msgid ""
+"<li><span style='background-color: %1; font-size: 14px; font-family: "
+"monospace'>&nbsp;&nbsp;</span>&nbsp;—&nbsp;%2</li>"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:472
-msgid "How long we have been seeding the torrent"
+#: plugins/stats/drawer/KPlotWgtDrawer.cc:383
+#: plugins/stats/drawer/PlainChartDrawer.cc:323
+msgid "Save as image…"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:473
-msgid "The location of the torrent's data on disk"
+#: plugins/stats/drawer/KPlotWgtDrawer.cc:387
+#: plugins/stats/drawer/PlainChartDrawer.cc:327
+msgid "Rescale"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:474
-msgid "When this torrent was added"
+#: plugins/stats/drawer/KPlotWgtDrawer.cc:391
+#: plugins/stats/drawer/PlainChartDrawer.cc:331
+msgid "Reset"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:520
-msgid "Unable to contact a tracker."
+#: plugins/stats/drawer/KPlotWgtDrawer.cc:403
+#: plugins/stats/drawer/PlainChartDrawer.cc:343
+msgid "Select path to save image…"
 msgstr ""
 
-#: ktorrent/view/viewmodel.cpp:526
-#, kde-format
-msgid "%1<br>Url: <b>%2</b>"
+#: plugins/stats/drawer/ChartDrawer.cc:26
+msgid "KiB/s"
 msgstr ""
 
-#: ktorrent/view/scanextender.cpp:46
-msgid "Checked %v of %m chunks"
+#. i18n: file: plugins/stats/DisplaySettings.ui:903
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: plugins/stats/DisplaySettingsPage.cc:28 rc.cpp:1186 rc.cpp:1186
+msgid "Display"
 msgstr ""
 
-#: ktorrent/view/scanextender.cpp:127
-#, kde-format
-msgid "<font color=\"red\">%1</font>"
+#: plugins/stats/StatsPlugin.cc:51
+msgid "Speed charts"
 msgstr ""
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:70
-#. i18n: ectx: Menu (ColumnsMenu)
-#: ktorrent/view/view.cpp:79 rc.cpp:480 rc.cpp:480
-msgid "Columns"
+#: plugins/stats/StatsPlugin.cc:51
+msgid "Displays charts about download and upload speed"
 msgstr ""
 
-#: ktorrent/view/view.cpp:232
-#, kde-format
-msgid ""
-"The torrent <b>%1</b> has not finished downloading, do you want to delete "
-"the incomplete data, too?"
+#: plugins/stats/StatsPlugin.cc:52
+msgid "Connections charts"
 msgstr ""
 
-#: ktorrent/view/view.cpp:237
-msgid "Remove Download"
+#: plugins/stats/StatsPlugin.cc:52
+msgid "Displays charts about connections"
 msgstr ""
 
-#: ktorrent/view/view.cpp:238
-msgid "Delete Data"
+#: plugins/stats/SettingsPage.cc:27
+msgid "Statistics"
 msgstr ""
 
-#: ktorrent/view/view.cpp:239
-msgid "Keep Data"
+#: plugins/stats/SettingsPage.cc:48
+#, kde-format
+msgid "(= %1 ms)"
 msgstr ""
 
-#: ktorrent/view/view.cpp:258
-msgid ""
-"You will lose all the downloaded data. Are you sure you want to do this?"
+#. i18n: file: ktorrent/pref/advancedpref.ui:179
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
+#: plugins/stats/SpdTabPage.cc:64 plugins/stats/SpdTabPage.cc:65 rc.cpp:2063
+#: rc.cpp:2063
+msgid "Current speed"
 msgstr ""
 
-#: ktorrent/view/view.cpp:259
-msgid "Remove Torrent"
+#. i18n: file: ktorrent/pref/advancedpref.ui:184
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
+#: plugins/stats/SpdTabPage.cc:67 plugins/stats/SpdTabPage.cc:68 rc.cpp:2066
+#: rc.cpp:2066
+msgid "Average speed"
 msgstr ""
 
-#: ktorrent/view/view.cpp:354 plugins/infowidget/fileview.cpp:320
-#: plugins/infowidget/fileview.cpp:341
-msgid "Select a directory to move the data to."
+#: plugins/stats/SpdTabPage.cc:70 plugins/stats/SpdTabPage.cc:71
+msgid "Speed limit"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:573
-msgctxt "@action Start all selected torrents in the current tab"
-msgid "Start"
+#. i18n: file: plugins/stats/DisplaySettings.ui:172
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#: plugins/stats/SpdTabPage.cc:73 rc.cpp:1123 rc.cpp:1123
+msgid "Average from leechers"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:574
-msgid "Start all selected torrents in the current tab"
+#. i18n: file: plugins/stats/DisplaySettings.ui:207
+#. i18n: ectx: property (text), widget (QLabel, label_19)
+#: plugins/stats/SpdTabPage.cc:74 rc.cpp:1126 rc.cpp:1126
+msgid "Average to leechers"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:579
-msgctxt "@action Stop all selected torrents in the current tab"
-msgid "Stop"
+#. i18n: file: plugins/stats/DisplaySettings.ui:242
+#. i18n: ectx: property (text), widget (QLabel, label_20)
+#: plugins/stats/SpdTabPage.cc:75 rc.cpp:1129 rc.cpp:1129
+msgid "Average from seeds"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:580
-msgid "Stop all selected torrents in the current tab"
+#. i18n: file: plugins/stats/DisplaySettings.ui:277
+#. i18n: ectx: property (text), widget (QLabel, label_21)
+#: plugins/stats/SpdTabPage.cc:76 rc.cpp:1132 rc.cpp:1132
+msgid "From leechers"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:585
-msgctxt "@action Pause all selected torrents in the current tab"
-msgid "Pause"
+#. i18n: file: plugins/stats/DisplaySettings.ui:312
+#. i18n: ectx: property (text), widget (QLabel, label_22)
+#: plugins/stats/SpdTabPage.cc:77 rc.cpp:1135 rc.cpp:1135
+msgid "From seeds"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:586
-msgid "Pause all selected torrents in the current tab"
+#: plugins/infowidget/webseedsmodel.cpp:124
+#: plugins/infowidget/trackermodel.cpp:147
+msgid "URL"
+msgstr "URL"
+
+#: plugins/infowidget/webseedsmodel.cpp:125
+msgid "Speed"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:590
-msgctxt "@action Remove all selected torrents in the current tab"
-msgid "Remove"
+#: plugins/infowidget/webseedsmodel.cpp:126
+#: plugins/infowidget/peerviewmodel.cpp:266 ktorrent/view/viewmodel.cpp:438
+msgid "Downloaded"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:591
-msgid "Remove all selected torrents in the current tab"
+#: plugins/infowidget/webseedsmodel.cpp:127
+#: plugins/infowidget/trackermodel.cpp:148 ktorrent/view/viewmodel.cpp:437
+#: ktorrent/trayicon.cpp:157 ktorrent/tools/queuemanagermodel.cpp:123
+#: ktorrent/tools/magnetmodel.cpp:129
+msgid "Status"
+msgstr "Cyflwr"
+
+#: plugins/infowidget/peerviewmodel.cpp:88
+msgid " (µTP)"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:596
-msgctxt "@action Start all torrents in the current tab"
-msgid "Start All"
+#: plugins/infowidget/peerviewmodel.cpp:103
+msgctxt "Choked"
+msgid "Yes"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:597
-msgid "Start all torrents in the current tab"
+#: plugins/infowidget/peerviewmodel.cpp:103
+msgctxt "Not choked"
+msgid "No"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:602
-msgctxt "@action Stop all torrents in the current tab"
-msgid "Stop All"
+#: plugins/infowidget/peerviewmodel.cpp:104
+msgctxt "Snubbed"
+msgid "Yes"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:603
-msgid "Stop all torrents in the current tab"
+#: plugins/infowidget/peerviewmodel.cpp:104
+msgctxt "Not snubbed"
+msgid "No"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:608
-msgid "Remove Torrent and Data"
+#: plugins/infowidget/peerviewmodel.cpp:112
+msgctxt "Interested"
+msgid "Yes"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:613
-msgid "Rename Torrent"
+#: plugins/infowidget/peerviewmodel.cpp:112
+msgctxt "Not Interested"
+msgid "No"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:617
-msgid "Add Peers"
+#: plugins/infowidget/peerviewmodel.cpp:113
+msgctxt "Interesting"
+msgid "Yes"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:621
-msgid "Manual Announce"
+#: plugins/infowidget/peerviewmodel.cpp:113
+msgctxt "Not Interesting"
+msgid "No"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:626
-msgid "Scrape"
+#: plugins/infowidget/peerviewmodel.cpp:254
+msgid "Address"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:630
-msgid "Preview"
-msgstr "Rhagolwg"
+#: plugins/infowidget/peerviewmodel.cpp:255
+msgid "Country"
+msgstr "Gwlad"
 
-#: ktorrent/view/viewmanager.cpp:634
-msgid "Data Directory"
-msgstr ""
+#: plugins/infowidget/peerviewmodel.cpp:256
+msgid "Client"
+msgstr "Dibynnydd:"
 
-#: ktorrent/view/viewmanager.cpp:638
-msgid "Temporary Directory"
+#: plugins/infowidget/peerviewmodel.cpp:257
+#: plugins/infowidget/chunkdownloadmodel.cpp:201
+#: ktorrent/view/viewmodel.cpp:441
+msgid "Down Speed"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:642
-msgid "Move Data"
+#: plugins/infowidget/peerviewmodel.cpp:258 ktorrent/view/viewmodel.cpp:442
+msgid "Up Speed"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, StatsSettingsWgt)
-#: ktorrent/view/viewmanager.cpp:646
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:285 rc.cpp:1486 rc.cpp:1486
-msgid "Settings"
+#: plugins/infowidget/peerviewmodel.cpp:259
+msgid "Choked"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:650
-msgid "Remove from Group"
+#: plugins/infowidget/peerviewmodel.cpp:260
+msgid "Snubbed"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:658
-msgid "Check Data"
+#: plugins/infowidget/peerviewmodel.cpp:261
+msgid "Availability"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:659
-msgid "Check all the data of a torrent"
+#. i18n: file: plugins/stats/DisplaySettings.ui:795
+#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
+#. i18n: file: plugins/stats/Settings.ui:234
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#. i18n: file: plugins/stats/Conns.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, DhtGbw)
+#. i18n: file: plugins/stats/DisplaySettings.ui:795
+#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
+#. i18n: file: plugins/stats/Settings.ui:234
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#. i18n: file: plugins/stats/Conns.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, DhtGbw)
+#: plugins/infowidget/peerviewmodel.cpp:262 rc.cpp:1177 rc.cpp:1252
+#: rc.cpp:1282 rc.cpp:1177 rc.cpp:1252 rc.cpp:1282
+msgid "DHT"
 msgstr ""
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:56
-#. i18n: ectx: Menu (OpenDirMenu)
-#: ktorrent/view/viewmanager.cpp:672 rc.cpp:471 rc.cpp:471
-msgid "Open Directory"
-msgstr ""
+#: plugins/infowidget/peerviewmodel.cpp:263
+msgid "Score"
+msgstr "Sgôr"
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:62
-#. i18n: ectx: Menu (GroupsSubMenu)
-#: ktorrent/view/viewmanager.cpp:675 rc.cpp:474 rc.cpp:474
-msgid "Add to Group"
+#: plugins/infowidget/peerviewmodel.cpp:264
+msgid "Upload Slot"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:678
-msgid "Copy Torrent URL"
+#: plugins/infowidget/peerviewmodel.cpp:265
+msgid "Requests"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:682
-msgid "Export Torrent"
+#: plugins/infowidget/peerviewmodel.cpp:267 ktorrent/view/viewmodel.cpp:440
+msgid "Uploaded"
 msgstr ""
 
-#: ktorrent/view/viewmanager.cpp:687
-msgid "Set the speed limits of individual torrents"
+#: plugins/infowidget/peerviewmodel.cpp:268
+msgid "Interested"
 msgstr ""
 
-#: ktorrent/statusbar.cpp:39 ktorrent/statusbar.cpp:71
-#, kde-format
-msgid "Speed down: %1 / up: %2"
+#: plugins/infowidget/peerviewmodel.cpp:269
+msgid "Interesting"
 msgstr ""
 
-#: ktorrent/statusbar.cpp:40 ktorrent/statusbar.cpp:82
-#, kde-format
-msgid "Transferred down: %1 / up: %2"
+#: plugins/infowidget/peerviewmodel.cpp:277
+msgid "IP address of the peer"
 msgstr ""
 
-#: ktorrent/statusbar.cpp:42 ktorrent/statusbar.cpp:97
-msgid "DHT: off"
+#: plugins/infowidget/peerviewmodel.cpp:278
+msgid "Country the peer is in"
 msgstr ""
 
-#: ktorrent/statusbar.cpp:95
-#, kde-format
-msgid "DHT: %1 nodes, %2 tasks"
+#: plugins/infowidget/peerviewmodel.cpp:279
+msgid "Which client the peer is using"
 msgstr ""
 
-#: ktorrent/gui.cpp:274 ktorrent/gui.cpp:289
-msgid "Open Location"
-msgstr "Agor Lleoliad"
-
-#: ktorrent/gui.cpp:406
-msgid "Create a new torrent"
+#: plugins/infowidget/peerviewmodel.cpp:280
+msgid "Download speed"
 msgstr ""
 
-#: ktorrent/gui.cpp:408
-msgid "Open a torrent"
+#: plugins/infowidget/peerviewmodel.cpp:281
+msgid "Upload speed"
 msgstr ""
 
-#: ktorrent/gui.cpp:411
-msgid "Open Silently"
+#: plugins/infowidget/peerviewmodel.cpp:282
+msgid ""
+"Whether or not the peer has choked us - when we are choked the peer will not "
+"send us any data"
 msgstr ""
 
-#: ktorrent/gui.cpp:412
-msgid "Open a torrent without asking any questions"
+#: plugins/infowidget/peerviewmodel.cpp:283
+msgid "Snubbed means the peer has not sent us any data in the last 2 minutes"
 msgstr ""
 
-#: ktorrent/gui.cpp:427
-msgid "Open URL"
+#: plugins/infowidget/peerviewmodel.cpp:284
+msgid "How much data the peer has of the torrent"
 msgstr ""
 
-#: ktorrent/gui.cpp:428
-msgid "Open a URL which points to a torrent, magnet links are supported"
+#: plugins/infowidget/peerviewmodel.cpp:285
+msgid "Whether or not the peer has DHT enabled"
 msgstr ""
 
-#: ktorrent/gui.cpp:433 plugins/ipfilter/ipfilterplugin.cpp:62
-#: plugins/ipfilter/ipfilterplugin.cpp:75
-#: plugins/ipfilter/ipblockingprefpage.cpp:35
-msgid "IP Filter"
+#: plugins/infowidget/peerviewmodel.cpp:286
+msgid ""
+"The score of the peer, KTorrent uses this to determine who to upload to"
 msgstr ""
 
-#: ktorrent/gui.cpp:434
-msgid "Show the list of blocked IP addresses"
+#: plugins/infowidget/peerviewmodel.cpp:287
+msgid "Only peers which have an upload slot will get data from us"
 msgstr ""
 
-#: ktorrent/gui.cpp:439
-msgid "Import Torrent"
+#: plugins/infowidget/peerviewmodel.cpp:288
+msgid "The number of download and upload requests"
 msgstr ""
 
-#: ktorrent/gui.cpp:440
-msgid "Import a torrent"
+#: plugins/infowidget/peerviewmodel.cpp:289
+msgid "How much data we have downloaded from this peer"
 msgstr ""
 
-#: ktorrent/gui.cpp:446
-msgid "Import KDE3 Torrents"
+#: plugins/infowidget/peerviewmodel.cpp:290
+msgid "How much data we have uploaded to this peer"
 msgstr ""
 
-#: ktorrent/gui.cpp:447
-msgid "Import all torrents from the KDE3 version of KTorrent"
+#: plugins/infowidget/peerviewmodel.cpp:291
+msgid "Whether the peer is interested in downloading data from us"
 msgstr ""
 
-#: ktorrent/gui.cpp:454
-msgid "Show/Hide KTorrent"
+#: plugins/infowidget/peerviewmodel.cpp:292
+msgid "Whether we are interested in downloading from this peer"
 msgstr ""
 
-#: ktorrent/ipfilterlist.cpp:158
-#, kde-format
-msgid "Invalid IP address %1"
+#: plugins/infowidget/trackermodel.cpp:149 ktorrent/view/viewmodel.cpp:444
+msgid "Seeders"
 msgstr ""
 
-#: ktorrent/ipfilterlist.cpp:163
-#, kde-format
-msgid "Duplicate IP address %1"
+#: plugins/infowidget/trackermodel.cpp:150 ktorrent/view/viewmodel.cpp:445
+msgid "Leechers"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:108
-msgid "Set max upload speed"
+#: plugins/infowidget/trackermodel.cpp:151
+msgid "Times Downloaded"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:110
-msgid "Set max download speed"
+#: plugins/infowidget/trackermodel.cpp:152
+msgid "Next Update"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:139
-#, kde-format
-msgid ""
-"<table><tr><td>Download&nbsp;speed:</td><td><b>%1</b></td></tr><tr><td>Upload"
-"&nbsp;speed:</td><td><b>%2</b></td></tr><tr><td>Received:</td><td><b>%3</b></"
-"td></tr><tr><td>Transmitted:</td><td><b>%4</b></td></tr></table>"
+#: plugins/infowidget/peerview.cpp:56
+msgid "Kick Peer"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:184
-#, kde-format
-msgid "<b>%1</b> has completed downloading.<br>Average speed: %2 DL / %3 UL."
+#: plugins/infowidget/peerview.cpp:57
+msgid "Ban Peer"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:202
-#, kde-format
-msgid ""
-"<b>%1</b> has reached its maximum share ratio of %2 and has been "
-"stopped.<br>Uploaded %3 at an average speed of %4."
+#. i18n: file: plugins/infowidget/trackerview.ui:22
+#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
+#: plugins/infowidget/trackerview.cpp:88 rc.cpp:1306 rc.cpp:1306
+msgid "Add Trackers"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:221
-#, kde-format
-msgid ""
-"<b>%1</b> has reached its maximum seed time of %2 hours and has been "
-"stopped.<br>Uploaded %3 at an average speed of %4."
+#: plugins/infowidget/trackerview.cpp:89
+msgid "Enter the URL's of the trackers, one per line:"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:236
-#, kde-format
-msgid "<b>%1</b> has been stopped with the following error: <br>%2"
+#: plugins/infowidget/trackerview.cpp:113
+msgid "Several URL's could not be added because they are malformed:"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:247
+#: plugins/infowidget/trackerview.cpp:133
 #, kde-format
-msgid ""
-"Corrupted data has been found in the torrent <b>%1</b><br>It would be a good "
-"idea to do a data integrity check on the torrent."
+msgid "There already is a tracker named <b>%1</b>."
 msgstr ""
 
-#: ktorrent/trayicon.cpp:264
-#, kde-format
-msgid ""
-"<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. "
-"<br>Remove the limit manually if you want to continue seeding."
+#: plugins/infowidget/trackerview.cpp:135
+msgid "The following duplicate trackers were not added:"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:268
-#, kde-format
-msgid ""
-"<b>%1</b> has reached its maximum seed time of %2 hours and cannot be "
-"enqueued. <br>Remove the limit manually if you want to continue seeding."
+#: plugins/infowidget/iwfilelistmodel.cpp:77
+#: plugins/infowidget/iwfiletreemodel.cpp:89
+#: ktorrent/tools/queuemanagermodel.cpp:125
+msgid "Priority"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:280
-#, kde-format
-msgid "Cannot start <b>%1</b>: <br>"
+#: plugins/infowidget/iwfilelistmodel.cpp:78
+#: plugins/infowidget/iwfiletreemodel.cpp:90
+msgctxt "@title:column"
+msgid "Preview"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:287
-#, kde-format
-msgid "Cannot seed more than 1 torrent. <br>"
-msgid_plural "Cannot seed more than %1 torrents. <br>"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/infowidget/iwfilelistmodel.cpp:80
+#: plugins/infowidget/iwfiletreemodel.cpp:92
+#, no-c-format
+msgctxt "Percent of File Downloaded"
+msgid "% Complete"
+msgstr ""
 
-#: ktorrent/trayicon.cpp:292
-#, kde-format
-msgid "Cannot download more than 1 torrent. <br>"
-msgid_plural "Cannot download more than %1 torrents. <br>"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/infowidget/iwfilelistmodel.cpp:89
+#: plugins/infowidget/iwfiletreemodel.cpp:101
+msgctxt "Download first"
+msgid "First"
+msgstr ""
 
-#: ktorrent/trayicon.cpp:295
-msgid ""
-"Go to Settings -> Configure KTorrent, if you want to change the limits."
+#: plugins/infowidget/iwfilelistmodel.cpp:90
+#: plugins/infowidget/iwfiletreemodel.cpp:102
+msgctxt "Download last"
+msgid "Last"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:299
-msgid "There is not enough diskspace available."
+#: plugins/infowidget/iwfilelistmodel.cpp:95
+msgctxt "Download Normal (not as first or last)"
+msgid "Normal"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:312
-#, kde-format
-msgid ""
-"Your disk is running out of space.<br /><b>%1</b> is being downloaded to "
-"'%2'."
+#: plugins/infowidget/iwfilelistmodel.cpp:146
+#: plugins/infowidget/iwfilelistmodel.cpp:169
+#: plugins/infowidget/iwfiletreemodel.cpp:182
+msgctxt "Preview available"
+msgid "Available"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:315
-msgid "Torrent has been stopped.<br />"
+#: plugins/infowidget/iwfilelistmodel.cpp:148
+#: plugins/infowidget/iwfilelistmodel.cpp:171
+#: plugins/infowidget/iwfiletreemodel.cpp:161
+#: plugins/infowidget/iwfiletreemodel.cpp:184
+msgctxt "Preview pending"
+msgid "Pending"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:351
-msgid "Speed limit in KiB/s"
+#: plugins/infowidget/iwfilelistmodel.cpp:151
+#: plugins/infowidget/iwfilelistmodel.cpp:174
+#: plugins/infowidget/iwfiletreemodel.cpp:164
+#: plugins/infowidget/iwfiletreemodel.cpp:187
+msgctxt "No preview available"
+msgid "No"
 msgstr ""
 
-#: ktorrent/trayicon.cpp:353 plugins/bwscheduler/schedulegraphicsitem.cpp:83
-#: plugins/bwscheduler/schedulegraphicsitem.cpp:84
-msgid "Unlimited"
-msgstr "Heb derfyn"
+#: plugins/infowidget/iwfilelistmodel.cpp:155
+#: plugins/infowidget/iwfilelistmodel.cpp:178
+#: plugins/infowidget/iwfiletreemodel.cpp:169
+#: plugins/infowidget/iwfiletreemodel.cpp:189
+#: plugins/infowidget/iwfiletreemodel.cpp:195
+#, kde-format
+msgid "%1 %"
+msgstr "%1 %"
 
-#: ktorrent/pref/qmpref.cpp:29
-msgid " minute"
-msgid_plural " minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: plugins/infowidget/infowidgetplugin.cpp:71
+#: plugins/infowidget/iwprefpage.cpp:27
+msgid "Info Widget"
+msgstr ""
 
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:201
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: ktorrent/pref/networkpref.cpp:35
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:330 rc.cpp:1450
-#: rc.cpp:1450
-msgid "Network"
+#: plugins/infowidget/infowidgetplugin.cpp:83
+msgctxt "@title:tab"
+msgid "Status"
 msgstr ""
 
-#: ktorrent/pref/networkpref.cpp:56
-msgid "All interfaces"
+#: plugins/infowidget/infowidgetplugin.cpp:84
+msgid "Displays status information about a torrent"
 msgstr ""
 
-#: ktorrent/pref/generalpref.cpp:27
-msgid "Application"
+#: plugins/infowidget/infowidgetplugin.cpp:85
+msgctxt "@title:tab"
+msgid "Files"
 msgstr ""
 
-#: ktorrent/pref/btpref.cpp:27
-msgid "BitTorrent"
+#: plugins/infowidget/infowidgetplugin.cpp:86
+msgid "Shows all the files in a torrent"
 msgstr ""
 
-#: ktorrent/pref/btpref.cpp:31
-msgid " corrupted chunk"
-msgid_plural " corrupted chunks"
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: plugins/stats/DisplaySettings.ui:164
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#. i18n: file: plugins/stats/Spd.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, PeersSpdGbw)
+#. i18n: file: plugins/stats/Settings.ui:166
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#. i18n: file: plugins/stats/DisplaySettings.ui:164
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#. i18n: file: plugins/stats/Spd.ui:31
+#. i18n: ectx: property (title), widget (QGroupBox, PeersSpdGbw)
+#. i18n: file: plugins/stats/Settings.ui:166
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: plugins/infowidget/infowidgetplugin.cpp:222
+#: ktorrent/tools/magnetmodel.cpp:130 rc.cpp:1120 rc.cpp:1213 rc.cpp:1246
+#: rc.cpp:1120 rc.cpp:1213 rc.cpp:1246
+msgid "Peers"
+msgstr ""
 
-#: ktorrent/pref/btpref.cpp:33
-msgid " corrupted chunks"
+#: plugins/infowidget/infowidgetplugin.cpp:223
+msgid "Displays all the peers you are connected to for a torrent"
 msgstr ""
 
-#: ktorrent/pref/proxypref.cpp:27
-msgid "Proxy"
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ChunkDownloadView)
+#. i18n: file: plugins/infowidget/statustab.ui:164
+#. i18n: ectx: property (text), widget (QLabel, hdr_chunks)
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ChunkDownloadView)
+#. i18n: file: plugins/infowidget/statustab.ui:164
+#. i18n: ectx: property (text), widget (QLabel, hdr_chunks)
+#: plugins/infowidget/infowidgetplugin.cpp:244 rc.cpp:1285 rc.cpp:1387
+#: rc.cpp:1285 rc.cpp:1387
+msgid "Chunks"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/networkpref.ui:170
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: ktorrent/pref/advancedpref.cpp:27
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:322 rc.cpp:1038 rc.cpp:1038
-msgid "Advanced"
+#: plugins/infowidget/infowidgetplugin.cpp:245
+msgid "Displays all the chunks you are downloading, of a torrent"
 msgstr ""
 
-#: ktorrent/pref/recommendedsettingsdlg.cpp:37
-msgid "Calculate Recommended Settings"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:160
+#. i18n: ectx: attribute (title), widget (QWidget, m_tracker_tab)
+#: plugins/infowidget/infowidgetplugin.cpp:266 rc.cpp:1741 rc.cpp:1741
+msgid "Trackers"
 msgstr ""
 
-#: ktorrent/pref/recommendedsettingsdlg.cpp:245
-#: ktorrent/pref/recommendedsettingsdlg.cpp:251
-#, kde-format
-msgid "(= %1/s)"
+#: plugins/infowidget/infowidgetplugin.cpp:267
+msgid "Displays information about all the trackers of a torrent"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:903
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: plugins/stats/DisplaySettingsPage.cc:28
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:688 rc.cpp:1738
-#: rc.cpp:1738
-msgid "Display"
+#: plugins/infowidget/infowidgetplugin.cpp:285
+msgid "Webseeds"
 msgstr ""
 
-#: plugins/stats/StatsPlugin.cc:51
-msgid "Speed charts"
+#: plugins/infowidget/infowidgetplugin.cpp:286
+msgid "Displays all the webseeds of a torrent"
 msgstr ""
 
-#: plugins/stats/StatsPlugin.cc:51
-msgid "Displays charts about download and upload speed"
+#: plugins/infowidget/availabilitychunkbar.cpp:33
+msgid ""
+"<img src=\"available_color\">&nbsp; - Available Chunks<br><img "
+"src=\"unavailable_color\">&nbsp; - Unavailable Chunks<br><img "
+"src=\"excluded_color\">&nbsp; - Excluded Chunks"
 msgstr ""
 
-#: plugins/stats/StatsPlugin.cc:52
-msgid "Connections charts"
+#: plugins/infowidget/webseedstab.cpp:97
+#, kde-format
+msgid ""
+"Cannot add the webseed %1, it is already part of the list of webseeds."
 msgstr ""
 
-#: plugins/stats/StatsPlugin.cc:52
-msgid "Displays charts about connections"
+#: plugins/infowidget/webseedstab.cpp:114
+#, kde-format
+msgid "Cannot remove webseed %1, it is part of the torrent."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/advancedpref.ui:179
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
-#: plugins/stats/SpdTabPage.cc:64 plugins/stats/SpdTabPage.cc:65
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:244 rc.cpp:917 rc.cpp:917
-msgid "Current speed"
+#: plugins/infowidget/iwfiletreemodel.cpp:107
+msgctxt "Download normally(not as first or last)"
+msgid "Normal"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/advancedpref.ui:184
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
-#: plugins/stats/SpdTabPage.cc:67 plugins/stats/SpdTabPage.cc:68
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:245 rc.cpp:920 rc.cpp:920
-msgid "Average speed"
+#: plugins/infowidget/iwfiletreemodel.cpp:159
+msgctxt "preview available"
+msgid "Available"
 msgstr ""
 
-#: plugins/stats/SpdTabPage.cc:70 plugins/stats/SpdTabPage.cc:71
-msgid "Speed limit"
+#: plugins/infowidget/chunkdownloadmodel.cpp:198
+msgid "Chunk"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:172
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: plugins/stats/SpdTabPage.cc:73
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:648 rc.cpp:1675
-#: rc.cpp:1675
-msgid "Average from leechers"
+#: plugins/infowidget/chunkdownloadmodel.cpp:199
+msgid "Progress"
+msgstr "Cynnydd"
+
+#: plugins/infowidget/chunkdownloadmodel.cpp:200
+msgid "Peer"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:207
-#. i18n: ectx: property (text), widget (QLabel, label_19)
-#: plugins/stats/SpdTabPage.cc:74
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:650 rc.cpp:1678
-#: rc.cpp:1678
-msgid "Average to leechers"
+#: plugins/infowidget/chunkdownloadmodel.cpp:202
+msgid "Files"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:242
-#. i18n: ectx: property (text), widget (QLabel, label_20)
-#: plugins/stats/SpdTabPage.cc:75
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:652 rc.cpp:1681
-#: rc.cpp:1681
-msgid "Average from seeds"
+#: plugins/infowidget/chunkdownloadmodel.cpp:210
+msgid "Number of the chunk"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:277
-#. i18n: ectx: property (text), widget (QLabel, label_21)
-#: plugins/stats/SpdTabPage.cc:76
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:654 rc.cpp:1684
-#: rc.cpp:1684
-msgid "From leechers"
+#: plugins/infowidget/chunkdownloadmodel.cpp:211
+msgid "Download progress of the chunk"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:312
-#. i18n: ectx: property (text), widget (QLabel, label_22)
-#: plugins/stats/SpdTabPage.cc:77
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:656 rc.cpp:1687
-#: rc.cpp:1687
-msgid "From seeds"
+#: plugins/infowidget/chunkdownloadmodel.cpp:212
+msgid "Which peer we are downloading it from"
 msgstr ""
 
-#: plugins/stats/drawer/KPlotWgtDrawer.cc:340
-#: plugins/stats/drawer/PlainChartDrawer.cc:530
-msgid ""
-"<h1 align='center' style='font-size: large; text-decoration: "
-"underline'>Legend:</h1><ul type='square'>"
+#: plugins/infowidget/chunkdownloadmodel.cpp:213
+msgid "Download speed of the chunk"
 msgstr ""
 
-#: plugins/stats/drawer/KPlotWgtDrawer.cc:344
-#: plugins/stats/drawer/PlainChartDrawer.cc:534
-#, kde-format
-msgid ""
-"<li><span style='background-color: %1; font-size: 14px; font-family: "
-"monospace'>&nbsp;&nbsp;</span>&nbsp;—&nbsp;%2</li>"
+#: plugins/infowidget/chunkdownloadmodel.cpp:214
+msgid "Which files the chunk is located in"
 msgstr ""
 
-#: plugins/stats/drawer/KPlotWgtDrawer.cc:383
-#: plugins/stats/drawer/PlainChartDrawer.cc:323
-msgid "Save as image…"
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:115
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:135
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:166
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:186
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:226
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:243
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:52
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverUploadLimit)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:81
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverDownloadLimit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:140
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:160
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:191
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:211
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:266
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:283
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
+#. i18n: file: plugins/infowidget/statustab.ui:289
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, ratio_limit)
+#. i18n: file: plugins/infowidget/statustab.ui:315
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, time_limit)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:91
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_download_rate)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:111
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_upload_rate)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:131
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_seed_time)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:154
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_share_ratio)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:80
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_rate)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:103
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_rate)
+#. i18n: file: ktorrent/pref/networkpref.ui:91
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxConnections)
+#. i18n: file: ktorrent/pref/networkpref.ui:111
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxTotalConnections)
+#. i18n: file: ktorrent/pref/networkpref.ui:131
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxDownloadRate)
+#. i18n: file: ktorrent/pref/networkpref.ui:154
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxUploadRate)
+#. i18n: file: ktorrent/pref/qmpref.ui:45
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxDownloads)
+#. i18n: file: ktorrent/pref/qmpref.ui:65
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxSeeds)
+#. i18n: file: ktorrent/pref/qmpref.ui:249
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxRatio)
+#. i18n: file: ktorrent/pref/qmpref.ui:272
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxSeedTime)
+#. i18n: file: ktorrent/pref/qmpref.ui:301
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_greenRatio)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:115
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:135
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:166
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:186
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:226
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:243
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:52
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverUploadLimit)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:81
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_screensaverDownloadLimit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:140
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:160
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:191
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:211
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:266
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_per_torrent)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:283
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_conn_global)
+#. i18n: file: plugins/infowidget/statustab.ui:289
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, ratio_limit)
+#. i18n: file: plugins/infowidget/statustab.ui:315
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, time_limit)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:91
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_download_rate)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:111
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_max_upload_rate)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:131
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_seed_time)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:154
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, m_max_share_ratio)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:80
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_rate)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:103
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_rate)
+#. i18n: file: ktorrent/pref/networkpref.ui:91
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxConnections)
+#. i18n: file: ktorrent/pref/networkpref.ui:111
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxTotalConnections)
+#. i18n: file: ktorrent/pref/networkpref.ui:131
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxDownloadRate)
+#. i18n: file: ktorrent/pref/networkpref.ui:154
+#. i18n: ectx: property (specialValueText), widget (QSpinBox, kcfg_maxUploadRate)
+#. i18n: file: ktorrent/pref/qmpref.ui:45
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxDownloads)
+#. i18n: file: ktorrent/pref/qmpref.ui:65
+#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_maxSeeds)
+#. i18n: file: ktorrent/pref/qmpref.ui:249
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxRatio)
+#. i18n: file: ktorrent/pref/qmpref.ui:272
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_maxSeedTime)
+#. i18n: file: ktorrent/pref/qmpref.ui:301
+#. i18n: ectx: property (specialValueText), widget (QDoubleSpinBox, kcfg_greenRatio)
+#: plugins/infowidget/statustab.cpp:66 ktorrent/dialogs/spinboxdelegate.cpp:41
+#: ktorrent/dialogs/speedlimitsmodel.cpp:138
+#: ktorrent/dialogs/speedlimitsmodel.cpp:143 rc.cpp:560 rc.cpp:569 rc.cpp:581
+#: rc.cpp:590 rc.cpp:605 rc.cpp:611 rc.cpp:629 rc.cpp:641 rc.cpp:713
+#: rc.cpp:722 rc.cpp:734 rc.cpp:743 rc.cpp:758 rc.cpp:764 rc.cpp:1405
+#: rc.cpp:1411 rc.cpp:1494 rc.cpp:1503 rc.cpp:1512 rc.cpp:1521 rc.cpp:1550
+#: rc.cpp:1559 rc.cpp:2148 rc.cpp:2157 rc.cpp:2166 rc.cpp:2178 rc.cpp:2544
+#: rc.cpp:2553 rc.cpp:2628 rc.cpp:2637 rc.cpp:2649 rc.cpp:560 rc.cpp:569
+#: rc.cpp:581 rc.cpp:590 rc.cpp:605 rc.cpp:611 rc.cpp:629 rc.cpp:641
+#: rc.cpp:713 rc.cpp:722 rc.cpp:734 rc.cpp:743 rc.cpp:758 rc.cpp:764
+#: rc.cpp:1405 rc.cpp:1411 rc.cpp:1494 rc.cpp:1503 rc.cpp:1512 rc.cpp:1521
+#: rc.cpp:1550 rc.cpp:1559 rc.cpp:2148 rc.cpp:2157 rc.cpp:2166 rc.cpp:2178
+#: rc.cpp:2544 rc.cpp:2553 rc.cpp:2628 rc.cpp:2637 rc.cpp:2649
+msgid "No limit"
 msgstr ""
 
-#: plugins/stats/drawer/KPlotWgtDrawer.cc:387
-#: plugins/stats/drawer/PlainChartDrawer.cc:327
-msgid "Rescale"
+#: plugins/infowidget/statustab.cpp:101
+msgid "Private"
 msgstr ""
 
-#: plugins/stats/drawer/KPlotWgtDrawer.cc:391
-#: plugins/stats/drawer/PlainChartDrawer.cc:331
-msgid "Reset"
+#: plugins/infowidget/statustab.cpp:101
+msgid "Public"
 msgstr ""
 
-#: plugins/stats/drawer/KPlotWgtDrawer.cc:403
-#: plugins/stats/drawer/PlainChartDrawer.cc:343
-msgid "Select path to save image…"
+#: plugins/infowidget/fileview.cpp:70 ktorrent/dialogs/fileselectdlg.cpp:96
+msgid "Filter"
 msgstr ""
 
-#: plugins/stats/drawer/ChartDrawer.cc:26
-msgid "KiB/s"
+#: plugins/infowidget/fileview.cpp:113
+msgctxt "Open file"
+msgid "Open"
 msgstr ""
 
-#: plugins/stats/drawer/ChartDrawerData.cc:25
-msgid "Unknown"
+#: plugins/infowidget/fileview.cpp:115
+msgid "Download first"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:512
-#. i18n: ectx: property (text), widget (QLabel, label_23)
-#: plugins/stats/ConnsTabPage.cc:57
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:666 rc.cpp:1705
-#: rc.cpp:1705
-msgid "Leechers connected"
+#: plugins/infowidget/fileview.cpp:116
+msgid "Download normally"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:547
-#. i18n: ectx: property (text), widget (QLabel, label_24)
-#: plugins/stats/ConnsTabPage.cc:61 plugins/stats/ConnsTabPage.cc:106
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:668 rc.cpp:1708
-#: rc.cpp:1708
-msgid "Leechers in swarms"
+#: plugins/infowidget/fileview.cpp:117
+msgid "Download last"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:582
-#. i18n: ectx: property (text), widget (QLabel, label_25)
-#: plugins/stats/ConnsTabPage.cc:64
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:670 rc.cpp:1711
-#: rc.cpp:1711
-msgid "Seeds connected"
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:53
+#. i18n: ectx: property (text), widget (KPushButton, m_dnd)
+#: plugins/infowidget/fileview.cpp:119 rc.cpp:1839 rc.cpp:1839
+msgid "Do Not Download"
 msgstr ""
 
-#: plugins/stats/ConnsTabPage.cc:68 plugins/stats/ConnsTabPage.cc:120
-#: plugins/stats/ConnsTabPage.cc:122
-msgid "Seeds in swarms"
+#: plugins/infowidget/fileview.cpp:120
+msgid "Delete File(s)"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:652
-#. i18n: ectx: property (text), widget (QLabel, label_27)
-#: plugins/stats/ConnsTabPage.cc:71
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:674 rc.cpp:1717
-#: rc.cpp:1717
-msgid "Average leechers connected per torrent"
+#: plugins/infowidget/fileview.cpp:122
+msgid "Move File"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:687
-#. i18n: ectx: property (text), widget (QLabel, label_28)
-#: plugins/stats/ConnsTabPage.cc:73
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:676 rc.cpp:1720
-#: rc.cpp:1720
-msgid "Average seeds connected per torrent"
+#: plugins/infowidget/fileview.cpp:124
+msgid "Collapse Folder Tree"
 msgstr ""
 
-#: plugins/stats/ConnsTabPage.cc:75
-msgid "Average leechers connected per running torrent"
+#: plugins/infowidget/fileview.cpp:125
+msgid "Expand Folder Tree"
 msgstr ""
 
-#: plugins/stats/ConnsTabPage.cc:77
-msgid "Average seeds connected per running torrent"
+#: plugins/infowidget/fileview.cpp:129
+msgid "File Tree"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:805
-#. i18n: ectx: property (text), widget (QLabel, label_31)
-#: plugins/stats/ConnsTabPage.cc:83
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:683 rc.cpp:1732
-#: rc.cpp:1732
-msgid "Nodes"
+#: plugins/infowidget/fileview.cpp:131
+msgid "File List"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:844
-#. i18n: ectx: property (text), widget (QLabel, label_32)
-#: plugins/stats/ConnsTabPage.cc:84
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:685 rc.cpp:1735
-#: rc.cpp:1735
-msgid "Tasks"
+#: plugins/infowidget/fileview.cpp:141
+msgid "Show Filter"
 msgstr ""
 
-#: plugins/stats/SettingsPage.cc:27
-msgid "Statistics"
+#: plugins/infowidget/fileview.cpp:305
+msgid ""
+"You will lose all data in this file, are you sure you want to do this?"
+msgid_plural ""
+"You will lose all data in these files, are you sure you want to do this?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/infowidget/fileview.cpp:320 plugins/infowidget/fileview.cpp:341
+#: ktorrent/view/view.cpp:354
+msgid "Select a directory to move the data to."
 msgstr ""
 
-#: plugins/stats/SettingsPage.cc:48
-#, kde-format
-msgid "(= %1 ms)"
+#: ktorrent/groups/groupview.cpp:118
+msgid "Custom Groups"
 msgstr ""
 
-#: plugins/bwscheduler/bwprefpage.cpp:27
-#: plugins/bwscheduler/bwschedulerplugin.cpp:87
-#: plugins/bwscheduler/bwschedulerplugin.cpp:119
-#: plugins/infowidget/infowidgetplugin.cpp:96
-msgid "Bandwidth Scheduler"
+#: ktorrent/groups/groupview.cpp:140 ktorrent/view/viewmanager.cpp:654
+msgid "New Group"
 msgstr ""
 
-#: plugins/bwscheduler/additemdlg.cpp:52
-msgid "Add an item"
+#: ktorrent/groups/groupview.cpp:144
+msgid "Edit Name"
 msgstr ""
 
-#: plugins/bwscheduler/additemdlg.cpp:78
-msgid "No day has been selected."
+#: ktorrent/groups/groupview.cpp:148
+msgid "Remove Group"
 msgstr ""
 
-#: plugins/bwscheduler/additemdlg.cpp:110
-msgid ""
-"Failed to add item, because it conflicts with another item on the schedule."
+#: ktorrent/groups/groupview.cpp:152
+msgid "Open Tab"
 msgstr ""
 
-#: plugins/bwscheduler/additemdlg.cpp:115
-msgid ""
-"This item could not be added to all selected days, because it conflicts with "
-"another item on the schedule."
+#: ktorrent/groups/groupview.cpp:156
+msgid "Group Policy"
 msgstr ""
 
-#: plugins/bwscheduler/schedule.cpp:124 plugins/bwscheduler/schedule.cpp:245
-#, kde-format
-msgid "Cannot open file %1: %2"
+#: ktorrent/groups/groupview.cpp:322
+msgid "Please enter the group name."
 msgstr ""
 
-#: plugins/bwscheduler/schedule.cpp:140 plugins/bwscheduler/schedule.cpp:146
+#: ktorrent/groups/groupview.cpp:329 ktorrent/groups/groupview.cpp:453
 #, kde-format
-msgid "The file %1 is corrupted or not a proper KTorrent schedule file."
+msgid "The group %1 already exists."
 msgstr ""
 
-#. i18n: file: plugins/bwscheduler/ktbwschedulerpluginui.rc:4
-#. i18n: ectx: ToolBar (SchedulerToolbar)
-#: plugins/bwscheduler/scheduleeditor.cpp:42 rc.cpp:2000 rc.cpp:2000
-msgid "Bandwidth Schedule"
+#: ktorrent/groups/grouppolicydlg.cpp:31
+#, kde-format
+msgid "Policy for the %1 group"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:45
-msgid "Edit the bandwidth schedule"
+#: ktorrent/dialogs/missingfilesdlg.cpp:72
+#: ktorrent/dialogs/missingfilesdlg.cpp:105
+msgid "Select the directory where the data now is."
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:88
-msgid "Load Schedule"
+#: ktorrent/dialogs/missingfilesdlg.cpp:83
+msgid ""
+"The data files are not present in the location you selected. Do you want to "
+"create all the files in the selected directory?"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:89
-msgid "Save Schedule"
+#: ktorrent/dialogs/missingfilesdlg.cpp:85
+msgid ""
+"Not all files were found in the new location; some are still missing. Do you "
+"want to create the missing files in the selected directory?"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:90
-msgid "New Item"
+#: ktorrent/dialogs/missingfilesdlg.cpp:114
+msgid ""
+"The data file is not present in the location you selected. Do you want to "
+"create the file in the selected directory?"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:91
-msgid "Remove Item"
+#: ktorrent/dialogs/importdialog.cpp:225 ktorrent/dialogs/importdialog.cpp:257
+#, kde-format
+msgid "Cannot load the torrent file: %1"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:92
-msgid "Edit Item"
+#: ktorrent/dialogs/importdialog.cpp:394 ktorrent/dialogs/importdialog.cpp:411
+#, kde-format
+msgid "Failed to create %1: %2"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:93
-msgid "Clear Schedule"
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:118
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:138
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:169
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:189
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:55
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverUploadLimit)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:84
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverDownloadLimit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:143
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:163
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:194
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:214
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:94
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_download_rate)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:114
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_upload_rate)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:83
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_rate)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:106
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_rate)
+#. i18n: file: ktorrent/pref/networkpref.ui:134
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxDownloadRate)
+#. i18n: file: ktorrent/pref/networkpref.ui:157
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxUploadRate)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:133
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_avg_speed_slot)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:118
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:138
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:169
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:189
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:55
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverUploadLimit)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:84
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_screensaverDownloadLimit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:143
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:163
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:194
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_download_limit)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:214
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_ss_upload_limit)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:94
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_download_rate)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:114
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_max_upload_rate)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:83
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_download_rate)
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:106
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_rate)
+#. i18n: file: ktorrent/pref/networkpref.ui:134
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxDownloadRate)
+#. i18n: file: ktorrent/pref/networkpref.ui:157
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxUploadRate)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:133
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_avg_speed_slot)
+#: ktorrent/dialogs/spinboxdelegate.cpp:39 rc.cpp:563 rc.cpp:572 rc.cpp:584
+#: rc.cpp:593 rc.cpp:632 rc.cpp:644 rc.cpp:716 rc.cpp:725 rc.cpp:737
+#: rc.cpp:746 rc.cpp:1497 rc.cpp:1506 rc.cpp:1553 rc.cpp:1562 rc.cpp:2169
+#: rc.cpp:2181 rc.cpp:2283 rc.cpp:563 rc.cpp:572 rc.cpp:584 rc.cpp:593
+#: rc.cpp:632 rc.cpp:644 rc.cpp:716 rc.cpp:725 rc.cpp:737 rc.cpp:746
+#: rc.cpp:1497 rc.cpp:1506 rc.cpp:1553 rc.cpp:1562 rc.cpp:2169 rc.cpp:2181
+#: rc.cpp:2283
+msgid " KiB/s"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:96
-msgid "Scheduler Active"
+#: ktorrent/dialogs/spinboxdelegate.cpp:43
+#: ktorrent/dialogs/speedlimitsmodel.cpp:148
+#: ktorrent/dialogs/speedlimitsmodel.cpp:153
+msgid "No assured speed"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:97
-msgid "Activate or deactivate the scheduler"
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, SpeedLimitsDlg)
+#: ktorrent/dialogs/speedlimitsdlg.cpp:50 ktorrent/view/viewmanager.cpp:686
+#: rc.cpp:1535 rc.cpp:1535
+msgid "Speed Limits"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:126
-#: plugins/bwscheduler/scheduleeditor.cpp:142
-msgid "KTorrent scheduler files"
+#: ktorrent/dialogs/speedlimitsmodel.cpp:111
+msgid "Download Limit"
 msgstr ""
 
-#: plugins/bwscheduler/scheduleeditor.cpp:189
-msgid ""
-"This item conflicts with another item in the schedule, we cannot change it."
+#: ktorrent/dialogs/speedlimitsmodel.cpp:112
+msgid "Upload Limit"
 msgstr ""
 
-#: plugins/bwscheduler/weekscene.cpp:74
-msgid "Current schedule: suspended"
+#: ktorrent/dialogs/speedlimitsmodel.cpp:113
+msgid "Assured Download Speed"
 msgstr ""
 
-#: plugins/bwscheduler/weekscene.cpp:76
-#, kde-format
-msgid "Current schedule: %1/s download, %2/s upload"
+#: ktorrent/dialogs/speedlimitsmodel.cpp:114
+msgid "Assured Upload Speed"
 msgstr ""
 
-#: plugins/bwscheduler/weekscene.cpp:79
+#: ktorrent/dialogs/torrentmigratordlg.cpp:97
 #, kde-format
-msgid "Current schedule: unlimited download, %1/s upload"
-msgstr ""
+msgid "Importing 1 torrent ..."
+msgid_plural "Importing %1 torrents ..."
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/bwscheduler/weekscene.cpp:81
+#: ktorrent/dialogs/torrentmigratordlg.cpp:105
 #, kde-format
-msgid "Current schedule: %1/s download, unlimited upload"
+msgid "Importing <b>%1</b> ..."
 msgstr ""
 
-#: plugins/bwscheduler/weekscene.cpp:83
-msgid "Current schedule: unlimited upload and download"
+#: ktorrent/dialogs/torrentmigratordlg.cpp:110
+msgid "Finished import."
 msgstr ""
 
-#: plugins/bwscheduler/weekscene.cpp:86
-msgid " (scheduler disabled)"
+#: ktorrent/dialogs/torrentmigratordlg.cpp:145
+#, kde-format
+msgid "Torrent <b>%1</b> already loaded."
 msgstr ""
 
-#: plugins/bwscheduler/weekscene.cpp:107
-msgid "Current schedule:"
+#: ktorrent/dialogs/torrentmigratordlg.cpp:152
+#, kde-format
+msgid "Failed to load <b>%1</b>"
 msgstr ""
 
-#: plugins/bwscheduler/schedulegraphicsitem.cpp:78
-msgid "Suspended"
+#: ktorrent/dialogs/torrentmigratordlg.cpp:160
+#, kde-format
+msgid "Failed to import <b>%1</b>: %2"
 msgstr ""
 
-#: plugins/bwscheduler/schedulegraphicsitem.cpp:85
+#: ktorrent/dialogs/torrentmigratordlg.cpp:164
 #, kde-format
-msgid ""
-"%1 Down\n"
-"%2 Up"
+msgid "Imported <b>%1</b>"
 msgstr ""
 
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, EditItemDlg)
-#: plugins/bwscheduler/edititemdlg.cpp:46
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:273 rc.cpp:1823
-#: rc.cpp:1823
-msgid "Edit an item"
+#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, PasteDlgBase)
+#: ktorrent/dialogs/pastedialog.cpp:38 rc.cpp:1669 rc.cpp:1669
+msgid "Open an URL"
 msgstr ""
 
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, DownloadOrderWidget)
-#: plugins/downloadorder/downloadorderdialog.cpp:38
-#: plugins/downloadorder/downloadorderplugin.cpp:46
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:112
-#: rc.cpp:2003 rc.cpp:2003
-msgid "File Download Order"
+#: ktorrent/dialogs/pastedialog.cpp:62 ktorrent/dialogs/fileselectdlg.cpp:427
+#: ktorrent/dialogs/torrentcreatordlg.cpp:118 libktcore/groups/allgroup.cpp:26
+msgid "All Torrents"
 msgstr ""
 
-#: plugins/downloadorder/downloadorderdialog.cpp:39
+#: ktorrent/dialogs/pastedialog.cpp:105
+#: ktorrent/dialogs/torrentcreatordlg.cpp:251 ktorrent/gui.cpp:338
 #, kde-format
-msgid "File download order for <b>%1</b>:"
+msgid "Invalid URL: %1"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:34
-msgctxt "@title:window"
-msgid "Configure Shutdown"
+#: ktorrent/dialogs/fileselectdlg.cpp:84
+msgid "Show a file tree"
 msgstr ""
 
-#. i18n: file: plugins/shutdown/ktshutdownpluginui.rc:5
-#. i18n: ectx: Menu (shutdown)
-#: plugins/shutdown/shutdowndlg.cpp:37 plugins/shutdown/shutdownplugin.cpp:166
-#: rc.cpp:2024 rc.cpp:2024
-msgid "Shutdown"
+#: ktorrent/dialogs/fileselectdlg.cpp:87
+msgid "Show a file list"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:38 plugins/shutdown/shutdownplugin.cpp:170
-msgid "Lock"
+#: ktorrent/dialogs/fileselectdlg.cpp:113
+#, kde-format
+msgid "Opening %1"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:42 plugins/shutdown/shutdowndlg.cpp:52
-#: plugins/shutdown/shutdownplugin.cpp:174
-msgid "Standby"
+#: ktorrent/dialogs/fileselectdlg.cpp:224
+msgid ""
+"Some files of this torrent have been found in the completed downloads "
+"directory. Do you want to import these files and use the completed downloads "
+"directory as the location?"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:45 plugins/shutdown/shutdowndlg.cpp:55
-#: plugins/shutdown/shutdownplugin.cpp:178
-msgid "Sleep (suspend to RAM)"
+#: ktorrent/dialogs/fileselectdlg.cpp:227
+msgid ""
+"All files of this torrent have been found in the completed downloads "
+"directory. Do you want to import these files and use the completed downloads "
+"directory as the location?"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:48 plugins/shutdown/shutdowndlg.cpp:58
-#: plugins/shutdown/shutdownplugin.cpp:182
-msgid "Hibernate (suspend to disk)"
+#: ktorrent/dialogs/fileselectdlg.cpp:231
+#, kde-format
+msgid ""
+"The file <b>%1</b> was found in the completed downloads directory. Do you "
+"want to import this file?"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:60
-msgid "When all torrents finish downloading"
+#: ktorrent/dialogs/fileselectdlg.cpp:246
+#: ktorrent/dialogs/fileselectdlg.cpp:263
+#, kde-format
+msgid "The directory %1 does not exist, do you want to create it?"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:61
-msgid "When all torrents finish seeding"
+#: ktorrent/dialogs/fileselectdlg.cpp:296
+msgid ""
+"You have deselected the following existing files. You will lose all data in "
+"these files, are you sure you want to do this?"
 msgstr ""
 
-#: plugins/shutdown/shutdowndlg.cpp:62
-msgid "When the events below happen"
+#: ktorrent/dialogs/fileselectdlg.cpp:300
+msgid "Yes, delete the files"
 msgstr ""
 
-#: plugins/shutdown/shutdownplugin.cpp:50
-msgid "Shutdown Enabled"
+#: ktorrent/dialogs/fileselectdlg.cpp:301
+msgid "No, keep the files"
 msgstr ""
 
-#: plugins/shutdown/shutdownplugin.cpp:54
-msgid "Configure Shutdown"
+#: ktorrent/dialogs/fileselectdlg.cpp:326
+#, kde-format
+msgid ""
+"Opening the torrent <b>%1</b>, would share one or more files with the "
+"following torrents. Torrents are not allowed to write to the same files. "
+"Please select a different location."
 msgstr ""
 
-#: plugins/shutdown/shutdowntorrentmodel.cpp:92
-#: plugins/shutdown/shutdowntorrentmodel.cpp:235
-msgid "Downloading finishes"
+#: ktorrent/dialogs/fileselectdlg.cpp:499
+msgid "<b>Unable to determine free space</b>"
 msgstr ""
 
-#: plugins/shutdown/shutdowntorrentmodel.cpp:94
-#: plugins/shutdown/shutdowntorrentmodel.cpp:236
-msgid "Seeding finishes"
+#: ktorrent/dialogs/fileselectdlg.cpp:511
+#, kde-format
+msgctxt "We are %1 bytes short of what we need"
+msgid "%1 short"
 msgstr ""
 
-#: plugins/shutdown/shutdowntorrentmodel.cpp:154
-msgid "Event"
+#: ktorrent/dialogs/fileselectdlg.cpp:532
+msgid "Existing files: <b>None</b>"
 msgstr ""
 
-#. i18n: file: plugins/upnp/upnpwidget.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, UPnPWidget)
-#: plugins/upnp/upnpplugin.cpp:56 plugins/upnp/upnpplugin.cpp:60
-#: plugins/upnp/upnpplugin.cpp:71
-#: obj-i686-linux-gnu/plugins/upnp/ui_upnpwidget.h:89 rc.cpp:2042 rc.cpp:2042
-msgid "UPnP"
+#: ktorrent/dialogs/fileselectdlg.cpp:534
+msgid "Existing files: <b>All</b>"
 msgstr ""
 
-#: plugins/upnp/upnpplugin.cpp:61
-msgid "Shows the status of the UPnP plugin"
+#: ktorrent/dialogs/fileselectdlg.cpp:536
+#, kde-format
+msgid "Existing files: <b>%1</b> of <b>%2</b>"
 msgstr ""
 
-#: plugins/upnp/routermodel.cpp:69
-msgid "Device"
-msgstr "Dyfais"
-
-#: plugins/upnp/routermodel.cpp:70
-msgid "Port Forwarded"
+#: ktorrent/dialogs/fileselectdlg.cpp:542
+msgid "Existing file: <b>No</b>"
 msgstr ""
 
-#: plugins/upnp/routermodel.cpp:71
-msgid "WAN Connection"
+#: ktorrent/dialogs/fileselectdlg.cpp:544
+msgid "Existing file: <b>Yes</b>"
 msgstr ""
 
-#: plugins/upnp/routermodel.cpp:115
-#, kde-format
-msgid ""
-"Model Name: <b>%1</b><br/>Manufacturer: <b>%2</b><br/>Model Description: "
-"<b>%3</b><br/>"
+#: ktorrent/dialogs/fileselectdlg.cpp:616
+msgid "Clear History"
 msgstr ""
 
-#: plugins/syndication/feedlist.cpp:175
-#, kde-format
-msgid ""
-"%2\n"
-"1 active filter"
-msgid_plural ""
-"%2\n"
-"%1 active filters"
-msgstr[0] ""
-msgstr[1] ""
-
-#: plugins/syndication/feedlist.cpp:183
-#, kde-format
-msgid "<b>%1</b><br/><br/>Download failed: <b>%2</b>"
+#: ktorrent/dialogs/torrentcreatordlg.cpp:44
+msgid "Create A Torrent"
 msgstr ""
 
-#: plugins/syndication/feedlist.cpp:185 plugins/scripting/scriptmodel.cpp:178
-#, kde-format
-msgid "<b>%1</b><br/><br/>%2"
+#: ktorrent/dialogs/torrentcreatordlg.cpp:257
+msgid "Only HTTP is supported for webseeding."
 msgstr ""
 
-#: plugins/syndication/managefiltersdlg.cpp:33
-#: plugins/syndication/syndicationplugin.cpp:95
-msgid "Add/Remove Filters"
+#: ktorrent/dialogs/torrentcreatordlg.cpp:289
+msgid "You must select a file or a folder."
 msgstr ""
 
-#: plugins/syndication/managefiltersdlg.cpp:35
-#, kde-format
-msgid "Feed: <b>%1</b>"
+#: ktorrent/dialogs/torrentcreatordlg.cpp:295
+msgid ""
+"You have not added a tracker, are you sure you want to create this torrent?"
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:48
-#: plugins/syndication/syndicationplugin.cpp:42
-#: plugins/syndication/syndicationplugin.cpp:47
-msgid "Syndication"
+#: ktorrent/dialogs/torrentcreatordlg.cpp:303
+msgid "You must add at least one node."
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:54
-msgid "Manages RSS and Atom feeds"
+#: ktorrent/dialogs/torrentcreatordlg.cpp:369
+msgid "Choose a file to save the torrent"
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:131
-msgid "Enter the URL"
+#: ktorrent/view/viewmodel.cpp:436 ktorrent/tools/queuemanagermodel.cpp:122
+msgid "Name"
+msgstr "Enw"
+
+#: ktorrent/view/viewmodel.cpp:439
+#: libktcore/torrent/torrentfilelistmodel.cpp:77
+#: libktcore/torrent/torrentfiletreemodel.cpp:400
+msgid "Size"
+msgstr "Maint"
+
+#: ktorrent/view/viewmodel.cpp:443
+msgid "Time Left"
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:131
-msgid "Please enter the URL of the RSS or Atom feed."
+#: ktorrent/view/viewmodel.cpp:447
+#, no-c-format
+msgid "% Complete"
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:156
-#, kde-format
-msgid "Failed to load feed %1."
+#: ktorrent/view/viewmodel.cpp:448
+msgid "Share Ratio"
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:172
-#, kde-format
-msgid "Failed to create directory for feed %1: %2"
+#: ktorrent/view/viewmodel.cpp:449
+msgid "Time Downloaded"
 msgstr ""
 
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:127
-#. i18n: ectx: property (text), widget (QPushButton, m_new_filter)
-#: plugins/syndication/syndicationactivity.cpp:280
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:167
-#: rc.cpp:2259 rc.cpp:2259
-msgid "New Filter"
+#: ktorrent/view/viewmodel.cpp:450
+msgid "Time Seeded"
 msgstr ""
 
-#: plugins/syndication/syndicationactivity.cpp:282
-msgid "Add New Filter"
+#: ktorrent/view/viewmodel.cpp:451
+msgid "Location"
 msgstr ""
 
-#: plugins/syndication/feedwidgetmodel.cpp:82
-#: plugins/mediaplayer/playlist.cpp:91
-msgid "Title"
+#: ktorrent/view/viewmodel.cpp:452
+msgid "Added"
 msgstr ""
 
-#: plugins/syndication/feedwidgetmodel.cpp:83
-msgid "Date Published"
+#: ktorrent/view/viewmodel.cpp:460
+msgid "How much data we have downloaded of the torrent"
 msgstr ""
 
-#: plugins/syndication/linkdownloader.cpp:169
-#, kde-format
-msgid "Could not find a valid link to a torrent on %1"
+#: ktorrent/view/viewmodel.cpp:461
+msgid "Total size of the torrent, excluded files are not included"
 msgstr ""
 
-#: plugins/syndication/filtereditor.cpp:39
-#: plugins/syndication/syndicationplugin.cpp:107
-msgid "Edit Filter"
+#: ktorrent/view/viewmodel.cpp:462
+msgid "How much data we have uploaded"
 msgstr ""
 
-#: plugins/syndication/filtereditor.cpp:233
-#, kde-format
-msgid "There already is a filter named %1, filter names must be unique."
+#: ktorrent/view/viewmodel.cpp:463
+msgid "Current download speed"
 msgstr ""
 
-#: plugins/syndication/feedwidget.cpp:107
-msgid "Authentication Cookie"
+#: ktorrent/view/viewmodel.cpp:464
+msgid "Current upload speed"
 msgstr ""
 
-#: plugins/syndication/feedwidget.cpp:107
-msgid "Enter the new authentication cookie"
+#: ktorrent/view/viewmodel.cpp:465
+msgid ""
+"How much time is left before the torrent is finished or before the maximum "
+"share ratio is reached, if that is enabled"
 msgstr ""
 
-#: plugins/syndication/feedwidget.cpp:126
-msgid "<b>OK</b>"
+#: ktorrent/view/viewmodel.cpp:466
+msgid ""
+"How many seeders we are connected to (How many seeders there are according "
+"to the tracker)"
 msgstr ""
 
-#: plugins/syndication/feedwidget.cpp:129
-msgid "<b>Not Loaded</b>"
+#: ktorrent/view/viewmodel.cpp:467
+msgid ""
+"How many leechers we are connected to (How many leechers there are according "
+"to the tracker)"
 msgstr ""
 
-#: plugins/syndication/feedwidget.cpp:132
-#, kde-format
-msgid "<b>Download Failed: %1</b>"
+#: ktorrent/view/viewmodel.cpp:469
+#, no-c-format
+msgid ""
+"The percentage of data we have of the whole torrent, not including excluded "
+"files"
 msgstr ""
 
-#: plugins/syndication/feedwidget.cpp:135
-msgid "<b>Downloading</b>"
+#: ktorrent/view/viewmodel.cpp:470
+msgid ""
+"Share ratio is the number of bytes uploaded divided by the number of bytes "
+"downloaded"
 msgstr ""
 
-#: plugins/syndication/syndicationplugin.cpp:86
-msgid "Add Feed"
+#: ktorrent/view/viewmodel.cpp:471
+msgid "How long we have been downloading the torrent"
 msgstr ""
 
-#: plugins/syndication/syndicationplugin.cpp:89
-msgid "Remove Feed"
+#: ktorrent/view/viewmodel.cpp:472
+msgid "How long we have been seeding the torrent"
 msgstr ""
 
-#: plugins/syndication/syndicationplugin.cpp:92
-msgid "Show Feed"
+#: ktorrent/view/viewmodel.cpp:473
+msgid "The location of the torrent's data on disk"
 msgstr ""
 
-#: plugins/syndication/syndicationplugin.cpp:98
-msgid "Rename"
+#: ktorrent/view/viewmodel.cpp:474
+msgid "When this torrent was added"
 msgstr ""
 
-#: plugins/syndication/syndicationplugin.cpp:101
-msgid "Add Filter"
+#: ktorrent/view/viewmodel.cpp:520
+msgid "Unable to contact a tracker."
 msgstr ""
 
-#: plugins/syndication/syndicationplugin.cpp:104
-msgid "Remove Filter"
+#: ktorrent/view/viewmodel.cpp:526
+#, kde-format
+msgid "%1<br>Url: <b>%2</b>"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:71
-#: plugins/infowidget/iwprefpage.cpp:27
-msgid "Info Widget"
+#: ktorrent/view/viewmanager.cpp:573
+msgctxt "@action Start all selected torrents in the current tab"
+msgid "Start"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:83
-msgctxt "@title:tab"
-msgid "Status"
+#: ktorrent/view/viewmanager.cpp:574
+msgid "Start all selected torrents in the current tab"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:84
-msgid "Displays status information about a torrent"
+#: ktorrent/view/viewmanager.cpp:579
+msgctxt "@action Stop all selected torrents in the current tab"
+msgid "Stop"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:85
-msgctxt "@title:tab"
-msgid "Files"
+#: ktorrent/view/viewmanager.cpp:580
+msgid "Stop all selected torrents in the current tab"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:86
-msgid "Shows all the files in a torrent"
+#: ktorrent/view/viewmanager.cpp:585
+msgctxt "@action Pause all selected torrents in the current tab"
+msgid "Pause"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:223
-msgid "Displays all the peers you are connected to for a torrent"
+#: ktorrent/view/viewmanager.cpp:586
+msgid "Pause all selected torrents in the current tab"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ChunkDownloadView)
-#. i18n: file: plugins/infowidget/statustab.ui:164
-#. i18n: ectx: property (text), widget (QLabel, hdr_chunks)
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ChunkDownloadView)
-#. i18n: file: plugins/infowidget/statustab.ui:164
-#. i18n: ectx: property (text), widget (QLabel, hdr_chunks)
-#: plugins/infowidget/infowidgetplugin.cpp:244
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:287
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:218
-#: rc.cpp:2277 rc.cpp:2395 rc.cpp:2277 rc.cpp:2395
-msgid "Chunks"
+#: ktorrent/view/viewmanager.cpp:590
+msgctxt "@action Remove all selected torrents in the current tab"
+msgid "Remove"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:245
-msgid "Displays all the chunks you are downloading, of a torrent"
+#: ktorrent/view/viewmanager.cpp:591
+msgid "Remove all selected torrents in the current tab"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:160
-#. i18n: ectx: attribute (title), widget (QWidget, m_tracker_tab)
-#: plugins/infowidget/infowidgetplugin.cpp:266
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:380 rc.cpp:289
-#: rc.cpp:289
-msgid "Trackers"
+#: ktorrent/view/viewmanager.cpp:596
+msgctxt "@action Start all torrents in the current tab"
+msgid "Start All"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:267
-msgid "Displays information about all the trackers of a torrent"
+#: ktorrent/view/viewmanager.cpp:597
+msgid "Start all torrents in the current tab"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:285
-msgid "Webseeds"
+#: ktorrent/view/viewmanager.cpp:602
+msgctxt "@action Stop all torrents in the current tab"
+msgid "Stop All"
 msgstr ""
 
-#: plugins/infowidget/infowidgetplugin.cpp:286
-msgid "Displays all the webseeds of a torrent"
+#: ktorrent/view/viewmanager.cpp:603
+msgid "Stop all torrents in the current tab"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:90
-#: plugins/infowidget/iwfilelistmodel.cpp:78
-msgctxt "@title:column"
-msgid "Preview"
+#: ktorrent/view/viewmanager.cpp:608
+msgid "Remove Torrent and Data"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:92
-#: plugins/infowidget/iwfilelistmodel.cpp:80
-#, no-c-format
-msgctxt "Percent of File Downloaded"
-msgid "% Complete"
+#: ktorrent/view/viewmanager.cpp:613
+msgid "Rename Torrent"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:101
-#: plugins/infowidget/iwfilelistmodel.cpp:89
-msgctxt "Download first"
-msgid "First"
+#: ktorrent/view/viewmanager.cpp:617
+msgid "Add Peers"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:102
-#: plugins/infowidget/iwfilelistmodel.cpp:90
-msgctxt "Download last"
-msgid "Last"
+#: ktorrent/view/viewmanager.cpp:621
+msgid "Manual Announce"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:107
-msgctxt "Download normally(not as first or last)"
-msgid "Normal"
+#: ktorrent/view/viewmanager.cpp:626
+msgid "Scrape"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:159
-msgctxt "preview available"
-msgid "Available"
-msgstr ""
+#: ktorrent/view/viewmanager.cpp:630
+msgid "Preview"
+msgstr "Rhagolwg"
 
-#: plugins/infowidget/iwfiletreemodel.cpp:161
-#: plugins/infowidget/iwfiletreemodel.cpp:184
-#: plugins/infowidget/iwfilelistmodel.cpp:148
-#: plugins/infowidget/iwfilelistmodel.cpp:171
-msgctxt "Preview pending"
-msgid "Pending"
+#: ktorrent/view/viewmanager.cpp:634
+msgid "Data Directory"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:164
-#: plugins/infowidget/iwfiletreemodel.cpp:187
-#: plugins/infowidget/iwfilelistmodel.cpp:151
-#: plugins/infowidget/iwfilelistmodel.cpp:174
-msgctxt "No preview available"
-msgid "No"
+#: ktorrent/view/viewmanager.cpp:638
+msgid "Temporary Directory"
 msgstr ""
 
-#: plugins/infowidget/iwfiletreemodel.cpp:169
-#: plugins/infowidget/iwfiletreemodel.cpp:189
-#: plugins/infowidget/iwfiletreemodel.cpp:195
-#: plugins/infowidget/iwfilelistmodel.cpp:155
-#: plugins/infowidget/iwfilelistmodel.cpp:178
-#, kde-format
-msgid "%1 %"
-msgstr "%1 %"
-
-#: plugins/infowidget/iwfiletreemodel.cpp:182
-#: plugins/infowidget/iwfilelistmodel.cpp:146
-#: plugins/infowidget/iwfilelistmodel.cpp:169
-msgctxt "Preview available"
-msgid "Available"
+#: ktorrent/view/viewmanager.cpp:642
+msgid "Move Data"
 msgstr ""
 
-#: plugins/infowidget/iwfilelistmodel.cpp:95
-msgctxt "Download Normal (not as first or last)"
-msgid "Normal"
+#. i18n: file: plugins/stats/Settings.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, StatsSettingsWgt)
+#: ktorrent/view/viewmanager.cpp:646 rc.cpp:1219 rc.cpp:1219
+msgid "Settings"
 msgstr ""
 
-#: plugins/infowidget/trackermodel.cpp:147
-#: plugins/infowidget/webseedsmodel.cpp:124
-msgid "URL"
-msgstr "URL"
+#: ktorrent/view/viewmanager.cpp:650
+msgid "Remove from Group"
+msgstr ""
 
-#: plugins/infowidget/trackermodel.cpp:151
-msgid "Times Downloaded"
+#: ktorrent/view/viewmanager.cpp:658
+msgid "Check Data"
 msgstr ""
 
-#: plugins/infowidget/trackermodel.cpp:152
-msgid "Next Update"
+#: ktorrent/view/viewmanager.cpp:659
+msgid "Check all the data of a torrent"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/trackerview.ui:22
-#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
-#: plugins/infowidget/trackerview.cpp:88
-#: obj-i686-linux-gnu/plugins/infowidget/ui_trackerview.h:98 rc.cpp:2262
-#: rc.cpp:2262
-msgid "Add Trackers"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:56
+#. i18n: ectx: Menu (OpenDirMenu)
+#: ktorrent/view/viewmanager.cpp:672 rc.cpp:2755 rc.cpp:2755
+msgid "Open Directory"
 msgstr ""
 
-#: plugins/infowidget/trackerview.cpp:89
-msgid "Enter the URL's of the trackers, one per line:"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:62
+#. i18n: ectx: Menu (GroupsSubMenu)
+#: ktorrent/view/viewmanager.cpp:675 rc.cpp:2758 rc.cpp:2758
+msgid "Add to Group"
 msgstr ""
 
-#: plugins/infowidget/trackerview.cpp:113
-msgid "Several URL's could not be added because they are malformed:"
+#: ktorrent/view/viewmanager.cpp:678
+msgid "Copy Torrent URL"
 msgstr ""
 
-#: plugins/infowidget/trackerview.cpp:133
-#, kde-format
-msgid "There already is a tracker named <b>%1</b>."
+#: ktorrent/view/viewmanager.cpp:682
+msgid "Export Torrent"
 msgstr ""
 
-#: plugins/infowidget/trackerview.cpp:135
-msgid "The following duplicate trackers were not added:"
+#: ktorrent/view/viewmanager.cpp:687
+msgid "Set the speed limits of individual torrents"
 msgstr ""
 
-#: plugins/infowidget/availabilitychunkbar.cpp:33
-msgid ""
-"<img src=\"available_color\">&nbsp; - Available Chunks<br><img "
-"src=\"unavailable_color\">&nbsp; - Unavailable Chunks<br><img "
-"src=\"excluded_color\">&nbsp; - Excluded Chunks"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:70
+#. i18n: ectx: Menu (ColumnsMenu)
+#: ktorrent/view/view.cpp:79 rc.cpp:2764 rc.cpp:2764
+msgid "Columns"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:113
-msgctxt "Open file"
-msgid "Open"
+#: ktorrent/view/view.cpp:232
+#, kde-format
+msgid ""
+"The torrent <b>%1</b> has not finished downloading, do you want to delete "
+"the incomplete data, too?"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:115
-msgid "Download first"
+#: ktorrent/view/view.cpp:237
+msgid "Remove Download"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:116
-msgid "Download normally"
+#: ktorrent/view/view.cpp:238
+msgid "Delete Data"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:117
-msgid "Download last"
+#: ktorrent/view/view.cpp:239
+msgid "Keep Data"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:53
-#. i18n: ectx: property (text), widget (KPushButton, m_dnd)
-#: plugins/infowidget/fileview.cpp:119
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:119 rc.cpp:217 rc.cpp:217
-msgid "Do Not Download"
+#: ktorrent/view/view.cpp:258
+msgid ""
+"You will lose all the downloaded data. Are you sure you want to do this?"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:120
-msgid "Delete File(s)"
+#: ktorrent/view/view.cpp:259
+msgid "Remove Torrent"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:122
-msgid "Move File"
+#: ktorrent/view/scanextender.cpp:46
+msgid "Checked %v of %m chunks"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:124
-msgid "Collapse Folder Tree"
+#: ktorrent/view/scanextender.cpp:127
+#, kde-format
+msgid "<font color=\"red\">%1</font>"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:125
-msgid "Expand Folder Tree"
+#: ktorrent/trayicon.cpp:110
+msgid "Set max upload speed"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:129
-msgid "File Tree"
+#: ktorrent/trayicon.cpp:112
+msgid "Set max download speed"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:131
-msgid "File List"
+#: ktorrent/trayicon.cpp:146
+#, kde-format
+msgid ""
+"<table><tr><td>Download&nbsp;speed:</td><td><b>%1</b></td></tr><tr><td>Upload"
+"&nbsp;speed:</td><td><b>%2</b></td></tr><tr><td>Received:</td><td><b>%3</b></"
+"td></tr><tr><td>Transmitted:</td><td><b>%4</b></td></tr></table>"
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:141
-msgid "Show Filter"
+#: ktorrent/trayicon.cpp:191
+#, kde-format
+msgid "<b>%1</b> has completed downloading.<br>Average speed: %2 DL / %3 UL."
 msgstr ""
 
-#: plugins/infowidget/fileview.cpp:305
+#: ktorrent/trayicon.cpp:209
+#, kde-format
 msgid ""
-"You will lose all data in this file, are you sure you want to do this?"
-msgid_plural ""
-"You will lose all data in these files, are you sure you want to do this?"
-msgstr[0] ""
-msgstr[1] ""
+"<b>%1</b> has reached its maximum share ratio of %2 and has been "
+"stopped.<br>Uploaded %3 at an average speed of %4."
+msgstr ""
 
-#: plugins/infowidget/webseedstab.cpp:97
+#: ktorrent/trayicon.cpp:228
 #, kde-format
 msgid ""
-"Cannot add the webseed %1, it is already part of the list of webseeds."
+"<b>%1</b> has reached its maximum seed time of %2 hours and has been "
+"stopped.<br>Uploaded %3 at an average speed of %4."
 msgstr ""
 
-#: plugins/infowidget/webseedstab.cpp:114
+#: ktorrent/trayicon.cpp:243
 #, kde-format
-msgid "Cannot remove webseed %1, it is part of the torrent."
+msgid "<b>%1</b> has been stopped with the following error: <br>%2"
 msgstr ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:198
-msgid "Chunk"
+#: ktorrent/trayicon.cpp:254
+#, kde-format
+msgid ""
+"Corrupted data has been found in the torrent <b>%1</b><br>It would be a good "
+"idea to do a data integrity check on the torrent."
 msgstr ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:199
-msgid "Progress"
-msgstr "Cynnydd"
-
-#: plugins/infowidget/chunkdownloadmodel.cpp:200
-msgid "Peer"
+#: ktorrent/trayicon.cpp:271
+#, kde-format
+msgid ""
+"<b>%1</b> has reached its maximum share ratio of %2 and cannot be enqueued. "
+"<br>Remove the limit manually if you want to continue seeding."
 msgstr ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:202
-msgid "Files"
+#: ktorrent/trayicon.cpp:275
+#, kde-format
+msgid ""
+"<b>%1</b> has reached its maximum seed time of %2 hours and cannot be "
+"enqueued. <br>Remove the limit manually if you want to continue seeding."
 msgstr ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:210
-msgid "Number of the chunk"
+#: ktorrent/trayicon.cpp:287
+#, kde-format
+msgid "Cannot start <b>%1</b>: <br>"
 msgstr ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:211
-msgid "Download progress of the chunk"
-msgstr ""
+#: ktorrent/trayicon.cpp:294
+#, kde-format
+msgid "Cannot seed more than 1 torrent. <br>"
+msgid_plural "Cannot seed more than %1 torrents. <br>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:212
-msgid "Which peer we are downloading it from"
-msgstr ""
+#: ktorrent/trayicon.cpp:299
+#, kde-format
+msgid "Cannot download more than 1 torrent. <br>"
+msgid_plural "Cannot download more than %1 torrents. <br>"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:213
-msgid "Download speed of the chunk"
+#: ktorrent/trayicon.cpp:302
+msgid ""
+"Go to Settings -> Configure KTorrent, if you want to change the limits."
 msgstr ""
 
-#: plugins/infowidget/chunkdownloadmodel.cpp:214
-msgid "Which files the chunk is located in"
+#: ktorrent/trayicon.cpp:306
+msgid "There is not enough diskspace available."
 msgstr ""
 
-#: plugins/infowidget/statustab.cpp:101
-msgid "Private"
+#: ktorrent/trayicon.cpp:319
+#, kde-format
+msgid ""
+"Your disk is running out of space.<br /><b>%1</b> is being downloaded to "
+"'%2'."
 msgstr ""
 
-#: plugins/infowidget/statustab.cpp:101
-msgid "Public"
+#: ktorrent/trayicon.cpp:322
+msgid "Torrent has been stopped.<br />"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:88
-msgid " (µTP)"
+#: ktorrent/trayicon.cpp:358
+msgid "Speed limit in KiB/s"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:103
-msgctxt "Choked"
-msgid "Yes"
+#: ktorrent/pref/proxypref.cpp:27
+msgid "Proxy"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:103
-msgctxt "Not choked"
-msgid "No"
+#: ktorrent/pref/generalpref.cpp:27
+msgid "Application"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:104
-msgctxt "Snubbed"
-msgid "Yes"
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:266
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: ktorrent/pref/qmpref.ui:27
+#. i18n: ectx: property (title), widget (QGroupBox, m_qm_group_box)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, QueueManagerWidget)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:266
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: ktorrent/pref/qmpref.ui:27
+#. i18n: ectx: property (title), widget (QGroupBox, m_qm_group_box)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, QueueManagerWidget)
+#: ktorrent/pref/qmpref.cpp:25 ktorrent/torrentactivity.cpp:82 rc.cpp:2310
+#: rc.cpp:2535 rc.cpp:2770 rc.cpp:2310 rc.cpp:2535 rc.cpp:2770
+msgid "Queue Manager"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:104
-msgctxt "Not snubbed"
-msgid "No"
-msgstr ""
+#: ktorrent/pref/qmpref.cpp:29
+msgid " minute"
+msgid_plural " minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/infowidget/peerviewmodel.cpp:112
-msgctxt "Interested"
-msgid "Yes"
+#: ktorrent/pref/recommendedsettingsdlg.cpp:37
+msgid "Calculate Recommended Settings"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:112
-msgctxt "Not Interested"
-msgid "No"
+#: ktorrent/pref/recommendedsettingsdlg.cpp:245
+#: ktorrent/pref/recommendedsettingsdlg.cpp:251
+#, kde-format
+msgid "(= %1/s)"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:113
-msgctxt "Interesting"
-msgid "Yes"
+#: ktorrent/pref/btpref.cpp:27
+msgid "BitTorrent"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:113
-msgctxt "Not Interesting"
-msgid "No"
-msgstr ""
+#: ktorrent/pref/btpref.cpp:31
+msgid " corrupted chunk"
+msgid_plural " corrupted chunks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/infowidget/peerviewmodel.cpp:254
-msgid "Address"
+#: ktorrent/pref/btpref.cpp:33
+msgid " corrupted chunks"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:255
-msgid "Country"
-msgstr "Gwlad"
-
-#: plugins/infowidget/peerviewmodel.cpp:256
-msgid "Client"
-msgstr "Dibynnydd:"
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:201
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: ktorrent/pref/networkpref.cpp:35 rc.cpp:2295 rc.cpp:2295
+msgid "Network"
+msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:259
-msgid "Choked"
+#: ktorrent/pref/networkpref.cpp:56
+msgid "All interfaces"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:260
-msgid "Snubbed"
+#. i18n: file: ktorrent/pref/networkpref.ui:170
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: ktorrent/pref/advancedpref.cpp:27 rc.cpp:2184 rc.cpp:2184
+msgid "Advanced"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:261
-msgid "Availability"
+#: ktorrent/core.cpp:178
+#, kde-format
+msgid ""
+"KTorrent is unable to accept connections because the TCP ports %1 is already "
+"in use by another program."
 msgstr ""
 
-#. i18n: file: plugins/stats/Conns.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, DhtGbw)
-#. i18n: file: plugins/stats/Settings.ui:234
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#. i18n: file: plugins/stats/DisplaySettings.ui:795
-#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
-#. i18n: file: plugins/stats/Conns.ui:31
-#. i18n: ectx: property (title), widget (QGroupBox, DhtGbw)
-#. i18n: file: plugins/stats/Settings.ui:234
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#. i18n: file: plugins/stats/DisplaySettings.ui:795
-#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
-#: plugins/infowidget/peerviewmodel.cpp:262
-#: obj-i686-linux-gnu/plugins/stats/ui_Conns.h:80
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:297
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:687 rc.cpp:1483
-#: rc.cpp:1519 rc.cpp:1729 rc.cpp:1483 rc.cpp:1519 rc.cpp:1729
-msgid "DHT"
+#: ktorrent/core.cpp:192
+#, kde-format
+msgid ""
+"KTorrent is unable to accept connections because the UDP port %1 is already "
+"in use by another program."
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:263
-msgid "Score"
-msgstr "Sgôr"
+#: ktorrent/core.cpp:305
+#, kde-format
+msgid ""
+"Opening the torrent <b>%1</b>, would share one or more files with the "
+"following torrents. .Torrents are not allowed to write to the same files. "
+msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:264
-msgid "Upload Slot"
+#: ktorrent/core.cpp:1022
+msgid "KTorrent is running one or more torrents"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:265
-msgid "Requests"
+#: ktorrent/core.cpp:1109
+#, kde-format
+msgid "Cannot create torrent: %1"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:268
-msgid "Interested"
+#: ktorrent/core.cpp:1212
+#, kde-format
+msgid ""
+"Several data files of the torrent \"%1\" are missing. \n"
+"Do you want to recreate them, or do you want to not download them?"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:269
-msgid "Interesting"
+#: ktorrent/core.cpp:1221 ktorrent/core.cpp:1232 ktorrent/core.cpp:1245
+msgid "Data files are missing"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:277
-msgid "IP address of the peer"
+#: ktorrent/core.cpp:1231
+#, kde-format
+msgid "Cannot deselect missing files: %1"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:278
-msgid "Country the peer is in"
+#: ktorrent/core.cpp:1244
+#, kde-format
+msgid "Cannot recreate missing files: %1"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:279
-msgid "Which client the peer is using"
+#: ktorrent/core.cpp:1255
+#, kde-format
+msgid ""
+"The file where the data is saved of the torrent \"%1\" is missing.\n"
+"Do you want to recreate it?"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:280
-msgid "Download speed"
+#: ktorrent/core.cpp:1262 ktorrent/core.cpp:1272
+msgid "Data file is missing"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:281
-msgid "Upload speed"
+#: ktorrent/core.cpp:1271
+#, kde-format
+msgid "Cannot recreate data file: %1"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:282
+#: ktorrent/core.cpp:1359
+#, kde-format
 msgid ""
-"Whether or not the peer has choked us - when we are choked the peer will not "
-"send us any data"
-msgstr ""
-
-#: plugins/infowidget/peerviewmodel.cpp:283
-msgid "Snubbed means the peer has not sent us any data in the last 2 minutes"
-msgstr ""
+"KTorrent has found a torrent from the KDE3 version of KTorrent, do you want "
+"to import it?"
+msgid_plural ""
+"KTorrent has found %1 torrents from the KDE3 version of KTorrent, do you "
+"want to import them?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugins/infowidget/peerviewmodel.cpp:284
-msgid "How much data the peer has of the torrent"
+#: ktorrent/core.cpp:1381
+msgid "No torrents from the KDE3 version were found."
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:285
-msgid "Whether or not the peer has DHT enabled"
+#: ktorrent/core.cpp:1413 ktorrent/core.cpp:1432
+#, kde-format
+msgid "Invalid magnet bittorrent link: %1"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:286
+#: ktorrent/core.cpp:1418 ktorrent/core.cpp:1437
 msgid ""
-"The score of the peer, KTorrent uses this to determine who to upload to"
+"You are attempting to download a magnet link, and DHT is not enabled. For "
+"optimum results enable DHT."
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:287
-msgid "Only peers which have an upload slot will get data from us"
+#: ktorrent/tools/queuemanagermodel.cpp:121
+msgid "Order"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:288
-msgid "The number of download and upload requests"
+#: ktorrent/tools/queuemanagermodel.cpp:124
+msgid "Time Stalled"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:289
-msgid "How much data we have downloaded from this peer"
+#: ktorrent/tools/queuemanagermodel.cpp:158
+msgid "Running"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:290
-msgid "How much data we have uploaded to this peer"
-msgstr ""
+#: ktorrent/tools/queuemanagermodel.cpp:160
+msgid "Queued"
+msgstr "Mewn Ciw"
 
-#: plugins/infowidget/peerviewmodel.cpp:291
-msgid "Whether the peer is interested in downloading data from us"
+#: ktorrent/tools/queuemanagermodel.cpp:162
+msgid "Not queued"
 msgstr ""
 
-#: plugins/infowidget/peerviewmodel.cpp:292
-msgid "Whether we are interested in downloading from this peer"
+#: ktorrent/tools/queuemanagermodel.cpp:171
+#, kde-format
+msgid "%1"
 msgstr ""
 
-#: plugins/infowidget/peerview.cpp:56
-msgid "Kick Peer"
+#: ktorrent/tools/queuemanagermodel.cpp:183
+msgid ""
+"Order of a torrent in the queue.\n"
+"Use drag and drop or the move up and down buttons on the right to change the "
+"order."
 msgstr ""
 
-#: plugins/infowidget/peerview.cpp:57
-msgid "Ban Peer"
+#: ktorrent/tools/queuemanagerwidget.cpp:66
+msgid "Show Search"
 msgstr ""
 
-#: plugins/infowidget/webseedsmodel.cpp:125
-#: obj-i686-linux-gnu/plugins/stats/ui_Spd.h:93
-msgid "Speed"
+#: ktorrent/tools/queuemanagerwidget.cpp:67
+msgid "Show or hide the search bar"
 msgstr ""
 
-#: plugins/search/searchplugin.cpp:65 plugins/search/searchplugin.cpp:83
-#: plugins/search/searchactivity.cpp:47 plugins/search/searchprefpage.cpp:58
-msgctxt "plugin name"
-msgid "Search"
+#: ktorrent/tools/queuemanagerwidget.cpp:71
+msgid "Move Top"
 msgstr ""
 
-#: plugins/search/searchenginelist.cpp:216
-#, kde-format
-msgid "Failed to parse %1"
+#: ktorrent/tools/queuemanagerwidget.cpp:72
+msgid "Move a torrent to the top of the queue"
 msgstr ""
 
-#: plugins/search/searchenginelist.cpp:365
-#, kde-format
-msgid "URL: <b>%1</b>"
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:50
+#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:188
+#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:50
+#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:188
+#. i18n: ectx: property (text), widget (KPushButton, m_move_up)
+#: ktorrent/tools/queuemanagerwidget.cpp:74 rc.cpp:789 rc.cpp:1750 rc.cpp:789
+#: rc.cpp:1750
+msgid "Move Up"
 msgstr ""
 
-#: plugins/search/webview.cpp:157
-msgid "Home"
+#: ktorrent/tools/queuemanagerwidget.cpp:75
+msgid "Move a torrent up in the queue"
 msgstr ""
 
-#: plugins/search/webview.cpp:159
-msgctxt "KDE 4 tag line, see http://kde.org/img/kde40.png"
-msgid "Be free."
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:57
+#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:195
+#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:57
+#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:195
+#. i18n: ectx: property (text), widget (KPushButton, m_move_down)
+#: ktorrent/tools/queuemanagerwidget.cpp:77 rc.cpp:792 rc.cpp:1753 rc.cpp:792
+#: rc.cpp:1753
+msgid "Move Down"
 msgstr ""
 
-#: plugins/search/webview.cpp:160
-msgid "Search the web for torrents."
+#: ktorrent/tools/queuemanagerwidget.cpp:78
+msgid "Move a torrent down in the queue"
 msgstr ""
 
-#: plugins/search/webview.cpp:188
-#, kde-format
-msgid "Save %1 to"
+#: ktorrent/tools/queuemanagerwidget.cpp:80
+msgid "Move Bottom"
 msgstr ""
 
-#: plugins/search/webview.cpp:205
-#, kde-format
-msgid "Cannot open <b>%1</b>: %2"
+#: ktorrent/tools/queuemanagerwidget.cpp:81
+msgid "Move a torrent to the bottom of the queue"
 msgstr ""
 
-#: plugins/search/searchactivity.cpp:246
-#, kde-format
-msgid "Search for %1"
+#: ktorrent/tools/magnetview.cpp:42
+msgid "Start Magnet"
 msgstr ""
 
-#: plugins/search/searchprefpage.cpp:105 plugins/search/searchprefpage.cpp:146
-msgid "Add a Search Engine"
+#: ktorrent/tools/magnetview.cpp:43
+msgid "Stop Magnet"
 msgstr ""
 
-#: plugins/search/searchprefpage.cpp:106
-msgid "Enter the hostname of the search engine (for example www.google.com):"
+#: ktorrent/tools/magnetview.cpp:45
+msgid "Remove Magnet"
 msgstr ""
 
-#: plugins/search/searchprefpage.cpp:144
-#, kde-format
-msgid ""
-"Opensearch is not supported by %1, you will need to enter the search URL "
-"manually. The URL should contain {searchTerms}, ktorrent will replace this "
-"by the thing you are searching for."
+#: ktorrent/tools/magnetmodel.cpp:128
+msgid "Magnet Link"
 msgstr ""
 
-#: plugins/search/searchprefpage.cpp:151
-#, kde-format
-msgid "The URL %1 does not contain {searchTerms}."
-msgstr ""
+#: ktorrent/tools/magnetmodel.cpp:205
+msgid "Downloading"
+msgstr "Lawrlwytho"
 
-#: plugins/search/searchwidget.cpp:75
-msgid " Engine:"
-msgstr ""
+#: ktorrent/tools/magnetmodel.cpp:207
+msgid "Stopped"
+msgstr "Wedi aros"
 
-#: plugins/search/searchwidget.cpp:228
-msgid "Do you want to download or save the torrent?"
+#: ktorrent/ipfilterwidget.cpp:53
+msgid "IP Filter List"
 msgstr ""
 
-#: plugins/search/searchwidget.cpp:229
-msgid "Download Torrent"
+#: ktorrent/ipfilterwidget.cpp:103
+#, kde-format
+msgid ""
+"Invalid IP address <b>%1</b>. IP addresses must be in the format "
+"'XXX.XXX.XXX.XXX'.<br/><br/>You can also use wildcards like '127.0.0.*' or "
+"specify ranges like '200.10.10.0-200.10.10.40'."
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:114
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: plugins/stats/Spd.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, DlSpdGbw)
-#. i18n: file: plugins/stats/DisplaySettings.ui:26
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: plugins/stats/DisplaySettings.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#. i18n: file: plugins/syndication/feedwidget.ui:121
-#. i18n: ectx: property (text), widget (KPushButton, m_download)
-#. i18n: file: plugins/stats/Settings.ui:114
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: plugins/stats/Spd.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, DlSpdGbw)
-#. i18n: file: plugins/stats/DisplaySettings.ui:26
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#. i18n: file: plugins/stats/DisplaySettings.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#. i18n: file: plugins/syndication/feedwidget.ui:121
-#. i18n: ectx: property (text), widget (KPushButton, m_download)
-#: plugins/search/searchwidget.cpp:230
-#: obj-i686-linux-gnu/plugins/stats/ui_Spd.h:94
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:293
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:641
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:647
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:187 rc.cpp:1507
-#: rc.cpp:1546 rc.cpp:1660 rc.cpp:1663 rc.cpp:2069 rc.cpp:1507 rc.cpp:1546
-#: rc.cpp:1660 rc.cpp:1663 rc.cpp:2069
-msgid "Download"
-msgstr "Lawrlwytho"
+#: ktorrent/ipfilterwidget.cpp:135
+msgid "Choose a file"
+msgstr "Dewiswch ffeil"
 
-#: plugins/search/searchtoolbar.cpp:66
-msgid "Search Text"
+#: ktorrent/ipfilterwidget.cpp:147
+msgid "Choose a filename to save under"
 msgstr ""
 
-#: plugins/search/searchtoolbar.cpp:75
-msgid "Search Engine"
+#: ktorrent/statusbar.cpp:39 ktorrent/statusbar.cpp:71
+#, kde-format
+msgid "Speed down: %1 / up: %2"
 msgstr ""
 
-#: plugins/search/searchtoolbar.cpp:80
-msgid "Search Engine Label"
+#: ktorrent/statusbar.cpp:40 ktorrent/statusbar.cpp:82
+#, kde-format
+msgid "Transferred down: %1 / up: %2"
 msgstr ""
 
-#: plugins/search/searchtoolbar.cpp:81
-msgid " Engine: "
+#: ktorrent/statusbar.cpp:42 ktorrent/statusbar.cpp:97
+msgid "DHT: off"
 msgstr ""
 
-#: plugins/ipfilter/downloadandconvertjob.cpp:82
-#: plugins/ipfilter/downloadandconvertjob.cpp:104
-#: plugins/ipfilter/downloadandconvertjob.cpp:147
-#: plugins/ipfilter/downloadandconvertjob.cpp:236
+#: ktorrent/statusbar.cpp:95
 #, kde-format
-msgid "Automatic update of IP filter failed: %1"
+msgid "DHT: %1 nodes, %2 tasks"
 msgstr ""
 
-#: plugins/ipfilter/downloadandconvertjob.cpp:162
+#: ktorrent/ipfilterlist.cpp:158
 #, kde-format
-msgid "Cannot open zip file %1."
+msgid "Invalid IP address %1"
 msgstr ""
 
-#: plugins/ipfilter/downloadandconvertjob.cpp:166
+#: ktorrent/ipfilterlist.cpp:163
 #, kde-format
-msgid "Automatic update of IP filter failed: cannot open zip file %1"
+msgid "Duplicate IP address %1"
 msgstr ""
 
-#: plugins/ipfilter/downloadandconvertjob.cpp:203
-#, kde-format
-msgid "Cannot find blocklist in zip file %1."
+#: ktorrent/gui.cpp:271 ktorrent/gui.cpp:286
+msgid "Open Location"
+msgstr "Agor Lleoliad"
+
+#: ktorrent/gui.cpp:403
+msgid "Create a new torrent"
 msgstr ""
 
-#: plugins/ipfilter/downloadandconvertjob.cpp:207
-#, kde-format
-msgid ""
-"Automatic update of IP filter failed: cannot find blocklist in zip file %1"
+#: ktorrent/gui.cpp:405
+msgid "Open a torrent"
+msgstr ""
+
+#: ktorrent/gui.cpp:408
+msgid "Open Silently"
 msgstr ""
 
-#: plugins/ipfilter/convertthread.cpp:72
-msgid "Loading txt file..."
+#: ktorrent/gui.cpp:409
+msgid "Open a torrent without asking any questions"
 msgstr ""
 
-#: plugins/ipfilter/convertthread.cpp:156
-#, kde-format
-msgid "There are no IP addresses to convert in %1"
+#: ktorrent/gui.cpp:424
+msgid "Open URL"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/convertdialog.ui:19
-#. i18n: ectx: property (windowTitle), widget (QDialog, ConvertDialog)
-#: plugins/ipfilter/convertthread.cpp:174
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_convertdialog.h:117 rc.cpp:2562
-#: rc.cpp:2562
-msgid "Converting..."
+#: ktorrent/gui.cpp:425
+msgid "Open a URL which points to a torrent, magnet links are supported"
 msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:42
-msgid " day"
-msgid_plural " days"
-msgstr[0] ""
-msgstr[1] ""
+#: ktorrent/gui.cpp:431
+msgid "Show the list of blocked IP addresses"
+msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:67
-#: plugins/ipfilter/ipblockingprefpage.cpp:89
-#: plugins/ipfilter/ipblockingprefpage.cpp:155
-msgid "Status: Loaded and running."
-msgstr "Statws: Wedi llwytho ac yn rhedeg"
+#: ktorrent/gui.cpp:436
+msgid "Import Torrent"
+msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:69
-#: plugins/ipfilter/ipblockingprefpage.cpp:91
-#: plugins/ipfilter/ipblockingprefpage.cpp:102
-#: plugins/ipfilter/ipblockingprefpage.cpp:157
-msgid "Status: Not loaded."
+#: ktorrent/gui.cpp:437
+msgid "Import a torrent"
 msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:120
-msgid "Status: Downloading and converting new block list..."
+#: ktorrent/gui.cpp:443
+msgid "Import KDE3 Torrents"
 msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:200
-msgid "No update done yet."
+#: ktorrent/gui.cpp:444
+msgid "Import all torrents from the KDE3 version of KTorrent"
 msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:204
-#, kde-format
-msgid "%1 (Last update attempt failed.)"
+#: ktorrent/gui.cpp:451
+msgid "Show/Hide KTorrent"
 msgstr ""
 
-#: plugins/ipfilter/ipblockingprefpage.cpp:218
-msgid "Never"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:7
+#. i18n: ectx: Menu (Torrents)
+#. i18n: file: ktorrent/kttorrentactivityui.rc:77
+#. i18n: ectx: ToolBar (TorrentsToolBar)
+#. i18n: file: ktorrent/kttorrentactivityui.rc:7
+#. i18n: ectx: Menu (Torrents)
+#. i18n: file: ktorrent/kttorrentactivityui.rc:77
+#. i18n: ectx: ToolBar (TorrentsToolBar)
+#: ktorrent/torrentactivity.cpp:48 libktcore/interfaces/functions.cpp:186
+#: rc.cpp:2746 rc.cpp:2767 rc.cpp:2746 rc.cpp:2767
+msgid "Torrents"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_x2)
-#: plugins/magnetgenerator/magnetgeneratorprefwidget.cpp:35
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:124
-#: rc.cpp:2592 rc.cpp:2592
-msgid "Magnet Generator"
+#: ktorrent/torrentactivity.cpp:82
+msgid "Widget to manage the torrent queue"
 msgstr ""
 
-#: plugins/magnetgenerator/magnetgeneratorplugin.cpp:49
-msgid "Copy Magnet URI"
+#: ktorrent/torrentactivity.cpp:86
+msgid "Displays the currently downloading magnet links"
 msgstr ""
 
-#: plugins/magnetgenerator/magnetgeneratorplugin.cpp:143
-msgid "Magnet link copied to clipboard"
+#: ktorrent/torrentactivity.cpp:110
+msgid "Start All"
 msgstr ""
 
-#: plugins/scanfolder/scanfolderprefpage.cpp:37
-#: plugins/scanfolder/scanfolderplugin.cpp:62
-#: plugins/scanfolder/scanfolderplugin.cpp:71
-msgctxt "plugin name"
-msgid "Scan Folder"
+#: ktorrent/torrentactivity.cpp:111
+msgid "Start all torrents"
 msgstr ""
 
-#: plugins/scanfolder/scanfolder.cpp:73 plugins/scanfolder/scanfolder.cpp:74
-#: plugins/scanfolder/scanfolder.cpp:92 plugins/scanfolder/scanfolder.cpp:202
-#: plugins/scanfolder/scanfolder.cpp:240 plugins/scanfolder/scanfolder.cpp:241
-msgid "loaded"
-msgstr "wedi'i lwytho"
+#: ktorrent/torrentactivity.cpp:115
+msgid "Stop All"
+msgstr ""
 
-#: plugins/logviewer/logflags.cpp:121
-msgid "System"
-msgstr "Cysawd"
+#: ktorrent/torrentactivity.cpp:116
+msgid "Stop all torrents"
+msgstr ""
 
-#: plugins/logviewer/logflags.cpp:122
-msgid "Log Level"
+#: ktorrent/torrentactivity.cpp:120
+msgid "Suspend Torrents"
 msgstr ""
 
-#: plugins/logviewer/logflags.cpp:201
-#: plugins/logviewer/logflagsdelegate.cpp:46
-msgid "Debug"
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:124
+#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:124
+#. i18n: ectx: property (text), widget (QCheckBox, m_suspended)
+#: ktorrent/torrentactivity.cpp:122 rc.cpp:554 rc.cpp:707 rc.cpp:554
+#: rc.cpp:707
+msgid "Suspend all running torrents"
 msgstr ""
 
-#: plugins/logviewer/logflags.cpp:202
-#: plugins/logviewer/logflagsdelegate.cpp:45
-msgid "Notice"
-msgstr "Noder"
+#: ktorrent/torrentactivity.cpp:127
+msgid "Group View Visible"
+msgstr ""
 
-#: plugins/logviewer/logflags.cpp:203
-#: plugins/logviewer/logflagsdelegate.cpp:44
-msgid "Important"
-msgstr "Pwysig"
+#: ktorrent/torrentactivity.cpp:128
+msgid "Show or hide the group view"
+msgstr ""
 
-#: plugins/logviewer/logflags.cpp:204
-#: plugins/logviewer/logflagsdelegate.cpp:43
-msgid "All"
-msgstr "Popeth"
+#: ktorrent/main.cpp:95
+msgid "Bittorrent client for KDE"
+msgstr ""
 
-#: plugins/logviewer/logflags.cpp:205
-#: plugins/logviewer/logflagsdelegate.cpp:47
-msgid "None"
-msgstr "Dim"
+#: ktorrent/main.cpp:97
+msgid "(C) 2005 - 2010 Joris Guisson and Ivan Vasic"
+msgstr ""
 
-#: plugins/logviewer/logprefpage.cpp:30
-msgid "Log Viewer"
+#: ktorrent/main.cpp:101
+msgid "Joris Guisson"
 msgstr ""
 
-#: plugins/logviewer/logviewer.cpp:35
-msgid "Log"
+#: ktorrent/main.cpp:102
+msgid "Ivan Vasic"
 msgstr ""
 
-#: plugins/logviewer/logviewer.cpp:37
-msgid "View the logging output generated by KTorrent"
+#: ktorrent/main.cpp:103
+msgid "Alan Jones"
 msgstr ""
 
-#: plugins/logviewer/logviewer.cpp:47
-msgid "Suspend Output"
+#: ktorrent/main.cpp:103
+msgid "BitFinder Plugin"
 msgstr ""
 
-#: plugins/logviewer/logviewer.cpp:124
-msgid "<font color=\"#FF0000\">Logging output suspended</font>"
+#: ktorrent/main.cpp:104
+msgid "Diego R. Brogna"
 msgstr ""
 
-#: plugins/logviewer/logviewer.cpp:126
-msgid "<font color=\"#00FF00\">Logging output resumed</font>"
+#: ktorrent/main.cpp:104
+msgid "Webinterface Plugin"
 msgstr ""
 
-#: plugins/zeroconf/zeroconfplugin.cpp:51
-#: plugins/zeroconf/zeroconfplugin.cpp:68
-msgid "ZeroConf"
+#: ktorrent/main.cpp:105
+msgid "Krzysztof Kundzicz"
 msgstr ""
 
-#: plugins/webinterface/torrentposthandler.cpp:52
-msgid "HTTP Get not supported when uploading a torrent"
+#: ktorrent/main.cpp:105
+msgid "Statistics Plugin"
 msgstr ""
 
-#: plugins/webinterface/torrentposthandler.cpp:65
-msgid "Invalid data received"
+#: ktorrent/main.cpp:106
+msgid "Christian Weilbach"
 msgstr ""
 
-#: plugins/webinterface/torrentposthandler.cpp:77
-msgid "Failed to open temporary file"
+#: ktorrent/main.cpp:106
+msgid "kio-magnet"
 msgstr ""
 
-#: plugins/webinterface/httpclienthandler.cpp:202
-#, kde-format
-msgid "An internal server error occurred: %1"
+#: ktorrent/main.cpp:108
+msgid "Mladen Babic"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:32
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: plugins/webinterface/webinterfaceprefwidget.cpp:40
-#: plugins/webinterface/webinterfaceplugin.cpp:55
-#: plugins/webinterface/webinterfaceplugin.cpp:65
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:221
-#: rc.cpp:2767 rc.cpp:2767
-msgid "Web Interface"
+#: ktorrent/main.cpp:108
+msgid "Application icon and a couple of others"
 msgstr ""
 
-#: plugins/webinterface/httpserver.cpp:327
-msgid "Cannot find web interface skins."
+#: ktorrent/main.cpp:109
+msgid "Adam Treat"
 msgstr ""
 
-#: plugins/webinterface/httpserver.cpp:492
-msgid "Unsupported HTTP method"
+#: ktorrent/main.cpp:110
+msgid "Danny Allen"
 msgstr ""
 
-#: plugins/scripting/scriptmodel.cpp:112
-msgid "Cannot open archive for reading."
+#: ktorrent/main.cpp:110
+msgid "1.0 application icon"
 msgstr ""
 
-#: plugins/scripting/scriptmodel.cpp:116
-msgid "Invalid archive."
+#: ktorrent/main.cpp:111
+msgid "Vincent Wagelaar"
 msgstr ""
 
-#: plugins/scripting/scriptmodel.cpp:143
-#, kde-format
-msgid "There is already a script package named %1 installed."
+#: ktorrent/main.cpp:112
+msgid "Knut Morten Johansson"
 msgstr ""
 
-#: plugins/scripting/scriptmodel.cpp:149
-msgid ""
-"Failed to load script from archive. There is something wrong with the "
-"desktop file."
+#: ktorrent/main.cpp:113
+msgid "Felix Berger"
 msgstr ""
 
-#: plugins/scripting/scriptmodel.cpp:154
-msgid "No script found in archive."
+#: ktorrent/main.cpp:113
+msgid "ChunkBar's tooltip and IWFileTreeItem sorting"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:43
-#: plugins/scripting/scriptingplugin.cpp:185
-msgid "Scripts"
+#: ktorrent/main.cpp:114
+msgid "Andreas Kling"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:47
-msgid "Widget to start, stop and manage scripts"
+#: ktorrent/main.cpp:115
+msgid "Felipe Sateler"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:90
-msgid "Add Script"
+#: ktorrent/main.cpp:116
+msgid "Maxmind"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:94
-msgid "Remove Script"
+#: ktorrent/main.cpp:116
+msgid ""
+"Country locator for InfoWidget plugin. Flags are taken from "
+"http://flags.blogpotato.de/ so thanks to them too."
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:98
-msgid "Run Script"
+#: ktorrent/main.cpp:117
+msgid "Adam Forsyth"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:102
-msgid "Stop Script"
+#: ktorrent/main.cpp:117
+msgid "File prioritization and some other patches"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:106
-msgid "Edit Script"
+#: ktorrent/main.cpp:118
+msgid "Thomas Bernard"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, PropertiesExtender)
-#: plugins/scripting/scriptmanager.cpp:110
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:94 rc.cpp:689
-#: rc.cpp:689
-msgid "Properties"
+#: ktorrent/main.cpp:118
+msgid "Miniupnp was used as an example for our own UPnP implementation"
 msgstr ""
 
-#: plugins/scripting/scriptmanager.cpp:114
-msgid "Configure"
+#: ktorrent/main.cpp:119
+msgid "Diego Rosario Brogna"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scriptproperties.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ScriptProperties)
-#: plugins/scripting/scriptmanager.cpp:228
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:146 rc.cpp:2830
-#: rc.cpp:2830
-msgid "Script Properties"
+#: ktorrent/main.cpp:119
+msgid "Global max share ratio patch"
 msgstr ""
 
-#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:4
-#. i18n: ectx: ToolBar (ScriptingToolbar)
-#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:15
-#. i18n: ectx: Menu (ScriptingMenu)
-#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:4
-#. i18n: ectx: ToolBar (ScriptingToolbar)
-#. i18n: file: plugins/scripting/ktscriptingpluginui.rc:15
-#. i18n: ectx: Menu (ScriptingMenu)
-#: plugins/scripting/scriptingplugin.cpp:75
-#: plugins/scripting/scriptingplugin.cpp:96 rc.cpp:2848 rc.cpp:2851
-#: rc.cpp:2848 rc.cpp:2851
-msgid "Scripting"
+#: ktorrent/main.cpp:120
+msgid "Lesly Weyts"
 msgstr ""
 
-#: plugins/scripting/scriptingplugin.cpp:184
-msgid "KTorrent Script Packages"
+#: ktorrent/main.cpp:120 ktorrent/main.cpp:121
+msgid "Zeroconf enhancements"
 msgstr ""
 
-#: plugins/scripting/scriptingplugin.cpp:245
-msgid ""
-"Removing these scripts will fully delete them from your disk. Are you sure "
-"you want to do this?"
+#: ktorrent/main.cpp:121
+msgid "Kevin Andre"
 msgstr ""
 
-#: plugins/mediaplayer/mediamodel.cpp:88
-msgid "Available"
-msgstr "Ar gael"
-
-#: plugins/mediaplayer/mediamodel.cpp:88
-msgid "Pending"
+#: ktorrent/main.cpp:122
+msgid "Dagur Valberg Johannsson"
 msgstr ""
 
-#: plugins/mediaplayer/mediamodel.cpp:89
-#, kde-format
-msgid "<b>%1</b><br/>Preview: %2<br/>Downloaded: %3 %"
+#: ktorrent/main.cpp:122
+msgid "Coldmilk webgui"
 msgstr ""
 
-#: plugins/mediaplayer/mediaview.cpp:54
-msgid "Search media files"
+#: ktorrent/main.cpp:123
+msgid "Alexander Dymo"
 msgstr ""
 
-#: plugins/mediaplayer/playlist.cpp:92
-msgid "Artist"
+#: ktorrent/main.cpp:123
+msgid "IDEAl code from KDevelop"
 msgstr ""
 
-#: plugins/mediaplayer/playlist.cpp:93
-msgid "Album"
+#: ktorrent/main.cpp:124
+msgid "Scott Wolchok"
 msgstr ""
 
-#: plugins/mediaplayer/playlist.cpp:94
-msgid "Length"
+#: ktorrent/main.cpp:124
+msgid "Conversion speed improvement in ipfilter plugin"
 msgstr ""
 
-#: plugins/mediaplayer/playlist.cpp:95
-msgid "Year"
+#: ktorrent/main.cpp:125
+msgid "Bryan Burns of Juniper Networks"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:71
-#: plugins/mediaplayer/playlistwidget.cpp:164
-msgid "Ready to play"
+#: ktorrent/main.cpp:125
+msgid "Discovered 2 security vulnerabilities (both are fixed)"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:85
-msgid "Mode:"
+#: ktorrent/main.cpp:126
+msgid "Goten Xiao"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:87
-msgid "Single File"
+#: ktorrent/main.cpp:126
+msgid "Patch to load silently with a save location"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:88
-msgid "Playlist"
+#: ktorrent/main.cpp:127
+msgid "Rapsys"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:89
-msgid "Random"
+#: ktorrent/main.cpp:127
+msgid "Fixes in PHP code of webinterface"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:181
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:287
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_node)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:331
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_webseed)
-#. i18n: file: ktorrent/ipfilterwidget.ui:65
-#. i18n: ectx: property (text), widget (KPushButton, m_remove)
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:67
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:181
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:287
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_node)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:331
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_webseed)
-#. i18n: file: ktorrent/ipfilterwidget.ui:65
-#. i18n: ectx: property (text), widget (KPushButton, m_remove)
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:67
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#: plugins/mediaplayer/playlistwidget.cpp:107
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:164
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:136
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:377
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:387
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:390 rc.cpp:295
-#: rc.cpp:322 rc.cpp:331 rc.cpp:503 rc.cpp:2250 rc.cpp:295 rc.cpp:322
-#: rc.cpp:331 rc.cpp:503 rc.cpp:2250
-msgid "Remove"
+#: ktorrent/main.cpp:128
+msgid "Athantor"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:109
-#: plugins/mediaplayer/mediaplayeractivity.cpp:123
-msgid "Add Media"
+#: ktorrent/main.cpp:128
+msgid "XFS specific disk preallocation"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:110
-#: plugins/mediaplayer/mediaplayeractivity.cpp:127
-msgid "Clear Playlist"
+#: ktorrent/main.cpp:129
+msgid "twisted_fall"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:175
-#: plugins/mediaplayer/playlistwidget.cpp:182
-#: plugins/mediaplayer/playlistwidget.cpp:211
-#, kde-format
-msgid "Playing: <b>%1</b>"
+#: ktorrent/main.cpp:129
+msgid "Patch to not show very low speeds"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:196
-#, kde-format
-msgid "Title: <b>%1</b><br/>Artist: <b>%2</b><br/>Album: <b>%3</b>"
+#: ktorrent/main.cpp:130
+msgid "Lucke"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:197
-#: plugins/mediaplayer/playlistwidget.cpp:202
-#: plugins/mediaplayer/playlistwidget.cpp:207
-#, kde-format
-msgid ""
-"Playing: <b>%1</b><br/>\n"
-"%2"
+#: ktorrent/main.cpp:130
+msgid "Patch to show potentially firewalled status"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:201
-#, kde-format
-msgid "Title: <b>%1</b><br/>Artist: <b>%2</b>"
+#: ktorrent/main.cpp:131
+msgid "Modestas Vainius"
 msgstr ""
 
-#: plugins/mediaplayer/playlistwidget.cpp:206
-#, kde-format
-msgid "Title: <b>%1</b>"
+#: ktorrent/main.cpp:131
+msgid "Several patches"
 msgstr ""
 
-#: plugins/mediaplayer/videowidget.cpp:68
-#: plugins/mediaplayer/mediaplayeractivity.cpp:99
-msgid "Play"
+#: ktorrent/main.cpp:132
+msgid "Stefan Monov"
 msgstr ""
 
-#: plugins/mediaplayer/videowidget.cpp:71
-#: plugins/mediaplayer/mediaplayeractivity.cpp:107
-msgid "Stop"
+#: ktorrent/main.cpp:132
+msgid "Patch to hide menu bar"
 msgstr ""
 
-#: plugins/mediaplayer/videowidget.cpp:201
-msgid "KTorrent is playing a video."
+#: ktorrent/main.cpp:133
+msgid "The_Kernel"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayerplugin.cpp:49
-#: plugins/mediaplayer/mediaplayerplugin.cpp:61
-#: plugins/mediaplayer/mediaplayeractivity.cpp:48
-#: plugins/mediaplayer/mediaplayeractivity.cpp:157
-#: plugins/mediaplayer/mediaplayeractivity.cpp:369
-msgid "Media Player"
+#: ktorrent/main.cpp:133
+msgid "Patch to change file priorities in the webgui"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:75
-msgid "Play List"
+#: ktorrent/main.cpp:134
+msgid "Rafał Miłecki"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:103
-msgid "Pause"
+#: ktorrent/main.cpp:134
+msgid "Several webgui patches"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:111
-msgid "Previous"
+#: ktorrent/main.cpp:135
+msgid "Ozzi"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:115
-msgid "Next"
+#: ktorrent/main.cpp:135
+msgid "Fixes for several warnings"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:119
-msgid "Show Video"
+#: ktorrent/main.cpp:136
+msgid "Markus Brueffer"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:131
-msgid "Toggle Fullscreen"
+#: ktorrent/main.cpp:136
+msgid "Patch to fix free diskspace calculation on FreeBSD"
 msgstr ""
 
-#: plugins/mediaplayer/mediaplayeractivity.cpp:171
-#: plugins/mediaplayer/mediaplayeractivity.cpp:372
-msgid "Movie player"
+#: ktorrent/main.cpp:137
+msgid "Lukas Appelhans"
 msgstr ""
 
-#: ktupnptest/main.cpp:40
-msgid "KTUPnPTest"
+#: ktorrent/main.cpp:137
+msgid "Patch to fix a crash in ChunkDownloadView"
 msgstr ""
 
-#: ktupnptest/main.cpp:41
-msgid "KTorrent's UPnP test application"
+#: ktorrent/main.cpp:138
+msgid "Rickard Närström"
 msgstr ""
 
-#: ktupnptest/main.cpp:43
-msgid "(C) 2005 - 2007 Joris Guisson and Ivan Vasic"
+#: ktorrent/main.cpp:138
+msgid "A couple of bugfixes"
 msgstr ""
 
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:24
-#. i18n: ectx: property (text), widget (QLabel, job_title)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:31
-#. i18n: ectx: property (text), widget (QLabel, job_description)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:47
-#. i18n: ectx: property (text), widget (QLabel, job_speed)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:59
-#. i18n: ectx: property (text), widget (QLabel, msg)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:24
-#. i18n: ectx: property (text), widget (QLabel, job_title)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:31
-#. i18n: ectx: property (text), widget (QLabel, job_description)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:47
-#. i18n: ectx: property (text), widget (QLabel, job_speed)
-#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:59
-#. i18n: ectx: property (text), widget (QLabel, msg)
-#: obj-i686-linux-gnu/libktcore/ui_basicjobprogresswidget.h:92
-#: obj-i686-linux-gnu/libktcore/ui_basicjobprogresswidget.h:93
-#: obj-i686-linux-gnu/libktcore/ui_basicjobprogresswidget.h:94
-#: obj-i686-linux-gnu/libktcore/ui_basicjobprogresswidget.h:95
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:246
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:248
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:148
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:150
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:152
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:154
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:156
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:158
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:332
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:334
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:336
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:338
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:341
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:343
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:345 rc.cpp:125
-#: rc.cpp:128 rc.cpp:131 rc.cpp:134 rc.cpp:125 rc.cpp:128 rc.cpp:131
-#: rc.cpp:134
-msgid "TextLabel"
+#: ktorrent/main.cpp:139
+msgid "caruccio"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:27
-#. i18n: ectx: property (toolTip), widget (QTreeView, m_logging_flags)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:129 rc.cpp:2706
-#: rc.cpp:2706
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Double click on the log "
-"level to alter it. The possible levels are :</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">All: </span>All messages are shown</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Important: </span>Only important messages are shown</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Notice: </span>Only notice and important messages are "
-"shown</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Debug: </span>Debug, notice and important messages are "
-"shown</p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">None:</span> No messages are shown</p></body></html>"
+#: ktorrent/main.cpp:139
+msgid "Patch to load torrents silently from the command line"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:46
-#. i18n: ectx: property (title), widget (QGroupBox, m_options)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:193
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: plugins/syndication/filtereditor.ui:256
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:71
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: plugins/logviewer/logprefwidget.ui:40
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:46
-#. i18n: ectx: property (title), widget (QGroupBox, m_options)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:193
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: plugins/syndication/filtereditor.ui:256
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:71
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: plugins/logviewer/logprefwidget.ui:40
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:142
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:159
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:466
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:358
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:397 rc.cpp:244 rc.cpp:412
-#: rc.cpp:2208 rc.cpp:2658 rc.cpp:2719 rc.cpp:244 rc.cpp:412 rc.cpp:2208
-#: rc.cpp:2658 rc.cpp:2719
-msgid "Options"
+#: ktorrent/main.cpp:140
+msgid "Lee Olson"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:46
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useRichText)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:144 rc.cpp:2722
-#: rc.cpp:2722
-msgid ""
-"Whether or not to use rich text or just plain text, for the logging output "
-"shown in the logviewer."
+#: ktorrent/main.cpp:140
+msgid "New set of icons"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:49
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useRichText)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:146 rc.cpp:2725
-#: rc.cpp:2725
-msgid "Use rich text for logging output"
+#: ktorrent/main.cpp:141
+msgid "Aaron J. Seigo"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:58
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:147 rc.cpp:2728
-#: rc.cpp:2728
-msgid "Log widget position:"
+#: ktorrent/main.cpp:141
+msgid "Drag and drop support for Plasma applet"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:72
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_logWidgetPosition)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:150 rc.cpp:2731
-#: rc.cpp:2731
-msgid "Separate activity"
+#: ktorrent/main.cpp:142
+msgid "Ian Higginson"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:77
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_logWidgetPosition)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:151 rc.cpp:2734
-#: rc.cpp:2734
-msgid "Dockable widget"
+#: ktorrent/main.cpp:142
+msgid "Patch to cleanup the plugin list"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:82
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_logWidgetPosition)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:152 rc.cpp:2737
-#: rc.cpp:2737
-msgid "Torrent activity"
+#: ktorrent/main.cpp:143
+msgid "Amichai Rothman"
 msgstr ""
 
-#. i18n: file: plugins/logviewer/logprefwidget.ui:107
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/logviewer/ui_logprefwidget.h:154 rc.cpp:2740
-#: rc.cpp:2740
-msgid "Maximum number of visible lines:"
+#: ktorrent/main.cpp:143
+msgid "Patch to make the Plasma applet a popup applet"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:123 rc.cpp:2329
-#: rc.cpp:2329
-msgid "Tabs"
+#: ktorrent/main.cpp:144
+msgid "Leo Trubach"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:23
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showPeerView)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:125 rc.cpp:2332
-#: rc.cpp:2332
-msgid "Whether or not to show the peers tab in the bottom of the window."
+#: ktorrent/main.cpp:144
+msgid "Patch to add support for IP ranges in IP filter dialog"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:26
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showPeerView)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:127 rc.cpp:2335
-#: rc.cpp:2335
-msgid "Show list of peers"
+#: ktorrent/main.cpp:145
+msgid "Andrei Barbu"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:33
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showChunkView)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:129 rc.cpp:2338
-#: rc.cpp:2338
-msgid "Whether or not to show the chunks tab in the bottom of the window."
+#: ktorrent/main.cpp:145
+msgid "Feature which adds the date a torrent was added"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:36
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showChunkView)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:131 rc.cpp:2341
-#: rc.cpp:2341
-msgid "Show list of chunks currently downloading"
+#: ktorrent/main.cpp:147
+msgid "Jonas Lundqvist"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:43
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showTrackersView)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:133 rc.cpp:2344
-#: rc.cpp:2344
-msgid "Whether or not to show the trackers tab in the bottom of the window."
+#: ktorrent/main.cpp:147
+msgid "Feature to disable authentication in the webinterface"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:46
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showTrackersView)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:135 rc.cpp:2347
-#: rc.cpp:2347
-msgid "Show list of trackers"
+#: ktorrent/main.cpp:148
+msgid "Jaroslaw Swierczynski"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:56
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showWebSeedsTab)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:137 rc.cpp:2350
-#: rc.cpp:2350
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Whether or not to show the "
-"webseeds tab at the bottom of the window.</p></body></html>"
+#: ktorrent/main.cpp:148
+msgid "Exclusion patterns in the syndication plugin"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:59
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showWebSeedsTab)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:142 rc.cpp:2356
-#: rc.cpp:2356
-msgid "Show list of webseeds"
+#: ktorrent/main.cpp:149
+msgid "Alexey Shildyakov "
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:69
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:143 rc.cpp:2359
-#: rc.cpp:2359
-msgid "File Priority Colors"
+#: ktorrent/main.cpp:149
+msgid "Patch to rename single file torrents to the file inside"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:75
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:144 rc.cpp:2362
-#: rc.cpp:2362
-msgid "First priority:"
+#: ktorrent/main.cpp:152 ktmagnetdownloader/magnetdownloader.cpp:52
+msgid "Document to open"
+msgstr "Dogfen i'w hagor"
+
+#: ktorrent/main.cpp:153
+msgid "Silently open torrent given on URL"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:85
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_firstColor)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:146 rc.cpp:2365
-#: rc.cpp:2365
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Color to use for first "
-"priority files.</p></body></html>"
+#: libktcore/groups/ungroupedgroup.cpp:27
+msgid "Ungrouped Torrents"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:92
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:151 rc.cpp:2371
-#: rc.cpp:2371
-msgid "Last priority:"
+#: libktcore/groups/groupmanager.cpp:100
+msgid "Uploads"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/iwprefpage.ui:102
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_lastColor)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_iwprefpage.h:153 rc.cpp:2374
-#: rc.cpp:2374
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Color to use for last "
-"priority files.</p></body></html>"
+#: libktcore/groups/groupmanager.cpp:102
+msgid "Running Uploads"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:32
-#. i18n: ectx: property (text), widget (QLabel, hdr_info)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:279 rc.cpp:2380
-#: rc.cpp:2380
-msgid "Info"
-msgstr "Gwybo"
+#: libktcore/groups/groupmanager.cpp:104
+msgid "Not Running Uploads"
+msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:41
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:280 rc.cpp:2383
-#: rc.cpp:2383
-msgid "Average down speed:"
+#: libktcore/groups/groupmanager.cpp:108
+msgid "Downloads"
+msgstr "Lawrlwythiadau"
+
+#: libktcore/groups/groupmanager.cpp:110
+msgid "Running Downloads"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:64
-#. i18n: ectx: property (text), widget (QLabel, label_16)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:282 rc.cpp:2386
-#: rc.cpp:2386
-msgid "Type:"
+#: libktcore/groups/groupmanager.cpp:112
+msgid "Not Running Downloads"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:100
-#. i18n: ectx: property (text), widget (QLabel, label_15)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:284 rc.cpp:2389
-#: rc.cpp:2389
-msgid "Average up speed:"
+#: libktcore/groups/groupmanager.cpp:116
+msgid "Active Torrents"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:359
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: plugins/infowidget/statustab.ui:123
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:359
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: plugins/infowidget/statustab.ui:123
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:286
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:392 rc.cpp:334
-#: rc.cpp:2392 rc.cpp:334 rc.cpp:2392
-msgid "Comments:"
-msgstr "Sylwadau :"
+#: libktcore/groups/groupmanager.cpp:118
+msgid "Active Downloads"
+msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:171
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:288 rc.cpp:2398
-#: rc.cpp:2398
-msgid "Downloaded chunks:"
+#: libktcore/groups/groupmanager.cpp:120
+msgid "Active Uploads"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:194
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:289 rc.cpp:2401
-#: rc.cpp:2401
-msgid "Available chunks:"
+#: libktcore/groups/groupmanager.cpp:122
+msgid "Passive Torrents"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:256
-#. i18n: ectx: property (text), widget (QLabel, hdr_sharing)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:290 rc.cpp:2404
-#: rc.cpp:2404
-msgid "Sharing"
-msgstr "Rhannu"
+#: libktcore/groups/groupmanager.cpp:124
+msgid "Passive Downloads"
+msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:265
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:291 rc.cpp:2407
-#: rc.cpp:2407
-msgid "Share ratio:"
+#: libktcore/groups/groupmanager.cpp:126
+msgid "Passive Uploads"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:282
-#. i18n: ectx: property (text), widget (QCheckBox, use_ratio_limit)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:293 rc.cpp:2410
-#: rc.cpp:2410
-msgid "Ratio limit:"
+#: libktcore/plugin/pluginactivity.cpp:38
+#: libktcore/plugin/pluginactivity.cpp:55
+msgid "Plugins"
+msgstr "Ategion"
+
+#: libktcore/torrent/basicjobprogresswidget.cpp:53
+#, kde-format
+msgid "%1: %2<br/>%3: %4"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/statustab.ui:308
-#. i18n: ectx: property (text), widget (QCheckBox, use_time_limit)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:295 rc.cpp:2416
-#: rc.cpp:2416
-msgid "Time limit:"
+#: libktcore/torrent/basicjobprogresswidget.cpp:68
+#, kde-format
+msgid "Warning: %1"
+msgstr ""
+
+#: libktcore/torrent/torrentfilelistmodel.cpp:76
+#: libktcore/torrent/torrentfiletreemodel.cpp:399
+msgid "File"
+msgstr ""
+
+#: libktcore/torrent/chunkbar.cpp:93
+msgid ""
+"<img src=\"available_color\">&nbsp; - Downloaded Chunks<br><img "
+"src=\"unavailable_color\">&nbsp; - Chunks to Download<br><img "
+"src=\"excluded_color\">&nbsp; - Excluded Chunks"
+msgstr ""
+
+#: libktcore/torrent/queuemanager.cpp:114
+#, kde-format
+msgid ""
+"The torrent \"%1\" has reached its maximum share ratio and its maximum seed "
+"time. Ignore the limit and start seeding anyway?"
 msgstr ""
 
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:134
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, m_max_seed_time)
-#. i18n: file: plugins/infowidget/statustab.ui:318
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, time_limit)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:134
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, m_max_seed_time)
-#. i18n: file: plugins/infowidget/statustab.ui:318
-#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, time_limit)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_statustab.h:297
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:208 rc.cpp:612 rc.cpp:2422
-#: rc.cpp:612 rc.cpp:2422
-msgid " Hours"
+#: libktcore/torrent/queuemanager.cpp:116
+#, kde-format
+msgid ""
+"The torrent \"%1\" has reached its maximum share ratio. Ignore the limit and "
+"start seeding anyway?"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:26
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:219
-#: rc.cpp:2280 rc.cpp:2280
-msgid "Total:"
-msgstr "Cyfanswm:"
-
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:62
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:221
-#: rc.cpp:2283 rc.cpp:2283
-msgid "Currently downloading:"
+#: libktcore/torrent/queuemanager.cpp:118
+#, kde-format
+msgid ""
+"The torrent \"%1\" has reached its maximum seed time. Ignore the limit and "
+"start seeding anyway?"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:162
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:98
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: ktorrent/view/scanextender.ui:162
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:98
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:223
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:217 rc.cpp:668 rc.cpp:2286
-#: rc.cpp:668 rc.cpp:2286
-msgid "Downloaded:"
+#: libktcore/torrent/queuemanager.cpp:122
+msgid "Limits reached."
 msgstr ""
 
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:134
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:225
-#: rc.cpp:2289 rc.cpp:2289
-msgid "Excluded:"
-msgstr "Gwaharddwyd :"
+#: libktcore/torrent/queuemanager.cpp:148
+msgid ""
+"You don't have enough disk space to download this torrent. Are you sure you "
+"want to continue?"
+msgstr ""
 
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:170
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:227
-#: rc.cpp:2292 rc.cpp:2292
-msgid "Left:"
+#: libktcore/torrent/queuemanager.cpp:151
+#, kde-format
+msgid "Insufficient disk space for %1"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/chunkdownloadview.ui:206
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_8)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_chunkdownloadview.h:229
-#: rc.cpp:2295 rc.cpp:2295
-msgid "Size:"
-msgstr "Maint:"
+#: libktcore/torrent/queuemanager.cpp:241
+msgid ""
+"Not enough disk space for the following torrents. Do you want to start them "
+"anyway?"
+msgstr ""
 
-#. i18n: file: plugins/infowidget/trackerview.ui:29
-#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_trackerview.h:99 rc.cpp:2265
-#: rc.cpp:2265
-msgid "Remove Tracker"
+#: libktcore/torrent/queuemanager.cpp:280
+msgid ""
+"The following torrents have reached their maximum seed time. Do you want to "
+"start them anyway?"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/trackerview.ui:36
-#. i18n: ectx: property (text), widget (KPushButton, m_change_tracker)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_trackerview.h:100 rc.cpp:2268
-#: rc.cpp:2268
-msgid "Change Tracker"
+#: libktcore/torrent/queuemanager.cpp:309
+msgid ""
+"The following torrents have reached their maximum share ratio. Do you want "
+"to start them anyway?"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/trackerview.ui:43
-#. i18n: ectx: property (text), widget (QPushButton, m_scrape)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_trackerview.h:101 rc.cpp:2271
-#: rc.cpp:2271
-msgid "Update Trackers"
+#: libktcore/torrent/queuemanager.cpp:737
+#, kde-format
+msgid "Error starting torrent %1: %2"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/trackerview.ui:63
-#. i18n: ectx: property (text), widget (KPushButton, m_restore_defaults)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_trackerview.h:102 rc.cpp:2274
-#: rc.cpp:2274
-msgid "Restore Defaults"
+#: libktcore/torrent/queuemanager.cpp:739
+#: libktcore/torrent/queuemanager.cpp:755
+msgid "Error"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/webseedstab.ui:21
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_webseed)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_webseedstab.h:102 rc.cpp:2309
-#: rc.cpp:2309
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Webseed to add to the "
-"torrent.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Note: </span>Only http webseeds are "
-"supported.</p></body></html>"
+#: libktcore/torrent/queuemanager.cpp:753
+#, kde-format
+msgid "Error stopping torrent %1: %2"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/webseedstab.ui:28
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_webseedstab.h:109 rc.cpp:2317
-#: rc.cpp:2317
-msgid "Add Webseed"
+#: libktcore/util/mmapfile.cpp:164
+msgid "Cannot write beyond end of the mmap buffer."
 msgstr ""
 
-#. i18n: file: plugins/infowidget/webseedstab.ui:50
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_webseedstab.h:110 rc.cpp:2320
-#: rc.cpp:2320
-msgid "Remove Webseed"
+#: libktcore/dbus/dbustorrent.cpp:322
+msgid "Maximum share ratio reached."
 msgstr ""
 
-#. i18n: file: plugins/infowidget/webseedstab.ui:70
-#. i18n: ectx: property (text), widget (QPushButton, m_enable_all)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_webseedstab.h:111 rc.cpp:2323
-#: rc.cpp:2323
-msgid "Enable All"
+#: libktcore/dbus/dbustorrent.cpp:325
+msgid "Maximum seed time reached."
 msgstr ""
 
-#. i18n: file: plugins/infowidget/webseedstab.ui:77
-#. i18n: ectx: property (text), widget (QPushButton, m_disable_all)
-#: obj-i686-linux-gnu/plugins/infowidget/ui_webseedstab.h:112 rc.cpp:2326
-#: rc.cpp:2326
-msgid "Disable All"
+#: ktmagnetdownloader/magnetdownloader.cpp:44
+msgid "KTMagnetDownloader"
 msgstr ""
 
-#. i18n: file: plugins/upnp/upnpwidget.ui:27
-#. i18n: ectx: property (text), widget (QPushButton, m_forward)
-#. i18n: file: ktupnptest/upnptestwidget.ui:125
-#. i18n: ectx: property (text), widget (QPushButton, m_forward)
-#. i18n: file: plugins/upnp/upnpwidget.ui:27
-#. i18n: ectx: property (text), widget (QPushButton, m_forward)
-#. i18n: file: ktupnptest/upnptestwidget.ui:125
-#. i18n: ectx: property (text), widget (QPushButton, m_forward)
-#: obj-i686-linux-gnu/plugins/upnp/ui_upnpwidget.h:90
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:175 rc.cpp:2045
-#: rc.cpp:2944 rc.cpp:2045 rc.cpp:2944
-msgid "Forward"
+#: ktmagnetdownloader/magnetdownloader.cpp:45
+msgid "KTorrent's magnet link downloader"
 msgstr ""
 
-#. i18n: file: plugins/upnp/upnpwidget.ui:34
-#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
-#. i18n: file: ktupnptest/upnptestwidget.ui:132
-#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
-#. i18n: file: plugins/upnp/upnpwidget.ui:34
-#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
-#. i18n: file: ktupnptest/upnptestwidget.ui:132
-#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
-#: obj-i686-linux-gnu/plugins/upnp/ui_upnpwidget.h:91
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:176 rc.cpp:2048
-#: rc.cpp:2947 rc.cpp:2048 rc.cpp:2947
-msgid "Undo Forward"
+#: ktmagnetdownloader/magnetdownloader.cpp:47
+msgid "(C) 2009 Joris Guisson"
 msgstr ""
 
-#. i18n: file: plugins/upnp/upnpwidget.ui:54
-#. i18n: ectx: property (text), widget (QPushButton, m_rescan)
-#: obj-i686-linux-gnu/plugins/upnp/ui_upnpwidget.h:92 rc.cpp:2051 rc.cpp:2051
-msgid "Rescan"
-msgstr "Ailsyllu"
+#: rc.cpp:1 rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Sam Adam Day"
 
-#. i18n: file: plugins/search/searchpref.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, SearchPref)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, WebInterfacePrefWidget)
-#. i18n: file: plugins/search/searchpref.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, SearchPref)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, WebInterfacePrefWidget)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:184
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:220
-#: rc.cpp:2440 rc.cpp:2764 rc.cpp:2440 rc.cpp:2764
-msgid "Search Preferences"
-msgstr ""
+#: rc.cpp:2 rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,,me@samadamday.com"
 
-#. i18n: file: plugins/search/searchpref.ui:34
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_clear_history)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:186 rc.cpp:2443
-#: rc.cpp:2443
-msgid "Clear the search history combo boxes."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, IPBlockingPrefPage)
+#: rc.cpp:5 rc.cpp:5
+msgid "IPBlocking Preferences"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:37
-#. i18n: ectx: property (text), widget (QPushButton, m_clear_history)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:188 rc.cpp:2446
-#: rc.cpp:2446
-msgid "Clear Search History"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:23
+#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
+#: rc.cpp:8 rc.cpp:8
+msgid "PeerGuardian Filter File "
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:44
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_reset_default_action)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:190 rc.cpp:2449
-#: rc.cpp:2449
-msgid "Reset the default action taken when a torrent is downloaded."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:29
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useLevel1)
+#: rc.cpp:11 rc.cpp:11
+msgid "Enable this if you want the IP filter plugin to work."
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:47
-#. i18n: ectx: property (text), widget (QPushButton, m_reset_default_action)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:192 rc.cpp:2452
-#: rc.cpp:2452
-msgid "Reset Default Torrent Action"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:32
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useLevel1)
+#: rc.cpp:14 rc.cpp:14
+msgid "Use PeerGuardian filter"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:69
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_restorePreviousSession)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:194 rc.cpp:2455
-#: rc.cpp:2455
-msgid "Restore all the active searches of the last session"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:44
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:17 rc.cpp:17
+msgid "IP filter file:"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:72
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_restorePreviousSession)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:196 rc.cpp:2458
-#: rc.cpp:2458
-msgid "Restore previous searches"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:54
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_filterURL)
+#: rc.cpp:20 rc.cpp:20
+msgid "Filter file to use, this can be a local file or a remote file."
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:79
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openInExternal)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:198 rc.cpp:2461
-#: rc.cpp:2461
-msgid "Whether or not to open searches in an external browser."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:81
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_download)
+#: rc.cpp:23 rc.cpp:23
+msgid "Download and convert the IP filter file."
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:82
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openInExternal)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:200 rc.cpp:2464
-#: rc.cpp:2464
-msgid "Open searches in external browser"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:84
+#. i18n: ectx: property (text), widget (QPushButton, m_download)
+#: rc.cpp:26 rc.cpp:26
+msgid "Dow&nload/Convert"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:89
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_useDefaultBrowser)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:202 rc.cpp:2467
-#: rc.cpp:2467
-msgid "Use the default browser configured in the system settings."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:94
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:29 rc.cpp:29
+msgid ""
+"Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
+"NOTE: ZIP file from bluetack.co.uk is supported."
 msgstr ""
 
-#. i18n: file: plugins/search/ktsearchplugin.kcfg:15
-#. i18n: ectx: label, entry (useDefaultBrowser), group (general)
-#. i18n: file: plugins/search/searchpref.ui:92
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useDefaultBrowser)
-#. i18n: file: plugins/search/ktsearchplugin.kcfg:15
-#. i18n: ectx: label, entry (useDefaultBrowser), group (general)
-#. i18n: file: plugins/search/searchpref.ui:92
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useDefaultBrowser)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:204 rc.cpp:2431
-#: rc.cpp:2470 rc.cpp:2431 rc.cpp:2470
-msgid "Use default browser"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:117
+#. i18n: ectx: property (title), widget (QGroupBox, m_auto_update_group_box)
+#: rc.cpp:33 rc.cpp:33
+msgid "Automatic Update"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:104
-#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_useCustomBrowser)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:207 rc.cpp:2473
-#: rc.cpp:2473
-msgid "Use a custom browser."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:125
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_autoUpdate)
+#: rc.cpp:36 rc.cpp:36
+msgid "Enable this if you want to automatically update the filter file."
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:107
-#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useCustomBrowser)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:209 rc.cpp:2476
-#: rc.cpp:2476
-msgid "Custom browser path:"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:128
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoUpdate)
+#: rc.cpp:39 rc.cpp:39
+msgid "Update file every:"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:117
-#. i18n: ectx: property (toolTip), widget (KLineEdit, kcfg_customBrowser)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:212 rc.cpp:2479
-#: rc.cpp:2479
-msgid "Path of the custom browser."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:147
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_autoUpdateInterval)
+#: rc.cpp:42 rc.cpp:42
+msgid "Update interval in days."
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:142
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox8)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:214 rc.cpp:2482
-#: rc.cpp:2482
-msgid "Search Engines"
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:167
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:45 rc.cpp:45
+msgid "Last updated:"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:157
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_add)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:216 rc.cpp:2485
-#: rc.cpp:2485
-msgid "Add a new search engine."
+#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:187
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:48 rc.cpp:48
+msgid "Next update:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:111
-#. i18n: ectx: property (text), widget (KPushButton, m_add)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:169
-#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:258
-#. i18n: ectx: property (text), widget (KPushButton, m_add_node)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:319
-#. i18n: ectx: property (text), widget (KPushButton, m_add_webseed)
-#. i18n: file: ktorrent/ipfilterwidget.ui:46
-#. i18n: ectx: property (text), widget (KPushButton, m_add)
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:60
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: plugins/search/searchpref.ui:160
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:111
-#. i18n: ectx: property (text), widget (KPushButton, m_add)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:169
-#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:258
-#. i18n: ectx: property (text), widget (KPushButton, m_add_node)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:319
-#. i18n: ectx: property (text), widget (KPushButton, m_add_webseed)
-#. i18n: file: ktorrent/ipfilterwidget.ui:46
-#. i18n: ectx: property (text), widget (KPushButton, m_add)
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:60
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#. i18n: file: plugins/search/searchpref.ui:160
-#. i18n: ectx: property (text), widget (QPushButton, m_add)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:218
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:163
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:135
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:376
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:383
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:389
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:150 rc.cpp:160 rc.cpp:292
-#: rc.cpp:313 rc.cpp:328 rc.cpp:500 rc.cpp:2247 rc.cpp:2488 rc.cpp:160
-#: rc.cpp:292 rc.cpp:313 rc.cpp:328 rc.cpp:500 rc.cpp:2247 rc.cpp:2488
-msgid "Add"
+#. i18n: file: plugins/ipfilter/convertdialog.ui:28
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:54 rc.cpp:54
+msgid "Converting block list to KTorrent format. This might take some time."
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:167
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_remove)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:220 rc.cpp:2491
-#: rc.cpp:2491
-msgid "Remove all selected search engines."
+#. i18n: file: plugins/ipfilter/convertdialog.ui:95
+#. i18n: ectx: property (text), widget (QPushButton, m_cancel)
+#: rc.cpp:57 rc.cpp:57
+msgid "C&ancel"
+msgstr "&Diddymu"
+
+#. i18n: file: plugins/ipfilter/ktipfilterplugin.kcfg:10
+#. i18n: ectx: label, entry (filterURL), group (general)
+#: rc.cpp:60 rc.cpp:60
+msgid "Level1 filter url"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:170
-#. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:222 rc.cpp:2494
-#: rc.cpp:2494
-msgid "&Remove"
+#. i18n: file: plugins/ipfilter/ktipfilterplugin.kcfg:14
+#. i18n: ectx: label, entry (useLevel1), group (general)
+#: rc.cpp:63 rc.cpp:63
+msgid "Use level1 filter?"
+msgstr "Defnyddio ffilter lefel1?"
+
+#. i18n: file: plugins/shutdown/shutdowndlg.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ShutdownDlg)
+#: rc.cpp:67 rc.cpp:67
+msgid "Shutdown Settings"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:177
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_remove_all)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:224 rc.cpp:2497
-#: rc.cpp:2497
-msgid "Remove all search engines."
+#. i18n: file: plugins/shutdown/shutdowndlg.ui:24
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:70 rc.cpp:70
+msgid "Action to execute:"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:180
-#. i18n: ectx: property (text), widget (QPushButton, m_remove_all)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:226 rc.cpp:2500
-#: rc.cpp:2500
-msgid "R&emove All"
-msgstr "G&waredu Popeth"
+#. i18n: file: plugins/shutdown/shutdowndlg.ui:34
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:73 rc.cpp:73
+msgid "Execute action when:"
+msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:200
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_add_default)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:228 rc.cpp:2503
-#: rc.cpp:2503
-msgid "Add all default search engines."
+#. i18n: file: plugins/shutdown/ktshutdownpluginui.rc:11
+#. i18n: ectx: ToolBar (ShutdownToolBar)
+#: rc.cpp:79 rc.cpp:79
+msgid "Shutdown Toolbar"
 msgstr ""
 
-#. i18n: file: plugins/search/searchpref.ui:203
-#. i18n: ectx: property (text), widget (QPushButton, m_add_default)
-#: obj-i686-linux-gnu/plugins/search/ui_searchpref.h:230 rc.cpp:2506
-#: rc.cpp:2506
-msgid "Add Defau&lt"
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:10
+#. i18n: ectx: label, entry (torrenttracker), group (general)
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:40
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_torrenttracker)
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:10
+#. i18n: ectx: label, entry (torrenttracker), group (general)
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:40
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_torrenttracker)
+#: rc.cpp:82 rc.cpp:106 rc.cpp:82 rc.cpp:106
+msgid "Grabs a tracker from the torrent file"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:40
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:222
-#: rc.cpp:2770 rc.cpp:2770
-msgid "Web interface skin:"
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:14
+#. i18n: ectx: label, entry (customtracker), group (general)
+#: rc.cpp:85 rc.cpp:85
+msgid "Toggles if a custom tracker is used"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:62
-#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_skin)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:224
-#: rc.cpp:2773 rc.cpp:2773
-msgid "Which interface to use."
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:18
+#. i18n: ectx: label, entry (tr), group (general)
+#: rc.cpp:88 rc.cpp:88
+msgid "The default tracker"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:95
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_authentication)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:227
-#: rc.cpp:2776 rc.cpp:2776
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">If login required is "
-"enabled, you need to enter a username and a password.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Attention: </span>You should not disable this when the "
-"webinterface is accessible from the internet. It will allow anybody access "
-"to it.</p></body></html>"
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:22
+#. i18n: ectx: label, entry (dn), group (general)
+#: rc.cpp:91 rc.cpp:91
+msgid "Show dn"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:98
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_authentication)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:235
-#: rc.cpp:2785 rc.cpp:2785
-msgid "Login required"
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:26
+#. i18n: ectx: label, entry (popup), group (general)
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:90
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_popup)
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:26
+#. i18n: ectx: label, entry (popup), group (general)
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:90
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_popup)
+#: rc.cpp:94 rc.cpp:136 rc.cpp:94 rc.cpp:136
+msgid "Show popup"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/proxypref.ui:189
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:105
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:25
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/pref/proxypref.ui:189
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:105
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:25
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:236
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:292 rc.cpp:1185 rc.cpp:2788
-#: rc.cpp:2887 rc.cpp:1185 rc.cpp:2788 rc.cpp:2887
-msgid "Username:"
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:30
+#. i18n: ectx: label, entry (onlypublic), group (general)
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:77
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_onlypublic)
+#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:30
+#. i18n: ectx: label, entry (onlypublic), group (general)
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:77
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_onlypublic)
+#: rc.cpp:97 rc.cpp:127 rc.cpp:97 rc.cpp:127
+msgid "Only enable on public torrents"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:115
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_username)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:238
-#: rc.cpp:2791 rc.cpp:2791
-msgid "Username you need to use in the login page of the webinterface."
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, MagnetGeneratorPrefWidget)
+#: rc.cpp:100 rc.cpp:100
+msgid "Magnet Generator Preferences"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/proxypref.ui:207
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:35
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: ktorrent/pref/proxypref.ui:207
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:122
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:35
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:240
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:300 rc.cpp:1195 rc.cpp:2794
-#: rc.cpp:2890 rc.cpp:1195 rc.cpp:2794 rc.cpp:2890
-msgid "Password:"
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:43
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_torrenttracker)
+#: rc.cpp:109 rc.cpp:109
+msgid "Add a tracker from the torrent file"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:129
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_password)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:242
-#: rc.cpp:2797 rc.cpp:2797
-msgid ""
-"The password for the webinterface login page. By default this is set to "
-"ktorrent."
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:50
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_customtracker)
+#: rc.cpp:112 rc.cpp:112
+msgid "Define what tracker to add"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:144
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:244
-#: rc.cpp:2800 rc.cpp:2800
-msgid "Web Server"
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:53
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_customtracker)
+#: rc.cpp:115 rc.cpp:115
+msgid "Add a custom tracker URL"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:59
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:236
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: ktorrent/pref/networkpref.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/pref/proxypref.ui:52
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: ktorrent/pref/proxypref.ui:145
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:152
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:61
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: ktupnptest/upnptestwidget.ui:65
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:59
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:236
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: ktorrent/pref/networkpref.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/pref/proxypref.ui:52
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#. i18n: file: ktorrent/pref/proxypref.ui:145
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:152
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:61
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: ktupnptest/upnptestwidget.ui:65
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:245
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:382
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:149
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:278
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:245
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:279
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:168 rc.cpp:157 rc.cpp:310
-#: rc.cpp:972 rc.cpp:1120 rc.cpp:1166 rc.cpp:2803 rc.cpp:2896 rc.cpp:2932
-#: rc.cpp:157 rc.cpp:310 rc.cpp:972 rc.cpp:1120 rc.cpp:1166 rc.cpp:2803
-#: rc.cpp:2896 rc.cpp:2932
-msgid "Port:"
-msgstr "Porth:"
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:60
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_tr)
+#: rc.cpp:118 rc.cpp:118
+msgid "The tracker URL that will be a part of the magnet link"
+msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:168
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_port)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:247
-#: rc.cpp:2806 rc.cpp:2806
-msgid "The port the webinterface listens on."
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:67
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_dn)
+#: rc.cpp:121 rc.cpp:121
+msgid "Add the torrent name in the URI"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:196
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_forward)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:250
-#: rc.cpp:2809 rc.cpp:2809
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">If you are behind a router "
-"and you want to access the webinterface from somewhere on the Internet you "
-"need to forward the correct port.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">This checkbox will ensure "
-"that the UPnP plugin automatically forwards the port. The UPnP plugin needs "
-"to be loaded for this to work.</p></body></html>"
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:70
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_dn)
+#: rc.cpp:124 rc.cpp:124
+msgid "Add name"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:199
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_forward)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:259
-#: rc.cpp:2818 rc.cpp:2818
-msgid "Forward port"
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:80
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_onlypublic)
+#: rc.cpp:130 rc.cpp:130
+msgid "Disable the menu item for private torrents"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:206
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:260
-#: rc.cpp:2821 rc.cpp:2821
-msgid "Session TTL:"
+#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:87
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_popup)
+#: rc.cpp:133 rc.cpp:133
+msgid "Give feedback in form of a popup"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:222
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_sessionTTL)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:262
-#: rc.cpp:2824 rc.cpp:2824
-msgid "How long a session is valid (in seconds)."
+#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:13
+#. i18n: ectx: label, entry (openSilently), group (general)
+#: rc.cpp:139 rc.cpp:139
+msgid "Whether to open torrent silently or not."
 msgstr ""
 
-#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:225
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_sessionTTL)
-#: obj-i686-linux-gnu/plugins/webinterface/ui_webinterfaceprefwidget.h:264
-#: rc.cpp:2827 rc.cpp:2827
-msgid " secs"
+#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:18
+#. i18n: ectx: label, entry (actionDelete), group (general)
+#: rc.cpp:142 rc.cpp:142
+msgid "Delete action checked."
+msgstr ""
+
+#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:23
+#. i18n: ectx: label, entry (actionMove), group (general)
+#: rc.cpp:145 rc.cpp:145
+msgid "Move action checked."
+msgstr ""
+
+#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:28
+#. i18n: ectx: label, entry (recursive), group (general)
+#: rc.cpp:148 rc.cpp:148
+msgid "Scan directories recursively."
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:16
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:147
-#: rc.cpp:2640 rc.cpp:2640
+#: rc.cpp:151 rc.cpp:151
 msgid "Folders to scan for torrents:"
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:25
 #. i18n: ectx: property (toolTip), widget (KListWidget, m_folders)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:149
-#: rc.cpp:2643 rc.cpp:2643
+#: rc.cpp:154 rc.cpp:154
 msgid "List of folders which will be scanned for torrents by this plugin."
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:34
 #. i18n: ectx: property (toolTip), widget (QPushButton, m_add)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:152
-#: rc.cpp:2646 rc.cpp:2646
+#: rc.cpp:157 rc.cpp:157
 msgid "Add a new folder to be scanned."
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:37
 #. i18n: ectx: property (text), widget (QPushButton, m_add)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:154
-#: rc.cpp:2649 rc.cpp:2649
+#: rc.cpp:160 rc.cpp:160
 msgid "Add Folder"
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:44
 #. i18n: ectx: property (toolTip), widget (QPushButton, m_remove)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:156
-#: rc.cpp:2652 rc.cpp:2652
+#: rc.cpp:163 rc.cpp:163
 msgid "Remove a folder from the list."
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:47
 #. i18n: ectx: property (text), widget (QPushButton, m_remove)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:158
-#: rc.cpp:2655 rc.cpp:2655
+#: rc.cpp:166 rc.cpp:166
 msgid "Remove Folder"
 msgstr ""
 
+#. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:71
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: plugins/syndication/filtereditor.ui:256
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#. i18n: file: plugins/logviewer/logprefwidget.ui:40
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:193
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:46
+#. i18n: ectx: property (title), widget (QGroupBox, m_options)
+#. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:71
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: plugins/syndication/filtereditor.ui:256
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#. i18n: file: plugins/logviewer/logprefwidget.ui:40
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:193
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:46
+#. i18n: ectx: property (title), widget (QGroupBox, m_options)
+#: rc.cpp:169 rc.cpp:443 rc.cpp:979 rc.cpp:1637 rc.cpp:1696 rc.cpp:169
+#: rc.cpp:443 rc.cpp:979 rc.cpp:1637 rc.cpp:1696
+msgid "Options"
+msgstr ""
+
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:77
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openSilently)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:161
-#: rc.cpp:2661 rc.cpp:2661
+#: rc.cpp:172 rc.cpp:172
 msgid "Open the torrents without asking any questions."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:55
-#. i18n: ectx: property (text), widget (QCheckBox, m_silently)
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:80
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_openSilently)
 #. i18n: file: ktorrent/dialogs/pastedlgbase.ui:55
 #. i18n: ectx: property (text), widget (QCheckBox, m_silently)
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:80
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_openSilently)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:163
-#: obj-i686-linux-gnu/ktorrent/ui_pastedlgbase.h:124 rc.cpp:343 rc.cpp:2664
-#: rc.cpp:343 rc.cpp:2664
+#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:55
+#. i18n: ectx: property (text), widget (QCheckBox, m_silently)
+#: rc.cpp:175 rc.cpp:1675 rc.cpp:175 rc.cpp:1675
 msgid "Open silently"
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:93
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_recursive)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:165
-#: rc.cpp:2667 rc.cpp:2667
+#: rc.cpp:178 rc.cpp:178
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -4841,15 +4049,13 @@
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:96
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_recursive)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:173
-#: rc.cpp:2676 rc.cpp:2676
+#: rc.cpp:187 rc.cpp:187
 msgid "Scan subfolders"
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:109
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_actionDelete)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:175
-#: rc.cpp:2679 rc.cpp:2679
+#: rc.cpp:190 rc.cpp:190
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -4872,15 +4078,13 @@
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:112
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_actionDelete)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:183
-#: rc.cpp:2688 rc.cpp:2688
+#: rc.cpp:199 rc.cpp:199
 msgid "Remove torrent file after loading"
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:119
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_actionMove)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:185
-#: rc.cpp:2691 rc.cpp:2691
+#: rc.cpp:202 rc.cpp:202
 msgid ""
 "When a torrent file is loaded, move it to a subdirectory named loaded. If "
 "the folder does not exist, it will be created."
@@ -4888,398 +4092,672 @@
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:122
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_actionMove)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:187
-#: rc.cpp:2694 rc.cpp:2694
+#: rc.cpp:205 rc.cpp:205
 msgid "Move torrent file to loaded directory"
 msgstr ""
 
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:131
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_addToGroup)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:189
-#: rc.cpp:2697 rc.cpp:2697
+#: rc.cpp:208 rc.cpp:208
 msgid "Add torrents opened with this plugin to a group."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:141
-#. i18n: ectx: property (text), widget (QLabel, label_6)
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:134
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_addToGroup)
 #. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:141
 #. i18n: ectx: property (text), widget (QLabel, label_6)
 #. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:134
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_addToGroup)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:191
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:375 rc.cpp:286
-#: rc.cpp:2700 rc.cpp:286 rc.cpp:2700
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:141
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:211 rc.cpp:1738 rc.cpp:211 rc.cpp:1738
 msgid "Add torrent to group:"
 msgstr ""
 
-#. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:141
-#. i18n: ectx: property (toolTip), widget (QComboBox, m_group)
-#: obj-i686-linux-gnu/plugins/scanfolder/ui_scanfolderprefpage.h:193
-#: rc.cpp:2703 rc.cpp:2703
-msgid "Group to add torrents to."
+#. i18n: file: plugins/scanfolder/scanfolderprefpage.ui:141
+#. i18n: ectx: property (toolTip), widget (QComboBox, m_group)
+#: rc.cpp:214 rc.cpp:214
+msgid "Group to add torrents to."
+msgstr ""
+
+#. i18n: file: plugins/scripting/scriptproperties.ui:51
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:226 rc.cpp:226
+msgid "Description:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scriptproperties.ui:65
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:229 rc.cpp:229
+msgid "License:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scriptproperties.ui:79
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:232 rc.cpp:232
+msgid "Author:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scriptproperties.ui:93
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:235 rc.cpp:235
+msgid "E-Mail:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scriptproperties.ui:107
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:238 rc.cpp:238
+msgid "Website:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, EMailConfigWidget)
+#: rc.cpp:241 rc.cpp:241
+msgid "EMail Settings"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:244 rc.cpp:244
+msgid "SMTP Server"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:25
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:105
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: ktorrent/pref/proxypref.ui:189
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:25
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:105
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: ktorrent/pref/proxypref.ui:189
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:247 rc.cpp:819 rc.cpp:2509 rc.cpp:247 rc.cpp:819 rc.cpp:2509
+msgid "Username:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/pref/proxypref.ui:207
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:122
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/pref/proxypref.ui:207
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#: rc.cpp:250 rc.cpp:825 rc.cpp:2519 rc.cpp:250 rc.cpp:825 rc.cpp:2519
+msgid "Password:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:49
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:253 rc.cpp:253
+msgid "SMTP server:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:61
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:152
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:236
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:59
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/pref/networkpref.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/pref/proxypref.ui:52
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ktorrent/pref/proxypref.ui:145
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#. i18n: file: ktupnptest/upnptestwidget.ui:65
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:61
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:152
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:236
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:59
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/pref/networkpref.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/pref/proxypref.ui:52
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: ktorrent/pref/proxypref.ui:145
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#. i18n: file: ktupnptest/upnptestwidget.ui:65
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:256 rc.cpp:834 rc.cpp:1762 rc.cpp:1809 rc.cpp:2118 rc.cpp:2444
+#: rc.cpp:2490 rc.cpp:2926 rc.cpp:256 rc.cpp:834 rc.cpp:1762 rc.cpp:1809
+#: rc.cpp:2118 rc.cpp:2444 rc.cpp:2490 rc.cpp:2926
+msgid "Port:"
+msgstr "Porth:"
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:80
+#. i18n: ectx: property (text), widget (QCheckBox, tls)
+#: rc.cpp:259 rc.cpp:259
+msgid "Use SSL/TLS encryption"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:90
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:262 rc.cpp:262
+msgid "Destination"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:96
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:265 rc.cpp:265
+msgid "Send mails to:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:106
+#. i18n: ectx: property (text), widget (QCheckBox, add_cc)
+#: rc.cpp:268 rc.cpp:268
+msgid "Add CC:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:116
+#. i18n: ectx: property (text), widget (QCheckBox, add_bcc)
+#: rc.cpp:271 rc.cpp:271
+msgid "Add BCC:"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AutoResumeConfig)
+#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AutoRemoveConfig)
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AutoResumeConfig)
+#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, AutoRemoveConfig)
+#: rc.cpp:274 rc.cpp:289 rc.cpp:274 rc.cpp:289
+msgid "Auto Resume Settings"
+msgstr ""
+
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:19
+#. i18n: ectx: property (text), widget (QCheckBox, auto_resume)
+#: rc.cpp:277 rc.cpp:277
+msgid "Auto resume after:"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, IPBlockingPrefPage)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:219 rc.cpp:2509
-#: rc.cpp:2509
-msgid "IPBlocking Preferences"
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:41
+#. i18n: ectx: property (suffix), widget (QSpinBox, hours)
+#: rc.cpp:280 rc.cpp:280
+msgid " hours"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:23
-#. i18n: ectx: property (title), widget (Q3GroupBox, groupBox1)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:220 rc.cpp:2512
-#: rc.cpp:2512
-msgid "PeerGuardian Filter File "
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:51
+#. i18n: ectx: property (suffix), widget (QSpinBox, minutes)
+#. i18n: file: plugins/syndication/feedwidget.ui:87
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_refresh_rate)
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:51
+#. i18n: ectx: property (suffix), widget (QSpinBox, minutes)
+#. i18n: file: plugins/syndication/feedwidget.ui:87
+#. i18n: ectx: property (suffix), widget (QSpinBox, m_refresh_rate)
+#: rc.cpp:283 rc.cpp:509 rc.cpp:283 rc.cpp:509
+msgid " minutes"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:29
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useLevel1)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:222 rc.cpp:2515
-#: rc.cpp:2515
-msgid "Enable this if you want the IP filter plugin to work."
+#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:61
+#. i18n: ectx: property (suffix), widget (QSpinBox, seconds)
+#: rc.cpp:286 rc.cpp:286
+msgid " seconds"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:32
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useLevel1)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:224 rc.cpp:2518
-#: rc.cpp:2518
-msgid "Use PeerGuardian filter"
+#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:292 rc.cpp:292
+msgid "Auto remove a torrent when:"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:44
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:226 rc.cpp:2521
-#: rc.cpp:2521
-msgid "IP filter file:"
+#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, finish_downloading)
+#: rc.cpp:295 rc.cpp:295
+msgid "The torrent finishes downloading"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:54
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_filterURL)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:228 rc.cpp:2524
-#: rc.cpp:2524
-msgid "Filter file to use, this can be a local file or a remote file."
+#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, finish_seeding)
+#: rc.cpp:298 rc.cpp:298
+msgid "The torrent finishes seeding"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:81
-#. i18n: ectx: property (toolTip), widget (QPushButton, m_download)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:231 rc.cpp:2527
-#: rc.cpp:2527
-msgid "Download and convert the IP filter file."
+#. i18n: file: plugins/upnp/ktupnpplugin.kcfg:10
+#. i18n: ectx: label, entry (defaultDevice), group (general)
+#: rc.cpp:301 rc.cpp:301
+msgid "Default UPnP device to use"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:84
-#. i18n: ectx: property (text), widget (QPushButton, m_download)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:233 rc.cpp:2530
-#: rc.cpp:2530
-msgid "Dow&nload/Convert"
+#. i18n: file: plugins/upnp/upnpwidget.ui:27
+#. i18n: ectx: property (text), widget (QPushButton, m_forward)
+#. i18n: file: ktupnptest/upnptestwidget.ui:125
+#. i18n: ectx: property (text), widget (QPushButton, m_forward)
+#. i18n: file: plugins/upnp/upnpwidget.ui:27
+#. i18n: ectx: property (text), widget (QPushButton, m_forward)
+#. i18n: file: ktupnptest/upnptestwidget.ui:125
+#. i18n: ectx: property (text), widget (QPushButton, m_forward)
+#: rc.cpp:307 rc.cpp:2938 rc.cpp:307 rc.cpp:2938
+msgid "Forward"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:94
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:234 rc.cpp:2533
-#: rc.cpp:2533
-msgid ""
-"Download PeerGuardian filter from bluetack.co.uk or blocklist.org.\n"
-"NOTE: ZIP file from bluetack.co.uk is supported."
+#. i18n: file: plugins/upnp/upnpwidget.ui:34
+#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
+#. i18n: file: ktupnptest/upnptestwidget.ui:132
+#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
+#. i18n: file: plugins/upnp/upnpwidget.ui:34
+#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
+#. i18n: file: ktupnptest/upnptestwidget.ui:132
+#. i18n: ectx: property (text), widget (QPushButton, m_undo_forward)
+#: rc.cpp:310 rc.cpp:2941 rc.cpp:310 rc.cpp:2941
+msgid "Undo Forward"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:117
-#. i18n: ectx: property (title), widget (QGroupBox, m_auto_update_group_box)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:237 rc.cpp:2537
-#: rc.cpp:2537
-msgid "Automatic Update"
-msgstr ""
+#. i18n: file: plugins/upnp/upnpwidget.ui:54
+#. i18n: ectx: property (text), widget (QPushButton, m_rescan)
+#: rc.cpp:313 rc.cpp:313
+msgid "Rescan"
+msgstr "Ailsyllu"
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:125
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_autoUpdate)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:239 rc.cpp:2540
-#: rc.cpp:2540
-msgid "Enable this if you want to automatically update the filter file."
+#. i18n: file: plugins/syndication/ktsyndicationpluginui.rc:4
+#. i18n: ectx: ToolBar (SyndicationToolBar)
+#: rc.cpp:316 rc.cpp:316
+msgid "Syndication Toolbar"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoUpdate)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:241 rc.cpp:2543
-#: rc.cpp:2543
-msgid "Update file every:"
-msgstr ""
+#. i18n: file: plugins/syndication/filtereditor.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:319 rc.cpp:319
+msgid "Name:"
+msgstr "Enw:"
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:147
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_autoUpdateInterval)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:243 rc.cpp:2546
-#: rc.cpp:2546
-msgid "Update interval in days."
+#. i18n: file: plugins/syndication/filtereditor.ui:38
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:322 rc.cpp:322
+msgid "String Matching"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:167
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:245 rc.cpp:2549
-#: rc.cpp:2549
-msgid "Last updated:"
+#. i18n: file: plugins/syndication/filtereditor.ui:72
+#. i18n: ectx: property (toolTip), widget (KEditListBox, m_word_matches)
+#. i18n: file: plugins/syndication/filtereditor.ui:144
+#. i18n: ectx: property (toolTip), widget (KEditListBox, m_exclusion_patterns)
+#. i18n: file: plugins/syndication/filtereditor.ui:72
+#. i18n: ectx: property (toolTip), widget (KEditListBox, m_word_matches)
+#. i18n: file: plugins/syndication/filtereditor.ui:144
+#. i18n: ectx: property (toolTip), widget (KEditListBox, m_exclusion_patterns)
+#: rc.cpp:325 rc.cpp:371 rc.cpp:325 rc.cpp:371
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The string to find in the "
+"title of an item. Simple wildcard syntax is supported :</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<table border=\"0\" style=\" margin-top:0px; margin-bottom:0px; margin-"
+"left:0px; margin-right:0px;\" align=\"center\" cellspacing=\"1\" "
+"cellpadding=\"2\">\n"
+"<tr>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
+"style=\" font-weight:600;\">c</span></p></td>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Any character represents "
+"itself apart from those mentioned below. Thus <span style=\" font-"
+"weight:600;\">c</span> matches the character <span style=\" font-"
+"style:italic;\">c</span>.</p></td></tr>\n"
+"<tr>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
+"style=\" font-weight:600;\">?</span></p></td>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">Matches any "
+"single character. </p></td></tr>\n"
+"<tr>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
+"style=\" font-weight:600;\">*</span></p></td>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">Matches "
+"zero or more of any characters.</p></td></tr>\n"
+"<tr>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
+"style=\" font-weight:600;\">[...]</span></p></td>\n"
+"<td style=\" vertical-align:top;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">Sets of "
+"characters can be represented in square brackets. Within the character "
+"class, like outside, backslash has no special "
+"meaning.</p></td></tr></table>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">For example "
+"the *.torrent will match any item which ends in .torrent. </p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ipblockingprefpage.ui:187
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_ipblockingprefpage.h:247 rc.cpp:2552
-#: rc.cpp:2552
-msgid "Next update:"
+#. i18n: file: plugins/syndication/filtereditor.ui:85
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_reg_exp_syntax)
+#. i18n: file: plugins/syndication/filtereditor.ui:157
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_exclusion_reg_exp)
+#. i18n: file: plugins/syndication/filtereditor.ui:85
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_reg_exp_syntax)
+#. i18n: file: plugins/syndication/filtereditor.ui:157
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_exclusion_reg_exp)
+#: rc.cpp:356 rc.cpp:402 rc.cpp:356 rc.cpp:402
+msgid ""
+"By default strings will use wildcard matching. If you want to use regular "
+"expressions, this needs to be enabled."
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/convertdialog.ui:28
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_convertdialog.h:118 rc.cpp:2565
-#: rc.cpp:2565
-msgid "Converting block list to KTorrent format. This might take some time."
+#. i18n: file: plugins/syndication/filtereditor.ui:88
+#. i18n: ectx: property (text), widget (QCheckBox, m_reg_exp_syntax)
+#. i18n: file: plugins/syndication/filtereditor.ui:160
+#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_reg_exp)
+#. i18n: file: plugins/syndication/filtereditor.ui:88
+#. i18n: ectx: property (text), widget (QCheckBox, m_reg_exp_syntax)
+#. i18n: file: plugins/syndication/filtereditor.ui:160
+#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_reg_exp)
+#: rc.cpp:359 rc.cpp:405 rc.cpp:359 rc.cpp:405
+msgid "Strings are regular expressions"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/convertdialog.ui:95
-#. i18n: ectx: property (text), widget (QPushButton, m_cancel)
-#: obj-i686-linux-gnu/plugins/ipfilter/ui_convertdialog.h:120 rc.cpp:2568
-#: rc.cpp:2568
-msgid "C&ancel"
-msgstr "&Diddymu"
-
-#. i18n: file: plugins/stats/Settings.ui:192
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#. i18n: file: plugins/stats/Spd.ui:43
-#. i18n: ectx: property (title), widget (QGroupBox, UlSpdGbw)
-#. i18n: file: plugins/stats/DisplaySettings.ui:363
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#. i18n: file: plugins/stats/DisplaySettings.ui:373
-#. i18n: ectx: property (text), widget (QLabel, label_15)
-#. i18n: file: plugins/stats/Settings.ui:192
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#. i18n: file: plugins/stats/Spd.ui:43
-#. i18n: ectx: property (title), widget (QGroupBox, UlSpdGbw)
-#. i18n: file: plugins/stats/DisplaySettings.ui:363
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#. i18n: file: plugins/stats/DisplaySettings.ui:373
-#. i18n: ectx: property (text), widget (QLabel, label_15)
-#: obj-i686-linux-gnu/plugins/stats/ui_Spd.h:96
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:296
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:659
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:665 rc.cpp:1516
-#: rc.cpp:1552 rc.cpp:1690 rc.cpp:1693 rc.cpp:1516 rc.cpp:1552 rc.cpp:1690
-#: rc.cpp:1693
-msgid "Upload"
+#. i18n: file: plugins/syndication/filtereditor.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, m_all_words_must_match)
+#: rc.cpp:362 rc.cpp:362
+msgid "Item must match all strings to be included"
 msgstr ""
 
-#. i18n: file: plugins/stats/Conns.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConnsWgt)
-#. i18n: file: plugins/stats/Conns.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, ConnsGbw)
-#. i18n: file: plugins/stats/Settings.ui:140
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: plugins/stats/DisplaySettings.ui:504
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: plugins/stats/Conns.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConnsWgt)
-#. i18n: file: plugins/stats/Conns.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, ConnsGbw)
-#. i18n: file: plugins/stats/Settings.ui:140
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: plugins/stats/DisplaySettings.ui:504
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: obj-i686-linux-gnu/plugins/stats/ui_Conns.h:78
-#: obj-i686-linux-gnu/plugins/stats/ui_Conns.h:79
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:294
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:682 rc.cpp:1477
-#: rc.cpp:1480 rc.cpp:1510 rc.cpp:1702 rc.cpp:1477 rc.cpp:1480 rc.cpp:1510
-#: rc.cpp:1702
-msgid "Connections"
+#. i18n: file: plugins/syndication/filtereditor.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, m_match_case_sensitive)
+#. i18n: file: plugins/syndication/filtereditor.ui:174
+#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_case_sensitive)
+#. i18n: file: plugins/syndication/filtereditor.ui:102
+#. i18n: ectx: property (text), widget (QCheckBox, m_match_case_sensitive)
+#. i18n: file: plugins/syndication/filtereditor.ui:174
+#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_case_sensitive)
+#: rc.cpp:365 rc.cpp:411 rc.cpp:365 rc.cpp:411
+msgid "Case sensitive matching"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, UpdateGbw)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:286 rc.cpp:1489 rc.cpp:1489
-msgid "Update"
+#. i18n: file: plugins/syndication/filtereditor.ui:110
+#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
+#: rc.cpp:368 rc.cpp:368
+msgid "Exclusion Patterns"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:25
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:287 rc.cpp:1492 rc.cpp:1492
-msgid "Update charts every"
+#. i18n: file: plugins/syndication/filtereditor.ui:167
+#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_all_must_match)
+#: rc.cpp:408 rc.cpp:408
+msgid "Item must match all strings to be excluded"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:50
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:288 rc.cpp:1495 rc.cpp:1495
-msgid "GUI updates"
+#. i18n: file: plugins/syndication/filtereditor.ui:182
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:414 rc.cpp:414
+msgid "Seasons && Episodes"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:69
+#. i18n: file: plugins/syndication/filtereditor.ui:188
+#. i18n: ectx: property (text), widget (QCheckBox, m_use_se_matching)
+#: rc.cpp:417 rc.cpp:417
+msgid "Use season and episode matching"
+msgstr ""
+
+#. i18n: file: plugins/syndication/filtereditor.ui:197
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:290 rc.cpp:1498 rc.cpp:1498
-msgid "Gather data every"
+#: rc.cpp:420 rc.cpp:420
+msgid "Seasons: "
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:95
+#. i18n: file: plugins/syndication/filtereditor.ui:208
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_seasons)
+#: rc.cpp:423 rc.cpp:423
+msgid ""
+"Specify the seasons to download, multiple seasons can be separated by a , "
+"and you can also use ranges by using a -\n"
+"\n"
+"For example: 1, 3-6, 9\n"
+"\n"
+"Will download seasons 1, 3, 4, 5, 6 and 9"
+msgstr ""
+
+#. i18n: file: plugins/syndication/filtereditor.ui:215
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:291 rc.cpp:1501 rc.cpp:1501
-msgid "milliseconds"
+#: rc.cpp:430 rc.cpp:430
+msgid "Episodes:"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:108
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:292 rc.cpp:1504 rc.cpp:1504
-msgid "Measurements counts"
+#. i18n: file: plugins/syndication/filtereditor.ui:226
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_episodes)
+#: rc.cpp:433 rc.cpp:433
+msgid ""
+"Specify the episodes to download, multiple episodes can be separated by a , "
+"and you can also use ranges by using a -\n"
+"\n"
+"For example: 1, 3-6, 9\n"
+"\n"
+"Will download episodes 1, 3, 4, 5, 6 and 9"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:247
-#. i18n: ectx: property (title), widget (QGroupBox, MaxModeGbw)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:298 rc.cpp:1522 rc.cpp:1522
-msgid "Maximum"
+#. i18n: file: plugins/syndication/filtereditor.ui:235
+#. i18n: ectx: property (text), widget (QCheckBox, m_se_no_duplicates)
+#: rc.cpp:440 rc.cpp:440
+msgid "Do not download multiple items with the same season and episode"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:255
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:299 rc.cpp:1525 rc.cpp:1525
-msgid "Maximum speed scale mode: "
+#. i18n: file: plugins/syndication/filtereditor.ui:262
+#. i18n: ectx: property (text), widget (QCheckBox, m_download_matches)
+#: rc.cpp:446 rc.cpp:446
+msgid "Download torrents of matching items"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:272
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MaxMode)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:302 rc.cpp:1528 rc.cpp:1528
-msgid "Top"
+#. i18n: file: plugins/syndication/filtereditor.ui:269
+#. i18n: ectx: property (text), widget (QCheckBox, m_download_non_matches)
+#: rc.cpp:449 rc.cpp:449
+msgid "Download torrents of non matching items"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:277
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MaxMode)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:303 rc.cpp:1531 rc.cpp:1531
-msgid "Exact"
+#. i18n: file: plugins/syndication/filtereditor.ui:278
+#. i18n: ectx: property (text), widget (QCheckBox, m_add_to_group)
+#: rc.cpp:452 rc.cpp:452
+msgid "Add to group:"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:290
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:305 rc.cpp:1534 rc.cpp:1534
-msgid "Peers connections"
+#. i18n: file: plugins/syndication/filtereditor.ui:312
+#. i18n: ectx: property (text), widget (QCheckBox, m_use_custom_download_location)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:25
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#. i18n: file: plugins/syndication/filtereditor.ui:312
+#. i18n: ectx: property (text), widget (QCheckBox, m_use_custom_download_location)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:25
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:455 rc.cpp:1586 rc.cpp:455 rc.cpp:1586
+msgid "Download to:"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:296
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowSeedsInSwarms)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:306 rc.cpp:1537 rc.cpp:1537
-msgid "Show seeds in swarms"
+#. i18n: file: plugins/syndication/filtereditor.ui:322
+#. i18n: ectx: property (text), widget (QCheckBox, m_move_on_completion)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:55
+#. i18n: ectx: property (text), widget (QCheckBox, m_moveCompleted)
+#. i18n: file: ktorrent/view/propertiesextender.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, move_on_completion_enabled)
+#. i18n: file: plugins/syndication/filtereditor.ui:322
+#. i18n: ectx: property (text), widget (QCheckBox, m_move_on_completion)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:55
+#. i18n: ectx: property (text), widget (QCheckBox, m_moveCompleted)
+#. i18n: file: ktorrent/view/propertiesextender.ui:61
+#. i18n: ectx: property (text), widget (QCheckBox, move_on_completion_enabled)
+#: rc.cpp:458 rc.cpp:1598 rc.cpp:1947 rc.cpp:458 rc.cpp:1598 rc.cpp:1947
+msgid "Move when completed to:"
 msgstr ""
 
-#. i18n: file: plugins/stats/Settings.ui:303
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowLeechersInSwarms)
-#: obj-i686-linux-gnu/plugins/stats/ui_Settings.h:307 rc.cpp:1540 rc.cpp:1540
-msgid "Show leechers in swarms"
+#. i18n: file: plugins/syndication/filtereditor.ui:334
+#. i18n: ectx: property (text), widget (QCheckBox, m_silently)
+#: rc.cpp:461 rc.cpp:461
+msgid "Open torrents silently"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, ColorsGbw)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:114
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: plugins/stats/DisplaySettings.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, ColorsGbw)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:114
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:640
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:200 rc.cpp:1657
-#: rc.cpp:1796 rc.cpp:1657 rc.cpp:1796
-msgid "Colors"
+#. i18n: file: plugins/syndication/filtereditor.ui:355
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#. i18n: file: plugins/syndication/filtereditor.ui:363
+#. i18n: ectx: property (text), widget (QPushButton, m_test)
+#. i18n: file: plugins/syndication/filtereditor.ui:355
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#. i18n: file: plugins/syndication/filtereditor.ui:363
+#. i18n: ectx: property (text), widget (QPushButton, m_test)
+#: rc.cpp:464 rc.cpp:467 rc.cpp:464 rc.cpp:467
+msgid "Test"
+msgstr "Profi"
+
+#. i18n: file: plugins/syndication/filtereditor.ui:370
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:470 rc.cpp:470
+msgid "filter on feed:"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:72
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#. i18n: file: plugins/stats/DisplaySettings.ui:412
-#. i18n: ectx: property (text), widget (QLabel, label_16)
-#. i18n: file: plugins/stats/DisplaySettings.ui:72
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#. i18n: file: plugins/stats/DisplaySettings.ui:412
-#. i18n: ectx: property (text), widget (QLabel, label_16)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:643
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:661 rc.cpp:1666
-#: rc.cpp:1696 rc.cpp:1666 rc.cpp:1696
-msgid "Average"
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ManageFiltersDlg)
+#: rc.cpp:473 rc.cpp:473
+msgid "Manage Filters"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:111
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#. i18n: file: plugins/stats/DisplaySettings.ui:451
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#. i18n: file: plugins/stats/DisplaySettings.ui:111
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#. i18n: file: plugins/stats/DisplaySettings.ui:451
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:645
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:663 rc.cpp:1669
-#: rc.cpp:1699 rc.cpp:1669 rc.cpp:1699
-msgid "Limit"
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:22
+#. i18n: ectx: property (text), widget (QLabel, m_feed_text)
+#: rc.cpp:476 rc.cpp:476
+msgid "Feed:"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:617
-#. i18n: ectx: property (text), widget (QLabel, label_26)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:672 rc.cpp:1714
-#: rc.cpp:1714
-msgid "Seeds  in swarms"
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:33
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:479 rc.cpp:479
+msgid "Active filters:"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:722
-#. i18n: ectx: property (text), widget (QLabel, label_29)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:678 rc.cpp:1723
-#: rc.cpp:1723
-msgid "Avg. leechers connected per running torr."
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:60
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: plugins/search/searchpref.ui:160
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:169
+#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:258
+#. i18n: ectx: property (text), widget (KPushButton, m_add_node)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:319
+#. i18n: ectx: property (text), widget (KPushButton, m_add_webseed)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:111
+#. i18n: ectx: property (text), widget (KPushButton, m_add)
+#. i18n: file: ktorrent/ipfilterwidget.ui:46
+#. i18n: ectx: property (text), widget (KPushButton, m_add)
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:60
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: plugins/search/searchpref.ui:160
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:169
+#. i18n: ectx: property (text), widget (KPushButton, m_add_tracker)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:258
+#. i18n: ectx: property (text), widget (KPushButton, m_add_node)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:319
+#. i18n: ectx: property (text), widget (KPushButton, m_add_webseed)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:111
+#. i18n: ectx: property (text), widget (KPushButton, m_add)
+#. i18n: file: ktorrent/ipfilterwidget.ui:46
+#. i18n: ectx: property (text), widget (KPushButton, m_add)
+#: rc.cpp:482 rc.cpp:942 rc.cpp:1744 rc.cpp:1765 rc.cpp:1780 rc.cpp:1812
+#: rc.cpp:1976 rc.cpp:482 rc.cpp:942 rc.cpp:1744 rc.cpp:1765 rc.cpp:1780
+#: rc.cpp:1812 rc.cpp:1976
+msgid "Add"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:757
-#. i18n: ectx: property (text), widget (QLabel, label_30)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:680 rc.cpp:1726
-#: rc.cpp:1726
-msgid "Avg. seeds connected per running torrent"
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:91
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:488 rc.cpp:488
+msgid "Available filters:"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:909
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AntiAliasing)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:689 rc.cpp:1741
-#: rc.cpp:1741
-msgid "Use anti-aliasing"
+#. i18n: file: plugins/syndication/managefiltersdlg.ui:107
+#. i18n: ectx: property (text), widget (QPushButton, m_remove_all)
+#: rc.cpp:491 rc.cpp:491
+msgid "Remove All"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:919
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_DrawBgdGrid)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:690 rc.cpp:1744
-#: rc.cpp:1744
-msgid "Draw background grid"
+#. i18n: file: plugins/syndication/feedwidget.ui:27
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:25
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#. i18n: file: plugins/syndication/feedwidget.ui:27
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:25
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:497 rc.cpp:1672 rc.cpp:497 rc.cpp:1672
+msgid "URL:"
+msgstr "URL:"
+
+#. i18n: file: plugins/syndication/feedwidget.ui:53
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:500 rc.cpp:500
+msgid "Status:"
+msgstr "Cyflwr:"
+
+#. i18n: file: plugins/syndication/feedwidget.ui:77
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:503 rc.cpp:503
+msgid "Refresh every:"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:931
-#. i18n: ectx: property (text), widget (QLabel, label_18)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:691 rc.cpp:1747
-#: rc.cpp:1747
-msgid "Widget type:"
+#. i18n: file: plugins/syndication/feedwidget.ui:84
+#. i18n: ectx: property (toolTip), widget (QSpinBox, m_refresh_rate)
+#: rc.cpp:506 rc.cpp:506
+msgid "Time between automatic refreshes of the feed."
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:939
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_WidgetType)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:694 rc.cpp:1750
-#: rc.cpp:1750
-msgid "Native"
+#. i18n: file: plugins/syndication/feedwidget.ui:128
+#. i18n: ectx: property (text), widget (KPushButton, m_refresh)
+#: rc.cpp:515 rc.cpp:515
+msgid "Refresh"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:944
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_WidgetType)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:695 rc.cpp:1753
-#: rc.cpp:1753
-msgid "KDE"
+#. i18n: file: plugins/syndication/feedwidget.ui:148
+#. i18n: ectx: property (text), widget (KPushButton, m_filters)
+#: rc.cpp:518 rc.cpp:518
+msgid "Filters"
+msgstr ""
+
+#. i18n: file: plugins/syndication/feedwidget.ui:155
+#. i18n: ectx: property (text), widget (KPushButton, m_cookies)
+#: rc.cpp:521 rc.cpp:521
+msgid "Cookies"
 msgstr ""
 
-#. i18n: file: plugins/stats/DisplaySettings.ui:952
-#. i18n: ectx: property (text), widget (QLabel, label_33)
-#: obj-i686-linux-gnu/plugins/stats/ui_DisplaySettings.h:697 rc.cpp:1756
-#: rc.cpp:1756
-msgid "(plugin reload is needed after change)"
+#. i18n: file: plugins/mediaplayer/ktmediaplayerpluginui.rc:3
+#. i18n: ectx: Menu (MediaPlayerMenu)
+#: rc.cpp:524 rc.cpp:524
+msgid "Media Player Menu"
 msgstr ""
 
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, AddItemDlg)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:298 rc.cpp:1907
-#: rc.cpp:1907
-msgid "Add a new item to the schedule"
+#. i18n: file: plugins/mediaplayer/ktmediaplayerpluginui.rc:11
+#. i18n: ectx: ToolBar (MediaPlayerToolBar)
+#: rc.cpp:527 rc.cpp:527
+msgid "Media Player Toolbar"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/edititemdlg.ui:23
@@ -5290,9 +4768,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:25
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:299
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:274 rc.cpp:1826
-#: rc.cpp:1910 rc.cpp:1826 rc.cpp:1910
+#: rc.cpp:533 rc.cpp:677 rc.cpp:533 rc.cpp:677
 msgid "Time"
 msgstr ""
 
@@ -5304,9 +4780,7 @@
 #. i18n: ectx: property (text), widget (QLabel, label_3)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:33
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:300
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:275 rc.cpp:1829
-#: rc.cpp:1913 rc.cpp:1829 rc.cpp:1913
+#: rc.cpp:536 rc.cpp:680 rc.cpp:536 rc.cpp:680
 msgid "From:"
 msgstr ""
 
@@ -5326,12 +4800,8 @@
 #. i18n: ectx: property (displayFormat), widget (QTimeEdit, m_from)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:54
 #. i18n: ectx: property (displayFormat), widget (QTimeEdit, m_to)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:301
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:303
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:276
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:278 rc.cpp:1832
-#: rc.cpp:1838 rc.cpp:1916 rc.cpp:1922 rc.cpp:1832 rc.cpp:1838 rc.cpp:1916
-#: rc.cpp:1922
+#: rc.cpp:539 rc.cpp:545 rc.cpp:683 rc.cpp:689 rc.cpp:539 rc.cpp:545
+#: rc.cpp:683 rc.cpp:689
 msgid "hh:mm"
 msgstr ""
 
@@ -5343,38 +4813,14 @@
 #. i18n: ectx: property (text), widget (QLabel, label_4)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:47
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:302
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:277 rc.cpp:1835
-#: rc.cpp:1919 rc.cpp:1835 rc.cpp:1919
+#: rc.cpp:542 rc.cpp:686 rc.cpp:542 rc.cpp:686
 msgid "To:"
 msgstr ""
 
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:63
+#. i18n: file: plugins/bwscheduler/edititemdlg.ui:63
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:304 rc.cpp:1925
-#: rc.cpp:1925
-msgid "Days:"
-msgstr ""
-
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:77
-#. i18n: ectx: property (text), widget (QPushButton, m_entire_week)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:305 rc.cpp:1928
-#: rc.cpp:1928
-msgid "Entire Week"
-msgstr ""
-
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:84
-#. i18n: ectx: property (text), widget (QPushButton, m_weekdays_only)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:306 rc.cpp:1931
-#: rc.cpp:1931
-msgid "Weekdays Only"
-msgstr ""
-
-#. i18n: file: plugins/bwscheduler/additemdlg.ui:91
-#. i18n: ectx: property (text), widget (QPushButton, m_weekend)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:307 rc.cpp:1934
-#: rc.cpp:1934
-msgid "Weekend"
+#: rc.cpp:548 rc.cpp:548
+msgid "Day:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/edititemdlg.ui:93
@@ -5385,9 +4831,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:118
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:308
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:280 rc.cpp:1844
-#: rc.cpp:1937 rc.cpp:1844 rc.cpp:1937
+#: rc.cpp:551 rc.cpp:704 rc.cpp:551 rc.cpp:704
 msgid "Limits"
 msgstr ""
 
@@ -5407,12 +4851,8 @@
 #. i18n: ectx: property (text), widget (QLabel, label)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:184
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:310
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:317
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:282
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:289 rc.cpp:1850
-#: rc.cpp:1871 rc.cpp:1943 rc.cpp:1964 rc.cpp:1850 rc.cpp:1871 rc.cpp:1943
-#: rc.cpp:1964
+#: rc.cpp:557 rc.cpp:578 rc.cpp:710 rc.cpp:731 rc.cpp:557 rc.cpp:578
+#: rc.cpp:710 rc.cpp:731
 msgid "Download limit:"
 msgstr ""
 
@@ -5432,12 +4872,8 @@
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:204
 #. i18n: ectx: property (text), widget (QLabel, label_9)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:313
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:320
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:285
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:292 rc.cpp:1859
-#: rc.cpp:1880 rc.cpp:1952 rc.cpp:1973 rc.cpp:1859 rc.cpp:1880 rc.cpp:1952
-#: rc.cpp:1973
+#: rc.cpp:566 rc.cpp:587 rc.cpp:719 rc.cpp:740 rc.cpp:566 rc.cpp:587
+#: rc.cpp:719 rc.cpp:740
 msgid "Upload limit:"
 msgstr ""
 
@@ -5449,9 +4885,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, m_screensaver_limits)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:175
 #. i18n: ectx: property (text), widget (QCheckBox, m_screensaver_limits)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:316
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:288 rc.cpp:1868
-#: rc.cpp:1961 rc.cpp:1868 rc.cpp:1961
+#: rc.cpp:575 rc.cpp:728 rc.cpp:575 rc.cpp:728
 msgid "When screensaver is activated:"
 msgstr ""
 
@@ -5463,9 +4897,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:244
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:323
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:295 rc.cpp:1889
-#: rc.cpp:1982 rc.cpp:1889 rc.cpp:1982
+#: rc.cpp:596 rc.cpp:749 rc.cpp:596 rc.cpp:749
 msgid "Connection Limits"
 msgstr ""
 
@@ -5477,16 +4909,10 @@
 #. i18n: ectx: property (text), widget (QCheckBox, m_set_connection_limits)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:250
 #. i18n: ectx: property (text), widget (QCheckBox, m_set_connection_limits)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:324
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:296 rc.cpp:1892
-#: rc.cpp:1985 rc.cpp:1892 rc.cpp:1985
+#: rc.cpp:599 rc.cpp:752 rc.cpp:599 rc.cpp:752
 msgid "Set connection limits"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/networkpref.ui:81
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:235
-#. i18n: ectx: property (text), widget (QLabel, label_7)
 #. i18n: file: plugins/bwscheduler/edititemdlg.ui:219
 #. i18n: ectx: property (text), widget (QLabel, label_7)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:259
@@ -5499,19 +4925,15 @@
 #. i18n: ectx: property (text), widget (QLabel, label_7)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:259
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:325
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:297
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:300
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:335 rc.cpp:996
-#: rc.cpp:1459 rc.cpp:1895 rc.cpp:1988 rc.cpp:996 rc.cpp:1459 rc.cpp:1895
-#: rc.cpp:1988
+#. i18n: file: ktorrent/pref/networkpref.ui:81
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:235
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:602 rc.cpp:755 rc.cpp:2142 rc.cpp:2304 rc.cpp:602 rc.cpp:755
+#: rc.cpp:2142 rc.cpp:2304
 msgid "Maximum connections per torrent:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/networkpref.ui:101
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:249
-#. i18n: ectx: property (text), widget (QLabel, label_8)
 #. i18n: file: plugins/bwscheduler/edititemdlg.ui:236
 #. i18n: ectx: property (text), widget (QLabel, label_6)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:276
@@ -5524,33 +4946,24 @@
 #. i18n: ectx: property (text), widget (QLabel, label_6)
 #. i18n: file: plugins/bwscheduler/additemdlg.ui:276
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_additemdlg.h:327
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:299
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:305
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:337 rc.cpp:1005
-#: rc.cpp:1462 rc.cpp:1901 rc.cpp:1994 rc.cpp:1005 rc.cpp:1462 rc.cpp:1901
-#: rc.cpp:1994
+#. i18n: file: ktorrent/pref/networkpref.ui:101
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:249
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:608 rc.cpp:761 rc.cpp:2151 rc.cpp:2307 rc.cpp:608 rc.cpp:761
+#: rc.cpp:2151 rc.cpp:2307
 msgid "Global connection limit:"
 msgstr ""
 
-#. i18n: file: plugins/bwscheduler/edititemdlg.ui:63
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_edititemdlg.h:279 rc.cpp:1841
-#: rc.cpp:1841
-msgid "Day:"
-msgstr ""
-
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:16
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:183 rc.cpp:1763
-#: rc.cpp:1763
+#: rc.cpp:614 rc.cpp:614
 msgid "Special Limits"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:22
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_screensaverLimits)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:185 rc.cpp:1766
-#: rc.cpp:1766
+#: rc.cpp:617 rc.cpp:617
 msgid ""
 "Use these global limits when the screensaver is activated, instead of the "
 "ones configured in the network settings."
@@ -5558,11 +4971,12 @@
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:25
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_screensaverLimits)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:187 rc.cpp:1769
-#: rc.cpp:1769
+#: rc.cpp:620 rc.cpp:620
 msgid "Use different speed limits when the screensaver is activated"
 msgstr ""
 
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:36
+#. i18n: ectx: property (text), widget (QLabel, label)
 #. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:93
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
 #. i18n: file: ktorrent/pref/networkpref.ui:144
@@ -5577,24 +4991,19 @@
 #. i18n: ectx: property (text), widget (QLabel, label_5)
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:207
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:188
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:147
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:316
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:331 rc.cpp:187
-#: rc.cpp:1026 rc.cpp:1453 rc.cpp:1772 rc.cpp:187 rc.cpp:1026 rc.cpp:1453
-#: rc.cpp:1772
+#: rc.cpp:623 rc.cpp:1556 rc.cpp:2172 rc.cpp:2298 rc.cpp:623 rc.cpp:1556
+#: rc.cpp:2172 rc.cpp:2298
 msgid "Maximum upload speed:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:49
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_screensaverUploadLimit)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:190 rc.cpp:1775
-#: rc.cpp:1775
+#: rc.cpp:626 rc.cpp:626
 msgid "Global upload limit when the screensaver is activated."
 msgstr ""
 
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:65
+#. i18n: ectx: property (text), widget (QLabel, label_6)
 #. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:70
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
 #. i18n: file: ktorrent/pref/networkpref.ui:121
@@ -5609,133 +5018,160 @@
 #. i18n: ectx: property (text), widget (QLabel, label_6)
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:221
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: plugins/bwscheduler/bwprefpage.ui:65
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:194
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:144
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:310
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:333 rc.cpp:178
-#: rc.cpp:1014 rc.cpp:1456 rc.cpp:1784 rc.cpp:178 rc.cpp:1014 rc.cpp:1456
-#: rc.cpp:1784
+#: rc.cpp:635 rc.cpp:1547 rc.cpp:2160 rc.cpp:2301 rc.cpp:635 rc.cpp:1547
+#: rc.cpp:2160 rc.cpp:2301
 msgid "Maximum download speed:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:78
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_screensaverDownloadLimit)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:196 rc.cpp:1787
-#: rc.cpp:1787
+#: rc.cpp:638 rc.cpp:638
 msgid "Global download limit when the screensaver is activated."
 msgstr ""
 
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:114
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: plugins/stats/DisplaySettings.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, ColorsGbw)
+#. i18n: file: plugins/bwscheduler/bwprefpage.ui:114
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: plugins/stats/DisplaySettings.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, ColorsGbw)
+#: rc.cpp:647 rc.cpp:1105 rc.cpp:647 rc.cpp:1105
+msgid "Colors"
+msgstr ""
+
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:120
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:201 rc.cpp:1799
-#: rc.cpp:1799
+#: rc.cpp:650 rc.cpp:650
 msgid "Schedule background color:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:127
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_scheduleBackgroundColor)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:203 rc.cpp:1802
-#: rc.cpp:1802
+#: rc.cpp:653 rc.cpp:653
 msgid "Color of the schedule background."
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:134
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:205 rc.cpp:1805
-#: rc.cpp:1805
+#: rc.cpp:656 rc.cpp:656
 msgid "Schedule line color:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:141
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_scheduleLineColor)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:207 rc.cpp:1808
-#: rc.cpp:1808
+#: rc.cpp:659 rc.cpp:659
 msgid "Color of all lines on the schedule."
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:148
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:209 rc.cpp:1811
-#: rc.cpp:1811
+#: rc.cpp:662 rc.cpp:662
 msgid "Schedule Item color:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:155
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_itemColor)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:211 rc.cpp:1814
-#: rc.cpp:1814
+#: rc.cpp:665 rc.cpp:665
 msgid "Color of each normal item on the schedule."
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:162
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:213 rc.cpp:1817
-#: rc.cpp:1817
+#: rc.cpp:668 rc.cpp:668
 msgid "Suspended schedule item color:"
 msgstr ""
 
 #. i18n: file: plugins/bwscheduler/bwprefpage.ui:169
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_suspendedColor)
-#: obj-i686-linux-gnu/plugins/bwscheduler/ui_bwprefpage.h:215 rc.cpp:1820
-#: rc.cpp:1820
+#: rc.cpp:671 rc.cpp:671
 msgid "Color of each suspended item on the schedule."
 msgstr ""
 
-#. i18n: file: plugins/scripting/scriptproperties.ui:51
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:149 rc.cpp:2833
-#: rc.cpp:2833
-msgid "Description:"
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddItemDlg)
+#: rc.cpp:674 rc.cpp:674
+msgid "Add a new item to the schedule"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scriptproperties.ui:65
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:63
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:151 rc.cpp:2836
-#: rc.cpp:2836
-msgid "License:"
+#: rc.cpp:692 rc.cpp:692
+msgid "Days:"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scriptproperties.ui:79
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:153 rc.cpp:2839
-#: rc.cpp:2839
-msgid "Author:"
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:77
+#. i18n: ectx: property (text), widget (QPushButton, m_entire_week)
+#: rc.cpp:695 rc.cpp:695
+msgid "Entire Week"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scriptproperties.ui:93
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:155 rc.cpp:2842
-#: rc.cpp:2842
-msgid "E-Mail:"
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:84
+#. i18n: ectx: property (text), widget (QPushButton, m_weekdays_only)
+#: rc.cpp:698 rc.cpp:698
+msgid "Weekdays Only"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scriptproperties.ui:107
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: obj-i686-linux-gnu/plugins/scripting/ui_scriptproperties.h:157 rc.cpp:2845
-#: rc.cpp:2845
-msgid "Website:"
+#. i18n: file: plugins/bwscheduler/additemdlg.ui:91
+#. i18n: ectx: property (text), widget (QPushButton, m_weekend)
+#: rc.cpp:701 rc.cpp:701
+msgid "Weekend"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:356 rc.cpp:2084
-#: rc.cpp:2084
-msgid "Name:"
-msgstr "Enw:"
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:22
+#. i18n: ectx: property (text), widget (QLabel, m_top_label)
+#: rc.cpp:777 rc.cpp:777
+msgid "File download order for:"
+msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:72
-#. i18n: ectx: property (toolTip), widget (KEditListBox, m_word_matches)
-#. i18n: file: plugins/syndication/filtereditor.ui:144
-#. i18n: ectx: property (toolTip), widget (KEditListBox, m_exclusion_patterns)
-#. i18n: file: plugins/syndication/filtereditor.ui:72
-#. i18n: ectx: property (toolTip), widget (KEditListBox, m_word_matches)
-#. i18n: file: plugins/syndication/filtereditor.ui:144
-#. i18n: ectx: property (toolTip), widget (KEditListBox, m_exclusion_patterns)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:358
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:400 rc.cpp:2090
-#: rc.cpp:2136 rc.cpp:2090 rc.cpp:2136
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:29
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_custom_order_enabled)
+#: rc.cpp:780 rc.cpp:780
+msgid "Whether or not to enable a custom download order."
+msgstr ""
+
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:32
+#. i18n: ectx: property (text), widget (QCheckBox, m_custom_order_enabled)
+#: rc.cpp:783 rc.cpp:783
+msgid "Custom file download order enabled"
+msgstr ""
+
+#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:41
+#. i18n: ectx: property (toolTip), widget (QListView, m_order)
+#: rc.cpp:786 rc.cpp:786
+msgid ""
+"Order in which to download the files of a torrent. The file at the top will "
+"be downloaded first, followed by the second, then the third ..."
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, WebInterfacePrefWidget)
+#. i18n: file: plugins/search/searchpref.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, SearchPref)
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, WebInterfacePrefWidget)
+#. i18n: file: plugins/search/searchpref.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, SearchPref)
+#: rc.cpp:795 rc.cpp:894 rc.cpp:795 rc.cpp:894
+msgid "Search Preferences"
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:40
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:801 rc.cpp:801
+msgid "Web interface skin:"
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:62
+#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_skin)
+#: rc.cpp:804 rc.cpp:804
+msgid "Which interface to use."
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:95
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_authentication)
+#: rc.cpp:807 rc.cpp:807
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -5745,1207 +5181,1048 @@
 "</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The string to find in the "
-"title of an item. Simple wildcard syntax is supported :</p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">If login required is "
+"enabled, you need to enter a username and a password.</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
 "indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Attention: </span>You should not disable this when the "
+"webinterface is accessible from the internet. It will allow anybody access "
+"to it.</p></body></html>"
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:98
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_authentication)
+#: rc.cpp:816 rc.cpp:816
+msgid "Login required"
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:115
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_username)
+#: rc.cpp:822 rc.cpp:822
+msgid "Username you need to use in the login page of the webinterface."
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:129
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_password)
+#: rc.cpp:828 rc.cpp:828
+msgid ""
+"The password for the webinterface login page. By default this is set to "
+"ktorrent."
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:144
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:831 rc.cpp:831
+msgid "Web Server"
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:168
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_port)
+#: rc.cpp:837 rc.cpp:837
+msgid "The port the webinterface listens on."
+msgstr ""
+
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:196
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_forward)
+#: rc.cpp:840 rc.cpp:840
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">If you are behind a router "
+"and you want to access the webinterface from somewhere on the Internet you "
+"need to forward the correct port.</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
 "indent:0px;\"></p>\n"
-"<table border=\"0\" style=\" margin-top:0px; margin-bottom:0px; margin-"
-"left:0px; margin-right:0px;\" align=\"center\" cellspacing=\"1\" "
-"cellpadding=\"2\">\n"
-"<tr>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
-"style=\" font-weight:600;\">c</span></p></td>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Any character represents "
-"itself apart from those mentioned below. Thus <span style=\" font-"
-"weight:600;\">c</span> matches the character <span style=\" font-"
-"style:italic;\">c</span>.</p></td></tr>\n"
-"<tr>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
-"style=\" font-weight:600;\">?</span></p></td>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">Matches any "
-"single character. </p></td></tr>\n"
-"<tr>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
-"style=\" font-weight:600;\">*</span></p></td>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">Matches "
-"zero or more of any characters.</p></td></tr>\n"
-"<tr>\n"
-"<td style=\" vertical-align:top;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\"><span "
-"style=\" font-weight:600;\">[...]</span></p></td>\n"
-"<td style=\" vertical-align:top;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">Sets of "
-"characters can be represented in square brackets. Within the character "
-"class, like outside, backslash has no special "
-"meaning.</p></td></tr></table>\n"
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; color:#000000;\">For example "
-"the *.torrent will match any item which ends in .torrent. </p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">This checkbox will ensure "
+"that the UPnP plugin automatically forwards the port. The UPnP plugin needs "
+"to be loaded for this to work.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:85
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_reg_exp_syntax)
-#. i18n: file: plugins/syndication/filtereditor.ui:157
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_exclusion_reg_exp)
-#. i18n: file: plugins/syndication/filtereditor.ui:85
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_reg_exp_syntax)
-#. i18n: file: plugins/syndication/filtereditor.ui:157
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_exclusion_reg_exp)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:393
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:435 rc.cpp:2121
-#: rc.cpp:2167 rc.cpp:2121 rc.cpp:2167
-msgid ""
-"By default strings will use wildcard matching. If you want to use regular "
-"expressions, this needs to be enabled."
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:199
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_forward)
+#: rc.cpp:849 rc.cpp:849
+msgid "Forward port"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:88
-#. i18n: ectx: property (text), widget (QCheckBox, m_reg_exp_syntax)
-#. i18n: file: plugins/syndication/filtereditor.ui:160
-#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_reg_exp)
-#. i18n: file: plugins/syndication/filtereditor.ui:88
-#. i18n: ectx: property (text), widget (QCheckBox, m_reg_exp_syntax)
-#. i18n: file: plugins/syndication/filtereditor.ui:160
-#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_reg_exp)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:395
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:437 rc.cpp:2124
-#: rc.cpp:2170 rc.cpp:2124 rc.cpp:2170
-msgid "Strings are regular expressions"
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:206
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#: rc.cpp:852 rc.cpp:852
+msgid "Session TTL:"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:95
-#. i18n: ectx: property (text), widget (QCheckBox, m_all_words_must_match)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:396 rc.cpp:2127
-#: rc.cpp:2127
-msgid "Item must match all strings to be included"
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:222
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_sessionTTL)
+#: rc.cpp:855 rc.cpp:855
+msgid "How long a session is valid (in seconds)."
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:102
-#. i18n: ectx: property (text), widget (QCheckBox, m_match_case_sensitive)
-#. i18n: file: plugins/syndication/filtereditor.ui:174
-#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_case_sensitive)
-#. i18n: file: plugins/syndication/filtereditor.ui:102
-#. i18n: ectx: property (text), widget (QCheckBox, m_match_case_sensitive)
-#. i18n: file: plugins/syndication/filtereditor.ui:174
-#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_case_sensitive)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:397
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:439 rc.cpp:2130
-#: rc.cpp:2176 rc.cpp:2130 rc.cpp:2176
-msgid "Case sensitive matching"
+#. i18n: file: plugins/webinterface/webinterfaceprefwidget.ui:225
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_sessionTTL)
+#: rc.cpp:858 rc.cpp:858
+msgid " secs"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:38
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:398 rc.cpp:2087
-#: rc.cpp:2087
-msgid "String Matching"
+#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:10
+#. i18n: ectx: label, entry (port), group (general)
+#: rc.cpp:861 rc.cpp:861
+msgid "Port number"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:167
-#. i18n: ectx: property (text), widget (QCheckBox, m_exclusion_all_must_match)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:438 rc.cpp:2173
-#: rc.cpp:2173
-msgid "Item must match all strings to be excluded"
+#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:15
+#. i18n: ectx: label, entry (forward), group (general)
+#: rc.cpp:864 rc.cpp:864
+msgid "forward Port"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:110
-#. i18n: ectx: attribute (title), widget (QWidget, tab_5)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:440 rc.cpp:2133
-#: rc.cpp:2133
-msgid "Exclusion Patterns"
+#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:20
+#. i18n: ectx: label, entry (sessionTTL), group (general)
+#: rc.cpp:867 rc.cpp:867
+msgid "Session time to live"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:188
-#. i18n: ectx: property (text), widget (QCheckBox, m_use_se_matching)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:441 rc.cpp:2182
-#: rc.cpp:2182
-msgid "Use season and episode matching"
+#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:26
+#. i18n: ectx: label, entry (skin), group (general)
+#: rc.cpp:870 rc.cpp:870
+msgid "interface skin"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:197
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:442 rc.cpp:2185
-#: rc.cpp:2185
-msgid "Seasons: "
+#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:33
+#. i18n: ectx: label, entry (username), group (general)
+#: rc.cpp:873 rc.cpp:873
+msgid "username"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:208
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_seasons)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:444 rc.cpp:2188
-#: rc.cpp:2188
-msgid ""
-"Specify the seasons to download, multiple seasons can be separated by a , "
-"and you can also use ranges by using a -\n"
-"\n"
-"For example: 1, 3-6, 9\n"
-"\n"
-"Will download seasons 1, 3, 4, 5, 6 and 9"
+#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:37
+#. i18n: ectx: label, entry (password), group (general)
+#: rc.cpp:876 rc.cpp:876
+msgid "password"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:215
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:450 rc.cpp:2195
-#: rc.cpp:2195
-msgid "Episodes:"
+#. i18n: file: plugins/search/ktsearchpluginui.rc:3
+#. i18n: ectx: ToolBar (SearchToolBar)
+#: rc.cpp:879 rc.cpp:879
+msgid "Search Toolbar"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:226
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_episodes)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:452 rc.cpp:2198
-#: rc.cpp:2198
-msgid ""
-"Specify the episodes to download, multiple episodes can be separated by a , "
-"and you can also use ranges by using a -\n"
-"\n"
-"For example: 1, 3-6, 9\n"
-"\n"
-"Will download episodes 1, 3, 4, 5, 6 and 9"
+#. i18n: file: plugins/search/ktsearchplugin.kcfg:10
+#. i18n: ectx: label, entry (searchEngine), group (general)
+#: rc.cpp:882 rc.cpp:882
+msgid "Current search engine"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:235
-#. i18n: ectx: property (text), widget (QCheckBox, m_se_no_duplicates)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:458 rc.cpp:2205
-#: rc.cpp:2205
-msgid "Do not download multiple items with the same season and episode"
+#. i18n: file: plugins/search/ktsearchplugin.kcfg:15
+#. i18n: ectx: label, entry (useDefaultBrowser), group (general)
+#. i18n: file: plugins/search/searchpref.ui:92
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useDefaultBrowser)
+#. i18n: file: plugins/search/ktsearchplugin.kcfg:15
+#. i18n: ectx: label, entry (useDefaultBrowser), group (general)
+#. i18n: file: plugins/search/searchpref.ui:92
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useDefaultBrowser)
+#: rc.cpp:885 rc.cpp:924 rc.cpp:885 rc.cpp:924
+msgid "Use default browser"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:182
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:459 rc.cpp:2179
-#: rc.cpp:2179
-msgid "Seasons && Episodes"
+#. i18n: file: plugins/search/ktsearchplugin.kcfg:19
+#. i18n: ectx: label, entry (useCustomBrowser), group (general)
+#: rc.cpp:888 rc.cpp:888
+msgid "Use custom browser"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:262
-#. i18n: ectx: property (text), widget (QCheckBox, m_download_matches)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:460 rc.cpp:2211
-#: rc.cpp:2211
-msgid "Download torrents of matching items"
+#. i18n: file: plugins/search/ktsearchplugin.kcfg:23
+#. i18n: ectx: label, entry (customBrowser), group (general)
+#: rc.cpp:891 rc.cpp:891
+msgid "Custom browser executable path"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:269
-#. i18n: ectx: property (text), widget (QCheckBox, m_download_non_matches)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:461 rc.cpp:2214
-#: rc.cpp:2214
-msgid "Download torrents of non matching items"
+#. i18n: file: plugins/search/searchpref.ui:34
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_clear_history)
+#: rc.cpp:897 rc.cpp:897
+msgid "Clear the search history combo boxes."
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:278
-#. i18n: ectx: property (text), widget (QCheckBox, m_add_to_group)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:462 rc.cpp:2217
-#: rc.cpp:2217
-msgid "Add to group:"
+#. i18n: file: plugins/search/searchpref.ui:37
+#. i18n: ectx: property (text), widget (QPushButton, m_clear_history)
+#: rc.cpp:900 rc.cpp:900
+msgid "Clear Search History"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:25
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: plugins/syndication/filtereditor.ui:312
-#. i18n: ectx: property (text), widget (QCheckBox, m_use_custom_download_location)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:25
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: plugins/syndication/filtereditor.ui:312
-#. i18n: ectx: property (text), widget (QCheckBox, m_use_custom_download_location)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:463
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:372 rc.cpp:361 rc.cpp:2220
-#: rc.cpp:361 rc.cpp:2220
-msgid "Download to:"
+#. i18n: file: plugins/search/searchpref.ui:44
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_reset_default_action)
+#: rc.cpp:903 rc.cpp:903
+msgid "Reset the default action taken when a torrent is downloaded."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:55
-#. i18n: ectx: property (text), widget (QCheckBox, m_moveCompleted)
-#. i18n: file: ktorrent/view/propertiesextender.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, move_on_completion_enabled)
-#. i18n: file: plugins/syndication/filtereditor.ui:322
-#. i18n: ectx: property (text), widget (QCheckBox, m_move_on_completion)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:55
-#. i18n: ectx: property (text), widget (QCheckBox, m_moveCompleted)
-#. i18n: file: ktorrent/view/propertiesextender.ui:61
-#. i18n: ectx: property (text), widget (QCheckBox, move_on_completion_enabled)
-#. i18n: file: plugins/syndication/filtereditor.ui:322
-#. i18n: ectx: property (text), widget (QCheckBox, m_move_on_completion)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:464
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:117
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:380 rc.cpp:373 rc.cpp:719
-#: rc.cpp:2223 rc.cpp:373 rc.cpp:719 rc.cpp:2223
-msgid "Move when completed to:"
+#. i18n: file: plugins/search/searchpref.ui:47
+#. i18n: ectx: property (text), widget (QPushButton, m_reset_default_action)
+#: rc.cpp:906 rc.cpp:906
+msgid "Reset Default Torrent Action"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:334
-#. i18n: ectx: property (text), widget (QCheckBox, m_silently)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:465 rc.cpp:2226
-#: rc.cpp:2226
-msgid "Open torrents silently"
+#. i18n: file: plugins/search/searchpref.ui:69
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_restorePreviousSession)
+#: rc.cpp:909 rc.cpp:909
+msgid "Restore all the active searches of the last session"
 msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:355
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: plugins/syndication/filtereditor.ui:363
-#. i18n: ectx: property (text), widget (QPushButton, m_test)
-#. i18n: file: plugins/syndication/filtereditor.ui:355
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#. i18n: file: plugins/syndication/filtereditor.ui:363
-#. i18n: ectx: property (text), widget (QPushButton, m_test)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:467
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:469 rc.cpp:2229
-#: rc.cpp:2232 rc.cpp:2229 rc.cpp:2232
-msgid "Test"
-msgstr "Profi"
+#. i18n: file: plugins/search/searchpref.ui:72
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_restorePreviousSession)
+#: rc.cpp:912 rc.cpp:912
+msgid "Restore previous searches"
+msgstr ""
 
-#. i18n: file: plugins/syndication/filtereditor.ui:370
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/syndication/ui_filtereditor.h:468 rc.cpp:2235
-#: rc.cpp:2235
-msgid "filter on feed:"
+#. i18n: file: plugins/search/searchpref.ui:79
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openInExternal)
+#: rc.cpp:915 rc.cpp:915
+msgid "Whether or not to open searches in an external browser."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:25
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: plugins/syndication/feedwidget.ui:27
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:25
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#. i18n: file: plugins/syndication/feedwidget.ui:27
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:178
-#: obj-i686-linux-gnu/ktorrent/ui_pastedlgbase.h:123 rc.cpp:340 rc.cpp:2054
-#: rc.cpp:340 rc.cpp:2054
-msgid "URL:"
-msgstr "URL:"
+#. i18n: file: plugins/search/searchpref.ui:82
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openInExternal)
+#: rc.cpp:918 rc.cpp:918
+msgid "Open searches in external browser"
+msgstr ""
 
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:179
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:181
-msgid "KSqueezedTextLabel"
+#. i18n: file: plugins/search/searchpref.ui:89
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_useDefaultBrowser)
+#: rc.cpp:921 rc.cpp:921
+msgid "Use the default browser configured in the system settings."
 msgstr ""
 
-#. i18n: file: plugins/syndication/feedwidget.ui:53
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:180 rc.cpp:2057
-#: rc.cpp:2057
-msgid "Status:"
-msgstr "Cyflwr:"
+#. i18n: file: plugins/search/searchpref.ui:104
+#. i18n: ectx: property (toolTip), widget (QRadioButton, kcfg_useCustomBrowser)
+#: rc.cpp:927 rc.cpp:927
+msgid "Use a custom browser."
+msgstr ""
 
-#. i18n: file: plugins/syndication/feedwidget.ui:77
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:182 rc.cpp:2060
-#: rc.cpp:2060
-msgid "Refresh every:"
+#. i18n: file: plugins/search/searchpref.ui:107
+#. i18n: ectx: property (text), widget (QRadioButton, kcfg_useCustomBrowser)
+#: rc.cpp:930 rc.cpp:930
+msgid "Custom browser path:"
+msgstr ""
+
+#. i18n: file: plugins/search/searchpref.ui:117
+#. i18n: ectx: property (toolTip), widget (KLineEdit, kcfg_customBrowser)
+#: rc.cpp:933 rc.cpp:933
+msgid "Path of the custom browser."
+msgstr ""
+
+#. i18n: file: plugins/search/searchpref.ui:142
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox8)
+#: rc.cpp:936 rc.cpp:936
+msgid "Search Engines"
+msgstr ""
+
+#. i18n: file: plugins/search/searchpref.ui:157
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_add)
+#: rc.cpp:939 rc.cpp:939
+msgid "Add a new search engine."
+msgstr ""
+
+#. i18n: file: plugins/search/searchpref.ui:167
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_remove)
+#: rc.cpp:945 rc.cpp:945
+msgid "Remove all selected search engines."
+msgstr ""
+
+#. i18n: file: plugins/search/searchpref.ui:170
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#: rc.cpp:948 rc.cpp:948
+msgid "&Remove"
+msgstr ""
+
+#. i18n: file: plugins/search/searchpref.ui:177
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_remove_all)
+#: rc.cpp:951 rc.cpp:951
+msgid "Remove all search engines."
 msgstr ""
 
-#. i18n: file: plugins/syndication/feedwidget.ui:84
-#. i18n: ectx: property (toolTip), widget (QSpinBox, m_refresh_rate)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:184 rc.cpp:2063
-#: rc.cpp:2063
-msgid "Time between automatic refreshes of the feed."
-msgstr ""
+#. i18n: file: plugins/search/searchpref.ui:180
+#. i18n: ectx: property (text), widget (QPushButton, m_remove_all)
+#: rc.cpp:954 rc.cpp:954
+msgid "R&emove All"
+msgstr "G&waredu Popeth"
 
-#. i18n: file: plugins/syndication/feedwidget.ui:87
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_refresh_rate)
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:51
-#. i18n: ectx: property (suffix), widget (QSpinBox, minutes)
-#. i18n: file: plugins/syndication/feedwidget.ui:87
-#. i18n: ectx: property (suffix), widget (QSpinBox, m_refresh_rate)
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:51
-#. i18n: ectx: property (suffix), widget (QSpinBox, minutes)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:186 rc.cpp:2066
-#: rc.cpp:2875 rc.cpp:2066 rc.cpp:2875
-msgid " minutes"
+#. i18n: file: plugins/search/searchpref.ui:200
+#. i18n: ectx: property (toolTip), widget (QPushButton, m_add_default)
+#: rc.cpp:957 rc.cpp:957
+msgid "Add all default search engines."
 msgstr ""
 
-#. i18n: file: plugins/syndication/feedwidget.ui:128
-#. i18n: ectx: property (text), widget (KPushButton, m_refresh)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:188 rc.cpp:2072
-#: rc.cpp:2072
-msgid "Refresh"
+#. i18n: file: plugins/search/searchpref.ui:203
+#. i18n: ectx: property (text), widget (QPushButton, m_add_default)
+#: rc.cpp:960 rc.cpp:960
+msgid "Add Defau&lt"
 msgstr ""
 
-#. i18n: file: plugins/syndication/feedwidget.ui:148
-#. i18n: ectx: property (text), widget (KPushButton, m_filters)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:189 rc.cpp:2075
-#: rc.cpp:2075
-msgid "Filters"
+#. i18n: file: plugins/logviewer/ktlogviewerplugin.kcfg:11
+#. i18n: ectx: label, entry (useRichText), group (general)
+#: rc.cpp:963 rc.cpp:963
+msgid "Use rich log text"
 msgstr ""
 
-#. i18n: file: plugins/syndication/feedwidget.ui:155
-#. i18n: ectx: property (text), widget (KPushButton, m_cookies)
-#: obj-i686-linux-gnu/plugins/syndication/ui_feedwidget.h:190 rc.cpp:2078
-#: rc.cpp:2078
-msgid "Cookies"
+#. i18n: file: plugins/logviewer/logprefwidget.ui:27
+#. i18n: ectx: property (toolTip), widget (QTreeView, m_logging_flags)
+#: rc.cpp:966 rc.cpp:966
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Double click on the log "
+"level to alter it. The possible levels are :</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">All: </span>All messages are shown</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Important: </span>Only important messages are shown</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Notice: </span>Only notice and important messages are "
+"shown</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Debug: </span>Debug, notice and important messages are "
+"shown</p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">None:</span> No messages are shown</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ManageFiltersDlg)
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:160
-#: rc.cpp:2238 rc.cpp:2238
-msgid "Manage Filters"
+#. i18n: file: plugins/logviewer/logprefwidget.ui:46
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useRichText)
+#: rc.cpp:982 rc.cpp:982
+msgid ""
+"Whether or not to use rich text or just plain text, for the logging output "
+"shown in the logviewer."
 msgstr ""
 
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:22
-#. i18n: ectx: property (text), widget (QLabel, m_feed_text)
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:161
-#: rc.cpp:2241 rc.cpp:2241
-msgid "Feed:"
+#. i18n: file: plugins/logviewer/logprefwidget.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useRichText)
+#: rc.cpp:985 rc.cpp:985
+msgid "Use rich text for logging output"
 msgstr ""
 
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:33
+#. i18n: file: plugins/logviewer/logprefwidget.ui:58
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:162
-#: rc.cpp:2244 rc.cpp:2244
-msgid "Active filters:"
+#: rc.cpp:988 rc.cpp:988
+msgid "Log widget position:"
 msgstr ""
 
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:91
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:165
-#: rc.cpp:2253 rc.cpp:2253
-msgid "Available filters:"
+#. i18n: file: plugins/logviewer/logprefwidget.ui:72
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_logWidgetPosition)
+#: rc.cpp:991 rc.cpp:991
+msgid "Separate activity"
 msgstr ""
 
-#. i18n: file: plugins/syndication/managefiltersdlg.ui:107
-#. i18n: ectx: property (text), widget (QPushButton, m_remove_all)
-#: obj-i686-linux-gnu/plugins/syndication/ui_managefiltersdlg.h:166
-#: rc.cpp:2256 rc.cpp:2256
-msgid "Remove All"
+#. i18n: file: plugins/logviewer/logprefwidget.ui:77
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_logWidgetPosition)
+#: rc.cpp:994 rc.cpp:994
+msgid "Dockable widget"
 msgstr ""
 
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:22
-#. i18n: ectx: property (text), widget (QLabel, m_top_label)
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:113
-#: rc.cpp:2006 rc.cpp:2006
-msgid "File download order for:"
+#. i18n: file: plugins/logviewer/logprefwidget.ui:82
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_logWidgetPosition)
+#: rc.cpp:997 rc.cpp:997
+msgid "Torrent activity"
 msgstr ""
 
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:29
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_custom_order_enabled)
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:115
-#: rc.cpp:2009 rc.cpp:2009
-msgid "Whether or not to enable a custom download order."
+#. i18n: file: plugins/logviewer/logprefwidget.ui:107
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1000 rc.cpp:1000
+msgid "Maximum number of visible lines:"
 msgstr ""
 
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:32
-#. i18n: ectx: property (text), widget (QCheckBox, m_custom_order_enabled)
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:117
-#: rc.cpp:2012 rc.cpp:2012
-msgid "Custom file download order enabled"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:10
+#. i18n: ectx: label, entry (UpdateEveryGuiUpdates), group (general)
+#: rc.cpp:1003 rc.cpp:1003
+msgid "Update charts every n gui updates"
 msgstr ""
 
-#. i18n: file: plugins/downloadorder/downloadorderwidget.ui:41
-#. i18n: ectx: property (toolTip), widget (QListView, m_order)
-#: obj-i686-linux-gnu/plugins/downloadorder/ui_downloadorderwidget.h:119
-#: rc.cpp:2015 rc.cpp:2015
-msgid ""
-"Order in which to download the files of a torrent. The file at the top will "
-"be downloaded first, followed by the second, then the third ..."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:15
+#. i18n: ectx: label, entry (DataGatherIval), group (general)
+#: rc.cpp:1006 rc.cpp:1006
+msgid "Interval in milliseconds between data gathering"
 msgstr ""
 
-#. i18n: file: plugins/shutdown/shutdowndlg.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ShutdownDlg)
-#: obj-i686-linux-gnu/plugins/shutdown/ui_shutdowndlg.h:96 rc.cpp:2030
-#: rc.cpp:2030
-msgid "Shutdown Settings"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:20
+#. i18n: ectx: label, entry (MaxMode), group (general)
+#: rc.cpp:1009 rc.cpp:1009
+msgid "Method of determining maximum value of the scale"
 msgstr ""
 
-#. i18n: file: plugins/shutdown/shutdowndlg.ui:24
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plugins/shutdown/ui_shutdowndlg.h:97 rc.cpp:2033
-#: rc.cpp:2033
-msgid "Action to execute:"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:25
+#. i18n: ectx: label, entry (ShowSeedsInSwarms), group (general)
+#: rc.cpp:1012 rc.cpp:1012
+msgid "Whether to show seeds in swarms"
 msgstr ""
 
-#. i18n: file: plugins/shutdown/shutdowndlg.ui:34
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/plugins/shutdown/ui_shutdowndlg.h:98 rc.cpp:2036
-#: rc.cpp:2036
-msgid "Execute action when:"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:30
+#. i18n: ectx: label, entry (ShowLeechersInSwarms), group (general)
+#: rc.cpp:1015 rc.cpp:1015
+msgid "Whether to show leachers in swarms"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, MagnetGeneratorPrefWidget)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:123
-#: rc.cpp:2589 rc.cpp:2589
-msgid "Magnet Generator Preferences"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:35
+#. i18n: ectx: label, entry (DlSpdSamples), group (general)
+#: rc.cpp:1018 rc.cpp:1018
+msgid "Samples to show on download chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:10
-#. i18n: ectx: label, entry (torrenttracker), group (general)
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:40
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_torrenttracker)
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:10
-#. i18n: ectx: label, entry (torrenttracker), group (general)
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:40
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_torrenttracker)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:126
-#: rc.cpp:2571 rc.cpp:2595 rc.cpp:2571 rc.cpp:2595
-msgid "Grabs a tracker from the torrent file"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:40
+#. i18n: ectx: label, entry (PeersSpdSamples), group (general)
+#: rc.cpp:1021 rc.cpp:1021
+msgid "Samples to show on peers chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:43
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_torrenttracker)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:128
-#: rc.cpp:2598 rc.cpp:2598
-msgid "Add a tracker from the torrent file"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:45
+#. i18n: ectx: label, entry (UlSpdSamples), group (general)
+#: rc.cpp:1024 rc.cpp:1024
+msgid "Samples to show on upload chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:50
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_customtracker)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:130
-#: rc.cpp:2601 rc.cpp:2601
-msgid "Define what tracker to add"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:50
+#. i18n: ectx: label, entry (ConnsSamples), group (general)
+#: rc.cpp:1027 rc.cpp:1027
+msgid "Samples to show on connections chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:53
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_customtracker)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:132
-#: rc.cpp:2604 rc.cpp:2604
-msgid "Add a custom tracker URL"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:55
+#. i18n: ectx: label, entry (DhtSpdSamples), group (general)
+#: rc.cpp:1030 rc.cpp:1030
+msgid "Samples to show on DHT chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:60
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_tr)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:134
-#: rc.cpp:2607 rc.cpp:2607
-msgid "The tracker URL that will be a part of the magnet link"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:60
+#. i18n: ectx: label, entry (DlSpdColor), group (general)
+#: rc.cpp:1033 rc.cpp:1033
+msgid "Color of the speed on dl chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:67
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_dn)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:137
-#: rc.cpp:2610 rc.cpp:2610
-msgid "Add the torrent name in the URI"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:65
+#. i18n: ectx: label, entry (DlAvgColor), group (general)
+#: rc.cpp:1036 rc.cpp:1036
+msgid "Color of the average on dl chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:70
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_dn)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:139
-#: rc.cpp:2613 rc.cpp:2613
-msgid "Add name"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:70
+#. i18n: ectx: label, entry (DlLimitColor), group (general)
+#: rc.cpp:1039 rc.cpp:1039
+msgid "Color of the limit on dl chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:30
-#. i18n: ectx: label, entry (onlypublic), group (general)
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:77
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_onlypublic)
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:30
-#. i18n: ectx: label, entry (onlypublic), group (general)
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:77
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_onlypublic)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:141
-#: rc.cpp:2586 rc.cpp:2616 rc.cpp:2586 rc.cpp:2616
-msgid "Only enable on public torrents"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:75
+#. i18n: ectx: label, entry (PrAvgFromLColor), group (general)
+#: rc.cpp:1042 rc.cpp:1042
+msgid "Color of the avg from leecher on peers chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:80
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_onlypublic)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:143
-#: rc.cpp:2619 rc.cpp:2619
-msgid "Disable the menu item for private torrents"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:80
+#. i18n: ectx: label, entry (PrAvgToLColor), group (general)
+#: rc.cpp:1045 rc.cpp:1045
+msgid "Color of the avg to leecher on peers chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:87
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_popup)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:145
-#: rc.cpp:2622 rc.cpp:2622
-msgid "Give feedback in form of a popup"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:85
+#. i18n: ectx: label, entry (PrAvgFromSColor), group (general)
+#: rc.cpp:1048 rc.cpp:1048
+msgid "Color of the avg from seeds on peers chart"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:26
-#. i18n: ectx: label, entry (popup), group (general)
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:90
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_popup)
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:26
-#. i18n: ectx: label, entry (popup), group (general)
-#. i18n: file: plugins/magnetgenerator/magnetgeneratorprefwidget.ui:90
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_popup)
-#: obj-i686-linux-gnu/plugins/magnetgenerator/ui_magnetgeneratorprefwidget.h:147
-#: rc.cpp:2583 rc.cpp:2625 rc.cpp:2583 rc.cpp:2625
-msgid "Show popup"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:90
+#. i18n: ectx: label, entry (PrFromLColor), group (general)
+#: rc.cpp:1051 rc.cpp:1051
+msgid "Color of the leechers on peers chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:20
-#. i18n: ectx: property (toolTip), widget (QCheckBox, dht)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:96 rc.cpp:692
-#: rc.cpp:692
-msgid ""
-"DHT is a distributed database which can be used to find more peers for a "
-"torrent."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:95
+#. i18n: ectx: label, entry (PrFromSColor), group (general)
+#: rc.cpp:1054 rc.cpp:1054
+msgid "Color of the seeds on peers chart"
+msgstr ""
+
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:100
+#. i18n: ectx: label, entry (UlSpdColor), group (general)
+#: rc.cpp:1057 rc.cpp:1057
+msgid "Color of the speed on upload chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, dht)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:98 rc.cpp:695
-#: rc.cpp:695
-msgid "Use DHT to find more peers"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:105
+#. i18n: ectx: label, entry (UlAvgColor), group (general)
+#: rc.cpp:1060 rc.cpp:1060
+msgid "Color of the avg on upload chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:30
-#. i18n: ectx: property (toolTip), widget (QCheckBox, pex)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:100 rc.cpp:698
-#: rc.cpp:698
-msgid ""
-"Peer exchange results in more peers being found, by exchanging information "
-"about peers with other peers."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:110
+#. i18n: ectx: label, entry (UlLimitColor), group (general)
+#: rc.cpp:1063 rc.cpp:1063
+msgid "Color of the limit on upload chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, pex)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:102 rc.cpp:701
-#: rc.cpp:701
-msgid "Use peer exchange to find more peers"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:115
+#. i18n: ectx: label, entry (CnLConnColor), group (general)
+#: rc.cpp:1066 rc.cpp:1066
+msgid "Color of the connected leechers on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:46
-#. i18n: ectx: property (toolTip), widget (QCheckBox, superseeding)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:104 rc.cpp:704
-#: rc.cpp:704
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Superseeding mode, is a "
-"special seeding mode which allows you to achieve much higher seeding "
-"efficiencies. This results in less bandwidth used to spread a torrent.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Note: </span>This should only be used if the swarm has not "
-"fully been established. Once there are multiple active seeders, this mode "
-"becomes useless.</p></body></html>"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:120
+#. i18n: ectx: label, entry (CnLSwarmsColor), group (general)
+#: rc.cpp:1069 rc.cpp:1069
+msgid "Color of the leechers in swarms on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:49
-#. i18n: ectx: property (text), widget (QCheckBox, superseeding)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:113 rc.cpp:713
-#: rc.cpp:713
-msgid "Use superseeding mode for seeding"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:125
+#. i18n: ectx: label, entry (CnSConnColor), group (general)
+#: rc.cpp:1072 rc.cpp:1072
+msgid "Color of the connected seeds on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:58
-#. i18n: ectx: property (toolTip), widget (QCheckBox, move_on_completion_enabled)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:115 rc.cpp:716
-#: rc.cpp:716
-msgid ""
-"Move the files of the torrent to a different directory when it has finished "
-"downloading."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:130
+#. i18n: ectx: label, entry (CnSSwarmsColor), group (general)
+#: rc.cpp:1075 rc.cpp:1075
+msgid "Color of the seeds in swarms on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/view/propertiesextender.ui:68
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, move_on_completion_url)
-#: obj-i686-linux-gnu/ktorrent/ui_propertiesextender.h:119 rc.cpp:722
-#: rc.cpp:722
-msgid "Location to move the files to."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:135
+#. i18n: ectx: label, entry (CnAvgLConnPerTorrColor), group (general)
+#: rc.cpp:1078 rc.cpp:1078
+msgid "Color of the avg connected leecher per torrent on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/ipfilterwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, IPFilterWidget)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:127 rc.cpp:486 rc.cpp:486
-msgid "KTorrent Blacklisted Peers"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:140
+#. i18n: ectx: label, entry (CnAvgSConnPerTorrColor), group (general)
+#: rc.cpp:1081 rc.cpp:1081
+msgid "Color of the avg connected seeds per torrent on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/ipfilterwidget.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:128 rc.cpp:489 rc.cpp:489
-msgid "Add peer:"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:145
+#. i18n: ectx: label, entry (CnAvgLConnPerRunTorrColor), group (general)
+#: rc.cpp:1084 rc.cpp:1084
+msgid ""
+"Color of the avg connected leechers per running torrent on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/ipfilterwidget.ui:31
-#. i18n: ectx: property (toolTip), widget (KLineEdit, m_ip_to_add)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:130 rc.cpp:492 rc.cpp:492
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:150
+#. i18n: ectx: label, entry (CnAvgSConnPerRunTorrColor), group (general)
+#: rc.cpp:1087 rc.cpp:1087
 msgid ""
-"IP addresses must be in the format 'XXX.XXX.XXX.XXX'.\n"
-"                                        \n"
-"You can also use wildcards like '127.0.0.*' or specify ranges like "
-"'200.10.10.0-200.10.10.40'."
+"Color of the avg connected seeds per running torrent on connections chart"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:48
-#. i18n: ectx: property (text), widget (QLineEdit, m_ip)
-#. i18n: file: ktorrent/ipfilterwidget.ui:34
-#. i18n: ectx: property (text), widget (KLineEdit, m_ip_to_add)
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:48
-#. i18n: ectx: property (text), widget (QLineEdit, m_ip)
-#. i18n: file: ktorrent/ipfilterwidget.ui:34
-#. i18n: ectx: property (text), widget (KLineEdit, m_ip_to_add)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:134
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:148 rc.cpp:154 rc.cpp:497
-#: rc.cpp:154 rc.cpp:497
-msgid "127.0.0.1"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:155
+#. i18n: ectx: label, entry (DhtNodesColor), group (general)
+#: rc.cpp:1090 rc.cpp:1090
+msgid "Color of the nodes on DHT chart"
 msgstr ""
 
-#. i18n: file: ktorrent/ipfilterwidget.ui:72
-#. i18n: ectx: property (text), widget (KPushButton, m_clear)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:137 rc.cpp:506 rc.cpp:506
-msgid "Clear"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:160
+#. i18n: ectx: label, entry (DhtTasksColor), group (general)
+#: rc.cpp:1093 rc.cpp:1093
+msgid "Color of the tasks on DHT chart"
 msgstr ""
 
-#. i18n: file: ktorrent/ipfilterwidget.ui:92
-#. i18n: ectx: property (text), widget (KPushButton, m_open)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:138 rc.cpp:509 rc.cpp:509
-msgid "Open..."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:165
+#. i18n: ectx: label, entry (AntiAliasing), group (general)
+#: rc.cpp:1096 rc.cpp:1096
+msgid "Use anti aliasing on charts?"
 msgstr ""
 
-#. i18n: file: ktorrent/ipfilterwidget.ui:99
-#. i18n: ectx: property (text), widget (KPushButton, m_save_as)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:139 rc.cpp:512 rc.cpp:512
-msgid "Save As..."
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:170
+#. i18n: ectx: label, entry (DrawBgdGrid), group (general)
+#: rc.cpp:1099 rc.cpp:1099
+msgid "Draw ugly grey background grid?"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:118
-#. i18n: ectx: property (text), widget (KPushButton, m_close)
-#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:61
-#. i18n: ectx: property (text), widget (KPushButton, m_close_button)
-#. i18n: file: ktorrent/ipfilterwidget.ui:106
-#. i18n: ectx: property (text), widget (KPushButton, m_close)
-#. i18n: file: ktorrent/view/scanextender.ui:233
-#. i18n: ectx: property (text), widget (KPushButton, close_button)
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:118
-#. i18n: ectx: property (text), widget (KPushButton, m_close)
-#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:61
-#. i18n: ectx: property (text), widget (KPushButton, m_close_button)
-#. i18n: file: ktorrent/ipfilterwidget.ui:106
-#. i18n: ectx: property (text), widget (KPushButton, m_close)
-#. i18n: file: ktorrent/view/scanextender.ui:233
-#. i18n: ectx: property (text), widget (KPushButton, close_button)
-#: obj-i686-linux-gnu/ktorrent/ui_ipfilterwidget.h:140
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:151
-#: obj-i686-linux-gnu/ktorrent/ui_torrentmigratordlg.h:100
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:226 rc.cpp:163 rc.cpp:355
-#: rc.cpp:515 rc.cpp:683 rc.cpp:163 rc.cpp:355 rc.cpp:515 rc.cpp:683
-msgid "Close"
+#. i18n: file: plugins/stats/ktstatsplugin.kcfg:175
+#. i18n: ectx: label, entry (WidgetType), group (general)
+#: rc.cpp:1102 rc.cpp:1102
+msgid "Type of widget used for chart drawing"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:23
-#. i18n: ectx: property (text), widget (QLabel, m_main_caption)
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:141 rc.cpp:169 rc.cpp:169
-msgid "Speed limits for individual torrents (double click to edit):"
+#. i18n: file: plugins/stats/DisplaySettings.ui:72
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#. i18n: file: plugins/stats/DisplaySettings.ui:412
+#. i18n: ectx: property (text), widget (QLabel, label_16)
+#. i18n: file: plugins/stats/DisplaySettings.ui:72
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#. i18n: file: plugins/stats/DisplaySettings.ui:412
+#. i18n: ectx: property (text), widget (QLabel, label_16)
+#: rc.cpp:1114 rc.cpp:1144 rc.cpp:1114 rc.cpp:1144
+msgid "Average"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:35
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:142 rc.cpp:172 rc.cpp:172
-msgid "Filter:"
+#. i18n: file: plugins/stats/DisplaySettings.ui:111
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#. i18n: file: plugins/stats/DisplaySettings.ui:451
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#. i18n: file: plugins/stats/DisplaySettings.ui:111
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#. i18n: file: plugins/stats/DisplaySettings.ui:451
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#: rc.cpp:1117 rc.cpp:1147 rc.cpp:1117 rc.cpp:1147
+msgid "Limit"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:64
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_speedlimitsdlg.h:143 rc.cpp:175 rc.cpp:175
-msgid "Global Limits"
+#. i18n: file: plugins/stats/DisplaySettings.ui:363
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#. i18n: file: plugins/stats/DisplaySettings.ui:373
+#. i18n: ectx: property (text), widget (QLabel, label_15)
+#. i18n: file: plugins/stats/Spd.ui:43
+#. i18n: ectx: property (title), widget (QGroupBox, UlSpdGbw)
+#. i18n: file: plugins/stats/Settings.ui:192
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#. i18n: file: plugins/stats/DisplaySettings.ui:363
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#. i18n: file: plugins/stats/DisplaySettings.ui:373
+#. i18n: ectx: property (text), widget (QLabel, label_15)
+#. i18n: file: plugins/stats/Spd.ui:43
+#. i18n: ectx: property (title), widget (QGroupBox, UlSpdGbw)
+#. i18n: file: plugins/stats/Settings.ui:192
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:1138 rc.cpp:1141 rc.cpp:1216 rc.cpp:1249 rc.cpp:1138 rc.cpp:1141
+#: rc.cpp:1216 rc.cpp:1249
+msgid "Upload"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:77
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:207
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:77
-#. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:207
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: obj-i686-linux-gnu/ktorrent/ui_pastedlgbase.h:125
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:398 rc.cpp:346 rc.cpp:415
-#: rc.cpp:346 rc.cpp:415
-msgid "Group:"
+#. i18n: file: plugins/stats/DisplaySettings.ui:504
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#. i18n: file: plugins/stats/Settings.ui:140
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#. i18n: file: plugins/stats/Conns.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ConnsWgt)
+#. i18n: file: plugins/stats/Conns.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, ConnsGbw)
+#. i18n: file: plugins/stats/DisplaySettings.ui:504
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#. i18n: file: plugins/stats/Settings.ui:140
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#. i18n: file: plugins/stats/Conns.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, ConnsWgt)
+#. i18n: file: plugins/stats/Conns.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, ConnsGbw)
+#: rc.cpp:1150 rc.cpp:1243 rc.cpp:1276 rc.cpp:1279 rc.cpp:1150 rc.cpp:1243
+#: rc.cpp:1276 rc.cpp:1279
+msgid "Connections"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, TorrentCreatorDlg)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:356 rc.cpp:238
-#: rc.cpp:238
-msgid "Create a torrent"
+#. i18n: file: plugins/stats/DisplaySettings.ui:617
+#. i18n: ectx: property (text), widget (QLabel, label_26)
+#: rc.cpp:1162 rc.cpp:1162
+msgid "Seeds  in swarms"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:357 rc.cpp:241
-#: rc.cpp:241
-msgid "File or directory to create torrent from:"
+#. i18n: file: plugins/stats/DisplaySettings.ui:722
+#. i18n: ectx: property (text), widget (QLabel, label_29)
+#: rc.cpp:1171 rc.cpp:1171
+msgid "Avg. leechers connected per running torr."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:54
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:359 rc.cpp:247
-#: rc.cpp:247
-msgid "Size of each chunk:"
+#. i18n: file: plugins/stats/DisplaySettings.ui:757
+#. i18n: ectx: property (text), widget (QLabel, label_30)
+#: rc.cpp:1174 rc.cpp:1174
+msgid "Avg. seeds connected per running torrent"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:65
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:362 rc.cpp:250
-#: rc.cpp:250
-msgid "32 KiB"
+#. i18n: file: plugins/stats/DisplaySettings.ui:909
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AntiAliasing)
+#: rc.cpp:1189 rc.cpp:1189
+msgid "Use anti-aliasing"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:70
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:363 rc.cpp:253
-#: rc.cpp:253
-msgid "64 KiB"
+#. i18n: file: plugins/stats/DisplaySettings.ui:919
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_DrawBgdGrid)
+#: rc.cpp:1192 rc.cpp:1192
+msgid "Draw background grid"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:75
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:364 rc.cpp:256
-#: rc.cpp:256
-msgid "128 KiB"
+#. i18n: file: plugins/stats/DisplaySettings.ui:931
+#. i18n: ectx: property (text), widget (QLabel, label_18)
+#: rc.cpp:1195 rc.cpp:1195
+msgid "Widget type:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:80
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:365 rc.cpp:259
-#: rc.cpp:259
-msgid "256 KiB"
+#. i18n: file: plugins/stats/DisplaySettings.ui:939
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_WidgetType)
+#: rc.cpp:1198 rc.cpp:1198
+msgid "Native"
+msgstr ""
+
+#. i18n: file: plugins/stats/DisplaySettings.ui:944
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_WidgetType)
+#: rc.cpp:1201 rc.cpp:1201
+msgid "KDE"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:85
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:366 rc.cpp:262
-#: rc.cpp:262
-msgid "512 KiB"
+#. i18n: file: plugins/stats/DisplaySettings.ui:952
+#. i18n: ectx: property (text), widget (QLabel, label_33)
+#: rc.cpp:1204 rc.cpp:1204
+msgid "(plugin reload is needed after change)"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:90
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:367 rc.cpp:265
-#: rc.cpp:265
-msgid "1 MiB"
+#. i18n: file: plugins/stats/Spd.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, SpdWgt)
+#: rc.cpp:1207 rc.cpp:1207
+msgctxt "@title:window"
+msgid "Speed"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:95
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:368 rc.cpp:268
-#: rc.cpp:268
-msgid "2 MiB"
+#. i18n: file: plugins/stats/Settings.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, UpdateGbw)
+#: rc.cpp:1222 rc.cpp:1222
+msgid "Update"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:100
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:369 rc.cpp:271
-#: rc.cpp:271
-msgid "4 MiB"
+#. i18n: file: plugins/stats/Settings.ui:25
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1225 rc.cpp:1225
+msgid "Update charts every"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:105
-#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:370 rc.cpp:274
-#: rc.cpp:274
-msgid "8 MiB"
+#. i18n: file: plugins/stats/Settings.ui:50
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1228 rc.cpp:1228
+msgid "GUI updates"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:115
-#. i18n: ectx: property (text), widget (QCheckBox, m_start_seeding)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:372 rc.cpp:277
-#: rc.cpp:277
-msgid "Start seeding"
+#. i18n: file: plugins/stats/Settings.ui:69
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1231 rc.cpp:1231
+msgid "Gather data every"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:125
-#. i18n: ectx: property (text), widget (QCheckBox, m_private)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:373 rc.cpp:280
-#: rc.cpp:280
-msgid "Private torrent (DHT not allowed)"
+#. i18n: file: plugins/stats/Settings.ui:95
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1234 rc.cpp:1234
+msgid "milliseconds"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, m_dht)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:374 rc.cpp:283
-#: rc.cpp:283
-msgid "Decentralized (DHT only)"
+#. i18n: file: plugins/stats/Settings.ui:108
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1237 rc.cpp:1237
+msgid "Measurements counts"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:226
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:381 rc.cpp:307
-#: rc.cpp:307
-msgid "Node:"
+#. i18n: file: plugins/stats/Settings.ui:247
+#. i18n: ectx: property (title), widget (QGroupBox, MaxModeGbw)
+#: rc.cpp:1255 rc.cpp:1255
+msgid "Maximum"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:54
-#. i18n: ectx: label, entry (port), group (downloads)
-#. i18n: file: libktcore/ktorrent.kcfg:60
-#. i18n: ectx: label, entry (udpTrackerPort), group (downloads)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:277
-#. i18n: ectx: property (text), widget (QTreeWidget, m_node_list)
-#. i18n: file: libktcore/ktorrent.kcfg:54
-#. i18n: ectx: label, entry (port), group (downloads)
-#. i18n: file: libktcore/ktorrent.kcfg:60
-#. i18n: ectx: label, entry (udpTrackerPort), group (downloads)
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:277
-#. i18n: ectx: property (text), widget (QTreeWidget, m_node_list)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:385 rc.cpp:35 rc.cpp:38
-#: rc.cpp:319 rc.cpp:35 rc.cpp:38 rc.cpp:319
-msgid "Port"
-msgstr "Porth"
-
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:272
-#. i18n: ectx: property (text), widget (QTreeWidget, m_node_list)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:386 rc.cpp:316
-#: rc.cpp:316
-msgid "IP or Hostname"
+#. i18n: file: plugins/stats/Settings.ui:255
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1258 rc.cpp:1258
+msgid "Maximum speed scale mode: "
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:218
-#. i18n: ectx: attribute (title), widget (QWidget, m_dht_tab)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:388 rc.cpp:304
-#: rc.cpp:304
-msgid "DHT Nodes"
+#. i18n: file: plugins/stats/Settings.ui:272
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MaxMode)
+#: rc.cpp:1261 rc.cpp:1261
+msgid "Top"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:310
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentcreatordlg.h:391 rc.cpp:325
-#: rc.cpp:325
-msgid "Web Seeds"
+#. i18n: file: plugins/stats/Settings.ui:277
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_MaxMode)
+#: rc.cpp:1264 rc.cpp:1264
+msgid "Exact"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, MissingFilesDlg)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:104 rc.cpp:196 rc.cpp:196
-msgid "Files are missing"
+#. i18n: file: plugins/stats/Settings.ui:290
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:1267 rc.cpp:1267
+msgid "Peers connections"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:20
-#. i18n: ectx: property (text), widget (QLabel, m_text)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:105 rc.cpp:199 rc.cpp:199
-msgid "The following files are missing:"
+#. i18n: file: plugins/stats/Settings.ui:296
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowSeedsInSwarms)
+#: rc.cpp:1270 rc.cpp:1270
+msgid "Show seeds in swarms"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:37
-#. i18n: ectx: property (toolTip), widget (KPushButton, m_recreate)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:107 rc.cpp:202 rc.cpp:202
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">They are no longer there, "
-"recreate them.</p></body></html>"
+#. i18n: file: plugins/stats/Settings.ui:303
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowLeechersInSwarms)
+#: rc.cpp:1273 rc.cpp:1273
+msgid "Show leechers in swarms"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:40
-#. i18n: ectx: property (text), widget (KPushButton, m_recreate)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:112 rc.cpp:208 rc.cpp:208
-msgid "Recreate"
-msgstr "Ail-greu"
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:26
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1288 rc.cpp:1288
+msgid "Total:"
+msgstr "Cyfanswm:"
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:50
-#. i18n: ectx: property (toolTip), widget (KPushButton, m_dnd)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:114 rc.cpp:211 rc.cpp:211
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Do not download the "
-"missing files.</p></body></html>"
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:62
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#: rc.cpp:1291 rc.cpp:1291
+msgid "Currently downloading:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:63
-#. i18n: ectx: property (toolTip), widget (KPushButton, m_select_new)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:121 rc.cpp:220 rc.cpp:220
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The files have been moved "
-"to another location, select the new location.</p></body></html>"
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:98
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: ktorrent/view/scanextender.ui:162
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:98
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: ktorrent/view/scanextender.ui:162
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1294 rc.cpp:1896 rc.cpp:1294 rc.cpp:1896
+msgid "Downloaded:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:66
-#. i18n: ectx: property (text), widget (KPushButton, m_select_new)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:126 rc.cpp:226 rc.cpp:226
-msgid "Select New Location"
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:134
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
+#: rc.cpp:1297 rc.cpp:1297
+msgid "Excluded:"
+msgstr "Gwaharddwyd :"
+
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:170
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
+#: rc.cpp:1300 rc.cpp:1300
+msgid "Left:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:89
-#. i18n: ectx: property (toolTip), widget (KPushButton, m_cancel)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:128 rc.cpp:229 rc.cpp:229
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Cancel, do not start the "
-"torrent.</p></body></html>"
+#. i18n: file: plugins/infowidget/chunkdownloadview.ui:206
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_8)
+#: rc.cpp:1303 rc.cpp:1303
+msgid "Size:"
+msgstr "Maint:"
+
+#. i18n: file: plugins/infowidget/trackerview.ui:29
+#. i18n: ectx: property (text), widget (KPushButton, m_remove_tracker)
+#: rc.cpp:1309 rc.cpp:1309
+msgid "Remove Tracker"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:92
-#. i18n: ectx: property (text), widget (KPushButton, m_cancel)
-#. i18n: file: ktorrent/view/scanextender.ui:226
-#. i18n: ectx: property (text), widget (KPushButton, cancel_button)
-#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:92
-#. i18n: ectx: property (text), widget (KPushButton, m_cancel)
-#. i18n: file: ktorrent/view/scanextender.ui:226
-#. i18n: ectx: property (text), widget (KPushButton, cancel_button)
-#: obj-i686-linux-gnu/ktorrent/ui_missingfilesdlg.h:133
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:225 rc.cpp:235 rc.cpp:680
-#: rc.cpp:235 rc.cpp:680
-msgid "Cancel"
+#. i18n: file: plugins/infowidget/trackerview.ui:36
+#. i18n: ectx: property (text), widget (KPushButton, m_change_tracker)
+#: rc.cpp:1312 rc.cpp:1312
+msgid "Change Tracker"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/importdialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, ImportDialog)
-#: obj-i686-linux-gnu/ktorrent/ui_importdialog.h:150 rc.cpp:444 rc.cpp:444
-msgid "Import an existing torrent"
+#. i18n: file: plugins/infowidget/trackerview.ui:43
+#. i18n: ectx: property (text), widget (QPushButton, m_scrape)
+#: rc.cpp:1315 rc.cpp:1315
+msgid "Update Trackers"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/importdialog.ui:29
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: obj-i686-linux-gnu/ktorrent/ui_importdialog.h:151 rc.cpp:447 rc.cpp:447
-msgid "Torrent:"
+#. i18n: file: plugins/infowidget/trackerview.ui:63
+#. i18n: ectx: property (text), widget (KPushButton, m_restore_defaults)
+#: rc.cpp:1318 rc.cpp:1318
+msgid "Restore Defaults"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/importdialog.ui:45
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: obj-i686-linux-gnu/ktorrent/ui_importdialog.h:152 rc.cpp:450 rc.cpp:450
-msgid "Data:"
-msgstr "Data:"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1321 rc.cpp:1321
+msgid "Tabs"
+msgstr ""
 
-#. i18n: file: ktorrent/dialogs/importdialog.ui:69
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_importdialog.h:153 rc.cpp:453 rc.cpp:453
-msgid "Select the torrent file and the data which belongs with it."
+#. i18n: file: plugins/infowidget/iwprefpage.ui:23
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showPeerView)
+#: rc.cpp:1324 rc.cpp:1324
+msgid "Whether or not to show the peers tab in the bottom of the window."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/importdialog.ui:108
-#. i18n: ectx: property (text), widget (KPushButton, m_import_btn)
-#: obj-i686-linux-gnu/ktorrent/ui_importdialog.h:154 rc.cpp:456 rc.cpp:456
-msgid "&Import"
-msgstr "&Mewnforio"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showPeerView)
+#: rc.cpp:1327 rc.cpp:1327
+msgid "Show list of peers"
+msgstr ""
 
-#. i18n: file: ktorrent/dialogs/importdialog.ui:115
-#. i18n: ectx: property (text), widget (KPushButton, m_cancel_btn)
-#: obj-i686-linux-gnu/ktorrent/ui_importdialog.h:155 rc.cpp:459 rc.cpp:459
-msgid "Ca&ncel"
-msgstr "Di&ddymu"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:33
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showChunkView)
+#: rc.cpp:1330 rc.cpp:1330
+msgid "Whether or not to show the chunks tab in the bottom of the window."
+msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, AddPeersDlg)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, GroupPolicyDlg)
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, AddPeersDlg)
-#. i18n: file: ktorrent/groups/grouppolicydlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, GroupPolicyDlg)
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:137
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:164 rc.cpp:137 rc.cpp:545
-#: rc.cpp:137 rc.cpp:545
-msgid "Dialog"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:36
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showChunkView)
+#: rc.cpp:1333 rc.cpp:1333
+msgid "Show list of chunks currently downloading"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:138 rc.cpp:140 rc.cpp:140
-msgid ""
-"Enter the IP address or hostname and port number of the peer you wish to add:"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:43
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showTrackersView)
+#: rc.cpp:1336 rc.cpp:1336
+msgid "Whether or not to show the trackers tab in the bottom of the window."
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:33
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:139 rc.cpp:143 rc.cpp:143
-msgid "Peer:"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:46
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showTrackersView)
+#: rc.cpp:1339 rc.cpp:1339
+msgid "Show list of trackers"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:45
-#. i18n: ectx: property (toolTip), widget (QLineEdit, m_ip)
-#: obj-i686-linux-gnu/ktorrent/ui_addpeersdlg.h:141 rc.cpp:146 rc.cpp:146
+#. i18n: file: plugins/infowidget/iwprefpage.ui:56
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showWebSeedsTab)
+#: rc.cpp:1342 rc.cpp:1342
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:9pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The IP address or hostname "
-"of the peer you want to connect to, should be put here.</p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Note:</span> We accept both IPv4 and IPv6 "
-"addresses</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Whether or not to show the "
+"webseeds tab at the bottom of the window.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, TorrentMigratorDlg)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentmigratordlg.h:98 rc.cpp:349
-#: rc.cpp:349
-msgid "Importing ..."
+#. i18n: file: plugins/infowidget/iwprefpage.ui:59
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showWebSeedsTab)
+#: rc.cpp:1348 rc.cpp:1348
+msgid "Show list of webseeds"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:22
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_torrentmigratordlg.h:99 rc.cpp:352
-#: rc.cpp:352
-msgid "Importing torrents from KDE3 version:"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:69
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:1351 rc.cpp:1351
+msgid "File Priority Colors"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, FileSelectDlg)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:371 rc.cpp:358 rc.cpp:358
-msgid "Select Which Files You Want to Download"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:75
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1354 rc.cpp:1354
+msgid "First priority:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:38
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_download_location_history)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:374 rc.cpp:364 rc.cpp:364
-msgid "History of all recently used download locations"
+#. i18n: file: plugins/infowidget/iwprefpage.ui:85
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_firstColor)
+#: rc.cpp:1357 rc.cpp:1357
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Color to use for first "
+"priority files.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:41
-#. i18n: ectx: property (text), widget (QToolButton, m_download_location_history)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:68
-#. i18n: ectx: property (text), widget (QToolButton, m_move_when_completed_history)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:79
-#. i18n: ectx: property (text), widget (QToolButton, m_tree)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:86
-#. i18n: ectx: property (text), widget (QToolButton, m_list)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:25
-#. i18n: ectx: property (text), widget (QToolButton, m_show_search)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:35
-#. i18n: ectx: property (text), widget (QToolButton, m_move_top)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:42
-#. i18n: ectx: property (text), widget (QToolButton, m_move_up)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:49
-#. i18n: ectx: property (text), widget (QToolButton, m_move_down)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:56
-#. i18n: ectx: property (text), widget (QToolButton, m_move_bottom)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:41
-#. i18n: ectx: property (text), widget (QToolButton, m_download_location_history)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:68
-#. i18n: ectx: property (text), widget (QToolButton, m_move_when_completed_history)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:79
-#. i18n: ectx: property (text), widget (QToolButton, m_tree)
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:86
-#. i18n: ectx: property (text), widget (QToolButton, m_list)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:25
-#. i18n: ectx: property (text), widget (QToolButton, m_show_search)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:35
-#. i18n: ectx: property (text), widget (QToolButton, m_move_top)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:42
-#. i18n: ectx: property (text), widget (QToolButton, m_move_up)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:49
-#. i18n: ectx: property (text), widget (QToolButton, m_move_down)
-#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:56
-#. i18n: ectx: property (text), widget (QToolButton, m_move_bottom)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:376
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:384
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:385
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:386
-#: obj-i686-linux-gnu/ktorrent/ui_queuemanagerwidget.h:114
-#: obj-i686-linux-gnu/ktorrent/ui_queuemanagerwidget.h:115
-#: obj-i686-linux-gnu/ktorrent/ui_queuemanagerwidget.h:116
-#: obj-i686-linux-gnu/ktorrent/ui_queuemanagerwidget.h:117
-#: obj-i686-linux-gnu/ktorrent/ui_queuemanagerwidget.h:118 rc.cpp:367
-#: rc.cpp:379 rc.cpp:382 rc.cpp:385 rc.cpp:521 rc.cpp:524 rc.cpp:527
-#: rc.cpp:530 rc.cpp:533 rc.cpp:367 rc.cpp:379 rc.cpp:382 rc.cpp:385
-#: rc.cpp:521 rc.cpp:524 rc.cpp:527 rc.cpp:530 rc.cpp:533
-msgid "..."
+#. i18n: file: plugins/infowidget/iwprefpage.ui:92
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1363 rc.cpp:1363
+msgid "Last priority:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:52
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_moveCompleted)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:378 rc.cpp:370 rc.cpp:370
+#. i18n: file: plugins/infowidget/iwprefpage.ui:102
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_lastColor)
+#: rc.cpp:1366 rc.cpp:1366
 msgid ""
-"Moves the files to the specified location when the torrent finishes "
-"downloading."
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Color to use for last "
+"priority files.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:65
-#. i18n: ectx: property (toolTip), widget (QToolButton, m_move_when_completed_history)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:382 rc.cpp:376 rc.cpp:376
-msgid "History of all recently used move when completed locations"
+#. i18n: file: plugins/infowidget/statustab.ui:32
+#. i18n: ectx: property (text), widget (QLabel, hdr_info)
+#: rc.cpp:1372 rc.cpp:1372
+msgid "Info"
+msgstr "Gwybo"
+
+#. i18n: file: plugins/infowidget/statustab.ui:41
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#: rc.cpp:1375 rc.cpp:1375
+msgid "Average down speed:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:96
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:387 rc.cpp:388 rc.cpp:388
-msgid "Text encoding:"
+#. i18n: file: plugins/infowidget/statustab.ui:64
+#. i18n: ectx: property (text), widget (QLabel, label_16)
+#: rc.cpp:1378 rc.cpp:1378
+msgid "Type:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:123
-#. i18n: ectx: property (toolTip), widget (QTreeView, m_file_view)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:389 rc.cpp:391 rc.cpp:391
-msgid ""
-"All files in the torrent, you can change them by double clicking on them."
+#. i18n: file: plugins/infowidget/statustab.ui:100
+#. i18n: ectx: property (text), widget (QLabel, label_15)
+#: rc.cpp:1381 rc.cpp:1381
+msgid "Average up speed:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:132
-#. i18n: ectx: property (text), widget (KPushButton, m_select_all)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:391 rc.cpp:394 rc.cpp:394
-msgid "Select &All"
-msgstr "Dewis Pope&th"
+#. i18n: file: plugins/infowidget/statustab.ui:123
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:359
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#. i18n: file: plugins/infowidget/statustab.ui:123
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:359
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1384 rc.cpp:1786 rc.cpp:1384 rc.cpp:1786
+msgid "Comments:"
+msgstr "Sylwadau :"
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:139
-#. i18n: ectx: property (text), widget (KPushButton, m_select_none)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:392 rc.cpp:397 rc.cpp:397
-msgid "Select &None"
-msgstr "Dewis D&im"
+#. i18n: file: plugins/infowidget/statustab.ui:171
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1390 rc.cpp:1390
+msgid "Downloaded chunks:"
+msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:146
-#. i18n: ectx: property (text), widget (KPushButton, m_invert_selection)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:393 rc.cpp:400 rc.cpp:400
-msgid "Invert Selection"
-msgstr "Gwrthdroi Dewisiad"
+#. i18n: file: plugins/infowidget/statustab.ui:194
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1393 rc.cpp:1393
+msgid "Available chunks:"
+msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:153
-#. i18n: ectx: property (text), widget (KPushButton, m_collapse_all)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:394 rc.cpp:403 rc.cpp:403
-msgid "Collapse All"
+#. i18n: file: plugins/infowidget/statustab.ui:256
+#. i18n: ectx: property (text), widget (QLabel, hdr_sharing)
+#: rc.cpp:1396 rc.cpp:1396
+msgid "Sharing"
+msgstr "Rhannu"
+
+#. i18n: file: plugins/infowidget/statustab.ui:265
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:1399 rc.cpp:1399
+msgid "Share ratio:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:160
-#. i18n: ectx: property (text), widget (KPushButton, m_expand_all)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:395 rc.cpp:406 rc.cpp:406
-msgid "Expand All"
+#. i18n: file: plugins/infowidget/statustab.ui:282
+#. i18n: ectx: property (text), widget (QCheckBox, use_ratio_limit)
+#: rc.cpp:1402 rc.cpp:1402
+msgid "Ratio limit:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:184
-#. i18n: ectx: property (text), widget (QLabel, m_existing_found)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:396 rc.cpp:409 rc.cpp:409
-msgid "No existing files are found"
+#. i18n: file: plugins/infowidget/statustab.ui:308
+#. i18n: ectx: property (text), widget (QCheckBox, use_time_limit)
+#: rc.cpp:1408 rc.cpp:1408
+msgid "Time limit:"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:244
-#. i18n: ectx: property (text), widget (QCheckBox, m_chkStartTorrent)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:399 rc.cpp:418 rc.cpp:418
-msgid "Start torrent"
+#. i18n: file: plugins/infowidget/statustab.ui:318
+#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, time_limit)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:134
+#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, m_max_seed_time)
+#. i18n: file: plugins/infowidget/statustab.ui:318
+#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, time_limit)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:134
+#. i18n: ectx: property (suffix), widget (QDoubleSpinBox, m_max_seed_time)
+#: rc.cpp:1414 rc.cpp:1515 rc.cpp:1414 rc.cpp:1515
+msgid " Hours"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:259
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_skip_data_check)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:401 rc.cpp:421 rc.cpp:421
+#. i18n: file: plugins/infowidget/webseedstab.ui:21
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_webseed)
+#: rc.cpp:1417 rc.cpp:1417
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -6953,51 +6230,74 @@
 "</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
 "size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">When existing files have "
-"been found, skip the data check and assume that the files are fully "
-"downloaded.</p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Webseed to add to the "
+"torrent.</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
 "indent:0px;\"></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Note: </span>only do this when you are absolutely "
-"sure.</p></body></html>"
+"weight:600;\">Note: </span>Only http webseeds are "
+"supported.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:262
-#. i18n: ectx: property (text), widget (QCheckBox, m_skip_data_check)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:408 rc.cpp:429 rc.cpp:429
-msgid "Skip data check if existing files are found"
+#. i18n: file: plugins/infowidget/webseedstab.ui:28
+#. i18n: ectx: property (text), widget (QPushButton, m_add)
+#: rc.cpp:1425 rc.cpp:1425
+msgid "Add Webseed"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:272
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:409 rc.cpp:432 rc.cpp:432
-msgid "Disk Space"
+#. i18n: file: plugins/infowidget/webseedstab.ui:50
+#. i18n: ectx: property (text), widget (QPushButton, m_remove)
+#: rc.cpp:1428 rc.cpp:1428
+msgid "Remove Webseed"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:280
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:410 rc.cpp:435 rc.cpp:435
-msgid "Required:"
+#. i18n: file: plugins/infowidget/webseedstab.ui:70
+#. i18n: ectx: property (text), widget (QPushButton, m_enable_all)
+#: rc.cpp:1431 rc.cpp:1431
+msgid "Enable All"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:290
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:411 rc.cpp:438 rc.cpp:438
-msgid "Available:"
+#. i18n: file: plugins/infowidget/webseedstab.ui:77
+#. i18n: ectx: property (text), widget (QPushButton, m_disable_all)
+#: rc.cpp:1434 rc.cpp:1434
+msgid "Disable All"
 msgstr ""
 
-#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:300
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#: obj-i686-linux-gnu/ktorrent/ui_fileselectdlg.h:412 rc.cpp:441 rc.cpp:441
-msgid "After download:"
+#. i18n: file: plugins/infowidget/ktinfowidgetplugin.kcfg:10
+#. i18n: ectx: label, entry (showPeerView), group (general)
+#: rc.cpp:1437 rc.cpp:1437
+msgid "Show peer view tab in main window"
+msgstr ""
+
+#. i18n: file: plugins/infowidget/ktinfowidgetplugin.kcfg:14
+#. i18n: ectx: label, entry (showChunkView), group (general)
+#: rc.cpp:1440 rc.cpp:1440
+msgid "Show chunk download view tab in main window"
+msgstr ""
+
+#. i18n: file: plugins/infowidget/ktinfowidgetplugin.kcfg:18
+#. i18n: ectx: label, entry (showTrackersView), group (general)
+#: rc.cpp:1443 rc.cpp:1443
+msgid "Show trackers view tab in main window"
+msgstr ""
+
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, GroupPolicyDlg)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, AddPeersDlg)
+#. i18n: file: ktorrent/groups/grouppolicydlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, GroupPolicyDlg)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, AddPeersDlg)
+#: rc.cpp:1448 rc.cpp:1789 rc.cpp:1448 rc.cpp:1789
+msgid "Dialog"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:28
 #. i18n: ectx: property (toolTip), widget (QCheckBox, m_default_location_enabled)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:166 rc.cpp:548 rc.cpp:548
+#: rc.cpp:1451 rc.cpp:1451
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -7025,15 +6325,13 @@
 #. i18n: ectx: property (text), widget (QCheckBox, m_default_location_enabled)
 #. i18n: file: ktorrent/pref/generalpref.ui:40
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_useSaveDir)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:173
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:179 rc.cpp:556 rc.cpp:1320
-#: rc.cpp:556 rc.cpp:1320
+#: rc.cpp:1459 rc.cpp:2664 rc.cpp:1459 rc.cpp:2664
 msgid "Default save location:"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:43
 #. i18n: ectx: property (toolTip), widget (KUrlRequester, m_default_location)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:175 rc.cpp:559 rc.cpp:559
+#: rc.cpp:1462 rc.cpp:1462
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -7055,13 +6353,13 @@
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:50
 #. i18n: ectx: property (text), widget (QCheckBox, m_default_move_on_completion_enabled)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:182 rc.cpp:567 rc.cpp:567
+#: rc.cpp:1470 rc.cpp:1470
 msgid "Default move when completed location:"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:63
 #. i18n: ectx: property (toolTip), widget (KUrlRequester, m_default_move_on_completion_location)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:184 rc.cpp:570 rc.cpp:570
+#: rc.cpp:1473 rc.cpp:1473
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -7088,7 +6386,7 @@
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:73
 #. i18n: ectx: property (toolTip), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:194 rc.cpp:579 rc.cpp:579
+#: rc.cpp:1482 rc.cpp:1482
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -7102,37 +6400,37 @@
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:76
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:199 rc.cpp:585 rc.cpp:585
+#: rc.cpp:1488 rc.cpp:1488
 msgid "Torrent Limits"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:84
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:200 rc.cpp:588 rc.cpp:588
+#: rc.cpp:1491 rc.cpp:1491
 msgid "Maximum download rate:"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:104
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:203 rc.cpp:597 rc.cpp:597
+#: rc.cpp:1500 rc.cpp:1500
 msgid "Maximum upload rate:"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:124
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:206 rc.cpp:606 rc.cpp:606
+#: rc.cpp:1509 rc.cpp:1509
 msgid "Maximum seed time:"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:147
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:209 rc.cpp:615 rc.cpp:615
+#: rc.cpp:1518 rc.cpp:1518
 msgid "Maximum share ratio:"
 msgstr ""
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:174
 #. i18n: ectx: property (toolTip), widget (QCheckBox, m_only_new)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:212 rc.cpp:621 rc.cpp:621
+#: rc.cpp:1524 rc.cpp:1524
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -7154,655 +6452,602 @@
 
 #. i18n: file: ktorrent/groups/grouppolicydlg.ui:177
 #. i18n: ectx: property (text), widget (QCheckBox, m_only_new)
-#: obj-i686-linux-gnu/ktorrent/ui_grouppolicydlg.h:219 rc.cpp:629 rc.cpp:629
+#: rc.cpp:1532 rc.cpp:1532
 msgid "Apply settings only for newly opened or created torrents"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:17
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manuallyControlTorrents)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:244 rc.cpp:725 rc.cpp:725
-msgid ""
-"When enabled, the queue manager will be totally disabled, allowing you to "
-"fully control all torrents manually."
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:20
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_manuallyControlTorrents)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:246 rc.cpp:728 rc.cpp:728
-msgid "Control torrents manually"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:35
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:288
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#. i18n: file: ktorrent/pref/qmpref.ui:35
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:288
-#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:248
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:342 rc.cpp:734
-#: rc.cpp:1471 rc.cpp:734 rc.cpp:1471
-msgid "Maximum downloads:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:42
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_maxDownloads)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:250 rc.cpp:737 rc.cpp:737
-msgid ""
-"The maximum number of simultaneous downloads the queue manager will run."
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:302
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#. i18n: file: ktorrent/pref/qmpref.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:302
-#. i18n: ectx: property (text), widget (QLabel, label_17)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:253
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:344 rc.cpp:743
-#: rc.cpp:1474 rc.cpp:743 rc.cpp:1474
-msgid "Maximum seeds:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:62
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_maxSeeds)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:255 rc.cpp:746 rc.cpp:746
-msgid "The maximum number of simultaneous seeds the queue manager will run."
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:75
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:258 rc.cpp:752 rc.cpp:752
-msgid "When diskspace is running low:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:86
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:261 rc.cpp:758 rc.cpp:758
-msgid "Don't start torrents"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:91
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:262 rc.cpp:761 rc.cpp:761
-msgid "Ask if torrents can be started"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:96
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:263 rc.cpp:764 rc.cpp:764
-msgid "Start torrents"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:82
-#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:266 rc.cpp:755 rc.cpp:755
-msgid ""
-"What to do when the diskspace is running low and the queue manager wants to "
-"start a torrent."
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:23
+#. i18n: ectx: property (text), widget (QLabel, m_main_caption)
+#: rc.cpp:1538 rc.cpp:1538
+msgid "Speed limits for individual torrents (double click to edit):"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:104
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:268 rc.cpp:767 rc.cpp:767
-msgid "Stop torrents when free disk space is lower than:"
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1541 rc.cpp:1541
+msgid "Filter:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:111
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_minDiskSpace)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:270 rc.cpp:770 rc.cpp:770
-msgid ""
-"When the free diskspace drops below this value, stop all torrents "
-"downloading."
+#. i18n: file: ktorrent/dialogs/speedlimitsdlg.ui:64
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1544 rc.cpp:1544
+msgid "Global Limits"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:114
-#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_minDiskSpace)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:272 rc.cpp:773 rc.cpp:773
-msgid " MiB"
+#. i18n: file: ktorrent/dialogs/importdialog.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, ImportDialog)
+#: rc.cpp:1565 rc.cpp:1565
+msgid "Import an existing torrent"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:137
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_decreasePriorityOfStalledTorrents)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:274 rc.cpp:776 rc.cpp:776
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-size:8pt; font-weight:400; font-"
-"style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">With this enabled, the "
-"queue manager will decrease the priority of a torrent which has been stalled "
-"for too long. </p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">This will allow the queue "
-"manager to run other torrents, when a torrent is doing "
-"nothing.</p></body></html>"
+#. i18n: file: ktorrent/dialogs/importdialog.ui:29
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1568 rc.cpp:1568
+msgid "Torrent:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:140
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_decreasePriorityOfStalledTorrents)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:281 rc.cpp:784 rc.cpp:784
-msgid "Decrease priority of torrents which are stalled for too long"
-msgstr ""
+#. i18n: file: ktorrent/dialogs/importdialog.ui:45
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1571 rc.cpp:1571
+msgid "Data:"
+msgstr "Data:"
 
-#. i18n: file: ktorrent/pref/qmpref.ui:149
+#. i18n: file: ktorrent/dialogs/importdialog.ui:69
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:282 rc.cpp:787 rc.cpp:787
-msgid "Stalled timer:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:160
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_stallTimer)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:284 rc.cpp:790 rc.cpp:790
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera "
-"Sans';\">Time used for the stall timer. When a torrent is stalled longer "
-"than this, its priority will be decreased.</p></body></html>"
-msgstr ""
-
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:290
-msgid "Seeding"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/qmpref.ui:200
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_keepSeeding)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:292 rc.cpp:800 rc.cpp:800
-msgid ""
-"When a download is finished, continue seeding it. If this is disabled, the "
-"torrent will be stopped."
+#: rc.cpp:1574 rc.cpp:1574
+msgid "Select the torrent file and the data which belongs with it."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:203
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_keepSeeding)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:294 rc.cpp:803 rc.cpp:803
-msgid "Keep seeding after download is finished"
-msgstr ""
+#. i18n: file: ktorrent/dialogs/importdialog.ui:108
+#. i18n: ectx: property (text), widget (KPushButton, m_import_btn)
+#: rc.cpp:1577 rc.cpp:1577
+msgid "&Import"
+msgstr "&Mewnforio"
 
-#. i18n: file: ktorrent/pref/qmpref.ui:210
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:274
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#. i18n: file: ktorrent/pref/qmpref.ui:210
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:274
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:295
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:340 rc.cpp:806
-#: rc.cpp:1468 rc.cpp:806 rc.cpp:1468
-msgid "Number of upload slots:"
-msgstr ""
+#. i18n: file: ktorrent/dialogs/importdialog.ui:115
+#. i18n: ectx: property (text), widget (KPushButton, m_cancel_btn)
+#: rc.cpp:1580 rc.cpp:1580
+msgid "Ca&ncel"
+msgstr "Di&ddymu"
 
-#. i18n: file: ktorrent/pref/qmpref.ui:217
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_numUploadSlots)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:297 rc.cpp:809 rc.cpp:809
-msgid ""
-"The number of upload slots, this determines the number of peers you can "
-"upload to simultaneously for one torrent."
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, FileSelectDlg)
+#: rc.cpp:1583 rc.cpp:1583
+msgid "Select Which Files You Want to Download"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:233
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:299 rc.cpp:812 rc.cpp:812
-msgid "Default maximum share ratio:"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:38
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_download_location_history)
+#: rc.cpp:1589 rc.cpp:1589
+msgid "History of all recently used download locations"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:246
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_maxRatio)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:301 rc.cpp:815 rc.cpp:815
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
-"style=\" font-size:8pt;\">The maximum share ratio, if this value is reached "
-"seeding will be stopped. This is only applied to newly opened torrents, "
-"existing torrents will not be affected by changing this.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"weight:600;\">Attention: </span>This is not used when downloading, only when "
-"seeding.</p></body></html>"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:41
+#. i18n: ectx: property (text), widget (QToolButton, m_download_location_history)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:68
+#. i18n: ectx: property (text), widget (QToolButton, m_move_when_completed_history)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:79
+#. i18n: ectx: property (text), widget (QToolButton, m_tree)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:86
+#. i18n: ectx: property (text), widget (QToolButton, m_list)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:25
+#. i18n: ectx: property (text), widget (QToolButton, m_show_search)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:35
+#. i18n: ectx: property (text), widget (QToolButton, m_move_top)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:42
+#. i18n: ectx: property (text), widget (QToolButton, m_move_up)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:49
+#. i18n: ectx: property (text), widget (QToolButton, m_move_down)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:56
+#. i18n: ectx: property (text), widget (QToolButton, m_move_bottom)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:41
+#. i18n: ectx: property (text), widget (QToolButton, m_download_location_history)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:68
+#. i18n: ectx: property (text), widget (QToolButton, m_move_when_completed_history)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:79
+#. i18n: ectx: property (text), widget (QToolButton, m_tree)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:86
+#. i18n: ectx: property (text), widget (QToolButton, m_list)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:25
+#. i18n: ectx: property (text), widget (QToolButton, m_show_search)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:35
+#. i18n: ectx: property (text), widget (QToolButton, m_move_top)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:42
+#. i18n: ectx: property (text), widget (QToolButton, m_move_up)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:49
+#. i18n: ectx: property (text), widget (QToolButton, m_move_down)
+#. i18n: file: ktorrent/tools/queuemanagerwidget.ui:56
+#. i18n: ectx: property (text), widget (QToolButton, m_move_bottom)
+#: rc.cpp:1592 rc.cpp:1604 rc.cpp:1607 rc.cpp:1610 rc.cpp:2773 rc.cpp:2776
+#: rc.cpp:2779 rc.cpp:2782 rc.cpp:2785 rc.cpp:1592 rc.cpp:1604 rc.cpp:1607
+#: rc.cpp:1610 rc.cpp:2773 rc.cpp:2776 rc.cpp:2779 rc.cpp:2782 rc.cpp:2785
+msgid "..."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:262
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:311 rc.cpp:827 rc.cpp:827
-msgid "Default maximum seed time:"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:52
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_moveCompleted)
+#: rc.cpp:1595 rc.cpp:1595
+msgid ""
+"Moves the files to the specified location when the torrent finishes "
+"downloading."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:269
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_maxSeedTime)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:313 rc.cpp:830 rc.cpp:830
-msgid ""
-"The maximum seed time in hours. Once you reach this time, the torrent will "
-"be stopped. This is only applied to newly opened torrents, existing torrents "
-"will not be affected by changing this."
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:65
+#. i18n: ectx: property (toolTip), widget (QToolButton, m_move_when_completed_history)
+#: rc.cpp:1601 rc.cpp:1601
+msgid "History of all recently used move when completed locations"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:288
-#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
-#. i18n: file: ktorrent/pref/qmpref.ui:298
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_greenRatio)
-#. i18n: file: ktorrent/pref/qmpref.ui:288
-#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
-#. i18n: file: ktorrent/pref/qmpref.ui:298
-#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_greenRatio)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:317
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:321 rc.cpp:836 rc.cpp:842
-#: rc.cpp:836 rc.cpp:842
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:96
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1613 rc.cpp:1613
+msgid "Text encoding:"
+msgstr ""
+
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:123
+#. i18n: ectx: property (toolTip), widget (QTreeView, m_file_view)
+#: rc.cpp:1616 rc.cpp:1616
 msgid ""
-"Value at which the share ratio will be displayed with a green color. Lower "
-"ratios will be displayed in red."
+"All files in the torrent, you can change them by double clicking on them."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:291
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_qmpref.h:319 rc.cpp:839 rc.cpp:839
-msgid "Minimum good share ratio:"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:132
+#. i18n: ectx: property (text), widget (KPushButton, m_select_all)
+#: rc.cpp:1619 rc.cpp:1619
+msgid "Select &All"
+msgstr "Dewis Pope&th"
+
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:139
+#. i18n: ectx: property (text), widget (KPushButton, m_select_none)
+#: rc.cpp:1622 rc.cpp:1622
+msgid "Select &None"
+msgstr "Dewis D&im"
+
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:146
+#. i18n: ectx: property (text), widget (KPushButton, m_invert_selection)
+#: rc.cpp:1625 rc.cpp:1625
+msgid "Invert Selection"
+msgstr "Gwrthdroi Dewisiad"
+
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:153
+#. i18n: ectx: property (text), widget (KPushButton, m_collapse_all)
+#: rc.cpp:1628 rc.cpp:1628
+msgid "Collapse All"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, dhtGroupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:241 rc.cpp:1205 rc.cpp:1205
-msgid "Features"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:160
+#. i18n: ectx: property (text), widget (KPushButton, m_expand_all)
+#: rc.cpp:1631 rc.cpp:1631
+msgid "Expand All"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:22
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_dhtSupport)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:243 rc.cpp:1208 rc.cpp:1208
-msgid ""
-"DHT is a trackerless protocol to find peers sharing the same torrents as you "
-"do."
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:184
+#. i18n: ectx: property (text), widget (QLabel, m_existing_found)
+#: rc.cpp:1634 rc.cpp:1634
+msgid "No existing files are found"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:25
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_dhtSupport)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:245 rc.cpp:1211 rc.cpp:1211
-msgid "Use DHT to get additional peers"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:207
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:77
+#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:207
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#. i18n: file: ktorrent/dialogs/pastedlgbase.ui:77
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1640 rc.cpp:1678 rc.cpp:1640 rc.cpp:1678
+msgid "Group:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:34
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:246 rc.cpp:1214 rc.cpp:1214
-msgid "UDP port for DHT communications:"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:244
+#. i18n: ectx: property (text), widget (QCheckBox, m_chkStartTorrent)
+#: rc.cpp:1643 rc.cpp:1643
+msgid "Start torrent"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:47
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_dhtPort)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:248 rc.cpp:1217 rc.cpp:1217
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:259
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_skip_data_check)
+#: rc.cpp:1646 rc.cpp:1646
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;  font-size:9pt;\"><span "
-"style=\" font-size:8pt;\">UDP port to use for the DHT protocol.</span></p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">When existing files have "
+"been found, skip the data check and assume that the files are fully "
+"downloaded.</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
 "indent:0px;\"></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; \"><span style=\" font-"
-"weight:600;\">Attention:</span> If you are behind a router, this port needs "
-"to be forwarded to accept incoming DHT requests. The UPnP plugin can do this "
-"for you.</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Note: </span>only do this when you are absolutely "
+"sure.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:65
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_pexEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:258 rc.cpp:1226 rc.cpp:1226
-msgid "Whether or not to use µTorrent compatible peer exchange."
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:262
+#. i18n: ectx: property (text), widget (QCheckBox, m_skip_data_check)
+#: rc.cpp:1654 rc.cpp:1654
+msgid "Skip data check if existing files are found"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:68
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_pexEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:260 rc.cpp:1229 rc.cpp:1229
-msgid "Use peer exchange"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:272
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:1657 rc.cpp:1657
+msgid "Disk Space"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:75
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_webseedsEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:262 rc.cpp:1232 rc.cpp:1232
-msgid ""
-"Enable or disable the use of webseeds when they are present in a torrent."
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:280
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1660 rc.cpp:1660
+msgid "Required:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:78
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_webseedsEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:264 rc.cpp:1235 rc.cpp:1235
-msgid "Use webseeds"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:290
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1663 rc.cpp:1663
+msgid "Available:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:90
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:265 rc.cpp:1238 rc.cpp:1238
-msgid "Encryption"
-msgstr "Cêl-ysgrifaeth"
+#. i18n: file: ktorrent/dialogs/fileselectdlg.ui:300
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#: rc.cpp:1666 rc.cpp:1666
+msgid "After download:"
+msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:100
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useEncryption)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:267 rc.cpp:1241 rc.cpp:1241
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Protocol encryption is "
-"useful when your ISP is slowing down bittorrent connections. </p>\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The encryption will "
-"prevent your bittorrent traffic to be flagged as bittorrent traffic, and so "
-"the ISP will not slow it down.</p></body></html>"
+#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, TorrentMigratorDlg)
+#: rc.cpp:1681 rc.cpp:1681
+msgid "Importing ..."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:148
-#. i18n: ectx: label, entry (useEncryption), group (downloads)
-#. i18n: file: ktorrent/pref/btpref.ui:103
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useEncryption)
-#. i18n: file: libktcore/ktorrent.kcfg:148
-#. i18n: ectx: label, entry (useEncryption), group (downloads)
-#. i18n: file: ktorrent/pref/btpref.ui:103
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useEncryption)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:273 rc.cpp:95 rc.cpp:1248 rc.cpp:95
-#: rc.cpp:1248
-msgid "Use protocol encryption"
+#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1684 rc.cpp:1684
+msgid "Importing torrents from KDE3 version:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:110
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_allowUnencryptedConnections)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:275 rc.cpp:1251 rc.cpp:1251
-msgid ""
-"Not all clients support encryption, and some people have encryption "
-"disabled. If you want to connect to those peers, you need to have this "
-"option enabled."
+#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:61
+#. i18n: ectx: property (text), widget (KPushButton, m_close_button)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:118
+#. i18n: ectx: property (text), widget (KPushButton, m_close)
+#. i18n: file: ktorrent/view/scanextender.ui:233
+#. i18n: ectx: property (text), widget (KPushButton, close_button)
+#. i18n: file: ktorrent/ipfilterwidget.ui:106
+#. i18n: ectx: property (text), widget (KPushButton, m_close)
+#. i18n: file: ktorrent/dialogs/torrentmigratordlg.ui:61
+#. i18n: ectx: property (text), widget (KPushButton, m_close_button)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:118
+#. i18n: ectx: property (text), widget (KPushButton, m_close)
+#. i18n: file: ktorrent/view/scanextender.ui:233
+#. i18n: ectx: property (text), widget (KPushButton, close_button)
+#. i18n: file: ktorrent/ipfilterwidget.ui:106
+#. i18n: ectx: property (text), widget (KPushButton, m_close)
+#: rc.cpp:1687 rc.cpp:1815 rc.cpp:1911 rc.cpp:1991 rc.cpp:1687 rc.cpp:1815
+#: rc.cpp:1911 rc.cpp:1991
+msgid "Close"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:152
-#. i18n: ectx: label, entry (allowUnencryptedConnections), group (downloads)
-#. i18n: file: ktorrent/pref/btpref.ui:113
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowUnencryptedConnections)
-#. i18n: file: libktcore/ktorrent.kcfg:152
-#. i18n: ectx: label, entry (allowUnencryptedConnections), group (downloads)
-#. i18n: file: ktorrent/pref/btpref.ui:113
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowUnencryptedConnections)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:277 rc.cpp:98 rc.cpp:1254 rc.cpp:98
-#: rc.cpp:1254
-msgid "Allow unencrypted connections"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, TorrentCreatorDlg)
+#: rc.cpp:1690 rc.cpp:1690
+msgid "Create a torrent"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:123
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:278 rc.cpp:1257 rc.cpp:1257
-msgid "Tracker"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1693 rc.cpp:1693
+msgid "File or directory to create torrent from:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:129
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useCustomIP)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:280 rc.cpp:1260 rc.cpp:1260
-msgid ""
-"Instead of allowing the tracker to determine your IP address, tell the "
-"tracker which IP address to use. Use this when you are behind a proxy."
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:54
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1699 rc.cpp:1699
+msgid "Size of each chunk:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useCustomIP)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:282 rc.cpp:1263 rc.cpp:1263
-msgid "Send the tracker a custom IP address or hostname"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:65
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1702 rc.cpp:1702
+msgid "32 KiB"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:141
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:283 rc.cpp:1266 rc.cpp:1266
-msgid "Custom IP address or hostname:"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:70
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1705 rc.cpp:1705
+msgid "64 KiB"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:148
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_customIP)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:285 rc.cpp:1269 rc.cpp:1269
-msgid ""
-"Custom IP address or hostname to send to the tracker. Hostnames will be "
-"resolved at runtime and the resolved IP address will be sent to the tracker."
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:75
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1708 rc.cpp:1708
+msgid "128 KiB"
+msgstr ""
+
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:80
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1711 rc.cpp:1711
+msgid "256 KiB"
+msgstr ""
+
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:85
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1714 rc.cpp:1714
+msgid "512 KiB"
+msgstr ""
+
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:90
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1717 rc.cpp:1717
+msgid "1 MiB"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:162
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:287 rc.cpp:1272 rc.cpp:1272
-msgid "Data Checking"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:95
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1720 rc.cpp:1720
+msgid "2 MiB"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:176
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_doUploadDataCheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:289 rc.cpp:1275 rc.cpp:1275
-msgid ""
-"During uploading when a chunk is loaded into memory automatically recheck "
-"this chunk, to see if it still is OK."
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:100
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1723 rc.cpp:1723
+msgid "4 MiB"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:179
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_doUploadDataCheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:291 rc.cpp:1278 rc.cpp:1278
-msgid "Recheck chunks during uploading"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:105
+#. i18n: ectx: property (text), item, widget (QComboBox, m_chunk_size)
+#: rc.cpp:1726 rc.cpp:1726
+msgid "8 MiB"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:186
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useMaxSizeForUploadDataCheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:293 rc.cpp:1281 rc.cpp:1281
-msgid ""
-"Because rechecking big chunks can take a lot of time, the recheck can be "
-"disabled when the chunks are bigger then a certain size."
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:115
+#. i18n: ectx: property (text), widget (QCheckBox, m_start_seeding)
+#: rc.cpp:1729 rc.cpp:1729
+msgid "Start seeding"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:189
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useMaxSizeForUploadDataCheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:295 rc.cpp:1284 rc.cpp:1284
-msgid "Do not recheck when chunks are bigger than"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:125
+#. i18n: ectx: property (text), widget (QCheckBox, m_private)
+#: rc.cpp:1732 rc.cpp:1732
+msgid "Private torrent (DHT not allowed)"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:196
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxSizeForUploadDataCheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:297 rc.cpp:1287 rc.cpp:1287
-msgid "The maximum size a chunk can be for rechecking during uploading."
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, m_dht)
+#: rc.cpp:1735 rc.cpp:1735
+msgid "Decentralized (DHT only)"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/advancedpref.ui:215
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeAudio)
-#. i18n: file: ktorrent/pref/advancedpref.ui:241
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeVideo)
-#. i18n: file: ktorrent/pref/btpref.ui:199
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxSizeForUploadDataCheck)
-#. i18n: file: ktorrent/pref/advancedpref.ui:215
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeAudio)
-#. i18n: file: ktorrent/pref/advancedpref.ui:241
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeVideo)
-#. i18n: file: ktorrent/pref/btpref.ui:199
-#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxSizeForUploadDataCheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:299
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:270
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:278 rc.cpp:938 rc.cpp:950
-#: rc.cpp:1290 rc.cpp:938 rc.cpp:950 rc.cpp:1290
-msgid " KiB"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:218
+#. i18n: ectx: attribute (title), widget (QWidget, m_dht_tab)
+#: rc.cpp:1756 rc.cpp:1756
+msgid "DHT Nodes"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:215
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_autoRecheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:301 rc.cpp:1293 rc.cpp:1293
-msgid ""
-"Automatically do a full data check when we find to many corrupted chunks."
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:226
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1759 rc.cpp:1759
+msgid "Node:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:218
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoRecheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:303 rc.cpp:1296 rc.cpp:1296
-msgid "Do a full data check after "
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:272
+#. i18n: ectx: property (text), widget (QTreeWidget, m_node_list)
+#: rc.cpp:1768 rc.cpp:1768
+msgid "IP or Hostname"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:237
-#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_maxCorruptedBeforeRecheck)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:305 rc.cpp:1299 rc.cpp:1299
-msgid "The number of corrupted chunks before a full data check is done"
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:277
+#. i18n: ectx: property (text), widget (QTreeWidget, m_node_list)
+#. i18n: file: libktcore/ktorrent.kcfg:54
+#. i18n: ectx: label, entry (port), group (downloads)
+#. i18n: file: libktcore/ktorrent.kcfg:60
+#. i18n: ectx: label, entry (udpTrackerPort), group (downloads)
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:277
+#. i18n: ectx: property (text), widget (QTreeWidget, m_node_list)
+#. i18n: file: libktcore/ktorrent.kcfg:54
+#. i18n: ectx: label, entry (port), group (downloads)
+#. i18n: file: libktcore/ktorrent.kcfg:60
+#. i18n: ectx: label, entry (udpTrackerPort), group (downloads)
+#: rc.cpp:1771 rc.cpp:2812 rc.cpp:2815 rc.cpp:1771 rc.cpp:2812 rc.cpp:2815
+msgid "Port"
+msgstr "Porth"
+
+#. i18n: file: ktorrent/dialogs/torrentcreatordlg.ui:310
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:1777 rc.cpp:1777
+msgid "Web Seeds"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:253
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_checkWhenFinished)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:308 rc.cpp:1302 rc.cpp:1302
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:19
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1792 rc.cpp:1792
 msgid ""
-"When a torrent has finished downloading, do a full data check on the torrent."
+"Enter the IP address or hostname and port number of the peer you wish to add:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/btpref.ui:256
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_checkWhenFinished)
-#: obj-i686-linux-gnu/ktorrent/ui_btpref.h:310 rc.cpp:1305 rc.cpp:1305
-msgid "Check data when download is finished"
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:33
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1795 rc.cpp:1795
+msgid "Peer:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:171 rc.cpp:1308 rc.cpp:1308
-msgid "Folders"
-msgstr "Plygyll"
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:45
+#. i18n: ectx: property (toolTip), widget (QLineEdit, m_ip)
+#: rc.cpp:1798 rc.cpp:1798
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The IP address or hostname "
+"of the peer you want to connect to, should be put here.</p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Note:</span> We accept both IPv4 and IPv6 "
+"addresses</p></body></html>"
+msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:172 rc.cpp:1311 rc.cpp:1311
-msgid "Folder to store torrent information:"
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:48
+#. i18n: ectx: property (text), widget (QLineEdit, m_ip)
+#. i18n: file: ktorrent/ipfilterwidget.ui:34
+#. i18n: ectx: property (text), widget (KLineEdit, m_ip_to_add)
+#. i18n: file: ktorrent/dialogs/addpeersdlg.ui:48
+#. i18n: ectx: property (text), widget (QLineEdit, m_ip)
+#. i18n: file: ktorrent/ipfilterwidget.ui:34
+#. i18n: ectx: property (text), widget (KLineEdit, m_ip_to_add)
+#: rc.cpp:1806 rc.cpp:1973 rc.cpp:1806 rc.cpp:1973
+msgid "127.0.0.1"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:30
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_tempDir)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:174 rc.cpp:1314 rc.cpp:1314
-msgid ""
-"Directory to store information about all torrents currently opened in "
-"KTorrent."
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, MissingFilesDlg)
+#: rc.cpp:1818 rc.cpp:1818
+msgid "Files are missing"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:37
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useSaveDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:47
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_saveDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:37
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useSaveDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:47
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_saveDir)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:177
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:181 rc.cpp:1317 rc.cpp:1323
-#: rc.cpp:1317 rc.cpp:1323
-msgid "Directory to use as a default save location for all data."
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:20
+#. i18n: ectx: property (text), widget (QLabel, m_text)
+#: rc.cpp:1821 rc.cpp:1821
+msgid "The following files are missing:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:54
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useCompletedDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:64
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_completedDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:54
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useCompletedDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:64
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_completedDir)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:184
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:188 rc.cpp:1326 rc.cpp:1332
-#: rc.cpp:1326 rc.cpp:1332
-msgid "Directory to move data to when a torrent has finished downloading."
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:37
+#. i18n: ectx: property (toolTip), widget (KPushButton, m_recreate)
+#: rc.cpp:1824 rc.cpp:1824
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">They are no longer there, "
+"recreate them.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:57
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useCompletedDir)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:186 rc.cpp:1329 rc.cpp:1329
-msgid "Move completed downloads to:"
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:40
+#. i18n: ectx: property (text), widget (KPushButton, m_recreate)
+#: rc.cpp:1830 rc.cpp:1830
+msgid "Recreate"
+msgstr "Ail-greu"
+
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:50
+#. i18n: ectx: property (toolTip), widget (KPushButton, m_dnd)
+#: rc.cpp:1833 rc.cpp:1833
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Do not download the "
+"missing files.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:71
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useTorrentCopyDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:81
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_torrentCopyDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:71
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useTorrentCopyDir)
-#. i18n: file: ktorrent/pref/generalpref.ui:81
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_torrentCopyDir)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:191
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:195 rc.cpp:1335 rc.cpp:1341
-#: rc.cpp:1335 rc.cpp:1341
-msgid "Directory to copy all torrent files in, which are opened by KTorrent."
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:63
+#. i18n: ectx: property (toolTip), widget (KPushButton, m_select_new)
+#: rc.cpp:1842 rc.cpp:1842
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The files have been moved "
+"to another location, select the new location.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:74
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useTorrentCopyDir)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:193 rc.cpp:1338 rc.cpp:1338
-msgid "Copy torrent files to:"
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:66
+#. i18n: ectx: property (text), widget (KPushButton, m_select_new)
+#: rc.cpp:1848 rc.cpp:1848
+msgid "Select New Location"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:91
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:197 rc.cpp:1344 rc.cpp:1344
-msgid "System Tray Icon"
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:89
+#. i18n: ectx: property (toolTip), widget (KPushButton, m_cancel)
+#: rc.cpp:1851 rc.cpp:1851
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Cancel, do not start the "
+"torrent.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:97
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showSystemTrayIcon)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:199 rc.cpp:1347 rc.cpp:1347
-msgid "Whether or not to show an icon in the system tray."
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:92
+#. i18n: ectx: property (text), widget (KPushButton, m_cancel)
+#. i18n: file: ktorrent/view/scanextender.ui:226
+#. i18n: ectx: property (text), widget (KPushButton, cancel_button)
+#. i18n: file: ktorrent/dialogs/missingfilesdlg.ui:92
+#. i18n: ectx: property (text), widget (KPushButton, m_cancel)
+#. i18n: file: ktorrent/view/scanextender.ui:226
+#. i18n: ectx: property (text), widget (KPushButton, cancel_button)
+#: rc.cpp:1857 rc.cpp:1908 rc.cpp:1857 rc.cpp:1908
+msgid "Cancel"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:100
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showSystemTrayIcon)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:201 rc.cpp:1350 rc.cpp:1350
-msgid "Show system tray icon"
+#. i18n: file: ktorrent/view/scanextender.ui:21
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1860 rc.cpp:1860
+msgid "Found:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:107
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showPopups)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:203 rc.cpp:1353 rc.cpp:1353
-msgid "Whether or not to show system tray popup messages."
+#. i18n: file: ktorrent/view/scanextender.ui:46
+#. i18n: ectx: property (toolTip), widget (QLabel, chunks_found)
+#: rc.cpp:1863 rc.cpp:1863
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
+"were not downloaded but have been found anyway.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:110
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showPopups)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:205 rc.cpp:1356 rc.cpp:1356
-msgid "Show system tray popup messages"
-msgstr ""
+#. i18n: file: ktorrent/view/scanextender.ui:52
+#. i18n: ectx: property (text), widget (QLabel, chunks_found)
+#. i18n: file: ktorrent/view/scanextender.ui:97
+#. i18n: ectx: property (text), widget (QLabel, chunks_failed)
+#. i18n: file: ktorrent/view/scanextender.ui:145
+#. i18n: ectx: property (text), widget (QLabel, chunks_not_downloaded)
+#. i18n: file: ktorrent/view/scanextender.ui:187
+#. i18n: ectx: property (text), widget (QLabel, chunks_downloaded)
+#. i18n: file: ktorrent/view/scanextender.ui:52
+#. i18n: ectx: property (text), widget (QLabel, chunks_found)
+#. i18n: file: ktorrent/view/scanextender.ui:97
+#. i18n: ectx: property (text), widget (QLabel, chunks_failed)
+#. i18n: file: ktorrent/view/scanextender.ui:145
+#. i18n: ectx: property (text), widget (QLabel, chunks_not_downloaded)
+#. i18n: file: ktorrent/view/scanextender.ui:187
+#. i18n: ectx: property (text), widget (QLabel, chunks_downloaded)
+#: rc.cpp:1869 rc.cpp:1881 rc.cpp:1893 rc.cpp:1905 rc.cpp:1869 rc.cpp:1881
+#: rc.cpp:1893 rc.cpp:1905
+msgid "0"
+msgstr "0"
 
-#. i18n: file: ktorrent/pref/advancedpref.ui:143
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: ktorrent/pref/generalpref.ui:120
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#. i18n: file: ktorrent/pref/advancedpref.ui:143
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: ktorrent/pref/generalpref.ui:120
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:206
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:239 rc.cpp:895 rc.cpp:1359
-#: rc.cpp:895 rc.cpp:1359
-msgid "Miscellaneous"
+#. i18n: file: ktorrent/view/scanextender.ui:69
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1872 rc.cpp:1872
+msgid "Failed:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:129
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openMultipleTorrentsSilently)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:208 rc.cpp:1362 rc.cpp:1362
+#. i18n: file: ktorrent/view/scanextender.ui:88
+#. i18n: ectx: property (toolTip), widget (QLabel, chunks_failed)
+#: rc.cpp:1875 rc.cpp:1875
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -7810,42 +7055,33 @@
 "</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
 "size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">When you select multiple "
-"torrents to be opened at the same time, open them silently.</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
+"have been downloaded, and which are not OK.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openMultipleTorrentsSilently)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:213 rc.cpp:1368 rc.cpp:1368
-msgid "Open multiple torrents silently"
+#. i18n: file: ktorrent/view/scanextender.ui:114
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1884 rc.cpp:1884
+msgid "Not downloaded:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:143
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openAllTorrentsSilently)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:215 rc.cpp:1371 rc.cpp:1371
+#. i18n: file: ktorrent/view/scanextender.ui:136
+#. i18n: ectx: property (toolTip), widget (QLabel, chunks_not_downloaded)
+#: rc.cpp:1887 rc.cpp:1887
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Bitstream Vera Sans';\">Open all torrents "
-"silently.</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/generalpref.ui:146
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openAllTorrentsSilently)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:221 rc.cpp:1378 rc.cpp:1378
-msgid "Open all torrents silently"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
+"have not been downloaded.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:156
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_suppressSleep)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:223 rc.cpp:1381 rc.cpp:1381
+#. i18n: file: ktorrent/view/scanextender.ui:178
+#. i18n: ectx: property (toolTip), widget (QLabel, chunks_downloaded)
+#: rc.cpp:1899 rc.cpp:1899
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -7853,49 +7089,150 @@
 "</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
 "size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Prevent computer from "
-"going into a sleep state when torrents are running.</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
+"have been downloaded, and which are OK.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:159
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_suppressSleep)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:228 rc.cpp:1387 rc.cpp:1387
-msgid "Suppress sleep when torrents are running"
+#. i18n: file: ktorrent/view/scanextender.ui:242
+#. i18n: ectx: property (text), widget (QLabel, error_msg)
+#: rc.cpp:1914 rc.cpp:1914
+msgid "Errors:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:172
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_autoRenameSingleFileTorrents)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:230 rc.cpp:1390 rc.cpp:1390
+#. i18n: file: ktorrent/view/propertiesextender.ui:20
+#. i18n: ectx: property (toolTip), widget (QCheckBox, dht)
+#: rc.cpp:1920 rc.cpp:1920
+msgid ""
+"DHT is a distributed database which can be used to find more peers for a "
+"torrent."
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:23
+#. i18n: ectx: property (text), widget (QCheckBox, dht)
+#: rc.cpp:1923 rc.cpp:1923
+msgid "Use DHT to find more peers"
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:30
+#. i18n: ectx: property (toolTip), widget (QCheckBox, pex)
+#: rc.cpp:1926 rc.cpp:1926
+msgid ""
+"Peer exchange results in more peers being found, by exchanging information "
+"about peers with other peers."
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, pex)
+#: rc.cpp:1929 rc.cpp:1929
+msgid "Use peer exchange to find more peers"
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:46
+#. i18n: ectx: property (toolTip), widget (QCheckBox, superseeding)
+#: rc.cpp:1932 rc.cpp:1932
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Rename a single file "
-"torrent with the name of its only file. </p>\n"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Superseeding mode, is a "
+"special seeding mode which allows you to achieve much higher seeding "
+"efficiencies. This results in less bandwidth used to spread a torrent.</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
 "indent:0px;\"></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">If for example the file is "
-"named <span style=\" font-weight:600;\">linux-desktop.iso</span>, the "
-"torrent will be displayed as <span style=\" font-weight:600;\">linux-"
-"desktop.</span></p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Note: </span>This should only be used if the swarm has not "
+"fully been established. Once there are multiple active seeders, this mode "
+"becomes useless.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/generalpref.ui:175
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoRenameSingleFileTorrents)
-#: obj-i686-linux-gnu/ktorrent/ui_generalpref.h:238 rc.cpp:1399 rc.cpp:1399
-msgid "Rename single file torrents with the name its only file"
+#. i18n: file: ktorrent/view/propertiesextender.ui:49
+#. i18n: ectx: property (text), widget (QCheckBox, superseeding)
+#: rc.cpp:1941 rc.cpp:1941
+msgid "Use superseeding mode for seeding"
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:58
+#. i18n: ectx: property (toolTip), widget (QCheckBox, move_on_completion_enabled)
+#: rc.cpp:1944 rc.cpp:1944
+msgid ""
+"Move the files of the torrent to a different directory when it has finished "
+"downloading."
+msgstr ""
+
+#. i18n: file: ktorrent/view/propertiesextender.ui:68
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, move_on_completion_url)
+#: rc.cpp:1950 rc.cpp:1950
+msgid "Location to move the files to."
+msgstr ""
+
+#. i18n: file: ktorrent/ktorrentui.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:1953 rc.cpp:1953
+msgid "&File"
+msgstr ""
+
+#. i18n: file: ktorrent/ktorrentui.rc:16
+#. i18n: ectx: Menu (view)
+#: rc.cpp:1956 rc.cpp:1956
+msgid "&View"
+msgstr ""
+
+#. i18n: file: ktorrent/ktorrentui.rc:25
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:1959 rc.cpp:1959
+msgid "Main"
+msgstr ""
+
+#. i18n: file: ktorrent/ipfilterwidget.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, IPFilterWidget)
+#: rc.cpp:1962 rc.cpp:1962
+msgid "KTorrent Blacklisted Peers"
+msgstr ""
+
+#. i18n: file: ktorrent/ipfilterwidget.ui:22
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1965 rc.cpp:1965
+msgid "Add peer:"
+msgstr ""
+
+#. i18n: file: ktorrent/ipfilterwidget.ui:31
+#. i18n: ectx: property (toolTip), widget (KLineEdit, m_ip_to_add)
+#: rc.cpp:1968 rc.cpp:1968
+msgid ""
+"IP addresses must be in the format 'XXX.XXX.XXX.XXX'.\n"
+"                                        \n"
+"You can also use wildcards like '127.0.0.*' or specify ranges like "
+"'200.10.10.0-200.10.10.40'."
+msgstr ""
+
+#. i18n: file: ktorrent/ipfilterwidget.ui:72
+#. i18n: ectx: property (text), widget (KPushButton, m_clear)
+#: rc.cpp:1982 rc.cpp:1982
+msgid "Clear"
+msgstr ""
+
+#. i18n: file: ktorrent/ipfilterwidget.ui:92
+#. i18n: ectx: property (text), widget (KPushButton, m_open)
+#: rc.cpp:1985 rc.cpp:1985
+msgid "Open..."
+msgstr ""
+
+#. i18n: file: ktorrent/ipfilterwidget.ui:99
+#. i18n: ectx: property (text), widget (KPushButton, m_save_as)
+#: rc.cpp:1988 rc.cpp:1988
+msgid "Save As..."
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:17
 #. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_diskPrealloc)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:206 rc.cpp:848 rc.cpp:848
+#: rc.cpp:1994 rc.cpp:1994
 msgid ""
 "Whether or not diskspace should be reserved before starting to download a "
 "torrent."
@@ -7903,13 +7240,13 @@
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_diskPrealloc)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:208 rc.cpp:851 rc.cpp:851
+#: rc.cpp:1997 rc.cpp:1997
 msgid "Reserve disk space before starting a torrent"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:32
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_fullDiskPrealloc)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:210 rc.cpp:854 rc.cpp:854
+#: rc.cpp:2000 rc.cpp:2000
 msgid ""
 "Instead of doing a quick reservation, do a full reservation. This is slower "
 "than the quick way, but avoids fragmentation on the disk."
@@ -7917,25 +7254,25 @@
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:35
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_fullDiskPrealloc)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:212 rc.cpp:857 rc.cpp:857
+#: rc.cpp:2003 rc.cpp:2003
 msgid "Fully reserve disk space (avoids fragmentation)"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:45
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:213 rc.cpp:860 rc.cpp:860
+#: rc.cpp:2006 rc.cpp:2006
 msgid "Performance"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:53
 #. i18n: ectx: property (text), widget (QLabel, label_5)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:214 rc.cpp:863 rc.cpp:863
+#: rc.cpp:2009 rc.cpp:2009
 msgid "GUI update interval:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:72
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_guiUpdateInterval)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:216 rc.cpp:866 rc.cpp:866
+#: rc.cpp:2012 rc.cpp:2012
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -7965,21 +7302,19 @@
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_guiUpdateInterval)
 #. i18n: file: ktorrent/pref/advancedpref.ui:109
 #. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_cpuUsage)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:224
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:238 rc.cpp:875 rc.cpp:892
-#: rc.cpp:875 rc.cpp:892
+#: rc.cpp:2021 rc.cpp:2038 rc.cpp:2021 rc.cpp:2038
 msgid " ms"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:91
 #. i18n: ectx: property (text), widget (QLabel, label_6)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:225 rc.cpp:878 rc.cpp:878
+#: rc.cpp:2024 rc.cpp:2024
 msgid "Network sleep interval:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:106
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_cpuUsage)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:227 rc.cpp:881 rc.cpp:881
+#: rc.cpp:2027 rc.cpp:2027
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -8010,27 +7345,27 @@
 "3000 KiB/s on a LAN.</p></body></html>"
 msgstr ""
 
+#. i18n: file: ktorrent/pref/advancedpref.ui:143
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: ktorrent/pref/generalpref.ui:120
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#. i18n: file: ktorrent/pref/advancedpref.ui:143
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: ktorrent/pref/generalpref.ui:120
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:2041 rc.cpp:2703 rc.cpp:2041 rc.cpp:2703
+msgid "Miscellaneous"
+msgstr ""
+
 #. i18n: file: ktorrent/pref/advancedpref.ui:153
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:240 rc.cpp:898 rc.cpp:898
+#: rc.cpp:2044 rc.cpp:2044
 msgid "Time estimation algorithm:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/advancedpref.ui:189
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:246 rc.cpp:923 rc.cpp:923
-msgid "Window of X"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/advancedpref.ui:194
-#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:247 rc.cpp:926 rc.cpp:926
-msgid "Moving average"
-msgstr ""
-
 #. i18n: file: ktorrent/pref/advancedpref.ui:170
 #. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_eta)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:250 rc.cpp:901 rc.cpp:901
+#: rc.cpp:2047 rc.cpp:2047
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -8068,15 +7403,27 @@
 "samples</p></body></html>"
 msgstr ""
 
+#. i18n: file: ktorrent/pref/advancedpref.ui:189
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
+#: rc.cpp:2069 rc.cpp:2069
+msgid "Window of X"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/advancedpref.ui:194
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_eta)
+#: rc.cpp:2072 rc.cpp:2072
+msgid "Moving average"
+msgstr ""
+
 #. i18n: file: ktorrent/pref/advancedpref.ui:202
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:263 rc.cpp:929 rc.cpp:929
+#: rc.cpp:2075 rc.cpp:2075
 msgid "Preview size for audio files:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:212
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_previewSizeAudio)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:265 rc.cpp:932 rc.cpp:932
+#: rc.cpp:2078 rc.cpp:2078
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -8089,15 +7436,31 @@
 "previewing.</p></body></html>"
 msgstr ""
 
+#. i18n: file: ktorrent/pref/advancedpref.ui:215
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeAudio)
+#. i18n: file: ktorrent/pref/advancedpref.ui:241
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeVideo)
+#. i18n: file: ktorrent/pref/btpref.ui:199
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxSizeForUploadDataCheck)
+#. i18n: file: ktorrent/pref/advancedpref.ui:215
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeAudio)
+#. i18n: file: ktorrent/pref/advancedpref.ui:241
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_previewSizeVideo)
+#. i18n: file: ktorrent/pref/btpref.ui:199
+#. i18n: ectx: property (suffix), widget (QSpinBox, kcfg_maxSizeForUploadDataCheck)
+#: rc.cpp:2084 rc.cpp:2096 rc.cpp:2407 rc.cpp:2084 rc.cpp:2096 rc.cpp:2407
+msgid " KiB"
+msgstr ""
+
 #. i18n: file: ktorrent/pref/advancedpref.ui:228
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:271 rc.cpp:941 rc.cpp:941
+#: rc.cpp:2087 rc.cpp:2087
 msgid "Preview size for video files:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:238
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_previewSizeVideo)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:273 rc.cpp:944 rc.cpp:944
+#: rc.cpp:2090 rc.cpp:2090
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
@@ -8112,7 +7475,7 @@
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:273
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useQHttpAnnounce)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:280 rc.cpp:953 rc.cpp:953
+#: rc.cpp:2099 rc.cpp:2099
 msgid ""
 "Disables the use of KDE's KIO library for tracker announces.\n"
 "\n"
@@ -8122,13 +7485,13 @@
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:276
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_useQHttpAnnounce)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:284 rc.cpp:958 rc.cpp:958
+#: rc.cpp:2104 rc.cpp:2104
 msgid "Do not use KIO for tracker announces"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:285
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_lookUpHostnameOfPeers)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:286 rc.cpp:961 rc.cpp:961
+#: rc.cpp:2107 rc.cpp:2107
 msgid ""
 "Resolve the hostname of each peer. This will result in the hostname of a "
 "peer being displayed instead of the IP address. \n"
@@ -8139,19 +7502,19 @@
 
 #. i18n: file: ktorrent/pref/advancedpref.ui:288
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_lookUpHostnameOfPeers)
-#: obj-i686-linux-gnu/ktorrent/ui_advancedpref.h:290 rc.cpp:966 rc.cpp:966
+#: rc.cpp:2112 rc.cpp:2112
 msgid "Resolve hostnames of peers"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:17
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:277 rc.cpp:969 rc.cpp:969
+#: rc.cpp:2115 rc.cpp:2115
 msgid "Ports && Limits"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:36
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_port)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:280 rc.cpp:975 rc.cpp:975
+#: rc.cpp:2121 rc.cpp:2121
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -8176,13 +7539,13 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:52
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:289 rc.cpp:984 rc.cpp:984
+#: rc.cpp:2130 rc.cpp:2130
 msgid "UDP tracker port:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:65
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_udpTrackerPort)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:291 rc.cpp:987 rc.cpp:987
+#: rc.cpp:2133 rc.cpp:2133
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -8207,37 +7570,37 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:88
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxConnections)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:302 rc.cpp:999 rc.cpp:999
+#: rc.cpp:2145 rc.cpp:2145
 msgid "The maximum number of connections allowed per torrent."
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:108
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxTotalConnections)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:307 rc.cpp:1008 rc.cpp:1008
+#: rc.cpp:2154 rc.cpp:2154
 msgid "The global connection limit for all torrents combined."
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:128
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxDownloadRate)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:312 rc.cpp:1017 rc.cpp:1017
+#: rc.cpp:2163 rc.cpp:2163
 msgid "The maximum download speed in KiB/s."
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:151
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxUploadRate)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:318 rc.cpp:1029 rc.cpp:1029
+#: rc.cpp:2175 rc.cpp:2175
 msgid "The maximum upload speed in KiB/s"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:178
 #. i18n: ectx: property (text), widget (QLabel, label_7)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:323 rc.cpp:1041 rc.cpp:1041
+#: rc.cpp:2187 rc.cpp:2187
 msgid "DSCP value for IP packets:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:185
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_dscp)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:325 rc.cpp:1044 rc.cpp:1044
+#: rc.cpp:2190 rc.cpp:2190
 msgid ""
 "This value will be filled in the DSCP field of all the IP packets sent for "
 "the bittorrent protocol."
@@ -8245,13 +7608,13 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:195
 #. i18n: ectx: property (text), widget (QLabel, label_8)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:327 rc.cpp:1047 rc.cpp:1047
+#: rc.cpp:2193 rc.cpp:2193
 msgid "Maximum number of connection setups:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:208
 #. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxConnectingSockets)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:329 rc.cpp:1050 rc.cpp:1050
+#: rc.cpp:2196 rc.cpp:2196
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -8275,13 +7638,13 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:228
 #. i18n: ectx: property (text), widget (QLabel, label_9)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:337 rc.cpp:1059 rc.cpp:1059
+#: rc.cpp:2205 rc.cpp:2205
 msgid "Network interface:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:247
 #. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_networkInterface)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:339 rc.cpp:1062 rc.cpp:1062
+#: rc.cpp:2208 rc.cpp:2208
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -8304,7 +7667,7 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:272
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_utpEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:348 rc.cpp:1071 rc.cpp:1071
+#: rc.cpp:2217 rc.cpp:2217
 msgid ""
 "The µTorrent transport protocol runs over UDP and is optimized to not "
 "interfere with other traffic, while still using up all unused bandwidth."
@@ -8312,13 +7675,13 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:275
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_utpEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:350 rc.cpp:1074 rc.cpp:1074
+#: rc.cpp:2220 rc.cpp:2220
 msgid "Use the µTorrent transport protocol (µTP)"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:282
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_onlyUseUtp)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:352 rc.cpp:1077 rc.cpp:1077
+#: rc.cpp:2223 rc.cpp:2223
 msgid ""
 "Don't use TCP for bittorrent connections, only use the µTP protocol. This "
 "can lead to slower speeds, seeing that not all bittorrent clients support "
@@ -8327,16 +7690,24 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:285
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_onlyUseUtp)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:354 rc.cpp:1080 rc.cpp:1080
+#: rc.cpp:2226 rc.cpp:2226
 msgid "Only use µTP"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:294
 #. i18n: ectx: property (text), widget (QLabel, label_10)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:355 rc.cpp:1083 rc.cpp:1083
+#: rc.cpp:2229 rc.cpp:2229
 msgid "Primary transport protocol:"
 msgstr ""
 
+#. i18n: file: ktorrent/pref/networkpref.ui:301
+#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_primaryTransportProtocol)
+#: rc.cpp:2232 rc.cpp:2232
+msgid ""
+"The primary transport protocol to use, when attempting to setup a connection "
+"with a peer, this protocol is chosen first."
+msgstr ""
+
 #. i18n: file: ktorrent/pref/networkpref.ui:305
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_primaryTransportProtocol)
 #. i18n: file: ktupnptest/upnptestwidget.ui:102
@@ -8345,29 +7716,19 @@
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_primaryTransportProtocol)
 #. i18n: file: ktupnptest/upnptestwidget.ui:102
 #. i18n: ectx: property (text), item, widget (QComboBox, m_protocol)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:358
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:173 rc.cpp:1089
-#: rc.cpp:2941 rc.cpp:1089 rc.cpp:2941
+#: rc.cpp:2235 rc.cpp:2935 rc.cpp:2235 rc.cpp:2935
 msgid "TCP"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/networkpref.ui:310
 #. i18n: ectx: property (text), item, widget (QComboBox, kcfg_primaryTransportProtocol)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:359 rc.cpp:1092 rc.cpp:1092
+#: rc.cpp:2238 rc.cpp:2238
 msgid "µTP"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/networkpref.ui:301
-#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_primaryTransportProtocol)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:362 rc.cpp:1086 rc.cpp:1086
-msgid ""
-"The primary transport protocol to use, when attempting to setup a connection "
-"with a peer, this protocol is chosen first."
-msgstr ""
-
 #. i18n: file: ktorrent/pref/networkpref.ui:351
 #. i18n: ectx: property (toolTip), widget (QPushButton, m_recommended_settings)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:365 rc.cpp:1095 rc.cpp:1095
+#: rc.cpp:2241 rc.cpp:2241
 msgid ""
 "Let KTorrent calculate the recommended settings based upon the bandwidth you "
 "have available."
@@ -8375,230 +7736,19 @@
 
 #. i18n: file: ktorrent/pref/networkpref.ui:354
 #. i18n: ectx: property (text), widget (QPushButton, m_recommended_settings)
-#: obj-i686-linux-gnu/ktorrent/ui_networkpref.h:367 rc.cpp:1098 rc.cpp:1098
+#: rc.cpp:2244 rc.cpp:2244
 msgid "Recommended Settings..."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/proxypref.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:232 rc.cpp:1101 rc.cpp:1101
-msgid "HTTP"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:26
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useKDEProxySettings)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:234 rc.cpp:1104 rc.cpp:1104
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
-"style=\" font-size:8pt;\">Use the HTTP proxy settings configured in the "
-"settings of KDE.</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:29
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useKDEProxySettings)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:240 rc.cpp:1111 rc.cpp:1111
-msgid "Use KDE proxy settings"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:38
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:241 rc.cpp:1114 rc.cpp:1114
-msgid "Proxy:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:45
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_httpProxy)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:243 rc.cpp:1117 rc.cpp:1117
-msgid "IP address or hostname of the HTTP proxy to use. "
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:59
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_httpProxyPort)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:247 rc.cpp:1123 rc.cpp:1123
-msgid "Port of the HTTP proxy."
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:77
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useProxyForWebSeeds)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:250 rc.cpp:1126 rc.cpp:1126
-msgid "Whether or not to use the HTTP proxy for webseed connections."
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:80
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useProxyForWebSeeds)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:252 rc.cpp:1129 rc.cpp:1129
-msgid "Use proxy for webseed connections"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:90
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useProxyForTracker)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:254 rc.cpp:1132 rc.cpp:1132
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Whether or not to use the "
-"HTTP proxy for tracker connections.</p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:93
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useProxyForTracker)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:259 rc.cpp:1138 rc.cpp:1138
-msgid "Use proxy for tracker connections"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:103
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:260 rc.cpp:1141 rc.cpp:1141
-msgid "SOCKS"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:115
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_socksEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:262 rc.cpp:1144 rc.cpp:1144
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
-"style=\" font-size:8pt;\">Use a SOCKS proxy server for bittorrent "
-"connections.</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"></p>\n"
-"<p style=\" font-family:'OpenSymbol'; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Note: </span>This is not "
-"used for tracker connections</p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:118
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_socksEnabled)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:270 rc.cpp:1153 rc.cpp:1153
-msgid "Use a SOCKS proxy server:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:127
-#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:271 rc.cpp:1156 rc.cpp:1156
-msgid "Server:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:138
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_socksProxy)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:273 rc.cpp:1159 rc.cpp:1159
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
-"style=\" font-size:8pt;\">IP address or hostname of the SOCKS "
-"server</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:156
-#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_socksPort)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:281 rc.cpp:1169 rc.cpp:1169
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
-"style=\" font-size:8pt;\">Port used by the SOCKS "
-"server</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:163
-#. i18n: ectx: property (text), widget (QLabel, label_13)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:287 rc.cpp:1176 rc.cpp:1176
-msgid "Version:"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:175
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_socksUsePassword)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:289 rc.cpp:1179 rc.cpp:1179
-msgid ""
-"If the SOCKS server requires authentication via a username and a password, "
-"enable this box."
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:178
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_socksUsePassword)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:291 rc.cpp:1182 rc.cpp:1182
-msgid "Username and password required"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:200
-#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_socksUsername)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:294 rc.cpp:1188 rc.cpp:1188
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;\"><span "
-"style=\" font-size:8pt;\">Username for the SOCKS proxy "
-"server.</span></p></body></html>"
-msgstr ""
-
-#. i18n: file: ktorrent/pref/proxypref.ui:218
-#. i18n: ectx: property (toolTip), widget (KLineEdit, kcfg_socksPassword)
-#: obj-i686-linux-gnu/ktorrent/ui_proxypref.h:302 rc.cpp:1198 rc.cpp:1198
-msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
-"weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;\"><span "
-"style=\" font-size:8pt;\">Password for the SOCKS proxy "
-"server.</span></p></body></html>"
-msgstr ""
-
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:13
 #. i18n: ectx: property (windowTitle), widget (QWidget, RecommendedSettingsDlg)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:314 rc.cpp:1402
-#: rc.cpp:1402
+#: rc.cpp:2247 rc.cpp:2247
 msgid "Recommended Settings"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:26
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:315 rc.cpp:1405
-#: rc.cpp:1405
+#: rc.cpp:2250 rc.cpp:2250
 msgid "Available upload bandwidth:"
 msgstr ""
 
@@ -8610,9 +7760,7 @@
 #. i18n: ectx: property (specialValueText), widget (QSpinBox, m_upload_bw)
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:59
 #. i18n: ectx: property (specialValueText), widget (QSpinBox, m_download_bw)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:316
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:319 rc.cpp:1408
-#: rc.cpp:1417 rc.cpp:1408 rc.cpp:1417
+#: rc.cpp:2253 rc.cpp:2262 rc.cpp:2253 rc.cpp:2262
 msgid " Kbps"
 msgstr ""
 
@@ -8624,954 +7772,1251 @@
 #. i18n: ectx: property (suffix), widget (QSpinBox, m_upload_bw)
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:62
 #. i18n: ectx: property (suffix), widget (QSpinBox, m_download_bw)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:317
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:320 rc.cpp:1411
-#: rc.cpp:1420 rc.cpp:1411 rc.cpp:1420
+#: rc.cpp:2256 rc.cpp:2265 rc.cpp:2256 rc.cpp:2265
 msgid " kb/s"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:52
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:318 rc.cpp:1414
-#: rc.cpp:1414
+#: rc.cpp:2259 rc.cpp:2259
 msgid "Available download bandwidth:"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:78
 #. i18n: ectx: property (text), widget (QLabel, m_upload_bw_display)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:321 rc.cpp:1423
-#: rc.cpp:1423
+#: rc.cpp:2268 rc.cpp:2268
 msgid "(= 32 KiB/s)"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:85
 #. i18n: ectx: property (text), widget (QLabel, m_download_bw_display)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:322 rc.cpp:1426
-#: rc.cpp:1426
+#: rc.cpp:2271 rc.cpp:2271
 msgid "(= 500 KiB/s)"
 msgstr ""
 
 #. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:96
 #. i18n: ectx: property (text), widget (KPushButton, m_calculate)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:323 rc.cpp:1429
-#: rc.cpp:1429
+#: rc.cpp:2274 rc.cpp:2274
 msgid "Calculate"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:120
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:324 rc.cpp:1432
-#: rc.cpp:1432
-msgid "Preferences"
-msgstr "Hoffterau"
-
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:126
-#. i18n: ectx: property (text), widget (QCheckBox, m_chk_avg_speed_slot)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:325 rc.cpp:1435
-#: rc.cpp:1435
-msgid "Average speed per slot:"
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:120
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:2277 rc.cpp:2277
+msgid "Preferences"
+msgstr "Hoffterau"
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:126
+#. i18n: ectx: property (text), widget (QCheckBox, m_chk_avg_speed_slot)
+#: rc.cpp:2280 rc.cpp:2280
+msgid "Average speed per slot:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:149
+#. i18n: ectx: property (text), widget (QCheckBox, m_chk_sim_torrents)
+#: rc.cpp:2286 rc.cpp:2286
+msgid "Number of torrents you usually download simultaneously:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:169
+#. i18n: ectx: property (text), widget (QCheckBox, m_chk_slots)
+#: rc.cpp:2289 rc.cpp:2289
+msgid "Slots per torrent:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:192
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:2292 rc.cpp:2292
+msgid "Recommended settings:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:274
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#. i18n: file: ktorrent/pref/qmpref.ui:210
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:274
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#. i18n: file: ktorrent/pref/qmpref.ui:210
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:2313 rc.cpp:2610 rc.cpp:2313 rc.cpp:2610
+msgid "Number of upload slots:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:288
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#. i18n: file: ktorrent/pref/qmpref.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:288
+#. i18n: ectx: property (text), widget (QLabel, label_14)
+#. i18n: file: ktorrent/pref/qmpref.ui:35
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:2316 rc.cpp:2538 rc.cpp:2316 rc.cpp:2538
+msgid "Maximum downloads:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:302
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#. i18n: file: ktorrent/pref/qmpref.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:302
+#. i18n: ectx: property (text), widget (QLabel, label_17)
+#. i18n: file: ktorrent/pref/qmpref.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:2319 rc.cpp:2547 rc.cpp:2319 rc.cpp:2547
+msgid "Maximum seeds:"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:149
-#. i18n: ectx: property (text), widget (QCheckBox, m_chk_sim_torrents)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:327 rc.cpp:1441
-#: rc.cpp:1441
-msgid "Number of torrents you usually download simultaneously:"
+#. i18n: file: ktorrent/pref/btpref.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, dhtGroupBox)
+#: rc.cpp:2322 rc.cpp:2322
+msgid "Features"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:169
-#. i18n: ectx: property (text), widget (QCheckBox, m_chk_slots)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:328 rc.cpp:1444
-#: rc.cpp:1444
-msgid "Slots per torrent:"
+#. i18n: file: ktorrent/pref/btpref.ui:22
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_dhtSupport)
+#: rc.cpp:2325 rc.cpp:2325
+msgid ""
+"DHT is a trackerless protocol to find peers sharing the same torrents as you "
+"do."
 msgstr ""
 
-#. i18n: file: ktorrent/pref/recommendedsettingsdlg.ui:192
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/ktorrent/ui_recommendedsettingsdlg.h:329 rc.cpp:1447
-#: rc.cpp:1447
-msgid "Recommended settings:"
+#. i18n: file: ktorrent/pref/btpref.ui:25
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_dhtSupport)
+#: rc.cpp:2328 rc.cpp:2328
+msgid "Use DHT to get additional peers"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:21
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:193 rc.cpp:632 rc.cpp:632
-msgid "Found:"
+#. i18n: file: ktorrent/pref/btpref.ui:34
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:2331 rc.cpp:2331
+msgid "UDP port for DHT communications:"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:46
-#. i18n: ectx: property (toolTip), widget (QLabel, chunks_found)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:195 rc.cpp:635 rc.cpp:635
+#. i18n: file: ktorrent/pref/btpref.ui:47
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_dhtPort)
+#: rc.cpp:2334 rc.cpp:2334
 msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
-"were not downloaded but have been found anyway.</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;  font-size:9pt;\"><span "
+"style=\" font-size:8pt;\">UDP port to use for the DHT protocol.</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; \"><span style=\" font-"
+"weight:600;\">Attention:</span> If you are behind a router, this port needs "
+"to be forwarded to accept incoming DHT requests. The UPnP plugin can do this "
+"for you.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:52
-#. i18n: ectx: property (text), widget (QLabel, chunks_found)
-#. i18n: file: ktorrent/view/scanextender.ui:97
-#. i18n: ectx: property (text), widget (QLabel, chunks_failed)
-#. i18n: file: ktorrent/view/scanextender.ui:145
-#. i18n: ectx: property (text), widget (QLabel, chunks_not_downloaded)
-#. i18n: file: ktorrent/view/scanextender.ui:187
-#. i18n: ectx: property (text), widget (QLabel, chunks_downloaded)
-#. i18n: file: ktorrent/view/scanextender.ui:52
-#. i18n: ectx: property (text), widget (QLabel, chunks_found)
-#. i18n: file: ktorrent/view/scanextender.ui:97
-#. i18n: ectx: property (text), widget (QLabel, chunks_failed)
-#. i18n: file: ktorrent/view/scanextender.ui:145
-#. i18n: ectx: property (text), widget (QLabel, chunks_not_downloaded)
-#. i18n: file: ktorrent/view/scanextender.ui:187
-#. i18n: ectx: property (text), widget (QLabel, chunks_downloaded)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:200
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:208
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:216
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:224 rc.cpp:641 rc.cpp:653
-#: rc.cpp:665 rc.cpp:677 rc.cpp:641 rc.cpp:653 rc.cpp:665 rc.cpp:677
-msgid "0"
-msgstr "0"
+#. i18n: file: ktorrent/pref/btpref.ui:65
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_pexEnabled)
+#: rc.cpp:2343 rc.cpp:2343
+msgid "Whether or not to use µTorrent compatible peer exchange."
+msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:69
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:201 rc.cpp:644 rc.cpp:644
-msgid "Failed:"
+#. i18n: file: ktorrent/pref/btpref.ui:68
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_pexEnabled)
+#: rc.cpp:2346 rc.cpp:2346
+msgid "Use peer exchange"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:88
-#. i18n: ectx: property (toolTip), widget (QLabel, chunks_failed)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:203 rc.cpp:647 rc.cpp:647
+#. i18n: file: ktorrent/pref/btpref.ui:75
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_webseedsEnabled)
+#: rc.cpp:2349 rc.cpp:2349
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
-"have been downloaded, and which are not OK.</p></body></html>"
+"Enable or disable the use of webseeds when they are present in a torrent."
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:114
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:209 rc.cpp:656 rc.cpp:656
-msgid "Not downloaded:"
+#. i18n: file: ktorrent/pref/btpref.ui:78
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_webseedsEnabled)
+#: rc.cpp:2352 rc.cpp:2352
+msgid "Use webseeds"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:136
-#. i18n: ectx: property (toolTip), widget (QLabel, chunks_not_downloaded)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:211 rc.cpp:659 rc.cpp:659
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
-"have not been downloaded.</p></body></html>"
-msgstr ""
+#. i18n: file: ktorrent/pref/btpref.ui:90
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:2355 rc.cpp:2355
+msgid "Encryption"
+msgstr "Cêl-ysgrifaeth"
 
-#. i18n: file: ktorrent/view/scanextender.ui:178
-#. i18n: ectx: property (toolTip), widget (QLabel, chunks_downloaded)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:219 rc.cpp:671 rc.cpp:671
+#. i18n: file: ktorrent/pref/btpref.ui:100
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useEncryption)
+#: rc.cpp:2358 rc.cpp:2358
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
 "type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
-"size:8pt; font-weight:400; font-style:normal;\">\n"
+"</style></head><body>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">The number of chunks which "
-"have been downloaded, and which are OK.</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Protocol encryption is "
+"useful when your ISP is slowing down bittorrent connections. </p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">The encryption will "
+"prevent your bittorrent traffic to be flagged as bittorrent traffic, and so "
+"the ISP will not slow it down.</p></body></html>"
 msgstr ""
 
-#. i18n: file: ktorrent/view/scanextender.ui:242
-#. i18n: ectx: property (text), widget (QLabel, error_msg)
-#: obj-i686-linux-gnu/ktorrent/ui_scanextender.h:227 rc.cpp:686 rc.cpp:686
-msgid "Errors:"
+#. i18n: file: ktorrent/pref/btpref.ui:103
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useEncryption)
+#. i18n: file: libktcore/ktorrent.kcfg:148
+#. i18n: ectx: label, entry (useEncryption), group (downloads)
+#. i18n: file: ktorrent/pref/btpref.ui:103
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useEncryption)
+#. i18n: file: libktcore/ktorrent.kcfg:148
+#. i18n: ectx: label, entry (useEncryption), group (downloads)
+#: rc.cpp:2365 rc.cpp:2872 rc.cpp:2365 rc.cpp:2872
+msgid "Use protocol encryption"
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, UPnPTestWidget)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:164 rc.cpp:2920
-#: rc.cpp:2920
-msgid "UPnP Test Application"
+#. i18n: file: ktorrent/pref/btpref.ui:110
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_allowUnencryptedConnections)
+#: rc.cpp:2368 rc.cpp:2368
+msgid ""
+"Not all clients support encryption, and some people have encryption "
+"disabled. If you want to connect to those peers, you need to have this "
+"option enabled."
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:24
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:165 rc.cpp:2923
-#: rc.cpp:2923
-msgid "Router:"
+#. i18n: file: ktorrent/pref/btpref.ui:113
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowUnencryptedConnections)
+#. i18n: file: libktcore/ktorrent.kcfg:152
+#. i18n: ectx: label, entry (allowUnencryptedConnections), group (downloads)
+#. i18n: file: ktorrent/pref/btpref.ui:113
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_allowUnencryptedConnections)
+#. i18n: file: libktcore/ktorrent.kcfg:152
+#. i18n: ectx: label, entry (allowUnencryptedConnections), group (downloads)
+#: rc.cpp:2371 rc.cpp:2875 rc.cpp:2371 rc.cpp:2875
+msgid "Allow unencrypted connections"
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:40
-#. i18n: ectx: property (text), widget (QLabel, m_router)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:166 rc.cpp:2926
-#: rc.cpp:2926
-msgid "No routers found."
+#. i18n: file: ktorrent/pref/btpref.ui:123
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2374 rc.cpp:2374
+msgid "Tracker"
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, m_find_routers)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:167 rc.cpp:2929
-#: rc.cpp:2929
-msgid "Find Routers"
+#. i18n: file: ktorrent/pref/btpref.ui:129
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useCustomIP)
+#: rc.cpp:2377 rc.cpp:2377
+msgid ""
+"Instead of allowing the tracker to determine your IP address, tell the "
+"tracker which IP address to use. Use this when you are behind a proxy."
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:89
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:169 rc.cpp:2935
-#: rc.cpp:2935
-msgid "Protocol:"
+#. i18n: file: ktorrent/pref/btpref.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useCustomIP)
+#: rc.cpp:2380 rc.cpp:2380
+msgid "Send the tracker a custom IP address or hostname"
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:97
-#. i18n: ectx: property (text), item, widget (QComboBox, m_protocol)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:172 rc.cpp:2938
-#: rc.cpp:2938
-msgid "UDP"
+#. i18n: file: ktorrent/pref/btpref.ui:141
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2383 rc.cpp:2383
+msgid "Custom IP address or hostname:"
 msgstr ""
 
-#. i18n: file: ktupnptest/upnptestwidget.ui:139
-#. i18n: ectx: property (text), widget (QCheckBox, m_verbose)
-#: obj-i686-linux-gnu/ktupnptest/ui_upnptestwidget.h:177 rc.cpp:2950
-#: rc.cpp:2950
-msgid "Verbose mode"
+#. i18n: file: ktorrent/pref/btpref.ui:148
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_customIP)
+#: rc.cpp:2386 rc.cpp:2386
+msgid ""
+"Custom IP address or hostname to send to the tracker. Hostnames will be "
+"resolved at runtime and the resolved IP address will be sent to the tracker."
 msgstr ""
 
-#. i18n: file: plasma/applet/appletconfig.ui:21
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: obj-i686-linux-gnu/plasma/applet/ui_appletconfig.h:74 rc.cpp:8 rc.cpp:8
-msgid "Torrent to display:"
+#. i18n: file: ktorrent/pref/btpref.ui:162
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2389 rc.cpp:2389
+msgid "Data Checking"
 msgstr ""
 
-#: rc.cpp:1 rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Sam Adam Day"
-
-#: rc.cpp:2 rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,,me@samadamday.com"
-
-#. i18n: file: libktcore/ktorrent.kcfg:10
-#. i18n: ectx: label, entry (maxDownloads), group (downloads)
-#: rc.cpp:11 rc.cpp:11
-msgid "Maximum number of downloads (0 = no limit)"
+#. i18n: file: ktorrent/pref/btpref.ui:176
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_doUploadDataCheck)
+#: rc.cpp:2392 rc.cpp:2392
+msgid ""
+"During uploading when a chunk is loaded into memory automatically recheck "
+"this chunk, to see if it still is OK."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:15
-#. i18n: ectx: label, entry (maxSeeds), group (downloads)
-#: rc.cpp:14 rc.cpp:14
-msgid "Maximum number of seeds (0 = no limit)"
+#. i18n: file: ktorrent/pref/btpref.ui:179
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_doUploadDataCheck)
+#: rc.cpp:2395 rc.cpp:2395
+msgid "Recheck chunks during uploading"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:20
-#. i18n: ectx: label, entry (startDownloadsOnLowDiskSpace), group (downloads)
-#: rc.cpp:17 rc.cpp:17
-msgid "Start downloads on low disk space?"
+#. i18n: file: ktorrent/pref/btpref.ui:186
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useMaxSizeForUploadDataCheck)
+#: rc.cpp:2398 rc.cpp:2398
+msgid ""
+"Because rechecking big chunks can take a lot of time, the recheck can be "
+"disabled when the chunks are bigger then a certain size."
+msgstr ""
+
+#. i18n: file: ktorrent/pref/btpref.ui:189
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useMaxSizeForUploadDataCheck)
+#: rc.cpp:2401 rc.cpp:2401
+msgid "Do not recheck when chunks are bigger than"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:25
-#. i18n: ectx: label, entry (maxConnections), group (downloads)
-#: rc.cpp:20 rc.cpp:20
-msgid "Maximum number of connections per torrent (0 = no limit)"
+#. i18n: file: ktorrent/pref/btpref.ui:196
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_maxSizeForUploadDataCheck)
+#: rc.cpp:2404 rc.cpp:2404
+msgid "The maximum size a chunk can be for rechecking during uploading."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:30
-#. i18n: ectx: label, entry (maxTotalConnections), group (downloads)
-#: rc.cpp:23 rc.cpp:23
-msgid "Maximum number of connections for all torrents (0 = no limit) "
+#. i18n: file: ktorrent/pref/btpref.ui:215
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_autoRecheck)
+#: rc.cpp:2410 rc.cpp:2410
+msgid ""
+"Automatically do a full data check when we find to many corrupted chunks."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:35
-#. i18n: ectx: label, entry (maxUploadRate), group (downloads)
-#: rc.cpp:26 rc.cpp:26
-msgid "Maximum upload speed in KiB/sec (0 = no limit)"
+#. i18n: file: ktorrent/pref/btpref.ui:218
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoRecheck)
+#: rc.cpp:2413 rc.cpp:2413
+msgid "Do a full data check after "
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:40
-#. i18n: ectx: label, entry (maxDownloadRate), group (downloads)
-#: rc.cpp:29 rc.cpp:29
-msgid "Maximum download speed in KiB/sec (0 = no limit)"
+#. i18n: file: ktorrent/pref/btpref.ui:237
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_maxCorruptedBeforeRecheck)
+#: rc.cpp:2416 rc.cpp:2416
+msgid "The number of corrupted chunks before a full data check is done"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:45
-#. i18n: ectx: label, entry (maxRatio), group (downloads)
-#: rc.cpp:32 rc.cpp:32
-msgid "Maximum share ratio (0 = no limit)"
+#. i18n: file: ktorrent/pref/btpref.ui:253
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_checkWhenFinished)
+#: rc.cpp:2419 rc.cpp:2419
+msgid ""
+"When a torrent has finished downloading, do a full data check on the torrent."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:66
-#. i18n: ectx: label, entry (showSystemTrayIcon), group (downloads)
-#: rc.cpp:41 rc.cpp:41
-msgid "Show a system tray icon"
+#. i18n: file: ktorrent/pref/btpref.ui:256
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_checkWhenFinished)
+#: rc.cpp:2422 rc.cpp:2422
+msgid "Check data when download is finished"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:70
-#. i18n: ectx: label, entry (showSpeedBarInTrayIcon), group (downloads)
-#: rc.cpp:44 rc.cpp:44
-msgid "Show speed bar in tray icon"
+#. i18n: file: ktorrent/pref/proxypref.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:2425 rc.cpp:2425
+msgid "HTTP"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:74
-#. i18n: ectx: label, entry (downloadBandwidth), group (downloads)
-#: rc.cpp:47 rc.cpp:47
-msgid "Download bandwidth (in kb/s):"
+#. i18n: file: ktorrent/pref/proxypref.ui:26
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useKDEProxySettings)
+#: rc.cpp:2428 rc.cpp:2428
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
+"style=\" font-size:8pt;\">Use the HTTP proxy settings configured in the "
+"settings of KDE.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:80
-#. i18n: ectx: label, entry (uploadBandwidth), group (downloads)
-#: rc.cpp:50 rc.cpp:50
-msgid "Upload bandwidth (in kb/s):"
+#. i18n: file: ktorrent/pref/proxypref.ui:29
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useKDEProxySettings)
+#: rc.cpp:2435 rc.cpp:2435
+msgid "Use KDE proxy settings"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:86
-#. i18n: ectx: label, entry (showPopups), group (downloads)
-#: rc.cpp:53 rc.cpp:53
-msgid "Show popup messages when torrent is finished."
+#. i18n: file: ktorrent/pref/proxypref.ui:38
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:2438 rc.cpp:2438
+msgid "Proxy:"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:90
-#. i18n: ectx: label, entry (keepSeeding), group (downloads)
-#: rc.cpp:56 rc.cpp:56
-msgid "Keep seeding after download has finished"
+#. i18n: file: ktorrent/pref/proxypref.ui:45
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_httpProxy)
+#: rc.cpp:2441 rc.cpp:2441
+msgid "IP address or hostname of the HTTP proxy to use. "
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:94
-#. i18n: ectx: label, entry (tempDir), group (downloads)
-#: rc.cpp:59 rc.cpp:59
-msgid "Folder to store temporary files"
+#. i18n: file: ktorrent/pref/proxypref.ui:59
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_httpProxyPort)
+#: rc.cpp:2447 rc.cpp:2447
+msgid "Port of the HTTP proxy."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:97
-#. i18n: ectx: label, entry (useSaveDir), group (downloads)
-#: rc.cpp:62 rc.cpp:62
-msgid "Whether to automatically save downloads to saveDir"
+#. i18n: file: ktorrent/pref/proxypref.ui:77
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useProxyForWebSeeds)
+#: rc.cpp:2450 rc.cpp:2450
+msgid "Whether or not to use the HTTP proxy for webseed connections."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:101
-#. i18n: ectx: label, entry (saveDir), group (downloads)
-#: rc.cpp:65 rc.cpp:65
-msgid "Folder to store downloaded files"
+#. i18n: file: ktorrent/pref/proxypref.ui:80
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useProxyForWebSeeds)
+#: rc.cpp:2453 rc.cpp:2453
+msgid "Use proxy for webseed connections"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:104
-#. i18n: ectx: label, entry (useTorrentCopyDir), group (downloads)
-#: rc.cpp:68 rc.cpp:68
-msgid "Whether to automatically copy .torrent files to torrentCopyDir"
+#. i18n: file: ktorrent/pref/proxypref.ui:90
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useProxyForTracker)
+#: rc.cpp:2456 rc.cpp:2456
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Whether or not to use the "
+"HTTP proxy for tracker connections.</p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:108
-#. i18n: ectx: label, entry (torrentCopyDir), group (downloads)
-#: rc.cpp:71 rc.cpp:71
-msgid "Folder to copy .torrent files to"
+#. i18n: file: ktorrent/pref/proxypref.ui:93
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useProxyForTracker)
+#: rc.cpp:2462 rc.cpp:2462
+msgid "Use proxy for tracker connections"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:111
-#. i18n: ectx: label, entry (useCustomIP), group (downloads)
-#: rc.cpp:74 rc.cpp:74
-msgid "Whether to use a custom IP to pass to the tracker"
+#. i18n: file: ktorrent/pref/proxypref.ui:103
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2465 rc.cpp:2465
+msgid "SOCKS"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:115
-#. i18n: ectx: label, entry (lastSaveDir), group (downloads)
-#: rc.cpp:77 rc.cpp:77
-msgid "Directory which was used as the last save directory"
+#. i18n: file: ktorrent/pref/proxypref.ui:115
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_socksEnabled)
+#: rc.cpp:2468 rc.cpp:2468
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
+"style=\" font-size:8pt;\">Use a SOCKS proxy server for bittorrent "
+"connections.</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" font-family:'OpenSymbol'; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"><span style=\" font-weight:600;\">Note: </span>This is not "
+"used for tracker connections</p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:119
-#. i18n: ectx: label, entry (customIP), group (downloads)
-#: rc.cpp:80 rc.cpp:80
-msgid "IP to pass to the tracker"
+#. i18n: file: ktorrent/pref/proxypref.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_socksEnabled)
+#: rc.cpp:2477 rc.cpp:2477
+msgid "Use a SOCKS proxy server:"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:123
-#. i18n: ectx: label, entry (guiUpdateInterval), group (downloads)
-#: rc.cpp:83 rc.cpp:83
-msgid "GUI update interval"
+#. i18n: file: ktorrent/pref/proxypref.ui:127
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:2480 rc.cpp:2480
+msgid "Server:"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:129
-#. i18n: ectx: label, entry (dhtSupport), group (downloads)
-#: rc.cpp:86 rc.cpp:86
-msgid "Support for DHT"
+#. i18n: file: ktorrent/pref/proxypref.ui:138
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_socksProxy)
+#: rc.cpp:2483 rc.cpp:2483
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
+"style=\" font-size:8pt;\">IP address or hostname of the SOCKS "
+"server</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:133
-#. i18n: ectx: label, entry (dhtPort), group (downloads)
-#: rc.cpp:89 rc.cpp:89
-msgid "DHT port"
+#. i18n: file: ktorrent/pref/proxypref.ui:156
+#. i18n: ectx: property (toolTip), widget (QSpinBox, kcfg_socksPort)
+#: rc.cpp:2493 rc.cpp:2493
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
+"style=\" font-size:8pt;\">Port used by the SOCKS "
+"server</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:142
-#. i18n: ectx: label, entry (numUploadSlots), group (downloads)
-#: rc.cpp:92 rc.cpp:92
-msgid "Number of upload slots"
+#. i18n: file: ktorrent/pref/proxypref.ui:163
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#: rc.cpp:2500 rc.cpp:2500
+msgid "Version:"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:192
-#. i18n: ectx: label, entry (shownColumns), group (downloads)
-#: rc.cpp:101 rc.cpp:101
-msgid "Columns shown in KTorrentView"
+#. i18n: file: ktorrent/pref/proxypref.ui:175
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_socksUsePassword)
+#: rc.cpp:2503 rc.cpp:2503
+msgid ""
+"If the SOCKS server requires authentication via a username and a password, "
+"enable this box."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:237
-#. i18n: ectx: label, entry (eta), group (downloads)
-#: rc.cpp:104 rc.cpp:104
-msgid "Algorithm to estimate the time when a torrent is finished"
+#. i18n: file: ktorrent/pref/proxypref.ui:178
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_socksUsePassword)
+#: rc.cpp:2506 rc.cpp:2506
+msgid "Username and password required"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:249
-#. i18n: ectx: label, entry (minDiskSpace), group (downloads)
-#: rc.cpp:107 rc.cpp:107
+#. i18n: file: ktorrent/pref/proxypref.ui:200
+#. i18n: ectx: property (toolTip), widget (QLineEdit, kcfg_socksUsername)
+#: rc.cpp:2512 rc.cpp:2512
 msgid ""
-"When there is no space left to complete download, and the available disk "
-"space is less than this value, the torrent will be stopped."
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;\"><span "
+"style=\" font-size:8pt;\">Username for the SOCKS proxy "
+"server.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:260
-#. i18n: ectx: label, entry (useCompletedDir), group (downloads)
-#: rc.cpp:110 rc.cpp:110
-msgid "Whether to automatically move completed downloads to completedDir"
+#. i18n: file: ktorrent/pref/proxypref.ui:218
+#. i18n: ectx: property (toolTip), widget (KLineEdit, kcfg_socksPassword)
+#: rc.cpp:2522 rc.cpp:2522
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;\"><span "
+"style=\" font-size:8pt;\">Password for the SOCKS proxy "
+"server.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:264
-#. i18n: ectx: label, entry (completedDir), group (downloads)
-#: rc.cpp:113 rc.cpp:113
-msgid "Folder to move completed downloaded files to"
+#. i18n: file: ktorrent/pref/qmpref.ui:17
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_manuallyControlTorrents)
+#: rc.cpp:2529 rc.cpp:2529
+msgid ""
+"When enabled, the queue manager will be totally disabled, allowing you to "
+"fully control all torrents manually."
 msgstr ""
 
-#. i18n: file: libktcore/ktorrent.kcfg:267
-#. i18n: ectx: label, entry (maxSeedTime), group (downloads)
-#: rc.cpp:116 rc.cpp:116
-msgid "Maximum seed time in hours (0 = no limit)"
+#. i18n: file: ktorrent/pref/qmpref.ui:20
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_manuallyControlTorrents)
+#: rc.cpp:2532 rc.cpp:2532
+msgid "Control torrents manually"
 msgstr ""
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:24
-#. i18n: ectx: Menu (GroupsMenu)
-#: rc.cpp:465 rc.cpp:465
-msgid "Groups"
+#. i18n: file: ktorrent/pref/qmpref.ui:42
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_maxDownloads)
+#: rc.cpp:2541 rc.cpp:2541
+msgid ""
+"The maximum number of simultaneous downloads the queue manager will run."
 msgstr ""
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:37
-#. i18n: ectx: Menu (ViewMenu)
-#: rc.cpp:468 rc.cpp:468
-msgid "View"
+#. i18n: file: ktorrent/pref/qmpref.ui:62
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_maxSeeds)
+#: rc.cpp:2550 rc.cpp:2550
+msgid "The maximum number of simultaneous seeds the queue manager will run."
 msgstr ""
 
-#. i18n: file: ktorrent/kttorrentactivityui.rc:69
-#. i18n: ectx: Menu (ColumnsMenu)
-#: rc.cpp:477 rc.cpp:477
-msgid "Configure Columns"
+#. i18n: file: ktorrent/pref/qmpref.ui:75
+#. i18n: ectx: property (text), widget (QLabel, label_12)
+#: rc.cpp:2556 rc.cpp:2556
+msgid "When diskspace is running low:"
 msgstr ""
 
-#. i18n: file: ktorrent/ktorrentui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:536 rc.cpp:536
-msgid "&File"
+#. i18n: file: ktorrent/pref/qmpref.ui:82
+#. i18n: ectx: property (toolTip), widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
+#: rc.cpp:2559 rc.cpp:2559
+msgid ""
+"What to do when the diskspace is running low and the queue manager wants to "
+"start a torrent."
 msgstr ""
 
-#. i18n: file: ktorrent/ktorrentui.rc:16
-#. i18n: ectx: Menu (view)
-#: rc.cpp:539 rc.cpp:539
-msgid "&View"
+#. i18n: file: ktorrent/pref/qmpref.ui:86
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
+#: rc.cpp:2562 rc.cpp:2562
+msgid "Don't start torrents"
 msgstr ""
 
-#. i18n: file: ktorrent/ktorrentui.rc:25
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:542 rc.cpp:542
-msgid "Main"
+#. i18n: file: ktorrent/pref/qmpref.ui:91
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
+#: rc.cpp:2565 rc.cpp:2565
+msgid "Ask if torrents can be started"
 msgstr ""
 
-#. i18n: file: ktorrent/pref/qmpref.ui:194
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:797 rc.cpp:797
-msgctxt "@title:group Options regarging Seeding"
-msgid "Seeding"
+#. i18n: file: ktorrent/pref/qmpref.ui:96
+#. i18n: ectx: property (text), item, widget (QComboBox, kcfg_startDownloadsOnLowDiskSpace)
+#: rc.cpp:2568 rc.cpp:2568
+msgid "Start torrents"
 msgstr ""
 
-#. i18n: file: plugins/stats/Spd.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, SpdWgt)
-#: rc.cpp:1543 rc.cpp:1543
-msgctxt "@title:window"
-msgid "Speed"
+#. i18n: file: ktorrent/pref/qmpref.ui:104
+#. i18n: ectx: property (text), widget (QLabel, label_13)
+#: rc.cpp:2571 rc.cpp:2571
+msgid "Stop torrents when free disk space is lower than:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:10
-#. i18n: ectx: label, entry (UpdateEveryGuiUpdates), group (general)
-#: rc.cpp:1555 rc.cpp:1555
-msgid "Update charts every n gui updates"
+#. i18n: file: ktorrent/pref/qmpref.ui:111
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_minDiskSpace)
+#: rc.cpp:2574 rc.cpp:2574
+msgid ""
+"When the free diskspace drops below this value, stop all torrents "
+"downloading."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:15
-#. i18n: ectx: label, entry (DataGatherIval), group (general)
-#: rc.cpp:1558 rc.cpp:1558
-msgid "Interval in milliseconds between data gathering"
+#. i18n: file: ktorrent/pref/qmpref.ui:114
+#. i18n: ectx: property (suffix), widget (KIntSpinBox, kcfg_minDiskSpace)
+#: rc.cpp:2577 rc.cpp:2577
+msgid " MiB"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:20
-#. i18n: ectx: label, entry (MaxMode), group (general)
-#: rc.cpp:1561 rc.cpp:1561
-msgid "Method of determining maximum value of the scale"
+#. i18n: file: ktorrent/pref/qmpref.ui:137
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_decreasePriorityOfStalledTorrents)
+#: rc.cpp:2580 rc.cpp:2580
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-size:8pt; font-weight:400; font-"
+"style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">With this enabled, the "
+"queue manager will decrease the priority of a torrent which has been stalled "
+"for too long. </p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">This will allow the queue "
+"manager to run other torrents, when a torrent is doing "
+"nothing.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:25
-#. i18n: ectx: label, entry (ShowSeedsInSwarms), group (general)
-#: rc.cpp:1564 rc.cpp:1564
-msgid "Whether to show seeds in swarms"
+#. i18n: file: ktorrent/pref/qmpref.ui:140
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_decreasePriorityOfStalledTorrents)
+#: rc.cpp:2588 rc.cpp:2588
+msgid "Decrease priority of torrents which are stalled for too long"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:30
-#. i18n: ectx: label, entry (ShowLeechersInSwarms), group (general)
-#: rc.cpp:1567 rc.cpp:1567
-msgid "Whether to show leachers in swarms"
+#. i18n: file: ktorrent/pref/qmpref.ui:149
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2591 rc.cpp:2591
+msgid "Stalled timer:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:35
-#. i18n: ectx: label, entry (DlSpdSamples), group (general)
-#: rc.cpp:1570 rc.cpp:1570
-msgid "Samples to show on download chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:160
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_stallTimer)
+#: rc.cpp:2594 rc.cpp:2594
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Bitstream Vera "
+"Sans';\">Time used for the stall timer. When a torrent is stalled longer "
+"than this, its priority will be decreased.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:40
-#. i18n: ectx: label, entry (PeersSpdSamples), group (general)
-#: rc.cpp:1573 rc.cpp:1573
-msgid "Samples to show on peers chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:194
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2601 rc.cpp:2601
+msgctxt "@title:group Options regarging Seeding"
+msgid "Seeding"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:45
-#. i18n: ectx: label, entry (UlSpdSamples), group (general)
-#: rc.cpp:1576 rc.cpp:1576
-msgid "Samples to show on upload chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:200
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_keepSeeding)
+#: rc.cpp:2604 rc.cpp:2604
+msgid ""
+"When a download is finished, continue seeding it. If this is disabled, the "
+"torrent will be stopped."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:50
-#. i18n: ectx: label, entry (ConnsSamples), group (general)
-#: rc.cpp:1579 rc.cpp:1579
-msgid "Samples to show on connections chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:203
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_keepSeeding)
+#: rc.cpp:2607 rc.cpp:2607
+msgid "Keep seeding after download is finished"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:55
-#. i18n: ectx: label, entry (DhtSpdSamples), group (general)
-#: rc.cpp:1582 rc.cpp:1582
-msgid "Samples to show on DHT chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:217
+#. i18n: ectx: property (toolTip), widget (KIntSpinBox, kcfg_numUploadSlots)
+#: rc.cpp:2613 rc.cpp:2613
+msgid ""
+"The number of upload slots, this determines the number of peers you can "
+"upload to simultaneously for one torrent."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:60
-#. i18n: ectx: label, entry (DlSpdColor), group (general)
-#: rc.cpp:1585 rc.cpp:1585
-msgid "Color of the speed on dl chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:233
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:2616 rc.cpp:2616
+msgid "Default maximum share ratio:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:65
-#. i18n: ectx: label, entry (DlAvgColor), group (general)
-#: rc.cpp:1588 rc.cpp:1588
-msgid "Color of the average on dl chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:246
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_maxRatio)
+#: rc.cpp:2619 rc.cpp:2619
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;\"><span "
+"style=\" font-size:8pt;\">The maximum share ratio, if this value is reached "
+"seeding will be stopped. This is only applied to newly opened torrents, "
+"existing torrents will not be affected by changing this.</span></p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"weight:600;\">Attention: </span>This is not used when downloading, only when "
+"seeding.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:70
-#. i18n: ectx: label, entry (DlLimitColor), group (general)
-#: rc.cpp:1591 rc.cpp:1591
-msgid "Color of the limit on dl chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:262
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:2631 rc.cpp:2631
+msgid "Default maximum seed time:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:75
-#. i18n: ectx: label, entry (PrAvgFromLColor), group (general)
-#: rc.cpp:1594 rc.cpp:1594
-msgid "Color of the avg from leecher on peers chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:269
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_maxSeedTime)
+#: rc.cpp:2634 rc.cpp:2634
+msgid ""
+"The maximum seed time in hours. Once you reach this time, the torrent will "
+"be stopped. This is only applied to newly opened torrents, existing torrents "
+"will not be affected by changing this."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:80
-#. i18n: ectx: label, entry (PrAvgToLColor), group (general)
-#: rc.cpp:1597 rc.cpp:1597
-msgid "Color of the avg to leecher on peers chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:288
+#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
+#. i18n: file: ktorrent/pref/qmpref.ui:298
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_greenRatio)
+#. i18n: file: ktorrent/pref/qmpref.ui:288
+#. i18n: ectx: property (toolTip), widget (QLabel, label_2)
+#. i18n: file: ktorrent/pref/qmpref.ui:298
+#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, kcfg_greenRatio)
+#: rc.cpp:2640 rc.cpp:2646 rc.cpp:2640 rc.cpp:2646
+msgid ""
+"Value at which the share ratio will be displayed with a green color. Lower "
+"ratios will be displayed in red."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:85
-#. i18n: ectx: label, entry (PrAvgFromSColor), group (general)
-#: rc.cpp:1600 rc.cpp:1600
-msgid "Color of the avg from seeds on peers chart"
+#. i18n: file: ktorrent/pref/qmpref.ui:291
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:2643 rc.cpp:2643
+msgid "Minimum good share ratio:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:90
-#. i18n: ectx: label, entry (PrFromLColor), group (general)
-#: rc.cpp:1603 rc.cpp:1603
-msgid "Color of the leechers on peers chart"
-msgstr ""
+#. i18n: file: ktorrent/pref/generalpref.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:2652 rc.cpp:2652
+msgid "Folders"
+msgstr "Plygyll"
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:95
-#. i18n: ectx: label, entry (PrFromSColor), group (general)
-#: rc.cpp:1606 rc.cpp:1606
-msgid "Color of the seeds on peers chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2655 rc.cpp:2655
+msgid "Folder to store torrent information:"
+msgstr ""
+
+#. i18n: file: ktorrent/pref/generalpref.ui:30
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_tempDir)
+#: rc.cpp:2658 rc.cpp:2658
+msgid ""
+"Directory to store information about all torrents currently opened in "
+"KTorrent."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:100
-#. i18n: ectx: label, entry (UlSpdColor), group (general)
-#: rc.cpp:1609 rc.cpp:1609
-msgid "Color of the speed on upload chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:37
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useSaveDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:47
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_saveDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:37
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useSaveDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:47
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_saveDir)
+#: rc.cpp:2661 rc.cpp:2667 rc.cpp:2661 rc.cpp:2667
+msgid "Directory to use as a default save location for all data."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:105
-#. i18n: ectx: label, entry (UlAvgColor), group (general)
-#: rc.cpp:1612 rc.cpp:1612
-msgid "Color of the avg on upload chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:54
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useCompletedDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:64
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_completedDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:54
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useCompletedDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:64
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_completedDir)
+#: rc.cpp:2670 rc.cpp:2676 rc.cpp:2670 rc.cpp:2676
+msgid "Directory to move data to when a torrent has finished downloading."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:110
-#. i18n: ectx: label, entry (UlLimitColor), group (general)
-#: rc.cpp:1615 rc.cpp:1615
-msgid "Color of the limit on upload chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:57
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useCompletedDir)
+#: rc.cpp:2673 rc.cpp:2673
+msgid "Move completed downloads to:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:115
-#. i18n: ectx: label, entry (CnLConnColor), group (general)
-#: rc.cpp:1618 rc.cpp:1618
-msgid "Color of the connected leechers on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:71
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useTorrentCopyDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:81
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_torrentCopyDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:71
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_useTorrentCopyDir)
+#. i18n: file: ktorrent/pref/generalpref.ui:81
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, kcfg_torrentCopyDir)
+#: rc.cpp:2679 rc.cpp:2685 rc.cpp:2679 rc.cpp:2685
+msgid "Directory to copy all torrent files in, which are opened by KTorrent."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:120
-#. i18n: ectx: label, entry (CnLSwarmsColor), group (general)
-#: rc.cpp:1621 rc.cpp:1621
-msgid "Color of the leechers in swarms on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:74
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_useTorrentCopyDir)
+#: rc.cpp:2682 rc.cpp:2682
+msgid "Copy torrent files to:"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:125
-#. i18n: ectx: label, entry (CnSConnColor), group (general)
-#: rc.cpp:1624 rc.cpp:1624
-msgid "Color of the connected seeds on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:91
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:2688 rc.cpp:2688
+msgid "System Tray Icon"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:130
-#. i18n: ectx: label, entry (CnSSwarmsColor), group (general)
-#: rc.cpp:1627 rc.cpp:1627
-msgid "Color of the seeds in swarms on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:97
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showSystemTrayIcon)
+#: rc.cpp:2691 rc.cpp:2691
+msgid "Whether or not to show an icon in the system tray."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:135
-#. i18n: ectx: label, entry (CnAvgLConnPerTorrColor), group (general)
-#: rc.cpp:1630 rc.cpp:1630
-msgid "Color of the avg connected leecher per torrent on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showSystemTrayIcon)
+#: rc.cpp:2694 rc.cpp:2694
+msgid "Show system tray icon"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:140
-#. i18n: ectx: label, entry (CnAvgSConnPerTorrColor), group (general)
-#: rc.cpp:1633 rc.cpp:1633
-msgid "Color of the avg connected seeds per torrent on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:107
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_showPopups)
+#: rc.cpp:2697 rc.cpp:2697
+msgid "Whether or not to show system tray popup messages."
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:145
-#. i18n: ectx: label, entry (CnAvgLConnPerRunTorrColor), group (general)
-#: rc.cpp:1636 rc.cpp:1636
-msgid ""
-"Color of the avg connected leechers per running torrent on connections chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:110
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_showPopups)
+#: rc.cpp:2700 rc.cpp:2700
+msgid "Show system tray popup messages"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:150
-#. i18n: ectx: label, entry (CnAvgSConnPerRunTorrColor), group (general)
-#: rc.cpp:1639 rc.cpp:1639
+#. i18n: file: ktorrent/pref/generalpref.ui:129
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openMultipleTorrentsSilently)
+#: rc.cpp:2706 rc.cpp:2706
 msgid ""
-"Color of the avg connected seeds per running torrent on connections chart"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">When you select multiple "
+"torrents to be opened at the same time, open them silently.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:155
-#. i18n: ectx: label, entry (DhtNodesColor), group (general)
-#: rc.cpp:1642 rc.cpp:1642
-msgid "Color of the nodes on DHT chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openMultipleTorrentsSilently)
+#: rc.cpp:2712 rc.cpp:2712
+msgid "Open multiple torrents silently"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:160
-#. i18n: ectx: label, entry (DhtTasksColor), group (general)
-#: rc.cpp:1645 rc.cpp:1645
-msgid "Color of the tasks on DHT chart"
+#. i18n: file: ktorrent/pref/generalpref.ui:143
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_openAllTorrentsSilently)
+#: rc.cpp:2715 rc.cpp:2715
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'OpenSymbol'; font-size:8pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'Bitstream Vera Sans';\">Open all torrents "
+"silently.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:165
-#. i18n: ectx: label, entry (AntiAliasing), group (general)
-#: rc.cpp:1648 rc.cpp:1648
-msgid "Use anti aliasing on charts?"
+#. i18n: file: ktorrent/pref/generalpref.ui:146
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_openAllTorrentsSilently)
+#: rc.cpp:2722 rc.cpp:2722
+msgid "Open all torrents silently"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:170
-#. i18n: ectx: label, entry (DrawBgdGrid), group (general)
-#: rc.cpp:1651 rc.cpp:1651
-msgid "Draw ugly grey background grid?"
+#. i18n: file: ktorrent/pref/generalpref.ui:156
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_suppressSleep)
+#: rc.cpp:2725 rc.cpp:2725
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Bitstream Vera Sans'; font-"
+"size:8pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Prevent computer from "
+"going into a sleep state when torrents are running.</p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/stats/ktstatsplugin.kcfg:175
-#. i18n: ectx: label, entry (WidgetType), group (general)
-#: rc.cpp:1654 rc.cpp:1654
-msgid "Type of widget used for chart drawing"
+#. i18n: file: ktorrent/pref/generalpref.ui:159
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_suppressSleep)
+#: rc.cpp:2731 rc.cpp:2731
+msgid "Suppress sleep when torrents are running"
 msgstr ""
 
-#. i18n: file: plugins/shutdown/ktshutdownpluginui.rc:11
-#. i18n: ectx: ToolBar (ShutdownToolBar)
-#: rc.cpp:2027 rc.cpp:2027
-msgid "Shutdown Toolbar"
+#. i18n: file: ktorrent/pref/generalpref.ui:172
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_autoRenameSingleFileTorrents)
+#: rc.cpp:2734 rc.cpp:2734
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Rename a single file "
+"torrent with the name of its only file. </p>\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">If for example the file is "
+"named <span style=\" font-weight:600;\">linux-desktop.iso</span>, the "
+"torrent will be displayed as <span style=\" font-weight:600;\">linux-"
+"desktop.</span></p></body></html>"
 msgstr ""
 
-#. i18n: file: plugins/upnp/ktupnpplugin.kcfg:10
-#. i18n: ectx: label, entry (defaultDevice), group (general)
-#: rc.cpp:2039 rc.cpp:2039
-msgid "Default UPnP device to use"
+#. i18n: file: ktorrent/pref/generalpref.ui:175
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_autoRenameSingleFileTorrents)
+#: rc.cpp:2743 rc.cpp:2743
+msgid "Rename single file torrents with the name its only file"
 msgstr ""
 
-#. i18n: file: plugins/syndication/ktsyndicationpluginui.rc:4
-#. i18n: ectx: ToolBar (SyndicationToolBar)
-#: rc.cpp:2081 rc.cpp:2081
-msgid "Syndication Toolbar"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:24
+#. i18n: ectx: Menu (GroupsMenu)
+#: rc.cpp:2749 rc.cpp:2749
+msgid "Groups"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/ktinfowidgetplugin.kcfg:10
-#. i18n: ectx: label, entry (showPeerView), group (general)
-#: rc.cpp:2298 rc.cpp:2298
-msgid "Show peer view tab in main window"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:37
+#. i18n: ectx: Menu (ViewMenu)
+#: rc.cpp:2752 rc.cpp:2752
+msgid "View"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/ktinfowidgetplugin.kcfg:14
-#. i18n: ectx: label, entry (showChunkView), group (general)
-#: rc.cpp:2301 rc.cpp:2301
-msgid "Show chunk download view tab in main window"
+#. i18n: file: ktorrent/kttorrentactivityui.rc:69
+#. i18n: ectx: Menu (ColumnsMenu)
+#: rc.cpp:2761 rc.cpp:2761
+msgid "Configure Columns"
 msgstr ""
 
-#. i18n: file: plugins/infowidget/ktinfowidgetplugin.kcfg:18
-#. i18n: ectx: label, entry (showTrackersView), group (general)
-#: rc.cpp:2304 rc.cpp:2304
-msgid "Show trackers view tab in main window"
+#. i18n: file: libktcore/ktorrent.kcfg:10
+#. i18n: ectx: label, entry (maxDownloads), group (downloads)
+#: rc.cpp:2788 rc.cpp:2788
+msgid "Maximum number of downloads (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/search/ktsearchpluginui.rc:3
-#. i18n: ectx: ToolBar (SearchToolBar)
-#: rc.cpp:2425 rc.cpp:2425
-msgid "Search Toolbar"
+#. i18n: file: libktcore/ktorrent.kcfg:15
+#. i18n: ectx: label, entry (maxSeeds), group (downloads)
+#: rc.cpp:2791 rc.cpp:2791
+msgid "Maximum number of seeds (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/search/ktsearchplugin.kcfg:10
-#. i18n: ectx: label, entry (searchEngine), group (general)
-#: rc.cpp:2428 rc.cpp:2428
-msgid "Current search engine"
+#. i18n: file: libktcore/ktorrent.kcfg:20
+#. i18n: ectx: label, entry (startDownloadsOnLowDiskSpace), group (downloads)
+#: rc.cpp:2794 rc.cpp:2794
+msgid "Start downloads on low disk space?"
 msgstr ""
 
-#. i18n: file: plugins/search/ktsearchplugin.kcfg:19
-#. i18n: ectx: label, entry (useCustomBrowser), group (general)
-#: rc.cpp:2434 rc.cpp:2434
-msgid "Use custom browser"
+#. i18n: file: libktcore/ktorrent.kcfg:25
+#. i18n: ectx: label, entry (maxConnections), group (downloads)
+#: rc.cpp:2797 rc.cpp:2797
+msgid "Maximum number of connections per torrent (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/search/ktsearchplugin.kcfg:23
-#. i18n: ectx: label, entry (customBrowser), group (general)
-#: rc.cpp:2437 rc.cpp:2437
-msgid "Custom browser executable path"
+#. i18n: file: libktcore/ktorrent.kcfg:30
+#. i18n: ectx: label, entry (maxTotalConnections), group (downloads)
+#: rc.cpp:2800 rc.cpp:2800
+msgid "Maximum number of connections for all torrents (0 = no limit) "
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ktipfilterplugin.kcfg:10
-#. i18n: ectx: label, entry (filterURL), group (general)
-#: rc.cpp:2555 rc.cpp:2555
-msgid "Level1 filter url"
+#. i18n: file: libktcore/ktorrent.kcfg:35
+#. i18n: ectx: label, entry (maxUploadRate), group (downloads)
+#: rc.cpp:2803 rc.cpp:2803
+msgid "Maximum upload speed in KiB/sec (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/ipfilter/ktipfilterplugin.kcfg:14
-#. i18n: ectx: label, entry (useLevel1), group (general)
-#: rc.cpp:2558 rc.cpp:2558
-msgid "Use level1 filter?"
-msgstr "Defnyddio ffilter lefel1?"
-
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:14
-#. i18n: ectx: label, entry (customtracker), group (general)
-#: rc.cpp:2574 rc.cpp:2574
-msgid "Toggles if a custom tracker is used"
+#. i18n: file: libktcore/ktorrent.kcfg:40
+#. i18n: ectx: label, entry (maxDownloadRate), group (downloads)
+#: rc.cpp:2806 rc.cpp:2806
+msgid "Maximum download speed in KiB/sec (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:18
-#. i18n: ectx: label, entry (tr), group (general)
-#: rc.cpp:2577 rc.cpp:2577
-msgid "The default tracker"
+#. i18n: file: libktcore/ktorrent.kcfg:45
+#. i18n: ectx: label, entry (maxRatio), group (downloads)
+#: rc.cpp:2809 rc.cpp:2809
+msgid "Maximum share ratio (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/magnetgenerator/ktmagnetgeneratorplugin.kcfg:22
-#. i18n: ectx: label, entry (dn), group (general)
-#: rc.cpp:2580 rc.cpp:2580
-msgid "Show dn"
+#. i18n: file: libktcore/ktorrent.kcfg:66
+#. i18n: ectx: label, entry (showSystemTrayIcon), group (downloads)
+#: rc.cpp:2818 rc.cpp:2818
+msgid "Show a system tray icon"
 msgstr ""
 
-#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:13
-#. i18n: ectx: label, entry (openSilently), group (general)
-#: rc.cpp:2628 rc.cpp:2628
-msgid "Whether to open torrent silently or not."
+#. i18n: file: libktcore/ktorrent.kcfg:70
+#. i18n: ectx: label, entry (showSpeedBarInTrayIcon), group (downloads)
+#: rc.cpp:2821 rc.cpp:2821
+msgid "Show speed bar in tray icon"
 msgstr ""
 
-#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:18
-#. i18n: ectx: label, entry (actionDelete), group (general)
-#: rc.cpp:2631 rc.cpp:2631
-msgid "Delete action checked."
+#. i18n: file: libktcore/ktorrent.kcfg:74
+#. i18n: ectx: label, entry (downloadBandwidth), group (downloads)
+#: rc.cpp:2824 rc.cpp:2824
+msgid "Download bandwidth (in kb/s):"
 msgstr ""
 
-#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:23
-#. i18n: ectx: label, entry (actionMove), group (general)
-#: rc.cpp:2634 rc.cpp:2634
-msgid "Move action checked."
+#. i18n: file: libktcore/ktorrent.kcfg:80
+#. i18n: ectx: label, entry (uploadBandwidth), group (downloads)
+#: rc.cpp:2827 rc.cpp:2827
+msgid "Upload bandwidth (in kb/s):"
 msgstr ""
 
-#. i18n: file: plugins/scanfolder/ktscanfolderplugin.kcfg:28
-#. i18n: ectx: label, entry (recursive), group (general)
-#: rc.cpp:2637 rc.cpp:2637
-msgid "Scan directories recursively."
+#. i18n: file: libktcore/ktorrent.kcfg:86
+#. i18n: ectx: label, entry (showPopups), group (downloads)
+#: rc.cpp:2830 rc.cpp:2830
+msgid "Show popup messages when torrent is finished."
 msgstr ""
 
-#. i18n: file: plugins/logviewer/ktlogviewerplugin.kcfg:11
-#. i18n: ectx: label, entry (useRichText), group (general)
-#: rc.cpp:2743 rc.cpp:2743
-msgid "Use rich log text"
+#. i18n: file: libktcore/ktorrent.kcfg:90
+#. i18n: ectx: label, entry (keepSeeding), group (downloads)
+#: rc.cpp:2833 rc.cpp:2833
+msgid "Keep seeding after download has finished"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:10
-#. i18n: ectx: label, entry (port), group (general)
-#: rc.cpp:2746 rc.cpp:2746
-msgid "Port number"
+#. i18n: file: libktcore/ktorrent.kcfg:94
+#. i18n: ectx: label, entry (tempDir), group (downloads)
+#: rc.cpp:2836 rc.cpp:2836
+msgid "Folder to store temporary files"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:15
-#. i18n: ectx: label, entry (forward), group (general)
-#: rc.cpp:2749 rc.cpp:2749
-msgid "forward Port"
+#. i18n: file: libktcore/ktorrent.kcfg:97
+#. i18n: ectx: label, entry (useSaveDir), group (downloads)
+#: rc.cpp:2839 rc.cpp:2839
+msgid "Whether to automatically save downloads to saveDir"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:20
-#. i18n: ectx: label, entry (sessionTTL), group (general)
-#: rc.cpp:2752 rc.cpp:2752
-msgid "Session time to live"
+#. i18n: file: libktcore/ktorrent.kcfg:101
+#. i18n: ectx: label, entry (saveDir), group (downloads)
+#: rc.cpp:2842 rc.cpp:2842
+msgid "Folder to store downloaded files"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:26
-#. i18n: ectx: label, entry (skin), group (general)
-#: rc.cpp:2755 rc.cpp:2755
-msgid "interface skin"
+#. i18n: file: libktcore/ktorrent.kcfg:104
+#. i18n: ectx: label, entry (useTorrentCopyDir), group (downloads)
+#: rc.cpp:2845 rc.cpp:2845
+msgid "Whether to automatically copy .torrent files to torrentCopyDir"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:33
-#. i18n: ectx: label, entry (username), group (general)
-#: rc.cpp:2758 rc.cpp:2758
-msgid "username"
+#. i18n: file: libktcore/ktorrent.kcfg:108
+#. i18n: ectx: label, entry (torrentCopyDir), group (downloads)
+#: rc.cpp:2848 rc.cpp:2848
+msgid "Folder to copy .torrent files to"
 msgstr ""
 
-#. i18n: file: plugins/webinterface/ktwebinterfaceplugin.kcfg:37
-#. i18n: ectx: label, entry (password), group (general)
-#: rc.cpp:2761 rc.cpp:2761
-msgid "password"
+#. i18n: file: libktcore/ktorrent.kcfg:111
+#. i18n: ectx: label, entry (useCustomIP), group (downloads)
+#: rc.cpp:2851 rc.cpp:2851
+msgid "Whether to use a custom IP to pass to the tracker"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AutoRemoveConfig)
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AutoResumeConfig)
-#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AutoRemoveConfig)
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, AutoResumeConfig)
-#: rc.cpp:2854 rc.cpp:2866 rc.cpp:2854 rc.cpp:2866
-msgid "Auto Resume Settings"
+#. i18n: file: libktcore/ktorrent.kcfg:115
+#. i18n: ectx: label, entry (lastSaveDir), group (downloads)
+#: rc.cpp:2854 rc.cpp:2854
+msgid "Directory which was used as the last save directory"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:19
-#. i18n: ectx: property (text), widget (QLabel, label)
+#. i18n: file: libktcore/ktorrent.kcfg:119
+#. i18n: ectx: label, entry (customIP), group (downloads)
 #: rc.cpp:2857 rc.cpp:2857
-msgid "Auto remove a torrent when:"
+msgid "IP to pass to the tracker"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:26
-#. i18n: ectx: property (text), widget (QCheckBox, finish_downloading)
+#. i18n: file: libktcore/ktorrent.kcfg:123
+#. i18n: ectx: label, entry (guiUpdateInterval), group (downloads)
 #: rc.cpp:2860 rc.cpp:2860
-msgid "The torrent finishes downloading"
+msgid "GUI update interval"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_remove/auto_remove.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, finish_seeding)
+#. i18n: file: libktcore/ktorrent.kcfg:129
+#. i18n: ectx: label, entry (dhtSupport), group (downloads)
 #: rc.cpp:2863 rc.cpp:2863
-msgid "The torrent finishes seeding"
+msgid "Support for DHT"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:19
-#. i18n: ectx: property (text), widget (QCheckBox, auto_resume)
-#: rc.cpp:2869 rc.cpp:2869
-msgid "Auto resume after:"
+#. i18n: file: libktcore/ktorrent.kcfg:133
+#. i18n: ectx: label, entry (dhtPort), group (downloads)
+#: rc.cpp:2866 rc.cpp:2866
+msgid "DHT port"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:41
-#. i18n: ectx: property (suffix), widget (QSpinBox, hours)
-#: rc.cpp:2872 rc.cpp:2872
-msgid " hours"
+#. i18n: file: libktcore/ktorrent.kcfg:142
+#. i18n: ectx: label, entry (numUploadSlots), group (downloads)
+#: rc.cpp:2869 rc.cpp:2869
+msgid "Number of upload slots"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/auto_resume/auto_resume.ui:61
-#. i18n: ectx: property (suffix), widget (QSpinBox, seconds)
+#. i18n: file: libktcore/ktorrent.kcfg:192
+#. i18n: ectx: label, entry (shownColumns), group (downloads)
 #: rc.cpp:2878 rc.cpp:2878
-msgid " seconds"
+msgid "Columns shown in KTorrentView"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, EMailConfigWidget)
+#. i18n: file: libktcore/ktorrent.kcfg:237
+#. i18n: ectx: label, entry (eta), group (downloads)
 #: rc.cpp:2881 rc.cpp:2881
-msgid "EMail Settings"
+msgid "Algorithm to estimate the time when a torrent is finished"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#. i18n: file: libktcore/ktorrent.kcfg:249
+#. i18n: ectx: label, entry (minDiskSpace), group (downloads)
 #: rc.cpp:2884 rc.cpp:2884
-msgid "SMTP Server"
+msgid ""
+"When there is no space left to complete download, and the available disk "
+"space is less than this value, the torrent will be stopped."
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:49
-#. i18n: ectx: property (text), widget (QLabel, label_3)
+#. i18n: file: libktcore/ktorrent.kcfg:260
+#. i18n: ectx: label, entry (useCompletedDir), group (downloads)
+#: rc.cpp:2887 rc.cpp:2887
+msgid "Whether to automatically move completed downloads to completedDir"
+msgstr ""
+
+#. i18n: file: libktcore/ktorrent.kcfg:264
+#. i18n: ectx: label, entry (completedDir), group (downloads)
+#: rc.cpp:2890 rc.cpp:2890
+msgid "Folder to move completed downloaded files to"
+msgstr ""
+
+#. i18n: file: libktcore/ktorrent.kcfg:267
+#. i18n: ectx: label, entry (maxSeedTime), group (downloads)
 #: rc.cpp:2893 rc.cpp:2893
-msgid "SMTP server:"
+msgid "Maximum seed time in hours (0 = no limit)"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:80
-#. i18n: ectx: property (text), widget (QCheckBox, tls)
-#: rc.cpp:2899 rc.cpp:2899
-msgid "Use SSL/TLS encryption"
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:24
+#. i18n: ectx: property (text), widget (QLabel, job_title)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:31
+#. i18n: ectx: property (text), widget (QLabel, job_description)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:47
+#. i18n: ectx: property (text), widget (QLabel, job_speed)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:59
+#. i18n: ectx: property (text), widget (QLabel, msg)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:24
+#. i18n: ectx: property (text), widget (QLabel, job_title)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:31
+#. i18n: ectx: property (text), widget (QLabel, job_description)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:47
+#. i18n: ectx: property (text), widget (QLabel, job_speed)
+#. i18n: file: libktcore/torrent/basicjobprogresswidget.ui:59
+#. i18n: ectx: property (text), widget (QLabel, msg)
+#: rc.cpp:2902 rc.cpp:2905 rc.cpp:2908 rc.cpp:2911 rc.cpp:2902 rc.cpp:2905
+#: rc.cpp:2908 rc.cpp:2911
+msgid "TextLabel"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:90
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:2902 rc.cpp:2902
-msgid "Destination"
+#. i18n: file: ktupnptest/upnptestwidget.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, UPnPTestWidget)
+#: rc.cpp:2914 rc.cpp:2914
+msgid "UPnP Test Application"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:96
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:2905 rc.cpp:2905
-msgid "Send mails to:"
+#. i18n: file: ktupnptest/upnptestwidget.ui:24
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:2917 rc.cpp:2917
+msgid "Router:"
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:106
-#. i18n: ectx: property (text), widget (QCheckBox, add_cc)
-#: rc.cpp:2908 rc.cpp:2908
-msgid "Add CC:"
+#. i18n: file: ktupnptest/upnptestwidget.ui:40
+#. i18n: ectx: property (text), widget (QLabel, m_router)
+#: rc.cpp:2920 rc.cpp:2920
+msgid "No routers found."
 msgstr ""
 
-#. i18n: file: plugins/scripting/scripts/email_notifications/emailconfig.ui:116
-#. i18n: ectx: property (text), widget (QCheckBox, add_bcc)
-#: rc.cpp:2911 rc.cpp:2911
-msgid "Add BCC:"
+#. i18n: file: ktupnptest/upnptestwidget.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, m_find_routers)
+#: rc.cpp:2923 rc.cpp:2923
+msgid "Find Routers"
 msgstr ""
 
-#. i18n: file: plugins/mediaplayer/ktmediaplayerpluginui.rc:3
-#. i18n: ectx: Menu (MediaPlayerMenu)
-#: rc.cpp:2914 rc.cpp:2914
-msgid "Media Player Menu"
+#. i18n: file: ktupnptest/upnptestwidget.ui:89
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:2929 rc.cpp:2929
+msgid "Protocol:"
 msgstr ""
 
-#. i18n: file: plugins/mediaplayer/ktmediaplayerpluginui.rc:11
-#. i18n: ectx: ToolBar (MediaPlayerToolBar)
-#: rc.cpp:2917 rc.cpp:2917
-msgid "Media Player Toolbar"
+#. i18n: file: ktupnptest/upnptestwidget.ui:97
+#. i18n: ectx: property (text), item, widget (QComboBox, m_protocol)
+#: rc.cpp:2932 rc.cpp:2932
+msgid "UDP"
+msgstr ""
+
+#. i18n: file: ktupnptest/upnptestwidget.ui:139
+#. i18n: ectx: property (text), widget (QCheckBox, m_verbose)
+#: rc.cpp:2944 rc.cpp:2944
+msgid "Verbose mode"
+msgstr ""
+
+#. i18n: file: plasma/applet/appletconfig.ui:21
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:2950 rc.cpp:2950
+msgid "Torrent to display:"
+msgstr ""
+
+#: ktupnptest/main.cpp:40
+msgid "KTUPnPTest"
+msgstr ""
+
+#: ktupnptest/main.cpp:41
+msgid "KTorrent's UPnP test application"
+msgstr ""
+
+#: ktupnptest/main.cpp:43
+msgid "(C) 2005 - 2007 Joris Guisson and Ivan Vasic"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktouch.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktouch.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktouch.po	2012-03-23 07:39:29.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktouch.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/ktouch.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-10 04:04+0000\n"
-"PO-Revision-Date: 2012-03-12 22:03+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 23:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:40+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
@@ -23,508 +23,518 @@
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: src/ktouchui.rc:4
-#. i18n: ectx: Menu (file)
+#. i18n: ectx: Menu (Training)
 #: rc.cpp:5
-msgid "F&ile"
-msgstr "F&feil"
+msgid "T&raining"
+msgstr ""
 
-#. i18n: file: src/ktouchui.rc:12
-#. i18n: ectx: Menu (training)
+#. i18n: file: src/ktouchui.rc:14
+#. i18n: ectx: Menu (Statistics)
 #: rc.cpp:8
-msgid "T&raining"
+msgid "S&tatistics"
 msgstr ""
 
-#. i18n: file: src/ktouchui.rc:19
+#. i18n: file: src/ktouchui.rc:21
 #. i18n: ectx: Menu (settings)
 #: rc.cpp:11
 msgid "&Settings"
 msgstr ""
 
-#. i18n: file: src/ktouchui.rc:27
+#. i18n: file: src/ktouchui.rc:28
 #. i18n: ectx: ToolBar (mainToolBar)
 #: rc.cpp:14
 msgid "Main Toolbar"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:20
-#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchStatisticsDialog)
-#: rc.cpp:252
-msgid "Training Statistics"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchColorEditorDialog)
+#: rc.cpp:17
+msgid "Color Scheme Editor"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:45
-#. i18n: ectx: attribute (title), widget (QWidget, currentTab)
-#: rc.cpp:255
-msgid "Current Training Session"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:25
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:20
+msgid "User Defined Color Schemes"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:68
-#. i18n: ectx: property (text), widget (QLabel, currentTitleLabel)
-#: rc.cpp:258
-msgid "Current Training Session Statistics"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:64
+#. i18n: ectx: property (text), widget (KPushButton, removeBtn)
+#: rc.cpp:23
+msgid "Remove"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:86
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_4_2)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:538
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_4)
-#: rc.cpp:261 rc.cpp:351
-msgid "Lecture:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:79
+#. i18n: ectx: property (text), widget (KPushButton, addBtn)
+#: rc.cpp:26
+msgid "Add"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:106
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_3_2)
-#: rc.cpp:264
-msgid "Levels in this session:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:97
+#. i18n: ectx: property (title), widget (QGroupBox, editGroupBox)
+#: rc.cpp:29
+msgid "Edit Color Scheme"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:136
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:588
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox4_2)
-#: rc.cpp:267 rc.cpp:363
-msgid "General Statistics"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:117
+#. i18n: ectx: property (text), widget (QLabel, nameL)
+#: rc.cpp:32
+msgid "Name of color scheme:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:151
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:603
-#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:270 rc.cpp:366
-msgid "Time (seconds) elapsed:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:127
+#. i18n: ectx: property (text), widget (KPushButton, updateBtn)
+#: rc.cpp:35
+msgid "&Store Data"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:164
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, elapsedTimeLCD)
-#: rc.cpp:273
-msgid ""
-"This shows the number of seconds you have typed in this training session."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:144
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:38
+msgid "Slide Line Colors"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:174
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:184
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
+#: rc.cpp:41
+msgid "Teacher background:"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:198
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:623
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#: rc.cpp:276 rc.cpp:369
-msgid "Characters typed:"
+#: rc.cpp:44
+msgid "Teacher text:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:187
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, totalCharsLCD)
-#: rc.cpp:279
-msgid ""
-"The number of characters (correct and wrong) that you have typed so far."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:215
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_4)
+#: rc.cpp:47
+msgid "Student background:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:197
-#. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:643
-#. i18n: ectx: property (text), widget (QLabel, textLabel5_2)
-#: rc.cpp:282 rc.cpp:372
-msgid "Mistyped characters:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:222
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_5)
+#: rc.cpp:50
+msgid "Student text on error:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:210
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, wrongCharsLCD)
-#: rc.cpp:285
-msgid "Shows how many wrong characters you did type."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:243
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
+#: rc.cpp:53
+msgid "Student text:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:220
-#. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:663
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
-#: rc.cpp:288 rc.cpp:375
-msgid "Words typed:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:250
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_6)
+#: rc.cpp:56
+msgid "Student background on error:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:233
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, wordsLCD)
-#: rc.cpp:291
-msgid "The number of words typed so far."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:297
+#. i18n: ectx: property (title), widget (QGroupBox, keyboardColorsGroup)
+#: rc.cpp:59
+msgid "Keyboard Colors"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:246
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:686
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6_3)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:101
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:157
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:294 rc.cpp:378 rc.cpp:590 rc.cpp:620
-msgid "Accuracy"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:309
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_11)
+#: rc.cpp:62
+msgid "Background colors for normal keys:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:258
-#. i18n: ectx: property (whatsThis), widget (QProgressBar, correctnessBar)
-#: rc.cpp:297
-msgid ""
-"The ratio of correctly typed characters versus total number of characters "
-"typed."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:536
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_10)
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:588
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_10_2)
+#: rc.cpp:65 rc.cpp:80
+msgid "Highlighted background:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:271
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:708
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox5_2)
-#: rc.cpp:300 rc.cpp:381
-msgid "Typing Rate"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:543
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:68
+msgid "Normal key colors:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:286
-#. i18n: ectx: property (text), widget (QLabel, textLabel6)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:723
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_3)
-#: rc.cpp:303 rc.cpp:384
-msgid "Characters per minute:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:550
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_9)
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:623
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_9_2)
+#: rc.cpp:71 rc.cpp:86
+msgid "Highlighted text color:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:299
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, charSpeedLCD)
-#: rc.cpp:306
-msgid "The number of correct characters you typed per minute."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:557
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_8)
+#: rc.cpp:74
+msgid "Text color:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:309
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:743
-#. i18n: ectx: property (text), widget (QLabel, textLabel6_2_2)
-#: rc.cpp:309 rc.cpp:387
-msgid "Words per minute:"
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:571
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_7)
+#: rc.cpp:77
+msgid "Key frame:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:322
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, wordSpeedLCD)
-#: rc.cpp:312
-msgid "The number of words you typed per minute."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:602
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:83
+msgid "Modifier/other keys:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:337
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, groupBox7)
-#: rc.cpp:315
-msgid ""
-"Here the characters are listed that you have missed during the typing test. "
-"The percentage shows the ratio of how often a key was missed versus how "
-"often the key was pressed in total. Large numbers indicate that the key was "
-"missed a lot."
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:637
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_7_2)
+#: rc.cpp:89
+msgid "Text color"
+msgstr "Lliw'r testun"
+
+#. i18n: file: src/ui/ktouchcoloreditordialog.ui:644
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_8_2)
+#. i18n: file: src/ui/ktouchprefcolorspage.ui:153
+#. i18n: ectx: property (text), widget (QLabel, l6)
+#. i18n: file: src/ui/ktouchprefcolorspage.ui:163
+#. i18n: ectx: property (text), widget (QLabel, l5)
+#. i18n: file: src/ui/ktouchprefcolorspage.ui:282
+#. i18n: ectx: property (text), widget (QLabel, errorBackgroundLabel)
+#: rc.cpp:92 rc.cpp:694 rc.cpp:697 rc.cpp:712
+msgid "Background:"
+msgstr "Cefndir:"
+
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchKeyboardEditorDialog)
+#: rc.cpp:95
+msgid "Keyboard Layout Editor"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:340
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox7)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:771
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox7_2)
-#: rc.cpp:318 rc.cpp:393
-msgid "Character Statistics (characters you need to focus on)"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:29
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:98
+msgid "Keyboard Identification Data"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:352
-#. i18n: ectx: property (text), widget (QLabel, charLabel1)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:874
-#. i18n: ectx: property (text), widget (QLabel, charLabel1Level)
-#: rc.cpp:321 rc.cpp:417
-msgid "a:"
-msgstr "a:"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:37
+#. i18n: ectx: property (text), widget (QLabel, titleLabel)
+#: rc.cpp:101
+msgid "Keyboard title:"
+msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:382
-#. i18n: ectx: property (text), widget (QLabel, charLabel5)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:867
-#. i18n: ectx: property (text), widget (QLabel, charLabel5Level)
-#: rc.cpp:324 rc.cpp:414
-msgid "e:"
-msgstr "dwyrain :"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:47
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:104
+msgid "Language id:"
+msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:396
-#. i18n: ectx: property (text), widget (QLabel, charLabel2)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:860
-#. i18n: ectx: property (text), widget (QLabel, charLabel2Level)
-#: rc.cpp:327 rc.cpp:411
-msgid "b:"
-msgstr "b:"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:69
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:107
+msgid "Comments:"
+msgstr "Sylwadau :"
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:410
-#. i18n: ectx: property (text), widget (QLabel, charLabel6)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:846
-#. i18n: ectx: property (text), widget (QLabel, charLabel6Level)
-#: rc.cpp:330 rc.cpp:408
-msgid "f:"
-msgstr "f :"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:95
+#. i18n: ectx: property (title), widget (QGroupBox, keyPropertiesBox)
+#: rc.cpp:110
+msgid "Key Properties"
+msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:424
-#. i18n: ectx: property (text), widget (QLabel, charLabel3)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:818
-#. i18n: ectx: property (text), widget (QLabel, charLabel3Level)
-#: rc.cpp:333 rc.cpp:402
-msgid "c:"
-msgstr "c:"
-
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:438
-#. i18n: ectx: property (text), widget (QLabel, charLabel7)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:825
-#. i18n: ectx: property (text), widget (QLabel, charLabel7Level)
-#: rc.cpp:336 rc.cpp:405
-msgid "g:"
-msgstr "g:"
-
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:452
-#. i18n: ectx: property (text), widget (QLabel, charLabel4)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:783
-#. i18n: ectx: property (text), widget (QLabel, charLabel4Level)
-#: rc.cpp:339 rc.cpp:396
-msgid "d:"
-msgstr "d :"
-
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:466
-#. i18n: ectx: property (text), widget (QLabel, charLabel8)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:790
-#. i18n: ectx: property (text), widget (QLabel, charLabel8Level)
-#: rc.cpp:342 rc.cpp:399
-msgid "h:"
-msgstr "h :"
-
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:497
-#. i18n: ectx: attribute (title), widget (QWidget, currentLevelTab)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:520
-#. i18n: ectx: property (text), widget (QLabel, currentTitleLabel_3)
-#: rc.cpp:345 rc.cpp:348
-msgid "Current Level Statistics"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:113
+msgid "Key type:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:551
-#. i18n: ectx: property (text), widget (QLabel, lectureLabel2)
-#: rc.cpp:354
-msgid "lectureLabel2"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:113
+#. i18n: ectx: property (text), widget (QLabel, keyTextLabel)
+#: rc.cpp:116
+msgid "Key text:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:558
-#. i18n: ectx: property (text), widget (QLabel, textLabel4_3)
-#: rc.cpp:357
-msgid "Level:"
-msgstr "Lefel :"
-
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:571
-#. i18n: ectx: property (text), widget (QLabel, levelLabel2)
-#: rc.cpp:360
-msgid "levelLabel2"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:133
+#. i18n: ectx: property (text), widget (QLabel, keyCharLabel)
+#: rc.cpp:119
+msgid "Key characters"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:768
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, groupBox7_2)
-#: rc.cpp:390
-msgid ""
-"Here the characters are listed that you have missed during the typing test. "
-"The percentage shows the ratio of how often a key was missed versus how "
-"often the key was pressed correctly. Large numbers indicate that the key was "
-"missed a lot."
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:140
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:122
+msgid "Top left:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:928
-#. i18n: ectx: attribute (title), widget (QWidget, progressTab)
-#: rc.cpp:420
-msgid "Monitor Progress"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:166
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:125
+msgid "Top right:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:945
-#. i18n: ectx: property (text), widget (QLabel, currentTitleLabel_2)
-#: rc.cpp:423
-msgid "Your Typing Progress"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:198
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:128
+msgid "Bottom left:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:960
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:426
-msgid "Show progress in lecture:"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:224
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:131
+msgid "Bottom right:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:973
-#. i18n: ectx: property (whatsThis), widget (KComboBox, lectureCombo)
-#: rc.cpp:429
-msgid "Here you can select the lecture you want to obtain statistics for."
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:270
+#. i18n: ectx: property (text), widget (KPushButton, selectFingerKeyButton)
+#: rc.cpp:134
+msgid "Select finger key"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1004
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox6_2)
-#: rc.cpp:432
-msgid "Progress Chart Options"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:280
+#. i18n: ectx: property (text), widget (KPushButton, deleteKeyButton)
+#: rc.cpp:137
+msgid "Delete Key"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1022
-#. i18n: ectx: property (title), widget (QGroupBox, chartDataGroup)
-#: rc.cpp:435
-msgid "Chart Data"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:298
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:140
+msgid "Keyboard Edit Options"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1056
-#. i18n: ectx: property (text), widget (QRadioButton, sessionsRadio)
-#: rc.cpp:438
-msgid "Session stats"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:306
+#. i18n: ectx: property (text), widget (QPushButton, openButton)
+#: rc.cpp:143
+msgid "Open Keyboard..."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1069
-#. i18n: ectx: property (text), widget (QRadioButton, levelsRadio)
-#: rc.cpp:441
-msgid "Level stats"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:313
+#. i18n: ectx: property (text), widget (QPushButton, setFontButton)
+#: rc.cpp:146
+msgid "Set Keyboard Font..."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1085
-#. i18n: ectx: property (title), widget (QGroupBox, chartTypeGroup)
-#: rc.cpp:444
-msgid "Chart Type"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:320
+#. i18n: ectx: property (text), widget (QPushButton, saveButton)
+#: rc.cpp:149
+msgid "Save Keyboard"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1119
-#. i18n: ectx: property (text), widget (QRadioButton, correctRadio)
-#. i18n: file: src/ui/ktouchstatuswidget.ui:190
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox12)
-#: rc.cpp:447 rc.cpp:677 src/ktouchstatisticsdialog.cpp:378
-msgid "Correctness"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:327
+#. i18n: ectx: property (text), widget (QPushButton, saveAsButton)
+#: rc.cpp:152
+msgid "Save Keyboard As..."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1132
-#. i18n: ectx: property (text), widget (QRadioButton, skillRadio)
-#: rc.cpp:450 src/ktouchstatisticsdialog.cpp:406
-msgid "Skill"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:334
+#. i18n: ectx: property (text), widget (QPushButton, closeButton)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1269
+#. i18n: ectx: property (text), widget (KPushButton, closeButton)
+#: rc.cpp:155 rc.cpp:556
+msgid "Close"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1145
-#. i18n: ectx: property (text), widget (QRadioButton, WPMRadio)
-#: rc.cpp:453 src/ktouchstatisticsdialog.cpp:336
-msgid "Words per minute"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:346
+#. i18n: ectx: property (title), widget (QGroupBox, keyGeometryBox)
+#: rc.cpp:158
+msgid "Key Geometry"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1158
-#. i18n: ectx: property (text), widget (QRadioButton, CPMRadio)
-#: rc.cpp:456 src/ktouchstatisticsdialog.cpp:357
-msgid "Characters per minute"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:352
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:161
+msgid "Left:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1174
-#. i18n: ectx: property (title), widget (QGroupBox, timeAxisScalingGroup)
-#: rc.cpp:459
-msgid "Time Axis Scaling"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:378
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:164
+msgid "Width:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1208
-#. i18n: ectx: property (text), widget (QRadioButton, timeRadio)
-#: rc.cpp:462
-msgid "Time scaled"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:404
+#. i18n: ectx: property (text), widget (QLabel, label_7)
+#: rc.cpp:167
+msgid "Top:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1221
-#. i18n: ectx: property (text), widget (QRadioButton, eventRadio)
-#: rc.cpp:465
-msgid "Constant spacing"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:430
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:170
+msgid "Height:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1246
-#. i18n: ectx: property (toolTip), widget (KPushButton, clearButton)
-#: rc.cpp:468
-msgid ""
-"Pressing this button will erase the whole training statistics for the "
-"current user."
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:465
+#. i18n: ectx: property (title), widget (QGroupBox, keyConnectorEditBox)
+#: rc.cpp:173
+msgid "Key connectors"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1249
-#. i18n: ectx: property (text), widget (KPushButton, clearButton)
-#: rc.cpp:471
-msgid "Clear History"
-msgstr "Gwaredu Hanes"
-
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:334
-#. i18n: ectx: property (text), widget (QPushButton, closeButton)
-#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1269
-#. i18n: ectx: property (text), widget (KPushButton, closeButton)
-#: rc.cpp:153 rc.cpp:474
-msgid "Close"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:473
+#. i18n: ectx: property (text), widget (QLabel, label_10)
+#: rc.cpp:176 src/ktouchkeyboardeditordialog.cpp:478
+msgid "Character"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:28
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
-#: rc.cpp:659
-msgid "Level"
-msgstr "Lefel"
-
-#. i18n: file: src/ui/ktouchstatuswidget.ui:46
-#. i18n: ectx: property (toolTip), widget (QLCDNumber, levelLCD)
-#: rc.cpp:662
-msgid "Current level"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:490
+#. i18n: ectx: property (text), widget (QLabel, label_11)
+#: rc.cpp:179
+msgid "or unicode"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:49
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, levelLCD)
-#: rc.cpp:665
-msgid "This shows which level you are at."
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:556
+#. i18n: ectx: property (text), widget (KPushButton, clearConnectorButton)
+#: rc.cpp:182
+msgid "Clear connectors"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:71
-#. i18n: ectx: property (text), widget (QToolButton, levelUpBtn)
-#. i18n: file: src/ui/ktouchstatuswidget.ui:90
-#. i18n: ectx: property (text), widget (QToolButton, levelDownBtn)
-#: rc.cpp:251 rc.cpp:254
-msgid "..."
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:563
+#. i18n: ectx: property (text), widget (KPushButton, addConnectorButton)
+#: rc.cpp:185
+msgid "Add/update connector"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:98
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox11)
-#: rc.cpp:668
-msgid "Speed"
-msgstr "Cyflymder"
-
-#. i18n: file: src/ui/ktouchstatuswidget.ui:162
-#. i18n: ectx: property (toolTip), widget (QLCDNumber, speedLCD)
-#: rc.cpp:671
-msgid "Characters/Minute"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:576
+#. i18n: ectx: property (text), widget (KPushButton, selectModifierKeyButton)
+#: rc.cpp:188
+msgid "< modifier key>"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:165
-#. i18n: ectx: property (whatsThis), widget (QLCDNumber, speedLCD)
-#: rc.cpp:674
-msgid ""
-"This shows how fast you are typing. It measures the typing speed in "
-"characters per minute."
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:624
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
+#: rc.cpp:191
+msgid "Keyboard Layout (click to activate keys for editing or drag keys)"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:251
-#. i18n: ectx: property (toolTip), widget (QProgressBar, correctnessBar)
-#: rc.cpp:680
-msgid "How much are you typing correctly?"
+#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:646
+#. i18n: ectx: property (text), widget (KPushButton, addKeyButton)
+#: rc.cpp:194
+msgid "Add key"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:254
-#. i18n: ectx: property (whatsThis), widget (QProgressBar, correctnessBar)
-#: rc.cpp:683
-msgid "This shows how correctly you are typing."
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchLevelSummaryDialog)
+#: rc.cpp:197
+msgid "Training level summary"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:273
-#. i18n: ectx: property (title), widget (QGroupBox, GroupBox4)
-#: rc.cpp:686
-msgid "New Characters in This Level"
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:200
+msgid "Summary"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchstatuswidget.ui:296
-#. i18n: ectx: property (text), widget (QLabel, newCharsLabel)
-#: rc.cpp:689
-msgid "new characters"
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:54
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:203
+msgid "High scores for this level"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchpreftrainingpage.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefTrainingPage)
-#: rc.cpp:477 src/ktouch.cpp:416
-msgid "Training Options"
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:61
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:117
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:206 rc.cpp:236
+msgid "1."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchpreftrainingpage.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_AutoLevelChange)
-#: rc.cpp:480
-msgid "A&utomatic level adjustment"
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:66
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:122
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:209 rc.cpp:239
+msgid "2."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchpreftrainingpage.ui:43
-#. i18n: ectx: property (text), widget (QLabel, l9)
-#. i18n: file: src/ui/ktouchpreftrainingpage.ui:178
-#. i18n: ectx: property (text), widget (QLabel, l4)
-#: rc.cpp:483 rc.cpp:515
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:71
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:127
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:212 rc.cpp:242
+msgid "3."
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:76
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:132
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:215 rc.cpp:245
+msgid "4."
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:81
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:137
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:218 rc.cpp:248
+msgid "5."
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:86
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:142
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:221 rc.cpp:251
+msgid "Date"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:91
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:147
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:224 rc.cpp:254
+msgid "Score"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:96
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:152
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#: rc.cpp:227 rc.cpp:257
+msgid "Characters per second"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:101
+#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:157
+#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:246
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox6)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:686
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox6_3)
+#: rc.cpp:230 rc.cpp:260 rc.cpp:376 rc.cpp:460
+msgid "Accuracy"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:110
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:233
+msgid "All users high scores for this level"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:169
+#. i18n: ectx: property (text), widget (QPushButton, retryButton)
+#: rc.cpp:263
+msgid "&Retry level"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:189
+#. i18n: ectx: property (text), widget (QPushButton, continueButton)
+#: rc.cpp:266
+msgid "&Continue to next level"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchpreftrainingpage.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefTrainingPage)
+#: rc.cpp:269 src/ktouch.cpp:424
+msgid "Training Options"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchpreftrainingpage.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_AutoLevelChange)
+#: rc.cpp:272
+msgid "A&utomatic level adjustment"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchpreftrainingpage.ui:43
+#. i18n: ectx: property (text), widget (QLabel, l9)
+#. i18n: file: src/ui/ktouchpreftrainingpage.ui:178
+#. i18n: ectx: property (text), widget (QLabel, l4)
+#: rc.cpp:275 rc.cpp:307
 msgid "chars/minute"
 msgstr ""
 
@@ -532,7 +542,7 @@
 #. i18n: ectx: property (text), widget (QLabel, l10)
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:147
 #. i18n: ectx: property (text), widget (QLabel, l5)
-#: rc.cpp:487 rc.cpp:503
+#: rc.cpp:279 rc.cpp:295
 #, no-c-format
 msgid "%"
 msgstr "%"
@@ -541,7 +551,7 @@
 #. i18n: ectx: property (text), widget (QLabel, l7)
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:114
 #. i18n: ectx: property (text), widget (QLabel, l2)
-#: rc.cpp:490 rc.cpp:496
+#: rc.cpp:282 rc.cpp:288
 msgid "Typing speed:"
 msgstr ""
 
@@ -549,571 +559,708 @@
 #. i18n: ectx: property (text), widget (QLabel, l8)
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:154
 #. i18n: ectx: property (text), widget (QLabel, l3)
-#: rc.cpp:493 rc.cpp:506
+#: rc.cpp:285 rc.cpp:298
 msgid "Correctness:"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:137
 #. i18n: ectx: property (text), widget (QLabel, l11)
-#: rc.cpp:499
+#: rc.cpp:291
 msgid "Workload:"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:164
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_CompleteWholeTrainingLevel)
-#: rc.cpp:509
+#: rc.cpp:301
 msgid "Complete whole training level before proceeding"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:171
 #. i18n: ectx: property (text), widget (QLabel, l12)
-#: rc.cpp:512
+#: rc.cpp:304
 msgid "lines"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:219
 #. i18n: ectx: property (text), widget (QLabel, l1)
-#: rc.cpp:518
+#: rc.cpp:310
 msgid "Limits to increase a level"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:226
 #. i18n: ectx: property (text), widget (QLabel, l6)
-#: rc.cpp:521
+#: rc.cpp:313
 msgid "Limits to decrease a level"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:283
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_DisableManualLevelChange)
-#: rc.cpp:524
+#: rc.cpp:316
 msgid "Disable manual level change buttons"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:314
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_PressEnterOnLineEnd)
-#: rc.cpp:527
+#: rc.cpp:319
 msgid "&Typewriter mode (user must confirm line with Enter)"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchpreftrainingpage.ui:321
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_RememberLevel)
-#: rc.cpp:530
+#: rc.cpp:322
 msgid "&Remember level for next program start"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:14
-#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchKeyboardEditorDialog)
-#: rc.cpp:93
-msgid "Keyboard Layout Editor"
+#. i18n: file: src/ui/ktouchopenrequestdialog.ui:77
+#. i18n: ectx: property (text), widget (KPushButton, browseBtn)
+#: rc.cpp:325
+msgid "Browse..."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:29
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:96
-msgid "Keyboard Identification Data"
+#. i18n: file: src/ui/ktouchopenrequestdialog.ui:150
+#. i18n: ectx: property (text), widget (KPushButton, okBtn)
+#: rc.cpp:328
+msgid "&Ok"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:37
-#. i18n: ectx: property (text), widget (QLabel, titleLabel)
-#: rc.cpp:99
-msgid "Keyboard title:"
+#. i18n: file: src/ui/ktouchopenrequestdialog.ui:163
+#. i18n: ectx: property (text), widget (KPushButton, cancelBtn)
+#: rc.cpp:331
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:47
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:20
+#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchStatisticsDialog)
+#: rc.cpp:334
+msgid "Training Statistics"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:45
+#. i18n: ectx: attribute (title), widget (QWidget, currentTab)
+#: rc.cpp:337
+msgid "Current Training Session"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:68
+#. i18n: ectx: property (text), widget (QLabel, currentTitleLabel)
+#: rc.cpp:340
+msgid "Current Training Session Statistics"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:86
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_4_2)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:538
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_4)
+#: rc.cpp:343 rc.cpp:433
+msgid "Lecture:"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:106
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_3_2)
+#: rc.cpp:346
+msgid "Levels in this session:"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:136
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox4)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:588
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox4_2)
+#: rc.cpp:349 rc.cpp:445
+msgid "General Statistics"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:151
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:102
-msgid "Language id:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:603
+#. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
+#: rc.cpp:352 rc.cpp:448
+msgid "Time (seconds) elapsed:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:69
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:105
-msgid "Comments:"
-msgstr "Sylwadau :"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:164
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, elapsedTimeLCD)
+#: rc.cpp:355
+msgid ""
+"This shows the number of seconds you have typed in this training session."
+msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:95
-#. i18n: ectx: property (title), widget (QGroupBox, keyPropertiesBox)
-#: rc.cpp:108
-msgid "Key Properties"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:174
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:623
+#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
+#: rc.cpp:358 rc.cpp:451
+msgid "Characters typed:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:111
-msgid "Key type:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:187
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, totalCharsLCD)
+#: rc.cpp:361
+msgid ""
+"The number of characters (correct and wrong) that you have typed so far."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:113
-#. i18n: ectx: property (text), widget (QLabel, keyTextLabel)
-#: rc.cpp:114
-msgid "Key text:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:197
+#. i18n: ectx: property (text), widget (QLabel, textLabel5)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:643
+#. i18n: ectx: property (text), widget (QLabel, textLabel5_2)
+#: rc.cpp:364 rc.cpp:454
+msgid "Mistyped characters:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:133
-#. i18n: ectx: property (text), widget (QLabel, keyCharLabel)
-#: rc.cpp:117
-msgid "Key characters"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:210
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, wrongCharsLCD)
+#: rc.cpp:367
+msgid "Shows how many wrong characters you did type."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:140
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:120
-msgid "Top left:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:220
+#. i18n: ectx: property (text), widget (QLabel, textLabel4)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:663
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_2)
+#: rc.cpp:370 rc.cpp:457
+msgid "Words typed:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:166
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:123
-msgid "Top right:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:233
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, wordsLCD)
+#: rc.cpp:373
+msgid "The number of words typed so far."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:198
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:126
-msgid "Bottom left:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:258
+#. i18n: ectx: property (whatsThis), widget (QProgressBar, correctnessBar)
+#: rc.cpp:379
+msgid ""
+"The ratio of correctly typed characters versus total number of characters "
+"typed."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:224
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:129
-msgid "Bottom right:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:271
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:708
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox5_2)
+#: rc.cpp:382 rc.cpp:463
+msgid "Typing Rate"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:270
-#. i18n: ectx: property (text), widget (KPushButton, selectFingerKeyButton)
-#: rc.cpp:132
-msgid "Select finger key"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:286
+#. i18n: ectx: property (text), widget (QLabel, textLabel6)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:723
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_3)
+#: rc.cpp:385 rc.cpp:466
+msgid "Characters per minute:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:280
-#. i18n: ectx: property (text), widget (KPushButton, deleteKeyButton)
-#: rc.cpp:135
-msgid "Delete Key"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:299
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, charSpeedLCD)
+#: rc.cpp:388
+msgid "The number of correct characters you typed per minute."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:298
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:138
-msgid "Keyboard Edit Options"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:309
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:743
+#. i18n: ectx: property (text), widget (QLabel, textLabel6_2_2)
+#: rc.cpp:391 rc.cpp:469
+msgid "Words per minute:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:306
-#. i18n: ectx: property (text), widget (QPushButton, openButton)
-#: rc.cpp:141
-msgid "Open Keyboard..."
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:322
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, wordSpeedLCD)
+#: rc.cpp:394
+msgid "The number of words you typed per minute."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:313
-#. i18n: ectx: property (text), widget (QPushButton, setFontButton)
-#: rc.cpp:144
-msgid "Set Keyboard Font..."
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:337
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, groupBox7)
+#: rc.cpp:397
+msgid ""
+"Here the characters are listed that you have missed during the typing test. "
+"The percentage shows the ratio of how often a key was missed versus how "
+"often the key was pressed in total. Large numbers indicate that the key was "
+"missed a lot."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:320
-#. i18n: ectx: property (text), widget (QPushButton, saveButton)
-#: rc.cpp:147
-msgid "Save Keyboard"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:340
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox7)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:771
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox7_2)
+#: rc.cpp:400 rc.cpp:475
+msgid "Character Statistics (characters you need to focus on)"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:327
-#. i18n: ectx: property (text), widget (QPushButton, saveAsButton)
-#: rc.cpp:150
-msgid "Save Keyboard As..."
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:352
+#. i18n: ectx: property (text), widget (QLabel, charLabel1)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:874
+#. i18n: ectx: property (text), widget (QLabel, charLabel1Level)
+#: rc.cpp:403 rc.cpp:499
+msgid "a:"
+msgstr "a:"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:382
+#. i18n: ectx: property (text), widget (QLabel, charLabel5)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:867
+#. i18n: ectx: property (text), widget (QLabel, charLabel5Level)
+#: rc.cpp:406 rc.cpp:496
+msgid "e:"
+msgstr "dwyrain :"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:396
+#. i18n: ectx: property (text), widget (QLabel, charLabel2)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:860
+#. i18n: ectx: property (text), widget (QLabel, charLabel2Level)
+#: rc.cpp:409 rc.cpp:493
+msgid "b:"
+msgstr "b:"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:410
+#. i18n: ectx: property (text), widget (QLabel, charLabel6)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:846
+#. i18n: ectx: property (text), widget (QLabel, charLabel6Level)
+#: rc.cpp:412 rc.cpp:490
+msgid "f:"
+msgstr "f :"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:424
+#. i18n: ectx: property (text), widget (QLabel, charLabel3)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:818
+#. i18n: ectx: property (text), widget (QLabel, charLabel3Level)
+#: rc.cpp:415 rc.cpp:484
+msgid "c:"
+msgstr "c:"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:438
+#. i18n: ectx: property (text), widget (QLabel, charLabel7)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:825
+#. i18n: ectx: property (text), widget (QLabel, charLabel7Level)
+#: rc.cpp:418 rc.cpp:487
+msgid "g:"
+msgstr "g:"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:452
+#. i18n: ectx: property (text), widget (QLabel, charLabel4)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:783
+#. i18n: ectx: property (text), widget (QLabel, charLabel4Level)
+#: rc.cpp:421 rc.cpp:478
+msgid "d:"
+msgstr "d :"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:466
+#. i18n: ectx: property (text), widget (QLabel, charLabel8)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:790
+#. i18n: ectx: property (text), widget (QLabel, charLabel8Level)
+#: rc.cpp:424 rc.cpp:481
+msgid "h:"
+msgstr "h :"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:497
+#. i18n: ectx: attribute (title), widget (QWidget, currentLevelTab)
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:520
+#. i18n: ectx: property (text), widget (QLabel, currentTitleLabel_3)
+#: rc.cpp:427 rc.cpp:430
+msgid "Current Level Statistics"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:346
-#. i18n: ectx: property (title), widget (QGroupBox, keyGeometryBox)
-#: rc.cpp:156
-msgid "Key Geometry"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:551
+#. i18n: ectx: property (text), widget (QLabel, lectureLabel2)
+#: rc.cpp:436
+msgid "lectureLabel2"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:352
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:159
-msgid "Left:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:558
+#. i18n: ectx: property (text), widget (QLabel, textLabel4_3)
+#: rc.cpp:439
+msgid "Level:"
+msgstr "Lefel :"
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:571
+#. i18n: ectx: property (text), widget (QLabel, levelLabel2)
+#: rc.cpp:442
+msgid "levelLabel2"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:378
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:162
-msgid "Width:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:768
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, groupBox7_2)
+#: rc.cpp:472
+msgid ""
+"Here the characters are listed that you have missed during the typing test. "
+"The percentage shows the ratio of how often a key was missed versus how "
+"often the key was pressed correctly. Large numbers indicate that the key was "
+"missed a lot."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:404
-#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: rc.cpp:165
-msgid "Top:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:928
+#. i18n: ectx: attribute (title), widget (QWidget, progressTab)
+#: rc.cpp:502
+msgid "Monitor Progress"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:430
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:168
-msgid "Height:"
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:945
+#. i18n: ectx: property (text), widget (QLabel, currentTitleLabel_2)
+#: rc.cpp:505
+msgid "Your Typing Progress"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:960
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:508
+msgid "Show progress in lecture:"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:973
+#. i18n: ectx: property (whatsThis), widget (KComboBox, lectureCombo)
+#: rc.cpp:511
+msgid "Here you can select the lecture you want to obtain statistics for."
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1004
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox6_2)
+#: rc.cpp:514
+msgid "Progress Chart Options"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1022
+#. i18n: ectx: property (title), widget (QGroupBox, chartDataGroup)
+#: rc.cpp:517
+msgid "Chart Data"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1056
+#. i18n: ectx: property (text), widget (QRadioButton, sessionsRadio)
+#: rc.cpp:520
+msgid "Session stats"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1069
+#. i18n: ectx: property (text), widget (QRadioButton, levelsRadio)
+#: rc.cpp:523
+msgid "Level stats"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1085
+#. i18n: ectx: property (title), widget (QGroupBox, chartTypeGroup)
+#: rc.cpp:526
+msgid "Chart Type"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1119
+#. i18n: ectx: property (text), widget (QRadioButton, correctRadio)
+#. i18n: file: src/ui/ktouchstatuswidget.ui:206
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox12)
+#: rc.cpp:529 rc.cpp:754 src/ktouchstatisticsdialog.cpp:392
+msgid "Correctness"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1132
+#. i18n: ectx: property (text), widget (QRadioButton, skillRadio)
+#: rc.cpp:532 src/ktouchstatisticsdialog.cpp:420
+msgid "Skill"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1145
+#. i18n: ectx: property (text), widget (QRadioButton, WPMRadio)
+#: rc.cpp:535 src/ktouchstatisticsdialog.cpp:350
+msgid "Words per minute"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1158
+#. i18n: ectx: property (text), widget (QRadioButton, CPMRadio)
+#: rc.cpp:538 src/ktouchstatisticsdialog.cpp:371
+msgid "Characters per minute"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1174
+#. i18n: ectx: property (title), widget (QGroupBox, timeAxisScalingGroup)
+#: rc.cpp:541
+msgid "Time Axis Scaling"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1208
+#. i18n: ectx: property (text), widget (QRadioButton, timeRadio)
+#: rc.cpp:544
+msgid "Time scaled"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1221
+#. i18n: ectx: property (text), widget (QRadioButton, eventRadio)
+#: rc.cpp:547
+msgid "Constant spacing"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1246
+#. i18n: ectx: property (toolTip), widget (KPushButton, clearButton)
+#: rc.cpp:550
+msgid ""
+"Pressing this button will erase the whole training statistics for the "
+"current user."
+msgstr ""
+
+#. i18n: file: src/ui/ktouchstatisticsdialog.ui:1249
+#. i18n: ectx: property (text), widget (KPushButton, clearButton)
+#: rc.cpp:553
+msgid "Clear History"
+msgstr "Gwaredu Hanes"
+
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefKeyboardPage)
+#: rc.cpp:559 src/ktouch.cpp:427
+msgid "Keyboard Settings"
+msgstr ""
+
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_ShowKeyboard)
+#: rc.cpp:562
+msgid "Show keyboard"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:465
-#. i18n: ectx: property (title), widget (QGroupBox, keyConnectorEditBox)
-#: rc.cpp:171
-msgid "Key connectors"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:28
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowAnimation)
+#: rc.cpp:565
+msgid "Show on the keyboards the keys you have to type"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:473
-#. i18n: ectx: property (text), widget (QLabel, label_10)
-#: rc.cpp:174 src/ktouchkeyboardeditordialog.cpp:478
-msgid "Character"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:31
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowAnimation)
+#: rc.cpp:568
+msgid ""
+"This highlights on the keyboard the key you have to type next. It is easier "
+"to type when this is checked."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:490
-#. i18n: ectx: property (text), widget (QLabel, label_11)
-#: rc.cpp:177
-msgid "or unicode"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:34
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowAnimation)
+#: rc.cpp:571
+msgid "Highlight &keys on keyboard"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:556
-#. i18n: ectx: property (text), widget (KPushButton, clearConnectorButton)
-#: rc.cpp:180
-msgid "Clear connectors"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:41
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowLearnedKeysOnly)
+#: rc.cpp:574
+msgid "Hide/dim not yet learned keys "
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:563
-#. i18n: ectx: property (text), widget (KPushButton, addConnectorButton)
-#: rc.cpp:183
-msgid "Add/update connector"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:48
+#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_OverrideKeyboardFont)
+#: rc.cpp:577
+msgid ""
+"If checked you can specify your own keyboard font instead of the predefined "
+"one of the keyboard layout."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:576
-#. i18n: ectx: property (text), widget (KPushButton, selectModifierKeyButton)
-#: rc.cpp:186
-msgid "< modifier key>"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:51
+#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_OverrideKeyboardFont)
+#: rc.cpp:580
+msgid ""
+"Every keyboard layout may specify its own font. If the predefined font of a "
+"certain keyboard layout does not work or you would like to have your own, "
+"check this button. You may then choose your own font that will be used to "
+"draw the characters on the keys."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:624
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox5)
-#: rc.cpp:189
-msgid "Keyboard Layout (click to activate keys for editing or drag keys)"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:54
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OverrideKeyboardFont)
+#: rc.cpp:583
+msgid "Override keyboard fonts"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchkeyboardeditordialog.ui:646
-#. i18n: ectx: property (text), widget (KPushButton, addKeyButton)
-#: rc.cpp:192
-msgid "Add key"
+#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:81
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:586
+msgid "Font for keys on keyboard:"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:14
 #. i18n: ectx: property (windowTitle), widget (QDialog, KTouchLectureEditorDialog)
-#: rc.cpp:195
+#: rc.cpp:589
 msgid "KTouch Lecture Editor"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:26
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:198
+#: rc.cpp:592
 msgid "Lecture Properties"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:46
 #. i18n: ectx: property (text), widget (QLabel, titleLabel)
-#: rc.cpp:201
+#: rc.cpp:595
 msgid "Title:"
 msgstr "Teitl:"
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:67
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:204
+#: rc.cpp:598
 msgid "Comment:"
 msgstr "Sylw:"
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:93
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:207
+#: rc.cpp:601
 msgid "Level Editor"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:143
 #. i18n: ectx: property (text), widget (QLabel, levelLabel)
-#: rc.cpp:210
+#: rc.cpp:604
 msgid "Level Data of Level 10"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:172
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:213
+#: rc.cpp:607
 msgid "New characters in this level:"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:198
 #. i18n: ectx: property (text), widget (QLabel, commentLabel)
-#: rc.cpp:216
+#: rc.cpp:610
 msgid "Level comment (optional):"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchlectureeditordialog.ui:224
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:219
+#: rc.cpp:613
 msgid "Level data:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchopenrequestdialog.ui:77
-#. i18n: ectx: property (text), widget (KPushButton, browseBtn)
-#: rc.cpp:83
-msgid "Browse..."
-msgstr ""
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#: rc.cpp:616
+msgid "Sound"
+msgstr "Sw^n"
 
-#. i18n: file: src/ui/ktouchopenrequestdialog.ui:150
-#. i18n: ectx: property (text), widget (KPushButton, okBtn)
-#: rc.cpp:87
-msgid "&Ok"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:37
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_BeepOnError)
+#. i18n: file: src/ktouch.kcfg:47
+#. i18n: ectx: label, entry (BeepOnError), group (General)
+#: rc.cpp:619 rc.cpp:814
+msgid "Emit a beep on each typing error"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchopenrequestdialog.ui:163
-#. i18n: ectx: property (text), widget (KPushButton, cancelBtn)
-#: rc.cpp:90
-msgid "&Cancel"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:40
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_BeepOnError)
+#: rc.cpp:622
+msgid ""
+"If checked (default) this will emit a beep each time you make a typing error."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchColorEditorDialog)
-#: rc.cpp:692
-msgid "Color Scheme Editor"
-msgstr ""
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:43
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_BeepOnError)
+#: rc.cpp:625
+msgid "&Beep on error"
+msgstr "&Canu ar gwall"
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:25
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:695
-msgid "User Defined Color Schemes"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:50
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_SoundOnKeypress)
+#: rc.cpp:628
+msgid "Make a typewriter sound for each key pressed"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:64
-#. i18n: ectx: property (text), widget (KPushButton, removeBtn)
-#: rc.cpp:698
-msgid "Remove"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:53
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_SoundOnKeypress)
+#: rc.cpp:631
+msgid "If checked this will play a typewriter sound for every key pressed."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:79
-#. i18n: ectx: property (text), widget (KPushButton, addBtn)
-#: rc.cpp:701
-msgid "Add"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:56
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SoundOnKeypress)
+#: rc.cpp:634
+msgid "&Typewriter sound when typing"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:97
-#. i18n: ectx: property (title), widget (QGroupBox, editGroupBox)
-#: rc.cpp:704
-msgid "Edit Color Scheme"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:63
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_SoundOnLevel)
+#: rc.cpp:637
+msgid "Play a sound when the level automatically changes."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:117
-#. i18n: ectx: property (text), widget (QLabel, nameL)
-#: rc.cpp:707
-msgid "Name of color scheme:"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:66
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_SoundOnLevel)
+#: rc.cpp:640
+msgid ""
+"If this is checked (default) a sound will be played each time you "
+"automatically change of level."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:127
-#. i18n: ectx: property (text), widget (KPushButton, updateBtn)
-#: rc.cpp:710
-msgid "&Store Data"
+#. i18n: file: src/ui/ktouchprefsoundpage.ui:69
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SoundOnLevel)
+#: rc.cpp:643
+msgid "&Sound on automatic level change"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:144
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:713
-msgid "Slide Line Colors"
-msgstr ""
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:13
+#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefGeneralPage)
+#: rc.cpp:646 src/ktouch.cpp:421
+msgid "General Options"
+msgstr "Dewisiadau Cyffredinol"
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:184
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_2)
-#: rc.cpp:716
-msgid "Teacher background:"
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:19
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:649
+msgid "Text Line Settings"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:198
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:76
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:719
-msgid "Teacher text:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:215
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_4)
-#: rc.cpp:722
-msgid "Student background:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:222
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_5)
-#: rc.cpp:725
-msgid "Student text on error:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:243
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#: rc.cpp:728
-msgid "Student text:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:250
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_6)
-#: rc.cpp:731
-msgid "Student background on error:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:297
-#. i18n: ectx: property (title), widget (QGroupBox, keyboardColorsGroup)
-#: rc.cpp:734
-msgid "Keyboard Colors"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:309
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_11)
-#: rc.cpp:737
-msgid "Background colors for normal keys:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:536
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_10)
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:588
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_10_2)
-#: rc.cpp:740 rc.cpp:755
-msgid "Highlighted background:"
+#: rc.cpp:652
+msgid "Fast"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:543
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:83
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:743
-msgid "Normal key colors:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:550
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_9)
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:623
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_9_2)
-#: rc.cpp:746 rc.cpp:761
-msgid "Highlighted text color:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:557
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_8)
-#: rc.cpp:749
-msgid "Text color:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:571
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_7)
-#: rc.cpp:752
-msgid "Key frame:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:602
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:758
-msgid "Modifier/other keys:"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:637
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_7_2)
-#: rc.cpp:764
-msgid "Text color"
-msgstr "Lliw'r testun"
-
-#. i18n: file: src/ui/ktouchprefcolorspage.ui:153
-#. i18n: ectx: property (text), widget (QLabel, l6)
-#. i18n: file: src/ui/ktouchprefcolorspage.ui:163
-#. i18n: ectx: property (text), widget (QLabel, l5)
-#. i18n: file: src/ui/ktouchprefcolorspage.ui:282
-#. i18n: ectx: property (text), widget (QLabel, errorBackgroundLabel)
-#. i18n: file: src/ui/ktouchcoloreditordialog.ui:644
-#. i18n: ectx: property (text), widget (QLabel, textLabel3_8_2)
-#: rc.cpp:41 rc.cpp:44 rc.cpp:59 rc.cpp:767
-msgid "Background:"
-msgstr "Cefndir:"
-
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefKeyboardPage)
-#: rc.cpp:629 src/ktouch.cpp:419
-msgid "Keyboard Settings"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_ShowKeyboard)
-#: rc.cpp:632
-msgid "Show keyboard"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:28
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowAnimation)
-#: rc.cpp:635
-msgid "Show on the keyboards the keys you have to type"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:31
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_ShowAnimation)
-#: rc.cpp:638
-msgid ""
-"This highlights on the keyboard the key you have to type next. It is easier "
-"to type when this is checked."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:34
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowAnimation)
-#: rc.cpp:641
-msgid "Highlight &keys on keyboard"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:41
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowLearnedKeysOnly)
-#: rc.cpp:644
-msgid "Hide/dim not yet learned keys "
+#: rc.cpp:655
+msgid "Slow"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:48
-#. i18n: ectx: property (toolTip), widget (QGroupBox, kcfg_OverrideKeyboardFont)
-#: rc.cpp:647
-msgid ""
-"If checked you can specify your own keyboard font instead of the predefined "
-"one of the keyboard layout."
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:128
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:658
+msgid "Sliding speed:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:51
-#. i18n: ectx: property (whatsThis), widget (QGroupBox, kcfg_OverrideKeyboardFont)
-#: rc.cpp:650
-msgid ""
-"Every keyboard layout may specify its own font. If the predefined font of a "
-"certain keyboard layout does not work or you would like to have your own, "
-"check this button. You may then choose your own font that will be used to "
-"draw the characters on the keys."
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:137
+#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OverrideLectureFont)
+#: rc.cpp:661
+msgid "Override lecture font"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:54
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OverrideKeyboardFont)
-#: rc.cpp:653
-msgid "Override keyboard fonts"
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:177
+#. i18n: ectx: property (text), widget (QLabel, fontTextLabel)
+#: rc.cpp:664
+msgid "Font for displayed/typed text:"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefkeyboardpage.ui:81
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:656
-msgid "Font for keys on keyboard:"
+#. i18n: file: src/ui/ktouchprefgeneralpage.ui:190
+#. i18n: ectx: property (whatsThis), widget (KFontRequester, kcfg_Font)
+#: rc.cpp:667
+msgid ""
+"This button will display a font dialog where you can change the font for the "
+"student and the teacher lines. When you leave the font dialog, the new font "
+"is previewed in the line below and only applied when you click the Apply "
+"button below."
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefColorsPage)
-#: rc.cpp:17 src/ktouch.cpp:422
+#: rc.cpp:670 src/ktouch.cpp:430
 msgid "Color Settings"
 msgstr "Gosodiadau Lliw"
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:20
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_CommonTypingLineColors)
-#: rc.cpp:20
+#: rc.cpp:673
 msgid "Use custom color for typing line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:49
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_TeacherTextColor)
-#: rc.cpp:23
+#: rc.cpp:676
 msgid "The color for the teacher's line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:75
 #. i18n: ectx: property (text), widget (QLabel, l1)
-#: rc.cpp:26
+#: rc.cpp:679
 msgid "Teacher's line"
 msgstr ""
 
@@ -1123,32 +1270,32 @@
 #. i18n: ectx: property (text), widget (QLabel, l4)
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:336
 #. i18n: ectx: property (text), widget (QLabel, errorTextLabel)
-#: rc.cpp:29 rc.cpp:32 rc.cpp:74
+#: rc.cpp:682 rc.cpp:685 rc.cpp:727
 msgid "Text:"
 msgstr "Testun:"
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:140
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_StudentTextColor)
-#: rc.cpp:35
+#: rc.cpp:688
 msgid "Change the text color for the student line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:143
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_StudentTextColor)
-#: rc.cpp:38
+#: rc.cpp:691
 msgid ""
 "Here you can change the color of the text you type in the student line."
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:208
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_TeacherBackgroundColor)
-#: rc.cpp:47
+#: rc.cpp:700
 msgid "The background for the teacher's line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:211
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_TeacherBackgroundColor)
-#: rc.cpp:50
+#: rc.cpp:703
 msgid ""
 "Here you can change the background color for the teacher's line (the line of "
 "letters you have to type.)"
@@ -1156,25 +1303,25 @@
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:221
 #. i18n: ectx: property (text), widget (QLabel, l2)
-#: rc.cpp:53
+#: rc.cpp:706
 msgid "Typing line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:233
 #. i18n: ectx: property (title), widget (QGroupBox, kcfg_ColorOnError)
-#: rc.cpp:56
+#: rc.cpp:709
 msgid "Use different color on missed typing"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:301
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_ErrorBackgroundColor)
-#: rc.cpp:62
+#: rc.cpp:715
 msgid "Choose the background color for error in typing line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:304
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_ErrorBackgroundColor)
-#: rc.cpp:65
+#: rc.cpp:718
 msgid ""
 "When you have checked 'Use different color on error in the typing line', you "
 "can then choose a color for the background of errors. You make an error when "
@@ -1184,13 +1331,13 @@
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:323
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_ErrorTextColor)
-#: rc.cpp:68
+#: rc.cpp:721
 msgid "Choose the text color for error in typing line"
 msgstr ""
 
 #. i18n: file: src/ui/ktouchprefcolorspage.ui:326
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_ErrorTextColor)
-#: rc.cpp:71
+#: rc.cpp:724
 msgid ""
 "When you have checked 'Use different color on error in the typing line', you "
 "can then choose a color for the text of errors. You make an error when you "
@@ -1198,954 +1345,871 @@
 "more visible."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchusersetupdialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchUserSetupDialog)
-#: rc.cpp:770
-msgid "Setup Users"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchusersetupdialog.ui:39
-#. i18n: ectx: property (text), widget (KPushButton, addBtn)
-#: rc.cpp:773
-msgid "&Add"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchusersetupdialog.ui:42
-#. i18n: ectx: property (shortcut), widget (KPushButton, addBtn)
-#: rc.cpp:776
-msgid "Ins, Alt+A"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchusersetupdialog.ui:49
-#. i18n: ectx: property (text), widget (KPushButton, removeBtn)
-#: rc.cpp:779
-msgid "&Remove"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchusersetupdialog.ui:52
-#. i18n: ectx: property (shortcut), widget (KPushButton, removeBtn)
-#: rc.cpp:782
-msgid "Del, Alt+R"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchusersetupdialog.ui:75
-#. i18n: ectx: property (text), widget (KPushButton, closeBtn)
-#: rc.cpp:785
-msgid "&Close"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchLevelSummaryDialog)
-#: rc.cpp:557
-msgid "Training level summary"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:560
-msgid "Summary"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:54
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:563
-msgid "High scores for this level"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:61
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:117
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:566 rc.cpp:596
-msgid "1."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:66
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:122
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:569 rc.cpp:599
-msgid "2."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:71
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:127
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:572 rc.cpp:602
-msgid "3."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:76
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:132
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:575 rc.cpp:605
-msgid "4."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:81
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:137
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:578 rc.cpp:608
-msgid "5."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:86
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:142
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:581 rc.cpp:611
-msgid "Date"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:91
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:147
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:584 rc.cpp:614
-msgid "Score"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:96
-#. i18n: ectx: property (text), widget (QTableWidget, userHighscoreTableWidget)
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:152
-#. i18n: ectx: property (text), widget (QTableWidget, allUserHighscoreTableWidget)
-#: rc.cpp:587 rc.cpp:617
-msgid "Characters per second"
-msgstr ""
+#. i18n: file: src/ui/ktouchstatuswidget.ui:29
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox1)
+#: rc.cpp:730
+msgid "Level"
+msgstr "Lefel"
 
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:110
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:593
-msgid "All users high scores for this level"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:41
+#. i18n: ectx: property (toolTip), widget (QLCDNumber, levelLCD)
+#: rc.cpp:733
+msgid "Current level"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:169
-#. i18n: ectx: property (text), widget (QPushButton, retryButton)
-#: rc.cpp:623
-msgid "&Retry level"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:44
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, levelLCD)
+#: rc.cpp:736
+msgid "This shows which level you are at."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchlevelsummarydialog.ui:189
-#. i18n: ectx: property (text), widget (QPushButton, continueButton)
-#: rc.cpp:626
-msgid "&Continue to next level"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:71
+#. i18n: ectx: property (text), widget (QToolButton, levelUpBtn)
+#. i18n: file: src/ui/ktouchstatuswidget.ui:90
+#. i18n: ectx: property (text), widget (QToolButton, levelDownBtn)
+#: rc.cpp:739 rc.cpp:742
+msgid "..."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:222
-msgid "Sound"
-msgstr "Sw^n"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:114
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox11)
+#: rc.cpp:745
+msgid "Speed"
+msgstr "Cyflymder"
 
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:37
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_BeepOnError)
-#. i18n: file: src/ktouch.kcfg:47
-#. i18n: ectx: label, entry (BeepOnError), group (General)
-#: rc.cpp:225 rc.cpp:815
-msgid "Emit a beep on each typing error"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:178
+#. i18n: ectx: property (toolTip), widget (QLCDNumber, speedLCD)
+#: rc.cpp:748
+msgid "Characters/Minute"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:40
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_BeepOnError)
-#: rc.cpp:228
+#. i18n: file: src/ui/ktouchstatuswidget.ui:181
+#. i18n: ectx: property (whatsThis), widget (QLCDNumber, speedLCD)
+#: rc.cpp:751
 msgid ""
-"If checked (default) this will emit a beep each time you make a typing error."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:43
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_BeepOnError)
-#: rc.cpp:231
-msgid "&Beep on error"
-msgstr "&Canu ar gwall"
-
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:50
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_SoundOnKeypress)
-#: rc.cpp:234
-msgid "Make a typewriter sound for each key pressed"
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:53
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_SoundOnKeypress)
-#: rc.cpp:237
-msgid "If checked this will play a typewriter sound for every key pressed."
-msgstr ""
-
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:56
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SoundOnKeypress)
-#: rc.cpp:240
-msgid "&Typewriter sound when typing"
+"This shows how fast you are typing. It measures the typing speed in "
+"characters per minute."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:63
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_SoundOnLevel)
-#: rc.cpp:243
-msgid "Play a sound when the level automatically changes."
+#. i18n: file: src/ui/ktouchstatuswidget.ui:267
+#. i18n: ectx: property (toolTip), widget (QProgressBar, correctnessBar)
+#: rc.cpp:757
+msgid "How much are you typing correctly?"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:66
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_SoundOnLevel)
-#: rc.cpp:246
-msgid ""
-"If this is checked (default) a sound will be played each time you "
-"automatically change of level."
+#. i18n: file: src/ui/ktouchstatuswidget.ui:270
+#. i18n: ectx: property (whatsThis), widget (QProgressBar, correctnessBar)
+#: rc.cpp:760
+msgid "This shows how correctly you are typing."
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefsoundpage.ui:69
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SoundOnLevel)
-#: rc.cpp:249
-msgid "&Sound on automatic level change"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:289
+#. i18n: ectx: property (title), widget (QGroupBox, GroupBox4)
+#: rc.cpp:763
+msgid "New Characters in This Level"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, KTouchPrefGeneralPage)
-#: rc.cpp:533 src/ktouch.cpp:413
-msgid "General Options"
-msgstr "Dewisiadau Cyffredinol"
-
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:19
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:536
-msgid "Text Line Settings"
+#. i18n: file: src/ui/ktouchstatuswidget.ui:312
+#. i18n: ectx: property (text), widget (QLabel, newCharsLabel)
+#: rc.cpp:766
+msgid "new characters"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:76
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:539
-msgid "Fast"
+#. i18n: file: src/ui/ktouchusersetupdialog.ui:13
+#. i18n: ectx: property (windowTitle), widget (QDialog, KTouchUserSetupDialog)
+#: rc.cpp:769
+msgid "Setup Users"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:83
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:542
-msgid "Slow"
+#. i18n: file: src/ui/ktouchusersetupdialog.ui:39
+#. i18n: ectx: property (text), widget (KPushButton, addBtn)
+#: rc.cpp:772
+msgid "&Add"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:128
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:545
-msgid "Sliding speed:"
+#. i18n: file: src/ui/ktouchusersetupdialog.ui:42
+#. i18n: ectx: property (shortcut), widget (KPushButton, addBtn)
+#: rc.cpp:775
+msgid "Ins, Alt+A"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:137
-#. i18n: ectx: property (title), widget (QGroupBox, kcfg_OverrideLectureFont)
-#: rc.cpp:548
-msgid "Override lecture font"
+#. i18n: file: src/ui/ktouchusersetupdialog.ui:49
+#. i18n: ectx: property (text), widget (KPushButton, removeBtn)
+#: rc.cpp:778
+msgid "&Remove"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:177
-#. i18n: ectx: property (text), widget (QLabel, fontTextLabel)
-#: rc.cpp:551
-msgid "Font for displayed/typed text:"
+#. i18n: file: src/ui/ktouchusersetupdialog.ui:52
+#. i18n: ectx: property (shortcut), widget (KPushButton, removeBtn)
+#: rc.cpp:781
+msgid "Del, Alt+R"
 msgstr ""
 
-#. i18n: file: src/ui/ktouchprefgeneralpage.ui:190
-#. i18n: ectx: property (whatsThis), widget (KFontRequester, kcfg_Font)
-#: rc.cpp:554
-msgid ""
-"This button will display a font dialog where you can change the font for the "
-"student and the teacher lines. When you leave the font dialog, the new font "
-"is previewed in the line below and only applied when you click the Apply "
-"button below."
+#. i18n: file: src/ui/ktouchusersetupdialog.ui:75
+#. i18n: ectx: property (text), widget (KPushButton, closeBtn)
+#: rc.cpp:784
+msgid "&Close"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:9
 #. i18n: ectx: label, entry (CurrentColorScheme), group (Colors)
-#: rc.cpp:788
+#: rc.cpp:787
 msgid "The number of the current color scheme."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:13
 #. i18n: ectx: label, entry (CommonTypingLineColors), group (Colors)
-#: rc.cpp:791
+#: rc.cpp:790
 msgid "Use the same typing line colors independent of color scheme."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:17
 #. i18n: ectx: label, entry (TeacherBackgroundColor), group (Colors)
-#: rc.cpp:794
+#: rc.cpp:793
 msgid "The background color for the teacher's line."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:21
 #. i18n: ectx: label, entry (TeacherTextColor), group (Colors)
-#: rc.cpp:797
+#: rc.cpp:796
 msgid "The text color for the teacher's line"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:25
 #. i18n: ectx: label, entry (StudentBackgroundColor), group (Colors)
-#: rc.cpp:800
+#: rc.cpp:799
 msgid "The background color for the student's line."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:29
 #. i18n: ectx: label, entry (StudentTextColor), group (Colors)
-#: rc.cpp:803
+#: rc.cpp:802
 msgid "The text color for the student's line"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:33
 #. i18n: ectx: label, entry (ColorOnError), group (Colors)
-#: rc.cpp:806
+#: rc.cpp:805
 msgid "Whether to use a different background for wrong text or not."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:37
 #. i18n: ectx: label, entry (ErrorBackgroundColor), group (Colors)
-#: rc.cpp:809
+#: rc.cpp:808
 msgid "The background color for wrong text (students line)."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:41
 #. i18n: ectx: label, entry (ErrorTextColor), group (Colors)
-#: rc.cpp:812
+#: rc.cpp:811
 msgid "The text color for wrong text (students line)."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:51
 #. i18n: ectx: label, entry (SoundOnKeypress), group (General)
-#: rc.cpp:818
+#: rc.cpp:817
 msgid "Play sounds for typing."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:55
 #. i18n: ectx: label, entry (SoundOnLevel), group (General)
-#: rc.cpp:821
+#: rc.cpp:820
 msgid "Play a sound on automatic level change"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:59
 #. i18n: ectx: label, entry (SlidingSpeed), group (General)
-#: rc.cpp:824
+#: rc.cpp:823
 msgid "The sliding speed"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:63
 #. i18n: ectx: label, entry (MaxSlidingWidgetHeight), group (General)
-#: rc.cpp:827
+#: rc.cpp:826
 msgid "The maximum height of the sliding widget"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:67
 #. i18n: ectx: label, entry (OverrideLectureFont), group (General)
-#: rc.cpp:830
+#: rc.cpp:829
 msgid "Override the default/predefined lecture fonts."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:71
 #. i18n: ectx: label, entry (Font), group (General)
-#: rc.cpp:833
+#: rc.cpp:832
 msgid "The font for the student and teacher lines"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:75
 #. i18n: ectx: label, entry (CurrentLectureFile), group (General)
-#: rc.cpp:836
+#: rc.cpp:835
 msgid "The currently loaded lecture file"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:79
 #. i18n: ectx: label, entry (Right2LeftTyping), group (General)
-#: rc.cpp:839
+#: rc.cpp:838
 msgid "Whether we use right-to-left typing."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:85
 #. i18n: ectx: label, entry (ShowAnimation), group (Keyboard)
-#: rc.cpp:842
+#: rc.cpp:841
 msgid "Whether to use colors on the keys or not."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:89
 #. i18n: ectx: label, entry (ShowLearnedKeysOnly), group (Keyboard)
-#: rc.cpp:845
+#: rc.cpp:844
 msgid "Whether to show only the learned/known keys or always all keys."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:93
 #. i18n: ectx: label, entry (ShowKeyboard), group (Keyboard)
-#: rc.cpp:848
+#: rc.cpp:847
 msgid "Whether to show the keyboard display."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:97
 #. i18n: ectx: label, entry (OverrideKeyboardFont), group (Keyboard)
-#: rc.cpp:851
+#: rc.cpp:850
 msgid "Whether to override the default/predefined keyboard fonts."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:101
 #. i18n: ectx: label, entry (KeyboardFont), group (Keyboard)
-#: rc.cpp:854
+#: rc.cpp:853
 msgid "The font for the keys on the keyboard"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:105
 #. i18n: ectx: label, entry (CurrentKeyboardFile), group (Keyboard)
-#: rc.cpp:857
+#: rc.cpp:856
 msgid "The currently loaded keyboard file"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:111
 #. i18n: ectx: label, entry (PressEnterOnLineEnd), group (Training)
-#: rc.cpp:860
+#: rc.cpp:859
 msgid "Requires user to press enter after the line is complete."
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:115
 #. i18n: ectx: label, entry (AutoLevelChange), group (Training)
-#: rc.cpp:863
+#: rc.cpp:862
 msgid "Allow automatic level adjustments"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:119
 #. i18n: ectx: label, entry (DisableManualLevelChange), group (Training)
-#: rc.cpp:866
+#: rc.cpp:865
 msgid "Disable manual level adjustments when auto-level change is enabled"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:123
 #. i18n: ectx: label, entry (RememberLevel), group (Training)
-#: rc.cpp:869
+#: rc.cpp:868
 msgid "Remember the current level for the next KTouch start"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:127
 #. i18n: ectx: label, entry (CurrentTrainingLevel), group (Training)
-#: rc.cpp:872
+#: rc.cpp:871
 msgid "The current training level"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:131
 #. i18n: ectx: label, entry (UpSpeedLimit), group (Training)
-#: rc.cpp:875
+#: rc.cpp:874
 msgid "Number of chars per minute to increase a level"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:135
 #. i18n: ectx: label, entry (UpCorrectLimit), group (Training)
-#: rc.cpp:878
+#: rc.cpp:877
 msgid "Percentage of correctness to increase a level"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:139
 #. i18n: ectx: label, entry (DownSpeedLimit), group (Training)
-#: rc.cpp:881
+#: rc.cpp:880
 msgid "Number of chars per minute to decrease a level"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:143
 #. i18n: ectx: label, entry (DownCorrectLimit), group (Training)
-#: rc.cpp:884
+#: rc.cpp:883
 msgid "Percentage of correctness to decrease a level"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:147
 #. i18n: ectx: label, entry (NumberOfLinesWorkload), group (Training)
-#: rc.cpp:887
+#: rc.cpp:886
 msgid "How many lines that must be typed before level can change"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:151
 #. i18n: ectx: label, entry (CompleteWholeTrainingLevel), group (Training)
-#: rc.cpp:890
+#: rc.cpp:889
 msgid "Run minimum one complete level before going up"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:157
 #. i18n: ectx: label, entry (MultipleUsers), group (Users)
-#: rc.cpp:893
+#: rc.cpp:892
 msgid "Allow multiple KTouch users for single user account"
 msgstr ""
 
 #. i18n: file: src/ktouch.kcfg:161
 #. i18n: ectx: label, entry (CurrentUserName), group (Users)
-#: rc.cpp:896
+#: rc.cpp:895
 msgid "The user name of the current user."
 msgstr ""
 
-#. i18n: file: training/russian_long.ktouch.xml:3
-#: rc.cpp:942
+#. i18n: file: training/Danish/da.auto.ktouch.xml:3
+#: rc.cpp:899
 msgctxt "Lesson Name"
-msgid "Russian (long auto-generated)"
+msgid "Danish (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/bulgarian.ktouch.xml:3
-#: rc.cpp:920
+#. i18n: file: training/Danish/da.ktouch.xml:3
+#: rc.cpp:901
 msgctxt "Lesson Name"
-msgid "Bulgarian (auto-generated)"
+msgid "Danish (complete course)"
 msgstr ""
 
-#. i18n: file: training/german.ktouch.xml:3
-#: rc.cpp:910
+#. i18n: file: training/Dutch/nl.ktouch.xml:3
+#: rc.cpp:903
 msgctxt "Lesson Name"
-msgid "German (in 9 levels)"
+msgid "Nederlands (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/dvorak_ABCD.ktouch.xml:3
-#: rc.cpp:938
+#. i18n: file: training/Dutch/nl.junior.ktouch.xml:3
+#: rc.cpp:905
 msgctxt "Lesson Name"
-msgid "Dvorak - ABCD"
+msgid "Nederlands Junior (Nederlands for Kids)"
 msgstr ""
 
-#. i18n: file: training/lt.ktouch.xml:3
-#: rc.cpp:978
+#. i18n: file: training/Finnish/fi.junior.ktouch.xml:3
+#: rc.cpp:907
 msgctxt "Lesson Name"
-msgid "Lithuanian (sdt)"
+msgid "Finnish For Kids"
 msgstr ""
 
-#. i18n: file: training/german3.ktouch.xml:3
-#: rc.cpp:898
+#. i18n: file: training/Finnish/fi.ktouch.xml:3
+#: rc.cpp:909
 msgctxt "Lesson Name"
-msgid "German (auto-generated)"
+msgid "Finnish (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/espanol.ktouch.xml:3
-#: rc.cpp:946
+#. i18n: file: training/Hellenic/el.ktouch.xml:3
+#: rc.cpp:911
 msgctxt "Lesson Name"
-msgid "Spanish (auto-generated) 1"
+msgid "Hellenic"
 msgstr ""
 
-#. i18n: file: training/danish2.ktouch.xml:3
-#: rc.cpp:912
+#. i18n: file: training/Slovak/sl.ktouch.xml:3
+#: rc.cpp:913
 msgctxt "Lesson Name"
-msgid "Danish (auto-generated)"
+msgid "Slovak (auto-generated)"
+msgstr ""
+
+#. i18n: file: training/German/de.1.ktouch.xml:3
+#: rc.cpp:915
+msgctxt "Lesson Name"
+msgid "German (in 9 levels)"
 msgstr ""
 
-#. i18n: file: training/german.neo2.ktouch.xml:3
-#: rc.cpp:958
+#. i18n: file: training/German/de.neo2.ktouch.xml:3
+#: rc.cpp:917
 msgctxt "Lesson Name"
 msgid "German (Neo 2 keyboard layout)"
 msgstr ""
 
-#. i18n: file: training/bulgarian_long.ktouch.xml:3
-#: rc.cpp:972
+#. i18n: file: training/German/de.3.ktouch.xml:3
+#: rc.cpp:919
 msgctxt "Lesson Name"
-msgid "Bulgarian (auto-generated-long)"
+msgid "German (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/catalan.ktouch.xml:3
-#: rc.cpp:908
+#. i18n: file: training/German/de.number.ktouch.xml:3
+#: rc.cpp:921
 msgctxt "Lesson Name"
-msgid "Catalan (auto-generated)"
+msgid "German (Number Pad)"
 msgstr ""
 
-#. i18n: file: training/polish.ktouch.xml:3
-#: rc.cpp:928
+#. i18n: file: training/German/de.dvorak.ktouch.xml:3
+#: rc.cpp:923
 msgctxt "Lesson Name"
-msgid "Polish (from TTCoach)"
+msgid "German (Dvorak keyboard layout)"
 msgstr ""
 
-#. i18n: file: training/latin.ktouch.xml:3
-#: rc.cpp:948
+#. i18n: file: training/German/de.2.ktouch.xml:3
+#: rc.cpp:925
 msgctxt "Lesson Name"
-msgid "Latin"
+msgid "German (from Tipptrainer)"
 msgstr ""
 
-#. i18n: file: training/slovak.ktouch.xml:3
-#: rc.cpp:932
+#. i18n: file: training/French/fr.auto1.ktouch.xml:3
+#: rc.cpp:927
 msgctxt "Lesson Name"
-msgid "Slovak (auto-generated)"
+msgid "French (auto-generated) 2"
 msgstr ""
 
-#. i18n: file: training/norwegian.ktouch.xml:3
-#: rc.cpp:936
+#. i18n: file: training/French/fr.auto2.ktouch.xml:3
+#: rc.cpp:929
 msgctxt "Lesson Name"
-msgid "Norwegian"
+msgid "French (auto-generated) 1"
 msgstr ""
 
-#. i18n: file: training/dvorak.ktouch.xml:3
-#: rc.cpp:930
+#. i18n: file: training/French/fr.dvorak2.ktouch.xml:3
+#: rc.cpp:931
 msgctxt "Lesson Name"
-msgid "Dvorak (auto-generated)"
+msgid "Dvorak French (Part 2)"
 msgstr ""
 
-#. i18n: file: training/dvorak-fr-1.ktouch.xml:3
-#: rc.cpp:982
+#. i18n: file: training/French/fr.dvorak1.ktouch.xml:3
+#: rc.cpp:933
 msgctxt "Lesson Name"
 msgid "Dvorak French (Part 1)"
 msgstr ""
 
-#. i18n: file: training/french2.ktouch.xml:3
-#: rc.cpp:950
+#. i18n: file: training/Latin/la.ktouch.xml:3
+#: rc.cpp:935
 msgctxt "Lesson Name"
-msgid "French (auto-generated) 2"
+msgid "Latin"
 msgstr ""
 
-#. i18n: file: training/german.dvorak.type2.ktouch.xml:3
-#: rc.cpp:954
+#. i18n: file: training/Hungarian/hu.ktouch.xml:3
+#: rc.cpp:937
 msgctxt "Lesson Name"
-msgid "German (Dvorak keyboard layout)"
+msgid "Hungarian (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/german2.ktouch.xml:3
-#: rc.cpp:968
+#. i18n: file: training/Hungarian/hu.expert.ktouch.xml:3
+#: rc.cpp:939
 msgctxt "Lesson Name"
-msgid "German (from Tipptrainer)"
+msgid "Hungarian Expert++"
 msgstr ""
 
-#. i18n: file: training/hungarian.ktouch.xml:3
-#: rc.cpp:962
+#. i18n: file: training/Polish/pl.ktouch.xml:3
+#: rc.cpp:941
 msgctxt "Lesson Name"
-msgid "Hungarian (auto-generated)"
+msgid "Polish (from TTCoach)"
 msgstr ""
 
-#. i18n: file: training/ukrainian.ktouch.xml:3
-#: rc.cpp:906
+#. i18n: file: training/Czech/cs.ktouch.xml:3
+#: rc.cpp:943
 msgctxt "Lesson Name"
-msgid "Ukrainian"
+msgid "Czech (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/hungarian.expert.ktouch.xml:3
-#: rc.cpp:976
+#. i18n: file: training/English/en.dvorak1.ktouch.xml:3
+#: rc.cpp:945
 msgctxt "Lesson Name"
-msgid "Hungarian Expert++"
+msgid "Dvorak (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/german.number.ktouch.xml:3
-#: rc.cpp:904
+#. i18n: file: training/English/en.dvorak2.ktouch.xml:3
+#: rc.cpp:947
 msgctxt "Lesson Name"
-msgid "German (Number Pad)"
+msgid "Dvorak - ABCD"
 msgstr ""
 
-#. i18n: file: training/dvorak_es.ktouch.xml:3
-#: rc.cpp:944
+#. i18n: file: training/English/en.ktouch.xml:3
+#: rc.cpp:949
 msgctxt "Lesson Name"
-msgid "Dvorak Spanish"
+msgid "English (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/finnish.ktouch.xml:3
-#: rc.cpp:914
+#. i18n: file: training/English/english_alphagrip.ktouch.xml:3
+#: rc.cpp:951
 msgctxt "Lesson Name"
-msgid "Finnish (auto-generated)"
+msgid "English (for AlphaGrip)"
 msgstr ""
 
-#. i18n: file: training/el.ktouch.xml:3
-#: rc.cpp:924
+#. i18n: file: training/English/en.colemak.ktouch.xml:3
+#: rc.cpp:953
 msgctxt "Lesson Name"
-msgid "Hellenic"
+msgid "Colemak (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/russian.ktouch.xml:3
-#: rc.cpp:902
+#. i18n: file: training/Russian/ru.1.ktouch.xml:3
+#: rc.cpp:955
 msgctxt "Lesson Name"
 msgid "Russian (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/arabic.ktouch.xml:3
-#: rc.cpp:922
+#. i18n: file: training/Russian/ru.long.ktouch.xml:3
+#: rc.cpp:957
 msgctxt "Lesson Name"
-msgid "Arabic"
+msgid "Russian (long auto-generated)"
 msgstr ""
 
-#. i18n: file: training/italian.ktouch.xml:3
-#: rc.cpp:966
+#. i18n: file: training/Russian/ru.2.ktouch.xml:3
+#: rc.cpp:959
 msgctxt "Lesson Name"
-msgid "Italian (auto-generated)"
+msgid "Russian 2"
 msgstr ""
 
-#. i18n: file: training/czech.ktouch.xml:3
-#: rc.cpp:934
+#. i18n: file: training/Turkish/tr.ktouch.xml:3
+#: rc.cpp:961
 msgctxt "Lesson Name"
-msgid "Czech (auto-generated)"
+msgid "Turkish (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/espanol2.ktouch.xml:3
-#: rc.cpp:974
+#. i18n: file: training/Bulgarian/bg.long.ktouch.xml:3
+#: rc.cpp:963
 msgctxt "Lesson Name"
-msgid "Spanish (auto-generated) 2"
+msgid "Bulgarian (auto-generated-long)"
 msgstr ""
 
-#. i18n: file: training/dvorak-fr-2.ktouch.xml:3
-#: rc.cpp:952
+#. i18n: file: training/Bulgarian/bg.ktouch.xml:3
+#: rc.cpp:965
 msgctxt "Lesson Name"
-msgid "Dvorak French (Part 2)"
+msgid "Bulgarian (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/english.ktouch.xml:3
-#: rc.cpp:926
+#. i18n: file: training/Lithuanian/lt.ktouch.xml:3
+#: rc.cpp:967
 msgctxt "Lesson Name"
-msgid "English (auto-generated)"
+msgid "Lithuanian (sdt)"
 msgstr ""
 
-#. i18n: file: training/spanish.ktouch.xml:3
-#: rc.cpp:956
+#. i18n: file: training/Norwegian/no.ktouch.xml:3
+#: rc.cpp:969
 msgctxt "Lesson Name"
-msgid "Spanish (auto-generated)"
+msgid "Norwegian"
 msgstr ""
 
-#. i18n: file: training/nederlands.ktouch.xml:3
-#: rc.cpp:964
+#. i18n: file: training/Slovenian/slovenian.ktouch.xml:3
+#: rc.cpp:971
 msgctxt "Lesson Name"
-msgid "Nederlands (auto-generated)"
+msgid "Slovenian"
 msgstr ""
 
-#. i18n: file: training/nederlands_junior.ktouch.xml:3
-#: rc.cpp:960
+#. i18n: file: training/Catalan/ca.ktouch.xml:3
+#: rc.cpp:973
 msgctxt "Lesson Name"
-msgid "Nederlands Junior (Nederlands for Kids)"
+msgid "Catalan (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/colemak.ktouch.xml:3
-#: rc.cpp:900
+#. i18n: file: training/Brazilian/pt.br-nativo.ktouch.xml:3
+#: rc.cpp:975
 msgctxt "Lesson Name"
-msgid "Colemak (auto-generated)"
+msgid "BR-Nativo"
 msgstr ""
 
-#. i18n: file: training/finnish_for_kids.ktouch.xml:3
-#: rc.cpp:940
+#. i18n: file: training/Ukrainian/uk.ktouch.xml:3
+#: rc.cpp:977
 msgctxt "Lesson Name"
-msgid "Finnish For Kids"
+msgid "Ukrainian"
 msgstr ""
 
-#. i18n: file: training/french.ktouch.xml:3
-#: rc.cpp:980
+#. i18n: file: training/Italian/it.ktouch.xml:3
+#: rc.cpp:979
 msgctxt "Lesson Name"
-msgid "French (auto-generated) 1"
+msgid "Italian (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/danish.ktouch.xml:3
-#: rc.cpp:916
+#. i18n: file: training/Spanish/es.1.ktouch.xml:3
+#: rc.cpp:981
 msgctxt "Lesson Name"
-msgid "Danish (complete course)"
+msgid "Spanish (auto-generated)"
 msgstr ""
 
-#. i18n: file: training/turkish.ktouch.xml:3
-#: rc.cpp:970
+#. i18n: file: training/Spanish/es.dvorak.ktouch.xml:3
+#: rc.cpp:983
 msgctxt "Lesson Name"
-msgid "Turkish (auto-generated)"
+msgid "Dvorak Spanish"
 msgstr ""
 
-#. i18n: file: training/slovenian.ktouch.xml:3
-#: rc.cpp:918
+#. i18n: file: training/Spanish/es.2.ktouch.xml:3
+#: rc.cpp:985
 msgctxt "Lesson Name"
-msgid "Slovenian"
+msgid "Spanish (auto-generated) 1"
 msgstr ""
 
-#. i18n: file: keyboards/colemak.keyboard.xml:3
-#: rc.cpp:1044
-msgctxt "Keyboard Layout Name"
-msgid "English Colemak"
+#. i18n: file: training/Spanish/es.3.ktouch.xml:3
+#: rc.cpp:987
+msgctxt "Lesson Name"
+msgid "Spanish (auto-generated) 2"
 msgstr ""
 
-#. i18n: file: keyboards/it.keyboard.xml:3
-#: rc.cpp:1000
-msgctxt "Keyboard Layout Name"
-msgid "Italian"
+#. i18n: file: training/Arabic/ar.ktouch.xml:3
+#: rc.cpp:989
+msgctxt "Lesson Name"
+msgid "Arabic"
 msgstr ""
 
-#. i18n: file: keyboards/no.keyboard.xml:3
-#: rc.cpp:986
+#. i18n: file: keyboards/russian/ru.winkeys.keyboard.xml:3
+#. i18n: file: keyboards/russian/ru.keyboard.xml:3
+#: rc.cpp:991 rc.cpp:993
 msgctxt "Keyboard Layout Name"
-msgid "Norwegian"
+msgid "Russian"
 msgstr ""
 
-#. i18n: file: keyboards/dvorak_fr.keyboard.xml:3
-#: rc.cpp:1016
+#. i18n: file: keyboards/hungarian/hu.keyboard.xml:3
+#: rc.cpp:995
 msgctxt "Keyboard Layout Name"
-msgid "French Dvorak"
+msgid "Hungarian"
 msgstr ""
 
-#. i18n: file: keyboards/en.keyboard.xml:3
-#: rc.cpp:1018
+#. i18n: file: keyboards/english/en.keyboard.xml:3
+#: rc.cpp:997
 msgctxt "Keyboard Layout Name"
 msgid "English"
 msgstr ""
 
-#. i18n: file: keyboards/ar.keyboard.xml:3
-#: rc.cpp:992
+#. i18n: file: keyboards/english/en_gb.dvorak.keyboard.xml:3
+#: rc.cpp:999
 msgctxt "Keyboard Layout Name"
-msgid "Arabic"
+msgid "English Dvorak (United Kingdom)"
 msgstr ""
 
-#. i18n: file: keyboards/ee.keyboard.xml:3
-#: rc.cpp:997
+#. i18n: file: keyboards/english/en.colemak.keyboard.xml:3
+#: rc.cpp:1001
 msgctxt "Keyboard Layout Name"
-msgid "Estonian"
+msgid "English Colemak"
 msgstr ""
 
-#. i18n: file: keyboards/kn.keyboard.xml:3
-#: rc.cpp:1026
+#. i18n: file: keyboards/english/en_alphagrip.keyboard.xml:3
+#: rc.cpp:1003
 msgctxt "Keyboard Layout Name"
-msgid "Kannada"
+msgid "AlphaGrip"
 msgstr ""
 
-#. i18n: file: keyboards/de.neo2.all.keyboard.xml:3
-#: rc.cpp:1002
+#. i18n: file: keyboards/english/en_gb.qwerty.keyboard.xml:3
+#: rc.cpp:1005
 msgctxt "Keyboard Layout Name"
-msgid "German Neo 2"
+msgid "English (United Kingdom)"
 msgstr ""
 
-#. i18n: file: keyboards/fi.keyboard.xml:3
-#: rc.cpp:1040
+#. i18n: file: keyboards/english/en.dvorak.keyboard.xml:3
+#: rc.cpp:1007
 msgctxt "Keyboard Layout Name"
-msgid "Finnish Keyboard"
+msgid "English Dvorak"
 msgstr ""
 
-#. i18n: file: keyboards/es.keyboard.xml:3
-#: rc.cpp:1012
+#. i18n: file: keyboards/arabic/ar.keyboard.xml:3
+#: rc.cpp:1009
 msgctxt "Keyboard Layout Name"
-msgid "Spanish"
+msgid "Arabic"
 msgstr ""
 
-#. i18n: file: keyboards/cs.qwerty.keyboard.xml:3
-#: rc.cpp:1028
+#. i18n: file: keyboards/swedish/sv.keyboard.xml:3
+#: rc.cpp:1011
 msgctxt "Keyboard Layout Name"
-msgid "Czech qwerty"
+msgid "Swedish Keyboard"
 msgstr ""
 
-#. i18n: file: keyboards/lt.keyboard.xml:3
-#: rc.cpp:1009
+#. i18n: file: keyboards/slovenian/sl.keyboard.xml:3
+#: rc.cpp:1013
+msgctxt "Keyboard Layout Name"
+msgid "Slovenian"
+msgstr ""
+
+#. i18n: file: keyboards/lithuanian/lt.keyboard.xml:3
+#: rc.cpp:1015
 msgctxt "Keyboard Layout Name"
 msgid "Lithuanian standard"
 msgstr ""
 
-#. i18n: file: keyboards/he.keyboard.xml:3
-#: rc.cpp:1038
+#. i18n: file: keyboards/hebrew/he.keyboard.xml:3
+#: rc.cpp:1017
 msgctxt "Keyboard Layout Name"
 msgid "Hebrew"
 msgstr ""
 
-#. i18n: file: keyboards/bg.keyboard.xml:3
-#: rc.cpp:1013
+#. i18n: file: keyboards/tamil/ta_eng.keyboard.xml:3
+#: rc.cpp:1019
+msgctxt "Keyboard Layout Name"
+msgid "Tamil Eng"
+msgstr ""
+
+#. i18n: file: keyboards/tamil/tamil.keyboard.xml:3
+#: rc.cpp:1021
+msgctxt "Keyboard Layout Name"
+msgid "Tamil"
+msgstr ""
+
+#. i18n: file: keyboards/kannada/kn.keyboard.xml:3
+#: rc.cpp:1023
+msgctxt "Keyboard Layout Name"
+msgid "Kannada"
+msgstr ""
+
+#. i18n: file: keyboards/bulgarian/bg.keyboard.xml:3
+#: rc.cpp:1025
 msgctxt "Keyboard Layout Name"
 msgid "Bulgarian"
 msgstr ""
 
-#. i18n: file: keyboards/uk.winkeys.keyboard.xml:3
-#: rc.cpp:996
+#. i18n: file: keyboards/spanish/es.dvorak.keyboard.xml:3
+#: rc.cpp:1027
 msgctxt "Keyboard Layout Name"
-msgid "Ukrainian (winkeys)"
+msgid "Spanish Dvorak"
 msgstr ""
 
-#. i18n: file: keyboards/sl.keyboard.xml:3
-#: rc.cpp:1032
+#. i18n: file: keyboards/spanish/es.keyboard.xml:3
+#: rc.cpp:1029
 msgctxt "Keyboard Layout Name"
-msgid "Slovenian"
+msgid "Spanish"
 msgstr ""
 
-#. i18n: file: keyboards/lat.keyboard.xml:3
-#: rc.cpp:998
+#. i18n: file: keyboards/latin/lat.keyboard.xml:3
+#: rc.cpp:1031
 msgctxt "Keyboard Layout Name"
 msgid "Latinoamerican"
 msgstr ""
 
-#. i18n: file: keyboards/pt.br.keyboard.xml:3
-#: rc.cpp:1021
+#. i18n: file: keyboards/danish/dk.keyboard.xml:3
+#: rc.cpp:1033
 msgctxt "Keyboard Layout Name"
-msgid "Brazilian"
+msgid "Danish"
 msgstr ""
 
-#. i18n: file: keyboards/dvorak.keyboard.xml:3
-#: rc.cpp:1010
+#. i18n: file: keyboards/french/fr.dvorak.keyboard.xml:3
+#: rc.cpp:1035
 msgctxt "Keyboard Layout Name"
-msgid "English Dvorak"
+msgid "French Dvorak"
 msgstr ""
 
-#. i18n: file: keyboards/dk.keyboard.xml:3
-#: rc.cpp:1008
+#. i18n: file: keyboards/french/fr.keyboard.xml:3
+#: rc.cpp:1037
 msgctxt "Keyboard Layout Name"
-msgid "Danish"
+msgid "French"
 msgstr ""
 
-#. i18n: file: keyboards/de_ch.keyboard.xml:3
-#: rc.cpp:1034
+#. i18n: file: keyboards/slovak/sk.qwerty.keyboard.xml:3
+#: rc.cpp:1039
 msgctxt "Keyboard Layout Name"
-msgid "German (Swiss)"
+msgid "Slovak qwerty"
 msgstr ""
 
-#. i18n: file: keyboards/en_gb.qwerty.keyboard.xml:3
-#: rc.cpp:1029
+#. i18n: file: keyboards/slovak/sk.qwertz.keyboard.xml:3
+#: rc.cpp:1041
 msgctxt "Keyboard Layout Name"
-msgid "English (United Kingdom)"
+msgid "Slovak qwertz"
 msgstr ""
 
-#. i18n: file: keyboards/de.dvorak.type2.keyboard.xml:3
-#: rc.cpp:1030
+#. i18n: file: keyboards/swiss/ch.de.keyboard.xml:3
+#: rc.cpp:1043
 msgctxt "Keyboard Layout Name"
-msgid "German Dvorak Type II"
+msgid "German (Swiss)"
 msgstr ""
 
-#. i18n: file: keyboards/hu.keyboard.xml:3
-#: rc.cpp:988
+#. i18n: file: keyboards/swiss/ch.fr.keyboard.xml:3
+#: rc.cpp:1045
 msgctxt "Keyboard Layout Name"
-msgid "Hungarian"
+msgid "French Swiss"
 msgstr ""
 
-#. i18n: file: keyboards/es.dvorak.keyboard.xml:3
-#: rc.cpp:1035
+#. i18n: file: keyboards/quebec/qc.keyboard.xml:3
+#: rc.cpp:1047
 msgctxt "Keyboard Layout Name"
-msgid "Spanish Dvorak"
+msgid "Québec"
 msgstr ""
 
-#. i18n: file: keyboards/ru.keyboard.xml:3
-#. i18n: file: keyboards/ru-winkeys.keyboard.xml:3
-#: rc.cpp:984 rc.cpp:1036
+#. i18n: file: keyboards/greek/el.keyboard.xml:3
+#: rc.cpp:1049
 msgctxt "Keyboard Layout Name"
-msgid "Russian"
+msgid "Greek (English)"
 msgstr ""
 
-#. i18n: file: keyboards/sv.keyboard.xml:3
-#: rc.cpp:1042
+#. i18n: file: keyboards/brazilian/pt.br.keyboard.xml:3
+#: rc.cpp:1051
 msgctxt "Keyboard Layout Name"
-msgid "Swedish Keyboard"
+msgid "Brazilian"
 msgstr ""
 
-#. i18n: file: keyboards/cs.qwertz.keyboard.xml:3
-#: rc.cpp:1014
+#. i18n: file: keyboards/norwegian/no.keyboard.xml:3
+#: rc.cpp:1053
 msgctxt "Keyboard Layout Name"
-msgid "Czech qwertz"
+msgid "Norwegian"
 msgstr ""
 
-#. i18n: file: keyboards/de.keyboard.xml:3
-#: rc.cpp:1022
+#. i18n: file: keyboards/ukrainian/uk.winkeys.keyboard.xml:3
+#: rc.cpp:1055
 msgctxt "Keyboard Layout Name"
-msgid "German"
+msgid "Ukrainian (winkeys)"
 msgstr ""
 
-#. i18n: file: keyboards/fr.keyboard.xml:3
-#: rc.cpp:1006
+#. i18n: file: keyboards/italian/it.keyboard.xml:3
+#: rc.cpp:1057
 msgctxt "Keyboard Layout Name"
-msgid "French"
+msgid "Italian"
 msgstr ""
 
-#. i18n: file: keyboards/fr_ch.keyboard.xml:3
-#: rc.cpp:1024
+#. i18n: file: keyboards/finnish/fi.keyboard.xml:3
+#: rc.cpp:1059
 msgctxt "Keyboard Layout Name"
-msgid "French Swiss"
+msgid "Finnish Keyboard"
 msgstr ""
 
-#. i18n: file: keyboards/el.keyboard.xml:3
-#: rc.cpp:990
+#. i18n: file: keyboards/czech/cs.qwertz.keyboard.xml:3
+#: rc.cpp:1061
 msgctxt "Keyboard Layout Name"
-msgid "Greek (English)"
+msgid "Czech qwertz"
 msgstr ""
 
-#. i18n: file: keyboards/sk.qwertz.keyboard.xml:3
-#: rc.cpp:994
+#. i18n: file: keyboards/czech/cs.qwerty.keyboard.xml:3
+#: rc.cpp:1063
 msgctxt "Keyboard Layout Name"
-msgid "Slovak qwertz"
+msgid "Czech qwerty"
 msgstr ""
 
-#. i18n: file: keyboards/en_gb.dvorak.keyboard.xml:3
-#: rc.cpp:1053
+#. i18n: file: keyboards/german/de.keyboard.xml:3
+#: rc.cpp:1065
 msgctxt "Keyboard Layout Name"
-msgid "English Dvorak (United Kingdom)"
+msgid "German"
 msgstr ""
 
-#. i18n: file: keyboards/qc.keyboard.xml:3
-#: rc.cpp:1020
+#. i18n: file: keyboards/german/de.neo2.all.keyboard.xml:3
+#: rc.cpp:1067
 msgctxt "Keyboard Layout Name"
-msgid "Québec"
+msgid "German Neo 2"
 msgstr ""
 
-#. i18n: file: keyboards/sk.qwerty.keyboard.xml:3
-#: rc.cpp:1004
+#. i18n: file: keyboards/german/de.dvorak.type2.keyboard.xml:3
+#: rc.cpp:1069
 msgctxt "Keyboard Layout Name"
-msgid "Slovak qwerty"
+msgid "German Dvorak Type II"
+msgstr ""
+
+#. i18n: file: keyboards/estonian/ee.keyboard.xml:3
+#: rc.cpp:1071
+msgctxt "Keyboard Layout Name"
+msgid "Estonian"
+msgstr ""
+
+#: src/ktouchcoloreditordialog.cpp:101 src/ktouchcoloreditordialog.cpp:153
+msgid "New color scheme"
+msgstr ""
+
+#: src/ktouchcoloreditordialog.cpp:163
+msgid "Save modified color schemes?"
+msgstr ""
+
+#: src/ktouchcolorscheme.cpp:65 src/ktouchcolorscheme.cpp:113
+msgid "untitled color scheme"
+msgstr ""
+
+#: src/ktouchcolorscheme.cpp:247
+msgid "Black && White"
+msgstr "Du & G&wyn"
+
+#: src/ktouchcolorscheme.cpp:267
+msgid "Classic"
+msgstr ""
+
+#: src/ktouchcolorscheme.cpp:293
+msgid "Deep Blue"
+msgstr ""
+
+#: src/ktouchcolorscheme.cpp:318
+msgid "Stripy"
 msgstr ""
 
 #: src/ktouch.cpp:159 src/ktouchstatisticsdata.cpp:435
@@ -2161,20 +2225,20 @@
 "*|All files"
 msgstr ""
 
-#: src/ktouch.cpp:214
+#: src/ktouch.cpp:216
 msgid "Select Practice Text"
 msgstr ""
 
-#: src/ktouch.cpp:240
+#: src/ktouch.cpp:246
 #, kde-format
 msgid "Imported text from file '%1'"
 msgstr ""
 
-#: src/ktouch.cpp:241
+#: src/ktouch.cpp:247
 msgid "generated from text file"
 msgstr ""
 
-#: src/ktouch.cpp:241
+#: src/ktouch.cpp:247
 msgid "all available"
 msgstr ""
 
@@ -2182,42 +2246,42 @@
 msgid "*.ktouch.xml|Lecture files"
 msgstr ""
 
-#: src/ktouch.cpp:264 src/ktouchopenrequestdialog.cpp:124
+#: src/ktouch.cpp:270 src/ktouchopenrequestdialog.cpp:124
 msgid "Select Training Lecture File"
 msgstr ""
 
-#: src/ktouch.cpp:363
+#: src/ktouch.cpp:371
 msgid ""
 "Would you like to keep the current level for the new training session?"
 msgstr ""
 
-#: src/ktouch.cpp:364
+#: src/ktouch.cpp:372
 msgid "Start new training session"
 msgstr ""
 
-#: src/ktouch.cpp:364
+#: src/ktouch.cpp:372
 msgid "Keep current level"
 msgstr ""
 
-#: src/ktouch.cpp:364
+#: src/ktouch.cpp:372
 msgid "Start from first level"
 msgstr ""
 
-#: src/ktouch.cpp:426
+#: src/ktouch.cpp:434
 msgid "Sound Settings"
 msgstr ""
 
-#: src/ktouch.cpp:461
+#: src/ktouch.cpp:469
 #, kde-format
 msgid "Level:  Correct/Total chars: %1/%2  Words: %3"
 msgstr ""
 
-#: src/ktouch.cpp:462
+#: src/ktouch.cpp:470
 #, kde-format
 msgid "Session: Correct/Total chars: %1/%2  Words: %3"
 msgstr ""
 
-#: src/ktouch.cpp:473
+#: src/ktouch.cpp:481
 msgid ""
 "Note that in different countries touch typing is taught slightly different "
 "which usually affects only the top row of keys. For instance, in the United "
@@ -2227,106 +2291,78 @@
 "Normally this only makes a difference for split or ergonomic keyboards."
 msgstr ""
 
-#: src/ktouch.cpp:501
+#: src/ktouch.cpp:509
 #, kde-format
 msgid "Could not find/open the lecture file '%1'."
 msgstr ""
 
-#: src/ktouch.cpp:527 src/ktouch.cpp:914
+#: src/ktouch.cpp:535 src/ktouch.cpp:924
 #, kde-format
 msgid "Changing user to '%1'. Restarting training session at current level."
 msgstr ""
 
-#: src/ktouch.cpp:669
+#: src/ktouch.cpp:677
 msgid "&Open Plain Text File..."
 msgstr ""
 
-#: src/ktouch.cpp:674
+#: src/ktouch.cpp:682
 msgid "&Open Lecture..."
 msgstr ""
 
-#: src/ktouch.cpp:679
+#: src/ktouch.cpp:687
 msgid "&Edit Lecture..."
 msgstr ""
 
-#: src/ktouch.cpp:684
+#: src/ktouch.cpp:692
 msgid "&Edit Color Scheme..."
 msgstr ""
 
-#: src/ktouch.cpp:689
+#: src/ktouch.cpp:697
 msgid "&Edit Keyboard Layout..."
 msgstr ""
 
-#: src/ktouch.cpp:697
+#: src/ktouch.cpp:705
 msgid "&Start New Session"
 msgstr "Dechrau &Sesiwn Newydd"
 
-#: src/ktouch.cpp:702
+#: src/ktouch.cpp:710
 msgid "&Pause Session"
 msgstr ""
 
-#: src/ktouch.cpp:707
+#: src/ktouch.cpp:715
 msgid "&Lecture Statistics"
 msgstr ""
 
-#: src/ktouch.cpp:713
+#: src/ktouch.cpp:721
 msgid "Default &Lectures"
 msgstr ""
 
-#: src/ktouch.cpp:723
+#: src/ktouch.cpp:731
 msgid "&Keyboard Layouts"
 msgstr ""
 
-#: src/ktouch.cpp:734
+#: src/ktouch.cpp:742
 msgid "Keyboards &Color Schemes"
 msgstr ""
 
-#: src/ktouch.cpp:749
+#: src/ktouch.cpp:757
 msgid "&Setup Users..."
 msgstr ""
 
-#: src/ktouch.cpp:754
+#: src/ktouch.cpp:762
 msgid "&Current User"
 msgstr ""
 
-#: src/ktouch.cpp:817 src/ktouchkeyboard.cpp:270 src/ktouchkeyboard.cpp:322
+#: src/ktouch.cpp:825 src/ktouchkeyboard.cpp:270 src/ktouchkeyboard.cpp:322
 #: src/ktouchkeyboardeditordialog.cpp:523
 #: src/ktouchkeyboardeditordialog.cpp:575
 msgid "untitled keyboard layout"
 msgstr ""
 
-#: src/ktouch.cpp:854 src/ktouchlecture.cpp:209 src/ktouchlecture.cpp:241
+#: src/ktouch.cpp:863 src/ktouchlecture.cpp:209 src/ktouchlecture.cpp:241
 msgid "untitled lecture"
 msgstr ""
 
-#: src/ktouchcoloreditordialog.cpp:101 src/ktouchcoloreditordialog.cpp:153
-msgid "New color scheme"
-msgstr ""
-
-#: src/ktouchcoloreditordialog.cpp:163
-msgid "Save modified color schemes?"
-msgstr ""
-
-#: src/ktouchcolorscheme.cpp:65 src/ktouchcolorscheme.cpp:113
-msgid "untitled color scheme"
-msgstr ""
-
-#: src/ktouchcolorscheme.cpp:247
-msgid "Black && White"
-msgstr "Du & G&wyn"
-
-#: src/ktouchcolorscheme.cpp:267
-msgid "Classic"
-msgstr ""
-
-#: src/ktouchcolorscheme.cpp:293
-msgid "Deep Blue"
-msgstr ""
-
-#: src/ktouchcolorscheme.cpp:318
-msgid "Stripy"
-msgstr ""
-
 #: src/ktouchkeyboard.cpp:64
 #, kde-format
 msgid "Could not open/download keyboard file '%1'"
@@ -2595,7 +2631,7 @@
 "successfully completed the default lecture. Hurray!!!"
 msgstr ""
 
-#: src/ktouchleveldata.cpp:72 src/ktouchleveldata.cpp:104
+#: src/ktouchleveldata.cpp:74 src/ktouchleveldata.cpp:117
 msgctxt "basically all characters on the keyboard"
 msgid "abcdefghijklmnopqrstuvwxyz"
 msgstr ""
@@ -2626,33 +2662,33 @@
 "The training session will restart at the current level."
 msgstr ""
 
-#: src/ktouchstatisticsdialog.cpp:425
+#: src/ktouchstatisticsdialog.cpp:439
 msgid "Time since first practice session in days"
 msgstr ""
 
-#: src/ktouchstatisticsdialog.cpp:429
+#: src/ktouchstatisticsdialog.cpp:443
 msgid "Sessions"
 msgstr "Sesiynau"
 
-#: src/ktouchtrainer.cpp:307
+#: src/ktouchtrainer.cpp:314
 msgid "Starting training session: Waiting for first keypress..."
 msgstr ""
 
-#: src/ktouchtrainer.cpp:326
+#: src/ktouchtrainer.cpp:333
 msgid "Training session paused. Training continues on next keypress..."
 msgstr ""
 
-#: src/ktouchtrainer.cpp:339
+#: src/ktouchtrainer.cpp:346
 msgid "Training session! The time is running..."
 msgstr ""
 
-#: src/ktouchtrainer.cpp:432
+#: src/ktouchtrainer.cpp:439
 msgid ""
 "You have finished this training exercise.\n"
 "This training session will start from the beginning."
 msgstr ""
 
-#: src/ktouchtrainer.cpp:433
+#: src/ktouchtrainer.cpp:440
 msgid "You rock!"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktraderclient.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktraderclient.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktraderclient.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktraderclient.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-11-11 14:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:04+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ktraderclient.cpp:30
 msgid "KTraderClient"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktron.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktron.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktron.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktron.po	2012-04-18 08:59:24.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: ktron\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-13 04:48+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-17 02:23+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,8 +19,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:14+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ktron.cpp:72
 msgid "Right Player / KSnake: Up"
@@ -151,109 +151,109 @@
 msgid "Player %1"
 msgstr ""
 
-#: rc.cpp:49
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: Thierry Vignaud, jr, KD, ,Launchpad Contributions:"
 
-#: rc.cpp:50
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: general.ui:35
 #. i18n: ectx: property (title), widget (QGroupBox, gameTypeGroup)
-#: rc.cpp:3 rc.cpp:53
+#: rc.cpp:5
 msgid "Game Type"
 msgstr ""
 
 #. i18n: file: general.ui:42
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_GameType)
-#: rc.cpp:6 rc.cpp:56
+#: rc.cpp:8
 msgid "KSnakeDuel: Player vs Computer"
 msgstr ""
 
 #. i18n: file: general.ui:47
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_GameType)
-#: rc.cpp:9 rc.cpp:59
+#: rc.cpp:11
 msgid "KSnakeDuel: Player vs Player"
 msgstr ""
 
 #. i18n: file: general.ui:52
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_GameType)
-#: rc.cpp:12 rc.cpp:62
+#: rc.cpp:14
 msgid "KSnake: Single player"
 msgstr ""
 
 #. i18n: file: general.ui:60
 #. i18n: ectx: property (text), widget (QLabel, gameTypeLabel)
-#: rc.cpp:15 rc.cpp:65
+#: rc.cpp:17
 msgid "Game type:"
 msgstr ""
 
 #. i18n: file: general.ui:73
 #. i18n: ectx: property (title), widget (QGroupBox, behaviorGroup)
-#: rc.cpp:18 rc.cpp:68
+#: rc.cpp:20
 msgid "Behavior"
 msgstr "Ymddygiad"
 
 #. i18n: file: general.ui:79
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AcceleratorBlocked)
-#: rc.cpp:21 rc.cpp:71
+#: rc.cpp:23
 msgid "&Disable acceleration"
 msgstr "&Analluogi cyflymu"
 
 #. i18n: file: general.ui:89
 #. i18n: ectx: property (title), widget (QGroupBox, playerNamesGroup)
-#: rc.cpp:24 rc.cpp:74
+#: rc.cpp:26
 msgid "Player Names"
 msgstr "Enwau'r Chwaraewyr"
 
 #. i18n: file: general.ui:101
 #. i18n: ectx: property (text), widget (QLabel, namePlayer1Label)
-#: rc.cpp:27 rc.cpp:77
+#: rc.cpp:29
 msgid "Right player / KSnake:"
 msgstr ""
 
 #. i18n: file: general.ui:111
 #. i18n: ectx: property (text), widget (QLabel, namePlayer2Label)
-#: rc.cpp:30 rc.cpp:80
+#: rc.cpp:32
 msgid "Left player:"
 msgstr ""
 
 #. i18n: file: ktron.kcfg:9
 #. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:33 rc.cpp:83
+#: rc.cpp:35
 msgid "The graphical theme to be used."
 msgstr ""
 
 #. i18n: file: ktron.kcfg:15
 #. i18n: ectx: label, entry (AcceleratorBlocked), group (Game)
-#: rc.cpp:36 rc.cpp:86
+#: rc.cpp:38
 msgid "Whether to disable acceleration."
 msgstr "A ddylid analluogi  cyflymder."
 
 #. i18n: file: ktron.kcfg:19
 #. i18n: ectx: label, entry (Difficulty), group (Game)
-#: rc.cpp:39 rc.cpp:89
+#: rc.cpp:41
 msgid "The difficulty level."
 msgstr ""
 
 #. i18n: file: ktron.kcfg:23
 #. i18n: ectx: label, entry (NamePlayer1), group (Game)
-#: rc.cpp:42 rc.cpp:92
+#: rc.cpp:44
 msgid "The name of player 1."
 msgstr "Enw chwaraewr 1."
 
 #. i18n: file: ktron.kcfg:26
 #. i18n: ectx: label, entry (NamePlayer2), group (Game)
-#: rc.cpp:45 rc.cpp:95
+#: rc.cpp:47
 msgid "The name of player 2."
 msgstr "Enw chwaraewr 2."
 
 #. i18n: file: ktron.kcfg:29
 #. i18n: ectx: label, entry, group (Game)
-#: rc.cpp:48 rc.cpp:98
+#: rc.cpp:50
 msgid "Type of the game"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktuberling.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktuberling.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktuberling.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktuberling.po	2012-04-18 08:59:24.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: ktuberling\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:02+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:53+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:14+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:20
 msgid "Potato game for kids"
@@ -92,105 +92,105 @@
 msgid "Potato to open"
 msgstr "Taten i'w hagor"
 
-#: rc.cpp:16
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Kyfieithu: dylunio, Keith, sam tan, KD, Thierry Vignaud, ,Launchpad "
 "Contributions:"
 
-#: rc.cpp:17
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: ktuberlingui.rc:9
 #. i18n: ectx: Menu (game)
-#: rc.cpp:3 rc.cpp:20
+#: rc.cpp:5
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: ktuberlingui.rc:12
 #. i18n: ectx: Menu (playground)
-#: rc.cpp:6 rc.cpp:23
+#: rc.cpp:8
 msgid "&Playground"
 msgstr "&Lle Chwarae"
 
 #. i18n: file: ktuberlingui.rc:17
 #. i18n: ectx: Menu (speech)
-#: rc.cpp:9 rc.cpp:26
+#: rc.cpp:11
 msgid "&Speech"
 msgstr "&Lleferydd"
 
 #. i18n: file: ktuberlingui.rc:23
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:12 rc.cpp:29
+#: rc.cpp:14
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: ktuberlingui.rc:32
 #. i18n: ectx: ToolBar (gameOptions)
-#: rc.cpp:15 rc.cpp:32
+#: rc.cpp:17
 msgid "Game Options"
 msgstr ""
 
-#: toplevel.cpp:153
+#: toplevel.cpp:171
 msgid "Error while loading the playground."
 msgstr ""
 
-#: toplevel.cpp:191
+#: toplevel.cpp:211
 msgid "Error while loading the sound file."
 msgstr ""
 
-#: toplevel.cpp:255
+#: toplevel.cpp:275
 msgid "Save &as Picture..."
 msgstr "Cad&w fel Llun..."
 
-#: toplevel.cpp:268
+#: toplevel.cpp:288
 msgid "&No Sound"
 msgstr "&Dim Sain"
 
-#: toplevel.cpp:275
+#: toplevel.cpp:295
 msgid "&Lock Aspect Ratio"
 msgstr ""
 
-#: toplevel.cpp:316 toplevel.cpp:354
+#: toplevel.cpp:336 toplevel.cpp:374
 msgid "KTuberling files"
 msgstr ""
 
-#: toplevel.cpp:316 toplevel.cpp:354
+#: toplevel.cpp:336
 msgid "All files"
 msgstr ""
 
-#: toplevel.cpp:337
+#: toplevel.cpp:357
 msgid ""
 "The saved file is from an old version of KTuberling and unfortunately cannot "
 "be opened with this version."
 msgstr ""
 
-#: toplevel.cpp:341
+#: toplevel.cpp:361
 msgid "Could not load file."
 msgstr "Methu llwytho ffeil."
 
-#: toplevel.cpp:366 toplevel.cpp:377 toplevel.cpp:384 toplevel.cpp:423
-#: toplevel.cpp:430
+#: toplevel.cpp:386 toplevel.cpp:397 toplevel.cpp:404 toplevel.cpp:443
+#: toplevel.cpp:450
 msgid "Could not save file."
 msgstr "Methu cadw'r ffeil."
 
-#: toplevel.cpp:411
+#: toplevel.cpp:431
 msgid "Unknown picture format."
 msgstr "Ffurfwedd lun anhysbys."
 
-#: toplevel.cpp:442
+#: toplevel.cpp:462
 #, kde-format
 msgid "Print %1"
 msgstr "Argraffu %1"
 
-#: toplevel.cpp:449
+#: toplevel.cpp:469
 msgid "Could not print picture."
 msgstr "Methu argraffu'r llun."
 
-#: toplevel.cpp:452
+#: toplevel.cpp:472
 msgid "Picture successfully printed."
 msgstr "Arraffwyd y llun yn llwyddiannus."
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kturtle.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kturtle.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kturtle.po	2012-03-23 07:39:29.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kturtle.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kturtle.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 20:07+0000\n"
-"PO-Revision-Date: 2012-03-14 18:17+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 23:11+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,27 +11,27 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:09+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:43+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: interpreter/executer.cpp:270
+#: interpreter/executer.cpp:272
 #, kde-format
 msgid "Internationalized string with an %1"
 msgstr ""
 
-#: interpreter/executer.cpp:271
+#: interpreter/executer.cpp:273
 #, kde-format
 msgid "The %1 command accepts no parameters."
 msgstr ""
 
-#: interpreter/executer.cpp:281
+#: interpreter/executer.cpp:283
 #, kde-format
 msgid "The %2 command was called with %3 but needs 1 parameter."
 msgid_plural "The %2 command was called with %3 but needs %1 parameters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: interpreter/executer.cpp:283
+#: interpreter/executer.cpp:285
 #, kde-format
 msgid "The %2 command was called with %3 but only accepts 1 parameter."
 msgid_plural ""
@@ -39,47 +39,47 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: interpreter/executer.cpp:301
+#: interpreter/executer.cpp:303
 #, kde-format
 msgid "The %1 command only accepts a string as its parameter."
 msgstr ""
 
-#: interpreter/executer.cpp:303
+#: interpreter/executer.cpp:305
 #, kde-format
 msgid "The %1 command only accepts strings as its parameters."
 msgstr ""
 
-#: interpreter/executer.cpp:308
+#: interpreter/executer.cpp:310
 #, kde-format
 msgid "The %1 command only accepts a number as its parameter."
 msgstr ""
 
-#: interpreter/executer.cpp:310
+#: interpreter/executer.cpp:312
 #, kde-format
 msgid "The %1 command only accepts numbers as its parameters."
 msgstr ""
 
-#: interpreter/executer.cpp:315
+#: interpreter/executer.cpp:317
 #, kde-format
 msgid "The %1 command only accepts an answer as its parameter."
 msgstr ""
 
-#: interpreter/executer.cpp:317
+#: interpreter/executer.cpp:319
 #, kde-format
 msgid "The %1 command only accepts answers as its parameters."
 msgstr ""
 
-#: interpreter/executer.cpp:395
+#: interpreter/executer.cpp:397
 #, kde-format
 msgid "The variable '%1' was used without first being assigned to a value"
 msgstr ""
 
-#: interpreter/executer.cpp:414
+#: interpreter/executer.cpp:416
 #, kde-format
 msgid "An unknown function named '%1' was called"
 msgstr ""
 
-#: interpreter/executer.cpp:431 interpreter/executer.cpp:432
+#: interpreter/executer.cpp:433 interpreter/executer.cpp:434
 #, kde-format
 msgctxt ""
 "The function '%1' was called with %2, while it should be called with %3"
@@ -88,129 +88,133 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: interpreter/executer.cpp:429
+#: interpreter/executer.cpp:431
 #, kde-format
 msgid ""
 "The function '%1' was called with %2, while it should be called with %3"
 msgstr ""
 
-#: interpreter/executer.cpp:636
+#: interpreter/executer.cpp:638
 msgid "ASSERT failed"
 msgstr ""
 
-#: interpreter/executer.cpp:642
+#: interpreter/executer.cpp:644
 msgid "'And' needs two variables"
 msgstr ""
 
-#: interpreter/executer.cpp:651
+#: interpreter/executer.cpp:653
 msgid "'Or' needs two variables"
 msgstr ""
 
-#: interpreter/executer.cpp:661
+#: interpreter/executer.cpp:663
 msgid "I need something to do a not on"
 msgstr ""
 
-#: interpreter/executer.cpp:669
+#: interpreter/executer.cpp:671
 msgid "I cannot do a '==' without 2 variables"
 msgstr ""
 
-#: interpreter/executer.cpp:677
+#: interpreter/executer.cpp:679
 msgid "I cannot do a '!=' without 2 variables"
 msgstr ""
 
-#: interpreter/executer.cpp:685
+#: interpreter/executer.cpp:687
 msgid "I cannot do a '>' without 2 variables"
 msgstr ""
 
-#: interpreter/executer.cpp:693
+#: interpreter/executer.cpp:695
 msgid "I cannot do a '<' without 2 variables"
 msgstr ""
 
-#: interpreter/executer.cpp:701
+#: interpreter/executer.cpp:703
 msgid "I cannot do a '>=' without 2 variables"
 msgstr ""
 
-#: interpreter/executer.cpp:709
+#: interpreter/executer.cpp:711
 msgid "I cannot do a '<=' without 2 variables"
 msgstr ""
 
-#: interpreter/executer.cpp:717
+#: interpreter/executer.cpp:719
 msgid "You need two numbers or string to do an addition"
 msgstr ""
 
-#: interpreter/executer.cpp:729
+#: interpreter/executer.cpp:731
 msgid "You need two numbers to subtract"
 msgstr ""
 
-#: interpreter/executer.cpp:736
+#: interpreter/executer.cpp:738
 #, kde-format
 msgid "You tried to subtract from a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:738
+#: interpreter/executer.cpp:740
 #, kde-format
 msgid "You tried to subtract a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:744
+#: interpreter/executer.cpp:746
 msgid "You need two numbers to multiplicate"
 msgstr ""
 
-#: interpreter/executer.cpp:751
+#: interpreter/executer.cpp:753
 #, kde-format
 msgid "You tried to multiplicate a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:753
+#: interpreter/executer.cpp:755
 #, kde-format
 msgid "You tried to multiplicate by a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:759
+#: interpreter/executer.cpp:761
 msgid "You need two numbers to divide"
 msgstr ""
 
-#: interpreter/executer.cpp:764
+#: interpreter/executer.cpp:766
 msgid "You tried to divide by zero"
 msgstr ""
 
-#: interpreter/executer.cpp:770
+#: interpreter/executer.cpp:772
 #, kde-format
 msgid "You tried to divide a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:772
+#: interpreter/executer.cpp:774
 #, kde-format
 msgid "You tried to divide by a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:778
+#: interpreter/executer.cpp:780
 msgid "You need two numbers to raise a power"
 msgstr ""
 
-#: interpreter/executer.cpp:789
+#: interpreter/executer.cpp:791
 msgid "The result of an exponentiation was too large"
 msgstr ""
 
-#: interpreter/executer.cpp:795
+#: interpreter/executer.cpp:797
 #, kde-format
 msgid "You tried to raise a non-number to a power, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:797
+#: interpreter/executer.cpp:799
 #, kde-format
 msgid "You tried to raise the power of a non-number, '%1'"
 msgstr ""
 
-#: interpreter/executer.cpp:803
+#: interpreter/executer.cpp:805
 msgid "You need one variable and a value or variable to do a '='"
 msgstr ""
 
-#: interpreter/executer.cpp:820
+#: interpreter/executer.cpp:822
 #, kde-format
 msgid "The function '%1' is already defined."
 msgstr ""
 
+#: interpreter/executer.cpp:1052
+msgid "Can't do a sqrt of a negative number"
+msgstr ""
+
 #: interpreter/parser.cpp:47
 #, kde-format
 msgid "Expected a command, instead got '%1'"
@@ -248,22 +252,22 @@
 msgid "Expected a name for a command after 'learn' command"
 msgstr ""
 
-#: interpreter/parser.cpp:238
+#: interpreter/parser.cpp:240
 #, kde-format
 msgid "You cannot put '%1' here."
 msgstr ""
 
-#: interpreter/parser.cpp:274
+#: interpreter/parser.cpp:276
 msgid ""
 "Text string was not properly closed, expected a double quote, ' \" ', to "
 "close the string."
 msgstr ""
 
-#: interpreter/parser.cpp:623
+#: interpreter/parser.cpp:625
 msgid "'for' was called wrongly"
 msgstr ""
 
-#: interpreter/parser.cpp:693
+#: interpreter/parser.cpp:695
 msgid "Expected a scope after the 'learn' command"
 msgstr ""
 
@@ -863,7 +867,15 @@
 msgid "getdirection"
 msgstr ""
 
-#: interpreter/translator.cpp:672
+#: interpreter/translator.cpp:667
+msgctxt ""
+"You are about to translate the 'Mod' COMMAND, there are some rules on how to "
+"translate it.Please see http://edu.kde.org/kturtle/translator.php to learn "
+"how to properly translate it."
+msgid "mod"
+msgstr ""
+
+#: interpreter/translator.cpp:686
 msgctxt ""
 "This is an EXAMPLE NAME in KTurtle.Please see "
 "http://edu.kde.org/kturtle/translator.php to learn know how to properly "
@@ -871,7 +883,7 @@
 msgid "triangle"
 msgstr ""
 
-#: interpreter/translator.cpp:684
+#: interpreter/translator.cpp:698
 msgctxt ""
 "This is an EXAMPLE NAME in KTurtle.Please see "
 "http://edu.kde.org/kturtle/translator.php to learn know how to properly "
@@ -879,7 +891,7 @@
 msgid "curly"
 msgstr ""
 
-#: interpreter/translator.cpp:702
+#: interpreter/translator.cpp:716
 msgctxt ""
 "This is an EXAMPLE NAME in KTurtle.Please see "
 "http://edu.kde.org/kturtle/translator.php to learn know how to properly "
@@ -887,7 +899,7 @@
 msgid "arrow"
 msgstr ""
 
-#: interpreter/translator.cpp:729
+#: interpreter/translator.cpp:743
 msgctxt ""
 "This is an EXAMPLE NAME in KTurtle.Please see "
 "http://edu.kde.org/kturtle/translator.php to learn know how to properly "
@@ -1386,7 +1398,7 @@
 
 #. i18n: file: kturtleui.rc:47
 #. i18n: ectx: Menu (run)
-#: mainwindow.cpp:317 mainwindow.cpp:436 rc.cpp:15 rc.cpp:50
+#: mainwindow.cpp:317 mainwindow.cpp:436 rc.cpp:17
 msgid "&Run"
 msgstr ""
 
@@ -1620,7 +1632,7 @@
 
 #. i18n: file: kturtleui.rc:41
 #. i18n: ectx: Menu (canvas)
-#: mainwindow.cpp:518 mainwindow.cpp:541 rc.cpp:12 rc.cpp:47
+#: mainwindow.cpp:518 mainwindow.cpp:541 rc.cpp:14
 msgid "&Canvas"
 msgstr ""
 
@@ -1784,66 +1796,66 @@
 msgid "Message"
 msgstr "Neges"
 
-#: rc.cpp:34
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: rc.cpp:35
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: kturtleui.rc:6
 #. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:38
+#: rc.cpp:5
 msgid "&File"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:11
 #. i18n: ectx: Menu (examples)
-#: rc.cpp:6 rc.cpp:41
+#: rc.cpp:8
 msgid "&Examples"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:24
 #. i18n: ectx: Menu (edit)
-#: rc.cpp:9 rc.cpp:44
+#: rc.cpp:11
 msgid "&Edit"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:51
 #. i18n: ectx: Menu (speed)
-#: rc.cpp:18 rc.cpp:53
+#: rc.cpp:20
 msgid "&Run Speed"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:60
 #. i18n: ectx: Menu (tools)
-#: rc.cpp:21 rc.cpp:56
+#: rc.cpp:23
 msgid "&Tools"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:64
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:24 rc.cpp:59
+#: rc.cpp:26
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:65
 #. i18n: ectx: Menu (language)
-#: rc.cpp:27 rc.cpp:62
+#: rc.cpp:29
 msgid "&Script Language"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:75
 #. i18n: ectx: Menu (help)
-#: rc.cpp:30 rc.cpp:65
+#: rc.cpp:32
 msgid "&Help"
 msgstr ""
 
 #. i18n: file: kturtleui.rc:80
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:33 rc.cpp:68
+#: rc.cpp:35
 msgid "Main Toolbar"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktux.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktux.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/ktux.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/ktux.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdetoys\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 04:38+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2009-12-16 12:12+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:04+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: src/sprite.cpp:54
 msgid "KTux"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kubuntu-firefox-installer.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kubuntu-firefox-installer.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kubuntu-firefox-installer.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kubuntu-firefox-installer.po	2012-04-18 08:59:33.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kubuntu-firefox-installer\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-07-12 18:59+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
 "PO-Revision-Date: 2011-05-08 17:18+0000\n"
 "Last-Translator: Huw <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 22:01+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 03:27+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: src/kubuntufirefoxinstaller.cpp:32 src/main.cpp:34 src/main.cpp:41
 msgid "Mozilla Firefox Installer"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kuiviewer.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kuiviewer.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kuiviewer.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kuiviewer.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/kuiviewer.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2008-02-15 21:57+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:25+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:59+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kuiviewer.cpp:81
 msgid "Unable to locate Kuiviewer kpart."
@@ -38,7 +38,7 @@
 
 #. i18n: file: kuiviewer_part.rc:14
 #. i18n: ectx: ToolBar (styleBar)
-#: kuiviewer_part.cpp:75 rc.cpp:12 rc.cpp:35
+#: kuiviewer_part.cpp:75 rc.cpp:14
 msgid "Style"
 msgstr "Ardull"
 
@@ -70,12 +70,12 @@
 msgid "Screenshot height"
 msgstr ""
 
-#: rc.cpp:22
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:23
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
@@ -84,11 +84,7 @@
 #. i18n: ectx: Menu (file)
 #. i18n: file: kuiviewerui.rc:4
 #. i18n: ectx: Menu (file)
-#. i18n: file: kuiviewer_part.rc:4
-#. i18n: ectx: Menu (file)
-#. i18n: file: kuiviewerui.rc:4
-#. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:15 rc.cpp:26 rc.cpp:38
+#: rc.cpp:5 rc.cpp:17
 msgid "&File"
 msgstr ""
 
@@ -96,11 +92,7 @@
 #. i18n: ectx: Menu (edit)
 #. i18n: file: kuiviewerui.rc:5
 #. i18n: ectx: Menu (edit)
-#. i18n: file: kuiviewer_part.rc:7
-#. i18n: ectx: Menu (edit)
-#. i18n: file: kuiviewerui.rc:5
-#. i18n: ectx: Menu (edit)
-#: rc.cpp:6 rc.cpp:18 rc.cpp:29 rc.cpp:41
+#: rc.cpp:8 rc.cpp:20
 msgid "&Edit"
 msgstr ""
 
@@ -108,10 +100,6 @@
 #. i18n: ectx: Menu (view)
 #. i18n: file: kuiviewerui.rc:6
 #. i18n: ectx: Menu (view)
-#. i18n: file: kuiviewer_part.rc:10
-#. i18n: ectx: Menu (view)
-#. i18n: file: kuiviewerui.rc:6
-#. i18n: ectx: Menu (view)
-#: rc.cpp:9 rc.cpp:21 rc.cpp:32 rc.cpp:44
+#: rc.cpp:11 rc.cpp:23
 msgid "&View"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kuser.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kuser.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kuser.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kuser.po	2012-04-18 08:59:23.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: kuser\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 02:38+0000\n"
-"PO-Revision-Date: 2012-03-13 01:07+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-17 10:51+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:41+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: ku_adduser.cpp:47
 msgid "New Account Options"
@@ -29,11 +29,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_createHomeDir)
 #. i18n: file: kuser.kcfg:55
 #. i18n: ectx: label, entry (createHomeDir), group (connection-$(connection))
-#. i18n: file: ku_generalsettings.ui:127
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_createHomeDir)
-#. i18n: file: kuser.kcfg:55
-#. i18n: ectx: label, entry (createHomeDir), group (connection-$(connection))
-#: ku_adduser.cpp:53 rc.cpp:45 rc.cpp:226 rc.cpp:551 rc.cpp:732
+#: ku_adduser.cpp:53 rc.cpp:59 rc.cpp:240
 msgid "Create home folder"
 msgstr "Creu plygell gartref"
 
@@ -108,7 +104,7 @@
 
 #. i18n: file: ku_generalsettings.ui:41
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_source)
-#: ku_configdlg.cpp:75 rc.cpp:24 rc.cpp:530
+#: ku_configdlg.cpp:75 rc.cpp:38
 msgid "Files"
 msgstr ""
 
@@ -122,13 +118,13 @@
 
 #. i18n: file: ku_ldapsamba.ui:21
 #. i18n: ectx: property (windowTitle), widget (QWidget, KU_LdapSamba)
-#: ku_configdlg.cpp:110 ku_edituser.cpp:271 rc.cpp:57 rc.cpp:563
+#: ku_configdlg.cpp:110 ku_edituser.cpp:271 rc.cpp:71
 msgid "Samba"
 msgstr ""
 
 #. i18n: file: ku_generalsettings.ui:46
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_source)
-#: ku_configdlg.cpp:112 rc.cpp:27 rc.cpp:533
+#: ku_configdlg.cpp:112 rc.cpp:41
 msgid "LDAP"
 msgstr "LDAP"
 
@@ -279,16 +275,8 @@
 #. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_swarn)
 #. i18n: file: ku_passwordpolicy.ui:159
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_sneverexpire)
-#. i18n: file: ku_passwordpolicy.ui:77
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_smax)
-#. i18n: file: ku_passwordpolicy.ui:90
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_sinact)
-#. i18n: file: ku_passwordpolicy.ui:116
-#. i18n: ectx: property (specialValueText), widget (KIntSpinBox, kcfg_swarn)
-#. i18n: file: ku_passwordpolicy.ui:159
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_sneverexpire)
-#: ku_edituser.cpp:82 ku_edituser.cpp:260 rc.cpp:171 rc.cpp:174 rc.cpp:180
-#: rc.cpp:186 rc.cpp:677 rc.cpp:680 rc.cpp:686 rc.cpp:692
+#: ku_edituser.cpp:82 ku_edituser.cpp:260 rc.cpp:185 rc.cpp:188 rc.cpp:194
+#: rc.cpp:200
 msgid "Never"
 msgstr "Byth"
 
@@ -410,7 +398,7 @@
 
 #. i18n: file: ku_ldapsamba.ui:74
 #. i18n: ectx: property (text), widget (QLabel, textLabel4_2_2)
-#: ku_edituser.cpp:293 rc.cpp:66 rc.cpp:572
+#: ku_edituser.cpp:293 rc.cpp:80
 msgid "Home drive:"
 msgstr ""
 
@@ -424,7 +412,7 @@
 
 #. i18n: file: ku_ldapsamba.ui:157
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: ku_edituser.cpp:308 rc.cpp:78 rc.cpp:584
+#: ku_edituser.cpp:308 rc.cpp:92
 msgid "Domain name:"
 msgstr "Enw Parth:"
 
@@ -994,92 +982,92 @@
 msgid "Samba Home Path"
 msgstr ""
 
-#: rc.cpp:493
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Peter Richards, Peter Bradley drwy KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:494
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: kuserui.rc:4
 #. i18n: ectx: Menu (file)
-#: rc.cpp:483 rc.cpp:497
+#: rc.cpp:5
 msgid "&File"
 msgstr ""
 
 #. i18n: file: kuserui.rc:8
 #. i18n: ectx: Menu (user)
-#: rc.cpp:486 rc.cpp:500
+#: rc.cpp:8
 msgid "&User"
 msgstr "&Defnyddiwr"
 
 #. i18n: file: kuserui.rc:14
 #. i18n: ectx: Menu (group)
-#: rc.cpp:489 rc.cpp:503
+#: rc.cpp:11
 msgid "&Group"
 msgstr "&Grŵp"
 
 #. i18n: file: kuserui.rc:19
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:492 rc.cpp:506
+#: rc.cpp:14
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: ku_filessettings.ui:30
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:3 rc.cpp:509
+#: rc.cpp:17
 msgid "User/group database locations"
 msgstr ""
 
 #. i18n: file: ku_filessettings.ui:42
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_md5shadow)
-#: rc.cpp:6 rc.cpp:512
+#: rc.cpp:20
 msgid "MD5 shadow passwords"
 msgstr ""
 
 #. i18n: file: ku_filessettings.ui:52
 #. i18n: ectx: property (text), widget (QLabel, textLabel6_3)
-#: rc.cpp:9 rc.cpp:515
+#: rc.cpp:23
 msgid "Shadow group file:"
 msgstr ""
 
 #. i18n: file: ku_filessettings.ui:65
 #. i18n: ectx: property (text), widget (QLabel, textLabel5_3)
-#: rc.cpp:12 rc.cpp:518
+#: rc.cpp:26
 msgid "Shadow password file:"
 msgstr ""
 
 #. i18n: file: ku_filessettings.ui:78
 #. i18n: ectx: property (text), widget (QLabel, textLabel4_3)
-#: rc.cpp:15 rc.cpp:521
+#: rc.cpp:29
 msgid "Group file:"
 msgstr ""
 
 #. i18n: file: ku_filessettings.ui:88
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_3)
-#: rc.cpp:18 rc.cpp:524
+#: rc.cpp:32
 msgid "Password file:"
 msgstr ""
 
 #. i18n: file: ku_generalsettings.ui:30
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:21 rc.cpp:527
+#: rc.cpp:35
 msgid "Source of user/group database:"
 msgstr ""
 
 #. i18n: file: ku_generalsettings.ui:51
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_source)
-#: rc.cpp:30 rc.cpp:536
+#: rc.cpp:44
 msgid "System"
 msgstr "Cysawd"
 
 #. i18n: file: ku_generalsettings.ui:72
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:33 rc.cpp:539
+#: rc.cpp:47
 msgid "First normal GID:"
 msgstr ""
 
@@ -1087,23 +1075,19 @@
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
 #. i18n: file: ku_ldapsamba.ui:103
 #. i18n: ectx: property (text), widget (QLabel, textLabel5_2_2)
-#. i18n: file: ku_generalsettings.ui:82
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#. i18n: file: ku_ldapsamba.ui:103
-#. i18n: ectx: property (text), widget (QLabel, textLabel5_2_2)
-#: rc.cpp:36 rc.cpp:72 rc.cpp:542 rc.cpp:578
+#: rc.cpp:50 rc.cpp:86
 msgid "Home path template:"
 msgstr ""
 
 #. i18n: file: ku_generalsettings.ui:92
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:39 rc.cpp:545
+#: rc.cpp:53
 msgid "Shell:"
 msgstr "Plisgyn:"
 
 #. i18n: file: ku_generalsettings.ui:109
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
-#: rc.cpp:42 rc.cpp:548
+#: rc.cpp:56
 msgid "First normal UID:"
 msgstr ""
 
@@ -1111,11 +1095,7 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_copySkel)
 #. i18n: file: kuser.kcfg:60
 #. i18n: ectx: label, entry (copySkel), group (connection-$(connection))
-#. i18n: file: ku_generalsettings.ui:137
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_copySkel)
-#. i18n: file: kuser.kcfg:60
-#. i18n: ectx: label, entry (copySkel), group (connection-$(connection))
-#: rc.cpp:48 rc.cpp:232 rc.cpp:554 rc.cpp:738
+#: rc.cpp:62 rc.cpp:246
 msgid "Copy skeleton to home folder"
 msgstr "Copïo sgerbwd i'r blygell gartref"
 
@@ -1123,35 +1103,31 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_userPrivateGroup)
 #. i18n: file: kuser.kcfg:65
 #. i18n: ectx: label, entry (userPrivateGroup), group (connection-$(connection))
-#. i18n: file: ku_generalsettings.ui:152
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_userPrivateGroup)
-#. i18n: file: kuser.kcfg:65
-#. i18n: ectx: label, entry (userPrivateGroup), group (connection-$(connection))
-#: rc.cpp:51 rc.cpp:238 rc.cpp:557 rc.cpp:744
+#: rc.cpp:65 rc.cpp:252
 msgid "User private groups"
 msgstr ""
 
 #. i18n: file: ku_generalsettings.ui:159
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:54 rc.cpp:560
+#: rc.cpp:68
 msgid "Default group:"
 msgstr ""
 
 #. i18n: file: ku_ldapsamba.ui:36
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ldapsam)
-#: rc.cpp:60 rc.cpp:566
+#: rc.cpp:74
 msgid "Manage Samba user accounts/groups"
 msgstr ""
 
 #. i18n: file: ku_ldapsamba.ui:61
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_2_2)
-#: rc.cpp:63 rc.cpp:569
+#: rc.cpp:77
 msgid "Default login script:"
 msgstr ""
 
 #. i18n: file: ku_ldapsamba.ui:87
 #. i18n: ectx: property (text), widget (QLabel, textLabel3_2_2)
-#: rc.cpp:69 rc.cpp:575
+#: rc.cpp:83
 msgid "Profile path template:"
 msgstr ""
 
@@ -1159,29 +1135,25 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_lanmanhash)
 #. i18n: file: kuser.kcfg:304
 #. i18n: ectx: label, entry (lanmanhash), group (connection-$(connection))
-#. i18n: file: ku_ldapsamba.ui:139
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_lanmanhash)
-#. i18n: file: kuser.kcfg:304
-#. i18n: ectx: label, entry (lanmanhash), group (connection-$(connection))
-#: rc.cpp:75 rc.cpp:477 rc.cpp:581 rc.cpp:983
+#: rc.cpp:89 rc.cpp:491
 msgid "Store LanManager hashed password"
 msgstr ""
 
 #. i18n: file: ku_ldapsamba.ui:177
 #. i18n: ectx: property (text), widget (KPushButton, domQuery)
-#: rc.cpp:81 rc.cpp:587
+#: rc.cpp:95
 msgid "&Query Server"
 msgstr "&Gweinydd Ymholiad"
 
 #. i18n: file: ku_ldapsamba.ui:189
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:84 rc.cpp:590
+#: rc.cpp:98
 msgid "Domain SID (you can obtain with 'net getlocalsid domain_name'):"
 msgstr ""
 
 #. i18n: file: ku_ldapsamba.ui:217
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:87 rc.cpp:593
+#: rc.cpp:101
 msgid "Algorithmic RID base:"
 msgstr ""
 
@@ -1189,131 +1161,127 @@
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapgrouprdn)
 #. i18n: file: ku_ldapsettings.ui:165
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapuserrdn)
-#. i18n: file: ku_ldapsettings.ui:34
-#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapgrouprdn)
-#. i18n: file: ku_ldapsettings.ui:165
-#. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapuserrdn)
-#: rc.cpp:90 rc.cpp:141 rc.cpp:596 rc.cpp:647
+#: rc.cpp:104 rc.cpp:155
 msgid "cn"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:39
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapgrouprdn)
-#: rc.cpp:93 rc.cpp:599
+#: rc.cpp:107
 msgid "gidNumber"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:51
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldappasswordhash)
-#: rc.cpp:96 rc.cpp:602
+#: rc.cpp:110
 msgid "Plain Text"
 msgstr "Testun Plaen"
 
 #. i18n: file: ku_ldapsettings.ui:56
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldappasswordhash)
-#: rc.cpp:99 rc.cpp:605
+#: rc.cpp:113
 msgid "CRYPT"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:61
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldappasswordhash)
-#: rc.cpp:102 rc.cpp:608
+#: rc.cpp:116
 msgid "MD5"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:66
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldappasswordhash)
-#: rc.cpp:105 rc.cpp:611
+#: rc.cpp:119
 msgid "SMD5"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:71
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldappasswordhash)
-#: rc.cpp:108 rc.cpp:614
+#: rc.cpp:122
 msgid "SHA"
 msgstr "SHA"
 
 #. i18n: file: ku_ldapsettings.ui:76
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldappasswordhash)
-#: rc.cpp:111 rc.cpp:617
+#: rc.cpp:125
 msgid "SSHA"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:84
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:114 rc.cpp:620
+#: rc.cpp:128
 msgid "User base:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:94
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_4_2)
-#: rc.cpp:117 rc.cpp:623
+#: rc.cpp:131
 msgid "Group filter:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:104
 #. i18n: ectx: property (text), widget (QLabel, textLabel5)
-#: rc.cpp:120 rc.cpp:626
+#: rc.cpp:134
 msgid "Structural objectclass:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:114
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:123 rc.cpp:629
+#: rc.cpp:137
 msgid "User filter:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:131
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapstructural)
-#: rc.cpp:126 rc.cpp:632
+#: rc.cpp:140
 msgid "account"
 msgstr "cyfrif"
 
 #. i18n: file: ku_ldapsettings.ui:136
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapstructural)
-#: rc.cpp:129 rc.cpp:635
+#: rc.cpp:143
 msgid "inetOrgPerson"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:144
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:132 rc.cpp:638
+#: rc.cpp:146
 msgid "Group RDN prefix:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:155
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapuserrdn)
-#: rc.cpp:135 rc.cpp:641
+#: rc.cpp:149
 msgid "uid"
 msgstr "uid"
 
 #. i18n: file: ku_ldapsettings.ui:160
 #. i18n: ectx: property (text), item, widget (KComboBox, kcfg_ldapuserrdn)
-#: rc.cpp:138 rc.cpp:644
+#: rc.cpp:152
 msgid "uidNumber"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:173
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:144 rc.cpp:650
+#: rc.cpp:158
 msgid "Group base:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:183
 #. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:147 rc.cpp:653
+#: rc.cpp:161
 msgid "User RDN prefix:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:193
 #. i18n: ectx: property (text), widget (QLabel, textLabel4)
-#: rc.cpp:150 rc.cpp:656
+#: rc.cpp:164
 msgid "Password hash:"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:205
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ldapshadow)
-#: rc.cpp:153 rc.cpp:659
+#: rc.cpp:167
 msgid "Manage shadowAccount objectclass"
 msgstr ""
 
@@ -1321,71 +1289,67 @@
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ldapcnfullname)
 #. i18n: file: kuser.kcfg:225
 #. i18n: ectx: label, entry (ldapcnfullname), group (connection-$(connection))
-#. i18n: file: ku_ldapsettings.ui:212
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ldapcnfullname)
-#. i18n: file: kuser.kcfg:225
-#. i18n: ectx: label, entry (ldapcnfullname), group (connection-$(connection))
-#: rc.cpp:156 rc.cpp:391 rc.cpp:662 rc.cpp:897
+#: rc.cpp:170 rc.cpp:405
 msgid "Store the user's full name in the cn attribute"
 msgstr ""
 
 #. i18n: file: ku_ldapsettings.ui:219
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_ldapgecos)
-#: rc.cpp:159 rc.cpp:665
+#: rc.cpp:173
 msgid "Update the gecos attribute"
 msgstr ""
 
 #. i18n: file: ku_passwordpolicy.ui:38
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:162 rc.cpp:668
+#: rc.cpp:176
 msgid "Time before password expires to issue an expire warning:"
 msgstr ""
 
 #. i18n: file: ku_passwordpolicy.ui:51
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:165 rc.cpp:671
+#: rc.cpp:179
 msgid "Time when password expires after last password change:"
 msgstr ""
 
 #. i18n: file: ku_passwordpolicy.ui:64
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_4)
-#: rc.cpp:168 rc.cpp:674
+#: rc.cpp:182
 msgid "Time when account will be disabled after expiration of password:"
 msgstr ""
 
 #. i18n: file: ku_passwordpolicy.ui:103
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:177 rc.cpp:683
+#: rc.cpp:191
 msgid "Time before password may not be changed after last password change:"
 msgstr ""
 
 #. i18n: file: ku_passwordpolicy.ui:149
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:183 rc.cpp:689
+#: rc.cpp:197
 msgid "Account will expire on:"
 msgstr "Bydd y cyfrif yn darfod ar:"
 
 #. i18n: file: kuser.kcfg:16
 #. i18n: ectx: label, entry (connection), group (general)
-#: rc.cpp:189 rc.cpp:695
+#: rc.cpp:203
 msgid "Default connection"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:20
 #. i18n: ectx: label, entry (showsys), group (general)
-#: rc.cpp:192 rc.cpp:698
+#: rc.cpp:206
 msgid "Show system users"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:26
 #. i18n: ectx: label, entry (source), group (connection-$(connection))
-#: rc.cpp:195 rc.cpp:701
+#: rc.cpp:209
 msgid "The source of the user and group database"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:27
 #. i18n: ectx: whatsthis, entry (source), group (connection-$(connection))
-#: rc.cpp:198 rc.cpp:704
+#: rc.cpp:212
 msgid ""
 "This option allows you to select where the user/group data stored. Currently "
 "three storage backends are supported. <BR><B>Files</B> stores user/group "
@@ -1398,13 +1362,13 @@
 
 #. i18n: file: kuser.kcfg:36
 #. i18n: ectx: label, entry (shell), group (connection-$(connection))
-#: rc.cpp:201 rc.cpp:707
+#: rc.cpp:215
 msgid "Shell"
 msgstr "Plisgyn"
 
 #. i18n: file: kuser.kcfg:37
 #. i18n: ectx: whatsthis, entry (shell), group (connection-$(connection))
-#: rc.cpp:204 rc.cpp:710
+#: rc.cpp:218
 msgid ""
 "This option allows you to select the shell which will be the default for new "
 "users."
@@ -1412,13 +1376,13 @@
 
 #. i18n: file: kuser.kcfg:40
 #. i18n: ectx: label, entry (homepath), group (connection-$(connection))
-#: rc.cpp:207 rc.cpp:713
+#: rc.cpp:221
 msgid "Home path template"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:41
 #. i18n: ectx: whatsthis, entry (homepath), group (connection-$(connection))
-#: rc.cpp:211 rc.cpp:717
+#: rc.cpp:225
 #, no-c-format
 msgid ""
 "This option specifies the UNIX home path template for new users. The '%U' "
@@ -1427,13 +1391,13 @@
 
 #. i18n: file: kuser.kcfg:45
 #. i18n: ectx: label, entry (firstUID), group (connection-$(connection))
-#: rc.cpp:214 rc.cpp:720
+#: rc.cpp:228
 msgid "First UID"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:46
 #. i18n: ectx: whatsthis, entry (firstUID), group (connection-$(connection))
-#: rc.cpp:217 rc.cpp:723
+#: rc.cpp:231
 msgid ""
 "This options specifies the first user ID where searching for an available "
 "UID starts."
@@ -1441,13 +1405,13 @@
 
 #. i18n: file: kuser.kcfg:50
 #. i18n: ectx: label, entry (firstGID), group (connection-$(connection))
-#: rc.cpp:220 rc.cpp:726
+#: rc.cpp:234
 msgid "First GID"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:51
 #. i18n: ectx: whatsthis, entry (firstGID), group (connection-$(connection))
-#: rc.cpp:223 rc.cpp:729
+#: rc.cpp:237
 msgid ""
 "This options specifies the first group ID where searching for an available "
 "GID starts."
@@ -1455,7 +1419,7 @@
 
 #. i18n: file: kuser.kcfg:56
 #. i18n: ectx: whatsthis, entry (createHomeDir), group (connection-$(connection))
-#: rc.cpp:229 rc.cpp:735
+#: rc.cpp:243
 msgid ""
 "If this option is checked then a home directory will created for the new "
 "user."
@@ -1463,7 +1427,7 @@
 
 #. i18n: file: kuser.kcfg:61
 #. i18n: ectx: whatsthis, entry (copySkel), group (connection-$(connection))
-#: rc.cpp:235 rc.cpp:741
+#: rc.cpp:249
 msgid ""
 "If this option is checked then the contents of the skeleton folder will "
 "copied to the new user's home directory"
@@ -1471,7 +1435,7 @@
 
 #. i18n: file: kuser.kcfg:66
 #. i18n: ectx: whatsthis, entry (userPrivateGroup), group (connection-$(connection))
-#: rc.cpp:241 rc.cpp:747
+#: rc.cpp:255
 msgid ""
 "If this option is enabled, new user creation will create a private group "
 "named as the user, and the primary group of the user will assigned to this "
@@ -1480,13 +1444,13 @@
 
 #. i18n: file: kuser.kcfg:70
 #. i18n: ectx: label, entry (defaultgroup), group (connection-$(connection))
-#: rc.cpp:244 rc.cpp:750
+#: rc.cpp:258
 msgid "Default primary group"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:71
 #. i18n: ectx: whatsthis, entry (defaultgroup), group (connection-$(connection))
-#: rc.cpp:247 rc.cpp:753
+#: rc.cpp:261
 msgid ""
 "This is the default primary group which will be assigned to a newly created "
 "user."
@@ -1494,85 +1458,85 @@
 
 #. i18n: file: kuser.kcfg:76
 #. i18n: ectx: label, entry (smin), group (connection-$(connection))
-#: rc.cpp:250 rc.cpp:756
+#: rc.cpp:264
 msgid "smin"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:80
 #. i18n: ectx: label, entry (smax), group (connection-$(connection))
-#: rc.cpp:253 rc.cpp:759
+#: rc.cpp:267
 msgid "smax"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:84
 #. i18n: ectx: label, entry (swarn), group (connection-$(connection))
-#: rc.cpp:256 rc.cpp:762
+#: rc.cpp:270
 msgid "swarn"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:88
 #. i18n: ectx: label, entry (sinact), group (connection-$(connection))
-#: rc.cpp:259 rc.cpp:765
+#: rc.cpp:273
 msgid "sinact"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:92
 #. i18n: ectx: label, entry (sexpire), group (connection-$(connection))
-#: rc.cpp:262 rc.cpp:768
+#: rc.cpp:276
 msgid "sexpire"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:93
 #. i18n: ectx: whatsthis, entry (sexpire), group (connection-$(connection))
-#: rc.cpp:265 rc.cpp:771
+#: rc.cpp:279
 msgid "This setting is for specifying a date when user accounts will expire."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:97
 #. i18n: ectx: label, entry (sneverexpire), group (connection-$(connection))
-#: rc.cpp:268 rc.cpp:774
+#: rc.cpp:282
 msgid "sneverexpire"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:98
 #. i18n: ectx: whatsthis, entry (sneverexpire), group (connection-$(connection))
-#: rc.cpp:271 rc.cpp:777
+#: rc.cpp:285
 msgid "Check this if you want to user accounts never expire."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:103
 #. i18n: ectx: label, entry (passwdsrc), group (connection-$(connection))
-#: rc.cpp:274 rc.cpp:780
+#: rc.cpp:288
 msgid "Password file"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:104
 #. i18n: ectx: whatsthis, entry (passwdsrc), group (connection-$(connection))
-#: rc.cpp:277 rc.cpp:783
+#: rc.cpp:291
 msgid "This specifies the users database file (usually /etc/passwd)."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:108
 #. i18n: ectx: label, entry (groupsrc), group (connection-$(connection))
-#: rc.cpp:280 rc.cpp:786
+#: rc.cpp:294
 msgid "Group file"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:109
 #. i18n: ectx: whatsthis, entry (groupsrc), group (connection-$(connection))
-#: rc.cpp:283 rc.cpp:789
+#: rc.cpp:297
 msgid "This specifies the groups database file (usually /etc/group)."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:113
 #. i18n: ectx: label, entry (md5shadow), group (connection-$(connection))
-#: rc.cpp:286 rc.cpp:792
+#: rc.cpp:300
 msgid "MD5 Shadow passwords"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:114
 #. i18n: ectx: whatsthis, entry (md5shadow), group (connection-$(connection))
-#: rc.cpp:289 rc.cpp:795
+#: rc.cpp:303
 msgid ""
 "Check this if you want the passwords in the shadow file MD5 hashed. Leave "
 "this unchecked if DES encryption should be used."
@@ -1580,13 +1544,13 @@
 
 #. i18n: file: kuser.kcfg:117
 #. i18n: ectx: label, entry (shadowsrc), group (connection-$(connection))
-#: rc.cpp:292 rc.cpp:798
+#: rc.cpp:306
 msgid "Shadow password file"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:118
 #. i18n: ectx: whatsthis, entry (shadowsrc), group (connection-$(connection))
-#: rc.cpp:295 rc.cpp:801
+#: rc.cpp:309
 msgid ""
 "Specifies the shadow password file (usually /etc/shadow). Leave this empty "
 "if your system does not use a shadow password file."
@@ -1594,13 +1558,13 @@
 
 #. i18n: file: kuser.kcfg:122
 #. i18n: ectx: label, entry (gshadowsrc), group (connection-$(connection))
-#: rc.cpp:298 rc.cpp:804
+#: rc.cpp:312
 msgid "Group shadow file"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:123
 #. i18n: ectx: whatsthis, entry (gshadowsrc), group (connection-$(connection))
-#: rc.cpp:301 rc.cpp:807
+#: rc.cpp:315
 msgid ""
 "Specifies the shadow group file (usually /etc/gshadow). Leave this empty if "
 "your system does not use a shadow group file."
@@ -1608,49 +1572,49 @@
 
 #. i18n: file: kuser.kcfg:128
 #. i18n: ectx: label, entry (ldapuser), group (connection-$(connection))
-#: rc.cpp:304 rc.cpp:810
+#: rc.cpp:318
 msgid "LDAP User"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:131
 #. i18n: ectx: label, entry (ldappassword), group (connection-$(connection))
-#: rc.cpp:307 rc.cpp:813
+#: rc.cpp:321
 msgid "LDAP Password"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:134
 #. i18n: ectx: label, entry (ldaprealm), group (connection-$(connection))
-#: rc.cpp:310 rc.cpp:816
+#: rc.cpp:324
 msgid "LDAP SASL Realm"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:137
 #. i18n: ectx: label, entry (ldapbinddn), group (connection-$(connection))
-#: rc.cpp:313 rc.cpp:819
+#: rc.cpp:327
 msgid "LDAP Bind DN"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:140
 #. i18n: ectx: label, entry (ldaphost), group (connection-$(connection))
-#: rc.cpp:316 rc.cpp:822
+#: rc.cpp:330
 msgid "LDAP Host"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:143
 #. i18n: ectx: label, entry (ldapport), group (connection-$(connection))
-#: rc.cpp:319 rc.cpp:825
+#: rc.cpp:333
 msgid "LDAP Port"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:147
 #. i18n: ectx: label, entry (ldapver), group (connection-$(connection))
-#: rc.cpp:322 rc.cpp:828
+#: rc.cpp:336
 msgid "LDAP version"
 msgstr "Fersiwn LDAP"
 
 #. i18n: file: kuser.kcfg:151
 #. i18n: ectx: label, entry (ldapsizelimit), group (connection-$(connection))
-#: rc.cpp:325 rc.cpp:831
+#: rc.cpp:339
 msgid "LDAP Size limit"
 msgstr ""
 
@@ -1658,133 +1622,129 @@
 #. i18n: ectx: label, entry (ldaptimelimit), group (connection-$(connection))
 #. i18n: file: kuser.kcfg:159
 #. i18n: ectx: label, entry (ldappagesize), group (connection-$(connection))
-#. i18n: file: kuser.kcfg:155
-#. i18n: ectx: label, entry (ldaptimelimit), group (connection-$(connection))
-#. i18n: file: kuser.kcfg:159
-#. i18n: ectx: label, entry (ldappagesize), group (connection-$(connection))
-#: rc.cpp:328 rc.cpp:331 rc.cpp:834 rc.cpp:837
+#: rc.cpp:342 rc.cpp:345
 msgid "LDAP Time limit"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:163
 #. i18n: ectx: label, entry (ldapdn), group (connection-$(connection))
-#: rc.cpp:334 rc.cpp:840
+#: rc.cpp:348
 msgid "LDAP Base DN"
 msgstr "Sail DN LDAP"
 
 #. i18n: file: kuser.kcfg:166
 #. i18n: ectx: label, entry (ldapfilter), group (connection-$(connection))
-#: rc.cpp:337 rc.cpp:843
+#: rc.cpp:351
 msgid "LDAP Filter"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:169
 #. i18n: ectx: label, entry (ldapnosec), group (connection-$(connection))
-#: rc.cpp:340 rc.cpp:846
+#: rc.cpp:354
 msgid "LDAP no encryption"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:173
 #. i18n: ectx: label, entry (ldaptls), group (connection-$(connection))
-#: rc.cpp:343 rc.cpp:849
+#: rc.cpp:357
 msgid "LDAP TLS"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:177
 #. i18n: ectx: label, entry (ldapssl), group (connection-$(connection))
-#: rc.cpp:346 rc.cpp:852
+#: rc.cpp:360
 msgid "LDAP SSL"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:181
 #. i18n: ectx: label, entry (ldapanon), group (connection-$(connection))
-#: rc.cpp:349 rc.cpp:855
+#: rc.cpp:363
 msgid "LDAP Anonymous"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:185
 #. i18n: ectx: label, entry (ldapsimple), group (connection-$(connection))
-#: rc.cpp:352 rc.cpp:858
+#: rc.cpp:366
 msgid "LDAP Simple auth"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:189
 #. i18n: ectx: label, entry (ldapsasl), group (connection-$(connection))
-#: rc.cpp:355 rc.cpp:861
+#: rc.cpp:369
 msgid "LDAP SASL auth"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:193
 #. i18n: ectx: label, entry (ldapsaslmech), group (connection-$(connection))
-#: rc.cpp:358 rc.cpp:864
+#: rc.cpp:372
 msgid "LDAP SASL mechanism"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:197
 #. i18n: ectx: label, entry (ldapuserbase), group (connection-$(connection))
-#: rc.cpp:361 rc.cpp:867
+#: rc.cpp:375
 msgid "LDAP User container"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:198
 #. i18n: ectx: whatsthis, entry (ldapuserbase), group (connection-$(connection))
-#: rc.cpp:364 rc.cpp:870
+#: rc.cpp:378
 msgid ""
 "This specifies where to store users' entries relative to the LDAP base DN."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:202
 #. i18n: ectx: label, entry (ldapuserfilter), group (connection-$(connection))
-#: rc.cpp:367 rc.cpp:873
+#: rc.cpp:381
 msgid "LDAP User filter"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:203
 #. i18n: ectx: whatsthis, entry (ldapuserfilter), group (connection-$(connection))
-#: rc.cpp:370 rc.cpp:876
+#: rc.cpp:384
 msgid "This specifies the filter used for user entries."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:206
 #. i18n: ectx: label, entry (ldapgroupbase), group (connection-$(connection))
-#: rc.cpp:373 rc.cpp:879
+#: rc.cpp:387
 msgid "LDAP Group container"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:207
 #. i18n: ectx: whatsthis, entry (ldapgroupbase), group (connection-$(connection))
-#: rc.cpp:376 rc.cpp:882
+#: rc.cpp:390
 msgid ""
 "This specifies where to store groups' entries relative to the LDAP base DN."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:211
 #. i18n: ectx: label, entry (ldapgroupfilter), group (connection-$(connection))
-#: rc.cpp:379 rc.cpp:885
+#: rc.cpp:393
 msgid "LDAP Group filter"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:212
 #. i18n: ectx: whatsthis, entry (ldapgroupfilter), group (connection-$(connection))
-#: rc.cpp:382 rc.cpp:888
+#: rc.cpp:396
 msgid "This specifies the filter used for group entries."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:215
 #. i18n: ectx: label, entry (ldapuserrdn), group (connection-$(connection))
-#: rc.cpp:385 rc.cpp:891
+#: rc.cpp:399
 msgid "LDAP User RDN prefix"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:216
 #. i18n: ectx: whatsthis, entry (ldapuserrdn), group (connection-$(connection))
-#: rc.cpp:388 rc.cpp:894
+#: rc.cpp:402
 msgid "This specifies what prefix will used for user entries."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:226
 #. i18n: ectx: whatsthis, entry (ldapcnfullname), group (connection-$(connection))
-#: rc.cpp:394 rc.cpp:900
+#: rc.cpp:408
 msgid ""
 "Check this if the user's full name should be stored in the cn (Canonical "
 "Name) attribute."
@@ -1792,25 +1752,25 @@
 
 #. i18n: file: kuser.kcfg:230
 #. i18n: ectx: label, entry (ldapgecos), group (connection-$(connection))
-#: rc.cpp:397 rc.cpp:903
+#: rc.cpp:411
 msgid "Update the gecos field"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:231
 #. i18n: ectx: whatsthis, entry (ldapgecos), group (connection-$(connection))
-#: rc.cpp:400 rc.cpp:906
+#: rc.cpp:414
 msgid "Check this if the gecos attribute should be updated."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:235
 #. i18n: ectx: label, entry (ldapshadow), group (connection-$(connection))
-#: rc.cpp:403 rc.cpp:909
+#: rc.cpp:417
 msgid "Manage LDAP shadowAccount objectclass"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:236
 #. i18n: ectx: whatsthis, entry (ldapshadow), group (connection-$(connection))
-#: rc.cpp:406 rc.cpp:912
+#: rc.cpp:420
 msgid ""
 "Check this if the shadowAccount object should be used in the users' entries. "
 "It allows to enforce password change/expiration policies."
@@ -1818,13 +1778,13 @@
 
 #. i18n: file: kuser.kcfg:240
 #. i18n: ectx: label, entry (ldapstructural), group (connection-$(connection))
-#: rc.cpp:409 rc.cpp:915
+#: rc.cpp:423
 msgid "LDAP Structural objectclass"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:241
 #. i18n: ectx: whatsthis, entry (ldapstructural), group (connection-$(connection))
-#: rc.cpp:412 rc.cpp:918
+#: rc.cpp:426
 msgid ""
 "This option allows to specify the structural objectclass used with users' "
 "entries. If you want to use these entries not just for authentication, but "
@@ -1833,37 +1793,37 @@
 
 #. i18n: file: kuser.kcfg:249
 #. i18n: ectx: label, entry (ldapgrouprdn), group (connection-$(connection))
-#: rc.cpp:415 rc.cpp:921
+#: rc.cpp:429
 msgid "LDAP Group RDN prefix"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:250
 #. i18n: ectx: whatsthis, entry (ldapgrouprdn), group (connection-$(connection))
-#: rc.cpp:418 rc.cpp:924
+#: rc.cpp:432
 msgid "This specifies what prefix will used for group entries."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:258
 #. i18n: ectx: label, entry (ldappasswordhash), group (connection-$(connection))
-#: rc.cpp:421 rc.cpp:927
+#: rc.cpp:435
 msgid "LDAP Password hash method"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:259
 #. i18n: ectx: whatsthis, entry (ldappasswordhash), group (connection-$(connection))
-#: rc.cpp:424 rc.cpp:930
+#: rc.cpp:438
 msgid "This specifies the password hashing method. The most secure is SSHA."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:271
 #. i18n: ectx: label, entry (ldapsam), group (connection-$(connection))
-#: rc.cpp:427 rc.cpp:933
+#: rc.cpp:441
 msgid "Enable samba account management"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:272
 #. i18n: ectx: whatsthis, entry (ldapsam), group (connection-$(connection))
-#: rc.cpp:430 rc.cpp:936
+#: rc.cpp:444
 msgid ""
 "Check this if you want to use the user/group entries in a Samba domain. "
 "KUser will create sambaSamAccount objectclass for each entry which is usable "
@@ -1872,25 +1832,25 @@
 
 #. i18n: file: kuser.kcfg:275
 #. i18n: ectx: label, entry (samdomain), group (connection-$(connection))
-#: rc.cpp:433 rc.cpp:939
+#: rc.cpp:447
 msgid "Samba domain name"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:276
 #. i18n: ectx: whatsthis, entry (samdomain), group (connection-$(connection))
-#: rc.cpp:436 rc.cpp:942
+#: rc.cpp:450
 msgid "This specifies the samba domain name."
 msgstr ""
 
 #. i18n: file: kuser.kcfg:279
 #. i18n: ectx: label, entry (samdomsid), group (connection-$(connection))
-#: rc.cpp:439 rc.cpp:945
+#: rc.cpp:453
 msgid "Samba domain SID"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:280
 #. i18n: ectx: whatsthis, entry (samdomsid), group (connection-$(connection))
-#: rc.cpp:442 rc.cpp:948
+#: rc.cpp:456
 msgid ""
 "This specifies the domain Security IDentifier. It is unique in a single "
 "domain. You can query the value of the domain SID with 'net getlocalsid "
@@ -1899,13 +1859,13 @@
 
 #. i18n: file: kuser.kcfg:283
 #. i18n: ectx: label, entry (samridbase), group (connection-$(connection))
-#: rc.cpp:445 rc.cpp:951
+#: rc.cpp:459
 msgid "Algorithmic RID base"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:284
 #. i18n: ectx: whatsthis, entry (samridbase), group (connection-$(connection))
-#: rc.cpp:448 rc.cpp:954
+#: rc.cpp:462
 msgid ""
 "This value is an offset for the algorithmic mapping from uids and gids to "
 "rids. The default (and minimum) value is 1000, it must be even, and the LDAP "
@@ -1914,13 +1874,13 @@
 
 #. i18n: file: kuser.kcfg:288
 #. i18n: ectx: label, entry (samloginscript), group (connection-$(connection))
-#: rc.cpp:451 rc.cpp:957
+#: rc.cpp:465
 msgid "Samba login script"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:289
 #. i18n: ectx: whatsthis, entry (samloginscript), group (connection-$(connection))
-#: rc.cpp:454 rc.cpp:960
+#: rc.cpp:468
 msgid ""
 "This specifies a name of a login script (in the `Netlogon` share) which will "
 "be executed as the user logs in to a Windows machine."
@@ -1928,13 +1888,13 @@
 
 #. i18n: file: kuser.kcfg:292
 #. i18n: ectx: label, entry (samhomedrive), group (connection-$(connection))
-#: rc.cpp:457 rc.cpp:963
+#: rc.cpp:471
 msgid "Samba home drive"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:293
 #. i18n: ectx: whatsthis, entry (samhomedrive), group (connection-$(connection))
-#: rc.cpp:460 rc.cpp:966
+#: rc.cpp:474
 msgid ""
 "Specifies a drive letter where the user's home directory will automatically "
 "mapped when he/she logs into a Windows machine."
@@ -1942,13 +1902,13 @@
 
 #. i18n: file: kuser.kcfg:296
 #. i18n: ectx: label, entry (samprofilepath), group (connection-$(connection))
-#: rc.cpp:463 rc.cpp:969
+#: rc.cpp:477
 msgid "Samba profile path template"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:297
 #. i18n: ectx: whatsthis, entry (samprofilepath), group (connection-$(connection))
-#: rc.cpp:467 rc.cpp:973
+#: rc.cpp:481
 #, no-c-format
 msgid ""
 "This specifies the location of the roaming profile of the user. The '%U' "
@@ -1957,13 +1917,13 @@
 
 #. i18n: file: kuser.kcfg:300
 #. i18n: ectx: label, entry (samhomepath), group (connection-$(connection))
-#: rc.cpp:470 rc.cpp:976
+#: rc.cpp:484
 msgid "Samba home path template"
 msgstr ""
 
 #. i18n: file: kuser.kcfg:301
 #. i18n: ectx: whatsthis, entry (samhomepath), group (connection-$(connection))
-#: rc.cpp:474 rc.cpp:980
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "This specifies the location of the home directory of the user. This field is "
@@ -1973,7 +1933,7 @@
 
 #. i18n: file: kuser.kcfg:305
 #. i18n: ectx: whatsthis, entry (lanmanhash), group (connection-$(connection))
-#: rc.cpp:480 rc.cpp:986
+#: rc.cpp:494
 msgid ""
 "Store the LanManager hashed password in the sambaLMPassword attribute. Check "
 "this if you have older clients (Win9x series and before) on your network."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwalletd.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwalletd.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwalletd.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwalletd.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,128 +7,84 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-11-11 13:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:06+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kwalletwizard.cpp:39
-msgid "KWallet"
-msgstr "KWallet"
-
-#: kwalletwizard.cpp:147
-msgid "<qt>Password is empty.  <b>(WARNING: Insecure)</b></qt>"
-msgstr ""
-
-#: kwalletwizard.cpp:149
-msgid "Passwords match."
-msgstr ""
-
-#: kwalletwizard.cpp:152
-msgid "Passwords do not match."
-msgstr ""
-
-#: main.cpp:38 main.cpp:39 kwalletd.cpp:356 kwalletd.cpp:445 kwalletd.cpp:508
-#: kwalletd.cpp:600 kwalletd.cpp:691 kwalletd.cpp:703 kwalletd.cpp:712
-#: kwalletd.cpp:717 kwalletd.cpp:1227
+#: kwalletd.cpp:362 kwalletd.cpp:451 kwalletd.cpp:515 kwalletd.cpp:607
+#: kwalletd.cpp:698 kwalletd.cpp:710 kwalletd.cpp:719 kwalletd.cpp:724
+#: kwalletd.cpp:1237 main.cpp:38 main.cpp:39
 msgid "KDE Wallet Service"
 msgstr ""
 
-#: main.cpp:40
-msgid "(C) 2002-2008 George Staikos, Michael Leupold, Thiago Maceira"
-msgstr ""
-
-#: main.cpp:41
-msgid "Michael Leupold"
-msgstr "Michael Leupold"
-
-#: main.cpp:41
-msgid "Maintainer"
-msgstr ""
-
-#: main.cpp:42
-msgid "George Staikos"
-msgstr "George Staikos"
-
-#: main.cpp:42
-msgid "Former maintainer"
-msgstr ""
-
-#: main.cpp:43
-msgid "Thiago Maceira"
-msgstr "Thiago Maceira"
-
-#: main.cpp:43
-msgid "D-Bus Interface"
-msgstr ""
-
-#: kwalletd.cpp:438
+#: kwalletd.cpp:444
 #, kde-format
 msgid ""
 "<qt>KDE has requested to open the wallet '<b>%1</b>'. Please enter the "
 "password for this wallet below.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:440
+#: kwalletd.cpp:446
 #, kde-format
 msgid ""
 "<qt>The application '<b>%1</b>' has requested to open the wallet "
 "'<b>%2</b>'. Please enter the password for this wallet below.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:444
+#: kwalletd.cpp:450
 msgid "&Open"
 msgstr "&Agor"
 
-#: kwalletd.cpp:454
+#: kwalletd.cpp:460
 msgctxt "Text of a button to ignore the open-wallet notification"
 msgid "Ignore"
 msgstr ""
 
-#: kwalletd.cpp:456
+#: kwalletd.cpp:462
 #, kde-format
 msgid "<b>KDE</b> has requested to open a wallet (%1)."
 msgstr ""
 
-#: kwalletd.cpp:459
+#: kwalletd.cpp:465
 msgctxt ""
 "Text of a button for switching to the (unnamed) application requesting a "
 "password"
 msgid "Switch there"
 msgstr ""
 
-#: kwalletd.cpp:461
+#: kwalletd.cpp:467
 #, kde-format
 msgid "<b>%1</b> has requested to open a wallet (%2)."
 msgstr ""
 
-#: kwalletd.cpp:464
+#: kwalletd.cpp:470
 #, kde-format
 msgctxt ""
 "Text of a button for switching to the application requesting a password"
 msgid "Switch to %1"
 msgstr ""
 
-#: kwalletd.cpp:479 kwalletd.cpp:517
+#: kwalletd.cpp:485 kwalletd.cpp:524
 #, kde-format
 msgid ""
 "<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br />(Error code "
 "%2: %3)</qt>"
 msgstr ""
 
-#: kwalletd.cpp:496
+#: kwalletd.cpp:503
 msgid ""
 "KDE has requested to open the wallet. This is used to store sensitive data "
 "in a secure fashion. Please enter a password to use with this wallet or "
 "click cancel to deny the application's request."
 msgstr ""
 
-#: kwalletd.cpp:498
+#: kwalletd.cpp:505
 #, kde-format
 msgid ""
 "<qt>The application '<b>%1</b>' has requested to open the KDE wallet. This "
@@ -137,7 +93,7 @@
 "request.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:502
+#: kwalletd.cpp:509
 #, kde-format
 msgid ""
 "<qt>KDE has requested to create a new wallet named '<b>%1</b>'. Please "
@@ -145,7 +101,7 @@
 "request.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:504
+#: kwalletd.cpp:511
 #, kde-format
 msgid ""
 "<qt>The application '<b>%1</b>' has requested to create a new wallet named "
@@ -153,42 +109,42 @@
 "application's request.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:509
+#: kwalletd.cpp:516
 msgid "C&reate"
 msgstr ""
 
-#: kwalletd.cpp:602
+#: kwalletd.cpp:609
 #, kde-format
 msgid "<qt>KDE has requested access to the open wallet '<b>%1</b>'.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:604
+#: kwalletd.cpp:611
 #, kde-format
 msgid ""
 "<qt>The application '<b>%1</b>' has requested access to the open wallet "
 "'<b>%2</b>'.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:691
+#: kwalletd.cpp:698
 msgid ""
 "Unable to open wallet. The wallet must be opened in order to change the "
 "password."
 msgstr ""
 
-#: kwalletd.cpp:702
+#: kwalletd.cpp:709
 #, kde-format
 msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'.</qt>"
 msgstr ""
 
-#: kwalletd.cpp:712
+#: kwalletd.cpp:719
 msgid "Error re-encrypting the wallet. Password was not changed."
 msgstr ""
 
-#: kwalletd.cpp:717
+#: kwalletd.cpp:724
 msgid "Error reopening the wallet. Data may be lost."
 msgstr ""
 
-#: kwalletd.cpp:1227
+#: kwalletd.cpp:1237
 msgid ""
 "There have been repeated failed attempts to gain access to a wallet. An "
 "application may be misbehaving."
@@ -230,19 +186,114 @@
 msgid "Decryption error."
 msgstr ""
 
-#: rc.cpp:49
+#: main.cpp:40
+msgid "(C) 2002-2008 George Staikos, Michael Leupold, Thiago Maceira"
+msgstr ""
+
+#: main.cpp:41
+msgid "Michael Leupold"
+msgstr "Michael Leupold"
+
+#: main.cpp:41
+msgid "Maintainer"
+msgstr ""
+
+#: main.cpp:42
+msgid "George Staikos"
+msgstr "George Staikos"
+
+#: main.cpp:42
+msgid "Former maintainer"
+msgstr ""
+
+#: main.cpp:43
+msgid "Thiago Maceira"
+msgstr "Thiago Maceira"
+
+#: main.cpp:43
+msgid "D-Bus Interface"
+msgstr ""
+
+#: kwalletwizard.cpp:39
+msgid "KWallet"
+msgstr "KWallet"
+
+#: kwalletwizard.cpp:147
+msgid "<qt>Password is empty.  <b>(WARNING: Insecure)</b></qt>"
+msgstr ""
+
+#: kwalletwizard.cpp:149
+msgid "Passwords match."
+msgstr ""
+
+#: kwalletwizard.cpp:152
+msgid "Passwords do not match."
+msgstr ""
+
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr " ,Launchpad Contributions:,David Jones"
 
-#: rc.cpp:50
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr ",,"
 
+#. i18n: file: kwalletwizardpageoptions.ui:16
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:5
+msgid ""
+"The KDE Wallet system allows you to control the level of security of your "
+"personal data.  Some of these settings do impact usability.  While the "
+"default settings are generally acceptable for most users, you may wish to "
+"change some of them.  You may further tune these settings from the KWallet "
+"control module."
+msgstr ""
+
+#. i18n: file: kwalletwizardpageoptions.ui:48
+#. i18n: ectx: property (text), widget (QCheckBox, _closeIdle)
+#: rc.cpp:8
+msgid "Automatically close idle wallets"
+msgstr ""
+
+#. i18n: file: kwalletwizardpageoptions.ui:55
+#. i18n: ectx: property (text), widget (QCheckBox, _networkWallet)
+#: rc.cpp:11
+msgid "Store network passwords and local passwords in separate wallet files"
+msgstr ""
+
+#. i18n: file: kwalletwizardpageintro.ui:17
+#. i18n: ectx: property (comment), widget (KTitleWidget, ktitlewidget)
+#: rc.cpp:14
+msgid "The KDE Wallet System"
+msgstr ""
+
+#. i18n: file: kwalletwizardpageintro.ui:30
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:17
+msgid ""
+"Welcome to KWallet, the KDE Wallet System.  KWallet allows you to store your "
+"passwords and other personal information on disk in an encrypted file, "
+"preventing others from viewing the information.  This wizard will tell you "
+"about KWallet and help you configure it for the first time."
+msgstr ""
+
+#. i18n: file: kwalletwizardpageintro.ui:69
+#. i18n: ectx: property (text), widget (QRadioButton, _basic)
+#: rc.cpp:20
+msgid "&Basic setup (recommended)"
+msgstr ""
+
+#. i18n: file: kwalletwizardpageintro.ui:79
+#. i18n: ectx: property (text), widget (QRadioButton, _advanced)
+#: rc.cpp:23
+msgid "&Advanced setup"
+msgstr ""
+
 #. i18n: file: kwalletwizardpagepassword.ui:16
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:39 rc.cpp:53
+#: rc.cpp:26
 msgid ""
 "Various applications may attempt to use the KDE wallet to store passwords or "
 "other information such as web form data and cookies.  If you would like "
@@ -254,77 +305,49 @@
 
 #. i18n: file: kwalletwizardpagepassword.ui:29
 #. i18n: ectx: property (text), widget (QCheckBox, _useWallet)
-#: rc.cpp:42 rc.cpp:56
+#: rc.cpp:29
 msgid "Yes, I wish to use the KDE wallet to store my personal information."
 msgstr ""
 
 #. i18n: file: kwalletwizardpagepassword.ui:88
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:45 rc.cpp:59
+#: rc.cpp:32
 msgid "Enter a new password:"
 msgstr ""
 
 #. i18n: file: kwalletwizardpagepassword.ui:104
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:48 rc.cpp:62
+#: rc.cpp:35
 msgid "Verify password:"
 msgstr ""
 
 #. i18n: file: kbetterthankdialogbase.ui:50
 #. i18n: ectx: property (text), widget (KPushButton, _allowOnce)
-#: rc.cpp:3 rc.cpp:65
+#: rc.cpp:38
 msgid "Allow &Once"
 msgstr ""
 
 #. i18n: file: kbetterthankdialogbase.ui:60
 #. i18n: ectx: property (text), widget (KPushButton, _allowAlways)
-#: rc.cpp:6 rc.cpp:68
+#: rc.cpp:41
 msgid "Allow &Always"
 msgstr ""
 
 #. i18n: file: kbetterthankdialogbase.ui:67
 #. i18n: ectx: property (text), widget (KPushButton, _deny)
-#: rc.cpp:9 rc.cpp:71
+#: rc.cpp:44
 msgid "&Deny"
 msgstr ""
 
 #. i18n: file: kbetterthankdialogbase.ui:74
 #. i18n: ectx: property (text), widget (KPushButton, _denyForever)
-#: rc.cpp:12 rc.cpp:74
+#: rc.cpp:47
 msgid "Deny &Forever"
 msgstr ""
 
-#. i18n: file: kwalletwizardpageintro.ui:17
-#. i18n: ectx: property (comment), widget (KTitleWidget, ktitlewidget)
-#: rc.cpp:18 rc.cpp:77
-msgid "The KDE Wallet System"
-msgstr ""
-
-#. i18n: file: kwalletwizardpageintro.ui:30
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:21 rc.cpp:80
-msgid ""
-"Welcome to KWallet, the KDE Wallet System.  KWallet allows you to store your "
-"passwords and other personal information on disk in an encrypted file, "
-"preventing others from viewing the information.  This wizard will tell you "
-"about KWallet and help you configure it for the first time."
-msgstr ""
-
-#. i18n: file: kwalletwizardpageintro.ui:69
-#. i18n: ectx: property (text), widget (QRadioButton, _basic)
-#: rc.cpp:24 rc.cpp:83
-msgid "&Basic setup (recommended)"
-msgstr ""
-
-#. i18n: file: kwalletwizardpageintro.ui:79
-#. i18n: ectx: property (text), widget (QRadioButton, _advanced)
-#: rc.cpp:27 rc.cpp:86
-msgid "&Advanced setup"
-msgstr ""
-
 #. i18n: file: kwalletwizardpageexplanation.ui:16
 #. i18n: ectx: property (text), widget (QLabel, textLabel2_3)
-#: rc.cpp:15 rc.cpp:89
+#: rc.cpp:50
 msgid ""
 "The KDE Wallet system stores your data in a <i>wallet</i> file on your local "
 "hard disk.  The data is only written in encrypted form, presently using the "
@@ -334,26 +357,3 @@
 "you to drag wallets and wallet contents, allowing you to easily copy a "
 "wallet to a remote system."
 msgstr ""
-
-#. i18n: file: kwalletwizardpageoptions.ui:16
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:30 rc.cpp:92
-msgid ""
-"The KDE Wallet system allows you to control the level of security of your "
-"personal data.  Some of these settings do impact usability.  While the "
-"default settings are generally acceptable for most users, you may wish to "
-"change some of them.  You may further tune these settings from the KWallet "
-"control module."
-msgstr ""
-
-#. i18n: file: kwalletwizardpageoptions.ui:48
-#. i18n: ectx: property (text), widget (QCheckBox, _closeIdle)
-#: rc.cpp:33 rc.cpp:95
-msgid "Automatically close idle wallets"
-msgstr ""
-
-#. i18n: file: kwalletwizardpageoptions.ui:55
-#. i18n: ectx: property (text), widget (QCheckBox, _networkWallet)
-#: rc.cpp:36 rc.cpp:98
-msgid "Store network passwords and local passwords in separate wallet files"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwatchgnupg.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwatchgnupg.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwatchgnupg.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwatchgnupg.po	2012-04-18 08:59:26.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdepim/kwatchgnupg.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-14 17:54+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-16 22:59+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:46+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: aboutdata.cpp:40
 msgid "GnuPG log viewer"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwin_art_clients.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwin_art_clients.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwin_art_clients.po	2012-03-23 07:39:12.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwin_art_clients.po	2012-04-18 08:59:23.000000000 +0000
@@ -7,57 +7,15 @@
 msgstr ""
 "Project-Id-Version: all.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 15:58+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 17:21+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:43+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: web/Web.cpp:56
-msgid "Web"
-msgstr ""
-
-#: kde2/config/config.cpp:57
-msgid "Draw titlebar &stipple effect"
-msgstr ""
-
-#: kde2/config/config.cpp:59
-msgid ""
-"When selected, active titlebars are drawn with a stipple (dotted) effect; "
-"otherwise, they are drawn without the stipple."
-msgstr ""
-
-#: kde2/config/config.cpp:63
-msgid "Draw g&rab bar below windows"
-msgstr ""
-
-#: kde2/config/config.cpp:65
-msgid ""
-"When selected, decorations are drawn with a \"grab bar\" below windows; "
-"otherwise, no grab bar is drawn."
-msgstr ""
-
-#: kde2/config/config.cpp:71
-msgid "Draw &gradients"
-msgstr ""
-
-#: kde2/config/config.cpp:73
-msgid ""
-"When selected, decorations are drawn with gradients for high-color displays; "
-"otherwise, no gradients are drawn."
-msgstr ""
-
-#: kde2/kde2.cpp:783
-msgid "KDE 2"
-msgstr ""
-
-#: redmond/redmond.cpp:378
-msgid "Redmond"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-04-17 23:59+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: keramik/keramik.cpp:957
 msgid "<center><b>Keramik preview</b></center>"
@@ -111,26 +69,12 @@
 msgid "Restore"
 msgstr ""
 
-#: quartz/config/config.cpp:56
-msgid "Draw window frames using &titlebar colors"
-msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
-
-#: quartz/config/config.cpp:58
-msgid ""
-"When selected, the window decoration borders are drawn using the titlebar "
-"colors; otherwise, they are drawn using normal border colors instead."
-msgstr ""
-
-#: quartz/config/config.cpp:61
-msgid "Quartz &extra slim"
-msgstr ""
-
-#: quartz/config/config.cpp:63
-msgid "Quartz window decorations with extra-small title bar."
+#: redmond/redmond.cpp:378
+msgid "Redmond"
 msgstr ""
 
-#: quartz/quartz.cpp:568
-msgid "Quartz"
+#: modernsystem/modernsys.cpp:457
+msgid "Modern System"
 msgstr ""
 
 #: modernsystem/config/config.cpp:62
@@ -160,6 +104,62 @@
 msgid "Large"
 msgstr ""
 
-#: modernsystem/modernsys.cpp:457
-msgid "Modern System"
+#: web/Web.cpp:56
+msgid "Web"
+msgstr ""
+
+#: kde2/kde2.cpp:783
+msgid "KDE 2"
+msgstr ""
+
+#: kde2/config/config.cpp:57
+msgid "Draw titlebar &stipple effect"
+msgstr ""
+
+#: kde2/config/config.cpp:59
+msgid ""
+"When selected, active titlebars are drawn with a stipple (dotted) effect; "
+"otherwise, they are drawn without the stipple."
+msgstr ""
+
+#: kde2/config/config.cpp:63
+msgid "Draw g&rab bar below windows"
+msgstr ""
+
+#: kde2/config/config.cpp:65
+msgid ""
+"When selected, decorations are drawn with a \"grab bar\" below windows; "
+"otherwise, no grab bar is drawn."
+msgstr ""
+
+#: kde2/config/config.cpp:71
+msgid "Draw &gradients"
+msgstr ""
+
+#: kde2/config/config.cpp:73
+msgid ""
+"When selected, decorations are drawn with gradients for high-color displays; "
+"otherwise, no gradients are drawn."
+msgstr ""
+
+#: quartz/quartz.cpp:568
+msgid "Quartz"
+msgstr ""
+
+#: quartz/config/config.cpp:56
+msgid "Draw window frames using &titlebar colors"
+msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
+
+#: quartz/config/config.cpp:58
+msgid ""
+"When selected, the window decoration borders are drawn using the titlebar "
+"colors; otherwise, they are drawn using normal border colors instead."
+msgstr ""
+
+#: quartz/config/config.cpp:61
+msgid "Quartz &extra slim"
+msgstr ""
+
+#: quartz/config/config.cpp:63
+msgid "Quartz window decorations with extra-small title bar."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwin_clients.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwin_clients.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwin_clients.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwin_clients.po	2012-04-18 08:59:39.000000000 +0000
@@ -2,159 +2,128 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdebase/kwin_clients.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-12-08 11:27+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:17+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:46+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: laptop/laptopclient.cpp:372
-msgid "Laptop"
-msgstr "Gluniadur"
-
-#: b2/config/config.cpp:59
-msgid "Draw window frames using &titlebar colors"
-msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
-
-#: b2/config/config.cpp:61
-msgid ""
-"When selected, the window borders are drawn using the titlebar colors; "
-"otherwise, they are drawn using normal border colors."
-msgstr ""
-
-#: b2/config/config.cpp:67
-msgid "Draw &resize handle"
-msgstr ""
-
-#: b2/config/config.cpp:69
-msgid ""
-"When selected, decorations are drawn with a \"grab handle\" in the bottom "
-"right corner of the windows; otherwise, no grab handle is drawn."
-msgstr ""
-
-#: b2/config/config.cpp:75
-msgid "Auto-move titlebar"
-msgstr ""
-
-#: b2/config/config.cpp:77
-msgid ""
-"When selected, titlebars are automatically relocated to visible positions; "
-"otherwise, they are only moved manually using shift+drag."
-msgstr ""
-
-#: b2/config/config.cpp:82
-msgid "Actions Settings"
-msgstr ""
-
-#: b2/config/config.cpp:85
-msgid "Double click on menu button:"
-msgstr ""
-
-#: b2/config/config.cpp:87
-msgid "Do Nothing"
-msgstr ""
-
-#: b2/config/config.cpp:88
-msgid "Minimize Window"
-msgstr "Lleihau'r Ffenestr"
-
-#: b2/config/config.cpp:89
-msgid "Shade Window"
-msgstr "Rholio'r Ffenestr"
-
-#: b2/config/config.cpp:90
-msgid "Close Window"
-msgstr "Cau'r Ffenestr"
-
-#: b2/config/config.cpp:93
-msgid ""
-"An action can be associated to a double click of the menu button. Leave it "
-"to none if in doubt."
-msgstr ""
-
-#: tabstrip/tabstripdecoration.cpp:55 oxygen/oxygenclient.cpp:196
-#: b2/b2client.cpp:406 aurorae/src/lib/auroraescene.cpp:470
-#: aurorae/src/lib/auroraescene.cpp:1047
+#: aurorae/src/lib/auroraescene.cpp:470 aurorae/src/lib/auroraescene.cpp:1047
+#: oxygen/oxygenclient.cpp:208 b2/b2client.cpp:406
+#: tabstrip/tabstripdecoration.cpp:55
 msgid "Menu"
 msgstr "Dewislen"
 
-#: b2/b2client.cpp:408 b2/b2client.cpp:893
 #: aurorae/src/lib/auroraescene.cpp:483 aurorae/src/lib/auroraescene.cpp:664
-#: aurorae/src/lib/auroraescene.cpp:1069
+#: aurorae/src/lib/auroraescene.cpp:1069 b2/b2client.cpp:408
+#: b2/b2client.cpp:893
 msgid "Not on all desktops"
 msgstr ""
 
-#: b2/b2client.cpp:408 b2/b2client.cpp:893
 #: aurorae/src/lib/auroraescene.cpp:483 aurorae/src/lib/auroraescene.cpp:664
-#: aurorae/src/lib/auroraescene.cpp:1069
+#: aurorae/src/lib/auroraescene.cpp:1069 b2/b2client.cpp:408
+#: b2/b2client.cpp:893
 msgid "On all desktops"
 msgstr "Ar Bob Penbwrdd"
 
-#: tabstrip/tabstripdecoration.cpp:49 oxygen/oxygenclient.cpp:202
-#: b2/b2client.cpp:409 aurorae/src/lib/auroraescene.cpp:503
-#: aurorae/src/lib/auroraescene.cpp:1050
+#: aurorae/src/lib/auroraescene.cpp:493 aurorae/src/lib/auroraescene.cpp:1072
+#: oxygen/oxygenclient.cpp:211 b2/b2client.cpp:410
+#: tabstrip/tabstripdecoration.cpp:43
+msgid "Help"
+msgstr ""
+
+#: aurorae/src/lib/auroraescene.cpp:503 aurorae/src/lib/auroraescene.cpp:1050
+#: oxygen/oxygenclient.cpp:214 b2/b2client.cpp:409
+#: tabstrip/tabstripdecoration.cpp:49
 msgid "Minimize"
 msgstr "Lleihau"
 
-#: tabstrip/tabstripdecoration.cpp:46 oxygen/oxygenclient.cpp:205
-#: b2/b2client.cpp:409 b2/b2client.cpp:904
 #: aurorae/src/lib/auroraescene.cpp:514 aurorae/src/lib/auroraescene.cpp:624
-#: aurorae/src/lib/auroraescene.cpp:1054
+#: aurorae/src/lib/auroraescene.cpp:1054 b2/b2client.cpp:904
+msgid "Restore"
+msgstr ""
+
+#: aurorae/src/lib/auroraescene.cpp:514 aurorae/src/lib/auroraescene.cpp:624
+#: aurorae/src/lib/auroraescene.cpp:1054 oxygen/oxygenclient.cpp:217
+#: b2/b2client.cpp:409 b2/b2client.cpp:904 tabstrip/tabstripdecoration.cpp:46
 msgid "Maximize"
 msgstr "Ehangu"
 
-#: tabstrip/tabstripdecoration.cpp:52 oxygen/oxygenclient.cpp:208
-#: b2/b2client.cpp:410 aurorae/src/lib/auroraescene.cpp:524
-#: aurorae/src/lib/auroraescene.cpp:1066
+#: aurorae/src/lib/auroraescene.cpp:524 aurorae/src/lib/auroraescene.cpp:1066
+#: oxygen/oxygenclient.cpp:220 b2/b2client.cpp:410
+#: tabstrip/tabstripdecoration.cpp:52
 msgid "Close"
 msgstr ""
 
-#: tabstrip/tabstripdecoration.cpp:43 oxygen/oxygenclient.cpp:199
-#: b2/b2client.cpp:410 aurorae/src/lib/auroraescene.cpp:493
-#: aurorae/src/lib/auroraescene.cpp:1072
-msgid "Help"
+#: aurorae/src/lib/auroraescene.cpp:536 aurorae/src/lib/auroraescene.cpp:688
+#: aurorae/src/lib/auroraescene.cpp:1057
+msgid "Do not keep above others"
 msgstr ""
 
-#: b2/b2client.cpp:411 b2/b2client.cpp:936
+#: aurorae/src/lib/auroraescene.cpp:536 aurorae/src/lib/auroraescene.cpp:688
+#: aurorae/src/lib/auroraescene.cpp:1057
+msgid "Keep above others"
+msgstr "Cadw Uwchben y Lleill"
+
+#: aurorae/src/lib/auroraescene.cpp:548 aurorae/src/lib/auroraescene.cpp:712
+#: aurorae/src/lib/auroraescene.cpp:1060
+msgid "Do not keep below others"
+msgstr ""
+
+#: aurorae/src/lib/auroraescene.cpp:548 aurorae/src/lib/auroraescene.cpp:712
+#: aurorae/src/lib/auroraescene.cpp:1060
+msgid "Keep below others"
+msgstr "Cadw Dan y Lleill"
+
 #: aurorae/src/lib/auroraescene.cpp:560 aurorae/src/lib/auroraescene.cpp:736
-#: aurorae/src/lib/auroraescene.cpp:1063
+#: aurorae/src/lib/auroraescene.cpp:1063 b2/b2client.cpp:411
+#: b2/b2client.cpp:936
 msgid "Unshade"
 msgstr "Dat-gysgodi"
 
-#: tabstrip/tabstripdecoration.cpp:67 b2/b2client.cpp:411 b2/b2client.cpp:936
 #: aurorae/src/lib/auroraescene.cpp:560 aurorae/src/lib/auroraescene.cpp:736
-#: aurorae/src/lib/auroraescene.cpp:1063
+#: aurorae/src/lib/auroraescene.cpp:1063 b2/b2client.cpp:411
+#: b2/b2client.cpp:936 tabstrip/tabstripdecoration.cpp:67
 msgid "Shade"
 msgstr "Rholio"
 
-#: b2/b2client.cpp:412
-msgid "Resize"
-msgstr "Newid maint"
+#: oxygen/config/oxygenanimationconfigwidget.cpp:48
+msgid "Button mouseover transition"
+msgstr ""
 
-#: b2/b2client.cpp:456
-msgid "<b><center>B II preview</center></b>"
+#: oxygen/config/oxygenanimationconfigwidget.cpp:49
+msgid "Configure window buttons' mouseover highlight animation"
 msgstr ""
 
-#: b2/b2client.cpp:904 aurorae/src/lib/auroraescene.cpp:514
-#: aurorae/src/lib/auroraescene.cpp:624 aurorae/src/lib/auroraescene.cpp:1054
-msgid "Restore"
+#: oxygen/config/oxygenanimationconfigwidget.cpp:52
+msgid "Title transitions"
 msgstr ""
 
-#: b2/b2client.cpp:1146
-msgctxt "Help button label, one character"
-msgid "?"
+#: oxygen/config/oxygenanimationconfigwidget.cpp:53
+msgid "Configure fading transitions when window title is changed"
 msgstr ""
 
-#: oxygen/config/oxygenexceptionlistwidget.cpp:178
-msgid "Remove selected exception?"
+#: oxygen/config/oxygenanimationconfigwidget.cpp:56
+msgid "Window active state change transitions"
 msgstr ""
 
-#: oxygen/config/oxygenexceptionlistwidget.cpp:312
-msgid "Regular Expression syntax is incorrect"
+#: oxygen/config/oxygenanimationconfigwidget.cpp:57
+msgid ""
+"Configure fading between window shadow and glow when window's active state "
+"is changed"
+msgstr ""
+
+#: oxygen/config/oxygenanimationconfigwidget.cpp:60
+msgid "Window grouping animations"
+msgstr ""
+
+#: oxygen/config/oxygenanimationconfigwidget.cpp:61
+msgid ""
+"Configure window titlebar animations when windows are grouped/ungrouped"
 msgstr ""
 
 #: oxygen/config/oxygenexceptionmodel.cpp:35
@@ -169,33 +138,41 @@
 msgid "Enable/disable this exception"
 msgstr ""
 
-#: oxygen/config/oxygenexceptiondialog.cpp:90
-#: oxygen/config/oxygenexceptiondialog.cpp:116
-#: oxygen/config/oxygenexceptiondialog.cpp:144
+#: oxygen/config/oxygenexceptiondialog.cpp:92
+#: oxygen/config/oxygenexceptiondialog.cpp:118
+#: oxygen/config/oxygenexceptiondialog.cpp:146
 msgctxt "outline window title"
 msgid "Enabled"
 msgstr ""
 
-#: oxygen/config/oxygenexceptiondialog.cpp:90
-#: oxygen/config/oxygenexceptiondialog.cpp:116
+#: oxygen/config/oxygenexceptiondialog.cpp:92
+#: oxygen/config/oxygenexceptiondialog.cpp:118
 msgctxt "outline window title"
 msgid "Disabled"
 msgstr ""
 
-#: oxygen/demo/main.cpp:42 oxygen/demo/oxygenshadowdemodialog.cpp:47
-msgid "Oxygen Shadow Demo"
+#: oxygen/config/oxygenexceptionlistwidget.cpp:201
+msgid "Remove selected exception?"
 msgstr ""
 
-#: oxygen/demo/main.cpp:44
-msgid "Oxygen decoration shadows demonstration"
+#: oxygen/config/oxygenexceptionlistwidget.cpp:335
+msgid "Regular Expression syntax is incorrect"
 msgstr ""
 
-#: oxygen/demo/main.cpp:46
-msgid "(c) 2011, Hugo Pereira Da Costa"
+#: oxygen/config/oxygenconfigurationui.cpp:144
+msgid "Hide Advanced Configuration Options"
 msgstr ""
 
-#: oxygen/demo/main.cpp:48
-msgid "Hugo Pereira Da Costa"
+#: oxygen/config/oxygenconfigurationui.cpp:144
+msgid "Show Advanced Configuration Options"
+msgstr ""
+
+#: oxygen/config/oxygenconfigurationui.cpp:162
+msgid "Animations"
+msgstr ""
+
+#: oxygen/demo/oxygenshadowdemodialog.cpp:47 oxygen/demo/main.cpp:42
+msgid "Oxygen Shadow Demo"
 msgstr ""
 
 #: oxygen/demo/oxygenshadowdemodialog.cpp:50
@@ -210,177 +187,230 @@
 msgid "Draw window background"
 msgstr ""
 
-#: oxygen/oxygenclient.cpp:76
+#: oxygen/demo/main.cpp:44
+msgid "Oxygen decoration shadows demonstration"
+msgstr ""
+
+#: oxygen/demo/main.cpp:46
+msgid "(c) 2011, Hugo Pereira Da Costa"
+msgstr ""
+
+#: oxygen/demo/main.cpp:48
+msgid "Hugo Pereira Da Costa"
+msgstr ""
+
+#: oxygen/oxygenexception.cpp:79
+msgid "Window Title"
+msgstr ""
+
+#: oxygen/oxygenexception.cpp:80
+msgid "Window Class Name"
+msgstr ""
+
+#: oxygen/oxygenclient.cpp:81
 msgid "Oxygen"
 msgstr ""
 
-#: oxygen/oxygenclient.cpp:211
+#: oxygen/oxygenclient.cpp:223
 msgid "Keep Above Others"
 msgstr "Cadw Uwchben y Lleill"
 
-#: oxygen/oxygenclient.cpp:214
+#: oxygen/oxygenclient.cpp:226
 msgid "Keep Below Others"
 msgstr "Cadw Dan y Lleill"
 
-#: oxygen/oxygenclient.cpp:217
+#: oxygen/oxygenclient.cpp:229
 msgid "On All Desktops"
 msgstr ""
 
-#: oxygen/oxygenclient.cpp:220
+#: oxygen/oxygenclient.cpp:232
 msgid "Shade Button"
 msgstr ""
 
-#: oxygen/oxygenexception.cpp:79
-msgid "Window Title"
-msgstr ""
-
-#: oxygen/oxygenexception.cpp:80
-msgid "Window Class Name"
-msgstr ""
-
 #. i18n: file: plastik/config/configdialog.ui:29
 #. i18n: ectx: property (text), widget (QRadioButton, AlignLeft)
-#: oxygen/oxygenconfiguration.cpp:201 rc.cpp:188
+#: oxygen/oxygenconfiguration.cpp:233 rc.cpp:158
 msgid "Left"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:212
+#: oxygen/oxygenconfiguration.cpp:237
 msgid "Center (Full Width)"
 msgstr ""
 
 #. i18n: file: plastik/config/configdialog.ui:36
 #. i18n: ectx: property (text), widget (QRadioButton, AlignHCenter)
-#: oxygen/oxygenconfiguration.cpp:202 rc.cpp:191
+#: oxygen/oxygenconfiguration.cpp:238 rc.cpp:161
 msgid "Center"
 msgstr ""
 
 #. i18n: file: plastik/config/configdialog.ui:43
 #. i18n: ectx: property (text), widget (QRadioButton, AlignRight)
-#: oxygen/oxygenconfiguration.cpp:203 rc.cpp:194
+#: oxygen/oxygenconfiguration.cpp:241 rc.cpp:164
 msgid "Right"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:226
+#: oxygen/oxygenconfiguration.cpp:264
 msgctxt "@item:inlistbox Button size:"
 msgid "Small"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:227
+#: oxygen/oxygenconfiguration.cpp:265
 msgctxt "@item:inlistbox Button size:"
 msgid "Normal"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:228
+#: oxygen/oxygenconfiguration.cpp:266
 msgctxt "@item:inlistbox Button size:"
 msgid "Large"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:229
+#: oxygen/oxygenconfiguration.cpp:267
 msgctxt "@item:inlistbox Button size:"
 msgid "Very Large"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:230
+#: oxygen/oxygenconfiguration.cpp:268
 msgctxt "@item:inlistbox Button size:"
 msgid "Huge"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:270
+#: oxygen/oxygenconfiguration.cpp:308
 msgctxt "@item:inlistbox Border size:"
 msgid "No Border"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:271
+#: oxygen/oxygenconfiguration.cpp:309
 msgctxt "@item:inlistbox Border size:"
 msgid "No Side Border"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:272
+#: oxygen/oxygenconfiguration.cpp:310
 msgctxt "@item:inlistbox Border size:"
 msgid "Tiny"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:273
+#: oxygen/oxygenconfiguration.cpp:311
 msgctxt "@item:inlistbox Border size:"
 msgid "Normal"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:274
+#: oxygen/oxygenconfiguration.cpp:312
 msgctxt "@item:inlistbox Border size:"
 msgid "Large"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:275
+#: oxygen/oxygenconfiguration.cpp:313
 msgctxt "@item:inlistbox Border size:"
 msgid "Very Large"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:276
+#: oxygen/oxygenconfiguration.cpp:314
 msgctxt "@item:inlistbox Border size:"
 msgid "Huge"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:277
+#: oxygen/oxygenconfiguration.cpp:315
 msgctxt "@item:inlistbox Border size:"
 msgid "Very Huge"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:278
+#: oxygen/oxygenconfiguration.cpp:316
 msgctxt "@item:inlistbox Border size:"
 msgid "Oversized"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:307
+#: oxygen/oxygenconfiguration.cpp:345
 msgid "Solid Color"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:308
+#: oxygen/oxygenconfiguration.cpp:346
 msgid "Radial Gradient"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:322
+#: oxygen/oxygenconfiguration.cpp:347
 msgid "Follow Style Hint"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:330
+#: oxygen/oxygenconfiguration.cpp:370
 msgid "Always Hide Extra Size Grip"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:331
+#: oxygen/oxygenconfiguration.cpp:371
 msgid "Show Extra Size Grip When Needed"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:403
-msgid "Disabled"
+#: b2/b2client.cpp:412
+msgid "Resize"
+msgstr "Newid maint"
+
+#: b2/b2client.cpp:456
+msgid "<b><center>B II preview</center></b>"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:404
-msgid "Variable"
+#: b2/b2client.cpp:1146
+msgctxt "Help button label, one character"
+msgid "?"
 msgstr ""
 
-#: oxygen/oxygenconfiguration.cpp:405
-msgid "Maximum"
+#: b2/config/config.cpp:59
+msgid "Draw window frames using &titlebar colors"
+msgstr "Darlunio fframau ffenestri â lliwia'r bar &teitl"
+
+#: b2/config/config.cpp:61
+msgid ""
+"When selected, the window borders are drawn using the titlebar colors; "
+"otherwise, they are drawn using normal border colors."
 msgstr ""
 
-#: aurorae/src/lib/auroraescene.cpp:536 aurorae/src/lib/auroraescene.cpp:688
-#: aurorae/src/lib/auroraescene.cpp:1057
-msgid "Do not keep above others"
+#: b2/config/config.cpp:67
+msgid "Draw &resize handle"
 msgstr ""
 
-#: aurorae/src/lib/auroraescene.cpp:536 aurorae/src/lib/auroraescene.cpp:688
-#: aurorae/src/lib/auroraescene.cpp:1057
-msgid "Keep above others"
-msgstr "Cadw Uwchben y Lleill"
+#: b2/config/config.cpp:69
+msgid ""
+"When selected, decorations are drawn with a \"grab handle\" in the bottom "
+"right corner of the windows; otherwise, no grab handle is drawn."
+msgstr ""
 
-#: aurorae/src/lib/auroraescene.cpp:548 aurorae/src/lib/auroraescene.cpp:712
-#: aurorae/src/lib/auroraescene.cpp:1060
-msgid "Do not keep below others"
+#: b2/config/config.cpp:75
+msgid "Auto-move titlebar"
 msgstr ""
 
-#: aurorae/src/lib/auroraescene.cpp:548 aurorae/src/lib/auroraescene.cpp:712
-#: aurorae/src/lib/auroraescene.cpp:1060
-msgid "Keep below others"
-msgstr "Cadw Dan y Lleill"
+#: b2/config/config.cpp:77
+msgid ""
+"When selected, titlebars are automatically relocated to visible positions; "
+"otherwise, they are only moved manually using shift+drag."
+msgstr ""
+
+#: b2/config/config.cpp:82
+msgid "Actions Settings"
+msgstr ""
+
+#: b2/config/config.cpp:85
+msgid "Double click on menu button:"
+msgstr ""
+
+#: b2/config/config.cpp:87
+msgid "Do Nothing"
+msgstr ""
+
+#: b2/config/config.cpp:88
+msgid "Minimize Window"
+msgstr "Lleihau'r Ffenestr"
+
+#: b2/config/config.cpp:89
+msgid "Shade Window"
+msgstr "Rholio'r Ffenestr"
+
+#: b2/config/config.cpp:90
+msgid "Close Window"
+msgstr "Cau'r Ffenestr"
+
+#: b2/config/config.cpp:93
+msgid ""
+"An action can be associated to a double click of the menu button. Leave it "
+"to none if in doubt."
+msgstr ""
 
 #: plastik/plastikclient.cpp:65
 msgid "Plastik"
@@ -404,10 +434,14 @@
 
 #. i18n: file: tabstrip/config/tabstripconfig.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, TabstripConfigUi)
-#: tabstrip/tabstripdecoration.cpp:212 rc.cpp:5
+#: tabstrip/tabstripdecoration.cpp:212 rc.cpp:191
 msgid "Tabstrip"
 msgstr ""
 
+#: laptop/laptopclient.cpp:372
+msgid "Laptop"
+msgstr "Gluniadur"
+
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
@@ -418,315 +452,297 @@
 msgid "Your emails"
 msgstr ","
 
-#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:17
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:17
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:38
-msgid "Information about Selected Window"
+#: rc.cpp:5
+msgid "Window Identification"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:23
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:23
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:41
-msgid "Class: "
+#: rc.cpp:8
+msgid "Matching window property: "
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:40
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:36
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:47
-msgid "Title: "
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:60
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:53
-msgid "Window Property Selection"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:66
-#. i18n: ectx: property (text), widget (QRadioButton, windowClassCheckBox)
-#: rc.cpp:56
-msgid "Use window class (whole application)"
+#: rc.cpp:11
+msgid "Regular expression to match: "
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:76
-#. i18n: ectx: property (text), widget (QRadioButton, windowTitleCheckBox)
-#: rc.cpp:59
-msgid "Use window title"
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:49
+#. i18n: ectx: property (text), widget (QPushButton, detectDialogButton)
+#: rc.cpp:14
+msgid "Detect Window Properties"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:30
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:74
-msgid "General"
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:69
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:17
+msgid "Decoration Options"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:39
-#. i18n: ectx: property (text), widget (QLabel, label)
 #. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:75
 #. i18n: ectx: property (text), widget (QCheckBox, frameBorderCheckBox)
-#: rc.cpp:77 rc.cpp:155
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:39
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:20 rc.cpp:95
 msgid "Border size:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:80
-msgid "Title alignment:"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:83
-msgid "Button size:"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:100
-#. i18n: ectx: property (text), widget (QCheckBox, tabsEnabled)
-#: rc.cpp:86
-msgid "Enable window grouping"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:120
-#. i18n: ectx: property (text), widget (QCheckBox, useAnimations)
-#: rc.cpp:89
-msgid "Enable animations"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:130
-#. i18n: ectx: property (text), widget (QCheckBox, animateTitleChange)
-#: rc.cpp:92
-msgid "Enable title transition animations"
-msgstr ""
-
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:138
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:95
-msgid "Fine Tuning"
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:82
+#. i18n: ectx: property (text), widget (QCheckBox, sizeGripCheckBox)
+#: rc.cpp:23
+msgid "Extra size grip display:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:147
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:98
-msgid "Background style: "
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:89
+#. i18n: ectx: property (text), widget (QCheckBox, titleOutlineCheckBox)
+#: rc.cpp:26
+msgid "Outline active window title:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:176
-#. i18n: ectx: property (text), widget (QCheckBox, titleOutline)
-#: rc.cpp:101
-msgid "Outline active window title"
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:96
+#. i18n: ectx: property (text), widget (QCheckBox, separatorCheckBox)
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:221
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:29 rc.cpp:131
+msgid "Separator display:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:183
-#. i18n: ectx: property (text), widget (QCheckBox, narrowButtonSpacing)
-#: rc.cpp:104
-msgid "Use narrow space between decoration buttons"
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:103
+#. i18n: ectx: property (text), widget (QCheckBox, blendColorCheckBox)
+#: rc.cpp:32
+msgid "Background style:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:206
-#. i18n: ectx: property (text), widget (QLabel, sizeGripModeLabel)
-#: rc.cpp:107
-msgid "Extra size grip display: "
+#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:110
+#. i18n: ectx: property (text), widget (QCheckBox, hideTitleBar)
+#: rc.cpp:35
+msgid "Hide window title bar"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:220
-#. i18n: ectx: property (text), item, widget (QComboBox, separatorMode)
 #. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:140
 #. i18n: ectx: property (text), item, widget (KComboBox, separatorComboBox)
-#: rc.cpp:110 rc.cpp:173
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:203
+#. i18n: ectx: property (text), item, widget (KComboBox, separatorMode)
+#: rc.cpp:38 rc.cpp:122
 msgid "Never Draw Separator"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:225
-#. i18n: ectx: property (text), item, widget (QComboBox, separatorMode)
 #. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:145
 #. i18n: ectx: property (text), item, widget (KComboBox, separatorComboBox)
-#: rc.cpp:113 rc.cpp:176
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:208
+#. i18n: ectx: property (text), item, widget (KComboBox, separatorMode)
+#: rc.cpp:41 rc.cpp:125
 msgid "Draw Separator When Window is Active"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:230
-#. i18n: ectx: property (text), item, widget (QComboBox, separatorMode)
 #. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:150
 #. i18n: ectx: property (text), item, widget (KComboBox, separatorComboBox)
-#: rc.cpp:116 rc.cpp:179
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:213
+#. i18n: ectx: property (text), item, widget (KComboBox, separatorMode)
+#: rc.cpp:44 rc.cpp:128
 msgid "Always Draw Separator"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:238
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:96
-#. i18n: ectx: property (text), widget (QCheckBox, separatorCheckBox)
-#: rc.cpp:119 rc.cpp:164
-msgid "Separator display:"
+#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:47
+msgid "Information about Selected Window"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:252
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#: rc.cpp:122
-msgid "Shadows"
+#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:23
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:50
+msgid "Class: "
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:293
-#. i18n: ectx: property (text), widget (QLabel, shadowCacheModeLabel)
-#: rc.cpp:128
-msgid "Shadow caching:"
+#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:40
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:53
+msgid "Title: "
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:314
-#. i18n: ectx: property (title), widget (Oxygen::ShadowConfigurationUi, inactiveShadowConfiguration)
-#: rc.cpp:131
-msgid "Window Drop-Down Shadow"
+#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:60
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:56
+msgid "Window Property Selection"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:324
-#. i18n: ectx: property (title), widget (Oxygen::ShadowConfigurationUi, activeShadowConfiguration)
-#: rc.cpp:134
-msgid "Active Window Glow"
+#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:66
+#. i18n: ectx: property (text), widget (QRadioButton, windowClassCheckBox)
+#: rc.cpp:59
+msgid "Use window class (whole application)"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:350
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: rc.cpp:137
-msgid "Window-Specific Overrides"
+#. i18n: file: oxygen/config/ui/oxygendetectwidget.ui:76
+#. i18n: ectx: property (text), widget (QRadioButton, windowTitleCheckBox)
+#: rc.cpp:62
+msgid "Use window title"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenshadowconfigurationui.ui:23
 #. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:62
+#: rc.cpp:65
 msgid "Inner Color:"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenshadowconfigurationui.ui:42
 #. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:65
+#: rc.cpp:68
 msgid "Outer Color:"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenshadowconfigurationui.ui:69
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:68
+#: rc.cpp:71
 msgid "Vertical Offset:"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenshadowconfigurationui.ui:82
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:71
+#: rc.cpp:74
 msgid "Size: "
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenexceptionlistwidget.ui:29
 #. i18n: ectx: property (text), widget (KPushButton, moveUpButton)
-#: rc.cpp:23
+#: rc.cpp:77
 msgid "Move Up"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenexceptionlistwidget.ui:36
 #. i18n: ectx: property (text), widget (KPushButton, moveDownButton)
-#: rc.cpp:26
+#: rc.cpp:80
 msgid "Move Down"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenexceptionlistwidget.ui:43
 #. i18n: ectx: property (text), widget (KPushButton, addButton)
-#: rc.cpp:29
+#: rc.cpp:83
 msgid "Add"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenexceptionlistwidget.ui:50
 #. i18n: ectx: property (text), widget (KPushButton, removeButton)
-#: rc.cpp:32
+#: rc.cpp:86
 msgid "Remove"
 msgstr ""
 
 #. i18n: file: oxygen/config/ui/oxygenexceptionlistwidget.ui:57
 #. i18n: ectx: property (text), widget (KPushButton, editButton)
-#: rc.cpp:35
+#: rc.cpp:89
 msgid "Edit"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:140
-msgid "Window Identification"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:33
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:92
+msgid "General"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:143
-msgid "Matching window property: "
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:98
+msgid "Title alignment:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:36
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:146
-msgid "Regular expression to match: "
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:84
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:101
+msgid "Button size:"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:49
-#. i18n: ectx: property (text), widget (QPushButton, detectDialogButton)
-#: rc.cpp:149
-msgid "Detect Window Properties"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, animationsEnabled)
+#: rc.cpp:104
+msgid "Enable animations"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:69
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:152
-msgid "Decoration Options"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:121
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:107
+msgid "Fine Tuning"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:82
-#. i18n: ectx: property (text), widget (QCheckBox, sizeGripCheckBox)
-#: rc.cpp:158
-msgid "Extra size grip display:"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:130
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:110
+msgid "Background style: "
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:89
-#. i18n: ectx: property (text), widget (QCheckBox, titleOutlineCheckBox)
-#: rc.cpp:161
-msgid "Outline active window title:"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:159
+#. i18n: ectx: property (text), widget (QCheckBox, titleOutline)
+#: rc.cpp:113
+msgid "Outline active window title"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:103
-#. i18n: ectx: property (text), widget (QCheckBox, blendColorCheckBox)
-#: rc.cpp:167
-msgid "Background style:"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:166
+#. i18n: ectx: property (text), widget (QCheckBox, narrowButtonSpacing)
+#: rc.cpp:116
+msgid "Use narrow space between decoration buttons"
 msgstr ""
 
-#. i18n: file: oxygen/config/ui/oxygenexceptiondialog.ui:110
-#. i18n: ectx: property (text), widget (QCheckBox, hideTitleBar)
-#: rc.cpp:170
-msgid "Hide window title bar"
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:189
+#. i18n: ectx: property (text), widget (QLabel, sizeGripModeLabel)
+#: rc.cpp:119
+msgid "Extra size grip display: "
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:235
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#: rc.cpp:134
+msgid "Shadows"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:243
+#. i18n: ectx: property (title), widget (Oxygen::ShadowConfigurationUi, inactiveShadowConfiguration)
+#: rc.cpp:137
+msgid "Window Drop-Down Shadow"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:253
+#. i18n: ectx: property (title), widget (Oxygen::ShadowConfigurationUi, activeShadowConfiguration)
+#: rc.cpp:140
+msgid "Active Window Glow"
+msgstr ""
+
+#. i18n: file: oxygen/config/ui/oxygenconfigurationui.ui:279
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#: rc.cpp:143
+msgid "Window-Specific Overrides"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenshadowdemo.ui:17
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:155
+#: rc.cpp:146
 msgid "Inactive Windows"
 msgstr ""
 
 #. i18n: file: oxygen/demo/ui/oxygenshadowdemo.ui:27
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:158
+#: rc.cpp:149
 msgid "Active Windows"
 msgstr ""
 
 #. i18n: file: plastik/config/configdialog.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, PlastikConfigDialog)
-#: rc.cpp:182
+#: rc.cpp:152
 msgid "Config Dialog"
 msgstr ""
 
-#. i18n: file: tabstrip/config/tabstripconfig.ui:20
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: plastik/config/configdialog.ui:23
 #. i18n: ectx: property (title), widget (KButtonGroup, titleAlign)
-#: rc.cpp:8 rc.cpp:185
+#. i18n: file: tabstrip/config/tabstripconfig.ui:20
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:155 rc.cpp:194
 msgid "Title &Alignment"
 msgstr ""
 
 #. i18n: file: plastik/config/configdialog.ui:53
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, coloredBorder)
-#: rc.cpp:197
+#: rc.cpp:167
 msgid ""
 "Check this option if the window border should be painted in the titlebar "
 "color. Otherwise it will be painted in the background color."
@@ -734,13 +750,13 @@
 
 #. i18n: file: plastik/config/configdialog.ui:56
 #. i18n: ectx: property (text), widget (QCheckBox, coloredBorder)
-#: rc.cpp:200
+#: rc.cpp:170
 msgid "Colored window border"
 msgstr ""
 
 #. i18n: file: plastik/config/configdialog.ui:66
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, titleShadow)
-#: rc.cpp:203
+#: rc.cpp:173
 msgid ""
 "Check this option if you want the titlebar text to have a 3D look with a "
 "shadow behind it."
@@ -750,13 +766,13 @@
 
 #. i18n: file: plastik/config/configdialog.ui:69
 #. i18n: ectx: property (text), widget (QCheckBox, titleShadow)
-#: rc.cpp:206
+#: rc.cpp:176
 msgid "Use shadowed &text"
 msgstr "Defnyddio &testun â chysgod"
 
 #. i18n: file: plastik/config/configdialog.ui:76
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, animateButtons)
-#: rc.cpp:209
+#: rc.cpp:179
 msgid ""
 "Check this option if you want the buttons to fade in when the mouse pointer "
 "hovers over them and fade out again when it moves away."
@@ -764,13 +780,13 @@
 
 #. i18n: file: plastik/config/configdialog.ui:79
 #. i18n: ectx: property (text), widget (QCheckBox, animateButtons)
-#: rc.cpp:212
+#: rc.cpp:182
 msgid "Animate buttons"
 msgstr ""
 
 #. i18n: file: plastik/config/configdialog.ui:86
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, menuClose)
-#: rc.cpp:215
+#: rc.cpp:185
 msgid ""
 "Check this option if you want windows to be closed when you double click the "
 "menu button, similar to Microsoft Windows."
@@ -778,30 +794,36 @@
 
 #. i18n: file: plastik/config/configdialog.ui:89
 #. i18n: ectx: property (text), widget (QCheckBox, menuClose)
-#: rc.cpp:218
+#: rc.cpp:188
 msgid "Close windows by double clicking the menu button"
 msgstr ""
 
 #. i18n: file: tabstrip/config/tabstripconfig.ui:26
 #. i18n: ectx: property (text), widget (QRadioButton, left)
-#: rc.cpp:11
+#: rc.cpp:197
 msgid "&Left"
 msgstr ""
 
 #. i18n: file: tabstrip/config/tabstripconfig.ui:33
 #. i18n: ectx: property (text), widget (QRadioButton, center)
-#: rc.cpp:14
+#: rc.cpp:200
 msgid "&Center"
 msgstr ""
 
 #. i18n: file: tabstrip/config/tabstripconfig.ui:40
 #. i18n: ectx: property (text), widget (QRadioButton, right)
-#: rc.cpp:17
+#: rc.cpp:203
 msgid "&Right"
 msgstr ""
 
 #. i18n: file: tabstrip/config/tabstripconfig.ui:50
 #. i18n: ectx: property (text), widget (QCheckBox, showIcon)
-#: rc.cpp:20
+#: rc.cpp:206
 msgid "Display window icons"
 msgstr ""
+
+#. i18n: file: tabstrip/config/tabstripconfig.ui:59
+#. i18n: ectx: property (text), widget (QLabel, outline)
+#: rc.cpp:209
+msgid "O&utline Color:"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwin.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwin.po	2012-04-18 08:59:39.000000000 +0000
@@ -11,46 +11,29 @@
 msgstr ""
 "Project-Id-Version: kwin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:04+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-11 16:39+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:16+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:46+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: activation.cpp:757
+#: activation.cpp:736
 #, kde-format
 msgid "Window '%1' demands attention."
 msgstr ""
 
-#: composite.cpp:330
+#: composite.cpp:271
 #, kde-format
 msgid ""
 "Desktop effects have been suspended by another application.<br/>You can "
 "resume using the '%1' shortcut."
 msgstr ""
 
-#: composite.cpp:584
-msgid ""
-"Desktop effects were too slow and have been suspended.\n"
-"You can disable functionality checks in System Settings (on the Advanced tab "
-"in Desktop Effects)."
-msgstr ""
-
-#: composite.cpp:587
-#, kde-format
-msgid ""
-"Desktop effects were too slow and have been suspended.\n"
-"If this was only a temporary problem, you can resume using the '%1' "
-"shortcut.\n"
-"You can disable functionality checks in System Settings (on the Advanced tab "
-"in Desktop Effects)."
-msgstr ""
-
-#: compositingprefs.cpp:108
+#: compositingprefs.cpp:102
 msgid ""
 "<b>OpenGL compositing (the default) has crashed KWin in the "
 "past.</b><br>This was most likely due to a driver bug.<p>If you think that "
@@ -60,395 +43,303 @@
 "instead.</p>"
 msgstr ""
 
-#: compositingprefs.cpp:90
+#: compositingprefs.cpp:110
 msgid "Required X extensions (XComposite and XDamage) are not available."
 msgstr ""
 
-#: compositingprefs.cpp:94
+#: compositingprefs.cpp:114
 msgid "GLX/OpenGL are not available and only OpenGL support is compiled."
 msgstr ""
 
-#: compositingprefs.cpp:97
-msgid ""
-"XRender/XFixes extensions are not available and only XRender support is "
-"compiled."
-msgstr ""
-
-#: compositingprefs.cpp:103
+#: compositingprefs.cpp:118
 msgid "GLX/OpenGL and XRender/XFixes are not available."
 msgstr ""
 
-#: compositingprefs.cpp:108
-msgid ""
-"Compositing was disabled at compile time.\n"
-"It is likely Xorg development headers were not installed."
-msgstr ""
-
-#: kwinbindings.cpp:51
+#: kwinbindings.cpp:58
 msgid "System"
 msgstr "Cysawd"
 
-#: kwinbindings.cpp:54
+#: kwinbindings.cpp:61
 msgid "Navigation"
 msgstr "Llywio"
 
-#: kwinbindings.cpp:55
-msgid "Walk Through Windows"
-msgstr "Cerdded Trwy'r Ffenestri"
-
-#: kwinbindings.cpp:56
-msgid "Walk Through Windows (Reverse)"
-msgstr "Cerdded Trwy'r Ffenestri (Am yn Ôl)"
-
-#: kwinbindings.cpp:57
+#: kwinbindings.cpp:62
 msgid "Walk Through Window Tabs"
 msgstr ""
 
-#: kwinbindings.cpp:58
+#: kwinbindings.cpp:63
 msgid "Walk Through Window Tabs (Reverse)"
 msgstr ""
 
-#: kwinbindings.cpp:59
+#: kwinbindings.cpp:64
 msgid "Remove Window From Group"
 msgstr ""
 
-#: kwinbindings.cpp:60
-msgid "Walk Through Windows Alternative"
-msgstr ""
-
-#: kwinbindings.cpp:61
-msgid "Walk Through Windows Alternative (Reverse)"
-msgstr ""
-
-#: kwinbindings.cpp:62
-msgid "Walk Through Desktops"
-msgstr "Cerdded Trwy'r Penbyrddau"
-
-#: kwinbindings.cpp:63
-msgid "Walk Through Desktops (Reverse)"
-msgstr "Cerdded Trwy'r Penbyrddau (Am yn Ôl)"
-
-#: kwinbindings.cpp:64
-msgid "Walk Through Desktop List"
-msgstr "Cerdded Trwy'r Restr Penbyrddau"
-
-#: kwinbindings.cpp:65
-msgid "Walk Through Desktop List (Reverse)"
-msgstr "Cerdded Trwy'r Restr Penbyrddau (Am yn Ôl)"
-
-#: kwinbindings.cpp:68
+#: kwinbindings.cpp:67
 msgid "Windows"
 msgstr "Ffenestri"
 
-#: kwinbindings.cpp:69
+#: kwinbindings.cpp:68
 msgid "Window Operations Menu"
 msgstr "Dewislen Weithredoedd Ffenestr"
 
-#: kwinbindings.cpp:71
+#: kwinbindings.cpp:70
 msgid "Close Window"
 msgstr "Cau'r Ffenestr"
 
-#: kwinbindings.cpp:73
+#: kwinbindings.cpp:72
 msgid "Maximize Window"
 msgstr "&Ehangu'r Ffenestr"
 
-#: kwinbindings.cpp:75
+#: kwinbindings.cpp:74
 msgid "Maximize Window Vertically"
 msgstr "Ehangu'r Ffenestr yn Fertigol"
 
-#: kwinbindings.cpp:77
+#: kwinbindings.cpp:76
 msgid "Maximize Window Horizontally"
 msgstr "Ehangu'r Ffenestr yn Llorweddol"
 
-#: kwinbindings.cpp:79
+#: kwinbindings.cpp:78
 msgid "Minimize Window"
 msgstr "Lleihau'r Ffenestr"
 
-#: kwinbindings.cpp:81
+#: kwinbindings.cpp:80
 msgid "Shade Window"
 msgstr "Rholio'r Ffenestr"
 
-#: kwinbindings.cpp:83
+#: kwinbindings.cpp:82
 msgid "Move Window"
 msgstr "Symud y Ffenestr"
 
-#: kwinbindings.cpp:85
+#: kwinbindings.cpp:84
 msgid "Resize Window"
 msgstr "Newid Maint y Ffenestr"
 
-#: kwinbindings.cpp:87
+#: kwinbindings.cpp:86
 msgid "Raise Window"
 msgstr "Codi'r Ffenestr"
 
-#: kwinbindings.cpp:89
+#: kwinbindings.cpp:88
 msgid "Lower Window"
 msgstr "Gostwng y Ffenestr"
 
-#: kwinbindings.cpp:91
+#: kwinbindings.cpp:90
 msgid "Toggle Window Raise/Lower"
 msgstr "Codi/Gostwng Ffenestr"
 
-#: kwinbindings.cpp:93
+#: kwinbindings.cpp:92
 msgid "Make Window Fullscreen"
 msgstr "Gwneud i'r Ffenestr Lenwi'r Sgrîn"
 
-#: kwinbindings.cpp:95
+#: kwinbindings.cpp:94
 msgid "Hide Window Border"
 msgstr "Cuddio Ymyl y Ffenestr"
 
-#: kwinbindings.cpp:97
+#: kwinbindings.cpp:96
 msgid "Keep Window Above Others"
 msgstr "Cadw'r Ffenestr Uwchben y Lleill"
 
-#: kwinbindings.cpp:99
+#: kwinbindings.cpp:98
 msgid "Keep Window Below Others"
 msgstr "Cadw'r Ffenestr Dan y Lleill"
 
-#: kwinbindings.cpp:101
+#: kwinbindings.cpp:100
 msgid "Activate Window Demanding Attention"
 msgstr "Gweithredu'r Ffenestr sy'n Gofyn am Sylw"
 
-#: kwinbindings.cpp:103
+#: kwinbindings.cpp:102
 msgid "Setup Window Shortcut"
 msgstr ""
 
-#: kwinbindings.cpp:105
+#: kwinbindings.cpp:104
 msgid "Pack Window to the Right"
 msgstr "Pacio'r Ffenestr i'r Dde"
 
-#: kwinbindings.cpp:107
+#: kwinbindings.cpp:106
 msgid "Pack Window to the Left"
 msgstr "Pacio'r Ffenestr i'r Chwith"
 
-#: kwinbindings.cpp:109
+#: kwinbindings.cpp:108
 msgid "Pack Window Up"
 msgstr "Pacio'r Ffenestr i Fyny"
 
-#: kwinbindings.cpp:111
+#: kwinbindings.cpp:110
 msgid "Pack Window Down"
 msgstr "Pacio'r Ffenestr i Lawr"
 
-#: kwinbindings.cpp:113
+#: kwinbindings.cpp:112
 msgid "Pack Grow Window Horizontally"
 msgstr "Pacio'r Ffenestr a'i Hehangu yn Llorweddol"
 
-#: kwinbindings.cpp:115
+#: kwinbindings.cpp:114
 msgid "Pack Grow Window Vertically"
 msgstr "Pacio'r Ffenestr a'i Hehangu yn Fertigol"
 
-#: kwinbindings.cpp:117
+#: kwinbindings.cpp:116
 msgid "Pack Shrink Window Horizontally"
 msgstr "Pacio'r Ffenestr a'i Lleihau yn Llorweddol"
 
-#: kwinbindings.cpp:119
+#: kwinbindings.cpp:118
 msgid "Pack Shrink Window Vertically"
 msgstr "Pacio'r Ffenestr a'i Lleihau yn Fertigol"
 
-#: kwinbindings.cpp:121
+#: kwinbindings.cpp:120
 msgid "Quick Tile Window to the Left"
 msgstr ""
 
-#: kwinbindings.cpp:123
+#: kwinbindings.cpp:122
 msgid "Quick Tile Window to the Right"
 msgstr ""
 
-#: kwinbindings.cpp:132
+#: kwinbindings.cpp:124
 msgid "Quick Tile Window to the Top Left"
 msgstr ""
 
-#: kwinbindings.cpp:134
+#: kwinbindings.cpp:126
 msgid "Quick Tile Window to the Bottom Left"
 msgstr ""
 
-#: kwinbindings.cpp:136
+#: kwinbindings.cpp:128
 msgid "Quick Tile Window to the Top Right"
 msgstr ""
 
-#: kwinbindings.cpp:138
+#: kwinbindings.cpp:130
 msgid "Quick Tile Window to the Bottom Right"
 msgstr ""
 
-#: kwinbindings.cpp:125
+#: kwinbindings.cpp:132
 msgid "Switch to Window Above"
 msgstr ""
 
-#: kwinbindings.cpp:127
+#: kwinbindings.cpp:134
 msgid "Switch to Window Below"
 msgstr ""
 
-#: kwinbindings.cpp:129
+#: kwinbindings.cpp:136
 msgid "Switch to Window to the Right"
 msgstr ""
 
-#: kwinbindings.cpp:131
+#: kwinbindings.cpp:138
 msgid "Switch to Window to the Left"
 msgstr ""
 
-#: kwinbindings.cpp:135
+#: kwinbindings.cpp:140
+msgid "Increase Opacity of Active Window by 5 %"
+msgstr ""
+
+#: kwinbindings.cpp:142
+msgid "Decrease Opacity of Active Window by 5 %"
+msgstr ""
+
+#: kwinbindings.cpp:146
 msgid "Window & Desktop"
 msgstr "Ffenestr & Penbwrdd"
 
-#: kwinbindings.cpp:136
+#: kwinbindings.cpp:147
 msgid "Keep Window on All Desktops"
 msgstr "Cadw'r Ffenestr ar Bob un Penbwrdd"
 
-#: kwinbindings.cpp:155
+#: kwinbindings.cpp:151
 #, kde-format
 msgid "Window to Desktop %1"
 msgstr ""
 
-#: kwinbindings.cpp:158
+#: kwinbindings.cpp:153
 msgid "Window to Next Desktop"
 msgstr "Ffenestr i'r Penbwrdd Nesaf"
 
-#: kwinbindings.cpp:159
+#: kwinbindings.cpp:154
 msgid "Window to Previous Desktop"
 msgstr "Ffenestr i'r Penbwrdd Blaenorol"
 
-#: kwinbindings.cpp:160
+#: kwinbindings.cpp:155
 msgid "Window One Desktop to the Right"
 msgstr ""
 
-#: kwinbindings.cpp:161
+#: kwinbindings.cpp:156
 msgid "Window One Desktop to the Left"
 msgstr ""
 
-#: kwinbindings.cpp:162
+#: kwinbindings.cpp:157
 msgid "Window One Desktop Up"
 msgstr ""
 
-#: kwinbindings.cpp:163
+#: kwinbindings.cpp:158
 msgid "Window One Desktop Down"
 msgstr ""
 
-#: kwinbindings.cpp:165
+#: kwinbindings.cpp:161
 #, kde-format
 msgid "Window to Screen %1"
 msgstr ""
 
-#: kwinbindings.cpp:172
+#: kwinbindings.cpp:163
 msgid "Window to Next Screen"
 msgstr ""
 
-#: kwinbindings.cpp:173
+#: kwinbindings.cpp:164
 msgid "Show Desktop"
 msgstr ""
 
-#: kwinbindings.cpp:176
+#: kwinbindings.cpp:167
 msgid "Desktop Switching"
 msgstr "Newid Penbwrdd"
 
-#: kwinbindings.cpp:177
+#: kwinbindings.cpp:173
 #, kde-format
 msgid "Switch to Desktop %1"
 msgstr ""
 
-#: kwinbindings.cpp:197
+#: kwinbindings.cpp:176
 msgid "Switch to Next Desktop"
 msgstr "Newid i'r Penbwrdd Nesaf"
 
-#: kwinbindings.cpp:198
+#: kwinbindings.cpp:177
 msgid "Switch to Previous Desktop"
 msgstr "Newid i'r Penbwrdd Blaenorol"
 
-#: kwinbindings.cpp:199
+#: kwinbindings.cpp:178
 msgid "Switch One Desktop to the Right"
 msgstr "Newid Un Penbwrdd i'r Dde"
 
-#: kwinbindings.cpp:200
+#: kwinbindings.cpp:179
 msgid "Switch One Desktop to the Left"
 msgstr "Newid Un Penbwrdd i'r Chwith"
 
-#: kwinbindings.cpp:201
+#: kwinbindings.cpp:180
 msgid "Switch One Desktop Up"
 msgstr "Newid Un Penbwrdd i Fynnu"
 
-#: kwinbindings.cpp:202
+#: kwinbindings.cpp:181
 msgid "Switch One Desktop Down"
 msgstr "Newid Un Penbwrdd i Lawr"
 
-#: kwinbindings.cpp:188
+#: kwinbindings.cpp:184
 #, kde-format
 msgid "Switch to Screen %1"
 msgstr ""
 
-#: kwinbindings.cpp:211
+#: kwinbindings.cpp:187
 msgid "Switch to Next Screen"
 msgstr ""
 
-#: kwinbindings.cpp:214
+#: kwinbindings.cpp:190
 msgid "Miscellaneous"
 msgstr ""
 
-#: kwinbindings.cpp:215
-msgid "Mouse Emulation"
-msgstr "Efelychiad Llygoden"
-
-#: kwinbindings.cpp:216
+#: kwinbindings.cpp:191
 msgid "Kill Window"
 msgstr "Lladd Ffenestr"
 
-#: kwinbindings.cpp:219
+#: kwinbindings.cpp:192
 msgid "Block Global Shortcuts"
 msgstr ""
 
-#: kwinbindings.cpp:220
+#: kwinbindings.cpp:193
 msgid "Suspend Compositing"
 msgstr ""
 
-#: kwinbindings.cpp:223
-msgid "Tiling"
-msgstr ""
-
-#: kwinbindings.cpp:224
-msgid "Enable/Disable Tiling"
-msgstr ""
-
-#: kwinbindings.cpp:225
-msgid "Toggle Floating"
-msgstr ""
-
-#: kwinbindings.cpp:227
-msgid "Switch Focus Left"
-msgstr ""
-
-#: kwinbindings.cpp:228
-msgid "Switch Focus Right"
-msgstr ""
-
-#: kwinbindings.cpp:229
-msgid "Switch Focus Up"
-msgstr ""
-
-#: kwinbindings.cpp:230
-msgid "Switch Focus Down"
-msgstr ""
-
-#: kwinbindings.cpp:231
-msgid "Move Window Left"
-msgstr ""
-
-#: kwinbindings.cpp:232
-msgid "Move Window Right"
-msgstr ""
-
-#: kwinbindings.cpp:233
-msgid "Move Window Up"
-msgstr ""
-
-#: kwinbindings.cpp:234
-msgid "Move Window Down"
-msgstr ""
-
-#: kwinbindings.cpp:235
-msgid "Next Layout"
-msgstr ""
-
-#: kwinbindings.cpp:236
-msgid "Previous Layout"
-msgstr ""
-
-#: main.cpp:180
+#: main.cpp:181
 msgid ""
 "kwin: it looks like there's already a window manager running. kwin not "
 "started.\n"
@@ -463,7 +354,7 @@
 "You can select another window manager to run:"
 msgstr ""
 
-#: main.cpp:269
+#: main.cpp:266
 msgid ""
 "kwin: unable to claim manager selection, another wm running? (try using --"
 "replace)\n"
@@ -471,59 +362,59 @@
 "kwin: Methu hawlio dewisiad trefnydd, trefnydd ffenestri arall yn rhedeg? "
 "(Ceisiwch ddefnyddio --replace)\n"
 
-#: main.cpp:401
+#: main.cpp:397
 msgid "KDE window manager"
 msgstr ""
 
-#: main.cpp:476 killer/killer.cpp:37
+#: main.cpp:473 killer/killer.cpp:40
 msgid "KWin"
 msgstr "KWin"
 
-#: main.cpp:480
+#: main.cpp:477
 msgid "(c) 1999-2008, The KDE Developers"
 msgstr ""
 
-#: main.cpp:481
+#: main.cpp:478
 msgid "Matthias Ettrich"
 msgstr ""
 
-#: main.cpp:482
+#: main.cpp:479
 msgid "Cristian Tibirna"
 msgstr ""
 
-#: main.cpp:483
+#: main.cpp:480
 msgid "Daniel M. Duley"
 msgstr ""
 
-#: main.cpp:484
+#: main.cpp:481
 msgid "Luboš Luňák"
 msgstr ""
 
-#: main.cpp:489
+#: main.cpp:482
 msgid "Martin Gräßlin"
 msgstr ""
 
-#: main.cpp:484
+#: main.cpp:482
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: main.cpp:489
+#: main.cpp:487
 msgid "Disable configuration options"
 msgstr "Analluogi dewisiadau ffurfweddu"
 
-#: main.cpp:490
+#: main.cpp:488
 msgid "Replace already-running ICCCM2.0-compliant window manager"
 msgstr ""
 
-#: main.cpp:491
+#: main.cpp:489
 msgid "Indicate that KWin has recently crashed n times"
 msgstr ""
 
-#: main.cpp:497
+#: main.cpp:491
 msgid "Load the script testing dialog"
 msgstr ""
 
-#: plugins.cpp:42
+#: plugins.cpp:48
 msgid "KWin: "
 msgstr "KWin: "
 
@@ -537,171 +428,154 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
-#: tabbox.cpp:213
-msgctxt "Special entry in alt+tab list for minimizing all windows"
-msgid "Show Desktop"
-msgstr ""
-
-#: tiling.cpp:70
-msgid "Tiling Disabled"
-msgstr ""
-
-#: tiling.cpp:76
-msgid "Tiling Enabled"
-msgstr ""
-
 #: tilinglayoutfactory.cpp:43
 #, kde-format
 msgid "Layout changed to %1"
 msgstr ""
 
-#: tilinglayoutfactory.cpp:61
+#: tilinglayoutfactory.cpp:60
 msgctxt "Spiral tiling layout"
 msgid "Spiral"
 msgstr ""
 
-#: tilinglayoutfactory.cpp:62
+#: tilinglayoutfactory.cpp:61
 msgctxt "Two-column horizontal tiling layout"
 msgid "Columns"
 msgstr ""
 
-#: tilinglayoutfactory.cpp:63
+#: tilinglayoutfactory.cpp:62
 msgctxt "Floating layout, windows aren't tiled at all"
 msgid "Floating"
 msgstr ""
 
-#: useractions.cpp:77
+#: useractions.cpp:81
 msgid "Keep &Above Others"
 msgstr "Cadw &Uwchben y Lleill"
 
-#: useractions.cpp:85
+#: useractions.cpp:89
 msgid "Keep &Below Others"
 msgstr "Cadw &Dan y Lleill"
 
-#: useractions.cpp:93
+#: useractions.cpp:97
 msgid "&Fullscreen"
 msgstr "S&grîn Llawn"
 
-#: useractions.cpp:101
+#: useractions.cpp:105
 msgid "&No Border"
 msgstr "D&im Ymyl"
 
-#: useractions.cpp:108
+#: useractions.cpp:112
 msgid "Window &Shortcut..."
 msgstr ""
 
-#: useractions.cpp:115
+#: useractions.cpp:119
 msgid "&Special Window Settings..."
 msgstr ""
 
-#: useractions.cpp:119
+#: useractions.cpp:123
 msgid "S&pecial Application Settings..."
 msgstr ""
 
-#: useractions.cpp:140
-msgid "&Opacity"
-msgstr "&Didreiddiad"
-
-#: useractions.cpp:143
+#: useractions.cpp:127
 msgid "&Move"
 msgstr "Sy&mud"
 
-#: useractions.cpp:150
+#: useractions.cpp:134
 msgid "Re&size"
 msgstr "&Newid Maint"
 
-#: useractions.cpp:156
+#: useractions.cpp:140
 msgid "Mi&nimize"
 msgstr "&Lleihau"
 
-#: useractions.cpp:162
+#: useractions.cpp:146
 msgid "Ma&ximize"
 msgstr "&Ehangu"
 
-#: useractions.cpp:169
+#: useractions.cpp:153
 msgid "Sh&ade"
 msgstr "&Cysgodi"
 
-#: useractions.cpp:181
+#: useractions.cpp:164
 msgid "Remove &From Group"
 msgstr ""
 
-#: useractions.cpp:187
+#: useractions.cpp:170
 msgid "Close Entire &Group"
 msgstr ""
 
-#: useractions.cpp:198
+#: useractions.cpp:181
 msgctxt "When in tiling mode, toggle's the window's floating/tiled state"
 msgid "&Float Window"
 msgstr ""
 
-#: useractions.cpp:214
+#: useractions.cpp:198
 msgid "Ad&vanced"
 msgstr "Uw&ch"
 
-#: useractions.cpp:221
+#: useractions.cpp:204
 msgid "Configur&e Window Behavior..."
 msgstr "Ffurfw&eddu Ymddygiad Ffenestr..."
 
-#: useractions.cpp:227
+#: useractions.cpp:210
 msgid "&Close"
 msgstr ""
 
-#: useractions.cpp:354
+#: useractions.cpp:326
 msgid "Switch to Window Tab"
 msgstr ""
 
-#: useractions.cpp:395
+#: useractions.cpp:360
 msgid "To the Left"
 msgstr ""
 
-#: useractions.cpp:397
+#: useractions.cpp:362
 msgid "To the Right"
 msgstr ""
 
-#: useractions.cpp:426
+#: useractions.cpp:389
 msgid "Move Window to Group"
 msgstr ""
 
-#: useractions.cpp:469
+#: useractions.cpp:428
 msgid "To &Desktop"
 msgstr "I'r Penbwr&dd"
 
-#: useractions.cpp:492
+#: useractions.cpp:451
 msgid "Ac&tivities"
 msgstr ""
 
-#: useractions.cpp:505
+#: useractions.cpp:464
 msgid "&All Desktops"
 msgstr "&Pob Penbwrdd"
 
-#: useractions.cpp:539
+#: useractions.cpp:498
 msgid "&All Activities"
 msgstr ""
 
-#: useractions.cpp:715
+#: useractions.cpp:602
 #, kde-format
 msgid "Activate Window (%1)"
 msgstr ""
 
-#: utils.cpp:525
+#: utils.cpp:506
 #, kde-format
 msgctxt "'%1' is a keyboard shortcut like 'ctrl+w'"
 msgid "<b>%1</b> is already in use"
 msgstr ""
 
-#: utils.cpp:527
+#: utils.cpp:508
 #, kde-format
 msgctxt "keyboard shortcut '%1' is used by action '%2' in application '%3'"
 msgid "<b>%1</b> is used by %2 in %3"
 msgstr ""
 
-#: workspace.cpp:1220 workspace.cpp:1240
+#: workspace.cpp:1103 workspace.cpp:1135
 #, kde-format
 msgid "Desktop %1"
 msgstr "Penbwrdd %1"
 
-#: workspace.cpp:2830
+#: workspace.cpp:1918
 #, kde-format
 msgid ""
 "You have selected to show a window without its border.\n"
@@ -710,7 +584,7 @@
 "keyboard shortcut."
 msgstr ""
 
-#: workspace.cpp:2844
+#: workspace.cpp:1930
 #, kde-format
 msgid ""
 "You have selected to show a window in fullscreen mode.\n"
@@ -719,39 +593,39 @@
 "window operations menu instead, activated using the %1 keyboard shortcut."
 msgstr ""
 
-#: killer/killer.cpp:38
+#: killer/killer.cpp:41
 msgid "KWin helper utility"
 msgstr "Defnyddioldeb gymorth KWin"
 
-#: killer/killer.cpp:41
+#: killer/killer.cpp:44
 msgid "PID of the application to terminate"
 msgstr ""
 
-#: killer/killer.cpp:42
+#: killer/killer.cpp:45
 msgid "Hostname on which the application is running"
 msgstr ""
 
-#: killer/killer.cpp:43
+#: killer/killer.cpp:46
 msgid "Caption of the window to be terminated"
 msgstr ""
 
-#: killer/killer.cpp:44
+#: killer/killer.cpp:47
 msgid "Name of the application to be terminated"
 msgstr ""
 
-#: killer/killer.cpp:45
+#: killer/killer.cpp:48
 msgid "ID of resource belonging to the application"
 msgstr ""
 
-#: killer/killer.cpp:46
+#: killer/killer.cpp:49
 msgid "Time of user action causing termination"
 msgstr ""
 
-#: killer/killer.cpp:64
+#: killer/killer.cpp:66
 msgid "This helper utility is not supposed to be called directly."
 msgstr ""
 
-#: killer/killer.cpp:68
+#: killer/killer.cpp:70
 #, kde-format
 msgid ""
 "<p>The window \"<b>%2</b>\" is not responding. It belongs to the application "
@@ -760,11 +634,48 @@
 "windows</em>?<br /><b>Any unsaved data will be lost.</b></p>"
 msgstr ""
 
-#: killer/killer.cpp:74
+#: killer/killer.cpp:76
 #, kde-format
 msgid "&Terminate Application %1"
 msgstr ""
 
-#: tabbox/clientmodel.cpp:57
+#: tabbox/clientmodel.cpp:62
 msgid "*** No Windows ***"
 msgstr ""
+
+#: tabbox/tabbox.cpp:234
+msgctxt "Special entry in alt+tab list for minimizing all windows"
+msgid "Show Desktop"
+msgstr ""
+
+#: tabbox/tabbox.cpp:346
+msgid "Walk Through Windows"
+msgstr "Cerdded Trwy'r Ffenestri"
+
+#: tabbox/tabbox.cpp:347
+msgid "Walk Through Windows (Reverse)"
+msgstr "Cerdded Trwy'r Ffenestri (Am yn Ôl)"
+
+#: tabbox/tabbox.cpp:348
+msgid "Walk Through Windows Alternative"
+msgstr ""
+
+#: tabbox/tabbox.cpp:349
+msgid "Walk Through Windows Alternative (Reverse)"
+msgstr ""
+
+#: tabbox/tabbox.cpp:350
+msgid "Walk Through Desktops"
+msgstr "Cerdded Trwy'r Penbyrddau"
+
+#: tabbox/tabbox.cpp:351
+msgid "Walk Through Desktops (Reverse)"
+msgstr "Cerdded Trwy'r Penbyrddau (Am yn Ôl)"
+
+#: tabbox/tabbox.cpp:352
+msgid "Walk Through Desktop List"
+msgstr "Cerdded Trwy'r Restr Penbyrddau"
+
+#: tabbox/tabbox.cpp:353
+msgid "Walk Through Desktop List (Reverse)"
+msgstr "Cerdded Trwy'r Restr Penbyrddau (Am yn Ôl)"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwinshutdown.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwinshutdown.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwinshutdown.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwinshutdown.po	2012-04-18 08:59:35.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kde-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2012-01-10 18:51+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:06+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:31+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: main.cpp:33
 msgid "kwinshutdown"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwordquiz.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwordquiz.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwordquiz.po	2012-03-23 07:39:29.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwordquiz.po	2012-04-18 08:59:40.000000000 +0000
@@ -4,233 +4,71 @@
 msgstr ""
 "Project-Id-Version: kwordquiz\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-09 16:24+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
 "PO-Revision-Date: 2009-07-18 17:48+0000\n"
 "Last-Translator: Kevin Donnelly <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:08+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:42+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kwordquizprefs.cpp:36
-msgctxt "@title:group general settings"
-msgid "General"
-msgstr ""
-
-#: kwordquizprefs.cpp:36
-msgctxt "@title:group general settings"
-msgid "General Settings"
-msgstr ""
-
-#: kwordquizprefs.cpp:39
-msgctxt "@title:group editor settings"
-msgid "Editor"
-msgstr ""
-
-#: kwordquizprefs.cpp:39
-msgctxt "@title:group editor settings"
-msgid "Editor Settings"
-msgstr ""
-
-#: kwordquizprefs.cpp:42
-msgctxt "@title:group quiz settings"
-msgid "Quiz"
-msgstr ""
-
-#: kwordquizprefs.cpp:42
-msgctxt "@title:group quiz settings"
-msgid "Quiz Settings"
-msgstr ""
-
-#: kwordquizprefs.cpp:45
-msgctxt "@title:group flash appearance settings"
-msgid "Flashcard Appearance"
-msgstr ""
-
-#: kwordquizprefs.cpp:45
-msgctxt "@title:group flash appearance settings"
-msgid "Flashcard Appearance Settings"
-msgstr ""
-
-#: kwordquizprefs.cpp:48
-msgctxt "@title:group special character settings"
-msgid "Special Characters"
-msgstr ""
-
-#: qaview.cpp:146 flashview.cpp:66 multipleview.cpp:112
-msgid "Your answer was correct!"
-msgstr "Roedd eich ateb yn gywir!"
-
-#: qaview.cpp:157 flashview.cpp:71 multipleview.cpp:121
-msgid "Your answer was incorrect."
-msgstr "Roedd eich ateb yn anghywir."
-
-#. i18n: file: multipleviewbase.ui:558
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:518
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:558
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:518
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:558
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:518
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:558
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:518
-#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
-#: qaview.cpp:155 rc.cpp:420 rc.cpp:858 rc.cpp:1166 rc.cpp:1604
-#: multipleview.cpp:119 rc.cpp:420 rc.cpp:858 rc.cpp:1166 rc.cpp:1604
-msgid "Correct Answer"
-msgstr "Ateb Cywir"
-
-#. i18n: file: multipleviewbase.ui:353
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:294
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:353
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:294
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:353
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:294
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:353
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:294
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
-#: qaview.cpp:163 rc.cpp:378 rc.cpp:813 rc.cpp:1124 rc.cpp:1559
-#: multipleview.cpp:124 rc.cpp:378 rc.cpp:813 rc.cpp:1124 rc.cpp:1559
-msgid "Previous Question"
-msgstr "Cwestiwn Cynt"
-
-#. i18n: file: multipleviewbase.ui:479
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:395
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:479
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:395
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:479
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:395
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:479
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:395
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
-#: qaview.cpp:168 rc.cpp:402 rc.cpp:834 rc.cpp:1148 rc.cpp:1580
-#: multipleview.cpp:128 rc.cpp:402 rc.cpp:834 rc.cpp:1148 rc.cpp:1580
-msgid "Your Answer"
-msgstr "Eich Ateb"
-
-#: qaview.cpp:184 multipleview.cpp:147
-msgid "Summary"
-msgstr "Crynodeb"
-
-#: kwqtutor.cpp:40
-msgid ""
-"<qt>KWordQuiz Tutor displays flashcards on your screen in a way that allows "
-"you to set a certain time interval at which flashcards will pop up.<br /><br "
-"/>The flashcards pop up in a non-intrusive way allowing you to carry on "
-"working without stealing the focus from other programs you might be working "
-"with.<br /><br />Be sure to right-click KWordQuiz Tutor icon on the panel "
-"and select Preferences. There you can assign keyboard shortcuts.</qt>"
-msgstr ""
-
-#: kwqtutor.cpp:46
-msgid "Tutor"
-msgstr ""
-
-#: kwqtutor.cpp:56 kwqtutor.cpp:128
-msgid "Start Exercise"
-msgstr ""
-
-#: kwqtutor.cpp:65
-msgid "Configure KWordQuiz Tutor..."
-msgstr ""
-
-#: kwqtutor.cpp:70
-msgid "Close Flash Card"
-msgstr ""
-
-#: kwqtutor.cpp:75
-msgid "Flip Flash Card"
-msgstr ""
-
-#: kwqtutor.cpp:120
-msgid "Stop Exercise"
-msgstr ""
-
-#: kwordquiz.cpp:786 kwqtutor.cpp:142
-msgid "Open Vocabulary Document"
+#: kwqcommands.cpp:88
+msgctxt "@item:inmenu undo clear"
+msgid "Clear"
 msgstr ""
 
-#: kwqcommands.h:106
-msgid "Font"
+#: kwqcommands.cpp:110
+msgctxt "@item:inmenu undo cut"
+msgid "Cut"
 msgstr ""
 
-#: kwqcommands.h:124
-msgid "Entry"
+#: kwqcommands.cpp:123
+msgctxt "@item:inmenu undo paste"
+msgid "Paste"
 msgstr ""
 
-#: main.cpp:30
-msgid "A powerful flashcard and vocabulary learning program"
+#: kwqcommands.cpp:220
+msgctxt "@item:inmenu undo sort"
+msgid "Sort"
 msgstr ""
 
-#: main.cpp:34
-msgid "KWordQuiz"
-msgstr "KWordQuiz"
-
-#: main.cpp:38
-msgid "(c) 2003-2010, Peter Hedlund"
+#: kwqcommands.cpp:247
+msgctxt "@item:inmenu undo shuffle"
+msgid "Shuffle"
 msgstr ""
 
-#: main.cpp:43
-msgid "Peter Hedlund"
+#: kwqcommands.cpp:267
+msgctxt "@item:inmenu undo insert"
+msgid "Insert"
 msgstr ""
 
-#: main.cpp:44
-msgid "Anne-Marie Mahfouf"
+#: kwqcommands.cpp:299
+msgctxt "@item:inmenu undo delete"
+msgid "Delete"
 msgstr ""
 
-#: main.cpp:44
-msgid "KDE Edutainment Maintainer"
-msgstr "Cynhaliwr Addloniant KDE"
-
-#: main.cpp:45
-msgid "Martin Pfeiffer"
+#: kwqcommands.cpp:348
+msgctxt "@item:inmenu undo unmark blank"
+msgid "Unmark Blank"
 msgstr ""
 
-#: main.cpp:45
-msgid "Leitner System and several code contributions"
+#: kwqcommands.cpp:370
+msgctxt "@item:inmenu undo column titles"
+msgid "Column Settings"
 msgstr ""
 
-#: main.cpp:51
-msgid ""
-"A number 1-5 corresponding to the \n"
-"entries in the Mode menu"
+#: kwqcommands.cpp:415
+msgctxt "@item:inmenu undo link image"
+msgid "Link Image"
 msgstr ""
 
-#: main.cpp:53
-msgid ""
-"Type of session to start with: \n"
-"'flash' for flashcard, \n"
-"'mc' for multiple choice, \n"
-"'qa' for question and answer, \n"
-"'tutor' for tutor"
+#: kwqcommands.cpp:434
+msgctxt "@item:inmenu undo link sound"
+msgid "Link Sound"
 msgstr ""
 
-#: main.cpp:54
-msgid "File to open"
-msgstr "Ffeil i'w hagor"
-
 #: prefcardappearance.cpp:80
 msgctxt "Back of the flashcard"
 msgid "Back"
@@ -248,86 +86,113 @@
 msgid "Question"
 msgstr "Cwestiwn"
 
-#: kwqtutorprefs.cpp:31
-msgctxt "@title:group tutor settings"
-msgid "Tutor"
+#: wqprintdialogpage.cpp:30
+msgid "Vocabulary Options"
 msgstr ""
 
-#: kwqtutorprefs.cpp:31
-msgctxt "@title:group tutor settings"
-msgid "Tutor Settings"
+#: wqprintdialogpage.cpp:38
+msgid "Select Type of Printout"
 msgstr ""
 
-#: kwqtutorprefs.cpp:34
-msgctxt "Shortcuts Config"
-msgid "Shortcuts"
+#: wqprintdialogpage.cpp:45
+msgid "Vocabulary &list"
 msgstr ""
 
-#: kwqtutorprefs.cpp:34
-msgid "Shortcuts Settings"
+#: wqprintdialogpage.cpp:46
+msgid "Select to print the vocabulary as displayed in the editor"
 msgstr ""
 
-#: kwordquiz.cpp:673 kwordquiz.cpp:730 kwordquiz.cpp:852 kwqtablemodel.cpp:223
-msgid "Untitled"
+#: wqprintdialogpage.cpp:50
+msgid "Vocabulary e&xam"
 msgstr ""
 
-#: kwqcommands.cpp:85
-msgctxt "@item:inmenu undo clear"
-msgid "Clear"
+#: wqprintdialogpage.cpp:51
+msgid "Select to print the vocabulary as a vocabulary exam"
 msgstr ""
 
-#: kwqcommands.cpp:107
-msgctxt "@item:inmenu undo cut"
-msgid "Cut"
+#: wqprintdialogpage.cpp:55
+msgid "&Flashcards"
 msgstr ""
 
-#: kwqcommands.cpp:120
-msgctxt "@item:inmenu undo paste"
-msgid "Paste"
+#: wqprintdialogpage.cpp:56
+msgid "Select to print flashcards"
 msgstr ""
 
-#: kwqcommands.cpp:217
-msgctxt "@item:inmenu undo sort"
-msgid "Sort"
-msgstr ""
+#: multipleview.cpp:112 flashview.cpp:66 qaview.cpp:146
+msgid "Your answer was correct!"
+msgstr "Roedd eich ateb yn gywir!"
 
-#: kwqcommands.cpp:244
-msgctxt "@item:inmenu undo shuffle"
-msgid "Shuffle"
-msgstr ""
+#. i18n: file: multipleviewbase.ui:558
+#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
+#. i18n: file: qaviewbase.ui:518
+#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
+#. i18n: file: multipleviewbase.ui:558
+#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
+#. i18n: file: qaviewbase.ui:518
+#. i18n: ectx: property (text), widget (QLabel, lblCorrectHeader)
+#: multipleview.cpp:119 rc.cpp:296 rc.cpp:734 qaview.cpp:155 rc.cpp:296
+#: rc.cpp:734
+msgid "Correct Answer"
+msgstr "Ateb Cywir"
 
-#: kwqcommands.cpp:264
-msgctxt "@item:inmenu undo insert"
-msgid "Insert"
-msgstr ""
+#: multipleview.cpp:121 flashview.cpp:71 qaview.cpp:157
+msgid "Your answer was incorrect."
+msgstr "Roedd eich ateb yn anghywir."
 
-#: kwqcommands.cpp:296
-msgctxt "@item:inmenu undo delete"
-msgid "Delete"
-msgstr ""
+#. i18n: file: multipleviewbase.ui:353
+#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
+#. i18n: file: qaviewbase.ui:294
+#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
+#. i18n: file: multipleviewbase.ui:353
+#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
+#. i18n: file: qaviewbase.ui:294
+#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestionHeader)
+#: multipleview.cpp:124 rc.cpp:254 rc.cpp:689 qaview.cpp:163 rc.cpp:254
+#: rc.cpp:689
+msgid "Previous Question"
+msgstr "Cwestiwn Cynt"
 
-#: kwqcommands.cpp:345
-msgctxt "@item:inmenu undo unmark blank"
-msgid "Unmark Blank"
+#. i18n: file: multipleviewbase.ui:479
+#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
+#. i18n: file: qaviewbase.ui:395
+#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
+#. i18n: file: multipleviewbase.ui:479
+#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
+#. i18n: file: qaviewbase.ui:395
+#. i18n: ectx: property (text), widget (QLabel, lblYourAnswerHeader)
+#: multipleview.cpp:128 rc.cpp:278 rc.cpp:710 qaview.cpp:168 rc.cpp:278
+#: rc.cpp:710
+msgid "Your Answer"
+msgstr "Eich Ateb"
+
+#: multipleview.cpp:147 qaview.cpp:184
+msgid "Summary"
+msgstr "Crynodeb"
+
+#: kwqtableview.cpp:190
+msgid "Name:_____________________________ Date:__________"
 msgstr ""
 
-#: kwqcommands.cpp:367
-msgctxt "@item:inmenu undo column titles"
-msgid "Column Settings"
+#. i18n: file: prefquizbase.ui:90
+#. i18n: ectx: property (title), widget (QGroupBox, grpScore)
+#: kwqtableview.cpp:237 rc.cpp:527 rc.cpp:527
+msgid "Score"
+msgstr "Sgôr"
+
+#: kwqtableview.cpp:656
+msgid "There is an error with the Fill-in-the-blank brackets"
 msgstr ""
 
-#: kwqcommands.cpp:412
-msgctxt "@item:inmenu undo link image"
-msgid "Link Image"
+#: kwqtableview.cpp:718
+msgid "Select Image"
 msgstr ""
 
-#: kwqcommands.cpp:431
-msgctxt "@item:inmenu undo link sound"
-msgid "Link Sound"
+#: kwqtableview.cpp:730
+msgid "*|All Files"
 msgstr ""
 
-#: kwqcleardialog.cpp:27
-msgid "Clear Contents"
+#: kwqtableview.cpp:730
+msgid "Select Sound"
 msgstr ""
 
 #: prefcharacter.cpp:44
@@ -347,540 +212,548 @@
 msgid "Special Character %1"
 msgstr ""
 
-#: kwordquiz.cpp:117
+#: kwordquiz.cpp:118
 msgid "Creates a new blank vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:122
+#: kwordquiz.cpp:123
 msgid "Opens an existing vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:128
+#: kwordquiz.cpp:129
 msgid "Download New Vocabularies..."
 msgstr ""
 
-#: kwordquiz.cpp:130
+#: kwordquiz.cpp:131
 msgid "Downloads new vocabularies"
 msgstr ""
 
-#: kwordquiz.cpp:135
+#: kwordquiz.cpp:136
 msgid "Saves the active vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:140
+#: kwordquiz.cpp:141
 msgid "Saves the active vocabulary document with a different name"
 msgstr ""
 
-#: kwordquiz.cpp:145
+#: kwordquiz.cpp:146
 msgid "Closes the active vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:149
+#: kwordquiz.cpp:150
 msgid "Prints the active vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:154
+#: kwordquiz.cpp:155
 msgid "Shows a preview of the active vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:159
+#: kwordquiz.cpp:160
 msgid "Quits KWordQuiz"
 msgstr ""
 
-#: kwordquiz.cpp:171
+#: kwordquiz.cpp:172
 msgid "Cuts the text from the selected cells and places it on the clipboard"
 msgstr ""
 
-#: kwordquiz.cpp:176
+#: kwordquiz.cpp:177
 msgid ""
 "Copies the text from the selected cells and places it on the clipboard"
 msgstr ""
 
-#: kwordquiz.cpp:181
+#: kwordquiz.cpp:182
 msgid ""
 "Pastes previously cut or copied text from the clipboard into the selected "
 "cells"
 msgstr ""
 
-#: kwordquiz.cpp:187
+#: kwordquiz.cpp:188
 msgid "Clears the content of the selected cells"
 msgstr ""
 
-#: kwordquiz.cpp:193
+#: kwordquiz.cpp:194
 msgid "&Insert Row"
 msgstr "&Mewnosod Rhes"
 
-#: kwordquiz.cpp:195
+#: kwordquiz.cpp:196
 msgid "Inserts a new row above the current row"
 msgstr ""
 
-#: kwordquiz.cpp:202
+#: kwordquiz.cpp:203
 msgid "&Delete Row"
 msgstr "&Dileu Rhes"
 
-#: kwordquiz.cpp:204
+#: kwordquiz.cpp:205
 msgid "Deletes the selected row(s)"
 msgstr ""
 
-#: kwordquiz.cpp:211
+#: kwordquiz.cpp:212
 msgid "&Mark as Blank"
 msgstr ""
 
-#: kwordquiz.cpp:213
+#: kwordquiz.cpp:214
 msgid "Marks the current or selected word as a blank for Fill-in-the-blank"
 msgstr ""
 
-#: kwordquiz.cpp:220
+#: kwordquiz.cpp:221
 msgid "&Unmark Blanks"
 msgstr ""
 
-#: kwordquiz.cpp:221
+#: kwordquiz.cpp:222
 msgid "Removes blanks from the current or selected word"
 msgstr ""
 
-#: kwordquiz.cpp:228
+#: kwordquiz.cpp:229
 msgid "&Column Settings..."
 msgstr ""
 
-#: kwordquiz.cpp:230
+#: kwordquiz.cpp:231
 msgid "Defines the column settings for the active vocabulary"
 msgstr ""
 
-#: kwordquiz.cpp:237
+#: kwordquiz.cpp:238
 msgid "&Font..."
 msgstr "W&ynebfath..."
 
-#: kwordquiz.cpp:238
+#: kwordquiz.cpp:239
 msgid "Defines the font used by the editor"
 msgstr ""
 
-#: kwordquiz.cpp:245
+#: kwordquiz.cpp:246
 msgid "Link &Image..."
 msgstr ""
 
-#: kwordquiz.cpp:246
+#: kwordquiz.cpp:247
 msgid "Links an image with the current entry"
 msgstr ""
 
-#: kwordquiz.cpp:253
+#: kwordquiz.cpp:254
 msgid "Link &Sound..."
 msgstr ""
 
-#: kwordquiz.cpp:254
+#: kwordquiz.cpp:255
 msgid "Links a sound with the current entry"
 msgstr ""
 
-#: kwordquiz.cpp:261
+#: kwordquiz.cpp:262
 msgid "&Adjust Row Heights"
 msgstr ""
 
-#: kwordquiz.cpp:262
+#: kwordquiz.cpp:263
 msgid "Automatically adjusts the height of selected rows"
 msgstr ""
 
-#: kwordquiz.cpp:269
+#: kwordquiz.cpp:270
 msgid "Sh&uffle"
 msgstr "Cy&mysgu"
 
-#: kwordquiz.cpp:270
+#: kwordquiz.cpp:271
 msgid "Shuffles the entries of the active vocabulary"
 msgstr ""
 
-#: kwordquiz.cpp:276
+#: kwordquiz.cpp:277
 msgid "&Keyboard Layout"
 msgstr ""
 
-#: kwordquiz.cpp:277
+#: kwordquiz.cpp:278
 msgid "Shows available keyboard layouts"
 msgstr ""
 
-#: kwordquiz.cpp:288
+#: kwordquiz.cpp:289
 msgid "Change Mode"
 msgstr ""
 
-#: kwordquiz.cpp:289
+#: kwordquiz.cpp:290
 msgid "Mode"
 msgstr ""
 
-#: kwordquiz.cpp:290
+#: kwordquiz.cpp:291
 msgid "Changes the mode used in quiz sessions"
 msgstr ""
 
-#: kwordquiz.cpp:303
+#: kwordquiz.cpp:304
 msgid "Selects this mode"
 msgstr ""
 
-#: kwordquiz.cpp:312
+#: kwordquiz.cpp:313
 msgctxt "@item:inlistbox activate vocabulary editor"
 msgid "&Editor"
 msgstr ""
 
-#: kwordquiz.cpp:314
+#: kwordquiz.cpp:315
 msgid "Activates the vocabulary editor"
 msgstr ""
 
-#: kwordquiz.cpp:321
+#: kwordquiz.cpp:322
 msgid "&Flashcard"
 msgstr ""
 
-#: kwordquiz.cpp:323
+#: kwordquiz.cpp:324
 msgid "Starts a flashcard session using the active vocabulary"
 msgstr ""
 
-#: kwordquiz.cpp:330
+#: kwordquiz.cpp:331
 msgid "&Multiple Choice"
 msgstr ""
 
-#: kwordquiz.cpp:332
+#: kwordquiz.cpp:333
 msgid "Starts a multiple choice session using the active vocabulary"
 msgstr ""
 
-#: kwordquiz.cpp:339
+#: kwordquiz.cpp:340
 msgid "&Question and Answer"
 msgstr ""
 
-#: kwordquiz.cpp:340
+#: kwordquiz.cpp:341
 msgid "Q&&A"
 msgstr ""
 
-#: kwordquiz.cpp:342
+#: kwordquiz.cpp:343
 msgid "Starts a question and answer session using the active vocabulary"
 msgstr ""
 
-#: kwordquiz.cpp:349
+#: kwordquiz.cpp:350
 msgid "&Check"
 msgstr ""
 
-#: kwordquiz.cpp:351
+#: kwordquiz.cpp:352
 msgid "Checks your answer to this question"
 msgstr ""
 
-#: kwordquiz.cpp:356
+#: kwordquiz.cpp:357
 msgid "Choose Option &1"
 msgstr ""
 
-#: kwordquiz.cpp:360
+#: kwordquiz.cpp:361
 msgid "Choose Option &2"
 msgstr ""
 
-#: kwordquiz.cpp:364
+#: kwordquiz.cpp:365
 msgid "Choose Option &3"
 msgstr ""
 
-#: kwordquiz.cpp:369
+#: kwordquiz.cpp:370
 msgid "I &Know"
 msgstr ""
 
-#: kwordquiz.cpp:371
+#: kwordquiz.cpp:372
 msgid "Counts this card as correct and shows the next card"
 msgstr ""
 
-#: kwordquiz.cpp:377
+#: kwordquiz.cpp:378
 msgid "I &Do Not Know"
 msgstr ""
 
-#: kwordquiz.cpp:379
+#: kwordquiz.cpp:380
 msgid "Counts this card as incorrect and shows the next card"
 msgstr ""
 
-#: kwordquiz.cpp:385
+#: kwordquiz.cpp:386
 msgid "&Hint"
 msgstr "&Awgrym"
 
-#: kwordquiz.cpp:387
+#: kwordquiz.cpp:388
 msgid "Gets the next correct letter of the answer"
 msgstr ""
 
-#: kwordquiz.cpp:393
+#: kwordquiz.cpp:394
 msgid "Mark Last Correct"
 msgstr ""
 
-#: kwordquiz.cpp:395
+#: kwordquiz.cpp:396
 msgid "Marks last answer as correct"
 msgstr ""
 
-#: kwordquiz.cpp:401
+#: kwordquiz.cpp:402
 msgid "&Restart"
 msgstr "&Ail-gychwyn"
 
-#: kwordquiz.cpp:403
+#: kwordquiz.cpp:404
 msgid "Restarts the quiz session from the beginning"
 msgstr ""
 
-#: kwordquiz.cpp:409
+#: kwordquiz.cpp:410
 msgid "&Play Audio"
 msgstr ""
 
-#: kwordquiz.cpp:411
+#: kwordquiz.cpp:412
 msgid "Play associated audio"
 msgstr ""
 
-#: kwordquiz.cpp:417
+#: kwordquiz.cpp:418
 msgid "Repeat &Errors"
 msgstr ""
 
-#: kwordquiz.cpp:419
+#: kwordquiz.cpp:420
 msgid "Repeats all incorrectly answered questions"
 msgstr ""
 
-#: kwordquiz.cpp:425
+#: kwordquiz.cpp:426
 msgid "Export Errors &As..."
 msgstr ""
 
-#: kwordquiz.cpp:426
+#: kwordquiz.cpp:427
 msgid "Exports all errors as a new vocabulary document"
 msgstr ""
 
-#: kwordquiz.cpp:432
+#: kwordquiz.cpp:433
 msgid "Show Se&arch"
 msgstr ""
 
-#: kwordquiz.cpp:434
+#: kwordquiz.cpp:435
 msgid "Toggle display of the search bar"
 msgstr ""
 
-#: kwordquiz.cpp:439
+#: kwordquiz.cpp:440
 msgid "Configures sound and other notifications for certain events"
 msgstr ""
 
-#: kwordquiz.cpp:444
+#: kwordquiz.cpp:445
 msgid "Specifies preferences for the vocabulary editor and quiz sessions"
 msgstr ""
 
-#: kwordquiz.cpp:453
+#: kwordquiz.cpp:454
 #, kde-format
 msgid "Special Character <numid>%1</numid>"
 msgstr ""
 
-#: kwordquiz.cpp:467
+#: kwordquiz.cpp:468
 msgid "Toggles display of the toolbars"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:45
 #. i18n: ectx: property (title), widget (QGroupBox, column1GroupBox)
-#: kwordquiz.cpp:484 rc.cpp:42 rc.cpp:929 rc.cpp:42 rc.cpp:929
+#: kwordquiz.cpp:485 rc.cpp:59 rc.cpp:59
 msgid "Column 1"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:214
 #. i18n: ectx: property (title), widget (QGroupBox, column2GroupBox)
-#: kwordquiz.cpp:487 rc.cpp:78 rc.cpp:965 rc.cpp:78 rc.cpp:965
+#: kwordquiz.cpp:488 rc.cpp:95 rc.cpp:95
 msgid "Column 2"
 msgstr ""
 
-#: kwordquiz.cpp:519
+#: kwordquiz.cpp:520
 msgid "Enter search terms here"
 msgstr ""
 
-#: kwordquiz.cpp:541
+#: kwordquiz.cpp:542
 msgctxt "@item:inlistbox vocabulary editor"
 msgid "Editor"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:192
 #. i18n: ectx: property (title), widget (QGroupBox, KeepDiscard)
-#: kwordquiz.cpp:546 rc.cpp:681 rc.cpp:1427 rc.cpp:681 rc.cpp:1427
+#: kwordquiz.cpp:547 rc.cpp:557 rc.cpp:557
 msgid "Flashcard"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:149
 #. i18n: ectx: property (title), widget (QGroupBox, grpMultiple)
-#: kwordquiz.cpp:550 rc.cpp:666 rc.cpp:1412 rc.cpp:666 rc.cpp:1412
+#: kwordquiz.cpp:551 rc.cpp:542 rc.cpp:542
 msgid "Multiple Choice"
 msgstr ""
 
-#: kwordquiz.cpp:554
+#: kwordquiz.cpp:555
 msgid "Question & Answer"
 msgstr ""
 
-#: kwordquiz.cpp:620 kwordquiz.cpp:776 kwordquiz.cpp:823
+#: kwordquiz.cpp:621 kwordquiz.cpp:777 kwordquiz.cpp:824
 msgid "Opening file..."
 msgstr "Agor ffeil..."
 
-#: kwordquiz.cpp:652 kwordquiz.cpp:771 kwordquiz.cpp:818 kwordquiz.cpp:826
-#: kwordquiz.cpp:864 kwordquiz.cpp:876 kwordquiz.cpp:953 kwordquiz.cpp:960
-#: kwordquiz.cpp:966 kwordquiz.cpp:994 kwordquiz.cpp:1001 kwordquiz.cpp:1008
-#: kwordquiz.cpp:1015 kwordquiz.cpp:1022 kwordquiz.cpp:1029 kwordquiz.cpp:1036
-#: kwordquiz.cpp:1043 kwordquiz.cpp:1056 kwordquiz.cpp:1072 kwordquiz.cpp:1080
-#: kwordquiz.cpp:1088 kwordquiz.cpp:1097 kwordquiz.cpp:1105 kwordquiz.cpp:1119
-#: kwordquiz.cpp:1127 kwordquiz.cpp:1134 kwordquiz.cpp:1141 kwordquiz.cpp:1148
+#: kwordquiz.cpp:653 kwordquiz.cpp:772 kwordquiz.cpp:819 kwordquiz.cpp:827
+#: kwordquiz.cpp:865 kwordquiz.cpp:877 kwordquiz.cpp:954 kwordquiz.cpp:961
+#: kwordquiz.cpp:967 kwordquiz.cpp:995 kwordquiz.cpp:1002 kwordquiz.cpp:1009
+#: kwordquiz.cpp:1016 kwordquiz.cpp:1023 kwordquiz.cpp:1030 kwordquiz.cpp:1037
+#: kwordquiz.cpp:1044 kwordquiz.cpp:1057 kwordquiz.cpp:1073 kwordquiz.cpp:1081
+#: kwordquiz.cpp:1089 kwordquiz.cpp:1098 kwordquiz.cpp:1106 kwordquiz.cpp:1120
+#: kwordquiz.cpp:1128 kwordquiz.cpp:1135 kwordquiz.cpp:1142 kwordquiz.cpp:1149
 msgctxt "@info:status ready"
 msgid "Ready"
 msgstr ""
 
-#: kwordquiz.cpp:722
+#: kwordquiz.cpp:674 kwordquiz.cpp:731 kwordquiz.cpp:853 kwqtablemodel.cpp:223
+msgid "Untitled"
+msgstr ""
+
+#: kwordquiz.cpp:723
 msgid ""
 "The current document has been modified.\n"
 "Do you want to save it?"
 msgstr ""
 
-#: kwordquiz.cpp:766
+#: kwordquiz.cpp:767
 msgid "Opening a new document window..."
 msgstr ""
 
-#: kwordquiz.cpp:778
+#: kwordquiz.cpp:779
 msgid "&Merge selected files with the current document"
 msgstr ""
 
-#: kwordquiz.cpp:851
+#: kwordquiz.cpp:787 kwqtutor.cpp:142
+msgid "Open Vocabulary Document"
+msgstr ""
+
+#: kwordquiz.cpp:852
 msgid "Saving file..."
 msgstr "Yn cadw ffeil..."
 
-#: kwordquiz.cpp:870
+#: kwordquiz.cpp:871
 msgid "Saving file with a new filename..."
 msgstr ""
 
-#: kwordquiz.cpp:887
+#: kwordquiz.cpp:888
 msgid "*.html|HTML Document"
 msgstr ""
 
-#: kwordquiz.cpp:891
+#: kwordquiz.cpp:892
 msgid "Save Vocabulary Document As"
 msgstr ""
 
-#: kwordquiz.cpp:936
+#: kwordquiz.cpp:937
 msgid "Closing file..."
 msgstr "Yn cau ffeil..."
 
-#: kwordquiz.cpp:958
+#: kwordquiz.cpp:959
 msgid "Printing..."
 msgstr "Yn argraffu..."
 
-#: kwordquiz.cpp:964
+#: kwordquiz.cpp:965
 msgid "Showing Preview..."
 msgstr ""
 
-#: kwordquiz.cpp:972
+#: kwordquiz.cpp:973
 msgctxt "@info:status quitting"
 msgid "Quitting..."
 msgstr ""
 
-#: kwordquiz.cpp:992
+#: kwordquiz.cpp:993
 msgid "Cutting selection..."
 msgstr "Yn torri detholiad..."
 
-#: kwordquiz.cpp:999
+#: kwordquiz.cpp:1000
 msgid "Copying selection to clipboard..."
 msgstr "Yn copïo detholiad i'r gludfwrdd..."
 
-#: kwordquiz.cpp:1006
+#: kwordquiz.cpp:1007
 msgid "Inserting clipboard contents..."
 msgstr "Yn mewnosod cynnwys y gludfwrdd..."
 
-#: kwordquiz.cpp:1013
+#: kwordquiz.cpp:1014
 msgid "Clearing the selected cells..."
 msgstr ""
 
-#: kwordquiz.cpp:1020
+#: kwordquiz.cpp:1021
 msgid "Inserting rows..."
 msgstr "Yn mewnosod rhesi..."
 
-#: kwordquiz.cpp:1027
+#: kwordquiz.cpp:1028
 msgid "Deleting selected rows..."
 msgstr ""
 
-#: kwordquiz.cpp:1034
+#: kwordquiz.cpp:1035
 msgid "Marking selected text as a blank..."
 msgstr ""
 
-#: kwordquiz.cpp:1041
+#: kwordquiz.cpp:1042
 msgid "Removing blank markings..."
 msgstr ""
 
-#: kwordquiz.cpp:1048
+#: kwordquiz.cpp:1049
 msgid "Setting the column titles of the vocabulary..."
 msgstr ""
 
-#: kwordquiz.cpp:1061
+#: kwordquiz.cpp:1062
 msgid "Setting the font of the vocabulary..."
 msgstr ""
 
-#: kwordquiz.cpp:1078
+#: kwordquiz.cpp:1079
 msgid "Linking an image with the current entry..."
 msgstr ""
 
-#: kwordquiz.cpp:1086
+#: kwordquiz.cpp:1087
 msgid "Linking a sound with the current entry..."
 msgstr ""
 
-#: kwordquiz.cpp:1094
+#: kwordquiz.cpp:1095
 msgid "Adjusting row heights..."
 msgstr ""
 
-#: kwordquiz.cpp:1103
+#: kwordquiz.cpp:1104
 msgid "Randomizing the vocabulary..."
 msgstr ""
 
-#: kwordquiz.cpp:1111
+#: kwordquiz.cpp:1112
 msgid "Updating mode..."
 msgstr ""
 
-#: kwordquiz.cpp:1125
+#: kwordquiz.cpp:1126
 msgid "Starting editor session..."
 msgstr ""
 
-#: kwordquiz.cpp:1132
+#: kwordquiz.cpp:1133
 msgid "Starting flashcard session..."
 msgstr ""
 
-#: kwordquiz.cpp:1139
+#: kwordquiz.cpp:1140
 msgid "Starting multiple choice session..."
 msgstr ""
 
-#: kwordquiz.cpp:1146
+#: kwordquiz.cpp:1147
 msgid "Starting question & answer session..."
 msgstr ""
 
-#: kwordquiz.cpp:1301
+#: kwordquiz.cpp:1299
 #, kde-format
 msgid "Insert %1"
 msgstr ""
 
-#: kwordquiz.cpp:1302
+#: kwordquiz.cpp:1300
 #, kde-format
 msgid "Inserts the character %1"
 msgstr ""
 
-#: kwordquiz.cpp:1353
+#: kwordquiz.cpp:1351
 msgid "This will restart your quiz. Do you wish to continue?"
 msgstr ""
 
-#: kwordquiz.cpp:1369
+#: kwordquiz.cpp:1367
 #, kde-format
 msgid "&1 %1 -> %2 In Order"
 msgstr ""
 
-#: kwordquiz.cpp:1370
+#: kwordquiz.cpp:1368
 #, kde-format
 msgid "&2 %1 -> %2 In Order"
 msgstr ""
 
-#: kwordquiz.cpp:1371
+#: kwordquiz.cpp:1369
 #, kde-format
 msgid "&3 %1 -> %2 Randomly"
 msgstr ""
 
-#: kwordquiz.cpp:1372
+#: kwordquiz.cpp:1370
 #, kde-format
 msgid "&4 %1 -> %2 Randomly"
 msgstr ""
 
-#: kwordquiz.cpp:1373
+#: kwordquiz.cpp:1371
 #, kde-format
 msgid "&5 %1 &lt;-&gt; %2 Randomly"
 msgstr ""
 
-#: kwordquiz.cpp:1380 kwordquiz.cpp:1383
+#: kwordquiz.cpp:1378 kwordquiz.cpp:1381
 #, kde-format
 msgid "%1 -> %2 In Order"
 msgstr ""
 
-#: kwordquiz.cpp:1386 kwordquiz.cpp:1389
+#: kwordquiz.cpp:1384 kwordquiz.cpp:1387
 #, kde-format
 msgid "%1 -> %2 Randomly"
 msgstr ""
 
-#: kwordquiz.cpp:1392
+#: kwordquiz.cpp:1390
 #, kde-format
 msgid "%1 &lt;-&gt; %2 Randomly"
 msgstr ""
@@ -900,93 +773,129 @@
 msgid "Select this character"
 msgstr ""
 
-#: dlglanguage.cpp:31
-msgid "Column Settings"
+#: kwordquizprefs.cpp:36
+msgctxt "@title:group general settings"
+msgid "General"
 msgstr ""
 
-#: wqprintdialogpage.cpp:30
-msgid "Vocabulary Options"
+#: kwordquizprefs.cpp:36
+msgctxt "@title:group general settings"
+msgid "General Settings"
 msgstr ""
 
-#: wqprintdialogpage.cpp:38
-msgid "Select Type of Printout"
+#: kwordquizprefs.cpp:39
+msgctxt "@title:group editor settings"
+msgid "Editor"
 msgstr ""
 
-#: wqprintdialogpage.cpp:45
-msgid "Vocabulary &list"
+#: kwordquizprefs.cpp:39
+msgctxt "@title:group editor settings"
+msgid "Editor Settings"
 msgstr ""
 
-#: wqprintdialogpage.cpp:46
-msgid "Select to print the vocabulary as displayed in the editor"
+#: kwordquizprefs.cpp:42
+msgctxt "@title:group quiz settings"
+msgid "Quiz"
 msgstr ""
 
-#: wqprintdialogpage.cpp:50
-msgid "Vocabulary e&xam"
+#: kwordquizprefs.cpp:42
+msgctxt "@title:group quiz settings"
+msgid "Quiz Settings"
 msgstr ""
 
-#: wqprintdialogpage.cpp:51
-msgid "Select to print the vocabulary as a vocabulary exam"
+#: kwordquizprefs.cpp:45
+msgctxt "@title:group flash appearance settings"
+msgid "Flashcard Appearance"
 msgstr ""
 
-#: wqprintdialogpage.cpp:55
-msgid "&Flashcards"
+#: kwordquizprefs.cpp:45
+msgctxt "@title:group flash appearance settings"
+msgid "Flashcard Appearance Settings"
 msgstr ""
 
-#: wqprintdialogpage.cpp:56
-msgid "Select to print flashcards"
+#: kwordquizprefs.cpp:48
+msgctxt "@title:group special character settings"
+msgid "Special Characters"
 msgstr ""
 
-#: kwqtableview.cpp:190
-msgid "Name:_____________________________ Date:__________"
+#: kwqtutor.cpp:40
+msgid ""
+"<qt>KWordQuiz Tutor displays flashcards on your screen in a way that allows "
+"you to set a certain time interval at which flashcards will pop up.<br /><br "
+"/>The flashcards pop up in a non-intrusive way allowing you to carry on "
+"working without stealing the focus from other programs you might be working "
+"with.<br /><br />Be sure to right-click KWordQuiz Tutor icon on the panel "
+"and select Preferences. There you can assign keyboard shortcuts.</qt>"
 msgstr ""
 
-#. i18n: file: prefquizbase.ui:90
-#. i18n: ectx: property (title), widget (QGroupBox, grpScore)
-#: rc.cpp:651 rc.cpp:1397 kwqtableview.cpp:237 rc.cpp:651 rc.cpp:1397
-msgid "Score"
-msgstr "Sgôr"
+#: kwqtutor.cpp:46
+msgid "Tutor"
+msgstr ""
 
-#: kwqtableview.cpp:656
-msgid "There is an error with the Fill-in-the-blank brackets"
+#: kwqtutor.cpp:56 kwqtutor.cpp:128
+msgid "Start Exercise"
 msgstr ""
 
-#: kwqtableview.cpp:718
-msgid "Select Image"
+#: kwqtutor.cpp:65
+msgid "Configure KWordQuiz Tutor..."
 msgstr ""
 
-#: kwqtableview.cpp:730
-msgid "*|All Files"
+#: kwqtutor.cpp:70
+msgid "Close Flash Card"
 msgstr ""
 
-#: kwqtableview.cpp:730
-msgid "Select Sound"
+#: kwqtutor.cpp:75
+msgid "Flip Flash Card"
+msgstr ""
+
+#: kwqtutor.cpp:120
+msgid "Stop Exercise"
+msgstr ""
+
+#: kwqtutorprefs.cpp:31
+msgctxt "@title:group tutor settings"
+msgid "Tutor"
+msgstr ""
+
+#: kwqtutorprefs.cpp:31
+msgctxt "@title:group tutor settings"
+msgid "Tutor Settings"
+msgstr ""
+
+#: kwqtutorprefs.cpp:34
+msgctxt "Shortcuts Config"
+msgid "Shortcuts"
+msgstr ""
+
+#: kwqtutorprefs.cpp:34
+msgid "Shortcuts Settings"
 msgstr ""
 
-#: rc.cpp:871 rc.cpp:871
+#: rc.cpp:1 rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "Kyfieithu: KD, ,Launchpad Contributions:,Kevin Donnelly"
 
-#: rc.cpp:872 rc.cpp:872
+#: rc.cpp:2 rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: kwordquizui.rc:16
 #. i18n: ectx: Menu (vocabulary)
-#: rc.cpp:237 rc.cpp:875 rc.cpp:237 rc.cpp:875
+#: rc.cpp:5 rc.cpp:5
 msgid "V&ocabulary"
 msgstr ""
 
 #. i18n: file: kwordquizui.rc:30
 #. i18n: ectx: Menu (mode)
-#: rc.cpp:240 rc.cpp:878 rc.cpp:240 rc.cpp:878
+#: rc.cpp:8 rc.cpp:8
 msgid "&Mode"
 msgstr "&Modd"
 
 #. i18n: file: kwordquizui.rc:38
 #. i18n: ectx: Menu (quiz)
-#: rc.cpp:243 rc.cpp:881 rc.cpp:243 rc.cpp:881
+#: rc.cpp:11 rc.cpp:11
 msgid "&Quiz"
 msgstr "&Pos"
 
@@ -998,116 +907,95 @@
 #. i18n: ectx: ToolBar (quizToolBar)
 #. i18n: file: prefquizbase.ui:20
 #. i18n: ectx: property (windowTitle), widget (QWidget, PrefQuizBase)
-#. i18n: file: kwordquizui.rc:61
-#. i18n: ectx: ToolBar (quizToolBar)
-#. i18n: file: prefquizbase.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, PrefQuizBase)
-#. i18n: file: kwordquizui.rc:61
-#. i18n: ectx: ToolBar (quizToolBar)
-#. i18n: file: prefquizbase.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, PrefQuizBase)
-#: rc.cpp:246 rc.cpp:630 rc.cpp:884 rc.cpp:1376 rc.cpp:246 rc.cpp:630
-#: rc.cpp:884 rc.cpp:1376
+#: rc.cpp:14 rc.cpp:506 rc.cpp:14 rc.cpp:506
 msgid "Quiz"
 msgstr "Pos"
 
 #. i18n: file: kwordquizui.rc:75
 #. i18n: ectx: ToolBar (characterToolBar)
-#: rc.cpp:249 rc.cpp:887 rc.cpp:249 rc.cpp:887
+#: rc.cpp:17 rc.cpp:17
 msgid "Special Characters"
 msgstr "Nodau Arbennig"
 
 #. i18n: file: cleardialogbase.ui:21
 #. i18n: ectx: property (title), widget (KButtonGroup, clearButtonGroup)
-#: rc.cpp:3 rc.cpp:890 rc.cpp:3 rc.cpp:890
+#: rc.cpp:20 rc.cpp:20
 msgid "Selection"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:30
 #. i18n: ectx: property (toolTip), widget (QCheckBox, clearAllCheckBox)
-#: rc.cpp:6 rc.cpp:893 rc.cpp:6 rc.cpp:893
+#: rc.cpp:23 rc.cpp:23
 msgid "Delete all information in selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:33
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, clearAllCheckBox)
-#: rc.cpp:9 rc.cpp:896 rc.cpp:9 rc.cpp:896
+#: rc.cpp:26 rc.cpp:26
 msgid ""
 "When checked all information will be deleted from the selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:36
 #. i18n: ectx: property (text), widget (QCheckBox, clearAllCheckBox)
-#: rc.cpp:12 rc.cpp:899 rc.cpp:12 rc.cpp:899
+#: rc.cpp:29 rc.cpp:29
 msgid "Clear &All"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:59
 #. i18n: ectx: property (toolTip), widget (QCheckBox, clearTextCheckBox)
-#: rc.cpp:15 rc.cpp:902 rc.cpp:15 rc.cpp:902
+#: rc.cpp:32 rc.cpp:32
 msgid "Delete the text from selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:62
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, clearTextCheckBox)
-#: rc.cpp:18 rc.cpp:905 rc.cpp:18 rc.cpp:905
+#: rc.cpp:35 rc.cpp:35
 msgid "When checked the text will be deleted from selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:65
 #. i18n: ectx: property (text), widget (QCheckBox, clearTextCheckBox)
-#: rc.cpp:21 rc.cpp:908 rc.cpp:21 rc.cpp:908
+#: rc.cpp:38 rc.cpp:38
 msgid "&Text"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:72
 #. i18n: ectx: property (toolTip), widget (QCheckBox, clearImageCheckBox)
-#: rc.cpp:24 rc.cpp:911 rc.cpp:24 rc.cpp:911
+#: rc.cpp:41 rc.cpp:41
 msgid "Delete the image link from selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:75
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, clearImageCheckBox)
-#: rc.cpp:27 rc.cpp:914 rc.cpp:27 rc.cpp:914
+#: rc.cpp:44 rc.cpp:44
 msgid "When checked the image link will be deleted from selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:78
 #. i18n: ectx: property (text), widget (QCheckBox, clearImageCheckBox)
-#: rc.cpp:30 rc.cpp:917 rc.cpp:30 rc.cpp:917
+#: rc.cpp:47 rc.cpp:47
 msgid "&Image Links"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:85
 #. i18n: ectx: property (toolTip), widget (QCheckBox, clearSoundCheckBox)
-#: rc.cpp:33 rc.cpp:920 rc.cpp:33 rc.cpp:920
+#: rc.cpp:50 rc.cpp:50
 msgid "Delete the sound link from selected entries"
 msgstr ""
 
 #. i18n: file: cleardialogbase.ui:88
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, clearSoundCheckBox)
-#: rc.cpp:36 rc.cpp:923 rc.cpp:36 rc.cpp:923
-msgid "When checked the sound link will be deleted from selected entries"
-msgstr ""
-
-#. i18n: file: cleardialogbase.ui:91
-#. i18n: ectx: property (text), widget (QCheckBox, clearSoundCheckBox)
-#: rc.cpp:39 rc.cpp:926 rc.cpp:39 rc.cpp:926
-msgid "&Sound Links"
-msgstr ""
-
-#. i18n: file: columndialogbase.ui:72
-#. i18n: ectx: property (toolTip), widget (QLabel, column1Picture)
-#. i18n: file: columndialogbase.ui:148
-#. i18n: ectx: property (toolTip), widget (KLineEdit, column1TitleLineEdit)
-#. i18n: file: columndialogbase.ui:241
-#. i18n: ectx: property (toolTip), widget (QLabel, column2Picture)
-#. i18n: file: columndialogbase.ui:72
-#. i18n: ectx: property (toolTip), widget (QLabel, column1Picture)
-#. i18n: file: columndialogbase.ui:148
-#. i18n: ectx: property (toolTip), widget (KLineEdit, column1TitleLineEdit)
-#. i18n: file: columndialogbase.ui:241
-#. i18n: ectx: property (toolTip), widget (QLabel, column2Picture)
+#: rc.cpp:53 rc.cpp:53
+msgid "When checked the sound link will be deleted from selected entries"
+msgstr ""
+
+#. i18n: file: cleardialogbase.ui:91
+#. i18n: ectx: property (text), widget (QCheckBox, clearSoundCheckBox)
+#: rc.cpp:56 rc.cpp:56
+msgid "&Sound Links"
+msgstr ""
+
 #. i18n: file: columndialogbase.ui:72
 #. i18n: ectx: property (toolTip), widget (QLabel, column1Picture)
 #. i18n: file: columndialogbase.ui:148
@@ -1120,8 +1008,7 @@
 #. i18n: ectx: property (toolTip), widget (KLineEdit, column1TitleLineEdit)
 #. i18n: file: columndialogbase.ui:241
 #. i18n: ectx: property (toolTip), widget (QLabel, column2Picture)
-#: rc.cpp:45 rc.cpp:60 rc.cpp:81 rc.cpp:932 rc.cpp:947 rc.cpp:968 rc.cpp:45
-#: rc.cpp:60 rc.cpp:81 rc.cpp:932 rc.cpp:947 rc.cpp:968
+#: rc.cpp:62 rc.cpp:77 rc.cpp:98 rc.cpp:62 rc.cpp:77 rc.cpp:98
 msgid "Title for the left column"
 msgstr "Teitl y golofn chwith"
 
@@ -1137,110 +1024,97 @@
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, column1TitleLineEdit)
 #. i18n: file: columndialogbase.ui:244
 #. i18n: ectx: property (whatsThis), widget (QLabel, column2Picture)
-#. i18n: file: columndialogbase.ui:75
-#. i18n: ectx: property (whatsThis), widget (QLabel, column1Picture)
-#. i18n: file: columndialogbase.ui:151
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, column1TitleLineEdit)
-#. i18n: file: columndialogbase.ui:244
-#. i18n: ectx: property (whatsThis), widget (QLabel, column2Picture)
-#. i18n: file: columndialogbase.ui:75
-#. i18n: ectx: property (whatsThis), widget (QLabel, column1Picture)
-#. i18n: file: columndialogbase.ui:151
-#. i18n: ectx: property (whatsThis), widget (KLineEdit, column1TitleLineEdit)
-#. i18n: file: columndialogbase.ui:244
-#. i18n: ectx: property (whatsThis), widget (QLabel, column2Picture)
-#: rc.cpp:48 rc.cpp:63 rc.cpp:84 rc.cpp:935 rc.cpp:950 rc.cpp:971 rc.cpp:48
-#: rc.cpp:63 rc.cpp:84 rc.cpp:935 rc.cpp:950 rc.cpp:971
+#: rc.cpp:65 rc.cpp:80 rc.cpp:101 rc.cpp:65 rc.cpp:80 rc.cpp:101
 msgid "Enter a title (identifier) for the left column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:96
 #. i18n: ectx: property (text), widget (QLabel, column1TitleLabel)
-#: rc.cpp:51 rc.cpp:938 rc.cpp:51 rc.cpp:938
+#: rc.cpp:68 rc.cpp:68
 msgid "&Title:"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:112
 #. i18n: ectx: property (text), widget (QLabel, column1LayoutLabel)
-#: rc.cpp:54 rc.cpp:941 rc.cpp:54 rc.cpp:941
+#: rc.cpp:71 rc.cpp:71
 msgid "&Keyboard Layout:"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:128
 #. i18n: ectx: property (text), widget (QLabel, column1WidthLabel)
-#: rc.cpp:57 rc.cpp:944 rc.cpp:57 rc.cpp:944
+#: rc.cpp:74 rc.cpp:74
 msgid "&Width:"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:158
 #. i18n: ectx: property (toolTip), widget (KComboBox, column1LayoutComboBox)
-#: rc.cpp:66 rc.cpp:953 rc.cpp:66 rc.cpp:953
+#: rc.cpp:83 rc.cpp:83
 msgid "Keyboard layout for the left column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:161
 #. i18n: ectx: property (whatsThis), widget (KComboBox, column1LayoutComboBox)
-#: rc.cpp:69 rc.cpp:956 rc.cpp:69 rc.cpp:956
+#: rc.cpp:86 rc.cpp:86
 msgid "Select a keyboard layout for the left column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:168
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, column1WidthSpinBox)
-#: rc.cpp:72 rc.cpp:959 rc.cpp:72 rc.cpp:959
+#: rc.cpp:89 rc.cpp:89
 msgid "Width of the left column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:171
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, column1WidthSpinBox)
-#: rc.cpp:75 rc.cpp:962 rc.cpp:75 rc.cpp:962
+#: rc.cpp:92 rc.cpp:92
 msgid "Enter the width (in pixels) for the left column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:265
 #. i18n: ectx: property (text), widget (QLabel, column2TitleLabel)
-#: rc.cpp:87 rc.cpp:974 rc.cpp:87 rc.cpp:974
+#: rc.cpp:104 rc.cpp:104
 msgid "T&itle:"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:281
 #. i18n: ectx: property (text), widget (QLabel, column2LayoutLabel)
-#: rc.cpp:90 rc.cpp:977 rc.cpp:90 rc.cpp:977
+#: rc.cpp:107 rc.cpp:107
 msgid "Keyboard &Layout:"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:297
 #. i18n: ectx: property (text), widget (QLabel, column2WidthLabel)
-#: rc.cpp:93 rc.cpp:980 rc.cpp:93 rc.cpp:980
+#: rc.cpp:110 rc.cpp:110
 msgid "Wi&dth:"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:317
 #. i18n: ectx: property (toolTip), widget (KLineEdit, column2TitleLineEdit)
-#: rc.cpp:96 rc.cpp:983 rc.cpp:96 rc.cpp:983
+#: rc.cpp:113 rc.cpp:113
 msgid "Title for the right column"
 msgstr "Teitl y golofn dde"
 
 #. i18n: file: columndialogbase.ui:320
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, column2TitleLineEdit)
-#: rc.cpp:99 rc.cpp:986 rc.cpp:99 rc.cpp:986
+#: rc.cpp:116 rc.cpp:116
 msgid "Enter a title (identifier) for the right column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:330
 #. i18n: ectx: property (toolTip), widget (KIntSpinBox, column2WidthSpinBox)
-#: rc.cpp:102 rc.cpp:989 rc.cpp:102 rc.cpp:989
+#: rc.cpp:119 rc.cpp:119
 msgid "Width of the right column"
 msgstr ""
 
 #. i18n: file: columndialogbase.ui:333
 #. i18n: ectx: property (whatsThis), widget (KIntSpinBox, column2WidthSpinBox)
-#: rc.cpp:105 rc.cpp:992 rc.cpp:105 rc.cpp:992
+#: rc.cpp:122 rc.cpp:122
 msgid "Enter the width (in pixels) for the right column"
 msgstr ""
 
 #. i18n: file: flashviewbase.ui:149
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:114 rc.cpp:995 rc.cpp:114 rc.cpp:995
+#: rc.cpp:125 rc.cpp:125
 msgid ""
 "<html>There are too few entries in your vocabulary.<br />You need at least "
 "one entry for a flashcard quiz.</html>"
@@ -1254,16 +1128,7 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblScoreCount)
 #. i18n: file: kwqscorewidgetbase.ui:167
 #. i18n: ectx: property (toolTip), widget (QLabel, picCount)
-#. i18n: file: kwqscorewidgetbase.ui:57
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreCount)
-#. i18n: file: kwqscorewidgetbase.ui:167
-#. i18n: ectx: property (toolTip), widget (QLabel, picCount)
-#. i18n: file: kwqscorewidgetbase.ui:57
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreCount)
-#. i18n: file: kwqscorewidgetbase.ui:167
-#. i18n: ectx: property (toolTip), widget (QLabel, picCount)
-#: rc.cpp:252 rc.cpp:282 rc.cpp:998 rc.cpp:1028 rc.cpp:252 rc.cpp:282
-#: rc.cpp:998 rc.cpp:1028
+#: rc.cpp:128 rc.cpp:158 rc.cpp:128 rc.cpp:158
 msgid "Questions"
 msgstr ""
 
@@ -1275,16 +1140,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreCount)
 #. i18n: file: kwqscorewidgetbase.ui:170
 #. i18n: ectx: property (whatsThis), widget (QLabel, picCount)
-#. i18n: file: kwqscorewidgetbase.ui:60
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreCount)
-#. i18n: file: kwqscorewidgetbase.ui:170
-#. i18n: ectx: property (whatsThis), widget (QLabel, picCount)
-#. i18n: file: kwqscorewidgetbase.ui:60
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreCount)
-#. i18n: file: kwqscorewidgetbase.ui:170
-#. i18n: ectx: property (whatsThis), widget (QLabel, picCount)
-#: rc.cpp:255 rc.cpp:285 rc.cpp:1001 rc.cpp:1031 rc.cpp:255 rc.cpp:285
-#: rc.cpp:1001 rc.cpp:1031
+#: rc.cpp:131 rc.cpp:161 rc.cpp:131 rc.cpp:161
 msgid "The number of questions in the session"
 msgstr ""
 
@@ -1304,25 +1160,8 @@
 #. i18n: ectx: property (text), widget (QLabel, lblScoreAnswered)
 #. i18n: file: kwqscorewidgetbase.ui:259
 #. i18n: ectx: property (text), widget (QLabel, lblScoreError)
-#. i18n: file: kwqscorewidgetbase.ui:63
-#. i18n: ectx: property (text), widget (QLabel, lblScoreCount)
-#. i18n: file: kwqscorewidgetbase.ui:120
-#. i18n: ectx: property (text), widget (QLabel, lblScoreCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:202
-#. i18n: ectx: property (text), widget (QLabel, lblScoreAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:259
-#. i18n: ectx: property (text), widget (QLabel, lblScoreError)
-#. i18n: file: kwqscorewidgetbase.ui:63
-#. i18n: ectx: property (text), widget (QLabel, lblScoreCount)
-#. i18n: file: kwqscorewidgetbase.ui:120
-#. i18n: ectx: property (text), widget (QLabel, lblScoreCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:202
-#. i18n: ectx: property (text), widget (QLabel, lblScoreAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:259
-#. i18n: ectx: property (text), widget (QLabel, lblScoreError)
-#: rc.cpp:258 rc.cpp:273 rc.cpp:294 rc.cpp:309 rc.cpp:1004 rc.cpp:1019
-#: rc.cpp:1040 rc.cpp:1055 rc.cpp:258 rc.cpp:273 rc.cpp:294 rc.cpp:309
-#: rc.cpp:1004 rc.cpp:1019 rc.cpp:1040 rc.cpp:1055
+#: rc.cpp:134 rc.cpp:149 rc.cpp:170 rc.cpp:185 rc.cpp:134 rc.cpp:149
+#: rc.cpp:170 rc.cpp:185
 msgid "00"
 msgstr "00"
 
@@ -1334,16 +1173,7 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, picCorrect)
 #. i18n: file: kwqscorewidgetbase.ui:114
 #. i18n: ectx: property (toolTip), widget (QLabel, lblScoreCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:85
-#. i18n: ectx: property (toolTip), widget (QLabel, picCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:114
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:85
-#. i18n: ectx: property (toolTip), widget (QLabel, picCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:114
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreCorrect)
-#: rc.cpp:261 rc.cpp:267 rc.cpp:1007 rc.cpp:1013 rc.cpp:261 rc.cpp:267
-#: rc.cpp:1007 rc.cpp:1013
+#: rc.cpp:137 rc.cpp:143 rc.cpp:137 rc.cpp:143
 msgid "Correct answers"
 msgstr ""
 
@@ -1355,16 +1185,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, picCorrect)
 #. i18n: file: kwqscorewidgetbase.ui:117
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:88
-#. i18n: ectx: property (whatsThis), widget (QLabel, picCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:117
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:88
-#. i18n: ectx: property (whatsThis), widget (QLabel, picCorrect)
-#. i18n: file: kwqscorewidgetbase.ui:117
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreCorrect)
-#: rc.cpp:264 rc.cpp:270 rc.cpp:1010 rc.cpp:1016 rc.cpp:264 rc.cpp:270
-#: rc.cpp:1010 rc.cpp:1016
+#: rc.cpp:140 rc.cpp:146 rc.cpp:140 rc.cpp:146
 msgid ""
 "The number of questions answered correctly. May be shown as a percentage."
 msgstr ""
@@ -1377,16 +1198,7 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, picError)
 #. i18n: file: kwqscorewidgetbase.ui:253
 #. i18n: ectx: property (toolTip), widget (QLabel, lblScoreError)
-#. i18n: file: kwqscorewidgetbase.ui:142
-#. i18n: ectx: property (toolTip), widget (QLabel, picError)
-#. i18n: file: kwqscorewidgetbase.ui:253
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreError)
-#. i18n: file: kwqscorewidgetbase.ui:142
-#. i18n: ectx: property (toolTip), widget (QLabel, picError)
-#. i18n: file: kwqscorewidgetbase.ui:253
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreError)
-#: rc.cpp:276 rc.cpp:303 rc.cpp:1022 rc.cpp:1049 rc.cpp:276 rc.cpp:303
-#: rc.cpp:1022 rc.cpp:1049
+#: rc.cpp:152 rc.cpp:179 rc.cpp:152 rc.cpp:179
 msgid "Incorrect answers"
 msgstr ""
 
@@ -1398,16 +1210,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, picError)
 #. i18n: file: kwqscorewidgetbase.ui:256
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreError)
-#. i18n: file: kwqscorewidgetbase.ui:145
-#. i18n: ectx: property (whatsThis), widget (QLabel, picError)
-#. i18n: file: kwqscorewidgetbase.ui:256
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreError)
-#. i18n: file: kwqscorewidgetbase.ui:145
-#. i18n: ectx: property (whatsThis), widget (QLabel, picError)
-#. i18n: file: kwqscorewidgetbase.ui:256
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreError)
-#: rc.cpp:279 rc.cpp:306 rc.cpp:1025 rc.cpp:1052 rc.cpp:279 rc.cpp:306
-#: rc.cpp:1025 rc.cpp:1052
+#: rc.cpp:155 rc.cpp:182 rc.cpp:155 rc.cpp:182
 msgid ""
 "The number of questions answered incorrectly. May be shown as a percentage."
 msgstr ""
@@ -1420,16 +1223,7 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblScoreAnswered)
 #. i18n: file: kwqscorewidgetbase.ui:224
 #. i18n: ectx: property (toolTip), widget (QLabel, picAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:196
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:224
-#. i18n: ectx: property (toolTip), widget (QLabel, picAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:196
-#. i18n: ectx: property (toolTip), widget (QLabel, lblScoreAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:224
-#. i18n: ectx: property (toolTip), widget (QLabel, picAnswered)
-#: rc.cpp:288 rc.cpp:297 rc.cpp:1034 rc.cpp:1043 rc.cpp:288 rc.cpp:297
-#: rc.cpp:1034 rc.cpp:1043
+#: rc.cpp:164 rc.cpp:173 rc.cpp:164 rc.cpp:173
 msgid "Answered questions"
 msgstr ""
 
@@ -1441,16 +1235,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreAnswered)
 #. i18n: file: kwqscorewidgetbase.ui:227
 #. i18n: ectx: property (whatsThis), widget (QLabel, picAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:199
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:227
-#. i18n: ectx: property (whatsThis), widget (QLabel, picAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:199
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblScoreAnswered)
-#. i18n: file: kwqscorewidgetbase.ui:227
-#. i18n: ectx: property (whatsThis), widget (QLabel, picAnswered)
-#: rc.cpp:291 rc.cpp:300 rc.cpp:1037 rc.cpp:1046 rc.cpp:291 rc.cpp:300
-#: rc.cpp:1037 rc.cpp:1046
+#: rc.cpp:167 rc.cpp:176 rc.cpp:167 rc.cpp:176
 msgid ""
 "The number of questions already answered. May be shown as a percentage."
 msgstr ""
@@ -1487,44 +1272,9 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblQuestion)
 #. i18n: file: qaviewbase.ui:104
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:70
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: multipleviewbase.ui:92
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:95
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:129
-#. i18n: ectx: property (toolTip), widget (QLabel, picQuestion)
-#. i18n: file: qaviewbase.ui:57
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: qaviewbase.ui:85
-#. i18n: ectx: property (toolTip), widget (QLabel, picQuestion)
-#. i18n: file: qaviewbase.ui:101
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestion)
-#. i18n: file: qaviewbase.ui:104
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:70
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: multipleviewbase.ui:92
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:95
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:129
-#. i18n: ectx: property (toolTip), widget (QLabel, picQuestion)
-#. i18n: file: qaviewbase.ui:57
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: qaviewbase.ui:85
-#. i18n: ectx: property (toolTip), widget (QLabel, picQuestion)
-#. i18n: file: qaviewbase.ui:101
-#. i18n: ectx: property (toolTip), widget (QLabel, lblQuestion)
-#. i18n: file: qaviewbase.ui:104
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestion)
-#: rc.cpp:312 rc.cpp:321 rc.cpp:324 rc.cpp:330 rc.cpp:759 rc.cpp:768
-#: rc.cpp:771 rc.cpp:774 rc.cpp:1058 rc.cpp:1067 rc.cpp:1070 rc.cpp:1076
-#: rc.cpp:1505 rc.cpp:1514 rc.cpp:1517 rc.cpp:1520 rc.cpp:312 rc.cpp:321
-#: rc.cpp:324 rc.cpp:330 rc.cpp:759 rc.cpp:768 rc.cpp:771 rc.cpp:774
-#: rc.cpp:1058 rc.cpp:1067 rc.cpp:1070 rc.cpp:1076 rc.cpp:1505 rc.cpp:1514
-#: rc.cpp:1517 rc.cpp:1520
+#: rc.cpp:188 rc.cpp:197 rc.cpp:200 rc.cpp:206 rc.cpp:635 rc.cpp:644
+#: rc.cpp:647 rc.cpp:650 rc.cpp:188 rc.cpp:197 rc.cpp:200 rc.cpp:206
+#: rc.cpp:635 rc.cpp:644 rc.cpp:647 rc.cpp:650
 msgid "The question"
 msgstr ""
 
@@ -1536,16 +1286,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestionLanguage)
 #. i18n: file: qaviewbase.ui:60
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: multipleviewbase.ui:73
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: qaviewbase.ui:60
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: multipleviewbase.ui:73
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: qaviewbase.ui:60
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblQuestionLanguage)
-#: rc.cpp:315 rc.cpp:762 rc.cpp:1061 rc.cpp:1508 rc.cpp:315 rc.cpp:762
-#: rc.cpp:1061 rc.cpp:1508
+#: rc.cpp:191 rc.cpp:638 rc.cpp:191 rc.cpp:638
 msgid "Language or other identifier for the question"
 msgstr ""
 
@@ -1557,16 +1298,7 @@
 #. i18n: ectx: property (text), widget (QLabel, lblQuestionLanguage)
 #. i18n: file: qaviewbase.ui:63
 #. i18n: ectx: property (text), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: multipleviewbase.ui:76
-#. i18n: ectx: property (text), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: qaviewbase.ui:63
-#. i18n: ectx: property (text), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: multipleviewbase.ui:76
-#. i18n: ectx: property (text), widget (QLabel, lblQuestionLanguage)
-#. i18n: file: qaviewbase.ui:63
-#. i18n: ectx: property (text), widget (QLabel, lblQuestionLanguage)
-#: rc.cpp:318 rc.cpp:765 rc.cpp:1064 rc.cpp:1511 rc.cpp:318 rc.cpp:765
-#: rc.cpp:1064 rc.cpp:1511
+#: rc.cpp:194 rc.cpp:641 rc.cpp:194 rc.cpp:641
 msgid "Language 1"
 msgstr ""
 
@@ -1578,16 +1310,7 @@
 #. i18n: ectx: property (text), widget (QLabel, lblQuestion)
 #. i18n: file: qaviewbase.ui:107
 #. i18n: ectx: property (text), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:98
-#. i18n: ectx: property (text), widget (QLabel, lblQuestion)
-#. i18n: file: qaviewbase.ui:107
-#. i18n: ectx: property (text), widget (QLabel, lblQuestion)
-#. i18n: file: multipleviewbase.ui:98
-#. i18n: ectx: property (text), widget (QLabel, lblQuestion)
-#. i18n: file: qaviewbase.ui:107
-#. i18n: ectx: property (text), widget (QLabel, lblQuestion)
-#: rc.cpp:327 rc.cpp:777 rc.cpp:1073 rc.cpp:1523 rc.cpp:327 rc.cpp:777
-#: rc.cpp:1073 rc.cpp:1523
+#: rc.cpp:203 rc.cpp:653 rc.cpp:203 rc.cpp:653
 msgid "This is your question"
 msgstr ""
 
@@ -1611,30 +1334,8 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerLanguage)
 #. i18n: file: multipleviewbase.ui:286
 #. i18n: ectx: property (toolTip), widget (QRadioButton, opt3)
-#. i18n: file: multipleviewbase.ui:161
-#. i18n: ectx: property (toolTip), widget (QLabel, picAnswer)
-#. i18n: file: multipleviewbase.ui:186
-#. i18n: ectx: property (toolTip), widget (QRadioButton, opt2)
-#. i18n: file: multipleviewbase.ui:217
-#. i18n: ectx: property (toolTip), widget (QRadioButton, opt1)
-#. i18n: file: multipleviewbase.ui:255
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: multipleviewbase.ui:286
-#. i18n: ectx: property (toolTip), widget (QRadioButton, opt3)
-#. i18n: file: multipleviewbase.ui:161
-#. i18n: ectx: property (toolTip), widget (QLabel, picAnswer)
-#. i18n: file: multipleviewbase.ui:186
-#. i18n: ectx: property (toolTip), widget (QRadioButton, opt2)
-#. i18n: file: multipleviewbase.ui:217
-#. i18n: ectx: property (toolTip), widget (QRadioButton, opt1)
-#. i18n: file: multipleviewbase.ui:255
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: multipleviewbase.ui:286
-#. i18n: ectx: property (toolTip), widget (QRadioButton, opt3)
-#: rc.cpp:333 rc.cpp:336 rc.cpp:345 rc.cpp:354 rc.cpp:363 rc.cpp:1079
-#: rc.cpp:1082 rc.cpp:1091 rc.cpp:1100 rc.cpp:1109 rc.cpp:333 rc.cpp:336
-#: rc.cpp:345 rc.cpp:354 rc.cpp:363 rc.cpp:1079 rc.cpp:1082 rc.cpp:1091
-#: rc.cpp:1100 rc.cpp:1109
+#: rc.cpp:209 rc.cpp:212 rc.cpp:221 rc.cpp:230 rc.cpp:239 rc.cpp:209
+#: rc.cpp:212 rc.cpp:221 rc.cpp:230 rc.cpp:239
 msgid "Your choices"
 msgstr ""
 
@@ -1650,32 +1351,19 @@
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, opt1)
 #. i18n: file: multipleviewbase.ui:289
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, opt3)
-#. i18n: file: multipleviewbase.ui:189
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, opt2)
-#. i18n: file: multipleviewbase.ui:220
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, opt1)
-#. i18n: file: multipleviewbase.ui:289
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, opt3)
-#. i18n: file: multipleviewbase.ui:189
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, opt2)
-#. i18n: file: multipleviewbase.ui:220
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, opt1)
-#. i18n: file: multipleviewbase.ui:289
-#. i18n: ectx: property (whatsThis), widget (QRadioButton, opt3)
-#: rc.cpp:339 rc.cpp:348 rc.cpp:366 rc.cpp:1085 rc.cpp:1094 rc.cpp:1112
-#: rc.cpp:339 rc.cpp:348 rc.cpp:366 rc.cpp:1085 rc.cpp:1094 rc.cpp:1112
+#: rc.cpp:215 rc.cpp:224 rc.cpp:242 rc.cpp:215 rc.cpp:224 rc.cpp:242
 msgid "Three choices for the answer. One is correct."
 msgstr ""
 
 #. i18n: file: multipleviewbase.ui:192
 #. i18n: ectx: property (text), widget (QRadioButton, opt2)
-#: rc.cpp:342 rc.cpp:1088 rc.cpp:342 rc.cpp:1088
+#: rc.cpp:218 rc.cpp:218
 msgid "&2 Option"
 msgstr ""
 
 #. i18n: file: multipleviewbase.ui:223
 #. i18n: ectx: property (text), widget (QRadioButton, opt1)
-#: rc.cpp:351 rc.cpp:1097 rc.cpp:351 rc.cpp:1097
+#: rc.cpp:227 rc.cpp:227
 msgid "&1 Option"
 msgstr ""
 
@@ -1687,16 +1375,7 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerLanguage)
 #. i18n: file: qaviewbase.ui:208
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: multipleviewbase.ui:258
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: qaviewbase.ui:208
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: multipleviewbase.ui:258
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: qaviewbase.ui:208
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerLanguage)
-#: rc.cpp:357 rc.cpp:798 rc.cpp:1103 rc.cpp:1544 rc.cpp:357 rc.cpp:798
-#: rc.cpp:1103 rc.cpp:1544
+#: rc.cpp:233 rc.cpp:674 rc.cpp:233 rc.cpp:674
 msgid "Language or other identifier for the answer"
 msgstr ""
 
@@ -1708,22 +1387,13 @@
 #. i18n: ectx: property (text), widget (QLabel, lblAnswerLanguage)
 #. i18n: file: qaviewbase.ui:211
 #. i18n: ectx: property (text), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: multipleviewbase.ui:261
-#. i18n: ectx: property (text), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: qaviewbase.ui:211
-#. i18n: ectx: property (text), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: multipleviewbase.ui:261
-#. i18n: ectx: property (text), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: qaviewbase.ui:211
-#. i18n: ectx: property (text), widget (QLabel, lblAnswerLanguage)
-#: rc.cpp:360 rc.cpp:801 rc.cpp:1106 rc.cpp:1547 rc.cpp:360 rc.cpp:801
-#: rc.cpp:1106 rc.cpp:1547
+#: rc.cpp:236 rc.cpp:677 rc.cpp:236 rc.cpp:677
 msgid "Language 2"
 msgstr ""
 
 #. i18n: file: multipleviewbase.ui:292
 #. i18n: ectx: property (text), widget (QRadioButton, opt3)
-#: rc.cpp:369 rc.cpp:1115 rc.cpp:369 rc.cpp:1115
+#: rc.cpp:245 rc.cpp:245
 msgid "&3 Option"
 msgstr ""
 
@@ -1751,34 +1421,8 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestion)
 #. i18n: file: qaviewbase.ui:347
 #. i18n: ectx: property (toolTip), widget (QLabel, picPrevious)
-#. i18n: file: multipleviewbase.ui:347
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:369
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: multipleviewbase.ui:409
-#. i18n: ectx: property (toolTip), widget (QLabel, picPrevious)
-#. i18n: file: qaviewbase.ui:288
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:310
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: qaviewbase.ui:347
-#. i18n: ectx: property (toolTip), widget (QLabel, picPrevious)
-#. i18n: file: multipleviewbase.ui:347
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:369
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: multipleviewbase.ui:409
-#. i18n: ectx: property (toolTip), widget (QLabel, picPrevious)
-#. i18n: file: qaviewbase.ui:288
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:310
-#. i18n: ectx: property (toolTip), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: qaviewbase.ui:347
-#. i18n: ectx: property (toolTip), widget (QLabel, picPrevious)
-#: rc.cpp:372 rc.cpp:381 rc.cpp:390 rc.cpp:807 rc.cpp:816 rc.cpp:825
-#: rc.cpp:1118 rc.cpp:1127 rc.cpp:1136 rc.cpp:1553 rc.cpp:1562 rc.cpp:1571
-#: rc.cpp:372 rc.cpp:381 rc.cpp:390 rc.cpp:807 rc.cpp:816 rc.cpp:825
-#: rc.cpp:1118 rc.cpp:1127 rc.cpp:1136 rc.cpp:1553 rc.cpp:1562 rc.cpp:1571
+#: rc.cpp:248 rc.cpp:257 rc.cpp:266 rc.cpp:683 rc.cpp:692 rc.cpp:701
+#: rc.cpp:248 rc.cpp:257 rc.cpp:266 rc.cpp:683 rc.cpp:692 rc.cpp:701
 msgid "Previous question"
 msgstr "Cwestiwn Cynt"
 
@@ -1797,37 +1441,12 @@
 #. i18n: file: qaviewbase.ui:291
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestionHeader)
 #. i18n: file: qaviewbase.ui:313
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: multipleviewbase.ui:350
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:372
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: qaviewbase.ui:291
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:313
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: multipleviewbase.ui:350
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: multipleviewbase.ui:372
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: qaviewbase.ui:291
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestionHeader)
-#. i18n: file: qaviewbase.ui:313
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestion)
-#: rc.cpp:375 rc.cpp:384 rc.cpp:810 rc.cpp:819 rc.cpp:1121 rc.cpp:1130
-#: rc.cpp:1556 rc.cpp:1565 rc.cpp:375 rc.cpp:384 rc.cpp:810 rc.cpp:819
-#: rc.cpp:1121 rc.cpp:1130 rc.cpp:1556 rc.cpp:1565
-msgid "The previous question"
-msgstr ""
-
-#. i18n: file: multipleviewbase.ui:375
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: qaviewbase.ui:316
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: multipleviewbase.ui:375
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
-#. i18n: file: qaviewbase.ui:316
-#. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
+#. i18n: ectx: property (whatsThis), widget (QLabel, lblPreviousQuestion)
+#: rc.cpp:251 rc.cpp:260 rc.cpp:686 rc.cpp:695 rc.cpp:251 rc.cpp:260
+#: rc.cpp:686 rc.cpp:695
+msgid "The previous question"
+msgstr ""
+
 #. i18n: file: multipleviewbase.ui:375
 #. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
 #. i18n: file: qaviewbase.ui:316
@@ -1836,8 +1455,7 @@
 #. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
 #. i18n: file: qaviewbase.ui:316
 #. i18n: ectx: property (text), widget (QLabel, lblPreviousQuestion)
-#: rc.cpp:387 rc.cpp:822 rc.cpp:1133 rc.cpp:1568 rc.cpp:387 rc.cpp:822
-#: rc.cpp:1133 rc.cpp:1568
+#: rc.cpp:263 rc.cpp:698 rc.cpp:263 rc.cpp:698
 msgid "This was your question"
 msgstr ""
 
@@ -1865,34 +1483,8 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswer)
 #. i18n: file: qaviewbase.ui:448
 #. i18n: ectx: property (toolTip), widget (QLabel, picYourAnswer)
-#. i18n: file: multipleviewbase.ui:441
-#. i18n: ectx: property (toolTip), widget (QLabel, picYourAnswer)
-#. i18n: file: multipleviewbase.ui:473
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:495
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:389
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:411
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:448
-#. i18n: ectx: property (toolTip), widget (QLabel, picYourAnswer)
-#. i18n: file: multipleviewbase.ui:441
-#. i18n: ectx: property (toolTip), widget (QLabel, picYourAnswer)
-#. i18n: file: multipleviewbase.ui:473
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:495
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:389
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:411
-#. i18n: ectx: property (toolTip), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:448
-#. i18n: ectx: property (toolTip), widget (QLabel, picYourAnswer)
-#: rc.cpp:393 rc.cpp:396 rc.cpp:405 rc.cpp:828 rc.cpp:837 rc.cpp:846
-#: rc.cpp:1139 rc.cpp:1142 rc.cpp:1151 rc.cpp:1574 rc.cpp:1583 rc.cpp:1592
-#: rc.cpp:393 rc.cpp:396 rc.cpp:405 rc.cpp:828 rc.cpp:837 rc.cpp:846
-#: rc.cpp:1139 rc.cpp:1142 rc.cpp:1151 rc.cpp:1574 rc.cpp:1583 rc.cpp:1592
+#: rc.cpp:269 rc.cpp:272 rc.cpp:281 rc.cpp:704 rc.cpp:713 rc.cpp:722
+#: rc.cpp:269 rc.cpp:272 rc.cpp:281 rc.cpp:704 rc.cpp:713 rc.cpp:722
 msgid "Your previous answer"
 msgstr ""
 
@@ -1912,25 +1504,8 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswerHeader)
 #. i18n: file: qaviewbase.ui:414
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswer)
-#. i18n: file: multipleviewbase.ui:476
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:498
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:392
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:414
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswer)
-#. i18n: file: multipleviewbase.ui:476
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: multipleviewbase.ui:498
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:392
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswerHeader)
-#. i18n: file: qaviewbase.ui:414
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblYourAnswer)
-#: rc.cpp:399 rc.cpp:408 rc.cpp:831 rc.cpp:840 rc.cpp:1145 rc.cpp:1154
-#: rc.cpp:1577 rc.cpp:1586 rc.cpp:399 rc.cpp:408 rc.cpp:831 rc.cpp:840
-#: rc.cpp:1145 rc.cpp:1154 rc.cpp:1577 rc.cpp:1586
+#: rc.cpp:275 rc.cpp:284 rc.cpp:707 rc.cpp:716 rc.cpp:275 rc.cpp:284
+#: rc.cpp:707 rc.cpp:716
 msgid "Your answer to the previous question"
 msgstr ""
 
@@ -1942,16 +1517,7 @@
 #. i18n: ectx: property (text), widget (QLabel, lblYourAnswer)
 #. i18n: file: qaviewbase.ui:417
 #. i18n: ectx: property (text), widget (QLabel, lblYourAnswer)
-#. i18n: file: multipleviewbase.ui:501
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:417
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswer)
-#. i18n: file: multipleviewbase.ui:501
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswer)
-#. i18n: file: qaviewbase.ui:417
-#. i18n: ectx: property (text), widget (QLabel, lblYourAnswer)
-#: rc.cpp:411 rc.cpp:843 rc.cpp:1157 rc.cpp:1589 rc.cpp:411 rc.cpp:843
-#: rc.cpp:1157 rc.cpp:1589
+#: rc.cpp:287 rc.cpp:719 rc.cpp:287 rc.cpp:719
 msgid "This was your answer"
 msgstr ""
 
@@ -1979,34 +1545,8 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblCorrectHeader)
 #. i18n: file: qaviewbase.ui:534
 #. i18n: ectx: property (toolTip), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:552
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:574
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:611
-#. i18n: ectx: property (toolTip), widget (QLabel, picCorrectAnswer)
-#. i18n: file: qaviewbase.ui:480
-#. i18n: ectx: property (toolTip), widget (QLabel, picCorrectAnswer)
-#. i18n: file: qaviewbase.ui:512
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:534
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:552
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:574
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:611
-#. i18n: ectx: property (toolTip), widget (QLabel, picCorrectAnswer)
-#. i18n: file: qaviewbase.ui:480
-#. i18n: ectx: property (toolTip), widget (QLabel, picCorrectAnswer)
-#. i18n: file: qaviewbase.ui:512
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:534
-#. i18n: ectx: property (toolTip), widget (QLabel, lblCorrect)
-#: rc.cpp:414 rc.cpp:423 rc.cpp:432 rc.cpp:849 rc.cpp:852 rc.cpp:861
-#: rc.cpp:1160 rc.cpp:1169 rc.cpp:1178 rc.cpp:1595 rc.cpp:1598 rc.cpp:1607
-#: rc.cpp:414 rc.cpp:423 rc.cpp:432 rc.cpp:849 rc.cpp:852 rc.cpp:861
-#: rc.cpp:1160 rc.cpp:1169 rc.cpp:1178 rc.cpp:1595 rc.cpp:1598 rc.cpp:1607
+#: rc.cpp:290 rc.cpp:299 rc.cpp:308 rc.cpp:725 rc.cpp:728 rc.cpp:737
+#: rc.cpp:290 rc.cpp:299 rc.cpp:308 rc.cpp:725 rc.cpp:728 rc.cpp:737
 msgid "Previous correct answer"
 msgstr ""
 
@@ -2026,25 +1566,8 @@
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrectHeader)
 #. i18n: file: qaviewbase.ui:537
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:555
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:577
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrect)
-#. i18n: file: qaviewbase.ui:515
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:537
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:555
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrectHeader)
-#. i18n: file: multipleviewbase.ui:577
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrect)
-#. i18n: file: qaviewbase.ui:515
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrectHeader)
-#. i18n: file: qaviewbase.ui:537
-#. i18n: ectx: property (whatsThis), widget (QLabel, lblCorrect)
-#: rc.cpp:417 rc.cpp:426 rc.cpp:855 rc.cpp:864 rc.cpp:1163 rc.cpp:1172
-#: rc.cpp:1601 rc.cpp:1610 rc.cpp:417 rc.cpp:426 rc.cpp:855 rc.cpp:864
-#: rc.cpp:1163 rc.cpp:1172 rc.cpp:1601 rc.cpp:1610
+#: rc.cpp:293 rc.cpp:302 rc.cpp:731 rc.cpp:740 rc.cpp:293 rc.cpp:302
+#: rc.cpp:731 rc.cpp:740
 msgid "The correct answer to the previous question"
 msgstr ""
 
@@ -2056,22 +1579,13 @@
 #. i18n: ectx: property (text), widget (QLabel, lblCorrect)
 #. i18n: file: qaviewbase.ui:540
 #. i18n: ectx: property (text), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:580
-#. i18n: ectx: property (text), widget (QLabel, lblCorrect)
-#. i18n: file: qaviewbase.ui:540
-#. i18n: ectx: property (text), widget (QLabel, lblCorrect)
-#. i18n: file: multipleviewbase.ui:580
-#. i18n: ectx: property (text), widget (QLabel, lblCorrect)
-#. i18n: file: qaviewbase.ui:540
-#. i18n: ectx: property (text), widget (QLabel, lblCorrect)
-#: rc.cpp:429 rc.cpp:867 rc.cpp:1175 rc.cpp:1613 rc.cpp:429 rc.cpp:867
-#: rc.cpp:1175 rc.cpp:1613
+#: rc.cpp:305 rc.cpp:743 rc.cpp:305 rc.cpp:743
 msgid "This was the correct answer"
 msgstr ""
 
 #. i18n: file: multipleviewbase.ui:649
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:435 rc.cpp:1181 rc.cpp:435 rc.cpp:1181
+#: rc.cpp:311 rc.cpp:311
 msgid ""
 "<html>There are too few entries in your vocabulary.<br />You need at least "
 "three entries for a multiple choice quiz.</html>"
@@ -2079,37 +1593,37 @@
 
 #. i18n: file: prefcardappearancebase.ui:15
 #. i18n: ectx: property (windowTitle), widget (QWidget, PrefCardAppearanceBase)
-#: rc.cpp:438 rc.cpp:1184 rc.cpp:438 rc.cpp:1184
+#: rc.cpp:314 rc.cpp:314
 msgid "Card Appearance"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:92
 #. i18n: ectx: property (toolTip), widget (QPushButton, flipButton)
-#: rc.cpp:441 rc.cpp:1187 rc.cpp:441 rc.cpp:1187
+#: rc.cpp:317 rc.cpp:317
 msgid "Flip card"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:95
 #. i18n: ectx: property (whatsThis), widget (QPushButton, flipButton)
-#: rc.cpp:444 rc.cpp:1190 rc.cpp:444 rc.cpp:1190
+#: rc.cpp:320 rc.cpp:320
 msgid "Use to show the other side of the card"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:98
 #. i18n: ectx: property (text), widget (QPushButton, flipButton)
-#: rc.cpp:447 rc.cpp:1193 rc.cpp:447 rc.cpp:1193
+#: rc.cpp:323 rc.cpp:323
 msgid "&Flip Card"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:111
 #. i18n: ectx: property (text), widget (QLabel, fontLabel)
-#: rc.cpp:450 rc.cpp:1196 rc.cpp:450 rc.cpp:1196
+#: rc.cpp:326 rc.cpp:326
 msgid "F&ont:"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:146
 #. i18n: ectx: property (whatsThis), widget (KFontRequester, kcfg_BackFont)
-#: rc.cpp:453 rc.cpp:1199 rc.cpp:453 rc.cpp:1199
+#: rc.cpp:329 rc.cpp:329
 msgid "Use to select the font for displaying text on the back of the card"
 msgstr ""
 
@@ -2121,16 +1635,7 @@
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackTextColor)
 #. i18n: file: prefcardappearancebase.ui:209
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontTextColor)
-#. i18n: file: prefcardappearancebase.ui:153
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackTextColor)
-#. i18n: file: prefcardappearancebase.ui:209
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontTextColor)
-#. i18n: file: prefcardappearancebase.ui:153
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackTextColor)
-#. i18n: file: prefcardappearancebase.ui:209
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontTextColor)
-#: rc.cpp:456 rc.cpp:477 rc.cpp:1202 rc.cpp:1223 rc.cpp:456 rc.cpp:477
-#: rc.cpp:1202 rc.cpp:1223
+#: rc.cpp:332 rc.cpp:353 rc.cpp:332 rc.cpp:353
 msgid "Select text color"
 msgstr "Dewis lliw testun"
 
@@ -2142,16 +1647,7 @@
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackTextColor)
 #. i18n: file: prefcardappearancebase.ui:212
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontTextColor)
-#. i18n: file: prefcardappearancebase.ui:156
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackTextColor)
-#. i18n: file: prefcardappearancebase.ui:212
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontTextColor)
-#. i18n: file: prefcardappearancebase.ui:156
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackTextColor)
-#. i18n: file: prefcardappearancebase.ui:212
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontTextColor)
-#: rc.cpp:459 rc.cpp:480 rc.cpp:1205 rc.cpp:1226 rc.cpp:459 rc.cpp:480
-#: rc.cpp:1205 rc.cpp:1226
+#: rc.cpp:335 rc.cpp:356 rc.cpp:335 rc.cpp:356
 msgid "Use to select the color for text shown on the card"
 msgstr ""
 "Defnyddiwch hyn i ddewis y lliw ar gyfer testun a ddangosir ar y cerdyn"
@@ -2164,16 +1660,7 @@
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackFrameColor)
 #. i18n: file: prefcardappearancebase.ui:219
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontFrameColor)
-#. i18n: file: prefcardappearancebase.ui:163
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackFrameColor)
-#. i18n: file: prefcardappearancebase.ui:219
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontFrameColor)
-#. i18n: file: prefcardappearancebase.ui:163
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackFrameColor)
-#. i18n: file: prefcardappearancebase.ui:219
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontFrameColor)
-#: rc.cpp:462 rc.cpp:483 rc.cpp:1208 rc.cpp:1229 rc.cpp:462 rc.cpp:483
-#: rc.cpp:1208 rc.cpp:1229
+#: rc.cpp:338 rc.cpp:359 rc.cpp:338 rc.cpp:359
 msgid "Select card frame color"
 msgstr "Dewis lliw ffrâm y cerdyn"
 
@@ -2185,16 +1672,7 @@
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackFrameColor)
 #. i18n: file: prefcardappearancebase.ui:222
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontFrameColor)
-#. i18n: file: prefcardappearancebase.ui:166
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackFrameColor)
-#. i18n: file: prefcardappearancebase.ui:222
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontFrameColor)
-#. i18n: file: prefcardappearancebase.ui:166
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackFrameColor)
-#. i18n: file: prefcardappearancebase.ui:222
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontFrameColor)
-#: rc.cpp:465 rc.cpp:486 rc.cpp:1211 rc.cpp:1232 rc.cpp:465 rc.cpp:486
-#: rc.cpp:1211 rc.cpp:1232
+#: rc.cpp:341 rc.cpp:362 rc.cpp:341 rc.cpp:362
 msgid "Use to select the color for drawing the frame of the card"
 msgstr "Defnyddiwch hyn i ddewis y lliw ar gyfer ffrâm y cerdyn"
 
@@ -2206,16 +1684,7 @@
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackCardColor)
 #. i18n: file: prefcardappearancebase.ui:229
 #. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontCardColor)
-#. i18n: file: prefcardappearancebase.ui:173
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackCardColor)
-#. i18n: file: prefcardappearancebase.ui:229
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontCardColor)
-#. i18n: file: prefcardappearancebase.ui:173
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_BackCardColor)
-#. i18n: file: prefcardappearancebase.ui:229
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_FrontCardColor)
-#: rc.cpp:468 rc.cpp:489 rc.cpp:1214 rc.cpp:1235 rc.cpp:468 rc.cpp:489
-#: rc.cpp:1214 rc.cpp:1235
+#: rc.cpp:344 rc.cpp:365 rc.cpp:344 rc.cpp:365
 msgid "Select card color"
 msgstr "Dewis lliw y cerdyn"
 
@@ -2227,46 +1696,37 @@
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackCardColor)
 #. i18n: file: prefcardappearancebase.ui:232
 #. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontCardColor)
-#. i18n: file: prefcardappearancebase.ui:176
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackCardColor)
-#. i18n: file: prefcardappearancebase.ui:232
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontCardColor)
-#. i18n: file: prefcardappearancebase.ui:176
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_BackCardColor)
-#. i18n: file: prefcardappearancebase.ui:232
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_FrontCardColor)
-#: rc.cpp:471 rc.cpp:492 rc.cpp:1217 rc.cpp:1238 rc.cpp:471 rc.cpp:492
-#: rc.cpp:1217 rc.cpp:1238
+#: rc.cpp:347 rc.cpp:368 rc.cpp:347 rc.cpp:368
 msgid "Select color used to draw the card"
 msgstr "Defnyddiwch hyn i ddewis y lliw ar gyfer y cerdyn ei hun"
 
 #. i18n: file: prefcardappearancebase.ui:202
 #. i18n: ectx: property (whatsThis), widget (KFontRequester, kcfg_FrontFont)
-#: rc.cpp:474 rc.cpp:1220 rc.cpp:474 rc.cpp:1220
+#: rc.cpp:350 rc.cpp:350
 msgid "Use to select the font for displaying text on the front of the card"
 msgstr "Defnyddiwch hyn i ddewis wynebfath ar gyfer testun ar wyneb y cerdyn"
 
 #. i18n: file: prefcardappearancebase.ui:249
 #. i18n: ectx: property (text), widget (QLabel, textColorLabel)
-#: rc.cpp:495 rc.cpp:1241 rc.cpp:495 rc.cpp:1241
+#: rc.cpp:371 rc.cpp:371
 msgid "&Text color:"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:262
 #. i18n: ectx: property (text), widget (QLabel, cardColorLabel)
-#: rc.cpp:498 rc.cpp:1244 rc.cpp:498 rc.cpp:1244
+#: rc.cpp:374 rc.cpp:374
 msgid "&Card color:"
 msgstr ""
 
 #. i18n: file: prefcardappearancebase.ui:275
 #. i18n: ectx: property (text), widget (QLabel, frameColorLabel)
-#: rc.cpp:501 rc.cpp:1247 rc.cpp:501 rc.cpp:1247
+#: rc.cpp:377 rc.cpp:377
 msgid "Fra&me color:"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:35
 #. i18n: ectx: property (text), widget (QLabel, lblShortCutInfo)
-#: rc.cpp:504 rc.cpp:1250 rc.cpp:504 rc.cpp:1250
+#: rc.cpp:380 rc.cpp:380
 msgid ""
 "Note: Select Settings -> Configure Shortcuts... to change the shortcut "
 "associated with each action."
@@ -2274,67 +1734,67 @@
 
 #. i18n: file: prefcharacterbase.ui:48
 #. i18n: ectx: property (toolTip), widget (QTreeWidget, CharacterTree)
-#: rc.cpp:507 rc.cpp:1253 rc.cpp:507 rc.cpp:1253
+#: rc.cpp:383 rc.cpp:383
 msgid "Select character to modify"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:51
 #. i18n: ectx: property (whatsThis), widget (QTreeWidget, CharacterTree)
-#: rc.cpp:510 rc.cpp:1256 rc.cpp:510 rc.cpp:1256
+#: rc.cpp:386 rc.cpp:386
 msgid "Customizable special character actions"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:61
 #. i18n: ectx: property (text), widget (QTreeWidget, CharacterTree)
-#: rc.cpp:513 rc.cpp:1259 rc.cpp:513 rc.cpp:1259
+#: rc.cpp:389 rc.cpp:389
 msgid "0"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:66
 #. i18n: ectx: property (text), widget (QTreeWidget, CharacterTree)
-#: rc.cpp:516 rc.cpp:1262 rc.cpp:516 rc.cpp:1262
+#: rc.cpp:392 rc.cpp:392
 msgid "1"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:71
 #. i18n: ectx: property (text), widget (QTreeWidget, CharacterTree)
-#: rc.cpp:519 rc.cpp:1265 rc.cpp:519 rc.cpp:1265
+#: rc.cpp:395 rc.cpp:395
 msgid "2"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:103
 #. i18n: ectx: property (toolTip), widget (QPushButton, btnCharacter)
-#: rc.cpp:522 rc.cpp:1268 rc.cpp:522 rc.cpp:1268
+#: rc.cpp:398 rc.cpp:398
 msgid "Click to choose a new character"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:106
 #. i18n: ectx: property (whatsThis), widget (QPushButton, btnCharacter)
-#: rc.cpp:525 rc.cpp:1271 rc.cpp:525 rc.cpp:1271
+#: rc.cpp:401 rc.cpp:401
 msgid "Choose a character for the selected action"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:109
 #. i18n: ectx: property (text), widget (QPushButton, btnCharacter)
-#: rc.cpp:528 rc.cpp:1274 rc.cpp:528 rc.cpp:1274
+#: rc.cpp:404 rc.cpp:404
 msgid "C&haracter..."
 msgstr "No&d..."
 
 #. i18n: file: prefcharacterbase.ui:151
 #. i18n: ectx: property (toolTip), widget (QLabel, lblPreview)
-#: rc.cpp:531 rc.cpp:1277 rc.cpp:531 rc.cpp:1277
+#: rc.cpp:407 rc.cpp:407
 msgid "Preview of current character"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:154
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblPreview)
-#: rc.cpp:534 rc.cpp:1280 rc.cpp:534 rc.cpp:1280
+#: rc.cpp:410 rc.cpp:410
 msgid "Preview of the character associated with the selected action"
 msgstr ""
 
 #. i18n: file: prefcharacterbase.ui:157
 #. i18n: ectx: property (text), widget (QLabel, lblPreview)
-#: rc.cpp:537 rc.cpp:1283 rc.cpp:537 rc.cpp:1283
+#: rc.cpp:413 rc.cpp:413
 msgid "A"
 msgstr "A"
 
@@ -2354,179 +1814,162 @@
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optRight)
 #. i18n: file: prefeditorbase.ui:73
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optNoMove)
-#. i18n: file: prefeditorbase.ui:29
-#. i18n: ectx: property (toolTip), widget (KButtonGroup, kcfg_EnterMove)
-#. i18n: file: prefeditorbase.ui:47
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optDown)
-#. i18n: file: prefeditorbase.ui:60
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optRight)
-#. i18n: file: prefeditorbase.ui:73
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optNoMove)
-#. i18n: file: prefeditorbase.ui:29
-#. i18n: ectx: property (toolTip), widget (KButtonGroup, kcfg_EnterMove)
-#. i18n: file: prefeditorbase.ui:47
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optDown)
-#. i18n: file: prefeditorbase.ui:60
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optRight)
-#. i18n: file: prefeditorbase.ui:73
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optNoMove)
-#: rc.cpp:540 rc.cpp:549 rc.cpp:558 rc.cpp:567 rc.cpp:1286 rc.cpp:1295
-#: rc.cpp:1304 rc.cpp:1313 rc.cpp:540 rc.cpp:549 rc.cpp:558 rc.cpp:567
-#: rc.cpp:1286 rc.cpp:1295 rc.cpp:1304 rc.cpp:1313
+#: rc.cpp:416 rc.cpp:425 rc.cpp:434 rc.cpp:443 rc.cpp:416 rc.cpp:425
+#: rc.cpp:434 rc.cpp:443
 msgid "How enter key moves"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:32
 #. i18n: ectx: property (whatsThis), widget (KButtonGroup, kcfg_EnterMove)
-#: rc.cpp:543 rc.cpp:1289 rc.cpp:543 rc.cpp:1289
+#: rc.cpp:419 rc.cpp:419
 msgid "Select how the Enter key should behave in the editor"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:35
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_EnterMove)
-#: rc.cpp:546 rc.cpp:1292 rc.cpp:546 rc.cpp:1292
+#: rc.cpp:422 rc.cpp:422
 msgid "Enter Ke&y Moves"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:50
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optDown)
-#: rc.cpp:552 rc.cpp:1298 rc.cpp:552 rc.cpp:1298
+#: rc.cpp:428 rc.cpp:428
 msgid ""
 "Select if the next cell below should become active when pressing Enter."
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:53
 #. i18n: ectx: property (text), widget (QRadioButton, optDown)
-#: rc.cpp:555 rc.cpp:1301 rc.cpp:555 rc.cpp:1301
+#: rc.cpp:431 rc.cpp:431
 msgid "&Down"
 msgstr "I &Lawr"
 
 #. i18n: file: prefeditorbase.ui:63
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optRight)
-#: rc.cpp:561 rc.cpp:1307 rc.cpp:561 rc.cpp:1307
+#: rc.cpp:437 rc.cpp:437
 msgid ""
 "Select if the next cell to the right should become active when pressing Enter"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:66
 #. i18n: ectx: property (text), widget (QRadioButton, optRight)
-#: rc.cpp:564 rc.cpp:1310 rc.cpp:564 rc.cpp:1310
+#: rc.cpp:440 rc.cpp:440
 msgid "&Right"
 msgstr "&De"
 
 #. i18n: file: prefeditorbase.ui:76
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optNoMove)
-#: rc.cpp:570 rc.cpp:1316 rc.cpp:570 rc.cpp:1316
+#: rc.cpp:446 rc.cpp:446
 msgid "Select if the current cell should remain active when pressing Enter"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:79
 #. i18n: ectx: property (text), widget (QRadioButton, optNoMove)
-#: rc.cpp:573 rc.cpp:1319 rc.cpp:573 rc.cpp:1319
+#: rc.cpp:449 rc.cpp:449
 msgid "Does not &move"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:89
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_EnableBlanks)
-#: rc.cpp:576 rc.cpp:1322 rc.cpp:576 rc.cpp:1322
+#: rc.cpp:452 rc.cpp:452
 msgid "Check to enable fill-in-the-blank"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:92
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_EnableBlanks)
-#: rc.cpp:579 rc.cpp:1325 rc.cpp:579 rc.cpp:1325
+#: rc.cpp:455 rc.cpp:455
 msgid "Select to enable the functions for Fill-in-the-blank"
 msgstr ""
 
 #. i18n: file: prefeditorbase.ui:95
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_EnableBlanks)
-#: rc.cpp:582 rc.cpp:1328 rc.cpp:582 rc.cpp:1328
+#: rc.cpp:458 rc.cpp:458
 msgid "E&nable fill-in-the-blank"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:35
 #. i18n: ectx: property (toolTip), widget (KButtonGroup, kcfg_StartSession)
-#: rc.cpp:585 rc.cpp:1331 rc.cpp:585 rc.cpp:1331
+#: rc.cpp:461 rc.cpp:461
 msgid "How vocabulary documents are opened"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:38
 #. i18n: ectx: property (whatsThis), widget (KButtonGroup, kcfg_StartSession)
-#: rc.cpp:588 rc.cpp:1334 rc.cpp:588 rc.cpp:1334
+#: rc.cpp:464 rc.cpp:464
 msgid "Select the kind of session to load an opened vocabulary document in"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:41
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_StartSession)
-#: rc.cpp:591 rc.cpp:1337 rc.cpp:591 rc.cpp:1337
+#: rc.cpp:467 rc.cpp:467
 msgid "&Open Vocabulary Documents in"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:47
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optEditor)
-#: rc.cpp:594 rc.cpp:1340 rc.cpp:594 rc.cpp:1340
+#: rc.cpp:470 rc.cpp:470
 msgid "Open vocabulary documents in the editor"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:50
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optEditor)
-#: rc.cpp:597 rc.cpp:1343 rc.cpp:597 rc.cpp:1343
+#: rc.cpp:473 rc.cpp:473
 msgid "Select if the vocabulary documents should be opened in the editor"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:53
 #. i18n: ectx: property (text), widget (QRadioButton, optEditor)
-#: rc.cpp:600 rc.cpp:1346 rc.cpp:600 rc.cpp:1346
+#: rc.cpp:476 rc.cpp:476
 msgid "&Editor"
 msgstr "&Golygydd"
 
 #. i18n: file: prefgeneralbase.ui:60
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optFlashcard)
-#: rc.cpp:603 rc.cpp:1349 rc.cpp:603 rc.cpp:1349
+#: rc.cpp:479 rc.cpp:479
 msgid "Open vocabulary documents in a flashcard quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:63
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optFlashcard)
-#: rc.cpp:606 rc.cpp:1352 rc.cpp:606 rc.cpp:1352
+#: rc.cpp:482 rc.cpp:482
 msgid ""
 "Select if the vocabulary documents should be opened in a flashcard quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:66
 #. i18n: ectx: property (text), widget (QRadioButton, optFlashcard)
-#: rc.cpp:609 rc.cpp:1355 rc.cpp:609 rc.cpp:1355
+#: rc.cpp:485 rc.cpp:485
 msgid "&Flashcard Quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:73
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optMultipleChoice)
-#: rc.cpp:612 rc.cpp:1358 rc.cpp:612 rc.cpp:1358
+#: rc.cpp:488 rc.cpp:488
 msgid "Open vocabulary documents in a multiple choice quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:76
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optMultipleChoice)
-#: rc.cpp:615 rc.cpp:1361 rc.cpp:615 rc.cpp:1361
+#: rc.cpp:491 rc.cpp:491
 msgid ""
 "Select if the vocabulary documents should be opened in a multiple choice quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:79
 #. i18n: ectx: property (text), widget (QRadioButton, optMultipleChoice)
-#: rc.cpp:618 rc.cpp:1364 rc.cpp:618 rc.cpp:1364
+#: rc.cpp:494 rc.cpp:494
 msgid "&Multiple Choice Quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:86
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optQA)
-#: rc.cpp:621 rc.cpp:1367 rc.cpp:621 rc.cpp:1367
+#: rc.cpp:497 rc.cpp:497
 msgid "Open vocabulary documents in a question and answer quiz"
 msgstr ""
 
 #. i18n: file: prefgeneralbase.ui:89
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optQA)
-#: rc.cpp:624 rc.cpp:1370 rc.cpp:624 rc.cpp:1370
+#: rc.cpp:500 rc.cpp:500
 msgid ""
 "Select if the vocabulary documents should be opened in a question and answer "
 "quiz"
@@ -2534,31 +1977,31 @@
 
 #. i18n: file: prefgeneralbase.ui:92
 #. i18n: ectx: property (text), widget (QRadioButton, optQA)
-#: rc.cpp:627 rc.cpp:1373 rc.cpp:627 rc.cpp:1373
+#: rc.cpp:503 rc.cpp:503
 msgid "&Question and Answer Quiz"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:44
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, grpQA)
-#: rc.cpp:633 rc.cpp:1379 rc.cpp:633 rc.cpp:1379
+#: rc.cpp:509 rc.cpp:509
 msgid "Specify behavior for a question and answer session"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:47
 #. i18n: ectx: property (title), widget (QGroupBox, grpQA)
-#: rc.cpp:636 rc.cpp:1382 rc.cpp:636 rc.cpp:1382
+#: rc.cpp:512 rc.cpp:512
 msgid "Question && Answer"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:71
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_HintError)
-#: rc.cpp:639 rc.cpp:1385 rc.cpp:639 rc.cpp:1385
+#: rc.cpp:515 rc.cpp:515
 msgid "Check to count hint as error"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:74
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_HintError)
-#: rc.cpp:642 rc.cpp:1388 rc.cpp:642 rc.cpp:1388
+#: rc.cpp:518 rc.cpp:518
 msgid ""
 "Select if questions where the hint function has been used should be counted "
 "as errors"
@@ -2566,85 +2009,85 @@
 
 #. i18n: file: prefquizbase.ui:77
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_HintError)
-#: rc.cpp:645 rc.cpp:1391 rc.cpp:645 rc.cpp:1391
+#: rc.cpp:521 rc.cpp:521
 msgid "&Treat hint as error"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:87
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, grpScore)
-#: rc.cpp:648 rc.cpp:1394 rc.cpp:648 rc.cpp:1394
+#: rc.cpp:524 rc.cpp:524
 msgid "Specify behavior of the score presentation in any session"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:114
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_Percent)
-#: rc.cpp:654 rc.cpp:1400 rc.cpp:654 rc.cpp:1400
+#: rc.cpp:530 rc.cpp:530
 msgid "Check to show score as a percentage"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:117
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_Percent)
-#: rc.cpp:657 rc.cpp:1403 rc.cpp:657 rc.cpp:1403
+#: rc.cpp:533 rc.cpp:533
 msgid "Select if the score should be shown as a percentage"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:120
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_Percent)
-#: rc.cpp:660 rc.cpp:1406 rc.cpp:660 rc.cpp:1406
+#: rc.cpp:536 rc.cpp:536
 msgid "&Show score as a percentage"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:146
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, grpMultiple)
-#: rc.cpp:663 rc.cpp:1409 rc.cpp:663 rc.cpp:1409
+#: rc.cpp:539 rc.cpp:539
 msgid "Specify behavior for a multiple choice session"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:173
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoCheck)
-#: rc.cpp:669 rc.cpp:1415 rc.cpp:669 rc.cpp:1415
+#: rc.cpp:545 rc.cpp:545
 msgid "Check to correct automatically"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:176
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoCheck)
-#: rc.cpp:672 rc.cpp:1418 rc.cpp:672 rc.cpp:1418
+#: rc.cpp:548 rc.cpp:548
 msgid "Select if a choice should be checked immediately"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:179
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoCheck)
-#: rc.cpp:675 rc.cpp:1421 rc.cpp:675 rc.cpp:1421
+#: rc.cpp:551 rc.cpp:551
 msgid "Check selection a&utomatically"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:189
 #. i18n: ectx: property (whatsThis), widget (QGroupBox, KeepDiscard)
-#: rc.cpp:678 rc.cpp:1424 rc.cpp:678 rc.cpp:1424
+#: rc.cpp:554 rc.cpp:554
 msgid "Specify behavior of a flashcard session"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:238
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblSeconds)
-#: rc.cpp:684 rc.cpp:1430 rc.cpp:684 rc.cpp:1430
+#: rc.cpp:560 rc.cpp:560
 msgid "Specify the amount of time between card flips"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:241
 #. i18n: ectx: property (text), widget (QLabel, lblSeconds)
-#: rc.cpp:687 rc.cpp:1433 rc.cpp:687 rc.cpp:1433
+#: rc.cpp:563 rc.cpp:563
 msgid "seconds and"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:248
 #. i18n: ectx: property (toolTip), widget (KIntNumInput, kcfg_FlipDelay)
-#: rc.cpp:690 rc.cpp:1436 rc.cpp:690 rc.cpp:1436
+#: rc.cpp:566 rc.cpp:566
 msgid "Delay to flip card"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:251
 #. i18n: ectx: property (whatsThis), widget (KIntNumInput, kcfg_FlipDelay)
-#: rc.cpp:693 rc.cpp:1439 rc.cpp:693 rc.cpp:1439
+#: rc.cpp:569 rc.cpp:569
 msgid "Delay in seconds to flip card"
 msgstr ""
 
@@ -2656,22 +2099,13 @@
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optCorrect)
 #. i18n: file: prefquizbase.ui:298
 #. i18n: ectx: property (toolTip), widget (QRadioButton, optError)
-#. i18n: file: prefquizbase.ui:285
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optCorrect)
-#. i18n: file: prefquizbase.ui:298
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optError)
-#. i18n: file: prefquizbase.ui:285
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optCorrect)
-#. i18n: file: prefquizbase.ui:298
-#. i18n: ectx: property (toolTip), widget (QRadioButton, optError)
-#: rc.cpp:696 rc.cpp:705 rc.cpp:1442 rc.cpp:1451 rc.cpp:696 rc.cpp:705
-#: rc.cpp:1442 rc.cpp:1451
+#: rc.cpp:572 rc.cpp:581 rc.cpp:572 rc.cpp:581
 msgid "Select how to count card"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:288
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optCorrect)
-#: rc.cpp:699 rc.cpp:1445 rc.cpp:699 rc.cpp:1445
+#: rc.cpp:575 rc.cpp:575
 msgid ""
 "Select if the previous card should be counted as correct when moving to the "
 "next card"
@@ -2679,13 +2113,13 @@
 
 #. i18n: file: prefquizbase.ui:291
 #. i18n: ectx: property (text), widget (QRadioButton, optCorrect)
-#: rc.cpp:702 rc.cpp:1448 rc.cpp:702 rc.cpp:1448
+#: rc.cpp:578 rc.cpp:578
 msgid "Count &as correct"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:301
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, optError)
-#: rc.cpp:708 rc.cpp:1454 rc.cpp:708 rc.cpp:1454
+#: rc.cpp:584 rc.cpp:584
 msgid ""
 "Select if the previous card should be counted as incorrect when moving to "
 "the next card"
@@ -2693,19 +2127,19 @@
 
 #. i18n: file: prefquizbase.ui:304
 #. i18n: ectx: property (text), widget (QRadioButton, optError)
-#: rc.cpp:711 rc.cpp:1457 rc.cpp:711 rc.cpp:1457
+#: rc.cpp:587 rc.cpp:587
 msgid "Count as &error"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:314
 #. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoFlip)
-#: rc.cpp:714 rc.cpp:1460 rc.cpp:714 rc.cpp:1460
+#: rc.cpp:590 rc.cpp:590
 msgid "Check to flip card automatically"
 msgstr ""
 
 #. i18n: file: prefquizbase.ui:317
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoFlip)
-#: rc.cpp:717 rc.cpp:1463 rc.cpp:717 rc.cpp:1463
+#: rc.cpp:593 rc.cpp:593
 msgid ""
 "Select if you want a card to turn over automatically after the given amount "
 "of time"
@@ -2713,79 +2147,79 @@
 
 #. i18n: file: prefquizbase.ui:320
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoFlip)
-#: rc.cpp:720 rc.cpp:1466 rc.cpp:720 rc.cpp:1466
+#: rc.cpp:596 rc.cpp:596
 msgid "&Flip card automatically after"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:17
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_TutorTiming)
-#: rc.cpp:723 rc.cpp:1469 rc.cpp:723 rc.cpp:1469
+#: rc.cpp:599 rc.cpp:599
 msgid "Tutor Timing"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:23
 #. i18n: ectx: property (text), widget (QRadioButton, radioButtonEvery)
-#: rc.cpp:726 rc.cpp:1472 rc.cpp:726 rc.cpp:1472
+#: rc.cpp:602 rc.cpp:602
 msgid "&Every"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:60
 #. i18n: ectx: property (text), widget (QLabel, labelMinutesPeriodic)
-#: rc.cpp:729 rc.cpp:1475 rc.cpp:729 rc.cpp:1475
+#: rc.cpp:605 rc.cpp:605
 msgid "&minutes"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:72
 #. i18n: ectx: property (text), widget (QRadioButton, radioButtonRandomly)
-#: rc.cpp:732 rc.cpp:1478 rc.cpp:732 rc.cpp:1478
+#: rc.cpp:608 rc.cpp:608
 msgid "&Randomly"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:100
 #. i18n: ectx: property (text), widget (QLabel, labelBetween)
-#: rc.cpp:735 rc.cpp:1481 rc.cpp:735 rc.cpp:1481
+#: rc.cpp:611 rc.cpp:611
 msgid "Between"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:120
 #. i18n: ectx: property (text), widget (QLabel, labelMinutesMax)
-#: rc.cpp:738 rc.cpp:1484 rc.cpp:738 rc.cpp:1484
+#: rc.cpp:614 rc.cpp:614
 msgid "m&inutes and"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:146
 #. i18n: ectx: property (text), widget (QLabel, labelMinutesMin)
-#: rc.cpp:741 rc.cpp:1487 rc.cpp:741 rc.cpp:1487
+#: rc.cpp:617 rc.cpp:617
 msgid "mi&nutes"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:161
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_TutorCardAppearance)
-#: rc.cpp:744 rc.cpp:1490 rc.cpp:744 rc.cpp:1490
+#: rc.cpp:620 rc.cpp:620
 msgid "Flashcard Appearance"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:167
 #. i18n: ectx: property (text), widget (QRadioButton, radioButtonAppearanceNative)
-#: rc.cpp:747 rc.cpp:1493 rc.cpp:747 rc.cpp:1493
+#: rc.cpp:623 rc.cpp:623
 msgid "&Native"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:177
 #. i18n: ectx: property (text), widget (QRadioButton, radioButtonAppearanceMinimalistic)
-#: rc.cpp:750 rc.cpp:1496 rc.cpp:750 rc.cpp:1496
+#: rc.cpp:626 rc.cpp:626
 msgid "Minim&alistic"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:187
 #. i18n: ectx: property (title), widget (QGroupBox, groupBoxMisc)
-#: rc.cpp:753 rc.cpp:1499 rc.cpp:753 rc.cpp:1499
+#: rc.cpp:629 rc.cpp:629
 msgid "Miscellaneous"
 msgstr ""
 
 #. i18n: file: preftutorbase.ui:193
 #. i18n: ectx: property (text), widget (QCheckBox, kcfg_StartExerciseAsSoonAsFileIsLoaded)
-#: rc.cpp:756 rc.cpp:1502 rc.cpp:756 rc.cpp:1502
+#: rc.cpp:632 rc.cpp:632
 msgid "S&tart exercise as soon as vocabulary file is opened"
 msgstr ""
 
@@ -2805,49 +2239,32 @@
 #. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerLanguage)
 #. i18n: file: qaviewbase.ui:233
 #. i18n: ectx: property (toolTip), widget (QLabel, picAnswer)
-#. i18n: file: qaviewbase.ui:142
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerBlank)
-#. i18n: file: qaviewbase.ui:173
-#. i18n: ectx: property (toolTip), widget (KLineEdit, txtAnswer)
-#. i18n: file: qaviewbase.ui:205
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: qaviewbase.ui:233
-#. i18n: ectx: property (toolTip), widget (QLabel, picAnswer)
-#. i18n: file: qaviewbase.ui:142
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerBlank)
-#. i18n: file: qaviewbase.ui:173
-#. i18n: ectx: property (toolTip), widget (KLineEdit, txtAnswer)
-#. i18n: file: qaviewbase.ui:205
-#. i18n: ectx: property (toolTip), widget (QLabel, lblAnswerLanguage)
-#. i18n: file: qaviewbase.ui:233
-#. i18n: ectx: property (toolTip), widget (QLabel, picAnswer)
-#: rc.cpp:780 rc.cpp:789 rc.cpp:795 rc.cpp:804 rc.cpp:1526 rc.cpp:1535
-#: rc.cpp:1541 rc.cpp:1550 rc.cpp:780 rc.cpp:789 rc.cpp:795 rc.cpp:804
-#: rc.cpp:1526 rc.cpp:1535 rc.cpp:1541 rc.cpp:1550
+#: rc.cpp:656 rc.cpp:665 rc.cpp:671 rc.cpp:680 rc.cpp:656 rc.cpp:665
+#: rc.cpp:671 rc.cpp:680
 msgid "Type your answer"
 msgstr ""
 
 #. i18n: file: qaviewbase.ui:145
 #. i18n: ectx: property (whatsThis), widget (QLabel, lblAnswerBlank)
-#: rc.cpp:783 rc.cpp:1529 rc.cpp:783 rc.cpp:1529
+#: rc.cpp:659 rc.cpp:659
 msgid "The answer showing blanks for a Fill-in-the-blank question"
 msgstr ""
 
 #. i18n: file: qaviewbase.ui:148
 #. i18n: ectx: property (text), widget (QLabel, lblAnswerBlank)
-#: rc.cpp:786 rc.cpp:1532 rc.cpp:786 rc.cpp:1532
+#: rc.cpp:662 rc.cpp:662
 msgid "This is _____ answer"
 msgstr ""
 
 #. i18n: file: qaviewbase.ui:176
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, txtAnswer)
-#: rc.cpp:792 rc.cpp:1538 rc.cpp:792 rc.cpp:1538
+#: rc.cpp:668 rc.cpp:668
 msgid "Type the answer to the question"
 msgstr ""
 
 #. i18n: file: qaviewbase.ui:587
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:870 rc.cpp:1616 rc.cpp:870 rc.cpp:1616
+#: rc.cpp:746 rc.cpp:746
 msgid ""
 "<html>There are too few entries in your vocabulary.<br />You need at least "
 "one entry for a question and answer quiz.</html>"
@@ -2855,205 +2272,205 @@
 
 #. i18n: file: documentsettings.kcfg:12
 #. i18n: ectx: label, entry (SizeHintColumn$(Section)), group (Document $(fileurl))
-#: rc.cpp:108 rc.cpp:1619 rc.cpp:108 rc.cpp:1619
+#: rc.cpp:749 rc.cpp:749
 msgid "Column widths"
 msgstr ""
 
 #. i18n: file: documentsettings.kcfg:18
 #. i18n: ectx: label, entry (KeyboardLayoutColumn$(Section)), group (Document $(fileurl))
-#: rc.cpp:111 rc.cpp:1622 rc.cpp:111 rc.cpp:1622
+#: rc.cpp:752 rc.cpp:752
 msgid "Keyboard layouts"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:11
 #. i18n: ectx: label, entry (FirstRun), group (General)
-#: rc.cpp:117 rc.cpp:1625 rc.cpp:117 rc.cpp:1625
+#: rc.cpp:755 rc.cpp:755
 msgid "Is this the first time KWordQuiz is run?"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:15
 #. i18n: ectx: label, entry (ShowSearch), group (General)
-#: rc.cpp:120 rc.cpp:1628 rc.cpp:120 rc.cpp:1628
+#: rc.cpp:758 rc.cpp:758
 msgid "Toggle display of the search bar."
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:19
 #. i18n: ectx: label, entry (StartSession), group (General)
-#: rc.cpp:123 rc.cpp:1631 rc.cpp:123 rc.cpp:1631
+#: rc.cpp:761 rc.cpp:761
 msgid "Type of session to use when opening files"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:29
 #. i18n: ectx: label, entry (PrintStyle), group (General)
-#: rc.cpp:126 rc.cpp:1634 rc.cpp:126 rc.cpp:1634
+#: rc.cpp:764 rc.cpp:764
 msgid "Type of printout to generate"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:40
 #. i18n: ectx: label, entry (ColumnTitles1), group (Editor)
-#: rc.cpp:129 rc.cpp:1637 rc.cpp:129 rc.cpp:1637
+#: rc.cpp:767 rc.cpp:767
 msgid "Titles for column 1"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:44
 #. i18n: ectx: label, entry (ColumnTitles2), group (Editor)
-#: rc.cpp:132 rc.cpp:1640 rc.cpp:132 rc.cpp:1640
+#: rc.cpp:770 rc.cpp:770
 msgid "Titles for column 2"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:48
 #. i18n: ectx: label, entry (EditorFont), group (Editor)
-#: rc.cpp:135 rc.cpp:1643 rc.cpp:135 rc.cpp:1643
+#: rc.cpp:773 rc.cpp:773
 msgid "Font used in the editor"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:52
 #. i18n: ectx: label, entry (EnableBlanks), group (Editor)
-#: rc.cpp:138 rc.cpp:1646 rc.cpp:138 rc.cpp:1646
+#: rc.cpp:776 rc.cpp:776
 msgid "If Fill-in-the-blank should be enabled"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:56
 #. i18n: ectx: label, entry (EnterMove), group (Editor)
-#: rc.cpp:141 rc.cpp:1649 rc.cpp:141 rc.cpp:1649
+#: rc.cpp:779 rc.cpp:779
 msgid "Direction the Enter key moves in the editor"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:60
 #. i18n: ectx: label, entry (SpecialCharacters), group (Editor)
-#: rc.cpp:144 rc.cpp:1652 rc.cpp:144 rc.cpp:1652
+#: rc.cpp:782 rc.cpp:782
 msgid "Characters for the special character toolbar"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:64
 #. i18n: ectx: label, entry (ClearAll), group (Editor)
-#: rc.cpp:147 rc.cpp:1655 rc.cpp:147 rc.cpp:1655
+#: rc.cpp:785 rc.cpp:785
 msgid "Clear all data in selected entries"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:68
 #. i18n: ectx: label, entry (ClearText), group (Editor)
-#: rc.cpp:150 rc.cpp:1658 rc.cpp:150 rc.cpp:1658
+#: rc.cpp:788 rc.cpp:788
 msgid "Clear the text in selected entries"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:72
 #. i18n: ectx: label, entry (ClearImageLink), group (Editor)
-#: rc.cpp:153 rc.cpp:1661 rc.cpp:153 rc.cpp:1661
+#: rc.cpp:791 rc.cpp:791
 msgid "Clear the image link in selected entries"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:76
 #. i18n: ectx: label, entry (ClearSoundLink), group (Editor)
-#: rc.cpp:156 rc.cpp:1664 rc.cpp:156 rc.cpp:1664
+#: rc.cpp:794 rc.cpp:794
 msgid "Clear the sound link in selected entries"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:82
 #. i18n: ectx: label, entry (AutoCheck), group (Quiz)
-#: rc.cpp:159 rc.cpp:1667 rc.cpp:159 rc.cpp:1667
+#: rc.cpp:797 rc.cpp:797
 msgid "Automatically check selected answer in multiple choice"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:86
 #. i18n: ectx: label, entry (AutoFlip), group (Quiz)
-#: rc.cpp:162 rc.cpp:1670 rc.cpp:162 rc.cpp:1670
+#: rc.cpp:800 rc.cpp:800
 msgid "Automatically flip flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:90
 #. i18n: ectx: label, entry (FlipDelay), group (Quiz)
-#: rc.cpp:165 rc.cpp:1673 rc.cpp:165 rc.cpp:1673
+#: rc.cpp:803 rc.cpp:803
 msgid "Time delay for flipping flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:94
 #. i18n: ectx: label, entry (HintError), group (Quiz)
-#: rc.cpp:168 rc.cpp:1676 rc.cpp:168 rc.cpp:1676
+#: rc.cpp:806 rc.cpp:806
 msgid "Treat use of hint as error"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:98
 #. i18n: ectx: label, entry (KeepDiscard), group (Quiz)
-#: rc.cpp:171 rc.cpp:1679 rc.cpp:171 rc.cpp:1679
+#: rc.cpp:809 rc.cpp:809
 msgid "Count flashcard as correct or error"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:102
 #. i18n: ectx: label, entry (Mode), group (Quiz)
-#: rc.cpp:174 rc.cpp:1682 rc.cpp:174 rc.cpp:1682
+#: rc.cpp:812 rc.cpp:812
 msgid "Quiz mode"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:106
 #. i18n: ectx: label, entry (Percent), group (Quiz)
-#: rc.cpp:177 rc.cpp:1685 rc.cpp:177 rc.cpp:1685
+#: rc.cpp:815 rc.cpp:815
 msgid "Show score as percentage"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:112
 #. i18n: ectx: label, entry (FrontFont), group (FlashCard)
-#: rc.cpp:180 rc.cpp:1688 rc.cpp:180 rc.cpp:1688
+#: rc.cpp:818 rc.cpp:818
 msgid "Font used for front of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:116
 #. i18n: ectx: label, entry (FrontTextColor), group (FlashCard)
-#: rc.cpp:183 rc.cpp:1691 rc.cpp:183 rc.cpp:1691
+#: rc.cpp:821 rc.cpp:821
 msgid "Color used for text on front of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:120
 #. i18n: ectx: label, entry (FrontCardColor), group (FlashCard)
-#: rc.cpp:186 rc.cpp:1694 rc.cpp:186 rc.cpp:1694
+#: rc.cpp:824 rc.cpp:824
 msgid "Color used for front of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:124
 #. i18n: ectx: label, entry (FrontFrameColor), group (FlashCard)
-#: rc.cpp:189 rc.cpp:1697 rc.cpp:189 rc.cpp:1697
+#: rc.cpp:827 rc.cpp:827
 msgid "Color used for frame on front of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:128
 #. i18n: ectx: label, entry (BackFont), group (FlashCard)
-#: rc.cpp:192 rc.cpp:1700 rc.cpp:192 rc.cpp:1700
+#: rc.cpp:830 rc.cpp:830
 msgid "Font used for back of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:132
 #. i18n: ectx: label, entry (BackTextColor), group (FlashCard)
-#: rc.cpp:195 rc.cpp:1703 rc.cpp:195 rc.cpp:1703
+#: rc.cpp:833 rc.cpp:833
 msgid "Color used for text on back of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:136
 #. i18n: ectx: label, entry (BackCardColor), group (FlashCard)
-#: rc.cpp:198 rc.cpp:1706 rc.cpp:198 rc.cpp:1706
+#: rc.cpp:836 rc.cpp:836
 msgid "Color used for back of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:140
 #. i18n: ectx: label, entry (BackFrameColor), group (FlashCard)
-#: rc.cpp:201 rc.cpp:1709 rc.cpp:201 rc.cpp:1709
+#: rc.cpp:839 rc.cpp:839
 msgid "Color used for frame on back of flashcard"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:146
 #. i18n: ectx: label, entry (ProvidersUrl), group (KNewStuff)
-#: rc.cpp:204 rc.cpp:1712 rc.cpp:204 rc.cpp:1712
+#: rc.cpp:842 rc.cpp:842
 msgid "The Providers path for KWordQuiz"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:150
 #. i18n: ectx: label, entry (InstallationCommand), group (KNewStuff)
-#: rc.cpp:207 rc.cpp:1715 rc.cpp:207 rc.cpp:1715
+#: rc.cpp:845 rc.cpp:845
 msgid "The command used to start a downloaded vocabulary"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:154
 #. i18n: ectx: label, entry (InstallPath), group (KNewStuff)
-#: rc.cpp:210 rc.cpp:1718 rc.cpp:210 rc.cpp:1718
+#: rc.cpp:848 rc.cpp:848
 msgid ""
 "The folder where downloaded vocabularies are saved by default (relative to "
 "$HOME)"
@@ -3061,43 +2478,43 @@
 
 #. i18n: file: kwordquiz.kcfg:160
 #. i18n: ectx: label, entry (TutorTiming), group (Tutor)
-#: rc.cpp:213 rc.cpp:1721 rc.cpp:213 rc.cpp:1721
+#: rc.cpp:851 rc.cpp:851
 msgid "Pop up flashcards at fixed or random intervals"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:168
 #. i18n: ectx: label, entry (TutorEvery), group (Tutor)
-#: rc.cpp:216 rc.cpp:1724 rc.cpp:216 rc.cpp:1724
+#: rc.cpp:854 rc.cpp:854
 msgid "The interval in minutes at which to pop up a flash card"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:172
 #. i18n: ectx: label, entry (TutorMin), group (Tutor)
-#: rc.cpp:219 rc.cpp:1727 rc.cpp:219 rc.cpp:1727
+#: rc.cpp:857 rc.cpp:857
 msgid "The minimum interval in minutes at which to pop up a flash card"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:176
 #. i18n: ectx: label, entry (TutorMax), group (Tutor)
-#: rc.cpp:222 rc.cpp:1730 rc.cpp:222 rc.cpp:1730
+#: rc.cpp:860 rc.cpp:860
 msgid "The maximum interval in minutes at which to pop up a flash card"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:180
 #. i18n: ectx: label, entry (TutorFlashCardGeometry), group (Tutor)
-#: rc.cpp:225 rc.cpp:1733 rc.cpp:225 rc.cpp:1733
+#: rc.cpp:863 rc.cpp:863
 msgid "Geometry of the last flash card"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:184
 #. i18n: ectx: label, entry (TutorCardAppearance), group (Tutor)
-#: rc.cpp:228 rc.cpp:1736 rc.cpp:228 rc.cpp:1736
+#: rc.cpp:866 rc.cpp:866
 msgid "Show flash card in a native KWordQuiz style"
 msgstr ""
 
 #. i18n: file: kwordquiz.kcfg:192
 #. i18n: ectx: label, entry (LastVocabFile), group (Tutor)
-#: rc.cpp:231 rc.cpp:1739 rc.cpp:231 rc.cpp:1739
+#: rc.cpp:869 rc.cpp:869
 msgid ""
 "Last open vocabulary file to be opened automatically if none other is "
 "specified on the command line"
@@ -3105,6 +2522,73 @@
 
 #. i18n: file: kwordquiz.kcfg:196
 #. i18n: ectx: label, entry (StartExerciseAsSoonAsFileIsLoaded), group (Tutor)
-#: rc.cpp:234 rc.cpp:1742 rc.cpp:234 rc.cpp:1742
+#: rc.cpp:872 rc.cpp:872
 msgid "Start exercise as soon as the user opens vocabulary file"
 msgstr ""
+
+#: kwqcommands.h:106
+msgid "Font"
+msgstr ""
+
+#: kwqcommands.h:124
+msgid "Entry"
+msgstr ""
+
+#: kwqcleardialog.cpp:27
+msgid "Clear Contents"
+msgstr ""
+
+#: dlglanguage.cpp:31
+msgid "Column Settings"
+msgstr ""
+
+#: main.cpp:30
+msgid "A powerful flashcard and vocabulary learning program"
+msgstr ""
+
+#: main.cpp:34
+msgid "KWordQuiz"
+msgstr "KWordQuiz"
+
+#: main.cpp:38
+msgid "(c) 2003-2010, Peter Hedlund"
+msgstr ""
+
+#: main.cpp:43
+msgid "Peter Hedlund"
+msgstr ""
+
+#: main.cpp:44
+msgid "Anne-Marie Mahfouf"
+msgstr ""
+
+#: main.cpp:44
+msgid "KDE Edutainment Maintainer"
+msgstr "Cynhaliwr Addloniant KDE"
+
+#: main.cpp:45
+msgid "Martin Pfeiffer"
+msgstr ""
+
+#: main.cpp:45
+msgid "Leitner System and several code contributions"
+msgstr ""
+
+#: main.cpp:51
+msgid ""
+"A number 1-5 corresponding to the \n"
+"entries in the Mode menu"
+msgstr ""
+
+#: main.cpp:53
+msgid ""
+"Type of session to start with: \n"
+"'flash' for flashcard, \n"
+"'mc' for multiple choice, \n"
+"'qa' for question and answer, \n"
+"'tutor' for tutor"
+msgstr ""
+
+#: main.cpp:54
+msgid "File to open"
+msgstr "Ffeil i'w hagor"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwriteconfig.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwriteconfig.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kwriteconfig.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kwriteconfig.po	2012-04-18 08:59:35.000000000 +0000
@@ -6,15 +6,15 @@
 msgstr ""
 "Project-Id-Version: kwriteconfig\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
-"PO-Revision-Date: 2012-03-14 17:34+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
+"PO-Revision-Date: 2012-04-16 14:19+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:07+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:32+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kwriteconfig.cpp:35
 msgid "KWriteConfig"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kxkb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kxkb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/kxkb.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/kxkb.po	2012-04-18 08:59:39.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: kxkb\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
-"PO-Revision-Date: 2012-03-14 17:03+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
+"PO-Revision-Date: 2012-04-17 00:04+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,14 +18,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:47+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kcm_add_layout_dialog.cpp:54
 msgid "Any language"
 msgstr ""
 
-#: kcm_add_layout_dialog.cpp:134 kcm_view_models.cpp:288
+#: kcm_add_layout_dialog.cpp:133 kcm_view_models.cpp:308
 msgctxt "variant"
 msgid "Default"
 msgstr "Rhagosodedig"
@@ -44,78 +44,78 @@
 "parameters and layouts."
 msgstr ""
 
-#: kcm_keyboard_widget.cpp:178
+#: kcm_keyboard_widget.cpp:213
 msgctxt "unknown keyboard model vendor"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: kcm_keyboard_widget.cpp:180
+#: kcm_keyboard_widget.cpp:215
 #, kde-format
 msgctxt "vendor | keyboard model"
 msgid "%1 | %2"
 msgstr "%1 | %2"
 
-#: kcm_keyboard_widget.cpp:190
+#: kcm_keyboard_widget.cpp:225
 #, kde-format
 msgid "Only up to %1 keyboard layout is supported"
 msgid_plural "Only up to %1 keyboard layouts are supported"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcm_keyboard_widget.cpp:533
+#: kcm_keyboard_widget.cpp:574
 msgctxt "no shortcuts defined"
 msgid "None"
 msgstr "Dim"
 
-#: kcm_keyboard_widget.cpp:549
+#: kcm_keyboard_widget.cpp:590
 #, kde-format
 msgid "%1 shortcut"
 msgid_plural "%1 shortcuts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: kcm_view_models.cpp:210
+#: kcm_view_models.cpp:224
 msgctxt "layout map name"
 msgid "Map"
 msgstr "Map"
 
-#: kcm_view_models.cpp:210
+#: kcm_view_models.cpp:224
 msgid "Layout"
 msgstr "Llunwedd"
 
-#: kcm_view_models.cpp:210
+#: kcm_view_models.cpp:224
 msgid "Variant"
 msgstr ""
 
-#: kcm_view_models.cpp:210
+#: kcm_view_models.cpp:224
 msgid "Label"
 msgstr "Label"
 
-#: kcm_view_models.cpp:225
+#: kcm_view_models.cpp:224
 msgid "Shortcut"
 msgstr ""
 
-#: keyboard_applet.cpp:51
+#: keyboard_applet.cpp:52
 msgid "XKB extension failed to initialize"
 msgstr ""
 
-#: layout_tray_icon.cpp:49 layout_tray_icon.cpp:50
+#: layout_tray_icon.cpp:46 layout_tray_icon.cpp:47
 msgctxt "tooltip title"
 msgid "Keyboard Layout"
 msgstr ""
 
-#: layouts_menu.cpp:79
+#: flags.cpp:138
 #, kde-format
 msgctxt "short layout label - full layout name"
 msgid "%1 - %2"
 msgstr ""
 
-#: flags.cpp:120
+#: flags.cpp:146
 #, kde-format
 msgctxt "layout - variant"
 msgid "%1 - %2"
 msgstr "%1 - %2"
 
-#: layouts_menu.cpp:120
+#: layouts_menu.cpp:137
 msgid "Configure..."
 msgstr "Ffurfweddu..."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libk3bdevice.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libk3bdevice.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libk3bdevice.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libk3bdevice.po	2012-04-18 08:59:22.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeextragear-1/libk3bdevice.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-01 16:25+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-08-19 17:58+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:38+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: k3bdeviceglobals.cpp:29 k3bdeviceglobals.cpp:152
 msgid "CD-R"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libk3b.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libk3b.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libk3b.po	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libk3b.po	2012-04-18 08:59:22.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeextragear-1/libk3b.po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-01 16:25+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2008-08-19 17:57+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -15,3630 +15,3628 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:38+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-17 23:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: projects/k3babstractwriter.cpp:56
-msgid "Unlocking drive..."
+#: jobs/k3bclonejob.cpp:88 jobs/k3bcdda2wavreader.cpp:97
+#: jobs/k3bdvdformattingjob.cpp:464 jobs/k3breadcdreader.cpp:106
+#: jobs/k3bdvdbooktypejob.cpp:288 projects/k3bcdrecordwriter.cpp:214
+#: projects/k3bcdrdaowriter.cpp:450 projects/k3bgrowisofswriter.cpp:156
+#: projects/videocd/k3bvcdjob.cpp:204 projects/datacd/k3bmsinfofetcher.cpp:56
+#: projects/datacd/k3bmsinfofetcher.cpp:92
+#, kde-format
+msgid "Could not find %1 executable."
 msgstr ""
 
-#: projects/k3babstractwriter.cpp:70
-msgid "Could not unlock drive."
+#: jobs/k3bclonejob.cpp:94
+#, kde-format
+msgid "Cdrecord version %1 does not have cloning support."
 msgstr ""
 
-#: projects/k3babstractwriter.cpp:73
-msgid "Ejecting Medium"
+#: jobs/k3bclonejob.cpp:102
+msgid "No device set."
 msgstr ""
 
-#: projects/k3babstractwriter.cpp:87 jobs/k3bdvdformattingjob.cpp:303
-msgid "Unable to eject medium."
+#: jobs/k3bclonejob.cpp:111
+#, kde-format
+msgid "CD writer %1 (%2) does not support cloning."
 msgstr ""
 
-#: projects/datacd/k3bdatadoc.cpp:1182 projects/videocd/k3bvcddoc.cpp:416
-msgid "Could not find the following files:"
+#: jobs/k3bclonejob.cpp:144
+msgid "Reading clone image"
 msgstr ""
 
-#: projects/datacd/k3bdatadoc.cpp:1183 projects/videocd/k3bvcddoc.cpp:417
-msgid "Not Found"
-msgstr "Heb ei ganfod"
-
-#: projects/datacd/k3bdatadoc.cpp:1188
-msgid "No permission to read the following files:"
+#: jobs/k3bclonejob.cpp:225 projects/videocd/k3bvcdjob.cpp:466
+#: projects/datacd/k3bdatajob.cpp:471
+#, kde-format
+msgid "Writing Track %1 of %2"
 msgstr ""
 
-#: projects/datacd/k3bdatadoc.cpp:1189
-msgid "No Read Permission"
+#: jobs/k3bclonejob.cpp:242
+#, kde-format
+msgid "Successfully written clone copy %1."
 msgstr ""
 
-#: projects/datacd/k3bdatadoc.cpp:1342 projects/datacd/k3bdatadoc.cpp:1355
-msgid "From previous session"
+#: jobs/k3bclonejob.cpp:290
+msgid "Successfully read disk."
 msgstr ""
 
-#: projects/datacd/k3bdatadoc.cpp:1462
-msgid "El Torito boot catalog file"
+#: jobs/k3bclonejob.cpp:302
+msgid "Failed to read disk completely in clone mode."
 msgstr ""
 
-#: projects/datacd/k3bdatadoc.cpp:1463
-msgid "Boot catalog"
+#: jobs/k3bclonejob.cpp:309
+msgid "Error while reading disk."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:150 projects/mixedcd/k3bmixedjob.cpp:222
-#: projects/audiocd/k3baudiojob.cpp:156 jobs/k3biso9660imagewritingjob.cpp:90
-msgid "Preparing data"
+#: jobs/k3bclonejob.cpp:335
+msgid "Simulating clone copy"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:219 projects/mixedcd/k3bmixedjob.cpp:1099
-#: projects/audiocd/k3baudioimager.cpp:109
+#: jobs/k3bclonejob.cpp:337
 #, kde-format
-msgid "Could not open %1 for writing"
+msgid "Writing clone copy %1"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:226
-msgid "Creating image file"
+#: jobs/k3bclonejob.cpp:346 jobs/k3bcdcopyjob.cpp:1122
+msgid "Removing image files."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:227
-msgid "Track 1 of 1"
+#: jobs/k3bclonejob.cpp:358
+msgid "Creating Clone Image"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:228
-#, kde-format
-msgid "Creating image file in %1"
+#: jobs/k3bclonejob.cpp:361
+msgid "Simulating Clone Image"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:386
-#, kde-format
-msgid "Image successfully created in %1"
+#: jobs/k3bclonejob.cpp:363
+msgid "Burning Clone Image"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:393 tools/k3bmd5job.cpp:101
-#, kde-format
-msgid "Could not open file %1"
-msgstr "Methwyd agor y ffeil %1"
-
-#: projects/datacd/k3bdatajob.cpp:406
-msgid "Error while creating ISO image"
+#: jobs/k3bclonejob.cpp:366
+msgid "Simulating CD Cloning"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:440 projects/mixedcd/k3bmixedjob.cpp:1013
-#: projects/audiocd/k3baudiojob.cpp:652 projects/k3bcdrdaowriter.cpp:565
-#: projects/k3bcdrdaowriter.cpp:583 projects/k3bcdrecordwriter.cpp:463
-#: projects/k3bgrowisofswriter.cpp:372 jobs/k3bcdcopyjob.cpp:715
-msgid "Simulating"
+#: jobs/k3bclonejob.cpp:368
+msgid "Cloning CD"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:442 projects/mixedcd/k3bmixedjob.cpp:1015
-#: projects/audiocd/k3baudiojob.cpp:654 jobs/k3bcdcopyjob.cpp:717
+#: jobs/k3bclonejob.cpp:374
 #, kde-format
-msgid "Writing Copy %1"
+msgid "Creating 1 clone copy"
+msgid_plural "Creating %1 clone copies"
+msgstr[0] ""
+msgstr[1] ""
+
+#: jobs/k3bdatatrackreader.cpp:149 jobs/k3bdatatrackreader.cpp:183
+#: jobs/k3baudiosessionreadingjob.cpp:150
+#, kde-format
+msgid "Could not open device %1"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:444 projects/audiocd/k3baudiojob.cpp:656
-#: projects/k3bcdrdaowriter.cpp:571 projects/k3bcdrecordwriter.cpp:471
-#: projects/k3bgrowisofswriter.cpp:377
-msgid "Writing"
+#: jobs/k3bdatatrackreader.cpp:178
+msgid "Unable to open libdvdcss."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:471 projects/videocd/k3bvcdjob.cpp:466
-#: jobs/k3bclonejob.cpp:225
-#, kde-format
-msgid "Writing Track %1 of %2"
+#: jobs/k3bdatatrackreader.cpp:187
+msgid "Retrieving all CSS keys. This might take a while."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:524 jobs/k3biso9660imagewritingjob.cpp:139
-msgid "Verifying written data"
+#: jobs/k3bdatatrackreader.cpp:190
+msgid "Failed to retrieve all CSS keys."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:533 projects/mixedcd/k3bmixedjob.cpp:543
-#: projects/audiocd/k3baudiojob.cpp:421 projects/videocd/k3bvcdjob.cpp:506
-#: jobs/k3bcdcopyjob.cpp:1063
-msgid "K3b was unable to eject the written disk. Please do so manually."
+#: jobs/k3bdatatrackreader.cpp:191
+msgid "Video DVD decryption failed."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:708
-msgid "Internal Error: No medium type fits. This project cannot be burned."
+#: jobs/k3bdatatrackreader.cpp:215
+msgid "No support for reading formless Mode2 sectors."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:712
-msgid "Waiting for a medium"
+#: jobs/k3bdatatrackreader.cpp:217
+msgid "Unsupported sector type."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:729
+#: jobs/k3bdatatrackreader.cpp:224
 #, kde-format
-msgid "Writing %1"
+msgid "Reading with sector size %1."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:746
-msgid "Unable to determine the last track's datamode. Using default."
+#: jobs/k3bdatatrackreader.cpp:240 jobs/k3bdvdcopyjob.cpp:360
+#: jobs/k3baudiosessionreadingjob.cpp:209
+#, kde-format
+msgid "Unable to open '%1' for writing."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:783 projects/datacd/k3bdatajob.cpp:806
-#: jobs/k3bmetawriter.cpp:304
+#: jobs/k3bdatatrackreader.cpp:271 jobs/k3bdatatrackreader.cpp:446
 #, kde-format
-msgid "Cannot write %1 media using %2. Falling back to default application."
+msgid "Error while reading sector %1."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:825 projects/datacd/k3bdatajob.cpp:942
-#: jobs/k3bdvdcopyjob.cpp:817 jobs/k3bdvdcopyjob.cpp:910
+#: jobs/k3bdatatrackreader.cpp:353
 #, kde-format
-msgid ""
-"%1 media do not support write simulation. Do you really want to continue? "
-"The disc will actually be written to."
-msgstr ""
+msgid "Ignored %1 erroneous sector."
+msgid_plural "Ignored a total of %1 erroneous sectors."
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/datacd/k3bdatajob.cpp:828 projects/datacd/k3bdatajob.cpp:945
-#: jobs/k3bdvdcopyjob.cpp:820 jobs/k3bdvdcopyjob.cpp:913
+#: jobs/k3bdatatrackreader.cpp:422
 #, kde-format
-msgid "No Simulation with %1"
+msgid "Problem while reading. Retrying from sector %1."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:836 projects/datacd/k3bdatajob.cpp:953
+#: jobs/k3bdatatrackreader.cpp:438
 #, kde-format
-msgid "Writing mode ignored when writing %1 media."
+msgid "Ignoring read error in sector %1."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:848 projects/datacd/k3bdatajob.cpp:966
-#, kde-format
-msgid "Growing ISO9660 filesystem on %1."
+#: jobs/k3bblankingjob.cpp:74 jobs/k3bblankingjob.cpp:162
+msgid "Erasing CD-RW"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:850 projects/datacd/k3bdatajob.cpp:968
-#: jobs/k3bmetawriter.cpp:854 jobs/k3bmetawriter.cpp:863
-#: jobs/k3bdvdcopyjob.cpp:832 jobs/k3bdvdcopyjob.cpp:922
-#, kde-format
-msgid "Writing %1."
+#: jobs/k3bblankingjob.cpp:75
+msgid "When erasing a CD-RW no progress information is available."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:858 jobs/k3bmetawriter.cpp:506
-#: jobs/k3bdvdcopyjob.cpp:840
+#: jobs/k3bblankingjob.cpp:115
 #, kde-format
-msgid ""
-"Your writer (%1 %2) does not support simulation with DVD-R(W) media. Do you "
-"really want to continue? The media will actually be written to."
+msgid "Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:863 jobs/k3bmetawriter.cpp:511
-#: jobs/k3bdvdcopyjob.cpp:845
-msgid "No Simulation with DVD-R(W)"
+#: jobs/k3bblankingjob.cpp:152
+msgid "Blanking error "
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:877 jobs/k3bmetawriter.cpp:850
-#: jobs/k3bdvdcopyjob.cpp:866
-msgid "Writing DVD-RW in restricted overwrite mode."
+#: jobs/k3bblankingjob.cpp:153
+msgid "Sorry, no error handling yet."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:880 jobs/k3bmetawriter.cpp:840
-msgid "Growing ISO9660 filesystem on DVD-RW in restricted overwrite mode."
+#: jobs/k3bblankingjob.cpp:169 jobs/k3bdvdformattingjob.cpp:108
+msgid "Quick Format"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:894 projects/datacd/k3bdatajob.cpp:911
-#: jobs/k3bmetawriter.cpp:856 jobs/k3bdvdcopyjob.cpp:892
+#: jobs/k3biso9660imagewritingjob.cpp:90 projects/audiocd/k3baudiojob.cpp:156
+#: projects/mixedcd/k3bmixedjob.cpp:222 projects/datacd/k3bdatajob.cpp:150
+msgid "Preparing data"
+msgstr ""
+
+#: jobs/k3biso9660imagewritingjob.cpp:93
 #, kde-format
-msgid "Writing %1 in DAO mode."
+msgid "Could not find image %1"
+msgstr "Methwyd canfod y ddelwedd %1"
+
+#: jobs/k3biso9660imagewritingjob.cpp:139 projects/datacd/k3bdatajob.cpp:524
+msgid "Verifying written data"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:901 jobs/k3bmetawriter.cpp:476
+#: jobs/k3biso9660imagewritingjob.cpp:141
 #, kde-format
-msgid ""
-"Your writer (%1 %2) does not support Incremental Streaming with %3 media. "
-"Multisession will not be possible. Continue anyway?"
+msgid "Verifying written copy %1 of %2"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:906 jobs/k3bmetawriter.cpp:481
-msgid "No Incremental Streaming"
+#: jobs/k3biso9660imagewritingjob.cpp:155 jobs/k3bdvdcopyjob.cpp:681
+msgid "K3b was unable to eject the written medium. Please do so manually."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:918 jobs/k3bmetawriter.cpp:443
-#: jobs/k3bmetawriter.cpp:492 jobs/k3bdvdcopyjob.cpp:887
-msgid "Restricted Overwrite is not possible with DVD-R media."
+#: jobs/k3biso9660imagewritingjob.cpp:214
+msgid "Writing image"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:920 jobs/k3bmetawriter.cpp:858
-#: jobs/k3bdvdcopyjob.cpp:896
+#: jobs/k3biso9660imagewritingjob.cpp:216
 #, kde-format
-msgid "Writing %1 in incremental mode."
+msgid "Writing copy %1 of %2"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:978
-msgid "Creating Data Image File"
+#: jobs/k3biso9660imagewritingjob.cpp:235
+msgid "Waiting for medium"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:982
-msgid "Writing Data Project"
+#: jobs/k3biso9660imagewritingjob.cpp:342
+msgid "Simulating ISO9660 Image"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:988
-msgid "Writing Multisession Project"
+#: jobs/k3biso9660imagewritingjob.cpp:344
+msgid "Burning ISO9660 Image"
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:1002
+#: jobs/k3biso9660imagewritingjob.cpp:346 jobs/k3bbinimagewritingjob.cpp:212
 #, kde-format
-msgid "ISO9660 Filesystem (Size: %2) - %1 copy"
-msgid_plural "ISO9660 Filesystem (Size: %2) - %1 copies"
+msgid " - %1 Copy"
+msgid_plural " - %1 Copies"
 msgstr[0] ""
 msgstr[1] ""
 
-#: projects/datacd/k3bdatajob.cpp:1007
-#, kde-format
-msgid "ISO9660 Filesystem (Size: %1)"
+#: jobs/k3bverificationjob.cpp:109 jobs/k3bcdcopyjob.cpp:1044
+#: projects/mixedcd/k3bmixedjob.cpp:529
+msgid "Need to reload medium to return to proper state."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:1024 jobs/k3bdvdcopyjob.cpp:935
-#, kde-format
-msgid "Removed image file %1"
+#: jobs/k3bverificationjob.cpp:133 jobs/k3bverificationjob.cpp:363
+#: jobs/k3bdvdcopyjob.cpp:290
+msgid "Unable to determine the ISO9660 filesystem size."
 msgstr ""
 
-#: projects/datacd/k3bdatajob.cpp:1054 jobs/k3bmetawriter.cpp:526
-msgid "Most writers do not support writing multisession CDs in DAO mode."
+#: jobs/k3bverificationjob.cpp:231
+msgid "no tracks added"
 msgstr ""
 
-#: projects/datacd/k3bisooptions.cpp:30
-msgctxt ""
-"This is the default volume identifier of a data project created by K3b. The "
-"string should not be longer than 16 characters to avoid warnings regarding "
-"Joiliet extensions which induce this restriction."
-msgid "K3b data project"
+#: jobs/k3bverificationjob.cpp:230 jobs/k3bverificationjob.cpp:286
+#: jobs/k3bverificationjob.cpp:309
+#, kde-format
+msgid "Internal Error: Verification job improperly initialized (%1)"
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:52
-msgid "Searching previous session"
+#: jobs/k3bverificationjob.cpp:236 jobs/k3bdvdformattingjob.cpp:154
+#: jobs/k3bdvdformattingjob.cpp:155 jobs/k3bdvdbooktypejob.cpp:129
+#: jobs/k3bdvdbooktypejob.cpp:130
+msgid "Checking medium"
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:56
-#: projects/datacd/k3bmsinfofetcher.cpp:92 projects/k3bcdrdaowriter.cpp:450
-#: projects/videocd/k3bvcdjob.cpp:204 projects/k3bcdrecordwriter.cpp:214
-#: projects/k3bgrowisofswriter.cpp:156 jobs/k3bdvdbooktypejob.cpp:288
-#: jobs/k3bdvdformattingjob.cpp:464 jobs/k3bcdda2wavreader.cpp:97
-#: jobs/k3breadcdreader.cpp:106 jobs/k3bclonejob.cpp:88
-#, kde-format
-msgid "Could not find %1 executable."
+#: jobs/k3bverificationjob.cpp:269 jobs/k3bcdcopyjob.cpp:1101
+#: projects/k3bcdrecordwriter.cpp:750 projects/mixedcd/k3bmixedjob.cpp:564
+msgid "Please reload the medium and press 'ok'"
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:152
-#: projects/datacd/k3bdatamultisessionparameterjob.cpp:252
+#: jobs/k3bverificationjob.cpp:270 jobs/k3bcdcopyjob.cpp:1102
+msgid "Failed to reload the medium"
+msgstr ""
+
+#: jobs/k3bverificationjob.cpp:287 jobs/k3bverificationjob.cpp:310
 #, kde-format
-msgid "Could not open Iso9660 filesystem in %1."
+msgid "specified track number '%1' not found on medium"
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:164
-msgid "Could not determine next writable address."
+#: jobs/k3bverificationjob.cpp:331
+#, kde-format
+msgid "Verifying track %1"
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:180
+#: jobs/k3bverificationjob.cpp:399
 #, kde-format
-msgid "Could not start %1"
+msgid "Written data in track %1 differs from original."
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:210
-msgid "Could not retrieve multisession information from disk."
+#: jobs/k3bverificationjob.cpp:403
+msgid "Written data verified."
 msgstr ""
 
-#: projects/datacd/k3bmsinfofetcher.cpp:211
-msgid "The disk is either empty or not appendable."
+#: jobs/k3bcdda2wavreader.cpp:136 jobs/k3bdvdformattingjob.cpp:505
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:181
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:384 jobs/k3bdvdbooktypejob.cpp:336
+#: projects/k3bcdrecordwriter.cpp:455 projects/k3bcdrdaowriter.cpp:552
+#: projects/k3bgrowisofswriter.cpp:367 projects/videocd/k3bvcdjob.cpp:258
+#: projects/datacd/k3bisoimager.cpp:307 projects/datacd/k3bisoimager.cpp:449
+#, kde-format
+msgid "Could not start %1."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:102
+#: jobs/k3bcdda2wavreader.cpp:241 jobs/k3bdvdformattingjob.cpp:272
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:278
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:480 jobs/k3bdvdbooktypejob.cpp:193
+#: projects/audiocd/k3baudionormalizejob.cpp:186
+#: projects/k3bcdrecordwriter.cpp:913 projects/k3bcdrdaowriter.cpp:756
+#: projects/videocd/k3bvcdjob.cpp:358 projects/datacd/k3bisoimager.cpp:171
 #, kde-format
-msgid "<em>%1</em> renamed to <em>%2</em>"
+msgid "%1 returned an unknown error (code %2)."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:142
+#: jobs/k3bcdda2wavreader.cpp:247 jobs/k3bdvdformattingjob.cpp:280
+#: jobs/k3bdvdbooktypejob.cpp:201
+#: projects/audiocd/k3baudionormalizejob.cpp:198
+#: projects/videocd/k3bvcdjob.cpp:366
 #, kde-format
-msgid ""
-"Some filenames need to be shortened due to the %1 char restriction of the "
-"Joliet extensions. If the Joliet extensions are disabled filenames do not "
-"have to be shortened but long filenames will not be available on Windows "
-"systems."
+msgid "%1 did not exit cleanly."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:148
-#: projects/datacd/k3bdatapreparationjob.cpp:172
-#: projects/datacd/k3bdatapreparationjob.cpp:187
-#: projects/datacd/k3bdatapreparationjob.cpp:209
-#: projects/mixedcd/k3bmixedjob.cpp:191 projects/audiocd/k3baudiojob.cpp:178
-msgid "Warning"
+#: jobs/k3bdvdcopyjob.cpp:122 jobs/k3bcdcopyjob.cpp:162
+msgid "Checking Source Medium"
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:149
-msgid "Shorten Filenames"
+#: jobs/k3bdvdcopyjob.cpp:127
+#, kde-format
+msgid "K3b does not support writing on-the-fly with growisofs %1."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:150
-msgid "Disable Joliet extensions"
+#: jobs/k3bdvdcopyjob.cpp:129
+msgid "Disabling on-the-fly writing."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:167
-#, kde-format
-msgid ""
-"The Joliet extensions (which are needed for long filenames on Windows "
-"systems) restrict the length of the volume descriptor (the name of the "
-"filesystem) to %1 characters. The selected descriptor '%2' is longer than "
-"that. Do you want it to be cut or do you want to go back and change it "
-"manually?"
+#: jobs/k3bdvdcopyjob.cpp:132 jobs/k3bcdcopyjob.cpp:165
+msgid "Waiting for source medium"
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:173
-msgid "Cut volume descriptor in the Joliet tree"
+#: jobs/k3bdvdcopyjob.cpp:144 jobs/k3bcdcopyjob.cpp:175
+msgid "Checking source medium"
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:174
-#: projects/datacd/k3bdatapreparationjob.cpp:189
-#: projects/datacd/k3bdatapreparationjob.cpp:211
-#: projects/mixedcd/k3bmixedjob.cpp:193 projects/audiocd/k3baudiojob.cpp:180
-msgid "Cancel and go back"
+#: jobs/k3bdvdcopyjob.cpp:164
+msgid "No source medium found."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:184
-#: projects/mixedcd/k3bmixedjob.cpp:188 projects/audiocd/k3baudiojob.cpp:175
-msgid ""
-"The following files could not be found. Do you want to remove them from the "
-"project and continue without adding them to the image?"
+#: jobs/k3bdvdcopyjob.cpp:183
+msgid "Found encrypted DVD."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:188
-#: projects/mixedcd/k3bmixedjob.cpp:192 projects/audiocd/k3baudiojob.cpp:179
-msgid "Remove missing files and continue"
+#: jobs/k3bdvdcopyjob.cpp:199
+msgid "Cannot copy encrypted DVDs."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:205
-msgid ""
-"K3b is not able to follow symbolic links to folders after they have been "
-"added to the project. Do you want to continue without writing the symbolic "
-"links to the image?"
+#: jobs/k3bdvdcopyjob.cpp:235
+msgid "The writer does not support writing Double Layer DVDs."
 msgstr ""
 
-#: projects/datacd/k3bdatapreparationjob.cpp:210
-msgid "Discard symbolic links to folders"
+#: jobs/k3bdvdcopyjob.cpp:242
+msgid "This growisofs version does not support writing Double Layer DVDs."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:162
+#: jobs/k3bdvdcopyjob.cpp:259
+msgid "K3b does not support copying multi-session DVD or Blu-ray disks."
+msgstr ""
+
+#: jobs/k3bdvdcopyjob.cpp:282
+msgid "K3b relies on the size saved in the ISO9660 header."
+msgstr ""
+
+#: jobs/k3bdvdcopyjob.cpp:283
 msgid ""
-"Due to a bug in mkisofs <= 1.15a40, K3b is unable to handle filenames that "
-"contain more than one backslash:"
+"This might result in a corrupt copy if the source was mastered with buggy "
+"software."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:171
-#: projects/audiocd/k3baudionormalizejob.cpp:186
-#: projects/k3bcdrdaowriter.cpp:756 projects/videocd/k3bvcdjob.cpp:358
-#: projects/k3bcdrecordwriter.cpp:913 jobs/k3bdvdbooktypejob.cpp:193
-#: jobs/k3bdvdformattingjob.cpp:272
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:278
-#: jobs/k3bcdda2wavreader.cpp:241 jobs/k3bvideodvdtitletranscodingjob.cpp:480
-#, kde-format
-msgid "%1 returned an unknown error (code %2)."
+#: jobs/k3bdvdcopyjob.cpp:299
+msgid "K3b does not support copying DVD-RAM."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:173
-#: projects/audiocd/k3baudionormalizejob.cpp:188
-#: projects/videocd/k3bvcdjob.cpp:360 jobs/k3bdvdbooktypejob.cpp:195
-#: jobs/k3bdvdformattingjob.cpp:274
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:281
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:483
-msgid "Please send me an email with the last output."
+#: jobs/k3bdvdcopyjob.cpp:305
+msgid "Unsupported media type."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:181 projects/k3bcdrdaowriter.cpp:767
-#: projects/k3bcdrecordwriter.cpp:933
+#: jobs/k3bdvdcopyjob.cpp:318 jobs/k3bcdcopyjob.cpp:583
 #, kde-format
-msgid "%1 crashed."
+msgid "Do you want to overwrite %1?"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:307 projects/datacd/k3bisoimager.cpp:449
-#: projects/k3bcdrdaowriter.cpp:552 projects/videocd/k3bvcdjob.cpp:258
-#: projects/k3bcdrecordwriter.cpp:455 projects/k3bgrowisofswriter.cpp:367
-#: jobs/k3bdvdbooktypejob.cpp:336 jobs/k3bdvdformattingjob.cpp:505
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:181
-#: jobs/k3bcdda2wavreader.cpp:136 jobs/k3bvideodvdtitletranscodingjob.cpp:384
-#, kde-format
-msgid "Could not start %1."
+#: jobs/k3bdvdcopyjob.cpp:319 jobs/k3bcdcopyjob.cpp:584
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: jobs/k3bdvdcopyjob.cpp:323 jobs/k3bcdcopyjob.cpp:542
+#: jobs/k3bcdcopyjob.cpp:588
+msgid "Specified an unusable temporary path. Using default."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:372
-msgid "Could not determine size of resulting image file."
+#: jobs/k3bdvdcopyjob.cpp:328 jobs/k3bcdcopyjob.cpp:593
+#, kde-format
+msgid "Writing image file to %1."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:525
-msgid "No volume id specified. Using default."
+#: jobs/k3bdvdcopyjob.cpp:329
+msgid "Reading source medium."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:618
+#: jobs/k3bdvdcopyjob.cpp:344 jobs/k3bcdcopyjob.cpp:319
 #, kde-format
-msgid "Found files bigger than 4 GB. K3b needs at least %1 to continue."
+msgid "Unable to determine free space in temporary folder '%1'."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:626
-msgid ""
-"Found files bigger than 2 GB. These files will only be fully accessible if "
-"mounted with UDF."
+#: jobs/k3bdvdcopyjob.cpp:351 jobs/k3bcdcopyjob.cpp:325
+msgid "Not enough space left in temporary folder."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:637
-msgid "Enabling UDF extension."
+#: jobs/k3bdvdcopyjob.cpp:368 jobs/k3bcdcopyjob.cpp:334
+msgid "Unmounting source medium"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:682
-msgid "Setting iso level to 3 to support files bigger than 4 GB."
+#: jobs/k3bdvdcopyjob.cpp:373
+msgid "Creating image"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:771
-#, kde-format
-msgid "Could not follow link %1 to non-existing file %2. Skipping..."
+#: jobs/k3bdvdcopyjob.cpp:379
+msgid "Simulating copy"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:775
+#: jobs/k3bdvdcopyjob.cpp:381 jobs/k3bdvdcopyjob.cpp:596
+#: jobs/k3bdvdcopyjob.cpp:686 jobs/k3bdvdcopyjob.cpp:746
 #, kde-format
-msgid ""
-"Ignoring link %1 to folder %2. K3b is unable to follow links to folders."
+msgid "Writing copy %1"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:783
-#, kde-format
-msgid "Could not find file %1. Skipping..."
+#: jobs/k3bdvdcopyjob.cpp:383 jobs/k3bdvdcopyjob.cpp:598
+msgid "Writing copy"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:787
-#, kde-format
-msgid "Could not read file %1. Skipping..."
+#: jobs/k3bdvdcopyjob.cpp:573
+msgid "Successfully read source medium."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:837
+#: jobs/k3bdvdcopyjob.cpp:585
+msgid "K3b was unable to eject the source medium. Please do so manually."
+msgstr ""
+
+#: jobs/k3bdvdcopyjob.cpp:646
 #, kde-format
-msgid "Failed to backup boot image file %1"
+msgid "Successfully written copy %1."
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:993 projects/datacd/k3bisoimager.cpp:1003
-#: projects/datacd/k3bisoimager.cpp:1010 projects/datacd/k3bisoimager.cpp:1016
-msgid "Could not write temporary file"
+#: jobs/k3bdvdcopyjob.cpp:669
+#, kde-format
+msgid "Verifying copy %1"
 msgstr ""
 
-#: projects/datacd/k3bisoimager.cpp:997
-msgid "No files to be written."
+#: jobs/k3bdvdcopyjob.cpp:671
+msgid "Verifying copy"
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:62
-#: projects/audiocd/k3baudionormalizejob.cpp:62
-#: projects/k3bcdrdaowriter.cpp:458 projects/videocd/k3bvcdjob.cpp:222
-#: projects/k3bcdrecordwriter.cpp:417 projects/k3bgrowisofswriter.cpp:170
-#: jobs/k3bdvdformattingjob.cpp:471
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:106
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:143
+#: jobs/k3bdvdcopyjob.cpp:791
 #, kde-format
-msgid "Using %1 %2 - Copyright (C) %3"
+msgid "Unsupported media type: %1"
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:73
-msgid "Mkisofs executable not found."
+#: jobs/k3bdvdcopyjob.cpp:817 jobs/k3bdvdcopyjob.cpp:910
+#: projects/datacd/k3bdatajob.cpp:825 projects/datacd/k3bdatajob.cpp:942
+#, kde-format
+msgid ""
+"%1 media do not support write simulation. Do you really want to continue? "
+"The disc will actually be written to."
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:87
+#: jobs/k3bdvdcopyjob.cpp:820 jobs/k3bdvdcopyjob.cpp:913
+#: projects/datacd/k3bdatajob.cpp:828 projects/datacd/k3bdatajob.cpp:945
 #, kde-format
-msgid "Read error from file '%1'"
+msgid "No Simulation with %1"
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:92
-msgid "Used version of mkisofs does not have large file support."
+#: jobs/k3bdvdcopyjob.cpp:826
+msgid "Writing DVD copy"
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:93
-msgid "Files bigger than 2 GB cannot be handled."
+#: jobs/k3bdvdcopyjob.cpp:830
+msgid "Writing mode ignored when writing DVD+R(W) media."
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:106
+#: jobs/k3bdvdcopyjob.cpp:832 jobs/k3bdvdcopyjob.cpp:922
+#: jobs/k3bmetawriter.cpp:854 jobs/k3bmetawriter.cpp:863
+#: projects/datacd/k3bdatajob.cpp:850 projects/datacd/k3bdatajob.cpp:968
 #, kde-format
-msgid "Encountered an incorrectly encoded filename '%1'"
-msgstr ""
-
-#: projects/datacd/k3bmkisofshandler.cpp:108
-msgid ""
-"This may be caused by a system update which changed the local character set."
+msgid "Writing %1."
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:109
+#: jobs/k3bdvdcopyjob.cpp:840 jobs/k3bmetawriter.cpp:506
+#: projects/datacd/k3bdatajob.cpp:858
+#, kde-format
 msgid ""
-"You may use convmv (http://j3e.de/linux/convmv/) to fix the filename "
-"encoding."
+"Your writer (%1 %2) does not support simulation with DVD-R(W) media. Do you "
+"really want to continue? The media will actually be written to."
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:113
-msgid "The boot image has an invalid size."
+#: jobs/k3bdvdcopyjob.cpp:845 jobs/k3bmetawriter.cpp:511
+#: projects/datacd/k3bdatajob.cpp:863
+msgid "No Simulation with DVD-R(W)"
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:117
-msgid "The boot image contains multiple partitions.."
+#: jobs/k3bdvdcopyjob.cpp:866 jobs/k3bmetawriter.cpp:850
+#: projects/datacd/k3bdatajob.cpp:877
+msgid "Writing DVD-RW in restricted overwrite mode."
 msgstr ""
 
-#: projects/datacd/k3bmkisofshandler.cpp:118
-msgid "A hard-disk boot image has to contain a single partition."
+#: jobs/k3bdvdcopyjob.cpp:874
+msgid "Writing DVD-RW in DAO mode."
 msgstr ""
 
-#: projects/datacd/k3bbootitem.cpp:30
-msgid "El Torito Boot image"
+#: jobs/k3bdvdcopyjob.cpp:878
+msgid "Writing DVD-RW in incremental mode."
 msgstr ""
 
-#: projects/datacd/k3bdatamultisessionparameterjob.cpp:91
-msgid "Searching for old session"
+#: jobs/k3bdvdcopyjob.cpp:887 jobs/k3bmetawriter.cpp:443
+#: jobs/k3bmetawriter.cpp:492 projects/datacd/k3bdatajob.cpp:918
+msgid "Restricted Overwrite is not possible with DVD-R media."
 msgstr ""
 
-#: projects/datacd/k3bdatamultisessionparameterjob.cpp:227
+#: jobs/k3bdvdcopyjob.cpp:892 jobs/k3bmetawriter.cpp:856
+#: projects/datacd/k3bdatajob.cpp:894 projects/datacd/k3bdatajob.cpp:911
 #, kde-format
-msgid ""
-"No medium inserted or an empty medium in %1. Cannot continue multisession "
-"disk."
+msgid "Writing %1 in DAO mode."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:211 projects/audiocd/k3baudiojob.cpp:198
-msgid "Please add files to your project first."
+#: jobs/k3bdvdcopyjob.cpp:896 jobs/k3bmetawriter.cpp:858
+#: projects/datacd/k3bdatajob.cpp:920
+#, kde-format
+msgid "Writing %1 in incremental mode."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:246 projects/audiocd/k3baudiojob.cpp:313
-msgid "Determining maximum writing speed"
+#: jobs/k3bdvdcopyjob.cpp:919
+msgid "Writing BD copy"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:277
+#: jobs/k3bdvdcopyjob.cpp:935 projects/datacd/k3bdatajob.cpp:1024
 #, kde-format
-msgid "Creating audio image files in %1"
+msgid "Removed image file %1"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:290 projects/mixedcd/k3bmixedjob.cpp:504
-msgid "Creating audio image files"
+#: jobs/k3bdvdcopyjob.cpp:943
+msgid "Creating Image"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:330 projects/audiocd/k3baudiojob.cpp:361
-msgid "Unable to determine maximum speed for some reason. Ignoring."
+#: jobs/k3bdvdcopyjob.cpp:947
+msgid "Copying DVD or BD On-The-Fly"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:379 projects/audiocd/k3baudiojob.cpp:389
-msgid "Writing canceled."
+#: jobs/k3bdvdcopyjob.cpp:949
+msgid "Copying DVD or BD"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:478
-msgid "Error while creating ISO image."
-msgstr ""
+#: jobs/k3bdvdcopyjob.cpp:956 jobs/k3bcdcopyjob.cpp:1230
+#, kde-format
+msgid "Creating 1 copy"
+msgid_plural "Creating %1 copies"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:493
-msgid "ISO image successfully created."
+#: jobs/k3baudiosessionreadingjob.cpp:142
+msgid "Could not load libcdparanoia."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:529 jobs/k3bverificationjob.cpp:109
-#: jobs/k3bcdcopyjob.cpp:1044
-msgid "Need to reload medium to return to proper state."
+#: jobs/k3baudiosessionreadingjob.cpp:156
+msgid "Error while initializing audio ripping."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:564 projects/k3bcdrecordwriter.cpp:750
-#: jobs/k3bverificationjob.cpp:269 jobs/k3bcdcopyjob.cpp:1101
-msgid "Please reload the medium and press 'ok'"
+#: jobs/k3baudiosessionreadingjob.cpp:243
+#, kde-format
+msgid "Unrecoverable error while ripping track %1."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:565 projects/k3bcdrecordwriter.cpp:751
-msgid "Unable to close the tray"
+#: jobs/k3bdvdformattingjob.cpp:101
+msgid "Formatting disc"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:578 projects/audiocd/k3baudiojob.cpp:451
-msgid "Error while decoding audio tracks."
+#: jobs/k3bdvdformattingjob.cpp:123 jobs/k3bdvdbooktypejob.cpp:103
+msgid "No device set"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:594
-msgid "Audio images successfully created."
+#: jobs/k3bdvdformattingjob.cpp:131 projects/k3bcdrecordwriter.cpp:439
+#: projects/k3bcdrdaowriter.cpp:535 projects/k3bgrowisofswriter.cpp:351
+msgid "Unmounting medium"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:618 projects/audiocd/k3baudiojob.cpp:483
+#: jobs/k3bdvdformattingjob.cpp:144
 #, kde-format
-msgid "Decoding audio track %1 of %2%3"
+msgid ""
+"Please insert a rewritable DVD or Blu-ray medium into drive<p><b>%1 %2 "
+"(%3)</b>."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:638 projects/mixedcd/k3bmixedjob.cpp:679
-#: projects/audiocd/k3baudiojob.cpp:550
-msgid "IO Error"
+#: jobs/k3bdvdformattingjob.cpp:262
+msgid "Formatting successfully completed"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:881 projects/audiocd/k3baudiojob.cpp:591
-#, kde-format
-msgid "Writing track %1 of %2%3"
+#: jobs/k3bdvdformattingjob.cpp:265
+msgid "Do not be concerned with the progress stopping before 100%."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:891
-msgid "ISO9660 data"
+#: jobs/k3bdvdformattingjob.cpp:266
+msgid "The formatting will continue in the background during writing."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:888
-#, kde-format
-msgid "Writing track %1 of %2 (%3)"
+#: jobs/k3bdvdformattingjob.cpp:274
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:281
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:483 jobs/k3bdvdbooktypejob.cpp:195
+#: projects/audiocd/k3baudionormalizejob.cpp:188
+#: projects/videocd/k3bvcdjob.cpp:360 projects/datacd/k3bisoimager.cpp:173
+msgid "Please send me an email with the last output."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:997
-msgid "Simulating second session"
+#: jobs/k3bdvdformattingjob.cpp:291
+msgid "Ejecting medium..."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:999
-#, kde-format
-msgid "Writing second session of copy %1"
+#: jobs/k3bdvdformattingjob.cpp:303 projects/k3babstractwriter.cpp:87
+msgid "Unable to eject medium."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1001
-msgid "Writing second session"
+#: jobs/k3bdvdformattingjob.cpp:322 jobs/k3bdvdbooktypejob.cpp:271
+msgid "Unable to determine media state."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1005
-msgid "Simulating first session"
+#: jobs/k3bdvdformattingjob.cpp:343
+#, kde-format
+msgid "Found %1 medium."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1007
+#: jobs/k3bdvdformattingjob.cpp:347
+msgid "No rewritable DVD or BD medium found. Unable to format."
+msgstr ""
+
+#: jobs/k3bdvdformattingjob.cpp:372 jobs/k3bdvdformattingjob.cpp:422
 #, kde-format
-msgid "Writing first session of copy %1"
+msgid "No need to format %1 media more than once."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1009
-msgid "Writing first session"
+#: jobs/k3bdvdformattingjob.cpp:374 jobs/k3bdvdformattingjob.cpp:424
+msgid "It may simply be overwritten."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1022 projects/audiocd/k3baudiojob.cpp:659
-#: jobs/k3bdvdbooktypejob.cpp:114 jobs/k3bcdcopyjob.cpp:723
-msgid "Waiting for media"
+#: jobs/k3bdvdformattingjob.cpp:377 jobs/k3bdvdformattingjob.cpp:416
+#: jobs/k3bdvdformattingjob.cpp:427
+msgid "Forcing formatting anyway."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1038 projects/k3bgrowisofshandler.cpp:101
-#: projects/k3bcdrecordwriter.cpp:624
-msgid "Trying to write more than the official disk capacity"
+#: jobs/k3bdvdformattingjob.cpp:378
+#, kde-format
+msgid "It is not recommended to force formatting of %1 media."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1041 projects/k3bgrowisofshandler.cpp:238
-#: projects/k3bcdrdaowriter.cpp:883 projects/k3bcdrecordwriter.cpp:835
-msgid "Data does not fit on disk."
+#: jobs/k3bdvdformattingjob.cpp:380
+msgid "After 10-20 reformats the media might become unusable."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1087
-msgid "Creating ISO image file"
+#: jobs/k3bdvdformattingjob.cpp:389
+#, kde-format
+msgid "Formatting %1 medium"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1088 projects/mixedcd/k3bmixedjob.cpp:1089
+#: jobs/k3bdvdformattingjob.cpp:400
 #, kde-format
-msgid "Creating ISO image in %1"
+msgid "Formatted in %1 mode."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1129
-msgid "Removing buffer files."
+#: jobs/k3bdvdformattingjob.cpp:414
+msgid "Media is already empty."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1134
+#: jobs/k3bdvdformattingjob.cpp:441
 #, kde-format
-msgid "Could not delete file %1."
+msgid "Formatting DVD-RW in %1 mode."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1235 projects/audiocd/k3baudiojob.cpp:291
-#: jobs/k3bmetawriter.cpp:457
-msgid "On-the-fly writing with cdrecord < 2.01a13 not supported."
+#: jobs/k3bdvdformattingjob.cpp:448
+msgid ""
+"Unable to determine the current formatting state of the DVD-RW medium."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1241 projects/audiocd/k3baudiojob.cpp:298
-#: jobs/k3bmetawriter.cpp:464
+#: jobs/k3bdvdformattingjob.cpp:471
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:106
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:143
+#: projects/audiocd/k3baudionormalizejob.cpp:62
+#: projects/k3bcdrecordwriter.cpp:417 projects/k3bcdrdaowriter.cpp:458
+#: projects/k3bgrowisofswriter.cpp:170 projects/videocd/k3bvcdjob.cpp:222
+#: projects/datacd/k3bmkisofshandler.cpp:62
 #, kde-format
-msgid "Cdrecord %1 does not support CD-Text writing."
+msgid "Using %1 %2 - Copyright (C) %3"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1244
-msgid "It is not possible to write CD-Text in TAO mode. Try DAO or RAW."
+#: jobs/k3bdvdformattingjob.cpp:510
+msgid "Formatting"
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1276 projects/audiocd/k3baudiojob.cpp:731
-msgid "Normalizing volume levels"
+#: jobs/k3bmetawriter.cpp:304 projects/datacd/k3bdatajob.cpp:783
+#: projects/datacd/k3bdatajob.cpp:806
+#, kde-format
+msgid "Cannot write %1 media using %2. Falling back to default application."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1341
-msgid "Writing Enhanced Audio CD"
+#: jobs/k3bmetawriter.cpp:310
+msgid "DVD and Blu-ray tracks can only be written in MODE1."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1346
-msgid "Writing Mixed Mode CD"
+#: jobs/k3bmetawriter.cpp:329
+msgid ""
+"Missing Blu-ray support in cdrecord and growisofs. Please update the system."
 msgstr ""
 
-#: projects/mixedcd/k3bmixedjob.cpp:1356
-#, kde-format
-msgctxt "%2 is of form XX:YY:ZZ, no pluralization needed"
-msgid "1 track (%2 minutes audio data, %3 ISO9660 data)"
-msgid_plural "%1 tracks (%2 minutes audio data, %3 ISO9660 data)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/mixedcd/k3bmixedjob.cpp:1362
-#: projects/videodvd/k3bvideodvdjob.cpp:69
-#: projects/movixcd/k3bmovixjob.cpp:128 projects/audiocd/k3baudiojob.cpp:862
-#: projects/videocd/k3bvcdjob.cpp:580
-#, kde-format
-msgid " - %1 copy"
-msgid_plural " - %1 copies"
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/k3bgrowisofshandler.cpp:83
-msgid "OPC failed. Please try writing speed 1x."
+#: jobs/k3bmetawriter.cpp:425 projects/audiocd/k3baudiojob.cpp:253
+msgid "Track lengths below 4 seconds violate the Red Book standard."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:88
-msgid "Please try again with writing mode DAO."
+#: jobs/k3bmetawriter.cpp:457 projects/audiocd/k3baudiojob.cpp:291
+#: projects/mixedcd/k3bmixedjob.cpp:1235
+msgid "On-the-fly writing with cdrecord < 2.01a13 not supported."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:124
-msgid "Flushing Cache"
+#: jobs/k3bmetawriter.cpp:464 projects/audiocd/k3baudiojob.cpp:298
+#: projects/mixedcd/k3bmixedjob.cpp:1241
+#, kde-format
+msgid "Cdrecord %1 does not support CD-Text writing."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:125
-msgid "Flushing the cache may take some time."
+#: jobs/k3bmetawriter.cpp:469 jobs/k3bcdcopyjob.cpp:863
+#: projects/audiocd/k3baudiojob.cpp:303
+msgid "It is not possible to write CD-Text in TAO mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:134
-msgid "Closing Track"
+#: jobs/k3bmetawriter.cpp:476 projects/datacd/k3bdatajob.cpp:901
+#, kde-format
+msgid ""
+"Your writer (%1 %2) does not support Incremental Streaming with %3 media. "
+"Multisession will not be possible. Continue anyway?"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:137
-msgid "Closing Disk"
+#: jobs/k3bmetawriter.cpp:481 projects/datacd/k3bdatajob.cpp:906
+msgid "No Incremental Streaming"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:140 projects/k3bgrowisofshandler.cpp:147
-#: projects/k3bgrowisofshandler.cpp:148 projects/k3bcdrecordwriter.cpp:723
-msgid "Closing Session"
+#: jobs/k3bmetawriter.cpp:497
+msgid ""
+"DVD+R(W) media do not support write simulation. Do you really want to "
+"continue? The media will actually be written to."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:143 projects/k3bgrowisofshandler.cpp:144
-msgid "Updating RMA"
+#: jobs/k3bmetawriter.cpp:500
+msgid "No Simulation with DVD+R(W)"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:151
-msgid "Writing Lead-out"
+#: jobs/k3bmetawriter.cpp:526 projects/datacd/k3bdatajob.cpp:1054
+msgid "Most writers do not support writing multisession CDs in DAO mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:152
-msgid "Writing the lead-out may take some time."
+#: jobs/k3bmetawriter.cpp:810
+msgid "Writing CD in Session At Once mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:155
-msgid "Removing reference to lead-out."
+#: jobs/k3bmetawriter.cpp:812
+msgid "Writing CD in Track At Once mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:158
-msgid "Modifying ISO9660 volume descriptor"
+#: jobs/k3bmetawriter.cpp:814
+msgid "Writing CD in Raw mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:165
-msgid "Writing mode Incremental Streaming not available"
+#: jobs/k3bmetawriter.cpp:817
+msgid "Appending session to CD"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:166
-msgid "Engaging DAO"
+#: jobs/k3bmetawriter.cpp:824
+msgid "Writing rewritable CD in Session At Once mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:178
-#, kde-format
-msgid "Writing speed: %1 KB/s (%2x)"
+#: jobs/k3bmetawriter.cpp:826
+msgid "Writing rewritable CD in Track At Once mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:229
-msgid "K3b detected a problem with the medium."
+#: jobs/k3bmetawriter.cpp:828
+msgid "Writing rewritable CD in Raw mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:230
-msgid ""
-"Please try another brand of media, preferably one explicitly recommended by "
-"your writer's vendor."
+#: jobs/k3bmetawriter.cpp:831
+msgid "Appending session to rewritable CD."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:231
-msgid "Report the problem if it persists anyway."
+#: jobs/k3bmetawriter.cpp:838
+msgid "Growing ISO9660 filesystem on DVD+RW."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:236 projects/k3bcdrecordwriter.cpp:833
-msgid "Data did not fit on disk."
+#: jobs/k3bmetawriter.cpp:840 projects/datacd/k3bdatajob.cpp:880
+msgid "Growing ISO9660 filesystem on DVD-RW in restricted overwrite mode."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:242
-msgid "Unable to set writing speed."
+#: jobs/k3bmetawriter.cpp:842
+msgid "Appending session to DVD+R."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:243
-msgid "Please try again with the 'ignore speed' setting."
+#: jobs/k3bmetawriter.cpp:844
+msgid "Appending session to Double Layer DVD+R."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:247
-msgid "Optimum Power Calibration failed."
+#: jobs/k3bmetawriter.cpp:846
+#, kde-format
+msgid "Appending session to %1."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:248
-msgid ""
-"Try adding '-use-the-force-luke=noopc' to the growisofs user parameters in "
-"the K3b settings."
+#: jobs/k3bmetawriter.cpp:852
+msgid "Writing Double Layer DVD+R."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:253
-msgid "Unable to allocate software buffer."
+#: jobs/k3baudiocuefilewritingjob.cpp:113
+msgid "Writing Audio Cue File"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:254
-msgid "This error is caused by the low memorylocked resource limit."
+#: jobs/k3baudiocuefilewritingjob.cpp:196
+msgid "Analysing the audio file failed. Corrupt file?"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:255
-msgid "It can be solved by issuing the command 'ulimit -l unlimited'..."
+#: jobs/k3baudiocuefilewritingjob.cpp:264
+msgid "Analysing the audio file"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:256
-msgid ""
-"...or by lowering the used software buffer size in the advanced K3b settings."
+#: jobs/k3baudiocuefilewritingjob.cpp:265
+#, kde-format
+msgid "Analysing %1"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:260
-msgid "Write error"
+#: jobs/k3baudiocuefilewritingjob.cpp:272
+#, kde-format
+msgid "Unable to handle '%1' due to an unsupported format."
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:276
+#: jobs/k3baudiocuefilewritingjob.cpp:277
 #, kde-format
-msgid "Fatal error at startup: %1"
+msgid "No valid audio cue file: '%1'"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:284
-msgid "Warning at exit: (1)"
+#: jobs/k3bbinimagewritingjob.cpp:60
+msgid "Write Binary Image"
 msgstr ""
 
-#: projects/k3bgrowisofshandler.cpp:285
-msgid "Most likely mkisofs failed in some way."
-msgstr ""
+#: jobs/k3bbinimagewritingjob.cpp:188
+#, kde-format
+msgid "%1 copy successfully created"
+msgid_plural "%1 copies successfully created"
+msgstr[0] ""
+msgstr[1] ""
 
-#: projects/k3bgrowisofshandler.cpp:288
+#: jobs/k3bbinimagewritingjob.cpp:204 jobs/k3bcdcopyjob.cpp:1181
+#: jobs/k3bcdcopyjob.cpp:1183 jobs/k3bcdcopyjob.cpp:1186
+#: jobs/k3bcdcopyjob.cpp:1188
 #, kde-format
-msgid "Fatal error during recording: %1"
+msgid "Writing track %1 of %2"
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdjob.cpp:54
-msgid "Creating Video DVD Image File"
+#: jobs/k3bbinimagewritingjob.cpp:210
+msgid "Writing cue/bin Image"
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdjob.cpp:57
-msgid "Writing Video DVD"
+#: jobs/k3bcdcopyjob.cpp:203
+msgid "K3b does not copy CDs containing multiple data tracks."
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdjob.cpp:67
-#, kde-format
-msgid "ISO9660/Udf Filesystem (Size: %1)"
+#: jobs/k3bcdcopyjob.cpp:207
+msgid "Copying Multisession Data CD."
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdimager.cpp:112
-#: projects/videodvd/k3bvideodvdimager.cpp:118 jobs/k3bcdcopyjob.cpp:553
-#, kde-format
-msgid "Unable to create temporary folder '%1'."
+#: jobs/k3bcdcopyjob.cpp:209
+msgid "Copying Data CD."
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdimager.cpp:124
-#, kde-format
-msgid "Found invalid entry in the VIDEO_TS folder (%1)."
+#: jobs/k3bcdcopyjob.cpp:215
+msgid "K3b can only copy CD-Extra mixed mode CDs."
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdimager.cpp:131
-#, kde-format
-msgid "Unable to link temporary file in folder %1."
+#: jobs/k3bcdcopyjob.cpp:219
+msgid "Copying Enhanced Audio CD (CD-Extra)."
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdimager.cpp:214
-msgid "The project does not contain all necessary Video DVD files."
+#: jobs/k3bcdcopyjob.cpp:224
+msgid "Copying Audio CD."
 msgstr ""
 
-#: projects/videodvd/k3bvideodvdimager.cpp:215
-msgid ""
-"The resulting DVD will most likely not be playable on a Hifi DVD player."
+#: jobs/k3bcdcopyjob.cpp:229
+msgid "The source disk is empty."
 msgstr ""
 
-#: projects/movixcd/k3bmovixdocpreparer.cpp:134
-msgid "Could not find a valid eMovix installation."
+#: jobs/k3bcdcopyjob.cpp:271
+msgid "K3b needs cdrecord 2.01a12 or newer to copy Mode2 data tracks."
 msgstr ""
 
-#: projects/movixcd/k3bmovixdocpreparer.cpp:208
-#: projects/movixcd/k3bmovixprogram.cpp:187
-#: projects/movixcd/k3bmovixprogram.cpp:219
-#: projects/movixcd/k3bmovixprogram.cpp:254
-#: projects/movixcd/k3bmovixprogram.cpp:266
-#: projects/movixcd/k3bmovixprogram.cpp:275
-#: projects/movixcd/k3bmovixprogram.cpp:284
-#: projects/movixcd/k3bmovixprogram.cpp:291
-#: projects/movixcd/k3bmovixprogram.cpp:325
-#: projects/movixcd/k3bmovixprogram.cpp:327
-#: projects/movixcd/k3bmovixprogram.cpp:329
-#: projects/movixcd/k3bmovixprogram.cpp:331
-msgid "default"
-msgstr "rhagosodiad"
+#: jobs/k3bcdcopyjob.cpp:283
+msgid ""
+"You will only be able to copy the first session in raw writing mode. "
+"Continue anyway?"
+msgstr ""
 
-#: projects/movixcd/k3bmovixdocpreparer.cpp:315
-#: projects/movixcd/k3bmovixprogram.cpp:199
-#: projects/movixcd/k3bmovixprogram.cpp:243
-msgid "none"
-msgstr "dim"
+#: jobs/k3bcdcopyjob.cpp:285
+msgid "Multisession CD"
+msgstr "CD aml-sesiwn"
 
-#: projects/movixcd/k3bmovixdoc.cpp:90
-msgid "Enter New Filename"
+#: jobs/k3bcdcopyjob.cpp:290
+msgid "Only copying first session."
 msgstr ""
 
-#: projects/movixcd/k3bmovixdoc.cpp:91
-msgid "A file with that name already exists. Please enter a new name:"
+#: jobs/k3bcdcopyjob.cpp:363
+msgid "Unable to read Table of contents"
 msgstr ""
 
-#: projects/movixcd/k3bmovixdoc.cpp:181
+#: jobs/k3bcdcopyjob.cpp:371
+msgid "Searching CD-TEXT"
+msgstr ""
+
+#: jobs/k3bcdcopyjob.cpp:385
 #, kde-format
-msgid ""
-"Could not rename subtitle file. File with requested name %1 already exists."
+msgid "Found CD-TEXT (%1 - %2)."
 msgstr ""
 
-#: projects/movixcd/k3bmovixjob.cpp:116
-msgid "Writing eMovix Project"
+#: jobs/k3bcdcopyjob.cpp:390
+msgid "Found corrupted CD-TEXT. Ignoring it."
 msgstr ""
 
-#: projects/movixcd/k3bmovixjob.cpp:118
-#, kde-format
-msgid "Writing eMovix Project (%1)"
+#: jobs/k3bcdcopyjob.cpp:395
+msgid "No CD-TEXT found."
 msgstr ""
 
-#: projects/movixcd/k3bmovixjob.cpp:124
-#, kde-format
-msgid "1 file (%2) and about 8 MB eMovix data"
-msgid_plural "%1 files (%2) and about 8 MB eMovix data"
-msgstr[0] ""
-msgstr[1] ""
+#: jobs/k3bcdcopyjob.cpp:406
+msgid "Querying Cddb"
+msgstr ""
 
-#: projects/audiocd/k3baudiocdtracksource.cpp:105
+#: jobs/k3bcdcopyjob.cpp:427
 #, kde-format
-msgid "Please insert Audio CD %1%2"
+msgid "Found Cddb entry (%1 - %2)."
 msgstr ""
 
-#: projects/audiocd/k3baudiocdtracksource.cpp:255
-msgid "CD Track"
+#: jobs/k3bcdcopyjob.cpp:450
+msgid "No Cddb entry found."
 msgstr ""
 
-#: projects/audiocd/k3baudiocdtracksource.cpp:261
+#: jobs/k3bcdcopyjob.cpp:453
 #, kde-format
-msgid "Track %1 from Audio CD %2"
+msgid "Cddb error (%1)."
 msgstr ""
 
-#: projects/audiocd/k3brawaudiodatasource.cpp:82
-msgid "Raw Audio CD Image"
+#: jobs/k3bcdcopyjob.cpp:469
+#, kde-format
+msgid ""
+"Found CD-TEXT (%1 - %2) and Cddb (%3 - %4) entries. Which one should be used "
+"to generate the CD-TEXT on the new CD?"
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:56
-msgid "Could not find normalize-audio executable."
+#: jobs/k3bcdcopyjob.cpp:475
+msgid "CD-TEXT"
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:84
-msgid "Could not start normalize-audio."
+#: jobs/k3bcdcopyjob.cpp:476
+msgid "Use CD-TEXT data"
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:124
-#, kde-format
-msgid "Track %1 is already normalized."
+#: jobs/k3bcdcopyjob.cpp:477
+msgid "Use Cddb entry"
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:130
-#, kde-format
-msgid "Adjusting volume level for track %1 of %2"
+#: jobs/k3bcdcopyjob.cpp:483 projects/k3bcdrecordwriter.cpp:435
+#: projects/k3bcdrdaowriter.cpp:523 projects/k3bgrowisofswriter.cpp:347
+msgid "Preparing write process..."
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:138
+#: jobs/k3bcdcopyjob.cpp:553 projects/videodvd/k3bvideodvdimager.cpp:112
+#: projects/videodvd/k3bvideodvdimager.cpp:118
 #, kde-format
-msgid "Computing level for track %1 of %2"
+msgid "Unable to create temporary folder '%1'."
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:181
-msgid "Successfully normalized all tracks."
+#: jobs/k3bcdcopyjob.cpp:560
+#, kde-format
+msgid "Using temporary folder %1."
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:189
-msgid "Error while normalizing tracks."
+#: jobs/k3bcdcopyjob.cpp:609
+#, kde-format
+msgid "Reading Session %1"
 msgstr ""
 
-#: projects/audiocd/k3baudionormalizejob.cpp:198
-#: projects/videocd/k3bvcdjob.cpp:366 jobs/k3bdvdbooktypejob.cpp:201
-#: jobs/k3bdvdformattingjob.cpp:280 jobs/k3bcdda2wavreader.cpp:247
-#, kde-format
-msgid "%1 did not exit cleanly."
+#: jobs/k3bcdcopyjob.cpp:611
+msgid "Reading Source Medium"
 msgstr ""
 
-#: projects/audiocd/k3baudioimager.cpp:93
+#: jobs/k3bcdcopyjob.cpp:614 jobs/k3bcdcopyjob.cpp:1203
 #, kde-format
-msgid "Unable to seek in track %1."
+msgid "Reading track %1 of %2"
 msgstr ""
 
-#: projects/audiocd/k3baudioimager.cpp:147
+#: jobs/k3bcdcopyjob.cpp:707
 #, kde-format
-msgid "Error while decoding track %1."
+msgid "Simulating Session %1"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:204
-msgid "Unable to write on-the-fly with these audio sources."
+#: jobs/k3bcdcopyjob.cpp:709
+#, kde-format
+msgid "Writing Copy %1 (Session %2)"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:253 jobs/k3bmetawriter.cpp:425
-msgid "Track lengths below 4 seconds violate the Red Book standard."
+#: jobs/k3bcdcopyjob.cpp:711
+#, kde-format
+msgid "Writing Copy (Session %1)"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:303 jobs/k3bmetawriter.cpp:469
-#: jobs/k3bcdcopyjob.cpp:863
-msgid "It is not possible to write CD-Text in TAO mode."
+#: jobs/k3bcdcopyjob.cpp:715 projects/audiocd/k3baudiojob.cpp:652
+#: projects/k3bcdrecordwriter.cpp:463 projects/k3bcdrdaowriter.cpp:565
+#: projects/k3bcdrdaowriter.cpp:583 projects/mixedcd/k3bmixedjob.cpp:1013
+#: projects/k3bgrowisofswriter.cpp:372 projects/datacd/k3bdatajob.cpp:440
+msgid "Simulating"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:348
+#: jobs/k3bcdcopyjob.cpp:717 projects/audiocd/k3baudiojob.cpp:654
+#: projects/mixedcd/k3bmixedjob.cpp:1015 projects/datacd/k3bdatajob.cpp:442
 #, kde-format
-msgid "Creating image files in %1"
+msgid "Writing Copy %1"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:349 projects/videocd/k3bvcdjob.cpp:192
-msgid "Creating image files"
+#: jobs/k3bcdcopyjob.cpp:719
+msgid "Writing Copy"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:459
-msgid "Successfully decoded all tracks."
+#: jobs/k3bcdcopyjob.cpp:723 jobs/k3bdvdbooktypejob.cpp:114
+#: projects/audiocd/k3baudiojob.cpp:659 projects/mixedcd/k3bmixedjob.cpp:1022
+msgid "Waiting for media"
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:501
-msgid "IO Error. Most likely no space left on harddisk."
+#: jobs/k3bcdcopyjob.cpp:982
+#, kde-format
+msgid "Successfully read session %1."
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:697 jobs/k3bcdcopyjob.cpp:1116
-msgid "Removing temporary files."
+#: jobs/k3bcdcopyjob.cpp:984
+msgid "Successfully read source disk."
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:848
-msgid "Writing Audio CD"
+#: jobs/k3bcdcopyjob.cpp:999
+msgid "K3b was unable to eject the source disk. Please do so manually."
 msgstr ""
 
-#: projects/audiocd/k3baudiojob.cpp:858
+#: jobs/k3bcdcopyjob.cpp:1016
 #, kde-format
-msgctxt "%2 is of form XX:YY:ZZ, no pluralization needed"
-msgid "1 track (%2 minutes)"
-msgid_plural "%1 tracks (%2 minutes)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Error while reading session %1."
+msgstr ""
 
-#: projects/audiocd/k3baudiozerodata.cpp:59
-msgid "Silence"
+#: jobs/k3bcdcopyjob.cpp:1045
+msgid "Reloading the medium"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:269
-#, kde-format
-msgid "Cdrdao %1 does not support disabling burnfree."
+#: jobs/k3bcdcopyjob.cpp:1063 projects/audiocd/k3baudiojob.cpp:421
+#: projects/mixedcd/k3bmixedjob.cpp:543 projects/videocd/k3bvcdjob.cpp:506
+#: projects/datacd/k3bdatajob.cpp:533
+msgid "K3b was unable to eject the written disk. Please do so manually."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:274 projects/k3bcdrecordwriter.cpp:317
-msgid "'Force unsafe operations' enabled."
+#: jobs/k3bcdcopyjob.cpp:1116 projects/audiocd/k3baudiojob.cpp:697
+msgid "Removing temporary files."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:293
-#, kde-format
-msgid "Cdrdao %1 does not support overburning."
-msgstr ""
-
-#: projects/k3bcdrdaowriter.cpp:494
-msgid "Could not backup tocfile."
-msgstr ""
-
-#: projects/k3bcdrdaowriter.cpp:520
-msgid "Preparing read process..."
+#: jobs/k3bcdcopyjob.cpp:1211
+msgid "Creating CD Image"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:523 projects/k3bcdrecordwriter.cpp:435
-#: projects/k3bgrowisofswriter.cpp:347 jobs/k3bcdcopyjob.cpp:483
-msgid "Preparing write process..."
+#: jobs/k3bcdcopyjob.cpp:1215
+msgid "Simulating CD Copy On-The-Fly"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:526
-msgid "Preparing copy process..."
+#: jobs/k3bcdcopyjob.cpp:1217
+msgid "Simulating CD Copy"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:529
-msgid "Preparing blanking process..."
+#: jobs/k3bcdcopyjob.cpp:1221
+msgid "Copying CD On-The-Fly"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:535 projects/k3bcdrecordwriter.cpp:439
-#: projects/k3bgrowisofswriter.cpp:351 jobs/k3bdvdformattingjob.cpp:131
-msgid "Unmounting medium"
+#: jobs/k3bcdcopyjob.cpp:1223
+msgid "Copying CD"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:563
-#, kde-format, no-c-format
-msgid "Starting DAO simulation at %1x speed..."
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:90
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:127
+#, kde-format
+msgid "%1 executable could not be found."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:570
-#, kde-format, no-c-format
-msgid "Starting DAO writing at %1x speed..."
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:96
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:133
+#, kde-format
+msgid "%1 version %2 is too old."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:575
-msgid "Starting reading..."
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:111
+#, kde-format
+msgid "Analysing Title %1 of Video DVD %2"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:576
-msgid "Reading"
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:185
+#, kde-format
+msgid "Analysing Chapter %1 of %2"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:582
-#, kde-format, no-c-format
-msgid "Starting simulation copy at %1x speed..."
+#: jobs/k3bvideodvdtitledetectclippingjob.cpp:262
+msgid ""
+"Ignoring clipping values of last chapter due to its short playback time."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:588
-#, kde-format, no-c-format
-msgid "Starting copy at %1x speed..."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:159
+#, kde-format
+msgid "Unable to create folder '%1'"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:589
-msgid "Copying"
-msgstr "Copïo"
-
-#: projects/k3bcdrdaowriter.cpp:593
-msgid "Starting blanking..."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:165
+#, kde-format
+msgid "Invalid filename: '%1'"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:594
-msgid "Blanking"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:177
+#, kde-format
+msgid "Transcoding title %1 from Video DVD %2"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:705
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:202
 #, kde-format
-msgid ""
-"Due to a bug in cdrdao the toc/cue file %1 has been deleted. K3b was unable "
-"to restore it from the backup %2."
+msgid "Invalid Video codec set: %1"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:728 projects/k3bcdrecordwriter.cpp:808
-#: projects/k3bgrowisofswriter.cpp:527
-msgid "Simulation successfully completed"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:225
+#, kde-format
+msgid "Invalid Audio codec set: %1"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:733
-msgid "Reading successfully completed"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:366
+#, kde-format
+msgid "Resizing picture of title %1 to %2x%3"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:736 projects/k3bcdrecordwriter.cpp:810
-#: projects/k3bgrowisofswriter.cpp:529
-msgid "Writing successfully completed"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:389
+msgid "Single-pass Encoding"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:739
-msgid "Copying successfully completed"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:391
+msgid "Two-pass Encoding: First Pass"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:742
-msgid "Blanking successfully completed"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:393
+msgid "Two-pass Encoding: Second Pass"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:748 projects/k3bcdrecordwriter.cpp:814
-#: projects/k3bgrowisofswriter.cpp:522
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:417
 #, kde-format
-msgid "Average overall write speed: %1 KB/s (%2x)"
+msgid "Removing incomplete video file '%1'"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:758
-msgid "Please include the debugging output in your problem report."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:491
+#, kde-format
+msgid "Execution of %1 failed."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:784 projects/k3bcdrecordwriter.cpp:688
-#, kde-format, no-c-format
-msgid "Medium or burner does not support writing at %1x speed"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:492
+msgid "Please consult the debugging output for details."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:786
-#, kde-format, no-c-format
-msgid "Switching down burn speed to %1x"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:523
+msgid "AC3 (Stereo)"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:816
-msgid "Executing Power calibration"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:525
+msgid "AC3 (Pass-through)"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:820
-msgid "Power calibration successful"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:527
+msgid "MPEG1 Layer III"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:821
-msgid "Preparing burn process..."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:538
+msgid "MPEG4 (FFMPEG)"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:825
-msgid "Flushing cache"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:540
+msgid "XviD"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:829
-msgid "Writing CD-Text lead-in..."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:551
+msgid ""
+"FFmpeg is an open-source project trying to support most video and audio "
+"codecs used these days. Its subproject libavcodec forms the basis for "
+"multimedia players such as xine or mplayer."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:833
-msgid "Turning BURN-Proof on"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:555
+msgid ""
+"FFmpeg contains an implementation of the MPEG-4 video encoding standard "
+"which produces high quality results."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:841
-msgid "Found ISRC code"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:558
+msgid ""
+"XviD is a free and open source MPEG-4 video codec. XviD was created by a "
+"group of volunteer programmers after the OpenDivX source was closed in July "
+"2001."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:845
-#, kde-format
-msgid "Found pregap: %1"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:561
+msgid ""
+"XviD features MPEG-4 Advanced Profile settings such as b-frames, global and "
+"quarter pixel motion compensation, lumi masking, trellis quantization, and "
+"H.263, MPEG and custom quantization matrices."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:858
-msgid "No cdrdao driver found."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:565
+msgid ""
+"XviD is a primary competitor of DivX (XviD being DivX spelled backwards). "
+"While DivX is closed source and may only run on Windows, Mac OS and Linux, "
+"XviD is open source and can potentially run on any platform."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:859
-msgid "Please select one manually in the device settings."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:569
+msgid "(Description taken from the Wikipedia article)"
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:860
-msgid "For most current drives this would be 'generic-mmc'."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:579
+msgid ""
+"AC3, better known as Dolby Digital is standardized as ATSC A/52. It contains "
+"up to 6 total channels of sound."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:869
-msgid "Device not ready, waiting."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:584
+msgid ""
+"With this setting K3b will create a two-channel stereo Dolby Digital audio "
+"stream."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:873
-msgid "Cue sheet not accepted."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:588
+msgid ""
+"With this setting K3b will use the Dolby Digital audio stream from the "
+"source DVD without changing it."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:878 projects/k3bcdrecordwriter.cpp:632
-#, kde-format
-msgid "No valid %1 option: %2"
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:590
+msgid "Use this setting to preserve 5.1 channel sound from the DVD."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:885 projects/k3bcdrecordwriter.cpp:837
-msgid "Enable overburning in the advanced K3b settings to burn anyway."
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:592
+msgid ""
+"MPEG1 Layer III is better known as MP3 and is the most used lossy audio "
+"format."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:970
-msgid "Writing leadin "
+#: jobs/k3bvideodvdtitletranscodingjob.cpp:593
+msgid ""
+"With this setting K3b will create a two-channel stereo MPEG1 Layer III audio "
+"stream."
 msgstr ""
 
-#: projects/k3bcdrdaowriter.cpp:976
-msgid "Writing leadout "
+#: jobs/k3breadcdreader.cpp:123
+#, kde-format
+msgid "Using readcd %1 instead of default version for clone support."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:124 projects/videocd/k3bvcdjob.cpp:478
-#, kde-format
-msgid "Removing Binary file %1"
+#: jobs/k3breadcdreader.cpp:130
+msgid "Could not find readcd executable with cloning support."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:134 projects/videocd/k3bvcdjob.cpp:488
+#: jobs/k3breadcdreader.cpp:163 jobs/k3breadcdreader.cpp:164
 #, kde-format
-msgid "Removing Cue file %1"
+msgid "Writing image to %1."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:184
-msgid "Could not write correct XML-file."
+#: jobs/k3breadcdreader.cpp:206
+msgid "Could not start readcd."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:200
-msgid "Creating Cue/Bin files ..."
+#: jobs/k3breadcdreader.cpp:262
+msgid "Cannot read source disk."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:205
+#: jobs/k3breadcdreader.cpp:274
 #, kde-format
-msgid "To create VideoCDs you must install VcdImager Version %1."
+msgid "Retrying from sector %1."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:206 projects/videocd/k3bvcdjob.cpp:215
-msgid ""
-"You can find this on your distribution disks or download it from "
-"http://www.vcdimager.org"
+#: jobs/k3breadcdreader.cpp:289
+#, kde-format
+msgid "Uncorrected error in sector %1"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:214
+#: jobs/k3breadcdreader.cpp:292
 #, kde-format
-msgid "%1 executable too old: need version %2 or greater."
+msgid "Corrected error in sector %1"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:296
+#: jobs/k3breadcdreader.cpp:312
 #, kde-format
-msgid "Scanning video file %1 of %2 (%3)"
+msgid "%1 returned error: %2"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:332
-#, kde-format
-msgid "Creating Image for track %1"
+#: jobs/k3breadcdreader.cpp:317
+msgid "Readcd exited abnormally."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:354
-msgid "Cue/Bin files successfully created."
-msgstr ""
-
-#: projects/videocd/k3bvcdjob.cpp:397
-#, kde-format
-msgid "Writing Copy %1 of %2"
+#: jobs/k3bdvdbooktypejob.cpp:85
+msgid "Changing DVD Booktype"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:523
+#: jobs/k3bdvdbooktypejob.cpp:119
 #, kde-format
-msgid "One or more BCD fields out of range for %1"
-msgstr ""
-
-#: projects/videocd/k3bvcdjob.cpp:526
 msgid ""
-"From now on, scan information data errors will not be reported anymore"
+"Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 "
+"(%3)</b>."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:527
-msgid ""
-"Consider enabling the 'update scan offsets' option, if it is not enabled "
-"already."
+#: jobs/k3bdvdbooktypejob.cpp:189
+msgid "Booktype successfully changed"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:534
-#, kde-format
-msgid "APS' pts seems out of order (actual pts %1, last seen pts %2)"
+#: jobs/k3bdvdbooktypejob.cpp:218
+msgid "Ejecting DVD..."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:535
-msgid "Ignoring this aps"
+#: jobs/k3bdvdbooktypejob.cpp:235
+msgid "Unable to eject media."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:543
-#, kde-format
-msgid "Bad packet at packet #%1 (stream byte offset %2)"
+#: jobs/k3bdvdbooktypejob.cpp:258
+msgid "Cannot change booktype on non-empty DVD+R media."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:550
-#, kde-format
-msgid "The remaining byte of the stream will be ignored."
-msgid_plural "The remaining %1 bytes of the stream will be ignored."
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/videocd/k3bvcdjob.cpp:552
-msgid "An unknown number of remaining stream bytes will be ignored."
+#: jobs/k3bdvdbooktypejob.cpp:266
+msgid "No DVD+R(W) media found."
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:561
-msgid "Writing Video CD (Version 1.1)"
+#: jobs/k3bdvdbooktypejob.cpp:341
+msgid "Changing Booktype"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:563
-msgid "Writing Video CD (Version 2.0)"
-msgstr ""
+#: core/k3bglobals.cpp:360
+msgid "Auto"
+msgstr "Ymysgogol"
 
-#: projects/videocd/k3bvcdjob.cpp:565
-msgid "Writing Super Video CD"
+#: plugin/k3bprojectplugin.cpp:26
+msgctxt "plugin type"
+msgid "Project plugin"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:567
-msgid "Writing High-Quality Video CD"
+#: plugin/k3baudiodecoder.cpp:597
+msgctxt "plugin type"
+msgid "Audio Decoder"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:569
-msgid "Writing Video CD"
+#: plugin/k3baudioencoder.cpp:53
+msgctxt "plugin type"
+msgid "Audio Encoder"
 msgstr ""
 
-#: projects/videocd/k3bvcdjob.cpp:576
-#, kde-format
-msgid "1 MPEG (%2)"
-msgid_plural "%1 MPEGs (%2)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/videocd/k3bvcddoc.cpp:214
-msgid "VCD"
+#: plugin/k3baudioencoder.cpp:162
+msgid "An unknown error occurred."
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:211 projects/videocd/k3bvcddoc.cpp:221
+#: plugin/k3bpluginmanager.cpp:195
 #, kde-format
-msgid ""
-"K3b will create a %1 image from the given MPEG files, but these files must "
-"already be in %1 format. K3b does not yet resample MPEG files."
+msgid "No settings available for plugin %1."
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:215 projects/videocd/k3bvcddoc.cpp:228
-#: projects/videocd/k3bvcddoc.cpp:257
-msgid "Information"
+#: videodvd/k3bvideodvd.cpp:288
+msgid "AC3"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:224
-msgid "SVCD"
+#: videodvd/k3bvideodvd.cpp:290
+msgid "MPEG1"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:226
-msgid ""
-"Note: Forcing MPEG2 as VCD is not supported by some standalone DVD players."
+#: videodvd/k3bvideodvd.cpp:292
+msgid "MPEG2 Extended"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:229
-msgid "Force VCD"
+#: videodvd/k3bvideodvd.cpp:294
+msgid "LPCM"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:230
-msgid "Do not force VCD"
+#: videodvd/k3bvideodvd.cpp:296
+msgid "DTS"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:243
-msgid ""
-"You cannot mix MPEG1 and MPEG2 video files.\n"
-"Please start a new Project for this filetype.\n"
-"Resample not implemented in K3b yet."
+#: videodvd/k3bvideodvd.cpp:298
+msgid "unknown audio format"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:244
-msgid "Wrong File Type for This Project"
+#: videodvd/k3bvideodvd.cpp:307 videodvd/k3bvideodvd.cpp:339
+#: projects/videocd/k3bvcdtrack.cpp:227
+msgid "Unspecified"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:255
-msgid ""
-"PBC (Playback control) enabled.\n"
-"Videoplayers can not reach Segments (Mpeg Still Pictures) without Playback "
-"control ."
-msgstr ""
+#: videodvd/k3bvideodvd.cpp:309
+msgid "Normal"
+msgstr "Arferol"
 
-#: projects/videocd/k3bvcddoc.cpp:287
-msgid "Only MPEG1 and MPEG2 video files are supported.\n"
+#: videodvd/k3bvideodvd.cpp:311
+msgid "For the visually impaired"
 msgstr ""
 
-#: projects/videocd/k3bvcddoc.cpp:288
-msgid "Wrong File Format"
+#: videodvd/k3bvideodvd.cpp:313
+msgid "Director's comments 1"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:163 projects/videocd/k3bvcdtrack.cpp:173
-#: projects/videocd/k3bvcdtrack.cpp:186 projects/videocd/k3bvcdtrack.cpp:199
-#: projects/videocd/k3bvcdtrack.cpp:234 projects/videocd/k3bvcdtrack.cpp:262
-#: projects/videocd/k3bvcdtrack.cpp:275 projects/videocd/k3bvcdtrack.cpp:288
-#: projects/videocd/k3bvcdtrack.cpp:301 projects/videocd/k3bvcdtrack.cpp:313
-#: projects/videocd/k3bvcdtrack.cpp:330 projects/videocd/k3bvcdtrack.cpp:352
-#: projects/videocd/k3bvcdtrack.cpp:415
-msgid "n/a"
-msgstr "amherthnasol"
-
-#: projects/videocd/k3bvcdtrack.cpp:194 projects/videocd/k3bvcdtrack.cpp:283
-#, kde-format
-msgid "1 bit/s"
-msgid_plural "%1 bits/s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: projects/videocd/k3bvcdtrack.cpp:211
-msgid "Component"
+#: videodvd/k3bvideodvd.cpp:315
+msgid "Director's comments 2"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:227 videodvd/k3bvideodvd.cpp:307
-#: videodvd/k3bvideodvd.cpp:339
-msgid "Unspecified"
+#: videodvd/k3bvideodvd.cpp:317
+msgid "unknown audio code extension"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:296
-#, kde-format
-msgid "%1 Hz"
+#: videodvd/k3bvideodvd.cpp:326
+msgid "RLE"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:323 projects/videocd/k3bvcdtrack.cpp:325
-msgid "original"
-msgstr "gwreiddiol"
-
-#: projects/videocd/k3bvcdtrack.cpp:323 projects/videocd/k3bvcdtrack.cpp:325
-msgid "duplicate"
-msgstr "dyblyg"
-
-#: projects/videocd/k3bvcdtrack.cpp:339
-msgid "Motion Picture"
+#: videodvd/k3bvideodvd.cpp:328
+msgid "Extended"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:341
-msgid "Still Picture"
+#: videodvd/k3bvideodvd.cpp:330
+msgid "unknown coding mode"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:348
-#, kde-format
-msgid "Layer %1"
-msgstr "Haen %1"
-
-#: projects/videocd/k3bvcdtrack.cpp:382
-msgid "unknown"
-msgstr "anhysbys"
-
-#: projects/videocd/k3bvcdtrack.cpp:383
-msgid "invalid"
-msgstr "annilys"
-
-#: projects/videocd/k3bvcdtrack.cpp:389
-msgid "stereo"
+#: videodvd/k3bvideodvd.cpp:341
+msgid "Caption with normal size characters"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:390
-msgid "joint stereo"
+#: videodvd/k3bvideodvd.cpp:343
+msgid "Caption with bigger size characters"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:391 projects/videocd/k3bvcdtrack.cpp:396
-msgid "dual channel"
+#: videodvd/k3bvideodvd.cpp:345
+msgid "Caption for children"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:392
-msgid "single channel"
+#: videodvd/k3bvideodvd.cpp:347
+msgid "Closed caption with normal size characters"
 msgstr ""
 
-#: projects/videocd/k3bvcdtrack.cpp:397
-msgid "surround sound"
+#: videodvd/k3bvideodvd.cpp:349
+msgid "Closed caption with bigger size characters"
 msgstr ""
 
-#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:69
-#, kde-format
-msgid "File %1 is empty."
+#: videodvd/k3bvideodvd.cpp:351
+msgid "Closed caption for children"
 msgstr ""
 
-#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:103
-msgid ""
-"This looks like an elementary video stream but a multiplexed program stream "
-"was required."
+#: videodvd/k3bvideodvd.cpp:353
+msgid "Forced caption"
 msgstr ""
 
-#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:108
-msgid ""
-"This looks like an elementary audio stream but a multiplexed program stream "
-"was required."
+#: videodvd/k3bvideodvd.cpp:355
+msgid "Director's comments with normal size characters"
 msgstr ""
 
-#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:113
-msgid ""
-"This looks like a RIFF header but a plain multiplexed program stream was "
-"required."
+#: videodvd/k3bvideodvd.cpp:357
+msgid "Director's comments with bigger size characters"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:248
-#, kde-format
-msgid "Cdrecord version %1 does not support Blu-ray writing."
+#: videodvd/k3bvideodvd.cpp:359
+msgid "Director's comments for children"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:272
-msgid "Writer does not support disk at once (DAO) recording"
+#: videodvd/k3bvideodvd.cpp:361
+msgid "unknown code extension"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:283
-msgid "Writer does not support raw writing."
+#: projects/movixcd/k3bmovixdocpreparer.cpp:134
+msgid "Could not find a valid eMovix installation."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:292
-#, kde-format
-msgid "Cdrecord does not support writing %1 media."
-msgstr ""
+#: projects/movixcd/k3bmovixdocpreparer.cpp:208
+#: projects/movixcd/k3bmovixprogram.cpp:187
+#: projects/movixcd/k3bmovixprogram.cpp:219
+#: projects/movixcd/k3bmovixprogram.cpp:254
+#: projects/movixcd/k3bmovixprogram.cpp:266
+#: projects/movixcd/k3bmovixprogram.cpp:275
+#: projects/movixcd/k3bmovixprogram.cpp:284
+#: projects/movixcd/k3bmovixprogram.cpp:291
+#: projects/movixcd/k3bmovixprogram.cpp:325
+#: projects/movixcd/k3bmovixprogram.cpp:327
+#: projects/movixcd/k3bmovixprogram.cpp:329
+#: projects/movixcd/k3bmovixprogram.cpp:331
+msgid "default"
+msgstr "rhagosodiad"
 
-#: projects/k3bcdrecordwriter.cpp:312
-msgid "Writer does not support buffer underrun free recording (Burnfree)"
+#: projects/movixcd/k3bmovixdocpreparer.cpp:315
+#: projects/movixcd/k3bmovixprogram.cpp:199
+#: projects/movixcd/k3bmovixprogram.cpp:243
+msgid "none"
+msgstr "dim"
+
+#: projects/movixcd/k3bmovixjob.cpp:116
+msgid "Writing eMovix Project"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:351
+#: projects/movixcd/k3bmovixjob.cpp:118
 #, kde-format
-msgid "Failed to write temporary file '%1'"
+msgid "Writing eMovix Project (%1)"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:371
+#: projects/movixcd/k3bmovixjob.cpp:124
 #, kde-format
-msgid "Cdrecord %1 does not support overburning."
+msgid "1 file (%2) and about 8 MB eMovix data"
+msgid_plural "%1 files (%2) and about 8 MB eMovix data"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/movixcd/k3bmovixjob.cpp:128 projects/audiocd/k3baudiojob.cpp:862
+#: projects/mixedcd/k3bmixedjob.cpp:1362
+#: projects/videodvd/k3bvideodvdjob.cpp:69 projects/videocd/k3bvcdjob.cpp:580
+#, kde-format
+msgid " - %1 copy"
+msgid_plural " - %1 copies"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/movixcd/k3bmovixdoc.cpp:90
+msgid "Enter New Filename"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:466
-#, kde-format, no-c-format
-msgid "Starting simulation at %1x speed..."
+#: projects/movixcd/k3bmovixdoc.cpp:91
+msgid "A file with that name already exists. Please enter a new name:"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:468
+#: projects/movixcd/k3bmovixdoc.cpp:181
 #, kde-format
-msgid "Starting %1 simulation at %2x speed..."
+msgid ""
+"Could not rename subtitle file. File with requested name %1 already exists."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:474
-#, kde-format, no-c-format
-msgid "Starting writing at %1x speed..."
+#: projects/audiocd/k3brawaudiodatasource.cpp:82
+msgid "Raw Audio CD Image"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:476
+#: projects/audiocd/k3baudiozerodata.cpp:59
+msgid "Silence"
+msgstr ""
+
+#: projects/audiocd/k3baudiocdtracksource.cpp:105
 #, kde-format
-msgid "Starting %1 writing at %2x speed..."
+msgid "Please insert Audio CD %1%2"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:570 projects/k3bgrowisofswriter.cpp:441
-msgid "Writing data"
+#: projects/audiocd/k3baudiocdtracksource.cpp:255
+msgid "CD Track"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:599
-msgid "DAO (Disk At Once) recording not supported with this writer"
+#: projects/audiocd/k3baudiocdtracksource.cpp:261
+#, kde-format
+msgid "Track %1 from Audio CD %2"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:600
-msgid "Please choose TAO (Track At Once) and try again"
+#: projects/audiocd/k3baudioimager.cpp:93
+#, kde-format
+msgid "Unable to seek in track %1."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:603
-msgid "RAW recording not supported with this writer"
+#: projects/audiocd/k3baudioimager.cpp:109
+#: projects/mixedcd/k3bmixedjob.cpp:1099 projects/datacd/k3bdatajob.cpp:219
+#, kde-format
+msgid "Could not open %1 for writing"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:606
-msgid "Input/output error. Not necessarily serious."
+#: projects/audiocd/k3baudioimager.cpp:147
+#, kde-format
+msgid "Error while decoding track %1."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:615
-msgid "Reloading of medium required"
+#: projects/audiocd/k3baudionormalizejob.cpp:56
+msgid "Could not find normalize-audio executable."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:659
-msgid "Only session 1 will be cloned."
+#: projects/audiocd/k3baudionormalizejob.cpp:84
+msgid "Could not start normalize-audio."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:662
-msgid "Unable to fixate the disk."
+#: projects/audiocd/k3baudionormalizejob.cpp:124
+#, kde-format
+msgid "Track %1 is already normalized."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:692
-#, kde-format, no-c-format
-msgid "Switching burn speed up to %1x"
+#: projects/audiocd/k3baudionormalizejob.cpp:130
+#, kde-format
+msgid "Adjusting volume level for track %1 of %2"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:695
-#, kde-format, no-c-format
-msgid "Switching burn speed down to %1x"
+#: projects/audiocd/k3baudionormalizejob.cpp:138
+#, kde-format
+msgid "Computing level for track %1 of %2"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:707
-msgid "Starting disc write"
+#: projects/audiocd/k3baudionormalizejob.cpp:181
+msgid "Successfully normalized all tracks."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:727
-msgid "Writing Leadin"
+#: projects/audiocd/k3baudionormalizejob.cpp:189
+msgid "Error while normalizing tracks."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:730
-msgid "Writing Leadout"
+#: projects/audiocd/k3baudiojob.cpp:175 projects/mixedcd/k3bmixedjob.cpp:188
+#: projects/datacd/k3bdatapreparationjob.cpp:184
+msgid ""
+"The following files could not be found. Do you want to remove them from the "
+"project and continue without adding them to the image?"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:733
-msgid "Writing pregap"
+#: projects/audiocd/k3baudiojob.cpp:178 projects/mixedcd/k3bmixedjob.cpp:191
+#: projects/datacd/k3bdatapreparationjob.cpp:148
+#: projects/datacd/k3bdatapreparationjob.cpp:172
+#: projects/datacd/k3bdatapreparationjob.cpp:187
+#: projects/datacd/k3bdatapreparationjob.cpp:209
+msgid "Warning"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:736
-msgid "Performing Optimum Power Calibration"
+#: projects/audiocd/k3baudiojob.cpp:179 projects/mixedcd/k3bmixedjob.cpp:192
+#: projects/datacd/k3bdatapreparationjob.cpp:188
+msgid "Remove missing files and continue"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:739
-msgid "Sending CUE sheet"
+#: projects/audiocd/k3baudiojob.cpp:180 projects/mixedcd/k3bmixedjob.cpp:193
+#: projects/datacd/k3bdatapreparationjob.cpp:174
+#: projects/datacd/k3bdatapreparationjob.cpp:189
+#: projects/datacd/k3bdatapreparationjob.cpp:211
+msgid "Cancel and go back"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:742
-msgid "Enabled Burnfree"
+#: projects/audiocd/k3baudiojob.cpp:198 projects/mixedcd/k3bmixedjob.cpp:211
+msgid "Please add files to your project first."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:745
-msgid "Disabled Burnfree"
+#: projects/audiocd/k3baudiojob.cpp:204
+msgid "Unable to write on-the-fly with these audio sources."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:761
-#, kde-format
-msgid "Burnfree was used once."
-msgid_plural "Burnfree was used %1 times."
-msgstr[0] ""
-msgstr[1] ""
+#: projects/audiocd/k3baudiojob.cpp:313 projects/mixedcd/k3bmixedjob.cpp:246
+msgid "Determining maximum writing speed"
+msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:767
+#: projects/audiocd/k3baudiojob.cpp:348
 #, kde-format
-msgid "Buffer was low once."
-msgid_plural "Buffer was low %1 times."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Creating image files in %1"
+msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:806
-msgid "Erasing successfully completed"
+#: projects/audiocd/k3baudiojob.cpp:349 projects/videocd/k3bvcdjob.cpp:192
+msgid "Creating image files"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:844
-#, kde-format
-msgid "%1 could not reserve shared memory segment of requested size."
+#: projects/audiocd/k3baudiojob.cpp:361 projects/mixedcd/k3bmixedjob.cpp:330
+msgid "Unable to determine maximum speed for some reason. Ignoring."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:845
-msgid "Probably you chose a too large buffer size."
+#: projects/audiocd/k3baudiojob.cpp:389 projects/mixedcd/k3bmixedjob.cpp:379
+msgid "Writing canceled."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:848
-msgid "OPC failed. Probably the writer does not like the medium."
+#: projects/audiocd/k3baudiojob.cpp:451 projects/mixedcd/k3bmixedjob.cpp:578
+msgid "Error while decoding audio tracks."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:851
-#, kde-format
-msgid "Unable to set write speed to %1."
+#: projects/audiocd/k3baudiojob.cpp:459
+msgid "Successfully decoded all tracks."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:852
-msgid "Probably this is lower than your writer's lowest writing speed."
+#: projects/audiocd/k3baudiojob.cpp:483 projects/mixedcd/k3bmixedjob.cpp:618
+#, kde-format
+msgid "Decoding audio track %1 of %2%3"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:855
-msgid "Unable to send CUE sheet."
+#: projects/audiocd/k3baudiojob.cpp:501
+msgid "IO Error. Most likely no space left on harddisk."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:857 projects/k3bcdrecordwriter.cpp:898
-#: projects/k3bcdrecordwriter.cpp:918
-msgid "Sometimes using TAO writing mode solves this issue."
+#: projects/audiocd/k3baudiojob.cpp:550 projects/mixedcd/k3bmixedjob.cpp:638
+#: projects/mixedcd/k3bmixedjob.cpp:679
+msgid "IO Error"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:860
-msgid "Unable to open new session."
+#: projects/audiocd/k3baudiojob.cpp:591 projects/mixedcd/k3bmixedjob.cpp:881
+#, kde-format
+msgid "Writing track %1 of %2%3"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:861
-msgid "Probably a problem with the medium."
+#: projects/audiocd/k3baudiojob.cpp:656 projects/k3bcdrecordwriter.cpp:471
+#: projects/k3bcdrdaowriter.cpp:571 projects/k3bgrowisofswriter.cpp:377
+#: projects/datacd/k3bdatajob.cpp:444
+msgid "Writing"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:864
-msgid "The disk might still be readable."
+#: projects/audiocd/k3baudiojob.cpp:731 projects/mixedcd/k3bmixedjob.cpp:1276
+msgid "Normalizing volume levels"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:866
-msgid "Try DAO writing mode."
+#: projects/audiocd/k3baudiojob.cpp:848
+msgid "Writing Audio CD"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:869
+#: projects/audiocd/k3baudiojob.cpp:858
 #, kde-format
-msgid "%1 has no permission to open the device."
+msgctxt "%2 is of form XX:YY:ZZ, no pluralization needed"
+msgid "1 track (%2 minutes)"
+msgid_plural "%1 tracks (%2 minutes)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/k3babstractwriter.cpp:56
+msgid "Unlocking drive..."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:871
-msgid "You may use K3bsetup to solve this problem."
+#: projects/k3babstractwriter.cpp:70
+msgid "Could not unlock drive."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:875
-msgid "Probably a buffer underrun occurred."
+#: projects/k3babstractwriter.cpp:73
+msgid "Ejecting Medium"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:877
-msgid "Please enable Burnfree or choose a lower burning speed."
+#: projects/k3bcdrecordwriter.cpp:248
+#, kde-format
+msgid "Cdrecord version %1 does not support Blu-ray writing."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:879
-msgid "Please choose a lower burning speed."
+#: projects/k3bcdrecordwriter.cpp:272
+msgid "Writer does not support disk at once (DAO) recording"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:882
-msgid "Found a high-speed medium not suitable for the writer being used."
+#: projects/k3bcdrecordwriter.cpp:283
+msgid "Writer does not support raw writing."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:883 projects/k3bcdrecordwriter.cpp:887
-msgid "Use the 'force unsafe operations' option to ignore this."
+#: projects/k3bcdrecordwriter.cpp:292
+#, kde-format
+msgid "Cdrecord does not support writing %1 media."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:886
-msgid "Found a low-speed medium not suitable for the writer being used."
-msgstr ""
-
-#: projects/k3bcdrecordwriter.cpp:890
-msgid "Most likely the burning failed due to low-quality media."
-msgstr ""
-
-#: projects/k3bcdrecordwriter.cpp:893
-msgid ""
-"Another application is blocking the device (most likely automounting)."
+#: projects/k3bcdrecordwriter.cpp:312
+msgid "Writer does not support buffer underrun free recording (Burnfree)"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:896
-msgid "A write error occurred."
+#: projects/k3bcdrecordwriter.cpp:317 projects/k3bcdrdaowriter.cpp:274
+msgid "'Force unsafe operations' enabled."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:901
-msgid "Some drives do not support all erase types."
+#: projects/k3bcdrecordwriter.cpp:351
+#, kde-format
+msgid "Failed to write temporary file '%1'"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:902
-msgid "Try again using 'Complete' erasing."
+#: projects/k3bcdrecordwriter.cpp:371
+#, kde-format
+msgid "Cdrecord %1 does not support overburning."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:909
-msgid ""
-"Since kernel version 2.6.8 cdrecord cannot use SCSI transport when running "
-"suid root anymore."
+#: projects/k3bcdrecordwriter.cpp:466
+#, kde-format, no-c-format
+msgid "Starting simulation at %1x speed..."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:910
-msgid ""
-"You may use K3b::Setup to solve this problem or remove the suid bit manually."
+#: projects/k3bcdrecordwriter.cpp:468
+#, kde-format
+msgid "Starting %1 simulation at %2x speed..."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:921
-msgid "If you are running an unpatched cdrecord version..."
+#: projects/k3bcdrecordwriter.cpp:474
+#, kde-format, no-c-format
+msgid "Starting writing at %1x speed..."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:922
-msgid "...and this error also occurs with high quality media..."
+#: projects/k3bcdrecordwriter.cpp:476
+#, kde-format
+msgid "Starting %1 writing at %2x speed..."
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:923
-msgid "...and the K3b FAQ does not help you..."
+#: projects/k3bcdrecordwriter.cpp:570 projects/k3bgrowisofswriter.cpp:441
+msgid "Writing data"
 msgstr ""
 
-#: projects/k3bcdrecordwriter.cpp:924
-msgid "...please include the debugging output in your problem report."
+#: projects/k3bcdrecordwriter.cpp:599
+msgid "DAO (Disk At Once) recording not supported with this writer"
 msgstr ""
 
-#: projects/k3bgrowisofswriter.cpp:161
-#, kde-format
-msgid "Growisofs version %1 is too old. K3b needs at least version 5.10."
+#: projects/k3bcdrecordwriter.cpp:600
+msgid "Please choose TAO (Track At Once) and try again"
 msgstr ""
 
-#: projects/k3bgrowisofswriter.cpp:175
-#, kde-format
-msgid ""
-"Growisofs version %1 does not feature a software buffer which may result in "
-"an unstable burn process."
+#: projects/k3bcdrecordwriter.cpp:603
+msgid "RAW recording not supported with this writer"
 msgstr ""
 
-#: projects/k3bgrowisofswriter.cpp:228
-#, kde-format
-msgid "Could not open file %1."
-msgstr "Methwyd agor y ffeil %1."
-
-#: projects/k3bgrowisofswriter.cpp:373
-msgid "Starting simulation..."
+#: projects/k3bcdrecordwriter.cpp:606
+msgid "Input/output error. Not necessarily serious."
 msgstr ""
 
-#: projects/k3bgrowisofswriter.cpp:378
-msgid "Starting disc write..."
+#: projects/k3bcdrecordwriter.cpp:615
+msgid "Reloading of medium required"
 msgstr ""
 
-#: core/k3bglobals.cpp:360
-msgid "Auto"
-msgstr "Ymysgogol"
-
-#: tools/k3bmediacache.cpp:139 tools/k3bmediacache.cpp:379
-msgid "CDDB Lookup"
+#: projects/k3bcdrecordwriter.cpp:624 projects/mixedcd/k3bmixedjob.cpp:1038
+#: projects/k3bgrowisofshandler.cpp:101
+msgid "Trying to write more than the official disk capacity"
 msgstr ""
 
-#: tools/k3bmd5job.cpp:94
+#: projects/k3bcdrecordwriter.cpp:632 projects/k3bcdrdaowriter.cpp:878
 #, kde-format
-msgid "Could not find file %1"
+msgid "No valid %1 option: %2"
 msgstr ""
 
-#: tools/k3bmd5job.cpp:239
-#, kde-format
-msgid "Error while reading from file %1"
+#: projects/k3bcdrecordwriter.cpp:659
+msgid "Only session 1 will be cloned."
 msgstr ""
 
-#: tools/k3bdeviceselectiondialog.cpp:45
-msgid "Device Selection"
+#: projects/k3bcdrecordwriter.cpp:662
+msgid "Unable to fixate the disk."
 msgstr ""
 
-#: tools/k3bdeviceselectiondialog.cpp:51
-msgid "Please select a device:"
+#: projects/k3bcdrecordwriter.cpp:688 projects/k3bcdrdaowriter.cpp:784
+#, kde-format, no-c-format
+msgid "Medium or burner does not support writing at %1x speed"
 msgstr ""
 
-#: tools/k3bmedium.cpp:322
-msgid "Audio CD"
+#: projects/k3bcdrecordwriter.cpp:692
+#, kde-format, no-c-format
+msgid "Switching burn speed up to %1x"
 msgstr ""
 
-#: tools/k3bmedium.cpp:325
-msgid "Mixed CD"
+#: projects/k3bcdrecordwriter.cpp:695
+#, kde-format, no-c-format
+msgid "Switching burn speed down to %1x"
 msgstr ""
 
-#: tools/k3bmedium.cpp:329
-msgid "Video DVD"
+#: projects/k3bcdrecordwriter.cpp:707
+msgid "Starting disc write"
 msgstr ""
 
-#: tools/k3bmedium.cpp:332
-msgid "Video CD"
+#: projects/k3bcdrecordwriter.cpp:723 projects/k3bgrowisofshandler.cpp:140
+#: projects/k3bgrowisofshandler.cpp:147 projects/k3bgrowisofshandler.cpp:148
+msgid "Closing Session"
 msgstr ""
 
-#: tools/k3bmedium.cpp:335
-#, kde-format
-msgid "Appendable Data %1"
+#: projects/k3bcdrecordwriter.cpp:727
+msgid "Writing Leadin"
 msgstr ""
 
-#: tools/k3bmedium.cpp:338
-#, kde-format
-msgid "Complete Data %1"
+#: projects/k3bcdrecordwriter.cpp:730
+msgid "Writing Leadout"
 msgstr ""
 
-#: tools/k3bmedium.cpp:342
-msgid "Empty"
+#: projects/k3bcdrecordwriter.cpp:733
+msgid "Writing pregap"
 msgstr ""
 
-#: tools/k3bmedium.cpp:355
-msgid "No medium information"
+#: projects/k3bcdrecordwriter.cpp:736
+msgid "Performing Optimum Power Calibration"
 msgstr ""
 
-#: tools/k3bmedium.cpp:359
-msgid "No medium present"
+#: projects/k3bcdrecordwriter.cpp:739
+msgid "Sending CUE sheet"
 msgstr ""
 
-#: tools/k3bmedium.cpp:363
-#, kde-format
-msgid "Empty %1 medium"
+#: projects/k3bcdrecordwriter.cpp:742
+msgid "Enabled Burnfree"
 msgstr ""
 
-#: tools/k3bmedium.cpp:404
-#, kde-format
-msgid "Appendable %1 medium"
+#: projects/k3bcdrecordwriter.cpp:745
+msgid "Disabled Burnfree"
 msgstr ""
 
-#: tools/k3bmedium.cpp:407
-#, kde-format
-msgid "Complete %1 medium"
+#: projects/k3bcdrecordwriter.cpp:751 projects/mixedcd/k3bmixedjob.cpp:565
+msgid "Unable to close the tray"
 msgstr ""
 
-#: tools/k3bmedium.cpp:424
+#: projects/k3bcdrecordwriter.cpp:761
 #, kde-format
-msgid "%1 in 1 track"
-msgid_plural "%1 in %2 tracks"
+msgid "Burnfree was used once."
+msgid_plural "Burnfree was used %1 times."
 msgstr[0] ""
 msgstr[1] ""
 
-#: tools/k3bmedium.cpp:428
+#: projects/k3bcdrecordwriter.cpp:767
 #, kde-format
-msgid " and %1 session"
-msgid_plural " and %1 sessions"
+msgid "Buffer was low once."
+msgid_plural "Buffer was low %1 times."
 msgstr[0] ""
 msgstr[1] ""
 
-#: tools/k3bmedium.cpp:433
-#, kde-format
-msgid "Free space: %1"
+#: projects/k3bcdrecordwriter.cpp:806
+msgid "Erasing successfully completed"
 msgstr ""
 
-#: tools/k3bmedium.cpp:437
-#, kde-format
-msgid "Capacity: %1"
+#: projects/k3bcdrecordwriter.cpp:808 projects/k3bcdrdaowriter.cpp:728
+#: projects/k3bgrowisofswriter.cpp:527
+msgid "Simulation successfully completed"
 msgstr ""
 
-#: tools/k3bmedium.cpp:617
+#: projects/k3bcdrecordwriter.cpp:810 projects/k3bcdrdaowriter.cpp:736
+#: projects/k3bgrowisofswriter.cpp:529
+msgid "Writing successfully completed"
+msgstr ""
+
+#: projects/k3bcdrecordwriter.cpp:814 projects/k3bcdrdaowriter.cpp:748
+#: projects/k3bgrowisofswriter.cpp:522
 #, kde-format
-msgid "Please insert an empty medium into drive<p><b>%1</b>"
+msgid "Average overall write speed: %1 KB/s (%2x)"
 msgstr ""
 
-#: tools/k3bmedium.cpp:619
-msgid "Please insert an empty medium"
+#: projects/k3bcdrecordwriter.cpp:833 projects/k3bgrowisofshandler.cpp:236
+msgid "Data did not fit on disk."
 msgstr ""
 
-#: tools/k3bmedium.cpp:624
-#, kde-format
-msgid "Please insert an empty DVD or Blu-ray medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:835 projects/k3bcdrdaowriter.cpp:883
+#: projects/mixedcd/k3bmixedjob.cpp:1041 projects/k3bgrowisofshandler.cpp:238
+msgid "Data does not fit on disk."
 msgstr ""
 
-#: tools/k3bmedium.cpp:626
-msgid "Please insert an empty DVD or Blu-ray medium"
+#: projects/k3bcdrecordwriter.cpp:837 projects/k3bcdrdaowriter.cpp:885
+msgid "Enable overburning in the advanced K3b settings to burn anyway."
 msgstr ""
 
-#: tools/k3bmedium.cpp:630
+#: projects/k3bcdrecordwriter.cpp:844
 #, kde-format
-msgid "Please insert an empty Blu-ray medium into drive<p><b>%1</b>"
+msgid "%1 could not reserve shared memory segment of requested size."
 msgstr ""
 
-#: tools/k3bmedium.cpp:632
-msgid "Please insert an empty Blu-ray medium"
+#: projects/k3bcdrecordwriter.cpp:845
+msgid "Probably you chose a too large buffer size."
 msgstr ""
 
-#: tools/k3bmedium.cpp:636
+#: projects/k3bcdrecordwriter.cpp:848
+msgid "OPC failed. Probably the writer does not like the medium."
+msgstr ""
+
+#: projects/k3bcdrecordwriter.cpp:851
 #, kde-format
-msgid "Please insert an empty CD medium into drive<p><b>%1</b>"
+msgid "Unable to set write speed to %1."
 msgstr ""
 
-#: tools/k3bmedium.cpp:638
-msgid "Please insert an empty CD medium"
+#: projects/k3bcdrecordwriter.cpp:852
+msgid "Probably this is lower than your writer's lowest writing speed."
 msgstr ""
 
-#: tools/k3bmedium.cpp:642
-#, kde-format
-msgid "Please insert an empty DVD medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:855
+msgid "Unable to send CUE sheet."
 msgstr ""
 
-#: tools/k3bmedium.cpp:644
-msgid "Please insert an empty DVD medium"
+#: projects/k3bcdrecordwriter.cpp:857 projects/k3bcdrecordwriter.cpp:898
+#: projects/k3bcdrecordwriter.cpp:918
+msgid "Sometimes using TAO writing mode solves this issue."
 msgstr ""
 
-#: tools/k3bmedium.cpp:648
-#, kde-format
-msgid "Please insert an empty DVD-DL medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:860
+msgid "Unable to open new session."
 msgstr ""
 
-#: tools/k3bmedium.cpp:650
-msgid "Please insert an empty DVD-DL medium"
+#: projects/k3bcdrecordwriter.cpp:861
+msgid "Probably a problem with the medium."
 msgstr ""
 
-#: tools/k3bmedium.cpp:654
-#, kde-format
-msgid ""
-"Please insert an empty medium of size %1 or larger into drive<p><b>%2</b>"
+#: projects/k3bcdrecordwriter.cpp:864
+msgid "The disk might still be readable."
 msgstr ""
 
-#: tools/k3bmedium.cpp:657
-#, kde-format
-msgid "Please insert an empty medium of size %1 or larger"
+#: projects/k3bcdrecordwriter.cpp:866
+msgid "Try DAO writing mode."
 msgstr ""
 
-#: tools/k3bmedium.cpp:663
+#: projects/k3bcdrecordwriter.cpp:869
 #, kde-format
-msgid "Please insert an empty or appendable medium into drive<p><b>%1</b>"
+msgid "%1 has no permission to open the device."
 msgstr ""
 
-#: tools/k3bmedium.cpp:665
-msgid "Please insert an empty or appendable medium"
+#: projects/k3bcdrecordwriter.cpp:871
+msgid "You may use K3bsetup to solve this problem."
 msgstr ""
 
-#: tools/k3bmedium.cpp:669
-#, kde-format
-msgid ""
-"Please insert an empty or appendable DVD or Blu-ray medium into "
-"drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:875
+msgid "Probably a buffer underrun occurred."
 msgstr ""
 
-#: tools/k3bmedium.cpp:671
-msgid "Please insert an empty or appendable DVD or Blu-ray medium"
+#: projects/k3bcdrecordwriter.cpp:877
+msgid "Please enable Burnfree or choose a lower burning speed."
 msgstr ""
 
-#: tools/k3bmedium.cpp:675
-#, kde-format
-msgid ""
-"Please insert an empty or appendable Blu-ray medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:879
+msgid "Please choose a lower burning speed."
 msgstr ""
 
-#: tools/k3bmedium.cpp:677
-msgid "Please insert an empty or appendable Blu-ray medium"
+#: projects/k3bcdrecordwriter.cpp:882
+msgid "Found a high-speed medium not suitable for the writer being used."
 msgstr ""
 
-#: tools/k3bmedium.cpp:681
-#, kde-format
-msgid "Please insert an empty or appendable CD medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:883 projects/k3bcdrecordwriter.cpp:887
+msgid "Use the 'force unsafe operations' option to ignore this."
 msgstr ""
 
-#: tools/k3bmedium.cpp:683
-msgid "Please insert an empty or appendable CD medium"
+#: projects/k3bcdrecordwriter.cpp:886
+msgid "Found a low-speed medium not suitable for the writer being used."
 msgstr ""
 
-#: tools/k3bmedium.cpp:687
-#, kde-format
+#: projects/k3bcdrecordwriter.cpp:890
+msgid "Most likely the burning failed due to low-quality media."
+msgstr ""
+
+#: projects/k3bcdrecordwriter.cpp:893
 msgid ""
-"Please insert an empty or appendable DVD medium into drive<p><b>%1</b>"
+"Another application is blocking the device (most likely automounting)."
 msgstr ""
 
-#: tools/k3bmedium.cpp:689
-msgid "Please insert an empty or appendable DVD medium"
+#: projects/k3bcdrecordwriter.cpp:896
+msgid "A write error occurred."
 msgstr ""
 
-#: tools/k3bmedium.cpp:693
-#, kde-format
-msgid ""
-"Please insert an empty or appendable DVD-DL medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:901
+msgid "Some drives do not support all erase types."
 msgstr ""
 
-#: tools/k3bmedium.cpp:695
-msgid "Please insert an empty or appendable DVD-DL medium"
+#: projects/k3bcdrecordwriter.cpp:902
+msgid "Try again using 'Complete' erasing."
 msgstr ""
 
-#: tools/k3bmedium.cpp:701
-#, kde-format
-msgid "Please insert a non-empty medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:909
+msgid ""
+"Since kernel version 2.6.8 cdrecord cannot use SCSI transport when running "
+"suid root anymore."
 msgstr ""
 
-#: tools/k3bmedium.cpp:703
-msgid "Please insert a non-empty medium"
+#: projects/k3bcdrecordwriter.cpp:910
+msgid ""
+"You may use K3b::Setup to solve this problem or remove the suid bit manually."
 msgstr ""
 
-#: tools/k3bmedium.cpp:707
-#, kde-format
-msgid "Please insert a non-empty rewritable medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:921
+msgid "If you are running an unpatched cdrecord version..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:709
-msgid "Please insert a non-empty rewritable medium"
+#: projects/k3bcdrecordwriter.cpp:922
+msgid "...and this error also occurs with high quality media..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:715
-#, kde-format
-msgid "Please insert a rewritable medium into drive<p><b>%1</b>"
+#: projects/k3bcdrecordwriter.cpp:923
+msgid "...and the K3b FAQ does not help you..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:717
-msgid "Please insert a rewritable medium"
+#: projects/k3bcdrecordwriter.cpp:924
+msgid "...please include the debugging output in your problem report."
 msgstr ""
 
-#: tools/k3bmedium.cpp:723 tools/k3bmedium.cpp:769
+#: projects/k3bcdrecordwriter.cpp:933 projects/k3bcdrdaowriter.cpp:767
+#: projects/datacd/k3bisoimager.cpp:181
 #, kde-format
-msgid "Please insert a suitable medium into drive<p><b>%1</b>"
+msgid "%1 crashed."
 msgstr ""
 
-#: tools/k3bmedium.cpp:725 tools/k3bmedium.cpp:771
-msgid "Please insert a suitable medium"
+#: projects/k3bcdrdaowriter.cpp:269
+#, kde-format
+msgid "Cdrdao %1 does not support disabling burnfree."
 msgstr ""
 
-#: tools/k3bmedium.cpp:738
+#: projects/k3bcdrdaowriter.cpp:293
 #, kde-format
-msgid "Please insert a Video CD medium into drive<p><b>%1</b>"
+msgid "Cdrdao %1 does not support overburning."
 msgstr ""
 
-#: tools/k3bmedium.cpp:740
-msgid "Please insert a Video CD medium"
+#: projects/k3bcdrdaowriter.cpp:494
+msgid "Could not backup tocfile."
 msgstr ""
 
-#: tools/k3bmedium.cpp:744
-#, kde-format
-msgid "Please insert a Video DVD medium into drive<p><b>%1</b>"
+#: projects/k3bcdrdaowriter.cpp:520
+msgid "Preparing read process..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:746
-msgid "Please insert a Video DVD medium"
+#: projects/k3bcdrdaowriter.cpp:526
+msgid "Preparing copy process..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:750
-#, kde-format
-msgid "Please insert a Mixed Mode CD medium into drive<p><b>%1</b>"
+#: projects/k3bcdrdaowriter.cpp:529
+msgid "Preparing blanking process..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:752
-msgid "Please insert a Mixed Mode CD medium"
+#: projects/k3bcdrdaowriter.cpp:563
+#, kde-format, no-c-format
+msgid "Starting DAO simulation at %1x speed..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:756
-#, kde-format
-msgid "Please insert an Audio CD medium into drive<p><b>%1</b>"
+#: projects/k3bcdrdaowriter.cpp:570
+#, kde-format, no-c-format
+msgid "Starting DAO writing at %1x speed..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:758
-msgid "Please insert an Audio CD medium"
+#: projects/k3bcdrdaowriter.cpp:575
+msgid "Starting reading..."
 msgstr ""
 
-#: tools/k3bmedium.cpp:762
-#, kde-format
-msgid "Please insert a Data medium into drive<p><b>%1</b>"
+#: projects/k3bcdrdaowriter.cpp:576
+msgid "Reading"
 msgstr ""
 
-#: tools/k3bmedium.cpp:764
-msgid "Please insert a Data medium"
+#: projects/k3bcdrdaowriter.cpp:582
+#, kde-format, no-c-format
+msgid "Starting simulation copy at %1x speed..."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:28
-msgid "Simulate"
+#: projects/k3bcdrdaowriter.cpp:588
+#, kde-format, no-c-format
+msgid "Starting copy at %1x speed..."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:29
-msgid ""
-"<p>If this option is checked K3b will perform all writing steps with the "
-"laser turned off.<p>This is useful, for example, to test a higher writing "
-"speed or whether your system is able to write on-the-fly.<p><b>Caution:</b> "
-"DVD+R(W) does not support simulated writing."
-msgstr ""
+#: projects/k3bcdrdaowriter.cpp:589
+msgid "Copying"
+msgstr "Copïo"
 
-#: tools/k3bstdguiitems.cpp:34
-msgid "Only simulate the writing process"
+#: projects/k3bcdrdaowriter.cpp:593
+msgid "Starting blanking..."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:40
-msgid "Disk at once"
+#: projects/k3bcdrdaowriter.cpp:594
+msgid "Blanking"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:41
+#: projects/k3bcdrdaowriter.cpp:705
+#, kde-format
 msgid ""
-"<p>If this option is checked, K3b will write the CD in 'disk at once' mode "
-"as compared to 'track at once' (TAO).<p>It is always recommended to use DAO "
-"where possible.<p><b>Caution:</b> Track pregaps with a length other than 2 "
-"seconds are only supported in DAO mode."
+"Due to a bug in cdrdao the toc/cue file %1 has been deleted. K3b was unable "
+"to restore it from the backup %2."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:46
-msgid "Write in disk at once mode"
+#: projects/k3bcdrdaowriter.cpp:733
+msgid "Reading successfully completed"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:52
-msgid "Use Burnfree"
+#: projects/k3bcdrdaowriter.cpp:739
+msgid "Copying successfully completed"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:53
-msgid "Enable Burnfree (or Just Link) to avoid buffer underruns"
+#: projects/k3bcdrdaowriter.cpp:742
+msgid "Blanking successfully completed"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:54
-msgid ""
-"<p>If this option is checked, K3b enables <em>Burnfree</em> (or <em>Just "
-"Link</em>). This is a feature of the CD writer which avoids buffer "
-"underruns.<p>Without <em>burnfree</em>, if the writer cannot get any more "
-"data a buffer underrun would occur, since the writer needs a constant stream "
-"of data to write the CD.<p>With <em>burnfree</em> the writer can "
-"<em>mark</em> the current position of the laser and get back to it when the "
-"buffer is filled again; but, since this means having little data gaps on the "
-"CD, <b>it is highly recommended to always choose an appropriate writing "
-"speed to prevent the usage of burnfree, especially for audio CDs</b> (in the "
-"worst case one would hear the gap).<p><em>Burnfree</em> was formerly known "
-"as <em>Burnproof</em>, but has since been renamed when it became part of the "
-"MMC standard."
+#: projects/k3bcdrdaowriter.cpp:758
+msgid "Please include the debugging output in your problem report."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:73
-msgid "Only create image"
+#: projects/k3bcdrdaowriter.cpp:786
+#, kde-format, no-c-format
+msgid "Switching down burn speed to %1x"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:74
-msgid ""
-"<p>If this option is checked, K3b will only create an image and not do any "
-"actual writing.<p>The image can later be written to a CD/DVD with most "
-"current writing programs (including K3b of course)."
+#: projects/k3bcdrdaowriter.cpp:816
+msgid "Executing Power calibration"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:78
-msgid "Only create an image"
+#: projects/k3bcdrdaowriter.cpp:820
+msgid "Power calibration successful"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:84
-msgid "Create image"
+#: projects/k3bcdrdaowriter.cpp:821
+msgid "Preparing burn process..."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:85
-msgid ""
-"<p>If this option is checked, K3b will create an image before writing the "
-"files to the CD/DVD. Otherwise the data will be written <em>on-the-fly</em>, "
-"i.e. no intermediate image will be created.<p><b>Caution:</b> Although "
-"writing on-the-fly should work on most systems, make sure the data is sent "
-"to the writer fast enough."
+#: projects/k3bcdrdaowriter.cpp:825
+msgid "Flushing cache"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:90 tools/k3bstdguiitems.cpp:112
-msgid "<p>It is recommended to try a simulation first."
+#: projects/k3bcdrdaowriter.cpp:829
+msgid "Writing CD-Text lead-in..."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:91
-msgid "Cache the data to be written on the harddisk"
+#: projects/k3bcdrdaowriter.cpp:833
+msgid "Turning BURN-Proof on"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:97
-msgid "Remove image"
-msgstr "Gwaredu Delwedd"
+#: projects/k3bcdrdaowriter.cpp:841
+msgid "Found ISRC code"
+msgstr ""
 
-#: tools/k3bstdguiitems.cpp:98
-msgid ""
-"<p>If this option is checked, K3b will remove any created images after the "
-"writing has finished.<p>Uncheck this if you want to keep the images."
+#: projects/k3bcdrdaowriter.cpp:845
+#, kde-format
+msgid "Found pregap: %1"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:101
-msgid "Remove images from disk when finished"
+#: projects/k3bcdrdaowriter.cpp:858
+msgid "No cdrdao driver found."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:107
-msgid "On the fly"
+#: projects/k3bcdrdaowriter.cpp:859
+msgid "Please select one manually in the device settings."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:108
-msgid ""
-"<p>If this option is checked, K3b will not create an image first but write "
-"the files directly to the CD/DVD.<p><b>Caution:</b> Although this should "
-"work on most systems, make sure the data is sent to the writer fast enough."
+#: projects/k3bcdrdaowriter.cpp:860
+msgid "For most current drives this would be 'generic-mmc'."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:113
-msgid "Write files directly to CD/DVD without creating an image"
+#: projects/k3bcdrdaowriter.cpp:869
+msgid "Device not ready, waiting."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:119
-msgid "Write CD-TEXT"
+#: projects/k3bcdrdaowriter.cpp:873
+msgid "Cue sheet not accepted."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:120
-msgid "Create CD-TEXT entries"
+#: projects/k3bcdrdaowriter.cpp:970
+msgid "Writing leadin "
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:121
-msgid ""
-"<p>If this option is checked K3b uses some otherwise-unused space on the "
-"audio CD to store additional information, such as the artist's name, or the "
-"CD title.<p>CD-TEXT is an extension to the audio CD standard introduced by "
-"Sony.<p>CD-TEXT will only be usable on CD players that support this "
-"extension (mostly car CD players).<p>Since a CD-TEXT-enhanced CD will work "
-"in any CD player it is never a bad idea to enable this (if you specify CD-"
-"TEXT data.)"
+#: projects/k3bcdrdaowriter.cpp:976
+msgid "Writing leadout "
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:140
-msgid "Set the paranoia level for reading audio CDs"
+#: projects/mixedcd/k3bmixedjob.cpp:277
+#, kde-format
+msgid "Creating audio image files in %1"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:141
-msgid ""
-"<p>Sets the correction mode for digital audio extraction.<ul><li>0: No "
-"checking, data is copied directly from the drive. <li>1: Perform overlapped "
-"reading to avoid jitter.</li><li>2: Like 1 but with additional checks of the "
-"read audio data.</li><li>3: Like 2 but with additional scratch detection and "
-"repair.</li></ul><p><b>The extraction speed reduces from 0 to 3.</b>"
+#: projects/mixedcd/k3bmixedjob.cpp:290 projects/mixedcd/k3bmixedjob.cpp:504
+msgid "Creating audio image files"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:153
-msgid "Start multisession CD"
+#: projects/mixedcd/k3bmixedjob.cpp:478
+msgid "Error while creating ISO image."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:154
-msgid "Do not close the disk to allow additional sessions to be added later"
+#: projects/mixedcd/k3bmixedjob.cpp:493
+msgid "ISO image successfully created."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:155
-msgid ""
-"<p>If this option is checked K3b will not close the CD, and will write a "
-"temporary table of contents.</p><p>This allows further sessions to be "
-"appended to the CD later.</p>"
+#: projects/mixedcd/k3bmixedjob.cpp:594
+msgid "Audio images successfully created."
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:164
-msgid "Normalize volume levels"
+#: projects/mixedcd/k3bmixedjob.cpp:891
+msgid "ISO9660 data"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:165
-msgid "Adjust the volume levels of all tracks"
+#: projects/mixedcd/k3bmixedjob.cpp:888
+#, kde-format
+msgid "Writing track %1 of %2 (%3)"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:166
-msgid ""
-"<p>If this option is checked K3b will adjust the volume of all tracks to a "
-"standard level. This is useful for things like creating mixes, where "
-"different recording levels on different albums can cause the volume to vary "
-"greatly from song to song.<p><b>Be aware that K3b currently does not support "
-"normalizing when writing on the fly.</b>"
+#: projects/mixedcd/k3bmixedjob.cpp:997
+msgid "Simulating second session"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:178
-msgid "Verify written data"
+#: projects/mixedcd/k3bmixedjob.cpp:999
+#, kde-format
+msgid "Writing second session of copy %1"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:179
-msgid "Compare original with written data"
+#: projects/mixedcd/k3bmixedjob.cpp:1001
+msgid "Writing second session"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:180
-msgid ""
-"<p>If this option is checked, then after successfully writing the disk K3b "
-"will compare the original source data with the written data to verify that "
-"the disk has been written correctly."
+#: projects/mixedcd/k3bmixedjob.cpp:1005
+msgid "Simulating first session"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:190
-msgid "Ignore read errors"
+#: projects/mixedcd/k3bmixedjob.cpp:1007
+#, kde-format
+msgid "Writing first session of copy %1"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:191
-msgid "Skip unreadable audio sectors"
+#: projects/mixedcd/k3bmixedjob.cpp:1009
+msgid "Writing first session"
 msgstr ""
 
-#: tools/k3bstdguiitems.cpp:192
-msgid ""
-"<p>If this option is checked and K3b is not able to read an audio sector "
-"from the source CD it will be replaced with zeros on the resulting "
-"copy.<p>Since audio CD Player are able to interpolate small errors in the "
-"data it is no problem to let K3b skip unreadable sectors."
+#: projects/mixedcd/k3bmixedjob.cpp:1087
+msgid "Creating ISO image file"
 msgstr ""
 
-#: tools/k3bprogressdialog.cpp:85
-msgid "Disk successfully erased. Please reload the disk."
+#: projects/mixedcd/k3bmixedjob.cpp:1088 projects/mixedcd/k3bmixedjob.cpp:1089
+#, kde-format
+msgid "Creating ISO image in %1"
 msgstr ""
 
-#: tools/k3bprogressdialog.cpp:87
-msgid "K3b was unable to erase the disk."
+#: projects/mixedcd/k3bmixedjob.cpp:1129
+msgid "Removing buffer files."
 msgstr ""
 
-#: tools/k3bcddb.cpp:44
-msgid "Multiple CDDB Entries Found"
+#: projects/mixedcd/k3bmixedjob.cpp:1134
+#, kde-format
+msgid "Could not delete file %1."
 msgstr ""
 
-#: tools/k3bcddb.cpp:49
-msgid "K3b found multiple or inexact CDDB entries. Please select one."
+#: projects/mixedcd/k3bmixedjob.cpp:1244
+msgid "It is not possible to write CD-Text in TAO mode. Try DAO or RAW."
 msgstr ""
 
-#: tools/k3bdevicemodel.cpp:138
-msgid "Analyzing medium..."
+#: projects/mixedcd/k3bmixedjob.cpp:1341
+msgid "Writing Enhanced Audio CD"
 msgstr ""
 
-#: plugin/k3bpluginmanager.cpp:195
-#, kde-format
-msgid "No settings available for plugin %1."
+#: projects/mixedcd/k3bmixedjob.cpp:1346
+msgid "Writing Mixed Mode CD"
 msgstr ""
 
-#: plugin/k3baudioencoder.cpp:53
-msgctxt "plugin type"
-msgid "Audio Encoder"
-msgstr ""
+#: projects/mixedcd/k3bmixedjob.cpp:1356
+#, kde-format
+msgctxt "%2 is of form XX:YY:ZZ, no pluralization needed"
+msgid "1 track (%2 minutes audio data, %3 ISO9660 data)"
+msgid_plural "%1 tracks (%2 minutes audio data, %3 ISO9660 data)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: plugin/k3baudioencoder.cpp:162
-msgid "An unknown error occurred."
+#: projects/k3bgrowisofswriter.cpp:161
+#, kde-format
+msgid "Growisofs version %1 is too old. K3b needs at least version 5.10."
 msgstr ""
 
-#: plugin/k3baudiodecoder.cpp:597
-msgctxt "plugin type"
-msgid "Audio Decoder"
+#: projects/k3bgrowisofswriter.cpp:175
+#, kde-format
+msgid ""
+"Growisofs version %1 does not feature a software buffer which may result in "
+"an unstable burn process."
 msgstr ""
 
-#: plugin/k3bprojectplugin.cpp:26
-msgctxt "plugin type"
-msgid "Project plugin"
-msgstr ""
+#: projects/k3bgrowisofswriter.cpp:228
+#, kde-format
+msgid "Could not open file %1."
+msgstr "Methwyd agor y ffeil %1."
 
-#: videodvd/k3bvideodvd.cpp:288
-msgid "AC3"
+#: projects/k3bgrowisofswriter.cpp:373
+msgid "Starting simulation..."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:290
-msgid "MPEG1"
+#: projects/k3bgrowisofswriter.cpp:378
+msgid "Starting disc write..."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:292
-msgid "MPEG2 Extended"
+#: projects/videodvd/k3bvideodvdimager.cpp:124
+#, kde-format
+msgid "Found invalid entry in the VIDEO_TS folder (%1)."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:294
-msgid "LPCM"
+#: projects/videodvd/k3bvideodvdimager.cpp:131
+#, kde-format
+msgid "Unable to link temporary file in folder %1."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:296
-msgid "DTS"
+#: projects/videodvd/k3bvideodvdimager.cpp:214
+msgid "The project does not contain all necessary Video DVD files."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:298
-msgid "unknown audio format"
+#: projects/videodvd/k3bvideodvdimager.cpp:215
+msgid ""
+"The resulting DVD will most likely not be playable on a Hifi DVD player."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:309
-msgid "Normal"
-msgstr "Arferol"
-
-#: videodvd/k3bvideodvd.cpp:311
-msgid "For the visually impaired"
+#: projects/videodvd/k3bvideodvdjob.cpp:54
+msgid "Creating Video DVD Image File"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:313
-msgid "Director's comments 1"
+#: projects/videodvd/k3bvideodvdjob.cpp:57
+msgid "Writing Video DVD"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:315
-msgid "Director's comments 2"
+#: projects/videodvd/k3bvideodvdjob.cpp:67
+#, kde-format
+msgid "ISO9660/Udf Filesystem (Size: %1)"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:317
-msgid "unknown audio code extension"
+#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:69
+#, kde-format
+msgid "File %1 is empty."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:326
-msgid "RLE"
+#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:103
+msgid ""
+"This looks like an elementary video stream but a multiplexed program stream "
+"was required."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:328
-msgid "Extended"
+#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:108
+msgid ""
+"This looks like an elementary audio stream but a multiplexed program stream "
+"was required."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:330
-msgid "unknown coding mode"
+#: projects/videocd/mpeginfo/k3bmpeginfo.cpp:113
+msgid ""
+"This looks like a RIFF header but a plain multiplexed program stream was "
+"required."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:341
-msgid "Caption with normal size characters"
+#: projects/videocd/k3bvcddoc.cpp:214
+msgid "VCD"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:343
-msgid "Caption with bigger size characters"
+#: projects/videocd/k3bvcddoc.cpp:211 projects/videocd/k3bvcddoc.cpp:221
+#, kde-format
+msgid ""
+"K3b will create a %1 image from the given MPEG files, but these files must "
+"already be in %1 format. K3b does not yet resample MPEG files."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:345
-msgid "Caption for children"
+#: projects/videocd/k3bvcddoc.cpp:215 projects/videocd/k3bvcddoc.cpp:228
+#: projects/videocd/k3bvcddoc.cpp:257
+msgid "Information"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:347
-msgid "Closed caption with normal size characters"
+#: projects/videocd/k3bvcddoc.cpp:224
+msgid "SVCD"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:349
-msgid "Closed caption with bigger size characters"
+#: projects/videocd/k3bvcddoc.cpp:226
+msgid ""
+"Note: Forcing MPEG2 as VCD is not supported by some standalone DVD players."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:351
-msgid "Closed caption for children"
+#: projects/videocd/k3bvcddoc.cpp:229
+msgid "Force VCD"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:353
-msgid "Forced caption"
+#: projects/videocd/k3bvcddoc.cpp:230
+msgid "Do not force VCD"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:355
-msgid "Director's comments with normal size characters"
+#: projects/videocd/k3bvcddoc.cpp:243
+msgid ""
+"You cannot mix MPEG1 and MPEG2 video files.\n"
+"Please start a new Project for this filetype.\n"
+"Resample not implemented in K3b yet."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:357
-msgid "Director's comments with bigger size characters"
+#: projects/videocd/k3bvcddoc.cpp:244
+msgid "Wrong File Type for This Project"
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:359
-msgid "Director's comments for children"
+#: projects/videocd/k3bvcddoc.cpp:255
+msgid ""
+"PBC (Playback control) enabled.\n"
+"Videoplayers can not reach Segments (Mpeg Still Pictures) without Playback "
+"control ."
 msgstr ""
 
-#: videodvd/k3bvideodvd.cpp:361
-msgid "unknown code extension"
+#: projects/videocd/k3bvcddoc.cpp:287
+msgid "Only MPEG1 and MPEG2 video files are supported.\n"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:85
-msgid "Changing DVD Booktype"
+#: projects/videocd/k3bvcddoc.cpp:288
+msgid "Wrong File Format"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:103 jobs/k3bdvdformattingjob.cpp:123
-msgid "No device set"
+#: projects/videocd/k3bvcddoc.cpp:416 projects/datacd/k3bdatadoc.cpp:1182
+msgid "Could not find the following files:"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:119
+#: projects/videocd/k3bvcddoc.cpp:417 projects/datacd/k3bdatadoc.cpp:1183
+msgid "Not Found"
+msgstr "Heb ei ganfod"
+
+#: projects/videocd/k3bvcdtrack.cpp:163 projects/videocd/k3bvcdtrack.cpp:173
+#: projects/videocd/k3bvcdtrack.cpp:186 projects/videocd/k3bvcdtrack.cpp:199
+#: projects/videocd/k3bvcdtrack.cpp:234 projects/videocd/k3bvcdtrack.cpp:262
+#: projects/videocd/k3bvcdtrack.cpp:275 projects/videocd/k3bvcdtrack.cpp:288
+#: projects/videocd/k3bvcdtrack.cpp:301 projects/videocd/k3bvcdtrack.cpp:313
+#: projects/videocd/k3bvcdtrack.cpp:330 projects/videocd/k3bvcdtrack.cpp:352
+#: projects/videocd/k3bvcdtrack.cpp:415
+msgid "n/a"
+msgstr "amherthnasol"
+
+#: projects/videocd/k3bvcdtrack.cpp:194 projects/videocd/k3bvcdtrack.cpp:283
 #, kde-format
-msgid ""
-"Please insert an empty DVD+R or a DVD+RW medium into drive<p><b>%1 %2 "
-"(%3)</b>."
-msgstr ""
+msgid "1 bit/s"
+msgid_plural "%1 bits/s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: jobs/k3bdvdbooktypejob.cpp:129 jobs/k3bdvdbooktypejob.cpp:130
-#: jobs/k3bdvdformattingjob.cpp:154 jobs/k3bdvdformattingjob.cpp:155
-#: jobs/k3bverificationjob.cpp:236
-msgid "Checking medium"
+#: projects/videocd/k3bvcdtrack.cpp:211
+msgid "Component"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:189
-msgid "Booktype successfully changed"
+#: projects/videocd/k3bvcdtrack.cpp:296
+#, kde-format
+msgid "%1 Hz"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:218
-msgid "Ejecting DVD..."
-msgstr ""
+#: projects/videocd/k3bvcdtrack.cpp:323 projects/videocd/k3bvcdtrack.cpp:325
+msgid "original"
+msgstr "gwreiddiol"
 
-#: jobs/k3bdvdbooktypejob.cpp:235
-msgid "Unable to eject media."
-msgstr ""
+#: projects/videocd/k3bvcdtrack.cpp:323 projects/videocd/k3bvcdtrack.cpp:325
+msgid "duplicate"
+msgstr "dyblyg"
 
-#: jobs/k3bdvdbooktypejob.cpp:258
-msgid "Cannot change booktype on non-empty DVD+R media."
+#: projects/videocd/k3bvcdtrack.cpp:339
+msgid "Motion Picture"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:266
-msgid "No DVD+R(W) media found."
+#: projects/videocd/k3bvcdtrack.cpp:341
+msgid "Still Picture"
 msgstr ""
 
-#: jobs/k3bdvdbooktypejob.cpp:271 jobs/k3bdvdformattingjob.cpp:322
-msgid "Unable to determine media state."
-msgstr ""
+#: projects/videocd/k3bvcdtrack.cpp:348
+#, kde-format
+msgid "Layer %1"
+msgstr "Haen %1"
 
-#: jobs/k3bdvdbooktypejob.cpp:341
-msgid "Changing Booktype"
-msgstr ""
+#: projects/videocd/k3bvcdtrack.cpp:382
+msgid "unknown"
+msgstr "anhysbys"
 
-#: jobs/k3bdvdformattingjob.cpp:101
-msgid "Formatting disc"
-msgstr ""
+#: projects/videocd/k3bvcdtrack.cpp:383
+msgid "invalid"
+msgstr "annilys"
 
-#: jobs/k3bdvdformattingjob.cpp:108 jobs/k3bblankingjob.cpp:169
-msgid "Quick Format"
+#: projects/videocd/k3bvcdtrack.cpp:389
+msgid "stereo"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:144
-#, kde-format
-msgid ""
-"Please insert a rewritable DVD or Blu-ray medium into drive<p><b>%1 %2 "
-"(%3)</b>."
+#: projects/videocd/k3bvcdtrack.cpp:390
+msgid "joint stereo"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:262
-msgid "Formatting successfully completed"
+#: projects/videocd/k3bvcdtrack.cpp:391 projects/videocd/k3bvcdtrack.cpp:396
+msgid "dual channel"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:265
-msgid "Do not be concerned with the progress stopping before 100%."
+#: projects/videocd/k3bvcdtrack.cpp:392
+msgid "single channel"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:266
-msgid "The formatting will continue in the background during writing."
+#: projects/videocd/k3bvcdtrack.cpp:397
+msgid "surround sound"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:291
-msgid "Ejecting medium..."
+#: projects/videocd/k3bvcdjob.cpp:124 projects/videocd/k3bvcdjob.cpp:478
+#, kde-format
+msgid "Removing Binary file %1"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:343
+#: projects/videocd/k3bvcdjob.cpp:134 projects/videocd/k3bvcdjob.cpp:488
 #, kde-format
-msgid "Found %1 medium."
+msgid "Removing Cue file %1"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:347
-msgid "No rewritable DVD or BD medium found. Unable to format."
+#: projects/videocd/k3bvcdjob.cpp:184
+msgid "Could not write correct XML-file."
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:372 jobs/k3bdvdformattingjob.cpp:422
-#, kde-format
-msgid "No need to format %1 media more than once."
+#: projects/videocd/k3bvcdjob.cpp:200
+msgid "Creating Cue/Bin files ..."
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:374 jobs/k3bdvdformattingjob.cpp:424
-msgid "It may simply be overwritten."
+#: projects/videocd/k3bvcdjob.cpp:205
+#, kde-format
+msgid "To create VideoCDs you must install VcdImager Version %1."
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:377 jobs/k3bdvdformattingjob.cpp:416
-#: jobs/k3bdvdformattingjob.cpp:427
-msgid "Forcing formatting anyway."
+#: projects/videocd/k3bvcdjob.cpp:206 projects/videocd/k3bvcdjob.cpp:215
+msgid ""
+"You can find this on your distribution disks or download it from "
+"http://www.vcdimager.org"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:378
+#: projects/videocd/k3bvcdjob.cpp:214
 #, kde-format
-msgid "It is not recommended to force formatting of %1 media."
+msgid "%1 executable too old: need version %2 or greater."
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:380
-msgid "After 10-20 reformats the media might become unusable."
+#: projects/videocd/k3bvcdjob.cpp:296
+#, kde-format
+msgid "Scanning video file %1 of %2 (%3)"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:389
+#: projects/videocd/k3bvcdjob.cpp:332
 #, kde-format
-msgid "Formatting %1 medium"
+msgid "Creating Image for track %1"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:400
-#, kde-format
-msgid "Formatted in %1 mode."
+#: projects/videocd/k3bvcdjob.cpp:354
+msgid "Cue/Bin files successfully created."
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:414
-msgid "Media is already empty."
+#: projects/videocd/k3bvcdjob.cpp:397
+#, kde-format
+msgid "Writing Copy %1 of %2"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:441
+#: projects/videocd/k3bvcdjob.cpp:523
 #, kde-format
-msgid "Formatting DVD-RW in %1 mode."
+msgid "One or more BCD fields out of range for %1"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:448
+#: projects/videocd/k3bvcdjob.cpp:526
 msgid ""
-"Unable to determine the current formatting state of the DVD-RW medium."
+"From now on, scan information data errors will not be reported anymore"
 msgstr ""
 
-#: jobs/k3bdvdformattingjob.cpp:510
-msgid "Formatting"
+#: projects/videocd/k3bvcdjob.cpp:527
+msgid ""
+"Consider enabling the 'update scan offsets' option, if it is not enabled "
+"already."
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:93
+#: projects/videocd/k3bvcdjob.cpp:534
 #, kde-format
-msgid "Could not find image %1"
-msgstr "Methwyd canfod y ddelwedd %1"
+msgid "APS' pts seems out of order (actual pts %1, last seen pts %2)"
+msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:141
+#: projects/videocd/k3bvcdjob.cpp:535
+msgid "Ignoring this aps"
+msgstr ""
+
+#: projects/videocd/k3bvcdjob.cpp:543
 #, kde-format
-msgid "Verifying written copy %1 of %2"
+msgid "Bad packet at packet #%1 (stream byte offset %2)"
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:155 jobs/k3bdvdcopyjob.cpp:681
-msgid "K3b was unable to eject the written medium. Please do so manually."
+#: projects/videocd/k3bvcdjob.cpp:550
+#, kde-format
+msgid "The remaining byte of the stream will be ignored."
+msgid_plural "The remaining %1 bytes of the stream will be ignored."
+msgstr[0] ""
+msgstr[1] ""
+
+#: projects/videocd/k3bvcdjob.cpp:552
+msgid "An unknown number of remaining stream bytes will be ignored."
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:214
-msgid "Writing image"
+#: projects/videocd/k3bvcdjob.cpp:561
+msgid "Writing Video CD (Version 1.1)"
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:216
-#, kde-format
-msgid "Writing copy %1 of %2"
+#: projects/videocd/k3bvcdjob.cpp:563
+msgid "Writing Video CD (Version 2.0)"
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:235
-msgid "Waiting for medium"
+#: projects/videocd/k3bvcdjob.cpp:565
+msgid "Writing Super Video CD"
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:342
-msgid "Simulating ISO9660 Image"
+#: projects/videocd/k3bvcdjob.cpp:567
+msgid "Writing High-Quality Video CD"
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:344
-msgid "Burning ISO9660 Image"
+#: projects/videocd/k3bvcdjob.cpp:569
+msgid "Writing Video CD"
 msgstr ""
 
-#: jobs/k3biso9660imagewritingjob.cpp:346 jobs/k3bbinimagewritingjob.cpp:212
+#: projects/videocd/k3bvcdjob.cpp:576
 #, kde-format
-msgid " - %1 Copy"
-msgid_plural " - %1 Copies"
+msgid "1 MPEG (%2)"
+msgid_plural "%1 MPEGs (%2)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: jobs/k3baudiosessionreadingjob.cpp:142
-msgid "Could not load libcdparanoia."
+#: projects/k3bgrowisofshandler.cpp:83
+msgid "OPC failed. Please try writing speed 1x."
 msgstr ""
 
-#: jobs/k3baudiosessionreadingjob.cpp:150 jobs/k3bdatatrackreader.cpp:149
-#: jobs/k3bdatatrackreader.cpp:183
-#, kde-format
-msgid "Could not open device %1"
+#: projects/k3bgrowisofshandler.cpp:88
+msgid "Please try again with writing mode DAO."
 msgstr ""
 
-#: jobs/k3baudiosessionreadingjob.cpp:156
-msgid "Error while initializing audio ripping."
+#: projects/k3bgrowisofshandler.cpp:124
+msgid "Flushing Cache"
 msgstr ""
 
-#: jobs/k3baudiosessionreadingjob.cpp:209 jobs/k3bdatatrackreader.cpp:240
-#: jobs/k3bdvdcopyjob.cpp:360
-#, kde-format
-msgid "Unable to open '%1' for writing."
+#: projects/k3bgrowisofshandler.cpp:125
+msgid "Flushing the cache may take some time."
 msgstr ""
 
-#: jobs/k3baudiosessionreadingjob.cpp:243
-#, kde-format
-msgid "Unrecoverable error while ripping track %1."
+#: projects/k3bgrowisofshandler.cpp:134
+msgid "Closing Track"
 msgstr ""
 
-#: jobs/k3baudiocuefilewritingjob.cpp:113
-msgid "Writing Audio Cue File"
+#: projects/k3bgrowisofshandler.cpp:137
+msgid "Closing Disk"
 msgstr ""
 
-#: jobs/k3baudiocuefilewritingjob.cpp:196
-msgid "Analysing the audio file failed. Corrupt file?"
+#: projects/k3bgrowisofshandler.cpp:143 projects/k3bgrowisofshandler.cpp:144
+msgid "Updating RMA"
 msgstr ""
 
-#: jobs/k3baudiocuefilewritingjob.cpp:264
-msgid "Analysing the audio file"
+#: projects/k3bgrowisofshandler.cpp:151
+msgid "Writing Lead-out"
 msgstr ""
 
-#: jobs/k3baudiocuefilewritingjob.cpp:265
-#, kde-format
-msgid "Analysing %1"
+#: projects/k3bgrowisofshandler.cpp:152
+msgid "Writing the lead-out may take some time."
 msgstr ""
 
-#: jobs/k3baudiocuefilewritingjob.cpp:272
-#, kde-format
-msgid "Unable to handle '%1' due to an unsupported format."
+#: projects/k3bgrowisofshandler.cpp:155
+msgid "Removing reference to lead-out."
 msgstr ""
 
-#: jobs/k3baudiocuefilewritingjob.cpp:277
-#, kde-format
-msgid "No valid audio cue file: '%1'"
+#: projects/k3bgrowisofshandler.cpp:158
+msgid "Modifying ISO9660 volume descriptor"
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:310
-msgid "DVD and Blu-ray tracks can only be written in MODE1."
+#: projects/k3bgrowisofshandler.cpp:165
+msgid "Writing mode Incremental Streaming not available"
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:329
-msgid ""
-"Missing Blu-ray support in cdrecord and growisofs. Please update the system."
+#: projects/k3bgrowisofshandler.cpp:166
+msgid "Engaging DAO"
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:497
-msgid ""
-"DVD+R(W) media do not support write simulation. Do you really want to "
-"continue? The media will actually be written to."
+#: projects/k3bgrowisofshandler.cpp:178
+#, kde-format
+msgid "Writing speed: %1 KB/s (%2x)"
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:500
-msgid "No Simulation with DVD+R(W)"
+#: projects/k3bgrowisofshandler.cpp:229
+msgid "K3b detected a problem with the medium."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:810
-msgid "Writing CD in Session At Once mode."
+#: projects/k3bgrowisofshandler.cpp:230
+msgid ""
+"Please try another brand of media, preferably one explicitly recommended by "
+"your writer's vendor."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:812
-msgid "Writing CD in Track At Once mode."
+#: projects/k3bgrowisofshandler.cpp:231
+msgid "Report the problem if it persists anyway."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:814
-msgid "Writing CD in Raw mode."
+#: projects/k3bgrowisofshandler.cpp:242
+msgid "Unable to set writing speed."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:817
-msgid "Appending session to CD"
+#: projects/k3bgrowisofshandler.cpp:243
+msgid "Please try again with the 'ignore speed' setting."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:824
-msgid "Writing rewritable CD in Session At Once mode."
+#: projects/k3bgrowisofshandler.cpp:247
+msgid "Optimum Power Calibration failed."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:826
-msgid "Writing rewritable CD in Track At Once mode."
+#: projects/k3bgrowisofshandler.cpp:248
+msgid ""
+"Try adding '-use-the-force-luke=noopc' to the growisofs user parameters in "
+"the K3b settings."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:828
-msgid "Writing rewritable CD in Raw mode."
+#: projects/k3bgrowisofshandler.cpp:253
+msgid "Unable to allocate software buffer."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:831
-msgid "Appending session to rewritable CD."
+#: projects/k3bgrowisofshandler.cpp:254
+msgid "This error is caused by the low memorylocked resource limit."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:838
-msgid "Growing ISO9660 filesystem on DVD+RW."
+#: projects/k3bgrowisofshandler.cpp:255
+msgid "It can be solved by issuing the command 'ulimit -l unlimited'..."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:842
-msgid "Appending session to DVD+R."
+#: projects/k3bgrowisofshandler.cpp:256
+msgid ""
+"...or by lowering the used software buffer size in the advanced K3b settings."
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:844
-msgid "Appending session to Double Layer DVD+R."
+#: projects/k3bgrowisofshandler.cpp:260
+msgid "Write error"
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:846
+#: projects/k3bgrowisofshandler.cpp:276
 #, kde-format
-msgid "Appending session to %1."
+msgid "Fatal error at startup: %1"
 msgstr ""
 
-#: jobs/k3bmetawriter.cpp:852
-msgid "Writing Double Layer DVD+R."
+#: projects/k3bgrowisofshandler.cpp:284
+msgid "Warning at exit: (1)"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:133 jobs/k3bverificationjob.cpp:363
-#: jobs/k3bdvdcopyjob.cpp:290
-msgid "Unable to determine the ISO9660 filesystem size."
+#: projects/k3bgrowisofshandler.cpp:285
+msgid "Most likely mkisofs failed in some way."
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:231
-msgid "no tracks added"
+#: projects/k3bgrowisofshandler.cpp:288
+#, kde-format
+msgid "Fatal error during recording: %1"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:230 jobs/k3bverificationjob.cpp:286
-#: jobs/k3bverificationjob.cpp:309
-#, kde-format
-msgid "Internal Error: Verification job improperly initialized (%1)"
+#: projects/datacd/k3bdatadoc.cpp:1188
+msgid "No permission to read the following files:"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:270 jobs/k3bcdcopyjob.cpp:1102
-msgid "Failed to reload the medium"
+#: projects/datacd/k3bdatadoc.cpp:1189
+msgid "No Read Permission"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:287 jobs/k3bverificationjob.cpp:310
-#, kde-format
-msgid "specified track number '%1' not found on medium"
+#: projects/datacd/k3bdatadoc.cpp:1342 projects/datacd/k3bdatadoc.cpp:1355
+msgid "From previous session"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:331
-#, kde-format
-msgid "Verifying track %1"
+#: projects/datacd/k3bdatadoc.cpp:1462
+msgid "El Torito boot catalog file"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:399
-#, kde-format
-msgid "Written data in track %1 differs from original."
+#: projects/datacd/k3bdatadoc.cpp:1463
+msgid "Boot catalog"
 msgstr ""
 
-#: jobs/k3bverificationjob.cpp:403
-msgid "Written data verified."
+#: projects/datacd/k3bbootitem.cpp:30
+msgid "El Torito Boot image"
 msgstr ""
 
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:90
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:127
-#, kde-format
-msgid "%1 executable could not be found."
+#: projects/datacd/k3bisoimager.cpp:162
+msgid ""
+"Due to a bug in mkisofs <= 1.15a40, K3b is unable to handle filenames that "
+"contain more than one backslash:"
 msgstr ""
 
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:96
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:133
-#, kde-format
-msgid "%1 version %2 is too old."
+#: projects/datacd/k3bisoimager.cpp:372
+msgid "Could not determine size of resulting image file."
 msgstr ""
 
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:111
-#, kde-format
-msgid "Analysing Title %1 of Video DVD %2"
+#: projects/datacd/k3bisoimager.cpp:525
+msgid "No volume id specified. Using default."
 msgstr ""
 
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:185
+#: projects/datacd/k3bisoimager.cpp:618
 #, kde-format
-msgid "Analysing Chapter %1 of %2"
+msgid "Found files bigger than 4 GB. K3b needs at least %1 to continue."
 msgstr ""
 
-#: jobs/k3bvideodvdtitledetectclippingjob.cpp:262
+#: projects/datacd/k3bisoimager.cpp:626
 msgid ""
-"Ignoring clipping values of last chapter due to its short playback time."
-msgstr ""
-
-#: jobs/k3bcdcopyjob.cpp:162 jobs/k3bdvdcopyjob.cpp:122
-msgid "Checking Source Medium"
+"Found files bigger than 2 GB. These files will only be fully accessible if "
+"mounted with UDF."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:165 jobs/k3bdvdcopyjob.cpp:132
-msgid "Waiting for source medium"
+#: projects/datacd/k3bisoimager.cpp:637
+msgid "Enabling UDF extension."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:175 jobs/k3bdvdcopyjob.cpp:144
-msgid "Checking source medium"
+#: projects/datacd/k3bisoimager.cpp:682
+msgid "Setting iso level to 3 to support files bigger than 4 GB."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:203
-msgid "K3b does not copy CDs containing multiple data tracks."
+#: projects/datacd/k3bisoimager.cpp:771
+#, kde-format
+msgid "Could not follow link %1 to non-existing file %2. Skipping..."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:207
-msgid "Copying Multisession Data CD."
+#: projects/datacd/k3bisoimager.cpp:775
+#, kde-format
+msgid ""
+"Ignoring link %1 to folder %2. K3b is unable to follow links to folders."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:209
-msgid "Copying Data CD."
+#: projects/datacd/k3bisoimager.cpp:783
+#, kde-format
+msgid "Could not find file %1. Skipping..."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:215
-msgid "K3b can only copy CD-Extra mixed mode CDs."
+#: projects/datacd/k3bisoimager.cpp:787
+#, kde-format
+msgid "Could not read file %1. Skipping..."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:219
-msgid "Copying Enhanced Audio CD (CD-Extra)."
+#: projects/datacd/k3bisoimager.cpp:837
+#, kde-format
+msgid "Failed to backup boot image file %1"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:224
-msgid "Copying Audio CD."
+#: projects/datacd/k3bisoimager.cpp:993 projects/datacd/k3bisoimager.cpp:1003
+#: projects/datacd/k3bisoimager.cpp:1010 projects/datacd/k3bisoimager.cpp:1016
+msgid "Could not write temporary file"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:229
-msgid "The source disk is empty."
+#: projects/datacd/k3bisoimager.cpp:997
+msgid "No files to be written."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:271
-msgid "K3b needs cdrecord 2.01a12 or newer to copy Mode2 data tracks."
+#: projects/datacd/k3bdatapreparationjob.cpp:102
+#, kde-format
+msgid "<em>%1</em> renamed to <em>%2</em>"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:283
+#: projects/datacd/k3bdatapreparationjob.cpp:142
+#, kde-format
 msgid ""
-"You will only be able to copy the first session in raw writing mode. "
-"Continue anyway?"
+"Some filenames need to be shortened due to the %1 char restriction of the "
+"Joliet extensions. If the Joliet extensions are disabled filenames do not "
+"have to be shortened but long filenames will not be available on Windows "
+"systems."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:285
-msgid "Multisession CD"
-msgstr "CD aml-sesiwn"
+#: projects/datacd/k3bdatapreparationjob.cpp:149
+msgid "Shorten Filenames"
+msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:290
-msgid "Only copying first session."
+#: projects/datacd/k3bdatapreparationjob.cpp:150
+msgid "Disable Joliet extensions"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:319 jobs/k3bdvdcopyjob.cpp:344
+#: projects/datacd/k3bdatapreparationjob.cpp:167
 #, kde-format
-msgid "Unable to determine free space in temporary folder '%1'."
+msgid ""
+"The Joliet extensions (which are needed for long filenames on Windows "
+"systems) restrict the length of the volume descriptor (the name of the "
+"filesystem) to %1 characters. The selected descriptor '%2' is longer than "
+"that. Do you want it to be cut or do you want to go back and change it "
+"manually?"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:325 jobs/k3bdvdcopyjob.cpp:351
-msgid "Not enough space left in temporary folder."
+#: projects/datacd/k3bdatapreparationjob.cpp:173
+msgid "Cut volume descriptor in the Joliet tree"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:334 jobs/k3bdvdcopyjob.cpp:368
-msgid "Unmounting source medium"
+#: projects/datacd/k3bdatapreparationjob.cpp:205
+msgid ""
+"K3b is not able to follow symbolic links to folders after they have been "
+"added to the project. Do you want to continue without writing the symbolic "
+"links to the image?"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:363
-msgid "Unable to read Table of contents"
+#: projects/datacd/k3bdatapreparationjob.cpp:210
+msgid "Discard symbolic links to folders"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:371
-msgid "Searching CD-TEXT"
+#: projects/datacd/k3bmsinfofetcher.cpp:52
+msgid "Searching previous session"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:385
+#: projects/datacd/k3bmsinfofetcher.cpp:152
+#: projects/datacd/k3bdatamultisessionparameterjob.cpp:252
 #, kde-format
-msgid "Found CD-TEXT (%1 - %2)."
+msgid "Could not open Iso9660 filesystem in %1."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:390
-msgid "Found corrupted CD-TEXT. Ignoring it."
+#: projects/datacd/k3bmsinfofetcher.cpp:164
+msgid "Could not determine next writable address."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:395
-msgid "No CD-TEXT found."
+#: projects/datacd/k3bmsinfofetcher.cpp:180
+#, kde-format
+msgid "Could not start %1"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:406
-msgid "Querying Cddb"
+#: projects/datacd/k3bmsinfofetcher.cpp:210
+msgid "Could not retrieve multisession information from disk."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:427
-#, kde-format
-msgid "Found Cddb entry (%1 - %2)."
+#: projects/datacd/k3bmsinfofetcher.cpp:211
+msgid "The disk is either empty or not appendable."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:450
-msgid "No Cddb entry found."
+#: projects/datacd/k3bisooptions.cpp:30
+msgctxt ""
+"This is the default volume identifier of a data project created by K3b. The "
+"string should not be longer than 16 characters to avoid warnings regarding "
+"Joiliet extensions which induce this restriction."
+msgid "K3b data project"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:453
-#, kde-format
-msgid "Cddb error (%1)."
+#: projects/datacd/k3bdatajob.cpp:226
+msgid "Creating image file"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:469
-#, kde-format
-msgid ""
-"Found CD-TEXT (%1 - %2) and Cddb (%3 - %4) entries. Which one should be used "
-"to generate the CD-TEXT on the new CD?"
+#: projects/datacd/k3bdatajob.cpp:227
+msgid "Track 1 of 1"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:475
-msgid "CD-TEXT"
+#: projects/datacd/k3bdatajob.cpp:228
+#, kde-format
+msgid "Creating image file in %1"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:476
-msgid "Use CD-TEXT data"
+#: projects/datacd/k3bdatajob.cpp:386
+#, kde-format
+msgid "Image successfully created in %1"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:477
-msgid "Use Cddb entry"
+#: projects/datacd/k3bdatajob.cpp:393 tools/k3bmd5job.cpp:101
+#, kde-format
+msgid "Could not open file %1"
+msgstr "Methwyd agor y ffeil %1"
+
+#: projects/datacd/k3bdatajob.cpp:406
+msgid "Error while creating ISO image"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:542 jobs/k3bcdcopyjob.cpp:588
-#: jobs/k3bdvdcopyjob.cpp:323
-msgid "Specified an unusable temporary path. Using default."
+#: projects/datacd/k3bdatajob.cpp:708
+msgid "Internal Error: No medium type fits. This project cannot be burned."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:560
-#, kde-format
-msgid "Using temporary folder %1."
+#: projects/datacd/k3bdatajob.cpp:712
+msgid "Waiting for a medium"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:583 jobs/k3bdvdcopyjob.cpp:318
+#: projects/datacd/k3bdatajob.cpp:729
 #, kde-format
-msgid "Do you want to overwrite %1?"
+msgid "Writing %1"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:584 jobs/k3bdvdcopyjob.cpp:319
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
+#: projects/datacd/k3bdatajob.cpp:746
+msgid "Unable to determine the last track's datamode. Using default."
+msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:593 jobs/k3bdvdcopyjob.cpp:328
+#: projects/datacd/k3bdatajob.cpp:836 projects/datacd/k3bdatajob.cpp:953
 #, kde-format
-msgid "Writing image file to %1."
+msgid "Writing mode ignored when writing %1 media."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:609
+#: projects/datacd/k3bdatajob.cpp:848 projects/datacd/k3bdatajob.cpp:966
 #, kde-format
-msgid "Reading Session %1"
+msgid "Growing ISO9660 filesystem on %1."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:611
-msgid "Reading Source Medium"
+#: projects/datacd/k3bdatajob.cpp:978
+msgid "Creating Data Image File"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:614 jobs/k3bcdcopyjob.cpp:1203
-#, kde-format
-msgid "Reading track %1 of %2"
+#: projects/datacd/k3bdatajob.cpp:982
+msgid "Writing Data Project"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:707
-#, kde-format
-msgid "Simulating Session %1"
+#: projects/datacd/k3bdatajob.cpp:988
+msgid "Writing Multisession Project"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:709
+#: projects/datacd/k3bdatajob.cpp:1002
 #, kde-format
-msgid "Writing Copy %1 (Session %2)"
-msgstr ""
+msgid "ISO9660 Filesystem (Size: %2) - %1 copy"
+msgid_plural "ISO9660 Filesystem (Size: %2) - %1 copies"
+msgstr[0] ""
+msgstr[1] ""
 
-#: jobs/k3bcdcopyjob.cpp:711
+#: projects/datacd/k3bdatajob.cpp:1007
 #, kde-format
-msgid "Writing Copy (Session %1)"
+msgid "ISO9660 Filesystem (Size: %1)"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:719
-msgid "Writing Copy"
+#: projects/datacd/k3bdatamultisessionparameterjob.cpp:91
+msgid "Searching for old session"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:982
+#: projects/datacd/k3bdatamultisessionparameterjob.cpp:227
 #, kde-format
-msgid "Successfully read session %1."
-msgstr ""
-
-#: jobs/k3bcdcopyjob.cpp:984
-msgid "Successfully read source disk."
+msgid ""
+"No medium inserted or an empty medium in %1. Cannot continue multisession "
+"disk."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:999
-msgid "K3b was unable to eject the source disk. Please do so manually."
+#: projects/datacd/k3bmkisofshandler.cpp:73
+msgid "Mkisofs executable not found."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1016
+#: projects/datacd/k3bmkisofshandler.cpp:87
 #, kde-format
-msgid "Error while reading session %1."
+msgid "Read error from file '%1'"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1045
-msgid "Reloading the medium"
+#: projects/datacd/k3bmkisofshandler.cpp:92
+msgid "Used version of mkisofs does not have large file support."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1122 jobs/k3bclonejob.cpp:346
-msgid "Removing image files."
+#: projects/datacd/k3bmkisofshandler.cpp:93
+msgid "Files bigger than 2 GB cannot be handled."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1181 jobs/k3bcdcopyjob.cpp:1183
-#: jobs/k3bcdcopyjob.cpp:1186 jobs/k3bcdcopyjob.cpp:1188
-#: jobs/k3bbinimagewritingjob.cpp:204
+#: projects/datacd/k3bmkisofshandler.cpp:106
 #, kde-format
-msgid "Writing track %1 of %2"
+msgid "Encountered an incorrectly encoded filename '%1'"
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1211
-msgid "Creating CD Image"
+#: projects/datacd/k3bmkisofshandler.cpp:108
+msgid ""
+"This may be caused by a system update which changed the local character set."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1215
-msgid "Simulating CD Copy On-The-Fly"
+#: projects/datacd/k3bmkisofshandler.cpp:109
+msgid ""
+"You may use convmv (http://j3e.de/linux/convmv/) to fix the filename "
+"encoding."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1217
-msgid "Simulating CD Copy"
+#: projects/datacd/k3bmkisofshandler.cpp:113
+msgid "The boot image has an invalid size."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1221
-msgid "Copying CD On-The-Fly"
+#: projects/datacd/k3bmkisofshandler.cpp:117
+msgid "The boot image contains multiple partitions.."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1223
-msgid "Copying CD"
+#: projects/datacd/k3bmkisofshandler.cpp:118
+msgid "A hard-disk boot image has to contain a single partition."
 msgstr ""
 
-#: jobs/k3bcdcopyjob.cpp:1230 jobs/k3bdvdcopyjob.cpp:956
-#, kde-format
-msgid "Creating 1 copy"
-msgid_plural "Creating %1 copies"
-msgstr[0] ""
-msgstr[1] ""
-
-#: jobs/k3bdatatrackreader.cpp:178
-msgid "Unable to open libdvdcss."
+#: tools/k3bcddb.cpp:44
+msgid "Multiple CDDB Entries Found"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:187
-msgid "Retrieving all CSS keys. This might take a while."
+#: tools/k3bcddb.cpp:49
+msgid "K3b found multiple or inexact CDDB entries. Please select one."
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:190
-msgid "Failed to retrieve all CSS keys."
+#: tools/k3bdeviceselectiondialog.cpp:45
+msgid "Device Selection"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:191
-msgid "Video DVD decryption failed."
+#: tools/k3bdeviceselectiondialog.cpp:51
+msgid "Please select a device:"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:215
-msgid "No support for reading formless Mode2 sectors."
+#: tools/k3bmedium.cpp:322
+msgid "Audio CD"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:217
-msgid "Unsupported sector type."
+#: tools/k3bmedium.cpp:325
+msgid "Mixed CD"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:224
-#, kde-format
-msgid "Reading with sector size %1."
+#: tools/k3bmedium.cpp:329
+msgid "Video DVD"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:271 jobs/k3bdatatrackreader.cpp:446
-#, kde-format
-msgid "Error while reading sector %1."
+#: tools/k3bmedium.cpp:332
+msgid "Video CD"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:353
+#: tools/k3bmedium.cpp:335
 #, kde-format
-msgid "Ignored %1 erroneous sector."
-msgid_plural "Ignored a total of %1 erroneous sectors."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Appendable Data %1"
+msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:422
+#: tools/k3bmedium.cpp:338
 #, kde-format
-msgid "Problem while reading. Retrying from sector %1."
+msgid "Complete Data %1"
 msgstr ""
 
-#: jobs/k3bdatatrackreader.cpp:438
-#, kde-format
-msgid "Ignoring read error in sector %1."
+#: tools/k3bmedium.cpp:342
+msgid "Empty"
 msgstr ""
 
-#: jobs/k3bblankingjob.cpp:74 jobs/k3bblankingjob.cpp:162
-msgid "Erasing CD-RW"
+#: tools/k3bmedium.cpp:355
+msgid "No medium information"
 msgstr ""
 
-#: jobs/k3bblankingjob.cpp:75
-msgid "When erasing a CD-RW no progress information is available."
+#: tools/k3bmedium.cpp:359
+msgid "No medium present"
 msgstr ""
 
-#: jobs/k3bblankingjob.cpp:115
+#: tools/k3bmedium.cpp:363
 #, kde-format
-msgid "Please insert a rewritable CD medium into drive<p><b>%1 %2 (%3)</b>."
-msgstr ""
-
-#: jobs/k3bblankingjob.cpp:152
-msgid "Blanking error "
+msgid "Empty %1 medium"
 msgstr ""
 
-#: jobs/k3bblankingjob.cpp:153
-msgid "Sorry, no error handling yet."
+#: tools/k3bmedium.cpp:404
+#, kde-format
+msgid "Appendable %1 medium"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:123
+#: tools/k3bmedium.cpp:407
 #, kde-format
-msgid "Using readcd %1 instead of default version for clone support."
+msgid "Complete %1 medium"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:130
-msgid "Could not find readcd executable with cloning support."
-msgstr ""
+#: tools/k3bmedium.cpp:424
+#, kde-format
+msgid "%1 in 1 track"
+msgid_plural "%1 in %2 tracks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: jobs/k3breadcdreader.cpp:163 jobs/k3breadcdreader.cpp:164
+#: tools/k3bmedium.cpp:428
 #, kde-format
-msgid "Writing image to %1."
-msgstr ""
+msgid " and %1 session"
+msgid_plural " and %1 sessions"
+msgstr[0] ""
+msgstr[1] ""
 
-#: jobs/k3breadcdreader.cpp:206
-msgid "Could not start readcd."
+#: tools/k3bmedium.cpp:433
+#, kde-format
+msgid "Free space: %1"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:262
-msgid "Cannot read source disk."
+#: tools/k3bmedium.cpp:437
+#, kde-format
+msgid "Capacity: %1"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:274
+#: tools/k3bmedium.cpp:617
 #, kde-format
-msgid "Retrying from sector %1."
+msgid "Please insert an empty medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:289
-#, kde-format
-msgid "Uncorrected error in sector %1"
+#: tools/k3bmedium.cpp:619
+msgid "Please insert an empty medium"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:292
+#: tools/k3bmedium.cpp:624
 #, kde-format
-msgid "Corrected error in sector %1"
+msgid "Please insert an empty DVD or Blu-ray medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:312
-#, kde-format
-msgid "%1 returned error: %2"
+#: tools/k3bmedium.cpp:626
+msgid "Please insert an empty DVD or Blu-ray medium"
 msgstr ""
 
-#: jobs/k3breadcdreader.cpp:317
-msgid "Readcd exited abnormally."
+#: tools/k3bmedium.cpp:630
+#, kde-format
+msgid "Please insert an empty Blu-ray medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bbinimagewritingjob.cpp:60
-msgid "Write Binary Image"
+#: tools/k3bmedium.cpp:632
+msgid "Please insert an empty Blu-ray medium"
 msgstr ""
 
-#: jobs/k3bbinimagewritingjob.cpp:188
+#: tools/k3bmedium.cpp:636
 #, kde-format
-msgid "%1 copy successfully created"
-msgid_plural "%1 copies successfully created"
-msgstr[0] ""
-msgstr[1] ""
-
-#: jobs/k3bbinimagewritingjob.cpp:210
-msgid "Writing cue/bin Image"
+msgid "Please insert an empty CD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:127
-#, kde-format
-msgid "K3b does not support writing on-the-fly with growisofs %1."
+#: tools/k3bmedium.cpp:638
+msgid "Please insert an empty CD medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:129
-msgid "Disabling on-the-fly writing."
+#: tools/k3bmedium.cpp:642
+#, kde-format
+msgid "Please insert an empty DVD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:164
-msgid "No source medium found."
+#: tools/k3bmedium.cpp:644
+msgid "Please insert an empty DVD medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:183
-msgid "Found encrypted DVD."
+#: tools/k3bmedium.cpp:648
+#, kde-format
+msgid "Please insert an empty DVD-DL medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:199
-msgid "Cannot copy encrypted DVDs."
+#: tools/k3bmedium.cpp:650
+msgid "Please insert an empty DVD-DL medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:235
-msgid "The writer does not support writing Double Layer DVDs."
+#: tools/k3bmedium.cpp:654
+#, kde-format
+msgid ""
+"Please insert an empty medium of size %1 or larger into drive<p><b>%2</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:242
-msgid "This growisofs version does not support writing Double Layer DVDs."
+#: tools/k3bmedium.cpp:657
+#, kde-format
+msgid "Please insert an empty medium of size %1 or larger"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:259
-msgid "K3b does not support copying multi-session DVD or Blu-ray disks."
+#: tools/k3bmedium.cpp:663
+#, kde-format
+msgid "Please insert an empty or appendable medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:282
-msgid "K3b relies on the size saved in the ISO9660 header."
+#: tools/k3bmedium.cpp:665
+msgid "Please insert an empty or appendable medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:283
+#: tools/k3bmedium.cpp:669
+#, kde-format
 msgid ""
-"This might result in a corrupt copy if the source was mastered with buggy "
-"software."
+"Please insert an empty or appendable DVD or Blu-ray medium into "
+"drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:299
-msgid "K3b does not support copying DVD-RAM."
+#: tools/k3bmedium.cpp:671
+msgid "Please insert an empty or appendable DVD or Blu-ray medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:305
-msgid "Unsupported media type."
+#: tools/k3bmedium.cpp:675
+#, kde-format
+msgid ""
+"Please insert an empty or appendable Blu-ray medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:329
-msgid "Reading source medium."
+#: tools/k3bmedium.cpp:677
+msgid "Please insert an empty or appendable Blu-ray medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:373
-msgid "Creating image"
+#: tools/k3bmedium.cpp:681
+#, kde-format
+msgid "Please insert an empty or appendable CD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:379
-msgid "Simulating copy"
+#: tools/k3bmedium.cpp:683
+msgid "Please insert an empty or appendable CD medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:381 jobs/k3bdvdcopyjob.cpp:596
-#: jobs/k3bdvdcopyjob.cpp:686 jobs/k3bdvdcopyjob.cpp:746
+#: tools/k3bmedium.cpp:687
 #, kde-format
-msgid "Writing copy %1"
+msgid ""
+"Please insert an empty or appendable DVD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:383 jobs/k3bdvdcopyjob.cpp:598
-msgid "Writing copy"
+#: tools/k3bmedium.cpp:689
+msgid "Please insert an empty or appendable DVD medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:573
-msgid "Successfully read source medium."
+#: tools/k3bmedium.cpp:693
+#, kde-format
+msgid ""
+"Please insert an empty or appendable DVD-DL medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:585
-msgid "K3b was unable to eject the source medium. Please do so manually."
+#: tools/k3bmedium.cpp:695
+msgid "Please insert an empty or appendable DVD-DL medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:646
+#: tools/k3bmedium.cpp:701
 #, kde-format
-msgid "Successfully written copy %1."
+msgid "Please insert a non-empty medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:669
-#, kde-format
-msgid "Verifying copy %1"
+#: tools/k3bmedium.cpp:703
+msgid "Please insert a non-empty medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:671
-msgid "Verifying copy"
+#: tools/k3bmedium.cpp:707
+#, kde-format
+msgid "Please insert a non-empty rewritable medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:791
-#, kde-format
-msgid "Unsupported media type: %1"
+#: tools/k3bmedium.cpp:709
+msgid "Please insert a non-empty rewritable medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:826
-msgid "Writing DVD copy"
+#: tools/k3bmedium.cpp:715
+#, kde-format
+msgid "Please insert a rewritable medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:830
-msgid "Writing mode ignored when writing DVD+R(W) media."
+#: tools/k3bmedium.cpp:717
+msgid "Please insert a rewritable medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:874
-msgid "Writing DVD-RW in DAO mode."
+#: tools/k3bmedium.cpp:723 tools/k3bmedium.cpp:769
+#, kde-format
+msgid "Please insert a suitable medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:878
-msgid "Writing DVD-RW in incremental mode."
+#: tools/k3bmedium.cpp:725 tools/k3bmedium.cpp:771
+msgid "Please insert a suitable medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:919
-msgid "Writing BD copy"
+#: tools/k3bmedium.cpp:738
+#, kde-format
+msgid "Please insert a Video CD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:943
-msgid "Creating Image"
+#: tools/k3bmedium.cpp:740
+msgid "Please insert a Video CD medium"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:947
-msgid "Copying DVD or BD On-The-Fly"
+#: tools/k3bmedium.cpp:744
+#, kde-format
+msgid "Please insert a Video DVD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bdvdcopyjob.cpp:949
-msgid "Copying DVD or BD"
+#: tools/k3bmedium.cpp:746
+msgid "Please insert a Video DVD medium"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:94
+#: tools/k3bmedium.cpp:750
 #, kde-format
-msgid "Cdrecord version %1 does not have cloning support."
+msgid "Please insert a Mixed Mode CD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:102
-msgid "No device set."
+#: tools/k3bmedium.cpp:752
+msgid "Please insert a Mixed Mode CD medium"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:111
+#: tools/k3bmedium.cpp:756
 #, kde-format
-msgid "CD writer %1 (%2) does not support cloning."
+msgid "Please insert an Audio CD medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:144
-msgid "Reading clone image"
+#: tools/k3bmedium.cpp:758
+msgid "Please insert an Audio CD medium"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:242
+#: tools/k3bmedium.cpp:762
 #, kde-format
-msgid "Successfully written clone copy %1."
+msgid "Please insert a Data medium into drive<p><b>%1</b>"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:290
-msgid "Successfully read disk."
+#: tools/k3bmedium.cpp:764
+msgid "Please insert a Data medium"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:302
-msgid "Failed to read disk completely in clone mode."
+#: tools/k3bmediacache.cpp:139 tools/k3bmediacache.cpp:379
+msgid "CDDB Lookup"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:309
-msgid "Error while reading disk."
-msgstr ""
-
-#: jobs/k3bclonejob.cpp:335
-msgid "Simulating clone copy"
+#: tools/k3bmd5job.cpp:94
+#, kde-format
+msgid "Could not find file %1"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:337
+#: tools/k3bmd5job.cpp:239
 #, kde-format
-msgid "Writing clone copy %1"
+msgid "Error while reading from file %1"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:358
-msgid "Creating Clone Image"
+#: tools/k3bstdguiitems.cpp:28
+msgid "Simulate"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:361
-msgid "Simulating Clone Image"
+#: tools/k3bstdguiitems.cpp:29
+msgid ""
+"<p>If this option is checked K3b will perform all writing steps with the "
+"laser turned off.<p>This is useful, for example, to test a higher writing "
+"speed or whether your system is able to write on-the-fly.<p><b>Caution:</b> "
+"DVD+R(W) does not support simulated writing."
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:363
-msgid "Burning Clone Image"
+#: tools/k3bstdguiitems.cpp:34
+msgid "Only simulate the writing process"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:366
-msgid "Simulating CD Cloning"
+#: tools/k3bstdguiitems.cpp:40
+msgid "Disk at once"
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:368
-msgid "Cloning CD"
+#: tools/k3bstdguiitems.cpp:41
+msgid ""
+"<p>If this option is checked, K3b will write the CD in 'disk at once' mode "
+"as compared to 'track at once' (TAO).<p>It is always recommended to use DAO "
+"where possible.<p><b>Caution:</b> Track pregaps with a length other than 2 "
+"seconds are only supported in DAO mode."
 msgstr ""
 
-#: jobs/k3bclonejob.cpp:374
-#, kde-format
-msgid "Creating 1 clone copy"
-msgid_plural "Creating %1 clone copies"
-msgstr[0] ""
-msgstr[1] ""
+#: tools/k3bstdguiitems.cpp:46
+msgid "Write in disk at once mode"
+msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:159
-#, kde-format
-msgid "Unable to create folder '%1'"
+#: tools/k3bstdguiitems.cpp:52
+msgid "Use Burnfree"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:165
-#, kde-format
-msgid "Invalid filename: '%1'"
+#: tools/k3bstdguiitems.cpp:53
+msgid "Enable Burnfree (or Just Link) to avoid buffer underruns"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:177
-#, kde-format
-msgid "Transcoding title %1 from Video DVD %2"
+#: tools/k3bstdguiitems.cpp:54
+msgid ""
+"<p>If this option is checked, K3b enables <em>Burnfree</em> (or <em>Just "
+"Link</em>). This is a feature of the CD writer which avoids buffer "
+"underruns.<p>Without <em>burnfree</em>, if the writer cannot get any more "
+"data a buffer underrun would occur, since the writer needs a constant stream "
+"of data to write the CD.<p>With <em>burnfree</em> the writer can "
+"<em>mark</em> the current position of the laser and get back to it when the "
+"buffer is filled again; but, since this means having little data gaps on the "
+"CD, <b>it is highly recommended to always choose an appropriate writing "
+"speed to prevent the usage of burnfree, especially for audio CDs</b> (in the "
+"worst case one would hear the gap).<p><em>Burnfree</em> was formerly known "
+"as <em>Burnproof</em>, but has since been renamed when it became part of the "
+"MMC standard."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:202
-#, kde-format
-msgid "Invalid Video codec set: %1"
+#: tools/k3bstdguiitems.cpp:73
+msgid "Only create image"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:225
-#, kde-format
-msgid "Invalid Audio codec set: %1"
+#: tools/k3bstdguiitems.cpp:74
+msgid ""
+"<p>If this option is checked, K3b will only create an image and not do any "
+"actual writing.<p>The image can later be written to a CD/DVD with most "
+"current writing programs (including K3b of course)."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:366
-#, kde-format
-msgid "Resizing picture of title %1 to %2x%3"
+#: tools/k3bstdguiitems.cpp:78
+msgid "Only create an image"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:389
-msgid "Single-pass Encoding"
+#: tools/k3bstdguiitems.cpp:84
+msgid "Create image"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:391
-msgid "Two-pass Encoding: First Pass"
+#: tools/k3bstdguiitems.cpp:85
+msgid ""
+"<p>If this option is checked, K3b will create an image before writing the "
+"files to the CD/DVD. Otherwise the data will be written <em>on-the-fly</em>, "
+"i.e. no intermediate image will be created.<p><b>Caution:</b> Although "
+"writing on-the-fly should work on most systems, make sure the data is sent "
+"to the writer fast enough."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:393
-msgid "Two-pass Encoding: Second Pass"
+#: tools/k3bstdguiitems.cpp:90 tools/k3bstdguiitems.cpp:112
+msgid "<p>It is recommended to try a simulation first."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:417
-#, kde-format
-msgid "Removing incomplete video file '%1'"
+#: tools/k3bstdguiitems.cpp:91
+msgid "Cache the data to be written on the harddisk"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:491
-#, kde-format
-msgid "Execution of %1 failed."
+#: tools/k3bstdguiitems.cpp:97
+msgid "Remove image"
+msgstr "Gwaredu Delwedd"
+
+#: tools/k3bstdguiitems.cpp:98
+msgid ""
+"<p>If this option is checked, K3b will remove any created images after the "
+"writing has finished.<p>Uncheck this if you want to keep the images."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:492
-msgid "Please consult the debugging output for details."
+#: tools/k3bstdguiitems.cpp:101
+msgid "Remove images from disk when finished"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:523
-msgid "AC3 (Stereo)"
+#: tools/k3bstdguiitems.cpp:107
+msgid "On the fly"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:525
-msgid "AC3 (Pass-through)"
+#: tools/k3bstdguiitems.cpp:108
+msgid ""
+"<p>If this option is checked, K3b will not create an image first but write "
+"the files directly to the CD/DVD.<p><b>Caution:</b> Although this should "
+"work on most systems, make sure the data is sent to the writer fast enough."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:527
-msgid "MPEG1 Layer III"
+#: tools/k3bstdguiitems.cpp:113
+msgid "Write files directly to CD/DVD without creating an image"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:538
-msgid "MPEG4 (FFMPEG)"
+#: tools/k3bstdguiitems.cpp:119
+msgid "Write CD-TEXT"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:540
-msgid "XviD"
+#: tools/k3bstdguiitems.cpp:120
+msgid "Create CD-TEXT entries"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:551
+#: tools/k3bstdguiitems.cpp:121
 msgid ""
-"FFmpeg is an open-source project trying to support most video and audio "
-"codecs used these days. Its subproject libavcodec forms the basis for "
-"multimedia players such as xine or mplayer."
+"<p>If this option is checked K3b uses some otherwise-unused space on the "
+"audio CD to store additional information, such as the artist's name, or the "
+"CD title.<p>CD-TEXT is an extension to the audio CD standard introduced by "
+"Sony.<p>CD-TEXT will only be usable on CD players that support this "
+"extension (mostly car CD players).<p>Since a CD-TEXT-enhanced CD will work "
+"in any CD player it is never a bad idea to enable this (if you specify CD-"
+"TEXT data.)"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:555
-msgid ""
-"FFmpeg contains an implementation of the MPEG-4 video encoding standard "
-"which produces high quality results."
+#: tools/k3bstdguiitems.cpp:140
+msgid "Set the paranoia level for reading audio CDs"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:558
+#: tools/k3bstdguiitems.cpp:141
 msgid ""
-"XviD is a free and open source MPEG-4 video codec. XviD was created by a "
-"group of volunteer programmers after the OpenDivX source was closed in July "
-"2001."
+"<p>Sets the correction mode for digital audio extraction.<ul><li>0: No "
+"checking, data is copied directly from the drive. <li>1: Perform overlapped "
+"reading to avoid jitter.</li><li>2: Like 1 but with additional checks of the "
+"read audio data.</li><li>3: Like 2 but with additional scratch detection and "
+"repair.</li></ul><p><b>The extraction speed reduces from 0 to 3.</b>"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:561
-msgid ""
-"XviD features MPEG-4 Advanced Profile settings such as b-frames, global and "
-"quarter pixel motion compensation, lumi masking, trellis quantization, and "
-"H.263, MPEG and custom quantization matrices."
+#: tools/k3bstdguiitems.cpp:153
+msgid "Start multisession CD"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:565
+#: tools/k3bstdguiitems.cpp:154
+msgid "Do not close the disk to allow additional sessions to be added later"
+msgstr ""
+
+#: tools/k3bstdguiitems.cpp:155
 msgid ""
-"XviD is a primary competitor of DivX (XviD being DivX spelled backwards). "
-"While DivX is closed source and may only run on Windows, Mac OS and Linux, "
-"XviD is open source and can potentially run on any platform."
+"<p>If this option is checked K3b will not close the CD, and will write a "
+"temporary table of contents.</p><p>This allows further sessions to be "
+"appended to the CD later.</p>"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:569
-msgid "(Description taken from the Wikipedia article)"
+#: tools/k3bstdguiitems.cpp:164
+msgid "Normalize volume levels"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:579
-msgid ""
-"AC3, better known as Dolby Digital is standardized as ATSC A/52. It contains "
-"up to 6 total channels of sound."
+#: tools/k3bstdguiitems.cpp:165
+msgid "Adjust the volume levels of all tracks"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:584
+#: tools/k3bstdguiitems.cpp:166
 msgid ""
-"With this setting K3b will create a two-channel stereo Dolby Digital audio "
-"stream."
+"<p>If this option is checked K3b will adjust the volume of all tracks to a "
+"standard level. This is useful for things like creating mixes, where "
+"different recording levels on different albums can cause the volume to vary "
+"greatly from song to song.<p><b>Be aware that K3b currently does not support "
+"normalizing when writing on the fly.</b>"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:588
-msgid ""
-"With this setting K3b will use the Dolby Digital audio stream from the "
-"source DVD without changing it."
+#: tools/k3bstdguiitems.cpp:178
+msgid "Verify written data"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:590
-msgid "Use this setting to preserve 5.1 channel sound from the DVD."
+#: tools/k3bstdguiitems.cpp:179
+msgid "Compare original with written data"
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:592
+#: tools/k3bstdguiitems.cpp:180
 msgid ""
-"MPEG1 Layer III is better known as MP3 and is the most used lossy audio "
-"format."
+"<p>If this option is checked, then after successfully writing the disk K3b "
+"will compare the original source data with the written data to verify that "
+"the disk has been written correctly."
 msgstr ""
 
-#: jobs/k3bvideodvdtitletranscodingjob.cpp:593
+#: tools/k3bstdguiitems.cpp:190
+msgid "Ignore read errors"
+msgstr ""
+
+#: tools/k3bstdguiitems.cpp:191
+msgid "Skip unreadable audio sectors"
+msgstr ""
+
+#: tools/k3bstdguiitems.cpp:192
 msgid ""
-"With this setting K3b will create a two-channel stereo MPEG1 Layer III audio "
-"stream."
+"<p>If this option is checked and K3b is not able to read an audio sector "
+"from the source CD it will be replaced with zeros on the resulting "
+"copy.<p>Since audio CD Player are able to interpolate small errors in the "
+"data it is no problem to let K3b skip unreadable sectors."
+msgstr ""
+
+#: tools/k3bprogressdialog.cpp:85
+msgid "Disk successfully erased. Please reload the disk."
+msgstr ""
+
+#: tools/k3bprogressdialog.cpp:87
+msgid "K3b was unable to erase the disk."
+msgstr ""
+
+#: tools/k3bdevicemodel.cpp:138
+msgid "Analyzing medium..."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkcal.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkcal.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkcal.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkcal.po	2012-04-18 08:59:30.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: libkcal\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
-"PO-Revision-Date: 2012-03-14 17:01+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
+"PO-Revision-Date: 2012-04-16 22:44+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,65 +15,65 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: attendee.cpp:137
+#: attendee.cpp:140
 msgctxt "@item event, to-do or journal needs action"
 msgid "Needs Action"
 msgstr ""
 
-#: attendee.cpp:140
+#: attendee.cpp:143
 msgctxt "@item event, to-do or journal accepted"
 msgid "Accepted"
 msgstr ""
 
-#: attendee.cpp:143
+#: attendee.cpp:146
 msgctxt "@item event, to-do or journal declined"
 msgid "Declined"
 msgstr ""
 
-#: attendee.cpp:146
+#: attendee.cpp:149
 msgctxt "@item event or to-do tentatively accepted"
 msgid "Tentative"
 msgstr ""
 
-#: attendee.cpp:149
+#: attendee.cpp:152
 msgctxt "@item event or to-do delegated"
 msgid "Delegated"
 msgstr ""
 
-#: attendee.cpp:152
+#: attendee.cpp:155
 msgctxt "@item to-do completed"
 msgid "Completed"
 msgstr ""
 
-#: attendee.cpp:155
+#: attendee.cpp:158
 msgctxt "@item to-do in process of being completed"
 msgid "In Process"
 msgstr ""
 
-#: attendee.cpp:158
+#: attendee.cpp:161
 msgctxt "@item event or to-do status unknown"
 msgid "Unknown"
 msgstr ""
 
-#: attendee.cpp:206
+#: attendee.cpp:209
 msgctxt "@item chairperson"
 msgid "Chair"
 msgstr ""
 
-#: attendee.cpp:210
+#: attendee.cpp:213
 msgctxt "@item participation is required"
 msgid "Participant"
 msgstr ""
 
-#: attendee.cpp:213
+#: attendee.cpp:216
 msgctxt "@item participation is optional"
 msgid "Optional Participant"
 msgstr ""
 
-#: attendee.cpp:216
+#: attendee.cpp:219
 msgctxt "@item non-participant copied for information"
 msgid "Observer"
 msgstr ""
@@ -178,7 +178,7 @@
 msgstr ""
 
 #: htmlexport.cpp:270
-msgctxt "@title:column event locatin"
+msgctxt "@title:column event location"
 msgid "Location"
 msgstr ""
 
@@ -298,232 +298,242 @@
 msgid "libical error"
 msgstr "gwall libical"
 
-#: icalformat_p.cpp:2423
+#: icalformat_p.cpp:2437
 msgid "No VERSION property found"
 msgstr ""
 
-#: icalformat_p.cpp:2430
+#: icalformat_p.cpp:2444
 msgid "Expected iCalendar, got vCalendar format"
 msgstr ""
 
-#: icalformat_p.cpp:2436
+#: icalformat_p.cpp:2450
 msgid "Expected iCalendar, got unknown format"
 msgstr ""
 
-#: incidence.cpp:800
+#: incidence.cpp:839
 msgctxt "@item event is tentative"
 msgid "Tentative"
 msgstr ""
 
-#: incidence.cpp:802
+#: incidence.cpp:841
 msgctxt "@item event is definite"
 msgid "Confirmed"
 msgstr ""
 
-#: incidence.cpp:804
+#: incidence.cpp:843
 msgctxt "@item to-do is complete"
 msgid "Completed"
 msgstr ""
 
-#: incidence.cpp:806
+#: incidence.cpp:845
 msgctxt "@item to-do needs action"
 msgid "Needs-Action"
 msgstr ""
 
-#: incidence.cpp:808
+#: incidence.cpp:847
 msgctxt "@item event orto-do is canceled; journal is removed"
 msgid "Canceled"
 msgstr ""
 
-#: incidence.cpp:810
+#: incidence.cpp:849
 msgctxt "@item to-do is in process"
 msgid "In-Process"
 msgstr ""
 
-#: incidence.cpp:812
+#: incidence.cpp:851
 msgctxt "@item journal is in draft form"
 msgid "Draft"
 msgstr ""
 
-#: incidence.cpp:814
+#: incidence.cpp:853
 msgctxt "@item journal is in final form"
 msgid "Final"
 msgstr ""
 
-#: incidence.cpp:846
+#: incidence.cpp:885
 msgctxt "@item incidence access if for everyone"
 msgid "Public"
 msgstr ""
 
-#: incidence.cpp:848
+#: incidence.cpp:887
 msgctxt "@item incidence access is by owner only"
 msgid "Private"
 msgstr ""
 
-#: incidence.cpp:850
+#: incidence.cpp:889
 msgctxt "@item incidence access is by owner and a controlled group"
 msgid "Confidential"
 msgstr ""
 
-#: incidenceformatter.cpp:232 incidenceformatter.cpp:1688
+#: incidenceformatter.cpp:269 incidenceformatter.cpp:2006
+#: incidenceformatter.cpp:3037
 #, kde-format
 msgid " (delegated by %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:235 incidenceformatter.cpp:1691
+#: incidenceformatter.cpp:272 incidenceformatter.cpp:2009
+#: incidenceformatter.cpp:3040
 #, kde-format
 msgid " (delegated to %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:211
+#: incidenceformatter.cpp:295 incidenceformatter.cpp:3060
 msgid "Organizer:"
 msgstr ""
 
-#: incidenceformatter.cpp:306 incidenceformatter.cpp:3064
+#: incidenceformatter.cpp:308 incidenceformatter.cpp:3068
 msgid "Chair:"
 msgstr ""
 
-#: incidenceformatter.cpp:315 incidenceformatter.cpp:3071
+#: incidenceformatter.cpp:317 incidenceformatter.cpp:3075
 msgid "Required Participants:"
 msgstr ""
 
-#: incidenceformatter.cpp:324 incidenceformatter.cpp:3078
+#: incidenceformatter.cpp:326 incidenceformatter.cpp:3082
 msgid "Optional Participants:"
 msgstr ""
 
-#: incidenceformatter.cpp:333 incidenceformatter.cpp:3085
+#: incidenceformatter.cpp:335 incidenceformatter.cpp:3089
 msgid "Observers:"
 msgstr ""
 
-#: incidenceformatter.cpp:259
+#: incidenceformatter.cpp:354
 msgid "Show mail"
 msgstr ""
 
-#: incidenceformatter.cpp:282
+#: incidenceformatter.cpp:378
 #, kde-format
 msgid "Creation date: %1"
 msgstr ""
 
-#: incidenceformatter.cpp:399 incidenceformatter.cpp:555
-#: incidenceformatter.cpp:684
+#: incidenceformatter.cpp:484 incidenceformatter.cpp:657
+#: incidenceformatter.cpp:806 incidenceformatter.cpp:3117
 msgid "Calendar:"
 msgstr ""
 
-#: incidenceformatter.cpp:407 incidenceformatter.cpp:563
-#: resourcelocalconfig.cpp:67 resourcelocaldirconfig.cpp:61
+#: incidenceformatter.cpp:491
+msgctxt "@title:column event location"
 msgid "Location:"
-msgstr "Lleoliad:"
+msgstr ""
 
-#: incidenceformatter.cpp:432 incidenceformatter.cpp:439
-#: incidenceformatter.cpp:447 incidenceformatter.cpp:467
-#: incidenceformatter.cpp:691 incidenceformatter.cpp:1177
-#: incidenceformatter.cpp:1314
+#: incidenceformatter.cpp:517 incidenceformatter.cpp:524
+#: incidenceformatter.cpp:532 incidenceformatter.cpp:539
+#: incidenceformatter.cpp:812 incidenceformatter.cpp:1393
+#: incidenceformatter.cpp:1518
 msgid "Date:"
 msgstr "Dyddiad:"
 
-#: incidenceformatter.cpp:434 incidenceformatter.cpp:449
-#: incidenceformatter.cpp:457
+#: incidenceformatter.cpp:519 incidenceformatter.cpp:534
+#: incidenceformatter.cpp:549
 #, kde-format
 msgctxt "<beginTime> - <endTime>"
 msgid "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:441 incidenceformatter.cpp:469
+#: incidenceformatter.cpp:526 incidenceformatter.cpp:541
 #, kde-format
 msgctxt "date as string"
 msgid "%1"
 msgstr "%1"
 
-#: incidenceformatter.cpp:454 incidenceformatter.cpp:1179
+#: incidenceformatter.cpp:546 incidenceformatter.cpp:1395
 msgid "Time:"
 msgstr ""
 
-#: incidenceformatter.cpp:1225
+#: incidenceformatter.cpp:565 incidenceformatter.cpp:708
+#: incidenceformatter.cpp:1423 incidenceformatter.cpp:3132
 msgid "Duration:"
 msgstr "Hyd:"
 
-#: incidenceformatter.cpp:1229
+#: incidenceformatter.cpp:572 incidenceformatter.cpp:715
+#: incidenceformatter.cpp:1427 incidenceformatter.cpp:3138
 msgid "Recurrence:"
 msgstr ""
 
-#: incidenceformatter.cpp:479
+#: incidenceformatter.cpp:585
 msgid "Anniversary:"
 msgstr ""
 
-#: incidenceformatter.cpp:481
+#: incidenceformatter.cpp:587
 msgid "Birthday:"
 msgstr ""
 
-#: incidenceformatter.cpp:491 incidenceformatter.cpp:604
-#: incidenceformatter.cpp:699 incidenceformatter.cpp:1108
-#: incidenceformatter.cpp:1315
+#: incidenceformatter.cpp:597 incidenceformatter.cpp:724
+#: incidenceformatter.cpp:820 incidenceformatter.cpp:1324
+#: incidenceformatter.cpp:1519 incidenceformatter.cpp:3154
 msgid "Description:"
 msgstr "Disgrifiad:"
 
-#: incidenceformatter.cpp:610 incidenceformatter.cpp:737
-#: incidenceformatter.cpp:3157
+#: incidenceformatter.cpp:608 incidenceformatter.cpp:735
+#: incidenceformatter.cpp:3162
 msgid "Reminder:"
 msgid_plural "Reminders:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:500 incidenceformatter.cpp:613
-#: incidenceformatter.cpp:708
+#: incidenceformatter.cpp:620 incidenceformatter.cpp:747
+#: incidenceformatter.cpp:829 incidenceformatter.cpp:3172
 msgid "Category:"
 msgid_plural "Categories:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:526 incidenceformatter.cpp:655
+#: incidenceformatter.cpp:630 incidenceformatter.cpp:779
 msgid "Attachment:"
 msgid_plural "Attachments:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:577
+#: incidenceformatter.cpp:664
+msgctxt "@title:column to-do location"
+msgid "Location:"
+msgstr ""
+
+#: incidenceformatter.cpp:678
 msgctxt "to-do start date/time"
 msgid "Start:"
 msgstr ""
 
-#: incidenceformatter.cpp:594
+#: incidenceformatter.cpp:697
 msgctxt "to-do due date/time"
 msgid "Due:"
 msgstr ""
 
-#: incidenceformatter.cpp:620
+#: incidenceformatter.cpp:755 incidenceformatter.cpp:2918
 msgid "Priority:"
 msgstr ""
 
-#: incidenceformatter.cpp:766 incidenceformatter.cpp:2920
+#: incidenceformatter.cpp:764 incidenceformatter.cpp:2924
 msgctxt "Completed: date"
 msgid "Completed:"
 msgstr ""
 
-#: incidenceformatter.cpp:770 incidenceformatter.cpp:2923
+#: incidenceformatter.cpp:768 incidenceformatter.cpp:2927
 msgid "Percent Done:"
 msgstr ""
 
-#: incidenceformatter.cpp:633
+#: incidenceformatter.cpp:770 incidenceformatter.cpp:2234
+#: incidenceformatter.cpp:2235 incidenceformatter.cpp:2928
 #, kde-format
 msgid "%1%"
 msgstr ""
 
-#: incidenceformatter.cpp:731 incidenceformatter.cpp:2454
+#: incidenceformatter.cpp:852 incidenceformatter.cpp:2979
 #, kde-format
 msgid "Free/Busy information for %1"
 msgstr ""
 
-#: incidenceformatter.cpp:734
+#: incidenceformatter.cpp:855
 #, kde-format
 msgid "Busy times in date range %1 - %2:"
 msgstr ""
 
-#: incidenceformatter.cpp:742
+#: incidenceformatter.cpp:863
 msgctxt "tag for busy periods list"
 msgid "Busy:"
 msgstr ""
 
-#: incidenceformatter.cpp:751 incidenceformatter.cpp:1346
+#: incidenceformatter.cpp:872 incidenceformatter.cpp:1550
 #, kde-format
 msgctxt "hours part of duration"
 msgid "1 hour "
@@ -531,7 +541,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:755
+#: incidenceformatter.cpp:876
 #, kde-format
 msgctxt "minutes part duration"
 msgid "1 minute "
@@ -539,7 +549,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:759 incidenceformatter.cpp:1354
+#: incidenceformatter.cpp:880 incidenceformatter.cpp:1558
 #, kde-format
 msgctxt "seconds part of duration"
 msgid "1 second"
@@ -547,158 +557,164 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:761 incidenceformatter.cpp:1357
+#: incidenceformatter.cpp:882 incidenceformatter.cpp:1561
 #, kde-format
 msgctxt "startDate for duration"
 msgid "%1 for %2"
 msgstr ""
 
-#: incidenceformatter.cpp:767 incidenceformatter.cpp:1363
+#: incidenceformatter.cpp:888 incidenceformatter.cpp:1567
 #, kde-format
 msgctxt "date, fromTime - toTime "
 msgid "%1, %2 - %3"
 msgstr ""
 
-#: incidenceformatter.cpp:772 incidenceformatter.cpp:1368
+#: incidenceformatter.cpp:893 incidenceformatter.cpp:1572
 #, kde-format
 msgctxt "fromDateTime - toDateTime"
 msgid "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:893
+#: incidenceformatter.cpp:1047
 #, kde-format
 msgctxt "%1: Start Date, %2: Start Time"
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:897
+#: incidenceformatter.cpp:1051
 #, kde-format
 msgctxt "%1: Start Date"
 msgid "%1 (all day)"
 msgstr ""
 
-#: incidenceformatter.cpp:908
+#: incidenceformatter.cpp:1062
 #, kde-format
 msgctxt "%1: End Date, %2: End Time"
 msgid "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:912
+#: incidenceformatter.cpp:1066
 #, kde-format
 msgctxt "%1: End Date"
 msgid "%1 (all day)"
 msgstr ""
 
-#: incidenceformatter.cpp:999
+#: incidenceformatter.cpp:1183
 msgid "Your response is requested"
 msgstr ""
 
-#: incidenceformatter.cpp:1187
+#: incidenceformatter.cpp:1185
 #, kde-format
 msgid "Your response as <b>%1</b> is requested"
 msgstr ""
 
-#: incidenceformatter.cpp:1191
+#: incidenceformatter.cpp:1189
 msgid "No response is necessary"
 msgstr ""
 
-#: incidenceformatter.cpp:1193
+#: incidenceformatter.cpp:1191
 #, kde-format
 msgid "No response as <b>%1</b> is necessary"
 msgstr ""
 
-#: incidenceformatter.cpp:1204
+#: incidenceformatter.cpp:1202
 #, kde-format
 msgid "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)"
 msgstr ""
 
-#: incidenceformatter.cpp:1118
+#: incidenceformatter.cpp:1334
 msgid "Comments:"
 msgstr ""
 
-#: incidenceformatter.cpp:1143 incidenceformatter.cpp:1245
-#: incidenceformatter.cpp:1298
+#: incidenceformatter.cpp:1359 incidenceformatter.cpp:1443
+#: incidenceformatter.cpp:1502
 msgid "Summary unspecified"
 msgstr ""
 
-#: incidenceformatter.cpp:1155 incidenceformatter.cpp:1257
+#: incidenceformatter.cpp:1371
+msgctxt "event location"
 msgid "Location unspecified"
 msgstr ""
 
-#: incidenceformatter.cpp:1172 incidenceformatter.cpp:1274
+#: incidenceformatter.cpp:1388 incidenceformatter.cpp:1472
 msgid "What:"
 msgstr "Beth :"
 
-#: incidenceformatter.cpp:1173 incidenceformatter.cpp:1275
+#: incidenceformatter.cpp:1389 incidenceformatter.cpp:1473
 msgid "Where:"
 msgstr "Lle :"
 
-#: incidenceformatter.cpp:1185
+#: incidenceformatter.cpp:1401
 msgctxt "starting date"
 msgid "From:"
 msgstr ""
 
-#: incidenceformatter.cpp:1188
+#: incidenceformatter.cpp:1404
 msgctxt "starting time"
 msgid "At:"
 msgstr ""
 
-#: incidenceformatter.cpp:1192 incidenceformatter.cpp:1199
+#: incidenceformatter.cpp:1408 incidenceformatter.cpp:1415
 msgctxt "ending date"
 msgid "To:"
 msgstr ""
 
-#: incidenceformatter.cpp:1195
+#: incidenceformatter.cpp:1411
 msgctxt "ending time"
 msgid "At:"
 msgstr ""
 
-#: incidenceformatter.cpp:1200
+#: incidenceformatter.cpp:1416
 msgid "no end date specified"
 msgstr ""
 
-#: incidenceformatter.cpp:1278
+#: incidenceformatter.cpp:1455
+msgctxt "todo location"
+msgid "Location unspecified"
+msgstr ""
+
+#: incidenceformatter.cpp:1476
 msgid "Start Date:"
 msgstr ""
 
-#: incidenceformatter.cpp:1480
+#: incidenceformatter.cpp:1478
 msgid "Start Time:"
 msgstr "Amser Dechrau :"
 
-#: incidenceformatter.cpp:1281 incidenceformatter.cpp:1283
+#: incidenceformatter.cpp:1482 incidenceformatter.cpp:1487
 msgid "Due Date:"
 msgstr ""
 
-#: incidenceformatter.cpp:1486
+#: incidenceformatter.cpp:1484
 msgid "Due Time:"
 msgstr ""
 
-#: incidenceformatter.cpp:1283
+#: incidenceformatter.cpp:1487
 msgctxt "no to-do due date"
 msgid "None"
 msgstr ""
 
-#: incidenceformatter.cpp:1299
+#: incidenceformatter.cpp:1503
 msgid "Description unspecified"
 msgstr ""
 
-#: incidenceformatter.cpp:1313
+#: incidenceformatter.cpp:1517
 msgid "Summary:"
 msgstr "Crynodeb:"
 
-#: incidenceformatter.cpp:1331
+#: incidenceformatter.cpp:1535
 msgid "Person:"
 msgstr ""
 
-#: incidenceformatter.cpp:1332
+#: incidenceformatter.cpp:1536
 msgid "Start date:"
 msgstr "Dyddiad dechrau:"
 
-#: incidenceformatter.cpp:1333
+#: incidenceformatter.cpp:1537
 msgid "End date:"
 msgstr "Dyddiad gorffen:"
 
-#: incidenceformatter.cpp:1350
+#: incidenceformatter.cpp:1554
 #, kde-format
 msgctxt "minutes part of duration"
 msgid "1 minute"
@@ -706,1089 +722,1098 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:1617
+#: incidenceformatter.cpp:1615
 msgid "This invitation has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:1620
+#: incidenceformatter.cpp:1618
 #, kde-format
 msgid "This invitation has been updated by the organizer %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1624
+#: incidenceformatter.cpp:1622
 msgid "I created this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1400
+#: incidenceformatter.cpp:1626
 #, kde-format
 msgid "You received an invitation from %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1403
+#: incidenceformatter.cpp:1629
 msgid "You received an invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1635
+#: incidenceformatter.cpp:1633
 #, kde-format
 msgid "You received an invitation from %1 as a representative of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1638
+#: incidenceformatter.cpp:1636
 #, kde-format
 msgid "You received an invitation from %1 as the organizer's representative"
 msgstr ""
 
-#: incidenceformatter.cpp:1407
+#: incidenceformatter.cpp:1642
 msgid "This invitation was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:1409
+#: incidenceformatter.cpp:1644
 msgid "This invitation has been canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:1411
+#: incidenceformatter.cpp:1646
 msgid "Addition to the invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1429
+#: incidenceformatter.cpp:1651 incidenceformatter.cpp:1663
+#: incidenceformatter.cpp:1728 incidenceformatter.cpp:1732
+#: incidenceformatter.cpp:1786 incidenceformatter.cpp:1798
+#: incidenceformatter.cpp:1872 incidenceformatter.cpp:1876
 msgid "Sender"
 msgstr ""
 
-#: incidenceformatter.cpp:1652 incidenceformatter.cpp:1729
-#: incidenceformatter.cpp:1787 incidenceformatter.cpp:1873
+#: incidenceformatter.cpp:1650 incidenceformatter.cpp:1727
+#: incidenceformatter.cpp:1785 incidenceformatter.cpp:1871
 #, kde-format
 msgid "%1 makes this counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:1440
+#: incidenceformatter.cpp:1674
 #, kde-format
 msgid "%1 indicates this invitation still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:1680
+#: incidenceformatter.cpp:1678
 #, kde-format
 msgid "This invitation has been updated by attendee %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1682
+#: incidenceformatter.cpp:1680
 msgid "This invitation has been updated by an attendee"
 msgstr ""
 
-#: incidenceformatter.cpp:1443
+#: incidenceformatter.cpp:1684
 #, kde-format
 msgid "%1 accepts this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1445
+#: incidenceformatter.cpp:1686
 #, kde-format
 msgid "%1 accepts this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1450
+#: incidenceformatter.cpp:1692
 #, kde-format
 msgid "%1 tentatively accepts this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1452
+#: incidenceformatter.cpp:1694
 #, kde-format
 msgid "%1 tentatively accepts this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1457
+#: incidenceformatter.cpp:1699
 #, kde-format
 msgid "%1 declines this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1459
+#: incidenceformatter.cpp:1701
 #, kde-format
 msgid "%1 declines this invitation on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1470
+#: incidenceformatter.cpp:1712
 #, kde-format
 msgid "%1 has delegated this invitation to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1472
+#: incidenceformatter.cpp:1714
 #, kde-format
 msgid "%1 has delegated this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1476
+#: incidenceformatter.cpp:1718
 msgid "This invitation is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:1478
+#: incidenceformatter.cpp:1720
 #, kde-format
 msgid "%1 is still processing the invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1480
+#: incidenceformatter.cpp:1722
 msgid "Unknown response to this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1733 incidenceformatter.cpp:1877
+#: incidenceformatter.cpp:1731 incidenceformatter.cpp:1875
 #, kde-format
 msgid "%1 declines the counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:1489
+#: incidenceformatter.cpp:1735
 msgid "Error: Event iTIP message with unknown method"
 msgstr ""
 
-#: incidenceformatter.cpp:1503
+#: incidenceformatter.cpp:1750
 msgid "This to-do has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:1755
+#: incidenceformatter.cpp:1753
 #, kde-format
 msgid "This to-do has been updated by the organizer %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1759
+#: incidenceformatter.cpp:1757
 msgid "I created this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1763
+#: incidenceformatter.cpp:1761
 #, kde-format
 msgid "You have been assigned this to-do by %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1508
+#: incidenceformatter.cpp:1763
 msgid "You have been assigned this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1769
+#: incidenceformatter.cpp:1767
 #, kde-format
 msgid "You have been assigned this to-do by %1 as a representative of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1772
+#: incidenceformatter.cpp:1770
 #, kde-format
 msgid ""
 "You have been assigned this to-do by %1 as the organizer's representative"
 msgstr ""
 
-#: incidenceformatter.cpp:1511
+#: incidenceformatter.cpp:1777
 msgid "This to-do was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:1513
+#: incidenceformatter.cpp:1779
 msgid "This to-do was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:1515
+#: incidenceformatter.cpp:1781
 msgid "Addition to the to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1811
+#: incidenceformatter.cpp:1809
 #, kde-format
 msgid "%1 indicates this to-do assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:1817
+#: incidenceformatter.cpp:1815
 #, kde-format
 msgid "This to-do has been completed by assignee %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1819
+#: incidenceformatter.cpp:1817
 #, kde-format
 msgid "This to-do has been updated by assignee %1"
 msgstr ""
 
-#: incidenceformatter.cpp:1823
+#: incidenceformatter.cpp:1821
 msgid "This to-do has been completed by an assignee"
 msgstr ""
 
-#: incidenceformatter.cpp:1825
+#: incidenceformatter.cpp:1823
 msgid "This to-do has been updated by an assignee"
 msgstr ""
 
-#: incidenceformatter.cpp:1830
+#: incidenceformatter.cpp:1828
 #, kde-format
 msgid "%1 accepts this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1832
+#: incidenceformatter.cpp:1830
 #, kde-format
 msgid "%1 accepts this to-do on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1838
+#: incidenceformatter.cpp:1836
 #, kde-format
 msgid "%1 tentatively accepts this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1840
+#: incidenceformatter.cpp:1838
 #, kde-format
 msgid "%1 tentatively accepts this to-do on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1845
+#: incidenceformatter.cpp:1843
 #, kde-format
 msgid "%1 declines this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1847
+#: incidenceformatter.cpp:1845
 #, kde-format
 msgid "%1 declines this to-do on behalf of %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1858
+#: incidenceformatter.cpp:1856
 #, kde-format
 msgid "%1 has delegated this to-do to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1860
+#: incidenceformatter.cpp:1858
 #, kde-format
 msgid "%1 has delegated this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1552
+#: incidenceformatter.cpp:1862
 msgid "The request for this to-do is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:1866
+#: incidenceformatter.cpp:1864
 #, kde-format
 msgid "%1 is still processing the to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1556
+#: incidenceformatter.cpp:1866
 msgid "Unknown response to this to-do"
 msgstr ""
 
-#: incidenceformatter.cpp:1565
+#: incidenceformatter.cpp:1879
 msgid "Error: To-do iTIP message with unknown method"
 msgstr ""
 
-#: incidenceformatter.cpp:1579
+#: incidenceformatter.cpp:1893
 msgid "This journal has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:1581
+#: incidenceformatter.cpp:1895
 msgid "You have been assigned this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1583
+#: incidenceformatter.cpp:1897
 msgid "This journal was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:1585
+#: incidenceformatter.cpp:1899
 msgid "This journal was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:1587
+#: incidenceformatter.cpp:1901
 msgid "Addition to the journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1485 incidenceformatter.cpp:1561
-#: incidenceformatter.cpp:1622 incidenceformatter.cpp:1652
+#: incidenceformatter.cpp:1905 incidenceformatter.cpp:1940
+#: incidenceformatter.cpp:1970
 msgid "Sender makes this counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:1603
+#: incidenceformatter.cpp:1921
 msgid "Sender indicates this journal assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:1605
+#: incidenceformatter.cpp:1923
 msgid "Sender accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1607
+#: incidenceformatter.cpp:1925
 msgid "Sender tentatively accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1609
+#: incidenceformatter.cpp:1927
 msgid "Sender declines this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1611
+#: incidenceformatter.cpp:1929
 msgid "Sender has delegated this request for the journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1613
+#: incidenceformatter.cpp:1931
 msgid "The request for this journal is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:1554 incidenceformatter.cpp:1615
+#: incidenceformatter.cpp:1933
 msgid "Sender is still processing the invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:1617
+#: incidenceformatter.cpp:1935
 msgid "Unknown response to this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1487 incidenceformatter.cpp:1563
-#: incidenceformatter.cpp:1624 incidenceformatter.cpp:1654
+#: incidenceformatter.cpp:1942 incidenceformatter.cpp:1972
 msgid "Sender declines the counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:1626
+#: incidenceformatter.cpp:1944
 msgid "Error: Journal iTIP message with unknown method"
 msgstr ""
 
-#: incidenceformatter.cpp:1640
+#: incidenceformatter.cpp:1958
 msgid "This free/busy list has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:1642
+#: incidenceformatter.cpp:1960
 msgid "The free/busy list has been requested"
 msgstr ""
 
-#: incidenceformatter.cpp:1644
+#: incidenceformatter.cpp:1962
 msgid "This free/busy list was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:1646
+#: incidenceformatter.cpp:1964
 msgid "This free/busy list was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:1648
+#: incidenceformatter.cpp:1966
 msgid "Addition to the free/busy list"
 msgstr ""
 
-#: incidenceformatter.cpp:1650
+#: incidenceformatter.cpp:1968
 msgid "Reply to the free/busy list"
 msgstr ""
 
-#: incidenceformatter.cpp:1656
+#: incidenceformatter.cpp:1974
 msgid "Error: Free/Busy iTIP message with unknown method"
 msgstr ""
 
-#: incidenceformatter.cpp:1670
+#: incidenceformatter.cpp:1988
 msgid "Invitation List"
 msgstr ""
 
-#: incidenceformatter.cpp:1702
+#: incidenceformatter.cpp:2020
 msgctxt "no attendees"
 msgid "None"
 msgstr ""
 
-#: incidenceformatter.cpp:1717
+#: incidenceformatter.cpp:2035
 msgid "Attached Documents:"
 msgstr ""
 
-#: incidenceformatter.cpp:1886
+#: incidenceformatter.cpp:2211
 #, kde-format
 msgid "The invitation starting time has been changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1891
+#: incidenceformatter.cpp:2216
 #, kde-format
 msgid "The invitation ending time has been changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2229
+#: incidenceformatter.cpp:2228
 msgid "The to-do has been completed"
 msgstr ""
 
-#: incidenceformatter.cpp:2232
+#: incidenceformatter.cpp:2231
 msgid "The to-do is no longer completed"
 msgstr ""
 
-#: incidenceformatter.cpp:2237
+#: incidenceformatter.cpp:2236
 #, kde-format
 msgid "The task completed percentage has changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2242
+#: incidenceformatter.cpp:2241
 msgid "A to-do starting time has been added"
 msgstr ""
 
-#: incidenceformatter.cpp:2245
+#: incidenceformatter.cpp:2244
 msgid "The to-do starting time has been removed"
 msgstr ""
 
-#: incidenceformatter.cpp:2249
+#: incidenceformatter.cpp:2248
 #, kde-format
 msgid "The to-do starting time has been changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2255
+#: incidenceformatter.cpp:2254
 msgid "A to-do due time has been added"
 msgstr ""
 
-#: incidenceformatter.cpp:2258
+#: incidenceformatter.cpp:2257
 msgid "The to-do due time has been removed"
 msgstr ""
 
-#: incidenceformatter.cpp:2262
+#: incidenceformatter.cpp:2261
 #, kde-format
 msgid "The to-do due time has been changed from %1 to %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1903
+#: incidenceformatter.cpp:2274
 #, kde-format
 msgid "The summary has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1908
+#: incidenceformatter.cpp:2279
 #, kde-format
+msgctxt "event/todo location"
 msgid "The location has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1913
+#: incidenceformatter.cpp:2284
 #, kde-format
 msgid "The description has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1923
+#: incidenceformatter.cpp:2294
 #, kde-format
 msgid "Attendee %1 has been added"
 msgstr ""
 
-#: incidenceformatter.cpp:1926
+#: incidenceformatter.cpp:2297
 #, kde-format
 msgid "The status of attendee %1 has been changed to: %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1936
+#: incidenceformatter.cpp:2309
 #, kde-format
 msgid "Attendee %1 has been removed"
 msgstr ""
 
-#: incidenceformatter.cpp:2369
+#: incidenceformatter.cpp:2373
 msgid "[Record]"
 msgstr ""
 
-#: incidenceformatter.cpp:2374
+#: incidenceformatter.cpp:2378
 msgid "[Move to Trash]"
 msgstr ""
 
-#: incidenceformatter.cpp:2118
+#: incidenceformatter.cpp:2385
 msgctxt "accept invitation"
 msgid "Accept"
 msgstr ""
 
-#: incidenceformatter.cpp:2125
+#: incidenceformatter.cpp:2391
 msgctxt "Accept invitation conditionally"
 msgid "Accept cond."
 msgstr ""
 
-#: incidenceformatter.cpp:2134
+#: incidenceformatter.cpp:2397
 msgctxt "invitation counter proposal"
 msgid "Counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:2143
+#: incidenceformatter.cpp:2403
 msgctxt "decline invitation"
 msgid "Decline"
 msgstr ""
 
-#: incidenceformatter.cpp:2152
+#: incidenceformatter.cpp:2411
 msgctxt "delegate inviation to another"
 msgid "Delegate"
 msgstr ""
 
-#: incidenceformatter.cpp:2159
+#: incidenceformatter.cpp:2417
 msgctxt "forward request to another"
 msgid "Forward"
 msgstr ""
 
-#: incidenceformatter.cpp:2167
+#: incidenceformatter.cpp:2424
 msgctxt "look for scheduling conflicts"
 msgid "Check my calendar"
 msgstr ""
 
-#: incidenceformatter.cpp:2437
+#: incidenceformatter.cpp:2441
 msgid "[Accept]"
 msgstr ""
 
-#: incidenceformatter.cpp:2442
+#: incidenceformatter.cpp:2446
 msgid "[Decline]"
 msgstr ""
 
-#: incidenceformatter.cpp:2448
+#: incidenceformatter.cpp:2452
 msgid "[Check my calendar] "
 msgstr ""
 
-#: incidenceformatter.cpp:2525
+#: incidenceformatter.cpp:2529
 msgid "The following changes have been made by the organizer:"
 msgstr ""
 
-#: incidenceformatter.cpp:2535
+#: incidenceformatter.cpp:2539
 #, kde-format
 msgid "The following changes have been made by %1:"
 msgstr ""
 
-#: incidenceformatter.cpp:2537
+#: incidenceformatter.cpp:2541
 msgid "The following changes have been made by an attendee:"
 msgstr ""
 
-#: incidenceformatter.cpp:2589
+#: incidenceformatter.cpp:2593
 #, kde-format
 msgid "Your <b>%1</b> response has already been recorded"
 msgstr ""
 
-#: incidenceformatter.cpp:2591
+#: incidenceformatter.cpp:2595
 #, kde-format
 msgid "Your status for this invitation is <b>%1</b>"
 msgstr ""
 
-#: incidenceformatter.cpp:2082
+#: incidenceformatter.cpp:2599
 msgid "This invitation was declined"
 msgstr ""
 
-#: incidenceformatter.cpp:2084
+#: incidenceformatter.cpp:2601
 msgid "This invitation was accepted"
 msgstr ""
 
-#: incidenceformatter.cpp:2602
+#: incidenceformatter.cpp:2606
 msgid "Awaiting delegation response"
 msgstr ""
 
-#: incidenceformatter.cpp:2106
+#: incidenceformatter.cpp:2638
 msgid "[Record invitation in my to-do list]"
 msgstr ""
 
-#: incidenceformatter.cpp:2108
+#: incidenceformatter.cpp:2640
 msgid "[Record invitation in my calendar]"
 msgstr ""
 
-#: incidenceformatter.cpp:2181
+#: incidenceformatter.cpp:2656
 msgid "Remove invitation from my to-do list"
 msgstr ""
 
-#: incidenceformatter.cpp:2184
+#: incidenceformatter.cpp:2659
 msgid "Remove invitation from my calendar"
 msgstr ""
 
-#: incidenceformatter.cpp:2203
+#: incidenceformatter.cpp:2701
 msgid "The response has already been recorded"
 msgstr ""
 
-#: incidenceformatter.cpp:2208
+#: incidenceformatter.cpp:2706
 msgid "[Record response in my to-do list]"
 msgstr ""
 
-#: incidenceformatter.cpp:2210
+#: incidenceformatter.cpp:2708
 msgid "[Record response in my calendar]"
 msgstr ""
 
-#: incidenceformatter.cpp:2343
+#: incidenceformatter.cpp:2856
 #, kde-format
 msgctxt "Event start"
 msgid "<i>From:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:2346
+#: incidenceformatter.cpp:2859
 #, kde-format
 msgctxt "Event end"
 msgid "<i>To:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:2351 incidenceformatter.cpp:2415
+#: incidenceformatter.cpp:2864 incidenceformatter.cpp:2940
 #, kde-format
 msgid "<i>Date:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:2358
+#: incidenceformatter.cpp:2871
 #, kde-format
 msgctxt "time for event"
 msgid "<i>Time:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:2363
+#: incidenceformatter.cpp:2876
 #, kde-format
 msgctxt "time range for event"
 msgid "<i>Time:</i> %1 - %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2384
+#: incidenceformatter.cpp:2897
 #, kde-format
 msgid "<i>Start:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:2395
+#: incidenceformatter.cpp:2910
 #, kde-format
 msgid "<i>Due:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:2425 incidenceformatter.cpp:2428
+#: incidenceformatter.cpp:2950 incidenceformatter.cpp:2953
 #, kde-format
 msgid "<i>Period start:</i> %1"
 msgstr ""
 
-#: incidenceformatter.cpp:3009
+#: incidenceformatter.cpp:3012
 msgctxt "separator for lists of people names"
 msgid ", "
 msgstr ""
 
-#: incidenceformatter.cpp:3005
+#: incidenceformatter.cpp:3031 incidenceformatter.cpp:3146
 msgctxt "elipsis"
 msgid "..."
 msgstr ""
 
-#: incidenceformatter.cpp:2539
+#: incidenceformatter.cpp:3125
+msgctxt "event/todo location"
+msgid "Location:"
+msgstr ""
+
+#: incidenceformatter.cpp:3233
 #, kde-format
 msgid "Summary: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2542
+#: incidenceformatter.cpp:3236
 #, kde-format
 msgid "Organizer: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2545
+#: incidenceformatter.cpp:3239
 #, kde-format
+msgctxt "event/todo location"
 msgid "Location: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2576
+#: incidenceformatter.cpp:3270
 msgid "This is a Free Busy Object"
 msgstr "Gwrthrych Rhydd Brysur yw Hwn"
 
-#: incidenceformatter.cpp:2587
+#: incidenceformatter.cpp:3281
 msgctxt "no recurrence"
 msgid "None"
 msgstr "Dim"
 
-#: incidenceformatter.cpp:2588
+#: incidenceformatter.cpp:3282
 msgctxt "event recurs by minutes"
 msgid "Minutely"
 msgstr ""
 
-#: incidenceformatter.cpp:2589
+#: incidenceformatter.cpp:3283
 msgctxt "event recurs by hours"
 msgid "Hourly"
 msgstr ""
 
-#: incidenceformatter.cpp:2590
+#: incidenceformatter.cpp:3284
 msgctxt "event recurs by days"
 msgid "Daily"
 msgstr ""
 
-#: incidenceformatter.cpp:2591
+#: incidenceformatter.cpp:3285
 msgctxt "event recurs by weeks"
 msgid "Weekly"
 msgstr ""
 
-#: incidenceformatter.cpp:2592
+#: incidenceformatter.cpp:3286
 msgctxt "event recurs same position (e.g. first monday) each month"
 msgid "Monthly Same Position"
 msgstr ""
 
-#: incidenceformatter.cpp:2593
+#: incidenceformatter.cpp:3287
 msgctxt "event recurs same day each month"
 msgid "Monthly Same Day"
 msgstr ""
 
-#: incidenceformatter.cpp:2594
+#: incidenceformatter.cpp:3288
 msgctxt "event recurs same month each year"
 msgid "Yearly Same Month"
 msgstr ""
 
-#: incidenceformatter.cpp:2595
+#: incidenceformatter.cpp:3289
 msgctxt "event recurs same day each year"
 msgid "Yearly Same Day"
 msgstr ""
 
-#: incidenceformatter.cpp:2596
+#: incidenceformatter.cpp:3290
 msgctxt "event recurs same position (e.g. first monday) each year"
 msgid "Yearly Same Position"
 msgstr ""
 
-#: incidenceformatter.cpp:2600 incidenceformatter.cpp:2647
+#: incidenceformatter.cpp:3294 incidenceformatter.cpp:3341
 #, kde-format
 msgid "Start Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2602 incidenceformatter.cpp:2649
+#: incidenceformatter.cpp:3296 incidenceformatter.cpp:3343
 #, kde-format
 msgid "Start Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2605
+#: incidenceformatter.cpp:3299
 #, kde-format
 msgid "End Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2608
+#: incidenceformatter.cpp:3302
 #, kde-format
 msgid "End Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2613
+#: incidenceformatter.cpp:3307
 #, kde-format
 msgid "Recurs: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2614
+#: incidenceformatter.cpp:3308
 #, kde-format
 msgid "Frequency: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2617
+#: incidenceformatter.cpp:3311
 #, kde-format
 msgid "Repeats once"
 msgid_plural "Repeats %1 times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2628
+#: incidenceformatter.cpp:3322
 #, kde-format
 msgid "Repeat until: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2630
+#: incidenceformatter.cpp:3324
 msgid "Repeats forever\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2637 incidenceformatter.cpp:2660
+#: incidenceformatter.cpp:3331 incidenceformatter.cpp:3354
 #, kde-format
 msgid ""
 "Details:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2653
+#: incidenceformatter.cpp:3347
 #, kde-format
 msgid "Due Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2655
+#: incidenceformatter.cpp:3349
 #, kde-format
 msgid "Due Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2668
+#: incidenceformatter.cpp:3362
 #, kde-format
 msgid "Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2670
+#: incidenceformatter.cpp:3364
 #, kde-format
 msgid "Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2673
+#: incidenceformatter.cpp:3367
 #, kde-format
 msgid ""
 "Text of the journal:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2718 incidenceformatter.cpp:2791
+#: incidenceformatter.cpp:3412 incidenceformatter.cpp:3485
 msgid "No recurrence"
 msgstr ""
 
-#: incidenceformatter.cpp:2721
+#: incidenceformatter.cpp:3415
 msgid "31st Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2722
+#: incidenceformatter.cpp:3416
 msgid "30th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2723
+#: incidenceformatter.cpp:3417
 msgid "29th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2724
+#: incidenceformatter.cpp:3418
 msgid "28th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2725
+#: incidenceformatter.cpp:3419
 msgid "27th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2726
+#: incidenceformatter.cpp:3420
 msgid "26th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2727
+#: incidenceformatter.cpp:3421
 msgid "25th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2728
+#: incidenceformatter.cpp:3422
 msgid "24th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2729
+#: incidenceformatter.cpp:3423
 msgid "23rd Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2730
+#: incidenceformatter.cpp:3424
 msgid "22nd Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2731
+#: incidenceformatter.cpp:3425
 msgid "21st Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2732
+#: incidenceformatter.cpp:3426
 msgid "20th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2733
+#: incidenceformatter.cpp:3427
 msgid "19th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2734
+#: incidenceformatter.cpp:3428
 msgid "18th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2735
+#: incidenceformatter.cpp:3429
 msgid "17th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2736
+#: incidenceformatter.cpp:3430
 msgid "16th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2737
+#: incidenceformatter.cpp:3431
 msgid "15th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2738
+#: incidenceformatter.cpp:3432
 msgid "14th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2739
+#: incidenceformatter.cpp:3433
 msgid "13th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2740
+#: incidenceformatter.cpp:3434
 msgid "12th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2741
+#: incidenceformatter.cpp:3435
 msgid "11th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2742
+#: incidenceformatter.cpp:3436
 msgid "10th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2743
+#: incidenceformatter.cpp:3437
 msgid "9th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2744
+#: incidenceformatter.cpp:3438
 msgid "8th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2745
+#: incidenceformatter.cpp:3439
 msgid "7th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2746
+#: incidenceformatter.cpp:3440
 msgid "6th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2747
+#: incidenceformatter.cpp:3441
 msgid "5th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2748
+#: incidenceformatter.cpp:3442
 msgid "4th Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2749
+#: incidenceformatter.cpp:3443
 msgid "3rd Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2750
+#: incidenceformatter.cpp:3444
 msgid "2nd Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2751
+#: incidenceformatter.cpp:3445
 msgctxt "last day of the month"
 msgid "Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2752
+#: incidenceformatter.cpp:3446
 msgctxt "unknown day of the month"
 msgid "unknown"
 msgstr ""
 
-#: incidenceformatter.cpp:2753
+#: incidenceformatter.cpp:3447
 msgid "1st"
 msgstr ""
 
-#: incidenceformatter.cpp:2754
+#: incidenceformatter.cpp:3448
 msgid "2nd"
 msgstr ""
 
-#: incidenceformatter.cpp:2755
+#: incidenceformatter.cpp:3449
 msgid "3rd"
 msgstr ""
 
-#: incidenceformatter.cpp:2756
+#: incidenceformatter.cpp:3450
 msgid "4th"
 msgstr ""
 
-#: incidenceformatter.cpp:2757
+#: incidenceformatter.cpp:3451
 msgid "5th"
 msgstr ""
 
-#: incidenceformatter.cpp:2758
+#: incidenceformatter.cpp:3452
 msgid "6th"
 msgstr ""
 
-#: incidenceformatter.cpp:2759
+#: incidenceformatter.cpp:3453
 msgid "7th"
 msgstr ""
 
-#: incidenceformatter.cpp:2760
+#: incidenceformatter.cpp:3454
 msgid "8th"
 msgstr ""
 
-#: incidenceformatter.cpp:2761
+#: incidenceformatter.cpp:3455
 msgid "9th"
 msgstr ""
 
-#: incidenceformatter.cpp:2762
+#: incidenceformatter.cpp:3456
 msgid "10th"
 msgstr ""
 
-#: incidenceformatter.cpp:2763
+#: incidenceformatter.cpp:3457
 msgid "11th"
 msgstr ""
 
-#: incidenceformatter.cpp:2764
+#: incidenceformatter.cpp:3458
 msgid "12th"
 msgstr ""
 
-#: incidenceformatter.cpp:2765
+#: incidenceformatter.cpp:3459
 msgid "13th"
 msgstr ""
 
-#: incidenceformatter.cpp:2766
+#: incidenceformatter.cpp:3460
 msgid "14th"
 msgstr ""
 
-#: incidenceformatter.cpp:2767
+#: incidenceformatter.cpp:3461
 msgid "15th"
 msgstr ""
 
-#: incidenceformatter.cpp:2768
+#: incidenceformatter.cpp:3462
 msgid "16th"
 msgstr ""
 
-#: incidenceformatter.cpp:2769
+#: incidenceformatter.cpp:3463
 msgid "17th"
 msgstr ""
 
-#: incidenceformatter.cpp:2770
+#: incidenceformatter.cpp:3464
 msgid "18th"
 msgstr ""
 
-#: incidenceformatter.cpp:2771
+#: incidenceformatter.cpp:3465
 msgid "19th"
 msgstr ""
 
-#: incidenceformatter.cpp:2772
+#: incidenceformatter.cpp:3466
 msgid "20th"
 msgstr ""
 
-#: incidenceformatter.cpp:2773
+#: incidenceformatter.cpp:3467
 msgid "21st"
 msgstr ""
 
-#: incidenceformatter.cpp:2774
+#: incidenceformatter.cpp:3468
 msgid "22nd"
 msgstr ""
 
-#: incidenceformatter.cpp:2775
+#: incidenceformatter.cpp:3469
 msgid "23rd"
 msgstr ""
 
-#: incidenceformatter.cpp:2776
+#: incidenceformatter.cpp:3470
 msgid "24th"
 msgstr ""
 
-#: incidenceformatter.cpp:2777
+#: incidenceformatter.cpp:3471
 msgid "25th"
 msgstr ""
 
-#: incidenceformatter.cpp:2778
+#: incidenceformatter.cpp:3472
 msgid "26th"
 msgstr ""
 
-#: incidenceformatter.cpp:2779
+#: incidenceformatter.cpp:3473
 msgid "27th"
 msgstr ""
 
-#: incidenceformatter.cpp:2780
+#: incidenceformatter.cpp:3474
 msgid "28th"
 msgstr ""
 
-#: incidenceformatter.cpp:2781
+#: incidenceformatter.cpp:3475
 msgid "29th"
 msgstr ""
 
-#: incidenceformatter.cpp:2782
+#: incidenceformatter.cpp:3476
 msgid "30th"
 msgstr ""
 
-#: incidenceformatter.cpp:2783
+#: incidenceformatter.cpp:3477
 msgid "31st"
 msgstr ""
 
-#: incidenceformatter.cpp:2794
+#: incidenceformatter.cpp:3488
 #, kde-format
 msgid "Recurs every minute until %2"
 msgid_plural "Recurs every %1 minutes until %2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2799 incidenceformatter.cpp:2813
-#: incidenceformatter.cpp:2826 incidenceformatter.cpp:2855
-#: incidenceformatter.cpp:2880 incidenceformatter.cpp:2907
-#: incidenceformatter.cpp:2934 incidenceformatter.cpp:2977
-#: incidenceformatter.cpp:3006
+#: incidenceformatter.cpp:3493 incidenceformatter.cpp:3507
+#: incidenceformatter.cpp:3520 incidenceformatter.cpp:3549
+#: incidenceformatter.cpp:3574 incidenceformatter.cpp:3601
+#: incidenceformatter.cpp:3628 incidenceformatter.cpp:3671
+#: incidenceformatter.cpp:3700
 #, kde-format
 msgctxt "number of occurrences"
 msgid " (<numid>%1</numid> occurrences)"
 msgstr ""
 
-#: incidenceformatter.cpp:2804
+#: incidenceformatter.cpp:3498
 #, kde-format
 msgid "Recurs every minute"
 msgid_plural "Recurs every %1 minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2808
+#: incidenceformatter.cpp:3502
 #, kde-format
 msgid "Recurs hourly until %2"
 msgid_plural "Recurs every %1 hours until %2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2818
+#: incidenceformatter.cpp:3512
 #, kde-format
 msgid "Recurs hourly"
 msgid_plural "Recurs every %1 hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2821
+#: incidenceformatter.cpp:3515
 #, kde-format
 msgid "Recurs daily until %2"
 msgid_plural "Recurs every %1 days until %2"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2831
+#: incidenceformatter.cpp:3525
 #, kde-format
 msgid "Recurs daily"
 msgid_plural "Recurs every %1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2838
+#: incidenceformatter.cpp:3532
 msgctxt "separator for list of days"
 msgid ", "
 msgstr ""
 
-#: incidenceformatter.cpp:2846
+#: incidenceformatter.cpp:3540
 msgctxt "Recurs weekly on no days"
 msgid "no days"
 msgstr ""
 
-#: incidenceformatter.cpp:2850
+#: incidenceformatter.cpp:3544
 #, kde-format
 msgctxt "Recurs weekly on [list of days] until end-date"
 msgid "Recurs weekly on %2 until %3"
@@ -1796,7 +1821,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2861
+#: incidenceformatter.cpp:3555
 #, kde-format
 msgctxt "Recurs weekly on [list of days]"
 msgid "Recurs weekly on %2"
@@ -1804,7 +1829,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2872
+#: incidenceformatter.cpp:3566
 #, kde-format
 msgctxt ""
 "Recurs every N months on the [2nd|3rd|...] weekdayname until end-date"
@@ -1813,7 +1838,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2886
+#: incidenceformatter.cpp:3580
 #, kde-format
 msgctxt "Recurs every N months on the [2nd|3rd|...] weekdayname"
 msgid "Recurs every month on the %2 %3"
@@ -1821,7 +1846,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2900
+#: incidenceformatter.cpp:3594
 #, kde-format
 msgctxt "Recurs monthly on the [1st|2nd|...] day until end-date"
 msgid "Recurs monthly on the %2 day until %3"
@@ -1829,7 +1854,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2913
+#: incidenceformatter.cpp:3607
 #, kde-format
 msgctxt "Recurs monthly on the [1st|2nd|...] day"
 msgid "Recurs monthly on the %2 day"
@@ -1837,7 +1862,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2926
+#: incidenceformatter.cpp:3620
 #, kde-format
 msgctxt "Recurs Every N years on month-name [1st|2nd|...] until end-date"
 msgid "Recurs yearly on %2 %3 until %4"
@@ -1845,7 +1870,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2942
+#: incidenceformatter.cpp:3636
 #, kde-format
 msgctxt "Recurs Every N years on month-name [1st|2nd|...]"
 msgid "Recurs yearly on %2 %3"
@@ -1853,13 +1878,13 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2951 incidenceformatter.cpp:2957
+#: incidenceformatter.cpp:3645 incidenceformatter.cpp:3651
 #, kde-format
 msgctxt "Recurs Every year on month-name [1st|2nd|...]"
 msgid "Recurs yearly on %1 %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2969
+#: incidenceformatter.cpp:3663
 #, kde-format
 msgctxt "Recurs every N years on day N until end-date"
 msgid "Recurs every year on day <numid>%2</numid> until %3"
@@ -1868,7 +1893,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2983
+#: incidenceformatter.cpp:3677
 #, kde-format
 msgctxt "Recurs every N YEAR[S] on day N"
 msgid "Recurs every year on day <numid>%2</numid>"
@@ -1876,7 +1901,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:2996
+#: incidenceformatter.cpp:3690
 #, kde-format
 msgctxt ""
 "Every N years on the [2nd|3rd|...] weekdayname of monthname until end-date"
@@ -1885,7 +1910,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:3013
+#: incidenceformatter.cpp:3707
 #, kde-format
 msgctxt "Every N years on the [2nd|3rd|...] weekdayname of monthname"
 msgid "Every year on the %2 %3 of %4"
@@ -1893,91 +1918,92 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:3023
+#: incidenceformatter.cpp:3717
 msgid "Incidence recurs"
 msgstr ""
 
-#: incidenceformatter.cpp:1210
+#: incidenceformatter.cpp:3817 incidenceformatter.cpp:3843
+#: incidenceformatter.cpp:3856
 #, kde-format
 msgid "1 day"
 msgid_plural "%1 days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:1216
+#: incidenceformatter.cpp:3823
 #, kde-format
 msgid "1 hour"
 msgid_plural "%1 hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:1222
+#: incidenceformatter.cpp:3829
 #, kde-format
 msgid "1 minute"
 msgid_plural "%1 minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:3842
+#: incidenceformatter.cpp:3847
 msgid "forever"
 msgstr ""
 
-#: incidenceformatter.cpp:3884
+#: incidenceformatter.cpp:3889
 #, kde-format
 msgctxt "N days/hours/minutes before the start datetime"
 msgid "%1 before the start"
 msgstr ""
 
-#: incidenceformatter.cpp:3887
+#: incidenceformatter.cpp:3892
 #, kde-format
 msgctxt "N days/hours/minutes after the start datetime"
 msgid "%1 after the start"
 msgstr ""
 
-#: incidenceformatter.cpp:3899
+#: incidenceformatter.cpp:3904
 #, kde-format
 msgctxt "N days/hours/minutes before the due datetime"
 msgid "%1 before the to-do is due"
 msgstr ""
 
-#: incidenceformatter.cpp:3902
+#: incidenceformatter.cpp:3907
 #, kde-format
 msgctxt "N days/hours/minutes before the end datetime"
 msgid "%1 before the end"
 msgstr ""
 
-#: incidenceformatter.cpp:3907
+#: incidenceformatter.cpp:3912
 #, kde-format
 msgctxt "N days/hours/minutes after the due datetime"
 msgid "%1 after the to-do is due"
 msgstr ""
 
-#: incidenceformatter.cpp:3910
+#: incidenceformatter.cpp:3915
 #, kde-format
 msgctxt "N days/hours/minutes after the end datetime"
 msgid "%1 after the end"
 msgstr ""
 
-#: incidenceformatter.cpp:3928
+#: incidenceformatter.cpp:3933
 #, kde-format
 msgctxt "reminder occurs at datetime"
 msgid "at %1"
 msgstr ""
 
-#: incidenceformatter.cpp:3935
+#: incidenceformatter.cpp:3940
 #, kde-format
 msgid "repeats once"
 msgid_plural "repeats %1 times"
 msgstr[0] ""
 msgstr[1] ""
 
-#: incidenceformatter.cpp:3937
+#: incidenceformatter.cpp:3942
 #, kde-format
 msgctxt "interval is N days/hours/minutes"
 msgid "interval is %1"
 msgstr ""
 
-#: incidenceformatter.cpp:3940
+#: incidenceformatter.cpp:3945
 #, kde-format
 msgctxt "(repeat string, interval string)"
 msgid "(%1, %2)"
@@ -2267,12 +2293,12 @@
 msgid "Busy times"
 msgstr ""
 
-#: resourcecached.cpp:860
+#: resourcecached.cpp:858
 #, kde-format
 msgid "Last loaded: %1"
 msgstr ""
 
-#: resourcecached.cpp:865
+#: resourcecached.cpp:863
 #, kde-format
 msgid "Last saved: %1"
 msgstr ""
@@ -2332,21 +2358,25 @@
 msgid "On every change"
 msgstr ""
 
-#: resourcecalendar.cpp:89
+#: resourcecalendar.cpp:88
 #, kde-format
 msgid "Type: %1"
 msgstr "Math: %1"
 
-#: resourcecalendar.cpp:196
+#: resourcecalendar.cpp:195
 #, kde-format
 msgid "Error while loading %1.\n"
 msgstr ""
 
-#: resourcecalendar.cpp:264
+#: resourcecalendar.cpp:263
 #, kde-format
 msgid "Error while saving %1.\n"
 msgstr ""
 
+#: resourcelocalconfig.cpp:67 resourcelocaldirconfig.cpp:62
+msgid "Location:"
+msgstr "Lleoliad:"
+
 #: resourcelocalconfig.cpp:69
 msgid "*.ics *.vcs|Calendar Files"
 msgstr ""
@@ -2376,83 +2406,84 @@
 msgid "No location specified.  The calendar will be invalid."
 msgstr ""
 
-#: scheduler.cpp:86
-msgctxt "@item new message posting"
-msgid "New Message Publish"
+#: scheduler.cpp:90
+msgctxt "@item this is a new scheduling message"
+msgid "New Scheduling Message"
 msgstr ""
 
-#: scheduler.cpp:88
-msgctxt "@item updated message"
-msgid "Updated Message Published"
+#: scheduler.cpp:93
+msgctxt "@item this is an update to an existing scheduling message"
+msgid "Updated Scheduling Message"
 msgstr ""
 
-#: scheduler.cpp:90
+#: scheduler.cpp:95
 msgctxt "@item obsolete status"
 msgid "Obsolete"
 msgstr ""
 
-#: scheduler.cpp:92
-msgctxt "@item request new message posting"
-msgid "Request New Message"
+#: scheduler.cpp:98
+msgctxt "@item this is a request for a new scheduling message"
+msgid "New Scheduling Message Request"
 msgstr ""
 
-#: scheduler.cpp:94
-msgctxt "@item request updated posting"
-msgid "Request Updated Message"
+#: scheduler.cpp:101
+msgctxt ""
+"@item this is a request for an update to an existing scheduling message"
+msgid "Updated Scheduling Message Request"
 msgstr ""
 
-#: scheduler.cpp:96
+#: scheduler.cpp:103
 #, kde-format
 msgctxt "@item unknown status"
 msgid "Unknown Status: %1"
 msgstr ""
 
-#: scheduler.cpp:205
+#: scheduler.cpp:212
 msgctxt "@item event, to-do, journal or freebusy posting"
 msgid "Publish"
 msgstr ""
 
-#: scheduler.cpp:207
+#: scheduler.cpp:214
 msgctxt "@item event, to-do or freebusy scheduling requests"
 msgid "Request"
 msgstr ""
 
-#: scheduler.cpp:209
+#: scheduler.cpp:216
 msgctxt "@item event, to-do or freebusy reply to request"
 msgid "Reply"
 msgstr ""
 
-#: scheduler.cpp:212
+#: scheduler.cpp:219
 msgctxt "@item event, to-do or journal additional property request"
 msgid "Add"
 msgstr ""
 
-#: scheduler.cpp:214
+#: scheduler.cpp:221
 msgctxt "@item event, to-do or journal cancellation notice"
 msgid "Cancel"
 msgstr ""
 
-#: scheduler.cpp:216
+#: scheduler.cpp:223
 msgctxt "@item event or to-do description update request"
 msgid "Refresh"
 msgstr ""
 
-#: scheduler.cpp:218
+#: scheduler.cpp:225
 msgctxt "@item event or to-do submit counter proposal"
 msgid "Counter"
 msgstr ""
 
-#: scheduler.cpp:220
+#: scheduler.cpp:227
 msgctxt "@item event or to-do decline a counter proposal"
 msgid "Decline Counter"
 msgstr ""
 
-#: scheduler.cpp:222
+#: scheduler.cpp:229
 msgctxt "@item no method"
 msgid "Unknown"
 msgstr ""
 
-#: scheduler.cpp:370
+#: scheduler.cpp:377
 msgctxt "@info"
 msgid ""
 "The event, to-do or journal to be updated could not be found. Maybe it has "
@@ -2460,27 +2491,27 @@
 "'Store' to create a new one or 'Throw away' to discard this update."
 msgstr ""
 
-#: scheduler.cpp:374
+#: scheduler.cpp:381
 msgctxt "@title"
 msgid "Discard this update?"
 msgstr ""
 
-#: scheduler.cpp:375
+#: scheduler.cpp:382
 msgctxt "@option"
 msgid "Store"
 msgstr ""
 
-#: scheduler.cpp:376
+#: scheduler.cpp:383
 msgctxt "@option"
 msgid "Throw away"
 msgstr ""
 
-#: scheduler.cpp:387
+#: scheduler.cpp:393
 msgctxt "@info"
 msgid "No calendars found, unable to save the invitation."
 msgstr ""
 
-#: scheduler.cpp:422
+#: scheduler.cpp:428
 msgctxt "@info"
 msgid ""
 "You canceled the save operation. Therefore, the appointment will not be "
@@ -2488,22 +2519,22 @@
 "certain you want to discard this invitation? "
 msgstr ""
 
-#: scheduler.cpp:425
+#: scheduler.cpp:431
 msgctxt "@title"
 msgid "Discard this invitation?"
 msgstr ""
 
-#: scheduler.cpp:426
+#: scheduler.cpp:432
 msgctxt "@option"
 msgid "Discard"
 msgstr ""
 
-#: scheduler.cpp:427
+#: scheduler.cpp:433
 msgctxt "@option"
 msgid "Go Back to Folder Selection"
 msgstr ""
 
-#: scheduler.cpp:431
+#: scheduler.cpp:437
 #, kde-format
 msgctxt "@info"
 msgid ""
@@ -2513,13 +2544,13 @@
 "notify the organizer %2 and ask them to remove you from the attendee list."
 msgstr ""
 
-#: scheduler.cpp:447
+#: scheduler.cpp:453
 #, kde-format
 msgctxt "@info"
 msgid "Unable to save %1 \"%2\"."
 msgstr ""
 
-#: scheduler.cpp:469
+#: scheduler.cpp:548
 msgctxt "@info"
 msgid ""
 "The event or task could not be removed from your calendar. Maybe it has "
@@ -2527,7 +2558,7 @@
 "only or disabled calendar."
 msgstr ""
 
-#: scheduler.cpp:506
+#: scheduler.cpp:585
 msgctxt "@info"
 msgid ""
 "The event or task to be canceled could not be removed from your calendar. "
@@ -2535,56 +2566,56 @@
 "to a read-only or disabled calendar."
 msgstr ""
 
-#: scheduler.cpp:586
+#: scheduler.cpp:665
 #, kde-format
 msgctxt "@info"
 msgid "%1 wants to attend %2 but was not invited."
 msgstr ""
 
-#: scheduler.cpp:590
+#: scheduler.cpp:669
 #, kde-format
 msgctxt "@info"
 msgid "%1 wants to attend %2 on behalf of %3."
 msgstr ""
 
-#: scheduler.cpp:595
+#: scheduler.cpp:674
 msgctxt "@title"
 msgid "Uninvited attendee"
 msgstr ""
 
-#: scheduler.cpp:596
+#: scheduler.cpp:675
 msgctxt "@option"
 msgid "Accept Attendance"
 msgstr ""
 
-#: scheduler.cpp:597
+#: scheduler.cpp:676
 msgctxt "@option"
 msgid "Reject Attendance"
 msgstr ""
 
-#: scheduler.cpp:602
+#: scheduler.cpp:681
 msgctxt "@info"
 msgid "The organizer rejected your attendance at this meeting."
 msgstr ""
 
-#: scheduler.cpp:704
+#: scheduler.cpp:710
 msgctxt "@info"
 msgid ""
 "An attendee was added to the incidence. Do you want to email the attendees "
 "an update message?"
 msgstr ""
 
-#: scheduler.cpp:706
+#: scheduler.cpp:712
 msgctxt "@title"
 msgid "Attendee Added"
 msgstr ""
 
-#: scheduler.cpp:707
+#: scheduler.cpp:713
 msgctxt "@option"
 msgid "Send Messages"
 msgstr ""
 
-#: scheduler.cpp:708
+#: scheduler.cpp:714
 msgctxt "@option"
 msgid "Do Not Send"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkcddb.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkcddb.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkcddb.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkcddb.po	2012-04-18 08:59:24.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdemultimedia/libkcddb.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:45+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2008-02-15 22:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:58+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:21+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: categories.cpp:22 genres.cpp:70
 msgid "Blues"
@@ -685,25 +685,25 @@
 
 #. i18n: file: cdinfodialog.ui:34
 #. i18n: ectx: property (text), widget (QLabel, lb_revision)
-#: rc.cpp:3 rc.cpp:60
+#: rc.cpp:3
 msgid "Revision:"
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:41
 #. i18n: ectx: property (toolTip), widget (KLineEdit, m_title)
-#: rc.cpp:6 rc.cpp:63
+#: rc.cpp:6
 msgid "Use the name of the artist if there is no title."
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:48
 #. i18n: ectx: property (text), widget (QLabel, lb_category)
-#: rc.cpp:9 rc.cpp:66
+#: rc.cpp:9
 msgid "&Category:"
 msgstr "&Categori :"
 
 #. i18n: file: cdinfodialog.ui:65
 #. i18n: ectx: property (toolTip), widget (KLineEdit, m_artist)
-#: rc.cpp:12 rc.cpp:69
+#: rc.cpp:12
 msgid ""
 "Write names as \"first last\", not \"last, first\". Omit any leading "
 "\"The\".  Use \"Various\" for compilations."
@@ -711,90 +711,90 @@
 
 #. i18n: file: cdinfodialog.ui:72
 #. i18n: ectx: property (text), widget (QLabel, lb_artist)
-#: rc.cpp:15 rc.cpp:72
+#: rc.cpp:15
 msgid "&Artist:"
 msgstr "&Artist:"
 
 #. i18n: file: cdinfodialog.ui:82
 #. i18n: ectx: property (text), widget (QLabel, lb_year)
-#: rc.cpp:18 rc.cpp:75
+#: rc.cpp:18
 msgid "&Year:"
 msgstr "&Blwyddyn :"
 
 #. i18n: file: cdinfodialog.ui:92
 #. i18n: ectx: property (text), widget (QLabel, lb_genre)
-#: rc.cpp:21 rc.cpp:78
+#: rc.cpp:21
 msgid "&Genre:"
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:105
 #. i18n: ectx: property (toolTip), widget (KComboBox, m_category)
-#: rc.cpp:24 rc.cpp:81
+#: rc.cpp:24
 msgid "Disc Id values must be unique within a category."
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:119
 #. i18n: ectx: property (text), widget (QCheckBox, m_multiple)
-#: rc.cpp:27 rc.cpp:84
+#: rc.cpp:27
 msgid "&Multiple artists"
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:129
 #. i18n: ectx: property (text), widget (QLabel, lb_comment)
-#: rc.cpp:30 rc.cpp:87
+#: rc.cpp:30
 msgid "Comment:"
 msgstr "Sylwad:"
 
 #. i18n: file: cdinfodialog.ui:139
 #. i18n: ectx: property (text), widget (QLabel, lb_title)
-#: rc.cpp:33 rc.cpp:90
+#: rc.cpp:33
 msgid "&Title:"
 msgstr "&Teitl:"
 
 #. i18n: file: cdinfodialog.ui:149
 #. i18n: ectx: property (toolTip), widget (KComboBox, m_genre)
-#: rc.cpp:36 rc.cpp:93
+#: rc.cpp:36
 msgid "Avoid custom values, as they will be written to CDDB as-is."
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:162
 #. i18n: ectx: property (text), widget (QLabel, lb_id)
-#: rc.cpp:39 rc.cpp:96
+#: rc.cpp:39
 msgid "Disc Id:"
 msgstr "Dynodiad y disg:"
 
 #. i18n: file: cdinfodialog.ui:169
 #. i18n: ectx: property (text), widget (QLabel, lb_length)
-#: rc.cpp:42 rc.cpp:99
+#: rc.cpp:42
 msgid "Length:"
 msgstr "Hyd:"
 
 #. i18n: file: cdinfodialog.ui:188
 #. i18n: ectx: property (toolTip), widget (QTreeView, m_trackList)
-#: rc.cpp:45 rc.cpp:102
+#: rc.cpp:45
 msgid "For a CD-Extra, set title to \"Data\"."
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:228
 #. i18n: ectx: property (text), widget (QPushButton, m_changeEncoding)
-#: rc.cpp:48 rc.cpp:105
+#: rc.cpp:48
 msgid "Change Encoding..."
 msgstr ""
 
 #. i18n: file: cdinfodialog.ui:237
 #. i18n: ectx: property (text), widget (QLabel, lb_playingOrder)
-#: rc.cpp:51 rc.cpp:108
+#: rc.cpp:51
 msgid "Playing order:"
 msgstr "Trefn chwarae:"
 
 #. i18n: file: cdinfoencodingwidget.ui:23
 #. i18n: ectx: property (text), widget (QLabel, encodingLabel)
-#: rc.cpp:54 rc.cpp:111
+#: rc.cpp:54
 msgid "Encoding"
 msgstr ""
 
 #. i18n: file: cdinfoencodingwidget.ui:33
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: rc.cpp:57 rc.cpp:114
+#: rc.cpp:57
 msgid "Preview"
 msgstr "Rhagolwg"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkdegames.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkdegames.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkdegames.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkdegames.po	2012-04-18 08:59:24.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libkdegames\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2010-09-06 18:34+0000\n"
 "Last-Translator: danielt998 <daniel@fearnley.net>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,118 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:15+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
+
+#: kchatbase.cpp:122
+msgid "Send to All Players"
+msgstr "Anfon i bob chwaraewr"
+
+#: kchatbase.cpp:260 kgame/kgamechat.cpp:170
+#, kde-format
+msgid "Send to %1"
+msgstr "Anfon i %1"
+
+#: kggzgames/kggzseatsdialog.cpp:110
+msgid "Display:"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:113
+msgid "Involved players and bots"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:114
+msgid "Spectators"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:116
+msgid "Close"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:133
+msgid "Players, Bots and Spectators"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:204
+msgid "Action..."
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:210
+msgid "Player"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:213
+msgid "Open"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:216
+msgid "Reserved"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:219
+msgid "AI bot"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:222
+msgid "Abandoned"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:228 kggzgames/kggzseatsdialog.cpp:316
+#, kde-format
+msgid "Type: %1"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:231 kggzgames/kggzseatsdialog.cpp:319
+msgid "(unnamed)"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:315
+msgid "Spectator"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:366
+msgid "Statistics..."
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:372
+msgid "Sit down here"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:374
+msgid "Add a bot here"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:378
+msgid "Boot bot and open seat"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:384
+msgid "Stand up"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:386
+msgid "Boot player and open seat"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:473
+#, kde-format
+msgid "Host: %1"
+msgstr ""
+
+#: kggzgames/kggzseatsdialog.cpp:479
+#, kde-format
+msgid "Realname: %1"
+msgstr ""
+
+#: kgamemisc.cpp:46
+msgctxt "A list of language typical names ( for games ), separated by spaces"
+msgid ""
+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan "
+"Ed Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike "
+"Neil Paul Rik Robert Sam Sean Thomas Tim Walter"
+msgstr ""
+"Arfon Arthur Arwel Bryn Dafydd Dewi Elgan Fôn Ffred Guto Gwallter Huw Iolo "
+"Llywelyn Marc Owain Pedr Rhys Sam Tomos"
 
 #: kstandardgameaction.cpp:51
 msgctxt "new game"
@@ -206,668 +316,452 @@
 msgid "Configure &High Scores..."
 msgstr ""
 
-#: highscore/kexthighscore_tab.cpp:49
-msgid "all"
-msgstr "i gyd"
-
-#: highscore/kexthighscore_tab.cpp:78
-msgid "Select player:"
-msgstr "Dewis chwaraewr:"
-
-#: highscore/kexthighscore_tab.cpp:115
-msgid "Total:"
-msgstr "Cyfanswm:"
-
-#: highscore/kexthighscore_tab.cpp:115
-msgid "Won:"
-msgstr "Ennillwyd:"
-
-#: highscore/kexthighscore_tab.cpp:115
-msgid "Lost:"
-msgstr "Collwyd:"
-
-#: highscore/kexthighscore_tab.cpp:116
-msgid "Draw:"
-msgstr "Gemau Cyfartal:"
-
-#: highscore/kexthighscore_tab.cpp:119
-msgid "Current:"
-msgstr "Cyfredol:"
-
-#: highscore/kexthighscore_tab.cpp:119
-msgid "Max won:"
-msgstr "Uchafswm a ennillwyd:"
-
-#: highscore/kexthighscore_tab.cpp:119
-msgid "Max lost:"
-msgstr "Uchafswm a gollwyd:"
-
-#: highscore/kexthighscore_tab.cpp:134
-msgid "Game Counts"
-msgstr "Cyfrifau Gêm"
-
-#: highscore/kexthighscore_tab.cpp:147
-msgid "Trends"
-msgstr "Tueddiadau"
+#: kchatbaseitemdelegate.cpp:54 kchatbaseitemdelegate.cpp:56
+#: kchatbaseitemdelegate.cpp:76
+#, kde-format
+msgid "%1: "
+msgstr ""
 
-#: highscore/kexthighscore_tab.cpp:235
-msgid "From"
-msgstr "O"
+#: kchat.cpp:100 kgame/kgamechat.cpp:105
+msgctxt "Unknown player"
+msgid "Unknown"
+msgstr ""
 
-#: highscore/kexthighscore_tab.cpp:236
-msgid "To"
-msgstr "I"
+#: carddeckinfo.cpp:78 carddeckinfo.cpp:79 carddeckinfo.cpp:126
+#: carddeckinfo.cpp:127
+msgid "unnamed"
+msgstr "di-enw"
 
-#: highscore/kexthighscore_tab.cpp:237
-msgid "Count"
-msgstr "Cyfrif"
+#: kgamedifficulty.cpp:116
+msgctxt "Game difficulty level"
+msgid "Difficulty"
+msgstr ""
 
-#: highscore/kexthighscore_tab.cpp:238
-msgid "Percent"
-msgstr "Canran"
+#: kgamedifficulty.cpp:117
+msgid "Set the difficulty level"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:48
-msgid "High Scores"
-msgstr "Sgorau Gorau"
+#: kgamedifficulty.cpp:118
+msgid "Set the difficulty level of the game."
+msgstr ""
 
-#: highscore/kscoredialog.cpp:117 highscore/kexthighscore_internal.h:64
-#: kgame/kplayer.cpp:95
-msgid "Name"
-msgstr "Enw"
+#: kgamedifficulty.cpp:126
+msgid "Difficulty"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:119 highscore/kexthighscore_internal.h:73
-msgid "Date"
-msgstr "Dyddiad"
+#: kgamedifficulty.cpp:140
+msgid "Changing the difficulty level will end the current game!"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:121
-msgid "Level"
-msgstr "Lefel"
+#: kgamedifficulty.cpp:140
+msgid "Change the difficulty level"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:123 highscore/kexthighscore.cpp:208
-msgid "Score"
-msgstr "Sgôr"
+#: kgamedifficulty.cpp:156
+msgctxt "Game difficulty level 1 out of 8"
+msgid "Ridiculously Easy"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:125
-msgid "Time"
-msgstr "Amser"
+#: kgamedifficulty.cpp:158
+msgctxt "Game difficulty level 2 out of 8"
+msgid "Very Easy"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:269 highscore/kexthighscore_internal.h:53
-msgid "Rank"
-msgstr "Gradd"
+#: kgamedifficulty.cpp:160
+msgctxt "Game difficulty level 3 out of 8"
+msgid "Easy"
+msgstr ""
 
-#: highscore/kscoredialog.cpp:292
-#, kde-format
-msgctxt "Enumeration (#1, #2 ...) of the highscore entries"
-msgid "#%1"
+#: kgamedifficulty.cpp:162
+msgctxt "Game difficulty level 4 out of 8"
+msgid "Medium"
 msgstr ""
 
-#: highscore/kscoredialog.cpp:554
-msgid "&Remember"
+#: kgamedifficulty.cpp:164
+msgctxt "Game difficulty level 5 out of 8"
+msgid "Hard"
 msgstr ""
 
-#: highscore/kscoredialog.cpp:555
-msgid "&Forget"
+#: kgamedifficulty.cpp:166
+msgctxt "Game difficulty level 6 out of 8"
+msgid "Very Hard"
 msgstr ""
 
-#: highscore/kscoredialog.cpp:556
-msgid "Remember this high score"
+#: kgamedifficulty.cpp:168
+msgctxt "Game difficulty level 7 out of 8"
+msgid "Extremely Hard"
 msgstr ""
 
-#: highscore/kscoredialog.cpp:557
-msgid "Forget this high score"
+#: kgamedifficulty.cpp:170
+msgctxt "Game difficulty level 8 out of 8"
+msgid "Impossible"
 msgstr ""
 
-#: highscore/kscoredialog.cpp:565
-msgid ""
-"Excellent!\n"
-"You have a new high score!"
+#: kgamedifficulty.cpp:205
+msgctxt ""
+"Name of the game difficulty level that is customized by the user by setting "
+"up different game parameters"
+msgid "Custom"
 msgstr ""
-"Ardderchog!\n"
-" Mae gennych sgôr gorau newydd!"
 
-#: highscore/kscoredialog.cpp:567
+#: kgamedifficulty.cpp:304
 msgid ""
-"Well done!\n"
-"You made it to the high score list!"
+"Select the <b>difficulty</b> of the game.<br />If you change the difficulty "
+"level while a game is running, you will have to cancel it and start a new "
+"one."
 msgstr ""
-"Da iawn!\n"
-"Rydych wedi cyrraedd y rhestr sgorau gorau!"
-
-#: highscore/kexthighscore_item.cpp:277
-msgid "Multiplayers Scores"
-msgstr "Sgorau Aml-Chwaraewr"
 
-#: highscore/kexthighscore_item.cpp:288
-msgid "No game played."
-msgstr "Dim gêm wedi'i chwarae."
-
-#: highscore/kexthighscore_item.cpp:290
-msgid "Scores for last game:"
-msgstr "Sgorau ar gyfer y gêm ddiwethaf:"
+#: kgamedifficulty.cpp:306
+msgid ""
+"Select the <b>difficulty</b> of the game.<br />You can change the difficulty "
+"level during a running game."
+msgstr ""
 
-#: highscore/kexthighscore_item.cpp:297
-#, kde-format
-msgid "Scores for the last %1 games:"
-msgstr "Sgorau ar gyfer y %1 gêm ddiwethaf:"
+#: kgame/dialogs/kgamedebugdialog.cpp:130
+msgid "KGame Debug Dialog"
+msgstr "Ymgom Dadnamu KGame"
 
-#: highscore/kexthighscore.cpp:211
-msgid "Mean Score"
-msgstr "Sgôr Cymedrig"
+#: kgame/dialogs/kgamedebugdialog.cpp:152
+msgid "Debug &KGame"
+msgstr "Dadnamu &KGame"
 
-#: highscore/kexthighscore.cpp:216
-msgid "Best Score"
-msgstr "Sgôr Gorau"
+#: kgame/dialogs/kgamedebugdialog.cpp:174
+#: kgame/dialogs/kgamedebugdialog.cpp:226
+msgid "Update"
+msgstr "Diweddaru"
 
-#: highscore/kexthighscore.cpp:220
-msgid "Elapsed Time"
-msgstr "Amser Aeth Heibio"
+#: kgame/dialogs/kgamedebugdialog.cpp:179
+msgid "KGame Pointer"
+msgstr "Pwyntydd KGame"
 
-#: highscore/kexthighscore_internal.cpp:52
-msgid "anonymous"
-msgstr "dienw"
+#: kgame/dialogs/kgamedebugdialog.cpp:180
+msgid "Game ID"
+msgstr "Dynodiad Gêm"
 
-#: highscore/kexthighscore_internal.cpp:269
-msgid "Games Count"
-msgstr "Cyfrif Gemau"
+#: kgame/dialogs/kgamedebugdialog.cpp:181
+msgid "Game Cookie"
+msgstr "Cwci Gêm"
 
-#: highscore/kexthighscore_internal.cpp:276
-msgid "Comment"
-msgstr "Sylwad"
+#: kgame/dialogs/kgamedebugdialog.cpp:182
+msgid "Is Master"
+msgstr "Yn Feistr"
 
-#: highscore/kexthighscore_internal.cpp:593
-msgid "Undefined error."
-msgstr "Gwall heb ei ddiffinio."
+#: kgame/dialogs/kgamedebugdialog.cpp:183
+msgid "Is Admin"
+msgstr "Yn Reolwr"
 
-#: highscore/kexthighscore_internal.cpp:594
-msgid "Missing argument(s)."
-msgstr "Ymresymiad(au) ar goll."
+#: kgame/dialogs/kgamedebugdialog.cpp:184
+msgid "Is Offering Connections"
+msgstr "Yn Cynnig Cysylltiadau"
 
-#: highscore/kexthighscore_internal.cpp:595
-msgid "Invalid argument(s)."
-msgstr "Ymresymiad(au) annilys."
+#: kgame/dialogs/kgamedebugdialog.cpp:185
+msgid "Game Status"
+msgstr "Cyflwr Gêm"
 
-#: highscore/kexthighscore_internal.cpp:597
-msgid "Unable to connect to MySQL server."
-msgstr "Methu cysylltu â'r gweinydd MySQL."
+#: kgame/dialogs/kgamedebugdialog.cpp:186
+msgid "Game is Running"
+msgstr "Mae'r Gêm yn Rhedeg"
 
-#: highscore/kexthighscore_internal.cpp:598
-msgid "Unable to select database."
-msgstr "Methu dewis cronfa ddata."
+#: kgame/dialogs/kgamedebugdialog.cpp:187
+msgid "Maximal Players"
+msgstr "Chwaraewyr Uchafsymol"
 
-#: highscore/kexthighscore_internal.cpp:599
-msgid "Error on database query."
-msgstr "Gwall wrth ymholi'r gronfa ddata."
+#: kgame/dialogs/kgamedebugdialog.cpp:188
+msgid "Minimal Players"
+msgstr "Chwaraewyr Isafsymol"
 
-#: highscore/kexthighscore_internal.cpp:600
-msgid "Error on database insert."
-msgstr "Gwall wrth mewnosod yn y gronfa ddata."
+#: kgame/dialogs/kgamedebugdialog.cpp:189
+msgid "Players"
+msgstr "Chwaraewyr"
 
-#: highscore/kexthighscore_internal.cpp:602
-msgid "Nickname already registered."
-msgstr "Ffugenw wedi ei gofrestru eisoes."
+#: kgame/dialogs/kgamedebugdialog.cpp:195
+msgid "Debug &Players"
+msgstr "Dadnamu &Chwaraewyr"
 
-#: highscore/kexthighscore_internal.cpp:603
-msgid "Nickname not registered."
-msgstr "Ffugenw heb ei gofrestru."
+#: kgame/dialogs/kgamedebugdialog.cpp:205
+msgid "Available Players"
+msgstr "Chwaraewyr Ar Gael"
 
-#: highscore/kexthighscore_internal.cpp:604
-msgid "Invalid key."
-msgstr "Allwedd annilys."
+#: kgame/dialogs/kgamedebugdialog.cpp:230
+msgid "Player Pointer"
+msgstr "Pwyntydd Chwaraewr"
 
-#: highscore/kexthighscore_internal.cpp:605
-msgid "Invalid submit key."
-msgstr "Allwedd anfon annilys."
+#: kgame/dialogs/kgamedebugdialog.cpp:231 kgame/kgamemessage.cpp:148
+msgid "Player ID"
+msgstr "Dynodiad Chwaraewr"
 
-#: highscore/kexthighscore_internal.cpp:607
-msgid "Invalid level."
-msgstr "Lefel annilys."
+#: kgame/dialogs/kgamedebugdialog.cpp:232
+msgid "Player Name"
+msgstr "Enw Chwaraewr"
 
-#: highscore/kexthighscore_internal.cpp:608
-msgid "Invalid score."
-msgstr "Sgôr annilys."
+#: kgame/dialogs/kgamedebugdialog.cpp:233
+msgid "Player Group"
+msgstr "Grŵp Chwaraewr"
 
-#: highscore/kexthighscore_internal.cpp:612
-msgid "Unable to contact world-wide highscore server"
-msgstr "Methu cysylltu â'r gweinydd sgorau gorau byd-eang"
+#: kgame/dialogs/kgamedebugdialog.cpp:234
+msgid "Player User ID"
+msgstr "Dynodiad Defnyddiwr y Chwaraewr"
 
-#: highscore/kexthighscore_internal.cpp:621
-#, kde-format
-msgid "Server URL: %1"
-msgstr "URL y gweinydd: %1"
+#: kgame/dialogs/kgamedebugdialog.cpp:235
+msgid "My Turn"
+msgstr "Fy Nhro"
 
-#: highscore/kexthighscore_internal.cpp:629
-msgid "Unable to open temporary file."
-msgstr "Methu agor ffeil dros dro."
+#: kgame/dialogs/kgamedebugdialog.cpp:236
+msgid "Async Input"
+msgstr "Mewnbwn Anghydamserol"
 
-#: highscore/kexthighscore_internal.cpp:651
-msgid "Message from world-wide highscores server"
-msgstr "Neges gan y gweinydd sgorau gorau byd-eang"
+#: kgame/dialogs/kgamedebugdialog.cpp:237
+msgid "KGame Address"
+msgstr "Cyfeiriad KGame"
 
-#: highscore/kexthighscore_internal.cpp:658
-msgid "Invalid answer from world-wide highscores server."
-msgstr "Ateb annilys gan y gweinydd sgorau gorau byd-eang."
+#: kgame/dialogs/kgamedebugdialog.cpp:238
+msgid "Player is Virtual"
+msgstr "Mae'r Chwaraewr yn Rhith"
 
-#: highscore/kexthighscore_internal.cpp:659
-#, kde-format
-msgid "Raw message: %1"
-msgstr "Ateb crai: %1"
+#: kgame/dialogs/kgamedebugdialog.cpp:239
+msgid "Player is Active"
+msgstr "Mae'r Chwaraewr yn Weithredol"
 
-#: highscore/kexthighscore_internal.cpp:671
-#, kde-format
-msgid "Invalid answer from world-wide highscores server (missing item: %1)."
-msgstr ""
-"Ateb annilys gan y gweinydd sgorau gorau byd-eang (eitem ar goll: %1)."
+#: kgame/dialogs/kgamedebugdialog.cpp:240
+msgid "RTTI"
+msgstr "RTTI"
 
-#: highscore/khighscore.cpp:138
-msgid "Retry"
-msgstr "Ailgeisio"
+#: kgame/dialogs/kgamedebugdialog.cpp:241
+msgid "Network Priority"
+msgstr "Blaenoriaeth Rwydwaith"
 
-#: highscore/khighscore.cpp:139
-msgid ""
-"Cannot access the highscore file. Another user is probably currently writing "
-"to it."
-msgstr ""
-"Methu cyrchu'r ffeil sgorau gorau.  Mwy na thebyg, mae defnyddiwr arall yn "
-"ysgrifennu iddo ar hyn o bryd."
+#: kgame/dialogs/kgamedebugdialog.cpp:247
+msgid "Debug &Messages"
+msgstr "Dadnamu &Negeseuon"
 
-#: highscore/kexthighscore_gui.cpp:162
-msgid "Best &Scores"
-msgstr "Sgorau G&orau"
+#: kgame/dialogs/kgamedebugdialog.cpp:261
+msgid "&>>"
+msgstr "&>>"
 
-#: highscore/kexthighscore_gui.cpp:167
-msgid "&Players"
-msgstr "Ch&waraewyr"
+#: kgame/dialogs/kgamedebugdialog.cpp:265
+msgid "&<<"
+msgstr "&<<"
 
-#: highscore/kexthighscore_gui.cpp:172
-msgid "Statistics"
-msgstr "Ystadegau"
+#: kgame/dialogs/kgamedebugdialog.cpp:269
+msgid "Do not show IDs:"
+msgstr "Peidio â dangos Dynodiadau:"
 
-#: highscore/kexthighscore_gui.cpp:178
-msgid "Histogram"
-msgstr "Histogram"
+#: kgame/dialogs/kgamedebugdialog.cpp:338 kgame/kgamepropertyhandler.cpp:356
+msgid "NULL pointer"
+msgstr "Pwyntydd nwl"
 
-#: highscore/kexthighscore_gui.cpp:185
-msgid "View world-wide highscores"
-msgstr "Gweld sgorau gorau byd-eang"
+#: kgame/dialogs/kgamedebugdialog.cpp:349
+#: kgame/dialogs/kgamedebugdialog.cpp:350
+#: kgame/dialogs/kgamedebugdialog.cpp:351
+#: kgame/dialogs/kgamedebugdialog.cpp:353
+#: kgame/dialogs/kgamedebugdialog.cpp:409
+#: kgame/dialogs/kgamedebugdialog.cpp:410
+#: kgame/dialogs/kgamedebugdialog.cpp:413
+#: kgame/dialogs/kgamedebugdialog.cpp:414 kgame/kgamepropertyhandler.cpp:375
+msgid "True"
+msgstr "Gwir"
 
-#: highscore/kexthighscore_gui.cpp:192
-msgid "View world-wide players"
-msgstr "Gweld chwaraewyr byd-eang"
-
-#: highscore/kexthighscore_gui.cpp:232
-msgid "Highscores"
-msgstr "Sgorau Gorau"
-
-#: highscore/kexthighscore_gui.cpp:239
-msgid "Configure..."
-msgstr "Ffurfweddu..."
-
-#: highscore/kexthighscore_gui.cpp:240
-msgid "Export..."
-msgstr "Allforio..."
-
-#: highscore/kexthighscore_gui.cpp:292
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: highscore/kexthighscore_gui.cpp:294
-msgid "The file already exists. Overwrite?"
-msgstr "Mae'r ffeil mewn bod eisoes.  Trosysgrifo?"
-
-#: highscore/kexthighscore_gui.cpp:295
-msgid "Export"
-msgstr ""
-
-#: highscore/kexthighscore_gui.cpp:344
-msgid "Winner"
-msgstr "Enillydd"
+#: kgame/dialogs/kgamedebugdialog.cpp:349
+#: kgame/dialogs/kgamedebugdialog.cpp:350
+#: kgame/dialogs/kgamedebugdialog.cpp:351
+#: kgame/dialogs/kgamedebugdialog.cpp:353
+#: kgame/dialogs/kgamedebugdialog.cpp:409
+#: kgame/dialogs/kgamedebugdialog.cpp:410
+#: kgame/dialogs/kgamedebugdialog.cpp:413
+#: kgame/dialogs/kgamedebugdialog.cpp:414 kgame/kgamepropertyhandler.cpp:375
+msgid "False"
+msgstr "Ffug"
 
-#: highscore/kexthighscore_gui.cpp:382
-msgid "Won Games"
-msgstr "Enillodd Gemau"
+#: kgame/dialogs/kgamedebugdialog.cpp:367
+#: kgame/dialogs/kgamedebugdialog.cpp:428
+msgid "Clean"
+msgstr "Glan"
 
-#: highscore/kexthighscore_gui.cpp:409
-msgid "Configure Highscores"
-msgstr "Ffurfweddu Sgorau Gorau"
+#: kgame/dialogs/kgamedebugdialog.cpp:370
+#: kgame/dialogs/kgamedebugdialog.cpp:431
+msgid "Dirty"
+msgstr "Budr"
 
-#: highscore/kexthighscore_gui.cpp:419
-msgid "Main"
-msgstr "Prif"
+#: kgame/dialogs/kgamedebugdialog.cpp:373
+#: kgame/dialogs/kgamedebugdialog.cpp:434
+msgid "Local"
+msgstr "Lleol"
 
-#: highscore/kexthighscore_gui.cpp:430 highscore/kexthighscore_gui.cpp:469
-msgid "Nickname:"
-msgstr "Ffugenw:"
+#: kgame/dialogs/kgamedebugdialog.cpp:377
+#: kgame/dialogs/kgamedebugdialog.cpp:438
+msgid "Undefined"
+msgstr "Anniffiniedig"
 
-#: highscore/kexthighscore_gui.cpp:441
-msgid "Comment:"
-msgstr "Sylwad:"
+#: kgame/dialogs/kgamedebugdialog.cpp:524 kgame/kgamepropertyhandler.cpp:381
+msgid "Unknown"
+msgstr "Anhysbys"
 
-#: highscore/kexthighscore_gui.cpp:451
-msgid "World-wide highscores enabled"
-msgstr "Alluogir sgorau gorau byd-eang"
+#: kgame/dialogs/kgamedialogconfig.cpp:136 kgame/kgamemessage.cpp:124
+msgid "Disconnect"
+msgstr "Datgysylltu"
 
-#: highscore/kexthighscore_gui.cpp:458
-msgid "Advanced"
-msgstr "Uwch"
+#: kgame/dialogs/kgamedialogconfig.cpp:140
+msgid "Network Configuration"
+msgstr "Ffurfweddu Rhwydwaith"
 
-#: highscore/kexthighscore_gui.cpp:464
-msgid "Registration Data"
-msgstr "Data Cofrestru"
+#: kgame/dialogs/kgamedialogconfig.cpp:200
+msgid "Cannot connect to the network"
+msgstr "Methu cysylltu â'r rhwydwaith"
 
-#: highscore/kexthighscore_gui.cpp:475
-msgid "Key:"
-msgstr "Allwedd:"
+#: kgame/dialogs/kgamedialogconfig.cpp:206
+msgid "Network status: No Network"
+msgstr "Cyflwr rhydwaith: Dim Rhwydwaith"
 
-#: highscore/kexthighscore_gui.cpp:482 highscore/kexthighscore_gui.cpp:515
-msgid "Remove"
-msgstr ""
+#: kgame/dialogs/kgamedialogconfig.cpp:212
+msgid "Network status: You are MASTER"
+msgstr "Cyflwr rhwydwaith: Chi yw'r MEISTR"
 
-#: highscore/kexthighscore_gui.cpp:517
-msgid ""
-"This will permanently remove your registration key. You will not be able to "
-"use the currently registered nickname anymore."
-msgstr ""
-"Bydd hyn yn gwaredu eich allwedd gofrestru am byth.  Ni fyddwch yn gallu "
-"defnyddio'r ffugenw wedi'i gofrestru ar hyn o bryd."
+#: kgame/dialogs/kgamedialogconfig.cpp:214
+msgid "Network status: You are connected"
+msgstr "Cyflwr rhwydwaith: Rydych wedi cysylltu"
 
-#: highscore/kexthighscore_gui.cpp:560
-msgid "Please choose a non empty nickname."
-msgstr "Dewiswch ffugenw nad yw'n wag."
+#: kgame/dialogs/kgamedialogconfig.cpp:284
+msgid "Your name:"
+msgstr "Eich enw:"
 
-#: highscore/kexthighscore_gui.cpp:564
-msgid "Nickname already in use. Please choose another one"
-msgstr "Mae'r ffugenw mewn defnydd eisoes. Dewiswch un arall"
+#: kgame/dialogs/kgamedialogconfig.cpp:448
+msgid "Maximal Number of Clients"
+msgstr "Nifer Uchafsymol o Ddibynyddion"
 
-#: highscore/kexthighscore_gui.cpp:585
-msgid "Enter Your Nickname"
-msgstr "Rhowch eich Ffugenw"
+#: kgame/dialogs/kgamedialogconfig.cpp:453
+msgid "Maximal number of clients (-1 = infinite):"
+msgstr "Nifer Uchafsymol o Ddibynyddion (-1 = anfeidrol):"
 
-#: highscore/kexthighscore_gui.cpp:597
-msgid "Congratulations, you have won!"
-msgstr "Llongyfarchiadau, rydych wedi ennill!"
+#: kgame/dialogs/kgamedialogconfig.cpp:502
+msgid "Change Maximal Number of Clients"
+msgstr "Newid Nifer Uchafsymol o Ddibynyddion"
 
-#: highscore/kexthighscore_gui.cpp:602
-msgid "Enter your nickname:"
-msgstr "Rhowch eich ffugenw:"
+#: kgame/dialogs/kgamedialogconfig.cpp:504
+msgid "Change Admin"
+msgstr "Newid Gweinyddwr"
 
-#: highscore/kexthighscore_gui.cpp:610
-msgid "Do not ask again."
-msgstr "Paid â gofyn eto."
+#: kgame/dialogs/kgamedialogconfig.cpp:506
+msgid "Remove Client with All Players"
+msgstr "Gwaredu Dibynnydd efo Pob Chwaraewr"
 
-#: highscore/kexthighscore_internal.h:82
-msgid "Success"
-msgstr "Llwyddiant"
+#: kgame/dialogs/kgamedialogconfig.cpp:518
+msgid "Only the admin can configure the message server!"
+msgstr "Y gweinyddwr yn unig a all ffurfweddu'r gweinydd negeseuon!"
 
-#: kchat.cpp:100 kgame/kgamechat.cpp:105
-msgctxt "Unknown player"
-msgid "Unknown"
+#: kgame/dialogs/kgamedialogconfig.cpp:529
+msgid "You do not own the message server"
 msgstr ""
 
-#: kchatdialog.cpp:65 kchatdialog.cpp:76
-msgid "Configure Chat"
-msgstr "Ffurfweddu Sgwrs"
-
-#: kchatdialog.cpp:97 kchatdialog.cpp:119
-msgid "Name Font..."
-msgstr "Gwynebfath Enw..."
+#: kgame/dialogs/kgamedialogconfig.cpp:563
+msgid "Chat"
+msgstr "Sgwrsio"
 
-#: kchatdialog.cpp:100 kchatdialog.cpp:122
-msgid "Text Font..."
-msgstr "Gwynebfath Testun..."
+#: kgame/dialogs/kgamedialogconfig.cpp:620
+msgid "Connected Players"
+msgstr "Chwaraewyr wedi Cysylltu"
 
-#: kchatdialog.cpp:109
-msgid "Player: "
-msgstr "Chwaraewr: "
+#: kgame/dialogs/kgamedialogconfig.cpp:766
+#, kde-format
+msgid "Do you want to ban player \"%1\" from the game?"
+msgstr "A ydych eisiau atal \"%1\" o'r gêm?"
 
-#: kchatdialog.cpp:111
-msgid "This is a player message"
-msgstr "Neges chwaraewr yw hon"
+#: kgame/dialogs/kgamedialogconfig.cpp:767
+msgid "Ban Player"
+msgstr "Atal Chwaraewr"
 
-#: kchatdialog.cpp:117
-msgid "System Messages - Messages directly sent from the game"
-msgstr "Negeseuon Cysawd - negeseuon a anfonir yn uniongyrchol o'r gêm"
+#: kgame/dialogs/kgamedialogconfig.cpp:767
+msgid "Do Not Ban"
+msgstr "Peidio ag Atal"
 
-#: kchatdialog.cpp:131
-msgid "--- Game: "
-msgstr "--- Gêm: "
+#: kgame/dialogs/kgameerrordialog.cpp:80
+msgid "Connection to the server has been lost!"
+msgstr "Collwyd y cysylltiad i'r gweinydd!"
 
-#: kchatdialog.cpp:133
-msgid "This is a system message"
-msgstr "Neges gysawd yw hon"
+#: kgame/dialogs/kgameerrordialog.cpp:93
+msgid "Connection to client has been lost!"
+msgstr "Collwyd y cysylltiad i'r derbynnydd!"
 
-#: kchatdialog.cpp:137
-msgid "Maximum number of messages (-1 = unlimited):"
+#: kgame/dialogs/kgameerrordialog.cpp:99
+#, kde-format
+msgid ""
+"Received a network error!\n"
+"Error number: %1\n"
+"Error message: %2"
 msgstr ""
+"Wedi derbyn gwall rhwydwaith!\n"
+" Rhif gwall: %1\n"
+" Neges wall: %2"
 
-#: kgamedifficulty.cpp:116
-msgctxt "Game difficulty level"
-msgid "Difficulty"
-msgstr ""
+#: kgame/dialogs/kgameerrordialog.cpp:107
+msgid "No connection could be created."
+msgstr "Ni fu modd creu cysylltiad."
 
-#: kgamedifficulty.cpp:117
-msgid "Set the difficulty level"
+#: kgame/dialogs/kgameerrordialog.cpp:109
+#, kde-format
+msgid ""
+"No connection could be created.\n"
+"The error message was:\n"
+"%1"
 msgstr ""
+"Ni fu modd creu cysylltiad.\n"
+" Y neges wall oedd:\n"
+" %1"
 
-#: kgamedifficulty.cpp:118
-msgid "Set the difficulty level of the game."
+#: kgame/dialogs/kgameerrordialog.cpp:121
+msgid "Error"
 msgstr ""
 
-#: kgamedifficulty.cpp:126
-msgid "Difficulty"
-msgstr ""
+#: kgame/dialogs/kgamedialog.cpp:138
+msgid "&Chat"
+msgstr "&Sgwrsio"
 
-#: kgamedifficulty.cpp:140
-msgid "Changing the difficulty level will end the current game!"
-msgstr ""
+#: kgame/dialogs/kgamedialog.cpp:149
+msgid "C&onnections"
+msgstr "&Cysylltiadau"
 
-#: kgamedifficulty.cpp:140
-msgid "Change the difficulty level"
+#: kgame/dialogs/kgamedialog.cpp:167
+msgid "&Game"
 msgstr ""
 
-#: kgamedifficulty.cpp:156
-msgctxt "Game difficulty level 1 out of 8"
-msgid "Ridiculously Easy"
-msgstr ""
+#: kgame/dialogs/kgamedialog.cpp:176
+msgid "&Network"
+msgstr "&Rhwydwaith"
 
-#: kgamedifficulty.cpp:158
-msgctxt "Game difficulty level 2 out of 8"
-msgid "Very Easy"
-msgstr ""
-
-#: kgamedifficulty.cpp:160
-msgctxt "Game difficulty level 3 out of 8"
-msgid "Easy"
-msgstr ""
-
-#: kgamedifficulty.cpp:162
-msgctxt "Game difficulty level 4 out of 8"
-msgid "Medium"
-msgstr ""
-
-#: kgamedifficulty.cpp:164
-msgctxt "Game difficulty level 5 out of 8"
-msgid "Hard"
-msgstr ""
-
-#: kgamedifficulty.cpp:166
-msgctxt "Game difficulty level 6 out of 8"
-msgid "Very Hard"
-msgstr ""
-
-#: kgamedifficulty.cpp:168
-msgctxt "Game difficulty level 7 out of 8"
-msgid "Extremely Hard"
-msgstr ""
-
-#: kgamedifficulty.cpp:170
-msgctxt "Game difficulty level 8 out of 8"
-msgid "Impossible"
-msgstr ""
-
-#: kgamedifficulty.cpp:205
-msgctxt ""
-"Name of the game difficulty level that is customized by the user by setting "
-"up different game parameters"
-msgid "Custom"
-msgstr ""
-
-#: kgamedifficulty.cpp:304
-msgid ""
-"Select the <b>difficulty</b> of the game.<br />If you change the difficulty "
-"level while a game is running, you will have to cancel it and start a new "
-"one."
-msgstr ""
-
-#: kgamedifficulty.cpp:306
-msgid ""
-"Select the <b>difficulty</b> of the game.<br />You can change the difficulty "
-"level during a running game."
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:110
-msgid "Display:"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:113
-msgid "Involved players and bots"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:114
-msgid "Spectators"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:116
-msgid "Close"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:133
-msgid "Players, Bots and Spectators"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:204
-msgid "Action..."
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:210
-msgid "Player"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:213
-msgid "Open"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:216
-msgid "Reserved"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:219
-msgid "AI bot"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:222
-msgid "Abandoned"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:228 kggzgames/kggzseatsdialog.cpp:316
-#, kde-format
-msgid "Type: %1"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:231 kggzgames/kggzseatsdialog.cpp:319
-msgid "(unnamed)"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:315
-msgid "Spectator"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:366
-msgid "Statistics..."
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:372
-msgid "Sit down here"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:374
-msgid "Add a bot here"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:378
-msgid "Boot bot and open seat"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:384
-msgid "Stand up"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:386
-msgid "Boot player and open seat"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:473
-#, kde-format
-msgid "Host: %1"
-msgstr ""
-
-#: kggzgames/kggzseatsdialog.cpp:479
-#, kde-format
-msgid "Realname: %1"
-msgstr ""
-
-#: kcarddialog.cpp:385
-msgid "Card Deck Selection"
-msgstr ""
-
-#: kchatbase.cpp:122
-msgid "Send to All Players"
-msgstr "Anfon i bob chwaraewr"
-
-#: kchatbase.cpp:260 kgame/kgamechat.cpp:170
-#, kde-format
-msgid "Send to %1"
-msgstr "Anfon i %1"
+#: kgame/dialogs/kgamedialog.cpp:184
+msgid "&Message Server"
+msgstr "Gweinydd &Negeseuon"
 
-#: kchatbaseitemdelegate.cpp:54 kchatbaseitemdelegate.cpp:56
-#: kchatbaseitemdelegate.cpp:76
-#, kde-format
-msgid "%1: "
-msgstr ""
+#: kgame/dialogs/kgameconnectdialog.cpp:73
+msgid "Create a network game"
+msgstr "Creu gêm rhwydwaith"
 
-#: kgamemisc.cpp:46
-msgctxt "A list of language typical names ( for games ), separated by spaces"
-msgid ""
-"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan "
-"Ed Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike "
-"Neil Paul Rik Robert Sam Sean Thomas Tim Walter"
-msgstr ""
-"Arfon Arthur Arwel Bryn Dafydd Dewi Elgan Fôn Ffred Guto Gwallter Huw Iolo "
-"Llywelyn Marc Owain Pedr Rhys Sam Tomos"
+#: kgame/dialogs/kgameconnectdialog.cpp:76
+msgid "Join a network game"
+msgstr "Ymuno â gêm rhwydwaith"
 
-#: carddeckinfo.cpp:78 carddeckinfo.cpp:79 carddeckinfo.cpp:126
-#: carddeckinfo.cpp:127
-msgid "unnamed"
-msgstr "di-enw"
+#: kgame/dialogs/kgameconnectdialog.cpp:82
+msgid "Game name:"
+msgstr "Enw gêm:"
 
-#: kgame/kplayer.cpp:91
-msgid "UserId"
-msgstr "Dynodiad Defnyddiwr"
+#: kgame/dialogs/kgameconnectdialog.cpp:84
+msgid "Network games:"
+msgstr "Gemau rhwydwaith:"
 
-#: kgame/kplayer.cpp:93
-msgid "Group"
-msgstr "Grŵp"
+#: kgame/dialogs/kgameconnectdialog.cpp:94
+msgid "Port to connect to:"
+msgstr "Porth i gysylltu iddi:"
 
-#: kgame/kplayer.cpp:94 kgame/kplayer.cpp:96
-msgid "default"
-msgstr "rhagosodiad"
+#: kgame/dialogs/kgameconnectdialog.cpp:98
+msgid "Host to connect to:"
+msgstr "Gweinyddwr i gysylltu iddo:"
 
-#: kgame/kplayer.cpp:98
-msgid "AsyncInput"
-msgstr "Mewnbwn Anghydamserol"
+#: kgame/dialogs/kgameconnectdialog.cpp:103
+msgid "&Start Network"
+msgstr "&Cychwyn Rhwydwaith"
 
-#: kgame/kplayer.cpp:100
-msgid "myTurn"
-msgstr "fyNhro"
+#: kgame/dialogs/kgameconnectdialog.cpp:246
+msgid "Network Game"
+msgstr "Gêm Rhwydwaith"
 
 #: kgame/kgameerror.cpp:60
 #, kde-format
@@ -896,6 +790,23 @@
 msgid "Unknown error code %1"
 msgstr "Côd gwall anhysbys %1"
 
+#: kgame/kgamepropertyhandler.cpp:170
+#, kde-format
+msgid "%1 (%2)"
+msgstr "%1(%2)"
+
+#: kgame/kgamepropertyhandler.cpp:172
+#, kde-format
+msgid "Unnamed - ID: %1"
+msgstr "Dienw - Dynodiad: %1"
+
+#: kgame/kgamepropertyhandler.cpp:176
+#, kde-format
+msgid "%1 unregistered"
+msgid_plural "%1 unregistered"
+msgstr[0] ""
+msgstr[1] ""
+
 #: kgame/kgamemessage.cpp:112
 msgid "Setup Game"
 msgstr "Ffurfweddu Gêm"
@@ -920,10 +831,6 @@
 msgid "Synchronize Random"
 msgstr "Cydamseru Hap"
 
-#: kgame/kgamemessage.cpp:124 kgame/dialogs/kgamedialogconfig.cpp:136
-msgid "Disconnect"
-msgstr "Datgysylltu"
-
 #: kgame/kgamemessage.cpp:126
 msgid "Player Property"
 msgstr "Priodwedd Chwaraewr"
@@ -968,10 +875,6 @@
 msgid "Process Query"
 msgstr "Ymholiad Proses"
 
-#: kgame/kgamemessage.cpp:148 kgame/dialogs/kgamedebugdialog.cpp:231
-msgid "Player ID"
-msgstr "Dynodiad Chwaraewr"
-
 #: kgame/kgame.cpp:93
 msgid "MaxPlayers"
 msgstr "Uchafswm Chwaraewyr"
@@ -984,428 +887,483 @@
 msgid "GameStatus"
 msgstr "Cyflwr Gêm"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:73
-msgid "Create a network game"
-msgstr "Creu gêm rhwydwaith"
+#: kgame/kplayer.cpp:91
+msgid "UserId"
+msgstr "Dynodiad Defnyddiwr"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:76
-msgid "Join a network game"
-msgstr "Ymuno â gêm rhwydwaith"
+#: kgame/kplayer.cpp:93
+msgid "Group"
+msgstr "Grŵp"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:82
-msgid "Game name:"
-msgstr "Enw gêm:"
+#: kgame/kplayer.cpp:94 kgame/kplayer.cpp:96
+msgid "default"
+msgstr "rhagosodiad"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:84
-msgid "Network games:"
-msgstr "Gemau rhwydwaith:"
+#: kgame/kplayer.cpp:95 highscore/kscoredialog.cpp:117
+#: highscore/kexthighscore_internal.h:64
+msgid "Name"
+msgstr "Enw"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:94
-msgid "Port to connect to:"
-msgstr "Porth i gysylltu iddi:"
+#: kgame/kplayer.cpp:98
+msgid "AsyncInput"
+msgstr "Mewnbwn Anghydamserol"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:98
-msgid "Host to connect to:"
-msgstr "Gweinyddwr i gysylltu iddo:"
+#: kgame/kplayer.cpp:100
+msgid "myTurn"
+msgstr "fyNhro"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:103
-msgid "&Start Network"
-msgstr "&Cychwyn Rhwydwaith"
+#: kgame/kgamechat.cpp:97
+#, kde-format
+msgid "Player %1"
+msgstr "Chwaraewr %1"
 
-#: kgame/dialogs/kgameconnectdialog.cpp:246
-msgid "Network Game"
-msgstr "Gêm Rhwydwaith"
+#: kgame/kgamechat.cpp:216
+#, kde-format
+msgid "Send to My Group (\"%1\")"
+msgstr "Anfon i Fy Ngrwp (\"%1\")"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:130
-msgid "KGame Debug Dialog"
-msgstr "Ymgom Dadnamu KGame"
+#: highscore/kexthighscore_internal.cpp:52
+msgid "anonymous"
+msgstr "dienw"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:152
-msgid "Debug &KGame"
-msgstr "Dadnamu &KGame"
+#: highscore/kexthighscore_internal.cpp:269
+msgid "Games Count"
+msgstr "Cyfrif Gemau"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:174
-#: kgame/dialogs/kgamedebugdialog.cpp:226
-msgid "Update"
-msgstr "Diweddaru"
+#: highscore/kexthighscore_internal.cpp:276
+msgid "Comment"
+msgstr "Sylwad"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:179
-msgid "KGame Pointer"
-msgstr "Pwyntydd KGame"
+#: highscore/kexthighscore_internal.cpp:593
+msgid "Undefined error."
+msgstr "Gwall heb ei ddiffinio."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:180
-msgid "Game ID"
-msgstr "Dynodiad Gêm"
+#: highscore/kexthighscore_internal.cpp:594
+msgid "Missing argument(s)."
+msgstr "Ymresymiad(au) ar goll."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:181
-msgid "Game Cookie"
-msgstr "Cwci Gêm"
+#: highscore/kexthighscore_internal.cpp:595
+msgid "Invalid argument(s)."
+msgstr "Ymresymiad(au) annilys."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:182
-msgid "Is Master"
-msgstr "Yn Feistr"
+#: highscore/kexthighscore_internal.cpp:597
+msgid "Unable to connect to MySQL server."
+msgstr "Methu cysylltu â'r gweinydd MySQL."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:183
-msgid "Is Admin"
-msgstr "Yn Reolwr"
+#: highscore/kexthighscore_internal.cpp:598
+msgid "Unable to select database."
+msgstr "Methu dewis cronfa ddata."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:184
-msgid "Is Offering Connections"
-msgstr "Yn Cynnig Cysylltiadau"
+#: highscore/kexthighscore_internal.cpp:599
+msgid "Error on database query."
+msgstr "Gwall wrth ymholi'r gronfa ddata."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:185
-msgid "Game Status"
-msgstr "Cyflwr Gêm"
+#: highscore/kexthighscore_internal.cpp:600
+msgid "Error on database insert."
+msgstr "Gwall wrth mewnosod yn y gronfa ddata."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:186
-msgid "Game is Running"
-msgstr "Mae'r Gêm yn Rhedeg"
+#: highscore/kexthighscore_internal.cpp:602
+msgid "Nickname already registered."
+msgstr "Ffugenw wedi ei gofrestru eisoes."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:187
-msgid "Maximal Players"
-msgstr "Chwaraewyr Uchafsymol"
+#: highscore/kexthighscore_internal.cpp:603
+msgid "Nickname not registered."
+msgstr "Ffugenw heb ei gofrestru."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:188
-msgid "Minimal Players"
-msgstr "Chwaraewyr Isafsymol"
+#: highscore/kexthighscore_internal.cpp:604
+msgid "Invalid key."
+msgstr "Allwedd annilys."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:189
-msgid "Players"
-msgstr "Chwaraewyr"
+#: highscore/kexthighscore_internal.cpp:605
+msgid "Invalid submit key."
+msgstr "Allwedd anfon annilys."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:195
-msgid "Debug &Players"
-msgstr "Dadnamu &Chwaraewyr"
+#: highscore/kexthighscore_internal.cpp:607
+msgid "Invalid level."
+msgstr "Lefel annilys."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:205
-msgid "Available Players"
-msgstr "Chwaraewyr Ar Gael"
+#: highscore/kexthighscore_internal.cpp:608
+msgid "Invalid score."
+msgstr "Sgôr annilys."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:230
-msgid "Player Pointer"
-msgstr "Pwyntydd Chwaraewr"
+#: highscore/kexthighscore_internal.cpp:612
+msgid "Unable to contact world-wide highscore server"
+msgstr "Methu cysylltu â'r gweinydd sgorau gorau byd-eang"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:232
-msgid "Player Name"
-msgstr "Enw Chwaraewr"
+#: highscore/kexthighscore_internal.cpp:621
+#, kde-format
+msgid "Server URL: %1"
+msgstr "URL y gweinydd: %1"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:233
-msgid "Player Group"
-msgstr "Grŵp Chwaraewr"
+#: highscore/kexthighscore_internal.cpp:629
+msgid "Unable to open temporary file."
+msgstr "Methu agor ffeil dros dro."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:234
-msgid "Player User ID"
-msgstr "Dynodiad Defnyddiwr y Chwaraewr"
+#: highscore/kexthighscore_internal.cpp:651
+msgid "Message from world-wide highscores server"
+msgstr "Neges gan y gweinydd sgorau gorau byd-eang"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:235
-msgid "My Turn"
-msgstr "Fy Nhro"
+#: highscore/kexthighscore_internal.cpp:658
+msgid "Invalid answer from world-wide highscores server."
+msgstr "Ateb annilys gan y gweinydd sgorau gorau byd-eang."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:236
-msgid "Async Input"
-msgstr "Mewnbwn Anghydamserol"
+#: highscore/kexthighscore_internal.cpp:659
+#, kde-format
+msgid "Raw message: %1"
+msgstr "Ateb crai: %1"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:237
-msgid "KGame Address"
-msgstr "Cyfeiriad KGame"
+#: highscore/kexthighscore_internal.cpp:671
+#, kde-format
+msgid "Invalid answer from world-wide highscores server (missing item: %1)."
+msgstr ""
+"Ateb annilys gan y gweinydd sgorau gorau byd-eang (eitem ar goll: %1)."
 
-#: kgame/dialogs/kgamedebugdialog.cpp:238
-msgid "Player is Virtual"
-msgstr "Mae'r Chwaraewr yn Rhith"
+#: highscore/kexthighscore_tab.cpp:49
+msgid "all"
+msgstr "i gyd"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:239
-msgid "Player is Active"
-msgstr "Mae'r Chwaraewr yn Weithredol"
+#: highscore/kexthighscore_tab.cpp:78
+msgid "Select player:"
+msgstr "Dewis chwaraewr:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:240
-msgid "RTTI"
-msgstr "RTTI"
+#: highscore/kexthighscore_tab.cpp:115
+msgid "Total:"
+msgstr "Cyfanswm:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:241
-msgid "Network Priority"
-msgstr "Blaenoriaeth Rwydwaith"
+#: highscore/kexthighscore_tab.cpp:115
+msgid "Won:"
+msgstr "Ennillwyd:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:247
-msgid "Debug &Messages"
-msgstr "Dadnamu &Negeseuon"
+#: highscore/kexthighscore_tab.cpp:115
+msgid "Lost:"
+msgstr "Collwyd:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:261
-msgid "&>>"
-msgstr "&>>"
+#: highscore/kexthighscore_tab.cpp:116
+msgid "Draw:"
+msgstr "Gemau Cyfartal:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:265
-msgid "&<<"
-msgstr "&<<"
+#: highscore/kexthighscore_tab.cpp:119
+msgid "Current:"
+msgstr "Cyfredol:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:269
-msgid "Do not show IDs:"
-msgstr "Peidio â dangos Dynodiadau:"
+#: highscore/kexthighscore_tab.cpp:119
+msgid "Max won:"
+msgstr "Uchafswm a ennillwyd:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:338 kgame/kgamepropertyhandler.cpp:356
-msgid "NULL pointer"
-msgstr "Pwyntydd nwl"
+#: highscore/kexthighscore_tab.cpp:119
+msgid "Max lost:"
+msgstr "Uchafswm a gollwyd:"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:349
-#: kgame/dialogs/kgamedebugdialog.cpp:350
-#: kgame/dialogs/kgamedebugdialog.cpp:351
-#: kgame/dialogs/kgamedebugdialog.cpp:353
-#: kgame/dialogs/kgamedebugdialog.cpp:409
-#: kgame/dialogs/kgamedebugdialog.cpp:410
-#: kgame/dialogs/kgamedebugdialog.cpp:413
-#: kgame/dialogs/kgamedebugdialog.cpp:414 kgame/kgamepropertyhandler.cpp:375
-msgid "True"
-msgstr "Gwir"
+#: highscore/kexthighscore_tab.cpp:134
+msgid "Game Counts"
+msgstr "Cyfrifau Gêm"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:349
-#: kgame/dialogs/kgamedebugdialog.cpp:350
-#: kgame/dialogs/kgamedebugdialog.cpp:351
-#: kgame/dialogs/kgamedebugdialog.cpp:353
-#: kgame/dialogs/kgamedebugdialog.cpp:409
-#: kgame/dialogs/kgamedebugdialog.cpp:410
-#: kgame/dialogs/kgamedebugdialog.cpp:413
-#: kgame/dialogs/kgamedebugdialog.cpp:414 kgame/kgamepropertyhandler.cpp:375
-msgid "False"
-msgstr "Ffug"
+#: highscore/kexthighscore_tab.cpp:147
+msgid "Trends"
+msgstr "Tueddiadau"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:367
-#: kgame/dialogs/kgamedebugdialog.cpp:428
-msgid "Clean"
-msgstr "Glan"
+#: highscore/kexthighscore_tab.cpp:235
+msgid "From"
+msgstr "O"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:370
-#: kgame/dialogs/kgamedebugdialog.cpp:431
-msgid "Dirty"
-msgstr "Budr"
+#: highscore/kexthighscore_tab.cpp:236
+msgid "To"
+msgstr "I"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:373
-#: kgame/dialogs/kgamedebugdialog.cpp:434
-msgid "Local"
-msgstr "Lleol"
+#: highscore/kexthighscore_tab.cpp:237
+msgid "Count"
+msgstr "Cyfrif"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:377
-#: kgame/dialogs/kgamedebugdialog.cpp:438
-msgid "Undefined"
-msgstr "Anniffiniedig"
+#: highscore/kexthighscore_tab.cpp:238
+msgid "Percent"
+msgstr "Canran"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:524 kgame/kgamepropertyhandler.cpp:381
-msgid "Unknown"
-msgstr "Anhysbys"
+#: highscore/kexthighscore_item.cpp:277
+msgid "Multiplayers Scores"
+msgstr "Sgorau Aml-Chwaraewr"
 
-#: kgame/dialogs/kgamedialog.cpp:138
-msgid "&Chat"
-msgstr "&Sgwrsio"
+#: highscore/kexthighscore_item.cpp:288
+msgid "No game played."
+msgstr "Dim gêm wedi'i chwarae."
 
-#: kgame/dialogs/kgamedialog.cpp:149
-msgid "C&onnections"
-msgstr "&Cysylltiadau"
+#: highscore/kexthighscore_item.cpp:290
+msgid "Scores for last game:"
+msgstr "Sgorau ar gyfer y gêm ddiwethaf:"
+
+#: highscore/kexthighscore_item.cpp:297
+#, kde-format
+msgid "Scores for the last %1 games:"
+msgstr "Sgorau ar gyfer y %1 gêm ddiwethaf:"
+
+#: highscore/kscoredialog.cpp:48
+msgid "High Scores"
+msgstr "Sgorau Gorau"
+
+#: highscore/kscoredialog.cpp:119 highscore/kexthighscore_internal.h:73
+msgid "Date"
+msgstr "Dyddiad"
+
+#: highscore/kscoredialog.cpp:121
+msgid "Level"
+msgstr "Lefel"
+
+#: highscore/kscoredialog.cpp:123 highscore/kexthighscore.cpp:208
+msgid "Score"
+msgstr "Sgôr"
+
+#: highscore/kscoredialog.cpp:125
+msgid "Time"
+msgstr "Amser"
+
+#: highscore/kscoredialog.cpp:269 highscore/kexthighscore_internal.h:53
+msgid "Rank"
+msgstr "Gradd"
+
+#: highscore/kscoredialog.cpp:292
+#, kde-format
+msgctxt "Enumeration (#1, #2 ...) of the highscore entries"
+msgid "#%1"
+msgstr ""
+
+#: highscore/kscoredialog.cpp:554
+msgid "&Remember"
+msgstr ""
+
+#: highscore/kscoredialog.cpp:555
+msgid "&Forget"
+msgstr ""
+
+#: highscore/kscoredialog.cpp:556
+msgid "Remember this high score"
+msgstr ""
+
+#: highscore/kscoredialog.cpp:557
+msgid "Forget this high score"
+msgstr ""
+
+#: highscore/kscoredialog.cpp:565
+msgid ""
+"Excellent!\n"
+"You have a new high score!"
+msgstr ""
+"Ardderchog!\n"
+" Mae gennych sgôr gorau newydd!"
+
+#: highscore/kscoredialog.cpp:567
+msgid ""
+"Well done!\n"
+"You made it to the high score list!"
+msgstr ""
+"Da iawn!\n"
+"Rydych wedi cyrraedd y rhestr sgorau gorau!"
+
+#: highscore/kexthighscore_gui.cpp:162
+msgid "Best &Scores"
+msgstr "Sgorau G&orau"
+
+#: highscore/kexthighscore_gui.cpp:167
+msgid "&Players"
+msgstr "Ch&waraewyr"
+
+#: highscore/kexthighscore_gui.cpp:172
+msgid "Statistics"
+msgstr "Ystadegau"
+
+#: highscore/kexthighscore_gui.cpp:178
+msgid "Histogram"
+msgstr "Histogram"
 
-#: kgame/dialogs/kgamedialog.cpp:167
-msgid "&Game"
-msgstr ""
+#: highscore/kexthighscore_gui.cpp:185
+msgid "View world-wide highscores"
+msgstr "Gweld sgorau gorau byd-eang"
 
-#: kgame/dialogs/kgamedialog.cpp:176
-msgid "&Network"
-msgstr "&Rhwydwaith"
+#: highscore/kexthighscore_gui.cpp:192
+msgid "View world-wide players"
+msgstr "Gweld chwaraewyr byd-eang"
 
-#: kgame/dialogs/kgamedialog.cpp:184
-msgid "&Message Server"
-msgstr "Gweinydd &Negeseuon"
+#: highscore/kexthighscore_gui.cpp:232
+msgid "Highscores"
+msgstr "Sgorau Gorau"
 
-#: kgame/dialogs/kgameerrordialog.cpp:80
-msgid "Connection to the server has been lost!"
-msgstr "Collwyd y cysylltiad i'r gweinydd!"
+#: highscore/kexthighscore_gui.cpp:239
+msgid "Configure..."
+msgstr "Ffurfweddu..."
 
-#: kgame/dialogs/kgameerrordialog.cpp:93
-msgid "Connection to client has been lost!"
-msgstr "Collwyd y cysylltiad i'r derbynnydd!"
+#: highscore/kexthighscore_gui.cpp:240
+msgid "Export..."
+msgstr "Allforio..."
 
-#: kgame/dialogs/kgameerrordialog.cpp:99
-#, kde-format
-msgid ""
-"Received a network error!\n"
-"Error number: %1\n"
-"Error message: %2"
-msgstr ""
-"Wedi derbyn gwall rhwydwaith!\n"
-" Rhif gwall: %1\n"
-" Neges wall: %2"
+#: highscore/kexthighscore_gui.cpp:292
+msgid "Overwrite"
+msgstr "Trosysgrifo"
 
-#: kgame/dialogs/kgameerrordialog.cpp:107
-msgid "No connection could be created."
-msgstr "Ni fu modd creu cysylltiad."
+#: highscore/kexthighscore_gui.cpp:294
+msgid "The file already exists. Overwrite?"
+msgstr "Mae'r ffeil mewn bod eisoes.  Trosysgrifo?"
 
-#: kgame/dialogs/kgameerrordialog.cpp:109
-#, kde-format
-msgid ""
-"No connection could be created.\n"
-"The error message was:\n"
-"%1"
+#: highscore/kexthighscore_gui.cpp:295
+msgid "Export"
 msgstr ""
-"Ni fu modd creu cysylltiad.\n"
-" Y neges wall oedd:\n"
-" %1"
 
-#: kgame/dialogs/kgameerrordialog.cpp:121
-msgid "Error"
-msgstr ""
+#: highscore/kexthighscore_gui.cpp:344
+msgid "Winner"
+msgstr "Enillydd"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:140
-msgid "Network Configuration"
-msgstr "Ffurfweddu Rhwydwaith"
+#: highscore/kexthighscore_gui.cpp:382
+msgid "Won Games"
+msgstr "Enillodd Gemau"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:200
-msgid "Cannot connect to the network"
-msgstr "Methu cysylltu â'r rhwydwaith"
+#: highscore/kexthighscore_gui.cpp:409
+msgid "Configure Highscores"
+msgstr "Ffurfweddu Sgorau Gorau"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:206
-msgid "Network status: No Network"
-msgstr "Cyflwr rhydwaith: Dim Rhwydwaith"
+#: highscore/kexthighscore_gui.cpp:419
+msgid "Main"
+msgstr "Prif"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:212
-msgid "Network status: You are MASTER"
-msgstr "Cyflwr rhwydwaith: Chi yw'r MEISTR"
+#: highscore/kexthighscore_gui.cpp:430 highscore/kexthighscore_gui.cpp:469
+msgid "Nickname:"
+msgstr "Ffugenw:"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:214
-msgid "Network status: You are connected"
-msgstr "Cyflwr rhwydwaith: Rydych wedi cysylltu"
+#: highscore/kexthighscore_gui.cpp:441
+msgid "Comment:"
+msgstr "Sylwad:"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:284
-msgid "Your name:"
-msgstr "Eich enw:"
+#: highscore/kexthighscore_gui.cpp:451
+msgid "World-wide highscores enabled"
+msgstr "Alluogir sgorau gorau byd-eang"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:448
-msgid "Maximal Number of Clients"
-msgstr "Nifer Uchafsymol o Ddibynyddion"
+#: highscore/kexthighscore_gui.cpp:458
+msgid "Advanced"
+msgstr "Uwch"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:453
-msgid "Maximal number of clients (-1 = infinite):"
-msgstr "Nifer Uchafsymol o Ddibynyddion (-1 = anfeidrol):"
+#: highscore/kexthighscore_gui.cpp:464
+msgid "Registration Data"
+msgstr "Data Cofrestru"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:504
-msgid "Change Maximal Number of Clients"
-msgstr "Newid Nifer Uchafsymol o Ddibynyddion"
+#: highscore/kexthighscore_gui.cpp:475
+msgid "Key:"
+msgstr "Allwedd:"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:506
-msgid "Change Admin"
-msgstr "Newid Gweinyddwr"
+#: highscore/kexthighscore_gui.cpp:482 highscore/kexthighscore_gui.cpp:515
+msgid "Remove"
+msgstr ""
 
-#: kgame/dialogs/kgamedialogconfig.cpp:508
-msgid "Remove Client with All Players"
-msgstr "Gwaredu Dibynnydd efo Pob Chwaraewr"
+#: highscore/kexthighscore_gui.cpp:517
+msgid ""
+"This will permanently remove your registration key. You will not be able to "
+"use the currently registered nickname anymore."
+msgstr ""
+"Bydd hyn yn gwaredu eich allwedd gofrestru am byth.  Ni fyddwch yn gallu "
+"defnyddio'r ffugenw wedi'i gofrestru ar hyn o bryd."
 
-#: kgame/dialogs/kgamedialogconfig.cpp:526
-msgid "Only the admin can configure the message server!"
-msgstr "Y gweinyddwr yn unig a all ffurfweddu'r gweinydd negeseuon!"
+#: highscore/kexthighscore_gui.cpp:560
+msgid "Please choose a non empty nickname."
+msgstr "Dewiswch ffugenw nad yw'n wag."
 
-#: kgame/dialogs/kgamedialogconfig.cpp:537
-msgid "You do not own the message server"
-msgstr ""
+#: highscore/kexthighscore_gui.cpp:564
+msgid "Nickname already in use. Please choose another one"
+msgstr "Mae'r ffugenw mewn defnydd eisoes. Dewiswch un arall"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:571
-msgid "Chat"
-msgstr "Sgwrsio"
+#: highscore/kexthighscore_gui.cpp:585
+msgid "Enter Your Nickname"
+msgstr "Rhowch eich Ffugenw"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:628
-msgid "Connected Players"
-msgstr "Chwaraewyr wedi Cysylltu"
+#: highscore/kexthighscore_gui.cpp:597
+msgid "Congratulations, you have won!"
+msgstr "Llongyfarchiadau, rydych wedi ennill!"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:774
-#, kde-format
-msgid "Do you want to ban player \"%1\" from the game?"
-msgstr "A ydych eisiau atal \"%1\" o'r gêm?"
+#: highscore/kexthighscore_gui.cpp:602
+msgid "Enter your nickname:"
+msgstr "Rhowch eich ffugenw:"
 
-#: kgame/dialogs/kgamedialogconfig.cpp:775
-msgid "Ban Player"
-msgstr "Atal Chwaraewr"
+#: highscore/kexthighscore_gui.cpp:610
+msgid "Do not ask again."
+msgstr "Paid â gofyn eto."
 
-#: kgame/dialogs/kgamedialogconfig.cpp:775
-msgid "Do Not Ban"
-msgstr "Peidio ag Atal"
+#: highscore/kexthighscore_internal.h:82
+msgid "Success"
+msgstr "Llwyddiant"
 
-#: kgame/kgamechat.cpp:97
-#, kde-format
-msgid "Player %1"
-msgstr "Chwaraewr %1"
+#: highscore/kexthighscore.cpp:211
+msgid "Mean Score"
+msgstr "Sgôr Cymedrig"
 
-#: kgame/kgamechat.cpp:216
-#, kde-format
-msgid "Send to My Group (\"%1\")"
-msgstr "Anfon i Fy Ngrwp (\"%1\")"
+#: highscore/kexthighscore.cpp:216
+msgid "Best Score"
+msgstr "Sgôr Gorau"
 
-#: kgame/kgamepropertyhandler.cpp:170
-#, kde-format
-msgid "%1 (%2)"
-msgstr "%1(%2)"
+#: highscore/kexthighscore.cpp:220
+msgid "Elapsed Time"
+msgstr "Amser Aeth Heibio"
 
-#: kgame/kgamepropertyhandler.cpp:172
-#, kde-format
-msgid "Unnamed - ID: %1"
-msgstr "Dienw - Dynodiad: %1"
+#: highscore/khighscore.cpp:138
+msgid "Retry"
+msgstr "Ailgeisio"
 
-#: kgame/kgamepropertyhandler.cpp:176
-#, kde-format
-msgid "%1 unregistered"
-msgid_plural "%1 unregistered"
-msgstr[0] ""
-msgstr[1] ""
+#: highscore/khighscore.cpp:139
+msgid ""
+"Cannot access the highscore file. Another user is probably currently writing "
+"to it."
+msgstr ""
+"Methu cyrchu'r ffeil sgorau gorau.  Mwy na thebyg, mae defnyddiwr arall yn "
+"ysgrifennu iddo ar hyn o bryd."
 
 #. i18n: file: kgamethemeselector.ui:40
 #. i18n: ectx: property (text), widget (QPushButton, getNewButton)
-#: rc.cpp:26 rc.cpp:44
+#: rc.cpp:3
 msgid "&Get New Themes..."
 msgstr ""
 
-#. i18n: file: kgamecardselector.ui:80
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: kgamethemeselector.ui:55
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
 #. i18n: file: kgamecardselector.ui:80
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:9 rc.cpp:29 rc.cpp:47 rc.cpp:68
+#: rc.cpp:6 rc.cpp:27
 msgid "Preview"
 msgstr ""
 
 #. i18n: file: kgamethemeselector.ui:97
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:32 rc.cpp:50
+#: rc.cpp:9
 msgid "Theme Details"
 msgstr ""
 
 #. i18n: file: kgamethemeselector.ui:131
 #. i18n: ectx: property (text), widget (QLabel, labelContact)
-#: rc.cpp:35 rc.cpp:53
+#: rc.cpp:12
 msgid "Contact:"
 msgstr ""
 
 #. i18n: file: kgamethemeselector.ui:166
 #. i18n: ectx: property (text), widget (QLabel, labelDescription)
-#: rc.cpp:38 rc.cpp:56
+#: rc.cpp:15
 msgid "Description:"
 msgstr ""
 
 #. i18n: file: kgamethemeselector.ui:201
 #. i18n: ectx: property (text), widget (QLabel, labelAuthor)
-#: rc.cpp:41 rc.cpp:59
+#: rc.cpp:18
 msgid "Author:"
 msgstr ""
 
 #. i18n: file: kgamecardselector.ui:22
 #. i18n: ectx: property (title), widget (QGroupBox, frontGroupBox)
-#: rc.cpp:3 rc.cpp:62
+#: rc.cpp:21
 msgctxt "Front side of a card"
 msgid "Front"
 msgstr ""
 
 #. i18n: file: kgamecardselector.ui:50
 #. i18n: ectx: property (title), widget (QGroupBox, backGroupBox)
-#: rc.cpp:6 rc.cpp:65
+#: rc.cpp:24
 msgctxt "Back side of a card"
 msgid "Back"
 msgstr ""
 
 #. i18n: file: kgamecardselector.ui:102
 #. i18n: ectx: property (text), widget (QLabel, frontPreview)
-#: rc.cpp:12 rc.cpp:71
+#: rc.cpp:30
 msgid ""
 "Frontside\n"
 "Preview"
@@ -1413,13 +1371,13 @@
 
 #. i18n: file: kgamecardselector.ui:115
 #. i18n: ectx: property (text), widget (QLabel, cardName)
-#: rc.cpp:16 rc.cpp:75
+#: rc.cpp:34
 msgid "Deck Name"
 msgstr ""
 
 #. i18n: file: kgamecardselector.ui:141
 #. i18n: ectx: property (text), widget (QLabel, backPreview)
-#: rc.cpp:19 rc.cpp:78
+#: rc.cpp:37
 msgid ""
 "Backside\n"
 "Preview"
@@ -1427,6 +1385,46 @@
 
 #. i18n: file: kgamecardselector.ui:157
 #. i18n: ectx: property (text), widget (QLabel, cardDescription)
-#: rc.cpp:23 rc.cpp:82
+#: rc.cpp:41
 msgid "Deck description."
 msgstr ""
+
+#: kchatdialog.cpp:65 kchatdialog.cpp:76
+msgid "Configure Chat"
+msgstr "Ffurfweddu Sgwrs"
+
+#: kchatdialog.cpp:97 kchatdialog.cpp:119
+msgid "Name Font..."
+msgstr "Gwynebfath Enw..."
+
+#: kchatdialog.cpp:100 kchatdialog.cpp:122
+msgid "Text Font..."
+msgstr "Gwynebfath Testun..."
+
+#: kchatdialog.cpp:109
+msgid "Player: "
+msgstr "Chwaraewr: "
+
+#: kchatdialog.cpp:111
+msgid "This is a player message"
+msgstr "Neges chwaraewr yw hon"
+
+#: kchatdialog.cpp:117
+msgid "System Messages - Messages directly sent from the game"
+msgstr "Negeseuon Cysawd - negeseuon a anfonir yn uniongyrchol o'r gêm"
+
+#: kchatdialog.cpp:131
+msgid "--- Game: "
+msgstr "--- Gêm: "
+
+#: kchatdialog.cpp:133
+msgid "This is a system message"
+msgstr "Neges gysawd yw hon"
+
+#: kchatdialog.cpp:137
+msgid "Maximum number of messages (-1 = unlimited):"
+msgstr ""
+
+#: kcarddialog.cpp:385
+msgid "Card Deck Selection"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkdepim.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkdepim.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkdepim.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkdepim.po	2012-04-18 08:59:26.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libkdepim\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2009-07-18 17:52+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:18+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:47+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: addcontactjob.cpp:61
 msgid ""
@@ -62,7 +62,7 @@
 "more information to this entry by opening the address book.</qt>"
 msgstr ""
 
-#: addresseelineedit.cpp:1212
+#: addresseelineedit.cpp:1221
 msgid "Configure Completion Order..."
 msgstr ""
 
@@ -140,38 +140,6 @@
 msgid "Edit Completion Order"
 msgstr ""
 
-#: kdateedit.cpp:182
-msgctxt "the day after today"
-msgid "tomorrow"
-msgstr ""
-
-#: kdateedit.cpp:183
-msgctxt "this day"
-msgid "today"
-msgstr ""
-
-#: kdateedit.cpp:184
-msgctxt "the day before today"
-msgid "yesterday"
-msgstr ""
-
-#: kdateedit.cpp:202
-#, kde-format
-msgctxt "@info"
-msgid "Date cannot be earlier than %1"
-msgstr ""
-
-#: kdateedit.cpp:207
-#, kde-format
-msgctxt "@info"
-msgid "Date cannot be later than %1"
-msgstr ""
-
-#: kdateedit.cpp:230
-msgctxt "@info/plain"
-msgid "today"
-msgstr ""
-
 #: kdatepickerpopup.cpp:99
 msgctxt "@option today"
 msgid "&Today"
@@ -221,25 +189,49 @@
 msgid "Reset to Defaults"
 msgstr ""
 
-#: kwidgetlister.cpp:101
+#: kwidgetlister.cpp:123
 msgctxt "more widgets"
 msgid "More"
 msgstr "Mwy"
 
-#: kwidgetlister.cpp:105
+#: kwidgetlister.cpp:127
 msgctxt "fewer widgets"
 msgid "Fewer"
 msgstr "Llai"
 
-#: maillistdrag.cpp:248
+#: maillistdrag.cpp:250
 msgid "Retrieving and storing messages..."
 msgstr ""
 
+#: nepomukwarning.cpp:44
+msgid ""
+"You do not have the semantic desktop system enabled. Many important features "
+"of this software depend on the semantic desktop system and will not work "
+"correctly without it."
+msgstr ""
+
+#: nepomukwarning.cpp:60
+msgid "&Configure"
+msgstr ""
+
+#: nepomukwarning.cpp:88
+msgid ""
+"The module to configure the semantic desktop system (Nepomuk) was not found "
+"on your system. Please make sure Nepomuk was properly installed."
+msgstr ""
+
+#: nepomukwarning.cpp:98
+#, kde-format
+msgid ""
+"You do not have the semantic desktop system enabled. The following features "
+"will not work correctly:<ul><li>%1</li></ul>"
+msgstr ""
+
 #: progressdialog.cpp:175
 msgid "Cancel this operation."
 msgstr ""
 
-#: progressmanager.cpp:99
+#: progressmanager.cpp:108
 msgid "Aborting..."
 msgstr "Atal ..."
 
@@ -253,7 +245,7 @@
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
-#: recentaddresses.cpp:175
+#: recentaddresses.cpp:179
 msgid "Edit Recent Addresses"
 msgstr ""
 
@@ -281,6 +273,37 @@
 msgid "Connection is unencrypted"
 msgstr ""
 
+#: statisticsproxymodel.cpp:86
+msgid "Total Messages"
+msgstr ""
+
+#: statisticsproxymodel.cpp:87
+msgid "Unread Messages"
+msgstr ""
+
+#: statisticsproxymodel.cpp:98
+msgid "Quota"
+msgstr ""
+
+#: statisticsproxymodel.cpp:105
+msgid "Storage Size"
+msgstr ""
+
+#: statisticsproxymodel.cpp:369
+msgctxt "collection size"
+msgid "Size"
+msgstr ""
+
+#: statisticsproxymodel.cpp:371
+msgctxt "number of entities in the collection"
+msgid "Total"
+msgstr ""
+
+#: statisticsproxymodel.cpp:373
+msgctxt "number of unread entities in the collection"
+msgid "Unread"
+msgstr ""
+
 #: statusbarprogresswidget.cpp:86
 msgid "Open detailed progress dialog"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkholidays.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkholidays.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkholidays.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkholidays.po	2012-04-18 08:59:30.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2008-02-15 21:51+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:20+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:59+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: astroseasons.cpp:39
 msgid "June Solstice"
@@ -28,172 +28,177 @@
 msgid "September Equinox"
 msgstr ""
 
-#: holidayregion.cpp:212
+#: holidayregion.cpp:214
 msgctxt "Canadian region"
 msgid "Quebec"
 msgstr ""
 
-#: holidayregion.cpp:214
+#: holidayregion.cpp:216
 msgctxt "German region"
 msgid "Bavaria"
 msgstr ""
 
-#: holidayregion.cpp:216
+#: holidayregion.cpp:218
 msgctxt "Spanish region"
 msgid "Catalonia"
 msgstr ""
 
-#: holidayregion.cpp:218
+#: holidayregion.cpp:220
 msgctxt "UK Region"
 msgid "England and Wales"
 msgstr ""
 
-#: holidayregion.cpp:220
+#: holidayregion.cpp:222
 msgctxt "UK Region"
 msgid "England"
 msgstr ""
 
-#: holidayregion.cpp:222
+#: holidayregion.cpp:224
 msgctxt "UK Region"
 msgid "Wales"
 msgstr ""
 
-#: holidayregion.cpp:224
+#: holidayregion.cpp:226
 msgctxt "UK Region"
 msgid "Scotland"
 msgstr ""
 
-#: holidayregion.cpp:226
+#: holidayregion.cpp:228
 msgctxt "UK Region"
 msgid "Northern Ireland"
 msgstr ""
 
-#: holidayregion.cpp:228
+#: holidayregion.cpp:230
 msgctxt "Italian Region"
 msgid "South Tyrol"
 msgstr ""
 
-#: holidayregion.cpp:230
+#: holidayregion.cpp:232
 msgctxt "Australian Region"
 msgid "New South Wales"
 msgstr ""
 
-#: holidayregion.cpp:232
+#: holidayregion.cpp:234
 msgctxt "Australian Region"
 msgid "Queensland"
 msgstr ""
 
-#: holidayregion.cpp:234
+#: holidayregion.cpp:236
 msgctxt "Australian Region"
 msgid "Victoria"
 msgstr ""
 
-#: holidayregion.cpp:236
+#: holidayregion.cpp:238
 msgctxt "Australian Region"
 msgid "South Australia"
 msgstr ""
 
-#: holidayregion.cpp:238
+#: holidayregion.cpp:240
 msgctxt "Australian Region"
 msgid "Northern Territory"
 msgstr ""
 
-#: holidayregion.cpp:240
+#: holidayregion.cpp:242
 msgctxt "Australian Region"
 msgid "Australian Capital Territory"
 msgstr ""
 
-#: holidayregion.cpp:242
+#: holidayregion.cpp:244
 msgctxt "Australian Region"
 msgid "Western Australia"
 msgstr ""
 
-#: holidayregion.cpp:244
+#: holidayregion.cpp:246
 msgctxt "Australian Region"
 msgid "Tasmania"
 msgstr ""
 
-#: holidayregion.cpp:260
+#: holidayregion.cpp:248
+msgctxt "Bosnian and Herzegovinian Region"
+msgid "Republic of Srpska"
+msgstr ""
+
+#: holidayregion.cpp:264
 msgctxt "Holiday type"
 msgid "Public"
 msgstr ""
 
-#: holidayregion.cpp:262
+#: holidayregion.cpp:266
 msgctxt "Holiday type"
 msgid "Religious"
 msgstr ""
 
-#: holidayregion.cpp:264
+#: holidayregion.cpp:268
 msgctxt "Holiday type"
 msgid "Financial"
 msgstr ""
 
-#: holidayregion.cpp:266
+#: holidayregion.cpp:270
 msgctxt "Holiday type"
 msgid "Cultural"
 msgstr ""
 
-#: holidayregion.cpp:268
+#: holidayregion.cpp:272
 msgctxt "Holiday type"
 msgid "School"
 msgstr ""
 
-#: holidayregion.cpp:270
+#: holidayregion.cpp:274
 msgctxt "Holiday type"
 msgid "Seasons"
 msgstr ""
 
-#: holidayregion.cpp:272
+#: holidayregion.cpp:276
 msgctxt "Holiday type"
 msgid "Name Days"
 msgstr ""
 
-#: holidayregion.cpp:274
+#: holidayregion.cpp:278
 msgctxt "Holiday type"
 msgid "Personal"
 msgstr ""
 
-#: holidayregion.cpp:276
+#: holidayregion.cpp:280
 msgctxt "Holiday type"
 msgid "Catholic"
 msgstr ""
 
-#: holidayregion.cpp:278
+#: holidayregion.cpp:282
 msgctxt "Holiday type"
 msgid "Protestant"
 msgstr ""
 
-#: holidayregion.cpp:280
+#: holidayregion.cpp:284
 msgctxt "Holiday type"
 msgid "Orthodox"
 msgstr ""
 
-#: holidayregion.cpp:282
+#: holidayregion.cpp:286
 msgctxt "Holiday type"
 msgid "Jewish"
 msgstr ""
 
-#: holidayregion.cpp:284
+#: holidayregion.cpp:288
 msgctxt "Holiday type"
 msgid "Islamic"
 msgstr ""
 
-#: holidayregion.cpp:298
+#: holidayregion.cpp:302
 msgctxt "Unknown holiday region"
 msgid "Unknown"
 msgstr ""
 
-#: holidayregionselector.cpp:104 holidayregionselector.cpp:107
+#: holidayregionselector.cpp:105 holidayregionselector.cpp:108
 msgid "<p>Select to use Holiday Region</p>"
 msgstr ""
 
-#: holidayregionselector.cpp:111
+#: holidayregionselector.cpp:112
 #, kde-format
 msgid ""
 "<p><b>Region:</b> %1<br/><b>Language:</b> %2<br/><b>Description:</b> %3</p>"
 msgstr ""
 
-#: holidayregionselector.cpp:123
+#: holidayregionselector.cpp:124
 msgid ""
 "<p>You can choose to display the Holiday Region for information only, or to "
 "use the Holiday Region when displaying or calculating days off such as "
@@ -203,54 +208,54 @@
 "Region as Days Off will continue to be work days.</p>"
 msgstr ""
 
-#: holidayregionselector.cpp:125
+#: holidayregionselector.cpp:132
 msgctxt "Combobox label, Holiday Region not used"
 msgid "Not Used"
 msgstr ""
 
-#: holidayregionselector.cpp:127
+#: holidayregionselector.cpp:134
 msgctxt "Combobox label, use Holiday Region for information only"
 msgid "Information"
 msgstr ""
 
-#: holidayregionselector.cpp:129
+#: holidayregionselector.cpp:136
 msgctxt "Combobox label, use Holiday Region for days off"
 msgid "Days Off"
 msgstr ""
 
-#: holidayregionselector.cpp:230
+#: holidayregionselector.cpp:240
 msgctxt "Header for Select column"
 msgid "Select"
 msgstr ""
 
-#: holidayregionselector.cpp:231
+#: holidayregionselector.cpp:241
 msgid "<p>This column selects to use the Holiday Region</p>"
 msgstr ""
 
-#: holidayregionselector.cpp:238
+#: holidayregionselector.cpp:248
 msgctxt "Header for Holiday Region column"
 msgid "Region"
 msgstr ""
 
-#: holidayregionselector.cpp:239
+#: holidayregionselector.cpp:249
 msgid "<p>This column displays the name of the Holiday Region</p>"
 msgstr ""
 
-#: holidayregionselector.cpp:243
+#: holidayregionselector.cpp:253
 msgctxt "Header for Language column"
 msgid "Language"
 msgstr ""
 
-#: holidayregionselector.cpp:244
+#: holidayregionselector.cpp:254
 msgid "<p>This column displays the language of the Holiday Region</p>"
 msgstr ""
 
-#: holidayregionselector.cpp:248
+#: holidayregionselector.cpp:258
 msgctxt "Header for Description column"
 msgid "Description"
 msgstr ""
 
-#: holidayregionselector.cpp:249
+#: holidayregionselector.cpp:259
 msgid "<p>This column displays the description of the Holiday Region</p>"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkleopatra.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkleopatra.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkleopatra.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkleopatra.po	2012-04-18 08:59:26.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdepim/libkleopatra.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2009-07-18 17:51+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -11,8 +11,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:47+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: ui/adddirectoryservicedialog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, AddDirectoryServiceDialog)
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkmahjongg.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkmahjongg.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkmahjongg.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkmahjongg.po	2012-04-18 08:59:24.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdegames\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2010-12-23 08:56+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:16+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kmahjonggconfigdialog.cpp:57
 msgid "Tiles"
@@ -29,11 +29,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
 #. i18n: file: kmahjonggtilesetselector.ui:46
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: kmahjonggbackgroundselector.ui:46
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: kmahjonggtilesetselector.ui:46
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:3 rc.cpp:18 rc.cpp:33 rc.cpp:48
+#: rc.cpp:3 rc.cpp:18
 msgid "Preview"
 msgstr ""
 
@@ -41,11 +37,7 @@
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #. i18n: file: kmahjonggtilesetselector.ui:81
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: kmahjonggbackgroundselector.ui:81
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: kmahjonggtilesetselector.ui:81
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:6 rc.cpp:21 rc.cpp:36 rc.cpp:51
+#: rc.cpp:6 rc.cpp:21
 msgid "Properties"
 msgstr ""
 
@@ -53,11 +45,7 @@
 #. i18n: ectx: property (text), widget (QLabel, labelAuthor)
 #. i18n: file: kmahjonggtilesetselector.ui:101
 #. i18n: ectx: property (text), widget (QLabel, labelAuthor)
-#. i18n: file: kmahjonggbackgroundselector.ui:101
-#. i18n: ectx: property (text), widget (QLabel, labelAuthor)
-#. i18n: file: kmahjonggtilesetselector.ui:101
-#. i18n: ectx: property (text), widget (QLabel, labelAuthor)
-#: rc.cpp:9 rc.cpp:24 rc.cpp:39 rc.cpp:54
+#: rc.cpp:9 rc.cpp:24
 msgid "Author:"
 msgstr "Awdur:"
 
@@ -65,11 +53,7 @@
 #. i18n: ectx: property (text), widget (QLabel, labelContact)
 #. i18n: file: kmahjonggtilesetselector.ui:111
 #. i18n: ectx: property (text), widget (QLabel, labelContact)
-#. i18n: file: kmahjonggbackgroundselector.ui:111
-#. i18n: ectx: property (text), widget (QLabel, labelContact)
-#. i18n: file: kmahjonggtilesetselector.ui:111
-#. i18n: ectx: property (text), widget (QLabel, labelContact)
-#: rc.cpp:12 rc.cpp:27 rc.cpp:42 rc.cpp:57
+#: rc.cpp:12 rc.cpp:27
 msgid "Contact:"
 msgstr "Cyswllt:"
 
@@ -77,10 +61,6 @@
 #. i18n: ectx: property (text), widget (QLabel, labelDescription)
 #. i18n: file: kmahjonggtilesetselector.ui:121
 #. i18n: ectx: property (text), widget (QLabel, labelDescription)
-#. i18n: file: kmahjonggbackgroundselector.ui:121
-#. i18n: ectx: property (text), widget (QLabel, labelDescription)
-#. i18n: file: kmahjonggtilesetselector.ui:121
-#. i18n: ectx: property (text), widget (QLabel, labelDescription)
-#: rc.cpp:15 rc.cpp:30 rc.cpp:45 rc.cpp:60
+#: rc.cpp:15 rc.cpp:30
 msgid "Description:"
 msgstr "Disgrifiad:"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkmime.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkmime.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkmime.po	2012-03-23 07:39:19.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkmime.po	2012-04-18 08:59:30.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: all.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 15:54+0000\n"
+"POT-Creation-Date: 2012-04-12 19:25+0000\n"
 "PO-Revision-Date: 2009-09-09 21:13+0000\n"
 "Last-Translator: Ciarán <ciax@live.com>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 20:21+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:59+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kmime_dateformatter.cpp:225
 msgctxt "invalid time specified"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkonq.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkonq.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkonq.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkonq.po	2012-04-18 08:59:36.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libkonq\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2009-07-18 18:11+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,120 +18,120 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:26+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: konq_copytomenu.cpp:78
+#: konq_copytomenu.cpp:82
 msgctxt "@title:menu"
 msgid "Copy To"
 msgstr ""
 
-#: konq_copytomenu.cpp:84
+#: konq_copytomenu.cpp:88
 msgctxt "@title:menu"
 msgid "Move To"
 msgstr ""
 
-#: konq_copytomenu.cpp:108
+#: konq_copytomenu.cpp:112
 msgctxt "@title:menu"
 msgid "Home Folder"
 msgstr ""
 
-#: konq_copytomenu.cpp:115
+#: konq_copytomenu.cpp:119
 msgctxt "@title:menu"
 msgid "Root Folder"
 msgstr ""
 
-#: konq_copytomenu.cpp:120
+#: konq_copytomenu.cpp:155
 msgctxt "@title:menu in Copy To or Move To submenu"
 msgid "Browse..."
 msgstr ""
 
-#: konq_copytomenu.cpp:191
+#: konq_copytomenu.cpp:226
 msgctxt "@title:menu"
 msgid "Copy Here"
 msgstr ""
 
-#: konq_copytomenu.cpp:192
+#: konq_copytomenu.cpp:227
 msgctxt "@title:menu"
 msgid "Move Here"
 msgstr ""
 
-#: konq_operations.cpp:275
+#: konq_operations.cpp:292
 msgid "You cannot drop a folder on to itself"
 msgstr "Nid yw'n bosib gollwng plygell ar ei hunan"
 
-#: konq_operations.cpp:320
+#: konq_operations.cpp:338
 msgid "File name for dropped contents:"
 msgstr ""
 
-#: konq_operations.cpp:532
+#: konq_operations.cpp:549
 msgid "&Move Here"
 msgstr "Sy&mud Yma"
 
-#: konq_operations.cpp:536
+#: konq_operations.cpp:553
 msgid "&Copy Here"
 msgstr "&Copïo Yma"
 
-#: konq_operations.cpp:540
+#: konq_operations.cpp:557
 msgid "&Link Here"
 msgstr "Creu Cysw&llt Yma"
 
-#: konq_operations.cpp:542
+#: konq_operations.cpp:559
 msgid "Set as &Wallpaper"
 msgstr "Gosod fel Papur &Wal"
 
-#: konq_operations.cpp:544
+#: konq_operations.cpp:561
 msgid "C&ancel"
 msgstr "&Diddymu"
 
-#: konq_operations.cpp:814
+#: konq_operations.cpp:831
 msgctxt "@action:button"
 msgid "Create directory"
 msgstr ""
 
-#: konq_operations.cpp:816
+#: konq_operations.cpp:833
 msgctxt "@action:button"
 msgid "Enter a different name"
 msgstr ""
 
-#: konq_operations.cpp:819
+#: konq_operations.cpp:836
 #, kde-format
 msgid ""
 "The name \"%1\" starts with a dot, so the directory will be hidden by "
 "default."
 msgstr ""
 
-#: konq_operations.cpp:836
+#: konq_operations.cpp:837
 msgctxt "@title:window"
 msgid "Create hidden directory?"
 msgstr ""
 
-#: konq_operations.cpp:847
+#: konq_operations.cpp:852
 msgctxt "@label Default name when creating a folder"
 msgid "New Folder"
 msgstr ""
 
-#: konq_operations.cpp:854
+#: konq_operations.cpp:859
 msgctxt "@title:window"
 msgid "New Folder"
 msgstr ""
 
-#: konq_operations.cpp:855
+#: konq_operations.cpp:860
 msgctxt "@label:textbox"
 msgid "Enter folder name:"
 msgstr ""
 
-#: konq_operations.cpp:947
+#: konq_operations.cpp:964
 msgctxt "@action:inmenu"
 msgid "Paste One Folder"
 msgstr ""
 
-#: konq_operations.cpp:948
+#: konq_operations.cpp:965
 msgctxt "@action:inmenu"
 msgid "Paste One File"
 msgstr ""
 
-#: konq_operations.cpp:951
+#: konq_operations.cpp:968
 #, kde-format
 msgctxt "@action:inmenu"
 msgid "Paste One Item"
@@ -139,85 +139,85 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: konq_operations.cpp:953
+#: konq_operations.cpp:970
 msgctxt "@action:inmenu"
 msgid "Paste Clipboard Contents..."
 msgstr ""
 
-#: konq_operations.cpp:957
+#: konq_operations.cpp:974
 msgctxt "@action:inmenu"
 msgid "Paste"
 msgstr ""
 
-#: konq_popupmenu.cpp:249
+#: konq_popupmenu.cpp:254
 msgid "&Open"
 msgstr "&Agor"
 
-#: konq_popupmenu.cpp:274
+#: konq_popupmenu.cpp:279
 msgid "Create &Folder..."
 msgstr "Creu pl&ygell..."
 
-#: konq_popupmenu.cpp:283
+#: konq_popupmenu.cpp:288
 msgid "&Restore"
 msgstr "&Adfer"
 
-#: konq_popupmenu.cpp:284
+#: konq_popupmenu.cpp:289
 msgid ""
 "Restores this file or directory, back to the location where it was deleted "
 "from initially"
 msgstr ""
 
-#: konq_popupmenu.cpp:304
+#: konq_popupmenu.cpp:309
 msgid "Show Original Directory"
 msgstr ""
 
-#: konq_popupmenu.cpp:304
+#: konq_popupmenu.cpp:309
 msgid "Show Original File"
 msgstr ""
 
-#: konq_popupmenu.cpp:305
+#: konq_popupmenu.cpp:310
 msgid ""
 "Opens a new file manager window showing the target of this link, in its "
 "parent directory."
 msgstr ""
 
-#: konq_popupmenu.cpp:337
+#: konq_popupmenu.cpp:342
 msgid "&Empty Trash Bin"
 msgstr "Gwagio'r Swbri&el"
 
-#: konq_popupmenu.cpp:351
+#: konq_popupmenu.cpp:353
 msgid "&Configure Trash Bin"
 msgstr ""
 
-#: konq_popupmenu.cpp:363
+#: konq_popupmenu.cpp:377
 msgid "&Bookmark This Page"
 msgstr "&Tudnodi'r Dudalen Yma"
 
-#: konq_popupmenu.cpp:365
+#: konq_popupmenu.cpp:379
 msgid "&Bookmark This Location"
 msgstr "T&udnodi'r Lleoliad Yma"
 
-#: konq_popupmenu.cpp:368
+#: konq_popupmenu.cpp:382
 msgid "&Bookmark This Folder"
 msgstr "Tu&dnodi'r Blygell Yma"
 
-#: konq_popupmenu.cpp:370
+#: konq_popupmenu.cpp:384
 msgid "&Bookmark This Link"
 msgstr "Tudnod&i'r Cyswllt Yma"
 
-#: konq_popupmenu.cpp:372
+#: konq_popupmenu.cpp:386
 msgid "&Bookmark This File"
 msgstr "Tudnod&i'r Ffeil Yma"
 
-#: konq_popupmenu.cpp:400
+#: konq_popupmenu.cpp:414
 msgid "Preview In"
 msgstr ""
 
-#: konq_popupmenu.cpp:435
+#: konq_popupmenu.cpp:449
 msgid "&Properties"
 msgstr "&Priodweddau"
 
-#: konq_popupmenu.cpp:449
+#: konq_popupmenu.cpp:463
 msgid "Share"
 msgstr "Rhannu"
 
@@ -225,3 +225,12 @@
 msgctxt "@info"
 msgid "Close"
 msgstr ""
+
+#: konq_statusbarmessagelabel.cpp:81
+msgid "Close"
+msgstr ""
+
+#: konq_statusbarmessagelabel.cpp:160
+#, kde-format
+msgid "Error: %1"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkpgp.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkpgp.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkpgp.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkpgp.po	2012-04-18 08:59:26.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: all.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
-"PO-Revision-Date: 2012-03-13 03:18+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
+"PO-Revision-Date: 2012-04-16 13:14+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kpgp.cpp:198
 msgid ""
@@ -206,7 +206,7 @@
 "\n"
 "Dewiswch yr allwedd(au) a ddylir eu defnyddio ar gyfer y derbyniwr yma."
 
-#: kpgpbase2.cpp:139 kpgpbaseG.cpp:151
+#: kpgpbase2.cpp:137 kpgpbaseG.cpp:151
 #, kde-format
 msgid ""
 "Could not find public keys matching the userid(s)\n"
@@ -214,7 +214,7 @@
 "the message is not encrypted."
 msgstr ""
 
-#: kpgpbase2.cpp:144 kpgpbaseG.cpp:156
+#: kpgpbase2.cpp:142 kpgpbaseG.cpp:156
 #, kde-format
 msgid ""
 "Could not find public keys matching the userid(s)\n"
@@ -222,7 +222,7 @@
 "these persons will not be able to read the message."
 msgstr ""
 
-#: kpgpbase2.cpp:170
+#: kpgpbase2.cpp:168
 #, kde-format
 msgid ""
 "Public keys not certified with trusted signature for userid(s)\n"
@@ -234,7 +234,7 @@
 "%1\n"
 "Ni chêl-ysgrifir y neges."
 
-#: kpgpbase2.cpp:176
+#: kpgpbase2.cpp:174
 #, kde-format
 msgid ""
 "Public keys not certified with trusted signature for userid(s)\n"
@@ -242,33 +242,33 @@
 "these persons will not be able to read the message."
 msgstr ""
 
-#: kpgpbase2.cpp:197
+#: kpgpbase2.cpp:195
 msgid "Bad passphrase; could not sign."
 msgstr ""
 
-#: kpgpbase2.cpp:205
+#: kpgpbase2.cpp:203
 msgid ""
 "Signing failed: please check your PGP User Identity, the PGP setup, and the "
 "key rings."
 msgstr ""
 
-#: kpgpbase2.cpp:213
+#: kpgpbase2.cpp:211
 msgid "Encryption failed: please check your PGP setup and the key rings."
 msgstr ""
 
-#: kpgpbase2.cpp:259 kpgpbase6.cpp:60 kpgpbase6.cpp:358
+#: kpgpbase2.cpp:257 kpgpbase6.cpp:57 kpgpbase6.cpp:351
 msgid "error running PGP"
 msgstr "gwall wrth redeg PGP"
 
-#: kpgpbase2.cpp:299 kpgpbase5.cpp:229 kpgpbase6.cpp:85 kpgpbaseG.cpp:261
+#: kpgpbase2.cpp:297 kpgpbase5.cpp:224 kpgpbase6.cpp:82 kpgpbaseG.cpp:261
 msgid "Bad passphrase; could not decrypt."
 msgstr ""
 
-#: kpgpbase2.cpp:310 kpgpbase5.cpp:240 kpgpbaseG.cpp:282
+#: kpgpbase2.cpp:308 kpgpbase5.cpp:235 kpgpbaseG.cpp:282
 msgid "You do not have the secret key needed to decrypt this message."
 msgstr ""
 
-#: kpgpbase2.cpp:450
+#: kpgpbase2.cpp:448
 #, kde-format
 msgid ""
 "The keyring file %1 does not exist.\n"
@@ -277,19 +277,19 @@
 "Nid yw'r ffeil modrwy allweddau %1 mewn bod.\n"
 "Gwiriwch eich gosodiad PGP."
 
-#: kpgpbase2.cpp:456
+#: kpgpbase2.cpp:454
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
 
-#: kpgpbase5.cpp:88
+#: kpgpbase5.cpp:86
 msgid "Neither recipients nor passphrase specified."
 msgstr "Ni phenodwyd derbynwyr neu gyfrinair."
 
-#: kpgpbase5.cpp:130
+#: kpgpbase5.cpp:129
 msgid "The passphrase you entered is invalid."
 msgstr "Mae'r cyfrin-ymadrodd a fewnosodir yn annilys."
 
-#: kpgpbase5.cpp:156
+#: kpgpbase5.cpp:155
 msgid ""
 "The key(s) you want to encrypt your message to are not trusted. No "
 "encryption done."
@@ -297,7 +297,7 @@
 "Ni ymddiriedir yr allwedd(au) yr hoffech ddefnyddio i gêl-ysgrifo eich "
 "neges.  Ni wnaed cêl-ysgrifo."
 
-#: kpgpbase5.cpp:159
+#: kpgpbase5.cpp:158
 #, kde-format
 msgid ""
 "The following key(s) are not trusted:\n"
@@ -308,7 +308,7 @@
 "%1\n"
 "Ni fydd eu perchennog/perchnogion yn gallu datgelu'r neges."
 
-#: kpgpbase5.cpp:171
+#: kpgpbase5.cpp:170
 #, kde-format
 msgid ""
 "Missing encryption key(s) for:\n"
@@ -317,15 +317,15 @@
 "Allwedd(au) cêl-ysgrifo ar goll ar gyfer:\n"
 "%1"
 
-#: kpgpbase5.cpp:208
+#: kpgpbase5.cpp:205
 msgid "Error running PGP"
 msgstr "Gwall wrth redeg PGP"
 
-#: kpgpbase6.cpp:93
+#: kpgpbase6.cpp:90
 msgid "You do not have the secret key for this message."
 msgstr ""
 
-#: kpgpbase6.cpp:170
+#: kpgpbase6.cpp:167
 msgid "??? (file ~/.pgp/pubring.pkr not found)"
 msgstr "??? (ni chanfuwyd y ffeil ~/.pgp/pubring.pkr)"
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libksieve.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libksieve.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libksieve.po	2012-03-23 07:39:15.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libksieve.po	2012-04-18 08:59:26.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libksieve\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 03:45+0000\n"
+"POT-Creation-Date: 2012-04-12 17:48+0000\n"
 "PO-Revision-Date: 2006-04-11 11:17+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -15,31 +15,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: kmanagesieve/sievejob.cpp:130 kmanagesieve/sievejob.cpp:134
-#, kde-format
-msgid ""
-"The script did not upload successfully.\n"
-"This is probably due to errors in the script.\n"
-"The server responded:\n"
-"%1"
-msgstr ""
-
-#: kmanagesieve/sievejob.cpp:138
-msgid ""
-"The script did not upload successfully.\n"
-"The script may contain errors."
-msgstr ""
-
-#: kmanagesieve/sievejob.cpp:170
-msgid "Sieve operation failed."
-msgstr ""
-
-#: kmanagesieve/sievejob.cpp:170 kmanagesieve/sievejob.cpp:172
-msgid "Sieve Error"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-04-18 00:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kmanagesieve/session.cpp:142
 msgid "Syntax error."
@@ -49,7 +26,7 @@
 msgid "Can not use TLS since the underlying Qt library does not support it."
 msgstr ""
 
-#: kmanagesieve/session.cpp:176
+#: kmanagesieve/session.cpp:175
 msgid ""
 "TLS encryption was requested, but your Sieve server does not advertise TLS "
 "in its capabilities.\n"
@@ -57,11 +34,11 @@
 "the operation."
 msgstr ""
 
-#: kmanagesieve/session.cpp:178
+#: kmanagesieve/session.cpp:177
 msgid "Server Does Not Advertise TLS"
 msgstr ""
 
-#: kmanagesieve/session.cpp:178
+#: kmanagesieve/session.cpp:177
 msgid "&Start TLS nonetheless"
 msgstr ""
 
@@ -94,234 +71,27 @@
 "same as your email password):"
 msgstr ""
 
-#: ksieveui/sievedebugdialog.cpp:170
-msgid "Sieve Diagnostics"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:184
-msgid ""
-"Collecting diagnostic information about Sieve support...\n"
-"\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:209
-#, kde-format
-msgid "Collecting data for account '%1'...\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:210
-msgid "------------------------------------------------------------\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:215
-msgid ""
-"(Account does not support Sieve)\n"
-"\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:247
-#, kde-format
-msgid "Contents of script '%1':\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:270
-msgid ""
-"(This script is empty.)\n"
-"\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:275
-#, kde-format
-msgid ""
-"------------------------------------------------------------\n"
-"%1\n"
-"------------------------------------------------------------\n"
-"\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:291
-msgid "Sieve capabilities:\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:295
-msgid "(No special capabilities available)"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:304
-msgid "Available Sieve scripts:\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:308
-msgid ""
-"(No Sieve scripts available on this server)\n"
-"\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:316
-#, kde-format
-msgid ""
-"Active script: %1\n"
-"\n"
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:343 ksieveui/vacation.cpp:698
-msgid ""
-"Sieve script installed successfully on the server.\n"
-"Out of Office reply is now active."
-msgstr ""
-
-#: ksieveui/sievedebugdialog.cpp:345 ksieveui/vacation.cpp:700
-msgid ""
-"Sieve script installed successfully on the server.\n"
-"Out of Office reply has been deactivated."
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:36
-msgid "Manage Sieve Scripts"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:51
-msgid "Available Scripts"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:99
-msgid "No Sieve URL configured"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:129
-msgid "Failed to fetch the list of scripts"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:156
-msgid "Delete Script"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:157
-msgid "Edit Script..."
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:159
-msgid "Deactivate Script"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:162
-msgid "New Script..."
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:318
-#, kde-format
-msgid "Really delete script \"%1\" from the server?"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:319
-msgid "Delete Sieve Script Confirmation"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:362
-msgid "New Sieve Script"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:363
-msgid "Please enter a name for the new Sieve script:"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:364
-msgid "unnamed"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:380
-msgid "Edit Sieve Script"
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:440
-msgid "The Sieve script was successfully uploaded."
-msgstr ""
-
-#: ksieveui/managesievescriptsdialog.cpp:441
-msgid "Sieve Script Upload"
-msgstr ""
-
-#: ksieveui/vacationdialog.cpp:61
-msgid "Configure vacation notifications to be sent:"
-msgstr ""
-
-#: ksieveui/vacationdialog.cpp:67
-msgid "&Activate vacation notifications"
-msgstr ""
-
-#: ksieveui/vacationdialog.cpp:83 ksieveui/vacationdialog.cpp:182
-msgid " day"
-msgid_plural " days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ksieveui/vacationdialog.cpp:85
-msgid "&Resend notification only after:"
-msgstr ""
-
-#: ksieveui/vacationdialog.cpp:95
-msgid "&Send responses for these addresses:"
-msgstr ""
-
-#: ksieveui/vacationdialog.cpp:102
-msgid "Do not send vacation replies to spam messages"
-msgstr ""
-
-#: ksieveui/vacationdialog.cpp:109
-msgid "Only react to mail coming from domain"
-msgstr ""
-
-#: ksieveui/vacation.cpp:538
+#: kmanagesieve/sievejob.cpp:132 kmanagesieve/sievejob.cpp:137
 #, kde-format
 msgid ""
-"I am out of office till %1.\n"
-"\n"
-"In urgent cases, please contact Mrs. <placeholder>vacation "
-"replacement</placeholder>\n"
-"\n"
-"email: <placeholder>email address of vacation replacement</placeholder>\n"
-"phone: +49 711 1111 11\n"
-"fax.:  +49 711 1111 12\n"
-"\n"
-"Yours sincerely,\n"
-"-- <placeholder>enter your name and email address here</placeholder>\n"
-msgstr ""
-
-#: ksieveui/vacation.cpp:586
-msgid ""
-"Your server did not list \"vacation\" in its list of supported Sieve "
-"extensions;\n"
-"without it, KMail cannot install out-of-office replies for you.\n"
-"Please contact your system administrator."
-msgstr ""
-
-#: ksieveui/vacation.cpp:596
-msgid "Configure \"Out of Office\" Replies"
-msgstr ""
-
-#: ksieveui/vacation.cpp:606
-msgid ""
-"Someone (probably you) changed the vacation script on the server.\n"
-"KMail is no longer able to determine the parameters for the autoreplies.\n"
-"Default values will be used."
+"The script did not upload successfully.\n"
+"This is probably due to errors in the script.\n"
+"The server responded:\n"
+"%1"
 msgstr ""
 
-#: ksieveui/vacation.cpp:631
+#: kmanagesieve/sievejob.cpp:141
 msgid ""
-"There is still an active out-of-office reply configured.\n"
-"Do you want to edit it?"
-msgstr ""
-
-#: ksieveui/vacation.cpp:632
-msgid "Out-of-office reply still active"
+"The script did not upload successfully.\n"
+"The script may contain errors."
 msgstr ""
 
-#: ksieveui/vacation.cpp:633
-msgid "Edit"
+#: kmanagesieve/sievejob.cpp:172
+msgid "Sieve operation failed."
 msgstr ""
 
-#: ksieveui/vacation.cpp:634
-msgid "Ignore"
+#: kmanagesieve/sievejob.cpp:172 kmanagesieve/sievejob.cpp:174
+msgid "Sieve Error"
 msgstr ""
 
 #: shared/error.cpp:110
@@ -521,97 +291,364 @@
 msgid "Unknown error"
 msgstr "Gwall annisgwyl"
 
-#. i18n: file: ksieveui/ksieveui.kcfg:12
-#. i18n: ectx: label, entry (AllowOutOfOfficeSettings), group (OutOfOffice)
-#: rc.cpp:3
-msgid "Allow out-of-office settings to be changeable by the user."
+#: ksieveui/sieveeditor.cpp:38
+msgid "Edit Sieve Script"
 msgstr ""
 
-#. i18n: file: ksieveui/ksieveui.kcfg:16
-#. i18n: ectx: label, entry (AllowOutOfOfficeUploadButNoSettings), group (OutOfOffice)
-#: rc.cpp:6
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but prevent them from "
-"changing any settings, such as the domain to react to or the spam reaction "
-"switch."
+#: ksieveui/sieveeditor.cpp:40
+msgid "Check Syntax"
 msgstr ""
 
-#. i18n: file: ksieveui/ksieveui.kcfg:20
-#. i18n: ectx: label, entry (OutOfOfficeDomain), group (OutOfOffice)
-#: rc.cpp:9
-msgid "Send out-of-office replies to mails coming from this domain only."
+#: ksieveui/sieveeditor.cpp:42
+msgid "Import..."
 msgstr ""
 
-#. i18n: file: ksieveui/ksieveui.kcfg:24
-#. i18n: ectx: label, entry (OutOfOfficeReactToSpam), group (OutOfOffice)
-#: rc.cpp:12
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+#: ksieveui/sieveeditor.cpp:50
+msgid "Script name:"
 msgstr ""
 
-#. i18n: file: ksieveui/ksieveui.kcfg:28
-#. i18n: ectx: label, entry (CheckOutOfOfficeOnStartup), group (OutOfOffice)
-#: rc.cpp:15
+#: ksieveui/sieveeditor.cpp:93
+#, kde-format
 msgid ""
-"Check if there is still an active out-of-office reply configured on startup."
+"Could not write the file %1:\n"
+"\"%2\" is the detailed error description."
 msgstr ""
 
-#. i18n: file: ksieveui/imapresource.kcfg:10
-#. i18n: ectx: label, entry (ImapServer), group (network)
-#: rc.cpp:18
+#: ksieveui/sieveeditor.cpp:97 ksieveui/sieveeditor.cpp:136
+msgid "Sieve Editor Error"
+msgstr ""
+
+#: ksieveui/sieveeditor.cpp:118
+msgid "You will overwrite script. Do you want to continue?"
+msgstr ""
+
+#: ksieveui/sieveeditor.cpp:118
+msgid "Import Script"
+msgstr ""
+
+#: ksieveui/sieveeditor.cpp:132
+#, kde-format
+msgid ""
+"Could not load the file %1:\n"
+"\"%2\" is the detailed error description."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:37
+msgid "Manage Sieve Scripts"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:51
+msgid "Available Scripts"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:68
+msgid "New..."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:72
+msgid "Edit..."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:76
+msgid "Delete"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:80
+msgid "Deactivate"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:166
+msgid "No Sieve URL configured"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:198
+msgid "Failed to fetch the list of scripts"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:224
+msgid "Delete Script"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:225
+msgid "Edit Script..."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:227
+msgid "Deactivate Script"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:231
+msgid "New Script..."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:385
+#, kde-format
+msgid "Really delete script \"%1\" from the server?"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:386
+msgid "Delete Sieve Script Confirmation"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:432
+msgid "New Sieve Script"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:433
+msgid "Please enter a name for the new Sieve script:"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:434
+msgid "unnamed"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:450
+#, kde-format
+msgid "Script name already used \"%1\"."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:450
+msgid "New Script"
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:513
+msgid "No error found."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:516
+msgid "Error unknown."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:525
+msgid "The Sieve script was successfully uploaded."
+msgstr ""
+
+#: ksieveui/managesievescriptsdialog.cpp:526
+msgid "Sieve Script Upload"
+msgstr ""
+
+#: ksieveui/vacationdialog.cpp:61
+msgid "Configure vacation notifications to be sent:"
+msgstr ""
+
+#: ksieveui/vacationdialog.cpp:67
+msgid "&Activate vacation notifications"
+msgstr ""
+
+#: ksieveui/vacationdialog.cpp:83 ksieveui/vacationdialog.cpp:182
+msgid " day"
+msgid_plural " days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ksieveui/vacationdialog.cpp:85
+msgid "&Resend notification only after:"
+msgstr ""
+
+#: ksieveui/vacationdialog.cpp:95
+msgid "&Send responses for these addresses:"
+msgstr ""
+
+#: ksieveui/vacationdialog.cpp:102
+msgid "Do not send vacation replies to spam messages"
+msgstr ""
+
+#: ksieveui/vacationdialog.cpp:109
+msgid "Only react to mail coming from domain"
+msgstr ""
+
+#: ksieveui/vacation.cpp:538
+#, kde-format
+msgid ""
+"I am out of office till %1.\n"
+"\n"
+"In urgent cases, please contact Mrs. <placeholder>vacation "
+"replacement</placeholder>\n"
+"\n"
+"email: <placeholder>email address of vacation replacement</placeholder>\n"
+"phone: +49 711 1111 11\n"
+"fax.:  +49 711 1111 12\n"
+"\n"
+"Yours sincerely,\n"
+"-- <placeholder>enter your name and email address here</placeholder>\n"
+msgstr ""
+
+#: ksieveui/vacation.cpp:586
+msgid ""
+"Your server did not list \"vacation\" in its list of supported Sieve "
+"extensions;\n"
+"without it, KMail cannot install out-of-office replies for you.\n"
+"Please contact your system administrator."
+msgstr ""
+
+#: ksieveui/vacation.cpp:596
+msgid "Configure \"Out of Office\" Replies"
+msgstr ""
+
+#: ksieveui/vacation.cpp:606
+msgid ""
+"Someone (probably you) changed the vacation script on the server.\n"
+"KMail is no longer able to determine the parameters for the autoreplies.\n"
+"Default values will be used."
+msgstr ""
+
+#: ksieveui/vacation.cpp:631
+msgid ""
+"There is still an active out-of-office reply configured.\n"
+"Do you want to edit it?"
+msgstr ""
+
+#: ksieveui/vacation.cpp:632
+msgid "Out-of-office reply still active"
+msgstr ""
+
+#: ksieveui/vacation.cpp:633
+msgid "Edit"
+msgstr ""
+
+#: ksieveui/vacation.cpp:634
+msgid "Ignore"
+msgstr ""
+
+#: ksieveui/vacation.cpp:698 ksieveui/sievedebugdialog.cpp:343
+msgid ""
+"Sieve script installed successfully on the server.\n"
+"Out of Office reply is now active."
+msgstr ""
+
+#: ksieveui/vacation.cpp:700 ksieveui/sievedebugdialog.cpp:345
+msgid ""
+"Sieve script installed successfully on the server.\n"
+"Out of Office reply has been deactivated."
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:170
+msgid "Sieve Diagnostics"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:184
+msgid ""
+"Collecting diagnostic information about Sieve support...\n"
+"\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:209
+#, kde-format
+msgid "Collecting data for account '%1'...\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:210
+msgid "------------------------------------------------------------\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:215
+msgid ""
+"(Account does not support Sieve)\n"
+"\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:247
+#, kde-format
+msgid "Contents of script '%1':\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:270
+msgid ""
+"(This script is empty.)\n"
+"\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:275
+#, kde-format
+msgid ""
+"------------------------------------------------------------\n"
+"%1\n"
+"------------------------------------------------------------\n"
+"\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:291
+msgid "Sieve capabilities:\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:295
+msgid "(No special capabilities available)"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:304
+msgid "Available Sieve scripts:\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:308
+msgid ""
+"(No Sieve scripts available on this server)\n"
+"\n"
+msgstr ""
+
+#: ksieveui/sievedebugdialog.cpp:316
+#, kde-format
+msgid ""
+"Active script: %1\n"
+"\n"
+msgstr ""
+
+#. i18n: file: ksieveui/imapresource.kcfg:10
+#. i18n: ectx: label, entry (ImapServer), group (network)
+#: rc.cpp:3
 msgid "IMAP server"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:13
 #. i18n: ectx: label, entry (ImapPort), group (network)
-#: rc.cpp:21
+#: rc.cpp:6
 msgid "Defines the port the IMAP service is running on"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:17
 #. i18n: ectx: label, entry (UserName), group (network)
-#: rc.cpp:24
+#: rc.cpp:9
 msgid "Username"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:20
 #. i18n: ectx: label, entry (Safety), group (network)
-#: rc.cpp:27
+#: rc.cpp:12
 msgid "Defines the encryption type to use"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:24
 #. i18n: ectx: label, entry (Authentication), group (network)
-#: rc.cpp:30
+#: rc.cpp:15
 msgid "Defines the authentication type to use"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:28
 #. i18n: ectx: label, entry (SubscriptionEnabled), group (network)
-#: rc.cpp:33
+#: rc.cpp:18
 msgid "Defines if the server side subscription is enabled"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:34
 #. i18n: ectx: label, entry (DisconnectedModeEnabled), group (cache)
-#: rc.cpp:36
+#: rc.cpp:21
 msgid "Defines if all the IMAP data should be cached locally all the time"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:38
 #. i18n: ectx: label, entry (IntervalCheckEnabled), group (cache)
-#: rc.cpp:39
+#: rc.cpp:24
 msgid "Defines if interval checking is enabled."
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:42
 #. i18n: ectx: label, entry (IntervalCheckTime), group (cache)
-#: rc.cpp:42
+#: rc.cpp:27
 msgid "Check interval in minutes"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:47
 #. i18n: ectx: label, entry (RetrieveMetadataOnFolderListing), group (cache)
-#: rc.cpp:45
+#: rc.cpp:30
 msgid ""
 "Defines if the annotations, ACLs and quota information of mailboxes should\n"
 "             also be retrieved when the mailboxes get listed."
@@ -619,7 +656,7 @@
 
 #. i18n: file: ksieveui/imapresource.kcfg:52
 #. i18n: ectx: label, entry (AutomaticExpungeEnabled), group (cache)
-#: rc.cpp:49
+#: rc.cpp:34
 msgid ""
 "Defines if the expunge command is issued automatically, otherwise it should "
 "be\n"
@@ -628,54 +665,88 @@
 
 #. i18n: file: ksieveui/imapresource.kcfg:56
 #. i18n: ectx: label, entry (TrashCollection), group (cache)
-#: rc.cpp:53
+#: rc.cpp:38
 msgid "Define which folder is used for trash"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:60
 #. i18n: ectx: label, entry (UseDefaultIdentity), group (cache)
-#: rc.cpp:56
+#: rc.cpp:41
 msgid "Define if account uses the default identity"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:64
 #. i18n: ectx: label, entry (AccountIdentity), group (cache)
-#: rc.cpp:59
+#: rc.cpp:44
 msgid "Identity account"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:69
 #. i18n: ectx: label, entry (IdleRidPath), group (idle)
-#: rc.cpp:62
+#: rc.cpp:47
 msgid "RID path to the mailbox to watch for changes"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:74
 #. i18n: ectx: label, entry (SieveSupport), group (siever)
-#: rc.cpp:65
+#: rc.cpp:50
 msgid "Define if server supports sieve"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:78
 #. i18n: ectx: label, entry (SieveReuseConfig), group (siever)
-#: rc.cpp:68
+#: rc.cpp:53
 msgid "Define if we reuse host and login configuration"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:82
 #. i18n: ectx: label, entry (SievePort), group (siever)
-#: rc.cpp:71
+#: rc.cpp:56
 msgid "Define sieve port"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:86
 #. i18n: ectx: label, entry (SieveAlternateUrl), group (siever)
-#: rc.cpp:74
+#: rc.cpp:59
 msgid "Define alternate URL"
 msgstr ""
 
 #. i18n: file: ksieveui/imapresource.kcfg:89
 #. i18n: ectx: label, entry (SieveVacationFilename), group (siever)
-#: rc.cpp:77
+#: rc.cpp:62
 msgid "Define default sieve vacation filename"
 msgstr ""
+
+#. i18n: file: ksieveui/ksieveui.kcfg:12
+#. i18n: ectx: label, entry (AllowOutOfOfficeSettings), group (OutOfOffice)
+#: rc.cpp:65
+msgid "Allow out-of-office settings to be changeable by the user."
+msgstr ""
+
+#. i18n: file: ksieveui/ksieveui.kcfg:16
+#. i18n: ectx: label, entry (AllowOutOfOfficeUploadButNoSettings), group (OutOfOffice)
+#: rc.cpp:68
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but prevent them from "
+"changing any settings, such as the domain to react to or the spam reaction "
+"switch."
+msgstr ""
+
+#. i18n: file: ksieveui/ksieveui.kcfg:20
+#. i18n: ectx: label, entry (OutOfOfficeDomain), group (OutOfOffice)
+#: rc.cpp:71
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#. i18n: file: ksieveui/ksieveui.kcfg:24
+#. i18n: ectx: label, entry (OutOfOfficeReactToSpam), group (OutOfOffice)
+#: rc.cpp:74
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#. i18n: file: ksieveui/ksieveui.kcfg:28
+#. i18n: ectx: label, entry (CheckOutOfOfficeOnStartup), group (OutOfOffice)
+#: rc.cpp:77
+msgid ""
+"Check if there is still an active out-of-office reply configured on startup."
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkworkspace.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkworkspace.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libkworkspace.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libkworkspace.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,44 +7,44 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-01 10:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:48+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kdisplaymanager.cpp:538
+#: kdisplaymanager.cpp:533
 #, kde-format
 msgctxt "user: ..."
 msgid "%1: TTY login"
 msgstr ""
 
-#: kdisplaymanager.cpp:544
+#: kdisplaymanager.cpp:539
 msgctxt "... location (TTY or X display)"
 msgid "Unused"
 msgstr ""
 
-#: kdisplaymanager.cpp:546
+#: kdisplaymanager.cpp:541
 msgid "X login on remote host"
 msgstr ""
 
-#: kdisplaymanager.cpp:547
+#: kdisplaymanager.cpp:542
 #, kde-format
 msgctxt "... host"
 msgid "X login on %1"
 msgstr ""
 
-#: kdisplaymanager.cpp:550
+#: kdisplaymanager.cpp:545
 #, kde-format
 msgctxt "user: session type"
 msgid "%1: %2"
 msgstr "%1: %2"
 
-#: kdisplaymanager.cpp:565
+#: kdisplaymanager.cpp:560
 #, kde-format
 msgctxt "session (location)"
 msgid "%1 (%2)"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/liboktetacore.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/liboktetacore.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/liboktetacore.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/liboktetacore.po	2012-04-18 08:59:27.000000000 +0000
@@ -7,19 +7,19 @@
 msgstr ""
 "Project-Id-Version: kdeutils\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2010-12-18 02:07+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:25+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:59+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: piecetable/replacepiecetablechange.cpp:40
+#: piecetable/swaprangespiecetablechange.cpp:40
 msgctxt "name of the change"
-msgid "Replace"
+msgid "Swap Ranges"
 msgstr ""
 
 #: piecetable/insertpiecetablechange.cpp:41
@@ -27,12 +27,12 @@
 msgid "Insert"
 msgstr ""
 
+#: piecetable/replacepiecetablechange.cpp:40
+msgctxt "name of the change"
+msgid "Replace"
+msgstr ""
+
 #: piecetable/removepiecetablechange.cpp:40
 msgctxt "name of the change"
 msgid "Remove"
 msgstr "Tynnu"
-
-#: piecetable/swaprangespiecetablechange.cpp:40
-msgctxt "name of the change"
-msgid "Swap Ranges"
-msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libtaskmanager.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libtaskmanager.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/libtaskmanager.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/libtaskmanager.po	2012-04-18 08:59:39.000000000 +0000
@@ -6,102 +6,212 @@
 msgstr ""
 "Project-Id-Version: libtaskmanager\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2009-07-18 18:14+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:19+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:49+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: task.cpp:222
+#: launcherconfig.cpp:44
+msgid "Launcher Matching Rules"
+msgstr ""
+
+#: launcherconfig.cpp:144
+#, kde-format
+msgid "A launcher is already defined for %1"
+msgstr ""
+
+#: launcherconfig.cpp:201
+msgid ""
+"To associate an application with a launcher, the task manager reads the "
+"application's window class and name. These are then used to look up the "
+"launcher details of an installed application. This attempts to match these "
+"against the application's 'Name'. This can sometimes fail. The list above "
+"allows you to manually set the class+name to launcher/name mapping."
+msgstr ""
+
+#: launcherproperties.cpp:46
+msgid "Launcher Properties"
+msgstr ""
+
+#: launcherproperties.cpp:96
+msgid "Select launcher application:"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:39
+#. i18n: ectx: property (text), widget (QTreeWidget, view)
+#: rc.cpp:3
+msgid "Window Class"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:44
+#. i18n: ectx: property (text), widget (QTreeWidget, view)
+#: rc.cpp:6
+msgid "Window Name"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:49
+#. i18n: ectx: property (text), widget (QTreeWidget, view)
+#: rc.cpp:9
+msgid "Launcher"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:57
+#. i18n: ectx: property (text), widget (KPushButton, add)
+#: rc.cpp:12
+msgid "Add"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:64
+#. i18n: ectx: property (text), widget (KPushButton, edit)
+#: rc.cpp:15
+msgid "Edit"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:71
+#. i18n: ectx: property (text), widget (KPushButton, remove)
+#: rc.cpp:18
+msgid "Remove"
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:91
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:21
+msgid ""
+"<b>NOTE:</b> The above list is only required when the automatic window to "
+"launcher rules do not work. You do not need to add an entry here for each "
+"launcher."
+msgstr ""
+
+#. i18n: file: launcherconfig.ui:101
+#. i18n: ectx: property (text), widget (KUrlLabel, label)
+#: rc.cpp:24
+msgid "More information..."
+msgstr ""
+
+#. i18n: file: launcherproperties.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:27
+msgid "Window class:"
+msgstr ""
+
+#. i18n: file: launcherproperties.ui:27
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:30
+msgid "Window name:"
+msgstr ""
+
+#. i18n: file: launcherproperties.ui:37
+#. i18n: ectx: property (text), widget (KPushButton, detect)
+#: rc.cpp:33
+msgid "Detect Window Properties"
+msgstr ""
+
+#. i18n: file: launcherproperties.ui:44
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:36
+msgid "Launcher:"
+msgstr ""
+
+#: task.cpp:237
 msgctxt "marks that a task has been modified"
 msgid "modified"
 msgstr "newidwyd"
 
-#: taskactions.cpp:112
+#: taskactions.cpp:168
 msgid "Mi&nimize"
 msgstr "&Lleihau"
 
-#: taskactions.cpp:123
+#: taskactions.cpp:179
 msgid "Ma&ximize"
 msgstr "&Ehangu"
 
-#: taskactions.cpp:133
+#: taskactions.cpp:189
 msgid "&Shade"
 msgstr "&Cysgodi"
 
-#: taskactions.cpp:144
+#: taskactions.cpp:199
 msgid "Re&size"
 msgstr "&Newid Maint"
 
-#: taskactions.cpp:153
+#: taskactions.cpp:207
 msgid "&Move"
 msgstr "Sy&mud"
 
-#: taskactions.cpp:162
+#: taskactions.cpp:216
 msgid "&Close"
 msgstr "&Cau"
 
-#: taskactions.cpp:202
+#: taskactions.cpp:249
 msgid "Move &To Current Desktop"
 msgstr ""
 
-#: taskactions.cpp:216
+#: taskactions.cpp:270
 msgid "&All Desktops"
 msgstr "&Pob Penbwrdd"
 
-#: taskactions.cpp:245
+#: taskactions.cpp:293
 msgid "Move To &Desktop"
 msgstr "Symud I Bwrdd Gwaith"
 
-#: taskactions.cpp:251
+#: taskactions.cpp:307
 msgid "Keep &Above Others"
 msgstr "Cadw &Uwchben y Lleill"
 
-#: taskactions.cpp:261
+#: taskactions.cpp:317
 msgid "Keep &Below Others"
 msgstr "Cadw &Dan y Lleill"
 
-#: taskactions.cpp:271
+#: taskactions.cpp:327
 msgid "&Fullscreen"
 msgstr "S&grîn Llawn"
 
-#: taskactions.cpp:281
-msgid "Ad&vanced"
-msgstr "&Uwch"
+#: taskactions.cpp:337
+msgid "More Actions"
+msgstr ""
 
-#: taskactions.cpp:292
+#: taskactions.cpp:364
 msgid "&Leave Group"
 msgstr ""
 
-#: taskactions.cpp:334
+#: taskactions.cpp:386
 msgid "Remove This Launcher"
 msgstr ""
 
-#: taskactions.cpp:336
-#, kde-format
-msgid "&Show A Launcher For %1 When It Is Not Running"
+#: taskactions.cpp:407
+msgid "&Show A Launcher When Not Running"
 msgstr ""
 
-#: taskactions.cpp:307
+#: taskactions.cpp:433
+msgid ""
+"The application, to which this task is associated with, could not be "
+"determined. Please select the appropriate application from the list below:"
+msgstr ""
+
+#: taskactions.cpp:480
+msgid "Start New Instance"
+msgstr ""
+
+#: taskactions.cpp:504
 msgid "&Edit Group"
 msgstr "Golygu Grŵp"
 
-#: strategies/manualgroupingstrategy.cpp:78
+#: strategies/manualgroupingstrategy.cpp:77
 msgid "Leave Group"
 msgstr "Gadael Grŵp"
 
-#: strategies/manualgroupingstrategy.cpp:85
+#: strategies/manualgroupingstrategy.cpp:84
 msgid "Remove Group"
 msgstr "Gwaredu Grŵp"
 
-#: strategies/programgroupingstrategy.cpp:75
+#: strategies/programgroupingstrategy.cpp:76
 msgid "Allow this program to be grouped"
 msgstr ""
 
-#: strategies/programgroupingstrategy.cpp:77
+#: strategies/programgroupingstrategy.cpp:78
 msgid "Do not allow this program to be grouped"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/lskat.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/lskat.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/lskat.po	2012-03-23 07:39:13.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/lskat.po	2012-04-18 08:59:24.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: lskat\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 04:39+0000\n"
-"PO-Revision-Date: 2012-03-12 21:56+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
+"PO-Revision-Date: 2012-04-16 23:01+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 18:54+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 00:16+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: config_two.cpp:45
 msgctxt "Default player name"
@@ -340,69 +340,69 @@
 msgid "Dealing cards..."
 msgstr ""
 
-#: rc.cpp:28
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Kyfieithu: dylunio, Ioan!, sali mali, KD, Thierry Vignaud, ,Launchpad "
 "Contributions:"
 
-#: rc.cpp:29
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
 
 #. i18n: file: lskatui.rc:10
 #. i18n: ectx: Menu (game)
-#: rc.cpp:3 rc.cpp:32
+#: rc.cpp:5
 msgid "&Game"
 msgstr ""
 
 #. i18n: file: lskatui.rc:12
 #. i18n: ectx: Menu (settings)
-#: rc.cpp:6 rc.cpp:35
+#: rc.cpp:8
 msgid "&Settings"
 msgstr ""
 
 #. i18n: file: lskatui.rc:24
 #. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:9 rc.cpp:38
+#: rc.cpp:11
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: namedialog.ui:13
 #. i18n: ectx: property (windowTitle), widget (QDialog, NameDialog)
-#: rc.cpp:12 rc.cpp:41
+#: rc.cpp:14
 msgid "Configure Names"
 msgstr "Ffurfweddu Enwau"
 
 #. i18n: file: namedialog.ui:25
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:15 rc.cpp:44
+#: rc.cpp:17
 msgid "Player Names"
 msgstr "Enwau Chwaraewyr"
 
 #. i18n: file: namedialog.ui:43
 #. i18n: ectx: property (text), widget (QLabel, label_1)
-#: rc.cpp:18 rc.cpp:47
+#: rc.cpp:20
 msgid "Player 1:"
 msgstr "Chwaraewr 1:"
 
 #. i18n: file: namedialog.ui:50
 #. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:21 rc.cpp:50
+#: rc.cpp:23
 msgid "Player 2:"
 msgstr "Chwaraewr 2:"
 
 #. i18n: file: namedialog.ui:81
 #. i18n: ectx: property (text), widget (QPushButton, okButton)
-#: rc.cpp:24 rc.cpp:53
+#: rc.cpp:26
 msgid "OK"
 msgstr ""
 
 #. i18n: file: namedialog.ui:88
 #. i18n: ectx: property (text), widget (QPushButton, cancelButton)
-#: rc.cpp:27 rc.cpp:56
+#: rc.cpp:29
 msgid "Cancel"
 msgstr ""
 
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/minitoolsplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/minitoolsplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/minitoolsplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/minitoolsplugin.po	2012-04-18 08:59:36.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: minitoolsplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-18 02:07+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:26+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: minitoolsplugin.cpp:50
 msgid "&Minitools"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/nsplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/nsplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/nsplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/nsplugin.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: nsplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:22+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 16:53+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:27+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:53+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: nspluginloader.cpp:91
 msgid "Start Plugin"
@@ -25,72 +25,72 @@
 msgid "Netscape Plugin"
 msgstr ""
 
-#: plugin_part.cpp:220
+#: plugin_part.cpp:212
 msgid "&Save As..."
 msgstr "&Cadw Fel..."
 
-#: plugin_part.cpp:299
+#: plugin_part.cpp:291
 #, kde-format
 msgid "Loading Netscape plugin for %1"
 msgstr "Yn llwytho ategyn Netscape ar gyfer %1"
 
-#: plugin_part.cpp:311
+#: plugin_part.cpp:303
 #, kde-format
 msgid "Unable to load Netscape plugin for %1"
 msgstr "Methu llwytho ategyn Netscape ar gyfer %1"
 
-#: pluginscan.cpp:178
+#: pluginscan.cpp:180
 #, kde-format
 msgctxt "Name of the netscape-plugin which generated this mimetype"
 msgid "Netscape plugin %1"
 msgstr ""
 
-#: pluginscan.cpp:235
+#: pluginscan.cpp:237
 msgid "Unnamed plugin"
 msgstr "Ategyn di-enw"
 
-#: pluginscan.cpp:464 pluginscan.cpp:467
+#: pluginscan.cpp:466 pluginscan.cpp:469
 msgid "Netscape plugin viewer"
 msgstr "Gwelydd ategion Netscape"
 
-#: pluginscan.cpp:518 pluginscan.cpp:519
+#: pluginscan.cpp:520 pluginscan.cpp:521
 msgid "nspluginscan"
 msgstr "nspluginscan"
 
-#: pluginscan.cpp:520
+#: pluginscan.cpp:522
 msgid "(c) 2000,2001 by Stefan Schimanski"
 msgstr "(c) 2000,2001 by Stefan Schimanski"
 
-#: pluginscan.cpp:525
+#: pluginscan.cpp:527
 msgid "Show progress output for GUI"
 msgstr ""
 
-#: rc.cpp:4
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr ""
 "Owain Green ar ran KGyfieithu - Meddalwedd Gymraeg, ,Launchpad "
 "Contributions:,David Jones,KD at KGyfieithu"
 
-#: rc.cpp:5
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,,"
 
-#. i18n: file: nspluginpart.rc:4
-#. i18n: ectx: Menu (file)
 #. i18n: file: test/testnsplugin.rc:5
 #. i18n: ectx: Menu (file)
-#: rc.cpp:3 rc.cpp:8 rc.cpp:11
+#. i18n: file: nspluginpart.rc:4
+#. i18n: ectx: Menu (file)
+#: rc.cpp:5 rc.cpp:8
 msgid "&File"
 msgstr "&Ffeil"
 
-#: viewer/nsplugin.cpp:956
+#: viewer/nsplugin.cpp:952
 #, kde-format
 msgid "Submitting data to %1"
 msgstr "Yn cyflwyno data i %1"
 
-#: viewer/nsplugin.cpp:976
+#: viewer/nsplugin.cpp:972
 #, kde-format
 msgid "Requesting %1"
 msgstr "Yn ceisio %1"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/oktetapart.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/oktetapart.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/oktetapart.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/oktetapart.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: all2.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
-"PO-Revision-Date: 2012-03-12 21:59+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
+"PO-Revision-Date: 2012-04-16 23:06+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:27+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:02+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: partfactory.cpp:40
 msgid "OktetaPart"
@@ -24,12 +24,12 @@
 msgid "Author"
 msgstr "Awdur"
 
-#: rc.cpp:13
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#: rc.cpp:14
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,"
@@ -40,19 +40,13 @@
 #. i18n: ectx: ToolBar (mainToolBar)
 #. i18n: file: oktetapartreadwriteui.rc:57
 #. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: oktetapartbrowserui.rc:40
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: oktetapartreadonlyui.rc:44
-#. i18n: ectx: ToolBar (mainToolBar)
-#. i18n: file: oktetapartreadwriteui.rc:57
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:3 rc.cpp:6 rc.cpp:12 rc.cpp:17 rc.cpp:20 rc.cpp:26
+#: rc.cpp:5 rc.cpp:8 rc.cpp:14
 msgid "Main Toolbar"
 msgstr ""
 
 #. i18n: file: oktetapartreadwriteui.rc:11
 #. i18n: ectx: Menu (permission)
-#: rc.cpp:9 rc.cpp:23
+#: rc.cpp:11
 msgctxt "@title:menu"
 msgid "Permissions"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/okular_mobi.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/okular_mobi.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/okular_mobi.po	2012-03-23 07:39:29.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/okular_mobi.po	2012-04-18 08:59:40.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdegraphics\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 14:28+0000\n"
+"POT-Creation-Date: 2012-04-12 13:14+0100\n"
 "PO-Revision-Date: 2010-12-01 11:18+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:10+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:44+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: converter.cpp:54
 msgid "Error while opening the Mobipocket document."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/parley.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/parley.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/parley.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/parley.po	2012-04-18 08:59:40.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeedu/kvoctrain.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 19:48+0000\n"
-"PO-Revision-Date: 2012-03-12 22:04+0000\n"
+"POT-Creation-Date: 2012-04-12 13:15+0100\n"
+"PO-Revision-Date: 2012-04-16 23:11+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -11,912 +11,750 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 01:03+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: src/parleydocument.cpp:122 src/parleydocument.cpp:394
-#, kde-format
-msgctxt "@title:window document properties"
-msgid "Properties for %1"
+#. i18n: file: src/editor/summarywordwidget.ui:32
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: src/vocabulary/containermodel.cpp:170 rc.cpp:951
+msgid "Lesson"
 msgstr ""
 
-#: src/parleydocument.cpp:156
-msgid "Open in practice &mode"
+#: src/vocabulary/containermodel.cpp:178
+msgid "Number of entries in this lesson."
 msgstr ""
 
-#: src/parleydocument.cpp:159
-msgid "Open Vocabulary Collection"
+#: src/vocabulary/basiccontainermodel.cpp:145
+msgid "None"
 msgstr ""
 
-#: src/parleydocument.cpp:213
-msgid "Open Downloaded Vocabulary Collection"
+#: src/vocabulary/vocabularyview.cpp:87
+msgid "&Add New Entry"
 msgstr ""
 
-#: src/parleydocument.cpp:223 src/export/exportdialog.cpp:106
-#: src/parleymainwindow.cpp:138
-msgid "Untitled"
+#: src/vocabulary/vocabularyview.cpp:90
+msgid "Append a new row to the vocabulary"
 msgstr ""
 
-#: src/parleydocument.cpp:239 src/parleydocument.cpp:289
-#, kde-format
-msgid "Writing file \"%1\" resulted in an error: %2"
+#: src/vocabulary/vocabularyview.cpp:98
+msgid "&Delete Entry"
 msgstr ""
 
-#: src/parleydocument.cpp:240 src/parleydocument.cpp:290
-msgid "Save File"
+#: src/vocabulary/vocabularyview.cpp:101
+msgid "Delete the selected rows"
 msgstr ""
 
-#: src/parleydocument.cpp:258
-msgid "Save Vocabulary As"
+#: src/vocabulary/vocabularyview.cpp:111
+msgid "Copy"
 msgstr ""
 
-#: src/parleydocument.cpp:267
-#, kde-format
-msgid ""
-"<qt>The file<p><b>%1</b></p>already exists. Do you want to overwrite it?</qt>"
+#: src/vocabulary/vocabularyview.cpp:117
+msgid "Cut"
 msgstr ""
 
-#: src/parleydocument.cpp:273
-#, kde-format
-msgctxt "@info:status saving a file"
-msgid "Saving %1"
+#: src/vocabulary/vocabularyview.cpp:123
+msgid "Paste"
 msgstr ""
 
-#: src/parleydocument.cpp:297 src/vocabulary/wordtypeview.cpp:74
-msgid "Noun"
+#: src/vocabulary/vocabularyview.cpp:129
+msgid "Select all rows"
 msgstr ""
 
-#: src/parleydocument.cpp:301
-msgid "Masculine"
+#: src/vocabulary/vocabularyview.cpp:134
+msgid "Deselect all rows"
 msgstr ""
 
-#: src/parleydocument.cpp:304
-msgid "Feminine"
+#: src/vocabulary/vocabularyview.cpp:142
+msgid "Vocabulary Columns..."
 msgstr ""
 
-#: src/parleydocument.cpp:307
-msgid "Neuter"
+#: src/vocabulary/vocabularyview.cpp:143
+msgid "Toggle display of individual vocabulary columns"
 msgstr ""
 
-#: src/parleydocument.cpp:311 src/vocabulary/wordtypeview.cpp:123
-msgid "Verb"
-msgstr ""
+#: src/vocabulary/vocabularyview.cpp:251
+#, kde-format
+msgid "Do you really want to delete the selected entry?"
+msgid_plural "Do you really want to delete the selected %1 entries?"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: src/editor/comparisonwidget.ui:116
-#. i18n: ectx: property (text), widget (QPushButton, makeAdjectiveButton)
-#: rc.cpp:248 src/parleydocument.cpp:315 src/vocabulary/wordtypeview.cpp:106
-msgid "Adjective"
+#: src/vocabulary/vocabularyview.cpp:251
+msgid "Delete"
 msgstr ""
 
-#. i18n: file: src/editor/comparisonwidget.ui:123
-#. i18n: ectx: property (text), widget (QPushButton, makeAdverbButton)
-#: rc.cpp:251 src/parleydocument.cpp:319 src/vocabulary/wordtypeview.cpp:114
-msgid "Adverb"
+#: src/vocabulary/vocabularyview.cpp:360
+msgid "Nothing to spell check."
 msgstr ""
 
-#. i18n: file: src/settings/documentproperties.ui:221
-#. i18n: ectx: property (text), item, widget (KComboBox, licenseComboBox)
-#: rc.cpp:954 src/parleydocument.cpp:332
-msgid "Public Domain"
+#: src/vocabulary/vocabularyview.cpp:385
+msgctxt "@title of a popup"
+msgid "No Spell Checker Available"
 msgstr ""
 
-#. i18n: file: src/settings/documentproperties.ui:167
-#. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
-#. i18n: file: src/settings/documentproperties.ui:237
-#. i18n: ectx: property (title), widget (QGroupBox, languageGroupBox)
-#: rc.cpp:929 rc.cpp:960 src/parleydocument.cpp:333
-msgid "Languages"
-msgstr "Ieithoedd"
+#: src/vocabulary/vocabularyview.cpp:385
+#, kde-format
+msgctxt "@popupmessage"
+msgid ""
+"Either the language set up is incorrect or no spellchecker was installed for "
+"this locale: %1."
+msgstr ""
 
-#: src/parleydocument.cpp:341
-msgid "A Second Language"
+#: src/vocabulary/lessonmodel.cpp:61
+#, kde-format
+msgctxt "display of the name of the vocabulary collection"
+msgid "Collection: %1"
 msgstr ""
 
-#: src/parleydocument.cpp:344
-msgid "Lesson 1"
+#: src/vocabulary/vocabularymodel.cpp:200
+msgid "You can drag and drop words onto their word type."
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:60
-msgid "Select Synonyms"
+#: src/vocabulary/vocabularymodel.cpp:202
+msgid "Enable the synonym view to edit synonyms."
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:66
-#, kde-format
-msgid "%1 and %2 are not Synonyms"
+#: src/vocabulary/vocabularymodel.cpp:204
+msgid "Enable the antonym view to edit antonyms."
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:68
-#, kde-format
-msgid "%1 and %2 are Synonyms"
+#. i18n: file: src/editor/summarywordwidget.ui:55
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: src/vocabulary/vocabularymodel.cpp:295 rc.cpp:957
+msgid "Pronunciation"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:73
-#, kde-format
-msgid "%1 and %2 are not Antonyms"
+#: src/vocabulary/vocabularymodel.cpp:297
+msgid "Word Type"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:75
-#, kde-format
-msgid "%1 and %2 are Antonyms"
+#. i18n: file: src/editor/synonymwidget.ui:26
+#. i18n: ectx: property (text), widget (QPushButton, synonymButton)
+#: src/vocabulary/vocabularymodel.cpp:299 rc.cpp:801
+msgid "Synonym"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:80
-#, kde-format
-msgid "%1 and %2 are not False Friends"
+#: src/vocabulary/vocabularymodel.cpp:301
+msgid "Antonym"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:82
-#, kde-format
-msgid "%1 and %2 are False Friends"
+#. i18n: file: src/editor/summarywordwidget.ui:71
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: src/vocabulary/vocabularymodel.cpp:303 rc.cpp:960
+msgid "Example"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:91
-#, kde-format
-msgctxt "Title for a list of synonyms for a word"
-msgid "Synonyms of %1:"
+#. i18n: file: src/editor/summarywordwidget.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: src/vocabulary/vocabularymodel.cpp:305 rc.cpp:966
+msgid "Comment"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:94
-#, kde-format
-msgctxt "Title for a list of antonyms (opposites) for a word"
-msgid "Antonyms of %1:"
+#. i18n: file: src/editor/summarywordwidget.ui:87
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: src/vocabulary/vocabularymodel.cpp:307 rc.cpp:963
+msgid "Paraphrase"
 msgstr ""
 
-#: src/editor/synonymwidget.cpp:97
-#, kde-format
-msgctxt ""
-"Title for a list of false friend (things that sound similar but have "
-"different meanings) for a word"
-msgid "False Friends of %1:"
+#: src/vocabulary/vocabularymodel.cpp:326
+msgid "Please use Edit -> Languages to set up your document."
 msgstr ""
 
-#: src/editor/conjugationwidget.cpp:133
-#, kde-format
-msgid "\"%1\" is a verb"
+#: src/vocabulary/vocabularymodel.cpp:326
+msgid "No Languages Defined"
 msgstr ""
 
-#: src/editor/conjugationwidget.cpp:167
-msgid "Could not determine word type of verbs"
+#: src/vocabulary/vocabularymodel.cpp:331
+msgid "Select a lesson before adding vocabulary."
 msgstr ""
 
-#: src/editor/editor.cpp:140
-msgid "Lessons"
+#: src/vocabulary/vocabularymodel.cpp:331
+msgid "No Lesson Selected"
 msgstr ""
 
-#: src/editor/editor.cpp:153
-msgid ""
-"Right click to add, delete, or rename lessons. \n"
-"With the checkboxes you can select which lessons you want to practice. \n"
-"Only checked lessons [x] will be asked in the tests!"
+#: src/vocabulary/wordtypeview.cpp:41
+msgid "New"
 msgstr ""
 
-#: src/editor/editor.cpp:168
-msgid "Word Types"
+#: src/vocabulary/wordtypeview.cpp:43
+msgid "Add a new word type to your document"
 msgstr ""
 
-#: src/editor/editor.cpp:189
-msgid "Conjugation"
+#: src/vocabulary/wordtypeview.cpp:49
+msgid "Rename"
 msgstr ""
 
-#: src/editor/editor.cpp:215
-msgid "Comparison forms"
+#: src/vocabulary/wordtypeview.cpp:51
+msgid "Rename the selected word type"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:168
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#. i18n: file: src/statistics/statisticsmainwindow.ui:115
-#. i18n: ectx: property (text), widget (QRadioButton, multipleChoice)
-#: rc.cpp:107 rc.cpp:461 src/editor/editor.cpp:227
-msgid "Multiple Choice"
+#: src/vocabulary/wordtypeview.cpp:57
+msgid "Delete Word Type"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:142
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: src/editor/synonymwidget.ui:16
-#. i18n: ectx: property (text), widget (QLabel, synonymLabel)
-#: rc.cpp:98 rc.cpp:176 src/editor/editor.cpp:239
-msgid "Synonyms"
+#: src/vocabulary/wordtypeview.cpp:59
+msgid "Delete the selected word type."
 msgstr ""
 
-#: src/editor/editor.cpp:250
-msgid "Antonyms"
+#: src/vocabulary/wordtypeview.cpp:65
+msgctxt ""
+"Let the user select what grammatical meaning is connected to a word type "
+"(nouns have gender, verbs conjugations etc)"
+msgid "Grammar"
 msgstr ""
 
-#: src/editor/editor.cpp:261
-msgid "False Friends"
+#: src/vocabulary/wordtypeview.cpp:67
+msgid "To let Parley know the grammatical meaning of a word type."
 msgstr ""
 
-#: src/editor/editor.cpp:273
-msgid "Phonetic Symbols"
+#: src/vocabulary/wordtypeview.cpp:74 src/parleydocument.cpp:297
+msgid "Noun"
 msgstr ""
 
-#: src/editor/editor.cpp:285
-msgid "Image"
+#: src/vocabulary/wordtypeview.cpp:76
+msgid "This word type folder contains nouns."
 msgstr ""
 
-#: src/editor/editor.cpp:297
-msgid "Summary"
+#: src/vocabulary/wordtypeview.cpp:82
+msgid "Masculine Noun"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:113
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_PracticeSoundEnabled)
-#: rc.cpp:95 src/editor/editor.cpp:309
-msgid "Sound"
+#: src/vocabulary/wordtypeview.cpp:84
+msgid "This word type folder contains masculine nouns."
 msgstr ""
 
-#: src/editor/editor.cpp:321
-msgid "Internet"
+#: src/vocabulary/wordtypeview.cpp:90
+msgid "Feminine Noun"
 msgstr ""
 
-#: src/editor/editor.cpp:334
-msgid "LaTeX"
+#: src/vocabulary/wordtypeview.cpp:92
+msgid "This word type folder contains feminine nouns."
 msgstr ""
 
-#: src/editor/editor.cpp:362 src/editor/editor.cpp:363
-msgid "Practice"
+#: src/vocabulary/wordtypeview.cpp:98
+msgid "Neuter Noun"
 msgstr ""
 
-#: src/editor/editor.cpp:399
-msgid "Enter search terms here"
+#: src/vocabulary/wordtypeview.cpp:100
+msgid "This word type folder contains neuter nouns."
 msgstr ""
 
-#: src/editor/editor.cpp:403
-msgid "S&earch:"
+#. i18n: file: src/editor/comparisonwidget.ui:116
+#. i18n: ectx: property (text), widget (QPushButton, makeAdjectiveButton)
+#: src/vocabulary/wordtypeview.cpp:106 src/parleydocument.cpp:315 rc.cpp:822
+msgid "Adjective"
 msgstr ""
 
-#: src/editor/comparisonwidget.cpp:87
-msgid "Could not determine word type of adjectives"
+#: src/vocabulary/wordtypeview.cpp:108
+msgid "This word type folder contains adjectives."
 msgstr ""
 
-#: src/editor/comparisonwidget.cpp:106
-msgid "Could not determine word type of adverbs"
+#. i18n: file: src/editor/comparisonwidget.ui:123
+#. i18n: ectx: property (text), widget (QPushButton, makeAdverbButton)
+#: src/vocabulary/wordtypeview.cpp:114 src/parleydocument.cpp:319 rc.cpp:825
+msgid "Adverb"
 msgstr ""
 
-#: src/editor/FromToEntryPage.cpp:160
-#, kde-format
-msgid "Grades from %1 to %2"
+#: src/vocabulary/wordtypeview.cpp:116
+msgid "This word type folder contains adverbs."
 msgstr ""
 
-#: src/editor/latexwidget.cpp:30
-msgid "Enter LaTeX code here."
+#: src/vocabulary/wordtypeview.cpp:123 src/parleydocument.cpp:311
+msgid "Verb"
 msgstr ""
 
-#: src/editor/declensionwidget.cpp:141
-#, kde-format
-msgid "\"%1\" is a noun"
+#: src/vocabulary/wordtypeview.cpp:125
+msgid "This word type folder contains verbs."
 msgstr ""
 
-#: src/editor/declensionwidget.cpp:166
-msgid "Could not determine word type of nouns"
+#: src/vocabulary/wordtypeview.cpp:131
+msgid "No Special Type"
 msgstr ""
 
-#: src/parleymainwindow.cpp:201
-msgid ""
-"Vocabulary is modified.\n"
-"\n"
-"Save file before exit?\n"
+#: src/vocabulary/wordtypeview.cpp:134
+msgid "This word type folder contains no word type with special meaning."
 msgstr ""
 
-#. i18n: file: src/welcomescreen/welcomescreen.ui:64
-#. i18n: ectx: property (text), widget (QLabel, recentLabel)
-#: rc.cpp:437 src/welcomescreen/welcomescreen.cpp:112
-msgid "Last Opened Collections"
-msgstr ""
-
-#: src/welcomescreen/buttondelegate.cpp:33
-msgid "Open this vocabulary collection in the editor"
+#: src/vocabulary/wordtypeview.cpp:221
+msgid "The root word type cannot be deleted."
 msgstr ""
 
-#: src/main.cpp:36
-msgid "Vocabulary Trainer"
-msgstr "Hyfforddwr Geirfa"
+#: src/vocabulary/wordtypeview.cpp:230
+#, kde-format
+msgid ""
+"There is a word left with this word type. It will lose its type. Continue?"
+msgid_plural ""
+"There are %1 words left with this word type. They will lose their word type. "
+"Continue?"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: src/welcomescreen/welcomescreen.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, WelcomeScreen)
-#: rc.cpp:422 src/main.cpp:40
-msgid "Parley"
+#: src/vocabulary/leitnerview.cpp:117 src/vocabulary/lessonview.cpp:150
+msgid "The root lesson cannot be deleted."
 msgstr ""
 
-#: src/main.cpp:44
-msgid ""
-"© 1999-2002\tEwald Arnold\n"
-"© 2001-2002\tThe KDE team\n"
-"© 2004-2007\tPeter Hedlund\n"
-"© 2007-2010\tFrederik Gladhorn\n"
-msgstr ""
+#: src/vocabulary/leitnerview.cpp:126 src/vocabulary/lessonview.cpp:159
+#, kde-format
+msgid "There is %1 word left in this lesson. Do you want to delete it?"
+msgid_plural ""
+"There are %1 words left in this lesson. Do you want to delete them?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:48
-msgid "Helps you train your vocabulary"
+#: src/vocabulary/vocabularycolumnsdialog.cpp:53
+msgid "Vocabulary Columns"
 msgstr ""
 
-#: src/main.cpp:52
-msgid "Frederik Gladhorn"
+#: src/vocabulary/vocabularycolumnsdialog.cpp:62
+msgid "Enable/Disable the columns for each language"
 msgstr ""
 
-#: src/main.cpp:53
-msgid "Developer and maintainer"
+#: src/vocabulary/lessonview.cpp:37
+msgid "New Lesson"
 msgstr ""
 
-#: src/main.cpp:56
-msgid "Daniel Laidig"
+#: src/vocabulary/lessonview.cpp:39
+msgid "Add a new lesson to your document"
 msgstr ""
 
-#: src/main.cpp:57
-msgid "Developer"
+#: src/vocabulary/lessonview.cpp:45
+msgid "Rename Lesson"
 msgstr ""
 
-#: src/main.cpp:60
-msgid "David Capel"
+#: src/vocabulary/lessonview.cpp:53
+msgid "Delete Lesson"
 msgstr ""
 
-#: src/main.cpp:61
-msgid "Practice Dialogs"
+#: src/vocabulary/lessonview.cpp:55
+msgid "Delete the selected lesson."
 msgstr ""
 
-#: src/main.cpp:64
-msgid "Avgoustinos Kadis"
+#: src/vocabulary/lessonview.cpp:61
+msgid "Split Lesson into Smaller Lessons"
 msgstr ""
 
-#: src/main.cpp:65
-msgid "Scripting"
+#: src/vocabulary/lessonview.cpp:63
+msgid "Make multiple smaller lessons out of one big lesson."
 msgstr ""
 
-#: src/main.cpp:68
-msgid "Peter Hedlund"
+#: src/vocabulary/lessonview.cpp:173
+msgid "Entries per Lesson"
 msgstr ""
 
-#: src/main.cpp:69
-msgid "Countless fixes, former maintainer, port to KDE4"
+#: src/vocabulary/lessonview.cpp:173
+msgid ""
+"The lesson will be split into smaller lessons. How many entries in each "
+"lesson do you want?"
 msgstr ""
 
-#: src/main.cpp:72
-msgid "Ewald Arnold"
+#: src/statistics/statisticsmainwindow.cpp:56
+#, kde-format
+msgctxt "caption for an overview of the grades for a document"
+msgid "Statistics for \"%1\""
 msgstr ""
 
-#: src/main.cpp:72
-msgid "Original Author"
-msgstr "Awdur Gwreiddiol"
-
-#: src/main.cpp:76
-msgid "Lee Olson"
+#: src/statistics/statisticsmainwindow.cpp:166
+#: src/statistics/statisticsmainwindow.cpp:177
+#, kde-format
+msgctxt "pair of two languages that the user chooses to practice"
+msgid "%1 to %2"
 msgstr ""
 
-#: src/main.cpp:77
-msgid "Artwork and Oxygen Icons"
+#: src/statistics/statisticsmodel.cpp:31
+#, kde-format
+msgctxt "Grade in language, table header"
+msgid "Grade (%1)"
 msgstr ""
 
-#: src/main.cpp:79
-msgid "Anne-Marie Mahfouf"
+#: src/statistics/lessonstatistics.cpp:90
+msgid "Remove &Grades"
 msgstr ""
 
-#: src/main.cpp:80
-msgid "Port to KConfig XT"
+#: src/statistics/lessonstatistics.cpp:92
+msgid "Remove all grades from this lesson"
 msgstr ""
 
-#: src/main.cpp:82
-msgid "Jeremy Whiting"
+#. i18n: file: src/settings/languagepropertiespage.ui:731
+#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
+#: src/statistics/conjugationoptions.cpp:35 rc.cpp:402
+msgid "Tenses"
 msgstr ""
 
-#: src/main.cpp:83
-msgid "Rewriting the kvtml library for KDE4"
+#: src/settings/parleyprefs.cpp:38
+msgid "Theme"
 msgstr ""
 
-#: src/main.cpp:85
-msgid "Markus Büchele"
+#: src/settings/parleyprefs.cpp:41
+msgctxt "title:window general settings"
+msgid "General"
 msgstr ""
 
-#: src/main.cpp:86
-msgid "Bug reports and testing on the way to KDE4"
-msgstr ""
+#: src/settings/parleyprefs.cpp:41
+msgid "General Settings"
+msgstr "Gosodiadau Cyffredinol"
 
-#: src/main.cpp:88
-msgid "Ramona Knapp"
+#: src/settings/parleyprefs.cpp:44
+msgid "View"
 msgstr ""
 
-#: src/main.cpp:89
-msgid "Conceived the name Parley"
-msgstr ""
+#: src/settings/parleyprefs.cpp:44
+msgid "View Settings"
+msgstr "Gweld Gosodiadau"
 
-#: src/main.cpp:95
-msgid "Start practice instead of editor"
+#: src/settings/generaloptions.cpp:60
+msgctxt "CSV separator"
+msgid ";"
 msgstr ""
 
-#: src/main.cpp:96
-msgid "+[file]"
+#: src/settings/generaloptions.cpp:61
+msgctxt "CSV separator"
+msgid "#"
 msgstr ""
 
-#: src/main.cpp:96
-msgid "Document file to open"
+#: src/settings/generaloptions.cpp:62
+msgctxt "CSV separator"
+msgid "!"
 msgstr ""
 
-#: src/practice/entryfilter.cpp:83
-msgid ""
-"The vocabulary document contains no entries that can be used for the chosen "
-"type of practice."
+#: src/settings/generaloptions.cpp:63
+msgctxt "CSV separator"
+msgid "|"
 msgstr ""
 
-#: src/practice/entryfilter.cpp:112
-msgid "Start Practice"
+#: src/settings/generaloptions.cpp:64
+msgctxt "CSV separator"
+msgid ","
 msgstr ""
 
-#: src/practice/comparisonmodewidget.cpp:61
-msgid "Enter the comparison forms."
+#: src/settings/generaloptions.cpp:65
+msgctxt "CSV separator: tabulator"
+msgid "TAB"
 msgstr ""
 
-#. i18n: file: src/editor/audiowidget.ui:18
-#. i18n: ectx: property (text), widget (QPushButton, playButton)
-#: rc.cpp:254 src/practice/audiobutton.cpp:26 src/practice/audiobutton.cpp:27
-#: src/practice/audiobutton.cpp:64 src/practice/audiobutton.cpp:65
-msgid "Play"
+#: src/settings/generaloptions.cpp:66
+msgctxt "CSV separator"
+msgid ">= 2 SPACES"
 msgstr ""
 
-#: src/practice/audiobutton.cpp:59 src/practice/audiobutton.cpp:60
-msgid "Stop"
+#: src/settings/generaloptions.cpp:67
+msgctxt "CSV separator"
+msgid " : "
 msgstr ""
 
-#: src/practice/statustoggle.cpp:86
-msgid ""
-"This answer will be counted as correct.\n"
-"Words will only be counted as correct if they are answered correctly on the "
-"first attempt."
+#: src/settings/generaloptions.cpp:68
+msgctxt "CSV separator"
+msgid " :: "
 msgstr ""
 
-#: src/practice/statustoggle.cpp:87
-msgid "Count this answer as wrong"
+#: src/settings/languageproperties.cpp:28
+msgid "Edit Languages"
 msgstr ""
 
-#: src/practice/statustoggle.cpp:90
-msgid ""
-"This answer will be counted as wrong.\n"
-"Words will only be counted as correct if they are answered correctly on the "
-"first attempt."
+#: src/settings/languageproperties.cpp:32
+msgid "Add language"
 msgstr ""
 
-#: src/practice/statustoggle.cpp:91
-msgid "Count this answer as correct"
+#: src/settings/languageproperties.cpp:34
+msgid "Remove language"
 msgstr ""
 
-#: src/practice/comparisonbackendmode.cpp:69
-msgid "All comparison forms were right."
+#: src/settings/languageproperties.cpp:49
+msgid "New Language"
 msgstr ""
 
-#: src/practice/comparisonbackendmode.cpp:74
+#: src/settings/languageproperties.cpp:59
 #, kde-format
-msgctxt ""
-"the user entered the wrong absolute form when practicing comparison forms of "
-"adjectives (the base form of the adjective is wrong)"
-msgid "\"%1\" is the wrong word."
+msgctxt "Edit language properties"
+msgid "Properties for %1"
 msgstr ""
 
-#: src/practice/comparisonbackendmode.cpp:78
-msgctxt ""
-"the user entered the wrong comparison forms when practicing comparison forms "
-"of adjectives (good, better, best)"
-msgid "Both comparison forms (comparative and superlative) are wrong."
+#: src/settings/languageproperties.cpp:88
+#, kde-format
+msgid "Really delete language: %1?"
 msgstr ""
 
-#: src/practice/comparisonbackendmode.cpp:81
-msgctxt ""
-"the user entered the wrong comparison forms when practicing comparison forms "
-"of adjectives (second form wrong - better)"
-msgid "The comparative is wrong."
+#: src/settings/languageproperties.cpp:88
+msgid "Remove Language"
 msgstr ""
 
-#: src/practice/comparisonbackendmode.cpp:84
-msgctxt ""
-"the user entered the wrong comparison forms when practicing comparison forms "
-"of adjectives (third form wrong - best)"
-msgid "The superlative is wrong."
+#: src/settings/languagepropertiespage.cpp:94
+msgid "No KDE keyboard selector found."
 msgstr ""
 
-#: src/practice/conjugationmodewidget.cpp:90
-msgid "Enter all conjugation forms."
+#: src/settings/languagepropertiespage.cpp:361
+#: src/settings/languagepropertiespage.cpp:383
+msgid "Tense Name"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:78
-msgid "Your answer was wrong."
+#: src/settings/languagepropertiespage.cpp:361
+#: src/settings/languagepropertiespage.cpp:383
+msgid "Enter name of tense:"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:92
+#: src/settings/languagepropertiespage.cpp:412
 msgid ""
-"Your answer was a synonym. Please enter another word with the same "
-"translation."
+"The selected user defined tense could not be deleted\n"
+"because it is in use."
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:96
-msgid "Your answer was an already entered synonym."
-msgstr ""
-
-#: src/practice/writtenbackendmode.cpp:99
-msgid "Your answer was a synonym and your capitalization was wrong."
+#: src/settings/languagepropertiespage.cpp:412
+msgid "Deleting Tense Description"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:101
-msgid "Your answer was a synonym and accents were wrong."
+#: src/editor/FromToEntryPage.cpp:160
+#, kde-format
+msgid "Grades from %1 to %2"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:103
-msgid "Your answer was a synonym."
+#: src/editor/conjugationwidget.cpp:133
+#, kde-format
+msgid "\"%1\" is a verb"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:111
-msgid ""
-"Your answer was wrong as capitalization mistakes are not accepted. Please "
-"try again."
+#: src/editor/conjugationwidget.cpp:167
+msgid "Could not determine word type of verbs"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:113
-msgid ""
-"Your answer was wrong as accent mistakes are not accepted. Please try again."
+#: src/editor/synonymwidget.cpp:60
+msgid "Select Synonyms"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:115
-msgid "Your answer was wrong. Please try again."
+#: src/editor/synonymwidget.cpp:66
+#, kde-format
+msgid "%1 and %2 are not Synonyms"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:122
-msgid "Your answer was right, but your capitalization was wrong."
+#: src/editor/synonymwidget.cpp:68
+#, kde-format
+msgid "%1 and %2 are Synonyms"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:124
-msgid "Your answer was right, but accents were wrong."
+#: src/editor/synonymwidget.cpp:73
+#, kde-format
+msgid "%1 and %2 are not Antonyms"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:126
-msgid "Your answer was right."
+#: src/editor/synonymwidget.cpp:75
+#, kde-format
+msgid "%1 and %2 are Antonyms"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:130
-msgid ""
-"Your answer was right... but not on the first try and your capitalization "
-"was wrong."
+#: src/editor/synonymwidget.cpp:80
+#, kde-format
+msgid "%1 and %2 are not False Friends"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:132
-msgid ""
-"Your answer was right... but not on the first try and accents were wrong."
+#: src/editor/synonymwidget.cpp:82
+#, kde-format
+msgid "%1 and %2 are False Friends"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:134
-msgid "Your answer was right... but not on the first try."
+#: src/editor/synonymwidget.cpp:91
+#, kde-format
+msgctxt "Title for a list of synonyms for a word"
+msgid "Synonyms of %1:"
 msgstr ""
 
-#: src/practice/multiplechoicebackendmode.cpp:105
-#: src/practice/writtenbackendmode.cpp:145
-msgid "You revealed the answer by using too many hints."
+#: src/editor/synonymwidget.cpp:94
+#, kde-format
+msgctxt "Title for a list of antonyms (opposites) for a word"
+msgid "Antonyms of %1:"
 msgstr ""
 
-#: src/practice/writtenbackendmode.cpp:154
+#: src/editor/synonymwidget.cpp:97
 #, kde-format
-msgid "The solution starts with: %1"
+msgctxt ""
+"Title for a list of false friend (things that sound similar but have "
+"different meanings) for a word"
+msgid "False Friends of %1:"
 msgstr ""
 
-#: src/practice/latexrenderer.cpp:54
-msgid "Rendering..."
+#: src/editor/editor.cpp:144
+msgid "Lessons"
 msgstr ""
 
-#: src/practice/latexrenderer.cpp:143
-msgid "LaTeX error."
+#: src/editor/editor.cpp:154
+msgid ""
+"Right click to add, delete, or rename lessons. \n"
+"With the checkboxes you can select which lessons you want to practice. \n"
+"Only checked lessons [x] will be asked in the tests!"
 msgstr ""
 
-#: src/practice/guifrontend.cpp:126
-#, kde-format
-msgctxt "Display of the current lesson during practice"
-msgid "Lesson: %1"
+#: src/editor/editor.cpp:169
+msgid "Word Types"
 msgstr ""
 
-#: src/practice/guifrontend.cpp:189
-#, kde-format
-msgid ""
-"You answered %2 of a total of %1 word.\n"
-"You are %3% done."
-msgid_plural ""
-"You answered %2 of a total of %1 words.\n"
-"You are %3% done."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/practice/practicesummarycomponent.cpp:61
-#, kde-format
-msgid "one word"
-msgid_plural "%1 words"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/practice/practicesummarycomponent.cpp:62
-#, kde-format
-msgid "one minute"
-msgid_plural "%1 minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/editor/editor.cpp:190
+msgid "Conjugation"
+msgstr ""
 
-#: src/practice/practicesummarycomponent.cpp:63
-#, kde-format
-msgid "one second"
-msgid_plural "%1 seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/editor/editor.cpp:216
+msgid "Comparison forms"
+msgstr ""
 
-#: src/practice/practicesummarycomponent.cpp:60
-#, kde-format
-msgctxt "number of words, minutes, seconds"
-msgid "You practiced %1 in %2 and %3."
+#. i18n: file: src/statistics/statisticsmainwindow.ui:115
+#. i18n: ectx: property (text), widget (QRadioButton, multipleChoice)
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:168
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: src/editor/editor.cpp:228 rc.cpp:41 rc.cpp:1077
+msgid "Multiple Choice"
 msgstr ""
 
-#: src/practice/practicesummarycomponent.cpp:79
-#: src/practice/practicesummarycomponent.cpp:80
-msgid "Practice Again"
+#. i18n: file: src/editor/synonymwidget.ui:16
+#. i18n: ectx: property (text), widget (QLabel, synonymLabel)
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:142
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: src/editor/editor.cpp:240 rc.cpp:798 rc.cpp:1068
+msgid "Synonyms"
 msgstr ""
 
-#: src/practice/practicemainwindow.cpp:73
-msgid "Stop Practice"
+#: src/editor/editor.cpp:251
+msgid "Antonyms"
 msgstr ""
 
-#: src/practice/practicemainwindow.cpp:75
-msgid "Stop practicing"
+#: src/editor/editor.cpp:262
+msgid "False Friends"
 msgstr ""
 
-#: src/practice/practicemainwindow.cpp:86
-msgid "Change answer to right/wrong"
+#: src/editor/editor.cpp:274
+msgid "Phonetic Symbols"
 msgstr ""
 
-#: src/practice/practicemainwindow.cpp:87
-msgid ""
-"When you answered, Parley will display that the answer was right or wrong.\n"
-"This shortcut changes how the answer is counted."
+#: src/editor/editor.cpp:286
+msgid "Image"
 msgstr ""
 
-#: src/practice/conjugationbackendmode.cpp:121
-msgid "All conjugation forms were right."
+#: src/editor/editor.cpp:298
+msgid "Summary"
 msgstr ""
 
-#: src/practice/conjugationbackendmode.cpp:124
-#, kde-format
-msgctxt "You did not get the conjugation forms right."
-msgid "You answered %1 conjugation form correctly."
-msgid_plural "You answered %1 conjugation forms correctly."
-msgstr[0] ""
-msgstr[1] ""
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:113
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_PracticeSoundEnabled)
+#: src/editor/editor.cpp:310 rc.cpp:1065
+msgid "Sound"
+msgstr ""
 
-#: src/practice/writtenpracticewidget.cpp:115
-msgid "Synonym: "
+#: src/editor/editor.cpp:322
+msgid "Internet"
 msgstr ""
 
-#: src/practice/genderbackendmode.cpp:59
-#, kde-format
-msgid "Choose the right article for \"%1\""
+#: src/editor/editor.cpp:335
+msgid "LaTeX"
 msgstr ""
 
-#: src/practice/genderbackendmode.cpp:81
-#, kde-format
-msgctxt "@label the gender of the word: masculine"
-msgid "%1 is masculine"
+#: src/editor/editor.cpp:367 src/editor/editor.cpp:368
+msgid "Practice"
 msgstr ""
 
-#: src/practice/genderbackendmode.cpp:86
-#, kde-format
-msgctxt "@label the gender of the word: feminine"
-msgid "%1 is feminine"
+#: src/editor/editor.cpp:404
+msgid "Enter search terms here"
 msgstr ""
 
-#: src/practice/genderbackendmode.cpp:91
-#, kde-format
-msgctxt "@label the gender of the word: neuter"
-msgid "%1 is neuter"
+#: src/editor/editor.cpp:408
+msgid "S&earch:"
 msgstr ""
 
-#: src/practice/summarybarwidget.cpp:85
-#, kde-format
-msgctxt "test results"
-msgid "%1 % correct"
+#: src/editor/latexwidget.cpp:30
+msgid "Enter LaTeX code here."
 msgstr ""
 
-#: src/practice/summarybarwidget.cpp:87
+#: src/editor/declensionwidget.cpp:141
 #, kde-format
-msgctxt "test results"
-msgid "%1 % wrong"
+msgid "\"%1\" is a noun"
 msgstr ""
 
-#: src/practice/summarybarwidget.cpp:89
-#, kde-format
-msgctxt "test results"
-msgid "%1 % not answered"
+#: src/editor/declensionwidget.cpp:166
+msgid "Could not determine word type of nouns"
 msgstr ""
 
-#: src/practice/summarybarwidget.cpp:148
-#, kde-format
-msgid "Answered correctly on the first attempt: %1 of %2 (%3 %)"
+#: src/editor/comparisonwidget.cpp:87
+msgid "Could not determine word type of adjectives"
 msgstr ""
 
-#: src/practice/summarybarwidget.cpp:155
-#, kde-format
-msgid "Answered wrong on the first attempt: %1 of %2 (%3 %)"
+#: src/editor/comparisonwidget.cpp:106
+msgid "Could not determine word type of adverbs"
 msgstr ""
 
-#: src/practice/summarybarwidget.cpp:162
+#: src/parleydocument.cpp:122 src/parleydocument.cpp:394
 #, kde-format
-msgid "Not answered during this practice: %1 of %2 (%3 %)"
+msgctxt "@title:window document properties"
+msgid "Properties for %1"
 msgstr ""
 
-#: src/practice/testentrymanager.cpp:61
-msgid "Could not start practice"
+#: src/parleydocument.cpp:156
+msgid "Open in practice &mode"
 msgstr ""
 
-#: src/practice/testentrymanager.cpp:61
-msgid "The vocabulary collection contains fewer than two languages."
+#: src/parleydocument.cpp:159
+msgid "Open Vocabulary Collection"
 msgstr ""
 
-#: src/configure-practice/configurepracticedialog.cpp:31
-msgctxt "@title:window"
-msgid "Configure Practice"
+#: src/parleydocument.cpp:213
+msgid "Open Downloaded Vocabulary Collection"
 msgstr ""
 
-#: src/configure-practice/configurepracticedialog.cpp:36
-msgctxt ""
-"@title:group vocabulary can be set to be blocked for a certain amount of time"
-msgid "Blocking"
+#: src/parleydocument.cpp:223 src/export/exportdialog.cpp:105
+#: src/parleymainwindow.cpp:139
+msgid "Untitled"
 msgstr ""
 
-#: src/configure-practice/configurepracticedialog.cpp:36
-msgid "Blocking Settings"
+#: src/parleydocument.cpp:239 src/parleydocument.cpp:289
+#, kde-format
+msgid "Writing file \"%1\" resulted in an error: %2"
 msgstr ""
 
-#: src/configure-practice/configurepracticedialog.cpp:39
-msgctxt ""
-"@title:group ignore vocabulary based on some properties like word type"
-msgid "Thresholds"
+#: src/parleydocument.cpp:240 src/parleydocument.cpp:290
+msgid "Save File"
 msgstr ""
 
-#: src/configure-practice/configurepracticedialog.cpp:39
-msgid "Threshold Settings"
+#: src/parleydocument.cpp:258
+msgid "Save Vocabulary As"
 msgstr ""
 
-#: src/configure-practice/configurepracticedialog.cpp:42
-msgctxt ""
-"@title:group Configure advanced settings for practicing vocabulary, short "
-"title in config dialog."
-msgid "Advanced"
-msgstr ""
-
-#: src/configure-practice/configurepracticedialog.cpp:42
-msgctxt "Configure advanced settings for practicing vocabulary."
-msgid "Advanced Practice Settings"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:43
-msgid "Do not Care"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:46
-msgid "30 Min"
-msgstr "30 Mun"
-
-#: src/configure-practice/blockoptions.cpp:47
-msgid "1 Hour"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:48
-msgid "2 Hours"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:49
-msgid "4 Hours"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:50
-msgid "8 Hours"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:51
-msgid "12 Hours"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:52
-msgid "18 Hours"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:54
-msgid "1 Day"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:55
-msgid "2 Days"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:56
-msgid "3 Days"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:57
-msgid "4 Days"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:58
-msgid "5 Days"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:59
-msgid "6 Days"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:61
-msgid "1 Week"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:62
-msgid "2 Weeks"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:63
-msgid "3 Weeks"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:64
-msgid "4 Weeks"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:66
-msgid "1 Month"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:67
-msgid "2 Months"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:68
-msgid "3 Months"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:69
-msgid "4 Months"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:70
-msgid "5 Months"
-msgstr ""
-
-#: src/configure-practice/blockoptions.cpp:71
-msgid "6 Months"
+#: src/parleydocument.cpp:267
+#, kde-format
+msgid ""
+"<qt>The file<p><b>%1</b></p>already exists. Do you want to overwrite it?</qt>"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:72
-msgid "10 Months"
+#: src/parleydocument.cpp:273
+#, kde-format
+msgctxt "@info:status saving a file"
+msgid "Saving %1"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:73
-msgid "12 Months"
+#: src/parleydocument.cpp:301
+msgid "Masculine"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:244
-msgid "Illogical blocking times.\n"
+#: src/parleydocument.cpp:304
+msgid "Feminine"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:246
-#: src/configure-practice/blockoptions.cpp:262
-#, kde-format
-msgid "The time for level %1 should be lower than the time for level %2.\n"
+#: src/parleydocument.cpp:307
+msgid "Neuter"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:260
-msgid ""
-"\n"
-"Illogical expiration times.\n"
+#. i18n: file: src/settings/documentproperties.ui:221
+#. i18n: ectx: property (text), item, widget (KComboBox, licenseComboBox)
+#: src/parleydocument.cpp:332 rc.cpp:475
+msgid "Public Domain"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:279
-msgid ""
-"\n"
-"Illogical blocking vs. expiration times.\n"
-msgstr ""
+#. i18n: file: src/settings/documentproperties.ui:167
+#. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
+#. i18n: file: src/settings/documentproperties.ui:237
+#. i18n: ectx: property (title), widget (QGroupBox, languageGroupBox)
+#: src/parleydocument.cpp:333 rc.cpp:450 rc.cpp:481
+msgid "Languages"
+msgstr "Ieithoedd"
 
-#: src/configure-practice/blockoptions.cpp:281
-#, kde-format
-msgid ""
-"The blocking time at level %1 should be lower than the expiration time.\n"
+#: src/parleydocument.cpp:341
+msgid "A Second Language"
 msgstr ""
 
-#: src/configure-practice/blockoptions.cpp:287
-msgid "Illogical Values"
+#: src/parleydocument.cpp:344
+msgid "Lesson 1"
 msgstr ""
 
 #: src/parleyactions.cpp:69
@@ -1006,7 +844,7 @@
 
 #. i18n: file: src/settings/parley.kcfg:50
 #. i18n: ectx: label, entry (AutomaticTranslation), group (General)
-#: rc.cpp:563 src/parleyactions.cpp:135
+#: src/parleyactions.cpp:135 rc.cpp:113
 msgid "Enable automatic translation of the lesson entries."
 msgstr ""
 
@@ -1066,1810 +904,1507 @@
 msgid "Share the current vocabulary collection with other users"
 msgstr ""
 
-#: src/statistics/statisticsmainwindow.cpp:56
-#, kde-format
-msgctxt "caption for an overview of the grades for a document"
-msgid "Statistics for \"%1\""
+#. i18n: file: src/export/exportdialog.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, ExportOptions)
+#: src/export/exportdialog.cpp:45 rc.cpp:969
+msgid "Export"
 msgstr ""
 
-#: src/statistics/statisticsmainwindow.cpp:166
-#: src/statistics/statisticsmainwindow.cpp:177
-#, kde-format
-msgctxt "pair of two languages that the user chooses to practice"
-msgid "%1 to %2"
+#: src/export/exportdialog.cpp:71
+msgid "HTML document"
 msgstr ""
 
-#: src/statistics/statisticsmodel.cpp:31
-#, kde-format
-msgctxt "Grade in language, table header"
-msgid "Grade (%1)"
+#: src/export/exportdialog.cpp:108
+msgid "Export As"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:683
-#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: rc.cpp:1116 src/statistics/conjugationoptions.cpp:35
-msgid "Tenses"
+#: src/configure-practice/blockoptions.cpp:43
+msgid "Do not Care"
 msgstr ""
 
-#: src/statistics/lessonstatistics.cpp:90
-msgid "Remove &Grades"
-msgstr ""
+#: src/configure-practice/blockoptions.cpp:46
+msgid "30 Min"
+msgstr "30 Mun"
 
-#: src/statistics/lessonstatistics.cpp:92
-msgid "Remove all grades from this lesson"
+#: src/configure-practice/blockoptions.cpp:47
+msgid "1 Hour"
 msgstr ""
 
-#. i18n: file: src/export/exportdialog.ui:13
-#. i18n: ectx: property (windowTitle), widget (QWidget, ExportOptions)
-#: rc.cpp:479 src/export/exportdialog.cpp:45
-msgid "Export"
+#: src/configure-practice/blockoptions.cpp:48
+msgid "2 Hours"
 msgstr ""
 
-#: src/export/exportdialog.cpp:71
-msgid "HTML document"
+#: src/configure-practice/blockoptions.cpp:49
+msgid "4 Hours"
 msgstr ""
 
-#: src/export/exportdialog.cpp:109
-msgid "Export As"
+#: src/configure-practice/blockoptions.cpp:50
+msgid "8 Hours"
 msgstr ""
 
-#: src/vocabulary/vocabularycolumnsdialog.cpp:53
-msgid "Vocabulary Columns"
+#: src/configure-practice/blockoptions.cpp:51
+msgid "12 Hours"
 msgstr ""
 
-#: src/vocabulary/vocabularycolumnsdialog.cpp:62
-msgid "Enable/Disable the columns for each language"
+#: src/configure-practice/blockoptions.cpp:52
+msgid "18 Hours"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:41
-msgid "New"
+#: src/configure-practice/blockoptions.cpp:54
+msgid "1 Day"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:43
-msgid "Add a new word type to your document"
+#: src/configure-practice/blockoptions.cpp:55
+msgid "2 Days"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:49
-msgid "Rename"
+#: src/configure-practice/blockoptions.cpp:56
+msgid "3 Days"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:51
-msgid "Rename the selected word type"
+#: src/configure-practice/blockoptions.cpp:57
+msgid "4 Days"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:57
-msgid "Delete Word Type"
+#: src/configure-practice/blockoptions.cpp:58
+msgid "5 Days"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:59
-msgid "Delete the selected word type."
+#: src/configure-practice/blockoptions.cpp:59
+msgid "6 Days"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:65
-msgctxt ""
-"Let the user select what grammatical meaning is connected to a word type "
-"(nouns have gender, verbs conjugations etc)"
-msgid "Grammar"
+#: src/configure-practice/blockoptions.cpp:61
+msgid "1 Week"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:67
-msgid "To let Parley know the grammatical meaning of a word type."
+#: src/configure-practice/blockoptions.cpp:62
+msgid "2 Weeks"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:76
-msgid "This word type folder contains nouns."
+#: src/configure-practice/blockoptions.cpp:63
+msgid "3 Weeks"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:82
-msgid "Masculine Noun"
+#: src/configure-practice/blockoptions.cpp:64
+msgid "4 Weeks"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:84
-msgid "This word type folder contains masculine nouns."
+#: src/configure-practice/blockoptions.cpp:66
+msgid "1 Month"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:90
-msgid "Feminine Noun"
-msgstr ""
-
-#: src/vocabulary/wordtypeview.cpp:92
-msgid "This word type folder contains feminine nouns."
-msgstr ""
-
-#: src/vocabulary/wordtypeview.cpp:98
-msgid "Neuter Noun"
+#: src/configure-practice/blockoptions.cpp:67
+msgid "2 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:100
-msgid "This word type folder contains neuter nouns."
+#: src/configure-practice/blockoptions.cpp:68
+msgid "3 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:108
-msgid "This word type folder contains adjectives."
+#: src/configure-practice/blockoptions.cpp:69
+msgid "4 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:116
-msgid "This word type folder contains adverbs."
+#: src/configure-practice/blockoptions.cpp:70
+msgid "5 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:125
-msgid "This word type folder contains verbs."
+#: src/configure-practice/blockoptions.cpp:71
+msgid "6 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:131
-msgid "No Special Type"
+#: src/configure-practice/blockoptions.cpp:72
+msgid "10 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:134
-msgid "This word type folder contains no word type with special meaning."
+#: src/configure-practice/blockoptions.cpp:73
+msgid "12 Months"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:221
-msgid "The root word type cannot be deleted."
+#: src/configure-practice/blockoptions.cpp:244
+msgid "Illogical blocking times.\n"
 msgstr ""
 
-#: src/vocabulary/wordtypeview.cpp:230
+#: src/configure-practice/blockoptions.cpp:246
+#: src/configure-practice/blockoptions.cpp:262
 #, kde-format
-msgid ""
-"There is a word left with this word type. It will lose its type. Continue?"
-msgid_plural ""
-"There are %1 words left with this word type. They will lose their word type. "
-"Continue?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/vocabulary/lessonview.cpp:37
-msgid "New Lesson"
-msgstr ""
-
-#: src/vocabulary/lessonview.cpp:39
-msgid "Add a new lesson to your document"
-msgstr ""
-
-#: src/vocabulary/lessonview.cpp:45
-msgid "Rename Lesson"
+msgid "The time for level %1 should be lower than the time for level %2.\n"
 msgstr ""
 
-#: src/vocabulary/lessonview.cpp:53
-msgid "Delete Lesson"
+#: src/configure-practice/blockoptions.cpp:260
+msgid ""
+"\n"
+"Illogical expiration times.\n"
 msgstr ""
 
-#: src/vocabulary/lessonview.cpp:55
-msgid "Delete the selected lesson."
+#: src/configure-practice/blockoptions.cpp:279
+msgid ""
+"\n"
+"Illogical blocking vs. expiration times.\n"
 msgstr ""
 
-#: src/vocabulary/lessonview.cpp:61
-msgid "Split Lesson into Smaller Lessons"
+#: src/configure-practice/blockoptions.cpp:281
+#, kde-format
+msgid ""
+"The blocking time at level %1 should be lower than the expiration time.\n"
 msgstr ""
 
-#: src/vocabulary/lessonview.cpp:63
-msgid "Make multiple smaller lessons out of one big lesson."
+#: src/configure-practice/blockoptions.cpp:287
+msgid "Illogical Values"
 msgstr ""
 
-#: src/vocabulary/leitnerview.cpp:117 src/vocabulary/lessonview.cpp:150
-msgid "The root lesson cannot be deleted."
+#: src/configure-practice/configurepracticedialog.cpp:31
+msgctxt "@title:window"
+msgid "Configure Practice"
 msgstr ""
 
-#: src/vocabulary/leitnerview.cpp:126 src/vocabulary/lessonview.cpp:159
-#, kde-format
-msgid "There is %1 word left in this lesson. Do you want to delete it?"
-msgid_plural ""
-"There are %1 words left in this lesson. Do you want to delete them?"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/vocabulary/lessonview.cpp:173
-msgid "Entries per Lesson"
+#: src/configure-practice/configurepracticedialog.cpp:36
+msgctxt ""
+"@title:group vocabulary can be set to be blocked for a certain amount of time"
+msgid "Blocking"
 msgstr ""
 
-#: src/vocabulary/lessonview.cpp:173
-msgid ""
-"The lesson will be split into smaller lessons. How many entries in each "
-"lesson do you want?"
+#: src/configure-practice/configurepracticedialog.cpp:36
+msgid "Blocking Settings"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:86
-msgid "&Add New Entry"
+#: src/configure-practice/configurepracticedialog.cpp:39
+msgctxt ""
+"@title:group ignore vocabulary based on some properties like word type"
+msgid "Thresholds"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:89
-msgid "Append a new row to the vocabulary"
+#: src/configure-practice/configurepracticedialog.cpp:39
+msgid "Threshold Settings"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:97
-msgid "&Delete Entry"
+#: src/configure-practice/configurepracticedialog.cpp:42
+msgctxt ""
+"@title:group Configure advanced settings for practicing vocabulary, short "
+"title in config dialog."
+msgid "Advanced"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:100
-msgid "Delete the selected rows"
+#: src/configure-practice/configurepracticedialog.cpp:42
+msgctxt "Configure advanced settings for practicing vocabulary."
+msgid "Advanced Practice Settings"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:110
-msgid "Copy"
+#: src/welcomescreen/buttondelegate.cpp:33
+msgid "Open this vocabulary collection in the editor"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:116
-msgid "Cut"
+#. i18n: file: src/welcomescreen/welcomescreen.ui:64
+#. i18n: ectx: property (text), widget (QLabel, recentLabel)
+#: src/welcomescreen/welcomescreen.cpp:112 rc.cpp:1143
+msgid "Last Opened Collections"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:122
-msgid "Paste"
+#: src/parleymainwindow.cpp:202
+msgid ""
+"Vocabulary is modified.\n"
+"\n"
+"Save file before exit?\n"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:128
-msgid "Select all rows"
+#: src/scripts/scriptdialog.cpp:33
+msgid "Script Dialog"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:133
-msgid "Deselect all rows"
+#: src/scripts/script.cpp:53
+msgid "The script file does not exist."
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:141
-msgid "Vocabulary Columns..."
+#: src/scripts/script.cpp:85
+#, kde-format
+msgid "Error in file %1 at line %2:"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:142
-msgid "Toggle display of individual vocabulary columns"
+#: src/scripts/script.cpp:87
+msgctxt "debug information in error message"
+msgid "Backtrace:"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:250
+#: src/scripts/scriptmanager.cpp:133
 #, kde-format
-msgid "Do you really want to delete the selected entry?"
-msgid_plural "Do you really want to delete the selected %1 entries?"
+msgid "A script could not be activated and has been disabled."
+msgid_plural "%1 scripts could not be activated and have been disabled."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/vocabulary/vocabularyview.cpp:250
-msgid "Delete"
+#: src/scripts/scriptmanager.cpp:133
+msgid ""
+"This probably means that there are errors in the script or that the required "
+"packages are not installed."
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:360
-msgid "Nothing to spell check."
+#: src/scripts/scriptmanager.cpp:135
+msgid "Script Activation"
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:401
-msgctxt "@title of a popup"
-msgid "No Spell Checker Available"
+#: src/practice/multiplechoicebackendmode.cpp:105
+#: src/practice/writtenbackendmode.cpp:145
+msgid "You revealed the answer by using too many hints."
 msgstr ""
 
-#: src/vocabulary/vocabularyview.cpp:401
-#, kde-format
-msgctxt "@popupmessage"
+#: src/practice/entryfilter.cpp:83
 msgid ""
-"Either the language set up is incorrect or no spellchecker was installed for "
-"this locale: %1."
+"The vocabulary document contains no entries that can be used for the chosen "
+"type of practice."
 msgstr ""
 
-#: src/vocabulary/basiccontainermodel.cpp:145
-msgid "None"
+#: src/practice/entryfilter.cpp:112
+msgid "Start Practice"
 msgstr ""
 
-#: src/vocabulary/lessonmodel.cpp:61
-#, kde-format
-msgctxt "display of the name of the vocabulary collection"
-msgid "Collection: %1"
+#: src/practice/testentrymanager.cpp:61
+msgid "Could not start practice"
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:191
-msgid "You can drag and drop words onto their word type."
+#: src/practice/testentrymanager.cpp:61
+msgid "The vocabulary collection contains fewer than two languages."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:193
-msgid "Enable the synonym view to edit synonyms."
+#: src/practice/writtenbackendmode.cpp:78
+msgid "Your answer was wrong."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:195
-msgid "Enable the antonym view to edit antonyms."
+#: src/practice/writtenbackendmode.cpp:92
+msgid ""
+"Your answer was a synonym. Please enter another word with the same "
+"translation."
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:55
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:290 src/vocabulary/vocabularymodel.cpp:286
-msgid "Pronunciation"
+#: src/practice/writtenbackendmode.cpp:96
+msgid "Your answer was an already entered synonym."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:288
-msgid "Word Type"
+#: src/practice/writtenbackendmode.cpp:99
+msgid "Your answer was a synonym and your capitalization was wrong."
 msgstr ""
 
-#. i18n: file: src/editor/synonymwidget.ui:26
-#. i18n: ectx: property (text), widget (QPushButton, synonymButton)
-#: rc.cpp:179 src/vocabulary/vocabularymodel.cpp:290
-msgid "Synonym"
+#: src/practice/writtenbackendmode.cpp:101
+msgid "Your answer was a synonym and accents were wrong."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:292
-msgid "Antonym"
+#: src/practice/writtenbackendmode.cpp:103
+msgid "Your answer was a synonym."
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:71
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:293 src/vocabulary/vocabularymodel.cpp:294
-msgid "Example"
+#: src/practice/writtenbackendmode.cpp:111
+msgid ""
+"Your answer was wrong as capitalization mistakes are not accepted. Please "
+"try again."
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:299 src/vocabulary/vocabularymodel.cpp:296
-msgid "Comment"
+#: src/practice/writtenbackendmode.cpp:113
+msgid ""
+"Your answer was wrong as accent mistakes are not accepted. Please try again."
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:87
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:296 src/vocabulary/vocabularymodel.cpp:298
-msgid "Paraphrase"
+#: src/practice/writtenbackendmode.cpp:115
+msgid "Your answer was wrong. Please try again."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:317
-msgid "Please use Edit -> Languages to set up your document."
+#: src/practice/writtenbackendmode.cpp:122
+msgid "Your answer was right, but your capitalization was wrong."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:317
-msgid "No Languages Defined"
+#: src/practice/writtenbackendmode.cpp:124
+msgid "Your answer was right, but accents were wrong."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:322
-msgid "Select a lesson before adding vocabulary."
+#: src/practice/writtenbackendmode.cpp:126
+msgid "Your answer was right."
 msgstr ""
 
-#: src/vocabulary/vocabularymodel.cpp:322
-msgid "No Lesson Selected"
+#: src/practice/writtenbackendmode.cpp:130
+msgid ""
+"Your answer was right... but not on the first try and your capitalization "
+"was wrong."
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:32
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:284 src/vocabulary/containermodel.cpp:170
-msgid "Lesson"
+#: src/practice/writtenbackendmode.cpp:132
+msgid ""
+"Your answer was right... but not on the first try and accents were wrong."
 msgstr ""
 
-#: src/vocabulary/containermodel.cpp:178
-msgid "Number of entries in this lesson."
+#: src/practice/writtenbackendmode.cpp:134
+msgid "Your answer was right... but not on the first try."
 msgstr ""
 
-#: src/settings/languagepropertiespage.cpp:93
-msgid "No KDE keyboard selector found."
+#: src/practice/writtenbackendmode.cpp:154
+#, kde-format
+msgid "The solution starts with: %1"
 msgstr ""
 
-#: src/settings/languagepropertiespage.cpp:337
-#: src/settings/languagepropertiespage.cpp:359
-msgid "Tense Name"
+#: src/practice/latexrenderer.cpp:54
+msgid "Rendering..."
 msgstr ""
 
-#: src/settings/languagepropertiespage.cpp:337
-#: src/settings/languagepropertiespage.cpp:359
-msgid "Enter name of tense:"
+#: src/practice/latexrenderer.cpp:143
+msgid "LaTeX error."
 msgstr ""
 
-#: src/settings/languagepropertiespage.cpp:388
-msgid ""
-"The selected user defined tense could not be deleted\n"
-"because it is in use."
+#: src/practice/writtenpracticewidget.cpp:129
+msgid "Synonym: "
 msgstr ""
 
-#: src/settings/languagepropertiespage.cpp:388
-msgid "Deleting Tense Description"
+#. i18n: file: src/editor/audiowidget.ui:18
+#. i18n: ectx: property (text), widget (QPushButton, playButton)
+#: src/practice/audiobutton.cpp:26 src/practice/audiobutton.cpp:27
+#: src/practice/audiobutton.cpp:64 src/practice/audiobutton.cpp:65 rc.cpp:942
+msgid "Play"
 msgstr ""
 
-#: src/settings/parleyprefs.cpp:38
-msgid "Theme"
+#: src/practice/audiobutton.cpp:59 src/practice/audiobutton.cpp:60
+msgid "Stop"
 msgstr ""
 
-#: src/settings/parleyprefs.cpp:41
-msgctxt "title:window general settings"
-msgid "General"
+#: src/practice/genderbackendmode.cpp:59
+#, kde-format
+msgid "Choose the right article for \"%1\""
 msgstr ""
 
-#: src/settings/parleyprefs.cpp:41
-msgid "General Settings"
-msgstr "Gosodiadau Cyffredinol"
-
-#: src/settings/parleyprefs.cpp:44
-msgid "View"
+#: src/practice/genderbackendmode.cpp:81
+#, kde-format
+msgctxt "@label the gender of the word: masculine"
+msgid "%1 is masculine"
 msgstr ""
 
-#: src/settings/parleyprefs.cpp:44
-msgid "View Settings"
-msgstr "Gweld Gosodiadau"
-
-#: src/settings/languageproperties.cpp:28
-msgid "Edit Languages"
+#: src/practice/genderbackendmode.cpp:86
+#, kde-format
+msgctxt "@label the gender of the word: feminine"
+msgid "%1 is feminine"
 msgstr ""
 
-#: src/settings/languageproperties.cpp:32
-msgid "Add language"
+#: src/practice/genderbackendmode.cpp:91
+#, kde-format
+msgctxt "@label the gender of the word: neuter"
+msgid "%1 is neuter"
 msgstr ""
 
-#: src/settings/languageproperties.cpp:34
-msgid "Remove language"
+#: src/practice/conjugationmodewidget.cpp:104
+msgid "Enter all conjugation forms."
 msgstr ""
 
-#: src/settings/languageproperties.cpp:49
-msgid "New Language"
+#: src/practice/comparisonbackendmode.cpp:69
+msgid "All comparison forms were right."
 msgstr ""
 
-#: src/settings/languageproperties.cpp:59
+#: src/practice/comparisonbackendmode.cpp:74
 #, kde-format
-msgctxt "Edit language properties"
-msgid "Properties for %1"
+msgctxt ""
+"the user entered the wrong absolute form when practicing comparison forms of "
+"adjectives (the base form of the adjective is wrong)"
+msgid "\"%1\" is the wrong word."
 msgstr ""
 
-#: src/settings/languageproperties.cpp:88
-#, kde-format
-msgid "Really delete language: %1?"
+#: src/practice/comparisonbackendmode.cpp:78
+msgctxt ""
+"the user entered the wrong comparison forms when practicing comparison forms "
+"of adjectives (good, better, best)"
+msgid "Both comparison forms (comparative and superlative) are wrong."
 msgstr ""
 
-#: src/settings/languageproperties.cpp:88
-msgid "Remove Language"
+#: src/practice/comparisonbackendmode.cpp:81
+msgctxt ""
+"the user entered the wrong comparison forms when practicing comparison forms "
+"of adjectives (second form wrong - better)"
+msgid "The comparative is wrong."
 msgstr ""
 
-#: src/settings/generaloptions.cpp:60
-msgctxt "CSV separator"
-msgid ";"
+#: src/practice/comparisonbackendmode.cpp:84
+msgctxt ""
+"the user entered the wrong comparison forms when practicing comparison forms "
+"of adjectives (third form wrong - best)"
+msgid "The superlative is wrong."
 msgstr ""
 
-#: src/settings/generaloptions.cpp:61
-msgctxt "CSV separator"
-msgid "#"
+#: src/practice/summarybarwidget.cpp:85
+#, kde-format
+msgctxt "test results"
+msgid "%1 % correct"
 msgstr ""
 
-#: src/settings/generaloptions.cpp:62
-msgctxt "CSV separator"
-msgid "!"
+#: src/practice/summarybarwidget.cpp:87
+#, kde-format
+msgctxt "test results"
+msgid "%1 % wrong"
 msgstr ""
 
-#: src/settings/generaloptions.cpp:63
-msgctxt "CSV separator"
-msgid "|"
+#: src/practice/summarybarwidget.cpp:89
+#, kde-format
+msgctxt "test results"
+msgid "%1 % not answered"
 msgstr ""
 
-#: src/settings/generaloptions.cpp:64
-msgctxt "CSV separator"
-msgid ","
+#: src/practice/summarybarwidget.cpp:148
+#, kde-format
+msgid "Answered correctly on the first attempt: %1 of %2 (%3 %)"
 msgstr ""
 
-#: src/settings/generaloptions.cpp:65
-msgctxt "CSV separator: tabulator"
-msgid "TAB"
+#: src/practice/summarybarwidget.cpp:155
+#, kde-format
+msgid "Answered wrong on the first attempt: %1 of %2 (%3 %)"
 msgstr ""
 
-#: src/settings/generaloptions.cpp:66
-msgctxt "CSV separator"
-msgid ">= 2 SPACES"
+#: src/practice/summarybarwidget.cpp:162
+#, kde-format
+msgid "Not answered during this practice: %1 of %2 (%3 %)"
 msgstr ""
 
-#: src/settings/generaloptions.cpp:67
-msgctxt "CSV separator"
-msgid " : "
+#: src/practice/statustoggle.cpp:86
+msgid ""
+"This answer will be counted as correct.\n"
+"Words will only be counted as correct if they are answered correctly on the "
+"first attempt."
 msgstr ""
 
-#: src/settings/generaloptions.cpp:68
-msgctxt "CSV separator"
-msgid " :: "
+#: src/practice/statustoggle.cpp:87
+msgid "Count this answer as wrong"
 msgstr ""
 
-#: src/scripts/scriptmanager.cpp:133
-#, kde-format
-msgid "A script could not be activated and has been disabled."
-msgid_plural "%1 scripts could not be activated and have been disabled."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/scripts/scriptmanager.cpp:133
+#: src/practice/statustoggle.cpp:90
 msgid ""
-"This probably means that there are errors in the script or that the required "
-"packages are not installed."
+"This answer will be counted as wrong.\n"
+"Words will only be counted as correct if they are answered correctly on the "
+"first attempt."
 msgstr ""
 
-#: src/scripts/scriptmanager.cpp:135
-msgid "Script Activation"
+#: src/practice/statustoggle.cpp:91
+msgid "Count this answer as correct"
 msgstr ""
 
-#: src/scripts/script.cpp:54
-msgid "The script file does not exist."
+#: src/practice/comparisonmodewidget.cpp:72
+msgid "Enter the comparison forms."
 msgstr ""
 
-#: src/scripts/script.cpp:86
-#, kde-format
-msgid "Error in file %1 at line %2:"
+#: src/practice/practicemainwindow.cpp:74
+msgid "Stop Practice"
 msgstr ""
 
-#: src/scripts/script.cpp:88
-msgctxt "debug information in error message"
-msgid "Backtrace:"
+#: src/practice/practicemainwindow.cpp:76
+msgid "Stop practicing"
 msgstr ""
 
-#: src/scripts/scriptdialog.cpp:33
-msgid "Script Dialog"
+#: src/practice/practicemainwindow.cpp:86
+msgid "Change answer to right/wrong"
 msgstr ""
 
-#: plasmoid/parley_plasma.cpp:183
-msgid " second"
-msgid_plural " seconds"
+#: src/practice/practicemainwindow.cpp:87
+msgid ""
+"When you answered, Parley will display that the answer was right or wrong.\n"
+"This shortcut changes how the answer is counted."
+msgstr ""
+
+#: src/practice/practicesummarycomponent.cpp:61
+#, kde-format
+msgid "one word"
+msgid_plural "%1 words"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plasmoid/parley_plasma.cpp:187
-msgid "*.kvtml|Vocabulary Collections"
-msgstr ""
+#: src/practice/practicesummarycomponent.cpp:62
+#, kde-format
+msgid "one minute"
+msgid_plural "%1 minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: src/settings/languagesettings.kcfg:11
-#. i18n: ectx: label, entry (KeyboardLayout), group (Locale $(locale))
-#. i18n: file: src/settings/languagesettings.kcfg:12
-#. i18n: ectx: whatsthis, entry (KeyboardLayout), group (Locale $(locale))
-#: rc.cpp:1128 rc.cpp:1131
-msgid "Keyboard layout for this locale"
-msgstr ""
+#: src/practice/practicesummarycomponent.cpp:63
+#, kde-format
+msgid "one second"
+msgid_plural "%1 seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: src/settings/languagesettings.kcfg:17
-#. i18n: ectx: label, entry (SpellChecker), group (Locale $(locale))
-#. i18n: file: src/settings/languagesettings.kcfg:18
-#. i18n: ectx: whatsthis, entry (SpellChecker), group (Locale $(locale))
-#: obj-i686-linux-gnu/src/languagesettings.cpp:19
-#: obj-i686-linux-gnu/src/languagesettings.cpp:20 rc.cpp:1000 rc.cpp:1003
-msgid "Spell checker for this language"
+#: src/practice/practicesummarycomponent.cpp:60
+#, kde-format
+msgctxt "number of words, minutes, seconds"
+msgid "You practiced %1 in %2 and %3."
 msgstr ""
 
-#. i18n: file: src/settings/documentsettings.kcfg:11
-#. i18n: ectx: label, entry (ConjugationTenses), group (Document $(fileurl))
-#. i18n: file: src/settings/documentsettings.kcfg:12
-#. i18n: ectx: whatsthis, entry (ConjugationTenses), group (Document $(fileurl))
-#. i18n: file: src/settings/languagesettings.kcfg:16
-#. i18n: ectx: label, entry (ConjugationTenses), group (Locale $(locale))
-#. i18n: file: src/settings/languagesettings.kcfg:17
-#. i18n: ectx: whatsthis, entry (ConjugationTenses), group (Locale $(locale))
-#: rc.cpp:746 rc.cpp:749 rc.cpp:1134 rc.cpp:1137
-msgid "Selected tenses for conjugation practice."
+#: src/practice/practicesummarycomponent.cpp:79
+#: src/practice/practicesummarycomponent.cpp:80
+msgid "Practice Again"
 msgstr ""
 
-#. i18n: file: src/settings/documentsettings.kcfg:16
-#. i18n: ectx: label, entry (VisibleColumns), group (Document $(fileurl))
-#. i18n: file: src/settings/documentsettings.kcfg:17
-#. i18n: ectx: whatsthis, entry (VisibleColumns), group (Document $(fileurl))
-#. i18n: file: src/settings/languagesettings.kcfg:21
-#. i18n: ectx: label, entry (VisibleColumns), group (Locale $(locale))
-#. i18n: file: src/settings/languagesettings.kcfg:22
-#. i18n: ectx: whatsthis, entry (VisibleColumns), group (Locale $(locale))
-#: rc.cpp:752 rc.cpp:755 rc.cpp:1140 rc.cpp:1143
-msgid "Visible columns in the main editor window."
+#: src/practice/conjugationbackendmode.cpp:121
+msgid "All conjugation forms were right."
 msgstr ""
 
-#. i18n: file: src/settings/languagesettings.kcfg:32
-#. i18n: ectx: label, entry (PracticeFont), group (Locale $(locale))
-#: obj-i686-linux-gnu/src/languagesettings.cpp:33 rc.cpp:1018
-msgid "The font used during practice"
-msgstr ""
+#: src/practice/conjugationbackendmode.cpp:124
+#, kde-format
+msgctxt "You did not get the conjugation forms right."
+msgid "You answered %1 conjugation form correctly."
+msgid_plural "You answered %1 conjugation forms correctly."
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: src/settings/languagesettings.kcfg:36
-#. i18n: ectx: label, entry (EditorFont), group (Locale $(locale))
-#: obj-i686-linux-gnu/src/languagesettings.cpp:36 rc.cpp:1021
-msgid "The font used in the editor"
+#: src/practice/guifrontend.cpp:126
+#, kde-format
+msgctxt "Display of the current lesson during practice"
+msgid "Lesson: %1"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
-#: rc.cpp:47
-msgid "Correction"
-msgstr ""
-
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:23
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_IgnoreAccentMistakes)
-#: rc.cpp:50
-msgid "Answers with wrong accents are still counted as correct."
-msgstr ""
-
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:26
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreAccentMistakes)
-#: rc.cpp:53
-msgid "Ignore Accents"
-msgstr ""
+#: src/practice/guifrontend.cpp:189
+#, kde-format
+msgid ""
+"You answered %2 of a total of %1 word.\n"
+"You are %3% done."
+msgid_plural ""
+"You answered %2 of a total of %1 words.\n"
+"You are %3% done."
+msgstr[0] ""
+msgstr[1] ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:36
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_IgnoreCapitalizationMistakes)
-#: rc.cpp:56
-msgid "Any captitalization in the answer is counted as correct."
-msgstr ""
+#: src/main.cpp:36
+msgid "Vocabulary Trainer"
+msgstr "Hyfforddwr Geirfa"
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:39
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreCapitalizationMistakes)
-#: rc.cpp:59
-msgid "Ignore Capitalization"
+#. i18n: file: src/welcomescreen/welcomescreen.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, WelcomeScreen)
+#: src/main.cpp:40 rc.cpp:1128
+msgid "Parley"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:49
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowHints)
-#: rc.cpp:62
+#: src/main.cpp:44
 msgid ""
-"During the practice you can use the hint button to see parts of the solution."
+"© 1999-2002\tEwald Arnold\n"
+"© 2001-2002\tThe KDE team\n"
+"© 2004-2007\tPeter Hedlund\n"
+"© 2007-2010\tFrederik Gladhorn\n"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:52
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowHints)
-#: rc.cpp:65
-msgid "Enable Hints"
+#: src/main.cpp:48
+msgid "Helps you train your vocabulary"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:62
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AltLearn)
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:65
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AltLearn)
-#: rc.cpp:68 rc.cpp:71
-msgid ""
-"Requires you to answer each question correctly 3 times in a row for it to be "
-"counted as correct."
+#: src/main.cpp:52
+msgid "Frederik Gladhorn"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:68
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AltLearn)
-#: rc.cpp:74
-msgid "Require 3 consecutive correct answers"
+#: src/main.cpp:53
+msgid "Developer and maintainer"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:78
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
-#: rc.cpp:77
-msgid "Images and Sound"
+#: src/main.cpp:56
+msgid "Daniel Laidig"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:84
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FlashcardsFrontImage)
-#: rc.cpp:80
-msgid "During the practice, images are shown for the question."
+#: src/main.cpp:57
+msgid "Developer"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:87
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_FlashcardsFrontImage)
-#: rc.cpp:83
-msgid "Image for Question"
+#: src/main.cpp:60
+msgid "David Capel"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:97
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FlashcardsBackImage)
-#: rc.cpp:86
-msgid "During the practice, images are shown for the solution."
+#: src/main.cpp:61
+msgid "Practice Dialogs"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:100
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_FlashcardsBackImage)
-#: rc.cpp:89
-msgid "Image for Solution"
+#: src/main.cpp:64
+msgid "Avgoustinos Kadis"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:110
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_PracticeSoundEnabled)
-#: rc.cpp:92
-msgid "Enable playing of pronunciation sound files during the practice."
+#: src/main.cpp:65
+msgid "Scripting"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:148
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:101
-msgid ""
-"By default you are asked to enter synonyms until you enter the one that is "
-"associated directly with the current word. With this option enabled any "
-"synonym is accepted."
+#: src/main.cpp:68
+msgid "Peter Hedlund"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:158
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_CountSynonymsAsCorrect)
-#: rc.cpp:104
-msgid "Accept any Synonym"
+#: src/main.cpp:69
+msgid "Countless fixes, former maintainer, port to KDE4"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:174
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_MultipleChoiceWordTypeConsistancy)
-#: rc.cpp:110
-msgid ""
-"When creating multiple choice practices, try to show answers of the same "
-"word type."
+#: src/main.cpp:72
+msgid "Ewald Arnold"
 msgstr ""
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:177
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_MultipleChoiceWordTypeConsistancy)
-#: rc.cpp:113
-msgid "Use choices of the same word type"
-msgstr ""
+#: src/main.cpp:72
+msgid "Original Author"
+msgstr "Awdur Gwreiddiol"
 
-#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:192
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:116
-msgid "Number of choices:"
+#: src/main.cpp:76
+msgid "Lee Olson"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:40
-#. i18n: ectx: property (text), widget (QLabel, l_lev2)
-#. i18n: file: src/settings/viewoptionsbase.ui:324
-#. i18n: ectx: property (text), widget (QLabel, l_lev2)
-#: rc.cpp:119 rc.cpp:857
-msgid "Level &2:"
+#: src/main.cpp:77
+msgid "Artwork and Oxygen Icons"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:53
-#. i18n: ectx: property (text), widget (QLabel, l_lev5)
-#. i18n: file: src/settings/viewoptionsbase.ui:201
-#. i18n: ectx: property (text), widget (QLabel, l_lev5)
-#: rc.cpp:122 rc.cpp:812
-msgid "Level &5:"
+#: src/main.cpp:79
+msgid "Anne-Marie Mahfouf"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:63
-#. i18n: ectx: property (text), widget (QLabel, l_lev6)
-#. i18n: file: src/settings/viewoptionsbase.ui:160
-#. i18n: ectx: property (text), widget (QLabel, l_lev6)
-#: rc.cpp:125 rc.cpp:797
-msgid "Level &6:"
+#: src/main.cpp:80
+msgid "Port to KConfig XT"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:79
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Expire)
-#: rc.cpp:128
-msgid "E&xpiring"
+#: src/main.cpp:82
+msgid "Jeremy Whiting"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:95
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Block)
-#: rc.cpp:131
-msgid "Bl&ocking"
+#: src/main.cpp:83
+msgid "Rewriting the kvtml library for KDE4"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:118
-#. i18n: ectx: property (text), widget (QLabel, l_lev4)
-#. i18n: file: src/settings/viewoptionsbase.ui:242
-#. i18n: ectx: property (text), widget (QLabel, l_lev4)
-#: rc.cpp:134 rc.cpp:827
-msgid "Level &4:"
+#: src/main.cpp:85
+msgid "Markus Büchele"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:128
-#. i18n: ectx: property (text), widget (QLabel, l_lev7)
-#. i18n: file: src/settings/viewoptionsbase.ui:119
-#. i18n: ectx: property (text), widget (QLabel, l_lev7)
-#: rc.cpp:137 rc.cpp:782
-msgid "Level &7:"
+#: src/main.cpp:86
+msgid "Bug reports and testing on the way to KDE4"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:150
-#. i18n: ectx: property (text), widget (QLabel, l_lev1)
-#. i18n: file: src/settings/viewoptionsbase.ui:365
-#. i18n: ectx: property (text), widget (QLabel, l_lev1)
-#: rc.cpp:140 rc.cpp:872
-msgid "Level &1:"
+#: src/main.cpp:88
+msgid "Ramona Knapp"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:192
-#. i18n: ectx: property (text), widget (QLabel, l_lev3)
-#. i18n: file: src/settings/viewoptionsbase.ui:283
-#. i18n: ectx: property (text), widget (QLabel, l_lev3)
-#: rc.cpp:143 rc.cpp:842
-msgid "Level &3:"
+#: src/main.cpp:89
+msgid "Conceived the name Parley"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:218
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:146
-msgid "Do not practice vocabulary that has been asked within:"
+#: src/main.cpp:95
+msgid "Start practice instead of editor"
 msgstr ""
 
-#. i18n: file: src/configure-practice/blockoptions.ui:228
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:149
-msgid "Vocabulary drops one grade after this much time:"
+#: src/main.cpp:96
+msgid "+[file]"
 msgstr ""
 
-#. i18n: file: src/configure-practice/thresholdoptions.ui:17
-#. i18n: ectx: property (text), widget (QLabel, label_8)
-#: rc.cpp:158
-msgid "Only practice vocabulary that fulfills the following conditions:"
+#: src/main.cpp:96
+msgid "Document file to open"
 msgstr ""
 
-#. i18n: file: src/configure-practice/thresholdoptions.ui:26
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:161
-msgid "At least"
-msgstr ""
+#: rc.cpp:1
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
 
-#. i18n: file: src/configure-practice/thresholdoptions.ui:33
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:164
-msgid "At most"
-msgstr ""
+#: rc.cpp:2
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "kyfieithu@dotmon.com,,"
 
-#. i18n: file: src/configure-practice/thresholdoptions.ui:43
+#. i18n: file: plugins/google_images.ui:49
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:167
-msgid "Grade"
+#: rc.cpp:5
+msgid "Give a keyword to search for an image related to it:"
 msgstr ""
 
-#. i18n: file: src/configure-practice/thresholdoptions.ui:53
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#: rc.cpp:170
-msgid "Times practiced"
+#. i18n: file: plugins/google_images.ui:61
+#. i18n: ectx: property (text), widget (QPushButton, searchButton)
+#: rc.cpp:8
+msgid "Search"
 msgstr ""
 
-#. i18n: file: src/configure-practice/thresholdoptions.ui:80
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:173
-msgid "Answered incorrectly"
+#. i18n: file: plugins/google_images.ui:72
+#. i18n: ectx: property (text), widget (QCheckBox, freeImageCheckBox)
+#: rc.cpp:11
+msgid "Free images only (creative commons, gpl, ...)"
 msgstr ""
 
-#. i18n: file: src/editor/multiplechoicewidget.ui:21
-#. i18n: ectx: property (text), widget (QPushButton, addChoiceButton)
-#: rc.cpp:302
-msgid "Add"
+#. i18n: file: plugins/google_images.ui:103
+#. i18n: ectx: property (text), widget (QPushButton, previousButton)
+#: rc.cpp:14
+msgid "Previous"
 msgstr ""
 
-#. i18n: file: src/editor/multiplechoicewidget.ui:28
-#. i18n: ectx: property (text), widget (QPushButton, removeChoiceButton)
-#: rc.cpp:305
-msgid "Remove"
-msgstr ""
-
-#. i18n: file: src/editor/comparisonwidget.ui:24
-#. i18n: ectx: property (toolTip), widget (QLabel, absoluteLabel)
-#. i18n: file: src/editor/comparisonwidget.ui:56
-#. i18n: ectx: property (toolTip), widget (QLabel, comparativeLabel)
-#: rc.cpp:230 rc.cpp:236
-msgid "The comparative is used to compare nouns or verbs (faster)"
-msgstr ""
-
-#. i18n: file: src/editor/comparisonwidget.ui:27
-#. i18n: ectx: property (text), widget (QLabel, absoluteLabel)
-#: rc.cpp:233
-msgid "Absolute:"
-msgstr ""
-
-#. i18n: file: src/editor/comparisonwidget.ui:59
-#. i18n: ectx: property (text), widget (QLabel, comparativeLabel)
-#: rc.cpp:239
-msgid "Comparative:"
-msgstr ""
-
-#. i18n: file: src/editor/comparisonwidget.ui:88
-#. i18n: ectx: property (toolTip), widget (QLabel, superlativeLabel)
-#: rc.cpp:242
-msgid "The superlative (fastest)"
-msgstr ""
-
-#. i18n: file: src/editor/comparisonwidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, superlativeLabel)
-#: rc.cpp:245
-msgid "Superlative:"
-msgstr ""
-
-#. i18n: file: src/editor/FromToEntryPageForm.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, FromToEntryPageForm)
-#. i18n: file: src/editor/conjugationwidget.ui:26
-#. i18n: ectx: property (windowTitle), widget (QWidget, ConjugationWidget)
-#. i18n: file: src/editor/declensionwidget.ui:25
-#. i18n: ectx: property (windowTitle), widget (QWidget, DeclensionWidget)
-#. i18n: file: src/settings/optionlistform.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, OptionListForm)
-#. i18n: file: src/settings/documentproperties.ui:19
-#. i18n: ectx: property (windowTitle), widget (QWidget, DocumentProperties)
-#: rc.cpp:182 rc.cpp:308 rc.cpp:374 rc.cpp:521 rc.cpp:893
-msgid "-"
-msgstr "-"
-
-#. i18n: file: src/editor/conjugationwidget.ui:38
-#. i18n: ectx: property (text), widget (QPushButton, makeVerbButton)
-#: rc.cpp:311
-msgid "Turn the selected word into a verb."
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:47
-#. i18n: ectx: property (text), widget (QLabel, singularFirstPersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:141
-#. i18n: ectx: property (text), widget (QLabel, dualFirstPersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:218
-#. i18n: ectx: property (text), widget (QLabel, pluralFirstPersonLabel)
-#: rc.cpp:314 rc.cpp:329 rc.cpp:344
-msgid "First"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:70
-#. i18n: ectx: property (text), widget (QLabel, singularSecondPersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:157
-#. i18n: ectx: property (text), widget (QLabel, dualSecondPersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:234
-#. i18n: ectx: property (text), widget (QLabel, pluralSecondPersonLabel)
-#: rc.cpp:317 rc.cpp:332 rc.cpp:347
-msgid "Second"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:93
-#. i18n: ectx: property (text), widget (QLabel, singularThirdMalePersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:173
-#. i18n: ectx: property (text), widget (QLabel, dualThirdMalePersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:250
-#. i18n: ectx: property (text), widget (QLabel, pluralThirdMalePersonLabel)
-#: rc.cpp:320 rc.cpp:335 rc.cpp:350
-msgid "Third Male"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:109
-#. i18n: ectx: property (text), widget (QLabel, singularThirdFemalePersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:186
-#. i18n: ectx: property (text), widget (QLabel, dualThirdFemalePersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:269
-#. i18n: ectx: property (text), widget (QLabel, pluralThirdFemalePersonLabel)
-#: rc.cpp:323 rc.cpp:338 rc.cpp:353
-msgid "Third Female"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:125
-#. i18n: ectx: property (text), widget (QLabel, singularThirdNeutralPersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:202
-#. i18n: ectx: property (text), widget (QLabel, dualThirdNeutralPersonLabel)
-#. i18n: file: src/editor/conjugationwidget.ui:288
-#. i18n: ectx: property (text), widget (QLabel, pluralThirdNeutralPersonLabel)
-#: rc.cpp:326 rc.cpp:341 rc.cpp:356
-msgid "Third Neutral"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:326
-#. i18n: ectx: property (text), widget (QPushButton, nextTenseButton)
-#: rc.cpp:359
-msgid "Ne&xt"
-msgstr "Ne&saf"
-
-#. i18n: file: src/editor/conjugationwidget.ui:339
-#. i18n: ectx: property (text), widget (QLabel, tenselabel)
-#: rc.cpp:362
-msgid "&Tense:"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:358
-#. i18n: ectx: property (text), widget (QLabel, singularLabel)
-#. i18n: file: src/editor/declensionwidget.ui:186
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#. i18n: file: src/settings/languagepropertiespage.ui:330
-#. i18n: ectx: property (text), widget (QLabel, male_label_3)
-#. i18n: file: src/settings/languagepropertiespage.ui:444
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_2)
-#: rc.cpp:365 rc.cpp:404 rc.cpp:1065 rc.cpp:1080
-msgid "Singular"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:377
-#. i18n: ectx: property (text), widget (QLabel, dualLabel)
-#. i18n: file: src/editor/declensionwidget.ui:193
-#. i18n: ectx: property (text), widget (QLabel, label_4)
-#. i18n: file: src/settings/languagepropertiespage.ui:451
-#. i18n: ectx: property (text), widget (QLabel, dualLabel)
-#: rc.cpp:368 rc.cpp:407 rc.cpp:1083
-msgid "Dual"
-msgstr ""
-
-#. i18n: file: src/editor/conjugationwidget.ui:396
-#. i18n: ectx: property (text), widget (QLabel, pluralLabel)
-#. i18n: file: src/editor/declensionwidget.ui:200
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#. i18n: file: src/settings/languagepropertiespage.ui:343
-#. i18n: ectx: property (text), widget (QLabel, male_label_4)
-#. i18n: file: src/settings/languagepropertiespage.ui:458
-#. i18n: ectx: property (text), widget (QLabel, TextLabel4_3)
-#: rc.cpp:371 rc.cpp:410 rc.cpp:1068 rc.cpp:1086
-msgid "Plural"
-msgstr ""
-
-#. i18n: file: src/editor/declensionwidget.ui:31
-#. i18n: ectx: property (text), widget (QPushButton, makeNounButton)
-#: rc.cpp:377
-msgid "Turn the selected word into a noun."
-msgstr ""
-
-#. i18n: file: src/editor/declensionwidget.ui:44
-#. i18n: ectx: property (title), widget (QGroupBox, declensionGroupBox)
-#: rc.cpp:380
-msgid "Declension Forms"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:282
-msgid "Nominative"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:283
-msgid "Genitive"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:284
-msgid "Dative"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:285
-msgid "Accusative"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:286
-msgid "Ablative"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:287
-msgid "Locative"
-msgstr ""
-
-#: obj-i686-linux-gnu/src/ui_declensionwidget.h:288
-msgid "Vocative"
-msgstr ""
-
-#. i18n: file: src/editor/audiowidget.ui:25
-#. i18n: ectx: property (text), widget (QPushButton, recordButton)
-#: rc.cpp:257
-msgid "Record"
-msgstr ""
-
-#. i18n: file: src/editor/browserwidget.ui:18
-#. i18n: ectx: property (text), widget (QPushButton, showCurrentButton)
-#: rc.cpp:224
-msgid "Lookup Current"
-msgstr ""
-
-#. i18n: file: src/editor/browserwidget.ui:33
-#. i18n: ectx: property (text), widget (QCheckBox, followTableCheckBox)
-#: rc.cpp:227
-msgid "Follow Table"
+#. i18n: file: plugins/google_images.ui:116
+#. i18n: ectx: property (text), widget (QPushButton, nextButton)
+#: rc.cpp:17
+msgid "Next"
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:16
-#. i18n: ectx: property (text), widget (QLabel, languageLabel)
-#: rc.cpp:281
-msgid "Language"
+#. i18n: file: src/statistics/statisticsui.rc:7
+#. i18n: ectx: Menu (file)
+#. i18n: file: src/editor/editorui.rc:7
+#. i18n: ectx: Menu (file)
+#. i18n: file: src/practice/practiceui.rc:7
+#. i18n: ectx: Menu (file)
+#. i18n: file: src/practice/practicesummaryui.rc:7
+#. i18n: ectx: Menu (file)
+#: rc.cpp:20 rc.cpp:729 rc.cpp:1146 rc.cpp:1155
+msgid "&File"
 msgstr ""
 
-#. i18n: file: src/editor/summarywordwidget.ui:42
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:287
-msgid "Word type"
+#. i18n: file: src/statistics/statisticsui.rc:12
+#. i18n: ectx: Menu (learning)
+#. i18n: file: src/editor/editorui.rc:60
+#. i18n: ectx: Menu (learning)
+#. i18n: file: src/practice/practicesummaryui.rc:12
+#. i18n: ectx: Menu (learning)
+#: rc.cpp:23 rc.cpp:741 rc.cpp:1158
+msgid "&Practice"
 msgstr ""
 
-#. i18n: file: src/editor/latexwidget.ui:17
-#. i18n: ectx: property (text), widget (QLabel, texLabel)
-#: rc.cpp:413
-msgid "LaTeX code"
+#. i18n: file: src/statistics/statisticsui.rc:19
+#. i18n: ectx: ToolBar (statisticsToolBar)
+#. i18n: file: src/parleyui.rc:36
+#. i18n: ectx: ToolBar (statisticsToolBar)
+#: rc.cpp:26 rc.cpp:993
+msgid "Statistics Toolbar"
 msgstr ""
 
-#. i18n: file: src/editor/latexwidget.ui:37
+#. i18n: file: src/statistics/statisticsmainwindow.ui:23
 #. i18n: ectx: property (text), widget (QLabel, label)
-#. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:55
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:416 rc.cpp:506
-msgid "Preview"
-msgstr ""
-
-#. i18n: file: src/editor/latexwidget.ui:57
-#. i18n: ectx: property (text), widget (QCheckBox, mathModeCheckBox)
-#: rc.cpp:419
-msgid "Math mode"
+#: rc.cpp:29
+msgid "Languages:"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:16
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:1219
-msgid ""
-"<p>Your selection of vocabulary for the practice is empty.</p><p>Below you "
-"can choose to ignore some of your configuration settings to start a practice "
-"anyway.</p>"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:91
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:32
+msgid "Practice Mode:"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:26
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:1222
-msgid "Ignore Configuration for:"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:98
+#. i18n: ectx: property (text), widget (QRadioButton, flashCard)
+#: rc.cpp:35
+msgid "Flash Cards"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:32
-#. i18n: ectx: property (text), widget (QCheckBox, lessonCheckBox)
-#: rc.cpp:1225
-msgid "Ignore Lessons"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:108
+#. i18n: ectx: property (text), widget (QRadioButton, mixedLetters)
+#: rc.cpp:38
+msgid "Mixed Letters"
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:205
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:207
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:209
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:211
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:213
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:215
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:218
-#: obj-i686-linux-gnu/src/ui_entryfilter.h:220
-msgid "TextLabel"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:122
+#. i18n: ectx: property (text), widget (QRadioButton, written)
+#: rc.cpp:44
+msgid "Written"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:52
-#. i18n: ectx: property (text), widget (QCheckBox, wordTypeCheckBox)
-#: rc.cpp:1229
-msgid "Ignore Word Types"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:132
+#. i18n: ectx: property (text), widget (QRadioButton, exampleSentence)
+#: rc.cpp:47
+msgid "Example Sentences"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:72
-#. i18n: ectx: property (text), widget (QCheckBox, blockedCheckBox)
-#: rc.cpp:1233
-msgid "Ignore Blocked"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:142
+#. i18n: ectx: property (text), widget (QRadioButton, gender)
+#: rc.cpp:50
+msgid "Gender of Nouns"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:92
-#. i18n: ectx: property (text), widget (QCheckBox, timesWrongCheckBox)
-#: rc.cpp:1237
-msgid "Ignore Times Answered Incorrectly"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:152
+#. i18n: ectx: property (text), widget (QRadioButton, comparisonForms)
+#: rc.cpp:53
+msgid "Comparison Forms"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:112
-#. i18n: ectx: property (text), widget (QCheckBox, timesPracticedCheckBox)
-#: rc.cpp:1241
-msgid "Ignore Times Practiced"
+#. i18n: file: src/statistics/statisticsmainwindow.ui:162
+#. i18n: ectx: property (text), widget (QRadioButton, conjugations)
+#: rc.cpp:56
+msgid "Conjugations"
 msgstr ""
 
-#. i18n: file: src/practice/entryfilter.ui:132
-#. i18n: ectx: property (text), widget (QCheckBox, minMaxGradeCheckBox)
-#: rc.cpp:1245
-msgid "Ignore Minimum/Maximum Grade"
-msgstr ""
+#. i18n: file: src/settings/optionlistform.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, OptionListForm)
+#. i18n: file: src/settings/documentproperties.ui:19
+#. i18n: ectx: property (windowTitle), widget (QWidget, DocumentProperties)
+#. i18n: file: src/editor/FromToEntryPageForm.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, FromToEntryPageForm)
+#. i18n: file: src/editor/conjugationwidget.ui:26
+#. i18n: ectx: property (windowTitle), widget (QWidget, ConjugationWidget)
+#. i18n: file: src/editor/declensionwidget.ui:25
+#. i18n: ectx: property (windowTitle), widget (QWidget, DeclensionWidget)
+#: rc.cpp:59 rc.cpp:414 rc.cpp:756 rc.cpp:828 rc.cpp:903
+msgid "-"
+msgstr "-"
 
-#. i18n: file: src/practice/entryfilter.ui:152
-#. i18n: ectx: property (text), widget (QLabel, lessonLabel_2)
-#: rc.cpp:1249
-msgid "Words"
-msgstr ""
+#. i18n: file: src/settings/optionlistform.ui:63
+#. i18n: ectx: property (text), widget (QPushButton, newButton)
+#. i18n: file: src/settings/languagepropertiespage.ui:758
+#. i18n: ectx: property (text), widget (QPushButton, newButton)
+#: rc.cpp:62 rc.cpp:405
+msgid "&New..."
+msgstr "&Newydd..."
 
-#. i18n: file: src/practice/entryfilter.ui:167
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:1252
-msgid "Total number of entries:"
-msgstr ""
+#. i18n: file: src/settings/optionlistform.ui:78
+#. i18n: ectx: property (text), widget (QPushButton, modifyButton)
+#. i18n: file: src/settings/languagepropertiespage.ui:771
+#. i18n: ectx: property (text), widget (QPushButton, modifyButton)
+#: rc.cpp:65 rc.cpp:408
+msgid "&Modify..."
+msgstr "&Addasu..."
 
-#. i18n: file: src/practice/entryfilter.ui:188
-#. i18n: ectx: property (text), widget (QLabel, label_9)
-#: rc.cpp:1256
-msgid "Resulting number of words to practice:"
+#. i18n: file: src/settings/optionlistform.ui:93
+#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
+#. i18n: file: src/settings/languagepropertiespage.ui:784
+#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
+#: rc.cpp:68 rc.cpp:411
+msgid "&Delete"
 msgstr ""
 
-#. i18n: file: src/practice/practicesummarywidget.ui:28
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:1207
-msgid "Attempts"
-msgstr ""
+#. i18n: file: src/settings/optionlistform.ui:124
+#. i18n: ectx: property (text), widget (QPushButton, cleanUpButton)
+#: rc.cpp:71
+msgid "&Clean Up"
+msgstr "&Glanhau"
 
-#. i18n: file: src/practice/practicesummarywidget.ui:33
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:1210
-msgid "Question"
+#. i18n: file: src/settings/documentsettings.kcfg:11
+#. i18n: ectx: label, entry (ConjugationTenses), group (Document $(fileurl))
+#. i18n: file: src/settings/documentsettings.kcfg:12
+#. i18n: ectx: whatsthis, entry (ConjugationTenses), group (Document $(fileurl))
+#. i18n: file: src/settings/languagesettings.kcfg:23
+#. i18n: ectx: label, entry (ConjugationTenses), group (Locale $(locale))
+#. i18n: file: src/settings/languagesettings.kcfg:24
+#. i18n: ectx: whatsthis, entry (ConjugationTenses), group (Locale $(locale))
+#: rc.cpp:74 rc.cpp:77 rc.cpp:526 rc.cpp:529
+msgid "Selected tenses for conjugation practice."
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:81
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#. i18n: file: src/practice/practicesummarywidget.ui:38
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:17 rc.cpp:1213
-msgid "Solution"
+#. i18n: file: src/settings/documentsettings.kcfg:16
+#. i18n: ectx: label, entry (VisibleColumns), group (Document $(fileurl))
+#. i18n: file: src/settings/documentsettings.kcfg:17
+#. i18n: ectx: whatsthis, entry (VisibleColumns), group (Document $(fileurl))
+#. i18n: file: src/settings/languagesettings.kcfg:28
+#. i18n: ectx: label, entry (VisibleColumns), group (Locale $(locale))
+#. i18n: file: src/settings/languagesettings.kcfg:29
+#. i18n: ectx: whatsthis, entry (VisibleColumns), group (Locale $(locale))
+#: rc.cpp:80 rc.cpp:83 rc.cpp:532 rc.cpp:535
+msgid "Visible columns in the main editor window."
 msgstr ""
 
-#. i18n: file: src/practice/practicesummarywidget.ui:43
-#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
-#: rc.cpp:1216
-msgid "Your Answer"
+#. i18n: file: src/settings/parley.kcfg:11
+#. i18n: ectx: label, entry (Theme), group (General)
+#: rc.cpp:86
+msgid "Theme to use for practice and welcome screen"
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_mainwindow.h:254
-msgid "Lesson 2: Nature Destroyed"
+#. i18n: file: src/settings/parley.kcfg:15
+#. i18n: ectx: label, entry (NumPreSetting), group (General)
+#: rc.cpp:89
+msgid "Number of stored setting profiles"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:118
-#. i18n: ectx: property (toolTip), widget (QPushButton, answerLaterButton)
-#: rc.cpp:1174
-msgid "Skip this word for now and ask again later"
+#. i18n: file: src/settings/parley.kcfg:19
+#. i18n: ectx: label, entry (SmartAppend), group (General)
+#: rc.cpp:92
+msgid ""
+"If true, when using the entry dialog, new rows will be appended as needed"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:121
-#. i18n: ectx: property (text), widget (QPushButton, answerLaterButton)
-#: rc.cpp:1177
-msgid "Answer Later"
+#. i18n: file: src/settings/parley.kcfg:23
+#. i18n: ectx: label, entry (Separator), group (General)
+#: rc.cpp:95
+msgid ""
+"This sets the separator used when copying/pasting text, default is Tab"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:131
-#. i18n: ectx: property (text), widget (QPushButton, hintButton)
-#: rc.cpp:1180
-msgid "Hint"
+#. i18n: file: src/settings/parley.kcfg:27
+#. i18n: ectx: label, entry (EntriesPerLesson), group (General)
+#: rc.cpp:98
+msgid "The number of entries per lesson"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:192
-#. i18n: ectx: property (text), widget (QPushButton, continueButton)
-#: rc.cpp:1183
-msgid "Continue"
+#. i18n: file: src/settings/parley.kcfg:31
+#. i18n: ectx: label, entry (AutoOpenLast), group (General)
+#: rc.cpp:101
+msgid ""
+"If true, on each application start the last opened file will be loaded"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:209
-#. i18n: ectx: property (text), widget (QPushButton, countAsWrongButton)
-#: rc.cpp:1186
-msgid "I did not know it"
+#. i18n: file: src/settings/parley.kcfg:35
+#. i18n: ectx: label, entry (AutoSave), group (General)
+#: rc.cpp:104
+msgid "If true, vocabularies are automatically saved on close and exit"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:216
-#. i18n: ectx: property (text), widget (QPushButton, countAsCorrectButton)
-#: rc.cpp:1189
-msgid "I knew it"
+#. i18n: file: src/settings/parley.kcfg:42
+#. i18n: ectx: label, entry (AutoBackup), group (General)
+#: rc.cpp:107
+msgid "If true, a backup is saved every BackupTime minutes"
 msgstr ""
 
-#. i18n: file: src/practice/practice_mainwindow.ui:290
-#. i18n: ectx: property (format), widget (QProgressBar, totalProgress)
-#: rc.cpp:1193
-#, no-c-format
-msgid "%v/%m"
+#. i18n: file: src/settings/parley.kcfg:46
+#. i18n: ectx: label, entry (BackupTime), group (General)
+#: rc.cpp:110
+msgid "Time interval between two automatic backups"
 msgstr ""
 
-#. i18n: file: src/practice/practice_widget_comparison.ui:32
-#. i18n: ectx: property (text), widget (QLabel, absoluteLabel)
-#: rc.cpp:1196
-msgid "absolute"
+#. i18n: file: src/settings/parley.kcfg:57
+#. i18n: ectx: label, entry (FlashcardsFrontImage), group (PracticeOptions)
+#: rc.cpp:116
+msgid "Show images on the front of the flashcard."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_comparison.h:159
-msgid "good"
+#. i18n: file: src/settings/parley.kcfg:61
+#. i18n: ectx: label, entry (FlashcardsBackImage), group (PracticeOptions)
+#: rc.cpp:119
+msgid "Show images on the back of the flashcard."
 msgstr ""
 
-#. i18n: file: src/practice/practice_widget_comparison.ui:74
-#. i18n: ectx: property (text), widget (QLabel, comparativeLabel)
-#: rc.cpp:1200
-msgid "comparative"
+#. i18n: file: src/settings/parley.kcfg:65
+#. i18n: ectx: label, entry (Block), group (PracticeOptions)
+#: rc.cpp:122
+msgid "In Blocking Query Tab Dialog, if checked then the Query is blocked"
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_comparison.h:162
-msgid "better"
+#. i18n: file: src/settings/parley.kcfg:69
+#. i18n: ectx: label, entry (Expire), group (PracticeOptions)
+#: rc.cpp:125
+msgid ""
+"In Blocking Query Tab Dialog, if checked then the Query accepts an expiring "
+"time"
 msgstr ""
 
-#. i18n: file: src/practice/practice_widget_comparison.ui:116
-#. i18n: ectx: property (text), widget (QLabel, superlativeLabel)
-#: rc.cpp:1204
-msgid "superlative"
+#. i18n: file: src/settings/parley.kcfg:73
+#. i18n: ectx: label, entry (AltLearn), group (PracticeOptions)
+#: rc.cpp:128
+msgid "Use the Leitner learning method"
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_comparison.h:165
-msgid "best"
+#. i18n: file: src/settings/parley.kcfg:77
+#. i18n: ectx: label, entry (TestOrderLesson), group (PracticeOptions)
+#: rc.cpp:131
+msgid ""
+"Append new vocabulary in a test in order of their lessons. Note that this "
+"will not be a hard transition, but a slow mix from one lesson to the next."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_conjugation.h:107
-msgid "Präsens"
+#. i18n: file: src/settings/parley.kcfg:81
+#. i18n: ectx: label, entry (TestNumberOfEntries), group (PracticeOptions)
+#: rc.cpp:134
+msgid ""
+"The number of entries that are practiced at the same time. If one of these "
+"is answered correctly another entry will be appended."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_conjugation.h:108
-msgid "to go"
+#. i18n: file: src/settings/parley.kcfg:85
+#. i18n: ectx: label, entry (SwapDirection), group (PracticeOptions)
+#: rc.cpp:137
+msgid "Swap direction randomly"
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_conjugation.h:109
-msgid "gehen"
+#. i18n: file: src/settings/parley.kcfg:90
+#. i18n: ectx: label, entry (PracticeTimeout), group (PracticeOptions)
+#: rc.cpp:140
+msgid "Limit the time for the user to answer in a test."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_flashcard.h:69
-#: obj-i686-linux-gnu/src/ui_practice_widget_multiplechoice.h:67
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:140
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:143
-msgid "Baum"
+#. i18n: file: src/settings/parley.kcfg:94
+#. i18n: ectx: label, entry (PracticeTimeoutMode), group (PracticeOptions)
+#: rc.cpp:143
+msgid ""
+"Show - show the solution after the given time; Continue - go to the next "
+"question after the given time."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_flashcard.h:70
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:144
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:147
-msgid "tree"
+#. i18n: file: src/settings/parley.kcfg:102
+#. i18n: ectx: label, entry (PracticeTimeoutTimePerAnswer), group (PracticeOptions)
+#: rc.cpp:146
+msgid "Maximum time allowed to answer."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_multiplechoice.h:68
-msgid "Feedback"
+#. i18n: file: src/settings/parley.kcfg:107
+#. i18n: ectx: label, entry (Suggestions), group (PracticeOptions)
+#: rc.cpp:149
+msgid "Enable suggestion lists in written practice."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:141
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:145
-msgid "[foo]"
+#. i18n: file: src/settings/parley.kcfg:111
+#. i18n: ectx: label, entry (ShowHints), group (PracticeOptions)
+#: rc.cpp:152
+msgid "Enable the showing of hints."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:142
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:146
-msgid "..."
+#. i18n: file: src/settings/parley.kcfg:115
+#. i18n: ectx: label, entry (IgnoreAccentMistakes), group (PracticeOptions)
+#: rc.cpp:155
+msgid "Count answers as right when only the accentuation is wrong."
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_practice_widget_written.h:148
-msgid "Waiting for an answer..."
+#. i18n: file: src/settings/parley.kcfg:119
+#. i18n: ectx: label, entry (IgnoreCapitalizationMistakes), group (PracticeOptions)
+#: rc.cpp:158
+msgid "Count answers as right when only the capitalization is wrong."
 msgstr ""
 
-#. i18n: file: src/settings/optionlistform.ui:63
-#. i18n: ectx: property (text), widget (QPushButton, newButton)
-#. i18n: file: src/settings/languagepropertiespage.ui:710
-#. i18n: ectx: property (text), widget (QPushButton, newButton)
-#: rc.cpp:524 rc.cpp:1119
-msgid "&New..."
-msgstr "&Newydd..."
-
-#. i18n: file: src/settings/optionlistform.ui:78
-#. i18n: ectx: property (text), widget (QPushButton, modifyButton)
-#. i18n: file: src/settings/languagepropertiespage.ui:723
-#. i18n: ectx: property (text), widget (QPushButton, modifyButton)
-#: rc.cpp:527 rc.cpp:1122
-msgid "&Modify..."
-msgstr "&Addasu..."
-
-#. i18n: file: src/settings/optionlistform.ui:93
-#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
-#. i18n: file: src/settings/languagepropertiespage.ui:736
-#. i18n: ectx: property (text), widget (QPushButton, deleteButton)
-#: rc.cpp:530 rc.cpp:1125
-msgid "&Delete"
+#. i18n: file: src/settings/parley.kcfg:124
+#. i18n: ectx: label, entry (SplitTranslations), group (PracticeOptions)
+#: rc.cpp:161
+msgid "Split translations in written practice."
 msgstr ""
 
-#. i18n: file: src/settings/optionlistform.ui:124
-#. i18n: ectx: property (text), widget (QPushButton, cleanUpButton)
-#: rc.cpp:533
-msgid "&Clean Up"
-msgstr "&Glanhau"
-
-#. i18n: file: src/settings/viewoptionsbase.ui:46
-#. i18n: ectx: property (whatsThis), widget (KFontRequester, kcfg_IPAFont)
-#: rc.cpp:758
-msgid ""
-"Specify which font to use for displaying pronunciations using phonetic "
-"symbols."
+#. i18n: file: src/settings/parley.kcfg:128
+#. i18n: ectx: label, entry (Periods), group (PracticeOptions)
+#: rc.cpp:164
+msgid "Split translations at periods."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:54
-#. i18n: ectx: property (text), widget (QLabel, IPAFontLabel)
-#: obj-i686-linux-gnu/src/ui_viewoptionsbase.h:277 rc.cpp:726
-msgid "&Pronunciation symbols font:"
+#. i18n: file: src/settings/parley.kcfg:132
+#. i18n: ectx: label, entry (Colons), group (PracticeOptions)
+#: rc.cpp:167
+msgid "Split translations at colons."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:94
-#. i18n: ectx: property (title), widget (QGroupBox, gradegroup)
-#: rc.cpp:770
-msgid "Grade Colors"
+#. i18n: file: src/settings/parley.kcfg:136
+#. i18n: ectx: label, entry (Semicolons), group (PracticeOptions)
+#: rc.cpp:170
+msgid "Split translations at semicolons."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:100
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_UseGradeColors)
-#. i18n: file: src/settings/viewoptionsbase.ui:103
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_UseGradeColors)
-#: rc.cpp:773 rc.cpp:776
-msgid ""
-"If it is unchecked, you will just have black on white for the grades; if it "
-"is checked, the colors below will be chosen."
+#. i18n: file: src/settings/parley.kcfg:140
+#. i18n: ectx: label, entry (Commas), group (PracticeOptions)
+#: rc.cpp:173
+msgid "Split translations at commas."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:106
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseGradeColors)
-#: rc.cpp:779
-msgid "&Use colors"
-msgstr "&Defnyddio lliwiau"
-
-#. i18n: file: src/settings/viewoptionsbase.ui:138
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor7)
-#: rc.cpp:785
-msgid "Color for the grade 7"
+#. i18n: file: src/settings/parley.kcfg:146
+#. i18n: ectx: label, entry (ShowMore), group (PracticeOptions)
+#: rc.cpp:176
+msgid ""
+"Enable Show More button to reveal parts of the solution in written practice."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:141
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor7)
-#: rc.cpp:788
-msgid "Click here to change the color for grade 7."
+#. i18n: file: src/settings/parley.kcfg:150
+#. i18n: ectx: label, entry (SkipKnownEnabled), group (PracticeOptions)
+#: rc.cpp:179
+msgid "Enable Skip (I Know It) button in written practice."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:144
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor7)
-#: rc.cpp:791
-msgid "&7"
-msgstr "&7"
-
-#. i18n: file: src/settings/viewoptionsbase.ui:147
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor7)
-#: rc.cpp:794
-msgid "Alt+7"
-msgstr "Alt+7"
-
-#. i18n: file: src/settings/viewoptionsbase.ui:179
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor6)
-#: rc.cpp:800
-msgid "Color for the grade 6"
+#. i18n: file: src/settings/parley.kcfg:154
+#. i18n: ectx: label, entry (CountSynonymsAsCorrect), group (PracticeOptions)
+#: rc.cpp:182
+msgid ""
+"When the synonym instead of the word was entered, does it count as correct?"
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:182
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor6)
-#: rc.cpp:803
-msgid "Click here to change the color for grade 6."
+#. i18n: file: src/settings/parley.kcfg:158
+#. i18n: ectx: label, entry (PracticeImagesEnabled), group (PracticeOptions)
+#: rc.cpp:185
+msgid "Enable image display in the practice dialogs."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:185
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor6)
-#: rc.cpp:806
-msgid "&6"
-msgstr "&6"
-
-#. i18n: file: src/settings/viewoptionsbase.ui:188
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor6)
-#: rc.cpp:809
-msgid "Alt+6"
-msgstr "Alt+6"
-
-#. i18n: file: src/settings/viewoptionsbase.ui:220
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor5)
-#: rc.cpp:815
-msgid "Color for the grade 5"
+#. i18n: file: src/settings/parley.kcfg:162
+#. i18n: ectx: label, entry (PracticeSoundEnabled), group (PracticeOptions)
+#: rc.cpp:188
+msgid "Enable sound playback in the practice dialogs."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:223
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor5)
-#: rc.cpp:818
-msgid "Click here to change the color for grade 5."
+#. i18n: file: src/settings/parley.kcfg:166
+#. i18n: ectx: label, entry (MultipleChoiceWordTypeConsistancy), group (PracticeOptions)
+#: rc.cpp:191
+msgid ""
+"Use the same word type as the solution for the incorrect answers in a "
+"multiple choice practice."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:226
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor5)
-#: rc.cpp:821
-msgid "&5"
-msgstr "&5"
+#. i18n: file: src/settings/parley.kcfg:170
+#. i18n: ectx: label, entry (NumberMultipleChoiceAnswers), group (PracticeOptions)
+#: rc.cpp:194
+msgid ""
+"How many answers are provided for a multiple choice question, including the "
+"correct answer."
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:229
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor5)
-#: rc.cpp:824
-msgid "Alt+5"
-msgstr "Alt+5"
+#. i18n: file: src/settings/parley.kcfg:177
+#. i18n: ectx: label, entry (ShowSearch), group (Appearance)
+#: rc.cpp:197
+msgid "Toggle display of the search bar."
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:261
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor4)
-#: rc.cpp:830
-msgid "Color for the grade 4"
+#. i18n: file: src/settings/parley.kcfg:182
+#. i18n: ectx: label, entry (ShowSublessonentries), group (Appearance)
+#: rc.cpp:200
+msgid "When enabled a lesson also shows entries from its sublessons."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:264
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor4)
-#: rc.cpp:833
-msgid "Click here to change the color for grade 4."
+#. i18n: file: src/settings/parley.kcfg:187
+#. i18n: ectx: label, entry (TableLessonColumnVisible), group (Appearance)
+#: rc.cpp:203
+msgid "Show/hide the lesson column."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:267
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor4)
-#: rc.cpp:836
-msgid "&4"
-msgstr "&4"
+#. i18n: file: src/settings/parley.kcfg:192
+#. i18n: ectx: label, entry (TableActiveColumnVisible), group (Appearance)
+#: rc.cpp:206
+msgid "Show/hide the active column."
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:270
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor4)
-#: rc.cpp:839
-msgid "Alt+4"
-msgstr "Alt+4"
+#. i18n: file: src/settings/parley.kcfg:197
+#. i18n: ectx: label, entry (LessonEditingSelection), group (Appearance)
+#: rc.cpp:209
+msgid "Select which lessons are displayed for editing"
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:302
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor3)
-#: rc.cpp:845
-msgid "Color for the grade 3"
+#. i18n: file: src/settings/parley.kcfg:207
+#. i18n: ectx: label, entry (MainWindowSplitter), group (Appearance)
+#: rc.cpp:212
+msgid "How the main window is divided."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:305
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor3)
-#: rc.cpp:848
-msgid "Click here to change the color for grade 3."
+#. i18n: file: src/settings/parley.kcfg:211
+#. i18n: ectx: label, entry (PracticeFont), group (Appearance)
+#: rc.cpp:215
+msgid "The font used in the vocabulary table"
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:308
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor3)
-#: rc.cpp:851
-msgid "&3"
-msgstr "&3"
+#. i18n: file: src/settings/parley.kcfg:215
+#. i18n: ectx: label, entry (IPAFont), group (Appearance)
+#: rc.cpp:218
+msgid "The font used for phonetics"
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:311
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor3)
-#: rc.cpp:854
-msgid "Alt+3"
-msgstr "Alt+3"
+#. i18n: file: src/settings/parley.kcfg:219
+#. i18n: ectx: label, entry (CurrentCol), group (Appearance)
+#: rc.cpp:221
+msgid "Currently selected column"
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:343
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor2)
-#: rc.cpp:860
-msgid "Color for the grade 2"
+#. i18n: file: src/settings/parley.kcfg:223
+#. i18n: ectx: label, entry (CurrentRow), group (Appearance)
+#: rc.cpp:224
+msgid "Currently selected row"
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:346
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor2)
-#: rc.cpp:863
-msgid "Click here to change the color for grade 2."
+#. i18n: file: src/settings/parley.kcfg:227
+#. i18n: ectx: label, entry (UseGradeColors), group (Appearance)
+#: rc.cpp:227
+msgid "Use your own colors"
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:349
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor2)
-#: rc.cpp:866
-msgid "&2"
-msgstr "&2"
+#. i18n: file: src/settings/parley.kcfg:232
+#. i18n: ectx: label, entry (GradeColor$(Number)), group (Appearance)
+#: rc.cpp:230
+msgid "Colors used to display different grades"
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:352
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor2)
-#: rc.cpp:869
-msgid "Alt+2"
-msgstr "Alt+2"
+#. i18n: file: src/settings/parley.kcfg:247
+#. i18n: ectx: label, entry (PracticeMinimumTimesAsked), group (Thresholds)
+#: rc.cpp:233
+msgid ""
+"The entry must have been asked at least this often to be included in the "
+"practice."
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:384
-#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor1)
-#: rc.cpp:875
-msgid "Color for the grade 1"
+#. i18n: file: src/settings/parley.kcfg:251
+#. i18n: ectx: label, entry (PracticeMaximumTimesAsked), group (Thresholds)
+#: rc.cpp:236
+msgid ""
+"The entry must have been asked at most this often to be included in the "
+"practice."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:387
-#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor1)
-#: rc.cpp:878
-msgid "Click here to change the color for grade 1."
+#. i18n: file: src/settings/parley.kcfg:256
+#. i18n: ectx: label, entry (PracticeMinimumWrongCount), group (Thresholds)
+#: rc.cpp:239
+msgid ""
+"The entry must have been answered incorrectly at least this often to be "
+"included in the practice."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:390
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor1)
-#: rc.cpp:881
-msgid "&1"
-msgstr "&1"
+#. i18n: file: src/settings/parley.kcfg:260
+#. i18n: ectx: label, entry (PracticeMaximumWrongCount), group (Thresholds)
+#: rc.cpp:242
+msgid ""
+"The entry must have been answered incorrectly at most this often to be "
+"included in the practice."
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:393
-#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor1)
-#: rc.cpp:884
-msgid "Alt+1"
-msgstr "Alt+1"
+#. i18n: file: src/settings/parley.kcfg:265
+#. i18n: ectx: label, entry (PracticeMinimumGrade), group (Thresholds)
+#: rc.cpp:245
+msgid ""
+"The entry must have at least this grade to be included in the practice "
+"(0..7)."
+msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:406
-#. i18n: ectx: property (text), widget (QLabel, l_lev0)
-#: rc.cpp:887
-msgid "Not &practiced:"
+#. i18n: file: src/settings/parley.kcfg:269
+#. i18n: ectx: label, entry (PracticeMaximumGrade), group (Thresholds)
+#: rc.cpp:248
+msgid ""
+"The entry must have at most this grade to be included in the practice (0..7)."
 msgstr ""
 
-#. i18n: file: src/settings/viewoptionsbase.ui:425
-#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor0)
-#: rc.cpp:890
-msgid "&N"
-msgstr "&N"
+#. i18n: file: src/settings/parley.kcfg:273
+#. i18n: ectx: label, entry (WordTypesInPracticeEnabled), group (Thresholds)
+#: rc.cpp:251
+msgid "Only selected word types will be included in practice."
+msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:17
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:975
-msgid "Open/Save"
+#. i18n: file: src/settings/parley.kcfg:277
+#. i18n: ectx: label, entry (WordTypesInPractice), group (Thresholds)
+#. i18n: file: src/settings/parley.kcfg:278
+#. i18n: ectx: whatsthis, entry (WordTypesInPractice), group (Thresholds)
+#: rc.cpp:254 rc.cpp:257
+msgid "Selected word types for practices."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:23
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoOpenLast)
-#: rc.cpp:978
-msgid "Always open the collection that was active when quitting Parley"
+#. i18n: file: src/settings/parley.kcfg:281
+#. i18n: ectx: label, entry (SubWordTypesInPractice), group (Thresholds)
+#. i18n: file: src/settings/parley.kcfg:282
+#. i18n: ectx: whatsthis, entry (SubWordTypesInPractice), group (Thresholds)
+#: rc.cpp:260 rc.cpp:263
+msgid "Selected sub word types for practices."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:26
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoOpenLast)
-#: rc.cpp:981
-msgid ""
-"When this option is checked, the last active collection will be loaded "
-"automatically when starting Parley instead of showing the welcome screen."
+#. i18n: file: src/settings/parley.kcfg:288
+#. i18n: ectx: label, entry (QuestionLanguage), group (PracticeManager)
+#: rc.cpp:266
+msgid "The language that is displayed in a test."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:29
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoOpenLast)
-#: rc.cpp:984
-msgid "Always load the last opened collection on start"
+#. i18n: file: src/settings/parley.kcfg:292
+#. i18n: ectx: label, entry (SolutionLanguage), group (PracticeManager)
+#: rc.cpp:269
+msgid "The language in which the user has to answer."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:39
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoSave)
-#. i18n: file: src/settings/generaloptionsbase.ui:60
-#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoBackup)
-#: rc.cpp:987 rc.cpp:996
-msgid "Allow automatic saving of your work"
+#. i18n: file: src/settings/parley.kcfg:297
+#. i18n: ectx: label, entry (ShowSolutionAfterAnswer), group (PracticeManager)
+#: rc.cpp:272
+msgid "Show the solution after an answer was given."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:42
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoSave)
-#. i18n: file: src/settings/generaloptionsbase.ui:63
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoBackup)
-#: rc.cpp:990 rc.cpp:999
-msgid "Your work will be automatically saved if you check this option"
+#. i18n: file: src/settings/parley.kcfg:301
+#. i18n: ectx: label, entry (ShowSolutionAfterAnswerTime), group (PracticeManager)
+#: rc.cpp:275
+msgid "The time the solution is shown (seconds). 0 is unlimited."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:45
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoSave)
-#: rc.cpp:993
-msgid "&Save vocabularies automatically on close and quit"
+#. i18n: file: src/settings/parley.kcfg:316
+#. i18n: ectx: label, entry (PracticeMode), group (PracticeManager)
+#: rc.cpp:278
+msgid "The practice mode that is currently selected."
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:66
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoBackup)
-#: rc.cpp:1002
-msgid "&Create a backup every"
+#. i18n: file: src/settings/parley.kcfg:322
+#. i18n: ectx: label, entry (BlockItem$(Grade)), group (PracticeManager)
+#: rc.cpp:281
+msgid "Amount of time different grades should be blocked"
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:89
-#. i18n: ectx: property (text), widget (QLabel, lblBackupInterva)
-#: rc.cpp:1005
-msgid "minutes"
-msgstr "munudau"
-
-#. i18n: file: src/settings/generaloptionsbase.ui:103
-#. i18n: ectx: property (text), widget (QLabel, label_sep)
-#: rc.cpp:1008
-msgid "Sep&arator for text file import/export (CSV):"
+#. i18n: file: src/settings/parley.kcfg:333
+#. i18n: ectx: label, entry (ExpireItem$(Grade)), group (PracticeManager)
+#: rc.cpp:284
+msgid "Amount of time after which different grades should expire"
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:119
-#. i18n: ectx: property (toolTip), widget (KComboBox, kcfg_SeparatorCombo)
-#: rc.cpp:1011
-msgid ""
-"Choose which separator you want to use to separate your data when importing "
-"and exporting text."
+#. i18n: file: src/settings/parley.kcfg:345
+#. i18n: ectx: label, entry (ProvidersUrl), group (KNewStuff)
+#: rc.cpp:287
+msgid "The Providers path for Parley"
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:122
-#. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_SeparatorCombo)
-#: rc.cpp:1014
-msgid ""
-"Choose the separator to use to divide the parts of an expression when "
-"importing or exporting data as text."
+#. i18n: file: src/settings/parley.kcfg:349
+#. i18n: ectx: label, entry (InstallationCommand), group (KNewStuff)
+#: rc.cpp:290
+msgid "The command used to start a downloaded vocabulary"
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:147
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:1017
-msgid "Editing"
+#. i18n: file: src/settings/parley.kcfg:353
+#. i18n: ectx: label, entry (InstallPath), group (KNewStuff)
+#: rc.cpp:293
+msgid "The folder where downloaded vocabularies are saved by default"
 msgstr ""
 
-#. i18n: file: src/settings/generaloptionsbase.ui:165
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SmartAppend)
-#: rc.cpp:1020
-msgid "&Append new rows automatically when editing"
-msgstr ""
+#. i18n: file: src/settings/languagepropertiespage.ui:21
+#. i18n: ectx: attribute (title), widget (QWidget, tab)
+#: rc.cpp:300
+msgid "General"
+msgstr "Cyffredinol"
 
-#. i18n: file: src/settings/languagepropertiespage.ui:40
+#. i18n: file: src/settings/languagepropertiespage.ui:30
 #. i18n: ectx: property (text), widget (QLabel, nameLabel)
-#: rc.cpp:1029
+#: rc.cpp:303
 msgid "Name:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:56
+#. i18n: file: src/settings/languagepropertiespage.ui:46
 #. i18n: ectx: property (text), widget (QLabel, keyboardLayoutLabel)
-#: rc.cpp:1032
+#: rc.cpp:306
 msgid "Keyboard layout:"
 msgstr "Cynllun bysellfwrdd:"
 
-#. i18n: file: src/settings/languagepropertiespage.ui:82
+#. i18n: file: src/settings/languagepropertiespage.ui:75
 #. i18n: ectx: property (text), widget (QPushButton, downloadGrammarButton)
-#: rc.cpp:1035
+#: rc.cpp:309
 msgid "&Download Grammar"
 msgstr ""
 
 #. i18n: file: src/settings/languagepropertiespage.ui:88
 #. i18n: ectx: property (text), widget (QLabel, spellcheckerLabel)
-#: obj-i686-linux-gnu/src/ui_languagepropertiespage.h:693 rc.cpp:606
+#: rc.cpp:312
 msgid "Spell checker:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:27
+#. i18n: file: src/settings/languagepropertiespage.ui:101
 #. i18n: ectx: property (text), widget (QLabel, localeSelectionLabel)
-#: rc.cpp:1026
+#: rc.cpp:315
 msgid "Language:"
 msgstr ""
 
 #. i18n: file: src/settings/languagepropertiespage.ui:117
 #. i18n: ectx: property (text), widget (QLabel, fontLabel_2)
-#: obj-i686-linux-gnu/src/ui_languagepropertiespage.h:695 rc.cpp:612
+#: rc.cpp:318
 msgid "Font (practice):"
 msgstr ""
 
 #. i18n: file: src/settings/languagepropertiespage.ui:127
 #. i18n: ectx: property (text), widget (QLabel, fontLabel_3)
-#: obj-i686-linux-gnu/src/ui_languagepropertiespage.h:696 rc.cpp:615
+#: rc.cpp:321
 msgid "Font (editor):"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:21
-#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: rc.cpp:1023
-msgid "General"
-msgstr "Cyffredinol"
+#. i18n: file: src/settings/languagepropertiespage.ui:141
+#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
+#: rc.cpp:324
+msgid "Articles"
+msgstr "Erhyglau"
 
-#. i18n: file: src/settings/languagepropertiespage.ui:105
+#. i18n: file: src/settings/languagepropertiespage.ui:153
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3)
-#. i18n: file: src/settings/languagepropertiespage.ui:362
+#. i18n: file: src/settings/languagepropertiespage.ui:410
 #. i18n: ectx: property (text), widget (QLabel, TextLabel3_2)
-#: rc.cpp:1041 rc.cpp:1071
+#: rc.cpp:327 rc.cpp:357
 msgid "Definite"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:112
+#. i18n: file: src/settings/languagepropertiespage.ui:160
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4)
-#. i18n: file: src/settings/languagepropertiespage.ui:369
+#. i18n: file: src/settings/languagepropertiespage.ui:417
 #. i18n: ectx: property (text), widget (QLabel, TextLabel4_2)
-#: rc.cpp:1044 rc.cpp:1074
+#: rc.cpp:330 rc.cpp:360
 msgid "Indefinite"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:119
+#. i18n: file: src/settings/languagepropertiespage.ui:167
 #. i18n: ectx: property (text), widget (QLabel, male_label)
-#. i18n: file: src/settings/languagepropertiespage.ui:317
+#. i18n: file: src/settings/languagepropertiespage.ui:365
 #. i18n: ectx: property (text), widget (QLabel, male_label_2)
-#: rc.cpp:1047 rc.cpp:1062
+#: rc.cpp:333 rc.cpp:348
 msgid "&Male:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:142
+#. i18n: file: src/settings/languagepropertiespage.ui:190
 #. i18n: ectx: property (text), widget (QLabel, female_label)
-#. i18n: file: src/settings/languagepropertiespage.ui:304
+#. i18n: file: src/settings/languagepropertiespage.ui:352
 #. i18n: ectx: property (text), widget (QLabel, female_label_2)
-#: rc.cpp:1050 rc.cpp:1059
+#: rc.cpp:336 rc.cpp:345
 msgid "&Female:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:175
+#. i18n: file: src/settings/languagepropertiespage.ui:223
 #. i18n: ectx: property (text), widget (QLabel, natural_label)
-#. i18n: file: src/settings/languagepropertiespage.ui:291
+#. i18n: file: src/settings/languagepropertiespage.ui:339
 #. i18n: ectx: property (text), widget (QLabel, natural_label_2)
-#: rc.cpp:1053 rc.cpp:1056
+#: rc.cpp:339 rc.cpp:342
 msgid "&Neutral:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:93
-#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: rc.cpp:1038
-msgid "Articles"
-msgstr "Erhyglau"
+#. i18n: file: src/settings/languagepropertiespage.ui:378
+#. i18n: ectx: property (text), widget (QLabel, male_label_3)
+#. i18n: file: src/settings/languagepropertiespage.ui:492
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4_2_2)
+#. i18n: file: src/editor/conjugationwidget.ui:358
+#. i18n: ectx: property (text), widget (QLabel, singularLabel)
+#. i18n: file: src/editor/declensionwidget.ui:186
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:351 rc.cpp:366 rc.cpp:885 rc.cpp:933
+msgid "Singular"
+msgstr ""
+
+#. i18n: file: src/settings/languagepropertiespage.ui:391
+#. i18n: ectx: property (text), widget (QLabel, male_label_4)
+#. i18n: file: src/settings/languagepropertiespage.ui:506
+#. i18n: ectx: property (text), widget (QLabel, TextLabel4_3)
+#. i18n: file: src/editor/conjugationwidget.ui:396
+#. i18n: ectx: property (text), widget (QLabel, pluralLabel)
+#. i18n: file: src/editor/declensionwidget.ui:200
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:354 rc.cpp:372 rc.cpp:891 rc.cpp:939
+msgid "Plural"
+msgstr ""
+
+#. i18n: file: src/settings/languagepropertiespage.ui:457
+#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
+#: rc.cpp:363
+msgid "Personal Pronouns"
+msgstr ""
+
+#. i18n: file: src/settings/languagepropertiespage.ui:499
+#. i18n: ectx: property (text), widget (QLabel, dualLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:377
+#. i18n: ectx: property (text), widget (QLabel, dualLabel)
+#. i18n: file: src/editor/declensionwidget.ui:193
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:369 rc.cpp:888 rc.cpp:936
+msgid "Dual"
+msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:465
+#. i18n: file: src/settings/languagepropertiespage.ui:513
 #. i18n: ectx: property (text), widget (QLabel, pers1_label)
-#: rc.cpp:1089
+#: rc.cpp:375
 msgid "&1. Person:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:501
+#. i18n: file: src/settings/languagepropertiespage.ui:549
 #. i18n: ectx: property (text), widget (QLabel, pers2_label)
-#: rc.cpp:1092
+#: rc.cpp:378
 msgid "&2. Person:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:537
+#. i18n: file: src/settings/languagepropertiespage.ui:585
 #. i18n: ectx: property (text), widget (QLabel, pers3_label)
-#: rc.cpp:1095
+#: rc.cpp:381
 msgid "3. Person:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:547
+#. i18n: file: src/settings/languagepropertiespage.ui:595
 #. i18n: ectx: property (text), widget (QLabel, male_c_label)
-#: rc.cpp:1098
+#: rc.cpp:384
 msgid "M&ale:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:583
+#. i18n: file: src/settings/languagepropertiespage.ui:631
 #. i18n: ectx: property (text), widget (QLabel, female_c_label)
-#: rc.cpp:1101
+#: rc.cpp:387
 msgid "F&emale:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:619
+#. i18n: file: src/settings/languagepropertiespage.ui:667
 #. i18n: ectx: property (text), widget (QLabel, natural_c_label)
-#: rc.cpp:1104
+#: rc.cpp:390
 msgid "Neu&ter:"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:655
+#. i18n: file: src/settings/languagepropertiespage.ui:703
 #. i18n: ectx: property (text), widget (QCheckBox, dualCheckBox)
-#: rc.cpp:1107
+#: rc.cpp:393
 msgid "Dual conjugations"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:662
+#. i18n: file: src/settings/languagepropertiespage.ui:710
 #. i18n: ectx: property (text), widget (QCheckBox, neutralCheckBox)
-#: rc.cpp:1110
+#: rc.cpp:396
 msgid "A neutral conjugation form exists"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:675
+#. i18n: file: src/settings/languagepropertiespage.ui:723
 #. i18n: ectx: property (text), widget (QCheckBox, maleFemaleDifferCheckBox)
-#: rc.cpp:1113
+#: rc.cpp:399
 msgid "Male/female have different conjugations"
 msgstr ""
 
-#. i18n: file: src/settings/languagepropertiespage.ui:409
-#. i18n: ectx: attribute (title), widget (QWidget, tab_3)
-#: rc.cpp:1077
-msgid "Personal Pronouns"
-msgstr ""
-
 #. i18n: file: src/settings/documentproperties.ui:25
 #. i18n: ectx: property (title), widget (QGroupBox, tiltle_group)
-#: rc.cpp:896
+#: rc.cpp:417
 msgid "General Document Properties"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:37
 #. i18n: ectx: property (text), widget (QLabel, label_title)
-#: rc.cpp:899
+#: rc.cpp:420
 msgid "&Title:"
 msgstr "&Teitl:"
 
@@ -2877,387 +2412,575 @@
 #. i18n: ectx: property (toolTip), widget (KLineEdit, titleLineEdit)
 #. i18n: file: src/settings/documentproperties.ui:82
 #. i18n: ectx: property (toolTip), widget (KLineEdit, authorLineEdit)
-#: rc.cpp:902 rc.cpp:908
+#: rc.cpp:423 rc.cpp:429
 msgid "A title for your document."
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:63
 #. i18n: ectx: property (text), widget (QLabel, label_author)
-#: rc.cpp:905
+#: rc.cpp:426
 msgid "&Author:"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:89
 #. i18n: ectx: property (text), widget (QLabel, label_author_2)
-#: rc.cpp:911
+#: rc.cpp:432
 msgid "&Email:"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:108
 #. i18n: ectx: property (toolTip), widget (KLineEdit, contactLineEdit)
-#: rc.cpp:914
+#: rc.cpp:435
 msgid "A way to contact you (email or a webpage)."
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:115
 #. i18n: ectx: property (text), widget (QLabel, label_remark)
-#: rc.cpp:917
+#: rc.cpp:438
 msgid "&Comment:"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:134
 #. i18n: ectx: property (toolTip), widget (KTextEdit, commentTextEdit)
-#: rc.cpp:920
+#: rc.cpp:441
 msgid "Any additional information."
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:147
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:923
+#: rc.cpp:444
 msgid "Cat&egory"
 msgstr ""
 
+#. i18n: file: src/settings/documentproperties.ui:160
+#. i18n: ectx: property (toolTip), widget (KComboBox, categoryComboBox)
+#: rc.cpp:447
+msgid "A general category into which your document belongs."
+msgstr ""
+
 #. i18n: file: src/settings/documentproperties.ui:172
 #. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
-#: rc.cpp:932
+#: rc.cpp:453
 msgid "Music"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:177
 #. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
-#: rc.cpp:935
+#: rc.cpp:456
 msgid "Geography"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:182
 #. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
-#: rc.cpp:938
+#: rc.cpp:459
 msgid "Anatomy"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:187
 #. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
-#: rc.cpp:941
+#: rc.cpp:462
 msgid "History"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:192
 #. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
-#: rc.cpp:944
+#: rc.cpp:465
 msgid "Test Preparation"
 msgstr ""
 
-#. i18n: file: src/settings/documentproperties.ui:160
-#. i18n: ectx: property (toolTip), widget (KComboBox, categoryComboBox)
-#: rc.cpp:926
-msgid "A general category into which your document belongs."
-msgstr ""
-
 #. i18n: file: src/settings/documentproperties.ui:200
 #. i18n: ectx: property (text), widget (QLabel, label_license)
-#: rc.cpp:947
+#: rc.cpp:468
 msgid "&License:"
 msgstr "&Trwydded:"
 
-#. i18n: file: src/settings/documentproperties.ui:226
-#. i18n: ectx: property (text), item, widget (KComboBox, licenseComboBox)
-#: rc.cpp:957
-msgid "GPLv2+ (GNU General Public License version 2 or later)"
-msgstr ""
-
 #. i18n: file: src/settings/documentproperties.ui:214
 #. i18n: ectx: property (toolTip), widget (KComboBox, licenseComboBox)
-#: rc.cpp:950
+#: rc.cpp:471
 msgid ""
 "The license under which your document will be.\n"
 "If you consider contributing your file to KDE in the future, an appropriate "
 "license is required."
 msgstr ""
 
+#. i18n: file: src/settings/documentproperties.ui:226
+#. i18n: ectx: property (text), item, widget (KComboBox, licenseComboBox)
+#: rc.cpp:478
+msgid "GPLv2+ (GNU General Public License version 2 or later)"
+msgstr ""
+
 #. i18n: file: src/settings/documentproperties.ui:243
 #. i18n: ectx: property (text), widget (QLabel, label_language_1)
-#: rc.cpp:963
+#: rc.cpp:484
 msgid "&First language:"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:269
 #. i18n: ectx: property (text), widget (QLabel, label_language_2)
-#: rc.cpp:966
+#: rc.cpp:487
 msgid "&Second language:"
 msgstr ""
 
 #. i18n: file: src/settings/documentproperties.ui:298
 #. i18n: ectx: property (text), widget (QCheckBox, grammarCheckBox)
-#: rc.cpp:969
+#: rc.cpp:490
 msgid "&Setup Grammar Details"
 msgstr ""
 
-#: obj-i686-linux-gnu/src/ui_documentproperties.h:283
+#. i18n: file: src/settings/documentproperties.ui:308
+#. i18n: ectx: property (text), widget (QCheckBox, downloadGrammarCheckBox)
+#: rc.cpp:493
+msgctxt "Attept to download grammar properties for the selected languages"
 msgid "Download Grammar"
 msgstr ""
 
 #. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:40
 #. i18n: ectx: property (text), widget (QPushButton, getNewButton)
-#: rc.cpp:503
+#: rc.cpp:496
 msgid "&Get New Themes..."
 msgstr ""
 
+#. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:55
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#. i18n: file: src/editor/latexwidget.ui:37
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:499 rc.cpp:897
+msgid "Preview"
+msgstr ""
+
 #. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:97
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: rc.cpp:509
+#: rc.cpp:502
 msgid "Theme Details"
 msgstr ""
 
 #. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:131
 #. i18n: ectx: property (text), widget (QLabel, labelContact)
-#: rc.cpp:512
+#: rc.cpp:505
 msgid "Contact:"
 msgstr ""
 
 #. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:166
 #. i18n: ectx: property (text), widget (QLabel, labelDescription)
-#: rc.cpp:515
+#: rc.cpp:508
 msgid "Description:"
 msgstr ""
 
 #. i18n: file: src/settings/kgametheme/kgamethemeselector.ui:201
 #. i18n: ectx: property (text), widget (QLabel, labelAuthor)
-#: rc.cpp:518
+#: rc.cpp:511
 msgid "Author:"
 msgstr "Awdur:"
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:23
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:449
-msgid "Languages:"
+#. i18n: file: src/settings/languagesettings.kcfg:12
+#. i18n: ectx: label, entry (KeyboardLayout), group (Locale $(locale))
+#. i18n: file: src/settings/languagesettings.kcfg:13
+#. i18n: ectx: whatsthis, entry (KeyboardLayout), group (Locale $(locale))
+#: rc.cpp:514 rc.cpp:517
+msgid "Keyboard layout for this locale"
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:91
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:452
-msgid "Practice Mode:"
+#. i18n: file: src/settings/languagesettings.kcfg:17
+#. i18n: ectx: label, entry (SpellChecker), group (Locale $(locale))
+#. i18n: file: src/settings/languagesettings.kcfg:18
+#. i18n: ectx: whatsthis, entry (SpellChecker), group (Locale $(locale))
+#: rc.cpp:520 rc.cpp:523
+msgid "Spell checker for this language"
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:98
-#. i18n: ectx: property (text), widget (QRadioButton, flashCard)
-#. i18n: file: src/export/exportdialog.ui:42
-#. i18n: ectx: property (text), widget (QRadioButton, flashCardRadio)
-#: rc.cpp:455 rc.cpp:491
-msgid "Flash Cards"
+#. i18n: file: src/settings/languagesettings.kcfg:32
+#. i18n: ectx: label, entry (PracticeFont), group (Locale $(locale))
+#: rc.cpp:538
+msgid "The font used during practice"
+msgstr ""
+
+#. i18n: file: src/settings/languagesettings.kcfg:36
+#. i18n: ectx: label, entry (EditorFont), group (Locale $(locale))
+#: rc.cpp:541
+msgid "The font used in the editor"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:47
+#. i18n: ectx: property (whatsThis), widget (KFontRequester, kcfg_IPAFont)
+#: rc.cpp:546
+msgid ""
+"Specify which font to use for displaying pronunciations using phonetic "
+"symbols."
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:54
+#. i18n: ectx: property (text), widget (QLabel, IPAFontLabel)
+#: rc.cpp:549
+msgid "&Pronunciation symbols font:"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:75
+#. i18n: ectx: property (title), widget (QGroupBox, gradegroup)
+#: rc.cpp:552
+msgid "Grade Colors"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:81
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_UseGradeColors)
+#. i18n: file: src/settings/viewoptionsbase.ui:84
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_UseGradeColors)
+#: rc.cpp:555 rc.cpp:558
+msgid ""
+"If it is unchecked, you will just have black on white for the grades; if it "
+"is checked, the colors below will be chosen."
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:87
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_UseGradeColors)
+#: rc.cpp:561
+msgid "&Use colors"
+msgstr "&Defnyddio lliwiau"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:100
+#. i18n: ectx: property (text), widget (QLabel, l_lev7)
+#. i18n: file: src/configure-practice/blockoptions.ui:128
+#. i18n: ectx: property (text), widget (QLabel, l_lev7)
+#: rc.cpp:564 rc.cpp:1113
+msgid "Level &7:"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:119
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor7)
+#: rc.cpp:567
+msgid "Color for the grade 7"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:122
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor7)
+#: rc.cpp:570
+msgid "Click here to change the color for grade 7."
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:125
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor7)
+#: rc.cpp:573
+msgid "&7"
+msgstr "&7"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:128
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor7)
+#: rc.cpp:576
+msgid "Alt+7"
+msgstr "Alt+7"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:144
+#. i18n: ectx: property (text), widget (QLabel, l_lev6)
+#. i18n: file: src/configure-practice/blockoptions.ui:63
+#. i18n: ectx: property (text), widget (QLabel, l_lev6)
+#: rc.cpp:579 rc.cpp:1101
+msgid "Level &6:"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:163
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor6)
+#: rc.cpp:582
+msgid "Color for the grade 6"
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:166
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor6)
+#: rc.cpp:585
+msgid "Click here to change the color for grade 6."
+msgstr ""
+
+#. i18n: file: src/settings/viewoptionsbase.ui:169
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor6)
+#: rc.cpp:588
+msgid "&6"
+msgstr "&6"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:172
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor6)
+#: rc.cpp:591
+msgid "Alt+6"
+msgstr "Alt+6"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:185
+#. i18n: ectx: property (text), widget (QLabel, l_lev5)
+#. i18n: file: src/configure-practice/blockoptions.ui:53
+#. i18n: ectx: property (text), widget (QLabel, l_lev5)
+#: rc.cpp:594 rc.cpp:1098
+msgid "Level &5:"
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:108
-#. i18n: ectx: property (text), widget (QRadioButton, mixedLetters)
-#: rc.cpp:458
-msgid "Mixed Letters"
+#. i18n: file: src/settings/viewoptionsbase.ui:204
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor5)
+#: rc.cpp:597
+msgid "Color for the grade 5"
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:122
-#. i18n: ectx: property (text), widget (QRadioButton, written)
-#: rc.cpp:464
-msgid "Written"
+#. i18n: file: src/settings/viewoptionsbase.ui:207
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor5)
+#: rc.cpp:600
+msgid "Click here to change the color for grade 5."
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:132
-#. i18n: ectx: property (text), widget (QRadioButton, exampleSentence)
-#: rc.cpp:467
-msgid "Example Sentences"
-msgstr ""
+#. i18n: file: src/settings/viewoptionsbase.ui:210
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor5)
+#: rc.cpp:603
+msgid "&5"
+msgstr "&5"
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:142
-#. i18n: ectx: property (text), widget (QRadioButton, gender)
-#: rc.cpp:470
-msgid "Gender of Nouns"
-msgstr ""
+#. i18n: file: src/settings/viewoptionsbase.ui:213
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor5)
+#: rc.cpp:606
+msgid "Alt+5"
+msgstr "Alt+5"
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:152
-#. i18n: ectx: property (text), widget (QRadioButton, comparisonForms)
-#: rc.cpp:473
-msgid "Comparison Forms"
+#. i18n: file: src/settings/viewoptionsbase.ui:226
+#. i18n: ectx: property (text), widget (QLabel, l_lev4)
+#. i18n: file: src/configure-practice/blockoptions.ui:118
+#. i18n: ectx: property (text), widget (QLabel, l_lev4)
+#: rc.cpp:609 rc.cpp:1110
+msgid "Level &4:"
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsmainwindow.ui:162
-#. i18n: ectx: property (text), widget (QRadioButton, conjugations)
-#: rc.cpp:476
-msgid "Conjugations"
+#. i18n: file: src/settings/viewoptionsbase.ui:245
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor4)
+#: rc.cpp:612
+msgid "Color for the grade 4"
 msgstr ""
 
-#. i18n: file: src/welcomescreen/welcomescreen.ui:20
-#. i18n: ectx: property (text), widget (QLabel, headingLabel)
-#: rc.cpp:425
-msgid "<h1>Parley</h1>"
+#. i18n: file: src/settings/viewoptionsbase.ui:248
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor4)
+#: rc.cpp:615
+msgid "Click here to change the color for grade 4."
 msgstr ""
 
-#. i18n: file: src/welcomescreen/welcomescreen.ui:27
-#. i18n: ectx: property (text), widget (KPushButton, newButton)
-#: rc.cpp:428
-msgid "Create a New Collection"
-msgstr ""
+#. i18n: file: src/settings/viewoptionsbase.ui:251
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor4)
+#: rc.cpp:618
+msgid "&4"
+msgstr "&4"
 
-#. i18n: file: src/welcomescreen/welcomescreen.ui:34
-#. i18n: ectx: property (text), widget (KPushButton, openButton)
-#: rc.cpp:431
-msgid "Open an Existing Collection"
+#. i18n: file: src/settings/viewoptionsbase.ui:254
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor4)
+#: rc.cpp:621
+msgid "Alt+4"
+msgstr "Alt+4"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:267
+#. i18n: ectx: property (text), widget (QLabel, l_lev3)
+#. i18n: file: src/configure-practice/blockoptions.ui:192
+#. i18n: ectx: property (text), widget (QLabel, l_lev3)
+#: rc.cpp:624 rc.cpp:1119
+msgid "Level &3:"
 msgstr ""
 
-#. i18n: file: src/welcomescreen/welcomescreen.ui:41
-#. i18n: ectx: property (text), widget (KPushButton, ghnsButton)
-#: rc.cpp:434
-msgid "Download New Collections"
+#. i18n: file: src/settings/viewoptionsbase.ui:286
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor3)
+#: rc.cpp:627
+msgid "Color for the grade 3"
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:18
-#. i18n: ectx: property (text), widget (QLabel, label_3)
-#: rc.cpp:5
-msgid "Vocabulary collection:"
+#. i18n: file: src/settings/viewoptionsbase.ui:289
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor3)
+#: rc.cpp:630
+msgid "Click here to change the color for grade 3."
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:30
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: rc.cpp:8
-msgid "Language Selection"
+#. i18n: file: src/settings/viewoptionsbase.ui:292
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor3)
+#: rc.cpp:633
+msgid "&3"
+msgstr "&3"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:295
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor3)
+#: rc.cpp:636
+msgid "Alt+3"
+msgstr "Alt+3"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:308
+#. i18n: ectx: property (text), widget (QLabel, l_lev2)
+#. i18n: file: src/configure-practice/blockoptions.ui:40
+#. i18n: ectx: property (text), widget (QLabel, l_lev2)
+#: rc.cpp:639 rc.cpp:1095
+msgid "Level &2:"
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:38
-#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: rc.cpp:11
-msgid "Top:"
+#. i18n: file: src/settings/viewoptionsbase.ui:327
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor2)
+#: rc.cpp:642
+msgid "Color for the grade 2"
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:45
-#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: rc.cpp:14
-msgid "Bottom:"
+#. i18n: file: src/settings/viewoptionsbase.ui:330
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor2)
+#: rc.cpp:645
+msgid "Click here to change the color for grade 2."
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:87
-#. i18n: ectx: property (text), widget (QRadioButton, solutionOnHover)
-#: rc.cpp:20
-msgid "Reveal solution when mouse cursor is over the widget"
+#. i18n: file: src/settings/viewoptionsbase.ui:333
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor2)
+#: rc.cpp:648
+msgid "&2"
+msgstr "&2"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:336
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor2)
+#: rc.cpp:651
+msgid "Alt+2"
+msgstr "Alt+2"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:349
+#. i18n: ectx: property (text), widget (QLabel, l_lev1)
+#. i18n: file: src/configure-practice/blockoptions.ui:150
+#. i18n: ectx: property (text), widget (QLabel, l_lev1)
+#: rc.cpp:654 rc.cpp:1116
+msgid "Level &1:"
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:97
-#. i18n: ectx: property (text), widget (QRadioButton, solutionAlways)
-#: rc.cpp:23
-msgid "Always show the solution"
+#. i18n: file: src/settings/viewoptionsbase.ui:368
+#. i18n: ectx: property (toolTip), widget (KColorButton, kcfg_GradeColor1)
+#: rc.cpp:657
+msgid "Color for the grade 1"
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:112
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:26
-msgid "Update interval:"
+#. i18n: file: src/settings/viewoptionsbase.ui:371
+#. i18n: ectx: property (whatsThis), widget (KColorButton, kcfg_GradeColor1)
+#: rc.cpp:660
+msgid "Click here to change the color for grade 1."
 msgstr ""
 
-#. i18n: file: plasmoid/config.ui:153
-#. i18n: ectx: property (text), widget (KPushButton, fontSelectButton)
-#: rc.cpp:29
-msgid "Select Font..."
+#. i18n: file: src/settings/viewoptionsbase.ui:374
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor1)
+#: rc.cpp:663
+msgid "&1"
+msgstr "&1"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:377
+#. i18n: ectx: property (shortcut), widget (KColorButton, kcfg_GradeColor1)
+#: rc.cpp:666
+msgid "Alt+1"
+msgstr "Alt+1"
+
+#. i18n: file: src/settings/viewoptionsbase.ui:390
+#. i18n: ectx: property (text), widget (QLabel, l_lev0)
+#: rc.cpp:669
+msgid "Not &practiced:"
 msgstr ""
 
-#: rc.cpp:1
-msgctxt "NAME OF TRANSLATORS"
-msgid "Your names"
-msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:"
+#. i18n: file: src/settings/viewoptionsbase.ui:409
+#. i18n: ectx: property (text), widget (KColorButton, kcfg_GradeColor0)
+#: rc.cpp:672
+msgid "&N"
+msgstr "&N"
 
-#: rc.cpp:2
-msgctxt "EMAIL OF TRANSLATORS"
-msgid "Your emails"
-msgstr "kyfieithu@dotmon.com,,"
+#. i18n: file: src/settings/generaloptionsbase.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:675
+msgid "Open/Save"
+msgstr ""
 
-#. i18n: file: plugins/google_images.ui:49
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:32
-msgid "Give a keyword to search for an image related to it:"
+#. i18n: file: src/settings/generaloptionsbase.ui:23
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoOpenLast)
+#: rc.cpp:678
+msgid "Always open the collection that was active when quitting Parley"
 msgstr ""
 
-#. i18n: file: plugins/google_images.ui:61
-#. i18n: ectx: property (text), widget (QPushButton, searchButton)
-#: rc.cpp:35
-msgid "Search"
+#. i18n: file: src/settings/generaloptionsbase.ui:26
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoOpenLast)
+#: rc.cpp:681
+msgid ""
+"When this option is checked, the last active collection will be loaded "
+"automatically when starting Parley instead of showing the welcome screen."
 msgstr ""
 
-#. i18n: file: plugins/google_images.ui:72
-#. i18n: ectx: property (text), widget (QCheckBox, freeImageCheckBox)
-#: rc.cpp:38
-msgid "Free images only (creative commons, gpl, ...)"
+#. i18n: file: src/settings/generaloptionsbase.ui:29
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoOpenLast)
+#: rc.cpp:684
+msgid "Always load the last opened collection on start"
 msgstr ""
 
-#. i18n: file: plugins/google_images.ui:103
-#. i18n: ectx: property (text), widget (QPushButton, previousButton)
-#: rc.cpp:41
-msgid "Previous"
+#. i18n: file: src/settings/generaloptionsbase.ui:39
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoSave)
+#. i18n: file: src/settings/generaloptionsbase.ui:60
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AutoBackup)
+#: rc.cpp:687 rc.cpp:696
+msgid "Allow automatic saving of your work"
 msgstr ""
 
-#. i18n: file: plugins/google_images.ui:116
-#. i18n: ectx: property (text), widget (QPushButton, nextButton)
-#: rc.cpp:44
-msgid "Next"
+#. i18n: file: src/settings/generaloptionsbase.ui:42
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoSave)
+#. i18n: file: src/settings/generaloptionsbase.ui:63
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AutoBackup)
+#: rc.cpp:690 rc.cpp:699
+msgid "Your work will be automatically saved if you check this option"
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:50
-#. i18n: ectx: property (text), widget (QLabel, singularFirstPersonLabel)
-#: rc.cpp:383
-msgctxt "one of the seven cases (grammatical)"
-msgid "Nominative"
+#. i18n: file: src/settings/generaloptionsbase.ui:45
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoSave)
+#: rc.cpp:693
+msgid "&Save vocabularies automatically on close and quit"
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:72
-#. i18n: ectx: property (text), widget (QLabel, singularSecondPersonLabel)
-#: rc.cpp:386
-msgctxt "one of the seven cases (grammatical)"
-msgid "Genitive"
+#. i18n: file: src/settings/generaloptionsbase.ui:66
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AutoBackup)
+#: rc.cpp:702
+msgid "&Create a backup every"
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:91
-#. i18n: ectx: property (text), widget (QLabel, singularThirdMalePersonLabel)
-#: rc.cpp:389
-msgctxt "one of the seven cases (grammatical)"
-msgid "Dative"
+#. i18n: file: src/settings/generaloptionsbase.ui:89
+#. i18n: ectx: property (text), widget (QLabel, lblBackupInterva)
+#: rc.cpp:705
+msgid "minutes"
+msgstr "munudau"
+
+#. i18n: file: src/settings/generaloptionsbase.ui:103
+#. i18n: ectx: property (text), widget (QLabel, label_sep)
+#: rc.cpp:708
+msgid "Sep&arator for text file import/export (CSV):"
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:110
-#. i18n: ectx: property (text), widget (QLabel, singularThirdFemalePersonLabel)
-#: rc.cpp:392
-msgctxt "one of the seven cases (grammatical)"
-msgid "Accusative"
+#. i18n: file: src/settings/generaloptionsbase.ui:119
+#. i18n: ectx: property (toolTip), widget (KComboBox, kcfg_SeparatorCombo)
+#: rc.cpp:711
+msgid ""
+"Choose which separator you want to use to separate your data when importing "
+"and exporting text."
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:129
-#. i18n: ectx: property (text), widget (QLabel, singularThirdNeutralPersonLabel)
-#: rc.cpp:395
-msgctxt "one of the seven cases (grammatical)"
-msgid "Ablative"
+#. i18n: file: src/settings/generaloptionsbase.ui:122
+#. i18n: ectx: property (whatsThis), widget (KComboBox, kcfg_SeparatorCombo)
+#: rc.cpp:714
+msgid ""
+"Choose the separator to use to divide the parts of an expression when "
+"importing or exporting data as text."
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:148
-#. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:398
-msgctxt "one of the seven cases (grammatical)"
-msgid "Locative"
+#. i18n: file: src/settings/generaloptionsbase.ui:147
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:717
+msgid "Editing"
 msgstr ""
 
-#. i18n: file: src/editor/declensionwidget.ui:167
-#. i18n: ectx: property (text), widget (QLabel, label_2)
-#: rc.cpp:401
-msgctxt "one of the seven cases (grammatical)"
-msgid "Vocative"
+#. i18n: file: src/settings/generaloptionsbase.ui:165
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_SmartAppend)
+#: rc.cpp:720
+msgid "&Append new rows automatically when editing"
+msgstr ""
+
+#. i18n: file: src/editor/multiplechoicewidget.ui:21
+#. i18n: ectx: property (text), widget (QPushButton, addChoiceButton)
+#: rc.cpp:723
+msgid "Add"
 msgstr ""
 
-#. i18n: file: src/editor/editorui.rc:7
-#. i18n: ectx: Menu (file)
-#. i18n: file: src/statistics/statisticsui.rc:7
-#. i18n: ectx: Menu (file)
-#. i18n: file: src/practice/practicesummaryui.rc:7
-#. i18n: ectx: Menu (file)
-#. i18n: file: src/practice/practiceui.rc:7
-#. i18n: ectx: Menu (file)
-#: rc.cpp:260 rc.cpp:440 rc.cpp:1164 rc.cpp:1259
-msgid "&File"
+#. i18n: file: src/editor/multiplechoicewidget.ui:28
+#. i18n: ectx: property (text), widget (QPushButton, removeChoiceButton)
+#: rc.cpp:726
+msgid "Remove"
 msgstr ""
 
 #. i18n: file: src/editor/editorui.rc:12
 #. i18n: ectx: Menu (edit)
-#: rc.cpp:263
+#: rc.cpp:732
 msgid "&Edit"
 msgstr ""
 
@@ -3265,29 +2988,19 @@
 #. i18n: ectx: Menu (view)
 #. i18n: file: src/practice/practiceui.rc:12
 #. i18n: ectx: Menu (view)
-#: rc.cpp:266 rc.cpp:1262
+#: rc.cpp:735 rc.cpp:1149
 msgid "&View"
 msgstr ""
 
 #. i18n: file: src/editor/editorui.rc:50
 #. i18n: ectx: Menu (lesson)
-#: rc.cpp:269
+#: rc.cpp:738
 msgid "&Lesson"
 msgstr ""
 
-#. i18n: file: src/editor/editorui.rc:60
-#. i18n: ectx: Menu (learning)
-#. i18n: file: src/statistics/statisticsui.rc:12
-#. i18n: ectx: Menu (learning)
-#. i18n: file: src/practice/practicesummaryui.rc:12
-#. i18n: ectx: Menu (learning)
-#: rc.cpp:272 rc.cpp:443 rc.cpp:1167
-msgid "&Practice"
-msgstr ""
-
 #. i18n: file: src/editor/editorui.rc:65
 #. i18n: ectx: Menu (scripts)
-#: rc.cpp:275
+#: rc.cpp:744
 msgid "&Scripts"
 msgstr ""
 
@@ -3295,594 +3008,766 @@
 #. i18n: ectx: ToolBar (editorToolBar)
 #. i18n: file: src/parleyui.rc:27
 #. i18n: ectx: ToolBar (editorToolBar)
-#: rc.cpp:278 rc.cpp:1152
+#: rc.cpp:747 rc.cpp:987
 msgid "Editor Toolbar"
 msgstr ""
 
+#. i18n: file: src/editor/browserwidget.ui:18
+#. i18n: ectx: property (text), widget (QPushButton, showCurrentButton)
+#: rc.cpp:750
+msgid "Lookup Current"
+msgstr ""
+
+#. i18n: file: src/editor/browserwidget.ui:33
+#. i18n: ectx: property (text), widget (QCheckBox, followTableCheckBox)
+#: rc.cpp:753
+msgid "Follow Table"
+msgstr ""
+
 #. i18n: file: src/editor/FromToEntryPageForm.ui:26
 #. i18n: ectx: property (title), widget (QGroupBox, direc_label)
-#: rc.cpp:185
+#: rc.cpp:759
 msgid "Properties From Original"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:72
 #. i18n: ectx: property (text), widget (QLabel, grade_label)
-#: rc.cpp:188
+#: rc.cpp:762
 msgid "&Grade:"
 msgstr "&Gradd:"
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:95
 #. i18n: ectx: property (text), widget (QLabel, fauxami_label)
-#: rc.cpp:191
+#: rc.cpp:765
 msgid "&False friend:"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:110
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox3)
-#: rc.cpp:194
+#: rc.cpp:768
 msgid "Practice &Counts"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:142
 #. i18n: ectx: property (text), widget (QLabel, bcount_label)
-#: rc.cpp:197
+#: rc.cpp:771
 msgid "&Wrong:"
 msgstr "&Anghywir:"
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:155
 #. i18n: ectx: property (text), widget (QLabel, qcount_label)
-#: rc.cpp:200
+#: rc.cpp:774
 msgid "Tot&al:"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:171
 #. i18n: ectx: property (title), widget (QGroupBox, GroupBox2)
-#: rc.cpp:203
+#: rc.cpp:777
 msgid "&Last Practiced"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:183
 #. i18n: ectx: property (text), widget (QPushButton, never)
-#: rc.cpp:206
+#: rc.cpp:780
 msgid "&Never"
 msgstr "&Byth"
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:190
 #. i18n: ectx: property (text), widget (QPushButton, today)
-#: rc.cpp:209
+#: rc.cpp:783
 msgid "T&oday"
 msgstr "H&eddiw"
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:206
 #. i18n: ectx: property (toolTip), widget (QDateEdit, queryDateEdit)
-#: rc.cpp:212
+#: rc.cpp:786
 msgid "The date this expression was last practiced"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:209
 #. i18n: ectx: property (specialValueText), widget (QDateEdit, queryDateEdit)
-#: rc.cpp:215
+#: rc.cpp:789
 msgid "Not Practiced Yet"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:229
 #. i18n: ectx: property (displayFormat), widget (QDateEdit, queryDateEdit)
-#: rc.cpp:218
+#: rc.cpp:792
 msgid "dd.MM.yyyy"
 msgstr ""
 
 #. i18n: file: src/editor/FromToEntryPageForm.ui:260
 #. i18n: ectx: property (text), widget (QPushButton, resetGradesButton)
-#: rc.cpp:221
+#: rc.cpp:795
 msgid "&Reset Grades"
 msgstr ""
 
-#. i18n: file: src/parleyui.rc:19
-#. i18n: ectx: Menu (help)
-#: rc.cpp:1146
-msgid "&Help"
+#. i18n: file: src/editor/comparisonwidget.ui:24
+#. i18n: ectx: property (toolTip), widget (QLabel, absoluteLabel)
+#. i18n: file: src/editor/comparisonwidget.ui:56
+#. i18n: ectx: property (toolTip), widget (QLabel, comparativeLabel)
+#: rc.cpp:804 rc.cpp:810
+msgid "The comparative is used to compare nouns or verbs (faster)"
 msgstr ""
 
-#. i18n: file: src/parleyui.rc:24
-#. i18n: ectx: ToolBar (mainToolBar)
-#: rc.cpp:1149
-msgid "Main Toolbar"
+#. i18n: file: src/editor/comparisonwidget.ui:27
+#. i18n: ectx: property (text), widget (QLabel, absoluteLabel)
+#: rc.cpp:807
+msgid "Absolute:"
 msgstr ""
 
-#. i18n: file: src/parleyui.rc:35
-#. i18n: ectx: ToolBar (practiceToolBar)
-#. i18n: file: src/practice/practiceui.rc:18
-#. i18n: ectx: ToolBar (practiceToolBar)
-#: rc.cpp:1155 rc.cpp:1265
-msgid "Practice Toolbar"
+#. i18n: file: src/editor/comparisonwidget.ui:59
+#. i18n: ectx: property (text), widget (QLabel, comparativeLabel)
+#: rc.cpp:813
+msgid "Comparative:"
 msgstr ""
 
-#. i18n: file: src/statistics/statisticsui.rc:19
-#. i18n: ectx: ToolBar (statisticsToolBar)
-#. i18n: file: src/parleyui.rc:39
-#. i18n: ectx: ToolBar (statisticsToolBar)
-#: rc.cpp:446 rc.cpp:1158
-msgid "Statistics Toolbar"
+#. i18n: file: src/editor/comparisonwidget.ui:88
+#. i18n: ectx: property (toolTip), widget (QLabel, superlativeLabel)
+#: rc.cpp:816
+msgid "The superlative (fastest)"
 msgstr ""
 
-#. i18n: file: src/parleyui.rc:46
-#. i18n: ectx: ToolBar (practiceSummaryToolBar)
-#. i18n: file: src/practice/practicesummaryui.rc:19
-#. i18n: ectx: ToolBar (practiceSummaryToolBar)
-#: rc.cpp:1161 rc.cpp:1170
-msgid "Practice Summary Toolbar"
+#. i18n: file: src/editor/comparisonwidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, superlativeLabel)
+#: rc.cpp:819
+msgid "Superlative:"
 msgstr ""
 
-#. i18n: file: src/configure-practice/comparisonoptionswidget.ui:16
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ComparisonIncludeAdjective)
-#: rc.cpp:152
-msgid "Include Adjectives"
+#. i18n: file: src/editor/conjugationwidget.ui:38
+#. i18n: ectx: property (text), widget (QPushButton, makeVerbButton)
+#: rc.cpp:831
+msgid "Turn the selected word into a verb."
 msgstr ""
 
-#. i18n: file: src/configure-practice/comparisonoptionswidget.ui:23
-#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ComparisonIncludeAdverb)
-#: rc.cpp:155
-msgid "Include Adverbs"
+#. i18n: file: src/editor/conjugationwidget.ui:47
+#. i18n: ectx: property (text), widget (QLabel, singularFirstPersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:141
+#. i18n: ectx: property (text), widget (QLabel, dualFirstPersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:218
+#. i18n: ectx: property (text), widget (QLabel, pluralFirstPersonLabel)
+#: rc.cpp:834 rc.cpp:849 rc.cpp:864
+msgid "First"
+msgstr ""
+
+#. i18n: file: src/editor/conjugationwidget.ui:70
+#. i18n: ectx: property (text), widget (QLabel, singularSecondPersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:157
+#. i18n: ectx: property (text), widget (QLabel, dualSecondPersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:234
+#. i18n: ectx: property (text), widget (QLabel, pluralSecondPersonLabel)
+#: rc.cpp:837 rc.cpp:852 rc.cpp:867
+msgid "Second"
+msgstr ""
+
+#. i18n: file: src/editor/conjugationwidget.ui:93
+#. i18n: ectx: property (text), widget (QLabel, singularThirdMalePersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:173
+#. i18n: ectx: property (text), widget (QLabel, dualThirdMalePersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:250
+#. i18n: ectx: property (text), widget (QLabel, pluralThirdMalePersonLabel)
+#: rc.cpp:840 rc.cpp:855 rc.cpp:870
+msgid "Third Male"
+msgstr ""
+
+#. i18n: file: src/editor/conjugationwidget.ui:109
+#. i18n: ectx: property (text), widget (QLabel, singularThirdFemalePersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:186
+#. i18n: ectx: property (text), widget (QLabel, dualThirdFemalePersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:269
+#. i18n: ectx: property (text), widget (QLabel, pluralThirdFemalePersonLabel)
+#: rc.cpp:843 rc.cpp:858 rc.cpp:873
+msgid "Third Female"
+msgstr ""
+
+#. i18n: file: src/editor/conjugationwidget.ui:125
+#. i18n: ectx: property (text), widget (QLabel, singularThirdNeutralPersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:202
+#. i18n: ectx: property (text), widget (QLabel, dualThirdNeutralPersonLabel)
+#. i18n: file: src/editor/conjugationwidget.ui:288
+#. i18n: ectx: property (text), widget (QLabel, pluralThirdNeutralPersonLabel)
+#: rc.cpp:846 rc.cpp:861 rc.cpp:876
+msgid "Third Neutral"
+msgstr ""
+
+#. i18n: file: src/editor/conjugationwidget.ui:326
+#. i18n: ectx: property (text), widget (QPushButton, nextTenseButton)
+#: rc.cpp:879
+msgid "Ne&xt"
+msgstr "Ne&saf"
+
+#. i18n: file: src/editor/conjugationwidget.ui:339
+#. i18n: ectx: property (text), widget (QLabel, tenselabel)
+#: rc.cpp:882
+msgid "&Tense:"
+msgstr ""
+
+#. i18n: file: src/editor/latexwidget.ui:17
+#. i18n: ectx: property (text), widget (QLabel, texLabel)
+#: rc.cpp:894
+msgid "LaTeX code"
+msgstr ""
+
+#. i18n: file: src/editor/latexwidget.ui:57
+#. i18n: ectx: property (text), widget (QCheckBox, mathModeCheckBox)
+#: rc.cpp:900
+msgid "Math mode"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:31
+#. i18n: ectx: property (text), widget (QPushButton, makeNounButton)
+#: rc.cpp:906
+msgid "Turn the selected word into a noun."
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:44
+#. i18n: ectx: property (title), widget (QGroupBox, declensionGroupBox)
+#: rc.cpp:909
+msgid "Declension Forms"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:50
+#. i18n: ectx: property (text), widget (QLabel, singularFirstPersonLabel)
+#: rc.cpp:912
+msgctxt "one of the seven cases (grammatical)"
+msgid "Nominative"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:72
+#. i18n: ectx: property (text), widget (QLabel, singularSecondPersonLabel)
+#: rc.cpp:915
+msgctxt "one of the seven cases (grammatical)"
+msgid "Genitive"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:91
+#. i18n: ectx: property (text), widget (QLabel, singularThirdMalePersonLabel)
+#: rc.cpp:918
+msgctxt "one of the seven cases (grammatical)"
+msgid "Dative"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:110
+#. i18n: ectx: property (text), widget (QLabel, singularThirdFemalePersonLabel)
+#: rc.cpp:921
+msgctxt "one of the seven cases (grammatical)"
+msgid "Accusative"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:129
+#. i18n: ectx: property (text), widget (QLabel, singularThirdNeutralPersonLabel)
+#: rc.cpp:924
+msgctxt "one of the seven cases (grammatical)"
+msgid "Ablative"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:148
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:927
+msgctxt "one of the seven cases (grammatical)"
+msgid "Locative"
+msgstr ""
+
+#. i18n: file: src/editor/declensionwidget.ui:167
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:930
+msgctxt "one of the seven cases (grammatical)"
+msgid "Vocative"
+msgstr ""
+
+#. i18n: file: src/editor/audiowidget.ui:25
+#. i18n: ectx: property (text), widget (QPushButton, recordButton)
+#: rc.cpp:945
+msgid "Record"
+msgstr ""
+
+#. i18n: file: src/editor/summarywordwidget.ui:16
+#. i18n: ectx: property (text), widget (QLabel, languageLabel)
+#: rc.cpp:948
+msgid "Language"
+msgstr ""
+
+#. i18n: file: src/editor/summarywordwidget.ui:42
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:954
+msgid "Word type"
+msgstr ""
+
+#. i18n: file: src/export/exportdialog.ui:20
+#. i18n: ectx: property (text), widget (QRadioButton, flashCardRadio)
+#: rc.cpp:972
+msgid "Flash Cards - to print learning cards (HTML)"
+msgstr ""
+
+#. i18n: file: src/export/exportdialog.ui:30
+#. i18n: ectx: property (text), widget (QRadioButton, tableRadio)
+#: rc.cpp:975
+msgid ""
+"A vocabulary list that works in a web-browser and can be printed (HTML)"
+msgstr ""
+
+#. i18n: file: src/export/exportdialog.ui:40
+#. i18n: ectx: property (text), widget (QRadioButton, csvRadio)
+#: rc.cpp:978
+msgid "Comma separated values (CSV)"
+msgstr ""
+
+#. i18n: file: src/parleyui.rc:19
+#. i18n: ectx: Menu (help)
+#: rc.cpp:981
+msgid "&Help"
+msgstr ""
+
+#. i18n: file: src/parleyui.rc:24
+#. i18n: ectx: ToolBar (mainToolBar)
+#: rc.cpp:984
+msgid "Main Toolbar"
 msgstr ""
 
-#. i18n: file: src/export/exportdialog.ui:20
-#. i18n: ectx: property (text), widget (QRadioButton, flashCardRadio)
-#: rc.cpp:567
-msgid "Flash Cards - to print learning cards (HTML)"
+#. i18n: file: src/parleyui.rc:32
+#. i18n: ectx: ToolBar (practiceToolBar)
+#. i18n: file: src/practice/practiceui.rc:18
+#. i18n: ectx: ToolBar (practiceToolBar)
+#: rc.cpp:990 rc.cpp:1152
+msgid "Practice Toolbar"
 msgstr ""
 
-#. i18n: file: src/export/exportdialog.ui:30
-#. i18n: ectx: property (text), widget (QRadioButton, tableRadio)
-#: rc.cpp:570
-msgid ""
-"A vocabulary list that works in a web-browser and can be printed (HTML)"
+#. i18n: file: src/parleyui.rc:43
+#. i18n: ectx: ToolBar (practiceSummaryToolBar)
+#. i18n: file: src/practice/practicesummaryui.rc:19
+#. i18n: ectx: ToolBar (practiceSummaryToolBar)
+#: rc.cpp:996 rc.cpp:1161
+msgid "Practice Summary Toolbar"
 msgstr ""
 
-#. i18n: file: src/export/exportdialog.ui:40
-#. i18n: ectx: property (text), widget (QRadioButton, csvRadio)
-#: rc.cpp:573
-msgid "Comma separated values (CSV)"
+#. i18n: file: src/configure-practice/thresholdoptions.ui:17
+#. i18n: ectx: property (text), widget (QLabel, label_8)
+#: rc.cpp:999
+msgid "Only practice vocabulary that fulfills the following conditions:"
 msgstr ""
 
-#. i18n: file: src/settings/documentproperties.ui:308
-#. i18n: ectx: property (text), widget (QCheckBox, downloadGrammarCheckBox)
-#: rc.cpp:972
-msgctxt "Attept to download grammar properties for the selected languages"
-msgid "Download Grammar"
+#. i18n: file: src/configure-practice/thresholdoptions.ui:26
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1002
+msgid "At least"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:11
-#. i18n: ectx: label, entry (Theme), group (General)
-#: rc.cpp:536
-msgid "Theme to use for practice and welcome screen"
+#. i18n: file: src/configure-practice/thresholdoptions.ui:33
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1005
+msgid "At most"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:15
-#. i18n: ectx: label, entry (NumPreSetting), group (General)
-#: rc.cpp:539
-msgid "Number of stored setting profiles"
+#. i18n: file: src/configure-practice/thresholdoptions.ui:43
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1008
+msgid "Grade"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:19
-#. i18n: ectx: label, entry (SmartAppend), group (General)
-#: rc.cpp:542
-msgid ""
-"If true, when using the entry dialog, new rows will be appended as needed"
+#. i18n: file: src/configure-practice/thresholdoptions.ui:53
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1011
+msgid "Times practiced"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:23
-#. i18n: ectx: label, entry (Separator), group (General)
-#: rc.cpp:545
-msgid ""
-"This sets the separator used when copying/pasting text, default is Tab"
+#. i18n: file: src/configure-practice/thresholdoptions.ui:80
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:1014
+msgid "Answered incorrectly"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:27
-#. i18n: ectx: label, entry (EntriesPerLesson), group (General)
-#: rc.cpp:548
-msgid "The number of entries per lesson"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_3)
+#: rc.cpp:1017
+msgid "Correction"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:31
-#. i18n: ectx: label, entry (AutoOpenLast), group (General)
-#: rc.cpp:551
-msgid ""
-"If true, on each application start the last opened file will be loaded"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:23
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_IgnoreAccentMistakes)
+#: rc.cpp:1020
+msgid "Answers with wrong accents are still counted as correct."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:35
-#. i18n: ectx: label, entry (AutoSave), group (General)
-#: rc.cpp:554
-msgid "If true, vocabularies are automatically saved on close and exit"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:26
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreAccentMistakes)
+#: rc.cpp:1023
+msgid "Ignore Accents"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:42
-#. i18n: ectx: label, entry (AutoBackup), group (General)
-#: rc.cpp:557
-msgid "If true, a backup is saved every BackupTime minutes"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:36
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_IgnoreCapitalizationMistakes)
+#: rc.cpp:1026
+msgid "Any captitalization in the answer is counted as correct."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:46
-#. i18n: ectx: label, entry (BackupTime), group (General)
-#: rc.cpp:560
-msgid "Time interval between two automatic backups"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:39
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_IgnoreCapitalizationMistakes)
+#: rc.cpp:1029
+msgid "Ignore Capitalization"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:57
-#. i18n: ectx: label, entry (FlashcardsFrontImage), group (PracticeOptions)
-#: rc.cpp:566
-msgid "Show images on the front of the flashcard."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:49
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_ShowHints)
+#: rc.cpp:1032
+msgid ""
+"During the practice you can use the hint button to see parts of the solution."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:61
-#. i18n: ectx: label, entry (FlashcardsBackImage), group (PracticeOptions)
-#: rc.cpp:569
-msgid "Show images on the back of the flashcard."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:52
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ShowHints)
+#: rc.cpp:1035
+msgid "Enable Hints"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:65
-#. i18n: ectx: label, entry (Block), group (PracticeOptions)
-#: rc.cpp:572
-msgid "In Blocking Query Tab Dialog, if checked then the Query is blocked"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:62
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_AltLearn)
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:65
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_AltLearn)
+#: rc.cpp:1038 rc.cpp:1041
+msgid ""
+"Requires you to answer each question correctly 3 times in a row for it to be "
+"counted as correct."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:69
-#. i18n: ectx: label, entry (Expire), group (PracticeOptions)
-#: rc.cpp:575
-msgid ""
-"In Blocking Query Tab Dialog, if checked then the Query accepts an expiring "
-"time"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:68
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_AltLearn)
+#: rc.cpp:1044
+msgid "Require 3 consecutive correct answers"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:73
-#. i18n: ectx: label, entry (AltLearn), group (PracticeOptions)
-#: rc.cpp:578
-msgid "Use the Leitner learning method"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:78
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_4)
+#: rc.cpp:1047
+msgid "Images and Sound"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:77
-#. i18n: ectx: label, entry (TestOrderLesson), group (PracticeOptions)
-#: rc.cpp:581
-msgid ""
-"Append new vocabulary in a test in order of their lessons. Note that this "
-"will not be a hard transition, but a slow mix from one lesson to the next."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:84
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FlashcardsFrontImage)
+#: rc.cpp:1050
+msgid "During the practice, images are shown for the question."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:81
-#. i18n: ectx: label, entry (TestNumberOfEntries), group (PracticeOptions)
-#: rc.cpp:584
-msgid ""
-"The number of entries that are practiced at the same time. If one of these "
-"is answered correctly another entry will be appended."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:87
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_FlashcardsFrontImage)
+#: rc.cpp:1053
+msgid "Image for Question"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:85
-#. i18n: ectx: label, entry (SwapDirection), group (PracticeOptions)
-#: rc.cpp:587
-msgid "Swap direction randomly"
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:97
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_FlashcardsBackImage)
+#: rc.cpp:1056
+msgid "During the practice, images are shown for the solution."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:90
-#. i18n: ectx: label, entry (PracticeTimeout), group (PracticeOptions)
-#: rc.cpp:590
-msgid "Limit the time for the user to answer in a test."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:100
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_FlashcardsBackImage)
+#: rc.cpp:1059
+msgid "Image for Solution"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:94
-#. i18n: ectx: label, entry (PracticeTimeoutMode), group (PracticeOptions)
-#: rc.cpp:593
-msgid ""
-"Show - show the solution after the given time; Continue - go to the next "
-"question after the given time."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:110
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_PracticeSoundEnabled)
+#: rc.cpp:1062
+msgid "Enable playing of pronunciation sound files during the practice."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:102
-#. i18n: ectx: label, entry (PracticeTimeoutTimePerAnswer), group (PracticeOptions)
-#: rc.cpp:596
-msgid "Maximum time allowed to answer."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:148
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1071
+msgid ""
+"By default you are asked to enter synonyms until you enter the one that is "
+"associated directly with the current word. With this option enabled any "
+"synonym is accepted."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:107
-#. i18n: ectx: label, entry (Suggestions), group (PracticeOptions)
-#: rc.cpp:599
-msgid "Enable suggestion lists in written practice."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:158
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_CountSynonymsAsCorrect)
+#: rc.cpp:1074
+msgid "Accept any Synonym"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:111
-#. i18n: ectx: label, entry (ShowHints), group (PracticeOptions)
-#: rc.cpp:602
-msgid "Enable the showing of hints."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:174
+#. i18n: ectx: property (toolTip), widget (QCheckBox, kcfg_MultipleChoiceWordTypeConsistancy)
+#: rc.cpp:1080
+msgid ""
+"When creating multiple choice practices, try to show answers of the same "
+"word type."
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:115
-#. i18n: ectx: label, entry (IgnoreAccentMistakes), group (PracticeOptions)
-#: rc.cpp:605
-msgid "Count answers as right when only the accentuation is wrong."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:177
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_MultipleChoiceWordTypeConsistancy)
+#: rc.cpp:1083
+msgid "Use choices of the same word type"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:119
-#. i18n: ectx: label, entry (IgnoreCapitalizationMistakes), group (PracticeOptions)
-#: rc.cpp:608
-msgid "Count answers as right when only the capitalization is wrong."
+#. i18n: file: src/configure-practice/advancedpracticeoptions.ui:192
+#. i18n: ectx: property (text), widget (QLabel, label_4)
+#: rc.cpp:1086
+msgid "Number of choices:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:124
-#. i18n: ectx: label, entry (SplitTranslations), group (PracticeOptions)
-#: rc.cpp:611
-msgid "Split translations in written practice."
+#. i18n: file: src/configure-practice/comparisonoptionswidget.ui:16
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ComparisonIncludeAdjective)
+#: rc.cpp:1089
+msgid "Include Adjectives"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:128
-#. i18n: ectx: label, entry (Periods), group (PracticeOptions)
-#: rc.cpp:614
-msgid "Split translations at periods."
+#. i18n: file: src/configure-practice/comparisonoptionswidget.ui:23
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_ComparisonIncludeAdverb)
+#: rc.cpp:1092
+msgid "Include Adverbs"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:132
-#. i18n: ectx: label, entry (Colons), group (PracticeOptions)
-#: rc.cpp:617
-msgid "Split translations at colons."
+#. i18n: file: src/configure-practice/blockoptions.ui:79
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Expire)
+#: rc.cpp:1104
+msgid "E&xpiring"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:136
-#. i18n: ectx: label, entry (Semicolons), group (PracticeOptions)
-#: rc.cpp:620
-msgid "Split translations at semicolons."
+#. i18n: file: src/configure-practice/blockoptions.ui:95
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_Block)
+#: rc.cpp:1107
+msgid "Bl&ocking"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:140
-#. i18n: ectx: label, entry (Commas), group (PracticeOptions)
-#: rc.cpp:623
-msgid "Split translations at commas."
+#. i18n: file: src/configure-practice/blockoptions.ui:218
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1122
+msgid "Do not practice vocabulary that has been asked within:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:146
-#. i18n: ectx: label, entry (ShowMore), group (PracticeOptions)
-#: rc.cpp:626
-msgid ""
-"Enable Show More button to reveal parts of the solution in written practice."
+#. i18n: file: src/configure-practice/blockoptions.ui:228
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1125
+msgid "Vocabulary drops one grade after this much time:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:150
-#. i18n: ectx: label, entry (SkipKnownEnabled), group (PracticeOptions)
-#: rc.cpp:629
-msgid "Enable Skip (I Know It) button in written practice."
+#. i18n: file: src/welcomescreen/welcomescreen.ui:20
+#. i18n: ectx: property (text), widget (QLabel, headingLabel)
+#: rc.cpp:1131
+msgid "<h1>Parley</h1>"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:154
-#. i18n: ectx: label, entry (CountSynonymsAsCorrect), group (PracticeOptions)
-#: rc.cpp:632
-msgid ""
-"When the synonym instead of the word was entered, does it count as correct?"
+#. i18n: file: src/welcomescreen/welcomescreen.ui:27
+#. i18n: ectx: property (text), widget (KPushButton, newButton)
+#: rc.cpp:1134
+msgid "Create a New Collection"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:158
-#. i18n: ectx: label, entry (PracticeImagesEnabled), group (PracticeOptions)
-#: rc.cpp:635
-msgid "Enable image display in the practice dialogs."
+#. i18n: file: src/welcomescreen/welcomescreen.ui:34
+#. i18n: ectx: property (text), widget (KPushButton, openButton)
+#: rc.cpp:1137
+msgid "Open an Existing Collection"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:162
-#. i18n: ectx: label, entry (PracticeSoundEnabled), group (PracticeOptions)
-#: rc.cpp:638
-msgid "Enable sound playback in the practice dialogs."
+#. i18n: file: src/welcomescreen/welcomescreen.ui:41
+#. i18n: ectx: property (text), widget (KPushButton, ghnsButton)
+#: rc.cpp:1140
+msgid "Download New Collections"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:166
-#. i18n: ectx: label, entry (MultipleChoiceWordTypeConsistancy), group (PracticeOptions)
-#: rc.cpp:641
-msgid ""
-"Use the same word type as the solution for the incorrect answers in a "
-"multiple choice practice."
+#. i18n: file: src/practice/practice_widget_comparison.ui:32
+#. i18n: ectx: property (text), widget (QLabel, absoluteLabel)
+#: rc.cpp:1164
+msgid "absolute"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:170
-#. i18n: ectx: label, entry (NumberMultipleChoiceAnswers), group (PracticeOptions)
-#: rc.cpp:644
-msgid ""
-"How many answers are provided for a multiple choice question, including the "
-"correct answer."
+#. i18n: file: src/practice/practice_widget_comparison.ui:74
+#. i18n: ectx: property (text), widget (QLabel, comparativeLabel)
+#: rc.cpp:1167
+msgid "comparative"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:177
-#. i18n: ectx: label, entry (ShowSearch), group (Appearance)
-#: rc.cpp:647
-msgid "Toggle display of the search bar."
+#. i18n: file: src/practice/practice_widget_comparison.ui:116
+#. i18n: ectx: property (text), widget (QLabel, superlativeLabel)
+#: rc.cpp:1170
+msgid "superlative"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:182
-#. i18n: ectx: label, entry (ShowSublessonentries), group (Appearance)
-#: rc.cpp:650
-msgid "When enabled a lesson also shows entries from its sublessons."
+#. i18n: file: src/practice/entryfilter.ui:16
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1173
+msgid ""
+"<p>Your selection of vocabulary for the practice is empty.</p><p>Below you "
+"can choose to ignore some of your configuration settings to start a practice "
+"anyway.</p>"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:187
-#. i18n: ectx: label, entry (TableLessonColumnVisible), group (Appearance)
-#: rc.cpp:653
-msgid "Show/hide the lesson column."
+#. i18n: file: src/practice/entryfilter.ui:26
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1176
+msgid "Ignore Configuration for:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:192
-#. i18n: ectx: label, entry (TableActiveColumnVisible), group (Appearance)
-#: rc.cpp:656
-msgid "Show/hide the active column."
+#. i18n: file: src/practice/entryfilter.ui:32
+#. i18n: ectx: property (text), widget (QCheckBox, lessonCheckBox)
+#: rc.cpp:1179
+msgid "Ignore Lessons"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:197
-#. i18n: ectx: label, entry (LessonEditingSelection), group (Appearance)
-#: rc.cpp:659
-msgid "Select which lessons are displayed for editing"
+#. i18n: file: src/practice/entryfilter.ui:52
+#. i18n: ectx: property (text), widget (QCheckBox, wordTypeCheckBox)
+#: rc.cpp:1182
+msgid "Ignore Word Types"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:207
-#. i18n: ectx: label, entry (MainWindowSplitter), group (Appearance)
-#: rc.cpp:662
-msgid "How the main window is divided."
+#. i18n: file: src/practice/entryfilter.ui:72
+#. i18n: ectx: property (text), widget (QCheckBox, blockedCheckBox)
+#: rc.cpp:1185
+msgid "Ignore Blocked"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:211
-#. i18n: ectx: label, entry (TableFont), group (Appearance)
-#: rc.cpp:665
-msgid "The font used in the vocabulary table"
+#. i18n: file: src/practice/entryfilter.ui:92
+#. i18n: ectx: property (text), widget (QCheckBox, timesWrongCheckBox)
+#: rc.cpp:1188
+msgid "Ignore Times Answered Incorrectly"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:215
-#. i18n: ectx: label, entry (IPAFont), group (Appearance)
-#: rc.cpp:668
-msgid "The font used for phonetics"
+#. i18n: file: src/practice/entryfilter.ui:112
+#. i18n: ectx: property (text), widget (QCheckBox, timesPracticedCheckBox)
+#: rc.cpp:1191
+msgid "Ignore Times Practiced"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:219
-#. i18n: ectx: label, entry (CurrentCol), group (Appearance)
-#: rc.cpp:671
-msgid "Currently selected column"
+#. i18n: file: src/practice/entryfilter.ui:132
+#. i18n: ectx: property (text), widget (QCheckBox, minMaxGradeCheckBox)
+#: rc.cpp:1194
+msgid "Ignore Minimum/Maximum Grade"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:223
-#. i18n: ectx: label, entry (CurrentRow), group (Appearance)
-#: rc.cpp:674
-msgid "Currently selected row"
+#. i18n: file: src/practice/entryfilter.ui:152
+#. i18n: ectx: property (text), widget (QLabel, lessonLabel_2)
+#: rc.cpp:1197
+msgid "Words"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:227
-#. i18n: ectx: label, entry (UseGradeColors), group (Appearance)
-#: rc.cpp:677
-msgid "Use your own colors"
+#. i18n: file: src/practice/entryfilter.ui:167
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: rc.cpp:1200
+msgid "Total number of entries:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:232
-#. i18n: ectx: label, entry (GradeColor$(Number)), group (Appearance)
-#: rc.cpp:680
-msgid "Colors used to display different grades"
+#. i18n: file: src/practice/entryfilter.ui:188
+#. i18n: ectx: property (text), widget (QLabel, label_9)
+#: rc.cpp:1203
+msgid "Resulting number of words to practice:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:247
-#. i18n: ectx: label, entry (PracticeMinimumTimesAsked), group (Thresholds)
-#: rc.cpp:683
-msgid ""
-"The entry must have been asked at least this often to be included in the "
-"practice."
+#. i18n: file: src/practice/practicesummarywidget.ui:28
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:1206
+msgid "Attempts"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:251
-#. i18n: ectx: label, entry (PracticeMaximumTimesAsked), group (Thresholds)
-#: rc.cpp:686
-msgid ""
-"The entry must have been asked at most this often to be included in the "
-"practice."
+#. i18n: file: src/practice/practicesummarywidget.ui:33
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:1209
+msgid "Question"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:256
-#. i18n: ectx: label, entry (PracticeMinimumWrongCount), group (Thresholds)
-#: rc.cpp:689
-msgid ""
-"The entry must have been answered incorrectly at least this often to be "
-"included in the practice."
+#. i18n: file: src/practice/practicesummarywidget.ui:38
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#. i18n: file: plasmoid/config.ui:81
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1212 rc.cpp:1252
+msgid "Solution"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:260
-#. i18n: ectx: label, entry (PracticeMaximumWrongCount), group (Thresholds)
-#: rc.cpp:692
-msgid ""
-"The entry must have been answered incorrectly at most this often to be "
-"included in the practice."
+#. i18n: file: src/practice/practicesummarywidget.ui:43
+#. i18n: ectx: property (text), widget (QTableWidget, tableWidget)
+#: rc.cpp:1215
+msgid "Your Answer"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:265
-#. i18n: ectx: label, entry (PracticeMinimumGrade), group (Thresholds)
-#: rc.cpp:695
-msgid ""
-"The entry must have at least this grade to be included in the practice "
-"(0..7)."
+#. i18n: file: src/practice/practice_mainwindow.ui:118
+#. i18n: ectx: property (toolTip), widget (QPushButton, answerLaterButton)
+#: rc.cpp:1218
+msgid "Skip this word for now and ask again later"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:269
-#. i18n: ectx: label, entry (PracticeMaximumGrade), group (Thresholds)
-#: rc.cpp:698
-msgid ""
-"The entry must have at most this grade to be included in the practice (0..7)."
+#. i18n: file: src/practice/practice_mainwindow.ui:121
+#. i18n: ectx: property (text), widget (QPushButton, answerLaterButton)
+#: rc.cpp:1221
+msgid "Answer Later"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:273
-#. i18n: ectx: label, entry (WordTypesInPracticeEnabled), group (Thresholds)
-#: rc.cpp:701
-msgid "Only selected word types will be included in practice."
+#. i18n: file: src/practice/practice_mainwindow.ui:131
+#. i18n: ectx: property (text), widget (QPushButton, hintButton)
+#: rc.cpp:1224
+msgid "Hint"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:277
-#. i18n: ectx: label, entry (WordTypesInPractice), group (Thresholds)
-#. i18n: file: src/settings/parley.kcfg:278
-#. i18n: ectx: whatsthis, entry (WordTypesInPractice), group (Thresholds)
-#: rc.cpp:704 rc.cpp:707
-msgid "Selected word types for practices."
+#. i18n: file: src/practice/practice_mainwindow.ui:192
+#. i18n: ectx: property (text), widget (QPushButton, continueButton)
+#: rc.cpp:1227
+msgid "Continue"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:281
-#. i18n: ectx: label, entry (SubWordTypesInPractice), group (Thresholds)
-#. i18n: file: src/settings/parley.kcfg:282
-#. i18n: ectx: whatsthis, entry (SubWordTypesInPractice), group (Thresholds)
-#: rc.cpp:710 rc.cpp:713
-msgid "Selected sub word types for practices."
+#. i18n: file: src/practice/practice_mainwindow.ui:209
+#. i18n: ectx: property (text), widget (QPushButton, countAsWrongButton)
+#: rc.cpp:1230
+msgid "I did not know it"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:288
-#. i18n: ectx: label, entry (QuestionLanguage), group (PracticeManager)
-#: rc.cpp:716
-msgid "The language that is displayed in a test."
+#. i18n: file: src/practice/practice_mainwindow.ui:216
+#. i18n: ectx: property (text), widget (QPushButton, countAsCorrectButton)
+#: rc.cpp:1233
+msgid "I knew it"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:292
-#. i18n: ectx: label, entry (SolutionLanguage), group (PracticeManager)
-#: rc.cpp:719
-msgid "The language in which the user has to answer."
+#. i18n: file: src/practice/practice_mainwindow.ui:290
+#. i18n: ectx: property (format), widget (QProgressBar, totalProgress)
+#: rc.cpp:1237
+#, no-c-format
+msgid "%v/%m"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:297
-#. i18n: ectx: label, entry (ShowSolutionAfterAnswer), group (PracticeManager)
-#: rc.cpp:722
-msgid "Show the solution after an answer was given."
+#. i18n: file: plasmoid/config.ui:18
+#. i18n: ectx: property (text), widget (QLabel, label_3)
+#: rc.cpp:1240
+msgid "Vocabulary collection:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:301
-#. i18n: ectx: label, entry (ShowSolutionAfterAnswerTime), group (PracticeManager)
-#: rc.cpp:725
-msgid "The time the solution is shown (seconds). 0 is unlimited."
+#. i18n: file: plasmoid/config.ui:30
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: rc.cpp:1243
+msgid "Language Selection"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:316
-#. i18n: ectx: label, entry (PracticeMode), group (PracticeManager)
-#: rc.cpp:728
-msgid "The practice mode that is currently selected."
+#. i18n: file: plasmoid/config.ui:38
+#. i18n: ectx: property (text), widget (QLabel, label_5)
+#: rc.cpp:1246
+msgid "Top:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:322
-#. i18n: ectx: label, entry (BlockItem$(Grade)), group (PracticeManager)
-#: rc.cpp:731
-msgid "Amount of time different grades should be blocked"
+#. i18n: file: plasmoid/config.ui:45
+#. i18n: ectx: property (text), widget (QLabel, label_6)
+#: rc.cpp:1249
+msgid "Bottom:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:333
-#. i18n: ectx: label, entry (ExpireItem$(Grade)), group (PracticeManager)
-#: rc.cpp:734
-msgid "Amount of time after which different grades should expire"
+#. i18n: file: plasmoid/config.ui:87
+#. i18n: ectx: property (text), widget (QRadioButton, solutionOnHover)
+#: rc.cpp:1255
+msgid "Reveal solution when mouse cursor is over the widget"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:345
-#. i18n: ectx: label, entry (ProvidersUrl), group (KNewStuff)
-#: rc.cpp:737
-msgid "The Providers path for Parley"
+#. i18n: file: plasmoid/config.ui:97
+#. i18n: ectx: property (text), widget (QRadioButton, solutionAlways)
+#: rc.cpp:1258
+msgid "Always show the solution"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:349
-#. i18n: ectx: label, entry (InstallationCommand), group (KNewStuff)
-#: rc.cpp:740
-msgid "The command used to start a downloaded vocabulary"
+#. i18n: file: plasmoid/config.ui:112
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: rc.cpp:1261
+msgid "Update interval:"
 msgstr ""
 
-#. i18n: file: src/settings/parley.kcfg:353
-#. i18n: ectx: label, entry (InstallPath), group (KNewStuff)
-#: rc.cpp:743
-msgid "The folder where downloaded vocabularies are saved by default"
+#. i18n: file: plasmoid/config.ui:153
+#. i18n: ectx: property (text), widget (KPushButton, fontSelectButton)
+#: rc.cpp:1264
+msgid "Select Font..."
 msgstr ""
 
 #. i18n: file: tips:2
@@ -3991,6 +3876,16 @@
 "ml2.php</a>.</p>\n"
 msgstr ""
 
+#: plasmoid/parley_plasma.cpp:183
+msgid " second"
+msgid_plural " seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: plasmoid/parley_plasma.cpp:187
+msgid "*.kvtml|Vocabulary Collections"
+msgstr ""
+
 #: plugins/google_images.py:46
 msgid ""
 "Error: ui file not found.\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/phononserver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/phononserver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/phononserver.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/phononserver.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,29 +7,29 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2010-11-11 13:55+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:10+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:35+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: audiodeviceaccess.cpp:42
+#: deviceaccess.cpp:67
 msgid "Invalid Driver"
 msgstr ""
 
-#: audiodeviceaccess.cpp:44
+#: deviceaccess.cpp:69
 msgid "ALSA"
 msgstr "ALSA"
 
-#: audiodeviceaccess.cpp:46
+#: deviceaccess.cpp:71
 msgid "OSS"
 msgstr "OSS"
 
-#: audiodeviceaccess.cpp:48
+#: deviceaccess.cpp:73
 msgid "Jack"
 msgstr ""
 
@@ -37,13 +37,13 @@
 msgid "Video 4 Linux"
 msgstr ""
 
-#: audiodevice.cpp:60
+#: deviceinfo.cpp:95
 msgid ""
 "<html>This device is currently not available (either it is unplugged or the "
 "driver is not loaded).</html>"
 msgstr ""
 
-#: audiodevice.cpp:67
+#: deviceinfo.cpp:103
 #, kde-format
 msgctxt ""
 "The first argument is name of the driver/sound subsystem. The second "
@@ -51,7 +51,7 @@
 msgid "<li>%1: %2</li>"
 msgstr "<li>%1: %2</li>"
 
-#: audiodevice.cpp:71
+#: deviceinfo.cpp:108
 #, kde-format
 msgid ""
 "<html>This will try the following devices and use the first that works: "
@@ -62,18 +62,18 @@
 msgid "Unknown"
 msgstr ""
 
-#: phononserver.cpp:210
+#: phononserver.cpp:239
 #, kde-format
 msgctxt "%1 is the sound card name, %2 is the description in case it exists"
 msgid "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: phononserver.cpp:556
+#: phononserver.cpp:739
 #, kde-format
 msgid "Output: %1"
 msgstr ""
 
-#: phononserver.cpp:557
+#: phononserver.cpp:739
 #, kde-format
 msgid "Capture: %1"
 msgstr ""
@@ -83,7 +83,7 @@
 msgid "Video: %1"
 msgstr ""
 
-#: phononserver.cpp:822
+#: phononserver.cpp:1135
 msgid "Removed Sound Devices"
 msgstr ""
 
@@ -91,7 +91,7 @@
 msgid "Removed Video Devices"
 msgstr ""
 
-#: phononserver.cpp:828
+#: phononserver.cpp:1141
 msgid "Forget about the sound devices."
 msgstr ""
 
@@ -99,7 +99,7 @@
 msgid "Forget about the video devices"
 msgstr ""
 
-#: phononserver.cpp:832
+#: phononserver.cpp:1145
 msgctxt ""
 "short string for a button, it opens the Phonon page of System Settings"
 msgid "Manage Devices"
@@ -120,6 +120,6 @@
 "removed:<ul><li>%1</li></ul></p></html>"
 msgstr ""
 
-#: phononserver.cpp:846
+#: phononserver.cpp:1159
 msgid "Do not ask again for these devices"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_battery.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_battery.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_battery.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_battery.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,108 +7,111 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-01-28 20:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:20+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
+"2 : 3;\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:49+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: battery.cpp:202
+#: battery.cpp:182
 msgid "<b>Battery:</b>"
 msgstr ""
 
-#: battery.cpp:209
+#: battery.cpp:189
 #, kde-format
 msgctxt "tooltip: placeholder is the battery ID"
 msgid "<b>Battery %1:</b>"
 msgstr ""
 
-#: battery.cpp:220
+#: battery.cpp:200
 msgctxt "tooltip"
 msgid "<b>AC Adapter:</b>"
 msgstr ""
 
-#: battery.cpp:221
+#: battery.cpp:201
 msgctxt "tooltip"
 msgid "Plugged in"
 msgstr ""
 
-#: battery.cpp:221
+#: battery.cpp:201
 msgctxt "tooltip"
 msgid "Not plugged in"
 msgstr ""
 
-#: battery.cpp:343
+#: battery.cpp:376
 msgid "General"
 msgstr ""
 
-#: battery.cpp:490
+#: battery.cpp:553
 msgctxt "Label for remaining time"
 msgid "Time Remaining:"
 msgstr ""
 
-#: battery.cpp:510
-msgid "Power Profile:"
+#: battery.cpp:560
+msgctxt "Label for power management inhibition"
+msgid "Power management enabled:"
 msgstr ""
 
-#: battery.cpp:531
+#: battery.cpp:582
 msgid "Screen Brightness:"
 msgstr ""
 
-#: battery.cpp:563
+#: battery.cpp:603
 msgctxt "Suspend the computer to RAM; translation should be short"
 msgid "Sleep"
 msgstr ""
 
-#: battery.cpp:570
+#: battery.cpp:610
 msgctxt "Suspend the computer to disk; translation should be short"
 msgid "Hibernate"
 msgstr ""
 
-#: battery.cpp:577
+#: battery.cpp:617
 msgctxt "tooltip on the config button in the popup"
 msgid "Configure Power Management..."
 msgstr ""
 
-#: battery.cpp:616
+#: battery.cpp:619
 msgid "Power Settings"
 msgstr ""
 
-#: battery.cpp:640
+#: battery.cpp:675
 #, kde-format
 msgid "%1% (charged)"
 msgstr ""
 
-#: battery.cpp:645
+#: battery.cpp:677
 #, kde-format
 msgid "%1% (discharging)"
 msgstr ""
 
-#: battery.cpp:648
+#: battery.cpp:679
 #, kde-format
 msgid "%1% (charging)"
 msgstr ""
 
-#: battery.cpp:651 battery.cpp:700
+#: battery.cpp:683
 msgctxt "Battery is not plugged in"
 msgid "Not present"
 msgstr ""
 
-#: battery.cpp:199 battery.cpp:667
+#: battery.cpp:699 battery.cpp:732
 msgid "Battery:"
 msgstr ""
 
-#: battery.cpp:206 battery.cpp:674
+#: battery.cpp:706
 #, kde-format
 msgctxt "Placeholder is the battery ID"
 msgid "Battery %1:"
 msgstr ""
 
-#: battery.cpp:710
+#: battery.cpp:713
 msgid "AC Adapter:"
 msgstr ""
 
@@ -125,26 +128,30 @@
 msgid "<b>Not present</b>"
 msgstr ""
 
-#: battery.cpp:951 battery.cpp:982 battery.cpp:994
+#: battery.cpp:965 battery.cpp:996 battery.cpp:1008
 #, kde-format
 msgctxt "overlay on the battery, needs to be really tiny"
 msgid "%1%"
 msgstr "%1%"
 
+#: battery.cpp:1080
+msgid "The battery applet has enabled system-wide inhibition"
+msgstr ""
+
 #. i18n: file: batteryConfig.ui:14
 #. i18n: ectx: property (windowTitle), widget (QWidget, batteryConfig)
-#: rc.cpp:3 rc.cpp:12
+#: rc.cpp:3
 msgid "Configure Battery Monitor"
 msgstr ""
 
 #. i18n: file: batteryConfig.ui:23
 #. i18n: ectx: property (text), widget (QCheckBox, showBatteryStringCheckBox)
-#: rc.cpp:6 rc.cpp:15
+#: rc.cpp:6
 msgid "Show charge &information"
 msgstr ""
 
 #. i18n: file: batteryConfig.ui:33
 #. i18n: ectx: property (text), widget (QCheckBox, showMultipleBatteriesCheckBox)
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:9
 msgid "Show the state for &each battery present"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_clock.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_clock.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_clock.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_clock.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,52 +7,52 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2011-09-03 02:40+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:21+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:51+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: clock.cpp:187
+#: clock.cpp:185
 msgid "Appearance"
 msgstr "Tremiant"
 
 #. i18n: file: clockConfig.ui:22
 #. i18n: ectx: property (toolTip), widget (QCheckBox, showSecondHandCheckBox)
-#: rc.cpp:3 rc.cpp:21
+#: rc.cpp:3
 msgid "Show the seconds"
 msgstr "Dangoswch yr eiliadau"
 
 #. i18n: file: clockConfig.ui:25
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showSecondHandCheckBox)
-#: rc.cpp:6 rc.cpp:24
+#: rc.cpp:6
 msgid "Check this if you want to show the seconds."
 msgstr "Cliciwch hyn os wyt ti eisiau dangos yr eiliadau"
 
 #. i18n: file: clockConfig.ui:28
 #. i18n: ectx: property (text), widget (QCheckBox, showSecondHandCheckBox)
-#: rc.cpp:9 rc.cpp:27
+#: rc.cpp:9
 msgid "Show &seconds hand"
 msgstr "Dangos bysedd eiliad"
 
 #. i18n: file: clockConfig.ui:35
 #. i18n: ectx: property (toolTip), widget (QCheckBox, showTimezoneStringCheckBox)
-#: rc.cpp:12 rc.cpp:30
+#: rc.cpp:12
 msgid "Show the Timezone in text"
 msgstr "Dangos yr cylchfa amser mewn text"
 
 #. i18n: file: clockConfig.ui:38
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, showTimezoneStringCheckBox)
-#: rc.cpp:15 rc.cpp:33
+#: rc.cpp:15
 msgid "Check this if you want to display Timezone in text."
 msgstr "Cliciwch hyn os wyt ti eisiau dangos yr cylchfa amser mewn text"
 
 #. i18n: file: clockConfig.ui:41
 #. i18n: ectx: property (text), widget (QCheckBox, showTimezoneStringCheckBox)
-#: rc.cpp:18 rc.cpp:36
+#: rc.cpp:18
 msgid "Show &time zone"
 msgstr "Dangos cylchfa amser"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_icon.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_icon.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_icon.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_icon.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,40 +7,40 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2011-06-24 00:01+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:22+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:52+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: icon.cpp:282
+#: icon.cpp:330
 #, kde-format
 msgid "%1 Icon Settings"
 msgstr ""
 
-#: icon.cpp:448
+#: icon.cpp:497
 #, kde-format
 msgctxt "@action:inmenu"
 msgid "&Move Here\t<shortcut>%1</shortcut>"
 msgstr ""
 
-#: icon.cpp:454
+#: icon.cpp:503
 #, kde-format
 msgctxt "@action:inmenu"
 msgid "&Copy Here\t<shortcut>%1</shortcut>"
 msgstr ""
 
-#: icon.cpp:460
+#: icon.cpp:509
 #, kde-format
 msgctxt "@action:inmenu"
 msgid "&Link Here\t<shortcut>%1</shortcut>"
 msgstr ""
 
-#: icon.cpp:463
+#: icon.cpp:512
 msgctxt "@action:inmenu"
 msgid "Cancel"
 msgstr "Dileu"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_kalzium.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_kalzium.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_kalzium.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_kalzium.po	2012-04-18 08:59:40.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeedu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 13:16+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-23 08:57+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:56+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: kalzium_plasma.cpp:37
 msgid "Enter the atomic number."
@@ -64,18 +64,18 @@
 
 #. i18n: file: config.ui:18
 #. i18n: ectx: property (text), widget (QLabel, label)
-#: rc.cpp:3 rc.cpp:12
+#: rc.cpp:3
 msgid "Theme:"
 msgstr "Thema:"
 
 #. i18n: file: config.ui:32
 #. i18n: ectx: property (text), item, widget (KComboBox, comboBox)
-#: rc.cpp:6 rc.cpp:15
+#: rc.cpp:6
 msgid "testtube.svg"
 msgstr ""
 
 #. i18n: file: config.ui:42
 #. i18n: ectx: property (text), widget (KPushButton, fontSelectButton)
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:9
 msgid "Select Font..."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_netpanel.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_netpanel.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_netpanel.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_netpanel.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,20 +7,20 @@
 msgstr ""
 "Project-Id-Version: kde-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2012-01-10 18:53+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:23+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:53+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: panel.cpp:97 panel.cpp:362
+#: panel.cpp:88 panel.cpp:353
 msgid "Lock Panel"
 msgstr "Cloi'r Panel"
 
-#: panel.cpp:355
+#: panel.cpp:346
 msgid "Unlock Panel"
 msgstr "Datgloi'r Panel"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_saverdesktop.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_saverdesktop.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_saverdesktop.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_saverdesktop.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,16 +7,16 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-23 08:44+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:26+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: desktop.cpp:69
+#: desktop.cpp:98
 msgid "Settings"
 msgstr "Gosodiadau"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_trash.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_trash.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_applet_trash.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_applet_trash.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 01:55+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
@@ -16,47 +16,50 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 05:58+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: trash.cpp:119 trash.cpp:135 trash.cpp:168 trash.cpp:242
+#: trash.cpp:117 trash.cpp:133 trash.cpp:166 trash.cpp:251
 msgid "Trash"
 msgstr "Sbwriel"
 
-#: trash.cpp:127
+#: trash.cpp:125
 msgid "&Open"
 msgstr "&Agor"
 
-#: trash.cpp:131 trash.cpp:236
+#: trash.cpp:129 trash.cpp:245
 msgid "&Empty Trashcan"
 msgstr ""
 
-#: trash.cpp:140
+#: trash.cpp:138
 msgid "&Menu"
 msgstr "&Dewislen"
 
-#: trash.cpp:169 trash.cpp:247 trash.cpp:249
+#: trash.cpp:167 trash.cpp:256 trash.cpp:258
 #, kde-format
 msgid "One item"
 msgid_plural "%1 items"
 msgstr[0] "%n Eitem"
 msgstr[1] "%n o Eitemau"
 
-#: trash.cpp:202
+#: trash.cpp:203
 msgctxt "@info"
 msgid "Do you really want to empty the trash? All items will be deleted."
 msgstr ""
 
-#: trash.cpp:207
-msgctxt "@action:button"
+#: trash.cpp:205 trash.cpp:207
 msgid "Empty Trash"
-msgstr "Gwagio Sbwriel"
+msgstr ""
+
+#: trash.cpp:208
+msgid "Cancel"
+msgstr ""
 
-#: trash.cpp:216
+#: trash.cpp:226
 msgid "Emptying Trashcan..."
 msgstr ""
 
-#: trash.cpp:254 trash.cpp:256
+#: trash.cpp:263 trash.cpp:265
 msgctxt "The trash is empty. This is not an action, but a state"
 msgid "Empty"
 msgstr "Gwag"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_engine_kalzium.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_engine_kalzium.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_engine_kalzium.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_engine_kalzium.po	2012-04-18 08:59:40.000000000 +0000
@@ -7,28 +7,28 @@
 msgstr ""
 "Project-Id-Version: kdeedu\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 13:16+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-18 02:16+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:57+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:29+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: kalzium_engine.cpp:162 kalzium_engine.cpp:181
+#: kalzium_engine.cpp:163 kalzium_engine.cpp:182
 msgid "An error occurred."
 msgstr "Digwyddodd gwall."
 
-#: kalzium_engine.cpp:172 kalzium_engine.cpp:178
+#: kalzium_engine.cpp:173 kalzium_engine.cpp:179
 #, kde-format
 msgid ""
 "Did you know that\n"
 " the element %1 has the symbol %2?"
 msgstr ""
 
-#: kalzium_engine.cpp:174 kalzium_engine.cpp:176
+#: kalzium_engine.cpp:175 kalzium_engine.cpp:177
 #, kde-format
 msgid ""
 "Did you know that\n"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_packagestructure_comic.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_packagestructure_comic.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_packagestructure_comic.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_packagestructure_comic.po	2012-04-18 08:59:31.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeplasma-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 04:40+0000\n"
+"POT-Creation-Date: 2012-04-12 19:02+0000\n"
 "PO-Revision-Date: 2011-01-27 23:33+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:21+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 02:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: comic_package.cpp:28
 msgid "Images"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasmapkg.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasmapkg.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasmapkg.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasmapkg.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,17 +7,17 @@
 msgstr ""
 "Project-Id-Version: kde-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2012-02-03 01:42+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: main.cpp:38
+#: main.cpp:41
 msgid "Install, list, remove Plasma packages"
 msgstr ""
 
@@ -33,11 +33,11 @@
 msgid "Path"
 msgstr "Llwybr"
 
-#: main.cpp:79
+#: main.cpp:122
 msgid "Package types that are installable with this tool:"
 msgstr ""
 
-#: main.cpp:80
+#: main.cpp:123
 msgid "Built in:"
 msgstr ""
 
@@ -69,35 +69,40 @@
 msgid "Wallpaper Plugin"
 msgstr ""
 
-#: main.cpp:92
+#: main.cpp:138
 msgid "Provided by plugins:"
 msgstr ""
 
-#: main.cpp:102
+#: main.cpp:155
 msgid "Provided by .desktop files:"
 msgstr ""
 
-#: main.cpp:75
+#: main.cpp:171
 msgid "Plasma Package Manager"
 msgstr ""
 
-#: main.cpp:77
+#: main.cpp:173
 msgid "(C) 2008, Aaron Seigo"
 msgstr "(C) 2008, Aaron Seigo"
 
-#: main.cpp:78
+#: main.cpp:174
 msgid "Aaron Seigo"
 msgstr "Aaron Seigo"
 
-#: main.cpp:79
+#: main.cpp:175
 msgid "Original author"
 msgstr "Awdur gwreiddiol"
 
-#: main.cpp:88
+#: main.cpp:184
+msgctxt "Do not translate <path>"
+msgid "Generate a SHA1 hash for the package at <path>"
+msgstr ""
+
+#: main.cpp:186
 msgid "For install or remove, operates on packages installed for all users."
 msgstr ""
 
-#: main.cpp:137
+#: main.cpp:192
 msgctxt ""
 "theme, wallpaper, etc. are keywords, but they may be translated, as both "
 "versions are recognized by the application (if translated, should be same as "
@@ -107,82 +112,92 @@
 "layout-template, etc."
 msgstr ""
 
-#: main.cpp:98
+#: main.cpp:196
 msgctxt "Do not translate <path>"
 msgid "Install the package at <path>"
 msgstr ""
 
-#: main.cpp:100
+#: main.cpp:198
 msgctxt "Do not translate <path>"
 msgid "Upgrade the package at <path>"
 msgstr ""
 
-#: main.cpp:102
+#: main.cpp:200
 msgid "List installed packages"
 msgstr ""
 
-#: main.cpp:146
+#: main.cpp:201
 msgid "lists all known Package types that can be installed"
 msgstr ""
 
-#: main.cpp:104
+#: main.cpp:203
 msgctxt "Do not translate <name>"
 msgid "Remove the package named <name>"
 msgstr ""
 
-#: main.cpp:106
+#: main.cpp:205
 msgid ""
 "Absolute path to the package root. If not supplied, then the standard data "
 "directories for this KDE session will be searched instead."
 msgstr ""
 
-#: main.cpp:134 main.cpp:166
+#: main.cpp:218
+#, kde-format
+msgid "Failed to generate a Package hash for %1"
+msgstr ""
+
+#: main.cpp:222
+#, kde-format
+msgid "SHA1 hash for Package at %1: '%2'"
+msgstr ""
+
+#: main.cpp:253 main.cpp:290
 msgctxt "package type"
 msgid "wallpaper"
 msgstr ""
 
-#: main.cpp:158
+#: main.cpp:280
 msgctxt "package type"
 msgid "plasmoid"
 msgstr ""
 
-#: main.cpp:164
+#: main.cpp:287
 msgctxt "package type"
 msgid "theme"
 msgstr "thema"
 
-#: main.cpp:168
+#: main.cpp:293
 msgctxt "package type"
 msgid "dataengine"
 msgstr ""
 
-#: main.cpp:172
+#: main.cpp:298
 msgctxt "package type"
 msgid "runner"
 msgstr ""
 
-#: main.cpp:176
+#: main.cpp:303
 msgctxt "package type"
 msgid "wallpaperplugin"
 msgstr ""
 
-#: main.cpp:238
+#: main.cpp:308
 msgctxt "package type"
 msgid "layout-template"
 msgstr ""
 
-#: main.cpp:184
+#: main.cpp:317
 #, kde-format
 msgid "Could not find a suitable installer for package of type %1"
 msgstr ""
 
-#: main.cpp:193
+#: main.cpp:326
 #, kde-format
 msgid ""
 "Could not load installer for package of type %1. Error reported was: %2"
 msgstr ""
 
-#: main.cpp:211
+#: main.cpp:346
 msgctxt ""
 "The user entered conflicting options packageroot and global, this is the "
 "error message telling the user he can use only one"
@@ -191,32 +206,32 @@
 "one."
 msgstr ""
 
-#: main.cpp:236
+#: main.cpp:371
 #, kde-format
 msgid "Successfully removed %1"
 msgstr ""
 
-#: main.cpp:238
+#: main.cpp:373
 #, kde-format
 msgid "Removal of %1 failed."
 msgstr ""
 
-#: main.cpp:243
+#: main.cpp:378
 #, kde-format
 msgid "Plugin %1 is not installed."
 msgstr ""
 
-#: main.cpp:248
+#: main.cpp:383
 #, kde-format
 msgid "Successfully installed %1"
 msgstr ""
 
-#: main.cpp:250
+#: main.cpp:385
 #, kde-format
 msgid "Installation of %1 failed."
 msgstr ""
 
-#: main.cpp:256
+#: main.cpp:391
 msgctxt ""
 "No option was given, this is the error message telling the user he needs at "
 "least one, do not translate install, remove, upgrade nor list"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_bookmarksrunner.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_bookmarksrunner.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_bookmarksrunner.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_bookmarksrunner.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-11-11 14:05+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:37+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:08+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: bookmarksrunner.cpp:47
 msgid "Finds web browser bookmarks matching :q:."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_contacts.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_contacts.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_contacts.po	2012-03-23 07:39:21.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_contacts.po	2012-04-18 08:59:31.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdeplasma-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-09 04:40+0000\n"
+"POT-Creation-Date: 2012-04-12 19:02+0000\n"
 "PO-Revision-Date: 2012-03-03 22:44+0000\n"
 "Last-Translator: Dafydd Francis <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 21:22+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 02:57+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: contactsrunner.cpp:48
 msgid "Finds people in your address book matching :q:."
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_locations.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_locations.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_locations.po	2012-03-23 07:39:27.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_locations.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-23 08:45+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:38+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:09+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: locationrunner.cpp:44
 msgid ""
@@ -23,17 +23,17 @@
 "paths matching :q:."
 msgstr ""
 
-#: locationrunner.cpp:115 locationrunner.cpp:137
+#: locationrunner.cpp:61 locationrunner.cpp:83
 #, kde-format
 msgid "Open %1"
 msgstr "Agor %1"
 
-#: locationrunner.cpp:155 locationrunner.cpp:164
+#: locationrunner.cpp:105 locationrunner.cpp:114
 #, kde-format
 msgid "Go to %1"
 msgstr "Ewch I %1"
 
-#: locationrunner.cpp:161
+#: locationrunner.cpp:111
 #, kde-format
 msgid "Launch with %1"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_nepomuksearchrunner.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_nepomuksearchrunner.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_nepomuksearchrunner.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_nepomuksearchrunner.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,22 +7,22 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-23 08:44+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:38+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:11+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: nepomuksearchrunner.cpp:76
+#: nepomuksearchrunner.cpp:81
 msgid ""
 "Finds files, documents and other content that matches :q: using the desktop "
 "search system."
 msgstr ""
 
-#: nepomuksearchrunner.cpp:149
+#: nepomuksearchrunner.cpp:195
 msgid "Open"
 msgstr "Agor"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_webshortcuts.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_webshortcuts.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/plasma_runner_webshortcuts.po	2012-03-23 07:39:28.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/plasma_runner_webshortcuts.po	2012-04-18 08:59:39.000000000 +0000
@@ -7,22 +7,22 @@
 msgstr ""
 "Project-Id-Version: kdebase-workspace\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-09-07 19:16+0000\n"
+"POT-Creation-Date: 2012-04-12 20:39+0000\n"
 "PO-Revision-Date: 2010-12-18 02:00+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-23 00:42+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 06:14+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: webshortcutrunner.cpp:105
+#: webshortcutrunner.cpp:80
 #, kde-format
 msgid "Opens \"%1\" in a web browser with the query :q:."
 msgstr ""
 
-#: webshortcutrunner.cpp:186
+#: webshortcutrunner.cpp:124 webshortcutrunner.cpp:143
 #, kde-format
 msgid "Search %1 for %2"
 msgstr "Chwillio %1 am %2"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/rellinks.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/rellinks.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/rellinks.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/rellinks.po	2012-04-18 08:59:36.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdeaddons/rellinks.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-31 04:55+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: plugin_rellinks.cpp:56
 msgid "Rellinks"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/searchbarplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/searchbarplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/searchbarplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/searchbarplugin.po	2012-04-18 08:59:36.000000000 +0000
@@ -4,35 +4,15 @@
 msgstr ""
 "Project-Id-Version: searchbarplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-31 04:57+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
-
-#: WebShortcutWidget.cpp:43
-msgid "Set Uri Shortcuts"
-msgstr ""
-
-#: WebShortcutWidget.cpp:57
-msgid "Name:"
-msgstr ""
-
-#: WebShortcutWidget.cpp:61
-msgid "Shortcuts:"
-msgstr ""
-
-#: WebShortcutWidget.cpp:71
-msgid "Ok"
-msgstr ""
-
-#: WebShortcutWidget.cpp:76
-msgid "Cancel"
-msgstr ""
+"X-Launchpad-Export-Date: 2012-04-18 04:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #. i18n: file: searchbar.rc:3
 #. i18n: ectx: ToolBar (locationToolBar)
@@ -40,17 +20,17 @@
 msgid "Search Toolbar"
 msgstr "Bar Offer Chwilio"
 
-#: searchbar.cpp:79
+#: searchbar.cpp:78
 msgid ""
 "Search Bar<p>Enter a search term. Click on the icon to change search mode or "
 "provider.</p>"
 msgstr ""
 
-#: searchbar.cpp:84
+#: searchbar.cpp:83
 msgid "Search Bar"
 msgstr "Bar Chwiliad"
 
-#: searchbar.cpp:89
+#: searchbar.cpp:88
 msgid "Focus Searchbar"
 msgstr ""
 
@@ -67,6 +47,26 @@
 msgid "Add %1..."
 msgstr ""
 
-#: searchbar.cpp:571
+#: searchbar.cpp:574
 msgid "Enable Suggestion"
 msgstr ""
+
+#: WebShortcutWidget.cpp:43
+msgid "Set Uri Shortcuts"
+msgstr ""
+
+#: WebShortcutWidget.cpp:57
+msgid "Name:"
+msgstr ""
+
+#: WebShortcutWidget.cpp:61
+msgid "Shortcuts:"
+msgstr ""
+
+#: WebShortcutWidget.cpp:71
+msgid "Ok"
+msgstr ""
+
+#: WebShortcutWidget.cpp:76
+msgid "Cancel"
+msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/soliduiserver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/soliduiserver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/soliduiserver.po	2012-03-23 07:39:24.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/soliduiserver.po	2012-04-18 08:59:36.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: kdebase-runtime\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-08-25 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 18:55+0000\n"
 "PO-Revision-Date: 2011-06-23 23:59+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Welsh <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:12+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:37+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: devicenothingaction.cpp:28
 msgid "Do nothing"
@@ -26,19 +26,19 @@
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#. i18n: file: deviceactionsdialogview.ui:55
+#. i18n: file: deviceactionsdialogview.ui:52
 #. i18n: ectx: property (text), widget (QLabel, textLabel1)
 #: rc.cpp:3
 msgid "A new device has been detected.<br><b>What do you want to do?</b>"
 msgstr ""
 
-#. i18n: file: deviceactionsdialogview.ui:76
+#. i18n: file: deviceactionsdialogview.ui:73
 #. i18n: ectx: property (text), widget (QLabel, descriptionLabel)
 #: rc.cpp:6
 msgid "..."
 msgstr "..."
 
-#: soliduiserver.cpp:148
+#: soliduiserver.cpp:151
 #, kde-format
 msgid "'%1' needs a password to be accessed. Please enter a password."
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/spy.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/spy.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/spy.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/spy.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/spy.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2009-07-18 18:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:27+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:02+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: classinfoview.cpp:31 navview.cpp:31 propsview.cpp:34
 msgid "Name"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/strigila_diff.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/strigila_diff.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/strigila_diff.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/strigila_diff.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,15 +2,15 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/kfile_diff.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2009-07-18 18:09+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:27+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:02+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: difflineanalyzer.cpp:388
 msgid "CVSDiff"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/uachangerplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/uachangerplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/uachangerplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/uachangerplugin.po	2012-04-18 08:59:37.000000000 +0000
@@ -4,15 +4,15 @@
 msgstr ""
 "Project-Id-Version: uachangerplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-23 08:53+0000\n"
 "Last-Translator: David Jones <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:54+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/umbrello.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/umbrello.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/umbrello.po	2012-03-23 07:39:16.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/umbrello.po	2012-04-18 08:59:27.000000000 +0000
@@ -2,2745 +2,2976 @@
 msgstr ""
 "Project-Id-Version: ../cy/messages//kdesdk/umbrello.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-08 16:09+0000\n"
+"POT-Creation-Date: 2012-04-12 17:44+0000\n"
 "PO-Revision-Date: 2009-07-18 18:01+0000\n"
 "Last-Translator: Thierry Vignaud <Unknown>\n"
 "Language-Team: cy <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 19:28+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 01:03+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
-#: cmds/cmd_set_stereotype.cpp:25
-#, kde-format
-msgid "Set stereotype : %1 to %2"
+#: umllistview.cpp:505
+msgid "Externalize Folder"
 msgstr ""
 
-#: cmds/cmd_create_seqdiag.cpp:25
+#: umllistview.cpp:545 umldoc.cpp:622 umldoc.cpp:632 umldoc.cpp:649
+#: umldoc.cpp:682 umldoc.cpp:700 umlviewimageexportermodel.cpp:251
 #, kde-format
-msgid "Create sequence diagram : %1"
+msgid "There was a problem saving file: %1"
 msgstr ""
 
-#: cmds/cmd_create_classdiag.cpp:25
-#, kde-format
-msgid "Create class diagram : %1"
-msgstr ""
+#: umllistview.cpp:546 umldoc.cpp:622 umldoc.cpp:632 umldoc.cpp:649
+#: umldoc.cpp:682 umldoc.cpp:700 umldoc.cpp:707
+msgid "Save Error"
+msgstr "Gwall Cadw"
 
-#: cmds/cmd_create_entityrelationdiag.cpp:25
-#, kde-format
-msgid "Create entity relationship diagram : %1"
+#: umllistview.cpp:577
+msgid "Enter Model Name"
 msgstr ""
 
-#: cmds/cmd_resizeWidget.cpp:26
-#, kde-format
-msgid "Resize widget : %1"
+#: umllistview.cpp:578
+msgid "Enter the new name of the model:"
 msgstr ""
 
-#: cmds/cmd_handle_rename.cpp:26
-#, kde-format
-msgid "Change text : %1 to %2"
-msgstr ""
+#: umllistview.cpp:1320
+msgid "Views"
+msgstr "Golygon"
 
-#: cmds/cmd_set_visibility.cpp:24
-#, kde-format
-msgid "Change visibility : %1"
+#: umllistview.cpp:2301
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: cmds/cmd_create_deploydiag.cpp:25
-#, kde-format
-msgid "Create deployment diagram : %1"
+#: umllistview.cpp:2302 umllistviewitem.cpp:715
+msgid "Name Not Valid"
 msgstr ""
 
-#: cmds/cmd_create_usecasediag.cpp:25
-#, kde-format
-msgid "Create use case diagram : %1"
+#: umllistview.cpp:2311 umldoc.cpp:1418
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
 
-#: cmds/cmd_create_collaborationdiag.cpp:25
-#, kde-format
-msgid "Create collaboration diagram : %1"
+#: umllistview.cpp:2312 umllistview.cpp:2319 umllistview.cpp:2584
+#: umldoc.cpp:1419 dialogs/umlviewdialog.cpp:227
+msgid "Name Not Unique"
 msgstr ""
 
-#: cmds/cmd_create_activitydiag.cpp:25
-#, kde-format
-msgid "Create activity diagram : %1"
+#: umllistview.cpp:2312 umldoc.cpp:1419
+msgid "Use Name"
 msgstr ""
 
-#: cmds/widget/cmd_set_name.cpp:25
-#, kde-format
-msgid "Set name : %1 to %2"
+#: umllistview.cpp:2312 umldoc.cpp:1419
+msgid "Enter New Name"
 msgstr ""
 
-#: cmds/widget/cmd_changeFontSelection.cpp:26
-#, kde-format
-msgid "Change font : %1"
+#: umllistview.cpp:2318 umllistview.cpp:2583
+msgid ""
+"The name you entered was not unique.\n"
+"Creation process has been canceled."
 msgstr ""
 
-#: cmds/widget/cmd_changeLineColor.cpp:34
-#, kde-format
-msgid "Change line color : %1"
+#: umllistview.cpp:2541 umllistview.cpp:2558 umllistview.cpp:2573
+#: umllistview.cpp:2603
+msgid "Creation canceled"
 msgstr ""
 
-#: cmds/widget/cmd_changeFillColor.cpp:26
-#, kde-format
-msgid "Change fill color : %1"
+#: umllistview.cpp:2861
+msgid "Loading listview..."
 msgstr ""
 
-#: cmds/widget/cmd_create_widget.cpp:26
-#, kde-format
-msgid "Create widget : %1"
+#: umllistview.cpp:3245
+msgid "The folder must be emptied before it can be deleted."
 msgstr ""
 
-#: cmds/widget/cmd_set_txt.cpp:26
-#, kde-format
-msgid "Set text : %1 to %2"
+#: umllistview.cpp:3246
+msgid "Folder Not Empty"
 msgstr ""
 
-#: cmds/widget/cmd_changeMulti.cpp:26
-#, kde-format
-msgid "Change multiplicity : %1 to %2"
+#: enumliteral.cpp:104
+msgctxt "enum name"
+msgid "Name"
 msgstr ""
 
-#: cmds/cmd_create_componentdiag.cpp:25
-#, kde-format
-msgid "Create component diagram : %1"
-msgstr ""
+#: enumliteral.cpp:104 stereotype.cpp:112 umldoc.cpp:1276 umldoc.cpp:1343
+#: umldoc.cpp:1374 umldoc.cpp:1408 object_factory.cpp:191
+msgid "Enter name:"
+msgstr "Rhowch enw:"
 
-#: cmds/generic/cmd_rename_umlobject.cpp:25
-#, kde-format
-msgid "Rename object : %1 to %2"
+#: widgets/umlwidget.cpp:362 widgets/umlwidget.cpp:366
+msgid "Change Properties"
 msgstr ""
 
-#: cmds/generic/cmd_create_umlobject.cpp:28
-#, kde-format
-msgid "Create uml object : %1"
+#: widgets/pinwidget.cpp:180
+msgid "Enter Pin Name"
 msgstr ""
 
-#: cmds/cmd_moveWidget.cpp:26
-#, kde-format
-msgid "Move widget : %1"
+#: widgets/pinwidget.cpp:180
+msgid "Enter the pin name :"
 msgstr ""
 
-#: cmds/cmd_create_statediag.cpp:25
-#, kde-format
-msgid "Create state diagram : %1"
+#: widgets/associationwidget.cpp:3012
+msgid "Multiplicity"
 msgstr ""
 
-#: umlviewimageexporter.cpp:71
-msgid "Exporting view..."
+#: widgets/associationwidget.cpp:3013 widgets/floatingtextwidget.cpp:362
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: umlviewimageexporter.cpp:75
-msgid "An error happened when exporting the image:\n"
+#: widgets/associationwidget.cpp:3030
+msgid "Association Name"
 msgstr ""
 
-#: umlviewimageexporter.cpp:77 uml.cpp:1316 umlviewimageexporterall.cpp:84
-msgctxt "reset status bar"
-msgid "Ready."
+#: widgets/associationwidget.cpp:3031 widgets/floatingtextwidget.cpp:369
+msgid "Enter association name:"
 msgstr ""
 
-#: umlviewimageexporter.cpp:102
-#, kde-format
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+#: widgets/associationwidget.cpp:3050
+msgid "Role Name"
 msgstr ""
 
-#: umlviewimageexporter.cpp:103
-msgid "File Already Exists"
-msgstr "Ffeil yn Bodoli'n Barod"
+#: widgets/associationwidget.cpp:3051 widgets/floatingtextwidget.cpp:360
+msgid "Enter role name:"
+msgstr ""
 
-#: umlviewimageexporter.cpp:103 dialogs/overwritedialogue.cpp:49
-msgid "&Overwrite"
-msgstr "&Trosysgrifo"
+#: widgets/messagewidget.cpp:1136 listpopupmenu.cpp:1187
+#: listpopupmenu.cpp:1191
+msgid "Operation"
+msgstr "Gweithrediad"
 
-#: umlviewimageexporter.cpp:166 uml.cpp:1105
-msgid "Save As"
+#: widgets/statewidget.cpp:271 umlview.cpp:2793 toolbarstateother.cpp:282
+msgid "Enter State Name"
 msgstr ""
 
-#: uml.cpp:239
-msgid "&Export model to DocBook"
+#: widgets/statewidget.cpp:271 umlview.cpp:2794 toolbarstateother.cpp:283
+msgid "Enter the name of the new state:"
 msgstr ""
 
-#: uml.cpp:243
-msgid "&Export model to XHTML"
+#: widgets/statewidget.cpp:281
+msgid "Enter Activity"
 msgstr ""
 
-#: uml.cpp:247
-msgid "&New Class Wizard..."
+#: widgets/statewidget.cpp:281 widgets/activitywidget.cpp:350 umlview.cpp:2826
+#: toolbarstateother.cpp:254 dialogs/activitypage.cpp:176
+msgid "Enter the name of the new activity:"
 msgstr ""
 
-#: uml.cpp:251
-msgid "&Add Default Datatypes for Active Language"
+#: widgets/statewidget.cpp:281 umlview.cpp:2827 toolbarstateother.cpp:254
+#: dialogs/activitypage.cpp:176
+msgid "new activity"
 msgstr ""
 
-#: uml.cpp:258
-msgid "&Import Classes..."
+#: widgets/objectwidget.cpp:90
+msgid "Rename Object"
 msgstr ""
 
-#: uml.cpp:263
-msgid "Import &Project..."
+#: widgets/objectwidget.cpp:91
+msgid "Enter object name:"
 msgstr ""
 
-#: uml.cpp:267
-msgid "&Code Generation Wizard..."
+#: widgets/signalwidget.cpp:313
+msgid "Enter signal name"
 msgstr ""
 
-#: uml.cpp:271
-msgid "&Generate All Code"
+#: widgets/signalwidget.cpp:313
+msgid "Enter the signal name :"
 msgstr ""
 
-#: uml.cpp:316
-msgid "Creates a new document"
-msgstr "Creu dogfen newydd"
-
-#: uml.cpp:317
-msgid "Opens an existing document"
-msgstr "Agor dogfen gyfredol"
-
-#: uml.cpp:318
-msgid "Opens a recently used file"
-msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
-
-#: uml.cpp:319
-msgid "Saves the document"
+#: widgets/preconditionwidget.cpp:122 widgets/toolbarstateonewidget.cpp:176
+msgid "Enter Precondition Name"
 msgstr ""
 
-#: uml.cpp:320
-msgid "Saves the document as..."
+#: widgets/preconditionwidget.cpp:122
+msgid "Enter the precondition :"
 msgstr ""
 
-#: uml.cpp:321
-msgid "Closes the document"
+#: widgets/statusbartoolbutton.cpp:120
+#, kde-format
+msgctxt "@info:tooltip of custom toolbar button"
+msgid "%1"
 msgstr ""
 
-#: uml.cpp:322
-msgid "Prints out the document"
+#: widgets/objectnodewidget.cpp:198
+msgid "Enter Object Node Name"
 msgstr ""
 
-#: uml.cpp:323
-msgid "Quits the application"
-msgstr "Terfynu'r cymhwysiad"
-
-#: uml.cpp:324
-msgid "Exports the model to the docbook format"
+#: widgets/objectnodewidget.cpp:198
+msgid "Enter the name of the object node :"
 msgstr ""
 
-#: uml.cpp:325
-msgid "Exports the model to the XHTML format"
+#: widgets/objectnodewidget.cpp:254
+msgid "Select Object node type"
 msgstr ""
 
-#: uml.cpp:326
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd"
-
-#: uml.cpp:327
-msgid "Copies the selected section to the clipboard"
-msgstr "Copïo'r adran dewisiedig i'r gludfwrdd"
-
-#: uml.cpp:328
-msgid "Pastes the contents of the clipboard"
+#: widgets/objectnodewidget.cpp:254
+msgid "Select the object node type"
 msgstr ""
 
-#: uml.cpp:329
-msgid "Set the default program preferences"
+#: widgets/objectnodewidget.cpp:260
+msgid "Enter the name of the data store node"
 msgstr ""
 
-#: uml.cpp:333
-msgctxt "delete selected widget"
-msgid "Delete &Selected"
+#: widgets/objectnodewidget.cpp:260
+msgid "data store name"
 msgstr ""
 
-#: uml.cpp:344
-msgid "&Class Diagram..."
+#: widgets/objectnodewidget.cpp:262
+msgid "Enter the name of the buffer node"
 msgstr ""
 
-#: uml.cpp:350
-msgid "&Sequence Diagram..."
+#: widgets/objectnodewidget.cpp:262
+msgid "Enter the name of the buffer"
 msgstr ""
 
-#: uml.cpp:356
-msgid "C&ollaboration Diagram..."
+#: widgets/objectnodewidget.cpp:262
+msgid "centralBuffer"
 msgstr ""
 
-#: uml.cpp:362
-msgid "&Use Case Diagram..."
+#: widgets/objectnodewidget.cpp:264
+msgid "Enter the name of the object flow"
 msgstr ""
 
-#: uml.cpp:368
-msgid "S&tate Diagram..."
+#: widgets/objectnodewidget.cpp:264
+msgid "object flow"
 msgstr ""
 
-#: uml.cpp:374
-msgid "&Activity Diagram..."
+#: widgets/objectnodewidget.cpp:277
+msgid "Enter Object Flow State"
 msgstr ""
 
-#: uml.cpp:380
-msgid "Co&mponent Diagram..."
+#: widgets/objectnodewidget.cpp:277
+msgid "Enter State (keep '-' if there is no state for the object) "
 msgstr ""
 
-#: uml.cpp:386
-msgid "&Deployment Diagram..."
+#: widgets/objectnodewidget.cpp:277 widgets/combinedfragmentwidget.cpp:253
+#: widgets/combinedfragmentwidget.cpp:255
+msgid "-"
 msgstr ""
 
-#: uml.cpp:392
-msgid "&Entity Relationship Diagram..."
+#: widgets/combinedfragmentwidget.cpp:251
+msgid "Enter the name of the diagram referenced"
 msgstr ""
 
-#: uml.cpp:398
-msgid "&Clear Diagram"
+#: widgets/combinedfragmentwidget.cpp:251
+msgid "Diagram name"
 msgstr ""
 
-#: uml.cpp:402
-msgid "&Snap to Grid"
-msgstr "&Snapio i'r Grid"
-
-#: uml.cpp:406
-msgid "S&how Grid"
-msgstr "D&angos Grid"
+#: widgets/combinedfragmentwidget.cpp:253
+#: widgets/combinedfragmentwidget.cpp:346
+msgid "Enter the guard of the loop"
+msgstr ""
 
-#: uml.cpp:411 umldoc.cpp:1404 umlview.cpp:2959
-#: dialogs/classifierlistpage.cpp:206 dialogs/umloperationdialog.cpp:166
-#: dialogs/umlforeignkeyconstraintdialog.cpp:310
-#: dialogs/umluniqueconstraintdialog.cpp:114
-msgid "&Delete"
+#: widgets/combinedfragmentwidget.cpp:255
+msgid "Enter the first alternative name"
 msgstr ""
 
-#: uml.cpp:416
-msgid "&Export as Picture..."
+#: widgets/combinedfragmentwidget.cpp:340
+msgid "Enter first alternative"
 msgstr ""
 
-#: uml.cpp:421
-msgid "Export &All Diagrams as Pictures..."
+#: widgets/combinedfragmentwidget.cpp:340
+msgid "Enter first alternative :"
 msgstr ""
 
-#: uml.cpp:426 dialogs/classifierlistpage.cpp:208
-#: dialogs/umloperationdialog.cpp:168
-msgid "&Properties"
-msgstr "&Priodweddau"
+#: widgets/combinedfragmentwidget.cpp:343
+msgid "Enter referenced diagram name"
+msgstr ""
 
-#: uml.cpp:440
-msgid "&Zoom Slider"
+#: widgets/combinedfragmentwidget.cpp:343
+msgid "Enter referenced diagram name :"
 msgstr ""
 
-#: uml.cpp:446
-msgid "Z&oom to 100%"
-msgstr "C&hwyddo i 100%"
+#: widgets/combinedfragmentwidget.cpp:346
+msgid "Enter the guard of the loop:"
+msgstr ""
 
-#: uml.cpp:450
-msgid "Align Right"
-msgstr "Alinio Dde"
+#: widgets/floatingtextwidget.cpp:183
+msgid "Change Text"
+msgstr "Newid y Testun"
 
-#: uml.cpp:455
-msgid "Align Left"
-msgstr "Alinio Chwith"
+#: widgets/floatingtextwidget.cpp:183 widgets/floatingtextwidget.cpp:371
+msgid "Enter new text:"
+msgstr ""
 
-#: uml.cpp:460
-msgid "Align Top"
-msgstr "Alinio Brig"
+#: widgets/floatingtextwidget.cpp:373
+msgid "ERROR"
+msgstr "GWALL"
 
-#: uml.cpp:465
-msgid "Align Bottom"
-msgstr "Alinio Gwaelod"
+#: widgets/floatingtextwidget.cpp:376 dialogs/activitypage.cpp:106
+msgid "Rename"
+msgstr "Ail-enwi"
 
-#: uml.cpp:470
-msgid "Align Vertical Middle"
+#: widgets/floatingtextwidget.cpp:548
+msgctxt "operation name"
+msgid "Name"
 msgstr ""
 
-#: uml.cpp:475
-msgid "Align Horizontal Middle"
+#: widgets/floatingtextwidget.cpp:549
+msgid "Enter operation name:"
 msgstr ""
 
-#: uml.cpp:480
-msgid "Align Vertical Distribute"
+#: widgets/notewidget.cpp:209
+msgid "Note Type"
 msgstr ""
 
-#: uml.cpp:485
-msgid "Align Horizontal Distribute"
+#: widgets/notewidget.cpp:209
+msgid "Select the Note Type"
 msgstr ""
 
-#: uml.cpp:489
-msgid "&Move Tab Left"
-msgstr "&Symud Tab i'r Chwith"
+#: widgets/toolbarstateonewidget.cpp:176
+msgid "Enter the precondition"
+msgstr ""
 
-#: uml.cpp:490
-msgid "&Move Tab Right"
-msgstr "&Symud Tab i'r Dde"
+#: widgets/toolbarstateonewidget.cpp:176
+msgid "new precondition"
+msgstr ""
 
-#: uml.cpp:505
-msgid "Select Diagram on Left"
+#: widgets/floatingdashlinewidget.cpp:75
+msgid "Enter alternative Name"
 msgstr ""
 
-#: uml.cpp:506
-msgid "Select Diagram on Right"
+#: widgets/floatingdashlinewidget.cpp:75
+msgid "Enter the alternative :"
 msgstr ""
 
-#: uml.cpp:632
-msgctxt "init status bar"
-msgid "Ready"
+#: widgets/activitywidget.cpp:350 umlview.cpp:2825 toolbarstateother.cpp:253
+msgid "Enter Activity Name"
 msgstr ""
 
-#: uml.cpp:645
-msgid "Diagram Toolbar"
+#: clipboard/umlclipboard.cpp:839
+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 ""
 
-#: uml.cpp:692
-msgid "&Tree View"
-msgstr "Golwg &Coeden"
-
-#: uml.cpp:702
-msgid "Doc&umentation"
+#: clipboard/umlclipboard.cpp:843 uml.cpp:1447
+msgid "Paste Error"
 msgstr ""
 
-#: uml.cpp:712
-msgid "Co&mmand history"
+#: umlcanvasobject.cpp:191 model_utils.cpp:458
+msgid "new_association"
 msgstr ""
 
-#: uml.cpp:734 uml.cpp:1023 uml.cpp:1054
-msgid "Opening file..."
-msgstr "Agor ffeil..."
-
-#: uml.cpp:795 uml.cpp:1085 umldoc.cpp:274 umldoc.cpp:367 umldoc.cpp:417
-#: umldoc.cpp:439 umldoc.cpp:477 umldoc.cpp:489 umldoc.cpp:503 umldoc.cpp:515
-#: umldoc.cpp:527 umldoc.cpp:693 umldoc.cpp:700 umldoc.cpp:2700
-#: umldoc.cpp:2703
-msgid "Untitled"
+#: umlcanvasobject.cpp:194
+msgid "new_attribute"
 msgstr ""
 
-#: uml.cpp:1005
-msgid "Creating new document..."
-msgstr "Yn creu dogfen newydd..."
-
-#: uml.cpp:1031
-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"
+#: umlcanvasobject.cpp:197
+msgid "new_template"
 msgstr ""
 
-#: uml.cpp:1035
-msgid "Open File"
-msgstr "Agor Ffeil"
-
-#: uml.cpp:1084
-msgid "Saving file..."
-msgstr "Yn cadw ffeil..."
-
-#: uml.cpp:1100
-msgid "Saving file with a new filename..."
+#: umlcanvasobject.cpp:200
+msgid "new_operation"
 msgstr ""
 
-#: uml.cpp:1105
-msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+#: umlcanvasobject.cpp:203
+msgid "new_literal"
 msgstr ""
 
-#: uml.cpp:1123
-#, kde-format
-msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+#: umlcanvasobject.cpp:206
+msgid "new_field"
 msgstr ""
 
-#: uml.cpp:1124
-msgid "Warning"
+#: umlcanvasobject.cpp:209
+msgid "new_unique_constraint"
 msgstr ""
 
-#: uml.cpp:1124
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
-#: uml.cpp:1158
-msgid "Closing file..."
-msgstr "Yn cau ffeil..."
-
-#: uml.cpp:1167
-msgid "Printing..."
-msgstr "Argraffu..."
-
-#: uml.cpp:1175
-#, kde-format
-msgid "Print %1"
-msgstr "Argraffu %1"
-
-#: uml.cpp:1193
-msgid "Exiting..."
-msgstr "Terfynu..."
-
-#: uml.cpp:1256
-msgid "Cutting selection..."
-msgstr "Yn torri'r dewisiad..."
-
-#: uml.cpp:1273
-msgid "Copying selection to clipboard..."
-msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
-
-#: uml.cpp:1285
-msgid "Inserting clipboard contents..."
-msgstr "Yn mewnosod cynnwys y clipfwrdd..."
-
-#: uml.cpp:1290
-msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the "
-"clipboard may be of the wrong type to be pasted here."
+#: umlcanvasobject.cpp:212
+msgid "new_fkey_constraint"
 msgstr ""
 
-#: uml.cpp:1292 clipboard/umlclipboard.cpp:831
-msgid "Paste Error"
+#: umlcanvasobject.cpp:215
+msgid "new_check_constraint"
 msgstr ""
 
-#: uml.cpp:1854
-msgid "Cannot view code until you generate some first."
+#: entity.cpp:125 entity.cpp:178 entity.cpp:228 entity.cpp:277 enum.cpp:107
+#: package.cpp:174 umldoc.cpp:1379 umldoc.cpp:1413 object_factory.cpp:196
+#: classifier.cpp:393 classifier.cpp:770
+msgid "That is an invalid name."
 msgstr ""
 
-#: uml.cpp:1854 uml.cpp:1857
-msgid "Cannot View Code"
+#: entity.cpp:125 entity.cpp:178 entity.cpp:228 entity.cpp:277 enum.cpp:107
+#: package.cpp:175 umldoc.cpp:1284 umldoc.cpp:1349 umldoc.cpp:1379
+#: umldoc.cpp:1413 object_factory.cpp:197 dialogs/umlviewdialog.cpp:217
+#: classifier.cpp:393 classifier.cpp:770
+msgid "Invalid Name"
 msgstr ""
 
-#: uml.cpp:1857
-msgid "Cannot view code from simple code writer."
+#: entity.cpp:127 entity.cpp:180 entity.cpp:230 entity.cpp:279 umldoc.cpp:1386
+#: umldoc.cpp:1424 object_factory.cpp:207 classifier.cpp:396
+#: classifier.cpp:772
+msgid "That name is already being used."
 msgstr ""
 
-#: uml.cpp:2263
-msgid "*.idl|IDL Files (*.idl)"
+#: entity.cpp:127 entity.cpp:180 entity.cpp:230 entity.cpp:279 umldoc.cpp:1288
+#: umldoc.cpp:1358 umldoc.cpp:1386 umldoc.cpp:1424 object_factory.cpp:208
+#: classifier.cpp:396 classifier.cpp:772
+msgid "Not a Unique Name"
 msgstr ""
 
-#: uml.cpp:2265
-msgid "*.py|Python Files (*.py *.pyw)"
+#: umlview.cpp:324 umlview.cpp:394
+#, kde-format
+msgid "Diagram: %2 Page %1"
 msgstr ""
 
-#: uml.cpp:2267
-msgid "*.java|Java Files (*.java)"
+#: umlview.cpp:1077
+msgid "Change Line Color"
 msgstr ""
 
-#: uml.cpp:2269
-msgid "*.pas|Pascal Files (*.pas)"
+#: umlview.cpp:1106
+msgid "Change Fill Color"
 msgstr ""
 
-#: uml.cpp:2271
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+#: umlview.cpp:2795 toolbarstateother.cpp:283
+msgid "new state"
 msgstr ""
 
-#: uml.cpp:2273
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+#: umlview.cpp:2857
+msgid "Enter Diagram Name"
 msgstr ""
 
-#: uml.cpp:2275
-msgid "All Files"
-msgstr "Pob Ffeil"
+#: umlview.cpp:2858
+msgid "Enter the new name of the diagram:"
+msgstr ""
 
-#: uml.cpp:2277
-msgid "Select Code to Import"
+#: umlview.cpp:3019
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
 msgstr ""
 
-#: uml.cpp:2744
-msgid "XHTML Generation failed ."
+#: umlview.cpp:3021
+msgid "Delete Diagram?"
 msgstr ""
 
-#: object_factory.cpp:189
-msgctxt "UMLObject name"
-msgid "Name"
+#: umlview.cpp:3021 uml.cpp:422 umldoc.cpp:1470
+#: dialogs/umloperationdialog.cpp:166
+#: dialogs/umluniqueconstraintdialog.cpp:114
+#: dialogs/classifierlistpage.cpp:206
+#: dialogs/umlforeignkeyconstraintdialog.cpp:310
+msgid "&Delete"
 msgstr ""
 
-#: object_factory.cpp:189 umldoc.cpp:1233 umldoc.cpp:1276 umldoc.cpp:1307
-#: umldoc.cpp:1341 enumliteral.cpp:105 stereotype.cpp:95
-msgid "Enter name:"
-msgstr "Rhowch enw:"
+#: worktoolbar.cpp:300
+msgid "Object"
+msgstr "Gwrthrych"
 
-#: object_factory.cpp:194 package.cpp:168 umldoc.cpp:1312 umldoc.cpp:1346
-#: entity.cpp:125 entity.cpp:178 entity.cpp:228 entity.cpp:277 enum.cpp:107
-#: classifier.cpp:391 classifier.cpp:768
-msgid "That is an invalid name."
+#: worktoolbar.cpp:301
+msgid "Synchronous Message"
 msgstr ""
 
-#: object_factory.cpp:195 package.cpp:169 umldoc.cpp:1241 umldoc.cpp:1282
-#: umldoc.cpp:1312 umldoc.cpp:1346 entity.cpp:125 entity.cpp:178
-#: entity.cpp:228 entity.cpp:277 dialogs/umlviewdialog.cpp:211 enum.cpp:107
-#: classifier.cpp:391 classifier.cpp:768
-msgid "Invalid Name"
+#: worktoolbar.cpp:302
+msgid "Asynchronous Message"
 msgstr ""
 
-#: object_factory.cpp:200
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+#: worktoolbar.cpp:303
+msgid "Found Message"
 msgstr ""
 
-#: object_factory.cpp:201
-msgid "Reserved Keyword"
+#: worktoolbar.cpp:304
+msgid "Lost Message"
 msgstr ""
 
-#: object_factory.cpp:205 umldoc.cpp:1319 umldoc.cpp:1357 entity.cpp:127
-#: entity.cpp:180 entity.cpp:230 entity.cpp:279 classifier.cpp:394
-#: classifier.cpp:770
-msgid "That name is already being used."
+#: worktoolbar.cpp:305
+msgid "Combined Fragment"
 msgstr ""
 
-#: object_factory.cpp:206 umldoc.cpp:1255 umldoc.cpp:1291 umldoc.cpp:1319
-#: umldoc.cpp:1357 entity.cpp:127 entity.cpp:180 entity.cpp:230 entity.cpp:279
-#: classifier.cpp:394 classifier.cpp:770
-msgid "Not a Unique Name"
+#: worktoolbar.cpp:306
+msgid "Precondition"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:214
-#, kde-format
-msgid "Can not create directory: %1"
-msgstr ""
+#: worktoolbar.cpp:307 basictypes.cpp:392
+msgid "Association"
+msgstr "Cyd"
 
-#: umlviewimageexportermodel.cpp:232
-msgid "Can not save an empty diagram"
+#: worktoolbar.cpp:308 basictypes.cpp:404
+msgid "Containment"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:237
-#, kde-format
-msgid "A problem occurred while saving diagram in %1"
+#: worktoolbar.cpp:309 basictypes.cpp:412
+msgid "Anchor"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:243 umldoc.cpp:614 umldoc.cpp:624
-#: umldoc.cpp:641 umldoc.cpp:674 umldoc.cpp:692 umllistview.cpp:470
-#, kde-format
-msgid "There was a problem saving file: %1"
-msgstr ""
+#: worktoolbar.cpp:310
+msgid "Label"
+msgstr "Label"
 
-#: package.cpp:160
-msgctxt "object name"
-msgid "Name"
-msgstr ""
+#: worktoolbar.cpp:311
+msgid "Note"
+msgstr "Noder"
 
-#: package.cpp:161
-#, kde-format
-msgid ""
-"An object with the name %1\n"
-"already exists in the package %2.\n"
-"Please enter a new name:"
+#: worktoolbar.cpp:312
+msgid "Box"
 msgstr ""
 
-#: codeimport/classimport.cpp:43
-#, kde-format
-msgid "Importing file: %1 Progress: %2/%3"
+#: worktoolbar.cpp:313 listpopupmenu.cpp:710
+msgid "Actor"
 msgstr ""
 
-#: codeimport/classimport.cpp:48
-msgctxt "ready to status bar"
-msgid "Ready."
+#: worktoolbar.cpp:314 basictypes.cpp:390
+msgid "Dependency"
+msgstr "Dibyniaeth"
+
+#: worktoolbar.cpp:315 basictypes.cpp:388
+msgid "Aggregation"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Gwall Mewnol"
+#: worktoolbar.cpp:316 basictypes.cpp:424
+msgid "Relationship"
+msgstr "Perthynas"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-#, kde-format
-msgid "Syntax Error before '%1'"
+#: worktoolbar.cpp:317
+msgid "Directional Association"
 msgstr ""
 
-#: codeimport/kdevcppparser/errors.cpp:25
-#, kde-format
-msgid "Parse Error before '%1'"
+#: worktoolbar.cpp:318
+msgid "Implements"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:38
-#: codeimport/kdevcppparser/parser.cpp:1925
-#, kde-format
-msgid "'%1' expected found '%2'"
+#: worktoolbar.cpp:319 basictypes.cpp:406
+msgid "Composition"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:94
-msgid "<eof>"
+#: worktoolbar.cpp:320 listpopupmenu.cpp:713
+msgid "Use Case"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:278
-#: codeimport/kdevcppparser/parser.cpp:2672
-#: codeimport/kdevcppparser/parser.cpp:2880
-#: codeimport/kdevcppparser/parser.cpp:2886
-msgid "expression expected"
+#: worktoolbar.cpp:321
+msgctxt "UML class"
+msgid "Class"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:553
-msgid "Declaration syntax error"
+#: worktoolbar.cpp:322 listpopupmenu.cpp:1148
+msgid "Initial State"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:598
-#: codeimport/kdevcppparser/parser.cpp:2767
-#: codeimport/kdevcppparser/parser.cpp:3223
-msgid "} expected"
+#: worktoolbar.cpp:323
+msgid "Region"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:640
-msgid "namespace expected"
+#: worktoolbar.cpp:324 listpopupmenu.cpp:1149
+msgid "End State"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:644
-msgid "{ expected"
+#: worktoolbar.cpp:325 listpopupmenu.cpp:1165 dialogs/activitydialog.cpp:136
+msgid "Branch/Merge"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:718
-#: codeimport/kdevcppparser/parser.cpp:2970
-msgid "Namespace name expected"
+#: worktoolbar.cpp:326
+msgid "Send signal"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:826
-msgid "Need a type specifier to declare"
+#: worktoolbar.cpp:327
+msgid "Accept signal"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:900
-msgid "expected a declaration"
+#: worktoolbar.cpp:328
+msgid "Accept time event"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1173
-#: codeimport/kdevcppparser/parser.cpp:2160
-msgid "Constant expression expected"
+#: worktoolbar.cpp:329
+msgid "Fork/Join"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:1243
-#: codeimport/kdevcppparser/parser.cpp:1339
-msgid "')' expected"
-msgstr ""
+#: worktoolbar.cpp:330 listpopupmenu.cpp:833 listpopupmenu.cpp:924
+msgid "Package"
+msgstr "Pecyn"
 
-#: codeimport/kdevcppparser/parser.cpp:1411
-#: codeimport/kdevcppparser/parser.cpp:1875
-#: codeimport/kdevcppparser/parser.cpp:2377
-msgid "} missing"
+#: worktoolbar.cpp:331 listpopupmenu.cpp:667
+msgid "Component"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2055
-msgid "Member initializers expected"
-msgstr ""
+#: worktoolbar.cpp:332 listpopupmenu.cpp:681
+msgid "Node"
+msgstr "Nôd"
 
-#: codeimport/kdevcppparser/parser.cpp:2217
-msgid "Base class specifier expected"
+#: worktoolbar.cpp:333 listpopupmenu.cpp:670
+msgid "Artifact"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2242
-msgid "Initializer clause expected"
-msgstr ""
+#: worktoolbar.cpp:334 listpopupmenu.cpp:830
+msgid "Interface"
+msgstr "Rhyngwyneb"
 
-#: codeimport/kdevcppparser/parser.cpp:2286
-msgid "Identifier expected"
+#: worktoolbar.cpp:335 listpopupmenu.cpp:831
+msgid "Datatype"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2322
-msgid "Type id expected"
+#: worktoolbar.cpp:336 listpopupmenu.cpp:832
+msgid "Enum"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2359
-msgid "Class name expected"
+#: worktoolbar.cpp:337 listpopupmenu.cpp:697
+msgid "Entity"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2632
-#: codeimport/kdevcppparser/parser.cpp:2794
-#: codeimport/kdevcppparser/parser.cpp:2837
-#: codeimport/kdevcppparser/parser.cpp:3283
-msgid "condition expected"
+#: worktoolbar.cpp:338
+msgid "Deep History"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2640
-#: codeimport/kdevcppparser/parser.cpp:2663
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
+#: worktoolbar.cpp:339
+msgid "Shallow History"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2700
-msgid "for initialization expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr ""
-
-#: codeimport/import_utils.cpp:215
-#, kde-format
-msgid "Is the scope %1 a namespace or a class?"
+#: worktoolbar.cpp:340
+msgctxt "join states"
+msgid "Join"
 msgstr ""
 
-#: codeimport/import_utils.cpp:216
-msgid "C++ Import Requests Your Help"
+#: worktoolbar.cpp:341
+msgid "Fork"
 msgstr ""
 
-#: codeimport/import_utils.cpp:217
-msgctxt "namespace scope"
-msgid "Namespace"
+#: worktoolbar.cpp:342
+msgid "Junction"
 msgstr ""
 
-#: codeimport/import_utils.cpp:217
-msgctxt "class scope"
-msgid "Class"
+#: worktoolbar.cpp:343
+msgctxt "state choice"
+msgid "Choice"
 msgstr ""
 
-#. i18n: file: codegenwizard/codegenoptionspage.ui:20
-#. i18n: ectx: property (windowTitle), widget (QWidget, CodeGenOptionsPage)
-#: codegenwizard/codegenoptionspage.cpp:42 rc.cpp:549
-msgid "Code Generation Options"
+#: worktoolbar.cpp:346
+msgid "And Line"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:43
-msgid "Adjust code generation options."
+#: worktoolbar.cpp:347 basictypes.cpp:414
+msgid "State Transition"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:198
-msgid "Language Options"
+#: worktoolbar.cpp:348
+msgid "Activity Transition"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:259
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: worktoolbar.cpp:349 basictypes.cpp:416 dialogs/activitydialog.cpp:136
+msgid "Activity"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:260
-msgid "Error Writing to Output Folder"
+#: worktoolbar.cpp:350
+msgctxt "state diagram"
+msgid "State"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:265
-#, kde-format
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
+#: worktoolbar.cpp:351 listpopupmenu.cpp:1163
+msgid "End Activity"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:266
-msgid "Please Choose Valid Folder"
+#: worktoolbar.cpp:352
+msgid "Final Activity"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:272
-#, kde-format
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: worktoolbar.cpp:353
+msgid "Pin"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:273
-#: codegenwizard/codegenoptionspage.cpp:285
-msgid "Output Folder Does Not Exist"
+#: worktoolbar.cpp:354 listpopupmenu.cpp:1162
+msgid "Initial Activity"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:273
-msgid "Create Folder"
-msgstr "Creu Plygell"
+#: worktoolbar.cpp:355
+msgid "Message"
+msgstr "Neges"
 
-#: codegenwizard/codegenoptionspage.cpp:273
-msgid "Do Not Create"
+#: worktoolbar.cpp:356 basictypes.cpp:418
+msgid "Exception"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:277
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select "
-"another, valid, folder."
+#: worktoolbar.cpp:357
+msgid "Object Node"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:278
-msgid "Error Creating Folder"
+#: worktoolbar.cpp:358
+msgid "Pre/Post condition"
 msgstr ""
 
-#: codegenwizard/codegenoptionspage.cpp:284
-msgid "Please select a valid folder."
+#: worktoolbar.cpp:359 listpopupmenu.cpp:707
+msgid "Category"
 msgstr ""
 
-#: codegenwizard/codegenerationwizard.cpp:44
-msgid "Code Generation Wizard"
+#: worktoolbar.cpp:360 basictypes.cpp:420
+msgid "Category to Parent"
 msgstr ""
 
-#: codegenwizard/codegenstatuspage.cpp:44
-msgid "Status of Code Generation Progress"
+#: worktoolbar.cpp:361 basictypes.cpp:422
+msgid "Child to Category"
 msgstr ""
 
-#: codegenwizard/codegenstatuspage.cpp:45
-msgid ""
-"Press the button Generate to start the code generation.\n"
-"Check the success state for every class."
+#: worktoolbar.cpp:372
+msgctxt "selection arrow"
+msgid "Select"
 msgstr ""
 
-#: codegenwizard/codegenstatuspage.cpp:84
-msgid "Not Yet Generated"
+#: umllistviewitem.cpp:574 umllistviewitem.cpp:607 umllistviewitem.cpp:638
+#: umllistviewitem.cpp:665
+msgid "Rename canceled"
 msgstr ""
 
-#: codegenwizard/codegenstatuspage.cpp:154
-msgid "Code Generated"
+#: umllistviewitem.cpp:699
+#, kde-format
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: codegenwizard/codegenstatuspage.cpp:158
-msgid "Not Generated"
+#: umllistviewitem.cpp:700
+msgid "Function Not Implemented"
 msgstr ""
 
-#: codegenwizard/codegenselectpage.cpp:36
-msgid "Select Classes"
+#: umllistviewitem.cpp:714
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
 
-#: codegenwizard/codegenselectpage.cpp:37
+#: controller/umlwidgetcontroller.cpp:195
 msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list."
+"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 ""
 
-#: umldoc.cpp:86 umldoc.cpp:1876
-msgid "UML Model"
+#: controller/umlwidgetcontroller.cpp:661
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
+"axis. Right button click to cancel resize."
 msgstr ""
 
-#: umldoc.cpp:118
-msgid "Logical View"
+#: codeimpwizard/codeimpthread.cpp:59
+#, kde-format
+msgid "Importing file: %1"
 msgstr ""
 
-#: umldoc.cpp:119
-msgid "Use Case View"
+#: codeimpwizard/codeimpthread.cpp:63
+msgctxt "show failed on status bar"
+msgid "Failed."
 msgstr ""
 
-#: umldoc.cpp:120
-msgid "Component View"
+#: codeimpwizard/codeimpthread.cpp:69
+msgctxt "show Ready on status bar"
+msgid "Ready."
 msgstr ""
 
-#: umldoc.cpp:121
-msgid "Deployment View"
+#: codeimpwizard/codeimpthread.cpp:78
+#, kde-format
+msgid "No code importer for file: %1"
 msgstr ""
 
-#: umldoc.cpp:122
-msgid "Entity Relationship Model"
+#: codeimpwizard/codeimportingwizard.cpp:53
+msgid "Code Importing Wizard"
 msgstr ""
 
-#: umldoc.cpp:129 umldoc.cpp:341
-msgid "Datatypes"
+#: codeimpwizard/codeimpstatuspage.cpp:52
+msgid "Status of Code Importing Progress"
 msgstr ""
 
-#: umldoc.cpp:269
+#: codeimpwizard/codeimpstatuspage.cpp:53
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
+"Press the button 'Start import' to start the code import.\n"
+"Check the success state for every class."
 msgstr ""
-"Addaswyd y ffeil gyfredol.\n"
-"Hoffech ei chadw?"
 
-#: umldoc.cpp:270
-msgctxt "warning message"
-msgid "Warning"
+#: codeimpwizard/codeimpstatuspage.cpp:101
+#: codegenwizard/codegenstatuspage.cpp:87
+msgid "Not Yet Generated"
 msgstr ""
 
-#: umldoc.cpp:416
+#: codeimpwizard/codeimpstatuspage.cpp:128
 #, kde-format
-msgid "The file %1 does not exist."
-msgstr "Nid yw'r ffeil %1 yn bodoli!."
-
-#: umldoc.cpp:416 umldoc.cpp:438 umldoc.cpp:476 umldoc.cpp:488 umldoc.cpp:502
-#: umldoc.cpp:514 umldoc.cpp:526 umldoc.cpp:544 folder.cpp:405 folder.cpp:409
-msgid "Load Error"
-msgstr "Gwall Llwytho"
+msgid "<b>Code import of %1 files:</b><br>"
+msgstr ""
 
-#: umldoc.cpp:438
-#, kde-format
-msgid "The file %1 seems to be corrupted."
+#: codeimpwizard/codeimpstatuspage.cpp:144
+#: codeimpwizard/codeimpstatuspage.cpp:151
+msgid "importing file ... DONE<br>"
 msgstr ""
 
-#: umldoc.cpp:475 umldoc.cpp:487 umldoc.cpp:513
-#, kde-format
-msgid "There was no XMI file found in the compressed file %1."
+#: codeimpwizard/codeimpstatuspage.cpp:145
+#: codeimpwizard/codeimpstatuspage.cpp:152
+msgid "Import Done"
 msgstr ""
 
-#: umldoc.cpp:501
-#, kde-format
-msgid "There was a problem loading the extracted file: %1"
+#: codeimpwizard/codeimpstatuspage.cpp:156
+msgid "importing file ..."
 msgstr ""
 
-#: umldoc.cpp:525 umldoc.cpp:543
-#, kde-format
-msgid "There was a problem loading file: %1"
+#: codeimpwizard/codeimpstatuspage.cpp:272
+msgid "Not Imported"
 msgstr ""
 
-#: umldoc.cpp:614 umldoc.cpp:624 umldoc.cpp:641 umldoc.cpp:674 umldoc.cpp:692
-#: umldoc.cpp:699 umllistview.cpp:471
-msgid "Save Error"
-msgstr "Gwall Cadw"
+#: codeimpwizard/codeimpselectpage.cpp:47
+msgid "Code Importing Path"
+msgstr ""
 
-#: umldoc.cpp:699
-#, kde-format
-msgid "There was a problem uploading file: %1"
+#: codeimpwizard/codeimpselectpage.cpp:48
+msgid "Select the code importing path."
 msgstr ""
 
-#: umldoc.cpp:1152
-msgid "use case diagram"
+#: codeimpwizard/codeimpselectpage.cpp:110
+msgid "File System Model"
 msgstr ""
 
-#: umldoc.cpp:1155
-msgid "class diagram"
+#: codeimpwizard/codeimpselectpage.cpp:135
+msgid "Select the desired language to filter files."
 msgstr ""
 
-#: umldoc.cpp:1158
-msgid "sequence diagram"
+#: codeimpwizard/codeimpselectpage.cpp:136
+msgid "Select also all the files in the subdirectories."
 msgstr ""
 
-#: umldoc.cpp:1161
-msgid "collaboration diagram"
+#: codeimpwizard/codeimpselectpage.cpp:137
+msgid "Select all the files below the current directory."
 msgstr ""
 
-#: umldoc.cpp:1164
-msgid "state diagram"
+#: codeimpwizard/codeimpselectpage.cpp:138
+msgid "Clear all selections."
 msgstr ""
 
-#: umldoc.cpp:1167
-msgid "activity diagram"
+#: codeimpwizard/codeimpselectpage.cpp:139
+msgid "Add file extensions like e.g. '*.h *.hpp'."
 msgstr ""
 
-#: umldoc.cpp:1170
-msgid "component diagram"
+#: operation.cpp:274
+msgid "new_parameter"
 msgstr ""
 
-#: umldoc.cpp:1173
-msgid "deployment diagram"
+#: main.cpp:36 main.cpp:68
+msgid "Umbrello UML Modeller"
 msgstr ""
 
-#: umldoc.cpp:1176
-msgid "entity relationship diagram"
+#: main.cpp:70
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 
-#: umldoc.cpp:1233
-msgctxt "diagram name"
-msgid "Name"
+#: main.cpp:72
+msgid "Paul Hensgen"
 msgstr ""
 
-#: umldoc.cpp:1241 umldoc.cpp:1282
-msgid "That is an invalid name for a diagram."
+#: main.cpp:73 docgenerators/main.cpp:56
+msgid "Umbrello UML Modeller Authors"
 msgstr ""
 
-#: umldoc.cpp:1255 umldoc.cpp:1291
-msgid "A diagram is already using that name."
+#: main.cpp:77
+msgid "File to open"
+msgstr "Ffeil i agor"
+
+#: main.cpp:78
+msgid "export diagrams to extension and exit"
 msgstr ""
 
-#: umldoc.cpp:1276
-msgctxt "renaming diagram"
-msgid "Name"
+#: main.cpp:79
+msgid "list available export extensions"
 msgstr ""
 
-#: umldoc.cpp:1307
-msgctxt "renaming uml object"
-msgid "Name"
+#: main.cpp:80
+msgid "the local directory to save the exported diagrams in"
 msgstr ""
 
-#: umldoc.cpp:1341
-msgctxt "renaming child uml object"
-msgid "Name"
+#: main.cpp:80
+msgid "the directory of the file"
 msgstr ""
 
-#: umldoc.cpp:1351 umllistview.cpp:2191
+#: main.cpp:81
 msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
+"keep the tree structure used to store the views in the document in the "
+"target directory"
 msgstr ""
 
-#: umldoc.cpp:1352 umllistview.cpp:2192 umllistview.cpp:2199
-#: umllistview.cpp:2461 dialogs/umlviewdialog.cpp:217
-msgid "Name Not Unique"
+#: umlviewimageexporterall.cpp:77 docgenerators/docbookgenerator.cpp:80
+msgid "Exporting all views..."
 msgstr ""
 
-#: umldoc.cpp:1352 umllistview.cpp:2192
-msgid "Use Name"
+#: umlviewimageexporterall.cpp:82 docgenerators/docbookgenerator.cpp:85
+msgid "Some errors happened when exporting the images:"
 msgstr ""
 
-#: umldoc.cpp:1352 umllistview.cpp:2192
-msgid "Enter New Name"
+#: umlviewimageexporterall.cpp:84 umlviewimageexporter.cpp:77 uml.cpp:1471
+msgctxt "reset status bar"
+msgid "Ready."
 msgstr ""
 
-#: umldoc.cpp:1402
+#: codeimport/kdevcppparser/parser.cpp:38
+#: codeimport/kdevcppparser/parser.cpp:1944
 #, kde-format
-msgid "Are you sure you want to delete diagram %1?"
-msgstr ""
-
-#: umldoc.cpp:1403
-msgid "Delete Diagram"
+msgid "'%1' expected found '%2'"
 msgstr ""
 
-#: umldoc.cpp:1932
-msgid "Setting up the document..."
+#: codeimport/kdevcppparser/parser.cpp:93
+msgid "<eof>"
 msgstr ""
 
-#: umldoc.cpp:1961
-msgid "Resolving object references..."
+#: codeimport/kdevcppparser/parser.cpp:277
+#: codeimport/kdevcppparser/parser.cpp:2691
+#: codeimport/kdevcppparser/parser.cpp:2899
+#: codeimport/kdevcppparser/parser.cpp:2905
+msgid "expression expected"
 msgstr ""
 
-#: umldoc.cpp:2012
-msgid "Loading UML elements..."
+#: codeimport/kdevcppparser/parser.cpp:572
+msgid "Declaration syntax error"
 msgstr ""
 
-#: umldoc.cpp:2207
-msgid "Loading diagrams..."
+#: codeimport/kdevcppparser/parser.cpp:617
+#: codeimport/kdevcppparser/parser.cpp:2786
+#: codeimport/kdevcppparser/parser.cpp:3242
+msgid "} expected"
 msgstr ""
 
-#: umldoc.cpp:2701
-#, kde-format
-msgid "/autosave%1"
+#: codeimport/kdevcppparser/parser.cpp:659
+msgid "namespace expected"
 msgstr ""
 
-#: umllistview.cpp:431
-msgid "Externalize Folder"
+#: codeimport/kdevcppparser/parser.cpp:663
+msgid "{ expected"
 msgstr ""
 
-#: umllistview.cpp:500
-msgid "Enter Model Name"
+#: codeimport/kdevcppparser/parser.cpp:737
+#: codeimport/kdevcppparser/parser.cpp:2989
+msgid "Namespace name expected"
 msgstr ""
 
-#: umllistview.cpp:501
-msgid "Enter the new name of the model:"
+#: codeimport/kdevcppparser/parser.cpp:845
+msgid "Need a type specifier to declare"
 msgstr ""
 
-#: umllistview.cpp:1228
-msgid "Views"
-msgstr "Golygon"
-
-#: umllistview.cpp:2181
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+#: codeimport/kdevcppparser/parser.cpp:919
+msgid "expected a declaration"
 msgstr ""
 
-#: umllistview.cpp:2182 umllistviewitem.cpp:664
-msgid "Name Not Valid"
+#: codeimport/kdevcppparser/parser.cpp:1192
+#: codeimport/kdevcppparser/parser.cpp:2179
+msgid "Constant expression expected"
 msgstr ""
 
-#: umllistview.cpp:2198 umllistview.cpp:2460
-msgid ""
-"The name you entered was not unique.\n"
-"Creation process has been canceled."
+#: codeimport/kdevcppparser/parser.cpp:1262
+#: codeimport/kdevcppparser/parser.cpp:1358
+msgid "')' expected"
 msgstr ""
 
-#: umllistview.cpp:2418 umllistview.cpp:2435 umllistview.cpp:2450
-#: umllistview.cpp:2480
-msgid "Creation canceled"
+#: codeimport/kdevcppparser/parser.cpp:1430
+#: codeimport/kdevcppparser/parser.cpp:1894
+#: codeimport/kdevcppparser/parser.cpp:2396
+msgid "} missing"
 msgstr ""
 
-#: umllistview.cpp:2691
-msgid "Loading listview..."
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
 msgstr ""
 
-#: umllistview.cpp:3066
-msgid "The folder must be emptied before it can be deleted."
+#: codeimport/kdevcppparser/parser.cpp:2236
+msgid "Base class specifier expected"
 msgstr ""
 
-#: umllistview.cpp:3067
-msgid "Folder Not Empty"
+#: codeimport/kdevcppparser/parser.cpp:2261
+msgid "Initializer clause expected"
 msgstr ""
 
-#: umllistviewitem.cpp:525 umllistviewitem.cpp:558 umllistviewitem.cpp:589
-#: umllistviewitem.cpp:616
-msgid "Rename canceled"
+#: codeimport/kdevcppparser/parser.cpp:2305
+msgid "Identifier expected"
 msgstr ""
 
-#: umllistviewitem.cpp:649
-#, kde-format
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: codeimport/kdevcppparser/parser.cpp:2341
+msgid "Type id expected"
 msgstr ""
 
-#: umllistviewitem.cpp:650
-msgid "Function Not Implemented"
+#: codeimport/kdevcppparser/parser.cpp:2378
+msgid "Class name expected"
 msgstr ""
 
-#: umllistviewitem.cpp:663
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: codeimport/kdevcppparser/parser.cpp:2651
+#: codeimport/kdevcppparser/parser.cpp:2813
+#: codeimport/kdevcppparser/parser.cpp:2856
+#: codeimport/kdevcppparser/parser.cpp:3302
+msgid "condition expected"
 msgstr ""
 
-#: operation.cpp:273
-msgid "new_parameter"
+#: codeimport/kdevcppparser/parser.cpp:2659
+#: codeimport/kdevcppparser/parser.cpp:2682
+#: codeimport/kdevcppparser/parser.cpp:2821
+#: codeimport/kdevcppparser/parser.cpp:2832
+msgid "statement expected"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:49
-msgid "Name"
-msgstr "Enw"
-
-#: refactoring/refactoringassistant.cpp:437
-msgid "Add Base Class"
+#: codeimport/kdevcppparser/parser.cpp:2719
+msgid "for initialization expected"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:438
-msgid "Add Derived Class"
+#: codeimport/kdevcppparser/parser.cpp:3292
+msgid "catch expected"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:440
-#: refactoring/refactoringassistant.cpp:446
-#: refactoring/refactoringassistant.cpp:458
-msgid "Add Operation"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:441
-#: refactoring/refactoringassistant.cpp:461
-msgid "Add Attribute"
-msgstr ""
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Gwall Mewnol"
 
-#: refactoring/refactoringassistant.cpp:444
-msgid "Add Base Interface"
+#: codeimport/kdevcppparser/errors.cpp:24
+#, kde-format
+msgid "Syntax Error before '%1'"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:445
-msgid "Add Derived Interface"
+#: codeimport/kdevcppparser/errors.cpp:25
+#, kde-format
+msgid "Parse Error before '%1'"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:453 dialogs/activitydialog.cpp:36
-#: dialogs/activitydialog.cpp:146 dialogs/assocgenpage.cpp:60
-#: dialogs/statedialog.cpp:37 dialogs/statedialog.cpp:125
-#: dialogs/objectnodedialog.cpp:39 dialogs/parmpropdlg.cpp:71
-#: dialogs/classpropdlg.cpp:109 dialogs/umlviewdialog.cpp:35
-#: listpopupmenu.cpp:583
-msgid "Properties"
+#: codeimport/import_utils.cpp:240
+#, kde-format
+msgid "Is the scope %1 a namespace or a class?"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:454 dialogs/activitypage.cpp:104
-#: listpopupmenu.cpp:589
-msgid "Delete"
+#: codeimport/import_utils.cpp:241
+msgid "C++ Import Requests Your Help"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:504
-#: refactoring/refactoringassistant.cpp:684
-msgid "Base Classifiers"
+#: codeimport/import_utils.cpp:242
+msgctxt "namespace scope"
+msgid "Namespace"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:549
-#: refactoring/refactoringassistant.cpp:699
-msgid "Derived Classifiers"
+#: codeimport/import_utils.cpp:242
+msgctxt "class scope"
+msgid "Class"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:658 dialogs/classifierlistpage.cpp:115
-#: dialogs/classpropdlg.cpp:265 listpopupmenu.cpp:909
-msgid "Attributes"
-msgstr "Priodweddion"
-
-#: refactoring/refactoringassistant.cpp:674 dialogs/classifierlistpage.cpp:119
-#: dialogs/classpropdlg.cpp:277 listpopupmenu.cpp:912
-msgid "Operations"
-msgstr "Gweithrediadau"
-
-#: refactoring/refactoringassistant.cpp:805 dialogs/umloperationdialog.cpp:446
+#: codeimport/classimport.cpp:74
 #, kde-format
-msgid "An operation with that signature already exists in %1.\n"
-msgstr ""
-
-#: refactoring/refactoringassistant.cpp:807 dialogs/umloperationdialog.cpp:448
-msgid "Choose a different name or parameter list."
+msgid "Importing file: %1 Progress: %2/%3"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:808 dialogs/umloperationdialog.cpp:437
-#: dialogs/umloperationdialog.cpp:449
-msgid "Operation Name Invalid"
+#: codeimport/classimport.cpp:80
+msgctxt "ready to status bar"
+msgid "Ready."
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:826
-#, kde-format
-msgid "An attribute with that name already exists in %1.\n"
+#: model_utils.cpp:434 dialogs/classwizard.cpp:44
+msgid "new_class"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:828
-msgid "Choose a different name."
+#: model_utils.cpp:436
+msgid "new_actor"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:829 dialogs/umlattributedialog.cpp:161
-msgid "Attribute Name Invalid"
+#: model_utils.cpp:438
+msgid "new_usecase"
 msgstr ""
 
-#: main.cpp:36 main.cpp:68
-msgid "Umbrello UML Modeller"
+#: model_utils.cpp:440
+msgid "new_package"
 msgstr ""
 
-#: main.cpp:70
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+#: model_utils.cpp:442
+msgid "new_component"
 msgstr ""
 
-#: main.cpp:72
-msgid "Paul Hensgen"
+#: model_utils.cpp:444
+msgid "new_node"
 msgstr ""
 
-#: main.cpp:73 docgenerators/main.cpp:57
-msgid "Umbrello UML Modeller Authors"
+#: model_utils.cpp:446
+msgid "new_artifact"
 msgstr ""
 
-#: main.cpp:77
-msgid "File to open"
-msgstr "Ffeil i agor"
-
-#: main.cpp:78
-msgid "export diagrams to extension and exit"
+#: model_utils.cpp:448
+msgid "new_interface"
 msgstr ""
 
-#: main.cpp:79
-msgid "list available export extensions"
+#: model_utils.cpp:450
+msgid "new_datatype"
 msgstr ""
 
-#: main.cpp:80
-msgid "the local directory to save the exported diagrams in"
+#: model_utils.cpp:452
+msgid "new_enum"
 msgstr ""
 
-#: main.cpp:80
-msgid "the directory of the file"
+#: model_utils.cpp:454
+msgid "new_entity"
 msgstr ""
 
-#: main.cpp:81
-msgid ""
-"keep the tree structure used to store the views in the document in the "
-"target directory"
+#: model_utils.cpp:456
+msgid "new_folder"
 msgstr ""
 
-#: umlview.cpp:317 umlview.cpp:387
-#, kde-format
-msgid "Diagram: %2 Page %1"
+#: model_utils.cpp:460
+msgid "new_category"
 msgstr ""
 
-#: cmds/widget/cmd_changeLineColor.cpp:34 umlview.cpp:1057
-msgid "Change Line Color"
+#: model_utils.cpp:462
+msgid "new_object"
 msgstr ""
 
-#: cmds/widget/cmd_changeFillColor.cpp:26 umlview.cpp:1086
-msgid "Change Fill Color"
+#: model_utils.cpp:863
+msgid "OK"
 msgstr ""
 
-#: umlview.cpp:2731 widgets/statewidget.cpp:175 toolbarstateother.cpp:256
-msgid "Enter State Name"
+#: model_utils.cpp:863
+msgctxt "parse status"
+msgid "Empty"
 msgstr ""
 
-#: umlview.cpp:2732 widgets/statewidget.cpp:175 toolbarstateother.cpp:257
-msgid "Enter the name of the new state:"
+#: model_utils.cpp:863
+msgid "Malformed argument"
 msgstr ""
 
-#: umlview.cpp:2733 toolbarstateother.cpp:257
-msgid "new state"
+#: model_utils.cpp:864
+msgid "Unknown argument type"
 msgstr ""
 
-#: umlview.cpp:2763 widgets/activitywidget.cpp:265 toolbarstateother.cpp:227
-msgid "Enter Activity Name"
+#: model_utils.cpp:864
+msgid "Illegal method name"
 msgstr ""
 
-#: umlview.cpp:2764 dialogs/activitypage.cpp:176 widgets/statewidget.cpp:185
-#: widgets/activitywidget.cpp:265 toolbarstateother.cpp:228
-msgid "Enter the name of the new activity:"
+#: model_utils.cpp:865
+msgid "Unknown return type"
 msgstr ""
 
-#: umlview.cpp:2765 dialogs/activitypage.cpp:176 widgets/statewidget.cpp:185
-#: toolbarstateother.cpp:228
-msgid "new activity"
+#: model_utils.cpp:865
+msgid "Unspecified error"
 msgstr ""
 
-#: umlview.cpp:2795
-msgid "Enter Diagram Name"
+#: codegenwizard/codegenerationwizard.cpp:43
+msgid "Code Generation Wizard"
 msgstr ""
 
-#: umlview.cpp:2796
-msgid "Enter the new name of the diagram:"
+#: codegenwizard/codegenstatuspage.cpp:45
+msgid "Status of Code Generation Progress"
 msgstr ""
 
-#: umlview.cpp:2957
+#: codegenwizard/codegenstatuspage.cpp:46
 msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+"Press the button Generate to start the code generation.\n"
+"Check the success state for every class."
 msgstr ""
 
-#: umlview.cpp:2959
-msgid "Delete Diagram?"
+#: codegenwizard/codegenstatuspage.cpp:159
+msgid "Code Generated"
 msgstr ""
 
-#: umlviewimageexporterall.cpp:77 docgenerators/docbookgenerator.cpp:81
-msgid "Exporting all views..."
+#: codegenwizard/codegenstatuspage.cpp:163
+msgid "Not Generated"
 msgstr ""
 
-#: umlviewimageexporterall.cpp:82 docgenerators/docbookgenerator.cpp:86
-msgid "Some errors happened when exporting the images:"
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, CodeImpSelectPage)
+#. i18n: file: codegenwizard/codegenoptionspage.ui:20
+#. i18n: ectx: property (windowTitle), widget (QWidget, CodeGenOptionsPage)
+#: codegenwizard/codegenoptionspage.cpp:40 rc.cpp:35 rc.cpp:86
+msgid "Code Generation Options"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:90
-msgid "Generating Docbook..."
+#: codegenwizard/codegenoptionspage.cpp:41
+msgid "Adjust code generation options."
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:110
-msgid "Docbook Generation Complete..."
+#: codegenwizard/codegenoptionspage.cpp:196
+msgid "Language Options"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:113
-msgid "Docbook Generation Failed..."
+#: codegenwizard/codegenoptionspage.cpp:257
+msgid ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
 
-#: docgenerators/main.cpp:39 docgenerators/main.cpp:52
-msgid "Umbrello UML Modeller autonomous code generator"
+#: codegenwizard/codegenoptionspage.cpp:258
+msgid "Error Writing to Output Folder"
 msgstr ""
 
-#: docgenerators/main.cpp:54
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
+#: codegenwizard/codegenoptionspage.cpp:263
+#, kde-format
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
 msgstr ""
 
-#: docgenerators/main.cpp:56
-msgid "Gael de Chalendar (aka Kleag)"
+#: codegenwizard/codegenoptionspage.cpp:264
+msgid "Please Choose Valid Folder"
 msgstr ""
 
-#: docgenerators/main.cpp:61
-msgid "File to transform"
+#: codegenwizard/codegenoptionspage.cpp:270
+#, kde-format
+msgid "The folder %1 does not exist. Do you want to create it now?"
 msgstr ""
 
-#: docgenerators/main.cpp:62
-msgid "The XSLT file to use"
+#: codegenwizard/codegenoptionspage.cpp:271
+#: codegenwizard/codegenoptionspage.cpp:283
+msgid "Output Folder Does Not Exist"
 msgstr ""
 
-#: docgenerators/xhtmlgenerator.cpp:108
-msgid "Generating XHTML..."
+#: codegenwizard/codegenoptionspage.cpp:271
+msgid "Create Folder"
+msgstr "Creu Plygell"
+
+#: codegenwizard/codegenoptionspage.cpp:271
+msgid "Do Not Create"
 msgstr ""
 
-#: docgenerators/xhtmlgenerator.cpp:134
-msgid "XHTML Generation Complete..."
+#: codegenwizard/codegenoptionspage.cpp:275
+msgid ""
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
 
-#: docgenerators/xhtmlgenerator.cpp:140
-msgid "Copying CSS..."
+#: codegenwizard/codegenoptionspage.cpp:276
+msgid "Error Creating Folder"
 msgstr ""
 
-#: docgenerators/xhtmlgenerator.cpp:148
-msgid "Finished Copying CSS..."
+#: codegenwizard/codegenoptionspage.cpp:282
+msgid "Please select a valid folder."
 msgstr ""
 
-#: docgenerators/xhtmlgenerator.cpp:151
-msgid "Failed Copying CSS..."
+#: codegenwizard/codegenselectpage.cpp:34
+msgid "Select Classes"
 msgstr ""
 
-#: docgenerators/docbook2xhtmlgeneratorjob.cpp:56
-msgid "Exporting to XHTML..."
+#: codegenwizard/codegenselectpage.cpp:35
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list."
 msgstr ""
 
-#: docgenerators/docbookgeneratorjob.cpp:80
-msgid "Exporting to DocBook..."
+#: toolbarstateother.cpp:261
+msgid "Enter Signal Name"
 msgstr ""
 
-#: umlcanvasobject.cpp:191 model_utils.cpp:428
-msgid "new_association"
+#: toolbarstateother.cpp:262
+msgid "Enter Signal"
 msgstr ""
 
-#: umlcanvasobject.cpp:194
-msgid "new_attribute"
+#: toolbarstateother.cpp:262
+msgid "new Signal"
 msgstr ""
 
-#: umlcanvasobject.cpp:197
-msgid "new_template"
+#: toolbarstateother.cpp:268
+msgid "Enter Time Event Name"
 msgstr ""
 
-#: umlcanvasobject.cpp:200
-msgid "new_operation"
+#: toolbarstateother.cpp:269
+msgid "Enter Time Event"
 msgstr ""
 
-#: umlcanvasobject.cpp:203
-msgid "new_literal"
+#: toolbarstateother.cpp:269
+msgid "new time event"
 msgstr ""
 
-#: umlcanvasobject.cpp:206
-msgid "new_field"
+#: toolbarstateother.cpp:275
+msgid "Enter Combined Fragment Name"
 msgstr ""
 
-#: umlcanvasobject.cpp:209
-msgid "new_unique_constraint"
+#: toolbarstateother.cpp:276
+msgid "Enter the Combined Fragment"
 msgstr ""
 
-#: umlcanvasobject.cpp:212
-msgid "new_fkey_constraint"
+#: toolbarstateother.cpp:276
+msgid "new Combined Fragment"
 msgstr ""
 
-#: umlcanvasobject.cpp:215
-msgid "new_check_constraint"
+#: debug/debug_utils.cpp:44
+msgid "Class Name"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:42
-msgid "&Diagrams"
+#: stereotype.cpp:112 listpopupmenu.cpp:927
+msgid "Stereotype"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:47
-msgid "Filter"
-msgstr "Hidlo"
+#: refactoring/refactoringassistant.cpp:49
+msgid "Name"
+msgstr "Enw"
 
-#: dialogs/diagramprintpage.cpp:54
-msgid "&Current diagram"
+#: refactoring/refactoringassistant.cpp:437
+msgid "Add Base Class"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:58
-msgid "&All diagrams"
+#: refactoring/refactoringassistant.cpp:438
+msgid "Add Derived Class"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Select diagrams"
+#: refactoring/refactoringassistant.cpp:440
+#: refactoring/refactoringassistant.cpp:446
+#: refactoring/refactoringassistant.cpp:458
+msgid "Add Operation"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:64
-msgid "&Type of diagram"
+#: refactoring/refactoringassistant.cpp:441
+#: refactoring/refactoringassistant.cpp:461
+msgid "Add Attribute"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:67
-msgctxt "diagram selection for printing"
-msgid "Selection"
+#: refactoring/refactoringassistant.cpp:444
+msgid "Add Base Interface"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:157
-msgid "No diagrams selected."
+#: refactoring/refactoringassistant.cpp:445
+msgid "Add Derived Interface"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, ui_propsGroupBox)
-#: dialogs/umlroledialog.cpp:25 rc.cpp:765
-msgid "Role Properties"
+#: refactoring/refactoringassistant.cpp:453 listpopupmenu.cpp:585
+#: dialogs/statedialog.cpp:37 dialogs/statedialog.cpp:125
+#: dialogs/classpropdlg.cpp:128 dialogs/parmpropdlg.cpp:71
+#: dialogs/activitydialog.cpp:36 dialogs/activitydialog.cpp:145
+#: dialogs/umlviewdialog.cpp:39 dialogs/objectnodedialog.cpp:39
+#: dialogs/assocgenpage.cpp:69
+msgid "Properties"
 msgstr ""
 
-#: dialogs/constraintlistpage.cpp:70 listpopupmenu.cpp:1178
-msgid "Unique Constraint..."
+#: refactoring/refactoringassistant.cpp:454 listpopupmenu.cpp:591
+#: dialogs/activitypage.cpp:104
+msgid "Delete"
 msgstr ""
 
-#: dialogs/constraintlistpage.cpp:73 listpopupmenu.cpp:1177
-msgid "Primary Key Constraint..."
+#: refactoring/refactoringassistant.cpp:504
+#: refactoring/refactoringassistant.cpp:684
+msgid "Base Classifiers"
 msgstr ""
 
-#: dialogs/constraintlistpage.cpp:76 listpopupmenu.cpp:1179
-msgid "Foreign Key Constraint..."
-msgstr ""
+#: refactoring/refactoringassistant.cpp:549
+#: refactoring/refactoringassistant.cpp:699
+msgid "Derived Classifiers"
+msgstr ""
 
-#: dialogs/constraintlistpage.cpp:79 listpopupmenu.cpp:1180
-msgid "Check Constraint..."
+#: refactoring/refactoringassistant.cpp:658 listpopupmenu.cpp:905
+#: dialogs/classpropdlg.cpp:287 dialogs/classifierlistpage.cpp:115
+msgid "Attributes"
+msgstr "Priodweddion"
+
+#: refactoring/refactoringassistant.cpp:674 listpopupmenu.cpp:908
+#: dialogs/classpropdlg.cpp:299 dialogs/classifierlistpage.cpp:119
+msgid "Operations"
+msgstr "Gweithrediadau"
+
+#: refactoring/refactoringassistant.cpp:805 dialogs/umloperationdialog.cpp:446
+#, kde-format
+msgid "An operation with that signature already exists in %1.\n"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137
-msgid "Initial activity"
+#: refactoring/refactoringassistant.cpp:807 dialogs/umloperationdialog.cpp:448
+msgid "Choose a different name or parameter list."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137 worktoolbar.cpp:349 association.cpp:54
-msgid "Activity"
+#: refactoring/refactoringassistant.cpp:808 dialogs/umloperationdialog.cpp:437
+#: dialogs/umloperationdialog.cpp:449
+msgid "Operation Name Invalid"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137
-msgid "End activity"
+#: refactoring/refactoringassistant.cpp:826
+#, kde-format
+msgid "An attribute with that name already exists in %1.\n"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137
-msgid "Final activity"
+#: refactoring/refactoringassistant.cpp:828
+msgid "Choose a different name."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137 listpopupmenu.cpp:1146 worktoolbar.cpp:325
-msgid "Branch/Merge"
+#: refactoring/refactoringassistant.cpp:829 dialogs/umlattributedialog.cpp:160
+msgid "Attribute Name Invalid"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137
-msgid "Invoke action"
+#: package.cpp:166
+msgctxt "object name"
+msgid "Name"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:137
-msgid "Parameter activity"
+#: package.cpp:167
+#, kde-format
+msgid ""
+"An object with the name %1\n"
+"already exists in the package %2.\n"
+"Please enter a new name:"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:141
-msgctxt "general properties page"
-msgid "General"
+#: umlviewimageexporter.cpp:71
+msgid "Exporting view..."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:142 dialogs/statedialog.cpp:121
-#: dialogs/objectnodedialog.cpp:141 dialogs/umloperationdialog.cpp:88
-#: dialogs/umlentityattributedialog.cpp:71 dialogs/umlattributedialog.cpp:69
-#: dialogs/umltemplatedialog.cpp:65
-msgid "General Properties"
-msgstr "Priodweddau Cyffredinol"
+#: umlviewimageexporter.cpp:75
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:154
-msgid "Activity type:"
+#: umlviewimageexporter.cpp:102
+#, kde-format
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:159
-msgid "Activity name:"
+#: umlviewimageexporter.cpp:103
+msgid "File Already Exists"
+msgstr "Ffeil yn Bodoli'n Barod"
+
+#: umlviewimageexporter.cpp:103 dialogs/overwritedialogue.cpp:52
+msgid "&Overwrite"
+msgstr "&Trosysgrifo"
+
+#: umlviewimageexporter.cpp:166 uml.cpp:1209
+msgid "Save As"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:163
-msgid "Precondition :"
+#: folder.cpp:406
+#, kde-format
+msgid "The folderfile %1 does not exist."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:167
-msgid "Postcondition :"
+#: folder.cpp:406 folder.cpp:410 umldoc.cpp:424 umldoc.cpp:446 umldoc.cpp:484
+#: umldoc.cpp:496 umldoc.cpp:510 umldoc.cpp:522 umldoc.cpp:534 umldoc.cpp:552
+msgid "Load Error"
+msgstr "Gwall Llwytho"
+
+#: folder.cpp:410
+#, kde-format
+msgid "The folderfile %1 cannot be opened."
 msgstr ""
 
-#: dialogs/activitydialog.cpp:174
-msgid "&Normal activity"
+#: basictypes.cpp:234
+msgid "Class Diagram"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:177
-msgid "&Invoke action "
+#: basictypes.cpp:236
+msgid "Use Case Diagram"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:180
-msgid "&Parameter activity node"
+#: basictypes.cpp:238
+msgid "Sequence Diagram"
 msgstr ""
 
-#. i18n: file: dialogs/diagrampropertiespage.ui:307
-#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:140
-#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
-#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:575
-#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:52
-#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:261
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:261
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
-#: dialogs/activitydialog.cpp:200 dialogs/assocgenpage.cpp:61
-#: dialogs/statedialog.cpp:140 dialogs/objectnodedialog.cpp:197
-#: dialogs/parmpropdlg.cpp:115 dialogs/classifierlistpage.cpp:218
-#: dialogs/assocrolepage.cpp:80 dialogs/assocrolepage.cpp:81
-#: dialogs/notedialog.cpp:38 dialogs/classgenpage.cpp:225
-#: dialogs/classgenpage.cpp:305 dialogs/classgenpage.cpp:368 rc.cpp:733
-#: rc.cpp:801 rc.cpp:1491 rc.cpp:1506 rc.cpp:1608 rc.cpp:1671
-msgid "Documentation"
-msgstr "Dogfenniaeth"
+#: basictypes.cpp:240
+msgid "Collaboration Diagram"
+msgstr ""
 
-#. i18n: file: umbrello.kcfg:126
-#. i18n: ectx: label, entry (uiFont), group (UI Options)
-#. i18n: file: umbrello.kcfg:224
-#. i18n: ectx: label, entry (codeViewerFont), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:126
-#. i18n: ectx: label, entry (uiFont), group (UI Options)
-#. i18n: file: umbrello.kcfg:224
-#. i18n: ectx: label, entry (codeViewerFont), group (Code Viewer Options)
-#: dialogs/activitydialog.cpp:223 dialogs/statedialog.cpp:166
-#: dialogs/objectnodedialog.cpp:220 dialogs/assocpropdlg.cpp:122
-#: dialogs/classpropdlg.cpp:379 dialogs/settingsdlg.cpp:355
-#: dialogs/umlviewdialog.cpp:145 rc.cpp:121 rc.cpp:229 rc.cpp:1804 rc.cpp:1912
-msgid "Font"
+#: basictypes.cpp:242
+msgid "State Diagram"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:224 dialogs/statedialog.cpp:167
-#: dialogs/objectnodedialog.cpp:221 dialogs/assocpropdlg.cpp:123
-#: dialogs/classpropdlg.cpp:380 dialogs/settingsdlg.cpp:356
-#: dialogs/umlviewdialog.cpp:146
-msgid "Font Settings"
-msgstr "Gosodiadau Ffont"
+#: basictypes.cpp:244
+msgid "Activity Diagram"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:254
-msgctxt "widget color page"
-msgid "Color"
+#: basictypes.cpp:246
+msgid "Component Diagram"
 msgstr ""
 
-#: dialogs/activitydialog.cpp:255 dialogs/objectnodedialog.cpp:248
-#: dialogs/classpropdlg.cpp:240
-msgid "Widget Colors"
+#: basictypes.cpp:248
+msgid "Deployment Diagram"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:72
-msgctxt "name of association widget"
-msgid "Name:"
+#: basictypes.cpp:250
+msgid "Entity Relationship Diagram"
 msgstr ""
 
-#: dialogs/assocgenpage.cpp:85
-msgid "Type:"
-msgstr "Math:"
+#: basictypes.cpp:252
+msgid "No Diagram"
+msgstr ""
 
-#: dialogs/statedialog.cpp:114
-msgctxt "initial state in statechart"
-msgid "Initial state"
+#: basictypes.cpp:386
+msgid "Generalization"
 msgstr ""
 
-#: dialogs/statedialog.cpp:115
-msgctxt "state in statechart"
-msgid "State"
+#: basictypes.cpp:394
+msgid "Self Association"
 msgstr ""
 
-#: dialogs/statedialog.cpp:116
-msgctxt "end state in statechart"
-msgid "End state"
+#: basictypes.cpp:396
+msgid "Collaboration Message"
 msgstr ""
 
-#: dialogs/statedialog.cpp:120
-msgctxt "general page"
-msgid "General"
+#: basictypes.cpp:398
+msgid "Sequence Message"
 msgstr ""
 
-#: dialogs/statedialog.cpp:132
-msgid "State type:"
+#: basictypes.cpp:400
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: dialogs/statedialog.cpp:137
-msgid "State name:"
+#: basictypes.cpp:402
+msgid "Sequence Self Message"
 msgstr ""
 
-#: dialogs/statedialog.cpp:180
-msgctxt "color page"
-msgid "Color"
+#: basictypes.cpp:408
+msgid "Realization"
 msgstr ""
 
-#: dialogs/statedialog.cpp:181
-msgid "Widget Color"
-msgstr "Lliw Celfigyn"
+#: basictypes.cpp:410
+msgid "Uni Association"
+msgstr ""
 
-#: dialogs/statedialog.cpp:195 dialogs/statedialog.cpp:196
-#: dialogs/activitypage.cpp:58
-msgid "Activities"
+#: basictypes.cpp:426
+msgid "Unknown"
 msgstr ""
 
-#: dialogs/classwizard.cpp:45 model_utils.cpp:404
-msgid "new_class"
+#: basictypes.cpp:428
+msgid "? AssociationType ?"
 msgstr ""
 
-#: dialogs/classwizard.cpp:60
-msgid "Class Wizard"
+#: uml.cpp:252
+msgid "&Export model to DocBook"
 msgstr ""
 
-#: dialogs/classwizard.cpp:83
-msgid "New Class"
+#: uml.cpp:256
+msgid "&Export model to XHTML"
 msgstr ""
 
-#: dialogs/classwizard.cpp:84
-msgid "Add general info about the new class."
+#: uml.cpp:260
+msgid "&New Class Wizard..."
 msgstr ""
 
-#: dialogs/classwizard.cpp:101
-msgid "Class Attributes"
+#: uml.cpp:264
+msgid "&Add Default Datatypes for Active Language"
 msgstr ""
 
-#: dialogs/classwizard.cpp:102
-msgid "Add attributes to the new class."
+#: uml.cpp:271
+msgid "Code &Importing Wizard..."
 msgstr ""
 
-#: dialogs/classwizard.cpp:119
-msgid "Class Operations"
+#: uml.cpp:276
+msgid "&Code Generation Wizard..."
+msgstr ""
+
+#: uml.cpp:281
+msgid "&Generate All Code"
+msgstr ""
+
+#: uml.cpp:326
+msgid "Creates a new document"
+msgstr "Creu dogfen newydd"
+
+#: uml.cpp:327
+msgid "Opens an existing document"
+msgstr "Agor dogfen gyfredol"
+
+#: uml.cpp:328
+msgid "Opens a recently used file"
+msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
+
+#: uml.cpp:329
+msgid "Saves the document"
+msgstr ""
+
+#: uml.cpp:330
+msgid "Saves the document as..."
+msgstr ""
+
+#: uml.cpp:331
+msgid "Closes the document"
+msgstr ""
+
+#: uml.cpp:332
+msgid "Prints out the document"
+msgstr ""
+
+#: uml.cpp:333
+msgid "Print Preview of the document"
+msgstr ""
+
+#: uml.cpp:334
+msgid "Quits the application"
+msgstr "Terfynu'r cymhwysiad"
+
+#: uml.cpp:335
+msgid "Exports the model to the docbook format"
+msgstr ""
+
+#: uml.cpp:336
+msgid "Exports the model to the XHTML format"
+msgstr ""
+
+#: uml.cpp:337
+msgid "Cuts the selected section and puts it to the clipboard"
+msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd"
+
+#: uml.cpp:338
+msgid "Copies the selected section to the clipboard"
+msgstr "Copïo'r adran dewisiedig i'r gludfwrdd"
+
+#: uml.cpp:339
+msgid "Pastes the contents of the clipboard"
+msgstr ""
+
+#: uml.cpp:340
+msgid "Set the default program preferences"
+msgstr ""
+
+#: uml.cpp:344
+msgctxt "delete selected widget"
+msgid "Delete &Selected"
+msgstr ""
+
+#: uml.cpp:355
+msgid "&Class Diagram..."
+msgstr ""
+
+#: uml.cpp:361
+msgid "&Sequence Diagram..."
+msgstr ""
+
+#: uml.cpp:367
+msgid "C&ollaboration Diagram..."
+msgstr ""
+
+#: uml.cpp:373
+msgid "&Use Case Diagram..."
+msgstr ""
+
+#: uml.cpp:379
+msgid "S&tate Diagram..."
+msgstr ""
+
+#: uml.cpp:385
+msgid "&Activity Diagram..."
+msgstr ""
+
+#: uml.cpp:391
+msgid "Co&mponent Diagram..."
+msgstr ""
+
+#: uml.cpp:397
+msgid "&Deployment Diagram..."
+msgstr ""
+
+#: uml.cpp:403
+msgid "&Entity Relationship Diagram..."
+msgstr ""
+
+#: uml.cpp:409
+msgid "&Clear Diagram"
+msgstr ""
+
+#: uml.cpp:413
+msgid "&Snap to Grid"
+msgstr "&Snapio i'r Grid"
+
+#: uml.cpp:417
+msgid "S&how Grid"
+msgstr "D&angos Grid"
+
+#: uml.cpp:427
+msgid "&Export as Picture..."
+msgstr ""
+
+#: uml.cpp:432
+msgid "Export &All Diagrams as Pictures..."
+msgstr ""
+
+#: uml.cpp:437 dialogs/umloperationdialog.cpp:168
+#: dialogs/classifierlistpage.cpp:208
+msgid "&Properties"
+msgstr "&Priodweddau"
+
+#: uml.cpp:452
+msgid "Z&oom to 100%"
+msgstr "C&hwyddo i 100%"
+
+#: uml.cpp:456
+msgid "Align Right"
+msgstr "Alinio Dde"
+
+#: uml.cpp:461
+msgid "Align Left"
+msgstr "Alinio Chwith"
+
+#: uml.cpp:466
+msgid "Align Top"
+msgstr "Alinio Brig"
+
+#: uml.cpp:471
+msgid "Align Bottom"
+msgstr "Alinio Gwaelod"
+
+#: uml.cpp:476
+msgid "Align Vertical Middle"
+msgstr ""
+
+#: uml.cpp:481
+msgid "Align Horizontal Middle"
+msgstr ""
+
+#: uml.cpp:486
+msgid "Align Vertical Distribute"
+msgstr ""
+
+#: uml.cpp:491
+msgid "Align Horizontal Distribute"
+msgstr ""
+
+#: uml.cpp:495
+msgid "&Move Tab Left"
+msgstr "&Symud Tab i'r Chwith"
+
+#: uml.cpp:496
+msgid "&Move Tab Right"
+msgstr "&Symud Tab i'r Dde"
+
+#: uml.cpp:511
+msgid "Select Diagram on Left"
+msgstr ""
+
+#: uml.cpp:512
+msgid "Select Diagram on Right"
+msgstr ""
+
+#: uml.cpp:680
+msgctxt "init status bar"
+msgid "Ready"
+msgstr ""
+
+#: uml.cpp:745
+msgid "Diagram Toolbar"
+msgstr ""
+
+#: uml.cpp:792
+msgid "&Tree View"
+msgstr "Golwg &Coeden"
+
+#: uml.cpp:802
+msgid "Doc&umentation"
+msgstr ""
+
+#: uml.cpp:812
+msgid "Co&mmand history"
+msgstr ""
+
+#: uml.cpp:834 uml.cpp:1125 uml.cpp:1158
+msgid "Opening file..."
+msgstr "Agor ffeil..."
+
+#: uml.cpp:895 uml.cpp:1189 umldoc.cpp:284 umldoc.cpp:374 umldoc.cpp:425
+#: umldoc.cpp:447 umldoc.cpp:485 umldoc.cpp:497 umldoc.cpp:511 umldoc.cpp:523
+#: umldoc.cpp:535 umldoc.cpp:701 umldoc.cpp:708 umldoc.cpp:2823
+#: umldoc.cpp:2826
+msgid "Untitled"
+msgstr ""
+
+#: uml.cpp:1107
+msgid "Creating new document..."
+msgstr "Yn creu dogfen newydd..."
+
+#: uml.cpp:1133
+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:1137
+msgid "Open File"
+msgstr "Agor Ffeil"
+
+#: uml.cpp:1188
+msgid "Saving file..."
+msgstr "Yn cadw ffeil..."
+
+#: uml.cpp:1204
+msgid "Saving file with a new filename..."
+msgstr ""
+
+#: uml.cpp:1209
+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:1227
+#, kde-format
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+
+#: uml.cpp:1228
+msgid "Warning"
+msgstr ""
+
+#: uml.cpp:1228
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: uml.cpp:1262
+msgid "Closing file..."
+msgstr "Yn cau ffeil..."
+
+#: uml.cpp:1294
+msgid "Print Preview..."
+msgstr ""
+
+#: uml.cpp:1321
+msgid "Printing..."
+msgstr "Argraffu..."
+
+#: uml.cpp:1328
+#, kde-format
+msgid "Print %1"
+msgstr "Argraffu %1"
+
+#: uml.cpp:1348
+msgid "Exiting..."
+msgstr "Terfynu..."
+
+#: uml.cpp:1411
+msgid "Cutting selection..."
+msgstr "Yn torri'r dewisiad..."
+
+#: uml.cpp:1428
+msgid "Copying selection to clipboard..."
+msgstr "Yn copïo'r dewisiad i'r clipfwrdd..."
+
+#: uml.cpp:1440
+msgid "Inserting clipboard contents..."
+msgstr "Yn mewnosod cynnwys y clipfwrdd..."
+
+#: uml.cpp:1445
+msgid ""
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
+msgstr ""
+
+#: uml.cpp:2024
+msgid "Cannot view code until you generate some first."
+msgstr ""
+
+#: uml.cpp:2024 uml.cpp:2027
+msgid "Cannot View Code"
+msgstr ""
+
+#: uml.cpp:2027
+msgid "Cannot view code from simple code writer."
+msgstr ""
+
+#: uml.cpp:2889
+msgid "XHTML Generation failed ."
+msgstr ""
+
+#: umldoc.cpp:80 umldoc.cpp:1942
+msgid "UML Model"
+msgstr ""
+
+#: umldoc.cpp:113
+msgid "Logical View"
+msgstr ""
+
+#: umldoc.cpp:114
+msgid "Use Case View"
+msgstr ""
+
+#: umldoc.cpp:115
+msgid "Component View"
+msgstr ""
+
+#: umldoc.cpp:116
+msgid "Deployment View"
+msgstr ""
+
+#: umldoc.cpp:117
+msgid "Entity Relationship Model"
+msgstr ""
+
+#: umldoc.cpp:140
+msgid "Datatypes"
+msgstr ""
+
+#: umldoc.cpp:279
+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:280
+msgctxt "warning message"
+msgid "Warning"
+msgstr ""
+
+#: umldoc.cpp:424
+#, kde-format
+msgid "The file %1 does not exist."
+msgstr "Nid yw'r ffeil %1 yn bodoli!."
+
+#: umldoc.cpp:446
+#, kde-format
+msgid "The file %1 seems to be corrupted."
+msgstr ""
+
+#: umldoc.cpp:483 umldoc.cpp:495 umldoc.cpp:521
+#, kde-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr ""
+
+#: umldoc.cpp:509
+#, kde-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr ""
+
+#: umldoc.cpp:533 umldoc.cpp:551
+#, kde-format
+msgid "There was a problem loading file: %1"
 msgstr ""
 
-#: dialogs/classwizard.cpp:120
-msgid "Add operations to the new class."
+#: umldoc.cpp:707
+#, kde-format
+msgid "There was a problem uploading file: %1"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:136
-msgid "Central Buffer"
+#: umldoc.cpp:1197
+msgid "use case diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:136
-msgid "Data Store"
+#: umldoc.cpp:1200
+msgid "class diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:136
-msgid "ObjectFlow"
+#: umldoc.cpp:1203
+msgid "sequence diagram"
 msgstr ""
 
-#. i18n: file: codegenwizard/codegenoptionspage.ui:39
-#. i18n: ectx: attribute (title), widget (QWidget, ui_tabGeneral)
-#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:51
-#. i18n: ectx: attribute (title), widget (QWidget, ui_tabGeneral)
-#: dialogs/objectnodedialog.cpp:140 rc.cpp:552 rc.cpp:846
-msgid "General"
-msgstr "Cyffredinol"
-
-#: dialogs/objectnodedialog.cpp:145
-msgctxt "properties group title"
-msgid "Properties"
+#: umldoc.cpp:1206
+msgid "collaboration diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:159
-msgid "Object Node type:"
+#: umldoc.cpp:1209
+msgid "state diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:164
-msgid "Object Node name:"
+#: umldoc.cpp:1212
+msgid "activity diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:168
-msgctxt "enter state label"
-msgid "State :"
+#: umldoc.cpp:1215
+msgid "component diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:173
-msgid "&Central Buffer"
+#: umldoc.cpp:1218
+msgid "deployment diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:176
-msgid "&Data Store "
+#: umldoc.cpp:1221
+msgid "entity relationship diagram"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:179
-msgid "&Object Flow"
+#: umldoc.cpp:1276
+msgctxt "diagram name"
+msgid "Name"
 msgstr ""
 
-#: dialogs/objectnodedialog.cpp:247
-msgctxt "color page title"
-msgid "Color"
+#: umldoc.cpp:1284 umldoc.cpp:1349
+msgid "That is an invalid name for a diagram."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:47
-msgid "Parameter Properties"
+#: umldoc.cpp:1288 umldoc.cpp:1358
+msgid "A diagram is already using that name."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:78 dialogs/umloperationdialog.cpp:101
-#: dialogs/umlentityattributedialog.cpp:76 dialogs/umlattributedialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:70
-msgid "&Type:"
-msgstr "&Math:"
-
-#: dialogs/parmpropdlg.cpp:86
-msgctxt "property name"
-msgid "&Name:"
+#: umldoc.cpp:1343
+msgctxt "renaming diagram"
+msgid "Name"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:90 dialogs/umlattributedialog.cpp:86
-msgid "&Initial value:"
+#: umldoc.cpp:1374
+msgctxt "renaming uml object"
+msgid "Name"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:93 dialogs/umloperationdialog.cpp:108
-#: dialogs/classgenpage.cpp:346 dialogs/umlentityattributedialog.cpp:92
-#: dialogs/umlattributedialog.cpp:90
-msgid "Stereotype name:"
+#: umldoc.cpp:1408
+msgctxt "renaming child uml object"
+msgid "Name"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:98
-msgid "Passing Direction"
+#: umldoc.cpp:1468
+#, kde-format
+msgid "Are you sure you want to delete diagram %1?"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:99
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and "
-"\"inout\" is a parameter for reading and writing."
+#: umldoc.cpp:1469
+msgid "Delete Diagram"
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:264
-msgid "You have entered an invalid parameter name."
+#: umldoc.cpp:2025
+msgid "Setting up the document..."
 msgstr ""
 
-#: dialogs/parmpropdlg.cpp:265
-msgid "Parameter Name Invalid"
+#: umldoc.cpp:2055
+msgid "Resolving object references..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:116
-msgid "N&ew Attribute..."
+#: umldoc.cpp:2106
+msgid "Loading UML elements..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:120
-msgid "N&ew Operation..."
+#: umldoc.cpp:2330
+msgid "Loading diagrams..."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:123 dialogs/classpropdlg.cpp:289
-msgid "Templates"
-msgstr "Patrymluniau"
-
-#: dialogs/classifierlistpage.cpp:124
-msgid "N&ew Template..."
+#: umldoc.cpp:2824
+#, kde-format
+msgid "/autosave%1"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:127 dialogs/classpropdlg.cpp:301
-msgid "Enum Literals"
+#: object_factory.cpp:191
+msgctxt "UMLObject name"
+msgid "Name"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:128
-msgid "N&ew Enum Literal..."
+#: object_factory.cpp:202
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:131 dialogs/classpropdlg.cpp:313
-msgid "Entity Attributes"
+#: object_factory.cpp:203
+msgid "Reserved Keyword"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:132
-msgid "N&ew Entity Attribute..."
+#: codegenerators/cpp/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:135
-msgid "Constraints"
+#: codegenerators/cpp/cppcodegenerationform.cpp:42
+msgid "Virtual destructors"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:136
-msgid "N&ew Constraint..."
+#: codegenerators/cpp/cppcodegenerationform.cpp:46
+msgid "Generate empty constructors"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:174 dialogs/activitypage.cpp:80
-msgid "Move selected item to the top"
+#: codegenerators/cpp/cppcodegenerationform.cpp:50
+msgid "Generate accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:180 dialogs/activitypage.cpp:86
-msgid "Move selected item up"
+#: codegenerators/cpp/cppcodegenerationform.cpp:54
+msgid "Operations are inline"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:186 dialogs/activitypage.cpp:92
-msgid "Move selected item down"
+#: codegenerators/cpp/cppcodegenerationform.cpp:58
+msgid "Accessors are inline"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:192 dialogs/activitypage.cpp:98
-msgid "Move selected item to the bottom"
+#: codegenerators/cpp/cppcodegenerationform.cpp:62
+msgid "Accessors are public"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:226
-msgid "Comment"
+#: codegenerators/cpp/cppcodegenerationform.cpp:66
+msgid "Use '\\' as documentation tag instead of '@'"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:227
-msgid "Source Code"
+#: codegenerators/codegenerator.cpp:597
+#, kde-format
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
 msgstr ""
 
-#: dialogs/activitypage.cpp:102
-msgid "New Activity..."
-msgstr ""
+#: codegenerators/codegenerator.cpp:597
+msgid "Cannot Open File"
+msgstr "Methu Agor y Ffeil"
 
-#: dialogs/activitypage.cpp:106 widgets/floatingtextwidget.cpp:219
-msgid "Rename"
-msgstr "Ail-enwi"
+#: codegenerators/codegenerator.cpp:659
+#: codegenerators/simplecodegenerator.cpp:140
+msgid "Cannot create the folder:\n"
+msgstr ""
 
-#: dialogs/activitypage.cpp:175
-msgid "New Activity"
+#: codegenerators/codegenerator.cpp:660
+#: codegenerators/simplecodegenerator.cpp:141
+msgid ""
+"\n"
+"Please check the access rights"
 msgstr ""
 
-#: dialogs/activitypage.cpp:198
-msgid "Rename Activity"
+#: codegenerators/codegenerator.cpp:661
+#: codegenerators/simplecodegenerator.cpp:142
+msgid "Cannot Create Folder"
 msgstr ""
 
-#: dialogs/activitypage.cpp:198
-msgid "Enter the new name of the activity:"
+#: cmds/cmd_handle_rename.cpp:27
+#, kde-format
+msgid "Change text : %1 to %2"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:43
-msgid "Association Properties"
+#: cmds/generic/cmd_rename_umlobject.cpp:25
+#, kde-format
+msgid "Rename object : %1 to %2"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:92
-msgctxt "general settings"
-msgid "General"
+#: cmds/generic/cmd_create_umlobject.cpp:29
+#, kde-format
+msgid "Create uml object : %1"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:93 dialogs/classpropdlg.cpp:227
-#: dialogs/classpropdlg.cpp:361 dialogs/umlforeignkeyconstraintdialog.cpp:197
-#: dialogs/settingsdlg.cpp:120 dialogs/umlviewdialog.cpp:84
-msgid "General Settings"
-msgstr "Gosodiadau Cyffredinol"
+#: cmds/cmd_resizeWidget.cpp:27
+#, kde-format
+msgid "Resize widget : %1"
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:103
-msgid "Roles"
+#: cmds/cmd_create_diagram.cpp:29
+#, kde-format
+msgid "Create diagram %1: %2"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:104
-msgid "Role Settings"
+#: cmds/widget/cmd_set_txt.cpp:26
+#, kde-format
+msgid "Set text : %1 to %2"
 msgstr ""
 
-#: dialogs/assocpropdlg.cpp:129
-msgid "Association font"
+#: cmds/widget/cmd_changeFillColor.cpp:26
+#, kde-format
+msgid "Change fill color : %1"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:57
-msgid "Operation Properties"
+#: cmds/widget/cmd_changeFontSelection.cpp:26
+#, kde-format
+msgid "Change font : %1"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:98
-msgctxt "operation name"
-msgid "&Name:"
+#: cmds/widget/cmd_create_widget.cpp:27
+#, kde-format
+msgid "Create widget : %1"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:113
-msgid "&Abstract operation"
+#: cmds/widget/cmd_set_name.cpp:25
+#, kde-format
+msgid "Set name : %1 to %2"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:116 dialogs/umlattributedialog.cpp:93
-msgid "Classifier &scope (\"static\")"
+#: cmds/widget/cmd_changeLineColor.cpp:34
+#, kde-format
+msgid "Change line color : %1"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:119
-msgid "&Query (\"const\")"
+#: cmds/widget/cmd_changeMulti.cpp:26
+#, kde-format
+msgid "Change multiplicity : %1 to %2"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:123 dialogs/classgenpage.cpp:203
-#: dialogs/umlattributedialog.cpp:99 dialogs/settingsdlg.cpp:244
-#: listpopupmenu.cpp:916
-msgid "Visibility"
+#: cmds/cmd_set_visibility.cpp:24
+#, kde-format
+msgid "Change visibility : %1"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:128 dialogs/classgenpage.cpp:207
-msgctxt "public visibility"
-msgid "P&ublic"
+#: cmds/cmd_set_stereotype.cpp:25
+#, kde-format
+msgid "Set stereotype : %1 to %2"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:131 dialogs/classgenpage.cpp:210
-msgctxt "private visibility"
-msgid "P&rivate"
+#: cmds/cmd_moveWidget.cpp:27
+#, kde-format
+msgid "Move widget : %1"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:134
-msgctxt "protected visibility"
-msgid "Prot&ected"
+#: listpopupmenu.cpp:286 listpopupmenu.cpp:603
+msgid "Change Font..."
+msgstr "Newid Wynebfath..."
+
+#: listpopupmenu.cpp:287
+msgid "Delete Selected Items"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:137 dialogs/umlattributedialog.cpp:112
-msgid "I&mplementation"
+#: listpopupmenu.cpp:293 listpopupmenu.cpp:954
+msgid "Draw as Circle"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:140
-msgid "Parameters"
-msgstr "Paramedrau"
+#: listpopupmenu.cpp:295 listpopupmenu.cpp:956
+msgid "Change into Class"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:164
-msgid "Ne&w Parameter..."
+#: listpopupmenu.cpp:299 listpopupmenu.cpp:962
+msgid "Change into Interface"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:305
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
+#: listpopupmenu.cpp:320 listpopupmenu.cpp:1492
+msgid "Category Type"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:306 dialogs/umloperationdialog.cpp:352
-msgid "Parameter Name Not Unique"
+#: listpopupmenu.cpp:371
+msgid "Move Up"
+msgstr "Symud i Fyny"
+
+#: listpopupmenu.cpp:372
+msgid "Move Down"
+msgstr "Symud i Lawr"
+
+#: listpopupmenu.cpp:378
+msgid "Rename Class..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:351
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
+#: listpopupmenu.cpp:379
+msgid "Rename Object..."
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:436
-msgid "You have entered an invalid operation name."
+#: listpopupmenu.cpp:398
+msgctxt "clear note"
+msgid "Clear"
 msgstr ""
 
-#: dialogs/codeviewerdialog.cpp:107
-msgid "Code Viewer - "
+#: listpopupmenu.cpp:400 listpopupmenu.cpp:489 listpopupmenu.cpp:508
+#: listpopupmenu.cpp:549
+msgid "Change Text..."
+msgstr "Newid y Testun ..."
+
+#: listpopupmenu.cpp:419
+msgid "Change State Name..."
 msgstr ""
 
-#: dialogs/pkgcontentspage.cpp:40
-msgid "Contained Items"
+#: listpopupmenu.cpp:430
+msgid "Flip Horizontal"
 msgstr ""
 
-#: dialogs/codeeditor.cpp:690
-msgid "Hide"
+#: listpopupmenu.cpp:433
+msgid "Flip Vertical"
 msgstr ""
 
-#: dialogs/codeeditor.cpp:696 dialogs/classoptionspage.cpp:76
-#: dialogs/classoptionspage.cpp:146 listpopupmenu.cpp:905
-msgid "Show"
-msgstr "Dangos"
+#: listpopupmenu.cpp:436 listpopupmenu.cpp:976
+msgid "Fill Color..."
+msgstr "Lliw Llenwad ..."
 
-#: dialogs/codeeditor.cpp:705
-msgid "Hide Comment"
+#: listpopupmenu.cpp:452
+msgid "Change Activity Name..."
 msgstr ""
 
-#: dialogs/codeeditor.cpp:711
-msgid "Show Comment"
+#: listpopupmenu.cpp:471
+msgid "Change Object Node Name..."
 msgstr ""
 
-#: dialogs/codeeditor.cpp:719
-msgid "Insert Code Block Before"
+#: listpopupmenu.cpp:487
+msgctxt "clear precondition"
+msgid "Clear"
 msgstr ""
 
-#: dialogs/codeeditor.cpp:724
-msgid "Insert Code Block After"
+#: listpopupmenu.cpp:498
+msgid "Add Interaction Operand"
 msgstr ""
 
-#: dialogs/codeeditor.cpp:731 listpopupmenu.cpp:595
-msgid "Copy"
+#: listpopupmenu.cpp:506
+msgctxt "clear combined fragment"
+msgid "Clear"
 msgstr ""
 
-#: dialogs/codeeditor.cpp:736 listpopupmenu.cpp:598
-msgid "Paste"
+#: listpopupmenu.cpp:516 listpopupmenu.cpp:519 listpopupmenu.cpp:1637
+#: listpopupmenu.cpp:1641
+msgid "Change Multiplicity..."
 msgstr ""
 
-#: dialogs/codeeditor.cpp:741 listpopupmenu.cpp:592
-msgid "Cut"
+#: listpopupmenu.cpp:522 listpopupmenu.cpp:1645
+msgid "Change Name"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:77
-msgctxt "title of color group"
-msgid "Color"
+#: listpopupmenu.cpp:525 listpopupmenu.cpp:1629 listpopupmenu.cpp:1651
+msgid "Change Role A Name..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:82
-msgctxt "line color"
-msgid "&Line:"
+#: listpopupmenu.cpp:528 listpopupmenu.cpp:1633 listpopupmenu.cpp:1652
+msgid "Change Role B Name..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:89
-msgctxt "default line color button"
-msgid "&Default"
+#: listpopupmenu.cpp:542 listpopupmenu.cpp:630
+msgid "New Operation..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:92
-msgid "&Fill:"
-msgstr "&Llenwi :"
-
-#: dialogs/umlwidgetcolorpage.cpp:99
-msgctxt "default fill color button"
-msgid "D&efault"
+#: listpopupmenu.cpp:543 listpopupmenu.cpp:1671
+msgid "Select Operation..."
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:102
-msgid "&Use fill"
-msgstr ""
+#: listpopupmenu.cpp:588 listpopupmenu.cpp:1675
+msgid "Rename..."
+msgstr "Ail-enwi..."
 
-#: dialogs/umlwidgetcolorpage.cpp:111
-msgctxt "background color"
-msgid "&Background:"
+#: listpopupmenu.cpp:594 dialogs/codeeditor.cpp:834
+msgid "Cut"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:118
-msgctxt "default background color button"
-msgid "De&fault"
+#: listpopupmenu.cpp:597 dialogs/codeeditor.cpp:824
+msgid "Copy"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:121
-msgctxt "grid dot color"
-msgid "&Grid dot:"
+#: listpopupmenu.cpp:600 dialogs/codeeditor.cpp:829
+msgid "Paste"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:128
-msgctxt "default grid dot color button"
-msgid "Def&ault"
-msgstr ""
+#: listpopupmenu.cpp:606 listpopupmenu.cpp:975
+msgid "Line Color..."
+msgstr "Lliw y llinell..."
 
-#: dialogs/assocrolepage.cpp:54
-msgid "Role A Properties"
+#: listpopupmenu.cpp:609
+msgid "Expand All"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:55
-msgid "Role B Properties"
+#: listpopupmenu.cpp:612
+msgid "Collapse All"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:72
-msgid "Role A Visibility"
+#: listpopupmenu.cpp:615
+msgctxt "duplicate action"
+msgid "Duplicate"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:73
-msgid "Role B Visibility"
+#: listpopupmenu.cpp:618
+msgid "Externalize Folder..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:74
-msgid "Role A Changeability"
+#: listpopupmenu.cpp:621
+msgid "Internalize Folder"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:75
-msgid "Role B Changeability"
+#: listpopupmenu.cpp:624
+msgid "Reset Label Positions"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:36
-#. i18n: ectx: property (text), widget (QLabel, ui_labelRoleName)
-#: dialogs/assocrolepage.cpp:100 dialogs/assocrolepage.cpp:177 rc.cpp:768
-msgid "Rolename:"
+#: listpopupmenu.cpp:627
+msgid "New Parameter..."
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:49
-#. i18n: ectx: property (text), widget (QLabel, ui_labelMultiplicity)
-#: dialogs/assocrolepage.cpp:105 dialogs/assocrolepage.cpp:182 rc.cpp:771
-msgid "Multiplicity:"
+#: listpopupmenu.cpp:633
+msgid "New Attribute..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:122
-msgctxt "scope for A is public"
-msgid "Public"
+#: listpopupmenu.cpp:636 listpopupmenu.cpp:1577
+msgid "New Template..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:125
-msgctxt "scope for A is private"
-msgid "Private"
+#: listpopupmenu.cpp:639
+msgid "New Literal..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:128
-msgctxt "scope for A is protected"
-msgid "Protected"
+#: listpopupmenu.cpp:642
+msgid "New Entity Attribute..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:131
-msgctxt "scope for A is implementation"
-msgid "Implementation"
+#: listpopupmenu.cpp:645
+msgid "Export as Picture..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:153
-msgctxt "changeability for A is changeable"
-msgid "Changeable"
+#: listpopupmenu.cpp:664
+msgid "Subsystem"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:156
-msgctxt "changeability for A is frozen"
-msgid "Frozen"
-msgstr ""
+#: listpopupmenu.cpp:694 listpopupmenu.cpp:828
+msgid "Folder"
+msgstr "Plygell"
 
-#: dialogs/assocrolepage.cpp:159
-msgctxt "changeability for A is add only"
-msgid "Add only"
+#: listpopupmenu.cpp:723
+msgid "Text Line..."
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:199
-msgctxt "scope for B is public"
-msgid "Public"
+#: listpopupmenu.cpp:825
+msgctxt "new container menu"
+msgid "New"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:202
-msgctxt "scope for B is private"
-msgid "Private"
+#: listpopupmenu.cpp:829
+msgctxt "new class menu item"
+msgid "Class"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:205
-msgctxt "scope for B is protected"
-msgid "Protected"
-msgstr ""
+#: listpopupmenu.cpp:901 dialogs/classoptionspage.cpp:77
+#: dialogs/classoptionspage.cpp:147 dialogs/codeeditor.cpp:789
+msgid "Show"
+msgstr "Dangos"
 
-#: dialogs/assocrolepage.cpp:208
-msgctxt "scope for B is implementation"
-msgid "Implementation"
+#: listpopupmenu.cpp:910
+msgid "Public Only"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:230
-msgctxt "changeability for B is changeable"
-msgid "Changeable"
+#: listpopupmenu.cpp:912 dialogs/classgenpage.cpp:205
+#: dialogs/settingsdlg.cpp:272 dialogs/umloperationdialog.cpp:123
+#: dialogs/umlattributedialog.cpp:98
+msgid "Visibility"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:233
-msgctxt "changeability for B is frozen"
-msgid "Frozen"
+#: listpopupmenu.cpp:914
+msgid "Operation Signature"
 msgstr ""
 
-#: dialogs/assocrolepage.cpp:236
-msgctxt "changeability for B is add only"
-msgid "Add only"
+#: listpopupmenu.cpp:919
+msgid "Attribute Signature"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:29
-msgid "Destination File Already Exists"
+#: listpopupmenu.cpp:939
+msgctxt "new classifier menu"
+msgid "New"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:42
-#, kde-format
-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."
+#: listpopupmenu.cpp:942
+msgid "Attribute..."
+msgstr "Priodoleddau ..."
+
+#: listpopupmenu.cpp:943
+msgid "Operation..."
+msgstr "Gweithrediad ..."
+
+#: listpopupmenu.cpp:944
+msgid "Template..."
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:45
-msgid "&Apply to all remaining files"
+#: listpopupmenu.cpp:958
+msgid "Refactor"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:50
-msgid "&Generate Similar File Name"
+#: listpopupmenu.cpp:959
+msgid "View Code"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:51
-msgid "&Do Not Generate File"
+#: listpopupmenu.cpp:974
+msgctxt "color menu"
+msgid "Color"
 msgstr ""
 
-#: dialogs/notedialog.cpp:27
-msgid "Note Documentation"
+#. i18n: file: umbrello.kcfg:130
+#. i18n: ectx: label, entry (useFillColor), group (UI Options)
+#: listpopupmenu.cpp:977 rc.cpp:1304
+msgid "Use Fill Color"
 msgstr ""
 
-#: dialogs/assocpage.cpp:30 dialogs/classpropdlg.cpp:349
-msgid "Associations"
+#: listpopupmenu.cpp:1086
+msgctxt "new sub menu"
+msgid "New"
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:227
-msgctxt "general settings page name"
-msgid "General"
+#: listpopupmenu.cpp:1135
+msgid "Actor..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:240
-msgctxt "widget color page name"
-msgid "Color"
+#: listpopupmenu.cpp:1136
+msgid "Use Case..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:252
-msgctxt "display option page name"
-msgid "Display"
+#: listpopupmenu.cpp:1140
+msgctxt "new class menu item"
+msgid "Class..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:252
-msgid "Display Options"
-msgstr "Dewisiadau masg"
+#: listpopupmenu.cpp:1141
+msgid "Interface..."
+msgstr "Rhyngwyneb ..."
 
-#: dialogs/classpropdlg.cpp:265
-msgid "Attribute Settings"
+#: listpopupmenu.cpp:1142
+msgid "Datatype..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:277
-msgid "Operation Settings"
+#: listpopupmenu.cpp:1143
+msgid "Enum..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:289
-msgid "Templates Settings"
-msgstr ""
+#: listpopupmenu.cpp:1144
+msgid "Package..."
+msgstr "Pecyn ..."
 
-#: dialogs/classpropdlg.cpp:301
-msgid "Enum Literals Settings"
+#: listpopupmenu.cpp:1150
+msgctxt "add new state"
+msgid "State..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:313
-msgid "Entity Attributes Settings"
+#: listpopupmenu.cpp:1164 listpopupmenu.cpp:1206
+msgid "Activity..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:325
-msgid "Entity Constraints"
+#: listpopupmenu.cpp:1169
+msgid "Subsystem..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:325
-msgid "Entity Constraints Settings"
+#: listpopupmenu.cpp:1170
+msgid "Component..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:337
-msgctxt "contents settings page name"
-msgid "Contents"
+#: listpopupmenu.cpp:1171
+msgid "Artifact..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:337
-msgid "Contents Settings"
-msgstr ""
+#: listpopupmenu.cpp:1174
+msgid "Node..."
+msgstr "Nôd ..."
 
-#: dialogs/classpropdlg.cpp:349
-msgid "Class Associations"
+#: listpopupmenu.cpp:1177
+msgid "Entity..."
 msgstr ""
 
-#: dialogs/classpropdlg.cpp:361
-msgctxt "instance general settings page name"
-msgid "General"
+#: listpopupmenu.cpp:1178
+msgid "Category..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:60
-msgid "Class &name:"
-msgstr ""
+#: listpopupmenu.cpp:1182
+msgid "Object..."
+msgstr "Gwrthrych ..."
 
-#: dialogs/classgenpage.cpp:63
-msgid "Actor &name:"
-msgstr ""
+#: listpopupmenu.cpp:1186
+msgid "Attribute"
+msgstr "Priodoleddau"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Package &name:"
-msgstr ""
+#: listpopupmenu.cpp:1188 listpopupmenu.cpp:1192
+msgid "Template"
+msgstr "Patrymlun"
 
-#: dialogs/classgenpage.cpp:69
-msgid "Use case &name:"
+#: listpopupmenu.cpp:1195
+msgid "Entity Attribute..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:72
-msgid "Interface &name:"
+#: listpopupmenu.cpp:1196 dialogs/constraintlistpage.cpp:76
+msgid "Primary Key Constraint..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:75
-msgid "Component &name:"
+#: listpopupmenu.cpp:1197 dialogs/constraintlistpage.cpp:72
+msgid "Unique Constraint..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:78
-msgid "Node &name:"
+#: listpopupmenu.cpp:1198 dialogs/constraintlistpage.cpp:80
+msgid "Foreign Key Constraint..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:81
-msgid "Artifact &name:"
+#: listpopupmenu.cpp:1199 dialogs/constraintlistpage.cpp:84
+msgid "Check Constraint..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:84
-msgid "Enum &name:"
+#: listpopupmenu.cpp:1202
+msgid "Enum Literal..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:87
-msgid "Datatype &name:"
+#: listpopupmenu.cpp:1625
+msgid "Delete Anchor"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:90
-msgid "Entity &name:"
+#: listpopupmenu.cpp:1650
+msgid "Change Association Name..."
 msgstr ""
 
-#: dialogs/classgenpage.cpp:113 dialogs/umltemplatedialog.cpp:82
-msgid "&Stereotype name:"
+#: listpopupmenu.cpp:1700
+msgid "Undo"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:127
-msgid "Package name:"
+#: listpopupmenu.cpp:1701
+msgid "Redo"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:154
-msgid "A&bstract class"
+#: listpopupmenu.cpp:1707
+msgid "Clear Diagram"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:156
-msgid "A&bstract use case"
+#: listpopupmenu.cpp:1710
+msgid "Snap to Grid"
+msgstr "Snapio i'r Grid"
+
+#: listpopupmenu.cpp:1712
+msgid "Show Grid"
+msgstr "Dangos Grid"
+
+#: listpopupmenu.cpp:1724
+msgid "Disjoint(Specialisation)"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:164
-msgctxt "component is executable"
-msgid "&Executable"
+#: listpopupmenu.cpp:1725
+msgid "Overlapping(Specialisation)"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:171
-msgid "Draw As"
+#: listpopupmenu.cpp:1726
+msgid "Union"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:175
-msgctxt "draw as default"
-msgid "&Default"
+#: dialogs/notedialog.cpp:27
+msgid "Note Documentation"
 msgstr ""
 
-#. i18n: file: umbrelloui.rc:4
-#. i18n: ectx: Menu (file)
-#: dialogs/classgenpage.cpp:178 rc.cpp:487 rc.cpp:519
-msgid "&File"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:261
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:575
+#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:52
+#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:261
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox1)
+#. i18n: file: dialogs/diagrampropertiespage.ui:307
+#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:140
+#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDocumentation)
+#: dialogs/notedialog.cpp:38 dialogs/classgenpage.cpp:227
+#: dialogs/classgenpage.cpp:307 dialogs/classgenpage.cpp:370
+#: dialogs/statedialog.cpp:140 dialogs/parmpropdlg.cpp:115
+#: dialogs/activitydialog.cpp:199 dialogs/objectnodedialog.cpp:197
+#: dialogs/assocgenpage.cpp:70 dialogs/assocrolepage.cpp:79
+#: dialogs/assocrolepage.cpp:80 dialogs/classifierlistpage.cpp:218 rc.cpp:280
+#: rc.cpp:943 rc.cpp:958 rc.cpp:1060 rc.cpp:1122 rc.cpp:1194
+msgid "Documentation"
+msgstr "Dogfenniaeth"
+
+#: dialogs/classoptionspage.cpp:84 dialogs/classoptionspage.cpp:153
+msgid "Operatio&ns"
+msgstr "Gweithre&diadau"
+
+#: dialogs/classoptionspage.cpp:88 dialogs/classoptionspage.cpp:170
+msgid "&Visibility"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:181
-msgid "&Library"
+#: dialogs/classoptionspage.cpp:97 dialogs/classoptionspage.cpp:157
+msgid "O&peration signature"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:184
-msgid "&Table"
-msgstr "&Tabl"
+#: dialogs/classoptionspage.cpp:101 dialogs/classoptionspage.cpp:174
+msgid "Pac&kage"
+msgstr "Pec&yn"
 
-#: dialogs/classgenpage.cpp:213
-msgctxt "protected visibility"
-msgid "Pro&tected"
-msgstr ""
+#: dialogs/classoptionspage.cpp:108 dialogs/classoptionspage.cpp:162
+msgid "Att&ributes"
+msgstr "Pri&odweddion"
 
-#: dialogs/classgenpage.cpp:217
-msgid "Imple&mentation"
+#: dialogs/classoptionspage.cpp:112 dialogs/classoptionspage.cpp:178
+msgid "Stereot&ype"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:269
-msgid "Class name:"
+#: dialogs/classoptionspage.cpp:116 dialogs/classoptionspage.cpp:166
+msgid "Attr&ibute signature"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:277 dialogs/classgenpage.cpp:356
-msgid "Instance name:"
+#: dialogs/classoptionspage.cpp:125 dialogs/classoptionspage.cpp:186
+msgid "&Public Only"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:285
-msgid "Draw as actor"
+#: dialogs/classoptionspage.cpp:131
+msgid "Draw as circle"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:290
-msgid "Multiple instance"
+#: dialogs/classoptionspage.cpp:182
+msgid "&Attribute associations"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:296
-msgid "Show destruction"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, ui_propsGroupBox)
+#: dialogs/umlroledialog.cpp:24 rc.cpp:1158
+msgid "Role Properties"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:334
-msgid "Component name:"
+#: dialogs/selectopdlg.cpp:37 dialogs/selectopdlg.cpp:48
+msgid "Select Operation"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:336
-msgid "Node name:"
+#: dialogs/selectopdlg.cpp:56
+msgid "Sequence number:"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:443 dialogs/classgenpage.cpp:494
-#: dialogs/classgenpage.cpp:507
-msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+#: dialogs/selectopdlg.cpp:59
+msgid "Class operation:"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:444 dialogs/classgenpage.cpp:495
-#: dialogs/classgenpage.cpp:508
-msgid "Name is Not Unique"
+#: dialogs/selectopdlg.cpp:68
+msgid "Custom operation:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:46
+#: dialogs/umlentityattributedialog.cpp:45
 msgid "Entity Attribute Properties"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:84
+#: dialogs/umlentityattributedialog.cpp:70 dialogs/statedialog.cpp:121
+#: dialogs/umltemplatedialog.cpp:64 dialogs/umloperationdialog.cpp:88
+#: dialogs/activitydialog.cpp:141 dialogs/umlattributedialog.cpp:68
+#: dialogs/objectnodedialog.cpp:141
+msgid "General Properties"
+msgstr "Priodweddau Cyffredinol"
+
+#: dialogs/umlentityattributedialog.cpp:75 dialogs/umltemplatedialog.cpp:69
+#: dialogs/parmpropdlg.cpp:78 dialogs/umloperationdialog.cpp:101
+#: dialogs/umlattributedialog.cpp:73
+msgid "&Type:"
+msgstr "&Math:"
+
+#: dialogs/umlentityattributedialog.cpp:83
 msgctxt "name of entity attribute"
 msgid "&Name:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:88
+#: dialogs/umlentityattributedialog.cpp:87
 msgid "&Default value:"
 msgstr "&Gwerth ragosod :"
 
-#: dialogs/umlentityattributedialog.cpp:96
+#: dialogs/umlentityattributedialog.cpp:91 dialogs/classgenpage.cpp:348
+#: dialogs/parmpropdlg.cpp:93 dialogs/umloperationdialog.cpp:108
+#: dialogs/umlattributedialog.cpp:89
+msgid "Stereotype name:"
+msgstr ""
+
+#: dialogs/umlentityattributedialog.cpp:95
 msgid "Length/Values:"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:99
+#: dialogs/umlentityattributedialog.cpp:98
 msgid "&Auto increment"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:103
+#: dialogs/umlentityattributedialog.cpp:102
 msgid "Allow &null"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:110
+#: dialogs/umlentityattributedialog.cpp:109
 msgid "Attributes:"
 msgstr "Priodweddion :"
 
-#: dialogs/umlentityattributedialog.cpp:125
+#: dialogs/umlentityattributedialog.cpp:124
 msgid "Indexing"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:129
+#: dialogs/umlentityattributedialog.cpp:128
 msgid "&Not Indexed"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:140
+#: dialogs/umlentityattributedialog.cpp:139
 msgid "&Indexed"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:182
+#: dialogs/umlentityattributedialog.cpp:181
 msgid "You have entered an invalid entity attribute name."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:183
+#: dialogs/umlentityattributedialog.cpp:182
 msgid "Entity Attribute Name Invalid"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:190
+#: dialogs/umlentityattributedialog.cpp:189
 msgid ""
 "The entity attribute name you have chosen is already being used in this "
 "operation."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:191
+#: dialogs/umlentityattributedialog.cpp:190
 msgid "Entity Attribute Name Not Unique"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:45
-msgid "Attribute Properties"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:82
-msgctxt "attribute name"
-msgid "&Name:"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:103
-msgctxt "access control public"
-msgid "&Public"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:106
-msgctxt "access control private"
-msgid "P&rivate"
-msgstr ""
-
-#: dialogs/umlattributedialog.cpp:109
-msgctxt "access control protected"
-msgid "Prot&ected"
+#: dialogs/classgenpage.cpp:60
+msgid "Class &name:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:160
-msgid "You have entered an invalid attribute name."
+#: dialogs/classgenpage.cpp:63
+msgid "Actor &name:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:168
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
+#: dialogs/classgenpage.cpp:66
+msgid "Package &name:"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:169
-msgid "Attribute Name Not Unique"
+#: dialogs/classgenpage.cpp:69
+msgid "Use case &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:50
-msgid "Foreign Key Setup"
+#: dialogs/classgenpage.cpp:72
+msgid "Interface &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:196
-msgctxt "general page title"
-msgid "General"
+#: dialogs/classgenpage.cpp:75
+msgid "Component &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:201
-msgctxt "general group title"
-msgid "General"
+#: dialogs/classgenpage.cpp:78
+msgid "Node &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:208
-msgctxt "label for entering name"
-msgid "Name"
+#: dialogs/classgenpage.cpp:81
+msgid "Artifact &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:211
-msgid "Referenced Entity"
+#: dialogs/classgenpage.cpp:84
+msgid "Enum &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:218
-msgid "Actions"
+#: dialogs/classgenpage.cpp:87
+msgid "Datatype &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:224
-msgid "On Update"
+#: dialogs/classgenpage.cpp:90
+msgid "Entity &name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:230
-msgid "On Delete"
+#: dialogs/classgenpage.cpp:113 dialogs/umltemplatedialog.cpp:81
+msgid "&Stereotype name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:262
-msgid "No Action"
+#: dialogs/classgenpage.cpp:127
+msgid "Package name:"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:262
-msgid "Restrict"
+#: dialogs/classgenpage.cpp:156
+msgid "A&bstract class"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:262
-msgid "Cascade"
+#: dialogs/classgenpage.cpp:158
+msgid "A&bstract use case"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:262
-msgid "Set Null"
+#: dialogs/classgenpage.cpp:166
+msgctxt "component is executable"
+msgid "&Executable"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:263
-msgid "Set Default"
+#: dialogs/classgenpage.cpp:173
+msgid "Draw As"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:281
-#: dialogs/umlforeignkeyconstraintdialog.cpp:282
-msgid "Columns"
+#: dialogs/classgenpage.cpp:177
+msgctxt "draw as default"
+msgid "&Default"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:289
-msgctxt "column header local"
-msgid "Local"
+#. i18n: file: umbrelloui.rc:4
+#. i18n: ectx: Menu (file)
+#: dialogs/classgenpage.cpp:180 rc.cpp:5
+msgid "&File"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:289
-msgctxt "column header referenced"
-msgid "Referenced"
+#: dialogs/classgenpage.cpp:183
+msgid "&Library"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:295
-msgid "Local Column"
-msgstr ""
+#: dialogs/classgenpage.cpp:186
+msgid "&Table"
+msgstr "&Tabl"
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:301
-msgid "Referenced Column"
+#: dialogs/classgenpage.cpp:209 dialogs/umloperationdialog.cpp:128
+msgctxt "public visibility"
+msgid "P&ublic"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:308
-#: dialogs/umluniqueconstraintdialog.cpp:112
-msgid "&Add"
+#: dialogs/classgenpage.cpp:212 dialogs/umloperationdialog.cpp:131
+msgctxt "private visibility"
+msgid "P&rivate"
 msgstr ""
 
-#: dialogs/umlforeignkeyconstraintdialog.cpp:383
-msgid ""
-"You are attempting to change the Referenced Entity of this ForeignKey "
-"Constraint. Any unapplied changes to the mappings between local and "
-"referenced entities will be lost. Are you sure you want to continue ?"
+#: dialogs/classgenpage.cpp:215
+msgctxt "protected visibility"
+msgid "Pro&tected"
 msgstr ""
 
-#: dialogs/umlcheckconstraintdialog.cpp:30
-msgid "Check Constraint Properties"
+#: dialogs/classgenpage.cpp:219
+msgid "Imple&mentation"
 msgstr ""
 
-#: dialogs/umlcheckconstraintdialog.cpp:64
-#: dialogs/umluniqueconstraintdialog.cpp:83
-msgctxt "name label"
-msgid "Name"
+#: dialogs/classgenpage.cpp:271
+msgid "Class name:"
 msgstr ""
 
-#: dialogs/umlcheckconstraintdialog.cpp:73
-msgid "Check Condition :"
+#: dialogs/classgenpage.cpp:279 dialogs/classgenpage.cpp:358
+msgid "Instance name:"
 msgstr ""
 
-#: dialogs/umluniqueconstraintdialog.cpp:42
-msgid "Unique Constraint Properties"
+#: dialogs/classgenpage.cpp:287
+msgid "Draw as actor"
 msgstr ""
 
-#: dialogs/umluniqueconstraintdialog.cpp:91
-msgid "Attribute Details"
+#: dialogs/classgenpage.cpp:292
+msgid "Multiple instance"
 msgstr ""
 
-#: dialogs/umluniqueconstraintdialog.cpp:241
-msgid "You have entered an invalid constraint name."
+#: dialogs/classgenpage.cpp:298
+msgid "Show destruction"
 msgstr ""
 
-#: dialogs/umluniqueconstraintdialog.cpp:242
-msgid "Constraint Name Invalid"
+#: dialogs/classgenpage.cpp:336
+msgid "Component name:"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:37 dialogs/selectopdlg.cpp:49
-msgid "Select Operation"
+#: dialogs/classgenpage.cpp:338
+msgid "Node name:"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:57
-msgid "Sequence number:"
+#: dialogs/classgenpage.cpp:445 dialogs/classgenpage.cpp:496
+#: dialogs/classgenpage.cpp:509
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:60
-msgid "Class operation:"
+#: dialogs/classgenpage.cpp:446 dialogs/classgenpage.cpp:497
+#: dialogs/classgenpage.cpp:510
+msgid "Name is Not Unique"
 msgstr ""
 
-#: dialogs/selectopdlg.cpp:69
-msgid "Custom operation:"
+#: dialogs/defaultcodegenpolicypage.cpp:28
+msgid "<p align=\"center\">No Options Available.</p>"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:36
+#: dialogs/settingsdlg.cpp:32
 msgid "Umbrello Setup"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:64
+#: dialogs/settingsdlg.cpp:63
 msgid "User Interface"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:65
+#: dialogs/settingsdlg.cpp:64
 msgid "User Interface Settings"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:69
+#: dialogs/settingsdlg.cpp:68
 msgctxt "color group box"
 msgid "Color"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:74
-msgid "Line color:"
-msgstr "Lliw y llinell:"
-
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Color"
-msgstr "L&liw Rhagosodol"
+#: dialogs/settingsdlg.cpp:76
+msgid "Custom line color:"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:84
-msgid "Fill color:"
-msgstr "Lliw llenwi:"
+#: dialogs/settingsdlg.cpp:87
+msgid "Custom fill color:"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:91
-msgid "De&fault Color"
-msgstr "Ll&iw Rhagosodol"
+#: dialogs/settingsdlg.cpp:97
+msgid "Custom grid color:"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:94
-msgid "Line width:"
-msgstr "Lled y llinell:"
+#: dialogs/settingsdlg.cpp:100
+msgid "Custom background color:"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:102
-msgid "D&efault Width"
+#: dialogs/settingsdlg.cpp:107
+msgid "Custom line width:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:105
+#: dialogs/settingsdlg.cpp:113
 msgid "&Use fill color"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:119 dialogs/umlviewdialog.cpp:83
+#: dialogs/settingsdlg.cpp:146 dialogs/umlviewdialog.cpp:90
 msgctxt "general settings page"
 msgid "General"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:125
+#: dialogs/settingsdlg.cpp:147 dialogs/classpropdlg.cpp:249
+#: dialogs/classpropdlg.cpp:383 dialogs/umlviewdialog.cpp:91
+#: dialogs/umlforeignkeyconstraintdialog.cpp:197 dialogs/assocpropdlg.cpp:93
+msgid "General Settings"
+msgstr "Gosodiadau Cyffredinol"
+
+#: dialogs/settingsdlg.cpp:152
 msgctxt "miscellaneous group box"
 msgid "Miscellaneous"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:131
+#: dialogs/settingsdlg.cpp:158
 msgid "Enable undo"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:135
+#: dialogs/settingsdlg.cpp:162
 msgid "Use tabbed diagrams"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:139
+#: dialogs/settingsdlg.cpp:166
 msgid "Use new C++/Java/Ruby generators"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:143
+#: dialogs/settingsdlg.cpp:170
 msgid "Use angular association lines"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:147
+#: dialogs/settingsdlg.cpp:174
 msgid "Turn on footer and page numbers when printing"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:152
+#: dialogs/settingsdlg.cpp:179
 msgid "Autosave"
 msgstr "Hunangadw"
 
-#: dialogs/settingsdlg.cpp:158
+#: dialogs/settingsdlg.cpp:185
 msgid "E&nable autosave"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:162
+#: dialogs/settingsdlg.cpp:189
 msgid "Select auto-save time interval (mins):"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:171
+#: dialogs/settingsdlg.cpp:198
 msgid "Set autosave suffix:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:173
+#: dialogs/settingsdlg.cpp:200
 msgid ""
 "<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving "
 "occurs before you have manually saved the file.</p><p>If you have already "
@@ -2750,1525 +2981,1417 @@
 "saved, the autosave will overwrite your file automatically.</p></qt>"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
+#: dialogs/settingsdlg.cpp:210
 msgid "Startup"
 msgstr "Ymgychwyn"
 
-#: dialogs/settingsdlg.cpp:189
+#: dialogs/settingsdlg.cpp:216
 msgid "&Load last project"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:193
+#: dialogs/settingsdlg.cpp:220
 msgid "Start new project with:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
+#: dialogs/settingsdlg.cpp:238
 msgid "Default Language :"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:239
+#: dialogs/settingsdlg.cpp:267
 msgctxt "class settings page"
 msgid "Class"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:240
+#: dialogs/settingsdlg.cpp:268
 msgid "Class Settings"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:250
+#: dialogs/settingsdlg.cpp:278
 msgid "Show &visibility"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:254
+#: dialogs/settingsdlg.cpp:282
 msgid "Show attributes"
 msgstr "Dangos nodweddion"
 
-#: dialogs/settingsdlg.cpp:258
+#: dialogs/settingsdlg.cpp:286
 msgid "Show operations"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:262
+#: dialogs/settingsdlg.cpp:290
 msgid "Show stereot&ype"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:266
+#: dialogs/settingsdlg.cpp:294
 msgid "Show attribute signature"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:270
+#: dialogs/settingsdlg.cpp:298
 msgid "Show package"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:184
-#. i18n: ectx: whatsthis, entry (showOpSig), group (Class Options)
 #. i18n: file: dialogs/diagrampropertiespage.ui:120
 #. i18n: ectx: property (text), widget (QCheckBox, ui_showOpSigs)
-#. i18n: file: umbrello.kcfg:184
+#. i18n: file: umbrello.kcfg:218
 #. i18n: ectx: whatsthis, entry (showOpSig), group (Class Options)
-#: dialogs/settingsdlg.cpp:274 rc.cpp:190 rc.cpp:705 rc.cpp:1873
+#: dialogs/settingsdlg.cpp:302 rc.cpp:1094 rc.cpp:1409
 msgid "Show operation signature"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:173
+#. i18n: file: umbrello.kcfg:207
 #. i18n: ectx: label, entry (showPublicOnly), group (Class Options)
-#: dialogs/settingsdlg.cpp:278 rc.cpp:175 rc.cpp:1858
+#: dialogs/settingsdlg.cpp:306 rc.cpp:1394
 msgid "Show Public Only"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:283
+#: dialogs/settingsdlg.cpp:311
 msgid "Starting Scope"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:288
+#: dialogs/settingsdlg.cpp:316
 msgid "Default attribute scope:"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:291
+#: dialogs/settingsdlg.cpp:319
 msgid "Default operation scope:"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:73
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pPublicRB)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:147
-#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:188
-#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
 #. i18n: file: codegenerators/d/dcodegenerationformbase.ui:168
 #. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
 #. i18n: file: codegenerators/d/dcodegenerationformbase.ui:221
 #. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:147
+#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:188
+#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
 #. i18n: file: codegenerators/java/javacodegenerationformbase.ui:168
 #. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
 #. i18n: file: codegenerators/java/javacodegenerationformbase.ui:221
 #. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
-#: dialogs/settingsdlg.cpp:295 dialogs/settingsdlg.cpp:303 rc.cpp:777
-#: rc.cpp:1533 rc.cpp:1548 rc.cpp:1581 rc.cpp:1596 rc.cpp:1644 rc.cpp:1659
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:73
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pPublicRB)
+#: dialogs/settingsdlg.cpp:323 dialogs/settingsdlg.cpp:331 rc.cpp:253
+#: rc.cpp:268 rc.cpp:985 rc.cpp:1000 rc.cpp:1033 rc.cpp:1048 rc.cpp:1170
 msgid "Public"
 msgstr "Cyhoeddus"
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:83
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pPrivateRB)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:152
-#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:193
-#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
 #. i18n: file: codegenerators/d/dcodegenerationformbase.ui:173
 #. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
 #. i18n: file: codegenerators/d/dcodegenerationformbase.ui:226
 #. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:152
+#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:193
+#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
 #. i18n: file: codegenerators/java/javacodegenerationformbase.ui:173
 #. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
 #. i18n: file: codegenerators/java/javacodegenerationformbase.ui:226
 #. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
-#: dialogs/settingsdlg.cpp:296 dialogs/settingsdlg.cpp:304 rc.cpp:780
-#: rc.cpp:1536 rc.cpp:1551 rc.cpp:1584 rc.cpp:1599 rc.cpp:1647 rc.cpp:1662
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:83
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pPrivateRB)
+#: dialogs/settingsdlg.cpp:324 dialogs/settingsdlg.cpp:332 rc.cpp:256
+#: rc.cpp:271 rc.cpp:988 rc.cpp:1003 rc.cpp:1036 rc.cpp:1051 rc.cpp:1173
 msgid "Private"
 msgstr "Preivat"
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:90
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pProtectedRB)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:157
-#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:198
-#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
 #. i18n: file: codegenerators/d/dcodegenerationformbase.ui:178
 #. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
 #. i18n: file: codegenerators/d/dcodegenerationformbase.ui:231
 #. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:157
+#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:198
+#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
 #. i18n: file: codegenerators/java/javacodegenerationformbase.ui:178
 #. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
 #. i18n: file: codegenerators/java/javacodegenerationformbase.ui:231
 #. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
-#: dialogs/settingsdlg.cpp:297 dialogs/settingsdlg.cpp:305 rc.cpp:783
-#: rc.cpp:1539 rc.cpp:1554 rc.cpp:1587 rc.cpp:1602 rc.cpp:1650 rc.cpp:1665
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:90
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pProtectedRB)
+#: dialogs/settingsdlg.cpp:325 dialogs/settingsdlg.cpp:333 rc.cpp:259
+#: rc.cpp:274 rc.cpp:991 rc.cpp:1006 rc.cpp:1039 rc.cpp:1054 rc.cpp:1176
 msgid "Protected"
 msgstr "Gwarchodir"
 
-#: dialogs/settingsdlg.cpp:333
-msgid "Code Generation"
-msgstr ""
-
-#: dialogs/settingsdlg.cpp:334
-msgid "Code Generation Settings"
-msgstr ""
-
-#: dialogs/settingsdlg.cpp:345
-msgid "Code Viewer"
-msgstr ""
-
-#: dialogs/settingsdlg.cpp:346
-msgid "Code Viewer Settings"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:40
-msgid "Template Properties"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:78
-msgctxt "template name"
-msgid "&Name:"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:149
-msgid "You have entered an invalid template name."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:150
-msgid "Template Name Invalid"
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:159
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-
-#: dialogs/umltemplatedialog.cpp:160
-msgid "Template Name Not Unique"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:113
-msgctxt "classes display options page"
-msgid "Display"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:114
-msgid "Classes Display Options"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:129
-msgctxt "diagram colors page"
-msgid "Color"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:130
-msgid "Diagram Colors"
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:210
-msgid "The name you have entered is invalid."
-msgstr ""
-
-#: dialogs/umlviewdialog.cpp:216
-msgid "The name you have entered is not unique."
-msgstr ""
-
-#: dialogs/defaultcodegenpolicypage.cpp:37
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr ""
-
-#: dialogs/importprojectdlg.cpp:122
-msgid "You have to choose a directory."
-msgstr ""
-
-#: dialogs/importprojectdlg.cpp:127
-msgid "This directory does not exist."
-msgstr ""
-
-#: dialogs/importprojectdlg.cpp:154
-msgid "No source file in this directory."
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:52
-#. i18n: ectx: property (toolTip), widget (QLabel, ui_imageTypeLabel)
-#: dialogs/exportallviewsdialog.cpp:86 rc.cpp:748
-msgid "The format that the images will be exported to"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:152
-msgid "Operatio&ns"
-msgstr "Gweithre&diadau"
-
-#: dialogs/classoptionspage.cpp:87 dialogs/classoptionspage.cpp:169
-msgid "&Visibility"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:96 dialogs/classoptionspage.cpp:156
-msgid "O&peration signature"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:100 dialogs/classoptionspage.cpp:173
-msgid "Pac&kage"
-msgstr "Pec&yn"
-
-#: dialogs/classoptionspage.cpp:107 dialogs/classoptionspage.cpp:161
-msgid "Att&ributes"
-msgstr "Pri&odweddion"
-
-#: dialogs/classoptionspage.cpp:111 dialogs/classoptionspage.cpp:177
-msgid "Stereot&ype"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:115 dialogs/classoptionspage.cpp:165
-msgid "Attr&ibute signature"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:124 dialogs/classoptionspage.cpp:185
-msgid "&Public Only"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:130
-msgid "Draw as circle"
-msgstr ""
-
-#: dialogs/classoptionspage.cpp:181
-msgid "&Attribute associations"
-msgstr ""
-
-#: clipboard/umlclipboard.cpp:827
-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 ""
-
-#: enumliteral.cpp:105
-msgctxt "enum name"
-msgid "Name"
-msgstr ""
-
-#: stereotype.cpp:95 listpopupmenu.cpp:931
-msgid "Stereotype"
-msgstr ""
-
-#: debug/debug_utils.cpp:44
-msgid "Class Name"
-msgstr ""
-
-#: model_utils.cpp:406
-msgid "new_actor"
-msgstr ""
-
-#: model_utils.cpp:408
-msgid "new_usecase"
-msgstr ""
-
-#: model_utils.cpp:410
-msgid "new_package"
-msgstr ""
-
-#: model_utils.cpp:412
-msgid "new_component"
-msgstr ""
-
-#: model_utils.cpp:414
-msgid "new_node"
-msgstr ""
-
-#: model_utils.cpp:416
-msgid "new_artifact"
-msgstr ""
-
-#: model_utils.cpp:418
-msgid "new_interface"
-msgstr ""
-
-#: model_utils.cpp:420
-msgid "new_datatype"
-msgstr ""
-
-#: model_utils.cpp:422
-msgid "new_enum"
-msgstr ""
-
-#: model_utils.cpp:424
-msgid "new_entity"
-msgstr ""
-
-#: model_utils.cpp:426
-msgid "new_folder"
-msgstr ""
-
-#: model_utils.cpp:430
-msgid "new_category"
-msgstr ""
-
-#: model_utils.cpp:432
-msgid "new_object"
-msgstr ""
-
-#: model_utils.cpp:833
-msgid "OK"
-msgstr ""
-
-#: model_utils.cpp:833
-msgctxt "parse status"
-msgid "Empty"
-msgstr ""
-
-#: model_utils.cpp:833
-msgid "Malformed argument"
+#: dialogs/settingsdlg.cpp:361
+msgid "Code Importer"
 msgstr ""
 
-#: model_utils.cpp:834
-msgid "Unknown argument type"
-msgstr ""
-
-#: model_utils.cpp:834
-msgid "Illegal method name"
-msgstr ""
-
-#: model_utils.cpp:835
-msgid "Unknown return type"
-msgstr ""
-
-#: model_utils.cpp:835
-msgid "Unspecified error"
-msgstr ""
-
-#: model_utils.cpp:1707
-msgid "Class Diagram"
+#: dialogs/settingsdlg.cpp:362
+msgid "Code Import Settings"
 msgstr ""
 
-#: model_utils.cpp:1709
-msgid "Use Case Diagram"
+#: dialogs/settingsdlg.cpp:372
+msgid "Code Generation"
 msgstr ""
 
-#: model_utils.cpp:1711
-msgid "Sequence Diagram"
+#: dialogs/settingsdlg.cpp:373
+msgid "Code Generation Settings"
 msgstr ""
 
-#: model_utils.cpp:1713
-msgid "Collaboration Diagram"
+#: dialogs/settingsdlg.cpp:384
+msgid "Code Viewer"
 msgstr ""
 
-#: model_utils.cpp:1715
-msgid "State Diagram"
+#: dialogs/settingsdlg.cpp:385
+msgid "Code Viewer Settings"
 msgstr ""
 
-#: model_utils.cpp:1717
-msgid "Activity Diagram"
+#. i18n: file: umbrello.kcfg:160
+#. i18n: ectx: label, entry (uiFont), group (UI Options)
+#. i18n: file: umbrello.kcfg:270
+#. i18n: ectx: label, entry (codeViewerFont), group (Code Viewer Options)
+#: dialogs/settingsdlg.cpp:394 dialogs/statedialog.cpp:166
+#: dialogs/classpropdlg.cpp:401 dialogs/activitydialog.cpp:222
+#: dialogs/umlviewdialog.cpp:152 dialogs/objectnodedialog.cpp:220
+#: dialogs/assocpropdlg.cpp:122 rc.cpp:1340 rc.cpp:1448
+msgid "Font"
 msgstr ""
 
-#: model_utils.cpp:1719
-msgid "Component Diagram"
-msgstr ""
+#: dialogs/settingsdlg.cpp:395 dialogs/statedialog.cpp:167
+#: dialogs/classpropdlg.cpp:402 dialogs/activitydialog.cpp:223
+#: dialogs/umlviewdialog.cpp:153 dialogs/objectnodedialog.cpp:221
+#: dialogs/assocpropdlg.cpp:123
+msgid "Font Settings"
+msgstr "Gosodiadau Ffont"
 
-#: model_utils.cpp:1721
-msgid "Deployment Diagram"
+#: dialogs/statedialog.cpp:114
+msgctxt "initial state in statechart"
+msgid "Initial state"
 msgstr ""
 
-#: model_utils.cpp:1723
-msgid "Entity Relationship Diagram"
+#: dialogs/statedialog.cpp:115
+msgctxt "state in statechart"
+msgid "State"
 msgstr ""
 
-#: model_utils.cpp:1725
-msgid "No Diagram"
+#: dialogs/statedialog.cpp:116
+msgctxt "end state in statechart"
+msgid "End state"
 msgstr ""
 
-#: widgets/toolbarstateonewidget.cpp:120 widgets/preconditionwidget.cpp:124
-msgid "Enter Precondition Name"
+#: dialogs/statedialog.cpp:120
+msgctxt "general page"
+msgid "General"
 msgstr ""
 
-#: widgets/toolbarstateonewidget.cpp:120
-msgid "Enter the precondition"
+#: dialogs/statedialog.cpp:132
+msgid "State type:"
 msgstr ""
 
-#: widgets/toolbarstateonewidget.cpp:120
-msgid "new precondition"
+#: dialogs/statedialog.cpp:137
+msgid "State name:"
 msgstr ""
 
-#: widgets/floatingdashlinewidget.cpp:77
-msgid "Enter alternative Name"
+#: dialogs/statedialog.cpp:180
+msgctxt "color page"
+msgid "Color"
 msgstr ""
 
-#: widgets/floatingdashlinewidget.cpp:77
-msgid "Enter the alternative :"
-msgstr ""
+#: dialogs/statedialog.cpp:181
+msgid "Widget Color"
+msgstr "Lliw Celfigyn"
 
-#: widgets/statewidget.cpp:185
-msgid "Enter Activity"
+#: dialogs/statedialog.cpp:195 dialogs/statedialog.cpp:196
+#: dialogs/activitypage.cpp:58
+msgid "Activities"
 msgstr ""
 
-#: widgets/objectwidget.cpp:94
-msgid "Rename Object"
+#: dialogs/codeeditor.cpp:783
+msgid "Hide"
 msgstr ""
 
-#: widgets/objectwidget.cpp:95
-msgid "Enter object name:"
+#: dialogs/codeeditor.cpp:798
+msgid "Hide Comment"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:147
-msgctxt "operation name"
-msgid "Name"
+#: dialogs/codeeditor.cpp:804
+msgid "Show Comment"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:148
-msgid "Enter operation name:"
+#: dialogs/codeeditor.cpp:812
+msgid "Insert Code Block Before"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:203 widgets/associationwidget.cpp:2733
-msgid "Enter role name:"
+#: dialogs/codeeditor.cpp:817
+msgid "Insert Code Block After"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:205 widgets/associationwidget.cpp:2695
-msgid "Enter multiplicity:"
+#: dialogs/umlwidgetcolorpage.cpp:79
+msgctxt "title of color group"
+msgid "Color"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:212 widgets/associationwidget.cpp:2713
-msgid "Enter association name:"
+#: dialogs/umlwidgetcolorpage.cpp:84
+msgctxt "line color"
+msgid "&Line:"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:214 widgets/floatingtextwidget.cpp:346
-msgid "Enter new text:"
+#: dialogs/umlwidgetcolorpage.cpp:91
+msgctxt "default line color button"
+msgid "&Default"
 msgstr ""
 
-#: widgets/floatingtextwidget.cpp:216
-msgid "ERROR"
-msgstr "GWALL"
-
-#: widgets/floatingtextwidget.cpp:346
-msgid "Change Text"
-msgstr "Newid y Testun"
+#: dialogs/umlwidgetcolorpage.cpp:94
+msgid "&Fill:"
+msgstr "&Llenwi :"
 
-#: widgets/pinwidget.cpp:180
-msgid "Enter Pin Name"
+#: dialogs/umlwidgetcolorpage.cpp:101
+msgctxt "default fill color button"
+msgid "D&efault"
 msgstr ""
 
-#: widgets/pinwidget.cpp:180
-msgid "Enter the pin name :"
+#: dialogs/umlwidgetcolorpage.cpp:104
+msgid "&Use fill"
 msgstr ""
 
-#: widgets/messagewidget.cpp:1019 listpopupmenu.cpp:1168
-#: listpopupmenu.cpp:1172
-msgid "Operation"
-msgstr "Gweithrediad"
-
-#: widgets/preconditionwidget.cpp:124
-msgid "Enter the precondition :"
+#: dialogs/umlwidgetcolorpage.cpp:113
+msgctxt "background color"
+msgid "&Background:"
 msgstr ""
 
-#: widgets/signalwidget.cpp:217
-msgid "Enter signal name"
+#: dialogs/umlwidgetcolorpage.cpp:120
+msgctxt "default background color button"
+msgid "De&fault"
 msgstr ""
 
-#: widgets/signalwidget.cpp:217
-msgid "Enter the signal name :"
+#: dialogs/umlwidgetcolorpage.cpp:123
+msgctxt "grid dot color"
+msgid "&Grid dot:"
 msgstr ""
 
-#: widgets/associationwidget.cpp:2694
-msgid "Multiplicity"
+#: dialogs/umlwidgetcolorpage.cpp:130
+msgctxt "default grid dot color button"
+msgid "Def&ault"
 msgstr ""
 
-#: widgets/associationwidget.cpp:2712
-msgid "Association Name"
+#: dialogs/classpropdlg.cpp:249
+msgctxt "general settings page name"
+msgid "General"
 msgstr ""
 
-#: widgets/associationwidget.cpp:2732
-msgid "Role Name"
+#: dialogs/classpropdlg.cpp:262
+msgctxt "widget color page name"
+msgid "Color"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:200
-msgid "Enter Object Node Name"
+#: dialogs/classpropdlg.cpp:262 dialogs/activitydialog.cpp:254
+#: dialogs/objectnodedialog.cpp:248
+msgid "Widget Colors"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:200
-msgid "Enter the name of the object node :"
+#: dialogs/classpropdlg.cpp:274
+msgctxt "display option page name"
+msgid "Display"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:256
-msgid "Select Object node type"
-msgstr ""
+#: dialogs/classpropdlg.cpp:274
+msgid "Display Options"
+msgstr "Dewisiadau masg"
 
-#: widgets/objectnodewidget.cpp:256
-msgid "Select the object node type"
+#: dialogs/classpropdlg.cpp:287
+msgid "Attribute Settings"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:262
-msgid "Enter the name of the data store node"
+#: dialogs/classpropdlg.cpp:299
+msgid "Operation Settings"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:262
-msgid "data store name"
+#: dialogs/classpropdlg.cpp:311 dialogs/classifierlistpage.cpp:123
+msgid "Templates"
+msgstr "Patrymluniau"
+
+#: dialogs/classpropdlg.cpp:311
+msgid "Templates Settings"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:264
-msgid "Enter the name of the buffer node"
+#: dialogs/classpropdlg.cpp:323 dialogs/classifierlistpage.cpp:127
+msgid "Enum Literals"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:264
-msgid "Enter the name of the buffer"
+#: dialogs/classpropdlg.cpp:323
+msgid "Enum Literals Settings"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:264
-msgid "centralBuffer"
+#: dialogs/classpropdlg.cpp:335 dialogs/classifierlistpage.cpp:131
+msgid "Entity Attributes"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:266
-msgid "Enter the name of the object flow"
+#: dialogs/classpropdlg.cpp:335
+msgid "Entity Attributes Settings"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:266
-msgid "object flow"
+#: dialogs/classpropdlg.cpp:347
+msgid "Entity Constraints"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:279
-msgid "Enter Object Flow State"
+#: dialogs/classpropdlg.cpp:347
+msgid "Entity Constraints Settings"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:279
-msgid "Enter State (keep '-' if there is no state for the object) "
+#: dialogs/classpropdlg.cpp:359
+msgctxt "contents settings page name"
+msgid "Contents"
 msgstr ""
 
-#: widgets/objectnodewidget.cpp:279 widgets/combinedfragmentwidget.cpp:255
-#: widgets/combinedfragmentwidget.cpp:257
-msgid "-"
+#: dialogs/classpropdlg.cpp:359
+msgid "Contents Settings"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:253
-msgid "Enter the name of the diagram referenced"
+#: dialogs/classpropdlg.cpp:371 dialogs/assocpage.cpp:38
+msgid "Associations"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:253
-msgid "Diagram name"
+#: dialogs/classpropdlg.cpp:371
+msgid "Class Associations"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:255
-#: widgets/combinedfragmentwidget.cpp:348
-msgid "Enter the guard of the loop"
+#: dialogs/classpropdlg.cpp:383
+msgctxt "instance general settings page name"
+msgid "General"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:257
-msgid "Enter the first alternative name"
+#: dialogs/umltemplatedialog.cpp:39
+msgid "Template Properties"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:342
-msgid "Enter first alternative"
+#: dialogs/umltemplatedialog.cpp:77
+msgctxt "template name"
+msgid "&Name:"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:342
-msgid "Enter first alternative :"
+#: dialogs/umltemplatedialog.cpp:148
+msgid "You have entered an invalid template name."
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:345
-msgid "Enter referenced diagram name"
+#: dialogs/umltemplatedialog.cpp:149
+msgid "Template Name Invalid"
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:345
-msgid "Enter referenced diagram name :"
+#: dialogs/umltemplatedialog.cpp:158
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
 
-#: widgets/combinedfragmentwidget.cpp:348
-msgid "Enter the guard of the loop:"
+#: dialogs/umltemplatedialog.cpp:159
+msgid "Template Name Not Unique"
 msgstr ""
 
-#: widgets/umlwidget.cpp:293 widgets/umlwidget.cpp:297
-msgid "Change Properties"
+#: dialogs/parmpropdlg.cpp:47
+msgid "Parameter Properties"
 msgstr ""
 
-#: widgets/notewidget.cpp:378
-msgid "Note Type"
+#: dialogs/parmpropdlg.cpp:86
+msgctxt "property name"
+msgid "&Name:"
 msgstr ""
 
-#: widgets/notewidget.cpp:378
-msgid "Select the Note Type"
+#: dialogs/parmpropdlg.cpp:90 dialogs/umlattributedialog.cpp:85
+msgid "&Initial value:"
 msgstr ""
 
-#: controller/umlwidgetcontroller.cpp:199
-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."
+#: dialogs/parmpropdlg.cpp:98
+msgid "Passing Direction"
 msgstr ""
 
-#: controller/umlwidgetcontroller.cpp:667
+#: dialogs/parmpropdlg.cpp:99
 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."
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and "
+"\"inout\" is a parameter for reading and writing."
 msgstr ""
 
-#: folder.cpp:405
-#, kde-format
-msgid "The folderfile %1 does not exist."
+#: dialogs/parmpropdlg.cpp:264
+msgid "You have entered an invalid parameter name."
 msgstr ""
 
-#: folder.cpp:409
-#, kde-format
-msgid "The folderfile %1 cannot be opened."
+#: dialogs/parmpropdlg.cpp:265
+msgid "Parameter Name Invalid"
 msgstr ""
 
-#: classifier.cpp:264
-msgid ""
-"An operation with the same name and signature already exists. You can not "
-"add it again."
+#: dialogs/umloperationdialog.cpp:57
+msgid "Operation Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:286 listpopupmenu.cpp:601
-msgid "Change Font..."
-msgstr "Newid Wynebfath..."
-
-#: listpopupmenu.cpp:287
-msgid "Delete Selected Items"
+#: dialogs/umloperationdialog.cpp:98
+msgctxt "operation name"
+msgid "&Name:"
 msgstr ""
 
-#: listpopupmenu.cpp:293 listpopupmenu.cpp:958
-msgid "Draw as Circle"
+#: dialogs/umloperationdialog.cpp:113
+msgid "&Abstract operation"
 msgstr ""
 
-#: listpopupmenu.cpp:295 listpopupmenu.cpp:960
-msgid "Change into Class"
+#: dialogs/umloperationdialog.cpp:116 dialogs/umlattributedialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#: listpopupmenu.cpp:299 listpopupmenu.cpp:966
-msgid "Change into Interface"
+#: dialogs/umloperationdialog.cpp:119
+msgid "&Query (\"const\")"
 msgstr ""
 
-#: listpopupmenu.cpp:320 listpopupmenu.cpp:1478
-msgid "Category Type"
+#: dialogs/umloperationdialog.cpp:134
+msgctxt "protected visibility"
+msgid "Prot&ected"
 msgstr ""
 
-#: listpopupmenu.cpp:371
-msgid "Move Up"
-msgstr "Symud i Fyny"
-
-#: listpopupmenu.cpp:372
-msgid "Move Down"
-msgstr "Symud i Lawr"
-
-#: listpopupmenu.cpp:378
-msgid "Rename Class..."
+#: dialogs/umloperationdialog.cpp:137 dialogs/umlattributedialog.cpp:111
+msgid "I&mplementation"
 msgstr ""
 
-#: listpopupmenu.cpp:379
-msgid "Rename Object..."
-msgstr ""
+#: dialogs/umloperationdialog.cpp:140
+msgid "Parameters"
+msgstr "Paramedrau"
 
-#: listpopupmenu.cpp:398
-msgctxt "clear note"
-msgid "Clear"
+#: dialogs/umloperationdialog.cpp:164
+msgid "Ne&w Parameter..."
 msgstr ""
 
-#: listpopupmenu.cpp:400 listpopupmenu.cpp:487 listpopupmenu.cpp:506
-#: listpopupmenu.cpp:547
-msgid "Change Text..."
-msgstr "Newid y Testun ..."
-
-#: listpopupmenu.cpp:419
-msgid "Change State Name..."
+#: dialogs/umloperationdialog.cpp:305
+msgid ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
 
-#: listpopupmenu.cpp:430
-msgid "Flip Horizontal"
+#: dialogs/umloperationdialog.cpp:306 dialogs/umloperationdialog.cpp:352
+msgid "Parameter Name Not Unique"
 msgstr ""
 
-#: listpopupmenu.cpp:433
-msgid "Flip Vertical"
+#: dialogs/umloperationdialog.cpp:351
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
 msgstr ""
 
-#: listpopupmenu.cpp:450
-msgid "Change Activity Name..."
+#: dialogs/umloperationdialog.cpp:436
+msgid "You have entered an invalid operation name."
 msgstr ""
 
-#: listpopupmenu.cpp:469
-msgid "Change Object Node Name..."
+#: dialogs/activitydialog.cpp:136
+msgid "Initial activity"
 msgstr ""
 
-#: listpopupmenu.cpp:485
-msgctxt "clear precondition"
-msgid "Clear"
+#: dialogs/activitydialog.cpp:136
+msgid "End activity"
 msgstr ""
 
-#: listpopupmenu.cpp:496
-msgid "Add Interaction Operand"
+#: dialogs/activitydialog.cpp:136
+msgid "Final activity"
 msgstr ""
 
-#: listpopupmenu.cpp:504
-msgctxt "clear combined fragment"
-msgid "Clear"
+#: dialogs/activitydialog.cpp:136
+msgid "Invoke action"
 msgstr ""
 
-#: listpopupmenu.cpp:514 listpopupmenu.cpp:517 listpopupmenu.cpp:1623
-#: listpopupmenu.cpp:1627
-msgid "Change Multiplicity..."
+#: dialogs/activitydialog.cpp:136
+msgid "Parameter activity"
 msgstr ""
 
-#: listpopupmenu.cpp:520 listpopupmenu.cpp:1631
-msgid "Change Name"
+#: dialogs/activitydialog.cpp:140
+msgctxt "general properties page"
+msgid "General"
 msgstr ""
 
-#: listpopupmenu.cpp:523 listpopupmenu.cpp:1615 listpopupmenu.cpp:1637
-msgid "Change Role A Name..."
+#: dialogs/activitydialog.cpp:153
+msgid "Activity type:"
 msgstr ""
 
-#: listpopupmenu.cpp:526 listpopupmenu.cpp:1619 listpopupmenu.cpp:1638
-msgid "Change Role B Name..."
+#: dialogs/activitydialog.cpp:158
+msgid "Activity name:"
 msgstr ""
 
-#: listpopupmenu.cpp:540 listpopupmenu.cpp:634
-msgid "New Operation..."
+#: dialogs/activitydialog.cpp:162
+msgid "Precondition :"
 msgstr ""
 
-#: listpopupmenu.cpp:541 listpopupmenu.cpp:1657
-msgid "Select Operation..."
+#: dialogs/activitydialog.cpp:166
+msgid "Postcondition :"
 msgstr ""
 
-#: listpopupmenu.cpp:586 listpopupmenu.cpp:1661
-msgid "Rename..."
-msgstr "Ail-enwi..."
-
-#: listpopupmenu.cpp:604 listpopupmenu.cpp:979
-msgid "Line Color..."
-msgstr "Lliw y llinell..."
+#: dialogs/activitydialog.cpp:173
+msgid "&Normal activity"
+msgstr ""
 
-#: listpopupmenu.cpp:607
-msgid "Expand All"
+#: dialogs/activitydialog.cpp:176
+msgid "&Invoke action "
 msgstr ""
 
-#: listpopupmenu.cpp:610
-msgid "Collapse All"
+#: dialogs/activitydialog.cpp:179
+msgid "&Parameter activity node"
 msgstr ""
 
-#: listpopupmenu.cpp:613
-msgctxt "duplicate action"
-msgid "Duplicate"
+#: dialogs/activitydialog.cpp:253
+msgctxt "widget color page"
+msgid "Color"
 msgstr ""
 
-#: listpopupmenu.cpp:616
-msgid "Externalize Folder..."
+#: dialogs/umlviewdialog.cpp:120
+msgctxt "classes display options page"
+msgid "Display"
 msgstr ""
 
-#: listpopupmenu.cpp:619
-msgid "Internalize Folder"
+#: dialogs/umlviewdialog.cpp:121
+msgid "Classes Display Options"
 msgstr ""
 
-#: listpopupmenu.cpp:622
-msgid "Import Classes..."
+#: dialogs/umlviewdialog.cpp:136
+msgctxt "diagram colors page"
+msgid "Color"
 msgstr ""
 
-#: listpopupmenu.cpp:625
-msgid "Import Project..."
+#: dialogs/umlviewdialog.cpp:137
+msgid "Diagram Colors"
 msgstr ""
 
-#: listpopupmenu.cpp:628
-msgid "Reset Label Positions"
+#: dialogs/umlviewdialog.cpp:216
+msgid "The name you have entered is invalid."
 msgstr ""
 
-#: listpopupmenu.cpp:631
-msgid "New Parameter..."
+#: dialogs/umlviewdialog.cpp:226
+msgid "The name you have entered is not unique."
 msgstr ""
 
-#: listpopupmenu.cpp:637
-msgid "New Attribute..."
+#: dialogs/umlcheckconstraintdialog.cpp:30
+msgid "Check Constraint Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:640 listpopupmenu.cpp:1563
-msgid "New Template..."
+#: dialogs/umlcheckconstraintdialog.cpp:64
+#: dialogs/umluniqueconstraintdialog.cpp:83
+msgctxt "name label"
+msgid "Name"
 msgstr ""
 
-#: listpopupmenu.cpp:643
-msgid "New Literal..."
+#: dialogs/umlcheckconstraintdialog.cpp:73
+msgid "Check Condition :"
 msgstr ""
 
-#: listpopupmenu.cpp:646
-msgid "New Entity Attribute..."
+#: dialogs/umlattributedialog.cpp:44
+msgid "Attribute Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:649
-msgid "Export as Picture..."
+#: dialogs/umlattributedialog.cpp:81
+msgctxt "attribute name"
+msgid "&Name:"
 msgstr ""
 
-#: listpopupmenu.cpp:668
-msgid "Subsystem"
+#: dialogs/umlattributedialog.cpp:102
+msgctxt "access control public"
+msgid "&Public"
 msgstr ""
 
-#: listpopupmenu.cpp:671 worktoolbar.cpp:331
-msgid "Component"
+#: dialogs/umlattributedialog.cpp:105
+msgctxt "access control private"
+msgid "P&rivate"
 msgstr ""
 
-#: listpopupmenu.cpp:674 worktoolbar.cpp:333
-msgid "Artifact"
+#: dialogs/umlattributedialog.cpp:108
+msgctxt "access control protected"
+msgid "Prot&ected"
 msgstr ""
 
-#: listpopupmenu.cpp:685 worktoolbar.cpp:332
-msgid "Node"
-msgstr "Nôd"
+#: dialogs/umlattributedialog.cpp:159
+msgid "You have entered an invalid attribute name."
+msgstr ""
 
-#: listpopupmenu.cpp:698 listpopupmenu.cpp:832
-msgid "Folder"
-msgstr "Plygell"
+#: dialogs/umlattributedialog.cpp:167
+msgid ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr ""
 
-#: listpopupmenu.cpp:701 worktoolbar.cpp:337
-msgid "Entity"
+#: dialogs/umlattributedialog.cpp:168
+msgid "Attribute Name Not Unique"
 msgstr ""
 
-#: listpopupmenu.cpp:711 worktoolbar.cpp:359
-msgid "Category"
+#: dialogs/activitypage.cpp:80 dialogs/classifierlistpage.cpp:174
+msgid "Move selected item to the top"
 msgstr ""
 
-#: listpopupmenu.cpp:714 worktoolbar.cpp:313
-msgid "Actor"
+#: dialogs/activitypage.cpp:86 dialogs/classifierlistpage.cpp:180
+msgid "Move selected item up"
 msgstr ""
 
-#: listpopupmenu.cpp:717 worktoolbar.cpp:320
-msgid "Use Case"
+#: dialogs/activitypage.cpp:92 dialogs/classifierlistpage.cpp:186
+msgid "Move selected item down"
 msgstr ""
 
-#: listpopupmenu.cpp:727
-msgid "Text Line..."
+#: dialogs/activitypage.cpp:98 dialogs/classifierlistpage.cpp:192
+msgid "Move selected item to the bottom"
 msgstr ""
 
-#: listpopupmenu.cpp:829
-msgctxt "new container menu"
-msgid "New"
+#: dialogs/activitypage.cpp:102
+msgid "New Activity..."
 msgstr ""
 
-#: listpopupmenu.cpp:833
-msgctxt "new class menu item"
-msgid "Class"
+#: dialogs/activitypage.cpp:175
+msgid "New Activity"
 msgstr ""
 
-#: listpopupmenu.cpp:834 worktoolbar.cpp:334
-msgid "Interface"
-msgstr "Rhyngwyneb"
+#: dialogs/activitypage.cpp:198
+msgid "Rename Activity"
+msgstr ""
 
-#: listpopupmenu.cpp:835 worktoolbar.cpp:335
-msgid "Datatype"
+#: dialogs/activitypage.cpp:198
+msgid "Enter the new name of the activity:"
 msgstr ""
 
-#: listpopupmenu.cpp:836 worktoolbar.cpp:336
-msgid "Enum"
+#: dialogs/umluniqueconstraintdialog.cpp:42
+msgid "Unique Constraint Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:837 listpopupmenu.cpp:928 worktoolbar.cpp:330
-msgid "Package"
-msgstr "Pecyn"
+#: dialogs/umluniqueconstraintdialog.cpp:91
+msgid "Attribute Details"
+msgstr ""
 
-#: listpopupmenu.cpp:914
-msgid "Public Only"
+#: dialogs/umluniqueconstraintdialog.cpp:112
+#: dialogs/umlforeignkeyconstraintdialog.cpp:308
+msgid "&Add"
 msgstr ""
 
-#: listpopupmenu.cpp:918
-msgid "Operation Signature"
+#: dialogs/umluniqueconstraintdialog.cpp:241
+msgid "You have entered an invalid constraint name."
 msgstr ""
 
-#: listpopupmenu.cpp:923
-msgid "Attribute Signature"
+#: dialogs/umluniqueconstraintdialog.cpp:242
+msgid "Constraint Name Invalid"
 msgstr ""
 
-#: listpopupmenu.cpp:943
-msgctxt "new classifier menu"
-msgid "New"
+#: dialogs/classwizard.cpp:59
+msgid "Class Wizard"
 msgstr ""
 
-#: listpopupmenu.cpp:946
-msgid "Attribute..."
-msgstr "Priodoleddau ..."
+#: dialogs/classwizard.cpp:82
+msgid "New Class"
+msgstr ""
 
-#: listpopupmenu.cpp:947
-msgid "Operation..."
-msgstr "Gweithrediad ..."
+#: dialogs/classwizard.cpp:83
+msgid "Add general info about the new class."
+msgstr ""
 
-#: listpopupmenu.cpp:948
-msgid "Template..."
+#: dialogs/classwizard.cpp:100
+msgid "Class Attributes"
 msgstr ""
 
-#: listpopupmenu.cpp:962
-msgid "Refactor"
+#: dialogs/classwizard.cpp:101
+msgid "Add attributes to the new class."
 msgstr ""
 
-#: listpopupmenu.cpp:963
-msgid "View Code"
+#: dialogs/classwizard.cpp:118
+msgid "Class Operations"
 msgstr ""
 
-#: listpopupmenu.cpp:978
-msgctxt "color menu"
-msgid "Color"
+#: dialogs/classwizard.cpp:119
+msgid "Add operations to the new class."
 msgstr ""
 
-#: listpopupmenu.cpp:980
-msgid "Fill Color..."
-msgstr "Lliw Llenwad ..."
+#: dialogs/pkgcontentspage.cpp:40
+msgid "Contained Items"
+msgstr ""
 
-#. i18n: file: umbrello.kcfg:96
-#. i18n: ectx: label, entry (useFillColor), group (UI Options)
-#: listpopupmenu.cpp:981 rc.cpp:85 rc.cpp:1768
-msgid "Use Fill Color"
+#: dialogs/objectnodedialog.cpp:136
+msgid "Central Buffer"
 msgstr ""
 
-#: listpopupmenu.cpp:1075
-msgctxt "new sub menu"
-msgid "New"
+#: dialogs/objectnodedialog.cpp:136
+msgid "Data Store"
 msgstr ""
 
-#: listpopupmenu.cpp:1124
-msgid "Actor..."
+#: dialogs/objectnodedialog.cpp:136
+msgid "ObjectFlow"
 msgstr ""
 
-#: listpopupmenu.cpp:1125
-msgid "Use Case..."
+#. i18n: file: codegenwizard/codegenoptionspage.ui:39
+#. i18n: ectx: attribute (title), widget (QWidget, ui_tabGeneral)
+#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:51
+#. i18n: ectx: attribute (title), widget (QWidget, ui_tabGeneral)
+#: dialogs/objectnodedialog.cpp:140 rc.cpp:89 rc.cpp:298
+msgid "General"
+msgstr "Cyffredinol"
+
+#: dialogs/objectnodedialog.cpp:145
+msgctxt "properties group title"
+msgid "Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:1129
-msgctxt "new class menu item"
-msgid "Class..."
+#: dialogs/objectnodedialog.cpp:159
+msgid "Object Node type:"
 msgstr ""
 
-#: listpopupmenu.cpp:1130
-msgid "Interface..."
-msgstr "Rhyngwyneb ..."
+#: dialogs/objectnodedialog.cpp:164
+msgid "Object Node name:"
+msgstr ""
 
-#: listpopupmenu.cpp:1131
-msgid "Datatype..."
+#: dialogs/objectnodedialog.cpp:168
+msgctxt "enter state label"
+msgid "State :"
 msgstr ""
 
-#: listpopupmenu.cpp:1132
-msgid "Enum..."
+#: dialogs/objectnodedialog.cpp:173
+msgid "&Central Buffer"
 msgstr ""
 
-#: listpopupmenu.cpp:1133
-msgid "Package..."
-msgstr "Pecyn ..."
+#: dialogs/objectnodedialog.cpp:176
+msgid "&Data Store "
+msgstr ""
 
-#: listpopupmenu.cpp:1137 worktoolbar.cpp:322
-msgid "Initial State"
+#: dialogs/objectnodedialog.cpp:179
+msgid "&Object Flow"
 msgstr ""
 
-#: listpopupmenu.cpp:1138 worktoolbar.cpp:324
-msgid "End State"
+#: dialogs/objectnodedialog.cpp:247
+msgctxt "color page title"
+msgid "Color"
 msgstr ""
 
-#: listpopupmenu.cpp:1139
-msgctxt "add new state"
-msgid "State..."
+#: dialogs/codeviewerdialog.cpp:107
+msgid "Code Viewer - "
 msgstr ""
 
-#: listpopupmenu.cpp:1143 worktoolbar.cpp:354
-msgid "Initial Activity"
+#: dialogs/overwritedialogue.cpp:32
+msgid "Destination File Already Exists"
 msgstr ""
 
-#: listpopupmenu.cpp:1144 worktoolbar.cpp:351
-msgid "End Activity"
+#: dialogs/overwritedialogue.cpp:45
+#, kde-format
+msgid ""
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
 
-#: listpopupmenu.cpp:1145 listpopupmenu.cpp:1187
-msgid "Activity..."
+#: dialogs/overwritedialogue.cpp:48
+msgid "&Apply to all remaining files"
 msgstr ""
 
-#: listpopupmenu.cpp:1150
-msgid "Subsystem..."
+#: dialogs/overwritedialogue.cpp:53
+msgid "&Generate Similar File Name"
 msgstr ""
 
-#: listpopupmenu.cpp:1151
-msgid "Component..."
+#: dialogs/overwritedialogue.cpp:54
+msgid "&Do Not Generate File"
 msgstr ""
 
-#: listpopupmenu.cpp:1152
-msgid "Artifact..."
+#: dialogs/assocgenpage.cpp:81
+msgctxt "name of association widget"
+msgid "Name:"
 msgstr ""
 
-#: listpopupmenu.cpp:1155
-msgid "Node..."
-msgstr "Nôd ..."
+#: dialogs/assocgenpage.cpp:94
+msgid "Type:"
+msgstr "Math:"
 
-#: listpopupmenu.cpp:1158
-msgid "Entity..."
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:52
+#. i18n: ectx: property (toolTip), widget (QLabel, ui_imageTypeLabel)
+#: dialogs/exportallviewsdialog.cpp:82 rc.cpp:1209
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#: listpopupmenu.cpp:1159
-msgid "Category..."
+#: dialogs/assocrolepage.cpp:53
+msgid "Role A Properties"
 msgstr ""
 
-#: listpopupmenu.cpp:1163
-msgid "Object..."
-msgstr "Gwrthrych ..."
+#: dialogs/assocrolepage.cpp:54
+msgid "Role B Properties"
+msgstr ""
 
-#: listpopupmenu.cpp:1167
-msgid "Attribute"
-msgstr "Priodoleddau"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role A Visibility"
+msgstr ""
 
-#: listpopupmenu.cpp:1169 listpopupmenu.cpp:1173
-msgid "Template"
-msgstr "Patrymlun"
+#: dialogs/assocrolepage.cpp:72
+msgid "Role B Visibility"
+msgstr ""
 
-#: listpopupmenu.cpp:1176
-msgid "Entity Attribute..."
+#: dialogs/assocrolepage.cpp:73
+msgid "Role A Changeability"
 msgstr ""
 
-#: listpopupmenu.cpp:1183
-msgid "Enum Literal..."
+#: dialogs/assocrolepage.cpp:74
+msgid "Role B Changeability"
 msgstr ""
 
-#: listpopupmenu.cpp:1611
-msgid "Delete Anchor"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:36
+#. i18n: ectx: property (text), widget (QLabel, ui_labelRoleName)
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:176 rc.cpp:1161
+msgid "Rolename:"
 msgstr ""
 
-#: listpopupmenu.cpp:1636
-msgid "Change Association Name..."
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:49
+#. i18n: ectx: property (text), widget (QLabel, ui_labelMultiplicity)
+#: dialogs/assocrolepage.cpp:104 dialogs/assocrolepage.cpp:181 rc.cpp:1164
+msgid "Multiplicity:"
 msgstr ""
 
-#: listpopupmenu.cpp:1686
-msgid "Undo"
+#: dialogs/assocrolepage.cpp:121
+msgctxt "scope for A is public"
+msgid "Public"
 msgstr ""
 
-#: listpopupmenu.cpp:1687
-msgid "Redo"
+#: dialogs/assocrolepage.cpp:124
+msgctxt "scope for A is private"
+msgid "Private"
 msgstr ""
 
-#: listpopupmenu.cpp:1693
-msgid "Clear Diagram"
+#: dialogs/assocrolepage.cpp:127
+msgctxt "scope for A is protected"
+msgid "Protected"
 msgstr ""
 
-#: listpopupmenu.cpp:1696
-msgid "Snap to Grid"
-msgstr "Snapio i'r Grid"
-
-#: listpopupmenu.cpp:1698
-msgid "Show Grid"
-msgstr "Dangos Grid"
-
-#: listpopupmenu.cpp:1710
-msgid "Disjoint(Specialisation)"
+#: dialogs/assocrolepage.cpp:130
+msgctxt "scope for A is implementation"
+msgid "Implementation"
 msgstr ""
 
-#: listpopupmenu.cpp:1711
-msgid "Overlapping(Specialisation)"
+#: dialogs/assocrolepage.cpp:152
+msgctxt "changeability for A is changeable"
+msgid "Changeable"
 msgstr ""
 
-#: listpopupmenu.cpp:1712
-msgid "Union"
+#: dialogs/assocrolepage.cpp:155
+msgctxt "changeability for A is frozen"
+msgid "Frozen"
 msgstr ""
 
-#: worktoolbar.cpp:300
-msgid "Object"
-msgstr "Gwrthrych"
-
-#: worktoolbar.cpp:301
-msgid "Synchronous Message"
+#: dialogs/assocrolepage.cpp:158
+msgctxt "changeability for A is add only"
+msgid "Add only"
 msgstr ""
 
-#: worktoolbar.cpp:302
-msgid "Asynchronous Message"
+#: dialogs/assocrolepage.cpp:198
+msgctxt "scope for B is public"
+msgid "Public"
 msgstr ""
 
-#: worktoolbar.cpp:303
-msgid "Found Message"
+#: dialogs/assocrolepage.cpp:201
+msgctxt "scope for B is private"
+msgid "Private"
 msgstr ""
 
-#: worktoolbar.cpp:304
-msgid "Lost Message"
+#: dialogs/assocrolepage.cpp:204
+msgctxt "scope for B is protected"
+msgid "Protected"
 msgstr ""
 
-#: worktoolbar.cpp:305
-msgid "Combined Fragment"
+#: dialogs/assocrolepage.cpp:207
+msgctxt "scope for B is implementation"
+msgid "Implementation"
 msgstr ""
 
-#: worktoolbar.cpp:306
-msgid "Precondition"
+#: dialogs/assocrolepage.cpp:229
+msgctxt "changeability for B is changeable"
+msgid "Changeable"
 msgstr ""
 
-#: worktoolbar.cpp:307 association.cpp:42
-msgid "Association"
-msgstr "Cyd"
-
-#: worktoolbar.cpp:308 association.cpp:48
-msgid "Containment"
+#: dialogs/assocrolepage.cpp:232
+msgctxt "changeability for B is frozen"
+msgid "Frozen"
 msgstr ""
 
-#: worktoolbar.cpp:309 association.cpp:52
-msgid "Anchor"
+#: dialogs/assocrolepage.cpp:235
+msgctxt "changeability for B is add only"
+msgid "Add only"
 msgstr ""
 
-#: worktoolbar.cpp:310
-msgid "Label"
-msgstr "Label"
-
-#: worktoolbar.cpp:311
-msgid "Note"
-msgstr "Noder"
-
-#: worktoolbar.cpp:312
-msgid "Box"
+#: dialogs/classifierlistpage.cpp:116
+msgid "N&ew Attribute..."
 msgstr ""
 
-#: worktoolbar.cpp:314 association.cpp:41
-msgid "Dependency"
-msgstr "Dibyniaeth"
-
-#: worktoolbar.cpp:315 association.cpp:40
-msgid "Aggregation"
+#: dialogs/classifierlistpage.cpp:120
+msgid "N&ew Operation..."
 msgstr ""
 
-#: worktoolbar.cpp:316 association.cpp:58
-msgid "Relationship"
-msgstr "Perthynas"
-
-#: worktoolbar.cpp:317
-msgid "Directional Association"
+#: dialogs/classifierlistpage.cpp:124
+msgid "N&ew Template..."
 msgstr ""
 
-#: worktoolbar.cpp:318
-msgid "Implements"
+#: dialogs/classifierlistpage.cpp:128
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#: worktoolbar.cpp:319 association.cpp:49
-msgid "Composition"
+#: dialogs/classifierlistpage.cpp:132
+msgid "N&ew Entity Attribute..."
 msgstr ""
 
-#: worktoolbar.cpp:321
-msgctxt "UML class"
-msgid "Class"
+#: dialogs/classifierlistpage.cpp:135
+msgid "Constraints"
 msgstr ""
 
-#: worktoolbar.cpp:323
-msgid "Region"
+#: dialogs/classifierlistpage.cpp:136
+msgid "N&ew Constraint..."
 msgstr ""
 
-#: worktoolbar.cpp:326
-msgid "Send signal"
+#: dialogs/classifierlistpage.cpp:226
+msgid "Comment"
 msgstr ""
 
-#: worktoolbar.cpp:327
-msgid "Accept signal"
+#: dialogs/classifierlistpage.cpp:227
+msgid "Source Code"
 msgstr ""
 
-#: worktoolbar.cpp:328
-msgid "Accept time event"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:50
+msgid "Foreign Key Setup"
 msgstr ""
 
-#: worktoolbar.cpp:329
-msgid "Fork/Join"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:196
+msgctxt "general page title"
+msgid "General"
 msgstr ""
 
-#: worktoolbar.cpp:338
-msgid "Deep History"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:201
+msgctxt "general group title"
+msgid "General"
 msgstr ""
 
-#: worktoolbar.cpp:339
-msgid "Shallow History"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:208
+msgctxt "label for entering name"
+msgid "Name"
 msgstr ""
 
-#: worktoolbar.cpp:340
-msgctxt "join states"
-msgid "Join"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:211
+msgid "Referenced Entity"
 msgstr ""
 
-#: worktoolbar.cpp:341
-msgid "Fork"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:218
+msgid "Actions"
 msgstr ""
 
-#: worktoolbar.cpp:342
-msgid "Junction"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:224
+msgid "On Update"
 msgstr ""
 
-#: worktoolbar.cpp:343
-msgctxt "state choice"
-msgid "Choice"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:230
+msgid "On Delete"
 msgstr ""
 
-#: worktoolbar.cpp:346
-msgid "And Line"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:262
+msgid "No Action"
 msgstr ""
 
-#: worktoolbar.cpp:347 association.cpp:53
-msgid "State Transition"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:262
+msgid "Restrict"
 msgstr ""
 
-#: worktoolbar.cpp:348
-msgid "Activity Transition"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:262
+msgid "Cascade"
 msgstr ""
 
-#: worktoolbar.cpp:350
-msgctxt "state diagram"
-msgid "State"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:262
+msgid "Set Null"
 msgstr ""
 
-#: worktoolbar.cpp:352
-msgid "Final Activity"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:263
+msgid "Set Default"
 msgstr ""
 
-#: worktoolbar.cpp:353
-msgid "Pin"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:281
+#: dialogs/umlforeignkeyconstraintdialog.cpp:282
+msgid "Columns"
 msgstr ""
 
-#: worktoolbar.cpp:355
-msgid "Message"
-msgstr "Neges"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:289
+msgctxt "column header local"
+msgid "Local"
+msgstr ""
 
-#: worktoolbar.cpp:356 association.cpp:55
-msgid "Exception"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:289
+msgctxt "column header referenced"
+msgid "Referenced"
 msgstr ""
 
-#: worktoolbar.cpp:357
-msgid "Object Node"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:295
+msgid "Local Column"
 msgstr ""
 
-#: worktoolbar.cpp:358
-msgid "Pre/Post condition"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:301
+msgid "Referenced Column"
 msgstr ""
 
-#: worktoolbar.cpp:360 association.cpp:56
-msgid "Category to Parent"
+#: dialogs/umlforeignkeyconstraintdialog.cpp:383
+msgid ""
+"You are attempting to change the Referenced Entity of this ForeignKey "
+"Constraint. Any unapplied changes to the mappings between local and "
+"referenced entities will be lost. Are you sure you want to continue ?"
 msgstr ""
 
-#: worktoolbar.cpp:361 association.cpp:57
-msgid "Child to Category"
+#: dialogs/assocpropdlg.cpp:43
+msgid "Association Properties"
 msgstr ""
 
-#: worktoolbar.cpp:372
-msgctxt "selection arrow"
-msgid "Select"
+#: dialogs/assocpropdlg.cpp:92
+msgctxt "general settings"
+msgid "General"
 msgstr ""
 
-#: toolbarstateassociation.cpp:181 toolbarstateassociation.cpp:250
-msgid "Incorrect use of associations."
+#: dialogs/assocpropdlg.cpp:103
+msgid "Roles"
 msgstr ""
 
-#: toolbarstateassociation.cpp:181 toolbarstateassociation.cpp:250
-msgid "Association Error"
+#: dialogs/assocpropdlg.cpp:104
+msgid "Role Settings"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:39
-msgid "Package is a namespace"
+#: dialogs/assocpropdlg.cpp:129
+msgid "Association font"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:43
-msgid "Virtual destructors"
+#: dialogs/diagramprintpage.cpp:44
+msgid "&Diagrams"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:47
-msgid "Generate empty constructors"
+#: dialogs/diagramprintpage.cpp:49
+msgid "Filter"
+msgstr "Hidlo"
+
+#: dialogs/diagramprintpage.cpp:56
+msgid "&Current diagram"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:51
-msgid "Generate accessor methods"
+#: dialogs/diagramprintpage.cpp:60
+msgid "&All diagrams"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:55
-msgid "Operations are inline"
+#: dialogs/diagramprintpage.cpp:63
+msgid "&Select diagrams"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:59
-msgid "Accessors are inline"
+#: dialogs/diagramprintpage.cpp:66
+msgid "&Type of diagram"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:63
-msgid "Accessors are public"
+#: dialogs/diagramprintpage.cpp:69
+msgctxt "diagram selection for printing"
+msgid "Selection"
 msgstr ""
 
-#: codegenerators/cpp/cppcodegenerationform.cpp:67
-msgid "Use '\\' as documentation tag instead of '@'"
+#: dialogs/diagramprintpage.cpp:160
+msgid "No diagrams selected."
 msgstr ""
 
-#: codegenerators/codegenerator.cpp:587
-#, kde-format
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
+#: docgenerators/docbookgeneratorjob.cpp:80
+msgid "Exporting to DocBook..."
 msgstr ""
 
-#: codegenerators/codegenerator.cpp:587
-msgid "Cannot Open File"
-msgstr "Methu Agor y Ffeil"
+#: docgenerators/xhtmlgenerator.cpp:108
+msgid "Generating XHTML..."
+msgstr ""
 
-#: codegenerators/codegenerator.cpp:649
-#: codegenerators/simplecodegenerator.cpp:132
-msgid "Cannot create the folder:\n"
+#: docgenerators/xhtmlgenerator.cpp:134
+msgid "XHTML Generation Complete..."
 msgstr ""
 
-#: codegenerators/codegenerator.cpp:650
-#: codegenerators/simplecodegenerator.cpp:133
-msgid ""
-"\n"
-"Please check the access rights"
+#: docgenerators/xhtmlgenerator.cpp:140
+msgid "Copying CSS..."
 msgstr ""
 
-#: codegenerators/codegenerator.cpp:651
-#: codegenerators/simplecodegenerator.cpp:134
-msgid "Cannot Create Folder"
+#: docgenerators/xhtmlgenerator.cpp:148
+msgid "Finished Copying CSS..."
 msgstr ""
 
-#: toolbarstateother.cpp:235
-msgid "Enter Signal Name"
+#: docgenerators/xhtmlgenerator.cpp:151
+msgid "Failed Copying CSS..."
 msgstr ""
 
-#: toolbarstateother.cpp:236
-msgid "Enter Signal"
+#: docgenerators/main.cpp:38 docgenerators/main.cpp:51
+msgid "Umbrello UML Modeller autonomous code generator"
 msgstr ""
 
-#: toolbarstateother.cpp:236
-msgid "new Signal"
+#: docgenerators/main.cpp:53
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
 
-#: toolbarstateother.cpp:242
-msgid "Enter Time Event Name"
+#: docgenerators/main.cpp:55
+msgid "Gael de Chalendar (aka Kleag)"
 msgstr ""
 
-#: toolbarstateother.cpp:243
-msgid "Enter Time Event"
+#: docgenerators/main.cpp:60
+msgid "File to transform"
 msgstr ""
 
-#: toolbarstateother.cpp:243
-msgid "new time event"
+#: docgenerators/main.cpp:61
+msgid "The XSLT file to use"
 msgstr ""
 
-#: toolbarstateother.cpp:249
-msgid "Enter Combined Fragment Name"
+#: docgenerators/docbook2xhtmlgeneratorjob.cpp:56
+msgid "Exporting to XHTML..."
 msgstr ""
 
-#: toolbarstateother.cpp:250
-msgid "Enter the Combined Fragment"
+#: docgenerators/docbookgenerator.cpp:89
+msgid "Generating Docbook..."
 msgstr ""
 
-#: toolbarstateother.cpp:250
-msgid "new Combined Fragment"
+#: docgenerators/docbookgenerator.cpp:109
+msgid "Docbook Generation Complete..."
 msgstr ""
 
-#: association.cpp:39
-msgid "Generalization"
+#: docgenerators/docbookgenerator.cpp:112
+msgid "Docbook Generation Failed..."
 msgstr ""
 
-#: association.cpp:43
-msgid "Self Association"
+#: classifier.cpp:266
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: association.cpp:44
-msgid "Collaboration Message"
+#: toolbarstateassociation.cpp:177 toolbarstateassociation.cpp:247
+msgid "Incorrect use of associations."
 msgstr ""
 
-#: association.cpp:45
-msgid "Sequence Message"
+#: toolbarstateassociation.cpp:177 toolbarstateassociation.cpp:247
+msgid "Association Error"
 msgstr ""
 
-#: association.cpp:46
-msgid "Collaboration Self Message"
+#: umlviewimageexportermodel.cpp:218
+msgid "Empty scene"
 msgstr ""
 
-#: association.cpp:47
-msgid "Sequence Self Message"
+#: umlviewimageexportermodel.cpp:223
+#, kde-format
+msgid "Can not create directory: %1"
 msgstr ""
 
-#: association.cpp:50
-msgid "Realization"
+#: umlviewimageexportermodel.cpp:240
+msgid "Can not save an empty diagram"
 msgstr ""
 
-#: association.cpp:51
-msgid "Uni Association"
+#: umlviewimageexportermodel.cpp:245
+#, kde-format
+msgid "A problem occurred while saving diagram in %1"
 msgstr ""
 
-#: rc.cpp:515
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD wrth KGyfieithu, ,Launchpad Contributions:,Thierry Vignaud"
 
-#: rc.cpp:516
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
 #. i18n: file: umbrelloui.rc:5
 #. i18n: ectx: Menu (file_export)
-#: rc.cpp:490 rc.cpp:522
+#: rc.cpp:8
 msgid "&Export"
 msgstr ""
 
 #. i18n: file: umbrelloui.rc:10
 #. i18n: ectx: Menu (edit)
-#: rc.cpp:493 rc.cpp:525
+#: rc.cpp:11
 msgid "&Edit"
 msgstr ""
 
 #. i18n: file: umbrelloui.rc:13
 #. i18n: ectx: Menu (views)
-#: rc.cpp:496 rc.cpp:528
+#: rc.cpp:14
 msgid "&Diagram"
 msgstr ""
 
 #. i18n: file: umbrelloui.rc:14
 #. i18n: ectx: Menu (new_view)
-#: rc.cpp:499 rc.cpp:531
+#: rc.cpp:17
 msgid "&New"
 msgstr "&Newydd"
 
 #. i18n: file: umbrelloui.rc:30
 #. i18n: ectx: Menu (show_view)
-#: rc.cpp:502 rc.cpp:534
+#: rc.cpp:20
 msgid "Sh&ow"
 msgstr "Da&ngos"
 
 #. i18n: file: umbrelloui.rc:33
 #. i18n: ectx: Menu (zoom_menu)
-#: rc.cpp:505 rc.cpp:537
+#: rc.cpp:23
 msgid "&Zoom"
 msgstr ""
 
 #. i18n: file: umbrelloui.rc:35
 #. i18n: ectx: Menu (align_menu)
-#: rc.cpp:508 rc.cpp:540
+#: rc.cpp:26
 msgid "&Align"
 msgstr ""
 
 #. i18n: file: umbrelloui.rc:51
 #. i18n: ectx: Menu (code)
-#: rc.cpp:511 rc.cpp:543
+#: rc.cpp:29
 msgid "&Code"
 msgstr ""
 
-#. i18n: file: umbrelloui.rc:56
+#. i18n: file: umbrelloui.rc:57
 #. i18n: ectx: Menu (active_lang_menu)
-#: rc.cpp:514 rc.cpp:546
+#: rc.cpp:32
 msgid "Active &Language"
 msgstr ""
 
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:37
+#. i18n: ectx: property (toolTip), widget (QLabel, ui_languageLabel)
+#: rc.cpp:38
+msgid "The language of the project."
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:40
+#. i18n: ectx: property (text), widget (QLabel, ui_languageLabel)
+#: rc.cpp:41
+msgid "Programming Language:"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:66
+#. i18n: ectx: property (text), widget (QCheckBox, ui_subdirCheckBox)
+#: rc.cpp:44
+msgid "Include Subdirectories."
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:77
+#. i18n: ectx: property (text), widget (QLabel, ui_fileExtLabel)
+#: rc.cpp:47
+msgid "List of file extensions"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:117
+#. i18n: ectx: property (text), widget (QPushButton, ui_deselectAllButton)
+#: rc.cpp:50
+msgid "Deselect all"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:124
+#. i18n: ectx: property (text), widget (QPushButton, ui_selectAllButton)
+#: rc.cpp:53
+msgid "Select all"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:136
+#. i18n: ectx: property (text), widget (QLabel, ui_filesLabel)
+#: rc.cpp:56
+msgid "Number of files:"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpselectpage.ui:143
+#. i18n: ectx: property (text), widget (QLabel, ui_filesNumLabel)
+#: rc.cpp:59
+msgid "0"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, ui_tabStatus)
+#: rc.cpp:62
+msgid "Import Status"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:49
+#. i18n: ectx: property (text), widget (QTableWidget, ui_tableWidgetStatus)
+#. i18n: file: codegenwizard/codegenstatuspage.ui:40
+#. i18n: ectx: property (text), widget (QTableWidget, ui_tableWidgetStatus)
+#: rc.cpp:65 rc.cpp:214
+msgid "Class"
+msgstr "Dosbarth"
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:54
+#. i18n: ectx: property (text), widget (QTableWidget, ui_tableWidgetStatus)
+#. i18n: file: codegenwizard/codegenstatuspage.ui:27
+#. i18n: ectx: attribute (title), widget (QWidget, ui_statusTab)
+#. i18n: file: codegenwizard/codegenstatuspage.ui:45
+#. i18n: ectx: property (text), widget (QTableWidget, ui_tableWidgetStatus)
+#: rc.cpp:68 rc.cpp:211 rc.cpp:217
+msgid "Status"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:75
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonStart)
+#: rc.cpp:71
+msgid "Start import"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:94
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonStop)
+#: rc.cpp:74
+msgid "Stop"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:105
+#. i18n: ectx: attribute (title), widget (QWidget, ui_tabLogger)
+#. i18n: file: codegenwizard/codegenstatuspage.ui:59
+#. i18n: ectx: attribute (title), widget (QWidget, ui_loggerTab)
+#: rc.cpp:77 rc.cpp:220
+msgid "Logger"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:131
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonClear)
+#. i18n: file: codegenwizard/codegenstatuspage.ui:85
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonClear)
+#: rc.cpp:80 rc.cpp:223
+msgid "Clear"
+msgstr ""
+
+#. i18n: file: codeimpwizard/codeimpstatuspage.ui:144
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonExport)
+#. i18n: file: codegenwizard/codegenstatuspage.ui:98
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonExport)
+#: rc.cpp:83 rc.cpp:226
+msgid "Export..."
+msgstr ""
+
 #. i18n: file: codegenwizard/codegenoptionspage.ui:53
 #. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxLanguage)
-#: rc.cpp:555
+#: rc.cpp:92
 msgid "Language"
 msgstr "Iaith"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:71
 #. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxFolders)
-#: rc.cpp:558
+#: rc.cpp:95
 msgid "Folders"
 msgstr "Plygyll"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:77
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelFolder)
-#: rc.cpp:561
+#: rc.cpp:98
 msgid "Write all generated files to folder:"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:89
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, ui_outputDir)
-#: rc.cpp:564
+#: rc.cpp:101
 msgid "Files generated by Code Generator will be written to this folder"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:96
 #. i18n: ectx: property (text), widget (QPushButton, ui_browseOutput)
-#: rc.cpp:567
+#: rc.cpp:104
 msgid "Bro&wse..."
 msgstr "Por&i..."
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:105
 #. i18n: ectx: property (text), widget (QCheckBox, ui_includeHeadings)
-#: rc.cpp:570
+#: rc.cpp:107
 msgid "&Include heading files from folder:"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:117
 #. i18n: ectx: property (whatsThis), widget (KLineEdit, ui_headingsDir)
-#: rc.cpp:573
+#: rc.cpp:110
 msgid ""
 "Files in this folder will be used as heading files in the generated code"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:124
 #. i18n: ectx: property (text), widget (QPushButton, ui_browseHeadings)
-#: rc.cpp:576
+#: rc.cpp:113
 msgid "B&rowse..."
 msgstr "Po&ri..."
 
-#. i18n: file: umbrello.kcfg:338
-#. i18n: ectx: label, entry (overwritePolicy), group (Code Generation)
 #. i18n: file: codegenwizard/codegenoptionspage.ui:136
 #. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxOverwritePolicy)
-#. i18n: file: umbrello.kcfg:338
+#. i18n: file: umbrello.kcfg:418
 #. i18n: ectx: label, entry (overwritePolicy), group (Code Generation)
-#: rc.cpp:355 rc.cpp:579 rc.cpp:2038
+#: rc.cpp:116 rc.cpp:1580
 msgid "Overwrite Policy"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:143
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelOverwritePolicy)
-#: rc.cpp:582
+#: rc.cpp:119
 msgid ""
 "If a file with the same name as the name code \n"
 "generator wants to use as output file already exists:"
@@ -4276,31 +4399,31 @@
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:167
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, ui_radioButtonOverwrite)
-#: rc.cpp:586
+#: rc.cpp:123
 msgid "Overwrite existing files if they exist in the destination folder"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:170
 #. i18n: ectx: property (text), widget (QRadioButton, ui_radioButtonOverwrite)
-#: rc.cpp:589
+#: rc.cpp:126
 msgid "O&verwrite"
 msgstr "T&rosysgrifo"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:177
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, ui_radioButtonAsk)
-#: rc.cpp:592
+#: rc.cpp:129
 msgid "If a file with the same name already exists, ask what to do"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:180
 #. i18n: ectx: property (text), widget (QRadioButton, ui_radioButtonAsk)
-#: rc.cpp:595
+#: rc.cpp:132
 msgid "As&k"
 msgstr "Go&fyn"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:190
 #. i18n: ectx: property (whatsThis), widget (QRadioButton, ui_radioButtonChangeName)
-#: rc.cpp:598
+#: rc.cpp:135
 msgid ""
 "If a file already exists in the destination folder, select a different name "
 "to use by adding a suffix to the file name"
@@ -4308,37 +4431,37 @@
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:193
 #. i18n: ectx: property (text), widget (QRadioButton, ui_radioButtonChangeName)
-#: rc.cpp:601
+#: rc.cpp:138
 msgid "&Use a different name"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:208
 #. i18n: ectx: attribute (title), widget (QWidget, ui_tabFormatting)
-#: rc.cpp:604
+#: rc.cpp:141
 msgid "Formatting"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:216
 #. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxComment)
-#: rc.cpp:607
+#: rc.cpp:144
 msgid "Comment Verbosity"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:222
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ui_forceDoc)
-#: rc.cpp:610
+#: rc.cpp:147
 msgid "Write comments &for class and method documentation even if empty"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:225
 #. i18n: ectx: property (text), widget (QCheckBox, ui_forceDoc)
-#: rc.cpp:613
+#: rc.cpp:150
 msgid "&Write documentation comments even if empty"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:232
 #. i18n: ectx: property (whatsThis), widget (QCheckBox, ui_forceSections)
-#: rc.cpp:616
+#: rc.cpp:153
 msgid ""
 "Writes comments to indicate the different sections (public, private etc) in "
 "a class, even if the sections are empty"
@@ -4346,7 +4469,7 @@
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:236
 #. i18n: ectx: property (text), widget (QCheckBox, ui_forceSections)
-#: rc.cpp:619
+#: rc.cpp:156
 msgid ""
 "Write comments &for sections even if section \n"
 "is empty"
@@ -4354,388 +4477,253 @@
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:246
 #. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxLines)
-#: rc.cpp:623
+#: rc.cpp:160
 msgid "Lines"
 msgstr "Llinellau"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:254
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelType)
-#: rc.cpp:626
+#: rc.cpp:163
 msgid "Indentation type:"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:265
 #. i18n: ectx: property (text), item, widget (KComboBox, ui_SelectIndentationTypeBox)
-#: rc.cpp:629
+#: rc.cpp:166
 msgid "No Indentation"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:270
 #. i18n: ectx: property (text), item, widget (KComboBox, ui_SelectIndentationTypeBox)
-#: rc.cpp:632
+#: rc.cpp:169
 msgid "Tab"
 msgstr "Tab"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:275
 #. i18n: ectx: property (text), item, widget (KComboBox, ui_SelectIndentationTypeBox)
-#: rc.cpp:635
+#: rc.cpp:172
 msgid "Space"
 msgstr "Gofodnod"
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:293
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelAmount)
-#: rc.cpp:638
+#: rc.cpp:175
 msgid "Indentation amount:"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:310
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
-#: rc.cpp:641
+#: rc.cpp:178
 msgid "Line ending style:"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:321
 #. i18n: ectx: property (text), item, widget (KComboBox, ui_SelectEndLineCharsBox)
-#: rc.cpp:644
+#: rc.cpp:181
 msgid "*NIX (\"\\n\")"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:326
 #. i18n: ectx: property (text), item, widget (KComboBox, ui_SelectEndLineCharsBox)
-#: rc.cpp:647
+#: rc.cpp:184
 msgid "Windows (\"\\r\\n\")"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenoptionspage.ui:331
 #. i18n: ectx: property (text), item, widget (KComboBox, ui_SelectEndLineCharsBox)
-#: rc.cpp:650
+#: rc.cpp:187
 msgid "Mac (\"\\r\")"
 msgstr ""
 
-#. i18n: file: codegenwizard/codegenstatuspage.ui:29
-#. i18n: ectx: property (text), widget (QTableWidget, ui_tableWidgetStatus)
-#: rc.cpp:653
-msgid "Class"
-msgstr "Dosbarth"
-
-#. i18n: file: codegenwizard/codegenstatuspage.ui:34
-#. i18n: ectx: property (text), widget (QTableWidget, ui_tableWidgetStatus)
-#: rc.cpp:656
-msgid "Status"
-msgstr ""
-
-#. i18n: file: codegenwizard/codegenstatuspage.ui:55
-#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonGenerate)
-#: rc.cpp:659
-msgid "Generate"
-msgstr ""
-
 #. i18n: file: codegenwizard/codegenselectpage.ui:19
 #. i18n: ectx: property (windowTitle), widget (QWidget, CodeGenSelectPage)
-#: rc.cpp:662
+#: rc.cpp:190
 msgid "Code Generation Selection"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenselectpage.ui:32
 #. i18n: ectx: property (text), widget (QLabel, ui_labelListAvailable)
-#: rc.cpp:665
+#: rc.cpp:193
 msgid "Classes Available"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenselectpage.ui:72
 #. i18n: ectx: property (toolTip), widget (QPushButton, ui_addButton)
-#: rc.cpp:668
+#: rc.cpp:196
 msgid "Add class for code generation"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenselectpage.ui:75
 #. i18n: ectx: property (text), widget (QPushButton, ui_addButton)
-#: rc.cpp:671
+#: rc.cpp:199
 msgid "Add >>"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenselectpage.ui:101
 #. i18n: ectx: property (toolTip), widget (QPushButton, ui_removeButton)
-#: rc.cpp:674
+#: rc.cpp:202
 msgid "Remove class from Code Generation"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenselectpage.ui:104
 #. i18n: ectx: property (text), widget (QPushButton, ui_removeButton)
-#: rc.cpp:677
+#: rc.cpp:205
 msgid "<< Remove"
 msgstr ""
 
 #. i18n: file: codegenwizard/codegenselectpage.ui:137
 #. i18n: ectx: property (text), widget (QLabel, ui_labelListSelected)
-#: rc.cpp:680
+#: rc.cpp:208
 msgid "Classes Selected"
 msgstr ""
 
-#. i18n: file: dialogs/codeviewerdialogbase.ui:20
-#. i18n: ectx: property (text), widget (QCheckBox, m_showHiddenCodeCB)
-#: rc.cpp:683
-msgid "Show hidden blocks"
-msgstr ""
-
-#. i18n: file: dialogs/codeviewerdialogbase.ui:33
-#. i18n: ectx: property (text), widget (QLabel, ui_componentLabel)
-#: rc.cpp:686
-msgid "<p align=\"center\">component name here</p>"
-msgstr ""
-
-#. i18n: file: dialogs/codeviewerdialogbase.ui:46
-#. i18n: ectx: property (text), widget (QCheckBox, m_highlightCheckBox)
-#: rc.cpp:689
-msgid "Show block type"
-msgstr ""
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:16
-#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDiagramProperties)
-#: rc.cpp:692
-msgid "Diagram Properties"
-msgstr ""
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:39
-#. i18n: ectx: property (text), widget (QLabel, ui_labelDiagramName)
-#: rc.cpp:695
-msgid "Name:"
-msgstr "Enw:"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:82
-#. i18n: ectx: property (text), widget (QLabel, ui_labelZoom)
-#: rc.cpp:698
-msgid "Zoom:"
-msgstr "Chwyddo:"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:108
-#. i18n: ectx: property (text), widget (QLabel, ui_labelZoomUnit)
-#: rc.cpp:702
-#, no-c-format
-msgid "%"
-msgstr "%"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:153
-#. i18n: ectx: property (text), widget (QCheckBox, ui_checkBoxShowGrid)
-#: rc.cpp:708
-msgid "Show &grid"
-msgstr "Dangos &grid"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:160
-#. i18n: ectx: property (text), widget (QCheckBox, ui_snapToGrid)
-#: rc.cpp:711
-msgid "Snap &to grid"
-msgstr "Snapio &i'r grid"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:168
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, ui_snapComponentSizeToGrid)
-#: rc.cpp:714
-msgid ""
-"Snap the size of the components to be a multiple of the grid spacing.\n"
-"If 'Snap to Grid' is enabled a component will always be aligned with the "
-"grid on all 4 sides."
-msgstr ""
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:171
-#. i18n: ectx: property (text), widget (QCheckBox, ui_snapComponentSizeToGrid)
-#: rc.cpp:718
-msgid "Snap component size"
-msgstr ""
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:197
-#. i18n: ectx: property (text), widget (QLabel, ui_labelGridSpacing)
-#: rc.cpp:721
-msgid "Grid spacing:  "
-msgstr ""
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:207
-#. i18n: ectx: property (text), widget (QLabel, ui_labelX)
-#: rc.cpp:724
-msgid "X"
-msgstr "X"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:243
-#. i18n: ectx: property (text), widget (QLabel, ui_labelY)
-#: rc.cpp:727
-msgid "Y"
-msgstr "Y"
-
-#. i18n: file: dialogs/diagrampropertiespage.ui:282
-#. i18n: ectx: property (text), widget (QLabel, ui_labeLineWidth)
-#: rc.cpp:730
-msgid "Line width:  "
-msgstr "Lled y llinell:  "
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:14
-#. i18n: ectx: property (windowTitle), widget (QWidget, ExportAllViewsDialogBase)
-#: rc.cpp:736
-msgid "Export All Views"
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:25
-#. i18n: ectx: property (toolTip), widget (QLabel, kURLRequesterLabel)
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:41
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_kURL)
-#: rc.cpp:739 rc.cpp:745
-msgid "The base directory used to save the images"
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:28
-#. i18n: ectx: property (text), widget (QLabel, kURLRequesterLabel)
-#: rc.cpp:742
-msgid "&Directory to save the diagrams in:"
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:55
-#. i18n: ectx: property (text), widget (QLabel, ui_imageTypeLabel)
-#: rc.cpp:751
-msgid "&Image type:"
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:71
-#. i18n: ectx: property (toolTip), widget (QCheckBox, m_useFolders)
-#: rc.cpp:754
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:75
-#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_useFolders)
-#: rc.cpp:758
-msgid ""
-"The views are stored in folders in the document. The same tree structure "
-"used in the document to store the views can be created in the selected base "
-"directory with this option.\n"
-"Only the folders made by the user are created in the base directory (Logical "
-"view, use case view and so on are not created)."
-msgstr ""
-
-#. i18n: file: dialogs/exportallviewsdialogbase.ui:78
-#. i18n: ectx: property (text), widget (QCheckBox, m_useFolders)
-#: rc.cpp:762
-msgid "Use &folders"
-msgstr ""
-
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:67
-#. i18n: ectx: property (title), widget (KButtonGroup, ui_visibilityButtonGroup)
-#: rc.cpp:774
-msgid "Role Visibility"
-msgstr ""
-
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:97
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pImplementationRB)
-#: rc.cpp:786
-msgid "Implementation"
+#. i18n: file: codegenwizard/codegenstatuspage.ui:120
+#. i18n: ectx: property (text), widget (QPushButton, ui_pushButtonGenerate)
+#: rc.cpp:229
+msgid "Generate"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:107
-#. i18n: ectx: property (title), widget (KButtonGroup, ui_changeabilityButtonGroup)
-#: rc.cpp:789
-msgid "Role Changeability"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:42
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:42
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
+#: rc.cpp:232 rc.cpp:1012
+msgid "Project Generation"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:113
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pChangeableRB)
-#: rc.cpp:792
-msgid "Changeable"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:60
+#. i18n: ectx: property (text), widget (QCheckBox, m_makeANTDocumentCheckBox)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:60
+#. i18n: ectx: property (text), widget (QCheckBox, m_makeANTDocumentCheckBox)
+#: rc.cpp:235 rc.cpp:1015
+msgid "Create ANT build document"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:123
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pFrozenRB)
-#: rc.cpp:795
-msgid "Frozen"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:76
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:76
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
+#: rc.cpp:238 rc.cpp:1018
+msgid "Auto-Generate Methods"
 msgstr ""
 
-#. i18n: file: dialogs/umlrolepropertiesbase.ui:130
-#. i18n: ectx: property (text), widget (QRadioButton, ui_pAddOnlyRB)
-#: rc.cpp:798
-msgid "Add only"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:108
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateConstructors)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:99
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateConstructors)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:108
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateConstructors)
+#: rc.cpp:241 rc.cpp:973 rc.cpp:1021
+msgid "Empty constructor methods"
 msgstr ""
 
-#. i18n: file: dialogs/codevieweroptionsbase.ui:32
-#. i18n: ectx: property (title), widget (Q3GroupBox, colorGroupBox)
-#: rc.cpp:804
-msgid "Colors"
-msgstr "Lliwiau"
-
-#. i18n: file: dialogs/codevieweroptionsbase.ui:46
-#. i18n: ectx: property (text), widget (QLabel, fontLabel)
-#: rc.cpp:807
-msgid "Font:"
-msgstr "Wynebfath:"
-
-#. i18n: file: dialogs/codevieweroptionsbase.ui:76
-#. i18n: ectx: property (text), widget (QLabel, paperLabel)
-#: rc.cpp:810
-msgid "Paper:"
-msgstr "Papur :"
-
-#. i18n: file: dialogs/codevieweroptionsbase.ui:106
-#. i18n: ectx: property (text), widget (QLabel, selectedLabel)
-#: rc.cpp:813
-msgid "Selected:"
-msgstr "Wedi'u dewis:"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateAssocAccessors)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:109
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateAssocAccessors)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:118
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateAssocAccessors)
+#: rc.cpp:244 rc.cpp:976 rc.cpp:1024
+msgid "Association accessor methods"
+msgstr ""
 
-#. i18n: file: dialogs/codevieweroptionsbase.ui:208
-#. i18n: ectx: property (text), widget (QLabel, textLabel1)
-#: rc.cpp:816
-msgid "<p align=\"right\">UML object block:</p>"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:128
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateAttribAccessors)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:119
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateAttribAccessors)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:128
+#. i18n: ectx: property (text), widget (QCheckBox, m_generateAttribAccessors)
+#: rc.cpp:247 rc.cpp:979 rc.cpp:1027
+msgid "Attribute accessor methods"
 msgstr ""
 
-#. i18n: file: dialogs/codevieweroptionsbase.ui:224
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
-#: rc.cpp:819
-msgid "<p align=\"right\">Hidden block:</p>"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:154
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:133
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelAccessorScope)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:154
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
+#: rc.cpp:250 rc.cpp:982 rc.cpp:1030
+msgid "Default attribute accessor scope:"
 msgstr ""
 
-#. i18n: file: dialogs/codevieweroptionsbase.ui:242
-#. i18n: ectx: property (text), widget (QLabel, textLabel2)
-#: rc.cpp:822
-msgid "<p align=\"right\">Uneditable text:</p>"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:183
+#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:162
+#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:183
+#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
+#: rc.cpp:262 rc.cpp:994 rc.cpp:1042
+msgid "From Parent Object"
 msgstr ""
 
-#. i18n: file: dialogs/codevieweroptionsbase.ui:278
-#. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:825
-msgid "<p align=\"right\">Editable text:</p>"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:207
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:174
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelAssocFieldScope)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:207
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelAssFieldScope)
+#: rc.cpp:265 rc.cpp:997 rc.cpp:1045
+msgid "Default association field scope:"
 msgstr ""
 
-#. i18n: file: dialogs/importprojectdlgbase.ui:23
-#. i18n: ectx: property (toolTip), widget (QLabel, kURLRequesterLabel)
-#. i18n: file: dialogs/importprojectdlgbase.ui:39
-#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_kURL)
-#: rc.cpp:828 rc.cpp:834
-msgid "The base directory that contains the project"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:236
+#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:203
+#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:236
+#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
+#: rc.cpp:277 rc.cpp:1009 rc.cpp:1057
+msgid "From Parent Role"
 msgstr ""
 
-#. i18n: file: dialogs/importprojectdlgbase.ui:26
-#. i18n: ectx: property (text), widget (QLabel, kURLRequesterLabel)
-#: rc.cpp:831
-msgid "&Directory of the project:"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:279
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
+#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:581
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:58
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:279
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
+#: rc.cpp:283 rc.cpp:946 rc.cpp:961 rc.cpp:1063
+msgid "Style:"
+msgstr "Arddull:"
+
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:290
+#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
+#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:592
+#. i18n: ectx: property (text), item, widget (KComboBox, ui_selectCommentStyle)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:290
+#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
+#: rc.cpp:286 rc.cpp:949 rc.cpp:1066
+msgid "Slash-Slash (//)"
 msgstr ""
 
-#. i18n: file: dialogs/importprojectdlgbase.ui:50
-#. i18n: ectx: property (toolTip), widget (QLabel, languageLabel)
-#: rc.cpp:837
-msgid "The language of the project"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:295
+#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
+#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:597
+#. i18n: ectx: property (text), item, widget (KComboBox, ui_selectCommentStyle)
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:295
+#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
+#: rc.cpp:289 rc.cpp:952 rc.cpp:1069
+msgid "Slash-Star (/**  */)"
 msgstr ""
 
-#. i18n: file: dialogs/importprojectdlgbase.ui:53
-#. i18n: ectx: property (text), widget (QLabel, languageLabel)
-#: rc.cpp:840
-msgid "Language:"
+#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:318
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
+#: rc.cpp:292
+msgid "<p align=\"center\">D Code Generation</p>"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:31
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
-#: rc.cpp:843
+#: rc.cpp:295
 msgid "<p align=\"center\">C++ Code Generation</p>"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:61
 #. i18n: ectx: attribute (title), widget (QWidget, ui_tabMethodBodyGeneration)
-#: rc.cpp:849
+#: rc.cpp:301
 msgid "Method Body Generation"
 msgstr ""
 
@@ -4789,11 +4777,11 @@
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_listClassHCombo)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:146
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_listClassHCombo)
-#: rc.cpp:852 rc.cpp:858 rc.cpp:864 rc.cpp:870 rc.cpp:876 rc.cpp:882
-#: rc.cpp:888 rc.cpp:894 rc.cpp:900 rc.cpp:906 rc.cpp:912 rc.cpp:918
-#: rc.cpp:924 rc.cpp:930 rc.cpp:936 rc.cpp:942 rc.cpp:948 rc.cpp:954
-#: rc.cpp:960 rc.cpp:966 rc.cpp:972 rc.cpp:978 rc.cpp:984 rc.cpp:990
-#: rc.cpp:996
+#: rc.cpp:304 rc.cpp:310 rc.cpp:316 rc.cpp:322 rc.cpp:328 rc.cpp:334
+#: rc.cpp:340 rc.cpp:346 rc.cpp:352 rc.cpp:358 rc.cpp:364 rc.cpp:370
+#: rc.cpp:376 rc.cpp:382 rc.cpp:388 rc.cpp:394 rc.cpp:400 rc.cpp:406
+#: rc.cpp:412 rc.cpp:418 rc.cpp:424 rc.cpp:430 rc.cpp:436 rc.cpp:442
+#: rc.cpp:448
 msgid "QPtrList"
 msgstr ""
 
@@ -4901,21 +4889,21 @@
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_listIncludeFileHistoryCombo)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:408
 #. i18n: ectx: property (text), item, widget (KHistoryComboBox, ui_listIncludeFileHistoryCombo)
-#: rc.cpp:855 rc.cpp:861 rc.cpp:867 rc.cpp:873 rc.cpp:879 rc.cpp:885
-#: rc.cpp:891 rc.cpp:897 rc.cpp:903 rc.cpp:909 rc.cpp:915 rc.cpp:921
-#: rc.cpp:927 rc.cpp:933 rc.cpp:939 rc.cpp:945 rc.cpp:951 rc.cpp:957
-#: rc.cpp:963 rc.cpp:969 rc.cpp:975 rc.cpp:981 rc.cpp:987 rc.cpp:993
-#: rc.cpp:999 rc.cpp:1002 rc.cpp:1173 rc.cpp:1179 rc.cpp:1185 rc.cpp:1191
-#: rc.cpp:1197 rc.cpp:1203 rc.cpp:1209 rc.cpp:1215 rc.cpp:1221 rc.cpp:1227
-#: rc.cpp:1233 rc.cpp:1239 rc.cpp:1245 rc.cpp:1251 rc.cpp:1257 rc.cpp:1263
-#: rc.cpp:1269 rc.cpp:1275 rc.cpp:1281 rc.cpp:1287 rc.cpp:1293 rc.cpp:1299
-#: rc.cpp:1305 rc.cpp:1311 rc.cpp:1317 rc.cpp:1320
+#: rc.cpp:307 rc.cpp:313 rc.cpp:319 rc.cpp:325 rc.cpp:331 rc.cpp:337
+#: rc.cpp:343 rc.cpp:349 rc.cpp:355 rc.cpp:361 rc.cpp:367 rc.cpp:373
+#: rc.cpp:379 rc.cpp:385 rc.cpp:391 rc.cpp:397 rc.cpp:403 rc.cpp:409
+#: rc.cpp:415 rc.cpp:421 rc.cpp:427 rc.cpp:433 rc.cpp:439 rc.cpp:445
+#: rc.cpp:451 rc.cpp:454 rc.cpp:625 rc.cpp:631 rc.cpp:637 rc.cpp:643
+#: rc.cpp:649 rc.cpp:655 rc.cpp:661 rc.cpp:667 rc.cpp:673 rc.cpp:679
+#: rc.cpp:685 rc.cpp:691 rc.cpp:697 rc.cpp:703 rc.cpp:709 rc.cpp:715
+#: rc.cpp:721 rc.cpp:727 rc.cpp:733 rc.cpp:739 rc.cpp:745 rc.cpp:751
+#: rc.cpp:757 rc.cpp:763 rc.cpp:769 rc.cpp:772
 msgid "vector"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:163
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelVariable)
-#: rc.cpp:1005
+#: rc.cpp:457
 msgid "<b>Variable</b>"
 msgstr "<b>Newidyn</b>"
 
@@ -4923,7 +4911,7 @@
 #. i18n: ectx: property (text), widget (QPushButton, ui_browseStringButton)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:530
 #. i18n: ectx: property (text), widget (QPushButton, ui_browseListButton)
-#: rc.cpp:1008 rc.cpp:1482
+#: rc.cpp:460 rc.cpp:934
 msgid "..."
 msgstr "..."
 
@@ -4977,11 +4965,11 @@
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_stringClassHCombo)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:263
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_stringClassHCombo)
-#: rc.cpp:1011 rc.cpp:1017 rc.cpp:1023 rc.cpp:1029 rc.cpp:1035 rc.cpp:1041
-#: rc.cpp:1047 rc.cpp:1053 rc.cpp:1059 rc.cpp:1065 rc.cpp:1071 rc.cpp:1077
-#: rc.cpp:1083 rc.cpp:1089 rc.cpp:1095 rc.cpp:1101 rc.cpp:1107 rc.cpp:1113
-#: rc.cpp:1119 rc.cpp:1125 rc.cpp:1131 rc.cpp:1137 rc.cpp:1143 rc.cpp:1149
-#: rc.cpp:1155
+#: rc.cpp:463 rc.cpp:469 rc.cpp:475 rc.cpp:481 rc.cpp:487 rc.cpp:493
+#: rc.cpp:499 rc.cpp:505 rc.cpp:511 rc.cpp:517 rc.cpp:523 rc.cpp:529
+#: rc.cpp:535 rc.cpp:541 rc.cpp:547 rc.cpp:553 rc.cpp:559 rc.cpp:565
+#: rc.cpp:571 rc.cpp:577 rc.cpp:583 rc.cpp:589 rc.cpp:595 rc.cpp:601
+#: rc.cpp:607
 msgid "QString"
 msgstr ""
 
@@ -5089,27 +5077,27 @@
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_stringIncludeFileHistoryCombo)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:490
 #. i18n: ectx: property (text), item, widget (KHistoryComboBox, ui_stringIncludeFileHistoryCombo)
-#: rc.cpp:1014 rc.cpp:1020 rc.cpp:1026 rc.cpp:1032 rc.cpp:1038 rc.cpp:1044
-#: rc.cpp:1050 rc.cpp:1056 rc.cpp:1062 rc.cpp:1068 rc.cpp:1074 rc.cpp:1080
-#: rc.cpp:1086 rc.cpp:1092 rc.cpp:1098 rc.cpp:1104 rc.cpp:1110 rc.cpp:1116
-#: rc.cpp:1122 rc.cpp:1128 rc.cpp:1134 rc.cpp:1140 rc.cpp:1146 rc.cpp:1152
-#: rc.cpp:1158 rc.cpp:1161 rc.cpp:1329 rc.cpp:1335 rc.cpp:1341 rc.cpp:1347
-#: rc.cpp:1353 rc.cpp:1359 rc.cpp:1365 rc.cpp:1371 rc.cpp:1377 rc.cpp:1383
-#: rc.cpp:1389 rc.cpp:1395 rc.cpp:1401 rc.cpp:1407 rc.cpp:1413 rc.cpp:1419
-#: rc.cpp:1425 rc.cpp:1431 rc.cpp:1437 rc.cpp:1443 rc.cpp:1449 rc.cpp:1455
-#: rc.cpp:1461 rc.cpp:1467 rc.cpp:1473 rc.cpp:1476
+#: rc.cpp:466 rc.cpp:472 rc.cpp:478 rc.cpp:484 rc.cpp:490 rc.cpp:496
+#: rc.cpp:502 rc.cpp:508 rc.cpp:514 rc.cpp:520 rc.cpp:526 rc.cpp:532
+#: rc.cpp:538 rc.cpp:544 rc.cpp:550 rc.cpp:556 rc.cpp:562 rc.cpp:568
+#: rc.cpp:574 rc.cpp:580 rc.cpp:586 rc.cpp:592 rc.cpp:598 rc.cpp:604
+#: rc.cpp:610 rc.cpp:613 rc.cpp:781 rc.cpp:787 rc.cpp:793 rc.cpp:799
+#: rc.cpp:805 rc.cpp:811 rc.cpp:817 rc.cpp:823 rc.cpp:829 rc.cpp:835
+#: rc.cpp:841 rc.cpp:847 rc.cpp:853 rc.cpp:859 rc.cpp:865 rc.cpp:871
+#: rc.cpp:877 rc.cpp:883 rc.cpp:889 rc.cpp:895 rc.cpp:901 rc.cpp:907
+#: rc.cpp:913 rc.cpp:919 rc.cpp:925 rc.cpp:928
 msgid "string"
 msgstr "llinell"
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:318
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelStringClass)
-#: rc.cpp:1164
+#: rc.cpp:616
 msgid "<p align=\"center\">String</p>"
 msgstr "<p align=\\\"center\\\">Llinell</p>"
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:334
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelListClass)
-#: rc.cpp:1167
+#: rc.cpp:619
 msgid "<p align=\"center\">List</p>"
 msgstr "<p align=\\\"center\\\">Rhestr</p>"
 
@@ -5163,17 +5151,17 @@
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_listIncludeFileHistoryCombo)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:399
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_listIncludeFileHistoryCombo)
-#: rc.cpp:1170 rc.cpp:1176 rc.cpp:1182 rc.cpp:1188 rc.cpp:1194 rc.cpp:1200
-#: rc.cpp:1206 rc.cpp:1212 rc.cpp:1218 rc.cpp:1224 rc.cpp:1230 rc.cpp:1236
-#: rc.cpp:1242 rc.cpp:1248 rc.cpp:1254 rc.cpp:1260 rc.cpp:1266 rc.cpp:1272
-#: rc.cpp:1278 rc.cpp:1284 rc.cpp:1290 rc.cpp:1296 rc.cpp:1302 rc.cpp:1308
-#: rc.cpp:1314
+#: rc.cpp:622 rc.cpp:628 rc.cpp:634 rc.cpp:640 rc.cpp:646 rc.cpp:652
+#: rc.cpp:658 rc.cpp:664 rc.cpp:670 rc.cpp:676 rc.cpp:682 rc.cpp:688
+#: rc.cpp:694 rc.cpp:700 rc.cpp:706 rc.cpp:712 rc.cpp:718 rc.cpp:724
+#: rc.cpp:730 rc.cpp:736 rc.cpp:742 rc.cpp:748 rc.cpp:754 rc.cpp:760
+#: rc.cpp:766
 msgid "qptrlist.h"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:416
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelGlobal)
-#: rc.cpp:1323
+#: rc.cpp:775
 msgid "<i>global?</i>"
 msgstr ""
 
@@ -5227,1116 +5215,1189 @@
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_stringIncludeFileHistoryCombo)
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:481
 #. i18n: ectx: property (historyItems), widget (KHistoryComboBox, ui_stringIncludeFileHistoryCombo)
-#: rc.cpp:1326 rc.cpp:1332 rc.cpp:1338 rc.cpp:1344 rc.cpp:1350 rc.cpp:1356
-#: rc.cpp:1362 rc.cpp:1368 rc.cpp:1374 rc.cpp:1380 rc.cpp:1386 rc.cpp:1392
-#: rc.cpp:1398 rc.cpp:1404 rc.cpp:1410 rc.cpp:1416 rc.cpp:1422 rc.cpp:1428
-#: rc.cpp:1434 rc.cpp:1440 rc.cpp:1446 rc.cpp:1452 rc.cpp:1458 rc.cpp:1464
-#: rc.cpp:1470
+#: rc.cpp:778 rc.cpp:784 rc.cpp:790 rc.cpp:796 rc.cpp:802 rc.cpp:808
+#: rc.cpp:814 rc.cpp:820 rc.cpp:826 rc.cpp:832 rc.cpp:838 rc.cpp:844
+#: rc.cpp:850 rc.cpp:856 rc.cpp:862 rc.cpp:868 rc.cpp:874 rc.cpp:880
+#: rc.cpp:886 rc.cpp:892 rc.cpp:898 rc.cpp:904 rc.cpp:910 rc.cpp:916
+#: rc.cpp:922
 msgid "qstring.h"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:508
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelClassName)
-#: rc.cpp:1479
+#: rc.cpp:931
 msgid "Class name"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:537
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelIncludeFile)
-#: rc.cpp:1485
+#: rc.cpp:937
 msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
 #. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:549
 #. i18n: ectx: property (text), widget (QLabel, ui_textLabelHelpMethodBodyGen)
-#: rc.cpp:1488
+#: rc.cpp:940
 msgid "Use following for classes in generated code:"
 msgstr ""
 
-#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:581
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:58
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:279
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:279
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelStyle)
-#: rc.cpp:1494 rc.cpp:1509 rc.cpp:1611 rc.cpp:1674
-msgid "Style:"
-msgstr "Arddull:"
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:30
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
+#: rc.cpp:955
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr ""
 
-#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:592
-#. i18n: ectx: property (text), item, widget (KComboBox, ui_selectCommentStyle)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:290
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:69
 #. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:290
+#: rc.cpp:964
+msgid "Hash (#)"
+msgstr ""
+
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:74
 #. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
-#: rc.cpp:1497 rc.cpp:1614 rc.cpp:1677
-msgid "Slash-Slash (//)"
+#: rc.cpp:967
+msgid "Begin-End (=begin  =end)"
+msgstr ""
+
+#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:91
+#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxAutoGeneratedMethods)
+#: rc.cpp:970
+msgid "Auto-Generated Methods"
+msgstr ""
+
+#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:318
+#. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
+#: rc.cpp:1072
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr ""
+
+#. i18n: file: dialogs/codeimportoptionspage.ui:17
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: rc.cpp:1075
+msgid "C++- Import"
+msgstr ""
+
+#. i18n: file: dialogs/codeimportoptionspage.ui:29
+#. i18n: ectx: property (text), widget (QCheckBox, createArtifactCheckBox)
+#: rc.cpp:1078
+msgid "  for each imported file create an artifact in the component view "
+msgstr ""
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:16
+#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxDiagramProperties)
+#: rc.cpp:1081
+msgid "Diagram Properties"
+msgstr ""
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:39
+#. i18n: ectx: property (text), widget (QLabel, ui_labelDiagramName)
+#: rc.cpp:1084
+msgid "Name:"
+msgstr "Enw:"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:82
+#. i18n: ectx: property (text), widget (QLabel, ui_labelZoom)
+#: rc.cpp:1087
+msgid "Zoom:"
+msgstr "Chwyddo:"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:108
+#. i18n: ectx: property (text), widget (QLabel, ui_labelZoomUnit)
+#: rc.cpp:1091
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:153
+#. i18n: ectx: property (text), widget (QCheckBox, ui_checkBoxShowGrid)
+#: rc.cpp:1097
+msgid "Show &grid"
+msgstr "Dangos &grid"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:160
+#. i18n: ectx: property (text), widget (QCheckBox, ui_snapToGrid)
+#: rc.cpp:1100
+msgid "Snap &to grid"
+msgstr "Snapio &i'r grid"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:168
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, ui_snapComponentSizeToGrid)
+#: rc.cpp:1103
+msgid ""
+"Snap the size of the components to be a multiple of the grid spacing.\n"
+"If 'Snap to Grid' is enabled a component will always be aligned with the "
+"grid on all 4 sides."
+msgstr ""
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:171
+#. i18n: ectx: property (text), widget (QCheckBox, ui_snapComponentSizeToGrid)
+#: rc.cpp:1107
+msgid "Snap component size"
+msgstr ""
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:197
+#. i18n: ectx: property (text), widget (QLabel, ui_labelGridSpacing)
+#: rc.cpp:1110
+msgid "Grid spacing:  "
+msgstr ""
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:207
+#. i18n: ectx: property (text), widget (QLabel, ui_labelX)
+#: rc.cpp:1113
+msgid "X"
+msgstr "X"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:243
+#. i18n: ectx: property (text), widget (QLabel, ui_labelY)
+#: rc.cpp:1116
+msgid "Y"
+msgstr "Y"
+
+#. i18n: file: dialogs/diagrampropertiespage.ui:282
+#. i18n: ectx: property (text), widget (QLabel, ui_labeLineWidth)
+#: rc.cpp:1119
+msgid "Line width:  "
+msgstr "Lled y llinell:  "
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:32
+#. i18n: ectx: property (title), widget (QGroupBox, colorGroupBox)
+#: rc.cpp:1125
+msgid "Colors"
+msgstr "Lliwiau"
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:46
+#. i18n: ectx: property (text), widget (QLabel, fontLabel)
+#: rc.cpp:1128
+msgid "Font:"
+msgstr "Wynebfath:"
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:76
+#. i18n: ectx: property (text), widget (QLabel, paperLabel)
+#: rc.cpp:1131
+msgid "Paper:"
+msgstr "Papur :"
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:106
+#. i18n: ectx: property (text), widget (QLabel, selectedLabel)
+#: rc.cpp:1134
+msgid "Selected:"
+msgstr "Wedi'u dewis:"
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:208
+#. i18n: ectx: property (text), widget (QLabel, textLabel1)
+#: rc.cpp:1137
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr ""
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:224
+#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
+#: rc.cpp:1140
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr ""
+
+#. i18n: file: dialogs/codevieweroptionsbase.ui:242
+#. i18n: ectx: property (text), widget (QLabel, textLabel2)
+#: rc.cpp:1143
+msgid "<p align=\"right\">Uneditable text:</p>"
 msgstr ""
 
-#. i18n: file: codegenerators/cpp/cppcodegenerationformbase.ui:597
-#. i18n: ectx: property (text), item, widget (KComboBox, ui_selectCommentStyle)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:295
-#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:295
-#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
-#: rc.cpp:1500 rc.cpp:1617 rc.cpp:1680
-msgid "Slash-Star (/**  */)"
+#. i18n: file: dialogs/codevieweroptionsbase.ui:278
+#. i18n: ectx: property (text), widget (QLabel, textLabel3)
+#: rc.cpp:1146
+msgid "<p align=\"right\">Editable text:</p>"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:30
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
-#: rc.cpp:1503
-msgid "<p align=\"center\">Ruby Code Generation</p>"
+#. i18n: file: dialogs/codeviewerdialogbase.ui:20
+#. i18n: ectx: property (text), widget (QCheckBox, ui_showHiddenCodeCB)
+#: rc.cpp:1149
+msgid "Show hidden blocks"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:69
-#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
-#: rc.cpp:1512
-msgid "Hash (#)"
+#. i18n: file: dialogs/codeviewerdialogbase.ui:33
+#. i18n: ectx: property (text), widget (QLabel, ui_componentLabel)
+#: rc.cpp:1152
+msgid "<p align=\"center\">component name here</p>"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:74
-#. i18n: ectx: property (text), item, widget (KComboBox, m_SelectCommentStyle)
-#: rc.cpp:1515
-msgid "Begin-End (=begin  =end)"
+#. i18n: file: dialogs/codeviewerdialogbase.ui:46
+#. i18n: ectx: property (text), widget (QCheckBox, ui_highlightCheckBox)
+#: rc.cpp:1155
+msgid "Show block type"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:91
-#. i18n: ectx: property (title), widget (QGroupBox, ui_groupBoxAutoGeneratedMethods)
-#: rc.cpp:1518
-msgid "Auto-Generated Methods"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:67
+#. i18n: ectx: property (title), widget (KButtonGroup, ui_visibilityButtonGroup)
+#: rc.cpp:1167
+msgid "Role Visibility"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:99
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateConstructors)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:108
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateConstructors)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:108
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateConstructors)
-#: rc.cpp:1521 rc.cpp:1569 rc.cpp:1632
-msgid "Empty constructor methods"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:97
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pImplementationRB)
+#: rc.cpp:1179
+msgid "Implementation"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:109
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateAssocAccessors)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:118
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateAssocAccessors)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:118
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateAssocAccessors)
-#: rc.cpp:1524 rc.cpp:1572 rc.cpp:1635
-msgid "Association accessor methods"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:107
+#. i18n: ectx: property (title), widget (KButtonGroup, ui_changeabilityButtonGroup)
+#: rc.cpp:1182
+msgid "Role Changeability"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:119
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateAttribAccessors)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateAttribAccessors)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:128
-#. i18n: ectx: property (text), widget (QCheckBox, m_generateAttribAccessors)
-#: rc.cpp:1527 rc.cpp:1575 rc.cpp:1638
-msgid "Attribute accessor methods"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:113
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pChangeableRB)
+#: rc.cpp:1185
+msgid "Changeable"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:133
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelAccessorScope)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:154
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:154
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3)
-#: rc.cpp:1530 rc.cpp:1578 rc.cpp:1641
-msgid "Default attribute accessor scope:"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:123
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pFrozenRB)
+#: rc.cpp:1188
+msgid "Frozen"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:162
-#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:183
-#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:183
-#. i18n: ectx: property (text), item, widget (KComboBox, m_accessorScopeCB)
-#: rc.cpp:1542 rc.cpp:1590 rc.cpp:1653
-msgid "From Parent Object"
+#. i18n: file: dialogs/umlrolepropertiesbase.ui:130
+#. i18n: ectx: property (text), widget (QRadioButton, ui_pAddOnlyRB)
+#: rc.cpp:1191
+msgid "Add only"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:174
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelAssocFieldScope)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:207
-#. i18n: ectx: property (text), widget (QLabel, textLabel1_3_2)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:207
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelAssFieldScope)
-#: rc.cpp:1545 rc.cpp:1593 rc.cpp:1656
-msgid "Default association field scope:"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:14
+#. i18n: ectx: property (windowTitle), widget (QWidget, ExportAllViewsDialogBase)
+#: rc.cpp:1197
+msgid "Export All Views"
 msgstr ""
 
-#. i18n: file: codegenerators/ruby/rubycodegenerationformbase.ui:203
-#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:236
-#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:236
-#. i18n: ectx: property (text), item, widget (KComboBox, m_assocFieldScopeCB)
-#: rc.cpp:1557 rc.cpp:1605 rc.cpp:1668
-msgid "From Parent Role"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:25
+#. i18n: ectx: property (toolTip), widget (QLabel, kURLRequesterLabel)
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:41
+#. i18n: ectx: property (toolTip), widget (KUrlRequester, m_kURL)
+#: rc.cpp:1200 rc.cpp:1206
+msgid "The base directory used to save the images"
 msgstr ""
 
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:42
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:42
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox3)
-#: rc.cpp:1560 rc.cpp:1623
-msgid "Project Generation"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:28
+#. i18n: ectx: property (text), widget (QLabel, kURLRequesterLabel)
+#: rc.cpp:1203
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:60
-#. i18n: ectx: property (text), widget (QCheckBox, m_makeANTDocumentCheckBox)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:60
-#. i18n: ectx: property (text), widget (QCheckBox, m_makeANTDocumentCheckBox)
-#: rc.cpp:1563 rc.cpp:1626
-msgid "Create ANT build document"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:55
+#. i18n: ectx: property (text), widget (QLabel, ui_imageTypeLabel)
+#: rc.cpp:1212
+msgid "&Image type:"
 msgstr ""
 
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:76
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:76
-#. i18n: ectx: property (title), widget (QGroupBox, groupBox2)
-#: rc.cpp:1566 rc.cpp:1629
-msgid "Auto-Generate Methods"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:68
+#. i18n: ectx: property (toolTip), widget (QCheckBox, m_useFolders)
+#: rc.cpp:1215
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#. i18n: file: codegenerators/d/dcodegenerationformbase.ui:318
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
-#: rc.cpp:1620
-msgid "<p align=\"center\">D Code Generation</p>"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:72
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, m_useFolders)
+#: rc.cpp:1219
+msgid ""
+"The views are stored in folders in the document. The same tree structure "
+"used in the document to store the views can be created in the selected base "
+"directory with this option.\n"
+"Only the folders made by the user are created in the base directory (Logical "
+"view, use case view and so on are not created)."
 msgstr ""
 
-#. i18n: file: codegenerators/java/javacodegenerationformbase.ui:318
-#. i18n: ectx: property (text), widget (QLabel, ui_textLabelTitle)
-#: rc.cpp:1683
-msgid "<p align=\"center\">Java Code Generation</p>"
+#. i18n: file: dialogs/exportallviewsdialogbase.ui:75
+#. i18n: ectx: property (text), widget (QCheckBox, m_useFolders)
+#: rc.cpp:1223
+msgid "Use &folders"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:13
 #. i18n: ectx: label, entry (Geometry), group (General Options)
 #. i18n: file: umbrello.kcfg:14
 #. i18n: ectx: whatsthis, entry (Geometry), group (General Options)
-#. i18n: file: umbrello.kcfg:13
-#. i18n: ectx: label, entry (Geometry), group (General Options)
-#. i18n: file: umbrello.kcfg:14
-#. i18n: ectx: whatsthis, entry (Geometry), group (General Options)
-#: rc.cpp:3 rc.cpp:6 rc.cpp:1686 rc.cpp:1689
+#: rc.cpp:1226 rc.cpp:1229
 msgid "Geometry"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:18
 #. i18n: ectx: label, entry (imageMimeType), group (General Options)
-#: rc.cpp:9 rc.cpp:1692
+#: rc.cpp:1232
 msgid "Image Mime Type"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:19
 #. i18n: ectx: whatsthis, entry (imageMimeType), group (General Options)
-#: rc.cpp:12 rc.cpp:1695
+#: rc.cpp:1235
 msgid "The Mime Type of the Images"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:23
 #. i18n: ectx: label, entry (undo), group (General Options)
-#: rc.cpp:15 rc.cpp:1698
+#: rc.cpp:1238
 msgid "Undo Support"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:24
 #. i18n: ectx: whatsthis, entry (undo), group (General Options)
-#: rc.cpp:18 rc.cpp:1701
+#: rc.cpp:1241
 msgid "Undo Support is enabled when this is true"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:28
 #. i18n: ectx: label, entry (tabdiagrams), group (General Options)
-#: rc.cpp:21 rc.cpp:1704
+#: rc.cpp:1244
 msgid "Tabbed Diagrams"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:29
 #. i18n: ectx: whatsthis, entry (tabdiagrams), group (General Options)
-#: rc.cpp:24 rc.cpp:1707
+#: rc.cpp:1247
 msgid "Enables/Disables Tabbed View of Diagrams in the view area"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:33
 #. i18n: ectx: label, entry (newcodegen), group (General Options)
-#: rc.cpp:27 rc.cpp:1710
+#: rc.cpp:1250
 msgid "New Code Generator"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:34
 #. i18n: ectx: whatsthis, entry (newcodegen), group (General Options)
-#: rc.cpp:30 rc.cpp:1713
+#: rc.cpp:1253
 msgid "Enables/Disables Support for the New Code Generator"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:38
 #. i18n: ectx: label, entry (angularlines), group (General Options)
-#: rc.cpp:33 rc.cpp:1716
+#: rc.cpp:1256
 msgid "Angular Lines"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:39
 #. i18n: ectx: whatsthis, entry (angularlines), group (General Options)
-#: rc.cpp:36 rc.cpp:1719
+#: rc.cpp:1259
 msgid "Enables/Disables Support for Angular Lines in diagrams"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:43
 #. i18n: ectx: label, entry (footerPrinting), group (General Options)
-#: rc.cpp:39 rc.cpp:1722
+#: rc.cpp:1262
 msgid "Footer Printing"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:44
 #. i18n: ectx: whatsthis, entry (footerPrinting), group (General Options)
-#: rc.cpp:42 rc.cpp:1725
+#: rc.cpp:1265
 msgid "Enables/Disables Support for footer printing"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:48
 #. i18n: ectx: label, entry (autosave), group (General Options)
-#: rc.cpp:45 rc.cpp:1728
+#: rc.cpp:1268
 msgid "Auto Save"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:49
 #. i18n: ectx: whatsthis, entry (autosave), group (General Options)
-#: rc.cpp:48 rc.cpp:1731
+#: rc.cpp:1271
 msgid "Enables/Disables Auto Saving at Regular Intervals"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:53
 #. i18n: ectx: label, entry (time), group (General Options)
-#: rc.cpp:51 rc.cpp:1734
+#: rc.cpp:1274
 msgid "Auto Save Time ( Old )"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:54
 #. i18n: ectx: whatsthis, entry (time), group (General Options)
-#: rc.cpp:54 rc.cpp:1737
+#: rc.cpp:1277
 msgid "Auto Save Time Interval ( Old )"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:67
 #. i18n: ectx: label, entry (autosavesuffix), group (General Options)
-#: rc.cpp:59 rc.cpp:1742
+#: rc.cpp:1280
 msgid "Auto Save Suffix"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:68
 #. i18n: ectx: whatsthis, entry (autosavesuffix), group (General Options)
-#: rc.cpp:62 rc.cpp:1745
+#: rc.cpp:1283
 msgid "The Suffix for the auto save file"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:72
 #. i18n: ectx: label, entry (loadlast), group (General Options)
-#: rc.cpp:65 rc.cpp:1748
+#: rc.cpp:1286
 msgid "Load Last"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:73
 #. i18n: ectx: whatsthis, entry (loadlast), group (General Options)
-#: rc.cpp:68 rc.cpp:1751
+#: rc.cpp:1289
 msgid "Enables/Disables Loading of the last open file"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:77
 #. i18n: ectx: label, entry (diagram), group (General Options)
-#: rc.cpp:71 rc.cpp:1754
+#: rc.cpp:1292
 msgid "Diagram To Load at Startup"
 msgstr ""
 
 #. i18n: file: umbrello.kcfg:78
 #. i18n: ectx: whatsthis, entry (diagram), group (General Options)
-#: rc.cpp:74 rc.cpp:1757
+#: rc.cpp:1295
 msgid "The Diagram to load at startup"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:83
+#. i18n: file: umbrello.kcfg:95
 #. i18n: ectx: label, entry (defaultLanguage), group (General Options)
-#: rc.cpp:77 rc.cpp:1760
+#: rc.cpp:1298
 msgid "Default Language at Startup"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:84
+#. i18n: file: umbrello.kcfg:96
 #. i18n: ectx: whatsthis, entry (defaultLanguage), group (General Options)
-#: rc.cpp:80 rc.cpp:1763
+#: rc.cpp:1301
 msgid "The Language that Umbrello should start with by default"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:97
+#. i18n: file: umbrello.kcfg:131
 #. i18n: ectx: whatsthis, entry (useFillColor), group (UI Options)
-#: rc.cpp:88 rc.cpp:1771
+#: rc.cpp:1307
 msgid "Enables/Disables usage of fill color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:101
+#. i18n: file: umbrello.kcfg:135
 #. i18n: ectx: label, entry (fillColor), group (UI Options)
-#: rc.cpp:91 rc.cpp:1774
+#: rc.cpp:1310
 msgid "Fill Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:102
+#. i18n: file: umbrello.kcfg:136
 #. i18n: ectx: whatsthis, entry (fillColor), group (UI Options)
-#: rc.cpp:94 rc.cpp:1777
+#: rc.cpp:1313
 msgid "The Fill Color to be used"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:106
+#. i18n: file: umbrello.kcfg:140
 #. i18n: ectx: label, entry (lineColor), group (UI Options)
-#: rc.cpp:97 rc.cpp:1780
+#: rc.cpp:1316
 msgid "Line Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:107
+#. i18n: file: umbrello.kcfg:141
 #. i18n: ectx: whatsthis, entry (lineColor), group (UI Options)
-#: rc.cpp:100 rc.cpp:1783
+#: rc.cpp:1319
 msgid "The Color of the Lines"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:111
+#. i18n: file: umbrello.kcfg:145
 #. i18n: ectx: label, entry (lineWidth), group (UI Options)
-#: rc.cpp:103 rc.cpp:1786
+#: rc.cpp:1322
 msgid "Line Width"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:112
+#. i18n: file: umbrello.kcfg:146
 #. i18n: ectx: whatsthis, entry (lineWidth), group (UI Options)
-#: rc.cpp:106 rc.cpp:1789
+#: rc.cpp:1325
 msgid "The Width of the Line"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:116
+#. i18n: file: umbrello.kcfg:150
 #. i18n: ectx: label, entry (textColor), group (UI Options)
-#: rc.cpp:109 rc.cpp:1792
+#: rc.cpp:1328
 msgid "Text Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:117
+#. i18n: file: umbrello.kcfg:151
 #. i18n: ectx: whatsthis, entry (textColor), group (UI Options)
-#: rc.cpp:112 rc.cpp:1795
+#: rc.cpp:1331
 msgid "The Color of the Text"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:121
+#. i18n: file: umbrello.kcfg:155
 #. i18n: ectx: label, entry (showDocWindow), group (UI Options)
-#: rc.cpp:115 rc.cpp:1798
+#: rc.cpp:1334
 msgid "Show Doc Window"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:122
+#. i18n: file: umbrello.kcfg:156
 #. i18n: ectx: whatsthis, entry (showDocWindow), group (UI Options)
-#: rc.cpp:118 rc.cpp:1801
+#: rc.cpp:1337
 msgid "Enables/Disables showing of the doc window"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:127
+#. i18n: file: umbrello.kcfg:161
 #. i18n: ectx: whatsthis, entry (uiFont), group (UI Options)
-#: rc.cpp:124 rc.cpp:1807
+#: rc.cpp:1343
 msgid "The Font to be used"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:131
+#. i18n: file: umbrello.kcfg:165
 #. i18n: ectx: label, entry (backgroundColor), group (UI Options)
-#: rc.cpp:127 rc.cpp:1810
+#: rc.cpp:1346
 msgid "Background Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:132
+#. i18n: file: umbrello.kcfg:166
 #. i18n: ectx: whatsthis, entry (backgroundColor), group (UI Options)
-#: rc.cpp:130 rc.cpp:1813
+#: rc.cpp:1349
 msgid "The Color of the diagram background"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:136
+#. i18n: file: umbrello.kcfg:170
 #. i18n: ectx: label, entry (gridDotColor), group (UI Options)
-#: rc.cpp:133 rc.cpp:1816
+#: rc.cpp:1352
 msgid "Grid Dot Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:137
+#. i18n: file: umbrello.kcfg:171
 #. i18n: ectx: whatsthis, entry (gridDotColor), group (UI Options)
-#: rc.cpp:136 rc.cpp:1819
+#: rc.cpp:1355
 msgid "The Color of the grid dots"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:143
+#. i18n: file: umbrello.kcfg:177
 #. i18n: ectx: label, entry (showVisibility), group (Class Options)
-#: rc.cpp:139 rc.cpp:1822
+#: rc.cpp:1358
 msgid "Show Visibility"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:144
+#. i18n: file: umbrello.kcfg:178
 #. i18n: ectx: whatsthis, entry (showVisibility), group (Class Options)
-#: rc.cpp:142 rc.cpp:1825
+#: rc.cpp:1361
 msgid ""
 "Show the Visibility of the Attributes ( eg: private, public, protected)"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:148
+#. i18n: file: umbrello.kcfg:182
 #. i18n: ectx: label, entry (showAtts), group (Class Options)
-#: rc.cpp:145 rc.cpp:1828
+#: rc.cpp:1364
 msgid "Show Attributes"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:149
+#. i18n: file: umbrello.kcfg:183
 #. i18n: ectx: whatsthis, entry (showAtts), group (Class Options)
-#: rc.cpp:148 rc.cpp:1831
+#: rc.cpp:1367
 msgid "Show attributes of the class"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:153
-#. i18n: ectx: label, entry (showOps), group (Class Options)
-#. i18n: file: umbrello.kcfg:154
-#. i18n: ectx: whatsthis, entry (showOps), group (Class Options)
-#. i18n: file: umbrello.kcfg:153
+#. i18n: file: umbrello.kcfg:187
 #. i18n: ectx: label, entry (showOps), group (Class Options)
-#. i18n: file: umbrello.kcfg:154
+#. i18n: file: umbrello.kcfg:188
 #. i18n: ectx: whatsthis, entry (showOps), group (Class Options)
-#: rc.cpp:151 rc.cpp:154 rc.cpp:1834 rc.cpp:1837
+#: rc.cpp:1370 rc.cpp:1373
 msgid "Show Operations"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:158
+#. i18n: file: umbrello.kcfg:192
 #. i18n: ectx: label, entry (showPackage), group (Class Options)
-#: rc.cpp:157 rc.cpp:1840
+#: rc.cpp:1376
 msgid "Show Package"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:159
+#. i18n: file: umbrello.kcfg:193
 #. i18n: ectx: whatsthis, entry (showPackage), group (Class Options)
-#: rc.cpp:160 rc.cpp:1843
+#: rc.cpp:1379
 msgid "Enables/Disables showing of packages"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:163
-#. i18n: ectx: label, entry (showStereoType), group (Class Options)
-#. i18n: file: umbrello.kcfg:164
-#. i18n: ectx: whatsthis, entry (showStereoType), group (Class Options)
-#. i18n: file: umbrello.kcfg:163
+#. i18n: file: umbrello.kcfg:197
 #. i18n: ectx: label, entry (showStereoType), group (Class Options)
-#. i18n: file: umbrello.kcfg:164
+#. i18n: file: umbrello.kcfg:198
 #. i18n: ectx: whatsthis, entry (showStereoType), group (Class Options)
-#: rc.cpp:163 rc.cpp:166 rc.cpp:1846 rc.cpp:1849
+#: rc.cpp:1382 rc.cpp:1385
 msgid "Show Stereotypes"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:168
-#. i18n: ectx: label, entry (showAttribAssocs), group (Class Options)
-#. i18n: file: umbrello.kcfg:169
-#. i18n: ectx: whatsthis, entry (showAttribAssocs), group (Class Options)
-#. i18n: file: umbrello.kcfg:168
+#. i18n: file: umbrello.kcfg:202
 #. i18n: ectx: label, entry (showAttribAssocs), group (Class Options)
-#. i18n: file: umbrello.kcfg:169
+#. i18n: file: umbrello.kcfg:203
 #. i18n: ectx: whatsthis, entry (showAttribAssocs), group (Class Options)
-#: rc.cpp:169 rc.cpp:172 rc.cpp:1852 rc.cpp:1855
+#: rc.cpp:1388 rc.cpp:1391
 msgid "Show Attribute Associations"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:174
+#. i18n: file: umbrello.kcfg:208
 #. i18n: ectx: whatsthis, entry (showPublicOnly), group (Class Options)
-#: rc.cpp:178 rc.cpp:1861
+#: rc.cpp:1397
 msgid "Enables/Disables showing of public attributes/methods"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:178
-#. i18n: ectx: label, entry (showAttSig), group (Class Options)
-#. i18n: file: umbrello.kcfg:179
-#. i18n: ectx: whatsthis, entry (showAttSig), group (Class Options)
-#. i18n: file: umbrello.kcfg:178
+#. i18n: file: umbrello.kcfg:212
 #. i18n: ectx: label, entry (showAttSig), group (Class Options)
-#. i18n: file: umbrello.kcfg:179
+#. i18n: file: umbrello.kcfg:213
 #. i18n: ectx: whatsthis, entry (showAttSig), group (Class Options)
-#: rc.cpp:181 rc.cpp:184 rc.cpp:1864 rc.cpp:1867
+#: rc.cpp:1400 rc.cpp:1403
 msgid "Show Attribute Signature"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:183
+#. i18n: file: umbrello.kcfg:217
 #. i18n: ectx: label, entry (showOpSig), group (Class Options)
-#: rc.cpp:187 rc.cpp:1870
+#: rc.cpp:1406
 msgid "Show Operation Signature"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:188
-#. i18n: ectx: label, entry (defaultAttributeScope), group (Class Options)
-#. i18n: file: umbrello.kcfg:189
-#. i18n: ectx: whatsthis, entry (defaultAttributeScope), group (Class Options)
-#. i18n: file: umbrello.kcfg:188
+#. i18n: file: umbrello.kcfg:222
 #. i18n: ectx: label, entry (defaultAttributeScope), group (Class Options)
-#. i18n: file: umbrello.kcfg:189
+#. i18n: file: umbrello.kcfg:223
 #. i18n: ectx: whatsthis, entry (defaultAttributeScope), group (Class Options)
-#: rc.cpp:193 rc.cpp:196 rc.cpp:1876 rc.cpp:1879
+#: rc.cpp:1412 rc.cpp:1415
 msgid "Default Attribute Scope"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:194
-#. i18n: ectx: label, entry (defaultOperationScope), group (Class Options)
-#. i18n: file: umbrello.kcfg:195
-#. i18n: ectx: whatsthis, entry (defaultOperationScope), group (Class Options)
-#. i18n: file: umbrello.kcfg:194
+#. i18n: file: umbrello.kcfg:234
 #. i18n: ectx: label, entry (defaultOperationScope), group (Class Options)
-#. i18n: file: umbrello.kcfg:195
+#. i18n: file: umbrello.kcfg:235
 #. i18n: ectx: whatsthis, entry (defaultOperationScope), group (Class Options)
-#: rc.cpp:199 rc.cpp:202 rc.cpp:1882 rc.cpp:1885
+#: rc.cpp:1418 rc.cpp:1421
 msgid "Default Operation Scope"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:202
+#. i18n: file: umbrello.kcfg:248
 #. i18n: ectx: label, entry (height), group (Code Viewer Options)
-#: rc.cpp:205 rc.cpp:1888
+#: rc.cpp:1424
 msgid "Height"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:203
+#. i18n: file: umbrello.kcfg:249
 #. i18n: ectx: whatsthis, entry (height), group (Code Viewer Options)
-#: rc.cpp:208 rc.cpp:1891
+#: rc.cpp:1427
 msgid "Height of the code viewer"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:208
+#. i18n: file: umbrello.kcfg:254
 #. i18n: ectx: label, entry (width), group (Code Viewer Options)
-#: rc.cpp:211 rc.cpp:1894
+#: rc.cpp:1430
 msgid "Width"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:209
+#. i18n: file: umbrello.kcfg:255
 #. i18n: ectx: whatsthis, entry (width), group (Code Viewer Options)
-#: rc.cpp:214 rc.cpp:1897
+#: rc.cpp:1433
 msgid "Width of the Code Viewer"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:214
-#. i18n: ectx: label, entry (showHiddenBlocks), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:215
-#. i18n: ectx: whatsthis, entry (showHiddenBlocks), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:214
+#. i18n: file: umbrello.kcfg:260
 #. i18n: ectx: label, entry (showHiddenBlocks), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:215
+#. i18n: file: umbrello.kcfg:261
 #. i18n: ectx: whatsthis, entry (showHiddenBlocks), group (Code Viewer Options)
-#: rc.cpp:217 rc.cpp:220 rc.cpp:1900 rc.cpp:1903
+#: rc.cpp:1436 rc.cpp:1439
 msgid "Show Hidden Blocks"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:219
+#. i18n: file: umbrello.kcfg:265
 #. i18n: ectx: label, entry (blocksAreHighlighted), group (Code Viewer Options)
-#: rc.cpp:223 rc.cpp:1906
+#: rc.cpp:1442
 msgid "Highlight Blocks"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:220
+#. i18n: file: umbrello.kcfg:266
 #. i18n: ectx: whatsthis, entry (blocksAreHighlighted), group (Code Viewer Options)
-#: rc.cpp:226 rc.cpp:1909
+#: rc.cpp:1445
 msgid "Enables/Disables Highlighting of blocks"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:225
+#. i18n: file: umbrello.kcfg:271
 #. i18n: ectx: whatsthis, entry (codeViewerFont), group (Code Viewer Options)
-#: rc.cpp:232 rc.cpp:1915
+#: rc.cpp:1451
 msgid "Font to be used in the Code Viewer"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:229
+#. i18n: file: umbrello.kcfg:275
 #. i18n: ectx: label, entry (paperColor), group (Code Viewer Options)
-#: rc.cpp:235 rc.cpp:1918
+#: rc.cpp:1454
 msgid "Paper Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:230
+#. i18n: file: umbrello.kcfg:276
 #. i18n: ectx: whatsthis, entry (paperColor), group (Code Viewer Options)
-#: rc.cpp:238 rc.cpp:1921
+#: rc.cpp:1457
 msgid "Color of the Paper"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:234
+#. i18n: file: umbrello.kcfg:280
 #. i18n: ectx: label, entry (fontColor), group (Code Viewer Options)
-#: rc.cpp:241 rc.cpp:1924
+#: rc.cpp:1460
 msgid "Font Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:235
+#. i18n: file: umbrello.kcfg:281
 #. i18n: ectx: whatsthis, entry (fontColor), group (Code Viewer Options)
-#: rc.cpp:244 rc.cpp:1927
+#: rc.cpp:1463
 msgid "Color of the Font"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:239
-#. i18n: ectx: label, entry (selectedColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:240
-#. i18n: ectx: whatsthis, entry (selectedColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:239
+#. i18n: file: umbrello.kcfg:285
 #. i18n: ectx: label, entry (selectedColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:240
+#. i18n: file: umbrello.kcfg:286
 #. i18n: ectx: whatsthis, entry (selectedColor), group (Code Viewer Options)
-#: rc.cpp:247 rc.cpp:250 rc.cpp:1930 rc.cpp:1933
+#: rc.cpp:1466 rc.cpp:1469
 msgid "Selected Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:244
+#. i18n: file: umbrello.kcfg:290
 #. i18n: ectx: label, entry (editBlockColor), group (Code Viewer Options)
-#: rc.cpp:253 rc.cpp:1936
+#: rc.cpp:1472
 msgctxt "Color of the Edit Block"
 msgid "Edit Block Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:245
+#. i18n: file: umbrello.kcfg:291
 #. i18n: ectx: whatsthis, entry (editBlockColor), group (Code Viewer Options)
-#: rc.cpp:256 rc.cpp:1939
+#: rc.cpp:1475
 msgid "Color of the Edit Block"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:249
-#. i18n: ectx: label, entry (nonEditBlockColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:250
-#. i18n: ectx: whatsthis, entry (nonEditBlockColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:249
+#. i18n: file: umbrello.kcfg:295
 #. i18n: ectx: label, entry (nonEditBlockColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:250
+#. i18n: file: umbrello.kcfg:296
 #. i18n: ectx: whatsthis, entry (nonEditBlockColor), group (Code Viewer Options)
-#: rc.cpp:259 rc.cpp:262 rc.cpp:1942 rc.cpp:1945
+#: rc.cpp:1478 rc.cpp:1481
 msgid "Non Edit Block Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:254
+#. i18n: file: umbrello.kcfg:300
 #. i18n: ectx: label, entry (umlObjectColor), group (Code Viewer Options)
-#: rc.cpp:265 rc.cpp:1948
+#: rc.cpp:1484
 msgid "UML Object Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:255
+#. i18n: file: umbrello.kcfg:301
 #. i18n: ectx: whatsthis, entry (umlObjectColor), group (Code Viewer Options)
-#: rc.cpp:268 rc.cpp:1951
+#: rc.cpp:1487
 msgid "Color of the UML Object"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:259
-#. i18n: ectx: label, entry (hiddenColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:260
-#. i18n: ectx: whatsthis, entry (hiddenColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:259
+#. i18n: file: umbrello.kcfg:305
 #. i18n: ectx: label, entry (hiddenColor), group (Code Viewer Options)
-#. i18n: file: umbrello.kcfg:260
+#. i18n: file: umbrello.kcfg:306
 #. i18n: ectx: whatsthis, entry (hiddenColor), group (Code Viewer Options)
-#: rc.cpp:271 rc.cpp:274 rc.cpp:1954 rc.cpp:1957
+#: rc.cpp:1490 rc.cpp:1493
 msgid "Hidden Color"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:266
+#. i18n: file: umbrello.kcfg:312
+#. i18n: ectx: label, entry (createArtifacts), group (Code Importer)
+#: rc.cpp:1496
+msgid "Create Artifacts for imported files"
+msgstr ""
+
+#. i18n: file: umbrello.kcfg:313
+#. i18n: ectx: whatsthis, entry (createArtifacts), group (Code Importer)
+#: rc.cpp:1499
+msgid "Create an artifact in the component view for each imported file"
+msgstr ""
+
+#. i18n: file: umbrello.kcfg:319
 #. i18n: ectx: label, entry (autoGenEmptyConstructors), group (Code Generation)
-#: rc.cpp:277 rc.cpp:1960
+#: rc.cpp:1502
 msgid "Auto Generate Empty Constructors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:267
+#. i18n: file: umbrello.kcfg:320
 #. i18n: ectx: whatsthis, entry (autoGenEmptyConstructors), group (Code Generation)
-#: rc.cpp:280 rc.cpp:1963
+#: rc.cpp:1505
 msgid "Enables/Disables Auto Generation of Empty Constructors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:271
+#. i18n: file: umbrello.kcfg:324
 #. i18n: ectx: label, entry (commentStyle), group (Code Generation)
-#: rc.cpp:283 rc.cpp:1966
+#: rc.cpp:1508
 msgid "Comment Style"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:272
+#. i18n: file: umbrello.kcfg:325
 #. i18n: ectx: whatsthis, entry (commentStyle), group (Code Generation)
-#: rc.cpp:286 rc.cpp:1969
+#: rc.cpp:1511
 msgid "Sets the Style of Comments to be used"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:277
+#. i18n: file: umbrello.kcfg:333
 #. i18n: ectx: label, entry (defaultAssocFieldScope), group (Code Generation)
-#: rc.cpp:289 rc.cpp:1972
+#: rc.cpp:1514
 msgid "Default Association Field Scope"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:278
+#. i18n: file: umbrello.kcfg:334
 #. i18n: ectx: whatsthis, entry (defaultAssocFieldScope), group (Code Generation)
-#: rc.cpp:292 rc.cpp:1975
+#: rc.cpp:1517
 msgid "Sets the default Association field scope"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:283
+#. i18n: file: umbrello.kcfg:345
 #. i18n: ectx: label, entry (defaultAttributeAccessorScope), group (Code Generation)
-#: rc.cpp:295 rc.cpp:1978
+#: rc.cpp:1520
 msgid "Default Attribute Accessor Scope"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:284
+#. i18n: file: umbrello.kcfg:346
 #. i18n: ectx: whatsthis, entry (defaultAttributeAccessorScope), group (Code Generation)
-#: rc.cpp:298 rc.cpp:1981
+#: rc.cpp:1523
 msgid "Sets the default attribute accessor scope"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:289
+#. i18n: file: umbrello.kcfg:357
 #. i18n: ectx: label, entry (forceDoc), group (Code Generation)
-#: rc.cpp:301 rc.cpp:1984
+#: rc.cpp:1526
 msgid "Force Documentation"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:290
+#. i18n: file: umbrello.kcfg:358
 #. i18n: ectx: whatsthis, entry (forceDoc), group (Code Generation)
-#: rc.cpp:304 rc.cpp:1987
+#: rc.cpp:1529
 msgid "Enables/Disables Verbose Documentation"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:294
+#. i18n: file: umbrello.kcfg:362
 #. i18n: ectx: label, entry (forceSections), group (Code Generation)
-#: rc.cpp:307 rc.cpp:1990
+#: rc.cpp:1532
 msgid "Force Section Documentation"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:295
+#. i18n: file: umbrello.kcfg:363
 #. i18n: ectx: whatsthis, entry (forceSections), group (Code Generation)
-#: rc.cpp:310 rc.cpp:1993
+#: rc.cpp:1535
 msgid "Enables/Disables verbose section documentation"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:299
+#. i18n: file: umbrello.kcfg:367
 #. i18n: ectx: label, entry (headingsDirectory), group (Code Generation)
-#: rc.cpp:313 rc.cpp:1996
+#: rc.cpp:1538
 msgid "Headings Directory"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:300
+#. i18n: file: umbrello.kcfg:368
 #. i18n: ectx: whatsthis, entry (headingsDirectory), group (Code Generation)
-#: rc.cpp:316 rc.cpp:1999
+#: rc.cpp:1541
 msgid "The Path in which the headings are stored"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:304
+#. i18n: file: umbrello.kcfg:372
 #. i18n: ectx: label, entry (includeHeadings), group (Code Generation)
-#: rc.cpp:319 rc.cpp:2002
+#: rc.cpp:1544
 msgid "Include headings"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:305
+#. i18n: file: umbrello.kcfg:373
 #. i18n: ectx: whatsthis, entry (includeHeadings), group (Code Generation)
-#: rc.cpp:322 rc.cpp:2005
+#: rc.cpp:1547
 msgid "Enables/Disables inclusion of headings"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:309
+#. i18n: file: umbrello.kcfg:377
 #. i18n: ectx: label, entry (indentationAmount), group (Code Generation)
-#: rc.cpp:325 rc.cpp:2008
+#: rc.cpp:1550
 msgid "Indentation Amount"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:310
+#. i18n: file: umbrello.kcfg:378
 #. i18n: ectx: whatsthis, entry (indentationAmount), group (Code Generation)
-#: rc.cpp:328 rc.cpp:2011
+#: rc.cpp:1553
 msgid "The amount of indentation"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:315
+#. i18n: file: umbrello.kcfg:383
 #. i18n: ectx: label, entry (indentationType), group (Code Generation)
-#: rc.cpp:331 rc.cpp:2014
+#: rc.cpp:1556
 msgid "Indentation Type"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:316
+#. i18n: file: umbrello.kcfg:384
 #. i18n: ectx: whatsthis, entry (indentationType), group (Code Generation)
-#: rc.cpp:334 rc.cpp:2017
+#: rc.cpp:1559
 msgid "The Type of Indentation"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:321
+#. i18n: file: umbrello.kcfg:393
 #. i18n: ectx: label, entry (lineEndingType), group (Code Generation)
-#: rc.cpp:337 rc.cpp:2020
+#: rc.cpp:1562
 msgid "Line Ending Type"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:322
+#. i18n: file: umbrello.kcfg:394
 #. i18n: ectx: whatsthis, entry (lineEndingType), group (Code Generation)
-#: rc.cpp:340 rc.cpp:2023
+#: rc.cpp:1565
 msgid "The type of line ending ( or new line type )"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:327
-#. i18n: ectx: label, entry (modnamePolicy), group (Code Generation)
-#. i18n: file: umbrello.kcfg:328
-#. i18n: ectx: whatsthis, entry (modnamePolicy), group (Code Generation)
-#. i18n: file: umbrello.kcfg:327
+#. i18n: file: umbrello.kcfg:403
 #. i18n: ectx: label, entry (modnamePolicy), group (Code Generation)
-#. i18n: file: umbrello.kcfg:328
+#. i18n: file: umbrello.kcfg:404
 #. i18n: ectx: whatsthis, entry (modnamePolicy), group (Code Generation)
-#: rc.cpp:343 rc.cpp:346 rc.cpp:2026 rc.cpp:2029
+#: rc.cpp:1568 rc.cpp:1571
 msgid "Modifier Name Policy"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:333
+#. i18n: file: umbrello.kcfg:413
 #. i18n: ectx: label, entry (outputDirectory), group (Code Generation)
-#: rc.cpp:349 rc.cpp:2032
+#: rc.cpp:1574
 msgid "Output Directory"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:334
+#. i18n: file: umbrello.kcfg:414
 #. i18n: ectx: whatsthis, entry (outputDirectory), group (Code Generation)
-#: rc.cpp:352 rc.cpp:2035
+#: rc.cpp:1577
 msgid "The directory to which the code has to be outputted"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:339
+#. i18n: file: umbrello.kcfg:419
 #. i18n: ectx: whatsthis, entry (overwritePolicy), group (Code Generation)
-#: rc.cpp:358 rc.cpp:2041
+#: rc.cpp:1583
 msgid "The policy to be followed when there are name conflicts"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:346
+#. i18n: file: umbrello.kcfg:431
 #. i18n: ectx: label, entry (autoGenAccessors), group (CPP Code Generation)
-#: rc.cpp:361 rc.cpp:2044
+#: rc.cpp:1586
 msgid "Auto Generate Accessors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:347
+#. i18n: file: umbrello.kcfg:432
 #. i18n: ectx: whatsthis, entry (autoGenAccessors), group (CPP Code Generation)
-#: rc.cpp:364 rc.cpp:2047
+#: rc.cpp:1589
 msgid "Enables/Disables auto generation of accessors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:351
+#. i18n: file: umbrello.kcfg:436
 #. i18n: ectx: label, entry (inlineAccessors), group (CPP Code Generation)
-#: rc.cpp:367 rc.cpp:2050
+#: rc.cpp:1592
 msgid "Inline Accessors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:352
+#. i18n: file: umbrello.kcfg:437
 #. i18n: ectx: whatsthis, entry (inlineAccessors), group (CPP Code Generation)
-#: rc.cpp:370 rc.cpp:2053
+#: rc.cpp:1595
 msgid "Enables/Disables Inline accessors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:356
+#. i18n: file: umbrello.kcfg:441
 #. i18n: ectx: label, entry (inlineOps), group (CPP Code Generation)
-#: rc.cpp:373 rc.cpp:2056
+#: rc.cpp:1598
 msgid "Inline operations"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:357
+#. i18n: file: umbrello.kcfg:442
 #. i18n: ectx: whatsthis, entry (inlineOps), group (CPP Code Generation)
-#: rc.cpp:376 rc.cpp:2059
+#: rc.cpp:1601
 msgid "Enables/Disables Inline Operations"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:361
+#. i18n: file: umbrello.kcfg:446
 #. i18n: ectx: label, entry (packageIsNamespace), group (CPP Code Generation)
-#: rc.cpp:379 rc.cpp:2062
+#: rc.cpp:1604
 msgid "Package is namespace"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:362
+#. i18n: file: umbrello.kcfg:447
 #. i18n: ectx: whatsthis, entry (packageIsNamespace), group (CPP Code Generation)
-#: rc.cpp:382 rc.cpp:2065
+#: rc.cpp:1607
 msgid "Enables/Disables treating a package as a namespace"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:366
+#. i18n: file: umbrello.kcfg:451
 #. i18n: ectx: label, entry (publicAccessors), group (CPP Code Generation)
-#: rc.cpp:385 rc.cpp:2068
+#: rc.cpp:1610
 msgid "Public Accessors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:367
+#. i18n: file: umbrello.kcfg:452
 #. i18n: ectx: whatsthis, entry (publicAccessors), group (CPP Code Generation)
-#: rc.cpp:388 rc.cpp:2071
+#: rc.cpp:1613
 msgid "Enables/Disables public accessors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:371
+#. i18n: file: umbrello.kcfg:456
 #. i18n: ectx: label, entry (stringClassName), group (CPP Code Generation)
-#: rc.cpp:391 rc.cpp:2074
+#: rc.cpp:1616
 msgid "String Class Name"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:372
+#. i18n: file: umbrello.kcfg:457
 #. i18n: ectx: whatsthis, entry (stringClassName), group (CPP Code Generation)
-#: rc.cpp:394 rc.cpp:2077
+#: rc.cpp:1619
 msgid "The name of the string class"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:376
+#. i18n: file: umbrello.kcfg:461
 #. i18n: ectx: label, entry (stringClassNameInclude), group (CPP Code Generation)
-#: rc.cpp:397 rc.cpp:2080
+#: rc.cpp:1622
 msgid "String Class Name Include"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:377
+#. i18n: file: umbrello.kcfg:462
 #. i18n: ectx: whatsthis, entry (stringClassNameInclude), group (CPP Code Generation)
-#: rc.cpp:400 rc.cpp:2083
+#: rc.cpp:1625
 msgid "The name of the string class to be included"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:381
+#. i18n: file: umbrello.kcfg:466
 #. i18n: ectx: label, entry (stringIncludeIsGlobal), group (CPP Code Generation)
-#: rc.cpp:403 rc.cpp:2086
+#: rc.cpp:1628
 msgid "String Include is Global"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:382
+#. i18n: file: umbrello.kcfg:467
 #. i18n: ectx: whatsthis, entry (stringIncludeIsGlobal), group (CPP Code Generation)
-#: rc.cpp:406 rc.cpp:2089
+#: rc.cpp:1631
 msgid "Enables/Disables global inclusion of string"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:386
+#. i18n: file: umbrello.kcfg:471
 #. i18n: ectx: label, entry (vectorClassName), group (CPP Code Generation)
-#: rc.cpp:409 rc.cpp:2092
+#: rc.cpp:1634
 msgid "Vector Class Name"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:387
+#. i18n: file: umbrello.kcfg:472
 #. i18n: ectx: whatsthis, entry (vectorClassName), group (CPP Code Generation)
-#: rc.cpp:412 rc.cpp:2095
+#: rc.cpp:1637
 msgid "The name of the vector class"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:391
+#. i18n: file: umbrello.kcfg:476
 #. i18n: ectx: label, entry (vectorClassNameInclude), group (CPP Code Generation)
-#: rc.cpp:415 rc.cpp:2098
+#: rc.cpp:1640
 msgid "Vector Class Name Include "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:392
+#. i18n: file: umbrello.kcfg:477
 #. i18n: ectx: whatsthis, entry (vectorClassNameInclude), group (CPP Code Generation)
-#: rc.cpp:418 rc.cpp:2101
+#: rc.cpp:1643
 msgid "The name of the vector class to be included"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:396
+#. i18n: file: umbrello.kcfg:481
 #. i18n: ectx: label, entry (vectorIncludeIsGlobal), group (CPP Code Generation)
-#: rc.cpp:421 rc.cpp:2104
+#: rc.cpp:1646
 msgid "Vector include is global"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:397
+#. i18n: file: umbrello.kcfg:482
 #. i18n: ectx: whatsthis, entry (vectorIncludeIsGlobal), group (CPP Code Generation)
-#: rc.cpp:424 rc.cpp:2107
+#: rc.cpp:1649
 msgid "Enables/Disables global inclusing of vector class"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:401
+#. i18n: file: umbrello.kcfg:486
 #. i18n: ectx: label, entry (virtualDestructors), group (CPP Code Generation)
-#: rc.cpp:427 rc.cpp:2110
+#: rc.cpp:1652
 msgid "Virtual Destructors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:402
+#. i18n: file: umbrello.kcfg:487
 #. i18n: ectx: whatsthis, entry (virtualDestructors), group (CPP Code Generation)
-#: rc.cpp:430 rc.cpp:2113
+#: rc.cpp:1655
 msgid "Enables/Disables virtual destructors"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:406
+#. i18n: file: umbrello.kcfg:491
 #. i18n: ectx: label, entry (docToolTag), group (CPP Code Generation)
-#: rc.cpp:433 rc.cpp:2116
+#: rc.cpp:1658
 msgid "Documentation tags"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:407
+#. i18n: file: umbrello.kcfg:492
 #. i18n: ectx: whatsthis, entry (docToolTag), group (CPP Code Generation)
-#: rc.cpp:436 rc.cpp:2119
+#: rc.cpp:1661
 msgid "The tag used for generating doxygen documentation (\\\\, @)"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:413
+#. i18n: file: umbrello.kcfg:498
 #. i18n: ectx: label, entry (autoGenerateAttributeAccessorsD), group (D Code Generation)
-#: rc.cpp:439 rc.cpp:2122
+#: rc.cpp:1664
 msgid "Auto Generate Attribute Accessors ( D ) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:414
+#. i18n: file: umbrello.kcfg:499
 #. i18n: ectx: whatsthis, entry (autoGenerateAttributeAccessorsD), group (D Code Generation)
-#: rc.cpp:442 rc.cpp:2125
+#: rc.cpp:1667
 msgid "Enables/Disables auto generation of attribute accessors ( D )"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:418
+#. i18n: file: umbrello.kcfg:503
 #. i18n: ectx: label, entry (autoGenerateAssocAccessorsD), group (D Code Generation)
-#: rc.cpp:445 rc.cpp:2128
+#: rc.cpp:1670
 msgid "Auto Generate Assoc Accessors ( D )"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:419
+#. i18n: file: umbrello.kcfg:504
 #. i18n: ectx: whatsthis, entry (autoGenerateAssocAccessorsD), group (D Code Generation)
-#: rc.cpp:448 rc.cpp:2131
+#: rc.cpp:1673
 msgid "Enables/Disables auto generation of association accessors ( D )"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:423
+#. i18n: file: umbrello.kcfg:508
 #. i18n: ectx: label, entry (buildANTDocumentD), group (D Code Generation)
-#: rc.cpp:451 rc.cpp:2134
+#: rc.cpp:1676
 msgid "Build ANT Document (D) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:424
+#. i18n: file: umbrello.kcfg:509
 #. i18n: ectx: whatsthis, entry (buildANTDocumentD), group (D Code Generation)
-#: rc.cpp:454 rc.cpp:2137
+#: rc.cpp:1679
 msgid "Enables/Disables building of ANT Document (D) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:430
+#. i18n: file: umbrello.kcfg:515
 #. i18n: ectx: label, entry (autoGenerateAttributeAccessorsJava), group (Java Code Generation)
-#: rc.cpp:457 rc.cpp:2140
+#: rc.cpp:1682
 msgid "Auto Generate Attribute Accessors (Java)"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:431
+#. i18n: file: umbrello.kcfg:516
 #. i18n: ectx: whatsthis, entry (autoGenerateAttributeAccessorsJava), group (Java Code Generation)
-#: rc.cpp:460 rc.cpp:2143
+#: rc.cpp:1685
 msgid "Enables/Disables auto generation of attribute accessors (Java)"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:435
+#. i18n: file: umbrello.kcfg:520
 #. i18n: ectx: label, entry (autoGenerateAssocAccessorsJava), group (Java Code Generation)
-#: rc.cpp:463 rc.cpp:2146
+#: rc.cpp:1688
 msgid "Auto Generate Assoc Accessors (Java) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:436
+#. i18n: file: umbrello.kcfg:521
 #. i18n: ectx: whatsthis, entry (autoGenerateAssocAccessorsJava), group (Java Code Generation)
-#: rc.cpp:466 rc.cpp:2149
+#: rc.cpp:1691
 msgid "Enables/Disables auto generation of association accessors (Java) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:440
+#. i18n: file: umbrello.kcfg:525
 #. i18n: ectx: label, entry (buildANTDocumentJava), group (Java Code Generation)
-#: rc.cpp:469 rc.cpp:2152
+#: rc.cpp:1694
 msgid "Build ANT Document (Java) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:441
+#. i18n: file: umbrello.kcfg:526
 #. i18n: ectx: whatsthis, entry (buildANTDocumentJava), group (Java Code Generation)
-#: rc.cpp:472 rc.cpp:2155
+#: rc.cpp:1697
 msgid "Enables/Disables building of ANT Document (Java) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:447
+#. i18n: file: umbrello.kcfg:532
 #. i18n: ectx: label, entry (autoGenerateAttributeAccessorsRuby), group (Ruby Code Generation)
-#: rc.cpp:475 rc.cpp:2158
+#: rc.cpp:1700
 msgid "Auto Generate Attribute Accessors (Ruby) "
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:448
+#. i18n: file: umbrello.kcfg:533
 #. i18n: ectx: whatsthis, entry (autoGenerateAttributeAccessorsRuby), group (Ruby Code Generation)
-#: rc.cpp:478 rc.cpp:2161
+#: rc.cpp:1703
 msgid "Enables/Disables auto generation of attribute accessors (Ruby)"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:452
+#. i18n: file: umbrello.kcfg:537
 #. i18n: ectx: label, entry (autoGenerateAssocAccessorsRuby), group (Ruby Code Generation)
-#: rc.cpp:481 rc.cpp:2164
+#: rc.cpp:1706
 msgid "Auto Generate Assoc Accessors (Ruby)"
 msgstr ""
 
-#. i18n: file: umbrello.kcfg:453
+#. i18n: file: umbrello.kcfg:538
 #. i18n: ectx: whatsthis, entry (autoGenerateAssocAccessorsRuby), group (Ruby Code Generation)
-#: rc.cpp:484 rc.cpp:2167
+#: rc.cpp:1709
 msgid "Enables/Disables auto generation of association accessors (Ruby)"
 msgstr ""
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/useraccount.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/useraccount.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/useraccount.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/useraccount.po	2012-04-18 08:59:37.000000000 +0000
@@ -4,38 +4,34 @@
 msgstr ""
 "Project-Id-Version: useraccount\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
-"PO-Revision-Date: 2012-03-14 17:23+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
+"PO-Revision-Date: 2012-04-11 16:54+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:29+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: chfacedlg.cpp:56
 msgctxt "@title:window"
 msgid "Change your Face"
 msgstr ""
 
-#: chfacedlg.cpp:60
-msgid "Custom image"
-msgstr ""
-
-#: chfacedlg.cpp:74
+#: chfacedlg.cpp:75
 msgid "&Acquire Image..."
 msgstr "&Cipio Delwedd..."
 
-#: chfacedlg.cpp:94
+#: chfacedlg.cpp:95
 msgid "(Custom)"
 msgstr "(Addasiedig)"
 
-#: chfacedlg.cpp:113 main.cpp:275
+#: chfacedlg.cpp:114 main.cpp:242
 msgid "There was an error loading the image."
 msgstr "Bu gwall wrth lwytho'r ddelwedd."
 
-#: chfacedlg.cpp:131 chfacedlg.cpp:167
+#: chfacedlg.cpp:132 chfacedlg.cpp:168
 #, kde-format
 msgid ""
 "There was an error saving the image:\n"
@@ -44,7 +40,7 @@
 "Bu gwall wrth gadw'r ddelwedd:\n"
 "%1"
 
-#: chfacedlg.cpp:142
+#: chfacedlg.cpp:143
 msgid "&Save copy in custom faces folder for future use"
 msgstr ""
 "Ca&dw copi yn y blygell wynebau addasiedig i'w defnyddio yn y dyfodol"
@@ -54,78 +50,78 @@
 msgid "Choose Image"
 msgstr ""
 
-#: main.cpp:76
+#: main.cpp:77
 msgid "Change &Password..."
 msgstr "Newid Cyf&rinair..."
 
-#: main.cpp:94
+#: main.cpp:95
 msgid "Password & User Information"
 msgstr "Gwybodaeth Gyfrinair a Defnyddiwr"
 
-#: main.cpp:96
+#: main.cpp:97
 msgid "(C) 2002, Braden MacDonald, (C) 2004 Ravikiran Rajagopal"
 msgstr "(h)(C) 2002 Braden MacDonald, (h)(C) 2004 Ravikiran Rajagopal"
 
-#: main.cpp:99
+#: main.cpp:100
 msgid "Frans Englich"
 msgstr ""
 
-#: main.cpp:99
+#: main.cpp:100
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
-#: main.cpp:100
+#: main.cpp:101
 msgid "Ravikiran Rajagopal"
 msgstr ""
 
-#: main.cpp:101
+#: main.cpp:102
 msgid "Michael Häckel"
 msgstr ""
 
-#: main.cpp:103
+#: main.cpp:104
 msgid "Braden MacDonald"
 msgstr ""
 
-#: main.cpp:103
+#: main.cpp:104
 msgid "Face editor"
 msgstr "Golygydd wyneb"
 
-#: main.cpp:104
+#: main.cpp:105
 msgid "Geert Jansen"
 msgstr ""
 
-#: main.cpp:104
+#: main.cpp:105
 msgid "Password changer"
 msgstr "Newidydd cyfrinair"
 
-#: main.cpp:106
+#: main.cpp:107
 msgid "Daniel Molkentin"
 msgstr ""
 
-#: main.cpp:107
+#: main.cpp:108
 msgid "Alex Zepeda"
 msgstr ""
 
-#: main.cpp:108
+#: main.cpp:109
 msgid "Hans Karlsson"
 msgstr ""
 
-#: main.cpp:108 main.cpp:109
+#: main.cpp:109 main.cpp:110
 msgid "Icons"
 msgstr "Eiconau"
 
-#: main.cpp:109
+#: main.cpp:110
 msgid "Hermann Thomas"
 msgstr ""
 
-#: main.cpp:112
+#: main.cpp:113
 msgid ""
 "<qt>Here you can change your personal information, which will be used, for "
 "instance, in mail programs and word processors. You can change your login "
 "password by clicking <em>Change Password...</em>.</qt>"
 msgstr ""
 
-#: main.cpp:126
+#: main.cpp:127
 msgid ""
 "A program error occurred: the internal program 'kdepasswd' could not be "
 "found. You will not be able to change your password."
@@ -133,19 +129,19 @@
 "Digwyddodd gwall rhaglen: ni allwyd canfod y rhaglen fewnol 'kdepasswd'.  Ni "
 "fyddwch yn gallu newid eich cyfrinair."
 
-#: main.cpp:232
+#: main.cpp:189
 msgid "Please enter your password in order to save your settings:"
 msgstr "Rhowch eich cyfrinair er mwyn cadw eich gosodiadau:"
 
-#: main.cpp:235
+#: main.cpp:192
 msgid "You must enter your password in order to change your information."
 msgstr "Rhaid i chi roi eich cyfrinair er mwyn cael newid eich gwybodaeth."
 
-#: main.cpp:245
+#: main.cpp:202
 msgid "You must enter a correct password."
 msgstr "Rhaid i chi roi cyfrinair cywir."
 
-#: main.cpp:249
+#: main.cpp:206
 #, kde-format
 msgid ""
 "An error occurred and your name has probably not been changed. The error "
@@ -153,16 +149,12 @@
 "%1"
 msgstr ""
 
-#: main.cpp:263
+#: main.cpp:226
 #, kde-format
 msgid "There was an error saving the image: %1"
 msgstr "Bu gwall wrth gadw'r ddelwedd: %1"
 
-#: main.cpp:289 main.cpp:323
-msgid "Your administrator has disallowed changing your image."
-msgstr "Mae eich gweinyddwr wedi atal newid eich delwedd."
-
-#: main.cpp:356
+#: main.cpp:310
 #, kde-format
 msgid ""
 "%1 does not appear to be an image file.\n"
@@ -173,126 +165,126 @@
 "Defnyddiwch ffeiliau efo'r estyniadau yma:\n"
 "%2"
 
-#: rc.cpp:58
+#: rc.cpp:1
 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 msgstr "KD, ,Launchpad Contributions:,KD at KGyfieithu"
 
-#: rc.cpp:59
+#: rc.cpp:2
 msgctxt "EMAIL OF TRANSLATORS"
 msgid "Your emails"
 msgstr "kyfieithu@dotmon.com,,,"
 
-#. i18n: file: faceDlg.ui:24
+#. i18n: file: faceDlg.ui:25
 #. i18n: ectx: property (text), widget (QLabel, header)
-#: rc.cpp:3
+#: rc.cpp:5
 msgid "Select a new face:"
 msgstr "Dewis wyneb newydd:"
 
 #. i18n: file: main_widget.ui:44
 #. i18n: ectx: property (toolTip), widget (KPushButton, btnChangeFace)
-#: rc.cpp:21 rc.cpp:65
+#: rc.cpp:8
 msgid "Change your image"
 msgstr ""
 
-#. i18n: file: main_widget.ui:68
+#. i18n: file: main_widget.ui:72
 #. i18n: ectx: property (text), widget (QLabel, lblClickButtonInfo)
-#: rc.cpp:24
+#: rc.cpp:11
 msgid "<i>Click to change your image</i>"
 msgstr ""
 
-#. i18n: file: main_widget.ui:83
+#. i18n: file: main_widget.ui:87
 #. i18n: ectx: property (text), widget (KPushButton, btnChangePassword)
-#: rc.cpp:27
+#: rc.cpp:14
 msgid "Change Password..."
 msgstr "Newid Cyfrinair..."
 
-#. i18n: file: main_widget.ui:112
+#. i18n: file: main_widget.ui:116
 #. i18n: ectx: property (title), widget (QGroupBox, grpUserInformation)
-#: rc.cpp:30
+#: rc.cpp:17
 msgid "User Information"
 msgstr "Gwybodaeth Ddefnyddiwr"
 
-#. i18n: file: main_widget.ui:118
+#. i18n: file: main_widget.ui:122
 #. i18n: ectx: property (text), widget (QLabel, lblRealName)
-#: rc.cpp:33
+#: rc.cpp:20
 msgid "&Name:"
 msgstr "&Enw:"
 
-#. i18n: file: main_widget.ui:144
+#. i18n: file: main_widget.ui:148
 #. i18n: ectx: property (text), widget (QLabel, lblOrganisation)
-#: rc.cpp:36
+#: rc.cpp:23
 msgid "&Organization:"
 msgstr "&Sefydliad:"
 
-#. i18n: file: main_widget.ui:167
+#. i18n: file: main_widget.ui:171
 #. i18n: ectx: property (text), widget (QLabel, lblEmail)
-#: rc.cpp:39
+#: rc.cpp:26
 msgid "&Email address:"
 msgstr "&Cyfeiriad ebost:"
 
-#. i18n: file: main_widget.ui:190
+#. i18n: file: main_widget.ui:194
 #. i18n: ectx: property (text), widget (QLabel, textLabel3)
-#: rc.cpp:42
+#: rc.cpp:29
 msgid "&SMTP server:"
 msgstr "&Gweinydd SMTP:"
 
-#. i18n: file: main_widget.ui:213
+#. i18n: file: main_widget.ui:217
 #. i18n: ectx: property (text), widget (QLabel, lblUIDTell)
-#: rc.cpp:45
+#: rc.cpp:32
 msgid "User ID:"
 msgstr "Dynodiad Defnyddiwr:"
 
-#. i18n: file: main_widget.ui:239
+#. i18n: file: main_widget.ui:243
 #. i18n: ectx: property (title), widget (KButtonGroup, kcfg_EchoMode)
-#: rc.cpp:48
+#: rc.cpp:35
 msgid "At Password Prompt"
 msgstr "Wrth Anogiad Cyfrinair"
 
-#. i18n: file: main_widget.ui:245
+#. i18n: file: main_widget.ui:249
 #. i18n: ectx: property (text), widget (QRadioButton, rdbOneStar)
-#: rc.cpp:51
+#: rc.cpp:38
 msgid "Show one bullet for each letter"
 msgstr ""
 
-#. i18n: file: main_widget.ui:252
+#. i18n: file: main_widget.ui:256
 #. i18n: ectx: property (text), widget (QRadioButton, rdbThreeStars)
-#: rc.cpp:54
+#: rc.cpp:41
 msgid "Show three bullets for each letter"
 msgstr ""
 
-#. i18n: file: main_widget.ui:259
+#. i18n: file: main_widget.ui:263
 #. i18n: ectx: property (text), widget (QRadioButton, rdbShowPassword)
-#: rc.cpp:57
+#: rc.cpp:44
 msgid "Show nothing"
 msgstr "Dangos dim byd"
 
 #. i18n: file: kcm_useraccount.kcfg:24
 #. i18n: ectx: label, entry (FaceSize), group (X-*-Greeter)
-#: rc.cpp:9
+#: rc.cpp:47
 msgid "The size of login images"
 msgstr "Maint y delweddau mewngofnodi"
 
 #. i18n: file: kcm_useraccount.kcfg:28
 #. i18n: ectx: label, entry (DefaultFile), group (X-*-Greeter)
-#: rc.cpp:12
+#: rc.cpp:50
 msgid "The default image file"
 msgstr "Ffeil ddelwedd ragosodol"
 
 #. i18n: file: kcm_useraccount.kcfg:32
 #. i18n: ectx: label, entry (CustomFaceFile), group (X-*-Greeter)
-#: rc.cpp:15
+#: rc.cpp:53
 msgid "The filename of the user's custom image file"
 msgstr "Enw ffeil ddelweddau addasiedig y defnyddiwr"
 
 #. i18n: file: kcm_useraccount.kcfg:36
 #. i18n: ectx: label, entry (FaceFile), group (X-*-Greeter)
-#: rc.cpp:18
+#: rc.cpp:56
 msgid "The user's login image"
 msgstr "Delwedd fewngofnodi y defnyddiwr"
 
 #. i18n: file: kcm_useraccount_pass.kcfg:9
 #. i18n: ectx: label, entry (EchoMode), group (Passwords)
-#: rc.cpp:21
+#: rc.cpp:61
 msgid "Password echo type"
 msgstr "Math atsain cyfrinair"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/validatorsplugin.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/validatorsplugin.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/validatorsplugin.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/validatorsplugin.po	2012-04-18 08:59:37.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: validatorsplugin\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-31 04:55+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,8 +18,8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
 "2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:29+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: plugin_validators.cpp:60
 msgid "Validate Web Page"
diff -Nru language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/webarchiver.po language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/webarchiver.po
--- language-pack-kde-cy-base-12.04+20120322/data/cy/LC_MESSAGES/webarchiver.po	2012-03-23 07:39:25.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/data/cy/LC_MESSAGES/webarchiver.po	2012-04-18 08:59:37.000000000 +0000
@@ -9,15 +9,15 @@
 msgstr ""
 "Project-Id-Version: webarchiver\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2011-09-07 16:13+0000\n"
+"POT-Creation-Date: 2012-04-12 13:13+0100\n"
 "PO-Revision-Date: 2010-12-31 04:57+0000\n"
 "Last-Translator: KD at KGyfieithu <Unknown>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-03-22 23:30+0000\n"
-"X-Generator: Launchpad (build 14981)\n"
+"X-Launchpad-Export-Date: 2012-04-18 04:56+0000\n"
+"X-Generator: Launchpad (build 15099)\n"
 
 #: archivedialog.cpp:161
 msgctxt "@title:window"
diff -Nru language-pack-kde-cy-base-12.04+20120322/debian/changelog language-pack-kde-cy-base-12.04+20120417/debian/changelog
--- language-pack-kde-cy-base-12.04+20120322/debian/changelog	2012-03-23 07:39:11.000000000 +0000
+++ language-pack-kde-cy-base-12.04+20120417/debian/changelog	2012-04-18 08:59:21.000000000 +0000
@@ -1,6 +1,6 @@
-language-pack-kde-cy-base (1:12.04+20120322) precise; urgency=low
+language-pack-kde-cy-base (1:12.04+20120417) precise; urgency=low
 
   * Initial Release.
 
- -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Fri, 23 Mar 2012 07:39:11 +0000
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 18 Apr 2012 08:59:21 +0000